diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 14f60b936f81..b77ca7eefb9f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -15,7 +15,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Format the commits in the following way: ``` - (pkg-name | service-name): (from -> to | init at version | refactor | etc) + (pkg-name | nixos/): (from -> to | init at version | refactor | etc) (Motivation for change. Additional information.) ``` @@ -24,10 +24,10 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * nginx: init at 2.0.1 * firefox: 3.0 -> 3.1.1 - * hydra service: add bazBaz option + * nixos/hydra: add bazBaz option Dual baz behavior is needed to do foo. - * nginx service: refactor config generation + * nixos/nginx: refactor config generation The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 5d99147051f1..756a2a30f0cc 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -11,3 +11,4 @@ * System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...) * Nix version: (run `nix-env --version`) * Nixpkgs version: (run `nix-instantiate --eval '' -A lib.nixpkgsVersion`) +* Sandboxing enabled: (run `grep build-use-sandbox /etc/nix/nix.conf`) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3482ae16e263..3247b1583421 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,6 +3,8 @@ ###### Things done +Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers. + - [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) @@ -11,6 +13,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/.mention-bot b/.mention-bot index d8529bd9123e..33c7e41c1dc7 100644 --- a/.mention-bot +++ b/.mention-bot @@ -2,7 +2,8 @@ "userBlacklist": [ "civodul", "jhasse", - "shlevy" + "shlevy", + "bbenoist" ], "alwaysNotifyForPaths": [ { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, diff --git a/.travis.yml b/.travis.yml index 802af69834d0..8ecd12642a79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,14 @@ language: nix +sudo: true +# 'sudo: false' == containers that start fast, but only get 4G ram; +# 'sudo: true' == VMs that start slow, but with 8G +# ..as per: https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments +# Nixpkgs PR tests OOM with 4G: https://github.com/NixOS/nixpkgs/issues/24200 + matrix: include: - os: linux - sudo: false + sudo: required script: - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual @@ -18,3 +24,6 @@ matrix: env: global: - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f + +notifications: + email: false diff --git a/README.md b/README.md index 002caa3a1719..1a0fb5014ded 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add ``` For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-16.09` for the latest +custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-16.09 +% git rebase channels/nixos-17.03 ``` For pull-requests, please rebase onto nixpkgs `master`. @@ -32,11 +32,11 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22)) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 16.09 release](https://hydra.nixos.org/jobset/nixos/release-16.09) +* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 16.09 release](https://hydra.nixos.org/job/nixos/release-16.09/tested#tabs-constituents) +* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents) 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/default.nix b/default.nix index 8171f4149d2f..a4896a9bbeec 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,17 @@ let requiredVersion = import ./lib/minver.nix; in if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then - abort "This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade! See https://nixos.org/wiki/How_to_update_when_Nix_is_too_old_to_evaluate_Nixpkgs" + abort '' + + This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade: + + - If you are running NixOS, use `nixos-rebuild' to upgrade your system. + + - If you installed Nix using the install script (https://nixos.org/nix/install), + it is safe to upgrade by running it again: + + curl https://nixos.org/nix/install | sh + '' else diff --git a/doc/configuration.xml b/doc/configuration.xml index 56950e07ab5c..ac03b42714c6 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -227,7 +227,7 @@ packages via packageOverrides You can define a function called packageOverrides in your local -~/.config/nixpkgs/config.nix to overide nix packages. It +~/.config/nixpkgs/config.nix to override nix packages. It must be a function that takes pkgs as an argument and return modified set of packages. @@ -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 8e981a4318e1..77d020afa2df 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -30,23 +30,17 @@
Platform parameters - The three GNU Autoconf platforms, build, host, and cross, are historically the result of much confusion. + The three GNU Autoconf platforms, build, host, and target, are historically the result of much confusion. clears this up somewhat but there is more to be said. An important advice to get out the way is, unless you are packaging a compiler or other build tool, just worry about the build and host platforms. Dealing with just two platforms usually better matches people's preconceptions, and in this case is completely correct. In Nixpkgs, these three platforms are defined as attribute sets under the names buildPlatform, hostPlatform, and targetPlatform. - All are guaranteed to contain at least a platform field, which contains detailed information on the platform. - 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.... - - These platforms should all have the same structure in all scenarios, but that is currently not the case. - When not cross-compiling, they will each contain a system field with a short 2-part, hyphen-separated summering string name for the platform. - But, when when cross compiling, hostPlatform and targetPlatform may instead contain config with a fuller 3- or 4-part string in the manner of LLVM. - We should have all 3 platforms always contain both, and maybe give config a better name while we are at it. - buildPlatform @@ -69,8 +63,8 @@ The "target platform" is black sheep. The other two intrinsically apply to all compiled software—or any build process with a notion of "build-time" followed by "run-time". The target platform only applies to programming tools, and even then only is a good for for some of them. - Briefly, GCC, Binutils, GHC, and certain other tools are written in such a way such that a single build can only compiler code for a single platform. - Thus, when building them, one must think ahead about what platforms they wish to use the tool to produce machine code for, and build binaries for each. + Briefly, GCC, Binutils, GHC, and certain other tools are written in such a way such that a single build can only compile code for a single platform. + Thus, when building them, one must think ahead about which platforms they wish to use the tool to produce machine code for, and build binaries for each. There is no fundamental need to think about the target ahead of time like this. @@ -83,14 +77,79 @@ Nixpkgs tries to avoid this where possible too, but still, because the concept of a target platform is so ingrained now in Autoconf and other tools, it is best to support it as is. Tools like LLVM that don't need up-front target platforms can safely ignore it like normal packages, and it will do no harm. - + + + + + 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. + For now, here are few fields can count on them containing: + + + + system + + + This is a two-component shorthand for the platform. + Examples of this would be "x86_64-darwin" and "i686-linux"; see lib.systems.doubles for more. + This format isn't very standard, but has built-in support in Nix, such as the builtins.currentSystem impure string. + + + + + config + + + This is a 3- or 4- component shorthand for the platform. + Examples of this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14". + This is a standard format called the "LLVM target triple", as they are pioneered by LLVM and traditionally just used for the targetPlatform. + This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. + This needs a better name than config! + + + + + parsed + + + This is a nix representation of a parsed LLVM target triple with white-listed components. + This can be specified directly, or actually parsed from the config. + [Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.] + See lib.systems.parse for the exact representation. + + + + + libc + + + This is a string identifying the standard C library used. + Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. + It should probably be refactored to use the module system, like parse. + + + + + is* + + + These predicates are defined in lib.systems.inspect, and slapped on every platform. + They are superior to the ones in stdenv as they force the user to be explicit about which platform they are inspecting. + Please use these instead of those. + + + + + platform + + + This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). + See lib.systems.platforms for examples—there's hopefully one in there that will work verbatim for each platform that is working. + Please help us triage these flags and give them better homes! + + - - 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. -
@@ -115,15 +174,20 @@ The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms. - How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from from buildPackages, whereas run-time dependencies are taken from the top level attribute set. + How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from buildPackages, whereas run-time dependencies are taken from the top level attribute set. For example, buildPackages.gcc should be used at build time, while gcc should be used at run time. Now, for most of Nixpkgs's history, there was no buildPackages, and most packages have not been refactored to use it explicitly. - Instead, one can use the four attributes used for specifying dependencies as documented in . + Instead, one can use the four attributes used for specifying dependencies as documented in . We "splice" together the run-time and build-time package sets with callPackage, and then mkDerivation for each of four attributes pulls the right derivation out. This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling. Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of buildPackages needed. For now, feel free to use either method. + + There is also a "backlink" __targetPackages, yielding a package set whose buildPackages is the current package set. + This is a hack, though, to accommodate compilers with lousy build systems. + Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way. +
@@ -136,11 +200,27 @@ More information needs to moved from the old wiki, especially , for this section. - Many sources (manual, wiki, etc) probably mention passing system, platform, and, optionally, crossSystem to nixpkgs: - import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }. - system and platform together determine the system on which packages are built, and crossSystem specifies the platform on which packages are ultimately intended to run, if it is different. - This still works, but with more recent changes, one can alternatively pass localSystem, containing system and platform, for symmetry. + Nixpkgs can be instantiated with localSystem alone, in which case there is no cross compiling and everything is built by and for that system, + or also with crossSystem, in which case packages run on the latter, but all building happens on the former. + Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. + As mentioned above, lib.systems.examples has some platforms which are used as arguments for these parameters in practice. + You can use them programmatically, or on the command line like nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz'. + + While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. + As discussed in the previous section, only one of system, config, and parsed is needed to infer the other two. + Additionally, libc will be inferred from parse. + Finally, localSystem.system is also impurely inferred based on the platform evaluation occurs. + This means it is often not necessary to pass localSystem at all, as in the command-line example in the previous paragraph. + + + + Many sources (manual, wiki, etc) probably mention passing system, platform, along with the optional crossSystem to nixpkgs: + import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }. + Passing those two instead of localSystem is still supported for compatibility, but is discouraged. + Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience. + + One would think that localSystem and crossSystem overlap horribly with the three *Platforms (buildPlatform, hostPlatform, and targetPlatform; see stage.nix or the manual). Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: diff --git a/doc/default.nix b/doc/default.nix index eaf3bb8d7a89..cfd51fba257e 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|||' \ @@ -68,6 +68,10 @@ pkgs.stdenv.mkDerivation { inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; } + + toDocbook { + inputFile = ./languages-frameworks/rust.md; + outputFile = "./languages-frameworks/rust.xml"; + } + toDocbook { inputFile = ./languages-frameworks/vim.md; outputFile = "./languages-frameworks/vim.xml"; diff --git a/doc/functions.xml b/doc/functions.xml index efe2590ddfb4..4a9015602afc 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -70,7 +70,7 @@ In the above example, the separateDebugInfo attribute is - overriden to be true, thus building debug info for + overridden to be true, thus building debug info for helloWithDebug, while all other attributes will be retained from the original hello package. @@ -529,7 +529,7 @@ If you see errors similar to getProtocolByName: does not exist (no such protocol name: tcp) - you may need to add pkgs.iana_etc to contents. + you may need to add pkgs.iana-etc to contents. diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index efb2e60cf3aa..1a18ed27237c 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 026acb4e8fb9..54ea60c90212 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 6d8984821741..ce2889f744f3 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -11,32 +11,35 @@ date: 2015-06-01 Nixpkgs distributes build instructions for all Haskell packages registered on [Hackage](http://hackage.haskell.org/), but strangely enough normal Nix package lookups don't seem to discover any of them, except for the default version of ghc, cabal-install, and stack: - - $ nix-env -i alex - error: selector ‘alex’ matches no derivations - $ nix-env -qa ghc - ghc-7.10.2 +``` +$ nix-env -i alex +error: selector ‘alex’ matches no derivations +$ nix-env -qa ghc +ghc-7.10.2 +``` The Haskell package set is not registered in the top-level namespace because it is *huge*. If all Haskell packages were visible to these commands, then name-based search/install operations would be much slower than they are now. We avoided that by keeping all Haskell-related packages in a separate attribute set called `haskellPackages`, which the following command will list: - - $ nix-env -f "" -qaP -A haskellPackages - haskellPackages.a50 a50-0.5 - haskellPackages.abacate haskell-abacate-0.0.0.0 - haskellPackages.abcBridge haskell-abcBridge-0.12 - haskellPackages.afv afv-0.1.1 - haskellPackages.alex alex-3.1.4 - haskellPackages.Allure Allure-0.4.101.1 - haskellPackages.alms alms-0.6.7 - [... some 8000 entries omitted ...] +``` +$ nix-env -f "" -qaP -A haskellPackages +haskellPackages.a50 a50-0.5 +haskellPackages.abacate haskell-abacate-0.0.0.0 +haskellPackages.abcBridge haskell-abcBridge-0.12 +haskellPackages.afv afv-0.1.1 +haskellPackages.alex alex-3.1.4 +haskellPackages.Allure Allure-0.4.101.1 +haskellPackages.alms alms-0.6.7 +[... some 8000 entries omitted ...] +``` To install any of those packages into your profile, refer to them by their attribute path (first column): - - $ nix-env -f "" -iA haskellPackages.Allure ... +```shell +nix-env -f "" -iA haskellPackages.Allure ... +``` The attribute path of any Haskell packages corresponds to the name of that particular package on Hackage: the package `cabal-install` has the attribute @@ -58,55 +61,60 @@ Attribute paths are deterministic inside of Nixpkgs, but the path necessary to reach Nixpkgs varies from system to system. We dodged that problem by giving `nix-env` an explicit `-f ""` parameter, but if you call `nix-env` without that flag, then chances are the invocation fails: - - $ nix-env -iA haskellPackages.cabal-install - error: attribute ‘haskellPackages’ in selection path - ‘haskellPackages.cabal-install’ not found +``` +$ nix-env -iA haskellPackages.cabal-install +error: attribute ‘haskellPackages’ in selection path + ‘haskellPackages.cabal-install’ not found +``` On NixOS, for example, Nixpkgs does *not* exist in the top-level namespace by default. To figure out the proper attribute path, it's easiest to query for the path of a well-known Nixpkgs package, i.e.: - - $ nix-env -qaP coreutils - nixos.coreutils coreutils-8.23 +``` +$ nix-env -qaP coreutils +nixos.coreutils coreutils-8.23 +``` If your system responds like that (most NixOS installations will), then the attribute path to `haskellPackages` is `nixos.haskellPackages`. Thus, if you want to use `nix-env` without giving an explicit `-f` flag, then that's the way to do it: - - $ nix-env -qaP -A nixos.haskellPackages - $ nix-env -iA nixos.haskellPackages.cabal-install +```shell +nix-env -qaP -A nixos.haskellPackages +nix-env -iA nixos.haskellPackages.cabal-install +``` Our current default compiler is GHC 7.10.x and the `haskellPackages` set contains packages built with that particular version. Nixpkgs contains the latest major release of every GHC since 6.10.4, however, and there is a whole family of package sets available that defines Hackage packages built with each of those compilers, too: - - $ nix-env -f "" -qaP -A haskell.packages.ghc6123 - $ nix-env -f "" -qaP -A haskell.packages.ghc763 +```shell +nix-env -f "" -qaP -A haskell.packages.ghc6123 +nix-env -f "" -qaP -A haskell.packages.ghc763 +``` The name `haskellPackages` is really just a synonym for `haskell.packages.ghc7102`, because we prefer that package set internally and recommend it to our users as their default choice, but ultimately you are free to compile your Haskell packages with any GHC version you please. The following command displays the complete list of available compilers: - - $ nix-env -f "" -qaP -A haskell.compiler - haskell.compiler.ghc6104 ghc-6.10.4 - haskell.compiler.ghc6123 ghc-6.12.3 - haskell.compiler.ghc704 ghc-7.0.4 - haskell.compiler.ghc722 ghc-7.2.2 - haskell.compiler.ghc742 ghc-7.4.2 - haskell.compiler.ghc763 ghc-7.6.3 - haskell.compiler.ghc784 ghc-7.8.4 - haskell.compiler.ghc7102 ghc-7.10.2 - haskell.compiler.ghcHEAD ghc-7.11.20150402 - haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704 - haskell.compiler.ghcjs ghcjs-0.1.0 - haskell.compiler.jhc jhc-0.8.2 - haskell.compiler.uhc uhc-1.1.9.0 +``` +$ nix-env -f "" -qaP -A haskell.compiler +haskell.compiler.ghc6104 ghc-6.10.4 +haskell.compiler.ghc6123 ghc-6.12.3 +haskell.compiler.ghc704 ghc-7.0.4 +haskell.compiler.ghc722 ghc-7.2.2 +haskell.compiler.ghc742 ghc-7.4.2 +haskell.compiler.ghc763 ghc-7.6.3 +haskell.compiler.ghc784 ghc-7.8.4 +haskell.compiler.ghc7102 ghc-7.10.2 +haskell.compiler.ghcHEAD ghc-7.11.20150402 +haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704 +haskell.compiler.ghcjs ghcjs-0.1.0 +haskell.compiler.jhc jhc-0.8.2 +haskell.compiler.uhc uhc-1.1.9.0 +``` We have no package sets for `jhc` or `uhc` yet, unfortunately, but for every version of GHC listed above, there exists a package set based on that compiler. @@ -121,8 +129,9 @@ A simple development environment consists of a Haskell compiler and one or both of the tools `cabal-install` and `stack`. We saw in section [How to install Haskell packages] how you can install those programs into your user profile: - - $ nix-env -f "" -iA haskellPackages.ghc haskellPackages.cabal-install +```shell +nix-env -f "" -iA haskellPackages.ghc haskellPackages.cabal-install +``` Instead of the default package set `haskellPackages`, you can also use the more precise name `haskell.compiler.ghc7102`, which has the advantage that it refers @@ -131,24 +140,25 @@ given time. Once you've made those tools available in `$PATH`, it's possible to build Hackage packages the same way people without access to Nix do it all the time: - - $ cabal get lens-4.11 && cd lens-4.11 - $ cabal install -j --dependencies-only - $ cabal configure - $ cabal build +```shell +cabal get lens-4.11 && cd lens-4.11 +cabal install -j --dependencies-only +cabal configure +cabal build +``` If you enjoy working with Cabal sandboxes, then that's entirely possible too: just execute the command - - $ cabal sandbox init - +```shell +cabal sandbox init +``` before installing the required dependencies. The `nix-shell` utility makes it easy to switch to a different compiler version; just enter the Nix shell environment with the command - - $ nix-shell -p haskell.compiler.ghc784 - +```shell +nix-shell -p haskell.compiler.ghc784 +``` to bring GHC 7.8.4 into `$PATH`. Alternatively, you can use Stack instead of `nix-shell` directly to select compiler versions and other build tools per-project. It uses `nix-shell` under the hood when Nix support is turned on. @@ -159,8 +169,9 @@ shell switches your build to use that compiler instead. If you're working on a project that doesn't depend on any additional system libraries outside of GHC, then it's even sufficient to just run the `cabal configure` command inside of the shell: - - $ nix-shell -p haskell.compiler.ghc784 --command "cabal configure" +```shell +nix-shell -p haskell.compiler.ghc784 --command "cabal configure" +``` Afterwards, all other commands like `cabal build` work just fine in any shell environment, because the configure phase recorded the absolute paths to all @@ -187,29 +198,30 @@ packages, which determines the libraries known to that particular version of GHC. For example, the Nix expression `ghcWithPackages (pkgs: [pkgs.mtl])` generates a copy of GHC that has the `mtl` library registered in addition to its normal core packages: +``` +$ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" - $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" - - [nix-shell:~]$ ghc-pkg list mtl - /nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d: - mtl-2.2.1 +[nix-shell:~]$ ghc-pkg list mtl +/nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d: + mtl-2.2.1 +``` This function allows users to define their own development environment by means of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`, - - { - packageOverrides = super: let self = super.pkgs; in - { - myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages - (haskellPackages: with haskellPackages; [ - # libraries - arrows async cgi criterion - # tools - cabal-install haskintex - ]); - }; - } - +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages + (haskellPackages: with haskellPackages; [ + # libraries + arrows async cgi criterion + # tools + cabal-install haskintex + ]); + }; +} +``` it's possible to install that compiler with `nix-env -f "" -iA myHaskellEnv`. If you'd like to switch that development environment to a different version of GHC, just replace the `ghc7102` bit in the previous @@ -221,14 +233,15 @@ file conflicts.) The generated `ghc` program is a wrapper script that re-directs the real GHC executable to use a new `lib` directory --- one that we specifically constructed to contain all those packages the user requested: - - $ cat $(type -p ghc) - #! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e - export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc - export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg - export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html - export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2 - exec /nix/store/j50p...-ghc-7.10.2/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" +``` +$ cat $(type -p ghc) +#! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e +export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc +export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg +export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html +export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2 +exec /nix/store/j50p...-ghc-7.10.2/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" +``` The variables `$NIX_GHC`, `$NIX_GHCPKG`, etc. point to the *new* store path `ghcWithPackages` constructed specifically for this environment. The last line @@ -248,23 +261,25 @@ than trying to guess them at compile-time. To make sure that mechanism works properly all the time, we recommend that you set those variables to meaningful values in your shell environment, too, i.e. by adding the following code to your `~/.bashrc`: - - if type >/dev/null 2>&1 -p ghc; then - eval "$(egrep ^export "$(type -p ghc)")" - fi +```bash +if type >/dev/null 2>&1 -p ghc; then + eval "$(egrep ^export "$(type -p ghc)")" +fi +``` If you are certain that you'll use only one GHC environment which is located in your user profile, then you can use the following code, too, which has the advantage that it doesn't contain any paths from the Nix store, i.e. those settings always remain valid even if a `nix-env -u` operation updates the GHC environment in your profile: - - if [ -e ~/.nix-profile/bin/ghc ]; then - export NIX_GHC="$HOME/.nix-profile/bin/ghc" - export NIX_GHCPKG="$HOME/.nix-profile/bin/ghc-pkg" - export NIX_GHC_DOCDIR="$HOME/.nix-profile/share/doc/ghc/html" - export NIX_GHC_LIBDIR="$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)" - fi +```bash +if [ -e ~/.nix-profile/bin/ghc ]; then + export NIX_GHC="$HOME/.nix-profile/bin/ghc" + export NIX_GHCPKG="$HOME/.nix-profile/bin/ghc-pkg" + export NIX_GHC_DOCDIR="$HOME/.nix-profile/share/doc/ghc/html" + export NIX_GHC_LIBDIR="$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)" +fi +``` ### How to install a compiler with libraries, hoogle and documentation indexes @@ -280,20 +295,20 @@ uses all those things. A precise name for this thing would be long and scary. For example, installing the following environment - - { - packageOverrides = super: let self = super.pkgs; in - { - myHaskellEnv = self.haskellPackages.ghcWithHoogle - (haskellPackages: with haskellPackages; [ - # libraries - arrows async cgi criterion - # tools - cabal-install haskintex - ]); - }; - } - +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + myHaskellEnv = self.haskellPackages.ghcWithHoogle + (haskellPackages: with haskellPackages; [ + # libraries + arrows async cgi criterion + # tools + cabal-install haskintex + ]); + }; +} +``` allows one to browse module documentation index [not too dissimilar to this](https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html) for all the specified packages and their dependencies by directing a browser of @@ -303,23 +318,24 @@ choice to `~/.nix-profiles/share/doc/hoogle/index.html` (or After you've marveled enough at that try adding the following to your `~/.ghc/ghci.conf` - - :def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\"" - :def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\"" - +``` +:def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\"" +:def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\"" +``` and test it by typing into `ghci`: - - :hoogle a -> a - :doc a -> a +``` +:hoogle a -> a +:doc a -> a +``` Be sure to note the links to `haddock` files in the output. With any modern and properly configured terminal emulator you can just click those links to navigate there. Finally, you can run - - hoogle server -p 8080 - +```shell +hoogle server -p 8080 +``` and navigate to http://localhost:8080/ for your own local [Hoogle](https://www.haskell.org/hoogle/). Note, however, that Firefox and possibly other browsers disallow navigation from `http:` to `file:` URIs for @@ -334,18 +350,20 @@ It has first-class support for Nix. Stack can optionally use Nix to automatically select the right version of GHC and other build tools to build, test and execute apps in an existing project downloaded from somewhere on the Internet. Pass the `--nix` flag to any `stack` command to do so, e.g. - - $ git clone --recursive http://github.com/yesodweb/wai - $ cd wai - $ stack --nix build +```shell +git clone --recursive http://github.com/yesodweb/wai +cd wai +stack --nix build +``` If you want `stack` to use Nix by default, you can add a `nix` section to the `stack.yaml` file, as explained in the [Stack documentation][stack-nix-doc]. For example: - - nix: - enable: true - packages: [pkgconfig zeromq zlib] +```yaml +nix: + enable: true + packages: [pkgconfig zeromq zlib] +``` The example configuration snippet above tells Stack to create an ad hoc environment for `nix-shell` as in the below section, in which the `pkgconfig`, @@ -356,10 +374,11 @@ Some projects have more sophisticated needs. For examples, some ad hoc environments might need to expose Nixpkgs packages compiled in a certain way, or with extra environment variables. In these cases, you'll need a `shell` field instead of `packages`: - - nix: - enable: true - shell-file: shell.nix +```yaml +nix: + enable: true + shell-file: shell.nix +``` For more on how to write a `shell.nix` file see the below section. You'll need to express a derivation. Note that Nixpkgs ships with a convenience wrapper @@ -368,32 +387,34 @@ create this derivation in exactly the way Stack expects. All of the same inputs as `mkDerivation` can be provided. For example, to build a Stack project that including packages that link against a version of the R library compiled with special options turned on: +```nix +with (import { }); - with (import { }); - - let R = pkgs.R.override { enableStrictBarrier = true; }; - in - haskell.lib.buildStackProject { - name = "HaskellR"; - buildInputs = [ R zeromq zlib ]; - } +let R = pkgs.R.override { enableStrictBarrier = true; }; +in +haskell.lib.buildStackProject { + name = "HaskellR"; + buildInputs = [ R zeromq zlib ]; +} +``` You can select a particular GHC version to compile with by setting the `ghc` attribute as an argument to `buildStackProject`. Better yet, let Stack choose what GHC version it wants based on the snapshot specified in `stack.yaml` (only works with Stack >= 1.1.3): +```nix +{nixpkgs ? import { }, ghc ? nixpkgs.ghc}: - {nixpkgs ? import { }, ghc ? nixpkgs.ghc}: +with nixpkgs; - with nixpkgs; - - let R = pkgs.R.override { enableStrictBarrier = true; }; - in - haskell.lib.buildStackProject { - name = "HaskellR"; - buildInputs = [ R zeromq zlib ]; - inherit ghc; - } +let R = pkgs.R.override { enableStrictBarrier = true; }; +in +haskell.lib.buildStackProject { + name = "HaskellR"; + buildInputs = [ R zeromq zlib ]; + inherit ghc; +} +``` [stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html @@ -401,24 +422,26 @@ in `stack.yaml` (only works with Stack >= 1.1.3): The easiest way to create an ad hoc development environment is to run `nix-shell` with the appropriate GHC environment given on the command-line: - - nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])" +```shell +nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])" +``` For more sophisticated use-cases, however, it's more convenient to save the desired configuration in a file called `shell.nix` that looks like this: - - { nixpkgs ? import {}, compiler ? "ghc7102" }: - let - inherit (nixpkgs) pkgs; - ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ - monad-par mtl - ]); - in - pkgs.stdenv.mkDerivation { - name = "my-haskell-env-0"; - buildInputs = [ ghc ]; - shellHook = "eval $(egrep ^export ${ghc}/bin/ghc)"; - } +```nix +{ nixpkgs ? import {}, compiler ? "ghc7102" }: +let + inherit (nixpkgs) pkgs; + ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ + monad-par mtl + ]); +in +pkgs.stdenv.mkDerivation { + name = "my-haskell-env-0"; + buildInputs = [ ghc ]; + shellHook = "eval $(egrep ^export ${ghc}/bin/ghc)"; +} +``` Now run `nix-shell` --- or even `nix-shell --pure` --- to enter a shell environment that has the appropriate compiler in `$PATH`. If you use `--pure`, @@ -434,13 +457,14 @@ already! Every Haskell package has an `env` attribute that provides a shell environment suitable for compiling that particular package. If you'd like to hack the `lens` library, for example, then you just have to check out the source code and enter the appropriate environment: +``` +$ cabal get lens-4.11 && cd lens-4.11 +Downloading lens-4.11... +Unpacking to lens-4.11/ - $ cabal get lens-4.11 && cd lens-4.11 - Downloading lens-4.11... - Unpacking to lens-4.11/ - - $ nix-shell "" -A haskellPackages.lens.env - [nix-shell:/tmp/lens-4.11]$ +$ nix-shell "" -A haskellPackages.lens.env +[nix-shell:/tmp/lens-4.11]$ +``` At point, you can run `cabal configure`, `cabal build`, and all the other development commands. Note that you need `cabal-install` installed in your @@ -459,18 +483,20 @@ convert those automatically into build instructions for Nix using the For example, let's assume that you're working on a private project called `foo`. To generate a Nix build expression for it, change into the project's top-level directory and run the command: - - $ cabal2nix . >foo.nix - +```shell +cabal2nix . > foo.nix +``` Then write the following snippet into a file called `default.nix`: - - { nixpkgs ? import {}, compiler ? "ghc7102" }: - nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } +```nix +{ nixpkgs ? import {}, compiler ? "ghc7102" }: +nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } +``` Finally, store the following code in a file called `shell.nix`: - - { nixpkgs ? import {}, compiler ? "ghc7102" }: - (import ./default.nix { inherit nixpkgs compiler; }).env +```nix +{ nixpkgs ? import {}, compiler ? "ghc7102" }: +(import ./default.nix { inherit nixpkgs compiler; }).env +``` At this point, you can run `nix-build` to have Nix compile your project and install it into a Nix store path. The local directory will contain a symlink @@ -486,9 +512,9 @@ libraries your package might need. If your package does not depend on any system-level libraries, then it's sufficient to run - - $ nix-shell --command "cabal configure" - +```shell +nix-shell --command "cabal configure" +``` once to set up your build. `cabal-install` determines the absolute paths to all resources required for the build and writes them into a config file in the `dist/` directory. Once that's done, you can run `cabal build` and any other @@ -502,14 +528,15 @@ If you want to do some quick-and-dirty hacking and don't want to bother setting up a `default.nix` and `shell.nix` file manually, then you can use the `--shell` flag offered by `cabal2nix` to have it generate a stand-alone `nix-shell` environment for you. With that feature, running - - $ cabal2nix --shell . >shell.nix - $ nix-shell --command "cabal configure" - +```shell +cabal2nix --shell . > shell.nix +nix-shell --command "cabal configure" +``` is usually enough to set up a build environment for any given Haskell package. You can even use that generated file to run `nix-build`, too: - - $ nix-build shell.nix +```shell +nix-build shell.nix +``` ### How to build projects that depend on each other @@ -518,33 +545,34 @@ you'll have to register those packages in the Nixpkgs set to make them visible for the dependency resolution performed by `callPackage`. First of all, change into each of your projects top-level directories and generate a `default.nix` file with `cabal2nix`: - - $ cd ~/src/foo && cabal2nix . >default.nix - $ cd ~/src/bar && cabal2nix . >default.nix - +```shell +cd ~/src/foo && cabal2nix . > default.nix +cd ~/src/bar && cabal2nix . > default.nix +``` Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the default Haskell package set: - - { - packageOverrides = super: let self = super.pkgs; in - { - haskellPackages = super.haskellPackages.override { - overrides = self: super: { - foo = self.callPackage ../src/foo {}; - bar = self.callPackage ../src/bar {}; - }; - }; - }; - } - +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskellPackages = super.haskellPackages.override { + overrides = self: super: { + foo = self.callPackage ../src/foo {}; + bar = self.callPackage ../src/bar {}; + }; + }; + }; +} +``` Once that's accomplished, `nix-env -f "" -qA haskellPackages` will show your packages like any other package from Hackage, and you can build them - - $ nix-build "" -A haskellPackages.foo - +```shell +nix-build "" -A haskellPackages.foo +``` or enter an interactive shell environment suitable for building them: - - $ nix-shell "" -A haskellPackages.bar.env +```shell +nix-shell "" -A haskellPackages.bar.env +``` ## Miscellaneous Topics @@ -555,20 +583,20 @@ to manipulate the package as much as you please. One useful application of this feature is to replace the default `mkDerivation` function with one that enables library profiling for all packages. To accomplish that, add configure the following snippet in your `~/.config/nixpkgs/config.nix` file: - - { - packageOverrides = super: let self = super.pkgs; in - { - profiledHaskellPackages = self.haskellPackages.override { - overrides = self: super: { - mkDerivation = args: super.mkDerivation (args // { - enableLibraryProfiling = true; - }); - }; - }; +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + profiledHaskellPackages = self.haskellPackages.override { + overrides = self: super: { + mkDerivation = args: super.mkDerivation (args // { + enableLibraryProfiling = true; + }); }; - } - + }; + }; +} +``` Then, replace instances of `haskellPackages` in the `cabal2nix`-generated `default.nix` or `shell.nix` files with `profiledHaskellPackages`. @@ -580,35 +608,39 @@ at the time of this writing. This is fine for users of GHC 7.10.x, but GHC 7.8.4 cannot compile that binary. Now, one way to solve that problem is to register an older version of `ghc-events` in the 7.8.x-specific package set. The first step is to generate Nix build instructions with `cabal2nix`: - - $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix - +```shell +cabal2nix cabal://ghc-events-0.4.3.0 > ~/.nixpkgs/ghc-events-0.4.3.0.nix +``` Then add the override in `~/.config/nixpkgs/config.nix`: - - { - packageOverrides = super: let self = super.pkgs; in - { - haskell = super.haskell // { - packages = super.haskell.packages // { - ghc784 = super.haskell.packages.ghc784.override { - overrides = self: super: { - ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; - }; - }; +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packages = super.haskell.packages // { + ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; }; }; }; - } + }; + }; +} +``` This code is a little crazy, no doubt, but it's necessary because the intuitive version +```nix +{ # ... - haskell.packages.ghc784 = super.haskell.packages.ghc784.override { - overrides = self: super: { - ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; - }; + haskell.packages.ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; }; - + }; +} +``` doesn't do what we want it to: that code replaces the `haskell` package set in Nixpkgs with one that contains only one entry,`packages`, which contains only one entry `ghc784`. This override loses the `haskell.compiler` set, and it @@ -618,16 +650,16 @@ iterating over each step in hierarchy. Once it's accomplished, however, we can install a variant of `ghc-events` that's compiled with GHC 7.8.4: - - nix-env -f "" -iA haskell.packages.ghc784.ghc-events - +```shell +nix-env -f "" -iA haskell.packages.ghc784.ghc-events +``` Unfortunately, it turns out that this build fails again while executing the test suite! Apparently, the release archive on Hackage is missing some data files that the test suite requires, so we cannot run it. We accomplish that by re-generating the Nix expression with the `--no-check` flag: - - $ cabal2nix --no-check cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix - +```shell +cabal2nix --no-check cabal://ghc-events-0.4.3.0 > ~/.nixpkgs/ghc-events-0.4.3.0.nix +``` Now the builds succeeds. Of course, in the concrete example of `ghc-events` this whole exercise is not @@ -642,91 +674,98 @@ older version might be useful. GHC and distributed build farms don't get along well: - https://ghc.haskell.org/trac/ghc/ticket/4012 + - https://ghc.haskell.org/trac/ghc/ticket/4012 When you see an error like this one - - package foo-0.7.1.0 is broken due to missing package - text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91 - +``` +package foo-0.7.1.0 is broken due to missing package +text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91 +``` then you have to download and re-install `foo` and all its dependents from scratch: - - # nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ - | xargs -L 1 nix-store --repair-path +```shell +nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ + | xargs -L 1 nix-store --repair-path +``` If you're using additional Hydra servers other than `hydra.nixos.org`, then it might be necessary to purge the local caches that store data from those machines to disable these binary channels for the duration of the previous command, i.e. by running: - - rm /nix/var/nix/binary-cache-v3.sqlite - rm /nix/var/nix/manifests/* - rm /nix/var/nix/channel-cache/* +```shell +rm /nix/var/nix/binary-cache-v3.sqlite +rm /nix/var/nix/manifests/* +rm /nix/var/nix/channel-cache/* +``` ### How to use the Haste Haskell-to-Javascript transpiler Open a shell with `haste-compiler` and `haste-cabal-install` (you don't actually need `node`, but it can be useful to test stuff): - - $ nix-shell -p "haskellPackages.ghcWithPackages (self: with self; [haste-cabal-install haste-compiler])" -p nodejs - +```shell +nix-shell \ + -p "haskellPackages.ghcWithPackages (self: with self; [haste-cabal-install haste-compiler])" \ + -p nodejs +``` You may not need the following step but if `haste-boot` fails to compile all the packages it needs, this might do the trick - - $ haste-cabal update - +```shell +haste-cabal update +``` `haste-boot` builds a set of core libraries so that they can be used from Javascript transpiled programs: - - $ haste-boot - +```shell +haste-boot +``` Transpile and run a "Hello world" program: - - $ echo 'module Main where main = putStrLn "Hello world"' > hello-world.hs - $ hastec --onexec hello-world.hs - $ node hello-world.js - Hello world +``` +$ echo 'module Main where main = putStrLn "Hello world"' > hello-world.hs +$ hastec --onexec hello-world.hs +$ node hello-world.js +Hello world +``` ### Builds on Darwin fail with `math.h` not found Users of GHC on Darwin have occasionally reported that builds fail, because the compiler complains about a missing include file: - - fatal error: 'math.h' file not found - +``` +fatal error: 'math.h' file not found +``` The issue has been discussed at length in [ticket 6390](https://github.com/NixOS/nixpkgs/issues/6390), and so far no good solution has been proposed. As a work-around, users who run into this problem can configure the environment variables - - export NIX_CFLAGS_COMPILE="-idirafter /usr/include" - export NIX_CFLAGS_LINK="-L/usr/lib" - +```shell +export NIX_CFLAGS_COMPILE="-idirafter /usr/include" +export NIX_CFLAGS_LINK="-L/usr/lib" +``` in their `~/.bashrc` file to avoid the compiler error. ### Builds using Stack complain about missing system libraries - -- While building package zlib-0.5.4.2 using: - runhaskell -package=Cabal-1.22.4.0 -clear-package-db [... lots of flags ...] - Process exited with code: ExitFailure 1 - Logs have been written to: /home/foo/src/stack-ide/.stack-work/logs/zlib-0.5.4.2.log +``` +-- While building package zlib-0.5.4.2 using: + runhaskell -package=Cabal-1.22.4.0 -clear-package-db [... lots of flags ...] +Process exited with code: ExitFailure 1 +Logs have been written to: /home/foo/src/stack-ide/.stack-work/logs/zlib-0.5.4.2.log - Configuring zlib-0.5.4.2... - Setup.hs: Missing dependency on a foreign library: - * Missing (or bad) header file: zlib.h - This problem can usually be solved by installing the system package that - provides this library (you may need the "-dev" version). If the library is - already installed but in a non-standard location then you can use the flags - --extra-include-dirs= and --extra-lib-dirs= to specify where it is. - If the header file does exist, it may contain errors that are caught by the C - compiler at the preprocessing stage. In this case you can re-run configure - with the verbosity flag -v3 to see the error messages. +Configuring zlib-0.5.4.2... +Setup.hs: Missing dependency on a foreign library: +* Missing (or bad) header file: zlib.h +This problem can usually be solved by installing the system package that +provides this library (you may need the "-dev" version). If the library is +already installed but in a non-standard location then you can use the flags +--extra-include-dirs= and --extra-lib-dirs= to specify where it is. +If the header file does exist, it may contain errors that are caught by the C +compiler at the preprocessing stage. In this case you can re-run configure +with the verbosity flag -v3 to see the error messages. +``` When you run the build inside of the nix-shell environment, the system -is configured to find libz.so without any special flags -- the compiler +is configured to find `libz.so` without any special flags -- the compiler and linker "just know" how to find it. Consequently, Cabal won't record -any search paths for libz.so in the package description, which means +any search paths for `libz.so` in the package description, which means that the package works fine inside of nix-shell, but once you leave the shell the shared object can no longer be found. That issue is by no means specific to Stack: you'll have that problem with any other @@ -735,63 +774,66 @@ environment. You can remedy this issue in several ways. The easiest is to add a `nix` section to the `stack.yaml` like the following: +```yaml +nix: + enable: true + packages: [ zlib ] +``` - nix: - enable: true - packages: [ zlib ] - -Stack's Nix support knows to add `${zlib.out}/lib` and `${zlib.dev}/include` as an -`--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you -can achieve the same effect by hand. First of all, run - - $ nix-build --no-out-link "" -A zlib - /nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8 - +Stack's Nix support knows to add `${zlib.out}/lib` and `${zlib.dev}/include` +as an `--extra-lib-dirs` and `extra-include-dirs`, respectively. +Alternatively, you can achieve the same effect by hand. First of all, run +``` +$ nix-build --no-out-link "" -A zlib +/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8 +``` to find out the store path of the system's zlib library. Now, you can -1) add that path (plus a "/lib" suffix) to your $LD_LIBRARY_PATH - environment variable to make sure your system linker finds libz.so - automatically. It's no pretty solution, but it will work. + 1. add that path (plus a "/lib" suffix) to your `$LD_LIBRARY_PATH` + environment variable to make sure your system linker finds `libz.so` + automatically. It's no pretty solution, but it will work. -2) As a variant of (1), you can also install any number of system - libraries into your user's profile (or some other profile) and point - $LD_LIBRARY_PATH to that profile instead, so that you don't have to - list dozens of those store paths all over the place. + 2. As a variant of (1), you can also install any number of system + libraries into your user's profile (or some other profile) and point + `$LD_LIBRARY_PATH` to that profile instead, so that you don't have to + list dozens of those store paths all over the place. -3) The solution I prefer is to call stack with an appropriate - --extra-lib-dirs flag like so: + 3. The solution I prefer is to call stack with an appropriate + --extra-lib-dirs flag like so: + ```shell + stack --extra-lib-dirs=/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8/lib build + ``` - $ stack --extra-lib-dirs=/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8/lib build + Typically, you'll need `--extra-include-dirs` as well. It's possible + to add those flag to the project's `stack.yaml` or your user's + global `~/.stack/global/stack.yaml` file so that you don't have to + specify them manually every time. But again, you're likely better off + using Stack's Nix support instead. - Typically, you'll need --extra-include-dirs as well. It's possible - to add those flag to the project's "stack.yaml" or your user's - global "~/.stack/global/stack.yaml" file so that you don't have to - specify them manually every time. But again, you're likely better off using - Stack's Nix support instead. - - The same thing applies to `cabal configure`, of course, if you're - building with `cabal-install` instead of Stack. + The same thing applies to `cabal configure`, of course, if you're + building with `cabal-install` instead of Stack. ### Creating statically linked binaries There are two levels of static linking. The first option is to configure the build with the Cabal flag `--disable-executable-dynamic`. In Nix expressions, this can be achieved by setting the attribute: - - enableSharedExecutables = false; - +``` +enableSharedExecutables = false; +``` That gives you a binary with statically linked Haskell libraries and dynamically linked system libraries. To link both Haskell libraries and system libraries statically, the additional flags `--ghc-option=-optl=-static --ghc-option=-optl=-pthread` need to be used. In Nix, this is accomplished with: +``` +configureFlags = [ "--ghc-option=-optl=-static" "--ghc-option=-optl=-pthread" ]; +``` - configureFlags = [ "--ghc-option=-optl=-static" "--ghc-option=-optl=-pthread" ]; - -It's important to realize, however, that most system libraries in Nix are built -as shared libraries only, i.e. there is just no static library available that -Cabal could link! +It's important to realize, however, that most system libraries in Nix are +built as shared libraries only, i.e. there is just no static library +available that Cabal could link! ### Building GHC with integer-simple @@ -801,7 +843,7 @@ The implementation can be found in the [integer-gmp](http://hackage.haskell.org/package/integer-gmp) package. A potential problem with this is that GMP is licensed under the -[​GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html), +[GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html), a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5, you may distribute a program that is designed to be compiled and dynamically linked with the library under the terms of your choice (i.e., commercially) but @@ -814,7 +856,7 @@ The LGPL licensing for GMP is a problem for the overall licensing of binary programs compiled with GHC because most distributions (and builds) of GHC use static libraries. (Dynamic libraries are currently distributed only for OS X.) The LGPL licensing situation may be worse: even though -​[The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license) +[The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license) is essentially a "free software" license (BSD3), according to paragraph 2 of the LGPL, GHC must be distributed under the terms of the LGPL! @@ -823,61 +865,61 @@ alternative implemention for Integer called [integer-simple](http://hackage.haskell.org/package/integer-simple). To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use -the attribute: `pkgs.haskell.compiler.integer-simple."${ghcVersion}"`. +the attribute: `haskell.compiler.integer-simple."${ghcVersion}"`. For example: - - $ nix-build -E '(import {}).pkgs.haskell.compiler.integer-simple.ghc802' - ... - $ result/bin/ghc-pkg list | grep integer - integer-simple-0.1.1.1 - +``` +$ nix-build -E '(import {}).haskell.compiler.integer-simple.ghc802' +... +$ result/bin/ghc-pkg list | grep integer + integer-simple-0.1.1.1 +``` The following command displays the complete list of GHC compilers build with `integer-simple`: - - $ nix-env -f "" -qaP -A haskell.compiler.integer-simple - haskell.compiler.integer-simple.ghc7102 ghc-7.10.2 - haskell.compiler.integer-simple.ghc7103 ghc-7.10.3 - haskell.compiler.integer-simple.ghc722 ghc-7.2.2 - haskell.compiler.integer-simple.ghc742 ghc-7.4.2 - haskell.compiler.integer-simple.ghc763 ghc-7.6.3 - haskell.compiler.integer-simple.ghc783 ghc-7.8.3 - haskell.compiler.integer-simple.ghc784 ghc-7.8.4 - haskell.compiler.integer-simple.ghc801 ghc-8.0.1 - haskell.compiler.integer-simple.ghc802 ghc-8.0.2 - haskell.compiler.integer-simple.ghcHEAD ghc-8.1.20170106 +``` +$ nix-env -f "" -qaP -A haskell.compiler.integer-simple +haskell.compiler.integer-simple.ghc7102 ghc-7.10.2 +haskell.compiler.integer-simple.ghc7103 ghc-7.10.3 +haskell.compiler.integer-simple.ghc722 ghc-7.2.2 +haskell.compiler.integer-simple.ghc742 ghc-7.4.2 +haskell.compiler.integer-simple.ghc783 ghc-7.8.3 +haskell.compiler.integer-simple.ghc784 ghc-7.8.4 +haskell.compiler.integer-simple.ghc801 ghc-8.0.1 +haskell.compiler.integer-simple.ghc802 ghc-8.0.2 +haskell.compiler.integer-simple.ghcHEAD ghc-8.1.20170106 +``` To get a package set supporting `integer-simple` use the attribute: -`pkgs.haskell.packages.integer-simple."${ghcVersion}"`. For example +`haskell.packages.integer-simple."${ghcVersion}"`. For example use the following to get the `scientific` package build with `integer-simple`: - - $ nix-build -A pkgs.haskell.packages.integer-simple.ghc802.scientific - +```shell +nix-build -A haskell.packages.integer-simple.ghc802.scientific +``` ## Other resources -- The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE) - provides an introduction into Haskell NG aimed at beginners. The slides are - available at http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form - ready for cut & paste -- at - https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md. + - The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE) + provides an introduction into Haskell NG aimed at beginners. The slides are + available at http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form + ready for cut & paste -- at + https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md. -- Another Youtube video is [Escaping Cabal Hell with Nix](https://www.youtube.com/watch?v=mQd3s57n_2Y), - which discusses the subject of Haskell development with Nix but also provides - a basic introduction to Nix as well, i.e. it's suitable for viewers with - almost no prior Nix experience. + - Another Youtube video is [Escaping Cabal Hell with Nix](https://www.youtube.com/watch?v=mQd3s57n_2Y), + which discusses the subject of Haskell development with Nix but also provides + a basic introduction to Nix as well, i.e. it's suitable for viewers with + almost no prior Nix experience. -- Oliver Charles wrote a very nice [Tutorial how to develop Haskell packages with Nix](http://wiki.ocharles.org.uk/Nix). + - Oliver Charles wrote a very nice [Tutorial how to develop Haskell packages with Nix](http://wiki.ocharles.org.uk/Nix). -- The *Journey into the Haskell NG infrastructure* series of postings - describe the new Haskell infrastructure in great detail: + - 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) - explains the differences between the old and the new code and gives - instructions how to migrate to the new setup. + - [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) - looks in-depth at how to tweak and configure your setup by means of - overrides. + - [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) - describes the infrastructure that keeps the Haskell package set in Nixpkgs - up-to-date. + - [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/index.xml b/doc/languages-frameworks/index.xml index 32a89860ec84..fc15d847d15f 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -27,6 +27,7 @@ such as Perl or Haskell. These are described in this chapter. + diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 87b5668740d1..3c9df2e6e821 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -3,7 +3,7 @@ ## User Guide Several versions of Python are available on Nix as well as a high amount of -packages. The default interpreter is CPython 3.5. +packages. The default interpreter is CPython 2.7. ### Using Python @@ -131,7 +131,7 @@ specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap The output of the function is a derivation, which is an attribute with the name `toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions, -so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`. +so e.g. `python27Packages`, `python35Packages` and `pypyPackages`. The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, @@ -422,8 +422,8 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters -Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively -`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter +Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as +respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and `python35`. The default interpreter, `python`, maps to `python2`. The Nix expressions for the interpreters can be found in @@ -472,6 +472,7 @@ sets are * `pkgs.python33Packages` * `pkgs.python34Packages` * `pkgs.python35Packages` +* `pkgs.python36Packages` * `pkgs.pypyPackages` and the aliases @@ -579,7 +580,7 @@ running `nix-shell` with the following `shell.nix` with import {}; (python3.buildEnv.override { - extraLibs = with python3Packages; [ numpy requests2 ]; + extraLibs = with python3Packages; [ numpy requests ]; }).env ``` @@ -621,12 +622,15 @@ attribute. The `shell.nix` file from the previous section can thus be also writt ```nix with import {}; -(python33.withPackages (ps: [ps.numpy ps.requests2])).env +(python33.withPackages (ps: [ps.numpy ps.requests])).env ``` In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`. +Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` +should be used with `ignoreCollisions = true`. + ### Development mode Development or editable mode is supported. To develop Python packages @@ -674,8 +678,8 @@ deterministic bytecode. This has security implications and is relevant for those using Python in a `nix-shell`. When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1. -The `buildPythonPackage` function sets `DETERMINISTIC_BUILD` as well as -[PYTHONHASHSEED](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). +The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and +[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. @@ -706,7 +710,7 @@ nix-env -if build.nix ``` Now you can use the Python interpreter, as well as the extra packages that you added to the environment. -#### Environment defined in `~/.nixpkgs/config.nix` +#### Environment defined in `~/.config/nixpkgs/config.nix` If you prefer to, you could also add the environment as a package override to the Nixpkgs set. ```nix @@ -897,6 +901,49 @@ is executed it will attempt to download the python modules listed in requirements.txt. However these will be cached locally within the `virtualenv` folder and not downloaded again. +### How to override a Python package from `configuration.nix`? + +If you need to change a package's attribute(s) from `configuration.nix` you could do: + +```nix + nixpkgs.config.packageOverrides = superP: { + pythonPackages = superP.pythonPackages.override { + overrides = self: super: { + bepasty-server = super.bepasty-server.overrideAttrs ( oldAttrs: { + src = pkgs.fetchgit { + url = "https://github.com/bepasty/bepasty-server"; + sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps"; + rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d"; + }; + }); + }; + }; + }; +``` + +If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). + +### How to override a Python package using overlays? + +To alter a python package using overlays, you would use the following approach: + +```nix +self: super: +rec { + python = super.python.override { + packageOverrides = python-self: python-super: { + bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: { + src = self.pkgs.fetchgit { + url = "https://github.com/bepasty/bepasty-server"; + sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps"; + rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d"; + }; + }); + }; + }; + pythonPackages = python.pkgs; +} +``` ## Contributing diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index b6c8f0e899e6..1dbbb5341ba3 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -2,31 +2,55 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-language-qt"> -Qt and KDE +Qt -Qt is a comprehensive desktop and mobile application development toolkit for C++. Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, but older versions are typically retained to support packages that may not be compatible with the latest version. When packaging applications and libraries for Nixpkgs, it is important to ensure that compatible versions of Qt 5 are used throughout; this consideration motivates the tools described below. + +Qt is a comprehensive desktop and mobile application development toolkit for C++. +Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. +The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, +but older versions are typically retained until their support window ends. +The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5; +this consideration motivates most of the tools described below. + -
Libraries +
Packaging Libraries for Nixpkgs -Libraries that depend on Qt 5 should be built with each available version to avoid linking a dependent package against incompatible versions of Qt 5. (Although Qt 5 maintains backward ABI compatibility, linking against multiple versions at once is generally not possible; at best it will lead to runtime faults.) Packages that provide libraries should be added to the top-level function mkLibsForQt5, which is used to build a set of libraries for every Qt 5 version. The callPackage provided in this scope will ensure that only one Qt version will be used throughout the dependency tree. Dependencies should be imported unqualified, i.e. qtbase not qt5.qtbase, so that callPackage can do its work. Do not import a package set such as qt5 or libsForQt5 into your package; although it may work fine in the moment, it could well break at the next Qt update. + +Whenever possible, libraries that use Qt 5 should be built with each available version. +Packages providing libraries should be added to the top-level function mkLibsForQt5, +which is used to build a set of libraries for every Qt 5 version. +A special callPackage function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version. +Import dependencies unqualified, i.e., qtbase not qt5.qtbase. +Do not import a package set such as qt5 or libsForQt5. + -If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its meta.broken attribute. A package may be marked broken for certain versions by testing the qtbase.version attribute, which will always give the current Qt 5 version. + +If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its meta.broken attribute. +A package may be marked broken for certain versions by testing the qtbase.version attribute, which will always give the current Qt 5 version. +
-
Applications +
Packaging Applications for Nixpkgs -Applications generally do not need to be built with every Qt version because they do not provide any libraries for dependent packages to link against. The primary consideration is merely ensuring that the application itself and its dependencies are linked against only one version of Qt. To call your application expression, use libsForQt5.callPackage instead of callPackage. Dependencies should be imported unqualified, i.e. qtbase not qt5.qtbase. Do not import a package set such as qt5 or libsForQt5 into your package; although it may work fine in the moment, it could well break at the next Qt update. + +Call your application expression using libsForQt5.callPackage instead of callPackage. +Import dependencies unqualified, i.e., qtbase not qt5.qtbase. +Do not import a package set such as qt5 or libsForQt5. + -It is generally best to build an application package against the libsForQt5 library set. In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. libsForQt55 for Qt 5.5, if that is the latest version the package supports. + +Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the libsForQt5 library set. +In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. libsForQt55 for Qt 5.5, if that is the latest version the package supports. +If a package must be pinned to an older Qt version, be sure to file a bug upstream; +because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application. + -Qt-based applications require that several paths be set at runtime. This is accomplished by wrapping the provided executables in a package with wrapQtProgram or makeQtWrapper during the postFixup phase. To use the wrapper generators, add makeQtWrapper to nativeBuildInputs. The wrapper generators support the same options as wrapProgram and makeWrapper respectively. It is usually only necessary to generate wrappers for programs intended to be invoked by the user. - -
- -
KDE - -The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based library does not require any steps beyond those described above for general Qt-based libraries. Frameworks-based applications should not use makeQtWrapper; instead, use kdeWrapper to create the necessary wrappers: kdeWrapper { unwrapped = expr; targets = exes; }, where expr is the un-wrapped package expression and exes is a list of strings giving the relative paths to programs in the package which should be wrapped. + +When testing applications in Nixpkgs, it is a common practice to build the package with nix-build and run it using the created symbolic link. +This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed. +To test a Qt application, install it with nix-env or run it inside nix-shell. +
diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index b52361212f3a..b13da92dcc41 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -16,8 +16,7 @@ $ cd sensu $ cat > Gemfile source 'https://rubygems.org' gem 'sensu' -$ nix-shell -p bundler --command "bundler package --path /tmp/vendor/bundle" -$ $(nix-build '' -A bundix)/bin/bundix +$ $(nix-build '' -A bundix)/bin/bundix --magic $ cat > default.nix { lib, bundlerEnv, ruby }: @@ -47,7 +46,7 @@ bundlerEnv rec { so it has all the libraries necessary for sensu in its paths. The second one can be used to make derivations from custom Ruby scripts which have Gemfiles with their dependencies specified. It is a derivation with ruby wrapped so it can find all the needed dependencies. For example, to make a derivation my-script for a my-script.rb (which should be placed in bin) you should -run bundix as specified above and then use bundlerEnv lile this: +run bundix as specified above and then use bundlerEnv like this: Installing a split package When installing a package via systemPackages or nix-env you have several options: - Currently nix-env almost always installs all outputs until https://github.com/NixOS/nix/pull/815 gets merged. You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The outputs attribute contains a list of output names. You can let it use the default outputs. These are handled by meta.outputsToInstall attribute that contains a list of output names. diff --git a/doc/overlays.xml b/doc/overlays.xml index 540c83e0a39b..f8f554bb5569 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -34,7 +34,7 @@ first one present is considered, and all the rest are ignored: - In the directory ~/.nixpkgs/overlays/. + In the directory ~/.config/nixpkgs/overlays/. @@ -50,7 +50,7 @@ the same recipe. In the case where overlays are loaded from a directory, they ar alphabetical order. To install an overlay using the last option, you can clone the overlay's repository and add -a symbolic link to it in ~/.nixpkgs/overlays/ directory. +a symbolic link to it in ~/.config/nixpkgs/overlays/ directory.
@@ -78,7 +78,7 @@ self: super: The first argument, usually named self, corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of rr in the example above come -from self, as well as the overriden dependencies used in the +from self, as well as the overridden dependencies used in the boost override. The second argument, usually named super, diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0f148f5c898a..33a61f31938c 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -516,4 +516,140 @@ to your configuration, rebuild, and run the game with
+
+ +Emacs + +
+ +Configuring Emacs + + + The Emacs package comes with some extra helpers to make it easier to + configure. emacsWithPackages allows you to manage + packages from ELPA. This means that you will not have to install + that packages from within Emacs. For instance, if you wanted to use + company, counsel, + flycheck, ivy, + magit, projectile, and + use-package you could use this as a + ~/.config/nixpkgs/config.nix override: + + + +{ + packageOverrides = pkgs: with pkgs; { + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + } +} + + + + You can install it like any other packages via nix-env -iA + myEmacs. However, this will only install those packages. + It will not configure them for us. To do this, we + need to provide a configuration file. Luckily, it is possible to do + this from within Nix! By modifying the above example, we can make + Emacs load a custom config file. The key is to create a package that + provide a default.el file in + /share/emacs/site-start/. Emacs knows to load + this file automatically when it starts. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myEmacsConfig = writeText "default.el" '' +;; initialize package + +(require 'package) +(package-initialize 'noactivate) +(eval-when-compile + (require 'use-package)) + +;; load some packages + +(use-package company + :bind ("<C-tab>" . company-complete) + :diminish company-mode + :commands (company-mode global-company-mode) + :defer 1 + :config + (global-company-mode)) + +(use-package counsel + :commands (counsel-descbinds) + :bind (([remap execute-extended-command] . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ("C-x l" . counsel-locate) + ("M-y" . counsel-yank-pop))) + +(use-package flycheck + :defer 2 + :config (global-flycheck-mode)) + +(use-package ivy + :defer 1 + :bind (("C-c C-r" . ivy-resume) + ("C-x C-b" . ivy-switch-buffer) + :map ivy-minibuffer-map + ("C-j" . ivy-call)) + :diminish ivy-mode + :commands ivy-mode + :config + (ivy-mode 1)) + +(use-package magit + :defer + :if (executable-find "git") + :bind (("C-x g" . magit-status) + ("C-x G" . magit-dispatch-popup)) + :init + (setq magit-completing-read-function 'ivy-completing-read)) + +(use-package projectile + :commands projectile-mode + :bind-keymap ("C-c p" . projectile-command-map) + :defer 5 + :config + (projectile-global-mode)) + ''; + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + (runCommand "default.el" {} '' +mkdir -p $out/share/emacs/site-lisp +cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el +'') + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + }; +} + + + + This provides a fairly full Emacs start file. It will load in + addition to the user's presonal config. You can always disable it by + passing -q to the Emacs command. + + +
+ +
+ diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 5ed959abacec..ca86e6c9519b 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/reviewing-contributions.xml b/doc/reviewing-contributions.xml index f86928bcd5d0..0813e0968e86 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -18,7 +18,7 @@ The high change rate of nixpkgs make any pull request that is open for long enough subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being - responsive to the comments is the key to avoid these. Github provides sort + responsive to the comments is the key to avoid these. GitHub provides sort filters that can be used to see the most recently and the namePhase. The former is convenient to override a phase from the derivation, while the -latter is convenient from a build script. +latter is convenient from a build script. + +However, typically one only wants to add some +commands to a phase, e.g. by defining postInstall +or preFixup, as skipping some of the default actions +may have unexpected consequences. +
Controlling @@ -634,6 +640,16 @@ script) if it exists.</para> true.</para></listitem> </varlistentry> + <varlistentry> + <term><varname>configurePlatforms</varname></term> + <listitem><para> + By default, when cross compiling, the configure script has <option>--build=...</option> and <option>--host=...</option> passed. + Packages can instead pass <literal>[ "build" "host" "target" ]</literal> 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. + </para></listitem> + </varlistentry> + <varlistentry> <term><varname>preConfigure</varname></term> <listitem><para>Hook executed at the start of the configure @@ -1156,7 +1172,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello <term><option>--replace</option> <replaceable>s1</replaceable> <replaceable>s2</replaceable></term> - <listitem><para>Replace every occurence of the string + <listitem><para>Replace every occurrence of the string <replaceable>s1</replaceable> by <replaceable>s2</replaceable>.</para></listitem> </varlistentry> @@ -1164,7 +1180,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello <varlistentry> <term><option>--subst-var</option> <replaceable>varName</replaceable></term> - <listitem><para>Replace every occurence of + <listitem><para>Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the contents of the environment variable <replaceable>varName</replaceable>. This is useful for @@ -1177,7 +1193,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello <term><option>--subst-var-by</option> <replaceable>varName</replaceable> <replaceable>s</replaceable></term> - <listitem><para>Replace every occurence of + <listitem><para>Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the string <replaceable>s</replaceable>.</para></listitem> </varlistentry> @@ -1225,7 +1241,7 @@ substitute ./foo.in ./foo.out \ <term><function>substituteAll</function> <replaceable>infile</replaceable> <replaceable>outfile</replaceable></term> - <listitem><para>Replaces every occurence of + <listitem><para>Replaces every occurrence of <literal>@<replaceable>varName</replaceable>@</literal>, where <replaceable>varName</replaceable> is any environment variable, in <replaceable>infile</replaceable>, writing the result to @@ -1528,7 +1544,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': depends on such a format string, it will need to be worked around. </para> - <para>Addtionally, some warnings are enabled which might trigger build + <para>Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set <option>NIX_CFLAGS_COMPILE</option> to <option>-Wno-error=warning-type</option>.</para> @@ -1558,7 +1574,7 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro <term><varname>pic</varname></term> <listitem> <para>Adds the <option>-fPIC</option> compiler options. This options adds - support for position independant code in shared libraries and thus making + support for position independent code in shared libraries and thus making ASLR possible.</para> <para>Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't diff --git a/lib/attrsets.nix b/lib/attrsets.nix index c1bd764c70dc..d2946f6ca9cb 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1,12 +1,12 @@ # Operations on attribute sets. -with { +let inherit (builtins) head tail length; - inherit (import ./trivial.nix) or; + inherit (import ./trivial.nix) and or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; inherit (import ./lists.nix) concatMap concatLists all deepSeqList; -}; +in rec { inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; @@ -116,7 +116,7 @@ rec { listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set)); - /* Filter an attribute set recursivelly by removing all attributes for + /* Filter an attribute set recursively by removing all attributes for which the given predicate return false. Example: @@ -334,7 +334,7 @@ rec { value = f name (catAttrs name sets); }) names); - /* Implentation note: Common names appear multiple times in the list of + /* Implementation note: Common names appear multiple times in the list of names, hopefully this does not affect the system because the maximal laziness avoid computing twice the same expression and listToAttrs does not care about duplicated attribute names. @@ -353,7 +353,7 @@ rec { zipAttrs = zipAttrsWith (name: values: values); /* Does the same as the update operator '//' except that attributes are - merged until the given pedicate is verified. The predicate should + merged until the given predicate is verified. The predicate should accept 3 arguments which are the path to reach the attribute, a part of the first attribute set and a part of the second attribute set. When the predicate is verified, the value of the first attribute set is @@ -417,18 +417,15 @@ rec { /* Returns true if the pattern is contained in the set. False otherwise. - FIXME(zimbatm): this example doesn't work !!! - Example: - sys = mkSystem { } - matchAttrs { cpu = { bits = 64; }; } sys + matchAttrs { cpu = {}; } { cpu = { bits = 64; }; } => true */ - matchAttrs = pattern: attrs: - fold or false (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: + matchAttrs = pattern: attrs: assert isAttrs pattern; + fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: let pat = head values; val = head (tail values); in if length values == 1 then false - else if isAttrs pat then isAttrs val && matchAttrs head values + else if isAttrs pat then isAttrs val && matchAttrs pat val else pat == val ) [pattern attrs])); diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix index e3e017d982d3..5e55ac023f14 100644 --- a/lib/composable-derivation.nix +++ b/lib/composable-derivation.nix @@ -1,4 +1,4 @@ -{lib, pkgs} : +{lib, pkgs}: let inherit (lib) nv nvs; in { @@ -19,7 +19,7 @@ let inherit (lib) nv nvs; in # * vim_configurable # # A minimal example illustrating most features would look like this: - # let base = composableDerivation { (fixed : let inherit (fixed.fixed) name in { + # let base = composableDerivation { (fixed: let inherit (fixed.fixed) name in { # src = fetchurl { # } # buildInputs = [A]; @@ -39,7 +39,7 @@ let inherit (lib) nv nvs; in # # issues: # * its complicated to understand - # * some "features" such as exact merge behaviour are burried in mergeAttrBy + # * some "features" such as exact merge behaviour are buried in mergeAttrBy # and defaultOverridableDelayableArgs assuming the default behaviour does # the right thing in the common case # * Eelco once said using such fix style functions are slow to evaluate @@ -48,7 +48,7 @@ let inherit (lib) nv nvs; in # / add patches the way you want without having to declare function arguments # # nice features: - # declaring "optional featuers" is modular. For instance: + # declaring "optional features" is modular. For instance: # flags.curl = { # configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"]; # buildInputs = [curl openssl]; @@ -79,7 +79,7 @@ let inherit (lib) nv nvs; in # consider adding addtional elements by derivation.merge { removeAttrs = ["elem"]; }; removeAttrs ? ["cfg" "flags"] - }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a) + }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a) { inherit applyPreTidy removeAttrs; }).merge; diff --git a/lib/customisation.nix b/lib/customisation.nix index a6c24f083a5b..98a46ca6c616 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -10,7 +10,7 @@ rec { /* `overrideDerivation drv f' takes a derivation (i.e., the result of a call to the builtin function `derivation') and returns a new - derivation in which the attributes of the original are overriden + derivation in which the attributes of the original are overridden according to the function `f'. The function `f' is called with the original derivation attributes. @@ -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 + "<pkg>.overrideDerivation" to learn about `overrideDerivation` and caveats + related to its use. + */ makeOverridable = f: origArgs: let ff = f origArgs; @@ -167,7 +185,7 @@ rec { /* Make a set of packages with a common scope. All packages called with the provided `callPackage' will be evaluated with the same arguments. Any package in the set may depend on any other. The - `override' function allows subsequent modification of the package + `overrideScope' function allows subsequent modification of the package set in a consistent way, i.e. all packages in the set will be called with the overridden packages. The package sets may be hierarchical: the packages in the set are called with the scope @@ -177,7 +195,7 @@ rec { let self = f self // { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; - override = g: + overrideScope = g: makeScope newScope (self_: let super = f self_; in super // g super self_); packages = f; diff --git a/lib/debug.nix b/lib/debug.nix index e2e895ab6202..925e0d405a79 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -20,14 +20,38 @@ 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; + traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; - attrNamesToStr = a : lib.concatStringsSep "; " (map (x : "${x}=") (attrNames a)); - showVal = x : + attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)); + showVal = x: if isAttrs x then if x ? outPath then "x is a derivation, name ${if x ? name then x.name else "<no name>"}, { ${attrNamesToStr x} }" else "x is attr set { ${attrNamesToStr x} }" @@ -43,9 +67,9 @@ rec { # trace the arguments passed to function and its result # maybe rewrite these functions in a traceCallXml like style. Then one function is enough - traceCall = n : f : a : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); - traceCall2 = n : f : a : b : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); - traceCall3 = n : f : a : b : c : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); + traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); + traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); + traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); # FIXME: rename this? traceValIfNot = c: x: @@ -71,7 +95,7 @@ rec { # create a test assuming that list elements are true # usage: { testX = allTrue [ true ]; } - testAllTrue = expr : { inherit expr; expected = map (x: true) expr; }; + testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; strict = v: trace "Warning: strict is deprecated and will be removed in the next release" diff --git a/lib/default.nix b/lib/default.nix index 09a64f754d8f..3893e349db36 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,7 +1,13 @@ +/* Library of low-level helper functions for nix expressions. + * + * Please implement (mostly) exhaustive unit tests + * for new functions in `./tests.nix'. + */ let - # trivial, often used functions + # often used, or depending on very little trivial = import ./trivial.nix; + fixedPoints = import ./fixed-points.nix; # datatypes attrsets = import ./attrsets.nix; @@ -22,8 +28,7 @@ let # constants licenses = import ./licenses.nix; - platforms = import ./platforms.nix; - systems = import ./systems.nix; + systems = import ./systems; # misc debug = import ./debug.nix; @@ -38,17 +43,20 @@ let filesystem = import ./filesystem.nix; in - { inherit trivial + { inherit trivial fixedPoints attrsets lists strings stringsWithDeps customisation maintainers meta sources modules options types - licenses platforms systems + licenses systems debug generators misc sandbox fetchers filesystem; + + # back-compat aliases + platforms = systems.doubles; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. - // trivial // lists // strings // stringsWithDeps // attrsets // sources + // trivial // fixedPoints + // lists // strings // stringsWithDeps // attrsets // sources // options // types // meta // debug // misc // modules - // systems // customisation diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 3729197f48bc..d4e78c39250c 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -16,23 +16,23 @@ rec { defaultMergeArg = x : y: if builtins.isAttrs y then y - else + else (y x); defaultMerge = x: y: x // (defaultMergeArg x y); - foldArgs = merger: f: init: x: - let arg=(merger init (defaultMergeArg init x)); - # now add the function with composed args already applied to the final attrs - base = (setAttrMerge "passthru" {} (f arg) - ( z : z // rec { - function = foldArgs merger f arg; - args = (lib.attrByPath ["passthru" "args"] {} z) // x; + foldArgs = merger: f: init: x: + let arg = (merger init (defaultMergeArg init x)); + # now add the function with composed args already applied to the final attrs + base = (setAttrMerge "passthru" {} (f arg) + ( z: z // rec { + function = foldArgs merger f arg; + args = (lib.attrByPath ["passthru" "args"] {} z) // x; } )); - withStdOverrides = base // { - override = base.passthru.function; - } ; + withStdOverrides = base // { + override = base.passthru.function; + }; in - withStdOverrides; - + withStdOverrides; + # predecessors: proposed replacement for applyAndFun (which has a bug cause it merges twice) # the naming "overridableDelayableArgs" tries to express that you can @@ -49,35 +49,35 @@ rec { # # examples: see test cases "res" below; overridableDelayableArgs = - f : # the function applied to the arguments - initial : # you pass attrs, the functions below are passing a function taking the fix argument + f: # the function applied to the arguments + initial: # you pass attrs, the functions below are passing a function taking the fix argument let takeFixed = if isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument - tidy = args : + tidy = args: let # apply all functions given in "applyPreTidy" in sequence - applyPreTidyFun = fold ( n : a : x : n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); + applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); in removeAttrs (applyPreTidyFun args) ( ["applyPreTidy"] ++ (maybeAttr "removeAttrs" [] args) ); # tidy up args before applying them - fun = n : x : - let newArgs = fixed : - let args = takeFixed fixed; - mergeFun = args.${n}; - in if isAttrs x then (mergeFun args x) - else assert isFunction x; - mergeFun args (x ( args // { inherit fixed; })); - in overridableDelayableArgs f newArgs; + fun = n: x: + let newArgs = fixed: + let args = takeFixed fixed; + mergeFun = args.${n}; + in if isAttrs x then (mergeFun args x) + else assert isFunction x; + mergeFun args (x ( args // { inherit fixed; })); + in overridableDelayableArgs f newArgs; in (f (tidy (lib.fix takeFixed))) // { merge = fun "mergeFun"; replace = fun "keepFun"; }; - defaultOverridableDelayableArgs = f : + defaultOverridableDelayableArgs = f: let defaults = { mergeFun = mergeAttrByFunc; # default merge function. merge strategie (concatenate lists, strings) is given by mergeAttrBy - keepFun = a : b : { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values + keepFun = a: b: { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values applyPreTidy = []; # list of functions applied to args before args are tidied up (usage case : prepareDerivationArgs) mergeAttrBy = mergeAttrBy // { - applyPreTidy = a : b : a ++ b; - removeAttrs = a : b: a ++ b; + applyPreTidy = a: b: a ++ b; + removeAttrs = a: b: a ++ b; }; removeAttrs = ["mergeFun" "keepFun" "mergeAttrBy" "removeAttrs" "fixed" ]; # before applying the arguments to the function make sure these names are gone }; @@ -86,7 +86,7 @@ rec { # rec { # an example of how composedArgsAndFun can be used - # a = composedArgsAndFun (x : x) { a = ["2"]; meta = { d = "bar";}; }; + # a = composedArgsAndFun (x: x) { a = ["2"]; meta = { d = "bar";}; }; # # meta.d will be lost ! It's your task to preserve it (eg using a merge function) # b = a.passthru.function { a = [ "3" ]; meta = { d2 = "bar2";}; }; # # instead of passing/ overriding values you can use a merge function: @@ -119,7 +119,7 @@ rec { else if val == true || val == false then false else null; - + # Return true only if there is an attribute and it is true. checkFlag = attrSet: name: if name == "true" then true else @@ -134,29 +134,29 @@ rec { ( attrByPath [name] (if checkFlag attrSet name then true else if argList == [] then null else let x = builtins.head argList; in - if (head x) == name then + if (head x) == name then (head (tail x)) - else (getValue attrSet + else (getValue attrSet (tail argList) name)) attrSet ); - + # Input : attrSet, [[name default] ...], [ [flagname reqs..] ... ] # Output : are reqs satisfied? It's asserted. - checkReqs = attrSet : argList : condList : + checkReqs = attrSet: argList: condList: ( - fold lib.and true - (map (x: let name = (head x) ; in - - ((checkFlag attrSet name) -> + fold lib.and true + (map (x: let name = (head x); in + + ((checkFlag attrSet name) -> (fold lib.and true (map (y: let val=(getValue attrSet argList y); in - (val!=null) && (val!=false)) - (tail x))))) condList)) ; - + (val!=null) && (val!=false)) + (tail x))))) condList)); + # This function has O(n^2) performance. - uniqList = {inputList, acc ? []} : - let go = xs : acc : + uniqList = { inputList, acc ? [] }: + let go = xs: acc: if xs == [] then [] else let x = head xs; @@ -164,26 +164,26 @@ rec { in y ++ go (tail xs) (y ++ acc); in go inputList acc; - uniqListExt = {inputList, outputList ? [], - getter ? (x : x), compare ? (x: y: x==y)}: + uniqListExt = { inputList, + outputList ? [], + getter ? (x: x), + compare ? (x: y: x==y) }: if inputList == [] then outputList else - let x=head inputList; - isX = y: (compare (getter y) (getter x)); - newOutputList = outputList ++ - (if any isX outputList then [] else [x]); - in uniqListExt {outputList=newOutputList; - inputList = (tail inputList); - inherit getter compare; - }; + let x = head inputList; + isX = y: (compare (getter y) (getter x)); + newOutputList = outputList ++ + (if any isX outputList then [] else [x]); + in uniqListExt { outputList = newOutputList; + inputList = (tail inputList); + inherit getter compare; + }; - - condConcat = name: list: checker: if list == [] then name else - if checker (head list) then - condConcat - (name + (head (tail list))) - (tail (tail list)) + if checker (head list) then + condConcat + (name + (head (tail list))) + (tail (tail list)) checker else condConcat name (tail (tail list)) checker; @@ -202,12 +202,12 @@ rec { in work startSet [] []; - innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else + innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else innerModifySumArgs f x (a // b); modifySumArgs = f: x: innerModifySumArgs f x {}; - innerClosePropagation = acc : xs : + innerClosePropagation = acc: xs: if xs == [] then acc else let y = head xs; @@ -227,45 +227,45 @@ rec { closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); # calls a function (f attr value ) for each record item. returns a list - mapAttrsFlatten = f : r : map (attr: f attr r.${attr}) (attrNames r); + mapAttrsFlatten = f: r: map (attr: f attr r.${attr}) (attrNames r); # attribute set containing one attribute - nvs = name : value : listToAttrs [ (nameValuePair name value) ]; + nvs = name: value: listToAttrs [ (nameValuePair name value) ]; # adds / replaces an attribute of an attribute set - setAttr = set : name : v : set // (nvs name v); + setAttr = set: name: v: set // (nvs name v); # setAttrMerge (similar to mergeAttrsWithFunc but only merges the values of a particular name) - # setAttrMerge "a" [] { a = [2];} (x : x ++ [3]) -> { a = [2 3]; } - # setAttrMerge "a" [] { } (x : x ++ [3]) -> { a = [ 3]; } - setAttrMerge = name : default : attrs : f : + # setAttrMerge "a" [] { a = [2];} (x: x ++ [3]) -> { a = [2 3]; } + # setAttrMerge "a" [] { } (x: x ++ [3]) -> { a = [ 3]; } + setAttrMerge = name: default: attrs: f: setAttr attrs name (f (maybeAttr name default attrs)); - # Using f = a : b = b the result is similar to // + # Using f = a: b = b the result is similar to // # merge attributes with custom function handling the case that the attribute # exists in both sets - mergeAttrsWithFunc = f : set1 : set2 : - fold (n: set : if set ? ${n} + mergeAttrsWithFunc = f: set1: set2: + fold (n: set: if set ? ${n} then setAttr set n (f set.${n} set2.${n}) else set ) (set2 // set1) (attrNames set2); # merging two attribute set concatenating the values of same attribute names # eg { a = 7; } { a = [ 2 3 ]; } becomes { a = [ 7 2 3 ]; } - mergeAttrsConcatenateValues = mergeAttrsWithFunc ( a : b : (toList a) ++ (toList b) ); + mergeAttrsConcatenateValues = mergeAttrsWithFunc ( a: b: (toList a) ++ (toList b) ); - # merges attributes using //, if a name exisits in both attributes + # merges attributes using //, if a name exists in both attributes # an error will be triggered unless its listed in mergeLists # so you can mergeAttrsNoOverride { buildInputs = [a]; } { buildInputs = [a]; } {} to get # { buildInputs = [a b]; } - # merging buildPhase does'nt really make sense. The cases will be rare where appending /prefixing will fit your needs? + # merging buildPhase doesn't really make sense. The cases will be rare where appending /prefixing will fit your needs? # in these cases the first buildPhase will override the second one # ! deprecated, use mergeAttrByFunc instead mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"], overrideSnd ? [ "buildPhase" ] - } : attrs1 : attrs2 : - fold (n: set : + }: attrs1: attrs2: + fold (n: set: setAttr set n ( if set ? ${n} - then # merge + then # merge if elem n mergeLists # attribute contains list, merge them by concatenating then attrs2.${n} ++ attrs1.${n} else if elem n overrideSnd @@ -286,14 +286,14 @@ rec { # { mergeAttrsBy = [...]; buildInputs = [ a b c d ]; } # is used by prepareDerivationArgs, defaultOverridableDelayableArgs and can be used when composing using # foldArgs, composedArgsAndFun or applyAndFun. Example: composableDerivation in all-packages.nix - mergeAttrByFunc = x : y : + mergeAttrByFunc = x: y: let - mergeAttrBy2 = { mergeAttrBy=lib.mergeAttrs; } + mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; } // (maybeAttr "mergeAttrBy" {} x) // (maybeAttr "mergeAttrBy" {} y); in fold lib.mergeAttrs {} [ x y - (mapAttrs ( a : v : # merge special names using given functions + (mapAttrs ( a: v: # merge special names using given functions if x ? ${a} then if y ? ${a} then v x.${a} y.${a} # both have attr, use merge func @@ -313,9 +313,9 @@ rec { # # This function is best explained by an example: # - # {version ? "2.x"} : + # {version ? "2.x"}: # - # mkDerivation (mergeAttrsByVersion "package-name" version + # mkDerivation (mergeAttrsByVersion "package-name" version # { # version specific settings # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; }; # "2.x" = { src = ..; }; @@ -346,21 +346,24 @@ rec { # See misc.nix -> versionedDerivation # discussion: nixpkgs: pull/310 mergeAttrsByVersion = name: version: attrsByVersion: base: - mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } base (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)]; + mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } + base + (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion) + ]; # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } - listToAttrs (map (n : nameValuePair n lib.concat) + listToAttrs (map (n: nameValuePair n lib.concat) [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" "patches" ]) - // listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) - // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) + // listToAttrs (map (n: nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) + // listToAttrs (map (n: nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) ; # prepareDerivationArgs tries to make writing configurable derivations easier # example: # prepareDerivationArgs { # mergeAttrBy = { - # myScript = x : y : x ++ "\n" ++ y; + # myScript = x: y: x ++ "\n" ++ y; # }; # cfg = { # readlineSupport = true; @@ -392,10 +395,10 @@ rec { # TODO use args.mergeFun here as well? prepareDerivationArgs = args: let args2 = { cfg = {}; flags = {}; } // args; - flagName = name : "${name}Support"; - cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags))) + flagName = name: "${name}Support"; + cfgWithDefaults = (listToAttrs (map (n: nameValuePair (flagName n) false) (attrNames args2.flags))) // args2.cfg; - opts = attrValues (mapAttrs (a : v : + opts = attrValues (mapAttrs (a: v: let v2 = if v ? set || v ? unset then v else { set = v; }; n = if cfgWithDefaults.${flagName a} then "set" else "unset"; attr = maybeAttr n {} v2; in @@ -420,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/fetchers.nix b/lib/fetchers.nix index 19d89d6c4074..21f28c32ef7e 100644 --- a/lib/fetchers.nix +++ b/lib/fetchers.nix @@ -1,4 +1,4 @@ -# snippets that can be shared by mutliple fetchers (pkgs/build-support) +# snippets that can be shared by multiple fetchers (pkgs/build-support) { proxyImpureEnvVars = [ diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 91b04d81c13b..3925beb21347 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -1,4 +1,22 @@ -{ # locateDominatingFile : RegExp +{ # haskellPathsInDir : Path -> Map String Path + # A map of all haskell packages defined in the given path, + # identified by having a cabal file with the same name as the + # directory itself. + haskellPathsInDir = root: + let # Files in the root + root-files = builtins.attrNames (builtins.readDir root); + # Files with their full paths + root-files-with-paths = + map (file: + { name = file; value = root + "/${file}"; } + ) root-files; + # Subdirectories of the root with a cabal file. + cabal-subdirs = + builtins.filter ({ name, value }: + builtins.pathExists (value + "/${name}.cabal") + ) root-files-with-paths; + in builtins.listToAttrs cabal-subdirs; + # locateDominatingFile : RegExp # -> Path # -> Nullable { path : Path; # matches : [ MatchResults ]; diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix new file mode 100644 index 000000000000..a11b5a6f4bdc --- /dev/null +++ b/lib/fixed-points.nix @@ -0,0 +1,78 @@ +rec { + # Compute the fixed point of the given function `f`, which is usually an + # attribute set that expects its final, non-recursive representation as an + # argument: + # + # f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } + # + # Nix evaluates this recursion until all references to `self` have been + # resolved. At that point, the final result is returned and `f x = x` holds: + # + # nix-repl> fix f + # { bar = "bar"; foo = "foo"; foobar = "foobar"; } + # + # Type: fix :: (a -> a) -> a + # + # See https://en.wikipedia.org/wiki/Fixed-point_combinator for further + # details. + fix = f: let x = f x; in x; + + # A variant of `fix` that records the original recursive attribute set in the + # result. This is useful in combination with the `extends` function to + # implement deep overriding. See pkgs/development/haskell-modules/default.nix + # for a concrete example. + fix' = f: let x = f x // { __unfix__ = f; }; in x; + + # Modify the contents of an explicitly recursive attribute set in a way that + # honors `self`-references. This is accomplished with a function + # + # g = self: super: { foo = super.foo + " + "; } + # + # that has access to the unmodified input (`super`) as well as the final + # non-recursive representation of the attribute set (`self`). `extends` + # differs from the native `//` operator insofar as that it's applied *before* + # references to `self` are resolved: + # + # nix-repl> fix (extends g f) + # { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; } + # + # The name of the function is inspired by object-oriented inheritance, i.e. + # think of it as an infix operator `g extends f` that mimics the syntax from + # Java. It may seem counter-intuitive to have the "base class" as the second + # argument, but it's nice this way if several uses of `extends` are cascaded. + extends = f: rattrs: self: let super = rattrs self; in super // f self super; + + # Compose two extending functions of the type expected by 'extends' + # into one where changes made in the first are available in the + # 'super' of the second + composeExtensions = + f: g: self: super: + let fApplied = f self super; + super' = super // fApplied; + in fApplied // g self super'; + + # Create an overridable, recursive attribute set. For example: + # + # nix-repl> obj = makeExtensible (self: { }) + # + # nix-repl> obj + # { __unfix__ = «lambda»; extend = «lambda»; } + # + # nix-repl> obj = obj.extend (self: super: { foo = "foo"; }) + # + # nix-repl> obj + # { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; } + # + # nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; }) + # + # nix-repl> obj + # { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; } + makeExtensible = makeExtensibleWithCustomName "extend"; + + # Same as `makeExtensible` but the name of the extending attribute is + # customized. + makeExtensibleWithCustomName = extenderName: rattrs: + fix' rattrs // { + ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); + }; +} diff --git a/lib/generators.nix b/lib/generators.nix index 4d3c920b0ae3..4419c3c88917 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/licenses.nix b/lib/licenses.nix index 4d4a3c1a9544..8dd1c210b7fa 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -45,6 +45,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Apple Public Source License 2.0"; }; + arphicpl = { + fullName = "Arphic Public License"; + url = https://www.freedesktop.org/wiki/Arphic_Public_License/; + }; + artistic1 = spdx { spdxId = "Artistic-1.0"; fullName = "Artistic License 1.0"; @@ -357,6 +362,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Lucent Public License v1.02"; }; + miros = { + fullname = "MirOS License"; + url = https://opensource.org/licenses/MirOS; + }; + # spdx.org does not (yet) differentiate between the X11 and Expat versions # for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions mit = spdx { @@ -526,6 +536,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Do What The F*ck You Want To Public License"; }; + wxWindows = spdx { + spdxId = "WXwindows"; + fullName = "wxWindows Library Licence, Version 3.1"; + }; + zlib = spdx { spdxId = "Zlib"; fullName = "zlib License"; diff --git a/lib/lists.nix b/lib/lists.nix index 5e224921de81..6a8fd8a18408 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -16,17 +16,22 @@ rec { */ singleton = x: [x]; - /* "Fold" a binary function `op' between successive elements of - `list' with `nul' as the starting value, i.e., `fold op nul [x_1 - x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is - Haskell's foldr). + /* “right fold” a binary function `op' between successive elements of + `list' with `nul' as the starting value, i.e., + `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. + Type: + foldr :: (a -> b -> b) -> b -> [a] -> b Example: - concat = fold (a: b: a + b) "z" + concat = foldr (a: b: a + b) "z" concat [ "a" "b" "c" ] => "abcz" + # different types + strange = foldr (int: str: toString (int + 1) + str) "a" + strange [ 1 2 3 4 ] + => "2345a" */ - fold = op: nul: list: + foldr = op: nul: list: let len = length list; fold' = n: @@ -35,13 +40,25 @@ rec { else op (elemAt list n) (fold' (n + 1)); in fold' 0; - /* Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul - x_1) x_2) ... x_n)'. + /* `fold' is an alias of `foldr' for historic reasons */ + # FIXME(Profpatsch): deprecate? + fold = foldr; + + + /* “left fold”, like `foldr', but from the left: + `foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`. + + Type: + foldl :: (b -> a -> b) -> b -> [a] -> b Example: lconcat = foldl (a: b: a + b) "z" lconcat [ "a" "b" "c" ] => "zabc" + # different types + lstrange = foldl (str: int: str + toString (int + 1)) "" + strange [ 1 2 3 4 ] + => "a2345" */ foldl = op: nul: list: let @@ -52,7 +69,7 @@ rec { else op (foldl' (n - 1)) (elemAt list n); in foldl' (length list - 1); - /* Strict version of foldl. + /* Strict version of `foldl'. The difference is that evaluation is forced upon access. Usually used with small whole results (in contract with lazily-generated list or large @@ -60,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. @@ -140,7 +163,7 @@ rec { any isString [ 1 { } ] => false */ - any = builtins.any or (pred: fold (x: y: if pred x then true else y) false); + any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false); /* Return true iff function `pred' returns true for all elements of `list'. @@ -151,7 +174,7 @@ rec { all (x: x < 3) [ 1 2 3 ] => false */ - all = builtins.all or (pred: fold (x: y: if pred x then y else false) true); + all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true); /* Count how many times function `pred' returns true for the elements of `list'. @@ -174,7 +197,7 @@ rec { */ optional = cond: elem: if cond then [elem] else []; - /* Return a list or an empty list, dependening on a boolean value. + /* Return a list or an empty list, depending on a boolean value. Example: optionals true [ 2 3 ] @@ -219,7 +242,7 @@ rec { => { right = [ 5 3 4 ]; wrong = [ 1 2 ]; } */ partition = builtins.partition or (pred: - fold (h: t: + foldr (h: t: if pred h then { right = [h] ++ t.right; wrong = t.wrong; } else { right = t.right; wrong = [h] ++ t.wrong; } @@ -454,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 dd257a495023..e10136bf070e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -14,7 +14,9 @@ aboseley = "Adam Boseley <adam.boseley@gmail.com>"; abuibrahim = "Ruslan Babayev <ruslan@babayev.com>"; acowley = "Anthony Cowley <acowley@gmail.com>"; + adelbertc = "Adelbert Chang <adelbertc@gmail.com>"; adev = "Adrien Devresse <adev@adev.name>"; + adisbladis = "Adam Hose <adis@blad.is>"; Adjective-Object = "Maxwell Huang-Hobbs <mhuan13@gmail.com>"; adnelson = "Allen Nelson <ithinkican@gmail.com>"; adolfogc = "Adolfo E. García Castro <adolfo.garcia.cr@gmail.com>"; @@ -24,6 +26,7 @@ aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>"; aherrmann = "Andreas Herrmann <andreash87@gmx.ch>"; + ahmedtd = "Taahir Ahmed <ahmed.taahir@gmail.com>"; ak = "Alexander Kjeldaas <ak@formalprivacy.com>"; akaWolf = "Artjom Vejsel <akawolf0@gmail.com>"; akc = "Anders Claesson <akc@akc.is>"; @@ -40,7 +43,9 @@ andrewrk = "Andrew Kelley <superjoe30@gmail.com>"; andsild = "Anders Sildnes <andsild@gmail.com>"; aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>"; + ankhers = "Justin Wood <justin.k.wood@gmail.com>"; antono = "Antono Vasiljev <self@antono.info>"; + apeschar = "Albert Peschar <albert@peschar.net>"; apeyroux = "Alexandre Peyroux <alex@px.io>"; ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>"; aristid = "Aristid Breitkreuz <aristidb@gmail.com>"; @@ -58,8 +63,9 @@ bachp = "Pascal Bach <pascal.bach@nextrem.ch>"; badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>"; balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>"; + barrucadu = "Michael Walker <mike@barrucadu.co.uk>"; + basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>"; Baughn = "Svein Ove Aas <sveina@gmail.com>"; - bbenoist = "Baptist BENOIST <return_0@live.com>"; bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>"; bcdarwin = "Ben Darwin <bcdarwin@gmail.com>"; bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>"; @@ -68,9 +74,11 @@ benwbooth = "Ben Booth <benwbooth@gmail.com>"; berdario = "Dario Bertini <berdario@gmail.com>"; bergey = "Daniel Bergey <bergey@teallabs.org>"; + bhipple = "Benjamin Hipple <bhipple@protonmail.com>"; bjg = "Brian Gough <bjg@gnu.org>"; bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>"; bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>"; + bobakker = "Bo Bakker <bobakk3r@gmail.com>"; bobvanderlinden = "Bob van der Linden <bobvanderlinden@gmail.com>"; bodil = "Bodil Stokke <nix@bodil.org>"; boothead = "Ben Ford <ben@perurbis.com>"; @@ -81,6 +89,7 @@ bzizou = "Bruno Bzeznik <Bruno@bzizou.net>"; c0dehero = "CodeHero <codehero@nerdpol.ch>"; calrama = "Moritz Maxeiner <moritz@ucworks.org>"; + calvertvl = "Victor Calvert <calvertvl@gmail.com>"; campadrenalin = "Philip Horger <campadrenalin@gmail.com>"; canndrew = "Andrew Cann <shum@canndrew.org>"; carlsverre = "Carl Sverre <accounts@carlsverre.com>"; @@ -93,6 +102,7 @@ chris-martin = "Chris Martin <ch.martin@gmail.com>"; chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>"; christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>"; + ciil = "Simon Lackerbauer <simon@lackerbauer.com>"; ckampka = "Christian Kampka <christian@kampka.net>"; cko = "Christine Koppelt <christine.koppelt@gmail.com>"; cleverca22 = "Michael Bishop <cleverca22@gmail.com>"; @@ -102,6 +112,7 @@ codsl = "codsl <codsl@riseup.net>"; codyopel = "Cody Opel <codyopel@gmail.com>"; colemickens = "Cole Mickens <cole.mickens@gmail.com>"; + colescott = "Cole Scott <colescottsf@gmail.com>"; copumpkin = "Dan Peebles <pumpkingod@gmail.com>"; corngood = "David McFarland <corngood@gmail.com>"; coroa = "Jonas Hörsch <jonas@chaoflow.net>"; @@ -125,6 +136,7 @@ deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>"; demin-dmitriy = "Dmitriy Demin <demindf@gmail.com>"; DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>"; + dermetfan = "Robin Stumm <serverkorken@gmail.com>"; DerTim1 = "Tim Digel <tim.digel@active-group.de>"; desiderius = "Didier J. Devroye <didier@devroye.name>"; devhell = "devhell <\"^\"@regexmail.net>"; @@ -132,18 +144,24 @@ dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>"; dgonyeo = "Derek Gonyeo <derek@gonyeo.com>"; dipinhora = "Dipin Hora <dipinhora+github@gmail.com>"; + disassembler = "Samuel Leathers <disasm@gmail.com>"; dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>"; + DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>"; dmjio = "David Johnson <djohnson.m@gmail.com>"; dochang = "Desmond O. Chang <dochang@gmail.com>"; domenkozar = "Domen Kozar <domen@dev.si>"; + dotlambda = "Robert Schütz <rschuetz17@gmail.com>"; doublec = "Chris Double <chris.double@double.co.nz>"; dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>"; drets = "Dmytro Rets <dmitryrets@gmail.com>"; drewkett = "Andrew Burkett <burkett.andrew@gmail.com>"; + dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>"; dtzWill = "Will Dietz <nix@wdtz.org>"; + dywedir = "Vladyslav M. <dywedir@protonmail.ch>"; e-user = "Alexander Kahl <nixos@sodosopa.io>"; ebzzry = "Rommel Martinez <ebzzry@gmail.com>"; edanaher = "Evan Danaher <nixos@edanaher.net>"; + edef = "edef <edef@edef.eu>"; ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>"; eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>"; edwtjo = "Edward Tjörnhammar <ed@cflags.cc>"; @@ -151,10 +169,13 @@ ehegnes = "Eric Hegnes <eric.hegnes@gmail.com>"; ehmry = "Emery Hemingway <emery@vfemail.net>"; eikek = "Eike Kettner <eike.kettner@posteo.de>"; + ekleog = "Leo Gaspard <leo@gaspard.io>"; elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>"; eleanor = "Dejan Lukan <dejan@proteansec.com>"; + elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>"; elitak = "Eric Litak <elitak@gmail.com>"; ellis = "Ellis Whitehead <nixos@ellisw.net>"; + eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>"; epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>"; ericbmerritt = "Eric Merritt <eric@afiniate.com>"; ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>"; @@ -165,7 +186,9 @@ exlevan = "Alexey Levan <exlevan@gmail.com>"; expipiplus1 = "Joe Hermaszewski <nix@monoid.al>"; fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>"; + fare = "Francois-Rene Rideau <fahree@gmail.com>"; falsifian = "James Cook <james.cook@utoronto.ca>"; + florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>"; flosse = "Markus Kohlhase <mail@markus-kohlhase.de>"; fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>"; fmthoma = "Franz Thoma <f.m.thoma@googlemail.com>"; @@ -179,12 +202,14 @@ ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>"; funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>"; fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>"; + fuzzy-id = "Thomas Bach <hacking+nixos@babibo.de>"; fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>"; gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>"; garbas = "Rok Garbas <rok@garbas.si>"; garrison = "Jim Garrison <jim@garrison.cc>"; gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gebner = "Gabriel Ebner <gebner@gebner.org>"; + georgewhewell = "George Whewell <georgerw@gmail.com>"; gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>"; @@ -195,6 +220,7 @@ goodrone = "Andrew Trachenko <goodrone@gmail.com>"; gpyh = "Yacine Hmito <yacine.hmito@gmail.com>"; grahamc = "Graham Christensen <graham@grahamc.com>"; + grburst = "Julius Elias <grburst@openmailbox.org>"; gridaphobe = "Eric Seidel <eric@seidel.io>"; guibert = "David Guibert <david.guibert@gmail.com>"; guillaumekoenig = "Guillaume Koenig <guillaume.edward.koenig@gmail.com>"; @@ -203,39 +229,54 @@ havvy = "Ryan Scheel <ryan.havvy@gmail.com>"; hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>"; hce = "Hans-Christian Esperer <hc@hcesperer.org>"; + hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>"; + heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>"; henrytill = "Henry Till <henrytill@gmail.com>"; + hhm = "hhm <heehooman+nixpkgs@gmail.com>"; hinton = "Tom Hinton <t@larkery.com>"; + hodapp = "Chris Hodapp <hodapp87@gmail.com>"; hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>"; + htr = "Hugo Tavares Reis <hugo@linux.com>"; iand675 = "Ian Duncan <ian@iankduncan.com>"; ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; igsha = "Igor Sharonov <igor.sharonov@gmail.com>"; ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>"; + infinisil = "Silvan Mosberger <infinisil@icloud.com"; ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; + jammerful = "jammerful <jammerful@gmail.com>"; + jansol = "Jan Solanti <jan.solanti@paivola.fi>"; javaguirre = "Javier Aguirre <contacto@javaguirre.net>"; jb55 = "William Casarin <bill@casarin.me>"; jbedo = "Justin Bedő <cu@cua0.org>"; jcumming = "Jack Cummings <jack@mudshark.org>"; jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>"; jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>"; + jensbin = "Jens Binkert <jensbin@protonmail.com>"; jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>"; jfb = "James Felix Black <james@yamtime.com>"; + jfrankenau = "Johannes Frankenau <johannes@frankenau.net>"; jgeerds = "Jascha Geerds <jascha@jgeerds.name>"; jgertm = "Tim Jaeger <jger.tm@gmail.com>"; jgillich = "Jakob Gillich <jakob@gillich.me>"; jhhuh = "Ji-Haeng Huh <jhhuh.note@gmail.com>"; jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>"; + jlesquembre = "José Luis Lafuente <jl@lafuente.me>"; + jluttine = "Jaakko Luttinen <jaakko.luttinen@iki.fi>"; joachifm = "Joachim Fasting <joachifm@fastmail.fm>"; joamaki = "Jussi Maki <joamaki@gmail.com>"; joelmo = "Joel Moberg <joel.moberg@gmail.com>"; joelteon = "Joel Taylor <me@joelt.io>"; johbo = "Johannes Bornhold <johannes@bornhold.name>"; + johnramsden = "John Ramsden <johnramsden@riseup.net>"; joko = "Ioannis Koutras <ioannis.koutras@gmail.com>"; jonafato = "Jon Banafato <jon@jonafato.com>"; jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>"; jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>"; + jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>"; jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>"; + jtojnar = "Jan Tojnar <jtojnar@gmail.com>"; juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>"; jwiegley = "John Wiegley <johnw@newartisans.com>"; jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>"; @@ -243,6 +284,7 @@ kaiha = "Kai Harries <kai.harries@gmail.com>"; kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>"; kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>"; + kentjames = "James Kent <jameschristopherkent@gmail.com"; kevincox = "Kevin Cox <kevincox@kevincox.ca>"; khumba = "Bryan Gardiner <bog@khumba.net>"; KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>"; @@ -276,9 +318,12 @@ lsix = "Lancelot SIX <lsix@lancelotsix.com>"; lucas8 = "Luc Chabassier <luc.linux@mailoo.org>"; ludo = "Ludovic Courtès <ludo@gnu.org>"; + lufia = "Kyohei Kadota <lufia@lufia.org>"; luispedro = "Luis Pedro Coelho <luis@luispedro.org>"; lukego = "Luke Gorrie <luke@snabb.co>"; lw = "Sergey Sofeychuk <lw@fmap.me>"; + lyt = "Tim Liou <wheatdoge@gmail.com>"; + m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>"; ma27 = "Maximilian Bosch <maximilian@mbosch.me>"; madjar = "Georges Dubus <georges.dubus@compiletoi.net>"; magnetophon = "Bart Brouns <bart@magnetophon.nl>"; @@ -311,7 +356,9 @@ michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; michalrus = "Michal Rus <m@michalrus.com>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; + midchildan = "midchildan <midchildan+nix@gmail.com>"; mikefaille = "Michaël Faille <michael@faille.io>"; + miltador = "Vasiliy Solovey <miltador@yandex.ua>"; mimadrid = "Miguel Madrid <mimadrid@ucm.es>"; mingchuan = "Ming Chuan <ming@culpring.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; @@ -332,6 +379,7 @@ msackman = "Matthew Sackman <matthew@wellquite.org>"; mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; msteen = "Matthijs Steen <emailmatthijs@gmail.com>"; + mt-caret = "Masayuki Takeda <mtakeda.enigsol@gmail.com>"; mtreskin = "Max Treskin <zerthurd@gmail.com>"; mudri = "James Wood <lamudri@gmail.com>"; muflax = "Stefan Dorn <mail@muflax.com>"; @@ -340,10 +388,12 @@ nand0p = "Fernando Jose Pando <nando@hex7.com>"; Nate-Devv = "Nathan Moore <natedevv@gmail.com>"; nathan-gs = "Nathan Bijnens <nathan@nathan.gs>"; - nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>"; + nckx = "Tobias Geerinckx-Rice <github@tobias.gr>"; ndowens = "Nathan Owens <ndowens04@gmail.com>"; + neeasade = "Nathan Isom <nathanisom27@gmail.com>"; nequissimus = "Tim Steinbach <tim@nequissimus.com>"; nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>"; + nh2 = "Niklas Hambüchen <mail@nh2.me>"; nhooyr = "Anmol Sethi <anmol@aubble.com>"; nickhu = "Nick Hu <me@nickhu.co.uk>"; nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>"; @@ -363,6 +413,7 @@ okasu = "Okasu <oka.sux@gmail.com>"; olcai = "Erik Timan <dev@timan.info>"; olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>"; + olynch = "Owen Lynch <owen@olynch.me>"; orbekk = "KJ Ørbekk <kjetil.orbekk@gmail.com>"; orbitz = "Malcolm Matalka <mmatalka@gmail.com>"; orivej = "Orivej Desh <orivej@gmx.fr>"; @@ -372,9 +423,12 @@ paholg = "Paho Lurie-Gregg <paho@paholg.com>"; pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>"; palo = "Ingolf Wanger <palipalo9@googlemail.com>"; + panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com"; paperdigits = "Mica Semrick <mica@silentumbrella.com>"; pashev = "Igor Pashev <pashev.igor@gmail.com>"; + patternspandemic = "Brad Christensen <patternspandemic@live.com>"; pawelpacana = "Paweł Pacana <pawel.pacana@gmail.com>"; + pbogdan = "Piotr Bogdan <ppbogdan@gmail.com>"; periklis = "theopompos@gmail.com"; pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>"; peterhoeg = "Peter Hoeg <peter@hoeg.com>"; @@ -391,6 +445,7 @@ pjones = "Peter Jones <pjones@devalot.com>"; pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>"; plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>"; + plumps = "Maksim Bronsky <maks.bronsky@web.de"; pmahoney = "Patrick Mahoney <pat@polycrystal.org>"; pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>"; polyrod = "Maurizio Di Pietro <dc1mdp@gmail.com>"; @@ -420,43 +475,51 @@ relrod = "Ricky Elrod <ricky@elrod.me>"; renzo = "Renzo Carbonara <renzocarbonara@gmail.com>"; retrry = "Tadas Barzdžius <retrry@gmail.com>"; + rht = "rht <rhtbot@protonmail.com>"; rick68 = "Wei-Ming Yang <rick68@gmail.com>"; rickynils = "Rickard Nilsson <rickynils@gmail.com>"; + ris = "Robert Scott <code@humanleg.org.uk>"; rlupton20 = "Richard Lupton <richard.lupton@gmail.com>"; rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>"; rob = "Rob Vermaas <rob.vermaas@gmail.com>"; robberer = "Longrin Wischnewski <robberer@freakmail.de>"; robbinch = "Robbin C. <robbinch33@gmail.com>"; + roberth = "Robert Hensing <nixpkgs@roberthensing.nl>"; robgssp = "Rob Glossop <robgssp@gmail.com>"; roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>"; roconnor = "Russell O'Connor <roconnor@theorem.ca>"; romildo = "José Romildo Malaquias <malaquias@gmail.com>"; rongcuid = "Rongcui Dong <rongcuid@outlook.com>"; - ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>"; - rszibele = "Richard Szibele <richard_szibele@hotmail.com>"; + rszibele = "Richard Szibele <richard@szibele.com>"; rtreffer = "Rene Treffer <treffer+nixos@measite.de>"; rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>"; rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>"; rvlander = "Gaëtan André <rvlander@gaetanandre.eu>"; + rvolosatovs = "Roman Volosatovs <rvolosatovs@riseup.net"; ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>"; ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>"; ryantm = "Ryan Mulligan <ryan@ryantm.com>"; rycee = "Robert Helgesson <robert@rycee.net>"; ryneeverett = "Ryne Everett <ryneeverett@gmail.com>"; + rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>"; s1lvester = "Markus Silvester <s1lvester@bockhacker.me>"; samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; + sargon = "Daniel Ehlers <danielehlers@mindeye.net>"; schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>"; schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>"; schristo = "Scott Christopher <schristopher@konputa.com>"; scolobb = "Sergiu Ivanov <sivanov@colimite.fr>"; sepi = "Raffael Mancini <raffael@mancini.lu>"; seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>"; + shanemikel = "Shane Pearlman <shanemikel1@gmail.com>"; + shawndellysse = "Shawn Dellysse <sdellysse@gmail.com>"; sheenobu = "Sheena Artrip <sheena.artrip@gmail.com>"; sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>"; shell = "Shell Turner <cam.turn@gmail.com>"; shlevy = "Shea Levy <shea@shealevy.com>"; siddharthist = "Langston Barrett <langston.barrett@gmail.com>"; + sigma = "Yann Hodique <yann.hodique@gmail.com>"; simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>"; sjagoe = "Simon Jagoe <simon@simonjagoe.com>"; sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>"; @@ -465,6 +528,7 @@ skrzyp = "Jakub Skrzypnik <jot.skrzyp@gmail.com>"; sleexyz = "Sean Lee <freshdried@gmail.com>"; smironov = "Sergey Mironov <grrwlf@gmail.com>"; + snyh = "Xia Bin <snyh@snyh.org>"; solson = "Scott Olson <scott@solson.me>"; spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>"; spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>"; @@ -477,7 +541,9 @@ sternenseemann = "Lukas Epple <post@lukasepple.de>"; stesie = "Stefan Siegl <stesie@brokenpipe.de>"; steveej = "Stefan Junker <mail@stefanjunker.de>"; + SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>"; swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>"; + swflint = "Samuel W. Flint <swflint@flintfam.org>"; swistak35 = "Rafał Łasocha <me@swistak35.com>"; szczyp = "Szczyp <qb@szczyp.com>"; sztupi = "Attila Sztupak <attila.sztupak@gmail.com>"; @@ -485,6 +551,8 @@ tailhook = "Paul Colomiets <paul@colomiets.name>"; takikawa = "Asumu Takikawa <asumu@igalia.com>"; taktoa = "Remy Goldschmidt <taktoa@gmail.com>"; + taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>"; + tari = "Peter Marheine <peter@taricorp.net>"; tavyc = "Octavian Cerna <octavian.cerna@gmail.com>"; teh = "Tom Hunger <tehunger@gmail.com>"; telotortium = "Robert Irelan <rirelan@gmail.com>"; @@ -498,17 +566,22 @@ tohl = "Tomas Hlavaty <tom@logand.com>"; tokudan = "Daniel Frank <git@danielfrank.net>"; tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; + tomsmeets = "Tom Smeets <tom@tsmeets.nl>"; travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>"; + trevorj = "Trevor Joynson <nix@trevor.joynson.io>"; trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>"; tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>"; ttuegel = "Thomas Tuegel <ttuegel@mailbox.org>"; tv = "Tomislav Viljetić <tv@shackspace.de>"; tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>"; tvorog = "Marsel Zaripov <marszaripov@gmail.com>"; + tweber = "Thorsten Weber <tw+nixpkgs@360vier.de>"; twey = "James ‘Twey’ Kay <twey@twey.co.uk>"; uralbash = "Svintsov Dmitry <root@uralbash.ru>"; - urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; + utdemir = "Utku Demir <me@utdemir.com>"; + #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012 uwap = "uwap <me@uwap.name>"; + vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>"; vanzef = "Ivan Solyankin <vanzef@gmail.com>"; vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>"; @@ -522,10 +595,13 @@ vklquevs = "vklquevs <vklquevs@gmail.com>"; vlstill = "Vladimír Štill <xstill@fi.muni.cz>"; vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>"; + vmchale = "Vanessa McHale <tmchale@wisc.edu>"; + valeriangalliat = "Valérian Galliat <val@codejam.info>"; volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>"; volth = "Jaroslavas Pocepko <jaroslavas@volth.com>"; vozz = "Oliver Hunt <oliver.huntuk@gmail.com>"; vrthra = "Rahul Gopinath <rahul@gopinath.org>"; + vyp = "vyp <elisp.vim@gmail.com>"; wedens = "wedens <kirill.wedens@gmail.com>"; willtim = "Tim Philip Williams <tim.williams.public@gmail.com>"; winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; @@ -537,17 +613,22 @@ wscott = "Wayne Scott <wsc9tt@gmail.com>"; wyvie = "Elijah Rum <elijahrum@gmail.com>"; xnwdd = "Guillermo NWDD <nwdd+nixos@no.team>"; + xvapx = "Marti Serra <marti.serra.coscollano@gmail.com>"; xwvvvvwx = "David Terry <davidterry@posteo.de>"; yarr = "Dmitry V. <savraz@gmail.com>"; yochai = "Yochai <yochai@titat.info>"; yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>"; + yuriaisaka = "Yuri Aisaka <yuri.aisaka+nix@gmail.com>"; yurrriq = "Eric Bailey <eric@ericb.me>"; z77z = "Marco Maggesi <maggesi@math.unifi.it>"; zagy = "Christian Zagrodnick <cz@flyingcircus.io>"; + zalakain = "Unai Zalakain <contact@unaizalakain.info>"; + zarelit = "David Costa <david@zarel.net>"; zauberpony = "Elmar Athmer <elmar@athmer.org>"; zef = "Zef Hemel <zef@zef.me>"; zimbatm = "zimbatm <zimbatm@zimbatm.com>"; zohl = "Al Zohali <zohl@fmap.me>"; zoomulator = "Kim Simmons <zoomulator@gmail.com>"; zraexy = "David Mell <zraexy@gmail.com>"; + zx2c4 = "Jason A. Donenfeld <Jason@zx2c4.com>"; } diff --git a/lib/meta.nix b/lib/meta.nix index 44e3cc011f18..8f77bbe01484 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -17,6 +17,11 @@ rec { drv // { meta = (drv.meta or {}) // newAttrs; }; + /* Disable Hydra builds of given derivation. + */ + dontDistribute = drv: addMetaAttrs { hydraPlatforms = []; } drv; + + /* Change the symbolic name of a package for presentation purposes (i.e., so that nix-env users can tell them apart). */ @@ -45,7 +50,7 @@ rec { /* Decrease the nix-env priority of the package, i.e., other versions/variants of the package will be preferred. */ - lowPrio = drv: addMetaAttrs { priority = "10"; } drv; + lowPrio = drv: addMetaAttrs { priority = 10; } drv; /* Apply lowPrio to an attrset with derivations @@ -56,7 +61,7 @@ rec { /* Increase the nix-env priority of the package, i.e., this version/variant of the package will be preferred. */ - hiPrio = drv: addMetaAttrs { priority = "-10"; } drv; + hiPrio = drv: addMetaAttrs { priority = -10; } drv; /* Apply hiPrio to an attrset with derivations diff --git a/lib/modules.nix b/lib/modules.nix index a7c397d2cf43..3da689a6bdb0 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -98,7 +98,7 @@ rec { /* Close a set of modules under the ‘imports’ relation. */ closeModules = modules: args: let - toClosureList = file: parentKey: imap (n: x: + toClosureList = file: parentKey: imap1 (n: x: if isAttrs x || isFunction x then let key = "${parentKey}:anon-${toString n}"; in unifyModuleSyntax file key (unpackSubmodule (applyIfFunction key) x args) @@ -114,7 +114,7 @@ rec { /* Massage a module into canonical form, that is, a set consisting of ‘options’, ‘config’ and ‘imports’ attributes. */ unifyModuleSyntax = file: key: m: - let metaSet = if m ? meta + let metaSet = if m ? meta then { meta = m.meta; } else {}; in @@ -423,7 +423,7 @@ rec { in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs; /* Sort a list of properties. The sort priority of a property is - 1000 by default, but can be overriden by wrapping the property + 1000 by default, but can be overridden by wrapping the property using mkOrder. */ sortProperties = defs: let @@ -595,7 +595,7 @@ rec { functionality This show a warning if any a.b.c or d.e.f is set, and set the value of - x.y.z to the result of the merge function + x.y.z to the result of the merge function */ mkMergedOptionModule = from: to: mergeFn: { config, options, ... }: @@ -611,12 +611,12 @@ rec { let val = getAttrFromPath f config; opt = getAttrFromPath f options; in - optionalString + optionalString (val != "_mkMergedOptionModule") "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly." ) from); } // setAttrByPath to (mkMerge - (optional + (optional (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) (mergeFn config))); }; diff --git a/lib/platforms.nix b/lib/platforms.nix deleted file mode 100644 index 6b56e1734ad6..000000000000 --- a/lib/platforms.nix +++ /dev/null @@ -1,24 +0,0 @@ -let lists = import ./lists.nix; in - -rec { - all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; - allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; - none = []; - - arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; - i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; - mips = [ "mips64el-linux" ]; - x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; - - cygwin = ["i686-cygwin" "x86_64-cygwin"]; - darwin = ["x86_64-darwin"]; - freebsd = ["i686-freebsd" "x86_64-freebsd"]; - gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ - illumos = ["x86_64-solaris"]; - linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux"]; - netbsd = ["i686-netbsd" "x86_64-netbsd"]; - openbsd = ["i686-openbsd" "x86_64-openbsd"]; - unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; - - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"]; -} diff --git a/lib/strings.nix b/lib/strings.nix index 86af4d438344..a03694d1b1d7 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -33,7 +33,7 @@ rec { concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"] => "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. @@ -126,8 +126,8 @@ rec { */ makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; - /* Dependening on the boolean `cond', return either the given string - or the empty string. Useful to contatenate against a bigger string. + /* Depending on the boolean `cond', return either the given string + or the empty string. Useful to concatenate against a bigger string. Example: optionalString true "some-string" @@ -291,7 +291,7 @@ rec { recurse = index: startAt: let cutUntil = i: [(substring startAt (i - startAt) s)]; in - if index < lastSearch then + if index <= lastSearch then if startWithSep index then let restartAt = index + sepLen; in cutUntil index ++ recurse restartAt restartAt @@ -438,8 +438,13 @@ rec { => true isStorePath pkgs.python => true + isStorePath [] || isStorePath 42 || isStorePath {} || … + => false */ - isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir; + isStorePath = x: + builtins.isString x + && builtins.substring 0 1 (toString x) == "/" + && dirOf (builtins.toPath x) == builtins.storeDir; /* Convert string to int Obviously, it is a bit hacky to use fromJSON that way. @@ -476,10 +481,8 @@ rec { readPathsFromFile = rootPath: file: let root = toString rootPath; - lines = - builtins.map (lib.removeSuffix "\n") - (lib.splitString "\n" (builtins.readFile file)); - removeComments = lib.filter (line: !(lib.hasPrefix "#" line)); + lines = lib.splitString "\n" (builtins.readFile file); + removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); relativePaths = removeComments lines; absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths; in diff --git a/lib/systems.nix b/lib/systems.nix deleted file mode 100644 index 92d8bdf892b4..000000000000 --- a/lib/systems.nix +++ /dev/null @@ -1,126 +0,0 @@ -# Define the list of system with their properties. Only systems tested for -# Nixpkgs are listed below - -with import ./lists.nix; -with import ./types.nix; -with import ./attrsets.nix; - -let - lib = import ./default.nix; - setTypes = type: - mapAttrs (name: value: - setType type ({inherit name;} // value) - ); -in - -rec { - - isSignificantByte = isType "significant-byte"; - significantBytes = setTypes "significant-byte" { - bigEndian = {}; - littleEndian = {}; - }; - - - isCpuType = x: isType "cpu-type" x - && elem x.bits [8 16 32 64 128] - && (8 < x.bits -> isSignificantByte x.significantByte); - - cpuTypes = with significantBytes; - setTypes "cpu-type" { - arm = { bits = 32; significantByte = littleEndian; }; - armv5tel = { bits = 32; significantByte = littleEndian; }; - armv7l = { bits = 32; significantByte = littleEndian; }; - i686 = { bits = 32; significantByte = littleEndian; }; - powerpc = { bits = 32; significantByte = bigEndian; }; - x86_64 = { bits = 64; significantByte = littleEndian; }; - }; - - - isExecFormat = isType "exec-format"; - execFormats = setTypes "exec-format" { - aout = {}; # a.out - elf = {}; - macho = {}; - pe = {}; - unknow = {}; - }; - - - isKernel = isType "kernel"; - kernels = with execFormats; - setTypes "kernel" { - cygwin = { execFormat = pe; }; - darwin = { execFormat = macho; }; - freebsd = { execFormat = elf; }; - linux = { execFormat = elf; }; - netbsd = { execFormat = elf; }; - none = { execFormat = unknow; }; - openbsd = { execFormat = elf; }; - win32 = { execFormat = pe; }; - }; - - - isArchitecture = isType "architecture"; - architectures = setTypes "architecture" { - apple = {}; - pc = {}; - unknow = {}; - }; - - - isSystem = x: isType "system" x - && isCpuType x.cpu - && isArchitecture x.arch - && isKernel x.kernel; - - mkSystem = { - cpu ? cpuTypes.i686, - arch ? architectures.pc, - kernel ? kernels.linux, - name ? "${cpu.name}-${arch.name}-${kernel.name}" - }: setType "system" { - inherit name cpu arch kernel; - }; - - - is64Bit = matchAttrs { cpu = { bits = 64; }; }; - isDarwin = matchAttrs { kernel = kernels.darwin; }; - isi686 = matchAttrs { cpu = cpuTypes.i686; }; - isLinux = matchAttrs { kernel = kernels.linux; }; - - - # This should revert the job done by config.guess from the gcc compiler. - mkSystemFromString = s: let - l = lib.splitString "-" s; - - getCpu = name: - attrByPath [name] (throw "Unknow cpuType `${name}'.") - cpuTypes; - getArch = name: - attrByPath [name] (throw "Unknow architecture `${name}'.") - architectures; - getKernel = name: - attrByPath [name] (throw "Unknow kernel `${name}'.") - kernels; - - system = - if builtins.length l == 2 then - mkSystem rec { - name = s; - cpu = getCpu (head l); - arch = - if isDarwin system - then architectures.apple - else architectures.pc; - kernel = getKernel (head (tail l)); - } - else - mkSystem { - name = s; - cpu = getCpu (head l); - arch = getArch (head (tail l)); - kernel = getKernel (head (tail (tail l))); - }; - in assert isSystem system; system; -} diff --git a/lib/systems/default.nix b/lib/systems/default.nix new file mode 100644 index 000000000000..c22c99561969 --- /dev/null +++ b/lib/systems/default.nix @@ -0,0 +1,34 @@ +let inherit (import ../attrsets.nix) mapAttrs; in + +rec { + doubles = import ./doubles.nix; + parse = import ./parse.nix; + inspect = import ./inspect.nix; + platforms = import ./platforms.nix; + examples = import ./examples.nix; + + # Elaborate a `localSystem` or `crossSystem` so that it contains everything + # necessary. + # + # `parsed` is inferred from args, both because there are two options with one + # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS + # always just used `final.*` would fail on both counts. + elaborate = args: let + final = { + # Prefer to parse `config` as it is strictly more informative. + parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); + # Either of these can be losslessly-extracted from `parsed` iff parsing succeeds. + system = parse.doubleFromSystem final.parsed; + config = parse.tripleFromSystem final.parsed; + # Just a guess, based on `system` + platform = platforms.selectBySystem final.system; + libc = + /**/ if final.isDarwin then "libSystem" + else if final.isMinGW then "msvcrt" + else if final.isLinux then "glibc" + # TODO(@Ericson2314) think more about other operating systems + else "native/impure"; + } // mapAttrs (n: v: v final.parsed) inspect.predicates + // args; + in final; +} diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix new file mode 100644 index 000000000000..0168eb42f2f7 --- /dev/null +++ b/lib/systems/doubles.nix @@ -0,0 +1,46 @@ +let + lists = import ../lists.nix; + parse = import ./parse.nix; + inherit (import ./inspect.nix) predicates; + inherit (import ../attrsets.nix) matchAttrs; + + all = [ + "aarch64-linux" + "armv5tel-linux" "armv6l-linux" "armv7l-linux" + + "mips64el-linux" + + "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" + + "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" + "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" + ]; + + allParsed = map parse.mkSystemFromString all; + + filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed); + +in rec { + inherit all; + + allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; + none = []; + + arm = filterDoubles predicates.isArm32; + i686 = filterDoubles predicates.isi686; + mips = filterDoubles predicates.isMips; + x86_64 = filterDoubles predicates.isx86_64; + + cygwin = filterDoubles predicates.isCygwin; + darwin = filterDoubles predicates.isDarwin; + freebsd = filterDoubles predicates.isFreeBSD; + # Should be better, but MinGW is unclear, and HURD is bit-rotted. + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); + illumos = filterDoubles predicates.isSunOS; + linux = filterDoubles predicates.isLinux; + netbsd = filterDoubles predicates.isNetBSD; + openbsd = filterDoubles predicates.isOpenBSD; + unix = filterDoubles predicates.isUnix; + + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux"]; +} diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix new file mode 100644 index 000000000000..e394f43831c9 --- /dev/null +++ b/lib/systems/examples.nix @@ -0,0 +1,130 @@ +# These can be passed to nixpkgs as either the `localSystem` or +# `crossSystem`. They are put here for user convenience, but also used by cross +# tests and linux cross stdenv building, so handle with care! + +let platforms = import ./platforms.nix; in + +rec { + # + # Linux + # + + sheevaplug = rec { + config = "armv5tel-unknown-linux-gnueabi"; + bigEndian = false; + arch = "armv5tel"; + float = "soft"; + withTLS = true; + libc = "glibc"; + platform = platforms.sheevaplug; + openssl.system = "linux-generic32"; + inherit (platform) gcc; + }; + + raspberryPi = rec { + config = "armv6l-unknown-linux-gnueabihf"; + bigEndian = false; + arch = "armv6l"; + float = "hard"; + fpu = "vfp"; + withTLS = true; + libc = "glibc"; + platform = platforms.raspberrypi; + openssl.system = "linux-generic32"; + inherit (platform) gcc; + }; + + armv7l-hf-multiplatform = rec { + config = "arm-unknown-linux-gnueabihf"; + bigEndian = false; + arch = "armv7-a"; + float = "hard"; + fpu = "vfpv3-d16"; + withTLS = true; + libc = "glibc"; + platform = platforms.armv7l-hf-multiplatform; + openssl.system = "linux-generic32"; + inherit (platform) gcc; + }; + + aarch64-multiplatform = rec { + config = "aarch64-unknown-linux-gnu"; + bigEndian = false; + arch = "aarch64"; + withTLS = true; + libc = "glibc"; + platform = platforms.aarch64-multiplatform; + inherit (platform) gcc; + }; + + scaleway-c1 = armv7l-hf-multiplatform // rec { + platform = platforms.scaleway-c1; + inherit (platform) gcc; + inherit (gcc) fpu; + }; + + pogoplug4 = rec { + arch = "armv5tel"; + config = "armv5tel-softfloat-linux-gnueabi"; + float = "soft"; + + platform = platforms.pogoplug4; + + inherit (platform) gcc; + libc = "glibc"; + + withTLS = true; + openssl.system = "linux-generic32"; + }; + + fuloongminipc = rec { + config = "mips64el-unknown-linux-gnu"; + bigEndian = false; + arch = "mips"; + float = "hard"; + withTLS = true; + libc = "glibc"; + platform = platforms.fuloong2f_n32; + openssl.system = "linux-generic32"; + inherit (platform) gcc; + }; + + # + # Darwin + # + + iphone64 = { + config = "aarch64-apple-darwin14"; + arch = "arm64"; + libc = "libSystem"; + platform = {}; + }; + + iphone32 = { + config = "arm-apple-darwin10"; + arch = "armv7-a"; + libc = "libSystem"; + platform = {}; + }; + + # + # Windows + # + + # 32 bit mingw-w64 + mingw32 = { + config = "i686-pc-mingw32"; + arch = "x86"; # Irrelevant + libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain + platform = {}; + }; + + # 64 bit mingw-w64 + mingwW64 = { + # That's the triplet they use in the mingw-w64 docs. + config = "x86_64-pc-mingw32"; + arch = "x86_64"; # Irrelevant + libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain + platform = {}; + }; +} diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix new file mode 100644 index 000000000000..a81e88989c0a --- /dev/null +++ b/lib/systems/inspect.nix @@ -0,0 +1,43 @@ +with import ./parse.nix; +with import ../attrsets.nix; +with import ../lists.nix; + +rec { + 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; }; }; + + BSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; + Unix = [ BSD Darwin Linux SunOS Hurd Cygwin ]; + + Darwin = { kernel = kernels.darwin; }; + Linux = { kernel = kernels.linux; }; + SunOS = { kernel = kernels.solaris; }; + FreeBSD = { kernel = kernels.freebsd; }; + Hurd = { kernel = kernels.hurd; }; + NetBSD = { kernel = kernels.netbsd; }; + OpenBSD = { kernel = kernels.openbsd; }; + Windows = { kernel = kernels.windows; }; + Cygwin = { kernel = kernels.windows; abi = abis.cygnus; }; + MinGW = { kernel = kernels.windows; abi = abis.gnu; }; + + 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) (matchAnyAttrs value)) + patterns; +} diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix new file mode 100644 index 000000000000..befe90f9abeb --- /dev/null +++ b/lib/systems/parse.nix @@ -0,0 +1,174 @@ +# Define the list of system with their properties. +# +# See https://clang.llvm.org/docs/CrossCompilation.html and +# http://llvm.org/docs/doxygen/html/Triple_8cpp_source.html especially +# Triple::normalize. Parsing should essentially act as a more conservative +# version of that last function. + +with import ../lists.nix; +with import ../types.nix; +with import ../attrsets.nix; +with (import ./inspect.nix).predicates; + +let + lib = import ../default.nix; + setTypesAssert = type: pred: + mapAttrs (name: value: + assert pred value; + setType type ({ inherit name; } // value)); + setTypes = type: setTypesAssert type (_: true); + +in + +rec { + + isSignificantByte = isType "significant-byte"; + significantBytes = setTypes "significant-byte" { + bigEndian = {}; + littleEndian = {}; + }; + + isCpuType = isType "cpu-type"; + cpuTypes = with significantBytes; setTypesAssert "cpu-type" + (x: elem x.bits [8 16 32 64 128] + && (if 8 < x.bits + then isSignificantByte x.significantByte + else !(x ? significantByte))) + { + arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; + armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; + 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 = "power"; }; + }; + + isVendor = isType "vendor"; + vendors = setTypes "vendor" { + apple = {}; + pc = {}; + + unknown = {}; + }; + + isExecFormat = isType "exec-format"; + execFormats = setTypes "exec-format" { + aout = {}; # a.out + elf = {}; + macho = {}; + pe = {}; + + unknown = {}; + }; + + isKernelFamily = isType "kernel-family"; + kernelFamilies = setTypes "kernel-family" { + bsd = {}; + }; + + 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 = { }; }; + 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. + darwin10 = kernels.darwin; + darwin14 = kernels.darwin; + win32 = kernels.windows; + }; + + isAbi = isType "abi"; + abis = setTypes "abi" { + cygnus = {}; + gnu = {}; + msvc = {}; + eabi = {}; + androideabi = {}; + gnueabi = {}; + gnueabihf = {}; + + unknown = {}; + }; + + isSystem = isType "system"; + mkSystem = { cpu, vendor, kernel, abi }: + assert isCpuType cpu && isVendor vendor && isKernel kernel && isAbi abi; + setType "system" { + inherit cpu vendor kernel abi; + }; + + mkSkeletonFromList = l: { + "2" = # We only do 2-part hacks for things Nix already supports + if elemAt l 1 == "cygwin" + then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } + else if elemAt l 1 == "gnu" + then { cpu = elemAt l 0; kernel = "hurd"; abi = "gnu"; } + else { cpu = elemAt l 0; kernel = elemAt l 1; }; + "3" = # Awkwards hacks, beware! + if elemAt l 1 == "apple" + then { cpu = elemAt l 0; vendor = "apple"; kernel = elemAt l 2; } + else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu") + then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; } + else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; } + else throw "Target specification with 3 components is ambiguous"; + "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; }; + }.${toString (length l)} + or (throw "system string has invalid number of hyphen-separated components"); + + # This should revert the job done by config.guess from the gcc compiler. + mkSystemFromSkeleton = { cpu + , # Optional, but fallback too complex for here. + # Inferred below instead. + vendor ? assert false; null + , kernel + , # Also inferred below + abi ? assert false; null + } @ args: let + getCpu = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}"); + getVendor = name: vendors.${name} or (throw "Unknown vendor: ${name}"); + getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}"); + getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}"); + + parsed = rec { + cpu = getCpu args.cpu; + vendor = + /**/ if args ? vendor then getVendor args.vendor + else if isDarwin parsed then vendors.apple + else if isWindows parsed then vendors.pc + else vendors.unknown; + kernel = getKernel args.kernel; + abi = + /**/ if args ? abi then getAbi args.abi + else if isLinux parsed then abis.gnu + else if isWindows parsed then abis.gnu + else abis.unknown; + }; + + in mkSystem parsed; + + mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s)); + + doubleFromSystem = { cpu, vendor, kernel, abi, ... }: + if abi == abis.cygnus + then "${cpu.name}-cygwin" + else "${cpu.name}-${kernel.name}"; + + tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let + optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}"; + in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}"; + +} diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix new file mode 100644 index 000000000000..ae4fc355c71d --- /dev/null +++ b/lib/systems/platforms.nix @@ -0,0 +1,563 @@ +rec { + pcBase = { + name = "pc"; + uboot = null; + kernelHeadersBaseConfig = "defconfig"; + kernelBaseConfig = "defconfig"; + # Build whatever possible as a module, if not stated in the extra config. + kernelAutoModules = true; + kernelTarget = "bzImage"; + }; + + pc64 = pcBase // { kernelArch = "x86_64"; }; + + pc32 = pcBase // { kernelArch = "i386"; }; + + pc32_simplekernel = pc32 // { + kernelAutoModules = false; + }; + + pc64_simplekernel = pc64 // { + kernelAutoModules = false; + }; + + pogoplug4 = { + name = "pogoplug4"; + + gcc = { + arch = "armv5te"; + float = "soft"; + }; + + kernelMajor = "2.6"; + kernelHeadersBaseConfig = "multi_v5_defconfig"; + kernelBaseConfig = "multi_v5_defconfig"; + kernelArch = "arm"; + kernelAutoModules = false; + kernelExtraConfig = + '' + # Ubi for the mtd + MTD_UBI y + UBIFS_FS y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + UBIFS_FS_LZO y + UBIFS_FS_ZLIB y + UBIFS_FS_DEBUG n + ''; + kernelMakeFlags = [ "LOADADDR=0x8000" ]; + kernelTarget = "uImage"; + # TODO reenable once manual-config's config actually builds a .dtb and this is checked to be working + #kernelDTB = true; + + # XXX can be anything non-null, pkgs actually only cares if it is set or not + uboot = "pogoplug4"; + }; + + sheevaplug = { + name = "sheevaplug"; + kernelMajor = "2.6"; + kernelHeadersBaseConfig = "multi_v5_defconfig"; + kernelBaseConfig = "multi_v5_defconfig"; + kernelArch = "arm"; + kernelAutoModules = false; + kernelExtraConfig = '' + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + BTRFS_FS m + XFS_FS m + JFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + # mv cesa requires this sw fallback, for mv-sha1 + CRYPTO_SHA1 y + # Fast crypto + CRYPTO_TWOFISH y + CRYPTO_TWOFISH_COMMON y + CRYPTO_BLOWFISH y + CRYPTO_BLOWFISH_COMMON y + + IP_PNP y + IP_PNP_DHCP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y + IPV6 m + VLAN_8021Q m + + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + + WATCHDOG y + WATCHDOG_CORE y + ORION_WATCHDOG m + + ZRAM m + NETCONSOLE m + + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # systemd uses cgroups + CGROUPS y + + # Latencytop + LATENCYTOP y + + # Ubi for the mtd + MTD_UBI y + UBIFS_FS y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + UBIFS_FS_LZO y + UBIFS_FS_ZLIB y + UBIFS_FS_DEBUG n + + # Kdb, for kernel troubles + KGDB y + KGDB_SERIAL_CONSOLE y + KGDB_KDB y + ''; + kernelMakeFlags = [ "LOADADDR=0x0200000" ]; + kernelTarget = "uImage"; + uboot = "sheevaplug"; + # Only for uboot = uboot : + ubootConfig = "sheevaplug_config"; + kernelDTB = true; # Beyond 3.10 + gcc = { + arch = "armv5te"; + float = "soft"; + }; + }; + + raspberrypi = { + name = "raspberrypi"; + kernelMajor = "2.6"; + kernelHeadersBaseConfig = "bcm2835_defconfig"; + kernelBaseConfig = "bcmrpi_defconfig"; + kernelDTB = true; + kernelArch = "arm"; + kernelAutoModules = false; + kernelExtraConfig = '' + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + BTRFS_FS y + XFS_FS m + JFS_FS y + EXT4_FS y + + IP_PNP y + IP_PNP_DHCP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y + IPV6 m + VLAN_8021Q m + + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + + ZRAM m + + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # nixos mounts some cgroup + CGROUPS y + + # Latencytop + LATENCYTOP y + ''; + kernelTarget = "zImage"; + uboot = null; + gcc = { + arch = "armv6"; + fpu = "vfp"; + float = "hard"; + # TODO(@Ericson2314) what is this and is it a good idea? It was + # used in some cross compilation examples but not others. + # + # abi = "aapcs-linux"; + }; + }; + + raspberrypi2 = armv7l-hf-multiplatform // { + name = "raspberrypi2"; + kernelBaseConfig = "bcm2709_defconfig"; + kernelDTB = true; + kernelAutoModules = false; + kernelExtraConfig = '' + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + BTRFS_FS y + XFS_FS m + JFS_FS y + EXT4_FS y + + IP_PNP y + IP_PNP_DHCP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y + IPV6 m + VLAN_8021Q m + + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + + ZRAM m + + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # nixos mounts some cgroup + CGROUPS y + + # Latencytop + LATENCYTOP y + + # Disable the common config Xen, it doesn't build on ARM + XEN? n + ''; + kernelTarget = "zImage"; + uboot = null; + }; + + scaleway-c1 = armv7l-hf-multiplatform // { + gcc = { + cpu = "cortex-a9"; + fpu = "vfpv3"; + float = "hard"; + }; + }; + + utilite = { + name = "utilite"; + kernelMajor = "2.6"; + kernelHeadersBaseConfig = "multi_v7_defconfig"; + kernelBaseConfig = "multi_v7_defconfig"; + kernelArch = "arm"; + kernelAutoModules = false; + kernelExtraConfig = + '' + # Ubi for the mtd + MTD_UBI y + UBIFS_FS y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + UBIFS_FS_LZO y + UBIFS_FS_ZLIB y + UBIFS_FS_DEBUG n + ''; + kernelMakeFlags = [ "LOADADDR=0x10800000" ]; + kernelTarget = "uImage"; + kernelDTB = true; + uboot = true; #XXX: any non-null value here is needed so that mkimage is present to build kernelTarget uImage + gcc = { + cpu = "cortex-a9"; + fpu = "neon"; + float = "hard"; + }; + }; + + guruplug = sheevaplug // { + # Define `CONFIG_MACH_GURUPLUG' (see + # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>) + # and other GuruPlug-specific things. Requires the `guruplug-defconfig' + # patch. + + kernelBaseConfig = "guruplug_defconfig"; + #kernelHeadersBaseConfig = "guruplug_defconfig"; + }; + + fuloong2f_n32 = { + name = "fuloong2f_n32"; + kernelMajor = "2.6"; + kernelHeadersBaseConfig = "fuloong2e_defconfig"; + kernelBaseConfig = "lemote2f_defconfig"; + kernelArch = "mips"; + kernelAutoModules = false; + kernelExtraConfig = '' + MIGRATION n + COMPACTION n + + # nixos mounts some cgroup + CGROUPS y + + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + IP_PNP y + IP_PNP_DHCP y + IP_PNP_BOOTP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # Needed for udev >= 150 + SYSFS_DEPRECATED_V2 n + + VGA_CONSOLE n + VT_HW_CONSOLE_BINDING y + SERIAL_8250_CONSOLE y + FRAMEBUFFER_CONSOLE y + EXT2_FS y + EXT3_FS y + REISERFS_FS y + MAGIC_SYSRQ y + + # The kernel doesn't boot at all, with FTRACE + FTRACE n + ''; + kernelTarget = "vmlinux"; + uboot = null; + gcc = { + arch = "loongson2f"; + abi = "n32"; + }; + }; + + beaglebone = armv7l-hf-multiplatform // { + name = "beaglebone"; + kernelBaseConfig = "omap2plus_defconfig"; + kernelAutoModules = false; + kernelExtraConfig = ""; # TBD kernel config + kernelTarget = "zImage"; + uboot = null; + }; + + armv7l-hf-multiplatform = { + name = "armv7l-hf-multiplatform"; + kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. + kernelHeadersBaseConfig = "multi_v7_defconfig"; + kernelBaseConfig = "multi_v7_defconfig"; + kernelArch = "arm"; + kernelDTB = true; + kernelAutoModules = true; + kernelPreferBuiltin = true; + uboot = null; + kernelTarget = "zImage"; + kernelExtraConfig = '' + # Fix broken sunxi-sid nvmem driver. + TI_CPTS y + + # Hangs ODROID-XU4 + ARM_BIG_LITTLE_CPUIDLE n + ''; + gcc = { + # Some table about fpu flags: + # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png + # Cortex-A5: -mfpu=neon-fp16 + # Cortex-A7 (rpi2): -mfpu=neon-vfpv4 + # Cortex-A8 (beaglebone): -mfpu=neon + # Cortex-A9: -mfpu=neon-fp16 + # Cortex-A15: -mfpu=neon-vfpv4 + + # More about FPU: + # https://wiki.debian.org/ArmHardFloatPort/VfpComparison + + # vfpv3-d16 is what Debian uses and seems to be the best compromise: NEON is not supported in e.g. Scaleway or Tegra 2, + # and the above page suggests NEON is only an improvement with hand-written assembly. + arch = "armv7-a"; + fpu = "vfpv3-d16"; + float = "hard"; + + # For Raspberry Pi the 2 the best would be: + # cpu = "cortex-a7"; + # fpu = "neon-vfpv4"; + }; + }; + + aarch64-multiplatform = { + name = "aarch64-multiplatform"; + kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. + kernelHeadersBaseConfig = "defconfig"; + kernelBaseConfig = "defconfig"; + kernelArch = "arm64"; + kernelDTB = true; + kernelAutoModules = true; + kernelPreferBuiltin = true; + kernelExtraConfig = '' + # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10. + ARCH_BCM2835 y + BCM2835_MBOX y + BCM2835_WDT y + RASPBERRYPI_FIRMWARE y + RASPBERRYPI_POWER y + SERIAL_8250_BCM2835AUX y + SERIAL_8250_EXTENDED y + SERIAL_8250_SHARE_IRQ y + + # Cavium ThunderX stuff. + PCI_HOST_THUNDER_ECAM y + ''; + uboot = null; + kernelTarget = "Image"; + gcc = { + arch = "armv8-a"; + }; + }; + + selectBySystem = system: { + "i686-linux" = pc32; + "x86_64-linux" = pc64; + "armv5tel-linux" = sheevaplug; + "armv6l-linux" = raspberrypi; + "armv7l-linux" = armv7l-hf-multiplatform; + "aarch64-linux" = aarch64-multiplatform; + "mips64el-linux" = fuloong2f_n32; + }.${system} or pcBase; +} diff --git a/lib/tests.nix b/lib/tests/misc.nix similarity index 50% rename from lib/tests.nix rename to lib/tests/misc.nix index d33e3a824e34..4c4c06fe78da 100644 --- a/lib/tests.nix +++ b/lib/tests/misc.nix @@ -1,8 +1,13 @@ -let inherit (builtins) add; in -with import ./default.nix; +# to run these tests: +# nix-instantiate --eval --strict nixpkgs/lib/tests/misc.nix +# if the resulting list is empty, all tests passed +with import ../default.nix; runTests { + +# TRIVIAL + testId = { expr = id 1; expected = 1; @@ -30,6 +35,18 @@ runTests { expected = {a = "a";}; }; + testComposeExtensions = { + expr = let obj = makeExtensible (self: { foo = self.bar; }); + f = self: super: { bar = false; baz = true; }; + g = self: super: { bar = super.baz or false; }; + f_o_g = composeExtensions f g; + composed = obj.extend f_o_g; + in composed.foo; + expected = true; + }; + +# STRINGS + testConcatMapStrings = { expr = concatMapStrings (x: x + ";") ["a" "b" "c"]; expected = "a;b;c;"; @@ -40,15 +57,102 @@ runTests { expected = "a,b,c"; }; + testSplitStringsSimple = { + expr = strings.splitString "." "a.b.c.d"; + expected = [ "a" "b" "c" "d" ]; + }; + + testSplitStringsEmpty = { + expr = strings.splitString "." "a..b"; + expected = [ "a" "" "b" ]; + }; + + testSplitStringsOne = { + expr = strings.splitString ":" "a.b"; + expected = [ "a.b" ]; + }; + + testSplitStringsNone = { + expr = strings.splitString "." ""; + expected = [ "" ]; + }; + + testSplitStringsFirstEmpty = { + expr = strings.splitString "/" "/a/b/c"; + expected = [ "" "a" "b" "c" ]; + }; + + testSplitStringsLastEmpty = { + expr = strings.splitString ":" "2001:db8:0:0042::8a2e:370:"; + expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ]; + }; + + testIsStorePath = { + expr = + let goodPath = + "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"; + in { + storePath = isStorePath goodPath; + storePathAppendix = isStorePath + "${goodPath}/bin/python"; + nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); + asPath = isStorePath (builtins.toPath goodPath); + otherPath = isStorePath "/something/else"; + otherVals = { + attrset = isStorePath {}; + list = isStorePath []; + int = isStorePath 42; + }; + }; + expected = { + storePath = true; + storePathAppendix = false; + nonAbsolute = false; + asPath = true; + otherPath = false; + otherVals = { + attrset = false; + list = false; + int = false; + }; + }; + }; + +# LISTS + testFilter = { expr = filter (x: x != "a") ["a" "b" "c" "a"]; expected = ["b" "c"]; }; - testFold = { - expr = fold (builtins.add) 0 (range 0 100); - expected = 5050; - }; + testFold = + let + f = op: fold: fold op 0 (range 0 100); + # fold with associative operator + assoc = f builtins.add; + # fold with non-associative operator + nonAssoc = f builtins.sub; + in { + expr = { + assocRight = assoc foldr; + # right fold with assoc operator is same as left fold + assocRightIsLeft = assoc foldr == assoc foldl; + nonAssocRight = nonAssoc foldr; + nonAssocLeft = nonAssoc foldl; + # with non-assoc operator the fold results are not the same + nonAssocRightIsNotLeft = nonAssoc foldl != nonAssoc foldr; + # fold is an alias for foldr + foldIsRight = nonAssoc fold == nonAssoc foldr; + }; + expected = { + assocRight = 5050; + assocRightIsLeft = true; + nonAssocRight = 50; + nonAssocLeft = (-5050); + nonAssocRightIsNotLeft = true; + foldIsRight = true; + }; + }; testTake = testAllTrue [ ([] == (take 0 [ 1 2 3 ])) @@ -66,45 +170,6 @@ runTests { expected = { a = [ 2 3 ]; b = [7]; c = [8];}; }; - testOverridableDelayableArgsTest = { - expr = - let res1 = defaultOverridableDelayableArgs id {}; - res2 = defaultOverridableDelayableArgs id { a = 7; }; - res3 = let x = defaultOverridableDelayableArgs id { a = 7; }; - in (x.merge) { b = 10; }; - res4 = let x = defaultOverridableDelayableArgs id { a = 7; }; - in (x.merge) ( x: { b = 10; }); - res5 = let x = defaultOverridableDelayableArgs id { a = 7; }; - in (x.merge) ( x: { a = add x.a 3; }); - res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; }; - y = x.merge {}; - in (y.merge) { a = 10; }; - - resRem7 = res6.replace (a : removeAttrs a ["a"]); - - resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; }; - x2 = x.merge { a = 20; }; # now we have 27 - in (x2.replace) { a = 10; }; # and override the value by 10 - - # fixed tests (delayed args): (when using them add some comments, please) - resFixed1 = - let x = defaultOverridableDelayableArgs id ( x : { a = 7; c = x.fixed.b; }); - y = x.merge (x : { name = "name-${builtins.toString x.fixed.c}"; }); - in (y.merge) { b = 10; }; - strip = attrs : removeAttrs attrs ["merge" "replace"]; - in all id - [ ((strip res1) == { }) - ((strip res2) == { a = 7; }) - ((strip res3) == { a = 7; b = 10; }) - ((strip res4) == { a = 7; b = 10; }) - ((strip res5) == { a = 10; }) - ((strip res6) == { a = 17; }) - ((strip resRem7) == {}) - ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; }) - ]; - expected = true; - }; - testSort = { expr = sort builtins.lessThan [ 40 2 30 42 ]; expected = [2 30 40 42]; @@ -131,9 +196,9 @@ runTests { }; - /* Generator tests */ - # these tests assume attributes are converted to lists - # in alphabetical order +# GENERATORS +# these tests assume attributes are converted to lists +# in alphabetical order testMkKeyValueDefault = { expr = generators.mkKeyValueDefault ":" "f:oo" "bar"; @@ -204,7 +269,7 @@ runTests { }; in { expr = generators.toJSON {} val; - # trival implementation + # trivial implementation expected = builtins.toJSON val; }; @@ -216,8 +281,81 @@ runTests { }; in { expr = generators.toYAML {} val; - # trival implementation + # trivial implementation 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 = { + expr = + let res1 = defaultOverridableDelayableArgs id {}; + res2 = defaultOverridableDelayableArgs id { a = 7; }; + res3 = let x = defaultOverridableDelayableArgs id { a = 7; }; + in (x.merge) { b = 10; }; + res4 = let x = defaultOverridableDelayableArgs id { a = 7; }; + in (x.merge) ( x: { b = 10; }); + res5 = let x = defaultOverridableDelayableArgs id { a = 7; }; + in (x.merge) ( x: { a = builtins.add x.a 3; }); + res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; }; + y = x.merge {}; + in (y.merge) { a = 10; }; + + resRem7 = res6.replace (a: removeAttrs a ["a"]); + + resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; }; + x2 = x.merge { a = 20; }; # now we have 27 + in (x2.replace) { a = 10; }; # and override the value by 10 + + # fixed tests (delayed args): (when using them add some comments, please) + resFixed1 = + let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; }); + y = x.merge (x: { name = "name-${builtins.toString x.fixed.c}"; }); + in (y.merge) { b = 10; }; + strip = attrs: removeAttrs attrs ["merge" "replace"]; + in all id + [ ((strip res1) == { }) + ((strip res2) == { a = 7; }) + ((strip res3) == { a = 7; b = 10; }) + ((strip res4) == { a = 7; b = 10; }) + ((strip res5) == { a = 10; }) + ((strip res6) == { a = 17; }) + ((strip resRem7) == {}) + ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; }) + ]; + expected = true; + }; + } diff --git a/lib/tests/release.nix b/lib/tests/release.nix index f9f57424f7d0..a6184041682f 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,15 +1,12 @@ -{ nixpkgs }: +{ pkgs ? import ((import ../.).cleanSource ../..) {} }: -with import ../.. { }; -with lib; - -stdenv.mkDerivation { +pkgs.stdenv.mkDerivation { name = "nixpkgs-lib-tests"; - buildInputs = [ nix ]; - NIX_PATH="nixpkgs=${nixpkgs}"; + buildInputs = [ pkgs.nix ]; + NIX_PATH="nixpkgs=${pkgs.path}"; buildCommand = '' - datadir="${nix}/share" + datadir="${pkgs.nix}/share" export TEST_ROOT=$(pwd)/test-tmp export NIX_BUILD_HOOK= export NIX_CONF_DIR=$TEST_ROOT/etc @@ -23,9 +20,13 @@ stdenv.mkDerivation { cacheDir=$TEST_ROOT/binary-cache nix-store --init - cd ${nixpkgs}/lib/tests + cd ${pkgs.path}/lib/tests ./modules.sh + [[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]] + + [[ "$(nix-instantiate --eval --strict systems.nix)" == "[ ]" ]] + touch $out ''; } diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix new file mode 100644 index 000000000000..523fd3feb3b0 --- /dev/null +++ b/lib/tests/systems.nix @@ -0,0 +1,31 @@ +# We assert that the new algorithmic way of generating these lists matches the +# way they were hard-coded before. +# +# One might think "if we exhaustively test, what's the point of procedurally +# calculating the lists anyway?". The answer is one can mindlessly update these +# tests as new platforms become supported, and then just give the diff a quick +# sanity check before committing :). +let + lib = import ../default.nix; + mseteq = x: y: { + expr = lib.sort lib.lessThan x; + expected = lib.sort lib.lessThan y; + }; +in with lib.systems.doubles; lib.runTests { + all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); + + arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]); + i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]); + mips = assertTrue (mseteq mips [ "mips64el-linux" ]); + x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]); + + cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]); + darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]); + freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]); + gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */)); + illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]); + linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]); + netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]); + openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]); + unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); +} diff --git a/lib/trivial.nix b/lib/trivial.nix index abe5a16c67d6..9ee0549fc0fb 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -1,86 +1,54 @@ rec { - # Identity function. + /* The identity function + For when you need a function that does “nothing”. + + Type: id :: a -> a + */ id = x: x; - # Constant function. + /* The constant function + Ignores the second argument. + Or: Construct a function that always returns a static value. + + Type: const :: a -> b -> a + Example: + let f = const 5; in f 10 + => 5 + */ const = x: y: x; - # Named versions corresponding to some builtin operators. + + ## Named versions corresponding to some builtin operators. + + /* Concat two strings */ concat = x: y: x ++ y; + + /* boolean “or” */ or = x: y: x || y; + + /* boolean “and” */ and = x: y: x && y; + + /* Convert a boolean to a string. + Note that toString on a bool returns "1" and "". + */ + boolToString = b: if b then "true" else "false"; + + /* Merge two attribute sets shallowly, right side trumps left + + Example: + mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; } + => { a = 1; b = 3; c = 4; } + */ mergeAttrs = x: y: x // y; - # Compute the fixed point of the given function `f`, which is usually an - # attribute set that expects its final, non-recursive representation as an - # argument: - # - # f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } - # - # Nix evaluates this recursion until all references to `self` have been - # resolved. At that point, the final result is returned and `f x = x` holds: - # - # nix-repl> fix f - # { bar = "bar"; foo = "foo"; foobar = "foobar"; } - # - # See https://en.wikipedia.org/wiki/Fixed-point_combinator for further - # details. - fix = f: let x = f x; in x; - - # A variant of `fix` that records the original recursive attribute set in the - # result. This is useful in combination with the `extends` function to - # implement deep overriding. See pkgs/development/haskell-modules/default.nix - # for a concrete example. - fix' = f: let x = f x // { __unfix__ = f; }; in x; - - # Modify the contents of an explicitly recursive attribute set in a way that - # honors `self`-references. This is accomplished with a function - # - # g = self: super: { foo = super.foo + " + "; } - # - # that has access to the unmodified input (`super`) as well as the final - # non-recursive representation of the attribute set (`self`). `extends` - # differs from the native `//` operator insofar as that it's applied *before* - # references to `self` are resolved: - # - # nix-repl> fix (extends g f) - # { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; } - # - # The name of the function is inspired by object-oriented inheritance, i.e. - # think of it as an infix operator `g extends f` that mimics the syntax from - # Java. It may seem counter-intuitive to have the "base class" as the second - # argument, but it's nice this way if several uses of `extends` are cascaded. - extends = f: rattrs: self: let super = rattrs self; in super // f self super; - - # Create an overridable, recursive attribute set. For example: - # - # nix-repl> obj = makeExtensible (self: { }) - # - # nix-repl> obj - # { __unfix__ = «lambda»; extend = «lambda»; } - # - # nix-repl> obj = obj.extend (self: super: { foo = "foo"; }) - # - # nix-repl> obj - # { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; } - # - # nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; }) - # - # nix-repl> obj - # { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; } - makeExtensible = makeExtensibleWithCustomName "extend"; - - # Same as `makeExtensible` but the name of the extending attribute is - # customized. - makeExtensibleWithCustomName = extenderName: rattrs: - fix' rattrs // { - ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); - }; - # Flip the order of the arguments of a binary function. flip = f: a: b: f b a; + # Apply function if argument is non-null + mapNullable = f: a: if isNull a then a else f a; + # Pull in some builtins not included elsewhere. inherit (builtins) pathExists readFile isBool isFunction diff --git a/lib/types.nix b/lib/types.nix index 0d1a88a00f2d..a7dcd3f1e1c7 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -6,7 +6,7 @@ with import ./attrsets.nix; with import ./options.nix; with import ./trivial.nix; with import ./strings.nix; -with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; }; +let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in rec { @@ -52,7 +52,7 @@ rec { { # Human-readable representation of the type, should be equivalent to # the type function name. name - , # Description of the type, defined recursively by embedding the the wrapped type if any. + , # Description of the type, defined recursively by embedding the wrapped type if any. description ? null , # Function applied to each definition that should return true if # its type-correct, false otherwise. @@ -81,7 +81,7 @@ rec { # name: name of the type # type: type function. # wrapped: the type wrapped in case of compound types. - # payload: values of the type, two payloads of the same type must be + # payload: values of the type, two payloads of the same type must be # combinable with the binOp binary operation. # binOp: binary operation that merge two payloads of the same type. functor ? defaultFunctor name @@ -92,6 +92,8 @@ rec { }; + # When adding new types don't forget to document them in + # nixos/doc/manual/development/option-types.xml! types = rec { unspecified = mkOptionType { @@ -177,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 @@ -218,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); @@ -231,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 ++ ["<name?>"]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); @@ -257,6 +259,7 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). uniq = elemType: mkOptionType rec { name = "uniq"; inherit (elemType) description check; @@ -267,6 +270,7 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + # Null or value of ... nullOr = elemType: mkOptionType rec { name = "nullOr"; description = "null or ${elemType.description}"; @@ -283,6 +287,7 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + # A submodule (like typed attribute set). See NixOS manual. submodule = opts: let opts' = toList opts; @@ -314,6 +319,7 @@ rec { }; }; + # A value from a set of allowed ones. enum = values: let show = v: @@ -329,6 +335,7 @@ rec { functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); }; }; + # Either value of type `t1` or `t2`. either = t1: t2: mkOptionType rec { name = "either"; description = "${t1.description} or ${t2.description}"; @@ -352,6 +359,8 @@ rec { functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; }; + # Either value of type `finalType` or `coercedType`, the latter is + # converted to `finalType` using `coerceFunc`. coercedTo = coercedType: coerceFunc: finalType: assert coercedType.getSubModules == null; mkOptionType rec { diff --git a/maintainers/docker/.dockerignore b/maintainers/docker/.dockerignore deleted file mode 100644 index eb4668233e6a..000000000000 --- a/maintainers/docker/.dockerignore +++ /dev/null @@ -1,14 +0,0 @@ -*~ -,* -.*.swp -.*.swo -result -result-* -/doc/NEWS.html -/doc/NEWS.txt -/doc/manual.html -/doc/manual.pdf -.version-suffix - -.DS_Store -.git diff --git a/maintainers/docker/Dockerfile b/maintainers/docker/Dockerfile deleted file mode 100644 index f02a9d653fd5..000000000000 --- a/maintainers/docker/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM busybox - -RUN dir=`mktemp -d` && trap 'rm -rf "$dir"' EXIT && \ - wget -O- https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ - mkdir -m 0755 /nix && USER=root sh $dir/*/install && \ - echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile - -ADD . /root/nix/nixpkgs -ONBUILD ENV NIX_PATH nixpkgs=/root/nix/nixpkgs:nixos=/root/nix/nixpkgs/nixos -ONBUILD ENV PATH /root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin -ONBUILD ENV ENV /etc/profile -ENV ENV /etc/profile diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix index 552f88022961..d981a1fa7dbc 100644 --- a/maintainers/scripts/all-tarballs.nix +++ b/maintainers/scripts/all-tarballs.nix @@ -14,5 +14,5 @@ removeAttrs (import ../../pkgs/top-level/release.nix supportedSystems = [ "x86_64-linux" ]; }) [ # Remove jobs whose evaluation depends on a writable Nix store. - "tarball" "unstable" + "tarball" "unstable" "darwin-tested" ] diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index b2d55d7fbed2..e5a8d606f1a3 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 <show project>|<update project>|<update-all> [major.minor]" >&2 diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index b339f296056c..6bbc0a45e44d 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -48,8 +48,8 @@ def get_maintainers(attr_name): @click.command() @click.option( '--jobset', - default="nixos/release-16.09", - help='Hydra project like nixos/release-16.09') + default="nixos/release-17.03", + help='Hydra project like nixos/release-17.03') def cli(jobset): """ Given a Hydra project, inspect latest evaluation @@ -74,13 +74,13 @@ def cli(jobset): # TODO: dependency failed without propagated builds for tr in d('img[alt="Failed"]').parents('tr'): a = pq(tr)('a')[1] - print "- [ ] [{}]({})".format(a.text, a.get('href')) + print("- [ ] [{}]({})".format(a.text, a.get('href'))) sys.stdout.flush() maintainers = get_maintainers(a.text) if maintainers: - print " - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))) + print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))) # TODO: print last three persons that touched this file # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? diff --git a/maintainers/scripts/nix-diff.sh b/maintainers/scripts/nix-diff.sh new file mode 100755 index 000000000000..0c65e29cf435 --- /dev/null +++ b/maintainers/scripts/nix-diff.sh @@ -0,0 +1,277 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils gnugrep gnused + +################################################################################ +# nix-diff.sh # +################################################################################ +# This script "diffs" Nix profile generations. # +# # +# Example: # +################################################################################ +# > nix-diff.sh 90 92 # +# + gnumake-4.2.1 # +# + gnumake-4.2.1-doc # +# - htmldoc-1.8.29 # +################################################################################ +# The example shows that as of generation 92 and since generation 90, # +# gnumake-4.2.1 and gnumake-4.2.1-doc have been installed, while # +# htmldoc-1.8.29 has been removed. # +# # +# The example above shows the default, minimal output mode of this script. # +# For more features, run `nix-diff.sh -h` for usage instructions. # +################################################################################ + +usage() { + cat <<EOF +usage: nix-diff.sh [-h | [-p profile | -s] [-q] [-l] [range]] +-h: print this message before exiting +-q: list the derivations installed in the parent generation +-l: diff every available intermediate generation between parent and + child +-p profile: specify the Nix profile to use + * defaults to ~/.nix-profile +-s: use the system profile + * equivalent to: -p /nix/var/nix/profiles/system +profile: * should be something like /nix/var/nix/profiles/default, not a + generation link like /nix/var/nix/profiles/default-2-link +range: the range of generations to diff + * the following patterns are allowed, where A, B, and N are positive + integers, and G is the currently active generation: + A..B => diffs from generation A to generation B + ~N => diffs from the Nth newest generation (older than G) to G + A => diffs from generation A to G + * defaults to ~1 +EOF +} + +usage_tip() { + echo 'run `nix-diff.sh -h` for usage instructions' >&2 + exit 1 +} + +while getopts :hqlp:s opt; do + case $opt in + h) + usage + exit + ;; + q) + opt_query=1 + ;; + l) + opt_log=1 + ;; + p) + opt_profile=$OPTARG + ;; + s) + opt_profile=/nix/var/nix/profiles/system + ;; + \?) + echo "error: invalid option -$OPTARG" >&2 + usage_tip + ;; + esac +done +shift $((OPTIND-1)) + +if [ -n "$opt_profile" ]; then + if ! [ -L "$opt_profile" ]; then + echo "error: expecting \`$opt_profile\` to be a symbolic link" >&2 + usage_tip + fi +else + opt_profile=$(readlink ~/.nix-profile) + if (( $? != 0 )); then + echo 'error: unable to dereference `~/.nix-profile`' >&2 + echo 'specify the profile manually with the `-p` flag' >&2 + usage_tip + fi +fi + +list_gens() { + nix-env -p "$opt_profile" --list-generations \ + | sed -r 's:^\s*::' \ + | cut -d' ' -f1 +} + +current_gen() { + nix-env -p "$opt_profile" --list-generations \ + | grep -E '\(current\)\s*$' \ + | sed -r 's:^\s*::' \ + | cut -d' ' -f1 +} + +neg_gen() { + local i=0 from=$1 n=$2 tmp + for gen in $(list_gens | sort -rn); do + if ((gen < from)); then + tmp=$gen + ((i++)) + ((i == n)) && break + fi + done + if ((i < n)); then + echo -n "error: there aren't $n generation(s) older than" >&2 + echo " generation $from" >&2 + return 1 + fi + echo $tmp +} + +match() { + argv=("$@") + for i in $(seq $(($#-1))); do + if grep -E "^${argv[$i]}\$" <(echo "$1") >/dev/null; then + echo $i + return + fi + done + echo 0 +} + +case $(match "$1" '' '[0-9]+' '[0-9]+\.\.[0-9]+' '~[0-9]+') in + 1) + diffTo=$(current_gen) + diffFrom=$(neg_gen $diffTo 1) + (($? == 1)) && usage_tip + ;; + 2) + diffFrom=$1 + diffTo=$(current_gen) + ;; + 3) + diffFrom=${1%%.*} + diffTo=${1##*.} + ;; + 4) + diffTo=$(current_gen) + diffFrom=$(neg_gen $diffTo ${1#*~}) + (($? == 1)) && usage_tip + ;; + 0) + echo 'error: invalid invocation' >&2 + usage_tip + ;; +esac + +dirA="${opt_profile}-${diffFrom}-link" +dirB="${opt_profile}-${diffTo}-link" + +declare -a temp_files +temp_length() { + echo -n ${#temp_files[@]} +} +temp_make() { + temp_files[$(temp_length)]=$(mktemp) +} +temp_clean() { + rm -f ${temp_files[@]} +} +temp_name() { + echo -n "${temp_files[$(($(temp_length)-1))]}" +} +trap 'temp_clean' EXIT + +temp_make +versA=$(temp_name) +refs=$(nix-store -q --references "$dirA") +(( $? != 0 )) && exit 1 +echo "$refs" \ + | grep -v env-manifest.nix \ + | sort \ + > "$versA" + +print_tag() { + local gen=$1 + nix-env -p "$opt_profile" --list-generations \ + | grep -E "^\s*${gen}" \ + | sed -r 's:^\s*::' \ + | sed -r 's:\s*$::' +} + +if [ -n "$opt_query" ]; then + print_tag $diffFrom + cat "$versA" \ + | sed -r 's:^[^-]+-(.*)$: \1:' + + print_line=1 +fi + +if [ -n "$opt_log" ]; then + gens=$(for gen in $(list_gens); do + ((diffFrom < gen && gen < diffTo)) && echo $gen + done) + # Force the $diffTo generation to be included in this list, instead of using + # `gen <= diffTo` in the preceding loop, so we encounter an error upon the + # event of its nonexistence. + gens=$(echo "$gens" + echo $diffTo) +else + gens=$diffTo +fi + +temp_make +add=$(temp_name) +temp_make +rem=$(temp_name) +temp_make +out=$(temp_name) + +for gen in $gens; do + + [ -n "$print_line" ] && echo + + temp_make + versB=$(temp_name) + + dirB="${opt_profile}-${gen}-link" + refs=$(nix-store -q --references "$dirB") + (( $? != 0 )) && exit 1 + echo "$refs" \ + | grep -v env-manifest.nix \ + | sort \ + > "$versB" + + in=$(comm -3 -1 "$versA" "$versB") + sed -r 's:^[^-]*-(.*)$:\1+:' <(echo "$in") \ + | sort -f \ + > "$add" + + un=$(comm -3 -2 "$versA" "$versB") + sed -r 's:^[^-]*-(.*)$:\1-:' <(echo "$un") \ + | sort -f \ + > "$rem" + + cat "$rem" "$add" \ + | sort -f \ + | sed -r 's:(.*)-$:- \1:' \ + | sed -r 's:(.*)\+$:\+ \1:' \ + | grep -v '^$' \ + > "$out" + + if [ -n "$opt_query" -o -n "$opt_log" ]; then + + lines=$(wc -l "$out" | cut -d' ' -f1) + tag=$(print_tag "$gen") + (( $? != 0 )) && exit 1 + if [ $lines -eq 0 ]; then + echo "$tag (no change)" + else + echo "$tag" + fi + cat "$out" \ + | sed 's:^: :' + + print_line=1 + + else + echo "diffing from generation $diffFrom to $diffTo" + cat "$out" + fi + + versA=$versB + +done + +exit 0 diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh index ebc5dc3b87ec..098a8c88cb7e 100755 --- a/maintainers/scripts/rebuild-amount.sh +++ b/maintainers/scripts/rebuild-amount.sh @@ -1,260 +1,115 @@ -#!/bin/sh +#!/usr/bin/env bash +set -e -usage () { - echo 1>&2 " -usage: - $0 - [--git commit..commit | --git commit] - [--svn rev:rev | --svn rev] - [--path path[:path]*] - [--help] - -This program is used to investigate how any changes inside your nixpkgs -repository may hurt. With these kind of information you may choose wisely -where you should commit your changes. - -This program adapts it-self to your versionning system to avoid too much -effort on your Internet bandwidth. If you need to check more than one -commits / revisions, you may use the following commands: - - --git remotes/trunk..master - --svn 17670:17677 - - Check the differences between each commit separating the first and the - last commit. - - --path /etc/nixos/nixpkgs:/tmp/nixpkgs_1:/tmp/nixpkgs_2 - - Check the differences between multiple directories containing different - versions of nixpkgs. - -All these options exist with one commit / revision argument. Such options -are used to compare your \$NIXPKGS path with the specified version. - -If you omit to mention any other commit / revision, then your \$NIXPKGS path -is compared with its last update. This command is useful to test code from -a dirty repository. - -" - - exit 1; -} - -##################### -# Process Arguments # -##################### - -: ${NIXPKGS=/etc/nixos/nixpkgs/} - -vcs="" -gitCommits="" -svnRevisions="" -pathLocations="" -verbose=false - -argfun="" -for arg; do - if test -z "$argfun"; then - case $arg in - --git) vcs="git"; argfun="set_gitCommits";; - --svn) vcs="svn"; argfun="set_svnRevisions";; - --path) vcs="path"; argfun="set_pathLocations";; - --verbose) verbose=true;; - --help) usage;; - *) usage;; - esac - else - case $argfun in - set_*) - var=$(echo $argfun | sed 's,^set_,,') - eval $var=$arg - ;; - esac - argfun="" - fi -done - -if $verbose; then - set -x -else - set +x +if [ "$#" != 1 ] && [ "$#" != 2 ]; then + cat <<-EOF + Usage: $0 commit-spec [commit-spec] + You need to be in a git-controlled nixpkgs tree. + The current state of the tree will be used if the second commit is missing. + EOF + exit 1 fi -############################ -# Find the repository type # -############################ +# A slightly hacky way to get the config. +parallel="$(echo 'config.rebuild-amount.parallel or false' | nix-repl . 2>/dev/null \ + | grep -v '^\(nix-repl.*\)\?$' | tail -n 1 || true)" -if test -z "$vcs"; then - if test -x "$NIXPKGS/.git"; then - if git --git-dir="$NIXPKGS/.git" branch > /dev/null 2>&1; then - vcs="git" - gitCommits=$(git --git-dir="$NIXPKGS/.git" log -n 1 --pretty=format:%H 2> /dev/null) - fi - elif test -x "$NIXPKGS/.svn"; then - cd "$NIXPKGS" - if svn info > /dev/null 2>&1; then - vcs="svn"; - svnRevisions=$(svn info | sed -n 's,Revision: ,,p') - fi - cd - - else - usage - fi -fi +echo "Estimating rebuild amount by counting changed Hydra jobs." -############################### -# Define a storage directory. # -############################### +toRemove=() -pkgListDir="" -exitCode=1 -cleanup(){ - test -e "$pkgListDir" && rm -rf "$pkgListDir" - exit $exitCode; +cleanup() { + rm -rf "${toRemove[@]}" } - trap cleanup EXIT SIGINT SIGQUIT ERR -pkgListDir=$(mktemp --tmpdir -d rebuild-amount-XXXXXXXX) -vcsDir="$pkgListDir/.vcs" +MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX' -########################### -# Versionning for Dummies # -########################### +nixexpr() { + cat <<-EONIX + let + lib = import $1/lib; + hydraJobs = import $1/pkgs/top-level/release.nix + # Compromise: accuracy vs. resources needed for evaluation. + { supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; }; + cfg = (import $1 {}).config.rebuild-amount or {}; -path_init() { - if test "${pathLocations#*:}" = "$pathLocations"; then - pathLocations="$NIXPKGS:$pathLocations" - fi - pathLocations="${pathLocations}:" + recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; + + # hydraJobs leaves recurseForDerivations as empty attrmaps; + # that would break nix-env and we also need to recurse everywhere. + tweak = lib.mapAttrs + (name: val: + if name == "recurseForDerivations" then true + else if lib.isAttrs val && val.type or null != "derivation" + then recurseIntoAttrs (tweak val) + else val + ); + + # Some of these contain explicit references to platform(s) we want to avoid; + # some even (transitively) depend on ~/.nixpkgs/config.nix (!) + blacklist = [ + "tarball" "metrics" "manual" + "darwin-tested" "unstable" "stdenvBootstrapTools" + "moduleSystem" "lib-tests" # these just confuse the output + ]; + + in + tweak (builtins.removeAttrs hydraJobs blacklist) + EONIX } -path_getNext() { - pathLoc="${pathLocations%%:*}" - pathLocations="${pathLocations#*:}" +# Output packages in tree $2 that weren't in $1. +# Changing the output hash or name is taken as a change. +# Extra nix-env parameters can be in $3 +newPkgs() { + # We use files instead of pipes, as running multiple nix-env processes + # could eat too much memory for a standard 4GiB machine. + local -a list + for i in 1 2; do + local l="$($MKTEMP)" + list[$i]="$l" + toRemove+=("$l") + + local expr="$($MKTEMP)" + toRemove+=("$expr") + nixexpr "${!i}" > "$expr" + + nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \ + | sort > "${list[$i]}" & + + if [ "$parallel" != "true" ]; then + wait + fi + done + + wait + comm -13 "${list[@]}" } -path_setPath() { - path="$pathLoc" -} +# Prepare nixpkgs trees. +declare -a tree +for i in 1 2; do + if [ -n "${!i}" ]; then # use the given commit + dir="$($MKTEMP -d)" + tree[$i]="$dir" + toRemove+=("$dir") -path_setName() { - name=$(echo "$pathLoc" | tr '/' '_') -} - -################ -# Git Commands # -################ - -git_init() { - git clone "$NIXPKGS/.git" "$vcsDir" > /dev/null 2>&1 - if echo "gitCommits" | grep -c "\.\." > /dev/null 2>&1; then - gitCommits=$(git --git-dir="$vcsDir/.git" log --reverse --pretty=format:%H $gitCommits 2> /dev/null) - else - pathLocations="$vcsDir:$NIXPKGS" - vcs="path" - path_init - fi -} - -git_getNext() { - git --git-dir="$vcsDir/.git" checkout $(echo "$gitCommits" | head -n 1) > /dev/null 2>&1 - gitCommits=$(echo "$gitCommits" | sed '1 d') -} - -git_setPath() { - path="$vcsDir" -} - -git_setName() { - name=$(git --git-dir="$vcsDir/.git" log -n 1 --pretty=format:%H 2> /dev/null) -} - -####################### -# Subversion Commands # -####################### - -svn_init() { - cp -r "$NIXPKGS" "$vcsDir" > /dev/null 2>&1 - if echo "svnRevisions" | grep -c ":" > /dev/null 2>&1; then - svnRevisions=$(seq ${svnRevisions%:*} ${svnRevisions#*:}) - else - pathLocations="$vcsDir:$NIXPKGS" - vcs="path" - path_init - fi -} - -svn_getNext() { - cd "$vcsDir" - svn checkout $(echo "$svnRevisions" | head -n 1) > /dev/null 2>&1 - cd - - svnRevisions=$(echo "$svnRevisions" | sed '1 d') -} - -svn_setPath() { - path="$vcsDir" -} - -svn_setName() { - name=$(svn info 2> /dev/null | sed -n 's,Revision: ,,p') -} - -#################### -# Logical Commands # -#################### - -init () { ${vcs}_init; } -getNext () { ${vcs}_getNext; } -setPath () { ${vcs}_setPath; } -setName () { ${vcs}_setName; } - - -##################### -# Check for Rebuild # -##################### - -# Generate the list of all derivations that could be build from a nixpkgs -# respository. This list of derivation hashes is compared with previous -# lists and a brief summary is produced on the output. - -compareNames () { - nb=$(diff -y --suppress-common-lines --speed-large-files "$pkgListDir/$1.drvs" "$pkgListDir/$2.drvs" 2> /dev/null | wc -l) - echo "$1 -> $2: $nb" -} - -echo "Please wait, this may take some minutes ..." - -init -first="" -oldPrev="" - -prev="" -curr="" - -while true; do - getNext - setPath # set path=... - setName # set name=... - curr="$name" - - test -z "$curr" && break || true - - nix-instantiate "$path" > "$pkgListDir/$curr.drvs" > /dev/null 2>&1 || true - - if test -n "$prev"; then - compareNames "$prev" "$curr" - else - echo "Number of package to rebuild:" - first="$curr" - fi - oldPrev="$prev" - prev="$curr" + git clone --shared --no-checkout --quiet . "${tree[$i]}" + (cd "${tree[$i]}" && git checkout --quiet "${!i}") + else #use the current tree + tree[$i]="$(pwd)" + fi done -if test "$first" != "$oldPrev"; then - echo "Number of package to rebuild (first -> last):" - compareNames "$first" "$curr" -fi +newlist="$($MKTEMP)" +toRemove+=("$newlist") +# Notes: +# - the evaluation is done on x86_64-linux, like on Hydra. +# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove) +newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist" + +# Hacky: keep only the last word of each attribute path and sort. +sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \ + | sort | uniq -c -exitCode=0 diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries new file mode 100755 index 000000000000..7c73510c353a --- /dev/null +++ b/maintainers/scripts/update-python-libraries @@ -0,0 +1,243 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests toolz ])' + +""" +Update a Python package expression by passing in the `.nix` file, or the directory containing it. +You can pass in multiple files or paths. + +You'll likely want to use +`` + $ ./update-python-libraries ../../pkgs/development/python-modules/* +`` +to update all libraries in that folder. +""" + +import argparse +import logging +import os +import re +import requests +import toolz + +INDEX = "https://pypi.io/pypi" +"""url of PyPI""" + +EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl'] +"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned.""" + +import logging +logging.basicConfig(level=logging.INFO) + + +def _get_values(attribute, text): + """Match attribute in text and return all matches. + + :returns: List of matches. + """ + regex = '{}\s+=\s+"(.*)";'.format(attribute) + regex = re.compile(regex) + values = regex.findall(text) + return values + +def _get_unique_value(attribute, text): + """Match attribute in text and return unique match. + + :returns: Single match. + """ + values = _get_values(attribute, text) + n = len(values) + if n > 1: + raise ValueError("found too many values for {}".format(attribute)) + elif n == 1: + return values[0] + else: + raise ValueError("no value found for {}".format(attribute)) + +def _get_line_and_value(attribute, text): + """Match attribute in text. Return the line and the value of the attribute.""" + regex = '({}\s+=\s+"(.*)";)'.format(attribute) + regex = re.compile(regex) + value = regex.findall(text) + n = len(value) + if n > 1: + raise ValueError("found too many values for {}".format(attribute)) + elif n == 1: + return value[0] + else: + raise ValueError("no value found for {}".format(attribute)) + + +def _replace_value(attribute, value, text): + """Search and replace value of attribute in text.""" + old_line, old_value = _get_line_and_value(attribute, text) + new_line = old_line.replace(old_value, value) + new_text = text.replace(old_line, new_line) + return new_text + +def _fetch_page(url): + r = requests.get(url) + if r.status_code == requests.codes.ok: + return r.json() + else: + raise ValueError("request for {} failed".format(url)) + +def _get_latest_version_pypi(package, extension): + """Get latest version and hash from PyPI.""" + url = "{}/{}/json".format(INDEX, package) + json = _fetch_page(url) + + version = json['info']['version'] + for release in json['releases'][version]: + 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 + + +def _get_latest_version_github(package, extension): + raise ValueError("updating from GitHub is not yet supported.") + + +FETCHERS = { + 'fetchFromGitHub' : _get_latest_version_github, + 'fetchPypi' : _get_latest_version_pypi, + 'fetchurl' : _get_latest_version_pypi, +} + + +DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz' + + +FORMATS = { + 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION, + 'wheel' : 'whl' +} + +def _determine_fetcher(text): + # Count occurences of fetchers. + nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys()) + if nfetchers == 0: + raise ValueError("no fetcher.") + elif nfetchers > 1: + raise ValueError("multiple fetchers.") + else: + # Then we check which fetcher to use. + for fetcher in FETCHERS.keys(): + if 'src = {}'.format(fetcher) in text: + return fetcher + + +def _determine_extension(text, fetcher): + """Determine what extension is used in the expression. + + If we use: + - fetchPypi, we check if format is specified. + - fetchurl, we determine the extension from the url. + - fetchFromGitHub we simply use `.tar.gz`. + """ + if fetcher == 'fetchPypi': + try: + format = _get_unique_value('format', text) + except ValueError as e: + format = None # format was not given + + try: + extension = _get_unique_value('extension', text) + except ValueError as e: + extension = None # extension was not given + + if extension is None: + if format is None: + format = 'setuptools' + extension = FORMATS[format] + + elif fetcher == 'fetchurl': + url = _get_unique_value('url', text) + extension = os.path.splitext(url)[1] + if 'pypi' not in url: + raise ValueError('url does not point to PyPI.') + + elif fetcher == 'fetchFromGitHub': + raise ValueError('updating from GitHub is not yet implemented.') + + return extension + + +def _update_package(path): + + + + # Read the expression + with open(path, 'r') as f: + text = f.read() + + # Determine pname. + pname = _get_unique_value('pname', text) + + # Determine version. + version = _get_unique_value('version', text) + + # First we check how many fetchers are mentioned. + fetcher = _determine_fetcher(text) + + extension = _determine_extension(text, fetcher) + + new_version, new_sha256 = _get_latest_version_pypi(pname, extension) + + if new_version == version: + logging.info("Path {}: no update available for {}.".format(path, pname)) + return False + if not new_sha256: + raise ValueError("no file available for {}.".format(pname)) + + text = _replace_value('version', new_version, text) + text = _replace_value('sha256', new_sha256, text) + + with open(path, 'w') as f: + f.write(text) + + logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version)) + + return True + + +def _update(path): + + # We need to read and modify a Nix expression. + if os.path.isdir(path): + path = os.path.join(path, 'default.nix') + + # If a default.nix does not exist, we quit. + if not os.path.isfile(path): + logging.info("Path {}: does not exist.".format(path)) + return False + + # If file is not a Nix expression, we quit. + if not path.endswith(".nix"): + logging.info("Path {}: does not end with `.nix`.".format(path)) + return False + + try: + return _update_package(path) + except ValueError as e: + logging.warning("Path {}: {}".format(path, e)) + return False + +def main(): + + parser = argparse.ArgumentParser() + parser.add_argument('package', type=str, nargs='+') + + args = parser.parse_args() + + packages = map(os.path.abspath, args.package) + + count = list(map(_update, packages)) + + logging.info("{} package(s) updated".format(sum(count))) + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 258e1ea948da..d5d8140e0764 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -29,8 +29,10 @@ line. For instance, to create a container that has <literal>root</literal>: <screen> -# nixos-container create foo --config 'services.openssh.enable = true; \ - users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];' +# nixos-container create foo --config ' + services.openssh.enable = true; + users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; +' </screen> </para> @@ -55,7 +57,7 @@ Thus, if something went wrong, you can get status info using </para> -<para>If the container has started succesfully, you can log in as +<para>If the container has started successfully, you can log in as root using the <command>root-login</command> operation: <screen> @@ -97,8 +99,11 @@ This will build and activate the new configuration. You can also specify a new configuration on the command line: <screen> -# nixos-container update foo --config 'services.httpd.enable = true; \ - services.httpd.adminAddr = "foo@example.org";' +# nixos-container update foo --config ' + services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; +' # curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index d1b324af3f12..ae3d124cd6bb 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -35,6 +35,12 @@ or <literal>ext4</literal>, then it’s best to specify <option>fsType</option> to ensure that the kernel module is available.</para> +<note><para>System startup will fail if any of the filesystems fails to mount, +dropping you to the emergency shell. +You can make a mount asynchronous and non-critical by adding +<literal>options = [ "nofail" ];</literal>. +</para></note> + <xi:include href="luks-file-systems.xml" /> </chapter> diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 4a73695e0942..fc6082ce3afd 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -45,6 +45,13 @@ services.xserver.displayManager.lightdm.enable = true; </programlisting> </para> +<para>You can set the keyboard layout (and optionally the layout variant): +<programlisting> +services.xserver.layout = "de"; +services.xserver.xkbVariant = "neo"; +</programlisting> +</para> + <para>The X server is started automatically at boot time. If you don’t want this to happen, you can set: <programlisting> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 40d49f1541b3..9413d71a34cf 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" <<EOF <?xml version="1.0" encoding="utf-8"?> @@ -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/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml index 150fa1d7017e..2f963f8666f1 100644 --- a/nixos/doc/manual/development/building-nixos.xml +++ b/nixos/doc/manual/development/building-nixos.xml @@ -12,12 +12,12 @@ your <filename>configuration.nix</filename> to configure the system that would be installed on the CD.</para> <para>Default CD/DVD configurations are available -inside <filename>nixos/modules/installer/cd-dvd</filename>. To build them -you have to set <envar>NIXOS_CONFIG</envar> before -running <command>nix-build</command> to build the ISO. +inside <filename>nixos/modules/installer/cd-dvd</filename>. <screen> -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix</screen> +$ git clone https://github.com/NixOS/nixpkgs.git +$ cd nixpkgs/nixos +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen> </para> diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index d62d0896bb7c..d20c2d1aa2e2 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -41,8 +41,9 @@ options = { <term><varname>default</varname></term> <listitem> <para>The default value used if no value is defined by any - module. A default is not required; in that case, if the option - value is never used, an error will be thrown.</para> + module. A default is not required; but if a default is not given, + then users of the module will have to define the value of the + option, otherwise an error will be thrown.</para> </listitem> </varlistentry> @@ -95,7 +96,7 @@ options = { </itemizedlist> </para> - <para>Both approachs have problems.</para> + <para>Both approaches have problems.</para> <para>Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 8e6ac53ad480..441393c98276 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -68,8 +68,7 @@ <section><title>Value Types - Value types are type that take a value parameter. The only value type - in the library is enum. + Value types are type that take a value parameter. @@ -141,6 +140,17 @@ str. Multiple definitions cannot be merged. + + types.coercedTo from + f to + Type to or type + from which will be coerced to + type to using function + f which takes an argument of type + from and return a value of type + to. Can be used to preserve backwards + compatibility of an option if its type was changed. +
@@ -282,7 +292,7 @@ config.mod.two = { foo = 2; bar = "two"; }; byte = mkOption { description = "An integer between 0 and 255."; - type = addCheck (x: x >= 0 && x <= 255) types.int; + type = addCheck types.int (x: x >= 0 && x <= 255); }; Overriding a type @@ -386,7 +396,7 @@ code before creating a new type.</para> <listitem><para>For composed types that can take a submodule as type parameter, this function can be used to substitute the parameter of a submodule type. It takes a module as parameter and return the type with - the submodule options substituted. It is usally defined as a type + the submodule options substituted. It is usually defined as a type function call with a recursive call to <literal>substSubModules</literal>, e.g for a type <literal>composedType</literal> that take an <literal>elemtype</literal> diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 7cd5ce0002c2..a2896cd7a135 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -8,7 +8,7 @@ <para>By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS and Nixpkgs sources provided by the -<literal>nixos-unstable</literal> channel (kept in +<literal>nixos</literal> channel (kept in <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To modify NixOS, however, you should check out the latest sources from Git. This is as follows: @@ -27,8 +27,8 @@ a subdirectory of the Nixpkgs repository.) The remote <literal>channels</literal> refers to a read-only repository that tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more information about channels). Thus, the Git branch -<literal>channels/nixos-14.12</literal> will contain the latest built -and tested version available in the <literal>nixos-14.12</literal> +<literal>channels/nixos-17.03</literal> will contain the latest built +and tested version available in the <literal>nixos-17.03</literal> channel.</para> <para>It’s often inconvenient to develop directly on the master @@ -39,9 +39,9 @@ branch based on your current NixOS version: <screen> $ nixos-version -14.04.273.ea1952b (Baboon) +17.09pre104379.6e0b727 (Hummingbird) -$ git checkout -b local ea1952b +$ git checkout -b local 6e0b727 </screen> Or, to base your local branch on the latest version available in a @@ -49,17 +49,17 @@ NixOS channel: <screen> $ git remote update channels -$ git checkout -b local channels/nixos-14.12 +$ git checkout -b local channels/nixos-17.03 </screen> -(Replace <literal>nixos-14.12</literal> with the name of the channel +(Replace <literal>nixos-17.03</literal> with the name of the channel you want to use.) You can use <command>git merge</command> or <command>git rebase</command> to keep your local branch in sync with the channel, e.g. <screen> $ git remote update channels -$ git merge channels/nixos-14.12 +$ git merge channels/nixos-17.03 </screen> You can use <command>git cherry-pick</command> to copy commits from @@ -87,7 +87,11 @@ $ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs You may want to delete the symlink <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s -NixOS channel from clashing with your own tree.</para> +NixOS channel from clashing with your own tree (this may break the +command-not-found utility though). If you want to go back to the default +state, you may just remove the <filename>~/.nix-defexpr</filename> +directory completely, log out and log in again and it should have been +recreated with a link to the root channels.</para> <!-- FIXME: not sure what this means. <para>You should not pass the base directory diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml index 927648febc50..0d3eaa8bb1fb 100644 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ b/nixos/doc/manual/installation/installing-uefi.xml @@ -26,7 +26,8 @@ changes: <literal>vfat</literal> filesystem.</para> </listitem> <listitem> - <para>You must set <option>boot.loader.systemd-boot.enable</option> to + <para>Instead of <option>boot.loader.grub.device</option>, + you must set <option>boot.loader.systemd-boot.enable</option> to <literal>true</literal>. <command>nixos-generate-config</command> should do this automatically for new configurations when booted in UEFI mode.</para> diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index a4b5dafbed16..4a74e406b14c 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -11,7 +11,9 @@ a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the correct drive; you can use the <command>lsblk</command> command to get a list of -block devices.</para> +block devices. If you're on OS X you can run <command>diskutil list</command> +to see the list of devices; the device you'll use for the USB must be ejected +before writing the image.</para> <para>The <command>dd</command> utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations. For @@ -32,6 +34,11 @@ ISO, copy its contents verbatim to your drive, then either: in <link xlink:href="https://www.kernel.org/doc/Documentation/kernel-parameters.txt"> the kernel documentation</link> for more details).</para> </listitem> + <listitem> + <para>If you want to load the contents of the ISO to ram after bootin + (So you can remove the stick after bootup) you can append the parameter + <literal>copytoram</literal>to the <literal>options</literal> field.</para> + </listitem> </itemizedlist> </para> diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 8fe61a5fdfdf..ee9680ced397 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -37,15 +37,7 @@ </orderedlist> <para> - There are a few modifications you should make in configuration.nix. Enable - the virtualbox guest service in the main block: -</para> - -<programlisting> -virtualisation.virtualbox.guest.enable = true; -</programlisting> - -<para> + There are a few modifications you should make in configuration.nix. Enable booting: </para> diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index c974523f886c..aee6523345c4 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -15,12 +15,12 @@ been built. These channels are: <itemizedlist> <listitem> <para><emphasis>Stable channels</emphasis>, such as <literal - xlink:href="https://nixos.org/channels/nixos-14.12">nixos-14.12</literal>. + xlink:href="https://nixos.org/channels/nixos-17.03">nixos-17.03</literal>. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your - system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but - not from 3.4.<replaceable>x</replaceable> to - 3.11.<replaceable>x</replaceable> (a major change that has the + system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but + not from 4.9.<replaceable>x</replaceable> to + 4.11.<replaceable>x</replaceable> (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created.</para> <para></para> @@ -34,7 +34,7 @@ been built. These channels are: </listitem> <listitem> <para><emphasis>Small channels</emphasis>, such as <literal - xlink:href="https://nixos.org/channels/nixos-14.12-small">nixos-14.12-small</literal> + xlink:href="https://nixos.org/channels/nixos-17.03-small">nixos-17.03-small</literal> or <literal xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These are identical to the stable and unstable channels described above, @@ -55,8 +55,8 @@ appliances.)</para> <para>When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 14.12 ISO, you will be subscribed to -the <literal>nixos-14.12</literal> channel. To see which NixOS +instance, if you installed from a 17.03 ISO, you will be subscribed to +the <literal>nixos-17.03</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root: <screen> @@ -71,16 +71,16 @@ To switch to a different NixOS channel, do </screen> (Be sure to include the <literal>nixos</literal> parameter at the -end.) For instance, to use the NixOS 14.12 stable channel: +end.) For instance, to use the NixOS 17.03 stable channel: <screen> -# nix-channel --add https://nixos.org/channels/nixos-14.12 nixos +# nix-channel --add https://nixos.org/channels/nixos-17.03 nixos </screen> If you have a server, you may want to use the “small” channel instead: <screen> -# nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos +# nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos </screen> And if you want to live on the bleeding edge: @@ -130,7 +130,7 @@ runs, see <command>systemctl list-timers</command>.) You can also specify a channel explicitly, e.g. <programlisting> -system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03; </programlisting> </para> diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 2c28dd448016..9aa332f026da 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -18,7 +18,7 @@ <para>If you encounter problems, please report them on the <literal - xlink:href="http://lists.science.uu.nl/mailman/listinfo/nix-dev">nix-dev@lists.science.uu.nl</literal> + xlink:href="https://groups.google.com/forum/#!forum/nix-devel">nix-devel</literal> mailing list or on the <link xlink:href="irc://irc.freenode.net/#nixos"> <literal>#nixos</literal> channel on Freenode</link>. Bugs should diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index e0271485c361..6c1c46844ccb 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:</para> since version 0.0 as well as the most recent <link xlink:href="http://www.stackage.org/">Stackage Nightly</link> snapshot. The announcement <link - xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-September/018138.html">"Full + xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">"Full Stackage Support in Nixpkgs"</link> gives additional details.</para> </listitem> @@ -342,7 +342,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc <listitem> <para> - Python 2.6 has been marked as broken (as it no longer recieves + Python 2.6 has been marked as broken (as it no longer receives security updates from upstream). </para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index f460e00e836e..7279dd058270 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -362,7 +362,7 @@ services.syncthing = { <listitem> <para> <literal>networking.firewall.allowPing</literal> is now enabled by - default. Users are encourarged to configure an approiate rate limit for + default. Users are encouraged to configure an appropriate rate limit for their machines using the Kernel interface at <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index ade7d5581ced..3abafac97378 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:</para> 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. <link - xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2016-June/020585.html">The + xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The motivation for this change</link> has been discussed at length on the <literal>nix-dev</literal> mailing list and in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github issue #14897</link>. Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in <link - xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2016-June/020642.html">another + xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another nix-dev article</link>.</para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index fda46217144c..6147b9830137 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -4,7 +4,15 @@ version="5.0" xml:id="sec-release-17.03"> -<title>Release 17.03 (“XXX”, 2017/03/??) +Release 17.03 (“Gorilla”, 2017/03/31) + +
+ +Highlights In addition to numerous new and upgraded packages, this release has the following highlights: @@ -16,19 +24,40 @@ has the following highlights: manual for more information. + + This release is based on Glibc 2.25, GCC 5.4.0 and systemd + 232. The default Linux kernel is 4.9 and Nix is at 1.11.8. + + + + The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed + + The setuid wrapper functionality now supports setting capabilities. - X.org server uses branch 1.19. Due to ABI incompatibilities, + X.org server uses branch 1.19. Due to ABI incompatibilities, ati_unfree keeps forcing 1.17 and amdgpu-pro starts forcing 1.18. - PHP now defaults to PHP 7.1 + + Cross compilation has been rewritten. See the nixpkgs manual for + details. The most obvious breaking change is that in derivations there is no + .nativeDrv nor .crossDrv are now + cross by default, not native. + + + + + The overridePackages function has been rewritten + to be replaced by + overlays @@ -38,16 +67,115 @@ has the following highlights: manual for more information. + + PHP now defaults to PHP 7.1 + + +
+
+ +New Services + The following new services were added since the last release: - - - + hardware/ckb.nix + hardware/mcelog.nix + hardware/usb-wwan.nix + hardware/video/capture/mwprocapture.nix + programs/adb.nix + programs/chromium.nix + programs/gphoto2.nix + programs/java.nix + programs/mtr.nix + programs/oblogout.nix + programs/vim.nix + programs/wireshark.nix + security/dhparams.nix + services/audio/ympd.nix + services/computing/boinc/client.nix + services/continuous-integration/buildbot/master.nix + services/continuous-integration/buildbot/worker.nix + services/continuous-integration/gitlab-runner.nix + services/databases/riak-cs.nix + services/databases/stanchion.nix + services/desktops/gnome3/gnome-terminal-server.nix + services/editors/infinoted.nix + services/hardware/illum.nix + services/hardware/trezord.nix + services/logging/journalbeat.nix + services/mail/offlineimap.nix + services/mail/postgrey.nix + services/misc/couchpotato.nix + services/misc/docker-registry.nix + services/misc/errbot.nix + services/misc/geoip-updater.nix + services/misc/gogs.nix + services/misc/leaps.nix + services/misc/nix-optimise.nix + services/misc/ssm-agent.nix + services/misc/sssd.nix + services/monitoring/arbtt.nix + services/monitoring/netdata.nix + services/monitoring/prometheus/default.nix + services/monitoring/prometheus/alertmanager.nix + services/monitoring/prometheus/blackbox-exporter.nix + services/monitoring/prometheus/json-exporter.nix + services/monitoring/prometheus/nginx-exporter.nix + services/monitoring/prometheus/node-exporter.nix + services/monitoring/prometheus/snmp-exporter.nix + services/monitoring/prometheus/unifi-exporter.nix + services/monitoring/prometheus/varnish-exporter.nix + services/monitoring/sysstat.nix + services/monitoring/telegraf.nix + services/monitoring/vnstat.nix + services/network-filesystems/cachefilesd.nix + services/network-filesystems/glusterfs.nix + services/network-filesystems/ipfs.nix + services/networking/dante.nix + services/networking/dnscrypt-wrapper.nix + services/networking/fakeroute.nix + services/networking/flannel.nix + services/networking/htpdate.nix + services/networking/miredo.nix + services/networking/nftables.nix + services/networking/powerdns.nix + services/networking/pdns-recursor.nix + services/networking/quagga.nix + services/networking/redsocks.nix + services/networking/wireguard.nix + services/system/cgmanager.nix + services/torrent/opentracker.nix + services/web-apps/atlassian/confluence.nix + services/web-apps/atlassian/crowd.nix + services/web-apps/atlassian/jira.nix + services/web-apps/frab.nix + services/web-apps/nixbot.nix + services/web-apps/selfoss.nix + services/web-apps/quassel-webserver.nix + services/x11/unclutter-xfixes.nix + services/x11/urxvtd.nix + system/boot/systemd-nspawn.nix + virtualisation/ecs-agent.nix + virtualisation/lxcfs.nix + virtualisation/openstack/keystone.nix + virtualisation/openstack/glance.nix +
+
+ +Backward Incompatibilities When upgrading from a previous release, please be aware of the following incompatible changes: @@ -55,10 +183,8 @@ following incompatible changes: - Cross compilation has been rewritten. See the nixpkgs manual for - details. The most obvious breaking change is that derivations absent a - .nativeDrv or .crossDrv are now - cross by default, not native. + Derivations have no .nativeDrv nor .crossDrv + and are now cross by default, not native. @@ -95,15 +221,6 @@ following incompatible changes: - - - The Yama LSM is now enabled by default in the kernel, - which prevents ptracing non-child processes. - This means you will not be able to attach gdb to an existing process, - but will need to start that process from gdb (so it is a child). - - - The stripHash bash function in stdenv @@ -183,7 +300,7 @@ following incompatible changes: overridePackages function no longer exists. It is replaced by - overlays. For example, the following code: + overlays. For example, the following code: let @@ -198,7 +315,7 @@ following incompatible changes: let pkgs = import <nixpkgs> {}; in - import pkgs.path { overlays = [(self: super: ...)] } + import pkgs.path { overlays = [(self: super: ...)]; } @@ -228,7 +345,7 @@ following incompatible changes: Iputils no longer provide ping6 and traceroute6. The functionality of - these tools have been integrated into ping and traceroute respectively. To + these tools has been integrated into ping and traceroute respectively. To enforce an address family the new flags -4 and -6 have been added. One notable incompatibility is that specifying an interface (for link-local IPv6 for instance) is no longer done @@ -237,10 +354,60 @@ following incompatible changes: + + + The socket handling of the services.rmilter module + has been fixed and refactored. As rmilter doesn't support binding to + more than one socket, the options bindUnixSockets + and bindInetSockets have been replaced by + services.rmilter.bindSocket.*. The default is still + a unix socket in /run/rmilter/rmilter.sock. Refer to + the options documentation for more information. + + + + + + The fetch* functions no longer support md5, + please use sha256 instead. + + + + + + The dnscrypt-proxy module interface has been streamlined around the + option. Where possible, legacy option + declarations are mapped to but will emit + warnings. The has been outright + removed: to use an unlisted resolver, use the + option. + + + + + + torbrowser now stores local state under + ~/.local/share/tor-browser by default. Any + browser profile data from the old location, + ~/.torbrowser4, must be migrated manually. + + + + + + The ihaskell, monetdb, offlineimap and sitecopy services have been removed. + + +
+
-Other notable improvements: +Other Notable Changes @@ -261,6 +428,18 @@ following incompatible changes: + + Python 2.6 interpreter and package set have been removed. + + + + + The Python 2.7 interpreter does not use modules anymore. Instead, all + CPython interpreters now include the whole standard library except for `tkinter`, + which is available in the Python package set. + + + Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. @@ -271,7 +450,65 @@ following incompatible changes: + + + The Python package sets now use a fixed-point combinator and the sets are + available as attributes of the interpreters. + + + + + + The Python function buildPythonPackage has been improved and can be + used to build from Setuptools source, Flit source, and precompiled Wheels. + + + + + + When adding new or updating current Python libraries, the expressions should be put + in separate files in pkgs/development/python-modules and + called from python-packages.nix. + + + + + + The dnscrypt-proxy service supports synchronizing the list of public + resolvers without working DNS resolution. This fixes issues caused by the + resolver list becoming outdated. It also improves the viability of + DNSCrypt only configurations. + + + + + + Containers using bridged networking no longer lose their connection after + changes to the host networking. + + + + + + ZFS supports pool auto scrubbing. + + + + + + The bind DNS utilities (e.g. dig) have been split into their own output and + are now also available in pkgs.dnsutils and it is no longer + necessary to pull in all of bind to use them. + + + + + + Per-user configuration was moved from ~/.nixpkgs to + ~/.config/nixpkgs. The former is still valid for + config.nix for backwards compatibility. + + - - +
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 3705fd468f61..72dfd60bedd9 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -11,9 +11,35 @@ has the following highlights: - + + The user handling now keeps track of deallocated UIDs/GIDs. When a user + or group is revived, this allows it to be allocated the UID/GID it had before. + A consequence is that UIDs and GIDs are no longer reused. + + + + + The module option now + causes the first head specified in this list to be set as the primary + head. Apart from that, it's now possible to also set additional options + by using an attribute set, for example: + +{ services.xserver.xrandrHeads = [ + "HDMI-0" + { + output = "DVI-0"; + primary = true; + monitorConfig = '' + Option "Rotate" "right" + ''; + } + ]; +} + + This will set the DVI-0 output to be the primary head, + even though HDMI-0 is the first head in the list. + - The following new services were added since the last release: @@ -31,11 +57,81 @@ following incompatible changes: + aiccu package was removed. This is due to SixXS + sunsetting its IPv6 tunnel. + + + + + Top-level idea package collection was renamed. + All JetBrains IDEs are now at jetbrains. + + + + + flexget's state database cannot be upgraded to its + new internal format, requiring removal of any existing + db-config.sqlite which will be automatically recreated. + + + + + The ipfs package now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with + +dataDir=<valueOfDataDir> +mv /var/lib/ipfs/.ipfs/* $dataDir +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. + + + The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing. + + + 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. + + + + + The caddy service was previously using an extra + .caddy in the data directory specified with the + dataDir option. The contents of the + .caddy directory are now expected to be in the + dataDir. + + + + + The ssh-agent user service is not started by default + anymore. Use programs.ssh.startAgent to enable it if + needed. There is also a new programs.gnupg.agent + module that creates a gpg-agent user service. It can + 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: @@ -49,6 +145,18 @@ following incompatible changes: rest of the system on a stable release. + + + Updated to FreeType 2.7.1, including a new TrueType engine. + The new engine replaces the Infinality engine which was the default in + NixOS. The default font rendering settings are now provided by + fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults + are less invasive and provide rendering that is more consistent with + other systems and hopefully with each font designer's intent. Some + system-wide configuration has been removed from the Fontconfig NixOS + module where user Fontconfig settings are available. + + diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 8c5de22f30ff..56766ec9047f 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -33,42 +33,124 @@ , name ? "nixos-disk-image" - # This prevents errors while checking nix-store validity, see - # https://github.com/NixOS/nix/issues/1134 -, fixValidity ? true - , format ? "raw" }: with lib; -pkgs.vmTools.runInLinuxVM ( +let + # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix + # TODO: factor out more cleanly + + # Do not include these things: + # - The '.git' directory + # - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...) + # - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...) + filterFn = path: type: let basename = baseNameOf (toString path); in + if type == "directory" then basename != ".git" + else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null + else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null; + + nixpkgs = builtins.filterSource filterFn pkgs.path; + + channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} '' + mkdir -p $out + cp -prd ${nixpkgs} $out/nixos + chmod -R u+w $out/nixos + if [ ! -e $out/nixos/nixpkgs ]; then + ln -s . $out/nixos/nixpkgs + fi + rm -rf $out/nixos/.git + echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix + ''; + + metaClosure = pkgs.writeText "meta" '' + ${config.system.build.toplevel} + ${config.nix.package.out} + ${channelSources} + ''; + + prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath; + + # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate + # image building logic. The comment right below this now appears in 4 different places in nixpkgs :) + # !!! should use XML. + sources = map (x: x.source) contents; + targets = map (x: x.target) contents; + + prepareImage = '' + export PATH=${pkgs.lib.makeSearchPathOutput "bin" "bin" prepareImageInputs} + + mkdir $out + diskImage=nixos.raw + truncate -s ${toString diskSize}M $diskImage + + ${if partitioned then '' + parted $diskImage -- mklabel msdos mkpart primary ext4 1M -1s + offset=$((2048*512)) + '' else '' + offset=0 + ''} + + mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage + + root="$PWD/root" + mkdir -p $root + + # Copy arbitrary other files into the image + # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of + # https://github.com/NixOS/nixpkgs/issues/23052. + set -f + sources_=(${concatStringsSep " " sources}) + targets_=(${concatStringsSep " " targets}) + set +f + + for ((i = 0; i < ''${#targets_[@]}; i++)); do + source="''${sources_[$i]}" + target="''${targets_[$i]}" + + if [[ "$source" =~ '*' ]]; then + # If the source name contains '*', perform globbing. + mkdir -p $root/$target + for fn in $source; do + rsync -a --no-o --no-g "$fn" $root/$target/ + done + else + mkdir -p $root/$(dirname $target) + if ! [ -e $root/$target ]; then + rsync -a --no-o --no-g $source $root/$target + else + echo "duplicate entry $target -> $source" + exit 1 + fi + fi + done + + # TODO: Nix really likes to chown things it creates to its current user... + fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure + + echo "copying staging root to image..." + cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* / + ''; +in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name - { preVM = - '' - mkdir $out - diskImage=$out/nixos.${if format == "qcow2" then "qcow2" else "img"} - ${pkgs.vmTools.qemu}/bin/qemu-img create -f ${format} $diskImage "${toString diskSize}M" - mv closure xchg/ - ''; - buildInputs = with pkgs; [ utillinux perl e2fsprogs parted rsync ]; - - # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate - # image building logic. The comment right below this now appears in 4 different places in nixpkgs :) - # !!! should use XML. - sources = map (x: x.source) contents; - targets = map (x: x.target) contents; - - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - inherit postVM; + { preVM = prepareImage; + buildInputs = with pkgs; [ utillinux e2fsprogs ]; + exportReferencesGraph = [ "closure" metaClosure ]; + postVM = '' + ${if format == "raw" then '' + mv $diskImage $out/nixos.img + diskImage=$out/nixos.img + '' else '' + ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2 + diskImage=$out/nixos.qcow2 + ''} + ${postVM} + ''; memSize = 1024; } '' ${if partitioned then '' - # Create a single / partition. - parted /dev/vda mklabel msdos - parted /dev/vda -- mkpart primary ext2 1M -1s . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR rootDisk=/dev/vda1 @@ -76,74 +158,34 @@ pkgs.vmTools.runInLinuxVM ( rootDisk=/dev/vda ''} - # Create an empty filesystem and mount it. - mkfs.${fsType} -L nixos $rootDisk - mkdir /mnt - mount $rootDisk /mnt - - # Register the paths in the Nix database. - printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" - - ${if fixValidity then '' - # Add missing size/hash fields to the database. FIXME: - # exportReferencesGraph should provide these directly. - ${config.nix.package.out}/bin/nix-store --verify --check-contents --option build-users-group "" - '' else ""} - - # In case the bootloader tries to write to /dev/sda… + # Some tools assume these exist ln -s vda /dev/xvda ln -s vda /dev/sda - # Install the closure onto the image - USER=root ${config.system.build.nixos-install}/bin/nixos-install \ - --closure ${config.system.build.toplevel} \ - --no-channel-copy \ - --no-root-passwd \ - ${optionalString (!installBootLoader) "--no-bootloader"} + mountPoint=/mnt + mkdir $mountPoint + mount $rootDisk $mountPoint - # Install a configuration.nix. + # Install a configuration.nix mkdir -p /mnt/etc/nixos ${optionalString (configFile != null) '' cp ${configFile} /mnt/etc/nixos/configuration.nix ''} - # Remove /etc/machine-id so that each machine cloning this image will get its own id - rm -f /mnt/etc/machine-id + mount --rbind /dev $mountPoint/dev + mount --rbind /proc $mountPoint/proc + mount --rbind /sys $mountPoint/sys - # Copy arbitrary other files into the image - # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of - # https://github.com/NixOS/nixpkgs/issues/23052. - set -f - sources_=($sources) - targets_=($targets) - set +f + # Set up core system link, GRUB, etc. + NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration boot - for ((i = 0; i < ''${#targets_[@]}; i++)); do - source="''${sources_[$i]}" - target="''${targets_[$i]}" + # TODO: figure out if I should activate, but for now I won't + # chroot $mountPoint /nix/var/nix/profiles/system/activate - if [[ "$source" =~ '*' ]]; then + # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images + rm -f $mountPoint/etc/machine-id - # If the source name contains '*', perform globbing. - mkdir -p /mnt/$target - for fn in $source; do - rsync -a --no-o --no-g "$fn" /mnt/$target/ - done - - else - - mkdir -p /mnt/$(dirname $target) - if ! [ -e /mnt/$target ]; then - rsync -a --no-o --no-g $source /mnt/$target - else - echo "duplicate entry $target -> $source" - exit 1 - fi - fi - done - - umount /mnt + umount -R /mnt # Make sure resize2fs works. Note that resize2fs has stricter criteria for resizing than a normal # mount, so the `-c 0` and `-i 0` don't affect it. Setting it to `now` doesn't produce deterministic diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 30664406b26d..cd375352c4ca 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/; } }); @@ -542,16 +548,20 @@ sub getScreenText { $self->nest("performing optical character recognition", sub { my $tmpbase = Cwd::abs_path(".")."/ocr"; my $tmpin = $tmpbase."in.ppm"; - my $tmpout = "$tmpbase.ppm"; $self->sendMonitorCommand("screendump $tmpin"); - system("ppmtopgm $tmpin | pamscale 4 -filter=lanczos > $tmpout") == 0 - or die "cannot scale screenshot"; + + my $magickArgs = "-filter Catrom -density 72 -resample 300 " + . "-contrast -normalize -despeckle -type grayscale " + . "-sharpen 1 -posterize 3 -negate -gamma 100 " + . "-blur 1x65535"; + my $tessArgs = "-c debug_file=/dev/null --psm 11 --oem 2"; + + $text = `convert $magickArgs $tmpin tiff:- | tesseract - - $tessArgs`; + my $status = $? >> 8; unlink $tmpin; - system("tesseract $tmpout $tmpbase") == 0 or die "OCR failed"; - unlink $tmpout; - $text = read_file("$tmpbase.txt"); - unlink "$tmpbase.txt"; + + die "OCR failed with exit code $status" if $status != 0; }); return $text; } @@ -562,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/; } }); @@ -596,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/; } @@ -613,29 +636,19 @@ sub copyFileFromHost { my %charToKey = ( - '!' => "shift-0x02", - '@' => "shift-0x03", - '#' => "shift-0x04", - '$' => "shift-0x05", - '%' => "shift-0x06", - '^' => "shift-0x07", - '&' => "shift-0x08", - '*' => "shift-0x09", - '(' => "shift-0x0A", - ')' => "shift-0x0B", - '-' => "0x0C", '_' => "shift-0x0C", - '=' => "0x0D", '+' => "shift-0x0D", - '[' => "0x1A", '{' => "shift-0x1A", - ']' => "0x1B", '}' => "shift-0x1B", - ';' => "0x27", ':' => "shift-0x27", - '\'' => "0x28", '"' => "shift-0x28", - '`' => "0x29", '~' => "shift-0x29", - '\\' => "0x2B", '|' => "shift-0x2B", - ',' => "0x33", '<' => "shift-0x33", - '.' => "0x34", '>' => "shift-0x34", - '/' => "0x35", '?' => "shift-0x35", - ' ' => "spc", - "\n" => "ret", + 'A' => "shift-a", 'N' => "shift-n", '-' => "0x0C", '_' => "shift-0x0C", '!' => "shift-0x02", + 'B' => "shift-b", 'O' => "shift-o", '=' => "0x0D", '+' => "shift-0x0D", '@' => "shift-0x03", + 'C' => "shift-c", 'P' => "shift-p", '[' => "0x1A", '{' => "shift-0x1A", '#' => "shift-0x04", + 'D' => "shift-d", 'Q' => "shift-q", ']' => "0x1B", '}' => "shift-0x1B", '$' => "shift-0x05", + 'E' => "shift-e", 'R' => "shift-r", ';' => "0x27", ':' => "shift-0x27", '%' => "shift-0x06", + 'F' => "shift-f", 'S' => "shift-s", '\'' => "0x28", '"' => "shift-0x28", '^' => "shift-0x07", + 'G' => "shift-g", 'T' => "shift-t", '`' => "0x29", '~' => "shift-0x29", '&' => "shift-0x08", + 'H' => "shift-h", 'U' => "shift-u", '\\' => "0x2B", '|' => "shift-0x2B", '*' => "shift-0x09", + 'I' => "shift-i", 'V' => "shift-v", ',' => "0x33", '<' => "shift-0x33", '(' => "shift-0x0A", + 'J' => "shift-j", 'W' => "shift-w", '.' => "0x34", '>' => "shift-0x34", ')' => "shift-0x0B", + 'K' => "shift-k", 'X' => "shift-x", '/' => "0x35", '?' => "shift-0x35", + 'L' => "shift-l", 'Y' => "shift-y", ' ' => "spc", + 'M' => "shift-m", 'Z' => "shift-z", "\n" => "ret", ); diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl index 854be99552a0..a3354fb0e1eb 100644 --- a/nixos/lib/test-driver/test-driver.pl +++ b/nixos/lib/test-driver/test-driver.pl @@ -35,7 +35,7 @@ foreach my $vlan (split / /, $ENV{VLANS} || "") { if ($pid == 0) { dup2(fileno($pty->slave), 0); dup2(fileno($stdoutW), 1); - exec "vde_switch -s $socket" or _exit(1); + exec "vde_switch -s $socket --dirmode 0700" or _exit(1); } close $stdoutW; print $pty "version\n"; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index c1cb5072acad..58c447c76db6 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -93,7 +93,7 @@ rec { vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - ocrProg = tesseract; + ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; }; # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the @@ -108,16 +108,17 @@ rec { mkdir -p $out/bin echo "$testScript" > $out/test-script ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" + vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) wrapProgram $out/bin/nixos-test-driver \ - --add-flags "$vms" \ - ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ + --add-flags "''${vms[*]}" \ + ${lib.optionalString enableOCR + "--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --set testScript '$testScript' \ --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ - --add-flags "$vms" \ + --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests 'startAll; joinAll;' \ --set VLANS '${toString vlans}' \ diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index b4190df8335b..cdfac71634d4 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -6,10 +6,7 @@ let cfg = config.amazonImage; in { - imports = - [ ../../../modules/installer/cd-dvd/channel.nix - ../../../modules/virtualisation/amazon-image.nix - ]; + imports = [ ../../../modules/virtualisation/amazon-image.nix ]; options.amazonImage = { contents = mkOption { diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 1e397b0f1761..24ced8da531a 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -3,21 +3,20 @@ # To start with do: nix-shell -p awscli --run "aws configure" - +set -e set -o pipefail -#set -x - -stateDir=${TMPDIR:-/tmp}/ec2-image -echo "keeping state in $stateDir" -mkdir -p $stateDir version=$(nix-instantiate --eval --strict '' -A lib.nixpkgsVersion | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" +stateDir=/var/tmp/ec2-image-$version +echo "keeping state in $stateDir" +mkdir -p $stateDir + rm -f ec2-amis.nix -types="hvm pv" +types="hvm" stores="ebs s3" regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" @@ -206,7 +205,7 @@ for type in $types; do # Register the AMI. if [ $type = pv ]; then - kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.04-$arch.gz" | jq -r .Images[0].ImageId) + kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.05-$arch.gz" | jq -r .Images[0].ImageId) if [ "$kernel" = null ]; then break; fi echo "using PV-GRUB kernel $kernel" extraFlags+=" --virtualization-type paravirtual --kernel $kernel" diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index 7f8a0d23027a..ef1801fe54be 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -1,15 +1,23 @@ -#! /bin/sh -e +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p google-cloud-sdk -BUCKET_NAME=${BUCKET_NAME:-nixos-images} -export NIX_PATH=nixpkgs=../../../.. -export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix -export TIMESTAMP=$(date +%Y%m%d%H%M) +set -euo pipefail + +BUCKET_NAME="${BUCKET_NAME:-nixos-images}" +TIMESTAMP="$(date +%Y%m%d%H%M)" +export TIMESTAMP nix-build '' \ - -A config.system.build.googleComputeImage --argstr system x86_64-linux -o gce --option extra-binary-caches http://hydra.nixos.org -j 10 + -A config.system.build.googleComputeImage \ + --arg configuration "{ imports = [ ]; }" \ + --argstr system x86_64-linux \ + -o gce \ + -j 10 -img=$(echo gce/*.tar.gz) -if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then - gsutil cp $img gs://${BUCKET_NAME}/$(basename $img) +img_path=$(echo gce/*.tar.gz) +img_name=$(basename "$img_path") +img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g') +if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then + gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name" fi -gcloud compute images create $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') --source-uri gs://${BUCKET_NAME}/$(basename $img) +gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name" diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix new file mode 100644 index 000000000000..3e163b8ec51e --- /dev/null +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -0,0 +1,270 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.fonts.fontconfig; + + fcBool = x: "" + (boolToString x) + ""; + + # back-supported fontconfig version and package + # version is used for font cache generation + supportVersion = "210"; + supportPkg = pkgs."fontconfig_${supportVersion}"; + + # latest fontconfig version and package + # version is used for configuration folder name, /etc/fonts/VERSION/ + # note: format differs from supportVersion and can not be used with makeCacheConf + latestVersion = pkgs.fontconfig.configVersion; + latestPkg = pkgs.fontconfig; + + # supported version fonts.conf + supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; }; + + # configuration file to read fontconfig cache + # version dependent + # priority 0 + cacheConfSupport = makeCacheConf { version = supportVersion; }; + cacheConfLatest = makeCacheConf {}; + + # generate the font cache setting file for a fontconfig version + # use latest when no version is passed + makeCacheConf = { version ? null }: + let + fcPackage = if builtins.isNull version + then "fontconfig" + else "fontconfig_${version}"; + makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; + cache = makeCache pkgs."${fcPackage}"; + cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}"; + in + pkgs.writeText "fc-00-nixos-cache.conf" '' + + + + + ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} + + ${cache} + ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' + ${cache32} + ''} + + ''; + + # The configuration to be included in /etc/font/ + penultimateConf = pkgs.runCommand "font-penultimate-conf" {} '' + support_folder=$out/etc/fonts/conf.d + latest_folder=$out/etc/fonts/${latestVersion}/conf.d + + mkdir -p $support_folder + mkdir -p $latest_folder + + ln -s ${supportFontsConf} $support_folder/../fonts.conf + ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ + $latest_folder/../fonts.conf + + # fontconfig-penultimate various configuration files + ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ + $support_folder + ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ + $latest_folder + + ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf + ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf + + rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf + ln -s ${antialiasConf} $support_folder/10-antialias.conf + ln -s ${antialiasConf} $latest_folder/10-antialias.conf + + rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf + ln -s ${hintingConf} $support_folder/10-hinting.conf + ln -s ${hintingConf} $latest_folder/10-hinting.conf + + ${optionalString cfg.useEmbeddedBitmaps '' + rm $support_folder/10-no-embedded-bitmaps.conf + rm $latest_folder/10-no-embedded-bitmaps.conf + ''} + + rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf + ln -s ${subpixelConf} $support_folder/10-subpixel.conf + ln -s ${subpixelConf} $latest_folder/10-subpixel.conf + + ${optionalString (cfg.dpi != 0) '' + ln -s ${dpiConf} $support_folder/11-dpi.conf + ln -s ${dpiConf} $latest_folder/11-dpi.conf + ''} + + ${optionalString (!cfg.includeUserConf) '' + rm $support_folder/50-user.conf + rm $latest_folder/50-user.conf + ''} + + # 51-local.conf + rm $latest_folder/51-local.conf + substitute \ + ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \ + $latest_folder/51-local.conf \ + --replace local.conf /etc/fonts/${latestVersion}/local.conf + + ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf + ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf + + ${optionalString cfg.allowBitmaps '' + rm $support_folder/53-no-bitmaps.conf + rm $latest_folder/53-no-bitmaps.conf + ''} + + ${optionalString (!cfg.allowType1) '' + ln -s ${rejectType1} $support_folder/53-no-type1.conf + ln -s ${rejectType1} $latest_folder/53-no-type1.conf + ''} + ''; + + hintingConf = pkgs.writeText "fc-10-hinting.conf" '' + + + + + + + + ${fcBool cfg.hinting.enable} + + + ${fcBool cfg.hinting.autohint} + + + hintslight + + + + + ''; + + antialiasConf = pkgs.writeText "fc-10-antialias.conf" '' + + + + + + + + ${fcBool cfg.antialias} + + + + + ''; + + subpixelConf = pkgs.writeText "fc-10-subpixel.conf" '' + + + + + + + + ${cfg.subpixel.rgba} + + + lcd${cfg.subpixel.lcdfilter} + + + + + ''; + + dpiConf = pkgs.writeText "fc-11-dpi.conf" '' + + + + + + + ${toString cfg.dpi} + + + + + ''; + + defaultFontsConf = + let genDefault = fonts: name: + optionalString (fonts != []) '' + + ${name} + + ${concatStringsSep "" + (map (font: '' + ${font} + '') fonts)} + + + ''; + in + pkgs.writeText "fc-52-nixos-default-fonts.conf" '' + + + + + + ${genDefault cfg.defaultFonts.sansSerif "sans-serif"} + + ${genDefault cfg.defaultFonts.serif "serif"} + + ${genDefault cfg.defaultFonts.monospace "monospace"} + + + ''; + + rejectType1 = pkgs.writeText "fc-53-no-type1.conf" '' + + + + + + + + + Type 1 + + + + + + ''; + +in +{ + + options = { + + fonts = { + + fontconfig = { + + penultimate = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable fontconfig-penultimate settings to supplement the + NixOS defaults by providing per-font rendering defaults and + metric aliases. + ''; + }; + }; + + }; + }; + + }; + + config = mkIf (config.fonts.fontconfig.enable && cfg.enable) { + + fonts.fontconfig.confPackages = [ penultimateConf ]; + + }; + +} diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index ed6429dda085..1bf9fdb19845 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -43,7 +43,7 @@ in ultimate = { enable = mkOption { type = types.bool; - default = true; + default = false; description = '' Enable fontconfig-ultimate settings (formerly known as Infinality). Besides the customizable settings in this NixOS diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 5648b7b1d027..12f5ca2e7993 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -20,7 +20,7 @@ with lib; let cfg = config.fonts.fontconfig; - fcBool = x: "" + (if x then "true" else "false") + ""; + fcBool = x: "" + (boolToString x) + ""; # back-supported fontconfig version and package # version is used for font cache generation @@ -75,23 +75,23 @@ let cfg = config.fonts.fontconfig; - - + + ${fcBool cfg.hinting.enable} - + ${fcBool cfg.hinting.autohint} - - hint${cfg.hinting.style} + + hintslight - + ${fcBool cfg.antialias} - + ${cfg.subpixel.rgba} - + lcd${cfg.subpixel.lcdfilter} @@ -104,13 +104,6 @@ let cfg = config.fonts.fontconfig; ''} - - - - ${fcBool cfg.forceAutohint} - - - ''; @@ -174,13 +167,6 @@ let cfg = config.fonts.fontconfig; - - - - ${fcBool cfg.renderMonoTTFAsBitmap} - - - ''; @@ -304,7 +290,11 @@ in antialias = mkOption { type = types.bool; default = true; - description = "Enable font antialiasing."; + description = '' + Enable font antialiasing. At high resolution (> 200 DPI), + antialiasing has no visible effect; users of such displays may want + to disable this option. + ''; }; dpi = mkOption { @@ -320,7 +310,7 @@ in type = types.lines; default = ""; description = '' - System-wide customization file contents, has higher priority than + System-wide customization file contents, has higher priority than defaultFonts settings. ''; }; @@ -358,26 +348,21 @@ in enable = mkOption { type = types.bool; default = true; - description = "Enable TrueType hinting."; + description = '' + Enable font hinting. Hinting aligns glyphs to pixel boundaries to + improve rendering sharpness at low resolution. At high resolution + (> 200 dpi) hinting will do nothing (at best); users of such + displays may want to disable this option. + ''; }; autohint = mkOption { type = types.bool; - default = true; + default = false; description = '' - Enable the autohinter, which provides hinting for otherwise - un-hinted fonts. The results are usually lower quality than - correctly-hinted fonts. - ''; - }; - - style = mkOption { - type = types.enum ["none" "slight" "medium" "full"]; - default = "full"; - description = '' - TrueType hinting style, one of none, - slight, medium, or - full. + Enable the autohinter in place of the default interpreter. + The results are usually lower quality than correctly-hinted + fonts, but better than unhinted fonts. ''; }; }; @@ -398,7 +383,15 @@ in default = "rgb"; type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; description = '' - Subpixel order. + Subpixel order. The overwhelming majority of displays are + rgb in their normal orientation. Select + vrgb for mounting such a display 90 degrees + clockwise from its normal orientation or vbgr + for mounting 90 degrees counter-clockwise. Select + bgr in the unlikely event of mounting 180 + degrees from the normal orientation. Reverse these directions in + the improbable event that the display's native subpixel order is + bgr. ''; }; @@ -406,7 +399,9 @@ in default = "default"; type = types.enum ["none" "default" "light" "legacy"]; description = '' - FreeType LCD filter. + FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering + has no visible effect; users of such displays may want to select + none. ''; }; @@ -444,31 +439,19 @@ in description = ''Use embedded bitmaps in fonts like Calibri.''; }; - forceAutohint = mkOption { - type = types.bool; - default = false; - description = '' - Force use of the TrueType Autohinter. Useful for debugging or - free-software purists. - ''; - }; - - renderMonoTTFAsBitmap = mkOption { - type = types.bool; - default = false; - description = ''Render some monospace TTF fonts as bitmaps.''; - }; - }; }; }; - config = mkIf cfg.enable { - fonts.fontconfig.confPackages = [ confPkg ]; - - environment.systemPackages = [ pkgs.fontconfig ]; - environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; - }; + config = mkMerge [ + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.fontconfig ]; + environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; + }) + (mkIf (cfg.enable && !cfg.penultimate.enable) { + fonts.fontconfig.confPackages = [ confPkg ]; + }) + ]; } diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index af3d93fc1bc4..0dd01df9da74 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -37,6 +37,7 @@ with lib; pkgs.xorg.fontbhlucidatypewriter75dpi pkgs.dejavu_fonts pkgs.freefont_ttf + pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts pkgs.liberation_ttf pkgs.xorg.fontbh100dpi pkgs.xorg.fontmiscmisc diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 799f0793c74f..65ef95127805 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -2,21 +2,27 @@ with lib; -let - - glibcLocales = pkgs.glibcLocales.override { - allLocales = any (x: x == "all") config.i18n.supportedLocales; - locales = config.i18n.supportedLocales; - }; - -in - { ###### interface options = { i18n = { + glibcLocales = mkOption { + type = types.path; + default = pkgs.glibcLocales.override { + allLocales = any (x: x == "all") config.i18n.supportedLocales; + locales = config.i18n.supportedLocales; + }; + example = literalExample "pkgs.glibcLocales"; + description = '' + Customized pkg.glibcLocales package. + + Changing this option can disable handling of i18n.defaultLocale + and supportedLocale. + ''; + }; + defaultLocale = mkOption { type = types.str; default = "en_US.UTF-8"; @@ -118,7 +124,7 @@ in ''); environment.systemPackages = - optional (config.i18n.supportedLocales != []) glibcLocales; + optional (config.i18n.supportedLocales != []) config.i18n.glibcLocales; environment.sessionVariables = { LANG = config.i18n.defaultLocale; @@ -126,7 +132,7 @@ in }; systemd.globalEnvironment = mkIf (config.i18n.supportedLocales != []) { - LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive"; }; # ‘/etc/locale.conf’ is used by systemd. diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index da875d6e4821..710dfdd01af5 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 4431dfb40859..cc967947dffb 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -178,10 +178,10 @@ in environment.etc = { # /etc/services: TCP/UDP port assignments. - "services".source = pkgs.iana_etc + "/etc/services"; + "services".source = pkgs.iana-etc + "/etc/services"; # /etc/protocols: IP protocol numbers. - "protocols".source = pkgs.iana_etc + "/etc/protocols"; + "protocols".source = pkgs.iana-etc + "/etc/protocols"; # /etc/rpc: RPC program numbers. "rpc".source = pkgs.glibc.out + "/etc/rpc"; @@ -222,13 +222,13 @@ in '' + cfg.extraResolvconfConf + '' ''; - } // (optionalAttrs config.services.resolved.enable ( - if dnsmasqResolve then { - "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; - } else { - "resolv.conf".source = "/run/systemd/resolve/resolv.conf"; - } - )); + } // optionalAttrs config.services.resolved.enable { + # 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"; + }; networking.proxy.envVars = optionalAttrs (cfg.proxy.default != null) { diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 4e5de421d8ac..16c43a99ad56 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -6,22 +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; + # 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 ["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" @@ -34,6 +41,7 @@ in { options = { # NSS modules. Hacky! + # Only works with nscd! system.nssModules = mkOption { type = types.listOf types.path; internal = true; @@ -53,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 @@ -76,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 bf66994b5022..b12ef2fe861d 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 { @@ -240,11 +242,14 @@ in { }; systemd.user = { services.pulseaudio = { + restartIfChanged = true; serviceConfig = { RestartSec = "500ms"; + PassEnvironment = "DISPLAY"; }; - environment = { DISPLAY = ":${toString config.services.xserver.display}"; }; - restartIfChanged = true; + }; + sockets.pulseaudio = { + wantedBy = [ "sockets.target" ]; }; }; }) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 8a7b3ea0bfd2..65f2e5d7af99 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -55,7 +55,7 @@ in environment.profileRelativeEnvVars = mkOption { type = types.attrsOf (types.listOf types.str); - example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; }; + example = { PATH = [ "/bin" ]; MANPATH = [ "/man" "/share/man" ]; }; description = '' Attribute set of environment variable. Each attribute maps to a list of relative paths. Each relative path is appended to the each profile @@ -168,9 +168,6 @@ in ${cfg.extraInit} - # The setuid/setcap wrappers override other bin directories. - export PATH="${config.security.wrapperDir}:$PATH" - # ~/bin if it exists overrides other bin directories. export PATH="$HOME/bin:$PATH" ''; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 61b02c5ffa6a..2114fb2b9d49 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -60,9 +60,10 @@ in # Hide kernel pointers (e.g. in /proc/modules) for unprivileged # users as these make it easier to exploit kernel vulnerabilities. - # - # Removed under grsecurity. - boot.kernel.sysctl."kernel.kptr_restrict" = - if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1; + boot.kernel.sysctl."kernel.kptr_restrict" = 1; + + # Disable YAMA by default to allow easy debugging. + boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0; + }; } diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 3ac5f634c7a6..cf3cc2f22628 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 000000000000..4fd6ba5ea605 --- /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/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index cbbe216e5a17..ef5e6346f02e 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -6,6 +6,21 @@ use JSON; make_path("/var/lib/nixos", { mode => 0755 }); +# Keep track of deleted uids and gids. +my $uidMapFile = "/var/lib/nixos/uid-map"; +my $uidMap = -e $uidMapFile ? decode_json(read_file($uidMapFile)) : {}; + +my $gidMapFile = "/var/lib/nixos/gid-map"; +my $gidMap = -e $gidMapFile ? decode_json(read_file($gidMapFile)) : {}; + + +sub updateFile { + my ($path, $contents, $perms) = @_; + write_file("$path.tmp", { binmode => ':utf8', perms => $perms // 0644 }, $contents); + rename("$path.tmp", $path) or die; +} + + sub hashPassword { my ($password) = @_; my $salt = ""; @@ -18,10 +33,10 @@ sub hashPassword { # Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in # /etc/login.defs. sub allocId { - my ($used, $idMin, $idMax, $up, $getid) = @_; + my ($used, $prevUsed, $idMin, $idMax, $up, $getid) = @_; my $id = $up ? $idMin : $idMax; while ($id >= $idMin && $id <= $idMax) { - if (!$used->{$id} && !defined &$getid($id)) { + if (!$used->{$id} && !$prevUsed->{$id} && !defined &$getid($id)) { $used->{$id} = 1; return $id; } @@ -31,23 +46,36 @@ sub allocId { die "$0: out of free UIDs or GIDs\n"; } -my (%gidsUsed, %uidsUsed); +my (%gidsUsed, %uidsUsed, %gidsPrevUsed, %uidsPrevUsed); sub allocGid { - return allocId(\%gidsUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) }); + my ($name) = @_; + my $prevGid = $gidMap->{$name}; + if (defined $prevGid && !defined $gidsUsed{$prevGid}) { + print STDERR "reviving group '$name' with GID $prevGid\n"; + $gidsUsed{$prevGid} = 1; + return $prevGid; + } + return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) }); } sub allocUid { - my ($isSystemUser) = @_; + my ($name, $isSystemUser) = @_; my ($min, $max, $up) = $isSystemUser ? (400, 499, 0) : (1000, 29999, 1); - return allocId(\%uidsUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); + my $prevUid = $uidMap->{$name}; + if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) { + print STDERR "reviving user '$name' with UID $prevUid\n"; + $uidsUsed{$prevUid} = 1; + return $prevUid; + } + return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); } # Read the declared users/groups. my $spec = decode_json(read_file($ARGV[0])); -# Don't allocate UIDs/GIDs that are already in use. +# Don't allocate UIDs/GIDs that are manually assigned. foreach my $g (@{$spec->{groups}}) { $gidsUsed{$g->{gid}} = 1 if defined $g->{gid}; } @@ -56,6 +84,11 @@ foreach my $u (@{$spec->{users}}) { $uidsUsed{$u->{uid}} = 1 if defined $u->{uid}; } +# Likewise for previously used but deleted UIDs/GIDs. +$uidsPrevUsed{$_} = 1 foreach values %{$uidMap}; +$gidsPrevUsed{$_} = 1 foreach values %{$gidMap}; + + # Read the current /etc/group. sub parseGroup { chomp; @@ -114,16 +147,18 @@ foreach my $g (@{$spec->{groups}}) { } } } else { - $g->{gid} = allocGid if !defined $g->{gid}; + $g->{gid} = allocGid($name) if !defined $g->{gid}; $g->{password} = "x"; } $g->{members} = join ",", sort(keys(%members)); $groupsOut{$name} = $g; + + $gidMap->{$name} = $g->{gid}; } # Update the persistent list of declarative groups. -write_file($declGroupsFile, { binmode => ':utf8' }, join(" ", sort(keys %groupsOut))); +updateFile($declGroupsFile, join(" ", sort(keys %groupsOut))); # Merge in the existing /etc/group. foreach my $name (keys %groupsCur) { @@ -140,8 +175,8 @@ foreach my $name (keys %groupsCur) { # Rewrite /etc/group. FIXME: acquire lock. my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" } (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut)); -write_file("/etc/group.tmp", { binmode => ':utf8' }, @lines); -rename("/etc/group.tmp", "/etc/group") or die; +updateFile($gidMapFile, encode_json($gidMap)); +updateFile("/etc/group", \@lines); system("nscd --invalidate group"); # Generate a new /etc/passwd containing the declared users. @@ -167,7 +202,7 @@ foreach my $u (@{$spec->{users}}) { $u->{uid} = $existing->{uid}; } } else { - $u->{uid} = allocUid($u->{isSystemUser}) if !defined $u->{uid}; + $u->{uid} = allocUid($name, $u->{isSystemUser}) if !defined $u->{uid}; if (defined $u->{initialPassword}) { $u->{hashedPassword} = hashPassword($u->{initialPassword}); @@ -177,7 +212,7 @@ foreach my $u (@{$spec->{users}}) { } # Create a home directory. - if ($u->{createHome} && ! -e $u->{home}) { + if ($u->{createHome}) { make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home}; chown $u->{uid}, $u->{gid}, $u->{home}; } @@ -195,10 +230,12 @@ foreach my $u (@{$spec->{users}}) { $u->{fakePassword} = $existing->{fakePassword} // "x"; $usersOut{$name} = $u; + + $uidMap->{$name} = $u->{uid}; } # Update the persistent list of declarative users. -write_file($declUsersFile, { binmode => ':utf8' }, join(" ", sort(keys %usersOut))); +updateFile($declUsersFile, join(" ", sort(keys %usersOut))); # Merge in the existing /etc/passwd. foreach my $name (keys %usersCur) { @@ -214,8 +251,8 @@ foreach my $name (keys %usersCur) { # Rewrite /etc/passwd. FIXME: acquire lock. @lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" } (sort { $a->{uid} <=> $b->{uid} } (values %usersOut)); -write_file("/etc/passwd.tmp", { binmode => ':utf8' }, @lines); -rename("/etc/passwd.tmp", "/etc/passwd") or die; +updateFile($uidMapFile, encode_json($uidMap)); +updateFile("/etc/passwd", \@lines); system("nscd --invalidate passwd"); @@ -242,5 +279,4 @@ foreach my $u (values %usersOut) { push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n"; } -write_file("/etc/shadow.tmp", { binmode => ':utf8', perms => 0600 }, @shadowNew); -rename("/etc/shadow.tmp", "/etc/shadow") or die; +updateFile("/etc/shadow", \@shadowNew, 0600); diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 57e4940378ba..0e7ffbd3c2e1 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -244,6 +244,17 @@ let ''; }; + packages = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.firefox pkgs.thunderbird ]"; + description = '' + The set of packages that should be made availabe to the user. + This is in contrast to , + which adds packages to all users. + ''; + }; + }; config = mkMerge @@ -568,5 +579,17 @@ in { imports = [ (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ]) + { + environment = { + etc = mapAttrs' (name: { packages, ... }: { + name = "per-user-pkgs/${name}"; + value.source = pkgs.symlinkJoin { + name = "per-user-pkgs.${name}"; + paths = packages; + }; + }) (filterAttrs (_: { packages, ... }: packages != []) cfg.users); + profiles = ["/etc/per-user-pkgs/$LOGNAME"]; + }; + } ]; } diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index fb8e1ccab667..afaa65f6ce35 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -2,7 +2,9 @@ with lib; -{ +let + cfg = config.hardware; +in { ###### interface @@ -12,7 +14,16 @@ with lib; default = false; type = types.bool; description = '' - Turn on this option if you want to enable all the firmware shipped in linux-firmware. + Turn on this option if you want to enable all the firmware. + ''; + }; + + hardware.enableRedistributableFirmware = mkOption { + default = false; + type = types.bool; + description = '' + Turn on this option if you want to enable all the firmware with a license allowing redistribution. + (i.e. free firmware and firmware-linux-nonfree) ''; }; @@ -21,12 +32,27 @@ with lib; ###### implementation - config = mkIf config.hardware.enableAllFirmware { - hardware.firmware = with pkgs; [ - firmwareLinuxNonfree - intel2200BGFirmware - rtl8723bs-firmware - ]; - }; - + config = mkMerge [ + (mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) { + hardware.firmware = with pkgs; [ + firmwareLinuxNonfree + intel2200BGFirmware + rtl8723bs-firmware + rtl8192su-firmware + ]; + }) + (mkIf cfg.enableAllFirmware { + assertions = [{ + assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false); + message = '' + the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files. + This requires nixpkgs.config.allowUnfree to be true. + An alternative is to use the hardware.enableRedistributableFirmware option. + ''; + }]; + hardware.firmware = with pkgs; [ + broadcom-bt-firmware + ]; + }) + ]; } diff --git a/nixos/modules/hardware/network/broadcom-43xx.nix b/nixos/modules/hardware/network/broadcom-43xx.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/broadcom-43xx.nix +++ b/nixos/modules/hardware/network/broadcom-43xx.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-2030.nix b/nixos/modules/hardware/network/intel-2030.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/intel-2030.nix +++ b/nixos/modules/hardware/network/intel-2030.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix index 89fdce415dda..0ec81474ad3e 100644 --- a/nixos/modules/hardware/network/intel-2100bg.nix +++ b/nixos/modules/hardware/network/intel-2100bg.nix @@ -23,7 +23,7 @@ config = lib.mkIf config.networking.enableIntel2100BGFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; }; diff --git a/nixos/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix index f4f19d208348..27a3f228b7d1 100644 --- a/nixos/modules/hardware/network/intel-3945abg.nix +++ b/nixos/modules/hardware/network/intel-3945abg.nix @@ -22,7 +22,7 @@ config = lib.mkIf config.networking.enableIntel3945ABGFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; }; diff --git a/nixos/modules/hardware/network/intel-4965agn.nix b/nixos/modules/hardware/network/intel-4965agn.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/intel-4965agn.nix +++ b/nixos/modules/hardware/network/intel-4965agn.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-5000.nix b/nixos/modules/hardware/network/intel-5000.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/intel-5000.nix +++ b/nixos/modules/hardware/network/intel-5000.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-5150.nix b/nixos/modules/hardware/network/intel-5150.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/intel-5150.nix +++ b/nixos/modules/hardware/network/intel-5150.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-6000.nix b/nixos/modules/hardware/network/intel-6000.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/intel-6000.nix +++ b/nixos/modules/hardware/network/intel-6000.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-6000g2a.nix b/nixos/modules/hardware/network/intel-6000g2a.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/intel-6000g2a.nix +++ b/nixos/modules/hardware/network/intel-6000g2a.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-6000g2b.nix b/nixos/modules/hardware/network/intel-6000g2b.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/network/intel-6000g2b.nix +++ b/nixos/modules/hardware/network/intel-6000g2b.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix index 0469ae3a1fb3..36182e2cb996 100644 --- a/nixos/modules/hardware/network/ralink.nix +++ b/nixos/modules/hardware/network/ralink.nix @@ -20,7 +20,7 @@ ###### implementation config = lib.mkIf config.networking.enableRalinkFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; }; } diff --git a/nixos/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix index deae6355492c..bf328c2d3224 100644 --- a/nixos/modules/hardware/network/rtl8192c.nix +++ b/nixos/modules/hardware/network/rtl8192c.nix @@ -20,7 +20,7 @@ ###### implementation config = lib.mkIf config.networking.enableRTL8192cFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; }; } diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix new file mode 100644 index 000000000000..bd440de69722 --- /dev/null +++ b/nixos/modules/hardware/nitrokey.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.hardware.nitrokey; + +in + +{ + options.hardware.nitrokey = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables udev rules for Nitrokey devices. By default grants access + to users in the "nitrokey" group. You may want to install the + nitrokey-app package, depending on your device and needs. + ''; + }; + + group = mkOption { + type = types.str; + default = "nitrokey"; + example = "wheel"; + description = '' + Grant access to Nitrokey devices to users in this group. + ''; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ + (pkgs.nitrokey-udev-rules.override (attrs: + { inherit (cfg) group; } + )) + ]; + users.extraGroups."${cfg.group}" = {}; + }; +} diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix new file mode 100644 index 000000000000..a8bc18800021 --- /dev/null +++ b/nixos/modules/hardware/sensor/iio.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + + options = { + hardware.sensor.iio = { + enable = mkOption { + description = "Enable this option to support IIO sensors."; + type = types.bool; + default = false; + }; + }; + }; + + ###### implementation + + config = mkIf config.hardware.sensor.iio.enable { + + boot.initrd.availableKernelModules = [ "hid-sensor-hub" ]; + + environment.systemPackages = with pkgs; [ iio-sensor-proxy ]; + + services.dbus.packages = with pkgs; [ iio-sensor-proxy ]; + services.udev.packages = with pkgs; [ iio-sensor-proxy ]; + systemd.packages = with pkgs; [ iio-sensor-proxy ]; + }; +} diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixos/modules/hardware/video/displaylink.nix index 2a9382f39410..669ac849cbad 100644 --- a/nixos/modules/hardware/video/displaylink.nix +++ b/nixos/modules/hardware/video/displaylink.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -6,7 +6,11 @@ let enabled = elem "displaylink" config.services.xserver.videoDrivers; - displaylink = config.boot.kernelPackages.displaylink; + evdi = config.boot.kernelPackages.evdi; + + displaylink = pkgs.displaylink.override { + inherit evdi; + }; in @@ -14,15 +18,11 @@ in config = mkIf enabled { - boot.extraModulePackages = [ displaylink ]; - - boot.kernelModules = [ "evdi" ]; + boot.extraModulePackages = [ evdi ]; # Those are taken from displaylink-installer.sh and from Arch Linux AUR package. - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess" - ''; + services.udev.packages = [ displaylink ]; powerManagement.powerDownCommands = '' #flush any bytes in pipe @@ -32,7 +32,10 @@ in echo "S" > /tmp/PmMessagesPort_in #wait until suspend of DisplayLinkManager finish - read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out + if [ -f /tmp/PmMessagesPort_out ]; then + #wait until suspend of DisplayLinkManager finish + read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out + fi ''; powerManagement.resumeCommands = '' @@ -40,10 +43,11 @@ in echo "R" > /tmp/PmMessagesPort_in ''; - systemd.services.displaylink = { + systemd.services.dlm = { description = "DisplayLink Manager Service"; after = [ "display-manager.service" ]; - wantedBy = [ "graphical.target" ]; + conflicts = [ "getty@tty7.service" ]; + path = [ pkgs.kmod ]; serviceConfig = { ExecStart = "${displaylink}/bin/DisplayLinkManager"; @@ -53,6 +57,7 @@ in preStart = '' mkdir -p /var/log/displaylink + modprobe evdi ''; }; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 161ed9457af9..80abec95c03d 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -28,7 +28,7 @@ let nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; nvidiaPackage = nvidia: pkgs: - if !nvidia.useGLVND then nvidia + if !nvidia.useGLVND then nvidia.out else pkgs.buildEnv { name = "nvidia-libs"; paths = [ pkgs.libglvnd nvidia.out ]; @@ -56,7 +56,8 @@ in hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs; hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686; - environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings nvidia_x11.persistenced ]; + environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] + ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; boot.extraModulePackages = [ nvidia_x11.bin ]; diff --git a/nixos/modules/hardware/video/radeon.nix b/nixos/modules/hardware/video/radeon.nix index 8fecdae36bf2..c92b7a0509d0 100644 --- a/nixos/modules/hardware/video/radeon.nix +++ b/nixos/modules/hardware/video/radeon.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index cd6e72755dea..663ff24c81f1 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -6,6 +6,16 @@ with lib; let + # Do not include these things: + # - The '.git' directory + # - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...) + # - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...) + filterFn = path: type: let basename = baseNameOf (toString path); in + if type == "directory" then basename != ".git" + else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null + else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null; + + nixpkgs = builtins.filterSource filterFn pkgs.path; # We need a copy of the Nix expressions for Nixpkgs and NixOS on the # CD. These are installed into the "nixos" channel of the root @@ -15,12 +25,11 @@ let { } '' mkdir -p $out - cp -prd ${pkgs.path} $out/nixos + cp -prd ${nixpkgs} $out/nixos chmod -R u+w $out/nixos if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi - rm -rf $out/nixos/.git echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix ''; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 85163305c1ef..8891ce0b6667 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -50,6 +50,13 @@ let LINUX /boot/bzImage APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset INITRD /boot/initrd + + # A variant to boot with 'copytoram' + LABEL boot-copytoram + MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with copytoram) + LINUX /boot/bzImage + APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram + INITRD /boot/initrd ''; isolinuxMemtest86Entry = '' @@ -78,6 +85,12 @@ let echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-nomodeset.conf echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset" >> $out/loader/entries/nixos-livecd-nomodeset.conf + # A variant to boot with 'copytoram' + echo "title NixOS Live CD (with copytoram)" > $out/loader/entries/nixos-livecd-copytoram.conf + echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-copytoram.conf + echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-copytoram.conf + echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram" >> $out/loader/entries/nixos-livecd-copytoram.conf + echo "default nixos-livecd" > $out/loader/loader.conf echo "timeout ${builtins.toString config.boot.loader.timeout}" >> $out/loader/loader.conf ''; @@ -172,7 +185,6 @@ in isoImage.includeSystemBuildDependencies = mkOption { default = false; - example = true; description = '' Set this option to include all the needed sources etc in the image. It significantly increases image size. Use that when diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index c769bc80a481..063ffb191ee6 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -10,7 +10,6 @@ let in { imports = [ - ../../profiles/minimal.nix ../../profiles/installation-device.nix ./sd-image.nix ]; diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 0b858746ff0a..1c664e025036 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -10,7 +10,6 @@ let in { imports = [ - ../../profiles/minimal.nix ../../profiles/installation-device.nix ./sd-image.nix ]; @@ -28,7 +27,7 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"]; + boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 886ffd9a0923..3f2970757bd2 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -10,7 +10,6 @@ let in { imports = [ - ../../profiles/minimal.nix ../../profiles/installation-device.nix ./sd-image.nix ]; diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix index e1a3052ba957..903933e2df02 100644 --- a/nixos/modules/installer/scan/not-detected.nix +++ b/nixos/modules/installer/scan/not-detected.nix @@ -5,5 +5,5 @@ with lib; { - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; } diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix index dfb43d1a1db9..a4d4f16d1d96 100644 --- a/nixos/modules/installer/tools/auto-upgrade.nix +++ b/nixos/modules/installer/tools/auto-upgrade.nix @@ -48,7 +48,7 @@ let cfg = config.system.autoUpgrade; in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the update will occur. ''; }; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 07623fd591de..4568a20e7789 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/4ssykr786d0wp7y6m4xd4qwqs4nrry1z-nix-1.11.7"; - i686-linux = "/nix/store/61ggxx2072y2g877m01asy0lsn7xpn06-nix-1.11.7"; - x86_64-darwin = "/nix/store/pxf5ri5kdbfqkhd10sw4lpj8sn385ks5-nix-1.11.7"; + 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 57bc249360e7..087fbcd4512f 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -87,38 +87,6 @@ if ! test -e "$mountPoint"; then exit 1 fi - -# Mount some stuff in the target root directory. -mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home -mkdir -m 01777 -p $mountPoint/tmp -mkdir -m 0755 -p $mountPoint/tmp/root -mkdir -m 0755 -p $mountPoint/var -mkdir -m 0700 -p $mountPoint/root -mount --rbind /dev $mountPoint/dev -mount --rbind /proc $mountPoint/proc -mount --rbind /sys $mountPoint/sys -mount --rbind / $mountPoint/tmp/root -mount -t tmpfs -o "mode=0755" none $mountPoint/run -rm -rf $mountPoint/var/run -ln -s /run $mountPoint/var/run -for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done -for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done - -cp -Lf "@cacert@" "$mountPoint/tmp/ca-cert.crt" -export SSL_CERT_FILE=/tmp/ca-cert.crt -# For Nix 1.7 -export CURL_CA_BUNDLE=/tmp/ca-cert.crt - -if [ -n "$runChroot" ]; then - if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then - echo "$0: installation not finished; cannot chroot into installation directory" - exit 1 - fi - ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system - exec chroot $mountPoint "${chrootCommand[@]}" -fi - - # Get the path of the NixOS configuration file. if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix @@ -130,121 +98,60 @@ if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then fi -# Create the necessary Nix directories on the target device, if they -# don't already exist. -mkdir -m 0755 -p \ - $mountPoint/nix/var/nix/gcroots \ - $mountPoint/nix/var/nix/temproots \ - $mountPoint/nix/var/nix/userpool \ - $mountPoint/nix/var/nix/profiles \ - $mountPoint/nix/var/nix/db \ - $mountPoint/nix/var/log/nix/drvs - -mkdir -m 1775 -p $mountPoint/nix/store -chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store - - -# There is no daemon in the chroot. -unset NIX_REMOTE - - -# We don't have locale-archive in the chroot, so clear $LANG. -export LANG= -export LC_ALL= -export LC_TIME= - - # Builds will use users that are members of this group extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup") - # Inherit binary caches from the host +# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')" extraBuildFlags+=(--option "binary-caches" "$binary_caches") +nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" +export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" +unset NIXOS_CONFIG -# Copy Nix to the Nix store on the target device, unless it's already there. -if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> /dev/null; then - echo "copying Nix to $mountPoint...." - for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do - echo " $i" - chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit - @rsync@/bin/rsync -a $i $mountPoint/nix/store/ - done - - # Register the paths in the Nix closure as valid. This is necessary - # to prevent them from being deleted the first time we install - # something. (I.e., Nix will see that, e.g., the glibc path is not - # valid, delete it to get it out of the way, but as a result nothing - # will work anymore.) - chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@ -fi +# TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough? -# Create the required /bin/sh symlink; otherwise lots of things -# (notably the system() function) won't work. -mkdir -m 0755 -p $mountPoint/bin -# !!! assuming that @shell@ is in the closure -ln -sf @shell@ $mountPoint/bin/sh +# A place to drop temporary closures +trap "rm -rf $tmpdir" EXIT +tmpdir="$(mktemp -d)" +# Build a closure (on the host; we then copy it into the guest) +function closure() { + nix-build "${extraBuildFlags[@]}" --no-out-link -E "with import {}; runCommand \"closure\" { exportReferencesGraph = [ \"x\" (buildEnv { name = \"env\"; paths = [ ($1) stdenv ]; }) ]; } \"cp x \$out\"" +} -# Build hooks likely won't function correctly in the minimal chroot; just disable them. -unset NIX_BUILD_HOOK - -# Make the build below copy paths from the CD if possible. Note that -# /tmp/root in the chroot is the root of the CD. -export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES - -p=@nix@/libexec/nix/substituters -export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl - +system_closure="$tmpdir/system.closure" if [ -z "$closure" ]; then - # Get the absolute path to the NixOS/Nixpkgs sources. - nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))" - - nixEnvAction="-f --set -A system" + expr="(import {}).system" + system_root="$(nix-build -E "$expr")" + system_closure="$(closure "$expr")" else - nixpkgs="" - nixEnvAction="--set $closure" + system_root=$closure + # Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure + # to the filesytem we're preparing. Also delete it on exit! + nix-store --export $(nix-store -qR $closure) > $system_closure fi -# Build the specified Nix expression in the target store and install -# it into the system configuration profile. -echo "building the system configuration..." -NIX_PATH="nixpkgs=/tmp/root/$nixpkgs:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \ - chroot $mountPoint @nix@/bin/nix-env \ - "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system $nixEnvAction +channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" +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" -# Copy the NixOS/Nixpkgs sources to the target as the initial contents -# of the NixOS channel. -mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles -mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user -mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root -srcs=$(nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "") -if [ -z "$noChannelCopy" ] && [ -n "$srcs" ]; then - echo "copying NixOS/Nixpkgs sources..." - chroot $mountPoint @nix@/bin/nix-env \ - "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet -fi -mkdir -m 0700 -p $mountPoint/root/.nix-defexpr -ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels - - -# Get rid of the /etc bind mounts. -for f in /etc/passwd /etc/group; do [ -f "$f" ] && umount $mountPoint/$f; done +# 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 +mount --rbind /dev $mountPoint/dev +mount --rbind /proc $mountPoint/proc +mount --rbind /sys $mountPoint/sys # Grub needs an mtab. ln -sfn /proc/mounts $mountPoint/etc/mtab - -# Mark the target as a NixOS installation, otherwise -# switch-to-configuration will chicken out. -touch $mountPoint/etc/NIXOS - - # Switch to the new system configuration. This will install Grub with # a menu default pointing at the kernel/initrd/etc of the new # configuration. diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh new file mode 100644 index 000000000000..0bd70d2d349c --- /dev/null +++ b/nixos/modules/installer/tools/nixos-prepare-root.sh @@ -0,0 +1,105 @@ +#! @shell@ + +# This script's goal is to perform all "static" setup of a filesystem structure from pre-built store paths. Everything +# in here should run in a non-root context and inside a Nix builder. It's designed primarily to be called from image- +# building scripts and from nixos-install, but because it makes very few assumptions about the context in which it runs, +# it could be useful in other contexts as well. +# +# Current behavior: +# - set up basic filesystem structure +# - make Nix store etc. +# - copy Nix, system, channel, and misceallaneous closures to target Nix store +# - register validity of all paths in the target store +# - set up channel and system profiles + +# Ensure a consistent umask. +umask 0022 + +set -e + +mountPoint="$1" +channel="$2" +system="$3" +shift 3 +closures="$@" + +PATH="@coreutils@/bin:@nix@/bin:@perl@/bin:@utillinux@/bin:@rsync@/bin" + +if ! test -e "$mountPoint"; then + echo "mount point $mountPoint doesn't exist" + exit 1 +fi + +# Create a few of the standard directories in the target root directory. +mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home +mkdir -m 01777 -p $mountPoint/tmp +mkdir -m 0755 -p $mountPoint/tmp/root +mkdir -m 0755 -p $mountPoint/var +mkdir -m 0700 -p $mountPoint/root + +ln -sf /run $mountPoint/var/run + +# Create the necessary Nix directories on the target device +mkdir -m 0755 -p \ + $mountPoint/nix/var/nix/gcroots \ + $mountPoint/nix/var/nix/temproots \ + $mountPoint/nix/var/nix/userpool \ + $mountPoint/nix/var/nix/profiles \ + $mountPoint/nix/var/nix/db \ + $mountPoint/nix/var/log/nix/drvs + +mkdir -m 1775 -p $mountPoint/nix/store + +# All Nix operations below should operate on our target store, not /nix/store. +# N.B: this relies on Nix 1.12 or higher +export NIX_REMOTE=local?root=$mountPoint + +# Copy our closures to the Nix store on the target mount point, unless they're already there. +for i in $closures; do + # We support closures both in the format produced by `nix-store --export` and by `exportReferencesGraph`, + # mostly because there doesn't seem to be a single format that can be produced outside of a nix build and + # inside one. See https://github.com/NixOS/nix/issues/1242 for more discussion. + if [[ "$i" =~ \.closure$ ]]; then + echo "importing serialized closure $i to $mountPoint..." + nix-store --import < $i + else + # There has to be a better way to do this, right? + echo "copying closure $i to $mountPoint..." + for j in $(perl @pathsFromGraph@ $i); do + echo " $j... " + rsync -a $j $mountPoint/nix/store/ + done + + nix-store --option build-users-group root --register-validity < $i + fi +done + +# Create the required /bin/sh symlink; otherwise lots of things +# (notably the system() function) won't work. +if [ ! -x $mountPoint/@shell@ ]; then + echo "Error: @shell@ wasn't included in the closure" >&2 + exit 1 +fi +mkdir -m 0755 -p $mountPoint/bin +ln -sf @shell@ $mountPoint/bin/sh + +echo "setting the system closure to '$system'..." +nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set "$system" + +ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system + +# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel. +mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles +mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user +mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root + +if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then + echo "copying channel..." + nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet +fi +mkdir -m 0700 -p $mountPoint/root/.nix-defexpr +ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels + +# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. +touch $mountPoint/etc/NIXOS + diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 4b5e7b3230c8..9ede74a54cd7 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/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index a35f6ad8ae54..a3bae78c0ffc 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -4,7 +4,6 @@ { config, pkgs, modulesPath, ... }: let - cfg = config.installer; makeProg = args: pkgs.substituteAll (args // { @@ -17,6 +16,14 @@ let src = ./nixos-build-vms/nixos-build-vms.sh; }; + nixos-prepare-root = makeProg { + name = "nixos-prepare-root"; + src = ./nixos-prepare-root.sh; + + nix = pkgs.nixUnstable; + inherit (pkgs) perl pathsFromGraph rsync utillinux coreutils; + }; + nixos-install = makeProg { name = "nixos-install"; src = ./nixos-install.sh; @@ -26,6 +33,7 @@ let cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; root_uid = config.ids.uids.root; nixbld_gid = config.ids.gids.nixbld; + prepare_root = nixos-prepare-root; nixClosure = pkgs.runCommand "closure" { exportReferencesGraph = ["refs" config.nix.package.out]; } @@ -69,6 +77,7 @@ in environment.systemPackages = [ nixos-build-vms + nixos-prepare-root nixos-install nixos-rebuild nixos-generate-config @@ -77,7 +86,7 @@ in ]; system.build = { - inherit nixos-install nixos-generate-config nixos-option nixos-rebuild; + inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild; }; }; diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index 19002b17dace..f4ee94ecc0d7 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -2,16 +2,6 @@ { _module.args = { - pkgs_i686 = import ../../.. { - system = "i686-linux"; - # FIXME: we enable config.allowUnfree to make packages like - # nvidia-x11 available. This isn't a problem because if the user has - # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on - # the 64-bit package anyway. However, it would be cleaner to respect - # nixpkgs.config here. - config.allowUnfree = true; - }; - utils = import ../../lib/utils.nix pkgs; }; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index feecee3225be..84d89510679c 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; @@ -289,6 +290,13 @@ rpc = 271; geoip = 272; fcron = 273; + sonarr = 274; + radarr = 275; + jackett = 276; + 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! @@ -408,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; @@ -547,6 +556,13 @@ #rpc = 271; # unused #geoip = 272; # unused fcron = 273; + sonarr = 274; + radarr = 275; + jackett = 276; + 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/locate.nix b/nixos/modules/misc/locate.nix index 6d9bc915ba03..0fe91435ce8c 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -131,9 +131,9 @@ in { path = mkIf (!isMLocate) [ pkgs.su ]; script = '' - install -m ${if isMLocate then "0750" else "0755"} -o root -g ${if isMLocate then "mlocate" else "root"} -d $(dirname ${cfg.output}) + mkdir -m 0755 -p ${dirOf cfg.output} exec ${cfg.locate}/bin/updatedb \ - ${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \ + ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; environment = { diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index 6a5738e47ff3..7a1e751394c0 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/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index b8824e6374b3..1793c1447d60 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -42,6 +42,8 @@ let merge = lib.mergeOneOption; }; + _pkgs = import ../../.. config.nixpkgs; + in { @@ -97,6 +99,9 @@ in }; config = { - _module.args.pkgs = import ../../.. config.nixpkgs; + _module.args = { + pkgs = _pkgs; + pkgs_i686 = _pkgs.pkgsi686Linux; + }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7d2ae4a571c4..e7dea5cb9dad 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1,8 +1,9 @@ [ ./config/debug-info.nix ./config/fonts/corefonts.nix - ./config/fonts/fontconfig-ultimate.nix ./config/fonts/fontconfig.nix + ./config/fonts/fontconfig-penultimate.nix + ./config/fonts/fontconfig-ultimate.nix ./config/fonts/fontdir.nix ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix @@ -20,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 @@ -29,6 +31,7 @@ ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/sensor/iio.nix ./hardware/ksm.nix ./hardware/mcelog.nix ./hardware/network/b43.nix @@ -37,6 +40,7 @@ ./hardware/network/intel-3945abg.nix ./hardware/network/ralink.nix ./hardware/network/rtl8192c.nix + ./hardware/nitrokey.nix ./hardware/opengl.nix ./hardware/pcmcia.nix ./hardware/usb-wwan.nix @@ -69,6 +73,7 @@ ./programs/atop.nix ./programs/bash/bash.nix ./programs/blcr.nix + ./programs/browserpass.nix ./programs/cdemu.nix ./programs/chromium.nix ./programs/command-not-found/command-not-found.nix @@ -76,6 +81,7 @@ ./programs/environment.nix ./programs/fish.nix ./programs/freetds.nix + ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/info.nix ./programs/java.nix @@ -86,12 +92,15 @@ ./programs/mtr.nix ./programs/nano.nix ./programs/oblogout.nix + ./programs/qt5ct.nix ./programs/screen.nix + ./programs/slock.nix ./programs/shadow.nix ./programs/shell.nix ./programs/spacefm.nix ./programs/ssh.nix ./programs/ssmtp.nix + ./programs/thefuck.nix ./programs/tmux.nix ./programs/venus.nix ./programs/vim.nix @@ -99,18 +108,22 @@ ./programs/wvdial.nix ./programs/xfs_quota.nix ./programs/xonsh.nix + ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh.nix + ./programs/zsh/zsh-syntax-highlighting.nix ./rename.nix ./security/acme.nix ./security/apparmor.nix ./security/apparmor-suid.nix ./security/audit.nix + ./security/auditd.nix ./security/ca.nix ./security/chromium-suid-sandbox.nix ./security/dhparams.nix ./security/duosec.nix ./security/grsecurity.nix ./security/hidepid.nix + ./security/lock-kernel-modules.nix ./security/oath.nix ./security/pam.nix ./security/pam_usb.nix @@ -121,6 +134,10 @@ ./security/rtkit.nix ./security/wrappers/default.nix ./security/sudo.nix + ./service-managers/docker.nix + ./service-managers/trivial.nix + ./services/admin/salt/master.nix + ./services/admin/salt/minion.nix ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix @@ -128,6 +145,7 @@ ./services/audio/liquidsoap.nix ./services/audio/mpd.nix ./services/audio/mopidy.nix + ./services/audio/slimserver.nix ./services/audio/squeezelite.nix ./services/audio/ympd.nix ./services/backup/almir.nix @@ -136,7 +154,6 @@ ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/rsnapshot.nix - ./services/backup/sitecopy-backup.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix ./services/cluster/fleet.nix @@ -158,6 +175,7 @@ ./services/continuous-integration/jenkins/slave.nix ./services/databases/4store-endpoint.nix ./services/databases/4store.nix + ./services/databases/clickhouse.nix ./services/databases/couchdb.nix ./services/databases/firebird.nix ./services/databases/hbase.nix @@ -178,6 +196,7 @@ ./services/desktops/geoclue2.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/evolution-data-server.nix + ./services/desktops/gnome3/gnome-disks.nix ./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-online-accounts.nix @@ -218,22 +237,26 @@ ./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/syslogd.nix ./services/logging/syslog-ng.nix + ./services/logging/syslogd.nix ./services/mail/dovecot.nix ./services/mail/dspam.nix ./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 @@ -244,8 +267,10 @@ ./services/mail/spamassassin.nix ./services/mail/rspamd.nix ./services/mail/rmilter.nix + ./services/mail/nullmailer.nix ./services/misc/apache-kafka.nix ./services/misc/autofs.nix + ./services/misc/autorandr.nix ./services/misc/bepasty.nix ./services/misc/canto-daemon.nix ./services/misc/calibre-server.nix @@ -262,8 +287,10 @@ ./services/misc/emby.nix ./services/misc/errbot.nix ./services/misc/etcd.nix + ./services/misc/exhibitor.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix + ./services/misc/fstrim.nix ./services/misc/gammu-smsd.nix ./services/misc/geoip-updater.nix #./services/misc/gitit.nix @@ -272,6 +299,8 @@ ./services/misc/gogs.nix ./services/misc/gpsd.nix #./services/misc/ihaskell.nix + ./services/misc/irkerd.nix + ./services/misc/jackett.nix ./services/misc/leaps.nix ./services/misc/mantisbt.nix ./services/misc/mathics.nix @@ -292,12 +321,14 @@ ./services/misc/parsoid.nix ./services/misc/phd.nix ./services/misc/plex.nix + ./services/misc/radarr.nix ./services/misc/redmine.nix ./services/misc/rippled.nix ./services/misc/ripple-rest.nix ./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 @@ -315,7 +346,7 @@ ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix - ./services/monitoring/dd-agent.nix + ./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/grafana.nix ./services/monitoring/graphite.nix ./services/monitoring/hdaps.nix @@ -325,13 +356,16 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix + ./services/monitoring/osquery.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/blackbox-exporter.nix + ./services/monitoring/prometheus/fritzbox-exporter.nix ./services/monitoring/prometheus/json-exporter.nix ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/prometheus/snmp-exporter.nix + ./services/monitoring/prometheus/unifi-exporter.nix ./services/monitoring/prometheus/varnish-exporter.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix @@ -351,6 +385,7 @@ ./services/network-filesystems/cachefilesd.nix ./services/network-filesystems/drbd.nix ./services/network-filesystems/glusterfs.nix + ./services/network-filesystems/kbfs.nix ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix @@ -362,7 +397,6 @@ ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix - ./services/networking/aiccu.nix ./services/networking/amuled.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix @@ -411,10 +445,14 @@ ./services/networking/i2p.nix ./services/networking/iodine.nix ./services/networking/ircd-hybrid/default.nix + ./services/networking/iwd.nix + ./services/networking/keepalived/default.nix + ./services/networking/keybase.nix ./services/networking/kippo.nix ./services/networking/kresd.nix ./services/networking/lambdabot.nix ./services/networking/libreswan.nix + ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix ./services/networking/mailpile.nix ./services/networking/mfi.nix @@ -449,13 +487,14 @@ ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix - ./services/networking/quagga.nix + # ./services/networking/quagga.nix ./services/networking/quassel.nix ./services/networking/racoon.nix ./services/networking/radicale.nix ./services/networking/radvd.nix ./services/networking/rdnssd.nix ./services/networking/redsocks.nix + ./services/networking/resilio.nix ./services/networking/rpcbind.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix @@ -492,6 +531,7 @@ ./services/networking/wpa_supplicant.nix ./services/networking/xinetd.nix ./services/networking/xl2tpd.nix + ./services/networking/xrdp.nix ./services/networking/zerobin.nix ./services/networking/zerotierone.nix ./services/networking/znc.nix @@ -517,14 +557,19 @@ ./services/security/munge.nix ./services/security/oauth2_proxy.nix ./services/security/physlock.nix - ./services/security/torify.nix + ./services/security/shibboleth-sp.nix + ./services/security/sshguard.nix ./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 @@ -540,6 +585,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 @@ -549,9 +595,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 @@ -590,6 +638,7 @@ ./services/x11/window-managers/windowlab.nix ./services/x11/window-managers/wmii.nix ./services/x11/window-managers/xmonad.nix + ./services/x11/xautolock.nix ./services/x11/xbanish.nix ./services/x11/xfs.nix ./services/x11/xserver.nix @@ -650,6 +699,7 @@ ./tasks/scsi-link-power-management.nix ./tasks/swraid.nix ./tasks/trackpoint.nix + ./tasks/powertop.nix ./testing/service-runner.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 6b4d8c737eba..6e6ae98e19fc 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" @@ -50,7 +53,7 @@ ]; # Include lots of firmware. - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; imports = [ ../hardware/network/zydas-zd1211.nix ]; diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix new file mode 100644 index 000000000000..0a0838431da7 --- /dev/null +++ b/nixos/modules/profiles/hardened.nix @@ -0,0 +1,62 @@ +# A profile with most (vanilla) hardening options enabled by default, +# potentially at the cost of features and performance. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened; + + security.hideProcessInformation = mkDefault true; + + security.lockKernelModules = mkDefault true; + + security.apparmor.enable = mkDefault true; + + boot.kernelParams = [ + # Overwrite free'd memory + "page_poison=1" + + # Disable legacy virtual syscalls + "vsyscall=none" + + # Disable hibernation (allows replacing the running kernel) + "nohibernate" + ]; + + # Restrict ptrace() usage to processes with a pre-defined relationship + # (e.g., parent/child) + boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1; + + # Prevent replacing the running kernel image w/o reboot + boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true; + + # Restrict access to kernel ring buffer (information leaks) + boot.kernel.sysctl."kernel.dmesg_restrict" = mkDefault true; + + # Hide kptrs even for processes with CAP_SYSLOG + boot.kernel.sysctl."kernel.kptr_restrict" = mkOverride 500 2; + + # Unprivileged access to bpf() has been used for privilege escalation in + # the past + boot.kernel.sysctl."kernel.unprivileged_bpf_disabled" = mkDefault true; + + # Disable bpf() JIT (to eliminate spray attacks) + boot.kernel.sysctl."net.core.bpf_jit_enable" = mkDefault false; + + # ... or at least apply some hardening to it + boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true; + + # A recurring problem with user namespaces is that there are + # still code paths where the kernel's permission checking logic + # fails to account for namespacing, instead permitting a + # namespaced process to act outside the namespace with the + # 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 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/adb.nix b/nixos/modules/programs/adb.nix index 9ba81899e588..18290555b79d 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -10,7 +10,6 @@ with lib; programs.adb = { enable = mkOption { default = false; - example = true; type = types.bool; description = '' Whether to configure system to use Android Debug Bridge (adb). diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix new file mode 100644 index 000000000000..a073c7e66eb8 --- /dev/null +++ b/nixos/modules/programs/browserpass.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + ###### interface + options = { + 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"; + "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/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index 9741aa7ca539..55529d73cb60 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixos/modules/programs/command-not-found/command-not-found.nix @@ -8,13 +8,14 @@ with lib; let - + cfg = config.programs.command-not-found; commandNotFound = pkgs.substituteAll { name = "command-not-found"; dir = "bin"; src = ./command-not-found.pl; isExecutable = true; inherit (pkgs) perl; + inherit (cfg) dbPath; perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ") [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]); }; @@ -22,50 +23,66 @@ let in { + options.programs.command-not-found = { - programs.bash.interactiveShellInit = - '' - # This function is called whenever a command is not found. - command_not_found_handle() { - local p=/run/current-system/sw/bin/command-not-found - if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then - # Run the helper program. - $p "$@" - # Retry the command if we just installed it. - if [ $? = 126 ]; then - "$@" + enable = mkEnableOption "command-not-found hook for interactive shell"; + + dbPath = mkOption { + default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ; + description = '' + Absolute path to programs.sqlite. + + By default this file will be provided by your channel + (nixexprs.tar.xz). + ''; + type = types.path; + }; + }; + + config = mkIf cfg.enable { + programs.bash.interactiveShellInit = + '' + # This function is called whenever a command is not found. + command_not_found_handle() { + local p=${commandNotFound}/bin/command-not-found + if [ -x $p -a -f ${cfg.dbPath} ]; then + # Run the helper program. + $p "$@" + # Retry the command if we just installed it. + if [ $? = 126 ]; then + "$@" + else + return 127 + fi else + echo "$1: command not found" >&2 return 127 fi - else - echo "$1: command not found" >&2 - return 127 - fi - } - ''; + } + ''; - programs.zsh.interactiveShellInit = - '' - # This function is called whenever a command is not found. - command_not_found_handler() { - local p=/run/current-system/sw/bin/command-not-found - if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then - # Run the helper program. - $p "$@" + programs.zsh.interactiveShellInit = + '' + # This function is called whenever a command is not found. + command_not_found_handler() { + local p=${commandNotFound}/bin/command-not-found + if [ -x $p -a -f ${cfg.dbPath} ]; then + # Run the helper program. + $p "$@" - # Retry the command if we just installed it. - if [ $? = 126 ]; then - "$@" + # Retry the command if we just installed it. + if [ $? = 126 ]; then + "$@" + fi + else + # Indicate than there was an error so ZSH falls back to its default handler + echo "$1: command not found" >&2 + return 127 fi - else - # Indicate than there was an error so ZSH falls back to its default handler - return 127 - fi - } - ''; + } + ''; - environment.systemPackages = [ commandNotFound ]; - - # TODO: tab completion for uninstalled commands! :-) + environment.systemPackages = [ commandNotFound ]; + }; } diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index 5bdda26592e6..ab7aa204653c 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -8,7 +8,7 @@ use Config; my $program = $ARGV[0]; -my $dbPath = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite"; +my $dbPath = "@dbPath@"; my $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "") or die "cannot open database `$dbPath'"; diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index a1615c920c02..401d152941a0 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -20,6 +20,7 @@ in { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; PAGER = mkDefault "less -R"; EDITOR = mkDefault "nano"; + XCURSOR_PATH = [ "$HOME/.icons" ]; }; environment.profiles = @@ -30,10 +31,9 @@ in # TODO: move most of these elsewhere environment.profileRelativeEnvVars = - { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ]; + { 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/" ]; @@ -42,15 +42,13 @@ in GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; XDG_DATA_DIRS = [ "/share" ]; + XCURSOR_PATH = [ "/share/icons" ]; MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ]; LIBEXEC_PATH = [ "/lib/libexec" ]; }; 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/fish.nix b/nixos/modules/programs/fish.nix index a99c98e166dc..c8d94a47be28 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -27,6 +27,30 @@ in ''; type = types.bool; }; + + vendor.config.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether fish should source configuration snippets provided by other packages. + ''; + }; + + vendor.completions.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether fish should use completion files provided by other packages. + ''; + }; + + vendor.functions.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether fish should autoload fish functions provided by other packages. + ''; + }; shellAliases = mkOption { default = config.environment.shellAliases; @@ -79,31 +103,74 @@ in environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; + environment.etc."fish/nixos-env-preinit.fish".text = '' + # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently + # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish + set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions + + # source the NixOS environment config + fenv source ${config.system.build.setEnvironment} + + # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish + set -e fish_function_path + ''; + environment.etc."fish/config.fish".text = '' # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically. - set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions + # if we haven't sourced the general config, do it + if not set -q __fish_nixos_general_config_sourced + set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path + fenv source /etc/fish/foreign-env/shellInit > /dev/null + set -e fish_function_path[1] + + ${cfg.shellInit} - fenv source ${config.system.build.setEnvironment} > /dev/null ^&1 - fenv source /etc/fish/foreign-env/shellInit > /dev/null - - ${cfg.shellInit} - - if status --is-login - fenv source /etc/fish/foreign-env/loginShellInit > /dev/null - ${cfg.loginShellInit} + # and leave a note so we don't source this config section again from + # this very shell (children will source the general config anew) + set -g __fish_nixos_general_config_sourced 1 end - if status --is-interactive + # if we haven't sourced the login config, do it + status --is-login; and not set -q __fish_nixos_login_config_sourced + and begin + set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path + fenv source /etc/fish/foreign-env/loginShellInit > /dev/null + set -e fish_function_path[1] + + ${cfg.loginShellInit} + + # and leave a note so we don't source this config section again from + # this very shell (children will source the general config anew) + set -g __fish_nixos_login_config_sourced 1 + end + + # if we haven't sourced the interactive config, do it + status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced + and begin ${fishAliases} + + + set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null + set -e fish_function_path[1] + + ${cfg.promptInit} ${cfg.interactiveShellInit} + + # and leave a note so we don't source this config section again from + # this very shell (children will source the general config anew, + # allowing configuration changes in, e.g, aliases, to propagate) + set -g __fish_nixos_interactive_config_sourced 1 end ''; # include programs that bring their own completions - environment.pathsToLink = [ "/share/fish/vendor_completions.d" ]; - + environment.pathsToLink = [] + ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" + ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d" + ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d"; + environment.systemPackages = [ pkgs.fish ]; environment.shells = [ diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix new file mode 100644 index 000000000000..8af55f38992f --- /dev/null +++ b/nixos/modules/programs/gnupg.nix @@ -0,0 +1,101 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.gnupg; + +in + +{ + + options.programs.gnupg = { + agent.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables GnuPG agent with socket-activation for every user session. + ''; + }; + + agent.enableSSHSupport = mkOption { + type = types.bool; + default = false; + description = '' + Enable SSH agent support in GnuPG agent. Also sets SSH_AUTH_SOCK + environment variable correctly. This will disable socket-activation + and thus always start a GnuPG agent per user session. + ''; + }; + + agent.enableExtraSocket = mkOption { + type = types.bool; + default = false; + description = '' + Enable extra socket for GnuPG agent. + ''; + }; + + agent.enableBrowserSocket = mkOption { + type = types.bool; + default = false; + description = '' + Enable browser socket for GnuPG agent. + ''; + }; + + dirmngr.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables GnuPG network certificate management daemon with socket-activation for every user session. + ''; + }; + }; + + config = mkIf cfg.agent.enable { + systemd.user.sockets.gpg-agent = { + wantedBy = [ "sockets.target" ]; + }; + + systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport { + wantedBy = [ "sockets.target" ]; + }; + + systemd.user.sockets.gpg-agent-extra = mkIf cfg.agent.enableExtraSocket { + wantedBy = [ "sockets.target" ]; + }; + + systemd.user.sockets.gpg-agent-browser = mkIf cfg.agent.enableBrowserSocket { + wantedBy = [ "sockets.target" ]; + }; + + systemd.user.sockets.dirmngr = mkIf cfg.dirmngr.enable { + wantedBy = [ "sockets.target" ]; + }; + + systemd.packages = [ pkgs.gnupg ]; + + environment.extraInit = '' + # Bind gpg-agent to this TTY if gpg commands are used. + export GPG_TTY=$(tty) + + '' + (optionalString cfg.agent.enableSSHSupport '' + # SSH agent protocol doesn't support changing TTYs, so bind the agent + # to every new TTY. + ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null + + if [ -z "$SSH_AUTH_SOCK" ]; then + export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket) + fi + ''); + + assertions = [ + { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent; + message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!"; + } + ]; + }; + +} diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix index 47822562aee1..ca7c6fb28f52 100644 --- a/nixos/modules/programs/gphoto2.nix +++ b/nixos/modules/programs/gphoto2.nix @@ -10,7 +10,6 @@ with lib; programs.gphoto2 = { enable = mkOption { default = false; - example = true; type = types.bool; description = '' Whether to configure system to use gphoto2. diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix index 1c29eddf01d6..b3aa55e189a3 100644 --- a/nixos/modules/programs/mosh.nix +++ b/nixos/modules/programs/mosh.nix @@ -14,7 +14,6 @@ in Whether to enable mosh. Note, this will open ports in your firewall! ''; default = false; - example = true; type = lib.types.bool; }; }; diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix new file mode 100644 index 000000000000..9a6cf755f2a2 --- /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/qt5ct.nix b/nixos/modules/programs/qt5ct.nix new file mode 100644 index 000000000000..550634e65be9 --- /dev/null +++ b/nixos/modules/programs/qt5ct.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta.maintainers = [ maintainers.romildo ]; + + ###### interface + options = { + programs.qt5ct = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the Qt5 Configuration Tool (qt5ct), a + program that allows users to configure Qt5 settings (theme, + font, icons, etc.) under desktop environments or window + manager without Qt integration. + + Official home page: https://sourceforge.net/projects/qt5ct/ + ''; + }; + }; + }; + + ###### implementation + config = mkIf config.programs.qt5ct.enable { + environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; + environment.systemPackages = [ pkgs.qt5ct ]; + }; +} diff --git a/nixos/modules/programs/slock.nix b/nixos/modules/programs/slock.nix new file mode 100644 index 000000000000..0e1281e62cd7 --- /dev/null +++ b/nixos/modules/programs/slock.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.slock; + +in +{ + options = { + programs.slock = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to install slock screen locker with setuid wrapper. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.slock ]; + security.wrappers.slock.source = "${pkgs.slock.out}/bin/slock"; + }; +} diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 5f4d4dc9475e..e0fbba897fa4 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -20,11 +20,11 @@ let knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); - knownHostsText = flip (concatMapStringsSep "\n") knownHosts + knownHostsText = (flip (concatMapStringsSep "\n") knownHosts (h: assert h.hostNames != []; concatStringsSep "," h.hostNames + " " + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) - ); + )) + "\n"; in { @@ -74,7 +74,7 @@ in startAgent = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to start the OpenSSH agent when you log in. The OpenSSH agent remembers private keys for you so that you don't have to type in @@ -199,9 +199,8 @@ in environment.etc."ssh/ssh_known_hosts".text = knownHostsText; # FIXME: this should really be socket-activated for über-awesomeness. - systemd.user.services.ssh-agent = - { enable = cfg.startAgent; - description = "SSH Agent"; + systemd.user.services.ssh-agent = mkIf cfg.startAgent + { description = "SSH Agent"; wantedBy = [ "default.target" ]; serviceConfig = { ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent"; diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index f5d1873cc5c8..44756171b74c 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -22,7 +22,6 @@ in directDelivery = mkOption { type = types.bool; default = false; - example = true; description = '' Use the trivial Mail Transfer Agent (MTA) ssmtp package to allow programs to send @@ -40,7 +39,8 @@ in example = "mail.example.org"; description = '' The host name of the default mail server to use to deliver - e-mail. + e-mail. Can also contain a port number (ex: mail.example.org:587), + defaults to port 25 if no port is given. ''; }; @@ -65,7 +65,6 @@ in useTLS = mkOption { type = types.bool; default = false; - example = true; description = '' Whether TLS should be used to connect to the default mail server. @@ -75,7 +74,6 @@ in useSTARTTLS = mkOption { type = types.bool; default = false; - example = true; description = '' Whether the STARTTLS should be used to connect to the default mail server. (This is needed for TLS-capable mail servers @@ -98,9 +96,28 @@ in example = "correctHorseBatteryStaple"; description = '' Password used for SMTP auth. (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE) + + It's recommended to use + which takes precedence over . ''; }; - + + authPassFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/run/keys/ssmtp-authpass"; + description = '' + Path to a file that contains the password used for SMTP auth. The file + should not contain a trailing newline, if the password does not contain one. + This file should be readable by the users that need to execute ssmtp. + + takes precedence over . + + Warning: when is non-empty + defaults to a file in the WORLD-READABLE Nix store containing that password. + ''; + }; + setSendmail = mkOption { type = types.bool; default = true; @@ -114,21 +131,28 @@ in config = mkIf cfg.directDelivery { + networking.defaultMailServer.authPassFile = mkIf (cfg.authPass != "") + (mkDefault (toString (pkgs.writeTextFile { + name = "ssmtp-authpass"; + text = cfg.authPass; + }))); + environment.etc."ssmtp/ssmtp.conf".text = + let yesNo = yes : if yes then "YES" else "NO"; in '' MailHub=${cfg.hostName} FromLineOverride=YES - ${if cfg.root != "" then "root=${cfg.root}" else ""} - ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""} - UseTLS=${if cfg.useTLS then "YES" else "NO"} - UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"} + ${optionalString (cfg.root != "") "root=${cfg.root}"} + ${optionalString (cfg.domain != "") "rewriteDomain=${cfg.domain}"} + UseTLS=${yesNo cfg.useTLS} + UseSTARTTLS=${yesNo cfg.useSTARTTLS} #Debug=YES - ${if cfg.authUser != "" then "AuthUser=${cfg.authUser}" else ""} - ${if cfg.authPass != "" then "AuthPass=${cfg.authPass}" else ""} + ${optionalString (cfg.authUser != "") "AuthUser=${cfg.authUser}"} + ${optionalString (!isNull cfg.authPassFile) "AuthPassFile=${cfg.authPassFile}"} ''; environment.systemPackages = [pkgs.ssmtp]; - + services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail { program = "sendmail"; source = "${pkgs.ssmtp}/bin/sendmail"; diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix new file mode 100644 index 000000000000..433a0ca95fef --- /dev/null +++ b/nixos/modules/programs/thefuck.nix @@ -0,0 +1,31 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.thefuck; +in + { + options = { + programs.thefuck = { + enable = mkEnableOption "thefuck"; + + alias = mkOption { + default = "fuck"; + type = types.string; + + description = '' + `thefuck` needs an alias to be configured. + The default value is `fuck`, but you can use anything else as well. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ thefuck ]; + environment.shellInit = '' + eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias}) + ''; + }; + } diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index f0f8d03505ac..ed1d88a420a2 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -65,7 +65,6 @@ in { aggressiveResize = mkOption { default = false; - example = true; type = types.bool; description = '' Resize the window to the size of the smallest session for which it is the current window. @@ -81,14 +80,12 @@ in { clock24 = mkOption { default = false; - example = true; type = types.bool; description = "Use 24 hour clock."; }; customPaneNavigationAndResize = mkOption { default = false; - example = true; type = types.bool; description = "Override the hjkl and HJKL bindings for pane navigation and resizing in VI mode."; }; @@ -124,14 +121,12 @@ in { newSession = mkOption { default = false; - example = true; type = types.bool; description = "Automatically spawn a session if trying to attach and none are running."; }; reverseSplit = mkOption { default = false; - example = true; type = types.bool; description = "Reverse the window split shortcuts."; }; diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 731ebed14c7b..110570ac3f06 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -45,7 +45,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the Venus will collect feeds. ''; }; diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix index 8476c1accd31..fe0e7f2c6d6b 100644 --- a/nixos/modules/programs/vim.nix +++ b/nixos/modules/programs/vim.nix @@ -9,7 +9,6 @@ in { defaultEditor = mkOption { type = types.bool; default = false; - example = true; description = '' When enabled, installs vim and configures vim to be the default editor using the EDITOR environment variable. diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix new file mode 100644 index 000000000000..9077643c4440 --- /dev/null +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.zsh.ohMyZsh; +in + { + options = { + programs.zsh.ohMyZsh = { + enable = mkOption { + default = false; + description = '' + Enable oh-my-zsh. + ''; + }; + + package = mkOption { + default = pkgs.oh-my-zsh; + defaultText = "pkgs.oh-my-zsh"; + description = '' + Package to install for `oh-my-zsh` usage. + ''; + + type = types.package; + }; + + plugins = mkOption { + default = []; + type = types.listOf(types.str); + description = '' + List of oh-my-zsh plugins + ''; + }; + + custom = mkOption { + default = ""; + type = types.str; + description = '' + Path to a custom oh-my-zsh package to override config of oh-my-zsh. + ''; + }; + + theme = mkOption { + default = ""; + type = types.str; + description = '' + Name of the theme to be used by oh-my-zsh. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + # Prevent zsh from overwriting oh-my-zsh's prompt + programs.zsh.promptInit = mkDefault ""; + + environment.systemPackages = [ cfg.package ]; + + programs.zsh.interactiveShellInit = with builtins; '' + # oh-my-zsh configuration generated by NixOS + export ZSH=${cfg.package}/share/oh-my-zsh + + ${optionalString (length(cfg.plugins) > 0) + "plugins=(${concatStringsSep " " cfg.plugins})" + } + + ${optionalString (stringLength(cfg.custom) > 0) + "ZSH_CUSTOM=\"${cfg.custom}\"" + } + + ${optionalString (stringLength(cfg.theme) > 0) + "ZSH_THEME=\"${cfg.theme}\"" + } + + source $ZSH/oh-my-zsh.sh + ''; + }; + } diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix new file mode 100644 index 000000000000..9452489e2fb4 --- /dev/null +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -0,0 +1,78 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.zsh.syntaxHighlighting; +in + { + options = { + programs.zsh.syntaxHighlighting = { + enable = mkEnableOption "zsh-syntax-highlighting"; + + highlighters = mkOption { + default = [ "main" ]; + + # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md + type = types.listOf(types.enum([ + "main" + "brackets" + "pattern" + "cursor" + "root" + "line" + ])); + + description = '' + Specifies the highlighters to be used by zsh-syntax-highlighting. + + The following defined options can be found here: + https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md + ''; + }; + + patterns = mkOption { + default = {}; + type = types.attrsOf types.string; + + example = literalExample '' + { + "rm -rf *" = "fg=white,bold,bg=red"; + } + ''; + + description = '' + Specifies custom patterns to be highlighted by zsh-syntax-highlighting. + + Please refer to the docs for more information about the usage: + https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ]; + + programs.zsh.interactiveShellInit = with pkgs; with builtins; '' + source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + + ${optionalString (length(cfg.highlighters) > 0) + "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})" + } + + ${let + n = attrNames cfg.patterns; + in + optionalString (length(n) > 0) + (assert(elem "pattern" cfg.highlighters); (foldl ( + a: b: + '' + ${a} + ZSH_HIGHLIGHT_PATTERNS+=('${b}' '${attrByPath [b] "" cfg.patterns}') + '' + ) "") n) + } + ''; + }; + } diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 990e6648e82b..a055291282c9 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -84,14 +84,6 @@ in type = types.bool; }; - enableSyntaxHighlighting = mkOption { - default = false; - description = '' - Enable zsh-syntax-highlighting - ''; - type = types.bool; - }; - enableAutosuggestions = mkOption { default = false; description = '' @@ -105,50 +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.enableSyntaxHighlighting) - "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" - } - - ${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. @@ -159,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. @@ -176,6 +128,8 @@ in if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi __ETC_ZPROFILE_SOURCED=1 + ${cfge.loginShellInit} + ${cfg.loginShellInit} # Read system-wide modifications. @@ -195,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 @@ -206,8 +186,7 @@ in environment.etc."zinputrc".source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions - ++ optional cfg.enableSyntaxHighlighting pkgs.zsh-syntax-highlighting; + ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index af8b34b5e5cb..c3fb5758edeb 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -35,6 +35,9 @@ with lib; (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) @@ -138,9 +141,6 @@ with lib; # Unity3D (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ]) - # fontconfig-ultimate - (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ]) - # murmur (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ]) @@ -199,5 +199,20 @@ with lib; "See the 16.09 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") + (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") + (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] + "Set the option `services.xserver.displayManager.sddm.package' instead.") + (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") + (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + + # ZSH + (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) + (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) + (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ]) + (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ]) + (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ]) + (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ]) + (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ]) + (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ]) ]; } diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 78bd09441f83..a40c5ef9ebe1 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -13,12 +13,18 @@ let description = '' Where the webroot of the HTTP vhost is located. .well-known/acme-challenge/ directory - will be created automatically if it doesn't exist. + will be created below the webroot if it doesn't exist. http://example.org/.well-known/acme-challenge/ must also be available (notice unencrypted HTTP). ''; }; + domain = mkOption { + type = types.nullOr types.str; + default = null; + description = "Domain to fetch certificate for (defaults to the entry name)"; + }; + email = mkOption { type = types.nullOr types.str; default = null; @@ -40,7 +46,10 @@ let allowKeysForGroup = mkOption { type = types.bool; default = false; - description = "Give read permissions to the specified group to read SSL private certificates."; + description = '' + Give read permissions to the specified group + () to read SSL private certificates. + ''; }; postRun = mkOption { @@ -59,21 +68,24 @@ let "cert.der" "cert.pem" "chain.pem" "external.sh" "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json" ]); - default = [ "fullchain.pem" "key.pem" "account_key.json" ]; + default = [ "fullchain.pem" "full.pem" "key.pem" "account_key.json" ]; description = '' Plugins to enable. With default settings simp_le will - store public certificate bundle in fullchain.pem - and private key in key.pem in its state directory. + store public certificate bundle in fullchain.pem, + private key in key.pem and those two previous + files combined in full.pem in its state directory. ''; }; extraDomains = mkOption { type = types.attrsOf (types.nullOr types.str); default = {}; - example = { - "example.org" = "/srv/http/nginx"; - "mydomain.org" = null; - }; + example = literalExample '' + { + "example.org" = "/srv/http/nginx"; + "mydomain.org" = null; + } + ''; description = '' Extra domain names for which certificates are to be issued, with their own server roots if needed. @@ -110,7 +122,7 @@ in description = '' Systemd calendar expression when to check for renewal. See systemd.time - 5. + 7. ''; }; @@ -133,17 +145,19 @@ in description = '' Attribute set of certificates to get signed and renewed. ''; - example = { - "example.com" = { - webroot = "/var/www/challenges/"; - email = "foo@example.com"; - extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; }; - }; - "bar.example.com" = { - webroot = "/var/www/challenges/"; - email = "bar@example.com"; - }; - }; + example = literalExample '' + { + "example.com" = { + webroot = "/var/www/challenges/"; + email = "foo@example.com"; + extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; }; + }; + "bar.example.com" = { + webroot = "/var/www/challenges/"; + email = "bar@example.com"; + }; + } + ''; }; }; }; @@ -157,9 +171,10 @@ in servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let + domain = if data.domain != null then data.domain else cert; cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ] + cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); @@ -178,12 +193,15 @@ in path = [ pkgs.simp_le ]; preStart = '' mkdir -p '${cfg.directory}' - chown '${data.user}:${data.group}' '${cfg.directory}' + chown 'root:root' '${cfg.directory}' + chmod 755 '${cfg.directory}' if [ ! -d '${cpath}' ]; then mkdir '${cpath}' fi chmod ${rights} '${cpath}' chown -R '${data.user}:${data.group}' '${cpath}' + mkdir -p '${data.webroot}/.well-known/acme-challenge' + chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge' ''; script = '' cd '${cpath}' @@ -228,6 +246,9 @@ in mv $workdir/server.key ${cpath}/key.pem mv $workdir/server.crt ${cpath}/fullchain.pem + # Create full.pem for e.g. lighttpd (same format as "simp_le ... -f full.pem" creates) + cat "${cpath}/key.pem" "${cpath}/fullchain.pem" > "${cpath}/full.pem" + # Clean up working directory rm $workdir/server.csr rm $workdir/server.pass.key @@ -237,6 +258,8 @@ in chown '${data.user}:${data.group}' '${cpath}/key.pem' chmod ${rights} '${cpath}/fullchain.pem' chown '${data.user}:${data.group}' '${cpath}/fullchain.pem' + chmod ${rights} '${cpath}/full.pem' + chown '${data.user}:${data.group}' '${cpath}/full.pem' ''; serviceConfig = { Type = "oneshot"; @@ -265,15 +288,14 @@ in ) ); servicesAttr = listToAttrs services; - nginxAttr = { - nginx = { - after = [ "acme-selfsigned-certificates.target" ]; - wants = [ "acme-selfsigned-certificates.target" "acme-certificates.target" ]; - }; + injectServiceDep = { + after = [ "acme-selfsigned-certificates.target" ]; + wants = [ "acme-selfsigned-certificates.target" "acme-certificates.target" ]; }; in servicesAttr // - (if config.services.nginx.enable then nginxAttr else {}); + (if config.services.nginx.enable then { nginx = injectServiceDep; } else {}) // + (if config.services.lighttpd.enable then { lighttpd = injectServiceDep; } else {}); systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair ("acme-${cert}") diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix new file mode 100644 index 000000000000..319dce9a6c55 --- /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/dhparams.nix b/nixos/modules/security/dhparams.nix index c16cd2fafef4..55c75713101d 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -19,6 +19,12 @@ in Note: The name of the DH params is taken as being the name of the service it serves: the params will be generated before the said service is started. + + Warning: If you are removing all dhparams from this list, you have + to leave security.dhparams.enable for at least one activation in + order to have them be cleaned up. This also means if you rollback to + a version without any dhparams the existing ones won't be cleaned + up. ''; type = with types; attrsOf int; default = {}; @@ -34,57 +40,68 @@ in type = types.str; default = "/var/lib/dhparams"; }; + + enable = mkOption { + description = + '' + Whether to generate new DH params and clean up old DH params. + ''; + default = false; + type = types.bool; + }; }; }; - config.systemd.services = { - dhparams-init = { - description = "Cleanup old Diffie-Hellman parameters"; - wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set - serviceConfig.Type = "oneshot"; - script = - # Create directory - '' - if [ ! -d ${cfg.path} ]; then - mkdir -p ${cfg.path} - fi - '' + - # Remove old dhparams - '' - for file in ${cfg.path}/*; do - if [ ! -f "$file" ]; then - continue + config = mkIf cfg.enable { + systemd.services = { + dhparams-init = { + description = "Cleanup old Diffie-Hellman parameters"; + wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set + serviceConfig.Type = "oneshot"; + script = + # Create directory + '' + if [ ! -d ${cfg.path} ]; then + mkdir -p ${cfg.path} fi - '' + concatStrings (mapAttrsToList (name: value: - '' - if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then - continue - fi - '' - ) cfg.params) + - '' - rm $file - done + '' + + # Remove old dhparams + '' + for file in ${cfg.path}/*; do + if [ ! -f "$file" ]; then + continue + fi + '' + concatStrings (mapAttrsToList (name: value: + '' + if [ "$file" == "${cfg.path}/${name}.pem" ] && \ + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then + continue + fi + '' + ) cfg.params) + + '' + rm $file + done - # TODO: Ideally this would be removing the *former* cfg.path, though this - # does not seem really important - rmdir -p --ignore-fail-on-non-empty ${cfg.path} - ''; - }; - } // - mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" { - description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; - after = [ "dhparams-init.service" ]; - before = [ "${name}.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - script = - '' - mkdir -p ${cfg.path} - if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value} - fi - ''; - }) cfg.params; + # TODO: Ideally this would be removing the *former* cfg.path, though this + # does not seem really important as changes to it are quite unlikely + rmdir --ignore-fail-on-non-empty ${cfg.path} + ''; + }; + } // + mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" { + description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; + after = [ "dhparams-init.service" ]; + before = [ "${name}.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + script = + '' + mkdir -p ${cfg.path} + if [ ! -f ${cfg.path}/${name}.pem ]; then + ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value} + fi + ''; + }) cfg.params; + }; } diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 3726b6c78185..d23c7f2e86de 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -13,7 +13,7 @@ in { meta = { - maintainers = with maintainers; [ joachifm ]; + maintainers = with maintainers; [ ]; doc = ./grsecurity.xml; }; @@ -21,7 +21,6 @@ in enable = mkOption { type = types.bool; - example = true; default = false; description = '' Enable grsecurity/PaX. @@ -30,7 +29,6 @@ in lockTunables = mkOption { type = types.bool; - example = false; default = true; description = '' Whether to automatically lock grsecurity tunables @@ -43,7 +41,6 @@ in disableEfiRuntimeServices = mkOption { type = types.bool; - example = false; default = true; description = '' Whether to disable access to EFI runtime services. Enabling EFI runtime diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 07a61919ab42..0a884b3f9b55 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -26,9 +26,11 @@ Arch Linux wiki page on grsecurity. - grsecurity/PaX is only available for the latest linux -stable - kernel; patches against older kernels are available from upstream only for - a fee. + Upstream has ceased free support for grsecurity/PaX. See + + the announcement for more information. Consequently, NixOS + support for grsecurity/PaX also must cease. Enabling this module will + result in a build error. We standardise on a desktop oriented configuration primarily due to lack of resources. The grsecurity/PaX configuration state space is huge and each configuration requires quite a bit of testing to ensure that the @@ -312,7 +314,7 @@ Overflows in boot critical code (e.g., the root filesystem module) can render the system unbootable. Work around by setting - boot.kernel.kernelParams = [ "pax_size_overflow_report_only" ]; + boot.kernelParams = [ "pax_size_overflow_report_only" ]; diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix new file mode 100644 index 000000000000..260ec3fc9464 --- /dev/null +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -0,0 +1,36 @@ +{ config, lib, ... }: + +with lib; + +{ + options = { + security.lockKernelModules = mkOption { + type = types.bool; + default = false; + description = '' + Disable kernel module loading once the system is fully initialised. + Module loading is disabled until the next reboot. Problems caused + by delayed module loading can be fixed by adding the module(s) in + question to . + ''; + }; + }; + + config = mkIf config.security.lockKernelModules { + systemd.services.disable-kernel-module-loading = rec { + description = "Disable kernel module loading"; + + wantedBy = [ config.systemd.defaultUnit ]; + after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy; + + script = "echo -n 1 > /proc/sys/kernel/modules_disabled"; + + unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel"; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; + }; +} diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 8d9d53480630..7e59408a5b0b 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -64,7 +64,7 @@ in systemd.packages = [ pkgs.polkit.out ]; systemd.services.polkit.restartTriggers = [ config.system.path ]; - systemd.services.polkit.unitConfig.X-StopIfChanged = false; + systemd.services.polkit.stopIfChanged = false; # The polkit daemon reads action/rule files environment.pathsToLink = [ "/share/polkit-1" ]; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 67a9b9a45ee3..cfd0595e63b7 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 65d875c3a375..a6dc8faaae98 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -80,8 +80,8 @@ let group = "root"; } // s) else if - (s ? "setuid" && s.setuid == true) || - (s ? "setguid" && s.setguid == true) || + (s ? "setuid" && s.setuid) || + (s ? "setgid" && s.setgid) || (s ? "permissions") then mkSetuidProgram s else mkSetuidProgram @@ -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. @@ -179,21 +179,31 @@ in # Remove the old /var/setuid-wrappers path from the system... # - # TODO: this is only necessary for ugprades 16.09 => 17.x; + # TODO: this is only necessary for upgrades 16.09 => 17.x; # this conditional removal block needs to be removed after # the release. if [ -d /var/setuid-wrappers ]; then rm -rf /var/setuid-wrappers + ln -s /run/wrappers/bin /var/setuid-wrappers fi # Remove the old /run/setuid-wrappers-dir path from the # system as well... # - # TODO: this is only necessary for ugprades 16.09 => 17.x; + # TODO: this is only necessary for upgrades 16.09 => 17.x; # this conditional removal block needs to be removed after # the release. if [ -d /run/setuid-wrapper-dirs ]; then rm -rf /run/setuid-wrapper-dirs + ln -s /run/wrappers/bin /run/setuid-wrapper-dirs + fi + + # TODO: this is only necessary for upgrades 16.09 => 17.x; + # this conditional removal block needs to be removed after + # the release. + if readlink -f /run/booted-system | grep nixos-17 > /dev/null; then + rm -rf /run/setuid-wrapper-dirs + rm -rf /var/setuid-wrappers fi # We want to place the tmpdirs for the wrappers to the parent dir. diff --git a/nixos/modules/service-managers/docker.nix b/nixos/modules/service-managers/docker.nix new file mode 100644 index 000000000000..8e9c763b18af --- /dev/null +++ b/nixos/modules/service-managers/docker.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.docker-containers; + + containerModule = { + script = mkOption { + type = types.lines; + description = "Shell commands executed as the service's main process."; + }; + }; + + toContainer = name: value: pkgs.dockerTools.buildImage { + inherit name; + config = { + Cmd = [ value.script ]; + }; + }; +in { + options.docker-containers = mkOption { + default = {}; + type = with types; attrsOf (types.submodule containerModule); + description = "Definition of docker containers"; + }; + + config.system.build.toplevel-docker = lib.mapAttrs toContainer cfg; +} diff --git a/nixos/modules/service-managers/trivial.nix b/nixos/modules/service-managers/trivial.nix new file mode 100644 index 000000000000..77e615d1e2e2 --- /dev/null +++ b/nixos/modules/service-managers/trivial.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.trivial-services; + + serviceModule.options = { + script = mkOption { + type = types.lines; + description = "Shell commands executed as the service's main process."; + }; + + environment = mkOption { + default = {}; + type = types.attrs; # FIXME + example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; + description = "Environment variables passed to the service's processes."; + }; + }; + + launcher = name: value: pkgs.writeScript name '' + #!${pkgs.stdenv.shell} -eu + + ${pkgs.writeScript "${name}-entry" value.script} + ''; +in { + options.trivial-services = mkOption { + default = {}; + type = with types; attrsOf (types.submodule serviceModule); + description = "Definition of trivial services"; + }; + + config.system.build.toplevel-trivial = lib.mapAttrs launcher cfg; +} diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix new file mode 100644 index 000000000000..165580b97837 --- /dev/null +++ b/nixos/modules/services/admin/salt/master.nix @@ -0,0 +1,60 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + + cfg = config.services.salt.master; + + fullConfig = lib.recursiveUpdate { + # Provide defaults for some directories to allow an immutable config dir + + # Default is equivalent to /etc/salt/master.d/*.conf + default_include = "/var/lib/salt/master.d/*.conf"; + # Default is in /etc/salt/pki/master + pki_dir = "/var/lib/salt/pki/master"; + } cfg.configuration; + +in + +{ + options = { + services.salt.master = { + enable = mkEnableOption "Salt master service"; + configuration = mkOption { + type = types.attrs; + default = {}; + description = "Salt master configuration as Nix attribute set."; + }; + }; + }; + + config = mkIf cfg.enable { + environment = { + # Set this up in /etc/salt/master so `salt`, `salt-key`, etc. work. + # The alternatives are + # - passing --config-dir to all salt commands, not just the master unit, + # - setting a global environment variable, + etc."salt/master".source = pkgs.writeText "master" ( + builtins.toJSON fullConfig + ); + systemPackages = with pkgs; [ salt ]; + }; + systemd.services.salt-master = { + description = "Salt Master"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = with pkgs; [ + utillinux # for dmesg + ]; + serviceConfig = { + ExecStart = "${pkgs.salt}/bin/salt-master"; + LimitNOFILE = 16384; + Type = "notify"; + NotifyAccess = "all"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ aneeshusa ]; +} diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix new file mode 100644 index 000000000000..9ecefb32cfa8 --- /dev/null +++ b/nixos/modules/services/admin/salt/minion.nix @@ -0,0 +1,56 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + + cfg = config.services.salt.minion; + + fullConfig = lib.recursiveUpdate { + # Provide defaults for some directories to allow an immutable config dir + # NOTE: the config dir being immutable prevents `minion_id` caching + + # Default is equivalent to /etc/salt/minion.d/*.conf + default_include = "/var/lib/salt/minion.d/*.conf"; + # Default is in /etc/salt/pki/minion + pki_dir = "/var/lib/salt/pki/minion"; + } cfg.configuration; + configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig); + +in + +{ + options = { + services.salt.minion = { + enable = mkEnableOption "Salt minion service"; + configuration = mkOption { + type = types.attrs; + default = {}; + description = '' + Salt minion configuration as Nix attribute set. + See + for details. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ salt ]; + systemd.services.salt-minion = { + description = "Salt Minion"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = with pkgs; [ + utillinux + ]; + serviceConfig = { + ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}"; + LimitNOFILE = 8192; + Type = "notify"; + NotifyAccess = "all"; + }; + }; + }; +} + diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 53786dbc6270..acf48d3c3d03 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 56af8fe152e0..bd6c316243c8 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/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix new file mode 100644 index 000000000000..7d661dd60408 --- /dev/null +++ b/nixos/modules/services/audio/slimserver.nix @@ -0,0 +1,69 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.slimserver; + +in { + options = { + + services.slimserver = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable slimserver. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.slimserver; + defaultText = "pkgs.slimserver"; + description = "Slimserver package to use."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/slimserver"; + description = '' + The directory where slimserver stores its state, tag cache, + playlists etc. + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.slimserver = { + after = [ "network.target" ]; + description = "Slim Server for Logitech Squeezebox Players"; + wantedBy = [ "multi-user.target" ]; + + preStart = "mkdir -p ${cfg.dataDir} && chown -R slimserver:slimserver ${cfg.dataDir}"; + serviceConfig = { + User = "slimserver"; + PermissionsStartOnly = true; + ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache"; + }; + }; + + users = { + users.slimserver = { + description = "Slimserver daemon user"; + home = cfg.dataDir; + group = "slimserver"; + }; + groups.slimserver = {}; + }; + }; + +} + diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix index 16815bcc8605..bb5dcab1dcf2 100644 --- a/nixos/modules/services/backup/rsnapshot.nix +++ b/nixos/modules/services/backup/rsnapshot.nix @@ -26,7 +26,6 @@ in enableManualRsnapshot = mkOption { description = "Whether to enable manual usage of the rsnapshot command with this module."; default = true; - example = false; type = types.bool; }; diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix deleted file mode 100644 index 6e4721ded68b..000000000000 --- a/nixos/modules/services/backup/sitecopy-backup.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - inherit (pkgs) sitecopy; - - stateDir = "/var/spool/sitecopy"; - - sitecopyCron = backup : '' - ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name} >> /var/log/sitecopy.log 2>&1 - ''; -in - -{ - - options = { - - services.sitecopy = { - - enable = mkOption { - default = false; - description = '' - Whether to enable sitecopy backups of specified - directories. - ''; - }; - - period = mkOption { - default = "15 04 * * *"; - description = '' - This option defines (in the format used by cron) - when the sitecopy backups are to be run. - The default is to update at 04:15 (at night) every day. - ''; - }; - - backups = mkOption { - example = [ - { name = "test"; - local = "/tmp/backup"; - remote = "/staff-groups/ewi/st/strategoxt/backup/test"; - server = "webdata.tudelft.nl"; - protocol = "webdav"; - https = true ; - symlinks = "maintain" ; - } - ]; - default = []; - description = '' - List of attribute sets describing the backups. - - Username/password are extracted from - ${stateDir}/sitecopy.secrets at activation - time. The secrets file lines should have the following structure: - - server username password - - ''; - }; - - }; - - }; - - config = mkIf config.services.sitecopy.enable { - environment.systemPackages = [ sitecopy ]; - - services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups; - - system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ] - '' - mkdir -m 0700 -p ${stateDir} - chown root ${stateDir} - touch ${stateDir}/sitecopy.secrets - chown root ${stateDir}/sitecopy.secrets - - ${lib.concatStrings (map ( b: '' - unset secrets - unset secret - secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1` - secret=($secrets) - cat > ${stateDir}/${b.name}.conf << EOF - site ${b.name} - server ${b.server} - protocol ${b.protocol} - username ''${secret[1]} - password ''${secret[2]} - local ${b.local} - remote ${b.remote} - symlinks ${b.symlinks} - ${if b.https then "http secure" else ""} - EOF - chmod 0600 ${stateDir}/${b.name}.conf - if ! test -e ${stateDir}/${b.name} ; then - echo " * Initializing sitecopy '${b.name}'" - ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name} - else - echo " * Sitecopy '${b.name}' already initialized" - fi - '' ) config.services.sitecopy.backups - )} - ''; - }; - -} diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 67112343c335..7c9dedb67ad2 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -230,6 +230,14 @@ in Download bandwidth rate limit in bytes. ''; }; + + verbose = mkOption { + type = types.bool; + default = false; + description = '' + Whether to produce verbose logging output. + ''; + }; }; } )); @@ -293,7 +301,10 @@ in ''; script = - let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" -c -f "${name}-$(date +"%Y%m%d%H%M%S")" ${concatStringsSep " " cfg.directories}''; + let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" \ + -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \ + ${optionalString cfg.verbose "-v"} \ + ${concatStringsSep " " cfg.directories}''; in if (cfg.cachedir != null) then '' mkdir -p ${cfg.cachedir} chmod 0700 ${cfg.cachedir} diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 648089f90b7b..8c5af80c8fb7 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -9,6 +9,26 @@ in options = { services.znapzend = { enable = mkEnableOption "ZnapZend daemon"; + + logLevel = mkOption { + default = "debug"; + example = "warning"; + type = lib.types.enum ["debug" "info" "warning" "err" "alert"]; + description = "The log level when logging to file. Any of debug, info, warning, err, alert. Default in daemonized form is debug."; + }; + + logTo = mkOption { + type = types.str; + default = "syslog::daemon"; + example = "/var/log/znapzend.log"; + description = "Where to log to (syslog::<facility> or <filepath>)."; + }; + + noDestroy = mkOption { + type = types.bool; + default = false; + description = "Does all changes to the filesystem except destroy"; + }; }; }; @@ -18,19 +38,17 @@ in systemd.services = { "znapzend" = { description = "ZnapZend - ZFS Backup System"; + wantedBy = [ "zfs.target" ]; after = [ "zfs.target" ]; - path = with pkgs; [ znapzend zfs mbuffer openssh ]; + path = with pkgs; [ zfs mbuffer openssh ]; - script = '' - znapzend - ''; - - reload = '' - /bin/kill -HUP $MAINPID - ''; + serviceConfig = { + ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "on-failure"; + }; }; }; - }; } diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 9ccc7295019a..4c9d9aad0e2d 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -40,12 +40,12 @@ let }); policyFile = pkgs.writeText "kube-policy" - concatStringsSep "\n" (map (builtins.toJSON cfg.apiserver.authorizationPolicy)); + (concatStringsSep "\n" (map builtins.toJSON cfg.apiserver.authorizationPolicy)); cniConfig = pkgs.buildEnv { name = "kubernetes-cni-config"; - paths = imap (i: entry: - pkgs.writeTextDir "${10+i}-${entry.type}.conf" (builtins.toJSON entry) + paths = imap1 (i: entry: + pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) ) cfg.kubelet.cni.config; }; @@ -597,7 +597,7 @@ in { (mkIf cfg.kubelet.enable { systemd.services.kubelet = { description = "Kubernetes Kubelet Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "network.target" "docker.service" "kube-apiserver.service" ]; path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables ]; preStart = '' @@ -606,14 +606,15 @@ in { ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages} ''; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kubelet \ --pod-manifest-path=${manifests} \ --kubeconfig=${kubeconfig} \ --require-kubeconfig \ --address=${cfg.kubelet.address} \ --port=${toString cfg.kubelet.port} \ - --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \ - --register-schedulable=${if cfg.kubelet.registerSchedulable then "true" else "false"} \ + --register-node=${boolToString cfg.kubelet.registerNode} \ + --register-schedulable=${boolToString cfg.kubelet.registerSchedulable} \ ${optionalString (cfg.kubelet.tlsCertFile != null) "--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \ ${optionalString (cfg.kubelet.tlsKeyFile != null) @@ -621,7 +622,7 @@ in { --healthz-bind-address=${cfg.kubelet.healthz.bind} \ --healthz-port=${toString cfg.kubelet.healthz.port} \ --hostname-override=${cfg.kubelet.hostname} \ - --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ + --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \ --root-dir=${cfg.dataDir} \ --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ ${optionalString (cfg.kubelet.clusterDns != "") @@ -655,9 +656,10 @@ in { (mkIf cfg.apiserver.enable { systemd.services.kube-apiserver = { description = "Kubernetes Kubelet Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "network.target" "docker.service" ]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-apiserver \ --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \ ${optionalString (cfg.etcd.caFile != null) @@ -670,14 +672,14 @@ in { --bind-address=0.0.0.0 \ ${optionalString (cfg.apiserver.advertiseAddress != null) "--advertise-address=${cfg.apiserver.advertiseAddress}"} \ - --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ + --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\ ${optionalString (cfg.apiserver.tlsCertFile != null) "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \ ${optionalString (cfg.apiserver.tlsKeyFile != null) "--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \ ${optionalString (cfg.apiserver.tokenAuth != null) "--token-auth-file=${cfg.apiserver.tokenAuth}"} \ - --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \ + --kubelet-https=${boolToString cfg.apiserver.kubeletHttps} \ ${optionalString (cfg.apiserver.kubeletClientCaFile != null) "--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \ ${optionalString (cfg.apiserver.kubeletClientCertFile != null) @@ -713,13 +715,14 @@ in { (mkIf cfg.scheduler.enable { systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-scheduler \ --address=${cfg.scheduler.address} \ --port=${toString cfg.scheduler.port} \ - --leader-elect=${if cfg.scheduler.leaderElect then "true" else "false"} \ + --leader-elect=${boolToString cfg.scheduler.leaderElect} \ --kubeconfig=${kubeconfig} \ ${optionalString cfg.verbose "--v=6"} \ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ @@ -735,16 +738,17 @@ in { (mkIf cfg.controllerManager.enable { systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { RestartSec = "30s"; Restart = "on-failure"; + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-controller-manager \ --address=${cfg.controllerManager.address} \ --port=${toString cfg.controllerManager.port} \ --kubeconfig=${kubeconfig} \ - --leader-elect=${if cfg.controllerManager.leaderElect then "true" else "false"} \ + --leader-elect=${boolToString cfg.controllerManager.leaderElect} \ ${if (cfg.controllerManager.serviceAccountKeyFile!=null) then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}" else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \ @@ -767,10 +771,11 @@ in { (mkIf cfg.proxy.enable { systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; path = [pkgs.iptables]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-proxy \ --kubeconfig=${kubeconfig} \ --bind-address=${cfg.proxy.address} \ @@ -786,9 +791,10 @@ in { (mkIf cfg.dns.enable { systemd.services.kube-dns = { description = "Kubernetes Dns Service"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { + Slice = "kubernetes.slice"; ExecStart = ''${cfg.package}/bin/kube-dns \ --kubecfg-file=${kubeconfig} \ --dns-port=${toString cfg.dns.port} \ @@ -836,6 +842,11 @@ in { cfg.proxy.enable || cfg.dns.enable ) { + systemd.targets.kubernetes = { + description = "Kubernetes"; + wantedBy = [ "multi-user.target" ]; + }; + systemd.tmpfiles.rules = [ "d /opt/cni/bin 0755 root root -" "d /var/run/kubernetes 0755 kubernetes kubernetes -" diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index 91bd463732de..e43b6bbb2536 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -12,7 +12,6 @@ in enable = mkOption { type = types.bool; default = false; - example = true; description = '' Whether to enable the BOINC distributed computing client. If this option is set to true, the boinc_client daemon will be run as a @@ -41,7 +40,6 @@ in allowRemoteGuiRpc = mkOption { type = types.bool; default = false; - example = true; description = '' If set to true, any remote host can connect to and control this BOINC client (subject to password authentication). If instead set to false, diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index ee38a42199ee..fb91a29a4000 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 533751734fa5..846efc8b5b9a 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -12,7 +12,7 @@ let factory = util.BuildFactory() c = BuildmasterConfig = dict( workers = [${concatStringsSep "," cfg.workers}], - protocols = { 'pb': {'port': ${cfg.bpPort} } }, + protocols = { 'pb': {'port': ${toString cfg.bpPort} } }, title = '${escapeStr cfg.title}', titleURL = '${escapeStr cfg.titleUrl}', buildbotURL = '${escapeStr cfg.buildbotUrl}', @@ -62,7 +62,7 @@ in { extraConfig = mkOption { type = types.str; description = "Extra configuration to append to master.cfg"; - default = ""; + default = "c['buildbotNetUsageData'] = None"; }; masterCfg = mkOption { @@ -92,10 +92,7 @@ in { workers = mkOption { type = types.listOf types.str; description = "List of Workers."; - default = [ - "worker.Worker('example-worker', 'pass')" - ]; - example = [ "worker.LocalWorker('example-worker')" ]; + default = [ "worker.Worker('example-worker', 'pass')" ]; }; status = mkOption { @@ -135,9 +132,8 @@ in { }; bpPort = mkOption { - default = "9989"; - type = types.string; - example = "tcp:10000:interface=127.0.0.1"; + default = 9989; + type = types.int; description = "Port where the master will listen to Buildbot Worker."; }; @@ -179,14 +175,14 @@ in { package = mkOption { type = types.package; - default = pkgs.buildbot-ui; - defaultText = "pkgs.buildbot-ui"; + default = pkgs.buildbot-full; + defaultText = "pkgs.buildbot-full"; description = "Package to use for buildbot."; example = literalExample "pkgs.buildbot-full"; }; packages = mkOption { - default = [ ]; + default = with pkgs; [ python27Packages.twisted git ]; example = literalExample "[ pkgs.git ]"; type = types.listOf types.package; description = "Packages to add to PATH for the buildbot process."; @@ -212,10 +208,18 @@ in { systemd.services.buildbot-master = { description = "Buildbot Continuous Integration Server."; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; path = cfg.packages; + preStart = '' + env > envvars + mkdir -vp ${cfg.buildbotDir} + ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg + rm -fv $cfg.buildbotDir}/buildbot.tac + ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir} + ''; + serviceConfig = { Type = "simple"; User = cfg.user; @@ -224,20 +228,9 @@ in { ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; }; - preStart = '' - ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir} - ${pkgs.coreutils}/bin/ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg - ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir} - ''; - - postStart = '' - until [[ $(${pkgs.curl}/bin/curl -s --head -w '\n%{http_code}' http://localhost:${toString cfg.port} | tail -n1) =~ ^(200|403)$ ]]; do - sleep 1 - done - ''; }; }; - meta.maintainers = with lib.maintainers; [ nand0p Mic92 ]; + meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; } diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index e4ee4dd861ef..a97f571e89df 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -74,7 +74,7 @@ in { }; packages = mkOption { - default = [ ]; + default = with pkgs; [ python27Packages.twisted git ]; example = literalExample "[ pkgs.git ]"; type = types.listOf types.package; description = "Packages to add to PATH for the buildbot process."; @@ -106,7 +106,8 @@ in { path = cfg.packages; preStart = '' - ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir} + mkdir -vp ${cfg.buildbotDir} + rm -fv $cfg.buildbotDir}/buildbot.tac ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass} ''; @@ -115,7 +116,11 @@ in { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.home; - ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}"; + Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages"; + + # NOTE: call twistd directly with stdout logging for systemd + #ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}"; + ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac"; }; }; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 1fe4d28f9f35..b11bc031b3ff 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.gitlab-runner; configFile = pkgs.writeText "config.toml" cfg.configText; + hasDocker = config.virtualisation.docker.enable; in { options.services.gitlab-runner = { @@ -14,33 +15,67 @@ 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; description = "The working directory used"; }; + package = mkOption { + description = "Gitlab Runner package to use"; + default = pkgs.gitlab-runner; + defaultText = "pkgs.gitlab-runner"; + type = types.package; + example = literalExample "pkgs.gitlab-runner_1_11"; + }; + }; config = mkIf cfg.enable { systemd.services.gitlab-runner = { description = "Gitlab Runner"; - after = [ "network.target" "docker.service" ]; - requires = [ "docker.service" ]; + after = [ "network.target" ] + ++ optional hasDocker "docker.service"; + requires = optional hasDocker "docker.service"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.gitlab-runner.bin}/bin/gitlab-runner run \ + ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ --working-directory ${cfg.workDir} \ --config ${configFile} \ --service gitlab-runner \ --user gitlab-runner \ ''; + + } // optionalAttrs (cfg.gracefulTermination) { + TimeoutStopSec = "${cfg.gracefulTimeout}"; + KillSignal = "SIGQUIT"; + KillMode = "process"; }; }; + # Make the gitlab-runner command availabe so users can query the runner + environment.systemPackages = [ cfg.package ]; + users.extraUsers.gitlab-runner = { group = "gitlab-runner"; - extraGroups = [ "docker" ]; + extraGroups = optional hasDocker "docker"; uid = config.ids.uids.gitlab-runner; home = cfg.workDir; createHome = true; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index fa550f68b338..fcc0f58637c4 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -233,6 +233,7 @@ in hydra_logo ${cfg.logo} ''} gc_roots_dir ${cfg.gcRootsDir} + use-substitutes = ${if cfg.useSubstitutes then "1" else "0"} ''; environment.systemPackages = [ cfg.package ]; @@ -307,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}' " @@ -323,12 +325,13 @@ 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 }; serviceConfig = - { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${if cfg.useSubstitutes then "true" else "false"}"; + { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${boolToString cfg.useSubstitutes}"; ExecStopPost = "${cfg.package}/bin/hydra-queue-runner --unlock"; User = "hydra-queue-runner"; Restart = "always"; @@ -343,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/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 4edbbf59a42c..c14aa4167231 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -101,6 +101,22 @@ in { ''; }; + plugins = mkOption { + default = null; + type = types.nullOr (types.attrsOf types.package); + description = '' + A set of plugins to activate. Note that this will completely + remove and replace any previously installed plugins. If you + have manually-installed plugins that you want to keep while + using this module, set this option to + null. You can generate this set with a + tool such as jenkinsPlugins2nix. + ''; + example = literalExample '' + import path/to/jenkinsPlugins2nix-generated-plugins.nix { inherit (pkgs) fetchurl stdenv; } + ''; + }; + extraOptions = mkOption { type = types.listOf types.str; default = [ ]; @@ -109,6 +125,15 @@ in { Additional command line arguments to pass to Jenkins. ''; }; + + extraJavaOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-Xmx80m" ]; + description = '' + Additional command line arguments to pass to the Java run time (as opposed to Jenkins). + ''; + }; }; }; @@ -149,12 +174,27 @@ in { path = cfg.packages; # Force .war (re)extraction, or else we might run stale Jenkins. - preStart = '' - rm -rf ${cfg.home}/war - ''; + + preStart = + let replacePlugins = + if isNull cfg.plugins + then "" + else + let pluginCmds = lib.attrsets.mapAttrsToList + (n: v: "cp ${v} ${cfg.home}/plugins/${n}.hpi") + cfg.plugins; + in '' + rm -r ${cfg.home}/plugins || true + mkdir -p ${cfg.home}/plugins + ${lib.strings.concatStringsSep "\n" pluginCmds} + ''; + in '' + rm -rf ${cfg.home}/war + ${replacePlugins} + ''; script = '' - ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ ${concatStringsSep " " cfg.extraOptions} diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index b43b448ed7e1..1e5cd8f54130 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -21,8 +21,8 @@ let cassandraConf = '' cluster_name: ${cfg.clusterName} num_tokens: 256 - auto_bootstrap: ${if cfg.autoBootstrap then "true" else "false"} - hinted_handoff_enabled: ${if cfg.hintedHandOff then "true" else "false"} + auto_bootstrap: ${boolToString cfg.autoBootstrap} + hinted_handoff_enabled: ${boolToString cfg.hintedHandOff} hinted_handoff_throttle_in_kb: ${builtins.toString cfg.hintedHandOffThrottle} max_hints_delivery_threads: 2 max_hint_window_in_ms: 10800000 # 3 hours @@ -62,7 +62,7 @@ let rpc_keepalive: true rpc_server_type: sync thrift_framed_transport_size_in_mb: 15 - incremental_backups: ${if cfg.incrementalBackups then "true" else "false"} + incremental_backups: ${boolToString cfg.incrementalBackups} snapshot_before_compaction: false auto_snapshot: true column_index_size_in_kb: 64 @@ -89,7 +89,7 @@ let truststore: ${cfg.trustStorePath} truststore_password: ${cfg.trustStorePassword} client_encryption_options: - enabled: ${if cfg.clientEncryption then "true" else "false"} + enabled: ${boolToString cfg.clientEncryption} keystore: ${cfg.keyStorePath} keystore_password: ${cfg.keyStorePassword} internode_compression: all @@ -310,7 +310,6 @@ in { autoBootstrap = mkOption { description = "It makes new (non-seed) nodes automatically migrate the right data to themselves."; default = true; - example = true; type = types.bool; }; streamingSocketTimoutInMS = mkOption { diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix new file mode 100644 index 000000000000..631d7f8cba79 --- /dev/null +++ b/nixos/modules/services/databases/clickhouse.nix @@ -0,0 +1,75 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.clickhouse; + confDir = "/etc/clickhouse-server"; + stateDir = "/var/lib/clickhouse"; +in +with lib; +{ + + ###### interface + + options = { + + services.clickhouse = { + + enable = mkOption { + default = false; + description = "Whether to enable ClickHouse database server."; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers.clickhouse = { + name = "clickhouse"; + uid = config.ids.uids.clickhouse; + group = "clickhouse"; + description = "ClickHouse server user"; + }; + + users.extraGroups.clickhouse.gid = config.ids.gids.clickhouse; + + systemd.services.clickhouse = { + description = "ClickHouse server"; + + wantedBy = [ "multi-user.target" ]; + + after = [ "network.target" ]; + + preStart = '' + mkdir -p ${stateDir} + chown clickhouse:clickhouse ${confDir} ${stateDir} + ''; + + script = '' + cd "${confDir}" + exec ${pkgs.clickhouse}/bin/clickhouse-server + ''; + + serviceConfig = { + User = "clickhouse"; + Group = "clickhouse"; + PermissionsStartOnly = true; + }; + }; + + environment.etc = { + "clickhouse-server/config.xml" = { + source = "${pkgs.clickhouse}/etc/clickhouse-server/config.xml"; + }; + + "clickhouse-server/users.xml" = { + source = "${pkgs.clickhouse}/etc/clickhouse-server/users.xml"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index d4d231456c52..52247bfb983e 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -4,20 +4,29 @@ with lib; let cfg = config.services.couchdb; - configFile = pkgs.writeText "couchdb.ini" + useVersion2 = strings.versionAtLeast (strings.getVersion cfg.package) "2.0"; + configFile = pkgs.writeText "couchdb.ini" ( '' [couchdb] database_dir = ${cfg.databaseDir} uri_file = ${cfg.uriFile} view_index_dir = ${cfg.viewIndexDir} - + '' + (if useVersion2 then + '' + [chttpd] + '' else + '' [httpd] + '') + + '' port = ${toString cfg.port} bind_address = ${cfg.bindAddress} [log] file = ${cfg.logFile} - ''; + ''); + executable = if useVersion2 then "${cfg.package}/bin/couchdb" + else ''${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}''; in { @@ -130,7 +139,6 @@ in { configFile = mkOption { type = types.string; - default = "/var/lib/couchdb/couchdb.ini"; description = '' Configuration file for persisting runtime changes. File needs to be readable and writable from couchdb user/group. @@ -147,6 +155,9 @@ in { environment.systemPackages = [ cfg.package ]; + services.couchdb.configFile = mkDefault + (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini"); + systemd.services.couchdb = { description = "CouchDB Server"; wantedBy = [ "multi-user.target" ]; @@ -170,11 +181,20 @@ in { fi ''; + environment = mkIf useVersion2 { + # we are actually specifying 4 configuration files: + # 1. the preinstalled default.ini + # 2. the module configuration + # 3. the extraConfig from the module options + # 4. the locally writable config file, which couchdb itself writes to + ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}''; + }; + serviceConfig = { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}"; + ExecStart = executable; }; }; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 38e46a0c6ef9..c56564f57f36 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -4,8 +4,6 @@ with lib; let - b2s = x: if x then "true" else "false"; - cfg = config.services.mongodb; mongodb = cfg.package; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index fcf1f123cfb5..6027f109285a 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; @@ -72,7 +80,7 @@ in dataDir = mkOption { type = types.path; - default = "/var/mysql"; # !!! should be /var/db/mysql + example = "/var/lib/mysql"; description = "Location where MySQL stores its table files"; }; @@ -166,6 +174,10 @@ in config = mkIf config.services.mysql.enable { + services.mysql.dataDir = + mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" + else "/var/mysql"); + users.extraUsers.mysql = { description = "MySQL server user"; group = "mysql"; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index cbba9c2a691c..424e08a6ee34 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -27,9 +27,7 @@ let ''} dbms.shell.enabled=true ${cfg.extraServerConfig} - ''; - wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" '' # Default JVM parameters from neo4j.conf dbms.jvm.additional=-XX:+UseG1GC dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow @@ -130,16 +128,16 @@ in { ExecStart = "${cfg.package}/bin/neo4j console"; User = "neo4j"; PermissionsStartOnly = true; + LimitNOFILE = 40000; }; preStart = '' mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs} ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf - ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi ''; }; - environment.systemPackages = [ pkgs.neo4j ]; + environment.systemPackages = [ cfg.package ]; users.extraUsers = singleton { name = "neo4j"; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index d76859bf3eb6..e884098cb08d 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -25,7 +25,6 @@ in description = " Whether to enable the ldap server. "; - example = true; }; user = mkOption { diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 24ef4637ec98..d06e03a52978 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -38,6 +38,10 @@ let pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4"; + # NixOS traditionally used `root` as superuser, most other distros use `postgres`. From 17.09 + # we also try to follow this standard + superuser = (if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root"); + in { @@ -74,7 +78,7 @@ in dataDir = mkOption { type = types.path; - default = "/var/db/postgresql"; + example = "/var/lib/postgresql/9.6"; description = '' Data directory for PostgreSQL. ''; @@ -160,7 +164,13 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 else pkgs.postgresql94); + mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96 + else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 + else pkgs.postgresql94); + + services.postgresql.dataDir = + mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}" + else "/var/db/postgresql"); services.postgresql.authentication = mkAfter '' @@ -205,7 +215,7 @@ in '' # Initialise the database. if ! test -e ${cfg.dataDir}/PG_VERSION; then - initdb -U root + initdb -U ${superuser} # See postStart! touch "${cfg.dataDir}/.first_startup" fi @@ -237,14 +247,14 @@ in # Wait for PostgreSQL to be ready to accept connections. postStart = '' - while ! psql --port=${toString cfg.port} postgres -c "" 2> /dev/null; do + while ! ${pkgs.sudo}/bin/sudo -u ${superuser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do if ! kill -0 "$MAINPID"; then exit 1; fi sleep 0.1 done if test -e "${cfg.dataDir}/.first_startup"; then ${optionalString (cfg.initialScript != null) '' - psql -f "${cfg.initialScript}" --port=${toString cfg.port} postgres + ${pkgs.sudo}/bin/sudo -u ${superuser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres ''} rm -f "${cfg.dataDir}/.first_startup" fi diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix new file mode 100644 index 000000000000..cd8c386b08db --- /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/desktops/gnome3/gnome-disks.nix b/nixos/modules/services/desktops/gnome3/gnome-disks.nix new file mode 100644 index 000000000000..33c4bc49f982 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/gnome-disks.nix @@ -0,0 +1,42 @@ +# GNOME Disks daemon. + +{ config, pkgs, lib, ... }: + +with lib; + +let + gnome3 = config.environment.gnome3.packageSet; +in +{ + + ###### interface + + options = { + + services.gnome3.gnome-disks = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable GNOME Disks daemon, a service designed to + be a UDisks2 graphical front-end. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.gnome-disks.enable { + + environment.systemPackages = [ gnome3.gnome-disk-utility ]; + + services.dbus.packages = [ gnome3.gnome-disk-utility ]; + + }; + +} diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 08fa6de6374c..2c5a0c4849ef 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -21,7 +21,6 @@ in { enable = mkOption { type = types.bool; default = false; - example = true; description = '' Whether to enable a user service for the Emacs daemon. Use emacsclient to connect to the daemon. If true, services.emacs.install is @@ -32,7 +31,6 @@ in { install = mkOption { type = types.bool; default = false; - example = true; description = '' Whether to install a user service for the Emacs daemon. Once the service is started, use emacsclient to connect to the @@ -57,7 +55,6 @@ in { defaultEditor = mkOption { type = types.bool; default = false; - example = true; description = '' When enabled, configures emacsclient to be the default editor using the EDITOR environment variable. diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 89f09ed08449..9d6395ebd74c 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -79,10 +79,11 @@ - emacs24Macport + emacsMacport + emacs25Macport - Emacs 24 with the "Mac port" patches, providing a more + Emacs 25 with the "Mac port" patches, providing a more native look and feel under OS X. diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index e7f070d08773..1dc8ce93a0e5 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/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix index 087bd0e04098..b0f9ff56d1b2 100644 --- a/nixos/modules/services/hardware/amd-hybrid-graphics.nix +++ b/nixos/modules/services/hardware/amd-hybrid-graphics.nix @@ -25,15 +25,22 @@ path = [ pkgs.bash ]; description = "Disable AMD Card"; after = [ "sys-kernel-debug.mount" ]; - requires = [ "sys-kernel-debug.mount" ]; - wantedBy = [ "multi-user.target" ]; + before = [ "systemd-vconsole-setup.service" "display-manager.service" ]; + requires = [ "sys-kernel-debug.mount" "vgaswitcheroo.path" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch; exit 0'"; - ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch; exit 0'"; + ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch'"; + ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch'"; }; }; + systemd.paths."vgaswitcheroo" = { + pathConfig = { + PathExists = "/sys/kernel/debug/vgaswitcheroo/switch"; + Unit = "amd-hybrid-graphics.service"; + }; + wantedBy = ["multi-user.target"]; + }; }; } diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 71b3a93a2e0d..4a8cd86b0b11 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -6,20 +6,34 @@ let bluez-bluetooth = pkgs.bluez; cfg = config.hardware.bluetooth; -in - -{ +in { ###### interface options = { - hardware.bluetooth.enable = mkEnableOption "support for Bluetooth."; + hardware.bluetooth = { + enable = mkEnableOption "support for Bluetooth."; - hardware.bluetooth.powerOnBoot = mkOption { - type = types.bool; - default = true; - description = "Whether to power up the default Bluetooth controller on boot."; + powerOnBoot = mkOption { + type = types.bool; + default = true; + description = "Whether to power up the default Bluetooth controller on boot."; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + [General] + ControllerMode = bredr + ''; + description = '' + Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf). + + NOTE: We already include [Policy], so any configuration under the Policy group should come first. + ''; + }; }; }; @@ -30,33 +44,25 @@ in environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; + environment.etc = singleton { + source = pkgs.writeText "main.conf" '' + [Policy] + AutoEnable=${lib.boolToString cfg.powerOnBoot} + + ${cfg.extraConfig} + ''; + target = "bluetooth/main.conf"; + }; + services.udev.packages = [ bluez-bluetooth ]; services.dbus.packages = [ bluez-bluetooth ]; systemd.packages = [ bluez-bluetooth ]; - services.udev.extraRules = optionalString cfg.powerOnBoot '' - ACTION=="add", KERNEL=="hci[0-9]*", ENV{SYSTEMD_WANTS}="bluetooth-power@%k.service" - ''; - systemd.services = { bluetooth = { wantedBy = [ "bluetooth.target" ]; aliases = [ "dbus-org.bluez.service" ]; }; - - "bluetooth-power@" = mkIf cfg.powerOnBoot { - description = "Power up bluetooth controller"; - after = [ - "bluetooth.service" - "suspend.target" - "sys-subsystem-bluetooth-devices-%i.device" - ]; - wantedBy = [ "suspend.target" ]; - - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = "${pkgs.bluez.out}/bin/hciconfig %i up"; - }; - }; systemd.user.services = { diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index f36a9e7b4596..3b108c87edd2 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -58,6 +58,9 @@ in powerManagement.cpuFreqGovernor = null; systemd.services = { + "systemd-rfkill@".enable = false; + "systemd-rfkill".enable = false; + tlp = { description = "TLP system startup/shutdown"; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 028907693a5a..9f42f9e59ad5 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -35,6 +35,7 @@ let udevRules = pkgs.runCommand "udev-rules" { preferLocalBuild = true; allowSubstitutes = false; + packages = unique (map toString cfg.packages); } '' mkdir -p $out @@ -45,7 +46,7 @@ let echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules # Add the udev rules from other packages. - for i in ${toString cfg.packages}; do + for i in $packages; do echo "Adding rules for package $i" for j in $i/{etc,lib}/udev/rules.d/*; do echo "Copying $j to $out/$(basename $j)" @@ -132,10 +133,11 @@ let hwdbBin = pkgs.runCommand "hwdb.bin" { preferLocalBuild = true; allowSubstitutes = false; + packages = unique (map toString ([udev] ++ cfg.packages)); } '' mkdir -p etc/udev/hwdb.d - for i in ${toString ([udev] ++ cfg.packages)}; do + for i in $packages; do echo "Adding hwdb files for package $i" for j in $i/{etc,lib}/udev/hwdb.d/*; do ln -s $j etc/udev/hwdb.d/$(basename $j) diff --git a/nixos/modules/services/logging/SystemdJournal2Gelf.nix b/nixos/modules/services/logging/SystemdJournal2Gelf.nix new file mode 100644 index 000000000000..e90d9e7a12b6 --- /dev/null +++ b/nixos/modules/services/logging/SystemdJournal2Gelf.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.SystemdJournal2Gelf; +in + +{ options = { + services.SystemdJournal2Gelf = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable SystemdJournal2Gelf. + ''; + }; + + graylogServer = mkOption { + type = types.string; + example = "graylog2.example.com:11201"; + description = '' + Host and port of your graylog2 input. This should be a GELF + UDP input. + ''; + }; + + extraOptions = mkOption { + type = types.string; + default = ""; + description = '' + Any extra flags to pass to SystemdJournal2Gelf. Note that + these are basically journalctl flags. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.systemd-journal2gelf; + description = '' + SystemdJournal2Gelf package to use. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + systemd.services.SystemdJournal2Gelf = { + description = "SystemdJournal2Gelf"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/SystemdJournal2Gelf ${cfg.graylogServer} --follow ${cfg.extraOptions}"; + Restart = "on-failure"; + RestartSec = "30"; + }; + }; + }; +} \ No newline at end of file diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix index 8ab7e6acd98e..612ae06d0a79 100644 --- a/nixos/modules/services/logging/awstats.nix +++ b/nixos/modules/services/logging/awstats.nix @@ -38,7 +38,7 @@ in Specification of the time at which awstats will get updated. (in the format described by systemd.time - 5) + 7) ''; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 95283096662e..9f0fb11f0252 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -4,16 +4,15 @@ with lib; let cfg = config.services.graylog; - configBool = b: if b then "true" else "false"; confFile = pkgs.writeText "graylog.conf" '' - is_master = ${configBool cfg.isMaster} + is_master = ${boolToString cfg.isMaster} node_id_file = ${cfg.nodeIdFile} password_secret = ${cfg.passwordSecret} root_username = ${cfg.rootUsername} root_password_sha2 = ${cfg.rootPasswordSha2} elasticsearch_cluster_name = ${cfg.elasticsearchClusterName} - elasticsearch_discovery_zen_ping_multicast_enabled = ${configBool cfg.elasticsearchDiscoveryZenPingMulticastEnabled} + elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled} elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts} message_journal_dir = ${cfg.messageJournalDir} mongodb_uri = ${cfg.mongodbUri} diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix new file mode 100644 index 000000000000..b595ac07bf5e --- /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 000000000000..d49795fe2b77 --- /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/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index c9477b9e3ab0..b4abd2cd7e5e 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -4,17 +4,46 @@ with lib; let cfg = config.services.logstash; + atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; pluginPath = lib.concatStringsSep ":" cfg.plugins; havePluginPath = lib.length cfg.plugins > 0; ops = lib.optionalString; - verbosityFlag = { - debug = "--debug"; - info = "--verbose"; - warn = ""; # intentionally empty - error = "--quiet"; - fatal = "--silent"; - }."${cfg.logLevel}"; + verbosityFlag = + if atLeast54 + then "--log.level " + cfg.logLevel + else { + debug = "--debug"; + info = "--verbose"; + warn = ""; # intentionally empty + error = "--quiet"; + fatal = "--silent"; + }."${cfg.logLevel}"; + pluginsPath = + if atLeast54 + then "--path.plugins ${pluginPath}" + else "--pluginpath ${pluginPath}"; + + logstashConf = pkgs.writeText "logstash.conf" '' + input { + ${cfg.inputConfig} + } + + filter { + ${cfg.filterConfig} + } + + output { + ${cfg.outputConfig} + } + ''; + + logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings; + + logstashSettingsDir = pkgs.runCommand "logstash-settings" {inherit logstashSettingsYml;} '' + mkdir -p $out + ln -s $logstashSettingsYml $out/logstash.yml + ''; in { @@ -45,6 +74,15 @@ in description = "The paths to find other logstash plugins in."; }; + dataDir = mkOption { + type = types.str; + default = "/var/lib/logstash"; + description = '' + A path to directory writable by logstash that it uses to store data. + Plugins will also have access to this path. + ''; + }; + logLevel = mkOption { type = types.enum [ "debug" "info" "warn" "error" "fatal" ]; default = "warn"; @@ -116,6 +154,19 @@ in ''; }; + extraSettings = mkOption { + type = types.lines; + default = ""; + description = "Extra Logstash settings in YAML format."; + example = '' + pipeline: + batch: + size: 125 + delay: 5 + ''; + }; + + }; }; @@ -123,31 +174,34 @@ in ###### implementation config = mkIf cfg.enable { + assertions = [ + { assertion = atLeast54 -> !cfg.enableWeb; + message = '' + The logstash web interface is only available for versions older than 5.4. + So either set services.logstash.enableWeb = false, + or set services.logstash.package to an older logstash. + ''; + } + ]; + systemd.services.logstash = with pkgs; { description = "Logstash Daemon"; wantedBy = [ "multi-user.target" ]; environment = { JAVA_HOME = jre; }; path = [ pkgs.bash ]; serviceConfig = { - ExecStart = - "${cfg.package}/bin/logstash agent " + - "-w ${toString cfg.filterWorkers} " + - ops havePluginPath "--pluginpath ${pluginPath} " + - "${verbosityFlag} " + - "-f ${writeText "logstash.conf" '' - input { - ${cfg.inputConfig} - } - - filter { - ${cfg.filterConfig} - } - - output { - ${cfg.outputConfig} - } - ''} " + - ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}"; + ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''; + ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [ + "${cfg.package}/bin/logstash" + (ops (!atLeast54) "agent") + "-w ${toString cfg.filterWorkers}" + (ops havePluginPath pluginsPath) + "${verbosityFlag}" + "-f ${logstashConf}" + (ops atLeast54 "--path.settings ${logstashSettingsDir}") + (ops atLeast54 "--path.data ${cfg.dataDir}") + (ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}") + ]); }; }; }; diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix new file mode 100644 index 000000000000..206fb50d31a2 --- /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/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index e2b37522cb16..b6439b44fb5f 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -4,6 +4,8 @@ with lib; let + concatMapLines = f: l: lib.concatStringsSep "\n" (map f l); + cfg = config.services.mlmmj; stateDir = "/var/lib/mlmmj"; spoolDir = "/var/spool/mlmmj"; @@ -16,13 +18,24 @@ let listAddress = domain: list: "${list}@${domain}"; customHeaders = domain: list: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ]; footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}"; - createList = d: l: '' - ${pkgs.coreutils}/bin/mkdir -p ${listCtl d l} - echo ${listAddress d l} > ${listCtl d l}/listadress - echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > ${listCtl d l}/customheaders - echo ${footer d l} > ${listCtl d l}/footer - echo ${subjectPrefix l} > ${listCtl d l}/prefix - ''; + createList = d: l: + let ctlDir = listCtl d l; in + '' + for DIR in incoming queue queue/discarded archive text subconf unsubconf \ + bounce control moderation subscribers.d digesters.d requeue \ + nomailsubs.d + do + mkdir -p '${listDir d l}'/"$DIR" + done + ${pkgs.coreutils}/bin/mkdir -p ${ctlDir} + echo ${listAddress d l} > '${ctlDir}/listaddress' + [ ! -e ${ctlDir}/customheaders ] && \ + echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > '${ctlDir}/customheaders' + [ ! -e ${ctlDir}/footer ] && \ + echo ${footer d l} > '${ctlDir}/footer' + [ ! -e ${ctlDir}/prefix ] && \ + echo ${subjectPrefix l} > '${ctlDir}/prefix' + ''; in { @@ -63,6 +76,16 @@ in description = "The collection of hosted maillists"; }; + maintInterval = mkOption { + type = types.str; + default = "20min"; + description = '' + Time interval between mlmmj-maintd runs, see + systemd.time + 7 for format information. + ''; + }; + }; }; @@ -93,7 +116,7 @@ in mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nexthop ''; - extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists; + extraAliases = concatMapLines (alias cfg.listDomain) cfg.mailLists; extraConfig = '' transport_maps = hash:${stateDir}/transports @@ -107,17 +130,15 @@ in system.activationScripts.mlmmj = '' ${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain} ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir} - ${lib.concatMapStrings (createList cfg.listDomain) cfg.mailLists} - echo ${lib.concatMapStrings (virtual cfg.listDomain) cfg.mailLists} > ${stateDir}/virtuals - echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} > ${stateDir}/transports + ${concatMapLines (createList cfg.listDomain) cfg.mailLists} + echo "${concatMapLines (virtual cfg.listDomain) cfg.mailLists}" > ${stateDir}/virtuals + echo "${concatMapLines (transport cfg.listDomain) cfg.mailLists}" > ${stateDir}/transports ${pkgs.postfix}/bin/postmap ${stateDir}/virtuals ${pkgs.postfix}/bin/postmap ${stateDir}/transports ''; systemd.services."mlmmj-maintd" = { description = "mlmmj maintenance daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { User = cfg.user; Group = cfg.group; @@ -125,6 +146,11 @@ in }; }; + systemd.timers."mlmmj-maintd" = { + description = "mlmmj maintenance timer"; + timerConfig.OnUnitActiveSec = cfg.maintInterval; + wantedBy = [ "timers.target" ]; + }; }; } diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix new file mode 100644 index 000000000000..b2c738ab6ebd --- /dev/null +++ b/nixos/modules/services/mail/nullmailer.nix @@ -0,0 +1,217 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + + options = { + + services.nullmailer = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable nullmailer daemon."; + }; + + user = mkOption { + type = types.string; + default = "nullmailer"; + description = '' + User to use to run nullmailer-send. + ''; + }; + + group = mkOption { + type = types.string; + default = "nullmailer"; + description = '' + Group to use to run nullmailer-send. + ''; + }; + + setSendmail = mkOption { + type = types.bool; + default = true; + description = "Whether to set the system sendmail to nullmailer's."; + }; + + config = { + adminaddr = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set, all recipients to users at either "localhost" (the literal string) + or the canonical host name (from the me control attribute) are remapped to this address. + This is provided to allow local daemons to be able to send email to + "somebody@localhost" and have it go somewhere sensible instead of being bounced + by your relay host. To send to multiple addresses, + put them all on one line separated by a comma. + ''; + }; + + allmailfrom = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set, content will override the envelope sender on all messages. + ''; + }; + + defaultdomain = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The content of this attribute is appended to any host name that + does not contain a period (except localhost), including defaulthost + and idhost. Defaults to the value of the me attribute, if it exists, + otherwise the literal name defauldomain. + ''; + }; + + defaulthost = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The content of this attribute is appended to any address that + is missing a host name. Defaults to the value of the me control + attribute, if it exists, otherwise the literal name defaulthost. + ''; + }; + + doublebounceto = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If the original sender was empty (the original message was a + delivery status or disposition notification), the double bounce + is sent to the address in this attribute. + ''; + }; + + helohost = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Sets the environment variable $HELOHOST which is used by the + SMTP protocol module to set the parameter given to the HELO command. + Defaults to the value of the me configuration attribute. + ''; + }; + + idhost = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The content of this attribute is used when building the message-id + string for the message. Defaults to the canonicalized value of defaulthost. + ''; + }; + + maxpause = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The maximum time to pause between successive queue runs, in seconds. + Defaults to 24 hours (86400). + ''; + }; + + me = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The fully-qualifiled host name of the computer running nullmailer. + Defaults to the literal name me. + ''; + }; + + pausetime = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The minimum time to pause between successive queue runs when there + are messages in the queue, in seconds. Defaults to 1 minute (60). + Each time this timeout is reached, the timeout is doubled to a + maximum of maxpause. After new messages are injected, the timeout + is reset. If this is set to 0, nullmailer-send will exit + immediately after going through the queue once (one-shot mode). + ''; + }; + + remotes = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set, content will override the envelope sender on all messages. + ''; + }; + + sendtimeout = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The time to wait for a remote module listed above to complete sending + a message before killing it and trying again, in seconds. + Defaults to 1 hour (3600). If this is set to 0, nullmailer-send + will wait forever for messages to complete sending. + ''; + }; + }; + }; + }; + + config = let + cfg = config.services.nullmailer; + in mkIf cfg.enable { + + environment = { + systemPackages = [ pkgs.nullmailer ]; + etc = let + getval = attr: builtins.getAttr attr cfg.config; + attrs = builtins.attrNames cfg.config; + attrs' = builtins.filter (attr: ! isNull (getval attr)) attrs; + in foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs'; + }; + + users = { + extraUsers = singleton { + name = cfg.user; + description = "Nullmailer relay-only mta user"; + group = cfg.group; + }; + + extraGroups = singleton { + name = cfg.group; + }; + }; + + systemd.services.nullmailer = { + description = "nullmailer"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + mkdir -p /var/spool/nullmailer/{queue,tmp} + rm -f var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger + chown ${cfg.user} /var/spool/nullmailer/* + ''; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly=true; + ExecStart = "${pkgs.nullmailer}/bin/nullmailer-send"; + Restart = "always"; + }; + }; + + services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail { + program = "sendmail"; + source = "${pkgs.nullmailer}/bin/sendmail"; + owner = cfg.user; + group = cfg.group; + setuid = true; + setgid = true; + }; + }; +} diff --git a/nixos/modules/services/mail/offlineimap.nix b/nixos/modules/services/mail/offlineimap.nix index 85ece020905b..4b24bd8d0813 100644 --- a/nixos/modules/services/mail/offlineimap.nix +++ b/nixos/modules/services/mail/offlineimap.nix @@ -12,7 +12,6 @@ in { install = mkOption { type = types.bool; default = false; - example = true; description = '' Whether to install a user service for Offlineimap. Once the service is started, emails will be fetched automatically. diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index caaa87b94d61..845c6acc7feb 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/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index 8f18b929c114..e17b7516bfff 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -5,35 +5,38 @@ with lib; let rspamdCfg = config.services.rspamd; + postfixCfg = config.services.postfix; cfg = config.services.rmilter; - inetSockets = map (sock: let s = stringSplit ":" sock; in "inet:${last s}:${head s}") cfg.bindInetSockets; - unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets; + inetSocket = addr: port: "inet:[${toString port}@${addr}]"; + unixSocket = sock: "unix:${sock}"; - allSockets = unixSockets ++ inetSockets; + systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path + else "${cfg.bindSocket.address}:${toString cfg.bindSocket.port}"; + rmilterSocket = if cfg.bindSocket.type == "unix" then unixSocket cfg.bindSocket.path + else inetSocket cfg.bindSocket.address cfg.bindSocket.port; rmilterConf = '' -pidfile = /run/rmilter/rmilter.pid; -bind_socket = ${if cfg.socketActivation then "fd:3" else concatStringsSep ", " allSockets}; -tempdir = /tmp; - + pidfile = /run/rmilter/rmilter.pid; + bind_socket = ${if cfg.socketActivation then "fd:3" else rmilterSocket}; + tempdir = /tmp; '' + (with cfg.rspamd; if enable then '' -spamd { - servers = ${concatStringsSep ", " servers}; - connect_timeout = 1s; - results_timeout = 20s; - error_time = 10; - dead_time = 300; - maxerrors = 10; - reject_message = "${rejectMessage}"; - ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} + spamd { + servers = ${concatStringsSep ", " servers}; + connect_timeout = 1s; + results_timeout = 20s; + error_time = 10; + dead_time = 300; + maxerrors = 10; + reject_message = "${rejectMessage}"; + ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} - # rspamd_metric - metric for using with rspamd - # Default: "default" - rspamd_metric = "default"; - ${extraConfig} -}; - '' else "") + cfg.extraConfig; + # rspamd_metric - metric for using with rspamd + # Default: "default" + rspamd_metric = "default"; + ${extraConfig} + }; + '' else "") + cfg.extraConfig; rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf; @@ -48,11 +51,13 @@ in services.rmilter = { enable = mkOption { + type = types.bool; default = cfg.rspamd.enable; description = "Whether to run the rmilter daemon."; }; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the rmilter daemon in debug mode."; }; @@ -73,25 +78,37 @@ in ''; }; - bindUnixSockets = mkOption { - type = types.listOf types.str; - default = ["/run/rmilter/rmilter.sock"]; + bindSocket.type = mkOption { + type = types.enum [ "unix" "inet" ]; + default = "unix"; description = '' - Unix domain sockets to listen for MTA requests. - ''; - example = '' - [ "/run/rmilter.sock"] + What kind of socket rmilter should listen on. Either "unix" + for an Unix domain socket or "inet" for a TCP socket. ''; }; - bindInetSockets = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Inet addresses to listen (in format accepted by systemd.socket) + bindSocket.path = mkOption { + type = types.str; + default = "/run/rmilter/rmilter.sock"; + description = '' + Path to Unix domain socket to listen on. ''; - example = '' - ["127.0.0.1:11990"] + }; + + bindSocket.address = mkOption { + type = types.str; + default = "::1"; + example = "0.0.0.0"; + description = '' + Inet address to listen on. + ''; + }; + + bindSocket.port = mkOption { + type = types.int; + default = 11990; + description = '' + Inet port to listen on. ''; }; @@ -100,14 +117,16 @@ in default = true; description = '' Enable systemd socket activation for rmilter. - (disabling socket activation not recommended - when unix socket used, and follow to wrong - permissions on unix domain socket.) + + Disabling socket activation is not recommended when a Unix + domain socket is used and could lead to incorrect + permissions. ''; }; rspamd = { enable = mkOption { + type = types.bool; default = rspamdCfg.enable; description = "Whether to use rspamd to filter mails"; }; @@ -157,13 +176,9 @@ in type = types.str; description = "Addon to postfix configuration"; default = '' -smtpd_milters = ${head allSockets} -# or for TCP socket -# # smtpd_milters = inet:localhost:9900 -milter_protocol = 6 -milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} -# skip mail without checks if milter will die -milter_default_action = accept + smtpd_milters = ${rmilterSocket} + milter_protocol = 6 + milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} ''; }; }; @@ -175,52 +190,60 @@ milter_default_action = accept ###### implementation - config = mkIf cfg.enable { + config = mkMerge [ - users.extraUsers = singleton { - name = cfg.user; - description = "rspamd daemon"; - uid = config.ids.uids.rmilter; - group = cfg.group; - }; + (mkIf cfg.enable { - users.extraGroups = singleton { - name = cfg.group; - gid = config.ids.gids.rmilter; - }; - - systemd.services.rmilter = { - description = "Rmilter Service"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; - ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - Restart = "always"; - RuntimeDirectory = "rmilter"; - RuntimeDirectoryMode = "0755"; + users.extraUsers = singleton { + name = cfg.user; + description = "rmilter daemon"; + uid = config.ids.uids.rmilter; + group = cfg.group; }; - }; - - systemd.sockets.rmilter = mkIf cfg.socketActivation { - description = "Rmilter service socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; - SocketUser = cfg.user; - SocketGroup = cfg.group; - SocketMode = "0666"; + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.rmilter; }; - }; - services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment; - users.users.postfix.extraGroups = [ cfg.group ]; - }; + systemd.services.rmilter = { + description = "Rmilter Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + Restart = "always"; + RuntimeDirectory = "rmilter"; + RuntimeDirectoryMode = "0750"; + }; + + }; + + systemd.sockets.rmilter = mkIf cfg.socketActivation { + description = "Rmilter service socket"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = systemdSocket; + SocketUser = cfg.user; + SocketGroup = cfg.group; + SocketMode = "0660"; + }; + }; + }) + + (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { + users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ]; + }) + + (mkIf (cfg.enable && cfg.postfix.enable) { + services.postfix.extraConfig = cfg.postfix.configFragment; + users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ]; + }) + ]; } diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 98489df78517..6d403e448e04 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -53,8 +53,11 @@ in bindSocket = mkOption { type = types.listOf types.str; default = [ - "/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}" + "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" ]; + defaultText = ''[ + "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" + ]''; description = '' List of sockets to listen, in format acceptable by rspamd ''; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 08953134b3b3..fc8396cd85e9 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -3,43 +3,129 @@ with lib; let - cfg = config.services.spamassassin; + spamassassin-local-cf = pkgs.writeText "local.cf" cfg.config; + spamassassin-init-pre = pkgs.writeText "init.pre" cfg.initPreConf; + + spamdEnv = pkgs.buildEnv { + name = "spamd-env"; + paths = []; + postBuild = '' + ln -sf ${spamassassin-init-pre} $out/init.pre + ln -sf ${spamassassin-local-cf} $out/local.cf + ''; + }; in { - - ###### interface - options = { services.spamassassin = { - enable = mkOption { default = false; - description = "Whether to run the SpamAssassin daemon."; + description = "Whether to run the SpamAssassin daemon"; }; debug = mkOption { default = false; - description = "Whether to run the SpamAssassin daemon in debug mode."; + description = "Whether to run the SpamAssassin daemon in debug mode"; }; + config = mkOption { + type = types.lines; + description = '' + The SpamAssassin local.cf config + + If you are using this configuration: + add_header all Status _YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_ + + Then you can Use this sieve filter: + require ["fileinto", "reject", "envelope"]; + + if header :contains "X-Spam-Flag" "YES" { + fileinto "spam"; + } + + Or this procmail filter: + :0: + * ^X-Spam-Flag: YES + /var/vpopmail/domains/lastlog.de/js/.maildir/.spam/new + + To filter your messages based on the additional mail headers added by spamassassin. + ''; + example = '' + #rewrite_header Subject [***** SPAM _SCORE_ *****] + required_score 5.0 + use_bayes 1 + bayes_auto_learn 1 + add_header all Status _YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_ + ''; + default = ""; + }; + + initPreConf = mkOption { + type = types.str; + description = "The SpamAssassin init.pre config."; + default = + '' + # + # to update this list, run this command in the rules directory: + # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq + # + + #loadplugin Mail::SpamAssassin::Plugin::AccessDB + #loadplugin Mail::SpamAssassin::Plugin::AntiVirus + loadplugin Mail::SpamAssassin::Plugin::AskDNS + # loadplugin Mail::SpamAssassin::Plugin::ASN + loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold + #loadplugin Mail::SpamAssassin::Plugin::AWL + loadplugin Mail::SpamAssassin::Plugin::Bayes + loadplugin Mail::SpamAssassin::Plugin::BodyEval + loadplugin Mail::SpamAssassin::Plugin::Check + #loadplugin Mail::SpamAssassin::Plugin::DCC + loadplugin Mail::SpamAssassin::Plugin::DKIM + loadplugin Mail::SpamAssassin::Plugin::DNSEval + loadplugin Mail::SpamAssassin::Plugin::FreeMail + loadplugin Mail::SpamAssassin::Plugin::Hashcash + loadplugin Mail::SpamAssassin::Plugin::HeaderEval + loadplugin Mail::SpamAssassin::Plugin::HTMLEval + loadplugin Mail::SpamAssassin::Plugin::HTTPSMismatch + loadplugin Mail::SpamAssassin::Plugin::ImageInfo + loadplugin Mail::SpamAssassin::Plugin::MIMEEval + loadplugin Mail::SpamAssassin::Plugin::MIMEHeader + # loadplugin Mail::SpamAssassin::Plugin::PDFInfo + #loadplugin Mail::SpamAssassin::Plugin::PhishTag + loadplugin Mail::SpamAssassin::Plugin::Pyzor + loadplugin Mail::SpamAssassin::Plugin::Razor2 + # loadplugin Mail::SpamAssassin::Plugin::RelayCountry + loadplugin Mail::SpamAssassin::Plugin::RelayEval + loadplugin Mail::SpamAssassin::Plugin::ReplaceTags + # loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody + # loadplugin Mail::SpamAssassin::Plugin::Shortcircuit + loadplugin Mail::SpamAssassin::Plugin::SpamCop + loadplugin Mail::SpamAssassin::Plugin::SPF + #loadplugin Mail::SpamAssassin::Plugin::TextCat + # loadplugin Mail::SpamAssassin::Plugin::TxRep + loadplugin Mail::SpamAssassin::Plugin::URIDetail + loadplugin Mail::SpamAssassin::Plugin::URIDNSBL + loadplugin Mail::SpamAssassin::Plugin::URIEval + # loadplugin Mail::SpamAssassin::Plugin::URILocalBL + loadplugin Mail::SpamAssassin::Plugin::VBounce + loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject + loadplugin Mail::SpamAssassin::Plugin::WLBLEval + ''; + }; }; - }; - - ###### implementation - config = mkIf cfg.enable { # Allow users to run 'spamc'. environment.systemPackages = [ pkgs.spamassassin ]; users.extraUsers = singleton { - name = "spamd"; + name = "spamd"; description = "Spam Assassin Daemon"; uid = config.ids.uids.spamd; group = "spamd"; @@ -50,13 +136,65 @@ in gid = config.ids.gids.spamd; }; + systemd.services.sa-update = { + script = '' + set +e + ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd + + v=$? + set -e + if [ $v -gt 1 ]; then + echo "sa-update execution error" + exit $v + fi + if [ $v -eq 0 ]; then + systemctl reload spamd.service + fi + ''; + }; + + systemd.timers.sa-update = { + description = "sa-update-service"; + partOf = [ "sa-update.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "1:*"; + Persistent = true; + }; + }; + systemd.services.spamd = { description = "Spam Assassin Server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - script = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --nouser-config --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid"; + serviceConfig = { + ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --siteconfigpath=${spamdEnv} --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + + # 0 and 1 no error, exitcode > 1 means error: + # https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes + preStart = '' + # this abstraction requires no centralized config at all + if [ -d /etc/spamassassin ]; then + echo "This spamassassin does not support global '/etc/spamassassin' folder for configuration as this would be impure. Merge your configs into 'services.spamassassin' and remove the '/etc/spamassassin' folder to make this service work. Also see 'https://github.com/NixOS/nixpkgs/pull/26470'."; + exit 1 + fi + echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'" + mkdir -p /var/lib/spamassassin + chown spamd:spamd /var/lib/spamassassin -R + set +e + ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd + v=$? + set -e + if [ $v -gt 1 ]; then + echo "sa-update execution error" + exit $v + fi + chown spamd:spamd /var/lib/spamassassin -R + ''; }; }; } diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix new file mode 100644 index 000000000000..792a4c8375d9 --- /dev/null +++ b/nixos/modules/services/misc/autorandr.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.autorandr; + +in { + + options = { + + services.autorandr = { + enable = mkEnableOption "handling of hotplug and sleep events by autorandr"; + }; + + }; + + config = mkIf cfg.enable { + + services.udev.packages = [ pkgs.autorandr ]; + + environment.systemPackages = [ pkgs.autorandr ]; + + systemd.packages = [ pkgs.autorandr ]; + + systemd.services.autorandr = { + wantedBy = [ "sleep.target" ]; + }; + + }; + +} diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index 52719222db66..4d78cddcb54f 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -21,7 +21,7 @@ in configure a number of bepasty servers which will be started with gunicorn. ''; - type = with types ; attrsOf (submodule ({ + type = with types ; attrsOf (submodule ({ config, ... } : { options = { @@ -34,7 +34,6 @@ in default = "127.0.0.1:8000"; }; - dataDir = mkOption { type = types.str; description = '' @@ -73,10 +72,28 @@ in type = types.str; description = '' server secret for safe session cookies, must be set. + + Warning: this secret is stored in the WORLD-READABLE Nix store! + + It's recommended to use + which takes precedence over . ''; default = ""; }; + secretKeyFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + A file that contains the server secret for safe session cookies, must be set. + + takes precedence over . + + Warning: when is non-empty + defaults to a file in the WORLD-READABLE Nix store containing that secret. + ''; + }; + workDir = mkOption { type = types.str; description = '' @@ -87,11 +104,22 @@ in }; }; + config = { + secretKeyFile = mkDefault ( + if config.secretKey != "" + then toString (pkgs.writeTextFile { + name = "bepasty-secret-key"; + text = config.secretKey; + }) + else null + ); + }; })); }; }; config = mkIf cfg.enable { + environment.systemPackages = [ bepasty ]; # creates gunicorn systemd service for each configured server @@ -115,7 +143,7 @@ in serviceConfig = { Type = "simple"; PrivateTmp = true; - ExecStartPre = assert server.secretKey != ""; pkgs.writeScript "bepasty-server.${name}-init" '' + ExecStartPre = assert !isNull server.secretKeyFile; pkgs.writeScript "bepasty-server.${name}-init" '' #!/bin/sh mkdir -p "${server.workDir}" mkdir -p "${server.dataDir}" @@ -123,7 +151,7 @@ in cat > ${server.workDir}/bepasty-${name}.conf < + ''; type = types.attrsOf types.str; default = {}; diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix new file mode 100644 index 000000000000..1db422758671 --- /dev/null +++ b/nixos/modules/services/misc/exhibitor.nix @@ -0,0 +1,415 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.exhibitor; + exhibitor = cfg.package; + exhibitorConfig = '' + zookeeper-install-directory=${cfg.baseDir}/zookeeper + zookeeper-data-directory=${cfg.zkDataDir} + zookeeper-log-directory=${cfg.zkLogDir} + zoo-cfg-extra=${cfg.zkExtraCfg} + client-port=${toString cfg.zkClientPort} + connect-port=${toString cfg.zkConnectPort} + election-port=${toString cfg.zkElectionPort} + cleanup-period-ms=${toString cfg.zkCleanupPeriod} + servers-spec=${concatStringsSep "," cfg.zkServersSpec} + auto-manage-instances=${lib.boolToString cfg.autoManageInstances} + ${cfg.extraConf} + ''; + configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig; + cliOptionsCommon = { + configtype = cfg.configType; + defaultconfig = "${configDir}/exhibitor.properties"; + port = toString cfg.port; + hostname = cfg.hostname; + headingtext = if (cfg.headingText != null) then (lib.escapeShellArg cfg.headingText) else null; + nodemodification = lib.boolToString cfg.nodeModification; + configcheckms = toString cfg.configCheckMs; + jquerystyle = cfg.jqueryStyle; + loglines = toString cfg.logLines; + servo = lib.boolToString cfg.servo; + timeout = toString cfg.timeout; + }; + s3CommonOptions = { s3region = cfg.s3Region; s3credentials = cfg.s3Credentials; }; + cliOptionsPerConfig = { + s3 = { + s3config = "${cfg.s3Config.bucketName}:${cfg.s3Config.objectKey}"; + s3configprefix = cfg.s3Config.configPrefix; + }; + zookeeper = { + zkconfigconnect = concatStringsSep "," cfg.zkConfigConnect; + zkconfigexhibitorpath = cfg.zkConfigExhibitorPath; + zkconfigpollms = toString cfg.zkConfigPollMs; + zkconfigretry = "${toString cfg.zkConfigRetry.sleepMs}:${toString cfg.zkConfigRetry.retryQuantity}"; + zkconfigzpath = cfg.zkConfigZPath; + zkconfigexhibitorport = toString cfg.zkConfigExhibitorPort; # NB: This might be null + }; + file = { + fsconfigdir = cfg.fsConfigDir; + fsconfiglockprefix = cfg.fsConfigLockPrefix; + fsConfigName = fsConfigName; + }; + none = { + noneconfigdir = configDir; + }; + }; + cliOptions = concatStringsSep " " (mapAttrsToList (k: v: "--${k} ${v}") (filterAttrs (k: v: v != null && v != "") (cliOptionsCommon // + cliOptionsPerConfig."${cfg.configType}" // + s3CommonOptions // + optionalAttrs cfg.s3Backup { s3backup = "true"; } // + optionalAttrs cfg.fileSystemBackup { filesystembackup = "true"; } + ))); +in +{ + options = { + services.exhibitor = { + enable = mkOption { + type = types.bool; + default = false; + description = " + Whether to enable the exhibitor server. + "; + }; + # See https://github.com/soabase/exhibitor/wiki/Running-Exhibitor for what these mean + # General options for any type of config + port = mkOption { + type = types.int; + default = 8080; + description = '' + The port for exhibitor to listen on and communicate with other exhibitors. + ''; + }; + baseDir = mkOption { + type = types.str; + default = "/var/exhibitor"; + description = '' + Baseline directory for exhibitor runtime config. + ''; + }; + configType = mkOption { + type = types.enum [ "file" "s3" "zookeeper" "none" ]; + description = '' + Which configuration type you want to use. Additional config will be + required depending on which type you are using. + ''; + }; + hostname = mkOption { + type = types.nullOr types.str; + description = '' + Hostname to use and advertise + ''; + default = null; + }; + nodeModification = mkOption { + type = types.bool; + description = '' + Whether the Explorer UI will allow nodes to be modified (use with caution). + ''; + default = true; + }; + configCheckMs = mkOption { + type = types.int; + description = '' + Period (ms) to check for shared config updates. + ''; + default = 30000; + }; + headingText = mkOption { + type = types.nullOr types.str; + description = '' + Extra text to display in UI header + ''; + default = null; + }; + jqueryStyle = mkOption { + type = types.enum [ "red" "black" "custom" ]; + description = '' + Styling used for the JQuery-based UI. + ''; + default = "red"; + }; + logLines = mkOption { + type = types.int; + description = '' + Max lines of logging to keep in memory for display. + ''; + default = 1000; + }; + servo = mkOption { + type = types.bool; + description = '' + ZooKeeper will be queried once a minute for its state via the 'mntr' four + letter word (this requires ZooKeeper 3.4.x+). Servo will be used to publish + this data via JMX. + ''; + default = false; + }; + timeout = mkOption { + type = types.int; + description = '' + Connection timeout (ms) for ZK connections. + ''; + default = 30000; + }; + autoManageInstances = mkOption { + type = types.bool; + description = '' + Automatically manage ZooKeeper instances in the ensemble + ''; + default = false; + }; + zkDataDir = mkOption { + type = types.str; + default = "${cfg.baseDir}/zkData"; + description = '' + The Zookeeper data directory + ''; + }; + zkLogDir = mkOption { + type = types.path; + default = "${cfg.baseDir}/zkLogs"; + description = '' + The Zookeeper logs directory + ''; + }; + extraConf = mkOption { + type = types.str; + default = ""; + description = '' + Extra Exhibitor configuration to put in the ZooKeeper config file. + ''; + }; + zkExtraCfg = mkOption { + type = types.str; + default = ''initLimit=5&syncLimit=2&tickTime=2000''; + description = '' + Extra options to pass into Zookeeper + ''; + }; + zkClientPort = mkOption { + type = types.int; + default = 2181; + description = '' + Zookeeper client port + ''; + }; + zkConnectPort = mkOption { + type = types.int; + default = 2888; + description = '' + The port to use for followers to talk to each other. + ''; + }; + zkElectionPort = mkOption { + type = types.int; + default = 3888; + description = '' + The port for Zookeepers to use for leader election. + ''; + }; + zkCleanupPeriod = mkOption { + type = types.int; + default = 0; + description = '' + How often (in milliseconds) to run the Zookeeper log cleanup task. + ''; + }; + zkServersSpec = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Zookeeper server spec for all servers in the ensemble. + ''; + example = [ "S:1:zk1.example.com" "S:2:zk2.example.com" "S:3:zk3.example.com" "O:4:zk-observer.example.com" ]; + }; + + # Backup options + s3Backup = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable backups to S3 + ''; + }; + fileSystemBackup = mkOption { + type = types.bool; + default = false; + description = '' + Enables file system backup of ZooKeeper log files + ''; + }; + + # Options for using zookeeper configType + zkConfigConnect = mkOption { + type = types.listOf types.str; + description = '' + The initial connection string for ZooKeeper shared config storage + ''; + example = ["host1:2181" "host2:2181"]; + }; + zkConfigExhibitorPath = mkOption { + type = types.string; + description = '' + If the ZooKeeper shared config is also running Exhibitor, the URI path for the REST call + ''; + default = "/"; + }; + zkConfigExhibitorPort = mkOption { + type = types.nullOr types.int; + description = '' + If the ZooKeeper shared config is also running Exhibitor, the port that + Exhibitor is listening on. IMPORTANT: if this value is not set it implies + that Exhibitor is not being used on the ZooKeeper shared config. + ''; + }; + zkConfigPollMs = mkOption { + type = types.int; + description = '' + The period in ms to check for changes in the config ensemble + ''; + default = 10000; + }; + zkConfigRetry = { + sleepMs = mkOption { + type = types.int; + default = 1000; + description = '' + Retry sleep time connecting to the ZooKeeper config + ''; + }; + retryQuantity = mkOption { + type = types.int; + default = 3; + description = '' + Retries connecting to the ZooKeeper config + ''; + }; + }; + zkConfigZPath = mkOption { + type = types.str; + description = '' + The base ZPath that Exhibitor should use + ''; + example = "/exhibitor/config"; + }; + + # Config options for s3 configType + s3Config = { + bucketName = mkOption { + type = types.str; + description = '' + Bucket name to store config + ''; + }; + objectKey = mkOption { + type = types.str; + description = '' + S3 key name to store the config + ''; + }; + configPrefix = mkOption { + type = types.str; + description = '' + When using AWS S3 shared config files, the prefix to use for values such as locks + ''; + default = "exhibitor-"; + }; + }; + + # The next two are used for either s3backup or s3 configType + s3Credentials = mkOption { + type = types.nullOr types.path; + description = '' + Optional credentials to use for s3backup or s3config. Argument is the path + to an AWS credential properties file with two properties: + com.netflix.exhibitor.s3.access-key-id and com.netflix.exhibitor.s3.access-secret-key + ''; + default = null; + }; + s3Region = mkOption { + type = types.nullOr types.str; + description = '' + Optional region for S3 calls + ''; + default = null; + }; + + # Config options for file config type + fsConfigDir = mkOption { + type = types.path; + description = '' + Directory to store Exhibitor properties (cannot be used with s3config). + Exhibitor uses file system locks so you can specify a shared location + so as to enable complete ensemble management. + ''; + }; + fsConfigLockPrefix = mkOption { + type = types.str; + description = '' + A prefix for a locking mechanism used in conjunction with fsconfigdir + ''; + default = "exhibitor-lock-"; + }; + fsConfigName = mkOption { + type = types.str; + description = '' + The name of the file to store config in + ''; + default = "exhibitor.properties"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.exhibitor = { + description = "Exhibitor Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + ZOO_LOG_DIR = cfg.baseDir; + }; + serviceConfig = { + /*** + Exhibitor is a bit un-nixy. It wants to present to you a user interface in order to + mutate the configuration of both itself and ZooKeeper, and to coordinate changes + among the members of the Zookeeper ensemble. I'm going for a different approach here, + which is to manage all the configuration via nix and have it write out the configuration + files that exhibitor will use, and to reduce the amount of inter-exhibitor orchestration. + ***/ + ExecStart = '' + ${pkgs.exhibitor}/bin/startExhibitor.sh ${cliOptions} + ''; + User = "zookeeper"; + PermissionsStartOnly = true; + }; + # This is a bit wonky, but the reason for this is that Exhibitor tries to write to + # ${cfg.baseDir}/zookeeper/bin/../conf/zoo.cfg + # I want everything but the conf directory to be in the immutable nix store, and I want defaults + # from the nix store + # If I symlink the bin directory in, then bin/../ will resolve to the parent of the symlink in the + # immutable nix store. Bind mounting a writable conf over the existing conf might work, but it gets very + # messy with trying to copy the existing out into a mutable store. + # Another option is to try to patch upstream exhibitor, but the current package just pulls down the + # prebuild JARs off of Maven, rather than building them ourselves, as Maven support in Nix isn't + # very mature. So, it seems like a reasonable compromise is to just copy out of the immutable store + # just before starting the service, so we're running binaries from the immutable store, but we work around + # Exhibitor's desire to mutate its current installation. + preStart = '' + mkdir -m 0700 -p ${cfg.baseDir}/zookeeper + # Not doing a chown -R to keep the base ZK files owned by root + chown zookeeper ${cfg.baseDir} ${cfg.baseDir}/zookeeper + cp -Rf ${pkgs.zookeeper}/* ${cfg.baseDir}/zookeeper + chown -R zookeeper ${cfg.baseDir}/zookeeper/conf + chmod -R u+w ${cfg.baseDir}/zookeeper/conf + ''; + }; + users.extraUsers = singleton { + name = "zookeeper"; + uid = config.ids.uids.zookeeper; + description = "Zookeeper daemon user"; + home = cfg.baseDir; + }; + }; +} diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix new file mode 100644 index 000000000000..e89366cbafed --- /dev/null +++ b/nixos/modules/services/misc/fstrim.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.fstrim; + +in { + + options = { + + services.fstrim = { + enable = mkEnableOption "periodic SSD TRIM of mounted partitions in background"; + + interval = mkOption { + type = types.string; + default = "weekly"; + description = '' + How often we run fstrim. For most desktop and server systems + a sufficient trimming frequency is once a week. + + The format is described in + systemd.time + 7. + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + + systemd.packages = [ pkgs.utillinux ]; + + systemd.timers.fstrim = { + timerConfig = { + OnCalendar = cfg.interval; + }; + wantedBy = [ "timers.target" ]; + }; + + }; + +} diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 36db4fb96606..ccc1854d2548 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -439,7 +439,10 @@ in { environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; path = with pkgs; [ gitAndTools.git + gnutar + gzip openssh + gitlab-workhorse ]; preStart = '' mkdir -p /run/gitlab @@ -481,6 +484,7 @@ in { mkdir -p ${cfg.statePath}/repositories mkdir -p ${gitlabConfig.production.shared.path}/artifacts mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects + mkdir -p ${gitlabConfig.production.shared.path}/pages mkdir -p ${cfg.statePath}/log mkdir -p ${cfg.statePath}/shell mkdir -p ${cfg.statePath}/tmp/pids diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index ca8fc06e4835..ad2e36d04d53 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -14,7 +14,7 @@ let HOST = ${cfg.database.host}:${toString cfg.database.port} NAME = ${cfg.database.name} USER = ${cfg.database.user} - PASSWD = ${cfg.database.password} + PASSWD = #dbpass# PATH = ${cfg.database.path} [repository] @@ -26,6 +26,10 @@ let HTTP_PORT = ${toString cfg.httpPort} ROOT_URL = ${cfg.rootUrl} + [session] + COOKIE_NAME = session + COOKIE_SECURE = ${boolToString cfg.cookieSecure} + [security] SECRET_KEY = #secretkey# INSTALL_LOCK = true @@ -102,7 +106,21 @@ in password = mkOption { type = types.str; default = ""; - description = "Database password."; + description = '' + The password corresponding to . + Warning: this is stored in cleartext in the Nix store! + Use instead. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/gogs-dbpassword"; + description = '' + A file containing the password corresponding to + . + ''; }; path = mkOption { @@ -148,6 +166,15 @@ in description = "HTTP listen port."; }; + cookieSecure = mkOption { + type = types.bool; + default = false; + description = '' + Marks session cookies as "secure" as a hint for browsers to only send + them via HTTPS. This option is recommend, if Gogs is being served over HTTPS. + ''; + }; + extraConfig = mkOption { type = types.str; default = ""; @@ -164,13 +191,25 @@ in wantedBy = [ "multi-user.target" ]; path = [ pkgs.gogs.bin ]; - preStart = '' + preStart = let + runConfig = "${cfg.stateDir}/custom/conf/app.ini"; + secretKey = "${cfg.stateDir}/custom/conf/secret_key"; + in '' # copy custom configuration and generate a random secret key if needed ${optionalString (cfg.useWizard == false) '' mkdir -p ${cfg.stateDir}/custom/conf - cp -f ${configFile} ${cfg.stateDir}/custom/conf/app.ini - KEY=$(head -c 16 /dev/urandom | tr -dc A-Za-z0-9) - sed -i "s,#secretkey#,$KEY,g" ${cfg.stateDir}/custom/conf/app.ini + cp -f ${configFile} ${runConfig} + + if [ ! -e ${secretKey} ]; then + head -c 16 /dev/urandom | base64 > ${secretKey} + fi + + KEY=$(head -n1 ${secretKey}) + DBPASS=$(head -n1 ${cfg.database.passwordFile}) + sed -e "s,#secretkey#,$KEY,g" \ + -e "s,#dbpass#,$DBPASS,g" \ + -i ${runConfig} + chmod 440 ${runConfig} ${secretKey} ''} mkdir -p ${cfg.repositoryRoot} @@ -212,5 +251,16 @@ in }; extraGroups.gogs.gid = config.ids.gids.gogs; }; + + warnings = optional (cfg.database.password != "") + ''config.services.gogs.database.password will be stored as plaintext + in the Nix store. Use database.passwordFile instead.''; + + # Create database passwordFile default when password is configured. + services.gogs.database.passwordFile = mkIf (cfg.database.password != "") + (mkDefault (toString (pkgs.writeTextFile { + name = "gogs-database-password"; + text = cfg.database.password; + }))); }; } diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index df7b9be0db50..e07a4a44613a 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -16,7 +16,6 @@ in services.ihaskell = { enable = mkOption { default = false; - example = true; description = "Autostart an IHaskell notebook service."; }; diff --git a/nixos/modules/services/misc/irkerd.nix b/nixos/modules/services/misc/irkerd.nix new file mode 100644 index 000000000000..993d77ba424c --- /dev/null +++ b/nixos/modules/services/misc/irkerd.nix @@ -0,0 +1,67 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.irkerd; + ports = [ 6659 ]; +in +{ + options.services.irkerd = { + enable = mkOption { + description = "Whether to enable irker, an IRC notification daemon."; + default = false; + type = types.bool; + }; + + openPorts = mkOption { + description = "Open ports in the firewall for irkerd"; + default = false; + type = types.bool; + }; + + listenAddress = mkOption { + default = "localhost"; + example = "0.0.0.0"; + type = types.str; + description = '' + Specifies the bind address on which the irker daemon listens. + The default is localhost. + + Irker authors strongly warn about the risks of running this on + a publicly accessible interface, so change this with caution. + ''; + }; + + nick = mkOption { + default = "irker"; + type = types.str; + description = "Nick to use for irker"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.irkerd = { + description = "Internet Relay Chat (IRC) notification daemon"; + documentation = [ "man:irkerd(8)" "man:irkerhook(1)" "man:irk(1)" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.irker}/bin/irkerd -H ${cfg.listenAddress} -n ${cfg.nick}"; + User = "irkerd"; + }; + }; + + environment.systemPackages = [ pkgs.irker ]; + + users.users.irkerd = { + description = "Irker daemon user"; + isSystemUser = true; + group = "irkerd"; + }; + users.groups.irkerd = {}; + + networking.firewall.allowedTCPPorts = mkIf cfg.openPorts ports; + networking.firewall.allowedUDPPorts = mkIf cfg.openPorts ports; + }; +} diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix new file mode 100644 index 000000000000..87a41ee70b54 --- /dev/null +++ b/nixos/modules/services/misc/jackett.nix @@ -0,0 +1,47 @@ +{ config, pkgs, lib, mono, ... }: + +with lib; + +let + cfg = config.services.jackett; +in +{ + options = { + services.jackett = { + enable = mkEnableOption "Jackett"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.jackett = { + description = "Jackett"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + test -d /var/lib/jackett/ || { + echo "Creating jackett data directory in /var/lib/jackett/" + mkdir -p /var/lib/jackett/ + } + chown -R jackett:jackett /var/lib/jackett/ + chmod 0700 /var/lib/jackett/ + ''; + + serviceConfig = { + Type = "simple"; + User = "jackett"; + Group = "jackett"; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.jackett}/bin/Jackett"; + Restart = "on-failure"; + }; + }; + + users.extraUsers.jackett = { + uid = config.ids.uids.jackett; + home = "/var/lib/jackett"; + group = "jackett"; + }; + users.extraGroups.jackett.gid = config.ids.gids.jackett; + + }; +} diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 4a1bea50c14e..a3ec0ea59f8f 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -5,9 +5,8 @@ with lib; let cfg = config.services.matrix-synapse; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; - mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${fromBool r.compress}}''; - mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; - fromBool = x: if x then "true" else "false"; + mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; + mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; configFile = pkgs.writeText "homeserver.yaml" '' ${optionalString (cfg.tls_certificate_path != null) '' tls_certificate_path: "${cfg.tls_certificate_path}" @@ -18,7 +17,7 @@ tls_private_key_path: "${cfg.tls_private_key_path}" ${optionalString (cfg.tls_dh_params_path != null) '' tls_dh_params_path: "${cfg.tls_dh_params_path}" ''} -no_tls: ${fromBool cfg.no_tls} +no_tls: ${boolToString cfg.no_tls} ${optionalString (cfg.bind_port != null) '' bind_port: ${toString cfg.bind_port} ''} @@ -30,7 +29,7 @@ bind_host: "${cfg.bind_host}" ''} server_name: "${cfg.server_name}" pid_file: "/var/run/matrix-synapse.pid" -web_client: ${fromBool cfg.web_client} +web_client: ${boolToString cfg.web_client} ${optionalString (cfg.public_baseurl != null) '' public_baseurl: "${cfg.public_baseurl}" ''} @@ -58,8 +57,8 @@ media_store_path: "/var/lib/matrix-synapse/media" uploads_path: "/var/lib/matrix-synapse/uploads" max_upload_size: "${cfg.max_upload_size}" max_image_pixels: "${cfg.max_image_pixels}" -dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails} -url_preview_enabled: ${fromBool cfg.url_preview_enabled} +dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails} +url_preview_enabled: ${boolToString cfg.url_preview_enabled} ${optionalString (cfg.url_preview_enabled == true) '' url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist} url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist} @@ -67,10 +66,10 @@ url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist} ''} recaptcha_private_key: "${cfg.recaptcha_private_key}" recaptcha_public_key: "${cfg.recaptcha_public_key}" -enable_registration_captcha: ${fromBool cfg.enable_registration_captcha} +enable_registration_captcha: ${boolToString cfg.enable_registration_captcha} turn_uris: ${builtins.toJSON cfg.turn_uris} turn_shared_secret: "${cfg.turn_shared_secret}" -enable_registration: ${fromBool cfg.enable_registration} +enable_registration: ${boolToString cfg.enable_registration} ${optionalString (cfg.registration_shared_secret != null) '' registration_shared_secret: "${cfg.registration_shared_secret}" ''} @@ -78,15 +77,15 @@ recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify" turn_user_lifetime: "${cfg.turn_user_lifetime}" user_creation_max_duration: ${cfg.user_creation_max_duration} bcrypt_rounds: ${cfg.bcrypt_rounds} -allow_guest_access: ${fromBool cfg.allow_guest_access} +allow_guest_access: ${boolToString cfg.allow_guest_access} trusted_third_party_id_servers: ${builtins.toJSON cfg.trusted_third_party_id_servers} room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types} ${optionalString (cfg.macaroon_secret_key != null) '' macaroon_secret_key: "${cfg.macaroon_secret_key}" ''} -expire_access_token: ${fromBool cfg.expire_access_token} -enable_metrics: ${fromBool cfg.enable_metrics} -report_stats: ${fromBool cfg.report_stats} +expire_access_token: ${boolToString cfg.expire_access_token} +enable_metrics: ${boolToString cfg.enable_metrics} +report_stats: ${boolToString cfg.report_stats} signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key" key_refresh_interval: "${cfg.key_refresh_interval}" perspectives: @@ -606,6 +605,7 @@ in { } ]; systemd.services.matrix-synapse = { + description = "Synapse Matrix homeserver"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' @@ -621,6 +621,7 @@ in { WorkingDirectory = "/var/lib/matrix-synapse"; PermissionsStartOnly = true; ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse"; + Restart = "on-failure"; }; }; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 5088c4e60691..bf1304ee7ac2 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -8,7 +8,7 @@ let nix = cfg.package.out; - isNix112 = versionAtLeast (getVersion nix) "1.12pre4997"; + isNix112 = versionAtLeast (getVersion nix) "1.12pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -41,11 +41,12 @@ let build-users-group = nixbld build-max-jobs = ${toString (cfg.maxJobs)} build-cores = ${toString (cfg.buildCores)} - build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then (if cfg.useSandbox then "true" else "false") else cfg.useSandbox} + build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox} build-sandbox-paths = ${toString cfg.sandboxPaths} /bin/sh=${sh} $(echo $extraPaths) binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys} + auto-optimise-store = ${boolToString cfg.autoOptimiseStore} ${optionalString cfg.requireSignedBinaryCaches '' signed-binary-caches = * ''} @@ -86,6 +87,18 @@ in ''; }; + autoOptimiseStore = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If set to true, Nix automatically detects files in the store that have + identical contents, and replaces them with hard links to a single copy. + This saves disk space. If set to false (the default), you can still run + nix-store --optimise to get rid of duplicate files. + ''; + }; + buildCores = mkOption { type = types.int; default = 1; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 304168c65b0b..8b493041b2c9 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -26,7 +26,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the garbage collector will run. ''; }; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index a76bfd9f1f19..295e7fb0ba03 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -26,7 +26,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the optimiser will run. ''; }; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 306ee346523d..515864ec2e2d 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -41,7 +41,7 @@ let entry = "${manual.manual}/share/doc/nixos/index.html"; - help = pkgs.writeScriptBin "nixos-help" + helpScript = pkgs.writeScriptBin "nixos-help" '' #! ${pkgs.stdenv.shell} -e browser="$BROWSER" @@ -58,6 +58,14 @@ let exec "$browser" ${entry} ''; + desktopItem = pkgs.makeDesktopItem { + name = "nixos-manual"; + desktopName = "NixOS Manual"; + genericName = "View NixOS documentation in a web browser"; + icon = "nix-snowflake"; + exec = "${helpScript}/bin/nixos-help"; + categories = "System"; + }; in { @@ -105,7 +113,8 @@ in system.build.manual = manual; environment.systemPackages = - [ manual.manual help ] + [ manual.manual helpScript ] + ++ 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/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 8faad46a49f1..6883993a893b 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -117,7 +117,7 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.octoprint}/bin/octoprint -b ${cfg.stateDir}"; + ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index f6bf2dee9865..e37b486375bd 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}" @@ -91,9 +91,11 @@ in # Copy the database skeleton files to /var/lib/plex/.skeleton # See the the Nix expression for Plex's package for more information on # why this is done. - test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton" + install --owner ${cfg.user} --group ${cfg.group} -d "${cfg.dataDir}/.skeleton" for db in "com.plexapp.plugins.library.db"; do - cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db" + if [ ! -e "${cfg.dataDir}/.skeleton/$db" ]; then + cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db" + fi chmod u+w "${cfg.dataDir}/.skeleton/$db" chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db" done @@ -136,6 +138,7 @@ in Group = cfg.group; PermissionsStartOnly = "true"; ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server"; + KillSignal = "SIGQUIT"; Restart = "on-failure"; }; environment = { diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix new file mode 100644 index 000000000000..245ad9f9a6df --- /dev/null +++ b/nixos/modules/services/misc/radarr.nix @@ -0,0 +1,47 @@ +{ config, pkgs, lib, mono, ... }: + +with lib; + +let + cfg = config.services.radarr; +in +{ + options = { + services.radarr = { + enable = mkEnableOption "Radarr"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.radarr = { + description = "Radarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + test -d /var/lib/radarr/ || { + echo "Creating radarr data directory in /var/lib/radarr/" + mkdir -p /var/lib/radarr/ + } + chown -R radarr:radarr /var/lib/radarr/ + chmod 0700 /var/lib/radarr/ + ''; + + serviceConfig = { + Type = "simple"; + User = "radarr"; + Group = "radarr"; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.radarr}/bin/Radarr"; + Restart = "on-failure"; + }; + }; + + users.extraUsers.radarr = { + uid = config.ids.uids.radarr; + home = "/var/lib/radarr"; + group = "radarr"; + }; + users.extraGroups.radarr.gid = config.ids.gids.radarr; + + }; +} diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix new file mode 100644 index 000000000000..62b344d11b06 --- /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/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index 6d96daa6c3d4..ecde2c33bfa9 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -22,14 +22,14 @@ in echo "Creating sonarr data directory in /var/lib/sonarr/" mkdir -p /var/lib/sonarr/ } - chown -R sonarr /var/lib/sonarr/ + chown -R sonarr:sonarr /var/lib/sonarr/ chmod 0700 /var/lib/sonarr/ ''; serviceConfig = { Type = "simple"; User = "sonarr"; - Group = "nogroup"; + Group = "sonarr"; PermissionsStartOnly = "true"; ExecStart = "${pkgs.sonarr}/bin/NzbDrone --no-browser"; Restart = "on-failure"; @@ -37,8 +37,11 @@ in }; users.extraUsers.sonarr = { + uid = config.ids.uids.sonarr; home = "/var/lib/sonarr"; + group = "sonarr"; }; + users.extraGroups.sonarr.gid = config.ids.gids.sonarr; }; } diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixos/modules/services/misc/spice-vdagentd.nix index f8133394ffd3..f322ba4cbd58 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/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 826f463bbd75..ba9f52f1904b 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -148,7 +148,6 @@ in { enable = mkOption { type = types.bool; default = false; - example = true; description = '' Whether to enable the Taskwarrior server. diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py index b97bc1df74f7..22a3d8d5311b 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/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index b7bca8b56b28..d85b5e4ec507 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.zookeeper; - + zookeeperConfig = '' dataDir=${cfg.dataDir} clientPort=${toString cfg.port} @@ -49,7 +49,7 @@ in { default = 1; type = types.int; }; - + extraConf = mkOption { description = "Extra configuration for Zookeeper."; type = types.lines; @@ -119,7 +119,7 @@ in { ExecStart = '' ${pkgs.jre}/bin/java \ -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \ - ${toString cfg.extraCmdLineOptions} \ + ${escapeShellArgs cfg.extraCmdLineOptions} \ -Dzookeeper.datadir.autocreate=false \ ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \ org.apache.zookeeper.server.quorum.QuorumPeerMain \ diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix index 1135c2c441cb..b41a3c7b5016 100644 --- a/nixos/modules/services/monitoring/arbtt.nix +++ b/nixos/modules/services/monitoring/arbtt.nix @@ -10,7 +10,6 @@ in { enable = mkOption { type = types.bool; default = false; - example = true; description = '' Enable the arbtt statistics capture service. ''; @@ -49,7 +48,8 @@ in { config = mkIf cfg.enable { systemd.user.services.arbtt = { description = "arbtt statistics capture service"; - wantedBy = [ "default.target" ]; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 8ae8b12056ce..6ca420a05b23 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -54,7 +54,29 @@ in { storageDriverPassword = mkOption { default = "root"; type = types.str; - description = "Cadvisor storage driver password."; + description = '' + Cadvisor storage driver password. + + Warning: this password is stored in the world-readable Nix store. It's + recommended to use the option + since that gives you control over the security of the password. + also takes precedence over . + ''; + }; + + storageDriverPasswordFile = mkOption { + type = types.str; + description = '' + File that contains the cadvisor storage driver password. + + takes precedence over + + Warning: when is non-empty this defaults to a file in the + world-readable Nix store that contains the value of . + + It's recommended to override this with a path not in the Nix store. + Tip: use nixops key management + ''; }; storageDriverSecure = mkOption { @@ -65,35 +87,44 @@ in { }; }; - config = mkIf cfg.enable { - systemd.services.cadvisor = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "docker.service" "influxdb.service" ]; + config = mkMerge [ + { services.cadvisor.storageDriverPasswordFile = mkIf (cfg.storageDriverPassword != "") ( + mkDefault (toString (pkgs.writeTextFile { + name = "cadvisor-storage-driver-password"; + text = cfg.storageDriverPassword; + })) + ); + } - postStart = mkBefore '' - until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do - sleep 1; - done - ''; + (mkIf cfg.enable { + systemd.services.cadvisor = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "docker.service" "influxdb.service" ]; - serviceConfig = { - ExecStart = ''${pkgs.cadvisor}/bin/cadvisor \ - -logtostderr=true \ - -listen_ip=${cfg.listenAddress} \ - -port=${toString cfg.port} \ - ${optionalString (cfg.storageDriver != null) '' - -storage_driver ${cfg.storageDriver} \ - -storage_driver_user ${cfg.storageDriverHost} \ - -storage_driver_db ${cfg.storageDriverDb} \ - -storage_driver_user ${cfg.storageDriverUser} \ - -storage_driver_password ${cfg.storageDriverPassword} \ - ${optionalString cfg.storageDriverSecure "-storage_driver_secure"} - ''} + postStart = mkBefore '' + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do + sleep 1; + done ''; - TimeoutStartSec=300; - }; - }; - virtualisation.docker.enable = mkDefault true; - }; + script = '' + exec ${pkgs.cadvisor}/bin/cadvisor \ + -logtostderr=true \ + -listen_ip="${cfg.listenAddress}" \ + -port="${toString cfg.port}" \ + ${optionalString (cfg.storageDriver != null) '' + -storage_driver "${cfg.storageDriver}" \ + -storage_driver_user "${cfg.storageDriverHost}" \ + -storage_driver_db "${cfg.storageDriverDb}" \ + -storage_driver_user "${cfg.storageDriverUser}" \ + -storage_driver_password "$(cat "${cfg.storageDriverPasswordFile}")" \ + ${optionalString cfg.storageDriverSecure "-storage_driver_secure"} + ''} + ''; + + serviceConfig.TimeoutStartSec=300; + }; + virtualisation.docker.enable = mkDefault true; + }) + ]; } diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 641da60e9adc..dfbac3446e03 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -7,8 +7,7 @@ let conf = pkgs.writeText "collectd.conf" '' BaseDir "${cfg.dataDir}" - PIDFile "${cfg.pidFile}" - AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"} + AutoLoadPlugin ${boolToString cfg.autoLoadPlugin} Hostname "${config.networking.hostName}" LoadPlugin syslog @@ -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/dd-agent/dd-agent-defaults.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix new file mode 100644 index 000000000000..045128197421 --- /dev/null +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix @@ -0,0 +1,8 @@ +# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY. +[ + "auto_conf" + "agent_metrics.yaml.default" + "disk.yaml.default" + "network.yaml.default" + "ntp.yaml.default" +] diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix similarity index 87% rename from nixos/modules/services/monitoring/dd-agent.nix rename to nixos/modules/services/monitoring/dd-agent/dd-agent.nix index a98b0f2f0f85..8d3d4f2065ec 100644 --- a/nixos/modules/services/monitoring/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -73,9 +73,15 @@ let nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig; mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig; jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig; + processConfig = pkgs.writeText "process.yaml" cfg.processConfig; etcfiles = - [ { source = ddConf; + let + defaultConfd = import ./dd-agent-defaults.nix; + in (map (f: { source = "${pkgs.dd-agent}/agent/conf.d-system/${f}"; + target = "dd-agent/conf.d/${f}"; + }) defaultConfd) ++ [ + { source = ddConf; target = "dd-agent/datadog.conf"; } { source = diskConfig; @@ -96,6 +102,10 @@ let { source = mongoConfig; target = "dd-agent/conf.d/mongo.yaml"; }) ++ + (optional (cfg.processConfig != null) + { source = processConfig; + target = "dd-agent/conf.d/process.yaml"; + }) ++ (optional (cfg.jmxConfig != null) { source = jmxConfig; target = "dd-agent/conf.d/jmx.yaml"; @@ -153,6 +163,16 @@ in { type = types.uniq (types.nullOr types.string); }; + processConfig = mkOption { + description = '' + Process integration configuration + + See http://docs.datadoghq.com/integrations/process/ + ''; + default = null; + type = types.uniq (types.nullOr types.string); + }; + }; config = mkIf cfg.enable { @@ -179,7 +199,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; }; systemd.services.dogstatsd = { @@ -195,7 +215,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ]; }; systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults new file mode 100755 index 000000000000..76724173171a --- /dev/null +++ b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +dd=$(nix-build --no-out-link -A dd-agent ../../../..) +echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix +echo '[' >> dd-agent-defaults.nix +echo ' "auto_conf"' >> dd-agent-defaults.nix +for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do + echo " \"$(basename $f)\"" >> dd-agent-defaults.nix +done +echo ']' >> dd-agent-defaults.nix diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 97806d5d83eb..4fbacef788f9 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.services.grafana; - b2s = val: if val then "true" else "false"; - envOptions = { PATHS_DATA = cfg.dataDir; PATHS_PLUGINS = "${cfg.dataDir}/plugins"; @@ -32,16 +30,16 @@ let SECURITY_ADMIN_PASSWORD = cfg.security.adminPassword; SECURITY_SECRET_KEY = cfg.security.secretKey; - USERS_ALLOW_SIGN_UP = b2s cfg.users.allowSignUp; - USERS_ALLOW_ORG_CREATE = b2s cfg.users.allowOrgCreate; - USERS_AUTO_ASSIGN_ORG = b2s cfg.users.autoAssignOrg; + USERS_ALLOW_SIGN_UP = boolToString cfg.users.allowSignUp; + USERS_ALLOW_ORG_CREATE = boolToString cfg.users.allowOrgCreate; + USERS_AUTO_ASSIGN_ORG = boolToString cfg.users.autoAssignOrg; USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole; - AUTH_ANONYMOUS_ENABLED = b2s cfg.auth.anonymous.enable; + AUTH_ANONYMOUS_ENABLED = boolToString cfg.auth.anonymous.enable; AUTH_ANONYMOUS_ORG_NAME = cfg.auth.anonymous.org_name; AUTH_ANONYMOUS_ORG_ROLE = cfg.auth.anonymous.org_role; - ANALYTICS_REPORTING_ENABLED = b2s cfg.analytics.reporting.enable; + ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable; } // cfg.extraOptions; in { diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index c5352e5887da..332a04634d06 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.graphite; - writeTextOrNull = f: t: if t == null then null else pkgs.writeTextDir f t; + writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t; dataDir = cfg.dataDir; @@ -400,7 +400,8 @@ in { mkdir -p ${cfg.dataDir}/whisper chmod 0700 ${cfg.dataDir}/whisper - chown -R graphite:graphite ${cfg.dataDir} + chown graphite:graphite ${cfg.dataDir} + chown graphite:graphite ${cfg.dataDir}/whisper ''; }; }) @@ -487,9 +488,9 @@ in { # create index ${pkgs.python27Packages.graphite_web}/bin/build-index.sh - touch ${dataDir}/db-created - chown -R graphite:graphite ${cfg.dataDir} + + touch ${dataDir}/db-created fi ''; }; @@ -526,9 +527,10 @@ in { mkdir -p ${dataDir}/cache/ chmod 0700 ${dataDir}/cache/ - touch ${dataDir}/db-created + chown graphite:graphite ${cfg.dataDir} + chown -R graphite:graphite ${cfg.dataDir}/cache - chown -R graphite:graphite ${cfg.dataDir} + touch ${dataDir}/db-created fi ''; }; @@ -549,7 +551,7 @@ in { preStart = '' if ! test -e ${dataDir}/db-created; then mkdir -p ${dataDir} - chown -R graphite:graphite ${dataDir} + chown graphite:graphite ${dataDir} fi ''; }; diff --git a/nixos/modules/services/monitoring/longview.nix b/nixos/modules/services/monitoring/longview.nix index 770d56e60efb..9c38956f9ba8 100644 --- a/nixos/modules/services/monitoring/longview.nix +++ b/nixos/modules/services/monitoring/longview.nix @@ -5,22 +5,10 @@ with lib; let cfg = config.services.longview; - pidFile = "/run/longview.pid"; + runDir = "/run/longview"; + configsDir = "${runDir}/longview.d"; - apacheConf = optionalString (cfg.apacheStatusUrl != "") '' - location ${cfg.apacheStatusUrl}?auto - ''; - mysqlConf = optionalString (cfg.mysqlUser != "") '' - username ${cfg.mysqlUser} - password ${cfg.mysqlPassword} - ''; - nginxConf = optionalString (cfg.nginxStatusUrl != "") '' - location ${cfg.nginxStatusUrl} - ''; - -in - -{ +in { options = { services.longview = { @@ -35,10 +23,27 @@ in apiKey = mkOption { type = types.str; + default = ""; example = "01234567-89AB-CDEF-0123456789ABCDEF"; description = '' Longview API key. To get this, look in Longview settings which are found at https://manager.linode.com/longview/. + + Warning: this secret is stored in the world-readable Nix store! + Use instead. + ''; + }; + + apiKeyFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/longview-api-key"; + description = '' + A file containing the Longview API key. + To get this, look in Longview settings which + are found at https://manager.linode.com/longview/. + + takes precedence over . ''; }; @@ -77,11 +82,23 @@ in mysqlPassword = mkOption { type = types.str; + default = ""; description = '' - The password corresponding to mysqlUser. Warning: this is - stored in cleartext in the Nix store! + The password corresponding to . + Warning: this is stored in cleartext in the Nix store! + Use instead. ''; }; + + mysqlPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/dbpassword"; + description = '' + A file containing the password corresponding to . + ''; + }; + }; }; @@ -94,25 +111,50 @@ in serviceConfig.Type = "forking"; serviceConfig.ExecStop = "-${pkgs.coreutils}/bin/kill -TERM $MAINPID"; serviceConfig.ExecReload = "-${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - serviceConfig.PIDFile = pidFile; + serviceConfig.PIDFile = "${runDir}/longview.pid"; serviceConfig.ExecStart = "${pkgs.longview}/bin/longview"; + preStart = '' + umask 077 + mkdir -p ${configsDir} + '' + (optionalString (cfg.apiKeyFile != null) '' + cp --no-preserve=all "${cfg.apiKeyFile}" ${runDir}/longview.key + '') + (optionalString (cfg.apacheStatusUrl != "") '' + cat > ${configsDir}/Apache.conf < ${configsDir}/MySQL.conf < ${configsDir}/Nginx.conf </dev/null | ${pkgs.bash}/bin/bash + PATH="/run/wrappers/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; @@ -193,14 +193,26 @@ in }) (mkIf cronCfg.enable { - services.cron.systemCronJobs = [ - "*/5 * * * * munin ${pkgs.munin}/bin/munin-cron --config ${muninConf}" - ]; + systemd.timers.munin-cron = { + description = "batch Munin master programs"; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "*:0/5"; + }; + + systemd.services.munin-cron = { + description = "batch Munin master programs"; + unitConfig.Documentation = "man:munin-cron(8)"; + + serviceConfig = { + Type = "oneshot"; + User = "munin"; + ExecStart = "${pkgs.munin}/bin/munin-cron --config ${muninConf}"; + }; + }; system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] '' mkdir -p /var/{run,log,www,lib}/munin chown -R munin:munin /var/{run,log,www,lib}/munin ''; - })]; } diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix new file mode 100644 index 000000000000..ba0dc4c21768 --- /dev/null +++ b/nixos/modules/services/monitoring/osquery.nix @@ -0,0 +1,91 @@ +{ config, lib, pkgs, ... }: + +with builtins; +with lib; + +let + cfg = config.services.osquery; + +in + +{ + + options = { + + services.osquery = { + + enable = mkEnableOption "osquery"; + + loggerPath = mkOption { + type = types.path; + description = "Base directory used for logging."; + default = "/var/log/osquery"; + }; + + pidfile = mkOption { + type = types.path; + description = "Path used for pid file."; + default = "/var/osquery/osqueryd.pidfile"; + }; + + utc = mkOption { + type = types.bool; + description = "Attempt to convert all UNIX calendar times to UTC."; + default = true; + }; + + databasePath = mkOption { + type = types.path; + description = "Path used for database file."; + default = "/var/osquery/osquery.db"; + }; + + extraConfig = mkOption { + type = types.attrs // { + merge = loc: foldl' (res: def: recursiveUpdate res def.value) {}; + }; + description = "Extra config to be recursively merged into the JSON config file."; + default = { }; + }; + }; + + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.osquery ]; + + environment.etc."osquery/osquery.conf".text = toJSON ( + recursiveUpdate { + options = { + config_plugin = "filesystem"; + logger_plugin = "filesystem"; + logger_path = cfg.loggerPath; + database_path = cfg.databasePath; + utc = cfg.utc; + }; + } cfg.extraConfig + ); + + systemd.services.osqueryd = { + description = "The osquery Daemon"; + after = [ "network.target" "syslog.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.osquery ]; + preStart = '' + mkdir -p ${escapeShellArg cfg.loggerPath} + mkdir -p "$(dirname ${escapeShellArg cfg.pidfile})" + mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})" + ''; + serviceConfig = { + TimeoutStartSec = 0; + ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}"; + KillMode = "process"; + KillSignal = "SIGTERM"; + Restart = "on-failure"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index cf9deccbffe2..c12b5f35dea3 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. - ''; - }; }; }; @@ -116,6 +107,13 @@ let The URL scheme with which to fetch metrics from targets. ''; }; + params = mkOption { + type = types.attrsOf (types.listOf types.str); + default = {}; + description = '' + Optional HTTP URL parameters. + ''; + }; basic_auth = mkOption { type = types.nullOr (types.submodule { options = { @@ -134,7 +132,7 @@ let }; }); default = null; - apply = x: if x == null then null else _filter x; + apply = x: mapNullable _filter x; description = '' Optional http login credentials for metrics scraping. ''; diff --git a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix new file mode 100644 index 000000000000..6da39b6519cb --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix @@ -0,0 +1,76 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.fritzboxExporter; +in { + options = { + services.prometheus.fritzboxExporter = { + enable = mkEnableOption "prometheus fritzbox exporter"; + + port = mkOption { + type = types.int; + default = 9133; + description = '' + Port to listen on. + ''; + }; + + gatewayAddress = mkOption { + type = types.str; + default = "fritz.box"; + description = '' + The hostname or IP of the FRITZ!Box. + ''; + }; + + gatewayPort = mkOption { + type = types.int; + default = 49000; + description = '' + The port of the FRITZ!Box UPnP service. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the fritzbox exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-fritzbox-exporter = { + description = "Prometheus exporter for FRITZ!Box via UPnP"; + unitConfig.Documentation = "https://github.com/ndecker/fritzbox_exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \ + -listen-address :${toString cfg.port} \ + -gateway-address ${cfg.gatewayAddress} \ + -gateway-port ${toString cfg.gatewayPort} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix new file mode 100644 index 000000000000..e3059e485098 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix @@ -0,0 +1,104 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.unifiExporter; +in { + options = { + services.prometheus.unifiExporter = { + enable = mkEnableOption "prometheus unifi exporter"; + + port = mkOption { + type = types.int; + default = 9130; + description = '' + Port to listen on. + ''; + }; + + unifiAddress = mkOption { + type = types.str; + example = "https://10.0.0.1:8443"; + description = '' + URL of the UniFi Controller API. + ''; + }; + + unifiInsecure = mkOption { + type = types.bool; + default = false; + description = '' + If enabled skip the verification of the TLS certificate of the UniFi Controller API. + Use with caution. + ''; + }; + + unifiUsername = mkOption { + type = types.str; + example = "ReadOnlyUser"; + description = '' + username for authentication against UniFi Controller API. + ''; + }; + + unifiPassword = mkOption { + type = types.str; + description = '' + Password for authentication against UniFi Controller API. + ''; + }; + + unifiTimeout = mkOption { + type = types.str; + default = "5s"; + example = "2m"; + description = '' + Timeout including unit for UniFi Controller API requests. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the unifi exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-unifi-exporter = { + description = "Prometheus exporter for UniFi Controller metrics"; + unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \ + -telemetry.addr :${toString cfg.port} \ + -unifi.addr ${cfg.unifiAddress} \ + -unifi.username ${cfg.unifiUsername} \ + -unifi.password ${cfg.unifiPassword} \ + -unifi.timeout ${cfg.unifiTimeout} \ + ${optionalString cfg.unifiInsecure "-unifi.insecure" } \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index c4c4ed227b35..29dc68f90cc9 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -80,7 +80,7 @@ let }; config = { - directives = mkHeader ([ + directives = mkOrder 10 ([ "driver = ${config.driver}" "port = ${config.port}" ''desc = "${config.description}"'' diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index a2f2c0339515..f7fed793066a 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -3,7 +3,7 @@ with lib; let - inherit (pkgs) glusterfs; + inherit (pkgs) glusterfs rsync; cfg = config.services.glusterfs; @@ -50,8 +50,11 @@ in after = [ "rpcbind.service" "network.target" "local-fs.target" ]; before = [ "network-online.target" ]; + # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761 preStart = '' install -m 0755 -d /var/log/glusterfs + mkdir -p /var/lib/glusterd/hooks/ + ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ ''; serviceConfig = { diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index e6e04248854e..10c1d751ac5d 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -3,12 +3,22 @@ with lib; let - inherit (pkgs) ipfs; + inherit (pkgs) ipfs runCommand makeWrapper; cfg = config.services.ipfs; ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}''; + # Before Version 17.09, ipfs would always use "/var/lib/ipfs/.ipfs" as it's dataDir + defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then + "/var/lib/ipfs" else + "/var/lib/ipfs/.ipfs"; + + # Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment + wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } '' + mkdir -p "$out/bin" + makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" --set IPFS_PATH ${cfg.dataDir} + ''; in { @@ -35,7 +45,7 @@ in dataDir = mkOption { type = types.str; - default = "/var/lib/ipfs"; + default = defaultDataDir; description = "The data dir for IPFS"; }; @@ -86,7 +96,7 @@ in ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.ipfs ]; + environment.systemPackages = [ wrapped ]; users.extraUsers = mkIf (cfg.user == "ipfs") { ipfs = { @@ -110,15 +120,15 @@ in after = [ "local-fs.target" ]; before = [ "ipfs.service" "ipfs-offline.service" ]; + environment.IPFS_PATH = cfg.dataDir; + path = [ pkgs.ipfs pkgs.su pkgs.bash ]; preStart = '' install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} ''; - script = '' - if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then - cd ${cfg.dataDir} + if [[ ! -f ${cfg.dataDir}/config ]]; then ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"} fi ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} @@ -143,6 +153,8 @@ in conflicts = [ "ipfs-offline.service" ]; wants = [ "ipfs-init.service" ]; + environment.IPFS_PATH = cfg.dataDir; + path = [ pkgs.ipfs ]; serviceConfig = { @@ -162,6 +174,8 @@ in conflicts = [ "ipfs.service" ]; wants = [ "ipfs-init.service" ]; + environment.IPFS_PATH = cfg.dataDir; + path = [ pkgs.ipfs ]; serviceConfig = { diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix new file mode 100644 index 000000000000..cf1d7617cca6 --- /dev/null +++ b/nixos/modules/services/network-filesystems/kbfs.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.kbfs; + +in { + + ###### interface + + options = { + + services.kbfs = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to mount the Keybase filesystem."; + }; + + mountPoint = mkOption { + type = types.str; + default = "%h/keybase"; + example = "/keybase"; + description = "Mountpoint for the Keybase filesystem."; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "-label kbfs" + "-mount-type normal" + ]; + description = '' + Additional flags to pass to the Keybase filesystem on launch. + ''; + }; + + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.user.services.kbfs = { + description = "Keybase File System"; + requires = [ "keybase.service" ]; + after = [ "keybase.service" ]; + path = [ "/run/wrappers" ]; + serviceConfig = { + ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${cfg.mountPoint}"; + ExecStart = "${pkgs.kbfs}/bin/kbfsfuse ${toString cfg.extraFlags} ${cfg.mountPoint}"; + ExecStopPost = "/run/wrappers/bin/fusermount -u ${cfg.mountPoint}"; + Restart = "on-failure"; + PrivateTmp = true; + }; + }; + + services.keybase.enable = true; + }; +} diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index bff54406a2b0..1dd869043f0c 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -9,7 +9,7 @@ let extmapFile = pkgs.writeText "extmap.conf" cfg.extmap; afpToString = x: if builtins.typeOf x == "bool" - then (if x then "true" else "false") + then boolToString x else toString x; volumeConfig = name: diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 6f51e287910a..f7c58c928633 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -76,6 +76,7 @@ in description = "AFS client"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + serviceConfig = { RemainAfterExit = true; }; preStart = '' mkdir -p -m 0755 /afs diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 6ae5292fc303..87c4f7a8ebcb 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -5,7 +5,7 @@ with lib; let smbToString = x: if builtins.typeOf x == "bool" - then (if x then "true" else "false") + then boolToString x else toString x; cfg = config.services.samba; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 3d78ac096a2b..f70fbcc49751 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -237,13 +237,13 @@ in # arguments to $(tahoe start). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' - if [ \! -d ${nodedir} ]; then + if [ ! -d ${lib.escapeShellArg nodedir} ]; then mkdir -p /var/db/tahoe-lafs - tahoe create-introducer ${nodedir} + tahoe create-introducer "${lib.escapeShellArg nodedir} fi # Tahoe has created a predefined tahoe.cfg which we must now @@ -252,7 +252,7 @@ in # we must do this on every prestart. Fixes welcome. # rm ${nodedir}/tahoe.cfg # ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg - cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg + cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); users.extraUsers = flip mapAttrs' cfg.introducers (node: _: @@ -290,14 +290,14 @@ in shares.total = ${toString settings.client.shares.total} [storage] - enabled = ${if settings.storage.enable then "true" else "false"} + enabled = ${boolToString settings.storage.enable} reserved_space = ${settings.storage.reservedSpace} [helper] - enabled = ${if settings.helper.enable then "true" else "false"} + enabled = ${boolToString settings.helper.enable} [sftpd] - enabled = ${if settings.sftpd.enable then "true" else "false"} + enabled = ${boolToString settings.sftpd.enable} ${optionalString (settings.sftpd.port != null) "port = ${toString settings.sftpd.port}"} ${optionalString (settings.sftpd.hostPublicKeyFile != null) @@ -337,13 +337,13 @@ in # arguments to $(tahoe start). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' - if [ \! -d ${nodedir} ]; then + if [ ! -d ${lib.escapeShellArg nodedir} ]; then mkdir -p /var/db/tahoe-lafs - tahoe create-node --hostname=localhost ${nodedir} + tahoe create-node --hostname=localhost ${lib.escapeShellArg nodedir} fi # Tahoe has created a predefined tahoe.cfg which we must now @@ -351,8 +351,8 @@ in # XXX I thought that a symlink would work here, but it doesn't, so # we must do this on every prestart. Fixes welcome. # rm ${nodedir}/tahoe.cfg - # ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg - cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg + # ln -s /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${nodedir}/tahoe.cfg + cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); users.extraUsers = flip mapAttrs' cfg.nodes (node: _: diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix index 8bc37f0f62c3..4f37fc2a9e5c 100644 --- a/nixos/modules/services/network-filesystems/u9fs.nix +++ b/nixos/modules/services/network-filesystems/u9fs.nix @@ -67,6 +67,7 @@ in StandardInput = "socket"; StandardError = "journal"; User = cfg.user; + AmbientCapabilities = "cap_setuid cap_setgid"; }; }; }; diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix deleted file mode 100644 index 4301da288814..000000000000 --- a/nixos/modules/services/networking/aiccu.nix +++ /dev/null @@ -1,195 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.aiccu; - showBool = b: if b then "true" else "false"; - notNull = a: ! isNull a; - configFile = pkgs.writeText "aiccu.conf" '' - ${if notNull cfg.username then "username " + cfg.username else ""} - ${if notNull cfg.password then "password " + cfg.password else ""} - protocol ${cfg.protocol} - server ${cfg.server} - ipv6_interface ${cfg.interfaceName} - verbose ${showBool cfg.verbose} - daemonize true - automatic ${showBool cfg.automatic} - requiretls ${showBool cfg.requireTLS} - pidfile ${cfg.pidFile} - defaultroute ${showBool cfg.defaultRoute} - ${if notNull cfg.setupScript then cfg.setupScript else ""} - makebeats ${showBool cfg.makeHeartBeats} - noconfigure ${showBool cfg.noConfigure} - behindnat ${showBool cfg.behindNAT} - ${if cfg.localIPv4Override then "local_ipv4_override" else ""} - ''; - -in { - - options = { - - services.aiccu = { - - enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel"; - }; - - username = mkOption { - type = with types; nullOr str; - default = null; - example = "FAB5-SIXXS"; - description = "Login credential"; - }; - - password = mkOption { - type = with types; nullOr str; - default = null; - example = "TmAkRbBEr0"; - description = "Login credential"; - }; - - protocol = mkOption { - type = types.str; - default = "tic"; - example = "tic|tsp|l2tp"; - description = "Protocol to use for setting up the tunnel"; - }; - - server = mkOption { - type = types.str; - default = "tic.sixxs.net"; - example = "enabled.ipv6server.net"; - description = "Server to use for setting up the tunnel"; - }; - - interfaceName = mkOption { - type = types.str; - default = "aiccu"; - example = "sixxs"; - description = '' - The name of the interface that will be used as a tunnel interface. - On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels - or tunX (eg tun0) for AYIYA tunnels. - ''; - }; - - tunnelID = mkOption { - type = with types; nullOr str; - default = null; - example = "T12345"; - description = "The tunnel id to use, only required when there are multiple tunnels in the list"; - }; - - verbose = mkOption { - type = types.bool; - default = false; - example = true; - description = "Be verbose?"; - }; - - automatic = mkOption { - type = types.bool; - default = true; - example = false; - description = "Automatic Login and Tunnel activation"; - }; - - requireTLS = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - When set to true, if TLS is not supported on the server - the TIC transaction will fail. - When set to false, it will try a starttls, when that is - not supported it will continue. - In any case if AICCU is build with TLS support it will - try to do a 'starttls' to the TIC server to see if that - is supported. - ''; - }; - - pidFile = mkOption { - type = types.path; - default = "/run/aiccu.pid"; - example = "/var/lib/aiccu/aiccu.pid"; - description = "Location of PID File"; - }; - - defaultRoute = mkOption { - type = types.bool; - default = true; - example = false; - description = "Add a default route"; - }; - - setupScript = mkOption { - type = with types; nullOr path; - default = null; - example = "/var/lib/aiccu/fix-subnets.sh"; - description = "Script to run after setting up the interfaces"; - }; - - makeHeartBeats = mkOption { - type = types.bool; - default = true; - example = false; - description = '' - In general you don't want to turn this off - Of course only applies to AYIYA and heartbeat tunnels not to static ones - ''; - }; - - noConfigure = mkOption { - type = types.bool; - default = false; - example = true; - description = "Don't configure anything"; - }; - - behindNAT = mkOption { - type = types.bool; - default = false; - example = true; - description = "Notify the user that a NAT-kind network is detected"; - }; - - localIPv4Override = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - Overrides the IPv4 parameter received from TIC - This allows one to configure a NAT into "DMZ" mode and then - forwarding the proto-41 packets to an internal host. - - This is only needed for static proto-41 tunnels! - AYIYA and heartbeat tunnels don't require this. - ''; - }; - - }; - }; - - config = mkIf cfg.enable { - - systemd.services.aiccu = { - description = "Automatic IPv6 Connectivity Client Utility"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.aiccu}/bin/aiccu start ${configFile}"; - ExecStop = "${pkgs.aiccu}/bin/aiccu stop"; - Type = "forking"; - PIDFile = cfg.pidFile; - Restart = "no"; # aiccu startup errors are serious, do not pound the tic server or be banned. - }; - }; - - }; -} diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix new file mode 100644 index 000000000000..ad4ac9bf45e3 --- /dev/null +++ b/nixos/modules/services/networking/aria2.nix @@ -0,0 +1,135 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.aria2; + + homeDir = "/var/lib/aria2"; + + settingsDir = "${homeDir}"; + sessionFile = "${homeDir}/aria2.session"; + downloadDir = "${homeDir}/Downloads"; + + rangesToStringList = map (x: builtins.toString x.from +"-"+ builtins.toString x.to); + + settingsFile = pkgs.writeText "aria2.conf" + '' + dir=${cfg.downloadDir} + listen-port=${concatStringsSep "," (rangesToStringList cfg.listenPortRange)} + rpc-listen-port=${toString cfg.rpcListenPort} + rpc-secret=${cfg.rpcSecret} + ''; + +in +{ + options = { + services.aria2 = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to enable the headless Aria2 daemon service. + + Aria2 daemon can be controlled via the RPC interface using + one of many WebUI (http://localhost:6800/ by default). + + Targets are downloaded to ${downloadDir} by default and are + accessible to users in the "aria2" group. + ''; + }; + openPorts = mkOption { + type = types.bool; + default = false; + description = '' + Open listen and RPC ports found in listenPortRange and rpcListenPort + options in the firewall. + ''; + }; + downloadDir = mkOption { + type = types.string; + default = "${downloadDir}"; + description = '' + Directory to store downloaded files. + ''; + }; + listenPortRange = mkOption { + type = types.listOf types.attrs; + default = [ { from = 6881; to = 6999; } ]; + description = '' + Set UDP listening port range used by DHT(IPv4, IPv6) and UDP tracker. + ''; + }; + rpcListenPort = mkOption { + type = types.int; + default = 6800; + description = "Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024-65535"; + }; + rpcSecret = mkOption { + type = types.string; + default = "aria2rpc"; + description = '' + Set RPC secret authorization token. + Read https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth to know how this option value is used. + ''; + }; + extraArguments = mkOption { + type = types.string; + example = "--rpc-listen-all --remote-time=true"; + default = ""; + description = '' + Additional arguments to be passed to Aria2. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + # Need to open ports for proper functioning + networking.firewall = mkIf cfg.openPorts { + allowedUDPPortRanges = config.services.aria2.listenPortRange; + allowedTCPPorts = [ config.services.aria2.rpcListenPort ]; + }; + + users.extraUsers.aria2 = { + group = "aria2"; + uid = config.ids.uids.aria2; + description = "aria2 user"; + home = homeDir; + createHome = false; + }; + + users.extraGroups.aria2.gid = config.ids.gids.aria2; + + systemd.services.aria2 = { + description = "aria2 Service"; + after = [ "local-fs.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -m 0770 -p "${homeDir}" + chown aria2:aria2 "${homeDir}" + if [[ ! -d "${config.services.aria2.downloadDir}" ]] + then + mkdir -m 0770 -p "${config.services.aria2.downloadDir}" + chown aria2:aria2 "${config.services.aria2.downloadDir}" + fi + if [[ ! -e "${sessionFile}" ]] + then + touch "${sessionFile}" + chown aria2:aria2 "${sessionFile}" + fi + cp -f "${settingsFile}" "${settingsDir}/aria2.conf" + ''; + + serviceConfig = { + Restart = "on-abort"; + ExecStart = "${pkgs.aria2}/bin/aria2c --enable-rpc --conf-path=${settingsDir}/aria2.conf ${config.services.aria2.extraArguments} --save-session=${sessionFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = "aria2"; + Group = "aria2"; + PermissionsStartOnly = true; + }; + }; + }; +} \ No newline at end of file diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 6a786e75bbc8..f4d0fc822dea 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -7,31 +7,35 @@ let cfg = config.services.avahi; + yesNo = yes : if yes then "yes" else "no"; + avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" '' [server] ${# Users can set `networking.hostName' to the empty string, when getting # a host name from DHCP. In that case, let Avahi take whatever the # current host name is; setting `host-name' to the empty string in # `avahi-daemon.conf' would be invalid. - if hostName != "" - then "host-name=${hostName}" - else ""} + optionalString (hostName != "") "host-name=${hostName}"} browse-domains=${concatStringsSep ", " browseDomains} - use-ipv4=${if ipv4 then "yes" else "no"} - use-ipv6=${if ipv6 then "yes" else "no"} + use-ipv4=${yesNo ipv4} + use-ipv6=${yesNo ipv6} ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"} ${optionalString (domainName!=null) "domain-name=${domainName}"} + allow-point-to-point=${yesNo allowPointToPoint} [wide-area] - enable-wide-area=${if wideArea then "yes" else "no"} + enable-wide-area=${yesNo wideArea} [publish] - disable-publishing=${if publish.enable then "no" else "yes"} - disable-user-service-publishing=${if publish.userServices then "no" else "yes"} - publish-addresses=${if publish.userServices || publish.addresses then "yes" else "no"} - publish-hinfo=${if publish.hinfo then "yes" else "no"} - publish-workstation=${if publish.workstation then "yes" else "no"} - publish-domain=${if publish.domain then "yes" else "no"} + disable-publishing=${yesNo (!publish.enable)} + disable-user-service-publishing=${yesNo (!publish.userServices)} + publish-addresses=${yesNo (publish.userServices || publish.addresses)} + publish-hinfo=${yesNo publish.hinfo} + publish-workstation=${yesNo publish.workstation} + publish-domain=${yesNo publish.domain} + + [reflector] + enable-reflector=${yesNo reflector} ''; in @@ -98,11 +102,25 @@ in ''; }; + allowPointToPoint = mkOption { + default = false; + description= '' + Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large + latencies with such links and opens a potential security hole by allowing mDNS access from Internet + connections. Use with care and YMMV! + ''; + }; + wideArea = mkOption { default = true; description = ''Whether to enable wide-area service discovery.''; }; + reflector = mkOption { + default = false; + description = ''Reflect incoming mDNS requests to all allowed network interfaces.''; + }; + publish = { enable = mkOption { default = false; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 0272b6ceff20..763283dfe7a2 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -10,12 +10,17 @@ let confFile = pkgs.writeText "named.conf" '' + include "/etc/bind/rndc.key"; + controls { + inet 127.0.0.1 allow {localhost;} keys {"rndc-key";}; + }; + acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} }; acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} }; options { - listen-on {any;}; - listen-on-v6 {any;}; + listen-on { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOn} }; + listen-on-v6 { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} }; allow-query { cachenetworks; }; blackhole { badnetworks; }; forward first; @@ -96,6 +101,22 @@ in "; }; + listenOn = mkOption { + default = ["any"]; + type = types.listOf types.str; + description = " + Interfaces to listen on. + "; + }; + + listenOnIpv6 = mkOption { + default = ["any"]; + type = types.listOf types.str; + description = " + Ipv6 interfaces to listen on. + "; + }; + zones = mkOption { default = []; description = " @@ -151,11 +172,21 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' + mkdir -m 0755 -p /etc/bind + if ! [ -f "/etc/bind/rndc.key" ]; then + ${pkgs.bind.out}/sbin/rndc-confgen -r /dev/urandom -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null + fi + ${pkgs.coreutils}/bin/mkdir -p /var/run/named chown ${bindUser} /var/run/named ''; - script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + serviceConfig = { + ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload"; + ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; + }; + unitConfig.Documentation = "man:named(8)"; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index e72ea20cccee..bd26804788f3 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/btsync.nix b/nixos/modules/services/networking/btsync.nix index 92e9fa7be419..6e479a5860ac 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -9,7 +9,6 @@ let listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort); - boolStr = x: if x then "true" else "false"; optionalEmptyStr = b: v: optionalString (b != "") v; webUIConfig = optionalString cfg.enableWebUI @@ -31,7 +30,7 @@ let sharedFoldersRecord = concatStringsSep "," (map (entry: let helper = attr: v: - if (entry ? attr) then boolStr entry.attr else boolStr v; + if (entry ? attr) then boolToString entry.attr else boolToString v; in '' { @@ -65,11 +64,11 @@ let "listening_port": ${toString cfg.listeningPort}, "use_gui": false, - "check_for_updates": ${boolStr cfg.checkForUpdates}, - "use_upnp": ${boolStr cfg.useUpnp}, + "check_for_updates": ${boolToString cfg.checkForUpdates}, + "use_upnp": ${boolToString cfg.useUpnp}, "download_limit": ${toString cfg.downloadLimit}, "upload_limit": ${toString cfg.uploadLimit}, - "lan_encrypt_data": ${boolStr cfg.encryptLAN}, + "lan_encrypt_data": ${boolToString cfg.encryptLAN}, ${webUIConfig} ${sharedFoldersConfig} diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index 2f7d006b8816..c354ec61fe23 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -51,6 +51,17 @@ in ''; }; + motd = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Charybdis MOTD text. + + Charybdis will read its MOTD from /etc/charybdis/ircd.motd . + If set, the value of this option will be written to this path. + ''; + }; + }; }; @@ -58,39 +69,42 @@ in ###### implementation - config = mkIf cfg.enable { - - users.extraUsers = singleton { - name = cfg.user; - description = "Charybdis IRC daemon user"; - uid = config.ids.uids.ircd; - group = cfg.group; - }; - - users.extraGroups = singleton { - name = cfg.group; - gid = config.ids.gids.ircd; - }; - - systemd.services.charybdis = { - description = "Charybdis IRC daemon"; - wantedBy = [ "multi-user.target" ]; - environment = { - BANDB_DBPATH = "${cfg.statedir}/ban.db"; + config = mkIf cfg.enable (lib.mkMerge [ + { + users.extraUsers = singleton { + name = cfg.user; + description = "Charybdis IRC daemon user"; + uid = config.ids.uids.ircd; + group = cfg.group; }; - serviceConfig = { - ExecStart = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}"; - Group = cfg.group; - User = cfg.user; - PermissionsStartOnly = true; # preStart needs to run with root permissions + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.ircd; }; - preStart = '' - ${coreutils}/bin/mkdir -p ${cfg.statedir} - ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir} - ''; - }; - - }; + systemd.services.charybdis = { + description = "Charybdis IRC daemon"; + wantedBy = [ "multi-user.target" ]; + environment = { + BANDB_DBPATH = "${cfg.statedir}/ban.db"; + }; + serviceConfig = { + ExecStart = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}"; + Group = cfg.group; + User = cfg.user; + PermissionsStartOnly = true; # preStart needs to run with root permissions + }; + preStart = '' + ${coreutils}/bin/mkdir -p ${cfg.statedir} + ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir} + ''; + }; + } + + (mkIf (cfg.motd != null) { + environment.etc."charybdis/ircd.motd".text = cfg.motd; + }) + ]); } diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 890ff5084078..3978a1969ce9 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -5,110 +5,122 @@ with lib; let cfg = config.services.cntlm; - uid = config.ids.uids.cntlm; + + configFile = if cfg.configText != "" then + pkgs.writeText "cntlm.conf" '' + ${cfg.configText} + '' + else + pkgs.writeText "lighttpd.conf" '' + # Cntlm Authentication Proxy Configuration + Username ${cfg.username} + Domain ${cfg.domain} + Password ${cfg.password} + ${optionalString (cfg.netbios_hostname != "") "Workstation ${cfg.netbios_hostname}"} + ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy} + ${optionalString (cfg.noproxy != []) "NoProxy ${concatStringsSep ", " cfg.noproxy}"} + + ${concatMapStrings (port: '' + Listen ${toString port} + '') cfg.port} + + ${cfg.extraConfig} + ''; in { - options = { + options.services.cntlm = { - services.cntlm = { + enable = mkOption { + default = false; + description = '' + Whether to enable the cntlm, which start a local proxy. + ''; + }; - enable = mkOption { - default = false; - description = '' - Whether to enable the cntlm, which start a local proxy. - ''; - }; + username = mkOption { + description = '' + Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). + ''; + }; - username = mkOption { - description = '' - Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). - ''; - }; + domain = mkOption { + description = ''Proxy account domain/workgroup name.''; + }; - domain = mkOption { - description = ''Proxy account domain/workgroup name.''; - }; + password = mkOption { + default = "/etc/cntlm.password"; + type = types.str; + description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.''; + }; - password = mkOption { - default = "/etc/cntlm.password"; - type = types.str; - description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.''; - }; + netbios_hostname = mkOption { + type = types.str; + default = ""; + description = '' + The hostname of your machine. + ''; + }; - netbios_hostname = mkOption { - type = types.str; - description = '' - The hostname of your machine. - ''; - }; + proxy = mkOption { + description = '' + A list of NTLM/NTLMv2 authenticating HTTP proxies. - proxy = mkOption { - description = '' - A list of NTLM/NTLMv2 authenticating HTTP proxies. + Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than once to specify unlimited + number of proxies. Should one proxy fail, cntlm automatically moves on to the next one. The connect request fails only if the whole + list of proxies is scanned and (for each request) and found to be invalid. Command-line takes precedence over the configuration file. + ''; + example = [ "proxy.example.com:81" ]; + }; - Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than once to specify unlimited - number of proxies. Should one proxy fail, cntlm automatically moves on to the next one. The connect request fails only if the whole - list of proxies is scanned and (for each request) and found to be invalid. Command-line takes precedence over the configuration file. - ''; - }; + noproxy = mkOption { + description = '' + A list of domains where the proxy is skipped. + ''; + default = []; + example = [ "*.example.com" "example.com" ]; + }; - port = mkOption { - default = [3128]; - description = "Specifies on which ports the cntlm daemon listens."; - }; + port = mkOption { + default = [3128]; + description = "Specifies on which ports the cntlm daemon listens."; + }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Verbatim contents of cntlm.conf."; - }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional config appended to the end of the generated cntlm.conf."; + }; + configText = mkOption { + type = types.lines; + default = ""; + description = "Verbatim contents of cntlm.conf."; }; }; - ###### implementation - config = mkIf config.services.cntlm.enable { + config = mkIf cfg.enable { systemd.services.cntlm = { description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - Type = "forking"; User = "cntlm"; ExecStart = '' - ${pkgs.cntlm}/bin/cntlm -U cntlm \ - -c ${pkgs.writeText "cntlm_config" cfg.extraConfig} + ${pkgs.cntlm}/bin/cntlm -U cntlm -c ${configFile} -v -f ''; - }; - }; - - services.cntlm.netbios_hostname = mkDefault config.networking.hostName; - - users.extraUsers.cntlm = { - name = "cntlm"; - description = "cntlm system-wide daemon"; - home = "/var/empty"; + }; }; - services.cntlm.extraConfig = - '' - # Cntlm Authentication Proxy Configuration - Username ${cfg.username} - Domain ${cfg.domain} - Password ${cfg.password} - Workstation ${cfg.netbios_hostname} - ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy} - - ${concatMapStrings (port: '' - Listen ${toString port} - '') cfg.port} - ''; + users.extraUsers.cntlm = { + name = "cntlm"; + description = "cntlm system-wide daemon"; + isSystemUser = true; + }; }; - } diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 14e6932d868b..65273a4bf939 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -320,6 +320,14 @@ in { RuntimeDirectory = "turnserver"; User = "turnserver"; Group = "turnserver"; + AmbientCapabilities = + mkIf ( + cfg.listening-port < 1024 || + cfg.alt-listening-port < 1024 || + cfg.tls-listening-port < 1024 || + cfg.alt-tls-listening-port < 1024 || + cfg.min-port < 1024 + ) "cap_net_bind_service"; Restart = "on-abort"; }; }; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 7eeceb7407c6..cdba14be21f0 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -71,8 +71,7 @@ let # anything ever again ("couldn't resolve ..., giving up on # it"), so we silently lose time synchronisation. This also # applies to openntpd. - ${config.systemd.package}/bin/systemctl try-restart ntpd.service - ${config.systemd.package}/bin/systemctl try-restart openntpd.service + ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service || true fi ${cfg.runHook} diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index b64929960576..ab7bbb15ad4f 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -17,7 +17,7 @@ let host = ${cfg.dns.address} port = ${toString cfg.dns.port} oldDNSMethod = NO_OLD_DNS - externalIP = ${cfg.dns.address} + externalIP = ${cfg.dns.externalAddress} [http] host = ${cfg.api.hostname} @@ -47,8 +47,18 @@ in type = types.str; default = "127.0.0.1"; description = '' - The IP address that will be used to reach this machine. - Leave this unchanged if you do not wish to directly expose the DNSChain resolver. + The IP address the DNSChain resolver will bind to. + Leave this unchanged if you do not wish to directly expose the resolver. + ''; + }; + + dns.externalAddress = mkOption { + type = types.str; + default = cfg.dns.address; + description = '' + The IP address used by clients to reach the resolver and the value of + the namecoin.dns record. Set this in case the bind address + is not the actual IP address (e.g. the machine is behind a NAT). ''; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index beddaa076122..077aeca457ea 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -2,14 +2,10 @@ with lib; let - apparmorEnabled = config.security.apparmor.enable; - cfg = config.services.dnscrypt-proxy; stateDirectory = "/var/lib/dnscrypt-proxy"; - localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; - # The minisign public key used to sign the upstream resolver list. # This is somewhat more flexible than preloading the key as an # embedded string. @@ -18,31 +14,33 @@ let sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh"; }; - # Internal flag indicating whether the upstream resolver list is used - useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null; + # Internal flag indicating whether the upstream resolver list is used. + useUpstreamResolverList = cfg.customResolver == null; - resolverList = - if (cfg.resolverList != null) - then cfg.resolverList - else "${stateDirectory}/dnscrypt-resolvers.csv"; + # The final local address. + localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; - resolverArgs = if (cfg.customResolver != null) - then - [ "--resolver-address=${cfg.customResolver.address}:${toString cfg.customResolver.port}" - "--provider-name=${cfg.customResolver.name}" - "--provider-key=${cfg.customResolver.key}" - ] - else - [ "--resolvers-list=${resolverList}" - "--resolver-name=${cfg.resolverName}" - ]; + # The final resolvers list path. + resolverList = "${stateDirectory}/dnscrypt-resolvers.csv"; + + # Build daemon command line + + resolverArgs = + if (cfg.customResolver == null) + then + [ "-L ${resolverList}" + "-R ${cfg.resolverName}" + ] + else with cfg.customResolver; + [ "-N ${name}" + "-k ${key}" + "-r ${address}:${toString port}" + ]; - # The final command line arguments passed to the daemon daemonArgs = - [ "--local-address=${localAddress}" ] - ++ optional cfg.tcpOnly "--tcp-only" - ++ optional cfg.ephemeralKeys "-E" - ++ resolverArgs; + [ "-a ${localAddress}" ] + ++ resolverArgs + ++ cfg.extraArgs; in { @@ -52,6 +50,9 @@ in }; options = { + # Before adding another option, consider whether it could + # equally well be passed via extraArgs. + services.dnscrypt-proxy = { enable = mkOption { default = false; @@ -84,19 +85,11 @@ in default = "dnscrypt.eu-nl"; type = types.nullOr types.str; description = '' - The name of the upstream DNSCrypt resolver to use, taken from - ${resolverList}. The default resolver is - located in Holland, supports DNS security extensions, and - claims to not keep logs. - ''; - }; - - resolverList = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - List of DNSCrypt resolvers. The default is to use the list of - public resolvers provided by upstream. + The name of the DNSCrypt resolver to use, taken from + ${resolverList}. The default + resolver is located in Holland, supports DNS security + extensions, and claims to not + keep logs. ''; }; @@ -133,25 +126,15 @@ in }; })); }; - tcpOnly = mkOption { - default = false; - type = types.bool; + extraArgs = mkOption { + default = []; + type = types.listOf types.str; description = '' - Force sending encrypted DNS queries to the upstream resolver over - TCP instead of UDP (on port 443). Use only if the UDP port is blocked. - ''; - }; - - ephemeralKeys = mkOption { - default = false; - type = types.bool; - description = '' - Compute a new key pair for every query. Enabling this option - increases CPU usage, but makes it more difficult for the upstream - resolver to track your usage of their service across IP addresses. - The default is to re-use the public key pair for all queries, making - tracking trivial. + Additional command-line arguments passed verbatim to the daemon. + See dnscrypt-proxy + 8 for details. ''; + example = [ "-X libdcplugin_example_cache.so,--min-ttl=60" ]; }; }; }; @@ -187,16 +170,13 @@ in documentation = [ "man:dnscrypt-proxy(8)" ]; before = [ "nss-lookup.target" ]; - - after = [ "network.target" ] - ++ optional apparmorEnabled "apparmor.service"; - - requires = [ "dnscrypt-proxy.socket "] - ++ optional apparmorEnabled "apparmor.service"; + after = [ "network.target" ]; + requires = [ "dnscrypt-proxy.socket "]; serviceConfig = { NonBlocking = "true"; ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "dnscrypt-proxy"; @@ -207,7 +187,9 @@ in }; } - (mkIf apparmorEnabled { + (mkIf config.security.apparmor.enable { + systemd.services.dnscrypt-proxy.after = [ "apparmor.service" ]; + security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy { /dev/null rw, @@ -238,6 +220,8 @@ in ${getLib pkgs.attr}/lib/libattr.so.* mr, # */ ${resolverList} r, + + /run/systemd/notify rw, } ''); }) @@ -272,15 +256,18 @@ in path = with pkgs; [ curl diffutils dnscrypt-proxy minisign ]; script = '' cd ${stateDirectory} - domain=download.dnscrypt.org + domain=raw.githubusercontent.com get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)" $get -o dnscrypt-resolvers.csv.tmp \ - https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv + https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv $get -o dnscrypt-resolvers.csv.minisig.tmp \ - https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig + https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig mv dnscrypt-resolvers.csv.minisig{.tmp,} - minisign -q -V -p ${upstreamResolverListPubKey} \ - -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig + if ! minisign -q -V -p ${upstreamResolverListPubKey} \ + -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig ; then + echo "failed to verify resolver list!" >&2 + exit 1 + fi [[ -f dnscrypt-resolvers.csv ]] && mv dnscrypt-resolvers.csv{,.old} mv dnscrypt-resolvers.csv{.tmp,} if cmp dnscrypt-resolvers.csv{,.old} ; then @@ -312,5 +299,24 @@ in imports = [ (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]) + + (mkChangedOptionModule + [ "services" "dnscrypt-proxy" "tcpOnly" ] + [ "services" "dnscrypt-proxy" "extraArgs" ] + (config: + let val = getAttrFromPath [ "services" "dnscrypt-proxy" "tcpOnly" ] config; in + optional val "-T")) + + (mkChangedOptionModule + [ "services" "dnscrypt-proxy" "ephemeralKeys" ] + [ "services" "dnscrypt-proxy" "extraArgs" ] + (config: + let val = getAttrFromPath [ "services" "dnscrypt-proxy" "ephemeralKeys" ] config; in + optional val "-E")) + + (mkRemovedOptionModule [ "services" "dnscrypt-proxy" "resolverList" ] '' + The current resolver listing from upstream is always used + unless a custom resolver is specified. + '') ]; } diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix index 8933e166f59f..07338ccf4d9c 100644 --- a/nixos/modules/services/networking/ferm.nix +++ b/nixos/modules/services/networking/ferm.nix @@ -19,7 +19,6 @@ in { services.ferm = { enable = mkOption { default = false; - example = true; type = types.bool; description = '' Whether to enable Ferm Firewall. diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 70d2d72ca8b7..3a95b9c4ec94 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -19,7 +19,7 @@ let [syncserver] public_url = ${cfg.publicUrl} ${optionalString (cfg.sqlUri != "") "sqluri = ${cfg.sqlUri}"} - allow_new_users = ${if cfg.allowNewUsers then "true" else "false"} + allow_new_users = ${boolToString cfg.allowNewUsers} [browserid] backend = tokenserver.verifiers.LocalVerifier @@ -33,7 +33,6 @@ in enable = mkOption { type = types.bool; default = false; - example = true; description = '' Whether to enable a Firefox Sync Server, this give the opportunity to Firefox users to store all synchronized data on their own server. To use this @@ -78,7 +77,6 @@ in allowNewUsers = mkOption { type = types.bool; default = true; - example = false; description = '' Whether to allow new-user signups on the server. Only request by existing accounts will be honored. diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 243cd04c96c2..68a814b23053 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -114,14 +114,15 @@ let # The "nixos-fw" chain does the actual work. ip46tables -N nixos-fw - # Perform a reverse-path test to refuse spoofers - # For now, we just drop, as the raw table doesn't have a log-refuse yet - ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' - # Clean up rpfilter rules - ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true + # Clean up rpfilter rules + ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true + ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true + ip46tables -t raw -X nixos-fw-rpfilter 2> /dev/null || true + ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' + # Perform a reverse-path test to refuse spoofers + # For now, we just drop, as the raw table doesn't have a log-refuse yet + ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN # Allows this host to act as a DHCPv4 server diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index fd4545e88e2d..bf2d0916fa36 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -164,7 +164,7 @@ in path = [ pkgs.hostapd ]; wantedBy = [ "network.target" ]; - after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service"]; + after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ]; serviceConfig = { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}"; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index c5b27350b3c2..7622f030f832 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -8,10 +8,6 @@ let homeDir = "/var/lib/i2pd"; - extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; - - toYesNo = b: if b then "true" else "false"; - mkEndpointOpt = name: addr: port: { enable = mkEnableOption name; name = mkOption { @@ -76,10 +72,10 @@ let i2pdConf = pkgs.writeText "i2pd.conf" '' - ipv4 = ${toYesNo cfg.enableIPv4} - ipv6 = ${toYesNo cfg.enableIPv6} - notransit = ${toYesNo cfg.notransit} - floodfill = ${toYesNo cfg.floodfill} + ipv4 = ${boolToString cfg.enableIPv4} + ipv6 = ${boolToString cfg.enableIPv6} + notransit = ${boolToString cfg.notransit} + floodfill = ${boolToString cfg.floodfill} netid = ${toString cfg.netid} ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" } ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} @@ -88,14 +84,14 @@ let transittunnels = ${toString cfg.limits.transittunnels} [upnp] - enabled = ${toYesNo cfg.upnp.enable} + enabled = ${boolToString cfg.upnp.enable} name = ${cfg.upnp.name} [precomputation] - elgamal = ${toYesNo cfg.precomputation.elgamal} + elgamal = ${boolToString cfg.precomputation.elgamal} [reseed] - verify = ${toYesNo cfg.reseed.verify} + verify = ${boolToString cfg.reseed.verify} file = ${cfg.reseed.file} urls = ${builtins.concatStringsSep "," cfg.reseed.urls} @@ -107,11 +103,11 @@ let (proto: let portStr = toString proto.port; in '' [${proto.name}] - enabled = ${toYesNo proto.enable} + enabled = ${boolToString proto.enable} address = ${proto.address} port = ${toString proto.port} ${if proto ? keys then "keys = ${proto.keys}" else ""} - ${if proto ? auth then "auth = ${toYesNo proto.auth}" else ""} + ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""} ${if proto ? user then "user = ${proto.user}" else ""} ${if proto ? pass then "pass = ${proto.pass}" else ""} ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""} @@ -154,9 +150,8 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh - ${if isNull cfg.extIp then extip else ""} ${pkgs.i2pd}/bin/i2pd \ - --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \ + ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \ --conf=${i2pdConf} \ --tunconf=${i2pdTunnelConf} ''; @@ -217,7 +212,8 @@ in type = with types; nullOr int; default = null; description = '' - Set a router bandwidth limit integer in kbps or letters: L (32), O (256), P (2048), X (>9000) + Set a router bandwidth limit integer in KBps. + If not set, i2pd defaults to 32KBps. ''; }; diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index ede57c5046d3..bd583fb020ec 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -12,7 +12,7 @@ let substFiles = [ "=>/conf" ./ircd.conf ]; inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps; - ipv6Enabled = if config.networking.enableIPv6 then "true" else "false"; + ipv6Enabled = boolToString config.networking.enableIPv6; inherit (cfg) serverName sid description adminEmail extraPort; diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix new file mode 100644 index 000000000000..23787bce9911 --- /dev/null +++ b/nixos/modules/services/networking/iwd.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.wireless.iwd; +in { + options.networking.wireless.iwd.enable = mkEnableOption "iwd"; + + config = mkIf cfg.enable { + assertions = [{ + assertion = !config.networking.wireless.enable; + message = '' + Only one wireless daemon is allowed at the time: networking.wireless.enable and networking.wireless.iwd.enable are mutually exclusive. + ''; + }]; + + # for iwctl + environment.systemPackages = [ pkgs.iwd ]; + + services.dbus.packages = [ pkgs.iwd ]; + + systemd.services.iwd = { + description = "Wireless daemon"; + before = [ "network.target" ]; + wants = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig.ExecStart = "${pkgs.iwd}/bin/iwd"; + }; + }; + + meta.maintainers = with lib.maintainers; [ mic92 ]; +} diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix new file mode 100644 index 000000000000..378cd9365848 --- /dev/null +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -0,0 +1,245 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.keepalived; + + keepalivedConf = pkgs.writeText "keepalived.conf" '' + global_defs { + ${snmpGlobalDefs} + ${cfg.extraGlobalDefs} + } + + ${vrrpInstancesStr} + ${cfg.extraConfig} + ''; + + snmpGlobalDefs = with cfg.snmp; optionalString enable ( + optionalString (socket != null) "snmp_socket ${socket}\n" + + optionalString enableKeepalived "enable_snmp_keepalived\n" + + optionalString enableChecker "enable_snmp_checker\n" + + optionalString enableRfc "enable_snmp_rfc\n" + + optionalString enableRfcV2 "enable_snmp_rfcv2\n" + + optionalString enableRfcV3 "enable_snmp_rfcv3\n" + + optionalString enableTraps "enable_traps" + ); + + vrrpInstancesStr = concatStringsSep "\n" (map (i: + '' + vrrp_instance ${i.name} { + interface ${i.interface} + state ${i.state} + virtual_router_id ${toString i.virtualRouterId} + priority ${toString i.priority} + ${optionalString i.noPreempt "nopreempt"} + + ${optionalString i.useVmac ( + "use_vmac" + optionalString (i.vmacInterface != null) " ${i.vmacInterface}" + )} + ${optionalString i.vmacXmitBase "vmac_xmit_base"} + + ${optionalString (i.unicastSrcIp != null) "unicast_src_ip ${i.unicastSrcIp}"} + unicast_peer { + ${concatStringsSep "\n" i.unicastPeers} + } + + virtual_ipaddress { + ${concatMapStringsSep "\n" virtualIpLine i.virtualIps} + } + + ${i.extraConfig} + } + '' + ) vrrpInstances); + + virtualIpLine = (ip: + ip.addr + + optionalString (notNullOrEmpty ip.brd) " brd ${ip.brd}" + + optionalString (notNullOrEmpty ip.dev) " dev ${ip.dev}" + + optionalString (notNullOrEmpty ip.scope) " scope ${ip.scope}" + + optionalString (notNullOrEmpty ip.label) " label ${ip.label}" + ); + + notNullOrEmpty = s: !(s == null || s == ""); + + vrrpInstances = mapAttrsToList (iName: iConfig: + { + name = iName; + } // iConfig + ) cfg.vrrpInstances; + + vrrpInstanceAssertions = i: [ + { assertion = i.interface != ""; + message = "services.keepalived.vrrpInstances.${i.name}.interface option cannot be empty."; + } + { assertion = i.virtualRouterId >= 0 && i.virtualRouterId <= 255; + message = "services.keepalived.vrrpInstances.${i.name}.virtualRouterId must be an integer between 0..255."; + } + { assertion = i.priority >= 0 && i.priority <= 255; + message = "services.keepalived.vrrpInstances.${i.name}.priority must be an integer between 0..255."; + } + { assertion = i.vmacInterface == null || i.useVmac; + message = "services.keepalived.vrrpInstances.${i.name}.vmacInterface has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set."; + } + { assertion = !i.vmacXmitBase || i.useVmac; + message = "services.keepalived.vrrpInstances.${i.name}.vmacXmitBase has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set."; + } + ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps); + + virtualIpAssertions = vrrpName: ip: [ + { assertion = ip.addr != ""; + message = "The 'addr' option for an services.keepalived.vrrpInstances.${vrrpName}.virtualIps entry cannot be empty."; + } + ]; + + pidFile = "/run/keepalived.pid"; + +in +{ + + options = { + services.keepalived = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Keepalived. + ''; + }; + + snmp = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the builtin AgentX subagent. + ''; + }; + + socket = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Socket to use for connecting to SNMP master agent. If this value is + set to null, keepalived's default will be used, which is + unix:/var/agentx/master, unless using a network namespace, when the + default is udp:localhost:705. + ''; + }; + + enableKeepalived = mkOption { + type = types.bool; + default = false; + description = '' + Enable SNMP handling of vrrp element of KEEPALIVED MIB. + ''; + }; + + enableChecker = mkOption { + type = types.bool; + default = false; + description = '' + Enable SNMP handling of checker element of KEEPALIVED MIB. + ''; + }; + + enableRfc = mkOption { + type = types.bool; + default = false; + description = '' + Enable SNMP handling of RFC2787 and RFC6527 VRRP MIBs. + ''; + }; + + enableRfcV2 = mkOption { + type = types.bool; + default = false; + description = '' + Enable SNMP handling of RFC2787 VRRP MIB. + ''; + }; + + enableRfcV3 = mkOption { + type = types.bool; + default = false; + description = '' + Enable SNMP handling of RFC6527 VRRP MIB. + ''; + }; + + enableTraps = mkOption { + type = types.bool; + default = false; + description = '' + Enable SNMP traps. + ''; + }; + + }; + + vrrpInstances = mkOption { + type = types.attrsOf (types.submodule (import ./vrrp-options.nix { + inherit lib; + })); + default = {}; + description = "Declarative vhost config"; + }; + + extraGlobalDefs = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to the 'global_defs' block of the + configuration file + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to the configuration file. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + assertions = flatten (map vrrpInstanceAssertions vrrpInstances); + + systemd.timers.keepalived-boot-delay = { + description = "Keepalive Daemon delay to avoid instant transition to MASTER state"; + after = [ "network.target" "network-online.target" "syslog.target" ]; + requires = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + timerConfig = { + OnActiveSec = "5s"; + Unit = "keepalived.service"; + }; + }; + + systemd.services.keepalived = { + description = "Keepalive Daemon (LVS and VRRP)"; + after = [ "network.target" "network-online.target" "syslog.target" ]; + wants = [ "network-online.target" ]; + serviceConfig = { + Type = "forking"; + PIDFile = pidFile; + KillMode = "process"; + ExecStart = "${pkgs.keepalived}/sbin/keepalived" + + " -f ${keepalivedConf}" + + " -p ${pidFile}" + + optionalString cfg.snmp.enable " --snmp"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "always"; + RestartSec = "1s"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/keepalived/virtual-ip-options.nix b/nixos/modules/services/networking/keepalived/virtual-ip-options.nix new file mode 100644 index 000000000000..1b8889b1b472 --- /dev/null +++ b/nixos/modules/services/networking/keepalived/virtual-ip-options.nix @@ -0,0 +1,50 @@ +{ lib } : + +with lib; +{ + options = { + + addr = mkOption { + type = types.str; + description = '' + IP address, optionally with a netmask: IPADDR[/MASK] + ''; + }; + + brd = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The broadcast address on the interface. + ''; + }; + + dev = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The name of the device to add the address to. + ''; + }; + + scope = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The scope of the area where this address is valid. + ''; + }; + + label = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Each address may be tagged with a label string. In order to preserve + compatibility with Linux-2.0 net aliases, this string must coincide with + the name of the device or must be prefixed with the device name followed + by colon. + ''; + }; + + }; +} diff --git a/nixos/modules/services/networking/keepalived/vrrp-options.nix b/nixos/modules/services/networking/keepalived/vrrp-options.nix new file mode 100644 index 000000000000..79eff3ae5419 --- /dev/null +++ b/nixos/modules/services/networking/keepalived/vrrp-options.nix @@ -0,0 +1,121 @@ +{ lib } : + +with lib; +{ + options = { + + interface = mkOption { + type = types.str; + description = '' + Interface for inside_network, bound by vrrp. + ''; + }; + + state = mkOption { + type = types.enum [ "MASTER" "BACKUP" ]; + default = "BACKUP"; + description = '' + Initial state. As soon as the other machine(s) come up, an election will + be held and the machine with the highest "priority" will become MASTER. + So the entry here doesn't matter a whole lot. + ''; + }; + + virtualRouterId = mkOption { + type = types.int; + description = '' + Arbitrary unique number 0..255. Used to differentiate multiple instances + of vrrpd running on the same NIC (and hence same socket). + ''; + }; + + priority = mkOption { + type = types.int; + default = 100; + description = '' + For electing MASTER, highest priority wins. To be MASTER, make 50 more + than other machines. + ''; + }; + + noPreempt = mkOption { + type = types.bool; + default = false; + description = '' + VRRP will normally preempt a lower priority machine when a higher + priority machine comes online. "nopreempt" allows the lower priority + machine to maintain the master role, even when a higher priority machine + comes back online. NOTE: For this to work, the initial state of this + entry must be BACKUP. + ''; + }; + + useVmac = mkOption { + type = types.bool; + default = false; + description = '' + Use VRRP Virtual MAC. + ''; + }; + + vmacInterface = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Name of the vmac interface to use. keepalived will come up with a name + if you don't specify one. + ''; + }; + + vmacXmitBase = mkOption { + type = types.bool; + default = false; + description = '' + Send/Recv VRRP messages from base interface instead of VMAC interface. + ''; + }; + + unicastSrcIp = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Default IP for binding vrrpd is the primary IP on interface. If you + want to hide location of vrrpd, use this IP as src_addr for unicast + vrrp packets. + ''; + }; + + unicastPeers = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Do not send VRRP adverts over VRRP multicast group. Instead it sends + adverts to the following list of ip addresses using unicast design + fashion. It can be cool to use VRRP FSM and features in a networking + environment where multicast is not supported! IP Addresses specified can + IPv4 as well as IPv6. + ''; + }; + + virtualIps = mkOption { + type = types.listOf (types.submodule (import ./virtual-ip-options.nix { + inherit lib; + })); + default = []; + example = literalExample '' + TODO: Example + ''; + description = "Declarative vhost config"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to the vrrp_instance section. + ''; + }; + + }; + +} diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix new file mode 100644 index 000000000000..ca5c279ac6f0 --- /dev/null +++ b/nixos/modules/services/networking/keybase.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.keybase; + +in { + + ###### interface + + options = { + + services.keybase = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to start the Keybase service."; + }; + + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.user.services.keybase = { + description = "Keybase service"; + serviceConfig = { + ExecStart = '' + ${pkgs.keybase}/bin/keybase service + ''; + Restart = "on-failure"; + PrivateTmp = true; + }; + }; + + environment.systemPackages = [ pkgs.keybase ]; + }; +} diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index c87e738d2a23..e7a6c565f4ff 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/lldpd.nix b/nixos/modules/services/networking/lldpd.nix new file mode 100644 index 000000000000..4f951d843e2c --- /dev/null +++ b/nixos/modules/services/networking/lldpd.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.lldpd; + +in + +{ + options.services.lldpd = { + enable = mkEnableOption "Link Layer Discovery Protocol Daemon"; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-c" "-k" "-I eth0" ]; + description = "List of command line parameters for lldpd"; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers._lldpd = { + description = "lldpd user"; + group = "_lldpd"; + home = "/var/run/lldpd"; + }; + users.extraGroups._lldpd = {}; + + environment.systemPackages = [ pkgs.lldpd ]; + + systemd.services.lldpd = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + requires = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.lldpd}/bin/lldpd -d ${concatStringsSep " " cfg.extraArgs}"; + PrivateTmp = true; + PrivateDevices = true; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/miredo.nix b/nixos/modules/services/networking/miredo.nix index 3d560338e2c5..8694d08385ca 100644 --- a/nixos/modules/services/networking/miredo.nix +++ b/nixos/modules/services/networking/miredo.nix @@ -20,7 +20,7 @@ in services.miredo = { - enable = mkEnableOption "Whether miredo should be run on startup."; + enable = mkEnableOption "the Miredo IPv6 tunneling service."; package = mkOption { type = types.package; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index f926cd710c8d..5451500b56f6 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -16,7 +16,7 @@ let pid_file /run/mosquitto/pid acl_file ${aclFile} persistence true - allow_anonymous ${if cfg.allowAnonymous then "true" else "false"} + allow_anonymous ${boolToString cfg.allowAnonymous} bind_address ${cfg.host} port ${toString cfg.port} ${listenerConf} @@ -147,7 +147,6 @@ in allowAnonymous = mkOption { default = false; - example = true; type = types.bool; description = '' Allow clients to connect without authentication. diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 81f968ae9fe1..13d7c3254f9d 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -26,21 +26,21 @@ let textmessagelength=${toString cfg.textMsgLength} imagemessagelength=${toString cfg.imgMsgLength} - allowhtml=${if cfg.allowHtml then "true" else "false"} + allowhtml=${boolToString cfg.allowHtml} logdays=${toString cfg.logDays} - bonjour=${if cfg.bonjour then "true" else "false"} - sendversion=${if cfg.sendVersion then "true" else "false"} + bonjour=${boolToString cfg.bonjour} + sendversion=${boolToString cfg.sendVersion} ${if cfg.registerName == "" then "" else "registerName="+cfg.registerName} ${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword} ${if cfg.registerUrl == "" then "" else "registerUrl="+cfg.registerUrl} ${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname} - certrequired=${if cfg.clientCertRequired then "true" else "false"} + certrequired=${boolToString cfg.clientCertRequired} ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert} ${if cfg.sslKey == "" then "" else "sslKey="+cfg.sslKey} ${if cfg.sslCa == "" then "" else "sslCA="+cfg.sslCa} - + ${cfg.extraConfig} ''; in diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 7255ffc5af4b..ab161b7e772c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,18 +9,23 @@ 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=${dns} [keyfile] - ${optionalString (config.networking.hostName != "") - ''hostname=${config.networking.hostName}''} ${optionalString (cfg.unmanaged != []) ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''} [logging] - level=WARN + level=${cfg.logLevel} [connection] ipv6.ip6-privacy=2 @@ -123,7 +128,7 @@ in { type = types.attrsOf types.package; default = { inherit networkmanager modemmanager wpa_supplicant networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect + networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp networkmanager_l2tp; }; internal = true; }; @@ -137,6 +142,22 @@ in { apply = list: (attrValues cfg.basePackages) ++ list; }; + dhcp = mkOption { + type = types.enum [ "dhclient" "dhcpcd" "internal" ]; + default = "dhclient"; + description = '' + Which program (or internal library) should be used for DHCP. + ''; + }; + + logLevel = mkOption { + type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ]; + default = "WARN"; + description = '' + Set the default logging verbosity level. + ''; + }; + appendNameservers = mkOption { type = types.listOf types.str; default = []; @@ -158,18 +179,29 @@ in { ethernet.macAddress = macAddressOpt; wifi.macAddress = macAddressOpt; + useDnsmasq = mkOption { + type = types.bool; + default = false; + description = '' + Enable NetworkManager's dnsmasq integration. NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + ''; + }; + dispatcherScripts = mkOption { type = types.listOf (types.submodule { options = { source = mkOption { - type = types.str; + type = types.path; description = '' - A script source. + A script. ''; }; type = mkOption { - type = types.enum (attrNames dispatcherTypesSubdirMap); + type = types.enum (attrNames dispatcherTypesSubdirMap); default = "basic"; description = '' Dispatcher hook type. Only basic hooks are currently available. @@ -210,6 +242,9 @@ in { { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; target = "NetworkManager/VPN/nm-openconnect-service.name"; } + { source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; + target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; + } { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } @@ -223,8 +258,8 @@ in { { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; } - ++ lib.imap (i: s: { - text = s.source; + ++ lib.imap1 (i: s: { + inherit (s) source; target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; }) cfg.dispatcherScripts; @@ -241,6 +276,7 @@ in { users.extraUsers = [{ name = "nm-openvpn"; uid = config.ids.uids.nm-openvpn; + extraGroups = [ "networkmanager" ]; }]; systemd.packages = cfg.packages; diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index 029c3df89932..56b942054140 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -17,6 +17,17 @@ in This conflicts with the standard networking firewall, so make sure to disable it before using nftables. + + Note that if you have Docker enabled you will not be able to use + nftables without intervention. Docker uses iptables internally to + setup NAT for containers. This module disables the ip_tables kernel + module, however Docker automatically loads the module. Please see [1] + for more information. + + There are other programs that use iptables internally too, such as + libvirt. + + [1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273 ''; }; networking.nftables.ruleset = mkOption { diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 481e267f6c38..c8b8ed547ebb 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -30,6 +30,7 @@ let cd $out/zones for zoneFile in *; do + echo "|- checking zone '$out/zones/$zoneFile'" ${nsdPkg}/sbin/nsd-checkzone "$zoneFile" "$zoneFile" || { if grep -q \\\\\\$ "$zoneFile"; then echo zone "$zoneFile" contains escaped dollar signes \\\$ @@ -810,6 +811,7 @@ in serviceConfig = { ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf"; + StandardError = "null"; PIDFile = pidFile; Restart = "always"; RestartSec = "4s"; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index feaa007de15e..fb9c9dc67f24 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -219,7 +219,7 @@ in data_path = "/var/lib/prosody" - allow_registration = ${ if cfg.allowRegistration then "true" else "false" }; + allow_registration = ${boolToString cfg.allowRegistration}; ${ optionalString cfg.modules.console "console_enabled = true;" } @@ -244,7 +244,7 @@ in ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" - enabled = ${if v.enabled then "true" else "false"}; + enabled = ${boolToString v.enabled}; ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) } ${ v.extraConfig } '') cfg.virtualHosts) } diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix index ac83da920638..aab58cc77b90 100644 --- a/nixos/modules/services/networking/quagga.nix +++ b/nixos/modules/services/networking/quagga.nix @@ -104,7 +104,6 @@ in enable = mkOption { type = types.bool; default = any isEnabled services; - example = true; description = '' Whether to enable the Zebra routing manager. diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index f9300fdabc57..ef860e7e5df4 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -57,4 +57,6 @@ in serviceConfig.Group = "radicale"; }; }; + + meta.maintainers = with lib.maintainers; [ aneeshusa ]; } diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix new file mode 100644 index 000000000000..6d2b7bdbca1b --- /dev/null +++ b/nixos/modules/services/networking/resilio.nix @@ -0,0 +1,268 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.resilio; + + resilioSync = pkgs.resilio-sync; + + sharedFoldersRecord = map (entry: { + secret = entry.secret; + dir = entry.directory; + + use_relay_server = entry.useRelayServer; + use_tracker = entry.useTracker; + use_dht = entry.useDHT; + + search_lan = entry.searchLAN; + use_sync_trash = entry.useSyncTrash; + known_hosts = knownHosts; + }) cfg.sharedFolders; + + configFile = pkgs.writeText "config.json" (builtins.toJSON ({ + device_name = cfg.deviceName; + storage_path = cfg.storagePath; + listening_port = cfg.listeningPort; + use_gui = false; + check_for_updates = cfg.checkForUpdates; + use_upnp = cfg.useUpnp; + download_limit = cfg.downloadLimit; + upload_limit = cfg.uploadLimit; + lan_encrypt_data = cfg.encryptLAN; + } // optionalAttrs cfg.enableWebUI { + webui = { listen = "${cfg.httpListenAddr}:${toString cfg.httpListenPort}"; } // + (optionalAttrs (cfg.httpLogin != "") { login = cfg.httpLogin; }) // + (optionalAttrs (cfg.httpPass != "") { password = cfg.httpPass; }) // + (optionalAttrs (cfg.apiKey != "") { api_key = cfg.apiKey; }) // + (optionalAttrs (cfg.directoryRoot != "") { directory_root = cfg.directoryRoot; }); + } // optionalAttrs (sharedFoldersRecord != []) { + shared_folders = sharedFoldersRecord; + })); + +in +{ + options = { + services.resilio = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, start the Resilio Sync daemon. Once enabled, you can + interact with the service through the Web UI, or configure it in your + NixOS configuration. Enabling the resilio service + also installs a systemd user unit which can be used to start + user-specific copies of the daemon. Once installed, you can use + systemctl --user start resilio as your user to start + the daemon using the configuration file located at + $HOME/.config/resilio-sync/config.json. + ''; + }; + + deviceName = mkOption { + type = types.str; + example = "Voltron"; + default = config.networking.hostName; + description = '' + Name of the Resilio Sync device. + ''; + }; + + listeningPort = mkOption { + type = types.int; + default = 0; + example = 44444; + description = '' + Listening port. Defaults to 0 which randomizes the port. + ''; + }; + + checkForUpdates = mkOption { + type = types.bool; + default = true; + description = '' + Determines whether to check for updates and alert the user + about them in the UI. + ''; + }; + + useUpnp = mkOption { + type = types.bool; + default = true; + description = '' + Use Universal Plug-n-Play (UPnP) + ''; + }; + + downloadLimit = mkOption { + type = types.int; + default = 0; + example = 1024; + description = '' + Download speed limit. 0 is unlimited (default). + ''; + }; + + uploadLimit = mkOption { + type = types.int; + default = 0; + example = 1024; + description = '' + Upload speed limit. 0 is unlimited (default). + ''; + }; + + httpListenAddr = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "1.2.3.4"; + description = '' + HTTP address to bind to. + ''; + }; + + httpListenPort = mkOption { + type = types.int; + default = 9000; + description = '' + HTTP port to bind on. + ''; + }; + + httpLogin = mkOption { + type = types.str; + example = "allyourbase"; + default = ""; + description = '' + HTTP web login username. + ''; + }; + + httpPass = mkOption { + type = types.str; + example = "arebelongtous"; + default = ""; + description = '' + HTTP web login password. + ''; + }; + + encryptLAN = mkOption { + type = types.bool; + default = true; + description = "Encrypt LAN data."; + }; + + enableWebUI = mkOption { + type = types.bool; + default = false; + description = '' + Enable Web UI for administration. Bound to the specified + httpListenAddress and + httpListenPort. + ''; + }; + + storagePath = mkOption { + type = types.path; + default = "/var/lib/resilio-sync/"; + description = '' + Where BitTorrent Sync will store it's database files (containing + things like username info and licenses). Generally, you should not + need to ever change this. + ''; + }; + + apiKey = mkOption { + type = types.str; + default = ""; + description = "API key, which enables the developer API."; + }; + + directoryRoot = mkOption { + type = types.str; + default = ""; + example = "/media"; + description = "Default directory to add folders in the web UI."; + }; + + sharedFolders = mkOption { + default = []; + example = + [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; + directory = "/home/user/sync_test"; + useRelayServer = true; + useTracker = true; + useDHT = false; + searchLAN = true; + useSyncTrash = true; + knownHosts = [ + "192.168.1.2:4444" + "192.168.1.3:4444" + ]; + } + ]; + description = '' + Shared folder list. If enabled, web UI must be + disabled. Secrets can be generated using rslsync + --generate-secret. Note that this secret will be + put inside the Nix store, so it is realistically not very + secret. + + If you would like to be able to modify the contents of this + directories, it is recommended that you make your user a + member of the resilio group. + + Directories in this list should be in the + resilio group, and that group must have + write access to the directory. It is also recommended that + chmod g+s is applied to the directory + so that any sub directories created will also belong to + the resilio group. Also, + setfacl -d -m group:resilio:rwx and + setfacl -m group:resilio:rwx should also + be applied so that the sub directories are writable by + the group. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.deviceName != ""; + message = "Device name cannot be empty."; + } + { assertion = cfg.enableWebUI -> cfg.sharedFolders == []; + message = "If using shared folders, the web UI cannot be enabled."; + } + { assertion = cfg.apiKey != "" -> cfg.enableWebUI; + message = "If you're using an API key, you must enable the web server."; + } + ]; + + users.extraUsers.rslsync = { + description = "Resilio Sync Service user"; + home = cfg.storagePath; + createHome = true; + uid = config.ids.uids.rslsync; + group = "rslsync"; + }; + + users.extraGroups = [ { name = "rslsync"; } ]; + + systemd.services.resilio = with pkgs; { + description = "Resilio Sync Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + serviceConfig = { + Restart = "on-abort"; + UMask = "0002"; + User = "rslsync"; + ExecStart = '' + ${resilioSync}/bin/rslsync --nodaemon --config ${configFile} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 3520c6d3f7da..e0eef9ed96f6 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -18,17 +18,12 @@ in services.searx = { - enable = mkOption { - type = types.bool; - default = false; - description = " - Whether to enable the Searx server. See https://github.com/asciimoo/searx - "; - }; + enable = mkEnableOption + "the searx server. See https://github.com/asciimoo/searx"; configFile = mkOption { - type = types.path; - default = ""; + type = types.nullOr types.path; + default = null; description = " The path of the Searx server configuration file. If no file is specified, a default file is used (default config file has @@ -72,7 +67,7 @@ in User = "searx"; ExecStart = "${cfg.package}/bin/searx-run"; }; - } // (optionalAttrs (configFile != "") { + } // (optionalAttrs (configFile != null) { environment.SEARX_SETTINGS_PATH = configFile; }); diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index bac794745277..c5c131cb4c50 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -288,8 +288,11 @@ in }; systemd.services.smokeping = { wantedBy = [ "multi-user.target"]; - serviceConfig.User = cfg.user; - serviceConfig.PermissionsStartOnly = true; + serviceConfig = { + User = cfg.user; + PermissionsStartOnly = true; + Restart = "on-failure"; + }; preStart = '' mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data rm -f ${smokepingHome}/cropper diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 80659f19c597..0f58536b4b73 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. ''; }; @@ -240,7 +242,7 @@ in systemd = let - sshd-service = + service = { description = "SSH Daemon"; wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; @@ -251,8 +253,20 @@ in environment.LD_LIBRARY_PATH = nssModulesPath; - wants = [ "sshd-keygen.service" ]; - after = [ "sshd-keygen.service" ]; + preStart = + '' + # Make sure we don't write to stdout, since in case of + # socket activation, it goes to the remote side (#19589). + exec >&2 + + mkdir -m 0755 -p /etc/ssh + + ${flip concatMapStrings cfg.hostKeys (k: '' + if ! [ -f "${k.path}" ]; then + ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N "" + fi + '')} + ''; serviceConfig = { ExecStart = @@ -262,31 +276,12 @@ in KillMode = "process"; } // (if cfg.startWhenNeeded then { StandardInput = "socket"; + StandardError = "journal"; } else { Restart = "always"; Type = "simple"; }); }; - - sshd-keygen-service = - { description = "SSH Host Key Generation"; - path = [ cfgc.package ]; - script = - '' - mkdir -m 0755 -p /etc/ssh - ${flip concatMapStrings cfg.hostKeys (k: '' - if ! [ -f "${k.path}" ]; then - ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N "" - fi - '')} - ''; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - }; - }; - in if cfg.startWhenNeeded then { @@ -298,13 +293,11 @@ in socketConfig.Accept = true; }; - services.sshd-keygen = sshd-keygen-service; - services."sshd@" = sshd-service; + services."sshd@" = service; } else { - services.sshd-keygen = sshd-keygen-service; - services.sshd = sshd-service; + services.sshd = service; }; @@ -325,8 +318,6 @@ in UsePAM yes - UsePrivilegeSeparation sandbox - AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} ${concatMapStrings (port: '' Port ${toString port} diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index bd584a3a85d3..e3d65c49fbf2 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.sslh; configFile = pkgs.writeText "sslh.conf" '' - verbose: ${if cfg.verbose then "true" else "false"}; + verbose: ${boolToString cfg.verbose}; foreground: true; inetd: false; numeric: false; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 8778b0364f9a..b0eb0460b9ba 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 6cb40185274d..42341b2d4123 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -35,7 +35,8 @@ in description = '' The name of the node which is used as an identifier when communicating with the remote nodes in the mesh. If null then the hostname of the system - is used. + is used to derive a name (note that tinc may replace non-alphanumeric characters in + hostnames by underscores). ''; }; @@ -78,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). ''; }; @@ -130,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} @@ -184,6 +194,19 @@ in }) ); + environment.systemPackages = let + cli-wrappers = pkgs.stdenv.mkDerivation { + name = "tinc-cli-wrappers"; + buildInputs = [ pkgs.makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + ${concatStringsSep "\n" (mapAttrsToList (network: data: '' + makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" --add-flags "--pidfile=/run/tinc.${network}.pid" + '') cfg.networks)} + ''; + }; + in [ cli-wrappers ]; + users.extraUsers = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 911836fdee42..5e13402d7645 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/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index deff645d9bfd..6b3d658bd852 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -37,6 +37,9 @@ let (yesNoOption "anonymousUser" "anonymous_enable" false '' Whether to enable the anonymous FTP user. '') + (yesNoOption "anonymousUserNoPassword" "no_anon_password" false '' + Whether to disable the password for the anonymous FTP user. + '') (yesNoOption "localUsers" "local_enable" false '' Whether to enable FTP for local users. '') diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 368d89e2e32e..be832ea45d8f 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -23,19 +23,22 @@ 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. + ''; }; - presharedKey = mkOption { - default = null; - example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; + privateKeyFile = mkOption { + example = "/private/wireguard_key"; type = with types; nullOr str; + default = null; description = '' - 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. + Private key file as generated by wg genkey. ''; }; @@ -98,6 +101,33 @@ let description = "The base64 public key the peer."; }; + presharedKey = mkOption { + default = null; + example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; + type = with types; nullOr str; + description = '' + 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. + ''; + }; + allowedIPs = mkOption { example = [ "10.192.122.3/32" "10.192.124.1/24" ]; type = with types; listOf str; @@ -134,54 +164,59 @@ let }; - generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" '' - [Interface] - PrivateKey = ${values.privateKey} - ${optionalString (values.presharedKey != null) "PresharedKey = ${values.presharedKey}"} - ${optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}"} - - ${concatStringsSep "\n\n" (map (peer: '' - [Peer] - PublicKey = ${peer.publicKey} - ${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: - "${ipCommand} route add ${ip} dev ${name}" - ) peer.allowedIPs)) values.peers)) + (map (peer: (map (ip: + "${ipCommand} route replace ${ip} dev ${name}" + ) 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/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix new file mode 100644 index 000000000000..bf23c6ae6192 --- /dev/null +++ b/nixos/modules/services/networking/xrdp.nix @@ -0,0 +1,160 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xrdp; + confDir = pkgs.runCommand "xrdp.conf" { } '' + mkdir $out + + cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out + + cat > $out/startwm.sh < + # xrdp can run X11 program even if "services.xserver.enable = false" + environment.pathsToLink = + [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; + + systemd = { + services.xrdp = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + description = "xrdp daemon"; + requires = [ "xrdp-sesman.service" ]; + preStart = '' + # prepare directory for unix sockets (the sockets will be owned by loggedinuser:xrdp) + mkdir -p /tmp/.xrdp || true + chown xrdp:xrdp /tmp/.xrdp + chmod 3777 /tmp/.xrdp + + # generate a self-signed certificate + if [ ! -s ${cfg.sslCert} -o ! -s ${cfg.sslKey} ]; then + mkdir -p $(dirname ${cfg.sslCert}) || true + mkdir -p $(dirname ${cfg.sslKey}) || true + ${pkgs.openssl.bin}/bin/openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 365 \ + -subj /C=US/ST=CA/L=Sunnyvale/O=xrdp/CN=www.xrdp.org \ + -config ${cfg.package}/share/xrdp/openssl.conf \ + -keyout ${cfg.sslKey} -out ${cfg.sslCert} + chown root:xrdp ${cfg.sslKey} ${cfg.sslCert} + chmod 440 ${cfg.sslKey} ${cfg.sslCert} + fi + if [ ! -s /var/run/xrdp/rsakeys.ini ]; then + mkdir -p /var/run/xrdp + ${cfg.package}/bin/xrdp-keygen xrdp /var/run/xrdp/rsakeys.ini + fi + ''; + serviceConfig = { + User = "xrdp"; + Group = "xrdp"; + PermissionsStartOnly = true; + ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini"; + }; + }; + + services.xrdp-sesman = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + description = "xrdp session manager"; + restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children + serviceConfig = { + ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini"; + ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; + }; + }; + + }; + + users.users.xrdp = { + description = "xrdp daemon user"; + isSystemUser = true; + group = "xrdp"; + }; + users.groups.xrdp = {}; + + security.pam.services.xrdp-sesman = { allowNullPassword = true; startSession = true; }; + }; + +} diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 0d41e3ea92ce..2b9867ade10d 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -35,9 +35,9 @@ let Port = ${toString confOpts.port} IPv4 = true IPv6 = true - SSL = ${if confOpts.useSSL then "true" else "false"} + SSL = ${boolToString confOpts.useSSL} - + ${confOpts.passBlock} Admin = true @@ -50,9 +50,13 @@ let ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: net: '' ${concatMapStrings (m: "LoadModule = ${m}\n") net.modules} - Server = ${net.server} ${if net.useSSL then "+" else ""}${toString net.port} - + Server = ${net.server} ${lib.optionalString net.useSSL "+"}${toString net.port} ${net.password} ${concatMapStrings (c: "\n\n") net.channels} + ${lib.optionalString net.hasBitlbeeControlChannel '' + + + ''} + ${net.extraConf} '') confOpts.networks) } @@ -85,6 +89,23 @@ let ''; }; + userName = mkOption { + default = ""; + example = "johntron"; + type = types.string; + description = '' + A nick identity specific to the IRC server. + ''; + }; + + password = mkOption { + type = types.str; + default = ""; + description = '' + IRC server password, such as for a Slack gateway. + ''; + }; + useSSL = mkOption { type = types.bool; default = true; @@ -119,6 +140,31 @@ let IRC channels to join. ''; }; + + hasBitlbeeControlChannel = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add the special Bitlbee operations channel. + ''; + }; + + extraConf = mkOption { + default = ""; + type = types.lines; + example = '' + Encoding = ^UTF-8 + FloodBurst = 4 + FloodRate = 1.00 + IRCConnectEnabled = true + Ident = johntron + JoinDelay = 0 + Nick = johntron + ''; + description = '' + Extra config for the network. + ''; + }; }; }; @@ -132,7 +178,6 @@ in services.znc = { enable = mkOption { default = false; - example = true; type = types.bool; description = '' Enable a ZNC service for a user. @@ -235,7 +280,7 @@ in example = defaultPassBlock; type = types.string; description = '' - Generate with znc --makepass. + Generate with `nix-shell -p znc --command "znc --makepass"`. This is the password used to log in to the ZNC web admin interface. ''; }; @@ -251,7 +296,6 @@ in useSSL = mkOption { default = true; - example = true; type = types.bool; description = '' Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated. @@ -275,22 +319,21 @@ in A list of global znc module packages to add to znc. ''; }; - + mutable = mkOption { default = false; - example = true; type = types.bool; description = '' Indicates whether to allow the contents of the `dataDir` directory to be changed by the user at run-time. - If true, modifications to the ZNC configuration after its initial creation are not + If true, modifications to the ZNC configuration after its initial creation are not overwritten by a NixOS system rebuild. If false, the ZNC configuration is rebuilt by every system rebuild. If the user wants to manage the ZNC service using the web admin interface, this value should be set to true. ''; }; - + extraFlags = mkOption { default = [ ]; example = [ "--debug" ]; @@ -337,7 +380,7 @@ in if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now." - ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir} + ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir} fi # Symlink modules @@ -355,7 +398,7 @@ in home = cfg.dataDir; createHome = true; }; - + users.extraGroups = optional (cfg.user == defaultUser) { name = defaultUser; gid = config.ids.gids.znc; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 3041dccfd154..855c89303847 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; }; @@ -52,6 +52,7 @@ let ServerBin ${bindir}/lib/cups DataDir ${bindir}/share/cups + DocumentRoot ${cups.out}/share/doc/cups AccessLog syslog ErrorLog syslog @@ -323,6 +324,8 @@ in fi ''} ''; + + serviceConfig.PrivateTmp = true; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 6eb277d0a2f2..7b1a1599e141 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -39,7 +39,7 @@ in enable = mkOption { type = types.bool; - example = true; + default = false; description = "Whether to enable the Vixie cron daemon."; }; diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index bd1ecb40969b..af4f9f41fd04 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -143,11 +143,13 @@ in }; preStart = '' - ${pkgs.coreutils}/bin/mkdir -m 0770 -p /var/spool/fcron - ${pkgs.coreutils}/bin/chown -R fcron:fcron /var/spool/fcron + install \ + --mode 0770 \ + --owner fcron \ + --group fcron \ + --directory /var/spool/fcron # load system crontab file - set -x - #${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab} + /run/wrappers/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab} ''; serviceConfig = { diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 574f74d547a5..2ea22a945940 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -5,13 +5,22 @@ with lib; let cfg = config.services.elasticsearch; + es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0; + esConfig = '' network.host: ${cfg.listenAddress} - network.port: ${toString cfg.port} - network.tcp.port: ${toString cfg.tcp_port} - # TODO: find a way to enable security manager - security.manager.enabled: false cluster.name: ${cfg.cluster_name} + + ${if es5 then '' + http.port: ${toString cfg.port} + transport.tcp.port: ${toString cfg.tcp_port} + '' else '' + network.port: ${toString cfg.port} + network.tcp.port: ${toString cfg.tcp_port} + # TODO: find a way to enable security manager + security.manager.enabled: false + ''} + ${cfg.extraConf} ''; @@ -19,13 +28,18 @@ let name = "elasticsearch-config"; paths = [ (pkgs.writeTextDir "elasticsearch.yml" esConfig) - (pkgs.writeTextDir "logging.yml" cfg.logging) + (if es5 then (pkgs.writeTextDir "log4j2.properties" cfg.logging) + else (pkgs.writeTextDir "logging.yml" cfg.logging)) ]; + # Elasticsearch 5.x won't start when the scripts directory does not exist + postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/scripts" else ""; }; esPlugins = pkgs.buildEnv { name = "elasticsearch-plugins"; paths = cfg.plugins; + # Elasticsearch 5.x won't start when the plugins directory does not exist + postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/plugins" else ""; }; in { @@ -85,18 +99,30 @@ in { logging = mkOption { description = "Elasticsearch logging configuration."; - default = '' - rootLogger: INFO, console - logger: - action: INFO - com.amazonaws: WARN - appender: - console: - type: console - layout: - type: consolePattern - conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n" - ''; + default = + if es5 then '' + logger.action.name = org.elasticsearch.action + logger.action.level = info + + appender.console.type = Console + appender.console.name = console + appender.console.layout.type = PatternLayout + appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n + + rootLogger.level = info + rootLogger.appenderRef.console.ref = console + '' else '' + rootLogger: INFO, console + logger: + action: INFO + com.amazonaws: WARN + appender: + console: + type: console + layout: + type: consolePattern + conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n" + ''; type = types.str; }; @@ -112,6 +138,12 @@ in { description = "Extra command line options for the elasticsearch launcher."; default = []; type = types.listOf types.str; + }; + + extraJavaOptions = mkOption { + description = "Extra command line options for Java."; + default = []; + type = types.listOf types.str; example = [ "-Djava.net.preferIPv4Stack=true" ]; }; @@ -133,13 +165,21 @@ in { path = [ pkgs.inetutils ]; environment = { ES_HOME = cfg.dataDir; + ES_JAVA_OPTS = toString ([ "-Des.path.conf=${configDir}" ] ++ cfg.extraJavaOptions); }; serviceConfig = { - ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; + ExecStart = "${cfg.package}/bin/elasticsearch ${toString cfg.extraCmdLineOptions}"; User = "elasticsearch"; PermissionsStartOnly = true; + LimitNOFILE = "1024000"; }; preStart = '' + # Only set vm.max_map_count if lower than ES required minimum + # This avoids conflict if configured via boot.kernel.sysctl + if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then + ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 + fi + mkdir -m 0700 -p ${cfg.dataDir} # Install plugins @@ -148,11 +188,6 @@ in { ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi ''; - postStart = mkBefore '' - until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do - sleep 1 - done - ''; }; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index d377a6feeb8e..9d7d2d799189 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -5,7 +5,11 @@ with lib; let cfg = config.services.kibana; - cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( + atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; + + cfgFile = if atLeast54 then cfgFile5 else cfgFile4; + + cfgFile4 = pkgs.writeText "kibana.json" (builtins.toJSON ( (filterAttrsRecursive (n: v: v != null) ({ host = cfg.listenAddress; port = cfg.port; @@ -36,6 +40,27 @@ let ]; } // cfg.extraConf) ))); + + cfgFile5 = pkgs.writeText "kibana.json" (builtins.toJSON ( + (filterAttrsRecursive (n: v: v != null) ({ + server.host = cfg.listenAddress; + server.port = cfg.port; + server.ssl.certificate = cfg.cert; + server.ssl.key = cfg.key; + + kibana.index = cfg.index; + kibana.defaultAppId = cfg.defaultAppId; + + elasticsearch.url = cfg.elasticsearch.url; + elasticsearch.username = cfg.elasticsearch.username; + elasticsearch.password = cfg.elasticsearch.password; + + elasticsearch.ssl.certificate = cfg.elasticsearch.cert; + elasticsearch.ssl.key = cfg.elasticsearch.key; + elasticsearch.ssl.certificateAuthorities = cfg.elasticsearch.certificateAuthorities; + } // cfg.extraConf) + ))); + in { options.services.kibana = { enable = mkEnableOption "enable kibana service"; @@ -96,11 +121,29 @@ in { }; ca = mkOption { - description = "CA file to auth against elasticsearch."; + description = '' + CA file to auth against elasticsearch. + + It's recommended to use the option + when using kibana-5.4 or newer. + ''; default = null; type = types.nullOr types.path; }; + certificateAuthorities = mkOption { + description = '' + CA files to auth against elasticsearch. + + Please use the option when using kibana < 5.4 + because those old versions don't support setting multiple CA's. + + This defaults to the singleton list [ca] when the option is defined. + ''; + default = if isNull cfg.elasticsearch.ca then [] else [ca]; + type = types.listOf types.path; + }; + cert = mkOption { description = "Certificate file to auth against elasticsearch."; default = null; @@ -118,6 +161,7 @@ in { description = "Kibana package to use"; default = pkgs.kibana; defaultText = "pkgs.kibana"; + example = "pkgs.kibana5"; type = types.package; }; diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix index f48a79b1f7f1..b64a1b4d03e0 100644 --- a/nixos/modules/services/security/haka.nix +++ b/nixos/modules/services/security/haka.nix @@ -99,7 +99,6 @@ in pcap = mkOption { default = true; - example = false; type = types.bool; description = "Whether to enable pcap"; }; diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index e267fed27955..8315c9ea5d61 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -23,6 +23,8 @@ let stats = cfg.statsAddress; listen = cfg.listenAddress; }); + + script = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; in { options = { services.hologram-server = { @@ -94,9 +96,15 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; - }; + inherit script; + }; + + docker-containers.hologram-server = { + inherit script; + }; + + trivial-services.hologram-server = { + inherit script; }; }; } diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index caa7d9d50812..3e5087766b1c 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -10,9 +10,6 @@ let # repeatedArgs (arg: "--arg=${arg}") args repeatedArgs = concatMapStringsSep " "; - # 'toString' doesn't quite do what we want for bools. - fromBool = x: if x then "true" else "false"; - # oauth2_proxy provides many options that are only relevant if you are using # a certain provider. This set maps from provider name to a function that # takes the configuration and returns a string that can be inserted into the @@ -24,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}' \ @@ -49,24 +45,24 @@ let --client-secret='${cfg.clientSecret}' \ ${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \ --cookie-expire='${cfg.cookie.expire}' \ - --cookie-httponly=${fromBool cfg.cookie.httpOnly} \ + --cookie-httponly=${boolToString cfg.cookie.httpOnly} \ --cookie-name='${cfg.cookie.name}' \ --cookie-secret='${cfg.cookie.secret}' \ - --cookie-secure=${fromBool cfg.cookie.secure} \ + --cookie-secure=${boolToString cfg.cookie.secure} \ ${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \ ${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \ ${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \ --http-address='${cfg.httpAddress}' \ - ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${fromBool cfg.htpasswd.displayForm}"} \ + ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${boolToString cfg.htpasswd.displayForm}"} \ ${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \ - --pass-access-token=${fromBool cfg.passAccessToken} \ - --pass-basic-auth=${fromBool cfg.passBasicAuth} \ - --pass-host-header=${fromBool cfg.passHostHeader} \ + --pass-access-token=${boolToString cfg.passAccessToken} \ + --pass-basic-auth=${boolToString cfg.passBasicAuth} \ + --pass-host-header=${boolToString cfg.passHostHeader} \ --proxy-prefix='${cfg.proxyPrefix}' \ ${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \ ${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \ ${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \ - --request-logging=${fromBool cfg.requestLogging} \ + --request-logging=${boolToString cfg.requestLogging} \ ${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \ ${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \ ${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \ diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 34d0be3b1beb..0881483967c6 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -26,17 +26,7 @@ in This will switch to a new virtual terminal, turn off console switching and disable SysRq mechanism (when is set) - until the root or - password is given. - ''; - }; - - user = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - User whose password will be used to unlock the screen on par - with the root password. + until the root or user password is given. ''; }; @@ -105,7 +95,7 @@ in ++ cfg.lockOn.extraTargets; serviceConfig.Type = "forking"; script = '' - ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.user != null) " -u ${cfg.user}"} + ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"} ''; }; diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixos/modules/services/security/shibboleth-sp.nix new file mode 100644 index 000000000000..5908f727d535 --- /dev/null +++ b/nixos/modules/services/security/shibboleth-sp.nix @@ -0,0 +1,75 @@ +{pkgs, config, lib, ...}: + +with lib; +let + cfg = config.services.shibboleth-sp; +in { + options = { + services.shibboleth-sp = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the shibboleth service"; + }; + + configFile = mkOption { + type = types.path; + example = "${pkgs.shibboleth-sp}/etc/shibboleth/shibboleth2.xml"; + description = "Path to shibboleth config file"; + }; + + fastcgi.enable = mkOption { + type = types.bool; + default = false; + description = "Whether to include the shibauthorizer and shibresponder FastCGI processes"; + }; + + fastcgi.shibAuthorizerPort = mkOption { + type = types.int; + default = 9100; + description = "Port for shibauthorizer FastCGI proccess to bind to"; + }; + + fastcgi.shibResponderPort = mkOption { + type = types.int; + default = 9101; + description = "Port for shibauthorizer FastCGI proccess to bind to"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.shibboleth-sp = { + description = "Provides SSO and federation for web applications"; + after = lib.optionals cfg.fastcgi.enable [ "shibresponder.service" "shibauthorizer.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.shibboleth-sp}/bin/shibd -F -d ${pkgs.shibboleth-sp} -c ${cfg.configFile}"; + }; + }; + + systemd.services.shibresponder = mkIf cfg.fastcgi.enable { + description = "Provides SSO through Shibboleth via FastCGI"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ "${pkgs.spawn_fcgi}" ]; + environment.SHIBSP_CONFIG = "${cfg.configFile}"; + serviceConfig = { + ExecStart = "${pkgs.spawn_fcgi}/bin/spawn-fcgi -n -p ${toString cfg.fastcgi.shibResponderPort} ${pkgs.shibboleth-sp}/lib/shibboleth/shibresponder"; + }; + }; + + systemd.services.shibauthorizer = mkIf cfg.fastcgi.enable { + description = "Provides SSO through Shibboleth via FastCGI"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ "${pkgs.spawn_fcgi}" ]; + environment.SHIBSP_CONFIG = "${cfg.configFile}"; + serviceConfig = { + ExecStart = "${pkgs.spawn_fcgi}/bin/spawn-fcgi -n -p ${toString cfg.fastcgi.shibAuthorizerPort} ${pkgs.shibboleth-sp}/lib/shibboleth/shibauthorizer"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ jammerful ]; +} diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix new file mode 100644 index 000000000000..5a183443f71d --- /dev/null +++ b/nixos/modules/services/security/sshguard.nix @@ -0,0 +1,140 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.sshguard; +in { + + ###### interface + + options = { + + services.sshguard = { + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to enable the sshguard service."; + }; + + attack_threshold = mkOption { + default = 30; + type = types.int; + description = '' + Block attackers when their cumulative attack score exceeds threshold. Most attacks have a score of 10. + ''; + }; + + blacklist_threshold = mkOption { + default = null; + example = 120; + type = types.nullOr types.int; + description = '' + Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file. + ''; + }; + + blacklist_file = mkOption { + default = "/var/lib/sshguard/blacklist.db"; + type = types.path; + description = '' + Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file. + ''; + }; + + blocktime = mkOption { + default = 120; + type = types.int; + description = '' + Block attackers for initially blocktime seconds after exceeding threshold. Subsequent blocks increase by a factor of 1.5. + + sshguard unblocks attacks at random intervals, so actual block times will be longer. + ''; + }; + + detection_time = mkOption { + default = 1800; + type = types.int; + description = '' + Remember potential attackers for up to detection_time seconds before resetting their score. + ''; + }; + + whitelist = mkOption { + default = [ ]; + example = [ "198.51.100.56" "198.51.100.2" ]; + type = types.listOf types.str; + description = '' + Whitelist a list of addresses, hostnames, or address blocks. + ''; + }; + + services = mkOption { + default = [ "sshd" ]; + example = [ "sshd" "exim" ]; + type = types.listOf types.str; + description = '' + Systemd services sshguard should receive logs of. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ]; + + environment.etc."sshguard.conf".text = let + list_services = ( name: "-t ${name} "); + in '' + BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset" + LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl -afb -p info -n1 ${toString (map list_services cfg.services)} -o cat" + ''; + + systemd.services.sshguard = + { description = "SSHGuard brute-force attacks protection system"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = optional config.networking.firewall.enable "firewall.service"; + + path = [ pkgs.iptables pkgs.ipset pkgs.iproute pkgs.systemd ]; + + postStart = '' + mkdir -p /var/lib/sshguard + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6 + ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP + ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP + ''; + + preStop = '' + ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP + ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP + ''; + + unitConfig.Documentation = "man:sshguard(8)"; + + serviceConfig = { + Type = "simple"; + ExecStart = let + list_whitelist = ( name: "-w ${name} "); + in '' + ${pkgs.sshguard}/bin/sshguard -a ${toString cfg.attack_threshold} ${optionalString (cfg.blacklist_threshold != null) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file} "}-i /run/sshguard/sshguard.pid -p ${toString cfg.blocktime} -s ${toString cfg.detection_time} ${toString (map list_whitelist cfg.whitelist)} + ''; + PIDFile = "/run/sshguard/sshguard.pid"; + Restart = "always"; + + ReadOnlyDirectories = "/"; + ReadWriteDirectories = "/run/sshguard /var/lib/sshguard"; + RuntimeDirectory = "sshguard"; + CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; + }; + }; + }; +} diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 47f863b96df2..10596d6431d0 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -12,6 +12,10 @@ let torRc = '' User tor DataDirectory ${torDirectory} + ${optionalString cfg.enableGeoIP '' + GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip + GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 + ''} ${optint "ControlPort" cfg.controlPort} '' @@ -58,6 +62,18 @@ in ''; }; + enableGeoIP = mkOption { + type = types.bool; + default = true; + description = '' + Whenever to configure Tor daemon to use GeoIP databases. + + Disabling this will disable by-country statistics for + bridges and relays and some client and third-party software + functionality. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -124,6 +140,7 @@ in }; privoxy.enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable and configure the system Privoxy to use Tor's diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix index a81cdbbc172f..a29cb3f33dae 100644 --- a/nixos/modules/services/security/torify.nix +++ b/nixos/modules/services/security/torify.nix @@ -19,15 +19,23 @@ in { ###### interface - + options = { - + services.tor.tsocks = { enable = mkOption { - default = cfg.enable && cfg.client.enable; + default = false; description = '' - Whether to build tsocks wrapper script to relay application traffic via TOR. + Whether to build tsocks wrapper script to relay application traffic via Tor. + + + You shouldn't use this unless you know what you're + doing because your installation of Tor already comes with + its own superior (doesn't leak DNS queries) + torsocks wrapper which does pretty much + exactly the same thing as this. + ''; }; diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix new file mode 100644 index 000000000000..146afec344ab --- /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/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 0ef31ef8a8b9..d513e44dcfba 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -3,52 +3,7 @@ with lib; let cfg = config.services.cloud-init; - path = with pkgs; [ cloud-init nettools utillinux e2fsprogs shadow dmidecode openssh ]; - configFile = pkgs.writeText "cloud-init.cfg" '' -users: - - root - -disable_root: false -preserve_hostname: false - -cloud_init_modules: - - migrator - - seed_random - - bootcmd - - write-files - - growpart - - resizefs - - set_hostname - - update_hostname - - update_etc_hosts - - ca-certs - - rsyslog - - users-groups - -cloud_config_modules: - - emit_upstart - - disk_setup - - mounts - - ssh-import-id - - set-passwords - - timezone - - disable-ec2-metadata - - runcmd - - ssh - -cloud_final_modules: - - rightscale_userdata - - scripts-vendor - - scripts-per-once - - scripts-per-boot - - scripts-per-instance - - scripts-user - - ssh-authkey-fingerprints - - keys-to-console - - phone-home - - final-message - - power-state-change -''; + path = with pkgs; [ cloud-init nettools utillinux e2fsprogs shadow openssh iproute ]; in { options = { @@ -74,12 +29,63 @@ in ''; }; + config = mkOption { + type = types.str; + default = '' + system_info: + distro: nixos + users: + - root + + disable_root: false + preserve_hostname: false + + cloud_init_modules: + - migrator + - seed_random + - bootcmd + - write-files + - growpart + - resizefs + - update_etc_hosts + - ca-certs + - rsyslog + - users-groups + + cloud_config_modules: + - disk_setup + - mounts + - ssh-import-id + - set-passwords + - timezone + - disable-ec2-metadata + - runcmd + - ssh + + cloud_final_modules: + - rightscale_userdata + - scripts-vendor + - scripts-per-once + - scripts-per-boot + - scripts-per-instance + - scripts-user + - ssh-authkey-fingerprints + - keys-to-console + - phone-home + - final-message + - power-state-change + ''; + description = ''cloud-init configuration.''; + }; + }; }; config = mkIf cfg.enable { + environment.etc."cloud/cloud.cfg".text = cfg.config; + systemd.services.cloud-init-local = { description = "Initial cloud-init job (pre-networking)"; wantedBy = [ "multi-user.target" ]; @@ -88,7 +94,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} init --local"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init init --local"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; @@ -105,7 +111,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} init"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init init"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; @@ -121,7 +127,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} modules --mode=config"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init modules --mode=config"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; @@ -137,7 +143,7 @@ in path = path; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} modules --mode=final"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init modules --mode=final"; RemainAfterExit = "yes"; TimeoutSec = "0"; StandardOutput = "journal+console"; diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix new file mode 100644 index 000000000000..daa46838bfa8 --- /dev/null +++ b/nixos/modules/services/system/earlyoom.nix @@ -0,0 +1,96 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + ecfg = config.services.earlyoom; +in +{ + options = { + services.earlyoom = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable early out of memory killing. + ''; + }; + + freeMemThreshold = mkOption { + type = types.int; + default = 10; + description = '' + Minimum of availabe memory (in percent). + If the free memory falls below this threshold and the analog is true for + + the killing begins. + ''; + }; + + freeSwapThreshold = mkOption { + type = types.int; + default = 10; + description = '' + Minimum of availabe swap space (in percent). + If the available swap space falls below this threshold and the analog + is true for + the killing begins. + ''; + }; + + useKernelOOMKiller= mkOption { + type = types.bool; + default = false; + description = '' + Use kernel OOM killer instead of own user-space implementation. + ''; + }; + + ignoreOOMScoreAdjust = mkOption { + type = types.bool; + default = false; + description = '' + Ignore oom_score_adjust values of processes. + User-space implementation only. + ''; + }; + + enableDebugInfo = mkOption { + type = types.bool; + default = false; + description = '' + Enable debugging messages. + ''; + }; + }; + }; + + config = mkIf ecfg.enable { + assertions = [ + { assertion = ecfg.freeMemThreshold > 0 && ecfg.freeMemThreshold <= 100; + message = "Needs to be a positive percentage"; } + { assertion = ecfg.freeSwapThreshold > 0 && ecfg.freeSwapThreshold <= 100; + message = "Needs to be a positive percentage"; } + { assertion = !ecfg.useKernelOOMKiller || !ecfg.ignoreOOMScoreAdjust; + message = "Both options in conjunction do not make sense"; } + ]; + + systemd.services.earlyoom = { + description = "Early OOM Daemon for Linux"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + StandardOutput = "null"; + StandardError = "syslog"; + ExecStart = '' + ${pkgs.earlyoom}/bin/earlyoom \ + -m ${toString ecfg.freeMemThreshold} \ + -s ${toString ecfg.freeSwapThreshold} \ + ${optionalString ecfg.useKernelOOMKiller "-k"} \ + ${optionalString ecfg.ignoreOOMScoreAdjust "-i"} \ + ${optionalString ecfg.enableDebugInfo "-d"} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix new file mode 100644 index 000000000000..281716cf1860 --- /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/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index a9c08b66eb82..2534f09b555a 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -13,7 +13,6 @@ in { deluge = { enable = mkOption { default = false; - example = true; description = "Start the Deluge daemon"; }; @@ -29,7 +28,6 @@ in { deluge.web = { enable = mkOption { default = false; - example = true; description = '' Start Deluge Web daemon. ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5b2e4ca16066..1f319df794b5 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -15,8 +15,7 @@ let # Strings must be quoted, ints and bools must not (for settings.json). toOption = x: - if x == true then "true" - else if x == false then "false" + if isBool x then boolToString x else if isInt x then toString x else toString ''"${x}"''; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 2d9287577de8..c1d7d4ea06d4 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -103,7 +103,7 @@ in requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; - path = [ cfg.jrePackage ]; + path = [ cfg.jrePackage pkgs.bash ]; environment = { CONF_USER = cfg.user; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index ada26f8057ba..b54c91d7de92 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -88,7 +88,6 @@ in secure = mkOption { type = types.bool; default = true; - example = false; description = "Whether the connections to the proxy should be considered secure."; }; }; @@ -138,7 +137,7 @@ in sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' - -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ + -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \ '') + '' ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml ''; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 6e31d20d0681..0ab94d95eee8 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -78,7 +78,6 @@ in secure = mkOption { type = types.bool; default = true; - example = false; description = "Whether the connections to the proxy should be considered secure."; }; }; diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 8e6baf6a17e3..be9af78da181 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -201,7 +201,6 @@ in Group = cfg.group; ExecStart = "${pkgs.mattermost}/bin/mattermost-platform"; WorkingDirectory = "${cfg.statePath}"; - PrivateTmp = true; JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; Restart = "always"; RestartSec = "10"; 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 000000000000..a1d8a5b7556a --- /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 000000000000..26342a9c5f00 --- /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-apps/pump.io-configure.js b/nixos/modules/services/web-apps/pump.io-configure.js new file mode 100644 index 000000000000..1fbf346a34c4 --- /dev/null +++ b/nixos/modules/services/web-apps/pump.io-configure.js @@ -0,0 +1,23 @@ +var fs = require('fs'); + +var opts = JSON.parse(fs.readFileSync("/dev/stdin").toString()); +var config = opts.config; + +var readSecret = function(filename) { + return fs.readFileSync(filename).toString().trim(); +}; + +if (opts.secretFile) { + config.secret = readSecret(opts.secretFile); +} +if (opts.dbPasswordFile) { + config.params.dbpass = readSecret(opts.dbPasswordFile); +} +if (opts.smtpPasswordFile) { + config.smtppass = readSecret(opts.smtpPasswordFile); +} +if (opts.spamClientSecretFile) { + config.spamclientsecret = readSecret(opts.opts.spamClientSecretFile); +} + +fs.writeFileSync(opts.outputFile, JSON.stringify(config)); diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix index b7c64bc6940b..27ae68516367 100644 --- a/nixos/modules/services/web-apps/pump.io.nix +++ b/nixos/modules/services/web-apps/pump.io.nix @@ -5,71 +5,74 @@ with lib; let cfg = config.services.pumpio; dataDir = "/var/lib/pump.io"; + runDir = "/run/pump.io"; user = "pumpio"; + optionalSet = condition: value: if condition then value else {}; + + configScript = ./pump.io-configure.js; configOptions = { - driver = if cfg.driver == "disk" then null else cfg.driver; - params = ({ } // - (if cfg.driver == "disk" then { - dir = dataDir; - } else { }) // - (if cfg.driver == "mongodb" || cfg.driver == "redis" then { - host = cfg.dbHost; - port = cfg.dbPort; - dbname = cfg.dbName; - dbuser = cfg.dbUser; - dbpass = cfg.dbPassword; - } else { }) // - (if cfg.driver == "memcached" then { - host = cfg.dbHost; - port = cfg.dbPort; - } else { }) // - cfg.driverParams); + outputFile = "${runDir}/config.json"; + config = + (optionalSet (cfg.driver != "disk") { + driver = cfg.driver; + }) // + { + params = (optionalSet (cfg.driver == "disk") { dir = dataDir; }) // + (optionalSet (cfg.driver == "mongodb" || cfg.driver == "redis") { + host = cfg.dbHost; + port = cfg.dbPort; + dbname = cfg.dbName; + dbuser = cfg.dbUser; + dbpass = cfg.dbPassword; + }) // + (optionalSet (cfg.driver == "memcached") { + host = cfg.dbHost; + port = cfg.dbPort; + }) // cfg.driverParams; + secret = cfg.secret; - secret = cfg.secret; + address = cfg.address; + port = cfg.port; - address = cfg.address; - port = cfg.port; + noweb = false; + urlPort = cfg.urlPort; + hostname = cfg.hostname; + favicon = cfg.favicon; - noweb = false; - urlPort = cfg.urlPort; - hostname = cfg.hostname; - favicon = cfg.favicon; + site = cfg.site; + owner = cfg.owner; + ownerURL = cfg.ownerURL; - site = cfg.site; - owner = cfg.owner; - ownerURL = cfg.ownerURL; + key = cfg.sslKey; + cert = cfg.sslCert; + bounce = false; - key = cfg.sslKey; - cert = cfg.sslCert; - bounce = false; + spamhost = cfg.spamHost; + spamclientid = cfg.spamClientId; + spamclientsecret = cfg.spamClientSecret; - spamhost = cfg.spamHost; - spamclientid = cfg.spamClientId; - spamclientsecret = cfg.spamClientSecret; + requireEmail = cfg.requireEmail; + smtpserver = cfg.smtpHost; + smtpport = cfg.smtpPort; + smtpuser = cfg.smtpUser; + smtppass = cfg.smtpPassword; + smtpusessl = cfg.smtpUseSSL; + smtpfrom = cfg.smtpFrom; - requireEmail = cfg.requireEmail; - smtpserver = cfg.smtpHost; - smtpport = cfg.smtpPort; - smtpuser = cfg.smtpUser; - smtppass = cfg.smtpPassword; - smtpusessl = cfg.smtpUseSSL; - smtpfrom = cfg.smtpFrom; + nologger = false; + enableUploads = cfg.enableUploads; + datadir = dataDir; + debugClient = false; + firehose = cfg.firehose; + disableRegistration = cfg.disableRegistration; - nologger = false; - uploaddir = "${dataDir}/uploads"; - debugClient = false; - firehose = cfg.firehose; - disableRegistration = cfg.disableRegistration; - } // - (if cfg.port < 1024 then { - serverUser = user; # have pump.io listen then drop privileges - } else { }) // - cfg.extraConfig; - -in - -{ + inherit (cfg) secretFile dbPasswordFile smtpPasswordFile spamClientSecretFile; + } // + (optionalSet (cfg.port < 1024) { + serverUser = user; # have pump.io listen then drop privileges + }) // cfg.extraConfig; +}; in { options = { services.pumpio = { @@ -77,7 +80,8 @@ in enable = mkEnableOption "Pump.io social streams server"; secret = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "my dog has fleas"; description = '' A session-generating secret, server-wide password. Warning: @@ -85,6 +89,16 @@ in ''; }; + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-secret"; + description = '' + A file containing the session-generating secret, + server-wide password. + ''; + }; + site = mkOption { type = types.str; example = "Awesome Sauce"; @@ -125,7 +139,7 @@ in hostname = mkOption { type = types.nullOr types.str; - default = null; + default = "localhost"; description = '' The hostname of the server, used for generating URLs. Defaults to "localhost" which doesn't do much for you. @@ -152,6 +166,15 @@ in ''; }; + enableUploads = mkOption { + type = types.bool; + default = true; + description = '' + If you want to disable file uploads, set this to false. Uploaded files will be stored + in ${dataDir}/uploads. + ''; + }; + sslKey = mkOption { type = types.path; example = "${dataDir}/myserver.key"; @@ -253,6 +276,15 @@ in ''; }; + dbPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-dbpassword"; + description = '' + A file containing the password corresponding to dbUser. + ''; + }; + smtpHost = mkOption { type = types.nullOr types.str; default = null; @@ -291,6 +323,17 @@ in ''; }; + smtpPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-smtppassword"; + description = '' + A file containing the password used to connect to SMTP + server. Might not be necessary for some servers. + ''; + }; + + smtpUseSSL = mkOption { type = types.bool; default = false; @@ -332,24 +375,55 @@ in stored in cleartext in the Nix store! ''; }; + spamClientSecretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-spamclientsecret"; + description = '' + A file containing the OAuth key for the spam server. + ''; + }; }; }; config = mkIf cfg.enable { + warnings = let warn = k: optional (cfg.${k} != null) + "config.services.pumpio.${k} is insecure. Use ${k}File instead."; + in concatMap warn [ "secret" "dbPassword" "smtpPassword" "spamClientSecret" ]; + + assertions = [ + { assertion = !(isNull cfg.secret && isNull cfg.secretFile); + message = "pump.io needs a secretFile configured"; + } + ]; + systemd.services."pump.io" = - { description = "pump.io social network stream server"; + { description = "Pump.io - stream server that does most of what people really want from a social network"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json"; - serviceConfig.User = if cfg.port < 1024 then "root" else user; - serviceConfig.Group = user; - }; - environment.etc."pump.io.json" = { - mode = "0440"; - gid = config.ids.gids.pumpio; - text = builtins.toJSON configOptions; + preStart = '' + mkdir -p ${dataDir}/uploads + mkdir -p ${runDir} + chown pumpio:pumpio ${dataDir}/uploads ${runDir} + chmod 770 ${dataDir}/uploads ${runDir} + + ${pkgs.nodejs}/bin/node ${configScript} < + ''; + }; tablePrefix = mkOption { default = "wp_"; description = '' @@ -253,7 +276,7 @@ in sleep 1 done ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};' - ${pkgs.mysql}/bin/mysql -e 'GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY "${config.dbPassword}";' + ${pkgs.mysql}/bin/mysql -e "GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY \"$(cat ${config.dbPasswordFile})\";" else echo "Good, no need to do anything database related." fi diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index a49838c876f9..ee32a1c86d4d 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -29,7 +29,6 @@ in agree = mkOption { default = false; - example = true; type = types.bool; description = "Agree to Let's Encrypt Subscriber Agreement"; }; @@ -37,7 +36,11 @@ in dataDir = mkOption { default = "/var/lib/caddy"; type = types.path; - description = "The data directory, for storing certificates."; + description = '' + The data directory, for storing certificates. Before 17.09, this + would create a .caddy directory. With 17.09 the contents of the + .caddy directory are in the specified data directory instead. + ''; }; package = mkOption { @@ -51,17 +54,32 @@ in config = mkIf cfg.enable { systemd.services.caddy = { description = "Caddy web server"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + environment = mkIf (versionAtLeast config.system.stateVersion "17.09") + { CADDYPATH = cfg.dataDir; }; serviceConfig = { - ExecStart = ''${cfg.package.bin}/bin/caddy -conf=${configFile} \ - -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} + ExecStart = '' + ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \ + -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Type = "simple"; User = "caddy"; Group = "caddy"; + Restart = "on-failure"; + StartLimitInterval = 86400; + StartLimitBurst = 5; AmbientCapabilities = "cap_net_bind_service"; - LimitNOFILE = 8192; + CapabilityBoundingSet = "cap_net_bind_service"; + NoNewPrivileges = true; + LimitNPROC = 64; + LimitNOFILE = 1048576; + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = "full"; + ReadWriteDirectories = cfg.dataDir; }; }; diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix index 583fe56eb5e2..d28724281a83 100644 --- a/nixos/modules/services/web-servers/jboss/default.nix +++ b/nixos/modules/services/web-servers/jboss/default.nix @@ -25,7 +25,7 @@ in enable = mkOption { default = false; - description = "Whether to enable jboss"; + description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities."; }; tempDir = mkOption { 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 000000000000..35b5edced68b --- /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 84cd0a4095d9..8c3f7b219acf 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/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index f12cc9734465..c8d9836b0b68 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -60,7 +60,8 @@ in "/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi" ) setenv.add-environment = ( - "GITWEB_CONFIG" => "${gitwebConfigFile}" + "GITWEB_CONFIG" => "${gitwebConfigFile}", + "HOME" => "${cfg.projectroot}" ) } ''; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix new file mode 100644 index 000000000000..843f0d986877 --- /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 6bc7192963d1..2310912d0fde 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) '' @@ -87,6 +88,8 @@ let server_tokens ${if cfg.serverTokens then "on" else "off"}; + ${cfg.commonHttpConfig} + ${vhosts} ${optionalString cfg.statusPage '' @@ -121,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; @@ -183,6 +190,7 @@ let ${optionalString (config.index != null) "index ${config.index};"} ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"} ${optionalString (config.root != null) "root ${config.root};"} + ${optionalString (config.alias != null) "alias ${config.alias};"} ${config.extraConfig} } '') locations); @@ -244,11 +252,13 @@ in }; package = mkOption { - default = pkgs.nginx; - defaultText = "pkgs.nginx"; + default = pkgs.nginxStable; + defaultText = "pkgs.nginxStable"; type = types.package; description = " - Nginx package to use. + Nginx package to use. This defaults to the stable version. Note + that the nginx team recommends to use the mainline version which + available in nixpkgs as nginxMainline. "; }; @@ -275,6 +285,24 @@ in ''; }; + commonHttpConfig = mkOption { + type = types.lines; + default = ""; + example = '' + resolver 127.0.0.1 valid=5s; + + log_format myformat '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; + ''; + description = '' + With nginx you must provide common http context definitions before + they are used, e.g. log_format, resolver, etc. inside of server + or location contexts. Use this attribute to set these definitions + at the appropriate location. + ''; + }; + httpConfig = mkOption { type = types.lines; default = ""; @@ -357,7 +385,7 @@ in virtualHosts = mkOption { type = types.attrsOf (types.submodule (import ./vhost-options.nix { - inherit lib; + inherit config lib; })); default = { localhost = {}; @@ -381,6 +409,13 @@ in config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test + assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ + { + assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts); + message = "Only one of nginx root or alias can be specified on a location."; + } + ]; + systemd.services.nginx = { description = "Nginx Web Server"; after = [ "network.target" ]; diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index e1885b160664..83ce0f717341 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -45,6 +45,15 @@ with lib; ''; }; + alias = mkOption { + type = types.nullOr types.path; + default = null; + example = "/your/alias/directory"; + description = '' + Alias directory for requests. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index c0ea645b3dfe..60260512bc2f 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/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index efb721c5773f..26f546022035 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -147,7 +147,6 @@ in { cfgFile = fpmCfgFile pool poolConfig; in { Slice = "phpfpm.slice"; - PrivateTmp = true; PrivateDevices = true; ProtectSystem = "full"; ProtectHome = true; diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index 61df43ec2352..5433db3b91c8 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -49,7 +49,6 @@ with lib; postStop = '' rm -rf ${cfg.stateDir} ''; - path = [ pkgs.gcc ]; serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish"; serviceConfig.Type = "forking"; }; diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 7cbca1dcddfd..56bc66b71796 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -43,7 +43,6 @@ in { enable = mkOption { type = types.bool; default = false; - example = true; description = '' Whether of not to enable Compton as the X.org composite manager. ''; @@ -52,7 +51,6 @@ in { fade = mkOption { type = types.bool; default = false; - example = true; description = '' Fade windows in and out. ''; @@ -85,7 +83,7 @@ in { "focused = 1" ]; description = '' - List of condition of windows that should have no shadow. + List of conditions of windows that should not be faded. See compton(1) man page for more examples. ''; }; @@ -93,7 +91,6 @@ in { shadow = mkOption { type = types.bool; default = false; - example = true; description = '' Draw window shadows. ''; @@ -126,7 +123,7 @@ in { "focused = 1" ]; description = '' - List of condition of windows that should have no shadow. + List of conditions of windows that should have no shadow. See compton(1) man page for more examples. ''; }; @@ -211,13 +208,13 @@ in { config = mkIf cfg.enable { systemd.user.services.compton = { description = "Compton composite manager"; - wantedBy = [ "default.target" ]; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; serviceConfig = { ExecStart = "${cfg.package}/bin/compton --config ${configFile}"; RestartSec = 3; Restart = "always"; }; - environment.DISPLAY = ":0"; }; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index af01f6acad18..c207aab5de0a 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -8,7 +8,7 @@ let cfg = xcfg.desktopManager; # If desktop manager `d' isn't capable of setting a background and - # the xserver is enabled, the `feh' program is used as a fallback. + # the xserver is enabled, `feh' or `xsetroot' are used as a fallback. needBGCond = d: ! (d ? bgSupport && d.bgSupport) && xcfg.enable; in @@ -26,6 +26,34 @@ in services.xserver.desktopManager = { + wallpaper = { + mode = mkOption { + type = types.enum [ "center" "fill" "max" "scale" "tile" ]; + default = "scale"; + example = "fill"; + description = '' + The file ~/.background-image is used as a background image. + This option specifies the placement of this image onto your desktop. + + Possible values: + center: Center the image on the background. If it is too small, it will be surrounded by a black border. + fill: Like scale, but preserves aspect ratio by zooming the image until it fits. Either a horizontal or a vertical part of the image will be cut off. + max: Like fill, but scale the image to the maximum size that fits the screen with black borders on one side. + scale: Fit the file into the background without repeating it, cutting off stuff or using borders. But the aspect ratio is not preserved either. + tile: Tile (repeat) the image in case it is too small for the screen. + ''; + }; + + combineScreens = mkOption { + type = types.bool; + default = false; + description = '' + When set to true the wallpaper will stretch across all screens. + When set to false the wallpaper is duplicated to all screens. + ''; + }; + }; + session = mkOption { internal = true; default = []; @@ -44,8 +72,11 @@ in manage = "desktop"; start = d.start + optionalString (needBGCond d) '' - if test -e $HOME/.background-image; then - ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image + if [ -e $HOME/.background-image ]; then + ${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image + else + # Use a solid black background as fallback + ${pkgs.xorg.xsetroot}/bin/xsetroot -solid black fi ''; }) list; @@ -80,6 +111,6 @@ in config = { services.xserver.displayManager.session = cfg.session.list; environment.systemPackages = - mkIf cfg.session.needBGPackages [ pkgs.feh ]; + mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable }; } diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index d908553ccdf8..b02eaf861a0d 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -20,7 +20,6 @@ in services.xserver.desktopManager.enlightenment.enable = mkOption { default = false; - example = true; description = "Enable the Enlightenment desktop environment."; }; @@ -65,7 +64,7 @@ in security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset"; environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + { source = xcfg.xkbDir; target = "X11/xkb"; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 21453d1917e8..c043884f8e0b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -35,10 +35,10 @@ let chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' + picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' [org.gnome.desktop.screensaver] - picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' + picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' ${cfg.extraGSettingsOverrides} EOF @@ -53,7 +53,6 @@ in { services.xserver.desktopManager.gnome3 = { enable = mkOption { default = false; - example = true; description = "Enable Gnome 3 desktop manager."; }; @@ -105,6 +104,7 @@ in { services.geoclue2.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; services.gnome3.evolution-data-server.enable = true; + services.gnome3.gnome-disks.enable = mkDefault true; services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-online-accounts.enable = mkDefault true; @@ -124,6 +124,7 @@ in { hardware.bluetooth.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; + systemd.packages = [ pkgs.gnome3.vino ]; # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; @@ -185,7 +186,7 @@ in { networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; inherit (gnome3) networkmanager_openvpn networkmanager_vpnc - networkmanager_openconnect networkmanager_pptp + networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp networkmanager_l2tp; }; # Needed for themes and backgrounds diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index de00ff93b17c..3ce49b9d2bf8 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -11,7 +11,6 @@ in services.xserver.desktopManager.kodi = { enable = mkOption { default = false; - example = true; description = "Enable the kodi multimedia center."; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index ed5ad4a2a001..5fe84cfb82ec 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -32,8 +32,7 @@ in environment.systemPackages = [ pkgs.fluxbox - pkgs.qt5.kwindowsystem - pkgs.qt5.oxygen-icons5 + pkgs.libsForQt5.kwindowsystem pkgs.lumina pkgs.numlockx pkgs.qt5.qtsvg diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bc6e728169b4..f099117f4777 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,7 +7,7 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg; + inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg; in @@ -30,24 +30,12 @@ in ''; }; - extraPackages = mkOption { - type = types.listOf types.package; - default = []; - description = '' - KDE packages that need to be installed system-wide. - ''; - }; - }; }; config = mkMerge [ - (mkIf (cfg.extraPackages != []) { - environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ]; - }) - (mkIf (xcfg.enable && cfg.enable) { services.xserver.desktopManager.session = singleton { name = "plasma5"; @@ -64,8 +52,8 @@ in }; security.wrappers = { - kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass"; - "start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit"; + kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass"; + "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit"; }; environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; @@ -139,10 +127,14 @@ in plasma-workspace plasma-workspace-wallpapers + dolphin dolphin-plugins ffmpegthumbs kdegraphics-thumbnailers + khelpcenter kio-extras + konsole + oxygen print-manager breeze-icons @@ -163,20 +155,10 @@ in ++ lib.optional config.services.colord.enable colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]; - services.xserver.desktopManager.plasma5.extraPackages = - with kdeApplications; with plasma5; - [ - khelpcenter - oxygen - - dolphin - konsole - ]; - environment.pathsToLink = [ "/share" ]; environment.etc = singleton { - source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + source = xcfg.xkbDir; target = "X11/xkb"; }; @@ -208,11 +190,6 @@ in services.xserver.displayManager.sddm = { theme = "breeze"; - themes = [ - pkgs.extra-cmake-modules # for the setup-hook - plasma5.plasma-workspace - pkgs.breeze-icons - ]; }; security.pam.services.kde = { allowNullPassword = true; }; @@ -225,11 +202,6 @@ in security.pam.services.sddm.enableKwallet = true; security.pam.services.slim.enableKwallet = true; - # use kimpanel as the default IBus panel - i18n.inputMethod.ibus.panel = - lib.mkDefault - "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; - }) ]; diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index eab914071410..29752ff405e2 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -13,7 +13,6 @@ in services.xserver.desktopManager.xterm.enable = mkOption { default = true; - example = false; description = "Enable a xterm terminal as a desktop manager."; }; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index e8b897fb6050..58773685ec1f 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -24,7 +24,7 @@ let Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter} Xft.hinting: ${if fontconfig.hinting.enable then "1" else "0"} Xft.autohint: ${if fontconfig.hinting.autohint then "1" else "0"} - Xft.hintstyle: hint${fontconfig.hinting.style} + Xft.hintstyle: hintslight ''; # file provided by services.xserver.displayManager.session.script @@ -32,8 +32,32 @@ let '' #! ${pkgs.bash}/bin/bash - # Handle being called by SDDM. - if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi + # Expected parameters: + # $1 = + + + # Actual parameters (FIXME): + # SDDM is calling this script like the following: + # $1 = /nix/store/xxx-xsession (= $0) + # $2 = + + # SLiM is using the following parameter: + # $1 = /nix/store/xxx-xsession + + # LightDM keeps the double quotes: + # $1 = /nix/store/xxx-xsession "+" + # The fake/auto display manager doesn't use any parameters and GDM is + # broken. + # If you want to "debug" this script don't print the parameters to stdout + # or stderr because this script will be executed multiple times and the + # output won't be visible in the log when the script is executed for the + # first time (e.g. append them to a file instead)! + + # All of the above cases are handled by the following hack (FIXME). + # Since this line is *very important* for *all display managers* it is + # very important to test changes to the following line with all display + # managers: + if [ "''${1:0:1}" = "/" ]; then eval exec "$1" "$2" ; fi + + # Now it should be safe to assume that the script was called with the + # expected parameters. ${optionalString cfg.displayManager.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then @@ -98,6 +122,9 @@ let source ~/.xprofile fi + # Start systemd user services for graphical sessions + ${config.systemd.package}/bin/systemctl --user start graphical-session.target + # Allow the user to setup a custom session type. if test -x ~/.xsession; then exec ~/.xsession @@ -107,15 +134,16 @@ let fi fi - # The session type is " + ", so - # extract those. - windowManager="''${sessionType##* + }" + # The session type is "+", so + # extract those (see: + # http://wiki.bash-hackers.org/syntax/pe#substring_removal). + windowManager="''${sessionType##*+}" : ''${windowManager:=${cfg.windowManager.default}} - desktopManager="''${sessionType% + *}" + desktopManager="''${sessionType%%+*}" : ''${desktopManager:=${cfg.desktopManager.default}} # Start the window manager. - case $windowManager in + case "$windowManager" in ${concatMapStrings (s: '' (${s.name}) ${s.start} @@ -125,7 +153,7 @@ let esac # Start the desktop manager. - case $desktopManager in + case "$desktopManager" in ${concatMapStrings (s: '' (${s.name}) ${s.start} @@ -139,9 +167,15 @@ let ''} test -n "$waitPID" && wait "$waitPID" + + ${config.systemd.package}/bin/systemctl --user stop graphical-session.target + exit 0 ''; + # Desktop Entry Specification: + # - https://standards.freedesktop.org/desktop-entry-spec/latest/ + # - https://standards.freedesktop.org/desktop-entry-spec/latest/ar01s06.html mkDesktops = names: pkgs.runCommand "desktops" { # trivial derivation preferLocalBuild = true; @@ -155,7 +189,7 @@ let Version=1.0 Type=XSession TryExec=${cfg.displayManager.session.script} - Exec=${cfg.displayManager.session.script} '${n}' + Exec=${cfg.displayManager.session.script} "${n}" X-GDM-BypassXsession=true Name=${n} Comment= @@ -238,7 +272,7 @@ in wm = filter (s: s.manage == "window") list; dm = filter (s: s.manage == "desktop") list; names = flip concatMap dm - (d: map (w: d.name + optionalString (w.name != "none") (" + " + w.name)) + (d: map (w: d.name + optionalString (w.name != "none") ("+" + w.name)) (filter (w: d.name != "none" || w.name != "none") wm)); desktops = mkDesktops names; script = xsession wm dm; @@ -297,6 +331,13 @@ in config = { services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X"; + + systemd.user.targets.graphical-session = { + unitConfig = { + RefuseManualStart = false; + StopWhenUnneeded = false; + }; + }; }; imports = [ diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index dfda90978b1e..1d5dcb2c7cbe 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -45,6 +45,7 @@ let theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} background = ${ldmcfg.background} + ${cfg.extraConfig} ''; in @@ -103,6 +104,15 @@ in }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the lightdm-gtk-greeter.conf + configuration file. + ''; + }; + }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 82b9a2fce5ab..1733f2fd39b2 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -61,7 +61,7 @@ let let dm = xcfg.desktopManager.default; wm = xcfg.windowManager.default; - in dm + optionalString (wm != "none") (" + " + wm); + in dm + optionalString (wm != "none") ("+" + wm); in { # Note: the order in which lightdm greeter modules are imported @@ -111,7 +111,7 @@ in background = mkOption { type = types.str; - default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; + default = "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png"; description = '' The background image or color to use. ''; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 6630b8257e4e..e6cc02e4d491 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,7 +9,7 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services."display-manager".environment; - sddm = pkgs.sddm.override { inherit (cfg) themes; }; + inherit (pkgs) sddm; xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh @@ -37,8 +37,8 @@ let [Theme] Current=${cfg.theme} - ThemeDir=${sddm}/share/sddm/themes - FacesDir=${sddm}/share/sddm/faces + ThemeDir=/run/current-system/sw/share/sddm/themes + FacesDir=/run/current-system/sw/share/sddm/faces [Users] MaximumUid=${toString config.ids.uids.nixbld} @@ -59,7 +59,7 @@ let [Autologin] User=${cfg.autoLogin.user} Session=${defaultSessionName}.desktop - Relogin=${if cfg.autoLogin.relogin then "true" else "false"} + Relogin=${boolToString cfg.autoLogin.relogin} ''} ${cfg.extraConfig} @@ -69,7 +69,7 @@ let let dm = xcfg.desktopManager.default; wm = xcfg.windowManager.default; - in dm + optionalString (wm != "none") (" + " + wm); + in dm + optionalString (wm != "none") ("+" + wm); in { @@ -105,14 +105,6 @@ in ''; }; - themes = mkOption { - type = types.listOf types.package; - default = []; - description = '' - Extra packages providing themes. - ''; - }; - autoNumlock = mkOption { type = types.bool; default = false; @@ -204,7 +196,15 @@ in services.xserver.displayManager.job = { logsXsession = true; - execCmd = "exec ${sddm}/bin/sddm"; + environment = { + # Load themes from system environment + QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix; + QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix; + + XDG_DATA_DIRS = "/run/current-system/sw/share"; + }; + + execCmd = "exec /run/current-system/sw/bin/sddm"; }; security.pam.services = { @@ -253,7 +253,8 @@ in users.extraGroups.sddm.gid = config.ids.gids.sddm; - services.dbus.packages = [ sddm.unwrapped ]; + environment.systemPackages = [ sddm ]; + services.dbus.packages = [ sddm ]; # To enable user switching, allow sddm to allocate TTYs/displays dynamically. services.xserver.tty = null; diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 05b979eef47f..0c4dd1973b53 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -17,6 +17,7 @@ let login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session" halt_cmd ${config.systemd.package}/sbin/shutdown -h now reboot_cmd ${config.systemd.package}/sbin/shutdown -r now + logfile /dev/stderr ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)} ${optionalString (cfg.defaultUser != null) ("focus_password yes")} ${optionalString cfg.autoLogin "auto_login yes"} @@ -128,11 +129,7 @@ in config = mkIf cfg.enable { services.xserver.displayManager.job = - { preStart = - '' - rm -f /var/log/slim.log - ''; - environment = + { environment = { SLIM_CFGFILE = slimConfig; SLIM_THEMESDIR = slimThemesDir; }; diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index b358550ba41d..d75c785270b3 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -73,7 +73,6 @@ in { clickMethod = mkOption { type = types.nullOr (types.enum [ "none" "buttonareas" "clickfinger" ]); default = null; - example = "none"; description = '' Enables a click method. Permitted values are none, buttonareas, clickfinger. @@ -85,14 +84,12 @@ in { leftHanded = mkOption { type = types.bool; default = false; - example = true; description = "Enables left-handed button orientation, i.e. swapping left and right buttons."; }; middleEmulation = mkOption { type = types.bool; default = true; - example = false; description = '' Enables middle button emulation. When enabled, pressing the left and right buttons @@ -103,7 +100,6 @@ in { naturalScrolling = mkOption { type = types.bool; default = false; - example = true; description = "Enables or disables natural scrolling behavior."; }; @@ -131,7 +127,6 @@ in { horizontalScrolling = mkOption { type = types.bool; default = true; - example = false; description = '' Disables horizontal scrolling. When disabled, this driver will discard any horizontal scroll @@ -153,7 +148,6 @@ in { tapping = mkOption { type = types.bool; default = true; - example = false; description = '' Enables or disables tap-to-click behavior. @@ -163,7 +157,6 @@ in { tappingDragLock = mkOption { type = types.bool; default = true; - example = false; description = '' Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap- @@ -175,7 +168,6 @@ in { disableWhileTyping = mkOption { type = types.bool; default = true; - example = false; description = '' Disable input method while typing. diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix index f8386b5e333b..c03bb3b494fb 100644 --- a/nixos/modules/services/x11/hardware/multitouch.nix +++ b/nixos/modules/services/x11/hardware/multitouch.nix @@ -18,20 +18,17 @@ in { enable = mkOption { default = false; - example = true; description = "Whether to enable multitouch touchpad support."; }; invertScroll = mkOption { default = false; - example = true; type = types.bool; description = "Whether to invert scrolling direction à la OSX Lion"; }; ignorePalm = mkOption { default = false; - example = true; type = types.bool; description = "Whether to ignore touches detected as being the palm (i.e when typing)"; }; @@ -39,7 +36,6 @@ in { tapButtons = mkOption { type = types.bool; default = true; - example = false; description = "Whether to enable tap buttons."; }; @@ -78,7 +74,7 @@ in { MatchIsTouchpad "on" Identifier "Touchpads" Driver "mtrack" - Option "IgnorePalm" "${if cfg.ignorePalm then "true" else "false"}" + Option "IgnorePalm" "${boolToString cfg.ignorePalm}" Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 2a7f4e5cbcd1..54454c736c1d 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -29,7 +29,6 @@ in { enable = mkOption { type = types.bool; default = false; - example = true; description = "Whether to enable touchpad support."; }; @@ -102,7 +101,6 @@ in { tapButtons = mkOption { type = types.bool; default = true; - example = false; description = "Whether to enable tap buttons."; }; @@ -125,7 +123,6 @@ in { palmDetect = mkOption { type = types.bool; default = false; - example = true; description = "Whether to enable palm detection (hardware support required)"; }; @@ -146,7 +143,6 @@ in { horizontalScroll = mkOption { type = types.bool; default = true; - example = false; description = "Whether to enable horizontal scrolling (on touchpad)"; }; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 78a97df98775..992709ed0000 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -12,7 +12,6 @@ in { enable = mkOption { type = types.bool; default = false; - example = true; description = '' Enable Redshift to change your screen's colour temperature depending on the time of day. @@ -96,7 +95,8 @@ in { config = mkIf cfg.enable { systemd.user.services.redshift = { description = "Redshift colour temperature adjuster"; - wantedBy = [ "default.target" ]; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; serviceConfig = { ExecStart = '' ${cfg.package}/bin/redshift \ @@ -108,12 +108,6 @@ in { RestartSec = 3; Restart = "always"; }; - environment = { - DISPLAY = ":${toString ( - let display = config.services.xserver.display; - in if display != null then display else 0 - )}"; - }; }; }; diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix index bd02c5ed9895..71262431b685 100644 --- a/nixos/modules/services/x11/unclutter-xfixes.nix +++ b/nixos/modules/services/x11/unclutter-xfixes.nix @@ -11,7 +11,6 @@ in { description = "Enable unclutter-xfixes to hide your mouse cursor when inactive."; type = types.bool; default = false; - example = true; }; package = mkOption { @@ -44,7 +43,8 @@ in { config = mkIf cfg.enable { systemd.user.services.unclutter-xfixes = { description = "unclutter-xfixes"; - wantedBy = [ "graphical.target" ]; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; serviceConfig.ExecStart = '' ${cfg.package}/bin/unclutter \ --timeout ${toString cfg.timeout} \ diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix index ebc195d108d0..5f16a680050d 100644 --- a/nixos/modules/services/x11/unclutter.nix +++ b/nixos/modules/services/x11/unclutter.nix @@ -11,7 +11,6 @@ in { description = "Enable unclutter to hide your mouse cursor when inactive"; type = types.bool; default = false; - example = true; }; package = mkOption { @@ -57,16 +56,17 @@ in { config = mkIf cfg.enable { systemd.user.services.unclutter = { description = "unclutter"; - wantedBy = [ "default.target" ]; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; serviceConfig.ExecStart = '' ${cfg.package}/bin/unclutter \ -idle ${toString cfg.timeout} \ - -display :${toString config.services.xserver.display} \ -jitter ${toString (cfg.threeshold - 1)} \ ${optionalString cfg.keystroke "-keystroke"} \ ${concatMapStrings (x: " -"+x) cfg.extraOptions} \ -not ${concatStringsSep " " cfg.excluded} \ ''; + serviceConfig.PassEnvironment = "DISPLAY"; serviceConfig.RestartSec = 3; serviceConfig.Restart = "always"; }; diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix index be36efaa5897..f2ce089ce19a 100644 --- a/nixos/modules/services/x11/urxvtd.nix +++ b/nixos/modules/services/x11/urxvtd.nix @@ -11,7 +11,6 @@ in { options.services.urxvtd.enable = mkOption { type = types.bool; default = false; - example = true; description = '' Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run "urxvtc". @@ -22,9 +21,8 @@ in { systemd.user = { sockets.urxvtd = { description = "socket for urxvtd, the urxvt terminal daemon"; - after = [ "graphical.target" ]; - wants = [ "graphical.target" ]; - wantedBy = [ "sockets.target" ]; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; socketConfig = { ListenStream = "%t/urxvtd-socket"; }; diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix new file mode 100644 index 000000000000..e3f5ec7dbe67 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/2bwm.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.windowManager."2bwm"; + +in + +{ + + ###### interface + + options = { + services.xserver.windowManager."2bwm".enable = mkEnableOption "2bwm"; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.xserver.windowManager.session = singleton + { name = "2bwm"; + start = + '' + ${pkgs."2bwm"}/bin/2bwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ pkgs."2bwm" ]; + + }; + +} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index f005decfa33c..32ef34bdad2b 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -8,12 +8,14 @@ in { imports = [ + ./2bwm.nix ./afterstep.nix ./bspwm.nix ./compiz.nix ./dwm.nix ./exwm.nix ./fluxbox.nix + ./fvwm.nix ./herbstluftwm.nix ./i3.nix ./jwm.nix diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index dbbd8a125d66..dc1d957c1709 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -21,7 +21,6 @@ in enable = mkEnableOption "exwm"; enableDefaultConfig = mkOption { default = true; - example = false; type = lib.types.bool; description = "Enable an uncustomised exwm configuration."; }; diff --git a/nixos/modules/services/x11/window-managers/fvwm.nix b/nixos/modules/services/x11/window-managers/fvwm.nix new file mode 100644 index 000000000000..9a51b9cd6602 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/fvwm.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.fvwm; + fvwm = pkgs.fvwm.override { gestures = cfg.gestures; }; +in + +{ + + ###### interface + + options = { + services.xserver.windowManager.fvwm = { + enable = mkEnableOption "Fvwm window manager"; + + gestures = mkOption { + default = false; + type = types.bool; + description = "Whether or not to enable libstroke for gesture support"; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton + { name = "fvwm"; + start = + '' + ${fvwm}/bin/fvwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ fvwm ]; + }; +} diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index f9c75e80db41..c9b0669e7ba5 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -36,6 +36,21 @@ in i3 package to use. ''; }; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs; [ dmenu i3status i3lock ]; + example = literalExample '' + with pkgs; [ + dmenu + i3status + i3lock + ] + ''; + description = '' + Extra packages to be installed system wide. + ''; + }; }; config = mkIf cfg.enable { @@ -50,7 +65,7 @@ in waitPID=$! ''; }]; - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages; }; imports = [ diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index 37f84f0903c3..ad3b65150b01 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -15,7 +15,7 @@ in services.xserver.windowManager.session = [{ name = "qtile"; start = '' - ${pkgs.qtile}/bin/qtile + ${pkgs.qtile}/bin/qtile & waitPID=$! ''; }]; diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 6af88d4f645b..e25a8ae22823 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -44,7 +44,6 @@ in enableContribAndExtras = mkOption { default = false; - example = true; type = lib.types.bool; description = "Enable xmonad-{contrib,extras} in Xmonad."; }; diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix new file mode 100644 index 000000000000..60ce9e6ed5c0 --- /dev/null +++ b/nixos/modules/services/x11/xautolock.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.xautolock; +in + { + options = { + services.xserver.xautolock = { + enable = mkEnableOption "xautolock"; + enableNotifier = mkEnableOption "xautolock.notify" // { + description = '' + Whether to enable the notifier feature of xautolock. + This publishes a notification before the autolock. + ''; + }; + + time = mkOption { + default = 15; + type = types.int; + + description = '' + Idle time to wait until xautolock locks the computer. + ''; + }; + + locker = mkOption { + default = "xlock"; # default according to `man xautolock` + example = "i3lock -i /path/to/img"; + type = types.string; + + description = '' + The script to use when locking the computer. + ''; + }; + + notify = mkOption { + default = 10; + type = types.int; + + description = '' + Time (in seconds) before the actual lock when the notification about the pending lock should be published. + ''; + }; + + notifier = mkOption { + default = "notify-send 'Locking in 10 seconds'"; + type = types.string; + + description = '' + Notification script to be used to warn about the pending autolock. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ xautolock ]; + + services.xserver.displayManager.sessionCommands = with builtins; with pkgs; '' + ${xautolock}/bin/xautolock \ + ${concatStringsSep " \\\n" ([ + "-time ${toString(cfg.time)}" + "-locker ${cfg.locker}" + ] ++ optional cfg.enableNotifier (concatStringsSep " " [ + "-notify ${toString(cfg.notify)}" + "-notifier \"${cfg.notifier}\"" + ]))} & + ''; + }; + } diff --git a/nixos/modules/services/x11/xbanish.nix b/nixos/modules/services/x11/xbanish.nix index e1e3cbc8e441..b95fac68f165 100644 --- a/nixos/modules/services/x11/xbanish.nix +++ b/nixos/modules/services/x11/xbanish.nix @@ -20,7 +20,8 @@ in { config = mkIf cfg.enable { systemd.user.services.xbanish = { description = "xbanish hides the mouse pointer"; - wantedBy = [ "default.target" ]; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; serviceConfig.ExecStart = '' ${pkgs.xbanish}/bin/xbanish ${cfg.arguments} ''; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 8438e6dcc702..638509e710be 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -31,18 +31,51 @@ let pkgs.xorg.fontadobe75dpi ]; + xrandrOptions = { + output = mkOption { + type = types.str; + example = "DVI-0"; + description = '' + The output name of the monitor, as shown by + xrandr + 1 + invoked without arguments. + ''; + }; + + primary = mkOption { + type = types.bool; + default = false; + description = '' + Whether this head is treated as the primary monitor, + ''; + }; + + monitorConfig = mkOption { + type = types.lines; + default = ""; + example = '' + DisplaySize 408 306 + Option "DPMS" "false" + ''; + description = '' + Extra lines to append to the Monitor section + verbatim. + ''; + }; + }; # Just enumerate all heads without discarding XRandR output information. xrandrHeads = let - mkHead = num: output: { + mkHead = num: config: { name = "multihead${toString num}"; - inherit output; + inherit config; }; - in imap mkHead cfg.xrandrHeads; + in imap1 mkHead cfg.xrandrHeads; xrandrDeviceSection = let monitors = flip map xrandrHeads (h: '' - Option "monitor-${h.output}" "${h.name}" + Option "monitor-${h.config.output}" "${h.name}" ''); # First option is indented through the space in the config but any # subsequent options aren't so we need to apply indentation to @@ -62,9 +95,13 @@ let value = '' Section "Monitor" Identifier "${current.name}" + ${optionalString (current.config.primary) '' + Option "Primary" "true" + ''} ${optionalString (previous != []) '' Option "RightOf" "${(head previous).name}" ''} + ${current.config.monitorConfig} EndSection ''; } ++ previous; @@ -258,7 +295,7 @@ in type = types.str; default = "us"; description = '' - Keyboard layout. + Keyboard layout, or multiple keyboard layouts separated by commas. ''; }; @@ -329,13 +366,39 @@ in xrandrHeads = mkOption { default = []; - example = [ "HDMI-0" "DVI-0" ]; - type = with types; listOf string; + example = [ + "HDMI-0" + { output = "DVI-0"; primary = true; } + { output = "DVI-1"; monitorConfig = "Option \"Rotate\" \"left\""; } + ]; + type = with types; listOf (coercedTo str (output: { + inherit output; + }) (submodule { options = xrandrOptions; })); + # Set primary to true for the first head if no other has been set + # primary already. + apply = heads: let + hasPrimary = any (x: x.primary) heads; + firstPrimary = head heads // { primary = true; }; + newHeads = singleton firstPrimary ++ tail heads; + in if heads != [] && !hasPrimary then newHeads else heads; description = '' - Simple multiple monitor configuration, just specify a list of XRandR - outputs which will be mapped from left to right in the order of the + Multiple monitor configuration, just specify a list of XRandR + outputs. The individual elements should be either simple strings or + an attribute set of output options. + + If the element is a string, it is denoting the physical output for a + monitor, if it's an attribute set, you must at least provide the + option. + + The monitors will be mapped from left to right in the order of the list. + By default, the first monitor will be set as the primary monitor if + none of the elements contain an option that has set + to true. + + Only one monitor is allowed to be primary. + Be careful using this option with multiple graphic adapters or with drivers that have poor support for XRandR, unexpected things might happen with those. @@ -469,11 +532,18 @@ in nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; }; - assertions = - [ { assertion = config.security.polkit.enable; - message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; - } - ]; + assertions = [ + { assertion = config.security.polkit.enable; + message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; + } + (let primaryHeads = filter (x: x.primary) cfg.xrandrHeads; in { + assertion = length primaryHeads < 2; + message = "Only one head is allowed to be primary in " + + "‘services.xserver.xrandrHeads’, but there are " + + "${toString (length primaryHeads)} heads set to primary: " + + concatMapStringsSep ", " (x: x.output) primaryHeads; + }) + ]; environment.etc = (optionals cfg.exportConfiguration @@ -578,6 +648,54 @@ in services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb"; + 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 + + touch "$out" + ''); + services.xserver.config = '' Section "ServerFlags" diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 84c23bed3e3b..e9897cc01b6a 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -53,6 +53,8 @@ let ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd + ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out + ln -s ${config.hardware.firmware}/lib/firmware $out/firmware ''} diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 59ecaf8d5a6d..d78775c27582 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -44,9 +44,10 @@ in description = '' RSA SSH private key file in the Dropbear format. - WARNING: This key is contained insecurely in the global Nix store. Do NOT - use your regular SSH host private keys for this purpose or you'll expose - them to regular users! + WARNING: Unless your bootloader supports initrd secrets, this key is + contained insecurely in the global Nix store. Do NOT use your regular + SSH host private keys for this purpose or you'll expose them to + regular users! ''; }; @@ -56,9 +57,10 @@ in description = '' DSS SSH private key file in the Dropbear format. - WARNING: This key is contained insecurely in the global Nix store. Do NOT - use your regular SSH host private keys for this purpose or you'll expose - them to regular users! + WARNING: Unless your bootloader supports initrd secrets, this key is + contained insecurely in the global Nix store. Do NOT use your regular + SSH host private keys for this purpose or you'll expose them to + regular users! ''; }; @@ -68,9 +70,10 @@ in description = '' ECDSA SSH private key file in the Dropbear format. - WARNING: This key is contained insecurely in the global Nix store. Do NOT - use your regular SSH host private keys for this purpose or you'll expose - them to regular users! + WARNING: Unless your bootloader supports initrd secrets, this key is + contained insecurely in the global Nix store. Do NOT use your regular + SSH host private keys for this purpose or you'll expose them to + regular users! ''; }; @@ -97,10 +100,6 @@ in boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib - - ${optionalString (cfg.hostRSAKey != null) "install -D ${cfg.hostRSAKey} $out/etc/dropbear/dropbear_rsa_host_key"} - ${optionalString (cfg.hostDSSKey != null) "install -D ${cfg.hostDSSKey} $out/etc/dropbear/dropbear_dss_host_key"} - ${optionalString (cfg.hostECDSAKey != null) "install -D ${cfg.hostECDSAKey} $out/etc/dropbear/dropbear_ecdsa_host_key"} ''; boot.initrd.extraUtilsCommandsTest = '' @@ -116,9 +115,6 @@ in touch /var/log/lastlog mkdir -p /etc/dropbear - ${optionalString (cfg.hostRSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key"} - ${optionalString (cfg.hostDSSKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_dss_host_key"} - ${optionalString (cfg.hostECDSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_ecdsa_host_key /etc/dropbear/dropbear_ecdsa_host_key"} mkdir -p /root/.ssh ${concatStrings (map (key: '' @@ -128,6 +124,11 @@ in dropbear -s -j -k -E -m -p ${toString cfg.port} ''; + boot.initrd.secrets = + (optionalAttrs (cfg.hostRSAKey != null) { "/etc/dropbear/dropbear_rsa_host_key" = cfg.hostRSAKey; }) // + (optionalAttrs (cfg.hostDSSKey != null) { "/etc/dropbear/dropbear_dss_host_key" = cfg.hostDSSKey; }) // + (optionalAttrs (cfg.hostECDSAKey != null) { "/etc/dropbear/dropbear_ecdsa_host_key" = cfg.hostECDSAKey; }); + }; } diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 5ab2d0775518..9056121fa7d1 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -64,11 +64,21 @@ let )) + ":" + (makeSearchPathOutput "bin" "sbin" [ pkgs.mdadm pkgs.utillinux ]); + font = if lib.last (lib.splitString "." cfg.font) == "pf2" + then cfg.font + else "${convertedFont}"; }); bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {} (concatMap (args: args.devices) cfg.mirroredBoots); + convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {} + (builtins.concatStringsSep " " + ([ "${realGrub}/bin/grub-mkfont" + cfg.font + "--output" "$out" + ] ++ (optional (cfg.fontSize!=null) "--size ${toString cfg.fontSize}"))) + ); in { @@ -239,6 +249,12 @@ in menuentry "Windows 7" { chainloader (hd0,4)+1 } + + # GRUB 2 with UEFI example, chainloading another distro + menuentry "Fedora" { + set root=(hd1,1) + chainloader /efi/fedora/grubx64.efi + } ''; description = '' Any additional entries you want added to the GRUB boot menu. @@ -270,7 +286,7 @@ in extraInitrd = mkOption { type = types.nullOr types.path; default = null; - example = "/boot/extra_initrafms.gz"; + example = "/boot/extra_initramfs.gz"; description = '' The path to a second initramfs to be supplied to the kernel. This ramfs will not be copied to the store, so that it can @@ -299,6 +315,24 @@ in ''; }; + font = mkOption { + type = types.nullOr types.path; + default = "${realGrub}/share/grub/unicode.pf2"; + description = '' + Path to a TrueType, OpenType, or pf2 font to be used by Grub. + ''; + }; + + fontSize = mkOption { + type = types.nullOr types.int; + example = literalExample 16; + default = null; + description = '' + Font size for the grub menu. Ignored unless font + is set to a ttf or otf font. + ''; + }; + gfxmodeEfi = mkOption { default = "auto"; example = "1024x768"; @@ -381,7 +415,6 @@ in efiInstallAsRemovable = mkOption { default = false; - example = true; type = types.bool; description = '' Whether to invoke grub-install with @@ -484,7 +517,7 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"); + else "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index c7559cd634a2..1edb9e0d229b 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -67,6 +67,7 @@ my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); my $bootloaderId = get("bootloaderId"); my $forceInstall = get("forceInstall"); +my $font = get("font"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -281,7 +282,7 @@ else { insmod vbe fi insmod font - if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then + if loadfont " . $grubBoot->path . "/converted-font.pf2; then insmod gfxterm if [ \"\${grub_platform}\" = \"efi\" ]; then set gfxmode=$gfxmodeEfi @@ -294,6 +295,9 @@ else { fi "; + if ($font) { + copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n"; + } if ($splashImage) { # FIXME: GRUB 1.97 doesn't resize the background image if it # doesn't match the video resolution. @@ -443,9 +447,40 @@ my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/g my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); + +# check whether to install GRUB EFI or not +sub getEfiTarget { + if ($grubVersion == 1) { + return "no" + } elsif (($grub ne "") && ($grubEfi ne "")) { + # EFI can only be installed when target is set; + # A target is also required then for non-EFI grub + if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } + else { return "both" } + } elsif (($grub ne "") && ($grubEfi eq "")) { + # TODO: It would be safer to disallow non-EFI grub installation if no taget is given. + # If no target is given, then grub auto-detects the target which can lead to errors. + # E.g. it seems as if grub would auto-detect a EFI target based on the availability + # of a EFI partition. + # However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386 + # architectures in NixOS. That would have to be fixed in the nixos modules first. + return "no" + } elsif (($grub eq "") && ($grubEfi ne "")) { + # EFI can only be installed when target is set; + if ($grubTargetEfi eq "") { die } + else {return "only" } + } else { + # prevent an installation if neither grub nor grubEfi is given + return "neither" + } +} + +my $efiTarget = getEfiTarget(); + # Append entries detected by os-prober if (get("useOSProber") eq "true") { - system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile"); + my $targetpackage = ($efiTarget eq "no") ? $grub : $grubEfi; + system(get("shell"), "-c", "pkgdatadir=$targetpackage/share/grub $targetpackage/etc/grub.d/30_os-prober >> $tmpFile"); } # Atomically switch to the new config @@ -498,36 +533,7 @@ sub getDeviceTargets { } return @devices; } - -# check whether to install GRUB EFI or not -sub getEfiTarget { - if ($grubVersion == 1) { - return "no" - } elsif (($grub ne "") && ($grubEfi ne "")) { - # EFI can only be installed when target is set; - # A target is also required then for non-EFI grub - if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } - else { return "both" } - } elsif (($grub ne "") && ($grubEfi eq "")) { - # TODO: It would be safer to disallow non-EFI grub installation if no taget is given. - # If no target is given, then grub auto-detects the target which can lead to errors. - # E.g. it seems as if grub would auto-detect a EFI target based on the availability - # of a EFI partition. - # However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386 - # architectures in NixOS. That would have to be fixed in the nixos modules first. - return "no" - } elsif (($grub eq "") && ($grubEfi ne "")) { - # EFI can only be installed when target is set; - if ($grubTargetEfi eq "") { die } - else {return "only" } - } else { - # prevent an installation if neither grub nor grubEfi is given - return "neither" - } -} - my @deviceTargets = getDeviceTargets(); -my $efiTarget = getEfiTarget(); my $prevGrubState = readGrubState(); my @prevDeviceTargets = split/,/, $prevGrubState->devices; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 04cf17c1b0b4..779005c0df52 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -1,39 +1,52 @@ -#! @python3@/bin/python3 +#! @python3@/bin/python3 -B import argparse import shutil import os +import sys import errno import subprocess import glob import tempfile import errno import warnings +import ctypes +libc = ctypes.CDLL("libc.so.6") +import re def copy_if_not_exists(source, dest): if not os.path.exists(dest): shutil.copyfile(source, dest) -def system_dir(generation): - return "/nix/var/nix/profiles/system-%d-link" % (generation) +def system_dir(profile, generation): + if profile: + return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation) + else: + return "/nix/var/nix/profiles/system-%d-link" % (generation) -BOOT_ENTRY = """title NixOS +BOOT_ENTRY = """title NixOS{profile} version Generation {generation} linux {kernel} initrd {initrd} options {kernel_params} """ -def write_loader_conf(generation): +def write_loader_conf(profile, generation): with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": f.write("timeout @timeout@\n") - f.write("default nixos-generation-%d\n" % generation) + if profile: + f.write("default nixos-%s-generation-%d\n" % (profile, generation)) + else: + f.write("default nixos-generation-%d\n" % (generation)) if not @editor@: f.write("editor 0"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") -def copy_from_profile(generation, name, dry_run=False): - store_file_path = os.readlink("%s/%s" % (system_dir(generation), name)) +def profile_path(profile, generation, name): + return os.readlink("%s/%s" % (system_dir(profile, generation), name)) + +def copy_from_profile(profile, generation, name, dry_run=False): + store_file_path = profile_path(profile, generation, name) suffix = os.path.basename(store_file_path) store_dir = os.path.basename(os.path.dirname(store_file_path)) efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix) @@ -41,17 +54,26 @@ def copy_from_profile(generation, name, dry_run=False): copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) return efi_file_path -def write_entry(generation, machine_id): - kernel = copy_from_profile(generation, "kernel") - initrd = copy_from_profile(generation, "initrd") - entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) - generation_dir = os.readlink(system_dir(generation)) +def write_entry(profile, generation, machine_id): + kernel = copy_from_profile(profile, generation, "kernel") + initrd = copy_from_profile(profile, generation, "initrd") + try: + append_initrd_secrets = profile_path(profile, generation, "append-initrd-secrets") + subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) + except FileNotFoundError: + pass + if profile: + entry_file = "@efiSysMountPoint@/loader/entries/nixos-%s-generation-%d.conf" % (profile, generation) + else: + entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) + generation_dir = os.readlink(system_dir(profile, generation)) tmp_path = "%s.tmp" % (entry_file) kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: - f.write(BOOT_ENTRY.format(generation=generation, + f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "", + generation=generation, kernel=kernel, initrd=initrd, kernel_params=kernel_params)) @@ -66,29 +88,33 @@ def mkdir_p(path): if e.errno != errno.EEXIST or not os.path.isdir(path): raise -def get_generations(profile): +def get_generations(profile=None): gen_list = subprocess.check_output([ "@nix@/bin/nix-env", "--list-generations", "-p", - "/nix/var/nix/profiles/%s" % (profile), + "/nix/var/nix/profiles/%s" % ("system-profiles/" + profile if profile else "system"), "--option", "build-users-group", ""], universal_newlines=True) gen_lines = gen_list.split('\n') gen_lines.pop() - return [ int(line.split()[0]) for line in gen_lines ] + return [ (profile, int(line.split()[0])) for line in gen_lines ] def remove_old_entries(gens): - slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-") - slice_end = -1 * len(".conf") + rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") + rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$") known_paths = [] for gen in gens: - known_paths.append(copy_from_profile(gen, "kernel", True)) - known_paths.append(copy_from_profile(gen, "initrd", True)) - for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"): + known_paths.append(copy_from_profile(*gen, "kernel", True)) + known_paths.append(copy_from_profile(*gen, "initrd", True)) + for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos*-generation-[1-9]*.conf"): try: - gen = int(path[slice_start:slice_end]) - if not gen in gens: + if rex_profile.match(path): + prof = rex_profile.sub(r"\1", path) + else: + prof = "system" + gen = int(rex_generation.sub(r"\1", path)) + if not (prof, gen) in gens: os.unlink(path) except ValueError: pass @@ -96,6 +122,14 @@ def remove_old_entries(gens): if not path in known_paths: os.unlink(path) +def get_profiles(): + if os.path.isdir("/nix/var/nix/profiles/system-profiles/"): + return [x + for x in os.listdir("/nix/var/nix/profiles/system-profiles/") + if not x.endswith("-link")] + else: + return [] + def main(): parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') @@ -130,12 +164,22 @@ def main(): mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") - gens = get_generations("system") + gens = get_generations() + for profile in get_profiles(): + gens += get_generations(profile) remove_old_entries(gens) for gen in gens: - write_entry(gen, machine_id) - if os.readlink(system_dir(gen)) == args.default_config: - write_loader_conf(gen) + write_entry(*gen, machine_id) + if os.readlink(system_dir(*gen)) == args.default_config: + write_loader_conf(*gen) + + # Since fat32 provides little recovery facilities after a crash, + # it can leave the system in an unbootable state, when a crash/outage + # happens shortly after an update. To decrease the likelihood of this + # event sync the efi filesystem after each update. + rc = libc.syncfs(os.open("@efiSysMountPoint@", os.O_RDONLY)) + if rc != 0: + print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr) if __name__ == '__main__': main() diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ec02f73cada2..a5a88a99be8f 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -65,6 +65,8 @@ in { boot.loader.grub.enable = mkDefault false; + boot.loader.supportsInitrdSecrets = true; + system = { build.installBootLoader = gummibootBuilder; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 1f412fe2d8f2..3ca679b479a0 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -6,29 +6,38 @@ let luks = config.boot.initrd.luks; openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; '' - # Wait for luksRoot to appear, e.g. if on a usb drive. - # XXX: copied and adapted from stage-1-init.sh - should be - # available as a function. - if ! test -e ${device}; then - echo -n "waiting 10 seconds for device ${device} to appear..." - for try in $(seq 10); do - sleep 1 - if test -e ${device}; then break; fi - echo -n . - done - echo "ok" - fi + + # Wait for a target (e.g. device, keyFile, header, ...) to appear. + wait_target() { + local name="$1" + local target="$2" + + if [ ! -e $target ]; then + echo -n "Waiting 10 seconds for $name $target to appear" + local success=false; + for try in $(seq 10); do + echo -n "." + sleep 1 + if [ -e $target ]; then success=true break; fi + done + if [ $success = true ]; then + echo " - success"; + else + echo " - failure"; + fi + fi + } + + # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g. + # if on a USB drive. + wait_target "device" ${device} ${optionalString (keyFile != null) '' - if ! test -e ${keyFile}; then - echo -n "waiting 10 seconds for key file ${keyFile} to appear..." - for try in $(seq 10); do - sleep 1 - if test -e ${keyFile}; then break; fi - echo -n . - done - echo "ok" - fi + wait_target "key file" ${keyFile} + ''} + + ${optionalString (header != null) '' + wait_target "header" ${header} ''} open_normally() { @@ -232,7 +241,7 @@ in description = '' The encrypted disk that should be opened before the root filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM - setups are sypported. The unencrypted devices can be accessed as + setups are supported. The unencrypted devices can be accessed as /dev/mapper/name. ''; @@ -425,7 +434,7 @@ in #!$out/bin/sh -e if [ -e /.luksopen_args ]; then cryptsetup \$(cat /.luksopen_args) - killall cryptsetup + killall -q cryptsetup else echo "Passphrase is not requested now" exit 1 @@ -434,8 +443,8 @@ in chmod +x $out/bin/cryptsetup-askpass ${optionalString luks.yubikeySupport '' - copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp - copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo + copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykchalresp + copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f96dde153610..b151b5688928 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/readonly-mountpoint.c b/nixos/modules/system/boot/readonly-mountpoint.c deleted file mode 100644 index 27b666873821..000000000000 --- a/nixos/modules/system/boot/readonly-mountpoint.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#include - -int main(int argc, char ** argv) { - struct statvfs stat; - if (argc != 2) { - fprintf(stderr, "Usage: %s PATH", argv[0]); - exit(2); - } - if (statvfs(argv[1], &stat) != 0) { - perror("statvfs"); - exit(3); - } - if (stat.f_flag & ST_RDONLY) - exit(0); - else - exit(1); -} - diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index f0699ad9832b..1f4ab3eae07e 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -8,6 +8,14 @@ export LD_LIBRARY_PATH=@extraUtils@/lib export PATH=@extraUtils@/bin ln -s @extraUtils@/bin /bin +# Copy the secrets to their needed location +if [ -d "@extraUtils@/secrets" ]; then + for secret in $(cd "@extraUtils@/secrets"; find . -type f); do + mkdir -p $(dirname "/$secret") + ln -s "@extraUtils@/secrets/$secret" "$secret" + done +fi + # Stop LVM complaining about fd3 export LVM_SUPPRESS_FD_WARNINGS=true @@ -146,6 +154,9 @@ for o in $(cat /proc/cmdline); do fi ln -s "$root" /dev/root ;; + copytoram) + copytoram=1 + ;; esac done @@ -290,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 ;; @@ -466,6 +478,22 @@ while read -u 3 mountPoint; do # doing something with $device right now. udevadm settle + # If copytoram is enabled: skip mounting the ISO and copy its content to a tmpfs. + if [ -n "$copytoram" ] && [ "$device" = /dev/root ] && [ "$mountPoint" = /iso ]; then + fsType=$(blkid -o value -s TYPE "$device") + fsSize=$(blockdev --getsize64 "$device") + + mkdir -p /tmp-iso + mount -t "$fsType" /dev/root /tmp-iso + mountFS tmpfs /iso size="$fsSize" tmpfs + + cp -r /tmp-iso/* /mnt-root/iso/ + + umount /tmp-iso + rmdir /tmp-iso + continue + fi + mountFS "$device" "$mountPoint" "$options" "$fsType" done diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 61def24efd88..02870878c0f3 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -82,6 +82,17 @@ let copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs ''} + # Copy secrets if needed. + ${optionalString (!config.boot.loader.supportsInitrdSecrets) + (concatStringsSep "\n" (mapAttrsToList (dest: source: + let source' = if source == null then dest else source; in + '' + mkdir -p $(dirname "$out/secrets/${dest}") + cp -a ${source'} "$out/secrets/${dest}" + '' + ) config.boot.initrd.secrets)) + } + ${config.boot.initrd.extraUtilsCommands} # Copy ld manually since it isn't detected correctly @@ -124,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" @@ -156,7 +167,7 @@ let --replace /sbin/blkid ${extraUtils}/bin/blkid \ --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \ --replace /sbin/mdadm ${extraUtils}/bin/mdadm \ - --replace /bin/sh ${extraUtils}/bin/sh \ + --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \ --replace /usr/bin/readlink ${extraUtils}/bin/readlink \ --replace /usr/bin/basename ${extraUtils}/bin/basename \ --replace ${udev}/bin/udevadm ${extraUtils}/bin/udevadm @@ -242,6 +253,52 @@ let ]; }; + # Script to add secret files to the initrd at bootloader update time + initialRamdiskSecretAppender = + pkgs.writeScriptBin "append-initrd-secrets" + '' + #!${pkgs.bash}/bin/bash -e + function usage { + echo "USAGE: $0 INITRD_FILE" >&2 + echo "Appends this configuration's secrets to INITRD_FILE" >&2 + } + + if [ $# -ne 1 ]; then + usage + exit 1 + fi + + if [ "$1"x = "--helpx" ]; then + usage + exit 0 + fi + + ${lib.optionalString (config.boot.initrd.secrets == {}) + "exit 0"} + + export PATH=${pkgs.coreutils}/bin:${pkgs.cpio}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin + + function cleanup { + if [ -n "$tmp" -a -d "$tmp" ]; then + rm -fR "$tmp" + fi + } + trap cleanup EXIT + + tmp=$(mktemp -d initrd-secrets.XXXXXXXXXX) + + ${lib.concatStringsSep "\n" (mapAttrsToList (dest: source: + let source' = if source == null then dest else toString source; in + '' + mkdir -p $(dirname "$tmp/${dest}") + cp -a ${source'} "$tmp/${dest}" + '' + ) config.boot.initrd.secrets) + } + + (cd "$tmp" && find . | cpio -H newc -o) | gzip >>"$1" + ''; + in { @@ -370,6 +427,25 @@ in example = "xz"; }; + boot.initrd.secrets = mkOption + { internal = true; + default = {}; + type = types.attrsOf (types.nullOr types.path); + description = + '' + Secrets to append to the initrd. The attribute name is the + path the secret should have inside the initrd, the value + is the path it should be copied from (or null for the same + path inside and out). + ''; + example = literalExample + '' + { "/etc/dropbear/dropbear_rsa_host_key" = + ./secret-dropbear-key; + } + ''; + }; + boot.initrd.supportedFilesystems = mkOption { default = [ ]; example = [ "btrfs" ]; @@ -377,6 +453,18 @@ in description = "Names of supported filesystem types in the initial ramdisk."; }; + boot.loader.supportsInitrdSecrets = mkOption + { internal = true; + default = false; + type = types.bool; + description = + '' + Whether the bootloader setup runs append-initrd-secrets. + If not, any needed secrets must be copied into the initrd + and thus added to the store. + ''; + }; + fileSystems = mkOption { options.neededForBoot = mkOption { default = false; @@ -404,9 +492,8 @@ in } ]; - system.build.bootStage1 = bootStage1; - system.build.initialRamdisk = initialRamdisk; - system.build.extraUtils = extraUtils; + system.build = + { inherit bootStage1 initialRamdisk initialRamdiskSecretAppender extraUtils; }; system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "TMPFS") diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index f827e530f877..46aed44bf10f 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -2,7 +2,22 @@ systemConfig=@systemConfig@ -export HOME=/root +export HOME=/root PATH="@path@" + + +# Process the kernel command line. +for o in $(>>\e[0m" echo -# Set the PATH. -setPath() { - local dirs="$1" - export PATH=/empty - for i in $dirs; do - PATH=$PATH:$i/bin - if test -e $i/sbin; then - PATH=$PATH:$i/sbin - fi - done -} - -setPath "@path@" - - # Normally, stage 1 mounts the root filesystem read/writable. # However, in some environments, stage 2 is executed directly, and the # root is read-only. So make it writable here. @@ -61,7 +61,9 @@ echo "booting system configuration $systemConfig" > /dev/kmsg chown -f 0:30000 /nix/store chmod -f 1775 /nix/store if [ -n "@readOnlyStore@" ]; then - if ! readonly-mountpoint /nix/store; then + if ! [[ "$(findmnt --noheadings --output OPTIONS /nix/store)" =~ ro(,|$) ]]; then + # FIXME when linux < 4.5 is EOL, switch to atomic bind mounts + #mount /nix/store /nix/store -o bind,remount,ro mount --bind /nix/store /nix/store mount -o remount,ro,bind /nix/store fi @@ -75,31 +77,12 @@ rm -f /etc/mtab* # not that we care about stale locks ln -s /proc/mounts /etc/mtab -# Process the kernel command line. -for o in $(cat /proc/cmdline); do - case $o in - boot.debugtrace) - # Show each command. - set -x - ;; - resume=*) - set -- $(IFS==; echo $o) - resumeDevice=$2 - ;; - esac -done - - # More special file systems, initialise required directories. [ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default mkdir -m 01777 -p /tmp -mkdir -m 0755 -p /var /var/log /var/lib /var/db -mkdir -m 0755 -p /nix/var -mkdir -m 0700 -p /root -chmod 0700 /root -mkdir -m 0755 -p /bin # for the /bin/sh symlink -mkdir -m 0755 -p /home -mkdir -m 0755 -p /etc/nixos +mkdir -m 0755 -p /var/{log,lib,db} /nix/var /etc/nixos/ \ + /run/lock /home /bin # for the /bin/sh symlink +install -m 0700 -d /root # Miscellaneous boot time cleanup. @@ -111,9 +94,6 @@ rm -f /etc/{group,passwd,shadow}.lock rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots -mkdir -m 0755 -p /run/lock - - # For backwards compatibility, symlink /var/run to /run, and /var/lock # to /run/lock. ln -s /run /var/run @@ -127,8 +107,8 @@ fi # Use /etc/resolv.conf supplied by systemd-nspawn, if applicable. -if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then - cat /etc/resolv.conf | resolvconf -m 1000 -a host +if [ -n "@useHostResolvConf@" ] && [ -e /etc/resolv.conf ]; then + resolvconf -m 1000 -a host systemd.time - 5. This is equivalent + 7. This is equivalent to adding a corresponding timer unit with set to the value given here. ''; @@ -375,9 +375,9 @@ in rec { Each attribute in this set specifies an option in the [Timer] section of the unit. See systemd.timer - 5 and + 7 and systemd.time - 5 for details. + 7 for details. ''; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index bff6739db616..46761fdc0e92 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -396,6 +396,11 @@ let ''; }; + logindHandlerType = types.enum [ + "ignore" "poweroff" "reboot" "halt" "kexec" "suspend" + "hibernate" "hybrid-sleep" "lock" + ]; + in { @@ -595,6 +600,27 @@ in ''; }; + services.logind.lidSwitch = mkOption { + default = "suspend"; + example = "ignore"; + type = logindHandlerType; + + description = '' + Specifies what to be done when the laptop lid is closed. + ''; + }; + + services.logind.lidSwitchDocked = mkOption { + default = "ignore"; + example = "suspend"; + type = logindHandlerType; + + description = '' + Specifies what to be done when the laptop lid is closed + and another screen is added. + ''; + }; + systemd.user.extraConfig = mkOption { default = ""; type = types.lines; @@ -633,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 { @@ -657,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; @@ -721,6 +759,8 @@ in "systemd/logind.conf".text = '' [Login] KillUserProcesses=no + HandleLidSwitch=${config.services.logind.lidSwitch} + HandleLidSwitchDocked=${config.services.logind.lidSwitchDocked} ${config.services.logind.extraConfig} ''; @@ -771,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) @@ -785,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; @@ -829,7 +871,8 @@ in # Some overrides to upstream units. systemd.services."systemd-backlight@".restartIfChanged = false; - systemd.services."systemd-rfkill@".restartIfChanged = false; + systemd.services."systemd-fsck@".restartIfChanged = false; + systemd.services."systemd-fsck@".path = [ config.system.path ]; systemd.services."user@".restartIfChanged = false; systemd.services.systemd-journal-flush.restartIfChanged = false; systemd.services.systemd-random-seed.restartIfChanged = false; diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index f988ec02af72..3bfdf89e0cf5 100644 --- a/nixos/modules/tasks/bcache.nix +++ b/nixos/modules/tasks/bcache.nix @@ -4,6 +4,8 @@ environment.systemPackages = [ pkgs.bcache-tools ]; + services.udev.packages = [ pkgs.bcache-tools ]; + boot.initrd.extraUdevRulesCommands = '' cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/ ''; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 9f30eb611466..3951d617f6f1 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -221,7 +221,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; + fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; in '' # This is a generated file. Do not edit! diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index c8fa6c21a4f6..2de3a3d8a330 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -109,7 +109,6 @@ in forceImportRoot = mkOption { type = types.bool; default = true; - example = false; description = '' Forcibly import the ZFS root pool(s) during early boot. @@ -128,7 +127,6 @@ in forceImportAll = mkOption { type = types.bool; default = true; - example = false; description = '' Forcibly import all ZFS pool(s). @@ -236,7 +234,7 @@ in description = '' Systemd calendar expression when to scrub ZFS pools. See systemd.time - 5. + 7. ''; }; @@ -372,7 +370,7 @@ in in listToAttrs (map createImportService dataPools ++ map createSyncService allPools) // { "zfs-mount" = { after = [ "systemd-modules-load.service" ]; }; "zfs-share" = { after = [ "systemd-modules-load.service" ]; }; - "zed" = { after = [ "systemd-modules-load.service" ]; }; + "zfs-zed" = { after = [ "systemd-modules-load.service" ]; }; }; systemd.targets."zfs-import" = diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 3571e00d04ec..f6f104ce7a68 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -120,7 +120,7 @@ let optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway.interface != null) - "dev ${cfg.defaultGateway.interface}"} || true + "dev ${cfg.defaultGateway.interface}"} proto static || true ''} ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). @@ -130,7 +130,7 @@ let optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway6.interface != null) - "dev ${cfg.defaultGateway6.interface}"} || true + "dev ${cfg.defaultGateway6.interface}"} proto static || true ''} ''; }; @@ -159,35 +159,42 @@ let after = [ "network-pre.target" ] ++ (deviceDependency i.name); serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; + # Restart rather than stop+start this unit to prevent the + # network from dying during switch-to-configuration. + stopIfChanged = false; path = [ pkgs.iproute ]; script = '' + # FIXME: shouldn't this be done in network-link? echo "bringing up interface..." ip link set "${i.name}" up - restart_network_interfaces=false + state="/run/nixos/network/addresses/${i.name}" + + mkdir -p $(dirname "$state") + '' + flip concatMapStrings (ips) (ip: let address = "${ip.address}/${toString ip.prefixLength}"; in '' - echo "checking ip ${address}..." + echo "${address}" >> $state if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then - echo "added ip ${address}..." + echo "added ip ${address}" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then echo "failed to add ${address}" exit 1 fi ''); - preStop = flip concatMapStrings (ips) (ip: - let - address = "${ip.address}/${toString ip.prefixLength}"; - in - '' - echo -n "deleting ${address}..." - ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" - echo "" - ''); + preStop = '' + state="/run/nixos/network/addresses/${i.name}" + while read address; do + echo -n "deleting $address..." + ip addr del "$address" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" + echo "" + done < "$state" + rm -f "$state" + ''; }; createTunDevice = i: nameValuePair "${i.name}-netdev" @@ -239,6 +246,10 @@ let ip link set "${i}" master "${n}" ip link set "${i}" up '')} + # Save list of enslaved interfaces + echo "${flip concatMapStrings v.interfaces (i: '' + ${i} + '')}" > /run/${n}.interfaces # Enable stp on the interface ${optionalString v.rstp '' @@ -250,7 +261,28 @@ let postStop = '' ip link set "${n}" down || true ip link del "${n}" || true + rm -f /run/${n}.interfaces ''; + reload = '' + # Un-enslave child interfaces (old list of interfaces) + for interface in `cat /run/${n}.interfaces`; do + ip link set "$interface" nomaster up + done + + # Enslave child interfaces (new list of interfaces) + ${flip concatMapStrings v.interfaces (i: '' + ip link set "${i}" master "${n}" + ip link set "${i}" up + '')} + # Save list of enslaved interfaces + echo "${flip concatMapStrings v.interfaces (i: '' + ${i} + '')}" > /run/${n}.interfaces + + # (Un-)set stp on the bridge + echo ${if v.rstp then "2" else "0"} > /sys/class/net/${n}/bridge/stp_state + ''; + reloadIfChanged = true; }); createVswitchDevice = n: v: nameValuePair "${n}-netdev" diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8b85ff0057f9..a365a01bfb1e 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -59,15 +59,16 @@ in systemd.network = let domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain); - genericNetwork = override: { - DHCP = override (dhcpStr cfg.useDHCP); - } // optionalAttrs (cfg.defaultGateway != null) { - gateway = override [ cfg.defaultGateway.address ]; - } // optionalAttrs (cfg.defaultGateway6 != null) { - gateway = override [ cfg.defaultGateway6.address ]; - } // optionalAttrs (domains != [ ]) { - domains = override domains; - }; + genericNetwork = override: + let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address + ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address; + in { + DHCP = override (dhcpStr cfg.useDHCP); + } // optionalAttrs (gateway != [ ]) { + gateway = override gateway; + } // optionalAttrs (domains != [ ]) { + domains = override domains; + }; in mkMerge [ { enable = true; networks."99-main" = genericNetwork mkDefault; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 6467259766ea..8ce7b2d2cf36 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -548,7 +548,6 @@ in }; rstp = mkOption { - example = true; default = false; type = types.bool; description = "Whether the bridge interface should enable rstp."; @@ -1111,7 +1110,7 @@ in ''; # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface. - newInterfaceScript = new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" '' + newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" '' #!${pkgs.stdenv.shell} # Configure the new interface ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type} @@ -1133,7 +1132,7 @@ in # It is important to have that rule first as overwriting the NAME attribute also prevents the # next rules from matching. ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface: - ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript interface}"'')} + ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')} # Add the required, new WLAN interfaces to the default WLAN interface with the # persistent, default name as assigned by udev. diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix new file mode 100644 index 000000000000..0ec4974789b4 --- /dev/null +++ b/nixos/modules/tasks/powertop.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.powerManagement.powertop; +in { + ###### interface + + options.powerManagement.powertop.enable = mkEnableOption "powertop auto tuning on startup"; + + ###### implementation + + config = mkIf (cfg.enable) { + systemd.services = { + powertop = { + wantedBy = [ "multi-user.target" ]; + description = "Powertop tunings"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = "${pkgs.powertop}/bin/powertop --auto-tune"; + }; + }; + }; + }; +} diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 32e69dd2bf58..1f8f2891e98c 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -81,7 +81,7 @@ with lib; services.xserver.inputClassSections = ['' Identifier "Trackpoint Wheel Emulation" - MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}" + MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "ETPS/2 Elantech TrackPoint|Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}" MatchDevicePath "/dev/input/event*" Option "EmulateWheel" "true" Option "EmulateWheelButton" "2" diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 80e481d79b9e..3e47710361a8 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -15,6 +15,12 @@ let cfg = config.ec2; in config = { + assertions = [ + { assertion = cfg.hvm; + message = "Paravirtualized EC2 instances are no longer supported."; + } + ]; + virtualisation.growPartition = cfg.hvm; fileSystems."/" = { diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 34a50dcab16f..349fd3adfc96 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -3,7 +3,7 @@ options = { ec2 = { hvm = lib.mkOption { - default = false; + default = lib.versionAtLeast config.system.stateVersion "17.03"; internal = true; description = '' Whether the EC2 instance is a HVM instance. @@ -11,6 +11,4 @@ }; }; }; - - config = {}; } diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 33f84986cac6..cb756842f369 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -2,93 +2,19 @@ with lib; let - diskSize = "30720"; + diskSize = 30720; in { - system.build.azureImage = - pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "azure-image" - { preVM = - '' - mkdir $out - diskImage=$out/$diskImageBase - - cyl=$(((${diskSize}*1024*1024)/(512*63*255))) - size=$(($cyl*255*63*512)) - roundedsize=$((($size/(1024*1024)+1)*(1024*1024))) - ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize - mv closure xchg/ - ''; - - postVM = - '' - mkdir -p $out - ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd - rm $diskImage - ''; - diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; - buildInputs = [ pkgs.utillinux pkgs.perl ]; - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - } - '' - # Create partition table - ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}M - ${pkgs.parted}/sbin/parted /dev/vda print - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 - - mkdir /mnt - mount /dev/vda1 /mnt - - # The initrd expects these directories to exist. - mkdir /mnt/dev /mnt/proc /mnt/sys - - mount --bind /proc /mnt/proc - mount --bind /dev /mnt/dev - mount --bind /sys /mnt/sys - - # Copy all paths in the closure to the filesystem. - storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) - - mkdir -p /mnt/nix/store - echo "copying everything (will take a while)..." - cp -prd $storePaths /mnt/nix/store/ - - echo Register the paths in the Nix database. - printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" - - echo Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package.out}/bin/nix-env \ - -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} --option build-users-group "" - - echo nixos-rebuild requires an /etc/NIXOS. - mkdir -p /mnt/etc - touch /mnt/etc/NIXOS - - echo switch-to-configuration requires a /bin/sh - mkdir -p /mnt/bin - ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh - - echo Install a configuration.nix. - mkdir -p /mnt/etc/nixos /mnt/boot/grub - cp ${./azure-config-user.nix} /mnt/etc/nixos/configuration.nix - - echo Generate the GRUB menu. - ln -s vda /dev/sda - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - - echo Almost done - umount /mnt/proc /mnt/dev /mnt/sys - umount /mnt - '' - ); + system.build.azureImage = import ../../lib/make-disk-image.nix { + name = "azure-image"; + postVM = '' + ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd + ''; + configFile = ./azure-config-user.nix; + format = "raw"; + inherit diskSize; + inherit config lib pkgs; + }; imports = [ ./azure-common.nix ]; diff --git a/nixos/modules/virtualisation/azure-images.nix b/nixos/modules/virtualisation/azure-images.nix new file mode 100644 index 000000000000..22c82fc14f65 --- /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/containers.nix b/nixos/modules/virtualisation/containers.nix index f79854967f1d..6adb2c1681a2 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -274,7 +274,6 @@ let }; isReadOnly = mkOption { default = true; - example = true; type = types.bool; description = "Determine whether the mounted path will be accessed in read-only mode."; }; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 4b30a38f832f..5a8a0e27436f 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -7,8 +7,7 @@ with lib; let cfg = config.virtualisation.docker; - pro = config.networking.proxy.default; - proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; }; + proxy_env = config.networking.proxy.envVars; in @@ -95,6 +94,38 @@ 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 + as specified by the dates option. + ''; + }; + + 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 @@ -106,6 +137,7 @@ in systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; + environment = proxy_env; serviceConfig = { ExecStart = [ "" @@ -122,11 +154,37 @@ in "" "${pkgs.procps}/bin/kill -s HUP $MAINPID" ]; - } // proxy_env; + }; path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); }; - systemd.sockets.docker.socketConfig.ListenStream = cfg.listenOptions; + + systemd.sockets.docker = { + description = "Docker Socket for the API"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = cfg.listenOptions; + SocketMode = "0660"; + SocketUser = "root"; + 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/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index d592a23c303f..745518f85972 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -193,5 +193,35 @@ let self = { "16.09".us-west-2.pv-ebs = "ami-6d4af60d"; "16.09".us-west-2.pv-s3 = "ami-de48f4be"; - latest = self."16.09"; + # 17.03.885.6024dd4067 + "17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc"; + "17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b"; + "17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab"; + "17.03".ap-northeast-2.hvm-s3 = "ami-0b944665"; + "17.03".ap-south-1.hvm-ebs = "ami-4f413220"; + "17.03".ap-south-1.hvm-s3 = "ami-864033e9"; + "17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383"; + "17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1"; + "17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f"; + "17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e"; + "17.03".ca-central-1.hvm-ebs = "ami-9b00bdff"; + "17.03".ca-central-1.hvm-s3 = "ami-e800bd8c"; + "17.03".eu-central-1.hvm-ebs = "ami-5450803b"; + "17.03".eu-central-1.hvm-s3 = "ami-6e2efe01"; + "17.03".eu-west-1.hvm-ebs = "ami-10754c76"; + "17.03".eu-west-1.hvm-s3 = "ami-11734a77"; + "17.03".eu-west-2.hvm-ebs = "ami-ff1d099b"; + "17.03".eu-west-2.hvm-s3 = "ami-fe1d099a"; + "17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5"; + "17.03".sa-east-1.hvm-s3 = "ami-fca2c190"; + "17.03".us-east-1.hvm-ebs = "ami-0940c61f"; + "17.03".us-east-1.hvm-s3 = "ami-674fc971"; + "17.03".us-east-2.hvm-ebs = "ami-afc2e6ca"; + "17.03".us-east-2.hvm-s3 = "ami-a1cde9c4"; + "17.03".us-west-1.hvm-ebs = "ami-587b2138"; + "17.03".us-west-1.hvm-s3 = "ami-70411b10"; + "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; + "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; + + latest = self."17.03"; }; in self diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix new file mode 100644 index 000000000000..8a9bda1b60c2 --- /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 556454c6b5f8..4a8dadaa281d 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -2,99 +2,32 @@ with lib; let - diskSize = "100G"; + diskSize = 1024; # MB + gce = pkgs.google-compute-engine; in { - imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; + 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 = '' + PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} + pushd $out + mv $diskImage disk.raw + tar -Szcf nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw.tar.gz disk.raw + rm $out/disk.raw + popd + ''; + configFile = ; + format = "raw"; + inherit diskSize; + inherit config lib pkgs; + }; - system.build.googleComputeImage = - pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "google-compute-image" - { preVM = - '' - mkdir $out - diskImage=$out/$diskImageBase - truncate $diskImage --size ${diskSize} - mv closure xchg/ - ''; - - postVM = - '' - PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} - pushd $out - mv $diskImageBase disk.raw - tar -Szcf $diskImageBase.tar.gz disk.raw - rm $out/disk.raw - popd - ''; - diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; - buildInputs = [ pkgs.utillinux pkgs.perl ]; - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - } - '' - # Create partition table - ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize} - ${pkgs.parted}/sbin/parted /dev/vda print - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 - - mkdir /mnt - mount /dev/vda1 /mnt - - # The initrd expects these directories to exist. - mkdir /mnt/dev /mnt/proc /mnt/sys - - mount --bind /proc /mnt/proc - mount --bind /dev /mnt/dev - mount --bind /sys /mnt/sys - - # Copy all paths in the closure to the filesystem. - storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) - - mkdir -p /mnt/nix/store - echo "copying everything (will take a while)..." - cp -prd $storePaths /mnt/nix/store/ - - # Register the paths in the Nix database. - printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" - - # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package.out}/bin/nix-env \ - -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \ - --option build-users-group "" - - # `nixos-rebuild' requires an /etc/NIXOS. - mkdir -p /mnt/etc - touch /mnt/etc/NIXOS - - # `switch-to-configuration' requires a /bin/sh - mkdir -p /mnt/bin - ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh - - # Install a configuration.nix. - mkdir -p /mnt/etc/nixos /mnt/boot/grub - cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix - - # Generate the GRUB menu. - ln -s vda /dev/sda - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - - umount /mnt/proc /mnt/dev /mnt/sys - umount /mnt - '' - ); - - fileSystems."/".label = "nixos"; + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + }; boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "virtio_scsi" ]; @@ -114,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 @@ -129,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"; @@ -143,51 +208,34 @@ in # When dealing with cryptographic keys, we want to keep things private. umask 077 # Don't download the SSH key if it has already been downloaded - if ! [ -s /root/.ssh/authorized_keys ]; then - echo "obtaining SSH key..." - mkdir -m 0700 -p /root/.ssh - AUTH_KEYS=$(${mktemp}) - ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys - if [ -s $AUTH_KEYS ]; then - KEY_PUB=$(${mktemp}) - cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB - if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then - cat $KEY_PUB >> /root/.ssh/authorized_keys - echo "New key added to authorized_keys." - fi - chmod 600 /root/.ssh/authorized_keys - rm -f $KEY_PUB - else - echo "Downloading http://metadata.google.internal/0.1/meta-data/authorized-keys failed." - false - fi - rm -f $AUTH_KEYS - fi + echo "Obtaining SSH keys..." + mkdir -m 0700 -p /root/.ssh + AUTH_KEYS=$(${mktemp}) + ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/project/attributes/sshKeys + if [ -s $AUTH_KEYS ]; then - countKeys=0 - ${flip concatMapStrings config.services.openssh.hostKeys (k : - let kName = baseNameOf k.path; in '' - PRIV_KEY=$(${mktemp}) - echo "trying to obtain SSH private host key ${kName}" - ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : - if [ $? -eq 0 -a -s $PRIV_KEY ]; then - countKeys=$((countKeys+1)) - mv -f $PRIV_KEY ${k.path} - echo "Downloaded ${k.path}" - chmod 600 ${k.path} - ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub - chmod 644 ${k.path}.pub - else - echo "Downloading http://metadata.google.internal/0.1/meta-data/attributes/${kName} failed." + # Read in key one by one, split in case Google decided + # to append metadata (it does sometimes) and add to + # authorized_keys if not already present. + touch /root/.ssh/authorized_keys + NEW_KEYS=$(${mktemp}) + # Yes this is a nix escape of two single quotes. + while IFS=''' read -r line || [[ -n "$line" ]]; do + keyLine=$(echo -n "$line" | cut -d ':' -f2) + IFS=' ' read -r -a array <<< "$keyLine" + if [ ''${#array[@]} -ge 3 ]; then + echo ''${array[@]:0:3} >> $NEW_KEYS + echo "Added ''${array[@]:2} to authorized_keys" fi - rm -f $PRIV_KEY - '' - )} - - if [[ $countKeys -le 0 ]]; then - echo "failed to obtain any SSH private host keys." - false + done < $AUTH_KEYS + mv $NEW_KEYS /root/.ssh/authorized_keys + chmod 600 /root/.ssh/authorized_keys + rm -f $KEY_PUB + else + echo "Downloading http://metadata.google.internal/computeMetadata/v1/project/attributes/sshKeys failed." + false fi + rm -f $AUTH_KEYS ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; @@ -195,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 @@ -251,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"; @@ -261,7 +318,7 @@ in "kernel.kptr_restrict" = mkDefault "1"; # set ptrace protections - "kernel.yama.ptrace_scope" = mkDefault "1"; + "kernel.yama.ptrace_scope" = mkOverride 500 "1"; # set perf only available to root "kernel.perf_event_paranoid" = mkDefault "2"; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 101ea9a4f51b..b24ea0f33c9e 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -14,6 +14,9 @@ let ${cfg.extraConfig} ''; qemuConfigFile = pkgs.writeText "qemu.conf" '' + ${optionalString cfg.qemuOvmf '' + nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"] + ''} ${cfg.qemuVerbatimConfig} ''; @@ -63,6 +66,15 @@ in { ''; }; + virtualisation.libvirtd.qemuOvmf = mkOption { + type = types.bool; + default = true; + description = '' + Allows libvirtd to take advantage of OVMF when creating new + QEMU VMs with UEFI boot. + ''; + }; + virtualisation.libvirtd.extraOptions = mkOption { type = types.listOf types.str; default = [ ]; @@ -90,14 +102,16 @@ in { config = mkIf cfg.enable { - environment.systemPackages = - [ pkgs.libvirt pkgs.netcat-openbsd ] - ++ optional cfg.enableKVM pkgs.qemu_kvm; + environment.systemPackages = with pkgs; + [ libvirt netcat-openbsd ] + ++ optional cfg.enableKVM qemu_kvm; boot.kernelModules = [ "tun" ]; users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd; + systemd.packages = [ pkgs.libvirt ]; + systemd.services.libvirtd = { description = "Libvirt Virtual Machine Management Daemon"; @@ -105,13 +119,17 @@ in { after = [ "systemd-udev-settle.service" ] ++ optional vswitch.enable "vswitchd.service"; - path = [ - pkgs.bridge-utils - pkgs.dmidecode - pkgs.dnsmasq - pkgs.ebtables + environment = { + LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; + }; + + path = with pkgs; [ + bridge-utils + dmidecode + dnsmasq + ebtables ] - ++ optional cfg.enableKVM pkgs.qemu_kvm + ++ optional cfg.enableKVM qemu_kvm ++ optional vswitch.enable vswitch.package; preStart = '' @@ -144,22 +162,29 @@ 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 ''; # */ serviceConfig = { - ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; Type = "notify"; KillMode = "process"; # when stopping, leave the VMs alone Restart = "on-failure"; }; }; + systemd.services.libvirt-guests = { + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ coreutils libvirt gawk ]; + }; + systemd.sockets.virtlogd = { description = "Virtual machine log manager socket"; wantedBy = [ "sockets.target" ]; diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 6759ff0f2fe9..2310fe984325 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -71,6 +71,7 @@ in environment.etc."lxc/lxc.conf".text = cfg.systemConfig; environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig; environment.etc."lxc/default.conf".text = cfg.defaultConfig; + systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; security.apparmor.packages = [ pkgs.lxc ]; security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ]; diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 9d76b890872a..b1ff0337994e 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -45,7 +45,7 @@ in after = [ "systemd-udev-settle.service" ]; # TODO(wkennington): Add lvm2 and thin-provisioning-tools - path = with pkgs; [ acl rsync gnutar xz btrfs-progs ]; + path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ]; serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; serviceConfig.Type = "simple"; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 1933f11d1fff..a17e2c9ca471 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -75,6 +75,7 @@ let exec ${qemu}/bin/qemu-kvm \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ + -smp ${toString config.virtualisation.cores} \ ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ @@ -125,7 +126,7 @@ let bootFlash=$out/bios.bin ${qemu}/bin/qemu-img create -f qcow2 $diskImage "40M" ${if cfg.useEFIBoot then '' - cp ${pkgs.OVMF-CSM}/FV/OVMF.fd $bootFlash + cp ${pkgs.OVMF-CSM.fd}/FV/OVMF.fd $bootFlash chmod 0644 $bootFlash '' else '' ''} @@ -244,6 +245,18 @@ in ''; }; + virtualisation.cores = + mkOption { + default = 1; + type = types.int; + description = + '' + Specify the number of cores the guest is permitted to use. + The number can be higher than the available cores on the + host system. + ''; + }; + virtualisation.pathsInNixDB = mkOption { default = []; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index c4c5cb3380e8..98be4f680c3a 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -22,7 +22,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the garbage collector will run. ''; }; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 57487f704519..5239652d4075 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -29,7 +29,6 @@ in virtualisation.xen.package = mkOption { type = types.package; - default = pkgs.xen; defaultText = "pkgs.xen"; example = literalExample "pkgs.xen-light"; description = '' @@ -39,7 +38,6 @@ in virtualisation.xen.qemu = mkOption { type = types.path; - default = "${pkgs.xen}/lib/xen/bin/qemu-system-i386"; defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386"; example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386"; description = '' @@ -49,7 +47,6 @@ in virtualisation.xen.qemu-package = mkOption { type = types.package; - default = pkgs.xen; defaultText = "pkgs.xen"; example = literalExample "pkgs.qemu_xen-light"; description = '' @@ -103,6 +100,16 @@ in subnet. ''; }; + + forwardDns = mkOption { + default = false; + description = '' + If set to true, the DNS queries from the + hosts connected to the bridge will be forwarded to the DNS + servers specified in /etc/resolv.conf . + ''; + }; + }; virtualisation.xen.stored = @@ -114,6 +121,19 @@ in ''; }; + virtualisation.xen.domains = { + extraConfig = mkOption { + type = types.string; + default = ""; + description = + '' + Options defined here will override the defaults for xendomains. + The default options can be seen in the file included from + /etc/default/xendomains. + ''; + }; + }; + virtualisation.xen.trace = mkOption { default = false; @@ -136,6 +156,9 @@ in message = "Xen currently does not support EFI boot"; } ]; + virtualisation.xen.package = mkDefault pkgs.xen; + virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386"; + virtualisation.xen.qemu-package = mkDefault pkgs.xen; virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; environment.systemPackages = [ cfg.package ]; @@ -216,7 +239,11 @@ in { source = "${cfg.package}/etc/xen/scripts"; target = "xen/scripts"; } - { source = "${cfg.package}/etc/default/xendomains"; + { text = '' + source ${cfg.package}/etc/default/xendomains + + ${cfg.domains.extraConfig} + ''; target = "default/xendomains"; } ]; @@ -240,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 ''; }; @@ -279,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"} @@ -286,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"} ''; }; }; @@ -296,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 @@ -306,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"; @@ -331,6 +372,9 @@ in IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address` export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}" + IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ mask` + export XEN_BRIDGE_NETMASK="${"\${data[1]//[[:blank:]]/}"}" + echo "${cfg.bridge.address} host gw dns" > /var/run/xen/dnsmasq.hostsfile cat < /var/run/xen/dnsmasq.conf @@ -339,7 +383,6 @@ in interface=${cfg.bridge.name} except-interface=lo bind-interfaces - auth-server=dns.xen.local,${cfg.bridge.name} auth-zone=xen.local,$XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} domain=xen.local addn-hosts=/var/run/xen/dnsmasq.hostsfile @@ -347,8 +390,11 @@ in strict-order no-hosts bogus-priv - no-resolv - no-poll + ${optionalString (!cfg.bridge.forwardDns) '' + no-resolv + no-poll + auth-server=dns.xen.local,${cfg.bridge.name} + ''} filterwin2k clear-on-reload domain-needed @@ -369,10 +415,14 @@ in ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name} ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address} + ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} netmask $XEN_BRIDGE_NETMASK ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} up ''; serviceConfig.ExecStart = "${pkgs.dnsmasq}/bin/dnsmasq --conf-file=/var/run/xen/dnsmasq.conf"; postStop = '' + IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address` + export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}" + ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} down ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge.name} @@ -380,8 +430,8 @@ in ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT # DHCP - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT - ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT + ${pkgs.iptables}/bin/iptables -w -D INPUT -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT ''; }; @@ -390,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 63ca39a9b602..ecbd317cb9a4 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) @@ -92,8 +99,9 @@ in rec { (all nixos.tests.openssh) (all nixos.tests.printing) (all nixos.tests.proxy) - (all nixos.tests.sddm) + (all nixos.tests.sddm.default) (all nixos.tests.simple) + (all nixos.tests.slim) (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/release.nix b/nixos/release.nix index 8a5b41ca3bb3..0dbdadf97816 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -222,12 +222,14 @@ in rec { tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable; tests.cjdns = callTest tests/cjdns.nix {}; + tests.cloud-init = callTest tests/cloud-init.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; tests.containers-bridge = callTest tests/containers-bridge.nix {}; tests.containers-imperative = callTest tests/containers-imperative.nix {}; tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {}; tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {}; + tests.containers-restart_networking = callTest tests/containers-restart_networking.nix {}; tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {}; tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; @@ -247,7 +249,7 @@ in rec { tests.gocd-server = callTest tests/gocd-server.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; - tests.grsecurity = callTest tests/grsecurity.nix {}; + tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; tests.hound = callTest tests/hound.nix {}; tests.i3wm = callTest tests/i3wm.nix {}; @@ -261,6 +263,7 @@ in rec { tests.keystone = callTest tests/keystone.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; + tests.ldap = callTest tests/ldap.nix {}; #tests.lightdm = callTest tests/lightdm.nix {}; tests.login = callTest tests/login.nix {}; #tests.logstash = callTest tests/logstash.nix {}; @@ -280,28 +283,32 @@ in rec { tests.networkingProxy = callTest tests/networking-proxy.nix {}; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; + tests.nginx = callTest tests/nginx.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; + tests.postgresql = callSubTests tests/postgresql.nix {}; tests.pgjwt = callTest tests/pgjwt.nix {}; - tests.postgresql = callTest tests/postgresql.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; tests.pumpio = callTest tests/pump.io.nix {}; - tests.quagga = callTest tests/quagga.nix {}; + # tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.samba = callTest tests/samba.nix {}; - tests.sddm = callTest tests/sddm.nix {}; + tests.sddm = callSubTests tests/sddm.nix {}; 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 {}; tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; }; + tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix new file mode 100644 index 000000000000..e1dee71fddf2 --- /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/boot.nix b/nixos/tests/boot.nix index 3ea0df65c8b5..69ab4755e444 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -40,12 +40,12 @@ in { uefiCdrom = makeBootTest "uefi-cdrom" '' cdrom => glob("${iso}/iso/*.iso"), - bios => '${pkgs.OVMF}/FV/OVMF.fd' + bios => '${pkgs.OVMF.fd}/FV/OVMF.fd' ''; uefiUsb = makeBootTest "uefi-usb" '' usb => glob("${iso}/iso/*.iso"), - bios => '${pkgs.OVMF}/FV/OVMF.fd' + bios => '${pkgs.OVMF.fd}/FV/OVMF.fd' ''; netboot = let diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 13a162e6c6e8..828846f17c89 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -4,18 +4,22 @@ import ./make-test.nix ({ pkgs, ... } : { name = "buildbot"; nodes = { - bbmaster = { config, pkgs, nodes, ... }: { + bbmaster = { config, pkgs, ... }: { services.buildbot-master = { enable = true; + package = pkgs.buildbot-full; + + # NOTE: use fake repo due to no internet in hydra ci factorySteps = [ - "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')" - "steps.ShellCommand(command=['trial', 'pyflakes'])" + "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')" + "steps.ShellCommand(command=['bash', 'fakerepo.sh'])" ]; changeSource = [ - "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" + "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" ]; }; - networking.firewall.allowedTCPPorts = [ 8010 9989 ]; + networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ]; + environment.systemPackages = with pkgs; [ git buildbot-full ]; }; bbworker = { config, pkgs, ... }: { @@ -23,24 +27,85 @@ import ./make-test.nix ({ pkgs, ... } : { enable = true; masterUrl = "bbmaster:9989"; }; + environment.systemPackages = with pkgs; [ git buildbot-worker ]; + }; + + gitrepo = { config, pkgs, ... }: { + services.openssh.enable = true; + networking.firewall.allowedTCPPorts = [ 22 9418 ]; + environment.systemPackages = with pkgs; [ git ]; }; }; testScript = '' + #Start up and populate fake repo + $gitrepo->waitForUnit("multi-user.target"); + print($gitrepo->execute(" \ + git config --global user.name 'Nobody Fakeuser' && \ + git config --global user.email 'nobody\@fakerepo.com' && \ + rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \ + mkdir -pv /srv/repos/fakerepo ~/.ssh && \ + ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \ + cat ~/.ssh/known_hosts && \ + cd /srv/repos/fakerepo && \ + git init && \ + echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \ + cat fakerepo.sh && \ + touch .git/git-daemon-export-ok && \ + git add fakerepo.sh .git/git-daemon-export-ok && \ + git commit -m fakerepo && \ + git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \ + ")); - $bbmaster->waitForUnit("network.target"); - $bbworker->waitForUnit("network.target"); + # Test gitrepo + $bbmaster->waitForUnit("network-online.target"); + #$bbmaster->execute("nc -z gitrepo 9418"); + print($bbmaster->execute(" \ + rm -rfv /tmp/fakerepo && \ + git clone git://gitrepo/fakerepo /tmp/fakerepo && \ + pwd && \ + ls -la && \ + ls -la /tmp/fakerepo \ + ")); - # Additional tests to be added - #$bbmaster->waitForUnit("buildbot-master.service"); - #$bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/ or die; - #$bbworker->waitForUnit("buildbot-worker.service"); - #$bbworker->waitUntilSucceeds("tail -10 /home/bbworker/worker/twistd.log") =~ /success/ or die; + # Test start master and connect worker + $bbmaster->waitForUnit("buildbot-master.service"); + $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/; + $bbworker->waitForUnit("network-online.target"); + $bbworker->execute("nc -z bbmaster 8010"); + $bbworker->execute("nc -z bbmaster 9989"); + $bbworker->waitForUnit("buildbot-worker.service"); + print($bbworker->execute("ls -la /home/bbworker/worker")); + + + # Test stop buildbot master and worker + print($bbmaster->execute(" \ + systemctl -l --no-pager status buildbot-master && \ + systemctl stop buildbot-master \ + ")); + $bbworker->fail("nc -z bbmaster 8010"); + $bbworker->fail("nc -z bbmaster 9989"); + print($bbworker->execute(" \ + systemctl -l --no-pager status buildbot-worker && \ + systemctl stop buildbot-worker && \ + ls -la /home/bbworker/worker \ + ")); + + + # Test buildbot daemon mode + # NOTE: daemon mode tests disabled due to broken PYTHONPATH child inheritence + # + #$bbmaster->execute("buildbot create-master /tmp"); + #$bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg"); + #$bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg"); + #$bbmaster->execute("buildbot start /tmp"); + #$bbworker->execute("nc -z bbmaster 8011"); + #$bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/; + #$bbmaster->execute("buildbot stop /tmp"); + #$bbworker->fail("nc -z bbmaster 8011"); ''; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nand0p ]; - }; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; }) diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix new file mode 100644 index 000000000000..c0add7eff360 --- /dev/null +++ b/nixos/tests/cloud-init.nix @@ -0,0 +1,47 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with import ../lib/qemu-flags.nix; +with pkgs.lib; + +let + metadataDrive = pkgs.stdenv.mkDerivation { + name = "metadata"; + buildCommand = '' + mkdir -p $out/iso + + cat << EOF > $out/iso/user-data + #cloud-config + write_files: + - content: | + cloudinit + path: /tmp/cloudinit-write-file + EOF + + cat << EOF > $out/iso/meta-data + instance-id: iid-local01 + local-hostname: "test" + public-keys: + - "should be a key!" + EOF + ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso + ''; + }; +in makeTest { + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lewo ]; + }; + machine = + { config, pkgs, ... }: + { + virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; + services.cloud-init.enable = true; + }; + testScript = '' + $machine->start; + $machine->waitForUnit("cloud-init.service"); + $machine->succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'"); + + $machine->waitUntilSucceeds("cat /root/.ssh/authorized_keys | grep -q 'should be a key!'"); + ''; +} diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix new file mode 100644 index 000000000000..086d056c51cd --- /dev/null +++ b/nixos/tests/containers-restart_networking.nix @@ -0,0 +1,114 @@ +# Test for NixOS' container support. + +let + client_base = rec { + networking.firewall.enable = false; + + containers.webserver = { + autoStart = true; + privateNetwork = true; + hostBridge = "br0"; + config = { + networking.firewall.enable = false; + networking.firewall.allowPing = true; + networking.interfaces.eth0.ip4 = [ + { address = "192.168.1.122"; prefixLength = 24; } + ]; + }; + }; + }; +in import ./make-test.nix ({ pkgs, lib, ...} : +{ + name = "containers-restart_networking"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ kampfschlaefer ]; + }; + + nodes = { + client = { lib, pkgs, ... }: client_base // { + virtualisation.vlans = [ 1 ]; + + networking.bridges.br0 = { + interfaces = []; + rstp = false; + }; + networking.interfaces = { + eth1.ip4 = lib.mkOverride 0 [ ]; + br0.ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }]; + }; + + }; + client_eth1 = { lib, pkgs, ... }: client_base // { + networking.bridges.br0 = { + interfaces = [ "eth1" ]; + rstp = false; + }; + networking.interfaces = { + eth1.ip4 = lib.mkOverride 0 [ ]; + br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }]; + }; + }; + client_eth1_rstp = { lib, pkgs, ... }: client_base // { + networking.bridges.br0 = { + interfaces = [ "eth1" ]; + rstp = true; + }; + networking.interfaces = { + eth1.ip4 = lib.mkOverride 0 [ ]; + br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }]; + }; + }; + }; + + testScript = {nodes, ...}: let + originalSystem = nodes.client.config.system.build.toplevel; + eth1_bridged = nodes.client_eth1.config.system.build.toplevel; + eth1_rstp = nodes.client_eth1_rstp.config.system.build.toplevel; + in '' + $client->start(); + + $client->waitForUnit("default.target"); + + subtest "initial state", sub { + $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2"); + + $client->fail("ip l show eth1 |grep \"master br0\" >&2"); + $client->fail("grep eth1 /run/br0.interfaces >&2"); + }; + + subtest "interfaces without stp", sub { + $client->succeed("${eth1_bridged}/bin/switch-to-configuration test >&2"); + + $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2"); + + $client->succeed("ip l show eth1 |grep \"master br0\" >&2"); + $client->succeed("grep eth1 /run/br0.interfaces >&2"); + }; + + # activating rstp needs another service, therefor the bridge will restart and the container will loose its connectivity + #subtest "interfaces with rstp", sub { + # $client->succeed("${eth1_rstp}/bin/switch-to-configuration test >&2"); + # $client->execute("ip -4 a >&2"); + # $client->execute("ip l >&2"); + # + # $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + # $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2"); + # + # $client->succeed("ip l show eth1 |grep \"master br0\" >&2"); + # $client->succeed("grep eth1 /run/br0.interfaces >&2"); + #}; + + subtest "back to no interfaces and no stp", sub { + $client->succeed("${originalSystem}/bin/switch-to-configuration test >&2"); + + $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2"); + + $client->fail("ip l show eth1 |grep \"master br0\" >&2"); + $client->fail("grep eth1 /run/br0.interfaces >&2"); + }; + ''; + +}) diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index 26409949ec62..845623368250 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -15,6 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { services.dnscrypt-proxy.enable = true; services.dnscrypt-proxy.localPort = localProxyPort; + services.dnscrypt-proxy.extraArgs = [ "-X libdcplugin_example.so" ]; services.dnsmasq.enable = true; services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ]; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 1b57a94a05d4..9096a5868f6c 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,6 +11,21 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { virtualisation.docker.enable = true; + + users.users = { + noprivs = { + isNormalUser = true; + description = "Can't access the docker daemon"; + password = "foobar"; + }; + + hasprivs = { + isNormalUser = true; + description = "Can access the docker daemon"; + password = "foobar"; + extraGroups = [ "docker" ]; + }; + }; }; }; @@ -21,6 +36,8 @@ import ./make-test.nix ({ pkgs, ...} : { $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg"); $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"); $docker->succeed("docker ps | grep sleeping"); + $docker->succeed("sudo -u hasprivs docker ps"); + $docker->fail("sudo -u noprivs docker ps"); $docker->succeed("docker stop sleeping"); ''; }) diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix new file mode 100644 index 000000000000..65ff1cac070b --- /dev/null +++ b/nixos/tests/elk.nix @@ -0,0 +1,95 @@ +# Test the ELK stack: Elasticsearch, Logstash and Kibana. + +import ./make-test.nix ({ pkgs, ...} : +let + esUrl = "http://localhost:9200"; +in { + name = "ELK"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow offline basvandijk ]; + }; + + nodes = { + one = + { config, pkgs, ... }: { + # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: + # + # OpenJDK 64-Bit Server VM warning: + # INFO: os::commit_memory(0x0000000085330000, 2060255232, 0) + # failed; error='Cannot allocate memory' (errno=12) + # + # There is insufficient memory for the Java Runtime Environment to continue. + # Native memory allocation (mmap) failed to map 2060255232 bytes for committing reserved memory. + # + # When setting this to 2500 I got "Kernel panic - not syncing: Out of + # memory: compulsory panic_on_oom is enabled" so lets give it even a + # bit more room: + virtualisation.memorySize = 3000; + + # For querying JSON objects returned from elasticsearch and kibana. + environment.systemPackages = [ pkgs.jq ]; + + services = { + logstash = { + enable = true; + package = pkgs.logstash5; + inputConfig = '' + exec { command => "echo -n flowers" interval => 1 type => "test" } + exec { command => "echo -n dragons" interval => 1 type => "test" } + ''; + filterConfig = '' + if [message] =~ /dragons/ { + drop {} + } + ''; + outputConfig = '' + file { + path => "/tmp/logstash.out" + codec => line { format => "%{message}" } + } + elasticsearch { + hosts => [ "${esUrl}" ] + } + ''; + }; + + elasticsearch = { + enable = true; + package = pkgs.elasticsearch5; + }; + + kibana = { + enable = true; + package = pkgs.kibana5; + elasticsearch.url = esUrl; + }; + }; + }; + }; + + testScript = '' + startAll; + + $one->waitForUnit("elasticsearch.service"); + + # Continue as long as the status is not "red". The status is probably + # "yellow" instead of "green" because we are using a single elasticsearch + # node which elasticsearch considers risky. + # + # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green". + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red"); + + # Perform some simple logstash tests. + $one->waitForUnit("logstash.service"); + $one->waitUntilSucceeds("cat /tmp/logstash.out | grep flowers"); + $one->waitUntilSucceeds("cat /tmp/logstash.out | grep -v dragons"); + + # See if kibana is healthy. + $one->waitForUnit("kibana.service"); + $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green"); + + # See if logstash messages arive in elasticsearch. + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + ''; +}) diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 1bdabe93fec1..e1b628c91445 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -8,15 +8,21 @@ import ./make-test.nix ({ pkgs, ... }: { { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - environment.systemPackages = [ pkgs.firefox ]; + environment.systemPackages = [ pkgs.firefox pkgs.xdotool ]; }; testScript = '' $machine->waitForX; - $machine->execute("firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html &"); + $machine->execute("xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' &"); $machine->waitForWindow(qr/Valgrind/); $machine->sleep(40); # wait until Firefox has finished loading the page + $machine->execute("xdotool key space"); # do I want to make Firefox the + # default browser? I just want to close the dialog + $machine->sleep(2); # wait until Firefox hides the default browser window + $machine->execute("xdotool key F12"); + $machine->sleep(10); # wait until Firefox draws the developer tool panel + $machine->succeed("xwininfo -root -tree | grep Valgrind"); $machine->screenshot("screen"); ''; diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 42425b57ba33..2c9c745021af 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.enable = true; + services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.gdm = { enable = true; autoLogin = { diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix deleted file mode 100644 index d4a419fd0e39..000000000000 --- a/nixos/tests/grsecurity.nix +++ /dev/null @@ -1,46 +0,0 @@ -# Basic test to make sure grsecurity works - -import ./make-test.nix ({ pkgs, ...} : { - name = "grsecurity"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ copumpkin joachifm ]; - }; - - machine = { config, pkgs, ... }: - { security.grsecurity.enable = true; - boot.kernel.sysctl."kernel.grsecurity.audit_mount" = 0; - boot.kernel.sysctl."kernel.grsecurity.deter_bruteforce" = 0; - networking.useDHCP = false; - }; - - testScript = '' - subtest "grsec-lock", sub { - $machine->succeed("systemctl is-active grsec-lock"); - $machine->succeed("grep -Fq 1 /proc/sys/kernel/grsecurity/grsec_lock"); - $machine->fail("echo -n 0 >/proc/sys/kernel/grsecurity/grsec_lock"); - }; - - subtest "paxtest", sub { - # TODO: running paxtest blackhat hangs the vm - my @pax_mustkill = ( - "anonmap", "execbss", "execdata", "execheap", "execstack", - "mprotanon", "mprotbss", "mprotdata", "mprotheap", "mprotstack", - ); - foreach my $name (@pax_mustkill) { - my $paxtest = "${pkgs.paxtest}/lib/paxtest/" . $name; - $machine->succeed($paxtest) =~ /Killed/ or die - } - }; - - # tcc -run executes run-time generated code and so allows us to test whether - # paxmark actually works (otherwise, the process should be terminated) - subtest "tcc", sub { - $machine->execute("echo -e '#include \nint main(void) { puts(\"hello\"); return 0; }' >main.c"); - $machine->succeed("${pkgs.tinycc}/bin/tcc -run main.c"); - }; - - subtest "RBAC", sub { - $machine->succeed("[ -c /dev/grsec ]"); - }; - ''; -}) diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix new file mode 100644 index 000000000000..1d9a9043e03a --- /dev/null +++ b/nixos/tests/hardened.nix @@ -0,0 +1,36 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "hardened"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ joachifm ]; + }; + + machine = + { config, lib, pkgs, ... }: + with lib; + { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; + users.users.sybil = { isNormalUser = true; group = "wheel"; }; + imports = [ ../modules/profiles/hardened.nix ]; + }; + + testScript = + '' + # Test hidepid + subtest "hidepid", sub { + $machine->succeed("grep -Fq hidepid=2 /proc/mounts"); + $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]"); + $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]"); + }; + + # Test kernel module hardening + subtest "lock-modules", sub { + $machine->waitForUnit("multi-user.target"); + # note: this better a be module we normally wouldn't load ... + $machine->fail("modprobe dccp"); + }; + + # Test userns + subtest "userns", sub { + $machine->fail("unshare --user"); + }; + ''; +}) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 7616a75b0214..db58a2f5c857 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: { networking.firewall.allowedTCPPorts = [ 4444 ]; - systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444"; + systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k"; }; probe = { config, lib, pkgs, ...}: { @@ -32,6 +32,7 @@ import ./make-test.nix (pkgs: { $machine->succeed("mkswap /dev/vdb"); $machine->succeed("swapon -a"); $machine->startJob("listener"); + $machine->waitForOpenPort(4444); $machine->succeed("systemctl hibernate &"); $machine->waitForShutdown; $machine->start; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 35dd00fe630f..a6afe8a4b72a 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -34,6 +34,12 @@ let boot.loader.systemd-boot.enable = true; ''} + users.extraUsers.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + }; + hardware.enableAllFirmware = lib.mkForce false; ${replaceChars ["\n"] ["\n "] extraConfig} @@ -57,7 +63,7 @@ let (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + (optionalString (system == "x86_64-linux") "-cpu kvm64 "); hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '' - + optionalString (bootLoader == "systemd-boot") ''bios => "${pkgs.OVMF}/FV/OVMF.fd", ''; + + optionalString (bootLoader == "systemd-boot") ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", ''; in '' $machine->start; @@ -96,7 +102,7 @@ let $machine->shutdown; # Now see if we can boot the installation. - $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "boot-after-install" }); # For example to enter LUKS passphrase. ${preBootCommands} @@ -118,11 +124,17 @@ let $machine->waitForUnit("swap.target"); $machine->succeed("cat /proc/swaps | grep -q /dev"); + # Check that the store is in good shape + $machine->succeed("nix-store --verify --check-contents >&2"); + # Check whether the channel works. $machine->succeed("nix-env -iA nixos.procps >&2"); $machine->succeed("type -tP ps | tee /dev/stderr") =~ /.nix-profile/ or die "nix-env failed"; + # Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon) + $machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2"); + # We need to a writable nix-store on next boot. $machine->copyFileFromHost( "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }", @@ -139,7 +151,7 @@ let $machine->shutdown; # Check whether a writable store build works - $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", name => "rebuild-switch" }); ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( @@ -150,7 +162,7 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". - $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}", "boot-after-rebuild-switch" }); ${preBootCommands} $machine->waitForUnit("network.target"); $machine->shutdown; @@ -159,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 ? {} @@ -180,6 +193,7 @@ let { imports = [ ../modules/profiles/installation-device.nix ../modules/profiles/base.nix + extraInstallerConfig ]; virtualisation.diskSize = 8 * 1024; @@ -209,7 +223,7 @@ let docbook5_xsl unionfs-fuse ntp - nixos-artwork + nixos-artwork.wallpapers.gnome-dark perlPackages.XMLLibXML perlPackages.ListCompare @@ -320,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/ldap.nix b/nixos/tests/ldap.nix new file mode 100644 index 000000000000..b39f4124c958 --- /dev/null +++ b/nixos/tests/ldap.nix @@ -0,0 +1,119 @@ +import ./make-test.nix ({ pkgs, lib, ...} : + +let + + dbSuffix = "dc=example,dc=com"; + dbPath = "/var/db/openldap"; + dbAdminDn = "cn=admin,${dbSuffix}"; + dbAdminPwd = "test"; + serverUri = "ldap:///"; + ldapUser = "test-ldap-user"; + ldapUserId = 10000; + ldapUserPwd = "test"; + ldapGroup = "test-ldap-group"; + ldapGroupId = 10000; + setupLdif = pkgs.writeText "test-ldap.ldif" '' + dn: ${dbSuffix} + dc: ${with lib; let dc = head (splitString "," dbSuffix); dcName = head (tail (splitString "=" dc)); in dcName} + o: ${dbSuffix} + objectclass: top + objectclass: dcObject + objectclass: organization + + dn: cn=${ldapUser},${dbSuffix} + sn: ${ldapUser} + objectClass: person + objectClass: posixAccount + uid: ${ldapUser} + uidNumber: ${toString ldapUserId} + gidNumber: ${toString ldapGroupId} + homeDirectory: /home/${ldapUser} + loginShell: /bin/sh + userPassword: ${ldapUserPwd} + + dn: cn=${ldapGroup},${dbSuffix} + objectClass: posixGroup + gidNumber: ${toString ldapGroupId} + memberUid: ${ldapUser} + ''; + mkClient = useDaemon: + { config, pkgs, lib, ... }: + { + virtualisation.memorySize = 256; + virtualisation.vlans = [ 1 ]; + security.pam.services.su.rootOK = lib.mkForce false; + users.ldap.enable = true; + users.ldap.daemon.enable = useDaemon; + users.ldap.loginPam = true; + users.ldap.nsswitch = true; + users.ldap.server = "ldap://server"; + users.ldap.base = "${dbSuffix}"; + }; + +in + +{ + name = "ldap"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ montag451 ]; + }; + + nodes = { + + server = + { config, pkgs, lib, ... }: + { + virtualisation.memorySize = 256; + virtualisation.vlans = [ 1 ]; + networking.firewall.allowedTCPPorts = [ 389 ]; + services.openldap.enable = true; + services.openldap.dataDir = dbPath; + services.openldap.urlList = [ + serverUri + ]; + services.openldap.extraConfig = '' + include ${pkgs.openldap.out}/etc/schema/core.schema + include ${pkgs.openldap.out}/etc/schema/cosine.schema + include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema + include ${pkgs.openldap.out}/etc/schema/nis.schema + + database mdb + suffix ${dbSuffix} + rootdn ${dbAdminDn} + rootpw ${dbAdminPwd} + directory ${dbPath} + ''; + }; + + client1 = mkClient true; # use nss_pam_ldapd + client2 = mkClient false; # use nss_ldap and pam_ldap + + }; + + testScript = '' + startAll; + $server->waitForUnit("default.target"); + $client1->waitForUnit("default.target"); + $client2->waitForUnit("default.target"); + + $server->succeed("ldapadd -D '${dbAdminDn}' -w ${dbAdminPwd} -H ${serverUri} -f '${setupLdif}'"); + + # NSS tests + subtest "nss", sub { + $client1->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}"); + $client1->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'"); + $client1->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}"); + $client1->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'"); + $client2->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}"); + $client2->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'"); + $client2->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}"); + $client2->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'"); + }; + + # PAM tests + subtest "pam", sub { + $client1->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true"); + $client2->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true"); + }; + ''; +}) diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix deleted file mode 100644 index 01f6a0358b2e..000000000000 --- a/nixos/tests/logstash.nix +++ /dev/null @@ -1,41 +0,0 @@ -# This test runs logstash and checks if messages flows and -# elasticsearch is started. - -import ./make-test.nix ({ pkgs, ...} : { - name = "logstash"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow offline ]; - }; - - nodes = { - one = - { config, pkgs, ... }: - { - services = { - logstash = { - enable = true; - inputConfig = '' - exec { command => "echo flowers" interval => 1 type => "test" } - exec { command => "echo dragons" interval => 1 type => "test" } - ''; - filterConfig = '' - if [message] =~ /dragons/ { - drop {} - } - ''; - outputConfig = '' - stdout { codec => rubydebug } - ''; - }; - }; - }; - }; - - testScript = '' - startAll; - - $one->waitForUnit("logstash.service"); - $one->waitUntilSucceeds("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep flowers"); - $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons"); - ''; -}) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix new file mode 100644 index 000000000000..a349265b2f57 --- /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 cd4086cb8f62..1b24551009c9 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -25,8 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : { }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; security.sudo = { enable = true; wheelNeedsPassword = false; }; - security.hideProcessInformation = true; - users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; }; testScript = @@ -36,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. @@ -119,12 +117,5 @@ import ./make-test.nix ({ pkgs, ...} : { subtest "sudo", sub { $machine->succeed("su - sybil -c 'sudo true'"); }; - - # Test hidepid - subtest "hidepid", sub { - $machine->succeed("grep -Fq hidepid=2 /etc/mtab"); - $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]"); - $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]"); - }; ''; }) diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 50746d17b451..40fafc625146 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -29,6 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $one->waitForUnit("munin-node.service"); + $one->succeed('systemctl start munin-cron'); $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd"); $one->waitForFile("/var/www/munin/one/index.html"); ''; diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index b20bce8edce6..75c6d793febc 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -56,11 +56,19 @@ in testScript = '' $master->start; $master->waitForUnit("mysql"); + $master->waitForOpenPort(3306); $slave1->start; $slave2->start; $slave1->waitForUnit("mysql"); + $slave1->waitForOpenPort(3306); $slave2->waitForUnit("mysql"); - $slave2->sleep(100); # Hopefully this is long enough!! + $slave2->waitForOpenPort(3306); $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + $slave2->succeed("systemctl stop mysql"); + $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N"); + $slave2->succeed("systemctl start mysql"); + $slave2->waitForUnit("mysql"); + $slave2->waitForOpenPort(3306); + $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"); ''; }) diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix new file mode 100644 index 000000000000..c2beb5590ef7 --- /dev/null +++ b/nixos/tests/nginx.nix @@ -0,0 +1,42 @@ +# verifies: +# 1. nginx generates config file with shared http context definitions above +# generated virtual hosts config. + +import ./make-test.nix ({ pkgs, ...} : { + name = "jenkins"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mbbx6spp ]; + }; + + nodes = { + webserver = + { config, pkgs, ... }: + { services.nginx.enable = true; + services.nginx.commonHttpConfig = '' + log_format ceeformat '@cee: {"status":"$status",' + '"request_time":$request_time,' + '"upstream_response_time":$upstream_response_time,' + '"pipe":"$pipe","bytes_sent":$bytes_sent,' + '"connection":"$connection",' + '"remote_addr":"$remote_addr",' + '"host":"$host",' + '"timestamp":"$time_iso8601",' + '"request":"$request",' + '"http_referer":"$http_referer",' + '"upstream_addr":"$upstream_addr"}'; + ''; + services.nginx.virtualHosts."0.my.test" = { + extraConfig = '' + access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat; + ''; + }; + }; + }; + + testScript = '' + startAll; + + $webserver->waitForUnit("nginx"); + $webserver->waitForOpenPort("80"); + ''; +}) diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index ca787e9c7b9b..f97544b5ea52 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -8,25 +8,42 @@ import ./make-test.nix ({ pkgs, ...} : machine = { lib, ... }: { imports = [ ./common/user-account.nix ]; - virtualisation.memorySize = 1024; services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; + services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.default = "plasma5"; - virtualisation.writableStore = false; # FIXME + virtualisation.memorySize = 1024; + + # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. + nixpkgs.config.packageOverrides = superPkgs: { + fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs + (_attrs: rec { + version = "0.3.3"; + name = "fontconfig-penultimate-${version}"; + src = pkgs.fetchFromGitHub { + owner = "ttuegel"; + repo = "fontconfig-penultimate"; + rev = version; + sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9"; + }; + }); + }; }; - testScript = { nodes, ... }: - let xdo = "${pkgs.xdotool}/bin/xdotool"; in - '' + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.extraUsers.alice; + xdo = "${pkgs.xdotool}/bin/xdotool"; + in '' startAll; + # Wait for display manager to start + $machine->waitForText(qr/${user.description}/); + $machine->screenshot("sddm"); + + # Log in + $machine->sendChars("${user.password}\n"); $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index f17384b44ba6..0ce37b55bb7b 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -1,26 +1,54 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "postgresql"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ zagy ]; - }; - - nodes = { - master = - { pkgs, config, ... }: - - { - services.postgresql.enable = true; - services.postgresql.initialScript = pkgs.writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; - }; - }; - - testScript = '' - startAll; - $master->waitForUnit("postgresql"); - $master->sleep(10); # Hopefully this is long enough!! - $master->succeed("echo 'select 1' | sudo -u postgres psql"); +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; +let + postgresql-versions = pkgs.callPackages ../../pkgs/servers/sql/postgresql { }; + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION pgcrypto; -- just to check if lib loading works + CREATE TABLE sth ( + id int + ); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + 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: makeTest { + name = postgresql-name; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ zagy ]; + }; + + machine = {pkgs, config, ...}: + { + services.postgresql.package=postgresql-package; + services.postgresql.enable = true; + }; + + 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} | sudo -u postgres psql"); + $machine->shutdown; # make sure that postgresql survive restart (bug #1735) + sleep(2); + $machine->start; + $machine->waitForUnit("postgresql"); + $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; + ''; + + }; +in + mapAttrs' (p-name: p-package: {name=p-name; value=make-postgresql-test p-name p-package;}) postgresql-versions diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix index 18da52b5134b..0991ed3fce1f 100644 --- a/nixos/tests/pump.io.nix +++ b/nixos/tests/pump.io.nix @@ -51,16 +51,6 @@ import ./make-test.nix ({ pkgs, ...} : let Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w== -----END CERTIFICATE----- ''; - - makePump = { opts ? { } }: - { - enable = true; - sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert; - sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey; - secret = "test"; - site = "test"; - } // opts; - in { name = "pumpio"; meta = with pkgs.stdenv.lib.maintainers; { @@ -72,9 +62,14 @@ in { { config, pkgs, ... }: { services = { - pumpio = makePump { opts = { + pumpio = { port = 443; - }; }; + enable = true; + sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert; + sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey; + secretFile = pkgs.writeText "secretFile" "test123"; + site = "test"; + }; mongodb.enable = true; mongodb.extraConfig = '' storage.journal.enabled: false diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix new file mode 100644 index 000000000000..4c2ed8456ddd --- /dev/null +++ b/nixos/tests/radicale.nix @@ -0,0 +1,80 @@ +let + port = 5232; + radicaleOverlay = self: super: { + radicale = super.radicale.overrideAttrs (oldAttrs: { + propagatedBuildInputs = with self.pythonPackages; + (oldAttrs.propagatedBuildInputs or []) ++ [ + passlib + ]; + }); + }; + common = { config, pkgs, ...}: { + services.radicale = { + enable = true; + config = let home = config.users.extraUsers.radicale.home; in '' + [server] + hosts = 127.0.0.1:${builtins.toString port} + daemon = False + [encoding] + [well-known] + [auth] + type = htpasswd + htpasswd_filename = /etc/radicale/htpasswd + htpasswd_encryption = bcrypt + [git] + [rights] + [storage] + type = filesystem + filesystem_folder = ${home}/collections + [logging] + [headers] + ''; + }; + # WARNING: DON'T DO THIS IN PRODUCTION! + # This puts secrets (albeit hashed) directly into the Nix store for ease of testing. + environment.etc."radicale/htpasswd".source = with pkgs; let + py = python.withPackages(ps: with ps; [ passlib ]); + in runCommand "htpasswd" {} '' + ${py}/bin/python -c " +from passlib.apache import HtpasswdFile +ht = HtpasswdFile( + '$out', + new=True, + default_scheme='bcrypt' +) +ht.set_password('someuser', 'really_secret_password') +ht.save() +" + ''; + }; + +in import ./make-test.nix ({ lib, ... }: { + name = "radicale"; + meta.maintainers = with lib.maintainers; [ aneeshusa ]; + + # Test radicale with bcrypt-based htpasswd authentication + nodes = { + py2 = { config, pkgs, ... }@args: (common args) // { + nixpkgs.overlays = [ + radicaleOverlay + ]; + }; + py3 = { config, pkgs, ... }@args: (common args) // { + nixpkgs.overlays = [ + (self: super: { + python = self.python3; + pythonPackages = self.python3.pkgs; + }) + radicaleOverlay + ]; + }; + }; + + testScript = '' + for my $machine ($py2, $py3) { + $machine->waitForUnit('radicale.service'); + $machine->waitForOpenPort(${builtins.toString port}); + $machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/'); + } + ''; +}) diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 041d88fbeae6..1ce2b8157842 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -1,28 +1,66 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "sddm"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ttuegel ]; - }; +{ system ? builtins.currentSystem }: - machine = { lib, ... }: { - imports = [ ./common/user-account.nix ]; - services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; +with import ../lib/testing.nix { inherit system; }; + +let + inherit (pkgs) lib; + + tests = { + default = { + name = "sddm"; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; }; - }; - services.xserver.windowManager.default = "icewm"; - services.xserver.windowManager.icewm.enable = true; - services.xserver.desktopManager.default = "none"; - }; - testScript = { nodes, ... }: '' - startAll; - $machine->waitForFile("/home/alice/.Xauthority"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->waitForWindow("^IceWM "); - ''; -}) + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.extraUsers.alice; + in '' + startAll; + $machine->waitForText(qr/select your user/i); + $machine->screenshot("sddm"); + $machine->sendChars("${user.password}\n"); + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->waitForWindow("^IceWM "); + ''; + }; + + autoLogin = { + name = "sddm-autologin"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ttuegel ]; + }; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + }; + + testScript = { nodes, ... }: '' + startAll; + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->waitForWindow("^IceWM "); + ''; + }; + }; +in + lib.mapAttrs (lib.const makeTest) tests diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix new file mode 100644 index 000000000000..7b939d836381 --- /dev/null +++ b/nixos/tests/slim.nix @@ -0,0 +1,66 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "slim"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ aszlig ]; + }; + + machine = { pkgs, lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + services.xserver.displayManager.slim = { + enable = true; + + # Use a custom theme in order to get best OCR results + theme = pkgs.runCommand "slim-theme-ocr" { + nativeBuildInputs = [ pkgs.imagemagick ]; + } '' + mkdir "$out" + convert -size 1x1 xc:white "$out/background.jpg" + convert -size 200x100 xc:white "$out/panel.jpg" + cat > "$out/slim.theme" <waitForText(qr/Username:/); + $machine->sendChars("${user.name}\n"); + $machine->waitForText(qr/Password:/); + $machine->sendChars("${user.password}\n"); + + $machine->waitForFile('${user.home}/.Xauthority'); + $machine->succeed('xauth merge ${user.home}/.Xauthority'); + $machine->waitForWindow('^IceWM '); + + # Make sure SLiM doesn't create a log file + $machine->fail('test -e /var/log/slim.log'); + ''; +}) diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix new file mode 100644 index 000000000000..74ec22fd3499 --- /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 cdccb11d8887..75be97a507d0 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/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 376c4f21dc04..4f7cb176d96f 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -65,7 +65,7 @@ let touch /mnt-root/boot-done hostname "${vmName}" mkdir -p /nix/store - unshare -m "@shell@" -c ' + unshare -m ${escapeShellArg pkgs.stdenv.shell} -c ' mount -t vboxsf nixstore /nix/store exec "$stage2Init" ' diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index afee1f7f6dd4..c51306a8c7a0 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -10,14 +10,10 @@ import ./make-test.nix ({ pkgs, ... }: { web = { config, pkgs, ... }: { - services.mysql.enable = true; - services.mysql.package = pkgs.mysql; - services.mysql.initialScript = pkgs.writeText "start.sql" '' - CREATE DATABASE wordpress; - CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress'; - GRANT ALL on wordpress.* TO 'wordpress'@'localhost'; - ''; - + services.mysql = { + enable = true; + package = pkgs.mysql; + }; services.httpd = { enable = true; logPerVirtualHost = true; diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix new file mode 100644 index 000000000000..c997e36cc442 --- /dev/null +++ b/nixos/tests/xrdp.nix @@ -0,0 +1,45 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "xrdp"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ volth ]; + }; + + nodes = { + server = { lib, pkgs, ... }: { + imports = [ ./common/user-account.nix ]; + services.xrdp.enable = true; + services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm"; + networking.firewall.allowedTCPPorts = [ 3389 ]; + }; + + client = { lib, pkgs, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + services.xserver.displayManager.auto.user = "alice"; + environment.systemPackages = [ pkgs.freerdp ]; + services.xrdp.enable = true; + services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm"; + }; + }; + + testScript = { nodes, ... }: '' + startAll; + + $client->waitForX; + $client->waitForFile("/home/alice/.Xauthority"); + $client->succeed("xauth merge ~alice/.Xauthority"); + + $client->sleep(5); + + $client->execute("xterm &"); + $client->sleep(1); + $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:alice /p:foobar\n"); + $client->sleep(5); + $client->screenshot("localrdp"); + + $client->execute("xterm &"); + $client->sleep(1); + $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:alice /p:foobar\n"); + $client->sleep(5); + $client->screenshot("remoterdp"); + ''; +}) diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 0c8753085029..5f17eb3a1cf6 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; + stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "0.11.2.cl1.b1"; + version = "1.2.5"; - src = fetchurl { - url = "https://github.com/bitcoinclassic/bitcoinclassic/archive/v${version}.tar.gz"; - sha256 = "1szsnx5aijk3hx7qkqzbqsr0basg8ydwp20mh3bhnf4ljryy2049"; + src = fetchFromGitHub { + owner = "bitcoinclassic"; + repo = "bitcoinclassic"; + rev = "v${version}"; + sha256 = "00spils0gv8krx2nyxrf6j1dl81wmxk8xjkqc22cv7nsdnakzrvm"; }; - buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib - miniupnpc utillinux protobuf ] + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qt4 qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -28,14 +32,16 @@ stdenv.mkDerivation rec { parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. - We call our code repository Bitcoin Classic. It starts as a one-feature patch - to bitcoin-core that increases the blocksize limit to 2 MB. We will have - ports for master and 0.11.2, so that miners and businesses can upgrade to 2 MB - blocks from any recent bitcoin software version they run. In the future we will - continue to release updates that are in line with Satoshi’s whitepaper & + Bitcoin Classic stands for the original Bitcoin as Satoshi described it, + "A Peer-to-Peer Electronic Cash System". We are writing the software that + miners and users say they want. We will make sure it solves their needs, help + them deploy it, and gracefully upgrade the bitcoin network's capacity + together. The data shows that Bitcoin can grow, on-chain, to welcome many + more users onto our coin in a safe and distributed manner. In the future we + will continue to release updates that are in line with Satoshi’s whitepaper & vision, and are agreed upon by the community. ''; - homepage = "https://bitcoinclassic.com/"; + homepage = https://bitcoinclassic.com/; maintainers = with maintainers; [ jefdaj ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix new file mode 100644 index 000000000000..2ad8e3fb3500 --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; + version = "1.0.2.0"; + + src = fetchFromGitHub { + owner = "bitcoinunlimited"; + repo = "bitcoinunlimited"; + rev = "v${version}"; + sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc utillinux protobuf libevent ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-peer electronic cash system (Unlimited client)"; + longDescription= '' + Bitcoin is a free open source peer-to-peer electronic cash system that is + completely decentralized, without the need for a central server or trusted + parties. Users hold the crypto keys to their own money and transact directly + with each other, with the help of a P2P network to check for double-spending. + + The Bitcoin Unlimited (BU) project seeks to provide a voice to all + stakeholders in the Bitcoin ecosystem. + + Every node operator or miner can currently choose their own blocksize limit + by modifying their client. Bitcoin Unlimited makes the process easier by + providing a configurable option for the accepted and generated blocksize via + a GUI menu. Bitcoin Unlimited further provides a user-configurable failsafe + setting allowing you to accept a block larger than your maximum accepted + blocksize if it reaches a certain number of blocks deep in the chain. + + The Bitcoin Unlimited client is not a competitive block scaling proposal + like BIP-101, BIP-102, etc. Instead it tracks consensus. This means that it + tracks the blockchain that the hash power majority follows, irrespective of + blocksize, and signals its ability to accept larger blocks via protocol and + block versioning fields. + + If you support an increase in the blocksize limit by any means - or just + support Bitcoin conflict resolution as originally envisioned by its founder - + consider running a Bitcoin Unlimited client. + ''; + homepage = https://www.bitcoinunlimited.info/; + maintainers = with maintainers; [ DmitryTsygankov ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index fd2d2f35bcb4..be4ea1fd6b66 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl , withGui }: @@ -6,14 +6,17 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - version = "0.11D"; + version = "0.11F"; - src = fetchurl { - url = "https://github.com/bitcoinxt/bitcoinxt/archive/v${version}.tar.gz"; - sha256 = "09r2i88wzqaj6mh66l3ngyfkm1a0dhwm5ibalj6y55wbxm9bvd36"; + src = fetchFromGitHub { + owner = "bitcoinxt"; + repo = "bitcoinxt"; + rev = "v${version}"; + sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24"; }; - buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf curl ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index c6490cf67df5..ddbe7104f1d9 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -4,19 +4,18 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.13.1"; - version = core_version; + version = "0.14.0"; src = fetchurl { - urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" - "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" + urls = [ "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" + "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "d8edbd797ff1c8266113e54d851a85def46ab82389abe7d7bd0d2827e74cecd7"; + sha256 = "07k4i9r033dsvkp5ii5g3hykidm8b19c8c0mz1bi8k0dda3d8hyp"; }; - buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix new file mode 100644 index 000000000000..51de4d202e84 --- /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/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index ef42560ee9aa..ff0f2407cfec 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/pkgs/applications/altcoins/dashpay.nix @@ -1,25 +1,35 @@ -{ fetchzip, stdenv, pkgconfig, autoreconfHook +{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc -, qt4, qrencode, glib, protobuf, yasm -, utillinux }: +, qrencode, glib, protobuf, yasm, libevent +, utillinux +, enable_Upnp ? false +, disable_Wallet ? false +, disable_Daemon ? false }: with stdenv.lib; stdenv.mkDerivation rec { + name = "dashpay-${version}"; + version = "0.12.1.3"; - name = "dashpay-${meta.version}"; - - src = fetchzip { - url = "https://github.com/dashpay/dash/archive/v${meta.version}.tar.gz"; - sha256 = "19bk7cviy3n2dpj4kr3i6i0i3ac2l5ri8ln1a51nd3n90k016wnx"; + src = fetchFromGitHub { + owner = "dashpay"; + repo= "dash"; + rev = "v${version}"; + sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj"; }; - buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm - boost zlib miniupnpc protobuf qt4 qrencode utillinux ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib openssl db48 yasm boost zlib libevent + miniupnpc protobuf qrencode utillinux ]; + - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ] + ++ optional enable_Upnp "--enable-upnp-default" + ++ optional disable_Wallet "--disable-wallet" + ++ optional disable_Daemon "--disable-daemon" + ; - meta = with stdenv.lib; { - version = "0.12.0.55"; + meta = { description = "A decentralized key/value registration and transfer system"; longDescription = '' Dash (DASH) is an open sourced, privacy-centric digital currency diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1d9b897188d7..1fbabc338f2a 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -5,6 +5,9 @@ rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; + bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; + bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; @@ -16,7 +19,12 @@ rec { dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; }; go-ethereum = callPackage ./go-ethereum.nix { }; + go-ethereum-classic = callPackage ./go-ethereum-classic { }; + + hivemind = callPackage ./hivemind.nix { withGui = true; }; + hivemindd = callPackage ./hivemind.nix { withGui = false; }; litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; @@ -28,10 +36,20 @@ rec { namecoind = callPackage ./namecoind.nix { }; 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/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index b92a656c0833..c584dd65ebb8 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,18 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "0.2.1"; + version = "1.0.4"; src = fetchFromGitHub { - owner = "ethcore"; + owner = "paritytech"; repo = "ethabi"; - rev = "fbed04984cab0db8767e01054ee16271b8e36281"; - sha256 = "1zgyyg1i5wmz8l1405yg5jmq4ddq530sl7018pkkc7l6cjj3bbhd"; + rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f"; + sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; }; - depsSha256 = "0srxv0wbhvyflc967lkpd2mx5nk7asx2cbxa0qxvas16wy6vxz52"; + depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz"; + + cargoBuildFlags = ["--features cli"]; meta = { description = "Ethereum function call encoding (ABI) utility"; diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix new file mode 100644 index 000000000000..f61a5884fd4a --- /dev/null +++ b/pkgs/applications/altcoins/ethrun.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +with rustPlatform; + +buildRustPackage rec { + name = "ethrun-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "ethrun"; + rev = "v${version}"; + sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn"; + }; + + depsSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1knq"; + + meta = { + description = "Directly run Ethereum bytecode"; + homepage = https://github.com/dapphub/ethrun/; + maintainers = [stdenv.lib.maintainers.dbrock]; + inherit version; + }; +} diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix new file mode 100644 index 000000000000..e8a26365361d --- /dev/null +++ b/pkgs/applications/altcoins/freicoin.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: + +stdenv.mkDerivation rec { + version = "0.8.6-2"; + name = "freicoin-${version}"; + + src = fetchFromGitHub { + owner = "freicoin"; + repo = "freicoin"; + rev = "v${version}"; + sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z"; + }; + + qmakeFlags = ["USE_UPNP=-"]; + + # I think that openssl and zlib are required, but come through other + # packages + + installPhase = '' + mkdir -p $out/bin + cp freicoin-qt $out/bin + ''; + + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ db boost gmp mpfr qt4 ]; + + meta = with stdenv.lib; { + description = "Peer-to-peer currency with demurrage fee"; + homepage = http://freicoi.in/; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix new file mode 100644 index 000000000000..b7585b2f109b --- /dev/null +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "go-ethereum-classic-${version}"; + version = "3.5.0"; + rev = "402c1700fbefb9512e444b32fe12c2d674638ddb"; + + goPackagePath = "github.com/ethereumproject/go-ethereum"; + subPackages = [ "cmd/evm" "cmd/geth" ]; + + src = fetchgit { + inherit rev; + url = "https://github.com/ethereumproject/go-ethereum"; + sha256 = "15wji12wqcrgsb1glwwz4jv7rsas71bbxh7750iv2phn7jivm0fi"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "Golang implementation of Ethereum Classic"; + homepage = "https://github.com/ethereumproject/go-ethereum"; + license = with lib.licenses; [ lgpl3 gpl3 ]; + }; +} diff --git a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/pkgs/applications/altcoins/go-ethereum-classic/deps.nix new file mode 100644 index 000000000000..0aa6755ee960 --- /dev/null +++ b/pkgs/applications/altcoins/go-ethereum-classic/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/maruel/panicparse"; + fetch = { + type = "git"; + url = "https://github.com/maruel/panicparse"; + rev = "ae43f192cef2add653fe1481a3070ed00a4a6981"; + sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; + sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "4163cd39dda1c0dda883a713640bc01e08951c24"; + sha256 = "1vzrhxf8823lrnwf1bfyxwlm52pph5iq2hgr1d0n07v8kjgqkrmx"; + }; + } +] diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 3beb38e0d2dd..7f7c3f304c22 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/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix new file mode 100644 index 000000000000..1b2682f7d4c0 --- /dev/null +++ b/pkgs/applications/altcoins/hivemind.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version; + version = "unstable"; + + src = fetchFromGitHub { + owner = "bitcoin-hivemind"; + repo = "hivemind"; + rev = "147973cfe76867410578d91d6f0a8df105cab4e0"; + sha256 = "1ndqqma1b0sh2gn7cl8d9fg44q0g2g42jr2y0nifkjgfjn3c7l5h"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc protobuf libevent] + ++ optionals stdenv.isLinux [ utillinux ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" + "--with-incompatible-bdb" + ] ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-Peer oracle protocol"; + longDescription= '' + Hivemind is a Peer-to-Peer Oracle Protocol which absorbs accurate data + into a blockchain so that Bitcoin-users can speculate in Prediction + Markets. + ''; + homepage = "https://bitcoinhivemind.com"; + maintainers = with maintainers; [ canndrew ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix new file mode 100644 index 000000000000..6db55e9ab076 --- /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/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index d30133fa5511..2723bf9dabdb 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, openssl, db48, boost -, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode +, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode , withGui }: with stdenv.lib; @@ -13,10 +13,12 @@ stdenv.mkDerivation rec{ sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8"; }; - buildInputs = [ pkgconfig openssl db48 boost zlib - miniupnpc utillinux protobuf ] + buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; + qmakeFlags = ["USE_UPNP=-"]; + makeFlags = ["USE_UPNP=-"]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 7d25a26fba25..311836702122 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, openssl, db48, boost -, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode +, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode , withGui }: with stdenv.lib; @@ -13,8 +13,10 @@ stdenv.mkDerivation rec{ sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3"; }; - buildInputs = [ pkgconfig openssl db48 boost zlib - miniupnpc utillinux protobuf ] + qmakeFlags = ["USE_UPNP=-"]; + makeFlags = ["USE_UPNP=-"]; + + buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix new file mode 100644 index 000000000000..b2f5cfdea067 --- /dev/null +++ b/pkgs/applications/altcoins/seth.nix @@ -0,0 +1,31 @@ +{ stdenv, makeWrapper, lib, fetchFromGitHub +, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }: + +stdenv.mkDerivation rec { + name = "seth-${version}"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "seth"; + rev = "v${version}"; + sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6"; + }; + + nativeBuildInputs = [makeWrapper]; + buildPhase = "true"; + makeFlags = ["prefix=$(out)"]; + postInstall = let path = lib.makeBinPath [ + bc coreutils curl ethabi git gnused jshon perl solc which + ]; in '' + wrapProgram "$out/bin/seth" --prefix PATH : "${path}" + ''; + + meta = { + description = "Command-line client for talking to Ethereum nodes"; + homepage = https://github.com/dapphub/seth/; + maintainers = [stdenv.lib.maintainers.dbrock]; + license = lib.licenses.gpl3; + inherit version; + }; +} diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix new file mode 100644 index 000000000000..0146bad6f86f --- /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 000000000000..4ce9a279d919 --- /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 000000000000..c5a824cd17d3 --- /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 000000000000..9dd3f6886c8f --- /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 000000000000..c92c113a27a9 --- /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 000000000000..c0b36ab93443 --- /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/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 2f8a6fcdad65..6cb1ae6de719 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 -, lame, flac, eject, mkcue +, lame, flac, eject, mkcue, glyr , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: @@ -19,46 +19,31 @@ in configurePhase = '' sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; - s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ - "Makefile"; + s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ + "Makefile"; # We use `cd-paranoia' from GNU libcdio, which contains a hyphen # in its name, unlike Xiph's cdparanoia. sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ; s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \ - "abcde" + "abcde" - substituteInPlace "abcde" \ - --replace "/etc/abcde.conf" "$out/etc/abcde.conf" + substituteInPlace "abcde" \ + --replace "/etc/abcde.conf" "$out/etc/abcde.conf" ''; - # no ELFs in this package, only scripts - dontStrip = true; - dontPatchELF = true; - buildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ]; + installFlags = [ "sysconfdir=$(out)/etc" ]; - postInstall = '' - # substituteInPlace "$out/bin/cddb-tool" \ - # --replace '#!/bin/sh' '#!${bash}/bin/sh' - # substituteInPlace "$out/bin/abcde" \ - # --replace '#!/bin/bash' '#!${bash}/bin/bash' - - # generic fixup script should be doing this, but it ignores this file for some reason - substituteInPlace "$out/bin/abcde-musicbrainz-tool" \ - --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' - - wrapProgram "$out/bin/abcde" --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac ]} - - wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ - "${wget}/bin" - - wrapProgram "$out/bin/abcde-musicbrainz-tool" --prefix PATH ":" \ - "${wget}/bin" + postFixup = '' + for cmd in abcde cddb-tool abcde-musicbrainz-tool; do + wrapProgram "$out/bin/$cmd" --prefix PATH ":" \ + ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} + done ''; meta = { diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 9fe781f17697..7ac1025c5027 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 -, libclxclient, libX11, libXft, readline}: +, libclxclient, libX11, libXft, readline +}: stdenv.mkDerivation rec { name = "aeolus-${version}"; - version = "0.9.0"; + version = "0.9.5"; + src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "0dkkibza25a6z9446njqlaynx8gfk5wb828pl9v1snmi5390iggp"; + sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv"; }; - buildInputs = [ libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient - libX11 libXft readline ]; + buildInputs = [ + libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient + libX11 libXft readline + ]; patchPhase = ''sed "s@ldconfig.*@@" -i source/Makefile''; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 39946fd5c7df..5a6901a94348 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper -, overrideCC, qt5, requireFile, unzip, wineStable +, overrideCC, qt5, requireFile, unzip, wine }: let @@ -26,7 +26,8 @@ let installPhase = "cp -r . $out"; }; - wine-wow64 = wineStable.override { + wine-wow64 = wine.override { + wineRelease = "stable"; wineBuild = "wineWow"; }; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index c70a1b4aa9bc..06e143704224 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = packageName + "-" + version ; packageName = "aj-snapshot" ; - version = "0.9.6" ; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; - sha256 = "12n2h3609fbvsnnwrwma4m55iyv6lcv1v3q5pznz2w6f12wf0c9z"; + sha256 = "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8"; }; doCheck = false; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 57864f863e3b..c447863e1497 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -16,7 +16,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "5.8"; + tag = "5.10"; in @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; - rev = "e5c6f16126e0901654b09ecce990554b1ff73833"; - sha256 = "1lcvslrcw6g4kp9w0h1jx46x6ilz4nzz0k2yrw4gd545k1rwx0c1"; + rev = "9c629c0c76808cc3e8f05e43bc760f849566dce6"; + sha256 = "062igiaaj18kbismrpzbafyq1ryyqj3lh0ajqqs2s8ms675x33sl"; }; buildInputs = diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 39edf18b0565..568195c1dba7 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: +{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: stdenv.mkDerivation rec { - name = "artyFX-git-${version}"; - version = "2015-05-07"; + name = "artyFX-${version}"; + version = "1.3"; - src = fetchgit { - url = "https://github.com/harryhaaren/openAV-ArtyFX.git"; - rev = "3a8cb9a5e4ffaf27a497a31cc9cd6f2e79622d5b"; - sha256 = "0nsmycm64a686ysfnmdvnaazijvfj90z5wyp96kyr81nsrbcv2ij"; + src = fetchFromGitHub { + owner = "openAVproductions"; + repo = "openAV-ArtyFX"; + rev = "release-${version}"; + sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9"; }; buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ]; diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 663e0eb0cc8c..da143c7d946a 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -1,6 +1,6 @@ { - stdenv, lib, fetchurl, - gettext, makeQtWrapper, pkgconfig, + mkDerivation, lib, fetchurl, + gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug, @@ -24,16 +24,14 @@ let }; in -stdenv.mkDerivation { +mkDerivation { inherit version; name = "audacious-qt5-${version}"; sourceFiles = lib.attrValues sources; sourceRoots = lib.attrNames sources; - nativeBuildInputs = [ - gettext makeQtWrapper pkgconfig - ]; + nativeBuildInputs = [ gettext pkgconfig ]; buildInputs = [ # Core dependencies @@ -68,15 +66,9 @@ stdenv.mkDerivation { fi done - - source $stdenv/setup - wrapQtProgram $out/bin/audacious - wrapQtProgram $out/bin/audtool ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Audio player"; homepage = http://audacious-media-player.org/; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix index 47c80af9fe0f..af0d2bbd0e9c 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf +{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf , glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp , libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb , libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; - version = "1.3.12"; + version = "2.0"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "01z6yia4a6lfsf3rqq379l7xzqfbpz27mf1mr8sx9z1a8rzzyhld"; + sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas"; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg_utils zenity + ffmpeg xdg_utils zenity ]; installPhase = '' diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 3b94235889cf..28155fd23178 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A range of synthesiser, electric piano and organ emulations"; homepage = http://bristol.sourceforge.net; license = licenses.gpl3; - platforms = platforms.linux; + platforms = ["x86_64-linux" "i686-linux"]; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 3231e3e53017..82a6d44f6436 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, vlc , withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper +, withQt5 ? true, qtbase, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -63,8 +63,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; - nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; - cmakeFlags = stdenv.lib.flatten [ (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) @@ -88,10 +86,6 @@ stdenv.mkDerivation rec { sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake ''; - postInstall = stdenv.lib.optionalString withQt5 '' - wrapQtProgram "$out/bin/cantata" - ''; - meta = with stdenv.lib; { homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 01c8ecaced0d..78841da46c59 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -5,6 +5,10 @@ let withSpotify = config.clementine.spotify or false; + withIpod = config.clementine.ipod or false; + withMTP = config.clementine.mtp or true; + withCD = config.clementine.cd or true; + withCloud = config.clementine.cloud or true; version = "1.2.3"; @@ -30,21 +34,19 @@ let gst-plugins-base gstreamer gvfs - libcdio - libgpod liblastfm - libmtp - libplist pkgconfig protobuf qca2 qjson qt4 - sparsehash sqlite taglib - usbmuxd - ]; + ] + ++ stdenv.lib.optionals (withIpod) [libgpod libplist usbmuxd] + ++ stdenv.lib.optionals (withMTP) [libmtp] + ++ stdenv.lib.optionals (withCD) [libcdio] + ++ stdenv.lib.optionals (withCloud) [sparsehash]; free = stdenv.mkDerivation { name = "clementine-free-${version}"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 166ed592ad84..dc0c8eabcacf 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,36 +1,48 @@ -{ stdenv, fetchurl, cmake, libsndfile, flex, bison +{ stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext , alsaLib ? null , libpulseaudio ? null +, libjack2 ? null +, liblo ? null +, ladspa-sdk ? null +, fluidsynth ? null +# , gmm ? null # opcodes don't build with gmm 5.1 +, eigen ? null +, curl ? null , tcltk ? null - -# maybe csound can be compiled with support for those, see configure output -# , ladspa ? null -# , fluidsynth ? null -# , jack ? null -# , gmm ? null -# , wiiuse ? null +, fltk ? null }: -stdenv.mkDerivation { - name = "csound-6.04"; +stdenv.mkDerivation rec { + name = "csound-${version}"; + version = "6.09.0"; enableParallelBuilding = true; hardeningDisable = [ "format" ]; - src = fetchurl { - url = mirror://sourceforge/csound/Csound6.04.tar.gz; - sha256 = "1030w38lxdwjz1irr32m9cl0paqmgr02lab2m7f7j1yihwxj1w0g"; + src = fetchFromGitHub { + owner = "csound"; + repo = "csound"; + rev = version; + sha256 = "1vfb0mab89psfwidadjrn5mbzq3bhjbyrrmyp98yp0xm6a8cssih"; }; - buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; + cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp + ++ stdenv.lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; - meta = { + nativeBuildInputs = [ cmake flex bison gettext ]; + buildInputs = [ libsndfile libsamplerate boost ] + ++ builtins.filter (optional: optional != null) [ + alsaLib libpulseaudio libjack2 + liblo ladspa-sdk fluidsynth eigen + curl tcltk fltk ]; + + meta = with stdenv.lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = http://www.csounds.com/; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [maintainers.marcweber]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index d006f2c01781..918accb4e167 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmakeHook, makeQtWrapper }: +{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let @@ -37,9 +37,9 @@ in stdenv.mkDerivation rec { owner = "gillesdegottex"; }; - buildInputs = [ fftw libsndfile qtbase qtmultimedia qmakeHook ]; + buildInputs = [ fftw libsndfile qtbase qtmultimedia ]; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ qmake ]; postPatch = '' substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' @@ -53,10 +53,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - wrapQtProgram "$out/bin/dfasma" - ''; - meta = with stdenv.lib; { description = "Analyse and compare audio files in time and frequency"; longDescription = '' diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix new file mode 100644 index 000000000000..3e315e2d1a75 --- /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 eaf02bd2689e..7a2e2a6da45b 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.11"; + version = "0.9.14"; name = "drumgizmo-${version}"; src = fetchurl { url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; - sha256 = "04hf3nhccwr98n2081rrvfccz50nly6k3gbk9zxccp1522qz5xvf"; + 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/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 0a2e293d90be..064feeb02a39 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga"; + sha256 = "0l6kjb1q9vslwy56836a0c65mf8z8ycam5vzz3k4qvd8g74bs1zq"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index a546441996ea..35079ea27385 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://sourceforge/project/eq10q/${name}.tar.gz"; - sha256 = "0brrr6ydsppi4zzn3vcgl0zgq5r8jmlcap1hpr3k43yvlwggb880"; + sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 6289688c53ce..274f7c9c3b84 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -1,6 +1,6 @@ { stdenv , coreutils -, fetchurl +, fetchFromGitHub , makeWrapper , pkgconfig , clang @@ -16,11 +16,13 @@ with stdenv.lib.strings; let - version = "2.0.a51"; + version = "2.1.0"; - src = fetchurl { - url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; - sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf"; + src = fetchFromGitHub { + owner = "grame-cncm"; + repo = "faust"; + rev = "v${builtins.replaceStrings ["."] ["-"] version}"; + sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m"; }; meta = with stdenv.lib; { @@ -67,7 +69,7 @@ let # # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION # to something the makefile will recognize. - sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix + sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix ''; # Remove most faust2appl scripts since they won't run properly @@ -194,8 +196,8 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ - --set FAUSTLIB "${faust}/lib/faust" \ - --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTLIB "${faust}/share/faust" \ + --set FAUST_LIB_PATH "${faust}/share/faust" \ --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix new file mode 100644 index 000000000000..f0863bfc50b0 --- /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/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index bb4df5ea1db5..e4c6c658efd7 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmakeHook +{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "gillesdegottex"; }; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ fftw qtbase qtmultimedia ] ++ optionals alsaSupport [ alsaLib ] ++ optionals jackSupport [ libjack2 ] diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix new file mode 100644 index 000000000000..47b85af724a7 --- /dev/null +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -0,0 +1,79 @@ +{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +, fetchurl, GConf, gdk_pixbuf, glib, gtk2, libpulseaudio, makeWrapper, nspr +, nss, pango, udev, xorg +}: + +let + version = "4.3.0"; + + deps = [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + GConf + gdk_pixbuf + glib + gtk2 + libpulseaudio + nspr + nss + pango + stdenv.cc.cc + udev + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + +in + +stdenv.mkDerivation { + name = "google-play-music-desktop-player-${version}"; + + src = fetchurl { + url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; + sha256 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb"; + }; + + dontBuild = true; + buildInputs = [ dpkg makeWrapper ]; + + unpackPhase = '' + dpkg -x $src . + ''; + + installPhase = '' + mkdir -p $out + cp -r ./usr/share $out + cp -r ./usr/bin $out + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" + + wrapProgram $out/bin/google-play-music-desktop-player \ + --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath deps}" + ''; + + meta = { + homepage = https://www.googleplaymusicdesktopplayer.com/; + description = "A beautiful cross platform Desktop Player for Google Play Music"; + license = stdenv.lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = stdenv.lib.maintainers.SuprDewd; + }; +} diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 1fe2c46d236b..5a10d1262f4a 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, mygpoclient, intltool +{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool , ipodSupport ? false, libgpod , gnome3 }: @@ -6,13 +6,31 @@ python2Packages.buildPythonApplication rec { name = "gpodder-${version}"; - version = "3.9.1"; + version = "3.9.3"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "036p9vnkr3if0k548xhhjmcwdaimy3yd24s3xd8vzlp0wdzkzrhn"; + sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl"; }; + patches = [ + (fetchpatch { + sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w"; + name = "Fix-soundcloud-feeds.patch"; + url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch"; + }) + (fetchpatch { + sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4"; + name = "use-https-urls-for-soundcloud.patch"; + url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch"; + }) + (fetchpatch { + sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b"; + name = "updates-soundcloud-support-to-recognize-https"; + url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch"; + }) + ]; + postPatch = with stdenv.lib; '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder @@ -30,22 +48,22 @@ python2Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python2Packages; [ - feedparser dbus-python mygpoclient pygtk eyeD3 + feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib ] ++ stdenv.lib.optional ipodSupport libgpod; checkPhase = '' LC_ALL=C python -m gpodder.unittests ''; - meta = { + meta = with stdenv.lib; { description = "A podcatcher written in python"; longDescription = '' gPodder downloads and manages free audio and video content (podcasts) for you. Listen directly on your computer or on your mobile devices. ''; homepage = "http://gpodder.org/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.skeidel ]; + license = licenses.gpl3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ skeidel mic92 ]; }; } diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 642cbbd23f62..6073008d541d 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.35.2"; + version = "0.35.3"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p"; + sha256 = "0pvw4ijkq6lcn45vrif9b4mqmgzi0qg1dp5b33kb5zan6n1aci4j"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 712f309fad0c..80fb6a9ef923 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/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 83fd2b14ed2e..d72a2b13c42d 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmakeHook +{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: stdenv.mkDerivation rec { @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; }; - buildInputs = [ alsaLib pkgconfig qtbase qtscript qmakeHook ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ alsaLib pkgconfig qtbase qtscript ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index bcec085887a5..e2c86256ce64 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jalv-${version}"; - version = "1.4.6"; + version = "1.6.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9"; + sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; }; buildInputs = [ diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 0cacd7724939..6aaf14a5763a 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmakeHook, taglib }: +{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: stdenv.mkDerivation rec { name = "keyfinder-${version}"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { owner = "ibsh"; }; - buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns qmakeHook taglib ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ]; postPatch = '' substituteInPlace is_KeyFinder.pro \ diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 32a4f255abee..a7c8098dd79a 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lv2bm-${version}"; - version = "git-2015-04-10"; + version = "git-2015-11-29"; src = fetchFromGitHub { - owner = "portalmod"; + owner = "moddevices"; repo = "lv2bm"; - rev = "08681624fc13eb700ec2b5cabedbffdf095e28b3"; - sha256 = "11pi97jy4f4c3vsaizc8a6sw9hnhnanj6y1fil33yd9x7f8f0kbj"; + rev = "e844931503b7597f45da6d61ff506bb9fca2e9ca"; + sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx"; }; buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ]; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 05e2b335f820..e526e40a1e36 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "faustCompressors-v${version}"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "magnetophon"; repo = "faustCompressors"; rev = "v${version}"; - sha256 = "0mkram2hm7i5za7pfn5crh2arbajk8praksxzgjx90rrxwl1y3d1"; + sha256 = "144f6g17q4m50kxzdncsfzdyycdfprnpwdaxcwgxj4jky1xsha1d"; }; buildInputs = [ faust2jaqt faust2lv2 ]; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' for f in *.dsp; do + echo "compiling standalone from" $f faust2jaqt -time -double -t 99999 $f done @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { for f in *.dsp; do + echo "compiling plugin from" $f faust2lv2 -time -double -gui -t 99999 $f done ''; @@ -30,6 +32,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/lv2 mv *.lv2/ $out/lib/lv2 mkdir -p $out/bin + rm newlib.sh for f in $(find . -executable -type f); do cp $f $out/bin/ diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix index 850e7abaef00..ab2a23b1994c 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ mopidy - pythonPackages.requests2 + pythonPackages.requests pythonPackages.gmusicapi pythonPackages.cachetools ]; diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix new file mode 100644 index 000000000000..a39c63277631 --- /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 000000000000..e9538273568a --- /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 000000000000..54501895e313 --- /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/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 045c400a17fd..999883dc26c3 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-spotify-${version}"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "0w7bhq6nz2xly5g72xd98r7lyzmx7nzfdpghk7vklkx0x41qccz8"; + sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 856da9f742e4..7de8f6941c2b 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -17,12 +17,12 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = with gst_all_1; [ - gst-plugins-base gst-plugins-good gst-plugins-ugly + gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad glib_networking gobjectIntrospection ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests2 dbus-python + gst-python pygobject3 pykka tornado requests dbus-python ]; # There are no tests diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index f37585d3decb..59adb7cde497 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, mpd_clientlib }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }: stdenv.mkDerivation rec { - version = "0.27"; name = "mpc-${version}"; + version = "0.28"; - src = fetchurl { - url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz"; - sha256 = "0r10wsqxsi07gns6mfnicvpci0sbwwj4qa9iyr1ysrgadl5bx8j5"; + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "mpc"; + rev = "v${version}"; + sha256 = "1g8i4q5xsqdhidyjpvj6hzbhxacv27cb47ndv9k68whd80c5f9n9"; }; buildInputs = [ mpd_clientlib ]; - preConfigure = - '' - export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion} - export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} - ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + enableParallelBuilding = true; + + preConfigure = '' + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion} + export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} + ''; meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; license = licenses.gpl2; - maintainers = [ maintainers.algorith ]; + maintainers = with maintainers; [ algorith ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 9004a46115ee..37717babce4a 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,19 +1,20 @@ -{stdenv, fetchurl, alsaLib }: +{ stdenv +, fetchurl, alsaLib +, hostPlatform +}: stdenv.mkDerivation rec { - name = "mpg123-1.23.8"; + name = "mpg123-1.25.4"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy"; + sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd"; }; 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/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index c719080c7427..9d6f2fc9c8f9 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchzip, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools +, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools , qtwebkit, qtxmlpatterns }: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.0.3"; + version = "2.1.0"; src = fetchzip { url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; - sha256 = "067f4li48qfhz2barj70zpf2d2mlii12npx07jx9xjkkgz84z4c9"; + sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls"; }; hardeningDisable = [ "relro" "bindnow" ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ]; preBuild = '' - make lupdate make lrelease ''; @@ -45,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools + portaudio qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns #tesseract ]; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 31185c0d0c28..e43120a715d6 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "0.24"; name = "ncmpc-${version}"; + version = "0.27"; - src = fetchurl { - url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"; - sha256 = "1sf3nirs3mcx0r5i7acm9bsvzqzlh730m0yjg6jcyj8ln6r7cvqf"; + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "ncmpc"; + rev = "v${version}"; + sha256 = "0sfal3wadqvy6yas4xzhw35awdylikci8kbdcmgm4l2afpmc1lrr"; }; - buildInputs = [ pkgconfig glib ncurses mpd_clientlib ] - ++ libintlOrEmpty; + buildInputs = [ glib ncurses mpd_clientlib ]; + # ++ libintlOrEmpty; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + # without this, po/Makefile.in.in is not being created + preAutoreconf = '' + ./autogen.sh + ''; + configureFlags = [ "--enable-colors" "--enable-lyrics-screen" diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 8dc15195a458..1923377e56a2 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.5"; + version = "0.8"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "0zg084m06y7dd8ccy6aq9hx8q7qi2s5kl0br5139hrmk40q68kvy"; + 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/non/default.nix b/pkgs/applications/audio/non/default.nix index a7252b9e28a3..f4e5998c0375 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "non-${version}"; - version = "2016-12-07"; + version = "2017-03-29"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "754d113b0e3144a145d50bde8370ff2cae98169c"; - sha256 = "04h67vy966vys6krgjsxd7dph4z46r8c6maw1hascxlasy3bhhk0"; + rev = "10c31e57291b6e42be53371567a722b62b32d220"; + sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx"; }; buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index fff3582f7dfb..b361e6c33ae4 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/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index a13009407eb9..da0f74848888 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; }; buildInputs = [ SDL2 pkgconfig flac libsndfile ]; - makeFlags = [ "NO_LTDL=1 TEST=0 EXAMPLES=0" ] + makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index cee86f456859..658ba1700f26 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,13 +1,14 @@ {stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}: stdenv.mkDerivation rec { - name = "opus-tools-0.1.9"; + name = "opus-tools-0.1.10"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "0fk4nknvl111k89j5yckmyrh6b2wvgyhrqfncp7rig3zikbkv1xi"; + sha256 = "135jfb9ny3xvd27idsxj7j5ns90lslbyrq70cq3bfwcls4r7add2"; }; - buildInputs = [ libogg libao pkgconfig libopus flac ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libogg libao libopus flac ]; meta = { description = "Tools to work with opus encoded audio streams"; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 857f77bbdaf3..c5a977d741a7 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak"; + sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 89f1682592aa..132e4a0fca28 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.3"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1sdnd189db44xhl9p8pd8h4bsy8s0bn1y64lrdq7nb21mwg8ymcs"; + sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index d429d5452345..8ac7a9115ca8 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/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index d48f1eb851b7..bdb9911d3650 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,8 +2,8 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland -, qmakeHook, rubberband, serd, sord, vampSDK, fftwFloat +, libsndfile, pkgconfig, libpulseaudio, qtbase, redland +, qmake, rubberband, serd, sord, vampSDK, fftwFloat }: stdenv.mkDerivation rec { @@ -16,11 +16,10 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qtbase qmakeHook fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord - pkgconfig # optional libjack2 # portaudio @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { libX11 ]; - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ pkgconfig qmake ]; configurePhase = '' for i in sonic-visualiser svapp svcore svgui; @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/sonic-visualiser} cp sonic-visualiser $out/bin/ cp -r samples $out/share/sonic-visualiser/ - wrapQtProgram "$out/bin/sonic-visualiser" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index ef28180cc3b2..979f15d4006b 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: +{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: stdenv.mkDerivation rec { name = "sorcer-${version}"; - version = "1.1.1"; + version = "1.1.3"; - src = fetchurl { - url = "https://github.com/harryhaaren/openAV-Sorcer/archive/release-${version}.tar.gz"; - sha256 = "1jkhs2rhn4givac7rlbj8067r7qq6jnj3ixabb346nw7pd6gn1wn"; + src = fetchFromGitHub { + owner = "openAVproductions"; + repo = "openAV-Sorcer"; + rev = "release-${version}"; + sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index affb574d60bd..ad0f7ee14c5a 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,6 +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/ + # Be careful not to pick the testing version. version = "1.0.49.125.g72ee7853-111"; deps = [ @@ -42,6 +43,7 @@ let xorg.libXrender xorg.libXScrnSaver xorg.libXtst + xorg.libxcb zlib ]; @@ -50,23 +52,24 @@ in stdenv.mkDerivation { name = "spotify-${version}"; - src = - fetchurl { - url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x"; - }; + src = fetchurl { + url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; + sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x"; + }; buildInputs = [ dpkg makeWrapper ]; + doConfigure = false; + doBuild = false; + dontStrip = true; + dontPatchELF = true; + unpackPhase = '' runHook preUnpack dpkg-deb -x $src . runHook postUnpack ''; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "runHook preBuild; runHook postBuild"; - installPhase = '' runHook preInstall @@ -109,13 +112,11 @@ stdenv.mkDerivation { runHook postInstall ''; - dontStrip = true; - dontPatchELF = true; - - meta = { + meta = with stdenv.lib; { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; + license = licenses.unfree; + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 69288880cb2a..75368c6633be 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 -, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: +, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20161230"; + version = "20170428"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5"; + sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; }; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations b/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations new file mode 100644 index 000000000000..f575af5ecd31 --- /dev/null +++ b/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations @@ -0,0 +1,25 @@ +Disable openpty() and forkpty() prototypes when needed. +--- a/yasr/yasr.h ++++ b/yasr/yasr.h +@@ -308,8 +308,10 @@ extern void opt_set(int num, void *val); + extern void opt_queue_empty(int ll); + extern void opt_write(FILE * fp); + ++#ifndef HAVE_OPENPTY + /* openpty.c prototypes */ + extern int openpty(int *, int *, char *, struct termios *, struct winsize *); ++#endif + + /* cfmakeraw.c prototypes */ + extern void cfmakeraw(struct termios *); +@@ -317,8 +319,10 @@ extern void cfmakeraw(struct termios *); + /* login_tty.c prototypes */ + extern int login_tty(int); + ++#ifndef HAVE_FORKPTY + /* forkpty.c prototypes */ + extern int forkpty(int *, char *, struct termios *, struct winsize *); ++#endif + + /* tbc - Would it be more efficient to ensure that "blank" grids always held + ascii 0x20 rather than ascii 0x00? */ diff --git a/pkgs/applications/audio/yasr/20_maxpathlen b/pkgs/applications/audio/yasr/20_maxpathlen new file mode 100644 index 000000000000..386c6cbf22bd --- /dev/null +++ b/pkgs/applications/audio/yasr/20_maxpathlen @@ -0,0 +1,11 @@ +--- a/yasr/config.c.orig 2011-11-28 03:56:58.764995828 +0100 ++++ a/yasr/config.c 2011-11-28 03:57:00.048967703 +0100 +@@ -60,7 +60,7 @@ + int args, arg[16], *argp; + int i, key, ln = 0, mode = 0; + char *home, *ptr, *s; +- char confname[MAXPATHLEN]; ++ char confname[strlen(PACKAGE_DATA_DIR) + 10 + 1]; + + if ((home = getenv("HOME")) != NULL) + { diff --git a/pkgs/applications/audio/yasr/30_conf b/pkgs/applications/audio/yasr/30_conf new file mode 100644 index 000000000000..98e959f55f31 --- /dev/null +++ b/pkgs/applications/audio/yasr/30_conf @@ -0,0 +1,18 @@ +diff --git a/yasr.conf b/yasr.conf +index 1e07fc6..72f5922 100644 +--- a/yasr.conf ++++ b/yasr.conf +@@ -59,11 +59,11 @@ synthesizer=emacspeak server + #synthesizer=speech dispatcher + #synthesizer port=S0 + #synthesizer port=l0 +-synthesizer port=|/usr/local/bin/eflite ++synthesizer port=|eflite + # Below line appropriate for Speech Dispatcher in its default configuration + #synthesizer port=127.0.0.1:6560 + key echo=off +-shell=/bin/bash ++shell=/bin/sh + special=off + up and down arrows=speak line + DisableKey=6925 diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars b/pkgs/applications/audio/yasr/40_dectalk_extended_chars new file mode 100644 index 000000000000..cc1f0af86065 --- /dev/null +++ b/pkgs/applications/audio/yasr/40_dectalk_extended_chars @@ -0,0 +1,14 @@ +Index: yasr-0.6.9/yasr/tts.c +=================================================================== +--- yasr-0.6.9.orig/yasr/tts.c 2008-02-03 00:10:07.000000000 +1100 ++++ yasr-0.6.9/yasr/tts.c 2012-02-05 10:59:06.059007839 +1100 +@@ -281,6 +281,9 @@ + char *p = synth[tts.synth].unspeakable; + + if (ch < 32) return 1; ++ /* characters with high bit set cause DECTALK to crash */ ++ if (tts.synth == TTS_DECTALK && ch & 0x80) ++ return 1; + while (*p) + { + if (*p++ == ch) return 1; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix new file mode 100644 index 000000000000..1008d3e8e983 --- /dev/null +++ b/pkgs/applications/audio/yasr/default.nix @@ -0,0 +1,28 @@ +{stdenv,fetchurl}: + +stdenv.mkDerivation rec { + name = "yasr-${version}"; + + version = "0.6.9"; + + src = fetchurl { + url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz"; + sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1"; + }; + + patches = [ + ./10_fix_openpty_forkpty_declarations + ./20_maxpathlen + ./30_conf + ./40_dectalk_extended_chars + ]; # taken from the debian yasr package + + meta = { + homepage = "http://yasr.sourceforge.net"; + description = "A general-purpose console screen reader"; + longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + }; +} diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index ec803f2a9c52..42fe3e34cd42 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, alsaLib, cmake, libjack2, fftw, fltk13, libjpeg -, minixml, pkgconfig, zlib, liblo +{ stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash, libjpeg +, libXpm, minixml, ntk, pkgconfig, zlib, liblo }: stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "2.5.4"; + version = "3.0.1"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "16llaa2wg2gbgjhwp3632b2vx9jvanj4csv7d41k233ms6d1sjq1"; + sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8"; }; - buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib liblo ]; + buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; nativeBuildInputs = [ cmake pkgconfig ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 1a125de0a872..3bfee48b8cd3 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,19 +1,15 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: -let - version = "4.8.0"; +stdenv.mkDerivation rec { + version = "4.8.3"; rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time - -in stdenv.mkDerivation rec { name = "crashplan-${version}-r${rev}"; - crashPlanArchive = fetchurl { + src = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "117k9yx10n4lc0hkx0j48f19km0jrdgfq6xmbmhv3v73zbx21axs"; + sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113"; }; - srcs = [ crashPlanArchive ]; - meta = with stdenv.lib; { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index b3dd9f91ec89..191ec84f87bf 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,38 +4,39 @@ , withQt5 ? false, qtbase }: +with stdenv.lib; + let - ver_branch = "1.19"; - version = "1.19.5"; + ver_branch = "1.22"; + version = "1.22.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z"; + sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4"; }; - patches = [ ./fix-paths.patch ]; - + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt + pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt qt4 libaudit gcc6 - ] ++ stdenv.lib.optional withQt5 qtbase; + ] ++ optional withQt5 qtbase; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" - ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" - ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5"; + ] ++ optional (qt4 != null) "--enable-liblightdm-qt" + ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" ]; - meta = with stdenv.lib; { + meta = { homepage = https://launchpad.net/lightdm; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch deleted file mode 100644 index 56930418caca..000000000000 --- a/pkgs/applications/display-managers/lightdm/fix-paths.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/common/user-list.c b/common/user-list.c -index 792c6d3..57fbfb7 100644 ---- a/common/user-list.c -+++ b/common/user-list.c -@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal) - - value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL); - if (!value) -- value = g_strdup ("/bin/false /usr/sbin/nologin"); -+ value = g_strdup ("/run/current-system/sw/bin/nologin"); - hidden_shells = g_strsplit (value, " ", -1); - g_free (value); - -diff --git a/src/seat.c b/src/seat.c -index f9b149d..9029742 100644 ---- a/src/seat.c -+++ b/src/seat.c -@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, - - /* Set POSIX variables */ - process_set_clear_environment (script, TRUE); -- process_set_env (script, "SHELL", "/bin/sh"); -+ process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh"); - - /* Variables required for regression tests */ - if (g_getenv ("LIGHTDM_TEST_ROOT")) -@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, - process_set_env (script, "PATH", g_getenv ("PATH")); - } - else -- process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin"); -+ process_set_env (script, "PATH", "/run/current-system/sw/bin"); - - if (user) - { -diff --git a/src/session-child.c b/src/session-child.c -index e85f57d..93db0bd 100644 ---- a/src/session-child.c -+++ b/src/session-child.c -@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv) - else - { - /* Set POSIX variables */ -- pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin"); -+ pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin"); - pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username)); - pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username)); - pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user))); -diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c -index 47f1c10..cc82652 100644 ---- a/src/shared-data-manager.c -+++ b/src/shared-data-manager.c -@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data) - - gchar *path = g_build_filename (USERS_DIR, user, NULL); - gchar *quoted_path = g_shell_quote (path); -- gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path); -+ gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path); - - g_spawn_command_line_async (cmd, &error); - if (error) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 9fd56a49b5f5..d54fb455fcb1 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,97 +1,72 @@ -{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch +{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd -, themes }: let + version = "0.14.0"; - unwrapped = stdenv.mkDerivation rec { - name = "sddm-unwrapped-${version}"; - - src = fetchFromGitHub { - owner = "sddm"; - repo = "sddm"; - rev = "v${version}"; - sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj"; - }; - - patches = [ - ./0001-ignore-config-mtime.patch - (fetchpatch { /* Fix display of user avatars. */ - url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch; - sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms"; - }) - ]; - - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; - - buildInputs = [ - libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd - ]; - - propagatedBuildInputs = [ qtdeclarative ]; - - cmakeFlags = [ - "-DCONFIG_FILE=/etc/sddm.conf" - # Set UID_MIN and UID_MAX so that the build script won't try - # to read them from /etc/login.defs (fails in chroot). - # The values come from NixOS; they may not be appropriate - # for running SDDM outside NixOS, but that configuration is - # not supported anyway. - "-DUID_MIN=1000" - "-DUID_MAX=29999" - ]; - - preConfigure = '' - export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" - ''; - - enableParallelBuilding = true; - - postInstall = '' - # remove empty scripts - rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop" - ''; - - meta = with stdenv.lib; { - description = "QML based X11 display manager"; - homepage = "https://github.com/sddm/sddm"; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ttuegel ]; - }; + /* Fix display of user avatars. */ + patchFixUserAvatars = fetchpatch { + url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch; + sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms"; }; -in +in mkDerivation rec { + name = "sddm-unwrapped-${version}"; -stdenv.mkDerivation { - name = "sddm-${version}"; + src = fetchFromGitHub { + owner = "sddm"; + repo = "sddm"; + rev = "v${version}"; + sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj"; + }; - nativeBuildInputs = [ lndir makeQtWrapper ]; - buildInputs = [ unwrapped ] ++ themes; - themes = map (pkg: pkg.out or pkg) themes; - inherit unwrapped; + patches = + copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [ patchFixUserAvatars ]; - unpackPhase = "true"; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "runHook preBuild; runHook postBuild"; + postPatch = + # Module Qt5::Test must be included in `find_package` before it is used. + '' + sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|' + ''; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; - makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm" + buildInputs = [ + libxcb libpthreadstubs libXdmcp libXau pam systemd + ]; - mkdir -p "$out/share/sddm" - for pkg in $unwrapped $themes; do - local sddmDir="$pkg/share/sddm" - if [ -d "$sddmDir" ]; then - lndir -silent "$sddmDir" "$out/share/sddm" - fi - done + propagatedBuildInputs = [ + qtbase qtdeclarative + ]; - runHook postInstall + cmakeFlags = [ + "-DCONFIG_FILE=/etc/sddm.conf" + # Set UID_MIN and UID_MAX so that the build script won't try + # to read them from /etc/login.defs (fails in chroot). + # The values come from NixOS; they may not be appropriate + # for running SDDM outside NixOS, but that configuration is + # not supported anyway. + "-DUID_MIN=1000" + "-DUID_MAX=29999" + ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" ''; - inherit (unwrapped) meta; + postInstall = '' + # remove empty scripts + rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop" + ''; + + meta = with lib; { + description = "QML based X11 display manager"; + homepage = "https://github.com/sddm/sddm"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ttuegel ]; + }; } diff --git a/pkgs/applications/display-managers/sddm/0001-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch similarity index 100% rename from pkgs/applications/display-managers/sddm/0001-ignore-config-mtime.patch rename to pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series new file mode 100644 index 000000000000..cb6ea65fedb1 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/series @@ -0,0 +1 @@ +sddm-ignore-config-mtime.patch \ No newline at end of file diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index fca84199e511..c75a8976b3fa 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { # Ensure that sessions appear in sort order, rather than in # directory order. ./sort-sessions.patch + + # Allow to set logfile to a special "/dev/stderr" in order to continue + # logging to stderr and thus to the journal. + ./no-logfile.patch ]; preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib"; diff --git a/pkgs/applications/display-managers/slim/no-logfile.patch b/pkgs/applications/display-managers/slim/no-logfile.patch new file mode 100644 index 000000000000..f2f5f1549930 --- /dev/null +++ b/pkgs/applications/display-managers/slim/no-logfile.patch @@ -0,0 +1,80 @@ +diff --git a/log.cpp b/log.cpp +index b44677a..7c89dda 100644 +--- a/log.cpp ++++ b/log.cpp +@@ -1,23 +1,31 @@ + #include "log.h" + #include ++#include + + bool + LogUnit::openLog(const char * filename) + { +- if (logFile.is_open()) { ++ if (isFile && logFile.is_open()) { + cerr << APPNAME + << ": opening a new Log file, while another is already open" + << endl; +- logFile.close(); ++ closeLog(); + } +- logFile.open(filename, ios_base::app); + +- return !(logFile.fail()); ++ if (strcmp(filename, "/dev/stderr") == 0) { ++ isFile = false; ++ return true; ++ } else { ++ logFile.open(filename, ios_base::app); ++ isFile = true; ++ return !(logFile.fail()); ++ } + } + + void + LogUnit::closeLog() + { ++ if (!isFile) return; + if (logFile.is_open()) + logFile.close(); + } +diff --git a/log.h b/log.h +index b7810be..ad548a2 100644 +--- a/log.h ++++ b/log.h +@@ -9,11 +9,14 @@ + #endif + #include "const.h" + #include ++#include + + using namespace std; + + static class LogUnit { + ofstream logFile; ++ bool isFile; ++ inline ostream &getStream() { return isFile ? logFile : cerr; } + public: + bool openLog(const char * filename); + void closeLog(); +@@ -22,17 +25,17 @@ public: + + template + LogUnit & operator<<(const Type & text) { +- logFile << text; logFile.flush(); ++ getStream() << text; getStream().flush(); + return *this; + } + + LogUnit & operator<<(ostream & (*fp)(ostream&)) { +- logFile << fp; logFile.flush(); ++ getStream() << fp; getStream().flush(); + return *this; + } + + LogUnit & operator<<(ios_base & (*fp)(ios_base&)) { +- logFile << fp; logFile.flush(); ++ getStream() << fp; getStream().flush(); + return *this; + } + } logStream; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/common.nix similarity index 73% rename from pkgs/applications/editors/android-studio/default.nix rename to pkgs/applications/editors/android-studio/common.nix index 28b6b2b85ad4..e74d04218f48 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.2.3.0"; - build = "145.3537739"; - androidStudio = stdenv.mkDerivation { - name = "android-studio"; + inherit src meta; + name = "${pname}"; buildInputs = [ makeWrapper unzip @@ -96,31 +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 = "10fmffkvvbnmgjxb4rq7rjwnn16jp5phw6div4n7hh2ad6spf8wq"; - }; - meta = { - description = "The Official IDE for Android"; - homepage = https://developer.android.com/studio/index.html; - license = stdenv.lib.licenses.asl20; - platforms = [ "x86_64-linux" ]; - }; }; # 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 000000000000..860f1e53297a --- /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/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 3eae877ff61a..39fe8fcb77e6 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv, libXScrnSaver, libxkbfile }: +{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv}: stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.15.0"; + version = "1.18.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0w790b9m94m28bx7n94pg2zjxrcjf13228lsb0pl8kyfsk2k2glx"; + sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6"; name = "${name}.deb"; }; @@ -14,16 +14,14 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/usr/ - ar p $src data.tar.gz | tar -C $out -xz ./usr + ar p $src data.tar.xz | tar -C $out -xJ ./usr substituteInPlace $out/usr/share/applications/atom.desktop \ --replace /usr/share/atom $out/bin mv $out/usr/* $out/ rm -r $out/share/lintian rm -r $out/usr/ wrapProgram $out/bin/atom \ - --prefix "PATH" : "${gvfs}/bin" \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbfile ]}/libxkbfile.so.1 + --prefix "PATH" : "${gvfs}/bin" fixupPhase @@ -33,8 +31,8 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + + find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 1285e46fb484..8f6c5f5c2906 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -9,7 +9,8 @@ let fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify + xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify + xorg.libxcb ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 59e8076c787b..1c2e3a425782 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bluefish-2.2.9"; + name = "bluefish-2.2.10"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1l7pg6h485yj84i34jr09y8qzc1yr4ih6w5jdhmnrg156db7nwav"; + sha256 = "1ciygj79q6i3ga5x1j8aivc05nh6rhhnm7hrq8q8xd9vd4ms3v5g"; }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index bba66366e6b7..23cb16c0733f 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,28 +1,24 @@ { stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: +with stdenv.lib; + let - bracketsEnv = buildEnv { - name = "env-brackets"; - paths = [ - gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 - dbus.lib systemd.lib - ]; - }; + bracketsLibs = makeLibraryPath [ + gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd + ]; in stdenv.mkDerivation rec { name = "brackets-${version}"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; - sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42"; + sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp"; name = "${name}.deb"; }; phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper ]; - installPhase = '' mkdir -p $out ar p $src data.tar.xz | tar -C $out -xJ @@ -33,27 +29,26 @@ stdenv.mkDerivation rec { ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ - $out/opt/brackets/Brackets - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/opt/brackets/Brackets-node - - patchelf \ - --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ - $out/opt/brackets/lib/libcef.so - - wrapProgram $out/opt/brackets/brackets \ - --prefix LD_LIBRARY_PATH : "${bracketsEnv}/lib:${bracketsEnv}/lib64" - substituteInPlace $out/opt/brackets/brackets.desktop \ --replace "Exec=/opt/brackets/brackets" "Exec=brackets" mkdir -p $out/share/applications ln -s $out/opt/brackets/brackets.desktop $out/share/applications/ ''; - meta = with stdenv.lib; { + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \ + $out/opt/brackets/Brackets + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${bracketsLibs}" \ + $out/opt/brackets/Brackets-node + + patchelf --set-rpath "${bracketsLibs}" \ + $out/opt/brackets/lib/libcef.so + ''; + + meta = { description = "An open source code editor for the web, written in JavaScript, HTML and CSS"; homepage = http://brackets.io/; license = licenses.mit; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 9cab87e9ed24..20c2623e034c 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2 +{ stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2 , contribPlugins ? false, hunspell, gamin, boost }: -with { inherit (stdenv.lib) optionalString optional optionals; }; +with stdenv.lib; stdenv.mkDerivation rec { name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; - version = "13.12"; + version = "16.01"; pname = "codeblocks"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz"; - sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz"; + sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh"; }; - buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ] + nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ]; + buildInputs = [ wxGTK gtk2 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; @@ -25,9 +26,9 @@ stdenv.mkDerivation rec { # Fix boost 1.59 compat # Try removing in the next version - CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; - meta = with stdenv.lib; { + meta = { maintainers = [ maintainers.linquize ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 74707c65b6ca..6a5bc3e7b0f8 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,6 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender +, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2 +, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -15,7 +17,10 @@ stdenv.mkDerivation rec { categories = "Application;Development;"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ + fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 + libXrender libXtst makeWrapper zlib + ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; buildCommand = '' # Unpack tarball. @@ -36,7 +41,8 @@ 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" # Create desktop item. diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 9271579346aa..b039bd168d87 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 -, webkitgtk2 ? null # for internal web browser +, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas +, webkitgtk24x-gtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage }: @@ -12,26 +12,27 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst webkitgtk2 makeWrapper; + 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}"; }; @@ -55,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"; }; }; @@ -92,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"; @@ -109,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 @@ -131,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"; @@ -148,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 fddd9e4920b3..c0c96d9e1a4d 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -127,6 +127,29 @@ rec { }; }; + autodetect-encoding = buildEclipsePlugin rec { + name = "autodetect-encoding-${version}"; + version = "1.8.3.201610171338"; + + srcFeature = fetchurl { + url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar"; + sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f"; + }; + + srcPlugin = fetchurl { + url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar"; + sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/cypher256/eclipse-encoding-plugin; + description = "Show file encoding and line ending for the active editor in the eclipse status bar"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + bytecode-outline = buildEclipsePlugin rec { name = "bytecode-outline-${version}"; version = "2.4.3"; @@ -171,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; { @@ -341,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 ec56667a4ba6..2404405c307f 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/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 8774b1b461fc..b9bd529930f2 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -1,15 +1,25 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, fetchpatch, stdenv, ncurses }: stdenv.mkDerivation rec { name = "elvis-2.2_0"; src = fetchurl { - url = ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz; + url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz"; sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; }; buildInputs = [ ncurses ]; + patches = [ (fetchpatch { + url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; + sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; + }) ]; + + postPatch = '' + substituteInPlace configure \ + --replace '-lcurses' '-lncurses' + ''; + preConfigure = '' mkdir -p $out/share/man/man1 ''; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 834d3056e742..7d8d01aafd6e 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 = { @@ -54,10 +54,10 @@ }) {}; adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "adaptive-wrap"; - version = "0.5"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.el"; - sha256 = "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy"; + url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el"; + sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll"; }; packageRequires = []; 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 = { @@ -162,10 +162,10 @@ }) {}; async = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "async"; - version = "1.9"; + version = "1.9.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.tar"; - sha256 = "1ip5nc8xyln5szvqwp6wqva9xr84pn8ssn3nnphrszr19y4js2bm"; + url = "https://elpa.gnu.org/packages/async-1.9.2.tar"; + sha256 = "17fnvrj7jww29sav6a6jpizclg4w2962m6h37akpii71gf0vrffw"; }; packageRequires = []; meta = { @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.90.0"; + version = "11.90.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.90.0.tar"; - sha256 = "04nsndwcf0dimgc2p1yzzrymc36amzdnjg0158nxplmjkzdp28gy"; + url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar"; + sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6"; }; packageRequires = []; 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; @@ -358,15 +359,14 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.2.tar"; - sha256 = "10divixs06gq9nm8s8x0q12ir07y27d06l52ix2dn84zvj853z4z"; + url = "https://elpa.gnu.org/packages/company-0.9.4.tar"; + sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/company.html"; license = lib.licenses.free; @@ -562,6 +562,20 @@ license = lib.licenses.free; }; }) {}; + dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dired-du"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-du-0.5.tar"; + sha256 = "09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-du.html"; + license = lib.licenses.free; + }; + }) {}; dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dismal"; @@ -631,10 +645,10 @@ }) {}; ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ediprolog"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-1.1.el"; - sha256 = "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd"; + url = "https://elpa.gnu.org/packages/ediprolog-1.2.el"; + sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz"; }; packageRequires = []; meta = { @@ -645,10 +659,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.2.3"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.2.3.tar"; - sha256 = "1d7iqr4fr0kr171fnjcm2n0bgcwzdh6jl585mwjf2zqnqszv13h0"; + url = "https://elpa.gnu.org/packages/el-search-1.3.2.tar"; + sha256 = "0lf0hk2pvy9yrb02sa3bg0hipshbgl9m4hx7db46jvmz5bf15nfq"; }; packageRequires = [ emacs stream ]; meta = { @@ -682,14 +696,14 @@ license = lib.licenses.free; }; }) {}; - enwc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "enwc"; - version = "1.0"; + version = "2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/enwc-1.0.tar"; - sha256 = "19mjkcgnacygzwm5dsayrwpbzfxadp9kdmmghrk1vir2hwixgv8y"; + url = "https://elpa.gnu.org/packages/enwc-2.0.tar"; + sha256 = "17w35b06am5n19nlq00ni5w3jvys9i7swyw4glb7081d2jbij2mn"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/enwc.html"; license = lib.licenses.free; @@ -738,10 +752,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.13.tar"; - sha256 = "0n1wzy6chh024r0yaywjbf7mdsrxs6hrfycv5v0ps0drf6q3zldc"; + url = "https://elpa.gnu.org/packages/exwm-0.14.tar"; + sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx"; }; packageRequires = [ xelb ]; meta = { @@ -805,6 +819,20 @@ license = lib.licenses.free; }; }) {}; + gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gited"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gited-0.3.2.tar"; + sha256 = "1y40zn1w5m2srrqffkpvvzk3j5zzq21smsqychyx2diggn4c0hgi"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gited.html"; + license = lib.licenses.free; + }; + }) {}; gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnome-c-style"; version = "0.1"; @@ -821,10 +849,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.1.2"; + version = "1.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.1.2.tar"; - sha256 = "18d5wdv33lcg96m3ljnv9zn98in27apm7bjycgq0asd2f31dvcvx"; + url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar"; + sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7"; }; packageRequires = [ cl-lib ]; meta = { @@ -873,6 +901,19 @@ license = lib.licenses.free; }; }) {}; + hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "hook-helpers"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hook-helpers-1.1.tar"; + sha256 = "0xvabl0lfc0ijr98clsyh0bqk2fdi1ncl0knn58j2p30gn9958i5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hook-helpers.html"; + license = lib.licenses.free; + }; + }) {}; html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "html5-schema"; version = "0.1"; @@ -941,10 +982,10 @@ }) {}; ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ivy"; - version = "0.8.0"; + version = "0.9.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.8.0.tar"; - sha256 = "1c1impdk1p082v6nb9lms4n258z6ngz8ra90cshprs0ingrk705p"; + url = "https://elpa.gnu.org/packages/ivy-0.9.1.tar"; + sha256 = "1jfc3zf6ln7i8pp5j0fpsai2w847v5g77b5fzlxbgvj80g3v5887"; }; packageRequires = [ emacs ]; meta = { @@ -1019,6 +1060,19 @@ license = lib.licenses.free; }; }) {}; + kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "kmb"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kmb-0.1.el"; + sha256 = "1wjfk28illfd5bkka3rlhhq59r0pad9zik1njlxym0ha8kbhzsj8"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kmb.html"; + license = lib.licenses.free; + }; + }) {}; landmark = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "landmark"; version = "1.0"; @@ -1058,27 +1112,29 @@ license = lib.licenses.free; }; }) {}; - lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "lmc"; version = "1.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/lmc-1.4.el"; sha256 = "0fm4sclx9gg0d0615smz105x320sk45y4ivpjk3nbc67c5l0sh2h"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/lmc.html"; license = lib.licenses.free; }; }) {}; - load-dir = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "load-dir"; - version = "0.0.3"; + version = "0.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/load-dir-0.0.3.el"; - sha256 = "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32"; + url = "https://elpa.gnu.org/packages/load-dir-0.0.5.el"; + sha256 = "1575ipn155nzzb5yghblxc7v1vpq4i16w1ff7y56qw2498ligpc5"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/load-dir.html"; license = lib.licenses.free; @@ -1086,10 +1142,10 @@ }) {}; load-relative = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "load-relative"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/load-relative-1.2.el"; - sha256 = "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw"; + url = "https://elpa.gnu.org/packages/load-relative-1.3.el"; + sha256 = "1hfxb2436jdsi9wfmsv47lkkpa5galjf5q81bqabbsv79rv59dps"; }; packageRequires = []; meta = { @@ -1166,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 = { @@ -1298,10 +1354,10 @@ }) {}; nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "nlinum"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nlinum-1.6.el"; - sha256 = "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw"; + url = "https://elpa.gnu.org/packages/nlinum-1.7.el"; + sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz"; }; packageRequires = []; meta = { @@ -1390,10 +1446,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170210"; + version = "20170717"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170210.tar"; - sha256 = "15415wh3w8d4c8hd7qfrfdjnjb1zppmrkg8cdp7hw2ilyr90c0bn"; + url = "https://elpa.gnu.org/packages/org-20170717.tar"; + sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh"; }; packageRequires = []; meta = { @@ -1417,10 +1473,10 @@ other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "other-frame-window"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/other-frame-window-1.0.2.el"; - sha256 = "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d"; + url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el"; + sha256 = "0hg82j8zjh0ann6bf56r0p8s0y3a016zny8byp80mcvkw63wrn5i"; }; packageRequires = [ emacs ]; meta = { @@ -1536,10 +1592,10 @@ }) {}; rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rainbow-mode"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-0.12.el"; - sha256 = "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04"; + url = "https://elpa.gnu.org/packages/rainbow-mode-0.13.el"; + sha256 = "1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl"; }; packageRequires = []; meta = { @@ -1550,10 +1606,10 @@ realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }: elpaBuild { pname = "realgud"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-1.4.3.tar"; - sha256 = "07yfah8kmr60rhrj8y8gs7l85hsbylv26crw3qbqh67ka4ykpj01"; + url = "https://elpa.gnu.org/packages/realgud-1.4.4.tar"; + sha256 = "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c"; }; packageRequires = [ cl-lib @@ -1596,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 = { @@ -1649,10 +1705,10 @@ }) {}; seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "seq"; - version = "2.19"; + version = "2.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/seq-2.19.tar"; - sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha"; + url = "https://elpa.gnu.org/packages/seq-2.20.tar"; + sha256 = "0vrpx6nnyjb0gsypknzagimlhvcvi5y1rcdkpxyqr42415zr8d0n"; }; packageRequires = []; meta = { @@ -1716,10 +1772,10 @@ soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "soap-client"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/soap-client-3.1.1.tar"; - sha256 = "0is2923g882farf73dix6ncq3m26yn5j5qr8wz6s0xad04zdbdhk"; + url = "https://elpa.gnu.org/packages/soap-client-3.1.3.tar"; + sha256 = "1s5m6dc7z532wchdih2ax2a791khyajjxb2xaw5rklk47yc5v3nk"; }; packageRequires = [ cl-lib ]; meta = { @@ -1729,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 = { @@ -1768,10 +1824,10 @@ }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/stream-2.2.3.el"; - sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy"; + url = "https://elpa.gnu.org/packages/stream-2.2.4.tar"; + sha256 = "1fdjjxfnpzfv5jsy0wmmnrsk821bg8d3magsng609fb2pkwvk1ij"; }; packageRequires = [ emacs ]; meta = { @@ -1836,10 +1892,10 @@ test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "test-simple"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/test-simple-1.2.0.el"; - sha256 = "1j97qrwi3i2kihszsxf3y2cby2bzp8g0zf6jlpdix3dinav8xa3b"; + url = "https://elpa.gnu.org/packages/test-simple-1.3.0.el"; + sha256 = "1yd61jc9ds95a5n09052kwc5gasy57g4lxr0jsff040brlyi9czz"; }; packageRequires = [ cl-lib ]; meta = { @@ -1967,6 +2023,19 @@ license = lib.licenses.free; }; }) {}; + vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild { + pname = "vdiff"; + version = "0.2.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vdiff-0.2.3.el"; + sha256 = "197wszzhm2kbfvvlg3f0dzfs3lf4536yq5fd67k2rycj421fr9qz"; + }; + packageRequires = [ emacs hydra ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vdiff.html"; + license = lib.licenses.free; + }; + }) {}; vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "vlf"; version = "1.7"; @@ -2032,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.6"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.6.tar"; - sha256 = "09im218c1gkq1lg356rcqqpkydnpxs5qzdqkwk95pwndswb40a5a"; + 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; @@ -2061,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 92159833e9c4..53035f2415e4 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20170211.1328"; + version = "20170604.1309"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "54777551c1760f02b35043a51e1cadad1468aa44"; - sha256 = "0p5jhp71n4021p173c9agmm26xqqx7z864ygaskf9dh810mxs1yh"; + rev = "9aff997fe7b4caded60150a832e3704ac55e69e5"; + sha256 = "0yfk7s7n10lkf11dy1l0xi0bbsjbam5lqq8kj9hxpz2zkddbaljl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -194,8 +194,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "ac-anaconda"; - rev = "e42b68f648a4179c76b56b7ff03d25a6e482f38c"; - sha256 = "092m8y38h4irh2ig6n6510gw2scjjxah37zim6mk92jzn1xv06d0"; + rev = "94f66b4d4bf0fd9683ee77511833b1eceace0462"; + sha256 = "15xkwnadqjkbgvilyfldj7z5kz2wvw1dk2bcgphx2z9qwjc7wd5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; @@ -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 = "20161202.725"; + version = "20170615.838"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; - sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; + rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; + sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -338,8 +338,9 @@ pname = "ac-dabbrev"; version = "20130905.2218"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el"; + url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el?revision=9"; sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh"; + name = "ac-dabbrev.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/ac-dabbrev"; @@ -355,12 +356,12 @@ ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }: melpaBuild { pname = "ac-dcd"; - version = "20160311.617"; + version = "20170323.601"; src = fetchFromGitHub { owner = "atilaneves"; repo = "ac-dcd"; - rev = "bfb4fe768c8bf6fc7b7ee880f54e2052ebb23e3b"; - sha256 = "1hlijh415wgl450ry16a1072jjrkqqqkk862hfhswfr2l6rjfw98"; + rev = "1614aa624252e3445b0392c8a9b7197084f3e422"; + sha256 = "02slswlcjh1rjc9hglvbizhvwp57xcnbhs8cmlcayw0yjwp6mnvb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd"; @@ -380,8 +381,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7"; - sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k"; + rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; + sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -737,8 +738,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec"; - sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -754,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 = "20170304.704"; + version = "20170612.2134"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec"; - sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -793,6 +794,27 @@ license = lib.licenses.free; }; }) {}; + ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: + melpaBuild { + pname = "ac-rtags"; + version = "20170522.2154"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; + sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641"; + name = "ac-rtags"; + }; + packageRequires = [ auto-complete rtags ]; + meta = { + homepage = "https://melpa.org/#/ac-rtags"; + license = lib.licenses.free; + }; + }) {}; ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }: melpaBuild { pname = "ac-skk"; @@ -859,16 +881,16 @@ ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-flyspell"; - version = "20170124.1245"; + version = "20170308.2109"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-flyspell"; - rev = "044d38fb8eb390ef1f51cf92cfe5c4ffd103044c"; - sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0"; + rev = "538d4f8508d305262ba0228dfe7c819fb65b53c9"; + sha256 = "1yplf5klgjjzx3cb1ihqb9f9cwn898l0vhasc3cwiqz6ldyq2na8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell"; - sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell"; + sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y"; name = "ace-flyspell"; }; packageRequires = [ avy ]; @@ -877,22 +899,22 @@ license = lib.licenses.free; }; }) {}; - ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }: + ace-isearch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-isearch"; - version = "20161107.1730"; + version = "20170506.12"; src = fetchFromGitHub { owner = "tam17aki"; repo = "ace-isearch"; - rev = "33b98ecdb3d5a966cbfc0ec7b104be5afca14f25"; - sha256 = "05a5jf9lx1g5cms5p1js7qxria5dfm310m83zmvwcdr96mfbz9ii"; + rev = "0502f95e333c8059a678745e5a112542965661d1"; + sha256 = "1gzvhxkx7dl7wh2fkkiq9vplfhrqyxl0vzlzf617j4gggjbkpzps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch"; sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm"; name = "ace-isearch"; }; - packageRequires = [ ace-jump-mode avy emacs helm-swoop ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ace-isearch"; license = lib.licenses.free; @@ -985,12 +1007,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20161203.1059"; + version = "20170528.1158"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "3691a0ca4d897d1b5f51795a14dc33b4ee48dd4a"; - sha256 = "0yhy6cq19zllc8cycpq5assdgdmhl77ybs7xr3q99m0jqx20g5xx"; + rev = "8af476ac323e56d3c69ec2ecd1c095de56ecd18e"; + sha256 = "0218qfmpjw57842w1wn6p5bkn1qmn39scnnsnc0a1xn8ywz1ivw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1024,22 +1046,22 @@ license = lib.licenses.free; }; }) {}; - ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: + ace-pinyin = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "ace-pinyin"; - version = "20160611.1755"; + version = "20170430.2326"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-pinyin"; - rev = "8f7d7fdf3912730076d30b0a3ba17d05da1db9ee"; - sha256 = "06bsrnhhpncmk6jpcnvmjdb0ccz6z34ksf2ywp00l1c343p90v38"; + rev = "a9df88c1e6a32a4f4895acbb8c45383693c494c1"; + sha256 = "18xi669c15k0m1wb7x231ch1kzqgpi4nm54c42ajrkfq7l8kxq8w"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/10bb2de9c6b938fa12deff1e2748bfd0a345891a/recipes/ace-pinyin"; - sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin"; + sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd"; name = "ace-pinyin"; }; - packageRequires = [ ace-jump-mode avy pinyinlib ]; + packageRequires = [ avy pinyinlib ]; meta = { homepage = "https://melpa.org/#/ace-pinyin"; license = lib.licenses.free; @@ -1048,12 +1070,12 @@ ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-popup-menu"; - version = "20161231.1553"; + version = "20170518.2244"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "423c59ac11899c66741aca3cad5dda46a167dfe4"; - sha256 = "01gh26marr3h61lvqw0mdc7r3s6cr2s6g5vqxf84ip43fzhi9zc3"; + rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d"; + sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1069,12 +1091,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20170219.256"; + version = "20170421.428"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "d92320e74089cb346e172c63b02cce48a0d8cca7"; - sha256 = "06sidq00xaw0n0gfh7akzyxfr65ma5h299yk347f1q916bqqxna5"; + rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c"; + sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1149,15 +1171,36 @@ license = lib.licenses.free; }; }) {}; + add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "add-hooks"; + version = "20170705.2205"; + src = fetchFromGitHub { + owner = "nickmccurdy"; + repo = "add-hooks"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; + sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p"; + name = "add-hooks"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/add-hooks"; + license = lib.licenses.free; + }; + }) {}; add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-node-modules-path"; - version = "20160912.220"; + version = "20170501.151"; src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "9ed240e05dcb9628ba380151b54b02688be5e78e"; - sha256 = "0avv3ypdpscchq9n1lxs0ba0fc52zjyv7dbv54s7sclqxx4mi63k"; + rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998"; + sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; @@ -1173,12 +1216,12 @@ addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "addressbook-bookmark"; - version = "20161130.150"; + version = "20170424.808"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "addressbook-bookmark"; - rev = "ad3c73369b804a48803fdfdf2ab613e6220260de"; - sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6"; + rev = "2c2051aa4f9309931a0aa22e97e1e9ce16d9d99d"; + sha256 = "1mic3v5rgg57zrsclvp1zq0bz34rcnp93vjv9lpbfj42ql72m36v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; @@ -1202,8 +1245,8 @@ sha256 = "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/adoc-mode"; - sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode"; + sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c"; name = "adoc-mode"; }; packageRequires = [ markup-faces ]; @@ -1215,12 +1258,12 @@ aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aes"; - version = "20160121.1237"; + version = "20170607.157"; src = fetchFromGitHub { owner = "Sauermann"; repo = "emacs-aes"; - rev = "1b9918036b16ee30ada71703a9283c67f2ad9999"; - sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6"; + rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92"; + sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; @@ -1257,12 +1300,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20161228.1641"; + version = "20170712.1549"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "754d0fea35059c583b9613c7924cebba74fe1319"; - sha256 = "0s9idrnzvd8sdx266s3p4jgpx0zd7s0cb7f48wp319xmqh448p84"; + rev = "2efb3ea5c3f3b4de79a6f21fa8dbcf90afb758f5"; + sha256 = "06aagmalpxvic285v0ipvir6777ipj6l9izfqsblbb7j70klw0dm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1299,12 +1342,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20170215.348"; + version = "20170627.1223"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "5959b48e94493738ead6fc91f18e70155962ffba"; - sha256 = "06kk8j7yq60cir4llgqdsyj4d94261danyw36idqx9papa4da3id"; + rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3"; + sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1360,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"; @@ -1381,12 +1424,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20161024.1051"; + version = "20170623.958"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "11e69a143ed66e50f0c95fda93ba0a5fa8bdf583"; - sha256 = "1n9qf9xmqbm0mjgcbzxgnmy1020rbh1cd7jmjbbfd8xhlh0kw14z"; + rev = "40cb03bbb56f09cfbfae07ff9ff97f3aaf8324be"; + sha256 = "0pngxrs1zz0vr0m7sbrl11a5gnxsgbqk1kp9566nj79h02y81sd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1420,22 +1463,22 @@ license = lib.licenses.free; }; }) {}; - alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170118.142"; + version = "20170614.218"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "20a0c043b5df66ee1f731e1ffe53d5697915b626"; - sha256 = "1szmjcim9mmzm45f7pb39gr0kf3y7x0kdhgvvbl9fbdzrphn02mx"; + rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b"; + sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369"; name = "alchemist"; }; - packageRequires = [ company dash elixir-mode emacs pkg-info ]; + packageRequires = [ company dash elixir-mode emacs pkg-info s ]; meta = { homepage = "https://melpa.org/#/alchemist"; license = lib.licenses.free; @@ -1444,12 +1487,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170125.1720"; + version = "20170629.2153"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "deeb659b1b1c6ec57a38875e9daf1f76f9b5c013"; - sha256 = "1z462b2cvfqz1pdrba89ag4v9mvw1dzsrzc219fz06f2xcpyz2v2"; + rev = "24f2495ab209f8f00b7883285637e207b6f07201"; + sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1465,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"; @@ -1486,12 +1529,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20170223.1030"; + version = "20170503.1714"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "fa9e6917c48e5338f3ed81226e1e5e5ec21563fb"; - sha256 = "0ri8lv3ln7n3msc8y6y9133dv8h0550xi142fn7w0s95hbskr61l"; + rev = "affbbc5f359a7abcf50f4509b712fc7a80843f51"; + sha256 = "04zxhxkk8dnq07m2cidn9mw05m2wyvix6vvbj1jaaawb60b1ic7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1546,22 +1589,22 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170217.103"; + version = "20170713.146"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "c39a6184c665e5ee3e53ed22beab6c4b6e8be2ce"; - sha256 = "17s35dj95nprac081v34bvj7mipnydj4blvjcymsn698aa21vgxm"; + rev = "84514026e342aa3cc98d8b6492175e1bdf788e5c"; + sha256 = "0s5cll8sq5hg1jm7g1nkcpbcz0n6f84ax9drzghv9y0m86v819mq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ dash emacs font-lock-plus ]; + packageRequires = [ emacs font-lock-plus memoize ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; @@ -1570,16 +1613,16 @@ all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-dired"; - version = "20170210.811"; + version = "20170418.1431"; src = fetchFromGitHub { owner = "jtbm37"; repo = "all-the-icons-dired"; - rev = "6e5152dfeb0f8be01a61d6fb0c0cb248ecdf1718"; - sha256 = "1siwrcfpj9wnrq5q0y5yhbqnh081db0v4kzvxiiqs3idppdnddxg"; + rev = "980b7747d6c4a7992a1ec56afad908956db0a519"; + sha256 = "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired"; - sha256 = "0fbl3i3wi2ka43xri0i30x561115hmv3j75vpkyzz3g1m9w006br"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/all-the-icons-dired"; + sha256 = "1qj639z24ln29hv6c51g1vsa2jsy4qrlhf8c7d5w9bxcrcn2fnr9"; name = "all-the-icons-dired"; }; packageRequires = [ all-the-icons emacs ]; @@ -1588,6 +1631,48 @@ 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"; + version = "20170508.25"; + src = fetchFromGitHub { + owner = "asok"; + repo = "all-the-icons-ivy"; + rev = "73b1bd545c683903b4123df1ac3f59ff80de89c3"; + sha256 = "1lh8i4dh0mvdjlkfnk0ann14y056ydcm5q9k5b143j8i9yxh2awy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; + sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2"; + name = "all-the-icons-ivy"; + }; + packageRequires = [ all-the-icons emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons-ivy"; + license = lib.licenses.free; + }; + }) {}; amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; @@ -1595,8 +1680,8 @@ src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "977b53e28b3141408fff4814be8b67ee23650cac"; - sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv"; + rev = "11e27444692bbf0eb38ec28af6bd041618c5c091"; + sha256 = "1qcag5sjg2p64lllgy237j8gkm7vp2kxr6wppkps5wgkf7bn4q4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1625,8 +1710,8 @@ src = fetchFromGitHub { owner = "immerrr"; repo = "ample-regexps.el"; - rev = "c806766693827a9ca12a6a07f6294260d6ef776e"; - sha256 = "17kdv4447dyjaz2chi1f8hlrry8pgvjgxivvk48r9yzi1crjd1zj"; + rev = "cbe91e148cac1ee8e223874dc956ed4cf607f046"; + sha256 = "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a5c72dfb52d55b2b22c91f115b32fff14f2f61e/recipes/ample-regexps"; @@ -1684,12 +1769,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170214.556"; + version = "20170405.301"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "65de04e9bda55b858d53d4d7982183fd82839b55"; - sha256 = "1x3wl30rbza8y4693jmpjpq7mcdv8gjhcnr451lgvfjmzxfhbn3d"; + rev = "1e7c9322c1ef395c4c4585bb29f5a421f2aa3077"; + sha256 = "1bb090n8nz8vacspihvnq37dx8knjgnarjbx5r4mqy9bp1v8i52p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1728,8 +1813,9 @@ pname = "anchored-transpose"; version = "20080904.2254"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el"; + url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el?revision=8"; sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651"; + name = "anchored-transpose.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/993271c9931170c3352daa3c1c0a8bcfa6915d9a/recipes/anchored-transpose"; @@ -1745,12 +1831,12 @@ android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; - version = "20170131.2347"; + version = "20170323.115"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; - rev = "76711e73b459de1ee639a49733e4f3f245b8fb41"; - sha256 = "1z0pw5h5yqpszr07jg7hqlfphhy0g6p2hqjyd9ds68p987v35vz0"; + rev = "f274da87429617b0b9c5889d46b36de64d982da4"; + sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; @@ -1879,8 +1965,8 @@ sha256 = "06gs5ln3w1xvq8f8k9225rwiipbh9cs0dzyyb7z05717rmqixcc4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/annoying-arrows-mode"; - sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode"; + sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh"; name = "annoying-arrows-mode"; }; packageRequires = [ cl-lib ]; @@ -1938,8 +2024,8 @@ src = fetchFromGitHub { owner = "lunaryorn"; repo = "ansible-doc.el"; - rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad"; - sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4"; + rev = "86083a7bb2ed0468ca64e52076b06441a2f8e9e0"; + sha256 = "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc"; @@ -2269,16 +2355,16 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "20170208.539"; + version = "20170708.1834"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "6f062a3bd00f7af651a21532d43900c22523e596"; - sha256 = "1vhf8qnknxvxkk44yyhp04kfmf0vrf41ycpgrj7p7la3k1anyvg6"; + rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43"; + sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; - sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; + sha256 = "053bi7b6d9aa6xwsgm0yxbklbs5sl3dgi529gsapj30lw68lh1vh"; name = "anything-tramp"; }; packageRequires = [ anything emacs ]; @@ -2298,8 +2384,8 @@ sha256 = "1y6s45k3f2x30fc9d5dv1v3cypj9wylx56khs5zxczgk5ky1ffp4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu"; - sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu"; + sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1"; name = "anzu"; }; packageRequires = [ emacs ]; @@ -2312,8 +2398,9 @@ pname = "aok"; version = "20130824.427"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/aok.el"; + url = "https://www.emacswiki.org/emacs/download/aok.el?revision=13"; sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g"; + name = "aok.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38eee4f0f7ad25d9b1de9011e63b82400177cdd5/recipes/aok"; @@ -2347,16 +2434,19 @@ license = lib.licenses.free; }; }) {}; - apache-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "apache-mode"; - version = "20150828.714"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/apache-mode.el"; - sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik"; + version = "20170711.913"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "apache-mode"; + rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; + sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/apache-mode"; - sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; + sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm"; name = "apache-mode"; }; packageRequires = []; @@ -2386,22 +2476,22 @@ license = lib.licenses.free; }; }) {}; - apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "apib-mode"; - version = "20161201.817"; + version = "20170520.658"; src = fetchFromGitHub { owner = "w-vi"; repo = "apib-mode"; - rev = "940fb1faecb4b0a460ed36de5551a59ebd1edf58"; - sha256 = "0sny3jv4amfc3lx45j1di2snp42xfl907q3l7frqhhsal57lkvd1"; + rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6"; + sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode"; sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb"; name = "apib-mode"; }; - packageRequires = [ emacs markdown-mode ]; + packageRequires = [ markdown-mode ]; meta = { homepage = "https://melpa.org/#/apib-mode"; license = lib.licenses.free; @@ -2410,12 +2500,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20170302.1825"; + version = "20170506.2356"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "2a14eab0c66b7c8ae4c8767ebcca1a82e325773c"; - sha256 = "1rxkzcl1clp794c017d19dpm085njmz7hlvn3sqgsw06wkczd0pl"; + rev = "8b60f9e9082583aa537369499506c70f192467ab"; + sha256 = "13pr2hkn2jmg85299lga9rvllghkc0khfdgl3d8g2al9ib0il8pk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2498,6 +2588,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el"; sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr"; + name = "apropos-fn+var.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var"; @@ -2513,12 +2604,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20170212.1229"; + version = "20170418.1352"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "f5ffcabf7f079bd899d95ffa11a78ccca7eb8c8e"; - sha256 = "1vrpg0fjshqcfhj4iwkgrqw052rvx9kf2l217mg2z94rjm1y9g55"; + rev = "98c548917bb696d541a58bfcf85f02572d8f7ebd"; + sha256 = "0kr6p1kf0sb036w9pb20xlfs7ynw357fv0zifsb8g7q1va7m5vs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2535,8 +2626,9 @@ pname = "apu"; version = "20170221.750"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/apu.el"; + url = "https://www.emacswiki.org/emacs/download/apu.el?revision=27"; sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6"; + name = "apu.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu"; @@ -2549,6 +2641,27 @@ license = lib.licenses.free; }; }) {}; + arch-packer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "arch-packer"; + version = "20170506.1005"; + src = fetchFromGitHub { + owner = "brotzeitmacher"; + repo = "arch-packer"; + rev = "e195c4f30da2a756f6e14715f436ff22826b5e82"; + sha256 = "0xxgnavpcimkb9adlbpcv96pp829x41nv744c8yl8rl8lb4f9xdl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer"; + sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72"; + name = "arch-packer"; + }; + packageRequires = [ async emacs s ]; + meta = { + homepage = "https://melpa.org/#/arch-packer"; + license = lib.licenses.free; + }; + }) {}; archive-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "archive-region"; @@ -2636,12 +2749,12 @@ arjen-grey-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "arjen-grey-theme"; - version = "20160403.1215"; + version = "20170522.1347"; src = fetchFromGitHub { owner = "credmp"; repo = "arjen-grey-theme"; - rev = "b795dcb5760a5ccc3597733c5933b91252542135"; - sha256 = "0p8k6sxmvmf535sawis6rn6lfyl5ph263i1phf2d5wl3dzs0xj5x"; + rev = "4cd0be72b65d42390e2105cfdaa408a1ead8d8d1"; + sha256 = "1n5axwn498ahb6984ir1zfl8vvwgbvq9bbrdfzydkmjljhgrp0rd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9804061cfadd26c69bb1bfe63dbe22f916f723/recipes/arjen-grey-theme"; @@ -2657,12 +2770,12 @@ artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "artbollocks-mode"; - version = "20161030.2059"; + version = "20170523.2122"; src = fetchFromGitHub { owner = "sachac"; repo = "artbollocks-mode"; - rev = "d77a01985a9161ce1676fb18d7228a0df566942b"; - sha256 = "1y69zq4r9ir1a2hy03lillxhw3skfj8ckkjv45i5xpasz4hjw50j"; + rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee"; + sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode"; @@ -2700,12 +2813,13 @@ pname = "ascii"; version = "20130824.500"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ascii.el"; + url = "https://www.emacswiki.org/emacs/download/ascii.el?revision=10"; sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75"; + name = "ascii.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/ascii"; - sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ascii"; + sha256 = "0f90anxrpnb8k1lqmz0iim4yp20riy19palwmdyl840hz69m98cd"; name = "ascii"; }; packageRequires = []; @@ -2756,22 +2870,22 @@ license = lib.licenses.free; }; }) {}; - assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: + assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: melpaBuild { pname = "assess"; - version = "20161203.327"; + version = "20170504.657"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "47ce039423f660174d097698615aaad6c77e87fb"; - sha256 = "16b0fdz1nj25bkzb3hyarwa2zgk23dn9598a4ljbr9smdl2pdv6b"; + rev = "e5b0415126c6bd24bd220759ff04220d963a0195"; + sha256 = "04242jhrajd9qi9dzngv33730sqhymgr0f18hf92fgb2k5649lqk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr"; name = "assess"; }; - packageRequires = [ dash emacs m-buffer ]; + packageRequires = [ emacs m-buffer ]; meta = { homepage = "https://melpa.org/#/assess"; license = lib.licenses.free; @@ -2780,16 +2894,16 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170219.942"; + version = "20170610.2241"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "666066d30a420d86801d8380f5991f2b82471107"; - sha256 = "1hjyac7dm0yvg5y32fii6508wwhl5q493i8ikf3fszafz03nc6sc"; + rev = "d6222c2959caaca5c4980038756097da8a51e505"; + sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async"; - sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; + sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4"; name = "async"; }; packageRequires = []; @@ -2830,8 +2944,8 @@ sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f6ab31b9371236fe1f3bf8e68c93d0bad8e14d24/recipes/@"; - sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/@"; + sha256 = "0da0xqk8fhz8aij3zmpp4bz3plpvfq2riyy17i7ny4ralxb3g08z"; name = "at"; }; packageRequires = [ emacs queue ]; @@ -2843,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"; @@ -2906,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 = "b7053f71f578ffb0d247f8a9e8d5152efd86e096"; - sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql"; + rev = "4d353522650d7685acbf1d38f7dbc504f734bd84"; + sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -2948,12 +3062,12 @@ audio-notes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "audio-notes-mode"; - version = "20140204.1154"; + version = "20170611.1459"; src = fetchFromGitHub { owner = "Malabarba"; repo = "audio-notes-mode"; - rev = "2158b2e8d20df3184bbe273a7fd5aa693e98baa9"; - sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm"; + rev = "fa38350829c7e97257efc746a010471d33748a68"; + sha256 = "1srg6rg3j9ri2cyr4g78dfqq3fhpn6hf3mq4iz2jfqjayppfv38b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/audio-notes-mode"; @@ -3015,8 +3129,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "cfd9cecb319c8fb547a62c732a5c1a106049c200"; - sha256 = "14cxchnp3sxnps03iycifvjx0w5lsxfnz6qsxgkxnis300lmnkym"; + rev = "e8d8733b1af67e4ea088d1ed015c554171feecb9"; + sha256 = "05yzqrdk2d6mqyapgnfflfvm2pqifmb6fprf5si8n6wb8gmi2idw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3075,8 +3189,9 @@ pname = "auto-capitalize"; version = "20160415.1403"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el"; + url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el?revision=19"; sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0"; + name = "auto-capitalize.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4edbba637a27a641f53f8a51861b176cabaa286/recipes/auto-capitalize"; @@ -3450,8 +3565,9 @@ pname = "auto-install"; version = "20150418.1702"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/auto-install.el"; + url = "https://www.emacswiki.org/emacs/download/auto-install.el?revision=82"; sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d"; + name = "auto-install.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad02a591b981518abd147475195f9484e4012fc/recipes/auto-install"; @@ -3464,6 +3580,27 @@ license = lib.licenses.free; }; }) {}; + auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-minor-mode"; + version = "20170716.717"; + 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-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "auto-org-md"; @@ -3527,6 +3664,27 @@ license = lib.licenses.free; }; }) {}; + auto-read-only = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-read-only"; + version = "20170305.2043"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "auto-read-only.el"; + rev = "79654f8fc024f383ae7af05487c1345738236500"; + sha256 = "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/189e394eb9fac09783c75ff1b64facdd745a0454/recipes/auto-read-only"; + sha256 = "1cvh2c7pgdxgnl0fr1lymz9pf573hj6dn8cjcb64wdczkrci7yk5"; + name = "auto-read-only"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/auto-read-only"; + license = lib.licenses.free; + }; + }) {}; auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-save-buffers-enhanced"; @@ -3590,6 +3748,27 @@ license = lib.licenses.free; }; }) {}; + auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: + melpaBuild { + pname = "auto-virtualenvwrapper"; + version = "20170618.52"; + src = fetchFromGitHub { + owner = "robert-zaremba"; + repo = "auto-virtualenvwrapper.el"; + rev = "516cb0406a98fd5a41d389f37544f11b28b1d027"; + sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; + sha256 = "1v82z922d9sadwvyrl4iddsa19f5k43s6iwn8w146jcl0v42bkmd"; + name = "auto-virtualenvwrapper"; + }; + packageRequires = [ cl-lib s virtualenvwrapper ]; + meta = { + homepage = "https://melpa.org/#/auto-virtualenvwrapper"; + license = lib.licenses.free; + }; + }) {}; auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "auto-yasnippet"; @@ -3614,12 +3793,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20170303.1213"; + version = "20170417.1407"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "62a1bbf904d075e7786fe1de2df86c5088a4be2d"; - sha256 = "156wbir32fvkwfvamp5yfw9gkz8j0cs2shgx406mhv7prcr6cnhs"; + rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119"; + sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3679,8 +3858,9 @@ pname = "autofit-frame"; version = "20170221.752"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/autofit-frame.el"; + url = "https://www.emacswiki.org/emacs/download/autofit-frame.el?revision=48"; sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm"; + name = "autofit-frame.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame"; @@ -3864,12 +4044,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170208.148"; + version = "20170702.237"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "b8d71639158b44a2a700b84cb02fc8518ad7d542"; - sha256 = "1yddpl78krl2y5l3w6f1h53f5qsc09ad4qcwv31k549ziwiz1vd4"; + rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b"; + sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3906,12 +4086,12 @@ avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-menu"; - version = "20161231.1554"; + version = "20170518.2245"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "75f4025ca53b9700ca5b478d85f5e53e887a6023"; - sha256 = "05smmmf8hc8ksgq711gn7hd8a7z6zw6l2i86zbx5fb79s11sqjg0"; + rev = "71b71e64900d0637e17013781042e086e9bf56e7"; + sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -3927,12 +4107,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20161229.605"; + version = "20170411.858"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "26e87aa7905a252b797e0bf592c9ff9eede165c1"; - sha256 = "1bfrc7wxnzhjn07psa5z1cflxxr1k8qc4jgsz5w7ds3sn48aji48"; + rev = "97020c34176538480cfd28004f16f9b5494315e6"; + sha256 = "1dgjkhcsb1iyjcwbjyccr7550lczg74jl7w1g7kif8g0df0mc5g6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -3970,12 +4150,13 @@ pname = "awk-it"; version = "20130917.1148"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/awk-it.el"; + url = "https://www.emacswiki.org/emacs/download/awk-it.el?revision=10"; sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw"; + name = "awk-it.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04101ec2a234a0f95faab6fa664e54413365ba9a/recipes/awk-it"; - sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/awk-it"; + sha256 = "0qic9m7c31sq4xgx7hnkhj0j0mfy26smghg266lrp5jii833qlz3"; name = "awk-it"; }; packageRequires = []; @@ -4053,8 +4234,8 @@ src = fetchFromGitHub { owner = "hung-phan"; repo = "babel-repl"; - rev = "0faa2f6518a2b46236f116ca1736a314f7d9c034"; - sha256 = "0sp0ja0346k401q5zpx3zl4pnxp4ml2jqkgk7z8i08rhdbp0c4nr"; + rev = "e619c16e349a1ee7bd0ee0d7f3650d33bff73fc3"; + sha256 = "1174r0gjpn5z3pnf32qlpqhmdfvskcd2vqgicvmqzjsrysj3fypn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd4ac01ea16fcbc6e9343a953a2f278c5874d3d/recipes/babel-repl"; @@ -4099,8 +4280,9 @@ pname = "backup-each-save"; version = "20130704.732"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/backup-each-save.el"; + url = "https://www.emacswiki.org/emacs/download/backup-each-save.el?revision=2"; sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7"; + name = "backup-each-save.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88fd979eb479701303e65e68c581f8f847887842/recipes/backup-each-save"; @@ -4187,8 +4369,8 @@ sha256 = "0a6adsxvmw3mgji17is75jrq3ifmzpch8rwqqyfgc99xzndvab7l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme"; - sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme"; + sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v"; name = "badwolf-theme"; }; packageRequires = [ emacs ]; @@ -4242,12 +4424,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170227.1310"; + version = "20170713.1237"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "0ebf2ee7ab5ae3b3cb6140ea57b2a88e02a59818"; - sha256 = "197avkxslnvp95f0spmys1nis6nmqfvrv0b1cm945syk7yxa30db"; + rev = "f701a8e191ae9c0bd6ab93926ce993bb18a9e98c"; + sha256 = "026a5frqvd2j09zzbf83mw3hmcj1ps7nsia87k0yn13sk62rd5bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4263,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"; @@ -4292,8 +4474,8 @@ sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile"; - sha256 = "07p35wg426ap0awgk4vg5n36s5jbfs3fi5djl8jq93jr6xs9imbc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile"; + sha256 = "0g595d1vd97b5qqydpb6cr3ibgcm08cw8c154h35vz3cl4w86mwd"; name = "basic-c-compile"; }; packageRequires = [ cl-lib f ]; @@ -4327,8 +4509,9 @@ pname = "batch-mode"; version = "20140807.1350"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/batch-mode.el"; + url = "https://www.emacswiki.org/emacs/download/batch-mode.el?revision=14"; sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p"; + name = "batch-mode.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fb675b865b8fa1497cdd33764bad051b2fd4d7e/recipes/batch-mode"; @@ -4387,13 +4570,13 @@ pname = "bbdb"; version = "20170129.2224"; src = fetchgit { - url = "git://git.savannah.nongnu.org/bbdb.git"; + url = "https://git.savannah.nongnu.org/git/bbdb.git"; rev = "8998b3416b36873f4e49454879f2eed20c31b384"; sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb"; - sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; + sha256 = "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2"; name = "bbdb"; }; packageRequires = []; @@ -4455,8 +4638,8 @@ sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f0e8f0aadc5a46df9d4c1bfdf77d69e839914124/recipes/bbdb-china"; - sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-china"; + sha256 = "1clrl3gk036w8q3p2f189jp6wv1y3xv037v77rg87dyz0yjs61py"; name = "bbdb-china"; }; packageRequires = [ bbdb-vcard chinese-pyim ]; @@ -4472,8 +4655,8 @@ src = fetchFromGitLab { owner = "iankelling"; repo = "bbdb-csv-import"; - rev = "21c775d776be1a6b3a096912bcdb53dab6bfaa31"; - sha256 = "0amdn5hd72108ylss90yk550w6vzvsg91l29dycbfr8a3hrfs22x"; + rev = "dc9e722d1c1fcd55b71625ee3f05a4921851d186"; + sha256 = "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import"; @@ -4518,8 +4701,8 @@ sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f0e8f0aadc5a46df9d4c1bfdf77d69e839914124/recipes/bbdb-handy"; - sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-handy"; + sha256 = "16wjnsw4p7y21zmpa69vpwydsv5i479czk3y79cnn7s4ap69jmm8"; name = "bbdb-handy"; }; packageRequires = [ bbdb ]; @@ -4602,8 +4785,8 @@ sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bc1d68a1d232016db004d145b9a40bcfbf400aa6/recipes/bdo"; - sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bdo"; + sha256 = "1n2kpaps6992nxl0v1003czcbw1k4xq906an56694wkh05az505j"; name = "bdo"; }; packageRequires = []; @@ -4615,12 +4798,12 @@ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "beacon"; - version = "20161004.756"; + version = "20170404.906"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "c9d86457d43decf61810006752544d7f7bd5a61d"; - sha256 = "132ixmzjz3sg15qvdbv3s8p6dv3bz7vwlhs50dax0z19dr79cda0"; + rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; + sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -4657,12 +4840,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20150607.1001"; + version = "20170714.709"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "05ed9428b3f09221da0e05fdd918cc5a0b643197"; - sha256 = "1vsid87pmls565bqknbgr7z907v7bb7115v70vzbw4z6lc4falry"; + rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd"; + sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4720,12 +4903,12 @@ better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-defaults"; - version = "20160619.2308"; + version = "20170613.2104"; src = fetchFromGitHub { owner = "technomancy"; repo = "better-defaults"; - rev = "ce2a9a85636a2ec220a6005185fb271b6f264907"; - sha256 = "0f1qq2fr734fa5cnlfpz4nm9j3wa1npji1vid3z02sllnh9y2dvq"; + rev = "12d9e6dbf24a8a3369b19650d74471b17b27f78d"; + sha256 = "1rx3p6syp6axnxbscg0l73yihgwdq7bdnkcrvfikz79yflxrsnmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults"; @@ -4742,8 +4925,9 @@ pname = "better-registers"; version = "20140813.119"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/better-registers.el"; + url = "https://www.emacswiki.org/emacs/download/better-registers.el?revision=23"; sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh"; + name = "better-registers.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2667829dfc72e848ab939be0602cbec1105671b0/recipes/better-registers"; @@ -4767,8 +4951,8 @@ sha256 = "08w3z4srbz478rmnnzjmbbd5bknady417x7s0r3nxszkxfpn3iy5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; - sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; + sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6"; name = "better-shell"; }; packageRequires = [ emacs ]; @@ -4864,12 +5048,12 @@ bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibretrieve"; - version = "20131013.1132"; + version = "20170709.1150"; src = fetchFromGitHub { owner = "pzorin"; repo = "bibretrieve"; - rev = "aff34c6e1a074ac4fd574d8e66fd9e0760585419"; - sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b"; + rev = "6aea308680f8f2cab4c5ae06bb3b64bd0a2d9215"; + sha256 = "1lf1az6ijamvqcyvmyyppn53cqf2hp5v0bdj6d95j99rpz38pnfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve"; @@ -4924,6 +5108,48 @@ 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"; + version = "20170418.812"; + src = fetchFromGitHub { + owner = "davep"; + repo = "binclock.el"; + rev = "38ef6531fed16eb2fa69824fbdafac998cf201ac"; + sha256 = "13s4j04b60l44xs381v4padhdyqs8625ssqph24qral6iizwry8d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; + sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk"; + name = "binclock"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/binclock"; + license = lib.licenses.free; + }; + }) {}; bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "bind-chord"; @@ -4952,8 +5178,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "53bf803f1d3efc61653f94fe56ff30a72304861e"; - sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp"; + rev = "7b055494e39efba8b237202b7c97f40aa19e2579"; + sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -4990,16 +5216,16 @@ bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bing-dict"; - version = "20170209.1459"; + version = "20170604.1831"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; - rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7"; - sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6"; + rev = "d4b261739e53e8ed8fa5db3d3946de82c0ab8e34"; + sha256 = "0dn6rifr0njpw3mwbyn21bw88lp0kzwwjp7ivgbbl1bxshj0ybhk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict"; - sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict"; + sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli"; name = "bing-dict"; }; packageRequires = []; @@ -5071,6 +5297,27 @@ license = lib.licenses.free; }; }) {}; + bitbucket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: + melpaBuild { + pname = "bitbucket"; + version = "20170404.2146"; + src = fetchFromGitHub { + owner = "tjaartvdwalt"; + repo = "bitbucket.el"; + rev = "5e663da1bd38a14c1ecf4d66a79d4321ac833bcf"; + sha256 = "1sikayb6i1k40zdl4j9n04xcmsf74py5vmcjbvli7k8b3ar7l5l5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf87389e6a5d868850d27e077202e1e52eaf4aa/recipes/bitbucket"; + sha256 = "1d0v6hvmxky3k2m89b7xm1igx9fmzvhdpn1bi8zln61m4zgr3yz0"; + name = "bitbucket"; + }; + packageRequires = [ emacs request s ]; + meta = { + homepage = "https://melpa.org/#/bitbucket"; + license = lib.licenses.free; + }; + }) {}; bitlbee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bitlbee"; @@ -5103,8 +5350,8 @@ sha256 = "00xbcgx4snz4sd7q7ys24rsnf5wdxjn402v8y5dgn4ayx88y1rrj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e62944dfef1c0c259524bacf1c82e68571acaf30/recipes/blackboard-bold-mode"; - sha256 = "0zip1v96mdmz2z9hakn9asg5c1gm68i4mdmrsccqig3s60zrxvhz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/blackboard-bold-mode"; + sha256 = "08fmzm5lblkk503zr4d6hkp45075pwwd8zinngasrsf1r01isksj"; name = "blackboard-bold-mode"; }; packageRequires = [ cl-lib ]; @@ -5138,8 +5385,9 @@ pname = "blank-mode"; version = "20130824.459"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/blank-mode.el"; + url = "https://www.emacswiki.org/emacs/download/blank-mode.el?revision=40"; sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv"; + name = "blank-mode.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e687f3d3945bdff0e8e36bcff1f629d8ad921fc/recipes/blank-mode"; @@ -5239,12 +5487,12 @@ blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20170126.458"; + version = "20170430.721"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "bcf4302dd158e6a7b9e4a57d739818987e039e76"; - sha256 = "0dc27df1cph67ygvsvjjskc21flsa055hzxc2j00sk5078gp7a9y"; + rev = "98e397c4014f7c81c42722028778726cbf9baf8c"; + sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5257,22 +5505,22 @@ license = lib.licenses.free; }; }) {}; - blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, s, simple-httpd }: + blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, org, s, simple-httpd }: melpaBuild { pname = "blog-minimal"; - version = "20170304.1548"; + version = "20170311.555"; src = fetchFromGitHub { owner = "thiefuniverse"; repo = "blog-minimal"; - rev = "a3454f1358a8add2969f221c4e56d3bc17ee4baa"; - sha256 = "0g7n9g4hnaar5basv26c1p00kdkn3vsbsxzby2bi1590grkgjycq"; + rev = "d679d74039ecc114b037800c8a94303265b9542a"; + sha256 = "1x14xwnv22dc99gzbn6z48dhxpy46a7lrby2p59aizpwpysi64yk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56217a33b0669a782621dd65d83419ae371ed60a/recipes/blog-minimal"; sha256 = "1qj25b6n3slvmbqvzfd37v4xmy1vvz37686jdr29bw5qk4prgxff"; name = "blog-minimal"; }; - packageRequires = [ ht mustache s simple-httpd ]; + packageRequires = [ ht mustache org s simple-httpd ]; meta = { homepage = "https://melpa.org/#/blog-minimal"; license = lib.licenses.free; @@ -5344,12 +5592,12 @@ bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bongo"; - version = "20160623.1058"; + version = "20170312.808"; src = fetchFromGitHub { owner = "dbrock"; repo = "bongo"; - rev = "6499a28fdd8249724cf3b9f3cf2dcbce8c4d3927"; - sha256 = "0s24b0z4q23rfj8j8ifhnnh1ll87c3frpcc0p829a2qqb2nqc4nn"; + rev = "1961b2e05c01c03d0dd6527988d1348610359d0d"; + sha256 = "0alm2kq32sxxc7708djxhgd3xnzlglynqjqp9af0y308ryajmdgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo"; @@ -5386,12 +5634,12 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20161019.1425"; + version = "20170621.1207"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "8b567f5efe71d94bba3c29c52dffd58a33abc0cb"; - sha256 = "1gwj8d1635l7l7cqk1508gkzfgi8hpq6w0x22w7rd5yrwz1nmx5b"; + rev = "27c372592e19678bda5012f1ec3c60bcf9df78d4"; + sha256 = "1qcjbmkx6qim2j1sbzjjidqhrakjsipay9bdssyfyi4bwwp8mnq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -5406,10 +5654,11 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170227.1053"; + version = "20170703.1431"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "14xkhc0x5ac2b0np5hvb0f4d1rap4yysbvm3fnmaaq4kylriysad"; + sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; + name = "bookmark+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; @@ -5446,12 +5695,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170214.1228"; + version = "20170709.1244"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "bb751855aa099ea3d6f4573534e0d3fa010aaea8"; - sha256 = "09bfmds8xfjafcqpn6fc5qjaixd0pvjn42jyr4kkgb8pi5c4vkvv"; + rev = "2b7a41491df809e425b81a574fea64e9d6f7f011"; + sha256 = "1haxw4xccalkwmrln5whd0lgfrq7lhdfyip2firlnrkaq8zw741w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5506,22 +5755,22 @@ license = lib.licenses.free; }; }) {}; - boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "20081011.1326"; + version = "20170418.835"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; - rev = "4c49b2046647ed187920c885e175ed388f4833dc"; - sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73"; + rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883"; + sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s"; name = "boxquote"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/boxquote"; license = lib.licenses.free; @@ -5635,16 +5884,16 @@ browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "browse-at-remote"; - version = "20170302.2236"; + version = "20170624.309"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "6de3e242e7b11ee2cb942547ac01823fada52605"; - sha256 = "09c4hsg02bmws65z4396j1yavx96785l6h3yl6s91qgx4byq9l17"; + rev = "e8b7533f6c37c4660e4ba97cd4856383f4e4ce32"; + sha256 = "0650c2401qidw5zprgvnkvqbar9vs9yyj58njiwc394xf5xwzsmb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote"; - sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote"; + sha256 = "0s088ba047azba60rlfn3jbqr321vnm953i7dqw2gj9xml90kbm4"; name = "browse-at-remote"; }; packageRequires = [ cl-lib f s ]; @@ -5681,6 +5930,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el"; sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq"; + name = "browse-kill-ring+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+"; @@ -5718,8 +5968,9 @@ pname = "bs-ext"; version = "20130824.459"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/bs-ext.el"; + url = "https://www.emacswiki.org/emacs/download/bs-ext.el?revision=8"; sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw"; + name = "bs-ext.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74c4861e76bb806ec4c4fd3482162bf0d95530a8/recipes/bs-ext"; @@ -5798,12 +6049,12 @@ bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "bts-github"; - version = "20150108.27"; + version = "20170401.549"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-bts-github"; - rev = "57c23f2b842f6775f0bbbdff97eeec78474be6bc"; - sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9"; + rev = "ef2cf9202dc2128e5efdb613bfde9276a8cd95ad"; + sha256 = "173i9n4c8mg93gpc7ljxh3nhm4lq2c04yhrvjz6fwwwqvmnkha5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f3e87699181877e50d75a89e2ee76e403fc9317/recipes/bts-github"; @@ -5924,11 +6175,11 @@ buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-sets"; - version = "20161231.1331"; + version = "20170505.829"; src = fetchgit { url = "https://git.flintfam.org/swf-projects/buffer-sets.git"; - rev = "f29c30f7cef4e29837c1e6e1282cf99a37c4210c"; - sha256 = "0kdi330p5xk67nzhj7mrz8arsblbx39lj1z4zy863294fn3ark7g"; + rev = "dd47af82f6cd5c4bab304e41518d4dc06bd6e353"; + sha256 = "1wsx7m9wmzc6yiiyvsjmlqzazcss4vaq8qcdm3r1gybli32llraw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets"; @@ -5945,12 +6196,13 @@ pname = "buffer-stack"; version = "20101223.220"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/buffer-stack.el"; + url = "https://www.emacswiki.org/emacs/download/buffer-stack.el?revision=2"; sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r"; + name = "buffer-stack.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b1245af5b838e4e782cf323813ba143a7666ac4/recipes/buffer-stack"; - sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buffer-stack"; + sha256 = "0lnd5mh20b4isa6m930dzibw3v4jyzp1ryvmz8irca28xfn0hjln"; name = "buffer-stack"; }; packageRequires = []; @@ -6067,12 +6319,12 @@ build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "build-status"; - version = "20170226.655"; + version = "20170323.1621"; src = fetchFromGitHub { owner = "sshaw"; repo = "build-status"; - rev = "25c61f445502699d18fda7eb2010a38cbf8085a2"; - sha256 = "04siqz69c5dp762c118b1b7iwdz8x3gavc3bncacgnx4ybyb1crf"; + rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b"; + sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; @@ -6138,8 +6390,8 @@ sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/buster-mode"; - sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buster-mode"; + sha256 = "0nylkxy9qlj1h5v0pja4g315xcj5qzvkys4dsnzbh3xq4xzyj6xj"; name = "buster-mode"; }; packageRequires = []; @@ -6214,12 +6466,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20161209.154"; + version = "20170701.429"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "07c525eaf9c1a9f1b48928b64e1802b1f1b25be3"; - sha256 = "1l4hjb21283mrb9v67k2xl83plq18ri7pqcp2kgs2ygbfnbwwqcs"; + rev = "b6deeffe032527696e32623b69bdf07b538a315e"; + sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6277,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"; @@ -6348,8 +6600,8 @@ sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/096d45e6fee9ec514b853d946bf0ce77a5c33ebc/recipes/cache"; - sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cache"; + sha256 = "15pj7f4n0lk8qqsfafdj19iy0hz4xpfcf2fnby7ziq2dldyqrax9"; name = "cache"; }; packageRequires = []; @@ -6407,8 +6659,8 @@ src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-cake-inflector"; - rev = "a91cecd533930bacf1dc30f5209831f79847abda"; - sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4"; + rev = "a1d338ec4840b1b1bc14f7f9298c07e2c1d2d8fc"; + sha256 = "0m8ss9aky24f5i6b8fyy8mhv9ygj158crjyddnj9xx73vsjf96bs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77c46238b632047160d6dfac9b257f57b0c4283b/recipes/cake-inflector"; @@ -6428,8 +6680,8 @@ src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-cake2"; - rev = "0a9d0b3a1c49ba1730088416f50507f53221c70b"; - sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb"; + rev = "caffb646c86333b8747cefeba070d57ac4fbaf00"; + sha256 = "14q5hny3bdwcaq3ls6jlk8np4hf99jksxz84dhm2rdvnm18b1wk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18e38d9cdb9f1a8cc05545c52c3a76265a9aa2ab/recipes/cake2"; @@ -6484,27 +6736,48 @@ license = lib.licenses.free; }; }) {}; - calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }: + calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20160302.1858"; + version = "20170714.840"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "e03ae470788778e7714b73520014eadc03a88abd"; - sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj"; + 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 = [ 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 = "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"; @@ -6516,8 +6789,8 @@ sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d9791feacdf46836d22ee907394b7242387804b9/recipes/calfw-gcal"; - sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/calfw-gcal"; + sha256 = "0pzjs8kvf9vxdzziq7zd59vniq21k4a6yygpv4fz2by3s3bvnrid"; name = "calfw-gcal"; }; packageRequires = []; @@ -6526,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"; @@ -6554,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"; @@ -6572,13 +6908,13 @@ pname = "caml"; version = "20151009.845"; src = fetchsvn { - url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16556"; + url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/"; + rev = "16560"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/55c90eb51ac6a69383c8b63987235d325f43fdb0/recipes/caml"; - sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caml"; + sha256 = "1s05s3dqxlz2qhvjr3j9akb56finpmpbnsjb5pmjnzflhc4y01cf"; name = "caml"; }; packageRequires = []; @@ -6611,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"; @@ -6640,8 +6976,8 @@ sha256 = "055w1spba0q9rqqg4rjds0iakr9d8xg66959xahxq8268mq5446n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f1a6003eae15ed12e8d6e5e74316f03201cf8373/recipes/caroline-theme"; - sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caroline-theme"; + sha256 = "178nxcz73lmvnjcr6x6as25d8m5knc21jpr66b4rg0rmlmhchkal"; name = "caroline-theme"; }; packageRequires = [ emacs ]; @@ -6716,12 +7052,12 @@ cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "cask-package-toolset"; - version = "20160102.137"; + version = "20170411.1430"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "cask-package-toolset.el"; - rev = "24fb0cf745d5e10342dbd2cdcd3d6c9910167726"; - sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s"; + rev = "aed1f12b6072a2467e0efa23c3265aaa9f414425"; + sha256 = "1as3fxs1h4gq6mv7gdsjqa59prrgzzs22c9qky8q47dr20sc9q6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; @@ -6783,8 +7119,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "651cdbca22d725958b4ee26f8f299f841005797d"; - sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl"; + rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; + sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6825,8 +7161,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "651cdbca22d725958b4ee26f8f299f841005797d"; - sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl"; + rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; + sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6850,8 +7186,8 @@ sha256 = "1pvlq98qll44g1ag8w5rkbppk1b8l8inkwn5qzrlsjr8pngyhljz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/193956c26050e15ddd7fb6579a053262d1de1e30/recipes/cdlatex"; - sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex"; + sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9"; name = "cdlatex"; }; packageRequires = []; @@ -6928,12 +7264,13 @@ pname = "centered-cursor-mode"; version = "20151001.634"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el"; + url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el?revision=30"; sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl"; + name = "centered-cursor-mode.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dcb9f72c7ecc30f5391e4f83c7bb173af04978e5/recipes/centered-cursor-mode"; - sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/centered-cursor-mode"; + sha256 = "1sq0hfvnm8sbqyxzr0znq0lwrhbqm961wi13yywjcwxd3x0ar3z0"; name = "centered-cursor-mode"; }; packageRequires = []; @@ -6942,22 +7279,22 @@ license = lib.licenses.free; }; }) {}; - centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-window-mode"; - version = "20160210.247"; + version = "20170528.25"; src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; - rev = "ff2350f5258249bbc9e07ac60c76028f4ae07190"; - sha256 = "1i5ipll7jlrxqb0kcwq0rlrpfaxsyp663bwjdnhj84c50wlv052f"; + rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15"; + sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode"; sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4"; name = "centered-window-mode"; }; - packageRequires = [ s ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/centered-window-mode"; license = lib.licenses.free; @@ -6991,8 +7328,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "cerbere"; - rev = "ef573b05f4c2a067b8234003aaa4b2a76fffea5c"; - sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im"; + rev = "dd2105c372b469954e665a5aa0c3766b4922ce6a"; + sha256 = "0i8939rycyq7baa043ksdv90mg3ik2amgkjf6iv4cx9r6c1xkzwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4145e270a2113f30f8bb4d0f6c335f1c76f77b1c/recipes/cerbere"; @@ -7005,6 +7342,27 @@ license = lib.licenses.free; }; }) {}; + ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ceylon-mode"; + version = "20170626.1403"; + src = fetchFromGitHub { + owner = "lucaswerkmeister"; + repo = "ceylon-mode"; + rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6"; + sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; + sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4"; + name = "ceylon-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ceylon-mode"; + license = lib.licenses.free; + }; + }) {}; cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; @@ -7012,8 +7370,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "5d48e64b00bd6d9ceef9f80ce27be6b8df76415d"; - sha256 = "0zzk009qjdc92svann593l7w3qajna29nv92qwsp4hav9zjgq07w"; + rev = "28484409e8f64f976bf3d80f10081b18f7724cf5"; + sha256 = "0zvxrbf30hy511jmlfvmqj5yiysfbs73x064w1px7ghavczdjvx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7051,13 +7409,13 @@ pname = "cg"; version = "20170201.347"; src = fetchsvn { - url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12036"; + url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; + rev = "12270"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg"; - sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg"; + sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5"; name = "cg"; }; packageRequires = []; @@ -7066,6 +7424,27 @@ license = lib.licenses.free; }; }) {}; + challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "challenger-deep-theme"; + version = "20170623.311"; + src = fetchFromGitHub { + owner = "MaxSt"; + repo = "challenger-deep"; + rev = "22022667437e94c2309c7c77a14268970de16146"; + sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; + sha256 = "1apjc32wy7h7fadxckdbfa6wzd360c7v6dig9gikjbsxm8xgdg60"; + name = "challenger-deep-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/challenger-deep-theme"; + license = lib.licenses.free; + }; + }) {}; change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "change-inner"; @@ -7077,8 +7456,8 @@ sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cbe7e12067af7e5287c714df6677d438f7f30c36/recipes/change-inner"; - sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/change-inner"; + sha256 = "09y076vhhvp21jsvw9f5z4yk6cnmmjavg7600flxg5g27ydgix57"; name = "change-inner"; }; packageRequires = [ expand-region ]; @@ -7111,12 +7490,12 @@ char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "char-menu"; - version = "20161231.1609"; + version = "20170518.2247"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "d0f87d8077e8516f562ae71d037839e164c987b1"; - sha256 = "0nxpm9bq8003wyjb8sg741nn7fcgvmsd0lhi0i907xpmii7bbjp6"; + rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2"; + sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7153,12 +7532,12 @@ chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chatwork"; - version = "20161121.555"; + version = "20170510.2142"; src = fetchFromGitHub { owner = "ataka"; repo = "chatwork"; - rev = "70b41451e2d2751e634e84e0452b34c558463fe4"; - sha256 = "11h76qc2n2p8yz941drmi0rp13xmmlacikfygdv1n7s730ja0hgy"; + rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c"; + sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork"; @@ -7171,6 +7550,27 @@ license = lib.licenses.free; }; }) {}; + cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cheat-sh"; + version = "20170707.757"; + src = fetchFromGitHub { + owner = "davep"; + repo = "cheat-sh.el"; + rev = "f61dc1ab9f0d6933dfda5366b8051217f1e9b491"; + sha256 = "028xyflii2ah6ijhq4fpmzsaj1nhps90kprpy7x7a9v4s85yvadx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; + sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80"; + name = "cheat-sh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cheat-sh"; + license = lib.licenses.free; + }; + }) {}; cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; @@ -7220,8 +7620,8 @@ src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "a986cce6fe0290934dedfb7afcfdcf5f5eb47a30"; - sha256 = "1cwn5xjchra3dsngbyh23w2p4ndjyjjg0zmj1ij4fk3v86cfqf79"; + rev = "19437183960ee525de1c0cde13dc2c8d8921abfb"; + sha256 = "0hrl7h2069g6r2b3i2b7sxizny6ihgf8qajfima32la3gsb0hd4k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7342,12 +7742,12 @@ chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20161008.450"; + version = "20170512.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-fonts-setup"; - rev = "3f1e8d13837d22109a0eb0af4ee85fb2e90b31a1"; - sha256 = "0xx692nbnw6wkdh84i59kfr0nzq6jh4iarzzqppd60rr48r3l9wx"; + rev = "a88f45239ca73e95eb6bac923590f1d108b822ca"; + sha256 = "1h0nwrnh0krn9p0x1cj67gjdlzr82xml76ycn6745f943sn6d5ah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; @@ -7371,8 +7771,8 @@ sha256 = "01i7nycjnx4cpfgwakj14jv9dwybjl5jnslcxic9pr1n77mz53wk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6c2e447028dbae2dfefc47859c185af254210fe8/recipes/chinese-number"; - sha256 = "0qj7lh7asic77dsdlsv4pg2jzickqa0m5lvn8f184qq98yfmj6d6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/chinese-number"; + sha256 = "01ia2l5vrg8fhaxcvk8pv9qfm08xs0fbyc9j57nbdk9wxnd9i45s"; name = "chinese-number"; }; packageRequires = []; @@ -7384,12 +7784,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20170221.206"; + version = "20170512.735"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1"; - sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0"; + rev = "d57d0fd47565dc087724a68c6b3abd16a58625ae"; + sha256 = "10ir2452rj6f48qfgwps6y1mn5afrsa04z0xl2f31j5463j4b4mx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7426,12 +7826,12 @@ chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-pyim-greatdict"; - version = "20160619.2109"; + version = "20170513.1833"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim-greatdict"; - rev = "11cf5145710349e9d928eb9197bebb426025fd58"; - sha256 = "1pza690b31ynyj31f1gp7y2d29ri3swcblpzd2pcpj3ynmnbsy3f"; + rev = "8efd9321d21d5daabdb32cb3696bc7c7b83ce991"; + sha256 = "05ap9d2kk9dyj85zm581nwizbdqx8fqa0yjswk4df0y6mgz4g0q9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict"; @@ -7531,12 +7931,12 @@ chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-yasdcv"; - version = "20161030.1504"; + version = "20170504.321"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-yasdcv"; - rev = "664494d4c4562a4d83a0e73386f854829d7a52c0"; - sha256 = "1qnhyv4b3sy596r3jz13iypi3jyr266lyphpw82ivb6dx33awk70"; + rev = "92231de8771f2ffc9f5bb9b4ee08700fdb1a9dcb"; + sha256 = "0viihcrnf7psqkfj2izdaah2w5bkz2cm46bgbhygzfqx8424vqh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv"; @@ -7553,8 +7953,9 @@ pname = "chm-view"; version = "20110616.1019"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/chm-view.el"; + url = "https://www.emacswiki.org/emacs/download/chm-view.el?revision=5"; sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8"; + name = "chm-view.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8688cd57fca1974403c0e36d6289845059adac5c/recipes/chm-view"; @@ -7612,12 +8013,12 @@ chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chruby"; - version = "20161222.430"; + version = "20170509.700"; src = fetchFromGitHub { owner = "plexus"; repo = "chruby.el"; - rev = "04182d666e19963fa0389cb744fc5cce62049a62"; - sha256 = "0cj5cs2bj7r5ijhz9vyfyzcq4mfccya34n9gs2vjdr2fg9mhgynx"; + rev = "3eddd2f5fc2ac979b496394c74e4aee436b64a28"; + sha256 = "15fihl38fa3jzn4r0abjpkqzibsrn0pnlvab6xba0ffr4sv4m0y2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby"; @@ -7633,12 +8034,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170306.1"; + version = "20170717.303"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "52e69c102f2e6438196e223483a388115809bbc1"; - sha256 = "0cr9clqni9yy5kxspy9nn9llzpqaa3x1d5q4fnlg7qncv6jyfyqb"; + rev = "7daf4e968de21e7eb7bb2dc1b6ca30ae4e990532"; + sha256 = "00y8d8gz0nfqr9dfd1nrkm32ckaln4cg6l6k3jbjzc0la673ljfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7746,8 +8147,8 @@ sha256 = "1x96f5wc916dcwb75a34b6x1mas20gdgy34c7rg59n91ydn1mfaf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4a31dfc9cfe8ca4e72b7060e1db8c3864299e5b/recipes/cider-spy"; - sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cider-spy"; + sha256 = "086yxz90mgc5si9k4j15nkc51k0lfk1dx1kq3r3swhyw3cwn7vh3"; name = "cider-spy"; }; packageRequires = [ cider cl-lib dash emacs noflet ]; @@ -7759,12 +8160,12 @@ ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ciel"; - version = "20161230.2212"; + version = "20170330.526"; src = fetchFromGitHub { owner = "cs14095"; repo = "ciel.el"; - rev = "ea047b6c097255ea3709b56007d0d1a3b3d5c9bc"; - sha256 = "1f0f2l3na49964wlyv8w99q2qqv5dsr880i6n1xin0q6yqms61yw"; + rev = "8c73f78d60ef52d3c395a9629963a63439b8a83e"; + sha256 = "1jaxqri8l7y1lqj830h5alxn37skjpb56j6ax8qf9926n8qz3arm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; @@ -7822,12 +8223,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170304.419"; + version = "20170528.731"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9d68903018f255838b51c734015be74bbdbf539c"; - sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh"; + rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; + sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7872,8 +8273,8 @@ sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a12bd6769ce7a5745c2da06dcd57ed3ba2ed891/recipes/cl-format"; - sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format"; + sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy"; name = "cl-format"; }; packageRequires = []; @@ -7909,8 +8310,8 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "297038"; - sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2"; + rev = "308172"; + sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -8115,12 +8516,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20170126.118"; + version = "20170608.320"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "0fb72efc1cb9a2a688e324e7fdc51f258a86e36d"; - sha256 = "0sibcrsygaxk60f2rrjbmsp7cjfgqkj7a40psal19nf1ygcy634y"; + rev = "769eb06ac82dff8aa0239b9ca47cf3240ff0857f"; + sha256 = "17g6rq30dvvhr3lljzn5gg6v9bdxw31fw6b20sgcp7gx4xspc42w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8295,12 +8696,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170303.2310"; + version = "20170712.349"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709"; - sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka"; + rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4"; + sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8320,8 +8721,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709"; - sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka"; + rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4"; + sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8358,12 +8759,12 @@ clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "clojure-snippets"; - version = "20161024.16"; + version = "20170713.2310"; src = fetchFromGitHub { owner = "mpenet"; repo = "clojure-snippets"; - rev = "bc9144ae5cd9e4468a9d34f1ae8a05d9933e5a39"; - sha256 = "1xcjlid47w4xjxishal2rvfdwk7qyphy2v2bphdaysllccclw9pq"; + rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68"; + sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets"; @@ -8379,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 = "d35f139dfff1f0a7aafbc8ade36a97f894c29922"; - sha256 = "19zsz8yabs77zk0b2509g7rkgv3a1lkzgqyc7b80rqlpsrlki3d0"; + rev = "7af6fa717f08fda930641a27f3a07743c2042514"; + sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8429,8 +8830,8 @@ sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/closure-lint-mode"; - sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/closure-lint-mode"; + sha256 = "11kxgvfwngdjryrrihlpn0509axwv4zwkxzs4h1pw5vi7sv1n6xd"; name = "closure-lint-mode"; }; packageRequires = []; @@ -8523,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 = "20170202.1402"; + version = "20170712.809"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "916f35e775c721a97fca8e11565c12207448c2f1"; - sha256 = "1c7y2zyk8ihzn2za9mlpvjv5fp559rd2a5b42jz7lm2zkyn5a8b8"; + 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; @@ -8551,8 +8952,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "add3b1ee4f798fe667b53a521eb18a623e64f0e0"; - sha256 = "0k0przix6iyfqc9flphsgbzbz09r2lbmw45667zbimpd91k4a29f"; + rev = "2d5e494637f9dad13fd0206ac3420e7d26f8b778"; + sha256 = "0wsljwpd0ld4c0qxfn1x1a7xvcq8ik5dmxcys94cb2cw8xxgzbz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8597,8 +8998,8 @@ sha256 = "0wi097yk9p1xcfmps1g58xvvlv60akwky4y0pxdz6pa31w9jd1q8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo"; - sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cmd-to-echo"; + sha256 = "1b4mw1ips4695ixgw2hyinq9ry3bx4d1842kr7k6155a1v34s4zh"; name = "cmd-to-echo"; }; packageRequires = [ emacs s shell-split-string ]; @@ -8611,8 +9012,9 @@ pname = "cmds-menu"; version = "20170221.1557"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cmds-menu.el"; + url = "https://www.emacswiki.org/emacs/download/cmds-menu.el?revision=10"; sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs"; + name = "cmds-menu.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; @@ -8667,27 +9069,6 @@ license = lib.licenses.free; }; }) {}; - coati = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "coati"; - version = "20170228.705"; - src = fetchFromGitHub { - owner = "CoatiSoftware"; - repo = "emacs-coati"; - rev = "f06eee92cb43b0dfd6dcf758ae05ac021a184f1c"; - sha256 = "1l36pjapcsgc6sph6scgpc4zl5qfwf17ppyjznchkh4ykj13ghj3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f28144401803d86bafdc9c5b60bcb3ada0bab/recipes/coati"; - sha256 = "0f6vhypv8b8maq72pc1xp1yqv760za508kff2dqv0crwyd7iv32h"; - name = "coati"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/coati"; - license = lib.licenses.free; - }; - }) {}; cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; @@ -8716,8 +9097,8 @@ src = fetchFromGitHub { owner = "lujun9972"; repo = "code-library"; - rev = "3c79338eae5c892bfb4e4882298422d9fd65d2d7"; - sha256 = "0gc56pdyzcnv3q1a82c79i8w58q9r6ccfix9s1s6msjxzxkznap5"; + rev = "32d59c5c845d6dbdda18f9bd1c03a58d55417fc5"; + sha256 = "1n00bb39jgx02zdgla85zx0a338xir0zh0af6xca14kg5bx07vsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/197bdc508c4fd9712125553a108ca6c9fedcaefc/recipes/code-library"; @@ -8758,8 +9139,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; - rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c"; - sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism"; + rev = "7013d933cd9d3c04f19a6572176483b48a311807"; + sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5aee771432c63fe2f0ec719ef000f2c5971947b5/recipes/codesearch"; @@ -8817,12 +9198,12 @@ coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coffee-mode"; - version = "20161124.832"; + version = "20170324.240"; src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; - rev = "231eccd8cf662516159359ed24d1b27d068ec7f8"; - sha256 = "1anidih1kbwqifrb7v90ga172alqhxizwz1vrf87cnj5ns1h1hx8"; + rev = "86ab8aae8662e8eff54d3013010b9c693b16eac5"; + sha256 = "0hf06wp6cpsm7fivwkph6xvc2r39xww8q3aibp4nprlrwcmmv2al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; @@ -8835,13 +9216,35 @@ license = lib.licenses.free; }; }) {}; + coin-ticker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "coin-ticker"; + version = "20170611.27"; + src = fetchFromGitHub { + owner = "eklitzke"; + repo = "coin-ticker-mode"; + rev = "9efab90fe4e6f29464af14e0d8fd1e20c0147b80"; + sha256 = "0xnrh6v4s2s3fgvw0v9fl48dlk4r2p6axp7xf41gzb1ai81yczhv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd783998658b69159e39d9440da7a0dd04135e49/recipes/coin-ticker"; + sha256 = "0v4zyswhghknlsal9xfsgwf8ckjwrjkjrg8w7p6yjqrxmfsbw93b"; + name = "coin-ticker"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/coin-ticker"; + license = lib.licenses.free; + }; + }) {}; col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }: melpaBuild { pname = "col-highlight"; - version = "20170221.1559"; + version = "20170510.1541"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/col-highlight.el"; - sha256 = "1xm1sbmcily1zy5xfpiphy3waq7928xpqmsrm3rcy37xbk2xj7vr"; + url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=31"; + sha256 = "0wi4xz8n5ib65spyrgqsp8l6zafnvxdiw3hy918fs0xjj7ziy6qc"; + name = "col-highlight.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight"; @@ -8857,12 +9260,12 @@ colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colemak-evil"; - version = "20140508.1612"; + version = "20170401.1626"; src = fetchFromGitHub { owner = "patbl"; repo = "colemak-evil"; - rev = "624985835a9e8192c687b99f7d59e7d01713c453"; - sha256 = "1bwbqb9j5cn9b42n4w8nr6sqyk40xcp06mnxn9f28w4hnjd12pqj"; + rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7"; + sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil"; @@ -8899,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"; @@ -8943,13 +9346,13 @@ pname = "color-theme"; version = "20080305.34"; src = fetchbzr { - url = "http://bzr.savannah.gnu.org/r/color-theme/trunk"; + url = "https://bzr.savannah.gnu.org/r/color-theme/trunk"; rev = "57"; sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d49f86519b1340420a5ee587de77a3a6fa5791c3/recipes/color-theme"; - sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme"; + sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy"; name = "color-theme"; }; packageRequires = []; @@ -9045,12 +9448,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170106.1620"; + version = "20170626.1417"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "ed7bcd2dd40989c99fe0ff13802432de8e0e8edd"; - sha256 = "0z65y0wda3rwymmjy7q8g4h1ar1a9crqgf3i8y9cyq5n8bmc5z7c"; + rev = "ffcec9177c8b4393f036acb5ca51b33b53916ea8"; + sha256 = "0w59yfg7chx6srxpxsnwz7qrgyy35pdswv44j6lbh33hylxmclrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9130,8 +9533,9 @@ pname = "column-marker"; version = "20121128.43"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/column-marker.el"; + url = "https://www.emacswiki.org/emacs/download/column-marker.el?revision=13"; sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9"; + name = "column-marker.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f629b6b44fae3191f58e007c39b75bbb880d517/recipes/column-marker"; @@ -9144,6 +9548,27 @@ license = lib.licenses.free; }; }) {}; + comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "comint-intercept"; + version = "20170317.528"; + src = fetchFromGitHub { + owner = "hying-caritas"; + repo = "comint-intercept"; + rev = "a329abf01fa8e0c6b02b46b29bcb421a21120dc5"; + sha256 = "0qswlafav415fh1dwqjsjmqlbnsjdl9gl3nzzya76ql5f0gb7svb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d38188ec2d6e16714de9bb24ebd1ea89c7df3da/recipes/comint-intercept"; + sha256 = "1m2fn02n7aphlqmiaxgwp8jqg60sq4001cnkdxn5wb3w1hxy5qvq"; + name = "comint-intercept"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/comint-intercept"; + license = lib.licenses.free; + }; + }) {}; command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "command-log-mode"; @@ -9273,12 +9698,12 @@ common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "common-lisp-snippets"; - version = "20161231.1557"; + version = "20170522.2147"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "common-lisp-snippets"; - rev = "bb8d22994592a7e69ef8e613e8638882e4e0e404"; - sha256 = "0i4w5jkz0yxnnapyijvjd5z1rcp0g3r3abj6hchb5yd26h1jcz8a"; + rev = "46f1de08c8d86b72b474c2f8e1c1b313ac70f23d"; + sha256 = "148ach1p3iqch3a6r1y8wkr1avyprg47jjz3a31vjvqgcwgs3ynw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; @@ -9294,12 +9719,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170218.1913"; + version = "20170715.1035"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "bc2ce4e23ff2a3bd4a8ffa766acc5efb0643a7d1"; - sha256 = "0s246gaa85g6mmvzrk6293qni39rg43lmdgkfn5hwz2zrbp9blfx"; + rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; + sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9319,8 +9744,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; - rev = "182a8fdabc01630f255beeb2708728c0cd5c6316"; - sha256 = "1rqf9i4l32njpwx4aiwxqr994g3jzispwprs6nwjfvg70xkvm4m0"; + rev = "b268a00821c79d7e4c5da0d7035356afb389b3a7"; + sha256 = "0pjiiqads9xawcwldic4m7mfi533s3wmqafz4day92v9135xwczj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; @@ -9336,12 +9761,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20161119.1155"; + version = "20170430.53"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "5e8b51b21d32d3d8929fc2e82dec8f584a863399"; - sha256 = "0appxl6njgxmgpf9np5cpjym3ifgdwh0mzvsnxvx08pidrrnmm33"; + rev = "2c30c3bdb8316b27d5c1832b944cb146d00de456"; + sha256 = "183hyy5vy7xs6hwsk8nrylck8w5czcqwzfx0wik4ppx8011jzis1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -9415,8 +9840,8 @@ sha256 = "0l4xnqhk3a4szwcfyw90naxasbca8nrnjhnaqiw8zyixhakdbhxz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex"; - sha256 = "14s3hxm7avpw59v4sz0d3drjzin745rczp93rcv4s7i3a7kdmn30"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-bibtex"; + sha256 = "1b96p5qyxl6jlq0kz0dbma5pwvgqcy4x4gmpknjqrjabafbq1ynn"; name = "company-bibtex"; }; packageRequires = [ cl-lib company parsebib ]; @@ -9428,12 +9853,12 @@ company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-c-headers"; - version = "20150801.901"; + version = "20170531.1330"; src = fetchFromGitHub { owner = "randomphrase"; repo = "company-c-headers"; - rev = "9bfdd438be5ecb75e5717eb48e09ce69904676e3"; - sha256 = "152fwy23x5k3dp45z1k4h4n6pcvl3wrhwhwd4l4rp06yhgwf0i1a"; + rev = "e959d43bebf0a524f7378669983a39ee1379cc21"; + sha256 = "18fi1jp3scz5rrf877qd1ciwx29bzndb85ifnx4ki0jvznvfas8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97b5c53967e0ff767b3654c52622f4b5ddf1985/recipes/company-c-headers"; @@ -9470,12 +9895,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170227.644"; + version = "20170615.1842"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "202f38a11d8b14b8f3a84c8261816dbcf0dbff8f"; - sha256 = "0zs3n1nycpahx5qmlfpkb4nc1g7kjr0q9pc5lwgpasi54bcp3371"; + rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0"; + sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9491,12 +9916,12 @@ company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }: melpaBuild { pname = "company-dcd"; - version = "20161114.2306"; + version = "20170516.210"; src = fetchFromGitHub { owner = "tsukimizake"; repo = "company-dcd"; - rev = "4161374fd0da40bbebb6f6e01f1589625708d8ef"; - sha256 = "0pi0363s8ww6xz7drgxi195jcanvmx1g4wv4zrpdl9dx8cf166bs"; + rev = "4832188a9e42287539a69c372fe1643166a6a7aa"; + sha256 = "07caaff8chabrgl4hqanq13p5qhzqx5fcg2synl8856d7v1456vc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd"; @@ -9586,8 +10011,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7"; - sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k"; + rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; + sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9645,12 +10070,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20170226.1930"; + version = "20170325.810"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "e2183e247720c1e252e04300313f386749997f5b"; - sha256 = "0gsdcm84k2j6753r44r2qxaq62264xj8cxqayynxvjsawzv3ljav"; + rev = "339f502e46e7d9214b61498d539b17f8f0322d17"; + sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9716,8 +10141,8 @@ sha256 = "02gq083lpbszy8pf7s5j61bjlm0hacv4md4g17n0q6448rix9yny"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f04b009780ebdf106534916869610d6f7264/recipes/company-ghci"; - sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ghci"; + sha256 = "0q71qil4sndg72s2g5yg17w3n102wlba37y9jbx0l7hisa5l11gi"; name = "company-ghci"; }; packageRequires = [ company haskell-mode ]; @@ -9729,12 +10154,12 @@ company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "company-go"; - version = "20170303.909"; + version = "20170420.515"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "d09cef6327ed848a446636a857cd851dc7e63d19"; - sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9771,12 +10196,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20160826.56"; + version = "20170612.1308"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "f1d6761c581fd12fa1188e26478c0229d8348332"; - sha256 = "10kbyrryjk66ix5024acqrc0nn3hfgsavfpgbdspwbhwcff9czsx"; + rev = "b8001ffc4da7403172835d47bc740cfbac35364d"; + sha256 = "03ym65ckpx6n03l633lwvxiwvcdhm8kjsw91ql1y4f44vijlh2xi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -9796,8 +10221,8 @@ src = fetchFromGitHub { owner = "hotpxl"; repo = "company-irony-c-headers"; - rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa"; - sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i"; + rev = "5bbd427a2d3d4445e3413f7516def9aa80543b2a"; + sha256 = "172wf0ywbvqn9smwnh4kgxx8gw9g2f76irg3fmcv4d8d53mi08wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers"; @@ -9880,8 +10305,8 @@ src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee"; - sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv"; + rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; + sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris"; @@ -9939,12 +10364,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20170306.659"; + version = "20170314.2141"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec"; - sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9981,12 +10406,12 @@ company-qml = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, qml-mode }: melpaBuild { pname = "company-qml"; - version = "20160707.1705"; + version = "20170428.1008"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "company-qml"; - rev = "2027907611cd8a484289340506c63fa3a2c891a8"; - sha256 = "13nxvn0rvz9nfyi0w7iczq28afvln1q6djhn4drfm3ipmrx0cfgg"; + rev = "4af4f32a7ad86d86bb9293fb0b675aec513b5736"; + sha256 = "09d733r07gr4cxp7npyhi93xchvirxh1v00fr487v4a0mdaahpxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b53477eaba4ef62f8317c9454e15ac015442fed/recipes/company-qml"; @@ -10002,12 +10427,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20170226.522"; + version = "20170429.1052"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "30197a39ddedef550fd98803805dc15f844fc3c6"; - sha256 = "1a972l0y58bjpbnmxd2h33arx26naq9f8dbq2vka2axigpy4455r"; + rev = "432c62f034a5097d3f85d7f54afcdc016d7afa12"; + sha256 = "06ijf4ayqkmlmk5waxi7alinv3wpy23b8xm35llf3h1ncg99zwqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -10068,22 +10493,43 @@ license = lib.licenses.free; }; }) {}; - company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: + melpaBuild { + pname = "company-rtags"; + version = "20170522.2154"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; + sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f"; + name = "company-rtags"; + }; + packageRequires = [ company emacs rtags ]; + meta = { + homepage = "https://melpa.org/#/company-rtags"; + license = lib.licenses.free; + }; + }) {}; + company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-shell"; - version = "20161128.953"; + version = "20170517.2241"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "company-shell"; - rev = "a4a7b9ed6b81e4c9f9cb04f63b386fd76d952f11"; - sha256 = "00bgxd66pwchpy1lnv43izgr6gk4c9nh02jab6laf5jk8s9xs2h7"; + rev = "6ae625f80d90e0779c79de38e8f83a336c1d00fa"; + sha256 = "0da9y7x1xvaahsslcmgji6hr3cbn779i504cfrmsabbr3wmkn3fy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell"; sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz"; name = "company-shell"; }; - packageRequires = [ cl-lib company dash ]; + packageRequires = [ cl-lib company dash emacs ]; meta = { homepage = "https://melpa.org/#/company-shell"; license = lib.licenses.free; @@ -10138,8 +10584,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "company-tern"; - rev = "dfa3f39d67f011a78fe04ad5a1c7f54d8d788a0a"; - sha256 = "125p6ipp9mrrc0va4a3pfc2wdnrsk945i9yv0p9lnmrrq69nnszr"; + rev = "10ac058b065ae73c1f30e9fb7d969dd1a79387be"; + sha256 = "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern"; @@ -10184,8 +10630,8 @@ sha256 = "0pjxahrhvz7l45whqlgm6n4mvqqxc8zs1dv33p3b498hyb83f52j"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2cda69dc7d45087fa9a3e0460d2b12a1dce1a7b3/recipes/company-web"; - sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; + sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b"; name = "company-web"; }; packageRequires = [ cl-lib company dash web-completion-data ]; @@ -10218,16 +10664,16 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20161026.2337"; + version = "20170622.146"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; - sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; + rev = "35e8a31e32d0de890547612db8373d7333db8d8a"; + sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; - sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; + sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d"; name = "company-ycmd"; }; packageRequires = [ company dash deferred f let-alist s ycmd ]; @@ -10239,12 +10685,12 @@ composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "composable"; - version = "20160519.1057"; + version = "20170426.459"; src = fetchFromGitHub { owner = "paldepind"; repo = "composable.el"; - rev = "73f46689cc298f87d2986fe634dadc930581addd"; - sha256 = "0phqphcgygy2amwy6lm96mxxhwac03p177lyklksy71gwlr3zxb5"; + rev = "09020605ee7f4e52ff2fa2f6d68d826db1ee7565"; + sha256 = "0vhvgn0ybdnh8c71sbjxh6bb05w5ivm3rmkj4f255zqfkjyddl7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable"; @@ -10285,8 +10731,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -10302,12 +10748,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20161103.743"; + version = "20170608.756"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; - sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; + rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53"; + sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10320,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"; @@ -10469,12 +10936,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20170303.1916"; + version = "20170603.945"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "a77b914ba99729ef618e9e86543da24a46be315a"; - sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx"; + rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; + sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10532,16 +10999,16 @@ coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "coq-commenter"; - version = "20160808.2307"; + version = "20170607.1355"; src = fetchFromGitHub { owner = "ailrun"; repo = "coq-commenter"; - rev = "b57c7c92219201c0f931014127b50fd9b1e0039a"; - sha256 = "03wwdd9n7fijrczrrdhn9xisrj7mqhc2q7z4da6fm3q45sy2npqk"; + rev = "6100933cadea289cdaabf2f56f2a0dd72385c1fe"; + sha256 = "1b28gyyfjknjz23m18yhaj1ir72y8nl75cnam3ggygm9ax65h8i1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/522d8ae8abbc672f09b8893acb77695756746321/recipes/coq-commenter"; - sha256 = "18whbdsdzyjl9gmbzh49gdv5w3d7fpp8c8g1539adzdxarps36s8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coq-commenter"; + sha256 = "07svxfh6wx78lg2r7jssdlipmcwzk8w14vry9fr5wxxi24y37nvg"; name = "coq-commenter"; }; packageRequires = [ cl-lib dash s ]; @@ -10574,12 +11041,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170225.356"; + version = "20170710.1111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10637,12 +11104,12 @@ counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; - version = "20170305.600"; + version = "20170326.559"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-counsel-gtags"; - rev = "9d9061ece327a315ad9161e4fcc20c83638ccd10"; - sha256 = "04h3hn1rs9i7cgdg393v12vqrm862bgiw64hyck7978d1w6n3a1b"; + rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2"; + sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; @@ -10697,15 +11164,36 @@ license = lib.licenses.free; }; }) {}; + counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "counsel-spotify"; + version = "20170612.1132"; + src = fetchFromGitHub { + owner = "Lautaro-Garcia"; + repo = "counsel-spotify"; + rev = "dba8c1bf92e15f34f12a9e22b5958a93f10b46c5"; + sha256 = "1j7rzf8mws2yzdvfz8a6k48b5x6cn11lfvfya5s4c90kyy92j8ag"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify"; + sha256 = "1xs4km5vjhn6dnlmrscz7airip07n1ppybp8mr17hinb8scfpv47"; + name = "counsel-spotify"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/counsel-spotify"; + license = lib.licenses.free; + }; + }) {}; cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; - version = "20170222.940"; + version = "20170405.1508"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "41719590b26b20642c31d233858dc27f34b277b3"; - sha256 = "1ph8hxnwbww194gcqq79ny6p3p396w1dgjr6inkg6f52ylycp25m"; + rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; + sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; @@ -10750,8 +11238,8 @@ sha256 = "1q6cx6kq68xxqcx7zd9l4szy038i5ifjb82fxs3sn5fv00q0j9vd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b2f92804e67fac780a0be850fcd0d0e93992ea7a/recipes/coverlay"; - sha256 = "0p5k9254r3i247h6ll6kjsgw3naiff5lgfkmb2wkc870lzggq0m4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay"; + sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j"; name = "coverlay"; }; packageRequires = [ cl-lib emacs ]; @@ -10805,12 +11293,12 @@ cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20170203.155"; + version = "20170507.629"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; - rev = "5bad6a1f1042e45fa6d2c20fd901100d14d455ff"; - sha256 = "0ag0wkyf1y4q0cnv8gixrbhhaf871x3r97izb82v42i47cnwk228"; + rev = "0d4b22cbf548e0d1ce4e79cc82ada3747bb5d389"; + sha256 = "0cg5cnvcd5nz15bpwi5h6972dlr2kxbzbz23lsq35hcbg3gj22k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; @@ -10876,8 +11364,8 @@ sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/crappy-jsp-mode"; - sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crappy-jsp-mode"; + sha256 = "17m404kdz9avihz52xd7hn5qx06a6k74gmn0gbhly4gl84w3zc6y"; name = "crappy-jsp-mode"; }; packageRequires = []; @@ -10939,8 +11427,8 @@ sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97649d365b8e206fb6b88a47e8f1eb8e0bd2450/recipes/creole"; - sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/creole"; + sha256 = "1q1c6f953g39xal1p7rj8dlcx2crk5cz1q07zp8bgp5jx4nd2z9n"; name = "creole"; }; packageRequires = [ kv noflet ]; @@ -10981,8 +11469,8 @@ sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz"; - sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; + sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; name = "cricbuzz"; }; packageRequires = [ dash enlive s ]; @@ -11036,14 +11524,15 @@ 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"; - sha256 = "1wjj88zv37ak9zd12d7sy7j261x5y17wxmw5jrzk56shkpdvcbq0"; + url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=40"; + sha256 = "1dcynm83a3ixdccw3cqy533d9xwzswyi67cydaqmv35q88dg2nqw"; + name = "crosshairs.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b4144c2fd45877effd8005abf64019aed651148a/recipes/crosshairs"; - sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crosshairs"; + sha256 = "0s7gh5zrb46hzybmpydb0pad7jinvcwds7i03ndhzwx89rxg3019"; name = "crosshairs"; }; packageRequires = [ col-highlight hl-line-plus vline ]; @@ -11055,12 +11544,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20161219.2313"; + version = "20170626.632"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "430235753cda1e9af75d209e36a2c9c4f6599a80"; - sha256 = "1v16ac9wfvnhy5h8v82ym165lz27bv9p0wma44c8nz24cl848rrm"; + rev = "e805ab780a4a1ce22a4436bde09b95e97d150e51"; + sha256 = "007mhf60w8385ki2bqhsfjhhc4zq8k21ivgzpw15z83y641nyjp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11139,12 +11628,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20170203.1122"; + version = "20170502.158"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "571c4c70fe2de790e093cff23050827c5f6e96aa"; - sha256 = "14wr98hq1banf0dbyi83rar0apj9gvwdqfvmnmhzxfr6dnzxsybf"; + rev = "628a4e2afa0e9c4672e8654c86240cb7f7bdf444"; + sha256 = "0gnl7nddgy7b83p70ybr41s3f6ybs383hdbzhp9jvxb21g665hn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11157,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"; @@ -11189,8 +11699,8 @@ sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3b5d83fcfb9d03301b95cf13e67549ce0f46e3/recipes/css-eldoc"; - sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/css-eldoc"; + sha256 = "0k0yzpqwfh5rg8sbv60simdslag514768i0naimm8vyrvv87fzny"; name = "css-eldoc"; }; packageRequires = []; @@ -11245,8 +11755,9 @@ pname = "csv-nav"; version = "20130407.1120"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/csv-nav.el"; + url = "https://www.emacswiki.org/emacs/download/csv-nav.el?revision=7"; sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva"; + name = "csv-nav.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/csv-nav"; @@ -11346,12 +11857,12 @@ cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cubicaltt"; - version = "20161020.1343"; + version = "20170421.1132"; src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "9ae218e0beefd3cc2c617cf6b66ac9faba1a8af7"; - sha256 = "08d09wgi7j8qihqsxyl2lgvwcsi7gwl8kbz3c36yc0gb656m7blr"; + rev = "e1e158d2103f0b441ed27ad4b2c0c123d7d710d7"; + sha256 = "0mbqdnbd6rqhsfdn5rijp9siyp5720s1gj6sadpqp55qi9r1hnpx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11410,12 +11921,13 @@ pname = "cursor-chg"; version = "20170221.1610"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cursor-chg.el"; + url = "https://www.emacswiki.org/emacs/download/cursor-chg.el?revision=21"; sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1"; + name = "cursor-chg.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/871d02540951a217ea3d4aed9ce6b66a77223fbf/recipes/cursor-chg"; - sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cursor-chg"; + sha256 = "1yam5hz1v16g2v19j3dmgbj7n2rj8dsqyr5hwfyc031s6q7f649x"; name = "cursor-chg"; }; packageRequires = []; @@ -11447,10 +11959,11 @@ }) {}; cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cus-edit-plus"; - version = "20170206.1603"; + version = "20170604.1000"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; - sha256 = "02mcvr8fnaflqwxzafr6i745wcw8akhjjq8ami312aibf5yjadik"; + sha256 = "0awn3m16cyamb4h9i4iq9fzbwzl6qrkpbcr4v3dr7iwlcz7lw7jl"; + name = "cus-edit+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+"; @@ -11466,12 +11979,12 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "20161012.1855"; + version = "20170712.2110"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "eb6ee11315180ae27b17b351163f47a1014348a0"; - sha256 = "0s9ja6l2y75lnkd1js4x3ks6pj5p6x7i9sm5vlcr5yq4qvmamn3h"; + rev = "c5ad3a1815ba25b91aced8232b6f6268a10379d7"; + sha256 = "1l8m5mk7qdvw9cc6ypqahrrzxfzdx7n5yp1j82dgli9gy0sq027v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -11551,8 +12064,9 @@ pname = "cygwin-mount"; version = "20131111.1346"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el"; + url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el?revision=17"; sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw"; + name = "cygwin-mount.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f94fb69a954275ee4098c96495b8566d6ce7cbb9/recipes/cygwin-mount"; @@ -11568,12 +12082,12 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "20161231.1558"; + version = "20170518.2255"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "2c65c3f111573e1919e0a35e0ef84b9e861572b7"; - sha256 = "1lclz4k4xh535ilxqxpaqzdzn4j6zml9a0vrzxn6ffgd378dxn31"; + rev = "d7842388a1872b165489624a1a68f536de97e28d"; + sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -11614,8 +12128,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "56a44bf2944107cfdb178a90c14a6e8092471359"; - sha256 = "1jg3bhm2ksa4ask2n8q80afpa027430gz5w7vq4iwqw5ij8cx4v8"; + rev = "a2db27bb85d0daa4cc4b4b7d65c0e6a7cda5ec2a"; + sha256 = "101gdyvhkb5lzsa69slaq0l81sjmrr34sb5sxbjxrbx5pk5wh9gz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11691,6 +12205,48 @@ 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"; + version = "20170501.654"; + src = fetchFromGitHub { + owner = "dakrone"; + repo = "dakrone-light-theme"; + rev = "4b3f3ba8e2ffc35e537507894620245c96ff8965"; + sha256 = "1191iyjc5pw6jy9kqmjgr1s4n88ndjdsys7hwzc8c18glv411r69"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme"; + sha256 = "1njlpvfa4ar14zn51fdmby55vjgfkpskizg5rif2f3zn6y4np2xw"; + name = "dakrone-light-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dakrone-light-theme"; + license = lib.licenses.free; + }; + }) {}; dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-theme"; @@ -11715,12 +12271,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170227.251"; + version = "20170702.1007"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "5a52c5eca997655b7db349962d056daba64219cb"; - sha256 = "17kfv071zg0v3hcmlzk5yb88xpyknxig2fl2mj2cw3xjcshbxaa0"; + rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83"; + sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11733,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 = "20170207.234"; + version = "20170708.421"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "7acaefbf36fe53e9af9f812957eea404e11f8a61"; - sha256 = "0ascjab014sbv9fvkswyxwhg50f0siwa9v6s67k5g58n9f7r7bls"; + 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; @@ -11862,12 +12418,12 @@ darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkburn-theme"; - version = "20151003.100"; + version = "20170423.952"; src = fetchFromGitHub { owner = "gorauskas"; repo = "darkburn-theme"; - rev = "a0151684ae4fa7c364115188422f6c3425d1594c"; - sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf"; + rev = "0af794ff7fac19778ac8a7efb92455c6f6c2158f"; + sha256 = "0nv917r8pbj6mfncjl8d7hq4763c69q491d4iwnff1n3wzlcp42s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a04dd517e02bc4b4a62d956aa901a727354202b0/recipes/darkburn-theme"; @@ -11904,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"; @@ -11925,12 +12481,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170216.2034"; + version = "20170715.1624"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "53ee536cc912a900a16b768abd0f8e23e609ef5e"; - sha256 = "04lj0161la9fb4fd7mdvr1raqnyarzp73dkfydvsaziggg8vnab8"; + rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf"; + sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -11946,16 +12502,16 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "20170127.1652"; + version = "20170525.1236"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "b3808189cf6c5165499d3f67540f550e49b26aa2"; - sha256 = "1bs3p72gxlcviz0l2dl1h92708j0c3ly0kwpdbr370i2hdv0l8ys"; + rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971"; + sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; - sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; + sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; name = "dart-mode"; }; packageRequires = [ cl-lib dash flycheck ]; @@ -11967,12 +12523,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20170207.2056"; + version = "20170613.151"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "98e819e407bbc35478cde30a74be15f077bd6d4b"; - sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm"; + rev = "0468a3137c9e0d49121213f416fc7e2547d46a77"; + sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12013,8 +12569,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "98e819e407bbc35478cde30a74be15f077bd6d4b"; - sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm"; + rev = "0468a3137c9e0d49121213f416fc7e2547d46a77"; + sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12030,12 +12586,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20161229.1711"; + version = "20170419.2358"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "89875ba44ef9f69dd561591ea8ec6d39a0b4aa6d"; - sha256 = "0qx2kb30s1z0mlr2sk1jx538v768g7df7v5ymmnvipl8xkr2ams3"; + rev = "27c559952483301cc92539f68a89a047a0cc69ad"; + sha256 = "0hl97zc5wvxnpizp29rri7nbpklgx7fvb3idmghckinpgg3gnz2x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12093,12 +12649,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20161007.1137"; + version = "20170318.254"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457"; - sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg"; + rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; + sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -12219,12 +12775,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170304.120"; + version = "20170709.839"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "651cdbca22d725958b4ee26f8f299f841005797d"; - sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl"; + rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; + sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12288,8 +12844,8 @@ sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste"; - sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste"; + sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v"; name = "debpaste"; }; packageRequires = [ xml-rpc ]; @@ -12322,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"; @@ -12343,12 +12899,12 @@ decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decl"; - version = "20160608.2347"; + version = "20170314.23"; src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "84a8c4d78e83629fb3100abf5408bd108e4cfcef"; - sha256 = "0s0zk2hy8mi46rz949i241qsiy0s4aywzb3j0ch69jf3i6qdxh59"; + rev = "b25825de88289fab5212dfd6d18874ca2748123f"; + sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -12427,16 +12983,16 @@ deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "20161228.1930"; + version = "20170531.2135"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; - sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred"; + sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm"; name = "deferred"; }; packageRequires = [ emacs ]; @@ -12492,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"; @@ -12530,12 +13086,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "20160822.924"; + version = "20170526.1508"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "24a4a9a0f023c7b3fe5441783794185ba3954ffe"; - sha256 = "04q7fv3qvh8a4p64hd9pqfvhnbclfbr1b9s0vi9m8jz9y5p86x8d"; + rev = "d3fce31974b1c9f659da427f3c69c2e6168df508"; + sha256 = "0k4pacjjgxagsa8kgzvynvmvczhbb73waq3l6gld7v3h38js163a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -12551,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"; @@ -12677,15 +13233,15 @@ dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; - version = "20160722.2319"; + version = "20170427.732"; src = fetchsvn { - url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "95"; - sha256 = "1lr236vz38mlzgqdcfx3adrnbfv55f1a6r2xgfkla0m2vq09v3bn"; + url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/"; + rev = "97"; + sha256 = "077iz1fsw22rhzlsigslx5k6hsk1xny3kikr4gcwdmjd28yh7nvg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6627b66fff02513ee467ed0f4436fb5cd400a81d/recipes/dic-lookup-w3m"; - sha256 = "0zc0phym431bjqg0r8n5xsa98m52xnbhpqlh0jcvcy02nbmdc584"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m"; + sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0"; name = "dic-lookup-w3m"; }; packageRequires = [ stem w3m ]; @@ -12697,12 +13253,12 @@ dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "dictcc"; - version = "20170207.835"; + version = "20170318.1232"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "a1e87dad68faee956e4614c4f0f0bb98ba81ab6a"; - sha256 = "086nq9ngn06n605s21733456knna2py5dfymm8824zslzz39i8fy"; + rev = "24fb40d0822f97c3d796ae81cb6684cd97263248"; + sha256 = "1faj9c4x306s3ml430s01c9zcg9xgj9p34v630046y4lh4i25qc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; @@ -12739,16 +13295,16 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20161102.1726"; + version = "20170709.2000"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "c476e4080de7bea98a7a9a1173df20397d1c7671"; - sha256 = "185gl1p80yx68d2hzawhrz26zy75z30qr1lb7c0gzmk5ryy5yzgv"; + rev = "bec9889de7bf48d28826039880cec9bfad24a628"; + sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl"; - sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; + sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2"; name = "diff-hl"; }; packageRequires = [ cl-lib emacs ]; @@ -12885,12 +13441,12 @@ diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diminish"; - version = "20151215.915"; + version = "20170419.1036"; src = fetchFromGitHub { owner = "myrjola"; repo = "diminish.el"; - rev = "826e19186bef91d2241739cb8b48b8cfba14c17a"; - sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4"; + rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d"; + sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish"; @@ -12910,8 +13466,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "dionysos"; - rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2"; - sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208"; + rev = "0aac21caadabc5a7f09e18a9dcb02f3dec26588b"; + sha256 = "1g6p9cr3p85i7ay3jmvn7f8c5k8d49fcynb3ymns7rgsf3ypvpyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos"; @@ -12973,8 +13529,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -12987,16 +13543,38 @@ 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"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-details.el"; + url = "https://www.emacswiki.org/emacs/download/dired-details.el?revision=15"; sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza"; + name = "dired-details.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8ed2327efe099420e53e7275eefeef74842068e8/recipes/dired-details"; - sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details"; + sha256 = "0kmcnx9zvfdwvq100nazgypkfwlgxgrbimprc5pysid8rrxyzws7"; name = "dired-details"; }; packageRequires = []; @@ -13012,10 +13590,11 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-details+.el"; sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x"; + name = "dired-details+.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0b6a13a5dfd977979d3185139000e7a639d32ec4/recipes/dired-details+"; - sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details+"; + sha256 = "0b4y01hk839z6m7fx5bwa80gwylvkp15niri8vrjak4vgj5g5cg9"; name = "dired-details-plus"; }; packageRequires = [ dired-details ]; @@ -13069,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"; @@ -13090,12 +13669,12 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "20150417.132"; + version = "20170413.747"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "e9bf4f16248cb5d187a323b7887d236a4a203c59"; - sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8"; + rev = "f55b69e5cd1d45699a0f37468ac8e20fa7a0cff6"; + sha256 = "193mf90d5vds8hswkxasda267ifr6w55vn4pph15lkbmp33wa50n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; @@ -13136,8 +13715,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13157,8 +13736,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13171,6 +13750,27 @@ license = lib.licenses.free; }; }) {}; + dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-hide-dotfiles"; + version = "20170314.1339"; + src = fetchFromGitHub { + owner = "mattiasb"; + repo = "dired-hide-dotfiles"; + rev = "b715f643ec805b3b8aca334595e6589320f04a49"; + sha256 = "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles"; + sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0"; + name = "dired-hide-dotfiles"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dired-hide-dotfiles"; + license = lib.licenses.free; + }; + }) {}; dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; @@ -13216,12 +13816,12 @@ dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "20161116.116"; + version = "20170313.803"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15"; - sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx"; + rev = "c50e8f73358060a448bff66db2d330b52bbeffc1"; + sha256 = "14yvsv7cvfviszii0bj0qf094rmnwzssinrqrkpxg4jil2n4bb9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -13237,12 +13837,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20170227.1532"; + version = "20170409.1923"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "b62492c1a6404ed2ed32973d99cdcf8630cf7d02"; - sha256 = "09nwzihg1v5p8c4jcjzl3w2il701lh3ps8c472g2iwmkihljs093"; + rev = "9dea31574dcf006d5247b488a1942faaac434362"; + sha256 = "03dim1ca332882i08r19k4vjzw3hwwg132n2mrxhniyzgkk7g891"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13258,12 +13858,12 @@ dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-narrow"; - version = "20160918.740"; + version = "20170309.329"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13283,8 +13883,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13299,10 +13899,11 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170221.1620"; + version = "20170630.752"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "0jfv0m3w3vqafaqcxp4n53msvjp83zczxc7drgng1amksr82xi63"; + sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y"; + name = "dired+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13339,12 +13940,12 @@ dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-rainbow"; - version = "20141214.543"; + version = "20170531.816"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13364,8 +13965,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13403,8 +14004,9 @@ pname = "dired-sort"; version = "20090208.2038"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort.el"; + url = "https://www.emacswiki.org/emacs/download/dired-sort.el?revision=1"; sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z"; + name = "dired-sort.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e4cd8274cdec74a9867060f72ec2025ed0150d/recipes/dired-sort"; @@ -13421,8 +14023,9 @@ pname = "dired-sort-menu"; version = "20130824.507"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el"; + url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el?revision=9"; sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi"; + name = "dired-sort-menu.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu"; @@ -13442,6 +14045,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el"; sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h"; + name = "dired-sort-menu+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+"; @@ -13461,8 +14065,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13538,22 +14142,22 @@ license = lib.licenses.free; }; }) {}; - direnv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20161002.715"; + version = "20170622.1128"; src = fetchFromGitHub { - owner = "jml"; - repo = "direnv-el"; - rev = "fc80f40a77553b3c8841abedc15a64771634cb35"; - sha256 = "15lkpnklvgppj63q9qwjd6jbq8czyvjic81mkhf3bwcd7gdqar84"; + owner = "wbolster"; + repo = "emacs-direnv"; + rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; + sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0f526b9cc7bc1495e5f5e9fb2e49af926aba8a7d/recipes/direnv"; - sha256 = "12yl7hmb7kc8ycr8nr39xb35jhagv8mqn6xs0k8j0mcykpzf2h1g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; + sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; name = "direnv"; }; - packageRequires = []; + packageRequires = [ dash emacs with-editor ]; meta = { homepage = "https://melpa.org/#/direnv"; license = lib.licenses.free; @@ -13562,12 +14166,12 @@ direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "direx"; - version = "20151023.1606"; + version = "20170422.627"; src = fetchFromGitHub { owner = "m2ym"; repo = "direx-el"; - rev = "9497231cf50767987494718db073731b05a4f970"; - sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr"; + rev = "a79bfdb5980cf6ed7bfb3b41ddc471a7b6c0ede4"; + sha256 = "0fl9hdnrq54awx43635p6pmc8bqyppa02gs1d76nifi0q4g9v4m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b0903466d63b1c87abc002b0e064e36a8cddd3/recipes/direx"; @@ -13601,17 +14205,19 @@ license = lib.licenses.free; }; }) {}; - dirtree = callPackage ({ fetchurl, lib, melpaBuild, tree-mode, windata }: + dirtree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tree-mode, windata }: melpaBuild { pname = "dirtree"; version = "20140129.32"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dirtree.el"; - sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "dirtree"; + rev = "ba55f1e716e386fdd37cb8e7f48616e405dc7251"; + sha256 = "0abs3r4zzfnf4igiakrv3bpyxz7qlnw26l57rynsk7c3w3s5ya29"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/343a34103fd435e01bb64e90536cc1e4da4e83c4/recipes/dirtree"; - sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/dirtree"; + sha256 = "1fm003rix3sdfx8fq3ab5s8b2q65gbkjsn1j3fg5qmhv56p7lrs9"; name = "dirtree"; }; packageRequires = [ tree-mode windata ]; @@ -13665,12 +14271,12 @@ disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disaster"; - version = "20130509.1055"; + version = "20170507.1626"; src = fetchFromGitHub { owner = "jart"; repo = "disaster"; - rev = "8d8fc67af5b3d876b0056562ece0478e6e2367f0"; - sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq"; + rev = "3bab3c0db29c6d5484ab8aacbf29490e3aa2d713"; + sha256 = "15brdrcq2i3rckdh2ml5m1fvf7asgqij9swc1p9fgp1fk2i05sfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster"; @@ -13792,8 +14398,9 @@ pname = "disk"; version = "20081128.706"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/disk.el"; + url = "https://www.emacswiki.org/emacs/download/disk.el?revision=9"; sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv"; + name = "disk.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edcafb4c459cf51fecc7c43a3e4dcbe377d68b46/recipes/disk"; @@ -13817,8 +14424,8 @@ sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/84d19999b8387e8b71215675cf1c15873314d90e/recipes/dispass"; - sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass"; + sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n"; name = "dispass"; }; packageRequires = [ dash ]; @@ -13963,8 +14570,8 @@ sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3f56de1465d1b19dbefff62d3a1f2c4ee86ac0c4/recipes/dizzee"; - sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee"; + sha256 = "14y10k8s65cyn86m1z77817436m89l0xpwd1wr4d7qp3x2mmn215"; name = "dizzee"; }; packageRequires = []; @@ -13997,12 +14604,12 @@ django-mode = callPackage ({ fetchFromGitHub, fetchurl, helm-make, lib, melpaBuild, projectile, s }: melpaBuild { pname = "django-mode"; - version = "20161109.749"; + version = "20170522.14"; src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; - rev = "561a3a7359a1526b67688239cdee67e0425b6a01"; - sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8"; + rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e"; + sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-mode"; @@ -14022,8 +14629,8 @@ src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; - rev = "561a3a7359a1526b67688239cdee67e0425b6a01"; - sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8"; + rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e"; + sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-snippets"; @@ -14173,8 +14780,8 @@ sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d32848d2de20cc71669b88699acaa0d306f009f5/recipes/dna-mode"; - sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode"; + sha256 = "06vprwv1v4jzqzi2nj9hbhnypnvqxmixls8yf91hzwlk3fdkdywf"; name = "dna-mode"; }; packageRequires = []; @@ -14228,12 +14835,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20170114.440"; + version = "20170601.1345"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "2c2f3c68f8136caeef67c4e74cc84d52a7664535"; - sha256 = "0qyksf5svcpz263ah197bcmpnfn2rfq8x049wbalxi638bmbvzfg"; + rev = "d3bdb09af10c7aa466b25e0c65a3d21fdf44514e"; + sha256 = "097nrhnc668yclvisq5hc3j8jgpk7w7k7clrlp5a1r1gd5472sj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14299,12 +14906,12 @@ dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dockerfile-mode"; - version = "20170221.1317"; + version = "20170418.1024"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "5f1e17e4e59fee4725c5b4cd9b5b49f1faaa108f"; - sha256 = "1pw6706lnd6n866scwp35ar58y2c6jjyn82qpjdk0ma12hgv3gzf"; + rev = "3c6bc90360a2df53caad1721ee4c8285e2e22369"; + sha256 = "166hfzfb45f11jfhx78w6h23cyj9wr1nrwrxxqs2m5cry407gj3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -14328,8 +14935,8 @@ sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e46cf6a57b93ddfda8e2d6e74cee8d0df2cb1ec7/recipes/dokuwiki"; - sha256 = "1vi6crl5y3g1p6xcpqzybmidn09cdf4gplmrvb2nkc94pyd9qxnw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki"; + sha256 = "0wfzzxx3n75zgxk06rlq7053hla84k79mk911by4jwk6km5adk55"; name = "dokuwiki"; }; packageRequires = [ emacs xml-rpc ]; @@ -14404,16 +15011,16 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170222.1412"; + version = "20170717.426"; src = fetchFromGitHub { owner = "hlissner"; - repo = "emacs-doom-theme"; - rev = "f6a5a148851183b2e3a92d21bc179cc637b5fcdd"; - sha256 = "0w53gar82avmwx6rlhnn2p2vlmpghrn7hy83lggiawgr4h3yw4dw"; + repo = "emacs-doom-themes"; + rev = "a00ee6cc48179dfeb8836726d9faa9b4f119783a"; + sha256 = "0f1szgr7xz2bg222x8b9h6kmi6diipc2r4j4yafjpsgkniv6c93c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; - sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; + sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs"; name = "doom-themes"; }; packageRequires = [ all-the-icons cl-lib emacs ]; @@ -14426,8 +15033,9 @@ pname = "doremi"; version = "20170221.1634"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi.el"; + url = "https://www.emacswiki.org/emacs/download/doremi.el?revision=42"; sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q"; + name = "doremi.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi"; @@ -14445,8 +15053,9 @@ pname = "doremi-cmd"; version = "20170221.1631"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el"; + url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el?revision=47"; sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6"; + name = "doremi-cmd.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd"; @@ -14464,8 +15073,9 @@ pname = "doremi-frm"; version = "20170221.1632"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-frm.el"; + url = "https://www.emacswiki.org/emacs/download/doremi-frm.el?revision=74"; sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd"; + name = "doremi-frm.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm"; @@ -14482,8 +15092,9 @@ pname = "doremi-mac"; version = "20170221.1633"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-mac.el"; + url = "https://www.emacswiki.org/emacs/download/doremi-mac.el?revision=30"; sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl"; + name = "doremi-mac.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac"; @@ -14496,24 +15107,6 @@ license = lib.licenses.free; }; }) {}; - dos = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dos"; - version = "20140808.1435"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dos.el"; - sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6c536abcb5a544e22bb339effa5bf39df96c12b9/recipes/dos"; - sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc"; - name = "dos"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dos"; - license = lib.licenses.free; - }; - }) {}; dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; @@ -14525,8 +15118,8 @@ sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b3082fb1c8a5e0439b3ae5e968845aecd99d28e2/recipes/dot-mode"; - sha256 = "18dj3bvnm28j7mllv4f575ahnhzziinycg48wbr73qi70vq059z8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode"; + sha256 = "039ylmbvw0wb3i2w4qn3dhckz7y3swbid4hwjcxljy4szc709p6k"; name = "dot-mode"; }; packageRequires = [ emacs ]; @@ -14588,8 +15181,8 @@ sha256 = "03n3k6a40lw9m1ycf62g6vll4gr2kr2509vjp1dkfq722xwrw7zk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/21061b3a61a0e5e3f99b2fa2a52e620d639dcc82/recipes/dpaste"; - sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste"; + sha256 = "0wrfy9w0yf5m15vmhg4l880v92cy557g332xniqs77ab0sga4vgc"; name = "dpaste"; }; packageRequires = []; @@ -14609,8 +15202,8 @@ sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2c7b89dc6ab23e4a6e70765b7fcb4885387ce65f/recipes/dpaste_de"; - sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste_de"; + sha256 = "0022dd8l7jsyl0lv9x6iz882ln71js8brqcbiqz001zv45yrgvy0"; name = "dpaste_de"; }; packageRequires = [ web ]; @@ -14643,12 +15236,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20170303.1415"; + version = "20170412.845"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "5db3f961644ea611682eab843a960eb3177ace48"; - sha256 = "0rrxvvspz2l8byhnl052x59yd0yx7aajnc9b41846ng83kyb8dlm"; + rev = "62df5de68c73d34faaa0191a92ce3ebce589bf24"; + sha256 = "0wpbscqaszr2mg0hijamcz6l9nknsi12mwdbib16ghlh6y9mj4ia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -14710,8 +15303,8 @@ src = fetchFromGitHub { owner = "sshbio"; repo = "drawille"; - rev = "d582b455c01432bc80933650c52a1f586bd1b5ad"; - sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa"; + rev = "d914845725719d8293e2f0dea3c9c7e0a1e0e62a"; + sha256 = "1ynjxfvx8b6rq6d4gm1sl96rmlk5pi8j5s1rd1y0p8x2lwqcfv77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0920232421bf177f2ab8595fab7e203f40b1a34/recipes/drawille"; @@ -14769,16 +15362,16 @@ dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }: melpaBuild { pname = "dropbox"; - version = "20130513.1537"; + version = "20170502.1722"; src = fetchFromGitHub { owner = "pavpanchekha"; repo = "dropbox.el"; - rev = "fb71a2787030f911b569426596c081a89241056e"; - sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s"; + rev = "d85bbf6caa4203d6088ea29f5c057c1e9bcacd85"; + sha256 = "15fg46pb64sz17sz3bqcpvg0nlsy4fs7ppzdq7q1686q3ihczk31"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/afc3754da223a33f3f06c199951b098acd18e5f5/recipes/dropbox"; - sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropbox"; + sha256 = "1dqjsn7wkjjvbwq3kgdd7bvwrirappwnhcwkj2ai19dpx6jd8wym"; name = "dropbox"; }; packageRequires = [ json oauth ]; @@ -14791,12 +15384,13 @@ pname = "dropdown-list"; version = "20120329.936"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dropdown-list.el"; + url = "https://www.emacswiki.org/emacs/download/dropdown-list.el?revision=5"; sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a"; + name = "dropdown-list.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/364c9db68f34fc617a706eb1d7b4304ef4a88714/recipes/dropdown-list"; - sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropdown-list"; + sha256 = "1zqqa4872r96fp377bcz6pd1djz59ami5k09abb62dw854sc5xfj"; name = "dropdown-list"; }; packageRequires = []; @@ -14851,13 +15445,13 @@ pname = "dsvn"; version = "20130120.1257"; src = fetchsvn { - url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1785720"; + url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; + rev = "1802135"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/dsvn"; - sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dsvn"; + sha256 = "1y55s187q2xiab31vs95jjjp1a3qzwkdwn7p5man666scbjrdyl5"; name = "dsvn"; }; packageRequires = []; @@ -14877,8 +15471,8 @@ sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5af0cec2b49ccc6807939162184cc40558a8716/recipes/dtrace-script-mode"; - sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dtrace-script-mode"; + sha256 = "00ar2qahgqpf4an6v9lbzgj73ylbavvigsm8kqdq94ghm4awxi4z"; name = "dtrace-script-mode"; }; packageRequires = []; @@ -14953,16 +15547,16 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20161218.110"; + version = "20170627.1309"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "0c7fed68916de6bcbbfbc6c9f787d610a3316b1e"; - sha256 = "1a5jg1344s18bj6v33wfrxxg1cxlx6aha40wyw9dbwj1pjpw7vqd"; + rev = "0328d922da4b1bbbb8f41848585c920608f6e9d3"; + sha256 = "1l3s42y90d2canslkjvfs4n5zlpdxp0h4b1yrip9825gh2k4fan7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; - sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; + sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w"; name = "dumb-jump"; }; packageRequires = [ dash emacs f popup s ]; @@ -15013,21 +15607,21 @@ license = lib.licenses.free; }; }) {}; - dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: + dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20170215.333"; + version = "20170519.704"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "c4f10d72febc"; - sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd"; + rev = "56fa34ea25d4"; + sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq"; name = "dyalog-mode"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/dyalog-mode"; license = lib.licenses.free; @@ -15183,12 +15777,12 @@ e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2wm-direx"; - version = "20140815.1613"; + version = "20170509.601"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-direx"; - rev = "f319625b56c44e601af7c17fc6dbb88e5d70ebae"; - sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia"; + rev = "b47f19d15436cc28233a812a1150689f61d11046"; + sha256 = "0lihc02b0792kk61vcmhi0jwb7c4w2hi19g6a0q1598b3rci82nf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8320cf626050cf455c97ef22e7a8ccfb253e3243/recipes/e2wm-direx"; @@ -15327,6 +15921,27 @@ license = lib.licenses.free; }; }) {}; + easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-hugo"; + version = "20170708.307"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-hugo"; + rev = "226fa5c661391c7f8317a24c9f757396e1900371"; + sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; + sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; + name = "easy-hugo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-hugo"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -15372,12 +15987,12 @@ easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: melpaBuild { pname = "easy-lentic"; - version = "20161031.2119"; + version = "20170309.2143"; src = fetchFromGitHub { owner = "tumashu"; repo = "easy-lentic"; - rev = "6f43c8d575274349757173b9bcad3bf5b59300ac"; - sha256 = "0jw1m2ff23b99rz137ndy0gjbk3fs7srsyjd8f8fssl4xm8mzb39"; + rev = "d2b600cc3bd3166c3e4543435070b511ae9bf148"; + sha256 = "1p99yf1nlial254dyy9i30lfx2v4jwpahvi9pfjm5sv64212vp33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic"; @@ -15414,12 +16029,12 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20161231.1559"; + version = "20170520.130"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "c0df139972c52200db417cc18e65f8748969fb79"; - sha256 = "19yxfc6lbd4311w291lxsw1v3hp0ha4inlp5fcakszd76bc69c4w"; + rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; + sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -15456,12 +16071,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170222.1459"; + version = "20170711.1234"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "36d9d19abacaeade54a043701c5b2e4e58b8a61b"; - sha256 = "1fiwgdlykgnyi93lrnh0ifd4c5jlbs1kg69r2q2fyyfcwwvvq3ck"; + rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; + sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15499,8 +16114,9 @@ pname = "echo-bell"; version = "20170221.1635"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/echo-bell.el"; + url = "https://www.emacswiki.org/emacs/download/echo-bell.el?revision=8"; sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh"; + name = "echo-bell.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell"; @@ -15516,12 +16132,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170305.1130"; + version = "20170522.1354"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7"; - sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k"; + rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; + sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15562,8 +16178,8 @@ src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "36db74ef44edfc654618d681f3452b9904740f9a"; - sha256 = "1hc1hb0lnkjanjddcwax783n2fcv5lvi1xl1kszbdzlck4sz1i1r"; + rev = "277d25cf8fc9548239599244ab15a2268a55b31b"; + sha256 = "0jh7l4lhbjd7qxqdi8d8mk5j3qxx70x3jdzpw2xw6szcx67lvd3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -15705,12 +16321,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "20170221.1002"; + version = "20170428.933"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "dfabfc775ab3288ac91aac855de4b64e5279f0a2"; - sha256 = "0nb2yfbw3zsxpygy8ksz55k720lymy2fbfszh1qfd4yi0hkmbm5i"; + rev = "65e502602dbc623257a820245d41f94cf2e1f07d"; + sha256 = "1569g3rnklxnnknrs9nmyjk9axrdhpr9pcz2ma925sb388jyrf5r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -15747,12 +16363,12 @@ ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ede-php-autoload-drupal"; - version = "20170225.1448"; + version = "20170316.1458"; src = fetchFromGitHub { owner = "xendk"; repo = "ede-php-autoload-drupal"; - rev = "2989b39067d5b556abb2977e52f1f0775fff3bbc"; - sha256 = "0j9nz2w3mg895nvfqnmxhl41xr6ijfrpqrf044mrz5h97hgk3g7w"; + rev = "54a04241d94fabc4f4d16ae4dc8ba4f0c6e3b435"; + sha256 = "1ckfja95zk4f7fgvycia7nxhxjgz4byrz30ic63f6kcq4dx78scs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal"; @@ -15831,12 +16447,12 @@ edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; - version = "20160528.651"; + version = "20170310.1002"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; - rev = "1d1dae842505e5ff09644529deec87c056e1b14e"; - sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz"; + rev = "2fc8f382ee12fc8f7202288534258186bdf6068a"; + sha256 = "1m40zi6dkq7m9386adrys5n7w8h9973svfmxl1c3n9vk9kjibb9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; @@ -15860,8 +16476,8 @@ sha256 = "0dgac0nk9x4sz4lisxb5badrzpcjqjwgi79hhl1y6mafzm0ncqs2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/688f0b6802d04d133afc3de7371f65b8d5d2bad4/recipes/edit-indirect-region-latex"; - sha256 = "0lsqz09c4p2gl1xd673783hmmh7y5iq4kw521q7hiza4xbaiwpr3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/edit-indirect-region-latex"; + sha256 = "0ys0fpfk259g14wvg0nnkc3wk1dbjjd2n4a636jblgq63w6g3h79"; name = "edit-indirect-region-latex"; }; packageRequires = [ edit-indirect emacs ht ]; @@ -15898,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"; @@ -15936,12 +16552,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170222.2141"; + version = "20170607.713"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "1d69cffd1dd4709338fba7241f344a55cb61f59e"; - sha256 = "1pv83biyiqkm5if3wkm071r5cl0ch1wv5yxzdqyxsq4k11s9z4qy"; + rev = "1543835ce00412c3cd34a61497af5f68ead250a6"; + sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15954,15 +16570,36 @@ license = lib.licenses.free; }; }) {}; + editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "editorconfig-charset-extras"; + version = "20170712.108"; + src = fetchFromGitHub { + owner = "10sr"; + repo = "editorconfig-charset-extras-el"; + rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85"; + sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras"; + sha256 = "15p9qpdwradcnjr0nf0ibhy94yi73l18xz7zxf6khmdirsirpwgh"; + name = "editorconfig-charset-extras"; + }; + packageRequires = [ editorconfig ]; + meta = { + homepage = "https://melpa.org/#/editorconfig-charset-extras"; + license = lib.licenses.free; + }; + }) {}; editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-custom-majormode"; - version = "20170102.751"; + version = "20170509.141"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-custom-majormode-el"; - rev = "8216ce7d20703a8ce923b4c0284c098ae85621f9"; - sha256 = "02qkvdgn78asz1i7gh8198z0as4yhax3yans96c8lxwmbac125kz"; + rev = "b5350d20b2730a0f029c9e1d651e50cf9a809fa9"; + sha256 = "1xk3c0g0a6g2p7wg26aphl6cdz45iql0s4w1qa8np2hly10a4cxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode"; @@ -16017,15 +16654,15 @@ license = lib.licenses.free; }; }) {}; - edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, eproject, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: + edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20160812.729"; + version = "20170421.55"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "a3e4eeb5b340186f727bd06aa3d4d3fcacc16292"; - sha256 = "0kbm11v3sfvkc821lpcv87z21pqb3pb4jzv7wyiy6mlkbnqjl289"; + rev = "3f90f4484ac03f06286b15b0c33ff0e5aeed2bb5"; + sha256 = "0wpr7h7vl1pi05sxyivk1a22qhcm74iacnra9h1d2jcf6as1h5x4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -16036,7 +16673,6 @@ auto-complete auto-highlight-symbol dash - eproject erlang f popup @@ -16096,8 +16732,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "8b9bfc404818038b8dd93dd4d39f3b820f8fcd52"; - sha256 = "0y6k54vz9r6b81aif9ags130wgk2v00yq6rv2l4nzswsifxy2r07"; + rev = "c06b457113a7e9484f8f4ae079cb257d8eb65396"; + sha256 = "16gij5kc4r4x85d8pnpyfkb2z7fjlmfxc73vhd0hf76740kgnnxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16113,16 +16749,16 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20170112.2043"; + version = "20170601.817"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "d81561d39524a5f78d5f94216b0ca5fef4b5700b"; - sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx"; + rev = "93ccd450d2d9e5db27aebb024a1b2ed56d5131dc"; + sha256 = "0izxsckmkdw70cz3ljar2r4iv784c43mnzjkayly08hlabq1g6b6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; - sha256 = "02s840chz3v4gdyq01b5i5w2vxl94001jk9j1nsp5b8xm10w985j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego"; + sha256 = "09k33ggc6n7wgykaawbmh6hyrl9dqp0azaq9zcjhjbc88nszj7fj"; name = "ego"; }; packageRequires = [ dash emacs ht htmlize mustache org simple-httpd ]; @@ -16133,15 +16769,15 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170213.1254"; + version = "20170420.1251"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "66d4490ec38dd992ba90b3801879d3f0ff312635"; - sha256 = "1y8imvgms7nb8fcpm1v6zkx3hqsf6zygc38gbj87c8s85f2qmfrq"; + rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3"; + sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide"; - sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; + sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv"; name = "eide"; }; packageRequires = []; @@ -16171,22 +16807,30 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ cl-generic, 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 = "20170224.1115"; + version = "20170714.1753"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "4578772ff1a64fa50f225646a9f4cd2c3070bffb"; - sha256 = "0dcn3wkb1hvmk9jy5s28nyfw7hrxslzjlylxxrf8g454swkmx0i8"; + rev = "08d2792d690cefb9ef2e00a14d3bbb1da55252a9"; + sha256 = "0fw56v0xx4axw24wzy8rk69zy0nhajk4y3fqi1305acfgn6hnnvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; name = "ein"; }; - packageRequires = [ cl-generic request websocket ]; + packageRequires = [ + auto-complete + cl-generic + dash + deferred + request + skewer-mode + websocket + ]; meta = { homepage = "https://melpa.org/#/ein"; license = lib.licenses.free; @@ -16234,22 +16878,30 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: + ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170221.33"; + version = "20170621.348"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "4663cd80af74d8e29001adc696568de5d3d8717c"; - sha256 = "1r6b4dgk1scy1fwsri96gjldcx4q60vdgqb29k5g9sljsw00xzfy"; + rev = "438e4f5995285d28fe7dddceacac212c2250dfe2"; + sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; name = "ejc-sql"; }; - packageRequires = [ auto-complete cider clomacs dash emacs spinner ]; + packageRequires = [ + auto-complete + cider + clomacs + dash + direx + emacs + spinner + ]; meta = { homepage = "https://melpa.org/#/ejc-sql"; license = lib.licenses.free; @@ -16279,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 = "e2b412ef6b6a6b6443314575609f730fce766e9b"; - sha256 = "0hzx6g62sa7lqkgsq1bavq8b73ji4994n31lr8afzgdx885xw6kw"; + rev = "4a1dde57e8a4d4c22ed279bac8253f5f16da9197"; + sha256 = "19570r8y2cs8y51rmihk5hk5sqavck4bf0zanajnplhxw52h0fji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16342,12 +16994,12 @@ el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-mock"; - version = "20170305.2325"; + version = "20170501.1123"; src = fetchFromGitHub { owner = "rejeep"; repo = "el-mock.el"; - rev = "9e4d0921791cd04917613d8e3d06342ead129777"; - sha256 = "1wkbhgyisj4kix0s4dkg72jylghqckmnyzk2brlrkvhz12zmhva3"; + rev = "e3017494230cb90c5f542acc07c539be1497123b"; + sha256 = "1dzll63ahsrjrx0dx6vzd88qvs3kvpn5jd3i39wjlfml18hpfiqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock"; @@ -16363,12 +17015,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170227.2208"; + version = "20170706.936"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b"; - sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r"; + rev = "979ea29884f54c5ac4a6a5b2873547c0964e3dd3"; + sha256 = "021ld1cs7swmrlbvnakwwx6xlyg95g8cnc6d1vk03a81p7s897il"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16490,8 +17142,9 @@ pname = "el-swank-fuzzy"; version = "20130824.457"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el"; + url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el?revision=3"; sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn"; + name = "el-swank-fuzzy.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2aecf6d476c7898478e6e5dcfc77d91935f07039/recipes/el-swank-fuzzy"; @@ -16528,16 +17181,16 @@ 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/914e845a0869680f84611a415373c9a166c93794/recipes/el2markdown"; - sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown"; + sha256 = "1bpfddcvg9wgc5g14clj6wyiw8rsh45rgibvlmyan2m0gmwvmqx6"; name = "el2markdown"; }; packageRequires = []; @@ -16546,6 +17199,27 @@ license = lib.licenses.free; }; }) {}; + el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "el2org"; + version = "20170502.550"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "el2org"; + rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; + sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; + sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh"; + name = "el2org"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/el2org"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -16571,8 +17245,9 @@ pname = "eldoc-extension"; version = "20140306.645"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el"; + url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el?revision=10"; sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch"; + name = "eldoc-extension.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c59866b554def3f6cef997cc23254a560f3eb33/recipes/eldoc-extension"; @@ -16596,8 +17271,8 @@ sha256 = "065sihf0dvi7g37zvf5drigkakydapyvpxdibcdzhcxx2p9bqszi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/de4d7c143f24d34eed093cfcdf481e98a6d2f839/recipes/eldoc-overlay-mode"; - sha256 = "158w2ffayqlcbgka3894p3zbq45kw9mijf421yzf55y1f1ipzqqs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode"; + sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954"; name = "eldoc-overlay-mode"; }; packageRequires = [ emacs inline-docs ]; @@ -16617,8 +17292,8 @@ sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1d2561bee760f11fd95ae6b1c97708d38e9203b1/recipes/electric-case"; - sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/electric-case"; + sha256 = "1ch108ljzg5xkk4pkfpfxm8v2yzqk79q3h2zhzzqhsydq7r07bdn"; name = "electric-case"; }; packageRequires = []; @@ -16630,12 +17305,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20170304.453"; + version = "20170311.533"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "57c00c08257794562e8b328adb7707c4aefe37a0"; - sha256 = "1gymbxdw8z2sfh3k2apg197r7k0l37pxzj761lc5jps3wy4d6w1g"; + rev = "13b5c19049bd7ac9529ee6fb6171f9141311f277"; + sha256 = "0xpqynnl1dxylxgg7h42pamxn7iwa4jwcy355l0sxmra951j22wq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -16680,8 +17355,8 @@ sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/elein"; - sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elein"; + sha256 = "01y5yrmm3biyrfgnl3qjfpn1xvjk2nabwjr8cls53ds697qpz5x2"; name = "elein"; }; packageRequires = []; @@ -16714,12 +17389,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170305.1633"; + version = "20170709.954"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32"; - sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16760,22 +17435,22 @@ license = lib.licenses.free; }; }) {}; - elfeed-org = callPackage ({ dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: + elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "elfeed-org"; - version = "20160814.314"; + version = "20170423.128"; src = fetchFromGitHub { owner = "remyhonig"; repo = "elfeed-org"; - rev = "ccb571188b7942ec3e1f93561ed4bb8b659a78a2"; - sha256 = "15wcwp8gfv1zsykyc59ml07g43p1w305q3mgahis37rl9bpyaadn"; + rev = "a54649f0fd83fd536213f58ee4268c67a799293a"; + sha256 = "05vqvkyyqbj4a886c9x53z7yv8hapmgm9c1ccfibpw0clyf0dixp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5874b83e31cb760698032106fff75c8ded1d8e82/recipes/elfeed-org"; - sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org"; + sha256 = "0rnxr2q2ib6xrdx41ams1z2ivw5zhcsmqdylyvbw62h20rlmlgm8"; name = "elfeed-org"; }; - packageRequires = [ dash elfeed org s ]; + packageRequires = [ cl-lib dash elfeed org s ]; meta = { homepage = "https://melpa.org/#/elfeed-org"; license = lib.licenses.free; @@ -16784,12 +17459,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20170125.1846"; + version = "20170709.954"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32"; - sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -16844,6 +17519,27 @@ license = lib.licenses.free; }; }) {}; + elisp-docstring-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elisp-docstring-mode"; + version = "20170304.815"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "elisp-docstring-mode"; + rev = "f512e509dd690f65133e55563ebbfd2dede5034f"; + sha256 = "0al8m75p359h4n82rf0dsl22qfdg9cwwywn5pn7x6gb96c7qrqaa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elisp-docstring-mode"; + sha256 = "0mdh3ikn6zfd3fbmifvivqih2fsijvlzalljdvm32crs9cy6fa96"; + name = "elisp-docstring-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/elisp-docstring-mode"; + license = lib.licenses.free; + }; + }) {}; elisp-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-format"; @@ -16889,12 +17585,12 @@ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20161205.444"; + version = "20170528.1223"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "6ef632c8922e01714a25c6e04fd5522be6e5ea26"; - sha256 = "00c9s60g7rl784q4slfaavqkjhj8j73pglflpjh8pvrgj77c4y6y"; + rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c"; + sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -16994,12 +17690,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20161210.49"; + version = "20170714.1600"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa"; - sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk"; + rev = "4155f4333545189901ce574601ef34dada07b672"; + sha256 = "1q5qgjmmwnhgq4ckpkzy3wvmnj3cgzcggwm9q9jsdfmz0j1dgwn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17036,12 +17732,12 @@ elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmacro"; - version = "20170304.705"; + version = "20170312.356"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "fad4cee572cb4dbe670be8eb19f10646d02be854"; - sha256 = "0zmg56gvq1hhhzzcx0d08r8ii56bn96ifaby6r6bgr6b094c2i59"; + rev = "97c8ca4041e5082df243ad6371a091759c30d0f7"; + sha256 = "0kqnnp7kfdgizs18zhsaxci210bgpr73w39dhb2y09yj40ja3yx4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; @@ -17057,16 +17753,16 @@ elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmine"; - version = "20151121.423"; + version = "20170511.20"; src = fetchFromGitHub { owner = "leoc"; repo = "elmine"; - rev = "60639f46a5f45653f490cdd30732beb2dca47ada"; - sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k"; + rev = "432d2f2f7cb5b533f25b993d1001abcadcebe8ed"; + sha256 = "02lsxj9zkcaiqlzy986n1f65cfyd8pkrdljgplsbd9p0w8ys0s94"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/29c24259817bf4b7caf51f1cfc163e6b7c63504b/recipes/elmine"; - sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine"; + sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn"; name = "elmine"; }; packageRequires = [ s ]; @@ -17170,8 +17866,8 @@ sha256 = "0wlhdzsrlj266jfvp925zrgzg2mxfba93klgky0hc8zialmmb50b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c351c97e5b2c0595c82d65a7075176f9ebe44638/recipes/elpa-audit"; - sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit"; + sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi"; name = "elpa-audit"; }; packageRequires = []; @@ -17180,22 +17876,22 @@ license = lib.licenses.free; }; }) {}; - elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-clone"; - version = "20161222.1009"; + version = "20170502.514"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d"; - sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a"; + rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110"; + sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa"; name = "elpa-clone"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/elpa-clone"; license = lib.licenses.free; @@ -17225,12 +17921,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170303.621"; + version = "20170701.1412"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2c8792e6e379c565e8dbfb5d3486988ab49c6b4e"; - sha256 = "1zrr7gmfpxjk0psvi3gf87qxf8nzh29n92f5f14xb75kjn2ji9l6"; + rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f"; + sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17250,22 +17946,22 @@ license = lib.licenses.free; }; }) {}; - elquery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elquery"; - version = "20170226.1238"; + version = "20170624.1635"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "elquery"; - rev = "bfda1499d11b5705bea60886a3d25ca6d3808111"; - sha256 = "1q0ifhq7wflzayg9mqy0wfc1fhgh4fmy17psz977k01yc7nc5s42"; + rev = "a5f7f3545330280991dd6334f4ce4f72aaa44145"; + sha256 = "0yf29d1akj1ays5rqcmgmvyfm4gx7j6yibd12x72wpf5mygv1fxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery"; sha256 = "19yik9w4kcj7i9d3bwwdszznwcrh75hxd0540iqk5by861z5f3zr"; name = "elquery"; }; - packageRequires = [ emacs s ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/elquery"; license = lib.licenses.free; @@ -17442,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"; @@ -17544,85 +18240,85 @@ license = lib.licenses.free; }; }) {}; - emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: + emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20170110.1853"; + version = "20170410.1218"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; - sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; + rev = "1b37570bf5813e160fa18a766e20dfa690910519"; + sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax"; name = "emacsql"; }; - packageRequires = [ cl-lib emacs finalize ]; + packageRequires = [ cl-generic cl-lib emacs finalize ]; meta = { homepage = "https://melpa.org/#/emacsql"; license = lib.licenses.free; }; }) {}; - emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "20151004.715"; + version = "20170410.1008"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; - sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; + rev = "1b37570bf5813e160fa18a766e20dfa690910519"; + sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy"; name = "emacsql-mysql"; }; - packageRequires = [ cl-lib emacs emacsql ]; + packageRequires = [ cl-generic cl-lib emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-mysql"; license = lib.licenses.free; }; }) {}; - emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: + emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: melpaBuild { pname = "emacsql-psql"; - version = "20151004.715"; + version = "20170410.1008"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; - sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; + rev = "1b37570bf5813e160fa18a766e20dfa690910519"; + sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3"; name = "emacsql-psql"; }; - packageRequires = [ cl-lib emacs emacsql pg ]; + packageRequires = [ cl-generic cl-lib emacs emacsql pg ]; meta = { homepage = "https://melpa.org/#/emacsql-psql"; license = lib.licenses.free; }; }) {}; - emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: + emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20160311.1238"; + version = "20170410.1218"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; - sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; + rev = "1b37570bf5813e160fa18a766e20dfa690910519"; + sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i"; name = "emacsql-sqlite"; }; - packageRequires = [ cl-lib emacs emacsql ]; + packageRequires = [ cl-generic cl-lib emacs emacsql ]; meta = { homepage = "https://melpa.org/#/emacsql-sqlite"; license = lib.licenses.free; @@ -17757,12 +18453,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "20161228.1948"; + version = "20170615.1131"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "7e0cc702bc15915f4e4be4c334faa37dca94e749"; - sha256 = "0w746jbyfjd8z8ga5nlsipw02pcbi98wxfdw51zv088ml0647v6j"; + rev = "394863dd7271e831cb9c257a1cd2249302ba962a"; + sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -17817,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 = "20170301.1406"; + version = "20170715.907"; src = fetchgit { - url = "git://git.sv.gnu.org/emms.git"; - rev = "6601ba8ef710b8ed260773e18a3baa940a7adc3a"; - sha256 = "1fzbzyvm98128dr01rldlabqkz9mag1z1qys36v2h6cfax1xjv9i"; + url = "https://git.savannah.gnu.org/git/emms.git"; + rev = "e790730a4e258440184bc8ce5d3015efe09f8984"; + sha256 = "0rh3hsggfw0yp5ssdwjpp0fdnc57cpcw02hxn80mrq16ylpj2zy9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; - sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m"; + 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; @@ -17902,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"; @@ -17923,12 +18620,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20170213.655"; + version = "20170506.1024"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "6897e43223eac133f0c2d9101932fec6479e58b6"; - sha256 = "1qjrnh25rv4n0cvdd8ynjlmvnb7zqibz1ky0x8ahkml72g672f5i"; + rev = "43ef07db6e724847fdcff5f66d1806b3e8d315e4"; + sha256 = "15wfr6qs4k6anm16zing0rgawpbrnk9589vr06fc6qvkald7ib3v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -17952,8 +18649,8 @@ sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f4eaa866ba6b0ad2b590fb15c30f81b9fdbef6dd/recipes/emms-player-simple-mpv"; - sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; + sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316"; name = "emms-player-simple-mpv"; }; packageRequires = [ cl-lib emacs emms ]; @@ -18091,12 +18788,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170220.2247"; + version = "20170709.207"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "181d619e96cd3275e69e010486169553c13479e7"; - sha256 = "1ms2pkjqdkwfvn8xq4dbm0585p2gdwcwplnx6rk7zjvir6nc6y5s"; + rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90"; + sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18137,8 +18834,8 @@ src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "c671b08facf37be6fc6783260cee686866cfed14"; - sha256 = "05v90g6ybdp2fmnnklnbdxygnw8xw0whmxbdw45qdww8idf2swfs"; + rev = "07e0b41fe080536e8a69301ff1c692f2871bee2f"; + sha256 = "1ckbc2ziw31cqal9hmc6n6gmncwficzw5rwwdcy4wj7f7w3xkr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; @@ -18208,12 +18905,12 @@ engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20161104.650"; + version = "20170508.828"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "9a1271b0051b9c939a63fa395cda2b5b64c5f36b"; - sha256 = "1nvf7anv2yplfhs4xbvrxdgd3mb41mzv4y1119lrqfvhsfd07ii5"; + rev = "59f1d463fada670895b00bab406160570fb8bc35"; + sha256 = "1j8jym795k59lhsckvnh06mykz7b2f54v52n0dwvhyy2aaq0bnhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; @@ -18226,22 +18923,22 @@ license = lib.licenses.free; }; }) {}; - enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20160817.1711"; + version = "20170417.2356"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "5493f9fde48557d6aaaf38dd63adfdd8538496ff"; - sha256 = "1nm304bg3k38s1gi21x7n6g8228fnyp91yb9p1i39hfckxjynq39"; + rev = "71ba417baea4c4e1ac814854638cbeb4b0b383fd"; + sha256 = "1hbmjbk6xs1r0kqh5ci7jfr6905ipa7xz0kgypqrlg0zap52gayz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns"; name = "enh-ruby-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/enh-ruby-mode"; license = lib.licenses.free; @@ -18313,12 +19010,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170128.359"; + version = "20170710.347"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "ee16c7a91b9ac1585be287ecf94e4b20aaaea3f5"; - sha256 = "15ldbviaxd9nlb11c3aw7dnp8xxyldm67dmbnsv6f3rpafy1gmzv"; + rev = "aaaa9e34f5ea023621bc8123064d3183b35339a7"; + sha256 = "11nxhzy4qc4y1gfi0m5c78jv2ib5gpsqdr1p84q0yqkzdc9wvcmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18426,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"; @@ -18594,11 +19291,11 @@ erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "erc-hipchatify"; - version = "20170228.1151"; + version = "20170314.937"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "2b93fb7103f5"; - sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p"; + rev = "a53227513692"; + sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -18622,8 +19319,8 @@ sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/321ae5999351637a2cd97ec1bf4668d68f569ee4/recipes/erc-hl-nicks"; - sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; + sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq"; name = "erc-hl-nicks"; }; packageRequires = []; @@ -18635,16 +19332,16 @@ 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/69c923ab029eb0c638104f38d2c9766992ca101c/recipes/erc-image"; - sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; + sha256 = "1k5llh2jg2wxy9v03qrhwqa6g7apkqiqa47jm24z0ydqinm6zl83"; name = "erc-image"; }; packageRequires = []; @@ -18727,8 +19424,8 @@ sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c846b4bad6836f53261d64ceac910b6cbd9021a1/recipes/erc-tweet"; - sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-tweet"; + sha256 = "0nmh3r8s69hfmkz0jycn7w2icb5gnw2qbf8xjd52kigkdb2s646c"; name = "erc-tweet"; }; packageRequires = []; @@ -18740,12 +19437,12 @@ erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "erc-twitch"; - version = "20160522.859"; + version = "20170426.2306"; src = fetchFromGitHub { owner = "vibhavp"; repo = "erc-twitch"; - rev = "c1ece5d18a2d13a08e8f764271be9e21a9bdddc5"; - sha256 = "094pzznjiv33lbjjg7yfjngc5hrphjj5j2l6jjy7fd62vh4m9jxk"; + rev = "53c6af0cb72e56d897d30a40e7e5066668d6b5ec"; + sha256 = "0qirx38czv8m7sgj3rm1zncmyd8z6k4xhd8ixwxl7nigfpqvvv4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46f8640b24bade45cc729eeb370adf959f99526f/recipes/erc-twitch"; @@ -18845,16 +19542,16 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20161119.652"; + version = "20170529.1408"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "57fc9c3f1ab9cfb2d6b5f20731ff7f63ee3daaa4"; - sha256 = "0hd949g9al3lifbpy36z4v9ia61zbjvj05kpb3min642m1a5361i"; + rev = "ef3cd7b9ced044bbd9a3e7cce0c78a970a483288"; + sha256 = "0n0n7600zwa9z8srafq0gp6d17lkr4pkrsql50rl2qa1fr44zi7z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; - sha256 = "10dhy4d8kwi983fx0klvpvwlwrwrnx1h4x32j2zzlg5rvig016li"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader"; + sha256 = "1ai27lyb9xcmjjcnppzzhb6ilsvq9d9g9z7h79lp7axq761vind4"; name = "ereader"; }; packageRequires = [ dash emacs s xml-plus ]; @@ -18908,12 +19605,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20170112.1108"; + version = "20170509.1202"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6"; - sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh"; + rev = "3e6fea941af18415b520f2fabc45349c4a148a8f"; + sha256 = "1b0whc2llfff6wggiran0df7wrh06mygca0cqpps6ljfniqcxl5y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18950,12 +19647,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20170303.248"; + version = "20170509.742"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "3300b3059d13cd204f553f0c7d46d784adc5a8ab"; - sha256 = "1717hpj71kq9bgfwp30z8k2pns6n23vh3mybfsn6iz8wz424428x"; + rev = "de5cfabdad61d45a112d95e24ac44e3f51a4bd18"; + sha256 = "14mi9qj2q0h21jy9zj4gqjz2205013d5s5l02asq6iid747jhx3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18979,8 +19676,8 @@ sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ee5807cfb3973348b901142b317e1c7edc3b38db/recipes/eros"; - sha256 = "0xry221mj1achsyc8mkmipza2zn2xmsx96fqznf6mqvx4s271nvs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eros"; + sha256 = "0l79bn72x5m2lzglrwwngz3hax9pf8wv7ci86y5pkwaa8frxycww"; name = "eros"; }; packageRequires = [ emacs ]; @@ -19010,16 +19707,19 @@ license = lib.licenses.free; }; }) {}; - ert-expectations = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + ert-expectations = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "ert-expectations"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ert-expectations.el"; - sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7"; + version = "20121009.34"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "ert-expectations"; + rev = "aed70e002c4305b66aed7f6d0d48e9addd2dc1e6"; + sha256 = "0qgi3rj49k0hz4azg7ghcj6385p5s9gakqjhrjnhih7dxvihcgxi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/55809f1a04061a26665d2995975aba429815c19e/recipes/ert-expectations"; - sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/ert-expectations"; + sha256 = "07mp0azb6wsa1z4s6q8jyh7dpzils0wh2bamfmxzy4gjqjwv8ncn"; name = "ert-expectations"; }; packageRequires = []; @@ -19111,22 +19811,22 @@ license = lib.licenses.free; }; }) {}; - es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }: + es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170213.1137"; + version = "20170705.2002"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "9fb395996316c140f3a6c77afb10dcd37cb49126"; - sha256 = "0g2x3jwy3v45p6nqjfskj0w0c94gyvxm1xzi5yypnyhsj188fsyp"; + 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 s spark ]; + packageRequires = [ cl-lib dash request s spark ]; meta = { homepage = "https://melpa.org/#/es-mode"; license = lib.licenses.free; @@ -19156,16 +19856,16 @@ esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esa"; - version = "20160430.2340"; + version = "20170427.845"; src = fetchFromGitHub { owner = "nabinno"; repo = "esa.el"; - rev = "b944078e190f050f8312eb7ea91dab4d049ca080"; - sha256 = "1rxfqj46zg3xgg7miflgsb187xa9fpwcvrbkqj41g8lvmycdnm0a"; + rev = "8bd011cd1861113f54ad155d3c62725e1dcd37e7"; + sha256 = "1a5mrz3m0gy5r7dcw31s488jgfhrp4axcnsmma40q2x3harp0hsk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f40e277af4001d367099360d4342d9c1ab925f59/recipes/esa"; - sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa"; + sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb"; name = "esa"; }; packageRequires = [ cl-lib ]; @@ -19177,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"; @@ -19219,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"; @@ -19290,8 +19990,8 @@ sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b0bc9259d7ee9eaf015f6583f82f1313d69e6f29/recipes/eshell-fixed-prompt"; - sha256 = "0r0dbqmxzlh1sqadivwq762qw7p6hbrqprykd6b1m9m9gbb2qnkg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt"; + sha256 = "0mhrfxf19p4qqnlnnfc0z70324c7qiiv63riaz4cn5jj1ps3v0iy"; name = "eshell-fixed-prompt"; }; packageRequires = [ emacs s ]; @@ -19324,12 +20024,12 @@ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "20161126.758"; + version = "20170316.1051"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "fb56e851c1baac68249c34043bd5db9c9420141e"; - sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs"; + rev = "ec246fa4c27ecb7df10c93b0710e6a64fa5ef4c9"; + sha256 = "0dc1d6z8m3dvgqvp16nsw84g4fwzqv3nh21k1v2mr3iy8nmdf0l2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; @@ -19345,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"; @@ -19366,16 +20066,16 @@ eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-up"; - version = "20170108.749"; + version = "20170425.1037"; src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "e30081fdfb20e380bdcd00b04fcca41aa2bc57af"; - sha256 = "1xq1y6ddq9hxcc13wzj55snc7dg75y1z78f5bhnm9ps3ww7nmc9s"; + rev = "9c100bae5c3020e8d9307e4332d3b64e7dc28519"; + sha256 = "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up"; - sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up"; + sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy"; name = "eshell-up"; }; packageRequires = [ emacs ]; @@ -19416,8 +20116,8 @@ sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3d4417bb564a942ef031cfb319cff3b93645e5d8/recipes/eslint-fix"; - sha256 = "06qzzx1bab1169jdaljm7zh5nzm9p0wzdvqcxfrsw8s2mw5q5wi8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix"; + sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da"; name = "eslint-fix"; }; packageRequires = []; @@ -19429,12 +20129,12 @@ eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20170227.1220"; + version = "20170711.552"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "9c1f697c95b16f623c24bbb9c63257068d834977"; - sha256 = "0ddpr9brxigc22mzq4nc5x499bpkqq3xx28ygjcmc0z7kb03d0rk"; + rev = "895d70be11ccdbcdf0b44d5ae2a85d4ccac2920c"; + sha256 = "1h43l4jvp3wbyyda3745m6c6ik6pn4k7pmq94ia9fbp4zqh4hsvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -19450,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"; @@ -19475,8 +20175,8 @@ src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; - rev = "ef854367d469c6eff459d24a544addd21a4fbd23"; - sha256 = "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q"; + rev = "7fc312184348df55d19d06914605356885674354"; + sha256 = "1vx1b1pyi2xpfl822mskzvh943rxp9pyr915fnx5pjp58hjwwf3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; @@ -19534,12 +20234,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170227.802"; + version = "20170710.118"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "e7e52d2c07d374209261d207293caa391db7b398"; - sha256 = "1apk33hmsn5qlagnrqnmd975pz2ydf69s4kwsnx00fj9fb48bkzz"; + rev = "064174931f0cbf91ad24fda883909a06eee10f6e"; + sha256 = "0f6ikmgcakaa74p271nfkg55gbq2wxdjq978h8kp7x7vaczfjz0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19660,12 +20360,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170125.43"; + version = "20170508.1536"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "a63ab0cd57a37317256b15a3f5f30c2b11d92c25"; - sha256 = "07bpcihmzaf7av2sbzs0pr0cw21xqr3nnalj3cwxv7d6yhc8g4qf"; + rev = "efaf44d0739391aed48c77b5cd3013b50027ed36"; + sha256 = "1ddff6scpnljl9h957zx7nahxd6si0gcznkg5da09sa7vpds0732"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -19689,8 +20389,8 @@ sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4381bbb725cb4a17d741f604698b38c95da475/recipes/esxml"; - sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml"; + sha256 = "0v63ihgg2db3648s2xygcky9s0vx9byjjpbhlgjy5j159w2w53vh"; name = "esxml"; }; packageRequires = []; @@ -19724,8 +20424,9 @@ pname = "etags-select"; version = "20130824.500"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/etags-select.el"; + url = "https://www.emacswiki.org/emacs/download/etags-select.el?revision=21"; sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb"; + name = "etags-select.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5875d00419666388acbcb8a4f392308e7576da0b/recipes/etags-select"; @@ -19742,8 +20443,9 @@ pname = "etags-table"; version = "20130824.457"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/etags-table.el"; + url = "https://www.emacswiki.org/emacs/download/etags-table.el?revision=4"; sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf"; + name = "etags-table.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3efc1791df5658ca5bba4907f2a22c2cabfd3c8/recipes/etags-table"; @@ -19759,12 +20461,12 @@ ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; - version = "20160317.920"; + version = "20170507.1330"; src = fetchFromGitHub { owner = "glasserc"; repo = "ethan-wspace"; - rev = "b8eae49ed3e7f646c16234970af5663e3090e720"; - sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja"; + rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4"; + sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace"; @@ -19780,12 +20482,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20161226.840"; + version = "20170621.945"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "cbbb60cf7d301c19906678bae933060af21c1a86"; - sha256 = "0xz4asnwg52f02jmyz2flmkl748isacvjylfwi23xdcxqiab454a"; + rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b"; + sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -19906,16 +20608,16 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170306.334"; + version = "20170712.2350"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "56e92f7cb4e04e665670460093b41f58446b7a2b"; - sha256 = "0063x3v849h57bf4pqf3k2kiqrjj0sjw5y9w9lr0q0v33mn8q145"; + 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 ]; @@ -20008,22 +20710,22 @@ license = lib.licenses.free; }; }) {}; - evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-basics"; - version = "20161117.1319"; + version = "20170425.509"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "5e56117af85e89659e9565abefef24fab7b567e8"; - sha256 = "0r62rpgklsc24yj57w72jq9i1c54fr4ksy99siyvkginmcink7kz"; + rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960"; + sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k"; name = "evil-colemak-basics"; }; - packageRequires = [ emacs evil ]; + packageRequires = [ emacs evil evil-snipe ]; meta = { homepage = "https://melpa.org/#/evil-colemak-basics"; license = lib.licenses.free; @@ -20053,12 +20755,12 @@ evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; - version = "20161015.1251"; + version = "20170413.751"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-commentary"; - rev = "a5f2543cb2b90d73b86776f02b25ef16c505832e"; - sha256 = "1nslk5j55yqaczpbz7w8jirl6gbccb32w8g6bm7higvv8cjv7qsg"; + rev = "395f91014b69844b81660c155f42eb9b1b3d199d"; + sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary"; @@ -20116,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"; @@ -20166,8 +20868,8 @@ sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; - sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape"; + sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l"; name = "evil-escape"; }; packageRequires = [ cl-lib emacs evil ]; @@ -20179,12 +20881,12 @@ evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-exchange"; - version = "20160812.843"; + version = "20170510.1959"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-exchange"; - rev = "8902966aec2709b7e680d13c362d74b7f89b909b"; - sha256 = "1jfjgh75ycm6i01zpnz8y1hp205w61rqbvargk3rp65c34j48dcd"; + rev = "47691537815150715e64e6f6ec79be7746c96120"; + sha256 = "0bjpn4yqig17ddym6wqq5fm1b294q74hzcbj9a6gs97fqiwf88xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange"; @@ -20260,6 +20962,27 @@ license = lib.licenses.free; }; }) {}; + evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-goggles"; + version = "20170710.724"; + src = fetchFromGitHub { + owner = "edkolev"; + repo = "evil-goggles"; + rev = "902270eea80594577d9af26298998406f79e59a0"; + sha256 = "11v1zpi3jnsxdwhxv441rvbkyb6v1sg4zyk74aw14l5cf38f0d55"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; + sha256 = "151xvawyhcjp98skaif08wbxqaw602f51zgwm604hp25a111qmnq"; + name = "evil-goggles"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-goggles"; + license = lib.licenses.free; + }; + }) {}; evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-iedit-state"; @@ -20344,6 +21067,27 @@ license = lib.licenses.free; }; }) {}; + evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-lion"; + version = "20170523.450"; + src = fetchFromGitHub { + owner = "edkolev"; + repo = "evil-lion"; + rev = "79766bfb8cbaa82af92eb9c90ea370e10ff74ea4"; + sha256 = "1799gjd1qj6hdzdy88x7lw0xwygkh70zm0y5gkhlmn4rzkdka9j1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion"; + sha256 = "1rwmpc5ifblb41c1yhhv26ayff4nk9iza7w0wb5ganny2r82fg2v"; + name = "evil-lion"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-lion"; + license = lib.licenses.free; + }; + }) {}; evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-lisp-state"; @@ -20355,8 +21099,8 @@ sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4ef683cb1707a481e26dc89b5491ec18e5b20ad1/recipes/evil-lisp-state"; - sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state"; + sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz"; name = "evil-lisp-state"; }; packageRequires = [ bind-map evil smartparens ]; @@ -20389,12 +21133,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20161130.847"; + version = "20170613.510"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "9251065b73c5023fc21d56f5b94c505cb7bee52d"; - sha256 = "17jnqd73i680fpmghghadc4d4xlg39xfjx3ra8sll0h1xf4xkspi"; + rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db"; + sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -20431,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"; @@ -20452,12 +21196,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170205.1355"; + version = "20170716.1806"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "17a469799a5fe0df8d9b3589c6719634acd065eb"; - sha256 = "0rwz0xg76kvyz959r8bywdbddxaxn69z9lqq95z71qq980w3d4g7"; + rev = "8127c3161a6d990635684a020f708b7914445593"; + sha256 = "10cy5shnd9dl9xkcl7gx4ksbbn2cqjww9ihw7ifawnwpa77bcf43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20515,12 +21259,12 @@ evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; - version = "20161010.1703"; + version = "20170623.1135"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "e2df8629971df7c905256c504ff5f90b94eebdb8"; - sha256 = "127x55msyy54n6lkml615akhafnbn62cxnmwj1brjwzzi5cbk6bn"; + rev = "e135fd8662406807bc0d9d0f2688e7dbe89b98c8"; + sha256 = "1dw3mf3dckjhnzvwj7jcwlgzkh592njvcg2xbs2wv1456rnnqaz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -20536,12 +21280,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20170305.1847"; + version = "20170309.49"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d"; - sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8"; + rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03"; + sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -20586,8 +21330,8 @@ sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener"; - sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener"; + sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g"; name = "evil-opener"; }; packageRequires = [ evil opener ]; @@ -20596,22 +21340,22 @@ license = lib.licenses.free; }; }) {}; - evil-org = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20151202.2347"; + version = "20170622.1310"; src = fetchFromGitHub { - owner = "edwtjo"; + owner = "Somelauw"; repo = "evil-org-mode"; - rev = "61319f85979e8768c930983595caa2483c0fb319"; - sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53"; + rev = "975109dc665f53cef221b3c668612664340b7940"; + sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5ec54af16e3dadce43ece7da3acb1cf2eab5d14b/recipes/evil-org"; - sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; + sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z"; name = "evil-org"; }; - packageRequires = [ evil evil-leader org ]; + packageRequires = [ emacs evil org ]; meta = { homepage = "https://melpa.org/#/evil-org"; license = lib.licenses.free; @@ -20683,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"; @@ -20708,8 +21452,8 @@ src = fetchFromGitHub { owner = "linktohack"; repo = "evil-rsi"; - rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0"; - sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f"; + rev = "65ae60866be494e4622fe383e23975e04d2a42a3"; + sha256 = "0cc2yxck5brnicllcadb4m5zlzczvdy6v38q34hj8bri1kxfzslz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi"; @@ -20725,16 +21469,16 @@ evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "evil-search-highlight-persist"; - version = "20160912.807"; + version = "20170522.2034"; src = fetchFromGitHub { - owner = "juanjux"; + owner = "naclander"; repo = "evil-search-highlight-persist"; - rev = "2f9ea9086373292610f50e5f468b55c3fe072bfc"; - sha256 = "04mf3zd424kfnswifrg3qlyi39f58ydnm7ahcd0zi168bv1d9r6j"; + rev = "6e04a8c075f5fd62526d222447048faab8bfa187"; + sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist"; - sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist"; + sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3"; name = "evil-search-highlight-persist"; }; packageRequires = [ highlight ]; @@ -20764,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 = "20170104.1209"; + version = "20170702.302"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "e8acacd31466def1e8fa1eac0c5ccbbcd5a0ba2e"; - sha256 = "1x8qwvpjv87sv2lyda57k0l47mjvn0ichpgjs0vc7q8kmhww5k5h"; + 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; @@ -20811,14 +21555,14 @@ pname = "evil-surround"; version = "20170124.1110"; src = fetchFromGitHub { - owner = "timcharper"; + owner = "emacs-evil"; repo = "evil-surround"; - rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; - sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; + rev = "43a266461517d2eb715338da0a31dc6616073116"; + sha256 = "04pzlkblziir91g38kmlmr7p1q5cxjw4q7difwhly3iz567minkq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; - sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; + sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1"; name = "evil-surround"; }; packageRequires = [ evil ]; @@ -20872,16 +21616,16 @@ evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-terminal-cursor-changer"; - version = "20160806.2236"; + version = "20170401.142"; src = fetchFromGitHub { owner = "7696122"; repo = "evil-terminal-cursor-changer"; - rev = "918a741c2ad83f3aa3478863d01bf57422eb6009"; - sha256 = "0wdn2gp93r555p7pp9pw8ma2wfs2gzvb54ncrh3ad0p8v95x1kf5"; + rev = "b49ca4393d2f3cc6014174950059b36a5cb22949"; + sha256 = "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/148d324afb1891b239dfad680ad7b87b4611316b/recipes/evil-terminal-cursor-changer"; - sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-terminal-cursor-changer"; + sha256 = "16p9a1dybbqr8r717c5ssfd3p5392bqxxzqs4n0xc7v7g8v1m0cd"; name = "evil-terminal-cursor-changer"; }; packageRequires = [ evil ]; @@ -20918,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"; @@ -21044,12 +21788,12 @@ src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "9bfbaf71898294e25d588a887fb4753641edfbe9"; - sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s"; + rev = "99559e1a6e813056a132f4be32b20f259470e9ed"; + sha256 = "053fqsl8cd2s0cyinvmihaglq4cv1l1ymxy7rcx9spknipcil1xp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace"; - sha256 = "1pw2s228q78cbjpd6yx5jca3xhj8lwrb8kj86i6afn4l1m88azzv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; + sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01"; name = "evil-visual-replace"; }; packageRequires = [ evil ]; @@ -21132,8 +21876,8 @@ sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/62ffcf48bdb2df2bc9e6dd767c4ed9d605a5c839/recipes/eww-lnum"; - sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum"; + sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c"; name = "eww-lnum"; }; packageRequires = []; @@ -21145,16 +21889,16 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20170304.1309"; + version = "20170508.4"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "c6eedaf916f763a68cbb7fdaf9c7af568546d4b9"; - sha256 = "1r8053w782054dygpjpahjns5v0qf4drjisg5131qjkd9nvwyc0k"; + rev = "5e355fbc50913d1ffe48bf86df0bcecd8b369ffb"; + sha256 = "1flkhbyxa7mi97vj4w6c2anzq7qz51sac6yqk308blfvd9z3pf95"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell"; - sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; + sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5"; name = "exec-path-from-shell"; }; packageRequires = []; @@ -21166,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 = "ff6f30a005444269b985bbc28963c85ebcdaa835"; - sha256 = "078xpnjqndlcaidzgdcvryqsrd5vpi2ckvlb6ihcym68611zqy7g"; + rev = "1c9c6feba21b98337665b6f2b4064b2bf5b75af6"; + sha256 = "1m3jn127w95sb4y34f9lb1cv445pxfs4b90f6ia5cjs75706fn03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -21207,12 +21951,12 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20170222.343"; + version = "20170514.1309"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "d1252200bac2e0197497d6d57ab6fd004f1b2e77"; - sha256 = "0bhwv92wqccz8y5xm6gj71ryci8cpsnm8z8vmdj8lsf6ki8vz512"; + rev = "2357f1d5efd9d5b9e37f3513342237fec2629291"; + sha256 = "0sggq57q8fxzd0my2kwbb2li91zq13cyhxn789bafzxq2d5fpk9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -21246,6 +21990,27 @@ license = lib.licenses.free; }; }) {}; + exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "exsqlaim-mode"; + version = "20170607.303"; + src = fetchFromGitHub { + owner = "ahmadnazir"; + repo = "exsqlaim-mode"; + rev = "a2e0a62ec8b87193d8eaa695774bfd689324b06c"; + sha256 = "1gj1q2h1ja30jizkjql12cxlppj07ykr4wxqca9msy043zdhqnkk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode"; + sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7"; + name = "exsqlaim-mode"; + }; + packageRequires = [ s ]; + meta = { + homepage = "https://melpa.org/#/exsqlaim-mode"; + license = lib.licenses.free; + }; + }) {}; extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "extempore-mode"; @@ -21288,22 +22053,22 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ cl-lib ? null, dmenu, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, start-menu, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20160307.55"; + version = "20170708.1735"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "cda2bc2b3b3347af34349e5f33d2d90f1ef27157"; - sha256 = "1i9lklzg7fyi4rl0vv1lidx0shlhih0474bbjsvc74p19p5cmlrq"; + 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 dmenu exwm start-menu switch-window ]; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -21312,12 +22077,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20161226.1438"; + version = "20170318.1418"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef"; - sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl"; + rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20"; + sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -21330,25 +22095,6 @@ license = lib.licenses.free; }; }) {}; - eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: - melpaBuild { - pname = "eyedropper"; - version = "20170221.1640"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/eyedropper.el"; - sha256 = "1nyplgpcpbczb1lfj2x5l92ckn6f7wz28sviqiinh45fzsji5h3r"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/eyedropper"; - sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk"; - name = "eyedropper"; - }; - packageRequires = [ hexrgb ]; - meta = { - homepage = "https://melpa.org/#/eyedropper"; - license = lib.licenses.free; - }; - }) {}; eyuml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "eyuml"; @@ -21356,8 +22102,8 @@ src = fetchFromGitHub { owner = "antham"; repo = "eyuml"; - rev = "2f259c201c6cc63ee608f75cd85c1ae27f9d2532"; - sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9"; + rev = "eb29c37316e44a14741f16e894fbcfcb7537dc80"; + sha256 = "19n2dzr3m56g76igh57cvvhqwpbcicwr7r6r4i3l8vsjch99kp6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a8d723e357da67441e65047759ccfa9cb7ef6/recipes/eyuml"; @@ -21373,12 +22119,12 @@ ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ez-query-replace"; - version = "20160908.1329"; + version = "20170311.139"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ez-query-replace.el"; - rev = "4b3c6212dc8141a1f75d258e70657b62e4c96ab3"; - sha256 = "0a1cgcbh969lchkqqxlxzg8rgdf1yiwaf1d15fk2z489lklqn5sx"; + rev = "66381226da00cc4a87c7d5962aaabbc0eb325cb7"; + sha256 = "1p5qg5pz87ym1gd0jmakkpkskmffl69694pkxbhhfxp10pyshzmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace"; @@ -21394,12 +22140,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170306.534"; + version = "20170517.847"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f"; - sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk"; + rev = "6c7e6ac20e27a26e7b27761f11a3a959ea815b5c"; + sha256 = "1jzqb1w8ax5h6g9nwqwnagalag2kj7mabq889vl59ka5lvccac0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -21415,16 +22161,16 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20161002.800"; + version = "20170404.1039"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "4ef57d1539a964a0d02b23becbe9b5e49b805d66"; - sha256 = "1hymz7chs177pwgfddz6prb18iqj93n1j2xzfszlgl28246939cl"; + rev = "fabdbd4a4a8caf8684f0fa656f457a03c5dfa4de"; + sha256 = "1983ymny8329d826kfm5f88na1lym991xnz8wjz4nd1ah52c323x"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f"; - sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; + sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s"; name = "f"; }; packageRequires = [ dash s ]; @@ -21461,8 +22207,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "fabric.el"; - rev = "8402f2f71c8975d2d9611e2a30845d62d58c9e28"; - sha256 = "116qwncyxaj9a0p5qk5ragi2wshbcv6ncgkmf9nhha7i45hdfa7f"; + rev = "2d436122243bcdd64ec5700e42d88ea9d363aefc"; + sha256 = "0g083jbxqzzg0pja1fhqshg6dv7p22ymnlsg02l073059sfy4c94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric"; @@ -21475,12 +22221,34 @@ 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"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/face-remap+.el"; sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad"; + name = "face-remap+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+"; @@ -21499,6 +22267,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/facemenu+.el"; sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq"; + name = "facemenu+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+"; @@ -21517,6 +22286,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/faces+.el"; sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx"; + name = "faces+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+"; @@ -21574,12 +22344,12 @@ faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faff-theme"; - version = "20161026.1047"; + version = "20170522.1219"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "61d98d43c9173662078c0c337ce78918eb6a3610"; - sha256 = "15shbzjpl89ybyyn7d53psn9i8csxi2h9jwz7mx98lg9pjy58ifa"; + rev = "e79dc142d99bc5a455a46345d3aba6f95f3f3f42"; + sha256 = "0j5vdbwwpav09v3kkx7cn5qd41inam0jd7smx8133hqpnirsh8mv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -21784,12 +22554,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20170208.1012"; + version = "20170615.1143"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "ec1d202c11a1c81f7ab0b9cf235d64c68d8e3134"; - sha256 = "1p32lqmnp7k0gck6my1cy4hd5sck28zkfvlg8q23lpkcg1vcsqlx"; + rev = "cddd216402c9a9b4228b5f82afa1bd637b2e0c37"; + sha256 = "0kvn9ikxnv9ahz0cqal3drxv95slwbf758sp37irih6fqh3ybgbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -21932,6 +22702,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/files+.el"; sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv"; + name = "files+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+"; @@ -21950,6 +22721,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/filesets+.el"; sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg"; + name = "filesets+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+"; @@ -22004,22 +22776,22 @@ license = lib.licenses.free; }; }) {}; - finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "finalize"; - version = "20140127.1046"; + version = "20170418.1245"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "9ac589cf487f5d37163dc9e7ca8c52800710805e"; - sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa"; + rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27"; + sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq"; name = "finalize"; }; - packageRequires = [ cl-lib eieio emacs ]; + packageRequires = [ cl-generic cl-lib eieio emacs ]; meta = { homepage = "https://melpa.org/#/finalize"; license = lib.licenses.free; @@ -22048,14 +22820,15 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20170222.1750"; + version = "20170409.1832"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "002lcqhddw163w8h2lkp3yd47qhbia9ml7g8agngffsin9jip7qw"; + sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs"; + name = "find-dired+.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; - sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/find-dired+"; + sha256 = "190cj41b6s1l6gk1m0rbwfsdciw4my39ncppdxf9pi7gzhcjpznr"; name = "find-dired-plus"; }; packageRequires = []; @@ -22067,12 +22840,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20161202.2205"; + version = "20170531.2054"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "08ab38b89d21f528fa7dc18f860191365852959a"; - sha256 = "1ybv1scpf7578zfjpl71nynzydq8g5607ai6l0vavprdhri70xdf"; + rev = "a6e59891973f3e40ca2e414ca66799cc686d8626"; + sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22154,6 +22927,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/finder+.el"; sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14"; + name = "finder+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+"; @@ -22166,16 +22940,19 @@ license = lib.licenses.free; }; }) {}; - findr = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "findr"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/findr.el"; - sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q"; + version = "20130127.1232"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "findr"; + rev = "1ddbc0464bb05dcda392b62666ad17239a2152d3"; + sha256 = "0wx4hd4agrfvk0igyash658cbf7v3bv01rlspllsvzr59fl3faqq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66bba94ec4168441c8e43253c7e1cfd82b613431/recipes/findr"; - sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/findr"; + sha256 = "0pw72bdpmc0ymlgjmwwrslhynij5a5b9sc3rx6vyprpv1ad4ac2c"; name = "findr"; }; packageRequires = []; @@ -22296,8 +23073,8 @@ src = fetchFromGitHub { owner = "johanvts"; repo = "emacs-fireplace"; - rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed"; - sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8"; + rev = "23a444f749bcb2b804593e3b2cb9c73cc59231fb"; + sha256 = "1ijsa9k0cqy8w0ix2axw2j5996xab77x5s5vd5850jx0my6m7wyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace"; @@ -22334,12 +23111,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "20160924.1207"; + version = "20170430.623"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "d8b3493623ad834cb18f7de957dfbd17e2fba3ba"; - sha256 = "16x8fv8yl9wxmrxh4p7npixrh36vdwdc2n6paly0swlmj9a2j399"; + rev = "888d037008272f6001207a2990e51ba87fe187e6"; + sha256 = "1r2clxm68nq8jhgc5cly51i6axjmi720r5m34dhf6zblwib4lfdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -22356,8 +23133,9 @@ pname = "fit-frame"; version = "20170222.1754"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fit-frame.el"; + url = "https://www.emacswiki.org/emacs/download/fit-frame.el?revision=63"; sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x"; + name = "fit-frame.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame"; @@ -22373,12 +23151,12 @@ fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; - version = "20161231.1554"; + version = "20170518.2311"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "483365fb3c4ba5e08f5df07436294e7f8714dbd2"; - sha256 = "09c6ynmsypjpiwwn29npsbf4lq20i5cks41maxifnpvqxmkk6a4c"; + rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3"; + sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -22415,12 +23193,12 @@ fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; - version = "20161231.1555"; + version = "20170518.2343"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "bcc22ef05b5cdd43632121bfc9d77b27df7c34e7"; - sha256 = "066wif5p96yrcb944ic84jxxps80qxl17igagw3cdfj868y7nfik"; + rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338"; + sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -22472,8 +23250,8 @@ sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ebba36b9acf27e515a71b6b2bf92aeecc78cee/recipes/flappymacs"; - sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flappymacs"; + sha256 = "0id3bz4h9wi4943kp2sab7240fw8hsnkpng02gij9ssyvjiii5cg"; name = "flappymacs"; }; packageRequires = []; @@ -22545,6 +23323,27 @@ license = lib.licenses.free; }; }) {}; + flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flatui-dark-theme"; + version = "20170513.722"; + src = fetchFromGitHub { + owner = "theasp"; + repo = "flatui-dark-theme"; + rev = "5b959a9f743f891e4660b1b432086417947872ea"; + sha256 = "0nz4ql7qf49cwsgjb7dg0jhipr5d472r4fddy6fhr1h17s1cd9qy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme"; + sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y"; + name = "flatui-dark-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/flatui-dark-theme"; + license = lib.licenses.free; + }; + }) {}; flatui-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatui-theme"; @@ -22577,8 +23376,8 @@ sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d8ffa6a578b4bc22b7146ab80769ce7ddee5eac/recipes/flex-autopair"; - sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flex-autopair"; + sha256 = "0w3l236psqxl7wqdi2aisz8wcv279kw6gdja72viiscrbcm78xh0"; name = "flex-autopair"; }; packageRequires = []; @@ -22590,11 +23389,11 @@ flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-isearch"; - version = "20160926.1630"; + version = "20170308.1210"; src = fetchhg { url = "https://bitbucket.com/jpkotta/flex-isearch"; - rev = "6a54f37be01f"; - sha256 = "19wcfpgd5qrh3sbybrxvd1hx34j85y34dy19yb80nlh2nha2n5sk"; + rev = "8b934ea6f1e4"; + sha256 = "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/flex-isearch"; @@ -22631,12 +23430,12 @@ flimenu = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flimenu"; - version = "20160821.1330"; + version = "20170417.1847"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "flimenu"; - rev = "ecbd47c857781b9c38035048d69415b617a75422"; - sha256 = "0a37kjpcpkm172icd2dbb5ndi6s164rbrpvy0c7kr0gl30n1gb8c"; + rev = "9351201d89b05cbdaec312a6ebd7fd10c38d6112"; + sha256 = "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu"; @@ -22653,8 +23452,9 @@ pname = "fliptext"; version = "20131113.1818"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fliptext.el"; + url = "https://www.emacswiki.org/emacs/download/fliptext.el?revision=4"; sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw"; + name = "fliptext.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/093046dfb39148d56681e9c8be8cccff23dd19cb/recipes/fliptext"; @@ -22670,12 +23470,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "20170204.226"; + version = "20170416.1718"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f"; - sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna"; + rev = "fdac635ecc57ac7743f74678147aca2e956561de"; + sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -22688,24 +23488,24 @@ license = lib.licenses.free; }; }) {}; - flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: + flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "flow-mode"; - version = "20170303.1146"; + pname = "flow-minor-mode"; + version = "20170418.1253"; src = fetchFromGitHub { owner = "an-sh"; - repo = "flow-mode"; - rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458"; - sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp"; + repo = "flow-minor-mode"; + rev = "b05d59f387133249e03004b79bf16d6fe6c38217"; + sha256 = "0kw001kcdqjj3ymk9vn9giiv18icp3yrys8xdvszkhlby99y74h5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode"; - sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8"; - name = "flow-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; + sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s"; + name = "flow-minor-mode"; }; - packageRequires = [ emacs web-mode ]; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/flow-mode"; + homepage = "https://melpa.org/#/flow-minor-mode"; license = lib.licenses.free; }; }) {}; @@ -22796,12 +23596,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170223.247"; + version = "20170715.1345"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "da499ef6a7e3c8f4adec732703f34aea2a4e70a2"; - sha256 = "0nyvkgva0qkk7hrsb2h3q22hxvc17r10hff87gv7bj82ia8lxqnl"; + rev = "b78d5a6f48c2ebd4298cf33c3364c63d86ae32cc"; + sha256 = "14mp95k9365869fikzsvxha74121kbcrwp0pavv17calf29ycxck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22888,8 +23688,8 @@ sha256 = "1jw8n6df2hpnjrsqzdd70j0ya3yjzkcy5gm6zx9acqfx88zlgb9m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/43224eef52bb316102fea524ba87b0e9e43dc6e6/recipes/flycheck-cask"; - sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask"; + sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f"; name = "flycheck-cask"; }; packageRequires = [ dash emacs flycheck ]; @@ -22905,8 +23705,8 @@ src = fetchFromGitHub { owner = "Gnouc"; repo = "flycheck-checkbashisms"; - rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057"; - sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3"; + rev = "0794ad763d7cd81286283f6400bc89a81e8e07d4"; + sha256 = "06jkvi17960wghphar9c1nixanb0197v8q5nm96mgz0gxn923400"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms"; @@ -22940,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"; @@ -22989,8 +23810,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44"; - sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3"; + rev = "2a0e96889b128808866a1e2e98694be1b251fd37"; + sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; @@ -23006,12 +23827,12 @@ flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-color-mode-line"; - version = "20131125.2138"; + version = "20170512.1607"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; - rev = "c85319f8d2579e770c9060bfef11bedc1370d8be"; - sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5"; + rev = "b2b20727d133c05fd31eac7b9b5c0886bbca8f98"; + sha256 = "1dgm9i2b9irp454ag9pv96hbacz1j3gsapk96xr45wjh4hblgwa3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; @@ -23024,15 +23845,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-coverity"; + version = "20170703.1759"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "flycheck-coverity"; + rev = "cb211e3dd50413a5042eb20175be518214591c9d"; + sha256 = "17c5lppa5axw6wga3k8zqmn5f2syadlqbavrqgsi8k8nlcckxy1x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity"; + sha256 = "1knd1sqgjkgb5zs8hgsi6lyvkqmrcrdjgx81f26nhg40qv5m2p5l"; + name = "flycheck-coverity"; + }; + packageRequires = [ dash emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-coverity"; + license = lib.licenses.free; + }; + }) {}; flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-credo"; - version = "20161121.2201"; + version = "20170526.845"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "flycheck-credo"; - rev = "f773422c356c1c3b39fcece3cb7cc1257c7df517"; - sha256 = "0cq6lap4gndm801lj1q1wajpb03vz40hsdimr1n02p2k2dkrz8p3"; + rev = "e88f11ead53805c361ec7706e44c3dfee1daa19f"; + sha256 = "04i7fbqpkjpsfa8vjpkdhg1sj5isczxwncdp4vr9x3vll3svblm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo"; @@ -23056,8 +23898,8 @@ sha256 = "1vy5yjf98b7dk9lniz3rgk33agg8f1x8488lvm28ljdq3jfdgcfw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7f413cc5c2080091491a986f69402b305abe4a7f/recipes/flycheck-css-colorguard"; - sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-css-colorguard"; + sha256 = "16qgn12jdps61mlbvhji5l8qrqigv382wyiv79rj2bwvdzbl653f"; name = "flycheck-css-colorguard"; }; packageRequires = [ emacs flycheck ]; @@ -23132,12 +23974,12 @@ flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dedukti"; - version = "20150106.651"; + version = "20170407.258"; src = fetchFromGitHub { owner = "rafoo"; repo = "flycheck-dedukti"; - rev = "717977c0ead0dc6e267ba2164781d92ee016b7b2"; - sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6"; + rev = "ea34af5e677fbf18a40935b531abb1d9aae59f6b"; + sha256 = "03flfn7caxa8jpp6v3mn1mvs8lf4khcl8nsgd1nb93k7wp9x6l5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/732832e88a65a8866fa3872ff5f29eb8a26438f2/recipes/flycheck-dedukti"; @@ -23157,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"; @@ -23174,12 +24016,12 @@ flycheck-dialyxir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dialyxir"; - version = "20170124.2319"; + version = "20170515.825"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "flycheck-dialyxir"; - rev = "7e79dc33a12b8aded7a86d64d302072eed522cb4"; - sha256 = "1ylg8v1khh2bph6hscib7diw039z0nxfh28b9mhgyi6s33jyq618"; + rev = "adfb73374cb2bee75724822972f405f2ec371199"; + sha256 = "1kzvq99f052mdj4ml1m6nvxhv0kqqblmpdgnwcm89krf0qfl4gjg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa49551b8f726c235e03ea377bb09a8be37b9f32/recipes/flycheck-dialyxir"; @@ -23216,12 +24058,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20161223.856"; + version = "20170403.1116"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "8c6220f45c24d662f1c4afae54f311139f0242b1"; - sha256 = "0n0q5qhwpx3v0d3aw6swzv8w09cs5mlnx9aybfhclzfa44adn6rq"; + rev = "879c52116989f6041ccd20f5db210f5552d5c649"; + sha256 = "12qblzrw99lcl8qccl26kwqiwscn04izvjrsq3mnp1r5q0s0jxl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -23241,8 +24083,8 @@ src = fetchFromGitHub { owner = "aaronjensen"; repo = "flycheck-dogma"; - rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e"; - sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr"; + rev = "eea1844a81e87e2488b05e703a93272d0fc3bc74"; + sha256 = "0wmp4q1jzb6giwrv8ajgqriy155mcc7jnj5sycpfk3hw6q74js66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma"; @@ -23321,12 +24163,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20170207.605"; + version = "20170604.811"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "090e89455b1f1dcb2de7a2f40c36d2a002417795"; - sha256 = "1vp2mswzxfd88i253l7mx5qj8x1h47fgvgy7dwi31xvp7vr40n6g"; + rev = "a249e60803b1e423c67e40462229646cc77fcb68"; + sha256 = "04xghj1l4fnfhl139k3s6q7fhln946gx8ak7l6ys7rz23iizbx4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -23363,12 +24205,12 @@ flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-gometalinter"; - version = "20161225.1721"; + version = "20170321.732"; src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "b6fa2468401d9035b2aeb1dc9bdb12a518e0d13b"; - sha256 = "08cr2jij9iaa117l4b4mg977hi6klw9qj8knc42lfzz37d91r3i6"; + rev = "c90ea1aba80ddfdf603c9ba731be302400fd6ba2"; + sha256 = "0xw2wbch3y5nm90j9c53n3710xm161w724cknv8dwq27ickgp49b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; @@ -23384,12 +24226,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20160524.117"; + version = "20170622.1248"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "a475c9c4d799bf98931efec95b61160e3ad8b61f"; - sha256 = "05a5hyl6avf09drq6wva8mmxbag41dqixaz6azifywa8p63w1mlk"; + rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c"; + sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -23444,6 +24286,48 @@ license = lib.licenses.free; }; }) {}; + flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-joker"; + version = "20170415.2009"; + src = fetchFromGitHub { + owner = "candid82"; + repo = "flycheck-joker"; + rev = "43a25fe17ba6ade96fc865bd8ec3fb3c131aa419"; + sha256 = "0m2msyyshbr6pgnjqybv8b1fj0axja3la0drbbbk0va1cn556wfs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; + sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3"; + name = "flycheck-joker"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-joker"; + 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"; @@ -23594,12 +24478,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20161229.205"; + version = "20170417.1807"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "11805f1d420e297db0346a6657f144b08e2ca556"; - sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il"; + rev = "b16b77f95e4e53a8951ebee6209a5de311748447"; + sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -23640,8 +24524,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38"; - sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"; + rev = "cb526f54f4017454e2503b340757ba15578a5aed"; + sha256 = "1x1pmz7gd909s11fsyqrh8a7bg2j4hw572wwqy1kjz2qf42mfw53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -23741,12 +24625,12 @@ flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; - version = "20161112.912"; + version = "20170504.1504"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-pos-tip"; - rev = "88b5a6d7ce0f313cbd22d554ea248aab95357d33"; - sha256 = "0jfgq346b4nh9wry3mnf4sfbv3l78kgadklvbv0nxykvlpx9c1rv"; + rev = "7b94c0c1e3185a4350dc39885add3927037ebad8"; + sha256 = "0m56rflfdzddfsr1xlgzfl7i259786hxsnwa0m729140c6v8f5wh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip"; @@ -23783,12 +24667,12 @@ flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pyflakes"; - version = "20140630.1521"; + version = "20170330.1611"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pyflakes"; - rev = "026ef070f1589bc0ae8f86a02072fa36e57b9912"; - sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa"; + rev = "61b045939e3743b2162b7e4e73249c66fc2b8f65"; + sha256 = "03p0666vpprp6ijkvx9ypaw58bdq42gh533270plv2k5l8r22cl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes"; @@ -23822,48 +24706,48 @@ license = lib.licenses.free; }; }) {}; - flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: + flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: + melpaBuild { + pname = "flycheck-rtags"; + version = "20170522.2154"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; + sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4"; + name = "flycheck-rtags"; + }; + packageRequires = [ emacs flycheck rtags ]; + meta = { + homepage = "https://melpa.org/#/flycheck-rtags"; + license = lib.licenses.free; + }; + }) {}; + flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20161019.1103"; + version = "20170404.842"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "f8ae845d4d7a18c1873ee1edd1a4db272fde5dd3"; - sha256 = "1p7ijqcbrflaxqk7r5zvgxznsvd8kcr8hfnzlymdylwbgy04j6wy"; + rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053"; + sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w"; name = "flycheck-rust"; }; - packageRequires = [ dash emacs flycheck seq ]; + packageRequires = [ dash emacs flycheck let-alist seq ]; meta = { homepage = "https://melpa.org/#/flycheck-rust"; license = lib.licenses.free; }; }) {}; - flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }: - melpaBuild { - pname = "flycheck-scala-sbt"; - version = "20170226.1127"; - src = fetchFromGitHub { - owner = "rjmac"; - repo = "flycheck-scala-sbt"; - rev = "2d063d42628baf4cd4f38224013ece5b027db046"; - sha256 = "0ch63mm24ljpz1kd6w2qs4218ifir6aah7dnxipi2q2yz24frg6x"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt"; - sha256 = "09d6nj7rc1ba4psnb2csnmrs1mh5xnwh7gq7g6kq4y4f27wr8zcg"; - name = "flycheck-scala-sbt"; - }; - packageRequires = [ emacs flycheck sbt-mode ]; - meta = { - homepage = "https://melpa.org/#/flycheck-scala-sbt"; - license = lib.licenses.free; - }; - }) {}; flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "flycheck-stack"; @@ -23888,12 +24772,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20160813.2038"; + version = "20170405.1600"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "bfe40fec4695b6914d1ef36331dbd3eda384c92d"; - sha256 = "06p38yqkdrb4ksm30yd7wj3i6vqkhgmys94dm33anslh8dz00flw"; + rev = "c4e891ad287c12b83b754ada27b4550fb763c07f"; + sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -23930,12 +24814,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20161229.331"; + version = "20170409.25"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "ae7b29111cb160774c317997902d7ef29cedd7d9"; - sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d"; + rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; + sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -23990,19 +24874,61 @@ license = lib.licenses.free; }; }) {}; + flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-vale"; + version = "20170619.2322"; + src = fetchFromGitHub { + owner = "abingham"; + repo = "flycheck-vale"; + rev = "97df981468120aaedeaa4cf8ecfd68b07046d998"; + sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale"; + sha256 = "1ny30q81hq62s178rj3jjwsf9f3988dd6pl82r0vq53z3asnsxyd"; + name = "flycheck-vale"; + }; + packageRequires = [ emacs flycheck let-alist ]; + meta = { + homepage = "https://melpa.org/#/flycheck-vale"; + license = lib.licenses.free; + }; + }) {}; + flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-yamllint"; + version = "20170325.1035"; + src = fetchFromGitHub { + owner = "krzysztof-magosa"; + repo = "flycheck-yamllint"; + rev = "c2b273d84f15bd03464d6722391e595d7c179a5c"; + sha256 = "0snj6kkshk8bivwsnhp7kiyhzcn7x6952vw098wgzwqw2hgdkq97"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint"; + sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m"; + name = "flycheck-yamllint"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-yamllint"; + license = lib.licenses.free; + }; + }) {}; flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20160913.130"; + version = "20170614.1434"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; - sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; + rev = "35e8a31e32d0de890547612db8373d7333db8d8a"; + sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; - sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; + sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr"; name = "flycheck-ycmd"; }; packageRequires = [ dash emacs flycheck let-alist ycmd ]; @@ -24106,8 +25032,8 @@ sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bd115612b61895f98b0659e9edc1e590967b6337/recipes/flymake-easy"; - sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy"; + sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v"; name = "flymake-easy"; }; packageRequires = []; @@ -24589,8 +25515,8 @@ sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f711074c4b1be9f123f63a366108bbe147df0ad5/recipes/flymake-vala"; - sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-vala"; + sha256 = "1fs4alyf3dckdf1pm6vgh4wjpl22wrlhfx9nv072l0dg48zgyw16"; name = "flymake-vala"; }; packageRequires = [ flymake-easy ]; @@ -24770,12 +25696,12 @@ flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-popup"; - version = "20150926.803"; + version = "20170529.115"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "flyspell-popup"; - rev = "f31d89ec60364ee24f89c90e9acc110bd86ea67f"; - sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb"; + rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde"; + sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup"; @@ -24837,8 +25763,8 @@ src = fetchFromGitHub { owner = "troyp"; repo = "fn.el"; - rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6"; - sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91"; + rev = "2dc78b7ef9e24f9fe872d40c8fe6050f7ce819cf"; + sha256 = "0nvhis3myclgvazhiljv7fgis1x5hwr5rr8rhxx3290fgsgdp0bw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; @@ -24854,12 +25780,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20161113.1145"; + version = "20170612.743"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2"; - sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg"; + rev = "a84ade00a2b57e47430d5b2df5246069f197356f"; + sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -24925,8 +25851,8 @@ sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ebbbc23a29b2040c587e2f60dbfb7a9b45058751/recipes/fold-dwim"; - sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; + sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; name = "fold-dwim"; }; packageRequires = []; @@ -25004,6 +25930,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; + name = "font-lock+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+"; @@ -25103,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"; @@ -25229,12 +26156,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20170208.2305"; + version = "20170527.1230"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "45650c28a2cdc149a4480d5ea754758c75f8eb01"; - sha256 = "14p0qygs2ng0jq7hqnhq3za52pzs8gv8qr75a6ic0irh21mvspzp"; + rev = "522256d98d1a909983bcfd3ae20c65226d5929b6"; + sha256 = "110ycl8zkimy2818rhp3hk3mn2y25m695shdsy6dwxnrv90agss6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; @@ -25271,12 +26198,12 @@ fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fortune-cookie"; - version = "20151110.2235"; + version = "20170407.1517"; src = fetchFromGitHub { owner = "andschwa"; repo = "fortune-cookie"; - rev = "9bf0d29358989e1aee61c472bd5204b9bdf46465"; - sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4"; + rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6"; + sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie"; @@ -25296,8 +26223,8 @@ src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "cd164b75fdad957a8ac2548d0ddff84ae3359488"; - sha256 = "01dlnkzm2rl6lli2r9rz8kd9w4xp236ag6i3gdr5raflylf2yxp4"; + rev = "37289bb68f01dd49b1192032ade6b0741d024a54"; + sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -25321,8 +26248,8 @@ sha256 = "169d9j7jk3li96fkn2sr257835flkcpml24l4bmzp8j3q57a7wxw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/42acad345b25ee60fba6bd90e503f5437c6241f5/recipes/fraktur-mode"; - sha256 = "05d7xff4vjy1qzw923xsd0kdm1q2cibgxxc4g83mr0hiwlcx91fl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fraktur-mode"; + sha256 = "0hy2cncbgpp7ysp7qwfpj0r075rxrc77bmc70bw7hf8m1xiw124k"; name = "fraktur-mode"; }; packageRequires = [ cl-lib ]; @@ -25334,10 +26261,11 @@ frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; - version = "20170222.1758"; + version = "20170506.945"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/frame-cmds.el"; - sha256 = "1r2hyl7f1rgw20mh8nj0lzf491p5pl4pfprv0yj0jls5jaqds4xc"; + url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=93"; + sha256 = "1ax9hcrhhwll4m4xi0dvsv4q498cngq5xzib6n2ka706fmnjj0rj"; + name = "frame-cmds.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds"; @@ -25354,8 +26282,9 @@ pname = "frame-fns"; version = "20170222.1759"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/frame-fns.el"; + url = "https://www.emacswiki.org/emacs/download/frame-fns.el?revision=31"; sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n"; + name = "frame-fns.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns"; @@ -25368,6 +26297,27 @@ license = lib.licenses.free; }; }) {}; + frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "frame-mode"; + version = "20170419.1427"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "frame-mode"; + rev = "fcdbafbda45758cd60ab3acb492fbbd692987a58"; + sha256 = "1sdxbjxx1lk2j220794af2qz9z068bmx55drm8h0b8kih0037ydn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode"; + sha256 = "0ch58x07fnsx3v3r9cvcmqrqws121m8achjilhqk988hkg7y47c8"; + name = "frame-mode"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/frame-mode"; + license = lib.licenses.free; + }; + }) {}; frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-tag"; @@ -25393,8 +26343,9 @@ pname = "framemove"; version = "20130328.433"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/framemove.el"; + url = "https://www.emacswiki.org/emacs/download/framemove.el?revision=4"; sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7"; + name = "framemove.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f075338369dbf0694205c1b2c35dc16821f6dc92/recipes/framemove"; @@ -25502,8 +26453,8 @@ sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/22a334294660e8625cfeeeb7108517e163d8e443/recipes/fringe-helper"; - sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper"; + sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m"; name = "fringe-helper"; }; packageRequires = []; @@ -25536,12 +26487,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20161130.653"; + version = "20170617.1330"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "22cf1815574c2d463c6a790afc7378db9d701fc2"; - sha256 = "1jqh518kn5c7gk8dqbx28inq71a1i95qafixa5kbh8my6kka7yr1"; + rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; + sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -25562,22 +26513,30 @@ license = lib.licenses.free; }; }) {}; - fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170224.912"; + version = "20170531.1958"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "f7b982007e26e34e43debd8759346874966e6924"; - sha256 = "1mh1qv8vxipxyi060xzniq3y8h7b0as9j5si4ql6hs742fhpd2zk"; + rev = "c9a9d722848dfc3f37ac9e0e91603340e5f5df1e"; + sha256 = "0faf8796vvfi2g4kmh7xsnc08m3iyldgcivslq0xy86ndh682f06"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; - sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; + sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s"; name = "fstar-mode"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ + company + company-quickhelp + dash + emacs + flycheck + quick-peek + yasnippet + ]; meta = { homepage = "https://melpa.org/#/fstar-mode"; license = lib.licenses.free; @@ -25586,11 +26545,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170107.626"; + version = "20170709.139"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "d60970c0a5de8cb16eba55fe71441e9de35d6299"; - sha256 = "0bhw69yh1jxlyny5w5dxpvd3r6s0rnp54il2q32dark22s75w72x"; + rev = "9adddfc5e5666febc2f98b230e4a7d2b4c02ce0b"; + sha256 = "1ya7ghnclgcwha2cgi37z627q257xxd8c3igfl12k22ix4l5wr37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25711,12 +26670,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170216.138"; + version = "20170714.1430"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "430317e5b2ea5005851ce7f03564aa8f8dba61c6"; - sha256 = "0zsg5q1370fqswq5cysfc4lg74hyjxn5yjpqzyl9mwlips90y42l"; + rev = "dbc4ae1b8c977435d5369b18e1b624a62f8e8b13"; + sha256 = "0h7244567anfrfm2wpkvy0g6bnczisv03rz2ipr35pqm3gf7hyh8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -25754,8 +26713,9 @@ pname = "fuzzy-format"; version = "20130824.500"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el"; + url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el?revision=6"; sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7"; + name = "fuzzy-format.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/154cb0a10c81ce4907029f0eddc51108961c65ae/recipes/fuzzy-format"; @@ -25772,12 +26732,13 @@ pname = "fuzzy-match"; version = "20170222.1800"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el"; + url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el?revision=23"; sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94"; + name = "fuzzy-match.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e00737be152e9082d0f0c9076cac7fcd08bd4e7b/recipes/fuzzy-match"; - sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fuzzy-match"; + sha256 = "0c1f4q985ag5qhv15iw2jhmpsyy09fbj87srp4k58lspjf40acdj"; name = "fuzzy-match"; }; packageRequires = []; @@ -25873,12 +26834,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20161226.936"; + version = "20170527.2120"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "779254fe1ec7a0c9110af36fd039cece3040a312"; - sha256 = "1p0k71vz9v8vx5h85ph1krb9v0jyhmq73h91ws9zcxpf1bdgy050"; + rev = "8d75f98cf904c3ab62e8cc54f2b8701c215620d7"; + sha256 = "1rr0d937j078xyhlx5i305l5wavd3fcmvfqmdnbfwah8mfnp4kip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -25894,12 +26855,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20170121.203"; + version = "20170309.2204"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "e8100f9694c1b85c12ed57d89f7efe408b9f933f"; - sha256 = "14d6iiy2dk93ani1d3vm57nsd3pn170fk8brs5v7jpf1sqszjihw"; + rev = "ce51aa1afec78bf96aedb4badf33463383b7593e"; + sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -25976,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"; @@ -26001,8 +26962,8 @@ src = fetchFromGitHub { owner = "ahungry"; repo = "geben-helm-projectile"; - rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d"; - sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l"; + rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b"; + sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile"; @@ -26026,8 +26987,8 @@ sha256 = "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/65c120f52e900b393b5ceefeca21b0670ca4a4cc/recipes/geeknote"; - sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/geeknote"; + sha256 = "03q0ca8m110qw8wczyyx94gwqymwnmamahw30j7fqkq6ry19yqsm"; name = "geeknote"; }; packageRequires = [ emacs ]; @@ -26039,12 +27000,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170201.1455"; + version = "20170704.1044"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "166593c68b66276e36c7d91a9653bb1c44650afc"; - sha256 = "0r7m1blswgkm8zkb703ksa74jy296i1vj4rfq5lw2f4ixdvkyq2h"; + rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd"; + sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26060,12 +27021,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20170202.1509"; + version = "20170708.104"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "b626fae4f0fbf2ec2bf7df850dd1c8ad15e70b65"; - sha256 = "1p9kwh9yadai0ijn98rag0sln18fj9ciy51p88967bgvbx1rx8x3"; + rev = "00efad765a3ace42a2833c65a169d96c7925623b"; + sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -26165,12 +27126,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20161022.251"; + version = "20170711.1806"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "2149f3a4a855ccebbe0c8832079a9f5d5d50909a"; - sha256 = "1nggwr28wbiz0ch7c5w9rs909gm5qxdqhfnv7d4zikfh568dv8y5"; + rev = "8579025b9b89c53221c6c608b92a85734ffb0116"; + sha256 = "1fr12adssldynjayylqck85nnlcjx6pf15vp0hhvdnl689imbg3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -26186,12 +27147,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20161119.2004"; + version = "20170512.2049"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "6a76836a2ed1ebc3380dcfbe2b46786abf905fab"; - sha256 = "0anlavmfhm0ax6566sl9ih0j4v80s313n32d4yfp9lh4f1drp62k"; + rev = "76255942ccc84d5cf918a2b6411a8ac98a7c8585"; + sha256 = "09b09zqawll6lbrhl352x7g62s4spq97rd8x32shn9m01w6paz9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -26228,12 +27189,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "20160808.813"; + version = "20170613.1212"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "fdd8ffb39098e38c0179dd647f05b846012f10a2"; - sha256 = "1niq9vwdgyw0bwwcfbmkzs9z59adx0ly1ana8rjb7r39ii1am6ah"; + rev = "d867cd0fee3fdb4e93440d96506c522de743aec6"; + sha256 = "0k615c7fvabs2y28kf0w3j8y3chqsbcdizv5z9jyf3519svb5sxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -26257,8 +27218,8 @@ sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cfbd335054aff49d4a46f73bee881b7a00714d3c/recipes/ghc-imported-from"; - sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from"; + sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc"; name = "ghc-imported-from"; }; packageRequires = [ emacs ]; @@ -26320,8 +27281,8 @@ sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9b589edfacb807fb17936e139499bdd9673dad94/recipes/ghost-blog"; - sha256 = "1wqi7r5jr3n0mgax7lddq5h3jfkcq69vvj02a6078vzd2bfxg9ia"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghost-blog"; + sha256 = "0289hgvrx96bfpvpbidwi2761kmscg5nzny7g5gxmy3xzzm9bqkj"; name = "ghost-blog"; }; packageRequires = [ markdown-mode ]; @@ -26354,12 +27315,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20160808.538"; + version = "20170702.512"; src = fetchFromGitHub { owner = "tarsius"; repo = "ghub"; - rev = "f9535e53fe6c5ffb18986ebf51e8529b9ec0da63"; - sha256 = "17cn3xl40kp2mx3w89w0cds47jrvx76ms2js3a9nr4bb0cgyw1yv"; + rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011"; + sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; @@ -26372,6 +27333,48 @@ license = lib.licenses.free; }; }) {}; + ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: + melpaBuild { + pname = "ghub-plus"; + version = "20170517.1445"; + src = fetchFromGitHub { + owner = "vermiculus"; + repo = "ghub-plus"; + rev = "07bd117a77d2f2de88facfa18b839c5c8bd5a423"; + sha256 = "04k3xvs33vv3g01ah16bc4l6f3ym4w16i9bk5q2s4f1xh4lad3jn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; + sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n"; + name = "ghub-plus"; + }; + packageRequires = [ apiwrap emacs ghub ]; + meta = { + homepage = "https://melpa.org/#/ghub+"; + license = lib.licenses.free; + }; + }) {}; + gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gift-mode"; + version = "20170603.906"; + src = fetchFromGitHub { + owner = "csrhodes"; + repo = "gift-mode"; + rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d"; + sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; + sha256 = "0sybrjmcg90cjaax7lzzqvacirn5l23hqy9d843c660fsv98scg1"; + name = "gift-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gift-mode"; + license = lib.licenses.free; + }; + }) {}; gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: melpaBuild { pname = "gildas-mode"; @@ -26396,12 +27399,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "20161127.855"; + version = "20170604.1834"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "62888de7f776c867a51cee4d5d55edc561e519cc"; - sha256 = "0xvmrpx3gbdancxhggw7k7r2bzlwmni9vynsjf5ddpv5alw2bscx"; + rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2"; + sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -26438,12 +27441,12 @@ git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-annex"; - version = "20170120.931"; + version = "20170417.1653"; src = fetchFromGitHub { owner = "jwiegley"; repo = "git-annex-el"; - rev = "d574b9d9e264167245e49bb96b000988a83af259"; - sha256 = "0c1hqff1g1ahaqalfdp09g7qk852bj83dcwd94q3wwmnsy1mf493"; + rev = "22b7161adcd144f88681b9b904972cea42b27fca"; + sha256 = "038h1dnvncdjy7q1ix3xrx4yqfqfp4ll69ksipj5kawsrch75nh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex"; @@ -26522,12 +27525,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170214.347"; + version = "20170609.2310"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f565039fd318ad5a90cd3c779785f25f540c652"; - sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr"; + rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5"; + sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26540,22 +27543,22 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: + git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; - version = "20170109.734"; + version = "20170502.1027"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; - rev = "7b8cf1f5ce9b2c19e9b7efe1ef03f3e37098eea7"; - sha256 = "13vd83k6sc3wy4552gvx7zmnmjpa7zs9nk1dlp5v8fc8p3j7afgb"; + rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; + sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue"; - sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; + sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax"; name = "git-commit-insert-issue"; }; - packageRequires = [ github-issues gitlab helm projectile s ]; + packageRequires = [ bitbucket github-issues gitlab helm projectile s ]; meta = { homepage = "https://melpa.org/#/git-commit-insert-issue"; license = lib.licenses.free; @@ -26669,12 +27672,12 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "20160203.2237"; + version = "20170517.144"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933"; - sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc"; + rev = "91bf19d6dd7368de5cad373a8155c48c4e254723"; + sha256 = "1gszcsji3n42xpshz1pzyvlrd0hxjh14fr4n0ixqv2igk3fywxr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -26690,12 +27693,12 @@ git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20170301.1618"; + version = "20170603.1026"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "8d43732a753bcea8a7777b03755c17a0f45094d2"; - sha256 = "1p439cwrxkcf36qfv93j8h2xyynynysr9ch9w662mhm7k7fgwc65"; + rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf"; + sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -26753,12 +27756,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20170226.24"; + version = "20170325.220"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "efa6752397101739c6abb53a0ca7a904d1c7898d"; - sha256 = "1v85cci8rm82wgss53ia1dqvq2q17hf2vayx6pi34h0hvj7ihzlx"; + rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743"; + sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -26799,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"; @@ -26824,8 +27827,8 @@ sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/318989b10a5bf5b961b3c607730377923c8fb05b/recipes/gitconfig"; - sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig"; + sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf"; name = "gitconfig"; }; packageRequires = []; @@ -26837,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"; @@ -26939,15 +27942,36 @@ 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"; - version = "20161102.755"; + version = "20170604.2119"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-notifier.el"; - rev = "12621caa8d78bf2b559d2113ef476a8f2c2a4e0e"; - sha256 = "1cwabnm6nirmrwdq14l3pqdjh40h49icbfjx3z86rppp7cj3dmlm"; + rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987"; + sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; @@ -26971,8 +27995,8 @@ sha256 = "1yr7v2wdrvwb1slks83bbh857qq1n207rdk48y8qwlcxbk4ygdr6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3dca88ef598d676661abea79cdbc41bad6dd28be/recipes/github-pullrequest"; - sha256 = "1icyxvkqy2vyx4b6f7ln0h3hfg0a4lkyajd596fch81irl8cjl34"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/github-pullrequest"; + sha256 = "1p5mwpl59iwd1aqczf1b5shcpzhlqwrcy2vp46c276mhqx15r8fr"; name = "github-pullrequest"; }; packageRequires = [ dash emacs magit request ]; @@ -27005,12 +28029,12 @@ github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; - version = "20170221.804"; + version = "20170630.1501"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-github-theme"; - rev = "a7bce12f914c09c6c58db2d33390e890cb685537"; - sha256 = "1isskh364klkvx7krxngx9fapf0qr41mzfl581admcl64b70x315"; + rev = "29f00a51d949a248a5f6355a97131e216747c797"; + sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; @@ -27030,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"; @@ -27047,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 = "9b14a972093b12e3a5d210370592e71df7f0d1e1"; - sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; @@ -27076,8 +28100,8 @@ sha256 = "11i9hxj76869w1z9xn7wq370v56hx5hm4d7msn4zgp64glpa66j9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/888b0cc58375c3eefac94a34e67130ff95822aad/recipes/gitolite-clone"; - sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitolite-clone"; + sha256 = "0mv2bdfqqq47wgikkm5kwpr8gajylf1yzk2j6cxljz09amgq6c8q"; name = "gitolite-clone"; }; packageRequires = [ dash emacs pcache s ]; @@ -27107,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"; @@ -27173,12 +28218,12 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "20161104.2041"; + version = "20170423.444"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; - rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; - sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; + rev = "a84fa385cfaec7fc5f1518c368e52722da139f99"; + sha256 = "1qbf3r8a66xlrbni3hv5q5b5v3izis5aid06228rfpc2hwa97hr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; @@ -27198,8 +28243,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "gmpl-mode"; - rev = "c4cf8896aef89b4c08c0c8764c9f2330fc987f9e"; - sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4"; + rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6"; + sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode"; @@ -27278,12 +28323,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20170123.248"; + version = "20170406.732"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "ffa5fec15971ccec0b19f759c9191cac9ee851eb"; - sha256 = "0hlzdvm7d0r9jh4cv9ff1wdjyfffr2417kkq0mlbv0bvqczwdd8b"; + rev = "72f6a7fc9153d141494b19ca7ff2c0d1e35c2a16"; + sha256 = "12w5hnp5nnsy532kfwsp43n633k1n03hs1az6pd9sczjzhhz9ihb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -27384,8 +28429,9 @@ pname = "gnus-spotlight"; version = "20130901.735"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el"; + url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el?revision=2"; sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4"; + name = "gnus-spotlight.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/004d48a59063163bfe5fbc5311330893d1b3b41c/recipes/gnus-spotlight"; @@ -27485,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 = "d09cef6327ed848a446636a857cd851dc7e63d19"; - sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -27556,8 +28602,8 @@ sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/34756daa47548da1aaf58b324014829d041cddf6/recipes/go-dlv"; - sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv"; + sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8"; name = "go-dlv"; }; packageRequires = [ go-mode ]; @@ -27632,12 +28678,12 @@ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; - version = "20161117.331"; + version = "20170501.1058"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; - sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; + rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21"; + sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -27674,12 +28720,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20170228.916"; + version = "20170308.1512"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; - sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; + rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21"; + sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -27762,8 +28808,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; - sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; + rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21"; + sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -27972,8 +29018,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "cb00e5669539f047b2f4c53a421a01b0c8e172c6"; - sha256 = "1wav8y5yps407znh0wspvcripbp2xjigqhzhgbv0adqsm9nyn70p"; + rev = "c5fb716d6688a859aae56d26d3e6070808df29f7"; + sha256 = "0bp9aarkinjr6m358qw9x4qxi3v9h06jvipyx1pg3pwsqh61vb12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -28035,8 +29081,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "15f2836d9fea3835d541d4d327ccf053d4052822"; - sha256 = "1yrd7v75pcpb658m53ysgai3ak5nvrm7bf7hzhga3rgm20hhsc16"; + rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a"; + sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -28098,8 +29144,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "emacs-google-this"; - rev = "6af9dcee88b9637b3bdd1900a907f7ac83113988"; - sha256 = "1l3aklpzzn407ww2k4ncjin3n869hg4lyf050p00nig3qfgvjnbz"; + rev = "4713c93d4c45458a7320b5e2af9b1edd43fd5e0b"; + sha256 = "0q8d10ihvqvnbp7gn19ixgi37cvpgyc5a8ls9nkr6w7valc4c0rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this"; @@ -28115,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"; @@ -28133,6 +29179,27 @@ license = lib.licenses.free; }; }) {}; + goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "goose-theme"; + version = "20160828.545"; + src = fetchFromGitHub { + owner = "tokenrove"; + repo = "goose-theme"; + rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c"; + sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e23a52e068ec0e6d457402254727673ea02bd407/recipes/goose-theme"; + sha256 = "1nw948js678xc5vgrpdkykpcbn1b1id4k1clf87vfv7y5zssvd0x"; + name = "goose-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/goose-theme"; + license = lib.licenses.free; + }; + }) {}; gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "gore-mode"; @@ -28165,8 +29232,8 @@ sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2ccb56a2aaabb1169cafc530c63e33d301e04c7a/recipes/gorepl-mode"; - sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode"; + sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq"; name = "gorepl-mode"; }; packageRequires = [ emacs ]; @@ -28178,12 +29245,12 @@ gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "gotest"; - version = "20170303.13"; + version = "20170522.53"; src = fetchFromGitHub { owner = "nlamirault"; repo = "gotest.el"; - rev = "a057deb08b41e37d767805ffeb024eee30f9faca"; - sha256 = "07s75y01mrs7m2xmvg764yhivczycynaa31paz8h2pz65sb0qdhd"; + rev = "c15bdcb78a46167e7a3fbaf5f71cbeddf2f13b78"; + sha256 = "0pzzcjc41k3by534ii11jxfind4fq1cv3pqa3scisv4pvyj6lha6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest"; @@ -28199,12 +29266,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20170305.942"; + version = "20170521.417"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "aca1bdd18997759bd4d3618c9591cc38774ac16a"; - sha256 = "1g59mwb1l8bvc66gsq8lprbrfbs238lp280k3xqda6z7dbrh9vq9"; + rev = "df428b477eb84f2ccd791c4310587cfd72644692"; + sha256 = "0ph5h08cx61nh70hafmnqzdcxb799fss0pl2d36hhimkf866zvln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -28221,8 +29288,9 @@ pname = "goto-chg"; version = "20131228.659"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/goto-chg.el"; + url = "https://www.emacswiki.org/emacs/download/goto-chg.el?revision=9"; sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"; + name = "goto-chg.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/529897b0c076d9031e7ecd13c945d2104ce8c735/recipes/goto-chg"; @@ -28280,12 +29348,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170302.1450"; + version = "20170629.1129"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16"; - sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj"; + rev = "0b533caa1ca0c4412748bde65753fa8c55ba4511"; + sha256 = "14lkhny4s6kmybx7w9hi11bnyvg7imyxnirdk28rb19krj2n7b36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28410,8 +29478,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "48f64589005d79f64beef367fc9a83afb6e26b1e"; - sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8"; + rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c"; + sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -28448,12 +29516,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20170118.2148"; + version = "20170507.104"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "c0884bfe0b2df8d6279cabd5ef6c521aaf7c0897"; - sha256 = "1cn3i4kp5pjiaq96svam3xn1s33lpysnzk77vq25wp65vz9jpbcg"; + rev = "2f7e607cde9dd38ad4a95f3f3ad6cd85eba09f7b"; + sha256 = "0mc29g3hz7fb2a91rr24z2fnlqdwnq1q3lh14qyd7i9zpy5965dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -28473,8 +29541,8 @@ src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; - rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed"; - sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl"; + rev = "bf77248e49b116a241bd5856df918ed63f89e195"; + sha256 = "1rn498l25vjy1wg45iskry8hh2afvd09cmg8dxppphjislw9pwch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene"; @@ -28523,12 +29591,12 @@ graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphql-mode"; - version = "20161016.635"; + version = "20170625.652"; src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "6e1f5335fa0b252b2bc422a837b82fdc82492eac"; - sha256 = "1x47abqqsry5f0ww01hp3470rqdzzr3yia8ljqq3ixpbnspp5q83"; + rev = "3c25bf5cbd5ba4c60dca9c96286412eb765de7c9"; + sha256 = "09y7w6nipg1f59xrdpzmjiynyvjzkyhkmrpc5mbvz1lavkplh6rd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; @@ -28548,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"; @@ -28586,11 +29654,11 @@ grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grass-mode"; - version = "20170303.854"; + version = "20170503.800"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "5383fff2996b"; - sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz"; + rev = "1ae8eae88117"; + sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -28645,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"; @@ -28677,8 +29724,8 @@ sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/655332f33f308e4da09dfd27625cb30af29b95a7/recipes/grep-a-lot"; - sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grep-a-lot"; + sha256 = "1cbl4gl91dx73q3i2glsivfxd8jkanrcrzy35zf6rb7raj7rc1bw"; name = "grep-a-lot"; }; packageRequires = []; @@ -28693,6 +29740,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/grep+.el"; sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr"; + name = "grep+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+"; @@ -28735,8 +29783,8 @@ sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grin"; - sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin"; + sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378"; name = "grin"; }; packageRequires = []; @@ -28787,22 +29835,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170305.813"; + version = "20170712.224"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "48f64589005d79f64beef367fc9a83afb6e26b1e"; - sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8"; + rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c"; + sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = []; + packageRequires = [ s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -28811,12 +29859,12 @@ gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruber-darker-theme"; - version = "20161017.1108"; + version = "20170716.647"; src = fetchFromGitHub { owner = "rexim"; repo = "gruber-darker-theme"; - rev = "ac87018437667c84fb5bb7e7b17e5ab2c8347272"; - sha256 = "0gw06d9h0fn9jds8vk8dkz8ghf62jrjmxj8q0qlaisdipmdqk87n"; + rev = "3e5d5d67f8b004db288d6c2e1a0b02c3844ab5c5"; + sha256 = "1az7fndm19wy8s3p6wxa0ps55amwmmpbschayzy3g3g26a4swcxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme"; @@ -28853,12 +29901,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20161229.1817"; + version = "20170712.1607"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "9a9f384a19742eb07b03b1975478c2e71a09b2e3"; - sha256 = "1pbb8ihvldpbcvr4bwqjmlyc6wv51h49fn522vxzl9kjmhs9fqi1"; + rev = "a3aafd33d9b027e6c0d5ef81ebb04a2bb8545cf2"; + sha256 = "1d9330yd2lch7yqlfvpv7gxyy00p4w9h6f0imn7bgj3y7wab20dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -28895,12 +29943,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "20161006.1944"; + version = "20170713.1934"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "734696423b8f807e6c1f0e871a8577a5f3a731f3"; - sha256 = "1vva58pcrh1rbvl1yyiy0fw2vmnfzlkpinjkr9yv19zmh0jphjzd"; + rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; + sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -28913,15 +29961,36 @@ license = lib.licenses.free; }; }) {}; + gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gtk-pomodoro-indicator"; + version = "20170517.900"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "gtk-pomodoro-indicator"; + rev = "0fa0e682b3bd1595f230275d73ca231e93c6d28a"; + sha256 = "1jm7kcray6qd867hacyhs5c7hhdm0fyfa1jx35sh09g5c9xa4x2f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator"; + sha256 = "0fg227yhj85xy0s32xzwg2ka9kc9ygl0wd33wypp6jban13ldasr"; + name = "gtk-pomodoro-indicator"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gtk-pomodoro-indicator"; + license = lib.licenses.free; + }; + }) {}; guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guess-language"; - version = "20170216.909"; + version = "20170620.308"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "guess-language.el"; - rev = "52e7623953dc1a76a24d1b8d261a7a1143fca903"; - sha256 = "00bkpxfn60sq0vz3xh60fylhvx4ijj9l34qmy55z024f1plzmvwp"; + rev = "1f1602f74d7159e7fb8c90f92ec5a3d1df5429da"; + sha256 = "1764v96sdn3zvpd35ppn31ib4p8cvdrj0bfmbplxg2xhp7xkgmca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; @@ -28979,12 +30048,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170227.656"; + version = "20170702.724"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "c11094293d250bd6299c4eeb4dc64af223124aa9"; - sha256 = "0ya4zacfrv3hl317l78jrj491hag36i4ishh0gcrz602qqdgw531"; + rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f"; + sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -29063,12 +30132,12 @@ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gxref"; - version = "20161215.2352"; + version = "20170411.1053"; src = fetchFromGitHub { owner = "dedi"; repo = "gxref"; - rev = "ffb2139cb9a8299ce965c28cb5d3a617405fb1b4"; - sha256 = "052j24k1svdnryss983dxjpnz4d51wx1vzqqpgckc86bkc4vfjzf"; + rev = "380b02c3c3c2586c828456716eef6a6392bb043b"; + sha256 = "1c5j28rwqx53qdsqglif8yblhm2bwm4qzpl2dg0l0g3pr8pk8zjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; @@ -29088,8 +30157,8 @@ src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "9b42651888c4b75e1d6f9df41d138ce6e77acbcc"; - sha256 = "1jrvjk8ccf47945liwz24xqvdaqm6zch1kb4cahgm4pp8m9hdcgn"; + rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce"; + sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -29102,6 +30171,27 @@ license = lib.licenses.free; }; }) {}; + hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hack-time-mode"; + version = "20170527.910"; + src = fetchFromGitLab { + owner = "marcowahl"; + repo = "hack-time-mode"; + rev = "73d6fcf8b39283526e5d4e3919193611e25a0898"; + sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode"; + sha256 = "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5"; + name = "hack-time-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hack-time-mode"; + license = lib.licenses.free; + }; + }) {}; hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hacker-typer"; @@ -29130,8 +30220,8 @@ src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "d6857acce7032035ffb4ee23358712127b8dd5a5"; - sha256 = "1xgx66dlhz4my1blnkddcwk6aan532fnvgli2dbbiy5ixn8aw1kc"; + rev = "629fe18abbef6674821876ed089c4fa83b709d1b"; + sha256 = "1s3ybiifbszp7v3gznh9f78dzwb1smdq3hb8np9swjr2fzcshwl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -29228,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; @@ -29260,8 +30350,8 @@ sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/40ad05c824c7f2ef8d8a6f5dfad6e7685dc70803/recipes/hamlet-mode"; - sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hamlet-mode"; + sha256 = "16cyfzv2yrf249jklxdahfmsy8rg6hargjpafy4fz4a532fcbw81"; name = "hamlet-mode"; }; packageRequires = [ cl-lib dash s ]; @@ -29281,8 +30371,8 @@ sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7c4f1e610cce403e86346b12b03892560dee3ccb/recipes/handlebars-mode"; - sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/handlebars-mode"; + sha256 = "0wizasjihnabnqzn1226vh4gb571rs7s86bffhvkfvbk95zkiafq"; name = "handlebars-mode"; }; packageRequires = []; @@ -29462,12 +30552,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170228.730"; + version = "20170704.1445"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "74351e8a14e6e8e1cdb77a4b677065ab81d98d8b"; - sha256 = "0h6xrng4qmfkafd77pg1svzcsz5law6rcif95050c03w3fvy4syn"; + rev = "00ca4d935e80707e18c17e40630ea9e36b39592c"; + sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29504,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"; @@ -29524,12 +30614,12 @@ hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hasky-extensions"; - version = "20170110.631"; + version = "20170520.149"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "c94662f0efdc9f350d8554e62955f0a7405ab545"; - sha256 = "0hlwv3m0mmwwvqa0nla9b8n7mi43zxmpg6fmmqi311ii75sqb2pa"; + rev = "5a57a6401f6625640f46d8f8d540ecddf52bb12d"; + sha256 = "1262kddcn3jr758s6wv15q3bh8j160q4m8nz2pbv2prabg0csz5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -29553,8 +30643,8 @@ sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4d9aa97450fdbd138f8293cfb31212a7c7f9eee8/recipes/haste"; - sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haste"; + sha256 = "175kprxqbpmssjxavcm7lyzg1cwsxkrfg9pc72vgqyfmcmjyk34c"; name = "haste"; }; packageRequires = [ json ]; @@ -29566,12 +30656,12 @@ haxe-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "haxe-imports"; - version = "20160814.52"; + version = "20170330.1604"; src = fetchFromGitHub { owner = "accidentalrebel"; repo = "emacs-haxe-imports"; - rev = "0fbd5d26f976bcf70bf26e685b2c3c0dc465a058"; - sha256 = "0hkyhj29imn1hrjabqjwqlj47qdwigcyclic3k3bigk06pjwalmh"; + rev = "f104a641f3dfe698359d9aca1f28d9383cf43e04"; + sha256 = "09crkm4ibi4m23qw4saqm0nm2i4cv40md3p768j2vniamby2q78f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports"; @@ -29594,8 +30684,8 @@ sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/haxe-mode"; - sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxe-mode"; + sha256 = "07krrpi636dadgyxxhh5037kq527wpnszbl22lk6i5fcxqidcnw9"; name = "haxe-mode"; }; packageRequires = []; @@ -29615,8 +30705,8 @@ sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd0352cac399eb2072dfb788deea9cc22d902964/recipes/haxor-mode"; - sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode"; + sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s"; name = "haxor-mode"; }; packageRequires = [ emacs ]; @@ -29692,12 +30782,13 @@ pname = "header2"; version = "20170223.729"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/header2.el"; + url = "https://www.emacswiki.org/emacs/download/header2.el?revision=69"; sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k"; + name = "header2.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d16829cb4dea98908735be13aa632bc13d308acb/recipes/header2"; - sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/header2"; + sha256 = "1vvxb850njn921djvnf76q1p045sqr5hqk6v0p0amvjvih48v0zx"; name = "header2"; }; packageRequires = []; @@ -29730,12 +30821,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170304.206"; + version = "20170714.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5d4d74c9ad506c33263df8a561289b621eda1546"; - sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm"; + rev = "07f8f705f54506da537b1f615ee2e95e9033defb"; + sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29898,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 = "9f7075e81c4996c22bc9dd4fe48ad8e8acc55efb"; - sha256 = "1zmv80iw1y6pj2c78227pc1hi85a986pkglzvjz8cb3c4rvd81ck"; + rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; + sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -29919,12 +31010,12 @@ helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bbdb"; - version = "20161122.522"; + version = "20170505.2338"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-bbdb"; - rev = "20513422102fea4c08a0433d728a7783bb4968c8"; - sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80"; + rev = "c0e6b83911598fe334c51b12f51ff1a8252ed11d"; + sha256 = "084m23w4088njk2c8z6yxi2851dakdq71jhpazlzms85i2dlwg21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; @@ -29940,12 +31031,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170227.608"; + version = "20170321.1306"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "c4fd39864d0c9f770426a93319b492942c81b1e6"; - sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr"; + rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; + sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30021,6 +31112,27 @@ license = lib.licenses.free; }; }) {}; + helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-books"; + version = "20170324.2331"; + src = fetchFromGitHub { + owner = "grugrut"; + repo = "helm-books"; + rev = "625aadec1541a5ca36951e4ce1301f4b6fe2bf3f"; + sha256 = "1d3nps765gxmadhbd1yqn4qvs23bczglwhxkciprky7ixm5lx53k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books"; + sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx"; + name = "helm-books"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-books"; + license = lib.licenses.free; + }; + }) {}; helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bundle-show"; @@ -30084,6 +31196,27 @@ license = lib.licenses.free; }; }) {}; + helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-charinfo"; + version = "20170611.1746"; + src = fetchFromGitHub { + owner = "mandoku"; + repo = "helm-charinfo"; + rev = "a4902a90bd9f012468ad8186e2548c7814847613"; + sha256 = "024pqnw87whwa7zpld8bcz1izaymqk0vajhbf9m173hlfw6x7wmp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo"; + sha256 = "04k6crcwhv2k69f5w75g0dg0f5qsbhyxl93qzxxdb5bnr56ad7f6"; + name = "helm-charinfo"; + }; + packageRequires = [ cl-lib emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-charinfo"; + license = lib.licenses.free; + }; + }) {}; helm-chrome = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-chrome"; @@ -30126,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/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; - sha256 = "1fvpq1xi3xhd8w1yasac87incv1w4av5a8vn0birw8pc7a6bxv4w"; + 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; @@ -30179,8 +31312,8 @@ sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f98a21483682eee0950bdba3a93d178db2118e95/recipes/helm-circe"; - sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe"; + sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw"; name = "helm-circe"; }; packageRequires = [ circe cl-lib emacs helm ]; @@ -30276,16 +31409,16 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20161121.2111"; + version = "20170608.1029"; src = fetchFromGitHub { - owner = "manuel-uberti"; + owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "59e93396309fe3cb60913332d384d2f4706694c3"; - sha256 = "0slp08dy9s40mqj6f64d8yw9si1a76mlhbmm3a7khf076b8ky02s"; + rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; + sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company"; - sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; + sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34"; name = "helm-company"; }; packageRequires = [ company helm ]; @@ -30297,12 +31430,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170301.2122"; + version = "20170717.520"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5d4d74c9ad506c33263df8a561289b621eda1546"; - sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm"; + rev = "07f8f705f54506da537b1f615ee2e95e9033defb"; + sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30318,12 +31451,12 @@ helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }: melpaBuild { pname = "helm-cscope"; - version = "20150609.649"; + version = "20170326.22"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "helm-cscope.el"; - rev = "ddc3f750a92044d6712585e29d3dbaface2e34db"; - sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x"; + rev = "3cc7259ab4989f9f7ca039e703cdac14b907530a"; + sha256 = "0gh4csq6v6lqqpi966iwl2238wgkmr3vxb4kxffajpk8r0cq1c9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope"; @@ -30381,16 +31514,16 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20170221.638"; + version = "20170531.135"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "f07a77bd6ae6d8c933753f25526cbf3b71903e77"; - sha256 = "0az1j68g0svynvag7p3x7l1rv4n6y1knkmfcjhcli4jwrkn720xr"; + rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe"; + sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; - sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; + sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb"; name = "helm-dash"; }; packageRequires = [ cl-lib helm ]; @@ -30462,19 +31595,40 @@ 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"; - version = "20161023.806"; + version = "20170524.346"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-dired-history"; - rev = "8149f5cbb1b2915afcdcfa3cb44e2c5663b872e6"; - sha256 = "1h7700lf5bmbwaryf0jswd9q8hgfkpazak5ypidwvqwacd1wvx15"; + rev = "281523f9fc46cf00fafd670ba5cd16552a607212"; + sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; - sha256 = "1k0021wn6x7in4wi9lri2c9wl06pvprv950hgdwgra8m155qjfp1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history"; + sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8"; name = "helm-dired-history"; }; packageRequires = [ cl-lib helm ]; @@ -30515,8 +31669,8 @@ sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/527a46536f7cdc235c779d2a69cea4a5d5e06ce9/recipes/helm-dirset"; - sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dirset"; + sha256 = "1bwgv1pm047xafidq23mdqj3sdc5bvqlw74s80dj88ybp3vrpvlk"; name = "helm-dirset"; }; packageRequires = [ cl-lib f helm s ]; @@ -30525,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"; @@ -30549,12 +31724,12 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20151001.1328"; + version = "20170517.1010"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "ed3da37e86ea5dabc15da708335b1e439ae0777d"; - sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl"; + rev = "b1c7d03e80c3012e327f0d518258508acf980c1c"; + sha256 = "18fpsr6kaw2m1bvj05i5qayq6d01v54jw98489bgwshp9wmhsy9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -30591,12 +31766,12 @@ helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ext"; - version = "20170304.910"; + version = "20170411.1049"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "helm-ext"; - rev = "1546dbbfaac7729435226b4a7426c9e67032482a"; - sha256 = "1a7kjibc2r26wxc2c12bymjxdx965blm39qfgcvmqy6if0bp6w7h"; + rev = "fe50af14eebc9be72b026e823facfd0a80593248"; + sha256 = "1pz7i1byscfq2j73cfgcjqdx8s14h9qxnfmvs5g00m0y3g25hhc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; @@ -30654,12 +31829,12 @@ helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flx"; - version = "20170110.957"; + version = "20170404.1230"; src = fetchFromGitHub { owner = "PythonNut"; repo = "helm-flx"; - rev = "4ba59e1db2d3c33c8ebd40207456f31ab05c5d75"; - sha256 = "1bh0nbw2ylgfba0k2bvhasxr6nlcvs5g62ls0xy8207dayjrbjxk"; + rev = "c8650d9b34afbc236c28aee12cbee998fda8d810"; + sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx"; @@ -30735,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"; @@ -30788,8 +31984,8 @@ sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/299ebd9b72b5db061d31d7ae4f00b1ce6bb9db34/recipes/helm-ghc"; - sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc"; + sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d"; name = "helm-ghc"; }; packageRequires = [ cl-lib emacs ghc helm ]; @@ -30819,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"; @@ -30864,12 +32081,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20161111.2337"; + version = "20170614.711"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "5ef4b5ff81707214c0c141d8bf219b1645fefe17"; - sha256 = "1a0cs7yf6yb4pkgknb1515a24649d3v5i7jjcfvw831jwc51gnca"; + rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3"; + sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -30931,8 +32148,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1"; - sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; @@ -30969,12 +32186,12 @@ helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20160620.1149"; + version = "20170509.244"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "c83f395e0876b4355bd7d0cd346b506cc53deb8f"; - sha256 = "1k8fl81jiaanyqyz8icl2wprlrv5i68kwjgvw5hgfk75cjbhj2lv"; + rev = "b24de3240b2a46fdf6124e91aa4f684b2370454b"; + sha256 = "1w48ag2pd462hf238hkdl0i6csvchcsdf3021lnkdy41vwxj1rdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -31082,8 +32299,8 @@ sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1e1f2efa82d5097c1f5e85fba3f67b38a5b37c2/recipes/helm-hayoo"; - sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo"; + sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb"; name = "helm-hayoo"; }; packageRequires = [ haskell-mode helm json ]; @@ -31137,12 +32354,12 @@ helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hunks"; - version = "20170225.602"; + version = "20170625.1523"; src = fetchFromGitHub { owner = "torgeir"; repo = "helm-hunks.el"; - rev = "1ea40753244ec843f38481b0889bb7d0e8db6619"; - sha256 = "0lhzzm5z50zfhfvg7chrflgnjnmpr9k9w40s6yczpsfanqm96qp3"; + rev = "56731db3968a57fbb2473529227c2998b7f404b0"; + sha256 = "1kszp6jy4r39r71jjrr8p3nfpylbqyphrsfb4dghh6kl0zxic38j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; @@ -31166,8 +32383,8 @@ sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/95f1c437d5312e1c8ead63d6f834de86f38d6f58/recipes/helm-idris"; - sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-idris"; + sha256 = "04f1963ksbjdza1syajb5vkwwsc9gzk0az6c1m1zgvsianrq4rd9"; name = "helm-idris"; }; packageRequires = [ helm idris-mode ]; @@ -31302,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"; @@ -31326,12 +32564,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170214.525"; + version = "20170716.109"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "7b7b6dc2554603ad98412927f84a803625069ab3"; - sha256 = "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi"; + rev = "47981a8d80e1d464a7cddde5a391b35626929f00"; + sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -31388,12 +32626,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20170206.1323"; + version = "20170430.1053"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "ed406557c814bb2521cf826370e57ffe9d40d33e"; - sha256 = "02dfrr474yza18xvshjx41h1fsk81g950k6p3h4j1hpdqgjkv96k"; + rev = "8bb531fa77fe1259cccdc2fa7629d65989684f16"; + sha256 = "1vvdk2f41aqhcb8hawk0x17ix1fyanvx3m2zd398lhv3r6mll0r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -31438,8 +32676,8 @@ sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/903a2b64d9a704105100d61f28cdfa8f497abd7d/recipes/helm-mode-manager"; - sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager"; + sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl"; name = "helm-mode-manager"; }; packageRequires = [ helm ]; @@ -31490,6 +32728,27 @@ license = lib.licenses.free; }; }) {}; + helm-navi = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, navi-mode, s }: + melpaBuild { + pname = "helm-navi"; + version = "20170402.752"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-navi"; + rev = "2256591174ff79f889450fdc10822316819d6476"; + sha256 = "0bbb52v1c81a6ap10qi7mqigi237vwrlmf8mg3ckglm1i710636j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5ffbc25c0eb30b9c96594d50f47cd0383aa8ebc/recipes/helm-navi"; + sha256 = "0v3amm15pwja2y7zg92hsfhp3scmswwl0q0slg33g11rvj26iiks"; + name = "helm-navi"; + }; + packageRequires = [ emacs helm navi-mode s ]; + meta = { + homepage = "https://melpa.org/#/helm-navi"; + license = lib.licenses.free; + }; + }) {}; helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }: melpaBuild { pname = "helm-nixos-options"; @@ -31556,12 +32815,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20161112.1505"; + version = "20170518.312"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "4596ac225a90bc49d96a416d661f5da2a13b711d"; - sha256 = "0snynrrrkhm7c3g2iwr5m4lq49lxfrkf7il1rm2k56r5lbzw7mkm"; + rev = "61adb8ec3af0b7b87b2f9245510dc8b014d026ed"; + sha256 = "05zqp6yifc87i22q0p37jl90cfyh5v1bq9ifhpkdy1rs3sgcmnif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -31637,22 +32896,22 @@ license = lib.licenses.free; }; }) {}; - helm-pass = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: + helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20160825.1410"; + version = "20170627.1124"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "36025e7e435c4ee516bab554fa097d958b8b4ba6"; - sha256 = "0v99cz44bdwajvzf882qp76p85g9mbd1a24b8156wpbsys0dkbg0"; + rev = "bf5e1ea85ca531f07372eb8e7b9a8812ff3d3a5e"; + sha256 = "1l3dbgl65rcvw7cgqfxm3kvpfj65pj8jhkp9pg4yykli5y0wsbdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia"; name = "helm-pass"; }; - packageRequires = [ helm password-store ]; + packageRequires = [ auth-password-store helm password-store ]; meta = { homepage = "https://melpa.org/#/helm-pass"; license = lib.licenses.free; @@ -31732,8 +32991,8 @@ sha256 = "11xahzybwh02ds19y6h5hbpqdj278kcb4239vyykdl3wx8p048a7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc"; - sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc"; + sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz"; name = "helm-proc"; }; packageRequires = [ helm ]; @@ -31766,12 +33025,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170202.1000"; + version = "20170613.14"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "e16da3ec6d6c495ee8355e3c3729294bdee0a57b"; - sha256 = "0wmzkqy7pr2nflfpbzq7gljk3jxxq3pbq76di1zl2rlj67whs1xk"; + rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7"; + sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -31837,8 +33096,8 @@ sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose"; - sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose"; + sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79"; name = "helm-purpose"; }; packageRequires = [ emacs helm window-purpose ]; @@ -31892,12 +33151,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20161201.222"; + version = "20170422.510"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "d9a342e2bbdabe86d6c25bb1939c55e3a2a12381"; - sha256 = "05amzj09jwn0ypnk53i1m1pzxqxghxcfv6s9y0gxnxhr440rbjhb"; + rev = "3cae7f309b45cc6e40507be68c0cc2e5595c1392"; + sha256 = "0j8yvxvd78lcfpss327xc6rahkqva66rrqjjx5cmdl82xncb53vz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -32057,6 +33316,27 @@ license = lib.licenses.free; }; }) {}; + helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: + melpaBuild { + pname = "helm-rtags"; + version = "20170522.2154"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; + sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n"; + name = "helm-rtags"; + }; + packageRequires = [ helm rtags ]; + meta = { + homepage = "https://melpa.org/#/helm-rtags"; + license = lib.licenses.free; + }; + }) {}; helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rubygems-local"; @@ -32225,6 +33505,48 @@ license = lib.licenses.free; }; }) {}; + helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: + melpaBuild { + pname = "helm-spotify-plus"; + version = "20170320.609"; + src = fetchFromGitHub { + owner = "wandersoncferreira"; + repo = "helm-spotify-plus"; + rev = "847dfafbb5e5d65a44464b0ec8e2b7d88864a9aa"; + sha256 = "0i1vnaiqcs220nc1mjbx0959aa0nbjxhrqkvbrj3zy7ybsya22gq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus"; + sha256 = "1f39g2kgx4jr7ahhhswkrj0m5rbsykvkgh00d7jy8czpp8r4dl20"; + name = "helm-spotify-plus"; + }; + packageRequires = [ emacs helm multi ]; + meta = { + homepage = "https://melpa.org/#/helm-spotify-plus"; + license = lib.licenses.free; + }; + }) {}; + helm-sql-connect = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-sql-connect"; + version = "20170319.551"; + src = fetchFromGitHub { + owner = "eric-hansen"; + repo = "helm-sql-connect"; + rev = "5aead55b6f8636140945714d8c332b287ab9ef10"; + sha256 = "037gri2r9y135av8gbgi9d8k90qs8jlax0bimzcbwdkyhibhzrcp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58347c583dcf4a915c1af1262a5348755f28fe03/recipes/helm-sql-connect"; + sha256 = "1av42580c68iq694yr532hhcq0jn7m58x3cib4ix5c8b4ljvnnvd"; + name = "helm-sql-connect"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-sql-connect"; + license = lib.licenses.free; + }; + }) {}; helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; @@ -32236,8 +33558,8 @@ sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6fe2ffb46ea763bc6fb6fb6c899be6d3a67440/recipes/helm-swoop"; - sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; + sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx"; name = "helm-swoop"; }; packageRequires = [ emacs helm ]; @@ -32257,8 +33579,8 @@ sha256 = "1yqwq8a5pw3iaj69kqvlgn4hr18ssx39lnm4vycbmsg1bi2ygfzw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/047e5a8cacd8432adc86812e4c014808b99586bc/recipes/helm-systemd"; - sha256 = "1kcf9218l8aygrcj1h3czyklk1cxc5c73qmv4d3r3bzpxbxgf6ib"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd"; + sha256 = "0k2yqmvwswihcn75wzn5923z5y4njarmvdlx3j7w3hwsxh6k1mcw"; name = "helm-systemd"; }; packageRequires = [ emacs helm with-editor ]; @@ -32291,16 +33613,16 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20170208.546"; + version = "20170708.320"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "65e1f3ab12caa206402fad381cc75c7e844f9452"; - sha256 = "0j07hrdws0n9s51a5z7b0q1lzivvmrpn0crsg5rwnm9jwa1a6vws"; + rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; + sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; - sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; + sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517"; name = "helm-tramp"; }; packageRequires = [ emacs helm ]; @@ -32316,8 +33638,8 @@ src = fetchFromGitHub { owner = "bomgar"; repo = "helm-unicode"; - rev = "e331c38e651287981e5d34c27e5d7dc4ff24b0d4"; - sha256 = "05pvswisi44bl35anjbimd0q8i3c7kkjfksvaj69gcr788lhb8iv"; + rev = "1ad1fcca7a83c163ae74eb72a443cfc102128e33"; + sha256 = "16s0k6l2k32nxmgqc159kr5vzgn8gydj3bkrkvhhydm3lnh8ki0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode"; @@ -32354,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"; @@ -32435,6 +33757,27 @@ license = lib.licenses.free; }; }) {}; + helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-xref"; + version = "20170425.1440"; + src = fetchFromGitHub { + owner = "brotzeitmacher"; + repo = "helm-xref"; + rev = "cd458044be2cec95f31f0ac318b0f80f4b92785b"; + sha256 = "0lx2xrkwrbzkbs26gwksdqpywcsfsi3d4g2mw1h8aabd12hnr4my"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref"; + sha256 = "157h2h2yw8calysa7jnyz7iy8s3ppqa6m35pl7wbgnzqx425cbny"; + name = "helm-xref"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-xref"; + license = lib.licenses.free; + }; + }) {}; helm-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "helm-youtube"; @@ -32442,8 +33785,8 @@ src = fetchFromGitHub { owner = "maximus12793"; repo = "helm-youtube"; - rev = "7a944bc25f0f9e915011e9325caf46b46fcaa1b8"; - sha256 = "0948rq6i4ibwhmi6m2k23f83yvf56vwgri1sg2060d901zd86cxy"; + rev = "202c27fc3b54927611e9d9c764465e1b42ef7e41"; + sha256 = "1wqxcz03fq2z31a1n90dg9ap3451vx1376ijbpfy9sg66pgj8yxv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7537f732091b96b6c1b96c0174895278eba6776a/recipes/helm-youtube"; @@ -32483,6 +33826,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4"; + name = "help-fns+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+"; @@ -32501,6 +33845,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-mode+.el"; sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg"; + name = "help-mode+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+"; @@ -32519,6 +33864,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help+.el"; sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f"; + name = "help+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+"; @@ -32531,6 +33877,27 @@ license = lib.licenses.free; }; }) {}; + helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "helpful"; + version = "20170625.1441"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "helpful"; + rev = "da7d479c89090155996bf568bd89fa8a8859eac7"; + sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; + sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; + name = "helpful"; + }; + packageRequires = [ dash elisp-refs emacs s ]; + meta = { + homepage = "https://melpa.org/#/helpful"; + license = lib.licenses.free; + }; + }) {}; hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hemisu-theme"; @@ -32563,8 +33930,8 @@ sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/652b78013a7a6fa321490413fe98a7de5829b0dc/recipes/heroku"; - sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/heroku"; + sha256 = "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp"; name = "heroku"; }; packageRequires = []; @@ -32597,12 +33964,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170228.615"; + version = "20170702.1915"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "fcc713565189eae4dc9f39ffd1944f4c192b512a"; - sha256 = "0338j0wf5h3vxdrhsgdiqiczg97md3gapghabswpsk8r9k4nsjn1"; + rev = "201c795ded01d96690ceadc1dd068744aceaeda8"; + sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -32619,12 +33986,13 @@ pname = "hexrgb"; version = "20170304.1213"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hexrgb.el"; + url = "https://www.emacswiki.org/emacs/download/hexrgb.el?revision=75"; sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy"; + name = "hexrgb.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb"; - sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hexrgb"; + sha256 = "0b8lzmyv91f5bg7n2wj50p1pv6hpd2wygjcrffg4wwa52lp24dzk"; name = "hexrgb"; }; packageRequires = []; @@ -32721,12 +34089,13 @@ pname = "hide-comnt"; version = "20170223.739"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-comnt.el"; + url = "https://www.emacswiki.org/emacs/download/hide-comnt.el?revision=25"; sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m"; + name = "hide-comnt.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt"; - sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hide-comnt"; + sha256 = "0l3qvklyyc6hfinlzif7vfspl8b91ql0qdiwhixcilglyvad8r80"; name = "hide-comnt"; }; packageRequires = []; @@ -32735,16 +34104,19 @@ license = lib.licenses.free; }; }) {}; - hide-lines = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "hide-lines"; version = "20151127.1040"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-lines.el"; - sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "hide-lines"; + rev = "331122bf19361130351cfe55968c2a7820329eb3"; + sha256 = "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2a4e010b04a4c5dddc3f7259fad929e4cb66760d/recipes/hide-lines"; - sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines"; + sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d"; name = "hide-lines"; }; packageRequires = []; @@ -32757,8 +34129,9 @@ pname = "hide-region"; version = "20140201.314"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-region.el"; + url = "https://www.emacswiki.org/emacs/download/hide-region.el?revision=6"; sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval"; + name = "hide-region.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fc294a4d0cfa74530c98d81149fd0501ea7efe/recipes/hide-region"; @@ -32796,8 +34169,9 @@ pname = "hideshowvis"; version = "20170227.1250"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hideshowvis.el"; + url = "https://www.emacswiki.org/emacs/download/hideshowvis.el?revision=10"; sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12"; + name = "hideshowvis.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis"; @@ -32810,12 +34184,34 @@ license = lib.licenses.free; }; }) {}; + hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hierarchy"; + version = "20170706.552"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "hierarchy"; + rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764"; + sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; + sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp"; + name = "hierarchy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hierarchy"; + license = lib.licenses.free; + }; + }) {}; 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"; - sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j"; + url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149"; + sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56"; + name = "highlight.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -32853,8 +34249,9 @@ pname = "highlight-chars"; version = "20170223.740"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-chars.el"; + url = "https://www.emacswiki.org/emacs/download/highlight-chars.el?revision=18"; sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f"; + name = "highlight-chars.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars"; @@ -32871,8 +34268,9 @@ pname = "highlight-cl"; version = "20091012.1030"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-cl.el"; + url = "https://www.emacswiki.org/emacs/download/highlight-cl.el?revision=3"; sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw"; + name = "highlight-cl.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc85d7fd8e4d7381850f4a379140c64506f86e8/recipes/highlight-cl"; @@ -32885,13 +34283,35 @@ license = lib.licenses.free; }; }) {}; + highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "highlight-context-line"; + version = "20170319.1442"; + src = fetchFromGitHub { + owner = "ska2342"; + repo = "highlight-context-line"; + rev = "716e10a0c7b703b5f1d9c6ca1481524a4d06b7b8"; + sha256 = "1ipj5l6d3d0mck3k8qsr685phk3zc7k4366vzvjyxvhgp5g2385l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00df721571ff67fe158251fa843c8f515ded3469/recipes/highlight-context-line"; + sha256 = "0zmqcfsr2j0m2l76c8h6lmdqwrd1b38gi6yp5sdib0m4vj9d0pnd"; + name = "highlight-context-line"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/highlight-context-line"; + license = lib.licenses.free; + }; + }) {}; highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-current-line"; version = "20051013.1056"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el"; + url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el?revision=4"; sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c"; + name = "highlight-current-line.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2768ed5917ec2e2339412d8fbd146ca5a8a5042/recipes/highlight-current-line"; @@ -32949,12 +34369,12 @@ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20170106.1025"; + version = "20170516.1355"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "087f719fda7d60c837146c81b1d9d0aab22ba88e"; - sha256 = "0q8ch945h9slfp636clf0f60ws78zcbnc1grld8n59chhq22nfyb"; + rev = "b51744bde1287979f2d948f46501bd6ed0897f69"; + sha256 = "17xbd1kiww762dibws48gwn682g1bxy5rb7np5alqhiiw1l13wdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -32970,12 +34390,12 @@ highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indentation"; - version = "20161012.209"; + version = "20170502.43"; src = fetchFromGitHub { owner = "antonj"; repo = "Highlight-Indentation-for-Emacs"; - rev = "731fe2058b68b2eee8c6bc99d914d30f3de233c5"; - sha256 = "093cvm4sabpchay49xm40mr65q6fk4df2i8kmlqiy2c5dvs5vsgf"; + rev = "5c7717a2224372f7113d13640515df3650388a37"; + sha256 = "13d85qbq6q9pz3yrwpn6rjlrbrjs0fnskkbb5liczyxyk8rzj924"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation"; @@ -33120,8 +34540,8 @@ src = fetchFromGitHub { owner = "zk-phi"; repo = "highlight-stages"; - rev = "87c476f8ca0474912af41680a8de243c0c8d5b46"; - sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79"; + rev = "29cbc5b78261916da042ddb107420083da49b271"; + sha256 = "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages"; @@ -33145,8 +34565,8 @@ sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/highlight-symbol"; - sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol"; + sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r"; name = "highlight-symbol"; }; packageRequires = []; @@ -33159,8 +34579,9 @@ pname = "highlight-tail"; version = "20140415.1841"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-tail.el"; + url = "https://www.emacswiki.org/emacs/download/highlight-tail.el?revision=5"; sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg"; + name = "highlight-tail.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d033ff8cceb7e6d1e5a9f0ec7b706eb28bfe30f3/recipes/highlight-tail"; @@ -33239,12 +34660,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "20160905.243"; + version = "20170609.126"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "c2ac3e3ce57c834525dc8ec5ca87d5e8d728b69b"; - sha256 = "1zhggfmhk57v2yj6w9z8mrq8yjsdjg7nzljz1jwbk03jkf7zvwr8"; + rev = "0721221ede01d6a3468e562fd7ea0df114de34e2"; + sha256 = "09cyzvk1ixbmnd6wl8idxn0263mgsvcnh1742flvxa5wsbqm9f08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -33281,12 +34702,12 @@ hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hippie-expand-slime"; - version = "20130907.132"; + version = "20170317.0"; src = fetchFromGitHub { owner = "purcell"; repo = "hippie-expand-slime"; - rev = "66665b65f9053ada47c0283caea0a7db3eaf2f5f"; - sha256 = "0xdbqillrxap29zg35mpxgilz66kjvhx7yvv7hblwj6j30p7bbkq"; + rev = "ed6c91a0600550788dc78a3ab32040ac28f7c8d4"; + sha256 = "0nqrz1wmg84xk08mi5w8h9mrymr23v8i39s2kdqsrmn6qpw37fpl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime"; @@ -33320,6 +34741,27 @@ license = lib.licenses.free; }; }) {}; + historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "historian"; + version = "20170715.2142"; + src = fetchFromGitHub { + owner = "PythonNut"; + repo = "historian.el"; + rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa"; + sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; + sha256 = "00cghcyb3liz2prgygjwsw82d9h70zjddnbf7dvglmj7ph9wn9ab"; + name = "historian"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/historian"; + license = lib.licenses.free; + }; + }) {}; history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "history"; @@ -33348,8 +34790,8 @@ src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-historyf"; - rev = "66590519a02816cde8f442032fb144f3c38ebc6e"; - sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0"; + rev = "196c058ceb092fdd56b0e4ce85b7e714d6f72224"; + sha256 = "0fgm1m9mq1zn5gnrynf332hamif05qhh8haqci7gii7crzy47c0g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a67279875c19475433fa13625c95ee5855962a59/recipes/historyf"; @@ -33429,8 +34871,9 @@ pname = "hl-defined"; version = "20170223.744"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-defined.el"; + url = "https://www.emacswiki.org/emacs/download/hl-defined.el?revision=9"; sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y"; + name = "hl-defined.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined"; @@ -33446,12 +34889,12 @@ hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-indent"; - version = "20141227.1330"; + version = "20170429.1404"; src = fetchFromGitHub { owner = "ikirill"; repo = "hl-indent"; - rev = "e749f726ce589e04bb508160e7b290b61fb64d75"; - sha256 = "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc"; + rev = "bdb2e0177a7c8b29af26998e688b856adc6ded93"; + sha256 = "0fwb64ja5ij97308pnd7g6l5mascavcp7jcar8igxv9yyqnw6pfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aa6ce8f3d1349e28dd9dea8396c38257e3cea2f/recipes/hl-indent"; @@ -33466,14 +34909,15 @@ }) {}; hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-line-plus"; - version = "20170223.745"; + version = "20170621.734"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "1dhrfbmh98y18xgsp42rx1qqcs296mpqqzzp3nr9rcqv4gvpllgp"; + sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc"; + name = "hl-line+.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d5d1cf2f29d46e8abd821095da86f137650a2ff/recipes/hl-line+"; - sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-line+"; + sha256 = "16wlvi97wfkj36rnkbhzsky7sib3b76r2ng0lizp7ncr8d0vvhfv"; name = "hl-line-plus"; }; packageRequires = []; @@ -33514,8 +34958,8 @@ sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/48b99dd60dda3039a0e1e71bb4b796d62340279e/recipes/hl-sexp"; - sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; + sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; name = "hl-sexp"; }; packageRequires = []; @@ -33528,8 +34972,9 @@ pname = "hl-spotlight"; version = "20170223.746"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el"; + url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el?revision=15"; sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3"; + name = "hl-spotlight.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight"; @@ -33545,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"; @@ -33566,16 +35011,16 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170302.711"; + version = "20170716.116"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "0e65583a7821e60882b8ce7934b1f1c34d4d1874"; - sha256 = "12r0jxcipfbs77yr2svs60x1b52l6lyjgjax3kxaizjdjaxxwsdc"; + rev = "2412435e53c4f739a7aa93c9b9d80d861a1aa764"; + sha256 = "0l5fw1c1dilsiiw82a1lwaa2xjq4dlfm51rvnkf2iay1ndr7l11x"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; - sha256 = "1xpar3nx1axc6yb0bph8xwvx0jcl79da9bz40an2fpr4l1pp4fw3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; + sha256 = "15s8rqc94z70jzv13961nvcm9a9qadq04pf0m6xrzf8qqk71zn52"; name = "hledger-mode"; }; packageRequires = [ async emacs htmlize popup ]; @@ -33608,12 +35053,12 @@ hlinum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hlinum"; - version = "20160521.2112"; + version = "20170507.2227"; src = fetchFromGitHub { owner = "tom-tan"; repo = "hlinum-mode"; - rev = "bc92bb8344af61929ffb0cb4df9d6b30d7df80d1"; - sha256 = "1yfq55gzg6p17qbd9xf0g9cza5bzkvl47rkjq19mf6kjxk0ihkh7"; + rev = "2b4a08db4ff361ac8eeee1ed94eca7e26c614595"; + sha256 = "0j2ras605i2zsna02lp8k4mkyhln65cggmgkhgr9imcxfzwpjzqk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41bca7b89a7ce52d4c9381b9a4046b7103996c4f/recipes/hlinum"; @@ -33716,8 +35161,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "hookify"; - rev = "b4aa586b24ff63f84baa8de4ed2fd93be6479ade"; - sha256 = "1d3dlkrv95xrpv4rv3jgn58mxs71f6vi2lr88bddhxz702vb11d8"; + rev = "21baae7393b07257de5796402fde0ca72fb00d77"; + sha256 = "0sg4h0m1ds3f6kpzd3vk30g6x2xl74r5j9bidw658f3mmai7m1l8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa04ccd0ac05beed5de8d51ed96ccbf0071fdea1/recipes/hookify"; @@ -33733,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"; @@ -33887,8 +35332,8 @@ sha256 = "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/55a0355077a16f82b45113d37a10b26676f5f507/recipes/html-to-hiccup"; - sha256 = "10d0fafqn6f1mwjbx8zizkc5ql9njs4f3ghplirqy82cx4w8rgbq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/html-to-hiccup"; + sha256 = "0gyghgdil14i4p0yv5mb6la1ajzf8xcgdm1si5i5w7cn72vfapmz"; name = "html-to-hiccup"; }; packageRequires = [ dash emacs s ]; @@ -33918,6 +35363,27 @@ license = lib.licenses.free; }; }) {}; + html2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "html2org"; + version = "20170417.2201"; + src = fetchFromGitHub { + owner = "lujun9972"; + repo = "html2org.el"; + rev = "6904aed40259ad8afccff079ebd8a07bff319ebc"; + sha256 = "0dryk622fz0yj939pbs0fbb9i4m8qjnmkcxjsssws8f90plk06af"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/771e6604edc90182697bbd4827c8c46c34b48289/recipes/html2org"; + sha256 = "1lj4dwmjkc43dfmsc7z4nvydmmf6wrk5v9ms23zf0llnk9h3hvnk"; + name = "html2org"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/html2org"; + license = lib.licenses.free; + }; + }) {}; htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; @@ -33942,12 +35408,12 @@ http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20161127.1449"; + version = "20170603.1107"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "18057d0967015979ee7e59598b1d3410d5966fcb"; - sha256 = "1bw9369c3r172p14rb74vqs0243696rqf46z627p1w73afq48zy5"; + rev = "19317fcc928bb75e0464e39032af1627b7961a0c"; + sha256 = "14zq54g4ckcrrbpwjcb84krg9bijw88nwnkj8kg9kij5p25knqwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; @@ -33960,16 +35426,19 @@ license = lib.licenses.free; }; }) {}; - http-post-simple = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "http-post-simple"; - version = "20131010.2058"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/http-post-simple.el"; - sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my"; + version = "20170715.240"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "http-post-simple"; + rev = "f53697fca278c741051aeb668b00466b5e0fd3fe"; + sha256 = "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4d1df16d1c429c46ea5555021ce84d050007adfb/recipes/http-post-simple"; - sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple"; + sha256 = "0z3zphaqywbm7vn2g1f7fkrdamgsc26i8zydm9y53v9z9fmzch5s"; name = "http-post-simple"; }; packageRequires = []; @@ -33989,8 +35458,8 @@ sha256 = "0fxmk5b4ggi92n5gi2nim08a2gx1yg7jlp4hj4m0qazxqdcy38i1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/56e6078d42cfefbe3f0731952f67afd7f6e9a92e/recipes/http-twiddle"; - sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/http-twiddle"; + sha256 = "1d8xnwhb8lp4p4xnnkryx5c6isd8ckalp0smx66lbi1pa4g6iqsh"; name = "http-twiddle"; }; packageRequires = []; @@ -34041,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"; @@ -34065,12 +35555,12 @@ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; - version = "20161128.2238"; + version = "20170411.1802"; src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; - rev = "2cedcdd113032414ea6d3bfa2504c8820b1a841a"; - sha256 = "1fg2his564qiqk7b47nswxcq4pd17ip164v4zva9715cjzgyzn66"; + rev = "0434458d3f6b2b585f332271feaa054bf4ec96d7"; + sha256 = "04g8gdfqpzdhxf5rnl2k49f2klmzxwys79aib7xs30i0n8c8qb7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete"; @@ -34086,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"; @@ -34132,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"; @@ -34170,12 +35660,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170108.148"; + version = "20170325.815"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "36fb5e0149795404d0271419fd4354ba58f81dbc"; - sha256 = "1yycpyr1pc7jzb7fdkiyrbyz7wfgs2g0r27c034pmykcmj02sb1q"; + rev = "38ce88a9c3be11b0431080078095159b2211ca7a"; + sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -34199,8 +35689,8 @@ sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f050a5b4bc18839a8d945c0799d0c0e239fa6864/recipes/i2b2-mode"; - sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/i2b2-mode"; + sha256 = "1jnlisdnp9sz54p444vlq00y3080i4ljcvclri9fy382g1s5ags5"; name = "i2b2-mode"; }; packageRequires = []; @@ -34273,12 +35763,12 @@ ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; - version = "20150121.837"; + version = "20170410.1452"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "8b225dc779088ce65b81d8d86dc5d394baa53e2e"; - sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc"; + rev = "a004cd0121ab15a00311631289fc6a8c7a86a897"; + sha256 = "013yx94q2ffhiqbx9dara7kq76yfmigj4y00zc48rdinclnzb6az"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; @@ -34356,10 +35846,11 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170303.1455"; + version = "20170707.610"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icicles.el"; - sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp"; + url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1088"; + sha256 = "0lckab25irgpm7y2wdg00v31514m6aw6n0wf9gz1v21zzc5ij6cz"; + name = "icicles.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles"; @@ -34378,6 +35869,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icomplete+.el"; sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam"; + name = "icomplete+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+"; @@ -34393,12 +35885,12 @@ id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "id-manager"; - version = "20161124.2045"; + version = "20170320.546"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-id-manager"; - rev = "98bd85db17914af59e7b75c89e82117323965af2"; - sha256 = "0fj3gsjpm58p7526c95g8fqkch51ic3h2rvr36fhmxqxd5baj5xf"; + rev = "14ebc35db298aac4dedc8aa188bc46bacab81f3b"; + sha256 = "0k9b12gzvjw06y5ycjkigkj8vcmj4rz57d4hyzip27g1v93vvimc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager"; @@ -34485,8 +35977,8 @@ sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7bdccd978644a6de9de1da0cf42304f748622885/recipes/idle-require"; - sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/idle-require"; + sha256 = "03z8d06ifzaf81h8b3h16ab69cp3ssky3my07spy81rbhbjl5nn3"; name = "idle-require"; }; packageRequires = []; @@ -34561,12 +36053,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20161211.910"; + version = "20170708.1116"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1"; - sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af"; + rev = "7b7136532ee4af0380f667f19700b53853bbbd7a"; + sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -34621,6 +36113,27 @@ license = lib.licenses.free; }; }) {}; + ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }: + melpaBuild { + pname = "ido-flex-with-migemo"; + version = "20170319.431"; + src = fetchFromGitHub { + owner = "ROCKTAKEY"; + repo = "ido-flex-with-migemo"; + rev = "c620934f50b9713693eba8e23f88c2aaa8510708"; + sha256 = "0aymvbf36ph0zaff38r5vd7q0z3kv8wl3ivakhaybpsa2zvsgvxf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo"; + sha256 = "1w8f1r17l4r7w5bacckv9zfl9qynv2ivsw639rzr5acg2ndxagv7"; + name = "ido-flex-with-migemo"; + }; + packageRequires = [ emacs flx-ido migemo ]; + meta = { + homepage = "https://melpa.org/#/ido-flex-with-migemo"; + license = lib.licenses.free; + }; + }) {}; ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "ido-gnus"; @@ -34653,8 +36166,8 @@ sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ccca92fee3d39966df135a5c79e42d2ab621848/recipes/ido-grid-mode"; - sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode"; + sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3"; name = "ido-grid-mode"; }; packageRequires = [ emacs ]; @@ -34813,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"; @@ -34855,12 +36368,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170211.1432"; + version = "20170705.1656"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1"; - sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af"; + rev = "7b7136532ee4af0380f667f19700b53853bbbd7a"; + sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -34939,12 +36452,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20161102.707"; + version = "20170703.2038"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "b5e057bf6b805f4da7c17cb6ca5e69833935e900"; - sha256 = "1bwrf529m9xjb9bdypx35ss5v6k5v96hcqah3sij98x9357g7b6n"; + rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3"; + sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -34960,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 ]; @@ -34989,8 +36502,8 @@ sha256 = "1pbbkizaa2f8lazpsc1j7qs3snvwkmw7schzhminzxrvdx15yids"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; - sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; + sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh"; name = "iedit"; }; packageRequires = []; @@ -35023,12 +36536,12 @@ iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iflipb"; - version = "20170205.200"; + version = "20170527.839"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; - rev = "8eb478535aa4847b94ea4ce29d9476a6b652be2b"; - sha256 = "0plvjg1nkq37mpdbli2fyqhvabzi18mq5kjrgxk9d6s6ki2m26kq"; + rev = "e19229473be70e55c56a26ccc26c4e11e8be6389"; + sha256 = "1ybnxl6zgzhxrwsqf54hz235xhz3rmxy7w459salb7rr2s1fqvlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; @@ -35066,8 +36579,9 @@ pname = "igrep"; version = "20130824.507"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/igrep.el"; + url = "https://www.emacswiki.org/emacs/download/igrep.el?revision=10"; sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29"; + name = "igrep.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83c05578974289527082bb67338c35e70bbff8f2/recipes/igrep"; @@ -35089,8 +36603,8 @@ sha256 = "11pss3hfxkfkyi273zfajdj43shdl6pn739zfv9jbm75v7m9bz6f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1d94609f2ef349c8b877791a996de3b6b60da9/recipes/igv"; - sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/igv"; + sha256 = "0vjqdyj9j26y0hhzmip6lpwc8g1c9vnmgya1p7v77bkgdicgl659"; name = "igv"; }; packageRequires = []; @@ -35252,6 +36766,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/imenu+.el"; sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb"; + name = "imenu+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+"; @@ -35296,8 +36811,8 @@ sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/eddb7acecc4948ade16ff02415484c9a16529c9c/recipes/imgix"; - sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix"; + sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg"; name = "imgix"; }; packageRequires = [ cl-lib dash ht json s ]; @@ -35371,12 +36886,12 @@ impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "impatient-mode"; - version = "20150501.247"; + version = "20170505.1921"; src = fetchFromGitHub { owner = "netguy204"; repo = "imp.el"; - rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0"; - sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj"; + rev = "11600a8441a1c0339252b0c19f151ccac3ee96c7"; + sha256 = "1k251pidqgjn380xbs2h3j02r76lq1gcqkslwfpvq2g3l3ksqkkd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode"; @@ -35434,16 +36949,16 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "20170101.1603"; + version = "20170702.1844"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "c75afbb93b024307c4cf67e6dd44cda80bbea697"; - sha256 = "1xz99g9j8gfd6qrdsmrf98mq61168divw8lrwl3zylfw04x20b4b"; + rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; + sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic"; - sha256 = "1d85sg8wsm03v8zmv5w0znkgnr4q33x0d3frkr16dcmgqh2z9lgp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; + sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv"; name = "importmagic"; }; packageRequires = [ emacs epc f ]; @@ -35476,16 +36991,16 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20161220.856"; + version = "20170608.647"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "b6b8bf42bf50c8b0b1aff56894d8265df79361cc"; - sha256 = "007102am1q2dkp18p1vlsy34i28lvvq4n8b3grz7nyblbik1v5wp"; + rev = "8d2072eef1fdc87e35f7495adfbfa0beb9faf6b7"; + sha256 = "1hrsmv25q9rpmj8paf3gggw7sp28z1m4gwlx50s64k5mxqa99iy8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools"; - sha256 = "1i81pk62lnjww80dpi5b55fz7p0z2qxm19z6v3225x2jpylwcab3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; + sha256 = "12rawl9qaihgyascy53yxpkknp95wh8fiqygb5cgl7d761qizvp6"; name = "indent-tools"; }; packageRequires = [ hydra s yafolding ]; @@ -35515,6 +37030,27 @@ license = lib.licenses.free; }; }) {}; + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: + melpaBuild { + pname = "indium"; + version = "20170626.312"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "Indium"; + rev = "4747a94cf823deb5623368f71f2012f8c5fdc156"; + sha256 = "11hsyqiy5lcvk721xrv1ihzp9ghdgk46n3qlaviy9alapl0v55d5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; + sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; + name = "indium"; + }; + packageRequires = [ company emacs js2-mode seq websocket ]; + meta = { + homepage = "https://melpa.org/#/indium"; + license = lib.licenses.free; + }; + }) {}; indy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indy"; @@ -35539,12 +37075,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170305.900"; + version = "20170710.708"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "2e1dd6c1e1540223f8cc4e3493c1e555144d5431"; - sha256 = "0flfp8313xxw8c3wip0fqqz33n7gfn3fhppsrpz7wlxiqymsb20d"; + rev = "f7ec13ab2fbc36e99df196eb863a75baf3b92fd6"; + sha256 = "01j4prrs78sq4w7cv15rdilxrqmjam2s1hrwijf6718c0s7dbpd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -35602,12 +37138,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20170212.1444"; + version = "20170615.335"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "af4f238ef4555521d13c5eb2fb8e818acf59d70a"; - sha256 = "1668dr6y0nph739x947kjz435qikg77m8ja7h6laf3f9wzcxcg9s"; + rev = "c14a68d1643ac3f439234da6a8275b48cae970d3"; + sha256 = "0b6qp9xljxn4mrh1xcv6fzklq963hrchq8iab4746kvylhn1xmsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -35648,8 +37184,8 @@ src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; - sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; + rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69"; + sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections"; @@ -35689,6 +37225,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz"; + name = "info+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -35725,12 +37262,12 @@ inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; - version = "20161007.724"; + version = "20170409.949"; src = fetchFromGitHub { owner = "shlevy"; repo = "inherit-local"; - rev = "426f7997af0906013846d20729a499f0ce6db634"; - sha256 = "1n97636c3zi7cq93m5fxvgqkqg5aryn742q7pb1s1w47smdpclgl"; + rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7"; + sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; @@ -35743,6 +37280,27 @@ license = lib.licenses.free; }; }) {}; + ini-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ini-mode"; + version = "20170424.209"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "ini-mode"; + rev = "2194cfa2fd13196a37350ec20b3f00dcf6162b7c"; + sha256 = "0s3dcqywrbggrcn9j5nibhcl4xbnhdndz5sibcp26qswd18jyrdk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/000cca577d000bafe7bf5711d0bfe7593fb6975a/recipes/ini-mode"; + sha256 = "0f6fbmg4wmlzghcibfbcx3z124b2017rhsasi5smgx9i2vkydzrm"; + name = "ini-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ini-mode"; + license = lib.licenses.free; + }; + }) {}; init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; @@ -35817,8 +37375,8 @@ sha256 = "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e3276b823cf03455083929599e1d47aea894ad5c/recipes/ink-mode"; - sha256 = "1fi1g7sim5qyildzz84iwywwq94qxym972ac15sj7yd7x0i8smax"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ink-mode"; + sha256 = "02q95xay6z56i4l0j24dszxnfpjbxijlj4150nsadbv55m7nnjcf"; name = "ink-mode"; }; packageRequires = [ emacs ]; @@ -35830,12 +37388,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20170203.2120"; + version = "20170709.1858"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "a7bbc67de279cbd1646d5f6733900fb4f4402280"; - sha256 = "1r0b7bnjg161km86pif4rsbwix81kr9n9w5bcp4p7ngrvxhfndgs"; + rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5"; + sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -35872,16 +37430,16 @@ inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inline-docs"; - version = "20170130.1434"; + version = "20170522.2150"; src = fetchFromGitHub { owner = "stardiviner"; repo = "inline-docs.el"; - rev = "4e94a62f6b02c37c1497f34b36fe36f04cc23405"; - sha256 = "0851jgh5v36d7lq9pwlmigqpqrfbrqqssib4id7s4c8j4sh4c03g"; + rev = "b57f1681be6147f999cdc12abff414a0442e8897"; + sha256 = "0ji8qgscs4fxp2i29l3v8z9y6i2glga6bysbcsn855pqsn00xkcv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/48f0262ec568a3dd53dcc48f11e473b30c7e6ab1/recipes/inline-docs"; - sha256 = "1a45a5bxm719fr4xvn26mraph3a19d53c2l74y1jrxhaksgl3n1j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/inline-docs"; + sha256 = "1imjcx4qgrs5llindgmnvkb73fagnlxfg04s72kckgcy47c4352p"; name = "inline-docs"; }; packageRequires = [ emacs ]; @@ -35976,12 +37534,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "20161004.2215"; + version = "20170416.359"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e"; - sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c"; + rev = "ad207c8c3d266d566fb1e4862df154096c059171"; + sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -36018,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"; @@ -36039,12 +37597,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170302.2354"; + version = "20170711.1415"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "693e13fd3f19c05e906c234c692d77ac48d69fdc"; - sha256 = "18xj5m6qglh4w903vcdxmw1sms51ansrai43sndcp6z4sbi02xpb"; + rev = "d03b3cb0cbc8d059a223366c4f7a2be85672c22f"; + sha256 = "0zga7p2hazcwxjyzgrvq77d3j6q9mz7wz7mkqk0hzf00sdb1gpg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -36099,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"; @@ -36194,8 +37773,8 @@ sha256 = "1s17wpdbrbkbmkndbwm0byy11cmymhs6yn7w0v5lvw5l2cgicxjg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3f80bcdf411de128139a6bf1f507d7ec87076c25/recipes/ipcalc"; - sha256 = "0rd9p4yvzabw437qf7lgiyzxnvv6cjai8b22ywsdryxar9fd8pb2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc"; + sha256 = "0hw5g30pnqwzvbhf6kggyj6wij5iw7d8jgmr88pyw63kxach8vkv"; name = "ipcalc"; }; packageRequires = [ cl-lib ]; @@ -36292,8 +37871,9 @@ pname = "irfc"; version = "20130824.507"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/irfc.el"; + url = "https://www.emacswiki.org/emacs/download/irfc.el?revision=45"; sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca"; + name = "irfc.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b4f2dc79231b165bd3b03a728e2b872ed6c50c1/recipes/irfc"; @@ -36309,12 +37889,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170223.515"; + version = "20170627.1045"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "75b356b357e63a03c04e194e85f1925f198363dc"; - sha256 = "0fsg79ww3aqy0m46xjdr3783zwc6vnxknh4k2yrizmm44zvy925z"; + rev = "bf21cf4c442a930e6007b3ff5bd8af094318991f"; + sha256 = "02fm2nwhglpb42qa5z2mrfkwqvwc3xvfdi0marlxbg3ramhn4s4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -36330,12 +37910,12 @@ irony-eldoc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "irony-eldoc"; - version = "20141226.2219"; + version = "20170502.1208"; src = fetchFromGitHub { owner = "ikirill"; repo = "irony-eldoc"; - rev = "bd1fadbc7c806d84aeec098b19238e5328cbbb7b"; - sha256 = "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn"; + rev = "0df5831eaae264a25422b061eb2792aadde8b3f2"; + sha256 = "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc42459d5c1671bd478d781339f2572b3de2e7d0/recipes/irony-eldoc"; @@ -36371,14 +37951,15 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20170303.1503"; + version = "20170614.928"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0nkyav1fw3n16alb5b90cqb3bbmr7i74rc90bpd22hkm25wcvqbj"; + sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl"; + name = "isearch+.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; - sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/isearch+"; + sha256 = "0n9jh3bx2h6k4mvbwss16m34fxzlq6sb057rj16hgrlmbqknynhw"; name = "isearch-plus"; }; packageRequires = []; @@ -36391,8 +37972,9 @@ pname = "isearch-prop"; version = "20170303.1504"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; + url = "https://www.emacswiki.org/emacs/download/isearch-prop.el?revision=79"; sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r"; + name = "isearch-prop.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; @@ -36492,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"; @@ -36513,16 +38095,16 @@ itasca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "itasca"; - version = "20160406.542"; + version = "20170601.922"; src = fetchFromGitHub { owner = "jkfurtney"; repo = "itasca-emacs"; - rev = "bf0b6a66b57c8a0e7d692d306a50b587a2da8284"; - sha256 = "1174f75p3rkq812gl2rs1x51nqbz4fqxwsbrd7djh1vkd2zii3aw"; + rev = "3d15dd1b70d6db69b0f4758a3e28b8b506cc84ca"; + sha256 = "0mfcl7ka7r5mx52xvf13i3799ddkdi9sq2q4p2rkgb96r37ia221"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/afcd7ab6f3c9ac51a9cd84b30b5f12b7d259386a/recipes/itasca"; - sha256 = "01075ad0sb5q7aql6j5wmjdk2qhdgbbm5xb0ikrnl7rzc1afvv6j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/itasca"; + sha256 = "0j0lvs9x2j3z5yyhbgmymccswi40vv1gz3sl56bl857m1hlxzshz"; name = "itasca"; }; packageRequires = [ emacs ]; @@ -36597,12 +38179,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170225.351"; + version = "20170716.1104"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -36618,12 +38200,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170227.608"; + version = "20170321.1306"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "c4fd39864d0c9f770426a93319b492942c81b1e6"; - sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr"; + rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; + sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -36636,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 = "20170216.952"; + version = "20170709.2151"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af"; - sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y"; + rev = "acd6322571cb0820868a6febdc5326782a29b729"; + sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -36664,8 +38267,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "9b14a972093b12e3a5d210370592e71df7f0d1e1"; - sha256 = "03bb6jw0f6l1wi1bl8ynb0k5rnk2rfnrhzc2qp5anmlxzy3qglc8"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; @@ -36678,15 +38281,36 @@ license = lib.licenses.free; }; }) {}; + ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-historian"; + version = "20170715.2120"; + src = fetchFromGitHub { + owner = "PythonNut"; + repo = "historian.el"; + rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa"; + sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; + sha256 = "0yzq3rr51q5d64pfc7x5jszz77x6nwpbjj0g74x5ga3bsw3i67d9"; + name = "ivy-historian"; + }; + packageRequires = [ emacs flx historian ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-historian"; + license = lib.licenses.free; + }; + }) {}; ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170302.1033"; + version = "20170703.2350"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -36744,12 +38368,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20170227.1745"; + version = "20170716.1924"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "ba15a2fb46a63f0aaf5e5b4dae026c2e1228ec1a"; - sha256 = "1hkydyrcqv3qn605kjm8lhv2hpjmrjp7qvfxwyjbr878nhbm6jn0"; + rev = "84964443f9a3ded1676190e9e0f91dac4557cc21"; + sha256 = "1gsf3klcrmabalfywxv5pffpbgw9nw90plc5xxq6a01f7b46rp7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -36762,6 +38386,48 @@ license = lib.licenses.free; }; }) {}; + ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: + melpaBuild { + pname = "ivy-rtags"; + version = "20170522.2154"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; + sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq"; + name = "ivy-rtags"; + }; + packageRequires = [ ivy rtags ]; + meta = { + homepage = "https://melpa.org/#/ivy-rtags"; + license = lib.licenses.free; + }; + }) {}; + ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-todo"; + version = "20170315.334"; + src = fetchFromGitHub { + owner = "Kungsgeten"; + repo = "ivy-todo"; + rev = "7c72deff0ffa15c7d9a3389bd4386aec2dec9372"; + sha256 = "1y6ilcwzz2rbsdy0fj6yjs75mxks6asha8cv5i129ylcapj9ygdy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo"; + sha256 = "12sfg2rbnk73a34ap94g4g70gx13llcgsrmfdrgrzk83a2274a2r"; + name = "ivy-todo"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-todo"; + license = lib.licenses.free; + }; + }) {}; ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xcdoc"; @@ -36790,12 +38456,12 @@ src = fetchFromGitHub { owner = "squiter"; repo = "ivy-youtube"; - rev = "32f609f1d1a3718739be5797e020d6266d8340d2"; - sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd"; + rev = "7e916dd531c52a2809188a99716aeff8446056cc"; + sha256 = "1dia1m9fjxbd5lsf788bv7zpdbrwbjswd9m588iaijcdd2hnma8q"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube"; - sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube"; + sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4"; name = "ivy-youtube"; }; packageRequires = [ cl-lib ivy request ]; @@ -36872,13 +38538,13 @@ pname = "jabber"; version = "20170106.1603"; src = fetchgit { - url = "git://git.code.sf.net/p/emacs-jabber/git"; + url = "https://git.code.sf.net/p/emacs-jabber/git"; rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e"; sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber"; - sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber"; + sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws"; name = "jabber"; }; packageRequires = [ fsm ]; @@ -36928,27 +38594,6 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: - melpaBuild { - pname = "jade"; - version = "20170224.922"; - src = fetchFromGitHub { - owner = "NicolasPetton"; - repo = "jade"; - rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; - sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; - sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; - name = "jade"; - }; - packageRequires = [ company emacs js2-mode seq websocket ]; - meta = { - homepage = "https://melpa.org/#/jade"; - license = lib.licenses.free; - }; - }) {}; jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jade-mode"; @@ -37225,12 +38870,12 @@ jaword = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }: melpaBuild { pname = "jaword"; - version = "20150325.718"; + version = "20170425.2327"; src = fetchFromGitHub { owner = "zk-phi"; repo = "jaword"; - rev = "a96bc63a08f616cc23dcc43d565e1f22a94aa9f3"; - sha256 = "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka"; + rev = "ac062b0e5ab4bd3270497e80aa0f3ac033a0493f"; + sha256 = "05kbscympb59njfrs94w4b2lwkc3057wzib65kq0l93bx4pcw2iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00fe123ddc7fbcb9fd2b97e8a9fc8a8c5fabbf7f/recipes/jaword"; @@ -37246,12 +38891,12 @@ jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jazz-theme"; - version = "20170115.723"; + version = "20170411.711"; src = fetchFromGitHub { owner = "donderom"; repo = "jazz-theme"; - rev = "0ae13bd12ddc339b8ef6f112c59b916a2da6922e"; - sha256 = "12iz3hvxha9mya2629azvmrwgkxk6b4fgmgpx1n30wlaw8ap69gj"; + rev = "b1cb78a97cc4050f19d88a89e455c3e52d98240e"; + sha256 = "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme"; @@ -37267,12 +38912,12 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20170303.1035"; + version = "20170413.901"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; - rev = "6eb6132f44bf87e52d5ed74c4bb3869c0d5f66a8"; - sha256 = "023yhdp4pdfm1fi4y09v925l8f1d8206z41kk1hv90zy034b94hk"; + rev = "ee3c3b95e4a8697438d48757c604f9491b395417"; + sha256 = "10zgdc4619y7w80w41jvr63s3wms52kfz011gaxwhzdgm2mdjqav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; @@ -37296,8 +38941,8 @@ sha256 = "00l6mc643na97jrb0k595kwmfg8wc7m5iqjd9l9vvf3dal6389b8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp"; - sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp"; + sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5"; name = "jdecomp"; }; packageRequires = [ emacs ]; @@ -37309,12 +38954,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20170303.1253"; + version = "20170506.1514"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "481b040c227e60c645094d0ec193a53adac7b09a"; - sha256 = "0qbiqjr2nkmvf1m874mdfwsszzcv32rfdvrp7bs62fw9q95wcrhb"; + rev = "e572d4889604c0b4e1d9180b8a68f9c0f99b99d2"; + sha256 = "1vhwza7xak2im2xp7qzs8b6bmnf9yw2di86rav8wh5xapqr8x7mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -37334,8 +38979,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "de1f5597b600c0cb7661b5f451da2af4cb722571"; - sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp"; + rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c"; + sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi"; @@ -37355,8 +39000,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "de1f5597b600c0cb7661b5f451da2af4cb722571"; - sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp"; + rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c"; + sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core"; @@ -37411,15 +39056,36 @@ license = lib.licenses.free; }; }) {}; + jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jemdoc-mode"; + version = "20170704.1327"; + src = fetchFromGitHub { + owner = "drdv"; + repo = "jemdoc-mode"; + rev = "529b4d4681e1198b9892f340fdd6c3f1592a047a"; + sha256 = "1f8nn8mv18q3x3k32i6kjis9f3g1ybdjcfaw8hywqwy6k8dr734m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode"; + sha256 = "1bl8a9fcilrqjzh92q7nvd16pxjiwmbnj157q2bx36y7bxm60acv"; + name = "jemdoc-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jemdoc-mode"; + license = lib.licenses.free; + }; + }) {}; 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"; @@ -37443,8 +39109,8 @@ sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6ddf4de8f3f4c3c1e3682225f3c46c5928e0e75d/recipes/jenkins-watch"; - sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jenkins-watch"; + sha256 = "1mdmh62rq3b8p23xgaf4i0kzpgq3ldljdxsnk07wa8bp3p7jxvgs"; name = "jenkins-watch"; }; packageRequires = []; @@ -37499,12 +39165,13 @@ pname = "jira"; version = "20131210.1022"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/jira.el"; + url = "https://www.emacswiki.org/emacs/download/jira.el?revision=11"; sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz"; + name = "jira.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9bc672a3553ea7996b72b11c9e979811150b59/recipes/jira"; - sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jira"; + sha256 = "1zrywkwzqn5ffzzk3rmy01vj6afm2p9gm81rpc7s86cj3ywfy4wx"; name = "jira"; }; packageRequires = []; @@ -37600,12 +39267,12 @@ jpop = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jpop"; - version = "20160816.348"; + version = "20170410.550"; src = fetchFromGitHub { owner = "domtronn"; repo = "jpop.el"; - rev = "485aec3e09e4f01eeb4b737c4de99fadf79e0b31"; - sha256 = "1a63xzczwb8frr3d4a2z864qq2wx83lgljqbqphkabx99apc749l"; + rev = "7628b03260be96576b34459d45959ee77d8b2110"; + sha256 = "1x7qha7xyn2j225h7axhskngc8icjhgm3f451iq3qysj22q8g4d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop"; @@ -37667,12 +39334,12 @@ src = fetchFromGitHub { owner = "Qquanwei"; repo = "auto-beautify.el"; - rev = "dd2e5940a07c5bb8e793f25e644def62c3426eed"; - sha256 = "0wqw9gj59n4bxb3zpr3ddaqzwl2rb8zk7zv5dkfrzzvy2rz10zxd"; + rev = "180d15af7b5dfaab4ee1954cca2fdc797932f9de"; + sha256 = "0xwkjq41v32dqc5gq8hcmcvdjg2y38xq6hkw5pja0kyvyk92c82d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7658000fb834fb17950a333967b116a785150633/recipes/js-auto-beautify"; - sha256 = "1as6xkmm295swyc2r6hac2lpf7r36mkq5ib5rxc11f30nnzyya9r"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-auto-beautify"; + sha256 = "0hpp6im24xy4g5l1n9kvpmpj26rnxxnf4snf7xgh5gxx6wsiicy1"; name = "js-auto-beautify"; }; packageRequires = [ web-beautify web-mode ]; @@ -37684,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"; @@ -37755,8 +39422,8 @@ sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import"; - sha256 = "0hbs84sp50f7w0sn8qrskkwdi53076mv00xz3gpvf3a4nfdr7fci"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-import"; + sha256 = "0r653ls1a4kr7i7249afgfj7vz365gadfm8bc1vmqfabxn8mysd4"; name = "js-import"; }; packageRequires = [ dash emacs f projectile ]; @@ -37789,12 +39456,12 @@ js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js2-highlight-vars"; - version = "20161209.128"; + version = "20170418.1129"; src = fetchFromGitHub { owner = "unhammer"; repo = "js2-highlight-vars.el"; - rev = "15dbc583d8c2b7385f677d7ea563065fe6bfdb56"; - sha256 = "0da32ky9fg5rilb3h3s6s7v8swvnyqfwv51f55y3dhyya3n1lclm"; + rev = "e3bb177e50f76b272e8073a94d4f46be6512a163"; + sha256 = "0yy8sqkn6c7r377qr2id4z550vw1x70xjd4i7yg0g1rj7q1kg98l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars"; @@ -37810,12 +39477,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170221.1636"; + version = "20170716.1313"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "4787b5f2b8dbc1a8f8620c374402aa347e311527"; - sha256 = "0zlmadvmyl9q8qlzs1i880slr4h800qq6zgqisa45nzychx8b07k"; + rev = "b176925c4d8a21e0ed375e13cf6aa04cdf3b4a0e"; + sha256 = "0ffr8wjqqs7p54hi8wgnd61dm4cs7112j56d8q9ycfmnw0fswyxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37831,12 +39498,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20161102.1108"; + version = "20170703.314"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "5633ee969c4644bde96c7f4134b02de463f910e1"; - sha256 = "0jwirj3aaigr8d5hnb5gpi447y2yl6ashxaqcagbasy6gvdf1knc"; + rev = "17dff6480c8d0b8e4daf44d65181ebc1371d3bdf"; + sha256 = "0fs9w3110cc62a8g6dasfmxi5zsmhhvhviw8r17p63f3snga6xi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -37915,12 +39582,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "20160803.1606"; + version = "20170619.1701"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "e8ba0c03c5c10f61b8f0b3f5d531ef1d80dec9b0"; - sha256 = "1j02bg20ngarfwifdxz6al6394rjms2491xh4nlia7d6ihhhrafr"; + rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966"; + sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -37933,6 +39600,27 @@ license = lib.licenses.free; }; }) {}; + json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }: + melpaBuild { + pname = "json-navigator"; + version = "20170606.34"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "json-navigator"; + rev = "d005a253fa73ed2c6c0b3ebbc7dc41be9270c304"; + sha256 = "1dklr166p5gx5y3nzkh758wwr6jvw50c3si05m71247kirhs0f89"; + }; + 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"; @@ -37957,12 +39645,12 @@ json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-rpc"; - version = "20160427.807"; + version = "20170402.955"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-json-rpc"; - rev = "5692192d25eba1b47758272e8de9d67c9ea4aecd"; - sha256 = "0cbqhijv2zv9mhnjxadr2kbz5b6jcvciwmza22jkwds0nkn2snmp"; + rev = "e77a62012e4d6c946666eed3a17454d5c6f83367"; + sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc"; @@ -38063,13 +39751,13 @@ pname = "jtags"; version = "20160211.1229"; src = fetchgit { - url = "git://git.code.sf.net/p/jtags/code"; + url = "https://git.code.sf.net/p/jtags/code"; rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96"; sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c083b5368d0c0682e9e92fe6e027c9be0e0af0f1/recipes/jtags"; - sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jtags"; + sha256 = "1f3dw9fr31lcqmida14d9rsvy1r1b5d6ihqwdj9hbx5kv7d8jyj7"; name = "jtags"; }; packageRequires = []; @@ -38081,12 +39769,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20170210.1504"; + version = "20170710.538"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "9c36479c83039c4fc26e583bb1c4dc27de058a4e"; - sha256 = "1w9fhc8k8zxxiscpyip39rrwd2yr1xpxias16scj470mviwh7j26"; + rev = "edaaff2e971a527460f838bebc0ef679f9a571b0"; + sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -38099,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"; @@ -38148,8 +39857,8 @@ src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "9519c675e8a650f6afade7d870e925d0fb50f112"; - sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr"; + rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69"; + sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump"; @@ -38173,8 +39882,8 @@ sha256 = "1dgghswf6s7h6h04mhfnsh2m0ld8qqk70l0dq3cxhdjzqx16vnms"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4155696ed09968f432c6205cb3e677beaea42ea0/recipes/jump-char"; - sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jump-char"; + sha256 = "1r6d1vhm87zafi7rr7z8jwyz3yy7i7s4774n84jsql24j1rzzwd4"; name = "jump-char"; }; packageRequires = []; @@ -38332,15 +40041,15 @@ }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; - version = "20170203.1701"; + version = "20170418.110"; src = fetchhg { url = "https://bitbucket.com/ArneBab/kanban.el"; - rev = "4481f57aee47"; - sha256 = "1crghlq0d87kc9mwy7prifxqla4q59c2447hhhl0pxbkf3ag9si1"; + rev = "dd11d722b20a"; + sha256 = "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban"; - sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kanban"; + sha256 = "1j4qv3xcg0gk07yx3b4kayiy1n3w8yq1r78h07613iljx2ny91fz"; name = "kanban"; }; packageRequires = []; @@ -38356,8 +40065,8 @@ src = fetchFromGitHub { owner = "wsgac"; repo = "kanji-mode"; - rev = "5e9d5b72468ece11cfb81b729be6babf63ede425"; - sha256 = "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy"; + rev = "eda4f8666486689d36317db7dbda54fb73d3e3d2"; + sha256 = "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f1fb16f2f7f677d0817fd63633dd071ba2cf12/recipes/kanji-mode"; @@ -38373,12 +40082,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170304.2103"; + version = "20170710.1014"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "5995aa56c9ccbb3eb78c49daba1e77a6aed354b0"; - sha256 = "0aqmd5hkqphwv74n6y5yidhn21hl2hlnmfdm7m8wkwhcylylq6xi"; + rev = "f2df1b80dfef88d38c5fbf1b9fad96e2091126c3"; + sha256 = "0anfz9npizaghhvpcvplxsymvv9q3sl7bpiis281p8c7yhrl93h5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -38394,12 +40103,12 @@ kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "kaomoji"; - version = "20160218.20"; + version = "20170311.2151"; src = fetchFromGitHub { owner = "kuanyui"; repo = "kaomoji.el"; - rev = "cde86e7f27008dbe03230d63941a0f5bd0512c10"; - sha256 = "0vqjbv3pqlbyibqylfsqqjzkvjhdg01hlxszfblpg72fziyzcci5"; + rev = "91ab93cc7455486182d5e7f88e03d0de44c9953e"; + sha256 = "19l3r2fbp895c46cklrjfwwa5d7i959nd6jc3gk14jyi35gjypyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji"; @@ -38475,16 +40184,19 @@ license = lib.licenses.free; }; }) {}; - key-chord = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "key-chord"; version = "20160227.438"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/key-chord.el"; - sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "key-chord"; + rev = "72443e9ff3c4f1c3ccaced3130236801efde3d83"; + sha256 = "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b38ec88553f9b1dfa11b0ce82433b450eb47ebce/recipes/key-chord"; - sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord"; + sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr"; name = "key-chord"; }; packageRequires = []; @@ -38643,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"; @@ -38706,12 +40418,12 @@ keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keyword-search"; - version = "20160607.2238"; + version = "20170309.2247"; src = fetchFromGitHub { owner = "keyword-search"; repo = "keyword-search"; - rev = "d40633712cf4dbb1bdf95d8262b5a4138b29e049"; - sha256 = "0g42yr331piv3r18ymz4kb8jqmslimq3xamkyqdn702xljmb2pad"; + rev = "33682e93429027805ee7c51c5f6f608872b6f5dc"; + sha256 = "03qz2sdyrlww1xc9bkarc07pf3rk42h7jjnl0dw76ffrci1z1mj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdc51938f2300bf005e2d1b1819e0fa59e0bd7/recipes/keyword-search"; @@ -38769,12 +40481,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "20161231.1559"; + version = "20170518.2358"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "beadb20a0f436b5f3413a0dee215a20f614f070e"; - sha256 = "1ck9v01xih9ik85q46ijhl1m3ppazkr6f9fjcamxgxcwxrniwj4j"; + rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; + sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -38798,8 +40510,8 @@ sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7c3aa60be932d65929f453f1ce576abcd00252ed/recipes/kill-ring-search"; - sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search"; + sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl"; name = "kill-ring-search"; }; packageRequires = []; @@ -38840,8 +40552,8 @@ sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/12e48ea4327188da607cc6f1d25a9cba7991c2f3/recipes/kite"; - sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kite"; + sha256 = "17bpk9ycx2xkwm3j1dxi5216lbzf5lgnscs8i4y0pkpicdn0wyr6"; name = "kite"; }; packageRequires = [ json websocket ]; @@ -38878,8 +40590,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "ca9eb0bbb8e9a4b5b6e2b177b2b36ab024495587"; - sha256 = "0kzh5q1dj7mqdjcp1di0lm8imxjlp1ak8licidfy0lz4h4fcqsch"; + rev = "e4a8a4b17cb1ae073afc5df54d9fed9333f1cc72"; + sha256 = "09z298s699jk76i6yrflplhvdc77flb2qfkzbb55ngmx0ajcf2h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -38895,16 +40607,16 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20170116.503"; + version = "20170508.1802"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "edea2234a7a5267c1888dbe2271e9100bdc3f5a8"; - sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp"; + rev = "a62f9e7c17ab34b183b36ae63408123a75689a5b"; + sha256 = "0v86haw2nfd7q4yylzd0ls6916l95960c15khjnv1cfyshhri5q7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; - sha256 = "1z5gns3y7iv3lmczgxdbvg3wigkch4ljwcx7dc5f92q3ykm0zwhf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; + sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07"; name = "kiwix"; }; packageRequires = [ cl-lib emacs ]; @@ -38955,22 +40667,22 @@ license = lib.licenses.free; }; }) {}; - kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: + kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20170226.1627"; + version = "20170716.1331"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "60141505ca027231866f7032c557afd7d085b35f"; - sha256 = "1c47p9zan4cifiaz097sc3sxq04inh5rqqc22p105x0jm0hykd93"; + rev = "700ea18fdc471ce351d7e2a443572746e8b93496"; + sha256 = "09qznjadbmspm8n56rk3giyxcf79sxfxpimgn3vkdv09la1mdbb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5"; name = "kodi-remote"; }; - packageRequires = [ json let-alist request ]; + packageRequires = [ elnode json let-alist request ]; meta = { homepage = "https://melpa.org/#/kodi-remote"; license = lib.licenses.free; @@ -39008,8 +40720,8 @@ sha256 = "1vc97d3i7jh4fbpan7lfnmsm32c4gwgrg11j2vq7z3rwm42wkkyr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/692d268189740e8b540ba14ed92b07bb8b7fb399/recipes/kooten-theme"; - sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kooten-theme"; + sha256 = "1zhrjli65pn5nshz8pqn5vbsndzk2h8mhbcldq9k0mc7ki2rrdlv"; name = "kooten-theme"; }; packageRequires = [ emacs ]; @@ -39025,12 +40737,12 @@ src = fetchFromGitHub { owner = "tttuuu888"; repo = "korean-holidays"; - rev = "aed79c24e3f91d8f9508367758b18e5fa3a9eaf4"; - sha256 = "1kqbxnjmp7hxjcv8zhy9v8v6220l9vd7rgqicjln4yrjz82z4579"; + rev = "6e94c2e071069aee9ed12ebbfd9b0ad863b8c78e"; + sha256 = "1xs81yafp783sz1clb65yc9w2xlf2kmshbsjynnafqd6pfd0skps"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9453d96fb963973ff53884d31e060f1e98004acb/recipes/korean-holidays"; - sha256 = "1w8mhhc05i1b6s9vvpk73zkk5x2kxxh3aax61p54mbkhn0a5zb8r"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/korean-holidays"; + sha256 = "1yf0z9vpiwhlsnyb0fy9wf5rz6f2fzzign96zgj0zd5hwmznbmyr"; name = "korean-holidays"; }; packageRequires = []; @@ -39042,16 +40754,16 @@ kosmos-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kosmos-theme"; - version = "20170218.1121"; + version = "20170502.1150"; src = fetchFromGitHub { owner = "habamax"; repo = "kosmos-theme"; - rev = "0c7b2257ab1d8aedafcf89a43dd2112871df23b4"; - sha256 = "18n0lw6cfc56np4s3mvpdp13pnsmqhjn1izipjv1s1sgyjj04qj4"; + rev = "616456d2376a75dc31190ad65137d179fbad4336"; + sha256 = "193zwgwfnj0lyk0msa16y0dfg7asp953p3jm56d9wdacggbcraj9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/617eb74a7a2416d244acc6feaba50eeeb425bda5/recipes/kosmos-theme"; - sha256 = "0d8h64f3vsrbqw7bzsslhzvwmnfk0kid21gfch817jw7v4gp5zii"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kosmos-theme"; + sha256 = "0vj1z69hz0j7kxnzj13c4vck1qj5j1glr9lymk5ns2v8l56gakwb"; name = "kosmos-theme"; }; packageRequires = [ emacs ]; @@ -39063,12 +40775,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20160720.1339"; + version = "20170522.1524"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "9e2e4c11fe3a9e8f63ce351762a2b1ac5dbe8a75"; - sha256 = "0yzhizxb8g0zlnx97vnaqvv0pm2mx4jg7qc2hnfvc5ya02yxhc6p"; + rev = "1ed0c5589ef2d53242f767f6071dbea90c64e813"; + sha256 = "0nywyf0znaffkchca5hal1w6h7fis9pybiivz7vzrr85ppl0gzas"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -39144,6 +40856,48 @@ license = lib.licenses.free; }; }) {}; + kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "kubernetes"; + version = "20170523.1517"; + src = fetchFromGitHub { + owner = "chrisbarrett"; + repo = "kubernetes-el"; + rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; + sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; + sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9"; + name = "kubernetes"; + }; + packageRequires = [ dash emacs magit ]; + meta = { + homepage = "https://melpa.org/#/kubernetes"; + license = lib.licenses.free; + }; + }) {}; + kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }: + melpaBuild { + pname = "kubernetes-evil"; + version = "20170523.1517"; + src = fetchFromGitHub { + owner = "chrisbarrett"; + repo = "kubernetes-el"; + rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; + sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil"; + sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8"; + name = "kubernetes-evil"; + }; + packageRequires = [ evil kubernetes ]; + meta = { + homepage = "https://melpa.org/#/kubernetes-evil"; + license = lib.licenses.free; + }; + }) {}; kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; @@ -39176,8 +40930,8 @@ sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cc1cbbdd9e3291207150af7953c3d63ef8cca1c1/recipes/kv"; - sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kv"; + sha256 = "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp"; name = "kv"; }; packageRequires = []; @@ -39210,12 +40964,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20170104.211"; + version = "20170502.207"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "c77596042d4f96e1cfdc2e8a542dd30cd55227a6"; - sha256 = "0wrwx1lgy38hvp7axwkgm3a760nw8gwl1b61ll33vc4qajgp525g"; + rev = "e95334acd8a73fbe8e156f70e047014a87e92e66"; + sha256 = "0ai8gr4an4d44lgin7kdzydn2d0a98jb8mv0n9b93bq160lbmkwj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -39230,14 +40984,15 @@ }) {}; lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lacarte"; - version = "20170101.1036"; + version = "20170307.837"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lacarte.el"; - sha256 = "0xlbv4hhmg85x8i2zzbma29r5674cbmjrqwda9bjxf00wfid0a76"; + url = "https://www.emacswiki.org/emacs/download/lacarte.el?revision=41"; + sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8"; + name = "lacarte.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte"; - sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lacarte"; + sha256 = "07rxgjax6ms0knjj5qplfy0hxzfhs6iqk4ny43566zzqv86n0bhi"; name = "lacarte"; }; packageRequires = []; @@ -39291,12 +41046,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20160116.1654"; + version = "20170606.432"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d014434d5698d927dfdbd0882d974edc3fc6ac66"; - sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1"; + rev = "d976e4f0cadb2309b798540429558936f8f45889"; + sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -39330,6 +41085,27 @@ license = lib.licenses.free; }; }) {}; + lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "lastpass"; + version = "20170418.1102"; + src = fetchFromGitHub { + owner = "storvik"; + repo = "emacs-lastpass"; + rev = "ff05ae82b1073759989616caf362c85575fdfc58"; + sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; + sha256 = "0x4c9c110nqv3v6kzcxdg9a9zcg7yn1hj6ffgrbsd8c3wbrdxrlj"; + name = "lastpass"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://melpa.org/#/lastpass"; + license = lib.licenses.free; + }; + }) {}; latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-extra"; @@ -39354,12 +41130,12 @@ latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-math-preview"; - version = "20160321.2159"; + version = "20170522.1455"; src = fetchFromGitLab { owner = "latex-math-preview"; repo = "latex-math-preview"; - rev = "2c7a526a4e46f7154befc9009b131dfbab22ac03"; - sha256 = "0cxmvadkiqhvhmvmx3vvwxasw7wll8abhviss7wgizwqf4i2p3v4"; + rev = "775887a89447dd19541b121161cc02e9799d0d3a"; + sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; @@ -39581,22 +41357,22 @@ license = lib.licenses.free; }; }) {}; - ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170208.425"; + version = "20170714.1529"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "574093b4bdbf4854f7a661556ec9ebfe5a9a9611"; - sha256 = "0irxj5w6yrqbyr9js1mp3fh19cfwijd7brpvzas6j7v3fb0mf7zx"; + rev = "f4abac98adfe747c93abd4398dac3aafa33a816c"; + sha256 = "04gm8i663k9vgij0c9qqmicmq0dcxbnahjrx81agp2sqzixh6adx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; - sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; + sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf"; name = "ledger-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ledger-mode"; license = lib.licenses.free; @@ -39605,12 +41381,12 @@ leerzeichen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leerzeichen"; - version = "20151105.2228"; + version = "20170422.613"; src = fetchFromGitHub { owner = "fgeller"; repo = "leerzeichen.el"; - rev = "e67e59a0e15bc4a41006fdd9822c4b3e6d7da626"; - sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn"; + rev = "5acf9855ecb2b2cd5da4402bb48df149e7525cc5"; + sha256 = "1bx4pv51a9x8f51pjrms8jkfrpa3glwkh308svz05gnyi2g0r8hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5de7033e75bc28de6e50b2146511cdaac4542ad6/recipes/leerzeichen"; @@ -39668,12 +41444,12 @@ lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lenlen-theme"; - version = "20150307.11"; + version = "20170328.1945"; src = fetchFromGitHub { owner = "zk-phi"; repo = "lenlen-theme"; - rev = "05202458fa0a5242e5c6e4451e375f6c16920272"; - sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65"; + rev = "b8a6412c81633b10fb98ba0930f55b25071c084a"; + sha256 = "177fqqhd498v2h6wki6pgg982rp4jxhn4wrzajcqppjz4nidb1b7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/lenlen-theme"; @@ -39773,12 +41549,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170226.131"; + version = "20170508.1319"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "51ca421f52839c62c6b4ed4cc70d55701ca2afdb"; - sha256 = "08v2mx80ihcs4v2ydf4ksb5yhbsp222wwzzx26xw70icahsx67y4"; + rev = "185e19f49ad05e9d813c10d24381f3e35b8c719e"; + sha256 = "1vxfw5nqvbv12wp0015fg5cm8z1zirya4sbr1xbakc758fq5q8j3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -39791,16 +41567,19 @@ license = lib.licenses.free; }; }) {}; - levenshtein = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + levenshtein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "levenshtein"; - version = "20051013.1056"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/levenshtein.el"; - sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "levenshtein"; + rev = "070925197ebf6b704e6e00c4f2d2ec783f3df38c"; + sha256 = "1w6rhp723kn1ns7r0gcblp5q8bvncicnjjsgdangbib1a4l2xw79"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dd530e23d6de5a592faf4fec7394d052ff440a8b/recipes/levenshtein"; - sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/levenshtein"; + sha256 = "1vdbgzs7gfy89a1dzf6z5l3f5jmly1i8lb2fqi2d08qyl5rhb8bl"; name = "levenshtein"; }; packageRequires = []; @@ -39837,8 +41616,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "69a2d1d410220a688ad169366d0d20e138e264f6"; - sha256 = "0ky6dcvqprmaww5503q2y42vz5qls844xvb7yx2sl3czlm47riy0"; + rev = "446f61280f984f17d4b923150f3b5c58f520ecaa"; + sha256 = "1vnck52yj8h0zahqgxlx70h7pqk9dnd5sy3jdl92rkj0bimhqr9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -39853,14 +41632,15 @@ }) {}; lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lib-requires"; - version = "20170101.1038"; + version = "20170307.855"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lib-requires.el"; - sha256 = "03y99c1cg368c3647w8jypf2nlx26qkygrijw2vxcp4ha5v9f44z"; + url = "https://www.emacswiki.org/emacs/download/lib-requires.el?revision=53"; + sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv"; + name = "lib-requires.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b3f0d443964f98bb65f2fe8f57048fbee844f2ba/recipes/lib-requires"; - sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lib-requires"; + sha256 = "1a69qf9dlsq5r7nm32hd0srzka7crd08gl82w8hjfvdhn43n2h0c"; name = "lib-requires"; }; packageRequires = []; @@ -39977,12 +41757,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20161216.857"; + version = "20170313.1945"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "5c3bac30fea5ff74493712273a64a1a6a9f72957"; - sha256 = "18s5frmaf7d3l15by9yvr8hzgnk9fing4bjpfj53bcck2nmfd7qj"; + rev = "6b926a6fbb7288eb062b28747a32644c5c8fea4f"; + sha256 = "047y75wkqiv1vlrgg6fy78xsfms14drfwmil2sb7j5p5p0cw5xc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -40133,8 +41913,9 @@ pname = "lispxmp"; version = "20170110.1508"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lispxmp.el"; + url = "https://www.emacswiki.org/emacs/download/lispxmp.el?revision=17"; sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr"; + name = "lispxmp.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp"; @@ -40150,12 +41931,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170302.1031"; + version = "20170707.949"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "8794864744151b808c0f966b29c33c547be96d89"; - sha256 = "0ii8092148a5mi59ssnl9hxzjx861vpb6ajma4anpzfjlv9wjjq7"; + rev = "7cf7bda344f015750e89719209a49f5991bfdffa"; + sha256 = "1h4129la499b3x3bz72s5c6bc8i7nvyh2kzxg7ff1h8xnwf1rcp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -40192,12 +41973,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20170205.1833"; + version = "20170515.807"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "3ba91c5908484188971e952d98256139123c4cbe"; - sha256 = "15zfpa2bd80537vcmlp4i39rpxvn6396wynh7sa9yiwrnq246sj6"; + rev = "92e22ed9f70e0ae2c68736fc8d91240af36102e1"; + sha256 = "0gz9z6dsslrx8fgzgy98y3mcpcs00k10hygrw8rbrdf2q8k2xpcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -40259,6 +42040,7 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/list-processes+.el"; sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a"; + name = "list-processes+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d508d50d89c914c53211197afc758fc0e1154081/recipes/list-processes+"; @@ -40299,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"; @@ -40397,6 +42179,27 @@ license = lib.licenses.free; }; }) {}; + literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "literal-string"; + version = "20170301.730"; + src = fetchFromGitHub { + owner = "joodie"; + repo = "literal-string-mode"; + rev = "2ca4fc08b8e19e6183b1f1db747bb0a4aa4f98eb"; + sha256 = "0wcz0lid05gnlmxpxm4ckw07cnxwjkyw6960nq7pylbjpg76g5ng"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string"; + sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn"; + name = "literal-string"; + }; + packageRequires = [ emacs markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/literal-string"; + license = lib.licenses.free; + }; + }) {}; literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "literate-coffee-mode"; @@ -40408,8 +42211,8 @@ sha256 = "1gm89azjgsdg0c7z9yprpjbph211c5jnqv11pkf1i1r1wzx0wanj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a20410e916d45e5b243e7eb3bb2226c7e1e67b00/recipes/literate-coffee-mode"; - sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode"; + sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64"; name = "literate-coffee-mode"; }; packageRequires = [ coffee-mode ]; @@ -40450,8 +42253,8 @@ sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/833e549ba618e58d9cb0b6768a08c651ad8c9e0a/recipes/live-code-talks"; - sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks"; + sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm"; name = "live-code-talks"; }; packageRequires = [ cl-lib emacs narrowed-page-navigation ]; @@ -40463,12 +42266,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170225.2207"; + version = "20170716.827"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "0c253d6547008202c20eba2cb5649dd1f44b3126"; - sha256 = "02wrf9mih1dx2xgzwc5465gb8ylm4i3y84x0y0bv1pk420y4iiav"; + rev = "d4a0708e2bac6492355c675717e458f88b7fab63"; + sha256 = "1fr8kwm6m3k57s55gfn3sjh6zb9hj57rqnygwq8klyvi5ydh9w9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -40502,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"; @@ -40550,8 +42374,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "c7849f87280d549f3829a2c2fe4cd911c421a0db"; - sha256 = "1anp1avlzl7xf2zhj9b8ixhwxmvprbiis7nmdnh9nq1xkpfjlmxm"; + rev = "325ccf1c3d92533f8bc5c48d741d3aa23a6b2542"; + sha256 = "05cz8jwkidwkzggifccl51daw6vbcy1fgnlwm27ppy933y306xyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -40567,12 +42391,12 @@ load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "load-relative"; - version = "20160716.438"; + version = "20170526.310"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "8280df5ce6db836559a5c2442b97a2f02b6f7a05"; - sha256 = "0jzq3vpdq5cw5nh2l2pvj0y3lnvjff2wyy6ip2z9n6xcjjdnzki9"; + rev = "738896e3da491b35399178ed2c6bc92cc728d119"; + sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -40648,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"; @@ -40672,12 +42517,12 @@ log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "log4e"; - version = "20150105.505"; + version = "20170401.604"; src = fetchFromGitHub { owner = "aki2o"; repo = "log4e"; - rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb"; - sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"; + rev = "34309972ad02abcebbcff6b1682731978aef030c"; + sha256 = "12zk40gqrh86m50y777kprkwz75vbcm0q1a9narzcs2lnpwc8g4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e"; @@ -40695,13 +42540,13 @@ pname = "log4j-mode"; version = "20160108.1118"; src = fetchgit { - url = "git://git.code.sf.net/p/log4j-mode/code"; + url = "https://git.code.sf.net/p/log4j-mode/code"; rev = "26171b1e723502055e085393b0ecdcb6db406010"; sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39321e054925a8de854942fec4ed8e7570099fc6/recipes/log4j-mode"; - sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/log4j-mode"; + sha256 = "0311jb47fjji8dqy98anr487f7vnvi85p4mn5ymqvxs5c6972gms"; name = "log4j-mode"; }; packageRequires = []; @@ -40742,8 +42587,8 @@ sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/logito"; - sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito"; + sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl"; name = "logito"; }; packageRequires = [ eieio ]; @@ -40755,16 +42600,16 @@ logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logstash-conf"; - version = "20150308.518"; + version = "20170524.1229"; src = fetchFromGitHub { owner = "Wilfred"; repo = "logstash-conf.el"; - rev = "60a06ad1ceb6699cef849e9f2e8255f7816ca5de"; - sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa"; + rev = "4e127f9aec190786613445aa88efa307ff7c6748"; + sha256 = "119yb1wk1n5ycfzgpffcwy7yx8ar8k1gza0gvbq3r61ha5a9qijs"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/eba82cc626f52e18c7ba9062d7ac648085e79914/recipes/logstash-conf"; - sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logstash-conf"; + sha256 = "0djf2kl6jypxlfss4x8ij670v733vid1vbyg6yd96pc9781v3zrm"; name = "logstash-conf"; }; packageRequires = []; @@ -40776,12 +42621,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170303.1225"; + version = "20170705.1217"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "6409991053350ab2d3def61749b92780dd1ed095"; - sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -40836,16 +42681,19 @@ license = lib.licenses.free; }; }) {}; - look-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + look-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "look-mode"; version = "20151211.1026"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/look-mode.el"; - sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "look-mode"; + rev = "d65f75e8ea24eff2ac31c53b4835b45127eedd56"; + sha256 = "1adzlviy928wsqx9fvxi71rwv89zyydqmf5g0wrlx66r0ksw3793"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/245ded3ee787da7ad5f462fc6f519a963485adb5/recipes/look-mode"; - sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/look-mode"; + sha256 = "0nhhz5s423g4kqqh0vy8k0696r0myhjfv84p2vciliky9gv1wkig"; name = "look-mode"; }; packageRequires = []; @@ -40861,8 +42709,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "loop.el"; - rev = "30c43568fca7688a70dc0e2e6f72738ee2d4f1fc"; - sha256 = "1vdfvndc967kagqzswxydcjp14hmfh8gfbm7i9000wb0pi8rpbdg"; + rev = "e22807f83a0890dc8a904c51ee0742c34efccc6c"; + sha256 = "1c89hsi0h783s96d322mvqwlf00ndm2qnrc165wpxrdbns38kbbv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop"; @@ -40917,27 +42765,132 @@ license = lib.licenses.free; }; }) {}; - lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }: melpaBuild { - pname = "lsp-mode"; - version = "20170302.1127"; + pname = "lsp-go"; + version = "20170709.1021"; src = fetchFromGitHub { - owner = "vibhavp"; - repo = "emacs-lsp"; - rev = "03f1bd56317557c398851757893522f25908cc7f"; - sha256 = "1xmmh4a23naa7ipd673q52hv31wmi1j20sh5kcgw14r3pqymd8dh"; + owner = "emacs-lsp"; + repo = "lsp-go"; + rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf"; + sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode"; - sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; + sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c"; + name = "lsp-go"; + }; + packageRequires = [ go-mode lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-go"; + license = lib.licenses.free; + }; + }) {}; + lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-haskell"; + version = "20170421.328"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-haskell"; + rev = "c22e6f4a70156e615e303d623e75362d3b14bcf4"; + sha256 = "1iv1y1pri313m5h59a06cydj8kkzy6ig4mi3hnzz5nxkcynd2whz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; + sha256 = "0pdcxnfp8ng24bfk695wpx5wcdqnjrjsfpks0xicih3mcdm1x9l8"; + name = "lsp-haskell"; + }; + packageRequires = [ haskell-mode lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-haskell"; + license = lib.licenses.free; + }; + }) {}; + lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-java"; + version = "20170522.633"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-java"; + rev = "ba797f9588944ae917ccbfa15c40ee1e427ea6e5"; + sha256 = "0plccx57j85b53s8nmhkcw8h1hznm147v3ajhzx2j1adbb2j0h3f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; + sha256 = "1y5wxggkr7v4a2a3h2n01911gd1xv047dikbvyy1gappf05fdngj"; + name = "lsp-java"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-java"; + license = lib.licenses.free; + }; + }) {}; + lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "lsp-mode"; + version = "20170629.33"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-mode"; + rev = "3e93b3fd754931cfd122855659afbd070d844bac"; + sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; + sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; name = "lsp-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs flycheck ]; meta = { homepage = "https://melpa.org/#/lsp-mode"; license = lib.licenses.free; }; }) {}; + lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-python"; + version = "20170430.443"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-python"; + rev = "5e032b39d74e63dee9157bf967f3902caa8524fa"; + sha256 = "1rhk6hlcvvg9yqy3x9fx8qdvhyf2aih2k6m4x5cr80mzvczmxl31"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; + sha256 = "0x8cyvkwp4znliiwf3qfrhnk80h8n1jfyyq0n5yfccsgk7gpm8qx"; + name = "lsp-python"; + }; + packageRequires = [ lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-python"; + license = lib.licenses.free; + }; + }) {}; + lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }: + melpaBuild { + pname = "lsp-rust"; + version = "20170421.326"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-rust"; + rev = "bd9b1f5d9195067decc496e61ad383d615b7f054"; + sha256 = "1nai41wv3wfxx2lslkpm0qas73j6hachiqwbvhvvcfz34h9nnc5l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; + sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; + name = "lsp-rust"; + }; + packageRequires = [ lsp-mode rust-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-rust"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; @@ -40946,7 +42899,7 @@ owner = "immerrr"; repo = "lua-mode"; rev = "652e299cb967fccca827dda381d61a9c144d97de"; - sha256 = "1had9sj3pbbmdb66mw1dxs7i866ck0af7pak3wi6213v5vip7w6b"; + sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -40959,22 +42912,22 @@ license = lib.licenses.free; }; }) {}; - luarocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + luarocks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "luarocks"; - version = "20170226.1430"; + version = "20170430.1605"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "luarocks.el"; - rev = "29fb50ec6ec1943b54b5a4810c3249bccee249ce"; - sha256 = "19ailxb0jlvkl5ljvbpddd1862j8x9vf767lfrby89s09fjxwfcp"; + rev = "cee27ba0716edf338077387969883226dd2b7484"; + sha256 = "0rdsjmmi95agb859997qdhbk0dns2jyx2mlg8rync58wna70nmbn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks"; sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x"; name = "luarocks"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/luarocks"; license = lib.licenses.free; @@ -41064,22 +43017,22 @@ license = lib.licenses.free; }; }) {}; - m-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "m-buffer"; - version = "20160721.1539"; + version = "20170407.1441"; src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "9c45387989bd7d813f15e56ac5d3210f5e44b1c6"; - sha256 = "1hiasrn3irxg7s413c34zxknml6fsy3yyykkv2lidk19npy6fslh"; + rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57"; + sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; name = "m-buffer"; }; - packageRequires = [ emacs ]; + packageRequires = [ seq ]; meta = { homepage = "https://melpa.org/#/m-buffer"; license = lib.licenses.free; @@ -41096,8 +43049,8 @@ sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/17df4dccdffff6ef7b4900565ae64c1cf84c1fda/recipes/macro-math"; - sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math"; + sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn"; name = "macro-math"; }; packageRequires = []; @@ -41108,10 +43061,11 @@ }) {}; macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "macros-plus"; - version = "20151231.1419"; + version = "20170307.842"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/macros+.el"; - sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d"; + sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p"; + name = "macros+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+"; @@ -41135,8 +43089,8 @@ sha256 = "1fm40mxdn289cyzgw992223dgrjmwxn4q8svyyxfaxjrpb38jhjz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/362b5cb71e81172bc654594c08a5d0b91262851a/recipes/macrostep"; - sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep"; + sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2"; name = "macrostep"; }; packageRequires = [ cl-lib ]; @@ -41211,12 +43165,12 @@ magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magic-latex-buffer"; - version = "20161231.2300"; + version = "20170530.1705"; src = fetchFromGitHub { owner = "zk-phi"; repo = "magic-latex-buffer"; - rev = "49a9ac6aff0a45aa6630dc0044533b7b3d3be7ad"; - sha256 = "1r9zq16n546xd9i27kiifdl7mwld8jk88rll2h0lbd77ir6wdlfm"; + rev = "c03277d5619d9adcd871f3e6480a1a27985810cb"; + sha256 = "065xfj6asw7px4xmh5isbfs0y6m6818lrds1ca45rhkyfw98d2sb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer"; @@ -41232,12 +43186,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170306.44"; + version = "20170711.1307"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f565039fd318ad5a90cd3c779785f25f540c652"; - sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr"; + rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5"; + sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -41260,12 +43214,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170211.1601"; + version = "20170702.832"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "2437efb93767b352eecf27f5d5e3513e34a395ca"; - sha256 = "1pmsbl8jh3dgs42k7b0a9ya1ywwy5435pshplc23z33i7qplva9f"; + rev = "2aa23cd169166e92be3e874c723ff224a9d42c15"; + sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -41365,12 +43319,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "20160809.1335"; + version = "20170425.128"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "a2b7b85134784317445faee13d647fb62401ea23"; - sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p"; + rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b"; + sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -41383,15 +43337,36 @@ license = lib.licenses.free; }; }) {}; + magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-lfs"; + version = "20170312.1524"; + src = fetchFromGitHub { + owner = "ailrun"; + repo = "magit-lfs"; + rev = "799282fce73b668d2cf6e4fa87f889fec8e25333"; + sha256 = "11wv3j8b377sbfj1qhcr6rn05ns728ifrigjk7r60rd34lwyc8c4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a92f0963d8df3e299a999948828173dac38a612/recipes/magit-lfs"; + sha256 = "1im9skj74jdi7jh0fnyyk8a4g4sk48clgn107ggf69lnfpxh8xxa"; + name = "magit-lfs"; + }; + packageRequires = [ dash emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-lfs"; + license = lib.licenses.free; + }; + }) {}; magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }: melpaBuild { pname = "magit-p4"; - version = "20160627.447"; + version = "20170414.546"; src = fetchFromGitHub { owner = "qoocku"; repo = "magit-p4"; - rev = "9c5ef8bbe70c916bc3742025ce0098e3bdf7be6e"; - sha256 = "12avgqcm7za16m84sx2gnrf6y87gj8g4lxk4hld98myxkvfp04zc"; + rev = "ef23e89dc504970e78ac9b158731a3eda7d6d7ee"; + sha256 = "1gld0x4y4jshyfr0q8k5icjpgmfrbcfir13sysgzqjz9ssyn2bi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4"; @@ -41407,12 +43382,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170214.347"; + version = "20170709.510"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f565039fd318ad5a90cd3c779785f25f540c652"; - sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr"; + rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5"; + sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -41428,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"; @@ -41488,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"; @@ -41509,22 +43505,22 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20170214.1710"; + version = "20170516.612"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "0b5207f3097dee40feefea916cdf211734c9fe32"; - sha256 = "143iwmga1ypa6v9086pcfr3n5jvaf1dl9czlld5y7npm4r0pxnbr"; + rev = "7fd7343c3c87df56c7c7dd6c41a80b14291b1ac4"; + sha256 = "0a0q94lvk0rzj4r7hchypp197rj561d2a28jfzrfvvhq6x9vb4im"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; - sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; + sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; name = "magithub"; }; - packageRequires = [ emacs git-commit magit s with-editor ]; + packageRequires = [ emacs ghub-plus magit s ]; meta = { homepage = "https://melpa.org/#/magithub"; license = lib.licenses.free; @@ -41659,12 +43655,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20170304.348"; + version = "20170328.216"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "af83a1be2bb800ebee4ab378f167075537eeb7ec"; - sha256 = "1zbjaixbrhs39fmf58mxqmwlby531gfxzn2s8s10rm0m6sswbzii"; + rev = "1f2015cb131d69ffd7994dcc153abef969999027"; + sha256 = "0brqh1dis4ahxxa4q8zsqr039l6k7arxkji4bx9yh65aimp8ckcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -41677,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"; @@ -41722,16 +43739,16 @@ malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: melpaBuild { pname = "malinka"; - version = "20160615.1348"; + version = "20170628.151"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "7a5c6e61462d2d76edcf9231d3cb70a63509269e"; - sha256 = "19ypnqrdxragnhdxfraxrinbsiamwpmgqgjj35crjnifdcj6lqzz"; + rev = "b8ec090cb57a78265650586f71f00c4c9e054e27"; + sha256 = "0wii0ylgdci69r1zjcrk7bh68dl25ry63cfwgdii9x217lmbn9qw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/909a2d78f49a11e3f90e7d3c7f8af55e15113442/recipes/malinka"; - sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; + sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y"; name = "malinka"; }; packageRequires = [ cl-lib dash f projectile rtags s ]; @@ -41835,8 +43852,8 @@ sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/67fe789d7d3ccf3eb0bbd1982f7d2c506a47bbdb/recipes/manage-minor-mode"; - sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/manage-minor-mode"; + sha256 = "0ljdca9b08dw0kx679jmq0wc484xcpbmzwx8zkncw642pnbj9q0j"; name = "manage-minor-mode"; }; packageRequires = [ emacs ]; @@ -41856,8 +43873,8 @@ sha256 = "1spj3mlydwnngccrny27p8s3m75n039hipqvzqskdg7p1hvr6m59"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/216a33a3acecb226c6b638a9e30ec4c741779a29/recipes/mandm-theme"; - sha256 = "1qhxzhv63hk81dff6w06cghir856ck6wn1zba6736qn4phbka7ja"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme"; + sha256 = "0mvzn29ljd3az6axyqq88vkkf1vpcvslc1svlnbyrpdfinphd0mx"; name = "mandm-theme"; }; packageRequires = []; @@ -41869,12 +43886,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170301.1511"; + version = "20170614.306"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "b360948acf5a31b6cf6f0113ab5f30bc47f6b098"; - sha256 = "016h6mq0650fw8ix1zh1j15i782g0bpmlsnsznzi5aspy8b391kn"; + rev = "01255150a80ada47bf3708daa93069ac3011831f"; + sha256 = "1djlzcg6dl29rifdss3cy0g3xmscblqvkfwzykiqs2y7vl51r60b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41887,6 +43904,35 @@ license = lib.licenses.free; }; }) {}; + mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }: + melpaBuild { + pname = "mandoku-tls"; + version = "20170611.6"; + src = fetchFromGitHub { + owner = "mandoku"; + repo = "mandoku-tls"; + rev = "e21205ca9c1c053801190f291d6583ce057e8a65"; + sha256 = "0yd33hflm1da61mc54y7yaaxb6y8gzv00n4ghcqn6rp4vlmi6534"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/mandoku-tls"; + sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz"; + name = "mandoku-tls"; + }; + packageRequires = [ + emacs + github-clone + helm + helm-charinfo + hydra + mandoku + org + ]; + meta = { + homepage = "https://melpa.org/#/mandoku-tls"; + license = lib.licenses.free; + }; + }) {}; map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "map-progress"; @@ -41936,8 +43982,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "marcopolo"; - rev = "e53ee8a0822d092d8669d75138f6d73f46d076f9"; - sha256 = "1hhqgwx65489rdq9qd8v0dpcnwicfr772j3i4k8cmnn2lkr3fmm8"; + rev = "9193aabdf12223087b5ed58f1507d5d8a24a4381"; + sha256 = "1yc0sgzh1qprhdrzjqc88d6g4xvw80fblcvjl6yn6kihv1ymz091"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo"; @@ -41995,12 +44041,12 @@ markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "markdown-edit-indirect"; - version = "20170210.1504"; + version = "20170607.1244"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "markdown-edit-indirect.el"; - rev = "980d8bf3a123a72aef18f608e99be3472be100c3"; - sha256 = "1idsh6gsm7kaz7i8kv3s326qxnd2j3nmwn8ykbnfwracm6him3qf"; + rev = "a789320354eab2b2275a308c38b1390e6d2cc41b"; + sha256 = "067rp6h2wax242zmykz5iv2v30cj327dh9vz6c69im02lsn65ib3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect"; @@ -42016,12 +44062,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20161222.1416"; + version = "20170712.1703"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "df4ac404ce92abdf1a0b78da8ef1675f1cd1f196"; - sha256 = "1k5bxqbcz174b6g3av6hr2q828bybinq96avab0561zqwqxlhkql"; + rev = "ea5549233b3ce1536dae3a4793df79971a3781da"; + sha256 = "1gm76j4w0fv7194dkhky5pxrrwysi4n0n0v0dnl6wp079irc7kcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -42037,12 +44083,12 @@ markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "markdown-mode-plus"; - version = "20120829.510"; + version = "20170320.1404"; src = fetchFromGitHub { owner = "milkypostman"; repo = "markdown-mode-plus"; - rev = "f35e63284c5caed19b29501730e134018a78e441"; - sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r"; + rev = "411d079f4430a33c34ec0bbcb1535fe1145a2509"; + sha256 = "0427cxvykmz8kz1gnn27yc9c4z8djyy6m9qz6wbd4np1cgqlmly2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/markdown-mode+"; @@ -42083,8 +44129,8 @@ src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "65f48df07c87d37275cc6a135741df4b585f1836"; - sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f"; + rev = "50e5baed5ca3a1d2fed08f32802976a5ed358fed"; + sha256 = "1p1npnhlh99m9pxvd1jhbzn9dxhg5fjml1bw8yakrv7k1h6zwrd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; @@ -42107,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"; @@ -42132,8 +44178,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-markdownfmt"; - rev = "af83cd00fafcaa837ffdb50d1fa2b0ac952f16c0"; - sha256 = "1alkjvs21wlai742qgcm0bgf3z3c0f10xgalz48gi4vmwn6in7r7"; + rev = "187a74eb4fd9e8520ce08da42d1d292b9af7f2b7"; + sha256 = "01rxl997rb7f71mbvygavsxaq2vr17f2nnpbg7i551lg82xrsbb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16cee5fe003e3afc7daf6858ed83843b52e44901/recipes/markdownfmt"; @@ -42146,22 +44192,22 @@ license = lib.licenses.free; }; }) {}; - markup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markup"; - version = "20130207.1309"; + version = "20170420.429"; src = fetchFromGitHub { owner = "leoc"; repo = "markup.el"; - rev = "5ff4874ce897db146f5fd2b3d32147a0d404e1e5"; - sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi"; + rev = "876da2d3f23473475bb0fd0a1480ae11d2671291"; + sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup"; sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf"; name = "markup"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/markup"; license = lib.licenses.free; @@ -42178,8 +44224,8 @@ sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/markup-faces"; - sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces"; + sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9"; name = "markup-faces"; }; packageRequires = []; @@ -42251,6 +44297,27 @@ license = lib.licenses.free; }; }) {}; + mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mastodon"; + version = "20170619.1050"; + src = fetchFromGitHub { + owner = "jdenen"; + repo = "mastodon.el"; + rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318"; + sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; + sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i"; + name = "mastodon"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mastodon"; + license = lib.licenses.free; + }; + }) {}; material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; @@ -42319,13 +44386,13 @@ pname = "matlab-mode"; version = "20160902.459"; src = fetchgit { - url = "git://git.code.sf.net/p/matlab-emacs/src"; + url = "https://git.code.sf.net/p/matlab-emacs/src"; rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0"; sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e384608df76bb3e91bd1405e3a5029181ff94e/recipes/matlab-mode"; - sha256 = "1bybc5xv5hbjh8afmh03qda5g3m2wcgsk6lgj6jkyyxzdfxqkrck"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode"; + sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28"; name = "matlab-mode"; }; packageRequires = []; @@ -42334,26 +44401,6 @@ license = lib.licenses.free; }; }) {}; - matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }: - melpaBuild { - pname = "matrix-client"; - version = "20161004.1933"; - src = fetchgit { - url = "https://fort.kickass.systems/git/rrix/matrix-client.git"; - rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d"; - sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/adeaf97d285120d7b20f1f7a21cb89eb3c40b3b6/recipes/matrix-client"; - sha256 = "05q1ggiq4nldcklpv2hndg1nx8jxl6qgi5jjc3kz736x7syb0j34"; - name = "matrix-client"; - }; - packageRequires = [ json request ]; - meta = { - homepage = "https://melpa.org/#/matrix-client"; - license = lib.licenses.free; - }; - }) {}; maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maude-mode"; @@ -42407,8 +44454,8 @@ sha256 = "0kh8yk1py9zg62zfl289hszhq3kl3mqmjk6z5vqkw3mcik4lm69g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe"; - sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe"; + sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8"; name = "maxframe"; }; packageRequires = []; @@ -42419,10 +44466,11 @@ }) {}; mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-depth-plus"; - version = "20170101.1046"; + version = "20170307.844"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mb-depth+.el"; - sha256 = "1sk8x91gxwk17kv7whwfh9szxmgyy9ys1h4hx17hyzlvhz9smncg"; + sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9"; + name = "mb-depth+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+"; @@ -42501,12 +44549,12 @@ mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbsync"; - version = "20170303.206"; + version = "20170320.503"; src = fetchFromGitHub { owner = "dimitri"; repo = "mbsync-el"; - rev = "8e34a059445b70a18ee5546921385d1636aeda09"; - sha256 = "1w1kjpi2gnhmvkay71q2rkc92bcibdrdjx8r7p979sds5pgaq332"; + rev = "046a745ea1ea85152e27efd4c83fd3487aacffaa"; + sha256 = "1s5zxv4qvy2lqh090lb2bc61y4y67mr22j0b02y69wd61s1w3ppx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync"; @@ -42564,12 +44612,12 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20170113.1308"; + version = "20170418.1035"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9"; - sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa"; + rev = "e1adf088e621c3446d04cb2222756edcb03eb363"; + sha256 = "00yh92g9if4vgh2qzgf9ji8k88gj9k2k9ap055r4mlg3fcyf1r4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; @@ -42585,12 +44633,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170228.1746"; + version = "20170628.2045"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9"; - sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -42719,8 +44767,8 @@ sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1b47649b529080e114f34a83dfb2e177c8b815a5/recipes/memolist"; - sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/memolist"; + sha256 = "0nvp38qbzcl6dcayjndw32d3r9h8vf2n29i678s1yr280ll8xw6w"; name = "memolist"; }; packageRequires = [ ag markdown-mode ]; @@ -42752,10 +44800,11 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20170101.1047"; + version = "20170618.1417"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "0s460zm9k8b76vih5wgyrg8a7w5alwd43ia00mp110ipq2sy9pd2"; + sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw"; + name = "menu-bar+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; @@ -42775,8 +44824,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805"; - sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q"; + rev = "957e551140587f0cd83d9186a06fba10a38c6084"; + sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -42789,12 +44838,34 @@ license = lib.licenses.free; }; }) {}; + meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "meson-mode"; + version = "20170501.1310"; + src = fetchFromGitHub { + owner = "wentasah"; + repo = "meson-mode"; + rev = "af09db99891c3d19353150e26338c191525711aa"; + sha256 = "1rqccn3j7rm9nncxiq6m4wcx2wxkck5j02phyij8s0dc820bzlhz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode"; + sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80"; + name = "meson-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/meson-mode"; + license = lib.licenses.free; + }; + }) {}; message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "message-x"; version = "20151029.718"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/message-x.el"; + url = "https://www.emacswiki.org/emacs/download/message-x.el?revision=9"; sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf"; + name = "message-x.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bf124ec30fa5551b31c0e0d39be234f19e2e81/recipes/message-x"; @@ -42818,8 +44889,8 @@ sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/275d537d9dab56e21d0d6d25a287ae9cbcc26d98/recipes/messages-are-flowing"; - sha256 = "0shqldzd2421ii42briqfbgf7nws54d1ajx6xw8iax8q1yqv4g8q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing"; + sha256 = "0v74b7cjj87kncndxfpfs6dcc4jcl18wpbirffl7dw6mac2anw6m"; name = "messages-are-flowing"; }; packageRequires = []; @@ -42831,12 +44902,12 @@ meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "meta-presenter"; - version = "20160924.2206"; + version = "20170425.1934"; src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "0b7f3d47e34fdd0c150da55e58ec2bfc274930a8"; - sha256 = "06s93i46rm91i23in51mf7ynl37c90f2gl52ykv48p41dyv1kg6v"; + rev = "e882ac7f7658dd9507aca0ff88c88fcf74618252"; + sha256 = "0h8zg2nvb0yn0z8xv1101r8rjxgs05k08j3n71inr7n118sa98bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -42849,27 +44920,6 @@ license = lib.licenses.free; }; }) {}; - metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "metafmt"; - version = "20160221.855"; - src = fetchFromGitHub { - owner = "lvillani"; - repo = "metafmt"; - rev = "b624ba1ac46cdbeddb0cfe920dd44dcab3fdb529"; - sha256 = "1r4v06pyi7y7gp3w0p3xfz8hf807p7i4frgws54naagzihww06y6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a53f740fb7a58cd6339b301d0de8c543b61f6a5/recipes/metafmt"; - sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75"; - name = "metafmt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/metafmt"; - license = lib.licenses.free; - }; - }) {}; metalheart-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "metalheart-theme"; @@ -42915,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"; @@ -42936,12 +44986,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20161224.1535"; + version = "20170508.22"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "8138c83339071884a2d6c5365a088ba8da4a0fc0"; - sha256 = "0yvqarinibrg7f362gg1i3r2wgjmzzv0j71zcrp9id30gfwbs6z3"; + rev = "7ea2baefff668263bf011c72879c2aa88125f2de"; + sha256 = "1i7i600hj76ggn1jwlj8r60kf157pxj88a4wwp1lasz91wp6msdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -42978,12 +45028,12 @@ mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20160526.18"; + version = "20160704.633"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "81c63fbd49d8267124fbfc775dc7cf06d2ebf7a0"; - sha256 = "1gvwcgxj7f9a8zrp01mcbj07692kg1pi8fi2srwg09jls4j84xnb"; + rev = "d5f7c5abe90831248581c26ef3abfec70b2c2b9c"; + sha256 = "0f5ilbl6dc5hf9s4lfp027qjdlwd0kzb7sni7lda6v5597vhsnb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -43049,8 +45099,8 @@ sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4b5e2bcc637cea31166fbd98a2ca42591a6e3c57/recipes/midje-mode"; - sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode"; + sha256 = "16g57mwkm3ypnyqniy1lj9nfn5wj7cyndb5fhl3fym773ywn6hip"; name = "midje-mode"; }; packageRequires = [ cider clojure-mode ]; @@ -43145,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"; @@ -43296,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"; @@ -43313,12 +45363,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20151214.558"; + version = "20170708.358"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "98064f098e6871382614fcf3c99520f7a526af0a"; - sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c"; + rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5"; + sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -43335,8 +45385,9 @@ pname = "minor-mode-hack"; version = "20141226.1220"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el"; + url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el?revision=10"; sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0"; + name = "minor-mode-hack.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df182bfd8272f3ded761c90826c8cfe6bfd1a48b/recipes/minor-mode-hack"; @@ -43373,12 +45424,12 @@ mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mips-mode"; - version = "20161008.212"; + version = "20170310.2149"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "8857384be127b55bd7a20437e4592d8a0175ebc7"; - sha256 = "0z9zlij7w51iz1ds7njvg8g2mqp80vi65fmxr67rhbfsb7i568cl"; + rev = "a13d1fc5b583a29f059f7794f2d83e59da439fa1"; + sha256 = "0ncvp52dnicy84wmnbxhm6djxhc8njrbxy6zwz2vylmy24z9948w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -43393,10 +45444,11 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20170113.904"; + version = "20170307.847"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "05ymqzikn16538iqjiwyhwhqzshx9kx9v8amarb8ybr96l1ci4bz"; + url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=103"; + sha256 = "1w58z2j95sycgkakgb9anlc3q73v77whspi9a4j1kf6lmcbpyms8"; + name = "misc-cmds.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -43411,10 +45463,11 @@ }) {}; misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-fns"; - version = "20170101.1050"; + version = "20170307.848"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/misc-fns.el"; - sha256 = "0q5if5p0yy2b3h93lsrhy7z8f5mjmm3kkh1ql94jng4a0hl64jqr"; + url = "https://www.emacswiki.org/emacs/download/misc-fns.el?revision=50"; + sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm"; + name = "misc-fns.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns"; @@ -43438,8 +45491,8 @@ sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/537bf6c5d5eedaea84806aadccbcec92387fec7a/recipes/mkdown"; - sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mkdown"; + sha256 = "034bwwgh0w1dwawdx2nwn4d6wj65i58aqlvi60kflijfn8l3inr3"; name = "mkdown"; }; packageRequires = [ markdown-mode ]; @@ -43451,12 +45504,12 @@ mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-jinja2"; - version = "20170128.416"; + version = "20170313.720"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "mmm-jinja2"; - rev = "f39a9bfe9e3001b0141ed3d6a156fbb60a76e25c"; - sha256 = "0p83i4ikd1bj4r0hahwnlj2gliwcgfql5rzvv7phl3nhjinclj55"; + rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f"; + sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; @@ -43513,12 +45566,12 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "20161231.1556"; + version = "20170519.4"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "66adeeeccc52121fae7350698c11583b31cbb5c3"; - sha256 = "01s1i7cc653yzxdmnlamz177sjlgjbknmz717kvrwd6wixgn2p08"; + rev = "1d89502ea4b0f6a7da327a95f104f5c11e662493"; + sha256 = "1pqarm9gpzc5qyiqr2713q1xn1p20kl5shrmm77m150z4qfhxzhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -43597,12 +45650,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20161214.839"; + version = "20170712.907"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "23831bab8290a90e9253b648176d99385a438568"; - sha256 = "0v8d0605c31x1crjhgr73x5372rhxlrbap29j0j3zlbv0shd39v7"; + rev = "60189c67a4800059411f71ca800d911240e8d22e"; + sha256 = "1hqyy7piaara1hgba2jys923y395kpcf6i312zaw472ksixqhw7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -43660,12 +45713,12 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "20161231.1639"; + version = "20170519.32"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "1831129c063fbef5f5378389281ecccca095b9e8"; - sha256 = "0jyczwam7xipw2qrk27wph3j4jd9gbkawvnsiad5xr1h9d019a41"; + rev = "f2b2e206105332620b97c1f3bfd6cb03469db98f"; + sha256 = "09wg7hbigk3084nvjw0ikfs9hgdp1ip0spmrsx70iq18xgv5fm37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -43722,14 +45775,15 @@ }) {}; modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-char"; - version = "20170101.1054"; + version = "20170307.854"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/modeline-char.el"; - sha256 = "0y5bjny8j9lvf94rfk3nrwdfmbp24i1b96909xpifn3l1r1xl6qr"; + url = "https://www.emacswiki.org/emacs/download/modeline-char.el?revision=8"; + sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d"; + name = "modeline-char.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char"; - sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/modeline-char"; + sha256 = "0ksi5vfcwbyhgpp59qdl7l536zw2rd33xf4r2gihcx2g2k52h2w9"; name = "modeline-char"; }; packageRequires = []; @@ -43740,10 +45794,11 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20170227.1124"; + version = "20170307.856"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "0glwnfgch9li5z6051ia3f61csl3f6aa1cwkwmw9w7saw4d6q3m1"; + url = "https://www.emacswiki.org/emacs/download/modeline-posn.el?revision=43"; + sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm"; + name = "modeline-posn.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -43759,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"; @@ -43851,8 +45906,8 @@ sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/886da7cd20f8fe5a4dc6a49390f54145f6023d77/recipes/mongo"; - sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mongo"; + sha256 = "0jb5m611m7w26wgfwijgy0dn65s7p1y6fdcfpfgpxa7j5vrcxasc"; name = "mongo"; }; packageRequires = []; @@ -43924,15 +45979,36 @@ license = lib.licenses.free; }; }) {}; + monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monokai-alt-theme"; + version = "20170630.1348"; + src = fetchFromGitHub { + owner = "dawidof"; + repo = "emacs-monokai-theme"; + rev = "f342b6afc31f929be0626eca2d696ee9fab78011"; + sha256 = "1lgsqrwf21b0rh4x8nmj08a46ld7dkq4jhwxi1fi7a9xhmi2yd4i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme"; + sha256 = "135bli9vhgl898526q6znjvck356bja1ylsfi95d9445jd136c4v"; + name = "monokai-alt-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/monokai-alt-theme"; + license = lib.licenses.free; + }; + }) {}; monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20161216.628"; + version = "20170705.1152"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "1a921469d0d3a974bf626a76bc5e9fb342fb32d6"; - sha256 = "1xby4jxxjwcgpai242y5c6ha2cj07hs1nndvxa6f1ncfkh5a7azx"; + rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062"; + sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -43948,12 +46024,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20170220.540"; + version = "20170623.103"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "6190d9935109e116944296be2faa46773e545d91"; - sha256 = "1lp0xbsgiajbx27fnsx61krcbj6p0frar4wh5dq6i98af46vwly6"; + rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3"; + sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -43998,8 +46074,8 @@ sha256 = "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6d6e3fdf5ab0b51605bbeb203b9fccb6db6ef6e9/recipes/morganey-mode"; - sha256 = "10lmbf21kh0jy567jzx1lam2hqyqygdvnngvxd97nk6pd32hy8s8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/morganey-mode"; + sha256 = "18cbmx8lnypgxkisxa3lrh88v8l9k0q8fnai5ps8ngvfgz42rlqp"; name = "morganey-mode"; }; packageRequires = [ emacs ]; @@ -44061,8 +46137,8 @@ sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b14e088b7b8f35321b720a1b3fdb75203aa66444/recipes/mote-mode"; - sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mote-mode"; + sha256 = "0ccsyl0wvf0nbsw57sxad7w0c0i5al5s5mjrjjq8bnfh4dyj2x0y"; name = "mote-mode"; }; packageRequires = [ ruby-mode ]; @@ -44094,10 +46170,11 @@ }) {}; mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-plus"; - version = "20170101.1057"; + version = "20170307.859"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse+.el"; - sha256 = "0drv4r30jj1bsgd9jv6znicc9jgxd0hzjd3xlsp7l2ynjbg86n4g"; + sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd"; + name = "mouse+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+"; @@ -44133,10 +46210,11 @@ }) {}; mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse3"; - version = "20170101.1058"; + version = "20170324.1050"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/mouse3.el"; - sha256 = "1d6192r5iqyvs21ip78wcsvwc4lpx2jiv6pljcm9blxr1bpsk3gl"; + url = "https://www.emacswiki.org/emacs/download/mouse3.el?revision=39"; + sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c"; + name = "mouse3.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3"; @@ -44152,12 +46230,12 @@ move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-dup"; - version = "20161026.742"; + version = "20170513.1911"; src = fetchFromGitHub { owner = "wyuenho"; repo = "move-dup"; - rev = "612f5b3faa5bc36f7403b6fac7a1a524ae146f37"; - sha256 = "0xiwlqhhx9aqj4059srp04zw1nksf8crp1z1wcfn4516f8mxs66p"; + rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0"; + sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup"; @@ -44198,8 +46276,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "67ca629b4bc3063ea19a7fccc693432a4eb10021"; - sha256 = "0i06ms5m7qhv2m1mmgzqh73j9wz3nxygz65p6vsnicxas09w70rd"; + rev = "bca452544b5e200034d0505a767090a975a21a28"; + sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -44362,12 +46440,12 @@ mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mpg123"; - version = "20151214.1150"; + version = "20170313.715"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "mpg123"; - rev = "ed2307843ca54ebf0ca5e5d2e79b41e79527c45c"; - sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb"; + rev = "d1dd8c56428ae55df9e23ba26f102588001d55be"; + sha256 = "1faqz3svh9l14617d39b8c7gfgf7kxf4q6d0k2q6y8whfljnbyvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/714d40891ab697b6303a3e25df2cb8adf04942f3/recipes/mpg123"; @@ -44404,12 +46482,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "20161221.558"; + version = "20170610.1044"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "71c38323187c98b32250b89088768599bb216ddb"; - sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg"; + rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; + sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -44425,12 +46503,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170121.1322"; + version = "20170506.1701"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "80c2a0b61c4fc2d7a5f7e6d1ecbe882b2033a879"; - sha256 = "02x6pmzsg4rczc146d2lvh6jwr857hqq0m44f7017h2wmvhhb9xr"; + rev = "55d493b2e4ad0d931659d1785bcdacc6f16bed07"; + sha256 = "1fp9q094glk4m2l6hf51ryj1qi4g3q7134hf6qjf707xv2vjcihm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -44467,16 +46545,16 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20170220.2245"; + version = "20170429.816"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "38452683b2cb4448de13062d47264f9e9d35e7c8"; - sha256 = "0mazixn55g0wcg541vj1wg2madczcy9r3ka38zfxnvj3jbf18cij"; + rev = "3453e25ff6c07c1b768b2a79fdb9fc5c97100e76"; + sha256 = "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; - sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; + sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r"; name = "mu4e-alert"; }; packageRequires = [ alert emacs ht s ]; @@ -44496,8 +46574,8 @@ sha256 = "1rj5vcb5f2xs5wvb3z5wd4866cjdzn8lmkbk6xflqq9wrakzl1kh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; - sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension"; + sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc"; name = "mu4e-maildirs-extension"; }; packageRequires = [ dash ]; @@ -44552,8 +46630,9 @@ pname = "multi-eshell"; version = "20120608.1135"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/multi-eshell.el"; + url = "https://www.emacswiki.org/emacs/download/multi-eshell.el?revision=9"; sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl"; + name = "multi-eshell.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9069a6eb1e57bccb06d26577cac70765de8e52f/recipes/multi-eshell"; @@ -44569,12 +46648,12 @@ multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20161103.1715"; + version = "20170417.1856"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "f510b7bc3c4726f262620bd6739f7de80d13ff35"; - sha256 = "01dbk0vxznmqhx8vd2iaa967ng5apnwkv0mlyd235wk2z1j8wci4"; + rev = "7e99fd560b15a6176a5ccfcac0af4ef9e8dd0656"; + sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; @@ -44590,11 +46669,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20170221.232"; + version = "20170604.1514"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "c04d5bdeb213"; - sha256 = "1m4sjmbrc8rln8817b4nybbh1akphbl58i0pfl1ic515xn1g3by2"; + rev = "04eeab45d19b"; + sha256 = "11mn36m40i93wig79kj1jp2i3ggck1qsfw2z9q24a1zxj2gns12i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -44607,16 +46686,19 @@ license = lib.licenses.free; }; }) {}; - multi-term = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "multi-term"; version = "20160619.233"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/multi-term.el"; - sha256 = "0i7gixcyqhd8ajbslfmb58rvdihzfprydwiqr730q9q0yfja36j8"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "multi-term"; + rev = "f954e4e18b0a035151d34852387e724d87a3316f"; + sha256 = "00cz3q654vpmijbqxp8c6nkxqj9zx1hjr3552l0adk3fbg6qpmcq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/multi-term"; - sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term"; + sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal"; name = "multi-term"; }; packageRequires = []; @@ -44691,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"; @@ -44762,8 +46844,8 @@ sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f7e5f7e9c551a149e9d433173bd8c8613487ed/recipes/mustache-mode"; - sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode"; + sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36"; name = "mustache-mode"; }; packageRequires = []; @@ -44839,8 +46921,9 @@ pname = "muttrc-mode"; version = "20090804.1552"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el"; + url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el?revision=7"; sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis"; + name = "muttrc-mode.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3fd45af3345742cff7be99ad8210d7f8fd2a2f/recipes/muttrc-mode"; @@ -44885,8 +46968,8 @@ sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38ad25fc6d80148c12e235bccf7732afa20ff3a4/recipes/mwe-log-commands"; - sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mwe-log-commands"; + sha256 = "1nf3rd5i4r61z64apkqi5wx60fpshx5px0y53jqf0rk86708l6wx"; name = "mwe-log-commands"; }; packageRequires = []; @@ -44990,8 +47073,8 @@ sha256 = "10wz20842j6yj4k9kg7pd93pzppsc31klbfzlvlkfywqv6j311cz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org"; - sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org"; + sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj"; name = "mysql-to-org"; }; packageRequires = [ emacs s ]; @@ -45024,12 +47107,12 @@ myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "myterminal-controls"; - version = "20160924.2206"; + version = "20170425.1936"; src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "b76ef43a64f25cbea67b966ebf88eb12518a52b4"; - sha256 = "1x8sfhdb5cw1xih9gpr07pz3f0y9wzxv38pxg4pllkayc2sqhsr4"; + rev = "3edcef051f882342ca769b84527bf92dfb755e14"; + sha256 = "0g9vyy639aqnk0g9rmrlszc7i0rl2f2ygnzfs4pwakgfiwig5r0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -45086,10 +47169,11 @@ }) {}; naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "naked"; - version = "20170101.1100"; + version = "20170418.1822"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/naked.el"; - sha256 = "06j2kijshd6ywx0rfvl4d08r0rh0b0rj69zypz63p418liymzcn6"; + url = "https://www.emacswiki.org/emacs/download/naked.el?revision=23"; + sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8"; + name = "naked.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked"; @@ -45113,8 +47197,8 @@ sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/806273d9898331b9b0189a72d9fdd43c86e1224c/recipes/name-this-color"; - sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color"; + sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8"; name = "name-this-color"; }; packageRequires = [ cl-lib dash emacs ]; @@ -45130,8 +47214,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; - sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; + rev = "d14186e99fa800d293e8e3072ba26f383c6624c6"; + sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe"; @@ -45147,12 +47231,12 @@ nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }: melpaBuild { pname = "nameframe-perspective"; - version = "20160927.2103"; + version = "20170405.1819"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; - sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; + rev = "d14186e99fa800d293e8e3072ba26f383c6624c6"; + sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective"; @@ -45172,8 +47256,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; - sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; + rev = "d14186e99fa800d293e8e3072ba26f383c6624c6"; + sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile"; @@ -45252,12 +47336,12 @@ nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nand2tetris"; - version = "20170214.2248"; + version = "20170306.1827"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee"; - sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv"; + rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; + sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris"; @@ -45277,8 +47361,8 @@ src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee"; - sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv"; + rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; + sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler"; @@ -45334,10 +47418,11 @@ }) {}; narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-indirect"; - version = "20170101.1101"; + version = "20170307.921"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el"; - sha256 = "0rlj647azpj5v7lzap88992f7mf2y94708f4aw2cvnzj6hf1rsvy"; + url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=13"; + sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh"; + name = "narrow-indirect.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect"; @@ -45479,16 +47564,16 @@ navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }: melpaBuild { pname = "navi-mode"; - version = "20160327.134"; + version = "20170414.1228"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "navi"; - rev = "a6b824ab2591e89e47f7399987f4fb3fa5d9306b"; - sha256 = "0vmrh8y8q7zch48iz9lk4n0b3s1b8zp3wki3906s709b5ajfvk7h"; + rev = "c1d38e8237f4e14af020a0b7d4f118ea198ab674"; + sha256 = "0jj5spk14hgb7zb1cd2n8whcw4k1kd5zb6llwj96v178yaws7l8k"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode"; - sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode"; + sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69"; name = "navi-mode"; }; packageRequires = [ outorg outshine ]; @@ -45504,8 +47589,8 @@ src = fetchFromGitHub { owner = "naota"; repo = "navi2ch"; - rev = "faebfd15184de9df6903eae436dafb52c38ee86e"; - sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m"; + rev = "f39d93c32acd5b9c3a7fb1a9fe14c5e1c4b5288e"; + sha256 = "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36bea1eca58de15d6106cbd293d941d12ee3d21c/recipes/navi2ch"; @@ -45588,12 +47673,12 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "883bca8693d0d289c19ea62d55e5fbaa93e721ce"; - sha256 = "0mr9x0fkza7l1427ib4cwab77vva2aghr7279rzh2hq0wlkzc5zj"; + rev = "d0777b677c50714415174e407a321efc1e9bfdae"; + sha256 = "19darrq975w11n4809f5blrc3paaxpdxmvwmsd96k8g5gwi0yf5m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; - sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; + sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny"; name = "nemerle"; }; packageRequires = []; @@ -45605,12 +47690,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20160811.216"; + version = "20170711.501"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "370212fa9ffcba3ff542a154d17ccf5be1066c4c"; - sha256 = "13a760jidh00czl05c0pnpbxzr7smrkf5ms9kd3h1cq613ffapby"; + rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7"; + sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -45626,12 +47711,12 @@ neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20170227.1731"; + version = "20170522.758"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "75d8e8686ae479490a0e60d4ea96f989d7a18725"; - sha256 = "10xc3hmm468rvjwmgyfg6zwwmki2bzlnnj61ch33m0hqrr8q6nl9"; + rev = "bc98dfb44c106375efa4f26848f3790ee264da97"; + sha256 = "1m30ldbprz3f62szyi1alzjy337ryczljxy1z5lf6smb03ymns2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -45752,12 +47837,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20160910.820"; + version = "20170504.2007"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "d06d8af34c1e74a7c7a8601233f5e42c38420035"; - sha256 = "0nz1lrx0iiapmhy78d17m8v91nly11hlykg00xvj91y1iw0713ql"; + rev = "adbfe16a47cf26edeb1b508cbedae5307b4efbf6"; + sha256 = "0ll850wpr4dyh25mq41afwbz17mqz82i53hfn970n9vw2icf36py"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -45773,12 +47858,12 @@ nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; - version = "20170213.1326"; + version = "20170611.2137"; src = fetchFromGitHub { owner = "ajc"; repo = "nginx-mode"; - rev = "b58708d15a6659577945c0aa3a63983eebff2e67"; - sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix"; + rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005"; + sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; @@ -45857,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"; @@ -45877,12 +47962,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20161001.2336"; + version = "20170716.948"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "2ddac4faa12fc405fcb2148f7d045be83cae5f3d"; - sha256 = "1iaf03791x3jw1vgp2pc4aa01xw5kfr7mk87x7bg1py88pljkh7l"; + rev = "05ac362f97874d50131ea38277cf95a5cfecb250"; + sha256 = "0phxkvi1s49grc717iprg96dalb5w2jcj1dfyrh339xny11f2hqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -45895,6 +47980,27 @@ license = lib.licenses.free; }; }) {}; + nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nimbus-theme"; + version = "20170412.758"; + src = fetchFromGitHub { + owner = "m-cat"; + repo = "nimbus-theme"; + rev = "ce999b8d152b9b15d75f66fe22b84827167c8311"; + sha256 = "08bfp2xm8ylkmb4rby15f6xx51qppd2g01i3mg2wwb8kvlwz6s4w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; + sha256 = "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18"; + name = "nimbus-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nimbus-theme"; + license = lib.licenses.free; + }; + }) {}; ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ninja-mode"; @@ -45902,8 +48008,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "fb3c70049b82d53101fc6086a1699ecf16966792"; - sha256 = "0amylb876720959hhsd31k025l1d3rv1i9i8qhf2k1skd8xfrvpj"; + rev = "7bbc708ff08f5660f4cff4b3e8c675bec428a1f2"; + sha256 = "1iqv268yvvhs7nxf28105g3ya16js1ibzxl0is13i4hlkx9wiqw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -45919,12 +48025,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170305.1601"; + version = "20170520.553"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "89d30002eddcc33c5c74dcc871a97aee0228d403"; - sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8"; + rev = "749f48b510d0fd47dac67850f4089119fbff142a"; + sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -45944,8 +48050,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1cf480110879ffc8aee94b4b75999da405b71d7c"; - sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02"; + rev = "4ec6eb1fdf513d93090d5898762d1186eb6feb0d"; + sha256 = "01vfj61rgfk0cyh1c4ai0ys0wjnjaqz6hdbg3b1dcfk4b09ydyjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -46000,6 +48106,27 @@ license = lib.licenses.free; }; }) {}; + nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: + melpaBuild { + pname = "nlinum-hl"; + version = "20170613.1748"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-nlinum-hl"; + rev = "d5ca1490e0cde0605e34a6a17de8cc236c9810da"; + sha256 = "0rj2ay2x7mqnj2vpnndfzr47sldx7i6zxj4nn81yamrdxgv19ajd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl"; + sha256 = "17lcp1ira7yhch9npg9sf3npwg06yh9zyhg0lnb22xg09lbndj0x"; + name = "nlinum-hl"; + }; + packageRequires = [ cl-lib emacs nlinum ]; + meta = { + homepage = "https://melpa.org/#/nlinum-hl"; + license = lib.licenses.free; + }; + }) {}; nlinum-relative = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: melpaBuild { pname = "nlinum-relative"; @@ -46066,12 +48193,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170226.1130"; + version = "20170702.457"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b"; - sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -46171,12 +48298,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "20170110.940"; + version = "20170607.1303"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "53b7f09a9be6700934321297758e29180e7850d7"; - sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy"; + rev = "f72a537700b08e14db28e6bcc1d6244bbeaefca4"; + sha256 = "1wha680gklq974wl2si3q024qhcdkqgicr6x3qrb9fhfkfr1nbjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -46210,6 +48337,27 @@ license = lib.licenses.free; }; }) {}; + nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nord-theme"; + version = "20170506.2351"; + src = fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-emacs"; + rev = "eb7929e41606776a45817946b5d6f79426767a93"; + sha256 = "1cb7la2al8124i4xfmripfzhabpnzh929qi1266p4c7jchyz2gxw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; + sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc"; + name = "nord-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nord-theme"; + license = lib.licenses.free; + }; + }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; version = "20140520.948"; @@ -46219,8 +48367,8 @@ sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/nose"; - sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose"; + sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682"; name = "nose"; }; packageRequires = []; @@ -46231,11 +48379,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170304.1716"; + version = "20170715.511"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "91524d5d6cafbab1c1d6bc5a75b02c4d86689e3b"; - sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q"; + rev = "4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051"; + sha256 = "145313a0krav6lcalbpq6skyf2iw96c97v6cd7s6bci5i93w0mp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -46271,10 +48419,11 @@ }) {}; novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "novice-plus"; - version = "20170101.1103"; + version = "20170307.925"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/novice+.el"; - sha256 = "04lsjzj0a0z7wn7jzlpzjdv9d2w591gs2mwvsh1j8hmgl4x5p9vp"; + sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb"; + name = "novice+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+"; @@ -46290,12 +48439,12 @@ noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noxml-fold"; - version = "20160707.847"; + version = "20170520.545"; src = fetchFromGitHub { owner = "paddymcall"; repo = "noXML-fold"; - rev = "4cf3628004ad872fb44943aab5274a45e22ea430"; - sha256 = "0i4fyxkwp2yksz8d4x309q8imab8gz59vcw64k9y1kzylcnxci0i"; + rev = "41cd645531783982e03cb1af2fc2acd59c88f6cb"; + sha256 = "1bpakbwcs6qilx0j24xg01yarkyvv8wvcf6j5kxqmls3hq23i47s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold"; @@ -46340,8 +48489,8 @@ sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d1d7144bb40a77c545ae1a3d12549080f30e5327/recipes/nrepl-eval-sexp-fu"; - sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nrepl-eval-sexp-fu"; + sha256 = "1mz7a6aa4x23khlfqhhn9ycs3yxg44h5cckg4v4rc6lbif1jzzf8"; name = "nrepl-eval-sexp-fu"; }; packageRequires = [ highlight smartparens thingatpt ]; @@ -46413,6 +48562,27 @@ license = lib.licenses.free; }; }) {}; + nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nubox"; + version = "20170619.210"; + src = fetchFromGitHub { + owner = "martijnat"; + repo = "nubox"; + rev = "1ccb8035ae42727ba6bdd5c1106fbceddeeed370"; + sha256 = "02yh99rcgxdq6jn4xs8782nl6bjccmal8j78qslvpkrzrrxjajx6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox"; + sha256 = "0snzfsd765i363ykdhqkn65lqy97c79d20lalszrwcl2snm96n1f"; + name = "nubox"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nubox"; + license = lib.licenses.free; + }; + }) {}; number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "number"; @@ -46455,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"; @@ -46466,8 +48657,8 @@ sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/138bdf35caf18dca8e9cc02035a983decb81dfd8/recipes/nummm-mode"; - sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nummm-mode"; + sha256 = "1gdq00f3x0rxxj917x9381v2x7cl9yabj7559zr5vj1clwza8jn4"; name = "nummm-mode"; }; packageRequires = []; @@ -46500,16 +48691,16 @@ nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nvm"; - version = "20151113.55"; + version = "20170513.1501"; src = fetchFromGitHub { owner = "rejeep"; repo = "nvm.el"; - rev = "d6c7ad048f1d2854ec3c043d80528857aa1090a8"; - sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7"; + rev = "61590e7fdeb19b1d866d26e48aef1af4767e5709"; + sha256 = "04z8zkgp0km575ijijpvmrqs0aa2f0878c5n4rl91hs1grq93mjf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1943a1986775952bedd78430ee41b67af130c439/recipes/nvm"; - sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm"; + sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w"; name = "nvm"; }; packageRequires = [ dash dash-functional f s ]; @@ -46521,12 +48712,12 @@ nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nyan-mode"; - version = "20160429.1323"; + version = "20170423.40"; src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "98f2283d60686d331346371bc7f7f3d49bdfaf34"; - sha256 = "0yv6wv1vdc5zd1sh3f8vcz7wdizziasjzr11shx2bhm8nhnqcdbj"; + rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a"; + sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -46592,8 +48783,8 @@ sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6554cc9a5f667b62623c753cf84e2c9a1cb1c90/recipes/oauth"; - sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/oauth"; + sha256 = "0vgxvscb9cr07g3lzpi269kamgzhpac6dir1rlr4qd2wdv0nifl9"; name = "oauth"; }; packageRequires = []; @@ -46623,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/e1b0ca3a2da727e2f521dacd2fa9fa79ca03f7e2/recipes/ob-async"; - sha256 = "0pra4lvvkdyn7agcgdjsk5dhis78pnvdfk3s5ivbaki70yi71aia"; + 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; @@ -46664,6 +48855,27 @@ license = lib.licenses.free; }; }) {}; + ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-blockdiag"; + version = "20170524.1605"; + src = fetchFromGitHub { + owner = "corpix"; + repo = "ob-blockdiag.el"; + rev = "715e7d41124a98d3f1e38e430e3a7f31b52704e4"; + sha256 = "0mqi9hm00apq43mmabai05x96q4x0l29n9gvdhphzjrhvjabmm6l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; + sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g"; + name = "ob-blockdiag"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-blockdiag"; + license = lib.licenses.free; + }; + }) {}; ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-browser"; @@ -46706,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"; @@ -46790,15 +49023,36 @@ 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"; - version = "20170302.849"; + version = "20170324.932"; src = fetchFromGitHub { owner = "pope"; repo = "ob-go"; - rev = "f4e9c1afebe4b8a2d89bdf012ac533a2544cdf4e"; - sha256 = "05yz1kf1jszns4psf065gq18c5y12xlyg2zcqqbw5zjkvbgsgnh1"; + rev = "28183e10581fa5fe0f5b5a885cbde32cb4b053ba"; + sha256 = "1liggd9nbl90c6mc0iccchckwm1pw2lb23nn61y2p9c1hj9myhm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; @@ -46814,12 +49068,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20170304.2215"; + version = "20170411.1842"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44"; - sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7"; + rev = "5fd0e99630e07c5e64f2483c6d46aefdd37677d2"; + sha256 = "1i5la27m36xfc8jwmz5i0yiim9ddmfaqjpahxgpbf63zks555vpk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -46835,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"; @@ -46856,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"; @@ -46898,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"; @@ -47042,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"; @@ -47049,8 +49324,8 @@ src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5"; - sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx"; + rev = "68d3e516c712bc7aa5042f305f3eb5bbb6d656c2"; + sha256 = "1yr7d3ayrdnycapnhc08zyf6b9gp7xw0pngz90h75s6j33pisx30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -47116,8 +49391,8 @@ sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/ob-spice"; - sha256 = "13a6g9sh6wvlshvzlllxn8zchb6cb2m0ar14fqvrz5g4hn4hbsm8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; + sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2"; name = "ob-spice"; }; packageRequires = [ org spice-mode ]; @@ -47137,8 +49412,8 @@ sha256 = "04npsn7awdp1n7fgwidaza58mjbmm3jsv2d992h2vzslfcyx2hnl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/892f629420f5e9e312e46b2022f45244ead39156/recipes/ob-sql-mode"; - sha256 = "1yrm0v0msy9d51w0b08bg3042cdrp4s78x41iwni4czmf6w3hpih"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-sql-mode"; + sha256 = "143agagkmwqwdqc0mbdsqp6v02y12q437v4x6dlh81yihif56rdk"; name = "ob-sql-mode"; }; packageRequires = [ emacs ]; @@ -47210,6 +49485,27 @@ license = lib.licenses.free; }; }) {}; + ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-uart"; + version = "20170521.158"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "ob-uart"; + rev = "90daeac90a9e75c20cdcf71234c67b812110c50e"; + sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart"; + sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7"; + name = "ob-uart"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-uart"; + license = lib.licenses.free; + }; + }) {}; oberon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "oberon"; @@ -47231,6 +49527,27 @@ license = lib.licenses.free; }; }) {}; + obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "obfusurl"; + version = "20170325.802"; + src = fetchFromGitHub { + owner = "davep"; + repo = "obfusurl.el"; + rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb"; + sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; + sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra"; + name = "obfusurl"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/obfusurl"; + license = lib.licenses.free; + }; + }) {}; objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "objc-font-lock"; @@ -47326,8 +49643,8 @@ sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b8126d5c1f69a2fb0ee6784c6d417ab9ee145af2/recipes/occur-x"; - sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/occur-x"; + sha256 = "04nydxp4syd0chfnfrz8v1vkx2qasfh86b98qv8719cily1jw76p"; name = "occur-x"; }; packageRequires = []; @@ -47381,12 +49698,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20160613.938"; + version = "20170412.12"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "5dc0ab3bee633aad64967e79539cdd007bbcacac"; - sha256 = "1d7q3gd6clyhpzy4phi6g5435iz50kba2mbn0jd403x3270gdk9y"; + rev = "d3f250b6029a7afec0d7ddd8770d9c4a7e5b9c7c"; + sha256 = "1h8w7vcaykhgf4vmrkp1c7y566bzi7av4cfvkp4l01817chrhyaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -47536,8 +49853,8 @@ sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/265c2a9c1880ade0248908ab696d737007e9bfd0/recipes/om-mode"; - sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/om-mode"; + sha256 = "0bnlnxmzch9j39l8sf85npi89xlnkcnkmy4fihmwhrm86mnmayrb"; name = "om-mode"; }; packageRequires = []; @@ -47570,12 +49887,12 @@ omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "omni-log"; - version = "20150604.1038"; + version = "20170420.407"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "e5a8ee7d63eb1e745b37ba4e3e71c5ea025e2342"; - sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0"; + rev = "60fd1b7ba77bd82787e43ce1aee2832f53981c68"; + sha256 = "1s81qj4g8nhw6k4b7wi4ya9g51xbsqzyi659zs4zdxjxj7acdq8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; @@ -47588,22 +49905,22 @@ license = lib.licenses.free; }; }) {}; - omni-quotes = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, omni-log }: + omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }: melpaBuild { pname = "omni-quotes"; - version = "20150604.1057"; + version = "20170425.1132"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-quotes.el"; - rev = "537f7191bede7156dae94622e92cec04c6cd4bdf"; - sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6"; + rev = "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0"; + sha256 = "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes"; sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs"; name = "omni-quotes"; }; - packageRequires = [ dash omni-log ]; + packageRequires = [ dash f ht omni-log s ]; meta = { homepage = "https://melpa.org/#/omni-quotes"; license = lib.licenses.free; @@ -47612,12 +49929,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "20151211.859"; + version = "20170416.329"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "7e04d7f20ee383bf72dfdcfd642bf08e4b8ab973"; - sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500"; + rev = "0da549c1386f93ed4de201bf8779ba64ddc91347"; + sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -47633,12 +49950,12 @@ omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: melpaBuild { pname = "omni-tags"; - version = "20150513.1053"; + version = "20170426.1409"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-tags.el"; - rev = "3f88b087d492e8ef742416d6e4bf8be41e5a46c4"; - sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5"; + rev = "8f0f6c302fab900b7681e5c039f90850cbbabd33"; + sha256 = "0cqj4h4bdhmb0r6f2xx9g6cs3599m4j3snkrvsgddaq8c6mg47w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags"; @@ -47672,19 +49989,19 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }: + 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 = "20170216.754"; + version = "20170716.926"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367"; - sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2"; + rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d"; + sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; - sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; + sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87"; name = "omnisharp"; }; packageRequires = [ @@ -47692,10 +50009,12 @@ cl-lib csharp-mode dash + emacs + f flycheck - json popup s + shut-up ]; meta = { homepage = "https://melpa.org/#/omnisharp"; @@ -47776,8 +50095,8 @@ sha256 = "0g2hvpnmgyy1k393prv97nqwlqc58nqf71hkrmaijw0cyy9q03nz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7e31ad4e6f5ae3084ef4b4c910dc6d90935d72/recipes/one-time-pad-encrypt"; - sha256 = "0aa7qcii7yf4527nhlwwp0hbhamhyp2xg0fsscnq2m28l5d5kmn6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/one-time-pad-encrypt"; + sha256 = "0xl74vxq9dzl84b6wsw8flykxcsxggpd4s47a2ph3irr64mbbgq5"; name = "one-time-pad-encrypt"; }; packageRequires = []; @@ -47788,10 +50107,11 @@ }) {}; oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "oneonone"; - version = "20170101.1104"; + version = "20170416.858"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/oneonone.el"; - sha256 = "04jjdfbn8ah3gk4fpc56il8j4q52l9raxkbkxivqn440as7nkrn4"; + url = "https://www.emacswiki.org/emacs/download/oneonone.el?revision=129"; + sha256 = "0ag62z31mb5n50m9qph2ww945pr71j95c5xv7krna1iq01qr8ji1"; + name = "oneonone.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone"; @@ -47916,8 +50236,8 @@ src = fetchFromGitHub { owner = "OpenSourceOrg"; repo = "el-opensourceorg"; - rev = "42742d5f1b9590acff7f05ee0094e3a80f4f7171"; - sha256 = "0z92l9d3q12qlf18v7w8qjiw0ciha9l1nvxr0zmik5ck87qk4vmn"; + rev = "13499b7ae602c735e40c1c494bda6252a2f1c98f"; + sha256 = "14vb47y5cq3j80aah8fjjf5aw343p9p7bhlxnpz5fr8r9a883dka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource"; @@ -47960,8 +50280,8 @@ sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/openwith"; - sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/openwith"; + sha256 = "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx"; name = "openwith"; }; packageRequires = []; @@ -47994,12 +50314,12 @@ org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "org-ac"; - version = "20140302.413"; + version = "20170401.607"; src = fetchFromGitHub { owner = "aki2o"; repo = "org-ac"; - rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a"; - sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca"; + rev = "41e3ef8e4039619d0370c23c66730b3b2e9e32ed"; + sha256 = "1l3fn8vjdqq7rrn1b7l2i238bhjni13mg9v25dydin0sfb697abk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac"; @@ -48036,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"; @@ -48096,22 +50416,22 @@ license = lib.licenses.free; }; }) {}; - org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }: melpaBuild { pname = "org-babel-eval-in-repl"; - version = "20161120.1243"; + version = "20170511.514"; src = fetchFromGitHub { owner = "diadochos"; repo = "org-babel-eval-in-repl"; - rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122"; - sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm"; + rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6"; + sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl"; - sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl"; + sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx"; name = "org-babel-eval-in-repl"; }; - packageRequires = [ emacs eval-in-repl ]; + packageRequires = [ emacs ess eval-in-repl matlab-mode ]; meta = { homepage = "https://melpa.org/#/org-babel-eval-in-repl"; license = lib.licenses.free; @@ -48141,12 +50461,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20170228.1156"; + version = "20170507.858"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "346140fcd727964dbac623dde856addb08d9ddd3"; - sha256 = "04ax2c6rg197i6is24gfm7cwdgkr98ic5r8x5h4dlqkr36f43f9m"; + rev = "2978aee8981a2ff5c09104b2d8b055957b277078"; + sha256 = "1vbpwzzrl5vq0vwkwn0cr1w9wkfbjd9rmxbpsddm0sbx7k4m3am9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -48162,12 +50482,12 @@ org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bookmark-heading"; - version = "20160325.2359"; + version = "20170510.1008"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-bookmark-heading"; - rev = "6c8aad7bf98387875836873040e7815d8720ba84"; - sha256 = "0hhw9w5aj8rbfrifpr4djppif5hwgzdb3x1az4gdwvc2dsgd8psf"; + rev = "c535fd9b430d2cc50b54a1ab550d64e20ebd5bd6"; + sha256 = "0v2321lzivxd35174xgsnc95g49dlcgj8lzb6nlid1ri38fhqwyl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading"; @@ -48180,6 +50500,27 @@ license = lib.licenses.free; }; }) {}; + org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-brain"; + version = "20170706.447"; + src = fetchFromGitHub { + owner = "Kungsgeten"; + repo = "org-brain"; + rev = "497c18f517074629394c4c30de03d985e0c5ca8c"; + sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; + sha256 = "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c"; + name = "org-brain"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-brain"; + license = lib.licenses.free; + }; + }) {}; org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bullets"; @@ -48204,16 +50545,16 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20160614.1342"; + version = "20170615.724"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "f8638d459c7294d44ccd7792b4216541c181d891"; - sha256 = "0vjw8fn6ipi2fg5wkj4jq8cs3m7694xgccy1h1n774w12bby3xhk"; + rev = "07e6ccda6756754a115d567f2ad3a760514b731d"; + sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b3f04ae3592496aa4148d1035599dd6f63ad14b/recipes/org-caldav"; - sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; + sha256 = "1wzb5garpxg8p7zaqp6z5q0l2x8n9m7fjg5xy3vg9878njnqr9kc"; name = "org-caldav"; }; packageRequires = [ org ]; @@ -48246,16 +50587,16 @@ org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-chinese-utils"; - version = "20160811.217"; + version = "20170313.2148"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-chinese-utils"; - rev = "3818d03bde90433b49b8ef8cffdd242084af4058"; - sha256 = "0rlqr0b54rv8p2015vgb730r3lqwxg3v0msiimwxlhfhgww1pg2b"; + rev = "f44d7114899102f1e1109bb7aeeab4330281ff94"; + sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils"; - sha256 = "1dycsv0p2xzm2dg6fi5f5dkb48qnqq0qhrmvi0cdjq34j67s27ix"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-chinese-utils"; + sha256 = "0bxx81zigbv5vv3aficd65p03lgpp2iknj8qgvn2k4wgbv56j4q4"; name = "org-chinese-utils"; }; packageRequires = []; @@ -48271,8 +50612,8 @@ src = fetchFromGitHub { owner = "rexim"; repo = "org-cliplink"; - rev = "4c7c126ad3421ef076e4eb6358c57389b40a5e53"; - sha256 = "1z514mrppdd3yir6apyf12nqhqsmyzlrh1xfvcb8m6q2f12ny7f2"; + rev = "6c134fdda7bb56cc960af87d06a81a6885f6ab0e"; + sha256 = "1x339lg1q1aq57jycfxwdmipl05wjb0d1b5psqbn37xvmkm3imgg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink"; @@ -48309,12 +50650,12 @@ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20170130.2213"; + version = "20170326.1041"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "59482e800700e66db5381661c1e6b3edb2c03a34"; - sha256 = "099mjbd0n7azv4v3i4a7fw3f85c16ck334sqv2l92k0dpsjdmnrx"; + rev = "0bae215df11e5602b07294e83b595447ae73ca0d"; + sha256 = "17im4njl1w5wm0rxvib2g7v0ibg1p6n0ibq480wwz204jd98q4gv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -48338,8 +50679,8 @@ sha256 = "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ddf5992be3677ef94ceac1ec6d3f90f520c7be9/recipes/org-clock-today"; - sha256 = "0vnpkxlag5h793vw74l1ys6i2v87f5khvjrqbm3wzwmyc08vdz1q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-clock-today"; + sha256 = "1x9hplz9w2kpa239rz6y02hsl4fgzxlkwr9hhwjy12x1f88x0k73"; name = "org-clock-today"; }; packageRequires = [ emacs ]; @@ -48477,12 +50818,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20170213.1151"; + version = "20170605.23"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "137c3d2aa083283a3fc853f9ecbbc03039bf397b"; - sha256 = "0c4vvpccmc60bavywsd0lijzyzchs6cdmp8y36d70lmp4s66863v"; + rev = "131d2409b3639798ebac6d77c98eae446ea915dc"; + sha256 = "1l04vs47pl63daz9n0d2xby43kr2ynbykvdr7hjbyizcg9l9fzp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -48519,12 +50860,12 @@ org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }: melpaBuild { pname = "org-drill-table"; - version = "20140117.137"; + version = "20170408.1205"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "org-drill-table"; - rev = "d7b5b3743ac04f8cb1087c5c049c0520058fa89c"; - sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy"; + rev = "5662511e98697e086149a223a64f9f01fabf7330"; + sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table"; @@ -48579,6 +50920,27 @@ license = lib.licenses.free; }; }) {}; + org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-edit-latex"; + version = "20170621.758"; + 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-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: melpaBuild { pname = "org-ehtml"; @@ -48624,12 +50986,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20161029.222"; + version = "20170529.741"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "5349f4f50d8b16ac4d38ef70a2a7562632e193cc"; - sha256 = "112rr4cwldwnwhg0qdq6khfl41azxp0c4j5l4il06560s6h7dmjq"; + rev = "aff7bf3885e318287abf7d542916d21372496bdd"; + sha256 = "1z6rj7nrjdmkc7skx2si7s462228bpka96p0zzmkg7wa82j7ywv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -48665,12 +51027,12 @@ org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }: melpaBuild { pname = "org-gcal"; - version = "20161115.357"; + version = "20170420.1401"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-gcal.el"; - rev = "d32031f7c488be0d9845c47cc1452d6d6489e561"; - sha256 = "0b3jwrfr55hqar5kyhv4wg05x21gzxab0n93xm1371vimhahgmbl"; + rev = "bdc704842da000a1cffb8f155ef3887c5e1d0446"; + sha256 = "0nbwxmc2arssy1ll416i6chb0rx239jh2fm1lcylhdg3af25rsbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal"; @@ -48791,12 +51153,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20170224.1951"; + version = "20170527.2154"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da"; - sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr"; + rev = "4d8bda9b5207175ecd3ae647ebec42b3546efd49"; + sha256 = "0877klmy48ad0rpy7azd4xbm9d07wrhr3g96sixx35wgp216kvlm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -48812,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 = "30ca909d50737d32b3790c57fd2e13915fccfe97"; - sha256 = "0j60ka5klx97swa20ldcm1y8rs5ib0jc0zz3vavhgdg0nhc7w69p"; + rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1"; + sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -48830,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"; @@ -48878,8 +51261,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b"; - sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb"; + rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023"; + sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -48898,8 +51281,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b"; - sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb"; + rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023"; + sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -48915,12 +51298,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170218.501"; + version = "20170506.2244"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481"; - sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc"; + rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0"; + sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -48954,6 +51337,27 @@ license = lib.licenses.free; }; }) {}; + org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mru-clock"; + version = "20170323.308"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-mru-clock"; + rev = "98691aac779001d50516b12679e2a53b5192f164"; + sha256 = "02v872vmvrda94s8gpv3ylss2fvj3ja6r70rvcmannjikmjdan5k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; + sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm"; + name = "org-mru-clock"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-mru-clock"; + license = lib.licenses.free; + }; + }) {}; org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-multiple-keymap"; @@ -48975,15 +51379,36 @@ license = lib.licenses.free; }; }) {}; + org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-notebook"; + version = "20170321.2152"; + src = fetchFromGitHub { + owner = "Rahi374"; + repo = "org-notebook"; + rev = "d90c4aeca2442161e6dd89de175561af85aace03"; + sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook"; + sha256 = "045xqmrik1s83chl7l7fnlav2p76xrfj21kacpjj215saz1f8nld"; + name = "org-notebook"; + }; + packageRequires = [ cl-lib emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-notebook"; + license = lib.licenses.free; + }; + }) {}; org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; - version = "20150826.416"; + version = "20170315.441"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "org-octopress"; - rev = "e04d55c3f4bb88e5661ee136cb3a55f998dca931"; - sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr"; + rev = "a8a251d6940623daae58453dd91630593c2536c0"; + sha256 = "14iqxg75x7iq0wbjsir6ijbmbkapzfcxjc64kzncwa5ixgdxph3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress"; @@ -49020,12 +51445,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20170305.1948"; + version = "20170607.442"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "493e9ac843eb44efd8a6f486a7cfa727d575f3af"; - sha256 = "1amviznfqjb3z09bzv11yy2ickka43z7ffzjlbgk9wy066944p8l"; + rev = "fa4e86621a63033148f8fe295a11b4721ba17462"; + sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -49047,41 +51472,41 @@ license = lib.licenses.free; }; }) {}; - org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170302.2113"; + version = "20170703.1738"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "690b6d4e1b83"; - sha256 = "0smla8pxnqdzgfhxhs6hsqv8par5xcvfcww857i691gya6scslnb"; + rev = "e8c81e633595"; + sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h"; name = "org-parser"; }; - packageRequires = [ emacs ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/org-parser"; 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; @@ -49098,8 +51523,8 @@ sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; - sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; + sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah"; name = "org-pdfview"; }; packageRequires = [ org pdf-tools ]; @@ -49161,8 +51586,8 @@ sha256 = "1cr68gn093q7vvkald2gwcxns2ypqxhc5vavjj1j81ijrh1y1h2w"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9d433daa1a3b95646f3957ba58c49db2a6da2768/recipes/org-preview-html"; - sha256 = "0nf8xbqc9q2ppkjplynhfqvsms97w68afxq4rarspzddn881z7nj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-preview-html"; + sha256 = "1dnr046mk5ngmic2yqcmrnn7pzrrx3sg22rk2pc3vgdxs8bhvhf9"; name = "org-preview-html"; }; packageRequires = [ emacs org ]; @@ -49174,16 +51599,16 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; - version = "20161205.1508"; + version = "20170520.2310"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92"; - sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; + rev = "0ca3b80a46d8c541d36f161506ac8d8dc36d8e80"; + sha256 = "0r5h6ibq73b84w82382ld5dbihhvff4pj2bind68i5isam7pxlbh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; - sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile"; + sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf"; name = "org-projectile"; }; packageRequires = [ dash emacs projectile ]; @@ -49195,12 +51620,12 @@ org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-protocol-jekyll"; - version = "20151119.838"; + version = "20170328.939"; src = fetchFromGitHub { owner = "vonavi"; repo = "org-protocol-jekyll"; - rev = "f41902baaa62c8de3f81ad67a5f36d6aa5781578"; - sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy"; + rev = "dec064a42d6dfe81dfde7ba59ece5ca103ac6334"; + sha256 = "1pgc0lfbz6q2x8b5qkk766i5qylql4p0ng732rcqr7rzg6j31gm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll"; @@ -49216,12 +51641,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "20161018.219"; + version = "20170404.318"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "10293cc751b13ef13ebdacb22968b4ffdcadb163"; - sha256 = "1fjlrs12kwybpx9zqrvyhalp4macx7v3vw739nd7bqsl1srwwr4f"; + rev = "8b784ff0419fcaa2467991bc670e0e8e31be62c0"; + sha256 = "14lsc6a9ddfd69x06z3ia9mlvac2p8iwvxbfnbmn2m49lijs8724"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -49261,6 +51686,27 @@ license = lib.licenses.free; }; }) {}; + org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-recent-headings"; + version = "20170703.1625"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-recent-headings"; + rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42"; + sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; + sha256 = "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa"; + name = "org-recent-headings"; + }; + packageRequires = [ dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-recent-headings"; + license = lib.licenses.free; + }; + }) {}; org-redmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-redmine"; @@ -49268,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"; @@ -49282,15 +51728,15 @@ license = lib.licenses.free; }; }) {}; - org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: + 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 = "20170306.638"; + version = "20170714.808"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "1cf25da328ecfeac402aaa38dc3f50af8f462264"; - sha256 = "17bw03c22khqxf8b5hmf4f0l2s7qbmjkkw6m3xvs30k5snq1wk8x"; + rev = "208a7beb0f8d4f7830d1d801776acd99c723e87d"; + sha256 = "0vf75sk3ik9vfqbr30yn9fn8ab7rc60y5vaiipvx9p6mgh6vhcad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -49306,6 +51752,7 @@ hydra ivy key-chord + pdf-tools s ]; meta = { @@ -49345,8 +51792,8 @@ sha256 = "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b474cf4f237c28771c48fb770dc88b57193976f0/recipes/org-review"; - sha256 = "1xzhbnd1p2fab2f5xhg4zp06gwk63x8sjlxrfji6hh2p5a6gf6nx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-review"; + sha256 = "1v7p7pmrjjyj0my9xw55gsn9vvr9aq5x53x13nmspvqg47z6bd98"; name = "org-review"; }; packageRequires = []; @@ -49366,8 +51813,8 @@ sha256 = "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0acb202acc25420274a1b9e639f34f9878a61e83/recipes/org-rtm"; - sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-rtm"; + sha256 = "1hdcwmiv2qivdr2g78xz9fl38wn45vj0bn55dbsdj3qx7k7wgfx6"; name = "org-rtm"; }; packageRequires = [ rtm ]; @@ -49387,8 +51834,8 @@ sha256 = "0aq3af6fd16lm9iirzya6hmc8g48kfp8pc4dx51mgb5d6jjiizkv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/05a83750e745f16b15cbdf123165a3192363bfd1/recipes/org-seek"; - sha256 = "08l5zl3wk2f632hslcl5fi9ylaml5my6qx481yvdrbi6m8bchkpp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-seek"; + sha256 = "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7"; name = "org-seek"; }; packageRequires = [ ag emacs ]; @@ -49397,6 +51844,48 @@ 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"; + version = "20170422.2135"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-sticky-header"; + rev = "aae8dbc7f3b33c4dd35dc38d83791d7c23757060"; + sha256 = "1vdaqi0054hgf70i1g4lxxr3ry6k855ndjysq9c8ip4x2dfzyrv4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header"; + sha256 = "0ign3vjckmxp7n3625wb53qlch07c3s4l67jsvk38dhhcsg1rhnj"; + name = "org-sticky-header"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-sticky-header"; + license = lib.licenses.free; + }; + }) {}; org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; @@ -49418,6 +51907,27 @@ license = lib.licenses.free; }; }) {}; + org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-sync-snippets"; + version = "20170614.641"; + src = fetchFromGitHub { + owner = "abrochard"; + repo = "org-sync-snippets"; + rev = "e96bc94ff8865b4d408d90c4f3e39cc7cbb6cec8"; + sha256 = "0913klrly2xb1pxh91yvvfpzpackxn7sqpsajf4q8adbnlkn0w96"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets"; + sha256 = "0kv15zqva2cgx7jscp02x9gx20b5ckf525h546hyca86vfaakfbp"; + name = "org-sync-snippets"; + }; + packageRequires = [ emacs f org ]; + meta = { + homepage = "https://melpa.org/#/org-sync-snippets"; + license = lib.licenses.free; + }; + }) {}; org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-table-comment"; @@ -49439,22 +51949,22 @@ license = lib.licenses.free; }; }) {}; - org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-table-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-table-sticky-header"; - version = "20170227.1242"; + version = "20170408.1814"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org-table-sticky-header"; - rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043"; - sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy"; + rev = "93dc69efc00ac9fd3cc2ece5100f51df33ec7d8b"; + sha256 = "0d9d9sxak6kvqbb91h65ahw272d7dfxpgjw6zbs472xb6di1r6pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m"; name = "org-table-sticky-header"; }; - packageRequires = [ org ]; + packageRequires = [ emacs org ]; meta = { homepage = "https://melpa.org/#/org-table-sticky-header"; license = lib.licenses.free; @@ -49673,12 +52183,12 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20161030.100"; + version = "20170318.450"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "6a3c80ec00bb16707def17138e4230221511df3a"; - sha256 = "1xr9rkkhijb3af2fqhphz7c869648l1hvf4g6qffi1kmla3djf9x"; + rev = "c71042f16bf33120d0d3d40e107f3f4de044ae53"; + sha256 = "1jy55qapc8fqf6r3wz4v489iyw4pxzj2hadkwsgsv1m1ha1sdvyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; @@ -49715,16 +52225,16 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20160502.1821"; + version = "20170627.1750"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "fc7b2d934f2199368d9fc2a0a97d46f20c4f667b"; - sha256 = "1bqiq27ln1pl40b9dms05nla4kf72s80g9ilvrgqflxgl36gxws7"; + rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; + sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b57b6d755b3855ccfe0a90eada939fb7a852b40/recipes/org2blog"; - sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; + sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40"; name = "org2blog"; }; packageRequires = [ metaweblog org xml-rpc ]; @@ -49736,12 +52246,12 @@ org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org2elcomment"; - version = "20170216.1455"; + version = "20170324.245"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org2elcomment"; - rev = "c97c8934c8df20873ce1bc7023740b69beeb2d30"; - sha256 = "1995w31na7g4agyknbm9jgxzs4mwbz0mli43cj8aqlbnq5py31hg"; + rev = "c88a75d9587c484ead18f7adf08592b09c1cceb0"; + sha256 = "19r7rxnd2cl0vc8bbf86mh5b779pl5z917657ymlc74bqq140m3x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment"; @@ -49841,12 +52351,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20170118.1647"; + version = "20170403.1323"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "cbce5871fe267fef725631b0b7365952c35ae401"; - sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7"; + rev = "c91e662ace7e3ce992269cbf755f378bc6742511"; + sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -49891,8 +52401,8 @@ sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7f022fd455e69f1bffdb9ef3273a91cc7d7a3ab9/recipes/orglue"; - sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue"; + sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j"; name = "orglue"; }; packageRequires = [ epic org org-mac-link ]; @@ -49901,6 +52411,27 @@ license = lib.licenses.free; }; }) {}; + orgnav = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: + melpaBuild { + pname = "orgnav"; + version = "20170608.1013"; + src = fetchFromGitHub { + owner = "facetframer"; + repo = "orgnav"; + rev = "9e2cac9c1a67af5f0080e60022e821bf7b70312d"; + sha256 = "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a41436df126d7ef2c0a8b56d90afb942fe47dc59/recipes/orgnav"; + sha256 = "0z04n5rzv5c0lvn658nrfj6rg3a31n369h5rjgi5bap06qm427ix"; + name = "orgnav"; + }; + packageRequires = [ dash emacs helm s ]; + meta = { + homepage = "https://melpa.org/#/orgnav"; + license = lib.licenses.free; + }; + }) {}; orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "orgtbl-aggregate"; @@ -50258,22 +52789,22 @@ license = lib.licenses.free; }; }) {}; - outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outorg"; - version = "20160327.132"; + version = "20170414.1215"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outorg"; - rev = "456b1500b560ead633ce723986a48c33fb52ab76"; - sha256 = "0szvynvw16vr7br95pssqkil0xnfdh46x8lgan4z9v6impdav0nf"; + rev = "78b0695121fb974bc4e971eb4ef7f8afd6d89d64"; + sha256 = "03aclh4m3f7rb821gr9pwvnqkkl91px3qxdcarpf3ypa1x4fxvlj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg"; - sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg"; + sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9"; name = "outorg"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/outorg"; license = lib.licenses.free; @@ -50282,16 +52813,16 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20161024.2158"; + version = "20170414.1217"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outshine"; - rev = "d45a512d149996ca232c0218e2d6b5bc802285a9"; - sha256 = "0f4jb39pd23kszf9wpdmibn3wqgx76y68n1l7jb9y8l47vs519lh"; + rev = "399ccd20cd65c758bbbd5563bd804d2bccfd0279"; + sha256 = "03jd3gyqrmrnykcv7p6fv53f32li7gkvd61zbhp483n8a8n3yy5j"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine"; - sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; + sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v"; name = "outshine"; }; packageRequires = [ cl-lib outorg ]; @@ -50332,8 +52863,8 @@ sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/82e6b86f20a2d2d687b13091da31150c467bf271/recipes/overseer"; - sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; + sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8"; name = "overseer"; }; packageRequires = [ dash emacs f pkg-info ]; @@ -50345,12 +52876,12 @@ owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }: melpaBuild { pname = "owdriver"; - version = "20141011.738"; + version = "20170401.612"; src = fetchFromGitHub { owner = "aki2o"; repo = "owdriver"; - rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86"; - sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk"; + rev = "d934f182bafe29aa16c173440eff3fef08b0ec10"; + sha256 = "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver"; @@ -50366,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"; @@ -50412,8 +52943,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "af3d973d90b779d93153f751c746f9ede85972dd"; - sha256 = "0468if164skl0rwnk36ld3kjcmiqmj59jijgfw5w9mpd8j4mvwf0"; + rev = "7ae7bc8bc84ffe0351e23a8a5dc72a18874bee61"; + sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -50426,15 +52957,36 @@ license = lib.licenses.free; }; }) {}; + ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ox-epub"; + version = "20170414.0"; + src = fetchFromGitHub { + owner = "ofosos"; + repo = "ox-epub"; + rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a"; + sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; + sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh"; + name = "ox-epub"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-epub"; + license = lib.licenses.free; + }; + }) {}; 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"; @@ -50513,12 +53065,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20170112.1537"; + version = "20170607.1513"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "3a2467d4050637a0551e1fac957f85644147d280"; - sha256 = "1c09rfwx5ywcdbjsmkb4a6ixmqn1f289986dx96pvh26jnh2k2vp"; + rev = "a5e7c7166f5d4baf4b6487f44865f2636cda4698"; + sha256 = "14qybj34wvpn91m9hvfmcrsj5d9zzq5pyzjc61gd0zn482bklxz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -50534,12 +53086,12 @@ ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20160928.2153"; + version = "20170401.439"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; - rev = "338b168bac4c44f8f4d212f67a2190a70eacd240"; - sha256 = "1wh0ds7cznnvvh9rg3wsapdhxi8pplimszhzliglgj8sqfyb7kcx"; + rev = "f79d25443987a169a1234f5fbb2bc115cccea33e"; + sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; @@ -50573,6 +53125,27 @@ license = lib.licenses.free; }; }) {}; + ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ox-minutes"; + version = "20170323.835"; + src = fetchFromGitHub { + owner = "kaushalmodi"; + repo = "ox-minutes"; + rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1"; + sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes"; + sha256 = "13rwcp0k9h7l5g8xw2s2r1xhsmkibhfqyq6hlicvddv232g724sj"; + name = "ox-minutes"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ox-minutes"; + license = lib.licenses.free; + }; + }) {}; ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }: melpaBuild { pname = "ox-nikola"; @@ -50594,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; @@ -50639,12 +53212,12 @@ ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-qmd"; - version = "20160606.504"; + version = "20170402.957"; src = fetchFromGitHub { owner = "0x60df"; repo = "ox-qmd"; - rev = "b41ffcf47af1a635596df31d4b0a704f274b5654"; - sha256 = "1zv8kh7hlskj4g1c4k3cx0hzraal3inn75yzxs08ndvycdsn6cky"; + rev = "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec"; + sha256 = "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e71826e8a8c30b0eb535cce7a379740011b79534/recipes/ox-qmd"; @@ -50681,12 +53254,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20170219.2052"; + version = "20170418.758"; src = fetchFromGitHub { owner = "masayuko"; repo = "ox-rst"; - rev = "c5f300cf020e6bdd654e304e0388a0c63d4b8ea1"; - sha256 = "1cdlqk0sbj8pa24dqxwg5kgjrghq4f7dma8d0mk33cfaxaq7jvxv"; + rev = "70f15591715796b1d96af660481739f019c295cb"; + sha256 = "1q6qfgfajl103hsf5zp4zxpf4svypv0n1kiqkhjp12b0hy45n2l0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst"; @@ -50731,8 +53304,8 @@ sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-tiddly"; - sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly"; + sha256 = "1rpbnz152af588r8kafqpg9aq3ngwjfkrsjqk6w90l5rh280yi39"; name = "ox-tiddly"; }; packageRequires = [ cl-lib org ]; @@ -50794,8 +53367,8 @@ sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; - sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs"; + sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73"; name = "ox-twbs"; }; packageRequires = []; @@ -50870,12 +53443,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20161014.2251"; + version = "20170506.1759"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "9a6824cda477d1bd77d0507b62dcc09ed436b32e"; - sha256 = "1yswi3yqpfm8sjlhcv4phd069vl9rc2ngi5ma6acpah532k4gi1f"; + rev = "940c991ccd0dab53bd7c120601b3db35669c5e73"; + sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -50912,12 +53485,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170305.2112"; + version = "20170709.120"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "4448466c8fe6f2dc049e076ac10cdc3ba31472fb"; - sha256 = "0fsj7fq2qgvaz76jdxcgrh08q3fnbl4afbsm44mcldfj7fjn1klk"; + rev = "4e4b34fc4f12ef2f7965fa959c5809aacdb6af63"; + sha256 = "036gvgh97ng8l8srq4jgjil6na15fy4h7w7aljxx6wkmaik7nvg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -50979,8 +53552,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "4ee0d996d4c1a6fed0689361bd9524661339ebdd"; - sha256 = "0a1wvjlr176dbkqgf44f0iwvx865wl2isns36gllcq5fsh4g1q1c"; + rev = "3cbbc2ff50ecb5e6fb20a309cb07d74ca10d4d42"; + sha256 = "1bp04c2ljcgxf590yv05wzvqz7b7ih22h343g7rwdd5l3cli43km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; @@ -50996,12 +53569,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20170130.1015"; + version = "20170314.1340"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "d2f01bffc987b226f618dda0663a1e233161518d"; - sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; + rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; + sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -51059,16 +53632,16 @@ page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20161205.2251"; + version = "20170517.235"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "c133848345ceef91e257aab8804c61f31c31b264"; - sha256 = "1d0b2pb2s04l7nkcn7yhrbcm927bsinyiayxn59in7p3mqlcmsnb"; + rev = "82f9100312dcc922fb66ff289faf5d4795d8ca7a"; + sha256 = "1bwh5g63cg2iw3kmcwj4y2jdw46rxll9rgjn6ymx7hbw15s7m5yp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines"; - sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; + sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1"; name = "page-break-lines"; }; packageRequires = []; @@ -51121,14 +53694,15 @@ }) {}; palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "palette"; - version = "20170101.1109"; + version = "20170307.936"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/palette.el"; - sha256 = "0kx41b6axq9ba1mhp7icjq165aklskiq9ddmcn8yrcx480v4gf11"; + url = "https://www.emacswiki.org/emacs/download/palette.el?revision=84"; + sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj"; + name = "palette.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette"; - sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette"; + sha256 = "1s9lklvr1b0a496q0ljbhkl8zdx80d7bqvkdjnfp35z2s37f1zz3"; name = "palette"; }; packageRequires = [ hexrgb ]; @@ -51165,8 +53739,8 @@ src = fetchFromGitHub { owner = "rdallasgray"; repo = "pallet"; - rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501"; - sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw"; + rev = "b8d0df1883224a371ac0a3bc9b9c1c4dc61e6ac0"; + sha256 = "0j87yq8rycklk8df4rlwx0bp2n94pyhaz4yv8vacbqrzchpa1bb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf977287e9bd668efbd972c9937906384ee832c6/recipes/pallet"; @@ -51203,12 +53777,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20161104.1521"; + version = "20170503.606"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "88ad7ea08afae0bf062755bb1e91c5543aac6028"; - sha256 = "0vjxlbm143i9a8pi5v2q82fms8lwf1i24nddxj4a1js2r6mpz15m"; + rev = "72aa0c2abad0ecca689adcf93dd4e9109c9fc737"; + sha256 = "0hrnd46anfq8vzanax7qzq5fl9kdw26aprally9kjqbr5xdjik2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -51224,12 +53798,12 @@ pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pangu-spacing"; - version = "20150927.24"; + version = "20170317.157"; src = fetchFromGitHub { owner = "coldnew"; repo = "pangu-spacing"; - rev = "e3dbbe87b91ab3e368fdcbcd0761ce403020db36"; - sha256 = "0bcqc4r0v02v99llphk8s0mj38gxk87a3jqcp8v4sb9040dkm8gd"; + rev = "a4463dbb74abdeddb6c1c132a1f8fcf67ed87498"; + sha256 = "143ywxgaf5y52ynd4wcqp40c5pgy61ng431y77l46iix10vasslq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing"; @@ -51291,8 +53865,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "17a6690d42a1e854ec270ed930c7494077570fc8"; - sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc"; + rev = "c508a52aee7f10f5e9b750b4724e264a3e694757"; + sha256 = "1xbys48368a6vcyjqxn71lg6yf7zvb2k9dlf07dl6hvh0a7qlpqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -51307,15 +53881,15 @@ }) {}; paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paredit"; - version = "20160615.1325"; + version = "20170405.1149"; src = fetchgit { - url = "http://mumble.net/~campbell/git/paredit.git"; - rev = "7c27746a8eb259ae24b5dce9380801c4846258f0"; - sha256 = "02s8cvrpcdp8xr7m8bfgwiy7wl9bc4834jlm071ypzx5xfip3zxd"; + url = "https://mumble.net/~campbell/git/paredit.git"; + rev = "99829aa423c9e8dd1be8d64c4b68982cf4c1559b"; + sha256 = "13h5gd9s1ajgqzq6ylzcmz4irb071wyhh9qj195ld177irkxi9wd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit"; - sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit"; + sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653"; name = "paredit"; }; packageRequires = []; @@ -51377,8 +53951,8 @@ sha256 = "1il0gbyjnlxhk04z3lgxmvlmlhgc94rmxdf8nl5sk3gblqmr8v3b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0cbe675482a72417cb3ff770ca3b85710e479ac1/recipes/paren-completer"; - sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/paren-completer"; + sha256 = "1k71nmsf155b4pvzcsymsc1bn42h9apypapkvc1kxyr6zm29zcr4"; name = "paren-completer"; }; packageRequires = [ emacs ]; @@ -51432,12 +54006,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170126.2111"; + version = "20170710.821"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "12f54f661180f894be9bc0fd956b30a69b3f39e0"; - sha256 = "0w44w2qgvbv1m5dwyqa7863r1r32fva5rgc0w14srpak41nn3bj2"; + rev = "23ac701e2a1a1364ca96d267437c3413986a4497"; + sha256 = "1kbwmdhv8fpw613yk8sgh3yz4rcrh2aygqkv3c46d5fr0xm04a80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -51474,12 +54048,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "20151006.232"; + version = "20170501.347"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; - sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; + rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; + sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -51495,12 +54069,12 @@ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsec"; - version = "20170219.1442"; + version = "20170508.1500"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "45046868fb2d5f3c914f2e3b67fbe15033c93532"; - sha256 = "07brvf6wcnvwz3y29gxk2yckgcg59898s1dhr3jfsnsq0nxam2ix"; + rev = "8755c60826efaa8603b0d4300bfba9abaa072584"; + sha256 = "03yzs4l53j4fvviqfhdn3cxc710yrg4wdbnl7r69yn69r4di9bfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -51513,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"; @@ -51587,8 +54182,8 @@ sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4af274e0e59aec44ede6f6ed0a34f4bcec6387f2/recipes/password-generator"; - sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/password-generator"; + sha256 = "1ziiz4x4slfadlm7fjpmwvq4a9fi3ird74b6v5na499ylqnzrl59"; name = "password-generator"; }; packageRequires = []; @@ -51597,14 +54192,35 @@ license = lib.licenses.free; }; }) {}; + password-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "password-mode"; + version = "20170411.2329"; + src = fetchFromGitHub { + owner = "juergenhoetzel"; + repo = "password-mode"; + rev = "ed764a4ec1011526457c71b7c37fa9a659a866ab"; + sha256 = "102zydbkr2zrr7w0j11n7pivnsdmq3c6lykf3qc84jifp7j58pgr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28dafa392a378e7de2c6992fe17b33f6379dc6b8/recipes/password-mode"; + sha256 = "1rxh6jg99qxagc6i2xgvswvw93h4ma7j8lhjr4ln44vbgyhzph11"; + name = "password-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/password-mode"; + license = lib.licenses.free; + }; + }) {}; password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "password-store"; version = "20151027.1449"; src = fetchgit { url = "http://git.zx2c4.com/password-store"; - rev = "6c7425b16895c6925c4f1ec875dac4576574b34c"; - sha256 = "1i4g5qhsp426jkxn4z1kps4cnb97lsrbfd2yk7x456v7dkrd6fn8"; + rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; + sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; @@ -51638,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"; @@ -51753,8 +54390,8 @@ sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dc926d83b0376e84b8a88ce794dcdac17603860c/recipes/path-headerline-mode"; - sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/path-headerline-mode"; + sha256 = "0yw2i3cp20v8nd2wj1rs1qad8abghzzasf2sjyla90q06wlna98w"; name = "path-headerline-mode"; }; packageRequires = []; @@ -51858,8 +54495,8 @@ sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; - sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache"; + sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva"; name = "pcache"; }; packageRequires = [ eieio ]; @@ -51900,8 +54537,8 @@ sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3130ab6bf500f68fb9af77d4c33b8ec76c36be6c/recipes/pcmpl-args"; - sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcmpl-args"; + sha256 = "10mgci1rk6sr7wk46mnp5l37v3qxdc6yy5zfvy9mzwzh3va1pw31"; name = "pcmpl-args"; }; packageRequires = []; @@ -52060,12 +54697,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170228.2312"; + version = "20170417.150"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "7cca03bd2fc534a6b42eafc2afef20099bf83dbf"; - sha256 = "05m282b4n2pgj3qgmdms8i8yxb2h2sdlvd7r9xlfp3j5xb35pk27"; + rev = "f314597b2e391f6564e4f9e5cc3af0b4b53f19e9"; + sha256 = "15m7x61m63zxz2jdz52brm9qjzmx1gy24rq8ilmc4drmb0vfmrr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -52332,12 +54969,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170302.712"; + version = "20170509.829"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "5e440fb287897b97a0d13fc150df60b6860e4481"; - sha256 = "1ff1h80hmkm3b1qj4y3hjzmmzcwp14qr8ankmi0qxymsz5z2jar8"; + rev = "a33c91e3738996c058841ed1985c67bedd4875e1"; + sha256 = "10ycv3yb5xav7wslf1swcmbn9w2an5izkca8crmdgr566h9mk0gb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -52350,6 +54987,27 @@ license = lib.licenses.free; }; }) {}; + persp-mode-projectile-bridge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode, projectile }: + melpaBuild { + pname = "persp-mode-projectile-bridge"; + version = "20170315.420"; + src = fetchFromGitHub { + owner = "Bad-ptr"; + repo = "persp-mode-projectile-bridge.el"; + rev = "f6453cd7b8b4352c06e771706f2c5b7e2cdff1ce"; + sha256 = "1gyfn2fhx3bqzr9m1r4b8nyak8pmpcgj7yz2bagnjs21vfngr18c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c049b0067b70577511114dc8abac0a00a9e0588/recipes/persp-mode-projectile-bridge"; + sha256 = "169mpikixa33ljmh2n9sm186yibrik3f5p8m1hcisnzdsc3wgxmp"; + name = "persp-mode-projectile-bridge"; + }; + packageRequires = [ cl-lib persp-mode projectile ]; + meta = { + homepage = "https://melpa.org/#/persp-mode-projectile-bridge"; + license = lib.licenses.free; + }; + }) {}; persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }: melpaBuild { pname = "persp-projectile"; @@ -52382,8 +55040,8 @@ sha256 = "1bdywz241kyvlxn107l2jg6vyhvvw5j4pywrarzx3pdymh9qk645"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf5d4356424b492579a029f58dd4685ff5aaf39/recipes/perspective"; - sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective"; + sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7"; name = "perspective"; }; packageRequires = [ cl-lib ]; @@ -52395,16 +55053,16 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170221.1910"; + version = "20170711.2304"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "cca16ec338454acbad26f4d1d57a463a034bdd44"; - sha256 = "078mfmky682hbjkdxkawimxddzc2laz6xqrcpi1dli1vzgpkx7p9"; + rev = "d69a7bb554d6eb003b7c5c222cbdbaacc7e01df0"; + sha256 = "1r3c352i4vkzqi5rcyniaa2x05jjpq9x8j43bbs4m63lczik75mz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; - sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; + sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04"; name = "perspeen"; }; packageRequires = [ emacs powerline ]; @@ -52413,6 +55071,27 @@ license = lib.licenses.free; }; }) {}; + pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pfuture"; + version = "20170531.805"; + 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; + }; + }) {}; pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pg"; @@ -52462,8 +55141,8 @@ src = fetchFromGitHub { owner = "gromnitsky"; repo = "ph"; - rev = "a66e38637d1898b2ec31ee611033ac3f295fd97f"; - sha256 = "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw"; + rev = "ed80dad9211583ed0db633448b3624c99b7fac23"; + sha256 = "1pgz64zv9a0r16i958x53g7wnk0q7ngcd6z1maf7lxhlp57v015d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph"; @@ -52542,12 +55221,12 @@ phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-grep"; - version = "20170220.103"; + version = "20170606.107"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-grep"; - rev = "e0cdb6d6b8502f9cb4db2d5536d8b32a3be9ebc5"; - sha256 = "12y7jhhqg16sqm063zbz8hjlh1hggjl627qqigqnslxbgsghk97n"; + rev = "ab9bd8d25e751a9cbfa108b49839293230b6e8b5"; + sha256 = "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep"; @@ -52571,8 +55250,8 @@ sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b6d362a12828dfef5f0e2216f5ef21c6cb7eed/recipes/phi-rectangle"; - sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/phi-rectangle"; + sha256 = "111fqqa7h5cajq92sbiqhavm25l5bcapxhfh38y7irq4mv08xifw"; name = "phi-rectangle"; }; packageRequires = []; @@ -52584,12 +55263,12 @@ phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-search"; - version = "20150807.112"; + version = "20170310.237"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search"; - rev = "40b86bfe9ae15377fbee842b1de3d93c2eb7dd69"; - sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62"; + rev = "a81c4ea203fcb572f6cc37cc658d6b01453bef9d"; + sha256 = "1z3640walrdk2c90hj47xvlpm6xd5iblxvn7i16krdfz735i4rr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search"; @@ -52647,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"; @@ -52689,12 +55368,12 @@ phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-pink-theme"; - version = "20161206.1519"; + version = "20170324.1144"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; - rev = "024a1dae5e12d9c62c67c6ba0bc56d2f8a109c15"; - sha256 = "1sfsf4ds6qvdj5hzzla31s1pvp5acbyxqqpncim2kvgim6sxyrac"; + rev = "219edf69adb7e911394c5849c310ca0f4201a917"; + sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; @@ -52710,12 +55389,12 @@ php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }: melpaBuild { pname = "php-auto-yasnippets"; - version = "20141128.1411"; + version = "20170330.1814"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-auto-yasnippets"; - rev = "7da250a0d40f3ec44c7249997436ee8c5cae04ef"; - sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0"; + rev = "03e1f0899c081813901ac15c2f7a675a37cca9f5"; + sha256 = "0d7y6njsd1s2r5df2k8wvvwgxpwwyaqkhdd2b3p1php8rrbj3mg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets"; @@ -52739,8 +55418,8 @@ sha256 = "07lcibr55pk3sab9bbq2r4phadl5p28n63wkq5rkhkkjc7s9rayc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38dc0469a114da121de5b7bdfb75a395f2bcf777/recipes/php-boris"; - sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-boris"; + sha256 = "0kklwk8b98czsg567vgzzdfnv76yn1id3ah2q2qqdhaky1yzw7ak"; name = "php-boris"; }; packageRequires = []; @@ -52770,6 +55449,27 @@ license = lib.licenses.free; }; }) {}; + php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "php-cs-fixer"; + version = "20170506.1133"; + src = fetchFromGitHub { + owner = "OVYA"; + repo = "php-cs-fixer"; + rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112"; + sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer"; + sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf"; + name = "php-cs-fixer"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/php-cs-fixer"; + license = lib.licenses.free; + }; + }) {}; php-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-eldoc"; @@ -52794,12 +55494,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170220.1707"; + version = "20170621.2242"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "aa69d062ea91e03ad84a378ed4f71c63846027d9"; - sha256 = "0xpdzv2vigidnqv2pl9g614cqd8xykyln84pksifx2ldjbcs9xsc"; + rev = "3a9076b6f6146326c1314c580acddce9cbb5a290"; + sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -52823,8 +55523,8 @@ sha256 = "06ffbw66zw5ssavgbllcb9a0syi5asy6wq8yqxdyw66nj941kjbr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/php+-mode"; - sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode"; + sha256 = "1wl15l4m68xng1b87a19fm21qwr230ckjz1iwi3y1xl184zliv8p"; name = "php-plus--mode"; }; packageRequires = []; @@ -52865,8 +55565,8 @@ sha256 = "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/68336364f6956325a2e03194d7db30747ab7f80c/recipes/php-scratch"; - sha256 = "1qlfrmva58jf6c04whn9dshz15wv53pyq60wxv9f3c9bl88ws0nv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-scratch"; + sha256 = "0sl9cccp4xjsidiyjf3sca8wlch3zd23zyac21xys11xm3rjxh9r"; name = "php-scratch"; }; packageRequires = [ emacs php-mode s ]; @@ -53109,12 +55809,12 @@ pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pinyinlib"; - version = "20160505.1248"; + version = "20170424.1352"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "pinyinlib.el"; - rev = "457b5ac6611d0f35ff2444e62008c798b45ae368"; - sha256 = "0kxsam8zb1rdw82d4jpa2n9kcdk05iscymgan39izgaa0w422s0r"; + rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234"; + sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib"; @@ -53148,6 +55848,27 @@ license = lib.licenses.free; }; }) {}; + pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "pippel"; + version = "20170325.649"; + src = fetchFromGitHub { + owner = "brotzeitmacher"; + repo = "pippel"; + rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f"; + sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pippel"; + sha256 = "0w6qbjb1wpz8gn4gzifzzjbc3gckhgnqvrpszrrklqmd10rk5mrw"; + name = "pippel"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/pippel"; + license = lib.licenses.free; + }; + }) {}; pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pivotal-tracker"; @@ -53159,8 +55880,8 @@ sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/793d86ec68fc10d4f23eca4ffef162e920d9fc42/recipes/pivotal-tracker"; - sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker"; + sha256 = "0yiyz11sd25ybgr2qmg62qqmcz96va1pq3q866cqmpl38xn7znpj"; name = "pivotal-tracker"; }; packageRequires = []; @@ -53222,8 +55943,8 @@ sha256 = "150xhsv695cchs5jc2hwk9gjgs0k8wkm966crvxxs6xvj5fg69xq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fc80e94c98ff304a521466c6577c96a10e79a8/recipes/pkg-info"; - sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info"; + sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n"; name = "pkg-info"; }; packageRequires = [ epl ]; @@ -53256,12 +55977,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "20170114.1146"; + version = "20170625.1100"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "43fc59d487d39e6110230a073f1376ab877aa739"; - sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; + rev = "7c376f5bf9d653bf12e414176284736cbdd19108"; + sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -53277,12 +55998,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20170129.553"; + version = "20170529.2212"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "db36861907144674a2526fed3ff733c53489b7f5"; - sha256 = "1sxx749xwxxab3k98wb4gpvy723kw5lcm7zhvvbjbgxr43lk6d05"; + rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949"; + sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -53306,8 +56027,8 @@ sha256 = "1xdj59skmldq5dnarirhwq4qycipas86nbyqwl8zsv0bh20nl1rs"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/18c4b8311b42af9f914264245f4dd377adcfbd0c/recipes/planet-theme"; - sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/planet-theme"; + sha256 = "1hr5m08qn51r9804jd0k95ryz3frzkk1dp6wpybil6bf67a2l5lr"; name = "planet-theme"; }; packageRequires = [ emacs ]; @@ -53361,12 +56082,12 @@ play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; - version = "20160615.2053"; + version = "20170426.33"; src = fetchFromGitHub { owner = "brocode"; repo = "play-routes-mode"; - rev = "325ce59b0b3cb27ddbbde9949a16f6a749ffbd3f"; - sha256 = "0jn4mcwaws92lsj5hp67zlx03qwcxbqacy3rigy1b183ksqqf26i"; + rev = "22d7b87e0eaf0330f2b2283872f8dc08a3258771"; + sha256 = "0j61adh2lsh2zgz1v9i2jzh56ngnrpvsblipvc472k5dxa5qdxin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode"; @@ -53379,6 +56100,27 @@ license = lib.licenses.free; }; }) {}; + playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "playerctl"; + version = "20170414.156"; + src = fetchFromGitHub { + owner = "thomasluquet"; + repo = "playerctl.el"; + rev = "8354352813cd206efb60002f2af4427957bf8894"; + sha256 = "1138jcn2yjfhg0abkiwzzrf69pc5nddppf2hj35mn8b0rr7zs4bq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl"; + sha256 = "1pix3hcsg6ymzajiixwcq4v3clvadpkl0rhplkhachv6wmci327x"; + name = "playerctl"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/playerctl"; + license = lib.licenses.free; + }; + }) {}; plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plenv"; @@ -53411,8 +56153,8 @@ sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a2fef4f90002193bf9758afbe88f2798c44cc294/recipes/plim-mode"; - sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/plim-mode"; + sha256 = "1nrqw5dvb3j5x3wkpsjbpv1d2s367icq9j4h1xv1cahfsn8nn4m9"; name = "plim-mode"; }; packageRequires = []; @@ -53467,8 +56209,9 @@ pname = "plsql"; version = "20121115.243"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/plsql.el"; + url = "https://www.emacswiki.org/emacs/download/plsql.el?revision=5"; sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1"; + name = "plsql.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb457144c112a7a9de2fc4c634dfd6c2dda2e486/recipes/plsql"; @@ -53523,15 +56266,15 @@ }) {}; po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "po-mode"; - version = "20160827.857"; + version = "20170419.303"; src = fetchgit { - url = "git://git.savannah.gnu.org/gettext.git"; - rev = "e5a008ae54ffa54a5343632f88f10ba2e63c4595"; - sha256 = "0fvr0bybqyaix3qcbaj06r61gw69wff63vgsflkc36a92pj971b1"; + url = "https://git.savannah.gnu.org/git/gettext.git"; + rev = "488bf1c3be5ebe66520f352bfb8d99917878ab42"; + sha256 = "1p81ljxxsxd5dp9xn46zia0sp8d095ib3aaby3yzar55nvdfpl6f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; - sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; + sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w"; name = "po-mode"; }; packageRequires = []; @@ -53543,12 +56286,12 @@ pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; - version = "20160530.738"; + version = "20170315.1934"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; - rev = "355424350e9367c67aa8b4e430568390e3960b67"; - sha256 = "1m3rczp5jyh83gfmv4rq11ya5vqly5zf7h4h6za3s5s3n38lldyc"; + rev = "de4c14122ffe6a04c93590da0ad4b8411801c6f5"; + sha256 = "1f1frnxsi8pgbmiycssq1jh1qjp12yfy1hq6zqscj0v510c4kzcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api"; @@ -53561,6 +56304,27 @@ license = lib.licenses.free; }; }) {}; + pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }: + melpaBuild { + pname = "pocket-mode"; + version = "20170327.438"; + src = fetchFromGitHub { + owner = "lujun9972"; + repo = "pocket-mode"; + rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46"; + sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode"; + sha256 = "04zxll5yg021m13vr54w2pnrmqb87ykdbpa8nx2wn9myg2rywh0v"; + name = "pocket-mode"; + }; + packageRequires = [ emacs pocket-api ]; + meta = { + homepage = "https://melpa.org/#/pocket-mode"; + license = lib.licenses.free; + }; + }) {}; podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "podcaster"; @@ -53582,6 +56346,27 @@ license = lib.licenses.free; }; }) {}; + point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "point-pos"; + version = "20170421.932"; + src = fetchFromGitHub { + owner = "alezost"; + repo = "point-pos.el"; + rev = "442bccb40791832cbc2d6f5c8f53be745aea2b73"; + sha256 = "1p56h8ipgrd5433pc641xccdnsni51l58ll0hv2rp9aqjg9nlgcr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos"; + sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync"; + name = "point-pos"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/point-pos"; + license = lib.licenses.free; + }; + }) {}; point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-stack"; @@ -53607,8 +56392,9 @@ pname = "point-undo"; version = "20100504.129"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/point-undo.el"; + url = "https://www.emacswiki.org/emacs/download/point-undo.el?revision=6"; sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz"; + name = "point-undo.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce31bd8f9a1ad4f3252f8cd4ef15984495df18bd/recipes/point-undo"; @@ -53663,15 +56449,36 @@ 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"; - version = "20170216.615"; + version = "20170307.322"; src = fetchFromGitHub { owner = "vspinu"; repo = "polymode"; - rev = "f72ab719c054ad2a46d175c77ad893bb6f476e36"; - sha256 = "1pkhp3b1fv7zvsq8qnf06czyv3ax95kni7k6zjgnrwrvm3ks8fsn"; + rev = "0340f5e7e55235832e59673f027cc79a23cbdcd6"; + sha256 = "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode"; @@ -53684,6 +56491,27 @@ license = lib.licenses.free; }; }) {}; + pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pomidor"; + version = "20170310.634"; + src = fetchFromGitHub { + owner = "TatriX"; + repo = "pomidor"; + rev = "bac68f7a1c72da3db6020d3bda45e38576c9c488"; + sha256 = "13bq9cm9aclnlsjzw66kig2618xr2v5sfb12dff8ja5hmw0j2jla"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; + sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi"; + name = "pomidor"; + }; + packageRequires = [ alert emacs ]; + meta = { + homepage = "https://melpa.org/#/pomidor"; + license = lib.licenses.free; + }; + }) {}; pomodoro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomodoro"; @@ -53750,12 +56578,12 @@ ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ponylang-mode"; - version = "20161008.1423"; + version = "20170514.1419"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "ponylang-mode"; - rev = "1f4ce183e11f4908173cea16685020f2acb818ae"; - sha256 = "1lxzl5ks4lydn8zzvkc0jz6p1zjz7hfm4fs9dlyjxi6fn2bvj5kw"; + rev = "88833317195f5ee2880e33a907861c6c2d3851da"; + sha256 = "0kzzf03m1jzkl9fxzivzh3536c0c9l7m9g5h7zycdz7nj5da38c0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode"; @@ -53768,22 +56596,22 @@ license = lib.licenses.free; }; }) {}; - pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: + pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "pophint"; - version = "20150930.1034"; + version = "20170403.701"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-pophint"; - rev = "fc02a155e28ae27466bedabc756e75c936b01266"; - sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3"; + rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59"; + sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint"; sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72"; name = "pophint"; }; - packageRequires = [ log4e popup yaxception ]; + packageRequires = [ log4e yaxception ]; meta = { homepage = "https://melpa.org/#/pophint"; license = lib.licenses.free; @@ -53792,12 +56620,12 @@ poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "poporg"; - version = "20170303.526"; + version = "20170403.51"; src = fetchFromGitHub { owner = "QBobWatson"; repo = "poporg"; - rev = "ba2f7f4c8662164c5e6f89aa2923484d6f1df8ed"; - sha256 = "04z2p4f5mdnc8jms6z360f3qv6ngpbyp7b88ybvw67kjkg9jn821"; + rev = "2c58d68c81ecca4140bf179f19ed153ec804b65a"; + sha256 = "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg"; @@ -53852,15 +56680,36 @@ license = lib.licenses.free; }; }) {}; + popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "popup-edit-menu"; + version = "20170404.725"; + src = fetchFromGitHub { + owner = "debugfan"; + repo = "popup-edit-menu"; + rev = "925600a6e29183841199e866cf55e566a6a1b002"; + sha256 = "1dd0ss7cjdjs3c7vkq8p874408iysih80brc8vlfh1f43cnc5v92"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu"; + sha256 = "1mqni09l1xfxv4g64hskpsla41r5d2xfbw81ncbszwqzlln6k5bf"; + name = "popup-edit-menu"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/popup-edit-menu"; + license = lib.licenses.free; + }; + }) {}; popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }: melpaBuild { pname = "popup-imenu"; - version = "20160409.510"; + version = "20170326.340"; src = fetchFromGitHub { owner = "ancane"; repo = "popup-imenu"; - rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5"; - sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b"; + rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09"; + sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu"; @@ -53978,6 +56827,27 @@ license = lib.licenses.free; }; }) {}; + postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "postcss-sorting"; + version = "20170531.1858"; + src = fetchFromGitHub { + owner = "P233"; + repo = "postcss-sorting.el"; + rev = "1320d74abd8ee7f0a09b5f7920d554650a7047a6"; + sha256 = "0071al1nwqazv8rhr7qm799rmizbqwgcrb5in3lm0sz88fbs9vnk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting"; + sha256 = "0730b2wddal15yi4k6wzhv9xv1k40iwrn3mivg9bkxabh3mgrl10"; + name = "postcss-sorting"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/postcss-sorting"; + license = lib.licenses.free; + }; + }) {}; pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pov-mode"; @@ -54010,8 +56880,8 @@ sha256 = "112s6qb80sn44b1cxggqfci89wymxvvwkwl7nknfnr2dzd58lzzy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/795b8723e105a22c729ef77377a85c63ee0a2a1f/recipes/pow"; - sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pow"; + sha256 = "13f3pk52f9lkkl3zi6448j9b39kn6ny9vmnlsvhwa6s0vaz8f220"; name = "pow"; }; packageRequires = [ cl-lib emacs ]; @@ -54023,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"; @@ -54085,10 +56955,11 @@ }) {}; pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-c-l"; - version = "20170101.1116"; + version = "20170307.939"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pp-c-l.el"; - sha256 = "07favccg34khq0rnkdmbmhagpn6sg0vrmxcql35vh1p0jalp208s"; + url = "https://www.emacswiki.org/emacs/download/pp-c-l.el?revision=25"; + sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc"; + name = "pp-c-l.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l"; @@ -54103,10 +56974,11 @@ }) {}; pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-plus"; - version = "20170101.1114"; + version = "20170307.938"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp+.el"; - sha256 = "0v8gm9z9dqxmqqvgz4dwmh79ssmir0zf4p3c6wbwrbak16b2ad6m"; + sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh"; + name = "pp+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+"; @@ -54143,12 +57015,12 @@ prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prassee-theme"; - version = "20170228.618"; + version = "20170406.1953"; src = fetchFromGitHub { owner = "prassee"; repo = "prassee-emacs-theme"; - rev = "5c95639cf397b6cae5b0b37e462bd370296f84b2"; - sha256 = "0qyzfw7qxy6jb1qv93a6dvylji62yi06wvi8bqaxjsqf0a3zhb32"; + rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa"; + sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; @@ -54203,6 +57075,27 @@ license = lib.licenses.free; }; }) {}; + prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prettier-js"; + version = "20170712.2334"; + src = fetchFromGitHub { + owner = "prettier"; + repo = "prettier-emacs"; + rev = "9cac36f6b1c224e0772dc92d15a6105ec10d3f40"; + sha256 = "0iwriz14aj5ripnr2v4y96pdl092h93i8mq2qi5jdi31fgi97sjj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; + sha256 = "0mf66sdsdbhf76pwkjkfjsnh26g4j3zb4y1qrbxc9jcvymccb3yq"; + name = "prettier-js"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/prettier-js"; + license = lib.licenses.free; + }; + }) {}; prettify-greek = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettify-greek"; @@ -54226,10 +57119,11 @@ }) {}; pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-lambdada"; - version = "20170101.1117"; + version = "20170307.940"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el"; - sha256 = "17vji7y92ahmhff6ax7znhi7dbfhi8zpghhnl408n5hzcvmqmf06"; + url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el?revision=15"; + sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r"; + name = "pretty-lambdada.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada"; @@ -54421,8 +57315,8 @@ sha256 = "1a9cbzfchbiv7kafmim1mbx38y2iscibbgg6i0aq3200b30mxk57"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; - sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; + sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p"; name = "prodigy"; }; packageRequires = [ dash emacs f s ]; @@ -54520,12 +57414,13 @@ pname = "project-local-variables"; version = "20080502.952"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/project-local-variables.el"; + url = "https://www.emacswiki.org/emacs/download/project-local-variables.el?revision=1"; sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw"; + name = "project-local-variables.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9a509f93bb65cc9bd268ee8c7b13046eac7385/recipes/project-local-variables"; - sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/project-local-variables"; + sha256 = "1jys9nac2912jdv40fly1q4i30xa8b1v2ndbc50rk4ysarhbhdd9"; name = "project-local-variables"; }; packageRequires = []; @@ -54596,22 +57491,43 @@ license = lib.licenses.free; }; }) {}; - projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "project-shells"; + version = "20170312.1912"; + src = fetchFromGitHub { + owner = "hying-caritas"; + repo = "project-shells"; + rev = "1baec678ff04c2970591a2cb477c00b0182d6db1"; + sha256 = "05x0i3zyqgx72r9mzs98anzwdy7l1v2p5m6k4sffp1fcsp78b80v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells"; + sha256 = "0mhifxcpgsfwrhbs7axg6ja4klgzzy9pc0nqa7w3qg45xgi9s4m8"; + name = "project-shells"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/project-shells"; + license = lib.licenses.free; + }; + }) {}; + projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170225.2320"; + version = "20170416.148"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "d9cc453b9e11c9b2f03413e3075e063a6143af69"; - sha256 = "1zam1avzb5dcv0icjd8vs1p7k24szqx1n4b7qr17pikyvjz4g0xs"; + rev = "56e262dd3b5998d0dc6a590d06bc11058839c588"; + sha256 = "0sq0w5fi4zrxccabnh78vjb7drw05ay2lpw7wvnrfv97xkywzr4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn"; name = "projectile"; }; - packageRequires = [ pkg-info ]; + packageRequires = [ emacs pkg-info ]; meta = { homepage = "https://melpa.org/#/projectile"; license = lib.licenses.free; @@ -54624,8 +57540,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; - rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c"; - sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism"; + rev = "7013d933cd9d3c04f19a6572176483b48a311807"; + sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa69679a71495a9ebaa8fcaac42f6682a5167d00/recipes/projectile-codesearch"; @@ -54645,8 +57561,8 @@ src = fetchFromGitHub { owner = "christianromney"; repo = "projectile-direnv"; - rev = "33455b93576855065ba4ba9ed1b05dc36e692f1a"; - sha256 = "09zyzfqy1i3i8knvh1ajr5jcidjx3jpsyx8qarxfr5kv16pwyfvj"; + rev = "d5d29e5228f840b7a25358a2fd50353ef2dc9b16"; + sha256 = "1bq47a6lckgin93cqy5wj277rlrw2cgfywgmbdpxvmbhygpg5hqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/602485c251bc573e855dfd33e4e94052afbab93f/recipes/projectile-direnv"; @@ -54662,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"; @@ -54704,12 +57620,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20170301.1407"; + version = "20170704.2358"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "038c7f9724f684c7862e108150e256a00ff9c5c6"; - sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv"; + rev = "c917c6e188de27331815f39511ed45a408de22d0"; + sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -54729,8 +57645,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; - sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; + rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e"; + sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -54750,8 +57666,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13"; - sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; + rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de"; + sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift"; @@ -54767,12 +57683,12 @@ projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }: melpaBuild { pname = "projectile-speedbar"; - version = "20170127.810"; + version = "20170516.1943"; src = fetchFromGitHub { owner = "anshulverma"; repo = "projectile-speedbar"; - rev = "1b9b3ae7624ca58a41ca7e0d0eb37556d3105c44"; - sha256 = "0src453yf63j5dhndrqjx6gh6nfm5c83y2xj2ibk3sj61x9daxj2"; + rev = "dcab13db72c2084edbebe808e35f1126fe0b3bcd"; + sha256 = "106a4y5r1adjpbnjn734s7d910r6akhjlyjpd6bnczjhp357wyc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar"; @@ -54809,12 +57725,12 @@ projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; - version = "20160929.2052"; + version = "20170410.905"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "e86b89e836ce2d0544b96235ef158d1252fd790f"; - sha256 = "1484gb3lxj8inh7q1z05mqiv5ddq2yymdlmhjxrl1l7c3lqbapn9"; + rev = "bd9e5b5c4727c0facd9d45a4b6a46ffddaf6a131"; + sha256 = "1fx5wg5lnb59z0y25bmysf6a2wld333iihrb9jhcab4hicdqsh9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; @@ -54876,8 +57792,8 @@ src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "7adac1f8e87d69b3d328add8db396f73254a4303"; - sha256 = "0xaa54plzlr894j3bp78c9nf8fqwgjscvdrrirh581ff772gx26z"; + rev = "d3cad4e1f7825404828cd9f5b887f18d3fd83c56"; + sha256 = "1cn1xcp6yfxp642yibknngf456v29s2qq3y8bsc67ydxjkr5w4gz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; @@ -54974,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"; @@ -54998,12 +57935,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "20160805.1045"; + version = "20170526.950"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "0c0a8879c3dd7ee6925746d2206f3262689b5833"; - sha256 = "1np5vkyzp5fjjzj8x3b55pj7mvanqsff726maj77mnixcs11vj7f"; + rev = "c78dbd7c895b8c80cd2f2401d73acf890edf82c6"; + sha256 = "136l13mq0yki95lra6bvzzq602vhp48nnvw741gf7x34rd4k5kwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -55016,15 +57953,36 @@ license = lib.licenses.free; }; }) {}; + protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "protocols"; + version = "20170327.758"; + src = fetchFromGitHub { + owner = "davep"; + repo = "protocols.el"; + rev = "1c93a48d4173635a7b742248797f424e7ce851e3"; + sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; + sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a"; + name = "protocols"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/protocols"; + license = lib.licenses.free; + }; + }) {}; 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 = "20170131.23"; + version = "20170711.511"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "4a78aac90d84ea7aef6219497bd75c3ead988806"; - sha256 = "04qckg29wgzcr4z696s5wm4w8lrq3m799p447l87z5i23gk4hw7j"; + rev = "0a0ead9f8098afbb2f5648bfbbd5c3b7646a1b77"; + sha256 = "0xfkj9kdd7i0jcca8nhsp7bv0x7wsxi03ncln9y8d7c2g72fjkdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -55110,22 +58068,22 @@ license = lib.licenses.free; }; }) {}; - psysh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; - version = "20170205.1142"; + version = "20170610.2104"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "429b59ba8fd5ac7b6d3c6c4e3ad72867062c96db"; - sha256 = "0ldv1lyra05g91hdsif131x7yqdmwld8hdpg4h3qi040kls9bix1"; + rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa"; + sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5"; name = "psysh"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs f s ]; meta = { homepage = "https://melpa.org/#/psysh"; license = lib.licenses.free; @@ -55239,12 +58197,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170213.207"; + version = "20170614.2215"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "03f608234ed0cf403966454de6758ec7fc9c784d"; - sha256 = "11kqbi4bjwn9cb48wn1nfy4d8rln07wmpj263cpb3npm1y6hfvpp"; + rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608"; + sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -55364,12 +58322,12 @@ px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "px"; - version = "20170123.851"; + version = "20170317.1630"; src = fetchFromGitHub { owner = "aaptel"; repo = "preview-latex"; - rev = "446f2c4670ae5a0e62393871190423333c531660"; - sha256 = "02rr4akm93c42zvlm5l1q8q7wipa051bcfv6h52p6fksw18ablha"; + rev = "0c52f7933eab3ca1642ab0df151db9950430c9e2"; + sha256 = "0f741a2gpc2mdl85ivbiskga620b6ci2x0dwjs7m8c1vk6xrxbpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/326fc9b057a5016248ac36ca166e9a38f13babf6/recipes/px"; @@ -55469,12 +58427,12 @@ py-smart-operator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "py-smart-operator"; - version = "20150824.1910"; + version = "20170531.509"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "py-smart-operator"; - rev = "5e3222e4fc285c48a77c8e4c0e1cbc985a9713c8"; - sha256 = "14gppb354wzbbqv0zp1675p84n07rll9n4i6lncd9bvv1flqsxy8"; + rev = "0c8a66faca4b35158d0b5885472cb75286039167"; + sha256 = "09pmkp24s7nwh6p4pzsjp1z65ksi9n3n2xv7d3igpa86l8qgcm2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7491a1825b7aaa5f76aafadb8f04721ab1b1cfe/recipes/py-smart-operator"; @@ -55574,12 +58532,12 @@ pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pydoc"; - version = "20160529.1639"; + version = "20170429.1158"; src = fetchFromGitHub { owner = "statmobile"; repo = "pydoc"; - rev = "5392248e33d83ef05d3b2809b0c6b207786b2644"; - sha256 = "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii"; + rev = "84133eefce0e52a861894815f0c414f1f276f6e1"; + sha256 = "1j5cjfak8rak8rp1cijjfyndpxjkr2vqw22av3386pbwdm6fzamg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; @@ -55741,12 +58699,12 @@ pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pylint"; - version = "20160728.1033"; + version = "20170402.555"; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "7df8caaa3e1995018417ac2fd87afd89be6945ba"; - sha256 = "0fj97k1h4yplz87pfcmbxcg7sam447k1rn6ggb227jlyvqbw30sm"; + rev = "9f7797ae15bd5e4e5c4ad320afcc15eeb4cdae82"; + sha256 = "0p3zmaq0vk5z4ia2i54rjdw4a1d4s9ljb28l48xbb82jmjlgniw7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -55762,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"; @@ -55825,12 +58783,12 @@ python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-docstring"; - version = "20160509.315"; + version = "20170508.156"; src = fetchFromGitHub { owner = "glyph"; repo = "python-docstring-mode"; - rev = "a07bad8498a995d3389711a1989a7fe3502c82d2"; - sha256 = "0y554x7gpjnw2l8yr70h4b0fj2adsl55lndfq6hba5xdiv7y3wkn"; + rev = "d35d2e0fbe468743c19a870fec7b28a7e725790d"; + sha256 = "11y208svg5nxw8k7cbgd2iydng40gwpr85bdnxkywd910sac5p7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring"; @@ -55888,12 +58846,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170219.809"; + version = "20170716.1133"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "52024dfb55354b3cc59f7115421bc130a7670c2d"; - sha256 = "1v0qd7935nlxz7y9175xz8ygx1m6snd0nhgfs2k0bkfyv14ps5bg"; + rev = "4846252fb81c309eb5f7a6aa2dcc04804412c684"; + sha256 = "0zcy7afvyzqmgsn88v5m73bkglnfavhqb4b7fviz355i3waiyfx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -55930,12 +58888,12 @@ python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; - version = "20161107.1048"; + version = "20170711.1155"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "python-test.el"; - rev = "f1d24e53c2a9a77812aa10f8cc6d5a5b49b57615"; - sha256 = "0al1s7fh2l0vhcsz261aaxsn3xkrp451zynym11ifhppf1wwlp04"; + rev = "196efba6dae286e0719bc5993ee23e01db9a0912"; + sha256 = "00hbwy0cnv2v1djncijmbsdxddd48p4g0mfr4nn83203243hvbn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test"; @@ -56053,6 +59011,27 @@ license = lib.licenses.free; }; }) {}; + qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "qt-pro-mode"; + version = "20170604.1141"; + 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; + }; + }) {}; quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quack"; @@ -56098,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 = "c1fe1dce4740ca1fcc3ac4c72db6999579d867a1"; - sha256 = "1m0mx8marrhc3wb925x66rpr15ynax2vx0crljqqsxk04bralj27"; + rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd"; + sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -56158,6 +59137,27 @@ license = lib.licenses.free; }; }) {}; + quick-peek = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "quick-peek"; + version = "20170327.27"; + src = fetchFromGitHub { + owner = "cpitclaudel"; + repo = "quick-peek"; + rev = "6a006fbf1a41b04c0e7522d50c942ec89c3637fc"; + sha256 = "06rww4a6j7wc32hvay83xcjl16aykm8hwlsh764fx9hfxxfa1fka"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68f59a3048ec6196b138b6584a22ce70baa38284/recipes/quick-peek"; + sha256 = "0ivg6v9c535bw2bv636wmkd4sy037j55054bfm31wvvxk99bndwq"; + name = "quick-peek"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/quick-peek"; + license = lib.licenses.free; + }; + }) {}; quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quick-preview"; @@ -56270,8 +59270,8 @@ src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "40f99f69b46edbf0855c92d908c11e29bf2e817c"; - sha256 = "18gf9fzn30190mgdgijzqxyh11q1kmx94fixs6c7gv927i8j7whm"; + rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33"; + sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -56287,12 +59287,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170226.1906"; + version = "20170617.1942"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "c50cd48edc74348bd89b09661ea325dac12fcb48"; - sha256 = "1vxplnnp751lp4nm2vqdysr9b1ksqykrn6l02dn2priyy5hh29k4"; + rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7"; + sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -56371,12 +59371,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20170214.116"; + version = "20170314.146"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2"; - sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn"; + rev = "bd6e385752c89760fdee7bdf331e24d1d80ee7e9"; + sha256 = "17vr2mbz1v20w7r52iqb7hicy131yaqhifbksvknx8xnm6z27pnm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -56421,8 +59421,8 @@ sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/de07b317e46475776d6d237908a0495866a7a851/recipes/rainbow-blocks"; - sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks"; + sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs"; name = "rainbow-blocks"; }; packageRequires = []; @@ -56526,8 +59526,8 @@ sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/246b7fbef1fecc261f4417d7519f26662be3b30f/recipes/rand-theme"; - sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rand-theme"; + sha256 = "0c2xs99jgrhk6f1s6pls8pigg6qwcr4imnwdlngwzr0jz8jhqvxa"; name = "rand-theme"; }; packageRequires = [ cl-lib ]; @@ -56543,8 +59543,8 @@ src = fetchFromGitHub { owner = "kakakaya"; repo = "random-splash-image"; - rev = "907e2db5ceff781ac7f4dbdd65fe71736c36aa22"; - sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll"; + rev = "53a39ebfd8ac6be066a652a508a717870f94218a"; + sha256 = "1mky9xhghzz34sswqm2v3jhfc25fdrjx4hh4a1hs4h45g1v58lm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bfbfe83143299b86f867c4d7faf6a0d7a070e1e/recipes/random-splash-image"; @@ -56560,12 +59560,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20170207.2133"; + version = "20170522.2331"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "efd54e6090114138f6b3acaf21168eca29363cd4"; - sha256 = "02hi45xd6vgaj98v772nmwhwqzlz68d9h5ywndp3i18zddnpr9y7"; + rev = "e371cdc2d6065099fe7c68583597b1d0abea792b"; + sha256 = "1c0jlykxkl46qimr60crac4j7nvzr0jixjiv4m6zzk93pn12y3g1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -56602,12 +59602,12 @@ rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "rats"; - version = "20160315.1145"; + version = "20170505.245"; src = fetchFromGitHub { owner = "ane"; repo = "rats.el"; - rev = "a5c519b88455a8eacd5e3b72286c96dfc484479d"; - sha256 = "0dd9yhxwwk16xkwld9c3hpf9bw8zzc1lyvisp0vn6vcd240j02w0"; + rev = "40aee473d369cd27593cb7709f4792d1006ca8f7"; + sha256 = "0aqs4xja66iwbk39m8w2dm9lcisvjkwym65vinj2ywnp5mkr6jg6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats"; @@ -56631,8 +59631,8 @@ sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/56d330fdd9e3b2cf3afc808190efebcc4cb1456d/recipes/rbenv"; - sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv"; + sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q"; name = "rbenv"; }; packageRequires = []; @@ -56812,12 +59812,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20170304.508"; + version = "20170514.859"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "d7e61535aaf89e643673b27c79b4a84ddb530288"; - sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i"; + rev = "35129521d5b6035e5dd75d5b3481ce4971f46034"; + sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -56851,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"; @@ -56959,12 +59980,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170218.740"; + version = "20170712.334"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "f7012d43f55957256ca81612c2ab5ae496b5a9da"; - sha256 = "0irhzy52vyg7363m0z3d0m9pymzdjwspaffi1j5ahi0lma18c438"; + rev = "ad333ac5e95f7e0c98cb4bc4c924ca9fff97cc88"; + sha256 = "1yng0fj9zr57jwmaxk71vxlwpxahyc4iadyyj5v8c09a4ljvlfs6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -56990,8 +60011,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "realgud-byebug"; - rev = "5f45e790cc8261caccc8f30b99b36c303e2c78f5"; - sha256 = "1gqszhdgrqcrlb3b7i1ng3qxkd8s1fxa69rh652ggwssy0ss8qsc"; + rev = "cb75d6bd9abbe04afa4c74a7ce9c66852814e0c3"; + sha256 = "04fn27a079zsdrf08w4rrvw9xd473ni1bh57gbizdznnvgjldfkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug"; @@ -57007,12 +60028,12 @@ realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-old-debuggers"; - version = "20161225.626"; + version = "20170316.31"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-old-debuggers"; - rev = "fd38ebe7d4a59786d34b0cf972c315278871bf47"; - sha256 = "1p3dk81f1cyisv6fb7fny6a9nij4c0yljypcdwiy79zq3fniskhp"; + rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94"; + sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers"; @@ -57032,8 +60053,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "realgud-pry"; - rev = "fca36075a223f6a4a643764199babe3d1dfde2ac"; - sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp"; + rev = "9b3834048fcbc16827c55af38f8cfef0cf6533da"; + sha256 = "1kpy2ym29mnr89c7im27hhbpww7dgblw6w731ayrlg8rlvqzh7ln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry"; @@ -57053,8 +60074,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "realgud-ruby-debugger2"; - rev = "8d1bf53e250d10bc4b051b32ee6a89161706c66a"; - sha256 = "1ip22z48vj6a6xh54s26ss10pxhqrdm5k9h28i1vgv5x75kqgxii"; + rev = "b394bee61e75b7c6a5fa565594aa79b74887f5df"; + sha256 = "17lspprzaxv6lmwxgqr0vazkvh6dm2cpqs5yildczlr843k90vv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-rdb2"; @@ -57070,12 +60091,12 @@ rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; - version = "20170220.1342"; + version = "20170406.2136"; src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "c42e33227a18258145156e69627b713b303ee702"; - sha256 = "0nkf3jf8x95ybw29gwkivfc3pnaiga7awz2mpyjm5bnz4i335mkm"; + rev = "cf8c45993ed4e0a49dcbda71827dbe5835bda077"; + sha256 = "15v688mnr0vg7pj8mcwqpwbw896xrfjpcbwhgfhq2bd0z0j0shbk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -57113,8 +60134,9 @@ pname = "recentf-ext"; version = "20161210.840"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/recentf-ext.el"; + url = "https://www.emacswiki.org/emacs/download/recentf-ext.el?revision=5"; sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg"; + name = "recentf-ext.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext"; @@ -57222,8 +60244,8 @@ sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8704384ec36a782ba1d08bce33cd47d0a46ee704/recipes/recursive-narrow"; - sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/recursive-narrow"; + sha256 = "15pzwxzyc3dl81v27gk7a4866cxbhzpmmcmfi9n4vrrxmf61h905"; name = "recursive-narrow"; }; packageRequires = []; @@ -57259,10 +60281,11 @@ src = fetchurl { url = "https://www.emacswiki.org/emacs/download/redo+.el"; sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3"; + name = "redo+.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b23e5c692b307ffe1c44216c5865243973ad7ad8/recipes/redo+"; - sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/redo+"; + sha256 = "0v7nrn6fbjx4mb0xsnkvqxk2hp35wfy83si5bavwwym4jcb5pl2r"; name = "redo-plus"; }; packageRequires = []; @@ -57295,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 = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca"; - sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n"; + rev = "a2f8c5612a055882db5c01b8160c0ae1bd44f1e1"; + sha256 = "0glnribgqg6hg3ghb5saf26hwydmsg51aq45wj8mdf5dfncimqq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -57365,8 +60388,8 @@ sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24fcd00ee6509df7cda7d873c9ea82beefdc6944/recipes/refheap"; - sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/refheap"; + sha256 = "11w2pmkz56141gvyzyims9rd42djizni3g6dw4qa48bvlqc56klh"; name = "refheap"; }; packageRequires = [ json ]; @@ -57378,12 +60401,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20170219.807"; + version = "20170322.1527"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "9ac5ccaab861968ff54ce4a89efeb29ea3e4fae9"; - sha256 = "1jqm4dmyzcknzpn6i00wgv1f7fa6acxg4b5vp6hzp8za8i9fzc6p"; + rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1"; + sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -57407,8 +60430,8 @@ sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dfdf111ecf33236f7b922a2b8e5d0f86e669cd8f/recipes/regex-dsl"; - sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-dsl"; + sha256 = "0c9mxsvmx6mgpq838qnjjr7ra4hafikv7hq4nfab7zw9mxrcr2f9"; name = "regex-dsl"; }; packageRequires = []; @@ -57428,8 +60451,8 @@ sha256 = "03qm8s7nqsj0pjnnb0p84gk7hvad4bywn3rhr3ibzj6hxqvppbqj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool"; - sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-tool"; + sha256 = "1s4clmy5r7w6aj2bh2vf2fmbcwnainzidj28mf3kc34x3qhybngq"; name = "regex-tool"; }; packageRequires = []; @@ -57563,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"; @@ -57629,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"; @@ -57650,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"; @@ -57679,8 +60681,8 @@ sha256 = "0gi4pdfgyhl2lss5p71p0jxifni6zl0fv7n4cj42hbalgfyxfv79"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle"; - sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle"; + sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b"; name = "repl-toggle"; }; packageRequires = [ fullframe ]; @@ -57733,10 +60735,11 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20170101.1119"; + version = "20170307.942"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0cbm5g5d1d4bdfmx3nkldpq8k5ah0cz5ddq7cn4278rjx1h9ml5f"; + sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5"; + name = "replace+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+"; @@ -57794,12 +60797,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "20161012.427"; + version = "20170314.2342"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "f0a81e86ede9896b4653839d5b3ca23f784d3678"; - sha256 = "1mk9wl63yhk0pjnbpsk0awvgxh31r6k98jik1b96adid77jxqj76"; + rev = "e7108177d05fc6f674b1766f1154d0652654b1af"; + sha256 = "1pv3yvglfq09rc2vxhy48hglppydsz0ji92564xba5kngqbbjw34"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -57899,12 +60902,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20170130.1926"; + version = "20170704.2212"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "194805787694194cf713ff15ee52a78c8da2d1fa"; - sha256 = "1g2vyi53sna5416q1sgc74yaw8vpqwwhxas4r5xcp8qyxxk5zspy"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -57920,12 +60923,12 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20170220.2245"; + version = "20170609.905"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "56f877fe86373df3eb048ac96d6deef7b9f60892"; - sha256 = "1v4yvkp4f3rg8gi01y1gsfn7sikx4c3w0gisc3kdb3rs9kf1p8dd"; + rev = "e6ac81464cce37b7ae3aea38dcf2720cc2750d31"; + sha256 = "19fh4hsnxb7jc0zhgrg01hn8vbcirjxny5w29gcq7xiighwrbap7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -57941,12 +60944,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20160801.707"; + version = "20170715.440"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d"; - sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp"; + rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c"; + sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -57962,12 +60965,12 @@ restclient-helm = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, restclient }: melpaBuild { pname = "restclient-helm"; - version = "20160407.249"; + version = "20170314.854"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d"; - sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp"; + rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c"; + sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -58026,8 +61029,9 @@ pname = "reveal-next"; version = "20170101.1120"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/reveal-next.el"; + url = "https://www.emacswiki.org/emacs/download/reveal-next.el?revision=7"; sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m"; + name = "reveal-next.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next"; @@ -58043,12 +61047,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170209.556"; + version = "20170623.640"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "47033e0597675a45d2b6852682e392e848a51af8"; - sha256 = "0kd55p8hl7mhcbsqxhqqyfkzq31cnk4aaqzrka681dk6d1xzk8z5"; + rev = "da6a4d2fdc1019e7fcd050db6c5344fdad1e2286"; + sha256 = "1vsfxy4scknn5142mn4v1hkj2qbphmwdj175prd1aj1gk8cbzw9v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -58149,12 +61153,13 @@ pname = "rfringe"; version = "20110405.820"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/rfringe.el"; + url = "https://www.emacswiki.org/emacs/download/rfringe.el?revision=1"; sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh"; + name = "rfringe.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/88fe56cbb3deab4d5f24c66ba166d204b6751bba/recipes/rfringe"; - sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rfringe"; + sha256 = "16a647gvvn5nzgng7a8pam4ay6aifvhldaxg2xfz9fcafzkvw967"; name = "rfringe"; }; packageRequires = []; @@ -58163,22 +61168,22 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170212.938"; + version = "20170622.1135"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db"; - sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661"; + rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; + sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib s ]; + packageRequires = [ cl-lib emacs s seq ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -58254,8 +61259,8 @@ src = fetchFromGitHub { owner = "eschulte"; repo = "rinari"; - rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4"; - sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx"; + rev = "134438af8fbdfa9c8077267c768d273a9792b484"; + sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b243a909faa71e14ee7ca4f307df8e8136e5d7c/recipes/rinari"; @@ -58292,12 +61297,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20170211.857"; + version = "20170602.152"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; - sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; + rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e"; + sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -58334,12 +61339,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20161115.456"; + version = "20170710.711"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "276be756cdf3cbaf23198e5f19ce7daa7bc2b6e8"; - sha256 = "0lhwkgk3n36kd6rzvnj6h5xcp5wwa4yczri0274a7ch5gz2jdhhz"; + rev = "a0a9cfd532f05f9ccb42919b9105d8e902d971fd"; + sha256 = "1gbgm00arfkgvp8gihpn1zf69lp4a5glhvrawnma6kraf5ldx0fs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -58352,22 +61357,22 @@ license = lib.licenses.free; }; }) {}; - robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: + robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "20160926.656"; + version = "20170611.1755"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "0c6d8b52293dea80e62b73204871d177c8896c0c"; - sha256 = "0brhw5fl5xhmmwx27aj1yqjslqvk0qdj4akpgq1ikpx8y4gac95d"; + rev = "9305fa042c40a32a2fcf60f935c0796dc67b5c55"; + sha256 = "0jx3pnz9m9bxlga867qdb6midz82mfl4wzn9dsfihkl399hbj46j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk"; name = "robe"; }; - packageRequires = [ inf-ruby ]; + packageRequires = [ emacs inf-ruby ]; meta = { homepage = "https://melpa.org/#/robe"; license = lib.licenses.free; @@ -58418,12 +61423,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20170131.217"; + version = "20170620.237"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "a3810cf223c92353338418058153a466657a2dca"; - sha256 = "1i6dk80h6f4crw55iwbi5qxj15pr46j8cbd3b5nxcsvhl32900by"; + rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba"; + sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -58468,8 +61473,8 @@ sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9bc02257f07ad72904905993a2a3eeda2917d8cb/recipes/roy-mode"; - sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/roy-mode"; + sha256 = "1r49c1v0xjkrpxmq0k2l2nrx95n06b7hbpmr1n7nkil2bxdq275i"; name = "roy-mode"; }; packageRequires = []; @@ -58502,12 +61507,12 @@ rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "rpn-calc"; - version = "20150302.534"; + version = "20170522.1842"; src = fetchFromGitHub { owner = "zk-phi"; repo = "rpn-calc"; - rev = "ed202e9eb59c4ace74b4703174f7bc7fa7e2d594"; - sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8"; + rev = "66fcb64dbfddfc23823356b6213215bd7ab5efc6"; + sha256 = "1lgabs97x6h4yrgwln8hsxi47wgl46jzhf162wa1almdbqbp9100"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc"; @@ -58544,12 +61549,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20170225.12"; + version = "20170312.56"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "159afaf630be5fb13b3b0762f4c42ae6699dd143"; - sha256 = "0pm0zzk7sdzvk3zwlqpkq5pg6p3kkny9a8104fpyszvd3f2ygsk2"; + rev = "1f468e443e7f2d8419eec29e42074edc400f8c0c"; + sha256 = "03wv1k3ppvdk2776bkbz8bhxw5n7h4b8zm3b2j2j6x7hrxfza5h4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -58565,16 +61570,16 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170303.1422"; + version = "20170714.1944"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "ec6d0dcd9215fe9f29c7cf49685a60c3ebeeaf8d"; - sha256 = "01br0l60ng8jx0wyvikjy96g6safdmr3vdr463jz61shif3xpirx"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; - sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; + sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd"; name = "rtags"; }; packageRequires = []; @@ -58594,8 +61599,8 @@ sha256 = "1ajks5dmsb5cyj0hzxbp3r305liwaayb8jds0wdnw4nk5anlsbnr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0acb202acc25420274a1b9e639f34f9878a61e83/recipes/rtm"; - sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rtm"; + sha256 = "1bwbaps76pawz73fs7nzkvbii9d57zmfdccpm18dwn6phaqxbhyc"; name = "rtm"; }; packageRequires = [ cl-lib ]; @@ -58607,12 +61612,12 @@ rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; - version = "20170123.906"; + version = "20170311.2211"; src = fetchFromGitHub { owner = "bbatsov"; repo = "rubocop-emacs"; - rev = "d4dad3209f05288bdbe3a31f47794047b87fa424"; - sha256 = "1w1mbp04sqsa4jl8ix05i8af9095zbblcjxkhgmj4x57s8yfsiap"; + rev = "980bedb455e3551d35a212fae515c054888907c1"; + sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop"; @@ -58630,13 +61635,13 @@ pname = "ruby-additional"; version = "20161115.2259"; src = fetchsvn { - url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57789"; - sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; + url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; + rev = "59350"; + sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional"; - sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional"; + sha256 = "1x5574swmch89jz2jiq6g34igp94bivzld0lb1nhyb1i3v1msq6i"; name = "ruby-additional"; }; packageRequires = [ emacs ruby-mode ]; @@ -58649,8 +61654,9 @@ pname = "ruby-block"; version = "20131210.1931"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ruby-block.el"; + url = "https://www.emacswiki.org/emacs/download/ruby-block.el?revision=12"; sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq"; + name = "ruby-block.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/ruby-block"; @@ -58670,8 +61676,8 @@ src = fetchFromGitHub { owner = "eschulte"; repo = "rinari"; - rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4"; - sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx"; + rev = "134438af8fbdfa9c8077267c768d273a9792b484"; + sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-compilation"; @@ -58710,13 +61716,13 @@ pname = "ruby-electric"; version = "20150424.752"; src = fetchsvn { - url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57789"; - sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; + url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; + rev = "59350"; + sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric"; - sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric"; + sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8"; name = "ruby-electric"; }; packageRequires = []; @@ -58854,16 +61860,16 @@ ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: melpaBuild { pname = "ruby-test-mode"; - version = "20160930.9"; + version = "20170515.1008"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "0924e9d17e0a9b7c5c1a4e878367be47f58a396c"; - sha256 = "0hlzkwll6di13hja3hm3nzmcjkwgciq9bziz837cr49agagz3b55"; + rev = "740ff1a7c81eb8380fd0f0cdb7c32238acf13dd1"; + sha256 = "1a7lhx7ibh9rrxdamxwd107npnmsf9sxbksvy9rm8l3rnm8yjnvy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/746e0e49a24f16baa5f1cc7f11220766ecf9f1fe/recipes/ruby-test-mode"; - sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; + sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk"; name = "ruby-test-mode"; }; packageRequires = [ pcre2el ruby-mode ]; @@ -58893,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"; @@ -58959,12 +61986,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170117.824"; + version = "20170712.1214"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "0de149a9ad04f652cd7a59a9ef67be8a7d86ba76"; - sha256 = "0cj12mz47k20d2lrnwr81ijbs42wjpdzmw646yghvazdrq23b12h"; + rev = "60a1f36f4111e825d20d9c3aed561981c470806a"; + sha256 = "0p09j3y90i0ninyr3alxra17r09ps4sj9klww638l9csk2cgw80f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -58988,8 +62015,8 @@ sha256 = "04d5z33pv1xqsn539nfkyjh7dvf0kc0rwili1zr6817z0406k1qn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground"; - sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground"; + sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v"; name = "rust-playground"; }; packageRequires = [ emacs rust-mode ]; @@ -59030,8 +62057,8 @@ sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4d9f86140b0ee95742c3a66dfbc063b5f87fb3a/recipes/ryo-modal"; - sha256 = "019r1k14mhdv1x06fd5q4l0l4jnjy330b078qvpxrqv1fnwh1q51"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; + sha256 = "06pm6grsdcldi1khbjfjp7lpi6f6x3pa5ikspp0xdwijnmi0xrrf"; name = "ryo-modal"; }; packageRequires = [ emacs ]; @@ -59043,16 +62070,16 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20160928.636"; + version = "20170428.1026"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "fc395c8d5e6c14d5e0920ab80d4d5df007eed14a"; - sha256 = "07db8jfi1m19x760grkznaiwbap5dp00cicd88cbam16a0qfhbjj"; + rev = "e61dee51474e61b777575b474459c582f3084f64"; + sha256 = "0yw23k8ix8v8sablqzn4802xxzf6b63q6hk3chypbx3y41363s8p"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e5137dac9f8f95579994601cb1e24614f965f2/recipes/s"; - sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; + sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa"; name = "s"; }; packageRequires = []; @@ -59110,8 +62137,8 @@ src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "c10f969e06deb0cb1471ebaa4c9bef8e3aeed39c"; - sha256 = "05g6pd125bjh4494fm65iyxjc1nn3a21amdf8cbzcyjakywajjwa"; + rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499"; + sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -59135,8 +62162,8 @@ sha256 = "1zsznz9pn9dj672jii6wcvs47yqyxv3dsm5qy1dax1d6gvvbf4zq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/455cfeb623057c2bb03a5a78380b3247e2bdd0d4/recipes/salesforce-utils"; - sha256 = "0fyz710saqfi44sf3zqm9n3m4w09zsip015ij0pqs75nanhcnmvy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/salesforce-utils"; + sha256 = "0b70w92zghid6n0ba28dh5r3pckr8jsd1743qyi8vj04ih1dns5i"; name = "salesforce-utils"; }; packageRequires = [ cl-lib ]; @@ -59145,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 = "20170128.424"; + version = "20170702.246"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "28e72f05f2159f94d7fa3270eb35bfc1f06965df"; - sha256 = "1dksmfvvza277dm245s9l8ydnbdqvl054hxsybynx05yb5c3sfgh"; + 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; @@ -59177,8 +62204,8 @@ sha256 = "0aazzq1yqn5mal75hxa6ifx2hnyv0lh800klqvzn26xd7i8xcfrd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5df85d24ee7ed41aab983626df72641bb04dadd5/recipes/sane-term"; - sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sane-term"; + sha256 = "08b8zlr8qzxfrpg9lqiyam3sb8a8rzak79ra4r6ljjppyj4zmwi7"; name = "sane-term"; }; packageRequires = [ emacs ]; @@ -59316,12 +62343,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "20170301.256"; + version = "20170509.1215"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "5a85d5e98b7a23a1009dc089d604de9a32facedf"; - sha256 = "1sxsf3f9rzlpm3pib39cdy4sbn2fg1l5k0iwcr3vpkrfiyzivbpd"; + rev = "20a92323c3edc060c521aa93edab9dad47646b4f"; + sha256 = "0h0wn5c1n2y3cyslz3kbhksvwy1rnwvb1995949b6qkkzwf0cb4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -59337,12 +62364,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20170201.246"; + version = "20170708.1211"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "c8fb801958e7c628ae618e8e1e4e04434ca41110"; - sha256 = "0acbsf5srdpk7gl27wyqkqg56akbg0xff3wzi07yw4hwaspcbm0s"; + rev = "cee28b5e6121e6c85bb647b709c7a8c9e3883700"; + sha256 = "1f5xkcr9kj5nwqh77hfxbs2i9zzsikbksa56lg9vw67pc78rs7vi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -59362,8 +62389,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "14322d78b2be5148c2756d69e7a6c1e53b745569"; - sha256 = "0ih1kahzr3n6rvmsv2jg9v1f5n119vn1qa6jjs27wpd39n3az3hj"; + rev = "a6e98831985be670148c527747b0e91330d0307b"; + sha256 = "0yyacg09p74r4q56kqw3km6sqwnk2hpzxqi9jvbw10x2q2c618bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -59400,12 +62427,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20170131.2121"; + version = "20170611.806"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; - sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; + rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; + sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -59442,12 +62469,12 @@ scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scheme-complete"; - version = "20160604.533"; + version = "20170410.617"; src = fetchFromGitHub { owner = "ashinn"; repo = "scheme-complete"; - rev = "bc7f0bd687c9a6625393053fb6490b4f37c82505"; - sha256 = "0xa0md847v3qizvf22jrb1rwynrdp7dbxv32rf4vl8yjsh44wspn"; + rev = "6bf844202cb9e8490ce37a414374be3f04eefca4"; + sha256 = "16mbcwx1x6bg86qfgl6bhq5qjkz9xgd5f2jl993vvfk824qg4jgl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete"; @@ -59484,11 +62511,11 @@ schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "schrute"; - version = "20161124.1227"; + version = "20170521.1140"; src = fetchgit { url = "https://bitbucket.org/shackra/dwight-k.-schrute"; - rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b"; - sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m"; + rev = "59faa6c4232ae183cea93237301acad8c0763997"; + sha256 = "1w5l1vf4cn4psrxgnq5n6j3zw644s70inpa17vsvng3sk5r8crcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; @@ -59588,16 +62615,16 @@ scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch"; - version = "20120830.1105"; + version = "20170614.1401"; src = fetchFromGitHub { - owner = "cbbrowne"; + owner = "ieure"; repo = "scratch-el"; - rev = "b377e5642aa0d0ddc9dbb2003d2055bc013e6426"; - sha256 = "1nr6yqmxz6jqjkfj249yz88480shlsnmri0d322pkz88d4nkr0hq"; + rev = "2cdf2b841ce7a0987093f65b0cc431947549f897"; + sha256 = "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e794c1fa9bd93e25a65c2b71a5ccf5662fe179bf/recipes/scratch"; - sha256 = "1hhwyvg05cnzfnn4bgygvjfqyayxl65f5zn7h05h9axvcab6s7kj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch"; + sha256 = "1an30pr64fz13s6lghlcb36b7hn3961vv0yipfp9s140ccygdvh7"; name = "scratch"; }; packageRequires = []; @@ -59693,12 +62720,12 @@ scratch-pop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "scratch-pop"; - version = "20150820.139"; + version = "20170510.758"; src = fetchFromGitHub { owner = "zk-phi"; repo = "scratch-pop"; - rev = "2c9648a669ce8e3a9e35e8e1e3c808531d20c549"; - sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1"; + rev = "7f4172c792b10bd38898dd8963cf0ade91921869"; + sha256 = "0mwjq7z0cpaqhqygzhfcpfqyx8376jsc1g2874np6ff49389bj4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420fb3408b64f1a3e42316262016728c483bf0c1/recipes/scratch-pop"; @@ -59736,8 +62763,9 @@ pname = "screenshot"; version = "20120509.405"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/screenshot.el"; + url = "https://www.emacswiki.org/emacs/download/screenshot.el?revision=8"; sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw"; + name = "screenshot.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24f113097db4cc27a2e9c7b9086af6d263e6fcb7/recipes/screenshot"; @@ -59816,12 +62844,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20161029.1945"; + version = "20170501.2155"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "62235bb69b903a5b191ff9935616dddf15fed52c"; - sha256 = "1y2a7132xsi10j9mx0mrpkp947h171rp67n04q0y5smjapvgjjlf"; + rev = "cf7aa835360a1cb93b2b5fedaf5b816ff7410f0f"; + sha256 = "05bcgfzl23v8hkj395pp0gwl088smyx36i82sx5yjgygpg2i5dif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -59920,10 +62948,11 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20161210.820"; + version = "20170702.729"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/second-sel.el"; - sha256 = "0c9j1lbharzyvhvb6whcymra76y0nyqfnaw1s5qzd3xdq5c9sf7c"; + url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29"; + sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg"; + name = "second-sel.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel"; @@ -59939,11 +62968,11 @@ secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "secretaria"; - version = "20161017.1345"; + version = "20170430.1724"; src = fetchgit { url = "https://bitbucket.org/shackra/secretaria.el"; - rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b"; - sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc"; + rev = "7551dfa21a4a796e0306041145c32c2ec8738028"; + sha256 = "1wiqk8ja3wjv7kmnnd93fg9rync08wjyhy1ssxan5csqfg89vw5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; @@ -60001,12 +63030,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20170115.237"; + version = "20170618.500"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "001e205b37ae0dded430b9a809425dc7ed730366"; - sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; + rev = "282bb04ed524ceff2a7a13cee118ec6df55b2323"; + sha256 = "1g15lrx3ik6539vc5f8v3x0va6k02zz5l13jnqlzs1fl4inxk35v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -60051,8 +63080,8 @@ sha256 = "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/selected"; - sha256 = "0nvrfymb7wd5lcyfpxzh0rc0l3qcwrvh0l32ag7mgs7jzgvnphnx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/selected"; + sha256 = "1zk9jvsiw30zqh68xjx2zcc71php68ryiwqmws52ghqiaifj50gf"; name = "selected"; }; packageRequires = []; @@ -60145,17 +63174,19 @@ license = lib.licenses.free; }; }) {}; - sentence-highlight = callPackage ({ fetchurl, lib, melpaBuild }: + sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-highlight"; - version = "20121026.750"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sentence-highlight.el"; - sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k"; + version = "20170405.2352"; + src = fetchFromGitHub { + owner = "sbelak"; + repo = "sentence-highlight"; + rev = "f47839853455d0f4ffe50b3b0f9d3e7a15ace1fa"; + sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1f41eba284e297177e89b9b7a8da4779eb6fdcba/recipes/sentence-highlight"; - sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight"; + sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm"; name = "sentence-highlight"; }; packageRequires = []; @@ -60188,16 +63219,16 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20161121.1247"; + version = "20170320.1311"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "4ec545214b137bd0062d53108b8a523250bda875"; - sha256 = "0hwvsxq7cba2bqanjmlln8cx63nhsq3rlg9p12lwbqrfppmlfj18"; + rev = "8afaf6aa2c63a003e2899e3e5ba8be85f6fdd350"; + sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme"; - sha256 = "058fadcqz21c22lzf33badibb7hn3w695akh560v10n8750h5wca"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme"; + sha256 = "1nvhnyfvmpqg0a54nq73lhz3h9g94zkbix13bbzv9bp1lg8v6w1x"; name = "seoul256-theme"; }; packageRequires = [ emacs ]; @@ -60232,8 +63263,9 @@ pname = "sequential-command"; version = "20151207.1403"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sequential-command.el"; + url = "https://www.emacswiki.org/emacs/download/sequential-command.el?revision=3"; sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk"; + name = "sequential-command.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31db031dc8712e89042d4ce80438a4267a241739/recipes/sequential-command"; @@ -60288,6 +63320,27 @@ license = lib.licenses.free; }; }) {}; + services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "services"; + version = "20170327.835"; + src = fetchFromGitHub { + owner = "davep"; + repo = "services.el"; + rev = "87d65bf9fd8b02101f751846c650fc518355d1ea"; + sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; + sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd"; + name = "services"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/services"; + license = lib.licenses.free; + }; + }) {}; session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "session"; @@ -60341,8 +63394,8 @@ sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/69270c79b47b7d9348bd2ca9fec3aabfd7e694b3/recipes/sexp-move"; - sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move"; + sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9"; name = "sexp-move"; }; packageRequires = []; @@ -60354,16 +63407,16 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "20170225.346"; + version = "20170611.859"; src = fetchFromGitHub { - owner = "nuncostans"; + owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1"; - sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9"; + rev = "8def559784c9f3ebaad179caaff58a9c6afc83a5"; + sha256 = "043pplyjdvqz45q1vlnkh8j8a4fhiw4km3b2xb06bycgs3ysb42h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; - sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; + sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq"; name = "sexy-monochrome-theme"; }; packageRequires = []; @@ -60446,8 +63499,8 @@ sha256 = "04p6132121cv9z20mpp3dw5b4s4k8wcknscq97a7z072cabph3ji"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b1c547d37422998c01a610f88d62784fbca33523/recipes/shakespeare-mode"; - sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode"; + sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x"; name = "shakespeare-mode"; }; packageRequires = []; @@ -60477,16 +63530,19 @@ license = lib.licenses.free; }; }) {}; - shell-command = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + shell-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "shell-command"; - version = "20090621.632"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/shell-command.el"; - sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "shell-command"; + rev = "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd"; + sha256 = "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/shell-command"; - sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-command"; + sha256 = "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk"; name = "shell-command"; }; packageRequires = []; @@ -60537,16 +63593,19 @@ license = lib.licenses.free; }; }) {}; - shell-history = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + shell-history = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "shell-history"; - version = "20100504.150"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/shell-history.el"; - sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r"; + version = "20100505.139"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "shell-history"; + rev = "ee371a81f2d2bf5a308344078329ca1e9b5ed38c"; + sha256 = "0jyz31j5a07shcf2ym5gnn16xk5r3s84ls8kxk5myvxi3wkpgdd4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/039854cf1b41b18423876170c5f48300bf3fe29a/recipes/shell-history"; - sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-history"; + sha256 = "1cmk8rymnj7dscxjq0p23jgwc16yvzw1804ya5wsg95v239gz1hy"; name = "shell-history"; }; packageRequires = []; @@ -60684,16 +63743,16 @@ shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shen-elisp"; - version = "20170213.1303"; + version = "20170427.1502"; src = fetchFromGitHub { owner = "deech"; repo = "shen-elisp"; - rev = "8248cd96a0931cb3215dc13e0905ac4be1701981"; - sha256 = "1acml0p04wxnm0di9iy5kwml6myr7gcj09ky6dw35f0k0m1w51ba"; + rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa"; + sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp"; - sha256 = "0i6z2icpndv5g5ydmwqskl7vrmdz9qp30l5bw1l7gqr3dippjiyz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp"; + sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq"; name = "shen-elisp"; }; packageRequires = [ emacs ]; @@ -60746,11 +63805,11 @@ }) {}; shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20170301.255"; + version = "20170503.1327"; src = fetchcvs { cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; module = "emacs-w3m"; - sha256 = "b861237e76035df9e806681dee0f58680d9e68e773cc5e3c65dd513e127f4240"; + sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; @@ -60766,12 +63825,12 @@ shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; - version = "20170126.420"; + version = "20170523.238"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "074c8696f52253af24a74e4b3a99edf9c0993aa9"; - sha256 = "1cn2kh5ccp09mg6y743vh2y9m96m0zbnh9w5infl9nj9xbidza72"; + rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d"; + sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -60849,14 +63908,15 @@ }) {}; showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showkey"; - version = "20170101.1132"; + version = "20170307.1528"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/showkey.el"; - sha256 = "1mx48ly135wmqrr0srwnxby46b0mcnyw4vyd0jykih9ygd8kk4dj"; + url = "https://www.emacswiki.org/emacs/download/showkey.el?revision=11"; + sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61"; + name = "showkey.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey"; - sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/showkey"; + sha256 = "04lw32k1imvpfc4dr5pz11sx74982xr13hcyblvrz1zxhgixb1z1"; name = "showkey"; }; packageRequires = []; @@ -60865,16 +63925,19 @@ license = lib.licenses.free; }; }) {}; - showtip = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "showtip"; - version = "20080329.1959"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/showtip.el"; - sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "showtip"; + rev = "930da302809a4257e8d69425455b29e1cc91949b"; + sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/19636728b501dadddaad9743635fd51ceb12cc07/recipes/showtip"; - sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip"; + sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780"; name = "showtip"; }; packageRequires = []; @@ -60904,6 +63967,27 @@ license = lib.licenses.free; }; }) {}; + shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: + melpaBuild { + pname = "shr-tag-pre-highlight"; + version = "20170525.902"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "shr-tag-pre-highlight.el"; + rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889"; + sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; + sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v"; + name = "shr-tag-pre-highlight"; + }; + packageRequires = [ emacs language-detection ]; + meta = { + homepage = "https://melpa.org/#/shr-tag-pre-highlight"; + license = lib.licenses.free; + }; + }) {}; shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shrink-whitespace"; @@ -60915,8 +63999,8 @@ sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/97fe5a411be1a7d80d50f5a8af44b74c6c7cf9e6/recipes/shrink-whitespace"; - sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace"; + sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw"; name = "shrink-whitespace"; }; packageRequires = []; @@ -60946,6 +64030,27 @@ license = lib.licenses.free; }; }) {}; + shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "shx"; + version = "20170714.1041"; + src = fetchFromGitHub { + owner = "riscy"; + repo = "shx-for-emacs"; + rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; + sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; + sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k"; + name = "shx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/shx"; + license = lib.licenses.free; + }; + }) {}; sibilant-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sibilant-mode"; @@ -60995,12 +64100,12 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13"; - sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; + rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de"; + sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/sift"; - sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; + sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj"; name = "sift"; }; packageRequires = []; @@ -61020,8 +64125,8 @@ sha256 = "1gzfdk3ks56h8q4xk69aaxkhkg9jhs55iqdicyvq7x9wmjn6b7xw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e5bad0b4c9a7cd28de44ce60de056330a376b3e6/recipes/signal"; - sha256 = "0pvl5qxi0rjbxkpa8kk1q9vz11i9yjmph42si3n7gmm9kc28pk61"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/signal"; + sha256 = "0y4crwpnmwm8bi9jazrph4yj0nnva2i1js8h3bw3sizy20a4yf00"; name = "signal"; }; packageRequires = [ cl-lib emacs ]; @@ -61180,10 +64285,11 @@ simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }: melpaBuild { pname = "simple-plus"; - version = "20170101.1133"; + version = "20170307.1529"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/simple+.el"; - sha256 = "1z1l1lsddd865ma1q714hj4y9p89z1m3hr7z9fir53ipsa31cnl1"; + sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi"; + name = "simple+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+"; @@ -61241,12 +64347,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "20150804.1010"; + version = "20170603.1542"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7079086ec09a148fcc9146ba9bd10e12fb011861"; - sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s"; + rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; + sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -61283,12 +64389,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20170106.2358"; + version = "20170618.644"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "9a97863bc8e089b2a751d8659a7fa2d19876d9bc"; - sha256 = "0vd1n2wsgzhwz6ir5cr90cl844r1yph28iav0kwa6bmk6zkfd3c6"; + rev = "78ab3d818633c0d6575cd1895c119bd690003bf6"; + sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -61325,12 +64431,12 @@ skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "skeletor"; - version = "20151220.2054"; + version = "20170616.1746"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "skeletor.el"; - rev = "78df0da39bdf0d3e78f8d672a3486c02baa9dbd0"; - sha256 = "1sabk2ly80k67hwypm5g292n3c4hjlcmvc61n3ixlkm4nq8dp6sy"; + rev = "01c330ec115fc29bba5d9bdf6c15beb4a44e2281"; + sha256 = "0i3axni8y4s5n2s7qbqzz3sadcfhr3369q7qn8psk29qbicjw5wv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor"; @@ -61367,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"; @@ -61451,12 +64557,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170306.718"; + version = "20170712.2328"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "e64753db3c989ba12f6b52796e9dbcf8c285fbea"; - sha256 = "0bxn7nngc851h5z8bwmc61cl3yps6w6zwf26af6fpcj7d4i8435r"; + rev = "f89362f31d8c1ee752bfd9d3cc8a6b5766c94bd6"; + sha256 = "0b2j0vvsm6psljdkyybjh5ki6drhvq98xwakifk0li220rsi3lkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -61514,12 +64620,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170209.1240"; + version = "20170705.643"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "9eeb7163f07a88450871fff2be78446ee7a4fd52"; - sha256 = "0pxc5ygjc3jz42nxim5l0yc0wns4rfzs2rxwpxy027rqwkk0ap6j"; + rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6"; + sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -61700,15 +64806,36 @@ license = lib.licenses.free; }; }) {}; + slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "slstats"; + version = "20170629.235"; + src = fetchFromGitHub { + owner = "davep"; + repo = "slstats.el"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; + sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q"; + name = "slstats"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/slstats"; + license = lib.licenses.free; + }; + }) {}; sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170305.1423"; + version = "20170413.557"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "f419ab5294015368ef30e658f94894ff2084f5b9"; - sha256 = "0llax80z1d5kn03ip6d4jclnd2x8ydx8q3y8kyx8ypzyvx1ya43n"; + rev = "95519c4ef41988205bb642e534bf2bd2463b6170"; + sha256 = "1bvmmpk4xd954i6dmxjcqayd6apzabg732yhcmjyg633d8hmmiwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -61893,8 +65020,9 @@ pname = "smart-compile"; version = "20161118.403"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/smart-compile.el"; + url = "https://www.emacswiki.org/emacs/download/smart-compile.el?revision=7"; sha256 = "163s97h1a9pjz3pqyn2mhh4mf05b7yycp29k5wnk3c9zc71pafvp"; + name = "smart-compile.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e6c3dd7b8e19193d070fd41c2be4bcd61f1022/recipes/smart-compile"; @@ -61918,8 +65046,8 @@ sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1da4d66a6cae13464343e35f0aed2cb232ac5fe5/recipes/smart-cursor-color"; - sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-cursor-color"; + sha256 = "19ah55514ashkm4f49nlbnrpwxpwlfn6x3fbi4dv0x2b8v1828ss"; name = "smart-cursor-color"; }; packageRequires = []; @@ -61969,6 +65097,27 @@ license = lib.licenses.free; }; }) {}; + smart-hungry-delete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-hungry-delete"; + version = "20170412.643"; + src = fetchFromGitHub { + owner = "hrehfeld"; + repo = "emacs-smart-hungry-delete"; + rev = "7c1d56a92481594e14d40b5fdf6c48657a0108a0"; + sha256 = "0mxaslx5823s68a8ggbbnmfk1jiswjvip5s4sg7ihfagnci72wni"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/abbf52a856b95ab88cde1fdeeebebb81f7c61fa9/recipes/smart-hungry-delete"; + sha256 = "03hw5p055dbayw5z43c1ippf2lnjgs77l7q969ng3fffqkazjq9b"; + name = "smart-hungry-delete"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/smart-hungry-delete"; + license = lib.licenses.free; + }; + }) {}; smart-indent-rigidly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-indent-rigidly"; @@ -62014,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"; @@ -62039,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"; @@ -62169,8 +65318,8 @@ sha256 = "0p1cqpdsp2vdx85i22shyzfhz22zwf1k1dxkqcmlgh3y7f4qq8ir"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/627e46a75bb25cf6e71785b5dda6b037f2adbb71/recipes/smart-window"; - sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-window"; + sha256 = "0w24v7v0477yl5zchyk6713yqp8lyfz600myvv4dp3kgppxpgd3f"; name = "smart-window"; }; packageRequires = [ cl-lib ]; @@ -62182,12 +65331,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170303.346"; + version = "20170716.1328"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "0c81107de550931466b11132b8c6286851615b5f"; - sha256 = "1xmaxl7s8lh288vrqg6diakzldp615z41innkl13yjawnad4mxfk"; + rev = "d4445621b88f36a391fc8bfabbed4db08dc88f33"; + sha256 = "0rsnc5b49n3s6k9a1vr1by1iq1ns9ba2l04k3siqr0hjr8jjwa7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -62232,8 +65381,8 @@ sha256 = "1nzkgfr1w30yi88h4kwgiwq4lcd0fpm1cd50gy0csjcpbnyq6ykf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/26c73e1d15186ebf300c6397fda61a8a885a130f/recipes/smartscan"; - sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan"; + sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w"; name = "smartscan"; }; packageRequires = []; @@ -62308,12 +65457,12 @@ smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smblog"; - version = "20160317.430"; + version = "20170419.321"; src = fetchFromGitHub { owner = "aaptel"; repo = "smblog-mode"; - rev = "25bf9374f692aec845d911286f10a11aaa0945d8"; - sha256 = "1ca8i45dj41vif2hm87ircwm9alxdm98irfi586ybrc72s24036r"; + rev = "5245e7aeac20915121946f59bba30899305d950b"; + sha256 = "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6469537a11972509fa2bfb10eb3f8816cc98efed/recipes/smblog"; @@ -62379,8 +65528,8 @@ sha256 = "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e377955c0c36459698aae429df0a78e84793798f/recipes/smiles-mode"; - sha256 = "0bg2kw7hfb8iqzbf3pgyyj384xmnfz4fj31ijlcrgl71fwb3gc9z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smiles-mode"; + sha256 = "0wf02aj9bhl2m861342f5jfkx3xws1ggcyszfp9jphlykw6r0v9k"; name = "smiles-mode"; }; packageRequires = []; @@ -62538,12 +65687,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20170226.1852"; + version = "20170430.1436"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "6f2c034f1ec557c9e7e624cfd53e8ebb997376ab"; - sha256 = "0255lh2r73h84kks3h7pfr8242q86kb8qrv8sm6dwv9jcbjp094n"; + rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20"; + sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -62580,12 +65729,12 @@ snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }: melpaBuild { pname = "snapshot-timemachine-rsnapshot"; - version = "20161008.305"; + version = "20170324.513"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "snapshot-timemachine-rsnapshot"; - rev = "4ff6b96219f4da576141e376b0348813c1c25615"; - sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa"; + rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f"; + sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot"; @@ -62609,8 +65758,8 @@ sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38043250c1696f61fed04c5feb6a859c36009a5e/recipes/snippet"; - sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/snippet"; + sha256 = "1yld7y1hsrqs0f0iq7zfwknil5zqv65npm67nh548hbyy3rhgd68"; name = "snippet"; }; packageRequires = []; @@ -62651,8 +65800,8 @@ sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0945169fa83a185869b905c9f7e4d37f0a5a8099/recipes/soft-charcoal-theme"; - sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/soft-charcoal-theme"; + sha256 = "1j9yd4kfh7ih5ipmwvxh9qqq6wxv6qk8a9vb5jiyk90dn8a2d7g5"; name = "soft-charcoal-theme"; }; packageRequires = []; @@ -62703,15 +65852,36 @@ license = lib.licenses.free; }; }) {}; + solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "solaire-mode"; + version = "20170610.442"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-solaire-mode"; + rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800"; + sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; + sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5"; + name = "solaire-mode"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/solaire-mode"; + license = lib.licenses.free; + }; + }) {}; solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20161222.109"; + version = "20170430.800"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "dc80b1fe7c613d26b6357dbf447b593af6000ca6"; - sha256 = "0w0lxihnzkav8mab050s600p06f8cmvvdv84fnfzj8zmd2raifki"; + rev = "8aa2ce76327dc7081b1c9a310e858fe2b854d899"; + sha256 = "1a8hqagh4jjskyyc66s2xyspn9k4hvl430kfzgjcfzis889v19y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -62727,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"; @@ -62748,16 +65918,16 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20170305.327"; + version = "20170313.810"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "d2f6facaf012fc556498c90a4d1343fcb59a4628"; - sha256 = "0hnjws9b4k0f6clcpcmvvlqnjkq09zrppkdylw334nhdbpkdhkxl"; + rev = "494981aa8f7828392a930ef8533698944738090e"; + sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi"; - sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; + sha256 = "0j6n1qgdrma6vvi6f7xiy66qwsl8710pca4ga9i7srhxv0r47x68"; name = "sonic-pi"; }; packageRequires = [ cl-lib dash emacs highlight osc ]; @@ -62832,12 +66002,12 @@ sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: melpaBuild { pname = "sotclojure"; - version = "20160421.1811"; + version = "20170512.612"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "8d879ef41c004726cca3c27a81b7543cc273c19b"; - sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh"; + rev = "84e2be5939c33d44f9518aea60cfccff4d6c9707"; + sha256 = "1jz3lscjq8xfkrx464a1s8vyggnh5sjl8jvq8dvx0w7blny2jvz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -62853,12 +66023,12 @@ sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sotlisp"; - version = "20161012.1217"; + version = "20170429.1945"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-lisp"; - rev = "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5"; - sha256 = "0j5zwb1ypqps30126w2684lmjh8ia4qxg8inlajcbv8i3pbai7k6"; + rev = "89dfed2b5d2e9a3b16bfc47f169412b583626059"; + sha256 = "17g03bfaq98ncd95qwms18pdrn5jphq7g2g606pymf10qr62g3n2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp"; @@ -63025,6 +66195,27 @@ license = lib.licenses.free; }; }) {}; + sourcetrail = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sourcetrail"; + version = "20170410.1437"; + src = fetchFromGitHub { + owner = "CoatiSoftware"; + repo = "emacs-sourcetrail"; + rev = "b8d5557aa565ae979622312576db20515f65f977"; + sha256 = "1aqkkbf0xw4kqsy1jjn4xhs5vk2vcsqzs7f4p2sf1plnzsqxflw8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9713bd8030657c8e867409a6aa8173219809173a/recipes/sourcetrail"; + sha256 = "0qa3iw82dbfc1b45505s39m99r0m2473312prws6hch0qhjyji7h"; + name = "sourcetrail"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sourcetrail"; + license = lib.licenses.free; + }; + }) {}; spacegray-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacegray-theme"; @@ -63049,12 +66240,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20170102.59"; + version = "20170630.2327"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "75cc751c3da252bd84f33b12daf11655a9f98fa6"; - sha256 = "1jn3qjxjhbgjixxny1n68ha80c2zqmfrj24ws7ni4zia264phxs0"; + rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33"; + sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -63067,15 +66258,36 @@ license = lib.licenses.free; }; }) {}; + spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: + melpaBuild { + pname = "spaceline-all-the-icons"; + version = "20170711.102"; + src = fetchFromGitHub { + owner = "domtronn"; + repo = "spaceline-all-the-icons.el"; + rev = "88661813baefece9899588cb34c633eda606f2ac"; + sha256 = "1qb26ya4f3qd3rh9cpdb02qyqqz6yhgv05b095i9fvwlcbvr4v51"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; + sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6"; + name = "spaceline-all-the-icons"; + }; + packageRequires = [ all-the-icons emacs memoize spaceline ]; + meta = { + homepage = "https://melpa.org/#/spaceline-all-the-icons"; + license = lib.licenses.free; + }; + }) {}; spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170305.506"; + version = "20170713.1156"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "80f40d21ff3350f6dbd3e572e49e177f734391fe"; - sha256 = "0yavgzricvgrvqgnjwxhw4vlphkglh9bb91j78wsmqr11l1sl66n"; + rev = "11d6958364271e11c920015c24d509f9bdcce6c9"; + sha256 = "1z6l85459fbfyn266qdz09c57ns8d1650ksicl3li442ffh5s75i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -63151,22 +66363,22 @@ license = lib.licenses.free; }; }) {}; - sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20161219.550"; + version = "20170619.255"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "e5bedd0b1df135bb1e42b756da850dac5955aeb8"; - sha256 = "11vpx9cq81ld6k4710nbvnfhpwq0v0bw0zg5aljr2j1pyfyh0pcs"; + rev = "c06eac2abae29ae55794e61ebd06890909edda7c"; + sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d"; name = "sparql-mode"; }; - packageRequires = [ async cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/sparql-mode"; license = lib.licenses.free; @@ -63176,12 +66388,13 @@ pname = "speck"; version = "20160717.951"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/speck.el"; + url = "https://www.emacswiki.org/emacs/download/speck.el?revision=12"; sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa"; + name = "speck.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9cac36b71f3690f65bd0ff78bf4a2fecf2dd5ea2/recipes/speck"; - sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/speck"; + sha256 = "06x5543pwqazs4airj43208caw3sxw7zb148njbn33qgl09r1iv6"; name = "speck"; }; packageRequires = []; @@ -63297,16 +66510,16 @@ sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sphinx-mode"; - version = "20160911.558"; + version = "20170607.1436"; src = fetchFromGitHub { owner = "Fuco1"; repo = "sphinx-mode"; - rev = "7db516b8b985cf209b6430b032cd0457af83b72b"; - sha256 = "0a3vgkp65hpc1a5h79yl0pc02lr6w299wd2fs9cgn8nvbdrip5ij"; + rev = "0a9fcd60639f1f4235b4747e8449b9f48651705f"; + sha256 = "05kn45gh4l1wrj06qb3qzphx8mfqn3zqb8v73awhn5p7a1asb8kr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode"; - sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode"; + sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys"; name = "sphinx-mode"; }; packageRequires = []; @@ -63326,8 +66539,8 @@ sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/spice-mode"; - sha256 = "0r9dp5g3rp8fycd6nmm4m1vwsqahc47h3dsk6whw9a7adxh5i2bv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode"; + sha256 = "1my6dbdnf4scshjf299d4n7vsdq3cxhq9kmqvirs45y3qjm7pgpg"; name = "spice-mode"; }; packageRequires = [ emacs ]; @@ -63410,8 +66623,8 @@ sha256 = "1270c4l7dxxsnzkifwa0ncgv078da9pzhlyxpdfbdbsj8w70plzm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify"; - sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify"; + sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x"; name = "spotify"; }; packageRequires = [ cl-lib ]; @@ -63578,8 +66791,8 @@ sha256 = "0d1ksh1rslzn93b8g6p48ca27f3d0ls4kxjcadjmd700x4vzv88i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/147b6d7a58cab128509589a84fb7938e56aa0604/recipes/sql-impala"; - sha256 = "1jr9k48d0q00d1x5lqv0n971mla2ymnqmjfn8pw0s0vxkldq4ibi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala"; + sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh"; name = "sql-impala"; }; packageRequires = []; @@ -63653,10 +66866,11 @@ }) {}; 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"; - sha256 = "04wqy4ss6499rpn0rnczmn39yi78xkqslblyq4xb700xzmzn7sg3"; + url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26"; + sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q"; + name = "sqlplus.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus"; @@ -63672,12 +66886,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20161207.2044"; + version = "20170610.837"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "81ad4ec3ca58172a3c261acf4973ec767693d0ef"; - sha256 = "02438pr144952ragf1ph4qd43kpzalbp6c5qpl725rwqxjh7bf8s"; + rev = "04970977b4abb4d44301651618bbf1cdb0b263dd"; + sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -63690,16 +66904,19 @@ license = lib.licenses.free; }; }) {}; - sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "sr-speedbar"; version = "20161025.131"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el"; - sha256 = "15kvl270a5xx1w5fjlrawslnpwyks2x17356xcr0idhv5xw2wn30"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "sr-speedbar"; + rev = "77a83fb50f763a465c021eca7343243f465b4a47"; + sha256 = "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f3e11958db5ecf764d6e659608220af2166fb3/recipes/sr-speedbar"; - sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar"; + sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052"; name = "sr-speedbar"; }; packageRequires = []; @@ -63729,6 +66946,27 @@ license = lib.licenses.free; }; }) {}; + ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ssass-mode"; + version = "20170310.2024"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "ssass-mode"; + rev = "c26852123436849367d826c370f24dd9f20cb501"; + sha256 = "05wk2jfvzpzjpqz5vmv8b1yz8nnnix6lv9rh66vgddm794j92dkd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; + sha256 = "07aym4a7l70f1lb6yvwxkhsykrwbf0lcpwlwgcn5n44kavvdbzxm"; + name = "ssass-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ssass-mode"; + license = lib.licenses.free; + }; + }) {}; ssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh"; @@ -63740,8 +66978,8 @@ sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b9700178edf36c4bbaf2b91f7138fbd6fb5f9ea3/recipes/ssh"; - sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh"; + sha256 = "1wlzagcg2fxqcbpd3z02wsil2n224kzmhcd54df80jypgq5fa6k3"; name = "ssh"; }; packageRequires = []; @@ -63774,16 +67012,16 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20170110.1756"; + version = "20170711.1433"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "badbd859517e0a7c0cb8002cf79f4c474478b16d"; - sha256 = "13dqzyc99qvspy8fxdjai0x0s0ggyhdlf6apyrq2r1z0j6gaf88g"; + rev = "8ce61a22d07cdcb96aa31fa9e5493875f00ad516"; + sha256 = "03lpfj2gq0wl8zsjwdkwk5i6ih2cwcmya55cyw8fs8i19y3zhcyb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode"; - sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; + sha256 = "1jlaf1bipmf51552jyp2ax6n4gwg38n2348kyxlwd7d8vwsibbpq"; name = "ssh-config-mode"; }; packageRequires = []; @@ -63795,16 +67033,16 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170109.2256"; + version = "20170711.725"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "1c1e379b153bc6206985c765969fd6a9f56aec25"; - sha256 = "10p5yaagv5lhv6d0jcfk8pynqcw6njkjgjmgicl32nwrkgfapa6f"; + rev = "ec4661059109f25df41db1800cac7ffc168fdbbc"; + sha256 = "1nqf8nwwb188mlyn8xy8v9qzq3xin2pz6synldf0yr8gac8b7bll"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; - sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; + sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; packageRequires = []; @@ -63900,12 +67138,12 @@ standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "standoff-mode"; - version = "20170214.1713"; + version = "20170609.134"; src = fetchFromGitHub { owner = "lueck"; repo = "standoff-mode"; - rev = "a1bea7231a6d25fc05f88c9af588538fea664caa"; - sha256 = "0cxnph1n1f77xhdafl5glmgqysg89k4lk2fy8384gbyhamfj95v4"; + rev = "b194fde6bf31ddc77409275e134aacba27e88043"; + sha256 = "0l48dij62d5cvw7kry0739i8zixkbmj80ghhixb30l6g0wg8k48g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode"; @@ -64088,8 +67326,9 @@ pname = "sticky"; version = "20101129.1852"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sticky.el"; + url = "https://www.emacswiki.org/emacs/download/sticky.el?revision=4"; sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy"; + name = "sticky.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3a9689703b8c8edbffdc966cded9ea98fc8762/recipes/sticky"; @@ -64210,12 +67449,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20161220.1825"; + version = "20170419.1638"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5"; - sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5"; + rev = "297aaf68e666381521b02d433fcd28d8b51c48de"; + sha256 = "1621lwda3j3pwfxqwfa2gp4fxz869bc0ib87v71mrab8p1qsdizg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -64251,10 +67490,11 @@ }) {}; strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "strings"; - version = "20170210.1925"; + version = "20170307.1533"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/strings.el"; - sha256 = "0am2w3p2igh0y5mdbmjfdzyrx3bngs4c3nibjjcky3pmvj4k3r4i"; + url = "https://www.emacswiki.org/emacs/download/strings.el?revision=49"; + sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz"; + name = "strings.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings"; @@ -64278,8 +67518,8 @@ sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fa948128841a1cd3c5fd4c30da3841629b17d3c7/recipes/stripe-buffer"; - sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer"; + sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b"; name = "stripe-buffer"; }; packageRequires = [ cl-lib ]; @@ -64293,13 +67533,13 @@ pname = "stumpwm-mode"; version = "20140130.1816"; src = fetchgit { - url = "git://git.savannah.nongnu.org/stumpwm.git"; + url = "https://git.savannah.nongnu.org/git/stumpwm.git"; rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4"; sha256 = "03is0690p7aw77c30j4r2b5gi5rv5f70wvpixy5qhcchlaxhaw82"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode"; - sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode"; + sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf"; name = "stumpwm-mode"; }; packageRequires = []; @@ -64311,11 +67551,11 @@ stupid-indent-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stupid-indent-mode"; - version = "20130816.1354"; + version = "20170525.417"; src = fetchgit { url = "https://gist.github.com/5487564.git"; - rev = "e26ff5a2c4a582c6c1940bbcd204cfeed8e65222"; - sha256 = "0sw7r4sbg0vmm7gqisjdp1wansn9k64djz3p83fwmyq3qkj90ar4"; + rev = "3295e7de5e2cfddc3bf0e462e852bf58972f5d70"; + sha256 = "00js2jkzvmvh1gbraijknv48y86pqyk9zv264a5n3l4sw5q6kcvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68cd648bde8028a39849f7beae8deae78bfb877b/recipes/stupid-indent-mode"; @@ -64339,8 +67579,8 @@ sha256 = "0cx9llbmfjhaxb60mj483ihl78xb30ldvhd1hdldmc9d473xbvmz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/63af0555576b0430f46d7383d7ea56e1789f43e9/recipes/stylefmt"; - sha256 = "17jj8n8x4ib51a6jdsywcssi6cvxmql9sk7f5clmbi94qxlh48lr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stylefmt"; + sha256 = "14ap3xklmxyqz61p7z3fwgxbwjqrcbijcmvsmhfbm102x1spgbhz"; name = "stylefmt"; }; packageRequires = []; @@ -64415,12 +67655,12 @@ subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "subemacs"; - version = "20160105.359"; + version = "20170401.234"; src = fetchFromGitHub { owner = "kbauer"; repo = "subemacs"; - rev = "d693919991de6b93f0797daae2a12285e54ae27e"; - sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg"; + rev = "18d53939fec8968c08dfc5aff7240ca07efb1aac"; + sha256 = "1k2lg7cxr98rq77sk0ypzlr3cyl20ld20jz8y21fdaa6ci8kdvdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs"; @@ -64436,12 +67676,12 @@ sublime-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sublime-themes"; - version = "20160111.122"; + version = "20170606.1144"; src = fetchFromGitHub { owner = "owainlewis"; repo = "emacs-color-themes"; - rev = "4648b68e96bfde26d6e4af9f919971eef2768e5f"; - sha256 = "0q9p974xvswr2sijz1rs858x9sdx0rb00lkhj5cd90abn33lb260"; + rev = "60ee40af82eb55b79d5ed4026f1911326311603f"; + sha256 = "17fcqvavgyl9cmv1hwcid2bw513vhawlsmac1w2adiz567594i6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/648d250c7d341b31581c839f77c1084ac29d3163/recipes/sublime-themes"; @@ -64477,14 +67717,15 @@ }) {}; subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "subr-plus"; - version = "20170101.1138"; + version = "20170501.916"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/subr+.el"; - sha256 = "057h7hshdvzm3qcwdnbyw0qb7ijw3jz38cff0n9ln4xgsma6cgm1"; + sha256 = "1vrs390vqcsjwzf6pzcvqjc3mliac66g7g5kifvz9zp0v3bq6x7d"; + name = "subr+.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/400c7aede8fee84660b5010eacb93536f1c0b0a4/recipes/subr+"; - sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subr+"; + sha256 = "17i5sgsv8clh3pzpkv5zvhmm584m1rvsypd6nh6ks2jpidwgs8x1"; name = "subr-plus"; }; packageRequires = []; @@ -64504,8 +67745,8 @@ sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bb904557529c5d9658039a10456812810541bfed/recipes/subshell-proc"; - sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc"; + sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp"; name = "subshell-proc"; }; packageRequires = []; @@ -64538,12 +67779,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20170201.916"; + version = "20170605.1710"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "615f6c073e42d433e79ae5a63210e2e04357a4c8"; - sha256 = "0k3ldywy1g6672hhasqmj1rvzrs0cmd3nzxkb688vw6mhzxfzld4"; + rev = "57d49eafd53868d3c86b20fa51e1889e621872c0"; + sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -64601,12 +67842,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161205.450"; + version = "20170703.1433"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "19bfa7d6c2356a62647c7fe85876a88ab3b6475f"; - sha256 = "0sh3nryhcr2spxjh7p0jsjyfhvmqnwjayzz2zrwv3xi2vdgg8gb8"; + rev = "59e140248a667127771aa7aa49ee0511c55e8817"; + sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -64644,8 +67885,9 @@ pname = "summarye"; version = "20130328.327"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/summarye.el"; + url = "https://www.emacswiki.org/emacs/download/summarye.el?revision=4"; sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py"; + name = "summarye.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85e28911e6b8173188f45331c6540681691223f2/recipes/summarye"; @@ -64703,12 +67945,12 @@ suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suomalainen-kalenteri"; - version = "20151129.304"; + version = "20170528.801"; src = fetchFromGitHub { owner = "tlikonen"; repo = "suomalainen-kalenteri"; - rev = "f5907236ce4da372325fce8b3ce429defa5b0f5a"; - sha256 = "1f16ds671mp8jwkkhvpbdqkk3jji96q9ipjlr8ij9vglp2arvslg"; + rev = "d380321ce7b7a5650847a7866bd98226af51d4b4"; + sha256 = "1fcyh26zd7rpp0519kswgr9ps67flwwypw2ic3nwgjdhxb41kmzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; @@ -64893,8 +68135,9 @@ pname = "swbuff-x"; version = "20130607.314"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/swbuff-x.el"; + url = "https://www.emacswiki.org/emacs/download/swbuff-x.el?revision=9"; sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5"; + name = "swbuff-x.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42bac16fa83eb3df693835326444f4bd4255cf1d/recipes/swbuff-x"; @@ -64931,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"; @@ -64973,12 +68216,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170225.356"; + version = "20170609.938"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -65036,12 +68279,12 @@ switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20160229.334"; + version = "20170701.246"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "c1bbe51573a19ff6adae8531bf20601e5da5f7db"; - sha256 = "09ba45zbya2a72prq13pjg9pgbs86c6kayf8q2papvr9f5yv57xa"; + rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; + sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; @@ -65065,8 +68308,8 @@ sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3a0a1f6e4ce4b06d4282f1cbb33d45f507a12c30/recipes/swoop"; - sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/swoop"; + sha256 = "0zcxasc0bpldvlp6032f9v1s4vm9r76pzd7sjgwa9dxbajw5h7fs"; name = "swoop"; }; packageRequires = [ async emacs ht pcre2el ]; @@ -65099,12 +68342,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20161222.1205"; + version = "20170521.1832"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "de73e993930f910862698727b5c0d93a1f656deb"; - sha256 = "03dah9rn6ray0c65rkqcmak77b1hgyi2fc1nqgb5vfgf65jk7z7c"; + rev = "8f1e3346286cfa5a5299ef192cc5aca3f37a7745"; + sha256 = "1ans6l0rv71w2vq0v4137jr0jhgzhkk62l7cq6b5m83v4ld9gr09"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -65117,6 +68360,27 @@ license = lib.licenses.free; }; }) {}; + symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "symbol-overlay"; + version = "20170615.1919"; + src = fetchFromGitHub { + owner = "wolray"; + repo = "symbol-overlay"; + rev = "1c40cd921d573bbbd2cd9770c0bafc484b23a2ad"; + sha256 = "1npgjhjdky298n70n1lh1qi6d1km1d9vy82n2x4rjn45699gkrl8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; + sha256 = "1al60x2mnjsv99jd10v5sd56zz185wsddiq7128phf1l35bkibis"; + name = "symbol-overlay"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/symbol-overlay"; + license = lib.licenses.free; + }; + }) {}; symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; @@ -65224,14 +68488,15 @@ }) {}; synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "synonyms"; - version = "20170101.1140"; + version = "20170307.1537"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/synonyms.el"; - sha256 = "0f1krqbmbdkpll6ggryblcr7gw0wqm3d9hvq145sdwhwi5jw8b4v"; + url = "https://www.emacswiki.org/emacs/download/synonyms.el?revision=63"; + sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk"; + name = "synonyms.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fd538439982dd7bd281bf78e96373b93f4d4a6b8/recipes/synonyms"; - sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/synonyms"; + sha256 = "1b000scgba310i7w27c8wj0iflqqgwik524ql084wpqvikwqnlzm"; name = "synonyms"; }; packageRequires = []; @@ -65243,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"; @@ -65285,12 +68550,12 @@ syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20161213.735"; + version = "20170510.2348"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "e03d1c8d09825377fcb6ae271c60a554f4d7a000"; - sha256 = "0l1ymn6ld15rvpkrz1pyq79c72y4rpc9wz99wfc791r30dqgvj2d"; + rev = "83f6a212637175c8cfb1132eb40cdd4c3343040a"; + sha256 = "0r5zff8fb0gid84f62l88lfh1hp8nkgf9cldnhmmv3icrhc2r0kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -65368,12 +68633,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20170205.1305"; + version = "20170710.612"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "5b3f7f5ae08d306604423f48e9a2ab5daaf58584"; - sha256 = "0b7hjgxr6pv6dj3q233mxlm8ssxpvkhckibn0cfr5xb7ycfkd6rm"; + rev = "ae993f994ed60a845c5752e90491cf127bb1c052"; + sha256 = "1dp8q82k7s2h3pp6qh4x2hbvq23ykn09mf6ymfy62p8jdavfvcx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -65410,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"; @@ -65669,8 +68934,8 @@ sha256 = "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b069fa60d3bbf41168b938f71f4903e313b2c6ac/recipes/tango-plus-theme"; - sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tango-plus-theme"; + sha256 = "1p1b48fvmk7a8m3bnddkx2pp7kz5agac0v1ii2r6iqapdqsl22ng"; name = "tango-plus-theme"; }; packageRequires = []; @@ -65703,12 +68968,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170301.557"; + version = "20170624.1300"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "df36a5b37928855f013d40bd47c87e2ed281727c"; - sha256 = "0qn1z4cxc3v4s6fl0j7k95zdnfs5r860nd0ah0w9yn7ic71jl9ib"; + rev = "bf6d718955d56b7cf824f7a60803c94a676ccb95"; + sha256 = "0hkni0dm4s7sgx7zzk88kls8qzmz47b5g1gskp3kxg88b1nbghcw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -65724,12 +68989,12 @@ tawny-mode = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tawny-mode"; - version = "20160504.1046"; + version = "20170422.1502"; src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "f7013f7e70da5d2fff2fcaf88c5edc2d807a022b"; - sha256 = "08l8c1kixx32zm7vvs4xy7zp53aqwlgx567hg7byqy8mqn3x0q8f"; + rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4"; + sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -65892,12 +69157,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20161105.840"; + version = "20170611.1115"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "44f296e6a16afdde97927c170c6dd0cdb3a3598b"; - sha256 = "16zjijz9syzbcxq1d4bx11kagxwhzygrlgdqvb443cch5s70n2n7"; + rev = "743614f372598597282efd29a18e624d5ef80bc1"; + sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -65997,12 +69262,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20161110.1707"; + version = "20170421.105"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9"; - sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45"; + rev = "7180f09078f89aadb83061420ca8fd58d929b629"; + sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -66015,22 +69280,22 @@ license = lib.licenses.free; }; }) {}; - term-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + term-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-plus"; - version = "20160404.355"; + version = "20170508.1717"; src = fetchFromGitHub { owner = "tarao"; repo = "term-plus-el"; - rev = "f4a8c3aa616f21fa0b4381874149db3cf4e3a360"; - sha256 = "0ca82vj61inn41xzk36a91g73gpg38nya4r9ajc2ldjqa5z1zdj8"; + rev = "c3c9239b339c127231860de43abfa08c44c0201a"; + sha256 = "1mpv9vvvl1sh35vsa5415rvdv57mmbfix8s435q676zvhz3nl8yx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/term+"; sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8"; name = "term-plus"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/term+"; license = lib.licenses.free; @@ -66081,12 +69346,12 @@ term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: melpaBuild { pname = "term-projectile"; - version = "20161106.1419"; + version = "20170421.105"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9"; - sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45"; + rev = "7180f09078f89aadb83061420ca8fd58d929b629"; + sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; @@ -66141,6 +69406,27 @@ license = lib.licenses.free; }; }) {}; + terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "terminal-here"; + version = "20170426.48"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "terminal-here"; + rev = "26e7c8d180dcc62d8802762ba738eb2ee02fd16c"; + sha256 = "06hqqjj8fl32mxiws6jqnii6cnbds2686y2hfv7v83rj6fy31vgc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; + sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj"; + name = "terminal-here"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/terminal-here"; + license = lib.licenses.free; + }; + }) {}; tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; @@ -66148,8 +69434,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e6a7777f273050098fa7074577ac196bae59d80b"; - sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv"; + rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; + sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -66165,12 +69451,12 @@ tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-auto-complete"; - version = "20160906.1204"; + version = "20170521.1235"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e6a7777f273050098fa7074577ac196bae59d80b"; - sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv"; + rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; + sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -66249,12 +69535,12 @@ test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-c"; - version = "20170123.950"; + version = "20170316.1432"; src = fetchFromGitHub { owner = "aaptel"; repo = "test-c"; - rev = "94e9f76659c45100a9b0e2a9fecf6482427cbbac"; - sha256 = "0lnx9fidpfpmwi7xa2ik5mc72lcfc9g8cm9r25s5x7sfy9vr3q8c"; + rev = "5a8c22a0e5ae6e2b0157bf1c41f0fe798c562a21"; + sha256 = "0g1xbb8n3006cqzb6awiqk7n0b6h54dlm7iz5r1n48zaf7mp6046"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c"; @@ -66312,12 +69598,12 @@ test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-simple"; - version = "20170117.411"; + version = "20170527.832"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-test-simple"; - rev = "604942d36021a8b14877a0a640234a09c79e0927"; - sha256 = "1ydbhd1xkwhd5zmas06rw7v5vzcmvri8gla3pyf2rcf2li5sz247"; + rev = "b3b69f52207d3a8111421ad7ab9ed82abbe85316"; + sha256 = "0n400nmz3iyp50sdd4gz0bmfn1sfq5p6a69yv4zd09ypa9gkndws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple"; @@ -66396,12 +69682,12 @@ textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textx-mode"; - version = "20161106.1243"; + version = "20170516.211"; src = fetchFromGitHub { owner = "novakboskov"; repo = "textx-mode"; - rev = "74b701ec2d31b228a8e1e9c993edd00f5c324dca"; - sha256 = "1i4bd17kymdc9w2xd83549f0dva2asnvqcppgsg3svyab8x1aa7z"; + rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3"; + sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; @@ -66439,12 +69725,13 @@ pname = "tfs"; version = "20120508.1120"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tfs.el"; + url = "https://www.emacswiki.org/emacs/download/tfs.el?revision=9"; sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v"; + name = "tfs.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/800aa22df0142a7e39b2d2c3c01321f880878655/recipes/tfs"; - sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tfs"; + sha256 = "0h38qd1xhfd0my26i6w5j1jr91r5qal8x4bp7ij1cym72yxspna6"; name = "tfs"; }; packageRequires = []; @@ -66477,16 +69764,16 @@ theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-looper"; - version = "20160924.2205"; + version = "20170425.606"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "66788db264b3d94f25a077f9a6cecfa1c8ad2c96"; - sha256 = "1wckby9q7c6xdq0kv0x0fdjr9gplj4an5s3kx78dqrxcjj12a35d"; + rev = "0feeed3c93fc54305499bda5953112487f25a3a0"; + sha256 = "18fkfr7cihnkxbz7r2p6dl5w2yzaibx3qxgwqgmx3g47lb1g13gc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/861c3b96189233956b15f222702ff034ed2d8cd1/recipes/theme-looper"; - sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; + sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf"; name = "theme-looper"; }; packageRequires = [ cl-lib ]; @@ -66520,12 +69807,13 @@ pname = "thesaurus"; version = "20121125.1137"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thesaurus.el"; + url = "https://www.emacswiki.org/emacs/download/thesaurus.el?revision=6"; sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq"; + name = "thesaurus.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9734291106ca0bcf018175af8051fe9d2b1cbfa9/recipes/thesaurus"; - sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/thesaurus"; + sha256 = "1cnna27dlragk4w3f59xbrwppp49r010qdn7n3n7wvhibv3cfyd7"; name = "thesaurus"; }; packageRequires = []; @@ -66537,10 +69825,11 @@ thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: melpaBuild { pname = "thing-cmds"; - version = "20170101.1143"; + version = "20170331.1338"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thing-cmds.el"; - sha256 = "1qpszba6ajwqphhk39y6j4wlg7s5lch63lwfa9y28qipwkbn6zlq"; + url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=57"; + sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq"; + name = "thing-cmds.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds"; @@ -66555,10 +69844,11 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20170101.1144"; + version = "20170307.1539"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "0hb3fyqzq0312isid5vji0j74dmkh08p41sss32f4w60yhd8p19x"; + sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a"; + name = "thingatpt+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -66592,6 +69882,27 @@ license = lib.licenses.free; }; }) {}; + thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "thinks"; + version = "20170607.144"; + src = fetchFromGitHub { + owner = "davep"; + repo = "thinks.el"; + rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; + sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; + sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq"; + name = "thinks"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/thinks"; + license = lib.licenses.free; + }; + }) {}; thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thread-dump"; @@ -66641,8 +69952,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "431732d39e89f1661dc7dddffedb2c5c1e019cc7"; - sha256 = "1mz2g5flz7yrsjzjfa9p6f5sinhd3xxf6nn3sjma7a9jcm626l7l"; + rev = "0dd823580c78a79ae9696eb9b3650e400fff140f"; + sha256 = "1j6pq0gxlfbcfkh9pmfgqpfvdmsd1q4jx384jib12y4g0maxnf2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -66658,10 +69969,11 @@ thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "thumb-frm"; - version = "20170101.1145"; + version = "20170307.1540"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thumb-frm.el"; - sha256 = "19fiafq5nl29wr35l7nkzjs70fvnw0g27424x7xnm425gwaags8s"; + url = "https://www.emacswiki.org/emacs/download/thumb-frm.el?revision=62"; + sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd"; + name = "thumb-frm.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm"; @@ -66698,12 +70010,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170303.1211"; + version = "20170712.638"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "616a93710a3bf882f75f61bd8f3438de698938c4"; - sha256 = "19n1pc3igwbd1yz1cylnk46jvv723aab7505i8r7mw05zd5cnwpg"; + rev = "329d4541b1aa5f90689e84c925562d3bda708755"; + sha256 = "10rn2lxwir488x1d43bqvsg7la818si0w1qqsf59q79hllzjclg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -66720,8 +70032,9 @@ pname = "tidy"; version = "20111222.956"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tidy.el"; + url = "https://www.emacswiki.org/emacs/download/tidy.el?revision=9"; sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa"; + name = "tidy.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf079dbd04675ecd5f511b940d7cc5f80ccc94c4/recipes/tidy"; @@ -66839,6 +70152,36 @@ license = lib.licenses.free; }; }) {}; + timonier = callPackage ({ all-the-icons, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }: + melpaBuild { + pname = "timonier"; + version = "20170411.100"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "timonier"; + rev = "0a150ea87bf695b43cf1740dfd7e553e0ae7601c"; + sha256 = "18yls8zc8d5nhx8j3l5av5xvmxmjrrmbzzab59kc6zib0isgxlcz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier"; + sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0"; + name = "timonier"; + }; + packageRequires = [ + all-the-icons + dash + emacs + f + hydra + pkg-info + request + s + ]; + meta = { + homepage = "https://melpa.org/#/timonier"; + license = lib.licenses.free; + }; + }) {}; timp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fifo-class, lib, melpaBuild, signal }: melpaBuild { pname = "timp"; @@ -66909,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"; @@ -66968,12 +70311,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20160807.2022"; + version = "20170702.1859"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "b2b154b0cbe495f25de1bd9bccc76666ef209342"; - sha256 = "1bdd31aravm01ahy3ksgfdm65rknzj2v5a69vnag36ap7lj4ax49"; + rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1"; + sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -67010,12 +70353,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20170131.558"; + version = "20170518.451"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "cda8f73640ae26c476990eae421e42627445f9d0"; - sha256 = "1qkm70ay10blhji8z6c64f18288r1gswzmmkvg7b2z2rz9w475fm"; + rev = "5a8a3f9b3a1440eb207a031685b7f4d77ef05b76"; + sha256 = "0cwc7l8vf6x62s7727a6zr099zxgbbgnqkb2y60js6bys2mxqv99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -67028,24 +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"; - sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5"; - }; - 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"; @@ -67057,8 +70382,8 @@ sha256 = "08fd5lk1gq9clxhz5i81qm5f0a20yrx49iy13bx1p59gj20f1z41"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f934da448463e672de3c87b2ee514a370f67107d/recipes/todotxt"; - sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt"; + sha256 = "1ravnkj6y2p027yhba2lan10079xzd2q7l8gyb8n6bwq14jif127"; name = "todotxt"; }; packageRequires = []; @@ -67091,12 +70416,12 @@ togetherly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "togetherly"; - version = "20150820.138"; + version = "20170425.2316"; src = fetchFromGitHub { owner = "zk-phi"; repo = "togetherly"; - rev = "9d655661984f7d62e9d6e0e9d47ae7ca8c4f43c7"; - sha256 = "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796"; + rev = "a6491bd5dd84f2aded0cd112ff06ae76ff78dfeb"; + sha256 = "05x6ppfkpklxf1098acs6gpd3zm9k05vhywa7n01y2g6nhp697pw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05da36e2d57a57255423a24a34742cbac2f6c9a5/recipes/togetherly"; @@ -67279,10 +70604,11 @@ }) {}; tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tool-bar-plus"; - version = "20170101.1147"; + version = "20170307.1542"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/tool-bar+.el"; - sha256 = "19ayc57vnv9348nfc10392kr4xd6wg0b6v2ya3x2zlpfsq3a6w2n"; + sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm"; + name = "tool-bar+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+"; @@ -67299,8 +70625,9 @@ pname = "top-mode"; version = "20130605.1039"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/top-mode.el"; + url = "https://www.emacswiki.org/emacs/download/top-mode.el?revision=3"; sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn"; + name = "top-mode.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/top-mode"; @@ -67362,8 +70689,8 @@ src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; - rev = "27a074b21238855ce3c33d22e42d69e2c2921205"; - sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk"; + rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c"; + sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox"; @@ -67396,15 +70723,36 @@ license = lib.licenses.free; }; }) {}; + tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tql-mode"; + version = "20170402.1846"; + src = fetchFromGitHub { + owner = "tiros-dev"; + repo = "tql-mode"; + rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018"; + sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode"; + sha256 = "0nrycix119vail6vk1kgqsli4l4cw8x49grc368n53w0xwngh0ns"; + name = "tql-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/tql-mode"; + license = lib.licenses.free; + }; + }) {}; traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20170302.613"; + version = "20170713.2320"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "de76278e77d26ab8c400c03cef7bc3326be1e257"; - sha256 = "1l092pxpm02wr0wp5j1027s8wdd0qjaj5rl2gfl9b2qskw4qh8f2"; + rev = "7a443ad17643060f9b4c2897abe185bb9221e304"; + sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -67430,8 +70778,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9d68903018f255838b51c734015be74bbdbf539c"; - sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh"; + rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; + sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -67531,12 +70879,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170305.1155"; + version = "20170715.2304"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "3c1b891f350a5c0b87d15d174203b9ba2bf3db2d"; - sha256 = "0l2qqrxpfn4f0x9zdz0rsf5vw8238ycjmxnbjx7mcp3awm90pp46"; + rev = "2c033fb7a2614a21920d1cb06665f590b97694da"; + sha256 = "1ark2lcms43kk24352k1jbmgv5bcymmbfqhpbzrribagm5n9qr2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -67549,16 +70897,19 @@ license = lib.licenses.free; }; }) {}; - transpose-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + transpose-frame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "transpose-frame"; version = "20151126.626"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/transpose-frame.el"; - sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "transpose-frame"; + rev = "011f420c3496b69fc22d789f64cb8091834feba7"; + sha256 = "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7682372c9075e19fcef2a2462c30010ee324cd14/recipes/transpose-frame"; - sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/transpose-frame"; + sha256 = "1ksdc4d9k05452hcq4xx0j5nfl9n01z8abbca6j7j66bdf3m4l1b"; name = "transpose-frame"; }; packageRequires = []; @@ -67595,8 +70946,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-travis"; - rev = "c8769d3db10ed4604969049e3bd276afa0a0138e"; - sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz"; + rev = "754ef07c17fed17ab03664ad11e2b0b2ef5e78ed"; + sha256 = "1ciwf40ghlm4w9g4ynbc3d1a93gf6f3imm3m8z9kqfa7cnlsypb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c064a0dc7922cbe4cff2ae65665c4f10e6dbff27/recipes/travis"; @@ -67609,16 +70960,19 @@ license = lib.licenses.free; }; }) {}; - tree-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + tree-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "tree-mode"; version = "20151104.531"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tree-mode.el"; - sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "tree-mode"; + rev = "b06078826d5875d74b0e7b7ac47b0d0917610534"; + sha256 = "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dc67872b6463bebbf06ef9a44521ab2a029fa359/recipes/tree-mode"; - sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/tree-mode"; + sha256 = "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b"; name = "tree-mode"; }; packageRequires = []; @@ -67627,6 +70981,48 @@ license = lib.licenses.free; }; }) {}; + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + melpaBuild { + pname = "treemacs"; + version = "20170705.1153"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; + sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh"; + name = "treemacs"; + }; + packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + meta = { + homepage = "https://melpa.org/#/treemacs"; + license = lib.licenses.free; + }; + }) {}; + treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: + melpaBuild { + pname = "treemacs-evil"; + version = "20170625.1401"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; + sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3"; + name = "treemacs-evil"; + }; + packageRequires = [ evil treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-evil"; + license = lib.licenses.free; + }; + }) {}; trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }: melpaBuild { pname = "trident-mode"; @@ -67817,12 +71213,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170221.1141"; + version = "20170531.557"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "f242fe45dc47aab8fe69392304ebc2c779c411e0"; - sha256 = "07lz7s7z913h0mvmjnvvg9m36pc5r9nrg1a6z2wxszbccjvkz95b"; + rev = "79bca7dc9254da190d821b504da4946df8c3d548"; + sha256 = "02zjjq3nmmawmialhj95bz032a3ycyvzl5sgp7g37l7q3l0s63bc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -67867,8 +71263,8 @@ sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5561a3284d861048251dc58182c95d16367e4744/recipes/tumblesocks"; - sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tumblesocks"; + sha256 = "005w7vfzi4qpm59pxhq9nhp8hlwh4m1i7zj6l4knizcwm5xrm4ab"; name = "tumblesocks"; }; packageRequires = [ htmlize markdown-mode oauth ]; @@ -67898,6 +71294,27 @@ license = lib.licenses.free; }; }) {}; + turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "turing-machine"; + version = "20170512.1438"; + src = fetchFromGitHub { + owner = "therockmandolinist"; + repo = "turing-machine"; + rev = "4b5901a13b38028b05ce19cecc78bcd2f708f97d"; + sha256 = "1avsqqpsbzlm0wi6fc5lgnmhps5wcr6gp05d4hw51sd5r0vx00dk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; + sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; + name = "turing-machine"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/turing-machine"; + license = lib.licenses.free; + }; + }) {}; turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turkish"; @@ -67972,8 +71389,8 @@ sha256 = "0g6qqfgbg507r8lgq99zj2b5n3r9m23hpx19m36c3i55mh94dl2h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4dfafdd43a22320c619f481e2bbe162459b48990/recipes/twilight-anti-bright-theme"; - sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme"; + sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k"; name = "twilight-anti-bright-theme"; }; packageRequires = []; @@ -67993,8 +71410,8 @@ sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/03c59c8fcf706fcdb34762e74ad1449540c357e2/recipes/twilight-bright-theme"; - sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-bright-theme"; + sha256 = "039mg147cvb0pk59q3c1bpx7562bajgrs74xymylr89hvrxivxqh"; name = "twilight-bright-theme"; }; packageRequires = []; @@ -68014,8 +71431,8 @@ sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/40e5497d05a7c83dc659cd1213dc9e8ea5d90f65/recipes/twilight-theme"; - sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-theme"; + sha256 = "0g9bbb6m7q8x4zcw5gfmg7ljsfdmjh0335sq53b0lva0h3ra6kzx"; name = "twilight-theme"; }; packageRequires = []; @@ -68027,12 +71444,12 @@ twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twittering-mode"; - version = "20160921.1038"; + version = "20170312.735"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "08a810167d47852367e7e8d56916c794f7b0fd04"; - sha256 = "15wghd8iiyrikahd7ayga9m0s993ghriwk44ylcycy3a6axaizmi"; + rev = "63c96fb029033b1a300b90aa922e167c7c405bcb"; + sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; @@ -68069,12 +71486,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20161130.1944"; + version = "20170710.427"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "3b0ace2a710cbe0a47617a2e4650f593c7282385"; - sha256 = "15rghh1k657hiahaqb6isrxs1bwys220r0fzk7fxhv8jfbmb2a12"; + rev = "1cea84486f937946a90caacf2a7c86ca855d1c9d"; + sha256 = "0s9gnlm52rsdda0qzfn89sjawd5r5qxdc878y11cak9zz4h6d706"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -68091,8 +71508,9 @@ pname = "typing"; version = "20121026.1418"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/typing.el"; + url = "https://www.emacswiki.org/emacs/download/typing.el?revision=13"; sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31"; + name = "typing.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bc0c7b53431a9d2bc41c9a7a755bdad0fa0f5cf/recipes/typing"; @@ -68129,12 +71547,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20170101.318"; + version = "20170519.51"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "eb2d9a73851c64e21c211136c36b9de34812dc0f"; - sha256 = "0r8cr4h3pkc23zxv01kkqv7bn34vppw6wgm7npzc9c04l40hs7iq"; + rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35"; + sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -68158,8 +71576,8 @@ sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8cf02f5c8cb29265e9c83be9c959b8a9012a369d/recipes/typo"; - sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; + sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h"; name = "typo"; }; packageRequires = []; @@ -68212,10 +71630,11 @@ }) {}; ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ucs-cmds"; - version = "20170101.1149"; + version = "20170308.1512"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el"; - sha256 = "0ql6qyzcj067vx2amwfh2m4vi056zf7qra4pkyskv829nxqg9mk8"; + url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el?revision=23"; + sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw"; + name = "ucs-cmds.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds"; @@ -68273,12 +71692,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170306.214"; + version = "20170607.206"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "69bbb941a6835137564b919109884d056429f2f0"; - sha256 = "1dg642b8s9s0f97mqm7facqsg6lmaxi9nv0kpj33p58bqsjrq6hc"; + rev = "e3a343991c0175092f27665fce9474e240f3f1f7"; + sha256 = "0wmyym7aj0wr80ya1wif1ywmsy4pln4khyzcnfhd0xrp62pya2cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -68316,8 +71735,9 @@ pname = "unbound"; version = "20160505.2355"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/unbound.el"; + url = "https://www.emacswiki.org/emacs/download/unbound.el?revision=11"; sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18"; + name = "unbound.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/118e8df30e4caf2a5ef668af8970cfbfc2327004/recipes/unbound"; @@ -68354,12 +71774,12 @@ undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: melpaBuild { pname = "undercover"; - version = "20161114.819"; + version = "20170502.912"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "465e339749f924606df71e250ae10d1f910f71a9"; - sha256 = "0p75m1v9hvdlmlpg9zk09q9zyxf1ld6njfqir6hx83lidgvs5wsm"; + rev = "d947e6410a3b269c657645b499a413d90d4b69ca"; + sha256 = "0c4i8qfa6mzbnjmdk9zqgw324fxyjnq5dm6bmxfadsnvnhjmn7y5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; @@ -68372,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"; @@ -68396,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"; @@ -68466,8 +71907,8 @@ sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5847a8ec892a1d00627a90a509bdde5a8a558df3/recipes/unicode-emoticons"; - sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/unicode-emoticons"; + sha256 = "0sp4sb2yw9msyqxgp4q5z9pzfvqwhizd1sx8w63g1vis6n2h254r"; name = "unicode-emoticons"; }; packageRequires = []; @@ -68781,6 +72222,27 @@ license = lib.licenses.free; }; }) {}; + uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "uptimes"; + version = "20170425.331"; + src = fetchFromGitHub { + owner = "davep"; + repo = "uptimes.el"; + rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; + sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; + sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; + name = "uptimes"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/uptimes"; + license = lib.licenses.free; + }; + }) {}; url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; @@ -68788,12 +72250,12 @@ src = fetchFromGitHub { owner = "yuyang0"; repo = "url-shortener"; - rev = "48182912d4f3a704d0b53f1664b995cfbf2ccd28"; - sha256 = "179hi6hsp2naczlcym3qxx9wbqx96bkkzvqygf3iffa0rmik4j7h"; + rev = "817ac58f6fd2190f688619a91cdc28654b211df9"; + sha256 = "1nah3vjg7966ssh2iwz8fingmcni867ksj2bjrvkgzmqbxqdxz9r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ac2d564ebebda3c7c5b5da278355dd242199427a/recipes/url-shortener"; - sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener"; + sha256 = "08zsirsndhr8xny2vkzznkvjs0b6490lzd915ws6crdwxp6mx5si"; name = "url-shortener"; }; packageRequires = []; @@ -68827,8 +72289,9 @@ pname = "usage-memo"; version = "20110722.851"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/usage-memo.el"; + url = "https://www.emacswiki.org/emacs/download/usage-memo.el?revision=12"; sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i"; + name = "usage-memo.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae8f3adf42300fc0d8f0c5474edf839614d84978/recipes/usage-memo"; @@ -68844,12 +72307,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170218.132"; + version = "20170710.1234"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "53bf803f1d3efc61653f94fe56ff30a72304861e"; - sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp"; + rev = "7b055494e39efba8b237202b7c97f40aa19e2579"; + sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -68886,12 +72349,12 @@ utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "20151105.247"; + version = "20170508.2343"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "f2015062fa5f8ff5a39d3f2db9475862f433b2d0"; - sha256 = "1l00rhh9l4b9ww5sx1vm87qnydcr59ka4w2n2faifglnsv3awzn6"; + rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d"; + sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -68915,8 +72378,8 @@ sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a717d05d3158658c8e57670ee630a9cc16a4aea0/recipes/uuid"; - sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/uuid"; + sha256 = "0d69z9686gnd1bb17wa44v1rbbgccacn4kicwf9niwwp05nccfw6"; name = "uuid"; }; packageRequires = []; @@ -69135,22 +72598,22 @@ license = lib.licenses.free; }; }) {}; - vc-darcs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-darcs"; - version = "20151225.1228"; + version = "20170409.623"; src = fetchFromGitHub { owner = "velkyel"; repo = "vc-darcs"; - rev = "f9b4cd89ed7eff91009ce27d9e1d2fb555a5efff"; - sha256 = "1zpvinbc3nrnjm931fgzrlkl31xcsg9ikh041s1fkfjkhfq0h82h"; + rev = "9c5cbf6fd9b624a31e918dd1a516b24d8b7ffe9d"; + sha256 = "0g26hyjblxldqr5hhijqaclmk1p6a1kc5yh3hkflw6y7lgcrqxkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs"; sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m"; name = "vc-darcs"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/vc-darcs"; license = lib.licenses.free; @@ -69243,12 +72706,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20170204.1636"; + version = "20170525.1231"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "d243767ed4b1ac68515c9276f53cc3ea407456a3"; - sha256 = "1xg4jxz1nxsmfwdqwzz35mkvd3afa28dlxgd5rw19m0wqsb0miim"; + rev = "66ae1ac324d9ec7ef87abee38f260734f036cf3d"; + sha256 = "0d8zam8p6qyzjr99n0jpmjav429qkjgg59gidmhgf0cbx2pyvy8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -69261,15 +72724,36 @@ license = lib.licenses.free; }; }) {}; + vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }: + melpaBuild { + pname = "vdiff-magit"; + version = "20170519.1407"; + src = fetchFromGitHub { + owner = "justbur"; + repo = "emacs-vdiff-magit"; + rev = "1ccf0a8be5aad18648fd59c775a8dd6070398b74"; + sha256 = "1skcrpfgz2c9s9r2xvwanrvyczcqjgmjrwjm188d55l4pn8ylr83"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit"; + sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw"; + name = "vdiff-magit"; + }; + packageRequires = [ emacs magit vdiff ]; + meta = { + homepage = "https://melpa.org/#/vdiff-magit"; + license = lib.licenses.free; + }; + }) {}; vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }: melpaBuild { pname = "vdirel"; - version = "20161009.224"; + version = "20170605.43"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; - rev = "1f071902d4e2aea49e7e96a327e09712565cb39c"; - sha256 = "0qkb7wx1qaa85g0dwmkyh4r65fg1j441f0b4hgg7qjq1yxrlkkhb"; + rev = "72399f5e09f53aa25a068be8689cb711b8accf08"; + sha256 = "1xlzm2c6wcmrjjwl61552yaijjsiazbs2lxn1y5p7xbj9x7jrkn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel"; @@ -69390,12 +72874,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20161010.239"; + version = "20170701.1603"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "c964571c38fd3a6bfadc88fd9def3ed03132a052"; - sha256 = "01sdkhljh7mdwv4mvm37gimjvl3i0jpn4xzmd9sdjll0dbc8rxki"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -69516,16 +73000,16 @@ vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimgolf"; - version = "20140814.1448"; + version = "20170323.600"; src = fetchFromGitHub { owner = "timvisher"; - repo = "vimgolf"; - rev = "289bef87963b660c0cf6ea1f648ac2440c609c88"; - sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj"; + repo = "vimgolf.el"; + rev = "741e414ec24072af05471058a5719271bfcfe766"; + sha256 = "0fs0gimry8xzydh7m305j86h1rq7qivsda19ah48sxbxks6xq5ax"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf"; - sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/50dc1c26cb848986dda3c930c8d9b421cd3b1d17/recipes/vimgolf"; + sha256 = "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f"; name = "vimgolf"; }; packageRequires = []; @@ -69537,12 +73021,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20161231.1600"; + version = "20170606.539"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "1eb00dc2d803df411d7b2eae1c775eecc6512728"; - sha256 = "1shxvnlpb3hw3pa7883nmpzjy2q6cyww3r8x4yx3h315nvxwxfkq"; + rev = "527a1d9b9e031713c29f12d1a82f1fdac50c5610"; + sha256 = "1k8m7b0h3qb5w0wvvjz8047xz71ljfj7kj4z5sv26rhsh5bsdb2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -69566,8 +73050,8 @@ sha256 = "02yhagnrq0zl19w7fh559fs6vm6b383k1r27alvixjfcm18p0fpg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/81521d8020d55d75014302b1e5cf0d7126a34bc6/recipes/vimrc-mode"; - sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vimrc-mode"; + sha256 = "05zmr624qwsj9wqsmjlhjvjl1fc1qxz4vvbb3ljr5fbpxdjrbnpn"; name = "vimrc-mode"; }; packageRequires = []; @@ -69663,12 +73147,12 @@ visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-fill-column"; - version = "20161109.337"; + version = "20170502.1300"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "159dcee48e7311ee816686d62e7ce36619127462"; - sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b"; + rev = "57c2a72d46900117ea92e0a01b97e19481800503"; + sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -69747,12 +73231,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20161030.840"; + version = "20170713.1652"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "a8ba8363b20d13fdb474faae0ea8d4178c350ca0"; - sha256 = "02xqfrv45d0d36jn6nvzmy6pc9dy7mban2dvljxspgpidqlwj8p8"; + rev = "b62bc046128df83c816a9b199ab5b4a7fcf93837"; + sha256 = "1gbl08dh172fv8xc0b737cybm3bac5hlm37f50qp0xk4kdbfv2sh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -69769,8 +73253,9 @@ pname = "vline"; version = "20120108.445"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/vline.el"; + url = "https://www.emacswiki.org/emacs/download/vline.el?revision=17"; sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj"; + name = "vline.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa860c2ccbaeb19d8b866919cdc45549d9cf9537/recipes/vline"; @@ -69794,8 +73279,8 @@ sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a305ed69dbad1a5f456acd1aad2fb9409d6d1fd6/recipes/vmd-mode"; - sha256 = "1hd4bqgmrrznixmig5p9c3rl09r8z5d1jmmia2001i0r59wi61wb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode"; + sha256 = "1xjyl2xh3vig2rzjqm1a4h2ridygbanmal78s4yc32hacy0lfyrx"; name = "vmd-mode"; }; packageRequires = [ emacs ]; @@ -69888,37 +73373,40 @@ license = lib.licenses.free; }; }) {}; - vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170206.120"; + version = "20170712.930"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "0b159770abc865796a1fa02be2f5959138b2f8a6"; - sha256 = "1i6a6g4l9xy45kllgr6kgai3mfg8b060dpspn6vv69kpwjcqiza7"; + rev = "e256f432b9cec9a0294fe3edf1c4965e1de28570"; + sha256 = "11nrzdqwzd7ib8gv52vplcafiwmv5nm6ql3ahw512zkkb2w3bkza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; name = "vue-mode"; }; - packageRequires = [ mmm-mode ]; + packageRequires = [ mmm-mode ssass-mode vue-html-mode ]; meta = { homepage = "https://melpa.org/#/vue-mode"; license = lib.licenses.free; }; }) {}; - w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "w32-browser"; version = "20170101.1154"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/w32-browser.el"; - sha256 = "0x30ldv2wbv3vhj85jss7hwf672m61f5r4z9l1sg3v0ibalqry45"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w32-browser"; + rev = "e5c60eafd8f8d3546a0fa295ad5af2414d36b4e6"; + sha256 = "18hcr9l5id2xdin20wrg9sdmwfad7qk78iryyg24ci9lvl53m02x"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser"; - sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser"; + sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn"; name = "w32-browser"; }; packageRequires = []; @@ -69930,10 +73418,11 @@ w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32browser-dlgopen"; - version = "20170101.1155"; + version = "20170309.1433"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el"; - sha256 = "1dv4l7rcm34p78cvyjv7b1lcc1d28pia18vj3swgnan9g1mi7zdf"; + url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el?revision=25"; + sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd"; + name = "w32browser-dlgopen.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen"; @@ -69948,11 +73437,11 @@ }) {}; w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20170301.254"; + version = "20170503.1331"; src = fetchcvs { cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; module = "emacs-w3m"; - sha256 = "b861237e76035df9e806681dee0f58680d9e68e773cc5e3c65dd513e127f4240"; + sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; @@ -69986,6 +73475,26 @@ license = lib.licenses.free; }; }) {}; + waf-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "waf-mode"; + version = "20170403.1240"; + src = fetchgit { + url = "https://bitbucket.org/dvalchuk/waf-mode"; + rev = "20c75eabd1d54fbce8e0dbef785c9fb68577ee4f"; + sha256 = "09jqxbkkprsrcj7gj9hi8ll7d17425lyjmdmqf12ffqv5pz6aq87"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/44c1aa152ba47113a91878df78d9b56eead98744/recipes/waf-mode"; + sha256 = "16rplrs599a67dcxcdc33zb9bqivv4a2mvrshvyip1lp75f36r5h"; + name = "waf-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/waf-mode"; + license = lib.licenses.free; + }; + }) {}; waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "waher-theme"; @@ -70010,12 +73519,12 @@ wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wakatime-mode"; - version = "20161019.602"; + version = "20170517.2053"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-mode"; - rev = "4a99c5ad1e25135a086cab63ad797fae9b03afbb"; - sha256 = "0y4ydwqvjnkf8iav0c08zpmqm1zja7r5c6cjwnk07rsnb5zhpzjw"; + rev = "b1eae15f38a367017e519c10837c44650631b154"; + sha256 = "0l2nwjz978lamlikipljw143j40bnli7rzf9rixsia9iby4krl25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode"; @@ -70031,12 +73540,12 @@ wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20170116.223"; + version = "20170412.1315"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "08c9511cd0f07ba65ef5a07ad93851549391333f"; - sha256 = "16zd914kwnnhp6zc81z9acq69prrgiwi25ggbpn4lcx7xm8h5hv3"; + rev = "3674f2edaa6ac30c314a885b229204f978ddce14"; + sha256 = "1yylw7yn9k8li283d5r4x9i38wfdx24jmlzdivvffn0jkhjj6i4k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; @@ -70052,12 +73561,12 @@ wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "wandbox"; - version = "20160418.1114"; + version = "20170603.531"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; - rev = "c5c4f1279f48e7871407d0fca2409512f427107e"; - sha256 = "0xzwflvj0mq0h9qr62aq473jz71jggnq2dlf1x2vy0a7rh8qw445"; + rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1"; + sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; @@ -70073,12 +73582,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170204.530"; + version = "20170627.2306"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "1a49ac05e9558edd4993d345c25cf2d166bfc17e"; - sha256 = "1bvq0wwc013f6aapwql1rwv9r5nifgff2iwc17kaiwlwwqd6j70z"; + rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9"; + sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -70123,8 +73632,8 @@ sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/577ff702b17f93e0db383a92e9bb3221e08de31c/recipes/watch-buffer"; - sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/watch-buffer"; + sha256 = "05f58kg05kfl4srwwjaf7w9jml50yx6bn4x8m1npswp882dsjyh9"; name = "watch-buffer"; }; packageRequires = []; @@ -70249,8 +73758,8 @@ sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/32b7ca528c0038909cee4271eb40bd92d97bfb56/recipes/web"; - sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web"; + sha256 = "141idn49b7x7llz249zbg2yq8snjxpmlpchsd3n1axlrbmx6pfpz"; name = "web"; }; packageRequires = [ dash s ]; @@ -70304,12 +73813,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170225.1206"; + version = "20170709.922"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "6e4d7e96f2a699c2df3056609584e586f4667b39"; - sha256 = "10iwzjc697niwj0sqvazpi779ipsncpmn2pfy58lgglriq88ss8r"; + rev = "e4304bcfa0c5121522ba2a5db75af8a2e4e81246"; + sha256 = "1pyhipazvhqflpxxdaqjyp7l5vpcp3cbc4qqb5fy1zxnlb5yj62l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -70333,8 +73842,8 @@ sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element"; - sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element"; + sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l"; name = "web-mode-edit-element"; }; packageRequires = [ emacs web-mode ]; @@ -70343,6 +73852,27 @@ license = lib.licenses.free; }; }) {}; + web-narrow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: + melpaBuild { + pname = "web-narrow-mode"; + version = "20170406.1910"; + src = fetchFromGitHub { + owner = "Qquanwei"; + repo = "web-narrow-mode"; + rev = "73bdcb7d0701abe65dab4fc295d944885e05ae33"; + sha256 = "1wg54vyfbacmyh8lyd5fgh88lfby17v24l98jjgxscaqgms86bch"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a910da9e0566344d4b195423b5f270cb2bdcc1e5/recipes/web-narrow-mode"; + sha256 = "09k3xp4l235wrffl7a4026wpikxhp10fh3182dlp4pa4wr2vzipi"; + name = "web-narrow-mode"; + }; + packageRequires = [ web-mode ]; + meta = { + homepage = "https://melpa.org/#/web-narrow-mode"; + license = lib.licenses.free; + }; + }) {}; web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-server"; @@ -70388,12 +73918,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20170306.946"; + version = "20170612.1352"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "92a586752b7fbc4089a6d92750c70274448aa496"; - sha256 = "00b6sbcp827n5d8ql87503m3k1wnlx6rbr3xgrr41aq0b0xj6z7k"; + rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1"; + sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -70409,12 +73939,12 @@ websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20161113.1736"; + version = "20170610.2117"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "fbd9e2263d2d7168aae31d4f8bde38f511e9d2ec"; - sha256 = "04kg6njw5frp9xafjyqff57m0a2r15r7c57mnb6dw6lgazxlscgb"; + rev = "ccbe93ac8b5858a85686b83642fbd6e828a47deb"; + sha256 = "18aw5pmvz91gv9wlmna1i5sli6z3f6dqk0bc4wkc15zbsi1dmdlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -70518,8 +74048,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; - sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; + rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; + sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep"; @@ -70539,8 +74069,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; - sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; + rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; + sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-ack"; @@ -70560,8 +74090,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; - sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; + rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; + sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c50b704343c4cac5e2a62a67e284ba6d8e15f8a/recipes/wgrep-ag"; @@ -70577,12 +74107,12 @@ wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: melpaBuild { pname = "wgrep-helm"; - version = "20140528.1427"; + version = "20170510.1539"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; - sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; + rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; + sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm"; @@ -70602,8 +74132,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; - sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; + rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d"; + sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39faef3b9c2e1867cd48341d9878b714dbed4eb/recipes/wgrep-pt"; @@ -70640,12 +74170,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20170209.729"; + version = "20170530.526"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "0d56e4369b53af2c5960af4827b56b06d9162d62"; - sha256 = "08dw13hn1w9m37gd2cch3z9af504x55w0hlinn05j1jgvja50c7f"; + rev = "3144b4c1fc774b63fc2350a0171e8ef01ab63298"; + sha256 = "1fyg4b5ngf4k30x9rb5n62w2y9awc1lasrszxp9bg6ydmigncans"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -70711,8 +74241,8 @@ sha256 = "1yqfq1gzkrw79myvj16nfi30ynfyz8yrpbzjcj8nhsc5rfrrmym2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/621e32e54be9e1ac7936bf6f4b9d74e2dd27df6e/recipes/white-theme"; - sha256 = "0nmxn35x6pngns1xqnsq8nm69f549c1gmvisd01in3qfvnpr0mic"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/white-theme"; + sha256 = "04l5hjhd465w9clrqc4dr8bx8hj4i9dx4nfr9hympgv101bpgy4x"; name = "white-theme"; }; packageRequires = [ emacs ]; @@ -70724,12 +74254,12 @@ whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whitespace-cleanup-mode"; - version = "20150603.447"; + version = "20170505.1923"; src = fetchFromGitHub { owner = "purcell"; repo = "whitespace-cleanup-mode"; - rev = "cdc6ee4e33b9e637afabf2075198c5616a44f91f"; - sha256 = "1j6gh435r52p8kjnzqwbnkynmdq541clwxlnzpsjw8n5mspp7g25"; + rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9"; + sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode"; @@ -70745,12 +74275,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "20161115.1720"; + version = "20170525.818"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "b5804004fb35c603468054cf179f4dd6936c8882"; - sha256 = "0x0cxwifqb8pv6j55iwxy7hdk0cvjz0zygayi494y4nhabcyp3kf"; + rev = "92986cbb260642c129b049950036b2b6698a8bd9"; + sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -70774,8 +74304,8 @@ sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/71addc88ce814ed4f413bcd8632402ac750009a1/recipes/whole-line-or-region"; - sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; + sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y"; name = "whole-line-or-region"; }; packageRequires = []; @@ -70786,10 +74316,11 @@ }) {}; wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wid-edit-plus"; - version = "20170101.1156"; + version = "20170309.1434"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/wid-edit+.el"; - sha256 = "0pzxarpwabbg67ajg340yrp1gqly8y71qrd5gcv9vjzgvvh9anws"; + sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9"; + name = "wid-edit+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+"; @@ -70830,8 +74361,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-widget-mvc"; - rev = "ef5648d7dd6dbb88ca946e42011fe8eccadb524e"; - sha256 = "1wlybqs45firifk7w7yndh70wmsimdrw6pv7hyaciyy0ghidya3n"; + rev = "ff5a85880df7b87f9f480fe3c28438a0712b7b87"; + sha256 = "1s0srhklmkmj3lfs8vr1dqi3s48z7fwx9mxqxckk5njld317hqg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc"; @@ -70851,8 +74382,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "83bce5f49e49e526a66e528445f54889cd57dbb6"; - sha256 = "02dmmw20jqcx1ij2kj3aam9fhwqcb52sjhcx7k4faryzdbx6zvwd"; + rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615"; + sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -70930,10 +74461,11 @@ }) {}; wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wimpy-del"; - version = "20161209.736"; + version = "20170309.1436"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/wimpy-del.el"; - sha256 = "19dsmchrgmrqnn0v81k3q6z0h3vnxx0wjyqzz27wc7ll1qrvjfyg"; + url = "https://www.emacswiki.org/emacs/download/wimpy-del.el?revision=26"; + sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13"; + name = "wimpy-del.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del"; @@ -70967,16 +74499,19 @@ license = lib.licenses.free; }; }) {}; - windata = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + windata = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "windata"; - version = "20080412.755"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/windata.el"; - sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "windata"; + rev = "a723fc446ceaec23d5f29ecc8245d94c99d91625"; + sha256 = "0y8yw5hazsir5kjskrh4mr63mmz87dc7yy5ddmlwpmn03wanqpha"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8a813e89fc19130d9cdc68f16bba00a0a501427b/recipes/windata"; - sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/windata"; + sha256 = "1mah2vy46pxwjd6c6ac14d2qfcixs2yrgwmzmisnfgsvprdlxryb"; name = "windata"; }; packageRequires = []; @@ -71038,8 +74573,8 @@ sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3b17efdf8b7306eadf37e331fc1d585b42f37b09/recipes/window-layout"; - sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout"; + sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639"; name = "window-layout"; }; packageRequires = []; @@ -71092,10 +74627,11 @@ }) {}; window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-plus"; - version = "20170101.1158"; + version = "20170309.1437"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/window+.el"; - sha256 = "06igqiwvnwm68k6gf9h85p4ppqab20sxl6qnxb57z8lpczpsssqa"; + sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61"; + name = "window+.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+"; @@ -71115,8 +74651,8 @@ src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "3ccfb8dfbd5970d6b0d64142e586459f38f21d79"; - sha256 = "0waf5imivhgzqp38rwhjqhy2y13dar7gqm52kbh71bvfwakgnkfd"; + rev = "67ecaa2b52c113f92913c3beb9fb7f302bd50318"; + sha256 = "0jvihc94iwrb2zxr1qg9yc5fypd1a028d2wfhvg68ipmngcf4q2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -71140,8 +74676,8 @@ sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/37924b239c1e883103c0cdfd429ddb6c2d40d3d7/recipes/windsize"; - sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize"; + sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv"; name = "windsize"; }; packageRequires = []; @@ -71195,12 +74731,12 @@ winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winum"; - version = "20170217.110"; + version = "20170430.1629"; src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "3c28c0dd685ee71b073e6a336efe3bff21f65a9b"; - sha256 = "0bxwhkshyxzq5f2jlsp6z97j2gdgz3a0hbp8bvjj71biywhn2m26"; + rev = "e950370d82cbb90ba291fc1c32de5d6f35068932"; + sha256 = "1p4b9gdrifjndk0irv735f8spy541x78chibdnr1i3qil2ib8xms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; @@ -71219,8 +74755,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "3a654cfe6632"; - sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; + rev = "f94ec5fed665"; + sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -71257,12 +74793,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170111.609"; + version = "20170707.1401"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0"; - sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn"; + rev = "791f985f63abe7f10de3fbd6fd49f9efac05a285"; + sha256 = "0nh12j3bf247q1ikb2apcpbx8nxvvi9rpj4fbsjbnrs0v65n0v4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -71408,8 +74944,8 @@ src = fetchFromGitHub { owner = "gromnitsky"; repo = "wordnut"; - rev = "3e0184a8a1cc118a985f1cbd0b6d5b7417987169"; - sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj"; + rev = "bcdb86f1f7ee91f721a427b19492ee9578ae74fc"; + sha256 = "0p8nl5ccic8jx0dzy2976v5mkwb5sq4165qnhq4i26741qbalb62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut"; @@ -71446,12 +74982,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20170225.405"; + version = "20170427.8"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "d543680243046f5f62d36f9e56debcfe414ba40a"; - sha256 = "0hdd5yi6cnf7ry088wrq2xdm7f2hirhwrds56wvi0bdm9rizm6gs"; + rev = "8b0de0d0896aa82a31d13972baf15de56ca5516e"; + sha256 = "14jk3sinxrb2685y5dslrik10cwjwjc76pgwj3w47h4s6ykarwn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -71527,6 +75063,27 @@ license = lib.licenses.free; }; }) {}; + wotd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "wotd"; + version = "20170328.1248"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "emacs-word-of-the-day"; + rev = "d2937a3d91e014f8028a1f33d21c18cc0b065a64"; + sha256 = "0nwq5ymj9kx1fx3kfc789nkd80gwzljwmk7xxzzsrdrv47gm047m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a52690a9bae634825bdfb5b6b17e5faccb93e13/recipes/wotd"; + sha256 = "145knl4n35kpqqzqkz1vd18d619nw011d93f8qp5h82xm92p3sb5"; + name = "wotd"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/wotd"; + license = lib.licenses.free; + }; + }) {}; wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wrap-region"; @@ -71572,12 +75129,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "20170228.1521"; + version = "20170623.327"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "f853350da848d0814f822587ae310e52d895f523"; - sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz"; + rev = "9e924dd7dd83f10b026c89cddef7e1646f1a3869"; + sha256 = "1v7hbmi9dqdqyr3png1xwhg3k05jr2q6jdjmj48bxiixl9zhcq9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -71601,8 +75158,8 @@ sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; - sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler"; + sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3"; name = "ws-butler"; }; packageRequires = []; @@ -71635,12 +75192,12 @@ wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "wttrin"; - version = "20160414.837"; + version = "20170614.506"; src = fetchFromGitHub { owner = "bcbcarl"; repo = "emacs-wttrin"; - rev = "e2a02cc58920a4f34ba01f7015c9e6bfcce51f61"; - sha256 = "1bq552mxlhq9sd2c9p2yir52p0jnfdav6vcdgs3xklcf89b1403m"; + rev = "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc"; + sha256 = "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin"; @@ -71761,12 +75318,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170116.919"; + version = "20170713.629"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "ed4539971dd9c32752c7ff5a1d280150446bc769"; - sha256 = "1nw7mwbiaq4i28his4l7hx1qrgqykr59sw1909s1l165ygl85jb2"; + rev = "df1906547f51f50c7e61ffa6c518a6ffb23d4770"; + sha256 = "0q93nz5z4awasllnnqs6pzi83mrx8nl7d3mi13ppqhd50sjm0166"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -71782,12 +75339,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170127.1616"; + version = "20170713.629"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "c32bae59a8d8daf97769b1c57b70ef9fb8b2570c"; - sha256 = "1gs6h8csy8yz3f6gvqn3lx3i6xdqrddfhg54m4g8c5yxz0202yyg"; + rev = "e28f16121619f1a929803ef1274d2853d1b43656"; + sha256 = "1l7yf3k5gdz7flm8qqzkcdpj3cx9q1kklbl2znkxiyb6rvgh7qf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -71803,12 +75360,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170124.1342"; + version = "20170713.624"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "0bd47dc9b570a1526cd3e387280280f20f6a5602"; - sha256 = "1nl8xgkcvnpp4iwcxvvdr3fb6kz5zjxdvkk6ldnybrcypg0xndsg"; + rev = "d5f12b6185af9674d236a758df16649bfafadf2c"; + sha256 = "19cg18gh18pp1z862aykfhn44vhnbggr32rrs7smy33nq2h6q512"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -71824,12 +75381,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170213.321"; + version = "20170713.626"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "073190840e6a07566f75a6dcabd1d3c120b0639e"; - sha256 = "19b8d4a5g43n9y2y0r8l12ds5badns9zlky0j201bzz3yrcid7xb"; + rev = "23dae1d6d14d238227e1ee0afeef6ef1561b0c31"; + sha256 = "1mlqhmk9qpa34p30f8m0ylfajzyvq49qvl3hklgrzqgc9xx4yhxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -71845,12 +75402,12 @@ xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20170303.1530"; + version = "20170713.628"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; - rev = "1eef698b7be06fa49347798089ca1e2ed8484da5"; - sha256 = "0cysykwnwpy43mnx9fjiqk1r004ac6c7h92zhki8858bcgjnwzzk"; + rev = "29a82b1a291ad6625b0da152ff1de10455d1831a"; + sha256 = "1si443vicgq7swr79lc9jv7fxm8x273xajrm6xqahkxzyly2751q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing"; @@ -71866,12 +75423,12 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20170227.1044"; + version = "20170713.615"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "4843663678db42827d12f2514f8ad4e2f4abcfb9"; - sha256 = "1hr4m5lrwhx1jf8zlwpx60w9528vq49j0q8kzydlsb895nivnn3s"; + rev = "91645ba91772bf4a1a20765722b72f7e374feacc"; + sha256 = "0hrs77qllpa77964bwjdmq4bzr47bgc0n57jsaagcdbs7wc6bmc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -71887,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"; @@ -71908,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"; @@ -71929,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"; @@ -71950,12 +75507,12 @@ xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xahk-mode"; - version = "20161218.2311"; + version = "20170523.1946"; src = fetchFromGitHub { owner = "xahlee"; repo = "xahk-mode.el"; - rev = "24aa00cd0a8c47f7d8906379eeccbeca22c1a50b"; - sha256 = "1npa30kp5jaqn7qmsca0a3ch0428l4n8w0hix0bvlfwr5s4zksfy"; + rev = "538b891a1565d109d079185b56332cd28dd846a7"; + sha256 = "1rm3sih1rciszs7m9d29r7vkgs8q2kwpn8sdwadlycgjmk9c38s1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d6422756b435f59ead15fa7e8081f5c88b2e93f/recipes/xahk-mode"; @@ -72042,8 +75599,8 @@ sha256 = "0znhjwlpgg05g39b16ddgw3a71a93fn2dicfsxjkziffn2a95m0s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac99eee00b76501d830373a13369f6a2a1239b5/recipes/xkcd"; - sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd"; + sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5"; name = "xkcd"; }; packageRequires = [ json ]; @@ -72118,16 +75675,16 @@ xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlgen"; - version = "20170116.833"; + version = "20170411.617"; src = fetchFromGitHub { owner = "philjackson"; repo = "xmlgen"; - rev = "331dbe01037873c209fbca2aeeaf42da446f1d79"; - sha256 = "03hksc2ng5dl4rq9yprj65d1x8kp0ccyb913hc6byz1n6gp0jkll"; + rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4"; + sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen"; - sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen"; + sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh"; name = "xmlgen"; }; packageRequires = []; @@ -72202,12 +75759,12 @@ xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-tool"; - version = "20160823.902"; + version = "20170605.126"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "b81b5862e8541aca5231840eb176afad7ab55cf3"; - sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm"; + rev = "0d1e2960c48701b83be5255d56324f65a6ee182e"; + sha256 = "0x6927x18nimh9rgnkl8dyc6r437a03byzscgg053lbg0cf2mqp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -72223,12 +75780,12 @@ xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "xref-js2"; - version = "20160803.116"; + version = "20170530.126"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "xref-js2"; - rev = "031def02271fdbe2e0ab30515c7291a239fea4e6"; - sha256 = "1i3gsv7npf6lg7hakky6yxn96aqjdlridj74l0vhj55j2w7ia6f8"; + rev = "d5f93605405989529c2f66b542def6c32429b927"; + sha256 = "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2"; @@ -72378,8 +75935,8 @@ sha256 = "17zlbrnxyc0lgsy5g8zqz13mqizhaqpp4i975x9m4ilpl5ycaqqx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e83b11c3d5b9773a26e2da4d848f645edcea5b/recipes/xwidgete"; - sha256 = "124gb5h3w4xydvx9zyvy60m038hjpz72yis1yv1vdb56lixndh9m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xwidgete"; + sha256 = "1v1dfykkb6nwjwz2623i6x1rl53z4457l6fpa4nv4krdqq79gl5d"; name = "xwidgete"; }; packageRequires = [ emacs ]; @@ -72420,8 +75977,8 @@ sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding"; - sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding"; + sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl"; name = "yafolding"; }; packageRequires = []; @@ -72472,6 +76029,27 @@ license = lib.licenses.free; }; }) {}; + yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yahtzee"; + version = "20170617.20"; + src = fetchFromGitHub { + owner = "drdv"; + repo = "yahtzee"; + rev = "1b6d6cc5651a02547415cd571658efcafd9d36fa"; + sha256 = "0xzw5inzpd2djqx8q276vhiw5j19irkaygnmjn5m5kh2xpzb6aah"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; + sha256 = "1fnywiami9mszagmms27dmak6chcichdi7q70x5c6aimc4jb98jk"; + name = "yahtzee"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yahtzee"; + license = lib.licenses.free; + }; + }) {}; yalinum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yalinum"; @@ -72496,12 +76074,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20170213.1023"; + version = "20170406.241"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "1c3ade410fb0bf5b6f2140b099f0ef96836ee74e"; - sha256 = "1p0m702lyjx5xcqvifc8lkrj430nvjiwswpf3ghcvl5sls8bf5af"; + rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6"; + sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -72525,8 +76103,8 @@ sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bfbef31df9d75964378448ac3c0d35bd36a6a3a/recipes/yaml-tomato"; - sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaml-tomato"; + sha256 = "1asy4nf759lcgksah2g7jvzwwlq9lxfkiji460csk5ycsv8aa99s"; name = "yaml-tomato"; }; packageRequires = [ s ]; @@ -72559,12 +76137,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "20170213.154"; + version = "20170323.1104"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "46c201b1d5195842fdf540d4c153127f91b1a125"; - sha256 = "0bfx6wsj8g6ryawxly17x2nppzcgg3bxpkx00ar1hgcrs11988kk"; + rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695"; + sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -72577,22 +76155,22 @@ license = lib.licenses.free; }; }) {}; - yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20170220.55"; + version = "20170607.819"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "0f2af3671f5f3b879a2c9a3f521f1d4066889d58"; - sha256 = "0qx98klmc40064si47s7ivvyx3vzki1skyjkxszi6gl8g5k0i1dl"; + rev = "70e755fcf58e37092de2c335355eab93d5f1fb44"; + sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4"; name = "yankpad"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/yankpad"; license = lib.licenses.free; @@ -72600,14 +76178,15 @@ }) {}; yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaoddmuse"; - version = "20160717.2212"; + version = "20170325.1752"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el"; - sha256 = "0j73zkzk1iyxpxca6zvjwq5iig8a6la6hm6i5kwwnbc9c681acqx"; + url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el?revision=104"; + sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6"; + name = "yaoddmuse.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dcbe43b65944968a882705ff4b3b2c9f40b6d2/recipes/yaoddmuse"; - sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaoddmuse"; + sha256 = "1p68f3xjv55m8lnq5x27b8y87mq685hpm3n9kiga9qq8wxdf2rnf"; name = "yaoddmuse"; }; packageRequires = []; @@ -72619,12 +76198,12 @@ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; - version = "20161202.1055"; + version = "20170519.115"; src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "c22db3683133ed4aff78e280983ec0621ca1cf1f"; - sha256 = "05nilm9adpymx1gs1qvcrrgyv13vf5lm13rp12ljbndk0gx4n8x6"; + rev = "492eb038b35f49b1012fb843d880bccc40f2260b"; + sha256 = "1jj1j525xlwhylsysay52f4rdrwz3r72ghx4iggkxqiqbv919ia4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -72640,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"; @@ -72700,15 +76279,36 @@ 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"; - version = "20150315.605"; + version = "20170315.1206"; src = fetchFromGitHub { owner = "m2ym"; repo = "yascroll-el"; - rev = "f7743df1cf6d8e55607141d1ea5f50b562582c51"; - sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5"; + rev = "fe4494e5f4faf2832e665c7de0fed99cdbb39478"; + sha256 = "09y8phmvqdwp1k9w84rf6p609jrg0mhgx6akwda8rsvxrrbsh6j4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll"; @@ -72724,12 +76324,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170226.1638"; + version = "20170716.1223"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "6e9b7f9432a87122cf9bb80a505be2fd9811a9cf"; - sha256 = "0k5yv90530946zjs7xdq3017vcq688mz44r542l39hyd9skxq8ba"; + rev = "2a3a0cd2b18c21fc5f391273045f466c41da743c"; + sha256 = "09s7ad3wl4rrmdyi0cxmn6vnpkcf97x0g0csy8a8lijsjnrvk4r9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -72749,8 +76349,8 @@ src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "b58d17e176f77ded83860d33f4f43fcb5f7d2c9c"; - sha256 = "13as073yw6wphcs7w62zicqgva0lh4xx4f1c9sph8ip1wydkr9pg"; + rev = "3854836489ce06bb65cf9aecbdc06aa5fc6801c5"; + sha256 = "051wwf802f00xk5gq5js1l0dd1ax0ls2jvlybz7xfy58dl8fbijx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -72765,11 +76365,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170306.55"; + version = "20170611.1642"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "7bf780961390"; - sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs"; + rev = "e9299b77df1f"; + sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -72827,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 = "20170227.2341"; + version = "20170710.103"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; - sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; + rev = "35e8a31e32d0de890547612db8373d7333db8d8a"; + sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -72900,12 +76500,12 @@ yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoshi-theme"; - version = "20170305.2158"; + version = "20170330.0"; src = fetchFromGitHub { owner = "ryuslash"; repo = "yoshi-theme"; - rev = "c76b1659a8e5cfccbdfcfe971ef6fcb3b7cd0263"; - sha256 = "0k86b7lkkdlwd2570hc93ywbg60bxpx1axvzbvyvqiara7vq6njy"; + rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44"; + sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; @@ -72963,12 +76563,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20161114.1811"; + version = "20170427.2042"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "bc71e4ecb154e140fa688add55d26d01b5a52dea"; - sha256 = "15ymggp3j7bxwp5q4ng8g2hnym8psgjyvx5baxh4d0yc54jiq1gx"; + rev = "50a1bd4240ff0db7c8f2046c3b00c5a8e14b9d2f"; + sha256 = "1xy9nbbk0fkd9dm8n0c0gy52vi34s6vgzbnab0hrghn6whs89ig8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -73025,12 +76625,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20170306.429"; + version = "20170511.1337"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "96f953cee3358fbc299662a3b3cbc087cb395b70"; - sha256 = "0cp2n0a4g1x4py1ixf273k6nrymhxc4hy1ccvg0cv43jpka85xkf"; + rev = "2f31ef9a954ec08202668a8d1b004db5a05831a2"; + sha256 = "0g4vgdzpbp0l734ajd1r9lj6qylljxaazk139lhzzyvmqd5dwaf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -73087,12 +76687,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20161212.1151"; + version = "20170709.1248"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "3f93de4fd1ed7e989873b556517e018f1436f8ed"; - sha256 = "0rqg3mmh7jxsasai6i8y8r2hngvhnncn38ihvbbylyx4f71h59hi"; + rev = "379df55b3ea6f217e0187fb8cb6df70d02236cec"; + sha256 = "0nj7qvr0z3gq31db8r3jsdljj93r0cijssbwxgqscvm945jpxc6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -73105,6 +76705,27 @@ license = lib.licenses.free; }; }) {}; + zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zig-mode"; + version = "20170413.130"; + src = fetchFromGitHub { + owner = "AndreaOrru"; + repo = "zig-mode"; + rev = "9a252ebd4ccd8a30abef3d9ed0ecb510e3d88844"; + sha256 = "07ar5lijj3y62ynx1fj9qxabf0h82laxzyb60f6cgxpzgxfpn1b8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64d12e362a2490e85c8e7a66a5ed1ebff9ce95a6/recipes/zig-mode"; + sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09"; + name = "zig-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zig-mode"; + license = lib.licenses.free; + }; + }) {}; zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zlc"; @@ -73137,8 +76758,8 @@ sha256 = "0jh11lbzsndsz9i143av7510417nzwy4j3mmpq7cjixfbmnxdq06"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/933bfffbfa6a5b777e7820684e4c115e7798941a/recipes/znc"; - sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/znc"; + sha256 = "1017dlzbpb3ww0zb370bgsdrzr4kcc72ddby9j63d95chz2jg0hb"; name = "znc"; }; packageRequires = [ cl-lib ]; @@ -73200,8 +76821,8 @@ sha256 = "106sppnp1jd5qcp2ydb180fbhfld90jvfimy8316qvrgk5xc2q57"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38262704e1045c21ee73ca9dc87656936382004a/recipes/zone-nyan"; - sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan"; + sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94"; name = "zone-nyan"; }; packageRequires = [ esxml ]; @@ -73275,14 +76896,15 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20170101.1159"; + version = "20170605.1046"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zones.el"; - sha256 = "1m88lqfmfayx2pj5ws14cfysf4pv8rm9v768x6xvsknjb4sl0q8l"; + url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30"; + sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz"; + name = "zones.el"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones"; - sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zones"; + sha256 = "1l4qilawlgvanrz4ny4aaqzg011dlqh65g06d44pf6ha586rvzp2"; name = "zones"; }; packageRequires = []; @@ -73315,10 +76937,11 @@ zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "zoom-frm"; - version = "20170101.1201"; + version = "20170309.1439"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zoom-frm.el"; - sha256 = "1n16qx3ag9cdds04l4s2a79ijqg4k5gg1144vyn5p6ih10casw32"; + url = "https://www.emacswiki.org/emacs/download/zoom-frm.el?revision=44"; + sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs"; + name = "zoom-frm.el"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm"; @@ -73355,12 +76978,12 @@ zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zop-to-char"; - version = "20160212.108"; + version = "20160212.754"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "zop-to-char"; - rev = "883cb9dbd12a08fba4164f16d7badf7f846c3eff"; - sha256 = "1hq5ycnj0kwqs25z5rm095d55r768458vc5h5dpjhka5n6c099p1"; + rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d"; + sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char"; @@ -73460,11 +77083,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170305.2023"; + version = "20170710.2029"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "d33bf30fd45c"; - sha256 = "0wa2nw8q1pbmif1n7vxyzxf7zziwxdv60pa4rx1kxjnrd8aizzi7"; + rev = "96131375ac74"; + sha256 = "1p19yy0xyf962rc0j3k4jxl9vyjjyd1ar61wmp6mf6jplj7sxyfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -73543,12 +77166,12 @@ zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zzz-to-char"; - version = "20161231.1557"; + version = "20170519.335"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "aaa854efb6b9e4451e97dfe90d37f368ff868b9e"; - sha256 = "1k66wsbgb7fqb5mbani0lzffy3yf0801rlgxwbkj34ciblz6a197"; + rev = "b62414b155fe2e09d91b70059a909d1403d89acf"; + sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 18759a91f5b7..8f1bf8ff38d3 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -212,12 +212,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; - sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; + 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.7"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b"; - sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6"; + 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.7"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b"; - sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -587,6 +587,27 @@ license = lib.licenses.free; }; }) {}; + ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: + melpaBuild { + pname = "ac-rtags"; + version = "2.10"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; + sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; + sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641"; + name = "ac-rtags"; + }; + packageRequires = [ auto-complete rtags ]; + meta = { + homepage = "https://melpa.org/#/ac-rtags"; + license = lib.licenses.free; + }; + }) {}; ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "ac-slime"; @@ -619,8 +640,8 @@ sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell"; - sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell"; + sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y"; name = "ace-flyspell"; }; packageRequires = [ avy ]; @@ -766,8 +787,8 @@ sha256 = "1d2g873zwq78ggs47954lccmaky20746wg0gafyj93d1qyc3m8rn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/10bb2de9c6b938fa12deff1e2748bfd0a345891a/recipes/ace-pinyin"; - sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin"; + sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd"; name = "ace-pinyin"; }; packageRequires = [ ace-jump-mode avy pinyinlib ]; @@ -779,12 +800,12 @@ ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-popup-menu"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "3e771b470b0c633d7633dceec054fc05beac81f0"; - sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4"; + rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d"; + sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -860,6 +881,69 @@ license = lib.licenses.free; }; }) {}; + add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "add-hooks"; + version = "3.1.0"; + src = fetchFromGitHub { + owner = "nickmccurdy"; + repo = "add-hooks"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; + sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p"; + name = "add-hooks"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/add-hooks"; + license = lib.licenses.free; + }; + }) {}; + add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "add-node-modules-path"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "add-node-modules-path"; + rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998"; + sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; + sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl"; + name = "add-node-modules-path"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/add-node-modules-path"; + license = lib.licenses.free; + }; + }) {}; + addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "addressbook-bookmark"; + version = "1.0"; + src = fetchFromGitHub { + owner = "thierryvolpiatto"; + repo = "addressbook-bookmark"; + rev = "ad3c73369b804a48803fdfdf2ab613e6220260de"; + sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; + sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r"; + name = "addressbook-bookmark"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/addressbook-bookmark"; + license = lib.licenses.free; + }; + }) {}; adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }: melpaBuild { pname = "adoc-mode"; @@ -871,8 +955,8 @@ sha256 = "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/adoc-mode"; - sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode"; + sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c"; name = "adoc-mode"; }; packageRequires = [ markup-faces ]; @@ -968,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"; @@ -1010,12 +1094,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "aa54643c6d64d82c2c8d502bb710e7de87699df1"; - sha256 = "0fbhrri816brh3283q3gisnxnginwzarsydsz881zk24kk2raq1k"; + rev = "34caeed1bd231c7dfa8d2b9aa5c5de2b2a059601"; + sha256 = "1cci0sq568ghx6x7my96m0iiwvqz2f4dh6k3gn3mmfyvi7bmrpww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1028,6 +1112,27 @@ license = lib.licenses.free; }; }) {}; + alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "alda-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "jgkamat"; + repo = "alda-mode"; + rev = "921b1d39ee1122c0f6935598dc17aaa904e74819"; + sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; + sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh"; + name = "alda-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/alda-mode"; + license = lib.licenses.free; + }; + }) {}; alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; @@ -1070,27 +1175,48 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "2.2.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "692ac0816783725600b80b5307bf48a83053a378"; - sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; + rev = "bb69345ead914345faad582723a2b61618f13289"; + sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ dash emacs font-lock-plus ]; + packageRequires = [ emacs font-lock-plus memoize ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; }; }) {}; + all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "all-the-icons-ivy"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "asok"; + repo = "all-the-icons-ivy"; + rev = "aa791d6b0055bce3ac68970a8ef6abf0726edf0f"; + sha256 = "0mmimibzn5ncy4rpyq6vkk2m2qlki54nf8yirphabh4m2zf9marg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; + sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2"; + name = "all-the-icons-ivy"; + }; + packageRequires = [ all-the-icons emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons-ivy"; + license = lib.licenses.free; + }; + }) {}; amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; @@ -1124,12 +1250,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059"; - sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk"; + rev = "95fdfab07600171daccb0e9e98fb91c11237fd48"; + sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1166,12 +1292,12 @@ android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; - rev = "146476c5ae958715520bec2b7f8de6b30c48c19f"; - sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740"; + rev = "f274da87429617b0b9c5889d46b36de64d982da4"; + sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; @@ -1258,8 +1384,8 @@ sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/annoying-arrows-mode"; - sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode"; + sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh"; name = "annoying-arrows-mode"; }; packageRequires = []; @@ -1477,6 +1603,27 @@ license = lib.licenses.free; }; }) {}; + anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "anything-tramp"; + version = "0.5.4"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-anything-tramp"; + rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43"; + sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; + sha256 = "053bi7b6d9aa6xwsgm0yxbklbs5sl3dgi529gsapj30lw68lh1vh"; + name = "anything-tramp"; + }; + packageRequires = [ anything emacs ]; + meta = { + homepage = "https://melpa.org/#/anything-tramp"; + license = lib.licenses.free; + }; + }) {}; anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; @@ -1488,8 +1635,8 @@ sha256 = "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu"; - sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu"; + sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1"; name = "anzu"; }; packageRequires = [ cl-lib emacs ]; @@ -1498,27 +1645,69 @@ license = lib.licenses.free; }; }) {}; - apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "apache-mode"; + version = "2.1"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "apache-mode"; + rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; + sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; + sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm"; + name = "apache-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/apache-mode"; + license = lib.licenses.free; + }; + }) {}; + apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "apib-mode"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "w-vi"; repo = "apib-mode"; - rev = "18aebab7cd61b9d296b7d5d2de0c828e2058c906"; - sha256 = "0sj948j4s26sxxandjzjjzmjqma7vf86msyyi23gsljy1q28vwlf"; + rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6"; + sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode"; sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb"; name = "apib-mode"; }; - packageRequires = [ emacs markdown-mode ]; + packageRequires = [ markdown-mode ]; meta = { homepage = "https://melpa.org/#/apib-mode"; license = lib.licenses.free; }; }) {}; + apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "apiwrap"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "vermiculus"; + repo = "apiwrap.el"; + rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45"; + sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; + sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw"; + name = "apiwrap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/apiwrap"; + license = lib.licenses.free; + }; + }) {}; apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apples-mode"; @@ -1561,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"; @@ -1624,22 +1834,22 @@ license = lib.licenses.free; }; }) {}; - assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: + assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: melpaBuild { pname = "assess"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "4a5eee8ba9db3e61b860b8b70236e385d3cf344a"; - sha256 = "0255sa5fzg069n1pf09sn5nypqw0ll5rmxfigw30xhh95w40nx8y"; + rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa"; + sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr"; name = "assess"; }; - packageRequires = [ dash emacs m-buffer ]; + packageRequires = [ emacs m-buffer ]; meta = { homepage = "https://melpa.org/#/assess"; license = lib.licenses.free; @@ -1648,16 +1858,16 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "1.9"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "14170a45c8cf91a0133960442509197e683c256d"; - sha256 = "1dgw075pdzfrb5wjba7iwal8crxpxm642fkfwj8389a5hpsj7v2n"; + rev = "d6222c2959caaca5c4980038756097da8a51e505"; + sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async"; - sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; + sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4"; name = "async"; }; packageRequires = []; @@ -1711,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"; @@ -1981,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"; @@ -2152,12 +2383,12 @@ avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-menu"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "9b8c6be09487dd3e804a10761266c4f22923eb9c"; - sha256 = "1564yv9330vjymw3xnikc2lz20f65n40fbl8m1zs1gp4nlgzkk38"; + rev = "71b71e64900d0637e17013781042e086e9bf56e7"; + sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -2271,8 +2502,8 @@ sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme"; - sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme"; + sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v"; name = "badwolf-theme"; }; packageRequires = [ emacs ]; @@ -2284,12 +2515,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "b50e90a39344402d169b8fdd5d18cc43fb16a256"; - sha256 = "13b9ccm7yw95zc8v8sri762fgqdp2hp107nj5b40yv90g3y4fwby"; + rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1"; + sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -2407,6 +2638,27 @@ license = lib.licenses.free; }; }) {}; + beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "beacon"; + version = "1.3.3"; + src = fetchFromGitHub { + owner = "Malabarba"; + repo = "beacon"; + rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; + sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; + sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq"; + name = "beacon"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://melpa.org/#/beacon"; + license = lib.licenses.free; + }; + }) {}; beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beeminder"; @@ -2431,12 +2683,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "de3833a1a651532e76df668bd92cfa07893501f1"; - sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9"; + rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd"; + sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -2481,8 +2733,8 @@ sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; - sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell"; + sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6"; name = "better-shell"; }; packageRequires = [ emacs ]; @@ -2533,6 +2785,48 @@ 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"; + version = "1.10"; + src = fetchFromGitHub { + owner = "davep"; + repo = "binclock.el"; + rev = "2e529ace67a04e6872a2328769782ef33b0e463a"; + sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; + sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk"; + name = "binclock"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/binclock"; + license = lib.licenses.free; + }; + }) {}; bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-key"; @@ -2586,8 +2880,8 @@ sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict"; - sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict"; + sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli"; name = "bing-dict"; }; packageRequires = []; @@ -2725,12 +3019,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "0.4"; + version = "1.0"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "c72d26ca2f9c0672192b5f40302ad0ebfc2d6db6"; - sha256 = "1grsaajfbhgq1wlraq8v21sfqdnk9ja3gj7y982hh44671haqjvw"; + rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56"; + sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -2743,22 +3037,22 @@ license = lib.licenses.free; }; }) {}; - boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "1.22"; + version = "2.1"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; - rev = "4c49b2046647ed187920c885e175ed388f4833dc"; - sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73"; + rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883"; + sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s"; name = "boxquote"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/boxquote"; license = lib.licenses.free; @@ -3040,12 +3334,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "657acef2132a6fdf0796f8ec62c5f261c1beebf0"; - sha256 = "0wkivh8x75gfsks6hy1ps9mlk101hrwsk8hqxx7qhs7f5iv0a082"; + rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb"; + sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -3184,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"; @@ -3229,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"; @@ -3384,8 +3762,8 @@ sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/193956c26050e15ddd7fb6579a053262d1de1e30/recipes/cdlatex"; - sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex"; + sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9"; name = "cdlatex"; }; packageRequires = []; @@ -3457,15 +3835,36 @@ license = lib.licenses.free; }; }) {}; + ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ceylon-mode"; + version = "0.2"; + src = fetchFromGitHub { + owner = "lucaswerkmeister"; + repo = "ceylon-mode"; + rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13"; + sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; + sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4"; + name = "ceylon-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ceylon-mode"; + license = lib.licenses.free; + }; + }) {}; cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "dc823da05d6790e9f95e3cb75618b51d6273e303"; - sha256 = "0xfdlzdcccz80qp3jbzv7wr1kwkh8797j9d3lfkh8apl4wkgvwpq"; + rev = "99e8b116e779f97e96866891362817c1c5c6534c"; + sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -3502,12 +3901,12 @@ char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "char-menu"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "5bdd7e880f89f27dbabe11def0fd31225b7f1c0a"; - sha256 = "0vb03k10i8vwy5wv65xl15kcsh9zz4y2xhpgndih87ssckdnhhlw"; + rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2"; + sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -3541,6 +3940,48 @@ license = lib.licenses.free; }; }) {}; + chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "chatwork"; + version = "0.3"; + src = fetchFromGitHub { + owner = "ataka"; + repo = "chatwork"; + rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c"; + sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork"; + sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p"; + name = "chatwork"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/chatwork"; + license = lib.licenses.free; + }; + }) {}; + cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cheat-sh"; + version = "1.7"; + src = fetchFromGitHub { + owner = "davep"; + repo = "cheat-sh.el"; + rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2"; + sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; + sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80"; + name = "cheat-sh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cheat-sh"; + license = lib.licenses.free; + }; + }) {}; checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "checkbox"; @@ -3754,12 +4195,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961"; - sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr"; + rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; + sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -3804,8 +4245,8 @@ sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a12bd6769ce7a5745c2da06dcd57ed3ba2ed891/recipes/cl-format"; - sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format"; + sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy"; name = "cl-format"; }; packageRequires = []; @@ -3898,15 +4339,15 @@ license = lib.licenses.free; }; }) {}; - clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: + clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "531a09fda51c9043efe18fd1f288be21ced3f3d1"; - sha256 = "0qjj40h8ryrs02rj73hkyhcjxdz926qxgvnjidav3sw2ggn8vdl3"; + rev = "9005de31ed05122d3db9f503fbc69722abf3634b"; + sha256 = "1pvxwvx36fl971j9dfhfk33sqg70nsw57brsi6kgphq7dgzmv7dk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -3915,7 +4356,7 @@ }; packageRequires = [ cider - dash + clojure-mode edn emacs hydra @@ -3923,6 +4364,7 @@ multiple-cursors paredit s + seq yasnippet ]; meta = { @@ -4164,12 +4606,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.8.0pre2"; + version = "3.9.0pre6"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "e1adec32b8325fb731da084e99acd6070f5e39bf"; - sha256 = "08illrxn9jks2z8yj7kczy65k7q3dkifima6j706kz8vjza60ikm"; + rev = "25b72e9097260d1faf254155a1199886c808a58f"; + sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4395,12 +4837,12 @@ common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "common-lisp-snippets"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "common-lisp-snippets"; - rev = "3b2b50fda8b1526d45a74e3d30f560d6b6bbb284"; - sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad"; + rev = "fc5c2683952328927a6d1c1f2694b85ddf7e9053"; + sha256 = "1835kg05794p1wdi7fsmpzlnnqy79dgfnfrxjfjj2j1gzcwmynsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; @@ -4413,22 +4855,22 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e"; - sha256 = "1jc9mnqj38lnn3yxkcixlwgqkxb7lsyzqybakk74mh3l3gr9cv8k"; + rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; + sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4"; name = "company"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/company"; license = lib.licenses.free; @@ -4458,12 +4900,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "2e3264670c861ecbe862f7618241367ab497b5ff"; - sha256 = "0a0pb3amsxj6m8ka12ny1w9qjy3dg7vsxdsy1wg3qzanj2pdsk4l"; + rev = "2c30c3bdb8316b27d5c1832b944cb146d00de456"; + sha256 = "183hyy5vy7xs6hwsk8nrylck8w5czcqwzfx0wik4ppx8011jzis1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -4668,12 +5110,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "0.1.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "c09f66c26bdd0dda007559a5c9bccfca0bd49ccd"; - sha256 = "17zi0xx8p2diwy1wgrhl6j8p57alwz24rjpz4apyyrqjk09ippq4"; + rev = "cebd82506c59d21a9c436bd8e8a33dfa8be84955"; + sha256 = "09mzxyvp07qwdhxagyiggpccxsklkbhjg730q6wbqd13g1mlkryj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -4794,12 +5236,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.7.7"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b"; - sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -4815,12 +5257,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "2.0.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09"; - sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4"; + rev = "b2953c725654650677e3d66eaeec666826d5f65f"; + sha256 = "08ccsfvwdpzpj0gai3xrdb2bv1nl6myjkxsc5774pbvlq9nkfdvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -4860,6 +5302,48 @@ license = lib.licenses.free; }; }) {}; + company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: + melpaBuild { + pname = "company-rtags"; + version = "2.10"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; + sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; + sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f"; + name = "company-rtags"; + }; + packageRequires = [ company emacs rtags ]; + meta = { + homepage = "https://melpa.org/#/company-rtags"; + license = lib.licenses.free; + }; + }) {}; + company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-shell"; + version = "1.2.1"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "company-shell"; + rev = "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86"; + sha256 = "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell"; + sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz"; + name = "company-shell"; + }; + packageRequires = [ cl-lib company dash emacs ]; + meta = { + homepage = "https://melpa.org/#/company-shell"; + license = lib.licenses.free; + }; + }) {}; company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; @@ -4934,8 +5418,8 @@ sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2cda69dc7d45087fa9a3e0460d2b12a1dce1a7b3/recipes/company-web"; - sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; + sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b"; name = "company-web"; }; packageRequires = [ cl-lib company dash web-completion-data ]; @@ -4947,16 +5431,16 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; - sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; - sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; + sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d"; name = "company-ycmd"; }; packageRequires = [ company dash deferred f let-alist s ycmd ]; @@ -5010,12 +5494,12 @@ concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -5031,12 +5515,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; - sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; + rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7"; + sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -5115,12 +5599,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "a77b914ba99729ef618e9e86543da24a46be315a"; - sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx"; + rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; + sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -5199,12 +5683,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -5312,8 +5796,8 @@ sha256 = "0ji8n4sv0zqmfn4g7ay927d8ya6wrvqdzvd5sc6vicma9gn27lvj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b2f92804e67fac780a0be850fcd0d0e93992ea7a/recipes/coverlay"; - sha256 = "0p5k9254r3i247h6ll6kjsgw3naiff5lgfkmb2wkc870lzggq0m4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay"; + sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j"; name = "coverlay"; }; packageRequires = []; @@ -5396,8 +5880,8 @@ sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/906b144e01aed96d62efbc34a8af2973135f6194/recipes/cricbuzz"; - sha256 = "1ad2afyn3xny3rgb8yy6w87f33idlrmis1vx0b6s8ppafv9z74j0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; + sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; name = "cricbuzz"; }; packageRequires = [ dash enlive s ]; @@ -5490,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"; @@ -5574,6 +6079,27 @@ license = lib.licenses.free; }; }) {}; + cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cubicaltt"; + version = "1.0"; + src = fetchFromGitHub { + owner = "mortberg"; + repo = "cubicaltt"; + rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d"; + sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; + sha256 = "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9"; + name = "cubicaltt"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/cubicaltt"; + license = lib.licenses.free; + }; + }) {}; cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cuda-mode"; @@ -5598,12 +6124,12 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "bec963abce7a208ec192a8349ed0b8e1ac3b3041"; - sha256 = "1adbws88113lfm5ljahms12aji1swip732l7pamxwibfywhgpn2f"; + rev = "8c3cc39bcff5def0d476c080b5248436da7f990f"; + sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -5619,12 +6145,12 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "9e1cdaaaf86f3acae074e40d96de008115d81ef9"; - sha256 = "04add8i0g4x5kzi1yd49i5viq9i2f5r5gzq33k05q6rimsp2ga02"; + rev = "d7842388a1872b165489624a1a68f536de97e28d"; + sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -5640,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"; @@ -5679,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"; @@ -5721,22 +6268,22 @@ license = lib.licenses.free; }; }) {}; - darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.2.100"; + version = "0.3.7"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "380fdcff12f44faf099bc5a38984d88784b495a2"; - sha256 = "1pragypiv59rrvq2xjzmldkf1v007viwwcvr3f5iyv31n0bmd0cn"; + rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555"; + sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs"; name = "darktooth-theme"; }; - packageRequires = []; + packageRequires = [ autothemer ]; meta = { homepage = "https://melpa.org/#/darktooth-theme"; license = lib.licenses.free; @@ -5753,8 +6300,8 @@ sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; - sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; + sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; name = "dart-mode"; }; packageRequires = [ cl-lib dash flycheck ]; @@ -5871,12 +6418,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457"; - sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg"; + rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; + sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -5900,8 +6447,8 @@ sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/13098bae76a3386689a9bf9c12f25b9a9b15145c/recipes/debpaste"; - sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste"; + sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v"; name = "debpaste"; }; packageRequires = [ xml-rpc ]; @@ -5913,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"; @@ -5976,16 +6523,16 @@ deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; - sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred"; + sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm"; name = "deferred"; }; packageRequires = [ emacs ]; @@ -6037,12 +6584,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "b40d7174d5d31ea8bf3442fb054f3c15bf6e979c"; - sha256 = "00aqhzamp1492kn0x1j2h15wywbkwx9m0alm5z82z60wrq7gy9z7"; + rev = "0f9436f98225e0f5a5deecea4680c173e76f0322"; + sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -6150,8 +6697,8 @@ sha256 = "03pvh213w0sgyvv0xrkj43bs53p2xfr7162yhzdh24qwa8dd23qv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl"; - sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; + sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2"; name = "diff-hl"; }; packageRequires = [ cl-lib ]; @@ -6349,6 +6896,27 @@ license = lib.licenses.free; }; }) {}; + dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-hide-dotfiles"; + version = "0.1"; + src = fetchFromGitHub { + owner = "mattiasb"; + repo = "dired-hide-dotfiles"; + rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221"; + sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles"; + sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0"; + name = "dired-hide-dotfiles"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dired-hide-dotfiles"; + license = lib.licenses.free; + }; + }) {}; dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; @@ -6496,6 +7064,27 @@ license = lib.licenses.free; }; }) {}; + direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: + melpaBuild { + pname = "direnv"; + version = "1.2.1"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-direnv"; + rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; + sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; + sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; + name = "direnv"; + }; + packageRequires = [ dash emacs with-editor ]; + meta = { + homepage = "https://melpa.org/#/direnv"; + license = lib.licenses.free; + }; + }) {}; direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "direx"; @@ -6612,8 +7201,8 @@ sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/84d19999b8387e8b71215675cf1c15873314d90e/recipes/dispass"; - sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass"; + sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n"; name = "dispass"; }; packageRequires = []; @@ -6797,22 +7386,22 @@ license = lib.licenses.free; }; }) {}; - doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: + doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "1.1.5"; + version = "1.2.5"; src = fetchFromGitHub { owner = "hlissner"; - repo = "emacs-doom-theme"; - rev = "f07088c1a6c177cdb5e2ff674489c17a8a7a8426"; - sha256 = "1c6id6d42p38viwd0x6cic0v08g117gj7im1m15k9j52rkvgvvn8"; + repo = "emacs-doom-themes"; + rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728"; + sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; - sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; + sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs"; name = "doom-themes"; }; - packageRequires = [ all-the-icons dash emacs font-lock-plus ]; + packageRequires = [ all-the-icons cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/doom-themes"; license = lib.licenses.free; @@ -6965,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"; @@ -6989,16 +7599,16 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "3f15f30a7330dd13a1d88891345ab382e9bee7cd"; - sha256 = "12y5gf65jdmh1m0fygzx4snfixlgc1laaax0w7ajkbhahyn8dwzc"; + rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0"; + sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; - sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; + sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w"; name = "dumb-jump"; }; packageRequires = [ dash emacs f popup s ]; @@ -7007,21 +7617,21 @@ license = lib.licenses.free; }; }) {}; - dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: + dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "c4f10d72febc"; - sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd"; + rev = "56fa34ea25d4"; + sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq"; name = "dyalog-mode"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/dyalog-mode"; license = lib.licenses.free; @@ -7195,6 +7805,27 @@ license = lib.licenses.free; }; }) {}; + easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-hugo"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-hugo"; + rev = "226fa5c661391c7f8317a24c9f757396e1900371"; + sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; + sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g"; + name = "easy-hugo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-hugo"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -7261,12 +7892,12 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "4d2ffa7ffbdfd6ee8a39a268e7c7c0de0905df6b"; - sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb"; + rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; + sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -7303,12 +7934,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.10.1"; + version = "2.11.6"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "d415b91c91581ff39364384fec35c219cb89d43a"; - sha256 = "13283ymm4av2gk7zj2rsppg6sk0lixy9g4lic4arrm8b5yb0vcsd"; + rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; + sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -7408,12 +8039,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "2a8988d845d5acf9d49d8177a68c3c8863916d25"; - sha256 = "19i746dyshcm2bih82n1m39sf18zx8gi1xaxc9q3pxm4hvn4s8mm"; + rev = "28a989232c276ee7fc5112c9050b1c29f628be9f"; + sha256 = "0kc51bb5jxrsra9ycg43n35dd8kngby321qbcixaj68cksf0whrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -7534,12 +8165,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "b86a4b3a696328faaa37a808abeed54561d19385"; - sha256 = "0ak5rw3y9cqggyclf9qddqrg9kzl50r5ynk9f99xjmsn2mpw6dwj"; + rev = "1543835ce00412c3cd34a61497af5f68ead250a6"; + sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -7659,15 +8290,15 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "2.1.1"; + version = "2.1.2"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "524494fd2b23217c6807b30b43bb95b5724f809e"; - sha256 = "0w9j5q5pzw55nwsw5wic7dl7psvg75vk1cxhrz2isgra6gissh9z"; + rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3"; + sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide"; - sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; + sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv"; name = "eide"; }; packageRequires = []; @@ -7676,22 +8307,22 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: + ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.12.1"; + version = "0.12.8"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "b52ccbd46dee2a1ece1dd6bd9be1224c323262ca"; - sha256 = "1qdznl8z0s2hy3hhls9ccr516wai11qh663630hc0zwv4gwlwp64"; + rev = "2dcec6a2c4d3258a92f77a35de1899cc00d2f537"; + sha256 = "0n8qvdj88d679ijjqs04cnnhz8prk8s3whijbp3lhlr5n034n8xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; name = "ein"; }; - packageRequires = [ cl-generic request websocket ]; + packageRequires = [ cl-generic dash deferred request websocket ]; meta = { homepage = "https://melpa.org/#/ein"; license = lib.licenses.free; @@ -7826,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"; @@ -7952,12 +8583,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; - sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -7973,12 +8604,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; - sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -8099,12 +8730,12 @@ elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmacro"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "d712c8efc01646117097e061e1b14933b822b9c7"; - sha256 = "00fry1gjsrx4dv9d9rjf5pd8w3709mn0052al0l948vhwz4wys9z"; + rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe"; + sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; @@ -8128,8 +8759,8 @@ sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/29c24259817bf4b7caf51f1cfc163e6b7c63504b/recipes/elmine"; - sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine"; + sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn"; name = "elmine"; }; packageRequires = []; @@ -8149,8 +8780,8 @@ sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c351c97e5b2c0595c82d65a7075176f9ebe44638/recipes/elpa-audit"; - sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit"; + sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi"; name = "elpa-audit"; }; packageRequires = []; @@ -8159,22 +8790,22 @@ license = lib.licenses.free; }; }) {}; - elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-clone"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d"; - sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a"; + rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110"; + sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa"; name = "elpa-clone"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/elpa-clone"; license = lib.licenses.free; @@ -8204,12 +8835,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.14.1"; + version = "1.15.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "9afc370f7044d4e5c5a47e7080b43468ff2a4e28"; - sha256 = "1ynranqi0lv9nhap4ydqns3znpqpc0q69qyb22i93pkd505ryyf8"; + rev = "55ee3d57872c87cb640abd5d63ac1887f9e8dc5d"; + sha256 = "0866l17sqq2p7bla2krg10y70wgsxf158kashcgschfr0h2f7r1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -8316,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"; @@ -8526,12 +9157,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "b447a2d0b311bc3c27b9ba51f27ec52ead58e258"; - sha256 = "1sagmgcarg7d7b7hv3bqgkxg39fzgxaaq7wz9cf7fpwz0pv8vfy6"; + rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9"; + sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -8567,15 +9198,15 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "4.1"; + version = "4.3"; src = fetchgit { - url = "git://git.sv.gnu.org/emms.git"; - rev = "c1e1a843c3389fc585908de367ff00fdd6470965"; - sha256 = "0q8grh20mzz8yashvzwx8s8hr761xmi6s81mjw8cjqzajm4ky8q3"; + url = "https://git.savannah.gnu.org/git/emms.git"; + rev = "4cb3ae341847e8e8586373a95a458a453469812d"; + sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; - sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; + sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; name = "emms"; }; packageRequires = []; @@ -8608,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"; @@ -8637,8 +9268,8 @@ sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f4eaa866ba6b0ad2b590fb15c30f81b9fdbef6dd/recipes/emms-player-simple-mpv"; - sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; + sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316"; name = "emms-player-simple-mpv"; }; packageRequires = [ cl-lib emacs emms ]; @@ -8783,22 +9414,22 @@ license = lib.licenses.free; }; }) {}; - enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20150711"; + version = "20170417"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "f945cff5e784e23e0028bf0a5221f4f47a822fac"; - sha256 = "1f6zyz5jmbrvv37mbzsvwb3ycmq105p4ryz8p65b76jz3ps8yq5w"; + rev = "2e483fe316ff993c80eafcf4ce4defd87d97776d"; + sha256 = "1xzhgmbc9iplxmqm7gc4hqk6nfdhqcrxz8g9kkf5ww3dx1czhiv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns"; name = "enh-ruby-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/enh-ruby-mode"; license = lib.licenses.free; @@ -8849,12 +9480,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "2621509bc9811c103d7efc999d4722e9d4c788e9"; - sha256 = "1bq634bimd5ng2jc5d0aglsrdi08jihm0qx2za4vfdqvnn82gxiv"; + rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6"; + sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -9007,8 +9638,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "2b93fb7103f5"; - sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p"; + rev = "a53227513692"; + sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -9032,8 +9663,8 @@ sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/321ae5999351637a2cd97ec1bf4668d68f569ee4/recipes/erc-hl-nicks"; - sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; + sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq"; name = "erc-hl-nicks"; }; packageRequires = []; @@ -9147,22 +9778,22 @@ license = lib.licenses.free; }; }) {}; - erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2.3"; + version = "20.0.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "aa315e1cf1b79ab782e5b4c944595495ebf4e2f4"; - sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c"; + rev = "a01de6873844ba510084090abec734c4166d71fa"; + sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq"; name = "erlang"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/erlang"; license = lib.licenses.free; @@ -9262,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 ]; @@ -9304,8 +9935,8 @@ sha256 = "0cairmqsaghl2ddb2v8zhcwy5ik756m7gkair8xrbigz4jklpcv9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f40e277af4001d367099360d4342d9c1ab925f59/recipes/esa"; - sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa"; + sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb"; name = "esa"; }; packageRequires = [ cl-lib ]; @@ -9314,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"; @@ -9388,8 +10040,8 @@ sha256 = "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up"; - sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up"; + sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy"; name = "eshell-up"; }; packageRequires = [ emacs ]; @@ -9419,6 +10071,48 @@ license = lib.licenses.free; }; }) {}; + eslint-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eslint-fix"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "eslint-fix"; + rev = "be90d1e78b1dfd43b6b3b1c06868539e2ac27d3a"; + sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix"; + sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da"; + name = "eslint-fix"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eslint-fix"; + license = lib.licenses.free; + }; + }) {}; + eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eslintd-fix"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "eslintd-fix"; + rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773"; + sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; + sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; + name = "eslintd-fix"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eslintd-fix"; + license = lib.licenses.free; + }; + }) {}; espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "espuds"; @@ -9556,8 +10250,8 @@ sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4381bbb725cb4a17d741f604698b38c95da475/recipes/esxml"; - sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml"; + sha256 = "0v63ihgg2db3648s2xygcky9s0vx9byjjpbhlgjy5j159w2w53vh"; name = "esxml"; }; packageRequires = []; @@ -9569,12 +10263,12 @@ ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "glasserc"; repo = "ethan-wspace"; - rev = "b8eae49ed3e7f646c16234970af5663e3090e720"; - sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja"; + rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4"; + sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace"; @@ -9661,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 ]; @@ -9713,22 +10407,22 @@ license = lib.licenses.free; }; }) {}; - evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-basics"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "f976bda20098c43be1418c36520a57467c8c6c13"; - sha256 = "18f1k4z7lkh237sz4p1xz4sxzs41ywmvd6dj7k9b6d9dscv3yxws"; + rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960"; + sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k"; name = "evil-colemak-basics"; }; - packageRequires = [ emacs evil ]; + packageRequires = [ emacs evil evil-snipe ]; meta = { homepage = "https://melpa.org/#/evil-colemak-basics"; license = lib.licenses.free; @@ -9737,12 +10431,12 @@ evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-commentary"; - rev = "6d9079894da0bdda8a317c03c90481b8754635c7"; - sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni"; + rev = "395f91014b69844b81660c155f42eb9b1b3d199d"; + sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary"; @@ -9755,6 +10449,27 @@ license = lib.licenses.free; }; }) {}; + evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-embrace"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "evil-embrace.el"; + rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7"; + sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; + sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7"; + name = "evil-embrace"; + }; + packageRequires = [ emacs embrace evil-surround ]; + meta = { + homepage = "https://melpa.org/#/evil-embrace"; + license = lib.licenses.free; + }; + }) {}; evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; @@ -9766,8 +10481,8 @@ sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; - sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape"; + sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l"; name = "evil-escape"; }; packageRequires = [ cl-lib emacs evil ]; @@ -9829,8 +10544,8 @@ sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4ef683cb1707a481e26dc89b5491ec18e5b20ad1/recipes/evil-lisp-state"; - sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state"; + sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz"; name = "evil-lisp-state"; }; packageRequires = [ bind-map evil smartparens ]; @@ -9884,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"; @@ -9926,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"; @@ -9947,12 +10662,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d"; - sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8"; + rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03"; + sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -9997,8 +10712,8 @@ sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da8d4e5bf23985632f993336b9183fe9f480addc/recipes/evil-opener"; - sha256 = "08vcf9i0rplw2p6gjl7zzrc7kxdl5yv2rggj2ihgdnnfpc4sl33h"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener"; + sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g"; name = "evil-opener"; }; packageRequires = [ evil opener ]; @@ -10012,14 +10727,14 @@ pname = "evil-org"; version = "0.1.1"; src = fetchFromGitHub { - owner = "edwtjo"; + owner = "Somelauw"; repo = "evil-org-mode"; rev = "2d7c58dbeca0d4ac7b4eab5f47b77946951f27e9"; sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5ec54af16e3dadce43ece7da3acb1cf2eab5d14b/recipes/evil-org"; - sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; + sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z"; name = "evil-org"; }; packageRequires = [ evil org ]; @@ -10075,14 +10790,14 @@ pname = "evil-search-highlight-persist"; version = "1.8"; src = fetchFromGitHub { - owner = "juanjux"; + owner = "naclander"; repo = "evil-search-highlight-persist"; rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85"; sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist"; - sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist"; + sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3"; name = "evil-search-highlight-persist"; }; packageRequires = [ highlight ]; @@ -10112,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; @@ -10159,14 +10874,14 @@ pname = "evil-surround"; version = "1.0.0"; src = fetchFromGitHub { - owner = "timcharper"; + owner = "emacs-evil"; repo = "evil-surround"; rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; - sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; + sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1"; name = "evil-surround"; }; packageRequires = [ evil ]; @@ -10259,6 +10974,27 @@ license = lib.licenses.free; }; }) {}; + evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-visual-replace"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "troyp"; + repo = "evil-visual-replace"; + rev = "9bfbaf71898294e25d588a887fb4753641edfbe9"; + sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; + sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01"; + name = "evil-visual-replace"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-visual-replace"; + license = lib.licenses.free; + }; + }) {}; evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visualstar"; @@ -10312,8 +11048,8 @@ sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/62ffcf48bdb2df2bc9e6dd767c4ed9d605a5c839/recipes/eww-lnum"; - sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum"; + sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c"; name = "eww-lnum"; }; packageRequires = []; @@ -10333,8 +11069,8 @@ sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell"; - sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; + sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5"; name = "exec-path-from-shell"; }; packageRequires = []; @@ -10346,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"; @@ -10405,6 +11141,27 @@ license = lib.licenses.free; }; }) {}; + exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "exsqlaim-mode"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "ahmadnazir"; + repo = "exsqlaim-mode"; + rev = "e77d2a07addffd7df4393019d9c3dad1ab1925d9"; + sha256 = "19v5sf3nf6dciakvs7ksbg66b5z1hybc4ivs24hm6k3fziblfzzs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode"; + sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7"; + name = "exsqlaim-mode"; + }; + packageRequires = [ s ]; + meta = { + homepage = "https://melpa.org/#/exsqlaim-mode"; + license = lib.licenses.free; + }; + }) {}; extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "extend-dnd"; @@ -10426,15 +11183,36 @@ license = lib.licenses.free; }; }) {}; + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + melpaBuild { + pname = "exwm-x"; + version = "1.7.2"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "exwm-x"; + rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; + sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; + sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; + name = "exwm-x"; + }; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; + meta = { + homepage = "https://melpa.org/#/exwm-x"; + license = lib.licenses.free; + }; + }) {}; eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef"; - sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl"; + rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20"; + sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -10450,12 +11228,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f"; - sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk"; + rev = "df2ae56e1ee5cc41c335ca6fd7ead3b99b3c5edd"; + sha256 = "0nsch4zzqd64rq0y75knfp95nn5nq2hvvgcjhq0i075g2vwhf73w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -10479,8 +11257,8 @@ sha256 = "1j6gc2pp5w3iwyjm4h3d0ahzs0ac3pah8lzfhpg4nkibl0nc1bcg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f"; - sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; + sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s"; name = "f"; }; packageRequires = [ dash s ]; @@ -10699,22 +11477,22 @@ license = lib.licenses.free; }; }) {}; - finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "finalize"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "72c8eaab3deb150ee2cf7f1473114cecffb5204a"; - sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx"; + rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27"; + sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq"; name = "finalize"; }; - packageRequires = [ cl-lib eieio emacs ]; + packageRequires = [ cl-generic cl-lib eieio emacs ]; meta = { homepage = "https://melpa.org/#/finalize"; license = lib.licenses.free; @@ -10744,12 +11522,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.2.7"; + version = "5.3.2"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "1ac2c0a717a1a0b70839625f2aaad2c18c21f729"; - sha256 = "0vmigmbr4fc36sahpf0bj65isa4sf1xhn1v2qvnidbx8qg18hm2f"; + rev = "99801cd730d579ed3b05d084ad254b6a73b259aa"; + sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -10891,12 +11669,12 @@ fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "728ae9258ebe790a69cf332407cba2f8c0be7d81"; - sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p"; + rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3"; + sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -10933,12 +11711,12 @@ fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "256a87d4b871ead0975fa0e7f76a1ecbaa074582"; - sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr"; + rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338"; + sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -10979,15 +11757,36 @@ license = lib.licenses.free; }; }) {}; + flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flatui-dark-theme"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "theasp"; + repo = "flatui-dark-theme"; + rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63"; + sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme"; + sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y"; + name = "flatui-dark-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/flatui-dark-theme"; + license = lib.licenses.free; + }; + }) {}; floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "643dbefca9754765e6d0f88a8953dc3689f5f93f"; - sha256 = "1wh4y53vqi2zb03gxa2g2s14i280yqv0i7432ifi10v2qdwkilna"; + rev = "fdac635ecc57ac7743f74678147aca2e956561de"; + sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -11000,24 +11799,24 @@ license = lib.licenses.free; }; }) {}; - flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: + flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "flow-mode"; + pname = "flow-minor-mode"; version = "0.1"; src = fetchFromGitHub { owner = "an-sh"; - repo = "flow-mode"; + repo = "flow-minor-mode"; rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458"; sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode"; - sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8"; - name = "flow-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; + sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s"; + name = "flow-minor-mode"; }; - packageRequires = [ emacs web-mode ]; + packageRequires = []; meta = { - homepage = "https://melpa.org/#/flow-mode"; + homepage = "https://melpa.org/#/flow-minor-mode"; license = lib.licenses.free; }; }) {}; @@ -11116,8 +11915,8 @@ sha256 = "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/43224eef52bb316102fea524ba87b0e9e43dc6e6/recipes/flycheck-cask"; - sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask"; + sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f"; name = "flycheck-cask"; }; packageRequires = [ dash emacs flycheck ]; @@ -11315,6 +12114,48 @@ license = lib.licenses.free; }; }) {}; + flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-joker"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "candid82"; + repo = "flycheck-joker"; + rev = "e7964140cbb0ee7badfc3d67c6412f5c3a461f76"; + sha256 = "0mqnhcpkf86dxqj0y7g5mnn91m81jdvrsbwikyqvx46z1jpi0y37"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; + sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3"; + name = "flycheck-joker"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-joker"; + 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"; @@ -11381,12 +12222,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "11805f1d420e297db0346a6657f144b08e2ca556"; - sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il"; + rev = "b16b77f95e4e53a8951ebee6209a5de311748447"; + sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -11423,12 +12264,12 @@ flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }: melpaBuild { pname = "flycheck-package"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573"; - sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1"; + rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38"; + sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -11504,22 +12345,43 @@ license = lib.licenses.free; }; }) {}; - flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: + melpaBuild { + pname = "flycheck-rtags"; + version = "2.10"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; + sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; + sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4"; + name = "flycheck-rtags"; + }; + packageRequires = [ emacs flycheck rtags ]; + meta = { + homepage = "https://melpa.org/#/flycheck-rtags"; + license = lib.licenses.free; + }; + }) {}; + flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "1c67e62562a5c30b3a184ef5090bbe50bab4d681"; - sha256 = "1xxvri9ax5cjrkxhjqhs7zqbch9cx8kvrn7sg611frl68qawkjsm"; + rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3"; + sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p"; name = "flycheck-status-emoji"; }; - packageRequires = [ emacs flycheck let-alist ]; + packageRequires = [ cl-lib emacs flycheck let-alist ]; meta = { homepage = "https://melpa.org/#/flycheck-status-emoji"; license = lib.licenses.free; @@ -11549,12 +12411,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "ae7b29111cb160774c317997902d7ef29cedd7d9"; - sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d"; + rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; + sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -11609,19 +12471,40 @@ license = lib.licenses.free; }; }) {}; + flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-yamllint"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "krzysztof-magosa"; + repo = "flycheck-yamllint"; + rev = "aa211b1243168a4f752888c0014c5b9d2da178b1"; + sha256 = "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint"; + sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m"; + name = "flycheck-yamllint"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-yamllint"; + license = lib.licenses.free; + }; + }) {}; flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; - sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; - sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; + sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr"; name = "flycheck-ycmd"; }; packageRequires = [ dash emacs flycheck let-alist ycmd ]; @@ -11704,8 +12587,8 @@ sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bd115612b61895f98b0659e9edc1e590967b6337/recipes/flymake-easy"; - sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy"; + sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v"; name = "flymake-easy"; }; packageRequires = []; @@ -12095,12 +12978,12 @@ flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-popup"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "flyspell-popup"; - rev = "a3890c9272c0cfa1e2cde6526f7d6280ad4af00c"; - sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic"; + rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde"; + sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup"; @@ -12134,6 +13017,27 @@ license = lib.licenses.free; }; }) {}; + fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fn"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "troyp"; + repo = "fn.el"; + rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6"; + sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; + sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn"; + name = "fn"; + }; + packageRequires = [ cl-lib dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/fn"; + license = lib.licenses.free; + }; + }) {}; focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; @@ -12166,8 +13070,8 @@ sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ebbbc23a29b2040c587e2f60dbfb7a9b45058751/recipes/fold-dwim"; - sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; + sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; name = "fold-dwim"; }; packageRequires = []; @@ -12347,12 +13251,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "4e88b7525c2f39c3d25f689b394b0ece7c6eed6d"; - sha256 = "1vcc8sdm0b3kss3g47wggc6mv28pr474559d3786fhncp5mxl1qq"; + rev = "37289bb68f01dd49b1192032ade6b0741d024a54"; + sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -12365,6 +13269,27 @@ license = lib.licenses.free; }; }) {}; + free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "free-keys"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "free-keys"; + rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4"; + sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys"; + sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj"; + name = "free-keys"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/free-keys"; + license = lib.licenses.free; + }; + }) {}; fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fringe-helper"; @@ -12376,8 +13301,8 @@ sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/22a334294660e8625cfeeeb7108517e163d8e443/recipes/fringe-helper"; - sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper"; + sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m"; name = "fringe-helper"; }; packageRequires = []; @@ -12410,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.3"; + version = "1.9.8"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "d5b9fde6dec186972f6ea457582504ca813b8778"; - sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879"; + rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; + sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -12447,8 +13372,8 @@ sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; - sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; + sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s"; name = "fstar-mode"; }; packageRequires = [ dash emacs ]; @@ -12647,12 +13572,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "6.1.2"; + version = "6.2"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; - sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; + rev = "ce51aa1afec78bf96aedb4badf33463383b7593e"; + sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -12689,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"; @@ -12710,12 +13635,12 @@ geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }: melpaBuild { pname = "geben-helm-projectile"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben-helm-projectile"; - rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d"; - sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l"; + rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b"; + sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile"; @@ -12886,8 +13811,8 @@ sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cfbd335054aff49d4a46f73bee881b7a00714d3c/recipes/ghc-imported-from"; - sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from"; + sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc"; name = "ghc-imported-from"; }; packageRequires = [ emacs ]; @@ -12917,36 +13842,57 @@ license = lib.licenses.free; }; }) {}; - ghub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "ghub"; - rev = "018aa524e12141b0d5a121ffcbde6d66d3f7aa4d"; - sha256 = "0phskyb48bvmmrrjcd8n7w2cnwyhfq6i3cfl71l8ypxb4pdibz0l"; + rev = "da60fa2316bf829cab18676afd5a43088ac06b60"; + sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8"; name = "ghub"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ghub"; license = lib.licenses.free; }; }) {}; + ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: + melpaBuild { + pname = "ghub-plus"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "vermiculus"; + repo = "ghub-plus"; + rev = "44a5558eb299adee1463b7120c23b26b1d914ea8"; + sha256 = "0fn5rb7ba4p39if68alvxv321918pki010vfylpp6jk98kzzh487"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; + sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n"; + name = "ghub-plus"; + }; + packageRequires = [ apiwrap emacs ghub ]; + meta = { + homepage = "https://melpa.org/#/ghub+"; + license = lib.licenses.free; + }; + }) {}; gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "144280f5353bceb902d5278fa64078337e99fa4d"; - sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8"; + rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2"; + sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -13046,12 +13992,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d"; - sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv"; + rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; + sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -13064,6 +14010,27 @@ license = lib.licenses.free; }; }) {}; + git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: + melpaBuild { + pname = "git-commit-insert-issue"; + version = "0.3.1"; + src = fetchFromGitLab { + owner = "emacs-stuff"; + repo = "git-commit-insert-issue"; + rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; + sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; + sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax"; + name = "git-commit-insert-issue"; + }; + packageRequires = [ bitbucket github-issues gitlab helm projectile s ]; + meta = { + homepage = "https://melpa.org/#/git-commit-insert-issue"; + license = lib.licenses.free; + }; + }) {}; git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; @@ -13151,12 +14118,12 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933"; - sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc"; + rev = "2d1d94fd2e8a17025224ae2224c5f44d8482dc64"; + sha256 = "1d0vk8344n4lcdcqxkv44qc7f3753mpy76hmgf8xi60kyajvjrd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -13169,22 +14136,22 @@ license = lib.licenses.free; }; }) {}; - git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "0.4.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b"; - sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy"; + rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf"; + sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7"; name = "git-link"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/git-link"; license = lib.licenses.free; @@ -13306,8 +14273,8 @@ sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/318989b10a5bf5b961b3c607730377923c8fb05b/recipes/gitconfig"; - sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig"; + sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf"; name = "gitconfig"; }; packageRequires = []; @@ -13400,6 +14367,27 @@ license = lib.licenses.free; }; }) {}; + github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "github-notifier"; + version = "0.1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "github-notifier.el"; + rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987"; + sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; + sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw"; + name = "github-notifier"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/github-notifier"; + license = lib.licenses.free; + }; + }) {}; github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; @@ -13484,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"; @@ -13757,6 +14766,27 @@ license = lib.licenses.free; }; }) {}; + go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-guru"; + version = "1.5.0"; + src = fetchFromGitHub { + owner = "dominikh"; + repo = "go-mode.el"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; + sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk"; + name = "go-guru"; + }; + packageRequires = [ cl-lib go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-guru"; + license = lib.licenses.free; + }; + }) {}; go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; @@ -13781,12 +14811,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "9d94107fae1b1137fb46f8cd7efc7e28f3abf2cb"; - sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -13820,6 +14850,27 @@ license = lib.licenses.free; }; }) {}; + go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-rename"; + version = "1.5.0"; + src = fetchFromGitHub { + owner = "dominikh"; + repo = "go-mode.el"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; + sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki"; + name = "go-rename"; + }; + packageRequires = [ go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-rename"; + license = lib.licenses.free; + }; + }) {}; go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-scratch"; @@ -13928,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"; @@ -14033,12 +15084,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16"; - sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj"; + rev = "b63044e5f833781eb7b305bc035392480ee06a82"; + sha256 = "1p0xnhcm7kx4g9wvy18nnij2wfirp0fccv24jz6v1i9bc64n7zka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -14138,12 +15189,12 @@ grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grails-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "50801257d376fd7383ddf9c19ff567183c24ad0b"; - sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm"; + rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; + sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -14300,8 +15351,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "5383fff2996b"; - sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz"; + rev = "1ae8eae88117"; + sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -14344,8 +15395,8 @@ sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grin"; - sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin"; + sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378"; name = "grin"; }; packageRequires = []; @@ -14399,12 +15450,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "groovy-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "50801257d376fd7383ddf9c19ff567183c24ad0b"; - sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm"; + rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; + sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -14483,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"; @@ -14546,12 +15597,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.3"; + version = "0.3.2"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "9cc6dba6ac9ede2855a1a95a22bc7353949f4362"; - sha256 = "0yyq2z3vsgib9r8paaj7ls4f8rwxmnhi5jsydzdmwqw1hrpkclv9"; + rev = "6d4ccb3f7376d6326b58b25f3c94ab546418a030"; + sha256 = "13n8k5ak3y1x6i27x47sji49kdbqhnc3ywqkn4xwmxcnrs28kr25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -14931,8 +15982,8 @@ sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd0352cac399eb2072dfb788deea9cc22d902964/recipes/haxor-mode"; - sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode"; + sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s"; name = "haxor-mode"; }; packageRequires = [ emacs ]; @@ -14965,12 +16016,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.5.3"; + version = "2.8.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a7d4308604ae790ff568730f8a2f47e578209d3a"; - sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5"; + rev = "c695a697461a48840f567bd5339909d4a80fa99f"; + sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -15049,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"; @@ -15070,12 +16121,12 @@ helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bbdb"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-bbdb"; - rev = "7be6ce17303422e9bc3ff1a7cb54361fcbcafc84"; - sha256 = "1ccj9gqr407mfrvp71571w3l82v96zdr956qsdbxfdda7bm3s0j7"; + rev = "20513422102fea4c08a0433d728a7783bb4968c8"; + sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; @@ -15130,6 +16181,27 @@ license = lib.licenses.free; }; }) {}; + helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-books"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "grugrut"; + repo = "helm-books"; + rev = "b4c57d2aed596faad41a753dccbcd0a31a717b76"; + sha256 = "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books"; + sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx"; + name = "helm-books"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-books"; + license = lib.licenses.free; + }; + }) {}; helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bundle-show"; @@ -15183,8 +16255,8 @@ sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; - sha256 = "1fvpq1xi3xhd8w1yasac87incv1w4av5a8vn0birw8pc7a6bxv4w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; + sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x"; name = "helm-cider"; }; packageRequires = [ cider emacs helm-core seq ]; @@ -15204,8 +16276,8 @@ sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f98a21483682eee0950bdba3a93d178db2118e95/recipes/helm-circe"; - sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe"; + sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw"; name = "helm-circe"; }; packageRequires = [ circe cl-lib emacs helm ]; @@ -15256,15 +16328,36 @@ license = lib.licenses.free; }; }) {}; + helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-company"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "Sodel-the-Vociferous"; + repo = "helm-company"; + rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; + sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; + sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34"; + name = "helm-company"; + }; + packageRequires = [ company helm ]; + meta = { + homepage = "https://melpa.org/#/helm-company"; + license = lib.licenses.free; + }; + }) {}; helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.5.3"; + version = "2.8.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a7d4308604ae790ff568730f8a2f47e578209d3a"; - sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5"; + rev = "c695a697461a48840f567bd5339909d4a80fa99f"; + sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -15309,8 +16402,8 @@ sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; - sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; + sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb"; name = "helm-dash"; }; packageRequires = [ cl-lib helm ]; @@ -15322,12 +16415,12 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "b4ad76372a1b9f4415322d210b3888423247693d"; - sha256 = "1qjhk1aag3arks0pgj3k2plr6k3cvb7i45apyczka6dvz8fmwj47"; + rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; + sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -15340,19 +16433,40 @@ 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"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-dired-history"; - rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56"; - sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i"; + rev = "281523f9fc46cf00fafd670ba5cd16552a607212"; + sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; - sha256 = "1k0021wn6x7in4wi9lri2c9wl06pvprv950hgdwgra8m155qjfp1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history"; + sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8"; name = "helm-dired-history"; }; packageRequires = [ cl-lib helm ]; @@ -15361,6 +16475,27 @@ license = lib.licenses.free; }; }) {}; + helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-emms"; + version = "1.3"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-emms"; + rev = "d7da090af0f63b92c5d735197992c732adbeef3d"; + sha256 = "0fs0i33di3liyx1f55xpg5nmac1b750n37g3pkxw2mil7fx7dz32"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; + sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5"; + name = "helm-emms"; + }; + packageRequires = [ cl-lib emacs emms helm ]; + meta = { + homepage = "https://melpa.org/#/helm-emms"; + license = lib.licenses.free; + }; + }) {}; helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-etags-plus"; @@ -15382,15 +16517,36 @@ license = lib.licenses.free; }; }) {}; + helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-ext"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "helm-ext"; + rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c"; + sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; + sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw"; + name = "helm-ext"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-ext"; + license = lib.licenses.free; + }; + }) {}; helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-firefox"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "eed223c2b0ce7dc2af3649d27eaef1603ad01f31"; - sha256 = "1v4kmw4hflvmy5v8mlp2mm284809alxybqszvv4j6dhjxyg4xz6a"; + rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085"; + sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; @@ -15435,8 +16591,8 @@ sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/299ebd9b72b5db061d31d7ae4f00b1ce6bb9db34/recipes/helm-ghc"; - sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc"; + sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d"; name = "helm-ghc"; }; packageRequires = [ cl-lib emacs ghc helm ]; @@ -15469,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"; @@ -15603,8 +16759,8 @@ sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1e1f2efa82d5097c1f5e85fba3f67b38a5b37c2/recipes/helm-hayoo"; - sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo"; + sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb"; name = "helm-hayoo"; }; packageRequires = [ haskell-mode helm json ]; @@ -15658,12 +16814,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "742eeb6c33253b2be581e30b5d70113cd87a581d"; - sha256 = "1dmmz6ghi21kmwprcv174pq5m198cmsphg297ll1bhqczk51j9h5"; + rev = "7b7b6dc2554603ad98412927f84a803625069ab3"; + sha256 = "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -15679,12 +16835,12 @@ helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-hg"; - version = "1.7.8"; + version = "1.8.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-hg"; - rev = "fa709b6354d84e1c88ccef096d29410fa16f7f5f"; - sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda"; + rev = "61b91a22fcfb62d0fc56e361ec01ce96973c7165"; + sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a22c9ec281330c4603aec6feb04cf580dee340/recipes/helm-ls-hg"; @@ -15750,8 +16906,8 @@ sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/903a2b64d9a704105100d61f28cdfa8f497abd7d/recipes/helm-mode-manager"; - sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager"; + sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl"; name = "helm-mode-manager"; }; packageRequires = [ helm ]; @@ -15847,12 +17003,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "c8ad1d86dd375f1be433b95e2bc40876f663663f"; - sha256 = "1ia960sqkbc5bqljjb0arw54q90x36lhp0230s75xcg6m47bxpw3"; + rev = "93df6808dda8f50da4f435c47763733703905119"; + sha256 = "1zyl8x03n9n9sc7bys2nqdmzadl5qrwi01qn1gy48jrkfhgiva6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -15981,8 +17137,8 @@ sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc"; - sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc"; + sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz"; name = "helm-proc"; }; packageRequires = [ helm ]; @@ -16065,8 +17221,8 @@ sha256 = "1jy9l4an2aqynj86pw2qxpzw446xm376n2ykiz17qlimqbxhwkgz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose"; - sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose"; + sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79"; name = "helm-purpose"; }; packageRequires = [ emacs helm window-purpose ]; @@ -16180,6 +17336,27 @@ license = lib.licenses.free; }; }) {}; + helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: + melpaBuild { + pname = "helm-rtags"; + version = "2.10"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; + sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; + sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n"; + name = "helm-rtags"; + }; + packageRequires = [ helm rtags ]; + meta = { + homepage = "https://melpa.org/#/helm-rtags"; + license = lib.licenses.free; + }; + }) {}; helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rubygems-org"; @@ -16275,8 +17452,8 @@ sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6fe2ffb46ea763bc6fb6fb6c899be6d3a67440/recipes/helm-swoop"; - sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; + sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx"; name = "helm-swoop"; }; packageRequires = [ emacs helm ]; @@ -16306,6 +17483,27 @@ license = lib.licenses.free; }; }) {}; + helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-tramp"; + version = "0.5.4"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-tramp"; + rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; + sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; + sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517"; + name = "helm-tramp"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-tramp"; + license = lib.licenses.free; + }; + }) {}; helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-unicode"; @@ -16348,6 +17546,27 @@ license = lib.licenses.free; }; }) {}; + helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: + melpaBuild { + pname = "helm-w3m"; + version = "1.0"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-w3m"; + rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a"; + sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m"; + sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz"; + name = "helm-w3m"; + }; + packageRequires = [ cl-lib emacs helm w3m ]; + meta = { + homepage = "https://melpa.org/#/helm-w3m"; + license = lib.licenses.free; + }; + }) {}; helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-zhihu-daily"; @@ -16411,6 +17630,48 @@ license = lib.licenses.free; }; }) {}; + hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hide-lines"; + version = "20130623.1701"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "hide-lines"; + rev = "4bfb4c6f4769bd6c637e4c18bbf65506832fc9f0"; + sha256 = "01cy7v9ql70bsvjz3idq23jpyb8jb61bs9ff8vf5y3fj45pc32ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines"; + sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d"; + name = "hide-lines"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/hide-lines"; + license = lib.licenses.free; + }; + }) {}; + hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hierarchy"; + version = "0.6.0"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "hierarchy"; + rev = "a6a01cd4688fc9264fd36c279c0249f16704132b"; + sha256 = "0b6g9j76zd5wdqg4xkw34a6sijf8jsdvnnr7hbix7zf8cxrr2gqr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; + sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp"; + name = "hierarchy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hierarchy"; + license = lib.licenses.free; + }; + }) {}; highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-blocks"; @@ -16548,8 +17809,8 @@ sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/highlight-symbol"; - sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol"; + sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r"; name = "highlight-symbol"; }; packageRequires = []; @@ -16561,12 +17822,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "d67cee32231aee30984b9c5d0250d21b5377b620"; - sha256 = "126q56673w7yz1p58550k6aya47nhbzn29g4zvq6wjbnicn0vwd1"; + rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469"; + sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -16716,8 +17977,8 @@ sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/48b99dd60dda3039a0e1e71bb4b796d62340279e/recipes/hl-sexp"; - sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; + sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; name = "hl-sexp"; }; packageRequires = []; @@ -16729,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"; @@ -16936,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"; @@ -17170,12 +18452,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "3.14"; + version = "3.16"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "397a43309c0405009cc6961053c54dedebdc83a2"; - sha256 = "091kq58bb5dxq13d3jap7m4v6ddpin7hkybzy7drqkwn2q005ggb"; + rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; + sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -17220,8 +18502,8 @@ sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ccca92fee3d39966df135a5c79e42d2ab621848/recipes/ido-grid-mode"; - sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode"; + sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3"; name = "ido-grid-mode"; }; packageRequires = [ emacs ]; @@ -17275,12 +18557,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "3.14"; + version = "3.16"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "397a43309c0405009cc6961053c54dedebdc83a2"; - sha256 = "091kq58bb5dxq13d3jap7m4v6ddpin7hkybzy7drqkwn2q005ggb"; + rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; + sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -17388,8 +18670,8 @@ sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; - sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; + sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh"; name = "iedit"; }; packageRequires = []; @@ -17598,8 +18880,8 @@ sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/eddb7acecc4948ade16ff02415484c9a16529c9c/recipes/imgix"; - sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix"; + sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg"; name = "imgix"; }; packageRequires = [ cl-lib dash ht json s ]; @@ -17692,6 +18974,27 @@ license = lib.licenses.free; }; }) {}; + importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "importmagic"; + version = "1.0"; + src = fetchFromGitHub { + owner = "anachronic"; + repo = "importmagic.el"; + rev = "135e049d763ceb4cabd0bab068c4c71452459065"; + sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; + sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv"; + name = "importmagic"; + }; + packageRequires = [ emacs epc f ]; + meta = { + homepage = "https://melpa.org/#/importmagic"; + license = lib.licenses.free; + }; + }) {}; indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-guide"; @@ -17713,15 +19016,36 @@ license = lib.licenses.free; }; }) {}; + indium = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "indium"; + version = "0.28"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "Indium"; + rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; + sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; + sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; + name = "indium"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/indium"; + license = lib.licenses.free; + }; + }) {}; inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "1.4.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "a9eb2109fcd547b5c9f18f7bf9e617f32d47b5a0"; - sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k"; + rev = "956b22e7941d71216799ca4e8d5244e94fad9558"; + sha256 = "1wakfwmb43na3g2yqign764kwi791x7ikzmf76pkdpky70a5dkhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -17737,12 +19061,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "54eb6bf6d68d71bdac63fcb2042d8e1c554b427f"; - sha256 = "0yqcl2r8kwdl99704vm8qsdzziidznp0gpyr29ipya7fl24nkfxr"; + rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2"; + sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -17800,12 +19124,12 @@ inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "shlevy"; repo = "inherit-local"; - rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; - sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7"; + sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; @@ -17967,12 +19291,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "1.0"; + version = "1.1"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "c4b4a7ecdad6ed57545c114b40da9f76371f566e"; - sha256 = "1wz6j7szb271g1baf6jj4k4kw1dfiz8l677vrazx4wyqdpmzlk0c"; + rev = "ad207c8c3d266d566fb1e4862df154096c059171"; + sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -18027,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"; @@ -18072,12 +19417,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "0.2.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "250ed1e03359fe5b29070da13cd55abc6deb0cda"; - sha256 = "168bnirfqpgiqmrjs52ixzqzq074y9szvxi6bml9zbxi8dcmafaq"; + rev = "2424f57a3c0d320946c7ad32b44d296a91104201"; + sha256 = "13lg7ra4g3nbg96vbwk1giw2pjhqarpd72qi21x57w3lc44fwqld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -18114,12 +19459,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -18153,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.1.5"; + version = "0.2.4"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af"; - sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y"; + rev = "117369f882f81fb9cc88459a4072a2789138c136"; + sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -18195,22 +19561,22 @@ license = lib.licenses.free; }; }) {}; - ivy-hydra = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx"; name = "ivy-hydra"; }; - packageRequires = []; + packageRequires = [ emacs hydra ivy ]; meta = { homepage = "https://melpa.org/#/ivy-hydra"; license = lib.licenses.free; @@ -18258,6 +19624,27 @@ license = lib.licenses.free; }; }) {}; + ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: + melpaBuild { + pname = "ivy-rtags"; + version = "2.10"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; + sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; + sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq"; + name = "ivy-rtags"; + }; + packageRequires = [ ivy rtags ]; + meta = { + homepage = "https://melpa.org/#/ivy-rtags"; + license = lib.licenses.free; + }; + }) {}; ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: melpaBuild { pname = "ivy-youtube"; @@ -18269,8 +19656,8 @@ sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube"; - sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube"; + sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4"; name = "ivy-youtube"; }; packageRequires = [ cl-lib ivy request ]; @@ -18346,13 +19733,13 @@ pname = "jabber"; version = "0.8.92"; src = fetchgit { - url = "git://git.code.sf.net/p/emacs-jabber/git"; + url = "https://git.code.sf.net/p/emacs-jabber/git"; rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd"; sha256 = "03x93wkd8syj2ybf5ymwcm6khx0h5nhrl8pyync1520294pq6i1i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber"; - sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber"; + sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws"; name = "jabber"; }; packageRequires = []; @@ -18361,27 +19748,6 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: - melpaBuild { - pname = "jade"; - version = "0.28"; - src = fetchFromGitHub { - owner = "NicolasPetton"; - repo = "jade"; - rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; - sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; - sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; - name = "jade"; - }; - packageRequires = [ company emacs js2-mode seq websocket ]; - meta = { - homepage = "https://melpa.org/#/jade"; - license = lib.licenses.free; - }; - }) {}; jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jade-mode"; @@ -18498,8 +19864,8 @@ sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp"; - sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp"; + sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5"; name = "jdecomp"; }; packageRequires = [ emacs ]; @@ -18550,6 +19916,27 @@ license = lib.licenses.free; }; }) {}; + jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jinja2-mode"; + version = "0.2"; + src = fetchFromGitHub { + owner = "paradoxxxzero"; + repo = "jinja2-mode"; + rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86"; + sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b79196cf0dc0b436ff75eabea369a62f92825d9f/recipes/jinja2-mode"; + sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx"; + name = "jinja2-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/jinja2-mode"; + license = lib.licenses.free; + }; + }) {}; jpop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jpop"; @@ -18592,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; @@ -18760,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"; @@ -18970,6 +20378,27 @@ license = lib.licenses.free; }; }) {}; + kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "kaolin-theme"; + version = "0.6"; + src = fetchFromGitHub { + owner = "0rdy"; + repo = "kaolin-theme"; + rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e"; + sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; + sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c"; + name = "kaolin-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/kaolin-theme"; + license = lib.licenses.free; + }; + }) {}; karma = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "karma"; @@ -18991,6 +20420,27 @@ license = lib.licenses.free; }; }) {}; + key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "key-chord"; + version = "0.6"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "key-chord"; + rev = "8468998946367157830df19a1e92785d22a34178"; + sha256 = "10ldhwp9a21r9g72hzaig1h5yh2zblny0r36nf5nz6gzikfcq0cd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord"; + sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr"; + name = "key-chord"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/key-chord"; + license = lib.licenses.free; + }; + }) {}; key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "key-combo"; @@ -19099,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"; @@ -19191,8 +20641,8 @@ sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7c3aa60be932d65929f453f1ce576abcd00252ed/recipes/kill-ring-search"; - sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search"; + sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl"; name = "kill-ring-search"; }; packageRequires = []; @@ -19225,12 +20675,12 @@ kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kivy-mode"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "7e789b24cdb0ee044469d7bc42da9e4146674a18"; - sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri"; + rev = "a4116a58d7c5448a4c6615021302375cbe3e129a"; + sha256 = "070ybsn66spb82jp1fzrnkn6xlbn7jn8zprmxkz8jv0lf5lg6ggk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -19254,8 +20704,8 @@ sha256 = "07nb141hxjabin8vr14hpn80vzrjaq1b3h6p76m0bwxvzbi8765r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; - sha256 = "1z5gns3y7iv3lmczgxdbvg3wigkch4ljwcx7dc5f92q3ykm0zwhf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; + sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07"; name = "kiwix"; }; packageRequires = [ cl-lib emacs ]; @@ -19306,6 +20756,48 @@ license = lib.licenses.free; }; }) {}; + kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "kubernetes"; + version = "0.11.3"; + src = fetchFromGitHub { + owner = "chrisbarrett"; + repo = "kubernetes-el"; + rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; + sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; + sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9"; + name = "kubernetes"; + }; + packageRequires = [ dash emacs magit ]; + meta = { + homepage = "https://melpa.org/#/kubernetes"; + license = lib.licenses.free; + }; + }) {}; + kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }: + melpaBuild { + pname = "kubernetes-evil"; + version = "0.11.3"; + src = fetchFromGitHub { + owner = "chrisbarrett"; + repo = "kubernetes-el"; + rev = "560b65baef1c4f2bedffd8e767774b55dfc35594"; + sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil"; + sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8"; + name = "kubernetes-evil"; + }; + packageRequires = [ evil kubernetes ]; + meta = { + homepage = "https://melpa.org/#/kubernetes-evil"; + license = lib.licenses.free; + }; + }) {}; kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; @@ -19327,15 +20819,36 @@ license = lib.licenses.free; }; }) {}; + labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "labburn-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ksjogo"; + repo = "labburn-theme"; + rev = "bfa1d9f1c7e107cb45754fe57e4e72a9be70e9d1"; + sha256 = "1r221fwfigr6fk4p3xh00wgw9wxm2gpzvj17jf5pgd7cvyspchsy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; + sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm"; + name = "labburn-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/labburn-theme"; + license = lib.licenses.free; + }; + }) {}; 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"; @@ -19464,8 +20977,8 @@ sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; - sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; + sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf"; name = "ledger-mode"; }; packageRequires = []; @@ -19540,12 +21053,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "d722d3662b191b61310dc9bba78f9a77f512b742"; - sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz"; + rev = "af14b1439097850ffa39935419ed83f5bcaa6d09"; + sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -19645,12 +21158,12 @@ linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-relative"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "coldnew"; repo = "linum-relative"; - rev = "1074e12904d08e00dda438d9700f2a3bff238bd5"; - sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc"; + rev = "b8a99dcfe38a491172a8193053fb7849634b43c0"; + sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; @@ -19796,6 +21309,27 @@ license = lib.licenses.free; }; }) {}; + literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "literal-string"; + version = "0.1"; + src = fetchFromGitHub { + owner = "joodie"; + repo = "literal-string-mode"; + rev = "46dd2b620df70d681261616f1a26afa4a032e2d5"; + sha256 = "02a1jvxk2m1lb21p3281cr9xyhzix31cn8a9la53w90sz569i66r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string"; + sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn"; + name = "literal-string"; + }; + packageRequires = [ emacs markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/literal-string"; + license = lib.licenses.free; + }; + }) {}; literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "literate-coffee-mode"; @@ -19807,8 +21341,8 @@ sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a20410e916d45e5b243e7eb3bb2226c7e1e67b00/recipes/literate-coffee-mode"; - sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode"; + sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64"; name = "literate-coffee-mode"; }; packageRequires = [ coffee-mode ]; @@ -19828,8 +21362,8 @@ sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/833e549ba618e58d9cb0b6768a08c651ad8c9e0a/recipes/live-code-talks"; - sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks"; + sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm"; name = "live-code-talks"; }; packageRequires = [ cl-lib emacs narrowed-page-navigation ]; @@ -19841,12 +21375,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.14.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f"; - sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx"; + rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674"; + sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -19954,8 +21488,8 @@ sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/logito"; - sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito"; + sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl"; name = "logito"; }; packageRequires = [ eieio ]; @@ -19967,12 +21501,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "6409991053350ab2d3def61749b92780dd1ed095"; - sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -20048,22 +21582,22 @@ license = lib.licenses.free; }; }) {}; - m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "m-buffer"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "61d1ed99e528840d2eee2ce07946a9d76eb6d814"; - sha256 = "048ls0ca9yppjj0mx6g00f1vwh4ryvv6bckihxs7ynbr2jcydjr7"; + rev = "6eb1d2535a82707a83733173bc400a0d8e520c80"; + sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; name = "m-buffer"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ seq ]; meta = { homepage = "https://melpa.org/#/m-buffer"; license = lib.licenses.free; @@ -20080,8 +21614,8 @@ sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/17df4dccdffff6ef7b4900565ae64c1cf84c1fda/recipes/macro-math"; - sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math"; + sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn"; name = "macro-math"; }; packageRequires = []; @@ -20101,8 +21635,8 @@ sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/362b5cb71e81172bc654594c08a5d0b91262851a/recipes/macrostep"; - sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep"; + sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2"; name = "macrostep"; }; packageRequires = [ cl-lib ]; @@ -20135,12 +21669,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d"; - sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv"; + rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; + sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -20163,12 +21697,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432"; - sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z"; + rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40"; + sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -20268,12 +21802,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "a2b7b85134784317445faee13d647fb62401ea23"; - sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p"; + rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b"; + sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -20289,12 +21823,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d"; - sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv"; + rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; + sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -20370,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"; @@ -20402,8 +21957,8 @@ sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; - sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; + sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; name = "magithub"; }; packageRequires = [ emacs git-commit magit s with-editor ]; @@ -20465,8 +22020,8 @@ sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/909a2d78f49a11e3f90e7d3c7f8af55e15113442/recipes/malinka"; - sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; + sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y"; name = "malinka"; }; packageRequires = [ cl-lib dash f projectile rtags s ]; @@ -20580,22 +22135,22 @@ license = lib.licenses.free; }; }) {}; - markdown-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "c6eb56eff31f7961c9a00a5d18eaf939c2c40b7d"; - sha256 = "098lf4n4rpx00sm07sy8dwp683a4sb7x0p15mrfp268apir3kkxb"; + rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9"; + sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14"; name = "markdown-mode"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/markdown-mode"; license = lib.licenses.free; @@ -20671,6 +22226,27 @@ license = lib.licenses.free; }; }) {}; + markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "markup"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "leoc"; + repo = "markup.el"; + rev = "876da2d3f23473475bb0fd0a1480ae11d2671291"; + sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup"; + sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf"; + name = "markup"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/markup"; + license = lib.licenses.free; + }; + }) {}; markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markup-faces"; @@ -20682,8 +22258,8 @@ sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/70a3b6a7b43c76b0ce3b350f5c8d657bf4f7fb04/recipes/markup-faces"; - sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces"; + sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9"; name = "markup-faces"; }; packageRequires = []; @@ -20713,6 +22289,27 @@ license = lib.licenses.free; }; }) {}; + mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mastodon"; + version = "0.7.0"; + src = fetchFromGitHub { + owner = "jdenen"; + repo = "mastodon.el"; + rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac"; + sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; + sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i"; + name = "mastodon"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mastodon"; + license = lib.licenses.free; + }; + }) {}; material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; @@ -20787,8 +22384,8 @@ sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7944652cb7a7bf45f16e86ea379a104d31861e76/recipes/maxframe"; - sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe"; + sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8"; name = "maxframe"; }; packageRequires = []; @@ -20884,12 +22481,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.6.6"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9"; - sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -20947,12 +22544,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "2.5.3"; + version = "2.5.5"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805"; - sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q"; + rev = "957e551140587f0cd83d9186a06fba10a38c6084"; + sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -20965,36 +22562,36 @@ license = lib.licenses.free; }; }) {}; - metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "metafmt"; - version = "0.0.3"; + pname = "meta-presenter"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "lvillani"; - repo = "metafmt"; - rev = "bd20fc67d0affd48c1199315b7da06a7182e7d76"; - sha256 = "0n4nv1s25z70xfy3bl1wy467abz3agj4qmpx4rwdwzbarnqp9ps3"; + owner = "myTerminal"; + repo = "meta-presenter"; + rev = "7ba8d30e36ce6de6e563c7f3a41a24d288787c48"; + sha256 = "0m23qsbai8j0bx0px7v3ipw92i4y8maxibna6zqrw3msv1j3s7cw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a53f740fb7a58cd6339b301d0de8c543b61f6a5/recipes/metafmt"; - sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75"; - name = "metafmt"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; + sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d"; + name = "meta-presenter"; }; packageRequires = []; meta = { - homepage = "https://melpa.org/#/metafmt"; + homepage = "https://melpa.org/#/meta-presenter"; license = lib.licenses.free; }; }) {}; 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"; @@ -21238,6 +22835,27 @@ license = lib.licenses.free; }; }) {}; + mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + melpaBuild { + pname = "mmm-jinja2"; + version = "0.1"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "mmm-jinja2"; + rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f"; + sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; + sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi"; + name = "mmm-jinja2"; + }; + packageRequires = [ mmm-mode ]; + meta = { + homepage = "https://melpa.org/#/mmm-jinja2"; + license = lib.licenses.free; + }; + }) {}; mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; @@ -21282,12 +22900,12 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "e77b809e39b9ab437b662ee759e990163bc89377"; - sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc"; + rev = "f7db836a10720ee50217012e7e2597ebcf624f90"; + sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -21321,6 +22939,27 @@ license = lib.licenses.free; }; }) {}; + mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "mocha-snippets"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "cowboyd"; + repo = "mocha-snippets.el"; + rev = "e054137bd78f0d236e983874da1f345d30a71816"; + sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; + sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds"; + name = "mocha-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/mocha-snippets"; + license = lib.licenses.free; + }; + }) {}; mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mocker"; @@ -21345,12 +22984,12 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "95627e660768c7ab7af4d8ad35c2bc0c4fa7195b"; - sha256 = "0yf5lwd95j55dkrkplsgnynq37ww0g97vw517j9q7spn7dqnq5f6"; + rev = "1259afa084f58d143d133aac56a6c0c10bc460f2"; + sha256 = "0ggj8q92sb6wp3hs1vhpmy56id0p3i9zwnw24g2v7xa7w8ac9s7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -21450,12 +23089,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "fc5822fcb11c3c6af67b5fb152f92c3e6e3c49d3"; - sha256 = "0r81jdwfmgzivfpkxqr425qajgw3dzzs8y2v5lsiwl1d5z8rz52a"; + rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; + sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -21534,12 +23173,12 @@ move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-dup"; - version = "0.2.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "wyuenho"; repo = "move-dup"; - rev = "4df67072eebac69d6be7619335b03f56f9960235"; - sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2"; + rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0"; + sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup"; @@ -21576,12 +23215,12 @@ mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "9645c431e921317721ba8dea9ce713d235f94726"; - sha256 = "14kpj1fh3p8asnxwb0jl3b6r32b7zplxyl5hvbgkal687b1gx50w"; + rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; + sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -21681,12 +23320,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "1.3.0"; + version = "1.3.5"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "71c38323187c98b32250b89088768599bb216ddb"; - sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg"; + rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; + sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -21699,19 +23338,40 @@ license = lib.licenses.free; }; }) {}; + mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mtg-deck-mode"; + version = "0.2"; + src = fetchFromGitHub { + owner = "mattiasb"; + repo = "mtg-deck-mode"; + rev = "7774641630ef85999ab2f6d57eebddbc7c1e7244"; + sha256 = "12ajrlgyj14jf66if7bdgj69jm72wzrmiclx7x8dpsz4zpj38m20"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; + sha256 = "07hszf33nawhp218f90qr4s713yyjdd7zzkq0s8q0fb6aai5iiih"; + name = "mtg-deck-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mtg-deck-mode"; + license = lib.licenses.free; + }; + }) {}; mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "0.4"; + version = "1.0"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "75ee79ed663bde0bd52f09c5b444cbd9e13a738a"; - sha256 = "09sywhf1g8yqadzp19djar2gm3fmilqi3pbdm0hvm9b7xpq1gg44"; + rev = "3453e25ff6c07c1b768b2a79fdb9fc5c97100e76"; + sha256 = "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; - sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; + sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r"; name = "mu4e-alert"; }; packageRequires = [ alert emacs ht s ]; @@ -21731,8 +23391,8 @@ sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; - sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension"; + sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc"; name = "mu4e-maildirs-extension"; }; packageRequires = []; @@ -21783,6 +23443,27 @@ license = lib.licenses.free; }; }) {}; + multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "multi-term"; + version = "1.2"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "multi-term"; + rev = "c9e67edb772f2d9f9da8d887dc746459cfbce244"; + sha256 = "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term"; + sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal"; + name = "multi-term"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/multi-term"; + license = lib.licenses.free; + }; + }) {}; multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-web-mode"; @@ -21836,8 +23517,8 @@ sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f7e5f7e9c551a149e9d433173bd8c8613487ed/recipes/mustache-mode"; - sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode"; + sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36"; name = "mustache-mode"; }; packageRequires = []; @@ -21899,8 +23580,8 @@ sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org"; - sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org"; + sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj"; name = "mysql-to-org"; }; packageRequires = [ emacs s ]; @@ -21909,6 +23590,27 @@ license = lib.licenses.free; }; }) {}; + myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "myterminal-controls"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "myTerminal"; + repo = "myterminal-controls"; + rev = "59ff3a02e34969a2ac608906937cb65cb514f9f1"; + sha256 = "11b0m09n1qqhjbdmcilb1g1408k17700qn37m3wavjrcjvdhnd5n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; + sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2"; + name = "myterminal-controls"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/myterminal-controls"; + license = lib.licenses.free; + }; + }) {}; name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "name-this-color"; @@ -21920,8 +23622,8 @@ sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/806273d9898331b9b0189a72d9fdd43c86e1224c/recipes/name-this-color"; - sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color"; + sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8"; name = "name-this-color"; }; packageRequires = [ cl-lib dash emacs ]; @@ -22061,14 +23763,14 @@ pname = "navi-mode"; version = "2.0"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "navi"; rev = "5c979b3b3873b0e67751a1321a9e271d066f2022"; sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode"; - sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode"; + sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69"; name = "navi-mode"; }; packageRequires = []; @@ -22130,8 +23832,8 @@ sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; - sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle"; + sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny"; name = "nemerle"; }; packageRequires = []; @@ -22143,12 +23845,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "1.0.2"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "370212fa9ffcba3ff542a154d17ccf5be1066c4c"; - sha256 = "13a760jidh00czl05c0pnpbxzr7smrkf5ms9kd3h1cq613ffapby"; + rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; + sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -22161,22 +23863,22 @@ license = lib.licenses.free; }; }) {}; - neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; - sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; + rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0"; + sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06"; name = "neotree"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/neotree"; license = lib.licenses.free; @@ -22185,12 +23887,12 @@ nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; - version = "1.1.7"; + version = "1.1.9"; src = fetchFromGitHub { owner = "ajc"; repo = "nginx-mode"; - rev = "b58708d15a6659577945c0aa3a63983eebff2e67"; - sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix"; + rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005"; + sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; @@ -22248,12 +23950,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "89d30002eddcc33c5c74dcc871a97aee0228d403"; - sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8"; + rev = "749f48b510d0fd47dac67850f4089119fbff142a"; + sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -22269,12 +23971,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.7"; + version = "1.11.12"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "13fe83dc8e28a32bdd454d04908fe1514ec50d51"; - sha256 = "1mddzphb0xbsa5ma83h3hmama77fvxxhwp5qbcrnwpihz1g1l5dv"; + rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232"; + sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -22311,12 +24013,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.5"; + version = "0.5.9"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b"; - sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -22371,6 +24073,27 @@ license = lib.licenses.free; }; }) {}; + nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nord-theme"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-emacs"; + rev = "290aa9221a10e107acb0f06d0ec338fcb3e44785"; + sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; + sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc"; + name = "nord-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nord-theme"; + license = lib.licenses.free; + }; + }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; version = "0.1.1"; @@ -22380,8 +24103,8 @@ sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/nose"; - sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose"; + sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682"; name = "nose"; }; packageRequires = []; @@ -22392,11 +24115,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.24pre0"; + version = "0.25pre0"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "990f8cd03203c7a19cef4e3edbec823cc99fa701"; - sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q"; + rev = "952a0f0cda7d1a12432d1c9ad71b41401cb1615c"; + sha256 = "1mj3946sg2lxamcz16jkys88scx1fyhky3amwxnl5iszd15lhvxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -22535,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"; @@ -22546,8 +24290,8 @@ sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1943a1986775952bedd78430ee41b67af130c439/recipes/nvm"; - sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm"; + sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w"; name = "nvm"; }; packageRequires = [ dash dash-functional f s ]; @@ -22559,12 +24303,12 @@ nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nyan-mode"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "b5db3a612bba35c8f54f44c300ebc879db6b3288"; - sha256 = "199ii1658k4sp5krha77n9l5jblyvnvvvr28g2nbc74lfybckjwq"; + rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a"; + sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -22619,6 +24363,27 @@ license = lib.licenses.free; }; }) {}; + ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-blockdiag"; + version = "20170501.112"; + src = fetchFromGitHub { + owner = "corpix"; + repo = "ob-blockdiag.el"; + rev = "e6532af46dcea8e79f3ad3cb2863cbbe516efbf6"; + sha256 = "059jcl1qpfxwsykbj1sf7r1fpg7wix4fbdhhghrhbhgf5w165hsv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag"; + sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g"; + name = "ob-blockdiag"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-blockdiag"; + license = lib.licenses.free; + }; + }) {}; ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; @@ -22714,8 +24479,8 @@ sha256 = "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/ob-spice"; - sha256 = "13a6g9sh6wvlshvzlllxn8zchb6cb2m0ar14fqvrz5g4hn4hbsm8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; + sha256 = "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2"; name = "ob-spice"; }; packageRequires = [ org spice-mode ]; @@ -22745,6 +24510,48 @@ license = lib.licenses.free; }; }) {}; + ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-uart"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "andrmuel"; + repo = "ob-uart"; + rev = "90daeac90a9e75c20cdcf71234c67b812110c50e"; + sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart"; + sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7"; + name = "ob-uart"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-uart"; + license = lib.licenses.free; + }; + }) {}; + obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "obfusurl"; + version = "2.0"; + src = fetchFromGitHub { + owner = "davep"; + repo = "obfusurl.el"; + rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e"; + sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; + sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra"; + name = "obfusurl"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/obfusurl"; + license = lib.licenses.free; + }; + }) {}; ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }: melpaBuild { pname = "ocodo-svg-modelines"; @@ -22769,12 +24576,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "8c349c5531d3bc90b00df875b6cd3c64110f59f1"; - sha256 = "1c4fdm6r3r3fqjflqjncfmx0ps52b5f17vq957g0b3pcaql5n63d"; + rev = "032599b162624a4b65c82c20be06433f24b00e8f"; + sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -22874,12 +24681,12 @@ omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "omni-log"; - version = "0.1.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "7eb30e42cc89064abb7acbec63cb9644c2ad7c9b"; - sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk"; + rev = "e86c80065030306645e28badcb0c25c549560106"; + sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; @@ -22892,15 +24699,36 @@ license = lib.licenses.free; }; }) {}; + omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }: + melpaBuild { + pname = "omni-quotes"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "AdrieanKhisbe"; + repo = "omni-quotes.el"; + rev = "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0"; + sha256 = "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes"; + sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs"; + name = "omni-quotes"; + }; + packageRequires = [ dash f ht omni-log s ]; + meta = { + homepage = "https://melpa.org/#/omni-quotes"; + license = lib.licenses.free; + }; + }) {}; omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "0.1.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "517b340427d5906002234832a01d0bc1ad27bac5"; - sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx"; + rev = "0da549c1386f93ed4de201bf8779ba64ddc91347"; + sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -22934,19 +24762,19 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }: + 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 = "3.9"; + version = "4.0"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367"; - sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2"; + rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d"; + sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; - sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; + sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87"; name = "omnisharp"; }; packageRequires = [ @@ -22954,10 +24782,12 @@ cl-lib csharp-mode dash + emacs + f flycheck - json popup s + shut-up ]; meta = { homepage = "https://melpa.org/#/omnisharp"; @@ -23153,22 +24983,22 @@ license = lib.licenses.free; }; }) {}; - org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }: melpaBuild { pname = "org-babel-eval-in-repl"; - version = "1.0"; + version = "1.4"; src = fetchFromGitHub { owner = "diadochos"; repo = "org-babel-eval-in-repl"; - rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122"; - sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm"; + rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6"; + sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/042745d47c379778195ed798ca5e0130e4877271/recipes/org-babel-eval-in-repl"; - sha256 = "00x4idm9a5ddng74axm4xjnw7z89qv3yav8j8rw2z1jf5cgbgah6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl"; + sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx"; name = "org-babel-eval-in-repl"; }; - packageRequires = [ emacs eval-in-repl ]; + packageRequires = [ emacs ess eval-in-repl matlab-mode ]; meta = { homepage = "https://melpa.org/#/org-babel-eval-in-repl"; license = lib.licenses.free; @@ -23195,6 +25025,27 @@ license = lib.licenses.free; }; }) {}; + org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-board"; + version = "1018"; + src = fetchFromGitHub { + owner = "scallywag"; + repo = "org-board"; + rev = "405bfd630f1b31bd77158bc8e79aab86812cba65"; + sha256 = "066shdqp0bca2xlds1m0c5ml3yxqfyzsyyy7sy72ybv41n5b11x3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; + sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4"; + name = "org-board"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-board"; + license = lib.licenses.free; + }; + }) {}; org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bookmark-heading"; @@ -23300,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"; @@ -23387,12 +25259,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da"; - sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr"; + rev = "ab86b343634acaaa04b81ecea511a38e975977d1"; + sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -23408,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"; @@ -23491,12 +25363,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481"; - sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc"; + rev = "dd1b9881af705b9e78f79791c9f933cabe59c125"; + sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -23603,8 +25475,8 @@ sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; - sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; + sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah"; name = "org-pdfview"; }; packageRequires = [ org pdf-tools ]; @@ -23645,8 +25517,8 @@ sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; - sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile"; + sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf"; name = "org-projectile"; }; packageRequires = [ dash emacs projectile ]; @@ -23679,12 +25551,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "0.4.1"; + version = "0.5"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "7398b8dff09bef54f579d158ce47b0090f00201e"; - sha256 = "1bi09hd5m994rkqcx0a045h20419b6n4vvwiiggzsi0723dd9fb9"; + rev = "14a065e1d376838f16a6ba32ed8710304542a4e6"; + sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -23718,15 +25590,15 @@ license = lib.licenses.free; }; }) {}; - org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: + 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 = "0.9.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "b6c6ae209d31caf71b158d6357780d74f6d08f19"; - sha256 = "18zzzh5aifbdbd2lw69fn7scvhalgxhzfz3f3cscjjkvzhkkya8j"; + rev = "db6c52f41faba686a378a8c57356a563f5cef496"; + sha256 = "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -23742,6 +25614,7 @@ hydra ivy key-chord + pdf-tools s ]; meta = { @@ -23770,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"; @@ -23815,12 +25709,12 @@ org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-table-sticky-header"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org-table-sticky-header"; - rev = "1fca19fbccbb21159086970b82af56a81f78e247"; - sha256 = "1swhsspa5yz68hl2449l9hk1d6r9c32z19z4mrdxw4nimdxhxmqp"; + rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043"; + sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; @@ -24025,16 +25919,16 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "ad389ae994d269a57e56fbea68df7e6fe5c2ff55"; - sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l"; + rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; + sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b57b6d755b3855ccfe0a90eada939fb7a852b40/recipes/org2blog"; - sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; + sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40"; name = "org2blog"; }; packageRequires = [ metaweblog org xml-rpc ]; @@ -24088,12 +25982,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "cbce5871fe267fef725631b0b7365952c35ae401"; - sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7"; + rev = "c91e662ace7e3ce992269cbf755f378bc6742511"; + sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -24279,14 +26173,14 @@ pname = "outorg"; version = "2.0"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outorg"; rev = "e946cda497bae53fca6fa1579910237e216170bf"; sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg"; - sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg"; + sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9"; name = "outorg"; }; packageRequires = []; @@ -24300,14 +26194,14 @@ pname = "outshine"; version = "2.0"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outshine"; rev = "cf1097692b3ea0367d3c821769399fec5831e200"; sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine"; - sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; + sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v"; name = "outshine"; }; packageRequires = []; @@ -24348,8 +26242,8 @@ sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/82e6b86f20a2d2d687b13091da31150c467bf271/recipes/overseer"; - sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; + sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8"; name = "overseer"; }; packageRequires = [ dash emacs pkg-info ]; @@ -24379,6 +26273,27 @@ license = lib.licenses.free; }; }) {}; + ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ox-epub"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "ofosos"; + repo = "ox-epub"; + rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a"; + sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; + sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh"; + name = "ox-epub"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-epub"; + license = lib.licenses.free; + }; + }) {}; ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-ioslide"; @@ -24432,8 +26347,8 @@ sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; - sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs"; + sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73"; name = "ox-twbs"; }; packageRequires = []; @@ -24487,12 +26402,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "93fdd7b51ad7456387b905ff4c9b104d0b3089a8"; - sha256 = "17swzcd58zh7yf221pfk8pmz8yhx2dsi2ad1y6lb2xpxxc5csflm"; + rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1"; + sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -24571,12 +26486,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "d2f01bffc987b226f618dda0663a1e233161518d"; - sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; + rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; + sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -24600,8 +26515,8 @@ sha256 = "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines"; - sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; + sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1"; name = "page-break-lines"; }; packageRequires = []; @@ -24740,13 +26655,13 @@ pname = "paredit"; version = "24"; src = fetchgit { - url = "http://mumble.net/~campbell/git/paredit.git"; + url = "https://mumble.net/~campbell/git/paredit.git"; rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409"; sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit"; - sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit"; + sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653"; name = "paredit"; }; packageRequires = []; @@ -24821,12 +26736,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.7"; + version = "0.4.10"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; - sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; + rev = "5b3b247d68eeaf7404598cbcbf2158e07f16e65d"; + sha256 = "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -24842,12 +26757,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "1.0.5"; + version = "2.3.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; - sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; + rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; + sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -24884,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"; @@ -24947,11 +26862,11 @@ password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "password-store"; - version = "1.7"; + version = "1.7.1"; src = fetchgit { url = "http://git.zx2c4.com/password-store"; - rev = "20081b546f371dcaee9ea2769f46e513bb39c275"; - sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs"; + rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; + sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; @@ -25080,8 +26995,8 @@ sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; - sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache"; + sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva"; name = "pcache"; }; packageRequires = [ eieio ]; @@ -25260,12 +27175,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.9.5"; + version = "2.9.6"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "1116ead88123a11efef346db0045ee8389250bd2"; - sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m"; + rev = "1dfea0de788f6d25ee47b5c62ddbeaf9e8e92f06"; + sha256 = "11ww8hg9p8qlmr8zpir0m5xzzbvd1faiqjx6vn4b05d4ll03rnhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -25310,8 +27225,8 @@ sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf5d4356424b492579a029f58dd4685ff5aaf39/recipes/perspective"; - sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective"; + sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7"; name = "perspective"; }; packageRequires = [ cl-lib ]; @@ -25331,8 +27246,8 @@ sha256 = "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; - sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; + sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04"; name = "perspeen"; }; packageRequires = []; @@ -25341,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"; @@ -25446,6 +27382,27 @@ license = lib.licenses.free; }; }) {}; + php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "php-cs-fixer"; + version = "1.0beta4"; + src = fetchFromGitHub { + owner = "OVYA"; + repo = "php-cs-fixer"; + rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112"; + sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer"; + sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf"; + name = "php-cs-fixer"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/php-cs-fixer"; + license = lib.licenses.free; + }; + }) {}; php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; @@ -25554,12 +27511,12 @@ pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pinyinlib"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "pinyinlib.el"; - rev = "f1e6c86f47e16c2bd48436630286bae8d6f8cb8c"; - sha256 = "13q95z0j1mpk2yrrq0amc2jjhajaz4884bfliy2h8adh109j4q1d"; + rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234"; + sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib"; @@ -25625,8 +27582,8 @@ sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fc80e94c98ff304a521466c6577c96a10e79a8/recipes/pkg-info"; - sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info"; + sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n"; name = "pkg-info"; }; packageRequires = [ epl ]; @@ -25659,12 +27616,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "2"; + version = "7"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "43fc59d487d39e6110230a073f1376ab877aa739"; - sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; + rev = "7c376f5bf9d653bf12e414176284736cbdd19108"; + sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -25828,13 +27785,13 @@ pname = "po-mode"; version = "0.19.8.1"; src = fetchgit { - url = "git://git.savannah.gnu.org/gettext.git"; + url = "https://git.savannah.gnu.org/git/gettext.git"; rev = "c737bf843616ca984c9416048a2da845e9ad3f50"; sha256 = "0hlvnq3cigpb8f4yxy2llcmmn0b38prlb1awwy6zl5fwwi9ksrwk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; - sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; + sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w"; name = "po-mode"; }; packageRequires = []; @@ -25843,6 +27800,27 @@ license = lib.licenses.free; }; }) {}; + point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "point-pos"; + version = "0.1"; + src = fetchFromGitHub { + owner = "alezost"; + repo = "point-pos.el"; + rev = "4cd0f8c8d1296c5c64f708b6a5835e8520c51b68"; + sha256 = "1l3mlz51wp729rm6wf72x2fk1fla2n2s1qh8h8z58inipdi2qydp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos"; + sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync"; + name = "point-pos"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/point-pos"; + license = lib.licenses.free; + }; + }) {}; pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "pony-snippets"; @@ -25867,12 +27845,12 @@ ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ponylang-mode"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "ponylang-mode"; - rev = "bdc549e2658f4662f462e0c233b4825c761288cd"; - sha256 = "0v55bdj3vhf260addgsim6q4rwfzyvhqswxan4qqcq6acgi1liw4"; + rev = "38786ba7f9f5709d511e27b85028b2dc6aff532d"; + sha256 = "0cr22scxk3y2qdlhhfvwf4fkk2ql1c0r73fxzhw64dhwm4q01pih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode"; @@ -25951,12 +27929,12 @@ popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }: melpaBuild { pname = "popup-imenu"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "ancane"; repo = "popup-imenu"; - rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5"; - sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b"; + rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09"; + sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu"; @@ -26169,8 +28147,8 @@ sha256 = "1whnk1902f8q03clm9xlfl47gkpsywf3mx0ykp70c1q496ab39qj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; - sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; + sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p"; name = "prodigy"; }; packageRequires = [ dash emacs f s ]; @@ -26307,12 +28285,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.13.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "038c7f9724f684c7862e108150e256a00ff9c5c6"; - sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv"; + rev = "19e3dc1236377de86147df8f3635fbbfe7558b2e"; + sha256 = "0n61npfg7hvybakn4nvsqyv2gmrwvf0jqwrh0nwzg9xg5hkbfmir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -26454,12 +28432,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.2.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5"; - sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14"; + rev = "5532abc15b97f3489183b266b41844306052a3fa"; + sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -26472,6 +28450,27 @@ license = lib.licenses.free; }; }) {}; + protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "protocols"; + version = "1.6"; + src = fetchFromGitHub { + owner = "davep"; + repo = "protocols.el"; + rev = "f5549f5d873a683af45a0e19c732524d5b964026"; + sha256 = "0v9is6r307814gvrnch2d3mvikd7j8lnmsqb2c3gj6gvfj4p9y7r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; + sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a"; + name = "protocols"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/protocols"; + license = lib.licenses.free; + }; + }) {}; psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; @@ -26496,12 +28495,12 @@ psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "138b27f57bdc3ff53ec5896439e8ed00294a5ea2"; - sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8"; + rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc"; + sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -26514,22 +28513,22 @@ license = lib.licenses.free; }; }) {}; - psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "6932f03447c3d821e4c03e99f1630928f0979452"; - sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49"; + rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa"; + sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5"; name = "psysh"; }; - packageRequires = []; + packageRequires = [ emacs f s ]; meta = { homepage = "https://melpa.org/#/psysh"; license = lib.licenses.free; @@ -26976,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"; @@ -27092,8 +29112,8 @@ sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/de07b317e46475776d6d237908a0495866a7a851/recipes/rainbow-blocks"; - sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks"; + sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs"; name = "rainbow-blocks"; }; packageRequires = []; @@ -27239,8 +29259,8 @@ sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/56d330fdd9e3b2cf3afc808190efebcc4cb1456d/recipes/rbenv"; - sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv"; + sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q"; name = "rbenv"; }; packageRequires = []; @@ -27294,12 +29314,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "d7e61535aaf89e643673b27c79b4a84ddb530288"; - sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i"; + rev = "35129521d5b6035e5dd75d5b3481ce4971f46034"; + sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -27420,12 +29440,12 @@ rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rectangle-utils"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "rectangle-utils"; - rev = "9328291ad043fdf617cd2191692f13fba5f9a9bb"; - sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm"; + rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a"; + sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils"; @@ -27543,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"; @@ -27617,8 +29616,8 @@ sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da4be8c67584ea0ae35c7c9ee33334db5061a538/recipes/repl-toggle"; - sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle"; + sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b"; name = "repl-toggle"; }; packageRequires = [ fullframe ]; @@ -27669,22 +29668,22 @@ license = lib.licenses.free; }; }) {}; - req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, use-package }: + req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "374c6d1a81b5448a66295be8c132c42ca44eeddb"; - sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs"; + rev = "30f76a9c52994562191c90c315002410706f6c0b"; + sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf"; name = "req-package"; }; - packageRequires = [ dash log4e use-package ]; + packageRequires = [ dash ht log4e use-package ]; meta = { homepage = "https://melpa.org/#/req-package"; license = lib.licenses.free; @@ -27756,12 +29755,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "0.4.0"; + version = "0.7"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "27364959798de0f019da799975027842c07e7829"; - sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -27858,22 +29857,22 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db"; - sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661"; + rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; + sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib s ]; + packageRequires = [ cl-lib emacs s seq ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -27966,12 +29965,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.1.0"; + version = "0.1.4"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0"; - sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a"; + rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749"; + sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -27984,22 +29983,22 @@ license = lib.licenses.free; }; }) {}; - robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: + robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "0.7.9"; + version = "0.8.1"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "7c56895b6c2fd5d6c9572182f5de10ebe5bfc977"; - sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n"; + rev = "22457d6855fb39b8aedf068556d0e2fbd2874d5b"; + sha256 = "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk"; name = "robe"; }; - packageRequires = [ inf-ruby ]; + packageRequires = [ emacs inf-ruby ]; meta = { homepage = "https://melpa.org/#/robe"; license = lib.licenses.free; @@ -28113,16 +30112,16 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.8"; + version = "2.10"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "6ac7740eaf05cdd9b699185f71cc2d1f634a761b"; - sha256 = "1w506qaklrly1lnq1i5kshl8m9aki8h2ba1y7h578gwx6lph3vhi"; + rev = "3b3ace901f53827daef81d4c13658ec4feb318b4"; + sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; - sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; + sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd"; name = "rtags"; }; packageRequires = []; @@ -28131,22 +30130,22 @@ license = lib.licenses.free; }; }) {}; - rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = "rubocop-emacs"; - rev = "405e0fd4c57adb125e3d04208bc86081e3e78d4c"; - sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q"; + rev = "980bedb455e3551d35a212fae515c054888907c1"; + sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop"; sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q"; name = "rubocop"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/rubocop"; license = lib.licenses.free; @@ -28226,8 +30225,8 @@ sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/746e0e49a24f16baa5f1cc7f11220766ecf9f1fe/recipes/ruby-test-mode"; - sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; + sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk"; name = "ruby-test-mode"; }; packageRequires = []; @@ -28257,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"; @@ -28331,8 +30351,8 @@ sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground"; - sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground"; + sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v"; name = "rust-playground"; }; packageRequires = [ emacs rust-mode ]; @@ -28373,8 +30393,8 @@ sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e5137dac9f8f95579994601cb1e24614f965f2/recipes/s"; - sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; + sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa"; name = "s"; }; packageRequires = []; @@ -28425,6 +30445,27 @@ license = lib.licenses.free; }; }) {}; + salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: + melpaBuild { + pname = "salt-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "salt-mode"; + rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81"; + sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x"; + }; + 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 ]; + meta = { + homepage = "https://melpa.org/#/salt-mode"; + license = lib.licenses.free; + }; + }) {}; sass-mode = callPackage ({ fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }: melpaBuild { pname = "sass-mode"; @@ -28488,22 +30529,22 @@ license = lib.licenses.free; }; }) {}; - sayid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "0.0.13"; + version = "0.0.15"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "01bf777cb15a4f236bc44842712e9ca82fed7f55"; - sha256 = "0lh4mmdm5vizr08lyz2jc131991dqmyx29n8njgpxa1vjzqd08az"; + rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298"; + sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs"; name = "sayid"; }; - packageRequires = []; + packageRequires = [ cider ]; meta = { homepage = "https://melpa.org/#/sayid"; license = lib.licenses.free; @@ -28537,8 +30578,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; - sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; + rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; + sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -28657,12 +30698,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "001e205b37ae0dded430b9a809425dc7ed730366"; - sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; + rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916"; + sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -28717,6 +30758,27 @@ license = lib.licenses.free; }; }) {}; + sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sentence-highlight"; + version = "0.1"; + src = fetchFromGitHub { + owner = "sbelak"; + repo = "sentence-highlight"; + rev = "6f2bc989207ec8cf641e44924ef530a2e436eedb"; + sha256 = "0740swhm3kzjx58a6nr9992p05q4kzvyham8g7kds4ydd7xsd9am"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight"; + sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm"; + name = "sentence-highlight"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sentence-highlight"; + license = lib.licenses.free; + }; + }) {}; servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: melpaBuild { pname = "servant"; @@ -28759,6 +30821,27 @@ license = lib.licenses.free; }; }) {}; + services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "services"; + version = "1.7"; + src = fetchFromGitHub { + owner = "davep"; + repo = "services.el"; + rev = "514e4095e8964c4d0f38c4f3ad6c692e86d12faa"; + sha256 = "1k6w2ghi1iczh65bbln5ryxwnxmkkjm3p0p54s155q9sjidiqlwb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; + sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd"; + name = "services"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/services"; + license = lib.licenses.free; + }; + }) {}; session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "session"; @@ -28791,8 +30874,8 @@ sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/69270c79b47b7d9348bd2ca9fec3aabfd7e694b3/recipes/sexp-move"; - sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move"; + sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9"; name = "sexp-move"; }; packageRequires = []; @@ -28804,16 +30887,16 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { - owner = "nuncostans"; + owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1"; - sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9"; + rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96"; + sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; - sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; + sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq"; name = "sexy-monochrome-theme"; }; packageRequires = []; @@ -28854,8 +30937,8 @@ sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b1c547d37422998c01a610f88d62784fbca33523/recipes/shakespeare-mode"; - sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode"; + sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x"; name = "shakespeare-mode"; }; packageRequires = []; @@ -29011,6 +31094,27 @@ license = lib.licenses.free; }; }) {}; + shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "shen-elisp"; + version = "0.1"; + src = fetchFromGitHub { + owner = "deech"; + repo = "shen-elisp"; + rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa"; + sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp"; + sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq"; + name = "shen-elisp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/shen-elisp"; + license = lib.licenses.free; + }; + }) {}; shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shift-number"; @@ -29053,6 +31157,27 @@ license = lib.licenses.free; }; }) {}; + showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "showtip"; + version = "0.1"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "showtip"; + rev = "930da302809a4257e8d69425455b29e1cc91949b"; + sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip"; + sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780"; + name = "showtip"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/showtip"; + license = lib.licenses.free; + }; + }) {}; shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shpec-mode"; @@ -29074,6 +31199,27 @@ license = lib.licenses.free; }; }) {}; + shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: + melpaBuild { + pname = "shr-tag-pre-highlight"; + version = "1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "shr-tag-pre-highlight.el"; + rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889"; + sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; + sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v"; + name = "shr-tag-pre-highlight"; + }; + packageRequires = [ emacs language-detection ]; + meta = { + homepage = "https://melpa.org/#/shr-tag-pre-highlight"; + license = lib.licenses.free; + }; + }) {}; shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shrink-whitespace"; @@ -29085,8 +31231,8 @@ sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/97fe5a411be1a7d80d50f5a8af44b74c6c7cf9e6/recipes/shrink-whitespace"; - sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace"; + sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw"; name = "shrink-whitespace"; }; packageRequires = []; @@ -29116,6 +31262,27 @@ license = lib.licenses.free; }; }) {}; + shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "shx"; + version = "0.0.8"; + src = fetchFromGitHub { + owner = "riscy"; + repo = "shx-for-emacs"; + rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; + sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; + sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k"; + name = "shx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/shx"; + license = lib.licenses.free; + }; + }) {}; sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sift"; @@ -29127,8 +31294,8 @@ sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/sift"; - sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; + sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj"; name = "sift"; }; packageRequires = []; @@ -29137,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"; @@ -29182,12 +31370,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "eba19a21da2e4d1e11abdc158f72d6513afaa669"; - sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v"; + rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; + sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -29287,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"; @@ -29473,6 +31661,27 @@ license = lib.licenses.free; }; }) {}; + slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "slstats"; + version = "1.9"; + src = fetchFromGitHub { + owner = "davep"; + repo = "slstats.el"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; + sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q"; + name = "slstats"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/slstats"; + license = lib.licenses.free; + }; + }) {}; sly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; @@ -29581,12 +31790,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "253afc49ff30a19ea1a7af10e1e8abdb46546ac1"; - sha256 = "0ml0fdvgx60vqansh4j17ihkrnyjdndkijysqhqx1q78d97vnhi4"; + rev = "7841b2f02a1a99e1cb166d595f24f16a514ccbb5"; + sha256 = "062g6y8an4kvfym2w56qy2iqd4ngxdxba38136ph0ckkzl0yrl7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -29631,8 +31840,8 @@ sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/26c73e1d15186ebf300c6397fda61a8a885a130f/recipes/smartscan"; - sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan"; + sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w"; name = "smartscan"; }; packageRequires = []; @@ -29770,12 +31979,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "327c168febbde24c2b39cc10d26c9cfc9189e130"; - sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly"; + rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab"; + sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -29791,12 +32000,12 @@ snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }: melpaBuild { pname = "snapshot-timemachine-rsnapshot"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "snapshot-timemachine-rsnapshot"; - rev = "4ff6b96219f4da576141e376b0348813c1c25615"; - sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa"; + rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f"; + sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot"; @@ -30019,6 +32228,27 @@ license = lib.licenses.free; }; }) {}; + spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: + melpaBuild { + pname = "spaceline-all-the-icons"; + version = "1.3.5"; + src = fetchFromGitHub { + owner = "domtronn"; + repo = "spaceline-all-the-icons.el"; + rev = "255e89303bb706b42057504e72caeb2764f3d413"; + sha256 = "0y3gv664crng4vibbh0pfh9w0ys9m5gny2b1mrqb7ma6xa78xiv2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; + sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6"; + name = "spaceline-all-the-icons"; + }; + packageRequires = [ all-the-icons emacs memoize spaceline ]; + meta = { + homepage = "https://melpa.org/#/spaceline-all-the-icons"; + license = lib.licenses.free; + }; + }) {}; sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparkline"; @@ -30040,22 +32270,22 @@ license = lib.licenses.free; }; }) {}; - sparql-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "0.11.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "303858e7f91829ec720141482c777460e66f310b"; - sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij"; + rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642"; + sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d"; name = "sparql-mode"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/sparql-mode"; license = lib.licenses.free; @@ -30135,8 +32365,8 @@ sha256 = "0l3a8swmf3sm54ayk2ahh1i5j1hf0hd822dfmx50kgwi4wpv48sp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode"; - sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode"; + sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys"; name = "sphinx-mode"; }; packageRequires = []; @@ -30177,8 +32407,8 @@ sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify"; - sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify"; + sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x"; name = "spotify"; }; packageRequires = [ cl-lib ]; @@ -30240,8 +32470,8 @@ sha256 = "12zyw8b8s3jga560wv141gc4yvlbldvfcmpibns8wrpx2w8aivfj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/147b6d7a58cab128509589a84fb7938e56aa0604/recipes/sql-impala"; - sha256 = "1jr9k48d0q00d1x5lqv0n971mla2ymnqmjfn8pw0s0vxkldq4ibi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala"; + sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh"; name = "sql-impala"; }; packageRequires = []; @@ -30253,12 +32483,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "65e75ebc7d85a63e4e27900ba746623a8e4bfa95"; - sha256 = "1yiz1k2dg010dypql5l9ahcl33nvqxl731wghv4jvp6bdxcf90g3"; + rev = "04970977b4abb4d44301651618bbf1cdb0b263dd"; + sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -30271,6 +32501,27 @@ license = lib.licenses.free; }; }) {}; + sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sr-speedbar"; + version = "20140914.2339"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "sr-speedbar"; + rev = "4f816528a32eb421197a768d6dcf3a05de83f642"; + sha256 = "1x9wizd0fzcmpf8ff7c3rcfxk64diy9jmzzvxa7d5a3k8vvpdhg3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar"; + sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052"; + name = "sr-speedbar"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sr-speedbar"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -30324,8 +32575,8 @@ sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; - sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; + sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; packageRequires = []; @@ -30511,8 +32762,8 @@ sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fa948128841a1cd3c5fd4c30da3841629b17d3c7/recipes/stripe-buffer"; - sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer"; + sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b"; name = "stripe-buffer"; }; packageRequires = [ cl-lib ]; @@ -30526,13 +32777,13 @@ pname = "stumpwm-mode"; version = "0.9.8"; src = fetchgit { - url = "git://git.savannah.nongnu.org/stumpwm.git"; + url = "https://git.savannah.nongnu.org/git/stumpwm.git"; rev = "4d0603e52b5bab993b3be63e3654c74f641e677d"; sha256 = "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode"; - sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode"; + sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf"; name = "stumpwm-mode"; }; packageRequires = []; @@ -30636,8 +32887,8 @@ sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bb904557529c5d9658039a10456812810541bfed/recipes/subshell-proc"; - sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc"; + sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp"; name = "subshell-proc"; }; packageRequires = []; @@ -30670,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"; @@ -30817,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"; @@ -30859,12 +33110,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -30919,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; @@ -31254,22 +33505,22 @@ license = lib.licenses.free; }; }) {}; - telephone-line = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: + telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "70c113bea37719c83961023afd893044398e681d"; - sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19"; + rev = "a83dcda21b0f6e10e51c3cded7da9a5d2ead5f34"; + sha256 = "1cg34l6jq75mcqnb3p93z0kv1arvnswm8nkk39fmryand2yygnl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3"; name = "telephone-line"; }; - packageRequires = [ cl-lib eieio emacs s seq ]; + packageRequires = [ cl-generic cl-lib emacs seq ]; meta = { homepage = "https://melpa.org/#/telephone-line"; license = lib.licenses.free; @@ -31422,6 +33673,27 @@ license = lib.licenses.free; }; }) {}; + terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "terminal-here"; + version = "1.0"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "terminal-here"; + rev = "e176d1675dc5c41b6aebd05122fb2efc44b6cff0"; + sha256 = "0dj3z8czvziszb20sizgf1yriv4im811rcfadm7ga9zs2al56kqy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; + sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj"; + name = "terminal-here"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/terminal-here"; + license = lib.licenses.free; + }; + }) {}; tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; @@ -31635,12 +33907,12 @@ textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textx-mode"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "novakboskov"; repo = "textx-mode"; - rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; - sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3"; + sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; @@ -31674,6 +33946,48 @@ license = lib.licenses.free; }; }) {}; + theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "theme-looper"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "myTerminal"; + repo = "theme-looper"; + rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9"; + sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; + sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf"; + name = "theme-looper"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/theme-looper"; + license = lib.licenses.free; + }; + }) {}; + thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "thinks"; + version = "1.12"; + src = fetchFromGitHub { + owner = "davep"; + repo = "thinks.el"; + rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; + sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; + sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq"; + name = "thinks"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/thinks"; + license = lib.licenses.free; + }; + }) {}; thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; @@ -31698,12 +34012,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.1.5"; + version = "2.3.1"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "bd89d93d9803319ba86eff0173821deb978ae2ac"; - sha256 = "1a736r1igq66hn6ig4l7c5xaxcyk2kxvj26laphakk1xg8j5x52k"; + rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268"; + sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -31758,6 +34072,27 @@ license = lib.licenses.free; }; }) {}; + timonier = callPackage ({ all-the-icons, dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }: + melpaBuild { + pname = "timonier"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "timonier"; + rev = "33ca5887a1d1b63349177237e9edfb73546511a5"; + sha256 = "0z6s26kc50rbmgkkbxzpasphi8hcwhixmi8ksqzrclayccjjj7ar"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier"; + sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0"; + name = "timonier"; + }; + packageRequires = [ all-the-icons dash hydra pkg-info request s ]; + meta = { + homepage = "https://melpa.org/#/timonier"; + license = lib.licenses.free; + }; + }) {}; toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; @@ -31782,12 +34117,12 @@ tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tox"; - version = "0.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; - rev = "5c1a7c18cb7f2fd2da2386debf86012e6953e15d"; - sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39"; + rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c"; + sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox"; @@ -31823,12 +34158,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961"; - sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr"; + rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; + sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -31883,6 +34218,48 @@ license = lib.licenses.free; }; }) {}; + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + melpaBuild { + pname = "treemacs"; + version = "1.7.6"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; + sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; + sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh"; + name = "treemacs"; + }; + packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + meta = { + homepage = "https://melpa.org/#/treemacs"; + license = lib.licenses.free; + }; + }) {}; + treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: + melpaBuild { + pname = "treemacs-evil"; + version = "1.7.6"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; + sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; + sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3"; + name = "treemacs-evil"; + }; + packageRequires = [ evil treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-evil"; + license = lib.licenses.free; + }; + }) {}; trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "trr"; @@ -31925,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"; @@ -32009,6 +34407,27 @@ license = lib.licenses.free; }; }) {}; + turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "turing-machine"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "therockmandolinist"; + repo = "turing-machine"; + rev = "41bfe79ecf8a44dcbaf308c33cbdf324f7c806ae"; + sha256 = "04j4nw526mxlm4fd2a28p0pa2ss4b4vznjvpk0f0wlf61ymvy884"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; + sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; + name = "turing-machine"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/turing-machine"; + license = lib.licenses.free; + }; + }) {}; twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twilight-anti-bright-theme"; @@ -32020,8 +34439,8 @@ sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4dfafdd43a22320c619f481e2bbe162459b48990/recipes/twilight-anti-bright-theme"; - sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme"; + sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k"; name = "twilight-anti-bright-theme"; }; packageRequires = []; @@ -32075,12 +34494,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "abc0751c0e3f316a0064fc7342ffb89b49b02e15"; - sha256 = "0lgsyqzfjqhygs8a3icnfsp6y20h2rqrk4wbyc1xfmkbahs7qk8y"; + rev = "f25f4751fea12298905c811a1f469a6b0a169ef1"; + sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -32096,12 +34515,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "0e5b374830e85a32b51a4cc8206df8e494378cb2"; - sha256 = "1jv5qmp3xs37py7d9aln4jn85j65h9pp5vb2dcmd8rlszhplsrng"; + rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35"; + sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -32125,8 +34544,8 @@ sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8cf02f5c8cb29265e9c83be9c959b8a9012a369d/recipes/typo"; - sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; + sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h"; name = "typo"; }; packageRequires = []; @@ -32180,12 +34599,12 @@ undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: melpaBuild { pname = "undercover"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "e72b8c924272f65d7cc6e884478e26d0b1e1e4e8"; - sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33"; + rev = "86f856c799aacfd48d2eb42d1a6afda0e6e49845"; + sha256 = "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; @@ -32198,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"; @@ -32222,12 +34662,12 @@ unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unfill"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "99388d79f971db70c5d18dab4257301f750ed907"; - sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w"; + rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8"; + sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; @@ -32393,6 +34833,27 @@ license = lib.licenses.free; }; }) {}; + uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "uptimes"; + version = "3.5"; + src = fetchFromGitHub { + owner = "davep"; + repo = "uptimes.el"; + rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; + sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; + sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; + name = "uptimes"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/uptimes"; + license = lib.licenses.free; + }; + }) {}; use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; @@ -32417,12 +34878,12 @@ utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "1.19.3"; + version = "2.0.1"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb"; - sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z"; + rev = "d658bd8f63ed6b23144fdba2ee3f2a6d77979c4f"; + sha256 = "1x96zxkvfq8mshgi654vvklrr7dqvq9can89n4jrrb82pcn06k5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -32540,6 +35001,48 @@ license = lib.licenses.free; }; }) {}; + vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: + melpaBuild { + pname = "vdiff"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "justbur"; + repo = "emacs-vdiff"; + rev = "f55acdbfcbb14e463d0850cfd041614c7002669e"; + sha256 = "0dlhisvnlzkzlilg456lxi0m5wh4a8681n142684hmk8vaw3wx2k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; + sha256 = "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l"; + name = "vdiff"; + }; + packageRequires = [ emacs hydra ]; + meta = { + homepage = "https://melpa.org/#/vdiff"; + license = lib.licenses.free; + }; + }) {}; + vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }: + melpaBuild { + pname = "vdiff-magit"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "justbur"; + repo = "emacs-vdiff-magit"; + rev = "5e245b6a078860d3b0f58436efec8ff6b4f485db"; + sha256 = "0rz06jh5ayg0w6a19w9jyyn6jw27ri3cydynflxygk9364zvj59p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit"; + sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw"; + name = "vdiff-magit"; + }; + packageRequires = [ emacs magit vdiff ]; + meta = { + homepage = "https://melpa.org/#/vdiff-magit"; + license = lib.licenses.free; + }; + }) {}; vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }: melpaBuild { pname = "vdirel"; @@ -32606,12 +35109,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "5.3"; + version = "5.6"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7"; - sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -32645,27 +35148,6 @@ license = lib.licenses.free; }; }) {}; - vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "vimgolf"; - version = "0.10.0"; - src = fetchFromGitHub { - owner = "timvisher"; - repo = "vimgolf"; - rev = "9fd8aaf68bc69d1dd628de4c7cbb070e366545a9"; - sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf"; - sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn"; - name = "vimgolf"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vimgolf"; - license = lib.licenses.free; - }; - }) {}; vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; @@ -32732,12 +35214,12 @@ visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-fill-column"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "159dcee48e7311ee816686d62e7ce36619127462"; - sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b"; + rev = "57c2a72d46900117ea92e0a01b97e19481800503"; + sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -32855,6 +35337,27 @@ license = lib.licenses.free; }; }) {}; + w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "w32-browser"; + version = "235"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w32-browser"; + rev = "a8126b60bf18193e8e4ec6f699b5694b6f71a062"; + sha256 = "13wjvzsas7in8f09sc2qj17dz25wizg1l0r2krgp1zymy92p8f97"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser"; + sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn"; + name = "w32-browser"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/w32-browser"; + license = lib.licenses.free; + }; + }) {}; wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; @@ -32879,12 +35382,12 @@ wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "wandbox"; - version = "0.6.0"; + version = "0.6.4"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; - rev = "70728ba1bfa425dee7a66fd86c7bbf2747b2514c"; - sha256 = "1nx7cr7d4qmzwbvp59kc8139nzc965ibc9vf7afrz8z2h5qg4d4l"; + rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1"; + sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; @@ -33023,22 +35526,22 @@ license = lib.licenses.free; }; }) {}; - web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "14.1"; + version = "15"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "44de4e0198051b52110d50d860db26ed770219f3"; - sha256 = "0pbim6aw0w9z5bb0hl98bda1a19pjmfki6jr1mxcfi5yismk2863"; + rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2"; + sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i"; name = "web-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/web-mode"; license = lib.licenses.free; @@ -33055,8 +35558,8 @@ sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2658e8a80455ad5ae1ceb69deddab89ebc6b6871/recipes/web-mode-edit-element"; - sha256 = "09m2jzsb3zz1wr396jrhcwskfm1m0a4hvxlxhq5p1w5fzfcdb8md"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element"; + sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l"; name = "web-mode-edit-element"; }; packageRequires = [ emacs web-mode ]; @@ -33068,12 +35571,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "1.0.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "58f66efcb8f061d25bf474b14f3867ae856f6b1d"; - sha256 = "0qczw7pdkjgqmjibwyw8psxhqy1bx183qzni832qx59sds15j13q"; + rev = "77e6154ece15ffcc58db80dca48fe342376831aa"; + sha256 = "0zj1hhz7m0fxaj03aqjfd6jhcg2khi87l6742miwkdxxggwhdijj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -33086,6 +35589,27 @@ license = lib.licenses.free; }; }) {}; + websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "websocket"; + version = "1.8"; + src = fetchFromGitHub { + owner = "ahyatt"; + repo = "emacs-websocket"; + rev = "a9b8e74fa190024cd450ef4f832482e8438674fa"; + sha256 = "0yi6g7wmjsgv0dmpyf8cpin0icw3ymb7vbr3f9s01xs2w6kp8p13"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; + sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg"; + name = "websocket"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/websocket"; + license = lib.licenses.free; + }; + }) {}; weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; @@ -33236,12 +35760,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "2.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "ea6f1dc5aacff2f3d909e410db05af01966555aa"; - sha256 = "0pckvxk2vpwqfypz5vyk0ig6g5697ibnlk8vspvqpanahvgaj0nh"; + rev = "3ff303b50495d492cfac70cc9f7321971928bdb1"; + sha256 = "1q0rg13lq31fqnkpkss61pfyx7ib7i4r1jbcavpjyr5gqcb08fzm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -33296,6 +35820,27 @@ license = lib.licenses.free; }; }) {}; + whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "whizzml-mode"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "whizzml"; + repo = "whizzml-mode"; + rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f"; + sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; + sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk"; + name = "whizzml-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/whizzml-mode"; + license = lib.licenses.free; + }; + }) {}; whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whole-line-or-region"; @@ -33307,8 +35852,8 @@ sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/71addc88ce814ed4f413bcd8632402ac750009a1/recipes/whole-line-or-region"; - sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region"; + sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y"; name = "whole-line-or-region"; }; packageRequires = []; @@ -33412,8 +35957,8 @@ sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3b17efdf8b7306eadf37e331fc1d585b42f37b09/recipes/window-layout"; - sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout"; + sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639"; name = "window-layout"; }; packageRequires = []; @@ -33475,8 +36020,8 @@ sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/37924b239c1e883103c0cdfd429ddb6c2d40d3d7/recipes/windsize"; - sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize"; + sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv"; name = "windsize"; }; packageRequires = []; @@ -33488,12 +36033,12 @@ winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winum"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518"; - sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9"; + rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883"; + sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; @@ -33512,8 +36057,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "3a654cfe6632"; - sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; + rev = "f94ec5fed665"; + sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -33550,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"; @@ -33718,12 +36263,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "3.6.1"; + version = "3.7"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "f853350da848d0814f822587ae310e52d895f523"; - sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz"; + rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a"; + sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -33747,8 +36292,8 @@ sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; - sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler"; + sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3"; name = "ws-butler"; }; packageRequires = []; @@ -33873,8 +36418,8 @@ sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac99eee00b76501d830373a13369f6a2a1239b5/recipes/xkcd"; - sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd"; + sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5"; name = "xkcd"; }; packageRequires = [ json ]; @@ -33907,16 +36452,16 @@ xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlgen"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "philjackson"; repo = "xmlgen"; - rev = "d27294a4174888fe452015cb98dedd2a4bdc1e92"; - sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0"; + rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4"; + sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen"; - sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen"; + sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh"; name = "xmlgen"; }; packageRequires = []; @@ -34020,8 +36565,8 @@ sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding"; - sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding"; + sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl"; name = "yafolding"; }; packageRequires = []; @@ -34182,8 +36727,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "7bf780961390"; - sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs"; + rev = "e9299b77df1f"; + sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -34220,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.0"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; - sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -34335,12 +36880,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "e5dc3962fd30005914b79b14e9821d298f2c305a"; - sha256 = "1n7ka608lk0xp7vg4zcw282zna0cwvcwvmhic6ym1ag7lq5cjrhc"; + rev = "f031c785b469cf4356fddb997eccf60399e34235"; + sha256 = "029955wp29wdrk1ddmhxixd76vhkp2li3mjaknw9d8iqz819vshc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -34356,12 +36901,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "4.2"; + version = "4.5"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "af231794425255d436690c9c31bceb2052251210"; - sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw"; + rev = "ceb46240636865e86f3fe26906957943ba7bd73c"; + sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -34406,8 +36951,8 @@ sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38262704e1045c21ee73ca9dc87656936382004a/recipes/zone-nyan"; - sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan"; + sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94"; name = "zone-nyan"; }; packageRequires = [ esxml ]; @@ -34440,12 +36985,12 @@ zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zop-to-char"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "zop-to-char"; - rev = "7888bb6f09ae24e8e10bd3095edd31940e6a1c46"; - sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496"; + rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d"; + sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char"; @@ -34524,12 +37069,12 @@ zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zzz-to-char"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "efbe99c9163602f23408abaea70ffe292632bf26"; - sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339"; + rev = "b62414b155fe2e09d91b70059a909d1403d89acf"; + sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 0e3d3fea3280..29b793825c4a 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 = "20170210"; + version = "20170717"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170210.tar"; - sha256 = "1v8adjz3rv429is8m7xx2v8hvc20dxl4hcdhdf2vhcx44bgbvyjb"; + 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 = "20170210"; + version = "20170717"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170210.tar"; - sha256 = "1h0lwf1sw7n1df865ip5mp0pdmdi2md6hz6fq53r4zhali041ifx"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar"; + sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index fabf8ac4ce4c..fd580ae9270c 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: +{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: stdenv.mkDerivation (rec { - name = "ProofGeneral-HEAD"; + name = "ProofGeneral-unstable-${version}"; + version = "2017-05-06"; - src = fetchgit { - url = "https://github.com/ProofGeneral/PG.git"; - rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4"; - sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64"; + src = fetchFromGitHub { + owner = "ProofGeneral"; + repo = "PG"; + rev = "574b0992e3cb4b7a4ad88400b9a5ab0198a96ca5"; + sha256 = "1c1pgdmy58h78s53g0ga9b5ilbsibz0dr2lk52xgbs3q5m22v5fh"; }; buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; @@ -16,16 +18,11 @@ stdenv.mkDerivation (rec { -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ s|/sbin/install-info|install-info|g" - - sed -i "bin/proofgeneral" -e's/which/type -p/g' - # @image{ProofGeneral} fails, so remove it. sed -i '94d' doc/PG-adapting.texi sed -i '96d' doc/ProofGeneral.texi ''; - patches = [ ./pg.patch ]; - preBuild = '' make clean; ''; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index fbf8895f971f..c51227bbc6f7 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,8 +4,8 @@ , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null -, withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null +, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? 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 = @@ -26,38 +26,19 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "25.1"; + version = "25.2"; versionModifier = ""; src = fetchurl { - url = "mirror://gnu//emacs/${name}.tar.xz"; - sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr"; + url = "mirror://gnu/emacs/${name}.tar.xz"; + sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar"; }; - patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch) ++ [ - ## Fixes a segfault in emacs 25.1 - ## http://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00917.html - ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358 - (fetchurl { - url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199; - sha256 = "0pshhq8wlh98m9hm8xd3g7gy3ms0l44dq6vgzkg67ydlccziqz40"; }) - (fetchurl { - url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0; - sha256 = "0h76wrrqyrky441immprskx5x7200zl7ajf7hyg4da22q7sr09qa"; }) - (fetchurl { - url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c; - sha256 = "0hk9pi3f2zj266qj8armzpl0z8rfjg0m9ss4k09mgg1hyz80wdvv"; }) - (fetchurl { - url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240; - sha256 = "1q2hqkjvj9z46b5ik56lv9wiibz09mvg2q3pn8fnpa04ki3zbh4x"; }) - (fetchurl { - url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a; - sha256 = "1wlyy04qahvls7bdrcxaazh9k27gksk7if1q58h83f7h6g9xxkzj"; - }) - ]; + patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch); nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals srcRepo [ autoconf automake texinfo ]; + ++ lib.optionals srcRepo [ autoconf automake texinfo ] + ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] @@ -66,9 +47,9 @@ stdenv.mkDerivation rec { [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optional (withX && withGTK3) gtk3 + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals withXwidgets [ webkitgtk24x wrapGAppsHook glib_networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix deleted file mode 100644 index 33d24242db79..000000000000 --- a/pkgs/applications/editors/emacs/macport-24.5.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext -, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit -, autoconf, automake -, ImageCaptureCore, GSS, ImageIO # These may be optional -}: - -stdenv.mkDerivation rec { - emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.15"; - - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"; - }; - - macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1r47bm1pf5av2yr37byz91y7bp6vdw9smahiy18g5qp4jp6mz193"; - }; - - enableParallelBuilding = true; - - buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake ]; - - propagatedBuildInputs = [ - AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit - ImageCaptureCore GSS ImageIO # may be optional - ]; - - postUnpack = '' - mv $emacsName $name - tar xzf $macportSrc - mv $name $emacsName - ''; - - postPatch = '' - patch -p1 < patch-mac - sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el - ''; - - configureFlags = [ - "LDFLAGS=-L${ncurses.out}/lib" - "--with-xml2=yes" - "--with-gnutls=yes" - "--with-mac" - "--enable-mac-app=$$out/Applications" - ]; - - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; - LDFLAGS = "-O3 -L${ncurses.out}/lib"; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "GNU Emacs 24, the extensible, customizable text editor"; - homepage = http://www.gnu.org/software/emacs/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley ]; - platforms = platforms.darwin; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - extensions are distributed with GNU Emacs; others are available - separately. - - This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later - already contain the official GUI support via the NS (Cocoa) port for - Mac OS X 10.4 and later. So if it is good enough for you, then you - don't need to try this. - ''; - }; -} diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport.nix similarity index 77% rename from pkgs/applications/editors/emacs/macport-25.1.nix rename to pkgs/applications/editors/emacs/macport.nix index 9169c12417ae..f38839a5abca 100644 --- a/pkgs/applications/editors/emacs/macport-25.1.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,19 +4,21 @@ }: stdenv.mkDerivation rec { - emacsName = "emacs-25.1"; - name = "${emacsName}-mac-6.1"; + emacsVersion = "25.2"; + emacsName = "emacs-${emacsVersion}"; + macportVersion = "6.3"; + name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/emacs/${emacsName}.tar.xz"; - sha256 = "19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33"; + url = "mirror:///gnu/emacs/${emacsName}.tar.xz"; + sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar"; }; macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62"; + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; + sha256 = "1dz11frk3ya3842lb89ixzpns9bz5f9njxdkyvjy75gfymqfhhzv"; }; hiresSrc = fetchurl { @@ -26,7 +28,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake]; + nativeBuildInputs = [ pkgconfig autoconf automake ]; + + buildInputs = [ ncurses libxml2 gnutls texinfo gettext ]; propagatedBuildInputs = [ AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { postUnpack = '' mv $sourceRoot $name - tar xzf $macportSrc + tar xzf $macportSrc -C $name --strip-components=1 mv $name $sourceRoot # extract retina image resources @@ -56,10 +60,11 @@ stdenv.mkDerivation rec { "--with-xml2=yes" "--with-gnutls=yes" "--with-mac" + "--with-modules" "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' @@ -92,8 +97,8 @@ stdenv.mkDerivation rec { extensions are distributed with GNU Emacs; others are available separately. - This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later + This is "Mac port" addition to GNU Emacs 25. This provides a native + GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you don't need to try this. diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 5a27a8efeb0e..89235514bb82 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: +with stdenv.lib; + let - version = "1.30"; + version = "1.30.1"; in stdenv.mkDerivation rec { @@ -9,12 +11,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d"; + sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - buildInputs = [ gtk2 which pkgconfig intltool file ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk2 which file ]; doCheck = true; @@ -47,9 +50,9 @@ stdenv.mkDerivation rec { - Simple project management - Plugin interface ''; - homepage = "http://www.geany.org/"; + homepage = http://www.geany.org/; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.all; + maintainers = []; + platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/jetbrains/common.nix similarity index 93% rename from pkgs/applications/editors/idea/common.nix rename to pkgs/applications/editors/jetbrains/common.nix index 839f537843d0..a7ac367f048a 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -63,6 +63,10 @@ with stdenv; lib.makeOverridable mkDerivation rec { makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + # Some internals want libstdc++.so.6 + stdenv.cc.cc.lib + ]}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/jetbrains/default.nix similarity index 62% rename from pkgs/applications/editors/idea/default.nix rename to pkgs/applications/editors/jetbrains/default.nix index c5f87d33f732..28a75befba80 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,15 +1,19 @@ -{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf +{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk +, androidsdk, jdk, cmake, libxml2, zlib, python2, ncurses }: assert stdenv.isLinux; -let - mkIdeaProduct = callPackage ./common.nix { }; +with stdenv.lib; - buildClion = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { +let + mkJetBrainsProduct = callPackage ./common.nix { }; + + # Sorted alphabetically + + buildClion = { name, version, src, license, description, wmClass, update-channel }: + lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { @@ -19,13 +23,77 @@ let Enhancing productivity for every C and C++ developer on Linux, OS X and Windows. ''; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo mic92 ]; + platforms = platforms.linux; + }; + }) (attrs: { + postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' + ( + cd $out/clion-${version} + # bundled cmake does not find libc + rm -rf bin/cmake + ln -s ${cmake} bin/cmake + + lldbLibPath=$out/clion-${version}/bin/lldb/lib + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5 + + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ + bin/lldb/bin/lldb-server + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ + bin/lldb/LLDBFrontend + patchelf \ + --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \ + bin/lldb/lib/liblldb.so + + 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, update-channel }: + (mkJetBrainsProduct { + inherit name version src wmClass jdk; + product = "DataGrip"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/datagrip/"; + inherit description license; + longDescription = '' + DataGrip is a new IDE from JetBrains built for database admins. + It allows you to quickly migrate and refactor relational databases, + construct efficient, statically checked SQL queries and much more. + ''; + maintainers = with maintainers; [ loskutov ]; platforms = platforms.linux; }; }); - buildIdea = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + buildGogland = { name, version, src, license, description, wmClass, update-channel }: + (mkJetBrainsProduct { + inherit name version src wmClass jdk; + product = "Gogland"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/go/"; + inherit description license; + longDescription = '' + Gogland is the codename for a new commercial IDE by JetBrains + aimed at providing an ergonomic environment for Go development. + The new IDE extends the IntelliJ platform with the coding assistance + and tool integrations specific for the Go language + ''; + maintainers = [ maintainers.miltador ]; + platforms = platforms.linux; + }; + }); + + buildIdea = { name, version, src, license, description, wmClass, update-channel }: + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { @@ -41,21 +109,8 @@ let }; }); - buildRubyMine = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { - inherit name version src wmClass jdk; - product = "RubyMine"; - meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/ruby/"; - inherit description license; - longDescription = description; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; - }); - - buildPhpStorm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }: + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { @@ -71,25 +126,8 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { - inherit name version src wmClass jdk; - product = "WebStorm"; - meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/webstorm/"; - inherit description license; - longDescription = '' - WebStorm provides an editor for HTML, JavaScript (incl. Node.js), - and CSS with on-the-fly code analysis, error prevention and - automated refactorings for JavaScript code. - ''; - maintainers = with maintainers; [ abaldeau ]; - platforms = platforms.linux; - }; - }); - - buildPycharm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + buildPycharm = { name, version, src, license, description, wmClass, update-channel }: + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { @@ -115,47 +153,104 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildDataGrip = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + buildRider = { name, version, src, license, description, wmClass, update-channel }: + lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; - product = "DataGrip"; + product = "Rider"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/datagrip/"; + homepage = "https://www.jetbrains.com/rider/"; inherit description license; longDescription = '' - DataGrip is a new IDE from JetBrains built for database admins. - It allows you to quickly migrate and refactor relational databases, - construct efficient, statically checked SQL queries and much more. + JetBrains Rider is a new .NET IDE based on the IntelliJ + platform and ReSharper. Rider supports .NET Core, + .NET Framework and Mono based projects. This lets you + develop a wide array of applications including .NET desktop + apps, services and libraries, Unity games, ASP.NET and + ASP.NET Core web applications. ''; - maintainers = with maintainers; [ loskutov ]; + maintainers = [ maintainers.miltador ]; + platforms = platforms.linux; + }; + }) (attrs: { + patchPhase = attrs.patchPhase + '' + # Patch built-in mono for ReSharperHost to start successfully + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen + ''; + }); + + buildRubyMine = { name, version, src, license, description, wmClass, update-channel }: + (mkJetBrainsProduct rec { + inherit name version src wmClass jdk; + product = "RubyMine"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/ruby/"; + inherit description license; + longDescription = description; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; }); + + buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: + (mkJetBrainsProduct { + inherit name version src wmClass jdk; + product = "WebStorm"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/webstorm/"; + inherit description license; + longDescription = '' + WebStorm provides an editor for HTML, JavaScript (incl. Node.js), + and CSS with on-the-fly code analysis, error prevention and + automated refactorings for JavaScript code. + ''; + maintainers = with maintainers; [ abaldeau ]; + platforms = platforms.linux; + }; + }); + in { + # Sorted alphabetically + clion = buildClion rec { name = "clion-${version}"; - version = "2016.3.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 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05"; + sha256 = "de7f47ec959be9653aa4d2028fb27f8327800d8370daa0ab2d1093f3469f4b49"; /* updated by script */ }; wmClass = "jetbrains-clion"; + update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; - clion1 = buildClion rec { - name = "clion-${version}"; - version = "1.2.5"; - description = "C/C++ IDE. New. Intelligent. Cross-platform"; + datagrip = buildDataGrip rec { + name = "datagrip-${version}"; + 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/cpp/${name}.tar.gz"; - sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp"; + url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; + sha256 = "8847c35761fcf6fc7a1d3f2bed0fa3971fbf28721c144f41d21feb473bb212dc"; /* updated by script */ }; - wmClass = "jetbrains-clion"; + wmClass = "jetbrains-datagrip"; + update-channel = "datagrip_2017_1"; + }; + + gogland = buildGogland rec { + name = "gogland-${version}"; + 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 = "8e9462fc7c5cc7dc110ea2257b920a55d7d52ea874a53567e5d19381a1fcb269"; /* updated by script */ + }; + wmClass = "jetbrains-gogland"; + update-channel = "gogland_1.0_EAP"; }; idea14-community = buildIdea rec { @@ -168,18 +263,20 @@ in sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz"; }; wmClass = "jetbrains-idea-ce"; + update-channel = "IDEA14.1"; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.3.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 = "712dccd726b43e2187e8025a6effb711d35310b36d553dbf7bf85400ec1cec15"; + sha256 = "0z5abj41f5l9ilznr34lm4fsivrl2yjdxb2kdcis5abij6zl0g3f"; }; wmClass = "jetbrains-idea-ce"; + update-channel = "IDEA_Release"; }; idea14-ultimate = buildIdea rec { @@ -192,6 +289,7 @@ in sha256 = "1hhga1i2zbsipgq283gn19kv9n94inhr1bxh2yx19gz7yr4r49d2"; }; wmClass = "jetbrains-idea"; + update-channel = "IDEA14.1"; }; idea15-ultimate = buildIdea rec { @@ -204,90 +302,33 @@ in sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll"; }; wmClass = "jetbrains-idea"; + update-channel = null; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.3.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}.tar.gz"; - sha256 = "1ichjrdmnhyqv9cr73d8kif9l53k3x36i8js8nf9cmkbhdsfckn3"; + url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; + sha256 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag"; }; wmClass = "jetbrains-idea"; - }; - - ruby-mine = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "2016.3.1"; - 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 = "10d1ba6qpizhz4d7fz0ya565pdvkgcmsdgs7b8dv98s9hxfjsldy"; - }; - wmClass = "jetbrains-rubymine"; - }; - - ruby-mine7 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "7.1.5"; - 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 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; - }; - wmClass = "jetbrains-rubymine"; - }; - - ruby-mine8 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "8.0.4"; - 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 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; - }; - wmClass = "jetbrains-rubymine"; - }; - - pycharm-community = buildPycharm rec { - name = "pycharm-community-${version}"; - version = "2016.3.2"; - description = "PyCharm Community Edition"; - license = stdenv.lib.licenses.asl20; - src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0fag5ng9n953mnf3gmxpac1icnb1qz6dybhqwjbr13qij8v2s2g1"; - }; - wmClass = "jetbrains-pycharm-ce"; - }; - - pycharm-professional = buildPycharm rec { - name = "pycharm-professional-${version}"; - version = "2016.3.2"; - description = "PyCharm Professional Edition"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1nylq0fyvix68l4dp9852dak58dbiamjphx2hin087cadaji6r63"; - }; - wmClass = "jetbrains-pycharm"; + update-channel = "IDEA_Release"; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2016.3.2"; + 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 = "05ylhpn1mijjphcmv6ay3123xp72yypw19430dgr8101zpsnifa5"; + sha256 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf"; }; wmClass = "jetbrains-phpstorm"; + update-channel = "PS2017.1"; }; phpstorm10 = buildPhpStorm rec { @@ -300,18 +341,98 @@ in sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; }; wmClass = "jetbrains-phpstorm"; + update-channel = "WI10"; + }; + + pycharm-community = buildPycharm rec { + name = "pycharm-community-${version}"; + 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 = "1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b"; /* updated by script */ + }; + wmClass = "jetbrains-pycharm-ce"; + update-channel = "PyCharm_Release"; + }; + + pycharm-professional = buildPycharm rec { + name = "pycharm-professional-${version}"; + 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 = "52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce"; /* updated by script */ + }; + wmClass = "jetbrains-pycharm"; + update-channel = "PyCharm_Release"; + }; + + rider = buildRider rec { + name = "rider-${version}"; + 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/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.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 = "198eb3d7914529ce3a6857e038167e194fb838c4b94242048ae45e8413458d66"; /* updated by script */ + }; + wmClass = "jetbrains-rubymine"; + update-channel = "rm2017.1"; + }; + + ruby-mine7 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "7.1.5"; + 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 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; + }; + wmClass = "jetbrains-rubymine"; + update-channel = null; + }; + + ruby-mine8 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "8.0.4"; + 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 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; + }; + wmClass = "jetbrains-rubymine"; + update-channel = null; }; webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2016.3.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 = "08f266afi8ia5jvvgk2lncra2n3i0l5c3h7c8fwxz6y8fhhlas4y"; + sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm"; }; wmClass = "jetbrains-webstorm"; + update-channel = "WS_Release"; }; webstorm10 = buildWebStorm rec { @@ -324,6 +445,7 @@ in sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic"; }; wmClass = "jetbrains-webstorm"; + update-channel = null; }; webstorm11 = buildWebStorm rec { @@ -336,17 +458,6 @@ in sha256 = "17agyqdyz6naxyx6p0y240ar93gja0ypw01nm2qmfzvh7ch03r24"; }; wmClass = "jetbrains-webstorm"; - }; - - datagrip = buildDataGrip rec { - name = "datagrip-${version}"; - version = "2016.3.2"; - 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 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3"; - }; - wmClass = "jetbrains-datagrip"; + update-channel = null; }; } diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl new file mode 100755 index 000000000000..fecdeb0cae84 --- /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/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 323059417ea8..d6c87c4991b9 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "4.2"; + version = "4.4"; name = "joe-${version}"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "0x39x0qrwdbhl45wd8r8cpzigsip6m5j2crajsrbffk8qm5scpdw"; + sha256 = "0y898r1xlrv75m00y598rvwwsricabplyh80wawsqafapcl4hw55"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix new file mode 100644 index 000000000000..ae4f1e6ad525 --- /dev/null +++ b/pkgs/applications/editors/jucipp/default.nix @@ -0,0 +1,73 @@ +{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, + boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, + libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, + coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "juicipp-${version}"; + version = "1.2.3"; + + meta = { + homepage = https://github.com/cppit/jucipp; + description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ xnwdd ]; + }; + + src = fetchgit { + url = "https://github.com/cppit/jucipp.git"; + rev = "refs/tags/v${version}"; + deepClone = true; + sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ + dbus_libs + openssl + libxml2 + gnome3.gtksourceview + at_spi2_core + pcre + epoxy + boost + libXdmcp + cmake + aspell + libgit2 + libxkbcommon + gnome3.gtkmm3 + libpthreadstubs + gnome3.gtksourceviewmm + llvmPackages.clang.cc + llvmPackages.lldb + gnome3.dconf + ]; + + + lintIncludes = let + p = "arguments.emplace_back(\"-I"; + e = "\");"; + v = stdenv.lib.getVersion llvmPackages.clang; + in + p+llvmPackages.libcxx+"/include/c++/v1"+e + +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e + +p+glibc.dev+"/include"+e; + + preConfigure = '' + sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt + sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc + ''; + cmakeFlags = "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so"; + postInstall = '' + mv $out/bin/juci $out/bin/.juci + makeWrapper "$out/bin/.juci" "$out/bin/juci" \ + --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \ + --set NO_AT_BRIDGE 1 \ + --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" + ''; + +} diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 4590939b516a..067aff5ee69b 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -3,25 +3,20 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "kakoune-nightly-${version}"; - version = "2017-02-09"; + name = "kakoune-unstable-${version}"; + version = "2017-04-12"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14"; - sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi"; + rev = "7482d117cc85523e840dff595134dcb9cdc62207"; + sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh"; }; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; - buildPhase = '' - sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile - substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex" + postPatch = '' export PREFIX=$out - (cd src && make ) - ''; - - installPhase = '' - (cd src && make install) + cd src + sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile ''; meta = { diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 19ffb2c4959b..bbd9be220744 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper -, qtquickcontrols, qtwebkit, qttools +{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules +, qtquickcontrols, qtwebkit, qttools, kde-cli-tools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee @@ -9,37 +9,47 @@ let pname = "kdevelop"; - version = "5.0.3"; - dirVersion = "5.0.3"; + version = "5.1.1"; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; - sha256 = "17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754"; }; nativeBuildInputs = [ - cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper + cmake gettext pkgconfig extra-cmake-modules makeWrapper ]; buildInputs = [ + kdevelop-pg-qt + llvmPackages.llvm llvmPackages.clang-unwrapped + ]; + + propagatedBuildInputs = [ qtquickcontrols qtwebkit kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped - llvmPackages.llvm llvmPackages.clang-unwrapped + kdevplatform shared_mime_info libksysguard konsole ]; postInstall = '' - wrapQtProgram "$out/bin/kdevelop" - wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin" + # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. + wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin" + + # Fix the (now wrapped) kdevelop! to find things in right places: + # - Make KDEV_BASEDIR point to bin directory of kdevplatform. + kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|" + # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop. + kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|" + sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped" ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; description = "KDE official IDE"; @@ -52,6 +62,6 @@ stdenv.mkDerivation rec { libraries and is under development since 1998. ''; homepage = https://www.kdevelop.org; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; }; } diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch deleted file mode 100644 index ba5140c77fcf..000000000000 --- a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e84645d1694bdad7f179cd41babce723fe07aa63 Mon Sep 17 00:00:00 2001 -From: Kevin Funk -Date: Mon, 5 Dec 2016 15:20:53 +0100 -Subject: Hotfix for restoring build with newer KConfig - -https://phabricator.kde.org/D3386 is a SIC change, handle that ---- - project/projectconfigskeleton.cpp | 4 ++++ - project/projectconfigskeleton.h | 14 +++++--------- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp -index 0e06149..c4c9767 100644 ---- a/project/projectconfigskeleton.cpp -+++ b/project/projectconfigskeleton.cpp -@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname ) - ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config ) - : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate ) - { -+ // FIXME: Check if that does the right thing. -+ // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public -+ Q_ASSERT(config); -+ d->m_developerTempFile = config->name(); - } - - void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg ) -diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h -index ed17ed0..c8314df 100644 ---- a/project/projectconfigskeleton.h -+++ b/project/projectconfigskeleton.h -@@ -55,16 +55,12 @@ public: - - Path projectFile() const; - Path developerFile() const; -+ -+protected: -+ explicit ProjectConfigSkeleton( KSharedConfigPtr config ); -+ - private: -- /** -- * There's no way in KDE4 API to find out the file that the config object -- * was created from, so we can't apply defaults when using this -- * constructors. Thus I'm making this private, so we can find out when -- * this constructor is used and see if we need to add appropriate API to -- * kdelibs -- */ -- explicit ProjectConfigSkeleton( KSharedConfigPtr config ); -- struct ProjectConfigSkeletonPrivate * const d; -+ struct ProjectConfigSkeletonPrivate * const d; - }; - - } --- -cgit v0.11.2 - diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index c36885a9e139..b7c0d0cf8554 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -1,30 +1,34 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper -, boost, subversion, apr, aprutil +{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules +, 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 }: let pname = "kdevplatform"; - version = "5.0.3"; - dirVersion = "5.0.3"; + version = "5.1.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - + src = fetchurl { - url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; - sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4"; + url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz"; + sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726"; }; - patches = [ ./kdevplatform-projectconfigskeleton.patch ]; + patches = [ + (fetchpatch { + name = "kdevplatform-project-selection.patch"; + url = "https://cgit.kde.org/kdevplatform.git/patch/?id=da4c0fdfcf21dc2a8f48a2b1402213a32effd47a"; + sha256 = "16ws8l6dciy2civjnsaj03ml2bzvg4a9g7gd4iyx4hprw65zrcxm"; + }) + ]; - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ]; - propagatedBuildInputs = [ ]; 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/kile/default.nix b/pkgs/applications/editors/kile/default.nix index a5914c92e8f9..259c319c70ff 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,9 +1,9 @@ -{ kdeDerivation +{ mkDerivation , lib , fetchgit , extra-cmake-modules , kdoctools -, kdeWrapper +, wrapGAppsHook , qtscript , kconfig , kcrash @@ -17,52 +17,47 @@ , kparts , ktexteditor , kwindowsystem +, okular , poppler }: -let - unwrapped = - kdeDerivation rec { - name = "kile-${version}"; - version = "2017-02-09"; +mkDerivation rec { + name = "kile-${version}"; + version = "2017-02-09"; - src = fetchgit { - url = git://anongit.kde.org/kile.git; - rev = "f77f6e627487c152f111e307ad6dc71699ade746"; - sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; + src = fetchgit { + url = git://anongit.kde.org/kile.git; + rev = "f77f6e627487c152f111e307ad6dc71699ade746"; + sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; - }; + }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; - buildInputs = [ - kconfig - kcrash - kdbusaddons - kdelibs4support - kdoctools - kguiaddons - kiconthemes - kinit - khtml - kparts - ktexteditor - kwindowsystem - poppler - qtscript - ]; + propagatedBuildInputs = [ + kconfig + kcrash + kdbusaddons + kdelibs4support + kdoctools + kguiaddons + kiconthemes + kinit + khtml + kparts + ktexteditor + kwindowsystem + okular + poppler + qtscript + ]; - meta = { - description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; - homepage = https://www.kde.org/applications/office/kile/; - maintainers = with lib.maintainers; [ fridh ]; - license = lib.licenses.gpl2Plus; - }; - }; -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/kile" ]; - paths = [ konsole.unwrapped ]; + propagatedUserEnvPkgs = [ konsole ]; + + meta = { + description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; + homepage = https://www.kde.org/applications/office/kile/; + maintainers = with lib.maintainers; [ fridh ]; + license = lib.licenses.gpl2Plus; + }; } diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix new file mode 100644 index 000000000000..a0e941289099 --- /dev/null +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -0,0 +1,133 @@ +{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper +, # Patchelf dependencies: + alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, mesa +, openssl, xlibs, xorg, zlib +}: + +let + + version = "17.1"; + + sha256 = if stdenv.system == "x86_64-linux" then "1kddisnvlk48jip6k59mw3wlkrl7rkck2lxpaghn0gfx02cvms5f" + else if stdenv.system == "i686-cygwin" then "1izp42afrlh4yd322ax9w85ki388gnkqfqbw8dwnn4k3j7r5487z" + else throw "Unsupported system: ${stdenv.system}"; + + urlBase = "https://github.com/Kode/KodeStudio/releases/download/v${version}/KodeStudio-"; + + urlStr = if stdenv.system == "x86_64-linux" then urlBase + "linux64.tar.gz" + else if stdenv.system == "i686-cygwin" then urlBase + "win32.zip" + else throw "Unsupported system: ${stdenv.system}"; + +in + + stdenv.mkDerivation rec { + name = "kodestudio-${version}"; + + src = fetchurl { + url = urlStr; + inherit sha256; + }; + + buildInputs = [ makeWrapper libXScrnSaver ]; + + desktopItem = makeDesktopItem { + name = "kodestudio"; + exec = "kodestudio"; + icon = "kodestudio"; + comment = "Kode Studio is an IDE for Kha based on Visual Studio Code"; + desktopName = "Kode Studio"; + genericName = "Text Editor"; + categories = "GNOME;GTK;Utility;TextEditor;Development;"; + }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out + cp -r ./* $out + ''; + + postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' + # Patch Binaries + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out:${atomEnv.libPath}" \ + $out/kodestudio + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \ + $out/resources/app/extensions/krom/Krom/linux/Krom + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ".:${stdenv.cc.libc}/lib" \ + $out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64 + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ".:${stdenv.cc.libc}/lib" \ + $out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64 + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \ + $out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64 + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \ + $out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64 + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \ + $out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64 + + # Patch Shared Objects + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/libnode.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib" $out/libffmpeg.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libplatform.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicuuc.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libbase.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicui18n.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/RPi/libneko.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux64/libneko.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux/libneko.so + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/pty.js/build/Release/pty.node + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/gcsignals.node + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/obj.target/gcsignals.node + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/onig_scanner.node + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/obj.target/onig_scanner.node + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/keymapping.node + patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/obj.target/keymapping.node + + # Rewrite VSCODE_PATH inside bin/kodestudio to $out + substituteInPlace $out/bin/kodestudio --replace "/usr/share/kodestudio" $out + + # Patch library calls that expects nix store files to be mode 644: + # A stat is made on srcFile (in the nix store), and its mode used + # for destFile, but it expects the mode to be read write, whereas + # all regular files in the nix store are made read only. + # (33188 is 100644 octal, the required mode) + substituteInPlace $out/resources/app/extensions/kha/Kha/Tools/khamake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188" + substituteInPlace $out/resources/app/extensions/kha/Kha/Kore/Tools/koremake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188" + + # Wrap preload libXss + wrapProgram $out/bin/kodestudio \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 + ''; + + meta = with stdenv.lib; { + description = '' + An IDE for Kha based on Visual Studio Code + ''; + longDescription = '' + Kode Studio is an IDE for Kha based on Visual Studio Code. + + Kha and Kore are multimedia frameworks for Haxe and C++ respectively + (with JavaScript coming soon). Using Kha or Kore you can access all + hardware at the lowest possible level in a completely portable way. + ''; + homepage = http://kode.tech/; + downloadPage = https://github.com/Kode/KodeStudio/releases; + license = licenses.mit; + maintainers = [ maintainers.patternspandemic ]; + platforms = [ "x86_64-linux" "i686-cygwin" ]; + }; + } diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 65fb927d48ea..b05bbd053c1f 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "leo-editor-${version}"; - version = "5.3"; + version = "5.5"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "0whbay8ilabzpxdjaxv447y6bqbsilx161fv7wa15v3qqm2kapsp"; + sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr"; }; dontBuild = true; - buildInputs = [ makeWrapper python3Packages.python ]; + nativeBuildInputs = [ makeWrapper python3Packages.python ]; propagatedBuildInputs = with python3Packages; [ pyqt5 ]; desktopItem = makeDesktopItem rec { @@ -50,16 +50,16 @@ 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" ''; meta = with stdenv.lib; { - homepage = "http://leoeditor.com"; + homepage = http://leoeditor.com; description = "A powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ leonardoce ramkromberg ]; }; } diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 68f5e14891fa..74a83c1278af 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: diff --git a/pkgs/applications/editors/mg/configure.patch b/pkgs/applications/editors/mg/configure.patch deleted file mode 100644 index 11105299eb4b..000000000000 --- a/pkgs/applications/editors/mg/configure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.old 2013-07-30 19:42:51.000000000 +0200 -+++ configure 2013-07-30 19:47:26.000000000 +0200 -@@ -163,31 +163,7 @@ - echo 'Fails.' - fi - -- --if [ ! -r /usr/include/term.h ]; then -- note 'term.h' -- if [ -r /usr/include/ncurses/term.h ]; then -- echo "Found in /usr/include/ncurses" -- extraflags="$extraflags -I/usr/include/ncurses" -- else -- for i in pkg local; do -- if [ -r /usr/$i/include/term.h ]; then -- echo "Found in /usr/$i/include" -- extralibs="$extralibs -L/usr/$i/lib" -- extraflags="$extraflags -I/usr/$i/include" -- break -- else -- false -- fi -- done || -- { -- echo 'Not found!' >&2 -- echo 'Do you have the ncurses devel package installed?' >&2 -- echo 'If you know where term.h is, please email the author!' >&2 -- exit 1 -- } -- fi --fi -+extraflags="$extraflags $NIX_CFLAGS_COMPILE" - - note 'base and dirname' - if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 95a6205125b0..b8bfd40c079b 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,19 +1,19 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, stdenv, ncurses, pkgconfig, libbsd }: stdenv.mkDerivation rec { - name = "mg-20110905"; + name = "mg-${version}"; + version = "20161005"; src = fetchurl { - url = http://homepage.boetes.org/software/mg/mg-20110905.tar.gz; - sha256 = "0ac2c7wy5kkcflm7cmiqm5xhb5c4yfw3i33iln8civ1yd9z7vlqw"; + url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; + sha256 = "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p"; }; - dontAddPrefix = true; - - patches = [ ./configure.patch ]; - patchFlags = "-p0"; - NIX_CFLAGS_COMPILE = "-Wno-error"; - buildFlags = [ "CC=cc" ]; + + preConfigure = '' + substituteInPlace GNUmakefile \ + --replace /usr/bin/pkg-config ${pkgconfig}/bin/pkg-config + ''; installPhase = '' mkdir -p $out/bin @@ -22,12 +22,13 @@ stdenv.mkDerivation rec { cp mg.1 $out/share/man/man1 ''; - buildInputs = [ ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses libbsd ]; - meta = { + meta = with stdenv.lib; { homepage = http://homepage.boetes.org/software/mg/; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.all; + license = licenses.publicDomain; + platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 9814e697d22b..d924532eb340 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -17,32 +17,33 @@ let rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; }; + in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.7.3"; + version = "2.8.6"; + src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1z0bfyc5cvv83l3bjmlcwl49mpxrp65k5ffsfpnayfyjc18fy9nr"; + sha256 = "0xjpm2ka56x5ycrgjh06v110na13xlbm42bs8qibk7g578m9cils"; }; + nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; + outputs = [ "out" "info" ]; + configureFlags = '' --sysconfdir=/etc ${optionalString (!enableNls) "--disable-nls"} ${optionalString enableTiny "--enable-tiny"} ''; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/text.c --replace "__time_t" "time_t" - ''; - postInstall = '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ ''; meta = { - homepage = http://www.nano-editor.org/; + homepage = https://www.nano-editor.org/; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; maintainers = with maintainers; [ diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index d933a207cd4a..a15b557f0e57 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, xlibsWrapper, motif, libXpm }: stdenv.mkDerivation rec { - name = "nedit-5.6a"; + name = "nedit-${version}"; + version = "5.7"; src = fetchurl { url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; - sha256 = "1v8y8vwj3kn91crsddqkz843y6csgw7wkjnd3zdcb4bcrf1pjrsk"; + sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd"; }; hardeningDisable = [ "format" ]; - buildInputs = [ xlibsWrapper motif libXpm ]; + nativeBuildInputs = [ xlibsWrapper ]; + buildInputs = [ motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else # the linux config works fine on darwin too! @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nedit.org; + homepage = http://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index cbaf14cee603..ca915b3e6d1b 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -24,8 +24,8 @@ let src = fetchFromGitHub { owner = "neovim"; repo = "libvterm"; - rev = "11682793d84668057c5aedc3d7f8071bb54eaf2c"; - sha256 = "0pd90yx6xsagrqjipi26sxri1l4wdnx23ziad1zbxnqx9njxa7g3"; + rev = "5a748f97fbf27003e141002b58933a99f3addf8d"; + sha256 = "1fnd57f5n9h7z50a4vj7g96k6ndsdknjqsibgnxi9ndhyz244qbx"; }; buildInputs = [ perl ]; @@ -53,18 +53,24 @@ let rubyWrapper = ''--suffix PATH : \"${rubyEnv}/bin\" '' + ''--suffix GEM_HOME : \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" ''; + pluginPythonPackages = if configure == null then [] else builtins.concatLists + (map ({ pythonDependencies ? [], ...}: pythonDependencies) + (vimUtils.requiredPlugins configure)); pythonEnv = pythonPackages.python.buildEnv.override { extraLibs = ( if withPyGUI then [ pythonPackages.neovim_gui ] else [ pythonPackages.neovim ] - ) ++ extraPythonPackages; + ) ++ extraPythonPackages ++ pluginPythonPackages; ignoreCollisions = true; }; pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" ''; + pluginPython3Packages = if configure == null then [] else builtins.concatLists + (map ({ python3Dependencies ? [], ...}: python3Dependencies) + (vimUtils.requiredPlugins configure)); python3Env = python3Packages.python.buildEnv.override { - extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages; + extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages; ignoreCollisions = true; }; python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" ''; @@ -75,13 +81,13 @@ let neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "0bk0raxlb1xsqyw9pmqmxvcq5szqhimidrasnvzrci84gld8cwz4"; + sha256 = "0fhjkgjwqqmzbfn9wk10l2vq9v74zkriz5j12b1rx0gdwzlfybn8"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 487d9c842b8c..cf4ea9df544e 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,17 +4,17 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { name = "neovim-remote-${version}"; - version = "v1.4.0"; + version = "v1.6.0"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = version; - sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz"; + sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l"; }; - propagatedBuildInputs = [ pythonPackages.neovim ]; + propagatedBuildInputs = with pythonPackages; [ neovim psutil ]; meta = { description = "A tool that helps controlling nvim processes from a terminal"; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 26f2a3b69411..e24ca50a0247 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen -, libmsgpack, makeQtWrapper, neovim, pythonPackages, qtbase }: +{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper +, libmsgpack, neovim, pythonPackages, qtbase }: stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "1wsxhy8fdayy4dsr2dxgh5k4jysybjlyzj134vk325v6cqz9bsgm"; + sha256 = "1bfni38l7cs0wbd9c6hgz2jfc8h3ixmg94izdvydm8j7amdz0cb6"; }; cmakeFlags = [ @@ -17,7 +17,13 @@ stdenv.mkDerivation rec { "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" ]; - doCheck = true; + # The following tests FAILED: + # 2 - tst_neovimconnector (Failed) + # 3 - tst_callallmethods (Failed) + # 4 - tst_encoding (Failed) + # + # Tests failed when upgraded to neovim 0.2.0 + doCheck = false; buildInputs = with pythonPackages; [ neovim qtbase libmsgpack @@ -25,7 +31,7 @@ stdenv.mkDerivation rec { jinja2 msgpack python ]); - nativeBuildInputs = [ cmake doxygen makeQtWrapper ]; + nativeBuildInputs = [ cmake doxygen makeWrapper ]; enableParallelBuilding = true; @@ -37,7 +43,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapQtProgram "$out/bin/nvim-qt" \ + wrapProgram "$out/bin/nvim-qt" \ --prefix PATH : "${neovim}/bin" ''; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 88100b2e8f87..327edca0ed24 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 c3ed45a78481..fbb9c63a1cff 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/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index 0de33d6d1949..b553e09ed5e2 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, which, qtbase }: +{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: let version = "0.53.0"; @@ -12,11 +12,11 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig which + pkgconfig which qttools ]; buildInputs = [ - qtbase.qtsvg qtbase.qtwebkit qtbase.qttools + qtbase qtsvg qtwebkit ]; preConfigure = '' diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 5fef166e663f..9ac91e7086ab 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,28 +1,21 @@ -{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, -R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, -# If you have set up an R wrapper with other packages by following -# something like https://nixos.org/nixpkgs/manual/#r-packages, RStudio -# by default not be able to access any of those R packages. In order -# to do this, override the argument "R" here with your respective R -# wrapper, and set "useRPackages" to true. This will add the -# environment variable R_PROFILE_USER to the RStudio wrapper, pointing -# to an R script which will allow R to use these packages. -useRPackages ? false +{ stdenv, fetchurl, makeDesktopItem, cmake, boost163, zlib, openssl, +R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: let - version = "0.98.110"; + version = "1.1.216"; ginVer = "1.5"; - gwtVer = "2.5.1"; + gwtVer = "2.7.0"; in stdenv.mkDerivation rec { name = "RStudio-${version}"; - buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ]; + buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ]; + nativeBuildInputs = [ qt5.qmake ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; - sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z"; + sha256 = "07lp2ybvj7ippdrp7fv7j54dp0mm6k19j1vqdvjdk95acg3xgcjf"; }; # Hack RStudio to only use the input R. @@ -38,14 +31,34 @@ stdenv.mkDerivation rec { inherit gwtVer; gwtSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; + sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda"; }; hunspellDictionaries = builtins.attrValues hunspellDicts; mathJaxSrc = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; - sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal"; + url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; + sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; + }; + + rmarkdownSrc = fetchurl { + url = "https://github.com/rstudio/rmarkdown/archive/95b8b1fa64f78ca99f225a67fff9817103be56.zip"; + sha256 = "12fa65qr04rwsprkmyl651mkaqcbn1znwsmcjg4qsk9n5nxg0fah"; + }; + + rsconnectSrc = fetchurl { + url = "https://github.com/rstudio/rsconnect/archive/425f3767b3142bc6b81c9eb62c4722f1eedc9781.zip"; + sha256 = "1sgf9dj9wfk4c6n5p1jc45386pf0nj2alg2j9qx09av3can1dy9p"; + }; + + rstudiolibclang = fetchurl { + url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip; + sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c"; + }; + + rstudiolibclangheaders = fetchurl { + url = https://s3.amazonaws.com/rstudio-buildtools/libclang-builtin-headers.zip; + sha256 = "0x4ax186bm3kf098izwmsplckgx1kqzg9iiyzg95rpbqsb4593qb"; }; preConfigure = @@ -66,10 +79,19 @@ stdenv.mkDerivation rec { done done - unzip $mathJaxSrc -d dependencies/common/mathjax + unzip $mathJaxSrc -d dependencies/common/mathjax-26 + unzip $rmarkdownSrc -d dependencies/common/rmarkdown + unzip $rsconnectSrc -d dependencies/common/rsconnect + mkdir -p dependencies/common/libclang/3.5 + unzip $rstudiolibclang -d dependencies/common/libclang/3.5 + mkdir -p dependencies/common/libclang/builtin-headers + unzip $rstudiolibclangheaders -d dependencies/common/libclang/builtin-headers + + mkdir -p dependencies/common/pandoc + cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ ''; - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ]; desktopItem = makeDesktopItem { name = name; @@ -82,14 +104,8 @@ stdenv.mkDerivation rec { mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; }; - postInstall = let rProfile = - # RStudio seems to bypass the environment variables that the R - # wrapper already applies, and so this sets R_PROFILE_USER to - # again make those R packages accessible: - if useRPackages - then "--set R_PROFILE_USER ${R}/${R.passthru.fixLibsR}" else ""; - in '' - wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin ${rProfile} + postInstall = '' + wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin mkdir $out/share cp -r ${desktopItem}/share/applications $out/share mkdir $out/share/icons @@ -100,7 +116,7 @@ stdenv.mkDerivation rec { { description = "Set of integrated tools for the R language"; homepage = http://www.rstudio.com/; license = licenses.agpl3; - maintainers = [ maintainers.ehmry ]; + maintainers = [ maintainers.ehmry maintainers.changlinli ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/applications/editors/rstudio/r-location.patch index a1ec84a5475c..24cb6a246977 100644 --- a/pkgs/applications/editors/rstudio/r-location.patch +++ b/pkgs/applications/editors/rstudio/r-location.patch @@ -1,18 +1,19 @@ -diff -ur rstudio-0.98.110-old/src/cpp/core/CMakeLists.txt rstudio-0.98.110-new/src/cpp/core/CMakeLists.txt ---- rstudio-0.98.110-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2013-04-28 10:02:14.000000000 -0400 -+++ rstudio-0.98.110-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2015-03-23 15:06:35.533400807 -0400 -@@ -84,9 +84,7 @@ +diff -ur rstudio-1.1.216-old/src/cpp/core/CMakeLists.txt rstudio-1.1.216-new/src/cpp/core/CMakeLists.txt +--- rstudio-1.1.216-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2017-04-30 03:37:26.669418665 -0400 ++++ rstudio-1.1.216-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2017-04-30 03:36:33.590726185 -0400 +@@ -87,10 +87,7 @@ { // define potential paths std::vector rScriptPaths; - rScriptPaths.push_back("/usr/bin/R"); - rScriptPaths.push_back("/usr/local/bin/R"); - rScriptPaths.push_back("/opt/local/bin/R"); +- rScriptPaths.push_back("/Library/Frameworks/R.framework/Resources/bin/R"); + rScriptPaths.push_back("@R@/bin/R"); return scanForRScript(rScriptPaths, pErrMsg); } - -@@ -220,8 +218,7 @@ + +@@ -226,8 +223,7 @@ // scan in standard locations as a fallback std::string scanErrMsg; std::vector rScriptPaths; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 989d3e42a6fa..05cf21fcc536 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: -let - version = "3.3.7"; - - version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "scite-${version}"; + version = "3.7.5"; src = fetchurl { - url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite${version_short}.tgz"; - sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd"; + url = http://www.scintilla.org/scite375.tgz; + sha256 = "11pg9bifyyqpblqsrl1b9f8shb3fa6fgzclvjba6hwh7hh98drji"; }; - buildInputs = [ pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; sourceRoot = "scintilla/gtk"; buildPhase = '' @@ -25,11 +23,11 @@ in stdenv.mkDerivation { make install prefix=$out/ ''; - meta = { + meta = with stdenv.lib; { homepage = "http://www.scintilla.org/SciTE.html"; description = "SCIntilla based Text Editor"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.rszibele ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.rszibele ]; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 7a066b068e1a..0c716ed63c14 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { - sha256 = "0hihd5f3avpdvxwp5j80qdg74zbw7p20y6j9q8cw7wd0bak58h9c"; + sha256 = "17m2f7pj2sx5rxrbry6wk1lvviy8fi2m270h47sisywnrhddarh7"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with python3Packages; [ lxml ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + buildInputs = [ - cmake pkgconfig boost xercesc qtbase qttools qtwebkit qtxmlpatterns - python3 python3Packages.lxml makeWrapper - ]; + python3 python3Packages.lxml ]; preFixup = '' wrapProgram "$out/bin/sigil" \ @@ -32,12 +32,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = https://github.com/Sigil-Ebook/Sigil/; - license = stdenv.lib.licenses.gpl3; - inherit version; - maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3; + maintainers =[ maintainers.ramkromberg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index f900a4e9147c..0b8ecda62302 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, - gksuSupport ? false, gksu}: + gksuSupport ? false, gksu, unzip, zip, bash }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; @@ -33,6 +33,21 @@ in let dontPatchELF = true; buildInputs = [ makeWrapper ]; + # make exec.py in Default.sublime-package use own bash with + # an LD_PRELOAD instead of "/bin/bash" + patchPhase = '' + mkdir Default.sublime-package-fix + ( cd Default.sublime-package-fix + ${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null + substituteInPlace "exec.py" --replace \ + "[\"/bin/bash\"" \ + "[\"$out/sublime_bash\"" + ) + ${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null + mv Default.sublime-package.zip Packages/Default.sublime-package + rm -r Default.sublime-package-fix + ''; + buildPhase = '' for i in sublime_text plugin_host crash_reporter; do patchelf \ @@ -52,6 +67,12 @@ in let mkdir -p $out cp -prvd * $out/ + # We can't just call /usr/bin/env bash because a relocation error occurs + # when trying to run a build from within Sublime Text + ln -s ${bash}/bin/bash $out/sublime_bash + wrapProgram $out/sublime_bash \ + --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" + wrapProgram $out/sublime_text \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} @@ -66,6 +87,7 @@ in stdenv.mkDerivation { phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin + ln -s ${sublime}/sublime_text $out/bin/subl ln -s ${sublime}/sublime_text $out/bin/sublime ln -s ${sublime}/sublime_text $out/bin/sublime3 mkdir -p $out/share/applications diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 89ae2e04eac0..52223dafeb7f 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.11.2"; + version = "2.12.4"; name = "${pname}-${version}"; altname="Texstudio"; src = fetchurl { url = "mirror://sourceforge/texstudio/${name}.tar.gz"; - sha256 = "1p6ja5y5902y814f3f5mafh0y8vj682ghrarx1pbm4r5ap8x9z82"; + sha256 = "03917faqyy0a1k6b86blc2fcards5a1819ydgkc4jlhwiaym4iyw"; }; - buildInputs = [ qt4 qmake4Hook poppler_qt4 zlib pkgconfig ]; + nativeBuildInputs = [ qmake4Hook pkgconfig ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = "http://texstudio.sourceforge.net/"; + homepage = http://texstudio.sourceforge.net; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cfouche ]; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 1e24054b9960..d1fa03c54796 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -43,11 +43,11 @@ let # These lists are taken from the Makefile. - scintilla_tgz = "scintilla367.tgz"; + scintilla_tgz = "scintilla373.tgz"; tre_zip = "cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip"; scinterm_zip = "scinterm_1.8.zip"; - scintillua_zip = "scintillua_3.6.7-1.zip"; - lua_tgz = "lua-5.3.3.tar.gz"; + scintillua_zip = "33298b6cbce3.zip"; + lua_tgz = "lua-5.3.4.tar.gz"; lpeg_tgz = "lpeg-1.0.0.tar.gz"; lfs_zip = "v_1_6_3.zip"; lspawn_zip = "lspawn_1.5.zip"; @@ -60,7 +60,8 @@ let scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip; - scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip; + #scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip; + scintillua_url = "http://foicica.com/hg/scintillua/archive/" + scintillua_zip; gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip; lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip; @@ -75,11 +76,11 @@ let termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz; - get_scintilla = get_url scintilla_url "0rh1xgd06qcnj4l0vi8g4i94vi63s76366b8hhqky3iqdjgwsxpi"; + get_scintilla = get_url scintilla_url "0rkczxzj6bqxks4jcbxbyrarjhfjh95nwxxiqprfid1kaamgkfm2"; get_tre = get_url tre_url "0mw8npwk5nnhc33352j4akannhpx77kqvfam8jdq1n4yf8js1gi7"; get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi"; - get_scintillua = get_url scintillua_url "0fhyjrkfj2cvxnql65687nx1d0sfyg5lbrxmylyzhnfh4s4jnwmq"; - get_lua = get_url lua_url "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"; + get_scintillua = get_url scintillua_url "1kx113dpjby1p9jcsqlnlzwj01z94f9szw4b38077qav3bj4lk6g"; + get_lua = get_url lua_url "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi"; @@ -87,7 +88,7 @@ let get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy"; get_gtdialog = get_url gtdialog_url "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; get_cdk = get_url cdk_url "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; - get_bombay = get_url_zip bombay_url "05fnh1imxdb4sb076fzqywqszp31whdbkzmpkqxc8q2r1m5vj3hg" + get_bombay = get_url_zip bombay_url "0illabngrrxidkprgz268wgjqknrds34nhm6hav95xc1nmsdr6jj" + "mv tip.zip bombay.zip\n"; get_termkey = get_url termkey_url "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"; @@ -108,7 +109,7 @@ let + get_termkey; in stdenv.mkDerivation rec { - version = "9.0"; + version = "9.3"; name = "textadept-${version}"; buildInputs = [ @@ -118,7 +119,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = http://foicica.com/hg/textadept; rev = "textadept_${version}"; - sha256 = "1fkxblf2db4i0kbfww94xwps7nbn88qc4fwghrm4dcszcq32jlfi"; + sha256 = "18x79pazm86agn1khdxfnf87la6kli3xasi7dcjx7l6yyz19y14d"; }; preConfigure = '' diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 5f2fffa5f508..7e8a85cf48a6 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, qmakeHook +{ stdenv, fetchFromGitHub, pkgconfig, qmake , python, qtbase, qttools, zlib }: let # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; in stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "0.17.0"; + version = "1.0.1"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz"; - sha256 = "0c9gykxmq0sk0yyfdq81g9psd922scqzn5asskjydj84d80f5z7p"; + src = fetchFromGitHub { + owner = "bjorn"; + repo = "tiled"; + rev = "v${version}"; + sha256 = "062ja3j84v5s4qslp01gqif8c6i1klkkxpxyyrrvjhxmbyn6nmgd"; }; - nativeBuildInputs = [ pkgconfig qmakeHook ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ python qtbase qttools ]; enableParallelBuilding = true; @@ -26,6 +27,6 @@ in stdenv.mkDerivation rec { gpl2Plus # all the rest ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; + maintainers = [ maintainers.nckx ]; }; } diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix new file mode 100644 index 000000000000..442a2e2224e4 --- /dev/null +++ b/pkgs/applications/editors/typora/default.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, atk, cairo +, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }: + +stdenv.mkDerivation rec { + name = "typora-${version}"; + version = "0.9.29"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; + sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7"; + } + else + fetchurl { + url = "https://www.typora.io/linux/typora_${version}_i386.deb"; + sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659"; + } + ; + + rpath = stdenv.lib.makeLibraryPath [ + alsaLib + gnome2.GConf + gnome2.gtk + gnome2.gdk_pixbuf + gnome2.pango + expat + atk + nspr + nss + stdenv.cc.cc + glib + cairo + cups + dbus + udev + fontconfig + freetype + xorg.libX11 + xorg.libXi + xorg.libXext + xorg.libXtst + xorg.libXfixes + xorg.libXcursor + xorg.libXdamage + xorg.libXrender + xorg.libXrandr + xorg.libXcomposite + xorg.libxcb + xorg.libXScrnSaver + ]; + + + buildInputs = [ dpkg makeWrapper ]; + + unpackPhase = "true"; + installPhase = '' + mkdir -p $out + dpkg -x $src $out + cp -av $out/usr/* $out + rm $out/bin/typora + + # Otherwise it looks "suspicious" + chmod -R g-w $out + ''; + + postFixup = '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora" + + ln -s "$out/share/typora/Typora" "$out/bin/typora" + + # Fix the desktop link + substituteInPlace $out/share/applications/typora.desktop \ + --replace /usr/bin/ $out/bin/ \ + --replace /usr/share/ $out/share/ + + ''; + + meta = with stdenv.lib; { + description = "A minimal Markdown reading & writing app"; + homepage = "https://typora.io"; + license = licenses.free; + maintainers = with stdenv.lib.maintainers; [ jensbin ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} + diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 8c9a725ddd66..4eefb207fd75 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -2,11 +2,13 @@ # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; - url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?h=packages/vim?id=68f6d131750aa778807119e03eed70286a17b1cb; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb; 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/vis/default.nix b/pkgs/applications/editors/vis/default.nix index f6760895b572..291c7b1b412d 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,18 +1,15 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null -, version ? "2016-10-09" -, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1" -, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90" }: stdenv.mkDerivation rec { - name = "vis-unstable-${version}"; - inherit version; + name = "vis-${version}"; + version = "0.3"; src = fetchFromGitHub { - inherit sha256; - inherit rev; + rev = "v${version}"; + sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk"; repo = "vis"; owner = "martanne"; }; @@ -37,8 +34,8 @@ stdenv.mkDerivation rec { cp $desktopItem/share/applications/* $out/share/applications echo wrapping $out/bin/vis with runtime environment wrapProgram $out/bin/vis \ - --prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ + --prefix LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index a92f8633c3a8..18eb1803fd62 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,35 +1,38 @@ { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem, - makeWrapper, libXScrnSaver }: + makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.10.0"; - rev = "49129d126e2c3c5592cfc8a509d872067b69d262"; + version = "1.14.2"; channel = "stable"; - # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465): - # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${stdenv.system}; - sha256 = if stdenv.system == "i686-linux" then "14ip00ysnn6daw7ws3vgnhib18pi7r1z1szfr7s996awbq12ir3i" - else if stdenv.system == "x86_64-linux" then "1krrshsx2pjkr4pc1d6zad664f5khdbhwaq8lpx1aagxxd921mx6" - else if stdenv.system == "x86_64-darwin" then "1y574b4wpkk06a36clajx57ydj7a0scn2gms4070cqaf0afzy19f" - else throw "Unsupported system: ${stdenv.system}"; + sha256 = { + "i686-linux" = "0ladqwgy37imq957mmbdfslaxcnx8gcl9nb1q5p8r91vldvf31zd"; + "x86_64-linux" = "1nb9n6511v2p1nwcwh6kbpxgydfs66yn7q2nf1rmh42ha5yzqkja"; + "x86_64-darwin" = "0yk2yd8rzhmsh276xfgywp1gjjkvxypgnjhs8jaxvrgsj7aw1s39"; + }.${stdenv.system}; - urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; + archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; + + rpath = lib.concatStringsSep ":" [ + atomEnv.libPath + "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1" + "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1" + "$out/lib/vscode" + ]; - urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-${channel}-code_${version}-1488384152_i386.tar.gz" - else if stdenv.system == "x86_64-linux" then - urlBase + "code-${channel}-code_${version}-1488387854_amd64.tar.gz" - else if stdenv.system == "x86_64-darwin" then - urlBase + "VSCode-darwin-${channel}.zip" - else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - inherit version; src = fetchurl { - url = urlStr; + name = "VSCode_${version}_${plat}.${archive_fmt}"; + url = "https://vscode-update.azurewebsites.net/${version}/${plat}/${channel}"; inherit sha256; }; @@ -45,28 +48,30 @@ in buildInputs = if stdenv.system == "x86_64-darwin" then [ unzip makeWrapper libXScrnSaver ] - else [ makeWrapper libXScrnSaver ]; + else [ makeWrapper libXScrnSaver libxkbfile ]; - installPhase = '' - mkdir -p $out/lib/vscode $out/bin - cp -r ./* $out/lib/vscode - ln -s $out/lib/vscode/code $out/bin + installPhase = + if stdenv.system == "x86_64-darwin" then '' + mkdir -p $out/lib/vscode $out/bin + cp -r ./* $out/lib/vscode + ln -s $out/lib/vscode/Contents/Resources/app/bin/code $out/bin + '' else '' + mkdir -p $out/lib/vscode $out/bin + cp -r ./* $out/lib/vscode + ln -s $out/lib/vscode/bin/code $out/bin - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps - cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png - ''; + mkdir -p $out/share/pixmaps + cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png + ''; postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \ + --set-rpath "${rpath}" \ $out/lib/vscode/code - - wrapProgram $out/bin/code \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 004d11fe1575..10c2ab9ebf99 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: 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 requests2 python2Packages.qscintilla sip ]); + (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; @@ -25,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 2ee7f3bb160f..1a854a82bf07 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.4-6"; - sha256 = "1nm0hjijwhcp6rzcn7zksp2820dxvj4lmblj7kzpzd3s1ds09q0y"; + 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 58a88e896816..a9223749f399 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.7-6"; - sha256 = "17pc3xz8srb9g5a5gkk6q9sjiss77fgm0wxxfmb5qya4rqivjpzn"; + 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 a8d0d490f8bb..b1f64afd9aee 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -1,20 +1,18 @@ +# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. + {stdenv, fetchurl, python, boost, pkgconfig, imagemagick}: -let - - version = "0.9.14"; - -in - stdenv.mkDerivation rec { name = "pythonmagick-${version}"; + version = "0.9.16"; src = fetchurl { url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; - sha256 = "1flkdfi3c19wy2qcfzax1cqvmmri10rvmhc2y85gmagqvv01zz22"; + sha256 = "0vkgpmrdz530nyvmjahpdrvcj7fd7hvsp15d485hq6103qycisv8"; }; - buildInputs = [python boost pkgconfig imagemagick]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [python boost imagemagick]; meta = { homepage = http://www.imagemagick.org/script/api.php; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 2a78f509429e..dc974aed0571 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,15 +1,20 @@ { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper }: -stdenv.mkDerivation { - name = "ahoviewer-1.4.6"; + +stdenv.mkDerivation rec { + name = "ahoviewer-${version}"; + version = "1.4.8"; + src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; - rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa"; - sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb"; + rev = version; + sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl unrar libzip librsvg @@ -18,18 +23,21 @@ stdenv.mkDerivation { gst_all_1.gst-plugins-bad gst_all_1.gst-libav gst_all_1.gst-plugins-base ]; + postPatch = ''patchShebangs version.sh''; + postInstall = '' wrapProgram $out/bin/ahoviewer \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = { + + meta = with stdenv.lib; { homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = [ stdenv.lib.maintainers.skrzyp ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ]; + maintainers = [ maintainers.skrzyp ]; + license = licenses.mit; + platforms = platforms.allBut [ "darwin" "cygwin" ]; }; } diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 263c411a8dbf..848f132060fe 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, jre}: -stdenv.mkDerivation { - name = "alchemy-007"; +stdenv.mkDerivation rec { + name = "alchemy-${version}"; + version = "008"; + enableParallelBuilding = true; src = fetchurl { - url = http://al.chemy.org/files/Alchemy-007.tar.gz; - sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b"; + url = "http://al.chemy.org/files/Alchemy-${version}.tar.gz"; + sha256 = "0449bvdccgx1jqnws1bckzs4nv2d230523qs0jx015gi81s1q7li"; }; installPhase = '' @@ -20,7 +22,7 @@ stdenv.mkDerivation { chmod +x $out/bin/alchemy ''; - meta = { + meta = with stdenv.lib; { description = "Drawing application"; longDescription = '' Alchemy is an open drawing project aimed at exploring how we can sketch, @@ -31,8 +33,8 @@ stdenv.mkDerivation { an expanded range of ideas and possibilities in a serendipitous way. ''; homepage = http://al.chemy.org/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index a9b2eb1163af..9b1dd4c25aeb 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "apitrace-${version}"; - version = "7.1"; + version = "7.1-363-ge3509be1"; src = fetchFromGitHub { - sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a"; - rev = version; + sha256 = "1xbz6gwl7kqjm7jjy5gxkdxzrg93vj1a3l19ara7rni6dii0q136"; + rev = "e3509be175eda77749abffe051ed0d3eb5d14e72"; repo = "apitrace"; owner = "apitrace"; }; diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix new file mode 100644 index 000000000000..31ee0ff0d07b --- /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 000000000000..2131589339c0 --- /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/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index b89e18ed148c..9e0916bab9cf 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qmakeHook, makeWrapper }: +{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }: stdenv.mkDerivation { name = "awesomebump-4.0"; @@ -10,7 +10,8 @@ stdenv.mkDerivation { setSourceRoot = "sourceRoot=$(echo */Sources)"; - buildInputs = [ qtbase qmakeHook makeWrapper ]; + nativeBuildInputs = [ makeWrapper qmake ]; + buildInputs = [ qtbase ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix new file mode 100644 index 000000000000..a254993a016b --- /dev/null +++ b/pkgs/applications/graphics/c3d/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, cmake, itk }: + +stdenv.mkDerivation rec { + _name = "c3d"; + _version = "1.1.0"; + name = "${_name}-${_version}"; + + src = fetchgit { + url = "https://git.code.sf.net/p/c3d/git"; + rev = "3453f6133f0df831dcbb0d0cfbd8b26e121eb153"; + sha256 = "1xgbk20w22jwvf7pa0n4lcbyx35fq56zzlslj0nvcclh6vx0b4z8"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk ]; + + meta = with stdenv.lib; { + homepage = http://www.itksnap.org/c3d; + description = "Medical imaging processing tool"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 1a80c1466d46..8c1db9c039e7 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.3"; + 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 = "1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0"; + sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3"; }; buildInputs = diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index a8f38d61f9df..8d8e36a8bc89 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; - maintainers = with stdenv.lib.maintainers; [raskin urkud]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 00c0da7a78e3..96b1ca54d558 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper +{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -29,6 +29,7 @@ , libgphoto2 , libkipi , liblqr1 +, libqtav , libusb1 , marble , mysql @@ -43,7 +44,7 @@ , oxygen }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "digikam-${version}"; version = "5.4.0"; @@ -52,26 +53,11 @@ stdenv.mkDerivation rec { sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; }; - nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; patches = [ ./0001-Disable-fno-operator-names.patch ]; buildInputs = [ - qtbase - qtxmlpatterns - qtsvg - qtwebkit - - kconfigwidgets - kcoreaddons - kdoctools - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui - bison boost eigen @@ -83,13 +69,30 @@ stdenv.mkDerivation rec { libgphoto2 libkipi liblqr1 + libqtav libusb1 - marble.unwrapped mysql opencv - threadweaver + ]; + propagatedBuildInputs = [ + qtbase + qtxmlpatterns + qtsvg + qtwebkit + + kconfigwidgets + kcoreaddons + kfilemetadata + knotifications + knotifyconfig + ktextwidgets + kwidgetsaddons + kxmlgui + + marble oxygen + threadweaver ]; enableParallelBuilding = true; @@ -99,24 +102,21 @@ stdenv.mkDerivation rec { "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" + "-DENABLE_MEDIAPLAYER=1" ]; - fixupPhase = '' + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" - - wrapQtProgram $out/bin/digikam \ - --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin" - - wrapQtProgram $out/bin/showfoto ''; - meta = { + meta = with lib; { description = "Photo Management Program"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ the-kenny ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix new file mode 100644 index 000000000000..80d2b2903678 --- /dev/null +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -0,0 +1,57 @@ +{buildPythonPackage, stdenv, fetchurl, pkgconfig + , libXext, libXxf86vm, libX11, libXrandr, libXinerama + , argyllcms, wxPython, numpy + }: +buildPythonPackage { + name = "displaycal-3.2.4.0"; + + enableParallelBuilding = true; + + src = fetchurl { + url = mirror://sourceforge/project/dispcalgui/release/3.2.4.0/DisplayCAL-3.2.4.0.tar.gz; + sha256 = "0swkhv338d1kmfxyf30zzdjs5xpbha40pg2zysiipcbasc0xhlb8"; + }; + + propagatedBuildInputs = [ + libXext + libXxf86vm + libX11 + libXrandr + libXinerama + argyllcms + wxPython + numpy + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + preConfigure = '' + mkdir dist + cp {misc,dist}/DisplayCAL.appdata.xml + mkdir -p $out + ln -s $out/share/DisplayCAL $out/Resources + ''; + + # no idea why it looks there - symlink .json lang (everything) + postInstall = '' + for x in $out/share/DisplayCAL/*; do + ln -s $x $out/lib/python2.7/site-packages/DisplayCAL + done + + for prog in "$out/bin/"*; do + wrapProgram "$prog" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : ${argyllcms}/bin + done + ''; + + meta = { + description = "Display Calibration and Characterization powered by Argyll CMS"; + homepage = http://displaycal.net/; + license = stdenv.lib.licenses.gpl3; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 2276b868b59a..2b0dde210c58 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }: +{ stdenv, fetchurl, pkgconfig +, djvulibre, qt4, xorg, libtiff +, darwin }: -let - qt = qt4; - # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error -in stdenv.mkDerivation rec { - name = "djview-4.10.5"; + name = "djview-${version}"; + version = "4.10.6"; + src = fetchurl { url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0"; + sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ djvulibre qt xorg.libXt libtiff ]; + buildInputs = [ djvulibre qt4 xorg.libXt libtiff ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://djvu.sourceforge.net/djview4.html; description = "A portable DjVu viewer and browser plugin"; license = licenses.gpl2; - inherit (qt.meta) platforms; - maintainers = [ maintainers.urkud ]; + platforms = platforms.unix; + maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix new file mode 100644 index 000000000000..a1cf91989ebe --- /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 75033cf0f9d6..d06c3eb5ec13 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler }: +, epoxy, poppler, lirc }: stdenv.mkDerivation rec { - name = "fbida-2.12"; + name = "fbida-2.13"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk"; + sha256 = "01yv4qqqfbz9v281y2jlxhxdym3ricyb0zkqkgp5b40qrmfik1x8"; }; nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff - libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler ]; + libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; makeFlags = [ "prefix=$(out)" "verbose=yes" ]; @@ -21,12 +21,6 @@ stdenv.mkDerivation rec { sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile ''; - configurePhase = "make config $makeFlags"; - - 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 5b385f2acbf1..5de8e7892abe 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, makeWrapper, xorg, imlib2, libjpeg, libpng +{ stdenv, fetchurl, makeWrapper +, xorg, imlib2, libjpeg, libpng , curl, libexif, perlPackages }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "feh-2.18.1"; + name = "feh-${version}"; + version = "2.19"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c"; + sha256 = "1sfhr6628xpj9p6bqihdq35y139x2gmrpydjlrwsl1rs77c2bgnf"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ] - ++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; + ++ optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; @@ -20,21 +24,29 @@ stdenv.mkDerivation rec { makeFlags="PREFIX=$out exif=1" ''; + postBuild = '' + pushd man + make + popd + ''; + postInstall = '' wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ --add-flags '--theme=feh' + install -D -m 644 man/*.1 $out/share/man/man1 ''; checkPhase = '' PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test ''; + doCheck = true; meta = { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index fc30a3559105..ced6a5f7258a 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "fontmatrix-0.6.0"; - src = fetchurl { - url = "http://fontmatrix.be/archives/${name}-Source.tar.gz"; - sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c"; + name = "fontmatrix-${version}"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fontmatrix"; + repo = "fontmatrix"; + rev = "v${version}"; + sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; }; buildInputs = [ qt4 ]; @@ -13,10 +17,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; - homepage = http://fontmatrix.be/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + homepage = http://github.com/fontmatrix/fontmatrix; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 8c430435dd7a..47004a025009 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -8,7 +8,7 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.8.20"; + version = "2.8.22"; # This declarations for `gimp-with-plugins` wrapper, # (used for determining $out/lib/gimp/${majorVersion}/ paths) @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805"; + sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"; }; buildInputs = diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 20a9648e8395..6b145ca09ee6 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,7 +5,7 @@ { pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig glib fetchFromGitHub; + inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub; inherit (gimp) targetPluginDir targetScriptDir; pluginDerivation = a: stdenv.mkDerivation ({ @@ -23,7 +23,11 @@ let } // a # don't call this gimp-* unless you want nix replace gimp by a plugin :-) - // { name = "${a.name}-${gimp.name}-plugin"; } + // { + name = "${a.name}-${gimp.name}-plugin"; + buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); + nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); + } ); scriptDerivation = {name, src} : pluginDerivation { @@ -34,7 +38,6 @@ let libLQR = pluginDerivation { name = "liblqr-1-0.4.1"; # required by lqrPlugin, you don't havet to install this lib explicitely - buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2; sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; @@ -48,7 +51,6 @@ rec { Video */ name = "gap-2.6.0"; - buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; @@ -73,7 +75,7 @@ rec { Filters/Generic/FFT Inverse */ name = "fourier-0.4.1"; - buildInputs = [ gimp pkgs.fftw pkgconfig glib] ++ gimp.nativeBuildInputs; + buildInputs = with pkgs; [ fftw ]; postInstall = "fail"; installPhase = "installPlugins fourier"; src = fetchurl { @@ -87,7 +89,7 @@ rec { Blur/Focus Blur */ name = "focusblur-3.2.6"; - buildInputs = [ gimp pkgconfig pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs; + buildInputs = with pkgs; [ fftwSinglePrec ]; patches = [ ./patches/focusblur-glib.patch ]; postInstall = "fail"; installPhase = "installPlugins src/focusblur"; @@ -105,7 +107,7 @@ rec { Filters/Enhance/Smart remove selection */ name = "resynthesizer-0.16"; - buildInputs = [ gimp pkgs.fftw ] ++ gimp.nativeBuildInputs; + buildInputs = with pkgs; [ fftw ]; src = fetchurl { url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz; sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x"; @@ -125,8 +127,8 @@ rec { Filters/Enhance/Smart remove selection */ name = "resynthesizer-2.0.1"; - buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] - ++ gimp.nativeBuildInputs; + buildInputs = with pkgs; [ fftw ]; + nativeBuildInputs = with pkgs; [ autoreconfHook ]; makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/"; src = fetchFromGitHub { owner = "bootchk"; @@ -138,11 +140,11 @@ rec { texturize = pluginDerivation { name = "texturize-2.1"; - buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz; sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; }; + buildInputs = with pkgs; [ perl ]; patchPhase = '' sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c* ''; @@ -154,7 +156,6 @@ rec { Filters/Enhance/Wavelet sharpen */ name = "wavelet-sharpen-0.1.2"; - buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; @@ -167,7 +168,7 @@ rec { Layer/Liquid Rescale */ name = "lqr-plugin-0.6.1"; - buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs; + buildInputs = with pkgs; [ libLQR ]; src = fetchurl { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; @@ -180,8 +181,7 @@ rec { pluginDerivation rec { inherit (pkgs.gmic) name src meta; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pkgs.fftw pkgs.opencv gimp ] ++ gimp.nativeBuildInputs; + buildInputs = with pkgs; [ fftw opencv curl ]; sourceRoot = "${name}/src"; @@ -195,7 +195,7 @@ rec { # or use the binary ufraw = pluginDerivation rec { name = "ufraw-0.19.2"; - buildInputs = [pkgs.gtkimageview pkgs.lcms gimp] ++ gimp.nativeBuildInputs; + buildInputs = with pkgs; [ gtkimageview lcms ]; # --enable-mime - install mime files, see README for more information # --enable-extras - build extra (dcraw, nikon-curve) executables # --enable-dst-correction - enable DST correction for file timestamps. @@ -228,7 +228,7 @@ rec { sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz"; }; - buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ]; + buildInputs = with pkgs; [ lensfun exiv2 ]; installPhase = " installPlugins gimp-lensfun diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index cf1ab1942e58..6dcf8223777a 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3 +{ stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book , intltool, itstool, makeWrapper, pkgconfig, which }: stdenv.mkDerivation rec { name = "glabels-${version}"; - version = "3.2.1"; - src = fetchFromGitHub { - owner = "jimevins"; - repo = "glabels"; - rev = "glabels-3_2_1"; - sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg"; + version = "3.4.0"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; + sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ - autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools + barcode gtk3 gtk_doc gnome3.yelp_tools gnome3.gnome_common gnome3.gsettings_desktop_schemas - intltool itstool libxml2 librsvg libe-book libtool - makeWrapper pkgconfig + itstool libxml2 librsvg libe-book libtool + ]; preFixup = '' @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - preConfigure = "./autogen.sh"; - meta = { description = "Create labels and business cards"; homepage = http://glabels.org/; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f655979c2ccc..c8c9ac8f26ef 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,46 +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"; - }) ]; configureFlags = [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 8aa2cf8f9f13..93894d0c6cb8 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "gthumb"; - version = "${major}.4"; - major = "3.4"; + version = "${major}.1"; + major = "3.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "154bdc8c1940209f1e3d9c60184efef45b0d24f5f7f7f59b819e9c08e19c2981"; + sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix new file mode 100644 index 000000000000..c96ddc987954 --- /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/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix new file mode 100644 index 000000000000..673361c734e1 --- /dev/null +++ b/pkgs/applications/graphics/imagej/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, jre, unzip, makeWrapper }: + +# Note: +# - User config dir is hard coded by upstream to $HOME/.imagej on linux systems +# and to $HOME/Library/Preferences on macOS. +# (The current trend appears to be to use $HOME/.config/imagej +# on linux systems, but we here do not attempt to fix it.) + +let + imagej150 = stdenv.mkDerivation rec { + name = "imagej-${version}"; + version = "150"; + + src = fetchurl { + url = "http://wsr.imagej.net/distros/cross-platform/ij150.zip"; + sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; + }; + buildInputs = [ unzip makeWrapper ]; + inherit jre; + + # JAR files that are intended to be used by other packages + # should go to $out/share/java. + # (Some uses ij.jar as a library not as a standalone program.) + installPhase = '' + mkdir -p $out/share/java + # Read permisssion suffices for the jar and others. + # Simple cp shall clear suid bits, if any. + cp ij.jar $out/share/java + cp -dR luts macros plugins $out/share + mkdir $out/bin + makeWrapper ${jre}/bin/java $out/bin/imagej \ + --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" + ''; + meta = with stdenv.lib; { + homepage = https://imagej.nih.gov/ij/; + description = "Image processing and analysis in Java"; + longDescription = '' + ImageJ is a public domain Java image processing program + inspired by NIH Image for the Macintosh. + It runs on any computer with a Java 1.4 or later virtual machine. + ''; + license = licenses.publicDomain; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ yuriaisaka ]; + }; + }; +in + imagej150 diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 2ab918e99b6a..f48ce6a4ce44 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,7 +2,7 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, automake114x, cmake +, libvisio, libcdr, libexif, automake114x, potrace, cmake }: let @@ -26,17 +26,18 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct - ''; - # Python is used at run-time to execute scripts, e.g., those from - # the "Effects" menu. - propagatedBuildInputs = [ python2Env ]; + # Python is used at run-time to execute scripts, e.g., those from + # the "Effects" menu. + substituteInPlace src/extension/implementation/script.cpp \ + --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' + ''; buildInputs = [ pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif automake114x cmake + libvisio libcdr libexif automake114x potrace cmake python2Env ]; enableParallelBuilding = true; @@ -44,6 +45,9 @@ stdenv.mkDerivation rec { postInstall = '' # Make sure PyXML modules can be found at run-time. rm "$out/share/icons/hicolor/icon-theme.cache" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape + install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 4a99d0ea4a17..2b1b1f8da8a6 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript +{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, qtbase -, makeQtWrapper }: stdenv.mkDerivation rec { @@ -28,14 +27,14 @@ stdenv.mkDerivation rec { LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript + libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript ]; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; postFixup = '' for prog in $out/bin/*; do - wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin" + wrapProgram "$prog" --prefix PATH : "${texlive}/bin" done ''; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 5bb577011e71..b7063a0c4e7f 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; name = "jpegoptim-${version}"; src = fetchurl { url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; - sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93"; + sha256 = "1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849"; }; # There are no checks, it seems. @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; - meta = { + meta = with stdenv.lib; { description = "Optimize JPEG files"; homepage = http://www.kokkonen.net/tjko/projects.html ; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.aristid ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = [ maintainers.aristid ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index dcd5c28172e4..ccac9dd0ed19 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,45 +1,45 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, makeQtWrapper +{ 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 }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "krita-${version}"; - ver_min = "3.1.2"; - version = "${ver_min}.1"; + version = "3.1.4"; src = fetchurl { - url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz"; - sha256 = "934ed82c3f4e55e7819b327c838ea2f307d3bf3d040722501378b01d76a3992d"; + url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; + sha256 = "1al27v17s70hihk2mcmz3l2g6rl9qzpxaifapdfpkyias6q3f63l"; }; - nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ 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 + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/KDE/krita/commit/2f59d0d1.patch"; + sha256 = "0sdlcjn6i3faln3c0aczw3pg4pvmccgszmy8n914mgsccrqrazlr"; + }) ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; - enableParallelBuilding = true; - - postInstall = '' - for i in $out/bin/*; do - wrapQtProgram "$i" - done - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "A free an open source painting application"; homepage = "https://krita.org/"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; - licenses = licenses.gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 96384765bd03..5f27cb446994 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -3,22 +3,22 @@ To use aditional parts libraries set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ */ -{ stdenv, fetchsvn, qt4, qmake4Hook, zlib }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "0.81"; + version = "17.02"; - src = fetchsvn { - url = "http://svn.leocad.org/tags/${name}"; - sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8"; + src = fetchFromGitHub { + owner = "leozide"; + repo = "leocad"; + rev = "v${version}"; + sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; }; - buildInputs = [ qt4 qmake4Hook zlib ]; - + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 zlib ]; postPatch = '' - sed '1i#include ' -i common/camera.cpp - substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan(" export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" ''; diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix new file mode 100644 index 000000000000..1b5fbc2271b5 --- /dev/null +++ b/pkgs/applications/graphics/meh/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: + +stdenv.mkDerivation rec { + name = "meh-unstable-2015-04-11"; + + src = fetchFromGitHub { + owner = "jhawthorn"; + repo = "meh"; + rev = "4ab1c75f97cb70543db388b3ed99bcfb7e94c758"; + sha256 = "1j1n3m9hjhz4faryai97jq7cr6a322cqrd878gpkm9nrikap3bkk"; + }; + + installPhase = '' + make PREFIX=$out install + ''; + + outputs = [ "out" "doc" ]; + + buildInputs = [ libXext libX11 libjpeg libpng giflib ]; + + meta = { + description = "A minimal image viewer using raw XLib"; + homepage = http://www.johnhawthorn.com/meh/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 1b082de98bc7..0ca997adb783 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, file, pkgconfig, libpng, nasm }: stdenv.mkDerivation rec { - version = "3.1"; + version = "3.2"; name = "mozjpeg-${version}"; src = fetchurl { url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz"; - sha256 = "07vs0xq9di7bv3y68daig8dvxvjqrn8a5na702gj3nn58a1xivfy"; + sha256 = "0wvv5qh1jasz8apq93c3j9d5wd22j7lld9dr06p76yj4mpnc3v4a"; }; postPatch = '' diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index db5e6e1a7e37..630834fc9e99 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/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix new file mode 100644 index 000000000000..669e46c6a842 --- /dev/null +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, pkgconfig +, wrapGAppsHook +, gsettings_desktop_schemas + +, qtbase +, qttools +, qtsvg + +, exiv2 +, opencv +, libraw +, libtiff +, quazip +}: + +stdenv.mkDerivation rec { + version = "3.6.1"; + src = fetchFromGitHub { + owner = "nomacs"; + repo = "nomacs"; + rev = version; + sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; + }; + + name = "nomacs-${version}"; + + enableParallelBuilding = true; + + sourceRoot = "${name}-src/ImageLounge"; + + patches = [./fix-appdata-install.patch]; + + nativeBuildInputs = [cmake + pkgconfig + wrapGAppsHook]; + + buildInputs = [qtbase + qttools + qtsvg + exiv2 + opencv + libraw + libtiff + quazip + gsettings_desktop_schemas]; + + cmakeFlags = ["-DENABLE_OPENCV=ON" + "-DENABLE_RAW=ON" + "-DENABLE_TIFF=ON" + "-DENABLE_QUAZIP=ON" + "-DUSE_SYSTEM_QUAZIP=ON"]; + + meta = with stdenv.lib; { + homepage = https://nomacs.org; + description = "Qt-based image viewer"; + maintainers = [maintainers.ahmedtd]; + license = licenses.gpl3Plus; + repositories.git = https://github.com/nomacs/nomacs.git; + inherit (qtbase.meta) platforms; + }; +} diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch new file mode 100644 index 000000000000..cdeed56f496d --- /dev/null +++ b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake +index 3521056a..34f99ed9 100644 +--- a/cmake/UnixBuildTarget.cmake ++++ b/cmake/UnixBuildTarget.cmake +@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) + # manpage + install(FILES Readme/nomacs.1 DESTINATION share/man/man1) + # appdata +-install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/) ++install(FILES nomacs.appdata.xml DESTINATION share/appdata/) + + # "make dist" target + string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME) diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 3ec25b503ebf..ac67759c258c 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { - name = "ocrad-0.25"; + name = "ocrad-0.26"; src = fetchurl { url = "mirror://gnu/ocrad/${name}.tar.lz"; - sha256 = "1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477"; + sha256 = "0g4fq7maybdnd1471kd05a3f5sb7spa3d26k706rk85sd5wd70y3"; }; buildInputs = [ lzip texinfo ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index d16800dc881d..44faeea007d6 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff +{ stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff , opencolorio, openexr, unzip }: stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.6.11"; + version = "1.7.12"; - src = fetchurl { - url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x"; + src = fetchFromGitHub { + owner = "OpenImageIO"; + repo = "oiio"; + rev = "Release-${version}"; + sha256 = "1ganx4f7zis5lkxxrwc83dbgngaxww2846bsc4vrg5dhjnns6n4y"; }; outputs = [ "bin" "out" "dev" "doc" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr + boost ilmbase libjpeg libpng + libtiff opencolorio openexr unzip ]; diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 5bf6907744ad..894667597d85 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,25 +1,26 @@ -{stdenv, fetchgit, flex, bison, cmake, git, zlib}: +{stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: stdenv.mkDerivation rec { - version = "2016-05-19"; + version = "2017-01-12"; name = "pbrt-v3-${version}"; - src = fetchgit { - url = "https://github.com/mmp/pbrt-v3.git"; - rev = "638249e5cf4596e129695c8df8525d43f11573ff"; - sha256 = "10ykqrg4zcfb4sfsg3z793c6vld6b6g8bzfyk7ya3yvvc9sdlr5g"; - }; - fetchSubmodules = true; + src = fetchFromGitHub { + rev = "35b6da3429526f2026fe5e5ebaf36d593e113028"; + owner = "mmp"; + repo = "pbrt-v3"; + sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7"; + fetchSubmodules = true; + }; buildInputs = [ git flex bison cmake zlib ]; - meta = { + meta = with stdenv.lib; { homepage = "http://pbrt.org"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; - platforms = stdenv.lib.platforms.linux ; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.juliendehos ]; + platforms = platforms.linux ; + license = licenses.bsd2; + maintainers = [ maintainers.juliendehos ]; priority = 10; }; } diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index f9b24581929a..d6bcdee41375 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick +{ stdenv, fetchurl, cmake, exiv2, graphicsmagick , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools }: @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ - cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick + qtbase qtquickcontrols qttools exiv2 graphicsmagick qtmultimedia qtdeclarative ]; @@ -21,10 +22,6 @@ stdenv.mkDerivation rec { export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; - postInstall = '' - wrapQtProgram $out/bin/photoqt - ''; - meta = { homepage = "http://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 4782376d1e0b..8ce9d407aade 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qmakeHook, exiv2 }: +{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: stdenv.mkDerivation rec { name = "phototonic-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase exiv2 ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; preConfigure = '' sed -i 's;/usr;$$PREFIX/;g' phototonic.pro diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 3cc5fe6fdd28..82fa4d5ee95b 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { name = "potrace-${version}"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; - sha256 = "115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2"; + sha256 = "0znr9i0ljb818qiwm22zw63g11a4v08gc5xkh0wbdp6g259vcwnv"; }; configureFlags = [ "--with-libpotrace" ]; buildInputs = [ zlib ]; - meta = { + meta = with stdenv.lib; { homepage = http://potrace.sourceforge.net/; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.pSub ]; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.pSub ]; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 25c6fc36c6c9..7e375367a2d2 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } : +{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk2 } : stdenv.mkDerivation (rec { - name = "pqiv-0.12"; + name = "pqiv-${version}"; + version = "2.9"; - src = fetchurl { - url = "https://github.com/downloads/phillipberndt/pqiv/${name}.tbz"; - sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e"; + src = fetchFromGitHub { + owner = "phillipberndt"; + repo = "pqiv"; + rev = version; + sha256 = "1xncf6aq52zpxpmz3ikmlkinz7y3nmbpgfxjb7q40sqs00n0mfsd"; }; - buildInputs = [ getopt which pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ getopt which gtk2 ]; - preConfigure='' - substituteInPlace configure --replace /bin/bash "$shell" - sed -i -e 's|$(tempfile -s.*)|temp.c|' -e 's|tempfile|mktemp|' configure - ''; + prePatch = "patchShebangs ."; - unpackCmd = '' - tar -xf ${src} - ''; - - meta = { + meta = with stdenv.lib; { description = "Rewrite of qiv (quick image viewer)"; homepage = http://www.pberndt.com/Programme/Linux/pqiv; + license = licenses.gpl3; + maintainers = [ maintainers.ndowens ]; + platforms = platforms.unix; }; }) diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 55c083ba71f3..451eaae79b2e 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,23 +1,33 @@ -{ stdenv, fetchgit, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmakeHook, mesa_glu +{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline +, qtbase, qmake, mesa_glu }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.8"; name = "rapcad-${version}"; - src = fetchgit { - url = "https://github.com/GilesBathgate/RapCAD.git"; - rev = "refs/tags/v${version}"; - sha256 = "1i5h4sw7mdbpdbssmbjccwgidndrsc606zz4wy9pjsg2wzrabw7x"; + src = fetchFromGitHub { + owner = "gilesbathgate"; + repo = "rapcad"; + rev = "v${version}"; + sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir"; }; - buildInputs = [ qtbase qmakeHook cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; + patches = [ + (fetchurl { + url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch"; + sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj"; + name = "disable-QVector-qHash.patch"; + }) + ]; - meta = { - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; + + meta = with stdenv.lib; { + license = licenses.gpl3; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; description = ''Constructive solid geometry package''; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 53fdc67cf242..97d04b036228 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; - rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2"; - sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s"; + rev = version + "-gtk3"; + sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q"; }; buildInputs = [ - pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx + pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx ]; + nativeBuildInputs = [ wrapGAppsHook ]; + cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" ]; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix new file mode 100644 index 000000000000..d69f9a676c1b --- /dev/null +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +, qtbase, qtx11extras, vulkan-loader, xorg +}: + +stdenv.mkDerivation rec { + name = "renderdoc-${version}"; + version = "0.34pre"; + + src = fetchFromGitHub { + owner = "baldurk"; + repo = "renderdoc"; + rev = "5e2717daec53e5b51517d3231fb6120bebbe6b7a"; + sha256 = "1zpvjvsj5c441kyjpmd2d2r0ykb190rbq474nkmp1jk72cggnpq0"; + }; + + buildInputs = [ + qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader + ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + + cmakeFlags = [ + "-DBUILD_VERSION_HASH=${src.rev}-distro-nix" + # TODO: use this instead of preConfigure once placeholders land + #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/" + ]; + preConfigure = '' + cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" + ''; + preFixup = '' + mkdir $out/bin/.bin + mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc + ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc + wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib + mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd + ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd + wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A single-frame graphics debugger"; + homepage = https://renderdoc.org/; + license = licenses.mit; + longDescription = '' + RenderDoc is a free MIT licensed stand-alone graphics debugger that + allows quick and easy single-frame capture and detailed introspection + of any application using Vulkan, D3D11, OpenGL or D3D12 across + Windows 7 - 10, Linux or Android. + ''; + maintainers = [maintainers.jansol]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index d645a15b02ea..e97278148f99 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -48,4 +48,8 @@ stdenv.mkDerivation { ''; buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ]; + + meta = { + broken = true; + }; } diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 8cd1a04e977d..3f31b86fe492 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; - major = "0.25"; - minor = "90"; + major = "0.26"; + minor = "2"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "1xlywhwr27n2q7xid19zzgf6rmmiyf4jq62rxn2af2as8rpkf1pm"; + sha256 = "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; @@ -24,11 +24,13 @@ stdenv.mkDerivation rec { patchShebangs . ''; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk - pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee + gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev libgudev gnome3.gexiv2 hicolor_icon_theme libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr + gnome_doc_utils gnome3.rest gnome3.gcr gnome3.defaultIconTheme itstool libgdata ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 8a24eab22007..0c800ce98593 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -29,6 +29,17 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/icons mv $out/share/simple-scan/icons/* $out/share/icons/ + ( + cd ${gnome3.defaultIconTheme}/share/icons/Adwaita + for f in `find . | grep 'scanner\.'` + do + local outFile="`echo "$out/share/icons/hicolor/$f" | sed \ + -e 's#/devices/#/apps/#g' \ + -e 's#scanner\.#simple-scan\.#g'`" + mkdir -p "`realpath -m "$outFile/.."`" + cp "$f" "$outFile" + done + ) ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index ab5a81d6add6..9026fc5d7cbb 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,38 +1,46 @@ -{ stdenv, fetchgit, autoreconfHook, fltk13 -, libjpeg, libpng, mesa, pkgconfig }: - -stdenv.mkDerivation { - name = "solvespace-2.0"; +{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype +, json_c, fontconfig, gtkmm2, pangomm, glew, mesa_glu, xlibs, pcre +}: +stdenv.mkDerivation rec { + name = "solvespace-2.3-20170416"; + rev = "b1d87bf284b32e875c8edba592113e691ea10bcd"; src = fetchgit { - url = "https://github.com/jwesthues/solvespace.git"; - sha256 = "0m6zlx1kiqxkm6szdsnywwr6spnb7xjg6vqsq30nrr44cx37w861"; - rev = "e587d0e"; + url = https://github.com/solvespace/solvespace; + inherit rev; + sha256 = "160qam04pfrwkh9qskfmjkj01wrjwhl09xi6jjxi009yqg3cff9l"; + fetchSubmodules = true; }; - # Fixup build after glibc-2.25. - postPatch = '' - sed 's/\/CHARWIDTH/g' \ - -i src/{fltk/fltkmain.cpp,glhelper.cpp,textwin.cpp,toolbar.cpp,ui.h} + buildInputs = [ + cmake pkgconfig zlib libpng cairo freetype + json_c fontconfig gtkmm2 pangomm glew mesa_glu + xlibs.libpthreadstubs xlibs.libXdmcp pcre + ]; + enableParallelBuilding = true; + + preConfigure = '' + patch CMakeLists.txt <&2 + exit 1 + fi + ''; + + meta = { + description = "OCR engine"; + homepage = http://code.google.com/p/tesseract-ocr/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 1f1da9a389f2..a5643da8c3a8 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, leptonica, libpng, libtiff -, icu, pango, opencl-headers +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, leptonica, libpng, libtiff, icu, pango, opencl-headers + +# Supported list of languages or `null' for all available languages +, enableLanguages ? null }: stdenv.mkDerivation rec { name = "tesseract-${version}"; - version = "3.04.01"; + version = "3.05.00"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv"; + sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; }; tessdata = fetchFromGitHub { @@ -20,18 +23,41 @@ stdenv.mkDerivation rec { sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; - postInstall = "cp -Rt \"$out/share/tessdata\" \"$tessdata/\"*"; + # Copy the .traineddata files of the languages specified in enableLanguages + # into `$out/share/tessdata' and check afterwards if copying was successful. + postInstall = let + mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}"; + mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg; + findLangArgs = if enableLanguages != null + then "\\( ${mkFindArgs enableLanguages} \\)" + else "-iname '*.traineddata'"; + in '' + numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \ + ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)" + + ${if enableLanguages != null then '' + expected=${toString (builtins.length enableLanguages)} + '' else '' + expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)" + ''} + + if [ "$numLangs" -ne "$expected" ]; then + echo "Expected $expected languages, but $numLangs" \ + "were copied to \`$out/share/tessdata'" >&2 + exit 1 + fi + ''; meta = { description = "OCR engine"; homepage = http://code.google.com/p/tesseract-ocr/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix new file mode 100644 index 000000000000..b4ddb1436856 --- /dev/null +++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: + +stdenv.mkDerivation rec { + name = "timelapse-deflicker-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "cyberang3l"; + repo = "timelapse-deflicker"; + rev = "v${version}"; + sha256 = "0bbfnrdycrpyz7rqrql5ib9qszny7z5xpqp65c1mxqd2876gv960"; + }; + + installPhase = '' + install -m755 -D timelapse-deflicker.pl $out/bin/timelapse-deflicker + wrapProgram $out/bin/timelapse-deflicker --set PERL5LIB $PERL5LIB + ''; + + buildInputs = with perlPackages; [ + makeWrapper perl + PerlMagick TermProgressBar ImageExifTool + FileType ClassMethodMaker + ]; + + meta = with stdenv.lib; { + description = "Simple script to deflicker images taken for timelapses"; + homepage = https://github.com/cyberang3l/timelapse-deflicker; + license = licenses.gpl3; + maintainers = with maintainers; [ valeriangalliat ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 1bb57538cd5f..dc896e0b0d9b 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -51,20 +51,30 @@ in ]; unpackPhase = '' + runHook preUnpack + cp $src extractor.run chmod +x extractor.run ./extractor.run --target $sourceRoot + + runHook postUnpack ''; patchPhase = '' + runHook prePatch + # Patch ELF files. elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1) for elf in $elfs; do patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true done + + runHook postPatch ''; installPhase = '' + runHook preInstall + instdir=$out/${instPath} # Install executables and libraries @@ -86,6 +96,8 @@ in wrapProgram $out/bin/valley \ --run "cd $instdir" \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath + + runHook postInstall ''; stripDebugList = ["${instPath}/bin"]; diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 39db1dd1f6d8..023008183ffb 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -68,5 +68,6 @@ python3Packages.buildPythonApplication rec { description = "An image viewer with Vim-like keybindings"; license = lib.licenses.mit; platforms = lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index d97a970df2a5..9af46f5cb358 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.16.2.1"; + version = "3.17"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27"; + sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 830c9e6899ea..3f410b7b8b91 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -1,11 +1,11 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, - akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine, - akonadi + akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes, + kio, kitemmodels, kmime, ktextwidgets, qtwebengine, }: -kdeApp { +mkDerivation { name = "akonadi-contacts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; @@ -13,7 +13,9 @@ kdeApp { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine + akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio + kitemmodels kmime ktextwidgets qtwebengine ]; propagatedBuildInputs = [ akonadi ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index ba4b4b50242c..98a341da6b68 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,15 +1,18 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, - akonadi, kdbusaddons, kio, kitemmodels, kmime + akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime, + shared_mime_info }: -kdeApp { +mkDerivation { name = "akonadi-mime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ]; + buildInputs = [ akonadi shared_mime_info + kdbusaddons ki18n kio kitemmodels kmime ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix deleted file mode 100644 index 284ed60a9cbd..000000000000 --- a/pkgs/applications/kde/akonadi.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - kdeApp, lib, - extra-cmake-modules, - kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, - kio, - boost, kitemmodels -}: - -kdeApp { - name = "akonadi"; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio - ]; - propagatedBuildInputs = [ boost kitemmodels ]; -} diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch new file mode 100644 index 000000000000..f1ae1f23cc95 --- /dev/null +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -0,0 +1,191 @@ +Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp +@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett + // determine default settings depending on the driver + QString defaultHostName; + QString defaultOptions; +- QString defaultServerPath; + QString defaultCleanShutdownCommand; + + #ifndef Q_OS_WIN +@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett + #endif + + const bool defaultInternalServer = true; +-#ifdef MYSQLD_EXECUTABLE +- if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) { +- defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE); +- } +-#endif +- const QStringList mysqldSearchPath = QStringList() +- << QStringLiteral("/usr/bin") +- << QStringLiteral("/usr/sbin") +- << QStringLiteral("/usr/local/sbin") +- << QStringLiteral("/usr/local/libexec") +- << QStringLiteral("/usr/libexec") +- << QStringLiteral("/opt/mysql/libexec") +- << QStringLiteral("/opt/local/lib/mysql5/bin") +- << QStringLiteral("/opt/mysql/sbin"); +- if (defaultServerPath.isEmpty()) { +- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath); +- } + +- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); ++ const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN); + if (!mysqladminPath.isEmpty()) { + #ifndef Q_OS_WIN + defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") +@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett + #endif + } + +- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath); ++ mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); + qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; + +- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath); ++ mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK); + qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; + + mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); +@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett + mUserName = settings.value(QStringLiteral("User")).toString(); + mPassword = settings.value(QStringLiteral("Password")).toString(); + mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); +- mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString(); ++ mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD); + mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); + settings.endGroup(); + +@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett + // intentionally not namespaced as we are the only one in this db instance when using internal mode + mDatabaseName = QStringLiteral("akonadi"); + } +- if (mInternalServer && (mMysqldPath.isEmpty() || !QFile::exists(mMysqldPath))) { +- mMysqldPath = defaultServerPath; +- } + + qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; + +@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett + settings.setValue(QStringLiteral("Name"), mDatabaseName); + settings.setValue(QStringLiteral("Host"), mHostName); + settings.setValue(QStringLiteral("Options"), mConnectionOptions); +- if (!mMysqldPath.isEmpty()) { +- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath); +- } + settings.setValue(QStringLiteral("StartServer"), mInternalServer); + settings.endGroup(); + settings.sync(); +@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer( + #endif + + // generate config file +- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); ++ const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); + const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf")); + const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); + if (globalConfig.isEmpty()) { +Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp +=================================================================== +--- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp ++++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp +@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings + // determine default settings depending on the driver + QString defaultHostName; + QString defaultOptions; +- QString defaultServerPath; + QString defaultInitDbPath; + QString defaultPgData; + +@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings + + mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); + if (mInternalServer) { +- QStringList postgresSearchPath; +- +-#ifdef POSTGRES_PATH +- const QString dir(QStringLiteral(POSTGRES_PATH)); +- if (QDir(dir).exists()) { +- postgresSearchPath << QStringLiteral(POSTGRES_PATH); +- } +-#endif +- postgresSearchPath << QStringLiteral("/usr/sbin") +- << QStringLiteral("/usr/local/sbin"); +- // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed +- // sorted order, so we search from the newest one to the oldest. +- QStringList postgresVersionedSearchPaths; +- QDir versionedDir(QStringLiteral("/usr/lib/postgresql")); +- if (versionedDir.exists()) { +- const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed); +- for (const auto &path : versionedDirs) { +- // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed +- if (path.fileName().startsWith(QLatin1String("10."))) { +- postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin")); +- } else { +- postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin")); +- } +- } +- } +- postgresSearchPath.append(postgresVersionedSearchPaths); +- +- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath); +- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath); ++ defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB); + defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); + defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); + } +@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings + mUserName = settings.value(QStringLiteral("User")).toString(); + mPassword = settings.value(QStringLiteral("Password")).toString(); + mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); +- mServerPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString(); +- if (mInternalServer && mServerPath.isEmpty()) { +- mServerPath = defaultServerPath; +- } ++ mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL); + qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; + mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); + if (mInternalServer && mInitDbPath.isEmpty()) { +@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings + settings.setValue(QStringLiteral("Port"), mHostPort); + } + settings.setValue(QStringLiteral("Options"), mConnectionOptions); +- settings.setValue(QStringLiteral("ServerPath"), mServerPath); + settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); + settings.setValue(QStringLiteral("StartServer"), mInternalServer); + settings.endGroup(); +Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp +=================================================================== +--- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp ++++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A + } else { + Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); + const QStringList arguments = QStringList() << executable << identifier(); +- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher")); ++ const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher"); + mController->start(agentLauncherExec, arguments); + } + return true; +Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp +=================================================================== +--- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp ++++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp +@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose, + mStorageController = new Akonadi::ProcessControl; + mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld + connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); +- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + + if (mAgentServerEnabled) { + mAgentServer = new Akonadi::ProcessControl; + connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); +- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + } + + #ifndef QT_NO_DEBUG diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch new file mode 100644 index 000000000000..25a835f5ba24 --- /dev/null +++ b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch @@ -0,0 +1,14 @@ +Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp +@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer( + bool confUpdate = false; + QFile actualFile(actualConfig); + // update conf only if either global (or local) is newer than actual +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || +- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { ++ if (true) { + QFile globalFile(globalConfig); + QFile localFile(localConfig); + if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix new file mode 100644 index 000000000000..c2e344284742 --- /dev/null +++ b/pkgs/applications/kde/akonadi/default.nix @@ -0,0 +1,37 @@ +{ + mkDerivation, copyPathsToStore, lib, + extra-cmake-modules, + kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, + kwindowsystem, kcrash, kio, + boost, kitemmodels, shared_mime_info, + mysql +}: + +mkDerivation { + name = "akonadi"; + meta = { + license = [ lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio + kwindowsystem kcrash shared_mime_info + ]; + propagatedBuildInputs = [ boost kitemmodels ]; + cmakeFlags = [ + "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld" + ]; + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"'' + ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"'' + ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB="${lib.getBin mysql}/bin/mysql_install_db"'' + ''-DNIXPKGS_MYSQL_MYSQLCHECK="${lib.getBin mysql}/bin/mysqlcheck"'' + ''-DNIXPKGS_POSTGRES_PG_CTL=""'' + ''-DNIXPKGS_POSTGRES_INITDB=""'' + ]; + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\"" + ''; +} diff --git a/pkgs/applications/kde/akonadi/series b/pkgs/applications/kde/akonadi/series new file mode 100644 index 000000000000..9e067f0a0008 --- /dev/null +++ b/pkgs/applications/kde/akonadi/series @@ -0,0 +1,2 @@ +akonadi-paths.patch +akonadi-timestamps.patch diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index e1e25b2acf24..df15f6b0f188 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, config, kdeWrapper, + mkDerivation, lib, config, makeWrapper, - extra-cmake-modules, kdoctools, makeWrapper, + extra-cmake-modules, kdoctools, - karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, - kservice, kpty, kwidgetsaddons, libarchive, + karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, kitemmodels, + khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive, # Archive tools p7zip, unzipNLS, zip, @@ -13,35 +13,25 @@ unfreeEnableUnrar ? false, unrar, }: -let - unwrapped = - kdeApp { - name = "ark"; - nativeBuildInputs = [ - extra-cmake-modules kdoctools makeWrapper - ]; - propagatedBuildInputs = [ - khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice - kpty kwidgetsaddons libarchive - ]; - postInstall = - let - PATH = - lib.makeBinPath - ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar); - in '' - wrapProgram "$out/bin/ark" \ - --prefix PATH : "${PATH}" - ''; - meta = { - license = with lib.licenses; - [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree; - maintainers = [ lib.maintainers.ttuegel ]; - }; - }; -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/ark" ]; +mkDerivation { + name = "ark"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + propagatedBuildInputs = [ + karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio kitemmodels + kparts kpty kservice kwidgetsaddons libarchive + ]; + outputs = [ "out" "dev" ]; + postFixup = + let + PATH = + lib.makeBinPath + ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar); + in '' + wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}" + ''; + meta = { + license = with lib.licenses; + [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree; + maintainers = [ lib.maintainers.ttuegel ]; + }; } diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix index bb6803057096..3479b6600fc9 100644 --- a/pkgs/applications/kde/baloo-widgets.nix +++ b/pkgs/applications/kde/baloo-widgets.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kdoctools, baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice }: -kdeApp { +mkDerivation { name = "baloo-widgets"; meta = { license = [ lib.licenses.lgpl21 ]; @@ -14,4 +14,5 @@ kdeApp { propagatedBuildInputs = [ baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix index 92fdb439330d..892d82fb51e8 100644 --- a/pkgs/applications/kde/build-support/application.nix +++ b/pkgs/applications/kde/build-support/application.nix @@ -1,4 +1,4 @@ -{ kdeDerivation, lib, debug, srcs }: +{ mkDerivation, lib, srcs }: args: @@ -7,14 +7,11 @@ let sname = args.sname or name; inherit (srcs."${sname}") src version; in -kdeDerivation (args // { +mkDerivation (args // { name = "${name}-${version}"; inherit src; - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + outputs = args.outputs or [ "out" "dev" ]; meta = { platforms = lib.platforms.linux; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index fff0df35d052..207228a65b0c 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -18,7 +18,7 @@ still shows most of the available features is in `./gwenview.nix`. # Updates 1. Update the URL in `./fetch.sh`. -2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications` +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde` from the top of the Nixpkgs tree. 3. Use `nox-review wip` to check that everything builds. 4. Commit the changes and open a pull request. @@ -27,9 +27,7 @@ still shows most of the available features is in `./gwenview.nix`. { stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, - kdeDerivation, plasma5, - attica, phonon, - debug ? false, + plasma5, attica, phonon, }: let @@ -42,14 +40,15 @@ let packages = self: with self; let callPackage = self.newScope { - kdeApp = import ./build-support/application.nix { - inherit lib kdeDerivation; - inherit debug srcs; + mkDerivation = import ./build-support/application.nix { + inherit lib; + inherit srcs; + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; }; }; in { kdelibs = callPackage ./kdelibs { inherit attica phonon; }; - akonadi = callPackage ./akonadi.nix {}; + akonadi = callPackage ./akonadi {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; ark = callPackage ./ark/default.nix {}; @@ -59,9 +58,11 @@ let ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; gwenview = callPackage ./gwenview.nix {}; + k3b = callPackage ./k3b.nix {}; kate = callPackage ./kate.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kcalc = callPackage ./kcalc.nix {}; + kcachegrind = callPackage ./kcachegrind.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; @@ -74,9 +75,12 @@ let kio-extras = callPackage ./kio-extras.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; + kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; + krfb = callPackage ./krfb.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; + libkcddb = callPackage ./libkcddb.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix index 7f436c7a55a9..eb823641ae44 100644 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ b/pkgs/applications/kde/dolphin-plugins.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kdoctools, dolphin, kdelibs4support, ki18n, kio, kxmlgui }: -kdeApp { +mkDerivation { name = "dolphin-plugins"; meta = { license = [ lib.licenses.gpl2 ]; @@ -12,6 +12,6 @@ kdeApp { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - dolphin.unwrapped kdelibs4support ki18n kio kxmlgui + dolphin kdelibs4support ki18n kio kxmlgui ]; } diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 6515c230c284..2570e37bf2c9 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -1,32 +1,24 @@ { - kdeApp, lib, kdeWrapper, - extra-cmake-modules, kdoctools, makeQtWrapper, + mkDerivation, lib, + extra-cmake-modules, kdoctools, baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, konsole, kparts, ktexteditor, kwindowsystem, phonon, solid }: -let - unwrapped = - kdeApp { - name = "dolphin"; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - propagatedBuildInputs = [ - baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig - kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes - kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem - phonon solid - ]; - }; -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/dolphin" ]; - paths = [ dolphin-plugins konsole.unwrapped ]; +mkDerivation { + name = "dolphin"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig + kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes + kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem + phonon solid + ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 607a16eb45b1..ad521a2b0388 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/applications/16.12.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 5dde6d8a64ea..4e915422d147 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, ffmpeg, kio }: -kdeApp { +mkDerivation { name = "ffmpegthumbs"; meta = { license = with lib.licenses; [ gpl2 bsd3 ]; diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index 71ab51320ab1..6eb219d8da96 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,24 +1,17 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kio, kparts, kxmlgui, qtscript, solid }: -let - unwrapped = - kdeApp { - name = "filelight"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh vcunat ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kio kparts kxmlgui qtscript solid - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/filelight" ]; +mkDerivation { + name = "filelight"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ fridh vcunat ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + kio kparts kxmlgui qtscript solid + ]; } diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 0fa06ed0fbe2..233566c1bdaf 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -1,27 +1,21 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, - baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2, - libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras + exiv2, lcms2, + baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, + phonon, qtimageformats, qtsvg, qtx11extras }: -let - unwrapped = - kdeApp { - name = "gwenview"; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw - libkipi phonon qtimageformats qtsvg qtx11extras - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/gwenview" ]; - paths = [ kipi-plugins ]; +mkDerivation { + name = "gwenview"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon + qtimageformats qtsvg qtx11extras + ]; + propagatedUserEnvPkgs = [ kipi-plugins ]; } diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix new file mode 100644 index 000000000000..79806dc93fbc --- /dev/null +++ b/pkgs/applications/kde/k3b.nix @@ -0,0 +1,41 @@ +{ mkDerivation, lib +, extra-cmake-modules, kdoctools, makeWrapper +, qtwebkit +, 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, shared_mime_info +}: + +mkDerivation { + name = "k3b"; + meta = with lib; { + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ sander phreedom ]; + platforms = platforms.linux; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + propagatedBuildInputs = [ + # qt + qtwebkit + # kde + libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui + # formats + flac lame libmad libmpcdec libvorbis + # sound utilities + libsamplerate libsndfile taglib + # cd/dvd + cdparanoia libdvdcss libdvdread + # others + ffmpeg libmusicbrainz2 shared_mime_info + ]; + postFixup = + let k3bPath = lib.makeBinPath [ + cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode + vcdimager + ]; + in '' + wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" + ''; +} diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index cd320afd8d3b..e6b4f6b6bdd4 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, @@ -7,26 +7,19 @@ plasma-framework, qtscript, threadweaver }: -let - unwrapped = - kdeApp { - name = "kate"; - meta = { - license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kactivities ki18n kio ktexteditor kwindowsystem plasma-framework - qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts - kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver - knewstuff libgit2 - ]; - }; -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/kate" "bin/kwrite" ]; - paths = [ konsole.unwrapped ]; +mkDerivation { + name = "kate"; + meta = { + license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libgit2 ]; + propagatedBuildInputs = [ + kactivities ki18n kio ktexteditor kwindowsystem plasma-framework + qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts + kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver + knewstuff + ]; + propagatedUserEnvPkgs = [ konsole ]; } diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix new file mode 100644 index 000000000000..19e01aeebe9e --- /dev/null +++ b/pkgs/applications/kde/kcachegrind.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kio, ki18n, karchive, qttools, + perl, python, php +}: + +mkDerivation { + name = "kcachegrind"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ orivej ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kio ]; + buildInputs = [ perl python php ki18n karchive qttools ]; +} diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 8ec7591460e7..856da42c835a 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -1,24 +1,18 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp }: -let - unwrapped = - kdeApp { - name = "kcalc"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.fridh ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - gmp kconfig kconfigwidgets kguiaddons kinit knotifications - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/kcalc" ]; +mkDerivation { + name = "kcalc"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.fridh ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ gmp ]; + propagatedBuildInputs = [ + kconfig kconfigwidgets kguiaddons kinit knotifications + ]; } diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index c1266009b686..186505a050c3 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -1,21 +1,16 @@ { - kdeApp, lib, kdeWrapper, - extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui + mkDerivation, lib, + extra-cmake-modules, + ki18n, kwidgetsaddons, kxmlgui }: -let - unwrapped = - kdeApp { - name = "kcolorchooser"; - meta = { - license = with lib.licenses; [ mit ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/kcolorchooser" ]; +mkDerivation { + name = "kcolorchooser"; + meta = { + license = with lib.licenses; [ mit ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ki18n ]; + propagatedBuildInputs = [ kwidgetsaddons kxmlgui ]; } diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix index 5143df60ef44..96828af9d170 100644 --- a/pkgs/applications/kde/kcontacts.nix +++ b/pkgs/applications/kde/kcontacts.nix @@ -1,15 +1,15 @@ { - kdeApp, lib, - extra-cmake-modules, ki18n, - kcoreaddons, kconfig, kcodecs + mkDerivation, lib, + extra-cmake-modules, + kcoreaddons, kconfig, kcodecs, ki18n, qtbase, }: -kdeApp { +mkDerivation { name = "kcontacts"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; - buildInputs = [ kcoreaddons kconfig kcodecs ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ]; } diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix index e83794c60d81..daf0a55b19e5 100644 --- a/pkgs/applications/kde/kde-locale-4.nix +++ b/pkgs/applications/kde/kde-locale-4.nix @@ -1,8 +1,8 @@ name: args: -{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }: +{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }: -kdeApp (args // { +mkDerivation (args // { sname = "kde-l10n-${name}"; name = "kde-l10n-${name}-qt4"; diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix index 772ebe37e44f..76d601cbdc0f 100644 --- a/pkgs/applications/kde/kde-locale-5.nix +++ b/pkgs/applications/kde/kde-locale-5.nix @@ -1,8 +1,8 @@ name: args: -{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: +{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }: -kdeApp (args // { +mkDerivation (args // { sname = "kde-l10n-${name}"; name = "kde-l10n-${name}-qt5"; diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index e50c92f88848..09f761df8517 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kio }: -kdeApp { +mkDerivation { name = "kdegraphics-mobipocket"; meta = { license = [ lib.licenses.gpl2Plus ]; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 5aa974a9c960..3302681bd852 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,9 +1,9 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kio, libkexiv2, libkdcraw }: -kdeApp { +mkDerivation { name = "kdegraphics-thumbnailers"; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix index e7b7b0a0ec4d..e3abe89eaded 100644 --- a/pkgs/applications/kde/kdelibs/default.nix +++ b/pkgs/applications/kde/kdelibs/default.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, + mkDerivation, lib, automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info, attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase, libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4, shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch }: -kdeApp { +mkDerivation { name = "kdelibs"; outputs = [ "out" "dev" ]; @@ -28,11 +28,6 @@ kdeApp { ./0001-old-kde4-cmake-policies.patch ./0002-polkit-install-path.patch ./0003-remove_xdg_impurities.patch - (fetchpatch { - name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch"; - url = "https://cgit.kde.org/kdelibs.git/patch/?id=1804c2fde7bf4e432c6cf5bb8cce5701c7010559"; - sha256 = "1y9951wgx35yf24i6gjz219fhspyqri1jvbw4fybd8nwwjb6ciz1"; - }) ]; # cmake does not detect path to `ilmbase` @@ -48,7 +43,7 @@ kdeApp { meta = { platforms = lib.platforms.linux; homepage = "http://www.kde.org"; - licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; + license = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index 20f81563c3b4..62176f3f3bbd 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -1,10 +1,10 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcoreaddons, ki18n, kio, kwidgetsaddons, samba }: -kdeApp { +mkDerivation { name = "kdenetwork-filesharing"; meta = { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch new file mode 100644 index 000000000000..ea2af2b09509 --- /dev/null +++ b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch @@ -0,0 +1,12 @@ +diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt +--- kdenlive-17.04.1-upstream/CMakeLists.txt 2017-06-10 00:06:44.773146595 -0400 ++++ kdenlive-17.04.1/CMakeLists.txt 2017-06-10 00:07:35.766596566 -0400 +@@ -79,7 +79,7 @@ + check_include_files(malloc.h HAVE_MALLOC_H) + check_include_files(pthread.h HAVE_PTHREAD_H) + +-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick ) ++find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick ) + find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) + + find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 3c18772f0392..854e346e2909 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -1,5 +1,4 @@ -{ kdeApp -, kdeWrapper +{ mkDerivation , lib , extra-cmake-modules , kdoctools @@ -31,21 +30,24 @@ , qtquickcontrols }: -let -unwrapped = kdeApp { +mkDerivation { name = "kdenlive"; + patches = [ + ./kdenlive-cmake-concurrent-module.patch + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - qtscript kconfig kcrash + kdbusaddons + kfilemetadata kguiaddons + ki18n kiconthemes kinit - kdbusaddons knotifications knewstuff karchive @@ -53,30 +55,19 @@ unwrapped = kdeApp { kplotting ktextwidgets mlt + phonon-backend-gstreamer + qtquickcontrols + qtscript shared_mime_info libv4l ffmpeg ]; - propagatedBuildInputs = [ - kactivities - ki18n - kio - kio-extras - kwindowsystem - kfilemetadata - plasma-framework - phonon-backend-gstreamer - qtquickcontrols - ]; - enableParallelBuilding = true; + postPatch = + # Module Qt5::Concurrent must be included in `find_package` before it is used. + '' + sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' + ''; meta = { license = with lib.licenses; [ gpl2Plus ]; }; -}; -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/kdenlive" ]; - paths = [ kinit ]; } diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index 97e74eb2e125..333fea3df53e 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -1,24 +1,15 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils }: -let - unwrapped = - kdeApp { - name = "kdf"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.peterhoeg ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kcmutils - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/kdf" ]; +mkDerivation { + name = "kdf"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.peterhoeg ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kcmutils ]; } diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index c44285982293..ca495a1ae269 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -1,19 +1,23 @@ { - kdeApp, lib, - extra-cmake-modules, kdoctools, ki18n, - akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, - kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, + mkDerivation, lib, + extra-cmake-modules, kdoctools, ki18n, makeWrapper, + akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, + kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem }: -kdeApp { +mkDerivation { name = "kgpg"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ]; - buildInputs = [ - akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + buildInputs = [ gnupg1 gpgme ki18n ]; + propagatedBuildInputs = [ + akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui kwidgetsaddons kwindowsystem ]; + postFixup = '' + wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}" + ''; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index 0579faa72a01..db68cec976e3 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -1,22 +1,16 @@ { - kdeApp, kdeWrapper, + mkDerivation, extra-cmake-modules, kdoctools, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support, khtml, kservice, xapian }: -let - unwrapped = - kdeApp { - name = "khelpcenter"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons - kinit kcmutils kservice xapian - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/khelpcenter" ]; +mkDerivation { + name = "khelpcenter"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ ki18n xapian ]; + propagatedBuildInputs = [ + grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons + kinit kcmutils kservice + ]; } diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 9f38079316fa..34b328962090 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -1,26 +1,20 @@ { - kdeApp, lib, kdeWrapper - , extra-cmake-modules, kdoctools, kparts - , qtsvg, qtxmlpatterns, ktexteditor, boost + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kparts, qtsvg, qtxmlpatterns, ktexteditor, boost, + karchive, kcrash }: -let - unwrapped = - kdeApp { - name = "kig"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ raskin ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kparts qtsvg qtxmlpatterns ktexteditor boost - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/kig" ]; +mkDerivation { + name = "kig"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ raskin ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ boost ]; + propagatedBuildInputs = [ + kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash + ]; } - diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 77f795167fc0..50709a7ddef7 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,12 +1,12 @@ { - kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info, + mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, qtsvg, samba, solid }: -kdeApp { +mkDerivation { name = "kio-extras"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index c17b3fdcd8e9..b14e0abcc3f1 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -1,15 +1,15 @@ { - kdeApp, lib, + mkDerivation, lib, extra-cmake-modules, ki18n, - kcodecs + kcodecs, qtbase, }: -kdeApp { +mkDerivation { name = "kmime"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ki18n ]; - buildInputs = [ kcodecs ]; + buildInputs = [ kcodecs qtbase ]; } diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 6ab653cfce06..058fd8178c4a 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -1,30 +1,23 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support, plasma-framework, libpulseaudio, alsaLib, libcanberra_kde }: -let - unwrapped = - kdeApp { - name = "kmix"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.rongcuid ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; - propagatedBuildInputs = [ - kglobalaccel kxmlgui kcoreaddons kdelibs4support - plasma-framework - ]; - cmakeFlags = [ - "-DKMIX_KF5_BUILD=1" - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/kmix" ]; +mkDerivation { + name = "kmix"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.rongcuid ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; + propagatedBuildInputs = [ + kglobalaccel kxmlgui kcoreaddons kdelibs4support + plasma-framework + ]; + cmakeFlags = [ + "-DKMIX_KF5_BUILD=1" + ]; } diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix new file mode 100644 index 000000000000..db4cb75cc35c --- /dev/null +++ b/pkgs/applications/kde/kolourpaint.nix @@ -0,0 +1,17 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kdelibs4support +, libkexiv2 +}: + +mkDerivation { + name = "kolourpaint"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kdelibs4support libkexiv2 ]; + meta = { + maintainers = [ lib.maintainers.fridh ]; + license = with lib.licenses; [ gpl2 ]; + }; +} diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index 660090dc84ae..cf2fa2e6a10f 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -1,21 +1,14 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kparts, ktexteditor, kwidgetsaddons, libkomparediff2 }: -let - unwrapped = - kdeApp { - name = "kompare"; - meta = { license = with lib.licenses; [ gpl2 ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kparts ktexteditor kwidgetsaddons libkomparediff2 - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/kompare" ]; +mkDerivation { + name = "kompare"; + meta = { license = with lib.licenses; [ gpl2 ]; }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + kparts ktexteditor kwidgetsaddons libkomparediff2 + ]; } diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 15b6373bdb02..bd026c6f0395 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, @@ -7,24 +7,17 @@ kwindowsystem, kxmlgui, qtscript }: -let - unwrapped = - kdeApp { - name = "konsole"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion - kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio - knotifications knotifyconfig kparts kpty kservice ktextwidgets - kwidgetsaddons kxmlgui - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/konsole" ]; +mkDerivation { + name = "konsole"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ ki18n ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support + kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty + kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript + ]; } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix new file mode 100644 index 000000000000..d6de25215339 --- /dev/null +++ b/pkgs/applications/kde/krfb.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kdelibs4support, kdnssd, libvncserver, libXtst, qtx11extras +}: + +mkDerivation { + name = "krfb"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = with lib.maintainers; [ jerith666 ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libvncserver libXtst qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support kdnssd ]; +} diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix index afa870d90a54..e39e7e5157d2 100644 --- a/pkgs/applications/kde/kwalletmanager.nix +++ b/pkgs/applications/kde/kwalletmanager.nix @@ -1,6 +1,5 @@ { lib -, kdeApp -, kdeWrapper +, mkDerivation , extra-cmake-modules , kdoctools , kauth @@ -9,28 +8,19 @@ , kcoreaddons , kdbusaddons , kdelibs4support +, kwallet , kxmlgui }: -let - unwrapped = kdeApp { - name = "kwalletmanager"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kauth - kcmutils - kconfigwidgets - kcoreaddons - kdbusaddons - kdelibs4support - kxmlgui - ]; +mkDerivation { + name = "kwalletmanager"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ fridh ]; }; -in kdeWrapper { - inherit unwrapped; - targets = ["bin/kwalletmanager5"]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support + kwallet kxmlgui + ]; } diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix index 87e7a82ce466..403db98c0f35 100644 --- a/pkgs/applications/kde/l10n.nix +++ b/pkgs/applications/kde/l10n.nix @@ -10,187 +10,141 @@ in lib.mapAttrs (name: attr: recurseIntoAttrs attr) { ar = { qt4 = callPackage (kdeLocale4 "ar" {}) {}; - qt5 = callPackage (kdeLocale5 "ar" {}) {}; }; bg = { qt4 = callPackage (kdeLocale4 "bg" {}) {}; - qt5 = callPackage (kdeLocale5 "bg" {}) {}; }; bs = { qt4 = callPackage (kdeLocale4 "bs" {}) {}; - qt5 = callPackage (kdeLocale5 "bs" {}) {}; }; ca = { qt4 = callPackage (kdeLocale4 "ca" {}) {}; - qt5 = callPackage (kdeLocale5 "ca" {}) {}; }; ca_valencia = { qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {}; - qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {}; }; cs = { qt4 = callPackage (kdeLocale4 "cs" {}) {}; - qt5 = callPackage (kdeLocale5 "cs" {}) {}; }; da = { qt4 = callPackage (kdeLocale4 "da" {}) {}; - qt5 = callPackage (kdeLocale5 "da" {}) {}; }; de = { qt4 = callPackage (kdeLocale4 "de" {}) {}; - qt5 = callPackage (kdeLocale5 "de" {}) {}; }; el = { qt4 = callPackage (kdeLocale4 "el" {}) {}; - qt5 = callPackage (kdeLocale5 "el" {}) {}; }; en_GB = { qt4 = callPackage (kdeLocale4 "en_GB" {}) {}; - qt5 = callPackage (kdeLocale5 "en_GB" {}) {}; }; eo = { qt4 = callPackage (kdeLocale4 "eo" {}) {}; - qt5 = callPackage (kdeLocale5 "eo" {}) {}; }; es = { qt4 = callPackage (kdeLocale4 "es" {}) {}; - qt5 = callPackage (kdeLocale5 "es" {}) {}; }; et = { qt4 = callPackage (kdeLocale4 "et" {}) {}; - qt5 = callPackage (kdeLocale5 "et" {}) {}; }; eu = { qt4 = callPackage (kdeLocale4 "eu" {}) {}; - qt5 = callPackage (kdeLocale5 "eu" {}) {}; }; fa = { qt4 = callPackage (kdeLocale4 "fa" {}) {}; - qt5 = callPackage (kdeLocale5 "fa" {}) {}; }; fi = { qt4 = callPackage (kdeLocale4 "fi" {}) {}; - qt5 = callPackage (kdeLocale5 "fi" {}) {}; }; fr = { qt4 = callPackage (kdeLocale4 "fr" {}) {}; - qt5 = callPackage (kdeLocale5 "fr" {}) {}; }; ga = { qt4 = callPackage (kdeLocale4 "ga" {}) {}; - qt5 = callPackage (kdeLocale5 "ga" {}) {}; }; gl = { qt4 = callPackage (kdeLocale4 "gl" {}) {}; - qt5 = callPackage (kdeLocale5 "gl" {}) {}; }; he = { qt4 = callPackage (kdeLocale4 "he" {}) {}; - qt5 = callPackage (kdeLocale5 "he" {}) {}; }; hi = { qt4 = callPackage (kdeLocale4 "hi" {}) {}; - qt5 = callPackage (kdeLocale5 "hi" {}) {}; }; hr = { qt4 = callPackage (kdeLocale4 "hr" {}) {}; - qt5 = callPackage (kdeLocale5 "hr" {}) {}; }; hu = { qt4 = callPackage (kdeLocale4 "hu" {}) {}; - qt5 = callPackage (kdeLocale5 "hu" {}) {}; }; ia = { qt4 = callPackage (kdeLocale4 "ia" {}) {}; - qt5 = callPackage (kdeLocale5 "ia" {}) {}; }; id = { qt4 = callPackage (kdeLocale4 "id" {}) {}; - qt5 = callPackage (kdeLocale5 "id" {}) {}; }; is = { qt4 = callPackage (kdeLocale4 "is" {}) {}; - qt5 = callPackage (kdeLocale5 "is" {}) {}; }; it = { qt4 = callPackage (kdeLocale4 "it" {}) {}; - qt5 = callPackage (kdeLocale5 "it" {}) {}; }; ja = { qt4 = callPackage (kdeLocale4 "ja" {}) {}; - qt5 = callPackage (kdeLocale5 "ja" {}) {}; }; kk = { qt4 = callPackage (kdeLocale4 "kk" {}) {}; - qt5 = callPackage (kdeLocale5 "kk" {}) {}; }; km = { qt4 = callPackage (kdeLocale4 "km" {}) {}; - qt5 = callPackage (kdeLocale5 "km" {}) {}; }; ko = { qt4 = callPackage (kdeLocale4 "ko" {}) {}; - qt5 = callPackage (kdeLocale5 "ko" {}) {}; }; lt = { qt4 = callPackage (kdeLocale4 "lt" {}) {}; - qt5 = callPackage (kdeLocale5 "lt" {}) {}; }; lv = { qt4 = callPackage (kdeLocale4 "lv" {}) {}; - qt5 = callPackage (kdeLocale5 "lv" {}) {}; }; mr = { qt4 = callPackage (kdeLocale4 "mr" {}) {}; - qt5 = callPackage (kdeLocale5 "mr" {}) {}; }; nb = { qt4 = callPackage (kdeLocale4 "nb" {}) {}; - qt5 = callPackage (kdeLocale5 "nb" {}) {}; }; nds = { qt4 = callPackage (kdeLocale4 "nds" {}) {}; - qt5 = callPackage (kdeLocale5 "nds" {}) {}; }; nl = { qt4 = callPackage (kdeLocale4 "nl" {}) {}; - qt5 = callPackage (kdeLocale5 "nl" {}) {}; }; nn = { qt4 = callPackage (kdeLocale4 "nn" {}) {}; - qt5 = callPackage (kdeLocale5 "nn" {}) {}; }; pa = { qt4 = callPackage (kdeLocale4 "pa" {}) {}; - qt5 = callPackage (kdeLocale5 "pa" {}) {}; }; pl = { qt4 = callPackage (kdeLocale4 "pl" {}) {}; - qt5 = callPackage (kdeLocale5 "pl" {}) {}; }; pt = { qt4 = callPackage (kdeLocale4 "pt" {}) {}; - qt5 = callPackage (kdeLocale5 "pt" {}) {}; }; pt_BR = { qt4 = callPackage (kdeLocale4 "pt_BR" {}) {}; - qt5 = callPackage (kdeLocale5 "pt_BR" {}) {}; }; ro = { qt4 = callPackage (kdeLocale4 "ro" {}) {}; - qt5 = callPackage (kdeLocale5 "ro" {}) {}; }; ru = { qt4 = callPackage (kdeLocale4 "ru" {}) {}; - qt5 = callPackage (kdeLocale5 "ru" {}) {}; }; sk = { qt4 = callPackage (kdeLocale4 "sk" {}) {}; - qt5 = callPackage (kdeLocale5 "sk" {}) {}; }; sl = { qt4 = callPackage (kdeLocale4 "sl" {}) {}; - qt5 = callPackage (kdeLocale5 "sl" {}) {}; }; sr = { qt4 = callPackage (kdeLocale4 "sr" { @@ -203,39 +157,26 @@ lib.mapAttrs (name: attr: recurseIntoAttrs attr) { 4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py ''; }) {}; - qt5 = callPackage (kdeLocale5 "sr" { - preConfigure = '' - patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid - sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt - ''; - }) {}; }; sv = { qt4 = callPackage (kdeLocale4 "sv" {}) {}; - qt5 = callPackage (kdeLocale5 "sv" {}) {}; }; tr = { qt4 = callPackage (kdeLocale4 "tr" {}) {}; - qt5 = callPackage (kdeLocale5 "tr" {}) {}; }; ug = { qt4 = callPackage (kdeLocale4 "ug" {}) {}; - qt5 = callPackage (kdeLocale5 "ug" {}) {}; }; uk = { qt4 = callPackage (kdeLocale4 "uk" {}) {}; - qt5 = callPackage (kdeLocale5 "uk" {}) {}; }; wa = { qt4 = callPackage (kdeLocale4 "wa" {}) {}; - qt5 = callPackage (kdeLocale5 "wa" {}) {}; }; zh_CN = { qt4 = callPackage (kdeLocale4 "zh_CN" {}) {}; - qt5 = callPackage (kdeLocale5 "zh_CN" {}) {}; }; zh_TW = { qt4 = callPackage (kdeLocale4 "zh_TW" {}) {}; - qt5 = callPackage (kdeLocale5 "zh_TW" {}) {}; }; } diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix new file mode 100644 index 000000000000..edd9732d051b --- /dev/null +++ b/pkgs/applications/kde/libkcddb.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools +, kcodecs, ki18n, kio, kwidgetsaddons +, libmusicbrainz5 }: + +mkDerivation { + name = "libkcddb"; + meta = with lib; { + license = with licenses; [ gpl2 lgpl21 bsd3 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase kdoctools ]; + propagatedBuildInputs = [ + kcodecs ki18n kio kwidgetsaddons + libmusicbrainz5 + ]; +} diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 179e9f414dc3..383bd3b67037 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, extra-cmake-modules, libraw, qtbase }: +{ mkDerivation, lib, extra-cmake-modules, libraw, qtbase }: -kdeApp { +mkDerivation { name = "libkdcraw"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 0991c5df5ab4..816d4168967c 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, exiv2, extra-cmake-modules, qtbase }: +{ mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }: -kdeApp { +mkDerivation { name = "libkexiv2"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index 32eeb171ff89..3a28d8c2e8c3 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: +{ mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: -kdeApp { +mkDerivation { name = "libkipi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index aacc89a0efe3..52aa2b10e241 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,6 +1,6 @@ -{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: +{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: -kdeApp { +mkDerivation { name = "libkomparediff2"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ]; diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index c151396f2476..1217c29032b4 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,25 +1,16 @@ -{ kdeApp, lib, kdeWrapper -, extra-cmake-modules, qtscript, qtsvg, qtquickcontrols -, gpsd +{ mkDerivation, lib +, extra-cmake-modules, kdoctools +, qtscript, qtsvg, qtquickcontrols, qtwebkit +, krunner, shared_mime_info, kparts, knewstuff +, gpsd, perl }: -let - unwrapped = - kdeApp { - name = "marble"; - meta.license = with lib.licenses; [ lgpl21 gpl3 ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - qtscript qtsvg qtquickcontrols - gpsd - ]; - - enableParallelBuilding = true; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/marble-qt" ]; - paths = [ unwrapped ]; +mkDerivation { + name = "marble"; + meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; + propagatedBuildInputs = [ + qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts + knewstuff gpsd + ]; } diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 59520e285327..1d44bb27fa3e 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -1,26 +1,21 @@ { - kdeApp, lib, kdeWrapper, + 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 }: -let - unwrapped = - kdeApp { - name = "okteta"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kconfig kinit - kcmutils kconfigwidgets knewstuff kparts qca-qt5 - ]; - }; - -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/okteta" ]; +mkDerivation { + name = "okteta"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; + 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/okular.nix b/pkgs/applications/kde/okular.nix index f5b3e38ca7c7..99b69f45e1eb 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,31 +1,25 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, - libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver + libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver }: -let - unwrapped = kdeApp { - name = "okular"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig - kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes - kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler - qca-qt5 qtdeclarative qtsvg threadweaver - ]; - meta = { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; +mkDerivation { + name = "okular"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets + kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio + kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler + qca-qt5 qtdeclarative qtsvg threadweaver + ]; + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/okular" ]; } diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index 0a3d311eb27a..085b53de0f39 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -1,20 +1,22 @@ { - kdeApp, lib, extra-cmake-modules, - cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio, + mkDerivation, lib, + extra-cmake-modules, + cups, ki18n, + kconfig, kconfigwidgets, kdbusaddons, kiconthemes, kcmutils, kio, knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework, qtdeclarative }: -kdeApp { +mkDerivation { name = "print-manager"; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ cups ki18n ]; propagatedBuildInputs = [ - cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications - kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework - qtdeclarative + kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications + kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative ]; } diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 30abfc23e834..db1bf2aee659 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -1,25 +1,20 @@ { - kdeApp, lib, kdeWrapper, + mkDerivation, lib, extra-cmake-modules, kdoctools, - kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins, + ki18n, xcb-util-cursor, + kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - xcb-util-cursor + qtx11extras }: -let - unwrapped = - kdeApp { - name = "spectacle"; - meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications - kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/spectacle" ]; - paths = [ kipi-plugins ]; +mkDerivation { + name = "spectacle"; + meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ ki18n xcb-util-cursor ]; + propagatedBuildInputs = [ + kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications + kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras + ]; + propagatedUserEnvPkgs = [ kipi-plugins ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 60c412e55fda..66498b0d2804 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2227 +3,2235 @@ { akonadi = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-16.12.2.tar.xz"; - sha256 = "1csaa69n65d3cnkajzk5702vxskfaiajvxw724s17a5y6sgk0h5z"; - name = "akonadi-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-17.04.2.tar.xz"; + sha256 = "08b3xyrff3y3s3c39l1fv3i55rdz6fq9mrsi3g80vs4i4x70f46d"; + name = "akonadi-17.04.2.tar.xz"; }; }; akonadi-calendar = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-16.12.2.tar.xz"; - sha256 = "1qfkwmh82l5ahzjpsla9gwwk2kqxv773ddq8f5h52qlxx56agc6k"; - name = "akonadi-calendar-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-17.04.2.tar.xz"; + sha256 = "17nx990k3l0mgwssrdg9avvp4yf6ichakx0cq4yg4mif5rc4angd"; + name = "akonadi-calendar-17.04.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-tools-16.12.2.tar.xz"; - sha256 = "1isjvsas6fnz2v2a8yl6ggkimfknr56a3zydwhq59lzcm15hn0hj"; - name = "akonadi-calendar-tools-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-tools-17.04.2.tar.xz"; + sha256 = "1qbj5fkzia0bjzyv8mybqf2gg917dyjqmiywf4asr0xlqxwydccj"; + name = "akonadi-calendar-tools-17.04.2.tar.xz"; }; }; akonadiconsole = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadiconsole-16.12.2.tar.xz"; - sha256 = "188qb2lc6d0xhvq8n5y7ax13a6wz3agg1mx3j2kphwn8f53grgzb"; - name = "akonadiconsole-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadiconsole-17.04.2.tar.xz"; + sha256 = "00wps8p6094bywkc6yrh9rpqp0q49nq68kmnbm7jqd9k07g93mxz"; + name = "akonadiconsole-17.04.2.tar.xz"; }; }; akonadi-contacts = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-contacts-16.12.2.tar.xz"; - sha256 = "1ixd1qzakxhq9qlfr6l8igii2ny8fi8hxasdadq9cyr5jl20rpgp"; - name = "akonadi-contacts-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-contacts-17.04.2.tar.xz"; + sha256 = "0fnmfcfxzjghfh3plliksa7sffjy8m2hif1s8gsdv2bl5v13gxbz"; + name = "akonadi-contacts-17.04.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-import-wizard-16.12.2.tar.xz"; - sha256 = "0xdmcs8l0lqqx2f2yabp1xx60h1jcz05q7lk6zzapzc0xqa8pqnq"; - name = "akonadi-import-wizard-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-import-wizard-17.04.2.tar.xz"; + sha256 = "0wg1nnrfafmpdb0li7d9i3qfdam4v2ybkbrbwgdwiawdqs9znaaa"; + name = "akonadi-import-wizard-17.04.2.tar.xz"; }; }; akonadi-mime = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-mime-16.12.2.tar.xz"; - sha256 = "0w88splvk1ci6l590kybb8dgddhk8q0mqag1xxliws534kl9bd0s"; - name = "akonadi-mime-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-mime-17.04.2.tar.xz"; + sha256 = "1ariwnjgsyccfa3iky3sf8lz08hv44jd6xa4hjfyz4bkp822grld"; + name = "akonadi-mime-17.04.2.tar.xz"; }; }; akonadi-notes = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-notes-16.12.2.tar.xz"; - sha256 = "181d4sv6vqrx0iy5fwdpd28h78i0jy4bj51jxbdn7fqmx1mavbkl"; - name = "akonadi-notes-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-notes-17.04.2.tar.xz"; + sha256 = "00p7sksfid7lln43f65jna8dr4w47wkxqyls2gzbgnblpd7m2rqg"; + name = "akonadi-notes-17.04.2.tar.xz"; }; }; akonadi-search = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akonadi-search-16.12.2.tar.xz"; - sha256 = "1jfcpjn45cxxnfg9y15fjkig6nfj6w8ggq3a7339kdhb79lkh1p5"; - name = "akonadi-search-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akonadi-search-17.04.2.tar.xz"; + sha256 = "111r1fplrd13xb7s36cm9bk5zkj8ap33d252xarwmzpj51q0l3vh"; + name = "akonadi-search-17.04.2.tar.xz"; }; }; akregator = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/akregator-16.12.2.tar.xz"; - sha256 = "0yyjpl6kajy0ip60m6vf0jnm217m5ax34a5y14k1wj7civ4fz9il"; - name = "akregator-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/akregator-17.04.2.tar.xz"; + sha256 = "0ngpw432pm57p34y4wcvrxlrlmixlgrpqawgn2b73dhvb2m8ypvy"; + name = "akregator-17.04.2.tar.xz"; }; }; analitza = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/analitza-16.12.2.tar.xz"; - sha256 = "1jii70a2nppfzqlzwrjvawfq2cfjqrcsj0mbpgahb8zphcfs5xhy"; - name = "analitza-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/analitza-17.04.2.tar.xz"; + sha256 = "0qs2mp7nlca9y8lpycwfsmdd33ficz36z2fbmqzqm837w1r5jplp"; + name = "analitza-17.04.2.tar.xz"; }; }; ark = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ark-16.12.2.tar.xz"; - sha256 = "07jp25jqnfcx48x7w0wwyldk56czyx2341yf2k73p3fy67rldlr3"; - name = "ark-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ark-17.04.2.tar.xz"; + sha256 = "0zdyxd7ghwrj48avyqv4q6dpyrxryzrg8v5ljwwsizlb7lp25afx"; + name = "ark-17.04.2.tar.xz"; }; }; artikulate = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/artikulate-16.12.2.tar.xz"; - sha256 = "11065zl5gdc1q7rvzmjvbz33k9xhdph7ynqwnv628c6a0478xwc5"; - name = "artikulate-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/artikulate-17.04.2.tar.xz"; + sha256 = "0rjqpn8aa0y3v2940qgfxl9xdrls1jw6yfvgqdsicrhd9qwpr6i2"; + name = "artikulate-17.04.2.tar.xz"; }; }; audiocd-kio = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/audiocd-kio-16.12.2.tar.xz"; - sha256 = "184grq1nfpv9sfcsk6kcx6bdnbh938jc3qr6n00gnnj509347xga"; - name = "audiocd-kio-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/audiocd-kio-17.04.2.tar.xz"; + sha256 = "0h6zvlhyi9dxmcxgcnn12pj056r62a6389nd9dnqzcc3m7jp0ypi"; + name = "audiocd-kio-17.04.2.tar.xz"; }; }; baloo-widgets = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/baloo-widgets-16.12.2.tar.xz"; - sha256 = "000v5s33j6qsdbxqf856si0z5dmh9dan41kf2lrzc017hj6pr34x"; - name = "baloo-widgets-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/baloo-widgets-17.04.2.tar.xz"; + sha256 = "1fspq5n53zgnwpvnq0z9g77xhfspd3indcvim8j8ls5qhmn4c8g9"; + name = "baloo-widgets-17.04.2.tar.xz"; }; }; blinken = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/blinken-16.12.2.tar.xz"; - sha256 = "1wcl8199wg74cv9hyrhcpqkf1awpf3q960jzgfv0z0c28xywb76x"; - name = "blinken-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/blinken-17.04.2.tar.xz"; + sha256 = "12pzbgxhdrzjnzg02hd96pxcqpjnzfrlv2bjpkpzb7ng70wb50ia"; + name = "blinken-17.04.2.tar.xz"; }; }; blogilo = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/blogilo-16.12.2.tar.xz"; - sha256 = "0j5mz8nfndr0g99l84s7n3gxrj6y4jbql1srnyl0yspmcjwmnc09"; - name = "blogilo-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/blogilo-17.04.2.tar.xz"; + sha256 = "14pn6l2qvgf7ab05i93lnhm6fjhy41xwnxa5v7an7xc8ismi5ric"; + name = "blogilo-17.04.2.tar.xz"; }; }; bomber = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/bomber-16.12.2.tar.xz"; - sha256 = "1fy17y5grir6kbr7xzclslrxyip4favhag6wasg9ah60r6k15cqc"; - name = "bomber-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/bomber-17.04.2.tar.xz"; + sha256 = "19c5ak9cw3ybcvw21rzjh7k0q7g1j9dv060pvjdfsphfyzkym5m3"; + name = "bomber-17.04.2.tar.xz"; }; }; bovo = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/bovo-16.12.2.tar.xz"; - sha256 = "0dszbxisq172x5jv10w62wg3kcs1f8wdxgw9pjq423j3jq8rw9zq"; - name = "bovo-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/bovo-17.04.2.tar.xz"; + sha256 = "0z4ajphzrnag1zqv3d9i6cvrfn5b74sklacxhn09hgjgx6ihps77"; + name = "bovo-17.04.2.tar.xz"; }; }; calendarsupport = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/calendarsupport-16.12.2.tar.xz"; - sha256 = "065h09kq6h2hr4lg34lqckw0g91zkhxpviagdgymx7qpdy36l2sb"; - name = "calendarsupport-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/calendarsupport-17.04.2.tar.xz"; + sha256 = "1n2nb15fn3v6hlp8ya3ah3pdyjjss1632a51k696lg474dhxvlzk"; + name = "calendarsupport-17.04.2.tar.xz"; }; }; cantor = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/cantor-16.12.2.tar.xz"; - sha256 = "055sxyl2x2mipnidrsgkmbjy4vw64pf5k0fql64p7pjhknn3i6x4"; - name = "cantor-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/cantor-17.04.2.tar.xz"; + sha256 = "0811770qn76ri11mgx2pac7vg67mj5qg3v3zhx4ym3f072lfp57i"; + name = "cantor-17.04.2.tar.xz"; }; }; cervisia = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/cervisia-16.12.2.tar.xz"; - sha256 = "1fdnvdp27wa8pni4vq501ajdln6dmg2kc0468x1c375g734npabx"; - name = "cervisia-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/cervisia-17.04.2.tar.xz"; + sha256 = "1gar8rx9vknpc7fnwlg7kvwj90wv9wd8c3dd59fj55d9fpwin3qg"; + name = "cervisia-17.04.2.tar.xz"; }; }; dolphin = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/dolphin-16.12.2.tar.xz"; - sha256 = "1xqkrkhpcxcrrk3msd7fkhqikwrx2mjd0c4cna2iwd0s4h7ahmy6"; - name = "dolphin-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/dolphin-17.04.2.tar.xz"; + sha256 = "1yd0fawz9n64gsd868qzp424h653f5lf22r5mf116bkgxia59b25"; + name = "dolphin-17.04.2.tar.xz"; }; }; dolphin-plugins = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/dolphin-plugins-16.12.2.tar.xz"; - sha256 = "07i4w95b20db51bzg0rnx6m3dgk2bz5nwivz6zngfiiksmb39dj3"; - name = "dolphin-plugins-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/dolphin-plugins-17.04.2.tar.xz"; + sha256 = "1h8g962pmpwahhrnzzd7x15j7p3bcxg92csfkd0y2mn6pfl9zb5s"; + name = "dolphin-plugins-17.04.2.tar.xz"; }; }; dragon = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/dragon-16.12.2.tar.xz"; - sha256 = "07iip379kpwy8yfiwacykkgzj7bfw2nz3vij61q68lr64k5sg4kk"; - name = "dragon-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/dragon-17.04.2.tar.xz"; + sha256 = "0yp0bswjq9zymczyscy3y186d7g921jmah6i5wd36j1vgff3i0ry"; + name = "dragon-17.04.2.tar.xz"; }; }; eventviews = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/eventviews-16.12.2.tar.xz"; - sha256 = "1hl0adi0ss533mnncyih3y9075i90accklbk8068dvxb7la9b7zd"; - name = "eventviews-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/eventviews-17.04.2.tar.xz"; + sha256 = "0rf87q002ax5r6qh99hmbdrm528grw3ib5zi5pnjai3l403vd6g6"; + name = "eventviews-17.04.2.tar.xz"; }; }; ffmpegthumbs = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ffmpegthumbs-16.12.2.tar.xz"; - sha256 = "0p1fqxqcgz3k910acacr86pa66yl5d65wxf93nlg4627dfhmrbkc"; - name = "ffmpegthumbs-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ffmpegthumbs-17.04.2.tar.xz"; + sha256 = "02i9x2amkwc40a7fpk939spgwbrcfm1s9swgmp1wzyg7arrf4qz3"; + name = "ffmpegthumbs-17.04.2.tar.xz"; }; }; filelight = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/filelight-16.12.2.tar.xz"; - sha256 = "0ynqnagyrn61gzvi0rl38200yxbxa2zpch3cl917wff527kjd7cw"; - name = "filelight-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/filelight-17.04.2.tar.xz"; + sha256 = "0wpcmk6i8hfalzymj8m1hsg1qi2hil8x51nvxg0c55x1cqg6k9a0"; + name = "filelight-17.04.2.tar.xz"; }; }; granatier = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/granatier-16.12.2.tar.xz"; - sha256 = "01b0nvfj5v2spaml003bpd4f5snncxsilfplwgb06kf8wwsb9mzd"; - name = "granatier-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/granatier-17.04.2.tar.xz"; + sha256 = "0bxf4cv1351bzz3yafdadih8bdcjjn0119zazmll2jjdnh4qiq0z"; + name = "granatier-17.04.2.tar.xz"; }; }; grantlee-editor = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/grantlee-editor-16.12.2.tar.xz"; - sha256 = "16r1f7vwsqfngv3kld4wqmvxn4pnxgcpiaaxa2z9szsjfrz10bp9"; - name = "grantlee-editor-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/grantlee-editor-17.04.2.tar.xz"; + sha256 = "1sjrsljp0g53gi4vlcmz6r9k657k4wr1l10743sfmg268skvs84b"; + name = "grantlee-editor-17.04.2.tar.xz"; }; }; grantleetheme = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/grantleetheme-16.12.2.tar.xz"; - sha256 = "09qr7icbkq4my594xkjkydkfwx8sixbc73i3gxjnki64w549gan2"; - name = "grantleetheme-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/grantleetheme-17.04.2.tar.xz"; + sha256 = "102a49ifkvjpz2703fr6dv45ksyg7y1yjc6xm0im95vb66aw3cb5"; + name = "grantleetheme-17.04.2.tar.xz"; }; }; gwenview = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/gwenview-16.12.2.tar.xz"; - sha256 = "1ldflh10b34r9xy8a8yh72jcjdxs3ylhyjhs97xcg381q4dyg1dr"; - name = "gwenview-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/gwenview-17.04.2.tar.xz"; + sha256 = "0x9pxw33ahzn0h4klgiw7ifcgkdwv7l1zzfapbh9gr9h3rbrpsra"; + name = "gwenview-17.04.2.tar.xz"; }; }; incidenceeditor = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/incidenceeditor-16.12.2.tar.xz"; - sha256 = "0z8ysrdkxfkn71anlzifd0dxh6fysl924jh4wjsphb4dnb417rym"; - name = "incidenceeditor-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/incidenceeditor-17.04.2.tar.xz"; + sha256 = "1qhkmw6n402xnv5ggpfp586gii5z6r5gqmgfd0jzxlnygslqd784"; + name = "incidenceeditor-17.04.2.tar.xz"; }; }; jovie = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/jovie-16.12.2.tar.xz"; - sha256 = "19ifp3p02ayka2zqnwfq381mjqpxhm0hydf1yx9lh2p8n6j9s4gy"; - name = "jovie-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/jovie-17.04.2.tar.xz"; + sha256 = "0mcv00hk1h1hl7hg4n2pcbsjw1g21k98fls7424jjh6vgvarbxmg"; + name = "jovie-17.04.2.tar.xz"; }; }; juk = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/juk-16.12.2.tar.xz"; - sha256 = "1453s0zxagqmx91f3x7fqrb6xdlgzr2sqj6hcj2pgl6jaz2x3n1c"; - name = "juk-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/juk-17.04.2.tar.xz"; + sha256 = "01lsmfd5h1km5w9xz9bwh07qvxlgh2j8nl638bxx6k9vydg53gll"; + name = "juk-17.04.2.tar.xz"; + }; + }; + k3b = { + version = "17.04.2"; + src = fetchurl { + url = "${mirror}/stable/applications/17.04.2/src/k3b-17.04.2.tar.xz"; + sha256 = "1yv2rgwsvabyj7pj91yir6zj7bc4n9psazg0q658pyqbdkgwrkx8"; + name = "k3b-17.04.2.tar.xz"; }; }; kaccessible = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kaccessible-16.12.2.tar.xz"; - sha256 = "1ibh2nw4bdnj1ll8qp3d3vkwvzdkv2k53n98p9282w3jhckpiq5r"; - name = "kaccessible-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kaccessible-17.04.2.tar.xz"; + sha256 = "00m2ya93isyhr9cbx7fa79pi1iqnj5nqqnjmh8kqx9abkpvy2yff"; + name = "kaccessible-17.04.2.tar.xz"; }; }; kaccounts-integration = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kaccounts-integration-16.12.2.tar.xz"; - sha256 = "0nx9wlh7arjqz0wf2zyaj3fwzm7sn38hn00m74mj7zvxr1pwcypv"; - name = "kaccounts-integration-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kaccounts-integration-17.04.2.tar.xz"; + sha256 = "0wrfyfczm92qz0w6gyvaac8n0763fviglji7ls73y0gy7xm1lfmj"; + name = "kaccounts-integration-17.04.2.tar.xz"; }; }; kaccounts-providers = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kaccounts-providers-16.12.2.tar.xz"; - sha256 = "0dln1l44bzaw782qjc57w2hgydbqzn4g7xh8d93qq52yz8ph875g"; - name = "kaccounts-providers-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kaccounts-providers-17.04.2.tar.xz"; + sha256 = "0y2y231f0xyysxnwdprlffp3m4wxyxabc2d4j8sr9w9gn0qfzdkj"; + name = "kaccounts-providers-17.04.2.tar.xz"; }; }; kaddressbook = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kaddressbook-16.12.2.tar.xz"; - sha256 = "023mfnin8si234yczhhfm3nk083w8bixg1b3gr8bzc1x92ka93m2"; - name = "kaddressbook-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kaddressbook-17.04.2.tar.xz"; + sha256 = "0y44b3wwpgpzim3an8kvrhqnw1wg0m2fcmanm2sj9vvccayy9fl6"; + name = "kaddressbook-17.04.2.tar.xz"; }; }; kajongg = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kajongg-16.12.2.tar.xz"; - sha256 = "0909hzwj8yf6sv97r2rgzbp8l7ixlxxy8nwy8dcv471dznlvqznn"; - name = "kajongg-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kajongg-17.04.2.tar.xz"; + sha256 = "08wzxkhfwagh2awcs4wdg56ks628bwysim5whwhrvw3rzc30v2ig"; + name = "kajongg-17.04.2.tar.xz"; }; }; kalarm = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kalarm-16.12.2.tar.xz"; - sha256 = "1znp4lym95jz93wwn1nrw9q8nkbwg7x489iccndrv4pl93jfsnqk"; - name = "kalarm-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kalarm-17.04.2.tar.xz"; + sha256 = "0km7fzhd8iskg4bkn6x62y9pgcvq8zwrjk3w7qvrx5j6dszjw11w"; + name = "kalarm-17.04.2.tar.xz"; }; }; kalarmcal = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kalarmcal-16.12.2.tar.xz"; - sha256 = "06rx33hdwz940cggr5rg6g1gh84yzz6vrnvk5lrgr8vxqgrssp3s"; - name = "kalarmcal-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kalarmcal-17.04.2.tar.xz"; + sha256 = "0rca71h85rd88fkx0pkxj40c8fnyiwfcnvmczkd9xb729hvrfblk"; + name = "kalarmcal-17.04.2.tar.xz"; }; }; kalgebra = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kalgebra-16.12.2.tar.xz"; - sha256 = "02yykjrsa01r697bk4jsly7762hvml7f67gy33vgywhh8lz3h3cd"; - name = "kalgebra-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kalgebra-17.04.2.tar.xz"; + sha256 = "12496gk238ipi2zmxx4njwc58mx9q3w463qp9ji23abv3c59g44f"; + name = "kalgebra-17.04.2.tar.xz"; }; }; kalzium = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kalzium-16.12.2.tar.xz"; - sha256 = "043prql6bwg2ka6y0inh8h46y7d5060b0h2inw0lhm49vizgkmsh"; - name = "kalzium-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kalzium-17.04.2.tar.xz"; + sha256 = "0gckmnbgym09kq53q0n3jsqfiaz4g7235ylpnwsaids3243jpa06"; + name = "kalzium-17.04.2.tar.xz"; }; }; kamera = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kamera-16.12.2.tar.xz"; - sha256 = "1kxmjpk0vdj9s3kxgcp2vw8dpx4r69j3jwifyvzrh06sg9z0bnqd"; - name = "kamera-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kamera-17.04.2.tar.xz"; + sha256 = "1ikniri791v63zzsng7yjvdil6vz08cw2iz9f0dwxzldlwws41j6"; + name = "kamera-17.04.2.tar.xz"; }; }; kanagram = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kanagram-16.12.2.tar.xz"; - sha256 = "09d20x0z066pgkwp25ig49v78k89nyxs769a3zjmq1y490nm34y1"; - name = "kanagram-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kanagram-17.04.2.tar.xz"; + sha256 = "06yqc197yzzzzga45db8i05q2yr4jyjf5bvry0k22nss3wgsy8mk"; + name = "kanagram-17.04.2.tar.xz"; }; }; kapman = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kapman-16.12.2.tar.xz"; - sha256 = "0g9swdgz8sd49q3sw2107b50ww978nppzp1b7bkv7ygiz49p28bq"; - name = "kapman-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kapman-17.04.2.tar.xz"; + sha256 = "15yyp69m096wbmpi52fi2ca6i83w0agjgsy1j6qiy6ki0fj2xyry"; + name = "kapman-17.04.2.tar.xz"; }; }; kapptemplate = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kapptemplate-16.12.2.tar.xz"; - sha256 = "1agpq16wxbzd7crgbj1cj60alqv090dkvxi2szg054bmks82j6rc"; - name = "kapptemplate-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kapptemplate-17.04.2.tar.xz"; + sha256 = "0v5v6m0z7jgq5lzlpa3qkza3s0amx6xikwcg1lbzivnwfjvyb9nj"; + name = "kapptemplate-17.04.2.tar.xz"; }; }; kate = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kate-16.12.2.tar.xz"; - sha256 = "1hkqzidd2cfp3wg7pq47ymsw1dh26qwn4cybnxw23d95ss85wx2p"; - name = "kate-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kate-17.04.2.tar.xz"; + sha256 = "1bya5xh57icsbx9jmk5w330xm97bjs3amvlnj0i8rplawjzcai8h"; + name = "kate-17.04.2.tar.xz"; }; }; katomic = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/katomic-16.12.2.tar.xz"; - sha256 = "1sgi8npzq3p7qwv3c4q8ji83gp33zxb0i19dx2i6rb45lir3lj68"; - name = "katomic-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/katomic-17.04.2.tar.xz"; + sha256 = "06bdvc8nckckd3rin7q7cjajxv0yzsq6m1jwzmyh90mm2sbq5g0j"; + name = "katomic-17.04.2.tar.xz"; }; }; kblackbox = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kblackbox-16.12.2.tar.xz"; - sha256 = "1cv5kqyqspiz0aaamnyq37s683m2iw27ma6yf3blm5f9g1r43n2k"; - name = "kblackbox-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kblackbox-17.04.2.tar.xz"; + sha256 = "1z6ladzhd1mgcqv0y199wv3dafpmy7h6yfgy7hgl26pqgw2qpz9z"; + name = "kblackbox-17.04.2.tar.xz"; }; }; kblocks = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kblocks-16.12.2.tar.xz"; - sha256 = "1xd5pxpi97nmrp4xglhm2qfpz8ksv8vyq4wrv25qbgvfc8jis790"; - name = "kblocks-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kblocks-17.04.2.tar.xz"; + sha256 = "0a3d4q2kph192zp6lcm2wxh8f55s3wj3wvxvfjk3v5vwjld6a298"; + name = "kblocks-17.04.2.tar.xz"; }; }; kblog = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kblog-16.12.2.tar.xz"; - sha256 = "001mqvahsmf4amxqmz2ah5chlgpp2zi8g4pcg83qb9d65cvr6877"; - name = "kblog-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kblog-17.04.2.tar.xz"; + sha256 = "1w97qkp2mwf7wqjwrrq94sah32cdybgxp2rzs5ypwaszka77xcd9"; + name = "kblog-17.04.2.tar.xz"; }; }; kbounce = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kbounce-16.12.2.tar.xz"; - sha256 = "1gsrafcjk55lbxi2mx382hj2lahlgnn3pv13ldi7zh6ms4sms1wm"; - name = "kbounce-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kbounce-17.04.2.tar.xz"; + sha256 = "1mgbjgbp2wmghvjgyf1s3gjwnwg4c8h6ni01mazqv8jlf0v14g1j"; + name = "kbounce-17.04.2.tar.xz"; }; }; kbreakout = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kbreakout-16.12.2.tar.xz"; - sha256 = "0lwwz17ynhdi6qw76yih8an6p890w8gwh1khsr8casc1wlm04s0y"; - name = "kbreakout-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kbreakout-17.04.2.tar.xz"; + sha256 = "1pydl6p7f8f1jxd6k8d563wwigx52fg850d2x736wzw1nk4vwg8b"; + name = "kbreakout-17.04.2.tar.xz"; }; }; kbruch = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kbruch-16.12.2.tar.xz"; - sha256 = "1n119nkm0385pv8pngsbwxd56v6y6pwh0rshbk0ryd7974i2z4mi"; - name = "kbruch-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kbruch-17.04.2.tar.xz"; + sha256 = "0kpzqlnx3wzygnna5l1rssclz9fkvl6mzr5jnr730d5c3r7hymby"; + name = "kbruch-17.04.2.tar.xz"; }; }; kcachegrind = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcachegrind-16.12.2.tar.xz"; - sha256 = "0wcizav1z3n31n7qcc05mx42vl2rv71c7haaa8vn0ma39rj4iaqv"; - name = "kcachegrind-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcachegrind-17.04.2.tar.xz"; + sha256 = "148wmzq482jarpg0sywdlrjc0bgb2vkg0g2pn7wqj1czijs5l0rv"; + name = "kcachegrind-17.04.2.tar.xz"; }; }; kcalc = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcalc-16.12.2.tar.xz"; - sha256 = "07lyssmkq34ym1w3ajm1vf4f57xv2h8y2zb039vj7gdx609syaq0"; - name = "kcalc-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcalc-17.04.2.tar.xz"; + sha256 = "03lzvhs4kyj9cvhw6kh1xmhs2r9vaa4a9ibqnkjb6xx1nx4cpm84"; + name = "kcalc-17.04.2.tar.xz"; }; }; kcalcore = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcalcore-16.12.2.tar.xz"; - sha256 = "1lq5shp8jwy490qx0rnc0sd67976r7j3sblzw0j5hn95k8n23hzd"; - name = "kcalcore-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcalcore-17.04.2.tar.xz"; + sha256 = "05v1w8k70cdvvw5kv4994llbifrq2almir74i44v4i1449x7ziqn"; + name = "kcalcore-17.04.2.tar.xz"; }; }; kcalutils = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcalutils-16.12.2.tar.xz"; - sha256 = "1sf5f8mwjdi2d8lpkrprnqc9jkj72p6mdz3pbczmixgfy7d7y4ci"; - name = "kcalutils-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcalutils-17.04.2.tar.xz"; + sha256 = "1hj3k4lqj019cy8p7j6f20lkc75g8wma1p8vwynzlclnz43bsikp"; + name = "kcalutils-17.04.2.tar.xz"; }; }; kcharselect = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcharselect-16.12.2.tar.xz"; - sha256 = "0a5cmc6n9h8h64in68qdi8bmqx341fvm8vf98vcqn5sivwwnflhc"; - name = "kcharselect-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcharselect-17.04.2.tar.xz"; + sha256 = "1xw5sd93zkkkp3v75p718bwrd9m391pryb12slrk66nsq1lbw1wn"; + name = "kcharselect-17.04.2.tar.xz"; }; }; kcolorchooser = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcolorchooser-16.12.2.tar.xz"; - sha256 = "07psjid00bjw0s6xx2hq96f8cj2axdsr7lqvgrclksa07lphzcvm"; - name = "kcolorchooser-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcolorchooser-17.04.2.tar.xz"; + sha256 = "156w22x3hx244l6v1zlndl45bxq25nnagji6zl0jspsa4csbzfrn"; + name = "kcolorchooser-17.04.2.tar.xz"; }; }; kcontacts = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcontacts-16.12.2.tar.xz"; - sha256 = "18z7894xh1ifkg177xxy41n61djcy07m8a39favbpab0ya1xk81l"; - name = "kcontacts-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcontacts-17.04.2.tar.xz"; + sha256 = "0nj7kff7yk7pbmq8g65qpj4g489mxfgwh8axbxsz8z31fgsg1i7s"; + name = "kcontacts-17.04.2.tar.xz"; }; }; kcron = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kcron-16.12.2.tar.xz"; - sha256 = "1z72wcrr8ggw89ivq70v98zwg1hw3sn5l5czpq00scqpaf8664g2"; - name = "kcron-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kcron-17.04.2.tar.xz"; + sha256 = "1k3ya01icz65zyl33p3668p6ivkrlfpp95aydfmnfcd2q365vksx"; + name = "kcron-17.04.2.tar.xz"; + }; + }; + kdav = { + version = "17.04.2"; + src = fetchurl { + url = "${mirror}/stable/applications/17.04.2/src/kdav-17.04.2.tar.xz"; + sha256 = "0yhjl9p4rnd6r5jwscxhwgv9d2xkj34mx4hh3rk4mc28bhy3yw9w"; + name = "kdav-17.04.2.tar.xz"; }; }; kdebugsettings = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdebugsettings-16.12.2.tar.xz"; - sha256 = "1zbmvn9c1sjjxiskivl0s4mpmh52hqj7921v2bac7bvqd2hkc5cv"; - name = "kdebugsettings-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdebugsettings-17.04.2.tar.xz"; + sha256 = "1c05zh66ahnm1ann35bm9q93lg6cylrfsyawki8g5485ivxfs5xh"; + name = "kdebugsettings-17.04.2.tar.xz"; }; }; kde-dev-scripts = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-dev-scripts-16.12.2.tar.xz"; - sha256 = "0l4sbzpnczixavyppc3swb09jna44rb61awwgh37ngsz97iza3sx"; - name = "kde-dev-scripts-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-dev-scripts-17.04.2.tar.xz"; + sha256 = "1vid5j08x8pkzzhqr78nsn4r9nnhisvsb7bfl9a1pc609y461y31"; + name = "kde-dev-scripts-17.04.2.tar.xz"; }; }; kde-dev-utils = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-dev-utils-16.12.2.tar.xz"; - sha256 = "0fhf9w5v355jsrr25yhj612gi0qh8kvrbfdfplns04q7viycn44f"; - name = "kde-dev-utils-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-dev-utils-17.04.2.tar.xz"; + sha256 = "1xf20zdlrinp9kxdky9a5lvflxikzdzv2yj211nlir8a63iv0bz7"; + name = "kde-dev-utils-17.04.2.tar.xz"; }; }; kdeedu-data = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdeedu-data-16.12.2.tar.xz"; - sha256 = "05jhqasi5h5dl4xlydx6jmn1i81qd8q8bzimhc2f9bwakkhqf73b"; - name = "kdeedu-data-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdeedu-data-17.04.2.tar.xz"; + sha256 = "1bdh14d9ypai97jcxf1sfaw6ccfnf2ckj677fc8gl8g7fid094np"; + name = "kdeedu-data-17.04.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-mobipocket-16.12.2.tar.xz"; - sha256 = "07mpm55ipdqq6absvhcsrbc3c9xmb3b5bnl5k852mqpp0v36ijs8"; - name = "kdegraphics-mobipocket-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-mobipocket-17.04.2.tar.xz"; + sha256 = "0qyv804a9cvqm0dm77zd79jj27i09jbw2cpgmazg3jn0plb5lkm6"; + name = "kdegraphics-mobipocket-17.04.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-thumbnailers-16.12.2.tar.xz"; - sha256 = "0asv8wjr5nm5i6zylvhn8qgxvpr79yg681rc6mg1liimimwzxia3"; - name = "kdegraphics-thumbnailers-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-thumbnailers-17.04.2.tar.xz"; + sha256 = "06vr377nr59n599dsmi250nak78ka1zkfa8ckp93sasp5nlilbnp"; + name = "kdegraphics-thumbnailers-17.04.2.tar.xz"; }; }; kde-l10n-ar = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ar-16.12.2.tar.xz"; - sha256 = "0an0r2l4vc2sdi4lc2p7iks9gnwasgvxnq81vf3qb40q290x4fim"; - name = "kde-l10n-ar-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ar-17.04.2.tar.xz"; + sha256 = "0w675vdbvms758y9hywjkg72sl37i2q1n8wq7mrqkvbgd7fri198"; + name = "kde-l10n-ar-17.04.2.tar.xz"; }; }; kde-l10n-ast = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ast-16.12.2.tar.xz"; - sha256 = "0fjpypz9w1ic9w75gpp1c71l43x3j8nm37h1bgbqkyik3spxin2l"; - name = "kde-l10n-ast-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ast-17.04.2.tar.xz"; + sha256 = "0v6qsn1x6rgll1hpr482jis0pljmqw0bax31a7vvr16ahp0rlrmk"; + name = "kde-l10n-ast-17.04.2.tar.xz"; }; }; kde-l10n-bg = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bg-16.12.2.tar.xz"; - sha256 = "1iwcs8nz2rfi0b05ypl6mydiw02c64hscy3zlz998nww65x3nks0"; - name = "kde-l10n-bg-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bg-17.04.2.tar.xz"; + sha256 = "0hi7dvv25yji3924983k3fjgxynz1avp6l9amj7frn6g0c68lbp4"; + name = "kde-l10n-bg-17.04.2.tar.xz"; }; }; kde-l10n-bs = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bs-16.12.2.tar.xz"; - sha256 = "0kps4paygx10l2nijwd946wns6sxlgn2771fzv1cmn5h1smffhkn"; - name = "kde-l10n-bs-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bs-17.04.2.tar.xz"; + sha256 = "11sikg952dv75f12rd7sky9rwamr9w4szdqkd9zw9kdgy6q2izn7"; + name = "kde-l10n-bs-17.04.2.tar.xz"; }; }; kde-l10n-ca = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca-16.12.2.tar.xz"; - sha256 = "0r6yccw7fdi2dsz9qf9rccgdmznkc66z5c51asdhrmyzq4x7c7r2"; - name = "kde-l10n-ca-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca-17.04.2.tar.xz"; + sha256 = "0s4j2vqxbpbsira0zyxz13kd59iicam2fhqz6xnlrd769vbfcbbv"; + name = "kde-l10n-ca-17.04.2.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.12.2"; + version = "ca_valencia-17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca@valencia-16.12.2.tar.xz"; - sha256 = "15wpsjzk9z61rpai8dzpzi5j9w57nmhm7fx4b6i5hsr9c4ypmi01"; - name = "kde-l10n-ca_valencia-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca@valencia-17.04.2.tar.xz"; + sha256 = "1dib0xvjcpg996smni56vncdq9wb9jcfr4abvqm7x3v50ip95f7f"; + name = "kde-l10n-ca_valencia-17.04.2.tar.xz"; }; }; kde-l10n-cs = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-cs-16.12.2.tar.xz"; - sha256 = "1z6a3rl7p0wmq6zs8fap052dp5hvlpzxf4xvjxk9c75wl2m9nvlg"; - name = "kde-l10n-cs-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-cs-17.04.2.tar.xz"; + sha256 = "05hjzfrzafb9xabsb15lq5hl152brqf68hvl3h0vsmxyw7hqzxrj"; + name = "kde-l10n-cs-17.04.2.tar.xz"; }; }; kde-l10n-da = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-da-16.12.2.tar.xz"; - sha256 = "0zi7h0cvzza1ly88821fsl2bnr2vn524rrdqsfc9yj3z1jbpnn2h"; - name = "kde-l10n-da-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-da-17.04.2.tar.xz"; + sha256 = "05g8vh33fxvi6dmj6ryr6i2j3l4fd4cj3dkzch76bgvi00750fah"; + name = "kde-l10n-da-17.04.2.tar.xz"; }; }; kde-l10n-de = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-de-16.12.2.tar.xz"; - sha256 = "0s1c22ad1r0qxpkc878gxz2wqkb52qrn1k753kqpn9105p5l92fh"; - name = "kde-l10n-de-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-de-17.04.2.tar.xz"; + sha256 = "1hiqbscd2py88z45g7blbj74ayqj4mmgy0b8z6hcxn9n0ph4sidb"; + name = "kde-l10n-de-17.04.2.tar.xz"; }; }; kde-l10n-el = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-el-16.12.2.tar.xz"; - sha256 = "02d4j12yr4v9apa3iziza611v6cgjf6725wgd41g00pj41p61kcq"; - name = "kde-l10n-el-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-el-17.04.2.tar.xz"; + sha256 = "066n3r1vi9j8nln4xyhgpjhsl7gwhl6q7gqbdcp6zpwgxhwv6zic"; + name = "kde-l10n-el-17.04.2.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.12.2"; + version = "en_GB-17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-en_GB-16.12.2.tar.xz"; - sha256 = "09h3zsq5qhzyagl8xysv74g2iv26739y02xgbwv5dahv0iln99rs"; - name = "kde-l10n-en_GB-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-en_GB-17.04.2.tar.xz"; + sha256 = "1307v713djkhny8rcg2schcwljn1cp728yllh227m30znprrqn41"; + name = "kde-l10n-en_GB-17.04.2.tar.xz"; }; }; kde-l10n-eo = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eo-16.12.2.tar.xz"; - sha256 = "1isqdnnj1g9jxagns3yq611pfd6nbanji9a8igfgm55djj5hx527"; - name = "kde-l10n-eo-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eo-17.04.2.tar.xz"; + sha256 = "06i2m3g4s4raa1vzynfw5m89ydkcgjlbd96a4qxx76v888q65lsl"; + name = "kde-l10n-eo-17.04.2.tar.xz"; }; }; kde-l10n-es = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-es-16.12.2.tar.xz"; - sha256 = "0h3c5an1i072rk9mkc9mc6k3bvlk37slhgl6qy3rs2l77mhhnpyi"; - name = "kde-l10n-es-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-es-17.04.2.tar.xz"; + sha256 = "1al4figznf5f6lgpz2l57x01n87jlaqxldgp7gi545672lxzyx44"; + name = "kde-l10n-es-17.04.2.tar.xz"; }; }; kde-l10n-et = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-et-16.12.2.tar.xz"; - sha256 = "0dpkxwpl17pgimx94v67wq90fzdayp6p3wcz7y0g8b0hn3bsbidj"; - name = "kde-l10n-et-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-et-17.04.2.tar.xz"; + sha256 = "1dhqk1sj32pij4wc4pgfih3i8g3jf9b223rnraymhbsima200hx4"; + name = "kde-l10n-et-17.04.2.tar.xz"; }; }; kde-l10n-eu = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eu-16.12.2.tar.xz"; - sha256 = "0q7l5s502ayr2vfa4ysvk4c6k5i8y5ci6yb34mm3lpwlain3bssb"; - name = "kde-l10n-eu-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eu-17.04.2.tar.xz"; + sha256 = "0kix9qs15488ns71hv67yvp3w03n68lxjll6cjxhyhrfcji9ldwc"; + name = "kde-l10n-eu-17.04.2.tar.xz"; }; }; kde-l10n-fa = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fa-16.12.2.tar.xz"; - sha256 = "03qvv814kvddf24fjvg55pbxaq58kc936b5qwbddxjr05n1dy964"; - name = "kde-l10n-fa-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fa-17.04.2.tar.xz"; + sha256 = "1867hgiqh51f6nzdmkq6nplnq7hs22lvzpishckhzw8x770sv10b"; + name = "kde-l10n-fa-17.04.2.tar.xz"; }; }; kde-l10n-fi = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fi-16.12.2.tar.xz"; - sha256 = "0902bbyi10vpn0qn0xn46p8fy98kaa4cvlgnn4cb2dgp8q3kni8j"; - name = "kde-l10n-fi-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fi-17.04.2.tar.xz"; + sha256 = "1p4agangwvdzcx9029wslq5228wkgk4kpxddi2alzhlcxd25fk7b"; + name = "kde-l10n-fi-17.04.2.tar.xz"; }; }; kde-l10n-fr = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fr-16.12.2.tar.xz"; - sha256 = "0zjlryvyq8z2llrba4hp3awz5hq74b6z21wp2x86g4k6y154i0as"; - name = "kde-l10n-fr-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fr-17.04.2.tar.xz"; + sha256 = "0lby60rklzcjk62qw2inslvhv4fli57kjn6a76hidcwvwmi3kcyh"; + name = "kde-l10n-fr-17.04.2.tar.xz"; }; }; kde-l10n-ga = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ga-16.12.2.tar.xz"; - sha256 = "1gwd4r28qv5sh4r008nq5mdzzb8cwq8dg17r19l3syydxxhjlf86"; - name = "kde-l10n-ga-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ga-17.04.2.tar.xz"; + sha256 = "06xkiizvcsg61ww8gdqjn84ymhwcxr9pkf8p0g5mrplvnxc9v1ys"; + name = "kde-l10n-ga-17.04.2.tar.xz"; }; }; kde-l10n-gl = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-gl-16.12.2.tar.xz"; - sha256 = "1jka29dh5aqdzgmqc9rf3lmrq4mm4vahhsk2klhp12ajzp9dgg70"; - name = "kde-l10n-gl-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-gl-17.04.2.tar.xz"; + sha256 = "059xv4a7mgf16h3wj2m4j1f32r8msvk0fdw62dlfypk0xi8lnzch"; + name = "kde-l10n-gl-17.04.2.tar.xz"; }; }; kde-l10n-he = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-he-16.12.2.tar.xz"; - sha256 = "0g87g0mpa3i59fk4fm5hk2z54s07cy9niy2kal50fbm5lnr7czfk"; - name = "kde-l10n-he-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-he-17.04.2.tar.xz"; + sha256 = "1w3rc832ngw91m1yrd988hxp8y0aaqgvkizkgmjiki0gqk3fkj25"; + name = "kde-l10n-he-17.04.2.tar.xz"; }; }; kde-l10n-hi = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hi-16.12.2.tar.xz"; - sha256 = "05q608wic0ssx0d14n39s786k8xw86hc560ywfs3k89v973nba5b"; - name = "kde-l10n-hi-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hi-17.04.2.tar.xz"; + sha256 = "1kd4yxq3m5kg3crn6w86aiipslkfa4z79prm3fd6d4a5zpacmqbf"; + name = "kde-l10n-hi-17.04.2.tar.xz"; }; }; kde-l10n-hr = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hr-16.12.2.tar.xz"; - sha256 = "0sm7ba6x3hgw1ml6qm00g9dfi56w2kx3pk37944l3r4jx2wdqs4f"; - name = "kde-l10n-hr-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hr-17.04.2.tar.xz"; + sha256 = "1m3avcrbyz31ir8qwwf9lhl4xr4qg241j99jbv28mgmsiv73ifji"; + name = "kde-l10n-hr-17.04.2.tar.xz"; }; }; kde-l10n-hu = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hu-16.12.2.tar.xz"; - sha256 = "1qcdqm6wjcgd5br99mm93lwlaxk5dvrliyj1ff4bxfxx0cabhx2g"; - name = "kde-l10n-hu-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hu-17.04.2.tar.xz"; + sha256 = "1vh94d0ffjak5gwf4flgc2giq6vswyh57i334sq7n3vbpg6rwh7s"; + name = "kde-l10n-hu-17.04.2.tar.xz"; }; }; kde-l10n-ia = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ia-16.12.2.tar.xz"; - sha256 = "0r1fryhi4czgbl1r228zry0msk11s075y15i4flznwdps99s5q8c"; - name = "kde-l10n-ia-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ia-17.04.2.tar.xz"; + sha256 = "0k391rwrrj6bd86nd791pk0ih7g3z1b7vva43dmlishh5xind12p"; + name = "kde-l10n-ia-17.04.2.tar.xz"; }; }; kde-l10n-id = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-id-16.12.2.tar.xz"; - sha256 = "1lz51bilx8dziiff65l91pknif9w7390q3l9amdlcjq86cj44khz"; - name = "kde-l10n-id-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-id-17.04.2.tar.xz"; + sha256 = "13pfybpngzv1lscd3q4x4qh8kxs2k7md9biyibrs1vpyr28jw01c"; + name = "kde-l10n-id-17.04.2.tar.xz"; }; }; kde-l10n-is = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-is-16.12.2.tar.xz"; - sha256 = "08bqhxppib360ywzmphjqx5yalzr3bgwpqkff79rl5ffq9dd4psv"; - name = "kde-l10n-is-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-is-17.04.2.tar.xz"; + sha256 = "19cngzf26438amwfc7prz6hrszlqr78j2w9djm7y24gy7r6blfjq"; + name = "kde-l10n-is-17.04.2.tar.xz"; }; }; kde-l10n-it = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-it-16.12.2.tar.xz"; - sha256 = "12k9vqdr2nrcqh535crylxrmznndx7bkwz68vrdvqidlabd0ci7m"; - name = "kde-l10n-it-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-it-17.04.2.tar.xz"; + sha256 = "0wfsvrhmmarl277qvgwh4w9nl3rcqslkd4fjsl88m7230xzcjy6k"; + name = "kde-l10n-it-17.04.2.tar.xz"; }; }; kde-l10n-ja = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ja-16.12.2.tar.xz"; - sha256 = "0i9hc66qlnq0yij9d3754m5wa2wkra95wcdbp6xwk82ws7lkckai"; - name = "kde-l10n-ja-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ja-17.04.2.tar.xz"; + sha256 = "1b41f8pki75rc2swjaf1hvdvvjqvfz0glawrh4dda872naw65mhy"; + name = "kde-l10n-ja-17.04.2.tar.xz"; }; }; kde-l10n-kk = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-kk-16.12.2.tar.xz"; - sha256 = "1h9scz1z046szxf54702w3wzlsvzr8016rx9fwg7z5fc1vpkhxxn"; - name = "kde-l10n-kk-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-kk-17.04.2.tar.xz"; + sha256 = "01jrsjwlv10qdyzlwljf74cdwxprmsfvhi1pdlhv271z2ix661w5"; + name = "kde-l10n-kk-17.04.2.tar.xz"; }; }; kde-l10n-km = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-km-16.12.2.tar.xz"; - sha256 = "09vw686y9qdx09cz58d11ldqz5bsnch1sx2dsbxvp1drypb1nhxk"; - name = "kde-l10n-km-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-km-17.04.2.tar.xz"; + sha256 = "1fw62awnkmk7q4ybjqiszj8d0jkmm247lq25l6h8zsmidc9x4xz9"; + name = "kde-l10n-km-17.04.2.tar.xz"; }; }; kde-l10n-ko = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ko-16.12.2.tar.xz"; - sha256 = "1q9kla2djqsvkj773wybxb1lds50v0lg3jkfpnrg2pvm49jl2c9g"; - name = "kde-l10n-ko-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ko-17.04.2.tar.xz"; + sha256 = "1b5pqr5q7kn4vh7p8kngsw82ya7lv1jzbn8ngzrr8qkf6hh6ig2a"; + name = "kde-l10n-ko-17.04.2.tar.xz"; }; }; kde-l10n-lt = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lt-16.12.2.tar.xz"; - sha256 = "1i6nzmqm1sl895x7hnsk9snw2ci8cbdvswdfbvllqivcd8l4vmg5"; - name = "kde-l10n-lt-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lt-17.04.2.tar.xz"; + sha256 = "06pn3dx7dx26w16lfcwdrzphakvnk709bs5mki9p08pdmamjdr7w"; + name = "kde-l10n-lt-17.04.2.tar.xz"; }; }; kde-l10n-lv = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lv-16.12.2.tar.xz"; - sha256 = "0why1sa09pd7pwwa57c27y969ijgmjsmni8x7n9gxx5w0317kq9d"; - name = "kde-l10n-lv-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lv-17.04.2.tar.xz"; + sha256 = "0a2kchx1qkyqzmqa7ajadfpxa5zywyhv55db5qax2xncz1w7v515"; + name = "kde-l10n-lv-17.04.2.tar.xz"; }; }; kde-l10n-mr = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-mr-16.12.2.tar.xz"; - sha256 = "0wkncbs5di9vlcfqbc8g4msp6kp926049jlkj4jhvgj1in434ay8"; - name = "kde-l10n-mr-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-mr-17.04.2.tar.xz"; + sha256 = "0mjg9v484ayafgdz0z6ahsqsdlyn3iv9sa0xwg2x2fc04r5k5dni"; + name = "kde-l10n-mr-17.04.2.tar.xz"; }; }; kde-l10n-nb = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nb-16.12.2.tar.xz"; - sha256 = "0p9yq33jzh83c1471072p94mrx8jazrinb987ifrl5lk8m54k34z"; - name = "kde-l10n-nb-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nb-17.04.2.tar.xz"; + sha256 = "0bxq83qg39ivcr0qvxb0cd0q9mkjwp9j4h86s14wp5yq6jp0vcni"; + name = "kde-l10n-nb-17.04.2.tar.xz"; }; }; kde-l10n-nds = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nds-16.12.2.tar.xz"; - sha256 = "1yb7axm4k1rlfp41s9q8ql7l2mjbyrf7ry1ww7c1rprcb93gm7f8"; - name = "kde-l10n-nds-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nds-17.04.2.tar.xz"; + sha256 = "0rpdbk83rmj24m3by7igvab5aaskizfqxwfyvcjj0zhxpals0px4"; + name = "kde-l10n-nds-17.04.2.tar.xz"; }; }; kde-l10n-nl = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nl-16.12.2.tar.xz"; - sha256 = "04d75kfxxijb4a7xk5saxz5vbrwfsl2nx0i4x3d4i2k06wzysvch"; - name = "kde-l10n-nl-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nl-17.04.2.tar.xz"; + sha256 = "180dsd92qap14pkqr4xv63zdaqz4s1jyx590d705yvbf3mkc1bwx"; + name = "kde-l10n-nl-17.04.2.tar.xz"; }; }; kde-l10n-nn = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nn-16.12.2.tar.xz"; - sha256 = "09vmvvmakcybgy6zl51xj05wflq88xkbjmns4wv42jf0fn4kipif"; - name = "kde-l10n-nn-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nn-17.04.2.tar.xz"; + sha256 = "1vbb3jvhhv8pksff8330i2b2qjksb4lksw3pb52ph2h77gb36bh3"; + name = "kde-l10n-nn-17.04.2.tar.xz"; }; }; kde-l10n-pa = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pa-16.12.2.tar.xz"; - sha256 = "0nv9pch0s24aamcz8lgbs26kp343kyw0rnz4a7myzcrb8g8sm0d3"; - name = "kde-l10n-pa-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pa-17.04.2.tar.xz"; + sha256 = "0v0a6bcrnrpy2ayj7d4v6lfgaxly3nk3d6dgmy26nydgmyg0xfsa"; + name = "kde-l10n-pa-17.04.2.tar.xz"; }; }; kde-l10n-pl = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pl-16.12.2.tar.xz"; - sha256 = "1bxhcqwmcfl2srfrn50ib57890m3m6w4x9vwn24qxwapb9s6nzav"; - name = "kde-l10n-pl-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pl-17.04.2.tar.xz"; + sha256 = "0chzlzyxjhh1rv4gl7pbph7fs09p932mkl7az8yihj3zl5cvw82n"; + name = "kde-l10n-pl-17.04.2.tar.xz"; }; }; kde-l10n-pt = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt-16.12.2.tar.xz"; - sha256 = "02x96cdvrbdcmrhnn4pamsdnr8m530p047avh82xvjvqywsnqf7z"; - name = "kde-l10n-pt-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt-17.04.2.tar.xz"; + sha256 = "14yp29l7fb2jlpx2dd12zn64q39yf7p9p79iynjsg3spwfdm5zpi"; + name = "kde-l10n-pt-17.04.2.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.12.2"; + version = "pt_BR-17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt_BR-16.12.2.tar.xz"; - sha256 = "17155laifayfb5c2hznlpnmaa8kwxzlmk7yb2skrf92fzzqx2379"; - name = "kde-l10n-pt_BR-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt_BR-17.04.2.tar.xz"; + sha256 = "12g1mbdhw18pga063gczsxvmigdwgncc0qk8vy1rj6h5q3w6kkfm"; + name = "kde-l10n-pt_BR-17.04.2.tar.xz"; }; }; kde-l10n-ro = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ro-16.12.2.tar.xz"; - sha256 = "1zsng3m031cbyz1jl5lv1fjg5vb3ig3pk0gaamvxbs6fxaz14ss3"; - name = "kde-l10n-ro-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ro-17.04.2.tar.xz"; + sha256 = "0sqym2mx927pfvdq5lny64scg80xyrz3q1vlg3sk8gyil0n942gv"; + name = "kde-l10n-ro-17.04.2.tar.xz"; }; }; kde-l10n-ru = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ru-16.12.2.tar.xz"; - sha256 = "1shs2j4kqqf2b8jz2691yi45f5bpsr9nx2i5j67mmn94dnds4ps6"; - name = "kde-l10n-ru-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ru-17.04.2.tar.xz"; + sha256 = "1gcy1ssir2fgg1djv7jbh9jv3y1pxs3yrxaqdd0m4zdkva1knx5p"; + name = "kde-l10n-ru-17.04.2.tar.xz"; }; }; kde-l10n-sk = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sk-16.12.2.tar.xz"; - sha256 = "1397sxczn9jdxbab3d9296w15swc40a8ypa3f4yhckqm4nmr8xn1"; - name = "kde-l10n-sk-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sk-17.04.2.tar.xz"; + sha256 = "0yq5b9z77bijfa3y1dx2d6avpirwzbdsz9zng93r8a3lzyv3syfi"; + name = "kde-l10n-sk-17.04.2.tar.xz"; }; }; kde-l10n-sl = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sl-16.12.2.tar.xz"; - sha256 = "1z14sbdk5zdshn36wija4hkj7l825i336bz92rq42f8by4mha0h4"; - name = "kde-l10n-sl-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sl-17.04.2.tar.xz"; + sha256 = "1k117r37waxlxhdhlh7s2fii2iyv8himfkxnbm4lcxfbmhqj82cn"; + name = "kde-l10n-sl-17.04.2.tar.xz"; }; }; kde-l10n-sr = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sr-16.12.2.tar.xz"; - sha256 = "12v6whnydgxxpx9vl3pimnxqny22kfiv51i1r9dk6vfqik18kxzy"; - name = "kde-l10n-sr-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sr-17.04.2.tar.xz"; + sha256 = "17xpb1q7qamz70qbg2k9i4jfbz1qsv4n0j5hw4ix9bm2dncaaqa9"; + name = "kde-l10n-sr-17.04.2.tar.xz"; }; }; kde-l10n-sv = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sv-16.12.2.tar.xz"; - sha256 = "10dzz39779lbb5mcnnmhwm86pkwc2g5qyiqg5jzpf0mg1zbl9y3w"; - name = "kde-l10n-sv-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sv-17.04.2.tar.xz"; + sha256 = "1xlzc96pcwlbja3m0m15ii8n4lxf8h8ganyyh43zgxikcibcny70"; + name = "kde-l10n-sv-17.04.2.tar.xz"; }; }; kde-l10n-tr = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-tr-16.12.2.tar.xz"; - sha256 = "0m4rgz7ha2i9bladavc5g3n94kai82ilx8akd2jcxz6q3wb75r0r"; - name = "kde-l10n-tr-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-tr-17.04.2.tar.xz"; + sha256 = "1fmmwv85cgazk655hdaykljjrh4cgghh0wkjf57n8lkkc7503278"; + name = "kde-l10n-tr-17.04.2.tar.xz"; }; }; kde-l10n-ug = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ug-16.12.2.tar.xz"; - sha256 = "1kjdiy92pi5vdxbfy61ckq8j9pc8kmrccfqnlm7yqvh8p5i28p2x"; - name = "kde-l10n-ug-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ug-17.04.2.tar.xz"; + sha256 = "0l350qq3bfbvs7621lrl9azlx4mw5vdlrndp606v878abxaw16bh"; + name = "kde-l10n-ug-17.04.2.tar.xz"; }; }; kde-l10n-uk = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-uk-16.12.2.tar.xz"; - sha256 = "1nhclnwy5lgkzhs6lm8dkhh4957v78rv2d9ss13a1jn2salz5kfv"; - name = "kde-l10n-uk-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-uk-17.04.2.tar.xz"; + sha256 = "1xnkknd2k8zdiq322nbiim9hg7gvww5zv3x7gqjrrqy7nha75mh4"; + name = "kde-l10n-uk-17.04.2.tar.xz"; }; }; kde-l10n-wa = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-wa-16.12.2.tar.xz"; - sha256 = "12f2kvks21hj5gjqjys7fa295148j0ndhxbzs5jysl0zq9y4909j"; - name = "kde-l10n-wa-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-wa-17.04.2.tar.xz"; + sha256 = "1f9sphx3rlc5m1ji0ihxs3p6wb7b53acfjyd5vps3b3cbf3j4aa3"; + name = "kde-l10n-wa-17.04.2.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.12.2"; + version = "zh_CN-17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_CN-16.12.2.tar.xz"; - sha256 = "1v21kap5lyzgygqv02jjx9yrfnkjkk0qrd85l0pjhqjyycs5r97w"; - name = "kde-l10n-zh_CN-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_CN-17.04.2.tar.xz"; + sha256 = "1258f5s3pg6a9mfniwdf44w3y6pnf14m8nmqpfy534z68ypw6ymw"; + name = "kde-l10n-zh_CN-17.04.2.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.12.2"; + version = "zh_TW-17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_TW-16.12.2.tar.xz"; - sha256 = "049q9d9ykhxk0dkmm4aw7fx1aa39s5cslk4011335jmg1msmrfna"; - name = "kde-l10n-zh_TW-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_TW-17.04.2.tar.xz"; + sha256 = "0qz66hz1yabdgx3yq7cc6i5w9m01yp8pjrh46blskq6apwfwdhmg"; + name = "kde-l10n-zh_TW-17.04.2.tar.xz"; }; }; kdelibs = { - version = "4.14.29"; + version = "4.14.33"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdelibs-4.14.29.tar.xz"; - sha256 = "0xvw0cscvz8arclgfhrrbgdg94mz4h9y33nyndlsw67qrbg8slqv"; - name = "kdelibs-4.14.29.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz"; + sha256 = "0594ak7d93sqk293p3jdi0mad2wwglk7m7x6sgj2jgaxjn3c5amq"; + name = "kdelibs-4.14.33.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdenetwork-filesharing-16.12.2.tar.xz"; - sha256 = "0q43c2xim5ibxyib1xz1wfz6bigkmk97bkvy9wrlk869c0qvrcn5"; - name = "kdenetwork-filesharing-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdenetwork-filesharing-17.04.2.tar.xz"; + sha256 = "1fac78wbh61vsk1ibkvhffgnlpds9a6ax6jyly2n9lrcqifann64"; + name = "kdenetwork-filesharing-17.04.2.tar.xz"; }; }; kdenlive = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdenlive-16.12.2.tar.xz"; - sha256 = "116lk641qlx8jkiaxm54g6svc6adg0bilhf634cyc8c46991a8z7"; - name = "kdenlive-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdenlive-17.04.2.tar.xz"; + sha256 = "1jzwar4bdjrbf97i9g6njzibv3ywcwha4cjkmj70pql67d5nmki9"; + name = "kdenlive-17.04.2.tar.xz"; }; }; kdepim-addons = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdepim-addons-16.12.2.tar.xz"; - sha256 = "1gi87bbdkj8cwinhicr5r6qxysc5rmylj8gajn0qh99rsyxy52dn"; - name = "kdepim-addons-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdepim-addons-17.04.2.tar.xz"; + sha256 = "08hcgkjk3mwlg07g5k2b02kc67xyp2kxgh80f0v342kg455lq3fw"; + name = "kdepim-addons-17.04.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdepim-apps-libs-16.12.2.tar.xz"; - sha256 = "07imq7nb1aqan8pbapvqg9mkzj18pj1v9xah9lpi6k64rhh0bkw9"; - name = "kdepim-apps-libs-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdepim-apps-libs-17.04.2.tar.xz"; + sha256 = "1ala5hqzhpny0sncm96kpalj7dxkh06p6j0sk3725lpjqhr1ng15"; + name = "kdepim-apps-libs-17.04.2.tar.xz"; }; }; kdepim-runtime = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdepim-runtime-16.12.2.tar.xz"; - sha256 = "0wd04zhc7nq2qf8iyjqf036bjs5by0zl0c58hl8r579b7gp5xljz"; - name = "kdepim-runtime-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdepim-runtime-17.04.2.tar.xz"; + sha256 = "16crq3yc7djsas9klg1vl9nmk27fqj9770lfpysgz0pglb6j6k92"; + name = "kdepim-runtime-17.04.2.tar.xz"; }; }; kde-runtime = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kde-runtime-16.12.2.tar.xz"; - sha256 = "1bsnb7inxqv652vq9izwdj02gi15xxf34my51kdq2xk9dn2kmj8x"; - name = "kde-runtime-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kde-runtime-17.04.2.tar.xz"; + sha256 = "1885cyarf6g460mnfl1wij0xg5n4z7w406lmlrk1w4h90ql48j69"; + name = "kde-runtime-17.04.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdesdk-kioslaves-16.12.2.tar.xz"; - sha256 = "18wd4lb3v2br40xclsig718r8mqs5hgl7xw13pq5bfqk5kx11md1"; - name = "kdesdk-kioslaves-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdesdk-kioslaves-17.04.2.tar.xz"; + sha256 = "10sigid2zwgjfw737gr4wmm2ajx31v1y8y28l7dqd6y4jlkzf34j"; + name = "kdesdk-kioslaves-17.04.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdesdk-thumbnailers-16.12.2.tar.xz"; - sha256 = "1jjchrbpyxjzs4zv68av53zhnlj46705261p0ad7x9ayb1mdrr24"; - name = "kdesdk-thumbnailers-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdesdk-thumbnailers-17.04.2.tar.xz"; + sha256 = "1bq36gqqkf2cklj6rh35r88d4vknn22p0x3p6mq9ixca0sw7yc4a"; + name = "kdesdk-thumbnailers-17.04.2.tar.xz"; }; }; kdf = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdf-16.12.2.tar.xz"; - sha256 = "0zkwqqrcna2f9j4g798lhdi2v5j9p6r3zqkhf7clh4nk2c6f766k"; - name = "kdf-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdf-17.04.2.tar.xz"; + sha256 = "00g9jyl4bxmrbxri1q3893gw362v4rzp0gpc94d46v2vi6xqb501"; + name = "kdf-17.04.2.tar.xz"; }; }; kdialog = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdialog-16.12.2.tar.xz"; - sha256 = "0jrp06zbdj5c3nigdard0a7whb3lg8j2lgnf3dp2gf7iqj8gb189"; - name = "kdialog-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdialog-17.04.2.tar.xz"; + sha256 = "184fyajhv4isirlv4sp8w2zxr7zkijknhsh6a1qpvr1r48ivw5aw"; + name = "kdialog-17.04.2.tar.xz"; }; }; kdiamond = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kdiamond-16.12.2.tar.xz"; - sha256 = "1bflb2lbhahwmcqzck0xbr39rcbyaw4fzjaalbsdf9n5mk5ixmxs"; - name = "kdiamond-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kdiamond-17.04.2.tar.xz"; + sha256 = "0krnb2g63zww655xmx1yn1105zkqryid5ip2vkn3cva2l1x8zfwr"; + name = "kdiamond-17.04.2.tar.xz"; }; }; keditbookmarks = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/keditbookmarks-16.12.2.tar.xz"; - sha256 = "16a2sq92r6nq7ksp905xp9v3fv8ynhfp9hslq4a46v71an06yh4p"; - name = "keditbookmarks-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/keditbookmarks-17.04.2.tar.xz"; + sha256 = "12s9v5m681f9sz49h1xdnpriik8q2zswgr051kvvckbdrxj46rqc"; + name = "keditbookmarks-17.04.2.tar.xz"; }; }; kfilereplace = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kfilereplace-16.12.2.tar.xz"; - sha256 = "086x9k71s2bc80863vlfryblg0cyw1qhk20vwhxmq81xkxsah6ky"; - name = "kfilereplace-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kfilereplace-17.04.2.tar.xz"; + sha256 = "1das2szmhw3lcpl2r3cqcylx3dx3xnvqclnasr3h5ahg4z86aqhn"; + name = "kfilereplace-17.04.2.tar.xz"; }; }; kfind = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kfind-16.12.2.tar.xz"; - sha256 = "0jpn75d331qiyhqswflkad5nc5r6c21q1d8236k2qvcm80xp10bm"; - name = "kfind-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kfind-17.04.2.tar.xz"; + sha256 = "0d04p14fzwryf9kjx7ancqi9cfhsmy9xc9ylyi7frbafr6kac5va"; + name = "kfind-17.04.2.tar.xz"; }; }; kfloppy = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kfloppy-16.12.2.tar.xz"; - sha256 = "1q1fh16msixpn59y0yglmjbib6a5c9pb3hpmcd5vsiy2ilpgffbm"; - name = "kfloppy-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kfloppy-17.04.2.tar.xz"; + sha256 = "1f2aah2kskvyxpwkglv38ql955x1870saycym20b058dirinxg42"; + name = "kfloppy-17.04.2.tar.xz"; }; }; kfourinline = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kfourinline-16.12.2.tar.xz"; - sha256 = "1df3si16d4ra3x3v9m4kiknlflx1ac10fq3vydcsn4yi89rhx2ix"; - name = "kfourinline-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kfourinline-17.04.2.tar.xz"; + sha256 = "1423hcikj2fyy26vm5nl5q5pg6xbsjppkvd6qhjwzj9csd9m2ysr"; + name = "kfourinline-17.04.2.tar.xz"; }; }; kgeography = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kgeography-16.12.2.tar.xz"; - sha256 = "1sw7blr264p88702718m5ch9qdzyd5krpf5qjvfhypx0fgzr40b6"; - name = "kgeography-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kgeography-17.04.2.tar.xz"; + sha256 = "1f7g9i4a2phi5gi5h6phn4w8l1yw2hf862yl6wwsgp4lb3agwcjb"; + name = "kgeography-17.04.2.tar.xz"; }; }; kget = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kget-16.12.2.tar.xz"; - sha256 = "1qiwcbdvr9g7cgqm4i3gcc6aw60d36n2m8a7faqa28srrw8f55lj"; - name = "kget-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kget-17.04.2.tar.xz"; + sha256 = "0hnizzplcmhvkyl270bbsi587f6adb1n6vpjji1scwnfjz42pjma"; + name = "kget-17.04.2.tar.xz"; }; }; kgoldrunner = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kgoldrunner-16.12.2.tar.xz"; - sha256 = "0sa7yf3656f8mib785xdv7q86gsslx1hwy69vqrnrfwg24vzx3gy"; - name = "kgoldrunner-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kgoldrunner-17.04.2.tar.xz"; + sha256 = "0ihh2qr7dn5ibax0ljh7ahzhr193a5ghmzgaxkfk4649qc34vnx5"; + name = "kgoldrunner-17.04.2.tar.xz"; }; }; kgpg = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kgpg-16.12.2.tar.xz"; - sha256 = "082fvxpawhsvfn6c1y32rvgp2qcim6lnk1gpp92cgn6k70dcx4lr"; - name = "kgpg-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz"; + sha256 = "0svr1qv9g6dm1m5ilbyws1mhrdjjq31iw0dwza3fri3vsmhhqpmx"; + name = "kgpg-17.04.2.tar.xz"; }; }; khangman = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/khangman-16.12.2.tar.xz"; - sha256 = "1v57za5bqhppc1fy2xd7d1x1fvanwxgl3xzckfz1k7kbx1kcpn1s"; - name = "khangman-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/khangman-17.04.2.tar.xz"; + sha256 = "1g06sm5fwdhysj7hjsrdj19hdf0q1kzc5li4h6klp4gim8hzji7w"; + name = "khangman-17.04.2.tar.xz"; }; }; khelpcenter = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/khelpcenter-16.12.2.tar.xz"; - sha256 = "1cij7v57zs14ynvmplcgn14m30hdc554kvrsbjgb695kmcvm1jv9"; - name = "khelpcenter-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/khelpcenter-17.04.2.tar.xz"; + sha256 = "0zggqlyfgmpxgvjy83lqah9y927xzj8dy13pih0slnk01z50386c"; + name = "khelpcenter-17.04.2.tar.xz"; }; }; kholidays = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kholidays-16.12.2.tar.xz"; - sha256 = "0pybdq2asx10sxf4kz1p85yfs66dhccz2xvf95n8hky7833kqs1n"; - name = "kholidays-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kholidays-17.04.2.tar.xz"; + sha256 = "1cyncg08binky75n93r0l5qlx1zw73dqx3xp4i7xajc7qkmiy1x9"; + name = "kholidays-17.04.2.tar.xz"; }; }; kidentitymanagement = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kidentitymanagement-16.12.2.tar.xz"; - sha256 = "0wv7b3rfysbsj87xgp5ymy5glh9p12i9x8ffv483nm8xqyzwaa9p"; - name = "kidentitymanagement-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kidentitymanagement-17.04.2.tar.xz"; + sha256 = "00pxbbnl4l4cq5mlmgf89ndfy4wykbfvhslws4is6wm3qf9v99gm"; + name = "kidentitymanagement-17.04.2.tar.xz"; }; }; kig = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kig-16.12.2.tar.xz"; - sha256 = "0v261pb1l7cnjkqcqfg3885wxa2hb2bgdk0a1dcwrg4q6fr9kw1g"; - name = "kig-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kig-17.04.2.tar.xz"; + sha256 = "0w1gl28rqqprijlqsfc8x6qjjc6nylniqvlpm71rgiwyq0zpyl1p"; + name = "kig-17.04.2.tar.xz"; }; }; kigo = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kigo-16.12.2.tar.xz"; - sha256 = "19sns6w32pm12634xqxx53hgpmrb4ggzx2idcx3ldknbixhmqm7c"; - name = "kigo-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kigo-17.04.2.tar.xz"; + sha256 = "01yjdwcfwibw1c7dgk2alyp9mj9vy70fki0zf85gi91cwkrqklsi"; + name = "kigo-17.04.2.tar.xz"; }; }; killbots = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/killbots-16.12.2.tar.xz"; - sha256 = "1cc2ddmp7a21yn0aavbh887j4xmzm2a6xlyq71b3msraw3p5vbmy"; - name = "killbots-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/killbots-17.04.2.tar.xz"; + sha256 = "09a6h7q0nwj4lk81mrh1cpi27pjyxpdrk9lr2kgmjxgksavsi1p6"; + name = "killbots-17.04.2.tar.xz"; }; }; kimagemapeditor = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kimagemapeditor-16.12.2.tar.xz"; - sha256 = "0n82v73da8hnan2c96g2lxy826dg6xhln28wwr8iib89zd5gmbi6"; - name = "kimagemapeditor-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kimagemapeditor-17.04.2.tar.xz"; + sha256 = "00ln9mkmsky4fjn931d6y94f34fp7p11cx2vg1rafxzygr4zv0wz"; + name = "kimagemapeditor-17.04.2.tar.xz"; }; }; kimap = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kimap-16.12.2.tar.xz"; - sha256 = "04shglmr8rv5r16qb3n9x7vwrsm55121rkj9pz1y7l40kybajl87"; - name = "kimap-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kimap-17.04.2.tar.xz"; + sha256 = "1g0j3n1ybx4vwyil7nic4rva2xn0dc86kbh1awcrk5q61pvkwmlr"; + name = "kimap-17.04.2.tar.xz"; }; }; kio-extras = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kio-extras-16.12.2.tar.xz"; - sha256 = "0bfjmggyl7x7nmkqq10pmcc2507yfkbv5c5v86225g9mk02frmhp"; - name = "kio-extras-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kio-extras-17.04.2.tar.xz"; + sha256 = "1k84yn9q5w0wsa0rfr5rkz9pnsnhpn0xmdxx2r3kriq866iy2wfh"; + name = "kio-extras-17.04.2.tar.xz"; }; }; kiriki = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kiriki-16.12.2.tar.xz"; - sha256 = "1fgdw7f4fqdfzsryvd8crdv60j2s2g3cvbibv3g91xkcq6p155wk"; - name = "kiriki-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kiriki-17.04.2.tar.xz"; + sha256 = "116llc5p785h17wlqmy7hhjm3h8cbzsa8wh5hc13g3db58zyy3l4"; + name = "kiriki-17.04.2.tar.xz"; }; }; kiten = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kiten-16.12.2.tar.xz"; - sha256 = "1ya1wwgh1x4iap3vs947ln949hjc499aiylg24666ab7vcqkbhh8"; - name = "kiten-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kiten-17.04.2.tar.xz"; + sha256 = "0khyg5m13ax2i7ml7cf23jq5zr090vdqm03b6m1959lhk3warvjw"; + name = "kiten-17.04.2.tar.xz"; }; }; kjumpingcube = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kjumpingcube-16.12.2.tar.xz"; - sha256 = "0flx7sxqac763i2nsvyjzjv9aii27hnv51k0yhqcp6pnsjy1fbhh"; - name = "kjumpingcube-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kjumpingcube-17.04.2.tar.xz"; + sha256 = "073hdjv6aa6lannn2avanjcxzgsz5pdfh5xi3r1hlmcwzwx4ydis"; + name = "kjumpingcube-17.04.2.tar.xz"; }; }; kldap = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kldap-16.12.2.tar.xz"; - sha256 = "06ql2d7l22c19gnw6wigym3qpqw22arsmwpnnwz9i76l3wq32s3x"; - name = "kldap-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kldap-17.04.2.tar.xz"; + sha256 = "1d5fbw11hz071rk814pfqa8gy8plznnr5wx5y16vb75a4sll1iw4"; + name = "kldap-17.04.2.tar.xz"; }; }; kleopatra = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kleopatra-16.12.2.tar.xz"; - sha256 = "1kh75qjas4x4aqvshdgcryqdrp475lx60gksjfh34ygz03avdssl"; - name = "kleopatra-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kleopatra-17.04.2.tar.xz"; + sha256 = "0ph1rmxgq8n3yb61rhphw3b3kv8drdw13a418xwzc1kddpksa8r8"; + name = "kleopatra-17.04.2.tar.xz"; }; }; klettres = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/klettres-16.12.2.tar.xz"; - sha256 = "116igb1gbl3dfh5rm4mp0n8krm0d9kpgns63sh355g02wf0cbz3f"; - name = "klettres-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/klettres-17.04.2.tar.xz"; + sha256 = "093fb3n6dza44v3dqjragwkirid86frdv2v4yf54smpj8i5ykz21"; + name = "klettres-17.04.2.tar.xz"; }; }; klickety = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/klickety-16.12.2.tar.xz"; - sha256 = "00fqfnxh8bb069q3a5jszggnwq0z45najd6qg3z9gqb2i6bb4w93"; - name = "klickety-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/klickety-17.04.2.tar.xz"; + sha256 = "18xian4xwsj7wm5i6239cnabigzy05w02gwall884xk61mjwgqi7"; + name = "klickety-17.04.2.tar.xz"; }; }; klines = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/klines-16.12.2.tar.xz"; - sha256 = "1pr5pvxd6fnybkjqxig9zjiq04d7g6igw24p2j6kfz91ihaf4g6q"; - name = "klines-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/klines-17.04.2.tar.xz"; + sha256 = "0va4ia1za6mynb0xxyn1z9xag0vs3pscgwkq1jfjyrd1k5inribr"; + name = "klines-17.04.2.tar.xz"; }; }; klinkstatus = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/klinkstatus-16.12.2.tar.xz"; - sha256 = "07wmaphs56x0jwgbkdynahwa0hrr3rakkbbfa4w046dga5z6dz60"; - name = "klinkstatus-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/klinkstatus-17.04.2.tar.xz"; + sha256 = "0mx16r98nr8ic5j9aqy32sz946v58cdzvhja4hxy56a2619pn7p8"; + name = "klinkstatus-17.04.2.tar.xz"; }; }; kmag = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmag-16.12.2.tar.xz"; - sha256 = "02vjwfh926jvhxn1sw603ijdrayk4jxrw9rl7kv48q00kgk5sr23"; - name = "kmag-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmag-17.04.2.tar.xz"; + sha256 = "1aswvc7zy8sd2jplyjmn05yvz4zjsjxy7arpzr5pb6q0za1fx1f0"; + name = "kmag-17.04.2.tar.xz"; }; }; kmahjongg = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmahjongg-16.12.2.tar.xz"; - sha256 = "1rbcbak87jyf6bc8k44xvpcihagwh4i3v20af14hvm52gdvzdhij"; - name = "kmahjongg-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmahjongg-17.04.2.tar.xz"; + sha256 = "116ahf9yaw23bxz0hvfd8bs8276vc2nr3b383vahsgywakvcq71q"; + name = "kmahjongg-17.04.2.tar.xz"; }; }; kmail = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmail-16.12.2.tar.xz"; - sha256 = "0a3r6pwm3dvvmljp5grl1mgymp3fb1l3hb8issdqlk4s805q0pql"; - name = "kmail-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmail-17.04.2.tar.xz"; + sha256 = "0vqhfnr9jz2yfjbk5cghmdxhdxlhk3x6mw9b33xq2cn9iink0n4l"; + name = "kmail-17.04.2.tar.xz"; }; }; kmail-account-wizard = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmail-account-wizard-16.12.2.tar.xz"; - sha256 = "1vm4lx5jwk5kqf3zdfm3zyzhap1dalslwj03gxmif6hh65d2s7h5"; - name = "kmail-account-wizard-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmail-account-wizard-17.04.2.tar.xz"; + sha256 = "1l7fq7yzhp9ad1ij8fj47j9pq7adl9p2jgwsyg7gkhrfa8s02ygv"; + name = "kmail-account-wizard-17.04.2.tar.xz"; }; }; kmailtransport = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmailtransport-16.12.2.tar.xz"; - sha256 = "0g2f25l4l8jlj4d5dcdlbz8rgy4xvm6if2i3qm4naqh35kb4rycn"; - name = "kmailtransport-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmailtransport-17.04.2.tar.xz"; + sha256 = "0yjzvfwyz546486n9d1r8lr0q41ffjlg5c3klg8zc54d8290ghdw"; + name = "kmailtransport-17.04.2.tar.xz"; }; }; kmbox = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmbox-16.12.2.tar.xz"; - sha256 = "1j30kvvlnfbky5x19gxjsbrshrdys6ajdbhpd9fy46jjh2dv3y6j"; - name = "kmbox-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmbox-17.04.2.tar.xz"; + sha256 = "0p1pf1a96h5bqhs5lmid0z9nd613x9vlwpraqdym5kyrzndvccys"; + name = "kmbox-17.04.2.tar.xz"; }; }; kmime = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmime-16.12.2.tar.xz"; - sha256 = "0sl34qahgvxaw9xi56d0l2a2iim9bpiv8ysf3spsc1m2ribf3400"; - name = "kmime-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmime-17.04.2.tar.xz"; + sha256 = "1jz4bj2rgcn4fmjybvrlq5i6fpx1jzqlzk0z5dv0yrqrln20lmw8"; + name = "kmime-17.04.2.tar.xz"; }; }; kmines = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmines-16.12.2.tar.xz"; - sha256 = "1324j3myr1wds3f6nzw186d1rc2aakxv0mqsx89bdvnky6zq2v5q"; - name = "kmines-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmines-17.04.2.tar.xz"; + sha256 = "0py92mbjqni0zpds8lf5wmirjwf8cw84ybirba73x6w40ysl3ny8"; + name = "kmines-17.04.2.tar.xz"; }; }; kmix = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmix-16.12.2.tar.xz"; - sha256 = "1s8di3jbgcaamfxfmmwxlajixia9m2ngl4qc1z7rq6a14fk3w5hz"; - name = "kmix-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmix-17.04.2.tar.xz"; + sha256 = "1dgxz6c2mm5wnmap6pj3pbiajgpm5xx1q2kklhqxc2gkqxrz25a2"; + name = "kmix-17.04.2.tar.xz"; }; }; kmousetool = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmousetool-16.12.2.tar.xz"; - sha256 = "128hp75zyyariflx03ilmvw09jngfy9ylykb73gg7xw2zqnjjw4i"; - name = "kmousetool-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmousetool-17.04.2.tar.xz"; + sha256 = "065s73yksb39yawdz2ai221jncphanmxpxirdfnhljbg8d551k30"; + name = "kmousetool-17.04.2.tar.xz"; }; }; kmouth = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmouth-16.12.2.tar.xz"; - sha256 = "0gk8rdlpwh304k7g85i80rfdjnvj4fcd1nlj89zmq2qh5s9jmqzg"; - name = "kmouth-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmouth-17.04.2.tar.xz"; + sha256 = "1iqa059169w4r94r99w338z5mbkxhcfz6xjycrw2nkvnp5spc4mw"; + name = "kmouth-17.04.2.tar.xz"; }; }; kmplot = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kmplot-16.12.2.tar.xz"; - sha256 = "0lwx0d1gv6k3nm0nxry6bl282j3vjc0p7rssbvhi5qsc7z9lc8s3"; - name = "kmplot-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kmplot-17.04.2.tar.xz"; + sha256 = "0rdg9ywmxd0bicb030kpyhcrgbhpvaac339gxwq1q2arrczds38x"; + name = "kmplot-17.04.2.tar.xz"; }; }; knavalbattle = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/knavalbattle-16.12.2.tar.xz"; - sha256 = "065hyrdqaj0g7kpgxdyjbf2msdxb6w6m2y50bw23p4w69y7fdxgn"; - name = "knavalbattle-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/knavalbattle-17.04.2.tar.xz"; + sha256 = "091wvhnj98s1c0as90h6qy0sx47bb95gbczljq2rrnxz6sjw3x52"; + name = "knavalbattle-17.04.2.tar.xz"; }; }; knetwalk = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/knetwalk-16.12.2.tar.xz"; - sha256 = "1rhmgr2qk8h04y87dviy0yhrv5dg8za5v00csmia3s1jyvz0fbwp"; - name = "knetwalk-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/knetwalk-17.04.2.tar.xz"; + sha256 = "0g0q9m63qc33gfklpqpncvd3qdjpbjb53701ypiby3dlyb1znf3d"; + name = "knetwalk-17.04.2.tar.xz"; }; }; knotes = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/knotes-16.12.2.tar.xz"; - sha256 = "12bdrw4ikw014phbq9w4q5y9lgjnazhvri7j13ld5r6806bxls04"; - name = "knotes-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/knotes-17.04.2.tar.xz"; + sha256 = "1ypl677rhgq8hmy9y5zryfs4zcyzj88ajlwvsxd3lv9ybkc7ymhy"; + name = "knotes-17.04.2.tar.xz"; }; }; kolf = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kolf-16.12.2.tar.xz"; - sha256 = "1v9lhir520n7kcc061z3zcc8wxswhnmjv7yifbqvviazl1n0p0vx"; - name = "kolf-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kolf-17.04.2.tar.xz"; + sha256 = "157gppkzgv3394pcxr3mc9vi0bd8hy9bjmmjcq9g8p5gdpj148ag"; + name = "kolf-17.04.2.tar.xz"; }; }; kollision = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kollision-16.12.2.tar.xz"; - sha256 = "1dklg0ns3abfxbfr7xrnzkcxxng3v7avzj4bjvsmsbq3lzy3pb8c"; - name = "kollision-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kollision-17.04.2.tar.xz"; + sha256 = "065h6lm71h4184jk8lh1gz5bq1kyxnpyf7jg0y50q9g8fm147s5j"; + name = "kollision-17.04.2.tar.xz"; }; }; kolourpaint = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kolourpaint-16.12.2.tar.xz"; - sha256 = "1himisb1f68pgaz15qam73qv9acqqh8i1jnk9wbsqjyj6z67wvnj"; - name = "kolourpaint-16.12.2.tar.xz"; - }; - }; - kommander = { - version = "16.12.2"; - src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kommander-16.12.2.tar.xz"; - sha256 = "140sz82gm5p8f8mhr2kdfy24fr6jjs0l53jcqr9hwdw6vlrm399w"; - name = "kommander-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kolourpaint-17.04.2.tar.xz"; + sha256 = "09kgmkqzcr534vz24w9p27zzd0hwh43cz09pjfdcgcwq5bsnni3s"; + name = "kolourpaint-17.04.2.tar.xz"; }; }; kompare = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kompare-16.12.2.tar.xz"; - sha256 = "1dd4k3rq8wlzsvl5nv5mrd0ddxgwlriik3vxj8xx3b4nqk720lh6"; - name = "kompare-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kompare-17.04.2.tar.xz"; + sha256 = "0q6mi2l3bvl15qrylngdrngsvzv2dc26550pkjm1db94byx1qfk2"; + name = "kompare-17.04.2.tar.xz"; }; }; konqueror = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/konqueror-16.12.2.tar.xz"; - sha256 = "0md9glzr1br2n5dsfmmv6gxsfhv6jl0r4fa1qgw4d2j2kpm94zw7"; - name = "konqueror-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/konqueror-17.04.2.tar.xz"; + sha256 = "0f36frk1wzw75w982clzlfxic7nj8nmslwy2wk855p3arcrg2dcq"; + name = "konqueror-17.04.2.tar.xz"; }; }; konquest = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/konquest-16.12.2.tar.xz"; - sha256 = "0k58adqr20k9wrwbaf1s6lqqgcma08wqnv66zrxbgacgsgx3pnzi"; - name = "konquest-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/konquest-17.04.2.tar.xz"; + sha256 = "10apw2dj9xxrv4rw200lxb1iiqd2kpikb7njkf1x0h7c6lp7isxc"; + name = "konquest-17.04.2.tar.xz"; }; }; konsole = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/konsole-16.12.2.tar.xz"; - sha256 = "1mwfv2hznmd1qml8hq1z81jv9y8jn1ybc69dqgnf1n6ygmz14676"; - name = "konsole-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/konsole-17.04.2.tar.xz"; + sha256 = "1v37v4shq0k3kv8vqnp9b1ghdirjj3vsjcvalkiagz94w1g61vyl"; + name = "konsole-17.04.2.tar.xz"; }; }; kontact = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kontact-16.12.2.tar.xz"; - sha256 = "1rfqb5a4brbvkhv905lcvc40r0as8zwdm2h67jc96cix358cpshv"; - name = "kontact-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kontact-17.04.2.tar.xz"; + sha256 = "12gd453gdxmwbnqrlnbbqnqxd8chpf57mnjv498nhjv6sfj6mshv"; + name = "kontact-17.04.2.tar.xz"; }; }; kontactinterface = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kontactinterface-16.12.2.tar.xz"; - sha256 = "0z6mjg8sy18jhkfmk9s098851gdqbh03031l92yqzsgsfph9nk77"; - name = "kontactinterface-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kontactinterface-17.04.2.tar.xz"; + sha256 = "1q4fdf4lglq84n0pva7fdqq4fqbwkq9g0qyp5mfq3fhvzbba3as1"; + name = "kontactinterface-17.04.2.tar.xz"; }; }; kopete = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kopete-16.12.2.tar.xz"; - sha256 = "0bf0bffcsyhrj70yb4l5g6n0jr38i5zkcl4hsfi9hac43xvp62ib"; - name = "kopete-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kopete-17.04.2.tar.xz"; + sha256 = "0bicwm8r4rl4awxkpi4hin95n37yj4ln29gp0z6j97fzc7kpiqlj"; + name = "kopete-17.04.2.tar.xz"; }; }; korganizer = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/korganizer-16.12.2.tar.xz"; - sha256 = "1211rhxvx42lndqv6n23mj6ibhfp09vvmzz59k1j0l9z8y1zyr2g"; - name = "korganizer-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/korganizer-17.04.2.tar.xz"; + sha256 = "0lrxy232v2gn40sd63xspyszkmqn1v6l40zcxpv9r7x62wn4v55r"; + name = "korganizer-17.04.2.tar.xz"; }; }; kpat = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kpat-16.12.2.tar.xz"; - sha256 = "1yc16yfsq18m5xxm9b17zba3ppw7j5hq82z0ln8sw2yisz59mylr"; - name = "kpat-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kpat-17.04.2.tar.xz"; + sha256 = "1r8i5aisllg9ykgy75gfnma2y8v6y67fa91z6r0q16bg66l2ij44"; + name = "kpat-17.04.2.tar.xz"; }; }; kpimtextedit = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kpimtextedit-16.12.2.tar.xz"; - sha256 = "0xspr7hip57j8n3mp71x8s908vlj7acl27jwyc33yi4xvlyfcgfy"; - name = "kpimtextedit-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kpimtextedit-17.04.2.tar.xz"; + sha256 = "0d739nadn8n2393hq9rm2v8qx8l9jk7n1wgpbdbsddfq2lxz8g39"; + name = "kpimtextedit-17.04.2.tar.xz"; }; }; kppp = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kppp-16.12.2.tar.xz"; - sha256 = "1gvb3sgxg1ysdrv18rf5kh6znvwlkp673yld6ghj3dcif8w6xq0n"; - name = "kppp-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kppp-17.04.2.tar.xz"; + sha256 = "1nm6kzjdwrl7206gwd47irhkj94vifxqhikc4g8jkvfh60rh87j8"; + name = "kppp-17.04.2.tar.xz"; }; }; kqtquickcharts = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kqtquickcharts-16.12.2.tar.xz"; - sha256 = "1gh3alqlmj2icd2jblncps4k6kklckbpqv18wplybgaz4h0pi4pi"; - name = "kqtquickcharts-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kqtquickcharts-17.04.2.tar.xz"; + sha256 = "0zjb7p3yxlpz8cyczsr9xwh44l7k1ddg1zwxqah91igdk7mc620x"; + name = "kqtquickcharts-17.04.2.tar.xz"; }; }; krdc = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/krdc-16.12.2.tar.xz"; - sha256 = "1ql2mkx7xc2y0vkxjk3i5scxa6ws5mwz39zynmyx7rmxp9f8frsf"; - name = "krdc-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/krdc-17.04.2.tar.xz"; + sha256 = "0y8s28rwxjbpgq6kfhmrq9qr4h19iplfrgab7rb25zl881g9wycg"; + name = "krdc-17.04.2.tar.xz"; }; }; kremotecontrol = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kremotecontrol-16.12.2.tar.xz"; - sha256 = "1c1xx458lchn9b3c9h27zb13m2y6b01sb0g6lf6bpx4skbdwdwma"; - name = "kremotecontrol-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kremotecontrol-17.04.2.tar.xz"; + sha256 = "1lw45vnarqw975zz38z9nnmqvk91j2viijl0sf4h2ikx0myqiif7"; + name = "kremotecontrol-17.04.2.tar.xz"; }; }; kreversi = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kreversi-16.12.2.tar.xz"; - sha256 = "18zfy3dzi9rgwhgvci93iv0gkmvac30rbj4xwpvzr3bc8zwz76df"; - name = "kreversi-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kreversi-17.04.2.tar.xz"; + sha256 = "1xhw4i4s7g7k3v4siprg2d1h9g4smqjwhz4qjzz236wmgky7na1b"; + name = "kreversi-17.04.2.tar.xz"; }; }; krfb = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/krfb-16.12.2.tar.xz"; - sha256 = "1sqij11a6pbivf2xbcglxzkfrpqvzcqxb4d85jxrhbp2wljx0xvy"; - name = "krfb-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/krfb-17.04.2.tar.xz"; + sha256 = "17lcv2kplawmvakashvrpk50g5ycw5fai4fiz0ijsj05ivqmrb6z"; + name = "krfb-17.04.2.tar.xz"; }; }; kross-interpreters = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kross-interpreters-16.12.2.tar.xz"; - sha256 = "1cw84z2wdh1kb7fgwmmljmc5d57skh6hlm0p6kzlqdbqknnva8ad"; - name = "kross-interpreters-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kross-interpreters-17.04.2.tar.xz"; + sha256 = "0m2adnwhdclhhql0v3g2ay31g7ly67m3782ryq0vp9r8rcd5ga1b"; + name = "kross-interpreters-17.04.2.tar.xz"; }; }; kruler = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kruler-16.12.2.tar.xz"; - sha256 = "11i7k53kpfampbkzzabp0v97pb22h7sb2i0r6qdx78kyhmkgdrvp"; - name = "kruler-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kruler-17.04.2.tar.xz"; + sha256 = "175c67m1wi9sl6is9f5pbsb3p6siyi9w7219p4ff6wbbjqjxpj2f"; + name = "kruler-17.04.2.tar.xz"; }; }; ksaneplugin = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ksaneplugin-16.12.2.tar.xz"; - sha256 = "0ljk7cf4ns39xszn6g1vk8av3dkkgwzj4ry4n56305mqyjgqx258"; - name = "ksaneplugin-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ksaneplugin-17.04.2.tar.xz"; + sha256 = "16j4mpl9ick5d43rxnwmvfsb2wr5zgpmr3mlnmn99cvpr27v9mkg"; + name = "ksaneplugin-17.04.2.tar.xz"; }; }; kscd = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kscd-16.12.2.tar.xz"; - sha256 = "1w1gcfwp1r18pjfp526pdb837kpd8zj08g1jrjcb3bmvh600apm0"; - name = "kscd-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kscd-17.04.2.tar.xz"; + sha256 = "0cgxbhmmw8n7fwin3glzgfx0m1sdx2k4yhkrjislni3raiq4rv9x"; + name = "kscd-17.04.2.tar.xz"; }; }; kshisen = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kshisen-16.12.2.tar.xz"; - sha256 = "0sw78qwlpimlhqzlz5migbngrhj7w6gdbqx12q7949paa03ash1b"; - name = "kshisen-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kshisen-17.04.2.tar.xz"; + sha256 = "0644aadh6svdhxb64hzhnvm11w071gax6bj30r0ad3zbqljzhnfv"; + name = "kshisen-17.04.2.tar.xz"; }; }; ksirk = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ksirk-16.12.2.tar.xz"; - sha256 = "0f9k476wbwx0maf0wsicgipqyv7gccm7ydwvns399iamb6xkiqnn"; - name = "ksirk-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ksirk-17.04.2.tar.xz"; + sha256 = "0zh304xwknka6336avzpc5dvv2v6sl474d5q9vqzj8h0ybhdr5pb"; + name = "ksirk-17.04.2.tar.xz"; }; }; ksnakeduel = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ksnakeduel-16.12.2.tar.xz"; - sha256 = "0lhwz1b1v1dir7k1vbkcwb73x7f3h7prb3zv4f8wlh32dj1yg983"; - name = "ksnakeduel-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ksnakeduel-17.04.2.tar.xz"; + sha256 = "137am9qi5wfg90b7zf4hk0nsa8pm9f8cj7iraij492d6naif8an5"; + name = "ksnakeduel-17.04.2.tar.xz"; }; }; kspaceduel = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kspaceduel-16.12.2.tar.xz"; - sha256 = "0h6m8xnmxx0q2r863ikck0kpyscd8s4iidcjiqz7wqgbsw1dadqb"; - name = "kspaceduel-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kspaceduel-17.04.2.tar.xz"; + sha256 = "0jkr7xbgrgnwa94fdr1w03xxy75nksr31wb1sr2b3kpwp5ax1380"; + name = "kspaceduel-17.04.2.tar.xz"; }; }; ksquares = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ksquares-16.12.2.tar.xz"; - sha256 = "14x1d9300wdhrnri5f5n5i31bs83hcbxs5w9cai1m8mlql99vvfy"; - name = "ksquares-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ksquares-17.04.2.tar.xz"; + sha256 = "07fn872d126wv0gcfd58jd72ypajlpkfcd4njzj0v05x6i0njir0"; + name = "ksquares-17.04.2.tar.xz"; }; }; kstars = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kstars-16.12.2.tar.xz"; - sha256 = "0acbirhr970fh53hfsbfw9jn4jqlww9zf80jfyg2drixi9d70mpp"; - name = "kstars-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kstars-17.04.2.tar.xz"; + sha256 = "1r47l3zifb0carmgn0rv6wddqn483q9jadrwbahqp7b1yy14rkcj"; + name = "kstars-17.04.2.tar.xz"; }; }; ksudoku = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ksudoku-16.12.2.tar.xz"; - sha256 = "1nvk8l6n7sja19s2kazf6xhzqwi9mrjxvz5i0i9nmpwmksii6lbg"; - name = "ksudoku-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ksudoku-17.04.2.tar.xz"; + sha256 = "11cvix24p1lpiss472yflcrwvygn0cxw4b5p9qhra643sx6bw5h5"; + name = "ksudoku-17.04.2.tar.xz"; }; }; ksystemlog = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ksystemlog-16.12.2.tar.xz"; - sha256 = "13q2h3yhlpjy8hiiz6vdx5xwniysbmz5agvvn28a469710601154"; - name = "ksystemlog-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ksystemlog-17.04.2.tar.xz"; + sha256 = "1sw5f89khflmcbwwd1z399bwlnnl2lqp2qrj7wfdxb7s91j4jk2m"; + name = "ksystemlog-17.04.2.tar.xz"; }; }; kteatime = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kteatime-16.12.2.tar.xz"; - sha256 = "0m163a11hp90rqf5170iqapmvn4ym6m2n42da2p1jgyim4877613"; - name = "kteatime-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kteatime-17.04.2.tar.xz"; + sha256 = "10yqww3hybjirncjsxpya08c49ca0ac6zn6anjc1mb9nvji203xb"; + name = "kteatime-17.04.2.tar.xz"; }; }; ktimer = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktimer-16.12.2.tar.xz"; - sha256 = "1l9xwfg3701h1f16ifh74c5hv7j7z0f332izcvfpiccps7gplhvz"; - name = "ktimer-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktimer-17.04.2.tar.xz"; + sha256 = "19b27l308xb70wbx06fxykdwzcan3cjf7naj51fgma4qcm6xjdir"; + name = "ktimer-17.04.2.tar.xz"; }; }; ktnef = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktnef-16.12.2.tar.xz"; - sha256 = "0id9shripwahgb258hgfpmxyg0z9x2dqpxgyrvb47d44rrcf9dxg"; - name = "ktnef-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktnef-17.04.2.tar.xz"; + sha256 = "0vpq81gyjr14xf94h654v8cmfvndhc9wn8zznp9a7jbpzp4wdfnj"; + name = "ktnef-17.04.2.tar.xz"; }; }; ktouch = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktouch-16.12.2.tar.xz"; - sha256 = "08c0g35ypsndh8pj1nbxn8gnzis10a5cxkz175x4asi5lcpw3kc1"; - name = "ktouch-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktouch-17.04.2.tar.xz"; + sha256 = "17chk2vzvb8manyfcsnr73pfnvy128fi8g20r1gnidhgw6ix0s1r"; + name = "ktouch-17.04.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-accounts-kcm-16.12.2.tar.xz"; - sha256 = "1p3pqvkyhwcqcwgpyfghhii3d5shbfpm8i9vap8vc43clvj9sfah"; - name = "ktp-accounts-kcm-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-accounts-kcm-17.04.2.tar.xz"; + sha256 = "0kbnhkhw787bbgkpnchxkmwnzr2s4nqwmknzf34h613mlv7wspvg"; + name = "ktp-accounts-kcm-17.04.2.tar.xz"; }; }; ktp-approver = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-approver-16.12.2.tar.xz"; - sha256 = "1ky4wg8qk4n2qyh5009zz6487pf31jb8w8zmjmck9fypc9rhzw2j"; - name = "ktp-approver-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-approver-17.04.2.tar.xz"; + sha256 = "0986j2yy57jzg5z4czmrjw625ihw1393mv8h8kqipw727vvchka9"; + name = "ktp-approver-17.04.2.tar.xz"; }; }; ktp-auth-handler = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-auth-handler-16.12.2.tar.xz"; - sha256 = "05dvbq1q0fbznyj11wkg0ic8svgkqdq8i20xddkkx2jpwhpkmcnl"; - name = "ktp-auth-handler-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-auth-handler-17.04.2.tar.xz"; + sha256 = "0hlch8d2fj6xnnd39v5q9vri8svn1852am1kbvvyws770kgldj49"; + name = "ktp-auth-handler-17.04.2.tar.xz"; }; }; ktp-call-ui = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-call-ui-16.12.2.tar.xz"; - sha256 = "1czm56vvbjbyyib2wi60f9s2icnyac007zzh2qxsxfnlp52mkzm2"; - name = "ktp-call-ui-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-call-ui-17.04.2.tar.xz"; + sha256 = "070ms5wyifqnc64x3r835vvbvn0l253qkn1li7bkqmsjg50q5sm7"; + name = "ktp-call-ui-17.04.2.tar.xz"; }; }; ktp-common-internals = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-common-internals-16.12.2.tar.xz"; - sha256 = "0323dhfiddq5yhbp0rpmpw60334z41f45ml8lcada8dv6mbjxlc6"; - name = "ktp-common-internals-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-common-internals-17.04.2.tar.xz"; + sha256 = "01xrdn1609ag2kha3wp756fh4kszvcp8biky3cgp52qasmp6k4k2"; + name = "ktp-common-internals-17.04.2.tar.xz"; }; }; ktp-contact-list = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-list-16.12.2.tar.xz"; - sha256 = "0gk0lims3ypjsir9k9a010kylnqzqb2dsh5yfv24a6fb1ix6q4yy"; - name = "ktp-contact-list-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-list-17.04.2.tar.xz"; + sha256 = "03iwx1xsd1scgw20s7n8cj7ai6cnlna19dd93s2a7r3z4jhwxkx0"; + name = "ktp-contact-list-17.04.2.tar.xz"; }; }; ktp-contact-runner = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-runner-16.12.2.tar.xz"; - sha256 = "1bfm4639jshw9ncchcj6m8q6xg49a20z4fzc66vrjkdbha8fwr0g"; - name = "ktp-contact-runner-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-runner-17.04.2.tar.xz"; + sha256 = "1fal6g5zrh0s4wcxsqgps3a20xfdjc3pyw4dhdpgnsr6ig1z7rwn"; + name = "ktp-contact-runner-17.04.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-desktop-applets-16.12.2.tar.xz"; - sha256 = "1ahm69h309dyg3byv3jxxm3j0c5jphzxng2g87hvjs9dvgx00msv"; - name = "ktp-desktop-applets-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-desktop-applets-17.04.2.tar.xz"; + sha256 = "0306lar375vh2wr9g2iicjawd5rm5zh7vp81jl0hgmzx7kxcjxgz"; + name = "ktp-desktop-applets-17.04.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-filetransfer-handler-16.12.2.tar.xz"; - sha256 = "1j1bmrwabh0mzm51ibb0qyf164g7hznjk2vm2kwkgk5sy8r1a363"; - name = "ktp-filetransfer-handler-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-filetransfer-handler-17.04.2.tar.xz"; + sha256 = "044sr00rlcvxfw59f5m4i33jg4f8i77a8yjf3sdwjrnh03nsbjxz"; + name = "ktp-filetransfer-handler-17.04.2.tar.xz"; }; }; ktp-kded-module = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-kded-module-16.12.2.tar.xz"; - sha256 = "1ia62r55my8s6l3am22z6nkvmi2x2gnpbwmmpiv8n2i7j2ysdjp9"; - name = "ktp-kded-module-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-kded-module-17.04.2.tar.xz"; + sha256 = "19f5kdd3g54791a7ilsaas5ibj3f8gb889n82gh88lq7q9zrs5f3"; + name = "ktp-kded-module-17.04.2.tar.xz"; }; }; ktp-send-file = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-send-file-16.12.2.tar.xz"; - sha256 = "0vl00bbnpddq9nczb53apf3sdr1r2hnpa3fa390yx3jrrr4hp3k0"; - name = "ktp-send-file-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-send-file-17.04.2.tar.xz"; + sha256 = "1ydwnmyqwbf5qjhy9w2z2788p7maa591nlc946ar32wg2sc6ik57"; + name = "ktp-send-file-17.04.2.tar.xz"; }; }; ktp-text-ui = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktp-text-ui-16.12.2.tar.xz"; - sha256 = "0c0khkargj4hg2j1va72hp45b3dzwvkvbssq7k309iljxgfi9qry"; - name = "ktp-text-ui-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktp-text-ui-17.04.2.tar.xz"; + sha256 = "1s5dhhc1ihnlz08a2vwalzmk6zm2kb157smn07a9ilq0l64psdqa"; + name = "ktp-text-ui-17.04.2.tar.xz"; }; }; ktuberling = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/ktuberling-16.12.2.tar.xz"; - sha256 = "0867ci5bi0phcwwxlqlyn3w1pv5q5wvzyqnzjvywc0bzy2qbpp0p"; - name = "ktuberling-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/ktuberling-17.04.2.tar.xz"; + sha256 = "18krcrj9xlajj3q6vspw79snwnliqc00djpq8ra6yg2l56xqbwym"; + name = "ktuberling-17.04.2.tar.xz"; }; }; kturtle = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kturtle-16.12.2.tar.xz"; - sha256 = "183glhn0amkcrzylax9cjyj3if9iz3dybmw55ljw003mf1s0sydq"; - name = "kturtle-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kturtle-17.04.2.tar.xz"; + sha256 = "140j7xws7kfw0cf4axf0jgfk9ywvrds79906iwzf1nig8rbxrfy1"; + name = "kturtle-17.04.2.tar.xz"; }; }; kubrick = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kubrick-16.12.2.tar.xz"; - sha256 = "10yakz1ffdx33sqgqmlga525r3cnz90m0rm5m2sl3b97ib7r0fxl"; - name = "kubrick-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kubrick-17.04.2.tar.xz"; + sha256 = "0pli70hkmb973j935fnjsaaml4gnck4jmzh3kph78wrhlxwqanqh"; + name = "kubrick-17.04.2.tar.xz"; }; }; kwalletmanager = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kwalletmanager-16.12.2.tar.xz"; - sha256 = "129q3c805g4jsrws3gvy751y4pdwp9m8yvlc62pkp703xwlnkzj4"; - name = "kwalletmanager-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kwalletmanager-17.04.2.tar.xz"; + sha256 = "1y1h7j6jg0nm5kfw03k5b9m39v5vfyflcfrfcqz4q19c3zx7msrw"; + name = "kwalletmanager-17.04.2.tar.xz"; }; }; kwave = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kwave-16.12.2.tar.xz"; - sha256 = "0g3n0fm3pyp6sd28qjpadpqs2kqd5gsbicdz1c5jkm8c1bypi0ij"; - name = "kwave-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kwave-17.04.2.tar.xz"; + sha256 = "0zk3xq76asz1lq1bvn5xyrly9qwz1bvipwsj03psckzzm0j2wx2j"; + name = "kwave-17.04.2.tar.xz"; }; }; kwordquiz = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/kwordquiz-16.12.2.tar.xz"; - sha256 = "1jy9833zrgaddzpfaaps2gcxjnf9mg2yx4w7mfpa3vglsyvhqlzx"; - name = "kwordquiz-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/kwordquiz-17.04.2.tar.xz"; + sha256 = "00x9l00d3aq8jcg4522faj9mp94k0526i41ls3wvmfd7q1i18viz"; + name = "kwordquiz-17.04.2.tar.xz"; }; }; libgravatar = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libgravatar-16.12.2.tar.xz"; - sha256 = "0vdryr9q30jkk5b9fa75yiqpspj83wvcy2zry8rsrx7pj21cdlsw"; - name = "libgravatar-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libgravatar-17.04.2.tar.xz"; + sha256 = "1w36qj6n40k2yxva1qw9naag6zz05gcnia3sqmfamzxdji4l3nis"; + name = "libgravatar-17.04.2.tar.xz"; }; }; libkcddb = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkcddb-16.12.2.tar.xz"; - sha256 = "0gs0zyisrgbzbcnwp95qi8msj5x2ysmqk9nwja3bwqzbangm0y82"; - name = "libkcddb-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkcddb-17.04.2.tar.xz"; + sha256 = "0cvy01krgvayc3hmsv55rrqjp72d27fz58clzw51p6zf2kvjn4q3"; + name = "libkcddb-17.04.2.tar.xz"; }; }; libkcompactdisc = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkcompactdisc-16.12.2.tar.xz"; - sha256 = "1ydhfi3hp30zg9nlmnzd5pslwlq6v6jbim2jda8ciyvniw0pm6va"; - name = "libkcompactdisc-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkcompactdisc-17.04.2.tar.xz"; + sha256 = "1ywpghj4dy8ly15g55q8mhmx85xlxz3zasblhzsyxqh6rgwhnab6"; + name = "libkcompactdisc-17.04.2.tar.xz"; }; }; libkdcraw = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkdcraw-16.12.2.tar.xz"; - sha256 = "0w54h8fa1hgyvqps936annb8dhbrpizv4ifcix0gq714p573l8w3"; - name = "libkdcraw-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkdcraw-17.04.2.tar.xz"; + sha256 = "17dd68wlc7528prywps7slv6f9jfzbfhfmdlv20q0lzrjlxb2jxk"; + name = "libkdcraw-17.04.2.tar.xz"; }; }; libkdegames = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkdegames-16.12.2.tar.xz"; - sha256 = "0lw6v81pr4xq5h58mgkbzlvp5bxic9szfmabgd3nrdijh6mla4ly"; - name = "libkdegames-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkdegames-17.04.2.tar.xz"; + sha256 = "07vs2077w7g6hvzaa9m7p6w3qc9daly174x7sq5an3wxb78zaj4k"; + name = "libkdegames-17.04.2.tar.xz"; }; }; libkdepim = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkdepim-16.12.2.tar.xz"; - sha256 = "1xblfj2i205jsm6nl05r3jis4gb4d15naq2mmfgxwy913pjh74jf"; - name = "libkdepim-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkdepim-17.04.2.tar.xz"; + sha256 = "1s6vvbxjrhvgc147ila9ryy5z1c76dqc9nrxdblkdk36kgj193xs"; + name = "libkdepim-17.04.2.tar.xz"; }; }; libkeduvocdocument = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkeduvocdocument-16.12.2.tar.xz"; - sha256 = "118z200ffqb2rj6yhmqp4b998cq6mlbpzn2gh2pdp70yin9w35qz"; - name = "libkeduvocdocument-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkeduvocdocument-17.04.2.tar.xz"; + sha256 = "1lakkz3ffp3qkhp15l8g04f1izgigv96ravj13yqvlafcj0l4wwh"; + name = "libkeduvocdocument-17.04.2.tar.xz"; }; }; libkexiv2 = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkexiv2-16.12.2.tar.xz"; - sha256 = "1bpk2mwiplk7c5xrdx7nq9fa0g53sgx6f5xa7d4k2i9mzn2s8hyr"; - name = "libkexiv2-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkexiv2-17.04.2.tar.xz"; + sha256 = "113gfmdvk85mlgq97hi5n4sn0ar55qy4lvrngzp70hr5gyk6jx87"; + name = "libkexiv2-17.04.2.tar.xz"; }; }; libkface = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkface-16.12.2.tar.xz"; - sha256 = "0jhnx71bnn2f8x5w5iylkk7369fcbx0y793182vc5rdqaax983sc"; - name = "libkface-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkface-17.04.2.tar.xz"; + sha256 = "04cp6fqji8s6zsv09nbdkv9ikff5df5gb2nqbfdhh5hdyl5k9a6y"; + name = "libkface-17.04.2.tar.xz"; + }; + }; + libkgapi = { + version = "17.04.2"; + src = fetchurl { + url = "${mirror}/stable/applications/17.04.2/src/libkgapi-17.04.2.tar.xz"; + sha256 = "1awcfwf1haa38vnr5273y5xk9b64s7m139aqgyr7r72czm96ql8s"; + name = "libkgapi-17.04.2.tar.xz"; }; }; libkgeomap = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkgeomap-16.12.2.tar.xz"; - sha256 = "1skmmg3hppzj923nl90r7v26k4fii7h3sr6yxzzvzaakwbil7d9q"; - name = "libkgeomap-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkgeomap-17.04.2.tar.xz"; + sha256 = "0gbri3vfan9n3za0qd5bzbwvmkslbsylg5rw11zlcl9r8c5yz23p"; + name = "libkgeomap-17.04.2.tar.xz"; }; }; libkipi = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkipi-16.12.2.tar.xz"; - sha256 = "0g1yyd5lhvwwa7q4in1p3q4mwlpp00lbir1a25wanlr6hqr2247w"; - name = "libkipi-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkipi-17.04.2.tar.xz"; + sha256 = "0spy876l7mzpb1kgbwxpi8nfyysd1xijg2ilbvbiisxf92krvxny"; + name = "libkipi-17.04.2.tar.xz"; }; }; libkleo = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkleo-16.12.2.tar.xz"; - sha256 = "031lfrn48xzi0kxkvg9597nxzharv0s0nxlkbdcr4xx8d8iga2l0"; - name = "libkleo-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkleo-17.04.2.tar.xz"; + sha256 = "05pz45g11sxjcmijdklb4kp2n7ydi33vbdfl43fjl0s7rv7vmzr4"; + name = "libkleo-17.04.2.tar.xz"; }; }; libkmahjongg = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkmahjongg-16.12.2.tar.xz"; - sha256 = "0imj2xv6qcf00dx53h37yq84cqrg806qjfmm836hw6wicw24117f"; - name = "libkmahjongg-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkmahjongg-17.04.2.tar.xz"; + sha256 = "1dd58zz8zlcrwwn1zkhp2lw8h83fwiajaxf2yibwbk0bza1ydp3r"; + name = "libkmahjongg-17.04.2.tar.xz"; }; }; libkomparediff2 = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libkomparediff2-16.12.2.tar.xz"; - sha256 = "02d3bd7miq1nq81z6b4c8c64wjj2z9shr8y0rd0yqlzmf8ma05p2"; - name = "libkomparediff2-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libkomparediff2-17.04.2.tar.xz"; + sha256 = "156s5lyna9wgj1cfqm36snyax9hybsr9xa72n246a94z81r6afsz"; + name = "libkomparediff2-17.04.2.tar.xz"; }; }; libksane = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libksane-16.12.2.tar.xz"; - sha256 = "0p215qc56ma4laajmql72f8bngi2x88nk1q8ysq0wviadgack885"; - name = "libksane-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libksane-17.04.2.tar.xz"; + sha256 = "12h6l6wa8g2qfddl9ylm9q4f8f2w7bgmii1v6yrmfb4nyr4bflda"; + name = "libksane-17.04.2.tar.xz"; }; }; libksieve = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/libksieve-16.12.2.tar.xz"; - sha256 = "1bzd8lfz0d9gnq6kh8k9wrcfbc61mdigy2madn7ywpxpcjp4rp3v"; - name = "libksieve-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/libksieve-17.04.2.tar.xz"; + sha256 = "0kz8nzd3cgipc3s3zif57d681ddb6xmb7kid25j3aypcz0i7gck1"; + name = "libksieve-17.04.2.tar.xz"; }; }; lokalize = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/lokalize-16.12.2.tar.xz"; - sha256 = "03cr89skhwbzq4h6fr78iaziplahpr4i7fvsf8395w6yiwsvcnyk"; - name = "lokalize-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/lokalize-17.04.2.tar.xz"; + sha256 = "0a85gjj40r5iw6mf190s4r4c4xsh1nfixj15g86acz02dn43zapn"; + name = "lokalize-17.04.2.tar.xz"; }; }; lskat = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/lskat-16.12.2.tar.xz"; - sha256 = "1jz7bjzw5msz5nyjvr21n3c355598afdnnqc6xzfl9zjkfgx4q9w"; - name = "lskat-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/lskat-17.04.2.tar.xz"; + sha256 = "0blnnyb7q6vxblvi6f1xigln70m1vjfpwav05qhm7msblhh5qp2j"; + name = "lskat-17.04.2.tar.xz"; }; }; mailcommon = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/mailcommon-16.12.2.tar.xz"; - sha256 = "0b9qawglc42y4wd98xaaiqdz7586wabj9zabs3dvk9vs10qpb9p0"; - name = "mailcommon-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/mailcommon-17.04.2.tar.xz"; + sha256 = "1f826r9m0xb418sqgx9lb23zf5am6cmgvcrx2d54c2va2vq97xgk"; + name = "mailcommon-17.04.2.tar.xz"; }; }; mailimporter = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/mailimporter-16.12.2.tar.xz"; - sha256 = "0dvnqqmmxdca7wmsajhzdxgz1k07dfbac0z1paww4d2inr164b8q"; - name = "mailimporter-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/mailimporter-17.04.2.tar.xz"; + sha256 = "06q8k3x2nvhbgk1kh542rmqnc5c0hj4yzwl1c1clvjwlw7vpxdwh"; + name = "mailimporter-17.04.2.tar.xz"; }; }; marble = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/marble-16.12.2.tar.xz"; - sha256 = "0p7ka2hl0f9ghpmyh124p57dy1ynhw0dszihg4rbbrjfjj65vig0"; - name = "marble-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz"; + sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09"; + name = "marble-17.04.2.tar.xz"; }; }; mbox-importer = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/mbox-importer-16.12.2.tar.xz"; - sha256 = "00q7x30bl1fwfgwvqmgbspp74bmjm40d30rykq052v1cp6n0c060"; - name = "mbox-importer-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/mbox-importer-17.04.2.tar.xz"; + sha256 = "1mq3wbj9fcrcny4m9vs4gk0cw7xyxv1sbpby0wl6a63hb6r4nvca"; + name = "mbox-importer-17.04.2.tar.xz"; }; }; messagelib = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/messagelib-16.12.2.tar.xz"; - sha256 = "0b65248mc6qamj1wcpv73v1ywda9gk2s2y20vjf35lmv5xi4cz88"; - name = "messagelib-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/messagelib-17.04.2.tar.xz"; + sha256 = "1fxajqxigfknl7ll755blz1ypy99idgr3gmi3p37ca3ld10f7ffv"; + name = "messagelib-17.04.2.tar.xz"; }; }; minuet = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/minuet-16.12.2.tar.xz"; - sha256 = "1sv9b1lq2dyvlwq0bmmnxak60nz83wbwnw1d8w3n5xadssarbr1s"; - name = "minuet-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/minuet-17.04.2.tar.xz"; + sha256 = "0p2ii0wfqswliqf4fk04mx9z6nfhifa11l2w7bid4aj78b29138g"; + name = "minuet-17.04.2.tar.xz"; }; }; okteta = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/okteta-16.12.2.tar.xz"; - sha256 = "1xq1bjpy7g8qn9d7dfgy00kf5bdcpvj1489b65yrlmyi382m5k7s"; - name = "okteta-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/okteta-17.04.2.tar.xz"; + sha256 = "0w1xi3kd083dss69gnq4ghmhfr3w2cz42jbfjsaidzf4qcqlfr40"; + name = "okteta-17.04.2.tar.xz"; }; }; okular = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/okular-16.12.2.tar.xz"; - sha256 = "020z6wlycip067j398lznqcspi3b6dx1zds9ibhxw9zzh3ms92kc"; - name = "okular-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/okular-17.04.2.tar.xz"; + sha256 = "0rqc6h3zb48smrmp835zk4agvlwnmjwmzwv3rh3lgwfw9i3jq2zf"; + name = "okular-17.04.2.tar.xz"; }; }; palapeli = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/palapeli-16.12.2.tar.xz"; - sha256 = "1vkkq9r9r85x46xx91gqyhpagx1xscrvlkx4knd72rcxfygipzf9"; - name = "palapeli-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/palapeli-17.04.2.tar.xz"; + sha256 = "0lcdkpvqmlsj73z88pi8v2hxd57bbbxlvf5yqj3zw33xb4nxw9bd"; + name = "palapeli-17.04.2.tar.xz"; }; }; parley = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/parley-16.12.2.tar.xz"; - sha256 = "0fvkhph41y5ig3nwmb4zfh8n3sip52r5al3vn4yll2ndkbwdkgjb"; - name = "parley-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/parley-17.04.2.tar.xz"; + sha256 = "02pcyl8lnpxi936k6i7hah7vzlwzsag7lpsc0ly6q6q9rm4iwkqj"; + name = "parley-17.04.2.tar.xz"; }; }; picmi = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/picmi-16.12.2.tar.xz"; - sha256 = "0j0jhvw8b18sskvd32snk4g7xpjk3kqfw9kpvfri0qayrshcxk2c"; - name = "picmi-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/picmi-17.04.2.tar.xz"; + sha256 = "0dqqaqfrqxwcp9daxfs8qmbf4kj6gn68v6l7dhj5r9mjvva0r4p5"; + name = "picmi-17.04.2.tar.xz"; }; }; pimcommon = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/pimcommon-16.12.2.tar.xz"; - sha256 = "1c4h1g6hpa7hw3ka2r561q813if031vriz646skin840jwdhnv7m"; - name = "pimcommon-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/pimcommon-17.04.2.tar.xz"; + sha256 = "1yvhf7hd2gm734i7k4smg57xq15wspbiq909crxs0ga82qx09hcg"; + name = "pimcommon-17.04.2.tar.xz"; }; }; pim-data-exporter = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/pim-data-exporter-16.12.2.tar.xz"; - sha256 = "14gkkyvcwa7q1yq6qhswq4ch9gcp1ddpjyf46d0550z1rkpws28m"; - name = "pim-data-exporter-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/pim-data-exporter-17.04.2.tar.xz"; + sha256 = "1q5qb4jbfdwp7h8d0drx0fyzmb7ffpcfrmirw22z8xk50r2r4v0i"; + name = "pim-data-exporter-17.04.2.tar.xz"; }; }; pim-sieve-editor = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/pim-sieve-editor-16.12.2.tar.xz"; - sha256 = "03a3imm5zs4p6zlp3m0pdc22cii26cnkgl1s1059lhmd3g3dhl85"; - name = "pim-sieve-editor-16.12.2.tar.xz"; - }; - }; - pim-storage-service-manager = { - version = "16.12.2"; - src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/pim-storage-service-manager-16.12.2.tar.xz"; - sha256 = "1kcbrg9h3c5khyabs5n6adqljj60vks7npb8iy649y0rx2qc2fn9"; - name = "pim-storage-service-manager-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/pim-sieve-editor-17.04.2.tar.xz"; + sha256 = "17aymflaqwci21h70s3lb8cfmh1qkynaswfkjqipravk58a302ni"; + name = "pim-sieve-editor-17.04.2.tar.xz"; }; }; poxml = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/poxml-16.12.2.tar.xz"; - sha256 = "17sv19rg1d65h6ks11k7f8zx6yliyhk1j2fxnc81l8md1flarfm0"; - name = "poxml-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/poxml-17.04.2.tar.xz"; + sha256 = "1cv7k4xilpx75z07l6mpzwinxn1cdw6h1qglqhs5i35ii4cbbw40"; + name = "poxml-17.04.2.tar.xz"; }; }; print-manager = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/print-manager-16.12.2.tar.xz"; - sha256 = "1amhl13n7i5z1jfhyrhvigk0bhh9myag7kk83bqkxffsx0lzzwbw"; - name = "print-manager-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/print-manager-17.04.2.tar.xz"; + sha256 = "19hs25cgf54c6igm0sp5by4fayaz1w793drwz1szcl5b631sdywj"; + name = "print-manager-17.04.2.tar.xz"; }; }; rocs = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/rocs-16.12.2.tar.xz"; - sha256 = "1gd0wdvp3c4s8br23fqqa0cp2vwfjp3xqkj1y3xf6pzv01sk7n7g"; - name = "rocs-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/rocs-17.04.2.tar.xz"; + sha256 = "0ahrbxs675zvwb81fmlp55hz72xx8zlzwjgq01p03ih8jsq71s4j"; + name = "rocs-17.04.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/signon-kwallet-extension-16.12.2.tar.xz"; - sha256 = "187xjbjw9a34p9cjjhijmwg8n7m83qikxa5q8nsffd48pl7pag2i"; - name = "signon-kwallet-extension-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/signon-kwallet-extension-17.04.2.tar.xz"; + sha256 = "1qcv8b5bmjd2dklbd4msp3cmh61qp6z6ml2ps6gzx4la1vp6qfmv"; + name = "signon-kwallet-extension-17.04.2.tar.xz"; }; }; spectacle = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/spectacle-16.12.2.tar.xz"; - sha256 = "1snz8kgnwm2cbfa6y9awb3d0markfmmbgkjs1k0xs938mqam4507"; - name = "spectacle-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/spectacle-17.04.2.tar.xz"; + sha256 = "1hab13wky0i7688jrzqy2m4kc49mz7fxjjk8z1rw2f4dxxaiymhf"; + name = "spectacle-17.04.2.tar.xz"; }; }; step = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/step-16.12.2.tar.xz"; - sha256 = "0ghr054c644hvay0k4xsahrl8bwnd9w8yqq3slrdblhs7z3c7iqk"; - name = "step-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/step-17.04.2.tar.xz"; + sha256 = "16mhi1z5x403764k5csnr60zg2nwkjj7b3b39kqv1qb9540dmb2y"; + name = "step-17.04.2.tar.xz"; }; }; svgpart = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/svgpart-16.12.2.tar.xz"; - sha256 = "0z9a7654f3n5870d02zm8a9dpymc3jxgmf79wavsp8jjr8sdgy6g"; - name = "svgpart-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/svgpart-17.04.2.tar.xz"; + sha256 = "1cns31z5pr78ilc1mhls31dchddwwzzwvbfddhygy2513067pca4"; + name = "svgpart-17.04.2.tar.xz"; }; }; sweeper = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/sweeper-16.12.2.tar.xz"; - sha256 = "0g0iw89l27v4ivqzsrv9j1q4dgihk80nvgf2cfagadfd50hmifr4"; - name = "sweeper-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/sweeper-17.04.2.tar.xz"; + sha256 = "0zarr01q1v3yq0ipb213i48q27qivrgcrhvynw7livs5s35mx844"; + name = "sweeper-17.04.2.tar.xz"; }; }; syndication = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/syndication-16.12.2.tar.xz"; - sha256 = "0vgpbr46ibyb097pbqmvpl934d4zwz3gb0fkyc23gwpxq1fgsizp"; - name = "syndication-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/syndication-17.04.2.tar.xz"; + sha256 = "19flj4f552yvvaih3wvw3i2p2nl60f5pgnl1ylimz5ga0c074vqq"; + name = "syndication-17.04.2.tar.xz"; }; }; umbrello = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/umbrello-16.12.2.tar.xz"; - sha256 = "1g4856mvj9vzm3k86nqm9sfynall1wcj3mvnc80jji7aazmpkl6z"; - name = "umbrello-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/umbrello-17.04.2.tar.xz"; + sha256 = "0jhxifv8s9a0pg6g2vlla901fwral8gyzzhy1mxbah907mj912k1"; + name = "umbrello-17.04.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.12.2"; + version = "17.04.2"; src = fetchurl { - url = "${mirror}/stable/applications/16.12.2/src/zeroconf-ioslave-16.12.2.tar.xz"; - sha256 = "1wqiakgc82zylvssxrm2askw6rjw89x85dws7q9zw13hdpvh12ss"; - name = "zeroconf-ioslave-16.12.2.tar.xz"; + url = "${mirror}/stable/applications/17.04.2/src/zeroconf-ioslave-17.04.2.tar.xz"; + sha256 = "10fm62dik7a0pnram7mdraryrbk1sscsp9i46j6sp243ndd13015"; + name = "zeroconf-ioslave-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 000000000000..a00e0ec8a48b --- /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-25"; + + src = fetchFromGitHub { + owner = "jwilm"; + repo = "alacritty"; + rev = "49c73f6d55e5a681a0e0f836cd3e9fe6af30788f"; + sha256 = "0h5hrb2g0fpc6xn94hmvxjj21cqbj4vgqkznvd64jl84qbyh1xjl"; + }; + + depsSha256 = "1pbb0swgpsbd6x3avxz6fv3q31dg801li47jibz721a4n9c0rssx"; + + 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/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 734ebb9cd862..854408e6e3e6 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,28 +1,38 @@ -{ stdenv, fetchFromGitHub, qtbase, qtsvg, qtx11extras, makeQtWrapper, muparser, cmake }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "albert-${version}"; - version = "0.9.4"; + version = "0.11.3"; src = fetchFromGitHub { - owner = "manuelschneid3r"; + owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "131ij525rgh2j9m2vydh79wm4bs0p3x27crar9f16rqhz15gkcpl"; + sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5"; }; - nativeBuildInputs = [ cmake makeQtWrapper ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qtsvg qtx11extras muparser ]; enableParallelBuilding = true; - fixupPhase = '' - wrapQtProgram $out/bin/albert + postPatch = '' + sed -i "/QStringList dirs = {/a \"$out/lib\"," \ + src/lib/albert/src/albert/extensionmanager.cpp ''; - meta = with stdenv.lib; { - homepage = https://github.com/manuelSchneid3r/albert; + preBuild = '' + mkdir -p "$out/" + ln -s "$PWD/lib" "$out/lib" + ''; + + postBuild = '' + rm "$out/lib" + ''; + + meta = with lib; { + homepage = https://albertlauncher.github.io/; description = "Desktop agnostic launcher"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 977f5e94e5d9..a07e0b6db61e 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy -, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence +, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation ]; + nativeBuildInputs = [ + wrapGAppsHook + ]; + patches = [ (fetchpatch { url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; @@ -41,6 +45,7 @@ stdenv.mkDerivation rec { # displays pdfStartup.pdf as default pdf entry mkdir -p $out/share/doc/apvlv/ cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf + cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index b4f01bc642bf..2585b5545482 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -9,6 +9,7 @@ , enableLibsndfile ? true, libsndfile ? null # amrnb and amrwb are unfree, disabled by default , enableAMR ? false, amrnb ? null, amrwb ? null +, enableLibpulseaudio ? true, libpulseaudio ? null }: with stdenv.lib; @@ -30,7 +31,8 @@ stdenv.mkDerivation rec { optional enableFLAC flac ++ optional enablePNG libpng ++ optional enableLibsndfile libsndfile ++ - optionals enableAMR [ amrnb amrwb ]; + optionals enableAMR [ amrnb amrwb ] ++ + optional enableLibpulseaudio libpulseaudio; meta = { description = "Sample Rate Converter for audio"; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix new file mode 100644 index 000000000000..542450080fea --- /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 85d8180983e8..ea3ca107d24d 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,37 +1,59 @@ -{ stdenv, pythonPackages, fetchFromGitHub, -}: +{ stdenv, pythonPackages, fetchFromGitHub }: with pythonPackages; buildPythonApplication rec { - version = "2.8"; + 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 = "1gazvij0072lca0jh84i8mhnaxiwg56hcxmrmk2clxd2x213zyjm"; + sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax"; }; - buildInputs = [ + nativeBuildInputs = [ + pytestcov + pytest-catchlog + hypothesis + pytest + ]; + + propagatedBuildInputs = [ cryptography beautifulsoup4 + requests + urllib3 ]; - propagatedBuildInputs = [ beautifulsoup4 ]; - 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"; homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 9211ef0ab83e..3f22d1629e27 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, ncurses, gettext}: +{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }: -stdenv.mkDerivation { - name = "calcurse-4.0.0"; +stdenv.mkDerivation rec { + name = "calcurse-${version}"; + version = "4.2.2"; src = fetchurl { - url = http://calcurse.org/files/calcurse-4.0.0.tar.gz; - sha256 = "0d33cpkbhyidvm3xx6iw9ljqdvl6477c2kcwix3bs63nj0ch06v2"; + url = "http://calcurse.org/files/${name}.tar.gz"; + sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266"; }; - buildInputs = [ncurses gettext]; + buildInputs = [ncurses gettext python3 ]; + nativeBuildInputs = [ makeWrapper ]; - meta = { + postInstall = '' + makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav + ''; + + meta = with stdenv.lib; { description = "A calendar and scheduling application for the command line"; - version = "4.0.0"; longDescription = '' calcurse is a calendar and scheduling application for the command line. It helps keep track of events, appointments and everyday tasks. A configurable notification @@ -21,7 +26,7 @@ stdenv.mkDerivation { be used to filter and format appointments, making it suitable for use in scripts. ''; homepage = http://calcurse.org/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index fc0374985cd7..8341898fa233 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,33 +1,27 @@ { stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp -, xdg_utils, makeDesktopItem +, xdg_utils, makeDesktopItem, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "2.80.0"; + version = "3.3.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1cgj30b0imv4gl12y1lcd07w3bx10sapclvjr78z78n7g32xp9ik"; + 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"; @@ -47,19 +41,25 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; buildInputs = [ poppler_utils libpng imagemagick libjpeg - fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ - apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow + 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 = '' + runHook preInstall + export HOME=$TMPDIR/fakehome export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler export POPPLER_LIB_DIR=${poppler_utils.out}/lib @@ -90,6 +90,8 @@ stdenv.mkDerivation rec { for entry in $out/share/applications/*.desktop; do substituteAllInPlace $entry done + + runHook postInstall ''; calibreDesktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 71cc688f7da0..45e27984ed59 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/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix index 23bd89b4f057..d90e8a6dba66 100644 --- a/pkgs/applications/misc/camlistore/default.nix +++ b/pkgs/applications/misc/camlistore/default.nix @@ -1,26 +1,28 @@ -{ stdenv, lib, go, fetchgit, git }: +{ stdenv, lib, go, fetchgit, git, buildGoPackage }: -stdenv.mkDerivation rec { - version = "0.9"; +buildGoPackage rec { name = "camlistore-${version}"; + version = "0.9"; src = fetchgit { url = "https://github.com/camlistore/camlistore"; - rev = "7b78c50007780643798adf3fee4c84f3a10154c9"; - sha256 = "1vc4ca2rn8da0z0viv3vv2p8z211zdvq83jh2x2izdckdz204n17"; + rev = "refs/tags/${version}"; + sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya"; leaveDotGit = true; }; - buildInputs = [ go git ]; + buildInputs = [ git ]; + goPackagePath = ""; buildPhase = '' + cd go/src/camlistore go run make.go - rm bin/README ''; installPhase = '' - mkdir -p $out/bin - cp bin/* $out/bin + mkdir -p $bin/bin + rm bin/README + cp bin/* $bin/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 469da1f6ec42..67d37489feb0 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -1,25 +1,20 @@ { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper -, python, pyserial, pygtk -}: -let - version = "20161018"; -in +, python, pyserial, pygtk }: + stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - inherit version; + version = "20170311"; src = fetchurl { - url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/chirp-daily-${version}.tar.gz"; - sha256 = "0f3r919az4vvcgxzqmxvhrxa2byzk5algy7srzzs15ihkvyxcwkb"; + url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; + sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - makeWrapper pyserial pygtk libxml2Python libxslt pyserial ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/chirp cp -r . $out/share/chirp/ diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix new file mode 100644 index 000000000000..554c7d8c78bb --- /dev/null +++ b/pkgs/applications/misc/colort/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "colort-unstable-2017-03-12"; + + src = fetchFromGitHub { + owner = "neeasade"; + repo = "colort"; + rev = "8470190706f358dc807b4c26ec3453db7f0306b6"; + sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw"; + }; + + makeFlags = ["PREFIX=$(out)"]; + + meta = with stdenv.lib; { + description = "A program for 'tinting' color values"; + homepage = https://github.com/neeasade/colort; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.neeasade ]; + }; +} diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 9ff27c747091..48e08be54748 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget, -qtquickcontrols, qtgraphicaleffects, qmakeHook }: +{ stdenv, fetchgit, qtbase, qtquick1, qmltermwidget, +qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { version = "1.0.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ qmake ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr - - wrapQtProgram $out/bin/cool-retro-term ''; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 0892f8899324..7461f6853f47 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchurl, cmake, qt4, libXfixes, libXtst}: +{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}: -let version = "2.5.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "CopyQ-${version}"; - src = fetchurl { - url = "https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"; - sha256 = "7726745056e8d82625531defc75b2a740d3c42131ecce1f3181bc0a0bae51fb1"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "hluk"; + repo = "CopyQ"; + rev = "v${version}"; + sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f"; }; - buildInputs = [ cmake qt4 libXfixes libXtst ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 libXfixes libXtst ]; meta = with stdenv.lib; { - homepage = "https://hluk.github.io/CopyQ"; + homepage = https://hluk.github.io/CopyQ; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3; - maintainers = with maintainers; [ willtim ]; + maintainers = [ maintainers.willtim ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. # OSX build requires QT5. platforms = platforms.linux; diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix deleted file mode 100644 index 42565ae7fa8c..000000000000 --- a/pkgs/applications/misc/cortex/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchgit, python3 }: - -stdenv.mkDerivation { - name = "cortex-2015-08-23"; - - src = fetchgit { - url = "https://github.com/gglucas/cortex"; - rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639"; - sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg"; - }; - - buildInputs = [ stdenv python3 ]; - - prePatch = '' - substituteInPlace cortex --replace "/usr/bin/env python3" "${python3}/bin/python3" - ''; - - installPhase = '' - mkdir -p $out/bin - cp cortex $out/bin/ - chmod +x $out/bin/cortex - ''; - - meta = with stdenv.lib; { - homepage = "http://cortex.glacicle.org"; - description = "An ncurses reddit browser and monitor"; - license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; - platforms = with platforms; unix; - }; - -} diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index ff18796e39d6..e33edfb0a440 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, cmake, python3, qtbase, makeQtWrapper, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "cura-${version}"; version = "2.4.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ]; - nativeBuildInputs = [ cmake python3.pkgs.wrapPython makeQtWrapper ]; + nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ]; @@ -24,11 +24,9 @@ stdenv.mkDerivation rec { postFixup = '' wrapPythonPrograms - mv $out/bin/cura $out/bin/.cura-noqtpath - makeQtWrapper $out/bin/.cura-noqtpath $out/bin/cura ''; - meta = with stdenv.lib; { + meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; homepage = "https://github.com/Ultimaker/Cura"; license = licenses.agpl3; diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index f6dd06e6c896..7aa19ffb3017 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, jre, coreutils, makeWrapper }: stdenv.mkDerivation { - name = "dbvisualizer-9.5"; + name = "dbvisualizer-9.5.7"; src = fetchurl { - url = https://www.dbvis.com/product_download/dbvis-9.5/media/dbvis_unix_9_5.tar.gz; - sha256 = "1bdc03039b50807206fd72ecf8ba0b940f5bb0386f483e10b7c0b2fa75cac021"; + url = https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz; + sha256 = "1xv4fw7cji2ffvv7z8vjl5lap512pj60s2ynihirrqld7pmklnyr"; }; buildInputs = [ makeWrapper ]; - + installPhase = '' mkdir -p $out/bin cp -a . $out - ln -sf $out/dbvis $out/bin + ln -sf $out/dbvis $out/bin wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${jre} ''; - + meta = { description = "The universal database tool"; homepage = https://www.dbvis.com/; diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix new file mode 100644 index 000000000000..e145bbe22e78 --- /dev/null +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -0,0 +1,29 @@ +{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, gee, wnck, gettext, libsecret, json_glib }: + +stdenv.mkDerivation rec { + name = "deepin-terminal-${version}"; + version = "2.3.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-terminal"; + rev = version; + sha256 = "0qam34g1rannv8kvw1zbps763a9ii9vbrkxyxxdk737hlpxdzg8h"; + }; + + patchPhase = '' + substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" + ''; + buildInputs = [ unzip gtk3 pkgconfig vala cmake vte gee wnck gettext libsecret json_glib ]; + + meta = { + description = "The default terminal emulation for Deepin"; + longDescription = '' + Deepin terminal, it sharpens your focus in the world of command line! + It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. + ''; + homepage = "https://github.com/linuxdeepin/deepin-terminal/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 96b429691155..4a7c4d7ec304 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,18 +2,15 @@ stdenv.mkDerivation rec { name = "devilspie2-${version}"; - version = "0.39"; + version = "0.42"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.39-src.tar.gz"; - sha256 = "07b74ffc078e5f01525d9da7a1978b4c1a9725b814b344f83a1a203cf4caae09"; + url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; + sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i"; }; - buildInputs = [ intltool pkgconfig glib gtk lua libwnck3 ]; - - patchPhase = '' - sed -i -e s@/usr/local@$out@ Makefile - ''; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ glib gtk lua libwnck3 ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 @@ -22,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Devilspie2 is a window matching utility"; + description = "A window matching utility"; longDescription = '' Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created. For diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 0341ffc64af8..d4c8b1ada6c3 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -1,38 +1,43 @@ -{ stdenv, fetchFromGitHub, unzip, alsaLib }: -let - version = "1.2"; -in +{ stdenv, fetchFromGitHub +, espeak, alsaLib, perl +, python }: + +with stdenv.lib; + stdenv.mkDerivation rec { name = "direwolf-${version}"; - inherit version; + version = "1.3"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "8b81a32"; - sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs"; + rev = version; + sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg"; }; buildInputs = [ - unzip alsaLib - ]; + espeak perl python + ] ++ (optional stdenv.isLinux alsaLib); patchPhase = '' - substituteInPlace Makefile.linux \ - --replace "/usr/local" "$out" \ - --replace "/usr/share" "$out/share" - ''; + substituteInPlace Makefile.* \ + --replace /usr/share $out/share - preInstall = '' - mkdir -p $out/bin - ''; + substituteInPlace dwespeak.sh \ + --replace espeak ${espeak}/bin/espeak + ''; - meta = with stdenv.lib; { + installPhase = '' + mkdir -p $out/bin + make INSTALLDIR=$out install + ''; + + meta = { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; # On the page: This page will be disappearing on October 8, 2015. - homepage = https://home.comcast.net/~wb2osz/site/; + homepage = https://github.com/wb2osz/direwolf/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 093382e13e6a..6e158f5696c1 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; license = licenses.gpl2; - maintainers = with maintainers; [ urkud ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix new file mode 100644 index 000000000000..0c9fa5ea2d27 --- /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/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 1dc9fe5e2026..8ef4f3ae8974 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-4.6"; + name = "dmenu-4.7"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "1cwnvamqqlgczvd5dv5rsgqbhv8kp0ddjnhmavb3q732i8028yja"; + sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7"; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 9dca8f983a4b..3d5676033593 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "A patched fork of the original dmenu - an efficient dynamic menu for X"; homepage = https://bitbucket.org/melek/dmenu2; - license = stdenv.lib.licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + license = licenses.mit; + maintainers = [ maintainers.cstrahan ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix new file mode 100644 index 000000000000..60bd5134e8ac --- /dev/null +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pythonPackages, gnome2, keybinder }: + +pythonPackages.buildPythonApplication rec { + ver = "0.92"; + name = "dockbarx-${ver}"; + + src = fetchFromGitHub { + owner = "M7S"; + repo = "dockbarx"; + rev = ver; + sha256 = "17n7jc3bk3f2i0i1ddpp05bakifc8y5xppads7ihpkj3qw9g35vl"; + }; + + postPatch = '' + substituteInPlace setup.py --replace /usr/ "" + substituteInPlace setup.py --replace '"/", "usr", "share",' '"share",' + substituteInPlace dockbarx/applets.py --replace /usr/share/ $out/share/ + substituteInPlace dockbarx/dockbar.py --replace /usr/share/ $out/share/ + substituteInPlace dockbarx/iconfactory.py --replace /usr/share/ $out/share/ + substituteInPlace dockbarx/theme.py --replace /usr/share/ $out/share/ + substituteInPlace dockx_applets/battery_status.py --replace /usr/share/ $out/share/ + substituteInPlace dockx_applets/namebar.py --replace /usr/share/ $out/share/ + substituteInPlace dockx_applets/namebar_window_buttons.py --replace /usr/share/ $out/share/ + substituteInPlace dockx_applets/volume-control.py --replace /usr/share/ $out/share/ + ''; + + propagatedBuildInputs = (with pythonPackages; [ pygtk pyxdg dbus-python pillow xlib ]) + ++ (with gnome2; [ gnome_python gnome_python_desktop ]) + ++ [ keybinder ]; + + meta = with stdenv.lib; { + homepage = http://launchpad.net/dockbar/; + description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index a8d35680dbde..61b0357bb9d0 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications ''; - meta = { + meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; description = "Multiplayer server browser for many Doom source ports"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.MP2E ]; }; } diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 221bd3c4bf5e..919ad10fa706 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 917d32e74afd..8752bafbe731 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 new file mode 100644 index 000000000000..25c963223789 --- /dev/null +++ b/pkgs/applications/misc/electrum-ltc/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchurl +, python2Packages +}: + +python2Packages.buildPythonApplication rec { + name = "electrum-ltc-${version}"; + version = "2.6.4.2"; + + src = fetchurl { + url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; + sha256 = "0sqcyk6n6kgaiinnwh6mzbbn4whk3ga59r5bw5rqmnnfqk1xdnb4"; + }; + + propagatedBuildInputs = with python2Packages; [ + pyqt4 + slowaes + ecdsa + pbkdf2 + requests + qrcode + ltc_scrypt + protobuf3_2 + dns + jsonrpclib + ]; + + preBuild = '' + sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py + # Recording the creation timestamps introduces indeterminism to the build + sed -i '/Created: .*/d' gui/qt/icons_rc.py + ''; + + checkPhase = '' + $out/bin/electrum-ltc help >/dev/null + ''; + + meta = with stdenv.lib; { + description = "Litecoin thin client"; + longDescription = '' + Electrum-LTC is a simple, but powerful Litecoin wallet. A twelve-word + security passphrase (or “seed”) leaves intruders stranded and your peace + of mind intact. Keep it on paper, or in your head... and never worry + about losing your litecoins to theft or hardware failure. No waiting, no + lengthy blockchain downloads and no syncing to the network. + ''; + homepage = https://electrum-ltc.org/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ asymmetric ]; + }; +} + diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 28b5f02e813a..34f403fda892 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.7.18"; + version = "2.8.3"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1l9krc7hqhqrm5bwp999bpykkcq4958qwvx8v0l5mxcxw8k7fkab"; + sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1"; }; propagatedBuildInputs = with python2Packages; [ @@ -14,23 +14,23 @@ python2Packages.buildPythonApplication rec { ecdsa jsonrpclib pbkdf2 - protobuf3_0 - pyasn1 - pyasn1-modules + protobuf3_2 + pyaes pycrypto pyqt4 + pysocks qrcode requests - slowaes tlslite # plugins - trezor keepkey + trezor + # TODO plugins - # matplotlib - # btchip # amodem + # btchip + # matplotlib ]; preBuild = '' @@ -43,8 +43,11 @@ python2Packages.buildPythonApplication rec { postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store/*/share $out + mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out rm -rf $out/lib/python2.7/site-packages/nix + + substituteInPlace $out/share/applications/electrum.desktop \ + --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; doInstallCheck = true; diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index a30a58db4836..7248fe2c8754 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,29 +2,26 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.34"; + version = "0.2.48"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "19dslv632qyz3hcycx22w6x96nwph7cxl1yjprir2w2c692dq06x"; + sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq"; }; - buildInputs = [ ]; - phases = [ "buildPhase" "installPhase" ]; buildPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/java + mkdir -p $out/bin $out/share/java ''; installPhase = '' cp $src $out/share/java/${pname}.jar - cat > $out/bin/${pname} < $out/bin/${pname} << EOF #! $SHELL $jdk/bin/java -jar $out/share/java/${pname}.jar "\$@" EOF diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 09bef975c85b..b6c10dbebcad 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { - name = "epdfview-0.1.8"; + name = "epdfview-${version}"; + version = "0.1.8"; src = fetchurl { - url = "http://trac.emma-soft.com/epdfview/chrome/site/releases/${name}.tar.bz2"; - sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; + url = "mirror://debian/pool/main/e/epdfview/epdfview_${version}.orig.tar.gz"; + sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64"; }; - buildInputs = [ pkgconfig gtk2 poppler ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 poppler ]; hardeningDisable = [ "format" ]; @@ -24,16 +26,16 @@ stdenv.mkDerivation rec { }) ]; - meta = { - homepage = http://trac.emma-soft.com/epdfview/; + meta = with stdenv.lib; { + homepage = https://packages.debian.org/wheezy/epdfview; description = "A lightweight PDF document viewer using Poppler and GTK+"; longDescription = '' ePDFView is a free lightweight PDF document viewer using Poppler and GTK+ libraries. The aim of ePDFView is to make a simple PDF document viewer, in the lines of Evince but without using the Gnome libraries. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = [ maintainers.astsmtl ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index 4a9c2b60006b..170e2385d4af 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchgit, bzip2, qt4, qmake4Hook, libX11 }: +{ stdenv, fetchFromGitHub, bzip2, qt4, qmake4Hook, libX11 }: stdenv.mkDerivation rec { name = "evopedia-${version}"; version = "0.4.4"; - src = fetchgit { - url = https://github.com/evopedia/evopedia_qt; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "evopedia"; + repo = "evopedia_qt"; + rev = "v${version}"; sha256 = "0snp5qiywj306kfaywvkl7j34fivgxcb8dids1lzmbqq5xcpqqvc"; }; buildInputs = [ bzip2 qt4 libX11 ]; nativeBuildInputs = [ qmake4Hook ]; - meta = { + meta = with stdenv.lib; { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.qknight ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 962d8f8b31f3..d0b98863d203 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "exercism-${version}"; - version = "2.3.0"; + version = "2.4.0"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5"; + sha256 = "1hl13sr4ymqg9sjhkxdmhf8cfw69cic3bysw34xfv2j6bjjxfwaa"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix new file mode 100644 index 000000000000..87709ec102bf --- /dev/null +++ b/pkgs/applications/misc/far2l/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, + xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: + +stdenv.mkDerivation rec { + rev = "ab240373f69824c56e9255d452b689cff3b1ecfb"; + build = "2017-05-09-${builtins.substring 0 10 rev}"; + name = "far2l-2.1.${build}"; + + src = fetchFromGitHub { + owner = "elfmz"; + repo = "far2l"; + rev = rev; + sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q"; + }; + + nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; + + buildInputs = [ wxGTK30 glib pcre ]; + + postPatch = '' + echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh + + substituteInPlace far2l/bootstrap/open.sh \ + --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' + substituteInPlace far2l/bootstrap/open.sh \ + --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' + substituteInPlace far2l/vtcompletor.cpp \ + --replace '"/bin/bash"' '"${bash}/bin/bash"' + substituteInPlace multiarc/src/formats/zip/zip.cpp \ + --replace '"unzip ' '"${unzip}/bin/unzip ' \ + --replace '"zip ' '"${zip}/bin/zip ' + substituteInPlace multiarc/src/formats/7z/7z.cpp \ + --replace '"^7z ' '"^${p7zip}/lib/p7zip/7z ' \ + --replace '"7z ' '"${p7zip}/lib/p7zip/7z ' + substituteInPlace multiarc/src/formats/targz/targz.cpp \ + --replace '"xz ' '"${xz}/bin/xz ' \ + --replace '"gzip ' '"${gzip}/bin/gzip ' \ + --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ + --replace '"tar ' '"${gnutar}/bin/tar ' + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/scalable/apps + cp -dpR install $out/share/far2l + mv $out/share/far2l/far2l $out/bin/ + ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_askpass + ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_sudoapp + + sed "s,/usr/bin/,$out/bin/," ../far2l/DE/far2l.desktop > $out/share/applications/far2l.desktop + + cp ../far2l/DE/icons/hicolor/1024x1024/apps/far2l.svg $out/share/icons/hicolor/scalable/apps/ + convert -size 128x128 ../far2l/DE/icons/far2l.svg $out/share/icons/far2l.png + for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024; do + mkdir -p $out/share/icons/hicolor/$size/apps + convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png + done + ''; + + stripDebugList = "bin share"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "An orthodox file manager"; + homepage = http://github.com/elfmz/far2l; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 1d8412a25f36..053cdd059916 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,27 +1,29 @@ -{ stdenv, lib, fetchgit, makeWrapper +{ stdenv, lib, fetchFromGitHub, makeWrapper , pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive }: +with stdenv.lib; + stdenv.mkDerivation { name = "finalterm-git-2014-11-15"; - src = fetchgit { - url = "https://github.com/p-e-w/finalterm.git"; + src = fetchFromGitHub { + owner = "p-e-w"; + repo = "finalterm"; rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b"; sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i"; }; + nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - pkgconfig cmake vala_0_23 intltool gtk3 gnome3.gnome_common gnome3.libgee - gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper + vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee + gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon - ] ++ lib.optionals stdenv.isLinux [ - udev - ]; + ] ++ optionals stdenv.isLinux [ udev ]; preConfigure = '' substituteInPlace data/org.gnome.finalterm.gschema.xml \ @@ -44,7 +46,7 @@ stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; - meta = with lib; { + meta = { homepage = "http://finalterm.org"; description = "A new breed of terminal emulator"; longDescription = '' @@ -57,7 +59,7 @@ stdenv.mkDerivation { - GUI terminal controls ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ cstrahan ]; + maintainers = [ maintainers.cstrahan ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix deleted file mode 100644 index b4e71d4bbc75..000000000000 --- a/pkgs/applications/misc/freicoin/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: - -stdenv.mkDerivation rec { - version = "0.8.3-1"; - name = "freicoin-${version}"; - - src = fetchurl { - url = "https://github.com/freicoin/freicoin/archive/v${version}.zip"; - sha256 = "0v3mh8a96nnb86mkyaylyjj7qfdrl7i9gvybh7f8w2hrl9paszfh"; - }; - - # I think that openssl and zlib are required, but come through other - # packages - buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip qmake4Hook ]; - - installPhase = '' - mkdir -p $out/bin - cp freicoin-qt $out/bin - ''; - - meta = { - description = "Peer-to-peer currency with demurrage fee"; - homepage = "http://freicoi.in/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 5d5f83a2370f..44071b328758 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl -, intltool, pkgconfig, gtk }: +{ stdenv, fetchFromGitHub +, autoreconfHook, intltool +, gtk, pkgconfig, flex }: stdenv.mkDerivation rec { - name = "galculator-${version}"; - version = "2.1.3"; + version = "2.1.4"; - src = fetchurl { - url = "mirror://sourceforge/galculator/${name}.tar.gz"; - sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17"; + src = fetchFromGitHub { + owner = "galculator"; + repo = "galculator"; + rev = "v${version}"; + sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; }; - buildInputs = [ intltool pkgconfig gtk ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + buildInputs = [ gtk flex ]; meta = with stdenv.lib; { description = "A GTK 2/3 algebraic and RPN calculator"; diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/applications/misc/gammu/bashcomp-dir.patch index 94cc2929c1ee..d41aa432cf35 100644 --- a/pkgs/applications/misc/gammu/bashcomp-dir.patch +++ b/pkgs/applications/misc/gammu/bashcomp-dir.patch @@ -1,12 +1,11 @@ -diff -Naur gammu-1.33.0.orig/contrib/CMakeLists.txt gammu-1.33.0/contrib/CMakeLists.txt ---- gammu-1.33.0.orig/contrib/CMakeLists.txt 2013-12-26 20:56:22.887772110 +0100 -+++ gammu-1.33.0/contrib/CMakeLists.txt 2013-12-26 20:57:04.386276037 +0100 -@@ -85,7 +85,7 @@ +--- a/contrib/CMakeLists.txt ++++ b/contrib/CMakeLists.txt +@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES) if (INSTALL_BASH_COMPLETION) + macro_optional_find_package (BashCompletion) + if (NOT BASH_COMPLETION_FOUND) +- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") ++ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") + endif (NOT BASH_COMPLETION_FOUND) install ( FILES bash-completion/gammu -- DESTINATION "/etc/bash_completion.d" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" - COMPONENT "bash" - ) - endif (INSTALL_BASH_COMPLETION) diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 10ee8272f380..950ce210c063 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl +{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl , libiconv, gettext, sqlite , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , postgresSupport ? false, postgresql ? null @@ -8,16 +8,20 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.33.0"; + version = "1.38.2"; - src = fetchurl { - url = "mirror://sourceforge/project/gammu/gammu/${version}/gammu-${version}.tar.xz"; - sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112"; + src = fetchFromGitHub { + owner = "gammu"; + repo = "gammu"; + rev = version; + sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv"; }; - patches = [ ./bashcomp-dir.patch ]; + patches = [ ./bashcomp-dir.patch ./systemd.patch ]; - buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ] + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ] ++ optionals dbiSupport [ libdbi libdbiDrivers ] ++ optionals postgresSupport [ postgresql ]; diff --git a/pkgs/applications/misc/gammu/systemd.patch b/pkgs/applications/misc/gammu/systemd.patch new file mode 100644 index 000000000000..22b49a5a2ffe --- /dev/null +++ b/pkgs/applications/misc/gammu/systemd.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in +index 8302353..e3ca59a 100644 +--- a/cmake/templates/gammu.spec.in ++++ b/cmake/templates/gammu.spec.in +@@ -387,9 +387,9 @@ fi + %doc %{_mandir}/man7/gammu-smsd-run.7* + %doc %{_mandir}/man7/gammu-smsd-sql.7* + %doc %{_mandir}/man7/gammu-smsd-tables.7* +-%dir %{_libexecdir}/systemd +-%dir %{_libexecdir}/systemd/system +-%{_libexecdir}/systemd/system/gammu-smsd.service ++%dir %{_prefix}/systemd ++%dir %{_prefix}/systemd/system ++%{_prefix}/systemd/system/gammu-smsd.service + + %files -n libGammu%{so_ver} -f libgammu.lang + %defattr(-,root,root,-) +diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt +index 78cc7fc..d674c36 100644 +--- a/contrib/CMakeLists.txt ++++ b/contrib/CMakeLists.txt +@@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION) + if (WITH_SYSTEMD) + install ( + FILES init/gammu-smsd.service +- DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd" + COMPONENT "systemd" + ) + endif (WITH_SYSTEMD) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 7560a8bfeb40..d3ba5a97333a 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,13 +1,14 @@ -{ fetchFromGitHub, lib, pythonPackages }: +{ stdenv, lib, fetchFromGitHub, pythonPackages +, libnotify ? null }: pythonPackages.buildPythonApplication rec { version = "3.4.0"; name = "gcalcli-${version}"; src = fetchFromGitHub { - owner = "insanum"; - repo = "gcalcli"; - rev = "v${version}"; + owner = "insanum"; + repo = "gcalcli"; + rev = "v${version}"; sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; }; @@ -20,12 +21,23 @@ pythonPackages.buildPythonApplication rec { parsedatetime six vobject - ] ++ lib.optional (!pythonPackages.isPy3k) futures; + ] + ++ lib.optional (!pythonPackages.isPy3k) futures; + + # there are no tests as of 3.4.0 + doCheck = false; + + postInstall = lib.optionalString stdenv.isLinux '' + substituteInPlace $out/bin/gcalcli \ + --replace "command = 'notify-send -u critical -a gcalcli %s'" \ + "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" + ''; meta = with lib; { homepage = https://github.com/insanum/gcalcli; description = "CLI for Google Calendar"; license = licenses.mit; - maintainers = [ maintainers.nocoolnametom ]; + maintainers = with maintainers; [ nocoolnametom ]; + inherit version; }; } diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index a858fefa8c2b..d024b0fce99e 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,9 +1,20 @@ -{stdenv, fetchurl, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}: +{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}: + +with stdenv.lib; + buildPerlPackage rec { name = "get_iplayer-${version}"; - version = "2.97"; + version = "2.99"; + + src = fetchFromGitHub { + owner = "get-iplayer"; + repo = "get_iplayer"; + rev = "v${version}"; + sha256 = "085bgwkjnaqp96gvd2s8qmkw69rz91si1sgzqdqbplkzj9bk2qii"; + }; - buildInputs = [makeWrapper perl]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLLibXML XMLSimple]; preConfigure = "touch Makefile.PL"; @@ -13,21 +24,15 @@ buildPerlPackage rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; - - src = fetchurl { - url = "https://github.com/get-iplayer/get_iplayer/archive/v${version}.tar.gz"; - sha256 = "0bb6kmzjmazwfxq5ip7yxm39vssfgz3v5vfx1114wfssp6pw0r44"; - }; meta = { description = "Downloads TV and radio from BBC iPlayer"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = https://squarepenguin.co.uk/; - downloadPage = https://github.com/get-iplayer/get_iplayer/releases; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 860068c5667a..7585ef6710a3 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses +{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintlOrEmpty , withBuildColors ? true }: @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' ''; - buildInputs = [ pkgconfig gtk gettext ]; + buildInputs = [ pkgconfig gtk gettext libintlOrEmpty ] + ++ stdenv.lib.optional stdenv.isDarwin libiconv; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; makeFlags = [ "PREFIX=$(out)" @@ -35,7 +38,7 @@ stdenv.mkDerivation rec { that focuses on simplicity and minimalism. ''; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.garbas ]; }; } diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index d6a59a89be65..8654e7f3a261 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,15 +1,19 @@ { fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE , IOKit ? null }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "gkrellm-2.3.5"; + name = "gkrellm-2.3.10"; + src = fetchurl { - url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2"; - sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; + url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2"; + sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb"; }; - buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gettext glib gtk2 libX11 libSM libICE] + ++ optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; @@ -22,12 +26,11 @@ stdenv.mkDerivation rec { sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" done ''; - buildPhase = '' - make PREFIX="$out" ''; - installPhase = '' - make install PREFIX="$out" ''; + installPhase = '' + make DESTDIR=$out install + ''; - meta = { + meta = { description = "Themeable process stack of system monitors"; longDescription = '' GKrellM is a single process stack of system monitors which supports @@ -35,10 +38,9 @@ stdenv.mkDerivation rec { or any other theme. ''; - homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html; - license = stdenv.lib.licenses.gpl3Plus; - + homepage = http://gkrellm.srcbox.net; + license = licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index dbff65d36518..6c712db01a5a 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://sourceforge.net/projects/gmrun/"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; + maintainers = []; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix new file mode 100644 index 000000000000..a86cf268801d --- /dev/null +++ b/pkgs/applications/misc/gmtp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 +, gsettings_desktop_schemas, wrapGAppsHook +}: + +let version = "1.3.10"; in + +stdenv.mkDerivation { + name = "gmtp-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; + sha256 = "b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ]; + + enableParallelBuilding = true; + + meta = { + description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; + homepage = "https://gmtp.sourceforge.io"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.pbogdan ]; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix new file mode 100644 index 000000000000..68b494927915 --- /dev/null +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub +, armadillo +, boost +, cmake +, glog +, gmock +, openssl +, google-gflags +, gnuradio +, orc +, pkgconfig +, pythonPackages +, uhd +}: + +stdenv.mkDerivation rec { + name = "gnss-sdr-${version}"; + version = "0.0.9"; + + src = fetchFromGitHub { + owner = "gnss-sdr"; + repo = "gnss-sdr"; + rev = "v${version}"; + sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975"; + }; + + buildInputs = [ + armadillo + boost.dev + cmake + glog + gmock + openssl.dev + google-gflags + gnuradio + orc + pkgconfig + pythonPackages.Mako + + # UHD support is optional, but gnuradio is built with it, so there's + # nothing to be gained by leaving it out. + uhd + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DGFlags_ROOT_DIR=${google-gflags}/lib" + "-DGLOG_INCLUDE_DIR=${glog}/include" + + # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as + # armadillo is built using both, so skip checking for them. + "-DBLAS=YES" + "-DLAPACK=YES" + + # Similarly, it doesn't actually use gfortran despite checking for + # its presence. + "-DGFORTRAN=YES" + ]; + + meta = with stdenv.lib; { + description = "An open source Global Navigation Satellite Systems software-defined receiver"; + homepage = http://gnss-sdr.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 497ac298d281..8218285c5fbb 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.10.1"; + version = "3.7.11"; src = fetchurl { - url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0ds9mcw8hgm03f82jvp3j4mm02ha6zvsl77lp13jzqmbqifbdmv3"; + url = "https://gnuradio.org/releases/gnuradio/${name}.tar.gz"; + sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7"; }; buildInputs = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { environments to support both wireless communications research and real-world radio systems. ''; - homepage = http://www.gnuradio.org; + homepage = https://www.gnuradio.org; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 68c9246c24b1..358d9dff44a6 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity -, yacc, flex, zlib, config, qmakeHook, makeQtWrapper +, yacc, flex, zlib, config, qmake, makeWrapper }: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz"; sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf"; }; - qtInputs = [ - qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib + buildInputs = [ + qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib qtconnectivity ]; - nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs; + nativeBuildInputs = [ flex makeWrapper qmake yacc ]; preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri @@ -22,9 +22,13 @@ stdenv.mkDerivation rec { sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp src/GoldenCheetah $out/bin - wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" + wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" + + runHook postInstall ''; meta = { description = "Performance software for cyclists, runners and triathletes"; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index be36eeceb6b6..278c685b7cf7 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell , libao, ffmpeg, libeb, lzo, xz, libtiff -, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmakeHook }: +, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }: stdenv.mkDerivation rec { + name = "goldendict-1.5.0.rc2"; src = fetchurl { url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz"; @@ -9,10 +10,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb - lzo xz libtiff qmakeHook + pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools + libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; + nativeBuildInputs = [ qmake ]; + qmakeFlags = [ "CONFIG+=zim_support" ]; meta = { diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 074a0c6fa43b..4322b4088436 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -2,48 +2,53 @@ GEM remote: https://rubygems.org/ specs: charlock_holmes (0.7.3) - diff-lcs (1.2.5) - github-markup (1.3.3) - gitlab-grit (2.7.3) + diff-lcs (1.3) + gemojione (3.2.0) + json + github-markup (1.6.0) + gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (~> 1.15) + mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gollum (4.0.1) + gollum (4.1.1) + gemojione (~> 3.2) gollum-lib (~> 4.0, >= 4.0.1) - kramdown (~> 1.8.0) + kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) - useragent (~> 0.14.0) - gollum-grit_adapter (1.0.0) + useragent (~> 0.16.2) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) + gollum-lib (4.2.5) + gemojione (~> 3.2) + github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - kramdown (1.8.0) - mime-types (1.25.1) - mini_portile2 (2.0.0) + rouge (~> 2.0) + sanitize (~> 2.1) + stringex (~> 2.6) + json (2.1.0) + kramdown (1.9.0) + mime-types (2.99.3) + mini_portile2 (2.1.0) mustache (0.99.8) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - posix-spawn (0.3.11) - rack (1.6.4) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + posix-spawn (0.3.13) + rack (1.6.8) rack-protection (1.5.3) rack - rouge (1.10.1) + rouge (2.0.7) sanitize (2.1.0) nokogiri (>= 1.4.4) - sinatra (1.4.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - stringex (2.5.2) - tilt (2.0.2) - useragent (0.14.0) + stringex (2.7.1) + tilt (2.0.7) + useragent (0.16.8) PLATFORMS ruby @@ -52,4 +57,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.10.6 + 1.15.0 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 1f3cc9e27c0c..160b38463b6a 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,16 +1,32 @@ -{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }: +{ stdenv, bundlerEnv, ruby, makeWrapper +, git }: -bundlerEnv rec { - name = "gollum-${version}"; - version = "4.0.1"; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "gollum"; + version = (import ./gemset.nix).gollum.version; - ruby = ruby_2_2; - gemdir = ./.; + nativeBuildInputs = [ makeWrapper ]; - meta = with lib; { + env = bundlerEnv { + name = "${name}-gems"; + inherit pname ruby; + gemdir = ./.; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/gollum $out/bin/gollum \ + --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} + ''; + + meta = with stdenv.lib; { description = "A simple, Git-powered wiki"; + homepage = "https://github.com/gollum/gollum"; license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; + maintainers = with maintainers; [ jgillich primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index f0c71fa455cf..2ad724b2bc7a 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,170 +1,186 @@ { - useragent = { - version = "0.14.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j"; - }; - }; - tilt = { - version = "2.0.2"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84"; - }; - }; - stringex = { - version = "2.5.2"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17"; - }; - }; - sinatra = { - version = "1.4.7"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; - }; - }; - sanitize = { - version = "2.1.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; - }; - }; - rouge = { - version = "1.10.1"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; - }; - }; - rack-protection = { - version = "1.5.3"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; - }; - }; - rack = { - version = "1.6.4"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; - }; - }; - posix-spawn = { - version = "0.3.11"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; - }; - }; - nokogiri = { - version = "1.6.7.2"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; - }; - }; - mustache = { - version = "0.99.8"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; - }; - }; - mini_portile2 = { - version = "2.0.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; - }; - }; - mime-types = { - version = "1.25.1"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; - }; - }; - kramdown = { - version = "1.8.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l"; - }; - }; - gollum-lib = { - version = "4.1.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm"; - }; - }; - gollum-grit_adapter = { - version = "1.0.0"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7"; - }; - }; - gollum = { - version = "4.0.1"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg"; - }; - }; - gitlab-grit = { - version = "2.7.3"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b"; - }; - }; - github-markup = { - version = "1.3.3"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq"; - }; - }; - diff-lcs = { - version = "1.2.5"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; charlock_holmes = { - version = "0.7.3"; source = { - type = "gem"; remotes = ["https://rubygems.org"]; sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + type = "gem"; }; + version = "0.7.3"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + gemojione = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik"; + type = "gem"; + }; + version = "3.2.0"; + }; + github-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9"; + type = "gem"; + }; + version = "1.6.0"; + }; + gitlab-grit = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; + type = "gem"; + }; + version = "2.8.1"; + }; + gollum = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s"; + type = "gem"; + }; + version = "4.1.1"; + }; + gollum-grit_adapter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; + type = "gem"; + }; + version = "1.0.1"; + }; + gollum-lib = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z"; + type = "gem"; + }; + version = "4.2.5"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; + type = "gem"; + }; + version = "1.9.0"; + }; + mime-types = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; + type = "gem"; + }; + version = "2.99.3"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + type = "gem"; + }; + version = "2.1.0"; + }; + mustache = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + type = "gem"; + }; + version = "0.99.8"; + }; + nokogiri = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj"; + type = "gem"; + }; + version = "1.6.8.1"; + }; + posix-spawn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; + type = "gem"; + }; + version = "0.3.13"; + }; + 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"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + type = "gem"; + }; + version = "2.0.7"; + }; + sanitize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + type = "gem"; + }; + version = "2.1.0"; + }; + sinatra = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + type = "gem"; + }; + version = "1.4.8"; + }; + stringex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv"; + type = "gem"; + }; + version = "2.7.1"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + type = "gem"; + }; + version = "2.0.7"; + }; + useragent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq"; + type = "gem"; + }; + version = "0.16.8"; }; } \ No newline at end of file diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 600a54931217..ef805a31567a 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { - name = "gpa-0.9.9"; + name = "gpa-0.9.10"; src = fetchurl { url = "mirror://gnupg/gpa/${name}.tar.bz2"; - sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38"; + sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3"; }; - buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ]; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ gtk2 gpgme libgpgerror libassuan ]; meta = with stdenv.lib; { description = "Graphical user interface for the GnuPG"; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 742bdaad9966..46278f42e7bb 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,17 +3,17 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.8"; + name = "gphoto2-2.5.11"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9"; + sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r"; }; - nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; + nativeBuildInputs = [ pkgconfig gettext libtool ]; + buildInputs = [ libgphoto2 libexif popt libjpeg readline ]; - meta = { + meta = with stdenv.lib; { description = "A ready to use set of digital camera software applications"; longDescription = '' @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gphoto.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.jcumming ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/clang-4.patch b/pkgs/applications/misc/gpsbabel/clang-4.patch new file mode 100644 index 000000000000..6bd19ae60440 --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/clang-4.patch @@ -0,0 +1,22 @@ +diff --git a/bushnell.cc b/bushnell.cc +index 8fa844d..40707c4 100644 +--- a/bushnell.cc ++++ b/bushnell.cc +@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name) + name = "Waypoint"; + } + +- for (t = bushnell_icons; t->icon > 0; t++) { ++ for (t = bushnell_icons; t->icon != 0; t++) { + if (0 == name.compare(t->icon, Qt::CaseInsensitive)) { + return t->symbol; + } +@@ -147,7 +147,7 @@ static const char* + bushnell_get_name_from_symbol(signed int s) + { + icon_mapping_t* t; +- for (t = bushnell_icons; t->icon > 0; t++) { ++ for (t = bushnell_icons; t->icon != 0; t++) { + if (s == t->symbol) { + return t->icon; + } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 6c248bc4dfa5..0911fbace449 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; - version = "1.5.3"; + version = "1.5.4"; - src = fetchurl { - # gpgbabel.org makes it hard to get the source tarball automatically, so - # get it from elsewhere. - url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; - sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1"; + src = fetchFromGitHub { + owner = "gpsbabel"; + repo = "gpsbabel"; + rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi"; }; patches = [ + ./clang-4.patch (fetchpatch { url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip; sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; }) ]; - buildInputs = [ zlib qt4 which ]; + buildInputs = [ zlib qtbase which ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -40,11 +42,13 @@ stdenv.mkDerivation rec { patchShebangs testo substituteInPlace testo \ --replace "-x /usr/bin/hexdump" "" - '' + ( + '' # The raymarine and gtm tests fail on i686 despite -ffloat-store. - if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;" - else "" - ); + + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" + # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572. + + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test" + # The arc-project test fails on aarch64. + + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test"; meta = with stdenv.lib; { description = "Convert, upload and download data from GPS and Map programs"; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 5026fea0e358..e691c79d85c0 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,17 +1,22 @@ -{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2 +{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2 , libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - name = "gpscorrelate-1.6.0"; + name = "gpscorrelate-${version}"; + version = "1.6.1"; - src = fetchurl { - url = "http://freefoote.dview.net/linux/${name}.tar.gz"; - sha256 = "1j0b244xkvvf0i4iivp4dw9k4xgyasx4sapd91mnwki35fy49sp0"; + src = fetchFromGitHub { + owner = "freefoote"; + repo = "gpscorrelate"; + rev = version; + sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig exiv2 libxml2 gtk2 - libxslt docbook_xsl docbook_xml_dtd_42 + exiv2 libxml2 gtk2 + libxslt docbook_xsl + docbook_xml_dtd_42 ]; patchPhase = '' @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g" ''; - meta = { + meta = with stdenv.lib; { description = "A GPS photo correlation tool, to add EXIF geotags"; longDescription = '' @@ -38,9 +43,8 @@ stdenv.mkDerivation rec { one takes the GPS data in a different format. ''; - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://freefoote.dview.net/linux_gpscorr.html; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + homepage = https://github.com/freefoote/gpscorrelate; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index edc8bbc3f77e..16147715705e 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchFromGitHub, qmakeHook }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "2.17"; + version = "4.8"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1422kgj972ydasqqm0k02qf3v2py7if2ibri7yjg8awqilacy6by"; + sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp"; }; - nativeBuildInputs = [ qmakeHook ]; - - patchPhase = '' - sed -i '/lang\/gpxsee_cs.qm/d' gpxsee.qrc + nativeBuildInputs = [ qmake qttools ]; + + preConfigure = '' + substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee + lrelease lang/*.ts ''; preFixup = '' - mkdir -p $out/bin - cp GPXSee $out/bin + install -Dm755 GPXSee $out/bin/GPXSee + + mkdir -p $out/share/gpxsee + cp pkg/maps.txt $out/share/gpxsee ''; - + meta = with stdenv.lib; { homepage = http://tumic.wz.cz/gpxsee; description = "GPX viewer and analyzer"; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index e925885f05f2..481e21079518 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "0.4.1"; + version = "0.4.2"; name = "haxor-news-${version}"; src = fetchurl { url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz"; - sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr"; + sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs"; }; propagatedBuildInputs = with pythonPackages; [ click colorama - requests2 + requests pygments - prompt_toolkit_52 + prompt_toolkit six ]; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix new file mode 100644 index 000000000000..0b679617243d --- /dev/null +++ b/pkgs/applications/misc/houdini/default.nix @@ -0,0 +1,14 @@ +{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: + +let + houdini-runtime = callPackage ./runtime.nix { }; +in buildFHSUserEnv rec { + name = "houdini-${houdini-runtime.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 000000000000..3a91d27fc48c --- /dev/null +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -0,0 +1,86 @@ +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, 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 + xorg.libXcursor + xorg.libXfixes + xorg.libXrender + xorg.libXcomposite + xorg.libXdamage + xorg.libXtst + alsaLib + fontconfig + libSM + libICE + zlib + libpng + dbus + ]) + ]; + license_dir = "~/.config/houdini"; +in +stdenv.mkDerivation rec { + version = "16.0.671"; + name = "houdini-runtime-${version}"; + src = requireFile rec { + name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; + sha256 = "1d3c1a1128szlgaf3ilw5y20plz5azwp37v0ljawgm80y64hq15r"; + 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 + echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $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 QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh + echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh + echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $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/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix deleted file mode 100644 index e8274418ae16..000000000000 --- a/pkgs/applications/misc/htmldoc/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }: -stdenv.mkDerivation rec { - name = "htmldoc-1.8.27"; - src = fetchurl { - url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2; - sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9"; - }; - buildInputs = [ fltk openssl libpng libjpeg ]; - meta = { - homepage = http://www.htmldoc.org/; - description = "Converts HTML files to indexed HTML, PS or PDF"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 05a4db7a2500..27757e4e31ae 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.18.1"; + version = "0.25.1"; - goPackagePath = "github.com/spf13/hugo"; + goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { - owner = "spf13"; + owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81"; + sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 0a95b083c0b8..ff832d4961f5 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,173 +1,38 @@ [ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a622679ebd7a3b813862379232f645f8e690e43f"; - sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; - sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "54864211433d45cb780682431585b3e573b49e4a"; - sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; - sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; - }; - } { goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab"; + sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "b938d81255b5473c57635324295cb0fe398c7a58"; + sha256 = "0d44lrg04g9nibhdlagwq9n8g5ka1784pm0jzyl6cfpq8nc1ppj8"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5"; + sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j"; }; } { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + goPackagePath = "github.com/bep/gitmap"; fetch = { type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; - sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; - sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; - }; - } - { - goPackagePath = "github.com/yosssi/ace"; - fetch = { - type = "git"; - url = "https://github.com/yosssi/ace"; - rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d"; - sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "ec4eb2fa8549869ae7a2accd4fcc83d1c0555c15"; - sha256 = "018niqyrg09andj3g08jalflq2ypz9bp7qb1mbk50kfly29lkih7"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "b83537d79690b75cac5e021b036ae16792bf0f20"; - sha256 = "19blhq00rnynv11nnvixisx4h1429rp5bik13k661ixw0421qqyx"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; - sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; - sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c265cfa48dda6474e208715ca93e987829f572f8"; - sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"; + url = "https://github.com/bep/gitmap"; + rev = "de8030ebafb76c6e84d50ee6d143382637c00598"; + sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami"; }; } { @@ -180,39 +45,21 @@ }; } { - goPackagePath = "github.com/eknkc/amber"; + goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "91774f050c1453128146169b626489e60108ec03"; - sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"; + url = "https://github.com/chaseadamsio/goorgeous"; + rev = "677defd0e024333503d8c946dd4ba3f32ad3e5d2"; + sha256 = "1mcncs3qdb62m9xwhkxy743ddvgsjfbmbl2djnhqmz1va05njna1"; }; } { - goPackagePath = "github.com/spf13/afero"; + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; - url = "https://github.com/spf13/afero"; - rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8"; - sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "27b586b42e29bec072fe7379259cc719e1289da6"; - sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7"; - sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "23709d0847197db6021a51fdb193e66e9222d4e7"; + sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f"; }; } { @@ -225,57 +72,84 @@ }; } { - goPackagePath = "github.com/spf13/fsync"; + goPackagePath = "github.com/eknkc/amber"; fetch = { type = "git"; - url = "https://github.com/spf13/fsync"; - rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b"; - sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z"; + url = "https://github.com/eknkc/amber"; + rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5"; + sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq"; }; } { - goPackagePath = "github.com/cpuguy83/go-md2man"; + goPackagePath = "github.com/fortytw2/leaktest"; fetch = { type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; - sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + url = "https://github.com/fortytw2/leaktest"; + rev = "7dad53304f9614c1c365755c1176a8e876fee3e8"; + sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m"; }; } { - goPackagePath = "github.com/miekg/mmark"; + goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; - url = "https://github.com/miekg/mmark"; - rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a"; - sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; + sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; }; } { - goPackagePath = "github.com/spf13/nitro"; + goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; - url = "https://github.com/spf13/nitro"; - rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; - sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + url = "https://github.com/gorilla/websocket"; + rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; + sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; }; } { - goPackagePath = "github.com/PuerkitoBio/purell"; + goPackagePath = "github.com/hashicorp/go-immutable-radix"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3"; - sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"; + url = "https://github.com/hashicorp/go-immutable-radix"; + rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc"; + sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb"; }; } { - goPackagePath = "github.com/pkg/sftp"; + goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472"; - sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; + sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; }; } { @@ -292,26 +166,35 @@ fetch = { type = "git"; url = "https://github.com/kyokomi/emoji"; - rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9"; - sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"; + rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17"; + sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh"; }; } { - goPackagePath = "github.com/pkg/errors"; + goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; - url = "https://github.com/pkg/errors"; - rev = "494e70f7620561491c2ca11e185bbef4b70060da"; - sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"; + url = "https://github.com/magiconair/properties"; + rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; + sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; }; } { - goPackagePath = "github.com/PuerkitoBio/urlesc"; + goPackagePath = "github.com/miekg/mmark"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587"; - sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"; + url = "https://github.com/miekg/mmark"; + rev = "f809cc9d384e2f7f3985a28a899237b892f35719"; + sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; }; } { @@ -319,17 +202,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "e6c90c3ceece7f43060f843b495c3c9c031f5575"; - sha256 = "1i1hqvq05lk12wnrhayca66pvfbyjnj7dm0lr0hn5qhb2i8k84kd"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "45932ad32dfdd20826f5671da37a5f3ce9f26a8d"; - sha256 = "1rs25xqlpz2j9gqii144qnkvhsgzhwgy9ild7yvxhnbs2mybgix7"; + rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24"; + sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i"; }; } { @@ -337,17 +211,197 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-buffruneio"; - rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d"; - sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f"; + rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; + sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; }; } { - goPackagePath = "github.com/bep/gitmap"; + goPackagePath = "github.com/pelletier/go-toml"; fetch = { type = "git"; - url = "https://github.com/bep/gitmap"; - rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac"; - sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g"; + url = "https://github.com/pelletier/go-toml"; + rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286"; + sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "c605e284fe17294bda444b34710735b29d1a9d90"; + sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "a5f8514e29e90a859e93871b1582e5c81f466f82"; + sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; + sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; + sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; + sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; + sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37"; + sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx"; + }; + } + { + goPackagePath = "github.com/spf13/fsync"; + fetch = { + type = "git"; + url = "https://github.com/spf13/fsync"; + rev = "12a01e648f05a938100a26858d2d59a120307a18"; + sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "0efa5202c04663c757d84f90f5219c1250baf94f"; + sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs"; + }; + } + { + goPackagePath = "github.com/spf13/nitro"; + fetch = { + type = "git"; + url = "https://github.com/spf13/nitro"; + rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; + sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "c1de95864d73a5465492829d7cb2dd422b19ac96"; + sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; + sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; + }; + } + { + goPackagePath = "github.com/yosssi/ace"; + fetch = { + type = "git"; + url = "https://github.com/yosssi/ace"; + rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"; + sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "850760c427c516be930bc91280636328f1a62286"; + sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d"; + sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd"; + sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; + sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735"; + sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; + sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; }; } ] diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 310f8feb2fd4..2202dd8c4c42 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -11,11 +11,11 @@ let ]; in stdenv.mkDerivation rec { - version = "0.8.3"; + version = "1.3.3"; name = "hyper-${version}"; src = fetchurl { - url = "https://github.com/zeit/hyper/releases/download/${version}/hyper-${version}-amd64.deb"; - sha256 = "1683gc0fhifn89l9h67yz02pk1xz7p5l3qpiyddr9w21qr9h3lhq"; + url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}.deb"; + sha256 = "1i68n77yv1g4dfx4xfmcb06mfpwhf0gnb3wmldg2gxkhs0fn19zg"; }; buildInputs = [ dpkg ]; unpackPhase = '' @@ -26,9 +26,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" mv opt "$out/" - ln -s "$out/opt/Hyper/Hyper" "$out/bin/Hyper" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/Hyper" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/Hyper/resources/app/node_modules/child_pty/build/Release/exechelper" + ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" mv usr/* "$out/" ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix index 536582e4ee71..5097496d3992 100644 --- a/pkgs/applications/misc/inspectrum/default.nix +++ b/pkgs/applications/misc/inspectrum/default.nix @@ -1,18 +1,34 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, boost, fftwFloat, qt5, gnuradio }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +, boost +, fftwFloat +, qt5 +, gnuradio +, liquid-dsp +}: stdenv.mkDerivation rec { - name = "inspectrum-${version}"; - version = "20160403"; + name = "inspectrum-unstable-2017-05-31"; src = fetchFromGitHub { owner = "miek"; repo = "inspectrum"; - rev = "27381dbb30f59267a429c04d17d792d3953a6b99"; - sha256 = "0y4j62khq6fcv2qqlqi0kn2ix821m5gcqzg72nhc2zzfb3cdm9nm"; + rev = "a89d1337efb31673ccb6a6681bb89c21894c76f7"; + sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv"; }; - buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat boost gnuradio ]; - + buildInputs = [ + pkgconfig + cmake + qt5.qtbase + fftwFloat + boost + gnuradio + liquid-dsp + ]; + meta = with stdenv.lib; { description = "Tool for analysing captured signals from sdr receivers"; homepage = https://github.com/miek/inspectrum; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 0afcbca4979f..f90784759941 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -4,12 +4,13 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "IPMIView-${version}"; - version = "20151223"; + version = "2.13.0"; + buildVersion = "170504"; src = fetchurl { - url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz"; - sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121"; - }; + url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; + sha256 = "1hfw5g6lxg3vqg0nc3g2sv2h6bn8za35bxxms0ri0sgb9v3xg1y6"; + }; buildInputs = [ patchelf makeWrapper ]; @@ -23,12 +24,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -R . $out/ - echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView - chmod +x $out/bin/IPMIView + makeWrapper $out/jre/bin/java $out/bin/IPMIView \ + --prefix PATH : "$out/jre/bin" \ + --add-flags "-jar $out/IPMIView20.jar" ''; meta = with stdenv.lib; { license = licenses.unfree; }; } - diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix index 028e5d6b725a..fa2ac38d383b 100644 --- a/pkgs/applications/misc/iterm2/default.nix +++ b/pkgs/applications/misc/iterm2/default.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation rec { name = "iterm2-${version}"; - version = "3.0.4"; + version = "3.0.14"; src = fetchFromGitHub { owner = "gnachman"; repo = "iTerm2"; rev = "v${version}"; - sha256 = "0ffg9l2jvv503h13nd5rjkn5xrahswcqqwmm052qzd6d0lmqjm93"; + sha256 = "03m0ja11w9910z96yi8fzq3436y8xl14q031rdb2w3sapjd54qrj"; }; patches = [ ./disable_updates.patch ]; + postPatch = '' + sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj + ''; makeFlagsArray = ["Deployment"]; installPhase = '' mkdir -p "$out/Applications" diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 9a60cd060f56..9896fd15b85c 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "j4-dmenu-desktop-${version}"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "enkore"; repo = "j4-dmenu-desktop"; rev = "r${version}"; - sha256 = "14srrkz4qx8qplgrrjv38ri4pnkxaxaq6jy89j13xhna492bq128"; + sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r"; }; postPatch = '' diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile index 4074421fca3e..97ebb9705bd6 100644 --- a/pkgs/applications/misc/jekyll/Gemfile +++ b/pkgs/applications/misc/jekyll/Gemfile @@ -1,5 +1,7 @@ source 'https://rubygems.org' gem 'jekyll' +gem 'jekyll-feed' gem 'jekyll-paginate' gem 'rdiscount' gem 'RedCloth' +gem 'minima' diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock index c2d82181be2d..da4be83382fb 100644 --- a/pkgs/applications/misc/jekyll/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/Gemfile.lock @@ -1,36 +1,48 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.2.9) - colorator (0.1) - ffi (1.9.10) - jekyll (3.0.1) - colorator (~> 0.1) + RedCloth (4.3.2) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + colorator (1.1.0) + ffi (1.9.18) + forwardable-extended (2.6.0) + jekyll (3.4.1) + addressable (~> 2.4) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) liquid (~> 3.0) mercenary (~> 0.3.3) + pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-sass-converter (1.4.0) - sass (~> 3.4) - jekyll-watch (1.3.0) - listen (~> 3.0) + jekyll-feed (0.9.1) + jekyll (~> 3.3) jekyll-paginate (1.1.0) - kramdown (1.9.0) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.13.2) liquid (3.0.6) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - mercenary (0.3.5) - rb-fsevent (0.9.7) - rb-inotify (0.9.5) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + minima (2.1.0) + jekyll (~> 3.3) + pathutil (0.14.0) + forwardable-extended (~> 2.6) + public_suffix (2.0.5) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) ffi (>= 0.5.0) - rdiscount (2.1.8) - rouge (1.10.1) + rdiscount (2.2.0.1) + rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.20) + sass (3.4.23) PLATFORMS ruby @@ -38,7 +50,10 @@ PLATFORMS DEPENDENCIES RedCloth jekyll + jekyll-feed + jekyll-paginate + minima rdiscount BUNDLED WITH - 1.10.6 + 1.14.4 diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index b06a28513b82..f3661030a2ba 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -1,11 +1,13 @@ -{ stdenv, lib, bundlerEnv, ruby_2_2, curl }: +{ stdenv, lib, bundlerEnv, ruby }: bundlerEnv rec { name = "jekyll-${version}"; - version = "3.0.1"; - ruby = ruby_2_2; - gemdir = ./.; + version = (import gemset).jekyll.version; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; meta = with lib; { description = "Simple, blog aware, static site generator"; diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix index a5c72d093850..5b1a35209aeb 100644 --- a/pkgs/applications/misc/jekyll/gemset.nix +++ b/pkgs/applications/misc/jekyll/gemset.nix @@ -1,145 +1,183 @@ { - "RedCloth" = { - version = "4.2.9"; + addressable = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; type = "gem"; - sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl"; }; + version = "2.5.0"; }; - "colorator" = { - version = "0.1"; + colorator = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; type = "gem"; - sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; }; - }; - "ffi" = { - version = "1.9.10"; - source = { - type = "gem"; - sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; - }; - }; - "jekyll" = { - version = "3.0.1"; - source = { - type = "gem"; - sha256 = "107svn6r7pvkg9wwfi4r44d2rqppysjf9zf09h7z1ajsy8k2s65a"; - }; - dependencies = [ - "colorator" - "jekyll-sass-converter" - "jekyll-watch" - "jekyll-paginate" - "kramdown" - "liquid" - "mercenary" - "rouge" - "safe_yaml" - ]; - }; - "jekyll-sass-converter" = { - version = "1.4.0"; - source = { - type = "gem"; - sha256 = "095757w0pg6qh3wlfg1j1mw4fsz7s89ia4zai5f2rhx9yxsvk1d8"; - }; - dependencies = [ - "sass" - ]; - }; - "jekyll-watch" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1mqwvrd2hm6ah5zsxqsv2xdp31wl94pl8ybb1q324j79z8pvyarg"; - }; - dependencies = [ - "listen" - ]; - }; - "jekyll-paginate" = { version = "1.1.0"; + }; + ffi = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; + }; + version = "1.9.18"; + }; + forwardable-extended = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; + type = "gem"; + }; + version = "2.6.0"; + }; + jekyll = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qbnjx7bpshbcam6p9ss2g6gpd3gxz6h4w9yszphj3ip335yhawb"; + type = "gem"; + }; + version = "3.4.1"; + }; + jekyll-feed = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dj62gy1jskkn703mi5h0bkg1psbpkdm2qqdw3bhjfid9358qvay"; + type = "gem"; + }; + version = "0.9.1"; + }; + jekyll-paginate = { + source = { sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; - }; - }; - "kramdown" = { - version = "1.9.0"; - source = { type = "gem"; - sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; }; + version = "1.1.0"; }; - "liquid" = { - version = "3.0.6"; + jekyll-sass-converter = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "01m921763yfgx1gc33k5ixqz623f4c4azgnpqhgsc2q61fyfk3q1"; type = "gem"; + }; + version = "1.5.0"; + }; + jekyll-watch = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02rg3wi95w2l0bg1igl5k6pza723vn2b2gj975gycz1cpmhdjn6z"; + type = "gem"; + }; + version = "1.5.0"; + }; + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1isiqc40q44zg57bd6cfnw1a2l0s2j5skw2awn2cz3gcm7wsf49d"; + type = "gem"; + }; + version = "1.13.2"; + }; + liquid = { + source = { sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2"; - }; - }; - "listen" = { - version = "3.0.5"; - source = { type = "gem"; - sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g"; }; - dependencies = [ - "rb-fsevent" - "rb-inotify" - ]; + version = "3.0.6"; }; - "mercenary" = { - version = "0.3.5"; + listen = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i"; type = "gem"; - sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb"; }; + version = "3.0.8"; }; - "rb-fsevent" = { - version = "0.9.7"; + mercenary = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; type = "gem"; - sha256 = "1xlkflgxngwkd4nyybccgd1japrba4v3kwnp00alikj404clqx4v"; }; + version = "0.3.6"; }; - "rb-inotify" = { - version = "0.9.5"; + minima = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s7ks9fqfvqx7qicnkrg76wavg9mjas52f7iyhr89lz9mqiy7p39"; type = "gem"; - sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; }; - dependencies = [ - "ffi" - ]; + version = "2.1.0"; }; - "rdiscount" = { - version = "2.1.8"; + pathutil = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f444wx6vjd30lkkb2zn1k5a6g33lidrpyy7lmgy66n1gsiipzn7"; type = "gem"; - sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; }; + version = "0.14.0"; }; - "rouge" = { - version = "1.10.1"; + public_suffix = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; type = "gem"; - sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; }; + version = "2.0.5"; }; - "safe_yaml" = { - version = "1.0.4"; + rb-fsevent = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pdiasp9zlr306yld19szapi6kdjk38rpv1hih9x0ry40x6mb63n"; type = "gem"; + }; + version = "0.9.8"; + }; + rb-inotify = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bq14f3md5nm00kgxgf0r9lcbn0vgbwljgajif0slxcwv622fjg9"; + type = "gem"; + }; + version = "0.9.8"; + }; + rdiscount = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; + type = "gem"; + }; + version = "2.2.0.1"; + }; + RedCloth = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; + type = "gem"; + }; + version = "4.3.2"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13amckbdknnc5491ag28y8pqbyfpbzx5n4rlmadxhd3wkrhp92c8"; + type = "gem"; + }; + version = "1.11.1"; + }; + safe_yaml = { + source = { sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sass" = { - version = "3.4.20"; - source = { type = "gem"; - sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf"; }; + version = "1.0.4"; }; -} + sass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0da4mn3n60cm1ss1pw1rrpa7fxagglxiwcgvz1asf1qgf4mvcwyr"; + type = "gem"; + }; + version = "3.4.23"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 6dd0f532f183..b53a49d584d6 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "11639"; + version = "12275"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1xq074jfk58gh5xmm8s9sjbcbnl34dpx7wsgq9n60phciya90sfb"; + sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a"; }; phases = [ "installPhase" ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "An extensible editor for ​OpenStreetMap"; + description = "An extensible editor for OpenStreetMap"; homepage = https://josm.openstreetmap.de/; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index e552ac9777f2..138ee397d3fd 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, libjpeg }: +{ stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.0.7"; name = "jp2a-${version}"; - src = fetchurl { - url = "mirror://sourceforge/jp2a/${name}.tar.gz"; - sha256 = "076frk3pa16s4r1b10zgy81vdlz0385zh3ykbnkaij25jn5aqc09"; + src = fetchFromGitHub { + owner = "cslarsen"; + repo = "jp2a"; + rev = "v${version}"; + sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; }; makeFlags = "PREFIX=$(out)"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libjpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix deleted file mode 100644 index bda647659416..000000000000 --- a/pkgs/applications/misc/k3b/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig -, shared_mime_info, libvorbis, taglib, flac, libsamplerate -, libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao -, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg -, libkcddb, phonon -}: - -let - # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, - # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, - # vcdxminfo, and vcdxrip - binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ]; - -in stdenv.mkDerivation rec { - name = "k3b-${version}"; - version = "2.0.3a"; - - src = fetchurl { - url = "http://download.kde.org/stable/k3b/${name}.tar.xz"; - sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd"; - }; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - buildInputs = [ - shared_mime_info libvorbis taglib flac libsamplerate libdvdread - lame libsndfile libmad stdenv.cc.libc kdelibs4 - phonon libkcddb makeWrapper cdparanoia - libdvdcss ffmpeg - ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_LINK = [ "-lcdda_interface" "-lcdda_paranoia" "-ldvdcss" ]; - - postInstall = '' - wrapProgram $out/bin/k3b \ - --prefix PATH ":" "${binPath}" - ''; - - meta = with stdenv.lib; { - description = "CD/DVD Burning Application for KDE"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index ba1a266a42f5..2a4793bfe09c 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "kanboard-${version}"; - version = "1.0.40"; + version = "1.0.44"; src = fetchzip { - url = "https://kanboard.net/kanboard-1.0.40.zip"; - sha256 = "1phn3rvngch636g00rhicl0225qk6gdmxqjflkrdchv299zysswd"; + url = "https://kanboard.net/${name}.zip"; + sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn"; }; dontBuild = true; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 22c9cfc7e986..0d8db33bc178 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , extra-cmake-modules -, makeQtWrapper , kcmutils , kconfigwidgets , kdbusaddons @@ -12,6 +11,7 @@ , qca-qt5 , libfakekey , libXtst +, qtx11extras }: stdenv.mkDerivation rec { @@ -33,16 +33,10 @@ stdenv.mkDerivation rec { knotifications libfakekey libXtst + qtx11extras ]; - nativeBuildInputs = [ - extra-cmake-modules - makeQtWrapper - ]; - - postInstall = '' - wrapQtProgram "$out/bin/kdeconnect-cli" - ''; + nativeBuildInputs = [ extra-cmake-modules ]; meta = { description = "KDE Connect provides several features to integrate your phone and your computer"; diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix new file mode 100644 index 000000000000..cd83d2a44e1d --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildEnv, fetchzip, mono }: + +let + version = "0.8.1"; + drv = stdenv.mkDerivation { + name = "keeagent-${version}"; + + src = fetchzip { + url = http://lechnology.com/wp-content/uploads/2016/07/KeeAgent_v0.8.1.zip; + sha256 = "16x1qrnzg0xkvi7w29wj3z0ldmql2vcbwxksbsmnidzmygwg98hk"; + stripRoot = false; + }; + + meta = { + description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; + homepage = http://lechnology.com/software/keeagent; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2; + maintainers = [ ]; + }; + + pluginFilename = "KeeAgent.plgx"; + + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename + ''; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index 5e43486b0752..e64632d529b1 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 57f6cfc4c4b4..e36fbfa0f3f9 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 c5bd9afd2cf6..6ae86486b47b 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.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "0ncc157xki1mzxfa41bgwjfsz5jq9sq750ka578lq61smyzh5lq6"; + 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/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 8d7eeffad310..98dbb0cbf911 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -3,12 +3,12 @@ with python3Packages; buildPythonApplication rec { - version = "0.9.2"; + version = "0.9.5"; name = "khal-${version}"; src = fetchurl { url = "mirror://pypi/k/khal/khal-${version}.tar.gz"; - sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp"; + sha256 = "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 3961138658f7..b0590fdc38f7 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation rec { description = "An offline reader for Web content"; homepage = http://kiwix.org; license = licenses.gpl3; + platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; }; } diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 8ce74850e1a4..e686ec94a4a3 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,35 +1,31 @@ { - kdeDerivation, kdeWrapper, fetchFromGitHub, lib, - extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed, - taglib, exiv2, podofo + mkDerivation, fetchFromGitHub, lib, + extra-cmake-modules, kdoctools, wrapGAppsHook, + kconfig, kinit, kjsembed, taglib, exiv2, podofo, + kcrash }: let pname = "krename"; - version = "20161228"; - unwrapped = kdeDerivation rec { - name = "${pname}-${version}"; + version = "20170610"; +in mkDerivation rec { + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "krename"; - rev = "4e55c2bef50898eb4a6485ce068379b166121895"; - sha256 = "09yz3sxy2l6radfybkj2f7224ggf315vnvyksk0aq8f03gan6cbp"; - }; - - meta = with lib; { - homepage = http://www.krename.net; - description = "A powerful batch renamer for KDE"; - inherit (kconfig.meta) platforms; - maintainers = with maintainers; [ urkud peterhoeg ]; - }; - - buildInputs = [ taglib exiv2 podofo ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kconfig kinit kjsembed ]; + src = fetchFromGitHub { + owner = "KDE"; + repo = "krename"; + rev = "18000edfec52de0b417d575e14eb078b4bd7b2f3"; + sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j"; }; -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/krename" ]; + meta = with lib; { + homepage = http://www.krename.net; + description = "A powerful batch renamer for KDE"; + inherit (kconfig.meta) platforms; + maintainers = with maintainers; [ peterhoeg ]; + }; + + buildInputs = [ taglib exiv2 podofo ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; } diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 75b2da6e8a25..bcf351ff46ae 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs4, kde_baseapps +{ + mkDerivation, fetchurl, lib, + extra-cmake-modules, kdoctools, wrapGAppsHook, + karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem }: -stdenv.mkDerivation rec { - name = "krusader-2.4.0-beta1"; +let + pname = "krusader"; + version = "2.6.0"; +in mkDerivation rec { + name = "krusader-${version}"; + src = fetchurl { - url = "mirror://sourceforge/krusader/${name}.tar.bz2"; - sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; + url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh"; }; - buildInputs = [ kdelibs4 kde_baseapps ]; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions - meta = { + + meta = with lib; { description = "Norton/Total Commander clone for KDE"; - license = "GPL"; + license = licenses.gpl2; homepage = http://www.krusader.org; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - inherit (kdelibs4.meta) platforms; + maintainers = with maintainers; [ sander ]; }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; } diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix new file mode 100644 index 000000000000..1b2cf94d173d --- /dev/null +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }: + +let version = "0.6.0"; in + +mkDerivation { + name = "latte-dock-${version}"; + + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "Latte-Dock"; + rev = "v${version}"; + sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv"; + }; + + buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Dock-style app launcher based on Plasma frameworks"; + homepage = https://github.com/psifidotos/Latte-Dock; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.benley ]; + }; +} diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 0da6e8eb34ae..0d5ee9790875 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.2.2"; + version = "2.2.3"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz"; - sha256 = "0s2mma8fkj5mi8qzc0j67589mbj854bypx2s3y59y1n429s3sp58"; + sha256 = "0mrbr24xbdg25gd7w8g76gpmy0a10nrnz0mz47mdjwi441yfpjjg"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix new file mode 100644 index 000000000000..af8d00b59bfb --- /dev/null +++ b/pkgs/applications/misc/madonctl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: + +buildGoPackage rec { + name = "madonctl-${version}"; + version = "1.1.0"; + + goPackagePath = "github.com/McKael/madonctl"; + + src = fetchFromGitHub { + owner = "McKael"; + repo = "madonctl"; + rev = "v${version}"; + sha256 = "1dnc1xaafhwhhf5afhb0wc2wbqq0s1r7qzj5k0xzc58my541gadc"; + }; + + # How to update: + # go get -u github.com/McKael/madonctl + # cd $GOPATH/src/github.com/McKael/madonctl + # git checkout v + # go2nix save + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "CLI for the Mastodon social network API"; + homepage = https://github.com/McKael/madonctl; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/applications/misc/madonctl/deps.nix b/pkgs/applications/misc/madonctl/deps.nix new file mode 100644 index 000000000000..9f94bb09ce4e --- /dev/null +++ b/pkgs/applications/misc/madonctl/deps.nix @@ -0,0 +1,228 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/McKael/madon"; + fetch = { + type = "git"; + url = "https://github.com/McKael/madon"; + rev = "e580cd41ac42bbb0b2ea5b3843b3f1f854db357c"; + sha256 = "0jvvfkf3wlzisvcq54xv3jxncx178ks5wxd6cx8k8215437b3hra"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; + sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; + sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; + sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "7cafcd837844e784b526369c9bce262804aebc60"; + sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx"; + }; + } + { + goPackagePath = "github.com/m0t0k1ch1/gomif"; + fetch = { + type = "git"; + url = "https://github.com/m0t0k1ch1/gomif"; + rev = "f5864f63e1ed5a138f015cc2cb71a2e99c148d21"; + sha256 = "0djg8chax1g0m02xz84ic19758jzv5m50b7vpwjkpjk3181j5z9k"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; + sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; + sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; + sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; + }; + } + { + goPackagePath = "github.com/pelletier/go-buffruneio"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-buffruneio"; + rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; + sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "5c26a6ff6fd178719e15decac1c8196da0d7d6d1"; + sha256 = "0f4l7mq0nb2p2vjfjqx251s6jzkl646n1vw45chykwvv1sbad8nq"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "c605e284fe17294bda444b34710735b29d1a9d90"; + sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; + }; + } + { + goPackagePath = "github.com/sendgrid/rest"; + fetch = { + type = "git"; + url = "https://github.com/sendgrid/rest"; + rev = "14de1ac72d9ae5c3c0d7c02164c52ebd3b951a4e"; + sha256 = "0wrggvgnqdmhscim52hvhg77jhksprxp52sc4ipd69kasd32b5dm"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; + sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; + sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "ca5710c94eabe15aa1f74490b8e5976dc652e8c6"; + sha256 = "1z5fxh9akwn95av6ra8p6804nhyxjc63m0s6abxi3l424n30b08i"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "8f07c835e5cc1450c082fe3a439cf87b0cbb2d99"; + sha256 = "1dhl6kdbyczhnsgiyc8mcb7kmxd9garx8gy3q2gx5mmv96xxzxx7"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; + sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2"; + sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "513929065c19401a1c7b76ecd942f9f86a0c061b"; + sha256 = "19ziin0k3n45nccjbk094f61hr198wzqnas93cmcxdja8f8fz27q"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "f047394b6d14284165300fd82dad67edb3a4d7f6"; + sha256 = "1l1a2iz1nmfmzzbjj1h8066prag4jvjqh13iv1jdlh05fgv6769i"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a2e06a18b0d52d8cb2010e04b372a1965d8e3439"; + sha256 = "0m0r2w2qk8jkdk21h52n66g4yqckmzpx3mph73cilkhvdfgwfd21"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "19e51611da83d6be54ddafce4a4af510cb3e9ea4"; + sha256 = "09pcfzx7nrma0gjv93jx57c28farf8m1qm4x07vk5505wlcgvvfl"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; + sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; + }; + } +] diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index e60d1619685a..787f97ac1b11 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.91"; + version = "0.7.97"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm"; + sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 0ddee228e9d0..38888b0ebdc6 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.91"; + version = "0.7.97"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm"; + sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 3882f679cae4..a1744f7a2c03 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "An openstreetmap editor"; homepage = http://merkaartor.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric urkud]; + maintainers = with stdenv.lib.maintainers; [viric]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix new file mode 100644 index 000000000000..ca4f91533ecf --- /dev/null +++ b/pkgs/applications/misc/metar/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, curl }: + +stdenv.mkDerivation { + name = "metar-20161013.1"; + + src = fetchgit { + url = "https://github.com/keesL/metar.git"; + rev = "20e9ca69faea330f6c2493b6829131c24cb55147"; + sha256 = "1fgrlnpasqf1ihh9y6zy6mzzybqx0lxvh7gmv03rjdb55dr42dxj"; + }; + + buildInputs = [ curl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/keesL/metar; + license = licenses.gpl2; + maintainers = [ maintainers.zalakain ]; + description = "Downloads weather reports and optionally decodes them"; + longDescription = '' + METAR reports are meteorogical weather reports for aviation. Metar is a small + program which downloads weather reports for user-specified stations and + optionally decodes them into a human-readable format. + + Currently, metar supports decoding date/time, wind, visibility, cloud layers, + temperature, air pressure and weather phenomena, such as rain, fog, etc. Also, + more work in the area of clouds need to be done, as support for Cumulus or + Cumulunimbus is not yet decoded. + ''; + }; +} diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 8b3e0a7cb4e8..09f343483dfb 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }: let - version = "0.10.2.1"; + version = "0.10.3.1"; in stdenv.mkDerivation { name = "monero-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0jr57lih3smdg4abglfyfhxp69akiyqy889gcpdplwl05vfnhand"; + sha256 = "1x6qjqijdbjyfb0dcjn46gp38hkb419skxansf9w2cjf58c2055n"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix new file mode 100644 index 000000000000..fffa95952622 --- /dev/null +++ b/pkgs/applications/misc/mpvc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, socat, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "mpvc-unstable-2017-03-18"; + + src = fetchFromGitHub { + owner = "wildefyr"; + repo = "mpvc"; + rev = "aea5c661455248cde7ac9ddba5f63cc790d26512"; + sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/" + ''; + + buildInputs = [ socat makeWrapper ]; + + meta = with stdenv.lib; { + description = "A mpc-like control interface for mpv"; + homepage = https://github.com/wildefyr/mpvc; + license = licenses.mit; + maintainers = [ maintainers.neeasade ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a4687c385c65..a3e5f99eef66 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -3,26 +3,26 @@ , libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }: stdenv.mkDerivation rec { - version = "1.10a"; + version = "1.11"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; + sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510"; }; patches = [ # Compatibility with new openjpeg (fetchpatch { - name = "mupdf-1.9a-openjpeg-2.1.1.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099"; - sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75"; + name = "mupdf-1.11-openjpeg-2.1.1.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=3d997e7ff2ac20c44856ede22760ba6fbca81a5c"; + sha256 = "1vr12kpzmmfr8pp3scwfhrm5laqwd58xm6vx971c4y8bxy60b2ig"; }) (fetchurl { - name = "CVE-2017-5896.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; - sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; + name = "mupdf-1.11-CVE-2017-6060.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614"; + sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc"; }) ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://mupdf.com; repositories.git = git://git.ghostscript.com/mupdf.git; - description = "Lightweight PDF viewer and toolkit written in portable C"; + description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.gpl3Plus; maintainers = with maintainers; [ viric vrthra fpletz ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 7b9b04c66c8d..2faf082197c8 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.2"; + version = "0.7.3"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "1linpagf0i0ggicq02fcvz4rpx7xdpy80ys49wx7fnmz7f3jc6jy"; + sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn"; }; makeFlags=["PREFIX=\${out}"]; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix new file mode 100644 index 000000000000..1005006c4027 --- /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 000000000000..bcf2edd8f2f6 --- /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/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 25c904880923..4d53203ccd4d 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -2,11 +2,11 @@ , libtool, makeWrapper }: stdenv.mkDerivation rec { - name = "nut-2.7.1"; + name = "nut-2.7.4"; src = fetchurl { url = "http://www.networkupstools.org/source/2.7/${name}.tar.gz"; - sha256 = "1667n9h8jcz7k6h24fn615khqahlq5z22zxs4s0q046rsqxdg9ki"; + sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq"; }; buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - + postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index e5c35c5290d6..45b704a5f47a 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,101 +1,100 @@ -{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }: +{ stdenv, fetchFromGitHub, python2, fetchurl }: let - tornado_4_0_2 = pythonPackages.buildPythonPackage rec { - name = "tornado-${version}"; - version = "4.0.2"; + pythonPackages = python2.pkgs.override { + overrides = self: super: with self; { + backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2; - propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + tornado = buildPythonPackage rec { + name = "tornado-${version}"; + version = "4.0.2"; - src = fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; + propagatedBuildInputs = [ backports_ssl_match_hostname certifi ]; + + src = fetchurl { + url = "mirror://pypi/t/tornado/${name}.tar.gz"; + sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; + }; + }; + + flask_login = buildPythonPackage rec { + name = "Flask-Login-${version}"; + version = "0.2.2"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; + sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; + }; + + propagatedBuildInputs = [ flask ]; + buildInputs = [ nose ]; + + # No tests included + doCheck = false; + }; + + jinja2 = buildPythonPackage rec { + pname = "Jinja2"; + version = "2.8.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; + }; + + propagatedBuildInputs = [ markupsafe ]; + + # No tests included + doCheck = false; + }; }; }; - sockjs-tornado = pythonPackages.buildPythonPackage rec { - name = "sockjs-tornado-${version}"; - version = "1.0.3"; - - src = fetchurl { - url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; - }; - - # This is needed for compatibility with OctoPrint - propagatedBuildInputs = [ tornado_4_0_2 ]; - }; - - websocket_client = pythonPackages.buildPythonPackage rec { - name = "websocket_client-0.32.0"; - - src = fetchurl { - url = "mirror://pypi/w/websocket-client/${name}.tar.gz"; - sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040"; - }; - - propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ]; - }; - - flask_login = pythonPackages.buildPythonPackage rec { - name = "Flask-Login-${version}"; - version = "0.2.2"; - - src = fetchurl { - url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; - sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; - }; - - propagatedBuildInputs = with pythonPackages; [ flask ]; - - # FIXME - doCheck = false; - }; - in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9"; + sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk"; }; # We need old Tornado propagatedBuildInputs = with pythonPackages; [ - awesome-slugify flask_assets rsa requests2 pkginfo watchdog - semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2 + awesome-slugify flask_assets rsa requests pkginfo watchdog + semantic-version flask_principal werkzeug flaskbabel tornado psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client scandir chainmap future ]; + buildInputs = with pythonPackages; [ nose mock ddt ]; + # Jailbreak dependencies. - # Currently broken for new: tornado, pyserial, flask_login postPatch = '' sed -i \ - -e 's,werkzeug>=[^"]*,werkzeug,g' \ - -e 's,requests>=[^"]*,requests,g' \ -e 's,pkginfo>=[^"]*,pkginfo,g' \ - -e 's,semantic_version>=[^"]*,semantic_version,g' \ - -e 's,psutil>=[^"]*,psutil,g' \ - -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \ -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ - -e 's,markdown>=[^"]*,markdown,g' \ - -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ - -e 's,rsa>=[^"]*,rsa,g' \ - -e 's,PyYAML>=[^"]*,PyYAML,g' \ - -e 's,flask>=[^"]*,flask,g' \ - -e 's,Click>=[^"]*,Click,g' \ -e 's,websocket-client>=[^"]*,websocket-client,g' \ + -e 's,Click>=[^"]*,Click,g' \ + -e 's,rsa>=[^"]*,rsa,g' \ + -e 's,flask>=[^"]*,flask,g' \ + -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \ + -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ + -e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,scandir>=[^"]*,scandir,g' \ - -e 's,Jinja2>=[^"]*,Jinja2,g' \ + -e 's,werkzeug>=[^"]*,werkzeug,g' \ + -e 's,psutil>=[^"]*,psutil,g' \ + -e 's,requests>=[^"]*,requests,g' \ setup.py ''; + checkPhase = "nosetests"; + meta = with stdenv.lib; { homepage = "http://octoprint.org/"; description = "The snappy web interface for your 3D printer"; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 2f894514c519..8bc4a22bc923 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: +{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }: let buildPlugin = args: pythonPackages.buildPythonApplication (args // { @@ -23,6 +23,11 @@ let patches = [ ./m33-fio-one-library.patch + # Fix incompatibility with new OctoPrint + (fetchpatch { + url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch"; + sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d"; + }) ]; postPatch = '' diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 36218b6d5079..5016acfff124 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook, vcg, glew }: +{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }: + stdenv.mkDerivation { - name = "openbrf-2016-01-09"; + name = "openbrf-unstable-2016-01-09"; src = fetchFromGitHub { owner = "cfcohen"; repo = "openbrf"; - rev = "c18d7431e1d499cee11586f4a035fb5fdc0d3330"; - sha256 = "0laikpz0ljz7l5fgapwj09ygizmvj1iywnpfgfd0i14j46s134xb"; + rev = "4bdc66e38def5e5184f5379c84a7558b7484c70a"; + sha256 = "16254cnr60ihcn7bki7wl1qm6gkvzb99cn66md1pnb7za8nvzf4j"; }; - buildInputs = [ qt4 qmake4Hook vcg glew ]; + buildInputs = [ qtbase vcg glew ]; enableParallelBuilding = true; + nativeBuildInputs = [ qmake ]; qmakeFlags = [ "openBrf.pro" ]; @@ -21,9 +23,19 @@ stdenv.mkDerivation { ''; installPhase = '' - install -Dm755 openBrf $out/bin/openBrf + install -Dm755 openBrf $out/share/openBrf/openBrf + install -Dm644 carry_positions.txt $out/share/openBrf/carry_positions.txt + install -Dm644 reference.brf $out/share/openBrf/reference.brf + + patchelf \ + --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \ + $out/share/openBrf/openBrf + + ln -s "$out/share/openBrf/openBrf" "$out/bin/openBrf" ''; + dontPatchELF = true; + meta = with stdenv.lib; { description = "A tool to edit resource files (BRF)"; homepage = "https://github.com/cfcohen/openbrf"; diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index 5a9ffc13007f..e70be8201b34 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line tools for transforming Open Street Map files"; - homepage = '' - http://wiki.openstreetmap.org/wiki/Osmconvert + homepage = [ + https://wiki.openstreetmap.org/wiki/Osmconvert https://wiki.openstreetmap.org/wiki/Osmfilter - ''; + ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 2f023412faf5..8e0fc6137210 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.5"; + version = "4.0.7"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s"; + sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c"; }; nativeBuildInputs = [ cmake pkgconfig vala ]; buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler - libpthreadstubs makeWrapper librsvg ]; + libpthreadstubs makeWrapper librsvg pcre ]; + + cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF"; postInstall = '' wrapProgram $out/bin/pdfpc \ @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { homepage = https://pdfpc.github.io/; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix new file mode 100644 index 000000000000..e01956e36119 --- /dev/null +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchsvn +, wrapGAppsHook, makeWrapper, gettext +, python3Packages, gtk3, poppler_gi +, gnome3, gsettings_desktop_schemas, shared_mime_info, +}: + +python3Packages.buildPythonApplication rec { + name = "pdfshuffler-unstable-2017-02-26"; # no official release in 5 years + + src = fetchsvn { + url = "http://svn.gna.org/svn/pdfshuffler/trunk"; + rev = "20"; + sha256 = "1g20dy45xg5vda9y58d2b1gkczj44xgrfi59jx6hr62ynd3z0dfc"; + }; + + nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; + + buildInputs = [ + gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pycairo + pypdf2 + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + ''; + + doCheck = false; # no tests + + meta = with stdenv.lib; { + homepage = https://gna.org/projects/pdfshuffler/; + description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index fba7b6371f67..968071e454e2 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/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index e5dd22bfbb1f..0cee74522ab2 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "phwmon-${version}"; - version = "2016-03-13"; + version = "2017-04-10"; src = fetchFromGitLab { owner = "o9000"; repo = "phwmon"; - rev = "90247ceaff915ad1040352c5cc9195e4153472d4"; - sha256 = "1gkjfmd8rai7bl1j7jz9drmzlw72n7mczl0akv39ya4l6k8plzvv"; + rev = "b162e53dccc4adf8f11f49408d05fd85d9c6c909"; + sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq"; }; nativeBuildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index da59f7f18867..2472b05a2e0b 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,29 +1,25 @@ -{ stdenv, fetchFromGitLab, python2Packages, gnome2 }: +{ stdenv, fetchFromGitLab, python2Packages, gnome3 }: stdenv.mkDerivation rec { name = "pmenu-${version}"; - version = "2016-05-13"; + version = "2017-04-10"; src = fetchFromGitLab { owner = "o9000"; repo = "pmenu"; - rev = "90b722de345cff56f8ec0908a0e8a7d733c0c671"; - sha256 = "15bkvadr7ab44mc8gkdqs3w14cm498mwf72w5rjm2rdh55357jjh"; + rev = "87fec9ddf594f1046d03348de2bafcfa6e94cfd1"; + sha256 = "0ynhml46bi5k52v7fw2pjpcac9dswkmlvh6gynvnyqjp4p153fl4"; }; nativeBuildInputs = [ python2Packages.wrapPython ]; - buildInputs = [ python2Packages.pygtk gnome2.gnome_menus ]; + buildInputs = [ python2Packages.pygtk gnome3.gnome-menus ]; pythonPath = [ python2Packages.pygtk ]; - - patchPhase = '' - substituteInPlace install.sh --replace "/usr/local" "$out" - ''; installPhase = '' mkdir -p $out/bin $out/share/applications - ./install.sh + ./install.sh $out ''; postFixup = '' diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index aceaf43ac976..026a1289fb61 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -21,11 +21,11 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchgit { url = "https://github.com/jaagr/polybar"; - rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af"; - sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas"; + rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d"; + sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix new file mode 100644 index 000000000000..abb1fb596fac --- /dev/null +++ b/pkgs/applications/misc/ptask/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }: + +stdenv.mkDerivation rec { + name = "ptask-1.0.0"; + + src = fetchurl { + url = "http://wpitchoune.net/ptask/files/${name}.tar.gz"; + sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; + }; + + buildInputs = [ gtk3 json_c ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + patches = [ ./tw-version.patch ]; + + preFixup = '' + wrapProgram "$out/bin/ptask" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --prefix PATH : "${taskwarrior}/bin" + ''; + + meta = with stdenv.lib; { + homepage = http://wpitchoune.net/ptask/; + description = "GTK-based GUI for taskwarrior"; + license = licenses.gpl2; + maintainer = [ maintainers.spacefrogg ]; + }; +} diff --git a/pkgs/applications/misc/ptask/tw-version.patch b/pkgs/applications/misc/ptask/tw-version.patch new file mode 100644 index 000000000000..995fffeda2f8 --- /dev/null +++ b/pkgs/applications/misc/ptask/tw-version.patch @@ -0,0 +1,11 @@ +--- a/src/tw.c 2017-02-21 22:56:19.289037608 +0100 ++++ b/src/tw.c 2017-02-21 22:57:04.726814256 +0100 +@@ -116,7 +116,7 @@ + || !strcmp(ver, "2.3.0") + || !strcmp(ver, "2.4.0") + || !strcmp(ver, "2.4.1") +- || !strcmp(ver, "2.5.0")) ++ || !strcmp(ver, "2.5.1")) + return 1; + else + return 0; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index f65435ba7b23..0ea530b6bf1c 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst -, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, ykpers +, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, yubikey-personalization }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; makefile = "Makefile.linux"; - makeFlags = "YBPERS_LIBPATH=${ykpers}/lib"; + makeFlags = "YBPERS_LIBPATH=${yubikey-personalization}/lib"; buildFlags = "unicoderelease"; buildInputs = [ wxGTK libuuid gettext perl zip xercesc libXt libXtst libXi xextproto - pkgconfig libyubikey ykpers ]; + pkgconfig libyubikey yubikey-personalization ]; postPatch = '' # Fix perl scripts used during the build. diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix new file mode 100644 index 000000000000..932d8156a79a --- /dev/null +++ b/pkgs/applications/misc/qmetro/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, qmake4Hook, unzip, qt4 }: + +stdenv.mkDerivation rec { + name = "${project}-${version}"; + project = "qmetro"; + version = "0.7.1"; + + src = fetchurl { + url = "mirror://sourceforge/${project}/${name}.zip"; + sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5"; + }; + + nativeBuildInputs = [ qmake4Hook unzip ]; + + buildInputs = [ qt4 ]; + + postPatch = '' + sed -e 's#Exec=/usr/bin/qmetro#Exec=qmetro#' -i rc/qmetro.desktop + echo 'LIBS += -lz' >> qmetro.pro + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/projects/qmetro/; + description = "Worldwide transit maps viewer"; + license = licenses.gpl3; + + maintainter = with maintainers; [ orivej ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index ba8b946f3fbb..e8ab85121dac 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,28 +1,50 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtwebengine -, qmakeHook }: +{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null +, qtbase, qtwebengine, qtwebkit +, cmake +, syncthing, syncthing-inotify ? null +, preferQWebView ? false }: -stdenv.mkDerivation rec { - version = "0.5.7"; +mkDerivation rec { + version = "0.5.8"; name = "qsyncthingtray-${version}"; src = fetchFromGitHub { - owner = "sieren"; - repo = "QSyncthingTray"; - rev = "${version}"; - sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq"; + owner = "sieren"; + repo = "QSyncthingTray"; + rev = "${version}"; + sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; }; - buildInputs = [ qtbase qtwebengine ]; - nativeBuildInputs = [ qmakeHook ]; - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $out/bin - cp binary/QSyncthingTray $out/bin + buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"; + + postPatch = '' + ${lib.optionalString stdenv.isLinux '' + substituteInPlace includes/platforms/linux/posixUtils.hpp \ + --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ + --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \ + --replace '"pgrep -x' '"${procps}/bin/pgrep -x' + ''} + + ${lib.optionalString stdenv.isDarwin '' + substituteInPlace includes/platforms/darwin/macUtils.hpp \ + --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' + ''} ''; - meta = with stdenv.lib; { + installPhase = let qst = "qsyncthingtray"; in '' + runHook preInstall + + mkdir -p $out/bin + install -m755 QSyncthingTray $out/bin/${qst} + ln -s $out/bin/${qst} $out/bin/QSyncthingTray + + runHook postInstall + ''; + + meta = with lib; { homepage = https://github.com/sieren/QSyncthingTray/; description = "A Traybar Application for Syncthing written in C++"; longDescription = '' @@ -31,7 +53,9 @@ stdenv.mkDerivation rec { Written in C++ with Qt. ''; license = licenses.lgpl3; - maintainers = with maintainers; [ zraexy ]; + maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; + # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 + broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; }; } diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 4cdb6591465e..d300e411c942 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }: +{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: stdenv.mkDerivation rec { name = "qtpass-${version}"; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ makeWrapper qmake ]; preConfigure = '' - qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out" + qmakeFlags="$qmakeFlags DESTDIR=$out" ''; installPhase = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapQtProgram $out/bin/qtpass \ + wrapProgram $out/bin/qtpass \ --suffix PATH : ${git}/bin \ --suffix PATH : ${gnupg}/bin \ --suffix PATH : ${pass}/bin diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 1371646be273..f378c3529363 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/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 9d333da01cb6..0ba850a34607 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, pkgconfig , libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtsvg, qttools, qtquick1 -, makeQtWrapper, qmakeHook +, qmake }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr"; }; - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats @@ -68,7 +68,6 @@ EOF mkdir -p $out/bin instdir="$srcdir/bin/linux/release" cp $instdir/rdm $out/bin - wrapQtProgram $out/bin/rdm ''; meta = with lib; { diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index fe09f7ff16ea..18e49176edc6 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/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index ebd97f6621d4..64f4c1aab482 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -1,28 +1,77 @@ -{ stdenv, fetchurl, qtbase, openssl, boost, cmake, scons, python, pcre, bzip2 }: +{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, + freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: -stdenv.mkDerivation { - name = "robomongo-0.8.4"; +stdenv.mkDerivation rec { + name = "robomongo-${version}"; + version = "0.9.0"; src = fetchurl { - url = https://github.com/paralect/robomongo/archive/v0.8.4.tar.gz; - sha256 = "199fb08701wrw3ky7gcqyvb3z4027qjcqdnzrx5y7yi3rb4gvkzc"; + url = "https://download.robomongo.org/${version}/linux/robomongo-${version}-linux-x86_64-0786489.tar.gz"; + sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad"; }; - patches = [ ./robomongo.patch ]; + icon = fetchurl { + url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png"; + sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2"; + }; - postPatch = '' - rm ./cmake/FindOpenSSL.cmake # remove outdated bundled CMake file + desktopItem = makeDesktopItem { + name = "robomongo"; + exec = "robomongo"; + icon = icon; + comment = "Query GUI for mongodb"; + desktopName = "Robomongo"; + genericName = "MongoDB management tool"; + categories = "Development;IDE;mongodb;"; + }; + + nativeBuildInputs = [makeWrapper]; + + ldLibraryPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + zlib + glib + xorg.libXi + xorg.libxcb + xorg.libXrender + xorg.libX11 + xorg.libSM + xorg.libICE + xorg.libXext + dbus + fontconfig + freetype + ]; + + installPhase = '' + BASEDIR=$out/lib/robomongo + + mkdir -p $BASEDIR/bin + cp bin/* $BASEDIR/bin + + mkdir -p $BASEDIR/lib + cp -r lib/* $BASEDIR/lib + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications + + mkdir -p $out/share/icons + cp ${icon} $out/share/icons/robomongo.png + + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robomongo + + mkdir $out/bin + + makeWrapper $BASEDIR/bin/robomongo $out/bin/robomongo \ + --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb ''; - NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - - buildInputs = [ cmake boost scons qtbase openssl python pcre bzip2 ]; - meta = { - homepage = "http://robomongo.org/"; + homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.amorsillo ]; + maintainers = [ stdenv.lib.maintainers.eperuffo ]; }; } diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch deleted file mode 100644 index 3de6e940d9f9..000000000000 --- a/pkgs/applications/misc/robomongo/robomongo.patch +++ /dev/null @@ -1,61 +0,0 @@ -Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle -Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment -Fix typo in cmakelists -Add stdint.h include to mongo driver src -diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt ---- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400 -+++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500 -@@ -133,7 +133,7 @@ ELSE() - ENDIF() - - ##################################DEFAULT VALUES########################################## --IF(NOT CMAKE_INSTALL_PREFIX}) -+IF(NOT CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") - ENDIF() - -diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h ---- robomongo-0.8.3/src/robomongo/gui/AppStyle.h 2013-10-01 10:55:00.000000000 -0400 -+++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h 2013-12-06 12:20:57.417297186 -0500 -@@ -8,13 +8,8 @@ - #include - typedef QProxyStyle OsStyle; - #elif defined OS_LINUX -- #if !defined(QT_NO_STYLE_GTK) -- #include -- typedef QProxyStyle OsStyle; -- #else -- #include -- typedef QCleanlooksStyle OsStyle; -- #endif -+ #include -+ typedef QProxyStyle OsStyle; - #endif - - namespace Robomongo - -diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct ---- robomongo-0.8.3/src/third-party/mongodb/SConstruct 2013-10-01 10:55:00.000000000 -0400 -+++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct 2013-12-06 12:21:45.705255731 -0500 -@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" ) - - justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient']) - --env = Environment( BUILD_DIR=variantDir, -+env = Environment( ENV=os.environ, -+ BUILD_DIR=variantDir, - CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}', - CLIENT_DIST_BASENAME=get_option('client-dist-basename'), - CLIENT_LICENSE='#distsrc/client/LICENSE.txt', - -diff -rupN robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h ---- robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h 2013-12-13 12:56:35.000000000 -0500 -+++ robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h 2014-08-20 18:16:31.788396489 -0400 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #include "time.h" - #include "string.h" diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 20f8df8da482..fbf9a9335675 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,28 +1,47 @@ -{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: +{ stdenv, fetchFromGitHub, pkgs, pythonPackages }: -pythonPackages.buildPythonApplication rec { - version = "1.14.1"; +with pythonPackages; +buildPythonApplication rec { + version = "1.15.1"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "03106sdsvj4zjjaqqg7qvm3n959plvy08a6n28ir1yf67kwzsx8a"; + sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya"; }; - propagatedBuildInputs = with pythonPackages; [ - beautifulsoup4 - mailcap-fix - tornado - requests2 - six - praw - kitchen - praw - ] ++ lib.optional (!pythonPackages.isPy3k) futures; + checkPhase = '' + py.test + ''; - meta = with lib; { + buildInputs = [ + coverage + coveralls + docopt + mock + pylint + pytest + vcrpy + ]; + + propagatedBuildInputs = [ + backports_functools_lru_cache + beautifulsoup4 + configparser + contextlib2 + decorator + kitchen + mailcap-fix + mccabe + requests + six + tornado + pyyaml + ]; + + meta = with stdenv.lib; { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 75d08ec81883..19fc62d12380 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }: +{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.6.0"; name = "sc-im-${version}"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0"; + sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj"; }; - buildInputs = [ yacc ncurses libxml2 pkgconfig ]; + buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ]; buildPhase = '' cd src - sed -i "s,prefix=/usr,prefix=$out," Makefile - sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile + sed -e "\|^prefix = /usr/local| s|/usr/local|$out|" \ + -e "\|^#LDLIBS += -lxlsreader| s|^#|| " \ + -e "\|^#CFLAGS += -DXLS| s|^#|| " \ + -i Makefile make export DESTDIR=$out diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 704262da5bf5..16d6ca2e26fa 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft -, fontconfig, conf ? null, patches ? []}: +, fontconfig, conf ? null, patches ? [], extraLibs ? []}: 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"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; + buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out @@ -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 4d9f0ef3f8d5..ab890c8db718 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 000000000000..5aaf04bbfd8f --- /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/stog/default.nix b/pkgs/applications/misc/stog/default.nix new file mode 100644 index 000000000000..fa160c51fe23 --- /dev/null +++ b/pkgs/applications/misc/stog/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime, + uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd +}: + +stdenv.mkDerivation rec { + name = "stog-${version}"; + version = "0.17.0"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "stog"; + rev = "release-${version}"; + sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d"; + }; + + buildInputs = [ ocaml camlp4 uutf ]; + propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ]; + + createFindlibDestdir = true; + + patches = [ ./install.patch ]; + + meta = with stdenv.lib; { + description = "XML documents and web site compiler"; + homepage = "https://zoggy.github.io/stog/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} + + diff --git a/pkgs/applications/misc/stog/install.patch b/pkgs/applications/misc/stog/install.patch new file mode 100644 index 000000000000..a2407d3079f5 --- /dev/null +++ b/pkgs/applications/misc/stog/install.patch @@ -0,0 +1,18 @@ +diff --git a/src/Makefile b/src/Makefile +index 736dd037..79a85b9c 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -431,11 +431,12 @@ install-lib: + install-share: + + install-bin: ++ mkdir $(out)/bin + $(CP) $(MAIN) $(MAIN_BYTE) $(TMPL) $(TMPL_BYTE) \ + $(SERVER) $(SERVER_BYTE) $(OCAML_SESSION) \ + $(MK_STOG) $(MK_STOG_BYTE) $(MK_STOG_OCAML) \ + $(LATEX2STOG) $(LATEX2STOG_BYTE) \ +- `dirname \`which $(OCAMLC)\``/ ++ $(out)/bin + + uninstall: uninstall-lib uninstall-share uninstall-bin + diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index a56b49752e3a..9ae6bfae1166 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "synergy-${version}"; - version = "1.7.6"; + version = "1.8.8"; src = fetchFromGitHub { owner = "symless"; repo = "synergy"; rev = "v${version}-stable"; - sha256 = "1bjksvdr74mc3xh11z4fd6qlhgklny51q5r6gqg1bhnvn9dzyrxw"; + sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; postPatch = '' @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.aszlig ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/taskjuggler/Gemfile b/pkgs/applications/misc/taskjuggler/Gemfile new file mode 100644 index 000000000000..77cbaeeed793 --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/Gemfile @@ -0,0 +1,2 @@ +source 'http://rubygems.org' +gem 'taskjuggler' diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock new file mode 100644 index 000000000000..d1642e76fa65 --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: http://rubygems.org/ + specs: + mail (2.6.3) + mime-types (>= 1.16, < 3) + mime-types (2.6.1) + taskjuggler (3.5.0) + mail (>= 2.4.3) + term-ansicolor (>= 1.0.7) + term-ansicolor (1.3.2) + tins (~> 1.0) + tins (1.6.0) + +PLATFORMS + ruby + +DEPENDENCIES + taskjuggler + +BUNDLED WITH + 1.10.5 diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix new file mode 100644 index 000000000000..23252d0c4807 --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "taskjuggler-3.5.0"; + + inherit ruby; + gemdir = ./.; + + meta = { + description = "A modern and powerful project management tool"; + homepage = http://taskjuggler.org/; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix new file mode 100644 index 000000000000..e65ab3451a62 --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/gemset.nix @@ -0,0 +1,47 @@ +{ + "mail" = { + version = "2.6.3"; + source = { + type = "gem"; + sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; + }; + dependencies = [ + "mime-types" + ]; + }; + "mime-types" = { + version = "2.6.1"; + source = { + type = "gem"; + sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; + }; + }; + "taskjuggler" = { + version = "3.5.0"; + source = { + type = "gem"; + sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2"; + }; + dependencies = [ + "mail" + "term-ansicolor" + ]; + }; + "term-ansicolor" = { + version = "1.3.2"; + source = { + type = "gem"; + sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys"; + }; + dependencies = [ + "tins" + ]; + }; + "tins" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz"; + }; + }; +} diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index e4938b928dab..841e0a494e48 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libuuid gnutls ]; postInstall = '' - mkdir -p "$out/etc/bash_completion.d" - ln -s "../../share/doc/task/scripts/bash/task.sh" "$out/etc/bash_completion.d/" + mkdir -p "$out/share/bash-completion/completions" + ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/" + mkdir -p "$out/etc/fish/completions" + ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/etc/fish/completions/" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix new file mode 100644 index 000000000000..631fc08e95ee --- /dev/null +++ b/pkgs/applications/misc/termdown/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildPythonApplication, +click, pyfiglet, dateutil}: + +with stdenv.lib; + +buildPythonApplication rec { + + name = "termdown-${version}"; + version = "1.11.0"; + + src = fetchFromGitHub { + rev = "d1e3504e02ad49013595112cb03fbf175822e58d"; + sha256 = "1i6fxymg52q95n0cbm4imdxh6yvpj3q57yf7w9z5d9pr35cf1iq5"; + repo = "termdown"; + owner = "trehn"; + }; + + propagatedBuildInputs = [ dateutil click pyfiglet ]; + + meta = with stdenv.lib; { + description = "Starts a countdown to or from TIMESPEC"; + longDescription = "Countdown timer and stopwatch in your terminal"; + homepage = https://github.com/trehn/termdown; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index d9046c55e12a..47cea34d4a54 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: Tue, 14 Mar 2017 07:51:02 -0500 +Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'. + +--- + doc/themes/CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt +index a954576..3a3b453 100644 +--- a/doc/themes/CMakeLists.txt ++++ b/doc/themes/CMakeLists.txt +@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8) + + message ("-- Configuring theme documentation") + +-install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) +-install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_blue.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_red.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) +-- +2.12.0 + diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index f72f4fdc5677..3edc9b73bb54 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "0.12.12"; + version = "0.14.6"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "0zgcdancsna95sjxslack9lh8f6qnj8d5wm02891mshn2jhgins3"; + sha256 = "0v7i8araj85cbl45icinvmsz5741cx2ybjgkx72m3xfcb9fqg69l"; }; enableParallelBuilding = true; @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { ''; prePatch = '' - for f in ./src/tint2conf/properties.c \ - ./src/launcher/apps-common.c \ + for f in ./src/launcher/apps-common.c \ ./src/launcher/icon-theme-common.c \ ./themes/*tint2rc do diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index 9e3cf011316a..63d68bbbea4a 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, lib, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.12"; + version = "1.4.14"; name = "tnef-${version}"; src = fetchFromGitHub { - owner = "verdammelt"; - repo = "tnef"; - rev = "${version}"; - sha256 = "02hwdaaa3yk0lbzb40fgxlkyhc1wicl6ncajpvfcz888z6yxps2c"; + owner = "verdammelt"; + repo = "tnef"; + rev = version; + sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2"; }; doCheck = true; nativeBuildInputs = [ autoreconfHook ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Unpacks MIME attachments of type application/ms-tnef"; longDescription = '' TNEF is a program for unpacking MIME attachments of type "application/ms-tnef". This is a Microsoft only attachment. @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/verdammelt/tnef; license = licenses.gpl2; - maintainers = [ ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index 5d03989a39e1..4464ab6a608d 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -4,7 +4,7 @@ , makeWrapper, lib}: let - version = "1.15.7"; + version = "1.15.9"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; - sha256 = "1i6sv6w2ms2x0nkgxq11agljiyg0yl4x2rzmcyvs2hxyf574hd1y"; + sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; }; buildInputs = [ itstool intltool pkgconfig diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix new file mode 100644 index 000000000000..4f66d7167e10 --- /dev/null +++ b/pkgs/applications/misc/toot/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + version = "0.8.0"; + name = "toot-${version}"; + + src = fetchFromGitHub { + owner = "ihabunek"; + repo = "toot"; + rev = "${version}"; + sha256 = "1y1jz4f53njq94zab0icf7jhd4jp10ywm508l4lw6spb69wr7rdy"; + }; + + propagatedBuildInputs = with pythonPackages; + [ requests beautifulsoup4 future ]; + + meta = with stdenv.lib; { + description = "Mastodon CLI interface"; + homepage = "https://github.com/ihabunek/toot"; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + }; + +} + diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index c38b97b0e980..7ec3d66f31cf 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmakeHook, pkgconfig, boost }: +{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }: stdenv.mkDerivation rec { name = "twmn-git-2014-09-23"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1a68gka9gyxyzhc9rn8df59rzcdwkjw90cxp1kk0rdfp6svhxhsa"; }; - buildInputs = [ qtbase qtx11extras pkgconfig boost qmakeHook ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtbase qtx11extras boost ]; postPatch = '' sed -i s/-Werror// twmnd/twmnd.pro diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 8ce683ec9088..9a4b795061b5 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation { }; buildInputs = [ intltool glib pkgconfig udev ]; configurePhase = '' - substituteInPlace src/Makefile.am --replace "-o root -g root" "" substituteInPlace src/Makefile.in --replace "-o root -g root" "" + # do not set setuid bit in nix store + substituteInPlace src/Makefile.in --replace 4755 0755 ./configure \ --prefix=$out \ --with-mount-prog=${utillinux}/bin/mount \ @@ -17,10 +18,6 @@ stdenv.mkDerivation { --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; - preConfigure = '' - cat src/Makefile.am - exit 2 - ''; patches = [ ./device-info-sys-stat.patch ]; meta = { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 6a326dba39c6..84ecf18c5ae5 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; + sha256 = "1dvfhf0d79al0vnrwdknfiy2297m3f7fgn7syr85p29hd6260jnv"; }; buildInputs = [ diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index e12b95754edf..9015bb9956b3 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; license = licenses.asl20; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index dc9cb3189d5b..7c4def952104 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -1,25 +1,21 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, urwid, pythonOlder }: +{ stdenv, python3Packages, fetchFromGitHub }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { name = "urlscan-${version}"; - version = "0.8.3"; + version = "0.8.6"; src = fetchFromGitHub { owner = "firecat53"; repo = "urlscan"; rev = version; - # (equivalent but less nice(?): rev = "00333f6d03bf3151c9884ec778715fc605f58cc5") - sha256 = "0l40anfznam4d3q0q0jp2wwfrvfypz9ppbpjyzjdrhb3r2nizb0y"; + sha256 = "1v26fni64n0lbv37m35plh2bsrvhpb4ibgmg2mv05qfc3df721s5"; }; - propagatedBuildInputs = [ urwid ]; - - # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet) - disabled = !pythonOlder "3.5"; + propagatedBuildInputs = [ python3Packages.urwid ]; meta = with stdenv.lib; { description = "Mutt and terminal url selector (similar to urlview)"; license = licenses.gpl2; - maintainers = [ maintainers.dpaetzel ]; + maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; } diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix new file mode 100644 index 000000000000..86924d9b3ca9 --- /dev/null +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -0,0 +1,44 @@ +{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself, + wxGUI ? true +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "veracrypt-${version}"; + version = "1.21"; + + src = fetchurl { + url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; + sha256 = "0n036znmwnv70wy8r2j3b55bx2z3cch5fr83vnwjvzyyp0j7swa4"; + }; + + unpackPhase = + '' + tar xjf $src + cd src + ''; + + nativeBuildInputs = [ makeself yasm pkgconfig ]; + buildInputs = [ fuse devicemapper ] + ++ optional wxGUI wxGTK30; + makeFlags = optionalString (!wxGUI) "NOGUI=1"; + + installPhase = + '' + mkdir -p $out/bin + cp Main/veracrypt $out/bin + mkdir -p $out/share/$name + cp License.txt $out/share/$name/LICENSE + mkdir -p $out/share/applications + sed "s,Exec=.*,Exec=$out/bin/veracrypt," Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop + ''; + + meta = { + description = "Free Open-Source filesystem on-the-fly encryption"; + homepage = https://veracrypt.codeplex.com/; + license = "VeraCrypt License"; + maintainers = with maintainers; [ dsferruzza ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix new file mode 100644 index 000000000000..3d4c35559e35 --- /dev/null +++ b/pkgs/applications/misc/verbiste/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: + +stdenv.mkDerivation rec { + name = "verbiste-${version}"; + + version = "0.1.44"; + + src = fetchurl { + url = "http://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; + sha256 = "0vmjr8w3qc64y312a0sj0ask309mmmlmyxp2fsii0ji35ls7m9sw"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libgnomeui libxml2 ]; + + meta = with stdenv.lib; { + homepage = http://sarrazip.com/dev/verbiste.html; + description = "French and Italian verb conjugator"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 00e1d10df10e..f0f5e8e22889 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "vifm-${version}"; - version = "0.8.2"; + version = "0.9"; src = fetchurl { - url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2"; - sha256 = "07r15kq7kjl3a41sd11ncpsii866xxps4f90zh3lv8jqcrv6silb"; + url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; + sha256 = "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 2f98bc66e9b3..f1bc06d395c7 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { homepage = http://wordnet.princeton.edu/; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix new file mode 100644 index 000000000000..9b27e8fc7947 --- /dev/null +++ b/pkgs/applications/misc/xastir/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoreconfHook +, curl, db, gdal, libgeotiff +, libXpm, libXt, motif, pcre +, perl, proj, rastermagick, shapelib +}: + +let + version = "208"; +in +stdenv.mkDerivation { + name = "xastir-"+version; + + src = fetchFromGitHub { + owner = "Xastir"; + repo = "Xastir"; + rev = "707f3aa8c7ca3e3fecd32d5a4af3f742437e5dce"; + sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl"; + }; + + buildInputs = + [ autoreconfHook + curl db gdal libgeotiff + libXpm libXt motif pcre + perl proj rastermagick shapelib + ]; + + configureFlags = + [ "--with-motif-includes=${motif}/include" ]; + + meta = with stdenv.lib; { + description = "Graphical APRS client"; + homepage = https://xastir.org; + license = licenses.gpl2; + maintainers = [ maintainers.ehmry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 30d38183c8f2..80ecbdeba77f 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, which, makeQtWrapper, - libtool, openssl, qtbase, qttools }: +{ mkDerivation, lib, fetchurl, pkgconfig, which +, libtool, openssl, qtbase, qttools }: -with stdenv.lib; +with lib; -stdenv.mkDerivation rec { +mkDerivation rec { name = "xca-${version}"; version = "1.3.2"; @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84"; }; - enableParallelBuilding = false; + enableParallelBuilding = true; buildInputs = [ libtool openssl qtbase qttools ]; - nativeBuildInputs = [ makeQtWrapper pkgconfig which ]; + nativeBuildInputs = [ pkgconfig which ]; configureFlags = [ "CXXFLAGS=-std=c++11" ]; @@ -26,16 +26,12 @@ stdenv.mkDerivation rec { --replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic ''; - postInstall = '' - wrapQtProgram "$out/bin/xca" - wrapQtProgram "$out/bin/xca_db_stat" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Interface for managing asymetric keys like RSA or DSA"; homepage = http://xca.sourceforge.net/; platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; + broken = builtins.compareVersions qtbase.version "5.7.0" == 0; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 0ea1159208f4..b372cd5b2dd2 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://sourceforge.net/projects/xfe/"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; + maintainers = []; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix new file mode 100644 index 000000000000..c0c5616db79a --- /dev/null +++ b/pkgs/applications/misc/xrq/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libX11}: + +stdenv.mkDerivation rec { + name = "xrq-unstable-2016-01-15"; + + src = fetchFromGitHub { + owner = "arianon"; + repo = "xrq"; + rev = "d5dc19c63881ebdd1287a02968e3a1447dde14a9"; + sha256 = "1bxf6h3fjw3kjraz7028m7p229l423y1ngy88lqvf0xl1g3dhp36"; + }; + + installPhase = '' + make PREFIX=$out install + ''; + + outputs = [ "out" "doc" ]; + + buildInputs = [ libX11 ]; + + meta = { + description = "X utility for querying xrdb"; + homepage = https://github.com/arianon/xrq; + license = stdenv.lib.licenses.mit; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index d01dc1207350..22e0466df368 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/ done + + install -D -t $out/share/applications xterm.desktop + install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm ''; meta = { diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 0d9f3834c615..8db48a7b3e61 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,8 +1,8 @@ -{ kdeDerivation +{ mkDerivation , lib , fetchurl , kdoctools -, kdeWrapper +, wrapGAppsHook , extra-cmake-modules , karchive , kcrash @@ -15,18 +15,18 @@ , konsole , kparts , kwindowsystem +, qtx11extras }: let - unwrapped = let - pname = "yakuake"; - version = "3.0.2"; - in kdeDerivation rec { - name = "${pname}-${version}"; + pname = "yakuake"; + version = "3.0.3"; +in mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; + sha256 = "ef51aa3325916d352fde17870cf706397e41105103e4c9289cc4032a1b8609a7"; }; buildInputs = [ @@ -40,24 +40,31 @@ let knotifyconfig kparts kwindowsystem + qtx11extras ]; - nativeBuildInputs = [ - extra-cmake-modules kdoctools - ]; + propagatedBuildInputs = [ + karchive + kcrash + kdbusaddons + ki18n + kiconthemes + knewstuff + knotifications + knotifyconfig + kparts + kwindowsystem + ]; - meta = { - homepage = https://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - maintainers = with lib.maintainers; [ fridh ]; - }; + propagatedUserEnvPkgs = [ konsole ]; + + nativeBuildInputs = [ + extra-cmake-modules kdoctools wrapGAppsHook + ]; + + meta = { + homepage = https://yakuake.kde.org; + description = "Quad-style terminal emulator for KDE"; + maintainers = with lib.maintainers; [ fridh ]; }; - - -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/yakuake" ]; - paths = [ konsole.unwrapped ]; } diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix deleted file mode 100644 index 0fa9b5f66b26..000000000000 --- a/pkgs/applications/misc/ykpers/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}: - -stdenv.mkDerivation rec -{ - version = "1.17.2"; - name = "ykpers-${version}"; - - src = fetchurl - { - url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz"; - sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; - }; - - buildInputs = [pkgconfig libusb1 libyubikey]; - - meta = - { - homepage = "http://opensource.yubico.com/yubikey-personalization/"; - description = "YubiKey Personalization cross-platform library and tool"; - license = "bsd"; - maintainers = [ stdenv.lib.maintainers.calrama ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 75f2dcda6a62..993d81ff96e4 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,10 +12,11 @@ mkChromiumDerivation (base: rec { sandboxExecutableName = "__chromium-suid-sandbox"; installPhase = '' - mkdir -p "$libExecPath" + mkdir -p "$libExecPath/swiftshader" cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index dac821a4898f..11177f3ee487 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,9 +1,9 @@ -{ stdenv, ninja, which +{ stdenv, ninja, which, nodejs, fetchurl, gnutar # default dependencies , bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy -, libpng, libxml2, libxslt, libcap +, libpng, libcap , xdg_utils, yasm, minizip, libwebp , libusb1, pciutils, nss, re2, zlib, libvpx @@ -14,6 +14,7 @@ , glib, gtk2, gtk3, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups +, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -36,6 +37,8 @@ buildFun: with stdenv.lib; +# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html + let # The additional attributes for creating derivations based on the chromium # source tree. @@ -57,7 +60,7 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libwebp" "libxml" "libxslt" "snappy" "yasm" + "ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg" ]; opusWithCustomModes = libopus.override { @@ -67,9 +70,10 @@ let defaultDependencies = [ bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy - libpng libxml2 libxslt libcap + libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib + ffmpeg harfbuzz libxslt harfbuzz-icu libxml2 ]; # build paths and release info @@ -78,6 +82,11 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; + freetype_source = fetchurl { + url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz; + sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77"; + }; + base = rec { name = "${packageName}-${version}"; inherit (upstream-info) version; @@ -87,7 +96,8 @@ let nativeBuildInputs = [ ninja which python2Packages.python perl pkgconfig - python2Packages.ply python2Packages.jinja2 + python2Packages.ply python2Packages.jinja2 nodejs + gnutar ]; buildInputs = defaultDependencies ++ [ @@ -105,6 +115,10 @@ let patches = [ ./patches/nix_plugin_paths_52.patch + # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled + # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 + ./patches/fix_network_api_crash.patch + ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch ++ optional enableWideVine ./patches/widevine.patch; @@ -129,10 +143,29 @@ let :l; n; bl }' gpu/config/gpu_control_list.cc + # Allow to put extensions into the system-path. + sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + patchShebangs . - '' + optionalString (versionAtLeast version "52.0.0.0") '' - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - third_party/pdfium/xfa/fxbarcode/utils.h + # use our own nodejs + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node + + # use patched freetype + # FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733 + # FIXME http://savannah.nongnu.org/bugs/?51156 + tar -xJf ${freetype_source} + + # remove unused third-party + for lib in ${toString gnSystemLibraries}; do + find -type f -path "*third_party/$lib/*" \ + \! -path "*third_party/$lib/chromium/*" \ + \! -path "*third_party/$lib/google/*" \ + \! -path "*base/third_party/icu/*" \ + \! -path "*base/third_party/libevent/*" \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete + done ''; gnFlags = mkGnFlags ({ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index cfc8951eef10..30a16d824d01 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed +, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas # package customization , channel ? "stable" @@ -62,10 +63,26 @@ let sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; -in stdenv.mkDerivation { - name = "chromium${suffix}-${chromium.browser.version}"; + version = chromium.browser.version; - buildInputs = [ makeWrapper ed ]; + inherit (stdenv.lib) versionAtLeast; + + gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; + gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; + +in stdenv.mkDerivation { + name = "chromium${suffix}-${version}"; + inherit version; + + buildInputs = [ + makeWrapper ed + + # needed for GSETTINGS_SCHEMAS_PATH + gsettings_desktop_schemas glib gtk + + # needed for XDG_ICON_DIRS + gnome.defaultIconTheme + ]; outputs = ["out" "sandbox"]; @@ -92,6 +109,8 @@ in stdenv.mkDerivation { # libredirect causes chromium to deadlock on startup export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + . w EOF @@ -107,7 +126,7 @@ in stdenv.mkDerivation { cp -v "${desktopItem}/share/applications/"* "$out/share/applications" ''; - inherit (chromium.browser) meta packageName version; + inherit (chromium.browser) meta packageName; passthru = { inherit (chromium) upstream-info browser; diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch new file mode 100644 index 000000000000..2ffdcc0ad6af --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch @@ -0,0 +1,63 @@ +Submitted By: DJ Lucas +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/patches/fix_network_api_crash.patch b/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch new file mode 100644 index 000000000000..093598465c47 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch @@ -0,0 +1,77 @@ +Index: extensions/browser/api/networking_private/networking_private_linux.cc +=================================================================== +--- a/extensions/browser/api/networking_private/networking_private_linux.cc.orig 2016-05-05 03:01:50.000000000 +0200 ++++ b/extensions/browser/api/networking_private/networking_private_linux.cc 2016-05-10 16:16:42.431052917 +0200 +@@ -215,12 +215,14 @@ void NetworkingPrivateLinux::GetState( + std::unique_ptr network_properties( + new base::DictionaryValue); + ++ std::string* erp = error.get(); ++ base::DictionaryValue* npp = network_properties.get(); + // Runs GetCachedNetworkProperties on |dbus_thread|. + dbus_thread_.task_runner()->PostTaskAndReply( + FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetCachedNetworkProperties, + base::Unretained(this), guid, +- base::Unretained(network_properties.get()), +- base::Unretained(error.get())), ++ base::Unretained(npp), ++ base::Unretained(erp)), + base::Bind(&GetCachedNetworkPropertiesCallback, base::Passed(&error), + base::Passed(&network_properties), success_callback, + failure_callback)); +@@ -301,11 +303,12 @@ void NetworkingPrivateLinux::GetNetworks + + // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the + // results back to OnAccessPointsFound where the callback is fired. ++ NetworkMap* nmp = network_map.get(); + dbus_thread_.task_runner()->PostTaskAndReply( + FROM_HERE, + base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints, + base::Unretained(this), configured_only, visible_only, limit, +- base::Unretained(network_map.get())), ++ base::Unretained(nmp)), + base::Bind(&NetworkingPrivateLinux::OnAccessPointsFound, + base::Unretained(this), base::Passed(&network_map), + success_callback, failure_callback)); +@@ -321,11 +324,12 @@ bool NetworkingPrivateLinux::GetNetworks + // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the + // results back to SendNetworkListChangedEvent to fire the event. No + // callbacks are used in this case. ++ NetworkMap* nmp = network_map.get(); + dbus_thread_.task_runner()->PostTaskAndReply( + FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints, + base::Unretained(this), false /* configured_only */, + false /* visible_only */, 0 /* limit */, +- base::Unretained(network_map.get())), ++ base::Unretained(nmp)), + base::Bind(&NetworkingPrivateLinux::OnAccessPointsFoundViaScan, + base::Unretained(this), base::Passed(&network_map))); + +@@ -506,11 +510,12 @@ void NetworkingPrivateLinux::StartConnec + + std::unique_ptr error(new std::string); + ++ std::string* erp = error.get(); + // Runs ConnectToNetwork on |dbus_thread|. + dbus_thread_.task_runner()->PostTaskAndReply( + FROM_HERE, + base::Bind(&NetworkingPrivateLinux::ConnectToNetwork, +- base::Unretained(this), guid, base::Unretained(error.get())), ++ base::Unretained(this), guid, base::Unretained(erp)), + base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error), + success_callback, failure_callback)); + } +@@ -524,11 +529,12 @@ void NetworkingPrivateLinux::StartDiscon + + std::unique_ptr error(new std::string); + ++ std::string* erp = error.get(); + // Runs DisconnectFromNetwork on |dbus_thread|. + dbus_thread_.task_runner()->PostTaskAndReply( + FROM_HERE, + base::Bind(&NetworkingPrivateLinux::DisconnectFromNetwork, +- base::Unretained(this), guid, base::Unretained(error.get())), ++ base::Unretained(this), guid, base::Unretained(erp)), + base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error), + success_callback, failure_callback)); + } diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 02b7ec34cfcd..be9aa16e1515 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 = "24.0.0.221"; + 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 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80"; + 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 32a3713682e7..708320e92a2d 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 = "0mwwscybips1kazl0rva3jdswfzfb7yp90ggqgk27z2ndp0qj8b3"; - sha256bin64 = "17n0jcysxi99v8hwlg7f69nrs2y5z87644145a8r53l809hkvkrk"; - version = "57.0.2987.21"; + sha256 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2"; + sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n"; + version = "60.0.3112.66"; }; dev = { - sha256 = "18gsj415cdlllp95q8pv1s3hhjg8cmjb6kwrvbr5mjdvsvj0ianf"; - sha256bin64 = "0z58rwz00bq61d24h8jynhzxanbh0m9wi04jbczci3681b4zyiyh"; - version = "58.0.3000.4"; + sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g"; + sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv"; + version = "61.0.3153.4"; }; stable = { - sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s"; - sha256bin64 = "1s64smkpjmnlw7ym14v3g3lcpagsgavmnlq6wkgci80kyvwasd3w"; - version = "56.0.2924.87"; + 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 60935b9605fe..bd5f757738d4 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/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fec1665f8b7c..967fd1e1595c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,925 +1,955 @@ { - version = "51.0b8"; + version = "55.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ach/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "c251fe3e50d7bb85a46e86afb9d041b161061e6718cbfe6114172a098f35eedaa2f221a3f7bcdb2ebe210a5ebb5cc33fb50b1dd04da5256cb32646678d722b28"; + sha512 = "7164db8b579c12976ab86770f3c238d8b4b4334a41107f995d03b87c77e7998e1c7d48b36b2305d67f1eddb4d3cbe0b9bfb9c27169abaac00839d90a0e80d38f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/af/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ff8af74fdf27e72169193a81e62b99ce831bc466e50ef2d843dda03894fe3cc764ba69021c839ee09ab48b7b3a6140f1ed01c045efb01f75342bcbc333158a49"; + sha512 = "994024e45c16b1dda3680ad4d73fa7a2a84bf43ce3be8df4fa61a695b9041fcdf88ae750c0ab34bf9dd814cbcde10b14832d5b03682e8c83e4dc43a316b6c75f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/an/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "20b5965b70cc773eb2226608fef18efdc24fe22f2feea43f39fe9d09afcb89db15caa8149a908bbca3f26e8d6b4f3651d164fb97f2dd2ee67e33b8e43635871e"; + sha512 = "dc4a8db0c9bd87ef140d8c2fa2e4deb63e664a97353d88f94f99fd10ed358091a6215b62f8a441ef65dfa6774989ede451e55749bdffb0f670904959f5e8bb70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ar/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b1816f401757634f618e1d9929c2a341adfdfad42bcefa8673c7d8c511c46267054352558f3a83d399c68e7f80faa1c2cea519ac24618479828c37b4067f8e78"; + sha512 = "94d018fe2116733bd14daf51d9d9f09022a745b3797773422ac79511a8fd1e14e9fea879f7873c1043e0b63d2df4425c806645467764325400f71600a2f1cc1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/as/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "049a8f3782a34d8432204ef6119a2909ca4e6eba83f760c8f35f1be86595483e47823088e508a1389d68ee366e14431686db7edc44d1fd5934f887aaed85bc4d"; + sha512 = "6b5811c9ec50be18a34e0102438e95fea58c8667a0a19c9c4c5f4ac93c8ae8b9cd929252c81de7f19a15b82ed6a01e8fe37fda7aafc63cac223cc09b1d9dbd11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ast/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b2c48f6009e01924e75d7671a819b4af51b87a3a08576812bc7f89b2273d047a3ca914147b519dcc50f1deb21acebeeebb05fc306fbbe016f12e3fbaa885bf16"; + sha512 = "4deb4aff290277f870d5c3148e375a9bd2071b455ff93f10e28c9afe149a8f11689bef936db8a87c0fd4cda5bdda70aced4580395343916e7510ab7970269fdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/az/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "315e47d4e4d6d985f4390d8a40cb736ec871ecb30ab76db9235bb040eac9b73c3a1e709d783db2363c97f6ca91e3281c4c88e10c4d9fc62131fd8c105d7269ee"; + sha512 = "3cf69626fbcd8667c83978e540cf0e8e0123408dd080073e95f543a0c98085320bd95caf77fb814002e45694cefa5542c6d436d258c66abb8435d52ce85f111c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bg/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "0318b4bbf69fda1586665dbe7626d4ba1c4768acf310b5bcb0d49c1212199704d4f0c0da6dcd99f75dd7871d39a4725497c47ec2f980b1c458b101a4e18531e5"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b31bf59b6546741ab005c5ca11115f1557923f467e801f16049e83881deb8a8f6b775b425a8fc2a608b51170fa00a4b464c9e60e306267fb50b2144b23948613"; + sha512 = "0de32e72eba0fae0e19c1d1cf8e8f8f99926d66df6831317742a74bd0e90f909cd4a55432f9fde3e25c33e37160f5e92d0ca97b2236089d4059c5789e89823f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-BD/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "5683955a4d1e678d9893554d9cc534a61f2cb0242e2ac068424eba238f1ce89e58692cdb35e43d58cdd71c0c0683a5d61920089ffd100416e6a2448ce43f2004"; + sha512 = "333b28b03e6a4612b0e5636e14bc83d6e152237fbcd4129acf25767f3049835bf262040caacba1976d2791ec06fa89e3c70ed1abea414bbf4289729296099993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0220a226f53b7a99d123a1e72a6db88e726748c9d3e0ed46a51ab36b2ba5213dbf2cdef55b8a8892c97ee656905f01920563e344a412142993c719f15cb0bc43"; + sha512 = "ba989a0555fdc40e9ce9d834eef26b19c30b19616d85b5864d26253572fd79bf02b7a0b9bfd00dddaa192950c7f9d52c20887569b7cad8b03622ac0df55baadb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/br/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "046d7c42a294fe636cbdbd13da8fccb879595ebda6353ed91981ecae39f670f1650f33b1ce0d3705158a437a22a718d5d381bbc37583702253941abe25ebc477"; + sha512 = "e43ec7e1ba0d977938e5a1bc3f985196211fb6587c44018958f750b35fea78f2dd94a8fbd1b91f70e41c3f3cc0da194bed76306d4b63bca3dfde7a65a6a7532a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bs/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "a2e0df77bdb46f501e2760df79589ebec8e1bfb85e07ddee1d89c797a34781efd57e1790127d6cb38199bbe01680e5b04208f2c06b22a9bc684c87042f825267"; + sha512 = "7ed042ecf92e7f873f93e0f6a7ab27418e960adcc2417e18fe9ee8b468157af85dfbd8e56df7f0dba97027b3a38aeb6279d81451579cc97a9fec814064b74e58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ca/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "e8a4a37a55a882ce638e51ad5d4a08ac815fb5cd556d0e8db3982501ee2f9c0ec141132ffb0eebbdae47be78f74dec7fba730638c8ebe38ce82ecdcfb570adb6"; + sha512 = "0953320dfdebfda3b2f135fb5277ebbdcae1c13f431b4452e0398515d990fd6faa8137dd4f49bf4336b385c70422f340e0bd8a466c07f76146d9ff32655cbe1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cak/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "aefda93ce59fdf238c2b957e45463c6f75e511a4331596bafaa4e8a99139f17ad2facc22befcf2fbe105651e9b003447bb62c3c2c6ffe4681816baa400f68a6f"; + sha512 = "e79e1e6a2784e3e61637624ddd8b628b784090c61daa35d36a3ebbb68db1801ead01b86bb04d7b2bb3037fb53b42197a50de78013afcc2443136b65df6f0b9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cs/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9eeeab75b2963959db947165f46443f686760f655dedae4de3d174a340c88830fbfcc0fd1df23740e6abe6d7f4552f06630c93f28246ff907fe6eebc1437d943"; + sha512 = "c48991f37c786982f90ba12d43120dbefdc046d30c9ccbba630224b1f08dbce2b73eb4456e1b588f5ca0518ad19b8148e9dd5cf4a9f47f8d4ca0e90e2988f18d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cy/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "659ea6606bb307893448b0352c175761e6bae90246ce157eb2cb9373b923ffede18eb8526330391396f9998fdade7db135a54f8aa14c4f52daeb9cddc44f344e"; + sha512 = "a01937ba6f1e56b34ed4d16acbfa336338391c8fe4e33e5f06ec2a35c3c6010a35f20f7949ef1f6d50c9d6f6d9db115eb95cac50762d7d6a3b642f78192a6b4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/da/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "22647561d07e92d82be5bcd2c5f2e7a08d6491ea582464f64a8ba686496b0267eab6c07db49ae189f996b8cac9d0c4c7789c3230003d05dbc5fa8319acabc4fb"; + sha512 = "d7861e3765acac1e8e5a1b302986fcfbdc262a22308ead2239e7acb3617534f1b8bc101c2ca6d5aa1758bc13a6cac5f31fa062dd31ef239113cc815c9d4d22a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/de/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "313446d8dd7764b98eba2284d71d8abb47568577f312718f02a73bdbee4938477ed407d3d638fee4dfacbb43d4125806c882e0c96cda43c9fc5b09e7fc6656d3"; + sha512 = "2b6efac1ab738f42fe52a6c8e4bd20fea1e044577a4dd82fea54ef403adf2ea9f7cb64268de68dc55799afd3f5e90f724c98b9f705affc704e1a58118c674dac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/dsb/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4e0bec424f15dec37ed21a46c79f9672d380f9d59e3109afd4debbda2cfe58bf8b17f75d905babcbf7bce5cb8f7f3312bd938ad945e163d3e11be42b9dee2fca"; + sha512 = "c5de911eea687279d6d14b8dc745597c6450c733cc332e104de6ebd9a7a64b877474fb0da0bbe59ef4c8424549eff4fc6b57a93379c09df00fda761bc7347e54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/el/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c10b58b13a85bc1cee23ed23ab8f62dc79247d025ead6efbc4165895568c6d369574fed7cd2d294bbbdec56e7673928ffa4db77720d871011b7757aa90789e18"; + sha512 = "b531426207bf42f74f87ba8807441926f9476f0f15caf8a21594d099992c7c91d2cda6d71d318d899863185bdf776f4bf46820fff77b37f8a95c52f570f9247d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-GB/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1cfe32620ca3a3fc5cce03ba13c6acb174567f99879fac86705e10d0036eea35c912064827676fe5dd0ba3da5bbc624795c3f7bde7546f15246b1acc1cbfbcda"; + sha512 = "4c1c99501cf1ff1320d27c7709d9572837a1a1fb7d8dea4578075836e013b5fd79c84afababb45bbb5cf95655b51b0503ac45023746ff6d4831bda93c493e539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-US/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c8504535fc15bad6fdcf5aeb11a54ef26ef56d14076ac6fe06cfb530c1952118b957fc3cc6ea2c046af3a5ca90dc87655ae67d7baf66e46064382ba529045362"; + sha512 = "82678293b35fe73c27c5842589de97858a8cb5186d7f1309693f16a516ddd62a59bd96e84358571367b706354625a98bec7fff9f7c598c96f025594baad44aa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-ZA/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "80b40ea103d5691cff9df8373231acb151e6bda0526d27d59bf226f24e8287eae335b1224429b61676c8c9f3021ba77a31cfd3bfc68948d6553978fc570ac6f0"; + sha512 = "ded063ef65018cb0b138298b9e9df9a2aedaadf92d5c77248120cee6504542d18967b01c1bf497e264a9aeac7c119c8bc9885fb202dd0abcb0ba00344ad30397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eo/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a9809ec0e031e7e127441c11003bc81d8dc701e3acc45f137e7e68bbf1ebdcb5cf40267e9f8e7431e62506678cac04f732e73978ad566cd51597a1cb45eb0ac7"; + sha512 = "205dc910f37c5501b27ff044f5bbb197fd4bbc3d8a5512ea01b0b4c155cd8b2f19eb6c400cb999a6136f2534ac0ede511ddf827ffd59f97ba00b538852c9a0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-AR/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "18851295d00c2204b75c8e3d2d07a12ecdb9456d8ce41606178054b64ea5b7e9ebd3832db76412d2d5a26941494936c811084216525c56e4f017063734d7ca44"; + sha512 = "95a026ce800722d1e89237a675a58fee8243e5b4a900d1ce42a4f139dbb43e940478660f78d9c4593b9d09af7c3dc843984b7a362b465d99317aba9bb213b371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-CL/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9a7dabef38bb5f0909f033950f4e0424fc2c0119f4bbc0de85bf76f29413b2984e0d56522f900055cd9e79916397791f0597229a19d2d6fe0f8850c09f9bf3f2"; + sha512 = "42f0703824210feedd7da2f78a4d0823d1d0f3b23d4edaa07d63a5021847ba55871fec33676915b9f2b411ebd9cdf31de155f2de0a47586428bf0e1a3fe7457e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-ES/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "52b87c75267dc27aa9acb9a49ce9e59bf989f76827c078acb8d9166f60f0d86f6a0e937aba324e8e9e9ab5e0c721f75f0330199e16540809d0e8e9c068826406"; + sha512 = "d11dd1264e4692da710d18ef5c18d7f5bc1db36214cfd28a7f567d56a35ac6e56f838a58ef6ebfc2d68b115417cdd19fd49ae2f6a13f1a57bb2eacd122945f1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-MX/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e57f22ee791acab3792cce3f52823d5fdcced5befb2808cc717d0da4a876a517d52b2e22f4558c33ecbbff01a799d70e2e67ead9140630a0111d73ffa5e54de9"; + sha512 = "ab33b21aaacb43f4676856e74f4d93e2d449b67095500907669db42f678fe0d7448f2205f42c3f85885cef0a2c262818368808ecc336205411dc27b99e42f272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/et/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "572a6f67b10f1a4981d7f0f131bfb9900a20a094f34cb3eee717d7694e3c1b2a949dbe262a10b6ed22cdc97c3a99ef885a4f34d15268c6aacdc7cd28ceb16f8a"; + sha512 = "2a87e6a9bd6c3aa22d278f114d0bd18779c7847cab2e6257c4e601f3749df703f2d0a25f5646ad91802a2cd093bd1734305fb350aa2be269c1fc5fd2d621d4db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eu/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "8ce7450a27a26954701585a2d55616d98658295c122071641209274a2555e0bd45e57e17be715cd69e00187169501f7c8fdf419a3e1626c4a1e5636f36be26b9"; + sha512 = "9017cc8bed387b103f78870b157a50c18f8e36858eca1bcbce8ac5ceb06f6d7b178760f7dc733ce570cdbdc3204d277a98a4b4324a0d3691d1fe3f6b1e9725df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fa/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f42a0effb6ff4210707371f6693e2bb25119f7535581c488760c237a3019e58fa270543f6981348f609c776bee54e76a220c449b7169d7032b2817ea1255eacf"; + sha512 = "d70f1a793d67f1b52f740bbcdc4fb01056495fdc5b14672b35a48a500c71ac7cd0cc6272e7f6b4b4fcac65874f32ee64338435f76131c1d74ef82ca7a512eab7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ff/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7718bb71ff031975bae785130c86c1fe007698177b04d55008a5175074f9ba33841e3939f80dd76034680d7409ba281162540757b4365c03e10fdc21317b3df4"; + sha512 = "c16463456725b2f0263b8fee2d0729bd4951a352b1dfdee819bc2af0e138cda73d169eec63a27ed2900a0703648db0c784969a41df874336b1a84170ddaa71a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fi/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9f5cb2d9ad20d788d715eae64406abc5fdf9229125f8a88f44de574c836af2943a7844ddbd96eb6770a5e011c5e239009aaf022ae6c0a14fc1c01dd2a9283b1f"; + sha512 = "00bf17dab47261470f57b94a18fcd5fcca0344be1b1d6352968e132c7f3fdfc5b5229c80eaca1a9802e75d432e09bb6e0dd3dbd40ee9f0c783ca007da61b52de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "d9098b1b61bdfa82db7acc0f24fdd8e248f9fc0ae1c044829a27c45ed99c933fe7e8eded84cce9d454dd544b0645b2e871a00f3677868aa4efc00bd82dbeaf5b"; + sha512 = "7599fed77975a7b4667c9d3456a5536e3b7eb1725acd624c504d061330ea84c3a19dd72914a0f7644068972b94a7a058708e3b1e3618e084315b920e8f671f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fy-NL/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "146b24d3670822394130e270b851beb3a4017818004ad5d6699b8424ca5d4dda16788668addb7f42b21980a6dd39a2c3546bc36d5bf2298b831fa83e957beefb"; + sha512 = "c665bb33f04b7d3b9790580b0db992ce223e75fdd3915b16f79125a72bac91cec098b1ae73b1223f5b03597c1e19522b46fe11c5c05a7cfe0c932a21bf94f90c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ga-IE/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b1b38c876e9226abe24cc4379ae8a0d489db7f91f332560f922b3998d0c564f42730ab568277f4159bce95c1024634f20c918b97e84fa7915e4b841f9d0b760d"; + sha512 = "c775e3e6858732104ba3251de42a0e9ba5031ade5f89207b357e93c6f6e4acd07bcc91a5fa558a9884f07438ca0de6bf10065ff7e37d980914da392428bc57e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gd/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e3b3191298f2a08ff52314aaf9ff9689e8ea83128f43010fa90ad8a24caf340e24223c8f5109fec2286a68c699bcfa98fbdca0c10f62956dfd768a473e0a77a6"; + sha512 = "c8df95449757099a7c8d50c04f42aace7ce25297c78622296feb336352cecb53726f3873210af6cab96d90f65e21daa084b08f6b943e1130c75f68e6de1168a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "024747e36d569e323964b9e0c3a3922563c94c5679774a9cfade272d8378dfed987c291bc55554b0e0273938a3cf65f48b5924549f6962dfffb51caeb053b64c"; + sha512 = "4488db080b8bbf7e437a684d1d7cbe219d1d730db055cd9988706cd71deb110b9496a87684ca32d172f3eeb3308ec1ee2ad0ab3b1e206d012c62311db45db911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gn/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e0487d5ac3730b09315f1b5b486fdd8359c78ed7a741ead18ab7d4951f9e079b80c1066a54f2b86988bcc8edab62971f0cc99e7d7cbaa97122d90e4fdc08298f"; + sha512 = "272c43aabe7c63b769df2aea4eac5350c9cf90326ece8ac2f096db421f7785e630cbdcfdb84e41c516e36165f1a67d9b22ee0090d84ca9d58fef275d119c2dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gu-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e9ceb5eea20eb9881c87e47700dddca0060628c28f7a8bee4df1be45d7b0f9f7ced122e7bd1b16468853512f759691072a455c13ab98e642c94f2f8794ca6b3c"; + sha512 = "415b1ff89552f6bb83458a96905c2c6b7b6b25a974b72ab4a4d4a0a1a5b1e431b82e519466393bd6a8e8031954eacbca97529cb0e4513d722563e13eb97a8fbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/he/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "68ef5903758f59df5e3bad14903734d470ee19cf7e3f34f112ff5be5d11b28e19cbb55331552a7437ba3bfea1d03d527690d0efecf0ca9e824c12fd2c5992269"; + sha512 = "1110e4c1c6121a00fd76f25bc513f0c877bfdc7751af2b5958f38f2a7892d8a00c9b5eaa6adab34213535480228a4e0b3aef3ec3a3ab4adde74bfa2fc7dbde94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hi-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c0bb9bab0b5ff7571af336febf1ecb07427400ef72d6a49fed3958a48fdb63a5cc8174b4365fbbecc11d4f7b646ef32d2204241d2c17290dda4b99bb971a1dc7"; + sha512 = "b1279b0f0a97413799598fbd3c6efca475b8aef7a0b05c401cddf283722ba423ad2524341962360845951798d9083019a5b8b431e658513001c3046b6a3fedff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "16e07aaaf4bcbe83dbe40ab688e4f40d02792e3793afa1fdbc90be6d7cce87ca3c8ebce27585eb24e899348f6bfcf3b471c73a0f09d0007c62e224710bbdf538"; + sha512 = "77474e40120fd4ad50a109c6b46fa93c070bfaf899e187bd4bac0ad4a53fc12c7f7d9d2a2003a871e8666dcfc60de4f3ea26b79008f4fe7ee1c5a358307b2eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hsb/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "6968bcc314f05af065a7a8dff0723579c760d979db7186e0c6dd7a1ddd5c5135673ff940ec471b57f2eee550e5c357342115a2799f1dd48c2120d3404c5e0510"; + sha512 = "b1e440f25ef20da7fd6e3d6a403b7c448e5493bfa410e09c3b9d59b32450883a938967b167a8e84cbfcaee546d36e28c8152a6c048070b543479072bb8df6189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hu/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "498823b2075e70459b71b60560ce7e458a8619e249fce237d91cdfa2a3992e279223586d82af35c2804eddb05544602f06925c8d24c76f9dc8aa37f8c5fa40b6"; + sha512 = "7ce8bedd243fb6d8cfe28eea17aafda028d1b85d96dd60c734f239f258dad8e7c132439614d48494e58088f99903f8a2a8824fc4878366400d9affffed203b84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hy-AM/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3b86b1efc5b958b999303de303df07967d4a51f5b8853663bf3e07c19762cc273cb26c073d8bfafb873f09399e6299472a210148d6dca2494580f727fcb7ce35"; + sha512 = "ab5054bc6cbc515af08763e61351275411edb2507b7013152185c49e3c7bad0263def5ad187cfe5fc4bb0f93e86a1596e131746646b25e452293f24216116543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/id/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "27a7574ff31cb8bafec7d2882b19d944829ff1508810118dc4053c602313c7f5ead2dc6328c14313c8b687fb5bc369be0aa5bef78193251ade7461f178ed466b"; + sha512 = "122b20868a4ee4d1bd42efb3bd281f137bda130d4328e830b3b21176777c6b993f562948671fd8e020d039b5e5798b150f1fbcf734f245615a2a3beda8d44e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/is/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d990e47ddbfda4c4a22a1c9f60b0aee13cad35de496c50c13d6f33fb6624e948a0c94a1f883a8f6ab94f0310fd3d3db1554b502c4faed8e05844c06f84d7bc23"; + sha512 = "033451b816392acf472f6f62f3367f929e4d4c2b749629138120580b7bb854c5409251c49650d3359e6f48929eeb62bb9a475ff46a8b57cf11c34d6035c67f70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/it/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "faedb800d78be5cda15858df073099767d521bbd71915733cb8558deb2fe3a6e90a203ae946795ce6f55ad7a6d35fa0acd016c3466286548e3d198a499d24bd9"; + sha512 = "99bccadd7b8994c20ade9907301ac695ef01542407032588bb17cd3353e4941ed70944c8f9a28aa0fee5b49990d2bfbc5ac37d9c3d4fb88d13c473d50ecaf849"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ja/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "3063eb49a6076153cabf57d7006c6e41306c652573a4d037ccba721fc4069b9fe7a3ec1f65ac8b8f596a4b7493209b8b46f9338f4eb3141793caaa47dbf7e821"; + sha512 = "ec7193a6eb610bf1ee67791f1f7ed9ab951cc8a53bdcbddffb1078479919d5a70c43235e3b4ec4c20eb89514f283dc8223a4f61835f039f347744d07727058ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ka/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "24defb6af2daaeb42c850d876feff49504e3e93ef2e1a4c3d1b85a8a86c4e8cedbfdb86693bf7bf7e4bd2e096f6ad53ea877b6c1505842b731ff2cfe7a75c134"; + sha512 = "753c48c6dc9de12787705574fe0319ca9e4d5f9db67166d62fe0391fe5b8867d7f5da9d21f829420bee034444762a6ac3166c109a36e0001e6e7752c93304f77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kab/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0c41c51f725e02e1fae284723547911cac5958352bf36f2382a8f293001d086e2667722e06fe7aa3ddfcdb24f60e6307b9f050eb15d4d58b7a9e0ef9e7a89b37"; + sha512 = "a64d1b1f69d18d06810d72ad10aaae40153e696a29efaba4327d44e45d167a4526cc00811cfb764288df8971576c281fee1d8b737597f1de0f0755a4d2e78126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "82cc8c6063359fa1a28d84a56500a0aea2fe7735dc695e0bb5c57445284e0d4a4b0cb76cd78e399023af83fbc00bfd20f0b17098a264aa6a230d925b5453112a"; + sha512 = "e95905b00476f33a8e5c39b427e592f844f04d267263dec65f9edee3e2a91790382cfde6731e2eec0193d535267d041d2254c4645a7f8cb6b1e3ecbaa40f37aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/km/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "a2a4d80aa6e9096cc8d11c101128e712079f3b6d3da9da3a9268e6e433274ebac4b0adb07da1fc63f57673dacf16ba91efce38bdfa3db9c4b4d1454fa4ecfb63"; + sha512 = "3dd5c83d82e6a47aebecee97c49e94018169a06a9f81ac61bcfa7d6ff337b5c4ca66d10ae552f5642cda20ce545752ffa0f2589163fd1e01bd7e61c24c88e7fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kn/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "5c202454bc5e221f14aa1ddcb04df9d489e1c036538a747315848b238ab8a8e569fa35b27e906bbbfa00b4502bb0f6a64d317744d5d3e82b430f2c0f28ee3d60"; + sha512 = "cfcc5d048fbfa18aa0030114c445b40ada42064ac56194add35d51340173b3f6dffa1c9faca87fe4ca2f5aee608d7d05903ac8540095236d19aed3f939f88914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ko/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "88f96e25f721e005acd51512e5f5323eadaaeb0fed0bc5c0e919661109e8800c3b940ba131fc788a82a8e6a35be37f9c7111c189b2e9d1ed4ba1a5a3503748ad"; + sha512 = "9e7b63568e745d5299fa0315dac87478bef0a30cdad42b05e33acdf188f8346e23ccac0ca3c544f1284e4cd216d8b5c792ef448d6cac31318ad711ec21ec4b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lij/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9b5bd55794df871bb7a622ded9bfe3b85d2edcff1a1a4bf5237f17dba98e3af53f70de48636c0bbcba68c5c19fac08873607094492d03bcfbd7550cbae9e4178"; + sha512 = "1c8ffd773a5c259d32a6bb6ed6472c041f5337f01f21f6e5e18f774ddb04480cf0772ccc6bac7710e9c22f760d7bd2b234d6d21e1281d9ce2a26483ccd6e928b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lt/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "be075ac4bda511c2bd81e726003f4ee680f35022e84365fccae090305c45dcc586162428dad944bd59b7e3c1f836e8b07a2a78e5a28d0eabb6aa44877398650c"; + sha512 = "2f087692eba683bb0e865b5d4abc712edff5cffae647e8bfe382b2c15acfca481bb56c20f6b14742e7f16dedaf27848e8ae4d5078492762185d36c040c7e33ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lv/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0bd623b3203c1403ca187a3b25abe0e438ddda0c6f5d4f947c0643ae3f492c649cf830002f7211853050b15e179a482677898ef0d93d32c5afe34ad6e7040cff"; + sha512 = "0f6869d9528ba56a8e03e2dd85d8b76d74a359a17eb84c575a94580f965fa8c3d253933b798e2c426f742fe5d8d0d7709a7280e21e7eb41ce3799ee98cdd3af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mai/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "b406ea5ddf4169961cb11104186a809ca7c8a69b124e85e796703326a37ee18473e4f0b430d5da2dfbbc38f7ec370951a5dd0c73be4f9bf48da771bb603bf38d"; + sha512 = "31c2449b7127b4b537d407330cb618e1ffc24259f9bb455f95e2b535a4ca17aff8249c77e98e8f36375671390d4225552b18ba21346e3f1062482e8b8d3cc288"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "ae182c6ffd7fcb3acd396e8d9f4b2baa65942d78498acf7a0f3efff69cce62812c2e60c937611c29116a45c5799625891f39e25ff499b7d3e4f453f790d8e8ce"; + sha512 = "0722b24e72fb8d0423e37d47035be6c2e90db45d99590961dea6cd5be6dbc7f1851234f20e4d8d741c4a36b82c31675b2e39884d2949f5134954b53ae6db6ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ml/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "9dfe1593bdbedb6262e7cf50857036a624a3ae13bfcc853dd91fd800d74f831665d8c89832b5727a9bd2bae3b4123104dbaaae1bdd39918f2c06be2fdf0a5c0e"; + sha512 = "4944473b377fabc233f30a6269ebf02aff87ecdd02a75e528b8f0c737dba37ad9eb322f99b1ffae1392a67144b737307bfedf0c6d45e65562f964bcb9dd3fdc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "2744d4fb88f2713b956efdb6d56fa1ef7e003013cb9a526ab2f9e8cfeb915fa3651978a3d863cc3c4dd62a447bb8cdde402483701b38cb206b99eff5fe5272c8"; + sha512 = "5b2bf5731f4a988d1bdcdac74abf00b0633b4f9b63c1b999309d5c4eb5390d0e823d170b7cedc278b49d018d74e6eaa83373ad5c2a26151b78e9e831bf38f14c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ms/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "4a313418db320dff4f91f817cba054fb65b5e97a434a6150d4f3373bb788b18bc02b194fc8349e5f41e1b8ebee94f0874431759fe79ed32fe7f5645f25c4e297"; + sha512 = "e96483b5e5800a6a33a9e9d065a90476ad76c94b6e75fe006881c209469e2f37173ef6d67b4f2b2cb216c46ad44bd0db9dcfb9d2e5afe864297e26eee93898d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nb-NO/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2"; + locale = "my"; + arch = "linux-x86_64"; + sha512 = "4d145815f5cdd37666a60b0db476925b89495b1add8bfba42cd15580a294610f20fa340c449c04fa9cd2714a62e09c61e742037cbe26b5f11671eb72dc8a5008"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "41085294ea372990b058e61942de5f2c972511bb22a1719e92275e4258d6c0c0a71ada6ab21475c1b32021fddf5b149f1dccb469a948050d901b2ddfb91886f2"; + sha512 = "3763bbc87d2ff21b6db0d45b684b91f1080e3dd9fa1b2240edd56c2db1100b66ae04748c67df410cc9c0802e83fcb2a6661fa35fce6e8615a787c280ded8ebd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "45ed2265c4d6a66142bfe117794bd950e56821d377a5437c9d0cb8405e7605de617cad3e92ec6aa71129117690591fc95ba5c4d9e662fafa408c3e018845e40e"; + sha512 = "eaaccd4746477ff10af5ee15b6e18020e8e1bf36bea7176cd3ca92903d983b97cea4d73a516a976827ad46dc4a03b000935f1d1d353af90ae205df435cdc3004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nn-NO/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1c981c33bea1ecea733db9c278d92ef42809a4dcc0ce8f9064e08b303a56970099b4f3591103fe262a777c4ded9948d9cedcca6d2046512851544c8da774a250"; + sha512 = "7df043f3e917978b9d2c3ec6128275daed830d1402a4bcb98160b2bbdb98012e5db116b7ae6537206de95f65b3c7472326b7739979a12e452bc045e738071ffa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/or/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "3c67ad9f3ae800cd2e0665f35cbe92f17337c5f2568b057b9c9baa7aa8c91ba4f5b1e7718f288a2cc982ecfa43241e992e35c798e833fa56c636f8c7296d5a55"; + sha512 = "04e46a2cc75b662404fd5c107a7df37761c6cde2bbe93f040d2b1b745ca6e3fad978ae868536aeb526e26b4af1f7b961e9327a3a9660e1ae9823c9688a8ab3fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pa-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "9778843430f504faae4f8e138490a92c14f5f0f1c47c642f7f1f81c90a37c4cdf0660ad5b134429d6a86f61bbbed0f285a41ba315b9c318799a90f3208cc4a3e"; + sha512 = "a5a7a0ce8df208b595f895428030fab8e19eca9b88ae2484e915766376d249e0455986b3a79fb4314889b35f52abb6aeca7e7b979ee86672b85ec777f8ad9a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "336a3afddebd687f62753f0bfd6b7e57884cbcb4c536de2d2a85e9ab22a696bda55795d5511ce299d34eac20abe91032450ddac97fd2be9c4b8db6b4b0fe6c6e"; + sha512 = "427a76174ed62b38ab83fdca0c64eab60c8d8626bf350d15c269056d126a3eb2263ce75f6cdd476ffed3c59b27a77119bc28317640d3407e54a2d17497207a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-BR/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "1908080393d171ea86a05277a4a0d67c0c054fdbc60c5a9ba76fdc92071e45ffa57750bca8b1f56c65a4a45d296399c1cf3e9c0db8593ae57e7b8b53a6969171"; + sha512 = "6f93c44b4e3990680eb37af208a1040de5a77008485e7163db861443334cd8fbc86ce387341737699dd0f9197df4ec9aa7668a2b3862c133f0df983d1abab0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-PT/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "eaec79b2cf363f613cefb2cbbeb3a5b607ab608d7e82ac21aaf4b591475a85374f49f34c912b569ae3fb8224f19b93d753298ef8f6db820fdb84a70b306b16d2"; + sha512 = "255a1297cd0c2c8c3f872173276a81a0847f9991d1dd4180555e3299379740a1a65318596c66c8d464dd74bb2b4c6a395fba3f905c98eac3a97a0b0cb4ebf45d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/rm/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f6fa58d42c155552546b7500d6a0081b3c02c3cd300c0744e4a964b97970f1a87e9754e126de346880447b6af9853a91f157ef5285a2db1a8fd677c46cd0f347"; + sha512 = "69c0e8248a17c54879e3e50b6bbf2054afa8d2f85a7006e6201d6dadf5112ba558d4f8e2839bf65c622dfc55f537aeaaf6fe267e6861317cda6bcf86eb9a3ddc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ro/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "876be7fb744a6887890671e00d84387c71e5c77ece611646e721eda3659654760094e39544a2bd3b6e80b075e7d24acfe1d7e86dcb4003efd867b2e7b81e3366"; + sha512 = "dd696d3f948e3fc5a6330fef299c93d2958daf96eb688826d58f76457931cd69b0a68cd9e1366e52407a2bcc650542c42f592c0b10c682d07faeaae968b0d74c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ru/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "52f58ee2af336e18640b1edeb54f2c632104a1cd40952509b512af5dc838deda531e850e0b56d605bfad046af34db1158dbd69bb25380b80a178f32083d148dd"; + sha512 = "5c788e031ab302a82cc4b7d51f7f2c7d1aeb9a32be241f4001fc8bb64c2331db391b5013480b15ae9426d970eb80fb95d72e3e2819c3ede8d54f9e47c6bfc76b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/si/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0b36230b9d214793cbd75f282f537e73e28ed37efc9f17e4aa0f5dbb3bdaee5b5569708d99f4cff772767e074a2b85a7079e48acf7aa31e955e6ae6658a779d6"; + sha512 = "2a87bd1040627364b6830604b9148df4b9c826ff9c8d6a9b8709ffa491503ea25ba32f8e186946021358d66129f0b84be98561be9682369a701bd56ca13d990a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6595aa0a2601005b0488e8ad02f0f5a8b96c4419beaf9a88660e111bb6e932cc98dfa16e511e0af2622360635e2139a8007bea5fd61708f4558576ad54da17dc"; + sha512 = "defa6ba4b5f00922a45d173fd85982e13a099760ef025c202cd3096366e6fa236ecda704ab97fdc3460f1c66c83e3e8cccfaa313a752f6a038118e2420626039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "56fd9bb355c5dfc680a7a91a1686285a32e147b1b0a72787106fca5244277238948ce9635f97b7c3ccd59d7999c794d4224bf4172384bcf2a02e0aa9d4716633"; + sha512 = "adf3e6886f3e500e62f3706ef79e03924e6e9390775b16fe20799d5f7fd6618e5d0c520a8b409b3ee4eb737d8bd2e0f87e1aa8c2b34ee2e0cae1651913215593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/son/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6475248c31a1d5199d6a4dcba9c98eb3a0c4bdd57ef37c5fb611ec68807658ff9de9056c0a5ad9e016e55d8ccc3ba7987948b2b2f47d6c3061e3f4d13051cf27"; + sha512 = "d6e1e6b2b0fda67a38eb9f7eb8c3bc50f1274fe81118491974372b46fe323419ddb990549c74be040900b372fd52c2cfc193e417714215f8a1b3b07259f2dd79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sq/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "41b602396bf33e36974c97ec25f120ee7452df5d26caed74a10835f0fa7a9302aa87d0fe09fafc2e6670d8ce859a8757a7e7c70657b29a7154b1501e478510a5"; + sha512 = "a787b2df5b1fd9ba57bfe5cc66bc4b774dd4a4b81d11c0d5f0b9c54e1c72590e58d11688ca0ea64d9775a3e4f65524cbfa9740d990197a0b6972034bd4bac9b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "dbc7df70483246003f27acd833c881b3ae6ddaa9e93c7e612334923e63a1a4bcf35c082d355d67425fcb72123039ee4b33a5ce5f75909ea6cc3990d76dc21c41"; + sha512 = "3127231295510a1681808d4c65735f2581991ef04fc7af8ee705ccf57b556f3e085a3abf0fe105533c608a27273bc659b8ac8941f2b044a1ec8a9b085b0a2124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sv-SE/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "082f21155e8c68f8e1f786a3bfc3f832637813bda06881f1b6ebe8a1be85bfeff03100d4a9f311ea8bd6ec802e55bbb674eddcd9551db6a26ae32a6a97535bd4"; + sha512 = "a1bcf79292ddd3efa08d2382a35ca00022e7be2930d832523a4f94db9f25b7ca45054d6d6b6c456f3793038fe4167d8659496f4b0bc812ddc8c58a1e83e279c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ta/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "51bf00c2014222e0d1b30d83a483882930d87d5f281d6b33712616769060dd4b1c5ffa92d30e0e61effe2392490dee43e1d49cd6e28c28bd3b94ef005b87846d"; + sha512 = "c3ce64381471908f7aa7d4004c8c00d1b05d852c200343ce48cf7d428558d0182c4b13b23190e266269c556165c6f51ed55baa1bad9f55f3c355935c09bc9f3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/te/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "83a879a6d9b96963e3370068961559cd530695cfd7db200fb8bff7d79ed01de0357e211454f9735b667a1c65ad7338da913646709d9c212704f2dad0486b3d24"; + sha512 = "9427ada27b5ad79a556f4e0f7d1fccecec7bafcb44ee19af9257c16e4235bc2078af94acf9e0c0240d11a32a59176040ac54721fa7b934ba12320a67c3207183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/th/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "d49d76980c091d354638a2c887cef68e762ddcf9d2a7c1ef74d1d735791949928a6fafa270711a0f776e51410b35c9b396015288ceb5992969af88dd3dea990b"; + sha512 = "83276f41443e931b7e55914fbf32547ab01d58f9d5bce5335cb931b783fd9845f20514b76889f82e357e489b65afa3dd0894544d4004625df08bd2021aeba8e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/tr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "642a6be0577f16c0c4ede21a82cf6c3866011c3b663f7ce7c15961eec7f01133fca8bebd46dc2cb9b91116ab7cb1060f04e9b4e208eaf6a1ddb3e64219a2d5c0"; + sha512 = "c93877ccb3a0d4ba9164363b869577a5cd36d85cb05a8d1ff882fac21e333b7ff8c4597647243de753c037525f1ad7fba21dc1acb2ad212802b514af9402896d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "bd72d88ff7f82b195f6ce44ab8d9b7541e0564ae7b6cc6bb9676a38a9bb2a2e23561f07006749de5598da1c6aadc1e90d0ad2a5eb1be0f998b4d36534a075afb"; + sha512 = "1512592dc0ec9a19e2e92fd39db30b50fb5b26886c1683038885c9d7b18a863182dbe1cef7b8265aaa82e60dcf94c45b84892ae19a25a8a9339382ddab13e327"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uz/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2"; + locale = "ur"; + arch = "linux-x86_64"; + sha512 = "3a90c751054ce848aae996641133e2aa573c4d6329d3dc58465562e45ff450bdbe820828c551de71f0719210458cc71aaa4d0d3745a7feb27731f91befcff3d3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "242b5367c7e78f0c753ebf4f8a4b1d1fd42e236f7417a3dc441a9e72c071fbb9488b226214cc14991f5d12c514e53b35de3c903ddbe5fd4aad31e53f1a6516cb"; + sha512 = "33d3c67687b235c231e09b6564fa525049e1d99c37c3a5fd6905feee5674c305af313d381eef5af990e878fca36f6af0cddbb399a5a297affa4e3aab5f3c103d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/vi/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "d2cf85b0592b3116de4848665c5726f40d3ee2e7b92c808a7a41f0760041fb5aee1d61b626d9fc427a8b0bbf697828ed86741a1d319e27694b51dde630afff8d"; + sha512 = "8dc83c33bf9e27dd0605c945a746035bf16a189b6d5f0e52a9d65e4f45964d8fadead1b539d9b906ab13cd43a7b2157b4c7040c1d155f4eb7aa67dc987819a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/xh/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c865f0b18d427aa364f512b0e5cf02c126f156bffc4db2ab50f32fe9d28a949644fc672fae9a651a28ce6119191b6b0cbf7dfef3e102266b790fd0290d3ecdcf"; + sha512 = "b0535a8704b8879b86d27cb4867f13269395ffafd54a5acdf49124808f9c606f52cdf9e64a6378fc0cc37a6eb4f955b3613af07076567a6bde71a5e61a521c9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-CN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "20fb7a5ed74e3badb56038ef16064b1fb92c6bf274341db0aed52427e313558846f34372cd019730ba0593439e6fb127241ec02906a76b5a7139c7ac45960783"; + sha512 = "17c5996c8002cdfd0b07ac796be9b437582cb0c5401fbe0f405dd0f8b4aa3f45aab24bb5a8f364320d62550eba7d228e1c20bc7805e741a86666c225db3046cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-TW/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "955bc613dfe9a968bd298b6cf038bf7db615ce456de31da656fb54c7f3e8126391154b49b1948a95871ddec04d03a51b543b9248498b661a998d40249f6e8bd0"; + sha512 = "68d9b507ac39d9e175285e5bb4f4f24396687e57622ff31448cf77d73ea8e8817230b65e70c493121b40f4ae91b145be59eda2ab9d572be3d48c14ddacfb28d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ach/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "cbceeff2ef8fa20f18ae5106a6cec638bb064c7b32fdd9bca83776bd58f3a579babd2a6e933e0cee9d0ff2e553358e136ea478b629317a1892f62c4c52f47e22"; + sha512 = "e6b59ce7c5c6289d57edbf019e74d2529b2d38f09552110a50d94eb82e7470103791c69c59066405b8e5d1cbf5058730c3bef780cab7b95444eee756b593eabc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/af/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "76c6eff9a98743a64d387f3a58830b7583510444fff7bcec5daac6fbe56f068925491fb2c8114302f862ddee3d4bce7df4a1dfd1057a918f584de4774da7ebc5"; + sha512 = "38393317412a3310ce7984e77a5dd12a70edc3da8691ca38b5133355c1c60e2ee61a12ecd5af7ea7b47d20f2718da2bce56c9b6b8b056fd75f9b93d1e196f52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/an/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6152904cf2cb33e6fe63b3c573bfabed1915b538d028be9fcf7ad3c169c98899becee772bb803a2b6830457a0d93bbacd49e8c0b962fd1898e8225463387e092"; + sha512 = "584ffa243d0d070aa642d3b0e5fa4b7db553f68032d1f0f251034f4c636529f382451930217da9a3fcfa62e7912108f41e280a2f277b5ca9faa2b05ee0a86487"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ar/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a83ab8633fa7658669daf271db339ed5812d0a85a9eaf313165671f11ae6d50ac92cdd8414945dc6b374a8a46b68df241812e8c8396e9256521ab81949969b6a"; + sha512 = "b04ec9e9698e2c70149c772818a8c4ba2e0516e3049b31ea8fe9db3b1f69724094bd2c05685a864f3364978362eb89a51b0e15e7931c61ab3cd4693dfa8d7517"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/as/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2a76a7eb0b3015eced2a4a83965d314753e44232bc333cccdacc8a0c207b5113aeb7b97fa972dfdaf6e79eda03d8e18f4d8daa6ae3f8059d75e1245ff5618173"; + sha512 = "2f76402d2333572483ac9441faf070bf55f39bc22a7d995c6e6f06e7f478e54209b1b61fdea9a350f1466b508c35a5640a3db0c4f5f0451de14e535dbc4760e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ast/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "91d8801a2fffaadee3635643a813d588650b318d9e074ce3284f97795408a9d513ccdc573fb083e523959470095ffabb8023f250e7b3abf7f94853f126ff42d7"; + sha512 = "1b5c6de905494d0773a7089df87987435b70b5c734de77a6ec44ffb941709d0e8713c54de8293c0f84a77a96fc3b7ca11e9ad892c870236c24a86031e62e35e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/az/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "abdaf4dcaf3ed2813b389fb91adee89f796d30152374110bab10b6aa1b328a406cf9e572b2d41b5ad9827928f8d5249c9d6abaea5b0698ff2840f66ffb71b656"; + sha512 = "d1ed01e6854e3ab1f8e8f339e7d4c3bbe4941ccda88090e09a44eb8828a62e59749218072fa248358c073ab76e84b18d59cbb3cd39550834de9e8c91b81a8477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bg/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "807a7bbdfe7e556c4f8071ea8e148cd3cdf2cc32c6c00d91a0563ebbb378599debd0d3e0a5f96f75f4ef0bde552c5050c8e798f6d1bb65a37019aa0b1b61b55b"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "65a76933c06f7d8bb71ab24e28f6e755090f8eef8cb7ac741d37c8532d20aa35eb119dcc0f7e28a97dec34a3720b79f869f8adda079b49dd270227bdc081d1ae"; + sha512 = "fe499058210285f65d81397d182b7e37ede56e60ee21cc7e0680fba8c9dff58a0e8747d6c99e789cc2b7578bba62b5a04b83d1cd1f8e533213ee3ece4957acba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-BD/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "e6cb0cf7469a125da031b2e9bb4d2dfa90df169e6a61f03d482e44e9beb19744a038eb1922ac31812732d0e72419211894bd5029e16091741aaf45c00e72c14b"; + sha512 = "df14ba0acae51673edcee4e2da4ebcbde1f44e615a56777712b4bf1261c49a1007249b4b547d378906b64e4b97959b53285bd5d0c074fd3e0080537a5ef24c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "4018dd322a92660780cd4e9ef9c8631593c34717d2d1ccee1a340e34c8465ea7a5fb196f39292c3f502f7458bd4790971a443cd9c16f28e1112417c8eed35bed"; + sha512 = "5db62ceaf945411c01066e244fd08a95ac72134867619c488f54df05659e6e335af77c6a5341370cbcdfc7c9142a5654aa843b1a392a1531c10062052cf97c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/br/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "31f75272fa7a747031697505505f8362589f46986f840fc8325fb95c0009356d4fbeccd33e20e923c49df91d7af40c948ebdbf35e6d2d48b734055e33b1a19de"; + sha512 = "02d4f4a010cc1ec71d93c1b6236bf891b290bddfca87ce9502f12f530033b26b94a1ea993f591911cb48d52145f2351a34be8b63b67a74498f6a10ee7744cc75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bs/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "888c6b2e2d79071710d580da39e33dbfa4392b9995bdfbe16a7c4377f54e7b9c81cdd4864fdd05d2f376e1d6650dcfb5dc94fe67e3bbbca55471ce2f62cc4589"; + sha512 = "458d234394e79ffb87fa3181c6722c63eecf19af4e6c10eaba372f01f4209db60ee01d932fddb335f0f1dfd2781cb3e651e98ab4e69b71974316be78693d05e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ca/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "87971a8c4bcf96a67fc370778274e2c35356b6239db4104740c16b281a45d45b03e4c8627c14f1c6f3ac5702784134c743f07998f3db2b2a8d4a2e6cf9c0b97b"; + sha512 = "cb0e2dce6a8dc0c211a72bb4e868bc3d04c2baf19478ddb4af6f6adf6c97b7a0ac334017d7faca08d51185e3352140b13c818b2a64f1c74956dca8aaba1edda4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cak/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "047e10a19ac8fae5474820ae26429711efff76e84d9f58b0f4b8a36d7f5c45fad6c46402448c454c32b3466de3618e2b2a392bd186361466f7e87717fcda4108"; + sha512 = "984b28925fdf204b1d0dfb4080f503a520ae38288370ab2e36ac1f32e579b5fcfbce3106896a351472dad078de42656c566bdd56b32088b52fe4bc6ffbada247"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cs/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "7d7b4583e3c6c4e906cde2cea8cb7bda2ce4cd007640b3e681608651e6f414675b7039c1ff13678947d617607cef407382feefd44ec1fe1534b9abb0b1dd0d7e"; + sha512 = "18bfdd25f92324a7ca00183f47ec0c43eebf582ba4493a36b6b39b7f178974333df29a2238fec5974baeba271a3f83ff3f274ffc15488c24e89cc2d17766ef64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cy/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "768429d9772d8e39d4230fac01c4bc6fbe20c7c2efd326e78cdcdf74382e3a38bee9bda90a1d97b61035cb35b5be8f337fd80d15d4f185a6a668f68afd3b67af"; + sha512 = "1aad954d11eb33704782e1ae502d86fe9c428c9cd0d7dfad020e7510348443adcdc7db789fbcffe96691e68880da2dde1ee331d5f51503dc90b839f14aa44ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/da/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a6e435be5ac73d683ade3dc29bd6d5e0c4ebea30f8521036650981b510d4df014891f8eb65a5a6a39855fcf5e45d1b393617d7c16071812952c635725bf206ee"; + sha512 = "0dd9a02adc2aa39fe5ec4ebbd0b6cfa0968b0daf50b558d088f1f0680cb06a8baa526ebf96fe63babdd8dc85561910a5a6645ac11e02e641361491a2c9185738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/de/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7ea17df3c926546f1eb7ec0880f7b0b63cc8201044b444280b31d2646999ad36ac10ce74e19794ba7c1a026f860c79e83ce6ead339865fe31a021bccd85f04b9"; + sha512 = "a3f13abc0d8ccc445a495cd87cc690e5875c9c79aebdf6adb04f469483a5870d45fe7a61231bcb3ce07eb64c38ef04ff6e16e75c4852864a3ed1f385d3dfb79d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/dsb/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0e75929ba5879fbbc269d1fe8e18627ba54c5f74edd3179360998c9aefbf21d1f3c3cb0860990e7b1b0a5f5037ce9a4779c3edb64912f4f13c80501e579cfa3b"; + sha512 = "e5bcf46a200adfa34191063503dc5875bcad0cc298f9ccecee7a1346c15b22dad5aeffee2ab7d17b98bd3cd659544422c05ee9f79ff8a0702e592b7d1b8e5b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/el/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b682e47f225a270ab421b3642f7c28085d9f2f1de1e68867ba09e69fed3d9b5908909be46bfaac6e9d0d1243eaad3cfe2bbeeeae6a5b9696b0ffb901a98db50b"; + sha512 = "eefcc3ebb84bd75472ee0614d386a5bfe718a77b2fcb7e4296dae1131415e6541f3158b072314e8aaf46851ab718d0bef12339cdfcbf1ce4d1ae19004fc82153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-GB/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "aeac6a542c1a4f91ee6bf01d4c916f8da4628b36550d80a166dc46c5c9b1a010b5201c87613e4d59640bdf9d2f9d029d0112bf8b62c7707e99b928c4ec18babe"; + sha512 = "c03a785ece38365eb69893ff4346f468199ce8753329c781241bf6ed96f595696c0927285db41fb00a15cb548eb74c66696e3962560c5add5b0be7a29936c8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-US/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1315208cd55f48ee05fcfc98c92891307442dc0bb34bb636e14a88701a1fef2229a62a0e8eb00e8028f460518c95c1369a198666cf67c4b09a0e69c2b76c75b9"; + sha512 = "26d4b175dd8ce02cee25c2f8d6eea4e60ec3ebbf4858a185d38d3593f4397131fbb60208043f4c53affbd075299c69d5916b4ad55b910cbc8cc15952c78d9b2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-ZA/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "891b4a076239132976a4cc51a3a374fe244b6a9119f76303253d6ec9d62b8230ac9c04b657bc741b13ca291a9b75a7b38a4aa25471e4faa6f34f06000a7f2fb8"; + sha512 = "f99136eb3831a304ec84044cda5d5fdcdefd1a4814f6372c9edfbffb98d93b551d0cbc8fb45e8386f251eeb0f0a4aebcc12013267a901c2533bcca197ca6b5d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eo/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f805e9bb3d2241a366026354433670c2792c16c74ab2f5d3691081f682639b23c4e6d1e91e5e81719601c571e74270d8b5bc4f24e7babfc77ee435c6a2125ba2"; + sha512 = "3ede053c3018b41f113d64f5d5dc14ee1d2bf219e1d7b37ae7ae8b36aab349b1364331d7364850cf40f7913294119c85468a8441f524cfa6f18fbb55c4bb2644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-AR/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "df78b4626f41afaba10331cc8921dc8f196aa2c8669366ae286a75e8850a647e7288964a8a323c742926d7661aa122072dcad592654dead9f57b8c008b61f7e6"; + sha512 = "51736e77004f5c9cbe4f303f00ac6c32c9459e55a1cdcab958ece590ae8d575f119ded5bb013600f077fe388e3572d01f31a41f462defc5407d9bcb6da743fde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-CL/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "71a340f8b004f3907eb763bcd817338be19955ef447241a6a680381823591324df9b9771425255693b49513a8f4475fa1ed8558e5a510bcd370bd225469a5f69"; + sha512 = "9ea21d6a5b9d0eab81eafa1a5757aa566b806fd16a925609e46002ad126a633d2373fa8ef27db9388c3f6f4680dc76b946b5ad9f71afa8dc69382323cf1dae22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-ES/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a34dc5ceef8875bd5d15c61ed9ada2f62b52cbe42636675cfb6a3df694a0fcbbb3b0dd61c3a0ed5b18e7ec427dfbf58887b91a0ada596dca04b3d2cd066123a9"; + sha512 = "3d77e61ddb1738c24af8edfd8a2b9905732626ffb51d1c64b2a27c229121ec8df0e7ad61389ffc0c78ed545a6ce8ad9deb424f65c6d6fcad427753f9cee6f1fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-MX/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a178599eb6454eb9a463fea5704b49c720cd2f9df033bd6f271322c75a5f2f52e82661c82f9ff9097af28ba617e2393979b28209758df3710ecdf72d0304c5f9"; + sha512 = "155eae1468c3f4ad4a38e3ab135f79e352da4e96b1f1bd2a20771d9eca6e4ee89a0bf6db92c2a3aa4ea92df8fa41cc63f35d3b78c3f14fa4ccb4521d7fddf102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/et/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "20e3af6d1f7fb7f154e366ee5e031889f3f24e04691a3d2915f4405f33e7220dae91e6e635ae98451048c254b7a08900851f013e7979c013f84b643635ecfebd"; + sha512 = "08f8ff1dfc92fbf4d26eef4ed6b05caa6b911fc8a2ef1c655fd6a6216a5469e3086a514deed1b6722e6207a439feac717d3df851caa08f71a9796033b6292a90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eu/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d13833a0eeb5b4c37baf6d1f85adcb3502b67219aef6ac5b5d25914fae90cf78284830acba0e8d6c76d8ceef7fbe3332d673be125325b9bf53f24d4b070e6998"; + sha512 = "407844c56a06d6464446390d35cba2b0ef983084beecd03f4cb9ea93607e0571be882b4ebd35bb25c6f2fc4f65bc64321c1e6f522838c1dd68bab46ea9bee779"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fa/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fc4a1d2c1e635de2094a8fdf3b082c0407bb937f089ae33c0f429e0c0bb41a7c0cc3158fdd1d01e81cbd01213b452301e2ba83a9dce1810c8d7c8adb035ba903"; + sha512 = "f5c27b8987623ce46979083aeb2c7cbe0efb9e92c2df6909fefb54e78a25ac3792d78605fcbd50fcf71dca8d09b60c5e92dc4ffce22f3a24130a0e1e5fc13918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ff/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1e4626d053e7abf236fc795f59e7dfd8053048fa1d0d8f4585efe7ea872a99511f9053e9bd6a1ae1af22cb3ff399d16d33c1b45a7b3c6557bda49062d1c672cf"; + sha512 = "12367b1f896f88a06c3eb906a10a5b288fa6b3d689fb1a452ae93677e37ed89957499937025d50f29ed808b93c359bc9cffced49e013e95a588e2828a4bd3d65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fi/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "dd8ea8dea6f76f3c5dee63abdc187f69e949e0b6b11126d4219b38d1314ba6ac77cc789e0923fe9efb26167200187cb236a783f7aadde64f20798d44839236ef"; + sha512 = "40ccce97079cc5ca9a7db1ab2aba581c4e92d10c83748c654e48d922ca14d28632bec850d138b97c847e9325162bc34a20d4e672aab9b191aed7f5784dbdf814"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9124a3c541879fa6f886555c93b1e07f431eef0d0b864cf414d2bf5d3cd749e30c65db4fb85a16072260f656598066cb8957d667aebf07f9067646e11fa09ad1"; + sha512 = "5639d6800f4e8265bae4b3b49fac10312fceb04be944a51c11b37c33b49c4f418f0c2a6481ff0860652adfd7a0259612be93d784a802769465fb29cf02780c6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fy-NL/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "2ff6aed7c4b172b5dd801d180a7b7e945a4f39b8b8001e673bfb16b868a2079a2c741ea1a0b44c6588468546e883c6057fc4787eac64ca9b10860b7d538fd72f"; + sha512 = "f73acd20403e4cf38d365f9b49de1879a750f73ec2842a3ee91da657c5fdb6eaf0695540efdbf3e67cd72234cb9007c2620b3d146a5bee72e30453c9fc6264b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ga-IE/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "163994a889e92bc84999e0c827f7ed0d162b43b1046a0391a851bd826730ce1199fa54a0e5dd549b3f30e197a8535ac5b4e1cb99f7f7a8706f7ecdd5bc125cff"; + sha512 = "b588a3a9782621b33d9b43e252311e78bee1a49b290bbe055cb01b45eed1ecaa79c8cbe326a4a462a632a4452978a2978d6ac73f7d56d9b4b51aac479bcc5c0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gd/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "324c856b4f0505bf5481ee57a2549594739dcec8b2a57ff32156c724adc001dfaaa2202b0b66a30565061f4ad8719bebb382ac5961c960f4991e9ab6488f2195"; + sha512 = "ecc2d97c4713a3646a3c38ea5cc1245ca7a0bc690305bbe0ac3d9b09d903e27265cf87b73f1baf98b50547b321ae4ff984bcb4f9afc788efef9b17962c9ac28b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "1b055c927c318d09ade13b64e50cb6ed03e10676535c9171ff3867200e8c79bd175b08b89377a4ef86f92f91977cd8a6cbeb48ac8beaf6576707d14743299227"; + sha512 = "0715dd37ac757f9c70d41bdd0faa26cb6f45745ed17b9e627d51bfc040d9d637f236546cf1eae77c8cabad59f82bf2bf95758e5eb675dd9fb6813eb43214163c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gn/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "7ef12effe16f92e87d98c71cde4f3f7303674b124a41d174e57a9a4bbca0c6cd33cf8f39bbf72fc693355b5a054fc8c6ef15228751eef52a1599b280c9a17801"; + sha512 = "7617f00ec13a6a672b80fda28108e467124d0ee22b5e0dc366e2bc04d5be5eab91c9ec4edc275df7bc7ccf45197629fea909e945c633f58f88c8165ef2628b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gu-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6437e9fc0e171f48c335fc7c6b7ba327dd9419dcd293449ecabef1a6a6546dc70c38099abdd42e5f087290a256362170fec02ca53ee33e8883f4c654c9382e29"; + sha512 = "15e94de3500b185668ee87880667ebebeccb23bf69c324cd64c9a5f94e6ad1844861c773eb0a7b7479c169de63c8612845902c8c468ff670b37684b1d6059d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/he/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ed8e6b961458652c273e443a29f4640b230044ca03d6da22a374704c800bbf8df4f7e984e9d3ec936153263cf29ee066c4fb6578ffdecf9955b7f65f10c26828"; + sha512 = "86a94619d93861ad797bd9457a768f62472f980076d0d526a95e1caff52cbb0136abad76825e191003ec55611429f2b35bab9dcf4a1d62aa226db89261e234f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hi-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "091595a3b68c6951357f1a8e417a8ebed56c41fc1548c8aabe846980c4e3a769795fc0fc7e4cb1af47be2f4bf77b691269018d8ac2052f5acc5111b752fbafb0"; + sha512 = "639469d7c987b366a5be59b45058f8aaa2e5322e0534a4784c19f434d48ba5cc7e6d2da824de48d49e09a56085521e16680e1cc29261c97cf18cd4dcdfc79c27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4dd4646bedeffd0219e1577e61f4e17f5c2b67b78cd8f8001d033dd7d4f906d0ac8d3e6d5500fa8a4aa049be0f7aeed967909d6cfa13b97fd1b9f93ac7d7b687"; + sha512 = "8c4021a8591de29704240d152bfe3283901b405e8b4296196eda3f0b9591b33fe8c08871c3248afa82c3967c7d025896d584478d1ec3b761ec5f97cff498e098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hsb/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8cc10487146e89e1728529271b6a9e3e6ce6260d495ad0a013c5489da06425ff9adb88bb521ce8bb90c0ac5e21ba126147d23cefe716b2708bf084d39d70c800"; + sha512 = "7316554b2d0d3b1cd559057374b67e9cf805bc827a40652e70d00bbddbc892f68c7e65fff08af2d4742115df124185c3e3ca862901a85ef56ccd658f799ac757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hu/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5c15c474ce885c88d863f1f22e73d300e0defeaf61009b939ea6c2e62f16a6fb3693a3dafdf264e83c618263153d3dd81bfcacbe5c9f701a28530d17b38d8189"; + sha512 = "1365f7b1e55eed2fb7d579fb2d9a2efb57d93a4e78051d57980e7b1bf3213b2f577eef6c0f1c53dcb47a7af92ea0b0ba9558e25e84c72e0f32e573c393dc8d4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hy-AM/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "fdd30dbeeb08a07822de29eb0e6ccb9df895675546054c75b4bfb0cf1f427488cfad9e2a1f541894cf366ddd1bb03e8eb4a75c318a1f80b2cc967a5b4ded8b39"; + sha512 = "14e0a798b4fd9af769a464ff8c2fc87ea69116f7ec66326cb623f4fbdcf4c99f285bb8e65492e9b65cbb86dcf66a52669bd81df37ed00359546072a3709f20f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/id/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "54734428db8860a7ae9c1543c341a5dd53f6e966f290a176e69f4fa66c2a4bcdd25075c5ec5f311adc033abb85e525b2b7426e113743632ebed07abaf31dba4c"; + sha512 = "dc15d01a33d3fbd10f26bb9a1758df13f53aeb9f6b0a62abfe8bca1e7a3e233aa0a06981d04085e79e91c629a1cb51510bdb744ff34a6522f374444c9bbb84ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/is/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6ee38f9506403f3cb57c6b7f971c599ea1a2e77cbd5424bae209390a20b322f0b527ea4a0be93bac8976cadb5080d22e262d6797b4e9257aec232e768909c235"; + sha512 = "13761e766b5fede7eb123f304bca45bc3a7cf5ffa4661e2a961ece5653c2986a61aee742cca3dc0cdc8bef54b38a66b08e9a45223e42cce9c0a99a857d6bf45b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/it/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "71a1d593554466db36e09aed429d07ac9ed563af33959c899319e96e7d757e8dfe912a8d18b52cc198a0c4a1c45226406bb56996bc199b67f79c6a3aaea7f6b9"; + sha512 = "23dc06fc36ef32c148990692ea5bc5266f1ae61aab4a3853034f85f3debee5ea5a5a71d741ffa29136db54d63857edeeca75805f9c7f75c278f06a6c930ac248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ja/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7d38e749f69ee99bcb546291b09a0a2b51b969bd4fcea50dc4f386cb951ab8a025c2ae8746c9e1d6398024d7904b63497421fc16f4f061babd0efafd17ea52af"; + sha512 = "f33b38709a7c4701debf19a901e36302b364c911405d96f952c0510fbf95fc4e24869a34e3a336718a0e0f26b5c7fc88fd1a3955c329a352bc1077b73cede937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ka/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "813069de2be9e1b299bbead6e2078d86d3a382bf6d502c5f96a9c10c9571f4dc79127b450760d994e8fe41b3afd966fc70cea60e798432c7b8aa900d3d715bb6"; + sha512 = "7b684624e52e189ccfd31d6d910b18148f9040eddfe0518710388dbc1160c2ac068f0de39faa42eccfba7823372290f932d3693ad898a0c7ce20f6368e696f1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kab/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "e1c562cf189a60b15c94fdd681007b4a64fe3e275900c3c78d492854fa28eb61ff30ab65ce7d3537170f28d51ad543e1b306b94d1ef6280b0b03b466fae9edf3"; + sha512 = "9a9f8ec3cb7b86866dfca4a4f5ac25e13135896144af816ed2242091fa8719535a7d2c225be6650cdbe17a9bdc7bd2bdb962e40abd16428702c2570cd06a798f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "be54a4085ecccf9d2dbb8894872d73d3d261a8a75c755fbb91ac4c1d8bd3ab696b95a25c87f0d509ab250b53470b20aad3255d128296928c591d45b2786c1cf3"; + sha512 = "c7aa9195a8bf39d65deeb4233139c6941433a7bef77797532fa346b509cf91c8e2041a24569996f7a5e7d2fb0e4a108bb40337cf1283195b257a5526d89b3bf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/km/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "6369eb361d1ee31d33b9780072c1c49926fc4314168e5883ca71cf864765d7758d51db55f5ccda231e24ed4b65d2665b5fde7a3fcb1524a04e7057490e8b2308"; + sha512 = "45a5dbd1ecbfbc69a4ff99327a234e9b26f06b9e280cdb2e0689b4378a84eefc4fe3a511bf8b111db873ccf39f7b99c1d256218accf190975d53ed574d565747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kn/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "671165858cedd7f4ba9173cabe9532f08de780c967f6af085e73e3ac97f156b39000b3b672bb690cc40691d3b9b6b9d20c08883a1f2a1da689a71093096642a1"; + sha512 = "75574a88816ff42e8f20555a55f41bacb9d33d2535843b38d3079d0487bd1190b392e07e7d97f288c51f38c053bbbacc7acb34a835a7ae39814d6ff2ebfb1510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ko/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "04cd3b277dc483cddcf6fbb79687b3ec170d33b0eee46717d645358df0f224c86f36723442e4d28e4460e663b3357f3d3c7a7aa1ec594013a8d91d030e08313a"; + sha512 = "2bbe4f990e2265e1d210c52987759486e6127a875ee55707bdd8fbceb44943215c28faa5f6c06161db7b7f18c2c2c3864882ffcc1eda286edc59aec7e33aca0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lij/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e62b1481001d5d63b65e07b527dbfc29b435f659db7237b411105711a601d9117d62f71dd93849b5ebb8dd0dd4e5981ffe9f318aff2e74485580471f672d5b6c"; + sha512 = "9c3580a05057f7e04f6efbf60b281c50b64970064dac547cf6a84ed305c8dab5d014f96719e70c87e67124f61afa3e1a44ecc3627fd6a3181e3dbfc28ed175c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lt/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f7cb9819f955f7b32439a7ffaf0cb57351bc25be579646d00f945f04152f64c9174bb49c99ec49b2d5c053634c73872a5b4a9615fd66744d0b5c650c9bbc67d9"; + sha512 = "37b30fdf603cd41617db37cc9ba7e546c58a6bb58833b461fdced4caaf128bbc1a36ed774370548b8249da884302bfedf52681af61348313c5599628576e9c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lv/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e7cfab908f9ea12c77ff0a76d2283e205c9b3751eb16a5dc06171e2cc3315193c6010faca943341e1a6496b48b3d90520308c53d85677cc18014fb8560f7714a"; + sha512 = "7d075198482100a338105bb80d2d40d97d24460f2a6b15b72b349d249ebb638112e69bcecbf32578375d5621f3a46e6267401629d2fbe1ab6dc5d72dba454086"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mai/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "6088910c06e1310097d09c6bd582e20928de56fddec03d7338faa9b9651900919315c15cffc601a0e4878ef7c8821d40d5e4d7e6998786b1cd50f21ca0e2dfc6"; + sha512 = "7e052470a133931183439deba29a16097ad50383b63f97d5a1c03b7a3ce0c6485811c1afa2ea78bf9f03def2b0678bb43acefb2c1b944d8c12ee18e44b5d520c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d4ab8618c7945843cd0c9234ffa68dc61adfc3759a99bd174f66456038614497e3b389b0af452b3958c12e9b2755ddbed33e098c9e4c07110daf0bc5c4b874cb"; + sha512 = "ef6b8ad5fdeb7300c9676a2232accca1cac1b47896987455ec93ae8b8cf46dc092e224b417f922bc4cc0c41ce941d607c4c3fde6e305e274750af72b8c405389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ml/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "05d3de5e0565316ccad5ad407299f6c31071d48edf1ec44492e61b8764040f22a6b23230b74f256554f313575084c9d79504d3ef85451c9f73c12edd663c57a4"; + sha512 = "79dd88442e22ec9b98d432985deafc68b6b5c3dcadf6fa0a04292b019b3245c24b2fd08784d4c4d804c3b913bdf379753df4ba24ec69cdfcf9fdd659c8a18e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1ba2e3529f379c8e77941ce42a0100cef1f2daab31d8b1a0b23bed898ce0bdc4cb3a873aae71c1c3f5789f35edf7ffd88e11902154a3aa4f3117ba1ba782b0c6"; + sha512 = "d474b05fc960f2c12319bbf994027945ed655bb8b6e766e1ba04f9c863e4d5b6d1ab8d632e0051d1191bbaab87e4793e8c1240372b9b0e0f170da03856c5d8d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ms/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "7fe116ab0d79e7de3faeeebcdaedebbfba94ce6320b563ad79de7f3d5459cc113a1f10b6b2fb3c3b074d4a027f0cff9106e078c2945a62e5f3b828459c1e8d83"; + sha512 = "c5372584abf3c3ccf858c50927d26099504efa43feecf487639ab7a73e87da6137e29f31a440d7b6eae43092701e68c02325a39207f95c73fa2db303c3b402d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nb-NO/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2"; + locale = "my"; + arch = "linux-i686"; + sha512 = "e5374a80b05eab9dd8b4a279ac96edc52930ee730a9108f76a022e3908f5d81c3e5db9ffedcad492edee532c2606982a6c76733a971cb5d8f64ce68d04b113ea"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9625821a4ce710ba5f1b5f7416086d4e33c67037e40dc0ad9a5d57049b4fd5bef9fd1b1c4c02cf6910465c641242a5ab9e596c962f5f4ace66b07cf4f0f85405"; + sha512 = "5077c2c497fda39bca53fd140241fd9bd3cde4f4e1ce3e7fbb101fed4a24d61df81d99db40453d4745750e24499382afd83e78cb67e82bbbf91158505472472f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "5ff420c38ec644f622aed733c599a505498bde48f2a573492d647745d7f7c5cee44b009eaccb8de458af813260bd19f9baa7f9f1e2dd946cde48f09510a885cf"; + sha512 = "9eb8e46b9ea30e2865a009beed1c4c515830b1acddf79c2a0c035e8005dc646f2ec1d011474cfe53c07f3bbc73071765e7a88aaf0ce24378b1501cf5f246b106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nn-NO/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "12ccce434da504753b38449959c97952767fa5af7aa2b0f58777f8775e4dac94d55d67e8d575f68e55e084bc65cdae101ad92b4654bcf345782bbe914d01f655"; + sha512 = "afe2b9c41cdd692b9166ddfecdb78ab94a3bb91d60b91e3e79a203a1f928a92d40eaf7889ceef19427dda1464155f85d0e166e98bd9eace6b071d3b30f954071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/or/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3b456b222d39b5a69761da7cd33504fc64ee76d5d8e6e4ca26be158f562bad27a3322604a6542195aed1181f578a650b05200b1ba75d5d8a05e400014bf25660"; + sha512 = "5eb2662445fa000b626e5f4a0195a44d8e00c630e09fe386eb7d77fb514b2ea939c07c23f299ae050260c06e6e68abda8e32a2ca8c5155e5f1d5e223add04e48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pa-IN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "3472c5eb75dd40b68995bfed8542546a9f35e04ca8a7fe17465a99a94846ea696d1cfedcca2d59a47082de6d2261f1701950be3295f063e69846cc90d531f5e0"; + sha512 = "7e6ab9ace1aff3de1209992336567da167a3d6681af81354b05e36012545df1ff06e1a825668de7146e843a56c4e3a110ea530351ed83b129f9989d24bf86a2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "0a883e16dc997c748a6d76e32455473ffea6612dcb88446f331e43f9d247f01ae93e49827b1e222a2990e54e201c58aed2150e800080fa47b222daaa69154bd9"; + sha512 = "fbddea93b51eb530f26de74d16a1d373ca9b86a8fc89b7f12c8ee4e2f3c3af8be22560ec11ee4afc7d93c305eb8f352931a06b2e7dcc11eb1e9ec755a2afc2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-BR/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "34e6870557e30a75838bcac1e268796f670b8f5dc4e49cdbcc6e34cab5f8c3e4996cc73149d13a5178ebadd1f052ac5c2eaecbaaf0d3f4245080e71f8b86c856"; + sha512 = "6ae90c6b37258ef9e9b93fdad261c7b2522ee3b251c36f03dc6bf964d91da86a05937b0a65c75bb3531b7c10be6d5ada3a88b2240dbcf1c64c5b3f624acedcb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-PT/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "932291baa2091d12d9832483d14a6e05568fa8d1d1c41f42d066c5efc13d7e511afcb953945334b9e7a573776bd2263c9e38a64f73cb44f4f8a32509e5fe5119"; + sha512 = "0f1d035f72a3f0739f843e97e1ab27c3b5b5901e88eb8adb9d8b343f6b5f571133fb8e9f40b3df14e4d7e1144aa7f1af86e7100df5786602185e4ebe425c8f97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/rm/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7258b1c4a865d593e820220f5b48bfd1a8b9c4a7bdeac9b15208f5060ca501e03b72914b2b53b65164d2db606b092252f0abd6fd83f781ef0f330d4bb487dbb5"; + sha512 = "7ec0f5792e812fb2d57d420ecdca006f5242f6c3599b58da01e3ee65df896d1853fb61ae0413ff59834a669690ab40b74244a31be5033ca215bbe784a7a8cb3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ro/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5fedc4a3dee59bcd804eee04ba07ee4b862e6ea8198d1a5c3383cf36667e2f15ef728f21138868b84c15f59c7b11760fb5fe293e8545840d1e5c98945f404eb7"; + sha512 = "653e8942d04dc440d998229ad8a10ec8a1098ef85331abd8e1676c05398dd4b514f5fbdfd15c1b20ab0fa83216d7ad0b0e4d20b6555aab9a02f7fdf139d11e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ru/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8e6a4f786d5db808ac5c63d4abbe4a53b941845a48fe2fb8dfbefb46e01e1053d591aa8bda63ee83785ef3cdc481593c86c804e4683455a2e27fe594b96a650b"; + sha512 = "66c45ddea853348cf0084fb64710ce0b077dc6521767a27a83eadfc237becf05e26335d85fd1701ba4790e80a2f5f971986c1a3847cc84efa2aaa8623d0b3556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/si/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "39c0c3487242a54287af42c9457ebe8882112954dec168630b8914896e3900e9799691bb88147927328c4c5f4b2078bf68e623e09ca2f62a4b7efb4e625bb283"; + sha512 = "69bc89b863e9a4ffde9ff478331a88b93a42a2cc5d51114acc995189c63301144093b4cd156864e6094940d64285797f83ef920b3231a427a149c5f6dac37dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "e87215632b5f0264a04fefd631def717c3f6bdfe31817dbe855d7c6195b4f340af043bf613fa9f89ca4af4893cc6effb876eb51555a089880970315f7ad15e2f"; + sha512 = "6b36b64b3edd9a16ba7051727a8ef326473859a07006159cd2b8a6fff25b0cd9649511dad03e5286e384ed74fca4b80d257cb0e754ee4ecd6eaa7c589478a5b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sl/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7cb036e5926b2ce9a03b27f37359b640f824f32a918ad8e9959683114755949ad7d2069f02e0206c2d67633ec9763ea612ec3e3e44dc5e881d4e275d1767cf30"; + sha512 = "19a6c7c7d7f8cc2a2f03bbb23f28c4691152ffda292399b6e438dbc3afe89dee98be86ea4d7f27d9d4f736e68a6ff21db1cbb746bcbcb9cd6ba9d7e23155cc21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/son/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e74ea45d6b5dab67229472ab524abc805c5e1c91b7ba627d95f0fb5eb1310aacfcd73a4a5fbfe8d7d5546aba9d254297494b34efe81aecc7e261cce23b9e0de1"; + sha512 = "df598c9156ba76218f4f0d87ff301a3220979abb3a4f5af19d0545b6a3ad48719a8267da22a31f646e6d20ad1f6f090579c9587e949be91559aa58455502a156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sq/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "8321933b4eec21e9297e446d62f63b4a7c69eef3952d99aa32828b76776c34efc9cc174ded4637c586a383558eebd2ce43a63dcb7608ea0a2568c03fa363e0aa"; + sha512 = "e8d53fa58ce1d34d22c7460c9b9d9111233047148e503e5a628d8d8e1c689b2c4a302048931dab44ee33ba2c4831362d3e74c294e907f1c5eee23d464007343d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a81dcf72785936754c04fe2e549795f612af671e360a653860dec811a65ad8e19cb6cba5fb205ee5925f364e49a358d459c354e26b23746a2e5deba41374115a"; + sha512 = "5d3e8d3741ee0ab535479ded3035379858ba092a8cebbd5ac8bcc525e88159594f5cef90894bb0fdc5eb9c349c435913b89a030ebf942054110d37e57bcc50cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sv-SE/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1835da3f930b9daa37dc14785feb0d145aa9640278a4119b2a8f6168bb5bb385187914a625fcf3d88c3822ea62f338c2376c08831a2c4d8203a4b6c0bacb2d7a"; + sha512 = "98da270b0da5091cff599cfdc9a0d241ab8463c1c9e2771f81e8c0dd7ecf567e2cf4ea536b81cfd6b1679e449d7f1d4157b8927f1b1b0a03f3cb7dbfbd267d65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ta/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0a7f219eece161bb3ae9ef280457e94470d1929770123a9197c08eb320ca2119aac66cd7fc5181e4c0c1359514d0338d306db1322435abea70538f9c55d5d7a2"; + sha512 = "63287a39d325111c7e18b62a9b76cf0e7564709846cad78a946852fce761475edc61e292e31491821215b0cd2f392e8c41b7ecf0ba78ac3440cdd4f7f9b52d21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/te/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "10a412a83c75b8a7d4adc800c858d9f0adbbf7b2c08cf8a3d5dc494ecf38cf8a83cd3a462eda7eabdec73e194264b698f40a705458fb0916829b783c511fd3aa"; + sha512 = "476840816b36816b967f86c9796f6df4afdb3d7524f4268cd867393eac83ff868645eb14ed5766aec87ba3c226e593099e15d44aa63a01bf422a12a4bb5c77ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/th/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d5bd9c86174be82336f711d50dc75e6f252a468083354c0a1dff99f4c72469a1a789144ffab2beba65d3e43a2e8812955176f426b560bb000607bb683eed81ac"; + sha512 = "b5dd1a09db20a788261a2f6812a6b35be7164d14cce7c700af51dc1cb187801c2ecc0d0b035386ec4340af25c8cf651f9dd4c679bd61b335866fd2d7a531f7ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/tr/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7ec4d2419a1afd9b23351ed896c92ba7812f4aac083e72242d21e0608c32dd5ac157c8d08a89991fd051f6fa0cc56507739b49cc94731a4aa83219d9c76cfc85"; + sha512 = "08a002ec452956730d02985e74c9c1c615783d19fde6c1ee3da3adaeb1ea021c05c865e72d8dd7c930f9351ee376cd42b20fb90916d276344e7b2d17eda6f458"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uk/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "eaebff23162685126416f9974ca6d4d20a8dfa320818c76716e695c6d9984e4591620185fc5bb4ea97c2ab0d042864525f9704d7c3e0fd222db3eb60fbbc63cd"; + sha512 = "7c75010a3a15f2208774f3e92317dd88c2a821c468a84a5855e4db193c5fa6d639d4b6969d3ef72bbc90c47212854abd0002295f163b06998285d439f50ccde4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uz/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2"; + locale = "ur"; + arch = "linux-i686"; + sha512 = "2d94f170a3eb66ef776c0c78c53d16716aef47218122bd5a9c7910fc6f821a5ae54192cee0314c48c7d6c5336f442532594c31e4e0821cb427f617590b8b7ae7"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "5cc21748974536c0f2e73dbd486e2bba1e5d44b4c198d94a6a4d8c3c0be925e89264a7201031903e1c4a41e4bd2c9fb558117ace9acb8f52051224c35b3558ec"; + sha512 = "21880c1a14e339e7b716f742c2910451662712a3870605db9eac00729b6cf9c2043cc49035c86044af8512239fbf05ea51ef476aebd234a7fa9317cefbd43a29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/vi/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "42ad1640ffd4c1f35addf69156992f87e1cf5925c8e5d5a1ee49a34835d28117918d3c7cc7087e258726f83e16e3e8fae14f6b8530d308b29606105c8a2f337d"; + sha512 = "5efca9a9fac37440d41c444497ecb2a5eb56b47881b46c66cf65b3b78353fd8a18d37c93d83400be1207193c7dc3a901402d679c50ebe55ddb93687439d4874e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/xh/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "14f18ee698bf639d4e51c13f58257af6a4a87e912e14dce51b2052351005f66df501e5b28408079d6d6221e2419da55675d298859c65b6c40b94108a7406f5c2"; + sha512 = "03927d0b8bf3c261fd00a043d8499e3686c7abc51eedac63f049d100095da2b858a2cea582c8aa2e3f65e1269b7094559709c22fd633a0cda29c6b21f3987eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-CN/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "66ee019ea1694d8e16e16a39799fa0bf1b6fca66a39ed5435865c7d3fd9ebd93496d20c37d750a1e70006e11672ae1a603ea81781146a10086604dbe39c3f2d4"; + sha512 = "75a77fff929aa72700b9af9452e2d0fa93f21136cd7651a32970fec24332d3c9a7afd58a823e3dffe1aa63ca49057c62ba5ce579021a783a096733c23c71bbfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-TW/firefox-51.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2575b4111e6061f941237392f23254eabbe7bf7c29a5113fcd61780238fb22f5b9d8ca9df0243f29d40b69f65ab5fa59d8ed83fdaff96ebab0b0e648f9adc0ad"; + sha512 = "d83bb672b5587b6fc8e2c4028f144821282b1596ca88f1aa889f4a2601d46fac44c7302d30f23179db6540e84e878244c4291dceadb56045f3edbdd41bc42a19"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 01cd7a1df380..f59cb402720d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, config, makeWrapper +{ stdenv, fetchurl, config, wrapGAppsHook , alsaLib , atk , cairo @@ -37,7 +37,8 @@ , libheimdal , libpulseaudio , systemd -, generated ? import ./sources.nix +, channel +, generated , writeScript , xidel , coreutils @@ -68,7 +69,7 @@ let source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; - name = "firefox-bin-unwrapped-${version}"; + name = "firefox-${channel}-bin-unwrapped-${version}"; in @@ -77,11 +78,12 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha512; }; - phases = "unpackPhase installPhase"; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib + alsaLib.dev atk cairo curl @@ -123,11 +125,19 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ makeWrapper gtk3 defaultIconTheme ]; + inherit gtk3; + + buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; + dontStrip = true; + dontPatchELF = true; + + patchPhase = '' + sed -i -e '/^pref("app.update.channel",/d' defaults/pref/channel-prefs.js + echo 'pref("app.update.channel", "non-existing-channel")' >> defaults/pref/channel-prefs.js + ''; installPhase = '' @@ -154,27 +164,16 @@ stdenv.mkDerivation { # wrapFirefox expects "$out/lib" instead of "$out/usr/lib" ln -s "$out/usr/lib" "$out/lib" - # Create a desktop item. - mkdir -p $out/share/applications - cat > $out/share/applications/firefox.desktop < loopSupport; # can't be disabled on firefox :( + +let + flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; +in + +stdenv.mkDerivation (rec { + name = "${pname}-unwrapped-${version}"; + + inherit src patches meta; + + buildInputs = [ + gtk2 perl zip libIDL libjpeg zlib bzip2 + dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + nspr libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto + xorg.libXext xorg.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx /* cairo */ + icu libpng jemalloc + ] + ++ lib.optionals (!isTorBrowserLike) [ nss ] + + ++ lib.optional alsaSupport alsaLib + ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed + ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] + ++ lib.optional gtk3Support gtk3; + + nativeBuildInputs = + [ autoconf213 which gnused pkgconfig perl python cargo rustc ] + ++ lib.optional gtk3Support wrapGAppsHook; + + preConfigure = '' + # remove distributed configuration files + rm -f configure + rm -f js/src/configure + rm -f .mozconfig* + + # this will run autoconf213 + make -f client.mk configure-files + + configureScript="$(realpath ./configure)" + cd obj-* + '' + lib.optionalString googleAPISupport '' + # Google API key used by Chromium and Firefox. + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga + ''; + + configureFlags = [ + "--enable-application=browser" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-libevent" + "--with-system-libvpx" + "--with-system-png" # needs APNG support + "--with-system-icu" + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + #"--enable-system-cairo" + "--enable-startup-notification" + #"--enable-content-sandbox" # TODO: probably enable after 54 + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-updater" + "--enable-jemalloc" + "--disable-maintenance-service" + "--disable-gconf" + "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" + ] + + # TorBrowser patches these + ++ lib.optionals (!isTorBrowserLike) [ + "--with-system-nss" + "--with-system-nspr" + ] + + # and wants these + ++ lib.optionals isTorBrowserLike [ + "--with-tor-browser-version=${version}" + "--enable-signmar" + "--enable-verify-mar" + + # We opt out of TorBrowser's nspr because that patch is useless on + # anything but Windows and produces zero fingerprinting + # possibilities on other platforms. + # Lets save some space instead. + "--with-system-nspr" + ] + + ++ flag alsaSupport "alsa" + ++ flag pulseaudioSupport "pulseaudio" + ++ flag ffmpegSupport "ffmpeg" + ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" + ++ flag webrtcSupport "webrtc" + ++ lib.optionals isTorBrowserLike + (flag loopSupport "loop") + ++ flag geolocationSupport "mozril-geoloc" + ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga" + ++ flag crashreporterSupport "crashreporter" + ++ flag safeBrowsingSupport "safe-browsing" + ++ lib.optional drmSupport "--enable-eme=widevine" + + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" + "--enable-strip" ]) + ++ lib.optional enableOfficialBranding "--enable-official-branding"; + + enableParallelBuilding = true; + + preInstall = '' + # The following is needed for startup cache creation on grsecurity kernels. + paxmark m dist/bin/xpcshell + ''; + + postInstall = '' + # For grsecurity kernels + paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container} + + # Remove SDK cruft. FIXME: move to a separate output? + rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* + + # Needed to find Mozilla runtime + gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped") + ''; + + postFixup = '' + # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. + patchelf --set-rpath "${lib.getLib libnotify + }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \ + "$out"/lib/firefox-*/libxul.so + ''; + + doInstallCheck = true; + installCheckPhase = '' + # Some basic testing + "$out/bin/firefox" --version + ''; + + passthru = { + browserName = "firefox"; + inherit version updateScript; + isFirefox3Like = true; + inherit isTorBrowserLike; + gtk = gtk2; + inherit nspr; + inherit ffmpegSupport; + } // lib.optionalAttrs gtk3Support { inherit gtk3; }; + +} // overrides) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix deleted file mode 100644 index 68e3bf1b2022..000000000000 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio -, autoconf213, which -, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl -, enableGTK3 ? false -, debugBuild ? false -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.cc ? libc && stdenv.cc.libc != null; - -let - -common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { - name = "${pname}-unwrapped-${version}"; - - src = fetchurl { - url = - let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2"; - in "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}"; - inherit sha512; - }; - - buildInputs = - [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xorg.libXi - xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - alsaLib nspr nss libnotify xorg.pixman yasm mesa - xorg.libXScrnSaver xorg.scrnsaverproto - xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx /* cairo */ - icu libpng jemalloc - libpulseaudio # only headers are needed - ] - ++ lib.optional enableGTK3 gtk3 - ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ]; - - nativeBuildInputs = [ autoconf213 which gnused ]; - - configureFlags = - [ "--enable-application=browser" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-libvpx" - "--with-system-png" # needs APNG support - "--with-system-icu" - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - #"--enable-system-cairo" - "--enable-startup-notification" - "--enable-content-sandbox" # available since 26.0, but not much info available - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-updater" - "--enable-jemalloc" - "--disable-gconf" - "--enable-default-toolkit=cairo-gtk2" - "--with-google-api-keyfile=ga" - ] - ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] - else [ "--disable-debug" "--enable-release" - "--enable-optimize" - "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; - - enableParallelBuilding = true; - - preConfigure = - '' - configureScript="$(realpath ./configure)" - mkdir ../objdir - cd ../objdir - - # Google API key used by Chromium and Firefox. - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys. - echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga - ''; - - preInstall = - '' - # The following is needed for startup cache creation on grsecurity kernels. - paxmark m ../objdir/dist/bin/xpcshell - ''; - - postInstall = - '' - # For grsecurity kernels - paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container} - - # Remove SDK cruft. FIXME: move to a separate output? - rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* - '' + lib.optionalString enableGTK3 - # argv[0] must point to firefox itself - '' - wrapProgram "$out/bin/firefox" \ - --argv0 "$out/bin/.firefox-wrapped" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \ - --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" - '' + - # some basic testing - '' - "$out/bin/firefox" --version - ''; - - postFixup = - # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. - '' - patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \ - "$out"/lib/firefox-*/libxul.so - ''; - - meta = { - description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with lib.maintainers; [ eelco ]; - platforms = lib.platforms.linux; - }; - - passthru = { - inherit nspr version updateScript; - gtk = gtk2; - isFirefox3Like = true; - browserName = "firefox"; - ffmpegSupport = lib.versionAtLeast version "46.0"; - }; -}; - -in { - - firefox-unwrapped = common { - pname = "firefox"; - version = "52.0"; - sha512 = "bffe5fd9eee240f252bf8a882c46f04551d21f6f58b8da68779cd106ed012ea77ee16bc287c847f8a7b959203c79f1b1d3f50151111f9610e1ca7a57c7b811f7"; - updateScript = import ./update.nix { - attrPath = "firefox-unwrapped"; - inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; - }; - }; - - firefox-esr-unwrapped = common { - pname = "firefox-esr"; - version = "52.0esr"; - sha512 = "7e191c37af98163131cbba4dcc820a4edc0913d81c3b2493d9aad0a2886e7aed41a990fa5281ccfb08566ecfdfd7df7353063a01ad92d2ec6e1ce19d277b6e67"; - updateScript = import ./update.nix { - attrPath = "firefox-esr-unwrapped"; - versionSuffix = "esr"; - inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; - }; - }; - -} diff --git a/pkgs/applications/networking/browsers/firefox/fix-debug.patch b/pkgs/applications/networking/browsers/firefox/fix-debug.patch new file mode 100644 index 000000000000..ba92bbc47403 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/fix-debug.patch @@ -0,0 +1,77 @@ + +# HG changeset patch +# User Michelangelo De Simone +# Date 1479198095 28800 +# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a +# Parent 687eac6845a77d2cac5505da9c8912885c2a9e57 +Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau + +MozReview-Commit-ID: IEHesdoU4Sz + +diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in +--- a/b2g/installer/package-manifest.in ++++ b/b2g/installer/package-manifest.in +@@ -570,17 +570,17 @@ + @RESPATH@/components/InputMethod.manifest + #ifdef MOZ_B2G + @RESPATH@/components/inputmethod.xpt + #endif + + @RESPATH@/components/SystemUpdate.manifest + @RESPATH@/components/SystemUpdateManager.js + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJSMaplike.js + #endif + + ; Modules + @RESPATH@/modules/* + +diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in +--- a/browser/installer/package-manifest.in ++++ b/browser/installer/package-manifest.in +@@ -554,17 +554,17 @@ + @RESPATH@/components/PresentationControlService.js + @RESPATH@/components/PresentationDataChannelSessionTransport.js + @RESPATH@/components/PresentationDataChannelSessionTransport.manifest + + ; InputMethod API + @RESPATH@/components/MozKeyboard.js + @RESPATH@/components/InputMethod.manifest + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJSMaplike.js + #endif + + ; [Extensions] + @RESPATH@/components/extensions-toolkit.manifest + @RESPATH@/browser/components/extensions-browser.manifest +diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in +--- a/mobile/android/installer/package-manifest.in ++++ b/mobile/android/installer/package-manifest.in +@@ -381,17 +381,17 @@ + + @BINPATH@/components/CaptivePortalDetectComponents.manifest + @BINPATH@/components/captivedetect.js + + #ifdef MOZ_WEBSPEECH + @BINPATH@/components/dom_webspeechsynth.xpt + #endif + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @BINPATH@/components/TestInterfaceJS.js + @BINPATH@/components/TestInterfaceJS.manifest + @BINPATH@/components/TestInterfaceJSMaplike.js + #endif + + @BINPATH@/components/nsAsyncShutdown.manifest + @BINPATH@/components/nsAsyncShutdown.js + + diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix new file mode 100644 index 000000000000..11d9324c0424 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -0,0 +1,103 @@ +{ lib, callPackage, fetchurl, fetchFromGitHub }: + +let common = opts: callPackage (import ./common.nix opts); in + +rec { + + firefox = common rec { + pname = "firefox"; + version = "54.0.1"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2"; + }; + + meta = { + description = "A web browser built from Firefox source tree"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = with lib.maintainers; [ eelco ]; + platforms = lib.platforms.linux; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-unwrapped"; + }; + } {}; + + firefox-esr = common rec { + pname = "firefox-esr"; + version = "52.2.1esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3"; + }; + + meta = firefox.meta // { + description = "A web browser built from Firefox Extended Support Release source tree"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-unwrapped"; + versionSuffix = "esr"; + }; + } {}; + + tor-browser = common rec { + pname = "tor-browser"; + version = "6.5.2"; + isTorBrowserLike = true; + + # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb + src = fetchFromGitHub { + owner = "SLNOS"; + repo = "tor-browser"; + rev = "tor-browser-45.8.0esr-6.5-2"; + sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j"; + }; + + overrides = { + unpackPhase = '' + # fetchFromGitHub produces ro sources, root dir gets a name that + # is too long for shebangs. fixing + cp -a $src . + mv *-src tor-browser + chmod -R +w tor-browser + cd tor-browser + + # set times for xpi archives + find . -exec touch -d'2010-01-01 00:00' {} \; + ''; + }; + + meta = { + description = "A web browser built from TorBrowser source tree"; + longDescription = '' + This is a version of TorBrowser with bundle-related patches + reverted. + + I.e. it's a variant of Firefox with less fingerprinting and + some isolation features you can't get with any extensions. + + Or, alternatively, a variant of TorBrowser that works like any + other UNIX program and doesn't expect you to run it from a + bundle. + + It will use your default Firefox profile if you're not careful + even! Be careful! + + It will clash with firefox binary if you install both. But its + not a problem since you should run browsers in separate + users/VMs anyway. + + Create new profile by starting it as + + $ firefox -ProfileManager + + and then configure it to use your tor instance. + ''; + homepage = https://www.torproject.org/projects/torbrowser.html; + platforms = lib.platforms.linux; + }; + } { + ffmpegSupport = false; + }; + +} diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f2ca9eaa622b..1dd5c9191f00 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 ]; @@ -74,7 +75,9 @@ in stdenv.mkDerivation { ]; }; - buildInputs = [makeWrapper] ++ lib.optionals (!ffmpegSupport) gst-plugins; + buildInputs = [makeWrapper] + ++ lib.optional (!ffmpegSupport) gst-plugins + ++ lib.optional (browser ? gtk3) browser.gtk3; buildCommand = '' if [ ! -x "${browser}/bin/${browserName}" ] @@ -92,7 +95,13 @@ in stdenv.mkDerivation { --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ - ${lib.optionalString (!ffmpegSupport) ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''} + ${lib.optionalString (!ffmpegSupport) + ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' + + lib.optionalString (browser ? gtk3) + ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' + '' + } if [ -e "${browser}/share/icons" ]; then mkdir -p "$out/share" diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index abc314f85699..9a4d90701b28 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildEnv, fetchurl, patchelf, bash +{ stdenv, fetchurl, patchelf, bash # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gdk_pixbuf, gcc +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -31,6 +31,9 @@ # Only needed for getting information about upstream binaries , chromium + +, gsettings_desktop_schemas +, gnome2, gnome3 }: with stdenv.lib; @@ -42,18 +45,21 @@ let withCustomModes = true; }; + gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; + gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; + deps = [ - stdenv.cc.cc glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gtk2 gdk_pixbuf gcc + dbus_libs gdk_pixbuf gcc-unwrapped.lib systemd libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap - ] ++ optional pulseSupport libpulseaudio; + ] ++ optional pulseSupport libpulseaudio + ++ [ gtk ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -64,7 +70,15 @@ in stdenv.mkDerivation rec { src = binary; - buildInputs = [ patchelf ]; + buildInputs = [ + patchelf + + # needed for GSETTINGS_SCHEMAS_PATH + gsettings_desktop_schemas glib gtk + + # needed for XDG_ICON_DIRS + gnome.defaultIconTheme + ]; unpackPhase = '' ar x $src @@ -109,6 +123,7 @@ in stdenv.mkDerivation rec { #!${bash}/bin/sh export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} export PATH=$binpath\''${PATH:+:\$PATH} + export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@" EOF chmod +x $exe diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index be2a836a085c..f504c3c2b333 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp"; }; - buildInputs = - [ libev librsvg libpng libjpeg libtiff gpm openssl xz bzip2 zlib ] - ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ] - ++ stdenv.lib.optional enableDirectFB [ directfb ]; + buildInputs = with stdenv.lib; + [ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ] + ++ optionals stdenv.isLinux [ gpm ] + ++ optionals enableX11 [ libX11 libXau libXt ] + ++ optional enableDirectFB [ directfb ]; nativeBuildInputs = [ pkgconfig bzip2 ]; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://links.twibright.com/; description = "A small browser with some graphics support"; - maintainers = with maintainers; [ raskin urkud viric ]; - platforms = platforms.linux; + maintainers = with maintainers; [ raskin viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index fb4b33ef71ab..bbf034a13424 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 +{ stdenv, buildPackages +, fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null +, buildPlatform, hostPlatform }: assert sslSupport -> openssl != null; @@ -13,14 +15,12 @@ stdenv.mkDerivation rec { sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a"; }; - configureFlags = [] - ++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ]; + configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; - buildInputs = [ ncurses gzip ]; + nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig + ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; - crossAttrs = { - configureFlags = configureFlags ++ [ "--enable-widec" ]; - }; + buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; meta = with stdenv.lib; { homepage = http://lynx.isc.org/; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 9e0b0852bf8a..c25390a7c99a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -60,7 +60,7 @@ let arch = - if stdenv.system == "x86_64-linux" then + if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "i686-linux" then "i386" @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "24.0.0.221"; + version = "26.0.0.137"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "10f8m5zc8p4xbhihbl785lws1kpv6smnbhx4ydzf8ai3mlv3y241" + "1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z" else - "1rz9rkbvln8wdkfmsnnq936xs6969qma141jc4qx408419q7v3hg" + "1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl" else if arch == "x86_64" then - "1cb4mvslphj3bcchgr7lcswz8kk8si0s60rl5266mi53byplhw08" + "0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls" else - "1vcyp9041171xkcnz05dlk3n7bnbcb9qbh4sy5wfgjkqsyd6i5bl"; + "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 248fe63ab0c6..d7dd83b58f37 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,27 +49,25 @@ let arch = - if stdenv.system == "x86_64-linux" then + if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then - "i386" else throw "Flash Player is not supported on this platform"; in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "24.0.0.221"; + version = "26.0.0.137"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0cy81cml72ayx2wa0fd9vgp2wzny866jasahndg01v0jfxcxw5rz" + "095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp" else - "0xgiycd47mzmwvmhbi0ig3rd7prksfdpcd4h62as1m9gs1ax4d7l"; + "1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 47e82d06e0eb..52a2ce9164c9 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 = "43.0.2442.991"; + version = "46.0.2597.39"; rpath = stdenv.lib.makeLibraryPath [ @@ -46,7 +46,7 @@ let alsaLib.out atk.out cairo.out - cups.out + cups curl.out dbus.lib expat.out @@ -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 = "0gd30b5gs2n4ypyn2ky2dlz648akmss2kixb8dqsy4yfd0mz7xqr"; - } - 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 = "1pj2d3zhzyavv2gj3v5w07m14679k2vlbfk6sd9bjdy6g7fb5f7x"; + 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/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index b167b59f03cf..bd334356df5c 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -3,21 +3,21 @@ , dbus, dbus_glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, mesa -, nspr, nss, pango, perl, python, libpulseaudio, sqlite +, libstartup_notification, libvpx, makeWrapper, mesa +, nspr, nss, pango, perl, python, libpulseaudio, sqlite , unzip, xlibs, which, yasm, zip, zlib }: stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.1.1"; + version = "27.2.1"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; - rev = "a35936746069e6591181eb67e5f9ea094938bae5"; - sha256 = "0hns5993dh93brwz3z4xp1zp8n90x1hajxylv17zybpysax64jsk"; + rev = version + "_Release"; + sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4"; }; desktopItem = makeDesktopItem { @@ -79,6 +79,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications cd $builddir $src/mach install ''; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4c186fcf5ea9..5ec4340dba78 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook -, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking +{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook +, 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 }: +, qtwebkit-plugins +, withWebEngineDefault ? false +}: let pdfjs = stdenv.mkDerivation rec { @@ -24,12 +26,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.9.1"; + version = "0.11.0"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass"; + sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"; }; # Needs tox @@ -42,11 +44,11 @@ in buildPythonApplication rec { ]; nativeBuildInputs = [ - makeQtWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils + pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl ]; postPatch = '' @@ -71,11 +73,8 @@ in buildPythonApplication rec { install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* ''; - postFixup = '' - mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath - makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser - - sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped + postFixup = lib.optionalString withWebEngineDefault '' + wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine" ''; meta = { diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index ae6ce3dd2c30..04d475f36f07 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,42 +1,36 @@ -{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: +{ stdenv, fetchurl +, pkgconfig, wrapGAppsHook +, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk +, patches ? null +}: stdenv.mkDerivation rec { name = "surf-${version}"; - version="0.7"; + version = "2.0"; src = fetchurl { url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; - sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m"; + sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"; }; - buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; - # Allow users set their own list of patches inherit patches; - buildPhase = " make "; - - # `-lX11' to make sure libX11's store path is in the RPATH - NIX_LDFLAGS = "-lX11"; - preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; - preFixup = '' - wrapProgram "$out/bin/surf" \ - --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - description = "Simple web browser"; + meta = with stdenv.lib; { + description = "A simple web browser based on WebKit/GTK+"; longDescription = '' Surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. - ''; + ''; homepage = http://surf.suckless.org; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = webkitgtk.meta.platforms; + maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix new file mode 100644 index 000000000000..5bcf47a4905d --- /dev/null +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -0,0 +1,353 @@ +{ stdenv +, fetchurl +, makeDesktopItem + +# Common run-time dependencies +, zlib + +# libxul run-time dependencies +, atk +, cairo +, dbus +, dbus_glib +, fontconfig +, freetype +, gdk_pixbuf +, glib +, gtk2 +, libxcb +, libX11 +, libXext +, libXrender +, libXt +, pango + +, audioSupport ? mediaSupport +, pulseaudioSupport ? audioSupport +, libpulseaudio + +# Media support (implies pulseaudio support) +, mediaSupport ? false +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-ffmpeg +, gmp +, ffmpeg + +# Pluggable transport dependencies +, python27 + +# Extra preferences +, extraPrefs ? "" +}: + +with stdenv.lib; + +let + libPath = makeLibraryPath ([ + atk + cairo + dbus + dbus_glib + fontconfig + freetype + gdk_pixbuf + glib + gtk2 + libxcb + libX11 + libXext + libXrender + libXt + pango + stdenv.cc.cc + zlib + ] + ++ optionals pulseaudioSupport [ libpulseaudio ] + ++ optionals mediaSupport [ + gstreamer + gst-plugins-base + gmp + ffmpeg + ]); + + gstPluginsPath = concatMapStringsSep ":" (x: + "${x}/lib/gstreamer-0.10") [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-ffmpeg + ]; + + # Library search path for the fte transport + fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; + + # Upstream source + version = "7.0.2"; + + lang = "en-US"; + + srcs = { + "x86_64-linux" = fetchurl { + urls = [ + "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 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr"; + }; + + "i686-linux" = fetchurl { + urls = [ + "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 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z"; + }; + }; +in + +stdenv.mkDerivation rec { + name = "tor-browser-bundle-bin-${version}"; + inherit version; + + src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + + preferLocalBuild = true; + allowSubstitutes = false; + + desktopItem = makeDesktopItem { + name = "torbrowser"; + exec = "tor-browser"; + icon = "torbrowser"; + desktopName = "Tor Browser"; + genericName = "Web Browser"; + comment = meta.description; + categories = "Network;WebBrowser;Security;"; + }; + + buildCommand = '' + # For convenience ... + TBB_IN_STORE=$out/share/tor-browser + interp=$(< $NIX_CC/nix-support/dynamic-linker) + + # Unpack & enter + mkdir -p "$TBB_IN_STORE" + tar xf "${src}" -C "$TBB_IN_STORE" --strip-components=2 + pushd "$TBB_IN_STORE" + + # Set ELF interpreter + for exe in firefox TorBrowser/Tor/tor ; do + patchelf --set-interpreter "$interp" "$exe" + done + + # The final libPath. Note, we could split this into firefoxLibPath + # and torLibPath for accuracy, but this is more convenient ... + libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor + + # Fixup paths to pluggable transports. + sed -i TorBrowser/Data/Tor/torrc-defaults \ + -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g" + + # Fixup obfs transport. Work around patchelf failing to set + # interpreter for pre-compiled Go binaries by invoking the interpreter + # directly. + sed -i TorBrowser/Data/Tor/torrc-defaults \ + -e "s|\(ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|" \ + + # Fixup fte transport + # + # Note: the script adds its dirname to search path automatically + sed -i TorBrowser/Tor/PluggableTransports/fteproxy.bin \ + -e "s,/usr/bin/env python,${python27.interpreter}," + + patchelf --set-rpath "${fteLibPath}" TorBrowser/Tor/PluggableTransports/fte/cDFA.so + + # Prepare for autoconfig. + # + # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment + cat >defaults/pref/autoconfig.js <mozilla.cfg <fonts,$TBB_IN_STORE/fonts," + + # Move default extension overrides into distribution dir, to avoid + # having to synchronize between local state and store. + mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js + + # Hard-code paths to geoip data files. TBB resolves the geoip files + # relative to torrc-defaults_path but if we do not hard-code them + # here, these paths end up being written to the torrc in the user's + # state dir. + cat >>TorBrowser/Data/Tor/torrc-defaults < "$out/bin/tor-browser" << EOF + #! ${stdenv.shell} + set -o errexit -o nounset + + # Enter local state directory. + REAL_HOME=\$HOME + TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser} + HOME=\$TBB_HOME + + mkdir -p "\$HOME" + cd "\$HOME" + + # Initialize empty TBB local state directory hierarchy. We + # intentionally mirror the layout that TBB would see if executed from + # the unpacked bundle dir. + mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data" + + # Initialize the Tor data directory. + mkdir -p "\$HOME/TorBrowser/Data/Tor" + + # TBB will fail if ownership is too permissive + chmod 0700 "\$HOME/TorBrowser/Data/Tor" + + # Initialize the browser profile state. Note that the only data + # copied from the Store payload is the initial bookmark file, which is + # never updated once created. All other files under user's profile + # dir are generated by TBB. + mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default" + cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \ + "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html" + + # Clear out some files that tend to capture store references but are + # easily generated by firefox at startup. + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} + + # Ensure that we're always using the up-to-date extensions. + ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \ + "\$HOME/TorBrowser/Data/Browser/profile.default/extensions" + + ${optionalString pulseaudioSupport '' + # Figure out some envvars for pulseaudio + : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" + : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" + : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" + : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" + ''} + + # Font cache files capture store paths; clear them out on the off + # chance that TBB would continue using old font files. + rm -rf "\$HOME/.cache/fontconfig" + + # Lift-off + # + # XAUTHORITY and DISPLAY are required for TBB to work at all. + # + # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launch; to + # prevent that, set it to an empty/invalid value prior to running + # tor-browser. + # + # PULSE_SERVER is necessary for audio playback. + # + # Setting FONTCONFIG_FILE is required to make fontconfig read the TBB + # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 + # indicates the system fonts.conf being used instead. + exec env -i \ + HOME="\$HOME" \ + XAUTHORITY="\$XAUTHORITY" \ + DISPLAY="\$DISPLAY" \ + DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ + \ + PULSE_SERVER="\''${PULSE_SERVER:-}" \ + PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ + \ + GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \ + GST_REGISTRY="/dev/null" \ + GST_REGISTRY_UPDATE="no" \ + \ + FONTCONFIG_FILE="$FONTCONFIG_FILE" \ + \ + LD_LIBRARY_PATH="$libPath" \ + \ + "$TBB_IN_STORE/firefox" \ + --class "Tor Browser" \ + -no-remote \ + -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \ + "\''${@}" + EOF + chmod +x $out/bin/tor-browser + + # Easier access to docs + mkdir -p $out/share/doc + ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser + + # Install .desktop item + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + sed -i $out/share/applications/torbrowser.desktop \ + -e "s,Exec=.*,Exec=$out/bin/tor-browser," + + # Install icons + mkdir -p $out/share/pixmaps + cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png + + # Check installed apps + echo "Checking bundled Tor ..." + LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null + + echo "Checking tor-browser wrapper ..." + DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \ + $out/bin/tor-browser --version >/dev/null + ''; + + meta = with stdenv.lib; { + description = "Tor Browser Bundle"; + homepage = https://www.torproject.org/; + platforms = attrNames srcs; + maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; + hydraPlatforms = []; + # MPL2.0+, GPL+, &c. While it's not entirely clear whether + # the compound is "libre" in a strict sense (some components place certain + # restrictions on redistribution), it's free enough for our purposes. + license = licenses.free; + }; +} diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ab010653c644..749fc8557881 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,31 +4,19 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr , patchelf }: -let - version = "1.6"; - build = "689.34-1"; - fullVersion = "stable_${version}.${build}"; - - info = if stdenv.is64bit then { - arch = "amd64"; - sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm"; - } else { - arch = "i386"; - sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0"; - }; - -in stdenv.mkDerivation rec { - product = "vivaldi"; - name = "${product}-${version}"; +stdenv.mkDerivation rec { + name = "${product}-${version}"; + product = "vivaldi"; + version = "1.10.867.38-1"; src = fetchurl { - inherit (info) sha256; - url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb"; + url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; + sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi"; }; unpackPhase = '' @@ -36,18 +24,20 @@ in stdenv.mkDerivation rec { tar -xvf data.tar.xz ''; - buildInputs = - [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb - libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd - freetype fontconfig libXrender libuuid expat glib nss nspr - gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf - patchelf - ]; + nativeBuildInputs = [ patchelf ]; + + buildInputs = [ + stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb + libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr + atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + freetype fontconfig libXrender libuuid expat glib nss nspr + gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf + ]; libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.is64bit) - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs) + + ":$out/opt/vivaldi/lib"; buildPhase = '' echo "Patching Vivaldi binaries" @@ -84,6 +74,6 @@ in stdenv.mkDerivation rec { homepage = "https://vivaldi.com"; license = licenses.unfree; maintainers = with maintainers; [ otwieracz nequissimus ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/w3m/cygwin.patch b/pkgs/applications/networking/browsers/w3m/cygwin.patch deleted file mode 100644 index 767cc289b5f6..000000000000 --- a/pkgs/applications/networking/browsers/w3m/cygwin.patch +++ /dev/null @@ -1,1710 +0,0 @@ -diff -ur w3m-0.5.3/config.guess new/w3m-0.5.3/config.guess ---- w3m-0.5.3/config.guess 2004-08-04 13:32:27.000000000 -0400 -+++ w3m-0.5.3/config.guess 2013-04-28 18:43:59.480227700 -0400 -@@ -1,13 +1,14 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012, 2013 Free Software Foundation, Inc. - --timestamp='2004-03-12' -+timestamp='2012-12-29' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -16,24 +17,22 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# along with this program; if not, see . - # - # 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 637041379dbd..e7641eb773dc 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/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 188ccdd71d4e..e7aa7bb67280 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,15 +1,17 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "c14-cli-2016-09-09"; + name = "c14-cli-unstable-${version}"; + version = "2017-05-15"; + rev = "97f437ef5133f73edd551c883db3076c76cb1f6b"; + goPackagePath = "github.com/online-net/c14-cli"; - subPackages = [ "cmd/c14" ]; src = fetchFromGitHub { owner = "online-net"; repo = "c14-cli"; - rev = "e7c7c3cb214fd06df63530a4e861210e7a0a1b6c"; - sha256 = "1k53lii2c04j8cy1bnyfvckl9fglprxp75cmbg15lrp9iic2w22a"; + inherit rev; + sha256 = "1b44bh0zhh6rhw4d3nprnnxhjgaskl9kzp2cvwwyli5svhjxrfdj"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/c14/deps.nix b/pkgs/applications/networking/c14/deps.nix index 60b6b7384387..fe51488c7066 100644 --- a/pkgs/applications/networking/c14/deps.nix +++ b/pkgs/applications/networking/c14/deps.nix @@ -1,65 +1 @@ -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"; - sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "87d4004f2ab62d0d255e0a38f1680aa534549fe3"; - sha256 = "0d51avdl4z38f7jd8qmzrzyh4gxkcjpxd0vvma9zfqhmqy15jqhb"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "ed8eb9e318d7a84ce5915b495b7d35e0cfe7b5a8"; - sha256 = "034fhyqmiqmn0v9gdbdmm0ca5d0pki2q1ch1rd34p9kh9574mjyq"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; - sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; - }; - } - { - goPackagePath = "github.com/online-net/c14-cli"; - fetch = { - type = "git"; - url = "https://github.com/online-net/c14-cli"; - rev = "e7c7c3cb214fd06df63530a4e861210e7a0a1b6c"; - sha256 = "1k53lii2c04j8cy1bnyfvckl9fglprxp75cmbg15lrp9iic2w22a"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "d77da356e56a7428ad25149ca77381849a6a5232"; - sha256 = "11id286pkzyswxcx2xz6185fzh0nz6yzkk055dd6z02gvinl6pqa"; - }; - } -] +[] diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index b2d70b1f767c..5016dc8fca3f 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.10.0"; + version = "0.12.0"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc"; + sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index f54964571575..dc7d2b8b2eab 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,17 +4,17 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1" - else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098"; -in -stdenv.mkDerivation rec { + then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd" + else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj"; pname = "helm"; - version = "2.1.3"; + version = "2.5.0"; +in +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz"; - sha256 = "${checksum}"; + sha256 = checksum; }; preferLocalBuild = true; @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { tar -xvzf $src cp ${arch}/helm $out/bin/${pname} chmod +x $out/bin/${pname} + mkdir -p $out/share/bash-completion/completions + mkdir -p $out/share/zsh/site-functions + $out/bin/helm completion bash > $out/share/bash-completion/completions/helm + $out/bin/helm completion zsh > $out/share/zsh/site-functions/_helm ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 80747e44bf53..e036fb2f38bd 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,24 +2,37 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.4.0"; - rev = "v${version}"; + version = "1.6.2"; goPackagePath = "k8s.io/kops"; src = fetchFromGitHub { - inherit rev; + rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1jwgn7l8c639j5annwymqjdw5mcajwn58y21042jy5lhgdh8pdf5"; + sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l"; }; buildInputs = [go-bindata]; subPackages = ["cmd/kops"]; + buildFlagsArray = '' + -ldflags= + -X k8s.io/kops.Version=${version} + -X k8s.io/kops.GitVersion=${version} + ''; + preBuild = '' (cd go/src/k8s.io/kops - go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...) + go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/... + go-bindata -o federation/model/bindata.go -pkg model -prefix federation/model federation/model/...) + ''; + + postInstall = '' + mkdir -p $bin/share/bash-completion/completions + mkdir -p $bin/share/zsh/site-functions + $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops + $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops ''; meta = with stdenv.lib; { @@ -27,5 +40,6 @@ buildGoPackage rec { homepage = https://github.com/kubernetes/kops; license = licenses.asl20; maintainers = with maintainers; [offline]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 952fd8fe9b6e..69fe6a1730aa 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -18,16 +18,16 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.5.2"; + version = "1.5.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v"; + sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w"; }; - buildInputs = [ makeWrapper which go rsync go-bindata ]; + buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; outputs = ["out" "man" "pause"]; @@ -59,12 +59,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # Remove references to go compiler - while read file; do - cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $out/bin $pause/bin -type f 2>/dev/null) + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 914ca259675c..6bceeefc37a9 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "1wpzsvvmk19qrwzwj7k12rngry1qriiqnjzq2q2pbpv5w0zb1fz5"; + sha256 = "6eab65a95c87a989e922aca2b49ba872b50a94e46a8fd4831d1ab41f319d6932"; }; buildInputs = [ makeWrapper jdk mesos ]; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 651d00e57108..a7cc5d789382 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -22,7 +22,7 @@ let }); in stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.1"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "1hdjd4syyp88l0bnh88bhzvn9466ad2ysfp9pq3kwj3qzwg5jv8g"; + sha256 = "0f46ebb130d2d4a9732f95d0a71d80c8c5967f3c172b110f2ece316e05922115"; }; patches = [ diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index fcc17df3fc46..5cdb30b3f00e 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,47 +1,74 @@ -{ stdenv, lib, fetchurl, makeWrapper, docker-machine-kvm, kubernetes, libvirt, qemu }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm, makeWrapper }: let - arch = if stdenv.isLinux - then "linux-amd64" - else "darwin-amd64"; - checksum = if stdenv.isLinux - then "0cdcabsx5l4jbpyj3zzyz5bnzks6wl64bmzdsnk41x92ar5y5yal" - else "12f3b7s5lwpvzx4wj6i6h62n4zjshqf206fxxwpwx9kpsdaw6xdi"; + binPath = [ kubernetes ] + ++ stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ] + ++ stdenv.lib.optionals stdenv.isDarwin []; -# TODO: compile from source + # Normally, minikube bundles localkube in its own binary via go-bindata. Unfortunately, it needs to make that localkube + # a static linux binary, and our Linux nixpkgs go compiler doesn't seem to work when asking for a cgo binary that's static + # (presumably because we don't have some static system libraries it wants), and cross-compiling cgo on Darwin is a nightmare. + # + # Note that minikube can download (and cache) versions of localkube it needs on demand. Unfortunately, minikube's knowledge + # of where it can download versions of localkube seems to rely on a json file that doesn't get updated as often as we'd like. So + # 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 -in stdenv.mkDerivation rec { - pname = "minikube"; - version = "0.17.1"; - name = "${pname}-${version}"; + localkube-version = "1.6.3"; + localkube-binary = fetchurl { + url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; + sha256 = "1fmxxjv1bxrfngc4ykfgg76b79dh8pq0k1gsbzhiy3hhrppfqylm"; + }; +in buildGoPackage rec { + pname = "minikube"; + name = "${pname}-${version}"; + version = "0.20.0"; - src = fetchurl { - url = "https://storage.googleapis.com/minikube/releases/v${version}/minikube-${arch}"; - sha256 = "${checksum}"; + goPackagePath = "k8s.io/minikube"; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; + sha256 = "0bly2phy67x4ckcg46g6r4kqfdpjfs1cb3588a900m8b4xyavvvb"; }; - phases = [ "installPhase" "fixupPhase" ]; + # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly + # that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions + buildInputs = [ go-bindata makeWrapper kubernetes ]; + subPackages = [ "cmd/minikube" ]; - buildInputs = [ makeWrapper ]; + preBuild = '' + pushd go/src/${goPackagePath} >/dev/null - binPath = lib.makeBinPath [ docker-machine-kvm kubernetes libvirt qemu ]; + mkdir -p out + cp ${localkube-binary} out/localkube - installPhase = '' - install -Dm755 ${src} $out/bin/${pname} + go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/addons/... + + ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//") + ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") + + export buildFlagsArray="-ldflags=\ + -X k8s.io/minikube/pkg/version.version=v${version} \ + -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \ + -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET" + + popd >/dev/null ''; - fixupPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/minikube" - - wrapProgram $out/bin/${pname} \ - --prefix PATH : ${binPath} + postInstall = '' + mkdir -p $bin/share/bash-completion/completions/ + MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube ''; + postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}"; + meta = with stdenv.lib; { - homepage = https://github.com/kubernetes/minikube; + homepage = https://github.com/kubernetes/minikube; description = "A tool that makes it easy to run Kubernetes locally"; - license = licenses.asl20; - maintainers = with maintainers; [ ebzzry ]; - platforms = with platforms; linux ++ darwin; + license = licenses.asl20; + maintainers = with maintainers; [ ebzzry copumpkin ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index ae3415adef9a..ce33fca44759 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.4"; + 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 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3"; + sha256 = "1ivxsrg8s5fcyhngf8wlrqw6j7s2iggbf9xkr8jnd80cxbcpnksl"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 403457bb4a61..6ade5bab70e8 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchFromGitHub, go, which }: +{ stdenv, fetchFromGitHub, which, buildGoPackage }: let - version = "1.3.2"; + version = "1.5.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; -in -stdenv.mkDerivation rec { +in buildGoPackage rec { name = "openshift-origin-${version}"; inherit version; @@ -15,17 +14,18 @@ stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "0zw8zb9c6icigcq6y47ppnjnqyghk2kril07bapbddvgnvbbfp6m"; + sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v"; }; - buildInputs = [ go which ]; + buildInputs = [ which ]; + goPackagePath = null; patchPhase = '' patchShebangs ./hack ''; buildPhase = '' - export GOPATH=$(pwd) + cd go/src/origin-v${version}-src # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub export OS_GIT_VERSION=${version} @@ -35,10 +35,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - export GOOS=$(go env GOOS) - export GOARCH=$(go env GOARCH) - mkdir -p "$out/bin" - mv _output/local/bin/$GOOS/$GOARCH/* "$out/bin/" + mkdir -p "$bin/bin" + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index a0df23e6f623..c276c2e752fd 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "pachyderm-${version}"; - version = "1.3.0"; + version = "1.4.6"; rev = "v${version}"; goPackagePath = "github.com/pachyderm/pachyderm"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "pachyderm"; repo = "pachyderm"; - sha256 = "0y25xh6h7p8hg0bzrjlschmz62r6dwh5mrvbnni1hb1pm0w9jb6g"; + sha256 = "1fivihn9s04lmzdiwg0f05qm708fb14xy81pbc31wxdyjw28m8ns"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 3347af83585f..6a8fe2834912 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler +{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler , ruby, libxslt, libxml2, sqlite, openssl, docker , dataDir ? "/var/lib/panamax-api" }@args: diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index bdcb0a846259..837447fe60fb 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchzip, makeWrapper, jre, pythonPackages +, RSupport? true, R , mesosSupport ? true, mesos , version }: let versionMap = { - "1.6.0" = { + "1.6.3" = { hadoopVersion = "cdh4"; - sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c"; + sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn"; }; "2.1.0" = { hadoopVersion = "hadoop2.4"; @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] + ++ optional RSupport R ++ optional mesosSupport mesos; untarDir = "${name}-bin-${hadoopVersion}"; @@ -46,6 +48,9 @@ stdenv.mkDerivation rec { export SPARK_HOME="$out/lib/${untarDir}" export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" + ${optionalString RSupport + ''export SPARKR_R_SHELL="${R}/bin/R" + export PATH=$PATH:"${R}/bin/R"''} ${optionalString mesosSupport ''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''} EOF @@ -57,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Lightning-fast cluster computing"; + description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "http://spark.apache.org"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix new file mode 100644 index 000000000000..dd4a36807ea1 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildGoPackage, fetchFromGitHub}: + +buildGoPackage rec { + name = "terraform-inventory-${version}"; + version = "0.7-pre"; + rev = "v${version}"; + + goPackagePath = "github.com/adammck/terraform-inventory"; + + subPackages = [ "./" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "adammck"; + repo = "terraform-inventory"; + sha256 = "0wwyi2nfyn3wfpmvj8aabn0cjba0lpr5nw3rgd6qdywy7sc3rmb1"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/adammck/terraform-inventory; + description = "Terraform state to ansible inventory adapter"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ htr ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-inventory/deps.nix b/pkgs/applications/networking/cluster/terraform-inventory/deps.nix new file mode 100644 index 000000000000..9f7b5e317fe3 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-inventory/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/adammck/venv"; + fetch = { + type = "git"; + url = "https://github.com/adammck/venv"; + rev = "8a9c907a37d36a8f34fa1c5b81aaf80c2554a306"; + sha256 = "1fzk3j4q59kpd2ks2aw8rmic6b123p5mh981cjh0kzs716grc6y8"; + }; + } + { + goPackagePath = "github.com/blang/vfs"; + fetch = { + type = "git"; + url = "https://github.com/blang/vfs"; + rev = "c14afcac17253ce7418da751ec6b1988790cdc8f"; + sha256 = "00q5qzxpn9n59nrmrljz4w9lljxvrr8i5j8i8b4iw86j0alcx53b"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 7dc2c5ed4982..92b043cfdbd2 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,34 +1,57 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "terraform-${version}"; - version = "0.8.8"; +{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }: +let goPackagePath = "github.com/hashicorp/terraform"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v${version}"; + generic = { version, sha256, ... }@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in + buildGoPackage ({ + name = "terraform-${version}"; + + inherit goPackagePath; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform"; + rev = "v${version}"; + inherit sha256; + }; + + postInstall = '' + # remove all plugins, they are part of the main binary now + for i in $bin/bin/*; do + if [[ $(basename $i) != terraform ]]; then + rm "$i" + fi + done + ''; + + preCheck = '' + export HOME=$TMP + ''; + + meta = with stdenv.lib; { + description = "Tool for building, changing, and versioning infrastructure"; + homepage = https://www.terraform.io/; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ]; + }; + } // attrs'); +in { + terraform_0_8_5 = generic { + version = "0.8.5"; + sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; + }; + + terraform_0_8_8 = generic { + version = "0.8.8"; sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - postInstall = '' - # remove all plugins, they are part of the main binary now - for i in $bin/bin/*; do - if [[ $(basename $i) != terraform ]]; then - rm "$i" - fi - done - ''; - - meta = with stdenv.lib; { - description = "Tool for building, changing, and versioning infrastructure"; - homepage = "https://www.terraform.io/"; - license = licenses.mpl20; - maintainers = with maintainers; [ - jgeerds - zimbatm - ]; + 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 new file mode 100644 index 000000000000..359579c3fde8 --- /dev/null +++ b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: + +buildGoPackage rec { + name = "terragrunt-${version}"; + version = "0.11.1"; + + goPackagePath = "github.com/gruntwork-io/terragrunt"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "gruntwork-io"; + repo = "terragrunt"; + sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5"; + }; + + goDeps = ./deps_0_11.nix; + + buildInputs = [ makeWrapper ]; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") + ''; + + postInstall = '' + wrapProgram $bin/bin/terragrunt \ + --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform + ''; + + meta = with stdenv.lib; { + description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; + homepage = https://github.com/gruntwork-io/terragrunt/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix new file mode 100644 index 000000000000..ec13cbe35bca --- /dev/null +++ b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: + +buildGoPackage rec { + name = "terragrunt-${version}"; + version = "0.9.8"; + + goPackagePath = "github.com/gruntwork-io/terragrunt"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "gruntwork-io"; + repo = "terragrunt"; + sha256 = "0aakr17yzh5jzvlmg3pzpnsfwl31njg27bpck541492shqcqmkiz"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ makeWrapper ]; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") + ''; + + postInstall = '' + wrapProgram $bin/bin/terragrunt \ + --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform + ''; + + meta = with stdenv.lib; { + description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; + homepage = https://github.com/gruntwork-io/terragrunt/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e2641b2d6571..d7988267f2f5 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.11.0"; + version = "0.12.24"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,13 +10,17 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b"; + sha256 = "0rkbicvqjadb99qw65g3k7pqal5sn05png30qwy59cv4gjr9q9m4"; }; goDeps = ./deps.nix; buildInputs = [ makeWrapper ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") + ''; + postInstall = '' wrapProgram $bin/bin/terragrunt \ --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 31f9f9a2b703..fc7da0a2a99a 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 go2nix. +# 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 = "78568b07950e5e7948496878fe99b9436add41d4"; - sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3"; + rev = "ae53883b2478fd8e2bdca2748367d5b5fa27ca22"; + sha256 = "0sa5g69wpk6hbd6g52cc7l5c6zph9zyc5l9dy4288xn4hpb6c23q"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "c3d66e76678dce180a7b452653472f949aedfbcd"; - sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7"; + rev = "2814e6fb2ca5b3bd950c97eff22553ecb3c7f77b"; + sha256 = "1pkqa5vdyc79iiw25b9vpl9f32nwv2pzh6f98l30678ypha0miqn"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b"; - sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh"; + rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; + sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; }; } { @@ -72,13 +72,22 @@ 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 = "db1efb556f84b25a0a13a04aad883943538ad2e0"; - sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; }; } { @@ -86,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; - sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; + sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; }; } { @@ -95,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53"; - sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db"; + 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 000000000000..5ea04d1f424e --- /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 07d89b53fa49..376c70f3f446 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.3.3"; + version = "1.5.1"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "09k0jrhjqrmpvyz5pf1g7wkidflkhpvw5869a95vnhfxjd45kzs3"; + sha256 = "1qajb4xms3vsfm5sg91z9ka0nrzgfi0fjgjxqm7snhkfgxlkph7w"; }; preConfigure = '' @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf glib_networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); + 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.override { gtkSupport = true; }) gst-libav ]); meta = { description = "Native Gtk+ Twitter client for the Linux desktop"; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index bb4a4a710094..b491f287e701 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,25 +1,27 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.7.2"; + name = "davmail-4.8.0"; src = fetchurl { - url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz"; - sha256 = "196jr44kksb197biz984z664llf9z3d8rlnjm2iqcmgkjhx1mgy3"; + url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz"; + sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62"; }; - buildInputs = [ makeWrapper ]; - - meta = { - description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - maintainers = [ stdenv.lib.maintainers.hinton ]; - platforms = stdenv.lib.platforms.all; - homepage = "http://davmail.sourceforce.net/"; - license = stdenv.lib.licenses.gpl2; - }; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin - cp ./* $out/bin/ -R - wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} - ''; + mkdir -p $out/share/davmail + cp -R ./* $out/share/davmail + makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} + ''; + + meta = with stdenv.lib; { + homepage = http://davmail.sourceforce.net/; + description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; + maintainers = [ maintainers.hinton ]; + platforms = platforms.all; + license = licenses.gpl2; + }; } diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 8be5ee3c775a..93ff39bde64f 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Mini Web server that let others upload files to your computer"; homepage = http://stackp.online.fr/droopy; license = licenses.bsd3; - maintainers = maintainers.profpatsch; + maintainers = [ maintainers.profpatsch ]; }; } diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 892d8fa33009..18c55c80fc08 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin/" "$out/share/applications" cp data/dropbox.desktop "$out/share/applications" + cp -a data/icons "$out/share/icons" + find "$out/share/icons" -type f \! -name '*.png' -delete substitute "dropbox.in" "$out/bin/dropbox" \ --replace '@PACKAGE_VERSION@' ${version} \ --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3721f7ed4af6..155c8787430d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper +{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem +, makeWrapper, patchelf , dbus_libs, fontconfig, freetype, gcc, glib , libdrm, libffi, libICE, libSM , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb , libxml2, libxslt, ncurses, zlib -, qtbase, qtdeclarative, qtwebkit +, qtbase, qtdeclarative, qtwebkit, wmctrl }: # this package contains the daemon version of dropbox @@ -23,11 +24,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "21.4.25"; + version = "30.4.22"; sha256 = { - "x86_64-linux" = "1pgab1ah6rl30rm4dj0biq5714pfzd5jjd2bp0nmhdqn1hm5vmhv"; - "i686-linux" = "05kn8qman8ghknb0chrlmcxrxg7w6l79frkaqj6blgnhanh13h4n"; + "x86_64-linux" = "0qc99j6hpd1k5bmvcll3rjglksrjw0mw2nrwj3s3kh55j6fy8a0r"; + "i686-linux" = "0zyl1q76cpwly4k7h4klnyrv50nyxi2wpz5sii1a00jbmr7snhab"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = @@ -39,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 @@ -47,6 +48,7 @@ let qtbase qtdeclarative qtwebkit ]; + ldpath = stdenv.lib.makeLibraryPath libs; desktopItem = makeDesktopItem { name = "dropbox"; @@ -58,41 +60,36 @@ let startupNotify = "false"; }; -in stdenv.mkDerivation { +in mkDerivation { name = "dropbox-${version}"; src = fetchurl { name = "dropbox-${version}.tar.gz"; - url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz"; + url = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; inherit sha256; }; sourceRoot = ".dropbox-dist"; nativeBuildInputs = [ makeWrapper patchelf ]; - dontPatchELF = true; # patchelf invoked explicitly below + buildInputs = libs; dontStrip = true; # already done installPhase = '' + runHook preInstall + mkdir -p "$out/${appdir}" cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" + # Vendored libraries interact poorly with our graphics drivers rm "$out/${appdir}/libdrm.so.2" rm "$out/${appdir}/libffi.so.6" rm "$out/${appdir}/libGL.so.1" rm "$out/${appdir}/libX11-xcb.so.1" - rm "$out/${appdir}/libQt5Core.so.5" - rm "$out/${appdir}/libQt5DBus.so.5" - rm "$out/${appdir}/libQt5Gui.so.5" - rm "$out/${appdir}/libQt5Network.so.5" - rm "$out/${appdir}/libQt5OpenGL.so.5" - rm "$out/${appdir}/libQt5PrintSupport.so.5" - rm "$out/${appdir}/libQt5Qml.so.5" - rm "$out/${appdir}/libQt5Quick.so.5" - rm "$out/${appdir}/libQt5Sql.so.5" - rm "$out/${appdir}/libQt5WebKit.so.5" - rm "$out/${appdir}/libQt5WebKitWidgets.so.5" - rm "$out/${appdir}/libQt5XcbQpa.so.5" + # Cannot use vendored Qt libraries due to problem with xkbcommon + rm "$out/${appdir}/"libQt5*.so.5 + rm "$out/${appdir}/qt.conf" + rm -fr "$out/${appdir}/plugins" mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications @@ -106,39 +103,33 @@ in stdenv.mkDerivation { --prefix LD_LIBRARY_PATH : "$RPATH" chmod 755 $out/${appdir}/dropbox + + 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/' - find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do + find "$out/${appdir}" -type f -print | while read obj; do dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true) - if [[ -n "$dynamic" ]]; then - type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") - - if [[ "$type" == "EXEC" ]]; then + if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then echo "patching interpreter path in $type $obj" patchelf --set-interpreter "$INTERP" "$obj" + fi + + type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") + if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then echo "patching RPATH in $type $obj" oldRPATH=$(patchelf --print-rpath "$obj") patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" - echo "shrinking RPATH in $type $obj" - patchelf --shrink-rpath "$obj" - - elif [[ "$type" == "DYN" ]]; then - - echo "patching RPATH in $type $obj" - oldRPATH=$(patchelf --print-rpath "$obj") - patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" - - echo "shrinking RPATH in $type $obj" - patchelf --shrink-rpath "$obj" - else echo "unknown ELF type \"$type\"; not patching $obj" @@ -153,8 +144,8 @@ in stdenv.mkDerivation { meta = { homepage = "http://www.dropbox.com"; description = "Online stored folders (daemon version)"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index f37f10d5209b..e2b5844429f1 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - webtest bottle threadpool rocket-errbot requests2 jinja2 + webtest bottle threadpool rocket-errbot requests jinja2 pyopenssl colorlog Yapsy markdown ansi pygments dns pep8 daemonize pygments-markdown-lexer telegram irc slackclient pyside sleekxmpp hypchat pytest diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index bf6da8c207a0..b7bc2c6c67a0 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: -stdenv.mkDerivation { - name = "esniper-2.32.0"; +stdenv.mkDerivation rec { + name = "esniper-2.33.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-32-0.tgz"; - sha256 = "04lka4d0mnrwc369yzvq28n8qi1qbm8810ykx6d0a4kaghiybqsy"; + url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz"; + sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69"; }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 39543f256fa2..4e22a95d4d86 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -12,12 +12,12 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ feedparser ]; namePrefix = ""; - + meta = with stdenv.lib; { homepage = "http://offog.org/code/rawdog/"; description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; - platform = platforms.unix; + platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix new file mode 100644 index 000000000000..6b92db9efa55 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -0,0 +1,29 @@ +{ pythonPackages, fetchurl, lib }: + +with pythonPackages; + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "rss2email"; + version = "3.9"; + + propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; + + src = fetchurl { + url = "mirror://pypi/r/rss2email/${name}.tar.gz"; + sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; + }; + + postInstall = '' + install -Dm 644 r2e.1 $out/share/man/man1/r2e.1 + # an alias for better finding the manpage + ln -s -T r2e.1 $out/share/man/man1/rss2email.1 + ''; + + meta = with lib; { + description = "A tool that converts RSS/Atom newsfeeds to email."; + homepage = "https://pypi.python.org/pypi/rss2email"; + license = licenses.gpl2; + maintainers = with maintainers; [ jb55 profpatsch ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix new file mode 100644 index 000000000000..d1c272fc3831 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "rssguard-${version}"; + version = "3.4.0"; + + src = fetchgit { + url = https://github.com/martinrotter/rssguard; + rev = "refs/tags/${version}"; + sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp"; + fetchSubmodules = true; + }; + + buildInputs = [ qtwebengine qttools ]; + nativeBuildInputs = [ qmake wrapGAppsHook ]; + qmakeFlags = [ "CONFIG+=release" ]; + + meta = with stdenv.lib; { + description = "Simple RSS/Atom feed reader with online synchronization"; + longDescription = '' + RSS Guard is a simple, light and easy-to-use RSS/ATOM feed aggregator + developed using Qt framework and with online feed synchronization support + for ownCloud/Nextcloud. + ''; + homepage = https://github.com/martinrotter/rssguard; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f7dd96183070..6c3731b82a41 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,31 +1,53 @@ { lib -, pythonPackages -, fetchurl +, fetchFromGitHub +, python , transmission , deluge , config }: -with pythonPackages; +with python.pkgs; -buildPythonPackage rec { - version = "1.2.337"; +buildPythonApplication rec { + version = "2.10.40"; name = "FlexGet-${version}"; - disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/F/FlexGet/${name}.tar.gz"; - sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346"; + src = fetchFromGitHub { + owner = "Flexget"; + repo = "Flexget"; + rev = version; + sha256 = "0hh21yv1lvdfi198snwjabfsdh04fnpjszpgg28wvg5pd1qq8lqv"; }; - doCheck = false; + doCheck = true; + # test_regexp requires that HOME exist, test_filesystem requires a + # unicode-capable filesystem (and setting LC_ALL doesn't work). + # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + postPatch = '' + sed -i '/def test_non_ascii/i\ import pytest\ + @pytest.mark.skip' flexget/tests/test_filesystem.py - buildInputs = [ nose ]; + substituteInPlace requirements.txt --replace "guessit<=2.0.4" "guessit" + ''; + + # Disable 3 failing tests caused by guessit upgrade + # https://github.com/Flexget/Flexget/issues/1804 + checkPhase = '' + export HOME=. + py.test --disable-pytest-warnings -k "not test_date_options and not test_ep_as_quality and not testFromGroup" + ''; + + buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; propagatedBuildInputs = [ - paver feedparser sqlalchemy pyyaml rpyc - beautifulsoup_4_1_3 html5lib_0_9999999 pyrss2gen pynzb progressbar jinja2 flask - cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 - guessit pathpy apscheduler ] + feedparser sqlalchemy pyyaml + beautifulsoup4 html5lib PyRSS2Gen pynzb + rpyc jinja2 requests dateutil jsonschema + pathpy guessit APScheduler + terminaltables colorclass + cherrypy flask flask-restful flask-restplus_0_8 + flask-compress flask_login flask-cors + pyparsing safe future zxcvbn-python ] + ++ lib.optional (pythonOlder "3.4") pathlib # enable deluge and transmission plugin support, if they're installed ++ lib.optional (config.deluge or false) deluge ++ lib.optional (transmission != null) transmissionrpc; @@ -34,6 +56,6 @@ buildPythonPackage rec { homepage = http://flexget.com/; description = "Multipurpose automation tool for content like torrents"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ domenkozar ]; + maintainers = with lib.maintainers; [ domenkozar tari ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 984616173cb6..950bdc8ebdbd 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.24.0"; in +let version = "3.25.2"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x"; + sha256 = "1kdah69lbgpam7xrxrqxbcjplk459a5fv5ffvgfn5y5gq7dhm6sm"; }; configureFlags = [ diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix new file mode 100644 index 000000000000..f39fac2605a4 --- /dev/null +++ b/pkgs/applications/networking/gdrive/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gdrive-${version}"; + version = "2.1.0"; + rev = "${version}"; + + goPackagePath = "github.com/prasmussen/gdrive"; + + src = fetchFromGitHub { + owner = "prasmussen"; + repo = "gdrive"; + sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7"; + inherit rev; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/prasmussen/gdrive; + description = "A command line utility for interacting with Google Drive"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.rzetterberg ]; + }; +} diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 64519ce17d5b..674cf60161db 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib -, ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas"; }; - buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; + buildInputs = [ zlib ocaml ocamlbuild ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; configurePhase = "ocaml setup.ml -configure --prefix \"$out\""; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 5dc4294ba3bc..90b2695f0039 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig , cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad , gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg -, gsm, speex, portaudio, spandsp, libuuid, ccache +, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { version = "0.5.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid - ccache + ccache libvpx ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" @@ -24,21 +24,22 @@ stdenv.mkDerivation rec { "USE_VIDEO=1" "CCACHE_DISABLE=1" - "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" - "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" - "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" - "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" + "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" + "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" + "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" "USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1" "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1=" - "USE_ILBC=" "USE_OPUS=" "USE_SILK=" + "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; + NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm - -DHAVE_INTTYPES_H -D__GLIBC__ + -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index bfd4e11ccac1..14a0a54fedac 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -2,16 +2,19 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-facebook-2015-08-27"; + name = "bitlbee-facebook-${version}"; + version = "1.1.1"; src = fetchFromGitHub { - rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062"; + rev = "v${version}"; owner = "jgeboski"; repo = "bitlbee-facebook"; - sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl"; + sha256 = "08ibjqqcrmq1a5nmj8z93rjrdabi0yy2a70p31xalnfrh200m24c"; }; - buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + + buildInputs = [ bitlbee glib json_glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 5ee93bd4df5b..abb0a1172973 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/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix new file mode 100644 index 000000000000..5f868fc98584 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, + cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }: + +buildGoPackage rec { + name = "coyim-${version}"; + version = "v0.3.7_1"; + + goPackagePath = "github.com/twstrike/coyim"; + + src = fetchFromGitHub { + owner = "twstrike"; + repo = "coyim"; + rev = "df2c52fe865d38fa27e8a7af1d87612e8c048805"; + sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; + + meta = { + description = "a safe and secure chat client"; + homepage = https://coy.im/; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix new file mode 100644 index 000000000000..eff9b71daa63 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub +, vala, cmake, wrapGAppsHook, pkgconfig, gettext +, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking +, xorg, libXdmcp, libxkbcommon +, libnotify +, libgcrypt +, epoxy +, at_spi2_core +, sqlite +, dbus +, gpgme +, pcre + }: + +stdenv.mkDerivation rec { + name = "dino-unstable-2017-06-21"; + + src = fetchFromGitHub { + owner = "dino"; + repo = "dino"; + rev = "3f0089db86e2057293a33453361678989919147f"; + sha256 = "011wd6qi8nagig8418hibgnsmznd76dvp3p2dzzr4wyrb7d6cgcb"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + vala + cmake + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + gobjectIntrospection + glib_networking + glib + gnome3.libgee + gnome3.defaultIconTheme + sqlite + gdk_pixbuf + gtk3 + libnotify + gpgme + libgcrypt + pcre + xorg.libxcb + xorg.libpthreadstubs + libXdmcp + libxkbcommon + epoxy + at_spi2_core + dbus + gettext + ]; + + meta = with stdenv.lib; { + description = "Modern Jabber/XMPP Client using GTK+/Vala"; + homepage = https://github.com/dino/dino; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index ef84f6402b52..a238009cd11b 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; @@ -25,16 +36,8 @@ in stdenv.mkDerivation rec { "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; }; - phases = [ "unpackPhase" "installPhase" "postFixup" ]; - - deps = with xorg; [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib - cups expat stdenv.cc.cc - - udev libnotify - ]; + # don't remove runtime deps + dontPatchELF = true; unpackPhase = '' tar xzf $src @@ -42,26 +45,27 @@ in stdenv.mkDerivation rec { installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz - patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz + patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz - mkdir -p $out/bin $out/share/franz - cp -r * $out/share/franz - ln -s $out/share/franz/Franz $out/bin + mkdir -p $out/bin $out/opt/franz + cp -r * $out/opt/franz + ln -s $out/opt/franz/Franz $out/bin + # provide desktop item and icon mkdir -p $out/share/applications $out/share/pixmaps ln -s ${desktopItem}/share/applications/* $out/share/applications - ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps + ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps ''; postFixup = '' - paxmark m $out/share/franz/Franz + paxmark m $out/opt/franz/Franz ''; meta = with stdenv.lib; { 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/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1228804f5b95..a21a82848e03 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -25,13 +25,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.7"; + version = "0.16.8"; src = fetchurl { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "18srrsswq09i54gcqqy0ylmrix1rrq43f0b8sz1lijr39h3ayw3j"; + sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb"; }; patches = let @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { # sha256 = ""; #}; }; - in mapAttrsToList (name: { rev, sha256 }: fetchurl { + in (mapAttrsToList (name: { rev, sha256 }: fetchurl { name = "gajim-${name}.patch"; url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff"; inherit sha256; - }) cherries; + }) cherries) + ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660 postPatch = '' sed -i -e '0,/^[^#]/ { diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch new file mode 100644 index 000000000000..cb866bb2d739 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/gajim.py b/src/common/gajim.py +index 4a5d884b6..95d401b67 100644 +--- a/src/common/gajim.py ++++ b/src/common/gajim.py +@@ -415,7 +415,7 @@ def get_jid_from_account(account_name, full=False): + jid = name + '@' + hostname + if full: + resource = connections[account_name].server_resource +- jid += '/' + resource ++ jid += '/' + str(resource) + return jid + + def get_our_jids(): diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 25d71fa88597..bc6e7a5f7def 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,18 +3,16 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2016-11-18"; + version = "2017-05-24"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "cab34acab004023911997ec9aee8b00a976af7e4"; - sha256 = "0h7wdsic4v6ys130w61zvxm5s2vc7y574hn7zby12rq88lhhrjh7"; + rev = "49a326d5696aa24f3ac18534c8860e03d0d58548"; + sha256 = "0p741mzq4kkqyly8njga1f5dxdnfz31wy2lpvs5542pq0iwvdj7k"; }; - patches = [ ./uchar.patch ]; - buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring diff --git a/pkgs/applications/networking/instant-messengers/jackline/uchar.patch b/pkgs/applications/networking/instant-messengers/jackline/uchar.patch deleted file mode 100644 index f861135090e5..000000000000 --- a/pkgs/applications/networking/instant-messengers/jackline/uchar.patch +++ /dev/null @@ -1,302 +0,0 @@ -diff --git a/_tags b/_tags -index 88318d9..b433ee8 100644 ---- a/_tags -+++ b/_tags -@@ -7,9 +7,11 @@ true : package(sexplib astring) - - : package(otr ppx_sexp_conv) - : package(uutf) -+: package(uchar) -+: package(uchar) - : package(lwt nocrypto) - : package(ppx_sexp_conv erm_xmpp) --: package(ppx_sexp_conv otr hex ptime ptime.clock.os) -+: package(uchar ppx_sexp_conv otr hex ptime ptime.clock.os) - : package(erm_xmpp lwt tls tls.lwt ptime) - : package(erm_xmpp lwt tls tls.lwt) - -@@ -18,6 +20,6 @@ true : package(sexplib astring) - : package(notty lwt erm_xmpp otr) - : package(lwt otr erm_xmpp) - : package(lwt nocrypto otr notty tls.lwt x509) --: package(hex lwt nocrypto erm_xmpp tls.lwt x509) -+: package(uchar hex lwt nocrypto erm_xmpp tls.lwt x509) - - : package(erm_xmpp hex lwt notty notty.lwt nocrypto otr sexplib tls tls.lwt ptime ptime.clock.os) -diff --git a/cli/cli_config.ml b/cli/cli_config.ml -index 618d655..dac6e68 100644 ---- a/cli/cli_config.ml -+++ b/cli/cli_config.ml -@@ -34,7 +34,7 @@ let rewrap term above below (prefix, inp, inp2) (width, _) = - let height = if col mod width = 0 then succ h else h in - (succ (col mod width), height) - in -- Notty_lwt.Term.cursor term (Some (col, row)) -+ Notty_lwt.Term.cursor term (Some (col - 1, row - 1)) - - let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term = - let rec go (pre, post) = -@@ -56,8 +56,8 @@ let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term = - | `Unhandled k -> - match k with - | `Key (`Enter, []) -> Lwt.return (char_list_to_str (pre @ post)) -- | `Key (`Uchar 0x43, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-c") -- | `Key (`Uchar 0x44, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-d") -+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x43 -> Lwt.fail (Invalid_argument "Ctrl-c") -+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 -> Lwt.fail (Invalid_argument "Ctrl-d") - | _ -> go (pre, post) - in - let pre = Utils.option [] str_to_char_list default in -@@ -180,7 +180,7 @@ let configure term () = - let pw = "Password: " in - let chars = match password with - | None -> I.string A.empty "will be asked at startup" -- | Some _ -> I.uchar A.empty 0x2605 5 1 -+ | Some _ -> I.uchar A.empty (Uchar.of_int 0x2605) 5 1 - in - above @ [I.(string A.empty pw <|> chars)] - in -diff --git a/cli/cli_input.ml b/cli/cli_input.ml -index 34b4288..07488f2 100644 ---- a/cli/cli_input.ml -+++ b/cli/cli_input.ml -@@ -314,19 +314,19 @@ let read_terminal term mvar input_mvar () = - | `Key (`Arrow `Up, []) -> p (fun s -> ok (history s Up)) >>= fun () -> loop () - | `Key (`Arrow `Down, []) -> p (fun s -> ok (history s Down)) >>= fun () -> loop () - -- | `Key (`Uchar 0x44, [`Ctrl]) (* C-d *) -> p (fun s -> Lwt.return (`Quit s)) -+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 (* C-d *) -> p (fun s -> Lwt.return (`Quit s)) - - (* UI navigation and toggles *) - | `Key (`Page `Up, []) -> p (fun s -> ok (navigate_buddy_list s Up)) >>= fun () -> loop () - | `Key (`Page `Down, []) -> p (fun s -> ok (navigate_buddy_list s Down)) >>= fun () -> loop () - - | `Key (`Page `Up, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop () -- | `Key (`Uchar 0x50, [`Ctrl]) (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop () -+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x50 (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop () - | `Key (`Page `Down, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop () -- | `Key (`Uchar 0x4E, [`Ctrl]) (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop () -+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x4E (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop () - -- | `Key (`Uchar 0x58, [`Ctrl]) (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop () -- | `Key (`Uchar 0x51, [`Ctrl]) (* C-q *) -> -+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x58 (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop () -+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x51 (* C-q *) -> - let handle s = - let s = match List.rev s.notifications with - | x::_ -> activate_contact s x -diff --git a/cli/cli_state.ml b/cli/cli_state.ml -index 5603cfe..ee320ce 100644 ---- a/cli/cli_state.ml -+++ b/cli/cli_state.ml -@@ -24,7 +24,7 @@ type connect_v = - | Reconnect - | Presence of (User.presence * string option * int option) - --type input = int list * int list -+type input = Uchar.t list * Uchar.t list - - type state = { - (* set only initially *) -diff --git a/cli/cli_support.ml b/cli/cli_support.ml -index 1c54df6..8275c38 100644 ---- a/cli/cli_support.ml -+++ b/cli/cli_support.ml -@@ -4,17 +4,17 @@ open Notty - module Char = struct - let hdash a w = - if !Utils.unicode then -- I.uchar a 0x2500 w 1 -+ I.uchar a (Uchar.of_int 0x2500) w 1 - else - I.char a '-' w 1 - and vdash a h = - if !Utils.unicode then -- I.uchar a 0x2502 1 h -+ I.uchar a (Uchar.of_int 0x2502) 1 h - else - I.char a '|' 1 h - and star a w = - if !Utils.unicode then -- I.uchar a 0x2605 w 1 -+ I.uchar a (Uchar.of_int 0x2605) w 1 - else - I.char a '*' w 1 - end -@@ -186,8 +186,8 @@ let v_center left right width = - and rw = I.width right - in - match rw, lw >= width with -- | 0, true -> (I.hcrop (lw - width + 1) 0 left, width) -- | 0, false -> (left, succ lw) -+ | 0, true -> (I.hcrop (lw - width + 1) 0 left, width - 1) -+ | 0, false -> (left, lw) - | _, _ -> - if lw + rw >= width then - let leftw = min (max (width - rw) (width / 2)) lw in -@@ -195,11 +195,11 @@ let v_center left right width = - let l = I.hcrop (lw - leftw) 0 left - and r = I.hcrop 0 (rw - rightw) right - in -- (I.(l <|> r), succ leftw) -+ (I.(l <|> r), leftw) - else -- (I.(left <|> right), succ lw) -+ (I.(left <|> right), lw) - --let str_to_char_list str : int list = -+let str_to_char_list str : Uchar.t list = - let open Uutf in - List.rev (String.fold_utf_8 (fun acc _ -> function `Uchar i -> i :: acc | `Malformed _ -> acc) [] str) - -@@ -236,22 +236,26 @@ let readline_input = function - | k -> `Unhandled k - - let emacs_bindings = function -- | `Key (`Uchar 0x41, [`Ctrl]) (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post)) -- | `Key (`Uchar 0x45, [`Ctrl]) (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, [])) -+ | `Key (`Uchar u, [`Ctrl]) as k -> -+ begin match Uchar.to_int u with -+ | 0x41 (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post)) -+ | 0x45 (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, [])) - -- | `Key (`Uchar 0x4b, [`Ctrl]) (* C-k *) -> `Ok (fun (pre, _) -> (pre, [])) -- | `Key (`Uchar 0x55, [`Ctrl]) (* C-u *) -> `Ok (fun (_, post) -> ([], post)) -+ | 0x4b (* C-k *) -> `Ok (fun (pre, _) -> (pre, [])) -+ | 0x55 (* C-u *) -> `Ok (fun (_, post) -> ([], post)) - -- | `Key (`Uchar 0x46, [`Ctrl]) (* C-f *) -> -+ | 0x46 (* C-f *) -> - `Ok (fun (pre, post) -> - match post with - | [] -> (pre, post) - | hd::tl -> (pre @ [hd], tl)) -- | `Key (`Uchar 0x42, [`Ctrl]) (* C-b *) -> -+ | 0x42 (* C-b *) -> - `Ok (fun (pre, post) -> - match List.rev pre with - | [] -> ([], post) - | hd::tl -> (List.rev tl, hd :: post)) -+ | _ -> `Unhandled k -+ end - - | `Key (`Arrow `Left, [`Ctrl]) -> - `Ok (fun (pre, post) -> -diff --git a/src/contact.mli b/src/contact.mli -index 6926296..d6c795b 100644 ---- a/src/contact.mli -+++ b/src/contact.mli -@@ -8,7 +8,7 @@ val bare : contact -> Xjid.bare_jid - val preserve_messages : contact -> bool - val expanded : contact -> bool - val messages : contact -> User.message list --val input_buffer : contact -> (int list * int list) -+val input_buffer : contact -> (Uchar.t list * Uchar.t list) - - val readline_history : contact -> string list - val add_readline_history : contact -> string -> contact -@@ -18,7 +18,7 @@ val set_history_position : contact -> int -> contact - val received : contact -> string -> contact - - val expand : contact -> contact --val set_input_buffer : contact -> (int list * int list) -> contact -+val set_input_buffer : contact -> (Uchar.t list * Uchar.t list) -> contact - val set_preserve_messages : contact -> bool -> contact - - val reset : contact -> contact -diff --git a/src/muc.ml b/src/muc.ml -index 1c98037..3293541 100644 ---- a/src/muc.ml -+++ b/src/muc.ml -@@ -132,7 +132,7 @@ type groupchat = { - expand : bool ; - preserve_messages : bool ; - message_history : User.message list ; (* persistent if preserve_messages *) -- input_buffer : (int list * int list) ; -+ input_buffer : (Uchar.t list * Uchar.t list) ; - readline_history : string list ; - history_position : int ; - autojoin : bool ; -diff --git a/src/user.ml b/src/user.ml -index d039278..42a8c47 100644 ---- a/src/user.ml -+++ b/src/user.ml -@@ -229,7 +229,7 @@ type user = { - properties : property list ; - preserve_messages : bool ; - message_history : message list ; (* persistent if preserve_messages is true *) -- input_buffer: (int list * int list) ; (* not persistent *) -+ input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *) - readline_history : string list ; (* not persistent *) - history_position : int ; (* not persistent *) - otr_fingerprints : fingerprint list ; -diff --git a/src/user.mli b/src/user.mli -index 52b503d..5ce41be 100644 ---- a/src/user.mli -+++ b/src/user.mli -@@ -118,7 +118,7 @@ type user = { - properties : property list ; - preserve_messages : bool ; - message_history : message list ; (* persistent if preserve_messages is true *) -- input_buffer: (int list * int list) ; (* not persistent *) -+ input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *) - readline_history : string list ; (* not persistent *) - history_position : int ; - otr_fingerprints : fingerprint list ; -diff --git a/src/utils.ml b/src/utils.ml -index 0b4a3a7..cd9cb10 100644 ---- a/src/utils.ml -+++ b/src/utils.ml -@@ -30,31 +30,33 @@ let validate_utf8 txt = - let rec loop d buf = match Uutf.decode d with - | `Await -> Buffer.contents buf - | `End -> Buffer.contents buf -- | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD; loop d buf -- | `Uchar 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf 0x000A ; loop d buf -- | `Uchar 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; loop d buf -- | `Uchar 0x007F (* DEL *) -+ | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD); loop d buf -+ | `Uchar u -> -+ match Uchar.to_int u with -+ | 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x000A) ; loop d buf -+ | 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; loop d buf -+ | 0x007F (* DEL *) - (* See https://en.wikipedia.org/wiki/Unicode_control_characters / https://en.wikipedia.org/wiki/Bi-directional_text *) -- | `Uchar 0x200E | `Uchar 0x200F (* left-to-right / right-to-left *) -- | `Uchar 0x202A | `Uchar 0x202D (* left-to-right embedding / override *) -- | `Uchar 0x202B | `Uchar 0x202E (* right-to-left embedding / override *) -- | `Uchar 0x202C (* pop directional format *) -- | `Uchar 0x2066 | `Uchar 0x2067 (* l-t-r isolate r-t-l isolate *) -- | `Uchar 0x2068 | `Uchar 0x2069 (* first strong isolate / pop directional isolate *) -- | `Uchar 0x2028 | `Uchar 0x2029 (* line separator / page separator *) -> -- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf -- | `Uchar x when x < 0x20 -> -+ | 0x200E | 0x200F (* left-to-right / right-to-left *) -+ | 0x202A | 0x202D (* left-to-right embedding / override *) -+ | 0x202B | 0x202E (* right-to-left embedding / override *) -+ | 0x202C (* pop directional format *) -+ | 0x2066 | 0x2067 (* l-t-r isolate r-t-l isolate *) -+ | 0x2068 | 0x2069 (* first strong isolate / pop directional isolate *) -+ | 0x2028 | 0x2029 (* line separator / page separator *) -> -+ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf -+ | x when x < 0x20 -> - (* other control characters *) -- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf -- | `Uchar x when x >= 0x0080 && x <= 0x009F -> -+ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf -+ | x when x >= 0x0080 && x <= 0x009F -> - (* ctrl chars used in conjunction with ISO 8859 character sets (C0/C1) *) -- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf -+ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf - -- | `Uchar x -> -+ | x -> - let c = if !unicode then x else if x > 0xff then 0x3f else x in -- Uutf.Buffer.add_utf_8 buf c ; loop d buf -+ Uutf.Buffer.add_utf_8 buf (Uchar.of_int c) ; loop d buf - in -- let nln = `Readline 0x000A in -+ let nln = `Readline (Uchar.of_int 0x000A) in - loop (Uutf.decoder ~nln ~encoding:`UTF_8 (`String txt)) (Buffer.create (String.length txt)) - - let version = "%%VERSION_NUM%%" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 30fedec1a4bb..c4cb25dfe987 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -6,7 +6,6 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "jitsi-${version}"; version = "2.10.5550"; @@ -15,7 +14,6 @@ stdenv.mkDerivation rec { sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; }; - patches = [ ./jitsi.patch ]; jitsiItem = makeDesktopItem { @@ -42,7 +40,8 @@ stdenv.mkDerivation rec { xorg.libXv ]); - buildInputs = [unzip ant jdk]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant jdk ]; buildPhase = ''ant make''; @@ -55,11 +54,11 @@ stdenv.mkDerivation rec { cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi substituteInPlace $out/bin/jitsi \ - --subst-var-by JAVA ${jdk}/bin/java \ - --subst-var-by EXTRALIBS ${gtk2.out}/lib + --subst-var-by JAVA ${jdk}/bin/java \ + --subst-var-by EXTRALIBS ${gtk2.out}/lib + sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi patchShebangs $out - - libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" + libPath="$libPath:${jdk.home}/lib/${jdk.architecture}" find $out/ -type f -name '*.so' | while read file; do patchelf --set-rpath "$libPath" "$file" && \ patchelf --shrink-rpath "$file" @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.khumba ]; + maintainers = with maintainers; [ khumba ndowens ]; }; - } diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 2bb0d9579428..dcffa2f14f46 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/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix new file mode 100644 index 000000000000..f12a14c5c926 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix @@ -0,0 +1,104 @@ +{ + stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat, + fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg +}: + +with stdenv.lib; + +let + + version = "2.0.6"; + + rpath = makeLibraryPath [ + alsaLib + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + glib + gnome2.GConf + gnome2.gdk_pixbuf + gnome2.gtk + gnome2.pango + libnotify + nspr + nss + stdenv.cc.cc + systemd + + xorg.libxkbfile + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXScrnSaver + ] + ":${stdenv.cc.cc.lib}/lib64"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb"; + sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b"; + } + else + throw "Messenger for Desktop is not supported on ${stdenv.system}"; + +in stdenv.mkDerivation { + name = "messenger-for-desktop-${version}"; + + inherit src; + + buildInputs = [ dpkg ]; + unpackPhase = "true"; + buildCommand = '' + mkdir -p $out + dpkg -x $src $out + + mv $out/usr/share $out/share + mv $out/opt/messengerfordesktop $out/libexec + rmdir $out/usr $out/opt + + chmod -R g-w $out + + # patch the binaries + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/libexec $file || true + done + + # add symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop + + # Fix the desktop link + substituteInPlace $out/share/applications/messengerfordesktop.desktop \ + --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop + ''; + + meta = { + description = "Bring messenger.com to your Linux desktop."; + longDescription = '' + A simple & beautiful desktop client for Facebook Messenger. Chat without + distractions on OS X, Windows and Linux. Not affiliated with Facebook. + This is NOT an official product. + ''; + homepage = https://messengerfordesktop.org; + license = licenses.mit; + maintainers = [ + maintainers.shawndellysse + ]; + platforms = [ + "x86_64-linux" + ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile new file mode 100644 index 000000000000..66b17ff87607 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile @@ -0,0 +1,37 @@ +alias __source_distinct__ source +def source(url) + @loaded ||= {} + unless @loaded[url] + @loaded[url] = true + __source_distinct__(url) end end + +source 'https://rubygems.org' + +group :default do + gem 'oauth', '>= 0.5.1' + gem 'json_pure', '~> 1.8' + gem 'addressable', '~> 2.3' + gem 'memoist', '~> 0.14' + gem 'ruby-hmac', '~> 0.4' + gem 'typed-array', '~> 0.1' + gem 'delayer', '~> 0.0' + gem 'pluggaloid', '>= 1.1.1', '< 2.0' + gem 'delayer-deferred', '>= 1.0.4', '< 2.0' + gem 'twitter-text', '1.14.2' +end + +group :test do + gem 'test-unit', '~> 3.0' + gem 'rake', '~> 10.1' + gem 'watch', '~> 0.1' + gem 'mocha', '~> 0.14' + gem 'webmock', '~> 1.17' + gem 'ruby-prof' +end + + +group :plugin do + Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "core/plugin/*/Gemfile"))){ |path| + eval File.open(path).read + } +end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock new file mode 100644 index 000000000000..58f41087919e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock @@ -0,0 +1,104 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) + atk (3.1.1) + glib2 (= 3.1.1) + cairo (1.15.7) + native-package-installer + pkg-config (>= 1.1.5) + crack (0.4.3) + safe_yaml (~> 1.0.0) + delayer (0.0.2) + delayer-deferred (1.1.1) + delayer (>= 0.0.2, < 0.1) + gdk_pixbuf2 (3.1.1) + gio2 (= 3.1.1) + gettext (3.0.9) + locale (>= 2.0.5) + text + gio2 (3.1.1) + glib2 (= 3.1.1) + gobject-introspection (= 3.1.1) + glib2 (3.1.1) + pkg-config + gobject-introspection (3.1.1) + glib2 (= 3.1.1) + gtk2 (3.1.1) + atk (= 3.1.1) + gdk_pixbuf2 (= 3.1.1) + pango (= 3.1.1) + hashdiff (0.3.4) + httpclient (2.8.3) + instance_storage (1.0.0) + json_pure (1.8.6) + locale (2.1.2) + memoist (0.15.0) + metaclass (0.0.4) + mini_portile2 (2.1.0) + mocha (0.14.0) + metaclass (~> 0.0.1) + moneta (1.0.0) + native-package-installer (1.0.1) + nokogiri (1.7.2) + mini_portile2 (~> 2.1.0) + oauth (0.5.1) + pango (3.1.1) + cairo (>= 1.14.0) + glib2 (= 3.1.1) + pkg-config (1.2.0) + pluggaloid (1.1.1) + delayer + instance_storage (>= 1.0.0, < 2.0.0) + power_assert (1.0.2) + public_suffix (2.0.5) + rake (10.5.0) + ruby-hmac (0.4.0) + ruby-prof (0.16.2) + safe_yaml (1.0.4) + test-unit (3.2.3) + power_assert + text (1.3.1) + totoridipjp (0.1.0) + twitter-text (1.14.2) + unf (~> 0.1.0) + typed-array (0.1.2) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.4) + watch (0.1.0) + webmock (1.24.6) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + +PLATFORMS + ruby + +DEPENDENCIES + addressable (~> 2.3) + delayer (~> 0.0) + delayer-deferred (>= 1.0.4, < 2.0) + gettext (~> 3.0.1) + gtk2 (= 3.1.1) + httpclient + json_pure (~> 1.8) + memoist (~> 0.14) + mocha (~> 0.14) + moneta + nokogiri + oauth (>= 0.5.1) + pluggaloid (>= 1.1.1, < 2.0) + rake (~> 10.1) + ruby-hmac (~> 0.4) + ruby-prof + test-unit (~> 3.0) + totoridipjp + twitter-text (= 1.14.2) + typed-array (~> 0.1) + watch (~> 0.1) + webmock (~> 1.17) + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile new file mode 100644 index 000000000000..4015fbec1bc9 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'gtk2', '3.1.1' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile new file mode 100644 index 000000000000..f86005fef078 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile @@ -0,0 +1 @@ +gem 'moneta' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile new file mode 100644 index 000000000000..ee2ecf52d42e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +gem 'nokogiri' +gem 'httpclient' +gem 'totoridipjp' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile new file mode 100644 index 000000000000..1625327f16dc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +group :default do + gem 'gettext', '~> 3.0.1' +end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix new file mode 100644 index 000000000000..4d69c5501e6b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl +, bundlerEnv, ruby, pkgconfig +, alsaUtils, libnotify, which, wrapGAppsHook, gtk2 +}: + +stdenv.mkDerivation rec { + name = "mikutter-${version}"; + version = "3.5.7"; + + src = fetchurl { + url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; + sha256 = "1vh5ap92q869j69hmmbznailaflmdp0km4sqdv06cpq7v8pwm28w"; + }; + + env = bundlerEnv { + name = "mikutter-${version}-gems"; + gemdir = ./.; + + inherit ruby; + }; + + buildInputs = [ alsaUtils libnotify which gtk2 ruby ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + postUnpack = '' + rm -rf $sourceRoot/vendor + ''; + + installPhase = '' + install -v -D -m644 README $out/share/doc/mikutter/README + install -v -D -m644 LICENSE $out/share/doc/mikutter/LICENSE + rm -v README LICENSE + + cp -rv . $out + mkdir $out/bin/ + # hack wrapGAppsHook wants a file not a symlink + mv $out/mikutter.rb $out/bin/mikutter + + gappsWrapperArgs+=( + --prefix PATH : "${ruby}/bin:${alsaUtils}/bin:${libnotify}/bin" + --prefix GEM_HOME : "${env}/${env.ruby.gemPath}" + --set DISABLE_BUNDLER_SETUP 1 + ) + + mkdir -p $out/share/mikutter $out/share/applications + ln -sv $out/core/skin $out/share/mikutter/skin + substituteAll ${./mikutter.desktop} $out/share/applications/mikutter.desktop + ''; + + postFixup = '' + mv $out/bin/.mikutter-wrapped $out/mikutter.rb + substituteInPlace $out/bin/mikutter \ + --replace "$out/bin/.mikutter-wrapped" "$out/mikutter.rb" + ''; + + meta = with stdenv.lib; { + description = "An extensible Twitter client"; + homepage = "https://mikutter.hachune.net"; + maintainers = with maintainers; [ midchildan ]; + platforms = ruby.meta.platforms; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix new file mode 100644 index 000000000000..d6d99f3d55b7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -0,0 +1,365 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; + type = "gem"; + }; + version = "2.5.1"; + }; + atk = { + dependencies = ["glib2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17x88g596s3pqfxplm5ia7anpcmd9kxs4nzmpf2h74bqwkbq2jrz"; + type = "gem"; + }; + version = "3.1.1"; + }; + cairo = { + dependencies = ["native-package-installer" "pkg-config"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "115ksrswbs7pg7kdfi2w8bi9xxv9gzmfvcjj8qj4dxy8dkvp3k4d"; + type = "gem"; + }; + version = "1.15.7"; + }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; + delayer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r"; + type = "gem"; + }; + version = "0.0.2"; + }; + delayer-deferred = { + dependencies = ["delayer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bw48i6qbxmjf2al4a0mw23nlkcrjrwsrdrabbwz62v8sdmdynpc"; + type = "gem"; + }; + version = "1.1.1"; + }; + gdk_pixbuf2 = { + dependencies = ["gio2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x9fzsazfi6f3iq7zkqc0vjl6311876dvff0000vg41rajv3rhh1"; + type = "gem"; + }; + version = "3.1.1"; + }; + gettext = { + dependencies = ["locale" "text"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14vw306p46w2kyad3kp9vq56zw3ch6px30wkhl5x0qkx8d3ya3ir"; + type = "gem"; + }; + version = "3.0.9"; + }; + gio2 = { + dependencies = ["glib2" "gobject-introspection"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ki9yxp860xk5cf04hrgvh386n93bkr0pf4c0kl3fx6pnwr4w3v0"; + type = "gem"; + }; + version = "3.1.1"; + }; + glib2 = { + dependencies = ["pkg-config"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "131jd26n2wwp2lrkyyfq5nb3qriasaym1zpygm991qzcaq79i444"; + type = "gem"; + }; + version = "3.1.1"; + }; + gobject-introspection = { + dependencies = ["glib2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fbi1pxyq73d674cwznya6kda38yjp4ahc2xgxi9shsdqmqcx3vs"; + type = "gem"; + }; + version = "3.1.1"; + }; + gtk2 = { + dependencies = ["atk" "gdk_pixbuf2" "pango"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00cbfl306xkglk0cc758vsvv1saaa24gvwh0m2jnzwgfwxk7mc5w"; + type = "gem"; + }; + version = "3.1.1"; + }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + type = "gem"; + }; + version = "0.3.4"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + instance_storage = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl"; + type = "gem"; + }; + version = "1.0.0"; + }; + json_pure = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam"; + type = "gem"; + }; + version = "1.8.6"; + }; + locale = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; + type = "gem"; + }; + version = "2.1.2"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; + type = "gem"; + }; + version = "0.15.0"; + }; + metaclass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + type = "gem"; + }; + version = "0.0.4"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + type = "gem"; + }; + version = "2.1.0"; + }; + mocha = { + dependencies = ["metaclass"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b"; + type = "gem"; + }; + version = "0.14.0"; + }; + moneta = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pgwn6xnlh7vviy511mfgkv2j3sfihn5ic2zabmyrs2nh6kfa912"; + type = "gem"; + }; + version = "1.0.0"; + }; + native-package-installer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zh5x87y9dr16ic7vif2c3rnpr5k5wfs6kihpy4dnb9s0mqyqhsj"; + type = "gem"; + }; + version = "1.0.1"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c"; + type = "gem"; + }; + version = "1.7.2"; + }; + oauth = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; + type = "gem"; + }; + version = "0.5.1"; + }; + pango = { + dependencies = ["cairo" "glib2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18cc24lz4dmb7pavfspivbhbsypf40fhcbdzj8885zs0zr0dknby"; + type = "gem"; + }; + version = "3.1.1"; + }; + pkg-config = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fklf2dnk354ahxma3iki5cx7b8yn9khby162pz17z6f1f3xk84g"; + type = "gem"; + }; + version = "1.2.0"; + }; + pluggaloid = { + dependencies = ["delayer" "instance_storage"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p9s1bzw02jzjlpjpxsbfsy1cyfbqs10iqvhxqh4xgyh72nry9zr"; + type = "gem"; + }; + version = "1.1.1"; + }; + power_assert = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "168ac459nv45a2lhdf86zv35lv9nr569ny5nh3kfnglnxyzyx0kr"; + type = "gem"; + }; + version = "1.0.2"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + type = "gem"; + }; + version = "2.0.5"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; + type = "gem"; + }; + version = "10.5.0"; + }; + ruby-hmac = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954"; + type = "gem"; + }; + version = "0.4.0"; + }; + ruby-prof = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; + type = "gem"; + }; + version = "0.16.2"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + test-unit = { + dependencies = ["power_assert"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kngxp21sqbm7kv7wnxfqk99ik3wv1bjab519vcbj8xj30a5y4py"; + type = "gem"; + }; + version = "3.2.3"; + }; + text = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; + type = "gem"; + }; + version = "1.3.1"; + }; + totoridipjp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck"; + type = "gem"; + }; + version = "0.1.0"; + }; + twitter-text = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lld6d8rzj1zrgs6b227mp675bn8ds56f1c9w9wvx321f6ibn6np"; + type = "gem"; + }; + version = "1.14.2"; + }; + typed-array = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9"; + type = "gem"; + }; + version = "0.1.2"; + }; + unf = { + dependencies = ["unf_ext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + type = "gem"; + }; + version = "0.0.7.4"; + }; + watch = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx"; + type = "gem"; + }; + version = "0.1.0"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5"; + type = "gem"; + }; + version = "1.24.6"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop b/pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop new file mode 100644 index 000000000000..092f5f35cbf8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/mikutter.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=mikutter +Comment=Twitter Client +Type=Application +Exec=@out@/bin/mikutter +Icon=@out@/core/skin/data/icon.png +Terminal=false +Categories=Network; +Keywords=Twitter; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix new file mode 100644 index 000000000000..efa57175b237 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix @@ -0,0 +1,17 @@ +{ pkgs ? import {} }: + +pkgs.stdenv.mkDerivation { + name = "mikutter-shell"; + buildInputs = with pkgs; [ + bundix + bundler + ]; + + shellHook = '' + truncate --size 0 Gemfile.lock + bundle lock + bundle package --path=vendor/bundle --no-install + rm -rf vendor .bundle + bundix -d + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix deleted file mode 100644 index 3d70990f4620..000000000000 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchFromGitHub -, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig -, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver -, scrnsaverproto -}: - -stdenv.mkDerivation rec { - name = "oneteam-unstable-2013-02-21"; - - src = fetchFromGitHub { - repo = "oneteam"; - owner = "processone"; - rev = "c51bc545c3a32db4ea8b96e43b84fcfc6b8d3d2a"; - sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3"; - }; - - nativeBuildInputs = [ pkgconfig cmake zip unzip ]; - - buildInputs = - [ perl xulrunner libpulseaudio glib gtk2 pixman nspr - nss libXScrnSaver scrnsaverproto - ] ++ [ perlPackages.SubName gtk2 glib ]; - - postPatch = '' - sed -e '1i#include ' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp - ''; - - cmakeBuildDir = "cmake-build"; - cmakeFlags = ["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"]; - - buildPhase = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - cd src/components - perl build.pl XULAPP 1 - cd ../../ - ''; - - installPhase = '' - TARGET_DIR="$out/share/oneteam/app" - BUILD_DIR="$PWD" - mkdir -p "$TARGET_DIR" - cd "$TARGET_DIR" - unzip "$BUILD_DIR/oneteam.xulapp" - mkdir -p "$out/bin" - echo "#! ${stdenv.shell}" > "$out/bin/oneteam" - echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam" - chmod a+x "$out/bin/oneteam" - mkdir -p "$out/share/doc" - cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam" - ''; - - meta = { - description = "An XMPP client"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - license = stdenv.lib.licenses.gpl2; - homepage="http://oneteam.im"; - }; - - passthru = { - updateInfo = { - downloadPage = "git://github.com/processone/oneteam"; - }; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix new file mode 100644 index 000000000000..592ef325139f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -0,0 +1,25 @@ +{ stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : + +stdenv.mkDerivation rec { + name = "pidgin-carbons-${version}"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "gkdr"; + repo = "carbons"; + rev = "v${version}"; + sha256 = "05hcqvsirb7gnpfcszsrgal5q7dajl2wdi2dy7c41zgl377syavw"; + }; + + makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; + + buildInputs = [ libxml2 pidgin pkgconfig ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/gkdr/carbons"; + description = "XEP-0280: Message Carbons plugin for libpurple"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jb55 ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 30e4992ff36c..6e96719fd896 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { - name = "purple-facebook-0.9.0"; + name = "purple-facebook-0.9.3"; src = fetchFromGitHub { owner = "dequis"; repo = "purple-facebook"; - rev = "v0.9.0-c9b74a765767"; - sha256 = "1f7jhmaj15p3c9s4xmfygrpav9c8wq0vilbi5cj4jysb7xgndlqv"; + rev = "v0.9.3-c9b74a765767"; + sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb"; }; postPatch = '' 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 36be2517fbd0..a0b7cfa45f2c 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.20.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 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs"; + sha256 = "f6b7b7475e349c0214eb02814b808b04850113a91dd8e8d2c26e7179a3fd1ae8"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 32f4f8f32b36..e1a068393b14 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -3,10 +3,12 @@ , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , notifySupport ? false, libnotify ? null, gdk_pixbuf ? null +, traySupport ? false, gnome2 ? null }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert notifySupport -> libnotify != null && gdk_pixbuf != null; +assert traySupport -> gnome2 != null; with stdenv.lib; @@ -23,7 +25,8 @@ stdenv.mkDerivation rec { pkgconfig readline libuuid libmesode glib openssl expat ncurses libotr curl ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] - ++ optionals notifySupport [ libnotify gdk_pixbuf ]; + ++ optionals notifySupport [ libnotify gdk_pixbuf ] + ++ optionals traySupport [ gnome2.gtk ]; meta = { description = "A console based XMPP client"; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix new file mode 100644 index 000000000000..c4d13ac7643d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, cmake +, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell +, libgcrypt, libotr, html-tidy, libgpgerror +}: + +stdenv.mkDerivation rec { + name = "psi-plus-${version}"; + version = "0.16.575.639"; + + src = fetchFromGitHub { + owner = "psi-plus"; + repo = "psi-plus-snapshots"; + rev = "${version}"; + sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg"; + }; + + resources = fetchFromGitHub { + owner = "psi-plus"; + repo = "resources"; + rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668"; + sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d"; + }; + + postUnpack = '' + cp -a "${resources}/iconsets" "$sourceRoot" + ''; + + cmakeFlags = [ + "-DENABLE_PLUGINS=ON" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit + libidn qca2-qt5 libXScrnSaver hunspell + libgcrypt libotr html-tidy libgpgerror + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "XMPP (Jabber) client"; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 036d7fb3ce52..c8c13a242ffb 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,48 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv, - libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg, - pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper, - 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 }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "qtox-${version}"; - version = "1.8.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "tux3"; repo = "qTox"; rev = "v${version}"; - sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq"; + 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 makeQtWrapper pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DGIT_DESCRIBE=${version}" + ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - cp qtox $out/bin - wrapQtProgram $out/bin/qtox + install -Dm755 qtox $out/bin/qtox runHook postInstall ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Qt Tox client"; license = licenses.gpl3; - maintainers = with maintainers; [ viric jgeerds akaWolf ]; + maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix new file mode 100644 index 000000000000..a2510c777385 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -0,0 +1,41 @@ +{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }: + +mkDerivation rec { + name = "quaternion-git-${version}"; + version = "2017-06-29"; + + # quaternion and tensor share the same libqmatrixclient library as a git submodule + # + # As all 3 projects are in very early stages, we simply load the submodule. + # + # At some point in the future, we should separate out libqmatrixclient into its own + # derivation. + + src = fetchgit { + url = "https://github.com/QMatrixClient/Quaternion.git"; + rev = "1febc0178fd3d02b7426f58981b54924ad60c84d"; + sha256 = "1whjhlphdhk7kgw2zqc0wj3k2i9gkp79qq2bnrh4mbcp3qmcqngr"; + fetchSubmodules = true; + }; + + buildInputs = [ qtbase qtquickcontrols ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + postInstall = '' + substituteInPlace $out/share/applications/quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + ''; + + meta = with lib; { + description = "Cross-platform desktop IM client for the Matrix protocol"; + 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 15df03ac90d9..7cb89f019e0e 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -6,13 +6,23 @@ let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; - version = "0.5.3"; + 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"; sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b"; }; - desktopItem = makeDesktopItem rec { name = "Rambox"; exec = "rambox"; @@ -26,35 +36,28 @@ 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 - "14pp466l0fj98p5qsb7i11hd603gwsir26m3j4gljzcizb9hirqv" else - "13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085"; + "1i5jbhsfdbhr0rsb5w2pfpwjiagz47ppxk65qny3ay3lr4lbccn3" else + "1p1m6vsa9xvl3pjf3pygvllyk7j4q9vnlzmrizb8f5q30fpls25x"; }; - phases = [ "unpackPhase" "installPhase" "postFixup" ]; - - deps = with xorg; [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib - cups expat stdenv.cc.cc - - udev libnotify - ]; + # don't remove runtime deps + dontPatchELF = true; installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox - patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" rambox + patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox - mkdir -p $out/bin $out/share/rambox - cp -r * $out/share/rambox - ln -s $out/share/rambox/rambox $out/bin + mkdir -p $out/bin $out/opt/rambox + cp -r * $out/opt/rambox + ln -s $out/opt/rambox/rambox $out/bin + # provide desktop item mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications ''; postFixup = '' - paxmark m $out/share/rambox/rambox + paxmark m $out/opt/rambox/rambox ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index d1af2ad70d19..b1dd7a4c90f3 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip -, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols -, openssl, protobuf, qmakeHook +, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols +, openssl, protobuf, qmake }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { openssl protobuf ]; - nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ pkgconfig qmake ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp ricochet $out/bin - wrapQtProgram $out/bin/ricochet mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications 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 000000000000..0632e787c700 --- /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 000000000000..842060935b04 --- /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 000000000000..0546d2dae472 --- /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/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index c035fc626651..4f360c831a25 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -1,49 +1,53 @@ -{stdenv, fetchurl, pythonPackages}: +{stdenv, fetchurl, python27Packages, file }: let - inherit (pythonPackages) python; -in stdenv.mkDerivation rec { - url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2"; - name = stdenv.lib.nameFromURL url ".tar"; - src = fetchurl { - inherit url; - sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1"; - }; + inherit (python27Packages) python; +in + stdenv.mkDerivation rec { + name = "salut-a-toi"; + version = "0.6.1"; + pname = "sat-${version}"; - buildInputs = with pythonPackages; + src = fetchurl { + url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2"; + sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d"; + }; + + buildInputs = with python27Packages; [ - python twisted urwid beautifulsoup wxPython pygobject2 - wokkel dbus-python pyfeed wrapPython setuptools + python twisted urwid wxPython pygobject2 + wokkel dbus-python pyfeed wrapPython setuptools file + pycrypto pyxdg ]; - configurePhase = '' - sed -i "/use_setuptools/d" setup.py - sed -e "s@sys.prefix@'$out'@g" -i setup.py - sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh - sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh + configurePhase = '' + sed -i "/use_setuptools/d" setup.py + sed -e "s@sys.prefix@'$out'@g" -i setup.py + sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh + sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh - echo 'import wokkel.muc' | python - ''; + echo 'import wokkel.muc' | python + ''; - buildPhase = '' - ${python.interpreter} setup.py build - ''; + buildPhase = '' + ${python.interpreter} setup.py build + ''; - installPhase = '' - ${python.interpreter} setup.py install --prefix="$out" + installPhase = '' + ${python.interpreter} setup.py install --prefix="$out" - for i in "$out/bin"/*; do + for i in "$out/bin"/*; do head -n 1 "$i" | grep -E '[/ ]python( |$)' && { wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}" } || true - done - ''; - - meta = { - homepage = "http://sat.goffi.org/"; - description = "A multi-frontend XMPP client"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.gpl3Plus; - }; -} + done + ''; + + meta = with stdenv.lib; { + homepage = http://sat.goffi.org/; + description = "A multi-frontend XMPP client"; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl3Plus; + }; + } diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index d9a3dfc690dd..9d2de536dbf6 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchgit, python3Packages }: +{ stdenv, fetchurl, python3Packages }: -python3Packages.buildPythonPackage { - name = "scudcloud-1.44"; +let version = "1.58"; +in python3Packages.buildPythonPackage { + name = "scudcloud-${version}"; - # Branch 254-port-to-qt5 - # https://github.com/raelgc/scudcloud/commit/65c304416dfdd5f456fa6f7301432a953d5e12d0 - src = fetchgit { - url = https://github.com/raelgc/scudcloud/; - rev = "65c304416dfdd5f456fa6f7301432a953d5e12d0"; - sha256 = "0h1055y88kldqw31ayqfx9zsksgxsyqd8h0hwnhj80yn3jcx0rp6"; + src = fetchurl { + url = "https://github.com/raelgc/scudcloud/archive/v${version}.tar.gz"; + sha256 = "1j84qdc2j3dvl1nhrjqm0blc8ww723p9a6hqprkkp8alw77myq1l"; }; propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix new file mode 100644 index 000000000000..9bad366b8ef3 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -0,0 +1,101 @@ +{ stdenv, fetchurl, dpkg, makeWrapper +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2 +, libnotify, nspr, nss, systemd, xorg }: + +let + + version = "5.3.0.1"; + + rpath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + glib + + gnome2.GConf + gnome2.gdk_pixbuf + gnome2.gtk + gnome2.pango + + gnome2.gnome_keyring + + libnotify + nspr + nss + stdenv.cc.cc + systemd + + xorg.libxkbfile + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXScrnSaver + xorg.libxcb + ] + ":${stdenv.cc.cc.lib}/lib64"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; + sha256 = "08sf9nqnznsydw4965w7ixwwba54hjc02ga7vcnz9vpx5hln3nrz"; + } + else + throw "Skype for linux is not supported on ${stdenv.system}"; + +in stdenv.mkDerivation { + name = "skypeforlinux-${version}"; + + system = "x86_64-linux"; + + inherit src; + + buildInputs = [ dpkg makeWrapper ]; + + unpackPhase = "true"; + installPhase = '' + mkdir -p $out + dpkg -x $src $out + cp -av $out/usr/* $out + rm -rf $out/opt $out/usr + rm $out/bin/skypeforlinux + + # Otherwise it looks "suspicious" + chmod -R g-w $out + ''; + + postFixup = '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux" + + ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" + + # Fix the desktop link + substituteInPlace $out/share/applications/skypeforlinux.desktop \ + --replace /usr/bin/ $out/bin/ \ + --replace /usr/share/ $out/share/ + + ''; + + meta = with stdenv.lib; { + description = "Linux client for skype"; + homepage = "https://www.skype.com"; + license = licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ panaeon ]; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 59ce03cc0f45..edd66bd900b3 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2 -, libnotify, nspr, nss, systemd, xorg }: +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: let - version = "2.5.1"; + version = "2.6.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -22,6 +22,7 @@ let gnome2.gtk gnome2.pango libnotify + libxcb nspr nss stdenv.cc.cc @@ -45,7 +46,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1rrhgqmz0ajv2135bzykv3dq0mifzf5kiycgrisk2sfxn6nwyyvj"; + sha256 = "01zdzzpnv8qpmcpy6h9x7izrnwm0y015j5p5rnjwx8ki712wnmm8"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 36a91716f5ea..efafbd9050cd 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype -, xorg, fontconfig, qtbase, xkeyboard_config, alsaLib, libpulseaudio ? null +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl +, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, xkeyboard_config, alsaLib, libpulseaudio ? null , libredirect, quazip, less, which, unzip, llvmPackages }: @@ -10,10 +10,10 @@ let libDir = if stdenv.is64bit then "lib64" else "lib"; deps = - [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender + [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase libpulseaudio - llvmPackages.libcxx llvmPackages.libcxxabi + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase qtwebengine qtwebchannel libpulseaudio + quazip llvmPackages.libcxx llvmPackages.libcxxabi ]; desktopItem = makeDesktopItem { @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.0.19.4"; + version = "3.1.4"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "f74617d2a2f5cb78e0ead345e6ee66c93e4a251355779018fd060828e212294a" - else "e11467dc1732ddc21ec0d86c2853c322af7a6b8307e3e8dfebc6b4b4d7404841"; + then "337aec99070366aa3bb82b1bedd8215372b9c74014b198d45d5d6375d1f1c3a8" + else "4e126e005b1180655b0847cbdbfc9c47c59c639b7f93f0d988b54a8c4c6ec80f"; }; # grab the plugin sdk for the desktop icon @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { '' # Delete unecessary libraries - these are provided by nixos. rm *.so.* *.so + rm QtWebEngineProcess rm qt.conf # Install files. @@ -89,7 +90,6 @@ stdenv.mkDerivation rec { ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client wrapProgram $out/bin/ts3client \ - --set LD_LIBRARY_PATH "${quazip}/lib" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 73e8ab83f725..c86de07bc842 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.0.13.5"; + version = "3.0.13.6"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "bd5933dd17d17f93d56f69332927cd1ce6f34439ec464a0ce2ca73102d85080c" - else "848e1a44af3c2b00840a280ba558a13407f4844432ddfd262ee8a7800365386b"; + then "19ccd8db5427758d972a864b70d4a1263ebb9628fcc42c3de75ba87de105d179" + else "2f70b3e70a3d9bf86106fab67a938922c8d27fec24e66e229913f78a0791b967"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index f0c99841c1b0..67d1f55f2fe0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchgit , qtbase, qtmultimedia, qtquick1, qtquickcontrols -, qtimageformats, qtgraphicaleffects +, qtimageformats, qtgraphicaleffects, qtwebkit , telegram-qml, libqtelegram-aseman-edition , gst_all_1 -, makeQtWrapper, qmakeHook }: +, makeWrapper, qmake }: stdenv.mkDerivation rec { name = "cutegram-${meta.version}"; @@ -16,16 +16,16 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtquick1 qtquickcontrols - qtimageformats qtgraphicaleffects - telegram-qml libqtelegram-aseman-edition + qtimageformats qtgraphicaleffects qtwebkit + telegram-qml libqtelegram-aseman-edition ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]); - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; enableParallelBuilding = true; + nativeBuildInputs = [ makeWrapper qmake ]; fixupPhase = '' - wrapQtProgram $out/bin/cutegram \ + wrapProgram $out/bin/cutegram \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index 322c40afc7dc..ec2e65dc4997 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmakeHook }: +, qtbase, qtmultimedia, qtquick1, qmake }: stdenv.mkDerivation rec { name = "libqtelegram-aseman-edition-${meta.version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase qtmultimedia qtquick1 ]; - nativeBuildInputs = [ qmakeHook ]; enableParallelBuilding = true; + nativeBuildInputs = [ qmake ]; patchPhase = '' substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" "" diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 67d86571b885..446156fbe4cf 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,147 +1,105 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake -, qtbase, qtimageformats, qtwayland -, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus -, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 -, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland -, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau - -, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon -, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11 -, inputproto, sqlite, dbus +{ mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake +, qtbase, qtimageformats +, breakpad, gtk3, libappindicator-gtk3, dee +, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio +, gcc }: -let - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - packagedQt = "5.6.2"; - # Hacky: split "1.2.3-4" into "1.2.3" and "4" - systemQt = (builtins.parseDrvName qtbase.version).name; - qtLibs = [ qtbase qtimageformats qtwayland ]; - -in stdenv.mkDerivation rec { +mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.0.2"; - qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; + version = "1.1.7"; - src = fetchFromGitHub { - owner = "telegramdesktop"; - repo = "tdesktop"; - rev = "v${version}"; - sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2"; + # Submodules + src = fetchgit { + url = "https://github.com/telegramdesktop/tdesktop"; + rev = "refs/tags/v${version}"; + sha256 = "0y0nc8d4vlhsmzayy26zdxc5jaiwcv0rb2s1v5fwnnx71gf89m2w"; }; tgaur = fetchgit { - url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69"; - sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8"; + url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; + rev = "83af81905de7fc5dc9fbea8f5318d56fa8a6efc6"; + sha256 = "0v7g7y5cmxzp2yrcj6ylwzxlzr9yrqs2badzplm7sg012nc69yf9"; }; buildInputs = [ - breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus - gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk - dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy - libSM libICE - # Qt dependencies - libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon - libpng libjpeg freetype harfbuzz pcre16 xproto libX11 - inputproto sqlite dbus libwebp wayland libvdpau + gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip + libopus alsaLib libpulseaudio ]; - nativeBuildInputs = [ pkgconfig gyp cmake ]; + nativeBuildInputs = [ pkgconfig gyp cmake gcc ]; - patches = [ "${tgaur}/aur-fixes.diff" ]; + patches = [ "${tgaur}/tdesktop.patch" ]; enableParallelBuilding = true; - qtSrcs = builtins.map (x: x.src) qtLibs; - qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs); - qtPatches = qtbase.patches; + GYP_DEFINES = lib.concatStringsSep "," [ + "TDESKTOP_DISABLE_CRASH_REPORTS" + "TDESKTOP_DISABLE_AUTOUPDATE" + "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + ]; - buildCommand = '' - unpackPhase - cd "$sourceRoot" + NIX_CFLAGS_COMPILE = [ + "-DTDESKTOP_DISABLE_AUTOUPDATE" + "-DTDESKTOP_DISABLE_CRASH_REPORTS" + "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + "-I${minizip}/include/minizip" + # See Telegram/gyp/qt.gypi + "-I${qtbase.dev}/mkspecs/linux-g++" + ] ++ lib.concatMap (x: [ + "-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; - patchPhase + preConfigure = '' - sed -i Telegram/gyp/Telegram.gyp \ - -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g' + 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' \ -e 's,-flto,,g' sed -i Telegram/gyp/qt.gypi \ - -e 's,${packagedQt},${systemQt},g' + -e "s,/usr/bin/moc,moc,g" + sed -i Telegram/gyp/qt_rcc.gypi \ + -e "s,/usr/bin/rcc,rcc,g" - gypFlagsArray=( - "-Dlinux_path_qt=$PWD/../qt" - "-Dlinux_lib_ssl=-lssl" - "-Dlinux_lib_crypto=-lcrypto" - "-Dlinux_lib_icu=-licuuc -licutu -licui18n" - ) + gyp \ + -Dbuild_defines=${GYP_DEFINES} \ + -Gconfig=Release \ + --depth=Telegram/gyp \ + --generator-output=../.. \ + -Goutput_dir=out \ + --format=cmake \ + Telegram/gyp/Telegram.gyp - export QMAKE=$PWD/../qt/bin/qmake - ( mkdir -p ../Libraries - cd ../Libraries - for i in $qtSrcs; do - tar -xaf $i - done - cd qtbase-* - # This patch is often outdated but the fixes doesn't feel very important - patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true - for i in $qtPatches; do - patch -p1 < $i - done - ${qtbase.postPatch} - cd .. + cd out/Release - export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \ - -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ - -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \ - -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \ - ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \ - -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2" - export dontAddPrefix=1 - export MAKEFLAGS=-j$NIX_BUILD_CORES + NUM=$((`wc -l < CMakeLists.txt` - 2)) + sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt - ( cd qtbase-* - configurePhase - buildPhase - make install - ) - for i in $qtNames; do - ( cd $i-* - $QMAKE - buildPhase - make install - ) - done - ) + export ASM=$(type -p gcc) + ''; - ( cd Telegram/gyp - gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake - ) - - ( cd out/Release - export ASM=$(type -p gcc) - cmake . - # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry. - buildPhase || true - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h" - buildPhase - ) - - install -Dm755 out/Release/Telegram $out/bin/telegram-desktop + installPhase = '' + install -Dm755 Telegram $out/bin/telegram-desktop mkdir -p $out/share/applications $out/share/kde4/services sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol for icon_size in 16 32 48 64 128 256 512; do - install -Dm644 "Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" + install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" done - - fixupPhase ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Telegram Desktop messaging app"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index 854648d97862..c8d24c9b28c1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmakeHook +, qtbase, qtmultimedia, qtquick1, qmake , libqtelegram-aseman-edition }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; - nativeBuildInputs = [ qmakeHook ]; enableParallelBuilding = true; + nativeBuildInputs = [ qmake ]; patchPhase = '' substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" "" diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 592fc2b5934d..0a5a309c27da 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -54,7 +54,7 @@ let meta = { inherit (kdelibs4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } ); diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 2ade2fd3edd0..4cf0d2a04492 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Logger service for Telepathy framework"; homepage = http://telepathy.freedesktop.org/wiki/Logger ; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix deleted file mode 100644 index 7d06d57ca9ac..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib -, sofia_sip }: - -stdenv.mkDerivation rec { - pname = "telepathy-rakia"; - name = "${pname}-0.8.0"; - - src = fetchurl { - url = "${meta.homepage}/releases/${pname}/${name}.tar.gz"; - sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv"; - }; - - nativeBuildInputs = [pkgconfigUpstream libxslt ]; - buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ]; - - meta = { - homepage = http://telepathy.freedesktop.org; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix new file mode 100644 index 000000000000..0571946061bc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: + +stdenv.mkDerivation rec { + name = "tensor-git-${version}"; + version = "2017-02-21"; + + src = fetchgit { + url = "https://github.com/davidar/tensor.git"; + rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; + sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + buildInputs = [ qtbase qtquickcontrols ]; + nativeBuildInputs = [ qmake ]; + + desktopItem = makeDesktopItem { + name = "tensor"; + exec = "@bin@"; + icon = "tensor.png"; + comment = meta.description; + desktopName = "Tensor Matrix Client"; + genericName = meta.description; + categories = "Chat;Utility"; + mimeType = "application/x-chat"; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 tensor $out/bin/tensor + install -Dm644 client/logo.png \ + $out/share/icons/hicolor/512x512/apps/tensor.png + install -Dm644 ${desktopItem}/share/applications/tensor.desktop \ + $out/share/applications/tensor.desktop + + substituteInPlace $out/share/applications/tensor.desktop \ + --subst-var-by bin $out/bin/tensor + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://matrix.org/docs/projects/client/tensor.html; + description = "Cross-platform Qt5/QML-based Matrix client"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix deleted file mode 100644 index b4403a780ed2..000000000000 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg -, bwidget, makeWrapper, xlibsWrapper -, withSitePlugins ? true -, theme ? null -}: - -with stdenv.lib; - -let - version = "1.1"; - - main = { - name = "tkabber"; - sha256 = "1ip0mi2icqkjxiam4qj1qcynnz9ck1ggzcbcqyjj132hakd855a2"; - }; - - plugins = { - name = "tkabber-plugins"; - sha256 = "1dr12rh4vs1w1bga45k4ijgxs39801c1k4z3b892pn1dwv84il5y"; - }; - - tclLibraries = [ bwidget tcllib tcltls tclgpg ]; - - getTclLibPath = p: "${p}/lib/${p.libPrefix}"; - - tclLibPaths = stdenv.lib.concatStringsSep " " - (map getTclLibPath tclLibraries); - - mkTkabber = attrs: stdenv.mkDerivation (rec { - name = "${attrs.name}-${version}"; - - src = fetchurl { - url = "http://files.jabber.ru/tkabber/${name}.tar.xz"; - inherit (attrs) sha256; - }; - - prePatch = '' - sed -e "s@/usr/local@$out@" -i Makefile - ''; - } // removeAttrs attrs [ "name" "sha256" ]); - -in mkTkabber (main // { - postPatch = optionalString (theme != null) '' - themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb" - sed -i '/^if.*load_default_xrdb/,/^}$/ { - s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@ - }' tkabber.tcl - ''; - - postInstall = '' - for prog in $out/bin/*; do - wrapProgram "$prog" \ - --prefix PATH : "${tk}/bin" \ - --set TCLLIBPATH '${tclLibPaths}' \ - ${optionalString withSitePlugins '' - --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins' - ''} - done - ''; - - buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries; - - meta = { - homepage = "http://tkabber.jabber.ru/"; - description = "A GUI XMPP (Jabber) client written in Tcl/Tk"; - license = stdenv.lib.licenses.gpl2; - }; -}) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 067b1c7884a7..d77cf347e5a8 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,104 +1,102 @@ -{ alsaLib -, fetchurl -, gcc -, glib -, gst-plugins-base -, gstreamer -, icu -, libpulseaudio -, libuuid -, libxml2 -, libxslt -, makeQtWrapper -, qt56 -, sqlite -, stdenv -, xlibs -, xorg -, zlib -}: +{ stdenv, fetchurl, system, makeWrapper, + alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, + libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: -stdenv.mkDerivation rec { - name = "zoom-us"; - meta = { - homepage = http://zoom.us; - description = "zoom.us instant messenger"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - }; +let - version = "2.0.81497.0116"; - src = fetchurl { + version = "2.0.91373.0502"; + srcs = { + x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1lq59l5vxirjgcsrl6r4nqgvjr519gkn69alffv1f1fwq5vzif7j"; + sha256 = "0gcbfsvybkvnyklm82irgz19x3jl0hz9bwf2l9jga188057pfj7a"; }; + }; - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ makeQtWrapper ]; - buildInputs = [ - alsaLib - gcc.cc - glib - gst-plugins-base - gstreamer - icu - libpulseaudio - libuuid - libxml2 - libxslt - qt56.qtbase - qt56.qtdeclarative - qt56.qtlocation - qt56.qtscript - qt56.qtwebchannel - qt56.qtwebengine - sqlite - xlibs.xcbutilkeysyms - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXext - xorg.libXfixes - xorg.libXrender - xorg.xcbutilimage - zlib - ]; +in stdenv.mkDerivation { + name = "zoom-us-${version}"; - libPath = stdenv.lib.makeLibraryPath buildInputs; + src = srcs.${system}; - installPhase = '' - mkdir -p $out/share - cp -r \ - application-x-zoom.png \ - audio \ - imageformats \ - config-dump.sh \ - dingdong1.pcm \ - dingdong.pcm \ - doc \ - Droplet.pcm \ - Droplet.wav \ - platforminputcontexts \ - platforms \ - platformthemes \ - leave.pcm \ - ring.pcm \ - ring.wav \ - version.txt \ - xcbglintegrations \ - zcacert.pem \ - zoom \ - Zoom.png \ - ZXMPPROOT.cer \ - $out/share + buildInputs = [ makeWrapper ]; - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath ${libPath} \ - $out/share/zoom - paxmark m $out/share/zoom - wrapQtProgram "$out/share/zoom" - mkdir -p $out/bin - ln -s $out/share/zoom $out/bin/zoom-us - ''; - } + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + dbus + glib + gstreamer + fontconfig + freetype + libpulseaudio + libxml2 + libxslt + nspr + nss + sqlite + utillinux + zlib + udev + expat + + xorg.libX11 + xorg.libSM + xorg.libICE + xorg.libxcb + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.libXcursor + xorg.libXext + xorg.libXfixes + xorg.libXdamage + xorg.libXtst + xorg.libxshmfence + xorg.libXi + xorg.libXrender + xorg.libXcomposite + xorg.libXScrnSaver + + stdenv.cc.cc + ]; + + installPhase = '' + $preInstallHooks + + packagePath=$out/share/zoom-us + mkdir -p $packagePath + mkdir -p $out/bin + cp -ar * $packagePath + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen + # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53 + # it works for me without it, but, well... + paxmark m $packagePath/zoom + #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about? + + # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it + wrapProgram $packagePath/zoom \ + --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ + --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ + --set QT_PLUGIN_PATH "$packagePath/platforms" \ + --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" + ln -s "$packagePath/zoom" "$out/bin/zoom-us" + + cat > $packagePath/qt.conf < gpgme != null; stdenv.mkDerivation rec { name = "sylpheed-${version}"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2"; - sha256 = "0p50cr9h8b7cv1ayxhqxpj3kv0b7k9dga7lmmfb1lvyagg8n42sa"; + sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = - [ pkgconfig gtk2 ] + [ gtk2 ] ++ optional sslSupport openssl ++ optional gpgSupport gpgme; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://sylpheed.sraoss.jp/en/; description = "A lightweight and user-friendly e-mail client"; maintainers = [ maintainers.eelco ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = "GPL"; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 851b87374951..4f714cabf79b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, config +{ stdenv, fetchurl, config, makeWrapper , gconf , alsaLib , at_spi2_atk @@ -16,6 +16,7 @@ , gst-plugins-base , gstreamer , gtk2 +, gtk3 , kerberos , libX11 , libXScrnSaver @@ -29,6 +30,7 @@ , libcanberra_gtk2 , libgnome , libgnomeui +, defaultIconTheme , mesa , nspr , nss @@ -44,7 +46,7 @@ assert stdenv.isLinux; # imports `version` and `sources` -with (import ./sources.nix); +with (import ./release_sources.nix); let arch = if stdenv.system == "i686-linux" @@ -95,6 +97,7 @@ stdenv.mkDerivation { gst-plugins-base gstreamer gtk2 + gtk3 kerberos libX11 libXScrnSaver @@ -116,6 +119,10 @@ stdenv.mkDerivation { stdenv.cc.cc ]; + buildInputs = [ gtk3 defaultIconTheme ]; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" @@ -146,11 +153,17 @@ stdenv.mkDerivation { GenericName=Mail Reader Categories=Application;Network; EOF + + wrapProgram "$out/bin/thunderbird" \ + --argv0 "$out/bin/.thunderbird-wrapped" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \ + --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { inherit name writeScript xidel coreutils gnused gnugrep curl gnupg; baseName = "thunderbird"; + channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; 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 43b41658413e..000000000000 --- 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 new file mode 100644 index 000000000000..c3ce77adb9e6 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -0,0 +1,595 @@ +{ + version = "52.2.1"; + sources = [ + { 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 = "5b19b8fb7b7a6a4dd03ee5ab163f07ee664dd7b6d701571e57b6b3943d8aebf69291958d9a51b7720c5e5935daabacfd6149229e7626557927133b00a6c8750d"; + } + { 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 = "d0d2a562834e865cb31648255a94b120419c7cf4bba20d0a43368a05c3590333443da9416f7940eb0ed1fd774bd161d85585154b389d01b468124b6da310d5a9"; + } + { 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 = "2809c98f9b64b778c1bced8f91657a9cb8e57963d273ff380740db9be2aa999df5c32eeca7b6e63a4db65854f4e5654cc81f58a35e26eec8038520a9e78f263e"; + } + { 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 = "cd6a67c530f7ce0e3da897ed5701ce2b85f5bcb30df8db85af38918e951e7cc75e446f5709d7b02b1f54092cd8cc54c15ec46e5bfe893cd85fccdb0851a4579c"; + } + { 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 = "f117b3f56a79b5fd4a947a83ae6a3d28f0bd83f5ecb65cde674c12191517f51956535e1872547b985a35a9c0c398abc610a3f2fc2d7c9893bf7299222e5fbad7"; + } + { 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 = "72af56a4376a28ec2f3c091614b2d5907b12c2e66f2d3dda27b46ceb8b199a32d495454a2ea167180e44b1f9ef7aba89aea47bfed0976892d5d9af7102d5f5df"; + } + { 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 = "85da428c53f3a2467f5be661c4f40e0f9434609fd6509e01e3c28dec522f5342d225a4f19c30a59187e42540905f156897b1f0e0ab76b2419d263923be844b3f"; + } + { 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 = "f1fc63e25fd30b1f379689fbc9d7f24e94f061b39d3b0494226f25702dd6bd610dc031e2105957e2abefab1d7f8e90e81f4381f6d69cb43b815d8b80b9588715"; + } + { 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 = "b15b4c2766ef32b5e8023e8002f05fa82fd1e71784d5b5f2d63c62c4b20076c46d470a253f8e0a59f1bb1425a2d297b403c32117e43ce2e4851795511604cfb2"; + } + { 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 = "98750936e15b469d489e31eb65935d9013a0f4250543267f03b5eb9615587f8fe592b84bddf51176ecfe0864bc5c35ad5408e42861d45ed3af61f43764f5f9b0"; + } + { 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 = "7653e5e9e02aba7cacaaeb82e7106dfd7e49e4611eb3fb347c8192fcab3749ed98b2a2342788fe8f0e23c932ae5f9ae71266464d3d6b83629231f83ef8efa7c8"; + } + { 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 = "abf52e2f55f9582a5a1f5243a35e3fc2196beddb128a690479d6e82ac5f3cb7967640418f02fcc57c5525debce716345da23e4105e551ab0682dc5df5b6b3cc1"; + } + { 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 = "e86bfe27cddf7b1deb2fe499df2c37488863e5af24614986ced8f9063eb8494f64e637691fe3f69f6b448a50a655725f866313cf0a881425ba5cb669c9fb9940"; + } + { 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 = "57970ed60a24e6c02383b99ff4886ea9d90f49fe466f8175b3b9ec16294acd5900191b4a8fd7be08f5d987eebe547a9fd5004e516d13da8bfd702b82baeb7b8b"; + } + { 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 = "787b0c18e5cf7115ee7f317d0949f7c8d35be15f3f0c6a07b75372c07992601194a860568879164b2c5a49c276b1b48c4a723b68be46b8cd4d3bdb4144db2606"; + } + { 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 = "65e6d0726d733b9f4929a946bc9890e5eff5ad9e22d50bbaad40d2dc259028643e666b619eef25ba7d906f5a05d0e9ea456ab0d298cab5ecccc9a4a494a6f4bf"; + } + { 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 = "7266fe0dfcdc7f119e521873ea0ddc3106c6ca3d147a9cc8f9a88d563a6647d97f4c46d26547a24afaa6b10d115a3d4effc58fe2621c62395c7fc99f9587e2d1"; + } + { 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 = "048cd4d824ddc0b075bcc6d9e7a8a3905031c3333ab8bc55893278435316fd310d6002b9fa1d7b270f8b94f3bf79679e96571b083305d687c36106b903389066"; + } + { 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 = "09b4d12b0a09de492082dc315173baccf603b387d391317a350fa67c04339b0d720a6c682e4d1c7fc7ea54e04569b004b6697d9e27a14c4f5095449f2f4e4471"; + } + { 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 = "21f1069f46a8dd2dc54326bfa32d0722dd5d139f3ac10702a3cfba7d5ba462362c126ac2656ddae8c2071b20e7f96ce8fddd8049b4df9d66438e7f32f53f9316"; + } + { 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 = "ae30bd2a9eccb925ed4cf6acda17363e9cbbca0b185b9477a9b5611b613e332647907bc4653f6d677677dfca9347026d02f0aec3a42f29ed532a4b71b2c207ce"; + } + { 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 = "7d35d3a78f9ab79fa8528260160d8b5fa1ee0198b53b94fdeb86e400f95320aa0d695bf1b4e1c73733ba09d6bc78d8d39f1825744e49cef1a22873f35d8a30fb"; + } + { 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 = "9886d5b9654e7cfaedd5dd60c59a6888929bc2001d4c43a2cf40f92a098ca725cfee8fc819af13c5ea2c9eeeeb3d6103289124b8fd05a234eba04f4570b5986c"; + } + { 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 = "18f62933d213197ae618226aea192e30875f76568fc0a17343b49152526a32c10ad79ed4d6eb36feda0c8e287d915a99bdbff70ca942b4a313ea81ca04b257c8"; + } + { 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 = "c6e447722e284beba304b42d643a16b835f525d053714577425660087b03aebdcb93c57071a2e9f143ec5393616f7a0cde9a52f5bdaf42c9df1aed8b509de415"; + } + { 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 = "7445dc1299038b412a39baf594c11444875d29332afd1c36a8ec603893c3f34d442566c2c18cfcee60c5b84e1bd1bf53675d1a32530dee7fc801554605d7fe4b"; + } + { 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 = "9812c41f77cc76a6de78ca009989623071a3b95f992658f584bfc58b5be65a3db48d9135025f578f8877bc2f9426182f3f2dff39f50f1018ffb7b6ff272affc3"; + } + { 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 = "af4fb4ca49ac982e28fb5b77d1ec7ec5be69cb097138bb7de865d8a0167b8ce13074d2b2ca80e11dbd68c7fec8533163b9285ed4495545da833f726dac484e7c"; + } + { 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 = "f1026a8fb44424b95e29051ab778313c417b6119fb9959d3116d6fcace96f1786f26b419eedd7f83790c13c89aba2c339c52ca5b5cfa2d62572518cebd12db9a"; + } + { 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 = "fa18a6113852d231dfcecdf682c6c1fd18f2ec5176fd9fd694a3134deb511ebaf01e00c0a336dac4a79918606136232d62f2b443ba60d25e40c573f696fca7ea"; + } + { 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 = "313e713ae5d1b4bc48789c2c33850b5177d8f497d9965606ad2530f26075cded2943351da7c13057aaeab72a60d4dca193b2fc8c4b8cc97734132b721d4df8fe"; + } + { 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 = "6f0f8444d230cbdb5dcc81530cd05fe08ea9e2482ea7560157ece9ef938d12b7cf86a259bcc72e132717ac143a6f3e203c869f1c37715bb87fd7b248366c7554"; + } + { 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 = "f0633c2a46c66b4db18b2e70fffd9459d1c6732e872afaf8a1ef7fcac20114a09d32ec666305963acefa6caf6ec9b902d3f9d2143f68951674c12af462cb3673"; + } + { 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 = "5893bd100cc44aefe160a8ecfc5e9e5b581e1b9c59a1aab02ea9c63f8c062d8dc0f0c069a4a8adf4b11e5be614b3390d195df91ba3c2f3845f13ae7734e7295e"; + } + { 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 = "3777a5caf8208f429db9e828b6812dd16c549511e539375ff2ecb74ddeea8b8823f93194c73fc8e708ab17f8fe37c72af6ca36b5ed0ecaa2994620be7ab21de9"; + } + { 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 = "6a3e800d909db23c7abcc10a9e07feb5df47c57c072544ba84246c84ad364c8027e6b383a65867d9d0f1523682c45a929fb1c628999b18df2c959e32d374a15a"; + } + { 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 = "486691138c9548343e6841ab1e84d2e795f280fbcfbef06769c7ad816e2dec79381a1d7bc0a4bdf0d5723d48f62ffa1acb7170ff6f1f1a5364ba6872a7b34fbc"; + } + { 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 = "0f3745ef22be9cb7fab9d5540a1ba9433e4450511398442debce3909577ca97e1ad5ec3a41c834b31ff60852a8479321dba44559fa2262afeadc16947f69eca9"; + } + { 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 = "6ad18ac7eb19eee591b64d6118de057ec49736e93f60b18ad979536a722a2d5df4b55a8b3d69a335eb0ef96451d2516c0a160a9218fd2ccd92c290752fca61fa"; + } + { 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 = "879e402e2dade3acaf1354b8566d1abc11994b749c90f5c1169b1fdff5ea5dd19ae31fbfd1628adaa02c93f2346c02cc69a8625de8302e9965724d8f79c5d384"; + } + { 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 = "f23942c425238016e1a13b84e6407badac50efa6f11960c9996e4bf7845d3a56537721bb4b6e1c1002870739534f2dd7ce6fb74781bb8e9986e744f36b704c8f"; + } + { 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 = "0ce3854480f0d9969e6c836e92ba7aecca8f662aec5c7784d8e0e9986239cd8e721baf0aae1142f43dcdc54d66708fe7b7d8f1d32c3410c69306e57e1d663159"; + } + { 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 = "13d2b36dcbc85016066b4fecd61b695eabdcfdf729996eb37ee3aabac3b6b06fb619db915fbca6d59e4827b9e724e9ce0f8308e033c5469ac906d8766bf7021c"; + } + { 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 = "9bce5873c1266fece8d14df41d44dfed545eaa7a9435336650cf102f765a99978d117c787d1ea0f0987407139bfd07765728c6fb188699e8e70dea557e4b4f12"; + } + { 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 = "d15bcd925d9be3d0a27478c62d178c99ed1ee474799dfb1a63b505cff3560f1d4a287a5067d6ed4b67cd05c6e8a7398a09468269f262fc001b934e5e6cef1bc7"; + } + { 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 = "7ef381e722553644d8f3842be5c0fcd1c2f08b4128a53380a6aeb54f4d7d8dba5f73ccecc60d5212429ccac96045eb9dffd77b39b42b637020ea0142daf98097"; + } + { 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 = "1f71926edd82ba36e98045e8135b4c60fcc59ab0b0a097385231a5dcc40a2d7628d6f3f3691981056f013d01a4a3b1765a58d3cab683ecd55fcfdbf1b974d138"; + } + { 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 = "453b2d6898cfe04580f2846da0d534eedb77aa9627a39d7e7b6af1287c9e2feb695bf3d1e5b51b9d15f293579df2ebb1d2f9afb6cfdc3071ad24618e43ae925c"; + } + { 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 = "c604c83470157e881f3563c04e3e5ad368fb2d0d1cc3fb58b176cfd03953141fe037baa14120f857e238071f55ab1a3d2c1ca06c847eaabf8012b96de1409c8c"; + } + { 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 = "da7a37a7fe21a338ed2ebbe13e46a2395cebde8036a5544e8678083cddf092fd47ee80ad7e7fef66dcae59567cecb1bd15b99d470d4ee083d328e5c2932ad518"; + } + { 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 = "1b1e592b2eeab57e843eb4fd6745886946dbba451b5bc78e2212400a4e10fffaa5159034e8ea5d32a0f3dab7527e91b642209a7233140e0fd9c1c44363da9fef"; + } + { 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 = "836d1b2c786e787e07be4df837efb2051f8fb5a964facc94e82cbc05aca77ae54e1553e285a868f4703b48e72e2a0b739ae5e92e7b3da55e4ffc70567e1ce992"; + } + { 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 = "ddb52211226353c021350dd94014061a42ce1ee06d2b4e8c612bcfb5e17525bf41ead152f91c466e69ae3041136fb7350ec58de21ed2726cab2d6695dacac332"; + } + { 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 = "c8c79641c7d80391d5007155b4ec3bb0ff36c2ae3e1dfb908013274ce6c64e03563a68a2ed4fbfed8e4684c4c49e7f9710050aab6851cbff2e77609ce6e25f34"; + } + { 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 = "3c6740c9512b0d2d7f809312ba9f375be8635dc41a477e5084007cdffec9fae3c3677faf96745b61a384a4b899f48c5e9c239f52549faea00e198539181f8ba8"; + } + { 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 = "0950bfca73dd4907e493e9b15667f70be1f1174ca755baeefbd2ed40160bec3f41e1c67207454e31afed919bc72314e671ed47492509c9b2c0c207bfe3e22088"; + } + { 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 = "0107c16694feaffb18160e4eac666ec840b7efda706ddd04596cd4f54feaad07a95e9168eb8eb78cf800b4c60f3f4d229d6d217e3d3c681d2a2b0182ff65251b"; + } + { 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 = "879cd62661967b85919fddc90658d40a3119715eb2cfa95edfa60e7ef3dbc3eb23c2d317a9c632d1c2055900f03e8437af635d72efbf14d7b9fee7f87ed5b19e"; + } + { 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 = "2c26ff8ed886aa5abf82511bb61fe96fc5817b211dcbfaf91deabb992b1cc968baccafcf1787b6f11b26052e18ff7f0da1d86de7ce45579bf2f6f403b11e9613"; + } + { 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 = "5d0971ab1c51c50a9f44967a13ea7c8cd7828f14625c5d5fc02ef001adbf69f7895ec6aa691a05c7a5ce5b038854d4dcfda0204c50533b028c2458adf5a6de97"; + } + { 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 = "26e55787bc6e7a9fa8e3a40d0cee9912201026ec04454cbb117dbbad97d448dab1de9aba0c84e8cb10dda5cf818fd0c98116590b9e62849b5b714e63029d0fd7"; + } + { 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 = "432295c9cbcbd59ea6bfca3d3509f9ba3ea07bc4004cd96bdfaff468210f30f9401e372c1f19c6504895e35db907d35c282d39666eb1c99e5362f46fe6dd9ecd"; + } + { 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 = "137f4baad093df14da263ec707aaa64edfe0972b36e6441b864722a1577cc1683d4205649f79fac9262c5a53f7adcf045991bbdd3168cde74365ca2938bc8df5"; + } + { 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 = "fc33faeec367b1161c969b82c0ec703fd4f443908284b0cae309f44942473cf6042723de8895442ca21da40d404f24a8c1a490313352b95cb949e568db56b953"; + } + { 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 = "69c71b3af91d6bd5c63198937f43d5ac4c29c1c075b9faa64a94362cc544d5abd9182b339936a88da87bb69ec3201c6b54185c67d0dff1defede541a48d721a5"; + } + { 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 = "b3b33c69e411cb4e920a72cb9a4eaf41469c709e0b04199e53094856121ed7fefe84d3987045442317dfed27069686692e9e0ea00562856a15c916c74c4f8e90"; + } + { 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 = "c38deac7a95fe30166f8a22e6e4c76039fa3ec31ddc4ffb4e84f78c549bd76ced476efeb0b4abac0d73b4f5ab54e6f9a7181804450f882c123f41b8c2dfa9f25"; + } + { 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 = "0ad5a4e40d03d0f329c479c56ad43a6151e262faa225e6f0280e4e60c7a13dd2ea949695f84514034031b796a8cf190fdab519cd58d998a254ad9238c337057e"; + } + { 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 = "e681d601bbeebad6c2abbd7784041b700bf0d2abcd490fa41165b608334e3a98ab2a8bd2291935622788c506c475de89ab5a868be734225219c499ad147d02be"; + } + { 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 = "f6388f6992e1057906e5343adcef5d3cc08c983d3319b2880190d7ad3a42266c1635f5a04914f44edea6487dbba64ec8a916383938d6c1c064eb06ead06da39d"; + } + { 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 = "661f1eef600803d2c76f623be25a0b3143dceda01e146c12075b8aab32112922bdfbdafcb0d1f9be88ec1414f8447a7804494d1b5e6ab91873eb5ab00039e29b"; + } + { 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 = "7c6cfdd5c97c7a721ccd02ecc6d000d759aafd9c1a05dd77da09ff077f2a284a5349a5c14371af35a5a9ab4829e4fb93d93042d75fd9eeefb95e2fc368dc458f"; + } + { 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 = "a76afaab47e279ebf5ebacf510a1ad39cebc7f1abfda826bb9b5a6af9d4de9a02066f040affe33238aba40e875402a35aa819ab1f4895ebafe370bb3d32e7d74"; + } + { 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 = "09e72c7a26e52973bf63e18e8c85f49c0aed00a7b4ea238bcb82c55964a019965cc24f5e71d3a7ab6f5d8f288a64609ce15bb584a2fddc08aea03ff5e6d071b3"; + } + { 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 = "412cf566707a02d62cc8a60d65a1974c608eaaf4ed666830facf137f7611a0346319a2cb560ae04742bffe776299facb7ea214e637248774bf406d5e7aab08ba"; + } + { 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 = "a56988ffdae668c2321f999b0cebf8008bbddbfc3469f053135d848d4cbfaccfac75ae2db325b6a080eacdb8ede5dc91e8c2fa2be255b2e72c3a47c761e63f02"; + } + { 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 = "0df3306cebff726d26cd3b46e8ef14ccbe730ff2002b80c463185c6fa1b491eec1c3262dc792db8fd96da2b4394e00ed8abe21700f85cf2f969dc8bc9b548421"; + } + { 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 = "ddf6542c17196aa7877409a4e37948eb351ea4fa7e10dfae21e4b8c21aa92b8bb3065c504b526784efcaa41c621889bc5ecebe4cf95ff56b0f2788d3b5cb7190"; + } + { 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 = "e86c14d4416939cd04d2a23849afc3cb991c352b9bdc3ecbc8f83aaa14360b30c706aa74ffbfef2bd369f62610c057232ec9e621871010d187965c177ed06e85"; + } + { 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 = "b0fdd4da60b3278e4639a17e896d1c817ab80a44207edf21845614a8c32c70bc2094184e8d90e1b831a3516dd5b18088f21a35b09e9e8c52d72ee41764bb45d2"; + } + { 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 = "b314386f0cf27ee7f46f703c50eec9bbd879e0bc6c304c07f75f2b1455bb29c067c9c3c3d168fe3986f3018c406cf10815edde01a74764aa6d3f48a3999ff409"; + } + { 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 = "0dafbe71c9f8da9bb6b2c2ea29498a9e6f120e59d6f352d96c89a2e3c5ea1b2b072e91943490320ba52e070fe5b2a39332945edf34c729b672a83a2afe16a86c"; + } + { 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 = "50809368c1fdde1181e163c9d77c79191454a68d0ebf4429d52c4e95ebf651adbfb7769b07ba4e3b365312ff12ed2fbb96be60dc3d90c6b8fc6fe35f3ea8c1de"; + } + { 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 = "f08d5bf61cca0e2fce5894619736a267be1851e8ad66fe2800b7a1dea2d847300bfa434c9dd539eaf966a63ee32a383cdede9029ce71758fb88e3fa6b35670d7"; + } + { 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 = "0a0a502e8da5945057c30f5a3de0fb623111e48d585cb7707addf0ea608e8683a882c0525e19ef4300f3d827e8d7989f09ff643955b3dc9379fcd6506e1415f9"; + } + { 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 = "954cc5c1f3687945c6a66698ddb45ce74731bdc72f34b9ed874883b732149ad9a50773acfa1f19eec16840be3aeeec7d37ca140158def750c68d7ef6d5a2ffd4"; + } + { 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 = "15b7f0ae3741e6578e492b14ba3e43dd60e6d9f3768053cb43cd88d91d40fa247b6035b9746c173d272f752d86da2f5778779b3e3677792b976da68ff460c542"; + } + { 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 = "32938f7f6a4f2f611a6e057a5eef8a1af67eee710f8de6053d4c9d1ef9b92fef5af29dfcc3c37939811f07dbdf89c529a9481ef4823aacfab7fa753f47144a5b"; + } + { 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 = "0cceb38a1b6d679b3a5dfa63a44b90255a271ad0b9808d55408fb18cfa1e034b7010365b32a86cd72a29020fe211f404b7fc640f2b24428c3bc3945b4970ce8f"; + } + { 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 = "89b8172a07ae809b153ea6c48dca1bf0ae7fcbc7dea6e13b78bce99f2e84d6bb3d23e3d7955344e71c918b1c26729b920429c1efdb6a4bd5db1bb24001220ccd"; + } + { 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 = "54875ec1b89501f52ad3525233ee8f7c9f50b1cf0b3061dc734a0733c0cf72c537f7279729b1c3afcfcdc411f708a519a4585877858c5c040e7455a0c5d30342"; + } + { 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 = "4766a810c7c49049ff20e52045100ab4a46a687e37613cb6161e680cdffe6fce708251a830c2b38f9fa5e93d6c31c5afa0856a79a20a9ac972c1624e77da932e"; + } + { 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 = "ef031bb68f1edf02c43887ec3c7d092c43e3b0694b18951997a3e2356675e09cd1f6be12a33945f8ebf877678c86266e61e1d3802ffbb42c7a7d1c3832f25eed"; + } + { 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 = "6876c464c3e23640a3a03cc977b727fd1fea9925efacf9bb8a14afa575ef88041b85dc30569035fab700663eca1224928584b98b99735fdd6a68d9f00071e75a"; + } + { 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 = "0e2f64e9499d0cfc7597fe76214de6d9312804eaafdaef07d95e8ab84927db1d27232c9ac8b9283f24cf04e8bfac8667a253e7e229116e9241005ea433476019"; + } + { 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 = "6e3c400dacb213a767699263a7106e08183d7c8b0fa06976ff5626aeb35be1d839a4383fb7cd61cf2437a1ab33e6315fdac8b921b2f0967bfd991a90ca2fe157"; + } + { 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 = "dce647bac69f3d7d7bee0e3ef622eedc6f7d97adf991a244718f24d8ba2c33a75c470c05e95d66109535a832c65d6cd2c064157e4e9806e44cd0f6f950de6de6"; + } + { 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 = "e797cf5d6300b6478435c554ed39d4d1ef5ff9a61cd47557a2db1766912f8da9b1e60599b66e35ca9138d3e04e234b2f443a675d0329639b21f37cd787faea4c"; + } + { 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 = "f30cf85b92a024a2c7133e97203c60ed18d2ddba2ddf081779962ea1af2be893cd820638b08dbbb09304ff1412df94a4dd5f6e9e05b49527a5d6d15011a4f024"; + } + { 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 = "b6256747abfe759c0c65a0dd3431e9e498339259caff450b0988e1936ce10e9f2f019a241b21d7f2c1e9911e4396a055ab9640fcfd9a22d5f520ed461d476411"; + } + { 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 = "a6cd073fd83eb0a31e1cbcadd149e5c1be90e0bd8d890cde0ceec19bf4be15582fcceb5d6987c1682492a4e6370c215995c3ea49f3ae25529be6c5b1534c198b"; + } + { 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 = "016eeaa8804945f34a89d0fbb60133f1e0beca5c6ccd695201f09ab8fe529b85f98f0d992875ba8ce866d147ce9f92807773d44f9932ba1de73fdb1398fdece1"; + } + { 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 = "e76b5313089da90a6cb34190bd07e65cb7fda4a34ee0581009fcdf9d0135c42b698f2a6c575cc13e63d749ca0ee0f3485fb05308419b5f7e72c9a1ff89601a69"; + } + { 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 = "fcb0fc5ef00a370396f01bdb885f3bedd551344849f6eba53057506a573486af5ec781f2850aaf1e6fede9a3613c9c94629511c0a7d445565db8fe1cabcec29c"; + } + { 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 = "fafff899f366c17bc81b4432a4b1c6cae8fd6bff6c307bd377a314b9b4f520fbce4ba23b144a816d24fad65e90b33e17b25767c60f4ef10136dac6701f3d326f"; + } + { 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 = "0a0598479ced443e18d9b29bd0e0deca39176303f81e25999282af9fa1d67ffe5d0e66ad4f4461a24fbd94ca960876e2836ad2d69ba0fb4bbe81c1e471555625"; + } + { 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 = "5aff4f01e7902140e817b206dd543a73b003a808bea448478918be7214de0601568151814baa96c4ae2ea193c76e7c8daa411f742b719df34dc275b4e9f8d52b"; + } + { 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 = "560557b1662f58311a2ba694544a6b329a4fa709bc1702e12351c90b2647b974ffca4ac7c78e0c2430193cd6fcf194fb40f078c8c7c4cbb628e9b8e4a8abc37f"; + } + { 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 = "c3689c69bad7cd2f8ae58e430de4141b593db86adfc58e1f4b65258aa2a74c68595bbdaa966437a732502aae8f8c6952e10a27e453e632e2a162457261426a55"; + } + { 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 = "6ab246a7878e68204c2d4548a1583edb7293a7d7c671ad2be4767e098d7e5ab2308e5f5d8f02a7081bf6aead42207e88b16a38667ebde5f76bfb8fcf398545d3"; + } + { 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 = "923fd4d862bb8c363f20a5f05dc67a98de3266b961790299c667492c1c528b860524bf7197377c73f68c849dca8a96ac7adccfd32b0e9513d631550e786c43b6"; + } + { 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 = "81d7662ebaa211208f435b8d66a5766289ca9bc897c81aeef9666f10157a5c6b3cd5226585e144ceb2ac3a2ca9edb336e82e4b3d9097e4a4097e5b6de5626e1a"; + } + { 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 = "dd8bd65fe029cb0fa7016119b354fc0e2d1a3bac2b89e899edcdc03e3514aad4ae91707f72d19156b1d24e778f0b7a54fbbdff049e553a3daeaf56c6486dec47"; + } + { 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 = "3a71dcf6e9562d2e196e7bd76c662f5181f11cc6cc121a1ed1724e13e5e897777f1c36a4eeef36bf8a606ab8f13fbe8c4b3b345e9c70f42f8c22155ac7da3963"; + } + { 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 = "6094592ebae6b37073e7c15da36f5fd39ccbbfbc104dac8faea889ebf00f9c6e7cd5f0a2bbd54b53c0495a7166ed871b7aa4c3abe4b97827d15646b4d002b010"; + } + { 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 = "f96d09771ebd3ff63d35f95e42e77b2227c5b48a459f6e1e782a1259a845c2d6d819afb3a12333f19d5440cc6098db98b502514c5bb68c509a5a4778a5b88501"; + } + { 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 = "eba8d0ee4cc69f386dc114019501fac6b5ebeb3828755062167519ca062fa1e60d2327aec6db647459efd9ce83d31dbfeff28ea7821f52e9254de362a46ee472"; + } + { 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 = "f0af41f4faa7259f6caa2a675e60880aea434b0f2bcbde3db00001c32362c001c92b10c14d06d1ea344390d16e20f87f0cb5a7e7ecfcfbb0b3ec1da9ece8f5dd"; + } + ]; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix deleted file mode 100644 index 286911e05c6b..000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ /dev/null @@ -1,585 +0,0 @@ -{ - version = "45.8.0"; - sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ar/thunderbird-45.8.0.tar.bz2"; - locale = "ar"; - arch = "linux-x86_64"; - sha512 = "b56803f7047547e0ffbe7491062e82a82b19dabf8d4a7483834720166b0fb913f4a0252bebb5653abfaaf526998a5af0c31ff8a62ad8f5ec7d9736a6d581a7d6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ast/thunderbird-45.8.0.tar.bz2"; - locale = "ast"; - arch = "linux-x86_64"; - sha512 = "c49d973c8b138743ea8fa0bca75f2de01ce1d051b15b5d9e6516ad7a8e489028d2198ba460abcb62a06f0738994f00885d0e26e98b5f3311dddb258622ef6f36"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/be/thunderbird-45.8.0.tar.bz2"; - locale = "be"; - arch = "linux-x86_64"; - sha512 = "8e5463a97d93c70fd9fb3b5cda89ad916c7ae2abc89974536dbe2af0633e696c839a97e8dfbf35bb3c1efc7ccf1c588c5ab3e595a0cea519596ac2c112f8012f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bg/thunderbird-45.8.0.tar.bz2"; - locale = "bg"; - arch = "linux-x86_64"; - sha512 = "912056b19247376e3f8f4f8da493391c9e094abe2723091cf22c83017fcaefa3402e3465db99ea2a4413ea3fdecb9eb6170e8091a2ce3bc191061e9697daf0cb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bn-BD/thunderbird-45.8.0.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "a221336fae5a44312b1fbf8027c9a6088152f96cf2e5ff55239c0256f6b824c92eddba4442b5efa9e4ae1ed81b3a7114d85fa08a785eb73a20aa0f2b86f73107"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/br/thunderbird-45.8.0.tar.bz2"; - locale = "br"; - arch = "linux-x86_64"; - sha512 = "ba3d2a59ef9347cb1c23716bd308f62cdcf1399ea6a2c35ede563fa2af48e49a8ca9954f986f55e41c80647cceb218d664ebed0c7053e3ef4a0ea12395bd01d0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ca/thunderbird-45.8.0.tar.bz2"; - locale = "ca"; - arch = "linux-x86_64"; - sha512 = "f64e2eaa1208fbcc8be61e28ceedc113101fd6a9d7b2ac23299f36913b7c696b7a3fbb83934c4ea2ca8d23d632891a22e48ce3001425fea54f7669599da136cb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cs/thunderbird-45.8.0.tar.bz2"; - locale = "cs"; - arch = "linux-x86_64"; - sha512 = "130c73d25b581988fc14f734d39bdea4d777258ba35f56f421b234a79a00cc4f322912977af0feab0b3d4ac72e3fd3d13eb26465da7b2d81d8ccbf05a42b8c0e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cy/thunderbird-45.8.0.tar.bz2"; - locale = "cy"; - arch = "linux-x86_64"; - sha512 = "a3894db9cef7368ee824ea7015b62d378a7e8733b86eaa5fa59645fea4fe9bd9bcb1752ed12678d6ac052b42060d2a3282f23c25c4451362a0c941001352a352"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/da/thunderbird-45.8.0.tar.bz2"; - locale = "da"; - arch = "linux-x86_64"; - sha512 = "ae037f835dd51fc4b140ca0165f75ff26a305715a8536929d46c487d4db1e77cb10f101faea6a612579b021db597b63045deaaa7db1cea2b3d4160d8ef423a4d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/de/thunderbird-45.8.0.tar.bz2"; - locale = "de"; - arch = "linux-x86_64"; - sha512 = "71255dfb152f4f204399b6ecaa837a468bce5582fb9f358a1d7bdd073e2aecd41a7302a0096f1429d20bd67a92d012172308e8df9aebde141bb7da828b158cd5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/dsb/thunderbird-45.8.0.tar.bz2"; - locale = "dsb"; - arch = "linux-x86_64"; - sha512 = "39f02422d754637044fe4c75c9d677c43ff6a87229893c3eb637ff6b9c8adf541833aa929b70f2b783aa1fcf998e112645809c6256070fa746c4c95885c9232e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/el/thunderbird-45.8.0.tar.bz2"; - locale = "el"; - arch = "linux-x86_64"; - sha512 = "3cf4cce1398e945a3cb41e5432aa0c2ed1fa386e8e553816b1478a12e1248ac709de8d21a938e6c3cd801fffb58fe6e10776b8b96bb295b5fa016492f70031e9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-GB/thunderbird-45.8.0.tar.bz2"; - locale = "en-GB"; - arch = "linux-x86_64"; - sha512 = "609ebe7d015af9dfd3b88ebfb04d67691314ac91d3df7cff91df3f20ba7fb12db5f44dff5c773b4b7c858cc4bc5817119fcfabff03ec550ce250a5289aaea9ab"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-US/thunderbird-45.8.0.tar.bz2"; - locale = "en-US"; - arch = "linux-x86_64"; - sha512 = "4294c93adb8f38617b2898c91d0362b3ab327158e1810d2304f2481bdc4e0e06e1fd2a2d6748cb491cc6c732a039fa3dd83dac801b12ec7be2d7c8cf7e986286"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-AR/thunderbird-45.8.0.tar.bz2"; - locale = "es-AR"; - arch = "linux-x86_64"; - sha512 = "ded0d52934a5b74e4eff172037c1abe9c15cb522897daee5173739f4a149c1891309a366d3aded2f1306c447970e72b1a2930a9adce07d57287f7f5f0e8eec73"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-ES/thunderbird-45.8.0.tar.bz2"; - locale = "es-ES"; - arch = "linux-x86_64"; - sha512 = "523c9b931d9ef8319c5a30463035d84946d97b07a9714b2357637f9992a3dcda4536a29933a29340d4e4951ff2bc540d587ab290a16033bfc510ac911c32d3e7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/et/thunderbird-45.8.0.tar.bz2"; - locale = "et"; - arch = "linux-x86_64"; - sha512 = "376e5cd8f50c4b10c4f71b6410528965f256b69c17f3d0d103efe6bdd28ed96d0fc47dcfb709dce617757c3cec603c5a16ac675ae12e17b093db3d1184c8ebfb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/eu/thunderbird-45.8.0.tar.bz2"; - locale = "eu"; - arch = "linux-x86_64"; - sha512 = "8dba4439fadb14028903eb552ad08c62b0a63559ff5332fd2d5434179fe28a75d754b6769d1a171d7e580ec6d86fdfcad8ae6230c14c4e9aa981944013dc5b86"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fi/thunderbird-45.8.0.tar.bz2"; - locale = "fi"; - arch = "linux-x86_64"; - sha512 = "40d579d59beae9070cf548f340d5b36d67d0456bb0f9569330dcaf4667d6cef71be1be4d32ffbb49446c8921486153e50d5c33ad87746f605e4d3a79b4b74a69"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fr/thunderbird-45.8.0.tar.bz2"; - locale = "fr"; - arch = "linux-x86_64"; - sha512 = "80b489cb98c0a39c641c0d49cb750cd737594e6de1c9b0559208535a41f95855afbbaf987ab0cfedf5fb5b2fa1589d538b7eada05114d7259d3789fa399e20e7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fy-NL/thunderbird-45.8.0.tar.bz2"; - locale = "fy-NL"; - arch = "linux-x86_64"; - sha512 = "6bd13607375c513be19ae9f86e806ca94d4acb087700fdf85842cd2a7eecab66735b9ca5130b013d09dcaab12134d894bb991774727d67ff71ef2cef4b0f9b49"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ga-IE/thunderbird-45.8.0.tar.bz2"; - locale = "ga-IE"; - arch = "linux-x86_64"; - sha512 = "de4744accb4332e8509a1cb439f29d773d67f42d3964e11df83e790e6f720063b3368d3a120f746829d61741abb18baaf1f2afd9dc3bffde1ae2a118025d7973"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gd/thunderbird-45.8.0.tar.bz2"; - locale = "gd"; - arch = "linux-x86_64"; - sha512 = "98f73337263ea57e609bab9f8f0537c15c385448c48b84185d9c8cde8550d2d2fb6adc31735c7a45eff5d1872047f7137e168b977a5686401c1f0aa21a38effb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gl/thunderbird-45.8.0.tar.bz2"; - locale = "gl"; - arch = "linux-x86_64"; - sha512 = "b255dcc44f33c9b8d74ba664350cb6423245a146134e64292f7bd0850ddeafedfd691d8c5e4db51c019df92283b094a8d152441512aef33971ac8959a2904656"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/he/thunderbird-45.8.0.tar.bz2"; - locale = "he"; - arch = "linux-x86_64"; - sha512 = "4c8406c16bae204a1aeb075dd061eb3a70585e439c29f585fed4bb7ee3c1d599f8fb2f12f2ad9d0521550729d7ad1a0b097349a3a318be89a37d10b749fa4fc1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hr/thunderbird-45.8.0.tar.bz2"; - locale = "hr"; - arch = "linux-x86_64"; - sha512 = "e855a5753de07b4f4435356571178149c0eb26d9b0b81bbd41de89e88bcf30c3d970514c3548a389cf719917f29899185e1bed9d18c4b467f2d31e00d271623b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hsb/thunderbird-45.8.0.tar.bz2"; - locale = "hsb"; - arch = "linux-x86_64"; - sha512 = "8afc5a73b43ae6b43595028213ff6e21da813f9e9a93aad498e583c4ad5fcc2c5eb90ecdf911a32a68710c36a742ca1a0cc89b987789aaeb9995716783e0fff3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hu/thunderbird-45.8.0.tar.bz2"; - locale = "hu"; - arch = "linux-x86_64"; - sha512 = "da48fd9398349c6dd583391413add0b789d1500dd1481758a62121052bedaa739406011b5a3747fca810c74140c98498eb8c49a092ff3f184627bbc3469df90c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hy-AM/thunderbird-45.8.0.tar.bz2"; - locale = "hy-AM"; - arch = "linux-x86_64"; - sha512 = "588c3670d7748453e273f515255c29e5644e521f9710d1f87360a2031334f9353adba4e219b0f90c3c028102e5e02a0ffe07071a6fddea2bd2a1d972c04e1537"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/id/thunderbird-45.8.0.tar.bz2"; - locale = "id"; - arch = "linux-x86_64"; - sha512 = "a9acd62a369249370f7c6b70bb48aaa8af06de2439b328d92ddd3092cb95fd59df679a451f42173e6901d0e9fce9159e295331479d5128fc50ca7a2c93129bbb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/is/thunderbird-45.8.0.tar.bz2"; - locale = "is"; - arch = "linux-x86_64"; - sha512 = "76aee81433e6d8f2f7906d754069a5aab3ff8caa2b3d503a730eefcc42ddc1ea2018049419015dd4725344dbb54d821633f10f1d0c0139ee62c230f7643c5ee9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/it/thunderbird-45.8.0.tar.bz2"; - locale = "it"; - arch = "linux-x86_64"; - sha512 = "c7912a63ab9141a32e8f9040522900b10bb56360fd387b8b47af860814fa1541ab7ec1c59eb6376b7aacc2a22faa046d05c4a1ae81ef12bf553fdf546cfc403a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ja/thunderbird-45.8.0.tar.bz2"; - locale = "ja"; - arch = "linux-x86_64"; - sha512 = "03f414eba62f4188bb7a368653f89f0b8d48e850751cab0fb6d706912787aa098a32934bd5c7b3026e466b23df4cc6780f6b88f1f252943b2d56b53f1ea62cb6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ko/thunderbird-45.8.0.tar.bz2"; - locale = "ko"; - arch = "linux-x86_64"; - sha512 = "d9c1cfba0ab167b4f3e16eb8ee37ca3acfd94477df51a2526975602882b93a4c86e7936f76263bddfc904900146b0ed570c641f4cd1d48904bd5b9f09aef91ac"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/lt/thunderbird-45.8.0.tar.bz2"; - locale = "lt"; - arch = "linux-x86_64"; - sha512 = "5f28db94768ba285feb1a239cfd909a588a975dea16ade7793e4e1f71f8dcee1685e7370ba23cb50b253d8252a51a38a90375e8224653bfeb37e2a1e8d969d34"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nb-NO/thunderbird-45.8.0.tar.bz2"; - locale = "nb-NO"; - arch = "linux-x86_64"; - sha512 = "e3078466c4a5aa5a2743c7224c279c908be05730a79bc541031efa48605e0b74fb4244e087f3cf526bab6c67c40da585815f11999ff29d6a3d0867614aa11e17"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nl/thunderbird-45.8.0.tar.bz2"; - locale = "nl"; - arch = "linux-x86_64"; - sha512 = "7e2bc54b6d72fa495ef99e132dc4e476bc233c88c1652fc625ed66b504b901fcef53b4968d63d7d468e734903b38ef897282c2122e4bfca5b492e2f4d44b51b6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nn-NO/thunderbird-45.8.0.tar.bz2"; - locale = "nn-NO"; - arch = "linux-x86_64"; - sha512 = "99a733996460fe3a425d7ac9d37d292ef9fdd0d1bb22aac251f592bd57f4ab2228040443ed132987cf17d971b3bb2232ba9e70aa2b6b702d73967ed55a1b3b41"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pa-IN/thunderbird-45.8.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha512 = "d43dc96e3620c8ee1257243e725743e72c64f39123d2e4648eb5a31e45175b9b01b066b85ee9cc3d9765151bc2aee32f73b50579619968ff95918189d45358ca"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pl/thunderbird-45.8.0.tar.bz2"; - locale = "pl"; - arch = "linux-x86_64"; - sha512 = "32f034261425fc41ad9b2c252aa456b1526526816d9ed66e92c49fbf8fb4b077405e2ead3256dac568e1470e29971ff84466854115f57f792a254f0723278054"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-BR/thunderbird-45.8.0.tar.bz2"; - locale = "pt-BR"; - arch = "linux-x86_64"; - sha512 = "65f85f596241f812a548a90a1ebf3cd24733e590cbedd600ca8d1164d3d3f5db9fb9a0e152ea05025039203f192168f60fd28a03121c31cdcf14449505d57c0d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-PT/thunderbird-45.8.0.tar.bz2"; - locale = "pt-PT"; - arch = "linux-x86_64"; - sha512 = "fab114396e6cbee135441392dfe6baa179640174edd19ec4d1854a4adb6d3310a38e162209bea0ac532e2734a9ad4c5abc1926e0a4ca2052c62697f99c374135"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/rm/thunderbird-45.8.0.tar.bz2"; - locale = "rm"; - arch = "linux-x86_64"; - sha512 = "e03da559d75887e2418119cc946bb9ae2f11027dc2109035e533da46c859f3dcaf8fec294a6bdcb10d164866bc5c3652ccb6b8276c58a91311c2bba63117f1fc"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ro/thunderbird-45.8.0.tar.bz2"; - locale = "ro"; - arch = "linux-x86_64"; - sha512 = "f7bed7908706485e0cb26a663bdd6b0fd8ad8ad5e687a21e1c137c39d01427e3edce5ce58602bcd18a185445badefa519ecd841367f88f169591aabdf570b940"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ru/thunderbird-45.8.0.tar.bz2"; - locale = "ru"; - arch = "linux-x86_64"; - sha512 = "7775b9054e95d373d188e496287b2cbea1ddcd12c51681123642fbc181cff258d47b900b3dbf046f3de7d75e80eef5f343a50577a9db05ab2b56867a18f3c912"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/si/thunderbird-45.8.0.tar.bz2"; - locale = "si"; - arch = "linux-x86_64"; - sha512 = "3e19c7e5b62b6d0bd3598ce6bfd23631abe381f7af91275aa8e424ff2950433fd5e58e912ad13c726185e528046d3bdccdb6b3e1fa540fc0cb69b18d37caa095"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sk/thunderbird-45.8.0.tar.bz2"; - locale = "sk"; - arch = "linux-x86_64"; - sha512 = "35a5b23cffb7a80aaab378ac17195b727b7776a0c91e1616fe9a66708adc08d6041efa55dd5b291eee823a5420b092671a34f930276521f0d757e3b5568e7861"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sl/thunderbird-45.8.0.tar.bz2"; - locale = "sl"; - arch = "linux-x86_64"; - sha512 = "a7b27babbcd47b4bca6e0686aefa175fab17c4ab0d7f18793a0a3755fcaf04cd85e9bf8ddaec442ab83bafede0ad9f8211add33b6cad845f7c827e3af0982f76"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sq/thunderbird-45.8.0.tar.bz2"; - locale = "sq"; - arch = "linux-x86_64"; - sha512 = "796d3cd98d39fbad987387f92d23c10f4176f2e612c1fa939bbbcf86eb3de5798a9c9add31549dcae001041d0318de2186e00200190f467ebfc85e5c95797cb0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sr/thunderbird-45.8.0.tar.bz2"; - locale = "sr"; - arch = "linux-x86_64"; - sha512 = "8b296aaf9314a8b0381e567ff87e8ed261ebb976c0f63d3636d03fe2e416475dad8c500058e58793a7945ae620268854f99c97b93da0ab73a40f67d801b34af9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sv-SE/thunderbird-45.8.0.tar.bz2"; - locale = "sv-SE"; - arch = "linux-x86_64"; - sha512 = "59e0eb3a4e1cc65fc34369b0854d7029bfe108b3cc3550bde26628d88d82c0031bbf13ed8564c7508b2acae5ffc9a912f1cbb991bc5cecf2a210bcdb181e2a05"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ta-LK/thunderbird-45.8.0.tar.bz2"; - locale = "ta-LK"; - arch = "linux-x86_64"; - sha512 = "86719203c04b90e2d359ede21ef3bca7e2190b131a78ba4ccf6a7d9644bcb2971b541cb3c6432e6a12952a3a589769851277a257aeec594b6208918c17d76b32"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/tr/thunderbird-45.8.0.tar.bz2"; - locale = "tr"; - arch = "linux-x86_64"; - sha512 = "5b7fa2e0881dceeb0ac371a0d84209cb9e9c414ee617766ff898b50c2b21956919410be26cc0b1e30997931519fcc491c63c6e30144a2c57af8b7b8f61cd192d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/uk/thunderbird-45.8.0.tar.bz2"; - locale = "uk"; - arch = "linux-x86_64"; - sha512 = "8be8b331dce88d3244007066036741af4794559237811ab8d45dffe3e850383de636bb75a510d4a0500a2a78aa86d06768073a5626f5bf2676eb4d8e355eddcd"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/vi/thunderbird-45.8.0.tar.bz2"; - locale = "vi"; - arch = "linux-x86_64"; - sha512 = "60ff68fc5190679b4faf2e80f89b8061348f24c0426f632fc2e523be2d47b0477b2ca122fe4c9a77e8baa91d5c55ef0204fba74f65a1d7e77727abb9846c93df"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-CN/thunderbird-45.8.0.tar.bz2"; - locale = "zh-CN"; - arch = "linux-x86_64"; - sha512 = "a7da3633bb13627a81681e2539472291e0ffbef2921ae59c7fa541b0115f761295221501ea7b4e71975ba89dff559aa0f4ae1be196983854021bef823cd7c40d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-TW/thunderbird-45.8.0.tar.bz2"; - locale = "zh-TW"; - arch = "linux-x86_64"; - sha512 = "dc16cdd23ad53baa7b0863aa889a9222a14ae8e81794efad08dfffc4a6282655fcce3ff64187ce149c06d808a0010af8a084bafc59e253f094d501ee6bebbbef"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ar/thunderbird-45.8.0.tar.bz2"; - locale = "ar"; - arch = "linux-i686"; - sha512 = "21c08dc4ae1655ddf62ab03ab68ff0d5fc3efd6c8cd3ccc6d757b0b684365a3316b4cf4fac5a51b21be27a5e3067fbc875bdac1a8bca5cceab6e048c10f0f177"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ast/thunderbird-45.8.0.tar.bz2"; - locale = "ast"; - arch = "linux-i686"; - sha512 = "3669b524e5d5800f9ef3c1c6b5f874c29ba6fbb336cebbfc9a88f857e73f9bf90ccdb0fa2f1723d4e883947e71dc0333391b9021166b5acf2e39ca3d7bf02ff1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/be/thunderbird-45.8.0.tar.bz2"; - locale = "be"; - arch = "linux-i686"; - sha512 = "f49f90f1998a5b7dec1e3a862b8f76bc11445d99f66cc6503675fc6629a028624e55dac5245da777b6e3acffcba24305ed199674343cb610861da9c7671c342f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bg/thunderbird-45.8.0.tar.bz2"; - locale = "bg"; - arch = "linux-i686"; - sha512 = "b46e78338269dc6c65f0eb2bcd2cb4a0dffd5c100b4b1905582c8189f79abc975f55c7edf06e1f0edbb641de86f3b6aba1ca9028d11f4fa08ea8bd1c276e41f6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bn-BD/thunderbird-45.8.0.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "d349c503a13ae9b951af173a43f4f8dcbd5cab43d5a6219fe5b00e1d37efa7a0ceeeda36576f31f51bac615d6e4307611496e8036af4f9fc40dd3dfb495a6b6c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/br/thunderbird-45.8.0.tar.bz2"; - locale = "br"; - arch = "linux-i686"; - sha512 = "4afebf7eab2f7205a8760f04e566ba8d54bc2974cbd132262eedeaf880d29aaaba48ebd731bb8dd7ca537e6cc3fe444c1ae4168e3e08b7e17c55e70f763fbadb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ca/thunderbird-45.8.0.tar.bz2"; - locale = "ca"; - arch = "linux-i686"; - sha512 = "6b5e9abc4fc05ed580d35baeb6c7b1462daef2352f751e318b9a7bf16d032d8a8240f83d54fa17d02a9a967e7477a36808587a9183df4274f10b59059c55fede"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cs/thunderbird-45.8.0.tar.bz2"; - locale = "cs"; - arch = "linux-i686"; - sha512 = "1410e7bb8ffc8a4c515b1c023ffa6eedc960632c05e5e7f4675aee9e972877dfc73d09ef14deb1c308bfcc1a6333e62b24af582410854b62acf4d889c7d54158"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cy/thunderbird-45.8.0.tar.bz2"; - locale = "cy"; - arch = "linux-i686"; - sha512 = "28b50a2fb0703f80fc9fb91d1add2305e71f2ddac99cfd086c8559f29b5a420e9e5e3d370f0b84a32f5c358661566b070844ccd0b33447ed4c5a427eec03cfa0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/da/thunderbird-45.8.0.tar.bz2"; - locale = "da"; - arch = "linux-i686"; - sha512 = "c38cffe6416ca50c78651d24d5466d6e06b2cbaa66062eb13381c4402d39a7bd55aae10cbe3400ba0fe5983309f2d70d3058a46054911399a057679b09b451be"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/de/thunderbird-45.8.0.tar.bz2"; - locale = "de"; - arch = "linux-i686"; - sha512 = "101ee34b890f1f3f9bc3eedf4936b8ef1fc9edd2f5af79b9c8375326d430585fc564a76a0bbc81bb119ce9a638af60055d578b5e6f1f760100171696351f13c1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/dsb/thunderbird-45.8.0.tar.bz2"; - locale = "dsb"; - arch = "linux-i686"; - sha512 = "a6dd564baa36402d082d5bc2b5bc6002a5abd66b9bd545a0962fc844f4800390e527b9deaa6ca4f197d98265bd85e7d52624e32be17b2efc96b136d4a0108109"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/el/thunderbird-45.8.0.tar.bz2"; - locale = "el"; - arch = "linux-i686"; - sha512 = "d5611f341f3322adeb5e94f9dc83dc0de26d6dbaaaa45a904fb9add1770f77b86db57693aa3c89f69c1aeb27e98793475c900643b78a70284911a63791048069"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-GB/thunderbird-45.8.0.tar.bz2"; - locale = "en-GB"; - arch = "linux-i686"; - sha512 = "b8c71ccef1793589f5cbbac8e12ad1aef833131a51a0029c75b08e26f28b3d5dfa821a84654efffae1e41c23cf5575cfb1b55de29e9c29b1a5adc1632581129f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-US/thunderbird-45.8.0.tar.bz2"; - locale = "en-US"; - arch = "linux-i686"; - sha512 = "dbc77f7814b3a085fdf54536d77db69ad893b0230ca1930fb5fbf916cc09e421cdf8987e7f75d726f1fe31f3c7ed0afc584da1d1b1636a2750e9e0454a6de45f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-AR/thunderbird-45.8.0.tar.bz2"; - locale = "es-AR"; - arch = "linux-i686"; - sha512 = "f161bccff6692a9652568530faa89012e2a7438814fc87f816cbbf93d40425133ef24250a6d1b9990bc772e9ce86d778f905d844166527ab6020687bbede4688"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-ES/thunderbird-45.8.0.tar.bz2"; - locale = "es-ES"; - arch = "linux-i686"; - sha512 = "51ca5165f83366f0fd73fa900640b35d572656d123d14663b737e140c1903a816ca8e2980c2c121b1e0a512e9211ceef745c34d3fd8c04b21cbec84b868b468a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/et/thunderbird-45.8.0.tar.bz2"; - locale = "et"; - arch = "linux-i686"; - sha512 = "a8524b1a72353ddf3d2b883b3936606b9eb3f1898aea05530c38d7d57fd03ad9c36085996fe3442f085ddf668e2fc909a704939c370ba1d2d0684253a10fa965"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/eu/thunderbird-45.8.0.tar.bz2"; - locale = "eu"; - arch = "linux-i686"; - sha512 = "6c3f12ccd7dd48258ff5972163da3617f3038f4f670223617f1b7734181234eaef5be4762156650c0398c4791fc82cfb397149f62e14bc6c873d279eaca92fb3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fi/thunderbird-45.8.0.tar.bz2"; - locale = "fi"; - arch = "linux-i686"; - sha512 = "2d417c63a5c5d5203bea96f88a51ac4b501dee7575bb43fcda3ea523e76e65dacaf16c3f6ad772b25a242aa8016fb36c4f3a04c86431ade23389a97b7cac25cb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fr/thunderbird-45.8.0.tar.bz2"; - locale = "fr"; - arch = "linux-i686"; - sha512 = "2c64e8a21306b6129a87333ff1c29ebba10f708d67636042bf6daf40bf01e5ef954038afae8d0d76c42d83ed0c8074525b13b60791f0d0e21108053c9b81822e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fy-NL/thunderbird-45.8.0.tar.bz2"; - locale = "fy-NL"; - arch = "linux-i686"; - sha512 = "fe444a91350d3c30e6254e526f5a506aedaebc92ed9632df6a4d2ee5c8f18246601bc8b853eadd54c0b02c2647cae21514a0c1767ff506bb3fd048aa431d5b7a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ga-IE/thunderbird-45.8.0.tar.bz2"; - locale = "ga-IE"; - arch = "linux-i686"; - sha512 = "73979022d045433b27f71a7278d518b2ee42a7250b166327bfd2f94c2f747acf2d14a9ea55e254f6ade0ccc3ffdc898f61e8dfaa9c7e2b8450fdee195db97b5b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gd/thunderbird-45.8.0.tar.bz2"; - locale = "gd"; - arch = "linux-i686"; - sha512 = "e856393fe16f57ecbcdc796dd027d8f426f9c1b39fd51c4bcea8ceb82934087ab71d87e7c04ae67b12de6d063994ee4eb607cca9889c7e500272600f80d65f6c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gl/thunderbird-45.8.0.tar.bz2"; - locale = "gl"; - arch = "linux-i686"; - sha512 = "c1e8ae50ce6495e9706ff1ef4fb790c53be407eaa738e86f2a788feaa16e5e903386f59bc986497d2ae9e5dff8489007a16c0f2b8b9c37456d180794dfa82642"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/he/thunderbird-45.8.0.tar.bz2"; - locale = "he"; - arch = "linux-i686"; - sha512 = "6caf34bd52e21809eb80ed88b104ed1a47a1c29abdc3b3f4059fb183a0b844449936362a1839d888e4d224ee987890982d37d27c32102cfe8029bea1371847cd"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hr/thunderbird-45.8.0.tar.bz2"; - locale = "hr"; - arch = "linux-i686"; - sha512 = "230f0bd3eddf99811d8fc60e988772ed107b75981beceec053d861f977e1e3c5261c0ea51475410aeff50efd0a4e378b5e666cdd4b2bfd76ad0ae465142a28a9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hsb/thunderbird-45.8.0.tar.bz2"; - locale = "hsb"; - arch = "linux-i686"; - sha512 = "389b0fab729562e09c17d7ca251675ed4d333f4a79932b5ef2ffeda9d3e683adb95b7f4e4cb192fcf9416826a8aa470b7f8ae4211165b50d7a5a21fe39ba199a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hu/thunderbird-45.8.0.tar.bz2"; - locale = "hu"; - arch = "linux-i686"; - sha512 = "2d0ec213b7cf3f875518841e0c08bc6b4134173606098cd0515e93206bf2419377041d44a2737c98b17a198998b80453763e695cabedc283ebbdfb42a60abd70"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hy-AM/thunderbird-45.8.0.tar.bz2"; - locale = "hy-AM"; - arch = "linux-i686"; - sha512 = "f77164c2fc3a083e13a11417f77454a885fd4ac77a0b7695c0d2bf8169b54afcd06c32e7c78cb6bbb4ac447a3d690a423344cdab59bc6fdfe83d82bac5d0be0d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/id/thunderbird-45.8.0.tar.bz2"; - locale = "id"; - arch = "linux-i686"; - sha512 = "24c383b106de72a3741d7333aa4ec53c091d41ab3638c91f5f88f8d2952d25e77223e95a728611bdfd1cbe2d4418447e588069c286f90ffec0d12c7f245c07fd"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/is/thunderbird-45.8.0.tar.bz2"; - locale = "is"; - arch = "linux-i686"; - sha512 = "bae6f4fa377bb76ffd8d5257f525ce43f151f44f07eaeb5c4109a3440965c36a622c41d6577113bf111335d51d211e18b1c9decac6d9c1dea6303f90b7368f94"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/it/thunderbird-45.8.0.tar.bz2"; - locale = "it"; - arch = "linux-i686"; - sha512 = "6b6082972ea030e2564bffaf4e9349d33800b840c0b185bb646c53d0578a1b6360a3d85cdf1dbc534a648d34138f1c8cd26d1c0297c99795e93b93b145a100c0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ja/thunderbird-45.8.0.tar.bz2"; - locale = "ja"; - arch = "linux-i686"; - sha512 = "66c8808d49986675e9049e77328cf7b1d2fad163b193b8442ca39be1b605bce0180e29b239141509cfec6302f053eaf2197513d5d482beb6c498f6a0ae8bbd9b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ko/thunderbird-45.8.0.tar.bz2"; - locale = "ko"; - arch = "linux-i686"; - sha512 = "bdb8a9d6172b6f56d29b29043c484547c9a9dc7bd1477bd8ac4aaa4bf07c0ceffe2ae1560458acefefad66e4487d62746f60b6ec56d5d91603937b0c339d5625"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/lt/thunderbird-45.8.0.tar.bz2"; - locale = "lt"; - arch = "linux-i686"; - sha512 = "dd70d123787ef85ee1c596346bf4c40a99907c2ece2116f7fb4536cb078d162f9afe0f92b466b713d6b75bf92960de32a3b3dedd861946da5b2e946187d4ebc5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nb-NO/thunderbird-45.8.0.tar.bz2"; - locale = "nb-NO"; - arch = "linux-i686"; - sha512 = "caf4d3d27db952fce1f34d5c641194d555c2443b86fbecdf68869cafeed0d532d7379212f4338401743e6e26531dd98111f75bddc5e2a3af42a3a7731ec3039b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nl/thunderbird-45.8.0.tar.bz2"; - locale = "nl"; - arch = "linux-i686"; - sha512 = "dd5071174889bdda282c496c4aa05158887fffc652d4c557320fab2c11e16b0cbb7e5121ef20b423d703dfbf9da52983ff288b9377ecedabfdba496f9c99eb6b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nn-NO/thunderbird-45.8.0.tar.bz2"; - locale = "nn-NO"; - arch = "linux-i686"; - sha512 = "edd6a1384ed0060398cffb4598a7014aa13cfe83891a4cd4972db2ed6eaae5068703944a6e14b033409eaf6b6426838a0a3d708b9d83eb08907f39469fde4435"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pa-IN/thunderbird-45.8.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha512 = "9e6227d28dc844621d1d9ac6c5536505dea0cc1d1b3d161bedf13b75a3255c5c681ce5b38bb510150f8db1add7f149119a8b5ce5b98c5f4dfe2427db6ad58581"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pl/thunderbird-45.8.0.tar.bz2"; - locale = "pl"; - arch = "linux-i686"; - sha512 = "8da6ec38d37df6202b751f112031e590777e587e23437cb7a4dcfeb958b27928e2f01cbd1682daa96c143df756b3c8f31f7516ca8cb30a884db2dc03f130f960"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-BR/thunderbird-45.8.0.tar.bz2"; - locale = "pt-BR"; - arch = "linux-i686"; - sha512 = "00a7ffd7509d538b9fe3e801d5c2ad069edd62665a7ce045381213b78226646b1cfe6356b5c873904277330b674608711e15f18dcf4664218b9c61048cf88e40"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-PT/thunderbird-45.8.0.tar.bz2"; - locale = "pt-PT"; - arch = "linux-i686"; - sha512 = "f12f544c9eb3a33f861791af9afcc987b72607c2456d7f741046ef9ad36f12552d4e9cf2682ac3f8adc108dc9d36c9fc1b013714b50ae894f72cbe367914f14b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/rm/thunderbird-45.8.0.tar.bz2"; - locale = "rm"; - arch = "linux-i686"; - sha512 = "9a8497f13a459d5dde822edeb9516d98beed220d75735a2f620c69b1f5e75e68987420aac6bb2a77775b6b34c2e0daa277c15d1491a6a02bb0f9658a40a16526"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ro/thunderbird-45.8.0.tar.bz2"; - locale = "ro"; - arch = "linux-i686"; - sha512 = "2c9c650647079eb754e471757cae6b5844ae8e19bf01ce25d91a73832483507f90e604caf11305760cab719fe4f830cace5b9313b7e2a6f07a92427f35441c55"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ru/thunderbird-45.8.0.tar.bz2"; - locale = "ru"; - arch = "linux-i686"; - sha512 = "4cbbe88691fd265b4d98aab61c5763f6baea168ea4cae222425973023174f765e7fa6b97fdef959ac0788a632f742715eb7e565113344147d43c228ece7f08ae"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/si/thunderbird-45.8.0.tar.bz2"; - locale = "si"; - arch = "linux-i686"; - sha512 = "a270a871187dc95d05cb79d9f4df7947aa58b875c2b0c588c2646f806e7e0eaeb1a62f69d38e78d40399f1c588f043b26d06c0d77cedc9949d8e3d8b026ad4a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sk/thunderbird-45.8.0.tar.bz2"; - locale = "sk"; - arch = "linux-i686"; - sha512 = "8cfd22b92789766c179dbb70739fcf68907c4b215e70d164c83e50f67f2c834f515176e30788ba1fcd58717fdf5642c9e1ef05640a06470146ee942737744c83"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sl/thunderbird-45.8.0.tar.bz2"; - locale = "sl"; - arch = "linux-i686"; - sha512 = "fbf54d81b006625f526ab496e9ec7acf9698f7c95415d61aa4bd91896db07bce9d13c835ec944f164678fca9f49be16b69d6e8b728914ec84a5a8d733d3941b4"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sq/thunderbird-45.8.0.tar.bz2"; - locale = "sq"; - arch = "linux-i686"; - sha512 = "f8dee08b3a4e049392f7c407e9403b972c755493fe638e7917181b8281a86d70f2d1113e69b785be756774bb9aef4cb493084bc8d0d12bda0f928f4cd468f569"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sr/thunderbird-45.8.0.tar.bz2"; - locale = "sr"; - arch = "linux-i686"; - sha512 = "8c8fba2fc92d91f086679b6ba451eed1af4fef5c56747260f9907300f057aab354d7f8ebc411fa25821bc006a551f26e0ddf29b344846a30dc493cfef30c7375"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sv-SE/thunderbird-45.8.0.tar.bz2"; - locale = "sv-SE"; - arch = "linux-i686"; - sha512 = "caf3911023d48fc48f4834be424c01cb22bd7383582c8bfc15468401a1558351659e93955103625872b5ea3351570bf216b34e93bff9bf535eccd1789f493bca"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ta-LK/thunderbird-45.8.0.tar.bz2"; - locale = "ta-LK"; - arch = "linux-i686"; - sha512 = "99a0db9f4e7d9f05e8398f76f0dcce418d0230b8a325a1289b690a87a43febd0c17f52248bb6070ad7bd2dc60d6e877a78f1c4a23c8888b105160f131b31ec1c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/tr/thunderbird-45.8.0.tar.bz2"; - locale = "tr"; - arch = "linux-i686"; - sha512 = "79379c3dc58d330949aa5a0338fb38e6334ca47c964842bf090a9431e5b7267f871aaa519dd35262ed9d6e042188e998e95eb7a63c77b3592db09a81bdd95267"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/uk/thunderbird-45.8.0.tar.bz2"; - locale = "uk"; - arch = "linux-i686"; - sha512 = "a2f0efb561fd84e5881bb93145f86f9445eb6cb3ce5ce0e209fc896c797e9a554d180ed1009f369bc12790b8d03d09d429dd3d52fda4ce48d7642009c1a9920a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/vi/thunderbird-45.8.0.tar.bz2"; - locale = "vi"; - arch = "linux-i686"; - sha512 = "14a7352ac3254aa0a748e98e208f48ee0b764853b37889077f651ed1d1a401d98c35dd6cd09bb5b25a7f8c5d5c3a7b02319ddf4dcdaa7a5440aa5caae9f09a32"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-CN/thunderbird-45.8.0.tar.bz2"; - locale = "zh-CN"; - arch = "linux-i686"; - sha512 = "5b991ccc4daafe744f1fffdc51882bdc72d5fadd1e570e0ff3670f7d7201a67151797a26f0222fe8cfa0ddefff45f0741da6c04d924367705347858cc028a945"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-TW/thunderbird-45.8.0.tar.bz2"; - locale = "zh-TW"; - arch = "linux-i686"; - sha512 = "231abcab55934962d3b8dec164ddf48b8b7bfc0e8cd70251479351d8be5d2605e2bb823bbf6c3002bba6c431461b0bfd570f101f31b5adf7c70804610262b856"; - } - ]; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6990c12439d7..4374e51f6d1e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,32 +1,34 @@ -{ stdenv, lib, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL -, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst-plugins-base, icu +{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, freetype, fontconfig, file, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip +, hunspell, libevent, libstartup_notification +, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc +, autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper +, enableCalendar ? true , debugBuild ? false -, # If you want the resulting program to call itself "Thunderbird" - # instead of "Earlybird", enable this option. However, those +, # If you want the resulting program to call itself "Thunderbird" instead + # of "Earlybird" or whatever, enable this option. However, those # binaries may not be distributed without permission from the # Mozilla Foundation, see # http://www.mozilla.org/foundation/trademarks/. enableOfficialBranding ? false +, makeDesktopItem }: -let version = "45.8.0"; in -let verName = "${version}"; in - -stdenv.mkDerivation rec { - name = "thunderbird-${verName}"; +let + wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; +in stdenv.mkDerivation rec { + name = "thunderbird-${version}"; + version = "52.2.1"; src = fetchurl { - url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha512 = "f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb"; + url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = "f30ba358b1bfc57265b26da3d2205a8a77c6cd1987278de40cde6c1c1241db3c2fedc60aebb6ff56ffb340492c5580294420158f4b7c4787f558e79f72e3d7fb"; }; - patches = [ ./gcc6.patch ]; - # New sed no longer tolerates this mistake. postPatch = '' for f in mozilla/{js/src,}/configure; do @@ -34,99 +36,144 @@ stdenv.mkDerivation rec { done ''; - buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx - [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 - python2 dbus dbus_glib pango freetype fontconfig xorg.libXi + # from firefox, but without sound libraries + buildInputs = + [ gtk2 zip libIDL libjpeg zlib bzip2 + dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - alsaLib nspr nss libnotify xorg.pixman yasm mesa + nspr nss libnotify xorg.pixman yasm mesa xorg.libXScrnSaver xorg.scrnsaverproto - xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification cairo icu - ] ++ [ m4 ]; + xorg.libXext xorg.xextproto sqlite unzip + hunspell libevent libstartup_notification /* cairo */ + icu libpng jemalloc + ] + ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; + + # from firefox + m4 + wrapperTool + nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ]; + + configureFlags = + [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) + "--enable-application=mail" + "--disable-alsa" + "--disable-pulseaudio" - configurePhase = let configureFlags = [ "--enable-application=mail" ] - # from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx - ++ [ "--with-system-jpeg" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" "--with-system-nss" "--with-system-libevent" - #"--with-system-libvpx" - "--with-system-png" + "--with-system-png" # needs APNG support "--with-system-icu" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" - "--enable-system-cairo" - "--disable-gconf" - "--disable-gstreamer" + #"--enable-system-cairo" "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now + "--enable-content-sandbox" # available since 26.0, but not much info available "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" "--disable-updater" - "--disable-pulseaudio" - ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + "--enable-jemalloc" + "--disable-gconf" + "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" + ] + ++ lib.optional enableCalendar "--enable-calendar" + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--disable-debug-symbols" "--enable-optimize" "--enable-strip" ]) - ++ [ - "--disable-javaxpcom" - #"--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7 - ] - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - in '' - mkdir -p objdir/mozilla - cd objdir - echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig - echo 'ac_add_options --prefix="'"$out"'"' >> .mozconfig - # From version 38, we need to specify the source directory to build - # Thunderbird. Refer to mozilla/configure and search a line with - # "checking for application to build" and "# Support comm-central". - echo 'ac_add_options --with-external-source-dir="'`realpath ..`'"' >> .mozconfig - echo 'mk_add_options MOZ_MAKE_FLAGS="-j'"$NIX_BUILD_CORES"'"' >> .mozconfig - echo 'mk_add_options MOZ_OBJDIR="'`pwd`'"' >> .mozconfig - - export MOZCONFIG=`realpath ./.mozconfig` - - patchShebangs ../mozilla/mach - ../mozilla/mach configure - ''; + ++ lib.optional enableOfficialBranding "--enable-official-branding"; enableParallelBuilding = true; - requiredSystemFeatures = [ "big-parallel" ]; - buildPhase = "../mozilla/mach build"; - - installPhase = + preConfigure = '' - ../mozilla/mach install - - rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - - # Create a desktop item. - mkdir -p $out/share/applications - cat > $out/share/applications/thunderbird.desktop < -# Date 1457596445 -32400 -# Node ID 55212130f19da3079167a6b0a5a0ed6689c9a71d -# Parent 27c94617d7064d566c24a42e11cd4c7ef725923d -Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj - -Our STL wrappers do various different things, one of which is including -mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h, -which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which -circles back to our STL wrapper. - -But of the things our STL wrappers do, including mozalloc.h is not one -that is necessary for cstdlib. So skip including mozalloc.h in our -cstdlib wrapper. - -Additionally, some C++ sources (in media/mtransport) are including -headers in an extern "C" block, which end up including stdlib.h, which -ends up including cstdlib because really, this is all C++, and our -wrapper pre-includes for mozalloc.h, which fails because templates -don't work inside extern "C". So, don't pre-include when we're not -including mozalloc.h. - - -diff --git a/mozilla/config/gcc-stl-wrapper.template.h b/mozilla/config/gcc-stl-wrapper.template.h ---- a/mozilla/config/gcc-stl-wrapper.template.h -+++ b/mozilla/config/gcc-stl-wrapper.template.h -@@ -12,33 +12,40 @@ - // compiling ObjC. - #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS) - # error "STL code can only be used with -fno-exceptions" - #endif - - // Silence "warning: #include_next is a GCC extension" - #pragma GCC system_header - -+// Don't include mozalloc for cstdlib. See bug 1245076. -+#ifndef moz_dont_include_mozalloc_for_cstdlib -+# define moz_dont_include_mozalloc_for_cstdlib -+#endif -+#ifndef moz_dont_include_mozalloc_for_${HEADER} - // mozalloc.h wants ; break the cycle by always explicitly - // including here. NB: this is a tad sneaky. Sez the gcc docs: - // - // `#include_next' does not distinguish between and "file" - // inclusion, nor does it check that the file you specify has the - // same name as the current file. It simply looks for the file - // named, starting with the directory in the search path after the - // one where the current file was found. --#include_next -+# include_next - - // See if we're in code that can use mozalloc. NB: this duplicates - // code in nscore.h because nscore.h pulls in prtypes.h, and chromium - // can't build with that being included before base/basictypes.h. --#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) --# include "mozilla/mozalloc.h" --#else --# error "STL code can only be used with infallible ::operator new()" -+# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -+# include "mozilla/mozalloc.h" -+# else -+# error "STL code can only be used with infallible ::operator new()" -+# endif -+ - #endif - - #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) - // Enable checked iterators and other goodies - // - // FIXME/bug 551254: gcc's debug STL implementation requires -frtti. - // Figure out how to resolve this with -fno-rtti. Maybe build with - // -frtti in DEBUG builds? - diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index fa6e4db0a0d2..26cb9e40a263 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -1,13 +1,12 @@ -{ stdenv +{ mkDerivation , lib , fetchgit , cmake , qtbase , qtwebkit -, makeQtWrapper }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "trojita-${version}"; version = "0.7"; @@ -18,25 +17,20 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake qtbase qtwebkit ]; nativeBuildInputs = [ - makeQtWrapper + cmake ]; - postInstall = '' - wrapQtProgram "$out/bin/trojita" - ''; - - meta = { + meta = with lib; { description = "A Qt IMAP e-mail client"; homepage = http://trojita.flaska.net/; - license = with lib.licenses; [ gpl2 gpl3 ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ gpl2 gpl3 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index b2cc30b6f1f3..3d0d576bffb1 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -1,24 +1,27 @@ { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }: +with stdenv.lib; + stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.6"; name = "mpop-${version}"; src = fetchurl { url = "mirror://sourceforge/mpop/${name}.tar.xz"; - sha256 = "158zl6clxrl2id4kvdig2lvdvm0vg2byqcgn1dnxfjg5mw16ngwk"; + sha256 = "0p1ix63jh64dibrlccch8q7gxl9nn18wd2qpyr5z1h4gs2fpmv4z"; }; - buildInputs = [ openssl pkgconfig gnutls gsasl libidn ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl gnutls gsasl libidn ] + ++ optional stdenv.isDarwin Security; configureFlags = - stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + optional stdenv.isDarwin [ "--with-macosx-keyring" ]; meta = { description = "POP3 mail retrieval agent"; - homepage = "http://mpop.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + homepage = http://mpop.sourceforge.net/; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 7c773b0db8ba..696681dce277 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, pkgconfig , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib +, alsaLib, python , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null @@ -19,8 +19,8 @@ let patches = optional jackSupport ./mumble-jack-support.patch; - nativeBuildInputs = [ pkgconfig ] - ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}" + nativeBuildInputs = [ pkgconfig python ] + ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}" ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}" @@ -42,6 +42,7 @@ let preConfigure = '' qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib" + patchShebangs scripts ''; makeFlags = [ "release" ]; @@ -69,7 +70,7 @@ let client = source: generic { type = "mumble"; - nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools; + nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools ]; buildInputs = [ libopus libsndfile speex ] ++ optional (source.qtVersion == 5) qt5.qtsvg ++ optional stdenv.isLinux alsaLib @@ -118,19 +119,21 @@ let }; gitSource = rec { - version = "1.3.0-git-2016-04-10"; + version = "2017-04-16"; qtVersion = 5; # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "0502fa67b036bae9f07a586d9f05a8bf74c24291"; - sha256 = "07c1r26i0b5z7i787nr4mc60799skdzsh764ckk3gdi76agp2r2z"; + rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf"; + sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh"; }; }; in { mumble = client stableSource; mumble_git = client gitSource; murmur = server stableSource; - murmur_git = server gitSource; + murmur_git = (server gitSource).overrideAttrs (old: { + meta = old.meta // { broken = iceSupport; }; + }); } diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix new file mode 100644 index 000000000000..a15c441b9cc6 --- /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/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index b348010c61f1..93e10fbe5664 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12-rc2"; + version = "1.12-rc3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb"; + sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 53520909b09c..e95963c695c1 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchFromGitHub, qt5, qmakeHook, makeQtWrapper, pkgconfig, sqlite }: +{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }: stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.4"; + version = "0.18.6"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "0gk4s41npg8is0jf4yyqpn8ksqrhwxq97z40iqcbd7dzsiv7bkvj"; + sha256 = "0qklgdv6b3zg4xil9yglja33vaa25d4i7vipv5aafhlavjz16mh6"; }; - buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ]; - - postInstall = '' - wrapQtProgram "$out/bin/quiterss" - ''; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; meta = with stdenv.lib; { description = "A Qt-based RSS/Atom news feed reader"; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index fd1406127ad8..1cae91dbf861 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/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index a35cfdffece2..e0e8622e6431 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }: +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: stdenv.mkDerivation rec { - name = "owncloud-client" + "-" + version; - - version = "2.2.3"; + name = "owncloud-client-${version}"; + version = "2.3.2"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "00bx9wrgvbdhi9vx30qfgkdz0k8nxlj313pac34cchx5xpij3jgq"; + sha256 = "02az9wq0d1vsgcdipddipdjwj2faf7jag8hizwd0ha3sjlmrs6d1"; }; - buildInputs = - [ cmake qt4 pkgconfig qtkeychain sqlite]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" + "-UCMAKE_INSTALL_LIBDIR" ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = https://owncloud.org; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - meta.platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.qknight ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 8d46cf621044..6b6f66e24d09 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { -DUSE_QT_QML=ON -DFREE_SPACE_BAR_C=ON -DUSE_MINIUPNP=ON + -DLOCAL_MINIUPNP=ON -DDBUS_NOTIFY=ON -DUSE_JS=ON -DPERL_REGEX=ON diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 54c232674bf6..6b91956e5e39 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring -, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib }: +, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib +, libpulseaudio, libopus, libogg }: stdenv.mkDerivation rec { name = "gnunet-0.10.1"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses - pkgconfig sqlite zlib + pkgconfig sqlite zlib libpulseaudio libopus libogg ]; preConfigure = '' diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 73cd26b2a6e8..77c7cf321cbd 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 416995f120c5..629e748fcacf 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 cdafea3be79f..c848f13b0d98 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, qmakeHook, qt5 +, boost, libtorrentRasterbar, qtbase, qttools , debugSupport ? false # Debugging , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -10,16 +10,16 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.10"; + version = "3.3.13"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1lm8y5k9363gajbw0k9jb1cb7zg0lz5rw2ja0kd36h68rpm7qr9c"; + sha256 = "13a6rv4f4xgbjh6nai7fnqb04rh7i2kjpp7y2z5j1wyy4x8pncc4"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ] + buildInputs = [ boost libtorrentRasterbar qtbase qttools ] ++ optional guiSupport dbus_libs; preConfigure = '' @@ -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/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index dc80d7d34dec..20c3540b7f45 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,27 +1,27 @@ -{ stdenv, autoconf, automake, libtool, makeWrapper, fetchgit, pkgconfig -, intltool, gtk3, json_glib, curl }: +{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig +, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib +, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "transmission-remote-gtk-${version}"; - version = "1.2"; + version = "1.3.1"; - src = fetchgit { - url = "https://github.com/ajf8/transmission-remote-gtk.git"; - rev = "aa4e0c7d836cfcc10d8effd10225abb050343fc8"; - sha256 = "0qz0jzr5w5fik2awfps0q49blwm4z7diqca2405rr3fyhyjhx42b"; + src = fetchFromGitHub { + owner = "transmission-remote-gtk"; + repo = "transmission-remote-gtk"; + rev = "${version}"; + sha256 = "02q0vl7achx9rpd0iv0347h838bwzm7aj4k04y88g3bh8fi3cddh"; }; - buildInputs = [ libtool autoconf automake makeWrapper pkgconfig intltool - gtk3 json_glib curl ]; + preConfigure = "./autogen.sh"; - preConfigure = "sh autogen.sh"; - - preFixup = '' - wrapProgram "$out/bin/transmission-remote-gtk" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache - ''; + nativeBuildInputs= [ + autoconf automake libtool wrapGAppsHook + pkgconfig intltool autoconf-archive + appstream-glib + ]; + buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ]; meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 12692b9566f9..6feeacc675a0 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -10,7 +10,7 @@ let version = "2.92"; in -with { inherit (stdenv.lib) optional optionals optionalString; }; +let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 890271916544..8e99d5159f87 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick -, enablePlayer ? false, vlc ? null }: - +{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick +, enablePlayer ? true, vlc ? null }: stdenv.mkDerivation rec { - name = "tribler-${version}"; - version = "v6.4.3"; + pname = "tribler"; + name = "${pname}-${version}"; + version = "7.0.0-beta"; + revision = "1d3ddb8"; - src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz"; - sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr"; + src = fetchgit { + url = "https://github.com/Tribler/tribler"; + rev = revision; + sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845"; + fetchSubmodules = true; }; buildInputs = [ @@ -20,42 +23,56 @@ stdenv.mkDerivation rec { pythonPath = [ libtorrentRasterbar - pythonPackages.wxPython pythonPackages.apsw pythonPackages.twisted - pythonPackages.gmpy pythonPackages.netifaces - pythonPackages.pillow pythonPackages.pycrypto pythonPackages.pyasn1 pythonPackages.requests pythonPackages.setuptools pythonPackages.m2crypto + pythonPackages.pyqt5 + pythonPackages.chardet + pythonPackages.cherrypy + pythonPackages.cryptography + pythonPackages.libnacl + pythonPackages.configobj + pythonPackages.matplotlib + pythonPackages.plyvel + pythonPackages.decorator + pythonPackages.feedparser ]; - installPhase = - '' - find . -name '*.png' -exec convert -strip {} {} \; - # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. - wrapPythonPrograms + postPatch = '' + ${stdenv.lib.optionalString enablePlayer '' + substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'" + ''} + ''; - mkdir -p $out/share/tribler - cp -prvd Tribler $out/share/tribler/ + installPhase = '' + find . -name '*.png' -exec convert -strip {} {} \; + mkdir -pv $out + # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. + wrapPythonPrograms + cp -prvd ./* $out/ + makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ + --set _TRIBLERPATH $out \ + --set PYTHONPATH $out:$program_PYTHONPATH \ + --set NO_AT_BRIDGE 1 \ + --run 'cd $_TRIBLERPATH' \ + --add-flags "-O $out/run_tribler.py" \ + ${stdenv.lib.optionalString enablePlayer '' + --prefix LD_LIBRARY_PATH : ${vlc}/lib + ''} + ''; - makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ - --set _TRIBLERPATH $out/share/tribler \ - --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \ - --run 'cd $_TRIBLERPATH' \ - --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \ - ${stdenv.lib.optionalString enablePlayer '' - --prefix LD_LIBRARY_PATH : ${vlc}/lib - ''} - ''; - - meta = { + meta = with stdenv.lib; { + maintainers = with maintainers; [ xvapx ]; homepage = http://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 4ccc3fd52373..bceabc2a64a9 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/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 57d04e528452..c656ff24df84 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -22,14 +22,15 @@ , alsaLib }: -stdenv.mkDerivation rec { +let versionRec = { major = "13"; minor = "4"; patch = "0"; }; +in stdenv.mkDerivation rec { name = "citrix-receiver-${version}"; - version = "13.4.0"; + version = with versionRec; "${major}.${minor}.${patch}"; homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; - src = requireFile rec { + src = with versionRec; requireFile rec { name = "${prefixWithBitness}-${version}.10109380.tar.gz"; sha256 = if stdenv.is64bit @@ -41,10 +42,14 @@ stdenv.mkDerivation rec { ${homepage} + (if you do not find version ${version} there, try at + https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html + or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux") + Once you have downloaded the file, please use the following command and re-run the installation: - nix-prefetch-url file://${name} + nix-prefetch-url file://\$PWD/${name} ''; }; @@ -133,7 +138,8 @@ stdenv.mkDerivation rec { echo "Wrapping wfica..." mkdir "$out/bin" - makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ + makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ + --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index d35f22c18396..f4109bbd179f 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig , alsaLib, ffmpeg_2, glib, openssl, pcre, zlib , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv , libxkbcommon, libxkbfile @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { name = "freerdp-git-${version}"; - version = "20170201"; + version = "20170502"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; - rev = "6001cb710dc67eb8811362b7bf383754257a902b"; - sha256 = "0l2lwqk2r8rq8a0f91wbb30kqg21fv0k0508djpwj0pa9n73fgmg"; + rev = "8569102c3a011602de3a1cdf69f7c69adbb864ee"; + sha256 = "0m61aiy8l3ybnk2d2kjmpp9ql31zfs63gjixyj9x95jd4m507j67"; }; # outputs = [ "bin" "out" "dev" ]; @@ -29,15 +29,11 @@ stdenv.mkDerivation rec { export HOME=$TMP substituteInPlace "libfreerdp/freerdp.pc.in" \ --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" + '' + lib.optionalString (pcsclite != null) '' + substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ + --replace "libpcsclite.so" "${pcsclite}/lib/libpcsclite.so" ''; - patches = with lib; [ - ] ++ optional (pcsclite != null) - (substituteAll { - src = ./dlopen-absolute-paths.diff; - inherit pcsclite; - }); - buildInputs = with lib; [ alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff b/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff deleted file mode 100644 index 2037ad6acb9f..000000000000 --- a/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff +++ /dev/null @@ -1,25 +0,0 @@ -*** FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c.orig 2015-01-25 19:10:03.971628580 -0800 ---- FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c 2015-01-25 19:55:05.453980544 -0800 -*************** -*** 2807,2816 **** - #ifdef __MACOSX__ - g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC"); - #else -! g_PCSCModule = LoadLibraryA("libpcsclite.so.1"); - - if (!g_PCSCModule) -! g_PCSCModule = LoadLibraryA("libpcsclite.so"); - #endif - - if (!g_PCSCModule) ---- 2807,2816 ---- - #ifdef __MACOSX__ - g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC"); - #else -! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so.1"); - - if (!g_PCSCModule) -! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so"); - #endif - - if (!g_PCSCModule) diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index dd9ca18cb1db..4179cc3058e8 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation (rec { buildInputs = [openssl libX11]; configureFlags = [ + "--with-ipv6" "--with-openssl=${openssl.dev}" "--disable-credssp" "--disable-smartcard" diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 288fa4383610..b28a9040532a 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -9,20 +9,20 @@ let mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]); + deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); tvldpath64 = lib.makeLibraryPath (deps pkgs); in stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "12.0.71510"; + version = "12.0.76279"; src = fetchurl { # There is a 64-bit package, but it has no differences apart from Debian dependencies. # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb"; - sha256 = "0f2qc2rpxk7zsyfxlsfr5gwbs9vhnzc3z7ib677pnr99bz06hbqp"; + sha256 = "15yhx66zxbjk0x3dpfg39gb1f2ajcp9kbp4zi58bfnvby277jl00"; }; unpackPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ - $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \ + $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop - for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do + for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do echo "patching $i" - patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true + patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true done - for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do + for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do echo "patching $i" - patchelf --set-rpath ${tvldpath32} $i || true + patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true done ${if stdenv.system == "x86_64-linux" then '' patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga ]; + maintainers = with maintainers; [ jagajaga dasuxullebt ]; }; } diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix new file mode 100644 index 000000000000..8079a0aabe66 --- /dev/null +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -0,0 +1,106 @@ +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: + +let + xorgxrdp = stdenv.mkDerivation rec { + name = "xorgxrdp-${version}"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "neutrinolabs"; + repo = "xorgxrdp"; + rev = "v${version}"; + sha256 = "13713qs1v79xa02iw6vaj9b2q62ix770a32z56ql05d6yvfdsfhi"; + }; + + nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + + buildInputs = [ xorg.xorgserver ]; + + postPatch = '' + # patch from Debian, allows to run xrdp daemon under unprivileged user + substituteInPlace module/rdpClientCon.c \ + --replace 'g_sck_listen(dev->listen_sck);' 'g_sck_listen(dev->listen_sck); g_chmod_hex(dev->uds_data, 0x0660);' + + substituteInPlace configure.ac \ + --replace 'moduledir=`pkg-config xorg-server --variable=moduledir`' "moduledir=$out/lib/xorg/modules" \ + --replace 'sysconfdir="/etc"' "sysconfdir=$out/etc" + ''; + + preConfigure = "./bootstrap"; + + configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common" ]; + + enableParallelBuilding = true; + }; + + xrdp = stdenv.mkDerivation rec { + version = "0.9.2"; + rev = "48c26a3"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be fixed already + name = "xrdp-${version}.${rev}"; + + src = fetchFromGitHub { + owner = "volth"; + repo = "xrdp"; + rev = rev; + fetchSubmodules = true; + sha256 = "0zs03amshmvy65d26vsv31n9jflkjf43vsjhg4crzifka3vz9p16"; + }; + + nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ]; + + buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; + + postPatch = '' + substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" + ''; + + preConfigure = '' + (cd librfxcodec && ./bootstrap && ./configure --prefix=$out --enable-static --disable-shared) + ./bootstrap + ''; + dontDisableStatic = true; + configureFlags = [ "--with-systemdsystemunitdir=./do-not-install" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; + + installFlags = [ "DESTDIR=$(out)" "prefix=" ]; + + postInstall = '' + # remove generated keys (as non-determenistic) and upstart script + rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh} + + cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf + + substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse + + # remove all session types except Xorg (they are not supported by this setup) + ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini + + # remove all session types and then add Xorg + ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini + + cat >> $out/etc/xrdp/sesman.ini < !withGtk && qt5 != null; with stdenv.lib; let - version = "2.2.4"; + version = "2.2.7"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,24 +20,22 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2"; + sha256 = "1dfvhra5v6xhzbp097qsxi0zvirw0srbasl4v1wjf58v49idz7b8"; }; + nativeBuildInputs = [ + bison cmake extra-cmake-modules flex + ] ++ optional withGtk wrapGAppsHook; + buildInputs = [ - bison cmake extra-cmake-modules flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls - geoip c-ares python glib zlib - ] ++ (optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])) - ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ]) + gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt + libgpgerror gnutls geoip c-ares python glib zlib + ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch - (fetchurl { - url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9"; - sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz"; - name = "wireshark-CVE-2017-6014.patch"; - }) - ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' @@ -56,7 +54,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.wireshark.org/; + homepage = https://www.wireshark.org/; description = "Powerful network protocol analyzer"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index 6c3c33007c8c..1751106cd68d 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: +{ stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: stdenv.mkDerivation rec { name = "sniproxy-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dlundquist"; repo = "sniproxy"; rev = version; - sha256 = "1r6hv55k2z8l5q57l2q2x3nsspc2yjvi56l760yrz2c1hgh6r0a2"; + sha256 = "0nspisqdl0si5zpiiwkh9hhdy6h7lxw8l09rasflyawlmm680z1i"; }; - buildInputs = [ autoconf automake autoreconfHook gettext libev pcre pkgconfig udns ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gettext libev pcre udns ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index bb767da94d06..e4ba29d3a9f8 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, dateutil, requests2, requests_toolbelt +, appdirs, colorama, dateutil, requests, requests_toolbelt , fusepy, sqlalchemy }: buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; }; - propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests2 + propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests requests_toolbelt sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index adbadba411c9..0888e0207a6b 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.35"; + version = "1.37"; goPackagePath = "github.com/ncw/rclone"; @@ -10,9 +10,15 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i"; + sha256 = "0krmdwzl4c68vxpbycqy2xba8vvqbka7xh3k2q6ldxsd8y2rypym"; }; + outputs = [ "bin" "out" "man" ]; + + postInstall = '' + install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 + ''; + meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; homepage = "http://rclone.org"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 53b723f5ec2a..1f5e9601ff22 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/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 2daa846990a3..ed48bce7b2e2 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (rec { description = "Bidirectional file synchronizer"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; }) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2cb4f0a5922e..5fb950886e36 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.24"; + version = "0.14.32"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1"; + sha256 = "1agjr3m4gnywbp40idi0pwy25cp836sdcar7r6r9hwcqxyyzz545"; }; buildInputs = [ go removeReferencesTo ]; @@ -25,20 +25,20 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/etc/systemd/{system,user} + mkdir -p $out/bin $out/lib/systemd/{system,user} cp bin/* $out/bin '' + lib.optionalString (stdenv.isLinux) '' substitute etc/linux-systemd/system/syncthing-resume.service \ - $out/etc/systemd/system/syncthing-resume.service \ - --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill + $out/lib/systemd/system/syncthing-resume.service \ + --replace /usr/bin/pkill ${procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ - $out/etc/systemd/system/syncthing@.service \ + $out/lib/systemd/system/syncthing@.service \ --replace /usr/bin/syncthing $out/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ - $out/etc/systemd/user/syncthing.service \ + $out/lib/systemd/user/syncthing.service \ --replace /usr/bin/syncthing $out/bin/syncthing ''; diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix index d8b087dcb80a..e5e554db67b8 100644 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -1,30 +1,21 @@ -# This file was generated by go2nix. +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 [ - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3"; - sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc"; - }; - } { goPackagePath = "github.com/syncthing/syncthing"; fetch = { type = "git"; url = "https://github.com/syncthing/syncthing"; - rev = "fb6d453c74d8420af847460e42e05779e90311b6"; - sha256 = "18fya44i80ij5wqpwg0bff2hp058rh87b9zld2rpw0z8r04bnsv0"; + rev = "d0061c172caecd3baf61f3ff720f56fdb805186e"; + sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1"; }; } { - goPackagePath = "github.com/zillode/notify"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; - url = "https://github.com/zillode/notify"; - rev = "df33c1a773b462f936a149c36696c018c047eaa9"; - sha256 = "0ncfqnj5kvbyw630xsxqkxy3y6jv5hp89fqi9mzra3lr4zckiv3s"; + url = "https://go.googlesource.com/sys"; + rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; + sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; }; } ] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index db99a1aa1090..c83d9a2fcd00 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "syncthing-inotify-${version}"; - version = "0.8.5"; + version = "0.8.6"; goPackagePath = "github.com/syncthing/syncthing-inotify"; @@ -10,20 +10,20 @@ buildGoPackage rec { owner = "syncthing"; repo = "syncthing-inotify"; rev = "v${version}"; - sha256 = "13qfppwlqrx3fs44ghnffdp9x0hs7mn1gal2316p7jb0klkcpfzh"; + sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl"; }; goDeps = ./inotify-deps.nix; postInstall = '' - mkdir -p $bin/etc/systemd/{system,user} + mkdir -p $bin/lib/systemd/{system,user} substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \ - $bin/etc/systemd/system/syncthing-inotify@.service \ + $bin/lib/systemd/system/syncthing-inotify@.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ - $bin/etc/systemd/user/syncthing-inotify.service \ + $bin/lib/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index f51b41d85686..88d1ae7fae13 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,14 +9,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "http://znc.in/releases/${name}.tar.gz"; - sha256 = "070d6b1i3jy66m4ci4ypxkg4pbwqbzbzss1y1ycgq2w62zmrf423"; + url = "http://znc.in/releases/archive/${name}.tar.gz"; + sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig"; }; - buildInputs = [ openssl pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] ++ optional withPerl perl ++ optional withPython python3 ++ optional withTcl tcl diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 059c68b77e65..4858a9f8bb91 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { prePatch = '' sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h + substituteInPlace Makefile --replace "gcc" "cc" ''; patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; @@ -25,6 +26,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 7535b6abf3c7..667c159838a0 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2017-01-20"; + name = "bean-add-2017-04-06"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "752674259fb9512e076ef2048927fb791ad21507"; - sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61"; + rev = "67c3cd345dc370f8cd967a31549c1d0b86b07024"; + sha256 = "0902lvwmf7k1h6gn3ilwzk20pxphbxsa3rn68jfhhfqpr6xpqf93"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 72f6c5de8a19..70d5180191e9 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b13"; + version = "2.0b15"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm"; + sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k"; }; buildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 154ff33c8449..76027f29a707 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { vector graphics. ''; homepage = http://calligra.org; - maintainers = with maintainers; [ urkud phreedom ebzzry ]; + maintainers = with maintainers; [ phreedom ebzzry ]; inherit (kdelibs4.meta) platforms; license = licenses.gpl2; }; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index abff61b881fc..1004733a18b5 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: +{ stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: stdenv.mkDerivation rec { name = pname + "-" + version; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index a246c7290a56..437a0cbbd133 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,17 +1,19 @@ { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: python3Packages.buildPythonApplication rec { - version = "1.2"; + version = "1.3"; name = "fava-${version}"; - src = fetchurl { - url = "https://github.com/beancount/fava/archive/v${version}.tar.gz"; - sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw"; + src = fetchFromGitHub { + owner = "beancount"; + repo = "fava"; + rev = "v${version}"; + sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8"; }; assets = fetchzip { - url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz"; - sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp"; + url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz"; + sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz"; }; buildInputs = with python3Packages; [ pytest_30 ]; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index fcd9f954a675..69a96c6148e1 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,24 +1,35 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser , goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages +, itstool }: let inherit (pythonPackages) python pygobject3; + isopub = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent; sha256 = "073l492jz70chcadr2p7ssx7gz5hd731s2cazhxx4r845kilyr77"; }; + 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.32"; + name = "gnumeric-1.12.35"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "a07bc83e2adaeb94bfa2c737c9a19d90381a19cb203dd7c4d5f7d6cfdbee6de8"; + sha256 = "77b1e3ce523578a807767ad71680fb865ac021d7bfadf93eada99ae094c06c0a"; }; configureFlags = "--disable-component"; + prePatch = '' + substituteInPlace doc/C/gnumeric.xml \ + --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \ + --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \ + --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1} + ''; + # ToDo: optional libgda, introspection? buildInputs = [ pkgconfig intltool perl perlXMLParser bison goffice gtk3 makeWrapper gnome3.defaultIconTheme - python pygobject3 + python pygobject3 itstool ]; enableParallelBuilding = true; @@ -27,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 ''; @@ -35,7 +46,7 @@ in stdenv.mkDerivation rec { description = "The GNOME Office Spreadsheet"; license = stdenv.lib.licenses.gpl2Plus; homepage = http://projects.gnome.org/gnumeric/; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; }; } diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index ac2f71c872da..65a7c9730e9a 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor_icon_theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.4"; + name = "homebank-5.1.5"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "07zxb9n7d281nfv29gi09fsp7y73fx4w2s48hgdn9s4vij25zwqa"; + sha256 = "03rkl4bvi1cmb8rqyvmhxhg63bdmb3nzqa3firfimsbphm3x6gsw"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 919ab01f5f6e..245d2a5fce1a 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "3"; - patch = "0"; - tweak = "3"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0vjmc8id9krpy9n4f0yil8k782cdzwmk53lvszi7r32b3ig23f84"; + sha256 = "1zsl0z0i8pw532x2lmwd64ms6igibkkjhwf01zmm2kpnr9ycsijp"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f583660c6232..89cd2548806e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -22,7 +22,7 @@ let primary-src = import ./default-primary-src.nix { inherit fetchurl; }; in -with { inherit (primary-src) major minor subdir version; }; +let inherit (primary-src) major minor subdir version; in let lib = stdenv.lib; @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1ld1zj2f0cbyr0fkibsiazyrb4qkshc9yqkfmq7b64hhp9zsa8a3"; + sha256 = "1r386qkfmlq7p1zly4xl0s0shp1d3rq9hwm1403ap22qpgrcgqyb"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0zqs9g6hqjv5z0yzi0ag4ii158249c70ppqhg1v60haip40xan6z"; + sha256 = "03n2lj6zhjg585zq9z458mj29dshni25p1v959a2z1xa3jzwfjfz"; }; }; @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { # It also seems not to mention libdl explicitly in some places. NIX_LDFLAGS = "-lcups -ldl"; - # For some reason librdf_redland sometimes refers to rasqal.h instead + # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; @@ -72,6 +72,8 @@ in stdenv.mkDerivation rec { configureScript = "./autogen.sh"; dontUseCmakeConfigure = true; + patches = [ ./xdg-open.patch ]; + postUnpack = '' mkdir -v $sourceRoot/src '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) @@ -156,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 : \ @@ -187,6 +189,7 @@ in stdenv.mkDerivation rec { "--disable-report-builder" "--enable-python=system" "--enable-dbus" + "--enable-release-build" (lib.enableFeature kdeIntegration "kde4") "--with-package-format=installed" "--enable-epm" diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 375db389da99..8ac7bc2eda02 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.51.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz"; - sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c"; - md5 = "490e19a8ccd1f4a244b50338a0eb9456"; - md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz"; + name = "curl-7.52.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; + sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; + md5 = "4e1ef056e117b4d25f4ec42ac609c0d4"; + md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; @@ -294,11 +294,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.4.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; - sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb"; - md5 = "33d370f7fe5a030985e445a5672b2067"; - md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; + name = "hunspell-1.6.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; + sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2"; + md5 = "047c3feb121261b76dc16cdb62f54483"; + md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index b973a4192bba..7c122c0725af 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -22,7 +22,7 @@ let primary-src = import ./still-primary-src.nix { inherit fetchurl; }; in -with { inherit (primary-src) major minor subdir version; }; +let inherit (primary-src) major minor subdir version; in let lib = stdenv.lib; @@ -73,11 +73,14 @@ in stdenv.mkDerivation rec { dontUseCmakeConfigure = true; # ICU 58, included in 5.3.x - patches = [(fetchurl { - url = "https://gerrit.libreoffice.org/gitweb?p=core.git;a=patch;h=3e42714c76b1347babfdea0564009d8d82a83af4"; - sha256 = "10bid0jdw1rpdsqwzzk3r4rp6bjs2cvi82h7anz2m1amfjdv86my"; - name = "libreoffice-5.2.x-icu4c-58.patch"; - })]; + patches = [ + (fetchurl { + url = "https://gerrit.libreoffice.org/gitweb?p=core.git;a=patch;h=3e42714c76b1347babfdea0564009d8d82a83af4"; + sha256 = "10bid0jdw1rpdsqwzzk3r4rp6bjs2cvi82h7anz2m1amfjdv86my"; + name = "libreoffice-5.2.x-icu4c-58.patch";} + ) + ./xdg-open.patch + ]; postUnpack = '' mkdir -v $sourceRoot/src diff --git a/pkgs/applications/office/libreoffice/xdg-open.patch b/pkgs/applications/office/libreoffice/xdg-open.patch new file mode 100644 index 000000000000..3ff7e5d80f7a --- /dev/null +++ b/pkgs/applications/office/libreoffice/xdg-open.patch @@ -0,0 +1,25 @@ +diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx +--- a/shell/source/unix/exec/shellexec.cxx ++++ b/shell/source/unix/exec/shellexec.cxx +@@ -150,7 +150,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar + if (std::getenv("LIBO_FLATPAK") != nullptr) { + aBuffer.append("/app/bin/xdg-open"); + } else { +- aBuffer.append("/usr/bin/xdg-open"); ++ aBuffer.append("xdg-open"); + } + #endif + aBuffer.append(" "); +diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh +index 4519e01f26e2..8985711a2c01 100755 +--- a/shell/source/unix/misc/senddoc.sh ++++ b/shell/source/unix/misc/senddoc.sh +@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in + MAILER=/usr/bin/kde-open + elif [ -x /usr/bin/xdg-open ] ; then + MAILER=/usr/bin/xdg-open ++ elif type -p xdg-open >/dev/null 2>&1 ; then ++ MAILER="$(type -p xdg-open)" + else + echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`" + exit 2 diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 9a59bef617b5..0e53d58a083b 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.9"; + version = "0.0.10"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "142c35d88rkgjy85f4204givgx0p1qyfpipbrsa11lp3cb6jzhn2"; + sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx"; }; sourceRoot = "."; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index d24c59b87d99..c5ef0e8a277a 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,4 +1,5 @@ { fetchurl, stdenv, dpkg, which +, makeWrapper , alsaLib , desktop_file_utils , dbus @@ -36,14 +37,14 @@ let then "i386" else "amd64"; - shortVersion = "1.17.8-stable"; + shortVersion = "1.17.10-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "0j2hi0kd3cjjs47fxdzilc3rh02kzkdhvh70yyv7j8n58lnyjnx7" - else "0pi1bis0jmy618c1jn6b61mn666w7546xzicbqv1g6c4l8s3wgm5"; + then "0sc9fsprdpl39q8wqbjp59pnr10c1a8gss60b81h54agjni55yrg" + else "02ncfdxcrdwghpch2nlfhc7d0vgjsfqn8sxjkb5yn4bf5wi8z9bq"; deps = [ qt5.qtbase @@ -92,7 +93,7 @@ stdenv.mkDerivation { sha256 = sha256; }; - nativeBuildInputs = [ qt5.makeQtWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg which ] ++ deps; unpackPhase = "true"; @@ -107,10 +108,10 @@ stdenv.mkDerivation { $out/bin/mendeleydesktop paxmark m $out/bin/mendeleydesktop - wrapQtProgram $out/bin/mendeleydesktop \ + 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/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 2981a0f7f890..30b8809f2247 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -2,7 +2,7 @@ let - version = "1.3.1"; + version = "1.3.3"; in stdenv.mkDerivation { name = "money-manager-ex-${version}"; @@ -10,7 +10,7 @@ in src = fetchgit { url = "https://github.com/moneymanagerex/moneymanagerex.git"; rev = "refs/tags/v${version}"; - sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0"; + sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74"; }; buildInputs = [ sqlite wxGTK30 gettext ]; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix new file mode 100644 index 000000000000..9f54f2df6bf2 --- /dev/null +++ b/pkgs/applications/office/mytetra/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, qmake, qtsvg }: + +let + version = "1.42.2"; +in stdenv.mkDerivation rec { + name = "mytetra-${version}"; + src = fetchurl { + url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; + sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtsvg ]; + + hardeningDisable = [ "format" ]; + + preBuild = '' + substituteInPlace mytetra.pro \ + --replace /usr/local/bin $out/bin \ + --replace /usr/share $out/share + + substituteInPlace src/views/mainWindow/MainWindow.cpp \ + --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" + ''; + + meta = with stdenv.lib; { + description = "Smart manager for information collecting"; + homepage = http://webhamster.ru/site/page/index/articles/projectcode/138; + license = licenses.gpl3; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 3209ae0a9c9b..23ee4da8e015 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, gettext, libical, libnotify -, libarchive, gtkspell2, webkitgtk2, libgringotts }: +{ stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify +, libarchive, gtkspell3, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { name = "osmo-${version}"; - version = "0.2.14"; + version = "0.4.0-1"; src = fetchurl { url = "mirror://sourceforge/osmo-pim/${name}.tar.gz"; - sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05"; + sha256 = "fb454718e071c44bd360ce3e56cb29926cbf44a0d06ec738fa9b40fe3cbf8a33"; }; - buildInputs = [ pkgconfig gtk2 libxml2 gettext libical libnotify libarchive - gtkspell2 webkitgtk2 libgringotts ]; + nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + buildInputs = [ gtk3 libxml2 libical libnotify libarchive + gtkspell3 webkitgtk libgringotts ]; meta = with stdenv.lib; { description = "A handy personal organizer"; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index c24812418180..e24d96257b27 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/planner/default.nix b/pkgs/applications/office/planner/default.nix index e7fd94500290..869a88fe2ab4 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -1,28 +1,35 @@ -{ stdenv, fetchurl +{ stdenv +, fetchgit , pkgconfig , intltool +, automake111x +, autoconf +, libtool , gnome2 , libxslt , python }: -let - version = "${major}.${minor}.${patch}"; - major = "0"; - minor = "14"; - patch = "6"; +let version = "20170425"; in stdenv.mkDerivation { name = "planner-${version}"; - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/planner/${major}.${minor}/planner-${version}.tar.xz"; - sha256 = "15h6ps58giy5r1g66sg1l4xzhjssl362mfny2x09khdqsvk2j38k"; + src = fetchgit { + url = "https://git.gnome.org/browse/planner"; + rev = "6a79647e5711b2b8d7435cacc3452e643d2f05e6"; + sha256 = "18k40s0f665qclrzvkgyfqmvjk0nqdc8aj3m8n4ky85di4qbqlwd"; }; buildInputs = with gnome2; [ pkgconfig intltool + automake111x + autoconf + libtool + + gnome_common + gtk_doc GConf gtk @@ -35,13 +42,28 @@ in stdenv.mkDerivation { python ]; + preConfigure = ''./autogen.sh''; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Planner/; + homepage = "https://wiki.gnome.org/Apps/Planner"; description = "Project management application for GNOME"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.rasendubi ]; + longDescription = '' + Planner is the GNOME project management tool. + Its goal is to be an easy-to-use no-nonsense cross-platform + project management application. + + Planner is a GTK+ application written in C and licensed under the + GPLv2 or any later version. It can store its data in either xml + files or in a postgresql database. Projects can also be printed + to PDF or exported to HTML for easy viewing from any web browser. + + Planner was originally created by Richard Hult and Mikael Hallendal + at Imendio. + ''; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ rasendubi amiloradovsky ]; }; } diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index acf60bd03755..0a53d5f8c229 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,32 +1,27 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper, qtwebkit, qtscript, grantlee, +{ 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 +}: -stdenv.mkDerivation rec { +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 makeQtWrapper ]; + 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 ]; - enableParallelBuilding = true; - - postInstall = '' - wrapQtProgram "$out/bin/skrooge" - wrapQtProgram "$out/bin/skroogeconvert" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "A personal finances manager, powered by KDE"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ joko ]; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix new file mode 100644 index 000000000000..d8e6cdd86ea9 --- /dev/null +++ b/pkgs/applications/office/treesheets/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, wxGTK, makeWrapper }: + +stdenv.mkDerivation rec { + name = "treesheets-${version}"; + version = "2017-03-27"; + + src = fetchFromGitHub { + owner = "aardappel"; + repo = "treesheets"; + rev = "1d1d6b214e3ae88445eb1ec0032d5fef14160f32"; + sha256 = "0np91c4skq3yxq76c4zi33w73qb1w2nrcin490kkvrxk53jspklb"; + }; + + buildInputs = [ wxGTK makeWrapper ]; + + preConfigure = "cd src"; + + postInstall = '' + mkdir "$out/share" -p + cp -av ../TS "$out/share/libexec" + + mkdir "$out/bin" -p + makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" + + mkdir "$out/share/doc" -p + + for f in readme.html docs examples + do + mv -v "$out/share/libexec/$f" "$out/share/doc" + ln -sv "$out/share/doc/$f" "$out/share/libexec/$f" + done + + mkdir "$out/share/applications" -p + mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications" + substituteInPlace "$out/share/applications/treesheets.desktop" \ + --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" + ''; + + meta = with stdenv.lib; { + description = "Free Form Data Organizer"; + + longDescription = '' + The ultimate replacement for spreadsheets, mind mappers, outliners, + PIMs, text editors and small databases. + + Suitable for any kind of data organization, such as Todo lists, + calendars, project management, brainstorming, organizing ideas, + planning, requirements gathering, presentation of information, etc. + ''; + + homepage = http://strlen.com/treesheets/; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.linux; + license = licenses.zlib; + }; +} diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix new file mode 100644 index 000000000000..a1fcfd5de700 --- /dev/null +++ b/pkgs/applications/office/watson/default.nix @@ -0,0 +1,27 @@ +{ stdenv, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + pname = "td-watson"; + name = "${pname}-${version}"; + version = "1.4.0"; + + src = pythonPackages.fetchPypi { + inherit version pname; + sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq"; + }; + + # uses tox, test invocation fails + doCheck = true; + checkPhase = '' + py.test -vs tests + ''; + checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; + propagatedBuildInputs = with pythonPackages; [ requests click arrow ]; + + meta = with stdenv.lib; { + homepage = https://tailordev.github.io/Watson/; + description = "A wonderful CLI to track your time!"; + license = licenses.mit; + maintainers = with maintainers; [ mguentner ] ; + }; +} \ No newline at end of file diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index d6640b6c5bb6..41dd8595c30d 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,32 +1,38 @@ -{stdenv, fetchurl, unzip, libX11, libcxxabi, glib, xorg, qt4, fontconfig, phonon, freetype, zlib, libpng12, libICE, libXrender, cups, lib}: +{ stdenv, fetchurl, fetchFromGitHub +, libX11, glib, xorg, fontconfig, freetype +, zlib, libpng12, libICE, libXrender, cups }: + +let + bits = if stdenv.system == "x86_64-linux" then "x86_64" + else "x86"; -stdenv.mkDerivation rec{ - name = "wpsoffice-${version}"; version = "10.1.0.5672"; +in stdenv.mkDerivation rec{ + name = "wpsoffice-${version}"; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5672~a21_x86_64.tar.xz"; - sha1 = "7e9b17572ed5cea50af24f01457f726fc558a515"; + name = "${name}.tar.xz"; + url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz"; + sha256 = if bits == "x86_64" then + "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else + "1dk400ap5qwdhjvn8lnk602f5akayr391fkljxdkrpn5xac01m97"; }; meta = { description = "Office program originally named Kingsoft Office"; homepage = http://wps-community.org/; - platforms = [ "x86_64-linux" ]; - # Binary for i686 is also available if someone can package it - license = lib.licenses.unfreeRedistributable; + platforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = []; + license = stdenv.lib.licenses.unfreeRedistributable; }; libPath = stdenv.lib.makeLibraryPath [ libX11 - libcxxabi libpng12 glib xorg.libSM xorg.libXext fontconfig - phonon zlib freetype libICE @@ -34,19 +40,36 @@ stdenv.mkDerivation rec{ libXrender ]; - phases = [ "unpackPhase" "installPhase" ]; + dontPatchELF = true; installPhase = '' - cp -r . "$out" - chmod +x "$out/office6/wpp" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wpp" - chmod +x "$out/office6/wps" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wps" - chmod +x "$out/office6/et" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/et" - mkdir -p "$out/bin/" - ln -s "$out/office6/wpp" "$out/bin/wpspresentation" - ln -s "$out/office6/wps" "$out/bin/wpswriter" - ln -s "$out/office6/et" "$out/bin/wpsspreadsheets" + prefix=$out/opt/kingsoft/wps-office + mkdir -p $prefix + cp -r . $prefix + + # Avoid forbidden reference error due use of patchelf + rm -r $PWD + + mkdir $out/bin + for i in wps wpp et; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --force-rpath --set-rpath "$prefix/office6:$libPath" \ + $prefix/office6/$i + + substitute $prefix/$i $out/bin/$i \ + --replace /opt/kingsoft/wps-office $prefix + chmod +x $out/bin/$i + + substituteInPlace $prefix/resource/applications/wps-office-$i.desktop \ + --replace /usr/bin $out/bin + done + + # China fonts + mkdir -p $prefix/resource/fonts/wps-office $out/etc/fonts/conf.d + ln -s $prefix/fonts/* $prefix/resource/fonts/wps-office + ln -s $prefix/fontconfig/*.conf $out/etc/fonts/conf.d + + ln -s $prefix/resource $out/share ''; } diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 71f38bb8d3cc..0cf85840db62 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "GTD for KDE"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (kdelibs4.meta) platforms; }; } diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 227b982689e1..18c4514c4de1 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.65"; + version = "0.67-rc2"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; + sha256 = "0l4q2dfnvyn0jr1lggf8g7515q4z7qr1lnmy0lsyhjf477ldszqf"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; @@ -37,9 +37,10 @@ python2Packages.buildPythonApplication rec { ''; - meta = { - description = "A desktop wiki"; - homepage = http://zim-wiki.org; - license = stdenv.lib.licenses.gpl2Plus; + meta = with stdenv.lib; { + description = "A desktop wiki"; + homepage = http://zim-wiki.org; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 49c774f7039a..da6aa38d746a 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv -, qtscript, qtserialport, qttools, makeQtWrapper +{ mkDerivation, lib, fetchurl +, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv +, qtscript, qtserialport, qttools , qtmultimedia }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "stellarium-${version}"; version = "0.15.0"; @@ -12,25 +13,19 @@ stdenv.mkDerivation rec { sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l"; }; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ - cmake freetype libpng mesa gettext openssl perl libiconv qtscript - qtserialport qttools qtmultimedia + freetype libpng mesa openssl libiconv qtscript qtserialport qttools + qtmultimedia ]; - enableParallelBuilding = true; - - postInstall = '' - wrapQtProgram "$out/bin/stellarium" - ''; - - meta = { + meta = with lib; { description = "Free open-source planetarium"; homepage = "http://stellarium.org/"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin + maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index bdb93c992262..9c79bfe1a55d 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Renders an image of the earth or other planets into the X root window"; homepage = http://xplanet.sourceforge.net; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix new file mode 100644 index 000000000000..24ab2ee9ac5e --- /dev/null +++ b/pkgs/applications/science/biology/ants/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk }: + +stdenv.mkDerivation rec { + _name = "ANTs"; + _version = "2.1.0"; + name = "${_name}-${_version}"; + + src = fetchFromGitHub { + owner = "stnava"; + repo = "ANTs"; + rev = "4e02aa76621698e3513330dd9e863e22917e14b7"; + sha256 = "0gyys1lf69bl3569cskxc8r5llwcr0dsyzvlby5skhfpsyw0dh8r"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ itk vtk ]; + + cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; + + checkPhase = "ctest"; + doCheck = false; + + postInstall = '' + for file in $out/bin/*; do + wrapProgram $file --set ANTSPATH "$out/bin" + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/stnava/ANTs; + description = "Advanced normalization toolkit for medical image registration and other processing"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.bsd3; + }; +} diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 7ae62b15d34a..97e081f908ef 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, zlib, htslib }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.3.1"; + major = "1.4"; + version = "${major}.0"; src = fetchurl { - url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2"; - sha256 = "095ry68vmz9q5s1scjsa698dhgyvgw5aicz24c19iwfbai07mhqj"; + url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2"; + sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg"; }; - buildInputs = [ zlib ]; + buildInputs = [ zlib bzip2 lzma perl ]; makeFlags = [ "HSTDIR=${htslib}" diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index cd5c980b0016..d6e00659c1a9 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib python ]; - buildPhase = "make prefix=$out SHELL=${stdenv.shell} -j $NIX_BUILD_CORES"; - installPhase = "make prefix=$out SHELL=${stdenv.shell} install"; + cc = if stdenv.cc.isClang then "clang++" else "g++"; + buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} -j $NIX_BUILD_CORES"; + installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} install"; meta = with stdenv.lib; { description = "A powerful toolset for genome arithmetic."; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix new file mode 100644 index 000000000000..a45e5df2f528 --- /dev/null +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake, gcc, zlib }: + +stdenv.mkDerivation rec { + name = "diamond-0.8.36"; + + src = fetchurl { + url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz"; + sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; + }; + + patches = [ + ./diamond-0.8.36-no-warning.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + description = "Accelerated BLAST compatible local sequence aligner"; + longDescription = '' + A sequence aligner for protein and translated DNA + searches and functions as a drop-in replacement for the NCBI BLAST + software tools. It is suitable for protein-protein search as well as + DNA-protein search on short reads and longer sequences including contigs + and assemblies, providing a speedup of BLAST ranging up to x20,000. + + DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter). + + If you use DIAMOND in published research, please cite + B. Buchfink, Xie C., D. Huson, + "Fast and sensitive protein alignment using DIAMOND", + Nature Methods 12, 59-60 (2015). + ''; + homepage = https://github.com/bbuchfink/diamond; + license = { + fullName = "University of Tuebingen, Benjamin Buchfink"; + url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING; + }; + maintainers = [ maintainers.metabar ]; + }; +} diff --git a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch new file mode 100644 index 000000000000..a16d475c5564 --- /dev/null +++ b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch @@ -0,0 +1,20 @@ +diff -u -r diamond-0.8.36/src/dp/scalar_traceback.h diamond-0.8.36-patched/src/dp/scalar_traceback.h +--- diamond-0.8.36/src/dp/scalar_traceback.h 2017-02-06 16:32:05.000000000 +0100 ++++ diamond-0.8.36-patched/src/dp/scalar_traceback.h 2017-02-23 15:13:24.000000000 +0100 +@@ -19,6 +19,7 @@ + #ifndef SCALAR_TRACEBACK_H_ + #define SCALAR_TRACEBACK_H_ + ++#include + #include + #include "../basic/score_matrix.h" + +@@ -31,7 +32,7 @@ + template<> + inline bool almost_equal(float x, float y) + { +- return abs(x - y) < 0.001f; ++ return std::abs(x - y) < 0.001f; + } + + template diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 331820276553..2110a9bcfaba 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline, perl, libX11, libpng, libXt, zlib}: +{stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: stdenv.mkDerivation { name = "emboss-6.6.0"; @@ -6,16 +6,14 @@ stdenv.mkDerivation { url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; - # patch = fetchurl { - # url = ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-9.gz; - # sha256 = "1pfn5zdxrr71c3kwpdkzmmsqvdwkmynkvcr707vqh73h9cjhk3c1"; - # }; - buildInputs = [readline perl libpng libX11 libXt zlib]; + buildInputs = [ readline perl libharu libpng libX11 libXt zlib ]; - # preConfigure = '' - # gzip -d $patch | patch -p1 - # ''; + configureFlags = [ "--with-hpdf=${libharu}" "--with-pngdriver=${zlib}" ]; + + postConfigure = '' + sed -i 's@$(bindir)/embossupdate@true@' Makefile + ''; meta = { description = "The European Molecular Biology Open Software Suite"; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix new file mode 100644 index 000000000000..714b7fddd446 --- /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/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 775e2ec3cc8c..821a80230e50 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -9,22 +9,21 @@ stdenv.mkDerivation rec { name = "ncbi_tools"; - ncbi_version="Dec_31_2008"; + ncbi_version = "Dec_31_2008"; src = fetchurl { url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${ncbi_version}/ncbi_cxx--${ncbi_version}.tar.gz"; sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; configureFlags = "--without-debug --with-bin-release --with-dll --without-static"; - # PIC flag (position independent code for shared libraries) - NIX_CXXFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; - buildInputs = [cpio]; + buildInputs = [ cpio ]; meta = { description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/; license = "GPL"; - priority = "5"; # zlib.so gives a conflict with zlib + priority = 5; # zlib.so gives a conflict with zlib + broken = true; }; } diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 5d69b1f29e73..bd300846cf09 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, fetchurl +{ stdenv +, fetchurl , pkgconfig , automake , autoconf @@ -7,16 +7,17 @@ , ncurses , readline , which -, python ? null +, python ? null , mpi ? null +, iv }: stdenv.mkDerivation rec { name = "neuron-${version}"; 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"; @@ -25,23 +26,32 @@ stdenv.mkDerivation rec { patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... + postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/gnu/neuron_gnu_builtin.h \ + --replace 'double abs(double arg);' "" \ + --replace 'float abs(float arg);' "" \ + --replace 'short abs(short arg);' "" \ + --replace 'long abs(long arg);' "" + ''; + enableParallelBuilding = true; ## neuron install by default everything under prefix/${host_arch}/* - ## override this to support nix standard file hierarchy + ## override this to support nix standard file hierarchy ## without issues: install everything under prefix/ preConfigure = '' ./build.sh - export prefix="''${prefix} --exec-prefix=''${out}" + export prefix="''${prefix} --exec-prefix=''${out}" ''; 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"] + ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] else ["--without-mpi"]); - - + + postInstall = stdenv.lib.optionals (python != null) [ '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then @@ -49,22 +59,22 @@ stdenv.mkDerivation rec { mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ fi '']; - - propagatedBuildInputs = [ readline ncurses which libtool ]; + + propagatedBuildInputs = [ readline ncurses which libtool ]; meta = with stdenv.lib; { description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; - longDescription = "NEURON is a simulation environment for developing and exercising models of - neurons and networks of neurons. It is particularly well-suited to problems where - cable properties of cells play an important role, possibly including extracellular - potential close to the membrane), and where cell membrane properties are complex, + longDescription = "NEURON is a simulation environment for developing and exercising models of + neurons and networks of neurons. It is particularly well-suited to problems where + cable properties of cells play an important role, possibly including extracellular + potential close to the membrane), and where cell membrane properties are complex, involving many ion-specific channels, ion accumulation, and second messengers"; license = licenses.bsd3; homepage = http://www.neuron.yale.edu/neuron; maintainers = [ maintainers.adev ]; platforms = platforms.all; - }; + }; } diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 868540fcbc3b..2947515652e2 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; homepage = https://github.com/andyrimmer/Platypus; maintainers = with maintainers; [ jbedo ]; - platforms = platforms.unix; + platforms = platforms.x86_64; }; } diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index e97af1ea0ee6..827c1448693a 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,14 +3,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.3.1"; + major = "1.4"; + version = "${major}.0"; src = fetchurl { - url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0znnnxc467jbf1as2dpskrjhfh8mbll760j6w6rdkwlwbqsp8gbc"; + url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2"; + sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls"; }; - buildInputs = [ zlib ncurses htslib ]; + buildInputs = [ zlib ncurses ]; configureFlags = [ "--with-htslib=${htslib}" ] ++ stdenv.lib.optional (ncurses == null) "--without-curses"; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 6c7a6b969ee6..844374fceb95 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "snpeff-${version}"; - version = "4.3i"; + version = "4.3p"; src = fetchurl { - url = "mirror://sourceforge/project/snpeff/snpEff_latest_core.zip"; - sha256 = "0i1slg201c8yjfr4wrg4xcgzwi0c8b9l3fb1i73fphq6q6zdblzb"; + url = "mirror://sourceforge/project/snpeff/snpEff_v4_3p_core.zip"; + sha256 = "1xb3k0yxd634znw2q083ligm2ww4p6v64041r9sdy3930lhjvxb1"; }; buildInputs = [ unzip jre makeWrapper ]; + sourceRoot = "snpEff"; + installPhase = '' mkdir -p $out/libexec/snpeff cp *.jar *.config $out/libexec/snpeff diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 1e9f3ee521b1..878dfde8f4e2 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Molecule editor and visualizer"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index af0c2e855498..ed208014f7d9 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,24 +1,50 @@ -{ stdenv, fetchurl, python27Packages, glew, freeglut, libpng, libxml2, tk, freetype }: +{ stdenv, fetchurl, makeDesktopItem +, python3, python3Packages +, glew, freeglut, libpng, libxml2, tk, freetype }: + + +with stdenv.lib; let - version = "1.8.4.0"; + pname = "pymol"; + ver_maj = "1.8"; + ver_min = "4"; + version = "${ver_maj}.${ver_min}.0"; + description = "A Python-enhanced molecular graphics tool"; + + desktopItem = makeDesktopItem { + name = "${pname}"; + exec = "${pname}"; + desktopName = "PyMol Molecular Graphics System"; + genericName = "Molecular Modeller"; + comment = description; + mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; + categories = "Graphics;Education;Science;Chemistry;"; + }; in -python27Packages.buildPythonApplication { +python3Packages.buildPythonApplication { name = "pymol-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/pymol/pymol/1.8/pymol-v1.8.4.0.tar.bz2"; + url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2"; sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n"; }; - buildInputs = [ python27Packages.numpy glew freeglut libpng libxml2 tk freetype ]; + buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; installPhase = '' python setup.py install --home=$out + cp -r ${desktopItem}/share/ $out/ + runHook postInstall ''; - meta = with stdenv.lib; { - description = "A Python-enhanced molecular graphics tool"; + postInstall = with python3Packages; '' + wrapProgram $out/bin/pymol \ + --prefix PYTHONPATH : ${makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]} + ''; + + meta = { + description = description; homepage = "https://www.pymol.org/"; license = licenses.psfl; }; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 0f817a71a701..ab5088543102 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,24 +1,39 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmakeHook, boost }: +{ stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig +, qtbase, qtsvg, qtserialport, boost, libgit2 +}: stdenv.mkDerivation rec { - version = "0.9.0b"; name = "fritzing-${version}"; + version = "0.9.3b"; - src = fetchurl { - url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2"; - sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk"; + src = fetchFromGitHub { + owner = "fritzing"; + repo = "fritzing-app"; + rev = version; + sha256 = "0hpyc550xfhr6gmnc85nq60w00rm0ljm0y744dp0z88ikl04f4s3"; }; - unpackPhase = '' - tar xjf ${src} - ''; + parts = fetchFromGitHub { + owner = "fritzing"; + repo = "fritzing-parts"; + rev = version; + sha256 = "1d2v8k7p176j0lczx4vx9n9gbg3vw09n2c4b6w0wj5wqmifywhc1"; + }; - buildInputs = [ qtbase qtsvg boost qmakeHook ]; + patches = [(fetchpatch { + name = "0001-Squashed-commit-of-the-following.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-Squashed-commit-of-the-following.patch?h=fritzing"; + sha256 = "1cv6myidxhy28i8m8v13ghzkvx5978p9dcd8v7885y0l1h3108mf"; + })]; + + buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; + + nativeBuildInputs = [ qmake pkgconfig ]; qmakeFlags = [ "phoenix.pro" ]; preConfigure = '' - cd fritzing-${version}.source + ln -s "$parts" parts ''; meta = { diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 9cac49d5189a..a7dcbb675f5b 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, openssl, boost, pkgconfig, doxygen }: +{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: stdenv.mkDerivation rec { name = "kicad-${series}"; series = "4.0"; - version = "4.0.2"; + version = "4.0.6"; srcs = [ (fetchurl { url = "https://code.launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz"; - sha256 = "1fcf91fmxj6ha3mm6gzdb0px50j58m80p8wrncm8ca9shj36kbif"; + sha256 = "1612lkr1p5sii2c4q8zdm6m4kmdylcq8hkd1mzr6b7l3g70sqz79"; }) (fetchurl { url = "http://downloads.kicad-pcb.org/libraries/kicad-library-${version}.tar.gz"; - sha256 = "1xk9sxxb3d42chdysqmvizrjcbm0467q7nsq5cahq3j1hci49m6l"; + sha256 = "16f47pd6f0ddsdxdrp327nr9v05gl8c24d0qypq2aqx5hdjmkp7f"; }) (fetchurl { url = "http://downloads.kicad-pcb.org/libraries/kicad-footprints-${version}.tar.gz"; - sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg"; + sha256 = "0vmgqhdw05k5fdnqv42grnvlz7v75g9md82jp2d3dvw2zw050lfb"; }) ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory - buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo openssl boost pkgconfig doxygen ]; + buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost pkgconfig doxygen ]; # They say they only support installs to /usr or /usr/local, # so we have to handle this. diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index fc07807b91d0..bab9b302d7d1 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A tool for squential logic synthesis and ormal verification"; - homepage = "www.eecs.berkeley.edu/~alanmi/abc/abc.htm"; + 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; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index fa890c03b6f7..9c8ecd016394 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 37d25c9e9477..2b40995b7433 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/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index f6837397e21a..8d3fb19b2638 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -1,31 +1,34 @@ -# - coqide compilation can be disabled by setting lablgtk to null; +# - coqide compilation can be disabled by setting buildIde to false; # - The csdp program used for the Micromega tactic is statically referenced. # However, coq can build without csdp by setting it to null. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. -{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: +{stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}: let - version = "8.6pre-0c999f02"; + version = "2017-02-03"; coq-version = "8.6"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; + ocaml = ocamlPackages_4_02.ocaml; + findlib = ocamlPackages_4_02.findlib; + lablgtk = ocamlPackages_4_02.lablgtk; + camlp5 = ocamlPackages_4_02.camlp5_transitional; in stdenv.mkDerivation { - name = "coq-${version}"; + name = "coq-unstable-${version}"; inherit coq-version; - inherit ocaml camlp5; + inherit ocaml camlp5 findlib; src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "ad768e435a736ca51ac79a575967b388b34918c7"; - sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j"; + rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06"; + sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index bc9ba049cd2c..fd3655ce9e92 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -26,9 +26,7 @@ let substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; -in - -stdenv.mkDerivation { +self = stdenv.mkDerivation { name = "coq-${version}"; inherit coq-version; @@ -36,6 +34,50 @@ stdenv.mkDerivation { inherit (ocamlPackages) ocaml; passthru = { inherit (ocamlPackages) findlib; + emacsBufferSetup = pkgs: '' + ; Propagate coq paths to children + (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") + (inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep") + (inherit-local-permanent coq-compiler "${self}/bin/coqc") + ; If the coq-library path was already set, re-set it based on our current coq + (when (fboundp 'get-coq-library-directory) + (inherit-local-permanent coq-library-directory (get-coq-library-directory)) + (coq-prog-args)) + (mapc (lambda (arg) + (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) + (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + ; TODO Abstract this pattern from here and nixBufferBuilders.withPackages! + (defvar nixpkgs--coq-buffer-count 0) + (when (eq nixpkgs--coq-buffer-count 0) + (make-variable-buffer-local 'nixpkgs--is-nixpkgs-coq-buffer) + (defun nixpkgs--coq-inherit (buf) + (inherit-local-inherit-child buf) + (with-current-buffer buf + (setq nixpkgs--coq-buffer-count (1+ nixpkgs--coq-buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-coq-buffer-count nil t)) + buf) + ; When generating a scomint buffer, do inherit-local inheritance and make it a nixpkgs-coq buffer + (defun nixpkgs--around-scomint-make (orig &rest r) + (if nixpkgs--is-nixpkgs-coq-buffer + (progn + (advice-add 'get-buffer-create :filter-return #'nixpkgs--coq-inherit) + (apply orig r) + (advice-remove 'get-buffer-create #'nixpkgs--coq-inherit)) + (apply orig r))) + (advice-add 'scomint-make :around #'nixpkgs--around-scomint-make) + ; When we have no more coq buffers, tear down the buffer handling + (defun nixpkgs--decrement-coq-buffer-count () + (setq nixpkgs--coq-buffer-count (1- nixpkgs--coq-buffer-count)) + (when (eq nixpkgs--coq-buffer-count 0) + (advice-remove 'scomint-make #'nixpkgs--around-scomint-make) + (fmakunbound 'nixpkgs--around-scomint-make) + (fmakunbound 'nixpkgs--coq-inherit) + (fmakunbound 'nixpkgs--decrement-coq-buffer-count)))) + (setq nixpkgs--coq-buffer-count (1+ nixpkgs--coq-buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-coq-buffer-count nil t) + (setq nixpkgs--is-nixpkgs-coq-buffer t) + (inherit-local 'nixpkgs--is-nixpkgs-coq-buffer) + ''; }; src = fetchurl { @@ -93,4 +135,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; platforms = platforms.unix; }; -} +}; in self diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix new file mode 100644 index 000000000000..4d96339149af --- /dev/null +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }: + +stdenv.mkDerivation rec { + name = "cryptominisat-${version}"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "msoos"; + repo = "cryptominisat"; + rev = version; + sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb"; + }; + + buildInputs = [ python xxd ]; + nativeBuildInputs = [ cmake ]; + + patches = [(fetchpatch rec { + name = "fix-exported-library-name.patch"; + url = "https://github.com/msoos/cryptominisat/commit/7a47795cbe5ad5a899731102d297f234bcade077.patch"; + sha256 = "11hf3cfqs4cykn7rlgjglq29lzqfxvlm0f20qasi0kdrz01cr30f"; + })]; + + meta = with stdenv.lib; { + description = "An advanced SAT Solver"; + homepage = https://github.com/msoos/cryptominisat; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix new file mode 100644 index 000000000000..9bfbcc3f30df --- /dev/null +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, ocaml, ocamlPackages }: + +stdenv.mkDerivation rec { + name = "cubicle-${version}"; + version = "1.0.2"; + src = fetchurl { + url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; + sha256 = "1fg39vlr2d5067512df32hkw6g8vglxj1m47md5mw3pn3ij6dpsx"; + }; + + buildInputs = [ ocaml ocamlPackages.functory ]; + + meta = with stdenv.lib; { + description = "An open source model checker for verifying safety properties of array-based systems"; + homepage = "http://cubicle.lri.fr/"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ lucas8 ]; + }; +} diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 91ee4e418995..acde7f6ae43b 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, cln, gmp, swig, pkgconfig, readline, libantlr3c, boost, jdk, autoreconfHook, python2 }: +{ stdenv, fetchFromGitHub, cln, gmp, swig, pkgconfig, readline, libantlr3c, +boost, jdk, autoreconfHook, python2, antlr3_4 }: stdenv.mkDerivation rec { - name = "cvc4-${version}"; - version = "1.5pre-smtcomp2016"; + name = "cvc4-unstable-${version}"; + version = "2017-05-18"; - src = fetchurl { - url = "http://cvc4.cs.nyu.edu/builds/src/cvc4-${version}.tar.gz"; - sha256 = "15wz0plfc9q8acrwq1ljgsgqmh8pyz5alzv5xpchvv9w76lvj2zf"; + src = fetchFromGitHub { + owner = "CVC4"; + repo = "CVC4"; + rev = "d77107cc56b0a089364c3d1512813701c155ea93"; + sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs"; }; - buildInputs = [ gmp cln pkgconfig readline swig libantlr3c boost jdk autoreconfHook python2 ]; + buildInputs = [ gmp cln pkgconfig readline swig libantlr3c antlr3_4 boost jdk autoreconfHook python2 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 40fb9bfb160b..e931c6fcf9d5 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; + broken = true; }; } 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 5c1ec4f7aaf1..000000000000 --- 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 fbd732595e6c..8d7c11ee91b7 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 fe906fbe3578..af225a2961d5 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/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index a863b01f43ae..08861341a1ae 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; rev = "v${version}"; - sha256 = "0w4cdai6mzx4wr7gscv4sl5q4mxx1agjbpp4smvrslav7gpbz025"; + sha256 = "13sb9rwgc9ni2j5zx77imjhkzhix9d7klsdb8cg68c17b20sy1g3"; }; buildInputs = [ gmp cmake ]; diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix new file mode 100644 index 000000000000..9d63f32c5449 --- /dev/null +++ b/pkgs/applications/science/logic/minisat/unstable.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, zlib, cmake }: + +stdenv.mkDerivation rec { + name = "minisat-unstable-2013-09-25"; + + src = fetchFromGitHub { + owner = "niklasso"; + repo = "minisat"; + rev = "37dc6c67e2af26379d88ce349eb9c4c6160e8543"; + sha256 = "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq"; + }; + + buildInputs = [ zlib ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Compact and readable SAT solver"; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = "http://minisat.se/"; + }; +} diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix new file mode 100644 index 000000000000..2fdbd87a275c --- /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/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 0cbe1d1cb375..49245c73f2c4 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchgit, mlton }: stdenv.mkDerivation { - name = "redprl-2016-09-22"; + name = "redprl-2017-03-28"; src = fetchgit { url = "https://github.com/RedPRL/sml-redprl.git"; - rev = "3215faf0d494f4ac14d6e10172329a161df192c4"; - sha256 = "0pcq4q9xy34j7ziwbly4qxccpkcrl92r9y11bv6hdkbzwm1g2a77"; + rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; + sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c"; fetchSubmodules = true; }; buildInputs = [ mlton ]; diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 444bb06c4a00..8c0b82cc549c 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -1,23 +1,32 @@ -{stdenv, cmake, boost, bison, flex, fetchgit, perl, zlib}: +{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }: + stdenv.mkDerivation rec { - version = "2014.01.07"; + version = "2.2.0"; name = "stp-${version}"; - src = fetchgit { - url = "git://github.com/stp/stp"; - rev = "3aa11620a823d617fc033d26aedae91853d18635"; - sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c"; + + src = fetchFromGitHub { + owner = "stp"; + repo = "stp"; + rev = "stp-${version}"; + sha256 = "1jh23wjm62nnqfx447g2y53bbangq04hjrvqc35v9xxpcjgj3i49"; }; - buildInputs = [ cmake boost bison flex perl zlib ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - patchPhase = '' - sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt - patch -p1 < ${./fixbuild.diff} - patch -p1 < ${./fixrefs.diff} + + buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ]; + nativeBuildInputs = [ cmake bison flex perl ]; + preConfigure = '' + python_install_dir=$out/${python3Packages.python.sitePackages} + mkdir -p $python_install_dir + cmakeFlagsArray=( + $cmakeFlagsArray + "-DBUILD_SHARED_LIBS=ON" + "-DPYTHON_LIB_INSTALL_DIR=$python_install_dir" + ) ''; - meta = { - description = ''Simple Theorem Prover''; - maintainers = with stdenv.lib.maintainers; [mornfall]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.mit; + + meta = with stdenv.lib; { + description = "Simple Theorem Prover"; + maintainers = with maintainers; [ mornfall ]; + platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/applications/science/logic/stp/fixbuild.diff b/pkgs/applications/science/logic/stp/fixbuild.diff deleted file mode 100644 index 01782cb4f40b..000000000000 --- a/pkgs/applications/science/logic/stp/fixbuild.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/libstp/CMakeLists.txt b/src/libstp/CMakeLists.txt -index 83bd03a..9c0304b 100644 ---- a/src/libstp/CMakeLists.txt -+++ b/src/libstp/CMakeLists.txt -@@ -23,6 +23,15 @@ set(stp_lib_targets - printer - ) - -+include_directories(${CMAKE_SOURCE_DIR}/src/AST/) -+include_directories(${CMAKE_BINARY_DIR}/src/AST/) -+ -+add_library(globalstp OBJECT -+ ../main/Globals.cpp -+ ${CMAKE_CURRENT_BINARY_DIR}/../main/GitSHA1.cpp -+) -+add_dependencies(globalstp ASTKind_header) -+ - # Create list of objects and gather list of - # associated public headers. - set(stp_lib_objects "") -@@ -31,6 +40,7 @@ foreach(target ${stp_lib_targets}) - list(APPEND stp_lib_objects $) - - get_target_property(TARGETS_PUBLIC_HEADERS ${target} PUBLIC_HEADER) -+ set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON) - if (EXISTS "${TARGETS_PUBLIC_HEADERS}") - list(APPEND stp_public_headers "${TARGETS_PUBLIC_HEADERS}") - message("Adding public header(s) ${TARGETS_PUBLIC_HEADERS} to target libstp") -diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt -index 0735137..73039f5 100644 ---- a/src/main/CMakeLists.txt -+++ b/src/main/CMakeLists.txt -@@ -3,12 +3,6 @@ include_directories(${CMAKE_BINARY_DIR}/src/AST/) - - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp" @ONLY) - --add_library(globalstp OBJECT -- Globals.cpp -- ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp --) --add_dependencies(globalstp ASTKind_header) -- - # ----------------------------------------------------------------------------- - # Create binary - # ----------------------------------------------------------------------------- diff --git a/pkgs/applications/science/logic/stp/fixrefs.diff b/pkgs/applications/science/logic/stp/fixrefs.diff deleted file mode 100644 index 60ad4949f076..000000000000 --- a/pkgs/applications/science/logic/stp/fixrefs.diff +++ /dev/null @@ -1,192 +0,0 @@ -commit 53b6043e25b2eba264faab845077fbf6736cf22f -Author: Petr Rockai -Date: Tue Jan 7 13:30:07 2014 +0100 - - aig: Comment out unused functions with undefined references in them. - -diff --git a/src/extlib-abc/aig/aig/aigPart.c b/src/extlib-abc/aig/aig/aigPart.c -index a4cc116..5bd5f08 100644 ---- a/src/extlib-abc/aig/aig/aigPart.c -+++ b/src/extlib-abc/aig/aig/aigPart.c -@@ -869,6 +869,7 @@ Vec_Ptr_t * Aig_ManMiterPartitioned( Aig_Man_t * p1, Aig_Man_t * p2, int nPartSi - SeeAlso [] - - ***********************************************************************/ -+#if 0 - Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize ) - { - extern int Cmd_CommandExecute( void * pAbc, char * sCommand ); -@@ -981,6 +982,7 @@ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize ) - Aig_ManMarkValidChoices( pAig ); - return pAig; - } -+#endif - - - //////////////////////////////////////////////////////////////////////// -diff --git a/src/extlib-abc/aig/aig/aigShow.c b/src/extlib-abc/aig/aig/aigShow.c -index ae8fa8b..f04eedc 100644 ---- a/src/extlib-abc/aig/aig/aigShow.c -+++ b/src/extlib-abc/aig/aig/aigShow.c -@@ -326,6 +326,7 @@ void Aig_WriteDotAig( Aig_Man_t * pMan, char * pFileName, int fHaig, Vec_Ptr_t * - SeeAlso [] - - ***********************************************************************/ -+#if 0 - void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold ) - { - extern void Abc_ShowFile( char * FileNameDot ); -@@ -347,7 +348,7 @@ void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold ) - // visualize the file - Abc_ShowFile( FileNameDot ); - } -- -+#endif - - //////////////////////////////////////////////////////////////////////// - /// END OF FILE /// -diff --git a/src/extlib-abc/aig/dar/darRefact.c b/src/extlib-abc/aig/dar/darRefact.c -index d744b4f..23fc3d5 100644 ---- a/src/extlib-abc/aig/dar/darRefact.c -+++ b/src/extlib-abc/aig/dar/darRefact.c -@@ -340,6 +340,7 @@ printf( "\n" ); - SeeAlso [] - - ***********************************************************************/ -+#if 0 - int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, int Required ) - { - Vec_Ptr_t * vCut; -@@ -428,6 +429,7 @@ int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, in - } - return p->GainBest; - } -+#endif - - /**Function************************************************************* - -@@ -461,6 +463,7 @@ int Dar_ObjCutLevelAchieved( Vec_Ptr_t * vCut, int nLevelMin ) - SeeAlso [] - - ***********************************************************************/ -+#if 0 - int Dar_ManRefactor( Aig_Man_t * pAig, Dar_RefPar_t * pPars ) - { - // Bar_Progress_t * pProgress; -@@ -583,6 +586,7 @@ p->timeOther = p->timeTotal - p->timeCuts - p->timeEval; - return 1; - - } -+#endif - - //////////////////////////////////////////////////////////////////////// - /// END OF FILE /// -diff --git a/src/extlib-abc/aig/dar/darScript.c b/src/extlib-abc/aig/dar/darScript.c -index e60df00..1b9c24f 100644 ---- a/src/extlib-abc/aig/dar/darScript.c -+++ b/src/extlib-abc/aig/dar/darScript.c -@@ -64,6 +64,7 @@ Aig_Man_t * Dar_ManRewriteDefault( Aig_Man_t * pAig ) - SeeAlso [] - - ***********************************************************************/ -+#if 0 - Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose ) - //alias rwsat "st; rw -l; b -l; rw -l; rf -l" - { -@@ -108,7 +109,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose ) - - return pAig; - } -- -+#endif - - /**Function************************************************************* - -@@ -121,6 +122,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose ) - SeeAlso [] - - ***********************************************************************/ -+#if 0 - Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose ) - //alias compress2 "b -l; rw -l; rwz -l; b -l; rwz -l; b -l" - { -@@ -180,6 +182,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i - - return pAig; - } -+#endif - - /**Function************************************************************* - -@@ -192,6 +195,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i - SeeAlso [] - - ***********************************************************************/ -+#if 0 - Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose ) - //alias compress2 "b -l; rw -l; rf -l; b -l; rw -l; rwz -l; b -l; rfz -l; rwz -l; b -l" - { -@@ -285,6 +289,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, - } - return pAig; - } -+#endif - - /**Function************************************************************* - -@@ -297,6 +302,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, - SeeAlso [] - - ***********************************************************************/ -+#if 0 - Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose ) - //alias resyn "b; rw; rwz; b; rwz; b" - //alias resyn2 "b; rw; rf; b; rw; rwz; b; rfz; rwz; b" -@@ -311,6 +317,7 @@ Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateL - Vec_PtrPush( vAigs, pAig ); - return vAigs; - } -+#endif - - /**Function************************************************************* - -diff --git a/src/extlib-abc/aig/kit/kitAig.c b/src/extlib-abc/aig/kit/kitAig.c -index de301f2..7e5df0f 100644 ---- a/src/extlib-abc/aig/kit/kitAig.c -+++ b/src/extlib-abc/aig/kit/kitAig.c -@@ -95,6 +95,7 @@ Aig_Obj_t * Kit_GraphToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, Kit_Graph_t - SeeAlso [] - - ***********************************************************************/ -+#if 0 - Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * pTruth, int nVars, Vec_Int_t * vMemory ) - { - Aig_Obj_t * pObj; -@@ -113,6 +114,7 @@ Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * p - Kit_GraphFree( pGraph ); - return pObj; - } -+#endif - - //////////////////////////////////////////////////////////////////////// - /// END OF FILE /// -diff --git a/src/extlib-abc/aig/kit/kitGraph.c b/src/extlib-abc/aig/kit/kitGraph.c -index 39ef587..0485c66 100644 ---- a/src/extlib-abc/aig/kit/kitGraph.c -+++ b/src/extlib-abc/aig/kit/kitGraph.c -@@ -349,6 +349,7 @@ unsigned Kit_GraphToTruth( Kit_Graph_t * pGraph ) - SeeAlso [] - - ***********************************************************************/ -+#if 0 - Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemory ) - { - Kit_Graph_t * pGraph; -@@ -365,6 +366,7 @@ Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemor - pGraph = Kit_SopFactor( vMemory, RetValue, nVars, vMemory ); - return pGraph; - } -+#endif - - /**Function************************************************************* - diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index cf5114b4a417..0ec7f93d26f5 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 f87a26cda8a5..e75ae2222ae9 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas -, curl, Cocoa, Foundation, cf-private, libobjc, tzdata +, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false }: stdenv.mkDerivation rec { - name = "R-3.3.3"; + name = "R-3.4.1"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss"; + sha256 = "0y7wlfk3cn1dxn2mpnxwvsk31s0599crbsyah8srm5pa2mfi7c82"; }; buildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; doCheck = true; - preCheck = "bin/Rscript -e 'sessionInfo()'"; + preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 19f769e4365c..b8ed7ffac3cd 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/calc --prefix LD_LIBRARY_PATH : $out/lib ''; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = { description = "C-style arbitrary precision calculator"; homepage = http://www.isthe.com/chongo/tech/comp/calc/; diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 7aafe9da41e4..796e8b7264fb 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; - buildInputs = [ blas gfortran liblapack ]; + buildInputs = [ blas gfortran.cc.lib liblapack ]; postPatch = '' substituteInPlace Makefile --replace /usr/local/bin $out/bin diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 072d772775cd..44dc7af98c1a 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -10,9 +10,12 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz; - sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8"; - }; + url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz; + sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8"; + }; + + # See https://trac.sagemath.org/ticket/19233 + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm-redc"; buildInputs = [ m4 gmp ]; @@ -23,6 +26,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; homepage = http://ecm.gforge.inria.fr/; maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 45f8dd1960b7..b6fdd6f58b9b 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-331-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 = "135g2xqafgs1gv98vqq2jpfwyi1aflyiynx1gmsgs23jxbr218v2"; + 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 9ea43023d57c..1956ebdcb0f1 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,25 +1,27 @@ -{ 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"; meta = with stdenv.lib; { description = "GiNaC is Not a CAS"; homepage = http://www.ginac.de/; - maintainers = with maintainers; [ lovek323 urkud ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index eae4b0ceb628..3e4c8c702869 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/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 85a13f7ac377..5a19f73d9cf9 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + broken = ecl != null; }; } // (stdenv.lib.optionalAttrs ecl-fasl { preConfigure = '' diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 4c99b5081cc5..6e1926810df0 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,29 +1,30 @@ {stdenv, fetchurl, zlib, gmp, ecm }: stdenv.mkDerivation { - name = "msieve-1.48"; + name = "msieve-1.53"; src = fetchurl { - url = mirror://sourceforge/msieve/msieve/Msieve%20v1.48/msieve148.tar.gz; - sha256 = "05cm23mpfsbwssqda243sbi8m31j783qx89x9gl7sy8a4dnv7h63"; - }; + url = mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz; + sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; + }; buildInputs = [ zlib gmp ecm ]; ECM = if ecm == null then "0" else "1"; - buildFlags = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else "generic"; + # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too + makeFlags = "CC=cc all"; - installPhase = ''mkdir -p $out/bin/ - cp msieve $out/bin/''; + installPhase = '' + mkdir -p $out/bin/ + cp msieve $out/bin/ + ''; meta = { description = "A C library implementing a suite of algorithms to factor large integers"; license = stdenv.lib.licenses.publicDomain; homepage = http://msieve.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 9e17fe60c295..e6630815ba16 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk -, imagemagick, liblapack, python, openssl, libpng +{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422 +, imagemagick, liblapack, python, openssl, libpng , which }: @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://old.files.sagemath.org/src-old/${name}.tar.gz"; sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9"; + }; - buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg tk imagemagick liblapack - python openssl libpng which]; + buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack + python openssl libpng which ]; patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ]; @@ -36,5 +37,6 @@ stdenv.mkDerivation rec { homepage = "http://www.sagemath.org"; description = "A free open source mathematics software system"; license = stdenv.lib.licenses.gpl2Plus; + broken = true; }; } diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 6cd66c62a0ad..3fe8b542995e 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -40,13 +40,12 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuild = true; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A CAS for polynomial computations"; - maintainers = with maintainers; - [ raskin ]; - platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; + platforms = subtractLists platforms.i686 platforms.linux; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 334423660a03..d36b135531c2 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, cmake, qtbase, qttools }: +{ mkDerivation, lib, fetchgit, cmake, qtbase, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "speedcrunch-${version}"; version = "0.12.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd src ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://speedcrunch.org; license = licenses.gpl2Plus; description = "A fast power user calculator"; @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { full keyboard-friendly and more than 15 built-in math function. ''; maintainers = with maintainers; [ gebner ]; - platforms = platforms.all; + inherit (qtbase.meta) platforms; + # works with qt 5.6 and qt 5.8 + broken = builtins.compareVersions qtbase.version "5.7.0" == 0; }; - } diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 4ac3500b6d93..cfc63a50165e 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "weka-${version}"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip"; - sha256 = "2586298688059a025e2810b1ffc73f4fb3cf81ebf2183d8d19b0763d33857f61"; + sha256 = "16n1a74d1cispp0a22zyiivi78izi354y67gmbyvv2lv9sc45wmk"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix new file mode 100644 index 000000000000..7cdacc1738be --- /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/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 54be212b86cd..716d6d9687c5 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -2,20 +2,28 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: +let + majorVersion = "7.8"; + minorVersion = "0"; +in + stdenv.mkDerivation rec { - version = "7.4.42"; + version = "${majorVersion}.${minorVersion}"; name = "boinc-${version}"; src = fetchFromGitHub { + name = "${name}-src"; owner = "BOINC"; repo = "boinc"; - rev = "561fbdae0cac3be996136319828f43cbc62c9"; - sha256 = "1rlh463yyz88p2g5pc6avndn3x1162vcksgbqich0i3qb90jms29"; + rev = "client_release/${majorVersion}/${version}"; + sha256 = "08kv3fai79cc28vmyi0y4xcdd5h9xgkn9yyc6y36c0mglaxsn4pr"; }; - buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi - freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11 - libxcb xcbutil + nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; + + buildInputs = [ + curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver + libnotify patchelf libX11 libxcb xcbutil ]; NIX_LDFLAGS = "-lX11"; @@ -31,11 +39,8 @@ stdenv.mkDerivation rec { meta = { description = "Free software for distributed and grid computing"; - homepage = http://boinc.berkeley.edu/; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 6b13d969bdd7..d36b0f0b4d93 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cytoscape-${version}"; - version = "3.4.0"; + version = "3.5.1"; src = fetchurl { url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz"; - sha256 = "065fsqa01w7j85nljwwc0677lfw112xphnyn1c4hb04166q082p2"; + sha256 = "1dvv0f7sc7q7lwmpd7xkcx86dd8lxh2il3wiwkij44gh7ni1qkfm"; }; buildInputs = [jre makeWrapper]; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix new file mode 100644 index 000000000000..5fe72e44842d --- /dev/null +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, fetchgit +, wxGTK, perl, python2, zlib, mesa, libX11 +, automake, autoconf +}: +let + s = # Generated upstream information + rec { + baseName="golly"; + version="2.8"; + name="${baseName}-${version}"; + hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; + }; +in +stdenv.mkDerivation rec { + name = "golly-${version}"; + version = "2.8.99.2.20161122"; + #src = fetchurl { + # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; + # sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; + #}; + src = fetchgit { + url = "git://git.code.sf.net/p/golly/code"; + rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8"; + sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk"; + }; + + setSourceRoot = '' + export sourceRoot="$(echo */gui-wx/configure)" + ''; + + nativeBuildInputs = [autoconf automake]; + + buildInputs = [ + wxGTK perl python2 zlib mesa libX11 + ]; + + # Link against Python explicitly as it is needed for scripts + makeFlags=[ + "AM_LDFLAGS=" + ]; + NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + preConfigure='' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE + -DPYTHON_SHLIB=$(basename "$( + readlink -f ${python2}/lib/libpython*.so)")" + + sh autogen.sh + ''; + + meta = { + inherit version; + description = "Cellular automata simulation program"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://sourceforge.net/projects/golly/files/golly"; + }; +} diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream index 24032de56684..ab9fb03e7b18 100644 --- a/pkgs/applications/science/misc/golly/default.upstream +++ b/pkgs/applications/science/misc/golly/default.upstream @@ -2,3 +2,4 @@ url http://sourceforge.net/projects/golly/files/golly/ version_link '[-][0-9.]+/$' SF_version_tarball 'src' SF_redirect +minimize_overwrite diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix new file mode 100644 index 000000000000..fb3b0a29724b --- /dev/null +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchgit, pkgconfig, cmake +, libjpeg ? null +, zlib ? null +, libpng ? null +, eigen ? null +, libtiff ? null +, enableExamples ? false +, enableDocs ? false }: + +stdenv.mkDerivation rec { + version = "1.1"; + name = "openmvg-${version}"; + + src = fetchgit { + url = "https://www.github.com/openmvg/openmvg.git"; + + # Tag v1.1 + rev = "refs/tags/v${version}"; + sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f"; + fetchSubmodules = true; + }; + + buildInputs = [ libjpeg zlib libpng eigen libtiff ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" + "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" + ]; + + cmakeDir = "./src"; + + dontUseCmakeBuildDir = true; + + # This can be enabled, but it will exhause virtual memory on most machines. + enableParallelBuilding = false; + + # Without hardeningDisable, certain flags are passed to the compile that break the build (primarily string format errors) + hardeningDisable = [ "all" ]; + + meta = { + description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community"; + homepage = http://openmvg.readthedocs.io/en/latest/; + license = stdenv.lib.licenses.mpl20; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix new file mode 100644 index 000000000000..177f8ca25649 --- /dev/null +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +, eigen, opencv, ceres-solver, cgal, boost, vcg +, gmp, mpfr, glog, google-gflags, libjpeg_turbo }: + +stdenv.mkDerivation rec { + name = "openmvs-unstable-2017-05-01"; + + src = fetchFromGitHub { + owner = "cdcseacave"; + repo = "openmvs"; + + rev = "a3b360016660a1397f6eb6c070c2c19bbb4c7590"; + sha256 = "170ff4ipix2kqq5rhb1yrrcvc79im9qgp5hiwsdr23xxzdl21221"; + }; + + buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + preConfigure = '' + cmakeFlagsArray=( + $cmakeFlagsArray + "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_RUNTIME=ON" + "-DINSTALL_BIN_DIR=$out/bin" + "-DVCG_DIR=${vcg}" + "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/" + ) + ''; + + cmakeDir = "./"; + + dontUseCmakeBuildDir = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; + homepage = http://cdcseacave.github.io/openMVS/; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch new file mode 100644 index 000000000000..a396a848f142 --- /dev/null +++ b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch @@ -0,0 +1,175 @@ +diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx +index d71cb74..076facb 100644 +--- a/core/metacling/src/TCling.cxx ++++ b/core/metacling/src/TCling.cxx +@@ -756,7 +756,7 @@ int TCling_GenerateDictionary(const std::vector &classes, + gSystem->PrependPathName(dirbase, header); + dir = gSystem->DirName(dir); + } +- fileContent += TString("#include \"") + header + "\"\n"; ++ fileContent += (TString("#include \"") + header + "\"\n").Data(); + } + } + for (it = fwdDecls.begin(); it != fwdDecls.end(); ++it) { +@@ -1061,7 +1061,7 @@ TCling::TCling(const char *name, const char *title) + ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage); + + // Add -I early so ASTReader can find the headers. +- std::string interpInclude(TROOT::GetEtcDir()); ++ std::string interpInclude(TROOT::GetEtcDir().Data()); + clingArgsStorage.push_back("-I" + interpInclude); + + // Add include path to etc/cling. FIXME: This is a short term solution. The +@@ -1070,7 +1070,7 @@ TCling::TCling(const char *name, const char *title) + clingArgsStorage.push_back("-I" + interpInclude + "/cling"); + + // Add the root include directory and etc/ to list searched by default. +- clingArgsStorage.push_back(std::string("-I" + TROOT::GetIncludeDir())); ++ clingArgsStorage.push_back(std::string(("-I" + TROOT::GetIncludeDir()).Data())); + + // Add the current path to the include path + // TCling::AddIncludePath("."); +diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx +index abf3929..e7dad98 100644 +--- a/hist/hist/src/TFormula.cxx ++++ b/hist/hist/src/TFormula.cxx +@@ -1677,7 +1677,7 @@ void TFormula::ProcessFormula(TString &formula) + if(fun.fName.Contains("::")) // add support for nested namespaces + { + // look for last occurence of "::" +- std::string name(fun.fName); ++ std::string name(fun.fName.Data()); + size_t index = name.rfind("::"); + assert(index != std::string::npos); + TString className = fun.fName(0,fun.fName(0,index).Length()); +@@ -1869,7 +1869,7 @@ void TFormula::ProcessFormula(TString &formula) + + // save copy of inputFormula in a std::strig for the unordered map + // and also formula is same as FClingInput typically and it will be modified +- std::string inputFormula = std::string(formula); ++ std::string inputFormula = std::string(formula.Data()); + + + // valid input formula - try to put into Cling +diff --git a/main/src/nbmain.cxx b/main/src/nbmain.cxx +index 55d4f2f..8490149 100644 +--- a/main/src/nbmain.cxx ++++ b/main/src/nbmain.cxx +@@ -173,9 +173,9 @@ static bool CreateStamp(string dest) + + int main() + { +- string rootbin(TROOT::GetBinDir()); +- string rootlib(TROOT::GetLibDir()); +- string rootetc(TROOT::GetEtcDir()); ++ string rootbin(TROOT::GetBinDir().Data()); ++ string rootlib(TROOT::GetLibDir().Data()); ++ string rootetc(TROOT::GetEtcDir().Data()); + + // If needed, install ROOT notebook files in the user's home directory + #ifdef WIN32 +diff --git a/math/minuit/src/TMinuitMinimizer.cxx b/math/minuit/src/TMinuitMinimizer.cxx +index 4e2082a..18215c0 100644 +--- a/math/minuit/src/TMinuitMinimizer.cxx ++++ b/math/minuit/src/TMinuitMinimizer.cxx +@@ -454,7 +454,7 @@ std::string TMinuitMinimizer::VariableName(unsigned int ivar) const { + // return the variable name + if (!CheckMinuitInstance()) return std::string(); + if (!CheckVarIndex(ivar)) return std::string(); +- return std::string(fMinuit->fCpnam[ivar]); ++ return std::string(fMinuit->fCpnam[ivar].Data()); + } + + int TMinuitMinimizer::VariableIndex(const std::string & ) const { +diff --git a/tmva/tmva/src/Factory.cxx b/tmva/tmva/src/Factory.cxx +index 36060ef..a1bbe34 100644 +--- a/tmva/tmva/src/Factory.cxx ++++ b/tmva/tmva/src/Factory.cxx +@@ -390,7 +390,7 @@ TMVA::MethodBase* TMVA::Factory::BookMethod( TMVA::DataLoader *loader, TString t + // initialize methods + IMethod* im; + if (!boostNum) { +- im = ClassifierFactory::Instance().Create( std::string(theMethodName), ++ im = ClassifierFactory::Instance().Create( std::string(theMethodName.Data()), + fJobName, + methodTitle, + loader->DefaultDataSetInfo(), +@@ -933,7 +933,7 @@ void TMVA::Factory::TrainAllMethods() + + // recreate + m = dynamic_cast( ClassifierFactory::Instance() +- .Create( std::string(Types::Instance().GetMethodName(methodType)), ++ .Create( std::string(Types::Instance().GetMethodName(methodType).Data()), + dataSetInfo, weightfile ) ); + if( m->GetMethodType() == Types::kCategory ){ + MethodCategory *methCat = (dynamic_cast(m)); +diff --git a/tmva/tmva/src/MethodBoost.cxx b/tmva/tmva/src/MethodBoost.cxx +index 1349e5d..2125ab3 100644 +--- a/tmva/tmva/src/MethodBoost.cxx ++++ b/tmva/tmva/src/MethodBoost.cxx +@@ -389,7 +389,7 @@ void TMVA::MethodBoost::Train() + // the first classifier shows the option string output, the rest not + if (fCurrentMethodIdx>0) TMVA::MsgLogger::InhibitOutput(); + +- IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName), ++ IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName.Data()), + GetJobName(), + Form("%s_B%04i", fBoostedMethodTitle.Data(),fCurrentMethodIdx), + DataInfo(), +diff --git a/tmva/tmva/src/MethodCategory.cxx b/tmva/tmva/src/MethodCategory.cxx +index c2cbe80..d278cca 100644 +--- a/tmva/tmva/src/MethodCategory.cxx ++++ b/tmva/tmva/src/MethodCategory.cxx +@@ -147,7 +147,7 @@ TMVA::IMethod* TMVA::MethodCategory::AddMethod( const TCut& theCut, + const TString& theTitle, + const TString& theOptions ) + { +- std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod)); ++ std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod).Data()); + + Log() << kINFO << "Adding sub-classifier: " << addedMethodName << "::" << theTitle << Endl; + +diff --git a/tmva/tmva/src/MethodCompositeBase.cxx b/tmva/tmva/src/MethodCompositeBase.cxx +index 98fa5da..96bd9a3 100644 +--- a/tmva/tmva/src/MethodCompositeBase.cxx ++++ b/tmva/tmva/src/MethodCompositeBase.cxx +@@ -194,7 +194,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromXML( void* wghtnode ) + ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodTypeName), methodName, optionString ); + } + fMethods.push_back(ClassifierFactory::Instance().Create( +- std::string(methodTypeName),jobName, methodName,DataInfo(),optionString)); ++ std::string(methodTypeName.Data()),jobName, methodName,DataInfo(),optionString)); + + fMethodWeight.push_back(methodWeight); + MethodBase* meth = dynamic_cast(fMethods.back()); +@@ -259,7 +259,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromStream( std::istream& istr ) + ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodName), methodTitle, optionString ); + } + else methodTitle=Form("%s (%04i)",GetMethodName().Data(),fCurrentMethodIdx); +- fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName), jobName, ++ fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName.Data()), jobName, + methodTitle,DataInfo(), optionString) ); + fMethodWeight.push_back( methodWeight ); + if(MethodBase* m = dynamic_cast(fMethods.back()) ) +diff --git a/tmva/tmva/src/Reader.cxx b/tmva/tmva/src/Reader.cxx +index 94a8b28..0b67867 100644 +--- a/tmva/tmva/src/Reader.cxx ++++ b/tmva/tmva/src/Reader.cxx +@@ -401,7 +401,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( const TString& methodTag, const TString& w + + TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const TString& weightfile ) + { +- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )), ++ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()), + DataInfo(), weightfile ); + + MethodBase *method = (dynamic_cast(im)); +@@ -440,7 +440,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const char* + #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00) + + // books MVA method from weightfile +- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )), ++ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()), + DataInfo(), "" ); + + MethodBase *method = (dynamic_cast(im)); diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 220b2e06360f..c13169041aaf 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, zlib, lzma, gsl, Cocoa }: +, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lzma, gsl +, Cocoa, OpenGL }: stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.08.02"; + version = "6.10.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0530v1r4rvds52hgb13f00l3phhn76z6vii550mwv8bj3sl5070k"; + sha256 = "1ryp9397xpbnxha6s222c10pa50lf2qf5s35n31lc29s90p8s9kc"; }; - buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa ] + buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -20,6 +21,9 @@ stdenv.mkDerivation rec { # this prevents thisroot.sh from setting $p, which interferes with stdenv setup ./thisroot.patch + + # https://sft.its.cern.ch/jira/browse/ROOT-8728 + ./ROOT-8728-extra.patch ]; preConfigure = '' @@ -39,6 +43,7 @@ stdenv.mkDerivation rec { "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" + "-Dimt=OFF" "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF" @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { "-Dmonalisa=OFF" "-Dmysql=OFF" "-Dodbc=OFF" - "-Dopengl=OFF" + "-Dopengl=ON" "-Doracle=OFF" "-Dpgsql=OFF" "-Dpythia6=OFF" @@ -55,10 +60,11 @@ stdenv.mkDerivation rec { "-Drfio=OFF" "-Dsqlite=OFF" "-Dssl=OFF" - "-Dxml=OFF" + "-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/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index c4632d62b4fe..df0ef79d0a0f 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -25,7 +25,7 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake - COMMAND cut -d . -f 2 - OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE) - -- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) +- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang) set(libcxx ON CACHE BOOL "Build using libc++" FORCE) - endif() diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 7656668f0564..8a3645705ab5 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_1, graphviz, libsigcxx -, libunwind, elfutils +{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_3, graphviz, libsigcxx +, libunwind, elfutils, python3, doxygen }: stdenv.mkDerivation rec { - version = "3.11.1"; + version = "3.15"; name = "simgrid-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33686/${name}.tar.gz"; - sha256 = "0mkrzxpf42lmn96khfl1791vram67r2nqsgmppd2yil889nyz5kp"; + url = "https://gforge.inria.fr/frs/download.php/36621/${name}.tar.gz"; + sha256 = "1s595wc4z8hkvim3ypfdxy16pply6ckjg10v84cc0lx9pz6i3r6i"; }; - buildInputs = [ cmake perl ruby boost lua5_1 graphviz libsigcxx libunwind - elfutils + buildInputs = [ cmake perl ruby boost lua5_3 graphviz libsigcxx libunwind + elfutils python3 doxygen ]; preConfigure = @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # Enable more functionality. export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on -Denable_latency_bound_tracking=on -Denable_lua=on - -Denable_ns3=on -Denable_gtnets=on + -Denable_ns3=off -Denable_gtnets=on " ''; @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' done + patchShebangs ./tools/ ''; # Fixing the few tests that fail is left as an exercise to the reader. diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index e815ddfc1c2f..e1e7c43943a7 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # LLVM 4 doesn't allow ambigous type in std::abs argument + patches = stdenv.lib.optional stdenv.cc.isClang [ ./explicit_overloads.patch ]; + configureFlags = [ "--with-sqlite3=${sqlite.dev}" "--enable-hepmc2=${hepmc}" diff --git a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch b/pkgs/applications/science/physics/sherpa/explicit_overloads.patch new file mode 100644 index 000000000000..33e5a7632178 --- /dev/null +++ b/pkgs/applications/science/physics/sherpa/explicit_overloads.patch @@ -0,0 +1,119 @@ +diff --git a/ATOOLS/Phys/Flavour.C b/ATOOLS/Phys/Flavour.C +index 1986348..740eea3 100644 +--- a/ATOOLS/Phys/Flavour.C ++++ b/ATOOLS/Phys/Flavour.C +@@ -298,8 +298,8 @@ std::string Flavour::IDName() const + + bool Flavour::IsDiQuark() const + { +- if(abs(Kfcode())>=1103&&abs(Kfcode())<=5505) { +- double help=abs(Kfcode())/100.0-int(abs(Kfcode())/100.0); ++ if(abs((long)Kfcode())>=1103&&abs((long)Kfcode())<=5505) { ++ double help=abs((long)Kfcode())/100.0-int(abs((long)Kfcode())/100.0); + if(help<0.031) return true; + } + return false; +@@ -307,27 +307,27 @@ bool Flavour::IsDiQuark() const + + bool Flavour::IsBaryon() const + { +- if (abs(Kfcode())%10000<1000) return false; ++ if (abs((long)Kfcode())%10000<1000) return false; + return !IsDiQuark(); + } + + bool Flavour::IsB_Hadron() const + { +- if (abs(Kfcode())<100) return 0; ++ if (abs((long)Kfcode())<100) return 0; + if (Kfcode()-100*int(Kfcode()/100)<10) return 0; +- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; +- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; +- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; ++ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; ++ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; ++ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; + return 0; + } + + bool Flavour::IsC_Hadron() const + { +- if (abs(Kfcode())<100) return 0; ++ if (abs((long)Kfcode())<100) return 0; + if (Kfcode()-100*int(Kfcode()/100)<10) return 0; +- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; +- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; +- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; ++ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; ++ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; ++ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; + return 0; + } + +diff --git a/AddOns/Pythia/Pythia_Jet_Criterion.C b/AddOns/Pythia/Pythia_Jet_Criterion.C +index bbe9597..c1201e1 100644 +--- a/AddOns/Pythia/Pythia_Jet_Criterion.C ++++ b/AddOns/Pythia/Pythia_Jet_Criterion.C +@@ -117,8 +117,8 @@ namespace PYTHIA { + double Qsq = sign * Q.Abs2(); + // Mass term of radiator + DEBUG_VAR(ampl->MS()); +- double m2Rad = ( abs(RadAfterBranch.Flav().Kfcode()) >= 4 +- && abs(RadAfterBranch.Flav().Kfcode()) < 7) ++ double m2Rad = ( abs((long)RadAfterBranch.Flav().Kfcode()) >= 4 ++ && abs((long)RadAfterBranch.Flav().Kfcode()) < 7) + ? ampl->MS()->Mass2(RadAfterBranch.Flav()) + : 0.; + // Construct 2->3 variables for FSR +diff --git a/BEAM/Main/EPA.C b/BEAM/Main/EPA.C +index 861a1b2..340ac33 100644 +--- a/BEAM/Main/EPA.C ++++ b/BEAM/Main/EPA.C +@@ -54,7 +54,7 @@ double EPA::CosInt::GetCosInt(double X) + + double EPA::phi(double x, double qq) + { +- if (abs(m_beam.Kfcode()) == kf_p_plus) { ++ if (abs((long)m_beam.Kfcode()) == kf_p_plus) { + const double a = 7.16; + const double b = -3.96; + const double c = .028; +@@ -179,7 +179,7 @@ bool EPA::CalculateWeight(double x,double q2) + m_weight=0.0; + return 1; + } +- if (abs(m_beam.Kfcode()) == kf_e) { ++ if (abs((long)m_beam.Kfcode()) == kf_e) { + double f = alpha/M_PI*(1+sqr(1-m_x))/m_x*log(2.*m_energy/m_mass); + if (f < 0) f = 0.; + m_weight = f; +@@ -187,7 +187,7 @@ bool EPA::CalculateWeight(double x,double q2) + <<"energy = "<Get()<0.25) +- anti=Flavour((kf_code)(abs(rem[0])*1000+abs(rem[1])*100+1)); ++ anti=Flavour((kf_code)(abs((long)rem[0])*1000+abs((long)rem[1])*100+1)); + } + else { +- anti=Flavour((kf_code)(abs(rem[0])*1100+3)); ++ anti=Flavour((kf_code)(abs((long)rem[0])*1100+3)); + } + if (flav.IsAnti()) anti=anti.Bar(); + return anti; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index a82027a628f3..8ed8e0e73b00 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { cp -r * "$out" # Hack around lack of libtinfo in NixOS ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5 - ln -s ${qtbase.out}/lib/qt5/plugins $out/lib/qt_plugins + ln -s ${qtbase.out}/$qtPluginPrefix $out/lib/qt_plugins ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1 for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 98567c340bc4..98ec39eb2064 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,19 +1,16 @@ { stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake - , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns - , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook - , makeQtWrapper, lndir - , gst_all_1, qt-gstreamer1, pkgconfig, glibc - , version ? "2.9.4" +, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns +, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake +, makeWrapper, lndir +, gst_all_1, qt-gstreamer1, pkgconfig, glibc +, version ? "2.9.4" }: stdenv.mkDerivation rec { name = "qgroundcontrol-${version}"; - buildInputs = [ - SDL udev doxygen git - ] ++ gstInputs; qtInputs = [ - qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg + qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg qtquick1 qtquickcontrols qtgraphicaleffects ]; @@ -22,9 +19,8 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ - pkgconfig makeQtWrapper qmakeHook - ] ++ qtInputs; + buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs; + nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; postPatch = '' @@ -56,10 +52,10 @@ stdenv.mkDerivation rec { # we need to link to our Qt deps in our own output if we want # this package to work without being installed as a system pkg - mkdir -p $out/lib/qt5 $out/etc/xdg + mkdir -p $out/lib/qt-$qtCompatVersion $out/etc/xdg for pkg in $qtInputs; do - if [[ -d $pkg/lib/qt5 ]]; then - for dir in lib/qt5 share etc/xdg; do + if [[ -d $pkg/lib/qt-$qtCompatVersion ]]; then + for dir in lib/qt-$qtCompatVersion share etc/xdg; do if [[ -d $pkg/$dir ]]; then ${lndir}/bin/lndir "$pkg/$dir" "$out/$dir" fi @@ -70,7 +66,7 @@ stdenv.mkDerivation rec { postInstall = '' - wrapQtProgram "$out/bin/qgroundcontrol" \ + wrapProgram "$out/bin/qgroundcontrol" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; @@ -89,5 +85,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pxc ]; + broken = true; # relies improperly on private Qt 5.5 headers }; } diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 141ef44b77e1..6dbc75e9c062 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/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 345b1341c0f4..649b34e75692 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -7,16 +7,14 @@ assert stdenv.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.21.3"; + ver = "1.23.1"; name = "recoll-${ver}"; src = fetchurl { url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a"; + sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8"; }; - patches = [ ./nodeblayout.patch ./versionawk.patch ]; - configureFlags = [ "--with-inotify" ]; buildInputs = [ qt4 xapian file python bison]; @@ -61,6 +59,6 @@ stdenv.mkDerivation rec { homepage = http://www.lesbonscomptes.com/recoll/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ jcumming ]; + maintainers = [ maintainers.jcumming ]; }; } diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix new file mode 100644 index 000000000000..569606d2fdb6 --- /dev/null +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "1.20170611"; + pname = "blackbox"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "stackexchange"; + repo = pname; + rev = "v${version}"; + sha256 = "1jnzhlj54c0szw9l9wib07i2375pbm402bx9wagspcmwc0qw43p6"; + }; + + installPhase = '' + mkdir -p $out/bin && cp -r bin/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "Safely store secrets in a VCS repo"; + maintainers = with maintainers; [ ericsagnes ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 14a492f6cc2b..cefdc1108bfc 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/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b9b7f2e543ff..081bfd5918b8 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -30,6 +30,8 @@ rec { diff-so-fancy = callPackage ./diff-so-fancy { }; + ghq = callPackage ./ghq { }; + git = appendToName "minimal" gitBase; # The full-featured Git. @@ -66,8 +68,16 @@ rec { git-imerge = callPackage ./git-imerge { }; + git-octopus = callPackage ./git-octopus { }; + + git-open = callPackage ./git-open { }; + git-radar = callPackage ./git-radar { }; + git-recent = callPackage ./git-recent { + utillinux = if stdenv.isLinux then utillinuxMinimal else null; + }; + git-remote-hg = callPackage ./git-remote-hg { }; git-stree = callPackage ./git-stree { }; 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 aa4b83c59b59..b613898faaae 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,18 +2,18 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "0.11.1"; - - # perl is needed here so patchShebangs can do its job - buildInputs = [perl makeWrapper]; + version = "1.1.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1dw32c5i9mry6zr2a6h1369fhp1qbqimx04qgdmdnmn1imyck1h3"; + sha256 = "0wd9npcfp41ggvddrbif8qr25pm7jlzxzd3xn5rlq0y0frwx5akj"; }; + # Perl is needed here for patchShebangs + nativeBuildInputs = [ perl makeWrapper ]; + buildPhase = null; installPhase = '' @@ -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` @@ -34,16 +34,15 @@ stdenv.mkDerivation rec { --prefix PATH : "${ncurses.out}/bin" ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/so-fancy/diff-so-fancy; description = "Good-looking diffs filter for git"; - license = stdenv.lib.licenses.mit; - + license = licenses.mit; + platforms = platforms.all; longDescription = '' diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix new file mode 100644 index 000000000000..4ba86a2a0866 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "ghq-${version}"; + version = "0.7.4"; + + goPackagePath = "github.com/motemen/ghq"; + + src = fetchFromGitHub { + owner = "motemen"; + repo = "ghq"; + rev = "v${version}"; + sha256 = "0x2agr7why8mcjhq2j8kh8d0gbwx2333zgf1ribc9fn14ryas1j2"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ''; + + postInstall = '' + install -m 444 -D ${src}/zsh/_ghq $bin/share/zsh/site-functions/_ghq + ''; + + meta = { + description = "Remote repository management made easy"; + homepage = https://github.com/motemen/ghq; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix new file mode 100644 index 000000000000..ec54803a6e76 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/motemen/go-colorine"; + fetch = { + type = "git"; + url = "https://github.com/motemen/go-colorine"; + rev = "49ff36b8fa42db28092361cd20dcefd0b03b1472"; + sha256 = "1rfi5gggf2sxb52whgxfl37p22r2xp27rndixbiicw6swllmml9l"; + }; + } + { + goPackagePath = "github.com/daviddengcn/go-colortext"; + fetch = { + type = "git"; + url = "https://github.com/daviddengcn/go-colortext"; + rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a"; + sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index d1996b72154d..d38529e92e60 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-annex-remote-rclone-${version}"; - version = "0.4"; + version = "0.5"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk"; + sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i"; }; nativeBuildInputs = [ makeWrapper ]; 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 000000000000..6918f048eae3 --- /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-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index cf7f6b82ce2a..2a9ea0715e03 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }: let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.8"; + version = "2.10"; - src = fetchurl { - url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; - sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr"; + src = fetchFromGitHub { + owner = "git-cola"; + repo = "git-cola"; + rev = "v${version}"; + sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8"; }; - buildInputs = [ git makeWrapper gettext ]; + buildInputs = [ git gettext ]; propagatedBuildInputs = [ pyqt4 sip pyinotify ]; - # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but - # "import __future__" must be placed above that. This removes the argv[0] line. - postFixup = '' - wrapPythonPrograms - - sed -i "$out/bin/.git-dag-wrapped" -e '{ - /import sys; sys.argv/d - }' - - sed -i "$out/bin/.git-cola-wrapped" -e '{ - /import sys; sys.argv/d - }' - ''; - doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 91180b33cde9..49856552aa3b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { name = "git-imerge-${version}"; - version = "0.7.0"; + version = "1.0.0"; - src = fetchurl { - url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz"; - sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206"; + src = fetchFromGitHub { + owner = "mhagger"; + repo = "git-imerge"; + rev = "v${version}"; + sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - installPhase = '' - mkdir -p $out/bin - make install PREFIX=$out - wrapPythonPrograms - ''; - + makeFlags = "PREFIX= DESTDIR=$(out)" ; + meta = with stdenv.lib; { homepage = https://github.com/mhagger/git-imerge; description = "Perform a merge between two branches incrementally"; diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix new file mode 100644 index 000000000000..f8d871bdcf30 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, git, perl, makeWrapper }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "git-octopus-${version}"; + version = "1.4"; + + installFlags = [ "prefix=$(out)" ]; + + buildInputs = [ makeWrapper ]; + + # perl provides shasum + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${makeBinPath [ git perl ]} + done + ''; + + src = fetchFromGitHub { + owner = "lesfurets"; + repo = "git-octopus"; + rev = "v${version}"; + sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1"; + }; + + meta = { + homepage = https://github.com/lesfurets/git-octopus; + description = "The continuous merge workflow"; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = [maintainers.mic92]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix new file mode 100644 index 000000000000..6b696821f1c9 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -0,0 +1,32 @@ +{stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: + +stdenv.mkDerivation rec { + name = "git-open-${version}"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "paulirish"; + repo = "git-open"; + rev = "v${version}"; + sha256 = "005am4phf7j4ybc9k1hqsxjb7gv2i56a3axrza866pwwx1ayrhpq"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = null; + + installPhase = '' + mkdir -p $out/bin + cp git-open $out/bin + wrapProgram $out/bin/git-open \ + --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/paulirish/git-open; + description = "Open the GitHub page or website for a repository in your browser"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.jlesquembre ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index f61f9fe6d2af..3b10c3305efc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "git-radar-${version}"; - version = "0.3.2"; + version = "0.5"; phases = [ "unpackPhase" "installPhase" ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "michaeldfallen"; repo = "git-radar"; rev = "v${version}"; - sha256 = "1028462b4kqxx66vjv7r8nnr6bi3kw11fixpqyg2srqriha6447p"; + sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9"; }; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/michaeldfallen/git-radar; license = licenses.mit; - description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo"; + description = "A tool you can add to your prompt to provide at-a-glance information on your git repo"; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix new file mode 100644 index 000000000000..ae1139e99937 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -0,0 +1,41 @@ +{stdenv, git, less, fetchFromGitHub, makeWrapper +# utillinuxMinimal is included because we need the column command +, utillinux ? null +}: + +assert stdenv.isLinux -> utillinux != null; + +let + binpath = stdenv.lib.makeBinPath + ([ git less ] + ++ stdenv.lib.optional (utillinux != null) utillinux); +in stdenv.mkDerivation rec { + name = "git-recent-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "paulirish"; + repo = "git-recent"; + rev = "v${version}"; + sha256 = "0rckjjrw2xmvmbqaf66i36x59vs1v4pfnmvbinx5iggp7vjly1a4"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = null; + + installPhase = '' + mkdir -p $out/bin + cp git-recent $out/bin + wrapProgram $out/bin/git-recent \ + --prefix PATH : "${binpath}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/paulirish/git-recent; + description = "See your latest local git branches, formatted real fancy"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.jlesquembre ]; + }; +} 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 af5fc8a8be46..c6082f71af8e 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.12.0"; + 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 = "09r0lcjj5v2apj39f0ziqzjq2bi1jpnhszc9q4n0ab86g5j7c88q"; + sha256 = "0qiy696pwqhbxcrvm3zhyjnfjrym541glhvgc4cynrwg8az27ali"; }; hardeningDisable = [ "format" ]; @@ -30,7 +31,6 @@ stdenv.mkDerivation { ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch - ./ssl-cert-file.patch ]; postPatch = '' @@ -105,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/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch index 26db3d810823..5e24c19f0fee 100644 --- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch +++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch @@ -2,20 +2,20 @@ diff --git a/connect.c b/connect.c index fd7ffe1..20cd992 100644 --- a/connect.c +++ b/connect.c -@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url, - +@@ -768,7 +768,7 @@ + ssh = getenv("GIT_SSH"); if (!ssh) - ssh = "ssh"; + ssh = "@ssh@"; - - ssh_dup = xstrdup(ssh); - base = basename(ssh_dup); + else + handle_ssh_variant(ssh, 0, + &port_option, diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl index 50029d0..17b9594 100644 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl -@@ -139,7 +139,7 @@ method _add {} { +@@ -139,7 +139,7 @@ # Parse the location if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] || [regexp {([^:][^:]+):(.+)} $location xx host path]} { diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch deleted file mode 100644 index bafd65e8c93e..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c ---- git-2.7.4-orig/http.c 2016-03-17 21:47:59.000000000 +0100 -+++ git-2.7.4/http.c 2016-04-12 11:38:33.187070848 +0200 -@@ -544,6 +544,7 @@ - #if LIBCURL_VERSION_NUM >= 0x070908 - set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); - #endif -+ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); - set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); - - set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index a6ac19583858..05659a68a522 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -14,15 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg"; }; - buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ]; + buildInputs = [ pkgs.makeWrapper ]; preBuild = '' makeFlagsArray+=(prefix="$out") ''; - postInstall = optional (stdenv.isDarwin) '' + postInstall = '' wrapProgram $out/bin/git-flow \ - --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt + --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt \ + --suffix PATH : ${pkgs.git}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 5e3532b5643d..7da45e2d3f96 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit; description = "Graphical front-end to Git"; - maintainer = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 0774bbc9a624..7b36a142d15d 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: -stdenv.mkDerivation { - name = "subgit-3.1.0"; +stdenv.mkDerivation rec { + name = "subgit-3.2.4"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ unzip makeWrapper ]; installPhase = '' mkdir $out; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://old.subgit.com/download/subgit-3.1.0.zip; - sha256 = "08qhpg6y2ziwplm0z1ghh1wfp607sw4hyb53a7qzfn759j5kcdrg"; + url = "http://subgit.com/download/${name}.zip"; + sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f953bbad48ba..8a0cd8982625 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv +{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig }: stdenv.mkDerivation rec { - name = "tig-2.2"; + pname = "tig"; + version = "2.2.2"; + name = "${pname}-${version}"; - src = fetchurl { - url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg"; + src = fetchFromGitHub { + owner = "jonas"; + repo = pname; + rev = name; + sha256 = "1zbj4pfcnj1d0zfhx5jw9x7f2hz99mry20bgyyvrij2vj8gf5vk4"; }; - buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ] + nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; + + autoreconfFlags = "-I tools -v"; + + buildInputs = [ ncurses readline git ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; - preConfigure = '' - export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' + # those files are inherently impure, we'll handle the corresponding dependencies. + postPatch = '' + rm -f contrib/config.make-* ''; enableParallelBuilding = true; @@ -30,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://jonas.nitro.dk/tig/"; + homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ]; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 36d81ae9c441..6238cf9c9754 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "transcrypt-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq"; + sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc"; }; buildInputs = [ git makeWrapper openssl ]; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index c33ffb5cefb2..6543f40c4dad 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,30 +1,33 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "git-lfs-${version}"; - # NOTE: use versions after 1.2.1 - version = "1.3.1"; - rev = "9c9dffb1b5baddfa06f280ef1b5fbf68ecbc90b1"; - - goPackagePath = "github.com/github/git-lfs"; + version = "2.0.2"; + rev = "85e2aec4d949517b4a7a53e4f745689331952b6c"; + + goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { inherit rev; - owner = "github"; + owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0fg48jxh0gmd0w5yy3avascaasxk85019qayaikzfkym8bdqplb2"; + sha256 = "0cvs17rd4qgaqj9vz6pwx9y3ni8c99gzykc3as92x37962nmq5cy"; }; - # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' - excludedPackages = [ "test" ]; - preBuild = '' - pushd go/src/github.com/github/git-lfs - go generate ./commands + pushd go/src/github.com/git-lfs/git-lfs + go generate ./commands popd ''; postInstall = '' - rm -v $bin/bin/{man,script} + rm -v $bin/bin/{man,script,genmakefile} ''; + + meta = with stdenv.lib; { + description = "Git extension for versioning large files"; + homepage = https://git-lfs.github.com/; + license = [ licenses.mit ]; + maintainers = [ maintainers.twey ]; + }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 001aa0c5b097..886efefa8bbb 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,24 +1,41 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchFromGitHub, makeWrapper +, python, git, gnupg1compat, less }: -stdenv.mkDerivation { - name = "git-repo-1.23"; - src = fetchurl { - # I could not find a versioned url for the 1.21 version. In case - # the sha mismatches, check the homepage for new version and sha. - url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; - sha256 = "1i8xymxh630a7d5nkqi49nmlwk77dqn36vsygpyhri464qwz0iz1"; +stdenv.mkDerivation rec { + name = "git-repo-${version}"; + version = "1.12.37"; + + src = fetchFromGitHub { + owner = "android"; + repo = "tools_repo"; + rev = "v${version}"; + sha256 = "0qp7jqhblv7xblfgpcq4n18dyjdv8shz7r60c3vnjxx2fngkj2jd"; }; - unpackPhase = "true"; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python git gnupg1compat less ]; + installPhase = '' mkdir -p $out/bin - sed -e 's,!/usr/bin/env python,!${python}/bin/python,' < $src > $out/bin/repo - chmod +x $out/bin/repo + cp $src/repo $out/bin/repo ''; - meta = { - homepage = "http://source.android.com/source/downloading.html"; + postFixup = '' + wrapProgram $out/bin/repo --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ git gnupg1compat less ]}" + ''; + + meta = with stdenv.lib; { description = "Android's repo management tool"; - platforms = stdenv.lib.platforms.unix; + longDescription = '' + Repo is a Python script based on Git that helps manage many Git + repositories, does the uploads to revision control systems, and automates + parts of the development workflow. Repo is not meant to replace Git, only + to make it easier to work with Git. + ''; + homepage = "https://android.googlesource.com/tools/repo"; + license = licenses.asl20; + maintainers = [ maintainers.primeos ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index de934db5f3ba..080894bc80e1 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce"; }; - propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests2 pythonPackages.argparse pythonPackages.setuptools ]; + propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests pythonPackages.argparse pythonPackages.setuptools ]; # Don't do tests because they require gerrit which is not packaged doCheck = false; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 70ca7a74b236..c7f7a4b02e4d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,19 +1,22 @@ -{stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib - ,libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig - ,libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst - ,nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus +{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib +, libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig +, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst +, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus +, dpkg, makeDesktopItem }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.1.0"; + version = "2.7.0"; src = fetchurl { - url = "https://release.gitkraken.com/linux/v${version}.tar.gz"; - sha256 = "56b5657f5c13fa1d8f6b7b9331194cbc8c48c0b913e5f0fb561d0e9af82f7999"; + url = "https://release.gitkraken.com/linux/v${version}.deb"; + sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = makeLibraryPath [ stdenv.cc.cc.lib curl udev @@ -47,28 +50,50 @@ stdenv.mkDerivation rec { libgnome_keyring ]; - phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ makeWrapper ]; + dontBuild = true; + + desktopItem = makeDesktopItem { + name = "gitkraken"; + exec = "gitkraken"; + icon = "app"; + desktopName = "GitKraken"; + genericName = "Git Client"; + categories = "Application;Development;"; + comment = "Graphical Git client from Axosoft"; + }; + + buildInputs = [ dpkg ]; + + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' mkdir -p "$out/opt/gitkraken" - cp -r ./* "$out/opt/gitkraken" - fixupPhase + cp -r usr/share/gitkraken/* "$out/opt/gitkraken" + + mkdir -p "$out/share/applications" + cp $desktopItem/share/applications/* "$out/share/applications" + + mkdir -p "$out/share/pixmaps" + cp usr/share/pixmaps/app.png "$out/share/pixmaps" + ''; + + postFixup = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" wrapProgram $out/opt/gitkraken/gitkraken \ - --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ curl ]}/libcurl.so.4" \ - --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" + --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \ + --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" mkdir "$out/bin" ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken" ''; - meta = with stdenv.lib; { + meta = { homepage = https://www.gitkraken.com/; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ xnwdd ]; }; } diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 6d6564ea5f9b..db1ac67a6667 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' -gem 'sprockets-es6', '~> 0.9.2' # Default values for AR models gem 'default_value_for', '~> 3.0.0' @@ -36,7 +35,7 @@ gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.2.0' gem 'rack-oauth2', '~> 1.2.1' -gem 'jwt' +gem 'jwt', '~> 1.5.6' # Spam and anti-bot protection gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' @@ -48,6 +47,9 @@ gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 3.0.0' gem 'u2f', '~> 0.2.1' +# GitLab Pages +gem 'validates_hostname', '~> 1.0.6' + # Browser detection gem 'browser', '~> 2.2' @@ -109,7 +111,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.2' -gem 'asciidoctor-plantuml', '0.0.6' +gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.8' @@ -219,10 +221,12 @@ gem 'oj', '~> 2.17.4' gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' +gem 'webpack-rails', '~> 0.9.9' +gem 'rack-proxy', '~> 0.6.0' + gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' -gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' @@ -280,6 +284,7 @@ group :development, :test do gem 'rspec-retry', '~> 0.4.5' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' + gem 'rspec_profiling' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.7.0' @@ -291,13 +296,9 @@ group :development, :test do gem 'capybara-screenshot', '~> 1.0.0' gem 'poltergeist', '~> 1.9.0' - gem 'teaspoon', '~> 1.1.0' - gem 'teaspoon-jasmine', '~> 2.2.0' - gem 'spring', '~> 1.7.0' gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-teaspoon', '~> 0.0.2' gem 'rubocop', '~> 0.46.0', require: false gem 'rubocop-rspec', '~> 1.9.1', require: false diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 80cdf9d3258d..398a88a13876 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -56,7 +56,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) asciidoctor (1.5.3) - asciidoctor-plantuml (0.0.6) + asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) ast (2.3.0) attr_encrypted (3.0.3) @@ -74,10 +74,6 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - babel-source (5.8.35) - babel-transpiler (0.7.0) - babel-source (>= 4.0, < 6) - execjs (~> 2.0) babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) @@ -268,8 +264,6 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.1) - gitlab-turbolinks-classic (2.5.6) - coffee-rails gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -381,7 +375,7 @@ GEM json (1.8.3) json-schema (2.6.2) addressable (~> 2.3.8) - jwt (1.5.4) + jwt (1.5.6) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -550,6 +544,8 @@ GEM rack (>= 1.1) rack-protection (1.5.3) rack + rack-proxy (0.6.0) + rack rack-test (0.6.3) rack (>= 1.0) rails (4.2.7.1) @@ -644,6 +640,11 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) + rspec_profiling (0.0.4) + activerecord + pg + rails + sqlite3 rubocop (0.46.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) @@ -662,7 +663,7 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) - rubyzip (1.2.0) + rubyzip (1.2.1) rufus-scheduler (3.1.10) rugged (0.24.0) safe_yaml (1.0.4) @@ -732,19 +733,14 @@ GEM spring (>= 0.9.1) spring-commands-spinach (1.1.0) spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler - sprockets (>= 3.0.0) sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + sqlite3 (1.3.11) stackprof (0.2.10) state_machines (0.4.0) state_machines-activemodel (0.4.0) @@ -757,10 +753,6 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) temple (0.7.7) test_after_commit (1.1.0) activerecord (>= 3.2) @@ -795,6 +787,9 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) + validates_hostname (1.0.6) + activerecord (>= 3.0) + activesupport (>= 3.0) version_sorter (2.1.0) virtus (1.0.5) axiom-types (~> 0.1) @@ -812,6 +807,8 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) + webpack-rails (0.9.9) + rails (>= 3.2.0) websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -838,7 +835,7 @@ DEPENDENCIES allocations (~> 1.0) asana (~> 0.4.0) asciidoctor (~> 1.5.2) - asciidoctor-plantuml (= 0.0.6) + asciidoctor-plantuml (= 0.0.7) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) @@ -888,7 +885,6 @@ DEPENDENCIES github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) - gitlab-turbolinks-classic (~> 2.5, >= 2.5.6) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) @@ -909,7 +905,7 @@ DEPENDENCIES jquery-rails (~> 4.1.0) jquery-ui-rails (~> 5.0.0) json-schema (~> 2.6.2) - jwt + jwt (~> 1.5.6) kaminari (~> 0.17.0) knapsack (~> 1.11.0) kubeclient (~> 2.2.0) @@ -924,7 +920,7 @@ DEPENDENCIES mysql2 (~> 0.3.16) net-ssh (~> 3.0.1) newrelic_rpm (~> 3.16) - nokogiri (~> 1.6.7, >= 1.6.7.2) + nokogiri (< 1.6.8, ~> 1.6.7, >= 1.6.7.2) oauth2 (~> 1.2.0) octokit (~> 4.6.2) oj (~> 2.17.4) @@ -952,6 +948,7 @@ DEPENDENCIES rack-attack (~> 4.4.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) + rack-proxy (~> 0.6.0) rails (= 4.2.7.1) rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) @@ -968,6 +965,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) + rspec_profiling rubocop (~> 0.46.0) rubocop-rspec (~> 1.9.1) ruby-fogbugz (~> 0.2.1) @@ -992,15 +990,11 @@ DEPENDENCIES spring (~> 1.7.0) spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.7.0) - sprockets-es6 (~> 0.9.2) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) + test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) truncato (~> 0.7.8) @@ -1010,12 +1004,14 @@ DEPENDENCIES unf (~> 0.1.4) unicorn (~> 5.1.0) unicorn-worker-killer (~> 0.4.4) + validates_hostname (~> 1.0.6) version_sorter (~> 2.1.0) virtus (~> 1.0.1) vmstat (~> 2.3.0) web-console (~> 2.0) webmock (~> 1.21.0) + webpack-rails (~> 0.9.9) wikicloth (= 0.8.1) BUNDLED WITH - 1.13.7 + 1.14.5 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 60921fc54886..9929c94198d9 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, libiconv, ruby -, tzdata, git, nodejs, procps +{ stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv, ruby +, tzdata, git, nodejs, procps, dpkg }: /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` @@ -18,19 +18,27 @@ let }; }; + version = "8.17.6"; + + gitlabDeb = fetchurl { + url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; + sha256 = "1pr8nfnkzmicn5nxjkq48l4nfjsp6v5j3v8p7cp8r86lgfdc6as3"; + }; + in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.16.6"; - buildInputs = [ env ruby bundler tzdata git nodejs procps ]; + buildInputs = [ + env ruby bundler tzdata git nodejs procps dpkg + ]; src = fetchFromGitHub { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "03rzms2frwx4c09l2rig1amlxj965s2iq421i52j8wj2khb7pd7g"; + sha256 = "1yyyn2j0a457q2xbcxz6b33r23myr8kxbm9whj2dwrrbp4p273hr"; }; patches = [ @@ -64,9 +72,15 @@ stdenv.mkDerivation rec { buildPhase = '' mv config/gitlab.yml.example config/gitlab.yml - GITLAB_DATABASE_ADAPTER=nulldb \ - SKIP_STORAGE_VALIDATION=true \ - rake assets:precompile RAILS_ENV=production + + dpkg -x ${gitlabDeb} . + mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public + rm -rf opt + + export GITLAB_DATABASE_ADAPTER=nulldb + export SKIP_STORAGE_VALIDATION=true + rake assets:precompile RAILS_ENV=production + mv config/gitlab.yml config/gitlab.yml.example rm config/secrets.yml mv config config.dist @@ -77,6 +91,10 @@ stdenv.mkDerivation rec { cp -r . $out/share/gitlab ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads ln -sf /run/gitlab/config $out/share/gitlab/config + + # rake tasks to mitigate CVE-2017-0882 + # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ + cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake ''; passthru = { diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 1ebb7c5b1fa1..4bc57f6bd08e 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -146,10 +146,10 @@ asciidoctor-plantuml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0rd8yh0by5sxhg1c3cb1mzkp4jp3j8v6vzbyv1mx492s9ml451fx"; + sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.7"; }; ast = { source = { @@ -207,22 +207,6 @@ }; version = "0.1.1"; }; - babel-source = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ncq8h82k6hypzfb5dk7z95mmcdwnhsxmc53xz17m1nbklm25vvr"; - type = "gem"; - }; - version = "5.8.35"; - }; - babel-transpiler = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w0minwxj56w96xps1msm6n75fs0y7r1vqcr9zlsn74fksnz81jc"; - type = "gem"; - }; - version = "0.7.0"; - }; babosa = { source = { remotes = ["https://rubygems.org"]; @@ -944,14 +928,6 @@ }; version = "1.5.1"; }; - gitlab-turbolinks-classic = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra"; - type = "gem"; - }; - version = "2.5.6"; - }; gitlab_omniauth-ldap = { source = { remotes = ["https://rubygems.org"]; @@ -1235,10 +1211,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5llb4mhpy0phzbrc4jd2jd2b91h1axy4bhci7g1bdz1w2m3a2i"; + sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; kaminari = { source = { @@ -1848,6 +1824,14 @@ }; version = "1.5.3"; }; + rack-proxy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4"; + type = "gem"; + }; + version = "0.6.0"; + }; rack-test = { source = { remotes = ["https://rubygems.org"]; @@ -2152,6 +2136,14 @@ }; version = "3.5.0"; }; + rspec_profiling = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qrs189r0q08ys8vax269ff858q9ypsc94n1d700m9da44zi3wg"; + type = "gem"; + }; + version = "0.0.4"; + }; rubocop = { source = { remotes = ["https://rubygems.org"]; @@ -2227,10 +2219,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s"; + sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; rufus-scheduler = { source = { @@ -2464,14 +2456,6 @@ }; version = "1.1.0"; }; - spring-commands-teaspoon = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz"; - type = "gem"; - }; - version = "0.0.2"; - }; sprockets = { source = { remotes = ["https://rubygems.org"]; @@ -2480,14 +2464,6 @@ }; version = "3.7.0"; }; - sprockets-es6 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3"; - type = "gem"; - }; - version = "0.9.2"; - }; sprockets-rails = { source = { remotes = ["https://rubygems.org"]; @@ -2496,6 +2472,14 @@ }; version = "3.1.1"; }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny"; + type = "gem"; + }; + version = "1.3.11"; + }; stackprof = { source = { remotes = ["https://rubygems.org"]; @@ -2552,22 +2536,6 @@ }; version = "1.2.0"; }; - teaspoon = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xz5f1w8jm2fg1g194kf17gh36imd7sgs9cx0adqx1l22p7jrkvv"; - type = "gem"; - }; - version = "1.1.5"; - }; - teaspoon-jasmine = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q"; - type = "gem"; - }; - version = "2.2.0"; - }; temple = { source = { remotes = ["https://rubygems.org"]; @@ -2728,6 +2696,14 @@ }; version = "1.10.0"; }; + validates_hostname = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja"; + type = "gem"; + }; + version = "1.0.6"; + }; version_sorter = { source = { remotes = ["https://rubygems.org"]; @@ -2776,6 +2752,14 @@ }; version = "1.21.0"; }; + webpack-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02jxkpdbi48yhcgldgl5jxnhnad83rdgpkkcwh8w1h6iyg04d42j"; + type = "gem"; + }; + version = "0.9.9"; + }; websocket-driver = { source = { remotes = ["https://rubygems.org"]; diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/pkgs/applications/version-management/gitlab/reset_token.rake new file mode 100644 index 000000000000..705b5830edfc --- /dev/null +++ b/pkgs/applications/version-management/gitlab/reset_token.rake @@ -0,0 +1,43 @@ +# Taken from: +# https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ + +# lib/tasks/reset_token.rake +require_relative '../../app/models/concerns/token_authenticatable.rb' + +STDOUT.sync = true + +namespace :tokens do + desc "Reset all GitLab user auth tokens" + task reset_all: :environment do + reset_all_users_token(:reset_authentication_token!) + end + + desc "Reset all GitLab email tokens" + task reset_all_email: :environment do + reset_all_users_token(:reset_incoming_email_token!) + end + + def reset_all_users_token(token) + TmpUser.find_in_batches do |batch| + puts "Processing batch starting with user ID: #{batch.first.id}" + + batch.each(&token) + end + end +end + +class TmpUser < ActiveRecord::Base + include TokenAuthenticatable + + self.table_name = 'users' + + def reset_authentication_token! + write_new_token(:authentication_token) + save!(validate: false) + end + + def reset_incoming_email_token! + write_new_token(:incoming_email_token) + save!(validate: false) + end +end diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index b9a1f2e7a843..c8af3fe63f92 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -3,46 +3,48 @@ , sqliteSupport ? true }: +with stdenv.lib; + buildGoPackage rec { name = "gogs-${version}"; - version = "0.9.113"; + version = "0.11.19"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7"; + sha256 = "0smzklhpfv3smqgzd0cnjdif3zi5q7b02grrnb5zssmdi1b2dlsd"; }; patchPhase = '' - substituteInPlace models/repo.go \ - --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - ''; + patchShebangs . + ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite"; + buildFlags = optionalString sqliteSupport "-tags sqlite"; 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 wrapProgram $bin/bin/gogs \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \ + --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \ --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \ --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \ --run "ln -fs $data/{public,templates} ." ''; goPackagePath = "github.com/gogits/gogs"; - goDeps = ./deps.nix; meta = { description = "A painless self-hosted Git service"; homepage = "https://gogs.io"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + license = licenses.mit; + maintainers = [ maintainers.schneefux ]; }; } diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix deleted file mode 100644 index 4596eb1d2437..000000000000 --- 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/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 034eb5344234..244a95447a96 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,15 +4,16 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "3.9.2"; + version = "4.1.1"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; -in python2Packages.mkPythonDerivation { +in python2Packages.buildPythonApplication { inherit name; + format = "other"; src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "1kw3cpcjygfapvi5c123limhpbkmg7is2i81pybk1s05gi16l139"; + sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 551a5795d11b..4d7ccaf30274 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - version = "1.20160123"; + version = "1.20170129"; name = "mr-${version}"; - src = fetchurl { - url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz"; - sha256 = "1723cg5haplz2w9dwdzp6ds1ip33cx3awmj4wnb0h4yq171v5lqk"; + src = fetchgit { + url = "git://myrepos.branchable.com/"; + rev = "refs/tags/" + version; + sha256 = "15i9bs2i25l7ibv530ghy8280kklcgm5kr6j86s7iwcqqckd0czp"; }; buildInputs = [ perl ]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix new file mode 100644 index 000000000000..c3ed61f31a23 --- /dev/null +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -0,0 +1,38 @@ +{lib, python2Packages, git, mercurial, coreutils}: + +with python2Packages; +buildPythonApplication rec { + name = "${pname}-${version}"; + version = "0.3.0"; + pname = "nbstripout"; + + # Mercurial should be added as a build input but because it's a Python + # application, it would mess up the Python environment. Thus, don't add it + # here, instead add it to PATH when running unit tests + buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; + propagatedBuildInputs = [ ipython nbformat ]; + + src = fetchPypi { + inherit pname version; + sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v"; + }; + + # for some reason, darwin uses /bin/sh echo native instead of echo binary, so + # force using the echo binary + postPatch = '' + substituteInPlace tests/test-git.t --replace "echo" "${coreutils}/bin/echo" + ''; + + # ignore flake8 tests for the nix wrapped setup.py + checkPhase = '' + PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py . + ''; + + meta = { + inherit version; + description = "Strip output from Jupyter and IPython notebooks"; + homepage = https://github.com/kynan/nbstripout; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 28df4f7fc312..01369b9685dc 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, python3Packages }: - -let - pythonPackages = python3Packages; -in pythonPackages.buildPythonApplication rec { +{ stdenv, fetchFromGitHub, python3Packages }: +python3Packages.buildPythonApplication rec { name = "peru-${version}"; - version = "1.0.1"; + version = "1.1.0"; - src = fetchurl { - url = "mirror://pypi/p/peru/${name}.tar.gz"; - sha256 = "d51771d4aa7e16119e46c39efd71b0a1a898607bf3fb7735fc688a64fc59cbf1"; + src = fetchFromGitHub { + owner = "buildinspace"; + repo = "peru"; + rev = "${version}"; + sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8"; }; - propagatedBuildInputs = with pythonPackages; [ pyyaml docopt ]; + propagatedBuildInputs = with python3Packages; [ pyyaml docopt ]; # No tests in archive doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/buildinspace/peru; description = "A tool for including other people's code in your projects"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.unix; }; -} \ No newline at end of file + +} diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix new file mode 100644 index 000000000000..d72c2945239a --- /dev/null +++ b/pkgs/applications/version-management/pijul/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, rustPlatform, perl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "pijul-${version}"; + version = "0.6.0"; + + src = fetchurl { + url = "https://pijul.org/releases/${name}.tar.gz"; + sha256 = "a6b066b49b25d1083320c5ab23941deee795e1fcbe1faa951e95189fd594cdb3"; + }; + + sourceRoot = "pijul"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ Security ]); + + doCheck = false; + + depsSha256 = "0raim0ahqg6fkidb6picfzircdzwdbsdmmv8in70r5hw770bv67r"; + + meta = with stdenv.lib; { + description = "A distributed version control system"; + homepage = https://pijul.org; + license = with licenses; [ gpl2Plus ]; + maintainers = [ maintainers.gal_bolle ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 9397aa8a1e19..7b3c7aafa44e 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}: +{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }: -stdenv.mkDerivation { - name = "rapidsvn-0.12.0-1"; +stdenv.mkDerivation rec { + name = "rapidsvn-${version}"; + version = "0.12.1"; src = fetchurl { - url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz; - sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg"; + url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz"; + sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; buildInputs = [ wxGTK subversion apr aprutil python ]; @@ -13,6 +14,10 @@ stdenv.mkDerivation { configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; + patches = [ + ./fix-build.patch + ]; + meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = http://rapidsvn.tigris.org/; diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/applications/version-management/rapidsvn/fix-build.patch new file mode 100644 index 000000000000..ca4bc394c2c6 --- /dev/null +++ b/pkgs/applications/version-management/rapidsvn/fix-build.patch @@ -0,0 +1,122 @@ +--- a/src/svncpp/client_ls.cpp ++++ b/src/svncpp/client_ls.cpp +@@ -25,6 +25,7 @@ + #include "svn_client.h" + #include "svn_path.h" + #include "svn_sorts.h" ++#include "svn_version.h" + //#include "svn_utf.h" + + // svncpp +@@ -35,6 +36,7 @@ + #include "m_is_empty.hpp" + + ++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8 + static int + compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b) + { +@@ -84,6 +86,72 @@ namespace svn + } + } + ++#else ++ ++#include ++ ++static svn_error_t* store_entry( ++ void *baton, ++ const char *path, ++ const svn_dirent_t *dirent, ++ const svn_lock_t *, ++ const char *abs_path, ++ const char *, ++ const char *, ++ apr_pool_t *scratch_pool) ++{ ++ svn::DirEntries *entries = reinterpret_cast(baton); ++ if (path[0] == '\0') { ++ if (dirent->kind == svn_node_file) { ++ // for compatibility with svn_client_ls behaviour, listing a file ++ // stores that file name ++ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent)); ++ } ++ } else { ++ entries->push_back(svn::DirEntry(path, dirent)); ++ } ++ return SVN_NO_ERROR; ++} ++ ++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b) ++{ ++ return svn_path_compare_paths(a.name(), b.name()) < 0; ++} ++ ++namespace svn ++{ ++ DirEntries ++ Client::list(const char * pathOrUrl, ++ svn_opt_revision_t * revision, ++ bool recurse) throw(ClientException) ++ { ++ Pool pool; ++ DirEntries entries; ++ ++ svn_error_t * error = ++ svn_client_list3(pathOrUrl, ++ revision, ++ revision, ++ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse), ++ SVN_DIRENT_ALL, ++ FALSE, // fetch locks ++ FALSE, // include externals ++ &store_entry, ++ &entries, ++ *m_context, ++ pool); ++ ++ if (error != SVN_NO_ERROR) ++ throw ClientException(error); ++ ++ std::sort(entries.begin(), entries.end(), &sort_by_path); ++ ++ return entries; ++ } ++} ++ ++#endif ++ + /* ----------------------------------------------------------------- + * local variables: + * eval: (load-file "../../rapidsvn-dev.el") +--- a/src/svncpp/dirent.cpp 2017-03-19 15:48:58.956827337 +0100 ++++ b/src/svncpp/dirent.cpp 2017-03-19 15:50:19.111527279 +0100 +@@ -47,7 +47,7 @@ + { + } + +- Data(const char * _name, svn_dirent_t * dirEntry) ++ Data(const char * _name, const svn_dirent_t * dirEntry) + : name(_name), kind(dirEntry->kind), size(dirEntry->size), + hasProps(dirEntry->has_props != 0), + createdRev(dirEntry->created_rev), time(dirEntry->time) +@@ -78,7 +78,7 @@ + { + } + +- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry) ++ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry) + : m(new Data(name, DirEntry)) + { + } +--- a/include/svncpp/dirent.hpp 2017-03-19 15:50:54.860506116 +0100 ++++ b/include/svncpp/dirent.hpp 2017-03-19 15:50:58.314407598 +0100 +@@ -41,7 +41,7 @@ + /** + * constructor for existing @a svn_dirent_t entries + */ +- DirEntry(const char * name, svn_dirent_t * dirEntry); ++ DirEntry(const char * name, const svn_dirent_t * dirEntry); + + /** + * copy constructor diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index b4b0e74a79c8..fc45620646e8 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "8_0_3"; + version = "17_0_3"; src = fetchurl { url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "1ghxjg5dm22kwfrq26nqp4qhh6h7f4l4fnf1cx9cksd30ypwy223"; + sha256 = "1swgh1bgjrbpxhj27b4gmn806nkqcl1w8lz7j7xkx3dlgljipw33"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 2bff15adc69d..e75223c6c363 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, python, rcs, git }: +{ stdenv, fetchurl, python, rcs, git, makeWrapper }: stdenv.mkDerivation rec { - name = "src-1.11"; + name = "src-${version}"; + version = "1.13"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "07kj0ri0s0vn8s54yvkyzaag332spxs0379r718b80y31c4mgbyl"; + sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8"; }; - buildInputs = [ python rcs git ]; + buildInputs = [ python rcs git makeWrapper ]; preConfigure = '' patchShebangs . @@ -16,10 +17,16 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = { + postInstall = '' + wrapProgram $out/bin/src \ + --suffix PATH ":" "${rcs}/bin" + ''; + + meta = with stdenv.lib; { description = "Simple single-file revision control"; homepage = http://www.catb.org/~esr/src/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ calvertvl ]; }; } diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix new file mode 100644 index 000000000000..059c4fc344c2 --- /dev/null +++ b/pkgs/applications/version-management/srcml/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "0.9.5_beta"; + name = "srcml-${version}"; + + src = fetchurl { + url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz"; + sha256 = "13pswdi75qjsw7z75lz7l3yjsvb58drihla2mwj0f9wfahaj3pam"; + }; + + prePatch = '' + patchShebangs . + substituteInPlace CMake/install.cmake --replace /usr/local $out + ''; + + nativeBuildInputs = [ cmake antlr ]; + buildInputs = [ libxml2 libxslt boost libarchive python ]; + + meta = { + description = "Infrastructure for exploration, analysis, and manipulation of source code"; + homepage = "http://www.srcml.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index eddbc0e56dd6..17ff3e4b19f3 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -26,8 +26,8 @@ let inherit sha256; }; - # Can't do separate $lib and $bin, as libs reference bins - outputs = [ "out" "dev" "man" ]; + # Can't do separate $lib and $bin, as libs reference bins + outputs = [ "out" "dev" "man" ]; buildInputs = [ zlib apr aprutil sqlite openssl ] ++ stdenv.lib.optional httpSupport serf @@ -75,7 +75,7 @@ let mkdir -p $out/share/bash-completion/completions cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion - for f in $out/lib/*.la; do + for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do substituteInPlace $f \ --replace "${expat.dev}/lib" "${expat.out}/lib" \ --replace "${zlib.dev}/lib" "${zlib.out}/lib" \ diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index c4eed94017ca..1a0c506a19d4 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "3.9.2"; + version = "4.1.1"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2"; + sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 4f87f4b569c7..77663e858ef2 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,20 +1,31 @@ -{stdenv, fetchurl}: +{ stdenv, fetchpatch, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: stdenv.mkDerivation rec { - version = "1.20151229-1"; + version = "1.20170226"; # date of commit we're pulling name = "vcsh-${version}"; - src = fetchurl { - url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz"; - sha256 = "0wgg5zz11ql2v37vby5gbqvnbs80g1q83b9qbvm8d2pqx8bsb0kn"; + src = fetchFromGitHub { + owner = "RichiH"; + repo = "vcsh"; + rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab"; + sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + 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/228.patch"; + sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam"; + }) + ]; - installPhase = '' - mkdir -p $out/bin - cp vcsh $out/bin - ''; + buildInputs = [ which git ronn perl ShellCommand TestMost ]; + + installPhase = "make install PREFIX=$out"; meta = with stdenv.lib; { description = "Version Control System for $HOME"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f87d81bd8fb8..6587b25ef94a 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub }: -let version = "1.05"; in +let version = "1.07"; in stdenv.mkDerivation { name = "yadm-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = "${version}"; - sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd"; + sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw"; }; buildCommand = '' diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index c98e27479894..bffb038f6536 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, mesa -, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook +, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet , ffmpeg @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapQtProgram $out/bin/bomi \ + wrapProgram $out/bin/bomi \ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; @@ -104,9 +104,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmakeHook ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ]; meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 7559c4c70e7d..c15a892e6981 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec{ description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 1096a64887b0..e2980c7108f4 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -4,12 +4,14 @@ stdenv.mkDerivation rec { name = "gnome-mplayer-1.0.4"; src = fetchurl { - url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz"; sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf]; - + + hardeningDisable = [ "format" ]; + meta = { homepage = http://kdekorte.googlepages.com/gnomemplayer; description = "Gnome MPlayer, a simple GUI for MPlayer"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index b8a161649889..7d0cfb455306 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -8,87 +8,100 @@ # making licenses more clear and reducing compile time/install size. # # Only tested on Linux -# -# TODO: package and use libappindicator -{ stdenv, config, fetchurl, - python2, pkgconfig, yasm, - autoconf, automake, libtool, m4, - libass, libsamplerate, fribidi, libxml2, bzip2, - libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, +{ stdenv, lib, fetchFromGitHub, + python2, pkgconfig, yasm, harfbuzz, zlib, + autoconf, automake, cmake, libtool, m4, jansson, + libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, + libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, lame, ffmpeg, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, fontconfig, freetype, hicolor_icon_theme, glib, gtk3, intltool, libnotify, gst_all_1, dbus_glib, udev, libgudev, libvpx, - wrapGAppsHook, - useGtk ? true + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null }: stdenv.mkDerivation rec { - version = "0.10.5"; + version = "1.0.7"; name = "handbrake-${version}"; - buildInputsX = stdenv.lib.optionals useGtk [ - glib gtk3 intltool libnotify - gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev - libgudev - wrapGAppsHook - ]; - - nativeBuildInputs = [ python2 pkgconfig yasm autoconf automake libtool m4 ]; - buildInputs = [ - fribidi fontconfig freetype hicolor_icon_theme - libass libsamplerate libxml2 bzip2 - libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac - lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx - ] ++ buildInputsX; - - src = fetchurl { - url = "http://download.handbrake.fr/releases/${version}/HandBrake-${version}.tar.bz2"; - sha256 = "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv"; + src = fetchFromGitHub { + owner = "HandBrake"; + repo = "HandBrake"; + rev = "${version}"; + sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57"; }; + nativeBuildInputs = [ + cmake python2 pkgconfig yasm autoconf automake libtool m4 + ] ++ (lib.optionals useGtk [ + intltool wrapGAppsHook + ]); + + buildInputs = [ + fribidi fontconfig freetype jansson zlib + libass libiconv libsamplerate libxml2 bzip2 + libogg libopus libtheora libvorbis libdvdcss a52dec libmkv fdk_aac + lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx + ] ++ (lib.optionals useGtk [ + glib gtk3 libappindicator-gtk3 libnotify + gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + libgudev + ]); + + dontUseCmakeConfigure = true; + + enableParallelBuilding = true; + preConfigure = '' - # Fake wget to prevent downloads - mkdir wget - echo "#!/bin/sh" > wget/wget - echo "echo ===== Not fetching \$*" >> wget/wget - echo "exit 1" >> wget/wget - chmod +x wget/wget - export PATH=$PATH:$PWD/wget + patchShebangs scripts + + echo 'TAG=${version}' > version.txt + + # `configure` errors out when trying to read the current year which is too low + substituteInPlace make/configure.py \ + --replace developer release \ + --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""' + + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules - - patch -p1 -R < ${./handbrake-0.10.3-nolibav.patch} ''; configureFlags = [ + "--disable-df-fetch" + "--disable-df-verify" "--enable-fdk-aac" (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") ]; + NIX_LDFLAGS = [ + "-lx265" + ]; + preBuild = '' cd build ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ x265 ]; - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}") + # icon-theme.cache belongs in the icon theme, not in individual packages + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache ''; - meta = { + meta = with stdenv.lib; { homepage = http://handbrake.fr/; description = "A tool for ripping DVDs into video files"; longDescription = '' Handbrake is a versatile transcoding DVD ripper. This package provides the cli HandbrakeCLI and the GTK+ version ghb. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; + license = licenses.gpl2; + maintainers = with maintainers; [ wmertens ]; # Not tested on anything else - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } 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 8539186aaa56..000000000000 --- 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/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix new file mode 100644 index 000000000000..7e3446d51dbf --- /dev/null +++ b/pkgs/applications/video/kodi/commons.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib +, unzip, cmake, kodiPlain, steam, libcec_platform, tinyxml +, libusb, pcre-cpp, jsoncpp, libhdhomerun }: + +rec { + + pluginDir = "/share/kodi/addons"; + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "17.1"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; + sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; + }; + + buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; + + }; + + mkKodiAPIPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: + stdenv.lib.makeOverridable stdenv.mkDerivation rec { + + inherit src meta sourceDir; + + name = "kodi-plugin-${plugin}-${version}"; + + passthru = { + kodiPlugin = pluginDir; + namespace = namespace; + }; + + dontStrip = true; + + installPhase = '' + ${if isNull sourceDir then "" else "cd $src/$sourceDir"} + d=$out${pluginDir}/${namespace} + mkdir -p $d + sauce="." + [ -d ${namespace} ] && sauce=${namespace} + cp -R "$sauce/"* $d + ''; + + }; + + mkKodiPlugin = mkKodiAPIPlugin; + + mkKodiABIPlugin = { plugin, namespace, version, src, meta + , extraBuildInputs ? [], sourceDir ? null, ... }: + stdenv.lib.makeOverridable stdenv.mkDerivation rec { + + inherit src meta sourceDir; + + name = "kodi-plugin-${plugin}-${version}"; + + passthru = { + kodiPlugin = pluginDir; + namespace = namespace; + }; + + dontStrip = true; + + buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] + ++ extraBuildInputs; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ + "-DOVERRIDE_PATHS=1" + ]; + + # kodi checks for plugin .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = let n = namespace; in '' + make install + ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}.so + ''; + + }; +} diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index d7625b8ebacc..33e64c65cf42 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -43,19 +43,27 @@ let url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz"; sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81"; }; + # Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback: + libdvdnav_src = fetchurl { + url = "https://github.com/xbmc/libdvdnav/archive/981488f.tar.gz"; + sha256 = "312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d"; + }; + libdvdread_src = fetchurl { + url = "https://github.com/xbmc/libdvdread/archive/17d99db.tar.gz"; + sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b"; + }; in stdenv.mkDerivation rec { - name = "kodi-" + version; - version = "17.0"; + name = "kodi-${version}"; + version = "17.3"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb"; + sha256 = "189isc1jagrnq549vwpvb0x1w6p0mkjwv7phm8dzvki96wx6bs0x"; }; buildInputs = [ - makeWrapper libxml2 gnutls - pkgconfig cmake gnumake yasm python2 - boost libmicrohttpd autoreconfHook + libxml2 gnutls yasm python2 + boost libmicrohttpd gettext pcre-cpp yajl fribidi libva openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto which @@ -82,6 +90,9 @@ in stdenv.mkDerivation rec { ++ lib.optional rtmpSupport rtmpdump ++ lib.optional joystickSupport SDL2; + nativeBuildInputs = [ + autoreconfHook cmake gnumake makeWrapper pkgconfig + ]; dontUseCmakeConfigure = true; @@ -92,14 +103,23 @@ in stdenv.mkDerivation rec { --replace "/bin/bash" "${bash}/bin/bash -ex" cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz - ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz - ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz + cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz + cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz ''; preConfigure = '' + patchShebangs . ./bootstrap + # tests here fail + sed -i '/TestSystemInfo.cpp/d' xbmc/utils/test/{Makefile,CMakeLists.txt} + # tests here trigger a segfault in kodi.bin + sed -i '/TestWebServer.cpp/d' xbmc/network/test/{Makefile,CMakeLists.txt} ''; + enableParallelBuilding = true; + + doCheck = true; + configureFlags = [ "--enable-libcec" ] ++ lib.optional (!sambaSupport) "--disable-samba" ++ lib.optional vdpauSupport "--enable-vdpau" @@ -110,19 +130,17 @@ in stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${python2}/bin" \ - --prefix PATH ":" "${glxinfo}/bin" \ - --prefix PATH ":" "${xdpyinfo}/bin" \ + --prefix PATH ":" "${lib.makeBinPath + [ python2 glxinfo xdpyinfo ]}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ] - }" + [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}" done ''; meta = with stdenv.lib; { homepage = http://kodi.tv/; description = "Media center"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar titanous edwtjo ]; }; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 41298269a184..51ff8fece630 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,46 +1,9 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib -, unzip, cmake, kodi, steam, libcec_platform, tinyxml }: +{ stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip +, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun }: -let +with (callPackage ./commons.nix {}); - pluginDir = "/share/kodi/addons"; - - kodi-platform = stdenv.mkDerivation rec { - project = "kodi-platform"; - version = "17.1"; - name = "${project}-${version}"; - - src = fetchFromGitHub { - owner = "xbmc"; - repo = project; - rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; - sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; - }; - - buildInputs = [ cmake kodi libcec_platform tinyxml ]; - }; - - mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - inherit src meta sourceDir; - name = "kodi-plugin-${plugin}-${version}"; - passthru = { - kodiPlugin = pluginDir; - namespace = namespace; - }; - dontStrip = true; - installPhase = '' - ${if isNull sourceDir then "" else "cd $src/$sourceDir"} - d=$out${pluginDir}/${namespace} - mkdir -p $d - sauce="." - [ -d ${namespace} ] && sauce=${namespace} - cp -R "$sauce/"* $d - ''; - }; - -in -{ +rec { advanced-launcher = mkKodiPlugin rec { @@ -72,6 +35,35 @@ in }; + advanced-emulator-launcher = mkKodiPlugin rec { + + plugin = "advanced-emulator-launcher"; + namespace = "plugin.program.advanced.emulator.launcher"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "Wintermute0110"; + repo = namespace; + rev = version; + sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2"; + }; + + meta = with stdenv.lib; { + homepage = "http://forum.kodi.tv/showthread.php?tid=287826"; + description = "A program launcher for Kodi"; + longDescription = '' + Advanced Emulator Launcher is a multi-emulator front-end for Kodi + scalable to collections of thousands of ROMs. Includes offline scrapers + for MAME and No-Intro ROM sets and also supports scrapping ROM metadata + and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML + DATs. Launching of games and standalone applications is also available. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + controllers = let pname = "game-controller"; version = "1.0.3"; @@ -111,11 +103,11 @@ in plugin = "exodus"; namespace = "plugin.video.exodus"; - version = "3.0.5"; + version = "3.1.13"; src = fetchurl { url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip"; - sha256 = "0di34sp6y3v72l6gfhj7cvs1vljs9vf0d0x2giix3jk433cj01j0"; + sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj"; }; meta = with stdenv.lib; { @@ -155,18 +147,40 @@ in }; }; + joystick = mkKodiABIPlugin rec { + namespace = "peripheral.joystick"; + version = "1.3.6"; + plugin = namespace; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = namespace; + rev = "5b480ccdd4a87f2ca3283a7b8d1bd69a114af0db"; + sha256 = "1zf5zwghx96bqk7bx53qra27lfbgfdi1dsk4s3hwixr8ii72cqpp"; + }; + + meta = with stdenv.lib; { + description = "Binary addon for raw joystick input."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + extraBuildInputs = [ libusb pcre-cpp ]; + + }; + svtplay = mkKodiPlugin rec { plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.42"; + version = "4.0.48"; src = fetchFromGitHub { name = plugin + "-" + version + ".tar.gz"; owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "83cb52b949930a1b6d2e51a7a0faf9bd69c7fb7d"; - sha256 = "0ync2ya4lwmfn6ngg8v0z6bng45whwg280irsn4bam5ca88383iy"; + rev = "dc18ad002cd69257611d0032fba91f57bb199165"; + sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x"; }; meta = with stdenv.lib; { @@ -184,6 +198,28 @@ in }; + steam-controller = mkKodiABIPlugin rec { + namespace = "peripheral.steamcontroller"; + version = "0.9.0"; + plugin = namespace; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = namespace; + rev = "76f640fad4f68118f4fab6c4c3338d13daca7074"; + sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh"; + }; + + extraBuildInputs = [ libusb ]; + + meta = with stdenv.lib; { + description = "Binary addon for steam controller."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + steam-launcher = (mkKodiPlugin rec { plugin = "steam-launcher"; @@ -233,7 +269,8 @@ in }; }; - pvr-hts = (mkKodiPlugin rec { + pvr-hts = mkKodiABIPlugin rec { + plugin = "pvr-hts"; namespace = "pvr.hts"; version = "3.4.16"; @@ -251,18 +288,30 @@ in platforms = platforms.all; maintainers = with maintainers; [ cpages ]; }; - }).override { - buildInputs = [ cmake kodi libcec_platform kodi-platform ]; - # disables check ensuring install prefix is that of kodi - cmakeFlags = [ "-DOVERRIDE_PATHS=1" ]; + }; + + pvr-hdhomerun = mkKodiABIPlugin rec { + + plugin = "pvr-hdhomerun"; + namespace = "pvr.hdhomerun"; + version = "2.4.7"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hdhomerun"; + rev = "60d89d16dd953d38947e8a6da2f8bb84a0f764ef"; + sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kodi-pvr/pvr.hdhomerun; + description = "Kodi's HDHomeRun PVR client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ titanous ]; + }; + + extraBuildInputs = [ jsoncpp libhdhomerun ]; - # kodi checks for plugin .so libs existance in the addon folder (share/...) - # and the non-wrapped kodi lib/... folder before even trying to dlopen - # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use - installPhase = '' - make install - ln -s $out/lib/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts - ''; }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index c156c5d607ff..1559535f342b 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.4"; + ver = "1.10.6"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa"; + sha256 = "99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4"; + 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 971588901b46..f70c142ab41d 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 0efa4aba2767..5ca530cfe9d2 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 e8dc1227ef87..0877df0a68cf 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake -, drake, ruby, file, xdg_utils, gettext, expat, qt5, boost -, libebml, zlib, libmatroska, libogg, libvorbis, flac +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv +, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost +, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt , withGUI ? true }: @@ -10,21 +10,23 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.8.0"; + version = "13.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1hnk92ksgg290q4kwdl8jqrz7vzlwki4f85bb6kgdgzpjkblw76n"; + sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg libvorbis flac - ] ++ optional withGUI qt5.qtbase; + ] + ++ optional stdenv.isDarwin libiconv + ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia]; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { "--disable-precompiled-headers" "--disable-static-qt" "--with-gettext" + "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl" (enableFeature withGUI "qt") ]; @@ -47,6 +50,7 @@ stdenv.mkDerivation rec { homepage = http://www.bunkus.org/videotools/mkvtoolnix/; license = licenses.gpl2; maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ]; - platforms = platforms.linux; + platforms = platforms.linux + ++ optionals (!withGUI) platforms.darwin; }; } diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 60625412617a..9ae1b99f86fd 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); @@ -93,6 +94,8 @@ stdenv.mkDerivation rec { prePatch = '' sed -i /^_install_strip/d configure + + rm -rf ffmpeg ''; buildInputs = with stdenv.lib; @@ -159,6 +162,7 @@ stdenv.mkDerivation rec { ${optionalString stdenv.isLinux "--enable-vidix"} ${optionalString stdenv.isLinux "--enable-fbdev"} --disable-ossaudio + --disable-ffmpeg_a ''; NIX_LDFLAGS = with stdenv.lib; @@ -182,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" ''; @@ -198,7 +203,7 @@ stdenv.mkDerivation rec { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3a5313b78279..d21a8ab6dcc9 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper -, docutils, perl, pkgconfig, python3, which, ffmpeg_3_2 +, docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs , lua, lua5_sockets, libuchardet, libiconv ? null, darwin @@ -33,6 +33,7 @@ , vaapiSupport ? true, libva ? null , drmSupport ? !stdenv.isDarwin, libdrm ? null , vapoursynthSupport ? false, vapoursynth ? null +, archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null # scripts you want to be loaded by default @@ -65,6 +66,7 @@ assert libpngSupport -> available libpng; assert youtubeSupport -> available youtube-dl; assert vapoursynthSupport -> available vapoursynth; assert jackaudioSupport -> available libjack2; +assert archiveSupport -> available libarchive; assert vaapiSupport -> available libva; assert drmSupport -> available libdrm; @@ -79,13 +81,13 @@ let }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.24.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "1aq1lvhw4l0i2gc9x6ijaaj2h3894jbcpd4j055n0y9vg9vqm6yy"; + sha256 = "0d9pvsknjqmxj907y85fxh9xcbb5dafw2bh7rpwhgs9x4wdrbvv0"; }; patchPhase = '' @@ -101,6 +103,9 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity + (enableFeature archiveSupport "libarchive") + (enableFeature dvdreadSupport "dvdread") + (enableFeature dvdnavSupport "dvdnav") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") ]; @@ -112,7 +117,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; buildInputs = [ - ffmpeg_3_2 freetype libass libpthreadstubs + ffmpeg freetype libass libpthreadstubs lua lua5_sockets libuchardet ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv Cocoa CoreAudio ]) @@ -136,6 +141,7 @@ in stdenv.mkDerivation rec { ++ optional vaapiSupport libva ++ optional drmSupport libdrm ++ optional vapoursynthSupport vapoursynth + ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optionals waylandSupport [ wayland libxkbcommon ]; @@ -154,7 +160,7 @@ in stdenv.mkDerivation rec { ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ - --add-flags "--script=${concatStringsSep "," scripts}" \ + --add-flags "--scripts=${concatStringsSep "," scripts}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a6238d9e808a..0aebb4dcb64d 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,9 +1,12 @@ { stdenv , fetchFromGitHub , cmake +, fdk_aac , ffmpeg , jansson , libxkbcommon +, libpthreadstubs +, libXdmcp , qtbase , qtx11extras , libv4l @@ -11,6 +14,7 @@ , curl , xorg , makeWrapper +, pkgconfig , alsaSupport ? false , alsaLib @@ -22,25 +26,29 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "18.0.1"; + version = "19.0.3"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "0mvjmkq5zlcppjqy18933w7r7rz1mpr2jpf8ipd0famdlgyacix6"; + sha256 = "1qh69bw848l61fmh6n5q86yl3djmvzh76ln044ngi2k69a9bl94b"; }; - patches = [ ./segfault-patch-systray.patch ]; + patches = [ ./find-xcb.patch ]; nativeBuildInputs = [ cmake + pkgconfig ]; buildInputs = [ curl + fdk_aac ffmpeg jansson libv4l libxkbcommon + libpthreadstubs + libXdmcp qtbase qtx11extras x264 @@ -67,7 +75,7 @@ in stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 MP2E ]; license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/pkgs/applications/video/obs-studio/find-xcb.patch b/pkgs/applications/video/obs-studio/find-xcb.patch new file mode 100644 index 000000000000..c45aba4ce2f0 --- /dev/null +++ b/pkgs/applications/video/obs-studio/find-xcb.patch @@ -0,0 +1,31 @@ +diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt +index cd2b80e1..7d829cdb 100644 +--- a/libobs/CMakeLists.txt ++++ b/libobs/CMakeLists.txt +@@ -15,6 +15,7 @@ if(UNIX) + find_package(DBus QUIET) + if (NOT APPLE) + find_package(X11_XCB REQUIRED) ++ find_package(XCB REQUIRED) + endif() + else() + set(HAVE_DBUS "0") +@@ -161,12 +162,15 @@ elseif(UNIX) + endif() + + include_directories( +- ${X11_XCB_INCLUDE_DIRS}) ++ ${X11_XCB_INCLUDE_DIRS} ++ ${XCB_INCLUDE_DIRS}) + add_definitions( +- ${X11_XCB_DEFINITIONS}) ++ ${X11_XCB_DEFINITIONS} ++ ${XCB_DEFINITIONS}) + set(libobs_PLATFORM_DEPS + ${libobs_PLATFORM_DEPS} +- ${X11_XCB_LIBRARIES}) ++ ${X11_XCB_LIBRARIES} ++ ${XCB_LIBRARIES}) + + if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + # use the sysinfo compatibility library on bsd diff --git a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch b/pkgs/applications/video/obs-studio/segfault-patch-systray.patch deleted file mode 100644 index c66b07bb57ad..000000000000 --- a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c31e0f682431508ccd2d3c0f74e6e16fc71445d8 Mon Sep 17 00:00:00 2001 -From: Cray Elliott -Date: Fri, 10 Mar 2017 03:48:36 -0800 -Subject: [PATCH] Fix segfault in Linux when no system tray exists - -previously, switching workspaces while obs-studio is running resulted in a -segfault if no system tray was available ---- - UI/window-basic-main.cpp | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp -index 8590dd75..024854d6 100644 ---- a/UI/window-basic-main.cpp -+++ b/UI/window-basic-main.cpp -@@ -2916,13 +2916,15 @@ void OBSBasic::closeEvent(QCloseEvent *event) - - void OBSBasic::changeEvent(QEvent *event) - { -- if (event->type() == QEvent::WindowStateChange && -- isMinimized() && -- trayIcon->isVisible() && -- sysTrayMinimizeToTray()) { -- -- ToggleShowHide(); -- } -+ if (trayIcon) { -+ if (event->type() == QEvent::WindowStateChange && -+ isMinimized() && -+ trayIcon->isVisible() && -+ sysTrayMinimizeToTray()) { -+ -+ ToggleShowHide(); -+ } -+ } - } - - void OBSBasic::on_actionShow_Recordings_triggered() --- -2.12.0 diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 449190cfaa17..29345f7548d5 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/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index ca44742b0461..f67ab412c26e 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,48 +1,44 @@ -{stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen -, ffmpeg, python3Packages, qt55}: +{ stdenv, fetchFromGitHub +, doxygen, python3Packages, libopenshot +, wrapGAppsHook, gtk3 }: -with stdenv.lib; - -let - libopenshot = callPackage ./libopenshot.nix {}; -in -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.1.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c"; + sha256 = "10j3p10q66m9nhzcd8315q1yiqscidkjbm474mllw7c281vacvzw"; }; - buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg]; + nativeBuildInputs = [ doxygen wrapGAppsHook ]; - propagatedBuildInputs = [ - qt55.qtbase - qt55.qtmultimedia - libopenshot - ]; + buildInputs = [ gtk3 ]; - installPhase = '' - mkdir -p $(toPythonPath $out) - cp -r src/* $(toPythonPath $out) - mkdir -p $out/bin - echo "#/usr/bin/env sh" >$out/bin/openshot-qt - echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt - chmod +x $out/bin/openshot-qt - wrapProgram $out/bin/openshot-qt \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" + propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 sip httplib2 pyzmq ]; + + + preConfigure = '' + # tries to create caching directories during install + export HOME=$(mktemp -d) ''; doCheck = false; - meta = { - homepage = "http://openshot.org/"; + meta = with stdenv.lib; { + homepage = http://openshot.org/; description = "Free, open-source video editor"; - license = licenses.gpl3Plus; - maintainers = []; - platforms = platforms.linux; + longDescription = '' + OpenShot Video Editor is a free, open-source video editor for Linux. + OpenShot can take your videos, photos, and music files and help you + create the film you have always dreamed of. Easily add sub-titles, + transitions, and effects, and then export your film to DVD, YouTube, + Vimeo, Xbox 360, and many other common formats. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 069c3ba7800b..82c7f247189e 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,8 +1,7 @@ -{stdenv, fetchurl, fetchFromGitHub, cmake, doxygen -, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor, alsaLib}: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib +, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }: with stdenv.lib; - stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; version = "0.1.2"; @@ -14,18 +13,24 @@ stdenv.mkDerivation rec { sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6"; }; - buildInputs = [ - cmake doxygen - libX11 libXft libXrandr libXinerama libXext libXcursor alsaLib - ]; + nativeBuildInputs = + [ pkgconfig cmake doxygen ]; + + buildInputs = + [ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ]; doCheck = false; meta = { - homepage = "http://openshot.org/"; - description = "Free, open-source video editor"; - license = licenses.gpl3Plus; - maintainers = []; - platforms = platforms.linux; + homepage = http://openshot.org/; + description = "High-quality sound editing library"; + longDescription = '' + OpenShot Audio Library (libopenshot-audio) is a program that allows the + high-quality editing and playback of audio, and is based on the amazing + JUCE library. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index b0891a3d69f3..b45460c426cc 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,22 +1,20 @@ -{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen -, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp -, cppzmq, czmqpp -}: +{ stdenv, fetchFromGitHub +, pkgconfig, cmake, doxygen +, libopenshot-audio, imagemagick, ffmpeg +, swig, python3, ruby +, unittest-cpp, cppzmq, czmqpp +, qtbase, qtmultimedia }: with stdenv.lib; - -let - libopenshot_audio = callPackage ./libopenshot-audio.nix {}; -in stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm"; + sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6"; }; patchPhase = '' @@ -27,22 +25,27 @@ stdenv.mkDerivation rec { export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages ''; - buildInputs = [ - cmake doxygen - imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby - unittest-cpp cppzmq czmqpp - ]; + nativeBuildInputs = [ pkgconfig cmake doxygen ]; - LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}"; + buildInputs = + [ imagemagick ffmpeg swig python3 ruby unittest-cpp + cppzmq czmqpp qtbase qtmultimedia ]; + + LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}"; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; doCheck = false; meta = { - homepage = "http://openshot.org/"; - description = "Free, open-source video editor"; - license = licenses.gpl3Plus; - maintainers = []; - platforms = platforms.linux; + homepage = http://openshot.org/; + description = "Free, open-source video editor library"; + longDescription = '' + OpenShot Library (libopenshot) is an open-source project dedicated to + delivering high quality video editing, animation, and playback solutions + to the world. API currently supports C++, Python, and Ruby. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix new file mode 100644 index 000000000000..310ac974fca7 --- /dev/null +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, qt5, gstreamer, gstreamermm, gst_plugins_bad +, gst_plugins_base, gst_plugins_good, ffmpeg, guvcview, automoc4 +, cmake, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils +, libv4l, pcre }: + +stdenv.mkDerivation rec { + pname = "qstopmotion"; + version = "2.3.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz"; + sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; + }; + + buildInputs = [ qt5.qtbase gstreamer gstreamermm gst_plugins_bad gst_plugins_good + gst_plugins_base ffmpeg guvcview v4l_utils libv4l pcre + ]; + + nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ]; + + meta = with stdenv.lib; { + homepage = "http://www.qstopmotion.org"; + description = "Create stopmotion animation with a (web)camera"; + longDescription = '' + Qstopmotion is a tool to create stopmotion + animation. Its users are able to create stop-motions from pictures + imported from a camera or from the harddrive and export the + animation to different video formats such as mpeg or avi. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ maintainers.leenaars ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 140c8e5863d1..4ca31916965c 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols, qtgraphicaleffects, -qmakeHook, makeQtWrapper }: +qmake, makeWrapper }: stdenv.mkDerivation rec { name = "shotcut-${version}"; @@ -12,10 +12,14 @@ stdenv.mkDerivation rec { sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr"; }; - buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit - qtx11extras qtwebsockets qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ]; enableParallelBuilding = true; + nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + buildInputs = [ + SDL frei0r gettext mlt + qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols + qtgraphicaleffects + ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ - wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin + wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index d7411c1128e2..ea5af4ab1186 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, qmakeHook, qtscript }: +{ stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.3.0"; + name = "smplayer-17.7.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0yv7725kr3dq02mcanc07sapirx6s73l4b6d13nzvq5rkwr8crmj"; + sha256 = "1g35h8xqs2bdwjdibzgs1ab2z2lmwgj8h53a7vqydv3j3crxx9wk"; }; buildInputs = [ qtscript ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; dontUseQmakeConfigure = true; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index ea0bd083b1d8..b05887967093 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }: +{ stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "17.1.0"; + version = "17.5.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "1kg45qkr7nvchy9ih24vlbpkn6vd8v8qw5xqsjhjpjkizcmzaa61"; + sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld"; }; makeFlags = [ @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; - buildInputs = [ qmakeHook qtscript qtwebkit ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtscript qtwebkit ]; meta = with stdenv.lib; { description = "Play and download Youtube videos"; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 462d74c9672f..1c92d66bcfcc 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,17 +1,19 @@ -{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump }: +{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.3.0"; + version = "0.7.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "1bjih6y21vmjmsk3xvhgc1innymryklgylyvjrskqw610niai59j"; + sha256 = "0knh7lw6bv1vix3p40hjp5lc0z9pavvx6rncviw5h095rzcw5287"; }; - propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ]; + buildInputs = with pythonPackages; [ pytest mock ]; + + propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { homepage = https://github.com/streamlink/streamlink; @@ -25,6 +27,6 @@ pythonPackages.buildPythonApplication rec { ''; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg zraexy ]; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index f3554ab230e3..b806ff65ddb2 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -20,11 +20,11 @@ assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.2.4"; + version = "2.2.6"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1gjkrwlg8ab3skzl67cxb9qzg4187ifckd1z9kpy11q058fyjchn"; + sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"; }; # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. @@ -50,6 +50,15 @@ stdenv.mkDerivation rec { LIVE555_PREFIX = live555; + preConfigure = '' + sed -e "s@/bin/echo@echo@g" -i configure + '' + optionalString withQt5 '' + # Make sure we only *add* "-std=c++11" to CXXFLAGS instead of overriding the + # values figured out by configure (for example "-g -O2"). + sed -i -re '/^ *CXXFLAGS=("[^$"]+")? *$/s/CXXFLAGS="?/&-std=c++11 /' \ + configure + ''; + configureFlags = [ "--enable-alsa" "--with-kde-solid=$out/share/apps/solid/actions" @@ -61,8 +70,6 @@ stdenv.mkDerivation rec { ] ++ optional onlyLibVLC "--disable-vlc"; - preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure''; - enableParallelBuilding = true; preBuild = '' @@ -76,9 +83,5 @@ stdenv.mkDerivation rec { homepage = http://www.videolan.org/vlc/; platforms = platforms.linux; license = licenses.lgpl21Plus; - broken = - if withQt5 - then builtins.compareVersions qtbase.version "5.7.0" >= 0 - else false; }; } diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 204580b108f7..b10495434b99 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, pkgconfig, qtbase, qttools, qmakeHook, qtx11extras, alsaLib, libv4l, libXrandr +, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: @@ -11,13 +11,12 @@ stdenv.mkDerivation { sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z"; }; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ alsaLib libv4l - pkgconfig qtbase qttools - qmakeHook qtx11extras libXrandr ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index fc3c679d414d..121875a69de7 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -9,10 +9,13 @@ let else throw "Unsupported architecture"; + version = (builtins.parseDrvName edk2.name).version; in stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { - name = "OVMF-2014-12-10"; + name = "OVMF-${version}"; + + outputs = [ "out" "fd" ]; # TODO: properly include openssl for secureBoot buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ]; @@ -20,6 +23,9 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { hardeningDisable = [ "stackprotector" "pic" "fortify" ]; unpackPhase = '' + # $fd is overwritten during the build + export OUTPUT_FD=$fd + for file in \ "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; do @@ -47,6 +53,13 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { build -D CSM_ENABLE -D FD_SIZE_2MB ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""} ''; + postFixup = '' + mkdir -vp $OUTPUT_FD/FV + mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV + ''; + + dontPatchELF = true; + meta = { description = "Sample UEFI firmware for QEMU and KVM"; homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index dfd926855790..211bd2f39e08 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 c428c56b313b..b918177f543f 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, removeReferencesTo , go, libapparmor, apparmor-parser, libseccomp }: with lib; @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sha256 = "16p8kixhzdx8afpciyf3fjx43xa3qrqpx06r5aqxdrqviw851zh8"; }; - buildInputs = [ go ]; + buildInputs = [ removeReferencesTo go ]; preBuild = '' - ln -s $(pwd) vendor/src/github.com/docker/containerd + ln -s $(pwd) vendor/src/github.com/containerd/containerd ''; installPhase = '' @@ -26,10 +26,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # remove references to go compiler - while read file; do - sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - done < <(find $out/bin -type f 2>/dev/null) + find $out -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix index 4850d7d9f5f5..c3c0de149668 100644 --- a/pkgs/applications/virtualization/docker-distribution/default.nix +++ b/pkgs/applications/virtualization/docker-distribution/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "distribution-${version}"; - version = "2.5.1"; + version = "2.6.0"; rev = "v${version}"; goPackagePath = "github.com/docker/distribution"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "docker"; repo = "distribution"; inherit rev; - sha256 = "08nxcsl9bc3k9gav2mkqccm5byrlfcgy6qaqaywiyza0b0cn4kdc"; + sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 903ee98a0e1b..c42b2a098f79 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,144 +1,183 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man -, go, containerd, runc, docker-proxy, tini +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +, 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 - with lib; -stdenv.mkDerivation rec { - name = "docker-${version}"; - version = "1.13.1"; - rev = "092cba3"; # should match the version commit +rec { + dockerGen = { + version, rev, sha256 + , runcRev, runcSha256 + , containerdRev, containerdSha256 + , tiniRev, tiniSha256 + } : stdenv.mkDerivation rec { + inherit version rev; - src = fetchFromGitHub { - owner = "docker"; - repo = "docker"; - rev = "v${version}"; - sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; - }; + name = "docker-${version}"; - docker-runc = runc.overrideAttrs (oldAttrs: rec { - name = "docker-runc"; src = fetchFromGitHub { owner = "docker"; - repo = "runc"; - rev = "9df8b306d01f59d3a8029be411de015b7304dd8f"; - sha256 = "1yvrk1w2409b90gk55k72z7l3jlkj682x4h3b7004mkl9bhscqd9"; - }; - # docker/runc already include these patches / are not applicable - patches = []; - }); - docker-containerd = containerd.overrideAttrs (oldAttrs: rec { - name = "docker-containerd"; - src = fetchFromGitHub { - owner = "docker"; - repo = "containerd"; - rev = "aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1"; - sha256 = "0vidbsgyn77m98kisrqnbykva0zmk1ljprgqhbfp5lw16ac6qj8c"; - }; - }); - docker-tini = tini.overrideAttrs (oldAttrs: rec { - name = "docker-init"; - src = fetchFromGitHub { - owner = "krallin"; - repo = "tini"; - rev = "949e6facb77383876aeff8a6944dde66b3089574"; - sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + repo = "docker-ce"; + rev = "v${version}"; + sha256 = sha256; }; - # Do not remove static from make files as we want a static binary - patchPhase = '' + docker-runc = runc.overrideAttrs (oldAttrs: rec { + name = "docker-runc"; + src = fetchFromGitHub { + owner = "docker"; + repo = "runc"; + rev = runcRev; + sha256 = runcSha256; + }; + # docker/runc already include these patches / are not applicable + patches = []; + }); + docker-containerd = containerd.overrideAttrs (oldAttrs: rec { + name = "docker-containerd"; + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = containerdRev; + sha256 = containerdSha256; + }; + }); + docker-tini = tini.overrideAttrs (oldAttrs: rec { + name = "docker-init"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = tiniRev; + sha256 = tiniSha256; + }; + + # Do not remove static from make files as we want a static binary + patchPhase = '' + ''; + + NIX_CFLAGS_COMPILE = [ + "-DMINIMAL=ON" + ]; + }); + + buildInputs = [ + makeWrapper removeReferencesTo pkgconfig go-md2man go + sqlite devicemapper btrfs-progs systemd libtool + ]; + + dontStrip = true; + + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + + buildPhase = '' + # 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 - ''; - NIX_CFLAGS_COMPILE = [ - "-DMINIMAL=ON" - ]; - }); + # 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" "" + ''; - buildInputs = [ - makeWrapper pkgconfig go-md2man go - sqlite devicemapper btrfs-progs systemd - ]; + outputs = ["out" "man"]; - dontStrip = true; + extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; - DOCKER_BUILDTAGS = [] - ++ optional (systemd != null) [ "journald" ] - ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + installPhase = '' + 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 \ + --prefix PATH : "$out/libexec/docker:$extraPath" - # 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 - ''; + # docker uses containerd now + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - buildPhase = '' - patchShebangs . - export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" - ./hack/make.sh dynbinary - ''; + # systemd + install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service - outputs = ["out" "man"]; + # 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 - extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; + # 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 - 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 - makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" - makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ - --prefix PATH : "$out/libexec/docker:$extraPath" + # Generate legacy pages from markdown + echo "Generate legacy manpages" + ./man/md2man-all.sh -q - # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc - ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy - 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 - - # 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 - - # Include contributed man pages - man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + manRoot="$man/share/man" + mkdir -p "$manRoot" + for manDir in ./man/man?; do + manBase="$(basename "$manDir")" # "man1" + for manFile in "$manDir"/*; do + manName="$(basename "$manFile")" # "docker-build.1" + mkdir -p "$manRoot/$manBase" + gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + done done - done - ''; + ''; - preFixup = '' - # remove references to go compiler, gcc and glibc - while read file; do - sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - done < <(find $out -type f 2>/dev/null) - ''; + preFixup = '' + find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + + ''; - meta = { - 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 ]; - platforms = platforms.linux; + meta = { + 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 vdemeester ]; + platforms = platforms.linux; + }; + }; + + 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 a9f278c4d2a8..651631b478fc 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -1,32 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, go, docker }: +{ stdenv, buildGoPackage, fetchFromGitHub, docker }: -with lib; - -stdenv.mkDerivation rec { +buildGoPackage rec { name = "docker-proxy-${rev}"; - rev = "0f534354b813003a754606689722fe253101bc4e"; + rev = "7b2b1feb1de4817d522cc372af149ff48d25028e"; src = fetchFromGitHub { inherit rev; owner = "docker"; repo = "libnetwork"; - sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31"; + sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935"; }; - buildInputs = [ go ]; + goPackagePath = "github.com/docker/libnetwork"; - buildPhase = '' - mkdir -p .gopath/src/github.com/docker - ln -sf $(pwd) .gopath/src/github.com/docker/libnetwork - GOPATH="$(pwd)/.gopath:$(pwd)/Godeps/_workspace" go build -ldflags="$PROXY_LDFLAGS" -o docker-proxy ./cmd/proxy - ''; + goDeps = null; installPhase = '' - mkdir -p $out/bin - cp docker-proxy $out/bin + install -m755 -D ./go/bin/proxy $bin/bin/docker-proxy ''; - meta = { + meta = with stdenv.lib; { description = "Docker proxy binary to forward traffic between host and containers"; license = licenses.asl20; homepage = https://github.com/docker/libnetwork; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 398c269d0746..d1bf5792a1b4 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,31 +1,35 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-${stdenv.lib.substring 0 7 rev}"; - rev = "d74707304d4e4614081ae2a612a833aeb46622b5"; + name = "lkl-2017-06-27"; + rev = "0d91d102b046eec535a6d67df9829b80b24e9ce9"; - buildInputs = [ bc python fuse libarchive ]; + outputs = [ "dev" "lib" "out" ]; + + nativeBuildInputs = [ bc python ]; + + buildInputs = [ fuse libarchive ]; src = fetchFromGitHub { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp"; + sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds prePatch = "patchShebangs arch/lkl/scripts"; installPhase = '' - mkdir -p $out/{bin,lib} + mkdir -p $out/bin $lib/lib $dev - # This tool assumes a different directory structure so let's point it at the right location cp tools/lkl/bin/lkl-hijack.sh $out/bin - substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib' + sed -i $out/bin/lkl-hijack.sh \ + -e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib," cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin - cp -r tools/lkl/include $out - cp tools/lkl/liblkl*.{a,so} $out/lib + cp -r tools/lkl/include $dev/ + cp tools/lkl/liblkl*.{a,so} $lib/lib ''; # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code): @@ -35,10 +39,16 @@ stdenv.mkDerivation rec { makeFlags = "-C tools/lkl"; - enableParallelBuilds = true; + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead"; + description = "The Linux kernel as a library"; + longDescription = '' + LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as + extensively as possible with minimal effort and reduced maintenance + overhead + ''; + homepage = https://github.com/lkl/linux/; platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index f78e5da9a8c0..21cb4906d034 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = with python2Packages; [ - Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8 + Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8 testresources testscenarios testtools psutil_1 oslotest psycopg2 sqlite which strace ]; diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 3a5941880795..39c54f0d204b 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec { buildInputs = with python2Packages; [ coverage fixtures mock subunit tempest-lib testtools testrepository - ldap ldappool webtest requests2 oslotest pep8 pymongo which + ldap ldappool webtest requests oslotest pep8 pymongo which ]; makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"]; diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index c1ee231d97f5..9ee586cf0409 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt propagatedBuildInputs = with python2Packages; [ - pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2 + pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six stevedore pecan ryu networking-hyperv MySQL_python diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index 219026f1e0fb..ef3eb2fb0842 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr - netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six + netifaces paramiko Babel iso8601 jsonschema keystoneclient requests six stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql keystonemiddleware MySQL_python diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e5620b6ce456..d09926da7cdb 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; let - version = "2.8.0"; + version = "2.9.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs"; + sha256 = "053c7ivp3li7cdagzkp2wdc5myybzjf826r6qfkcf0xvn4bv5gq0"; }; buildInputs = @@ -54,94 +54,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = let - upstreamPatch = name: commit: sha256: fetchurl { - name = "${name}.patch"; - url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=${commit}"; - inherit sha256; - }; - in [ - ./no-etc-install.patch - - # bugfixes - (fetchurl { - name = "qemu-vnc-do-not-disconnect-on-EAGAIN.patch"; - url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/vnc-do-not-disconnect-on-EAGAIN.patch?h=debian/qemu_2.8%2bdfsg-3"; - sha256 = "1nqhfgfw1pzhid094pk204qy36r6n7w1yilsiwabgcsyxs5bymnh"; - }) - - (upstreamPatch "qemu-fix-win7-xhci" "7da76e12cc5cc902dda4c168d8d608fd4e61cbc5" - "0m1ggbxziy7vqz9007ypzg23cni8cc4db36wlnhxz0kdpq70c6x0") - - (upstreamPatch "qemu-xhci-free-completed-transfers" "f94d18d6c6df388fde196d3ab252f57e33843a8b" - "0lk19qss6ky7cqnvis54742cr2z0vl8c64chhch0kp6n83hray9x") - - # security fixes from debian - (fetchurl { - name = "CVE-2016-9602.patch"; - url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/9pfs-symlink-attack-fixes-CVE-2016-9602.patch?h=debian/qemu_2.8%2bdfsg-3"; - sha256 = "0f7m1k3hbw9v0dwqn53ds36s7s334vlidvbn0682s9r2sq0sjlkv"; - }) - - (fetchurl { - name = "CVE-2017-2630.patch"; - url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/nbd_client-fix-drop_sync-CVE-2017-2630.patch?h=debian/qemu_2.8%2bdfsg-3"; - sha256 = "1gdxaari53iwgj3gyczz30rhg8lj6xqycxym4snw9z5vmkyj1bbq"; - }) - - (fetchurl { - name = "CVE-2017-6058.patch"; - url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/vmxnet3-fix-memory-corruption-on-vlan-header-stripping-CVE-2017-6058.patch?h=debian/qemu_2.8%2bdfsg-3"; - sha256 = "0w8az2cr116mnijxjd4aprl8dvfdj76gm7ddajmngdslxiax601f"; - }) - - # security fixes from upstream - (upstreamPatch "CVE-2016-7907" "81f17e0d435c3db3a3e67e0d32ebf9c98973211f" - "0dzghbm3jmnyw34kd40a6akrr1cpizd9hdzqmhlc2ljab7pr1rcb") - - (upstreamPatch "CVE-2016-10155" "eb7a20a3616085d46aa6b4b4224e15587ec67e6e" - "1xk00fyls0hdza11dyfrnzcn6gibmmcrwy7sxgp6iizp6wgzi3vw") - - (upstreamPatch "CVE-2017-2615" "62d4c6bd5263bb8413a06c80144fc678df6dfb64" - "0miph2x4d474issa44hmc542zxmkc7lsr4ncb7pwarq6j7v52l8h") - - (upstreamPatch "CVE-2017-2620" "92f2b88cea48c6aeba8de568a45f2ed958f3c298" - "1kz12qmvfccy7xilsrxahbs67jycv4zjfbijxivadvx9klxs1n58") - - (upstreamPatch "CVE-2017-5525" "12351a91da97b414eec8cdb09f1d9f41e535a401" - "190b4aqr35p4lb3rjarknfi1ip1c9zizliqp1dd6frx4364y5yp2") - - (upstreamPatch "CVE-2017-5526" "069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da" - "05xgzd3zldk3x2vqpjag9z5ilhdkpkyh633fb5kvnz8scns6v86f") - - (upstreamPatch "CVE-2017-5579" "8409dc884a201bf74b30a9d232b6bbdd00cb7e2b" - "0lbcyhif1kdcy8my0bv8aqr2f421kmljcch3plrjzj9pgcm4sv83") - - (upstreamPatch "CVE-2017-5667" "42922105beb14c2fc58185ea022b9f72fb5465e9" - "049vq70is3fj9bf4ysfj3s44iz93qhyqn6xijck32w1x6yyzqyx4") - - (upstreamPatch "CVE-2017-5667-fix" "913a87885f589d263e682c2eb6637c6e14538061" - "0nm1k2r9n6r86dvjr16hxak2vcsinj7ijlqw5i6f4y5h2sh37wr5") - - (upstreamPatch "CVE-2017-5856" "765a707000e838c30b18d712fe6cb3dd8e0435f3" - "03pjkn8l8rp9ip5h5rm1dp0nrwd43nmgpwamz4z1vy3rli1z3yjw") - - (upstreamPatch "CVE-2017-5857" "5e8e3c4c75c199aa1017db816fca02be2a9f8798" - "1kz14rmxf049zl5m27apzpbvy8dk0g47n9gnwy0nm70g65rl1dh8") - - (upstreamPatch "CVE-2017-5898" "c7dfbf322595ded4e70b626bf83158a9f3807c6a" - "1y2j0qw04s8fl0cs8i619y08kj75lxn3c0y19g710fzpk3rq8dvn") - - (upstreamPatch "CVE-2017-5931" "a08aaff811fb194950f79711d2afe5a892ae03a4" - "0hlih9jhbb1mb174hvxs7pf7lgcs7s9g705ri9rliw7wrhqdpja5") - - (upstreamPatch "CVE-2017-5973" "f89b60f6e5fee3923bedf80e82b4e5efc1bb156b" - "06niyighjxb4p5z2as3mqfmrwrzn4sq47j7raipbq9gnda7x9sw6") - - (upstreamPatch "CVE-2017-5987" "6e86d90352adf6cb08295255220295cf23c4286e" - "09yfxf93cisx8rhm0h48ib1ibwfs420k5pqpz8dnz33nci9567jm") - - ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; + patches = [ ./no-etc-install.patch ] + ++ optional nixosTestRunner ./force-uid0-on-9p.patch; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 833f030bed35..47b4b3176dc8 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,11 +1,10 @@ --- a/Makefile +++ b/Makefile -@@ -418,7 +418,7 @@ +@@ -597,7 +597,7 @@ - install: all $(if $(BUILD_DOCS),install-doc) \ --install-datadir install-localstatedir -+install-datadir +-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir ifneq ($(TOOLS),) - $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) + $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) endif diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 81e26f78528d..bca2e558b387 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.25.0"; + version = "1.27.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; src = fetchFromGitHub { - owner = "coreos"; - repo = "rkt"; - rev = "v${version}"; - sha256 = "0lcnhyaxq8z0ndwqg0svcc1gg0ahhcprxlf9gifm4mpxqimhaz8j"; + owner = "coreos"; + repo = "rkt"; + rev = "v${version}"; + sha256 = "153nkl4mp2p0llv4bpdhdd6127qyaz27jsnxmjgvxhaia0ab79v2"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 7f19121b7f5b..3c7480e51812 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,43 +1,37 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: with lib; stdenv.mkDerivation rec { name = "runc-${version}"; - version = "1.0.0-rc2"; + version = "1.0.0-rc3"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk"; + sha256 = "14hdhnni0rz3g0bhcaq95zn2zrhyds0mq2pm2padbamg4bgq4r1c"; }; - patches = [ - # Two patches to fix CVE-2016-9962 - # From https://bugzilla.suse.com/show_bug.cgi?id=1012568 - (fetchpatch { - name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch"; - url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw"; - sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck"; - }) - (fetchpatch { - name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch"; - url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw"; - sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl"; - }) - ]; - outputs = [ "out" "man" ]; hardeningDisable = ["fortify"]; - buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; + preConfigure = '' + # Extract the source + cd "$NIX_BUILD_TOP" + mkdir -p "go/src/github.com/opencontainers" + mv "$sourceRoot" "go/src/github.com/opencontainers/runc" + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + ''; + preBuild = '' + cd go/src/github.com/opencontainers/runc patchShebangs . substituteInPlace libcontainer/apparmor/apparmor.go \ --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser @@ -61,10 +55,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # remove references to go compiler - while read file; do - sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - done < <(find $out/bin -type f 2>/dev/null) + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index bd003df57f85..dad16ffb0f08 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchurl, python2Packages, intltool, curl -, wrapGAppsHook, virtinst, gtkvnc, vte -, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib -, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt +{ stdenv, fetchurl, python2Packages, intltool, file +, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf +, gobjectIntrospection, libvirt-glib, system-libvirt +, gsettings_desktop_schemas, glib, libosinfo, gnome3 +, spiceSupport ? true, spice_gtk ? null }: with stdenv.lib; -with python2Packages; -buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.0"; + version = "1.4.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1jnawqjmcqd2db78ngx05x7cxxn3iy1sb4qfgbwcn045qh6a8cdz"; + sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6"; }; - propagatedBuildInputs = - [ eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted - distutils_extra simplejson glanceclient cheetah lockfile httplib2 - urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3 - libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox - gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme - wrapGAppsHook + nativeBuildInputs = [ wrapGAppsHook intltool file ]; + + buildInputs = + [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi + gsettings_desktop_schemas libosinfo ] ++ optional spiceSupport spice_gtk; - buildInputs = [ dconf avahi intltool ]; + propagatedBuildInputs = with python2Packages; + [ eventlet greenlet gflags netaddr carrot routes PasteDeploy + m2crypto ipy twisted distutils_extra simplejson + cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python + pygobject3 ipaddr mox libvirt libxml2 requests + ]; patchPhase = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py @@ -35,13 +37,17 @@ buildPythonApplication rec { ''; postConfigure = '' - ${python.interpreter} setup.py configure --prefix=$out + ${python2Packages.python.interpreter} setup.py configure --prefix=$out ''; postInstall = '' ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas ''; + preFixup = '' + gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") + ''; + # Failed tests doCheck = false; @@ -54,6 +60,6 @@ buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; - maintainers = with maintainers; [qknight offline]; + maintainers = with maintainers; [ qknight offline fpletz ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index d502ef06671e..fe885d86456b 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtmultimedia, qtsvg, makeQtWrapper +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, qtbase, qtmultimedia, qtsvg , lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.39.60"; + version = "0.43.72"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "010lpw85m5sd613l281y4zxkp5v3k16pgnawskbi1ricsnj4k5mh"; + sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg"; }; cmakeFlags = [ @@ -23,17 +23,9 @@ stdenv.mkDerivation rec { libvirt libvncserver pixman spice_gtk spice_protocol ]; - nativeBuildInputs = [ cmake pkgconfig makeQtWrapper ]; + nativeBuildInputs = [ cmake pkgconfig ]; - postFixup = '' - for f in $out/bin/* ; do - wrapQtProgram $f - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = http://f1ash.github.io/qt-virt-manager; description = "Desktop user interface for managing virtual machines (QT)"; longDescription = '' diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index f63eeb603068..3b8d0a7cf63e 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl -, gsettings_desktop_schemas, makeWrapper, xen, numactl -, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null +, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen +, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, libapparmor +, spiceSupport ? true +, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null }: assert spiceSupport -> @@ -11,18 +13,19 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "2.0"; + version = "5.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9"; + sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b"; }; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl - shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper - xen numactl + glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info + libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib + libcap_ng numactl libapparmor xen ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; postInstall = '' diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 75f90c234e83..f0ee4b5b26ed 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pythonPath = with python2Packages; [ setuptools eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted - distutils_extra simplejson glanceclient cheetah lockfile httplib2 + distutils_extra simplejson cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. libvirt libxml2Python urlgrabber diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 14121660fa85..a67663d56dfc 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 = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85"; - extpackRev = 112924; - main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"; - version = "5.1.14"; + extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5"; + extpackRev = "117012"; + main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf"; + version = "5.1.24"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -72,15 +72,17 @@ in stdenv.mkDerivation { ''} -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 - sed -i -e ' - s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g - s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g - ${optionalString pulseSupport '' - s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g - ''} - ' src/VBox/Main/xml/Settings.cpp \ - src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \ - include/VBox/dbus-calls.h + + grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e ' + ${optionalString pulseSupport + ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' + + grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e ' + s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' + + grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e ' + s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g' + export USER=nix set +x ''; @@ -127,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 @@ -151,9 +154,10 @@ in stdenv.mkDerivation { find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ -name src -o -exec cp -avt "$libexec" {} + - # Create wrapper script mkdir -p $out/bin - for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do + for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + echo "Linking $file to /bin" + test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file done diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 6e58d42a1cb5..e19cb7486070 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 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a"; + sha256 = "0hxxv2707fb6x34m5cmjhj73sxwgmy2dgir7mbbdh9wivw07b9q1"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -97,7 +97,7 @@ stdenv.mkDerivation { sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all # Install binaries - install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf + install -D -m 755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf install -D -m 755 sbin/VBoxService $out/bin/VBoxService mkdir -p $out/bin @@ -139,7 +139,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 8d408d3494e3..bd29ca9a65af 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/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 754f800afada..5fe4fa823fea 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -67,6 +67,14 @@ callPackage (import ./generic.nix (rec { name = "209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput"; sha256 = "0avxqs9922qjfsxxlk7bh10432a526j2yyykhags8dk1bzxkpxwv"; }) + (xsaPatch { + name = "211-qemuu-4.6"; + sha256 = "1g090xs8ca8676vyi78b99z5yjdliw6mxkr521b8kimhf8crx4yg"; + }) + (xsaPatch { + name = "216-qemuu-4.5"; + sha256 = "0nh5akbal93czia1gh1pzvwq7gc4zwiyr1hbyk1m6wwdmqv6ph61"; + }) ]; meta.description = "Xen's fork of upstream Qemu"; }; @@ -95,6 +103,10 @@ callPackage (import ./generic.nix (rec { name = "209-qemut"; sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r"; }) + (xsaPatch { + name = "211-qemut-4.5"; + sha256 = "1z3phabvqmxv4b5923fx63hwdg4v1fnl15zbl88873ybqn0hp50f"; + }) ]; postPatch = '' substituteInPlace xen-hooks.mak \ @@ -167,7 +179,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withSeabios) "--with-system-seabios=${seabios}" ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" - ++ optional (withOVMF) "--with-system-ovmf=${OVMF}" + ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; patches = @@ -218,10 +230,178 @@ callPackage (import ./generic.nix (rec { name = "204-4.5"; sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; }) + (xsaPatch { + name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; + sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; + }) + (xsaPatch { + name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; + sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; + }) + (xsaPatch { + name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; + sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; + }) + (xsaPatch { + name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; + sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; + }) + (xsaPatch { + name = "206-4.5/0005-oxenstored-refactor-request-processing"; + sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; + }) + (xsaPatch { + name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; + sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; + }) + (xsaPatch { + name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; + sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; + }) + (xsaPatch { + name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; + sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; + }) + (xsaPatch { + name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; + sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; + }) + (xsaPatch { + name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; + sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; + }) + (xsaPatch { + name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; + sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; + }) + (xsaPatch { + name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; + sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; + }) + (xsaPatch { + name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; + sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; + }) + (xsaPatch { + name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; + sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; + }) + (xsaPatch { + name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; + sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; + }) + (xsaPatch { + name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; + sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; + }) + (xsaPatch { + name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; + sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; + }) + (xsaPatch { + name = "206-4.5/0018-oxenstored-track-commit-history"; + sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; + }) + (xsaPatch { + name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; + sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; + }) + (xsaPatch { + name = "206-4.5/0020-oxenstored-allow-self-conflicts"; + sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; + }) + (xsaPatch { + name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; + sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; + }) + (xsaPatch { + name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; + sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; + }) + (xsaPatch { + name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; + sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; + }) + (xsaPatch { + name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; + sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; + }) (xsaPatch { name = "207"; sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; }) + (xsaPatch { + name = "212"; + sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; + }) + (xsaPatch { + name = "213-4.5"; + sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; + }) + (xsaPatch { + name = "214"; + sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; + }) + (xsaPatch { + 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 000000000000..f6205f5c467a --- /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 953368b7e3bc..434853b7cc12 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 @@ -107,7 +107,8 @@ stdenv.mkDerivation (rec { # We want to do this before getting prefetched stuff to speed things up # (prefetched stuff has lots of files) find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g' - find . -type f | xargs sed -i 's@/bin/bash@/bin/sh@g' + find . -type f -not -path "./tools/hotplug/Linux/xendomains.in" \ + | xargs sed -i 's@/bin/bash@/bin/sh@g' # Get prefetched stuff ${withXenfiles (name: x: '' @@ -152,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: '' @@ -171,6 +179,11 @@ stdenv.mkDerivation (rec { ${config.postPatch or ""} ''; + postConfigure = '' + substituteInPlace tools/hotplug/Linux/xendomains \ + --replace /bin/ls ls + ''; + # TODO: Flask needs more testing before enabling it by default. #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] @@ -185,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 @@ -198,6 +211,8 @@ stdenv.mkDerivation (rec { --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\" wrapPythonPrograms + # We also need to wrap pygrub, which lies in lib + wrapPythonProgramsIn "$out/lib" "$out $pythonPath" shopt -s extglob for i in $out/etc/xen/scripts/!(*.sh); do diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 633ec4f3d124..8f5262acb024 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/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index b7205ac000e2..c519784a6233 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; - version = "0.2.0"; + name = "xhyve-${version}"; + version = "1f1dbe305"; src = fetchurl { - url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; - sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; + url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz"; + sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx"; }; + buildInputs = [ Hypervisor vmnet xpc libobjc ]; + # Don't use git to determine version - buildFlags = '' - CFLAGS=-DVERSION=\"${version}\" + prePatch = '' + substituteInPlace Makefile \ + --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" ''; + + makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ]; + installPhase = '' mkdir -p $out/bin cp build/xhyve $out/bin diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix new file mode 100644 index 000000000000..50c342269c71 --- /dev/null +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, patches +, libxcb, xcbutilkeysyms, xcbutilwm +, libX11, xcbutil, xcbutilxrm }: + +stdenv.mkDerivation rec { + version = "0.2"; + name = "2bwm-${version}"; + + src = fetchFromGitHub { + owner = "venam"; + repo = "2bwm"; + rev = "v${version}"; + sha256 = "1la1ixpm5knsj2gvdcmxzj1jfbzxvhmgzps4f5kbvx5047xc6ici"; + }; + + # Allow users set their own list of patches + inherit patches; + + buildInputs = [ libxcb xcbutilkeysyms xcbutilwm libX11 xcbutil xcbutilxrm ]; + + installPhase = "make install DESTDIR=$out PREFIX=\"\""; + + meta = with stdenv.lib; { + homepage = "https://github.com/venam/2bwm"; + description = "A fast floating WM written over the XCB library and derived from mcwm"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 0a1256d67a48..6f56ff98998f 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm @@ -9,10 +9,13 @@ with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - version = "4.0"; - src = fetchurl { - url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz"; - sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "awesomewm"; + repo = "awesome"; + rev = "v${version}"; + sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj"; }; nativeBuildInputs = [ @@ -22,10 +25,12 @@ with luaPackages; stdenv.mkDerivation rec { imagemagick makeWrapper pkgconfig - xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + xmlto docbook_xml_dtd_45 + docbook_xsl findXMLCatalogs ]; + propagatedUserEnvPkgs = [ hicolor_icon_theme ]; - buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection + buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection git lgi libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence @@ -33,6 +38,13 @@ with luaPackages; stdenv.mkDerivation rec { xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon xcbutilxrm ]; + patches = [ + (fetchurl { + url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch"; + sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj"; + }) + ]; + #cmakeFlags = "-DGENERATE_MANPAGES=ON"; LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; @@ -42,6 +54,7 @@ with luaPackages; stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/awesome \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix new file mode 100644 index 000000000000..582f9cb61f8e --- /dev/null +++ b/pkgs/applications/window-managers/bevelbar/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: + +stdenv.mkDerivation rec { + name = "bevelbar-${version}"; + version = "16.11"; + + src = fetchFromGitHub { + owner = "vain"; + repo = "bevelbar"; + rev = "v${version}"; + sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm"; + }; + + buildInputs = [ libX11 libXrandr libXft ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "An X11 status bar with fancy schmancy 1985-ish beveled borders"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.neeasade ]; + }; +} diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index c11a9a539896..c2f9bec33c21 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildPhase = " make "; meta = { - homepage = "www.suckless.org"; + homepage = "http://suckless.org/"; description = "Dynamic window manager for X"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index b374c9829318..75df68427aab 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -8,11 +8,13 @@ assert gestures -> libstroke != null; stdenv.mkDerivation rec { - name = "fvwm-2.6.6"; + pname = "fvwm"; + version = "2.6.7"; + name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/${name}.tar.gz"; - sha256 = "c5de085ff25b2128a401a80225481e63335f815f84eea139f80a5f66e606dc2c"; + url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz"; + sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73"; }; buildInputs = [ @@ -26,5 +28,6 @@ stdenv.mkDerivation rec { description = "A multiple large virtual desktop window manager"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ edanaher ]; }; } diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index d32e82f100e2..83fe3ef163a3 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -1,5 +1,16 @@ -{ fetchFromGitHub, stdenv }: +{ fetchFromGitHub, stdenv, perl, makeWrapper +, iproute, acpi, sysstat, alsaUtils +, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" + "load_average" "memory" "volume" "wifi" ] +}: +with stdenv.lib; + +let + perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ]; + contains_any = l1: l2: 0 < length( intersectLists l1 l2 ); + +in stdenv.mkDerivation rec { name = "i3blocks-gaps-${version}"; version = "1.4"; @@ -14,6 +25,22 @@ stdenv.mkDerivation rec { makeFlags = "all"; installFlags = "PREFIX=\${out} VERSION=${version}"; + buildInputs = optional (contains_any scripts perlscripts) perl; + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/libexec/i3blocks/bandwidth \ + --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)} + wrapProgram $out/libexec/i3blocks/battery \ + --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} + wrapProgram $out/libexec/i3blocks/cpu_usage \ + --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} + wrapProgram $out/libexec/i3blocks/iface \ + --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)} + wrapProgram $out/libexec/i3blocks/volume \ + --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} + ''; + meta = with stdenv.lib; { description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; homepage = https://github.com/Airblader/i3blocks-gaps; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index 60f13ce440c3..88bf7762dd87 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -1,5 +1,19 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, perl, makeWrapper +, iproute, acpi, sysstat, xset, playerctl +, cmus, openvpn, lm_sensors, alsaUtils +, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" + "keyindicator" "load_average" "mediaplayer" "memory" + "openvpn" "temperature" "volume" "wifi" ] +}: +with stdenv.lib; + +let + perlscripts = [ "battery" "cpu_usage" "keyindicator" + "mediaplayer" "openvpn" "temperature" ]; + contains_any = l1: l2: 0 < length( intersectLists l1 l2 ); + +in stdenv.mkDerivation rec { name = "i3blocks-${version}"; version = "1.4"; @@ -12,7 +26,31 @@ stdenv.mkDerivation rec { buildFlags = "SYSCONFDIR=/etc all"; installFlags = "PREFIX=\${out} VERSION=${version}"; - meta = with stdenv.lib; { + buildInputs = optional (contains_any scripts perlscripts) perl; + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/libexec/i3blocks/bandwidth \ + --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)} + wrapProgram $out/libexec/i3blocks/battery \ + --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} + wrapProgram $out/libexec/i3blocks/cpu_usage \ + --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} + wrapProgram $out/libexec/i3blocks/iface \ + --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)} + wrapProgram $out/libexec/i3blocks/keyindicator \ + --prefix PATH : ${makeBinPath (optional (elem "keyindicator" scripts) xset)} + wrapProgram $out/libexec/i3blocks/mediaplayer \ + --prefix PATH : ${makeBinPath (optionals (elem "mediaplayer" scripts) [playerctl cmus])} + wrapProgram $out/libexec/i3blocks/openvpn \ + --prefix PATH : ${makeBinPath (optional (elem "openvpn" scripts) openvpn)} + wrapProgram $out/libexec/i3blocks/temperature \ + --prefix PATH : ${makeBinPath (optional (elem "temperature" scripts) lm_sensors)} + wrapProgram $out/libexec/i3blocks/volume \ + --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} + ''; + + meta = { description = "A flexible scheduler for your i3bar blocks"; homepage = https://github.com/vivien/i3blocks; license = licenses.gpl3; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index b6de07bff8ad..df7ba69c5c5f 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run, dmenu, i3status }: +, xorgserver, xvfb_run }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -30,13 +30,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - postFixup = '' - substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run - substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status" - substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run - substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status" - ''; - # Tests have been failing (at least for some people in some cases) # and have been disabled until someone wants to fix them. Some # initial digging uncovers that the tests call out to `git`, which @@ -58,6 +51,8 @@ stdenv.mkDerivation rec { done ''; + separateDebugInfo = true; + meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "http://i3wm.org"; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index dd781143d862..ade6182ec7b0 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -2,17 +2,19 @@ , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - rev = "c8e1aece7301c3c6481bf2f695734f8d273f252e"; - version = "2.7-2016-09-17"; + version = "2.9.1-c"; name = "i3lock-color-${version}"; + src = fetchFromGitHub { owner = "chrjguill"; repo = "i3lock-color"; - inherit rev; - sha256 = "07fpvwgdfxsnxnf63idrz3n1kbyayr53lsfns2q775q93cz1mfia"; + rev = version; + sha256 = "0qnw71qbppgp3ywj1k07av7wkl9syfb8j6izrkhj143q2ks4rkvl"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile ]; + makeFlags = "all"; preInstall = '' mkdir -p $out/share/man/man1 diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index d9ea14828ddd..9d7b45025654 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/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 861313431b07..ef3ad8fda251 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export cmakeFlags="-DPREFIX=$out" + export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm" ''; meta = { diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 2082f48d2577..85136cb9f97f 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1582"; + version = "1600"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "1z6cxf18n69sjd20bbyxrnd19hhy955ddvakgpfyhiprpfjkkv70"; + sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 810803866890..fec3ae631328 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,22 +1,29 @@ { stdenv, fetchurl, pkgconfig, perl, autoconf, automake , libX11, inputproto, libXt, libXpm, libXft, libXtst, xextproto, libXi -, fontconfig, freetype, readline +, libXrandr, fontconfig, freetype, readline }: stdenv.mkDerivation rec { name = "ratpoison-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://savannah/ratpoison/${name}.tar.xz"; - sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains"; + sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; }; outputs = [ "out" "contrib" "doc" "info" ]; + configureFlags = [ + # >=1.4.9 requires this even with readline in inputs + "--enable-history" + ]; + + nativeBuildInputs = [ pkgconfig autoconf automake ]; + buildInputs = - [ pkgconfig perl autoconf automake - libX11 inputproto libXt libXpm libXft libXtst xextproto libXi + [ perl + libX11 inputproto libXt libXpm libXft libXtst xextproto libXi libXrandr fontconfig freetype readline ]; postInstall = '' diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 39825e37f30f..1a3c976f77de 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { xcbutilwm ]; - sourceRoot = "spectrwm-SPECTRWM_2_7_2/linux"; + sourceRoot = let + subdir = if stdenv.isDarwin then "osx" else "linux"; + in "spectrwm-SPECTRWM_2_7_2/${subdir}"; + makeFlags="PREFIX=$(out)"; installPhase = "PREFIX=$out make install"; diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 3b5af42a8be2..1e6c3b861f1a 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stalonetray-${version}"; - version = "0.8.1"; + version = "0.8.3"; src = fetchurl { url = "mirror://sourceforge/stalonetray/${name}.tar.bz2"; - sha256 = "1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll"; + sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"; }; buildInputs = [ libX11 xproto ]; @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stand alone tray"; - maintainers = with maintainers; [ raskin ]; + homepage = http://stalonetray.sourceforge.net; + license = licenses.gpl2; platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; }; passthru = { diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 79077b477b44..ac725733d647 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,10 +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, pam, gdk_pixbuf }: let - version = "0.11"; + version = "0.13.0"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -13,18 +14,19 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv"; + 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 ]; + 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/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 296de4e1e253..146bd7e1438b 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }: stdenv.mkDerivation rec { - name = "trayer-1.1.6"; + name = "trayer-1.1.7"; - buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ]; + buildInputs = [ pkgconfig gdk_pixbuf gtk2 ]; src = fetchFromGitHub { owner = "sargon"; repo = "trayer-srg"; rev = name; - sha256 = "0mmya7a1qh3zyqgvcx5fz2lvr9n0ilr490l1j3z4myahi4snk2mg"; + sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a"; }; + preConfigure = '' + patchShebangs configure + ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix new file mode 100755 index 000000000000..d9d84e834304 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig +, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }: + +with rustPlatform; + +buildRustPackage rec { + name = "way-cooler-${version}"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "way-cooler"; + repo = "way-cooler"; + rev = "v${version}"; + sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb"; + }; + + depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc"; + + buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Customizable Wayland compositor (window manager)"; + longDescription = '' + Way Cooler is a customizable tiling window manager written in Rust + for Wayland and configurable using Lua. It is heavily inspired by + the tiling and extensibility of both i3 and awesome. While Lua is + used for the configuration, like awesome, extensions for Way Cooler + are implemented as totally separate client programs using D-Bus. + This means that you can use virtually any language to extend the + window manager, with much better guarantees about interoperability + between extensions. + ''; + homepage = http://way-cooler.org/; + license = with licenses; [ mit ]; + maintainers = [ maintainers.miltador ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index a8b5be83234e..d83c4493accb 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "windowmaker-${version}"; - version = "0.95.7"; + version = "0.95.8"; srcName = "WindowMaker-${version}"; src = fetchurl { url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz"; - sha256 = "1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4"; + sha256 = "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx"; }; nativeBuildInputs = [ pkgconfig ]; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { contributions being made by programmers from around the world. ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix new file mode 100644 index 000000000000..0ff3367e3aee --- /dev/null +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }: + +rustPlatform.buildRustPackage rec { + name = "wtftw-0.0pre20161001"; + src = fetchFromGitHub { + owner = "kintaro"; + repo = "wtftw"; + rev = "b72a1bd24430a614d953d6ecf61732805277cc0c"; + sha256 = "1ajxkncqh4azyhmsdyk07r1kbhwv81vl1ix3w4iaz8cyln4gs0kp"; + }; + + depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71"; + + buildInputs = [ libXinerama libX11 pkgconfig ]; + libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; + + preInstall = '' + cargo update + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/xsessions + cp -p target/release/wtftw $out/bin/ + echo "[Desktop Entry] + Name=wtftw + Exec=/bin/wtftw + Type=XSession + DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop + ''; + + meta = with stdenv.lib; { + description = "A tiling window manager in Rust"; + homepage = https://github.com/Kintaro/wtftw; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index 3d24f6fb4340..2b1b34429c57 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -102,8 +102,9 @@ attrsOrig @ mkdir -p "$out"/bin commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")" makeWrapper \ - "${mono}/bin/mono \"$exe\"" \ + "${mono}/bin/mono" \ "$out"/bin/"$commandName" \ + --add-flags "\"$exe\"" \ ''${makeWrapperArgs} done done diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 11f672acb9ff..833aab16ceb1 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/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 9a1897695a9d..9c228b391147 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,11 +52,12 @@ let export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' - export PKG_CONFIG_PATH=/usr/lib/pkgconfig - # Force compilers to look in default search paths + # Force compilers and other tools to look in default search paths export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32' + export PKG_CONFIG_PATH=/usr/lib/pkgconfig + export ACLOCAL_PATH=/usr/share/aclocal ${profile} ''; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index dc05ec1678cb..47e2c1b904c3 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{ perl, runCommand, lib }: +{ buildPackages, runCommand, lib }: { name @@ -66,6 +66,6 @@ runCommand name passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } '' - ${perl}/bin/perl -w ${./builder.pl} + ${buildPackages.perl}/bin/perl -w ${./builder.pl} eval "$postBuild" '' diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 95c6bee3cc77..676fbd006881 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,47 +19,146 @@ 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 (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; inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; gnugrep_bin = if nativeTools then "" else gnugrep; + passthru = { - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; + 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)})) ''; }; @@ -74,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 @@ -87,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' @@ -113,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 @@ -157,140 +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 + echo ${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 '' - + 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 default_cxx_stdlib_compile="${ - if stdenv.isLinux && !(cc.isGNU or false) - then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" - else "" - }" + 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 000000000000..05b9c62b1e8d --- /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 aba5f3295a98..87e48da9c8d5 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -24,25 +24,17 @@ badPath() { } expandResponseParams() { - local inparams=("$@") - local n=0 - local p - params=() - while [ $n -lt ${#inparams[*]} ]; do - p=${inparams[n]} - case $p in - @*) - if [ -e "${p:1}" ]; then - args=$(<"${p:1}") - eval 'for arg in '${args//$/\\$}'; do params+=("$arg"); done' - else - params+=("$p") - fi - ;; - *) - params+=("$p") - ;; - esac - n=$((n + 1)) + 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 27575053954f..0d02897da74a 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 @@ -82,7 +82,7 @@ rec { export PATH=${shadow}/bin:$PATH mkdir -p /etc/pam.d if [[ ! -f /etc/passwd ]]; then - echo "root:x:0:0::/root:/bin/sh" > /etc/passwd + echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd echo "root:!x:::::::" > /etc/shadow fi if [[ ! -f /etc/group ]]; then @@ -209,7 +209,7 @@ rec { postMount = '' echo "Packing raw image..." - tar -C mnt --mtime=0 -cf $out . + tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $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 ]; } '' @@ -247,12 +246,14 @@ rec { echo "Adding contents..." for item in $contents; do echo "Adding $item" - rsync -ak $item/ layer/ + rsync -ak --chown=0:0 $item/ layer/ done else 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=0 -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..." @@ -310,8 +311,10 @@ rec { echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." - rsync -ak $item/ layer/ + rsync -ak --chown=0:0 $item/ layer/ done + + chmod ug+w layer ''; postMount = '' @@ -340,7 +343,7 @@ rec { echo "Packing layer..." mkdir $out - tar -C layer --mtime=0 -cf $out/layer.tar . + tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . # Compute the tar checksum and add it to the output json. echo "Computing checksum..." @@ -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 @@ -405,8 +409,9 @@ rec { }; result = runCommand "docker-image-${baseName}.tar.gz" { buildInputs = [ jshon pigz coreutils findutils ]; - imageName = name; - imageTag = tag; + # Image name and tag must be lowercase + imageName = lib.toLower name; + imageTag = lib.toLower tag; inherit fromImage baseJson; layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; @@ -467,7 +472,8 @@ rec { comm <(sort -n baseFiles|uniq) \ <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles # Append the new files to the layer. - tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles + tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \ + --owner=0 --group=0 --no-recursion --files-from newFiles echo "Adding meta..." @@ -496,7 +502,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --mtime=0 -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/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 05b4a9b4f2d2..49cbb7a98175 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -83,16 +83,12 @@ rec { }; # 4. example of pulling an image. could be used as a base for other images - # - # ***** Currently broken, getting 404s. Perhaps the docker API has changed? - # - # - # debian = pullImage { - # imageName = "debian"; - # imageTag = "jessie"; - # # this hash will need change if the tag is updated at docker hub - # sha256 = "18kd495lc2k35h03bpcbdjnix17nlqbwf6nmq3sb161blf0dk14q"; - # }; + nix = pullImage { + imageName = "nixos/nix"; + imageTag = "1.11"; + # this hash will need change if the tag is updated at docker hub + sha256 = "1gk4bq05vl3rj3mh4mlbl4iicgndmimlv8jvkhdk4hrv0r44bwr3"; + }; # 5. example of multiple contents, emacs and vi happily coexisting editors = buildImage { diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix index 0e1b147f6e18..5ccd0a41c5e4 100644 --- a/pkgs/build-support/docker/pull.nix +++ b/pkgs/build-support/docker/pull.nix @@ -1,41 +1,32 @@ -{ stdenv, lib, curl, jshon, python, runCommand }: - -# Inspired and simplified version of fetchurl. +{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }: +let + nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; +in # For simplicity we only support sha256. +{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}" +, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }: +let + pullImage = vmTools.runInLinuxVM ( + stdenv.mkDerivation { + inherit name imageId; -# Currently only registry v1 is supported, compatible with Docker Hub. + certs = "${cacert}/etc/ssl/certs/ca-bundle.crt"; -{ imageName, imageTag ? "latest", imageId ? null -, sha256, name ? "${imageName}-${imageTag}" -, indexUrl ? "https://index.docker.io" -, registryVersion ? "v1" -, curlOpts ? "" }: + builder = ./pull.sh; -assert registryVersion == "v1"; + buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; -let layer = stdenv.mkDerivation { - inherit name imageName imageTag imageId - indexUrl registryVersion curlOpts; + outputHashAlgo = "sha256"; + outputHash = sha256; - builder = ./pull.sh; - detjson = ./detjson.py; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; - buildInputs = [ curl jshon python ]; + preVM = vmTools.createEmptyImage { + size = 2048; + fullName = "${name}-disk"; + }; - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = "recursive"; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - # This variable allows the user to pass additional options to curl - "NIX_CURL_FLAGS" - ]; - - # Doing the download on a remote machine just duplicates network - # traffic, so don't do that. - preferLocalBuild = true; -}; - -in runCommand "${name}.tar.gz" {} '' - tar -C ${layer} -czf $out . -'' + QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0"; + }); +in + pullImage diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh index 7ba146e9de09..db643f5e88e5 100644 --- a/pkgs/build-support/docker/pull.sh +++ b/pkgs/build-support/docker/pull.sh @@ -1,86 +1,36 @@ -# Reference: docker src contrib/download-frozen-image.sh - source $stdenv/setup -# Curl flags to handle redirects, not use EPSV, handle cookies for -# servers to need them during redirects, and work on SSL without a -# certificate (this isn't a security problem because we check the -# cryptographic hash of the output anyway). -curl=$(command -v curl) -curl() { - [[ -n ${token:-} ]] && set -- -H "Authorization: Token $token" "$@" - $curl \ - --location --max-redirs 20 \ - --retry 3 \ - --fail \ - --disable-epsv \ - --cookie-jar cookies \ - --insecure \ - $curlOpts \ - $NIX_CURL_FLAGS \ - "$@" -} +mkdir -p /var/lib/docker +mkfs.ext4 /dev/vda +mount -t ext4 /dev/vda /var/lib/docker -fetchLayer() { - local url="$1" - local dest="$2" - local curlexit=18; +modprobe virtio_net +dhclient eth0 - # if we get error code 18, resume partial download - while [ $curlexit -eq 18 ]; do - # keep this inside an if statement, since on failure it doesn't abort the script - if curl -C - "$url" --output "$dest"; then - return 0 - else - curlexit=$?; - fi - done +mkdir -p /etc/ssl/certs/ +cp "$certs" "/etc/ssl/certs/" - return $curlexit -} - -headers=$(curl -o /dev/null -D- -H 'X-Docker-Token: true' \ - "$indexUrl/$registryVersion/repositories/$imageName/images") - -header() { - grep $1 <<< "$headers" | tr -d '\r' | cut -d ' ' -f 2 -} - -# this only takes the first endpoint, more may be provided -# https://docs.docker.com/v1.6/reference/api/docker-io_api/ -if ! registryUrl=$(header X-Docker-Endpoints); then - echo "error: index returned no endpoint" - exit 1 -fi -baseUrl="https://$registryUrl/$registryVersion" - -token="$(header X-Docker-Token || true)"; - -if [ -z "$imageId" ]; then - imageId="$(curl "$baseUrl/repositories/$imageName/tags/$imageTag")" - imageId="${imageId//\"/}" - if [ -z "$imageId" ]; then - echo "error: no image ID found for ${imageName}:${imageTag}" - exit 1 +# from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount +mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup +cd /sys/fs/cgroup +for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do + mkdir -p $sys + if ! mountpoint -q $sys; then + if ! mount -n -t cgroup -o $sys cgroup $sys; then + rmdir $sys || true fi - - echo "found image ${imageName}:${imageTag}@$imageId" -fi - -mkdir -p $out - -jshon -n object \ - -n object -s "$imageId" -i "$imageTag" \ - -i "$imageName" > $out/repositories - -curl "$baseUrl/images/$imageId/ancestry" -o ancestry.json - -layerIds=$(jshon -a -u < ancestry.json) -for layerId in $layerIds; do - echo "fetching layer $layerId" - - mkdir "$out/$layerId" - echo '1.0' > "$out/$layerId/VERSION" - curl "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json" - fetchLayer "$baseUrl/images/$layerId/layer" "$out/$layerId/layer.tar" + fi done + +# run docker daemon +dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock & + +until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do + printf '.' + sleep 1 +done + +rm -r $out + +docker pull ${imageId} +docker save ${imageId} > $out diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 1cbac0709a66..75e660d02143 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -3,7 +3,7 @@ { lib, writeText, inherit-local }: -{ +rec { withPackages = pkgs: let extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); in writeText "dir-locals.el" '' @@ -39,6 +39,8 @@ (make-local-variable 'process-environment) (put 'process-environment 'permanent-local t) (inherit-local 'process-environment) + ; setenv modifies in place, so copy the environment first + (setq process-environment (copy-tree process-environment)) (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) @@ -47,4 +49,28 @@ ${lib.concatStringsSep "\n" extras} ''; + # nix-buffer function for a project with a bunch of haskell packages + # in one directory + haskellMonoRepo = { project-root # The monorepo root + , haskellPackages # The composed haskell packages set that contains all of the packages + }: { root }: + let # The haskell paths. + haskell-paths = lib.filesystem.haskellPathsInDir project-root; + # Find the haskell package that the 'root' is in, if any. + haskell-path-parent = + let filtered = builtins.filter (name: + lib.hasPrefix (toString (project-root + "/${name}")) (toString root) + ) (builtins.attrNames haskell-paths); + in + if filtered == [] then null else builtins.head filtered; + # We're in the directory of a haskell package + is-haskell-package = haskell-path-parent != null; + haskell-package = haskellPackages.${haskell-path-parent}; + # GHC environment with all needed deps for the haskell package + haskell-package-env = + builtins.head haskell-package.env.nativeBuildInputs; + in + if is-haskell-package + then withPackages [ haskell-package-env ] + else {}; } diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/build-support/emacs/elpa2nix.el index 7eef81b9e7ab..64587c0fad1a 100644 --- a/pkgs/build-support/emacs/elpa2nix.el +++ b/pkgs/build-support/emacs/elpa2nix.el @@ -28,3 +28,6 @@ The file can either be a tar file or an Emacs Lisp file." (insert-file-contents file)) (when is-tar (tar-mode)) (elpa2nix-install-from-buffer)))) + +;; Allow installing package tarfiles larger than 10MB +(setq large-file-warning-threshold nil) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index b13def07bb88..e41b1fd6a215 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -21,7 +21,7 @@ set which contains `emacsWithPackages`. For example, to override `emacsPackagesNg.emacsWithPackages`, ``` let customEmacsPackages = - emacsPackagesNg.override (super: self: { + emacsPackagesNg.overrideScope (super: self: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit @@ -115,6 +115,19 @@ EOF --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" done + # Wrap MacOS app + # this has to pick up resources and metadata + # to recognize it as an "app" + if [ -d "$emacs/Applications/Emacs.app" ]; then + mkdir -p $out/Applications/Emacs.app/Contents/MacOS + cp -r $emacs/Applications/Emacs.app/Contents/Info.plist \ + $emacs/Applications/Emacs.app/Contents/PkgInfo \ + $emacs/Applications/Emacs.app/Contents/Resources \ + $out/Applications/Emacs.app/Contents + makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \ + --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" + fi + mkdir -p $out/share # Link icons and desktop files into place for dir in applications icons info man; do diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 3c2e0524eea5..2df1b136c559 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,13 +1,19 @@ -{stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: +{stdenv, darcs, nix, cacert}: +{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: + +if md5 != "" then + throw "fetchdarcs does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = "fetchdarcs"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; builder = ./builder.sh; buildInputs = [darcs]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; - + outputHash = sha256; + inherit url rev context; } diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix index 3e0d5d566ad7..41d2c936e01e 100644 --- a/pkgs/build-support/fetchegg/default.nix +++ b/pkgs/build-support/fetchegg/default.nix @@ -4,14 +4,17 @@ { stdenv, chicken }: { name, version, md5 ? "", sha256 ? "" }: +if md5 != "" then + throw "fetchegg does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = "chicken-${name}-export"; builder = ./builder.sh; buildInputs = [ chicken ]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; + outputHash = sha256; inherit version; diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 4bbef1d6e62a..6ae46469738a 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -12,4 +12,5 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${fetchSubmodules:+--fetch-submodules} \ ${branchName:+--branch-name "$branchName"} +runHook postFetch stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index e40b460d390a..8e060b87ebd3 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; @@ -15,6 +16,9 @@ in , fetchSubmodules ? true, deepClone ? false , branchName ? null , name ? urlToName url rev +, # Shell code executed after the file has been fetched + # successfully. This can do things like check or transform the file. + postFetch ? "" }: /* NOTE: @@ -39,20 +43,22 @@ in server admins start using the new version? */ -assert md5 != "" || sha256 != ""; assert deepClone -> leaveDotGit; +if md5 != "" then + throw "fetchgit does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { inherit name; builder = ./builder.sh; fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. buildInputs = [git]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; + outputHash = sha256; - inherit url rev leaveDotGit fetchSubmodules deepClone branchName; + inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix new file mode 100644 index 000000000000..90005b545692 --- /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 3d656eba5fff..a180509a3265 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/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix index c72bbec66321..ea91a0854d16 100644 --- a/pkgs/build-support/fetchgx/default.nix +++ b/pkgs/build-support/fetchgx/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildPhase = '' export GOPATH=$(pwd)/vendor - mkdir vendor + mkdir -p vendor gx install ''; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 79f610166a79..aba12317963a 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,5 +1,8 @@ {stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: +if md5 != null then + throw "fetchhg does not support md5 anymore, please use sha256" +else # TODO: statically check if mercurial as the https support if the url starts woth https. stdenv.mkDerivation { name = "hg-archive" + (if name != null then "-${name}" else ""); @@ -8,14 +11,11 @@ stdenv.mkDerivation { impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; - # Nix <= 0.7 compatibility. - id = md5; - subrepoClause = if fetchSubrepos then "S" else ""; - outputHashAlgo = if md5 != null then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if md5 != null then md5 else sha256; + outputHash = sha256; inherit url rev; preferLocalBuild = true; diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 95bb7b7cd8da..62b700dd81b5 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -8,9 +8,12 @@ attrs @ , md5 ? "" , ... }: +if md5 != "" then + throw "fetchnuget does not support md5 anymore, please use sha256" +else buildDotnetPackage ({ src = fetchurl { - inherit url sha256 md5; + inherit url sha256; name = "${baseName}.${version}.zip"; }; diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix new file mode 100644 index 000000000000..8c55db5372d9 --- /dev/null +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -0,0 +1,73 @@ +{ stdenv, git, gitRepo, gnupg ? null, cacert, copyPathsToStore }: + +{ name, manifest, rev ? "HEAD", sha256, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "" +, localManifests ? [], createMirror ? false, useArchive ? !createMirror +}: + +assert repoRepoRev != "" -> repoRepoURL != ""; +assert createMirror -> !useArchive; + +with stdenv.lib; + +let + repoInitFlags = [ + "--manifest-url=${manifest}" + "--manifest-branch=${rev}" + "--depth=1" + #TODO: fetching clone.bundle seems to fail spectacularly inside a sandbox. + "--no-clone-bundle" + (optionalString createMirror "--mirror") + (optionalString useArchive "--archive") + (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") + (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") + (optionalString (referenceDir != "") "--reference=${referenceDir}") + ]; + + local_manifests = copyPathsToStore localManifests; + +in + +with stdenv.lib; + +let + extraRepoInitFlags = [ + (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") + (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") + (optionalString (referenceDir != "") "--reference=${referenceDir}") + ]; +in + +stdenv.mkDerivation { + buildCommand = '' + mkdir .repo + ${optionalString (local_manifests != []) '' + mkdir ./.repo/local_manifests + for local_manifest in ${concatMapStringsSep " " toString local_manifests} + + do + cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName) + done + ''} + + export HOME=.repo + repo init ${concatStringsSep " " repoInitFlags} + + repo sync --jobs=$NIX_BUILD_CORES --current-branch + ${optionalString (!createMirror) "rm -rf $out/.repo"} + ''; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; + + buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + preferLocalBuild = true; + enableParallelBuilding = true; + inherit name cacert manifest rev repoRepoURL repoRepoRev referenceDir; +} diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix new file mode 100644 index 000000000000..a5cdbd150b8b --- /dev/null +++ b/pkgs/build-support/fetchs3/default.nix @@ -0,0 +1,29 @@ +{ stdenv, runCommand, awscli }: + +{ s3url +, sha256 +, region ? "us-east-1" +, credentials ? null # Default to looking at local EC2 metadata service +, executable ? false +, recursiveHash ? false +, postFetch ? null +}: + +let + credentialAttrs = stdenv.lib.optionalAttrs (credentials != null) { + AWS_ACCESS_KEY_ID = credentials.access_key_id; + AWS_SECRET_ACCESS_KEY = credentials.secret_access_key; + AWS_SESSION_TOKEN = credentials.session_token ? null; + }; +in runCommand "foo" ({ + buildInputs = [ awscli ]; + outputHashAlgo = "sha256"; + outputHash = sha256; + outputHashMode = if recursiveHash then "recursive" else "flat"; +} // credentialAttrs) (if postFetch != null then '' + downloadedFile="$(mktemp)" + aws s3 cp ${s3url} $downloadedFile + ${postFetch} +'' else '' + aws s3 cp ${s3url} $out +'') diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index 3ab6e730a51b..8ed30b37fc7f 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -18,11 +18,16 @@ if test -n "$http_proxy"; then export HOME="$PWD" fi; +if test -z "$LC_ALL"; then + export LC_ALL="en_US.UTF-8" +fi; + # Pipe the "p" character into Subversion to force it to accept the # server's certificate. This is perfectly safe: we don't care # whether the server is being spoofed --- only the cryptographic # hash of the output matters. Pass in extra p's to handle redirects. -printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive ${ignoreExternals:+--ignore-externals} \ +printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive \ + ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \ -r "$rev" "$url" "$out" stopNest diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 85ec52c4bde0..8a1085affd3c 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,5 +1,6 @@ -{stdenv, subversion, sshSupport ? false, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}: +{stdenv, subversion, glibcLocales, sshSupport ? false, openssh ? null}: +{url, rev ? "HEAD", md5 ? "", sha256 ? "", + ignoreExternals ? false, ignoreKeywords ? false, name ? null}: let repoName = with stdenv.lib; @@ -7,7 +8,9 @@ let fst = head; snd = l: head (tail l); trd = l: head (tail (tail l)); - path_ = reverseList (splitString "/" url); + path_ = + (p: if head p == "" then tail p else p) # ~ drop final slash if any + (reverseList (splitString "/" url)); path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_); in # ../repo/trunk -> repo @@ -22,16 +25,19 @@ let name_ = if name == null then "${repoName}-r${toString rev}" else name; in +if md5 != "" then + throw "fetchsvn does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = name_; builder = ./builder.sh; - buildInputs = [subversion]; + buildInputs = [ subversion glibcLocales ]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; - - inherit url rev sshSupport openssh ignoreExternals; + outputHash = sha256; + + inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; preferLocalBuild = true; diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index 6c6c03d68732..a6f3d3469f09 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,16 +1,20 @@ {stdenv, subversion, sshSupport ? false, openssh ? null, expect}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: + +if md5 != "" then + throw "fetchsvnssh does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = "svn-export-ssh"; builder = ./builder.sh; buildInputs = [subversion expect]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; - + outputHash = sha256; + sshSubversion = ./sshsubversion.exp; - + inherit username password url rev sshSupport openssh; } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 00f485ce6975..5811950bf053 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -59,6 +59,13 @@ in , recursiveHash ? false +, # Shell code to build a netrc file for BASIC auth + netrcPhase ? null + +, # Impure env vars (http://nixos.org/nix/manual/#sec-advanced-attributes) + # needed for netrcPhase + netrcImpureEnvVars ? [] + , # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. postFetch ? "" @@ -87,12 +94,14 @@ assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; let hasHash = showURLs || (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != "" || sha512 != ""; + || sha1 != "" || sha256 != "" || sha512 != ""; urls_ = if urls != [] then urls else [url]; in -if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else stdenv.mkDerivation { +if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512" +else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" +else stdenv.mkDerivation { name = if showURLs then "urls" else if name != "" then name @@ -110,17 +119,24 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s # New-style output content requirements. outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else "sha1"; outputHash = if outputHash != "" then outputHash else - if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + if sha512 != "" then sha512 else if sha256 != "" then sha256 else sha1; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; - inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp executable; + inherit curlOpts showURLs mirrorsFile postFetch downloadToTemp executable; + + impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; # Doing the download on a remote machine just duplicates network # traffic, so don't do that. preferLocalBuild = true; + postHook = if netrcPhase == null then null else '' + ${netrcPhase} + curlOpts="$curlOpts --netrc-file $PWD/netrc" + ''; + inherit meta; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 1dfe968f129e..41bfc84c247b 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -141,9 +141,11 @@ rec { http://bitlbee.intergenia.de/ ]; - # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php. + # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php imagemagick = [ - http://www.imagemagick.org/download/ + https://www.imagemagick.org/download/ + https://mirror.checkdomain.de/imagemagick/ + https://ftp.nluug.nl/ImageMagick/ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ ftp://ftp.imagemagick.org/pub/ImageMagick/ diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 1145d32ba022..751dba56930e 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 9ff4522e800b..000000000000 --- 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 b729144b8601..000000000000 --- 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 505d80a6b2ac..000000000000 --- 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 c15777144e11..000000000000 --- 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 226fad833599..000000000000 --- 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 599954bd127d..000000000000 --- 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 753b3772e956..000000000000 --- 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/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index a87c726e0a8b..a37d94c36e06 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/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix deleted file mode 100644 index ccd46e20654f..000000000000 --- a/pkgs/build-support/grsecurity/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv -, lib -, overrideDerivation - -# required for gcc plugins -, gmp, libmpc, mpfr - -# the base kernel -, kernel - -, grsecPatch -, kernelPatches ? [] - -, localver ? "-grsec" -, modDirVersion ? "${kernel.version}${localver}" -, extraConfig ? "" -, ... -} @ args: - -assert (kernel.version == grsecPatch.kver); - -overrideDerivation (kernel.override { - inherit modDirVersion; - kernelPatches = lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or [])); - extraConfig = '' - GRKERNSEC y - PAX y - ${extraConfig} - ''; - ignoreConfigErrors = true; -}) (attrs: { - nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); - preConfigure = '' - echo ${localver} >localversion-grsec - ${attrs.preConfigure or ""} - ''; -}) diff --git a/pkgs/build-support/kde/derivation.nix b/pkgs/build-support/kde/derivation.nix deleted file mode 100644 index 2e29a0a661e1..000000000000 --- a/pkgs/build-support/kde/derivation.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, lib, debug ? false }: - -args: - -stdenv.mkDerivation (args // { - - outputs = args.outputs or [ "out" "dev" ]; - - propagatedUserEnvPkgs = - builtins.map lib.getBin (args.propagatedBuildInputs or []); - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - -}) diff --git a/pkgs/build-support/kde/wrapper.nix b/pkgs/build-support/kde/wrapper.nix deleted file mode 100644 index f5add12e8eca..000000000000 --- a/pkgs/build-support/kde/wrapper.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, lib, makeWrapper, buildEnv }: - -packages: - -let - packages_ = if builtins.isList packages then packages else [packages]; - - unwrapped = lib.concatMap (p: if builtins.isList p.unwrapped then p.unwrapped else [p.unwrapped]) packages_; - targets = lib.concatMap (p: p.targets) packages_; - paths = lib.concatMap (p: p.paths or []) packages_; - - name = - if builtins.length unwrapped == 1 - then (lib.head unwrapped).name - else "kde-application"; - meta = - if builtins.length unwrapped == 1 - then (lib.head unwrapped).meta - else {}; - - env = buildEnv { - inherit name meta; - paths = builtins.map lib.getBin (unwrapped ++ paths); - pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ]; - }; -in - -stdenv.mkDerivation { - inherit name meta; - preferLocalBuild = true; - - inherit unwrapped env targets; - - passthru = { - inherit targets paths; - unwrapped = if builtins.length unwrapped == 1 then lib.head unwrapped else unwrapped; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - for t in $targets; do - good="" - for drv in $unwrapped; do - if [ -a "$drv/$t" ]; then - makeWrapper "$drv/$t" "$out/$t" \ - --argv0 '"$0"' \ - --suffix PATH : "$env/bin" \ - --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \ - --prefix XDG_DATA_DIRS : "$env/share" \ - --set QML_IMPORT_PATH "$env/lib/qt5/imports" \ - --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \ - --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" - good="1" - break - fi - done - if [ -z "$good" ]; then - echo "file or directory not found in derivations: $t" - exit 1 - fi - done - - mkdir -p "$out/nix-support" - echo "$unwrapped" > "$out/nix-support/propagated-user-env-packages" - ''; -} diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 092ab4586b38..70727f9b49dc 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/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index ed0d5b0043d5..d1e8f77fb1f6 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -47,6 +47,7 @@ static void init() static const char * rewrite(const char * path, char * buf) { + if (path == NULL) return path; for (int n = 0; n < nrRedirects; ++n) { int len = strlen(from[n]); if (strncmp(path, from[n], len) != 0) continue; diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index fad6f00d8211..da1d4105c89f 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/plugins.nix b/pkgs/build-support/plugins.nix new file mode 100644 index 000000000000..bf8a982a88f9 --- /dev/null +++ b/pkgs/build-support/plugins.nix @@ -0,0 +1,29 @@ +{ stdenv }: +# helper functions for packaging programs with plugin systems +{ + + /* Takes a list of expected plugin names + * and compares it to the found plugins given in the file, + * one plugin per line. + * If the lists differ, the build fails with a nice message. + * + * This is helpful to ensure maintainers don’t miss + * the addition or removal of a plugin. + */ + diffPlugins = expectedPlugins: foundPluginsFilePath: '' + # sort both lists first + plugins_expected=$(mktemp) + (${stdenv.lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \ + | sort -u > "$plugins_expected" + plugins_found=$(mktemp) + sort -u "${foundPluginsFilePath}" > "$plugins_found" + + if ! mismatches="$(diff -y "$plugins_expected" "$plugins_found")"; then + echo "The the list of expected plugins (left side) doesn't match" \ + "the list of plugins we found (right side):" >&2 + echo "$mismatches" >&2 + exit 1 + fi + ''; + +} diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index c77db30a81ce..5ab24132290a 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation ( mkdir -p $out/bin cat >> $out/bin/${w.name} < "$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 a69ef5c6b07f..36130289fbaa 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 @@ -7,9 +12,12 @@ , buildInputs ? [] , cargoUpdateHook ? "" , cargoDepsHook ? "" +, cargoBuildFlags ? [] , ... } @ args: let + lib = stdenv.lib; + fetchDeps = import ./fetchcargo.nix { inherit stdenv cacert git rust rustRegistry; }; @@ -26,14 +34,18 @@ in stdenv.mkDerivation (args // { buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs; - configurePhase = args.configurePhase or "true"; + configurePhase = args.configurePhase or '' + runHook preConfigure + # noop + runHook postConfigure + ''; postUnpack = '' eval "$cargoDepsHook" echo "Using cargo deps from $cargoDeps" - cp -r "$cargoDeps" deps + cp -a "$cargoDeps" deps chmod +w deps -R # It's OK to use /dev/null as the URL because by the time we do this, cargo @@ -92,22 +104,26 @@ in stdenv.mkDerivation (args // { ) '' + (args.prePatch or ""); - buildPhase = args.buildPhase or '' - echo "Running cargo build --release" - cargo build --release + buildPhase = with builtins; args.buildPhase or '' + runHook preBuild + echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}" + cargo build --release ${concatStringsSep " " cargoBuildFlags} + runHook postBuild ''; checkPhase = args.checkPhase or '' + runHook preCheck echo "Running cargo test" cargo test + runHook postCheck ''; doCheck = args.doCheck or true; installPhase = args.installPhase or '' + runHook preInstall mkdir -p $out/bin - for f in $(find target/release -maxdepth 1 -type f); do - cp $f $out/bin - done; + find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \; + runHook postInstall ''; }) diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index 54593994990f..3c7e034364f4 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -1,3 +1,18 @@ +# copied from libgit2 source code 'repo-template.h' +makeGitTemplate() { + local target="$1" + mkdir -p -m777 "$target/info" "$target/pack" "$target/objects" "$target/refs" + mkdir -p -m777 "$target/refs/heads" "$target/refs/tags" "$target/objects/info" "$target/objects/pack" + cat <<'EOF' > "$target/description" +Unnamed repository; edit this file 'description' to name the repository. +EOF + chmod 666 "$target/description" + cat <<'EOF' > "$target/info/exclude" +# File patterns to ignore; see `git help ignore` for more information. +# Lines that start with '#' are comments. +EOF +} + fetchCargoDeps() { src=$(realpath $1) out=$(realpath $2) @@ -6,6 +21,23 @@ fetchCargoDeps() { mkdir $out + # Configure git template dir to make libgit2 more deterministic + # + # Without a template dir, libgit2 defaults to /usr/share/git-core/templates, + # which can vary between systems if sandboxed builds aren't used. + # + # Note: we explictly set --tmpdir for mktemp here to make it more friendly + # for nix-shell users, where $TMPDIR is not necessarily set to NIX_BUILD_TOP + echo "Setting up git templatedir" + export GIT_TEMPLATE_DIR="$(mktemp -d --tmpdir=$NIX_BUILD_TOP git-template.XXX)" + makeGitTemplate "$GIT_TEMPLATE_DIR" + export XDG_CONFIG_HOME="$(mktemp -d --tmpdir=$NIX_BUILD_TOP home.XXX)" + mkdir -p $XDG_CONFIG_HOME/git + cat < $XDG_CONFIG_HOME/git/config +[init] + templatedir = $GIT_TEMPLATE_DIR +EOF + # Configure cargo to fetch from a local copy of the crates.io registry echo "Using rust registry from $rustRegistry" @@ -116,7 +148,7 @@ EOF cd "$out/git/checkouts/$name/$branch" rev="$(git rev-parse HEAD)" - revs="$revs $rev" + revs="$rev $revs" done < <(find . -type d -name .git -print) echo "List of revs to keep for git db $name: $revs" @@ -147,7 +179,7 @@ EOF done # Create ad-hoc branches for the revs we need - echo "$revs" | tr " " "\n" | while read -d " " rev; do + echo "$revs" | while read -d " " rev; do echo "Creating git branch b_$rev $rev" git branch b_$rev $rev done diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh new file mode 100644 index 000000000000..ffaa61f2d809 --- /dev/null +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -0,0 +1,41 @@ +# Check whether RPATHs or wrapper scripts contain references to +# $TMPDIR. This is a serious security bug because it allows any user +# to inject files into search paths of other users' processes. +# +# It might be better to have Nix scan build output for any occurrence +# of $TMPDIR (which would also be good for reproducibility), but at +# the moment that would produce too many spurious errors (e.g. debug +# info or assertion messages that refer to $TMPDIR). + +fixupOutputHooks+=('if [ -z "$noAuditTmpdir" -a -e "$prefix" ]; then auditTmpdir "$prefix"; fi') + +auditTmpdir() { + local dir="$1" + [ -e "$dir" ] || return 0 + + header "checking for references to $TMPDIR in $dir..." + + local i + while IFS= read -r -d $'\0' i; do + if [[ "$i" =~ .build-id ]]; then continue; fi + + if isELF "$i"; then + if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR"; then + echo "RPATH of binary $i contains a forbidden reference to $TMPDIR" + exit 1 + fi + fi + + if isScript "$i"; then + if [ -e "$(dirname $i)/.$(basename $i)-wrapped" ]; then + if grep -q -F "$TMPDIR" "$i"; then + echo "wrapper script $i contains a forbidden reference to $TMPDIR" + exit 1 + fi + fi + fi + + done < <(find "$dir" -type f -print0) + + stopNest +} diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh new file mode 100644 index 000000000000..e3a08b2598d9 --- /dev/null +++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh @@ -0,0 +1,31 @@ +# On Mac OS X, frameworks are linked to the system CoreFoundation but +# dynamic libraries built with nix use a pure version of CF this +# causes segfaults for binaries that depend on it at runtime. This +# can be solved in two ways. +# 1. Rewrite references to the pure CF using this setup hook, this +# works for the simple case but this can still cause problems if other +# dependencies (eg. python) use the pure CF. +# 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to +# /System/Library/Frameworks. This will make everything load the +# system's CoreFoundation framework while still keeping the +# dependencies pure for other packages. + +fixupOutputHooks+=('fixDarwinFrameworksIn $prefix') + +fixDarwinFrameworks() { + local systemPrefix='/System/Library/Frameworks' + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + + for framework in $(otool -L "$fn" | awk '/CoreFoundation\.framework/ {print $1}'); do + install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2 + done + done +} + +fixDarwinFrameworksIn() { + local dir="$1" + fixDarwinFrameworks $(find "$dir" -name "*.dylib") +} diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 4f55493ae483..eebde886a884 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -19,98 +19,100 @@ # are read first and used as VALS # --suffix-contents makeWrapper() { - local original=$1 - local wrapper=$2 + local original="$1" + local wrapper="$2" local params varName value command separator n fileNames - local argv0 flagsBefore flags extraFlagsArray + local argv0 flagsBefore flags - mkdir -p "$(dirname $wrapper)" + mkdir -p "$(dirname "$wrapper")" - echo "#! $SHELL -e" > $wrapper + echo "#! $SHELL -e" > "$wrapper" params=("$@") for ((n = 2; n < ${#params[*]}; n += 1)); do - p=${params[$n]} + p="${params[$n]}" if test "$p" = "--set"; then - varName=${params[$((n + 1))]} - value=${params[$((n + 2))]} + varName="${params[$((n + 1))]}" + value="${params[$((n + 2))]}" n=$((n + 2)) - echo "export $varName=\"$value\"" >> $wrapper + echo "export $varName=\"$value\"" >> "$wrapper" fi if test "$p" = "--unset"; then - varName=${params[$((n + 1))]} + varName="${params[$((n + 1))]}" n=$((n + 1)) echo "unset $varName" >> "$wrapper" fi if test "$p" = "--run"; then - command=${params[$((n + 1))]} + command="${params[$((n + 1))]}" n=$((n + 1)) - echo "$command" >> $wrapper + echo "$command" >> "$wrapper" fi if test "$p" = "--suffix" -o "$p" = "--prefix"; then - varName=${params[$((n + 1))]} - separator=${params[$((n + 2))]} - value=${params[$((n + 3))]} + varName="${params[$((n + 1))]}" + separator="${params[$((n + 2))]}" + value="${params[$((n + 3))]}" n=$((n + 3)) if test -n "$value"; then if test "$p" = "--suffix"; then - echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper + echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper" else - echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper + echo "export $varName=$value\${$varName:+$separator}\$$varName" >> "$wrapper" fi fi fi if test "$p" = "--suffix-each"; then - varName=${params[$((n + 1))]} - separator=${params[$((n + 2))]} - values=${params[$((n + 3))]} + varName="${params[$((n + 1))]}" + separator="${params[$((n + 2))]}" + values="${params[$((n + 3))]}" n=$((n + 3)) for value in $values; do - echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper + echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper" done fi if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then - varName=${params[$((n + 1))]} - separator=${params[$((n + 2))]} - fileNames=${params[$((n + 3))]} + varName="${params[$((n + 1))]}" + separator="${params[$((n + 2))]}" + fileNames="${params[$((n + 3))]}" n=$((n + 3)) for fileName in $fileNames; do if test "$p" = "--suffix-contents"; then - echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper + echo "export $varName=\$$varName\${$varName:+$separator}$(cat "$fileName")" >> "$wrapper" else - echo "export $varName=$(cat $fileName)\${$varName:+$separator}\$$varName" >> $wrapper + echo "export $varName=$(cat "$fileName")\${$varName:+$separator}\$$varName" >> "$wrapper" fi done fi if test "$p" = "--add-flags"; then - flags=${params[$((n + 1))]} + flags="${params[$((n + 1))]}" n=$((n + 1)) flagsBefore="$flagsBefore $flags" fi if test "$p" = "--argv0"; then - argv0=${params[$((n + 1))]} + argv0="${params[$((n + 1))]}" n=$((n + 1)) fi done # Note: extraFlagsArray is an array containing additional flags # that may be set by --run actions. - echo exec ${argv0:+-a $argv0} "$original" \ - $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper + # Silence warning about unexpanded extraFlagsArray: + # shellcheck disable=SC2016 + echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \ + "$flagsBefore" '"${extraFlagsArray[@]}"' '"$@"' >> "$wrapper" - chmod +x $wrapper + chmod +x "$wrapper" } addSuffix() { - suffix=$1 + suffix="$1" shift for name in "$@"; do echo "$name$suffix" @@ -128,7 +130,13 @@ filterExisting() { # Syntax: wrapProgram wrapProgram() { local prog="$1" - local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped - mv $prog $hidden - makeWrapper $hidden $prog --argv0 '"$0"' "$@" + local hidden + hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped + while [ -e "$hidden" ]; do + hidden="${hidden}_" + done + mv "$prog" "$hidden" + # Silence warning about unexpanded $0: + # shellcheck disable=SC2016 + makeWrapper "$hidden" "$prog" --argv0 '$0' "$@" } diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index eafc770a8e17..62a6491b8dc0 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -61,7 +61,7 @@ _multioutConfig() { local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")" fi # PACKAGE_TARNAME sometimes contains garbage. - if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z-_0-9]'; then + if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')" fi fi diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 6860c9b9cb9a..0bf37e10d870 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -30,7 +30,7 @@ stripDirs() { if [ -n "${dirs}" ]; then header "stripping (with flags $stripFlags) in$dirs" - find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true + find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags 2>/dev/null || true stopNest fi } diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index 634a9d18f00d..9658b9f82595 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/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 3cad1838d260..9891128a6231 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -35,10 +35,16 @@ wrapGAppsHook() { gappsWrapperArgs+=(--prefix $v : "$dummy") done - if [ -z "$dontWrapGApps" ]; then - for i in $prefix/bin/* $prefix/libexec/*; do - echo "Wrapping app $i" - wrapProgram "$i" "${gappsWrapperArgs[@]}" + if [[ -z "$dontWrapGApps" ]]; then + targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) + for targetDir in "${targetDirs[@]}"; do + if [[ -d "${targetDir}" ]]; then + find "${targetDir}" -type f -executable -print0 \ + | while IFS= read -r -d '' file; do + echo "Wrapping program ${file}" + wrapProgram "${file}" "${gappsWrapperArgs[@]}" + done + fi done fi } diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix new file mode 100644 index 000000000000..4fa2f42c39dc --- /dev/null +++ b/pkgs/build-support/setup-systemd-units.nix @@ -0,0 +1,83 @@ +# | Build a script to install and start a set of systemd units on any +# systemd-based system. +# +# Creates a symlink at /etc/systemd-static/${namespace} for slightly +# improved atomicity. +{ writeScriptBin +, bash +, coreutils +, systemd +, runCommand +, lib +}: + { units # : AttrSet String (Either Path { path : Path, wanted-by : [ String ] }) + # ^ A set whose names are unit names and values are + # either paths to the corresponding unit files or a set + # containing the path and the list of units this unit + # should be wanted-by (none by default). + # + # The names should include the unit suffix + # (e.g. ".service") + , namespace # : String + # The namespace for the unit files, to allow for + # multiple independent unit sets managed by + # `setupSystemdUnits`. + }: + let static = runCommand "systemd-static" {} + '' + mkdir -p $out + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (nm: file: + "ln -sv ${file.path or file} $out/${nm}" + ) units)} + ''; + add-unit-snippet = name: file: + '' + oldUnit=$(readlink -f "$unitDir/${name}" || echo "$unitDir/${name}") + if [ -f "$oldUnit" -a "$oldUnit" != "${file.path or file}" ]; then + unitsToStop+=("${name}") + fi + ln -sf "/etc/systemd-static/${namespace}/${name}" \ + "$unitDir/.${name}.tmp" + mv -T "$unitDir/.${name}.tmp" "$unitDir/${name}" + ${lib.concatStringsSep "\n" (map (unit: + '' + mkdir -p "$unitDir/${unit}.wants" + ln -sf "../${name}" \ + "$unitDir/${unit}.wants/.${name}.tmp" + mv -T "$unitDir/${unit}.wants/.${name}.tmp" \ + "$unitDir/${unit}.wants/${name}" + '' + ) file.wanted-by or [])} + unitsToStart+=("${name}") + ''; + in + writeScriptBin "setup-systemd-units" + '' + #!${bash}/bin/bash -e + export PATH=${coreutils}/bin:${systemd}/bin + + unitDir=/etc/systemd/system + if [ ! -w "$unitDir" ]; then + unitDir=/etc/systemd-mutable/system + mkdir -p "$unitDir" + fi + declare -a unitsToStop unitsToStart + + oldStatic=$(readlink -f /etc/systemd-static/${namespace} || true) + if [ "$oldStatic" != "${static}" ]; then + ${lib.concatStringsSep "\n" + (lib.mapAttrsToList add-unit-snippet units)} + if [ ''${#unitsToStop[@]} -ne 0 ]; then + echo "Stopping unit(s) ''${unitsToStop[@]}" >&2 + systemctl stop "''${unitsToStop[@]}" + fi + mkdir -p /etc/systemd-static + ln -sfT ${static} /etc/systemd-static/.${namespace}.tmp + mv -T /etc/systemd-static/.${namespace}.tmp /etc/systemd-static/${namespace} + systemctl daemon-reload + echo "Starting unit(s) ''${unitsToStart[@]}" >&2 + systemctl start "''${unitsToStart[@]}" + else + echo "Units unchanged, doing nothing" >&2 + fi + '' diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 1529869aa331..4debd9636396 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -71,7 +71,7 @@ rec { '' mkdir -p $out for i in $paths; do - ${lndir}/bin/lndir $i $out + ${lndir}/bin/lndir -silent $i $out done ${postBuild} ''; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 19a3f24a470d..d5cfc419fc72 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1954,22 +1954,22 @@ rec { }; debian8i386 = { - name = "debian-8.7-jessie-i386"; - fullName = "Debian 8.7 Jessie (i386)"; + name = "debian-8.8-jessie-i386"; + fullName = "Debian 8.8 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "71cacb934dc4ab2e67a5ed215ccbc9836cf8d95687edec7e7fe8d3916e3b3fe8"; + sha256 = "79dbf81e9698913c577333f47f5a56be78529fba265ec492880e8c369c478b58"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.7-jessie-amd64"; - fullName = "Debian 8.7 Jessie (amd64)"; + name = "debian-8.8-jessie-amd64"; + fullName = "Debian 8.8 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "b4cfbaaef31f05ce1726d00f0a173f5b6f33a9192513302319a49848884a17f3"; + sha256 = "845fc80c9934d8c0f78ada6455c81c331a3359ef15c4c036b47e742fb1bb99c6"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 9009702113ea..17803a28330f 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -185,7 +185,7 @@ let MONITOR_SOCKET="$(pwd)/monitor" WINVM_PIDFILE="$(pwd)/winvm.pid" CTRLVM_PIDFILE="$(pwd)/ctrlvm.pid" - ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" & + ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" --dirmode 0700 & echo 'alive?' | ${socat}/bin/socat - \ UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20 ''; diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index c668e7569a44..f15752199822 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -1,3 +1,4 @@ +#note: the hardcoded /bin/sh is required for the VM's cygwin shell pkgs: let diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index cb7f23f7480a..b260c67ca7c6 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, coreutils, gawk, gnused, nix }: +{ stdenv, makeWrapper, coreutils, gawk, gnused, diffutils, nix }: stdenv.mkDerivation { name = "common-updater-scripts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp ${./scripts}/* $out/bin for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix ]} + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix diffutils ]} done ''; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 52227e9b2ba5..6ced5785ecfb 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.09"; + version = "4.11"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1740gq9sq28dp5a5sjn1ya7cvrv8mbky6knb7734v8k29a7a0x55"; + sha256 = "097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix index 8053020a3f27..bd38389eb47e 100644 --- a/pkgs/data/documentation/rnrs/common.nix +++ b/pkgs/data/documentation/rnrs/common.nix @@ -24,5 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://swiss.csail.mit.edu/~jaffer/Scheme; + + broken = true; }; } diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 25a99789af50..36416c6f827c 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase -, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }: +, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmake }: stdenv.mkDerivation rec { version = "0.3.1"; @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "14ld7zm15677jdlasnfa6c42kiswd4d6yg1db50xbk2yflzzwqqa"; }; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive qmakeHook + xcbutilkeysyms qtbase qtimageformats qtwebkit qtx11extras libarchive ]; qmakeFlags = [ "PREFIX=/" ]; diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix new file mode 100644 index 000000000000..b392ac79b2da --- /dev/null +++ b/pkgs/data/fonts/arphic/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchurl, mkfontscale, mkfontdir }: + +{ + arphic-ukai = stdenv.mkDerivation rec { + name = "arphic-ukai-${version}"; + + version = "0.2.20080216.2"; + + src = fetchurl { + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; + sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml"; + }; + + buildInputs = [ mkfontscale mkfontdir ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = "CJK Unicode font Kai style"; + homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; + }; + + arphic-uming = stdenv.mkDerivation rec { + name = "arphic-uming-${version}"; + + version = "0.2.20080216.2"; + + src = fetchurl { + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; + sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3"; + }; + + buildInputs = [ mkfontscale mkfontdir ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = "CJK Unicode font Ming style"; + homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; + }; +} diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix new file mode 100644 index 000000000000..16534d4d6cbe --- /dev/null +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "babelstone-han-${version}"; + version = "9.0.2"; + + src = fetchurl { + url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip"; + sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Unicode CJK font with over 32600 Han characters"; + homepage = http://www.babelstone.co.uk/Fonts/Han.html; + + license = licenses.free; + platforms = platforms.all; + hydraPlatforms = []; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index a8b2b786efaf..31c89215ea77 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "https://dl.dropbox.com/u/56493902/loudifier/comicrelief.zip"; + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch"; }; diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index 8051606632df..fd32f478b715 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "Droid Family fonts by Google Android"; - homepage = [ https://github.com/google/fonts ]; + homepage = "https://github.com/google/fonts"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix new file mode 100644 index 000000000000..4082d5949a3f --- /dev/null +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "emacs-all-the-icons-fonts-${version}"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "domtronn"; + repo = "all-the-icons.el"; + rev = version; + sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/all-the-icons + for font in $src/fonts/*.ttf; do cp $font $out/share/fonts/all-the-icons; done + ''; + + meta = with stdenv.lib; { + description = "Icon fonts for emacs all-the-icons"; + longDescription = '' + The emacs package all-the-icons provides icons to improve + presentation of information in emacs. This package provides + the fonts needed to make the package work properly. + ''; + homepage = https://github.com/domtronn/all-the-icons.el; + + /* + The fonts come under a mixture of licenses - the MIT license, + SIL OFL license, and Apache license v2.0. See the GitHub page + for further information. + */ + license = licenses.free; + platforms = platforms.all; + maintainers = with maintainers; [ rlupton20 ]; + }; +} diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index e19734c19136..d0bf8d34714f 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source emoji set"; homepage = "http://emojione.com/"; - licenses = licenses.cc-by-40; + license = licenses.cc-by-40; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix new file mode 100644 index 000000000000..203b68f5e5d2 --- /dev/null +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, mkfontdir, mkfontscale }: + +stdenv.mkDerivation rec { + name = "envypn-font-1.7.1"; + + src = fetchurl { + url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz"; + sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; + }; + + buildInputs = [ mkfontdir mkfontscale ]; + + unpackPhase = '' + tar -xzf $src --strip-components=1 + ''; + + installPhase = '' + # install the pcf fonts (for xorg applications) + fontDir="$out/share/fonts/envypn" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = '' + Readable bitmap font inspired by Envy Code R + ''; + homepage = "http://ywstd.fr/p/pj/#envypn"; + license = licenses.miros; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix new file mode 100644 index 000000000000..e8868764271c --- /dev/null +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -0,0 +1,24 @@ +{ stdenv, runCommand, fetchurl, unzip }: + +runCommand "fira-code-symbols-20160811" { + src = fetchurl { + url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + sha256 = "01sk8cmm50xg2vwf0ff212yi5gd2sxcb5l4i9g004alfrp7qaqxg"; + }; + buildInputs = [ unzip ]; + + meta = with stdenv.lib; { + description = "FiraCode unicode ligature glyphs in private use area"; + longDescription = '' + FiraCode uses ligatures, which some editors don’t support. + This addition adds them as glyphs to the private unicode use area. + See https://github.com/tonsky/FiraCode/issues/211. + ''; + license = licenses.ofl; + maintainers = [ maintainers.profpatsch ]; + homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; + }; +} '' + mkdir -p $out/share/fonts/opentype + unzip "$src" -d $out/share/fonts/opentype +'' diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix new file mode 100644 index 000000000000..360cacb551d7 --- /dev/null +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +let version = "0.3.5"; in +stdenv.mkDerivation { + name = "fontconfig-penultimate-${version}"; + + src = fetchFromGitHub { + owner = "ttuegel"; + repo = "fontconfig-penultimate"; + rev = version; + sha256 = "1xi664bs6n687s972nch87hi0iqkd6gr1l76zl58pymiw2132ks8"; + }; + + installPhase = '' + mkdir -p $out/etc/fonts/conf.d + cp *.conf $out/etc/fonts/conf.d + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ttuegel/fontconfig-penultimate; + description = "Sensible defaults for Fontconfig"; + license = licenses.asl20; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index df96241542de..0c9dfa40982f 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "go-font-${version}"; - version = "2016-11-17"; + version = "2017-03-30"; src = fetchgit { url = "https://go.googlesource.com/image"; - rev = "d2f07f8aaaa906f1a64eee0e327fc681cdb2944f"; - sha256 = "1kmsipa4cyrwx86acc695c281hchrz9k9ni8r7giyggvdi577iga"; + rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc"; + sha256 = "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d"; }; installPhase = '' diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index fd3425e3c7c3..de281c278e62 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/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index 670cb2317b48..e7445186b729 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inconsolata-lgc-${version}"; - version = "git-2015-04-18"; + version = "1.3"; src = fetchFromGitHub { owner = "MihailJP"; repo = "Inconsolata-LGC"; - rev = "30bbc1bd82502bf76f1cc5553f17388da2ba20e7"; - sha256 = "02af2gpksdxdp7zfh5qhgfqzc6gvah9v4ph818irwhs9gcq8833c"; + rev = "8adfef7a7316fcd2e9a5857054c7cdb2babeb35d"; + sha256 = "0dqjj3mlc28s8ljnph6l086b4j9r5dly4fldq59crycwys72zzai"; }; buildInputs = [ fontforge ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; - meta = { + meta = with stdenv.lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' Inconsolata is one of the most suitable font for programmers created by Raph @@ -50,11 +50,9 @@ stdenv.mkDerivation rec { ''; # See `License.txt' for details. - license = stdenv.lib.licenses.ofl; + license = licenses.ofl; homepage = https://github.com/MihailJP/Inconsolata-LGC; - maintainers = [ - stdenv.lib.maintainers.avnik - ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ avnik rht ]; + platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index cbd963e903df..053a3ae76c1d 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.4.2"; + version = "1.13.1"; - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v${version}"; - sha256 = "1h1lmvjpjk0238bhdhnv2c149s98qpbndc8rxzlk6bhmxcy6rwsk"; + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; + sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i"; }; + sourceRoot = "."; + installPhase = '' fontdir=$out/share/fonts/iosevka diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix new file mode 100644 index 000000000000..5e9a2c219167 --- /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/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix new file mode 100644 index 000000000000..074fceeac94a --- /dev/null +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, fontforge, pythonFull }: + +stdenv.mkDerivation rec { + name = "rictydiminished-with-firacode-${version}"; + version = "0.0.1"; + src = fetchgit { + url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; + rev = "refs/tags/${version}"; + sha256 = "12lhb0k4d8p4lzw9k6hlsxpfpc15zfshz1h5cbaa88sb8n5jh360"; + fetchSubmodules = true; + }; + + buildPhase = '' + make + ''; + + installPhase = '' + mkdir -p $out/share/fonts/rictydiminished-with-firacode + cp *.ttf $out/share/fonts/rictydiminished-with-firacode + ''; + + nativeBuildInputs = [ + fontforge + (pythonFull.withPackages (ps: [ + ps.jinja2 + ps."3to2" + ps.fonttools + ])) + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode; + description = "The best Japanese programming font meets the awesone ligatures of Firacode"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ mt-caret ]; + }; +} + diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix new file mode 100644 index 000000000000..942a284e2c0d --- /dev/null +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "2016-03-03"; + name = "shrikhand-${version}"; + + src = fetchFromGitHub { + owner = "jonpinhorn"; + repo = "shrikhand"; + rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394"; + sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk"; + }; + + installPhase = '' + install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf + ''; + + meta = with stdenv.lib; { + homepage = https://jonpinhorn.github.io/shrikhand/; + description = "A vibrant and playful typeface for both Latin and Gujarati writing systems"; + maintainers = with maintainers; [ sternenseemann ]; + platforms = platforms.all; + license = licenses.ofl; + }; +} diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix index 11132710a905..240f0ff5d290 100644 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -23,10 +23,11 @@ let ''; meta = { - description = "${language} subset of an open source Pan-CJK typeface"; + description = "${language} subset of an open source Pan-CJK sans-serif typeface"; homepage = https://github.com/adobe-fonts/source-han-sans; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; }; }; in diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix new file mode 100644 index 000000000000..148f5a4538f5 --- /dev/null +++ b/pkgs/data/fonts/source-han-serif/default.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, unzip}: + +let + makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + version = "1.000R"; + name = "source-han-serif-${variant}-${version}"; + revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; + inherit sha256; + }; + + setSourceRoot = '' + sourceRoot=$( echo SourceHanSerif* ) + ''; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp $( find . -name '*.otf' ) $out/share/fonts/opentype + ''; + + meta = { + description = "${language} subset of an open source Pan-CJK serif typeface"; + homepage = https://github.com/adobe-fonts/source-han-sans; + license = stdenv.lib.licenses.ofl; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + }; +in +{ + japanese = makePackage { + variant = "japanese"; + language = "Japanese"; + region = "JP"; + sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7"; + }; + korean = makePackage { + variant = "korean"; + language = "Korean"; + region = "KR"; + sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r"; + }; + simplified-chinese = makePackage { + variant = "simplified-chinese"; + language = "Simplified Chinese"; + region = "CN"; + sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43"; + }; + traditional-chinese = makePackage { + variant = "traditional-chinese"; + language = "Traditional Chinese"; + region = "TW"; + sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h"; + }; +} diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index e9adc4c0422b..01959f91195f 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 29c4c250fb96..c1ee2250c9a2 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 000000000000..8db10d7f582c --- /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 8ac65dcae359..bd99d20480bf 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/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 008a41125315..d1fa36540707 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.0.1.1"; + version = "4.1.0"; package-name = "elementary-icon-theme"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; - sha256 = "1p20569lxgkif4gzvgpisd8vg93zxd6447y634lv7ay85nq4lx76"; + sha256 = "08pkk4299dj442dby15lwxwz7bax5d3828v1f81mbll084k7vssm"; }; dontBuild = true; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 5d0893154480..083ea80a69d6 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = http://icon-theme.freedesktop.org/releases/; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 57dfe0797fac..5ac2a13be4d1 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 000000000000..082fa29fa9db --- /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/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 07c5828a9e7e..282a0dd1596a 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,26 +8,26 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2016-07-08"; + version = "2017-05-26"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" - "03rp862snj4pxpz272az2mjp0vdw9a6rzbzcml9bzwvsi1ap5sl7"; + "04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" "GeoIPv6.dat.gz" - "1s5y6r4ji1ljsl1d3w9mcqppxy2kvxjk5aq5lldbj616rbcp2v72"; + "0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz" - "07dp3wf5b6g62y6zgm9f1zfc7gn2wnss7fjdips879373kj3lgbr"; + "0bgf4kfg4mmqvgmrff27lbiglnnb3pnd7f3i4fxzl68c33bizmbm"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz" - "1y7c8f84x99dbrqij124bylddc7bmcld1xp4h3qxvmmp8ch5hcxz"; + "06slyw2644y2z5bgn4yl79aa4smf94mdcddybldh1glc3ay3p4iz"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "168z6j6adrn80sl3ip41fa0jfv2p26lfa8qil6w17sqhg8f61rnp"; + "1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "0q0vgjgxixcq5qnl5d6hxg3bpsbylmmjkhdp308vbbd68q6fws22"; + "0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index fd8b50e4c0bd..3aef8f6017b0 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 = "53fcf983669a3f0cdfd795fec28ecb40740a64ca"; - sha256 = "0jfrr6mjb3x1ybgrsinhm0nl3jmdjyf9mghpgsm75lgr83cm12a5"; + rev = "43b26c8a8f64f6caf7b4345eff0099798adcac28"; + sha256 = "1yfaxzgdrf7cifz4qq462amja2iq7r99nvpggggs8scwg4dz1i0b"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index f20b992ab727..842b031c6bed 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,18 +1,23 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iana-etc-2.30"; + name = "iana-etc-${version}"; + version = "20170512"; src = fetchurl { - url = "http://sethwklein.net/${name}.tar.bz2"; - sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr"; + url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; + sha256 = "0zx2ag894qldvrv8f4hs84644kdcp8a83gjg33xsw8rrn38gll2a"; }; - preInstall = "installFlags=\"PREFIX=$out\""; + installPhase = '' + mkdir -p $out/etc + cp services protocols $out/etc/ + ''; - meta = { - homepage = http://sethwklein.net/iana-etc; + meta = with stdenv.lib; { + homepage = https://github.com/Mic92/iana-etc; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 0c4e5bc2a134..95c66ed029ef 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.publicDomain; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix index b35a96fff82f..71fe32c10665 100644 --- a/pkgs/data/misc/nixos-artwork/default.nix +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -1,23 +1,5 @@ -{ stdenv, fetchurl }: +{ callPackage }: -stdenv.mkDerivation { - name = "nixos-artwork-2015-02-27"; - # Remember to check the default lightdm wallpaper when updating - - GnomeDark = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; - sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7"; - }; - - unpackPhase = "true"; - - installPhase = '' - mkdir -p $out/share/artwork/gnome - ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/NixOS/nixos-artwork; - platforms = platforms.all; - }; +rec { + wallpapers = callPackage ./wallpapers.nix { }; } diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix new file mode 100644 index 000000000000..cee6e600cbe0 --- /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/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix new file mode 100644 index 000000000000..254f13825abc --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -0,0 +1,100 @@ +{ stdenv, fetchurl }: + +let + mkNixBackground = { name, src, description } @ attrs: + + stdenv.mkDerivation { + inherit name src; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/share/artwork/gnome + ln -s $src $out/share/artwork/gnome/${src.name} + ''; + + meta = with stdenv.lib; { + inherit description; + homepage = https://github.com/NixOS/nixos-artwork; + license = licenses.free; + platforms = platforms.all; + }; + }; + +in + +{ + + gnome-dark = mkNixBackground { + name = "gnome-dark-2015-02-27"; + description = "Gnome Dark background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/Nix/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; + sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7"; + }; + }; + + mosaic-blue = mkNixBackground { + name = "mosaic-blue-2016-02-19"; + description = "Mosaic blue background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png; + sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5"; + }; + }; + + simple-blue = mkNixBackground { + name = "simple-blue-2016-02-19"; + description = "Simple blue background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png; + sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms"; + }; + }; + + simple-dark-gray = mkNixBackground { + name = "simple-dark-gray-2016-02-19"; + description = "Simple dark gray background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png; + sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5"; + }; + }; + + simple-light-gray = mkNixBackground { + name = "simple-light-gray-2016-02-19"; + description = "Simple light gray background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png; + sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2"; + }; + }; + + simple-red = mkNixBackground { + name = "simple-red-2016-02-19"; + description = "Simple red background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png; + sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs"; + }; + }; + + stripes-logo = mkNixBackground { + name = "stripes-logo-2016-02-19"; + description = "Stripes logo background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png; + sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl"; + }; + }; + + stripes = mkNixBackground { + name = "stripes-2016-02-19"; + description = "Stripes background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png; + sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3"; + }; + }; + +} diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index beac81051993..59f4724e1bee 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = with maintainers; [ urkud ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 831028467f42..72895653479b 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { are used by projects like KDE or Strigi. ''; platforms = platforms.all; - maintainers = [ maintainers.sander maintainers.urkud ]; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix new file mode 100644 index 000000000000..9a3db92adcc2 --- /dev/null +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, pkgconfig, xproto}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "rgb"; + version = "1.0.6"; + + src = fetchurl { + url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2"; + sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; + }; + + nativeBuildInputs = [pkgconfig]; + buildInputs = [xproto]; + meta = { + inherit version; + description = "X11 colorname to RGB mapping database"; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = http://xorg.freedesktop.org/; + }; +} diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index a955f5cf8a48..a527765688d6 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, ruby }: let @@ -10,6 +10,8 @@ let inherit sha256; }; + buildInputs = [ ruby ]; + dontBuild = true; installPhase = '' @@ -21,6 +23,9 @@ let # Backwards compatibility. Will remove eventually. mkdir -p $out/xml/xsl ln -s $dst $out/xml/xsl/docbook + + ln -sv $dst/epub/bin $out + chmod +x $out/bin/dbtoepub ''; meta = { diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 2129005ab01e..a8b5e08abd65 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -10,4 +10,5 @@ rec { econnman = callPackage ./econnman.nix { }; terminology = callPackage ./terminology.nix { }; rage = callPackage ./rage.nix { }; + ephoto = callPackage ./ephoto.nix { }; } diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 60e63dc68ed9..7739e2bd09ec 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/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 45e547f4a22a..e9302fca674b 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,12 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig +, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio +, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit +, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg +, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp +, curl, libinput, systemd, writeText +}: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.18.4"; + version = "1.19.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "09c0ajszjarcs6d62zlgnf1aha2f921mfr0gxg6nwza36xzc1srr"; + sha256 = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,18 +30,39 @@ stdenv.mkDerivation rec { libinput ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ - configureFlags = [ "--enable-sdl" "--enable-drm" "--enable-elput" "--with-opengl=full" - "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-liblz4" "--enable-systemd" - "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" - "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" - "ac_ct_CXX=foo" ]; + configureFlags = [ + "--enable-sdl" + "--enable-drm" + "--enable-elput" + "--with-opengl=full" + "--enable-image-loader-jp2k" + "--enable-xinput22" + "--enable-multisense" + "--enable-liblz4" + "--enable-systemd" + "--enable-image-loader-webp" + "--enable-harfbuzz" + "--enable-xine" + "--enable-fb" + "--disable-tslib" + "--with-systemdunitdir=$out/systemd/user" + "ac_ct_CXX=foo" + ]; patches = [ ./efl-elua.patch ]; + # bin/edje_cc creates $HOME/.run, which would break build of reverse dependencies. + setupHook = writeText "setupHook.sh" '' + export HOME="$TEMPDIR" + ''; + preConfigure = '' export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" + source "$setupHook" ''; + NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + postInstall = '' substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) @@ -48,8 +75,8 @@ stdenv.mkDerivation rec { meta = { description = "Enlightenment foundation libraries"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; }; } diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 3949bffaba17..968cf8baf6ab 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.5"; + version = "0.21.8"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "1fslq70z4s6v9ipahnk8s5fgqnqq4njv4rlqv951r1bh1xk5lx7h"; + sha256 = "0cjjiip12hd8bfjl9ccl3vzl81pxh1wpymxk2yvrzf6ap5girhps"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix new file mode 100644 index 000000000000..ee6013dae290 --- /dev/null +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "ephoto-${version}"; + version = "1.0"; + + src = fetchurl { + url = "http://www.smhouston.us/stuff/${name}.tar.gz"; + sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31"; + }; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ efl curl ]; + + NIX_CFLAGS_COMPILE = [ + "-I${efl}/include/ecore-con-1" + "-I${efl}/include/ecore-evas-1" + "-I${efl}/include/ecore-imf-1" + "-I${efl}/include/ecore-input-1" + "-I${efl}/include/eet-1" + "-I${efl}/include/eldbus-1" + "-I${efl}/include/emile-1" + "-I${efl}/include/ethumb-1" + "-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/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index a92221050580..4d102b31e3b9 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 fc36a7e7a656..5f2db064af24 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-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index d7861285cb1e..9e099a17d277 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { homepage = "http://pygtk.org/"; description = "Python wrapper for GNOME libraries"; platforms = platforms.linux; - licenses = licenses.lgpl2; + license = licenses.lgpl2; maintainers = with maintainers; [ qknight ]; }; } diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix index 87a014f8f74e..c802f9636eb1 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, libnotify, gtkspell3 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }: +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf, openldap}: let majVer = gnome3.version; @@ -24,12 +24,13 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit nss nspr libnotify procps highlight gnome3.libgweather gnome3.gsettings_desktop_schemas dconf - gnome3.libgnome_keyring gnome3.glib_networking ]; + gnome3.libgnome_keyring gnome3.glib_networking openldap ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" - "--disable-libcryptui" ]; + + configureFlags = [ "--disable-pst-import" "--disable-autoar" + "--disable-libcryptui" "--with-openldap"]; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 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 000000000000..1179b2fdc5cf --- /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 000000000000..edaa51d94784 --- /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/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix index a9bb4514a3a2..cb8bf49254ba 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 -, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen -, libusb, libarchive, acl, libgudev, qemu, libsecret +, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils +, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret +, libcap_ng, numactl, xen, libapparmor }: # TODO: ovirt (optional) @@ -15,12 +15,16 @@ stdenv.mkDerivation rec { doCheck = true; + nativeBuildInputs = [ + makeWrapper pkgconfig intltool + ]; + buildInputs = [ - makeWrapper pkgconfig intltool itstool libvirt-glib glib - gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol - libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive - librsvg desktop_file_utils acl libgudev numactl xen libsecret + itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc + libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd + tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive + gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret + libcap_ng numactl xen libapparmor ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix index ea8f15fd4e59..4f11e7a28438 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify - python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2 + python3Packages.pycairo python3Packages.dbus-python python3Packages.requests python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook gnome3.gsettings_desktop_schemas makeWrapper tracker ]; diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix index 3c3a05dc3af8..62cc4da6ba14 100644 --- a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' rm -rf "$out/locale" ''; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix index f7a0ff473cc1..15db270e80c5 100644 --- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, vala_0_32, libgtop +{ stdenv, intltool, fetchurl, vala, libgtop , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 +, bash, wrapGAppsHook, itstool, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { @@ -10,17 +10,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Baobab; diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix index 02c60256e15b..9200c4180bd2 100644 --- a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix @@ -13,11 +13,18 @@ stdenv.mkDerivation rec { sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6"; }; + outputs = [ "out" "lib" "dev" ]; + buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 intltool docbook_xsl docbook_xsl_ns makeWrapper ]; + postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace client/Makefile \ + --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1" + ''; + meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = gnome3.maintainers; }; } 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 7629e5b56550..340825cd6668 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 36572a58e17e..07997a5c095a 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/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix index a4cb3e8c1464..d3b2d814b164 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { # ToDo: ldap reported as not found but afterwards reported as supported + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/gconf/; description = "A system for storing application preferences"; diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix index 7ba3c3734f84..0d8e46aeeced 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ #./xserver_path.patch # gdm now uses wayland + patches = [ ./xserver_path.patch ./sessions_dir.patch ./gdm-x-session_extra_args.patch ./gdm-session-worker_xserver-path.patch diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix index 32d6d6e7535a..eb801caf5657 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } 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 726f47d0cde6..23d32cdbac30 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-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix index 3ea108808f50..df47c1a477b9 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper +, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook , docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { @@ -7,25 +7,18 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper + pango gcr gdk_pixbuf atk p11_kit ]; propagatedBuildInputs = [ glib libtasn1 libxslt ]; - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; + nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ]; configureFlags = [ "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; 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 85c15042614b..29f6ae3e860e 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/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix index 00999353c2fb..ff5670935bd9 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst , libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: +, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -14,15 +14,7 @@ stdenv.mkDerivation rec { libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio libcanberra_gtk3 upower colord libgweather xkeyboard_config polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; - - # FIXME: glib binaries shouldn't be in .dev! - preFixup = '' - wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib.dev}/bin" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; + libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix index aac1739a6e99..3dfbe6fbf0b5 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./nix_share_path.patch ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix index a4c46ef85d4c..05344a33025e 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, glib }: stdenv.mkDerivation rec { - name = "libcroco-0.6.11"; + name = "libcroco-0.6.12"; src = fetchurl { url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"; + sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; }; outputs = [ "out" "dev" ]; @@ -13,9 +13,13 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - buildInputs = [ pkgconfig libxml2 glib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 glib ]; meta = with stdenv.lib; { + description = "GNOME CSS2 parsing and manipulation toolkit"; + homepage = "https://git.gnome.org/browse/libcroco"; + license = licenses.lgpl2; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix index 7b49af3c50ff..d4697c99a938 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix index 9fad1873fbd6..4818d05517ba 100644 --- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare"; configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; patches = [ - #./x86.patch ./math.patch + ./x86.patch # ./math.patch ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch index a997b27540ee..93df1e7f2831 100644 --- a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch @@ -18,16 +18,3 @@ MetaRectangle unconstrained_rect; MetaRectangle constrained_rect; MetaMoveResizeResultFlags result = 0; ---- a/src/core/startup-notification.c 2016-06-06 12:13:27.100251933 +0200 -+++ b/src/core/startup-notification.c 2016-06-06 12:13:42.554956773 +0200 -@@ -418,7 +418,7 @@ - elapsed = ctod->now - timestamp; - - meta_topic (META_DEBUG_STARTUP, -- "Sequence used %ld ms vs. %d max: %s\n", -+ "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n", - elapsed, STARTUP_TIMEOUT, - meta_startup_notification_sequence_get_id (sequence)); - -[?25l[?25h[?1049h[?1h=[?25h[?25l~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [?25h[?25lType :quit to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h -[?1l>[?1049l diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix index 524813957563..bd446623fc25 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, makeWrapper +{ stdenv, fetchurl, lib, wrapGAppsHook , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup , telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = [ - makeWrapper + wrapGAppsHook pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] ++ optional gnomeKeyringSupport libgnome_keyring3 @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - wrapProgram "$out/libexec/vino-server" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix index 50aef658713a..3181348d843c 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; - configureFlags = [ "--enable-introspection" ]; + configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ]; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2; maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix index 8f525945a6af..80f2dde534ec 100644 --- a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: +, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index c6b2f1a76f50..e79b66bdedf2 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk214x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,7 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk214x; + webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; @@ -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; # }; @@ -212,6 +212,10 @@ let inherit gnome3; }; + networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { + inherit gnome3; + }; + networkmanager_l2tp = pkgs.networkmanager_l2tp.override { inherit gnome3; }; @@ -253,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 { }; @@ -264,6 +268,8 @@ let gedit = callPackage ./apps/gedit { }; + ghex = callPackage ./apps/ghex { }; + glade = callPackage ./apps/glade { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; @@ -359,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/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix index e149a0b31264..9e5d256741f6 100644 --- a/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 , wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile, libcanberra_gtk3 }: +, guile_2_0, libcanberra_gtk3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-card-theme-formats=svg" ]; buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ]; + librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Aisleriot; 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 d27e10f104c3..69d89bd58795 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/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix index 8d9ee143ac2b..b3646abd6dda 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix @@ -20,12 +20,11 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ shared_mime_info gnome3.gnome_themes_standard ]; - buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - librsvg libsecret dconf - gobjectIntrospection gnome3.adwaita-icon-theme ]; + buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas + librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ]; # https://bugzilla.gnome.org/show_bug.cgi?id=758240 preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix index bc9e517aceb8..5a78b8d0ca6b 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gitg-3.22.0"; + name = "gitg-3.23.90"; src = fetchurl { - url = mirror://gnome/sources/gitg/3.22/gitg-3.22.0.tar.xz; - sha256 = "ba6895f85c18748294075980a5e03e0936ad4e84534dbb0d8f9e29aa874ddeaf"; + url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz; + sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix index fbb95efb27ac..3024d3ed59ff 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig glib gtk3 enchant isocodes ]; + buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix index 248e39151524..850e13fb011e 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix @@ -1,10 +1,10 @@ fetchurl: rec { - major = "1.0"; - minor = "3"; + major = "1.2"; + minor = "1"; name = "gspell-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; - sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr"; + sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix index 6922a7aee1bc..b9abde42cbda 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix @@ -1,12 +1,12 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - major = "0.24"; - minor = "4"; + major = "0.25"; + minor = "0"; name = "libgit2-glib-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz"; - sha256 = "0802qskm64l5ic8rvfjxg27chj502irhw1xkabrl4015dxsiy89s"; + sha256 = "0rf5gcr3khp35wj9ax9cbyq5j3iiwa1l0fi16w6sfgmrryd6n9aa"; }; } 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 000000000000..d556c5e55ca4 --- /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/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix new file mode 100644 index 000000000000..8a99932e8307 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -0,0 +1,31 @@ +{stdenv, lib, python, dbus, fetchgit, cmake, coreutils, jq, gobjectIntrospection, python27Packages, makeWrapper, gnome3, wrapGAppsHook}: + +stdenv.mkDerivation rec { +name="chrome-gnome-shell"; + src = fetchgit { + url = "git://git.gnome.org/chrome-gnome-shell"; + rev = "7d99523e90805cb65027cc2f5f1191a957dcf276"; + sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc"; + }; + + buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection + python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook]; + + preConfigure = '' + mkdir build usr etc + cd build + ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../ + substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc" + ''; + + postInstall = '' + rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json + rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json + wrapProgram $out/usr/bin/chrome-gnome-shell \ + --prefix PATH '"${dbus}/bin/dbus:$PATH"' \ + --prefix PATH '"${gnome3.gnome_shell}:$PATH"' \ + --prefix PYTHONPATH : "$PYTHONPATH" + + ''; + +} diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix new file mode 100644 index 000000000000..4d5b29f6cc61 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, glib, gettext }: + +stdenv.mkDerivation rec { + name = "gnome-shell-dash-to-dock-${version}"; + version = "v57"; + + src = fetchFromGitHub { + owner = "micheleg"; + repo = "dash-to-dock"; + rev = "97f6a0bb95b9f87d7a34a074c9b3624b65111794"; + sha256 = "0b9i89hpn9k63zcrbl4bhs7qfb70wh09870fwv2ik7hajm64kynn"; + }; + + nativeBuildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "A dock for the Gnome Shell"; + license = licenses.gpl2; + maintainers = with maintainers; [ eperuffo ]; + homepage = https://micheleg.github.io/dash-to-dock/; + }; +} 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 000000000000..4aedc10e056a --- /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/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 8e11a2862841..6678b11df023 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -5,6 +5,7 @@ , x11 , freetype , pkgconfig +, libXmu }: let version = "0.25.0"; @@ -15,7 +16,7 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; }; - buildInputs = [ cairo base gui freetype pkgconfig x11 ]; + buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix index 67fffd10a0f4..210b72292fd6 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/desktops/gnustep/gworkspace/default.nix @@ -4,13 +4,13 @@ , system_preferences }: let - version = "0.9.3"; + version = "0.9.4"; in gsmakeDerivation { name = "gworkspace-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz"; - sha256 = "0jchqwb0dj522j98jqlqlib44jppax39zx2zqyzdwiz4qjl470r3"; + sha256 = "0cjn83m7qmbwdpldlyhs239nwswgip3yaz01ahls130dq5qq7hgk"; }; # additional dependencies: # - PDFKit framework from http://gap.nongnu.org/ diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index a05e6d0c62a2..401069785763 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -10,7 +10,6 @@ hashes=builtins.listToAttrs[ {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";} {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";} {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";} - {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";} {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";} ]; versions=builtins.listToAttrs[ @@ -26,7 +25,6 @@ versions=builtins.listToAttrs[ {name="libkexiv2";value="4.14.3";} {name="marble";value="4.14.3";} {name="okular";value="4.14.3";} - {name="pykde4";value="4.14.3";} {name="svgpart";value="4.14.3";} ]; modules=[ @@ -62,13 +60,6 @@ modules=[ { name="marble"; } ]; } -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="pykde4"; } - ]; -} { module="kde-baseapps"; sane="kde_baseapps"; split=true; diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch b/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch deleted file mode 100644 index 27925a3e3548..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0ed8c85dd15fb18a902b22a7555ba4f7cf01cb - -Patch created by: Erik Zeek - -See also: https://bugs.gentoo.org/show_bug.cgi?id=567022 - ---- a/CMakeLists.txt -+++ a/CMakeLists.txt -@@ -166,7 +166,7 @@ add_sip_python_module(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${Q - - file(GLOB kio_files_sip sip/kio/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kio_files_sip}) --add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) -+add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) - - file(GLOB kutils_files_sip sip/kutils/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kutils_files_sip}) -@@ -190,7 +190,7 @@ add_sip_python_module(PyKDE4.knewstuff sip/knewstuff/knewstuffmod.sip ${KDE4_KNE - - file(GLOB dnssd_files_sip sip/dnssd/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${dnssd_files_sip}) --add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY}) -+add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - - file(GLOB phonon_files_sip sip/phonon/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${phonon_files_sip}) - diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix deleted file mode 100644 index 48d457e10a7f..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies, - polkit_qt4, boost, lndir, pkgconfig }: - -let - inherit (pythonPackages) python pyqt4; - pydir = "lib/python${python.majorVersion}"; -in kde { - - patches = [ ./pykde4-gcc-5.patch ]; - - # todo: polkit isn't found by the build system - - buildInputs = [ - python kdepimlibs shared_desktop_ontologies - boost polkit_qt4 - ]; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ pyqt4 ]; - - preConfigure = - '' - # Symlink PyQt into PyKDE. This is necessary because PyQt looks - # in its PyQt4/uic/widget-plugins directory for plugins, and KDE - # needs to install a plugin. - mkdir -pv $out/${pydir} - ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} - cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" ) - ''; - - meta = { - description = "Python bindings for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index 5e7643469b64..1f412d3c766e 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -1,7 +1,7 @@ { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison , kdelibs, akonadi, libxslt , shared_mime_info, shared_desktop_ontologies, qjson -, automoc4, cmake, perl +, automoc4, cmake_2_8, perl }: kde { @@ -11,7 +11,7 @@ kde { setOutputFlags = false; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ]; cmakeFlags = [ "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3" diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix index 5238744cc7b9..ecfb4913a429 100644 --- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.14/support/akonadi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "KDE PIM Storage Service"; license = "LGPL"; homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; + maintainers = [ maintainers.sander maintainers.phreedom ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 2c80f5157b66..77b47533d537 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx, - xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, 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 = [ - qmakeHook + qmake qttools ]; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras - oxygen-icons5 fluxbox xscreensaver desktop_file_utils diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index b6b63e316152..9793ff9c2502 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }: +{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { name = "lxappearance-0.6.3"; @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libX11 gtk2 ]; + buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) ]; + + patches = [ ./lxappearance-0.6.3-xdg.system.data.dirs.patch ]; + + configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; diff --git a/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch b/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch new file mode 100644 index 000000000000..a63882aa2a7a --- /dev/null +++ b/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch @@ -0,0 +1,27 @@ +--- lxappearance-0.6.3/src/widget-theme.c.orig 2016-02-20 20:48:38.000000000 -0200 ++++ lxappearance-0.6.3/src/widget-theme.c 2017-06-09 17:37:53.369555085 -0300 +@@ -66,6 +66,7 @@ + static void load_themes() + { + char* dir; ++ const gchar * const * dirs; + GSList* themes = NULL, *l; + GtkTreeIter sel_it = {0}; + GtkTreeSelection* tree_sel; +@@ -85,6 +86,16 @@ + themes = load_themes_in_dir(dir, themes); + g_free(dir); + ++ /* load from sharedata theme dirs */ ++ dirs = g_get_system_data_dirs(); ++ while (*dirs != NULL) ++ { ++ dir = g_build_filename(*dirs, "themes", NULL); ++ themes = load_themes_in_dir(dir, themes); ++ g_free(dir); ++ dirs++; ++ } ++ + themes = g_slist_sort(themes, (GCompareFunc)strcmp); + for(l = themes; l; l=l->next) + { diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix new file mode 100644 index 000000000000..a05905547fd6 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder +, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk_pixbuf +, menu-cache, lxmenu-data, wirelesstools +, supportAlsa ? false, alsaLib +}: + +stdenv.mkDerivation rec { + name = "lxpanel-0.9.3"; + + src = fetchurl { + url = "mirror://sourceforge/lxde/${name}.tar.xz"; + sha256 = "1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l"; + }; + + nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ]; + buildInputs = [ + keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk_pixbuf + menu-cache lxmenu-data m4 wirelesstools + ] ++ stdenv.lib.optional supportAlsa alsaLib; + + meta = { + description = "Lightweight X11 desktop panel for LXDE"; + homepage = "http://lxde.org/"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.ryneeverett ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index dfbd39acaa35..d2faf9c0eee4 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, standardPatch, + stdenv, fetchFromGitHub, fetchurl, standardPatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, @@ -49,6 +49,13 @@ stdenv.mkDerivation rec { lxmenu-data ]; + patches = [ + (fetchurl { + url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; + sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr"; + }) + ]; + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; postPatch = standardPatch; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index fbcb286f5b24..735ba79b405c 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -13,7 +13,7 @@ let --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \ --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \ - --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"lib/qt5/plugins" \ + --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \ --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations echo ============================ echo $file diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix new file mode 100644 index 000000000000..197c5470d2bd --- /dev/null +++ b/pkgs/desktops/mate/atril/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "atril-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.19"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0v829yvr738y5s2knyvimcgqv351qzb0rpw5il19qc27rbzyri1r"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + itstool + libsecret + libxml2 + poppler + mate.mate-desktop + ]; + + configureFlags = [ "--disable-caja" ]; + + meta = { + description = "A simple multi-page document viewer for the MATE desktop"; + homepage = "http://mate-desktop.org"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix new file mode 100644 index 000000000000..aea006fc4867 --- /dev/null +++ b/pkgs/desktops/mate/caja/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "caja-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libnotify + libxml2 + libexif + exempi + mate.mate-desktop + ]; + + configureFlags = [ "--disable-update-mimedb" ]; + + meta = { + description = "File manager for the MATE desktop"; + homepage = "http://mate-desktop.org"; + license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 4d662cf52a99..528f792a600d 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -1,5 +1,7 @@ { callPackage, pkgs }: rec { + atril = callPackage ./atril { }; + caja = callPackage ./caja { }; mate-common = callPackage ./mate-common { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index b020351afe21..7bd7a3f27701 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-common-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc"; + sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p"; }; meta = { diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index fcb66c9ad799..2afd700d9333 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,33 +1,36 @@ -{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-desktop-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; - minor-ver = "2"; + name = "mate-desktop-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g"; + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg"; }; - propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ]; - - buildInputs = with pkgs; [ - intltool - pkgconfig - - gnome3.dconf - gnome3.gtk - gnome3.defaultIconTheme + propagatedUserEnvPkgs = [ + gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ + gnome3.dconf + gnome3.gtk + gnome3.defaultIconTheme + ]; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = "http://mate-desktop.org"; - license = licenses.gpl2; - platforms = platforms.unix; + homepage = "http://mate-desktop.org"; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index d9370f318d72..3d820553b4ac 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.16"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg"; + sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index ab699c78c0ef..ce0366b36690 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; - minor-ver = "0"; + major-ver = "1.18"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n"; + sha256 = "1217nza3ilmy6x3b9i1b75lpq7lpvhs18s0c2n3j6zhxdqy61nlm"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index dd380f39477a..fd907c562806 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-terminal-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; + name = "mate-terminal-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f"; + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92"; }; - buildInputs = with pkgs; [ - intltool - pkgconfig + buildInputs = [ glib itstool libxml2 @@ -25,12 +23,16 @@ stdenv.mkDerivation rec { gnome3.dconf ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = "http://mate-desktop.org"; - license = licenses.gpl3; - platforms = platforms.unix; + homepage = "http://mate-desktop.org"; + license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 343148da0bc8..0a8b37b4e015 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -6,17 +6,15 @@ stdenv.mkDerivation rec { version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.18" = "4"; - "3.20" = "12"; - "3.22" = "3"; + "3.20" = "19"; + "3.22" = "10"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b"; - "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca"; - "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k"; + "3.20" = "11b8g374dkjhbs7x7khpriabvkip4dmfkma5myzfv6m54qlj3b8g"; + "3.22" = "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb"; }."${major-ver}"; }; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index d0e784998132..44e8a26eee15 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,17 +1,16 @@ { - plasmaPackage, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared_mime_info, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative }: -plasmaPackage { +mkDerivation { name = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; - propagatedBuildInputs = [ + buildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons ]; - propagatedUserEnvPkgs = [ bluez-qt.out ]; postInstall = '' # Fix the location of logic.js for the plasmoid ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index da0fb6f73ad7..eed396b54375 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -1,10 +1,9 @@ { - plasmaPackage + mkDerivation }: -plasmaPackage { +mkDerivation { name = "breeze-grub"; - outputs = [ "out" ]; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index 4048d98431db..cc51c4b0471c 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,11 +1,14 @@ -{ plasmaPackage -, extra-cmake-modules -, qtbase -}: +{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, }: -plasmaPackage { +let inherit (lib) getLib; in + +mkDerivation { name = "breeze-gtk"; nativeBuildInputs = [ extra-cmake-modules ]; - cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ]; buildInputs = [ qtbase ]; + postPatch = '' + sed -i cmake/FindGTKEngine.cmake \ + -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|" + ''; + cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ]; } diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index dfbdf48165aa..41a4dd66b2c8 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,14 +1,13 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, plymouth }: -plasmaPackage { +mkDerivation { name = "breeze-plymouth"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plymouth ]; - outputs = [ "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix index adcc6110c4d7..6c31398037b0 100644 --- a/pkgs/desktops/plasma-5/breeze-qt4.nix +++ b/pkgs/desktops/plasma-5/breeze-qt4.nix @@ -1,14 +1,15 @@ { - plasmaPackage, lib, + mkDerivation, lib, automoc4, cmake, perl, pkgconfig, kdelibs4, qt4, xproto }: -plasmaPackage { +mkDerivation { name = "breeze-qt4"; sname = "breeze"; buildInputs = [ kdelibs4 qt4 xproto ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + outputs = [ "out" "dev" ]; cmakeFlags = [ "-DUSE_KDE4=ON" "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index a1b64a4656cb..c0e55dec76d5 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -1,17 +1,20 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, - kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras + kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative, + qtx11extras }: -plasmaPackage { +mkDerivation { name = "breeze-qt5"; sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration - kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras + kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative + qtx11extras ]; + outputs = [ "out" "dev" "bin" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; } diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix deleted file mode 100644 index 1e9ba016c471..000000000000 --- a/pkgs/desktops/plasma-5/build-support/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kdeDerivation, lib, fetchurl }: - -let - mirror = "mirror://kde"; - srcs = import ../srcs.nix { inherit fetchurl mirror; }; -in - -args: - -let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; -in -kdeDerivation (args // { - name = "${name}-${version}"; - inherit src; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - } // (args.meta or {}); -}) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0cb25a315d6e..a592a623510f 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -25,19 +25,80 @@ existing packages here and modify it as necessary. */ { - libsForQt5, kdeDerivation, lib, fetchurl, + libsForQt5, lib, fetchurl, gconf, debug ? false, }: let + srcs = import ./srcs.nix { + inherit fetchurl; + mirror = "mirror://kde"; + }; + + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + packages = self: with self; let + + propagate = out: + let setupHook = { writeScript }: + writeScript "setup-hook" '' + if [ "$hookName" != postHook ]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@" + + 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 + ''; + in callPackage setupHook {}; + + propagateBin = propagate "bin"; + callPackage = self.newScope { - plasmaPackage = import ./build-support/package.nix { - inherit kdeDerivation lib fetchurl; - }; + mkDerivation = args: + let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + + outputs = args.outputs or [ "out" ]; + hasBin = lib.elem "bin" outputs; + hasDev = lib.elem "dev" outputs; + + defaultSetupHook = if hasBin && hasDev then propagateBin else null; + setupHook = args.setupHook or defaultSetupHook; + + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + in + mkDerivation (args // { + name = "${name}-${version}"; + inherit meta outputs setupHook src; + }); }; + in { bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; @@ -62,7 +123,7 @@ let kwayland-integration = callPackage ./kwayland-integration.nix {}; kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; - libkscreen = callPackage ./libkscreen.nix {}; + libkscreen = callPackage ./libkscreen {}; libksysguard = callPackage ./libksysguard {}; milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 7d127211956b..c1a6e8672740 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.6/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 282e58ecf9e6..ae2736fde113 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,13 +1,14 @@ -{ plasmaPackage -, extra-cmake-modules -, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel -, kwindowsystem, kxmlgui +{ + mkDerivation, + extra-cmake-modules, + boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel, + kwindowsystem, kxmlgui }: -plasmaPackage { +mkDerivation { name = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ + buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem kxmlgui ]; diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 87a46703997a..6bcafc5813a9 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,14 +1,14 @@ { - plasmaPackage, extra-cmake-modules, - kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes, - kwindowsystem, qtsvg, qtx11extras + mkDerivation, extra-cmake-modules, kdoctools, + kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, + qtsvg, qtx11extras, }: -plasmaPackage { +mkDerivation { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg + buildInputs = [ + kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index f482f2a6a3f3..38bab58c829e 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -1,25 +1,18 @@ -{ plasmaPackage -, extra-cmake-modules -, glib -, gtk2 -, gtk3 -, karchive -, kcmutils -, kconfigwidgets -, ki18n -, kiconthemes -, kio -, knewstuff +{ + mkDerivation, + extra-cmake-modules, + glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, + knewstuff }: -plasmaPackage { +mkDerivation { name = "kde-gtk-config"; - patches = [ ./0001-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ + buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes knewstuff ]; + patches = [ ./0001-follow-symlinks.patch ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 546f72c3f384..d8f996421ac9 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,7 +1,8 @@ -{ plasmaPackage, extra-cmake-modules, qtbase }: +{ mkDerivation, extra-cmake-modules, qtbase }: -plasmaPackage { +mkDerivation { name = "kdecoration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 3371e17beaf8..b9f40563ef64 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,20 +1,17 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools -, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n -, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion -, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras -, ibus +{ + mkDerivation, + extra-cmake-modules, kdoctools, + kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio, + knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, + plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, }: -plasmaPackage { +mkDerivation { name = "kdeplasma-addons"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff - kross krunner kservice ksysguard kunitconversion plasma-framework + kross krunner kservice ksysguard kunitconversion ibus plasma-framework plasma-workspace qtdeclarative qtx11extras - ibus ]; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index 965c33e6eef8..ea58cad12ae0 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,9 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support -, qtx11extras +{ + mkDerivation, + extra-cmake-modules, kdoctools, + kconfig, kconfigwidgets, ki18n, qtx11extras, }: -plasmaPackage { +mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kdelibs4support qtx11extras ]; + buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index 2b02e5916b9f..77f1002c08aa 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,14 +1,17 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils -, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui -, plasma-framework, plasma-workspace, qtx11extras -, fetchpatch +{ + mkDerivation, + extra-cmake-modules, kdoctools, + kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui, + plasma-framework, plasma-workspace, qtx11extras }: -plasmaPackage { +mkDerivation { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace - qtx11extras kcmutils kdbusaddons kxmlgui + buildInputs = [ + kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui + plasma-framework plasma-workspace qtx11extras ]; + outputs = [ "out" "dev" "bin" ]; + enableParallelBuilding = false; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index b4c8dc99adcb..d366aa4b36e4 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,15 +1,15 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid }: -plasmaPackage { +mkDerivation { name = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index a27dc5dd92a8..016ea940d99b 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -1,14 +1,14 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui, sonnet }: -plasmaPackage { +mkDerivation { name = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet ]; } diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index e0fbea5d7467..7fdaedbb78d7 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -1,13 +1,15 @@ -{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets -, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui -, libkscreen, qtdeclarative, qtgraphicaleffects +{ + mkDerivation, + extra-cmake-modules, + kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, + kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects }: -plasmaPackage { +mkDerivation { name = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig - kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui + buildInputs = [ + kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui + libkscreen qtdeclarative qtgraphicaleffects ]; } diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index 3551feab76fc..e748121132c1 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,15 +1,17 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, - kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland + kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras, + wayland, }: -plasmaPackage { +mkDerivation { name = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland - libXcursor pam plasma-framework qtdeclarative wayland + libXcursor pam plasma-framework qtdeclarative qtx11extras wayland ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index f1a6b82ae93c..39e260f6c708 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,9 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons +{ + mkDerivation, + extra-cmake-modules, kdoctools, + kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase, }: -plasmaPackage { +mkDerivation { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; + buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; } diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 366b154cae70..150b97be50d7 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -1,17 +1,16 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kdoctools, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, knewstuff, libksysguard, qtwebkit }: -plasmaPackage { +mkDerivation { name = "ksysguard"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ lm_sensors ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n qtwebkit + kdelibs4support ki18n lm_sensors qtwebkit ]; } diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 2789499c50a2..1cbfb87ea563 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,11 +1,10 @@ -{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt -}: +{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }: -plasmaPackage { +mkDerivation { name = "kwallet-pam"; - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ pam socat libgcrypt ]; - + buildInputs = [ pam socat libgcrypt qtbase ]; + postPatch = '' + sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" + ''; } diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 9045227a51a9..1344b477f736 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,16 +1,11 @@ -{ plasmaPackage -, extra-cmake-modules -, kidletime -, kwayland -, kwindowsystem +{ + mkDerivation, + extra-cmake-modules, + kidletime, kwayland, kwindowsystem, qtbase, }: -plasmaPackage { +mkDerivation { name = "kwayland-integration"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kidletime kwindowsystem kwayland - ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kidletime kwindowsystem kwayland qtbase ]; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 3555cf91e005..09708b654877 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,32 +1,45 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, - breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig, - kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, - ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, - kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, - kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative, - qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, xwayland + + epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, + xwayland, + + qtdeclarative, qtmultimedia, qtscript, qtx11extras, + + breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, + kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, + kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, + kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, + plasma-framework, }: -plasmaPackage { +mkDerivation { name = "kwin"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor + xwayland + + qtdeclarative qtmultimedia qtscript qtx11extras + + breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice - kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM - plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev - wayland xcb-util-cursor xwayland + kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework ]; + outputs = [ "out" "dev" "bin" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postPatch = '' - substituteInPlace main_wayland.cpp \ - --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland - ''; + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"'' + ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + postInstall = '' + # Some package(s) refer to these service types by the wrong name. + # I would prefer to patch those packages, but I cannot find them! + ln -s ''${!outputBin}/share/kservicetypes5/kwineffect.desktop \ + ''${!outputBin}/share/kservicetypes5/kwin-effect.desktop + ln -s ''${!outputBin}/share/kservicetypes5/kwinscript.desktop \ + ''${!outputBin}/share/kservicetypes5/kwin-script.desktop + ''; } diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch index 5fde01d08bf3..51f15c87d274 100644 --- a/pkgs/desktops/plasma-5/kwin/xwayland.patch +++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch @@ -7,7 +7,7 @@ Index: kwin-5.7.3/main_wayland.cpp m_xwaylandProcess = new Process(kwinApp()); m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); - m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); -+ m_xwaylandProcess->setProgram(QStringLiteral("@xwayland@")); ++ m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND)); QProcessEnvironment env = m_environment; env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); m_xwaylandProcess->setProcessEnvironment(env); diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 29498e93404d..f6f6187e9462 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,9 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty -, knotifications, kdbusaddons +{ + mkDerivation, + extra-cmake-modules, + kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase, }: -plasmaPackage { +mkDerivation { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ]; + buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; } diff --git a/pkgs/desktops/plasma-5/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix deleted file mode 100644 index 4e04fd5ed1d9..000000000000 --- a/pkgs/desktops/plasma-5/libkscreen.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, kwayland, libXrandr -, qtx11extras -}: - -plasmaPackage { - name = "libkscreen"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kwayland libXrandr qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix new file mode 100644 index 000000000000..b81755ed7579 --- /dev/null +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, + kwayland, libXrandr, qtx11extras +}: + +mkDerivation { + name = "libkscreen"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kwayland libXrandr qtx11extras ]; + outputs = [ "out" "dev" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" + ''; +} diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch new file mode 100644 index 000000000000..48be0d037df5 --- /dev/null +++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch @@ -0,0 +1,27 @@ +Index: libkscreen-5.9.4/src/backendmanager.cpp +=================================================================== +--- libkscreen-5.9.4.orig/src/backendmanager.cpp ++++ libkscreen-5.9.4/src/backendmanager.cpp +@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke + QFileInfoList BackendManager::listBackends() + { + // Compile a list of installed backends first +- const QString backendFilter = QStringLiteral("KSC_*"); +- const QStringList paths = QCoreApplication::libraryPaths(); +- QFileInfoList finfos; +- for (const QString &path : paths) { +- const QDir dir(path + QLatin1String("/kf5/kscreen/"), +- backendFilter, +- QDir::SortFlags(QDir::QDir::Name), +- QDir::NoDotAndDotDot | QDir::Files); +- finfos.append(dir.entryInfoList()); +- } +- return finfos; ++ const QDir dir(QLatin1String(NIXPKGS_LIBKSCREEN_BACKENDS), ++ QStringLiteral("KSC_*"), ++ QDir::SortFlags(QDir::QDir::Name), ++ QDir::NoDotAndDotDot | QDir::Files); ++ return dir.entryInfoList(); + } + + KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, diff --git a/pkgs/desktops/plasma-5/libkscreen/series b/pkgs/desktops/plasma-5/libkscreen/series new file mode 100644 index 000000000000..86bf4ab10602 --- /dev/null +++ b/pkgs/desktops/plasma-5/libkscreen/series @@ -0,0 +1 @@ +libkscreen-backends-path.patch diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index b67e041a7821..4e88cd3df0e7 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,20 +1,21 @@ { - plasmaPackage, + mkDerivation, extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras }: -plasmaPackage { +mkDerivation { name = "libksysguard"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ + buildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras qtwebkit ]; + outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 43f78d9e2a97..fa4ad3fcd296 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,15 +1,15 @@ -{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative -, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework -, krunner +{ + mkDerivation, + extra-cmake-modules, + kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework, + qtscript, qtdeclarative, }: -plasmaPackage { +mkDerivation { name = "milou"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript - kcoreaddons kservice + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons kdeclarative ki18n krunner kservice plasma-framework + qtdeclarative qtscript ]; } diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index b4ff775264f8..97421191d905 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -1,21 +1,18 @@ { - plasmaPackage, kdeWrapper, + mkDerivation, extra-cmake-modules, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, - ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras + ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative, + qtx11extras }: -let - unwrapped = plasmaPackage { - name = "oxygen"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras - ]; - }; -in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ]; +mkDerivation { + name = "oxygen"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ + frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative + qtx11extras + ]; + outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 1ac257057309..18675159df6d 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,44 +1,50 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, - attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth, - kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, - kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, - kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft, - libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework, - plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, - xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, - utillinux + + boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, + libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, + xorgserver, utillinux, + + qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras, + + attica, baloo, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons, + kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, + kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, + kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework, + plasma-workspace, }: -plasmaPackage rec { +mkDerivation rec { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff - knotifications knotifyconfig kwallet libcanberra_kde libXcursor - libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev - xf86inputsynaptics xkeyboard_config xinput baloo kactivities - kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel - ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative - qtquickcontrols qtx11extras ksysguard + boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft + libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config + + qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras + + attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons + kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels + knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker + ksysguard kwallet kwin plasma-framework plasma-workspace ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = '' - substituteInPlace kcms/dateandtime/helper.cpp \ - --subst-var hwclock "${utillinux}/sbin/hwclock" - sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ''; - NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ]; + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev xorgserver}/include/xorg" + ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"'' + ]; cmakeFlags = [ - "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" - "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg" + "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" + "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg" ]; postInstall = '' # Display ~/Desktop contents on the desktop by default. - sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ + sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/' ''; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch index 5623de84668f..a46212af10fb 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch @@ -18,7 +18,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp void ClockHelper::toHwclock() { - QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath); -+ QString hwclock = "@hwclock@"; ++ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK); if (!hwclock.isEmpty()) { KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); } diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix index 97d30dcd7732..de46bb4373c6 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration.nix @@ -1,17 +1,17 @@ -{ plasmaPackage, extra-cmake-modules -, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland -, libXcursor +{ + mkDerivation, + extra-cmake-modules, + breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, + kwayland, libXcursor }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration -plasmaPackage { +mkDerivation { name = "plasma-integration"; - nativeBuildInputs = [ - extra-cmake-modules - ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland + breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland libXcursor ]; } diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch new file mode 100644 index 000000000000..3bc871f09063 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch @@ -0,0 +1,13 @@ +diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp +index 2f11ba1d..310f11b4 100644 +--- a/vpn/openvpn/openvpnadvancedwidget.cpp ++++ b/vpn/openvpn/openvpnadvancedwidget.cpp +@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P + connect(m_ui->cmbProxyType, static_cast(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged); + + // start openVPN process and get its cipher list +- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin"); ++ const QString openVpnBinary = "@openvpn@/bin/openvpn"; + const QStringList ciphersArgs(QLatin1String("--show-ciphers")); + const QStringList versionArgs(QLatin1String("--version")); + diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index da57653bb083..cc1dcb7ee9f7 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,26 +1,31 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools -, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews -, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, mobile_broadband_provider_info -, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework -, qca-qt5, qtdeclarative, solid +{ + mkDerivation, substituteAll, + extra-cmake-modules, kdoctools, + kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, + kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, + kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, + mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt, + openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid }: -plasmaPackage { +mkDerivation { name = "plasma-nm"; - patches = [ - (substituteAll { - src = ./0001-mobile-broadband-provider-info-path.patch; - inherit mobile_broadband_provider_info; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; + buildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; + patches = [ + (substituteAll { + src = ./0001-mobile-broadband-provider-info-path.patch; + inherit mobile_broadband_provider_info; + }) + (substituteAll { + src = ./0002-openvpn-binary-path.patch; + inherit openvpn; + }) + ]; } diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index f398e1a9efc0..50f53d70a987 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,17 +1,15 @@ { - plasmaPackage, - extra-cmake-modules, - gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, - ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework + mkDerivation, + extra-cmake-modules, kdoctools, + gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, + libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative }: -plasmaPackage { +mkDerivation { name = "plasma-pa"; - nativeBuildInputs = [ - extra-cmake-modules kdoctools - ]; - propagatedBuildInputs = [ - gconf glib kconfigwidgets kcoreaddons kdeclarative - kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n + libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index 8af9caaa5795..cb068166c1d9 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,11 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -}: +{ mkDerivation , extra-cmake-modules }: -plasmaPackage { +mkDerivation { name = "plasma-workspace-wallpapers"; - outputs = [ "out" ]; - nativeBuildInputs = [ - extra-cmake-modules - ]; + nativeBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 19d530da1a60..b28a1e87fb6a 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,40 +1,47 @@ { - plasmaPackage, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, + isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland, + baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, - knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, - kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, - phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, qtscript, - qtx11extras, solid, isocodes, libdbusmenu, libSM, libXcursor, pam, wayland + knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets, + kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, + networkmanager-qt, phonon, plasma-framework, prison, solid, + + qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qtx11extras, }: -plasmaPackage { +mkDerivation { name = "plasma-workspace"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ + isocodes libdbusmenu libSM libXcursor libXtst pam wayland + baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff - knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland - kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon - plasma-framework qtgraphicaleffects qtquickcontrols qtscript qtx11extras - solid isocodes libdbusmenu libSM libXcursor pam wayland + knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets + kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard + networkmanager-qt phonon plasma-framework prison solid + + qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtx11extras ]; + outputs = [ "out" "dev" "bin" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = '' substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 $out/bin/kdostartupconfig5 + --replace kdostartupconfig5 ''${!outputBin}/bin/kdostartupconfig5 ''; postInstall = '' - rm "$out/bin/startkde" - rm "$out/bin/startplasmacompositor" - rm "$out/lib/libexec/startplasma" - rm -r "$out/share/wayland-sessions" + rm "''${!outputBin}/bin/startkde" + rm "''${!outputBin}/bin/startplasmacompositor" + rm "''${!outputLib}/lib/libexec/startplasma" + rm -r "''${!outputBin}/share/wayland-sessions" ''; } diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 1d7d20a7ffbf..bd3e5d6e1f4b 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,10 +1,10 @@ { - plasmaPackage, extra-cmake-modules, + mkDerivation, extra-cmake-modules, kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, kwidgetsaddons, kwindowsystem, polkit-qt }: -plasmaPackage { +mkDerivation { name = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index c3469cc2ebc8..65fc5446c16e 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,13 +1,15 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities -, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n -, kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt -, plasma-workspace, qtx11extras, solid, udev +{ + mkDerivation, + extra-cmake-modules, kdoctools, + bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support, + kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, + networkmanager-qt, plasma-workspace, qtx11extras, solid, udev }: -plasmaPackage { +mkDerivation { name = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen networkmanager-qt plasma-workspace qtx11extras diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index aaaea8708ae6..d1824f305279 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,323 +3,339 @@ { bluedevil = { - version = "5.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/bluedevil-5.8.6.tar.xz"; - sha256 = "0qz9v5wrx72s3r1shi3m77931kl7sx7p89dk3h9w1hy61bx0azlj"; - name = "bluedevil-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-5.8.6.tar.xz"; - sha256 = "16wxrmnlk359kapa6zj8hfcjjdffvmqc7ibzdxdd8xpdva01p7sm"; - name = "breeze-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-grub-5.8.6.tar.xz"; - sha256 = "1ywlczid32a8z4rrjxc6c3b8q3l02a3b7scbxyljgfv7xzggj1fm"; - name = "breeze-grub-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-gtk-5.8.6.tar.xz"; - sha256 = "1ppxsf868d2v9kmdz18hnbdwwqbs0xhpn7pc3bdxxj4gk87dpxpl"; - name = "breeze-gtk-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-plymouth-5.8.6.tar.xz"; - sha256 = "0cdrl0ri4b5zbld8wb3hkmsncac6qn3mswvb7zp63br3jiqfg7v8"; - name = "breeze-plymouth-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/discover-5.8.6.tar.xz"; - sha256 = "04smq3n0prs2bjq6sn5kd5mp4aay58nr2fg10yq39sgyp2qkls0r"; - name = "discover-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kactivitymanagerd-5.8.6.tar.xz"; - sha256 = "0cxpf3aj22ap6m24gm1ybjykwv10ryqhpd4bv6wr748ckj5zsgh4"; - name = "kactivitymanagerd-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kde-cli-tools-5.8.6.tar.xz"; - sha256 = "08j6mpn6g4mrdwiljfm5rqvyfjgd3wd4kpwmpmvrprqrd755m0cs"; - name = "kde-cli-tools-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kdecoration-5.8.6.tar.xz"; - sha256 = "0nbh0phgfzc5j1l1adnq3gn5fkazgk2pg2iiqjkfbax6a7r9wwny"; - name = "kdecoration-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kde-gtk-config-5.8.6.tar.xz"; - sha256 = "07in78awn7kqg47zbypj5lb2i9yibrmpzkljjy67wwcwax5zlm2d"; - name = "kde-gtk-config-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kdeplasma-addons-5.8.6.tar.xz"; - sha256 = "0yvh2n736apbfzqc5kdf3b0a9jyvlzcaamall1paa8jb8cg706px"; - name = "kdeplasma-addons-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kgamma5-5.8.6.tar.xz"; - sha256 = "1kk9bygihnggm4kmgxf1bbd0wc92ijmzvm9k5cmkm3v0pc975viz"; - name = "kgamma5-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/khotkeys-5.8.6.tar.xz"; - sha256 = "0x6z025vzpccz0yql7nafcarq6rpw3p7d7wjffdck3lym8vkalxj"; - name = "khotkeys-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kinfocenter-5.8.6.tar.xz"; - sha256 = "1d8h5h01dy7s1yaapamcz4dzf0pjdykf7jn8y34hc0djxww29k4b"; - name = "kinfocenter-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kmenuedit-5.8.6.tar.xz"; - sha256 = "0zvircfmggc4vwz6520i67s1yfv34zkx8ydj1vfhaabpsn7nqn1w"; - name = "kmenuedit-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kscreen-5.8.6.tar.xz"; - sha256 = "15k8pm1k2ylxqb3x4b75zi68firsxq56qfn39xddxnzncbsqp54r"; - name = "kscreen-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kscreenlocker-5.8.6.tar.xz"; - sha256 = "1cql5wq4zh8sdwlgwibnyyx169g79948nhdqslw08ddw61f9llgd"; - name = "kscreenlocker-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/ksshaskpass-5.8.6.tar.xz"; - sha256 = "0y912dcvdx6gih0brnxnd3cysw0rj5pw7684xswaqz5i8iimw68g"; - name = "ksshaskpass-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/ksysguard-5.8.6.tar.xz"; - sha256 = "0c0bxv5m0kziyqzwr6x46g4x2kahmq6n95kgcbihv74yvnn6v049"; - name = "ksysguard-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwallet-pam-5.8.6.tar.xz"; - sha256 = "1ii1035w8xqvkbm0ckj5iq4qq7fnbix7vyvwmdjm8m4xm0rr7g33"; - name = "kwallet-pam-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwayland-integration-5.8.6.tar.xz"; - sha256 = "0bd8hnqr6sqlzk0qrymk6jdxnl2niamb1a08m8d27qdybm0ga56v"; - name = "kwayland-integration-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwin-5.8.6.tar.xz"; - sha256 = "1p9dgh6d25h41bgnx9jiyb9qg7jyc61kbzh9j9vy9j5kd97dsjg5"; - name = "kwin-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwrited-5.8.6.tar.xz"; - sha256 = "08frbgzfzqhi4si3v024lx4dypxvm60mdz2xzyyx482iqjny97d5"; - name = "kwrited-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/libkscreen-5.8.6.tar.xz"; - sha256 = "0210lyvsk9wm7svj3bkaa9j0n57lfzs56jplasdqdia1450n7dmf"; - name = "libkscreen-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/libksysguard-5.8.6.tar.xz"; - sha256 = "0i325hzl9zsknkr1dcdg64r4msrnvbb4b9rmjysygnpyll6n9bm8"; - name = "libksysguard-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/milou-5.8.6.tar.xz"; - sha256 = "00svi7f9pa1m6gxkkf8vngyf4jzv7k88pbcnlvik38zws17j4vbs"; - name = "milou-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/oxygen-5.8.6.tar.xz"; - sha256 = "1dspmzjmymnnv6blz2sfw0ynpqbw6cqzvhlnmzakf3xq8jd99k0m"; - name = "oxygen-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-desktop-5.8.6.tar.xz"; - sha256 = "10qz1r777wr8wdr5lb7fph8ny8sxbm9vlq6njpn9rxxwr0nhlp6y"; - name = "plasma-desktop-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-integration-5.8.6.tar.xz"; - sha256 = "0v07i95xxv5rp0lis2xm0p66qicbigqjlx3sxyvcj3llf73jpcnc"; - name = "plasma-integration-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-nm-5.8.6.tar.xz"; - sha256 = "162756r2rif415w8x6x67h8bwjvvmfv56s84p7a4k5zisyr1j678"; - name = "plasma-nm-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-pa-5.8.6.tar.xz"; - sha256 = "173w2ks2nm4sp96vj3pkax1d8asshd9y39m5cwq8mgzgpz6ldjp8"; - name = "plasma-pa-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-sdk-5.8.6.tar.xz"; - sha256 = "1vadfwv23r33f5byaf3zj8m12a84r4qk24ak7qyq869m9gznyw8r"; - name = "plasma-sdk-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-tests-5.8.6.tar.xz"; - sha256 = "0baqfn861jy7kmaqka79k6nkr7vivzymk8jy3glkh21rm4yl8gvh"; - name = "plasma-tests-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-5.8.6.tar.xz"; - sha256 = "14h1lmyyb4rxnww7vyn9wnsi56v9ydhpbwmk9sv3zj1k9igqpasi"; - name = "plasma-workspace-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-wallpapers-5.8.6.tar.xz"; - sha256 = "11s2sc37xni78fyb0yvnhlkw6ahhx4pkynqr06bmd9vq6c3133id"; - name = "plasma-workspace-wallpapers-5.8.6.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.3"; + src = fetchurl { + 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.8.6"; + version = "1-5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/polkit-kde-agent-1-5.8.6.tar.xz"; - sha256 = "10bglbr7svm9bfl4a5kfyvj5zpyk46hsyh2rq9z9qy9ds76fh9w2"; - name = "polkit-kde-agent-1-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/powerdevil-5.8.6.tar.xz"; - sha256 = "0cmyx267z917qqpndpzqzlgzx1hf54430644rhr7cf9iqqilvnv4"; - name = "powerdevil-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/sddm-kcm-5.8.6.tar.xz"; - sha256 = "0xd8137pb0409vfiwv5n1vzzwa1vcvf3rgc36fid5hnlrdc15ilc"; - name = "sddm-kcm-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/systemsettings-5.8.6.tar.xz"; - sha256 = "1zy037pb8w9xbzg316hbqfmfm39aylqngb5v08yn5hcnvxcll71v"; - name = "systemsettings-5.8.6.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.8.6"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/user-manager-5.8.6.tar.xz"; - sha256 = "1z0aj5cvl5rxikbbvrvg0dq6y68jxm34ssf3gvhkd0jqlyqdl7ip"; - name = "user-manager-5.8.6.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.3"; + src = fetchurl { + 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/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix index 516d651cec25..3b04c037073d 100644 --- a/pkgs/desktops/plasma-5/startkde/default.nix +++ b/pkgs/desktops/plasma-5/startkde/default.nix @@ -1,54 +1,41 @@ { - stdenv, lib, runCommand, dbus, qttools, socat, gnugrep, gnused, kconfig, - kinit, kservice, plasma-workspace, xmessage, xprop, xsetroot, qtbase, - qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtscript, qtsvg, - qtx11extras, qtxmlpatterns + stdenv, lib, runCommand, substituteAll, dbus, gnugrep, gnused, kconfig, + kinit, kservice, plasma-desktop, plasma-workspace, xmessage, xprop, xrdb, + xsetroot, qttools, }: let - env = { + inherit (lib) getBin getLib; + + script = substituteAll { + src = ./startkde.sh; inherit (stdenv) shell; - bins = builtins.map (pkg: pkg.out or pkg) - [ - dbus qttools socat - gnugrep gnused - kconfig kinit kservice - plasma-workspace - xmessage xprop xsetroot - ]; - libs = builtins.map (pkg: pkg.out or pkg) - [ - qtbase qtdeclarative qtgraphicaleffects qtquickcontrols - qtscript qtsvg qtx11extras qtxmlpatterns - ]; + kbuildsycoca5 = "${getBin kservice}/bin/kbuildsycoca5"; + sed = "${getBin gnused}/bin/sed"; + kcheckrunning = "${getBin plasma-workspace}/bin/kcheckrunning"; + xmessage = "${getBin xmessage}/bin/xmessage"; + kstartupconfig5 = "${getBin plasma-workspace}/bin/kstartupconfig5"; + kapplymousetheme = "${getBin plasma-desktop}/bin/kapplymousetheme"; + xsetroot = "${getBin xsetroot}/bin/xsetroot"; + xrdb = "${getBin xrdb}/bin/xrdb"; + ksplashqml = "${getBin plasma-workspace}/bin/ksplashqml"; + qdbus = "${getBin qttools}/bin/qdbus"; + xprop = "${getBin xprop}/bin/xprop"; + qtpaths = "${getBin qttools}/bin/qtpaths"; + dbus_update_activation_environment = "${getBin dbus}/bin/dbus-update-activation-environment"; + start_kdeinit_wrapper = "${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper"; + kwrapper5 = "${getBin kinit}/bin/kwrapper5"; + ksmserver = "${getBin plasma-workspace}/bin/ksmserver"; + kreadconfig5 = "${getBin kconfig}/bin/kreadconfig5"; + kdeinit5_shutdown = "${getBin kinit}/bin/kdeinit5_shutdown"; }; -in runCommand "startkde" env '' +in - # Configure PATH variable - suffixPATH= - for p in $bins; do - addToSearchPath suffixPATH "$p/bin" - addToSearchPath suffixPATH "$p/lib/libexec" - addToSearchPath suffixPATH "$p/lib/libexec/kf5" - done - - # Configure Qt search paths - QT_PLUGIN_PATH= - QML_IMPORT_PATH= - QML2_IMPORT_PATH= - for p in $libs; do - addToSearchPath QT_PLUGIN_PATH "$p/lib/qt5/plugins" - addToSearchPath QML_IMPORT_PATH "$p/lib/qt5/imports" - addToSearchPath QML2_IMPORT_PATH "$p/lib/qt5/qml" - done - - substitute ${./startkde.sh} "$out" \ - --subst-var shell \ - --subst-var suffixPATH \ - --subst-var QT_PLUGIN_PATH \ - --subst-var QML_IMPORT_PATH \ - --subst-var QML2_IMPORT_PATH - chmod +x "$out" +runCommand "startkde.sh" +{ preferLocalBuild = true; allowSubstitutes = false; } +'' + cp ${script} $out + chmod +x $out '' diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh index c38450516e91..f8b4f4844e23 100755 --- a/pkgs/desktops/plasma-5/startkde/startkde.sh +++ b/pkgs/desktops/plasma-5/startkde/startkde.sh @@ -1,12 +1,6 @@ #!@shell@ -PATH="$PATH${PATH:+:}@suffixPATH@" - -export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@" -export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@" -export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@" - -kbuildsycoca5 +@kbuildsycoca5@ # Set the default GTK 2 theme if ! [ -e $HOME/.gtkrc-2.0 ] \ @@ -32,6 +26,7 @@ fi if ! [ -e $HOME/.config/gtk-3.0/settings.ini ] \ && [ -e /run/current-system/sw/share/themes/Breeze/gtk-3.0 ]; then + mkdir -p $HOME/.config/gtk-3.0 cat >$HOME/.config/gtk-3.0/settings.ini <&2 # Make sure that D-Bus is running -if qdbus >/dev/null 2>/dev/null; then +if @qdbus@ >/dev/null 2>/dev/null; then : # ok else echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" + @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" exit 1 fi @@ -274,11 +269,11 @@ fi # KDE_FULL_SESSION=true export KDE_FULL_SESSION -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 +@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 KDE_SESSION_UID=$(id -ru) export KDE_SESSION_UID @@ -300,7 +295,7 @@ export XDG_CURRENT_DESKTOP # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. -IFS=":" read -r -a scriptpath <<< $(qtpaths --paths GenericConfigLocation) +IFS=":" read -r -a scriptpath <<< $(@qtpaths@ --paths GenericConfigLocation) # Add /env/ to the directory to locate the scripts to be sourced for prefix in "${scriptpath[@]}"; do for file in "$prefix"/plasma-workspace/env/*.sh; do @@ -308,37 +303,28 @@ for prefix in "${scriptpath[@]}"; do done done -# At this point all the environment is ready, let's send it to kwalletd if running -if test -n "$PAM_KWALLET_LOGIN" ; then - env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -fi -# ...and also to kwalletd5 -if test -n "$PAM_KWALLET5_LOGIN" ; then - env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN -fi - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -dbus-update-activation-environment --systemd --all +@dbus_update_activation_environment@ --systemd --all if test $? -ne 0; then # Startup error echo 'startkde: Could not sync environment to dbus.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not sync environment to dbus." + @xmessage@ -geometry 500x100 "Could not sync environment to dbus." exit 1 fi # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true start_kdeinit_wrapper --kded +kcminit_startup +LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup if test $? -ne 0; then # Startup error echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." + @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi -qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit +@qdbus@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence @@ -355,15 +341,15 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS="" test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" -kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS +@kwrapper5@ @ksmserver@ $KDEWM $KSMSERVEROPTIONS if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation." fi -wait_drkonqi=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true) +wait_drkonqi=$(@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) if test x"$wait_drkonqi"x = x"true"x ; then # wait for remaining drkonqi instances with timeout (in seconds) @@ -374,8 +360,8 @@ if test x"$wait_drkonqi"x = x"true"x ; then wait_drkonqi_counter=$((wait_drkonqi_counter+5)) if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then # ask remaining drkonqis to die in a graceful way - qdbus | grep 'org.kde.drkonqi-' | while read address ; do - qdbus "$address" "/MainApplication" "quit" + @qdbus@ | grep 'org.kde.drkonqi-' | while read address ; do + @qdbus@ "$address" "/MainApplication" "quit" done break fi @@ -387,12 +373,12 @@ echo 'startkde: Shutting down...' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null # Clean up -kdeinit5_shutdown +@kdeinit5_shutdown@ unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@xprop@ -root -remove KDE_FULL_SESSION unset KDE_SESSION_VERSION -xprop -root -remove KDE_SESSION_VERSION +@xprop@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID echo 'startkde: Done.' 1>&2 diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 32ea83d9d507..a24eabc39f31 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,14 +1,15 @@ { - plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper, + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols + kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 }: -plasmaPackage { +mkDerivation { name = "systemsettings"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols + kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 ]; + outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 7e25bfa75b74..ffcdf4835779 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup -, exo, hicolor_icon_theme }: +, makeWrapper, glib_networking, exo, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ - pkgconfig intltool + pkgconfig intltool wrapGAppsHook ]; buildInputs = [ - xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme + xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme glib_networking ]; meta = { diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix index 8cbb4cca93c1..4344d34f13f6 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix @@ -4,12 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.2.0"; - name = "xfce4-volumed-pulse-${version}"; + p_name = "xfce4-volumed-pulse"; + ver_maj = "0.2"; + ver_min = "2"; + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { - url = "https://launchpad.net/xfce4-volumed-pulse/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "0l75gl96skm0zn10w70mwvsjd12p1zjshvn7yc3439dz61506c39"; + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0xjcs1b6ix6rwj9xgr9n89h315r3yhdm8wh5bkincd4lhz6ibhqf"; }; buildInputs = diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix new file mode 100644 index 000000000000..80cf7dd28c5d --- /dev/null +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + p_name = "xfwm4-themes"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + meta = with stdenv.lib; { + homepage = http://www.xfce.org/; + description = "Themes for Xfce"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 36ef85aeb124..6fa9c991dbd9 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -73,6 +73,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; + xfwm4themes = callPackage ./art/xfwm4-themes.nix { }; #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}" @@ -82,11 +83,13 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfce4_cpugraph_plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; xfce4_dict_plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; + xfce4_dockbarx_plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; xfce4_embed_plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; xfce4_eyes_plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + xfce4_namebar_plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { }; xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; xfce4_mailwatch_plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix new file mode 100644 index 000000000000..fbc841db1fc6 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -0,0 +1,44 @@ +{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala, dockbarx, gtk2, xfce, pythonPackages }: + +stdenv.mkDerivation rec { + ver = "0.5"; + rev = "a2dcb66"; + name = "xfce4-dockbarx-plugin-${ver}-${rev}"; + + src = fetchFromGitHub { + owner = "TiZ-EX1"; + repo = "xfce4-dockbarx-plugin"; + rev = rev; + sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx"; + }; + + pythonPath = [ dockbarx ]; + + buildInputs = [ pkgconfig python2 vala gtk2 pythonPackages.wrapPython ] + ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ]) + ++ pythonPath; + + postPatch = '' + substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/" + substituteInPlace src/dockbarx.vala --replace /usr/share/ $out/share/ + substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash + ''; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf build"; + + installPhase = "python waf install"; + + postFixup = '' + wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin; + description = "A plugins to embed DockbarX into xfce4-panel"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix new file mode 100644 index 000000000000..5822ff173c97 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -0,0 +1,35 @@ +{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4panel }: + +stdenv.mkDerivation rec { + ver = "0.3.1"; + rev = "07a23b3"; + name = "xfce4-namebar-plugin-${ver}"; + + src = fetchFromGitHub { + owner = "TiZ-EX1"; + repo = "xfce4-namebar-plugin"; + rev = rev; + sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad"; + }; + + buildInputs = [ pkgconfig python2 vala gtk2 libwnck libxfce4util xfce4panel ]; + + postPatch = '' + substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" + substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" + ''; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf build"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin; + description = "A plugins which integrates titlebar and window controls into the xfce4-panel"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index ffda5b94e076..92564c4eb684 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-whiskermenu-plugin"; - version = "1.6.2"; + version = "1.7.2"; name = "${p_name}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "gottcode"; repo = "xfce4-whiskermenu-plugin"; rev = "v${version}"; - sha256 = "0vfyav01hynjm7p73wwbwnn2l8l9a0hkz755wmjzr6qv06f9019d"; + sha256 = "1rpazgnjp443abc31bgi6gp9q3sgbg13v7v74nn7vf6kl4v725ah"; }; nativeBuildInputs = [ cmake pkgconfig intltool ]; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index fbc139c314fd..fdb9d1be6ad2 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -54,25 +54,25 @@ let + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.6.12"; + version = "1.8.2"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh"; + sha256 = "1ssznjmzmahayslj2xnci9b5wpsl53nyg85say54akng93qipmfb"; }; teensyduino_src = fetchurl { - url = "http://www.pjrc.com/teensy/td_131/TeensyduinoInstall.${teensy_architecture}"; + url = "https://www.pjrc.com/teensy/td_136/TeensyduinoInstall.${teensy_architecture}"; sha256 = lib.optionalString ("${teensy_architecture}" == "linux64") - "1q4wv6s0900hyv9z1mjq33fr2isscps4q3bsy0h12wi3l7ir94g9" + "0qvb5z9y6nsqy0kzib9fvvbn8dakl50vib6r3nm6bnpvyxzwjl2r" + lib.optionalString ("${teensy_architecture}" == "linux32") - "06fl951f44avqyqim5qmy73siylbqcnsmz55zmj2dzhgf4sflkvc" + "14ca62vq7cpx269vfd92shi80qj8spf0dzli8gfcb39ss2zc4jf1" + lib.optionalString ("${teensy_architecture}" == "linuxarm") - "0ldf33w8wkqwklcj8fn4p22f23ibpwpf7873dc6i2jfmmbx0yvxn"; + "122z1gxcgkmwjb8wdklb2w8c3qkj5rc1ap5n4a8fi3kjz29va9rx"; }; buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline @@ -93,6 +93,10 @@ stdenv.mkDerivation rec { cp -v $file_src $file_dst done + # Deliberately break build.xml's download statement in order to cause + # an error if anything needed is missing from download.nix. + substituteInPlace build/build.xml --replace "get src" "get error" + cd ./arduino-core && ant cd ../build && ant cd .. @@ -208,7 +212,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source electronics prototyping platform"; homepage = http://arduino.cc/; - license = stdenv.lib.licenses.gpl2; + license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ antono auntie robberer bjornfor ]; }; diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index 9d3ed56bee99..f74da9773724 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -2,28 +2,28 @@ { "build/shared/reference-1.6.6-3.zip" = fetchurl { - url = "http://downloads.arduino.cc/reference-1.6.6-3.zip"; + url = "https://downloads.arduino.cc/reference-1.6.6-3.zip"; sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3"; }; "build/shared/Galileo_help_files-1.6.2.zip" = fetchurl { - url = "http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip"; + url = "https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip"; sha256 = "0qda0xml353sfhjmx9my4mlcyzbf531k40dcr1cnsa438xp2fw0w"; }; "build/shared/Edison_help_files-1.6.2.zip" = fetchurl { - url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; + url = "https://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan"; }; - "build/Firmata-2.5.3.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Firmata/archive/2.5.3.zip"; - sha256 = "1ims6bdmwv8lgcvd4ri4i39vqm1q5jbwirmki35bybqqb1sl171v"; + "build/Firmata-2.5.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip"; + sha256 = "117dd4pdlgv60gdlgm2ckjfq89i0dg1q8vszg6hxywdf701c1fk4"; }; "build/Bridge-1.6.3.zip" = fetchurl { url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; }; - "build/Robot_Control-1.0.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip"; - sha256 = "1wdpz3ilnza3lfd5a628dryic46j72h4a89y8vp0qkbscvifcvdk"; + "build/Robot_Control-1.0.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.3.zip"; + sha256 = "1pc3b8skbpx7j32jnxa67mfqhnsmfz3876pc9mdyzpsad4mmcn62"; }; "build/Robot_Motor-1.0.2.zip" = fetchurl { url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip"; @@ -37,9 +37,9 @@ url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip"; sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90"; }; - "build/Temboo-1.1.7.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Temboo/archive/1.1.7.zip"; - sha256 = "0fq2q6qs0qp15njsl9dif8dkpxgb4cgg8jk3s5y0fcz9lb8m2j50"; + "build/Temboo-1.2.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip"; + sha256 = "1fyzfihsbcjpjasqbmbbfcall2zl48nzrp4xk9pslppal31mvl8x"; }; "build/Esplora-1.0.4.zip" = fetchurl { url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip"; @@ -53,72 +53,100 @@ url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip"; sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac"; }; + "build/SD-1.1.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SD/archive/1.1.1.zip"; + sha256 = "0nackcf7yx5np1s24wnsrcjl8j0nlmqqir6316vqqkfayvb1247n"; + }; + "build/Servo-1.1.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip"; + sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7"; + }; + "build/Adafruit_CircuitPlayground-1.6.4.zip" = fetchurl { + url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.4.zip"; + sha256 = "1ph7m0l1sfx9db56n2h6vi78pn3zyah813lfhqiqghncx34amrhj"; + }; "build/libastylej-2.05.1-3.zip" = fetchurl { - url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip"; + url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip"; sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6"; }; - "build/liblistSerials-1.1.4.zip" = fetchurl { - url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip"; - sha256 = "1w0zs155hs5b87i5wj049hfj2jsnf9jk30qq93wz1mxab01261v0"; + "build/liblistSerials-1.4.0.zip" = fetchurl { + url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"; + sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv"; }; - "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" = fetchurl { - url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip"; - sha256 = "0fp4mb1qa3w02hrwd51wf261l8ywcl36mi9wipsrgx2y29pk759z"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip"; + sha256 = "1nkk87q2l3bs9y387hdxzgqllm0lqpmc5kdmr6my4hjz5lcpgbza"; }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.3.21_r1.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2"; - sha256 = "1cqx5smzm4dhbj2ah191vbbxi0l7xj95c5gcdbgqm9283hrpfrn7"; + "build/arduino-builder-linux64-1.3.25.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2"; + sha256 = "15y80p255w2rg028vc8dq4hpqsmf770qigv3hgf78npb4qrjnqqf"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "124icbjh28cax6pgg6bzrfdi27shsn9mjjshgrr93pczpg8sc0rr"; + "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "132qm8l6h50z4s9h0i5mfv6bp0iia0pp9kc3gd37hkajy4bh4j0r"; }; - "build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "08b6dbllnvzv1aqx0v037zks4r3vqcx6yxxv040wf431mmf8gd4p"; + "build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "0shz5ymnlsrbnaqcb13fwbd73hz9k45adw14gf1ywjgywa2cpk68"; + }; + "build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2"; + sha256 = "0xy25srvpz6d0yfnz8b17mkmary3k51lb1cvgw7n2zyxayjd0npb"; }; } // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.3.21_r1.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2"; - sha256 = "1prfwb5scprvd74gihd78ibsdy3806b0fsjhgyj9in4w1q8s3dxj"; + "build/arduino-builder-linux32-1.3.25.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2"; + sha256 = "0hjiqbf7xspdcr7lganqnl68qcmndc9pz06dghkrwzbzc5ki72qr"; }; - "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2"; - sha256 = "0s7chsp1jyk477zvfaraf0yacvlzahkwqxpws4k0kjadghg9a27i"; + "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1d81z5m4cklv29hgb5ywrmyq64ymlwmjx2plm1gzs1mcpg7d9ab3"; }; - "build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1yyn016b5162j94nmqcznfabi5y2ly27z2whr77387bvjnqc8jsz"; + "build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2"; + sha256 = "12r1drjafxwzrvf1y1glxd46rv870mhz1ifn0g328ciwivas4da2"; + }; + "build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2"; + sha256 = "1vvilbbbvv68svxzyhjspacbavcqakph5glhnz7c0mxkspqixjbs"; }; } // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.3.21_r1.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.21_r1.tar.bz2"; - sha256 = "06y5j1z9jjnqa7v6nl9dflm1qqpf3ar1jc53zxgdgsrb9c473d8l"; + "build/arduino-builder-macosx-1.3.25.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.25.tar.bz2"; + sha256 = "0inkxjzdplb8b17j7lyam6v9gca25rxmsinrkgqnx3xxgkaxz2k0"; }; - "build/linux/avr-gcc-4.9.2-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2"; - sha256 = "12r4a1q7mh1gbasy7lqn0p4acg699lglw7il9d5f5vwd32pmh4ii"; + "build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2"; + sha256 = "0c27i3y4f5biinxjdpp43wbj00lz7dvl08pnqr7hpkzaalsyvcv7"; }; - "build/linux/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2"; - sha256 = "11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r"; + "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2"; + sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r"; + }; + "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl { + url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip"; + sha256 = "1vz0g98ancfqdf7yx5m3zrxmzb3fwp18zh5lkh2nyl5xlr9m368z"; }; } // optionalAttrs (system == "armv6l-linux") { - "build/arduino-builder-arm-1.3.21_r1.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.21_r1.tar.bz2"; - sha256 = "1ik6r5n6g20x4pb0vbxbkqxgzj39f13n995ki9xgpsrq22x6g1n4"; + "build/arduino-builder-linuxarm-1.3.25.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.3.25.tar.bz2"; + sha256 = "1jvlihpcbdv1sgq1wjdwp7dhznk7nd88zin6yj40kr80gcd2ykry"; }; - "build/linux/avr-gcc-4.9.2-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "08b8z7ca0wcgzxmjz6q5ihjrm3i10frnrcqpvwjrlsxw37ah1wvp"; + "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "033jb1vmspcxsv0w9pk73xv195xnbnmckjsiccgqs8xx36g00dpf"; }; - "build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "1rybp4hgk0mm7dydr3rj7yx59jzi30s4kyadzkjv13nm4ds209i4"; + "build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "1kp1xry97385zbrs94j285h1gqlzyyhkchh26z7zq6c0wi5879i5"; + }; + "build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2"; + sha256 = "0k1pib8lmvk6c0y3m038fj3mc18ax1hy3kbvgd5nygrxvy1hv274"; }; } diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix index ff6e47e5a805..27ce64582f34 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/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index de2c6d40d40c..224d111026af 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,5 +1,5 @@ { stdenv, writeText, erlang, rebar3, openssl, libyaml, - pc, buildEnv, lib }: + pc, lib }: { name, version , src diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 1fd899c53c97..3a165fd2f6a4 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_5; + + elixir_1_5 = 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 new file mode 100644 index 000000000000..26d868a8e7c4 --- /dev/null +++ b/pkgs/development/beam-modules/lib.nix @@ -0,0 +1,81 @@ +{ pkgs, stdenv }: + +rec { + + /* Similar to callPackageWith/callPackage, but without makeOverridable + */ + callPackageWith = autoArgs: fn: args: + let + f = if builtins.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + in f (auto // args); + + callPackage = callPackageWith pkgs; + + /* Uses generic-builder to evaluate provided drv containing OTP-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, used to + enable/disable high-level OTP features, like ODBC or WX support; + + Please note that "mkDerivation" defined here is the one called from R16.nix + and similar files. + */ + callErlang = drv: args: + let + builder = callPackage ../../development/interpreters/erlang/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.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 c4a1b364daa7..6c9a20c6de2f 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/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 0c8b0f5ce601..15c51af005f3 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { homepage = http://www.ps.uni-saarland.de/alice/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.doublec ]; + broken = true; }; } diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix new file mode 100755 index 000000000000..6fa25df5e033 --- /dev/null +++ b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix @@ -0,0 +1,98 @@ +{stdenv, fetchurl +, arm-frc-linux-gnueabi-binutils, arm-frc-linux-gnueabi-eglibc, arm-frc-linux-gnueabi-linux-api-headers +, elfutils +, libmpc, gmp, mpfr, zlib, isl_0_15, cloog}: + +stdenv.mkDerivation rec { + _target = "arm-frc-linux-gnueabi"; + + version = "4.9.4"; + name = "${_target}-gcc-${version}"; + + src = fetchurl { + url = "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092"; + }; + + patches = [ + ./minorSOname.patch + ./no-nested-deprecated-warnings.patch + ]; + + hardeningDisable = [ "format" ]; + + buildInputs = [ + arm-frc-linux-gnueabi-binutils + arm-frc-linux-gnueabi-eglibc + arm-frc-linux-gnueabi-linux-api-headers + elfutils + libmpc + gmp + mpfr + zlib + isl_0_15 + cloog + ]; + + + configurePhase = '' + mkdir gcc-build + cd gcc-build + ../configure \ + --prefix=$out \ + --host=$CHOST \ + --build=$CHOST \ + --program-prefix=${_target}- \ + --target=${_target} \ + --enable-shared \ + --disable-nls \ + --enable-threads=posix \ + --enable-languages=c,c++ \ + --disable-multilib \ + --disable-multiarch \ + --with-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \ + --with-build-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \ + --with-as=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/as \ + --with-ld=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/ld \ + --with-cpu=cortex-a9 \ + --with-float=softfp \ + --with-fpu=vfp \ + --with-specs='%{save-temps:-fverbose-asm} %{funwind-tables|fno-unwind-tables|mabi=*|ffreestanding|nostdlib:;:-funwind-tables}' \ + --enable-lto \ + --with-pkgversion='GCC-for-FRC' \ + --with-cloog \ + --enable-poison-system-directories \ + --enable-plugin \ + --with-system-zlib \ + --disable-libmudflap \ + --disable-libsanitizer + ''; + + makeFlags = [ + "all-gcc" + "all-target-libgcc" + "all-target-libstdc++-v3" + ]; + + installPhase = '' + make install-gcc install-target-libgcc install-target-libstdc++-v3 + ''; + + postInstall = '' + rm -rf $out/share/{man/man7,info}/ "$out/share/gcc-${version}/python" + ''; + + meta = with stdenv.lib; { + description = "FRC cross compiler"; + longDescription = '' + arm-frc-linux-gnueabi-gcc is a cross compiler for building + code for FIRST Robotics Competition. Used as a cross compiler + for the NI RoboRio. + ''; + license = licenses.gpl2; + maintainers = [ maintainers.colescott ]; + platforms = platforms.linux; + + priority = 4; + }; +} diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch new file mode 100755 index 000000000000..d97d12bc629a --- /dev/null +++ b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch @@ -0,0 +1,49 @@ +Description: Make the default SONAME include minor numbers (c++) + This patch adds .0.20 to the end of the SONAME for libstdc++ to support + independent side-by-side usage of .17 and .20. + . + gcc-armel (4.9.1-0frc2) trusty; urgency=low + . + * Fixing dependency ambiguity yet again... +Author: Patrick Plenefisch + +--- + +--- gcc-armel-4.9.1.orig/libstdc++-v3/configure ++++ gcc-armel-4.9.1/libstdc++-v3/configure +@@ -10698,7 +10698,7 @@ gnu*) + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shared_ext}$versuffix' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; +@@ -10824,7 +10824,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -14382,7 +14382,7 @@ gnu*) + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shared_ext}$versuffix' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; +@@ -14508,7 +14508,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch new file mode 100755 index 000000000000..050a63e92fd6 --- /dev/null +++ b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch @@ -0,0 +1,22 @@ +Description: Get rid of recursive deprecated warnings. + As is, gcc gives warnings when a function with the + deprecated attribute calls another function with + the deprecated attribute. + See http://stackoverflow.com/questions/13459602/how-can-i-get-rid-of-deprecated-warnings-in-deprecated-functions-in-gcc + +Author: James Kuszmaul + +-- + +--- gcc-armel-4.9.1.orig/gcc/tree.c ++++ gcc-armel-4.9.1/gcc/tree.c +@@ -12063,6 +12063,9 @@ warn_deprecated_use (tree node, tree attr) + if (node == 0 || !warn_deprecated_decl) + return; + ++ if (current_function_decl && TREE_DEPRECATED(current_function_decl)) ++ return; ++ + if (!attr) + { + if (DECL_P (node)) diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index d3c4bf19a65b..eda895d726a0 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "asn1c-${version}"; - version = "0.9.27"; + version = "0.9.28"; src = fetchurl { url = "http://lionet.info/soft/asn1c-${version}.tar.gz"; - sha256 = "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2"; + sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 3599ff750c26..bf2272a75c17 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { checkTarget = "test"; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = { description = "Efficient Scheme compiler"; homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix new file mode 100644 index 000000000000..72eaae998779 --- /dev/null +++ b/pkgs/development/compilers/binaryen/default.nix @@ -0,0 +1,24 @@ +{ stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "33"; + rev = "version_${version}"; + name = "binaryen-${version}"; + + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "binaryen"; + sha256 = "0zijs2mcgfv0iynwdb0l4zykm0891b1zccf6r8w35ipxvcdwbsbp"; + inherit rev; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = https://github.com/WebAssembly/binaryen; + description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; + platforms = platforms.all; + maintainers = with maintainers; [ asppsa ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 3e1784424e3c..76caf12ffd30 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/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 949008d990f8..86e04b491e57 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20160208"; + version = "20170218"; src = fetchurl { url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "19v9z8lfxfmhc4cl9fys7vnaslqiznjy1jpk5mcv468p7vysg46p"; + sha256 = "06snabmpy07x4xm8d1xgq5dfzbjli10xkxk3nx9jms39zkj493cd"; }; phases = [ "installPhase" ]; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/java $out/bin tar -xzf $src - cp -r compiler.jar $out/share/java/ + cp -r closure-compiler-v${version}.jar $out/share/java/ echo "#!${bash}/bin/bash" > $out/bin/closure-compiler - echo "${jre}/bin/java -jar $out/share/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler + echo "${jre}/bin/java -jar $out/share/java/closure-compiler-v${version}.jar \"\$@\"" >> $out/bin/closure-compiler chmod +x $out/bin/closure-compiler ''; diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 63290735f414..2833c5378c1d 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -2,7 +2,7 @@ let inherit (stdenv) system; - version = "21a"; + version = "21b"; downloadUrl = arch: "http://common-lisp.net/project/cmucl/downloads/release/" + "${version}/cmucl-${version}-${arch}.tar.bz2"; @@ -13,7 +13,7 @@ let dist = if system == "i686-linux" then fetchDist { arch = "x86-linux"; - sha256 = "0w8dcaiasfd4fbj340zaf6wcjfgc4wzkvr24gbxa5rr3aw10rl02"; + sha256 = "13k3b5ygnbsq6n2i3r5i4ljw3r1qlskn2p5f4x9hrx6vfvbb3k7a"; } else throw "Unsupported platform for cmucl."; in diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 8cf8a04f4eb5..ee9224b380c8 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, makeWrapper, gcc }: +{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }: stdenv.mkDerivation rec { name = "colm-${version}"; - version = "0.13.0.4"; + version = "0.13.0.5"; src = fetchurl { url = "http://www.colm.net/files/colm/${name}.tar.gz"; - sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx"; + sha256 = "1320bx96ycd1xwww137cixrb983838wnrgkfsym8x5bnf5kj9rik"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper asciidoc ]; doCheck = true; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "A programming language for the analysis and transformation of computer languages"; homepage = http://www.colm.net/open-source/colm; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 8086a9f97495..f519776b6891 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/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 558cfa35adad..b619bf6ce208 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -102,5 +102,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ obadz ]; license = stdenv.lib.licenses.mit; + broken = true; # CoreCLR has proven to be very difficult to package. PRs welcome if someone wants to shave that yak. }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index b8cbceb97678..115c686d7de1 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.21.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" = "0a44539df3813baea4381c314ad5f782b13cf1596e478851c52cd84193cc7a1f"; - "i686-linux" = "9a45287f94d329f5ebe77f5a0d71cd0e09c3db79b0b56f6fe4a5166beed707ef"; - "x86_64-darwin" = "e92abb33a9a592febb4e629ad68375b2577acd791a71220b8dc407904be469ee"; + "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 = "4dd01703f5304a0eda7f02fc362fba27ba069666097c0f921f8a3ee58808779c"; + 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 new file mode 100644 index 000000000000..3538f85a75f8 --- /dev/null +++ b/pkgs/development/compilers/dale/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, libffi +, llvm_35 +, doCheck ? false +, perl +}: + +let version = "20170519"; + +in stdenv.mkDerivation { + name = "dale-${version}"; + + src = fetchFromGitHub { + owner = "tomhrr"; + repo = "dale"; + rev = "39e16d8e89fa070de65a673d4462e783d530f95a"; + sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl"; + }; + + buildInputs = [ cmake pkgconfig libffi llvm_35 ] + ++ stdenv.lib.optional doCheck perl; + + patches = [ ./link-llvm.patch ]; + + inherit doCheck; + + checkTarget = "tests"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Lisp-flavoured C"; + longDescription = '' + Dale is a system (no GC) programming language that uses + S-expressions for syntax and supports syntactic macros. + ''; + homepage = "https://github.com/tomhrr/dale"; + license = licenses.bsd3; + maintainers = with maintainers; [ amiloradovsky ]; + platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; + # failed on Darwin: linker couldn't find the FFI lib + # failed on AArch64: because LLVM 3.5 is failed there + }; +} diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/pkgs/development/compilers/dale/link-llvm.patch new file mode 100644 index 000000000000..3facec91874f --- /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/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index ac7a275d66ae..e8c36dc7a037 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "dtc-${version}"; - version = "1.4.2"; + version = "1.4.4"; src = fetchgit { url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git"; rev = "refs/tags/v${version}"; - sha256 = "0pwhbw930pnksrmkimqqwp4nqj9mmh06bs5b8p5l2cnhnh8lxn3j"; + sha256 = "1pxp7700b3za7q4fnsnxx6i8v66rnr8p6lyi7jf684y1hq5ynlnf"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 48eafff6f724..6fb36d7cbfb9 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -29,6 +29,9 @@ mkDerivation { tasty-hunit tasty-quickcheck text union-find wl-pprint ]; jailbreak = true; + postInstall = '' + ln -s $out/bin/elm-format-0.18 $out/bin/elm-format + ''; homepage = "http://elm-lang.org"; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index b5d2ba66e752..ae7a5ce87b25 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, ... }: let - rev = "1.37.3"; + rev = "1.37.13"; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp"; - sha256 = "0s5156g6576hm31628c2wbqwl9r6vn10z5ry59psl565zz3lpg8x"; + sha256 = "1r4f4d5dmhxqwmpf2psainx7sj1j26fdp5acifdwg4sbbpsv96az"; inherit rev; }; srcFL = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp-clang"; - sha256 = "0jhk20wb7275n5m9niqkzmvrr8hh5v26glkmsfmng4p66cs7jkil"; + sha256 = "1p0108iz77vmzm7i1aa29sk93g5vd95xiwmags18qkr7x3fmfqsw"; inherit rev; }; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 05df6e9359a0..b39198f30a48 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: +{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler +, jre, binaryen, enableWasm ? true +}: let - rev = "1.37.3"; + rev = "1.37.13"; appdir = "share/emscripten"; in @@ -11,7 +13,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten"; - sha256 = "0pkxm8nd2zv57f2xm0c3n4xsdh2scliyy3zx04xk2bpkvskyzl7x"; + sha256 = "0xnr8nq431pksb346fwsbs5knqmcygb8mywzzl0c9nz3ims1vkx5"; inherit rev; }; @@ -34,8 +36,11 @@ stdenv.mkDerivation { echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config - echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/compiler.jar'" >> $out/${appdir}/config + echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config + '' + + stdenv.lib.optionalString enableWasm '' + echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix new file mode 100644 index 000000000000..35e6749659e0 --- /dev/null +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -0,0 +1,87 @@ +# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it + +{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }: + +stdenv.mkDerivation rec { + name = "fsharp-${version}"; + version = "4.1.7"; + + src = fetchurl { + url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; + sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl"; + }; + + buildInputs = [ + pkgconfig + autoconf + automake + which + mono + dotnetbuildhelpers + dotnetPackages.FsCheck262 + dotnetPackages.FSharpCompilerTools + dotnetPackages.FSharpCore + dotnetPackages.FSharpData225 + dotnetPackages.FsLexYacc704 + dotnetPackages.MicrosoftDiaSymReader + dotnetPackages.MicrosoftDiaSymReaderPortablePdb + dotnetPackages.NUnit350 + dotnetPackages.SystemCollectionsImmutable131 + dotnetPackages.SystemReflectionMetadata + dotnetPackages.SystemValueTuple + ]; + + configurePhase = '' + substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" + ./autogen.sh --prefix $out + ''; + + preBuild = '' + substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "" "" + + rm -rf packages + mkdir packages + + ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2 + ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4 + ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 + ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5 + ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4 + ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0 + ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0 + ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0 + ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1 + ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2 + ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0 + ''; + + # Make sure the executables use the right mono binary, + # and set up some symlinks for backwards compatibility. + postInstall = '' + substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " + ln -s $out/bin/fsharpc $out/bin/fsc + ln -s $out/bin/fsharpi $out/bin/fsi + for dll in "$out/lib/mono/fsharp"/FSharp*.dll + do + create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + done + ''; + + # To fix this error when running: + # The file "/nix/store/path/whatever.exe" is an not a valid CIL image + dontStrip = true; + + meta = { + description = "A functional CLI language"; + homepage = "http://fsharp.org/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 24a4135bde13..51777f748e30 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,26 +1,38 @@ -{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper }: +{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper, pkgconfig, file }: stdenv.mkDerivation rec { name = "fstar-${version}"; - version = "0.9.2.0"; + version = "0.9.4.0"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "0vrxmxfaslngvbvkzpm1gfl1s34hdsprv8msasxf9sjqc3hlir3l"; + sha256 = "130779p5plsgvz0dkcqycns3vwrvyfl138nq2xdhd3rkdsbyyvb7"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = with ocamlPackages; [ - mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl + mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries + zarith camlp4 yojson pprint openssl pkgconfig file ]; preBuild = '' - substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" + substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" \ + --replace Darwin xyz + substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true" - source setenv.sh + # Fails with bad interpreter otherwise + patchShebangs src/tools + patchShebangs bin + + export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets" + # remove hardcoded windows paths + sed -i '/ zip != null && unzip != null @@ -65,19 +64,22 @@ let version = "4.5.4"; javaAwtGtk = langJava && gtk2 != null; /* Cross-gcc settings */ - gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; - gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; - gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; + gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform; + gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatformt; + gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null targetPlatform; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; - crossMingw = (cross != null && cross.libc == "msvcrt"); + crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"); crossConfigureFlags = - "--target=${cross.config}" + + "--target=${targetPlatform.config}" + withArch + withCpu + withAbi + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${targetPlatform.config}-as" + + " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + @@ -117,7 +119,7 @@ let version = "4.5.4"; ); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; in @@ -136,7 +138,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all"; - outputs = if (stdenv.is64bit && langAda) then [ "out" "doc" ] + outputs = if (hostPlatform.is64bit && langAda) then [ "out" "doc" ] else [ "out" "lib" "doc" ]; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -145,7 +147,7 @@ stdenv.mkDerivation ({ patches = [ ] - ++ optional (cross != null) ../libstdc++-target.patch + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. @@ -158,7 +160,7 @@ stdenv.mkDerivation ({ || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") - || (cross != null && cross.config == "i586-pc-gnu" + || (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu" && libcCross != null)) then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not @@ -194,7 +196,7 @@ stdenv.mkDerivation ({ sed -i gcc/config/t-gnu \ -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g' '' - else if cross != null || stdenv.cc.libc != null then + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -224,7 +226,7 @@ stdenv.mkDerivation ({ ++ (optional langJava boehmgc) ++ (optionals langJava [zip unzip]) ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals (targetPlatform != hostPlatform) [binutils]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) ; @@ -262,26 +264,26 @@ stdenv.mkDerivation ({ ) } ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f - if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} + if targetPlatform == hostPlatform && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} + ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} "; - targetConfig = if cross != null then cross.config else null; + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; crossAttrs = { - AR = "${stdenv.cross.config}-ar"; - LD = "${stdenv.cross.config}-ld"; - CC = "${stdenv.cross.config}-gcc"; - CXX = "${stdenv.cross.config}-gcc"; - AR_FOR_TARGET = "${stdenv.cross.config}-ar"; - LD_FOR_TARGET = "${stdenv.cross.config}-ld"; - CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; - NM_FOR_TARGET = "${stdenv.cross.config}-nm"; - CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + 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 cross == null then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} @@ -309,9 +311,9 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} - --target=${stdenv.cross.config} + ${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} + --target=${targetPlatform.config} ''; }; @@ -354,7 +356,7 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-idirafter ${libcCross.dev}/include" ] ++ optionals (! crossStageStatic) [ @@ -363,7 +365,7 @@ stdenv.mkDerivation ({ else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-Wl,-L${libcCross.out}/lib" ] ++ (if crossStageStatic then [ @@ -409,14 +411,14 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (cross != null || libcCross != null) { +// optionalAttrs (targetPlatform != hostPlatform || libcCross != null) { # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of, # say, "i586-pc-gnu-gcc -E" when building `gcc.crossDrv'. # FIXME: Fix `builder.sh' directly in the next stdenv-update. postUnpack = "unset CPP"; } -// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index e6f990113ccc..38ff23f86a6d 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false -, langObjC ? stdenv.isDarwin -, langObjCpp ? stdenv.isDarwin +, langObjC ? targetPlatform.isDarwin +, langObjCpp ? targetPlatform.isDarwin , langJava ? false , langAda ? false , langVhdl ? false @@ -25,8 +25,6 @@ , enableMultilib ? false , enablePlugin ? true # whether to support user-supplied plug-ins , name ? "gcc" -, cross ? null -, binutilsCross ? null , libcCross ? null , crossStageStatic ? true , gnat ? null @@ -34,6 +32,7 @@ , stripped ? true , gnused ? null , darwin ? null +, buildPlatform, hostPlatform, targetPlatform }: assert langJava -> zip != null && unzip != null @@ -49,7 +48,7 @@ assert cloog != null -> isl != null; assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.isDarwin -> gnused != null; +assert hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -60,19 +59,19 @@ with builtins; let version = "4.8.5"; # Whether building a cross-compiler for GNU/Hurd. - crossGNU = cross != null && cross.config == "i586-pc-gnu"; + crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; enableParallelBuilding = true; patches = [ ] ++ optional enableParallelBuilding ../parallel-bconfig.patch - ++ optional (cross != null) ../libstdc++-target.patch + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch # 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 stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch; + ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -120,15 +119,15 @@ let version = "4.8.5"; withMode; /* Cross-gcc settings */ - crossMingw = cross != null && cross.libc == "msvcrt"; - crossDarwin = cross != null && cross.libc == "libSystem"; + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = let - gccArch = stdenv.cross.gcc.arch or null; - gccCpu = stdenv.cross.gcc.cpu or null; - gccAbi = stdenv.cross.gcc.abi or null; - gccFpu = stdenv.cross.gcc.fpu or null; - gccFloat = stdenv.cross.gcc.float or null; - gccMode = stdenv.cross.gcc.mode or null; + gccArch = targetPlatform.gcc.arch or null; + gccCpu = targetPlatform.gcc.cpu or null; + gccAbi = targetPlatform.gcc.abi or null; + gccFpu = targetPlatform.gcc.fpu or null; + gccFloat = targetPlatform.gcc.float or null; + gccMode = targetPlatform.gcc.mode or null; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; @@ -136,13 +135,16 @@ let version = "4.8.5"; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; in - "--target=${cross.config}" + + "--target=${targetPlatform.config}" + withArch + withCpu + withAbi + withFpu + withFloat + withMode + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${targetPlatform.config}-as" + + " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + @@ -169,10 +171,6 @@ let version = "4.8.5"; (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" else " --with-headers=${libcCross.dev}/include") + # Ensure that -print-prog-name is able to find the correct programs. - (stdenv.lib.optionalString (crossMingw || crossDarwin) ( - " --with-as=${binutilsCross}/bin/${cross.config}-as" + - " --with-ld=${binutilsCross}/bin/${cross.config}-ld" - )) + " --enable-__cxa_atexit" + " --enable-long-long" + (if crossMingw then @@ -188,7 +186,7 @@ let version = "4.8.5"; " --disable-shared" + # To keep ABI compatibility with upstream mingw-w64 " --enable-fully-dynamic-string" - else (if cross.libc == "uclibc" then + else (if targetPlatform.libc == "uclibc" then # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. " --disable-libgomp" else "") + @@ -197,9 +195,9 @@ let version = "4.8.5"; " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; + bootstrap = targetPlatform == hostPlatform && !hostPlatform.isArm && !hostPlatform.isMips; in @@ -227,7 +225,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if (stdenv.isGNU + if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") @@ -263,7 +261,7 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' '' - else if cross != null || stdenv.cc.libc != null then + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -293,17 +291,17 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals (targetPlatform != hostPlatform) [binutils]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional stdenv.isDarwin gnused) + ++ (optional hostPlatform.isDarwin gnused) ; - preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" @@ -313,7 +311,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; configureFlags = " - ${if stdenv.isSunOS then + ${if hostPlatform.isSunOS then " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + # On Illumos/Solaris GNU as is preferred " --with-gnu-as --without-gnu-ld " @@ -358,19 +356,19 @@ stdenv.mkDerivation ({ ) ) } - ${if cross == null - then if stdenv.isDarwin + ${if targetPlatform == hostPlatform + then if hostPlatform.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} + ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} - ${if cross == null then platformFlags else ""} + ${if targetPlatform == hostPlatform then platformFlags else ""} "; - targetConfig = if cross != null then cross.config else null; + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -382,28 +380,28 @@ stdenv.mkDerivation ({ else "install"; crossAttrs = let - xgccArch = stdenv.cross.gcc.arch or null; - xgccCpu = stdenv.cross.gcc.cpu or null; - xgccAbi = stdenv.cross.gcc.abi or null; - xgccFpu = stdenv.cross.gcc.fpu or null; - xgccFloat = stdenv.cross.gcc.float or null; + xgccArch = targetPlatform.gcc.arch or null; + xgccCpu = targetPlatform.gcc.cpu or null; + xgccAbi = targetPlatform.gcc.abi or null; + xgccFpu = targetPlatform.gcc.fpu or null; + xgccFloat = targetPlatform.gcc.float or null; xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; in { - AR = "${stdenv.cross.config}-ar"; - LD = "${stdenv.cross.config}-ld"; - CC = "${stdenv.cross.config}-gcc"; - CXX = "${stdenv.cross.config}-gcc"; - AR_FOR_TARGET = "${stdenv.cross.config}-ar"; - LD_FOR_TARGET = "${stdenv.cross.config}-ld"; - CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; - NM_FOR_TARGET = "${stdenv.cross.config}-nm"; - CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + 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 cross == null then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} @@ -431,7 +429,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - --target=${stdenv.cross.config} + --target=${targetPlatform.config} ${xwithArch} ${xwithCpu} ${xwithAbi} @@ -480,7 +478,7 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-idirafter ${libcCross.dev}/include" ] ++ optionals (! crossStageStatic) [ @@ -489,7 +487,7 @@ stdenv.mkDerivation ({ else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-Wl,-L${libcCross.out}/lib" ] ++ (if crossStageStatic then [ @@ -538,13 +536,13 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; } +# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index eb03148a4b8d..04e67e44f773 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false -, langObjC ? stdenv.isDarwin -, langObjCpp ? stdenv.isDarwin +, langObjC ? targetPlatform.isDarwin +, langObjCpp ? targetPlatform.isDarwin , langJava ? false , langAda ? false , langVhdl ? false @@ -25,8 +25,6 @@ , enableMultilib ? false , enablePlugin ? true # whether to support user-supplied plug-ins , name ? "gcc" -, cross ? null -, binutilsCross ? null , libcCross ? null , crossStageStatic ? true , gnat ? null @@ -34,6 +32,7 @@ , stripped ? true , gnused ? null , darwin ? null +, buildPlatform, hostPlatform, targetPlatform }: assert langJava -> zip != null && unzip != null @@ -49,7 +48,7 @@ assert cloog != null -> isl != null; assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.isDarwin -> gnused != null; +assert hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -60,21 +59,21 @@ with builtins; let version = "4.9.4"; # Whether building a cross-compiler for GNU/Hurd. - crossGNU = cross != null && cross.config == "i586-pc-gnu"; + crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; enableParallelBuilding = true; patches = [ ../use-source-date-epoch.patch ] ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ] - ++ optional (cross != null) ../libstdc++-target.patch + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch # 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 # The NXConstStr.patch can be removed at 4.9.4 - ++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch; + ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -122,15 +121,15 @@ let version = "4.9.4"; withMode; /* Cross-gcc settings */ - crossMingw = cross != null && cross.libc == "msvcrt"; - crossDarwin = cross != null && cross.libc == "libSystem"; + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = let - gccArch = stdenv.cross.gcc.arch or null; - gccCpu = stdenv.cross.gcc.cpu or null; - gccAbi = stdenv.cross.gcc.abi or null; - gccFpu = stdenv.cross.gcc.fpu or null; - gccFloat = stdenv.cross.gcc.float or null; - gccMode = stdenv.cross.gcc.mode or null; + gccArch = targetPlatform.gcc.arch or null; + gccCpu = targetPlatform.gcc.cpu or null; + gccAbi = targetPlatform.gcc.abi or null; + gccFpu = targetPlatform.gcc.fpu or null; + gccFloat = targetPlatform.gcc.float or null; + gccMode = targetPlatform.gcc.mode or null; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; @@ -138,13 +137,16 @@ let version = "4.9.4"; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; in - "--target=${cross.config}" + + "--target=${targetPlatform.config}" + withArch + withCpu + withAbi + withFpu + withFloat + withMode + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${targetPlatform.config}-as" + + " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + @@ -169,11 +171,6 @@ let version = "4.9.4"; else (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" else " --with-headers=${libcCross.dev}/include") + - # Ensure that -print-prog-name is able to find the correct programs. - (stdenv.lib.optionalString (crossMingw || crossDarwin) ( - " --with-as=${binutilsCross}/bin/${cross.config}-as" + - " --with-ld=${binutilsCross}/bin/${cross.config}-ld" - )) + " --enable-__cxa_atexit" + " --enable-long-long" + (if crossMingw then @@ -189,7 +186,7 @@ let version = "4.9.4"; " --disable-shared" + # To keep ABI compatibility with upstream mingw-w64 " --enable-fully-dynamic-string" - else (if cross.libc == "uclibc" then + else (if targetPlatform.libc == "uclibc" then # libsanitizer requires netrom/netrom.h which is not # available in uclibc. " --disable-libsanitizer" + @@ -201,9 +198,9 @@ let version = "4.9.4"; " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = cross == null; + bootstrap = targetPlatform == hostPlatform; in @@ -232,7 +229,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if (stdenv.isGNU + if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") @@ -268,7 +265,7 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' '' - else if cross != null || stdenv.cc.libc != null then + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -298,16 +295,16 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals (targetPlatform != hostPlatform) [binutils]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional stdenv.isDarwin gnused) + ++ (optional hostPlatform.isDarwin gnused) ; - preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' sed -i -e "s/-lrt//g" libstdc++-v3/configure export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" @@ -322,7 +319,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; configureFlags = " - ${if stdenv.isSunOS then + ${if hostPlatform.isSunOS then " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + # On Illumos/Solaris GNU as is preferred " --with-gnu-as --without-gnu-ld " @@ -365,19 +362,19 @@ stdenv.mkDerivation ({ ) ) } - ${if cross == null - then if stdenv.isDarwin + ${if targetPlatform == hostPlatform + then if hostPlatform.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} + ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} - ${if cross == null then platformFlags else ""} + ${if targetPlatform == hostPlatform then platformFlags else ""} "; - targetConfig = if cross != null then cross.config else null; + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -389,28 +386,28 @@ stdenv.mkDerivation ({ else "install"; crossAttrs = let - xgccArch = stdenv.cross.gcc.arch or null; - xgccCpu = stdenv.cross.gcc.cpu or null; - xgccAbi = stdenv.cross.gcc.abi or null; - xgccFpu = stdenv.cross.gcc.fpu or null; - xgccFloat = stdenv.cross.gcc.float or null; + xgccArch = targetPlatform.gcc.arch or null; + xgccCpu = targetPlatform.gcc.cpu or null; + xgccAbi = targetPlatform.gcc.abi or null; + xgccFpu = targetPlatform.gcc.fpu or null; + xgccFloat = targetPlatform.gcc.float or null; xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; in { - AR = "${stdenv.cross.config}-ar"; - LD = "${stdenv.cross.config}-ld"; - CC = "${stdenv.cross.config}-gcc"; - CXX = "${stdenv.cross.config}-gcc"; - AR_FOR_TARGET = "${stdenv.cross.config}-ar"; - LD_FOR_TARGET = "${stdenv.cross.config}-ld"; - CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; - NM_FOR_TARGET = "${stdenv.cross.config}-nm"; - CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + 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 cross == null then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} @@ -438,7 +435,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - --target=${stdenv.cross.config} + --target=${targetPlatform.config} ${xwithArch} ${xwithCpu} ${xwithAbi} @@ -487,7 +484,7 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-idirafter ${libcCross.dev}/include" ] ++ optionals (! crossStageStatic) [ @@ -496,7 +493,7 @@ stdenv.mkDerivation ({ else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-Wl,-L${libcCross.out}/lib" ] ++ (if crossStageStatic then [ @@ -545,13 +542,13 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; } +# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 1721eba325bf..e95ef92c3f65 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false -, langObjC ? stdenv.isDarwin -, langObjCpp ? stdenv.isDarwin +, langObjC ? targetPlatform.isDarwin +, langObjCpp ? targetPlatform.isDarwin , langJava ? false , langAda ? false , langVhdl ? false @@ -25,8 +25,6 @@ , enableMultilib ? false , enablePlugin ? true # whether to support user-supplied plug-ins , name ? "gcc" -, cross ? null -, binutilsCross ? null , libcCross ? null , crossStageStatic ? true , gnat ? null @@ -36,6 +34,8 @@ , binutils ? null , 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 @@ -48,10 +48,10 @@ assert langVhdl -> gnat != null; assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.isDarwin -> gnused != null; +assert hostPlatform.isDarwin -> gnused != null; # Need c++filt on darwin -assert stdenv.isDarwin -> binutils != null; +assert hostPlatform.isDarwin -> binutils != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -63,18 +63,22 @@ let version = "5.4.0"; sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; # Whether building a cross-compiler for GNU/Hurd. - crossGNU = cross != null && cross.config == "i586-pc-gnu"; + crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; enableParallelBuilding = true; patches = [ ../use-source-date-epoch.patch ] - ++ optional (cross != null) ../libstdc++-target.patch + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch # 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 langFortran ../gfortran-driving.patch + + # This could be applied unconditionally but I don't want to cause a full + # Linux rebuild. + ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -122,15 +126,15 @@ let version = "5.4.0"; withMode; /* Cross-gcc settings */ - crossMingw = cross != null && cross.libc == "msvcrt"; - crossDarwin = cross != null && cross.libc == "libSystem"; + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = let - gccArch = stdenv.cross.gcc.arch or null; - gccCpu = stdenv.cross.gcc.cpu or null; - gccAbi = stdenv.cross.gcc.abi or null; - gccFpu = stdenv.cross.gcc.fpu or null; - gccFloat = stdenv.cross.gcc.float or null; - gccMode = stdenv.cross.gcc.mode or null; + gccArch = targetPlatform.gcc.arch or null; + gccCpu = targetPlatform.gcc.cpu or null; + gccAbi = targetPlatform.gcc.abi or null; + gccFpu = targetPlatform.gcc.fpu or null; + gccFloat = targetPlatform.gcc.float or null; + gccMode = targetPlatform.gcc.mode or null; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; @@ -138,13 +142,16 @@ let version = "5.4.0"; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; in - "--target=${cross.config}" + + "--target=${targetPlatform.config}" + withArch + withCpu + withAbi + withFpu + withFloat + withMode + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${targetPlatform.config}-as" + + " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + @@ -169,11 +176,6 @@ let version = "5.4.0"; else (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot" else " --with-headers=${getDev libcCross}/include") + - # Ensure that -print-prog-name is able to find the correct programs. - (stdenv.lib.optionalString (crossMingw || crossDarwin) ( - " --with-as=${binutilsCross}/bin/${cross.config}-as" + - " --with-ld=${binutilsCross}/bin/${cross.config}-ld" - )) + " --enable-__cxa_atexit" + " --enable-long-long" + (if crossMingw then @@ -189,7 +191,7 @@ let version = "5.4.0"; " --disable-shared" + # To keep ABI compatibility with upstream mingw-w64 " --enable-fully-dynamic-string" - else (if cross.libc == "uclibc" then + else (if targetPlatform.libc == "uclibc" then # libsanitizer requires netrom/netrom.h which is not # available in uclibc. " --disable-libsanitizer" + @@ -201,9 +203,9 @@ let version = "5.4.0"; " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = cross == null; + bootstrap = targetPlatform == hostPlatform; in @@ -231,8 +233,21 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + postPatch = - if (stdenv.isGNU + if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") @@ -268,7 +283,7 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' '' - else if cross != null || stdenv.cc.libc != null then + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -297,19 +312,20 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals (targetPlatform != hostPlatform) [binutils]) + ++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional stdenv.isDarwin gnused) - ++ (optional stdenv.isDarwin binutils) + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional hostPlatform.isDarwin binutils) ; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" @@ -319,7 +335,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; configureFlags = " - ${if stdenv.isSunOS then + ${if hostPlatform.isSunOS then " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + # On Illumos/Solaris GNU as is preferred " --with-gnu-as --without-gnu-ld " @@ -363,19 +379,19 @@ stdenv.mkDerivation ({ ) ) } - ${if cross == null - then if stdenv.isDarwin + ${if targetPlatform == hostPlatform + then if hostPlatform.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} + ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} - ${if cross == null then platformFlags else ""} + ${if targetPlatform == hostPlatform then platformFlags else ""} "; - targetConfig = if cross != null then cross.config else null; + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -387,28 +403,28 @@ stdenv.mkDerivation ({ else "install"; crossAttrs = let - xgccArch = stdenv.cross.gcc.arch or null; - xgccCpu = stdenv.cross.gcc.cpu or null; - xgccAbi = stdenv.cross.gcc.abi or null; - xgccFpu = stdenv.cross.gcc.fpu or null; - xgccFloat = stdenv.cross.gcc.float or null; + xgccArch = targetPlatform.gcc.arch or null; + xgccCpu = targetPlatform.gcc.cpu or null; + xgccAbi = targetPlatform.gcc.abi or null; + xgccFpu = targetPlatform.gcc.fpu or null; + xgccFloat = targetPlatform.gcc.float or null; xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; in { - AR = "${stdenv.cross.config}-ar"; - LD = "${stdenv.cross.config}-ld"; - CC = "${stdenv.cross.config}-gcc"; - CXX = "${stdenv.cross.config}-gcc"; - AR_FOR_TARGET = "${stdenv.cross.config}-ar"; - LD_FOR_TARGET = "${stdenv.cross.config}-ld"; - CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; - NM_FOR_TARGET = "${stdenv.cross.config}-nm"; - CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + 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 cross == null then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} @@ -435,7 +451,9 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - --target=${stdenv.cross.config} + --build=${buildPlatform.config} + --host=${hostPlatform.config} + --target=${targetPlatform.config} ${xwithArch} ${xwithCpu} ${xwithAbi} @@ -484,7 +502,7 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-idirafter ${getDev libcCross}/include" ] ++ optionals (! crossStageStatic) [ @@ -493,7 +511,7 @@ stdenv.mkDerivation ({ else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-Wl,-L${libcCross.out}/lib" ] ++ (if crossStageStatic then [ @@ -541,13 +559,13 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; } +# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch new file mode 100644 index 000000000000..ee48901a6d0c --- /dev/null +++ b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch @@ -0,0 +1,46 @@ +This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958, +which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths. + +--- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC ++++ b/gcc/auto-profile.c +@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3. + . */ + + #include "config.h" +-#include "system.h" +- +-#include + #include + #include ++#include "system.h" + + #include "coretypes.h" + #include "hash-set.h" +--- a/gcc/graphite-isl-ast-to-gimple.c 2017-01-19 21:02:12 UTC ++++ b/gcc/graphite-isl-ast-to-gimple.c +@@ -38,6 +38,7 @@ extern "C" { + #endif + #endif + ++#include + #include "system.h" + #include "coretypes.h" + #include "hash-set.h" +@@ -75,7 +76,6 @@ extern "C" { + #include "tree-scalar-evolution.h" + #include "gimple-ssa.h" + #include "tree-into-ssa.h" +-#include + + #ifdef HAVE_isl + #include "graphite-poly.h" +--- a/gcc/system.h 2015-01-05 12:33:28 UTC ++++ b/gcc/system.h +@@ -217,6 +217,7 @@ extern int errno; + #ifdef __cplusplus + # include + # include ++# include + # include + #endif + diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index c6fac16a76ca..b091fd1ae370 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false -, langObjC ? stdenv.isDarwin -, langObjCpp ? stdenv.isDarwin +, langObjC ? targetPlatform.isDarwin +, langObjCpp ? targetPlatform.isDarwin , langJava ? false , langAda ? false , langVhdl ? false @@ -25,8 +25,6 @@ , enableMultilib ? false , enablePlugin ? true # whether to support user-supplied plug-ins , name ? "gcc" -, cross ? null -, binutilsCross ? null , libcCross ? null , crossStageStatic ? true , gnat ? null @@ -36,6 +34,7 @@ , binutils ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null +, buildPlatform, hostPlatform, targetPlatform }: assert langJava -> zip != null && unzip != null @@ -48,10 +47,10 @@ assert langVhdl -> gnat != null; assert libelf != null -> zlib != null; # Make sure we get GNU sed. -assert stdenv.isDarwin -> gnused != null; +assert hostPlatform.isDarwin -> gnused != null; # Need c++filt on darwin -assert stdenv.isDarwin -> binutils != null; +assert hostPlatform.isDarwin -> binutils != null; # The go frontend is written in c++ assert langGo -> langCC; @@ -59,16 +58,16 @@ 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 = cross != null && cross.config == "i586-pc-gnu"; + crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; enableParallelBuilding = true; patches = [ ../use-source-date-epoch.patch ] - ++ optional (cross != null) ../libstdc++-target.patch + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. @@ -121,15 +120,15 @@ let version = "6.3.0"; withMode; /* Cross-gcc settings */ - crossMingw = cross != null && cross.libc == "msvcrt"; - crossDarwin = cross != null && cross.libc == "libSystem"; + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = let - gccArch = stdenv.cross.gcc.arch or null; - gccCpu = stdenv.cross.gcc.cpu or null; - gccAbi = stdenv.cross.gcc.abi or null; - gccFpu = stdenv.cross.gcc.fpu or null; - gccFloat = stdenv.cross.gcc.float or null; - gccMode = stdenv.cross.gcc.mode or null; + gccArch = targetPlatform.gcc.arch or null; + gccCpu = targetPlatform.gcc.cpu or null; + gccAbi = targetPlatform.gcc.abi or null; + gccFpu = targetPlatform.gcc.fpu or null; + gccFloat = targetPlatform.gcc.float or null; + gccMode = targetPlatform.gcc.mode or null; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; @@ -137,13 +136,16 @@ let version = "6.3.0"; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; in - "--target=${cross.config}" + + "--target=${targetPlatform.config}" + withArch + withCpu + withAbi + withFpu + withFloat + withMode + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${targetPlatform.config}-as" + + " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + @@ -168,11 +170,6 @@ let version = "6.3.0"; else (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot" else " --with-headers=${getDev libcCross}/include") + - # Ensure that -print-prog-name is able to find the correct programs. - (stdenv.lib.optionalString (crossMingw || crossDarwin) ( - " --with-as=${binutilsCross}/bin/${cross.config}-as" + - " --with-ld=${binutilsCross}/bin/${cross.config}-ld" - )) + " --enable-__cxa_atexit" + " --enable-long-long" + (if crossMingw then @@ -188,7 +185,7 @@ let version = "6.3.0"; " --disable-shared" + # To keep ABI compatibility with upstream mingw-w64 " --enable-fully-dynamic-string" - else (if cross.libc == "uclibc" then + else (if targetPlatform.libc == "uclibc" then # libsanitizer requires netrom/netrom.h which is not # available in uclibc. " --disable-libsanitizer" + @@ -200,9 +197,9 @@ let version = "6.3.0"; " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = cross == null; + bootstrap = targetPlatform == hostPlatform; in @@ -215,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; @@ -230,7 +227,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; postPatch = - if (stdenv.isGNU + if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") @@ -266,7 +263,7 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' '' - else if cross != null || stdenv.cc.libc != null then + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -295,19 +292,19 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals (targetPlatform != hostPlatform) [binutils]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional stdenv.isDarwin gnused) - ++ (optional stdenv.isDarwin binutils) + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional hostPlatform.isDarwin binutils) ; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" @@ -317,7 +314,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; configureFlags = " - ${if stdenv.isSunOS then + ${if hostPlatform.isSunOS then " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + # On Illumos/Solaris GNU as is preferred " --with-gnu-as --without-gnu-ld " @@ -361,19 +358,19 @@ stdenv.mkDerivation ({ ) ) } - ${if cross == null - then if stdenv.isDarwin + ${if targetPlatform == hostPlatform + then if hostPlatform.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} + ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} - ${if cross == null then platformFlags else ""} + ${if targetPlatform == hostPlatform then platformFlags else ""} "; - targetConfig = if cross != null then cross.config else null; + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -385,28 +382,28 @@ stdenv.mkDerivation ({ else "install"; crossAttrs = let - xgccArch = stdenv.cross.gcc.arch or null; - xgccCpu = stdenv.cross.gcc.cpu or null; - xgccAbi = stdenv.cross.gcc.abi or null; - xgccFpu = stdenv.cross.gcc.fpu or null; - xgccFloat = stdenv.cross.gcc.float or null; + xgccArch = targetPlatform.gcc.arch or null; + xgccCpu = targetPlatform.gcc.cpu or null; + xgccAbi = targetPlatform.gcc.abi or null; + xgccFpu = targetPlatform.gcc.fpu or null; + xgccFloat = targetPlatform.gcc.float or null; xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; in { - AR = "${stdenv.cross.config}-ar"; - LD = "${stdenv.cross.config}-ld"; - CC = "${stdenv.cross.config}-gcc"; - CXX = "${stdenv.cross.config}-gcc"; - AR_FOR_TARGET = "${stdenv.cross.config}-ar"; - LD_FOR_TARGET = "${stdenv.cross.config}-ld"; - CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; - NM_FOR_TARGET = "${stdenv.cross.config}-nm"; - CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + 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 cross == null then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} @@ -433,7 +430,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - --target=${stdenv.cross.config} + --target=${targetPlatform.config} ${xwithArch} ${xwithCpu} ${xwithAbi} @@ -482,7 +479,7 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-idirafter ${getDev libcCross}/include" ] ++ optionals (! crossStageStatic) [ @@ -491,7 +488,7 @@ stdenv.mkDerivation ({ else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ + if targetPlatform != hostPlatform && libcCross != null then [ "-Wl,-L${libcCross.out}/lib" ] ++ (if crossStageStatic then [ @@ -539,13 +536,13 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; } +# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix new file mode 100644 index 000000000000..5d3126ea0e96 --- /dev/null +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -0,0 +1,550 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langObjC ? targetPlatform.isDarwin +, langObjCpp ? targetPlatform.isDarwin +, langJava ? false +, langAda ? false +, langVhdl ? false +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man); required for Java +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null, boehmgc ? null +, zip ? null, unzip ? null, pkgconfig ? null +, gtk2 ? null, libart_lgpl ? null +, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, x11Support ? langJava +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? true # whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, crossStageStatic ? true +, gnat ? null +, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true +, gnused ? null +, binutils ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null +, flex ? null +, buildPlatform, hostPlatform, targetPlatform +}: + +assert langJava -> zip != null && unzip != null + && zlib != null && boehmgc != null + && perl != null; # for `--enable-java-home' +assert langAda -> gnatboot != null; +assert langVhdl -> gnat != null; + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert hostPlatform.isDarwin -> gnused != null; + +# Need c++filt on darwin +assert hostPlatform.isDarwin -> binutils != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "7.1.0"; + + # Whether building a cross-compiler for GNU/Hurd. + crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; + + enableParallelBuilding = true; + + patches = + [ ] + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + # 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; + + javaEcj = fetchurl { + # The `$(top_srcdir)/ecj.jar' file is automatically picked up at + # `configure' time. + + # XXX: Eventually we might want to take it from upstream. + url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; + sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; + }; + + # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a + # binary distribution here to allow the whole chain to be bootstrapped. + javaAntlr = fetchurl { + url = http://www.antlr.org/download/antlr-4.4-complete.jar; + sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; + }; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender libXrandr libXi + xproto renderproto xextproto inputproto randrproto + ]; + + javaAwtGtk = langJava && x11Support; + + /* Platform flags */ + platformFlags = let + gccArch = stdenv.platform.gcc.arch or null; + gccCpu = stdenv.platform.gcc.cpu or null; + gccAbi = stdenv.platform.gcc.abi or null; + gccFpu = stdenv.platform.gcc.fpu or null; + gccFloat = stdenv.platform.gcc.float or null; + gccMode = stdenv.platform.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode; + + /* Cross-gcc settings */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; + crossConfigureFlags = let + gccArch = targetPlatform.gcc.arch or null; + gccCpu = targetPlatform.gcc.cpu or null; + gccAbi = targetPlatform.gcc.abi or null; + gccFpu = targetPlatform.gcc.fpu or null; + gccFloat = targetPlatform.gcc.float or null; + gccMode = targetPlatform.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + "--target=${targetPlatform.config}" + + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${targetPlatform.config}-as" + + " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" + + (if crossMingw && crossStageStatic then + " --with-headers=${libcCross}/include" + + " --with-gcc" + + " --with-gnu-as" + + " --with-gnu-ld" + + " --with-gnu-ld" + + " --disable-shared" + + " --disable-nls" + + " --disable-debug" + + " --enable-sjlj-exceptions" + + " --enable-threads=win32" + + " --disable-win32-registry" + else if crossStageStatic then + " --disable-libssp --disable-nls" + + " --without-headers" + + " --disable-threads " + + " --disable-libgomp " + + " --disable-libquadmath" + + " --disable-shared" + + " --disable-libatomic " + # libatomic requires libc + " --disable-decimal-float" # libdecnumber requires libc + else + (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot" + else " --with-headers=${getDev libcCross}/include") + + # Ensure that -print-prog-name is able to find the correct programs. + " --enable-__cxa_atexit" + + " --enable-long-long" + + (if crossMingw then + " --enable-threads=win32" + + " --enable-sjlj-exceptions" + + " --enable-hash-synchronization" + + " --disable-libssp" + + " --disable-nls" + + " --with-dwarf2" + + # I think noone uses shared gcc libs in mingw, so we better do the same. + # In any case, mingw32 g++ linking is broken by default with shared libs, + # unless adding "-lsupc++" to any linking command. I don't know why. + " --disable-shared" + + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" + else (if targetPlatform.libc == "uclibc" then + # libsanitizer requires netrom/netrom.h which is not + # available in uclibc. + " --disable-libsanitizer" + + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + " --disable-libgomp" else "") + + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) + ); + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + + bootstrap = targetPlatform == hostPlatform; + +in + +# We need all these X libraries when building AWT with GTK+. +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" ]; + + postPatch = + if (hostPlatform.isHurd + || (libcCross != null # e.g., building `gcc.crossDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") + || (crossGNU && libcCross != null)) + then + # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not + # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; + let + libc = if libcCross != null then libcCross else stdenv.glibc; + gnu_h = "gcc/config/gnu.h"; + extraCPPDeps = + libc.propagatedBuildInputs + ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross + ++ stdenv.lib.optional (libpthread != null) libpthread; + extraCPPSpec = + concatStrings (intersperse " " + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); + extraLibSpec = + if libpthreadCross != null + then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" + else "-L${libpthread}/lib"; + in + '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." + sed -i "${gnu_h}" \ + -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' + + echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." + sed -i "${gnu_h}" \ + -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + '' + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q LIBC_DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + done + '' + else null; + + inherit noSysDirs staticCompiler langJava crossStageStatic + libcCross crossMingw; + + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig); + + buildInputs = [ gmp mpfr libmpc libelf flex ] + ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + ++ (optionals langJava [ boehmgc zip unzip ]) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) + ++ (optionals (targetPlatform != hostPlatform) [binutils]) + ++ (optionals langAda [gnatboot]) + ++ (optionals langVhdl [gnat]) + + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional hostPlatform.isDarwin binutils) + ; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + ''; + + dontDisableStatic = true; + + configureFlags = " + ${if hostPlatform.isSunOS then + " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + + # On Illumos/Solaris GNU as is preferred + " --with-gnu-as --without-gnu-ld " + else ""} + --enable-lto + ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if enablePlugin then "--enable-plugin" else "--disable-plugin"} + ${optionalString (isl != null) "--with-isl=${isl}"} + ${if langJava then + "--with-ecj-jar=${javaEcj} " + + + # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See + # . + "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " + else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib + --with-mpc=${libmpc} + ${if libelf != null then "--with-libelf=${libelf}" else ""} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-static + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + } + ${if targetPlatform == hostPlatform + then if hostPlatform.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" + else ""} + ${if langAda then " --enable-libada" else ""} + ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} + ${if !bootstrap then "--disable-bootstrap" else ""} + ${if targetPlatform == hostPlatform then platformFlags else ""} + "; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = if bootstrap then + (if profiledCompiler then "profiledbootstrap" else "bootstrap") + else ""; + + installTargets = + if stripped + then "install-strip" + else "install"; + + crossAttrs = let + xgccArch = targetPlatform.gcc.arch or null; + xgccCpu = targetPlatform.gcc.cpu or null; + xgccAbi = targetPlatform.gcc.abi or null; + xgccFpu = targetPlatform.gcc.fpu or null; + xgccFloat = targetPlatform.gcc.float or null; + xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; + xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; + xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; + xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; + xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; + in { + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + NM_FOR_TARGET = "${targetPlatform.config}-nm"; + CXX_FOR_TARGET = "${targetPlatform.config}-g++"; + # If we are making a cross compiler, targetPlatform != hostPlatform + NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + dontStrip = true; + configureFlags = '' + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} + --with-mpc=${libmpc.crossDrv} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if langAda then " --enable-libada" else ""} + --target=${targetPlatform.config} + ${xwithArch} + ${xwithCpu} + ${xwithAbi} + ${xwithFpu} + ${xwithFloat} + ''; + buildFlags = ""; + }; + + + # Needed for the cross compilation to work + AR = "ar"; + LD = "ld"; + # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find + # the library headers and binaries, regarless of the language being + # compiled. + + # Note: When building the Java AWT GTK+ peer, the build system doesn't + # honor `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just + # add them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + libcCross.propagatedBuildInputs); + + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); + + EXTRA_TARGET_CFLAGS = + if targetPlatform != hostPlatform && libcCross != null then [ + "-idirafter ${getDev libcCross}/include" + ] + ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ] + else null; + + EXTRA_TARGET_LDFLAGS = + if targetPlatform != hostPlatform && libcCross != null then [ + "-Wl,-L${libcCross.out}/lib" + ] + ++ (if crossStageStatic then [ + "-B${libcCross.out}/lib" + ] else [ + "-Wl,-rpath,${libcCross.out}/lib" + "-Wl,-rpath-link,${libcCross.out}/lib" + ]) + ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ] + else null; + + passthru = + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + + inherit enableParallelBuilding enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = http://gcc.gnu.org/; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well + as libraries for these languages (libstdc++, libgcj, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ ]; + + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + optionals (langAda == false) stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index de3e9ba3ef5f..ee56425f00b4 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -212,6 +212,7 @@ postInstall() { # Move runtime libraries to $lib. moveToOutput "lib/lib*.so*" "$lib" moveToOutput "lib/lib*.la" "$lib" + moveToOutput "lib/lib*.dylib" "$lib" moveToOutput "share/gcc-*/python" "$lib" for i in "$lib"/lib/*.{la,py}; do @@ -221,6 +222,7 @@ postInstall() { if [ -n "$enableMultilib" ]; then moveToOutput "lib64/lib*.so*" "$lib" moveToOutput "lib64/lib*.la" "$lib" + moveToOutput "lib64/lib*.dylib" "$lib" for i in "$lib"/lib64/*.{la,py}; do substituteInPlace "$i" --replace "$out" "$lib" @@ -251,6 +253,16 @@ postInstall() { done fi + if type "install_name_tool"; then + for i in "$lib"/lib/*.*.dylib; do + install_name_tool -id "$i" "$i" || true + for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do + new_path=`echo "$old_path" | sed "s,$out,$lib,"` + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + done + fi + # Get rid of some "fixed" header files rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux} diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix deleted file mode 100644 index 48caeea5f1ff..000000000000 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ /dev/null @@ -1,52 +0,0 @@ -# This is a derivation specific to OS X (Darwin) -{gmp, mpfr, libmpc, isl_0_14, cloog, zlib, fetchurl, stdenv - -, Libsystem -}: - -stdenv.mkDerivation rec { - name = "gfortran-${version}"; - version = "5.1.0"; - - buildInputs = [ gmp mpfr libmpc isl_0_14 cloog zlib ]; - - src = fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp"; - }; - - patches = ./gfortran-darwin.patch; - - hardeningDisable = [ "format" ]; - - configureFlags = '' - --disable-bootstrap - --disable-cloog-version-check - --disable-isl-version-check - --disable-multilib - --enable-checking=release - --enable-languages=fortran - --with-cloog=${cloog} - --with-gmp=${gmp.dev} - --with-isl=${isl_0_14} - --with-mpc=${libmpc} - --with-mpfr=${mpfr.dev} - --with-native-system-header-dir=${Libsystem}/include - --with-system-zlib - ''; - - postConfigure = '' - export DYLD_LIBRARY_PATH=`pwd`/`uname -m`-apple-darwin`uname -r`/libgcc - ''; - - makeFlags = [ "CC=clang" ]; - - passthru.cc = stdenv.cc.cc; - - meta = with stdenv.lib; { - description = "GNU Fortran compiler, part of the GNU Compiler Collection"; - homepage = "https://gcc.gnu.org/fortran/"; - license = licenses.gpl3Plus; - platforms = platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.patch b/pkgs/development/compilers/gcc/gfortran-darwin.patch deleted file mode 100644 index 73c5d35153b0..000000000000 --- a/pkgs/development/compilers/gcc/gfortran-darwin.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/gcc/config/darwin-c.c 2015-01-09 22:18:42.000000000 +0200 -+++ b/gcc/config/darwin-c.c 2015-06-27 04:17:58.000000000 +0300 -@@ -490,8 +490,7 @@ - - static const char *framework_defaults [] = - { -- "/System/Library/Frameworks", -- "/Library/Frameworks", -+// stdenvDarwinPure - }; - - /* Register the GNU objective-C runtime include path if STDINC. */ - - /* Register the GNU objective-C runtime include path if STDINC. */ ---- a/gcc/cppdefault.c 2015-01-05 14:33:28.000000000 +0200 -+++ b/gcc/cppdefault.c 2015-06-27 04:16:15.000000000 +0300 -@@ -35,6 +35,9 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+// stdenvDarwinPure -+# undef LOCAL_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix new file mode 100644 index 000000000000..f3d8d27d90c6 --- /dev/null +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -0,0 +1,550 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langObjC ? targetPlatform.isDarwin +, langObjCpp ? targetPlatform.isDarwin +, langJava ? false +, langAda ? false +, langVhdl ? false +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man); required for Java +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null, boehmgc ? null +, zip ? null, unzip ? null, pkgconfig ? null +, gtk2 ? null, libart_lgpl ? null +, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, x11Support ? langJava +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? true # whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, crossStageStatic ? true +, gnat ? null +, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true +, gnused ? null +, binutils ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null +, flex ? null +, buildPlatform, hostPlatform, targetPlatform +}: + +assert langJava -> zip != null && unzip != null + && zlib != null && boehmgc != null + && perl != null; # for `--enable-java-home' +assert langAda -> gnatboot != null; +assert langVhdl -> gnat != null; + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert hostPlatform.isDarwin -> gnused != null; + +# Need c++filt on darwin +assert hostPlatform.isDarwin -> binutils != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "7-20170409"; + + # Whether building a cross-compiler for GNU/Hurd. + crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; + + enableParallelBuilding = true; + + patches = + [ ] + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + # 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; + + javaEcj = fetchurl { + # The `$(top_srcdir)/ecj.jar' file is automatically picked up at + # `configure' time. + + # XXX: Eventually we might want to take it from upstream. + url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; + sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; + }; + + # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a + # binary distribution here to allow the whole chain to be bootstrapped. + javaAntlr = fetchurl { + url = http://www.antlr.org/download/antlr-4.4-complete.jar; + sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; + }; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender libXrandr libXi + xproto renderproto xextproto inputproto randrproto + ]; + + javaAwtGtk = langJava && x11Support; + + /* Platform flags */ + platformFlags = let + gccArch = stdenv.platform.gcc.arch or null; + gccCpu = stdenv.platform.gcc.cpu or null; + gccAbi = stdenv.platform.gcc.abi or null; + gccFpu = stdenv.platform.gcc.fpu or null; + gccFloat = stdenv.platform.gcc.float or null; + gccMode = stdenv.platform.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode; + + /* Cross-gcc settings */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; + crossConfigureFlags = let + gccArch = targetPlatform.gcc.arch or null; + gccCpu = targetPlatform.gcc.cpu or null; + gccAbi = targetPlatform.gcc.abi or null; + gccFpu = targetPlatform.gcc.fpu or null; + gccFloat = targetPlatform.gcc.float or null; + gccMode = targetPlatform.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + "--target=${targetPlatform.config}" + + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode + + # Ensure that -print-prog-name is able to find the correct programs. + " --with-as=${binutils}/bin/${targetPlatform.config}-as" + + " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" + + (if crossMingw && crossStageStatic then + " --with-headers=${libcCross}/include" + + " --with-gcc" + + " --with-gnu-as" + + " --with-gnu-ld" + + " --with-gnu-ld" + + " --disable-shared" + + " --disable-nls" + + " --disable-debug" + + " --enable-sjlj-exceptions" + + " --enable-threads=win32" + + " --disable-win32-registry" + else if crossStageStatic then + " --disable-libssp --disable-nls" + + " --without-headers" + + " --disable-threads " + + " --disable-libgomp " + + " --disable-libquadmath" + + " --disable-shared" + + " --disable-libatomic " + # libatomic requires libc + " --disable-decimal-float" # libdecnumber requires libc + else + (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot" + else " --with-headers=${getDev libcCross}/include") + + # Ensure that -print-prog-name is able to find the correct programs. + " --enable-__cxa_atexit" + + " --enable-long-long" + + (if crossMingw then + " --enable-threads=win32" + + " --enable-sjlj-exceptions" + + " --enable-hash-synchronization" + + " --disable-libssp" + + " --disable-nls" + + " --with-dwarf2" + + # I think noone uses shared gcc libs in mingw, so we better do the same. + # In any case, mingw32 g++ linking is broken by default with shared libs, + # unless adding "-lsupc++" to any linking command. I don't know why. + " --disable-shared" + + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" + else (if targetPlatform.libc == "uclibc" then + # libsanitizer requires netrom/netrom.h which is not + # available in uclibc. + " --disable-libsanitizer" + + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + " --disable-libgomp" else "") + + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) + ); + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + + bootstrap = targetPlatform == hostPlatform; + +in + +# We need all these X libraries when building AWT with GTK+. +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2"; + sha256 = "19197rw1xrpkb8h10lfgn6zj7yj52x95hdmr0x5lg8i4v3i23b67"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" ]; + + postPatch = + if (hostPlatform.isHurd + || (libcCross != null # e.g., building `gcc.crossDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") + || (crossGNU && libcCross != null)) + then + # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not + # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; + let + libc = if libcCross != null then libcCross else stdenv.glibc; + gnu_h = "gcc/config/gnu.h"; + extraCPPDeps = + libc.propagatedBuildInputs + ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross + ++ stdenv.lib.optional (libpthread != null) libpthread; + extraCPPSpec = + concatStrings (intersperse " " + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); + extraLibSpec = + if libpthreadCross != null + then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" + else "-L${libpthread}/lib"; + in + '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." + sed -i "${gnu_h}" \ + -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' + + echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." + sed -i "${gnu_h}" \ + -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + '' + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q LIBC_DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + done + '' + else null; + + inherit noSysDirs staticCompiler langJava crossStageStatic + libcCross crossMingw; + + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig); + + buildInputs = [ gmp mpfr libmpc libelf flex ] + ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + ++ (optionals langJava [ boehmgc zip unzip ]) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) + ++ (optionals (targetPlatform != hostPlatform) [binutils]) + ++ (optionals langAda [gnatboot]) + ++ (optionals langVhdl [gnat]) + + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional hostPlatform.isDarwin binutils) + ; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + ''; + + dontDisableStatic = true; + + configureFlags = " + ${if hostPlatform.isSunOS then + " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + + # On Illumos/Solaris GNU as is preferred + " --with-gnu-as --without-gnu-ld " + else ""} + --enable-lto + ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if enablePlugin then "--enable-plugin" else "--disable-plugin"} + ${optionalString (isl != null) "--with-isl=${isl}"} + ${if langJava then + "--with-ecj-jar=${javaEcj} " + + + # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See + # . + "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " + else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib + --with-mpc=${libmpc} + ${if libelf != null then "--with-libelf=${libelf}" else ""} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-static + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + } + ${if targetPlatform == hostPlatform + then if hostPlatform.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" + else ""} + ${if langAda then " --enable-libada" else ""} + ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} + ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} + ${if !bootstrap then "--disable-bootstrap" else ""} + ${if targetPlatform == hostPlatform then platformFlags else ""} + "; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = if bootstrap then + (if profiledCompiler then "profiledbootstrap" else "bootstrap") + else ""; + + installTargets = + if stripped + then "install-strip" + else "install"; + + crossAttrs = let + xgccArch = targetPlatform.gcc.arch or null; + xgccCpu = targetPlatform.gcc.cpu or null; + xgccAbi = targetPlatform.gcc.abi or null; + xgccFpu = targetPlatform.gcc.fpu or null; + xgccFloat = targetPlatform.gcc.float or null; + xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; + xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; + xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; + xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; + xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; + in { + AR = "${targetPlatform.config}-ar"; + LD = "${targetPlatform.config}-ld"; + CC = "${targetPlatform.config}-gcc"; + CXX = "${targetPlatform.config}-gcc"; + AR_FOR_TARGET = "${targetPlatform.config}-ar"; + LD_FOR_TARGET = "${targetPlatform.config}-ld"; + CC_FOR_TARGET = "${targetPlatform.config}-gcc"; + NM_FOR_TARGET = "${targetPlatform.config}-nm"; + CXX_FOR_TARGET = "${targetPlatform.config}-g++"; + # If we are making a cross compiler, cross != null + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; + dontStrip = true; + configureFlags = '' + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} + --with-mpc=${libmpc.crossDrv} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if langAda then " --enable-libada" else ""} + --target=${targetPlatform.config} + ${xwithArch} + ${xwithCpu} + ${xwithAbi} + ${xwithFpu} + ${xwithFloat} + ''; + buildFlags = ""; + }; + + + # Needed for the cross compilation to work + AR = "ar"; + LD = "ld"; + # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find + # the library headers and binaries, regarless of the language being + # compiled. + + # Note: When building the Java AWT GTK+ peer, the build system doesn't + # honor `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just + # add them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + libcCross.propagatedBuildInputs); + + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); + + EXTRA_TARGET_CFLAGS = + if targetPlatform != hostPlatform && libcCross != null then [ + "-idirafter ${getDev libcCross}/include" + ] + ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ] + else null; + + EXTRA_TARGET_LDFLAGS = + if targetPlatform != hostPlatform && libcCross != null then [ + "-Wl,-L${libcCross.out}/lib" + ] + ++ (if crossStageStatic then [ + "-B${libcCross.out}/lib" + ] else [ + "-Wl,-rpath,${libcCross.out}/lib" + "-Wl,-rpath-link,${libcCross.out}/lib" + ]) + ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ] + else null; + + passthru = + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + + inherit enableParallelBuilding enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = http://gcc.gnu.org/; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well + as libraries for these languages (libstdc++, libgcj, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ ]; + + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + optionals (langAda == false) stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix new file mode 100644 index 000000000000..22047b663d04 --- /dev/null +++ b/pkgs/development/compilers/gerbil/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, fetchgit, gambit, + coreutils, rsync, bash, + openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: + +stdenv.mkDerivation rec { + name = "gerbil-${version}"; + + version = "0.12-DEV"; + src = fetchgit { + url = "https://github.com/vyzo/gerbil.git"; + rev = "3657b6e940ea248e0b312f276590e38ff68997e7"; + sha256 = "11ys7082ghkm4yikz4qxmv3jpxcr42jfi0jhjw1mpzbqdg6004w2"; + }; + + buildInputs = [ + gambit openssl + coreutils rsync bash + zlib openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb + ]; + + postPatch = '' + patchShebangs . + + find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' + done + ''; + + 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 + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -fa bin lib etc doc $out/ + + cat > $out/bin/gxi < mk/build.mk + ''; +in stdenv.mkDerivation (rec { + inherit version; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; + sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng"; + }; + + postPatch = "patchShebangs ."; + + preConfigure = commonPreConfigure; + + buildInputs = commonBuildInputs; + + enableParallelBuilding = true; + + configureFlags = [ + "CC=${stdenv.cc}/bin/cc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + postInstall = '' + paxmark m $out/lib/${preReleaseName}/bin/{ghc,haddock} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i + done + ''; + + outputs = [ "out" "doc" ]; + + passthru = { + inherit bootPkgs; + } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { + crossCompiler = selfPkgs.ghc.override { + cross = targetPlatform; + bootPkgs = selfPkgs; + }; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs (cross != null) { + name = "${cross.config}-ghc-${version}"; + + preConfigure = commonPreConfigure + '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + 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" + "--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 ]; + + dontSetConfigureCross = true; + + passthru = { + inherit bootPkgs cross; + cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + }; +}) diff --git a/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch new file mode 100644 index 000000000000..90224df19f61 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch @@ -0,0 +1,23 @@ +--- b/includes/rts/storage/ClosureMacros.h 2017-05-21 12:54:09.000000000 +0200 ++++ a/includes/rts/storage/ClosureMacros.h 2017-05-21 12:55:57.000000000 +0200 +@@ -499,8 +499,17 @@ + + -------------------------------------------------------------------------- */ + +-#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING)) +-#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS)) ++#if defined(PROFILING) ++#define ZERO_SLOP_FOR_LDV_PROF 1 ++#else ++#define ZERO_SLOP_FOR_LDV_PROF 0 ++#endif ++ ++#if defined(DEBUG) && !defined(THREADED_RTS) ++#define ZERO_SLOP_FOR_SANITY_CHECK 1 ++#else ++#define ZERO_SLOP_FOR_SANITY_CHECK 0 ++#endif + + #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK + #define OVERWRITING_CLOSURE(c) overwritingClosure(c) + diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index ed6f4717446d..f199048353c0 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -48,6 +48,7 @@ in stdenv.mkDerivation (rec { configureFlags = [ "CC=${stdenv.cc}/bin/cc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--datadir=$doc/share/doc/ghc" ] ++ stdenv.lib.optional (! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ @@ -74,6 +75,8 @@ in stdenv.mkDerivation (rec { done ''; + outputs = [ "out" "doc" ]; + passthru = { inherit bootPkgs; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { @@ -98,26 +101,26 @@ in stdenv.mkDerivation (rec { ''; configureFlags = [ - "CC=${stdenv.ccCross}/bin/${cross.config}-cc" - "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld" - "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar" - "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm" - "RANLIB=${stdenv.binutilsCross}/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.binutilsCross ]; + 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.binutilsCross}/bin/${cross.config}-ld"; + ld = "${stdenv.cc}/bin/${cross.config}-ld"; }; }) diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index ac9419d662ec..4c9ae16a3134 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -19,7 +19,6 @@ , executable-path , transformers-compat , haddock-api -, ghcjs-prim , regex-posix , callPackage @@ -122,7 +121,7 @@ in mkDerivation (rec { alex happy git gnumake autoconf automake libtool patch gmp base16-bytestring cryptohash executable-path haddock-api transformers-compat QuickCheck haddock hspec xhtml - ghcjs-prim regex-posix libiconv + regex-posix libiconv ]; buildTools = [ nodejs git ]; testDepends = [ @@ -191,6 +190,6 @@ in mkDerivation (rec { description = "A Haskell to JavaScript compiler that uses the GHC API"; license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ]; inherit broken; }) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index eda724e5947b..f23da1149c51 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -2,5 +2,5 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs; - broken = true; # http://hydra.nixos.org/build/45110274 + broken = false; } diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 1c347655ebed..01b13262ef0c 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,22 +1,24 @@ { fetchgit, fetchFromGitHub, bootPkgs }: bootPkgs.callPackage ./base.nix { - version = "0.2.020161101"; + version = "0.2.020170323"; - # deprecated on HEAD, directly included in the distribution - ghcjs-prim = null; inherit bootPkgs; ghcjsSrc = fetchFromGitHub { - owner = "ghcjs"; + # TODO: switch back to the regular ghcjs repo + # when https://github.com/ghcjs/ghcjs/pull/573 is merged. + owner = "k0001"; repo = "ghcjs"; - rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6"; - sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz"; + rev = "600015e085a28da601b65a41c513d4a458fcd184"; + sha256 = "01kirrg0fnfwhllvwgfqjiwzwj4yv4lyig87x61n9jp6y5shzjdx"; }; ghcjsBootSrc = fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; - sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; + # TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git + # when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged. + url = git://github.com/basvandijk/ghcjs-boot.git; + rev = "19a3b157ecb807c2224daffda5baecc92b76af35"; + sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb"; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix index 765a384bf634..d4247f51b3e3 100644 --- a/pkgs/development/compilers/ghcjs/head_stage2.nix +++ b/pkgs/development/compilers/ghcjs/head_stage2.nix @@ -2,107 +2,117 @@ { async = callPackage - ({ mkDerivation, base, HUnit, stdenv, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.1.0"; - src = "${ghcjsBoot}/boot/async"; - doCheck = false; - libraryHaskellDepends = [ base stm ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = "https://github.com/simonmar/async"; - description = "Run IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, HUnit, stm, test-framework + , test-framework-hunit, stdenv + }: + mkDerivation { + pname = "async"; + version = "2.1.1"; + src = "${ghcjsBoot}/boot/async"; + doCheck = false; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + jailbreak = true; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + }) {}; aeson = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific - , stdenv, syb, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.11.2.0"; - src = "${ghcjsBoot}/boot/aeson"; - doCheck = false; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist fail ghc-prim - hashable mtl scientific syb tagged template-haskell text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring containers ghc-prim HUnit QuickCheck - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - jailbreak = true; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, deepseq, directory + , dlist, fetchgit, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, stdenv, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, time-locale-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.1.1.0"; + src = "${ghcjsBoot}/boot/aeson"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable scientific tagged template-haskell text time + time-locale-compat unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers directory dlist filepath generic-deriving + ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck + quickcheck-instances scientific tagged template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 text + time time-locale-compat unordered-containers uuid-types vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; attoparsec = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , QuickCheck, quickcheck-unicode, scientific, stdenv - , test-framework, test-framework-quickcheck2, text, transformers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.0.2"; - src = "${ghcjsBoot}/boot/attoparsec"; - doCheck = false; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring containers deepseq QuickCheck - quickcheck-unicode scientific test-framework - test-framework-quickcheck2 text transformers vector - ]; - jailbreak = true; - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector, stdenv + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.1.0"; + src = "${ghcjsBoot}/boot/attoparsec"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; case-insensitive = callPackage - ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "case-insensitive"; - version = "1.2.0.6"; - src = "${ghcjsBoot}/boot/case-insensitive"; - doCheck = false; - libraryHaskellDepends = [ base bytestring deepseq hashable text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit text - ]; - jailbreak = true; - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , HUnit, test-framework, test-framework-hunit, text, stdenv + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.0.8"; + src = "${ghcjsBoot}/boot/case-insensitive"; + doCheck = false; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + }) {}; dlist = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: - mkDerivation { - pname = "dlist"; - version = "0.7.1.2"; - src = "${ghcjsBoot}/boot/dlist"; - doCheck = false; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - jailbreak = true; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; + mkDerivation { + pname = "dlist"; + version = "0.8.0.2"; + src = "${ghcjsBoot}/boot/dlist"; + doCheck = false; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; extensible-exceptions = callPackage ({ mkDerivation, base, stdenv }: mkDerivation { @@ -175,29 +185,29 @@ license = stdenv.lib.licenses.bsd3; }) {}; scientific = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim - , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , text, vector - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.7"; - src = "${ghcjsBoot}/boot/scientific"; - doCheck = false; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp text vector - ]; - testHaskellDepends = [ - base bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - jailbreak = true; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ 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, stdenv + }: + mkDerivation { + pname = "scientific"; + version = "0.3.4.10"; + src = "${ghcjsBoot}/boot/scientific"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghc-prim hashable + integer-gmp integer-logarithms text vector + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + }) {}; stm = callPackage ({ mkDerivation, array, base, stdenv }: mkDerivation { @@ -224,6 +234,23 @@ description = "Scrap Your Boilerplate"; license = stdenv.lib.licenses.bsd3; }) {}; + tagged = callPackage + ({ mkDerivation, base, deepseq, template-haskell, transformers + , transformers-compat, stdenv + }: + mkDerivation { + pname = "tagged"; + version = "0.8.5"; + src = "${ghcjsBoot}/boot/tagged"; + doCheck = false; + libraryHaskellDepends = [ + base deepseq template-haskell transformers transformers-compat + ]; + jailbreak = true; + homepage = "http://github.com/ekmett/tagged"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = stdenv.lib.licenses.bsd3; + }) {}; text = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq, directory , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode @@ -249,25 +276,52 @@ license = stdenv.lib.licenses.bsd3; }) {}; unordered-containers = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable - , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "unordered-containers"; - version = "0.2.7.0"; - src = "${ghcjsBoot}/boot/unordered-containers"; - doCheck = false; - libraryHaskellDepends = [ base deepseq hashable ]; - testHaskellDepends = [ - base ChasingBottoms containers hashable HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - jailbreak = true; - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2, stdenv + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.7.2"; + src = "${ghcjsBoot}/boot/unordered-containers"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + jailbreak = true; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + uuid-types = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.3"; + src = "${ghcjsBoot}/boot/uuid/uuid-types"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable random text + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq random + ]; + jailbreak = true; + homepage = "https://github.com/aslatter/uuid"; + description = "Type definitions for Universally Unique Identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; vector = callPackage ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck , random, stdenv, template-haskell, test-framework diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix index 0da50570bf59..fa706699449a 100644 --- a/pkgs/development/compilers/ghcjs/shims.nix +++ b/pkgs/development/compilers/ghcjs/shims.nix @@ -2,6 +2,6 @@ fetchFromGitHub { owner = "ghcjs"; repo = "shims"; - rev = "dc034a035aa73db2c5be34145732090bd74c1b57"; - sha256 = "18r8kf7g7d2n0rhwcgiz9gsgdmgln1nmwwyj347bpn4zh17qlkqa"; + rev = "b97015229c58eeab7c1d0bb575794b14a9f6efca"; + sha256 = "1p5adkqvmb1gsv9hnn3if0rdpnaq3v9a1zkfdy282yw05jaaaggz"; } diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index d2384598456d..20e156a72e43 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2016-12-21"; + version = "2017-03-29"; # `vulkan-loader` requires a specific version of `glslang` as specified in - # `/glslang_revision`. + # `/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "807a0d9e2f4e176f75d62ac3c179c81800ec2608"; - sha256 = "02jckgihqhagm73glipb4c6ri5fr3pnbxb5vrznn2vppyfdfghbj"; + rev = "714e58b2fc5a45714596e6aa2f6ac8f64260365c"; + sha256 = "0ihnd0c4mr6ppbv9g7z1abrn8vx66simfzx5q48nqcpnywn35jxv"; }; - patches = [ ./install-headers.patch ]; - buildInputs = [ cmake bison ]; enableParallelBuilding = true; @@ -23,5 +21,6 @@ stdenv.mkDerivation rec { description = "Khronos reference front-end for GLSL and ESSL"; license = licenses.asl20; platforms = platforms.linux; + maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch deleted file mode 100644 index 75f271309780..000000000000 --- a/pkgs/development/compilers/glslang/install-headers.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index c538e84..6ece1ab 100755 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS) - endif(ENABLE_AMD_EXTENSIONS) - - if(ENABLE_NV_EXTENSIONS) -- set(HEADERS -- GLSL.ext.NV.h) -+ list(APPEND -+ HEADERS -+ GLSL.ext.NV.h) - endif(ENABLE_NV_EXTENSIONS) - - add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) -@@ -51,3 +52,5 @@ endif(WIN32) - - install(TARGETS SPIRV SPVRemapper - ARCHIVE DESTINATION lib) -+ -+install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 95d4bdd..e7fda90 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -93,3 +93,8 @@ endif(WIN32) - - install(TARGETS glslang - ARCHIVE DESTINATION lib) -+ -+foreach(file ${HEADERS}) -+ get_filename_component(dir ${file} DIRECTORY) -+ install(FILES ${file} DESTINATION include/glslang/${dir}) -+endforeach() diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix new file mode 100644 index 000000000000..e5ec3659f0b5 --- /dev/null +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, gcc, makeWrapper +, db, gmp, ncurses }: + +let version = { + maj = "2.0"; + min = "rc-2"; +}; +in +stdenv.mkDerivation rec { + name = "gnu-cobol-${version.maj}${version.min}"; + + src = fetchurl { + url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version.maj}/gnu-cobol-${version.maj}_${version.min}.tar.gz"; + sha256 = "1pj7mjnp3l76zvzrh1xa6d4kw3jkvzqh39sbf02kiinq4y65s7zj"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ db gmp ncurses ]; + + postInstall = with stdenv.lib; '' + wrapProgram "$out/bin/cobc" \ + --prefix PATH ':' "${gcc}/bin" \ + --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ + --prefix NIX_CFLAGS_COMPILE ' ' "'$NIX_CFLAGS_COMPILE'" + ''; + + meta = with stdenv.lib; { + description = "An open-source COBOL compiler"; + homepage = http://sourceforge.net/projects/open-cobol/; + license = licenses.gpl3; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b703a92f3ea5..2a1944debd91 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross +{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross , pkgconfig , pcre , Security }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # ParseInLocation fails the test sed -i '/TestParseInSydney/areturn' src/time/format_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go @@ -114,6 +114,13 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.4.patch ./creds-test-1.4.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. + (fetchpatch { + url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; + sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; + }) ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 7d78f5efd104..61408c0ebb34 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, tzdata, iana_etc, go_bootstrap, runCommand +{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand , perl, which, pkgconfig, patch, fetchpatch , pcre , Security, Foundation, bash }: @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { # Remove the timezone naming test sed -i '/TestLoadFixed/areturn' src/time/time_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go '' + lib.optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + lib.optionalString stdenv.isDarwin '' @@ -113,6 +113,14 @@ 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. + (fetchpatch { + url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; + sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; + }) ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 0df2e8d6f7e9..d7a824239b84 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch , pcre, cacert , Security, Foundation, bash }: @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7.4"; + version = "1.7.6"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1ks3xph20afrfp3vqs1sjnkpjb0lgxblv8706wa3iiyg7rka4axv"; + sha256 = "1gacjwbs1qbx8x84746qdxx2xwylirvd31ybgagfglfsl77vi4m2"; }; # perl is used for testing go vet @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { # Remove the timezone naming test sed -i '/TestLoadFixed/areturn' src/time/time_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go @@ -105,11 +105,18 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.7.patch - ./cacert-1.7.patch + ./ssl-cert-file.patch ./creds-test.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. + (fetchpatch { + url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; + sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; + }) ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 00ec11abc47b..8e0b1c7360f5 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch -, pcre, cacert -, Security, Foundation, bash }: +, pcre, cacert, llvm +, Security, Foundation, bash +, makeWrapper, git, subversion, mercurial, bazaar }: let @@ -24,17 +25,17 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8"; + version = "1.8.3"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0plm11rqrqz7frwz0jjcm13x939yhny755ks1adxjzmsngln9prl"; + sha256 = "0g83xm9gb872rsqzwqr1zw5szq69xhynljj2nglg4yyfi7dm2r1c"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]; buildInputs = [ pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -71,20 +72,18 @@ stdenv.mkDerivation rec { # Remove the timezone naming test sed -i '/TestLoadFixed/areturn' src/time/time_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isArm '' + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' - - # Disabling `format_test.go` because it fails on Darwin for an - # unknown reason see: https://github.com/NixOS/nixpkgs/pull/23122#issuecomment-282188727 - rm src/time/format_test.go - substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go @@ -112,12 +111,17 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.8.patch - ./cacert-1.8.patch + ./ssl-cert-file.patch ./creds-test.patch ./remove-test-pie-1.8.patch ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + postPatch = optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" @@ -148,6 +152,9 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) + + # (https://github.com/golang/go/wiki/GoGetTools) + wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/cacert-1.7.patch deleted file mode 100644 index 57f09c975d9c..000000000000 --- a/pkgs/development/compilers/go/cacert-1.7.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go -index a4b33c7..9700b75 100644 ---- a/src/crypto/x509/root_cgo_darwin.go -+++ b/src/crypto/x509/root_cgo_darwin.go -@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = nil - err := C.FetchPEMRoots(&data) -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 59b303d..d4a34ac 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -28,16 +28,25 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - // The linker will not include these unused functions in binaries built with cgo enabled. - - func execSecurityRoots() (*CertPool, error) { -+ var ( -+ mu sync.Mutex -+ roots = NewCertPool() -+ ) -+ -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") - data, err := cmd.Output() - if err != nil { - return nil, err - } - -- var ( -- mu sync.Mutex -- roots = NewCertPool() -- ) - add := func(cert *Certificate) { - mu.Lock() - defer mu.Unlock() -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index 7bcb3d6..3986e1a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - var firstErr error - for _, file := range certFiles { - data, err := ioutil.ReadFile(file) 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 000000000000..e4a3932001e5 --- /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/go/cacert-1.8.patch b/pkgs/development/compilers/go/ssl-cert-file.patch similarity index 92% rename from pkgs/development/compilers/go/cacert-1.8.patch rename to pkgs/development/compilers/go/ssl-cert-file.patch index bf44e123711f..052655eed52c 100644 --- a/pkgs/development/compilers/go/cacert-1.8.patch +++ b/pkgs/development/compilers/go/ssl-cert-file.patch @@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -43,7 +43,7 @@ index 66cdb5e..bb28036 100644 numVerified int // number of execs of 'security verify-cert', for debug stats ) -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -67,7 +67,7 @@ index 7bcb3d6..3986e1a 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix new file mode 100644 index 000000000000..5b241b31ee3e --- /dev/null +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, binutils, autoconf, alex, happy, makeStaticLibraries +, hscolour, xen, automake, gcc, git, zlib, libtool, enableIntegerSimple ? false +}: + +stdenv.mkDerivation rec { + version = "2.4.0"; + name = "HaLVM-${version}"; + isHaLVM = true; + enableParallelBuilding = false; + isGhcjs = false; + src = fetchgit { + rev = "65fad65966eb7e60f234453a35aeb564a09d2595"; + url = "https://github.com/GaloisInc/HaLVM"; + sha256 = "09633h38w0z20cz0wcfp9z5kzv8v1zwcv0wqvgq3c8svqbrxp28k"; + }; + prePatch = '' + sed -i '305 d' Makefile + sed -i '309,439 d' Makefile # Removes RPM packaging + sed -i '20 d' src/scripts/halvm-cabal.in + sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in + ''; + configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ]; + propagatedNativeBuildInputs = [ alex happy ]; + buildInputs = + let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc + ]; in [ bootPkgs.ghc + automake perl git binutils + autoconf xen zlib ncurses.dev + libtool gmp ] ++ haskellPkgs; + preConfigure = '' + autoconf + patchShebangs . + ''; + hardeningDisable = ["all"]; + postInstall = '' + patchShebangs $out/bin + $out/bin/halvm-ghc-pkg recache + ''; + passthru = { + inherit bootPkgs; + cross.config = "halvm"; + cc = "${gcc}/bin/gcc"; + ld = "${binutils}/bin/ld"; + }; + + meta = { + homepage = "http://github.com/GaloisInc/HaLVM"; + description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen"; + platforms = ["x86_64-linux"]; # other platforms don't have Xen + maintainers = with stdenv.lib.maintainers; [ dmjio ]; + inherit (bootPkgs.ghc.meta) license; + }; +} diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a4077408ef00..ca41545eb451 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,42 +1,82 @@ -{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }: +{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }: -stdenv.mkDerivation { - name = "haxe-3.2.1"; +let + generic = { version, sha256, prePatch }: + stdenv.mkDerivation rec { + name = "haxe-${version}"; - buildInputs = [ocaml zlib neko camlp4]; + buildInputs = [ocaml zlib pcre neko camlp4]; - src = fetchgit { - url = "https://github.com/HaxeFoundation/haxe.git"; + src = fetchgit { + url = https://github.com/HaxeFoundation/haxe.git; + inherit sha256; + fetchSubmodules = true; + rev = "refs/tags/${version}"; + }; + + 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"; - fetchSubmodules = true; - - # Tag 3.2.1 - rev = "deab4424399b520750671e51e5f5c2684e942c17"; + 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|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml - ''; - - patches = [ ./haxelib-nix.patch ]; - - 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 = http://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/haxelib-nix.patch b/pkgs/development/compilers/haxe/haxelib-nix.patch deleted file mode 100644 index ed370e8efd12..000000000000 --- a/pkgs/development/compilers/haxe/haxelib-nix.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/src/tools/haxelib/Main.hx b/src/tools/haxelib/Main.hx -index dc18815..def5231 100644 ---- a/extra/haxelib_src/src/tools/haxelib/Main.hx -+++ b/extra/haxelib_src/src/tools/haxelib/Main.hx -@@ -1301,21 +1301,26 @@ class Main { - } - - function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) { -- var pdir = getRepository() + Data.safe(prj); -- if( !FileSystem.exists(pdir) ) -- throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; -- var version = if( version != null ) version else getCurrent(pdir); -- var vdir = pdir + "/" + Data.safe(version); -- if( vdir.endsWith("dev") ) -- vdir = getDev(pdir); -- if( !FileSystem.exists(vdir) ) -- throw "Library "+prj+" version "+version+" is not installed"; -- for( p in l ) -- if( p.project == prj ) { -- if( p.version == version ) -- return; -- throw "Library "+prj+" has two version included "+version+" and "+p.version; -- } -+ var vdir = this.getNixLib(prj); -+ if (vdir == null) { -+ var pdir = getRepository() + Data.safe(prj); -+ if( !FileSystem.exists(pdir) ) -+ throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'"; -+ var version = if( version != null ) version else getCurrent(pdir); -+ var vdir = pdir + "/" + Data.safe(version); -+ if( vdir.endsWith("dev") ) -+ vdir = getDev(pdir); -+ if( !FileSystem.exists(vdir) ) -+ throw "Library "+prj+" version "+version+" is not installed"; -+ for( p in l ) -+ if( p.project == prj ) { -+ if( p.version == version ) -+ return; -+ throw "Library "+prj+" has two version included "+version+" and "+p.version; -+ } -+ } else { -+ version = null; -+ } - var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null; - var inf = Data.readData(json,false); - l.add({ project : prj, version : version, info: inf }); -@@ -1330,15 +1335,21 @@ class Main { - var a = args[argcur++].split(":"); - checkRec(a[0],a[1],list); - } -- var rep = getRepository(); - for( d in list ) { -- var pdir = Data.safe(d.project)+"/"+Data.safe(d.version)+"/"; -- var dir = rep + pdir; -- try { -- dir = getDev(rep+Data.safe(d.project)); -+ var dir = this.getNixLib(d.project); -+ var pdir = Data.safe(d.project)+"/"; -+ if (dir == null) { -+ var rep = getRepository(); -+ pdir += Data.safe(d.version)+"/"; -+ dir = rep + pdir; -+ try { -+ dir = getDev(rep+Data.safe(d.project)); -+ dir = Path.addTrailingSlash(dir); -+ pdir = dir; -+ } catch( e : Dynamic ) {} -+ } else { - dir = Path.addTrailingSlash(dir); -- pdir = dir; -- } catch( e : Dynamic ) {} -+ } - var ndir = dir + "ndll"; - if( FileSystem.exists(ndir) ) { - var sysdir = ndir+"/"+Sys.systemName(); -@@ -1491,23 +1502,43 @@ class Main { - ); - } - -+ function getNixLib(project:String):Null -+ { -+ var hlibPath = Sys.getEnv("HAXELIB_PATH"); -+ if (hlibPath != null) { -+ for (libDir in hlibPath.split(":")) { -+ var fullpath = libDir; -+ fullpath += libDir.substr(-1, 1) == "/" ? "" : "/"; -+ fullpath += Data.safe(project); -+ if (FileSystem.exists(fullpath)) -+ return fullpath; -+ } -+ } -+ return null; -+ } - - function run() { -- var rep = getRepository(); - var project = param("Library"); - var temp = project.split(":"); - project = temp[0]; -- var pdir = rep + Data.safe(project); -- if( !FileSystem.exists(pdir) ) -- throw "Library "+project+" is not installed"; -- pdir += "/"; -- var version = temp[1] != null ? temp[1] : getCurrent(pdir); -- var dev = try getDev(pdir) catch ( e : Dynamic ) null; -- var vdir = dev != null ? dev : pdir + Data.safe(version); - - args.push(cli.cwd); -+ -+ var vdir = this.getNixLib(project); -+ if (vdir == null) { -+ var rep = getRepository(); -+ var pdir = rep + Data.safe(project); -+ if( !FileSystem.exists(pdir) ) -+ throw "Library "+project+" is not installed"; -+ pdir += "/"; -+ var version = temp[1] != null ? temp[1] : getCurrent(pdir); -+ var dev = try getDev(pdir) catch ( e : Dynamic ) null; -+ vdir = dev!=null ? dev : pdir + Data.safe(version); -+ var rdir = vdir + "/run.n"; -+ if( !FileSystem.exists(rdir) ) -+ throw "Library "+project+" version "+version+" does not have a run script"; -+ } - cli.cwd = vdir; -- - var callArgs = - switch try [Data.readData(File.getContent(vdir + '/haxelib.json'), false), null] catch (e:Dynamic) [null, e] { - case [null, e]: diff --git a/pkgs/development/compilers/haxe/hxcpp.nix b/pkgs/development/compilers/haxe/hxcpp.nix deleted file mode 100644 index 56b43fc128ef..000000000000 --- 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 a29e04a989b6..21cc0206859f 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/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 934fbeeb6f9b..5e0970ea12f4 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, bison, flex}: -stdenv.mkDerivation { - name = "iasl-20130117"; +stdenv.mkDerivation rec { + name = "iasl-${version}"; + version = "20170303"; src = fetchurl { - url = http://www.acpica.org/download/acpica-unix-20130117.tar.gz; - sha256 = "1zils7l7gnkbbl8916dlhvij1g625ryb7769zhzffn3flshfdivh"; + url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; + sha256 = "1dc933rr11gv1nlaf5j8ih1chdakbjbjkn34jgbm330zppmck4y0"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 6bc7f66ca299..f8413075ac81 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex_2_6_1, llvmPackages, clangWrapSelf, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { m4 python bison - flex + flex_2_6_1 llvm llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 32d98b1ce135..cfe3d59aba3a 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl +{ stdenv, fetchgit, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , runCommand @@ -54,12 +54,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.5.0"; + version = "0.5.2"; name = "${pname}-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0bhickil88lalp9jdj1kmf4is70zinhx8ha9rng0g3z50r4a2qmv"; + sha256 = "1616f53dj7xc0g2iys8qfbzal6dx55nswnws5g5r44dlbf4hcl0h"; }; prePatch = '' mkdir deps/srccache @@ -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 = '' @@ -166,6 +166,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ''; postInstall = '' diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 0f2f3d12a1ce..e23bee15e1bf 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.1.2-5"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1dhliqd79hydd62xmrn2nwrcqy7lb5svkahkkpx9w3z9s5r0p8j2"; + sha256 = "0whfnn7wf8nil9lb8hl9bccjrzwf9zpbf8pz607zg9x3q8g01p9d"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 0a18f7e01cf6..79b0c9ff898d 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -29,12 +29,16 @@ in stdenv.mkDerivation rec { ''; buildInputs = - [ perl groff cmake libxml2 libffi ] - ++ stdenv.lib.optional (!stdenv.isDarwin) python2 /* + [ perl groff cmake libxml2 libffi python2 ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */; propagatedBuildInputs = [ ncurses zlib ]; + patches = stdenv.lib.optionals (!stdenv.isDarwin) [ + # llvm-config --libfiles returns (non-existing) static libs + ../fix-llvm-config.patch + ]; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -48,7 +52,7 @@ in stdenv.mkDerivation rec { "-DLLVM_REQUIRES_RTTI=1" "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; + ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON"; postBuild = '' rm -fR $out diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 8bb5a6c684bb..c5503da9b838 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -53,7 +53,8 @@ in stdenv.mkDerivation rec { "-DCAN_TARGET_i386=false" ]; - patches = [ ./fix-15974.patch ]; + patches = [ ./fix-15974.patch ] ++ + stdenv.lib.optionals (!stdenv.isDarwin) [../fix-llvm-config.patch ]; postBuild = '' rm -fR $out diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index 535dbbc93d51..f27e3f0089e2 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -42,6 +42,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix index 6a62a6256b4f..d2be57b1a5fa 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix @@ -1,6 +1,12 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: +{ stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }: -stdenv.mkDerivation { +let + # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version + llvm38-and-above = fetchpatch { + url = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch"; + sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr"; + }; +in stdenv.mkDerivation { name = "libc++abi-${version}"; src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; @@ -16,6 +22,13 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin ''; + # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract + # into the libc++abi build environment above. + prePatch = ''( + cd ../libcxx-* + patch -p1 < ${llvm38-and-above} + )''; + installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index d4e7c73ad0de..81aaa7cd65c2 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -53,6 +53,11 @@ in stdenv.mkDerivation rec { ln -sv $PWD/lib $out ''; + patches = stdenv.lib.optionals (!stdenv.isDarwin) [ + # llvm-config --libfiles returns (non-existing) static libs + ../fix-llvm-config.patch + ]; + cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 41e515249eb3..90b8ea2581e8 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -53,6 +53,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch new file mode 100644 index 000000000000..6e56c67c8977 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch @@ -0,0 +1,11 @@ +--- llvm.org/utils/llvm-build/llvmbuild/main.py 2015-10-07 00:24:35.000000000 +0100 ++++ llvm/utils/llvm-build/llvmbuild/main.py 2017-06-16 17:08:39.866586578 +0100 +@@ -413,7 +413,7 @@ + if library_name is None: + library_name_as_cstr = 'nullptr' + else: +- library_name_as_cstr = '"lib%s.a"' % library_name ++ library_name_as_cstr = '"lib%s.so"' % library_name + if is_installed: + is_installed_as_cstr = 'true' + else: diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 9394179a8f94..ee0a50c93978 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -37,7 +37,8 @@ in stdenv.mkDerivation rec { # Fix a segfault in llc # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html - patches = [ ./D17533-1.patch ]; + patches = [ ./D17533-1.patch ] ++ + stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; # hacky fix: New LLVM releases require a newer OS X SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 677c4a526ea4..ec2ec27df363 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -13,7 +13,9 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm python ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libedit libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" @@ -29,12 +31,23 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp ''; + outputs = [ "out" "python" ]; + # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' ln -sv ${llvm}/lib/LLVMgold.so $out/lib ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + + rm $out/bin/c-index-test ''; enableParallelBuilding = true; @@ -42,6 +55,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 62f1514e2315..654e1ce0023b 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -15,10 +15,15 @@ , compiler-rt_src , libcxxabi , debugVersion ? false -, enableSharedLibraries ? true +, enableSharedLibraries ? (buildPlatform == hostPlatform) , darwin +, buildPackages +, buildPlatform +, hostPlatform }: +assert (hostPlatform != buildPlatform) -> !enableSharedLibraries; + let src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; shlib = if stdenv.isDarwin then "dylib" else "so"; @@ -39,12 +44,28 @@ in stdenv.mkDerivation rec { outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; - buildInputs = [ perl groff cmake libxml2 python libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin - [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ]; + nativeBuildInputs = [ + perl + cmake + python + ]; + + buildInputs = [ + groff + libxml2 + libffi + ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + # fix output of llvm-config (fixed in llvm 4.0) + (fetchpatch { + url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch; + sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl"; + }) + ]; + postPatch = "" + '' patch -p1 --reverse < ${fetchpatch { @@ -53,11 +74,15 @@ in stdenv.mkDerivation rec { sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf"; }} '' - # hacky fix: New LLVM releases require a newer OS X SDK than - # 10.9. This is a temporary measure until nixpkgs darwin support is - # updated. + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. I realize that this LLVM isn't used in the stdenv but I want to + # keep it consistent with 4.0. We really shouldn't be copying and pasting all this code around... + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -85,7 +110,9 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool" + ] ++ stdenv.lib.optionals (buildPlatform != hostPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index c0a33f03e0f2..8d40ee3c8aa2 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python }: +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +, fixDarwinDylibNames +, enableManpages ? false +}: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; @@ -6,35 +9,71 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "062n17mfsn85dx3qy1qvq8rfxi7hcbr2nj70v2dah3xmy28i3yaq"} + unpackFile ${fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm python ]; + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libedit libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ + ] ++ stdenv.lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); + ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; patches = [ ./purity.patch ]; + postBuild = stdenv.lib.optionalString enableManpages '' + cmake --build . --target docs-clang-man + ''; + postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt ''; + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableManpages "man"; + # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' ln -sv ${llvm}/lib/LLVMgold.so $out/lib ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + + rm $out/bin/c-index-test + '' + + stdenv.lib.optionalString enableManpages '' + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + + # Move it and other man pages to 'man' output + moveToOutput "share/man" "$man" ''; enableParallelBuilding = true; @@ -42,6 +81,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index aed77b7513ad..9e5bccff3556 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,32 +1,42 @@ -{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: +{ lowPrio, newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: let - callPackage = newScope (self // { inherit stdenv isl release_version version fetch; }); + callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "4.0.0"; - rc = "rc4"; - version = "${release_version}${rc}"; + release_version = "4.0.1"; + version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz"; - # Once 4 is released, use this instead: - # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz"; + url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1bxz2z9mxbx7211xfgsn5inwvpz53d1cqg76h8166dsli27xwkjm"; - clang-tools-extra_src = fetch "clang-tools-extra" "0zkgnnv3srqxf44q4a5n3wpizf71mlq8w5rnwfwhdx777k94s5nx"; + 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; + openmp = callPackage ./openmp.nix {}; + libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; isClang = true; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 753aded54ff7..b74d2fb89dcd 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -3,29 +3,34 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "052fc91y8084830ajfm8nkc0vghafhnfl7l89b68qsyz3ra93i3l"; + src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; postUnpack = '' unpackFile ${libcxxabi.src} export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; + # https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc + patches = [ ./pthread_mach_thread_np.patch ]; + + prePatch = '' + substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" + ''; + preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") ''; - patchPhase = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ cmake llvm libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch new file mode 100644 index 000000000000..8c71f1b815db --- /dev/null +++ b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch @@ -0,0 +1,41 @@ +From bcc92d75df0274b9593ebd097fcae60494e3bffc Mon Sep 17 00:00:00 2001 +From: Asiri Rathnayake +Date: Thu, 26 Jan 2017 10:40:17 +0000 +Subject: [PATCH] Fix chromium build (libcxx) + +Remove the reference to pthread_mach_thread_np() in libcxx headers. + +git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@293167 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + include/__threading_support | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/include/__threading_support b/include/__threading_support +index 13ab769..dfe7fe1 100644 +--- a/include/__threading_support ++++ b/include/__threading_support +@@ -149,11 +149,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag, + void (*init_routine)(void)); + + // Thread id +-#if defined(__APPLE__) && !defined(__arm__) +-_LIBCPP_THREAD_ABI_VISIBILITY +-mach_port_t __libcpp_thread_get_port(); +-#endif +- + _LIBCPP_THREAD_ABI_VISIBILITY + bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2); + +@@ -297,12 +292,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag, + } + + // Thread id +-#if defined(__APPLE__) && !defined(__arm__) +-mach_port_t __libcpp_thread_get_port() { +- return pthread_mach_thread_np(pthread_self()); +-} +-#endif +- + // Returns non-zero if the thread ids are equal, otherwise 0 + bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2) + { diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 23269f605f09..6a3d91101360 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -3,9 +3,10 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "02z8d0q42wfmnnd0rd1yg2x4y50rfrv1k9rq00a86b6803dc7p45"; + src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index e62e50b2d316..776109ee74d1 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -10,9 +10,10 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "00wy4qczh4s6g49sbfmyk21845zx5qc2qpm39bznqz8ynpnh4phc"; + src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; - buildInputs = [ cmake llvm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/4/lldb-libedit.patch b/pkgs/development/compilers/llvm/4/lldb-libedit.patch new file mode 100644 index 000000000000..73459ce6c864 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/lldb-libedit.patch @@ -0,0 +1,30 @@ +From 94764369222a8e6c65420a6981d7f179a18a5417 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 25 May 2017 15:03:42 -0500 +Subject: [PATCH] EditLine.h: libedit supports wide chars on NixOS + +--- + include/lldb/Host/Editline.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h +index faed373bc..b248cdee1 100644 +--- a/include/lldb/Host/Editline.h ++++ b/include/lldb/Host/Editline.h +@@ -43,12 +43,9 @@ + // will only be + // used in cases where this is true. This is a compile time dependecy, for now + // selected per target Platform +-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) ++// (libedit on NixOS is always wide-char capable) + #define LLDB_EDITLINE_USE_WCHAR 1 + #include +-#else +-#define LLDB_EDITLINE_USE_WCHAR 0 +-#endif + + #include "lldb/Host/ConnectionFileDescriptor.h" + #include "lldb/lldb-private.h" +-- +2.13.0 + diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 4fec3ad1a894..7d33179913be 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "14dy1j48nw10w8brkpmla2vjjwfr1mrsl9wfabjfx1j85ywp3h69"; + src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; - patchPhase = '' + patches = [ ./lldb-libedit.patch ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ cmake/modules/LLDBStandalone.cmake @@ -29,14 +30,15 @@ stdenv.mkDerivation { cmake/modules/LLDBStandalone.cmake ''; - buildInputs = [ cmake python which swig ncurses zlib libedit libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ]; + nativeBuildInputs = [ cmake python which swig ]; + buildInputs = [ ncurses zlib libedit libxml2 llvm ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DLLDB_DISABLE_LIBEDIT=ON" + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; enableParallelBuilding = true; @@ -45,6 +47,6 @@ stdenv.mkDerivation { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; license = licenses.ncsa; - platforms = platforms.allBut platforms.darwin; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 1470e7d510fa..abfac1cce143 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -16,12 +16,13 @@ , compiler-rt_src , libcxxabi , debugVersion ? false +, enableManpages ? false , enableSharedLibraries ? true , darwin }: let - src = fetch "llvm" "1ljb5y5wgypk3sy8zcd5qdgsm5hw8vl7cy6874mbf4gnk9k809b1"; + src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib @@ -38,31 +39,31 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; + outputs = [ "out" ] + ++ stdenv.lib.optional enableSharedLibraries "lib" + ++ stdenv.lib.optional enableManpages "man"; - buildInputs = [ perl groff cmake libxml2 python libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin - [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ]; + nativeBuildInputs = [ perl groff cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libxml2 libffi ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; propagatedBuildInputs = [ ncurses zlib ]; - # hacky fix: New LLVM releases require a newer OS X SDK than - # 10.9. This is a temporary measure until nixpkgs darwin support is - # updated. + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + 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 @@ -78,14 +79,21 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code - ] ++ stdenv.lib.optional enableSharedLibraries [ + ] + ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" - ] ++ stdenv.lib.optional (!isDarwin) + ++ stdenv.lib.optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] + ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" - ++ stdenv.lib.optionals (isDarwin) [ + ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool" ]; postBuild = '' @@ -102,15 +110,17 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = "" - + stdenv.lib.optionalString (enableSharedLibraries) '' + postInstall = stdenv.lib.optionalString enableManpages '' + moveToOutput "share/man" "$man" + '' + + 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 new file mode 100644 index 000000000000..0bdf5c71e1f3 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, perl +, version +}: + +stdenv.mkDerivation { + name = "openmp-${version}"; + + src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; + + enableParallelBuilding = true; + + meta = { + description = "Components required to build an executable OpenMP program"; + homepage = http://openmp.llvm.org/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/fix-llvm-config.patch b/pkgs/development/compilers/llvm/fix-llvm-config.patch new file mode 100644 index 000000000000..772c49609275 --- /dev/null +++ b/pkgs/development/compilers/llvm/fix-llvm-config.patch @@ -0,0 +1,13 @@ +diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py +index eacefdf60bf..40d25f5cef8 100644 +--- a/utils/llvm-build/llvmbuild/main.py ++++ b/utils/llvm-build/llvmbuild/main.py +@@ -412,7 +412,7 @@ subdirectories = %s + if library_name is None: + library_name_as_cstr = '0' + else: +- library_name_as_cstr = '"lib%s.a"' % library_name ++ library_name_as_cstr = '"lib%s.so"' % library_name + f.write(' { "%s", %s, %d, { %s } },\n' % ( + name, library_name_as_cstr, is_installed, + ', '.join('"%s"' % dep diff --git a/pkgs/development/compilers/manticore/builder.sh b/pkgs/development/compilers/manticore/builder.sh deleted file mode 100755 index ad72f50a1b31..000000000000 --- a/pkgs/development/compilers/manticore/builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!@shell@ - -source $stdenv/setup -echo "Building Manticore research compiler." -set -xe - -PATH=$smlnj/bin:$PATH - -mkdir -p $out/bin - -# Manticore seems to use the MLB files from the build tree, -# so for now we copy the whole build tree into the store: -cd $out/ -tar xf $src -mv manticore* repo_checkout -cd repo_checkout/ -# TODO: At the very least, this could probably be cut down to a subset -# of the repo. - -${autoconf}/bin/autoheader -Iconfig -${autoconf}/bin/autoconf -Iconfig -./configure --prefix=$out -make build -j -make install diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 7e8312549da9..795830e0e707 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -1,14 +1,41 @@ -{ stdenv, fetchurl, coreutils, autoconf, automake, smlnj }: +{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: -stdenv.mkDerivation rec { +let + rev = "592a5714595b4448b646a7d49df04c285668c2f8"; +in stdenv.mkDerivation rec { name = "manticore-${version}"; version = "2014.08.18"; - builder = ./builder.sh; - src = fetchurl { - url = https://github.com/rrnewton/manticore_temp_mirror/archive/snapshot-20140818.tar.gz; - sha256 = "1x52xpj5gbcpqjqm6aw6ssn901f353zypj3d5scm8i3ad777y29d"; + + src = fetchFromGitHub { + owner = "rrnewton"; + repo = "manticore_temp_mirror"; + sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi"; + inherit rev; }; - inherit stdenv coreutils autoconf automake smlnj; + + enableParallelBuilding = false; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ coreutils smlnj ]; + + autoreconfFlags = "-Iconfig -vfi"; + + unpackPhase = '' + mkdir -p $out + cd $out + unpackFile $src + mv manticore_temp_mirror-${rev}-src repo_checkout + cd repo_checkout + chmod u+w . -R + ''; + + postPatch = '' + patchShebangs . + substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' + ''; + + preInstall = "mkdir -p $out/bin"; meta = { description = "A parallel, pure variant of Standard ML"; diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix index 03ccd776c600..283c34efb321 100644 --- a/pkgs/development/compilers/mono/4.6.nix +++ b/pkgs/development/compilers/mono/4.6.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; - version = "4.6.0.182"; - sha256 = "1sajwl7fqhkcmh697qqjj4z6amzkay7xf7npsvpm10gm071s5qi6"; + version = "4.6.2.16"; + sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9"; }) diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix new file mode 100644 index 000000000000..911ba0ae02a7 --- /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 000000000000..f6e3f5a0100b --- /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 000000000000..1b9c59402bff --- /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/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index a30a97ce9ce5..eb090e8b38ad 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.08"; + version = "2.12.02"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "0ialkla6i63j8fpv840jy7k5mdf2wbqr98bvbcq0dp0b38ls18wx"; + sha256 = "097318bjxvmffbjfd1k89parc04xf5jfxg2rr93581lccwf8kc00"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 493748d369b7..e90f3af704df 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/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 0cebd40afdba..101f8ab64ba5 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "http://nim-lang.org/download/${name}.tar.xz"; - sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy"; + sha256 = "16vsmk4rqnkg9lc9h9jk62ps0x778cdqg6qrs3k6fv2g73cqvq9n"; }; doCheck = true; diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix index 1ded1aed2325..4f49bcf80728 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 = "0"; - sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4"; + 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 000000000000..a63b06a9f628 --- /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 1d12d59998a1..51effd2c7841 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -1,11 +1,17 @@ { stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + jdk = stdenv.mkDerivation { - name = "zulu1.8.0_66-8.11.0.1"; + name = "zulu1.8.0_121-8.20.0.5"; src = fetchurl { - url = http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip; - sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz"; + url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip"; + sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; }; @@ -15,6 +21,9 @@ let mkdir -p $out mv * $out + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/jre/lib/security/ + # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ ''; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 6eb8f67b5f5c..7977881d5f6d 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "121"; - build = "13"; + update = "141"; + build = "15"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1ns0lnl5n05k1kgp8d6fyyk6gx57sx7rmlcc33d3vxhr58560nbv"; + sha256 = "0b2nf1x2wcjn0ijyxhnrhcap4vq43sbblh5kf0qcqmx83cs3z6yh"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0vj5mnqw80r4xqlmiab7wbrkhz3rl8ijhwqplkbs42wad75lvnh8"; + sha256 = "1mirjjywv7mnirrxj5sx3zg6j2864vjvphkn9mxx1pad49by7157"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0mcjjc34jvckg1f1x9v7gik3h5y4kx7skkfgzhknh14637jzb2hs"; + sha256 = "0hhvsrclx58i7ns2v7la2wncnndblppwjncniwcvhnhgl5zhpp31"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0bxf1mrpmxgjmg40yi3ww7lh22f6h0nrvlvf5jwwzf4hb3a3998g"; + sha256 = "1brr72rlpaz70ihymdyp808vw433cr8b11l5qdc76aic2ywbwjyp"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "10f641ngwiqr2z6hbz0xkyfh8h3z7kdxj5b1d30rgynzghf5wksr"; + sha256 = "1d4q531jswzk00kdskzfkgr0f4qmxpc7pg9w8p1gq84yz93wz11k"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1bgjpivlxi0qlmhvz838zzkzz26d4ly8b0c963kx0lpabz8p99xi"; + sha256 = "0haw5095p45w33m8pafnp5r5j2lif8c1271chad5sp4gbbk40ai4"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "17bcb5ic1ifk5rda1dzjd1483k9mah5npjg5dg77iyziq8kprvri"; + sha256 = "0pm2cccy31d9rnkgc2hcxbpjjhf4wbayx18qn736nncvwcwa76bj"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "19fmlipqk9qiv7jc84b0z022q403nyp7b32a5qqqcn6aavdqnf7c"; + sha256 = "1g05vfggjjg51dki28zby27pnd4z1b23fv9kyc3hdmc4bcj306x0"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 8fe775de146f..6db0029730a0 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 @@ -163,11 +171,22 @@ let result = stdenv.mkDerivation rec { 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 2f16acb51d9a..bc556bdfcade 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,9 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "121"; + patchVersion = "141"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp"; - sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp"; + sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5"; + sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784"; + 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 2f16acb51d9a..bc556bdfcade 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "121"; + patchVersion = "141"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp"; - sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp"; + sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5"; + sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784"; + 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/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix new file mode 100644 index 000000000000..b01914afc295 --- /dev/null +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, coreutils }: + +stdenv.mkDerivation rec { + name = "owl-lisp-${version}"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "aoh"; + repo = "owl-lisp"; + rev = "v${version}"; + sha256 = "1rr0icprna3zs834q1pj4xy21cql3pcfknfkqipq01rhnl2893sz"; + }; + + prePatch = '' + substituteInPlace Makefile --replace /usr $out + + for f in tests/run tests/exec.sh ; do + substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo + done + ''; + + # tests are already run as part of the compilation process + doCheck = false; + + meta = with stdenv.lib; { + descripton = "A functional lisp"; + homepage = https://github.com/aoh/owl-lisp; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 8b5d14e7f5fb..390d37dd245f 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,33 +1,38 @@ -{stdenv, fetchurl, autoreconfHook}: +{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: -let - version = "5.6"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "polyml-${version}"; + version = "5.7"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; - buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + buildInputs = [ libffi gmp ]; - src = fetchurl { - url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; - sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0"; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + + configureFlags = [ + "--enable-shared" + "--with-system-libffi" + "--with-gmp" + ]; + + src = fetchFromGitHub { + owner = "polyml"; + repo = "polyml"; + rev = "v${version}"; + sha256 = "10nsljmcl0zjbcc7ifc991ypwfwq5gh4rcp5rg4nnb706c6bs16y"; }; - meta = { + meta = with stdenv.lib; { description = "Standard ML compiler and interpreter"; longDescription = '' Poly/ML is a full implementation of Standard ML. ''; homepage = http://www.polyml.org/; - license = stdenv.lib.licenses.lgpl21; - platforms = with stdenv.lib.platforms; linux; - maintainers = [ #Add your name here! - stdenv.lib.maintainers.z77z - ]; + license = licenses.lgpl21; + platforms = with platforms; (linux ++ darwin); + maintainers = with maintainers; [ z77z yurrriq ]; }; } diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 2c785d2a721d..6e393426b7a8 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.10.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1v314abmhlqsj8iyab61cf8nb4kbddv1ycnw29z53mpbmivk4gn0"; + sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif"; }; buildInputs = [ llvm makeWrapper which ]; @@ -79,11 +79,11 @@ stdenv.mkDerivation ( rec { # Stripping breaks linking for ponyc dontStrip = true; - meta = { + meta = with stdenv.lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = http://www.ponylang.org; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + maintainers = with maintainers; [ doublec kamilchm ]; + platforms = subtractLists platforms.i686 platforms.unix; }; }) diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index cd4859acec21..c91d9d603d54 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-2016-10-10"; + name = "pony-stable-unstable-2017-04-20"; src = fetchFromGitHub { - owner = "jemc"; + owner = "ponylang"; repo = "pony-stable"; - rev = "fdefa26fed93f4ff81c323f29abd47813c515703"; - sha256 = "16inavy697icgryyvn9gcylgh639xxs7lnbrqdzcryvh0ck15qxk"; + 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 new file mode 100644 index 000000000000..306eaa93958f --- /dev/null +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -0,0 +1,26 @@ +{ haskellPackages, mkDerivation, fetchFromGitHub, lib }: + +with lib; + +mkDerivation rec { + pname = "psc-package"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "purescript"; + repo = pname; + rev = "v${version}"; + sha256 = "0vid8vc8n8xj0qa4gnm1any9s18rdh7yn960vgix17r7a3bdndwb"; + }; + + isLibrary = false; + isExecutable = true; + + executableHaskellDepends = with haskellPackages; [ + aeson aeson-pretty optparse-applicative system-filepath turtle + ]; + + description = "An experimental package manager for PureScript"; + license = licenses.bsd3; + maintainers = with lib.maintainers; [ profpatsch ]; +} diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix new file mode 100644 index 000000000000..e364f536c889 --- /dev/null +++ b/pkgs/development/compilers/reason/default.nix @@ -0,0 +1,57 @@ +{ stdenv, makeWrapper, buildOcaml, fetchFromGitHub, + ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }: + +let + version = "2.0.0"; + src = fetchFromGitHub { + owner = "facebook"; + repo = "reason"; + rev = version; + sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy"; + }; + meta = with stdenv.lib; { + homepage = https://facebook.github.io/reason/; + description = "Facebook's friendly syntax to OCaml"; + license = licenses.bsd3; + maintainers = [ maintainers.volth ]; + }; + + reason-parser = buildOcaml { + name = "reason-parser"; + inherit version src meta; + sourceRoot = "reason-${version}-src/reason-parser"; + + minimumSupportedOcamlVersion = "4.02"; + + propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; + buildInputs = [ opam topkg ]; + + createFindlibDestdir = true; + + inherit (topkg) installPhase; + }; +in +buildOcaml { + name = "reason"; + inherit version src meta; + + buildInputs = [ makeWrapper opam topkg reason-parser utop ]; + + buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed + + createFindlibDestdir = true; + + postPatch = '' + substituteInPlace src/reasonbuild.ml --replace "refmt --print binary" "$out/bin/refmt --print binary" + ''; + + installPhase = '' + ${topkg.installPhase} + + wrapProgram $out/bin/reup \ + --prefix PATH : "${opam}/bin" + wrapProgram $out/bin/rtop \ + --prefix PATH : "${utop}/bin" \ + --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH + ''; +} diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index 5205c8fc93f2..93aaeb9e16e4 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -1,56 +1,37 @@ -{ stdenv, callPackage, rustPlatform, cacert, gdb, - targets ? [], targetToolchains ? [], targetPatches ? [] }: +{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: +let + rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); +in rec { - rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix { - shortVersion = "beta-2017-01-07"; - forceBundledLLVM = true; # TODO: figure out why linking fails without this + rustc = callPackage ./rustc.nix { + inherit llvm targets targetPatches targetToolchains rustPlatform; + + version = "beta-2017-05-27"; + configureFlags = [ "--release-channel=beta" ]; - srcRev = "a035041ba450ce3061d78a2bdb9c446eb5321d0d"; - srcSha = "12xsm0yp1y39fvf9j218gxv73j8hhahc53jyv3q58kiriyqvfc1s"; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/2017-05-27/rustc-beta-src.tar.gz"; + sha256 = "9f3f92efef7fb2b4bf38e57e4ff1f416dc221880b90841c4bdaee350801c0b57"; + }; + patches = [ - ./patches/disable-lockfile-check-nightly.patch + ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - inherit targets; - inherit targetPatches; - inherit targetToolchains; - inherit rustPlatform; - }) (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ]; - postUnpack = '' - export CARGO_HOME="$(realpath deps)" - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - ''; - postPatch = '' - ${oldAttrs.postPatch} - # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596 - rm -vr src/test/debuginfo/borrowed-enum.rs || true - rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true - rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true - rm -vr src/test/debuginfo/packed-struct.rs || true - rm -vr src/test/debuginfo/recursive-struct.rs || true - rm -vr src/test/debuginfo/struct-in-enum.rs || true - rm -vr src/test/debuginfo/struct-style-enum.rs || true - rm -vr src/test/debuginfo/tuple-style-enum.rs || true - rm -vr src/test/debuginfo/union-smoke.rs || true - rm -vr src/test/debuginfo/unique-enum.rs || true - - # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed - sed -i "s# def cargo(self):# def cargo(self):\n return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py - substituteInPlace \ - src/bootstrap/config.rs \ - --replace \ - 'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \ - ''$'self.cargo = Some(\n "${rustPlatform.rust.cargo}\\\n /bin/cargo".into());' - ''; - }); + doCheck = false; + }; cargo = callPackage ./cargo.nix rec { - version = "beta-2017-01-10"; - srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0"; - srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj"; - depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp"; + version = "0.18.0"; + srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; + srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; + depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix new file mode 100644 index 000000000000..37b06555bdbd --- /dev/null +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl +, version +, src +, platform +, versionType +}: + +let + inherit (stdenv.lib) optionalString; + + needsPatchelf = stdenv.isLinux; + + bootstrapping = versionType == "bootstrap"; + + installComponents + = "rustc,rust-std-${platform}" + + (optionalString bootstrapping ",rust-docs,cargo") + ; +in + +rec { + inherit buildRustPackage; + + rustc = stdenv.mkDerivation rec { + name = "rustc-${versionType}-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + ./install.sh --prefix=$out \ + --components=${installComponents} + + ${optionalString (needsPatchelf && bootstrapping) '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustdoc" + patchelf \ + --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + ${optionalString needsPatchelf '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustc" + + # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc + # (or similar) here. It causes strange effects where rustc loads + # the wrong libraries in a bootstrap-build causing failures that + # are very hard to track dow. For details, see + # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 + ''} + ''; + + }; + + cargo = stdenv.mkDerivation rec { + name = "cargo-${versionType}-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + buildInputs = [ makeWrapper ]; + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + ./install.sh --prefix=$out \ + --components=cargo + + ${optionalString needsPatchelf '' + patchelf \ + --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + wrapProgram "$out/bin/cargo" \ + --suffix PATH : "${rustc}/bin" + ''; + }; +} diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 91660dcc5b33..ad49b1305706 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, cacert, zlib }: +{ stdenv, fetchurl, makeWrapper, cacert, zlib, curl }: let - inherit (stdenv.lib) optionalString; - platform = if stdenv.system == "i686-linux" then "i686-unknown-linux-gnu" @@ -14,77 +12,30 @@ let then "x86_64-apple-darwin" else throw "missing bootstrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.14.0` + # fetch hashes by patching print-hashes.sh to not use the "$DATE" variable + # then running `print-hashes.sh 1.16.0` bootstrapHash = if stdenv.system == "i686-linux" - then "8d5c75728b44468216f99651dfae9d60ae0696a77105dd2b02942d75f3256840" + then "b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5" else if stdenv.system == "x86_64-linux" - then "c71325cfea1b6f0bdc5189fa4c50ff96f828096ff3f7b5056367f9685d6a4d04" + then "48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd" else if stdenv.system == "i686-darwin" - then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd" + then "26356b14164354725bd0351e8084f9b164abab134fb05cddb7758af35aad2065" else if stdenv.system == "x86_64-darwin" - then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20" + then "2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926" else throw "missing bootstrap hash for platform ${stdenv.system}"; - needsPatchelf = stdenv.isLinux; - src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; sha256 = bootstrapHash; }; - version = "1.14.0"; -in - -rec { - rustc = stdenv.mkDerivation rec { - name = "rustc-bootstrap-${version}"; - - inherit version; - inherit src; - - buildInputs = [ makeWrapper ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=rustc,rust-std-${platform},rust-docs - - ${optionalString needsPatchelf '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/rustc" - ''} - - # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc - # (or similar) here. It causes strange effects where rustc loads - # the wrong libraries in a bootstrap-build causing failures that - # are very hard to track dow. For details, see - # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 - ''; - }; - - cargo = stdenv.mkDerivation rec { - name = "cargo-bootstrap-${version}"; - - inherit version; - inherit src; - - buildInputs = [ makeWrapper zlib rustc ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=cargo - - ${optionalString needsPatchelf '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" - ''} - - wrapProgram "$out/bin/cargo" \ - --suffix PATH : "${rustc}/bin" - ''; - }; -} + # Note: the version MUST be one version prior to the version we're + # building + version = "1.16.0"; +in import ./binaryBuild.nix + { inherit stdenv fetchurl makeWrapper cacert zlib curl; + buildRustPackage = null; + inherit version src platform; + versionType = "bootstrap"; + } diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index f0d7e0dabc27..2d4d6ad4db1f 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,12 +24,6 @@ rustPlatform.buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG=1; postInstall = '' - rm "$out/lib/rustlib/components" \ - "$out/lib/rustlib/install.log" \ - "$out/lib/rustlib/rust-installer-version" \ - "$out/lib/rustlib/uninstall.sh" \ - "$out/lib/rustlib/manifest-cargo" - # NOTE: We override the `http.cainfo` option usually specified in # `.cargo/config`. This is an issue when users want to specify # their own certificate chain as environment variables take diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 91d7cda1c00a..0d7e26e06f47 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,33 +1,35 @@ -{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, - targets ? [], targetToolchains ? [], targetPatches ? [] }: +{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); + version = "1.17.0"; in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.15.1"; - isRelease = true; - forceBundledLLVM = false; + inherit llvm targets targetPatches targetToolchains rustPlatform version; + configureFlags = [ "--release-channel=stable" ]; - srcRev = "021bd294c039bd54aa5c4aa85bcdffb0d24bc892"; - srcSha = "1dp7cjxj8nv960jxkq3p18agh9bpfb69ac14x284jmhwyksim3y7"; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = "4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87"; + }; patches = [ ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - inherit targets; - inherit targetPatches; - inherit targetToolchains; - inherit rustPlatform; }; cargo = callPackage ./cargo.nix rec { - version = "0.16.0"; - srcRev = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420"; - srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya"; - depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq"; + version = "0.18.0"; + srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; + srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; + depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix index d9ae8c140abe..b69dffbd8b38 100644 --- a/pkgs/development/compilers/rust/nightly.nix +++ b/pkgs/development/compilers/rust/nightly.nix @@ -1,56 +1,34 @@ -{ stdenv, callPackage, rustPlatform, cacert, gdb, - targets ? [], targetToolchains ? [], targetPatches ? [] }: +{ stdenv, callPackage, rustPlatform, llvm, fetchurl +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: rec { - rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix { - shortVersion = "nightly-2017-01-10"; - forceBundledLLVM = true; # TODO: figure out why linking fails without this + rustc = callPackage ./rustc.nix { + inherit llvm targets targetPatches targetToolchains rustPlatform; + + version = "nightly-2017-05-30"; + configureFlags = [ "--release-channel=nightly" ]; - srcRev = "7bffede97cf58f7159e261eac592f9cf88ce209d"; - srcSha = "1784jvsf9g03cglwask1zhjmba4ghycbin3rw0hmhb41cz2y4q8v"; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/2017-05-30/rustc-nightly-src.tar.gz"; + sha256 = "90ce76db56a93f1b4532f2e62bbf12c243c4d156662b0d80c25319211ee7d0e0"; + }; + patches = [ - ./patches/disable-lockfile-check-nightly.patch + ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - inherit targets; - inherit targetPatches; - inherit targetToolchains; - inherit rustPlatform; - }) (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ]; - postUnpack = '' - export CARGO_HOME="$(realpath deps)" - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - ''; - postPatch = '' - ${oldAttrs.postPatch} - # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596 - rm -vr src/test/debuginfo/borrowed-enum.rs || true - rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true - rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true - rm -vr src/test/debuginfo/packed-struct.rs || true - rm -vr src/test/debuginfo/recursive-struct.rs || true - rm -vr src/test/debuginfo/struct-in-enum.rs || true - rm -vr src/test/debuginfo/struct-style-enum.rs || true - rm -vr src/test/debuginfo/tuple-style-enum.rs || true - rm -vr src/test/debuginfo/union-smoke.rs || true - rm -vr src/test/debuginfo/unique-enum.rs || true - - # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed - sed -i "s# def cargo(self):# def cargo(self):\n return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py - substituteInPlace \ - src/bootstrap/config.rs \ - --replace \ - 'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \ - ''$'self.cargo = Some(\n "${rustPlatform.rust.cargo}\\\n /bin/cargo".into());' - ''; - }); + doCheck = false; + }; cargo = callPackage ./cargo.nix rec { - version = "nightly-2017-01-10"; - srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0"; - srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj"; - depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp"; + version = "0.18.0"; + srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; + srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; + depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index 9916e4555c56..af06835c5def 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -1,86 +1,23 @@ -{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage }: +{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }: let - inherit (stdenv.lib) optionalString; - platform = if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" else throw "missing bootstrap url for platform ${stdenv.system}"; bootstrapHash = if stdenv.system == "x86_64-linux" - then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91" + then "0svlm4bxsdhdn4jsv46f278kid23a9w978q2137qrba4xnyb06kf" else throw "missing bootstrap hash for platform ${stdenv.system}"; - needsPatchelf = stdenv.isLinux; - src = fetchurl { url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz"; sha256 = bootstrapHash; }; - version = "2017-01-26"; -in - -rec { - inherit buildRustPackage; - - rustc = stdenv.mkDerivation rec { - name = "rustc-nightly-${version}"; - - inherit version; - inherit src; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ qknight ]; - license = [ licenses.mit licenses.asl20 ]; - }; - - buildInputs = [ makeWrapper ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=rustc,rust-std-x86_64-unknown-linux-gnu - - ${optionalString needsPatchelf '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/rustc" - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/rustdoc" - ''} - ''; - - }; - cargo = stdenv.mkDerivation rec { - name = "cargo-nightly-${version}"; - - inherit version; - inherit src; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ qknight ]; - license = [ licenses.mit licenses.asl20 ]; - }; - - buildInputs = [ makeWrapper ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=cargo - - ${optionalString needsPatchelf '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" - ''} - ''; - }; -} + version = "2017-06-26"; +in import ./binaryBuild.nix + { inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl; + inherit version src platform; + versionType = "nightly"; + } diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index 4d1d20066b85..da52ac37ab30 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -1,8 +1,21 @@ -#!/bin/sh +#!/usr/bin/env bash + +# All rust-related downloads can be found at +# https://static.rust-lang.org/dist/index.html. To find the date on +# which a particular thing was last updated, look for the *-date.txt +# file, e.g. +# https://static.rust-lang.org/dist/channel-rust-beta-date.txt PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin" BASEURL="https://static.rust-lang.org/dist" -VERSION=$1 +DATE=$1 +VERSION=$2 + +if [[ -z $DATE ]] +then + echo "No date supplied" + exit -1 +fi if [[ -z $VERSION ]] then @@ -12,6 +25,6 @@ fi for PLATFORM in $PLATFORMS do - URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256" + URL="$BASEURL/$DATE/rust-$VERSION-$PLATFORM.tar.gz.sha256" curl $URL done diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a693afb8b597..28863e450a7a 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,25 +1,21 @@ { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps , llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl - -, isRelease ? false -, shortVersion +, which, libffi, gdb +, version , forceBundledLLVM ? false -, srcSha, srcRev +, src , configureFlags ? [] , patches , targets , targetPatches , targetToolchains +, doCheck ? true +, buildPlatform, hostPlatform } @ args: let inherit (stdenv.lib) optional optionalString; - version = if isRelease then - "${shortVersion}" - else - "${shortVersion}-g${builtins.substring 0 7 srcRev}"; - procps = if stdenv.isDarwin then darwin.ps else args.procps; llvmShared = llvm.override { enableSharedLibraries = true; }; @@ -32,6 +28,8 @@ stdenv.mkDerivation { name = "rustc-${version}"; inherit version; + inherit src; + __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; @@ -45,19 +43,13 @@ stdenv.mkDerivation { # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; - src = fetchgit { - url = https://github.com/rust-lang/rust; - rev = srcRev; - sha256 = srcSha; - }; - # We need rust to build rust. If we don't provide it, configure will try to download it. configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] + ++ [ "--enable-vendor" "--disable-locked-deps" ] + ++ [ "--enable-llvm-link-shared" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] - # TODO: Remove when fixed build with rustbuild - ++ [ "--disable-rustbuild" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; @@ -67,17 +59,8 @@ stdenv.mkDerivation { passthru.target = target; postPatch = '' - substituteInPlace src/rust-installer/gen-install-script.sh \ - --replace /bin/echo "$(type -P echo)" - substituteInPlace src/rust-installer/gen-installer.sh \ - --replace /bin/echo "$(type -P echo)" - - # Workaround for NixOS/nixpkgs#8676 - substituteInPlace mk/rustllvm.mk \ - --replace "\$\$(subst /,//," "\$\$(subst /,/," - # Fix dynamic linking against llvm - ${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} + #${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -98,15 +81,26 @@ stdenv.mkDerivation { # https://reviews.llvm.org/rL281650 rm -vr src/test/run-pass/issue-36474.rs || true + # Disable some failing gdb tests. Try re-enabling these when gdb + # is updated past version 7.12. + rm src/test/debuginfo/basic-types-globals.rs + rm src/test/debuginfo/basic-types-mut-globals.rs + rm src/test/debuginfo/c-style-enum.rs + rm src/test/debuginfo/lexical-scopes-in-block-expression.rs + rm src/test/debuginfo/limited-debuginfo.rs + rm src/test/debuginfo/simple-struct.rs + rm src/test/debuginfo/simple-tuple.rs + rm src/test/debuginfo/union-smoke.rs + rm src/test/debuginfo/vec-slices.rs + rm src/test/debuginfo/vec.rs + # Useful debugging parameter # export VERBOSE=1 - '' + - # In src/compiler-rt/cmake/config-ix.cmake, the cmake build falls - # back to darwin 10.4. This causes the OS name to be recorded as - # "10.4" rather than the expected "osx". But mk/rt.mk expects the - # built library name to have an "_osx" suffix on darwin. - optionalString stdenv.isDarwin '' - substituteInPlace mk/rt.mk --replace "_osx" "_10.4" + '' + + optionalString stdenv.isDarwin '' + # Disable all lldb tests. + # error: Can't run LLDB test because LLDB's python path is not set + rm -vr src/test/debuginfo/* ''; preConfigure = '' @@ -120,7 +114,8 @@ stdenv.mkDerivation { dontUseCmakeConfigure = true; # ps is needed for one of the test cases - nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake ]; + nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake + which libffi gdb ]; buildInputs = [ ncurses ] ++ targetToolchains ++ optional (!forceBundledLLVM) llvmShared; @@ -141,8 +136,9 @@ stdenv.mkDerivation { sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs ''; - doCheck = true; - dontSetConfigureCross = true; + inherit doCheck; + + configurePlatforms = []; # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764 # https://github.com/rust-lang/rust/issues/30181 @@ -151,7 +147,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix deleted file mode 100644 index 4f854652ffeb..000000000000 --- a/pkgs/development/compilers/sbcl/1.2.5.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchurl, sbclBootstrap, clisp, which}: - -stdenv.mkDerivation rec { - name = "sbcl-${version}"; - version = "1.2.5"; - - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0nmb9amygr5flzk2z9fa6wzwqknbgd2qrkybxkxkamvbdwyayvzr"; - }; - - buildInputs = [ which ] - ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) - ++ (stdenv.lib.optional stdenv.isLinux clisp) - ; - - patchPhase = '' - echo '"${version}.nixos"' > version.lisp-expr - echo " - (lambda (features) - (flet ((enable (x) - (pushnew x features)) - (disable (x) - (setf features (remove x features)))) - (enable :sb-thread))) " > customize-target-features.lisp - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix software version retrieval - sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp - - # Fix the tests - sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp - - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - ''; - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - buildPhase = if stdenv.isLinux - then '' - sh make.sh clisp --prefix=$out - '' - else '' - sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit' - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - ''; - - meta = { - description = "Lisp compiler"; - homepage = http://www.sbcl.org; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - inherit version; - }; -} diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 8f442bd890b3..1fe2bb90ad92 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -8,15 +8,20 @@ let sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j"; }; x86_64-linux = rec { - version = "1.2.15"; + version = "1.3.16"; system = "x86-64-linux"; - sha256 = "1bpbfz9x2w73hy2kh8p0kd4m1p6pin90h2zycq52r3bbz8yv47aw"; + sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; }; i686-linux = rec { version = "1.2.7"; system = "x86-linux"; sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; }; + aarch64-linux = rec { + version = "1.3.16"; + system = "arm64-linux"; + sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; + }; armv7l-linux = rec { version = "1.2.14"; system = "armhf-linux"; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index d1dcda064cb5..3bd1982baa59 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" -, threadSupport ? (stdenv.isi686 || stdenv.isx86_64) +, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.system) # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. # Note that the created binaries still need `patchelf --set-interpreter ...` # to get rid of ${glibc} dependency. @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.15"; + version = "1.3.19"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "11db8pkv3i8ajyb295dh9nl0niyrkh9gjqv4vlaa1dl1vzck5ddi"; + sha256 = "0660gw43myikpa6n2qjhjxz61ilqazva4v8shljgwymag99risxm"; }; patchPhase = '' diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index 394b2f9da094..469c8c8e3bc5 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.11.8"; + name = "scala-2.11.11"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47"; + sha256 = "02whsszxabyhyrbcmgg3figaxknmfzy4f3wmgrqqwik89jk7q0qj"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 8e1f8dd47220..e48fc63096e5 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.1"; + name = "scala-2.12.2"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0nf37ix3rrm50s7dacwlyr8fl1hgrbxbw5yz21qf58rj8n46ic2d"; + sha256 = "1xd68q9h0vzqndar3r4mvabbd7naa25fbiciahkhxwgw8sr6hq8r"; }; propagatedBuildInputs = [ jre ] ; @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { rm "bin/"*.bat mv * $out + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/scala + for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ --prefix PATH ":" ${coreutils}/bin \ diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index a246a413f50d..7383f39f6cbb 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl, bison, flex, boost, gputils ? null }: +{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; name = "sdcc-${version}"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "1aazz0yynr694q0rich7r03qls0zvsjc00il14pb4i22c78phagq"; + sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8"; }; # TODO: remove this comment when gputils != null is tested - buildInputs = [ bison flex boost gputils ]; + buildInputs = [ bison flex boost texinfo gputils ]; configureFlags = '' ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} ''; - NIX_CFLAGS_COMPILE = "--std=c99"; # http://sourceforge.net/p/sdcc/code/9106/ - meta = with stdenv.lib; { description = "Small Device C Compiler"; longDescription = '' diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 7f8580f058b6..75daad36f762 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; '' sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\ \ \*x86-darwin\*)\ -\ INCLFILE=${osx_sdk}/Developer/SDKs/${osx_sdk.name}/usr/include/unistd.h\ +\ INCLFILE=${apple_sdk.sdk}/include/unistd.h\ \ ;;\ \ \*) ;; ' base/runtime/config/gen-posix-names.sh diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index ecf975bf76f1..714f06d0b53f 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,27 +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 -stdenv.mkDerivation rec { - version = "0.4.8"; +stdenv.mkDerivation { name = "solc-${version}"; # Cannot use `fetchFromGitHub' because of submodules src = fetchgit { url = "https://github.com/ethereum/solidity"; - rev = "60cc1668517f56ce6ca8225555472e7a27eab8b0"; - sha256 = "09mwah7c5ca1bgnqp5qgghsi6mbsi7p16z8yxm0aylsn2cjk23na"; + inherit rev sha256; }; patchPhase = '' - echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8 + 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 ]; @@ -31,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/souper/cmake-fix.patch b/pkgs/development/compilers/souper/cmake-fix.patch new file mode 100644 index 000000000000..5ef289f53e93 --- /dev/null +++ b/pkgs/development/compilers/souper/cmake-fix.patch @@ -0,0 +1,14 @@ +--- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig 2017-01-20 13:55:14.783632588 -0600 ++++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt 2017-01-20 13:55:20.505728456 -0600 +@@ -33,7 +33,10 @@ + OUTPUT_VARIABLE LLVM_SYSTEM_LIBS + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +-set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") ++ ++if (LLVM_SYSTEM_LIBS) ++ set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") ++endif() + + execute_process( + COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix index 74e1cbf68d30..327139ce0455 100644 --- a/pkgs/development/compilers/souper/default.nix +++ b/pkgs/development/compilers/souper/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, llvmPackages_39, hiredis, z3_opt, gtest +, llvmPackages_4, hiredis, z3_opt, gtest }: let klee = fetchFromGitHub { - owner = "klee"; + owner = "rsas"; repo = "klee"; - rev = "a743d7072d9ccf11f96e3df45f25ad07da6ad9d6"; - sha256 = "0qwzs029vlba8xz362n4b00hdm2z3lzhzmvix1r8kpbfrvs8vv91"; + rev = "57cd3d43056b029d9da3c6b3c666c4153554c04f"; + sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz"; }; -in stdenv.mkDerivation { - name = "souper-unstable-2017-01-05"; +in stdenv.mkDerivation rec { + name = "souper-unstable-${version}"; + version = "2017-03-23"; src = fetchFromGitHub { owner = "google"; repo = "souper"; - rev = "1be75fe6a96993b57dcba038798fe6d1c7d113eb"; - sha256 = "0r8mjb88lwz9a3syx7gwsxlwfg0krffaml04ggaf3ad0cza2mvm8"; + rev = "cf2911d2eb1e7c8ab465df5a722fa5cdac06e6fc"; + sha256 = "1kg08a1af4di729pn1pip2lzqzlvjign6av95214f5rr3cq2q0cl"; }; nativeBuildInputs = [ @@ -25,12 +26,14 @@ in stdenv.mkDerivation { ]; buildInputs = [ - llvmPackages_39.llvm - llvmPackages_39.clang-unwrapped + llvmPackages_4.llvm + llvmPackages_4.clang-unwrapped hiredis gtest ]; + patches = [ ./cmake-fix.patch ]; + enableParallelBuilding = true; preConfigure = '' diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix new file mode 100644 index 000000000000..839ecdbeb652 --- /dev/null +++ b/pkgs/development/compilers/swift/default.nix @@ -0,0 +1,268 @@ +{ stdenv +, cmake +, coreutils +, glibc +, which +, perl +, libedit +, ninja +, pkgconfig +, sqlite +, swig +, bash +, libxml2 +, llvm +, clang +, python +, ncurses +, libuuid +, libbsd +, icu +, autoconf +, libtool +, automake +, libblocksruntime +, curl +, rsync +, git +, libgit2 +, binutils +, fetchFromGitHub +, paxctl +, findutils +#, systemtap +}: + +let + v_major = "3.1.1"; + version = "${v_major}-RELEASE"; + version_friendly = "${v_major}"; + + tag = "refs/tags/swift-${version}"; + fetch = { repo, sha256, fetchSubmodules ? false }: + fetchFromGitHub { + owner = "apple"; + inherit repo sha256 fetchSubmodules; + rev = tag; + name = "${repo}-${version}-src"; + }; + +sources = { + # FYI: SourceKit probably would work but currently requires building everything twice + # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 + clang = fetch { + repo = "swift-clang"; + sha256 = "1gmdgr8jph87nya8cgdl7iwrggbji2sag996m27hkbszw4nxy8sd"; + }; + llvm = fetch { + repo = "swift-llvm"; + sha256 = "0nwd7cp6mbj7f6a2rx8123n7ygs8406hsx7hp7ybagww6v75bwzi"; + }; + compilerrt = fetch { + repo = "swift-compiler-rt"; + sha256 = "1gjcr6g3ffs3nhf4a84iwg4flbd7rqcf9rvvclwyq96msa3mj950"; + }; + cmark = fetch { + repo = "swift-cmark"; + sha256 = "0qf2f3zd8lndkfbxbz6vkznzz8rvq5gigijh7pgmfx9fi4zcssqx"; + }; + lldb = fetch { + repo = "swift-lldb"; + sha256 = "17n4whpf3wxw9zaayiq21gk9q3547qxi4rvxld2hybh0k7a1bj5c"; + }; + llbuild = fetch { + repo = "swift-llbuild"; + sha256 = "1l3hnb2s01jby91k1ipbc3bhszq14vyx5pzdhf2chld1yhpg420d"; + }; + pm = fetch { + repo = "swift-package-manager"; + sha256 = "1ayy5vk3mjk354pg9bf68wvnaj3jymx23w0qnlw1jxz256ff8fwi"; + }; + xctest = fetch { + repo = "swift-corelibs-xctest"; + sha256 = "0cj5y7wanllfldag08ci567x12aw793c79afckpbsiaxmwy4xhnm"; + }; + foundation = fetch { + repo = "swift-corelibs-foundation"; + sha256 = "1d1ldk7ckqn4mhmdhsx2zrmsd6jfxzgdywn2pki7limk979hcwjc"; + }; + libdispatch = fetch { + repo = "swift-corelibs-libdispatch"; + sha256 = "0ckjg41fjak06i532azhryckjq64fkxzsal4svf5v4s8n9mkq2sg"; + fetchSubmodules = true; + }; + swift = fetch { + repo = "swift"; + sha256 = "0879jlv37lmxc1apzi53xn033y72548i86r7fzwr0g52124q5gry"; + }; + }; + + devInputs = [ + curl + glibc + icu + libblocksruntime + libbsd + libedit + libuuid + libxml2 + ncurses + sqlite + swig + # systemtap? + ]; + + cmakeFlags = [ + "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include" + "-DC_INCLUDE_DIRS=${stdenv.lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2" + "-DGCC_INSTALL_PREFIX=${clang.cc.gcc}" + ]; + + builder = '' + $SWIFT_SOURCE_ROOT/swift/utils/build-script \ + --preset=buildbot_linux \ + installable_package=$INSTALLABLE_PACKAGE \ + install_prefix=$out \ + install_destdir=$SWIFT_INSTALL_DIR \ + extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"''; + +in +stdenv.mkDerivation rec { + name = "swift-${version_friendly}"; + + buildInputs = devInputs ++ [ + autoconf + automake + bash + clang + cmake + coreutils + libtool + ninja + perl + pkgconfig + python + rsync + which + findutils + ] ++ stdenv.lib.optional stdenv.needsPax paxctl; + + # TODO: Revisit what's propagated and how + propagatedBuildInputs = [ + libgit2 + python + ]; + propagatedUserEnvPkgs = [ git pkgconfig ]; + + hardeningDisable = [ "format" ]; # for LLDB + + configurePhase = '' + cd .. + + export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz + + mkdir build install + export SWIFT_BUILD_ROOT=$PWD/build + export SWIFT_INSTALL_DIR=$PWD/install + + cd $SWIFT_BUILD_ROOT + + unset CC + unset CXX + + export NIX_ENFORCE_PURITY= + ''; + + unpackPhase = '' + mkdir src + cd src + export sourceRoot=$PWD + export SWIFT_SOURCE_ROOT=$PWD + + cp -r ${sources.clang} clang + cp -r ${sources.llvm} llvm + cp -r ${sources.compilerrt} compiler-rt + cp -r ${sources.cmark} cmark + cp -r ${sources.lldb} lldb + cp -r ${sources.llbuild} llbuild + cp -r ${sources.pm} swiftpm + cp -r ${sources.xctest} swift-corelibs-xctest + cp -r ${sources.foundation} swift-corelibs-foundation + cp -r ${sources.libdispatch} swift-corelibs-libdispatch + cp -r ${sources.swift} swift + + chmod -R u+w . + ''; + + patchPhase = '' + # Just patch all the things for now, we can focus this later + patchShebangs $SWIFT_SOURCE_ROOT + + substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \ + --replace '/usr/include' "${stdenv.cc.libc.dev}/include" + substituteInPlace swift/utils/build-script-impl \ + --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++" + '' + stdenv.lib.optionalString stdenv.needsPax '' + patch -p1 -d swift -i ${./patches/build-script-pax.patch} + '' + '' + patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} + patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} + patch -p1 -d swift -i ${./patches/0003-build-presets-linux-disable-tests.patch} + patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} + + substituteInPlace clang/lib/Driver/ToolChains.cpp \ + --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ + ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);' + patch -p1 -d clang -i ${./purity.patch} + + # Workaround hardcoded dep on "libcurses" (vs "libncurses"): + sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt + substituteInPlace llbuild/tests/BuildSystem/Build/basic.llbuild \ + --replace /usr/bin/env $(type -p env) + + # This test fails on one of my machines, not sure why. + # Disabling for now. + rm llbuild/tests/Examples/buildsystem-capi.llbuild + + substituteInPlace swift-corelibs-foundation/lib/script.py \ + --replace /bin/cp $(type -p cp) + + PREFIX=''${out/#\/} + substituteInPlace swift-corelibs-xctest/build_script.py \ + --replace usr "$PREFIX" + substituteInPlace swiftpm/Utilities/bootstrap \ + --replace "usr" "$PREFIX" + ''; + + doCheck = false; + + buildPhase = builder; + + installPhase = '' + mkdir -p $out + + # Extract the generated tarball into the store + PREFIX=''${out/#\/} + tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX + + paxmark pmr $out/bin/swift + paxmark pmr $out/bin/* + + # TODO: Use wrappers to get these on the PATH for swift tools, instead + ln -s ${clang}/bin/* $out/bin/ + ln -s ${binutils}/bin/ar $out/bin/ar + ''; + + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + + meta = with stdenv.lib; { + description = "The Swift Programming Language"; + homepage = "https://github.com/apple/swift"; + maintainers = with maintainers; [ jb55 dtzWill ]; + license = licenses.asl20; + # Swift doesn't support 32bit Linux, unknown on other platforms. + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch new file mode 100644 index 000000000000..6ef83754a674 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch @@ -0,0 +1,25 @@ +From 1fc49285c7a198de14005803dfde64bda17f4120 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:01:16 -0500 +Subject: [PATCH 1/4] build-presets: (linux) don't require using Ninja + +--- + utils/build-presets.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index 7ee57ad2df..e6b0af3581 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -686,7 +686,7 @@ swiftpm + xctest + dash-dash + +-build-ninja ++# build-ninja + install-swift + install-lldb + install-llbuild +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch new file mode 100644 index 000000000000..0e18e8812a84 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch @@ -0,0 +1,25 @@ +From fca6624b7a0ad670157105336a737cc95f9ce9fb Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:01:40 -0500 +Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix + +--- + utils/build-presets.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index e6b0af3581..1095cbaab7 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -692,7 +692,7 @@ install-lldb + install-llbuild + install-swiftpm + install-xctest +-install-prefix=/usr ++install-prefix=%(install_prefix)s + swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license + build-swift-static-stdlib + build-swift-static-sdk-overlay +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch new file mode 100644 index 000000000000..f647d9189dd2 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch @@ -0,0 +1,38 @@ +From fcc7c216da6cd255f884b7aa39f361786e3afa6a Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:02:18 -0500 +Subject: [PATCH 3/4] build-presets: (linux) disable tests. + +--- + utils/build-presets.ini | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index 1095cbaab7..1739e91dc2 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -700,7 +700,7 @@ build-swift-stdlib-unittest-extra + + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out +-test-installable-package ++# test-installable-package + + # Path to the root of the installation filesystem. + install-destdir=%(install_destdir)s +@@ -713,9 +713,9 @@ mixin-preset=mixin_linux_installation + build-subdir=buildbot_linux + lldb + release +-test +-validation-test +-long-test ++#test ++#validation-test ++#long-test + foundation + libdispatch + lit-args=-v +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch new file mode 100644 index 000000000000..5493196303cd --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch @@ -0,0 +1,25 @@ +From 4a46b12f580d0a9779937d07c4f1fd347570c4ef Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:02:37 -0500 +Subject: [PATCH 4/4] build-presets: (linux) plumb extra-cmake-options + +--- + utils/build-presets.ini | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index 1739e91dc2..0608fed9c1 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -708,6 +708,8 @@ install-destdir=%(install_destdir)s + # Path to the .tar.gz package we would create. + installable-package=%(installable_package)s + ++extra-cmake-options=%(extra_cmake_options)s ++ + [preset: buildbot_linux] + mixin-preset=mixin_linux_installation + build-subdir=buildbot_linux +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch new file mode 100644 index 000000000000..fa2ccdf9d5c6 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch @@ -0,0 +1,33 @@ +--- 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,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 ++ exec {fd}<&- ++ if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi ++} ++ + # + # Configure and build each product + # +@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do + fi + + call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]} ++ ++ while IFS= read -r -d $'\0' i; do ++ if ! isELF "$i"; then continue; fi ++ echo "setting pax flags on $i" ++ paxctl -czexm "$i" || true ++ done < <(find "${build_dir}" -executable -type f -wholename "*/bin/*" -print0) + fi + done + done diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch new file mode 100644 index 000000000000..f5fb4c73af47 --- /dev/null +++ b/pkgs/development/compilers/swift/purity.patch @@ -0,0 +1,16 @@ +--- a/lib/Driver/Tools.cpp 2016-08-25 15:48:05.187553443 +0200 ++++ b/lib/Driver/Tools.cpp 2016-08-25 15:48:47.534468882 +0200 +@@ -9420,13 +9420,6 @@ + if (!Args.hasArg(options::OPT_static)) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared)) { +- const std::string Loader = +- D.DyldPrefix + ToolChain.getDynamicLinker(Args); +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Loader)); +- } + } + + CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 79745d45c2b3..7e083ffe67be 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170220"; + date = "20170710"; version = "0.9.27pre-${date}"; - rev = "e209b7dac463e228525499153103ec28173ca365"; - sha256 = "1p8h999aqgy5rlkk47vc86c5lx8280761712nwkcgvydvixd0gd6"; + rev = "2acb04f7f2077a4cff103421d79ceee48441918a"; + sha256 = "1rh89dx1myqfm752d4rlzrm8aadfm17fm88ps0q9ibmbxavb45qw"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 638b10f76d5d..c1e1e2ece7a8 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "urweb-${version}"; - version = "20160621"; + version = "20170105"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "08km96hli5yp754nsxxjzih2la0m89j5wc2cq12rkas43nqqgr65"; + sha256 = "2ad3aea2c4851c9b18f752d38c7127af8293fbbbbdb3dd06b73a4603fe399b67"; }; buildInputs = [ openssl mlton mysql.client postgresql sqlite ]; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://www.impredicative.com/ur/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.sheganinans ]; }; } diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix index 13a48aaaa30c..2ea2faa3e09e 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 7621aa82bc75..c4cdf70f14ac 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 @@ -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 000000000000..c7aaf2a2e329 --- /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 db364ffb1afc..80cdcfec2879 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 = "b73a594af5460567dc233b2f2e7b0f781ae0490d"; in +let revision = "ee436635a34873c79f49c3d2d507194216f6e8e9"; in stdenv.mkDerivation rec { name = "coq-QuickChick-${coq.coq-version}-${version}"; - version = "20150605-${builtins.substring 0 7 revision}"; + version = "20170710-${builtins.substring 0 7 revision}"; src = fetchgit { url = git://github.com/QuickChick/QuickChick.git; rev = revision; - sha256 = "1prlihkgi2yvgzd62x80fsnxp5w1n0wyk7zrd6zwa8dbqx9pbr09"; + 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 000000000000..dde0e2e03eb6 --- /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 000000000000..d27ba0052994 --- /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/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index a92c14bdbff6..fe9f3307b7aa 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -2,8 +2,8 @@ stdenv.mkDerivation rec { - name = "coq-fiat-${coq.coq-version}-${version}"; - version = "20161024"; + name = "coq-fiat-${coq.coq-version}-unstable-${version}"; + version = "2016-10-24"; src = fetchgit { url = "https://github.com/mit-plv/fiat.git"; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index e12327a347f4..0e7549623e7a 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 98d447d21d38..93ef7c14f1f3 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/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index c707592e4ae3..c2e4b39472c4 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, govers, parallel, lib, fetchgit, fetchhg, rsync }: +{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync, removeReferencesTo }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -41,9 +41,7 @@ let removeReferences = [ ] ++ lib.optional (!allowGoReference) go; - removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: '' - | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ - ''); + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; dep2src = goDep: { @@ -56,7 +54,11 @@ let fetchhg { inherit (goDep.fetch) url rev sha256; } - else abort "Unrecognized package fetch type"; + else if goDep.fetch.type == "bzr" then + fetchbzr { + inherit (goDep.fetch) url rev sha256; + } + else abort "Unrecognized package fetch type: ${goDep.fetch.type}"; }; importGodeps = { depsFile }: @@ -70,7 +72,7 @@ go.stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { inherit name; - nativeBuildInputs = [ go parallel ] + nativeBuildInputs = [ removeReferencesTo go parallel ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = [ go ] ++ buildInputs; @@ -116,6 +118,7 @@ go.stdenv.mkDerivation ( local d; local cmd; cmd="$1" d="$2" + . $TMPDIR/buildFlagsArray echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT @@ -143,6 +146,11 @@ go.stdenv.mkDerivation ( fi } + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then + declare -p buildFlagsArray > $TMPDIR/buildFlagsArray + else + touch $TMPDIR/buildFlagsArray + fi export -f buildGoDir # parallel needs to see the function if [ -z "$enableParallelBuilding" ]; then export NIX_BUILD_CORES=1 @@ -180,11 +188,7 @@ go.stdenv.mkDerivation ( ''; preFixup = preFixup + '' - while read file; do - cat $file ${removeExpr removeReferences} > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $bin/bin -type f 2>/dev/null) + find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; shellHook = '' @@ -194,7 +198,7 @@ go.stdenv.mkDerivation ( ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" '' ) goPath) + '' - export GOPATH="$d:$GOPATH" + export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)} ''; disallowedReferences = lib.optional (!allowGoReference) go diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 8d98ace71f88..313580fe600a 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -8,8 +8,7 @@ fetchgit, guile, libtool, - pkgconfig, - buildEnv + pkgconfig }: stdenv.mkDerivation rec { name = "guile-sdl2-${version}"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f37d8b4c9c7f..8fa2cbcf713f 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; @@ -55,19 +56,23 @@ self: super: { # check requires mysql server mysql-simple = dontCheck super.mysql-simple; + mysql-haskell = dontCheck super.mysql-haskell; # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; # 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 = "0irvzwpwxxdy6qs7jj81r6qk7i1gkkqyaza4wcm0phyyn07yh2sz"; + 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; @@ -170,7 +175,13 @@ self: super: { else dontCheck super.fsnotify; double-conversion = if !pkgs.stdenv.isDarwin - then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib + then addExtraLibrary + # https://github.com/bos/double-conversion/pull/17 + (appendPatch super.double-conversion (pkgs.fetchpatch { + url = "https://github.com/basvandijk/double-conversion/commit/0927e347d53dbd96d1949930e728cc2471dd4b14.patch"; + sha256 = "042yqbq5p6nc9nymmbz9hgp51dlc5asaj9bf91kw5fph6dw2hwg9"; + })) + pkgs.stdenv.cc.cc.lib else addExtraLibrary (overrideCabal super.double-conversion (drv: { postPatch = '' @@ -187,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; @@ -222,6 +235,7 @@ self: super: { pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; postgrest = dontCheck super.postgrest; + postgrest-ws = dontCheck super.postgrest-ws; snowball = dontCheck super.snowball; sophia = dontCheck super.sophia; test-sandbox = dontCheck super.test-sandbox; @@ -260,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 @@ -282,6 +295,7 @@ self: super: { etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw + friday-juicypixels = dontCheck super.friday-juicypixels; #tarball missing test/rgba8.png ghc-events = dontCheck super.ghc-events; # http://hydra.cryp.to/build/498226/log/raw ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw ghc-imported-from = dontCheck super.ghc-imported-from; @@ -295,7 +309,6 @@ self: super: { haeredes = dontCheck super.haeredes; hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; - hastache = dontCheck super.hastache; hath = dontCheck super.hath; haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; @@ -322,7 +335,6 @@ self: super: { language-slice = dontCheck super.language-slice; ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; - liquidhaskell = dontCheck super.liquidhaskell; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; memcache = dontCheck super.memcache; @@ -363,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; @@ -448,16 +459,6 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # See instructions provided by Peti in https://github.com/NixOS/nixpkgs/issues/23036 - purescript = super.purescript.overrideScope (self: super: { - # TODO: Re-evaluate the following overrides after the 0.11 release. - aeson = self.aeson_0_11_3_0; - http-client = self.http-client_0_4_31_2; - http-client-tls = self.http-client-tls_0_2_4_1; - pipes = self.pipes_4_2_0; - websockets = self.websockets_0_9_8_2; - }); - # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) unlambda = dontHyperlinkSource super.unlambda; @@ -481,17 +482,6 @@ self: super: { # https://github.com/afcowie/locators/issues/1 locators = dontCheck super.locators; - # https://github.com/haskell/haddock/issues/378 - haddock-library = dontCheck super.haddock-library; - - # https://github.com/haskell/haddock/issues/571 - haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch { - url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch"; - sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m"; - stripLen = 2; - addPrefixes = true; - }); - # https://github.com/anton-k/csound-expression-dynamic/issues/1 csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; @@ -507,6 +497,7 @@ self: super: { # Depends on itself for testing doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover); + tasty-discover = addBuildTool super.tasty-discover (dontCheck super.tasty-discover); # https://github.com/bos/aeson/issues/253 aeson = dontCheck super.aeson; @@ -679,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; @@ -689,14 +680,16 @@ self: super: { then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk; - # https://github.com/commercialhaskell/stack/issues/3001 - stack = doJailbreak super.stack; + # The stack people don't bother making their own code compile in an LTS-based + # environment: https://github.com/commercialhaskell/stack/issues/3001. + stack = super.stack.overrideScope (self: super: { + store-core = self.store-core_0_3; + store = self.store_0_3_1; + hpack = self.hpack_0_17_1; + }); - # The latest Hoogle needs versions not yet in LTS Haskell 7.x. - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; - - # Needs new version. - haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; + # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only. + intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {}; # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. @@ -716,9 +709,9 @@ self: super: { servant-server = dontCheck super.servant-server; # Fix build for latest versions of servant and servant-client. - servant-client_0_10 = super.servant-client_0_10.overrideScope (self: super: { - servant-server = self.servant-server_0_10; - servant = self.servant_0_10; + servant-client_0_11 = super.servant-client_0_11.overrideScope (self: super: { + servant-server = self.servant-server_0_11; + servant = self.servant_0_11; }); # build servant docs from the repository @@ -752,19 +745,15 @@ self: super: { # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; + # fails with sandbox + yi-keymap-vim = dontCheck super.yi-keymap-vim; + # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; # https://github.com/roelvandijk/terminal-progress-bar/issues/13 terminal-progress-bar = doJailbreak super.terminal-progress-bar; - # https://github.com/NixOS/nixpkgs/issues/19612 - wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: { - http-client = self.http-client_0_5_5; - http-client-tls = self.http-client-tls_0_3_3_1; - http-conduit = self.http-conduit_2_2_3; - }); - # https://hydra.nixos.org/build/42769611/nixlog/1/raw # note: the library is unmaintained, no upstream issue dataenc = doJailbreak super.dataenc; @@ -775,10 +764,6 @@ self: super: { # horribly outdated (X11 interface changed a lot) sindre = markBroken super.sindre; - # https://github.com/jmillikin/haskell-dbus/pull/7 - # http://hydra.cryp.to/build/498404/log/raw - dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch); - # Test suite occasionally runs for 1+ days on Hydra. distributed-process-tests = dontCheck super.distributed-process-tests; @@ -824,12 +809,6 @@ self: super: { # https://github.com/xmonad/xmonad-extras/issues/3 xmonad-extras = doJailbreak super.xmonad-extras; - # https://github.com/bmillwood/pointfree/issues/21 - pointfree = appendPatch super.pointfree (pkgs.fetchpatch { - url = "https://github.com/bmillwood/pointfree/pull/22.patch"; - sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp"; - }); - # https://github.com/int-e/QuickCheck-safe/issues/2 QuickCheck-safe = doJailbreak super.QuickCheck-safe; @@ -872,9 +851,30 @@ self: super: { # https://github.com/diagrams/diagrams-lib/issues/288 diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); - # https://github.com/cartazio/arithmoi/issues/49 - arithmoi = overrideCabal super.arithmoi (drv: { doCheck = !pkgs.stdenv.isi686; }); - # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; + + # strict-io is too cautious with it's deepseq dependency + # strict-io doesn't have a working bug tracker, the author has been emailed however. + strict-io = doJailbreak super.strict-io; + + # https://github.com/danidiaz/tailfile-hinotify/issues/2 + tailfile-hinotify = dontCheck super.tailfile-hinotify; + + # build liquidhaskell with the proper (old) aeson version + liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; }; + + # Test suite fails: https://github.com/lymar/hastache/issues/46. + # Don't install internal mkReadme tool. + hastache = overrideCabal super.hastache (drv: { + doCheck = false; + 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-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 03a905ea3d11..6be7ae16572a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -41,7 +41,7 @@ self: super: { unix = null; # These packages are core libraries in GHC 7.10.x, but not here. - binary = self.binary_0_8_4_1; + binary = self.binary_0_8_5_1; deepseq = self.deepseq_1_3_0_1; haskeline = self.haskeline_0_7_3_1; hoopl = self.hoopl_3_10_2_0; 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 ca271e6c271e..c2a7e0014056 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -62,6 +62,7 @@ self: super: { # Setup: Can't find transitive deps for haddock doctest = dontHaddock super.doctest; + hsdns = dontHaddock super.hsdns; # Needs hashable on pre 7.10.x compilers. nats_1 = addBuildDepend super.nats_1 self.hashable; @@ -79,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.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ee62cf64fec6..7f561133b64e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -95,18 +95,6 @@ self: super: { # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; - ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation { - pname = "ghcjs-prim"; - version = "0.1.0.0"; - src = fetchgit { - url = git://github.com/ghcjs/ghcjs-prim.git; - rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch - sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy"; - }; - buildDepends = [ primitive ]; - license = pkgs.stdenv.lib.licenses.bsd3; - }) {}; - # diagrams/monoid-extras#19 monoid-extras = overrideCabal super.monoid-extras (drv: { prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal"; 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 ee6e59c65ef3..911fb8640f42 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -42,7 +42,7 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -63,6 +63,7 @@ self: super: { # Setup: Can't find transitive deps for haddock doctest = dontHaddock super.doctest; + hsdns = dontHaddock super.hsdns; # Needs hashable on pre 7.10.x compilers. nats_1 = addBuildDepend super.nats_1 self.hashable; @@ -71,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 3bbfa34fb502..8a6d22bcc7ec 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -41,10 +41,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -80,6 +80,11 @@ self: super: { # Test suite won't compile. unix-time = dontCheck super.unix-time; + # The test suite depends on mockery, which pulls in logging-facade, which + # doesn't compile with this older version of base: + # https://github.com/sol/logging-facade/issues/14 + doctest = dontCheck super.doctest; + # Avoid depending on tasty-golden. monad-par = dontCheck super.monad-par; @@ -92,7 +97,13 @@ self: super: { # 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; + # 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 27fed51e6fc8..43ec45bf8217 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -39,11 +39,8 @@ self: super: { transformers = self.transformers_0_4_3_0; xhtml = self.xhtml_3000_2_1; - # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; }; - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -96,11 +93,18 @@ 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; + extra = addSetupDepend super.extra self.Cabal_1_24_2_0; + hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; 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 1be8f16a7d58..a97cbfde4fc9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -139,12 +139,22 @@ self: super: { conduit = addBuildDepend super.conduit self.void; conduit_1_2_5 = addBuildDepend super.conduit_1_2_5 self.void; - # Needs additional inputs on pre 7.10.x compilers. + # Breaks a dependency cycle between QuickCheck and semigroups + hashable = dontCheck super.hashable; + unordered-containers = dontCheck super.unordered-containers; + + # 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; + # extra-test: : hFlush: invalid argument (Bad file descriptor) + extra = dontCheck super.extra; + } 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 78c3823a0f95..83efa6b0b5a3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -41,19 +41,6 @@ self: super: { # jailbreak-cabal can use the native Cabal library. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; - ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation { - pname = "ghcjs-prim"; - version = "0.1.0.0"; - src = fetchgit { - url = git://github.com/ghcjs/ghcjs-prim.git; - rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch - sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy"; - }; - buildDepends = [ primitive ]; - license = pkgs.stdenv.lib.licenses.bsd3; - broken = true; # needs template-haskell >=2.9 && <2.11 - }) {}; - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; @@ -65,4 +52,12 @@ self: super: { # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 vector-algorithms = dontCheck super.vector-algorithms; + # 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 new file mode 100644 index 000000000000..8e18435c0c4f --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -0,0 +1,75 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_39; + + # Disable GHC 8.2.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + terminfo = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # cabal-install can use the native Cabal library. + cabal-install = super.cabal-install.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 { + url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; + sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; + }); + + ## GHC > 8.0.2 + + # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 + vector-algorithms = dontCheck super.vector-algorithms; + + # 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-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index f093c0e427e8..6a9d15d402ef 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -53,7 +53,7 @@ self: super: { postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; }); utf8-string = overrideCabal super.utf8-string (drv: { - postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; + postPatch = "sed -i -e 's|base >= 4.3 && < 4.10|base|' utf8-string.cabal"; }); # bos/attoparsec#92 @@ -87,6 +87,7 @@ self: super: { llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; # A bunch of jailbreaks due to 'base' bump + old-time = doJailbreak super.old-time; old-locale = doJailbreak super.old-locale; primitive = doJailbreak super.primitive; test-framework = doJailbreak super.test-framework; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index e4a4f74907a8..7efb75c33296 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -53,6 +53,18 @@ self: super: terminfo = self.terminfo_0_4_0_2; xhtml = self.xhtml_3000_2_1; + # Cabal isn't part of the stage1 packages which form the default package-db + # that GHCJS provides. + # Almost all packages require Cabal to build their Setup.hs, + # but usually they don't declare it explicitly as they don't need to for normal GHC. + # To account for that we add Cabal by default. + mkDerivation = args: super.mkDerivation (args // { + setupHaskellDepends = (args.setupHaskellDepends or []) ++ + (if args.pname == "Cabal" then [ ] + # Break the dependency cycle between Cabal and hscolour + else if args.pname == "hscolour" then [ (dontHyperlinkSource self.Cabal) ] + else [ self.Cabal ]); + }); ## OTHER PACKAGES @@ -126,7 +138,8 @@ self: super: }); ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { - libraryHaskellDepends = [ self.ghcjs-base self.text ]; + setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.Cabal_1_24_2_0 ]; + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ]; isLibrary = true; }); @@ -137,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 @@ -180,8 +204,6 @@ self: super: ] drv.libraryHaskellDepends; }); - semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; - transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cab70ea6f6d7..204a23c62863 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,8 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - - store < 0.4.1 # https://github.com/fpco/store/issues/104 - # LTS Haskell 8.4 + # LTS Haskell 8.23 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -47,25 +46,27 @@ default-package-overrides: - ace ==0.6 - acid-state ==0.14.2 - action-permutations ==0.0.0.1 - - active ==0.2.0.12 - - ad ==4.3.2.1 + - active ==0.2.0.13 + - ad ==4.3.3 - adjunctions ==4.3 - adler32 ==0.1.1.0 - aeson ==1.0.2.1 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.6 + - aeson-diff ==1.1.0.2 - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - - aeson-injector ==1.0.7.0 - - aeson-pretty ==0.8.2 - - aeson-qq ==0.8.1 + - aeson-injector ==1.0.8.0 + - aeson-pretty ==0.8.5 + - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 - Agda ==2.5.2 - airship ==0.6.0 - alarmclock ==0.4.0.2 - alex ==3.2.1 - - alternators ==0.1.1.0 + - algebraic-graphs ==0.0.4 + - alternators ==0.1.1.1 - ALUT ==2.4.0.2 - amazonka ==1.4.5 - amazonka-apigateway ==1.4.5 @@ -160,30 +161,37 @@ default-package-overrides: - amqp ==0.14.1 - annotated-wl-pprint ==0.7.0 - anonymous-sums ==0.6.0.0 - - ansi-terminal ==0.6.2.3 + - ansi-terminal ==0.6.3.1 - ansi-wl-pprint ==0.6.7.3 - ansigraph ==0.3.0.2 - - app-settings ==0.2.0.10 + - app-settings ==0.2.0.11 - appar ==0.1.4 - - arbtt ==0.9.0.12 + - apportionment ==0.0.0.2 + - arbtt ==0.9.0.13 - arithmoi ==0.4.3.0 - array-memoize ==0.6.0 + - arrow-extras ==0.1.0.1 - arrow-list ==0.7 - ascii-progress ==0.3.3.0 - asciidiagram ==1.3.3 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 - - async ==2.1.1 + - astro ==0.4.2.0 + - async ==2.1.1.1 - async-dejafu ==0.1.3.0 - async-extra ==0.1.0.0 - - atom-basic ==0.2.4 + - async-refresh ==0.2.0.2 + - async-refresh-tokens ==0.1.0 + - atom-basic ==0.2.5 - atom-conduit ==0.4.0.1 - atomic-primops ==0.8.0.4 - atomic-write ==0.2.0.5 - attoparsec ==0.13.1.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 + - attoparsec-iso8601 ==1.0.0.0 + - audacity ==0.0.1.2 - authenticate ==1.3.3.2 - authenticate-oauth ==1.6 - auto ==0.4.3.1 @@ -194,10 +202,11 @@ 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 - - base-compat ==0.9.1 + - base-compat ==0.9.3 - base-noprelude ==4.9.1.0 - base-orphans ==0.5.4 - base-prelude ==1.0.1.1 @@ -209,11 +218,14 @@ default-package-overrides: - base64-string ==0.2 - basic-prelude ==0.6.1.1 - bcrypt ==0.0.10 + - bench ==1.0.5 - benchpress ==0.2.2.9 - bencode ==0.6.0.0 - bento ==0.1.0 - - bifunctors ==5.4.1 - - bimap ==0.3.2 + - between ==0.11.0.0 + - bibtex ==0.1.0.6 + - bifunctors ==5.4.2 + - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - binary-conduit ==1.2.4.1 @@ -235,12 +247,14 @@ default-package-overrides: - biofastq ==0.1 - biopsl ==0.4 - bitarray ==0.0.1.1 + - bitcoin-api ==0.12.1 + - bitcoin-api-extra ==0.9.1 - bitcoin-block ==0.13.1 - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - - bits ==0.5 - - bitx-bitcoin ==0.11.0.0 + - bits ==0.5.1 + - bitx-bitcoin ==0.11.0.1 - blake2 ==0.2.0 - blank-canvas ==0.6 - BlastHTTP ==1.2.1 @@ -249,13 +263,16 @@ default-package-overrides: - blaze-builder ==0.4.0.2 - blaze-html ==0.8.1.3 - blaze-markup ==0.7.1.1 - - blaze-svg ==0.3.6 + - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - BlogLiterately ==0.8.4.3 - BlogLiterately-diagrams ==0.2.0.5 - bloodhound ==0.12.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 + - board-games ==0.1.0.6 + - boltzmann-samplers ==0.1.0.0 + - bookkeeping ==0.2.1.1 - bool-extras ==0.4.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 @@ -266,18 +283,19 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.4 - - brick ==0.17.1 + - brick ==0.17.2 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 - bson-lens ==0.1.1 - btrfs ==0.1.2.3 - buffer-builder ==0.2.4.4 + - buffer-pipe ==0.0 - bumper ==0.6.0.3 - bv ==0.4.1 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 - - bytes ==0.15.2 + - bytes ==0.15.3 - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.1.0 - bytestring-conversion ==0.3.1 @@ -291,31 +309,33 @@ default-package-overrides: - c2hs ==0.28.1 - Cabal ==1.24.2.0 - cabal-dependency-licenses ==0.2.0.0 - - cabal-doctest ==1 + - cabal-doctest ==1.0.2 - cabal-file-th ==0.2.4 - cabal-helper ==0.7.3.0 - - cabal-rpm ==0.11 + - cabal-rpm ==0.11.1 - cache ==0.1.0.0 - - cacophony ==0.9.1 + - cacophony ==0.9.2 - cairo ==0.13.3.1 + - calendar-recycling ==0.0 - call-stack ==0.1.0 - camfort ==0.901 - - carray ==0.1.6.5 + - carray ==0.1.6.7 - cartel ==0.18.0.2 - - case-insensitive ==1.2.0.8 + - case-insensitive ==1.2.0.10 - cased ==0.1.0.0 - cases ==0.1.3.2 + - casing ==0.1.2.1 - cassava ==0.4.5.1 - cassava-conduit ==0.3.5.1 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - - cayley-client ==0.4.0 + - cayley-client ==0.4.1 - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 - cgi ==3001.3.0.2 - - ChannelT ==0.0.0.2 + - ChannelT ==0.0.0.4 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.2 - Chart ==1.8.2 @@ -327,9 +347,9 @@ 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.0 + - choice ==0.2.1 - chunked-data ==0.3.0 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.3 @@ -337,18 +357,18 @@ 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.0.1 - - clash-lib ==0.7 - - clash-prelude ==0.11 - - clash-systemverilog ==0.7 - - clash-verilog ==0.7 - - clash-vhdl ==0.7 + - clash-ghc ==0.7.2 + - clash-lib ==0.7.1 + - clash-prelude ==0.11.2 + - clash-systemverilog ==0.7.2 + - clash-verilog ==0.7.2 + - clash-vhdl ==0.7.2 - 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 @@ -356,44 +376,48 @@ 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 - ClustalParser ==1.2.1 - clustering ==0.3.1 - - cmark ==0.5.5 + - cmark ==0.5.5.1 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.14 + - cmdargs ==0.10.17 - code-builder ==0.1.3 - - code-page ==0.1.2 + - code-page ==0.1.3 - codo-notation ==0.5.2 - colorful-monoids ==0.2.1.0 - colour ==2.3.3 + - comfort-graph ==0.0.2 - commutative ==0.0.1.4 - - comonad ==5 + - comonad ==5.0.1 - comonad-transformers ==4.0 - comonads-fd ==4.0 - compactmap ==0.1.4.2 - composition ==1.0.2.1 - composition-extra ==2.0.0 + - concise ==0.1.0.0 - concurrency ==1.0.0.0 - concurrent-output ==1.7.9 + - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - - conduit ==1.2.9 - - conduit-combinators ==1.1.0 + - conduit ==1.2.11 + - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - - conduit-extra ==1.1.15 + - 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 - configurator-export ==0.1.0.1 - - connection ==0.2.7 + - connection ==0.2.8 + - connection-pool ==0.2.1 - console-style ==0.0.2.1 - - constraints ==0.9 + - constraints ==0.9.1 - consul-haskell ==0.4.2 - containers-unicode-symbols ==0.3.1.1 - contravariant ==1.4 @@ -402,12 +426,16 @@ default-package-overrides: - control-monad-free ==0.6.1 - control-monad-loop ==0.1 - control-monad-omega ==0.3.1 + - conversion ==1.2.1 + - conversion-bytestring ==1.0.1 + - conversion-case-insensitive ==1.0.0.0 + - conversion-text ==1.0.1 - convert-annotation ==0.5.0.1 - convertible ==1.1.1.0 - cookie ==0.4.2.1 - countable ==1.0 - - courier ==0.1.1.4 - - cpphs ==1.20.4 + - courier ==0.1.1.5 + - cpphs ==1.20.8 - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.1 @@ -437,6 +465,7 @@ default-package-overrides: - cryptonite ==0.21 - cryptonite-conduit ==0.2.0 - cryptonite-openssl ==0.5 + - csp ==1.3.1 - css-syntax ==0.0.5 - css-text ==0.1.2.2 - csv ==0.1.2 @@ -446,24 +475,36 @@ default-package-overrides: - cubicspline ==0.1.2 - cue-sheet ==0.1.0 - curl ==1.3.8 + - cutter ==0.0 - darcs ==2.12.5 - data-accessor ==0.2.2.7 - data-accessor-mtl ==0.2.0.4 + - data-accessor-template ==0.2.1.13 + - data-accessor-transformers ==0.2.1.7 - data-binary-ieee754 ==0.4.4 - - data-check ==0.1.0 + - data-bword ==0.1.0.1 + - data-check ==0.1.1 + - data-checked ==0.3 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - data-default-instances-containers ==0.0.1 - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 + - data-dword ==0.3.1.1 + - data-endian ==0.1.1 + - data-fix ==0.0.4 + - data-has ==0.2.1.0 - data-hash ==0.2.0.1 - data-inttrie ==0.1.2 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 - - data-msgpack ==0.0.9 + - data-msgpack ==0.0.10 - data-or ==1.0.0.5 - data-ordlist ==0.4.7.0 + - data-ref ==0.0.1.1 - data-reify ==0.6.1 + - data-serializer ==0.3 + - data-textual ==0.3.0.2 - datasets ==0.2.1 - dataurl ==0.1.0.0 - DAV ==1.3.1 @@ -475,7 +516,8 @@ default-package-overrides: - dejafu ==0.4.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - - deriving-compat ==0.3.5 + - derive ==2.6.2 + - deriving-compat ==0.3.6 - descriptive ==0.9.4 - diagrams ==1.4 - diagrams-builder ==0.8.0.1 @@ -485,27 +527,29 @@ default-package-overrides: - diagrams-core ==1.4 - diagrams-gtk ==1.4 - diagrams-html5 ==1.4 - - diagrams-lib ==1.4.0.1 + - 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 - Diff ==0.3.4 - diff3 ==0.3.0 - 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 + - disposable ==0.2.0.4 - distance ==0.1.0.0 - - distributed-closure ==0.3.3.0 + - distributed-closure ==0.3.4.0 - distributed-process ==0.6.6 - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 - - distribution-nixpkgs ==1.0.0.1 + - distribution ==1.1.1.0 - distributive ==0.5.2 - diversity ==0.8.0.2 - djinn-ghc ==0.0.2.3 @@ -521,9 +565,9 @@ default-package-overrides: - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 - doctemplates ==0.1.0.2 - - doctest ==0.11.1 + - doctest ==0.11.3 - doctest-discover ==0.1.0.7 - - dotenv ==0.3.1.0 + - dotenv ==0.3.4.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.5 @@ -532,7 +576,9 @@ default-package-overrides: - DRBG ==0.5.5 - drifter ==0.2.2 - drifter-postgresql ==0.1.0 - - dual-tree ==0.2.0.9 + - dsp ==0.2.3.1 + - dual-tree ==0.2.1 + - dvorak ==0.1.0.0 - dynamic-state ==0.2.2.0 - dyre ==0.8.12 - Earley ==0.11.0.1 @@ -544,41 +590,51 @@ default-package-overrides: - EdisonAPI ==1.3.1 - EdisonCore ==1.3.1.1 - edit-distance ==0.2.2.1 + - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - effect-handlers ==0.1.0.8 + - effin ==0.3.0.2 - either ==4.4.1.1 - either-unwrap ==1.1 - - ekg ==0.4.0.12 + - ekg ==0.4.0.13 - ekg-core ==0.1.1.1 - - ekg-json ==0.1.0.4 + - ekg-json ==0.1.0.5 - ekg-statsd ==0.2.1.0 + - ekg-wai ==0.1.0.1 - elerea ==2.9.0 - - elm-bridge ==0.4.0 + - elm-bridge ==0.4.1 - 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 - - envelope ==0.2.1.0 + - enumset ==0.0.4 + - envelope ==0.2.2.0 - envparse ==0.4 - envy ==1.3.0.2 - epub-metadata ==4.5 - eq ==4.0.4 + - equal-files ==0.0.5.3 - equivalence ==0.3.2 - erf ==2.0.0.0 - errors ==2.1.3 - ersatz ==0.3.1 - - esqueleto ==2.5.1 + - esqueleto ==2.5.3 + - etc ==0.0.0.2 - etcd ==1.0.5 - - ether ==0.4.0.2 + - ether ==0.4.2.0 - euphoria ==0.8.0.0 - event ==0.1.4 - - eventstore ==0.14.0.1 + - event-list ==0.1.1.3 + - eventstore ==0.14.0.2 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.2 - exception-mtl ==0.4.0.1 @@ -586,19 +642,22 @@ default-package-overrides: - exceptional ==0.3.0.0 - exceptions ==0.8.3 - executable-hash ==0.2.0.4 - - executable-path ==0.0.3 - - exhaustive ==1.1.3 + - executable-path ==0.0.3.1 + - exhaustive ==1.1.4 - exp-pairs ==0.1.5.2 - 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.1 + - extra ==1.5.3 + - extract-dependencies ==0.2.0.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-builder ==0.0.0.6 - fast-digits ==0.2.1.0 - fast-logger ==2.4.10 + - fast-math ==1.0.2 - fasta ==0.10.4.2 - fay ==0.23.1.16 - fay-base ==0.20.0.1 @@ -611,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.4 + - fft ==0.1.8.6 - fgl ==5.5.3.1 - fgl-arbitrary ==0.2.0.3 - file-embed ==0.0.10 @@ -621,12 +680,13 @@ default-package-overrides: - filemanip ==0.3.6.3 - fingertree ==0.1.1.0 - fingertree-psqueue ==0.3 - - finite-typelits ==0.1.1.0 + - finite-typelits ==0.1.2.0 - fixed ==0.2.1.1 + - fixed-length ==0.2 - fixed-vector ==0.9.0.0 - fixed-vector-hetero ==0.3.1.1 - - flac ==0.1.1 - - flac-picture ==0.1.0 + - flac ==0.1.2 + - flac-picture ==0.1.1 - flat-mcmc ==1.5.0 - flexible-defaults ==0.0.1.2 - FloatingHex ==0.4 @@ -637,19 +697,22 @@ default-package-overrides: - focus ==0.1.5 - fold-debounce ==0.2.0.5 - fold-debounce-conduit ==0.1.0.5 - - foldl ==1.2.3 - - foldl-statistics ==0.1.4.2 - - folds ==0.7.1 - - FontyFruity ==0.5.3.2 + - foldl ==1.2.5 + - foldl-statistics ==0.1.4.6 + - folds ==0.7.3 + - 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.13 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 + - freer ==0.2.4.1 + - freer-effects ==0.3.0.1 - friendly-time ==0.4 - frisby ==0.2 - from-sum ==0.2.1.0 @@ -658,51 +721,55 @@ default-package-overrides: - fsnotify-conduit ==0.1.0.0 - funcmp ==1.8 - fuzzcheck ==0.1.1 + - fuzzy ==0.1.0.0 - gd ==3000.7.3 - Genbank ==1.0.3 - - generic-aeson ==0.2.0.8 - - generic-deriving ==1.11.1 - - generic-random ==0.4.0.0 + - general-games ==1.0.5 + - generic-aeson ==0.2.0.9 + - generic-deriving ==1.11.2 + - generic-random ==0.4.1.0 - generic-xmlpickler ==0.1.0.5 - GenericPretty ==1.2.1 - generics-eot ==0.2.1.1 - - generics-sop ==0.2.4.0 + - generics-sop ==0.2.5.0 - generics-sop-lens ==0.1.2.1 - - geniplate-mirror ==0.7.4 - - getopt-generics ==0.13 + - geniplate-mirror ==0.7.5 + - getopt-generics ==0.13.0.1 - ghc-events ==0.4.4.0 - - ghc-exactprint ==0.5.3.0 - - ghc-heap-view ==0.5.7 + - ghc-exactprint ==0.5.3.1 + - ghc-heap-view ==0.5.9 - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 - ghc-prof ==1.3.0.2 - - ghc-syb-utils ==0.2.3 + - ghc-syb-utils ==0.2.3.2 - ghc-tcplugins-extra ==0.2 - - ghc-typelits-extra ==0.2.2 - - ghc-typelits-knownnat ==0.2.3 - - ghc-typelits-natnormalise ==0.5.2 + - ghc-typelits-extra ==0.2.3 + - ghc-typelits-knownnat ==0.2.4 + - ghc-typelits-natnormalise ==0.5.3 - ghcid ==0.6.6 + - ghcjs-base-stub ==0.1.0.2 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - - ghcjs-perch ==0.3.3.1 - - gi-atk ==2.0.11 - - gi-cairo ==1.0.11 - - gi-gdk ==3.0.11 - - gi-gdkpixbuf ==2.0.11 - - gi-gio ==2.0.11 - - gi-glib ==2.0.11 - - gi-gobject ==2.0.11 - - gi-gtk ==3.0.11 - - gi-javascriptcore ==3.0.11 - - gi-pango ==1.0.12 - - gi-soup ==2.4.11 - - gi-webkit ==3.0.11 + - ghcjs-perch ==0.3.3.2 + - gi-atk ==2.0.12 + - gi-cairo ==1.0.12 + - gi-gdk ==3.0.12 + - gi-gdkpixbuf ==2.0.12 + - gi-gio ==2.0.12 + - gi-glib ==2.0.12 + - gi-gobject ==2.0.12 + - gi-gtk ==3.0.15 + - gi-javascriptcore ==3.0.12 + - gi-pango ==1.0.13 + - gi-soup ==2.4.12 + - gi-webkit ==3.0.12 - ginger ==0.3.9.1 - gio ==0.13.3.1 - - gipeda ==0.3.3.1 + - gipeda ==0.3.3.2 - giphy-api ==0.5.2.0 + - git ==0.2.0 - github ==0.15.0 - - github-release ==1.0.1 + - github-release ==1.0.3 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -711,7 +778,8 @@ default-package-overrides: - gitlib-test ==3.1.0.3 - gitrev ==1.2.0 - gitson ==0.5.2 - - glabrous ==0.3.1 + - gl ==0.8.0 + - glabrous ==0.3.2 - glaze ==0.2.0.2 - glazier ==0.7.0.0 - glazier-pipes ==0.1.4.0 @@ -722,7 +790,8 @@ default-package-overrides: - gloss ==1.10.2.5 - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.3 - - GLUT ==2.7.0.11 + - GLUT ==2.7.0.12 + - gnuplot ==0.5.4.1 - gogol ==0.1.1 - gogol-adexchange-buyer ==0.1.1 - gogol-adexchange-seller ==0.1.1 @@ -831,7 +900,13 @@ default-package-overrides: - graphviz ==2999.18.1.2 - gravatar ==0.8.0 - graylog ==0.1.0.1 - - groom ==0.1.2 + - groom ==0.1.2.1 + - groundhog ==0.8 + - groundhog-inspector ==0.8 + - groundhog-mysql ==0.8 + - groundhog-postgresql ==0.8.0.1 + - groundhog-sqlite ==0.8 + - groundhog-th ==0.8 - grouped-list ==0.2.1.2 - groupoids ==4.0 - groups ==0.4.0.0 @@ -842,32 +917,35 @@ default-package-overrides: - H ==0.9.0.1 - hackage-db ==1.22 - hackage-security ==0.5.2.2 - - hackernews ==1.1.1.0 - - haddock-library ==1.4.2 - - hailgun ==0.4.1.2 + - hackernews ==1.1.2.0 + - haddock-library ==1.4.3 + - hailgun ==0.4.1.4 - hailgun-simple ==0.1.0.0 - - hakyll ==4.9.5.1 + - hakyll ==4.9.7.0 - half ==0.2.2.3 - hamilton ==0.1.0.0 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 + - handwriting ==0.1.0.3 - hapistrano ==0.2.1.2 - happstack-authenticate ==2.3.4.7 - happstack-clientsession ==7.3.1 - - happstack-hsp ==7.3.7.1 + - happstack-hsp ==7.3.7.2 - happstack-jmacro ==7.0.11 - - happstack-server ==7.4.6.3 + - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.2 - happy ==1.19.5 + - HaRe ==0.8.4.0 - harp ==0.4.2 - - hasbolt ==0.1.1.1 - - hashable ==1.2.5.0 - - hashable-time ==0.2 + - hasbolt ==0.1.2.1 + - hashable ==1.2.6.1 + - hashable-time ==0.2.0.1 - hashmap ==1.3.2 - - hashtables ==1.2.1.0 - - haskeline ==0.7.3.1 - - haskell-gi ==0.20 - - haskell-gi-base ==0.20 + - 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.2 - haskell-lexer ==1.0.1 - haskell-names ==0.8.0 - haskell-neo4j-client ==0.3.2.4 @@ -894,34 +972,38 @@ default-package-overrides: - hasql-transaction ==0.5 - hastache ==0.6.1 - hasty-hamiltonian ==1.3.0 - - HaTeX ==3.17.1.0 + - HaTeX ==3.17.2.0 - 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 - HCodecs ==0.5 - - hdaemonize ==0.5.2 + - hdaemonize ==0.5.3 - HDBC ==2.4.0.1 + - HDBC-mysql ==0.7.1.0 - HDBC-session ==0.1.1.0 - hdevtools ==0.1.5.0 - heap ==1.0.3 - - heaps ==0.3.3 + - heaps ==0.3.4.1 - hebrew-time ==0.1.1 - - hedis ==0.9.7 - - here ==1.2.9 + - hedis ==0.9.8 + - here ==1.2.11 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.4.0 + - heterocephalus ==1.0.5.0 - hex ==0.1.2 - - hexml ==0.3.1 + - hexml ==0.3.2 + - hexpat ==0.20.13 - hexstring ==0.11.1 - hflags ==0.4.2 - hformat ==0.1.0.1 - hfsevents ==0.1.6 + - hgal ==2.0.0.2 - hid ==0.2.2 - hidapi ==0.1.4 + - hidden-char ==0.1.0.0 - hierarchical-clustering ==0.4.6 - highjson ==0.4.0.0 - highjson-swagger ==0.4.0.0 @@ -929,16 +1011,16 @@ default-package-overrides: - highlighting-kate ==0.6.4 - hinotify ==0.3.9 - hint ==0.6.0 - - hip ==1.5.2.0 + - hip ==1.5.3.0 - histogram-fill ==0.8.5.0 - hit ==0.6.3 - hjpath ==3.0.1 - hjsmin ==0.2.0.2 - hjson ==1.3.2 - - hjsonpointer ==1.1.0.2 + - hjsonpointer ==1.1.1 - hjsonschema ==1.5.0.1 - hlibgit2 ==0.18.0.16 - - hlibsass ==0.1.5.0 + - hlibsass ==0.1.6.0 - hlint ==1.9.41 - hmatrix ==0.18.0.0 - hmatrix-gsl ==0.18.0.1 @@ -952,47 +1034,50 @@ default-package-overrides: - holy-project ==0.2.0.1 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - - hopenssl ==1.7 + - hopfli ==0.2.2.1 - hosc ==0.15 - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.10 - - hpc-coveralls ==1.0.8 + - hpc-coveralls ==1.0.10 - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.7 + - hpio ==0.8.0.10 - hpp ==0.4.0 - hpqtypes ==1.5.1.1 - - hquantlib ==0.0.3.3 + - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hruby ==0.3.4.3 - hs-bibutils ==5.5 - hs-GeoIP ==0.3 - - hsass ==0.4.0 + - hsass ==0.4.1 - hsb2hs ==0.3.1 - hscolour ==1.24.1 + - hscurses ==1.4.2.0 - hsdns ==1.7 - hse-cpp ==0.2 - hsebaysdk ==0.4.0.0 - - hsemail ==1.7.7 - - HSet ==0.0.0 + - hsemail ==2 + - HSet ==0.0.1 - hset ==2.2.0 - - hsexif ==0.6.1.0 + - hsexif ==0.6.1.1 - hsignal ==0.2.7.5 - hsinstall ==1.5 - hslogger ==1.2.10 - hslua ==0.4.1 + - hslua-aeson ==0.1.0.4 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4.1 + - HsOpenSSL ==0.11.4.9 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.4.2 + - hspec ==2.4.3 - hspec-attoparsec ==0.1.0.2 + - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.4.0 - - hspec-core ==2.4.2 - - hspec-discover ==2.4.2 + - hspec-core ==2.4.3 + - hspec-discover ==2.4.3 - hspec-expectations ==0.8.2 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 @@ -1003,11 +1088,12 @@ default-package-overrides: - hspec-wai ==0.8.0 - hspec-wai-json ==0.8.0 - hspec-webdriver ==1.2.0 + - hsshellscript ==3.4.1 - hstatistics ==0.3 - hstatsd ==0.1 - - HStringTemplate ==0.8.5 + - HStringTemplate ==0.8.6 - hsx-jmacro ==7.3.8 - - hsx2hs ==0.14.0 + - hsx2hs ==0.14.1 - hsyslog ==4 - htaglib ==1.0.4 - HTF ==0.13.1.0 @@ -1015,20 +1101,21 @@ default-package-overrides: - html-conduit ==1.2.1.1 - html-email-validate ==0.2.0.0 - htoml ==1.0.0.3 - - HTTP ==4000.3.5 - - http-api-data ==0.3.5 - - http-client ==0.5.6.1 - - http-client-openssl ==0.2.0.4 - - http-client-tls ==0.3.4 + - HTTP ==4000.3.7 + - 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.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 - - http-reverse-proxy ==0.4.3.2 - - http-streams ==0.8.4.0 + - http-reverse-proxy ==0.4.4 + - http-streams ==0.8.5.3 - http-types ==0.9.1 - http2 ==1.6.3 + - httpd-shed ==0.4.0.3 - human-readable-duration ==0.2.0.3 - HUnit ==1.5.0.0 - HUnit-approx ==1.1 @@ -1043,7 +1130,7 @@ default-package-overrides: - hw-json ==0.4.0.0 - hw-mquery ==0.1.0.1 - hw-parser ==0.0.0.1 - - hw-prim ==0.4.0.2 + - hw-prim ==0.4.0.3 - hw-rankselect ==0.8.0.0 - hw-rankselect-base ==0.2.0.0 - hw-string-parse ==0.0.0.3 @@ -1061,17 +1148,19 @@ default-package-overrides: - hyphenation ==0.6 - ical ==0.0.1 - iconv ==0.4.1.3 - - identicon ==0.2.0 + - identicon ==0.2.2 + - idris ==1.0 - ieee754 ==0.8.0 - if ==0.1.0.0 - IfElse ==0.85 + - iff ==0.0.6 - ignore ==0.1.1.0 - ilist ==0.2.0.0 - imagesize-conduit ==1.1 - 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 @@ -1081,17 +1170,18 @@ default-package-overrides: - inline-c-cpp ==0.1.0.0 - inline-java ==0.6.1 - inline-r ==0.9.0.1 - - insert-ordered-containers ==0.2.0.0 + - insert-ordered-containers ==0.2.1.0 - instance-control ==0.1.1.1 - integer-logarithms ==1.0.1 - integration ==0.2.1 - intero ==0.1.20 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 + - interpolation ==0.1.0.1 - IntervalMap ==0.5.2.0 - intervals ==0.7.2 - intro ==0.1.0.10 - - invariant ==0.4 + - invariant ==0.4.2 - invertible ==0.2.0.2 - io-choice ==0.0.6 - io-machine ==0.2.0.0 @@ -1099,50 +1189,53 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.3.6.0 + - io-streams ==1.3.6.1 - io-streams-haproxy ==1.0.0.1 - - ip6addr ==0.5.2 + - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==0.6.3 - irc ==0.6.1.0 - irc-client ==0.4.4.1 - irc-conduit ==0.2.2.1 - irc-ctcp ==0.1.3.0 - - irc-dcc ==2.0.0 + - irc-dcc ==2.0.1 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.4 + - isotope ==0.4.0.0 - iterable ==3.0 - ix-shapable ==0.1.0 - ixset ==1.0.7 - ixset-typed ==0.3.1 - jailbreak-cabal ==1.3.2 + - javascript-extras ==0.3.1.0 - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - jmacro-rpc-snap ==0.3 - jni ==0.2.3 - - jose ==0.5.0.2 - - jose-jwt ==0.7.5 + - jose ==0.5.0.4 + - jose-jwt ==0.7.6 - js-flot ==0.8.3 - js-jquery ==3.1.1 - json ==0.9.1 + - json-ast ==0.3.1 - json-builder ==0.3 - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - json-stream ==0.4.1.3 - - JuicyPixels ==3.2.8 + - JuicyPixels ==3.2.8.2 - JuicyPixels-extra ==0.1.1 - JuicyPixels-scale-dct ==0.1.1.2 - jvm ==0.1.2 - jvm-streaming ==0.1 - jwt ==0.7.2 - - kan-extensions ==5.0.1 + - kan-extensions ==5.0.2 - kansas-comet ==0.4 - - katip ==0.3.1.4 - - katip-elasticsearch ==0.3.0.2 - - kawhi ==0.2.1 + - katip ==0.3.1.5 + - katip-elasticsearch ==0.3.1.0 + - kawhi ==0.2.3 - kdt ==0.2.4 - keter ==1.4.3.2 - keycode ==0.2.2 @@ -1151,42 +1244,45 @@ default-package-overrides: - knob ==0.1.1 - koofr-client ==1.0.0.3 - kraken ==0.0.3 - - l10n ==0.1.0.0 + - l10n ==0.1.0.1 - labels ==0.3.2 - - lackey ==0.4.2 + - lackey ==0.4.3 - language-c ==0.5.0 - - language-c-quote ==0.11.7.1 - - language-dockerfile ==0.3.5.0 - - language-ecmascript ==0.17.1.0 + - language-c-quote ==0.11.7.3 + - language-dockerfile ==0.3.6.0 + - language-ecmascript ==0.17.2.0 - language-fortran ==0.5.1 - language-glsl ==0.2.0 - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - - language-javascript ==0.6.0.9 + - language-javascript ==0.6.0.10 - language-lua2 ==0.1.0.5 - - language-nix ==2.1.0.1 - - language-puppet ==1.3.6 + - language-puppet ==1.3.7 - language-python ==0.5.4 - language-thrift ==0.10.0.0 - - large-hashable ==0.1.0.3 + - large-hashable ==0.1.0.4 - largeword ==1.2.5 + - latex ==0.1.0.3 - lattices ==1.5.0 - lazy-csv ==0.5.1 + - lazyio ==0.1.0.4 - lca ==0.3 - leapseconds-announced ==2017 - lens ==4.15.1 - - lens-action ==0.2.0.2 - - lens-aeson ==1.0.0.5 + - lens-action ==0.2.1 + - lens-aeson ==1.0.1 - lens-datetime ==0.3 - lens-family ==1.2.1 - lens-family-core ==1.2.1 - lens-family-th ==0.5.0.0 + - lens-labels ==0.1.0.1 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 - - lentil ==1.0.8.0 - - leveldb-haskell ==0.6.4 + - lentil ==1.0.9.0 + - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.1 - lhs2tex ==1.19 + - libffi ==0.1 - libgit ==0.3.1 - libinfluxdb ==0.0.4 - libmpd ==0.9.0.6 @@ -1196,10 +1292,10 @@ default-package-overrides: - LibZip ==1.0.1 - licensor ==0.2.0 - lift-generics ==0.1.1 - - lifted-async ==0.9.1.1 - - lifted-base ==0.2.3.10 + - lifted-async ==0.9.3 + - lifted-base ==0.2.3.11 - line ==2.2.0 - - linear ==1.20.5 + - linear ==1.20.6 - linear-accelerate ==0.2 - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 @@ -1209,13 +1305,14 @@ default-package-overrides: - list-prompt ==0.1.1.0 - list-t ==1 - ListLike ==4.5.1 + - llvm-hs-pure ==4.0.0.0 - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.7 - - log-base ==0.7 - - 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 @@ -1223,36 +1320,44 @@ 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 - - machines ==0.6.1 + - machines ==0.6.2 - machines-binary ==0.3.0.3 - - machines-directory ==0.2.0.10 + - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - machines-process ==0.2.0.8 - magic ==1.1 + - magicbane ==0.1.1 - mainland-pretty ==0.4.1.4 - makefile ==0.1.1.0 - managed ==1.0.5 - - mandrill ==0.5.3.1 + - mandrill ==0.5.3.2 - markdown ==0.1.16 - markdown-unlit ==0.4.0 + - markov-chain ==0.0.3.4 - markup ==3.1.0 + - marvin ==0.2.3 + - marvin-interpolate ==1.1.2 - math-functions ==0.2.1.0 - mathexpr ==0.3.0.0 + - matplotlib ==0.4.5 - matrices ==0.4.4 - matrix ==0.3.5.0 - - matrix-market-attoparsec ==0.1.0.5 + - matrix-market-attoparsec ==0.1.0.8 - maximal-cliques ==0.1.1 - mbox ==0.3.3 + - mbox-utility ==0.0.1 - mcmc-types ==1.0.3 + - mediabus ==0.3.3.0 + - mediabus-rtp ==0.3.2.1 - median-stream ==0.7.0.0 - - mega-sdist ==0.3.0 + - mega-sdist ==0.3.0.2 - megaparsec ==5.2.0 - - memory ==0.14.1 - - MemoTrie ==0.6.7 + - memory ==0.14.6 + - MemoTrie ==0.6.8 - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 @@ -1261,35 +1366,41 @@ default-package-overrides: - MFlow ==0.4.6.0 - mfsolve ==0.3.2.0 - microbench ==0.1 - - microformats2-parser ==1.0.1.6 - - microlens ==0.4.7.0 - - microlens-aeson ==2.2.0 + - microformats2-parser ==1.0.1.7 + - microlens ==0.4.8.0 + - microlens-aeson ==2.2.0.1 - microlens-contra ==0.1.0.1 - - microlens-ghc ==0.4.7.0 - - microlens-mtl ==0.1.10.0 - - microlens-platform ==0.3.7.1 + - microlens-ghc ==0.4.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.4 - mighty-metropolis ==1.2.0 - - mime-mail ==0.4.13 + - mime-mail ==0.4.13.1 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 - - mintty ==0.1 + - minio-hs ==0.2.1 + - mintty ==0.1.1 - misfortune ==0.1.1.2 - 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 - - mockery ==0.3.4 + - mnist-idx ==0.1.2.8 + - 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 - monad-journal ==0.7.2 - - monad-logger ==0.3.20.2 + - monad-logger ==0.3.24 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - - monad-logger-syslog ==0.1.3.0 + - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - monad-metrics ==0.1.0.2 - monad-par ==0.3.4.8 @@ -1298,7 +1409,7 @@ default-package-overrides: - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 - - monad-skeleton ==0.1.3 + - monad-skeleton ==0.1.3.2 - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.0 @@ -1314,9 +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.6 + - morte ==1.6.9 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1329,10 +1441,12 @@ default-package-overrides: - multiset-comb ==0.2.4.1 - multistate ==0.7.1.1 - murmur-hash ==0.1.0.9 + - mushu ==0.1.1 - MusicBrainz ==0.2.4 + - mustache ==2.1.4 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 - - mwc-random ==0.13.5.0 + - mwc-random ==0.13.6.0 - mwc-random-monad ==0.7.3.1 - mysql ==0.1.4 - mysql-haskell ==0.8.0.0 @@ -1353,7 +1467,7 @@ default-package-overrides: - netwire ==5.0.2 - netwire-input ==0.0.6 - netwire-input-glfw ==0.0.6 - - network ==2.6.3.1 + - network ==2.6.3.2 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 @@ -1361,6 +1475,7 @@ default-package-overrides: - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - network-info ==0.2.0.8 + - network-ip ==0.3 - network-msgpack-rpc ==0.0.3 - network-multicast ==0.2.0 - Network-NineP ==0.4.1 @@ -1378,48 +1493,56 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.0.1 + - non-empty ==0.3 - non-empty-sequence ==0.2.0.2 - - nonce ==1.0.2 + - non-negative ==0.1.1 + - nonce ==1.0.4 + - nondeterminism ==1.4 - NoTrace ==0.3.0.1 - nsis ==0.3.1 - numbers ==3000.2.0.1 - numeric-extras ==0.1 + - numeric-prelude ==0.4.2 + - numeric-quest ==0.2.0.1 - NumInstances ==1.4 - numtype-dk ==0.5.0.1 - oanda-rest-api ==0.3.0.0 - objective ==1.1.1 - ObjectName ==1.1.0.1 - - octane ==0.18.2 + - octane ==0.18.3 - Octree ==0.5.4.3 - - oeis ==0.3.8 + - oeis ==0.3.9 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - once ==0.2 + - 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 - open-browser ==0.2.1.0 - open-witness ==0.4 - OpenAL ==1.7.0.4 - - OpenGL ==3.0.1.0 + - OpenGL ==3.0.2.0 - OpenGLRaw ==3.2.4.0 - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - - openssl-streams ==1.2.1.0 + - openssl-streams ==1.2.1.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - opml-conduit ==0.6.0.1 - optional-args ==1.0.1 - options ==1.2.1.1 - - optparse-applicative ==0.13.1.0 - - optparse-generic ==1.1.4 + - optparse-applicative ==0.13.2.0 + - optparse-generic ==1.1.5 - optparse-helper ==0.2.1.1 - optparse-simple ==0.0.3 - optparse-text ==0.1.1.0 - osdkeys ==0.0 - overloaded-records ==0.4.2.0 + - package-description-remote ==0.2.0.0 - packdeps ==0.4.3 - pager ==0.1.1.0 - pagerduty ==0.0.8 @@ -1429,17 +1552,17 @@ default-package-overrides: - pandoc-citeproc ==0.10.4.1 - pandoc-types ==1.17.0.5 - pango ==0.13.3.1 - - parallel ==3.2.1.0 + - parallel ==3.2.1.1 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - parsec ==3.1.11 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parsers ==0.12.4 + - parsers ==0.12.5 - partial-handler ==1.0.2 - - partial-isomorphisms ==0.2.2 - - patat ==0.5.0.0 - - path ==0.5.12 + - partial-isomorphisms ==0.2.2.1 + - patat ==0.5.2.2 + - path ==0.5.13 - path-extra ==0.0.3 - path-io ==1.2.2 - path-pieces ==0.2.1 @@ -1457,29 +1580,29 @@ default-package-overrides: - permutation ==0.5.0.5 - persistable-record ==0.4.1.1 - persistable-types-HDBC-pg ==0.0.1.4 - - persistent ==2.6 - - persistent-mysql ==2.6 - - persistent-postgresql ==2.6 + - persistent ==2.6.1 + - persistent-mysql ==2.6.1 + - persistent-postgresql ==2.6.1 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.0.1 - - persistent-template ==2.5.1.6 + - persistent-sqlite ==2.6.2 + - persistent-template ==2.5.2 - pgp-wordlist ==0.1.0.2 - 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.0.2 + - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - - pipes ==4.3.2 - - pipes-attoparsec ==0.5.1.4 - - pipes-bytestring ==2.1.4 + - pipes ==4.3.4 + - pipes-attoparsec ==0.5.1.5 + - pipes-bytestring ==2.1.6 - pipes-cacophony ==0.4.1 - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.7 - pipes-csv ==1.4.3 - - pipes-extras ==1.0.8 + - pipes-extras ==1.0.10 - pipes-fluid ==0.5.0.3 - pipes-group ==1.0.6 - pipes-misc ==0.2.5.0 @@ -1492,8 +1615,8 @@ default-package-overrides: - pixelated-avatar-generator ==0.1.3 - pkcs10 ==0.2.0.0 - placeholders ==0.1 - - plan-b ==0.2.0 - - plot ==0.2.3.6 + - plan-b ==0.2.1 + - plot ==0.2.3.7 - plot-gtk ==0.2.0.4 - plot-gtk-ui ==0.3.0.2 - plot-gtk3 ==0.1.0.2 @@ -1502,54 +1625,71 @@ default-package-overrides: - pointedlist ==0.6.1 - pointful ==1.0.9 - pointless-fun ==1.1.0.6 + - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 + - pooled-io ==0.0.2.1 - posix-paths ==0.2.1.1 - posix-realtime ==0.0.0.4 - post-mess-age ==0.2.1.0 - postgresql-binary ==0.9.3 - - postgresql-libpq ==0.9.3.0 - - postgresql-simple ==0.5.2.1 + - postgresql-libpq ==0.9.3.1 + - 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 - postgresql-transactional ==1.1.1 - - postgresql-typed ==0.5.0 - - pqueue ==1.3.2 + - postgresql-typed ==0.5.1 + - pqueue ==1.3.2.2 - pred-set ==0.0.1 - prednote ==0.36.0.4 - prefix-units ==0.2.0 + - prelude-compat ==0.0.0.1 - prelude-extras ==0.4.0.3 - prelude-safeenum ==0.1.1.2 - preprocessor-tools ==1.0.1 - presburger ==1.3.1 + - present ==4.1.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - - pretty-show ==1.6.12 + - pretty-show ==1.6.13 - 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 - - process-extras ==0.7.1 + - probability ==0.2.5.1 + - process-extras ==0.7.2 - product-profunctors ==0.7.1.0 - - profiteur ==0.4.2.1 + - profiteur ==0.4.3.0 - profunctor-extras ==4.0 - profunctors ==5.2 - project-template ==0.2.0 - projectroot ==0.2.0.1 - - prometheus-client ==0.1.0.1 - - prometheus-metrics-ghc ==0.1.0.1 + - prometheus-client ==0.1.1 + - prometheus-metrics-ghc ==0.1.1 - prompt ==0.1.1.2 + - proto-lens ==0.2.1.0 + - 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.3 + - proto-lens-protoc ==0.2.1.0 - protobuf ==0.2.1.1 - - protobuf-simple ==0.1.0.2 - - protocol-buffers ==2.4.0 - - protocol-buffers-descriptor ==2.4.0 + - protobuf-simple ==0.1.0.4 + - 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 @@ -1566,10 +1706,11 @@ 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.3 + - quickcheck-simple ==0.1.0.2 + - quickcheck-special ==0.1.0.5 - quickcheck-text ==0.1.2.1 - - quickcheck-unicode ==1.0.0.1 + - quickcheck-unicode ==1.0.1.0 + - raaz ==0.1.1 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - ramus ==0.1.2 @@ -1580,23 +1721,25 @@ default-package-overrides: - random-tree ==0.6.0.5 - range ==0.1.2.0 - range-set-list ==0.1.2.0 + - rank-product ==0.2.0.1 - rank1dynamic ==0.3.3.0 - - Rasterific ==0.7.1 + - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.2.1 - - ratel ==0.3.2 + - ratel ==0.3.3 - ratel-wai ==0.2.0 - rattletrap ==2.1.5 - raw-strings-qq ==1.1 - - rawfilepath ==0.1.0.0 + - rawfilepath ==0.1.1 - rawstring-qm ==0.2.3.0 - rdf ==0.1.0.1 + - rdtsc ==1.3.0.1 - read-editor ==0.1.0.2 - read-env-var ==0.1.0.1 - readable ==0.3.1 - 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 @@ -1604,6 +1747,7 @@ default-package-overrides: - ref-fd ==0.4.0.1 - refact ==0.3.0.2 - references ==0.3.2.1 + - refined ==0.1.2.1 - reflection ==2.1.2 - reform ==0.2.7.1 - reform-blaze ==0.2.4.3 @@ -1611,6 +1755,7 @@ default-package-overrides: - reform-happstack ==0.2.5.1 - reform-hsp ==0.2.7.1 - RefSerialize ==0.4.0 + - regex ==1.0.1.3 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1618,13 +1763,15 @@ default-package-overrides: - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.94.4 - regex-pcre-builtin ==0.94.4.8.8.35 + - regex-pcre-text ==0.94.0.1 - regex-posix ==0.95.2 - regex-tdfa ==1.2.2 - regex-tdfa-text ==1.0.0.3 + - regex-with-pcre ==1.0.1.3 - reinterpret-cast ==0.1.0 - - relational-query ==0.8.3.5 - - relational-query-HDBC ==0.6.0.2 - - relational-record ==0.1.6.1 + - relational-query ==0.8.4.0 + - relational-query-HDBC ==0.6.0.3 + - relational-record ==0.1.7.1 - relational-schemas ==0.1.3.1 - renderable ==0.2.0.1 - repa ==3.4.1.2 @@ -1648,14 +1795,14 @@ default-package-overrides: - rest-types ==1.14.1.1 - rest-wai ==0.2.0.1 - result ==0.2.6.0 - - rethinkdb ==2.2.0.9 + - rethinkdb ==2.2.0.10 - rethinkdb-client-driver ==0.0.23 - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - - riak ==1.1.1.0 + - riak ==1.1.2.0 - riak-protobuf ==0.22.0.0 - - RNAlien ==1.3.1 + - RNAlien ==1.3.7 - rng-utils ==0.2.1 - rose-trees ==0.0.4.3 - rot13 ==0.1.0.2 @@ -1665,26 +1812,30 @@ 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.4.0 + - safe ==0.3.15 + - safe-exceptions ==0.1.6.0 - safe-exceptions-checked ==0.1.0 - - safecopy ==0.9.2 + - safecopy ==0.9.3.2 - SafeSemaphore ==0.10.1 + - sample-frame ==0.0.3 + - sample-frame-np ==0.0.4.1 - sampling ==0.3.2 - sandi ==0.4.0 - sandman ==0.2.0.1 - say ==0.1.0.0 - sbv ==5.14 - - scalpel ==0.5.0 - - scalpel-core ==0.5.0 + - scalpel ==0.5.1 + - scalpel-core ==0.5.1 - scanner ==0.2 - - scientific ==0.3.4.10 + - scientific ==0.3.5.1 - scotty ==0.11.0 + - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 - sdl2 ==2.2.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==0.1 + - search-algorithms ==0.1.0 - securemem ==0.1.9 - SegmentTree ==0.3 - semigroupoid-extras ==5 @@ -1698,7 +1849,7 @@ default-package-overrides: - serf ==0.1.1.0 - servant ==0.9.1.1 - servant-aeson-specs ==0.5.2.0 - - servant-auth-cookie ==0.4.3.3 + - servant-auth-cookie ==0.4.4 - servant-blaze ==0.7.1 - servant-cassava ==0.8 - servant-client ==0.9.1.1 @@ -1706,36 +1857,40 @@ 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 + - servant-ruby ==0.2.1.0 - servant-server ==0.9.1.1 + - servant-static-th ==0.1.0.3 - servant-subscriber ==0.5.0.3 - servant-swagger ==1.1.2 - - servant-swagger-ui ==0.2.2.2.2.8 + - servant-swagger-ui ==0.2.3.2.2.8 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-backend-acid-state ==1.0.3 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - servius ==1.2.0.2 + - 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 - - shake-language-c ==0.10.0 - - shakespeare ==2.0.12.1 + - shake-language-c ==0.10.1 + - shakespeare ==2.0.13 - shell-conduit ==4.5.2 + - shelly ==1.6.8.3 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - - show-prettyprint ==0.1.2 - - sibe ==0.2.0.4 + - show-prettyprint ==0.1.2.1 + - sibe ==0.2.0.5 - signal ==0.1.0.3 - silently ==1.2.5 - - simple ==0.11.1 + - simple ==0.11.2 - simple-download ==0.0.2 - simple-log ==0.5.1 - simple-reflect ==0.3.2 @@ -1753,13 +1908,14 @@ default-package-overrides: - slug ==0.1.6 - smallcaps ==0.6.0.4 - smallcheck ==1.1.1 - - smoothie ==0.4.2.6 + - smoothie ==0.4.2.7 - smtLib ==1.0.8 - smtp-mail ==0.1.4.6 - - snap-core ==1.0.1.0 - - snap-server ==1.0.1.1 + - snap-blaze ==0.2.1.5 + - snap-core ==1.0.2.1 + - snap-server ==1.0.2.2 - snowflake ==0.1.1.1 - - soap ==0.2.3.3 + - soap ==0.2.3.5 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - socket ==0.7.0.0 @@ -1767,17 +1923,18 @@ default-package-overrides: - socks ==0.5.5 - solga ==0.1.0.2 - solga-swagger ==0.1.0.2 + - sort ==1.0.0.0 - sorted-list ==0.2.0.0 - 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.1 + - split ==0.2.3.2 - Spock ==0.12.0.0 - Spock-api ==0.12.0.0 - Spock-api-server ==0.12.0.0 @@ -1786,13 +1943,18 @@ default-package-overrides: - Spock-worker ==0.3.1.0 - spool ==0.1 - spoon ==0.3.1 - - sql-words ==0.1.4.1 - - sqlite-simple ==0.4.13.0 + - spreadsheet ==0.1.3.5 + - sql-words ==0.1.5.0 + - sqlite-simple ==0.4.14.0 - sqlite-simple-errors ==0.6.0.0 - - srcloc ==0.5.1.0 - - stache ==0.2.0 + - srcloc ==0.5.1.1 + - stache ==0.2.2 + - stack-run-auto ==0.1.1.4 - stack-type ==0.1.0.0 - - state-plus ==0.1.2 + - stackage-curator ==0.14.5 + - stackage-query ==0.1.1 + - stackage-types ==1.2.0 + - state-plus ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.0.4 @@ -1806,7 +1968,8 @@ default-package-overrides: - stm-conduit ==3.0.0 - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 - - stm-extras ==0.1.0.1 + - stm-extras ==0.1.0.2 + - stm-split ==0.0.2 - stm-stats ==0.2.0.0 - stm-supply ==0.2.0.0 - STMonadTrans ==0.4.3 @@ -1814,8 +1977,13 @@ default-package-overrides: - storable-complex ==0.2.2 - storable-endian ==0.2.6 - storable-record ==0.0.3.1 + - storable-tuple ==0.0.3.2 + - storablevector ==0.2.12 + - storablevector-carray ==0.0 + - store ==0.4.3.1 + - store-core ==0.4.1 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.4.1 + - stratosphere ==0.4.4 - streaming ==0.1.4.5 - streaming-bytestring ==0.1.4.6 - streaming-commons ==0.1.17 @@ -1837,16 +2005,16 @@ default-package-overrides: - stripe-haskell ==2.2.1 - stripe-http-streams ==2.2.1 - stripe-tests ==2.2.1 - - strive ==3.0.2 + - strive ==3.0.3 - stylish-haskell ==0.7.1.0 - success ==0.2.6 - sundown ==0.6 - superbuffer ==0.2.0.1 - svg-builder ==0.1.0.2 - - svg-tree ==0.6 + - svg-tree ==0.6.1 - SVGFonts ==1.6.0.1 - swagger ==0.3.0 - - swagger2 ==2.1.3 + - swagger2 ==2.1.4.1 - syb ==0.6 - syb-with-class ==0.6.1.7 - symbol ==0.2.4 @@ -1857,18 +2025,19 @@ default-package-overrides: - system-posix-redirect ==1.1.0.1 - syz ==0.2.0.0 - tabular ==0.2.2.7 + - tagchup ==0.4.1 - tagged ==0.8.5 - tagged-binary ==0.2.0.0 - - tagged-identity ==0.1.1 + - tagged-identity ==0.1.2 - taggy ==0.2.0 - taggy-lens ==0.1.2 - tagshare ==0.0 - tagsoup ==0.14.1 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 - - tar-conduit ==0.1.0 + - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - - tasty ==0.11.2 + - tasty ==0.11.2.2 - tasty-ant-xml ==1.0.5 - tasty-auto ==0.1.0.2 - tasty-dejafu ==0.3.0.2 @@ -1876,72 +2045,84 @@ 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 - tasty-program ==1.0.5 - tasty-quickcheck ==0.8.4 - tasty-rerun ==1.1.6 - - tasty-silver ==3.1.9 + - tasty-silver ==3.1.10 - tasty-smallcheck ==0.8.1 + - tasty-stats ==0.2.0.2 - tasty-tap ==0.0.4 - - tasty-th ==0.1.4 + - tasty-th ==0.1.7 - Taxonomy ==1.0.2 - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==0.6.0.0 - tcp-streams-openssl ==0.6.0.0 - - telegram-api ==0.6.0.2 + - tdigest ==0.1 + - 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 - - terminal-progress-bar ==0.1.1 + - termcolor ==0.2.0.0 + - terminal-progress-bar ==0.1.1.1 - terminal-size ==0.3.2.1 - - terminfo ==0.4.0.2 - - test-fixture ==0.5.0.0 + - terminfo ==0.4.1.0 + - test-fixture ==0.5.0.1 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - - test-framework-quickcheck2 ==0.3.0.3 + - 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.1 + - texmath ==0.9.4.1 - text ==1.2.2.1 - - text-all ==0.3.0.2 + - text-all ==0.3.1.0 - text-binary ==0.2.1.1 - text-conversions ==0.3.0 - text-format ==0.3.1.1 - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 + - text-latin1 ==0.3 - text-ldap ==0.1.1.8 - text-manipulate ==0.2.0.1 - text-metrics ==0.2.0 - text-postgresql ==0.0.2.2 + - text-printer ==0.5 - text-region ==0.1.0.1 - text-show ==3.4.1.1 - text-show-instances ==3.5 - text-zipper ==0.10 - textlocal ==0.1.0.5 - tf-random ==0.5 - - th-data-compat ==0.0.2.2 + - tfp ==1.0.0.2 + - th-abstraction ==0.2.3.0 + - th-data-compat ==0.0.2.4 - th-desugar ==1.6 - - th-expand-syns ==0.4.2.0 + - th-expand-syns ==0.4.3.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.6 + - 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 - thread-local-storage ==0.1.1 - threads ==0.5.1.4 - - threepenny-gui ==0.7.0.1 + - threepenny-gui ==0.7.0.2 + - threepenny-gui-flexbox ==0.3.0.2 - through-text ==0.1.0.0 - thumbnail-plus ==1.0.5 - thyme ==0.3.5.5 + - tibetan-utils ==0.1.1.2 - tidal ==0.8.2 - time-compat ==0.1.0.3 - time-lens ==0.4.0.1 @@ -1952,13 +2133,14 @@ default-package-overrides: - timemap ==0.0.4 - timerep ==2.0.0.2 - timespan ==0.3.0.0 - - timezone-olson ==0.1.7 + - timezone-olson ==0.1.8 - timezone-series ==0.1.6.1 - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - titlecase ==0.1.0.3 - - tls ==1.3.9 + - 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 @@ -1971,18 +2153,24 @@ default-package-overrides: - tree-fun ==0.8.1.0 - trifecta ==1.6.2.1 - true-name ==0.1.0.2 + - tsv2csv ==0.1.0.2 - ttrie ==0.1.2.1 - - tttool ==1.7.0.1 + - tttool ==1.7.0.3 - tuple ==0.3.0.2 - tuple-th ==0.2.5 - tuples-homogenous-h98 ==0.1.1.0 - - turtle ==1.3.1 + - turtle ==1.3.6 - turtle-options ==0.1.0.4 - twitter-feed ==0.2.0.11 + - twitter-types ==0.7.2.2 + - twitter-types-lens ==0.7.2 - type-aligned ==0.9.6 - type-assertions ==0.1.0.0 + - type-combinators ==0.2.4.3 - type-eq ==0.5 - type-fun ==0.1.1 + - type-hint ==0.1 + - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - type-list ==0.5.0.0 @@ -1994,20 +2182,27 @@ 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 - unbound-generics ==0.3.1 - - unbounded-delays ==0.1.0.9 + - unbounded-delays ==0.1.1.0 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 + - unfoldable ==0.9.4 + - unfoldable-restricted ==0.0.3 + - unicode ==0.0 - unicode-show ==0.1.0.2 - unicode-transforms ==0.2.1 - unification-fd ==0.10.0.1 - union ==0.1.1.1 - union-find ==0.2 - uniplate ==1.6.12 + - uniq-deep ==1.1.0.0 - Unique ==0.4.6.1 + - unique ==0 + - unit-constraint ==0.0.0 - units ==2.4 - units-defs ==2.0.1.1 - units-parser ==0.1.0.0 @@ -2022,8 +2217,9 @@ default-package-overrides: - unix-time ==0.3.7 - Unixutils ==1.54.1 - unlit ==0.4.0.0 - - unordered-containers ==0.2.7.2 - - uri-bytestring ==0.2.3.1 + - unordered-containers ==0.2.8.0 + - unsafe ==0.0 + - uri-bytestring ==0.2.3.3 - uri-encode ==1.5.0.5 - uri-templater ==0.2.1.0 - url ==2.1.3 @@ -2034,7 +2230,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - utility-ht ==0.0.12 + - utility-ht ==0.0.14 - uu-interleaved ==0.2.0.0 - uu-parsinglib ==2.9.1.1 - uuid ==1.3.13 @@ -2042,44 +2238,49 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.8 - validate-input ==0.4.0.0 + - validation ==0.5.4 - varying ==0.7.0.3 - - vault ==0.3.0.6 + - vault ==0.3.0.7 - vcswrapper ==0.1.5 - vector ==0.11.0.0 - vector-algorithms ==0.7.0.1 - - vector-binary-instances ==0.2.3.4 + - 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 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - vectortiles ==1.2.0.2 - - versions ==3.0.0 + - vectortiles ==1.2.0.5 + - verbosity ==0.2.3.0 + - versions ==3.0.2.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 - viewprof ==0.0.0.1 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - - void ==0.7.1 - - vty ==5.15 + - void ==0.7.2 + - vty ==5.15.1 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 + - wai-cli ==0.1.1 - 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.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-consul ==0.1.0.2 - wai-middleware-content-type ==0.5.0.1 - wai-middleware-crowd ==0.1.4.2 - - wai-middleware-metrics ==0.2.3 - - wai-middleware-prometheus ==0.1.0.1 + - wai-middleware-metrics ==0.2.4 + - wai-middleware-prometheus ==0.1.1 + - wai-middleware-rollbar ==0.3.0 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.1.0 - wai-middleware-verbs ==0.3.2 @@ -2092,27 +2293,28 @@ default-package-overrides: - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.11.1 - - warp-tls ==3.2.3 - - wave ==0.1.4 - - wavefront ==0.7.0.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 - web-routes-th ==0.22.6.1 - web-routes-wai ==0.24.3 - - webdriver ==0.8.4 + - webdriver ==0.8.5 - webdriver-angular ==0.1.11 - webkitgtk3 ==0.14.2.1 - webkitgtk3-javascriptcore ==0.14.2.1 - - webpage ==0.0.4 + - webpage ==0.0.5 - webrtc-vad ==0.1.0.3 - websockets ==0.10.0.0 - - websockets-snap ==0.10.2.0 - - weigh ==0.0.3 + - websockets-rpc ==0.0.2 + - websockets-snap ==0.10.2.2 + - weigh ==0.0.4 - wikicfp-scraper ==0.1.0.8 - wild-bind ==0.1.0.3 - wild-bind-indicator ==0.1.0.1 @@ -2124,7 +2326,7 @@ default-package-overrides: - wire-streams ==0.1.1.0 - with-location ==0.1.0 - withdependencies ==0.2.4 - - witherable ==0.1.3.3 + - witherable ==0.1.3.4 - witness ==0.4 - wizards ==1.0.2 - wl-pprint ==1.2 @@ -2139,85 +2341,96 @@ default-package-overrides: - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 + - wreq ==0.5.0.1 - writer-cps-full ==0.1.0.0 - - writer-cps-lens ==0.1.0.0 - - writer-cps-morph ==0.1.0.1 - - writer-cps-mtl ==0.1.1.2 - - writer-cps-transformers ==0.1.1.2 - - wuss ==1.1.3 + - writer-cps-lens ==0.1.0.1 + - writer-cps-morph ==0.1.0.2 + - writer-cps-mtl ==0.1.1.4 + - writer-cps-transformers ==0.1.1.3 + - wuss ==1.1.4 - X11 ==1.8 + - X11-xft ==0.3.1 - x509 ==1.6.5 - x509-store ==1.6.2 - x509-system ==1.6.4 - x509-validation ==1.6.5 - Xauth ==0.1 - - xdcc ==1.1.3 + - xdcc ==1.1.4 - 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 + - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.1.6.3 - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.6 - xmlgen ==0.6.2.1 - - xmlhtml ==0.2.3.5 + - xmlhtml ==0.2.4 - xmonad ==0.13 + - xmonad-contrib ==0.13 - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - - yahoo-finance-api ==0.2.0.1 - - yaml ==0.8.22 - - Yampa ==0.10.5 + - yahoo-finance-api ==0.2.0.2 + - yaml ==0.8.23.3 + - Yampa ==0.10.6 - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 - yesod ==1.4.5 - - yesod-auth ==1.4.17 + - yesod-auth ==1.4.17.2 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - - yesod-auth-hashdb ==1.6.0.1 - - yesod-bin ==1.5.2 - - yesod-core ==1.4.32 + - yesod-auth-hashdb ==1.6.1 + - yesod-bin ==1.5.2.3 + - yesod-core ==1.4.35 - yesod-eventsource ==1.4.1 - yesod-fay ==0.8.0 - - yesod-form ==1.4.11 - - yesod-form-richtext ==0.1.0.0 + - yesod-form ==1.4.12 + - yesod-form-richtext ==0.1.0.1 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 + - yesod-markdown ==0.11.4 - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.2 - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.2 + - yesod-static ==1.5.3 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.5 + - 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 - - zip ==0.1.9 - - zip-archive ==0.3.0.5 - - zippers ==0.2.2 + - zeromq4-haskell ==0.6.7 + - zip ==0.1.11 + - zip-archive ==0.3.1.1 + - zippers ==0.2.3 + - ziptastic-client ==0.3.0.3 + - ziptastic-core ==0.2.0.3 - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -2225,10 +2438,12 @@ default-package-overrides: - ztail ==1.2 extra-packages: - - aeson < 0.8 # newer versions don't work with GHC 6.12.3 - - aeson < 1.1 # required by stack + - 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 - - binary > 0.7 && < 0.8 # binary 0.8.x is the latest, but it's largely unsupported so far + - 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 - Cabal == 1.20.* # required for cabal-install et al on old GHC versions - containers < 0.5 # required to build alex with GHC 6.12.3 @@ -2241,26 +2456,22 @@ extra-packages: - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-library == 1.2.* # required for haddock-api-2.16.x - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 + - 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 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - - servant-auth-server < 0.2.2.0 # https://github.com/plow-technologies/servant-auth/issues/25 - split < 0.2 # newer versions don't work with GHC 6.12.3 + - store < 0.4 # needed by stack 1.4.0 + - store-core < 0.4 # needed by stack 1.4.0 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet - vector < 0.10.10 # newer versions don't work with GHC 6.12.3 - zlib < 0.6 # newer versions break cabal-install - - aeson == 0.11.3.0 # purescript 0.10.7 - - bower-json == 1.0.0.1 # purescript 0.10.7 - - optparse-applicative == 0.13.1.0 # purescript 0.10.7 - - http-client == 0.4.31.2 # purescript 0.10.7 - - http-client-tls == 0.2.4.1 # purescript 0.10.7 - - pipes == 4.2.0 # purescript 0.10.7 - - websockets == 0.9.8.2 # purescript 0.10.7 package-maintainers: peti: @@ -2270,9 +2481,7 @@ package-maintainers: - git-annex - hackage-db - hledger - - hledger-diff - hledger-interest - - hledger-irr - hledger-ui - hledger-web - hopenssl @@ -2281,6 +2490,7 @@ package-maintainers: - hsyslog - jailbreak-cabal - language-nix + - logging-facade-syslog - pandoc - stack - streamproc @@ -2318,15 +2528,34 @@ package-maintainers: dont-distribute-packages: # hard restrictions that really belong into meta.platforms + alsa-mixer: [ x86_64-darwin ] + alsa-pcm: [ x86_64-darwin ] + alsa-seq: [ x86_64-darwin ] AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-directfb: [ x86_64-darwin ] d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ] DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ] dx9base: [ i686-linux, x86_64-linux, x86_64-darwin ] dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin ] dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfsevents: [ i686-linux, x86_64-linux ] + freenect: [ x86_64-darwin ] + FTGL: [ x86_64-darwin ] + gi-ostree: [ x86_64-darwin ] + hcwiid: [ x86_64-darwin ] + hfsevents: [ x86_64-darwin ] + HFuse: [ x86_64-darwin ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] + lio-fs: [ x86_64-darwin ] + midi-alsa: [ x86_64-darwin ] + pam: [ x86_64-darwin ] + PortMidi: [ x86_64-darwin ] + Raincat: [ x86_64-darwin ] reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ] + rtlsdr: [ x86_64-darwin ] + rubberband: [ x86_64-darwin ] + sdl2-mixer: [ x86_64-darwin ] + sdl2-ttf: [ x86_64-darwin ] + tokyotyrant-haskell: [ x86_64-darwin ] Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2337,18 +2566,22 @@ dont-distribute-packages: Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + xattr: [ x86_64-darwin ] XInput: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmobar: [ x86_64-darwin ] # Depens on shine, which is a ghcjs project. shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ] # these packages depend on software with an unfree license + accelerate-bignum: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-llvm-ptx: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-yices: [ i686-linux, x86_64-linux, x86_64-darwin ] ccelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2379,6 +2612,8 @@ dont-distribute-packages: accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2465,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 ] @@ -2475,7 +2711,6 @@ dont-distribute-packages: al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alphachar: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2498,6 +2733,7 @@ dont-distribute-packages: amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-health: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-lightsail: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-opsworks-cm: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-pinpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2597,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 ] @@ -2672,6 +2909,7 @@ dont-distribute-packages: aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] + axiom: [ i686-linux, x86_64-linux, x86_64-darwin ] azubi: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2683,6 +2921,7 @@ dont-distribute-packages: backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ] bag: [ i686-linux, x86_64-linux, x86_64-darwin ] + ballast: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-launcher: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-plugin-highlight: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2707,6 +2946,7 @@ dont-distribute-packages: basic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2718,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 ] @@ -2839,7 +3080,9 @@ 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 ] BlogLiterately-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2883,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 ] @@ -2893,12 +3137,14 @@ 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 ] Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] + butcher: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] byline: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2910,6 +3156,7 @@ dont-distribute-packages: bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2931,6 +3178,7 @@ dont-distribute-packages: cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabalish: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3018,6 +3266,8 @@ dont-distribute-packages: cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] + cef3-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] + cef3-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] cerberus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3135,7 +3385,11 @@ dont-distribute-packages: closure: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloudi: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + clr-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + clr-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] + clr-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] clua: [ i686-linux, x86_64-linux, x86_64-darwin ] cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3149,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 ] @@ -3174,6 +3429,7 @@ dont-distribute-packages: collections: [ i686-linux, x86_64-linux, x86_64-darwin ] colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] + colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3184,6 +3440,7 @@ dont-distribute-packages: combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] comfort-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] + comic: [ i686-linux, x86_64-linux, x86_64-darwin ] commander: [ i686-linux, x86_64-linux, x86_64-darwin ] Commando: [ i686-linux, x86_64-linux, x86_64-darwin ] commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3193,6 +3450,7 @@ dont-distribute-packages: comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] + compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3207,6 +3465,11 @@ dont-distribute-packages: complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-ltr: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ] + composite-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + composite-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] + composite-opaleye: [ i686-linux, x86_64-linux, x86_64-darwin ] composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] compressed: [ i686-linux, x86_64-linux, x86_64-darwin ] compression: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3486,6 +3749,7 @@ dont-distribute-packages: dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] debian-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] decimal-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3534,6 +3798,8 @@ dont-distribute-packages: dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] @@ -3587,10 +3853,12 @@ 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 ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] + disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] distance-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3733,6 +4001,7 @@ dont-distribute-packages: elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] + elsa: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] emailparse: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3753,6 +4022,7 @@ dont-distribute-packages: entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] + enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] enumfun: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3793,11 +4063,17 @@ dont-distribute-packages: Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ] eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ] + ethereum-analyzer-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + ethereum-analyzer-deps: [ i686-linux, x86_64-linux, x86_64-darwin ] + ethereum-analyzer: [ i686-linux, x86_64-linux, x86_64-darwin ] + ethereum-analyzer-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-client-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventful-dynamodb: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventful-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3871,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 ] @@ -3882,12 +4159,14 @@ dont-distribute-packages: feldspar-language: [ i686-linux, x86_64-linux, x86_64-darwin ] fenfire: [ i686-linux, x86_64-linux, x86_64-darwin ] FermatsLastMargin: [ i686-linux, x86_64-linux, x86_64-darwin ] + fernet: [ i686-linux, x86_64-linux, x86_64-darwin ] FerryCore: [ i686-linux, x86_64-linux, x86_64-darwin ] Feval: [ i686-linux, x86_64-linux, x86_64-darwin ] ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] fficxx: [ i686-linux, x86_64-linux, x86_64-darwin ] ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] fibon: [ i686-linux, x86_64-linux, x86_64-darwin ] + ficketed: [ i686-linux, x86_64-linux, x86_64-darwin ] fields: [ i686-linux, x86_64-linux, x86_64-darwin ] FieldTrip: [ i686-linux, x86_64-linux, x86_64-darwin ] fieldwise: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4022,8 +4301,10 @@ dont-distribute-packages: friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] @@ -4054,6 +4335,7 @@ dont-distribute-packages: fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] + g4ip: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4075,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 ] @@ -4085,6 +4368,8 @@ dont-distribute-packages: genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] + genesis: [ i686-linux, x86_64-linux, x86_64-darwin ] + genesis-test: [ i686-linux, x86_64-linux, x86_64-darwin ] genetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geniconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] genifunctors: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4100,6 +4385,7 @@ dont-distribute-packages: genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4146,6 +4432,8 @@ 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 ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4155,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 ] @@ -4204,6 +4494,9 @@ dont-distribute-packages: glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] glapp: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react-widget: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-b-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-task: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4222,8 +4515,11 @@ dont-distribute-packages: GlomeVec: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-raster: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4249,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 ] @@ -4258,7 +4555,10 @@ dont-distribute-packages: gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -4285,6 +4585,7 @@ dont-distribute-packages: GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-GLFW: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] gps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4293,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 ] @@ -4329,6 +4631,7 @@ dont-distribute-packages: greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] gremlin-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] + grenade: [ i686-linux, x86_64-linux, x86_64-darwin ] gridbounds: [ i686-linux, x86_64-linux, x86_64-darwin ] gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] grid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4449,7 +4752,9 @@ dont-distribute-packages: halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] halive: [ i686-linux, x86_64-linux, x86_64-darwin ] + halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] + halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4514,6 +4819,7 @@ dont-distribute-packages: haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ] + HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] hascal: [ i686-linux, x86_64-linux, x86_64-darwin ] hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4572,6 +4878,7 @@ dont-distribute-packages: haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-import-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4696,6 +5003,7 @@ dont-distribute-packages: HCL: [ i686-linux, x86_64-linux, x86_64-darwin ] hcltest: [ i686-linux, x86_64-linux, x86_64-darwin ] hcoap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcoord: [ i686-linux, x86_64-linux, x86_64-darwin ] hcron: [ i686-linux, x86_64-linux, x86_64-darwin ] hCsound: [ i686-linux, x86_64-linux, x86_64-darwin ] hcube: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4724,6 +5032,7 @@ dont-distribute-packages: heaps: [ i686-linux, x86_64-linux, x86_64-darwin ] hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] heckle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ] Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4777,6 +5086,7 @@ dont-distribute-packages: hfann: [ i686-linux, x86_64-linux, x86_64-darwin ] hfd: [ i686-linux, x86_64-linux, x86_64-darwin ] hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ] + HFitUI: [ i686-linux, x86_64-linux, x86_64-darwin ] hfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] hfoil: [ i686-linux, x86_64-linux, x86_64-darwin ] hfov: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4880,10 +5190,12 @@ dont-distribute-packages: HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlibsass: [ i686-linux, x86_64-linux, x86_64-darwin ] HList: [ i686-linux, x86_64-linux, x86_64-darwin ] HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4897,6 +5209,7 @@ dont-distribute-packages: hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4917,6 +5230,7 @@ dont-distribute-packages: hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] + hnormalise: [ i686-linux, x86_64-linux, x86_64-darwin ] hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5006,6 +5320,7 @@ dont-distribute-packages: hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] + hriemann: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5018,6 +5333,7 @@ dont-distribute-packages: hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hS3: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsass: [ i686-linux, x86_64-linux, x86_64-darwin ] hsay: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5093,11 +5409,13 @@ dont-distribute-packages: hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -5111,8 +5429,10 @@ dont-distribute-packages: hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] @@ -5131,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 ] @@ -5152,6 +5474,7 @@ dont-distribute-packages: hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsudoku: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] hsverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5256,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 ] @@ -5329,6 +5653,7 @@ dont-distribute-packages: implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] imports: [ i686-linux, x86_64-linux, x86_64-darwin ] impossible: [ i686-linux, x86_64-linux, x86_64-darwin ] + imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] inch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5376,6 +5701,7 @@ dont-distribute-packages: intro: [ i686-linux, x86_64-linux, x86_64-darwin ] intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5392,6 +5718,7 @@ dont-distribute-packages: ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] + IPv6DB: [ i686-linux, x86_64-linux, x86_64-darwin ] ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5444,6 +5771,7 @@ dont-distribute-packages: jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] + jarify: [ i686-linux, x86_64-linux, x86_64-darwin ] jason: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5503,6 +5831,7 @@ dont-distribute-packages: json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5534,6 +5863,7 @@ dont-distribute-packages: kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] + karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] katip: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5615,7 +5945,6 @@ dont-distribute-packages: lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] Lambdajudge: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5649,6 +5978,8 @@ dont-distribute-packages: language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5687,6 +6018,7 @@ dont-distribute-packages: legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] legion: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5730,6 +6062,7 @@ dont-distribute-packages: librato: [ i686-linux, x86_64-linux, x86_64-darwin ] libroman: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5740,6 +6073,7 @@ dont-distribute-packages: libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] libzfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5751,6 +6085,7 @@ dont-distribute-packages: limp: [ i686-linux, x86_64-linux, x86_64-darwin ] lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ] linda: [ i686-linux, x86_64-linux, x86_64-darwin ] + linden: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5777,10 +6112,8 @@ dont-distribute-packages: lio-eci11: [ i686-linux, x86_64-linux, x86_64-darwin ] lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] lipsum-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquid-fixpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5808,6 +6141,7 @@ dont-distribute-packages: llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5855,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 ] @@ -5872,6 +6207,7 @@ dont-distribute-packages: lui: [ i686-linux, x86_64-linux, x86_64-darwin ] luis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] luka: [ i686-linux, x86_64-linux, x86_64-darwin ] + luminance: [ i686-linux, x86_64-linux, x86_64-darwin ] luminance-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] lushtags: [ i686-linux, x86_64-linux, x86_64-darwin ] luthor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5950,7 +6286,11 @@ dont-distribute-packages: mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] + matplotlib: [ i686-linux, x86_64-linux, x86_64-darwin ] matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] + matterhorn: [ i686-linux, x86_64-linux, x86_64-darwin ] + mattermost-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + mattermost-api-qc: [ i686-linux, x86_64-linux, x86_64-darwin ] maude: [ i686-linux, x86_64-linux, x86_64-darwin ] maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5962,6 +6302,7 @@ dont-distribute-packages: MBot: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] + mcl: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmc-samplers: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmc-synthesis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5978,6 +6319,7 @@ dont-distribute-packages: mech: [ i686-linux, x86_64-linux, x86_64-darwin ] mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mediabus-fdk-aac: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus: [ i686-linux ] mediabus-rtp: [ i686-linux ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6049,6 +6391,7 @@ dont-distribute-packages: mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] mnist-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6076,6 +6419,7 @@ dont-distribute-packages: MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6142,6 +6486,7 @@ dont-distribute-packages: mps: [ i686-linux, x86_64-linux, x86_64-darwin ] mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mqtt: [ i686-linux, x86_64-linux, x86_64-darwin ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6197,6 +6542,7 @@ dont-distribute-packages: mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] + MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6322,6 +6668,7 @@ dont-distribute-packages: nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] + nlopt-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6329,10 +6676,15 @@ dont-distribute-packages: nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] noise: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] nonfree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6358,6 +6710,8 @@ dont-distribute-packages: numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6437,6 +6791,7 @@ dont-distribute-packages: optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] + optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6480,6 +6835,8 @@ dont-distribute-packages: pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] + pang-a-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + panpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] pansite: [ i686-linux, x86_64-linux, x86_64-darwin ] papa: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6550,6 +6907,7 @@ dont-distribute-packages: peparser: [ i686-linux, x86_64-linux, x86_64-darwin ] perceptron: [ i686-linux, x86_64-linux, x86_64-darwin ] perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] + peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ] perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] period: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6582,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 ] @@ -6632,6 +6991,7 @@ dont-distribute-packages: pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] + pixelated-avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ] plailude: [ i686-linux, x86_64-linux, x86_64-darwin ] planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6640,6 +7000,7 @@ dont-distribute-packages: playlists: [ i686-linux, x86_64-linux, x86_64-darwin ] plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] + plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6681,24 +7042,27 @@ dont-distribute-packages: pool: [ i686-linux, x86_64-linux, x86_64-darwin ] popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] + portager: [ i686-linux, x86_64-linux, x86_64-darwin ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] + posix-pty: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6728,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 ] @@ -6776,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 ] @@ -6798,7 +7164,6 @@ dont-distribute-packages: pure-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6882,6 +7247,7 @@ dont-distribute-packages: rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raft: [ i686-linux, x86_64-linux, x86_64-darwin ] rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] + rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6900,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 ] @@ -6956,6 +7323,7 @@ dont-distribute-packages: record: [ i686-linux, x86_64-linux, x86_64-darwin ] record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] + records-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6986,10 +7354,12 @@ dont-distribute-packages: ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] refty: [ i686-linux, x86_64-linux, x86_64-darwin ] + refurb: [ i686-linux, x86_64-linux, x86_64-darwin ] regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7002,6 +7372,7 @@ dont-distribute-packages: regex-tdfa-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-with-pcre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] regions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7020,6 +7391,7 @@ dont-distribute-packages: rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reinterpret-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7083,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 ] @@ -7140,6 +7514,7 @@ dont-distribute-packages: rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rss: [ i686-linux, x86_64-linux, x86_64-darwin ] rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ] + rtnetlink: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] rts-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7170,6 +7545,7 @@ dont-distribute-packages: saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + saltine: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7280,6 +7656,7 @@ dont-distribute-packages: servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7296,19 +7673,22 @@ dont-distribute-packages: servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger-ui: [ 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 ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] + services: [ i686-linux, x86_64-linux, x86_64-darwin ] serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7316,6 +7696,7 @@ dont-distribute-packages: sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] + setoid: [ i686-linux, x86_64-linux, x86_64-darwin ] sets: [ i686-linux, x86_64-linux, x86_64-darwin ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7345,6 +7726,7 @@ dont-distribute-packages: shaker: [ i686-linux, x86_64-linux, x86_64-darwin ] shakers: [ i686-linux, x86_64-linux, x86_64-darwin ] shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] + shakespeare-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-fields: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7360,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 ] @@ -7408,6 +7791,7 @@ dont-distribute-packages: sink: [ i686-linux, x86_64-linux, x86_64-darwin ] siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] + sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7444,6 +7828,7 @@ dont-distribute-packages: smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] + SMTPClient: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] snake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7520,6 +7905,7 @@ dont-distribute-packages: SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7575,6 +7961,7 @@ dont-distribute-packages: sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ] sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + sqlcipher: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7670,6 +8057,7 @@ dont-distribute-packages: structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] + stutter: [ i686-linux, x86_64-linux, x86_64-darwin ] stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] styx: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7735,6 +8123,7 @@ dont-distribute-packages: Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] + system-info: [ i686-linux, x86_64-linux, x86_64-darwin ] system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] system-locale: [ i686-linux, x86_64-linux, x86_64-darwin ] system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7797,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 ] @@ -7808,6 +8198,14 @@ dont-distribute-packages: temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ] tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow-core-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow-opgen: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow-proto: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow-records-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensorflow-records: [ i686-linux, x86_64-linux, x86_64-darwin ] tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] terminal-progress-bar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7853,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 ] @@ -7897,6 +8296,7 @@ dont-distribute-packages: TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ] + tidal-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] TigerHash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7929,11 +8329,14 @@ dont-distribute-packages: TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + titan: [ i686-linux, x86_64-linux, x86_64-darwin ] Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -7945,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 ] @@ -7957,6 +8361,7 @@ dont-distribute-packages: toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ] tpar: [ i686-linux, x86_64-linux, x86_64-darwin ] + tpb: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ] traced: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7976,8 +8381,11 @@ dont-distribute-packages: transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7996,6 +8404,7 @@ dont-distribute-packages: TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] tries: [ i686-linux, x86_64-linux, x86_64-darwin ] trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] + triplesec: [ i686-linux, x86_64-linux, x86_64-darwin ] tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ] tropical: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8052,6 +8461,7 @@ dont-distribute-packages: typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8068,6 +8478,7 @@ dont-distribute-packages: type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + typesafe-precure: [ i686-linux, x86_64-linux, x86_64-darwin ] types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] type-settheory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8255,6 +8666,7 @@ dont-distribute-packages: wai-static-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-throttler: [ i686-linux, x86_64-linux, x86_64-darwin ] + waldo: [ i686-linux, x86_64-linux, x86_64-darwin ] warc: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8294,6 +8706,7 @@ dont-distribute-packages: webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-output: [ i686-linux, x86_64-linux, x86_64-darwin ] web-page: [ i686-linux, x86_64-linux, x86_64-darwin ] web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8303,6 +8716,7 @@ dont-distribute-packages: web-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] + websockets-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] websockets-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] wedged: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8346,6 +8760,7 @@ dont-distribute-packages: wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] workdays: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] + workflow-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-windows: [ i686-linux, x86_64-linux, x86_64-darwin ] wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ] wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8470,12 +8885,14 @@ dont-distribute-packages: yeller: [ i686-linux, x86_64-linux, x86_64-darwin ] yeshql: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-articles: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-hashdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-hmac-keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8529,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 ] @@ -8560,18 +8978,28 @@ 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 ] + zifter-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-git: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-google-java-format: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-hindent: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-hlint: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] zim-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] zip: [ i686-linux ] zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ] zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + ziptastic-client: [ i686-linux, x86_64-linux, x86_64-darwin ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] + zm: [ i686-linux, x86_64-linux, x86_64-darwin ] zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ] zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix new file mode 100644 index 000000000000..cd7857e23de9 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix @@ -0,0 +1,59 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_35; + + # Disable GHC 8.0.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + terminfo = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # 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; }; + + # https://github.com/bmillwood/applicative-quoters/issues/6 + applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; + sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; + }); + + # https://github.com/christian-marie/xxhash/issues/3 + xxhash = doJailbreak super.xxhash; + + # https://github.com/Deewiant/glob/issues/8 + Glob = doJailbreak super.Glob; + + # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 + vector-algorithms = dontCheck super.vector-algorithms; + +} diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 85421ba960e8..7b9dbcdaa792 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -29,6 +29,17 @@ with import ./lib.nix { inherit pkgs; }; +# All of the overrides in this set should look like: +# +# foo = ... something involving super.foo ... +# +# but that means that we add `foo` attribute even if there is no `super.foo`! So if +# you want to use this configuration for a package set that only contains a subset of +# the packages that have overrides defined here, you'll end up with a set that contains +# a bunch of attributes that trigger an evaluation error. +# +# To avoid this, we use `intersectAttrs` here so we never add packages that are not present +# in the parent package set (`super`). self: super: builtins.intersectAttrs super { # Apply NixOS-specific patches. @@ -115,14 +126,11 @@ self: super: builtins.intersectAttrs super { glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; - gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; - gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; + gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; # Need WebkitGTK, not just webkit. - webkit = super.webkit.override { webkit = pkgs.webkitgtk2; }; - webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; - webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; - 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. @@ -190,9 +198,6 @@ self: super: builtins.intersectAttrs super { # Nix-specific workaround xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch; - # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44 - liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; }); - # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. # http://hydra.cryp.to/build/1331287/log/raw wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; }; @@ -216,20 +221,21 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: { - preConfigure = '' - sed -i llvm-general.cabal \ - -e 's,extra-libraries: stdc++,extra-libraries: c++,' - ''; - configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; - librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; - }); - - # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 llvm-general = - if pkgs.stdenv.isDarwin - then self.llvm-general-darwin - else super.llvm-general.override { llvm-config = pkgs.llvm_35; }; + # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 + let base = super.llvm-general.override { llvm-config = pkgs.llvm_35; }; + in if !pkgs.stdenv.isDarwin then base else overrideCabal base ( + drv: { + preConfigure = '' + sed -i llvm-general.cabal \ + -e 's,extra-libraries: stdc++,extra-libraries: c++,' + ''; + configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; + librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; + } + ); + + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_4; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -423,12 +429,8 @@ self: super: builtins.intersectAttrs super { # This propagates this to everything depending on haskell-gi-base haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection; - # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) - gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; - gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; - # Requires gi-javascriptcore API version 4 - gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; }; + gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_12; }; # requires valid, writeable $HOME hatex-guide = overrideCabal super.hatex-guide (drv: { @@ -449,4 +451,20 @@ self: super: builtins.intersectAttrs super { export PATH="$PWD/dist/build/intero:$PATH" ''; }); + + # loc and loc-test depend on each other for testing. Break that infinite cycle: + loc-test = super.loc-test.override { loc = dontCheck self.loc; }; + + # The test suites try to run the "fixpoint" and "liquid" executables built just + # before and fail because the library search paths aren't configured properly. + # Also needs https://github.com/ucsd-progsys/liquidhaskell/issues/1038 resolved. + 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 df17c769ea2d..32fa46f111dd 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -2,115 +2,31 @@ , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) +, initialPackages ? import ./hackage-packages.nix +, configurationCommon ? import ./configuration-common.nix +, configurationNix ? import ./configuration-nix.nix }: let - inherit (stdenv.lib) fix' extends makeOverridable makeExtensible; - inherit (import ./lib.nix { inherit pkgs; }) overrideCabal; + inherit (stdenv.lib) extends makeExtensible; + inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet; - haskellPackages = self: - let + haskellPackages = makePackageSet { + package-set = initialPackages; + inherit ghc extensible-self; + }; - mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { - inherit stdenv; - inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; - jailbreak-cabal = if (self.ghc.cross or null) != null - then self.ghc.bootPkgs.jailbreak-cabal - else self.jailbreak-cabal; - inherit (self) ghc; - hscolour = overrideCabal self.hscolour (drv: { - isLibrary = false; - doHaddock = false; - hyperlinkSource = false; # Avoid depending on hscolour for this build. - postFixup = "rm -rf $out/lib $out/share $out/nix-support"; - }); - cpphs = overrideCabal (self.cpphs.overrideScope (self: super: { - mkDerivation = drv: super.mkDerivation (drv // { - enableSharedExecutables = false; - enableSharedLibraries = false; - doHaddock = false; - useCpphs = false; - }); - })) (drv: { - isLibrary = false; - postFixup = "rm -rf $out/lib $out/share $out/nix-support"; - }); - }; + commonConfiguration = configurationCommon { inherit pkgs; }; + nixConfiguration = configurationNix { inherit pkgs; }; - mkDerivation = makeOverridable mkDerivationImpl; - - callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // { - overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; - }; - - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; - defaultScope = mkScope self; - callPackage = drv: args: callPackageWithScope defaultScope drv args; - - withPackages = packages: callPackage ./with-packages-wrapper.nix { - inherit (self) llvmPackages; - haskellPackages = self; - inherit packages; - }; - - haskellSrc2nix = { name, src, sha256 ? null }: - let - sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; - in pkgs.stdenv.mkDerivation { - name = "cabal2nix-${name}"; - buildInputs = [ pkgs.cabal2nix ]; - phases = ["installPhase"]; - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; - installPhase = '' - export HOME="$TMP" - mkdir -p "$out" - cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix" - ''; - }; - - hackage2nix = name: version: haskellSrc2nix { - name = "${name}-${version}"; - sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")''; - src = "${all-cabal-hashes}/${name}/${version}/${name}.cabal"; - }; - - in - import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // { - - inherit mkDerivation callPackage; - - callHackage = name: version: self.callPackage (hackage2nix name version); - - # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; }); - - ghcWithPackages = selectFrom: withPackages (selectFrom self); - - ghcWithHoogle = selectFrom: - let - packages = selectFrom self; - hoogle = callPackage ./hoogle.nix { - inherit packages; - }; - in withPackages (packages ++ [ hoogle ]); - - ghc = ghc // { - withPackages = self.ghcWithPackages; - withHoogle = self.ghcWithHoogle; - }; - - }; - - commonConfiguration = import ./configuration-common.nix { inherit pkgs; }; - nixConfiguration = import ./configuration-nix.nix { inherit pkgs; }; - -in - - makeExtensible + extensible-self = makeExtensible (extends overrides (extends packageSetConfig (extends compilerConfig (extends commonConfiguration - (extends nixConfiguration haskellPackages))))) + (extends nixConfiguration haskellPackages))))); + +in + + extensible-self diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f580de51a35c..97a3adaf220f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs +, jailbreak-cabal, hscolour, cpphs, nodejs, lib }: let isCross = (ghc.cross or null) != null; in { pname @@ -34,8 +34,7 @@ , license , maintainers ? [] , doCoverage ? false -# TODO Do we care about haddock when cross-compiling? -, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") +, doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] @@ -53,7 +52,7 @@ , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? [] +, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" } @ args: assert editedCabalFile != null -> revision != null; @@ -63,10 +62,12 @@ assert enableSplitObjs == null; let inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast - concatStringsSep enableFeature optionalAttrs toUpper; + concatStringsSep enableFeature optionalAttrs toUpper + filter makeLibraryPath; isGhcjs = ghc.isGhcjs or false; - packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version + isHaLVM = ghc.isHaLVM or false; + packageDbFlag = if isGhcjs || isHaLVM || versionOlder "7.6" ghc.version then "package-db" else "package-conf"; @@ -99,16 +100,15 @@ let "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" "--with-gcc=${ghc.cc}" "--with-ld=${ghc.ld}" - "--hsc2hs-options=--cross-compile" "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" - ]; + ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); crossCabalFlagsString = stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" - "--with-gcc=$CC" # Clang won't work without that extra information. + "--with-gcc=$CC" # Clang won't work without that extra information. "--package-db=$packageConfDir" (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") @@ -125,7 +125,6 @@ let ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" ] ++ optionals isGhcjs [ - "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" "--ghcjs" ] ++ optionals isCross ([ "--configure-option=--host=${ghc.cross.config}" @@ -133,8 +132,10 @@ let setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") - (optionalString (isGhcjs || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") - (optionalString (versionOlder "7.10" ghc.version) "-threaded") # https://github.com/haskell/cabal/issues/2398 + (optionalString isGhcjs "-build-runner") + (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") + # https://github.com/haskell/cabal/issues/2398 + (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") ]; isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env); @@ -143,11 +144,13 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends; + nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; - otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++ - buildTools ++ libraryToolDepends ++ executableToolDepends ++ + otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ + # ghcjs's hsc2hs calls out to the native hsc2hs + optional isGhcjs nativeGhc ++ optionals withBenchmarkDepends (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; @@ -156,7 +159,7 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); - setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand; + setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; @@ -178,8 +181,9 @@ stdenv.mkDerivation ({ inherit src; - nativeBuildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs; - propagatedNativeBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; + inherit nativeBuildInputs; + buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs; + propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. @@ -193,13 +197,11 @@ stdenv.mkDerivation ({ ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + postPatch; - # for ghcjs, we want to put ghcEnv on PATH so compiler plugins will be available. - # TODO(cstrahan): would the same be of benefit to native ghc? setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment echo "Build with ${ghc}." - export PATH="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH" + export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} packageConfDir="$TMPDIR/package.conf.d" @@ -208,11 +210,8 @@ stdenv.mkDerivation ({ setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" - local inputClosure="" - for i in $propagatedNativeBuildInputs $nativeBuildInputs; do - findInputs $i inputClosure propagated-native-build-inputs - done - for p in $inputClosure; do + # nativePkgs defined in stdenv/setup.hs + for p in $nativePkgs; do if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ continue @@ -224,6 +223,22 @@ stdenv.mkDerivation ({ configureFlags+=" --extra-lib-dirs=$p/lib" fi done + '' + (optionalString stdenv.isDarwin '' + # Work around a limit in the Mac OS X Sierra linker on the number of paths + # referenced by any one dynamic library: + # + # Create a local directory with symlinks of the *.dylib (Mac OS X shared + # libraries) from all the dependencies. + local dynamicLinksDir="$out/lib/links" + mkdir -p $dynamicLinksDir + for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do + ln -s $d/*.dylib $dynamicLinksDir + done + # Edit the local package DB to reference the links directory. + for f in $packageConfDir/*.conf; do + sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f + done + '') + '' ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache runHook postSetupCompilerEnvironment @@ -293,6 +308,14 @@ stdenv.mkDerivation ({ local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf ''} + ${optionalString isGhcjs '' + for exeDir in "$out/bin/"*.jsexe; do + exe="''${exeDir%.jsexe}" + printf '%s\n' '#!${nodejs}/bin/node' > "$exe" + cat "$exeDir/all.js" >> "$exe" + chmod +x "$exe" + done + ''} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' for exe in "$out/bin/"* ; do @@ -319,11 +342,15 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}" + export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH:+''${LD_LIBRARY_PATH}:}${ + makeLibraryPath (filter (x: !isNull x) systemBuildInputs) + }" + ${if isHaLVM + then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' + else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''} ${shellHook} ''; }; - }; meta = { inherit homepage license platforms; } diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 1a16cf3683fe..7fbca53886ef 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,11 +1,11 @@ -{ stdenv, ghc, pkgconfig, glibcLocales, cacert }: +{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs: with stdenv.lib; { buildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] -, ghc ? ghc +, ghc ? depArgs.ghc , ... }@args: @@ -37,7 +37,6 @@ stdenv.mkDerivation (args // { configurePhase = args.configurePhase or '' export STACK_ROOT=$NIX_BUILD_TOP/.stack - stack setup ''; buildPhase = args.buildPhase or "stack build"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c50f9a12731a..8c3613419604 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9,7 +9,7 @@ self: { mkDerivation { pname = "3d-graphics-examples"; version = "0.0.0.2"; - sha256 = "fdb14c0601d63fb1fd3d029f5912c19a3a3658bb88c7a7f17e9c46b336c1a509"; + sha256 = "02d5q4vb6ilwgvqsgiw8pdc3cflsq495k7q27pyv2gyn0434rcgx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT OpenGL random ]; @@ -23,7 +23,7 @@ self: { mkDerivation { pname = "3dmodels"; version = "0.3.0"; - sha256 = "19fa758554bc6f59c37bfd390bc3d69b20d17a8dcca7194b0425a5b2c243f702"; + sha256 = "00pp8g1b59950i5ik9ycimxd284vsv1hnfgxgg1mjvxwaj2pbyhr"; libraryHaskellDepends = [ attoparsec base bytestring linear packer ]; @@ -38,7 +38,7 @@ self: { mkDerivation { pname = "4Blocks"; version = "0.2"; - sha256 = "dcbce915d9997ea63a5698e120ea095244461b7772e79b4cdb4c3809c438cad3"; + sha256 = "1lya7320jf2cvd69prvjfwdlci2j17m21qcqaqxaczlrv4aykg6w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55,7 +55,7 @@ self: { mkDerivation { pname = "AAI"; version = "0.2.0.1"; - sha256 = "d0f14c6e9040c1947c63bf82b5e3f68389e7ebf4d12177575285aecb3404b86d"; + sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh"; libraryHaskellDepends = [ base ]; description = "Abstract Application Interface"; license = stdenv.lib.licenses.mit; @@ -69,7 +69,7 @@ self: { mkDerivation { pname = "ABList"; version = "0.0.3"; - sha256 = "016f571499f63744b2696708117dafdd2909f8224a83637d829d2d3a6619121a"; + sha256 = "06hj35k3lbcxh9yn70sa4bw0jafxmxyi2237d6r48dznk4a5fvq1"; libraryHaskellDepends = [ base linear newtype ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -84,7 +84,7 @@ self: { mkDerivation { pname = "AC-Angle"; version = "1.0"; - sha256 = "b545b0086832adc7d9ae15b4c3f3d1522d63a746f204570766828f1a893a4965"; + sha256 = "0ra97a4im3w2cq3mf17j8skn6bajs7rw7d0mmvcwgb9jd04b0idm"; libraryHaskellDepends = [ base ]; description = "Angles in degrees and radians"; license = stdenv.lib.licenses.bsd3; @@ -95,7 +95,7 @@ self: { mkDerivation { pname = "AC-Boolean"; version = "1.1.0"; - sha256 = "4bf08cc6648c8e9e84da14fc3b6294294869a79fdfc1f682bbe249711f4fa145"; + sha256 = "0id19wgp2jg2pf1gdhfzkyknjj19jii3pz0lva29x3lcck38rw2b"; libraryHaskellDepends = [ base ]; description = "Handle Boolean values generatically"; license = stdenv.lib.licenses.bsd3; @@ -106,7 +106,7 @@ self: { mkDerivation { pname = "AC-BuildPlatform"; version = "1.1.0"; - sha256 = "f033919101259e07668df195e1ff20172239a7ae2f93b2b6ff9fb06ad854906e"; + sha256 = "0vlhakc6mc4zzyvb54rgmskkj8hp43zy35giimk0g7i5068r2czh"; libraryHaskellDepends = [ base ]; description = "Detect which OS you're running on"; license = stdenv.lib.licenses.bsd3; @@ -118,7 +118,7 @@ self: { mkDerivation { pname = "AC-Colour"; version = "1.1.6"; - sha256 = "29fc7c00b8817e31d44c9cec82f103b7c1a3c09caeaf89281bce72e86e58630b"; + sha256 = "02v3b1pfhwnf3cl8kbxfkk0a7hdp0gqq5v4w9ka32zl1p007rz19"; libraryHaskellDepends = [ base ]; description = "Efficient RGB colour types"; license = stdenv.lib.licenses.bsd3; @@ -129,7 +129,7 @@ self: { mkDerivation { pname = "AC-EasyRaster-GTK"; version = "1.1.3"; - sha256 = "2b118ef6f9c9caeacee662131affac969430c2c5e48213acf2718901cca15120"; + sha256 = "082il76032biyan170p4qp13154nmkzil4v2wv7fmjn9z7v8w49b"; libraryHaskellDepends = [ array base gtk ]; description = "GTK+ pixel plotting"; license = stdenv.lib.licenses.bsd3; @@ -141,7 +141,7 @@ self: { mkDerivation { pname = "AC-HalfInteger"; version = "1.2.1"; - sha256 = "6bb5eefb6a58a3d09ba19889c2fb48d3df3d6215623c2c4480efd766d4599673"; + sha256 = "0wwnb7a6dmzgh122qg322mi3vpyk93xw52cql6dx18sqdbxyxdbb"; libraryHaskellDepends = [ base ]; description = "Efficient half-integer type"; license = stdenv.lib.licenses.bsd3; @@ -153,7 +153,7 @@ self: { mkDerivation { pname = "AC-MiniTest"; version = "1.1.1"; - sha256 = "fab219b210a6c4e0f99dc157665b4fc9316dba67ceb1ecea93f45a50702a5047"; + sha256 = "0ish59q50npljgmfrcffcyx6scf99xdncmy1kpwy1i5622r1kcps"; libraryHaskellDepends = [ base transformers ]; description = "A simple test framework"; license = stdenv.lib.licenses.bsd3; @@ -165,7 +165,7 @@ self: { mkDerivation { pname = "AC-PPM"; version = "1.1.1"; - sha256 = "783e93443321e5a1a1fcb63ee266bd21b9f2daf0b2bed8e6cfa0746a1dff5c78"; + sha256 = "0y2wzwfnlx50rzkdigmjy3dg5f91pmkf4gmnzjhs3r916d296gkq"; libraryHaskellDepends = [ base bytestring ]; description = "Trivial package for writing PPM images"; license = stdenv.lib.licenses.bsd3; @@ -176,7 +176,7 @@ self: { mkDerivation { pname = "AC-Random"; version = "0.1"; - sha256 = "8159443b99eae8da13227b7a47fb59b84e860cafec072355d38212063ebb00b0"; + sha256 = "1c00pcz0c4l2sdaj61zcmw68ckmqb7xlfykv489xms7ak4xl8nc1"; libraryHaskellDepends = [ base ]; description = "A pure Haskell PRNG"; license = stdenv.lib.licenses.bsd3; @@ -187,7 +187,7 @@ self: { mkDerivation { pname = "AC-Terminal"; version = "1.0"; - sha256 = "83d09dd723aea78934fcf7feb979606e1e8a5053a99fda34142d91781c6e1b34"; + sha256 = "0d0vdqf7i49d2hsdm7x9ad88l7kfc1wvkzppzhs8k9xf4gbrvl43"; libraryHaskellDepends = [ ansi-terminal base ]; description = "Trivial wrapper over ansi-terminal"; license = stdenv.lib.licenses.bsd3; @@ -199,7 +199,7 @@ self: { mkDerivation { pname = "AC-VanillaArray"; version = "1.1.2"; - sha256 = "7b4430ab596a5aae4245df83de7682966d8bb1a0e9b931819f398a57188f9310"; + sha256 = "044kiwc5g2irky0k3fg9l2qqnvcnh9vdx0yz8m1awnkab6mk0i3v"; libraryHaskellDepends = [ base ghc-prim ]; description = "Immutable arrays with plain integer indicies"; license = stdenv.lib.licenses.bsd3; @@ -211,7 +211,7 @@ self: { mkDerivation { pname = "AC-Vector"; version = "2.3.2"; - sha256 = "5e51ff6779a3803ce1009c9dffd13a3022fb3cbddeb49e685d7f43d7a8715011"; + sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay"; libraryHaskellDepends = [ base ]; description = "Efficient geometric vectors and transformations"; license = stdenv.lib.licenses.bsd3; @@ -222,7 +222,7 @@ self: { mkDerivation { pname = "AC-Vector-Fancy"; version = "2.4.0"; - sha256 = "be1862481fbcf93fbfce7a39cb2bccb8237bd7937b33d86bd009b172b4b08a71"; + sha256 = "0wcan2s75c89s1mxhcvvjgbpn8xqrhmwnfbsrszkzydw3x46465y"; libraryHaskellDepends = [ AC-Angle AC-Vector base ]; description = "Fancy type-system stuff for AC-Vector"; license = stdenv.lib.licenses.bsd3; @@ -235,7 +235,7 @@ self: { mkDerivation { pname = "ACME"; version = "0.0.0.1"; - sha256 = "ba59ace4c4e06fcecfb080555366ae8bfbe43dbec0ff28b9d8e0f548118d7580"; + sha256 = "103mil8lixg0v2wjizy0pqyy9ywbmrk56mc0n37wwvz0qkjaqnds"; libraryHaskellDepends = [ base list-extras mtl random random-shuffle void ]; @@ -247,14 +247,14 @@ self: { "ADPfusion" = callPackage ({ mkDerivation, base, bits, containers, DPutils, mmorph, mtl - , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict - , template-haskell, test-framework, test-framework-quickcheck2 - , test-framework-th, th-orphans, transformers, tuple, vector + , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict, tasty + , tasty-quickcheck, tasty-th, template-haskell, th-orphans + , transformers, tuple, vector }: mkDerivation { pname = "ADPfusion"; - version = "0.5.2.0"; - sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d"; + version = "0.5.2.2"; + sha256 = "1r87pbwhghxyk4ivbyivrs8iwrzyvhy5lp0cy4c7kmvh50w0swlh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263,8 +263,8 @@ self: { transformers tuple vector ]; testHaskellDepends = [ - base bits OrderedBits PrimitiveArray QuickCheck strict - test-framework test-framework-quickcheck2 test-framework-th vector + base bits OrderedBits PrimitiveArray QuickCheck strict tasty + tasty-quickcheck tasty-th vector ]; homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; @@ -272,6 +272,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ADPfusionSet" = callPackage + ({ mkDerivation, ADPfusion, base, bits, containers, DPutils, mmorph + , mtl, OrderedBits, primitive, PrimitiveArray, QuickCheck + , smallcheck, strict, tasty, tasty-quickcheck, tasty-smallcheck + , tasty-th, template-haskell, th-orphans, transformers, tuple + , vector + }: + mkDerivation { + pname = "ADPfusionSet"; + version = "0.0.0.1"; + sha256 = "0prhxzvg489z2s77djay7airflfdgvvxx2d262gj7yz6945l6nyb"; + libraryHaskellDepends = [ + ADPfusion base bits containers DPutils mmorph mtl OrderedBits + primitive PrimitiveArray QuickCheck strict template-haskell + th-orphans transformers tuple vector + ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th + ]; + homepage = "https://github.com/choener/ADPfusionSet"; + description = "Dynamic programming for Set data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "AERN-Basics" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , QuickCheck, random, test-framework, test-framework-quickcheck2 @@ -279,7 +304,7 @@ self: { mkDerivation { pname = "AERN-Basics"; version = "2011.1.0.1"; - sha256 = "8a2b3447b71c22fd72c5525d340b2764d28c0327d0b5d421d79fbb4a4e32f5ff"; + sha256 = "1zzm6974mfwzswhx9dfh4w1qrlk44w5k8pajqmrgs8hwnx3k8awa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -300,7 +325,7 @@ self: { mkDerivation { pname = "AERN-Net"; version = "0.2.1.1"; - sha256 = "0f83f21c2cdaec93cd9fd8a6c0bb5b7d5886d6fe23d7129df4b4a1fb0be2fec0"; + sha256 = "1h7yw85zp8dlyjfi5mr3zvb8cn3xbfxw19nqkz6r7v6s5hfg50qg"; libraryHaskellDepends = [ AERN-Real AERN-RnToRm base binary containers html stm time ]; @@ -317,7 +342,7 @@ self: { mkDerivation { pname = "AERN-Real"; version = "2011.1.0.1"; - sha256 = "db5ca1816068ececd6e2ac281d91b1e918da6b6d1276fddf2eb9d4fdd4600ed5"; + sha256 = "1m8fc3agvm5r5vgzsxhjdmmxl679n68isa5cwbbfrv38c20s2p6v"; libraryHaskellDepends = [ AERN-Basics base criterion QuickCheck test-framework test-framework-quickcheck2 @@ -336,7 +361,7 @@ self: { mkDerivation { pname = "AERN-Real-Double"; version = "2011.1.0.2"; - sha256 = "e22d260a3574cedd97b67dad3793726d45ab42650ee1051d6ecdbd15ade08b43"; + sha256 = "0hwbw2nibgfddqfhbq8fcm1anibdfa9kgbbxnsbxvkkl6l52cbg2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -360,7 +385,7 @@ self: { mkDerivation { pname = "AERN-Real-Interval"; version = "2011.1.0.1"; - sha256 = "9b2fa7d8f36876c93e0fc38814df73728bca6f09e40e1fc43c4f93c74436d0d7"; + sha256 = "1myh6r2cg4sg7k21y3p415pwm2vjfggi92631wzcjxk8ygcafbwv"; libraryHaskellDepends = [ AERN-Basics AERN-Real base deepseq QuickCheck test-framework test-framework-quickcheck2 @@ -378,7 +403,7 @@ self: { mkDerivation { pname = "AERN-RnToRm"; version = "0.5.0.1"; - sha256 = "5b3e4a56399ddfaabab4f24f11989b923c8a007d626099dc23798001031ca967"; + sha256 = "0rx93h1h303r4gf9jq32gl08lg4jkfc12kzjnjxampwx75b4lgjv"; libraryHaskellDepends = [ AERN-Real base binary containers directory filepath html QuickCheck time @@ -397,7 +422,7 @@ self: { mkDerivation { pname = "AERN-RnToRm-Plot"; version = "0.2.0.3"; - sha256 = "78e5ad50110d29ce756978236da1e8207a686a5d5c47e39eba500a0c9206f77e"; + sha256 = "0zpp0s90q2jhpagf6iswbmm6hyi0x2hns8vqd5swwa8d258avrbq"; libraryHaskellDepends = [ AERN-Real AERN-RnToRm base binary containers directory filepath glade glib gtk gtkglext mtl OpenGL stm time @@ -415,9 +440,9 @@ self: { mkDerivation { pname = "AES"; version = "0.2.9"; - sha256 = "ec73a3f6a473671104e0b450643e3de3a60706e07b876841480864791b41c48a"; + sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc"; revision = "1"; - editedCabalFile = "9e51c1b1687fe35ccd0f2983e861b5b0441399803ff76b192530984724a68d6f"; + editedCabalFile = "0vwdlqj4g61h4lcnpxrzh2ci6i5hnmhyi0r91z6mrqvzd2qw2lcy"; libraryHaskellDepends = [ base bytestring cereal monads-tf random transformers ]; @@ -430,7 +455,7 @@ self: { mkDerivation { pname = "AFSM"; version = "0.1.3.1"; - sha256 = "e6438e257446122b63c12dbb22ac58a2ff020ae164a2063a1166a544b325c27b"; + sha256 = "0yy24nrl99b624x0d8k4w4505zx2b2n25frdq5ijn4j6fhjqwhz6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/PseudoPower/AFSM"; description = "Arrowized functional state machines"; @@ -442,7 +467,7 @@ self: { mkDerivation { pname = "AGI"; version = "1.3"; - sha256 = "dbead701e7cccf1ee62687587c691488b4f104f4d799846d2cc368d9766310c0"; + sha256 = "1h0hcdvdjs635inq96fpyh2g3d482ilpqn474vk1xkycww0xgsnv"; libraryHaskellDepends = [ base mtl network parsec random syb unix ]; @@ -457,7 +482,7 @@ self: { mkDerivation { pname = "ALUT"; version = "2.4.0.2"; - sha256 = "b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87"; + sha256 = "11sb715z6rkmwf9n7l9q32g81qiv2ld8a9z42dfxiwgmh2ilsdmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base OpenAL StateVar transformers ]; @@ -474,7 +499,7 @@ self: { mkDerivation { pname = "AMI"; version = "0.1"; - sha256 = "7ee628826bd0e62287119f1f1eb04ab2590417879a3b838e114c1536239b8603"; + sha256 = "00w6kcikc5ac26786fwshwbh8ndj9aq1w7wz263j5rnhdf12irky"; libraryHaskellDepends = [ base bytestring containers mtl network pureMD5 stm ]; @@ -489,7 +514,7 @@ self: { mkDerivation { pname = "ANum"; version = "0.1.1.0"; - sha256 = "099375862dda03346ebdd2005109a3d7bf849df8b3a1d637e7cc983f55f88f46"; + sha256 = "0ilgz1akz66cwwvxd8dkz2fq9gyplc4m206jpmp380ys5n37b4q9"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/DanBurton/ANum#readme"; description = "Num instance for Applicatives provided via the ANum newtype"; @@ -503,7 +528,7 @@ self: { mkDerivation { pname = "ASN1"; version = "0.0.1.1"; - sha256 = "b032dd33ca45479386d4fd77c71304a9089b7ea346b3fbaccf08928b667015a1"; + sha256 = "188mf1k8p4h8ryngpcs6ldz9n2590h9wfxzxsj396is5r8rxscmh"; libraryHaskellDepends = [ base containers HUnit mtl NewBinary old-time pretty QuickCheck ]; @@ -517,7 +542,7 @@ self: { mkDerivation { pname = "AVar"; version = "0.0.5.1"; - sha256 = "87810e38b8b5d14887dffce8d8e4ec6b12a3fcf6a5a26d7db884075dbdfcef49"; + sha256 = "0jggzjyms1w4p1ynv8m5yvya64kbxkjdis7wvy3lildmp0w0x0c7"; libraryHaskellDepends = [ base ]; description = "Mutable variables with Exception handling and concurrency support"; license = stdenv.lib.licenses.bsd3; @@ -528,7 +553,7 @@ self: { mkDerivation { pname = "AWin32Console"; version = "1.1"; - sha256 = "01ceae8d21da257245e0065e35f1727ac0484e5f9567506fad2924229f5d8546"; + sha256 = "0il5bngj4919mmpm0rwmbx74ih3sfbqkaph6w12p49fs466sxkh1"; libraryHaskellDepends = [ base regex-compat Win32 ]; description = "A binding to a part of the ANSI escape code for the console"; license = stdenv.lib.licenses.bsd3; @@ -540,7 +565,7 @@ self: { mkDerivation { pname = "AbortT-monadstf"; version = "1.0"; - sha256 = "ced8466aae6a5fe10926a74d8acd352a1f617c9ee1adabe7c232a624f4225bc6"; + sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f"; libraryHaskellDepends = [ AbortT-transformers base monads-tf ]; homepage = "http://github.com/gcross/AbortT-transformers"; description = "Monads-tf instances for the AbortT monad transformer"; @@ -553,7 +578,7 @@ self: { mkDerivation { pname = "AbortT-mtl"; version = "1.0.0.1"; - sha256 = "5175fa41e0e71627a4bedd3e61fe9b871a6730b065ffe6ae1952ba6f0de151f4"; + sha256 = "1x2iw46nzfjj36pfdzv5n0q6f6l7kgz62gnxpsj2f5p7w10zlxai"; libraryHaskellDepends = [ AbortT-transformers base mtl ]; homepage = "http://github.com/gcross/AbortT-mtl"; description = "mtl instances for the AbortT monad transformer"; @@ -568,7 +593,7 @@ self: { mkDerivation { pname = "AbortT-transformers"; version = "1.0.1.2"; - sha256 = "62e9da8630493deb3b63aa5ec4c0151fd75e44b0d530eba0cb7f1f58ffb978ea"; + sha256 = "1skqp7zmh7vzrfhfnc6mn125xmqz2p0c8pmaccxynga9623dmsb2"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -587,7 +612,7 @@ self: { mkDerivation { pname = "ActionKid"; version = "0.1.1.0"; - sha256 = "b87fe93a3db4540747b8d880f592f712516417eb7b9362b7957892fe287b4e37"; + sha256 = "0dsfgclgx4kqjnvn54vvxcbn8l8jyy9gb06qp13hfm5l7lxfjzxq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -610,9 +635,9 @@ self: { mkDerivation { pname = "Adaptive"; version = "0.23"; - sha256 = "0c5d3e880bbcd6245ccefa16d1d2cc15f7e48bd4ab50723f321883b91b6a4758"; + sha256 = "0n27d8dvk0qq68zp4l5bsj5y9xqmrk9d25psrrf29mmw1f43wp8c"; revision = "1"; - editedCabalFile = "36c76cf96db195ede96306358e65aec311211569c236983efb473c3e97b864b5"; + editedCabalFile = "1db4p2bkwg27zcz9hdn2d4aj24f3mrjqwd86cglyv5didpwnrirn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -626,7 +651,7 @@ self: { mkDerivation { pname = "Adaptive-Blaisorblade"; version = "0.23"; - sha256 = "aa6c6fac69364cd16b547cc588e9077f4567415c45c152e04fa6447f5da42b22"; + sha256 = "08iblifpyi569zh55ha5bi0nfibz0zlqiibwaimx2k1nd6n6yv5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -640,7 +665,7 @@ self: { mkDerivation { pname = "Advgame"; version = "0.1.2"; - sha256 = "decf583cef9bf685417c7b3ca0171a414d610ba7e768a8d41ff65f4194fff999"; + sha256 = "16grzya42pzn3zaahs77lw5n2ka138bs0g3vgi0qbxlvxwy5ikyy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 mtl ]; @@ -656,7 +681,7 @@ self: { mkDerivation { pname = "AesonBson"; version = "0.2.2"; - sha256 = "1ae1a774ac0f43a4d945b05a7c4476a2ef92e4ddbf31c044e49c7d269719e6dc"; + sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s"; libraryHaskellDepends = [ aeson attoparsec base bson unordered-containers vector ]; @@ -674,7 +699,7 @@ self: { mkDerivation { pname = "Agata"; version = "0.2.1.1"; - sha256 = "15a6418c5d570d43325431b2ddb8fa1d14788f0a479f38fd1821d9d59ef00f6d"; + sha256 = "0v8gy2gdbn9133yki7s71a7ph50xzawdvciiahr463apbn6439hm"; libraryHaskellDepends = [ base containers mtl QuickCheck tagged template-haskell ]; @@ -695,9 +720,9 @@ self: { mkDerivation { pname = "Agda"; version = "2.5.2"; - sha256 = "d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439"; + sha256 = "0f8ld7sqkfhirhs886kp090iaq70qxsj8ms8farc80vzpz1ww4nq"; revision = "2"; - editedCabalFile = "4db0b12bc07e72fe1b180acad2a0d59ac11d9a1d45698b46cede7b634fb6bfff"; + editedCabalFile = "1zxznr7n6yyyrr38nsa53nd1vhcssnhd5jha30dzwwkyq0mv3c2d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -732,7 +757,7 @@ self: { mkDerivation { pname = "Agda-executable"; version = "2.3.0.1"; - sha256 = "614594c414c828c87abb1913741db66447c09617d57b92e58ffe445ceffed694"; + sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ Agda base ]; @@ -748,7 +773,7 @@ self: { mkDerivation { pname = "AhoCorasick"; version = "0.0.3"; - sha256 = "ea53fdab246fb415d9d40d5ca5e345c55f35c400658458fb85bfbd0cfba8319c"; + sha256 = "171im3xhrgdzhpxmi1350323apy58pisap0dskcibd3g4jmzslza"; libraryHaskellDepends = [ array base hashable mtl unordered-containers ]; @@ -766,7 +791,7 @@ self: { mkDerivation { pname = "AlanDeniseEricLauren"; version = "0.1.0.1"; - sha256 = "52338386938ad8fca09a2c3d1dc5fd34580749f89ea190fbc553d795a8e9b083"; + sha256 = "10xhx6l9bmskqpxr18cyz14hfn1lzp2isg9ckahgrn4ajf386csj"; libraryHaskellDepends = [ base containers MonadRandom mtl random random-shuffle vector ]; @@ -786,7 +811,7 @@ self: { mkDerivation { pname = "AlgorithmW"; version = "0.1.1.0"; - sha256 = "6c28821c06371d73a14a0be1378b2f6a15137ac773705ca1fd005c5838ec732b"; + sha256 = "0avkxhw5hp00znhmqw3kqxx165ba5y5kgq8b9ahp679p0qf84a3c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl pretty ]; @@ -802,8 +827,8 @@ self: { }: mkDerivation { pname = "AlignmentAlgorithms"; - version = "0.0.2.1"; - sha256 = "8d6118e9cd863cde4ac78f726d36105979ed9f463aa56a25ff4a20cfe881c99a"; + version = "0.1.0.0"; + sha256 = "0k6wljkj7ffjbfhclgfbij5wh9p3zjnchrnh3cwbw4s1cf2gsk78"; libraryHaskellDepends = [ ADPfusion base containers fmlist FormalGrammars GrammarProducts PrimitiveArray vector @@ -815,27 +840,26 @@ self: { }) {}; "Allure" = callPackage - ({ mkDerivation, base, containers, enummapset-th, filepath - , LambdaHack, template-haskell, text + ({ mkDerivation, async, base, containers, enummapset-th, filepath + , LambdaHack, random, template-haskell, text, zlib }: mkDerivation { pname = "Allure"; - version = "0.5.0.0"; - sha256 = "a7e3f742f15ea3efb499461fe5373e90b023c4a0d4383a888d1882c98d72b352"; + version = "0.6.0.0"; + sha256 = "1baqvfrg5qsrfzlg6para87vf11srk0dmi062fpzfv1x452wx6ja"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers enummapset-th filepath LambdaHack template-haskell - text + async base containers enummapset-th filepath LambdaHack random + template-haskell text zlib ]; testHaskellDepends = [ - base containers enummapset-th filepath LambdaHack template-haskell - text + base containers enummapset-th filepath LambdaHack random + template-haskell text zlib ]; homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -846,7 +870,7 @@ self: { mkDerivation { pname = "AndroidViewHierarchyImporter"; version = "0.1.0.1"; - sha256 = "ccf7b4d128a88e37b97bfe0dbc75b66200a9f83a0f6e5bbd1b1f791c33ec55cf"; + sha256 = "1ksmxhriqy8z3fymnvhg7bwaj032nrsvq3gygfwkg3m8538v9xyc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -863,7 +887,7 @@ self: { mkDerivation { pname = "Animas"; version = "0.2"; - sha256 = "75cf0cd4d5264b4653c7c8f411b9cd325949c1fe98dcea3f6008e39174e27707"; + sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm"; libraryHaskellDepends = [ base random ]; homepage = "https://github.com/eamsden/Animas"; description = "Updated version of Yampa: a library for programming hybrid systems"; @@ -876,7 +900,7 @@ self: { mkDerivation { pname = "Annotations"; version = "0.2.2"; - sha256 = "31c0d4765aba5d21df0e2b38521828fda860139609c2f6a6947423650f66161c"; + sha256 = "070ncq7na8vljjkgdhh9jq9n1a7x50c54f1b1vgj2pdsb9vd9h1i"; libraryHaskellDepends = [ base mtl multirec parsec ]; testHaskellDepends = [ base mtl multirec parsec ]; description = "Constructing, analyzing and destructing annotated trees"; @@ -889,7 +913,7 @@ self: { mkDerivation { pname = "Ansi2Html"; version = "0.9"; - sha256 = "302b9edfc7f28a6c7426fcb5342a7994787ceceed5ce1038b10cf0d06d0e18b7"; + sha256 = "1dqq1rnx1w0cn4w11knmxvn7qy4lg4m39dgw4rs6r2pjqzgrwarh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl parsec xhtml ]; @@ -905,7 +929,7 @@ self: { mkDerivation { pname = "ApplePush"; version = "0.1"; - sha256 = "7950ea5bd17e5282b86f71e969aa613e1d220aea97b85f8089efb913e4158537"; + sha256 = "0dw52pj17fggi605zf4px852479yc6m6ksbidyw84lkys5dyll3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -922,7 +946,7 @@ self: { mkDerivation { pname = "AppleScript"; version = "0.2.0.1"; - sha256 = "796b0a7deaa5a6ae0f30f98f9451afa5033aea96b41df52b1d4bd7b27d8fbcca"; + sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr"; doHaddock = false; homepage = "https://github.com/reinerp/haskell-AppleScript"; description = "Call AppleScript from Haskell, and then call back into Haskell"; @@ -935,7 +959,7 @@ self: { mkDerivation { pname = "ApproxFun-hs"; version = "0.1.0.0"; - sha256 = "fe621b16f2e3b81c689e43b30173fe70534747c3bfc9e514da6f151991afeae8"; + sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy"; libraryHaskellDepends = [ base vector ]; homepage = "https://github.com/idontgetoutmuch/ApproxFun.hs"; description = "Function approximation"; @@ -948,7 +972,7 @@ self: { mkDerivation { pname = "ArrayRef"; version = "0.1.3.1"; - sha256 = "d887cfa72c15ce17f67b481ab491a30a1bce038cbcd2fb9e9d63293a760262f9"; + sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq"; libraryHaskellDepends = [ base ]; homepage = "http://haskell.org/haskellwiki/Library/ArrayRef"; description = "Unboxed references, dynamic arrays and more"; @@ -961,7 +985,7 @@ self: { mkDerivation { pname = "ArrowVHDL"; version = "1.1"; - sha256 = "0b262766252398758e1a63a8ac7fb535387cd7894f294a9f5a4a0786493567d3"; + sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb"; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/frosch03/arrowVHDL"; description = "A library to generate Netlist code from Arrow descriptions"; @@ -974,9 +998,9 @@ self: { mkDerivation { pname = "AspectAG"; version = "0.3.6.1"; - sha256 = "0ee6c8a3807927c671d934ea55248071acd59f7db4cd01b888b16c34dca6ef06"; + sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf"; revision = "1"; - editedCabalFile = "d5b68030eaf2111998f6d5774a1d26d5afb685fe6b087fe1aed7ef90084a0070"; + editedCabalFile = "0w0098491vypmvhpy23bzs2vdbym4qfllxymysc1j4gjx8q81dnm"; libraryHaskellDepends = [ base containers HList mtl template-haskell ]; @@ -994,7 +1018,7 @@ self: { mkDerivation { pname = "AttoBencode"; version = "0.3.1.0"; - sha256 = "0b26edc3dfafefcea423b8d26d33862060f0f81bd8b74eb1456f56a71589ff67"; + sha256 = "0rzzi4asfmkg8nqlxdyq3gwg0q10hqrnvlmq4fjcxvxgvz1ys9hb"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers ]; @@ -1015,7 +1039,7 @@ self: { mkDerivation { pname = "AttoJson"; version = "0.5.10"; - sha256 = "a28514bc7b2fba26afdcf4a4ea4a843f7de45eb56fb2127e93f7743895c15b55"; + sha256 = "0mavq6akhx7pjdz15ckgnmgf8z9zhi5fm97lvjpjdfiggfy191d2"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-show containers mtl utf8-string @@ -1031,7 +1055,7 @@ self: { mkDerivation { pname = "Attrac"; version = "0.1.3"; - sha256 = "c01caee95e1618bad2c5144c51651ec41fcb27408588429349758ee1e6dbfb6a"; + sha256 = "0spvvgkf33km969l524580kwn7y43rjm2k0lqp9bl60nbvlsw760"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -1048,7 +1072,7 @@ self: { mkDerivation { pname = "Aurochs"; version = "0.1"; - sha256 = "c5e1f8dafbe0f08371cceac0c054e7141cb12736891f4b0c9e6f5e8a4191a158"; + sha256 = "0n51j50qlpkgkq64n7w96qkv270lwxac1h7ariqq7w70zgdgiqf5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers parsec pretty ]; @@ -1064,7 +1088,7 @@ self: { mkDerivation { pname = "AutoForms"; version = "0.4.2"; - sha256 = "ee9bf0cc92bad0ffc602a481ea4c831dd4c4114eab430f7743e3f0248736ad91"; + sha256 = "14dd6s3j9w738dvhyhxb9q8w9m0xhd6fm0d40b3gzl5sjb6g16zf"; libraryHaskellDepends = [ array base haskell98 mtl syb-with-class template-haskell wx wxcore ]; @@ -1079,7 +1103,7 @@ self: { mkDerivation { pname = "AvlTree"; version = "4.2"; - sha256 = "bd1d5cec4b4e1621a4fb857aa660882cea3062a918efed2ad09397034d41862f"; + sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx"; libraryHaskellDepends = [ base COrdering ]; description = "Balanced binary trees using the AVL algorithm"; license = stdenv.lib.licenses.bsd3; @@ -1091,7 +1115,7 @@ self: { mkDerivation { pname = "BASIC"; version = "0.1.5.0"; - sha256 = "8c761f69c904851a4fb008cf9016746d3140203bb4e1ba275fbcc499403df8fa"; + sha256 = "1ypq7m09ki5wbwkvmqdl7ch40cbdfhb91kq8n17im184r5liyxlc"; libraryHaskellDepends = [ base containers llvm random timeit ]; description = "Embedded BASIC"; license = stdenv.lib.licenses.bsd3; @@ -1107,7 +1131,7 @@ self: { mkDerivation { pname = "BCMtools"; version = "0.1.1"; - sha256 = "44fb60ce4916b2d4f766e0b23d6fb4df43bff26a21c40c20a232e40ed19b2399"; + sha256 = "1693kg8hxr1jl8h0ri11dbrbyhyznipkvcp0cvvx9chn97761ys4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1133,7 +1157,7 @@ self: { mkDerivation { pname = "BNFC"; version = "2.8.1"; - sha256 = "2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920"; + sha256 = "082r1arj76563q1grc9ivpzfip8ghdffm87fj4q830s40dffl6rc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -1157,7 +1181,7 @@ self: { mkDerivation { pname = "BNFC-meta"; version = "0.4.0.3"; - sha256 = "c25ba825ae48d0dbfeae9cf088b2bc17ccc6f191b80359572c87b6e7a1a42e83"; + sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2"; libraryHaskellDepends = [ alex-meta array base happy-meta haskell-src-meta syb template-haskell @@ -1172,9 +1196,9 @@ self: { mkDerivation { pname = "Baggins"; version = "1.0"; - sha256 = "6c81288356d6296abd8031be0df21ad16628b76021f990ec9ebc3a8f3fc2fd55"; + sha256 = "0mgxq8zqyfmwkvn91y91c2vjhrni3br0vgiih2ynlafnas1ji0bc"; revision = "1"; - editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098"; + editedCabalFile = "16206xd8lm8fkvpxbm19h403264xyjki07s9lam3pgq985xbqk35"; libraryHaskellDepends = [ base cairo containers mtl ]; homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins"; description = "Tools for self-assembly"; @@ -1189,7 +1213,7 @@ self: { mkDerivation { pname = "Bang"; version = "0.1.1.1"; - sha256 = "aa544019d45ec93139e6253f2d1b812516107f6d7ba7ceeab7f14c3be3b9876f"; + sha256 = "0vw7p7iknk7inzmcx9vvdmzi05i5h4djsgr5wqwk3jayshcl0m5a"; libraryHaskellDepends = [ base bifunctors hmidi mtl stm time transformers ]; @@ -1208,7 +1232,7 @@ self: { mkDerivation { pname = "Barracuda"; version = "1.0.2"; - sha256 = "434a92c5719f64e6096576371cb761b71c03277b6ee0105fc9e5f12dc5330b45"; + sha256 = "0i8b6g2jvwg5r5gi1q3fgckh675pc6viqdvncl4ycr4zf72r4jj3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1234,7 +1258,7 @@ self: { mkDerivation { pname = "Befunge93"; version = "0.1"; - sha256 = "d4509dded6dedd2dc705b75001b7df04ca72c4f1508594b33f89563074b944c3"; + sha256 = "1hs4p5s30ml97yrr91ahy7275jh4vyvh2l5p0p3jvpfysvg9sl6l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base mtl random ]; @@ -1251,7 +1275,7 @@ self: { mkDerivation { pname = "BenchmarkHistory"; version = "0.0.0.2"; - sha256 = "a3ab4de30a90e70c3b8bfe28d956322312c5e14b42f94da1051c71ff0853fa3d"; + sha256 = "0ggsac4gyw8w0nhlvya29ghwa4i369bdja7yicxhrrwh1bilvax3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1268,7 +1292,7 @@ self: { mkDerivation { pname = "BerkeleyDB"; version = "0.8.7"; - sha256 = "c2c4b9b5625a48b5c303127968d3b591b372fab9568d2a689fab00ddb2613860"; + sha256 = "0q1qc6rds05bkxl2m3anp7x75cwinp9nhy8j0g1vaj2scasvki62"; libraryHaskellDepends = [ base bytestring extensible-exceptions ]; librarySystemDepends = [ db ]; homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML"; @@ -1283,7 +1307,7 @@ self: { mkDerivation { pname = "BerkeleyDBXML"; version = "0.7.2"; - sha256 = "1746f7723d1b9d81f5f26d25bf17f941e790c1403656e4f08caa43127189adfa"; + sha256 = "1ymdi5qi4hxaikqf8min830r1rs1z4bvy9bdybsq378v7mrgfihp"; libraryHaskellDepends = [ base BerkeleyDB bytestring ]; librarySystemDepends = [ db dbxml xercesc xqilla ]; homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML"; @@ -1298,7 +1322,7 @@ self: { mkDerivation { pname = "BerlekampAlgorithm"; version = "0.1.0.0"; - sha256 = "d9d799d9a3b8bff9a953b36aa3868323e74b8708a2de29037dd7a196b2bb9293"; + sha256 = "14wjpfr9d8fpgl1jkpm2123lprr3hf3a6smkaflzkgxqlgcrkmyr"; libraryHaskellDepends = [ base besout ]; description = "Factorization of polynomials over finite field"; license = stdenv.lib.licenses.bsd3; @@ -1311,7 +1335,7 @@ self: { mkDerivation { pname = "BiGUL"; version = "1.0.1"; - sha256 = "91727be408a414f83f9cb26ef7d5ee9a46ec6167e61423b82bf508dda2383f59"; + sha256 = "0n9z72ids27m5fw26576cxhyqilsxvazfvmjkhzzh55413j7nwli"; libraryHaskellDepends = [ base containers mtl template-haskell th-extras ]; @@ -1325,7 +1349,7 @@ self: { mkDerivation { pname = "BigPixel"; version = "1.3.0"; - sha256 = "ff65071fc26d1e66e554ec196c3da7eb5cd3fa01c399d6af133f1f23dfeadda5"; + sha256 = "19fxxbgj67rz2fpxd6f307xd6p7blwynq6gcakjnc7kdq8ghfrgz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bmp bytestring gloss ]; @@ -1339,7 +1363,7 @@ self: { mkDerivation { pname = "Binpack"; version = "0.4.1"; - sha256 = "5a75472c100b115272e011dd9c724c2d182de172784033c57d56da430f22a02a"; + sha256 = "0am0487l7njngp2k6h3qfbhjs61d9ir9rp8iw1r5448b20n4fxas"; libraryHaskellDepends = [ base ]; description = "Common bin-packing heuristics"; license = stdenv.lib.licenses.bsd3; @@ -1352,8 +1376,8 @@ self: { }: mkDerivation { pname = "BioHMM"; - version = "1.0.5"; - sha256 = "f32d7c8e0433c38e77c3c06c08fd30bfc6eccaa8a4ccc074638de016ab13793f"; + version = "1.2.0"; + sha256 = "1mrk5w10601gvfghmmrkmxvnr5jcwnlnk05q1bfb8akiyc2d4pbh"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector @@ -1373,7 +1397,7 @@ self: { mkDerivation { pname = "Biobase"; version = "0.3.1.1"; - sha256 = "8cd5fc11c906335cb8ef5a54c9ae4a1b9d3f120f1209b3801f8c47351ca43aff"; + sha256 = "1zrslhf3aiwc3y0b628j1w93z78v9apcjm2sxyw5qcq6r48zrmcc"; libraryHaskellDepends = [ array base bytestring containers deepseq directory either-unwrap file-embed filemanip filepath ghc-prim HsTools mtl parsec @@ -1387,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 = "0ed0c769b4a7b13186519ec825639db89854721dc8d8a177af508b84bf12eedc"; - 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; @@ -1404,7 +1440,7 @@ self: { mkDerivation { pname = "BiobaseDotP"; version = "0.1.0.0"; - sha256 = "fc3c18d67ea993c2ca7eedfe9aa96760dff102e9bfe76e48f0741a4f051bf654"; + sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w"; libraryHaskellDepends = [ base bytestring iteratee ]; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "Vienna / DotBracket / ExtSS parsers"; @@ -1419,7 +1455,7 @@ self: { mkDerivation { pname = "BiobaseFR3D"; version = "0.2.3.0"; - sha256 = "903dd78d6a0f923c0cb044ef055765f43813bdb0997111012593e08756c70af9"; + sha256 = "1y8aqxb8gq4k4l0i2wcrn2yi6f7lcmbhbvs4n063r4hgda6xfgch"; libraryHaskellDepends = [ base BiobaseXNA bytestring containers filemanip iteratee tuple ]; @@ -1436,7 +1472,7 @@ self: { mkDerivation { pname = "BiobaseFasta"; version = "0.0.1.0"; - sha256 = "dc521f4d8a3a0ff7c880d72d61d45221f8ee65409c52a4e4add0d55cc3c8b70c"; + sha256 = "035pr31mrmfhmpja8llw81jyxy11aba62bfph34gf3rsi96iylnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1450,21 +1486,40 @@ self: { }) {}; "BiobaseInfernal" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base, BiobaseXNA - , biocore, bytestring, bytestring-lexing, conduit, containers - , either-unwrap, lens, primitive, PrimitiveArray, repa - , transformers, tuple, vector + ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes + , BiobaseXNA, bytestring, cereal, cereal-text, cereal-vector + , cmdargs, containers, criterion, data-default, deepseq, DPutils + , filepath, hashable, HUnit, lens, parallel, pipes + , pipes-attoparsec, pipes-bytestring, pipes-parse, pipes-safe + , pipes-zlib, primitive, PrimitiveArray, QuickCheck, strict + , string-conversions, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, text, text-binary, transformers, tuple + , unordered-containers, utf8-string, vector, vector-th-unbox, zlib }: mkDerivation { pname = "BiobaseInfernal"; - version = "0.7.1.0"; - sha256 = "5a3417356d462b64c10516fe898923373bb07bc6e1225b479b725c871546eaa5"; + version = "0.8.1.0"; + sha256 = "0y6g4prgd4k342ziblcpl7mj4yaf916r0psk9dzm6p3rq6masr0g"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - attoparsec attoparsec-conduit base BiobaseXNA biocore bytestring - bytestring-lexing conduit containers either-unwrap lens primitive - PrimitiveArray repa transformers tuple vector + aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring + cereal cereal-text cereal-vector containers data-default deepseq + DPutils filepath hashable lens parallel pipes pipes-attoparsec + pipes-bytestring pipes-parse pipes-safe pipes-zlib primitive + PrimitiveArray strict string-conversions text text-binary + transformers tuple unordered-containers utf8-string vector + vector-th-unbox zlib ]; - homepage = "http://www.tbi.univie.ac.at/~choener/"; + executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ + base HUnit lens QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th + ]; + benchmarkHaskellDepends = [ + base criterion lens text transformers + ]; + homepage = "https://github.com/choener/BiobaseInfernal"; description = "Infernal data structures and tools"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -1475,7 +1530,7 @@ self: { mkDerivation { pname = "BiobaseMAF"; version = "0.5.0.0"; - sha256 = "3958f2a5b63e2a4cc236aac4a60ed015f7c52e5e5a267ba37c5c0c61cff29e57"; + sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r"; libraryHaskellDepends = [ base bytestring containers iteratee ]; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "Multiple Alignment Format"; @@ -1485,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 = "ba1cae7e21ab56164d5b5aa800e007f359eb24ab923df0ec31c7c94fc4ecf047"; + 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 @@ -1514,7 +1574,7 @@ self: { mkDerivation { pname = "BiobaseTrainingData"; version = "0.1.2.3"; - sha256 = "5ad85e628d5c01ca815aa7503d774bc4d47e62ab852ec24223b2ef28fc901e63"; + sha256 = "0qqyj3y2ivxj4d1c4bl5mdi7xm649dvksl57ba0wl0awimi5xn2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1536,7 +1596,7 @@ self: { mkDerivation { pname = "BiobaseTurner"; version = "0.3.1.1"; - sha256 = "aeaff956f267d79e8e251fa7e856946bd90ae9ec05e7e0d15f2e22caadb1dec0"; + sha256 = "1h6yn6nwl8ifbz8y1rq5xklhmnbbjibfi9qz4n79xmv7y9bgkbxf"; libraryHaskellDepends = [ base BiobaseXNA bytestring bytestring-lexing conduit containers filepath lens primitive PrimitiveArray repa split vector @@ -1549,19 +1609,19 @@ self: { "BiobaseTypes" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, cereal, cereal-text - , cereal-vector, data-default, deepseq, hashable, intern - , log-domain, primitive, PrimitiveArray, QuickCheck, stringable - , tasty, tasty-quickcheck, tasty-th, text, text-binary, vector + , cereal-vector, data-default, deepseq, hashable, intern, primitive + , PrimitiveArray, QuickCheck, string-conversions, tasty + , tasty-quickcheck, tasty-th, text, text-binary, vector , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.2.0"; - sha256 = "b1086f4228edfad9cddfb7abdbeca079bef5517a3629552069f3dfcd8378e84e"; + version = "0.1.2.1"; + sha256 = "11wcwnhz9n7vs8xmsr3jdwa219797kcbaw5dw2qip9jih41gijwj"; libraryHaskellDepends = [ aeson base bimaps binary cereal cereal-text cereal-vector - data-default deepseq hashable intern log-domain primitive - PrimitiveArray QuickCheck stringable text text-binary vector + data-default deepseq hashable intern primitive PrimitiveArray + QuickCheck string-conversions text text-binary vector vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ @@ -1580,7 +1640,7 @@ self: { mkDerivation { pname = "BiobaseVienna"; version = "0.3.0.0"; - sha256 = "92071881d7c152b848e9f9a49ac50299c64e07d9302ef517479c805c3300612f"; + sha256 = "0bv100rmr04w8wbzabihv43lxilr0b2rm97rx54bhln1sy0ih1wj"; libraryHaskellDepends = [ base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector ]; @@ -1593,22 +1653,26 @@ self: { "BiobaseXNA" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring , cereal, cereal-vector, cmdargs, containers, csv, deepseq - , file-embed, hashable, lens, primitive, PrimitiveArray, split - , text, tuple, vector, vector-binary-instances, vector-th-unbox + , file-embed, hashable, lens, primitive, PrimitiveArray, QuickCheck + , split, tasty, tasty-quickcheck, tasty-th, text, tuple, vector + , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.3.0"; - sha256 = "c5175ce6473b6f46885834acf600b11ca196d62ae0c5de2c598b8f01c07f3e45"; + version = "0.9.3.1"; + sha256 = "0jlcdd0slq7d5wr44h3h6lnfcp310h36cabd4r7l32xhcxns9k6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bimaps binary bytes bytestring cereal cereal-vector containers csv deepseq file-embed hashable lens primitive - PrimitiveArray split text tuple vector vector-binary-instances - vector-th-unbox + PrimitiveArray QuickCheck split text tuple vector + vector-binary-instances vector-th-unbox ]; executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; @@ -1620,7 +1684,7 @@ self: { mkDerivation { pname = "BirdPP"; version = "1.1"; - sha256 = "e2eb56de2800af809517850584487d67b1a0d0bc4c90c7ff61bb9ce765b78b93"; + sha256 = "14wbnxjyg75vc7zwg42cpk8a1cb7gm4881c52yaq1bq053g5dsz2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 ]; @@ -1631,16 +1695,20 @@ self: { "BitStringRandomMonad" = callPackage ({ mkDerivation, base, bitstring, bytestring, mtl, parallel - , primitive, transformers, vector + , primitive, QuickCheck, transformers, vector }: mkDerivation { pname = "BitStringRandomMonad"; - version = "0.1.1.2"; - sha256 = "96a5bb1cb04427a64be71f83d1a09abb950d3023ae80e3811a304748ace16dbf"; + version = "1.0.0.1"; + sha256 = "1snk8ynll0gc82gqgvnkc6zjpnaszrwc6bb1r4a63ca5vsip2r7x"; libraryHaskellDepends = [ base bitstring bytestring mtl parallel primitive transformers vector ]; + testHaskellDepends = [ + base bitstring bytestring mtl parallel primitive QuickCheck + transformers vector + ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -1649,7 +1717,7 @@ self: { mkDerivation { pname = "BitSyntax"; version = "0.3.2.1"; - sha256 = "19e112bd41c6092739d5a71850ded01b2bcd0adb19ffbd8242c62e6febb68031"; + sha256 = "0cc0nvmnybn68a1bvzqrvc5csaqvs3g50657slwjf2f686yi5q8r"; libraryHaskellDepends = [ base bytestring QuickCheck template-haskell ]; @@ -1663,7 +1731,7 @@ self: { mkDerivation { pname = "Bitly"; version = "0.1.0"; - sha256 = "31aba41c4abbbc003b685e3110b518e1202486551d935ceec6805d63cd7bb5de"; + sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari"; libraryHaskellDepends = [ base HTTP json2 ]; homepage = "http://bitbucket.org/jetxee/hs-bitly/"; description = "A library to access bit.ly URL shortener."; @@ -1678,7 +1746,7 @@ self: { mkDerivation { pname = "BlastHTTP"; version = "1.2.1"; - sha256 = "cee85e0fba0530aff57209b3d91a800db52b63c3f7e4a431a04e7a9cbd355bd5"; + sha256 = "1mav6nyrqyjfl0qs9r7pqdijpd8dh0ddkcq9fbssyc05p87mxs6f"; libraryHaskellDepends = [ base biocore biofasta blastxml bytestring conduit HTTP http-conduit hxt mtl network transformers @@ -1695,7 +1763,7 @@ self: { mkDerivation { pname = "Blobs"; version = "0.3"; - sha256 = "f465046e8a5342c3ee6c82f151463c4316ca59833e7ef225051d8dccf170b726"; + sha256 = "09mpf3qwr38x0ljz4ziyhdcwl5j37i353wc2dkpc6hjki9p08rgl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1720,9 +1788,9 @@ self: { mkDerivation { pname = "BlogLiterately"; version = "0.8.4.3"; - sha256 = "56789deadc7e7a3b94b6dbbc0f8857565348ddde049ed8f0d938d4701f761721"; + sha256 = "088pfqgp1m1qv7qdi7h4vvflhlsnay40zg6vnsa3nykyvkm9sy2n"; revision = "1"; - editedCabalFile = "fa4ead9c5b7ffc4b664584723d9cb95fccab0ba835b8ec8ca8303787bbe1d705"; + editedCabalFile = "01fpw6xqfdrhm26frf1mm05spk2zp6f3swl48mk4pz3zbffaskps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1746,7 +1814,7 @@ self: { mkDerivation { pname = "BlogLiterately-diagrams"; version = "0.2.0.5"; - sha256 = "9aa44dcff5bdddc3e3331a359ce517ec5f04258ebf2ab8c52c0971c38cd01948"; + sha256 = "0j0rs26c6w895k2vhamziqjh8pzc2zjrqd8s6giw7pdxyp7lv94s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1759,12 +1827,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Blogdown" = callPackage + ({ mkDerivation, base, Cabal, containers, criterion, MissingH + , network-uri, parsec + }: + mkDerivation { + pname = "Blogdown"; + version = "0.2.2"; + sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal MissingH ]; + libraryHaskellDepends = [ + base containers MissingH network-uri parsec + ]; + executableHaskellDepends = [ + base containers MissingH network-uri parsec + ]; + testHaskellDepends = [ + base containers MissingH network-uri parsec + ]; + benchmarkHaskellDepends = [ + base containers criterion MissingH network-uri parsec + ]; + homepage = "https://blogdown.io"; + description = "A markdown-like markup language designed for blog posts"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "BluePrintCSS" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { pname = "BluePrintCSS"; version = "0.1"; - sha256 = "0cd4687114feba3ab236d08ce27107c44fa5c3da5fb6c1edd8eee9084e7cd267"; + sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c"; libraryHaskellDepends = [ base mtl ]; homepage = "http://git.ierton.ru/?p=BluePrint.git;a=summary"; description = "Html document layout library"; @@ -1776,7 +1873,7 @@ self: { mkDerivation { pname = "Blueprint"; version = "0.1"; - sha256 = "24c56bc4c8a51bd52b7998b89ef46e8384fdb045c0fbdaa4b925b06689af8e99"; + sha256 = "16cfmy4ndc15p6jdmyy08nqgv143dvs9xf4qg4mxa6x5r326pi94"; doHaddock = false; homepage = "http://github.com/gcross/Blueprint"; description = "Preview of a new build system"; @@ -1791,7 +1888,7 @@ self: { mkDerivation { pname = "Bookshelf"; version = "0.6"; - sha256 = "58b10d81bafc9a0b3c865277cec76c6fa31349c44744ba9d202bf37b6f442fa8"; + sha256 = "1a1g8ipppwrb42fvli27qi4i78vgdk3wwxsjhqy0p6pwpa0hvcaq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -1810,7 +1907,7 @@ self: { mkDerivation { pname = "Boolean"; version = "0.2.4"; - sha256 = "67216013b02b8ac5b534a1ef25f409f930eea1a85eae801933a01ad43145eef8"; + sha256 = "1y7f8lqx86m06ccq1bjym2hywc7r17s2bvx16jswb2ibn09n08b7"; libraryHaskellDepends = [ base ]; description = "Generalized booleans and numbers"; license = stdenv.lib.licenses.bsd3; @@ -1821,7 +1918,7 @@ self: { mkDerivation { pname = "BoundedChan"; version = "1.0.3.0"; - sha256 = "531ceaed7f62844c2a63a7cbfdcab332ea5eaa218e9922ca3305580438adc46d"; + sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k"; libraryHaskellDepends = [ array base ]; description = "Implementation of bounded channels"; license = stdenv.lib.licenses.bsd3; @@ -1834,7 +1931,7 @@ self: { mkDerivation { pname = "Bravo"; version = "0.1.0.1"; - sha256 = "368624a29a7ee145b87f23592a9da8d8b4c38c61513a12ae875b9e43b320919a"; + sha256 = "16li42rl77jvhyp14fjic66c7d6qm2fjln93gyw4bqbykai291in"; libraryHaskellDepends = [ base haskell-src-exts haskell-src-meta mtl parsec syb template-haskell @@ -1850,7 +1947,7 @@ self: { mkDerivation { pname = "BufferedSocket"; version = "0.2.1.0"; - sha256 = "bf521304ccbecfd8ba5aefbf76fa7abaebfa646eb9dcff330be5a284fa899c8f"; + sha256 = "13wwi7x898p51crzzp5rdrjgmsxsgbx7dgzgbaxdikxyrh216lmz"; libraryHaskellDepends = [ base bytestring network text ]; description = "A socker wrapper that makes the IO of sockets much cleaner"; license = stdenv.lib.licenses.mit; @@ -1865,7 +1962,7 @@ self: { mkDerivation { pname = "Buster"; version = "0.1.1"; - sha256 = "0d775441fedfd72a36094593d49b83e4bb88759649b4b3d66b9835ac8787ec8b"; + sha256 = "12zchy3sqdcqdgbb7d29jrsqifz4hfdx94s514v2mmyzzr0m8xqd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -1890,7 +1987,7 @@ self: { mkDerivation { pname = "CBOR"; version = "0.1.0.1"; - sha256 = "d8f0d06e3a1dca36759e99ef9b84773ed13c525687a184e15df9a2aacba5080e"; + sha256 = "03h8lp5sm8prbphq98c7ar93rl9yfy29pvwrkrskdjhx79pd1w6q"; libraryHaskellDepends = [ base binary binary-bits bytestring data-binary-ieee754 ]; @@ -1909,7 +2006,7 @@ self: { mkDerivation { pname = "CC-delcont"; version = "0.2.1.0"; - sha256 = "6c6b36b7bc7d98727307dab460805834456e2bced4b50d413ce81f55a0ec6203"; + sha256 = "00v2xjh5a7z87i0hvdflrqmnwi9lb2061d6s0xrp563xpjvkcsvc"; libraryHaskellDepends = [ base mtl ]; homepage = "http://code.haskell.org/~dolio/CC-delcont"; description = "Delimited continuations and dynamically scoped variables"; @@ -1923,7 +2020,7 @@ self: { mkDerivation { pname = "CC-delcont-alt"; version = "0.1.1.1"; - sha256 = "5bbf45fb85158e84ee7b1037299f1dda48941089221b26dfdfa1b3dad92adf68"; + sha256 = "0s6z5bcxmcx1vzgjc6r2i4898j6s3ngjjdqhggp893hmhpxlbgsv"; libraryHaskellDepends = [ base CC-delcont-cxe CC-delcont-exc CC-delcont-ref mtl ]; @@ -1939,7 +2036,7 @@ self: { mkDerivation { pname = "CC-delcont-cxe"; version = "0.1.0.2"; - sha256 = "ac2864ce814662cb4ad0b0a9903046bc30489f70248e9ad5fbcea39313c5cbe8"; + sha256 = "1s6bql9r78yfzgarm3i4f2glhc5w8qq91adhs15cnqj6h7768a5c"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformers for multi-prompt delimited control"; license = stdenv.lib.licenses.bsd3; @@ -1951,7 +2048,7 @@ self: { mkDerivation { pname = "CC-delcont-exc"; version = "0.1.0.0"; - sha256 = "018d87f61ca97fdcb7c70bae819b0b522d045706619c636e98a923fd1742631f"; + sha256 = "07v388bzs8x9k1p677310rbh8baj1fdq3bhbqyvxqzx93kv8g381"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformers for multi-prompt delimited control"; license = stdenv.lib.licenses.bsd3; @@ -1963,7 +2060,7 @@ self: { mkDerivation { pname = "CC-delcont-ref"; version = "0.1.0.0"; - sha256 = "55208f27102fd232284f774288998d8859492c0e7e48e02acb34a316c7c9f23b"; + sha256 = "0fzjr73id8rlrcmf0j3y1qn4jnc8incqhhkp9wl35lig20kqy82m"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformers for multi-prompt delimited control using refercence cells"; license = stdenv.lib.licenses.bsd3; @@ -1975,7 +2072,7 @@ self: { mkDerivation { pname = "CC-delcont-ref-tf"; version = "0.1.0.2"; - sha256 = "303a1e64000a7eaa3a2583fca3814f85440897aa30fd4b2b9421b34e04e25b7d"; + sha256 = "0zavw824xcr1jhmlpz9hmabhhi459y0s7z434lxalzha01j1wfih"; libraryHaskellDepends = [ base ref-tf transformers ]; description = "A monad transformers for multi-prompt delimited control using refercence cells"; license = stdenv.lib.licenses.bsd3; @@ -1989,7 +2086,7 @@ self: { mkDerivation { pname = "CCA"; version = "0.1.5.3"; - sha256 = "5c199d7f28c4bf57947cb987eef6a408c37fcbdccbe6dd1ae1cf85a1e00efb17"; + sha256 = "05zv1vha31fgw4ddvrnbvk5pzhq8lkvfx1xrgja5ggy451zrs6aw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim syb template-haskell ]; @@ -2007,7 +2104,7 @@ self: { mkDerivation { pname = "CHXHtml"; version = "0.2.0"; - sha256 = "38a53d06db3389403d05743b08b7a90af5f4ef7884b46b392062fc6cd9ae225f"; + sha256 = "0pr2mvcnrz3240wnpd44g3pz9x8am6vhhfvl0lyl129kvc33v99q"; libraryHaskellDepends = [ base bytestring hxt-regex-xmlschema utf8-string ]; @@ -2023,7 +2120,7 @@ self: { mkDerivation { pname = "CLASE"; version = "2009.2.11"; - sha256 = "23bab76f5cc64997a2c83cc1e4d0dfe45789e828e685c131aef742dae5594a82"; + sha256 = "10jab7jxlhppmqqw31g653l8jmz4vz8f9h9wr2i9fjf6bipvgfi3"; libraryHaskellDepends = [ base containers filepath mtl parsec template-haskell ]; @@ -2038,7 +2135,7 @@ self: { mkDerivation { pname = "CLI"; version = "0.1.0.0"; - sha256 = "942a45623c5b904d63aeeb2ab13e37a33da67b508af1cea9c7cd76f38f0d47bc"; + sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall"; libraryHaskellDepends = [ base directory split time ]; testHaskellDepends = [ base doctest ]; description = "CLI tools"; @@ -2053,7 +2150,7 @@ self: { mkDerivation { pname = "CMCompare"; version = "0.0.1.5"; - sha256 = "4bc035d82768beb9ff52b5ace7db1b1477ca35b84aea6d9f3bdd23c680f592b1"; + sha256 = "1ccjyn0cc8yx7fgnvsjap0swlxql3gdygb5mabzvkgk84zc3bh2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2073,7 +2170,7 @@ self: { mkDerivation { pname = "CMQ"; version = "0.0.12"; - sha256 = "eb3a500715ed9af078c9693512a928ea22ec3f466bcb43e95c4893d6245b537f"; + sha256 = "0zskbcjdd4s8bkll7jvb8qzyq8pa52li4db9r5wg16pd2l3m0fpb"; libraryHaskellDepends = [ base bytestring cereal containers iproute mtl network PSQueue stm time @@ -2088,7 +2185,7 @@ self: { mkDerivation { pname = "COrdering"; version = "2.3"; - sha256 = "a8b3b0082290e4f98242db57489e57f369d5b3f40efb695cc02a673f39d96ad2"; + sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8"; libraryHaskellDepends = [ base ]; description = "An algebraic data type similar to Prelude Ordering"; license = stdenv.lib.licenses.bsd3; @@ -2100,7 +2197,7 @@ self: { mkDerivation { pname = "CPBrainfuck"; version = "1.1"; - sha256 = "96f3e7d3e58553d09b6776e24b2ca35b714ff46b0e3cf3ef350f65d505a82b10"; + sha256 = "041bm02xar8g6ppz6g0fdgs4ywavlcn4pqkncydx0lw5wp9ygwwn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 ]; @@ -2114,7 +2211,7 @@ self: { mkDerivation { pname = "CPL"; version = "0.0.8"; - sha256 = "20d364f60d8250b8a0f07da0864e02815b1527ced1e52b213c5def85339e9438"; + sha256 = "0f4lkqrqbvsx7hhjprfirqkianw10978d83xy2hbhl421pv69lr0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -2129,7 +2226,7 @@ self: { mkDerivation { pname = "CSPM-CoreLanguage"; version = "0.3.0.3"; - sha256 = "020f9dffa5ddecd1ef37c7da70bd6c78338bf615e745c8bf9fd7d2f2dbfd266f"; + sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2"; libraryHaskellDepends = [ base ]; description = "Definition of a FDR-compatible CSP core-language"; license = stdenv.lib.licenses.bsd3; @@ -2142,7 +2239,7 @@ self: { mkDerivation { pname = "CSPM-FiringRules"; version = "0.4.3.0"; - sha256 = "159c3536753cfeea4d2554091faf40edae8c7a241366e31491a1e00f807baf65"; + sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m"; libraryHaskellDepends = [ base containers CSPM-CoreLanguage mtl parallel-tree-search QuickCheck random tree-monad @@ -2159,7 +2256,7 @@ self: { mkDerivation { pname = "CSPM-Frontend"; version = "0.10.0.0"; - sha256 = "e3a75f5121707e77a97ed82e603ac31d814f0d2ac0bcf9a522c0ec1d5f9aae72"; + sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3"; libraryHaskellDepends = [ array base containers dlist either ghc-prim mtl parsec2 prettyclass syb transformers @@ -2177,7 +2274,7 @@ self: { mkDerivation { pname = "CSPM-Interpreter"; version = "0.7.0.0"; - sha256 = "1683c9736c46dfa92ae21ccb1e70a1ab9f64bcb67d6fa529dbdde24fd6020e6a"; + sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn"; libraryHaskellDepends = [ array base containers CSPM-CoreLanguage CSPM-Frontend mtl prettyclass syb @@ -2194,7 +2291,7 @@ self: { mkDerivation { pname = "CSPM-ToProlog"; version = "0.5.2.0"; - sha256 = "2240f0cc4e32bdab8a80af2b17af65991be9370d6eb2282a533bd5f67afbc263"; + sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12"; libraryHaskellDepends = [ array base containers CSPM-Frontend ghc-prim pretty ]; @@ -2211,7 +2308,7 @@ self: { mkDerivation { pname = "CSPM-cspm"; version = "0.8.0.0"; - sha256 = "89ad60bbc824d2648e618e745dc91ac81a3943df47f1a9791f4f682a1fc20ed2"; + sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2236,7 +2333,7 @@ self: { mkDerivation { pname = "CTRex"; version = "0.6"; - sha256 = "2642d566008e4e804ea7b4278cc596fa4006cd4a44419df1e23ab73dedb75132"; + sha256 = "0cjinznkvdrswbqrsha49b6hch7sjv2qq9xllx780klf01kdahi6"; libraryHaskellDepends = [ base containers hashable mtl unordered-containers ]; @@ -2257,7 +2354,7 @@ self: { mkDerivation { pname = "CV"; version = "0.3.7"; - sha256 = "b94eb54d18624e1413f930ee6d903f5aa240783f94ca342621c7136cac044030"; + sha256 = "0c200jn6q4y744k39jll7xw418js7y86vvihz49i8kk2316vakmr"; libraryHaskellDepends = [ array base binary bindings-DSL carray containers deepseq directory filepath lazysmallcheck mtl mwc-random parallel parallel-io @@ -2288,7 +2385,7 @@ self: { mkDerivation { pname = "Cabal"; version = "1.18.1.7"; - sha256 = "1fc2d4d5110019cee45ffb0777ad8aa33d46673a982cbe58d602d3b17e6e7282"; + sha256 = "10kjdrzb3lq2srcbwb4q79klcgd3ianpf1zvbzjcw68027ax9hhz"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath pretty process time unix @@ -2314,7 +2411,7 @@ self: { mkDerivation { pname = "Cabal"; version = "1.20.0.4"; - sha256 = "fdf6d934ec74e27e4b5071f4d54932b24828017fe6777f8829ac1271a394e4e0"; + sha256 = "1q74jjip24mc5647yxz6gw0jhj5j694xbx3ia15pxqklxhsdkxpx"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath pretty process time unix @@ -2340,7 +2437,9 @@ self: { mkDerivation { pname = "Cabal"; version = "1.24.2.0"; - sha256 = "b7d0eb8e3503fbca460c0a6ca5c88352cecfe1b69e0bbc79827872134ed86340"; + sha256 = "0h33v1716wkqh9wvq2wynvhwzkjjhg4aav0a1i3cmyq36n7fpl5p"; + revision = "1"; + editedCabalFile = "0jw809psa2ms9sy1mnirmbj9h7rs76wbmf24zgjqvhp4wq919z3m"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -2367,7 +2466,7 @@ self: { mkDerivation { pname = "Cabal-ide-backend"; version = "1.23.0.0"; - sha256 = "fc314197d35dbf6011b57050f7ced5a854b9de58367b25b3455f9326f07c491f"; + sha256 = "07s9gkq2d4sz8nrjayrnb3gbjm58sp7gfl3hnl8n1gsxsfbl2cgw"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -2390,7 +2489,7 @@ self: { mkDerivation { pname = "CabalSearch"; version = "0.0.2"; - sha256 = "0b8149a862670b3b004f926cbbd9cf4091e05484c960171caf12fab57c1633a0"; + sha256 = "181k2rybbyhjmwf1fq69hiaf14a0rzcvnv4j9w03n2v7cal4k08b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -2407,7 +2506,7 @@ self: { mkDerivation { pname = "Capabilities"; version = "0.1.0.0"; - sha256 = "0434c5659c3f893942159bde4bd760089e81a3942f799010d04bd5bee0f6a559"; + sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04"; libraryHaskellDepends = [ base compdata directory free unix ]; homepage = "https://github.com/Icelandjack/Capabilities"; description = "Separate and contain effects of IO monad"; @@ -2420,7 +2519,7 @@ self: { mkDerivation { pname = "Cardinality"; version = "0.2"; - sha256 = "b619bc5eee6c495bb047bdf34abfb739caba7710114013778f1a01ba0b017705"; + sha256 = "01bp045vl08sixvi6h0i21vvmjirnyzlmwxx8yq5njbcxrgbq6dn"; libraryHaskellDepends = [ base containers mtl ]; description = "Measure container capacity. Use it to safely change container."; license = "LGPL"; @@ -2431,7 +2530,7 @@ self: { mkDerivation { pname = "CarneadesDSL"; version = "1.3"; - sha256 = "4321620aba2608ee2686297de0c465957ec879967398f58ba9774fedd821311b"; + sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3"; libraryHaskellDepends = [ base containers fgl parsec ]; homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesDSL/"; description = "An implementation and DSL for the Carneades argumentation model"; @@ -2444,7 +2543,7 @@ self: { mkDerivation { pname = "CarneadesIntoDung"; version = "1.0"; - sha256 = "3d0718a11b6cb7b78864d27fb7d408fd67334e3037e6b366cec5aa8fce61b93e"; + sha256 = "0gmrc778zan5rrkb7rip61736rzx13abfzyjcj4bgdvc3fhih1rx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2460,7 +2559,7 @@ self: { mkDerivation { pname = "Cartesian"; version = "0.6.0.0"; - sha256 = "74f6d388bf6cc91f1bde2677fe53b9e429d1cad3f84e9514854828bb40524dbc"; + sha256 = "1g2da90bna28hla9akpqsg5d2ag4p59zwxr6vqdizjbcpy4d7xkl"; libraryHaskellDepends = [ base lens linear template-haskell ]; description = "Coordinate systems"; license = stdenv.lib.licenses.mit; @@ -2472,7 +2571,7 @@ self: { mkDerivation { pname = "Cascade"; version = "0.1.0.0"; - sha256 = "cf42ad930c046204753dc670a6f37da894c254d3bb17d6e29bacab2458f308c6"; + sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng"; libraryHaskellDepends = [ base comonad ghc-prim mtl void ]; homepage = "http://github.com/rampion/Cascade"; description = "Playing with reified categorical composition"; @@ -2485,7 +2584,7 @@ self: { mkDerivation { pname = "Catana"; version = "0.3"; - sha256 = "2ed2e8d18e3a9d58c7c4d74bffc3d1449b18c51b6989d827e0428d1bc0a1a782"; + sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif"; libraryHaskellDepends = [ base mtl ]; description = "A monad for complex manipulation of a stream"; license = stdenv.lib.licenses.bsd3; @@ -2496,8 +2595,8 @@ self: { ({ mkDerivation, base, free, mmorph, mtl, transformers-base }: mkDerivation { pname = "ChannelT"; - version = "0.0.0.2"; - sha256 = "1ca364133211d323a743424a45677e2f61051f704e80223247b8fdc86f8aa7a0"; + version = "0.0.0.4"; + sha256 = "06yr40kpi4jr65r76vlbf68ybh17n4b2k8claj0czgs4igspyhvn"; libraryHaskellDepends = [ base free mmorph mtl transformers-base ]; homepage = "https://github.com/pthariensflame/ChannelT"; description = "Generalized stream processors"; @@ -2511,7 +2610,7 @@ self: { mkDerivation { pname = "Chart"; version = "1.8.2"; - sha256 = "8442c16959e2a46355418b82c0c6fc3174d04b41ea6e2e320c56588a563be28d"; + sha256 = "13g27db8ln2n1hr2wvpa855x0x1izk3c10lb85an7972b5lw2hl4"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -2528,7 +2627,7 @@ self: { mkDerivation { pname = "Chart-cairo"; version = "1.8.2"; - sha256 = "7cd8ba9da4c43ff4d6ba468d65e91b7239a0543038996a9a626818dc1a408fc1"; + sha256 = "1hcg80ddq638cad6m69q61aa0fbj3glnb3a6pbbg8gy4ljfvmn3w"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -2547,7 +2646,7 @@ self: { mkDerivation { pname = "Chart-diagrams"; version = "1.8.2"; - sha256 = "ca181dec04bac1029101dd75951f48710ebc42f5333e06c57943e3245bba9f41"; + sha256 = "0hczp9dj9qs3g72hcgikym1bq3ki90graxfx068h5hds0kn1s66a"; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers data-default-class diagrams-core diagrams-lib diagrams-postscript @@ -2566,7 +2665,7 @@ self: { mkDerivation { pname = "Chart-gtk"; version = "1.8.2"; - sha256 = "20c97819a35e0983af3e27e196c593e1bb1262f7dda86f4a874485e6042274c9"; + sha256 = "1jbl482fd1a4hx56za6xyxi15fz1jg2rdq977spq62aylccpij90"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -2584,7 +2683,7 @@ self: { mkDerivation { pname = "Chart-simple"; version = "1.3.3"; - sha256 = "b9ecf141d1397d5a192dee53e6ad26c80ac0e14cf5a1c330522f324abe0c684e"; + sha256 = "0kk81jz4lciga8qc78gm9khw02n84snyclzf5lcmlz9rs50z3v5r"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo Chart-gtk colour data-default-class gtk mtl old-locale time @@ -2602,7 +2701,7 @@ self: { mkDerivation { pname = "ChasingBottoms"; version = "1.3.1.2"; - sha256 = "796e278b60c4a24eb6772155ea0edff9e20f96d396cfcd6c5a55d10a3bd2b8d6"; + sha256 = "1mmqs8xhmlamb9ncvkwnsfb0zqprvw7flm91fyv4x8n4c25jfvkr"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -2618,7 +2717,7 @@ self: { mkDerivation { pname = "CheatSheet"; version = "2.9"; - sha256 = "433ca1df4f0c49cf5831bee710388935d26dc00a4e69382993faf6dab4d686df"; + sha256 = "1pw6sssdmxpsjclkhsaf1b06vlimi4w11rxy65ccyj8c9zgs2g23"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers directory ]; @@ -2632,7 +2731,7 @@ self: { mkDerivation { pname = "Checked"; version = "0.0.0.2"; - sha256 = "440b4e5ad21da2100d3b2ee7a18639a74cf1fb141698688b32990e08f31023d7"; + sha256 = "1mr323rhh3lr6a5ni60n2kxz2k57763a3rrf7c6i18hxs9d4w2s4"; libraryHaskellDepends = [ base text ]; description = "Inbuilt checking for ultra reliable computing"; license = stdenv.lib.licenses.bsd3; @@ -2644,7 +2743,7 @@ self: { mkDerivation { pname = "Chitra"; version = "0.2.2"; - sha256 = "739046befdda7d196bd915a0845b490e7476b7636ad8ccf88549ec5b7b50c661"; + sha256 = "0qf6a1xmpv29hpwcrn3acfvpcx0f95dq980mv5mijzfsznz4d43k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring mtl network ]; @@ -2661,7 +2760,7 @@ self: { mkDerivation { pname = "ChristmasTree"; version = "0.2.1.1"; - sha256 = "c826a563744d029618bd92736ba2c93c5ffff45c4c84fd8f0893f9a86b4acff6"; + sha256 = "1xng99msiyck127zv12cbksgyprwr6i6nwwjplc9c0jdfiisa9n8"; libraryHaskellDepends = [ base containers fgl template-haskell TTTAS uulib ]; @@ -2676,7 +2775,7 @@ self: { mkDerivation { pname = "CirruParser"; version = "0.0.1"; - sha256 = "e98d997c6a32292c40b26b19615356759e24e5f6cc46583c295ee6af23672c84"; + sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9"; libraryHaskellDepends = [ aeson base text vector ]; homepage = "https://github.com/Cirru/parser.hs"; description = "Cirru Parser in Haskell"; @@ -2688,7 +2787,7 @@ self: { mkDerivation { pname = "ClassLaws"; version = "0.3.1.0"; - sha256 = "f3714acd50d8e99f1e112c84a82166855b1a4fbe0fbc6ffb69fd428286dde788"; + sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk"; libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ]; homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws"; description = "Stating and checking laws for type class methods"; @@ -2701,7 +2800,7 @@ self: { mkDerivation { pname = "ClassyPrelude"; version = "0.1"; - sha256 = "a9c6cb34c57f40ee7448be2f67c42fdb92bbcbc67fcd8ddd80321e3adacf73fb"; + sha256 = "1yvkrzd3l7ijh3fqvkbzqv5vp4nv5z26fbxy91sfwh3zqlscpim9"; libraryHaskellDepends = [ base strict ]; description = "Prelude replacement using classes instead of concrete types where reasonable"; license = stdenv.lib.licenses.bsd3; @@ -2713,7 +2812,7 @@ self: { mkDerivation { pname = "Clean"; version = "0.6"; - sha256 = "ae006102e1a503c23a6663d647d09a272b948529dd66c8ba658b0bc84688294f"; + sha256 = "0kr9i13ch2wbcnxchrnx562r8ar7kb84gmk3cqxc40x5w416205f"; libraryHaskellDepends = [ base containers ]; description = "A light, clean and powerful utility library"; license = stdenv.lib.licenses.bsd3; @@ -2724,8 +2823,8 @@ self: { ({ mkDerivation, base, directory, unix, utf8-string, X11 }: mkDerivation { pname = "Clipboard"; - version = "2.3.1.0"; - sha256 = "ddbb85e3e3fa01edc9c98b0798d0db8cec803a8f85a3c6b56684a604dff053e3"; + version = "2.3.2.0"; + sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz"; libraryHaskellDepends = [ base directory unix utf8-string X11 ]; homepage = "http://haskell.org/haskellwiki/Clipboard"; description = "System clipboard interface"; @@ -2739,7 +2838,7 @@ self: { mkDerivation { pname = "ClustalParser"; version = "1.2.1"; - sha256 = "0034a9fdca3e4bcb70edb961536ee4acb162fec0ab1b2c67108598bfcd75879d"; + sha256 = "17c7fp6vz64521kjq6xbq3z65cdcwip56qdrxmqcnjryrbysjd00"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec text vector ]; @@ -2757,7 +2856,7 @@ self: { mkDerivation { pname = "Coadjute"; version = "0.1.1"; - sha256 = "632570c477dcde7d6ea6a466baeff36ec9d5f212d20e268a708e8d341bd22bb3"; + sha256 = "1crbs8dk93cff252c3nj2brdbjbfygpvlrm4lrp7vpnwfz2709b3"; libraryHaskellDepends = [ array base bytestring bytestring-csv containers directory fgl filepath mtl old-time pretty pureMD5 safe utf8-string @@ -2773,7 +2872,7 @@ self: { mkDerivation { pname = "Codec-Compression-LZF"; version = "0.2"; - sha256 = "56f345f997646634ff047836eb52470cd3bcc9334423395903468b61948a424a"; + sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn"; libraryHaskellDepends = [ base ]; homepage = "http://www.cs.helsinki.fi/u/ekarttun/Codec-Compression-LZF/"; description = "LZF compression bindings"; @@ -2784,8 +2883,8 @@ self: { ({ mkDerivation, array, base, libdevil }: mkDerivation { pname = "Codec-Image-DevIL"; - version = "0.2.3"; - sha256 = "5fe78aa154e4cb5f7dd4ff2b01fcbed8fdf1fdd749da21ce72700197b48563cf"; + version = "0.2.4"; + sha256 = "1kzphhzh0ad2mf76mr67b6pl77yrapyakvrwlkvhcx8gp5afy4zk"; libraryHaskellDepends = [ array base ]; librarySystemDepends = [ libdevil ]; description = "An FFI interface to the DevIL library"; @@ -2803,7 +2902,7 @@ self: { mkDerivation { pname = "Combinatorrent"; version = "0.3.2"; - sha256 = "2aaf1c168aca3f2b1107f4416ecf9783d4f70dca12ce319403ac4cdfb5bfa537"; + sha256 = "0dx5pysxyk5c0fa33khjr86zgm43jz7nwhgl0w8jngyai8b1rbra"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -2823,7 +2922,7 @@ self: { mkDerivation { pname = "Command"; version = "0.0.7"; - sha256 = "6d6c511905ac5a64b8a747b8ca88dd41b714f63b2bc697c167a20636e5e66d10"; + sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d"; libraryHaskellDepends = [ base directory process ]; homepage = "https://github.com/tonymorris/command"; description = "A replacement for System.Exit and System.Process"; @@ -2837,7 +2936,7 @@ self: { mkDerivation { pname = "Commando"; version = "1.0.0.4"; - sha256 = "52732efb2c3ee1c9485674ad9f3fdc98a9c0727ff68feb82b3131999a4ead7f1"; + sha256 = "1wfpxaj9j68knf1fp3zngxrc1acqvhzrzbblar4ckq9y5kxjwwsj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2862,7 +2961,7 @@ self: { mkDerivation { pname = "ComonadSheet"; version = "0.3.0.0"; - sha256 = "ff18bb7e2bfa7b1413f7342ace25f814e2da4c962ef1f72c0ab349587d61fdca"; + sha256 = "1jpxc5ymhjdk18nggw9fjr6dmqhlz0jwwailyw9i8yzs5dzbn67z"; libraryHaskellDepends = [ applicative-numbers base comonad containers distributive IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers @@ -2878,7 +2977,7 @@ self: { mkDerivation { pname = "Compactable"; version = "0.1.0.2"; - sha256 = "402a4d9c2fd28c9d780f094d112858f38600cf73bbdddf9baaac580912cd3f3e"; + sha256 = "0gizrl90jn5cmadxzpdvfg7h11pkb0l12k891xw9v36j5yf4saj0"; libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothing"; license = stdenv.lib.licenses.bsd3; @@ -2889,28 +2988,25 @@ self: { mkDerivation { pname = "Concurrent-Cache"; version = "0.2.2.3"; - sha256 = "08084673a92a6ae2b5be1f3cf115cdef1139ff23b60f7cd6a8df0ce954028a55"; + sha256 = "0mca09afj36zm3b7q3xn4gzkj4ggrlaz2g0zpssy4siam5rlc208"; libraryHaskellDepends = [ base ]; description = "A Cached variable for IO functions"; license = stdenv.lib.licenses.bsd3; }) {}; "ConcurrentUtils" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , crypto-random, cryptohash, list-extras, MonadRandom, monads-tf - , network, parallel, process, reexport-crypto-random, RSA - , securemem, tagged + ({ mkDerivation, array, arrows, base, containers, hashable + , hashtables, list-extras, monad-loops, MonadRandom, monads-tf + , parallel, stm, strict, tagged, ttrie }: mkDerivation { pname = "ConcurrentUtils"; - version = "0.4.4.0"; - sha256 = "bf952d335d069acf90a05cc3e99a390133a222e64b3d6d92a128c15b8b1f70ff"; + version = "0.4.5.0"; + sha256 = "1kf5g4d8q28hs4wfd0fvc7k1bfir40z7rzx3lxflci36inr1d6dc"; libraryHaskellDepends = [ - array base binary bytestring containers crypto-random cryptohash - list-extras MonadRandom monads-tf network parallel process - reexport-crypto-random RSA securemem tagged + array arrows base containers hashable hashtables list-extras + monad-loops MonadRandom monads-tf parallel stm strict tagged ttrie ]; - homepage = "http://alkalisoftware.net"; description = "Concurrent utilities"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -2921,7 +3017,7 @@ self: { mkDerivation { pname = "Concurrential"; version = "0.5.0.1"; - sha256 = "addb2abcf81ad9619d42e2f25e5866f7e998f29527409e40c7954078cc9fd676"; + sha256 = "0xnnkz67hh4mqx09wh17jpr9isgpcrc5xwp28afn3n8sz2y2mnxd"; libraryHaskellDepends = [ async base ]; homepage = "http://github.com/avieth/Concurrential"; description = "Mix concurrent and sequential computation"; @@ -2936,7 +3032,7 @@ self: { mkDerivation { pname = "Condor"; version = "0.3"; - sha256 = "b7c09b9879f9d217ec3ab7777f8ffa9e6987f9b8e31ec0b6ab0006e665a52e6f"; + sha256 = "0vrflmjyc1h0mfvc07p3p3wqfscyza7pyxxp7bn1glprg6c9ph5p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary containers glider-nlp text ]; @@ -2957,7 +3053,7 @@ self: { mkDerivation { pname = "ConfigFile"; version = "1.1.4"; - sha256 = "ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514"; + sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl parsec ]; @@ -2971,7 +3067,7 @@ self: { mkDerivation { pname = "ConfigFileTH"; version = "0.2"; - sha256 = "30c94c801d42ee4dd08e4b535b7f041f4a25cf7198aab69963e00b6af3dc898c"; + sha256 = "1349vkrnl2z0cfcvdalqf77jajhz0izmnlsbiv84vvj23n04rj9h"; libraryHaskellDepends = [ base ConfigFile parsec template-haskell ]; @@ -2985,7 +3081,7 @@ self: { mkDerivation { pname = "Configger"; version = "0.1"; - sha256 = "e245afe5009f1e2cf2d09957a233ed535d0cbc71c4733325e199c0a58a09673a"; + sha256 = "0fk7165abh4rw4jk6wy4f6y0qpakxlrs4mwrs3r2q7lz03jsyig2"; libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ]; description = "Parse config files"; license = stdenv.lib.licenses.mit; @@ -2997,7 +3093,7 @@ self: { mkDerivation { pname = "Configurable"; version = "0.1.0.0"; - sha256 = "4b277ee5ddb5a9d0c6b0a8323d5b802b363a85ebcf04b88394ff58679c83c0c5"; + sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/tel/Configurable"; description = "Declare types as Configurable then specialize them all in one place"; @@ -3010,7 +3106,7 @@ self: { mkDerivation { pname = "ConsStream"; version = "0.1"; - sha256 = "ffcada64d509a57932b31d26c83e979ec8b1382bd5952819f19508cc85cc90fb"; + sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz"; libraryHaskellDepends = [ base Stream ]; homepage = "github"; description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash"; @@ -3022,7 +3118,7 @@ self: { mkDerivation { pname = "Conscript"; version = "0.1.0.0"; - sha256 = "56204f9cc54702517641d826a20bdea79e89903a98d70908b1e9ba6d251f3f42"; + sha256 = "0hiz3wjnvfp9n440kmwq7a88k7m7vq5s49nq85v520j7qnf4y82n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -3037,7 +3133,7 @@ self: { mkDerivation { pname = "ConstraintKinds"; version = "1.3.0"; - sha256 = "eab751ffb0274e79830003bf1ce453e29c493c7e9a5d64a5cf0d963d302f1e66"; + sha256 = "0rhy5wq3v5hdryjn8pcsgqy4k772agj1rgq3021pjki7n3zm3dza"; libraryHaskellDepends = [ base dlist ghc-prim vector ]; description = "Repackages standard type classes with the ConstraintKinds extension"; license = stdenv.lib.licenses.bsd3; @@ -3049,7 +3145,7 @@ self: { mkDerivation { pname = "Consumer"; version = "1.2"; - sha256 = "d1c42e4ae255c574cde528720b7ca66de682f437abb703013a3011b8cba80a0e"; + sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i"; libraryHaskellDepends = [ base mtl ]; homepage = "http://src.seereason.com/ghc6103/haskell-consumer"; description = "A monad and monad transformer for consuming streams"; @@ -3062,7 +3158,7 @@ self: { mkDerivation { pname = "ContArrow"; version = "0.0.5"; - sha256 = "2b481952047a77ce6a30a6154b5fb74e2c4714f38be910562fd1a0293a4752dd"; + sha256 = "1paj8wx2k86i5xb11scbyca4fb2fnxgln5d661mcwxvs0i91jj1b"; libraryHaskellDepends = [ arrows base ]; description = "Control.Arrow.Transformer.Cont"; license = stdenv.lib.licenses.bsd3; @@ -3076,7 +3172,7 @@ self: { mkDerivation { pname = "ContextAlgebra"; version = "1.0.0.0"; - sha256 = "272e9209c1b5f627912378b260ffd9191eb32f73932ab3eb329cc0b77e7e22f6"; + sha256 = "1xi2grzbgh4w6bmv6alkfcpv67hrv7zn1ckq4f8jgxmmq44r4bi7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -3093,7 +3189,7 @@ self: { mkDerivation { pname = "Contract"; version = "0.1"; - sha256 = "10ae2cbd387c044102b9f60b832230367ab85bced6b6186b3364ba2c47d9ed08"; + sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://www.cs.kent.ac.uk/~oc/contracts.html"; description = "Practical typed lazy contracts"; @@ -3106,7 +3202,7 @@ self: { mkDerivation { pname = "Control-Engine"; version = "1.1.0.1"; - sha256 = "ca1989c170bc3417d987d4d2aba66b4bd8645fac2e3fa9e860112999bb20d2cb"; + sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa"; libraryHaskellDepends = [ base BoundedChan stm ]; homepage = "http://www.haskell.org/haskellwiki/Control-Engine"; description = "A parallel producer/consumer engine (thread pool)"; @@ -3121,7 +3217,7 @@ self: { mkDerivation { pname = "Control-Monad-MultiPass"; version = "0.1.0.0"; - sha256 = "1178b77d04539e9b94c5bfdfef4944e6068f97788afee7003085b7b483f5aa5d"; + sha256 = "0pdayn1v9dw5600fgzlag2bqy1p68i4yzpxzqna9p7jk0iyvfy0i"; libraryHaskellDepends = [ array base containers Control-Monad-ST2 mtl ]; @@ -3142,7 +3238,7 @@ self: { mkDerivation { pname = "Control-Monad-ST2"; version = "0.1.0.1"; - sha256 = "f3032f84e4b88622495a0d4889cc22b2e8c5684dd632b54b7f62d2035723d40a"; + sha256 = "02nl4dbh7lk2gx5vacnn9mlcbs5j4b68jj0db94j51mqwj22y0zk"; libraryHaskellDepends = [ array base QuickCheck SafeSemaphore ]; testHaskellDepends = [ array base mtl QuickCheck SafeSemaphore test-framework @@ -3159,7 +3255,7 @@ self: { mkDerivation { pname = "CoreDump"; version = "0.1.2.0"; - sha256 = "240a9a03ba1643cd48a3eaab22825d0ab88931c9da0022d165fab30e23e4e0e4"; + sha256 = "1r70whihxczscp8j406sr4qqkf0abn125azald4cshqnp81rl2i4"; libraryHaskellDepends = [ base ghc pretty pretty-show ]; description = "A GHC plugin for printing GHC's internal Core data structures"; license = stdenv.lib.licenses.bsd3; @@ -3171,7 +3267,7 @@ self: { mkDerivation { pname = "CoreErlang"; version = "0.0.3"; - sha256 = "cc0eb5184c11d7bda4352a80ceadbe1761d94b85cef692535d43397bb9082084"; + sha256 = "111012wpnfa3bm9r5xnfhm5xjq8ppsnwx01a6njbvmqi9hcba3nc"; libraryHaskellDepends = [ base parsec pretty ]; homepage = "http://github.com/amtal/CoreErlang"; description = "Manipulating Core Erlang source code"; @@ -3187,7 +3283,7 @@ self: { mkDerivation { pname = "CoreFoundation"; version = "0.1"; - sha256 = "b400230767509f876673a6c0abd808d1d068d430b1149a028bee01cab5122a57"; + sha256 = "0mra2aswl0gfic19l55i63a6il6i13caph56fdk8g7shcw3j605l"; libraryHaskellDepends = [ base bytestring containers deepseq filepath network property-list tagged text time transformers vector @@ -3204,7 +3300,7 @@ self: { mkDerivation { pname = "Coroutine"; version = "0.1.0.0"; - sha256 = "dc869b986666a907b65d33ba9ed5a551fcf1d11ee710e21c73d5b41d8f4c4db1"; + sha256 = "1cad9j7ivd6mfcff44773v8z3z2ilparxfikbnv0gab6csc9p1nw"; libraryHaskellDepends = [ base ]; description = "Type-safe coroutines using lightweight session types"; license = stdenv.lib.licenses.bsd3; @@ -3218,7 +3314,7 @@ self: { mkDerivation { pname = "CouchDB"; version = "1.2.2"; - sha256 = "e8078c9a378eb2ba85c245c766facfb55a86b71042f4bf8656a464eb33bfbf46"; + sha256 = "0imzpwrynr54as3bzx2222vqcnmmrzx6dis5qa2vmclf6yd8q1z8"; libraryHaskellDepends = [ base bytestring containers HTTP json mtl network network-uri utf8-string @@ -3238,7 +3334,7 @@ self: { mkDerivation { pname = "Craft3e"; version = "0.1.1.0"; - sha256 = "7315402aceb5ce2fff070add7aac3503ea02adb76dade5b1f472744d439601e5"; + sha256 = "1r81jr1lsx3jyjqybbbdnynh5sh36nn7mp8a0zzjzkmmrqm405bk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3256,7 +3352,7 @@ self: { mkDerivation { pname = "Crypto"; version = "4.2.5.1"; - sha256 = "6ad5e0533d0aaaf2f30049d166881a845cc190780798661815da9b4914a0af66"; + sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3279,7 +3375,7 @@ self: { mkDerivation { pname = "CurryDB"; version = "0.1.1.0"; - sha256 = "830e1c84b7bed4d09f7a896c0a7870f3d54ae41d7839b8dac2fc0cc7ebea4fd6"; + sha256 = "1mjgxbmwf37wqbdbhfbq3pj4mmgkf1w0lv49gagx1m5yny21q3l3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3311,7 +3407,7 @@ self: { mkDerivation { pname = "DAG-Tournament"; version = "0.1"; - sha256 = "933a2b5a1639fcc18061d18ccc36adef4f4b8db1ff68a63adb92c66ff230d9fb"; + sha256 = "1yyr63r6ziljvcxacs7zn66lnkzgmlvcr36ic60c3z1r2rd2nflk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -3332,7 +3428,7 @@ self: { mkDerivation { pname = "DAV"; version = "1.3.1"; - sha256 = "5c80faa58f8bbfb4bbdf7f3db6f23a3a4d26a199831ceb27dd5f69fef21bc009"; + sha256 = "02f03grgwsazvlkyn743k6hjck9s7brbcgbzvyxv9gwbiyjzm02w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3357,7 +3453,7 @@ self: { mkDerivation { pname = "DBlimited"; version = "0.1.1"; - sha256 = "4ed0dd1aecf80c7efcf63b7c8b2ab174820162177e8a99d36bd1041c68152cd2"; + sha256 = "1lic2ml1q16idg9rk2ky2xi030kln4m8nz1vyvy7w37qxhddvl2f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers parsec ]; @@ -3372,7 +3468,7 @@ self: { mkDerivation { pname = "DBus"; version = "0.5.1"; - sha256 = "909a25492523179b1e08eeebb39bb21bc6e98868369f5af6941a7140bc174150"; + sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/alexkay/hdbus"; description = "D-Bus bindings"; @@ -3385,7 +3481,7 @@ self: { mkDerivation { pname = "DCFL"; version = "0.1.6.0"; - sha256 = "5d9ab448a88229f9534efd7f87c9d61c8595b511e4efbcf7ae390d0ffc60c081"; + sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx"; libraryHaskellDepends = [ base deepseq HUnit parallel random ]; homepage = "https://github.com/Poincare/DCFL"; description = "Communication Free Learning-based constraint solver"; @@ -3397,7 +3493,7 @@ self: { mkDerivation { pname = "DMuCheck"; version = "0.3.0.2"; - sha256 = "4d0d343eedc2660f2e1f722acccca80e5fdbf993a5049d372d48350b819fb001"; + sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base MuCheck ]; @@ -3412,7 +3508,7 @@ self: { mkDerivation { pname = "DOM"; version = "2.0.1"; - sha256 = "4bf0d678279b7e0012aea7d9bf9766a219de7f1c488ee85e01ba78749e24f28f"; + sha256 = "13zj4jg78y5s05gfi3j83izxw6d2csbvznd7mq900zlv4xwddw2b"; libraryHaskellDepends = [ base mtl WebBits ]; description = "DOM Level 2 bindings for the WebBits package"; license = stdenv.lib.licenses.bsd3; @@ -3426,7 +3522,7 @@ self: { mkDerivation { pname = "DP"; version = "0.1.1"; - sha256 = "1f41cdf3fb0751b84f1ca76ea335342aa7b62c8f13bc018202ae0a65ffe4f20d"; + sha256 = "03gjwkzna2mf0a103g0kiwnbd9ra6hss6vm73i7vhl87zgrwsh8z"; libraryHaskellDepends = [ array base containers list-tries mtl QuickCheck safe semiring ]; @@ -3445,7 +3541,7 @@ self: { mkDerivation { pname = "DPM"; version = "0.3.0.0"; - sha256 = "4cce2e06d4a04458f491ab09f57185e49d10caee0c1cc43486cad98893162e0f"; + sha256 = "03rf2s9qinfahqsc870cxv5117g4hmqza2dbj7s5hi50sh32xkjc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3469,7 +3565,7 @@ self: { mkDerivation { pname = "DPutils"; version = "0.0.1.0"; - sha256 = "2640e8e994275b3227578d33551f60528da345ad336c287b10136113f0de11a8"; + sha256 = "1a0ivvq16q8k21xjhv1kmm2s73ajc0gmacwdawkk4nr7jklyhh16"; libraryHaskellDepends = [ base bytestring containers kan-extensions parallel pipes QuickCheck stringsearch transformers vector @@ -3494,7 +3590,7 @@ self: { mkDerivation { pname = "DRBG"; version = "0.5.5"; - sha256 = "21df3202486cc83c7cc3f867cb139eac9a3f69bd91b5f6b016ae026e03c33bfd"; + sha256 = "1z9vqc1nw0mf2sqgddcipmlkz6mckq9wnrzqqdy3rj3c90135pr1"; libraryHaskellDepends = [ base bytestring cereal cipher-aes128 crypto-api cryptohash-cryptoapi entropy mtl parallel prettyclass tagged @@ -3517,7 +3613,7 @@ self: { mkDerivation { pname = "DSA"; version = "1.0.2"; - sha256 = "9c4f9de5fe61be4c25e4696b3ddbf1b38d7f064c4600d24e6021d342194deb1d"; + sha256 = "07gb9lcl5lr1c17d40269h37z3dky7dkssv9whjlrgk1zvjrskww"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types ghc-prim integer-gmp SHA tagged @@ -3542,7 +3638,7 @@ self: { mkDerivation { pname = "DSH"; version = "0.12.0.1"; - sha256 = "de4df78a674097f58a5292f688ff97e77bf86ae0f496289d799cac2c31bcc9d4"; + sha256 = "1m69phqjrb4wg6fji5plw1mghyz7jzzqixljaa5gb5s0cy5gfkfy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3567,7 +3663,7 @@ self: { mkDerivation { pname = "DSTM"; version = "0.1.2"; - sha256 = "cb4538387f916a12fc7d4edea1efbe98e8a3445aa2caadc458f37abe30d39e20"; + sha256 = "084yscqbwypkb32avjm2b92a7s4qpvps3pjfgpy14sligww3hifb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3586,7 +3682,7 @@ self: { mkDerivation { pname = "DTC"; version = "1.1.0.1"; - sha256 = "b4e8065dcc3ab7fe687c991c0b83da77808eec40993ad4bb4b5448c0ff496654"; + sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l"; libraryHaskellDepends = [ base haskell-src-exts ]; homepage = "https://github.com/Daniel-Diaz/DTC"; description = "Data To Class transformation"; @@ -3599,7 +3695,7 @@ self: { mkDerivation { pname = "Dangerous"; version = "0.3.2"; - sha256 = "7a1774170ef174c5d16ab84cf88db2d44937ac29d0cc4e7bbabde8a336e4de5e"; + sha256 = "0pnywhva7s5xp9xlxk6h56n3fjflna6zhk5qdb8wax7i1qbp85vs"; libraryHaskellDepends = [ base MaybeT mtl ]; description = "Monads for operations that can exit early and produce warnings"; license = stdenv.lib.licenses.mit; @@ -3614,7 +3710,7 @@ self: { mkDerivation { pname = "Dao"; version = "0.1.0.2"; - sha256 = "d5eb3a32373e80c2703f4c640cb0951e54b7d686f935adff9340724f37defab8"; + sha256 = "1f7svqvlywj0jgzssdgrhvbbfm0yjnq0qr2c7xqc501y6wr3msym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3642,13 +3738,25 @@ self: { mkDerivation { pname = "DarcsHelpers"; version = "0.1"; - sha256 = "c30ae43ca3a711f13a1d8a40d3d00647d71e591efd761e5280b48fd6e155d80a"; + sha256 = "02nqaphxd3xlh191wxpx3rcixms70v8d6h4a3lxg24d7lcyf82n3"; libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ]; description = "Code used by Patch-Shack that seemed sensible to open for reusability"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Data-Angle" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Data-Angle"; + version = "0.9"; + sha256 = "0lk0w64hyqkg99r9ccn5k1nh6rmd99z8d925px4cl09nin7hnm71"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/deadmanswitch/Data.Angle"; + description = "Geometric angles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Data-Hash-Consistent" = callPackage ({ mkDerivation, base, bytestring, digest, utf8-string, vector , vector-algorithms @@ -3656,7 +3764,7 @@ self: { mkDerivation { pname = "Data-Hash-Consistent"; version = "0.1.1"; - sha256 = "c5d4ea2cbedd81b0c3e8ac5efe0e6285fdef2ac0cc3d6f242a647dd7ec7774ed"; + sha256 = "1vblfzndfzb458j6ygfcq0mfzzc5c87gwpmcx31v10fxpqnfmm65"; libraryHaskellDepends = [ base bytestring digest utf8-string vector vector-algorithms ]; @@ -3670,7 +3778,7 @@ self: { mkDerivation { pname = "Data-Rope"; version = "0.2"; - sha256 = "3cdbdac325e61a414653d882c3bcbbff183fae6265b422869dd40b67004c777f"; + sha256 = "0zvp9h06f2ylkn325d35cap3y67zpfyc70nqad3426p64p1xmnrw"; libraryHaskellDepends = [ base bytestring unix ]; description = "Ropes, an alternative to (Byte)Strings"; license = "GPL"; @@ -3682,7 +3790,7 @@ self: { mkDerivation { pname = "DataIndex"; version = "0.1.1"; - sha256 = "60dda6e5fafec65578339f9e3ac21dda26b44c4fbc1fad83bd866b81f21bedf3"; + sha256 = "1wzd3gr82sw6pn1ss7xw9x6b89ns3p13m7lz6dw5bipyzbjsdpb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -3702,7 +3810,7 @@ self: { mkDerivation { pname = "DataTreeView"; version = "0.1.1"; - sha256 = "b2dd07c63c1d3dddecc188449d3f6f5ac1c6e74eb8676d5fe068cb954e9ea47c"; + sha256 = "0z54kr79bjv8w1gnsrxq9vkwdhasdwzrsi48q7ndsg8x7k30gpdj"; libraryHaskellDepends = [ base bytestring containers deepseq glib gtk lifted-base ListLike MissingH monad-control mtl syb transformers-base @@ -3722,7 +3830,7 @@ self: { mkDerivation { pname = "Deadpan-DDP"; version = "0.9.6.0"; - sha256 = "dcb8603347c3e6fef34a3524636b95c7db01096956707a1d27eada526d5778c6"; + sha256 = "1ikqaxnm5npa4wfplw2nd44h3ny7jmmn691m9brzxrn38wrn1f6w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3746,7 +3854,7 @@ self: { mkDerivation { pname = "DebugTraceHelpers"; version = "0.12"; - sha256 = "c8ffb982b139633f9a5a71c2d1af77905c1daf04ac9b6131765a8e0bb91a5b7a"; + sha256 = "0yjv3awhp3jsfqqn36xc0jpisp4hfypx3hkibad3yqrrn61bkzy8"; libraryHaskellDepends = [ base mtl ]; description = "Convenience functions and instances for Debug.Trace"; license = "GPL"; @@ -3759,7 +3867,7 @@ self: { mkDerivation { pname = "Decimal"; version = "0.4.2"; - sha256 = "c5f53652949eedd48dbafc1bb3e08c05348d5e25c248e8e1543bc380a9f84261"; + sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq HUnit QuickCheck test-framework test-framework-hunit @@ -3775,7 +3883,7 @@ self: { mkDerivation { pname = "DecisionTree"; version = "0.0"; - sha256 = "6d6dc700c23dafb3a3e61bbafc36b66238f147f5ca4f73b96ea79725a0cbd793"; + sha256 = "14yprfh2b5x7dswp6kyaym3z2f32nqvgrfhvwsiv7brxq80cfvbd"; libraryHaskellDepends = [ base containers ]; homepage = "http://page.mi.fu-berlin.de/~aneumann/decisiontree.html"; description = "A very simple implementation of decision trees for discrete attributes"; @@ -3788,13 +3896,28 @@ self: { mkDerivation { pname = "DeepArrow"; version = "0.4.0"; - sha256 = "cccb0d57c63cec7bbffd82cc718524939482b20003a2886f8d3124313d5a7bc9"; + sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc"; libraryHaskellDepends = [ base haskell-src mtl TypeCompose ]; homepage = "http://haskell.org/haskellwiki/DeepArrow"; description = "Arrows for \"deep application\""; license = stdenv.lib.licenses.bsd3; }) {}; + "DeepDarkFantasy" = callPackage + ({ mkDerivation, base, bimap, constraints, containers, mtl, random + }: + mkDerivation { + pname = "DeepDarkFantasy"; + version = "0.2017.4.19"; + sha256 = "19fr67fkn4z47a27nbcqh1a24jh2ir32d6fzvjdmj7d0maman2rz"; + libraryHaskellDepends = [ + base bimap constraints containers mtl random + ]; + testHaskellDepends = [ base constraints mtl random ]; + description = "A DSL for creating neural network"; + license = stdenv.lib.licenses.asl20; + }) {}; + "DefendTheKing" = callPackage ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP , MaybeT, mtl, network, peakachu, random, time, utility-ht, zlib @@ -3802,7 +3925,7 @@ self: { mkDerivation { pname = "DefendTheKing"; version = "0.3.1"; - sha256 = "fc53bc85ea025da31120a6555f4fdaa55d4e9303dbf546702fa50e32c0529f27"; + sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -3816,18 +3939,22 @@ self: { }) {}; "Delta-Lambda" = callPackage - ({ mkDerivation, base, bytestring, cereal, cpphs, filepath + ({ mkDerivation, base, bytestring, Cabal, cereal, cpphs, filepath , haskeline, megaparsec, mtl, options, parallel, text, wl-pprint }: mkDerivation { pname = "Delta-Lambda"; - version = "0.2.0.0"; - sha256 = "257636843d457a08119e1e410b46fa5ea51e25f1b84cfed0b27355fb96afb232"; + version = "0.3.0.0"; + sha256 = "1z354aa181dka2sr4q6vzix4y0lgm5821l2ma0dlyypxk74a3xqq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cereal cpphs filepath haskeline megaparsec mtl - options parallel text wl-pprint + base bytestring Cabal cereal cpphs filepath haskeline megaparsec + mtl options parallel text wl-pprint + ]; + testHaskellDepends = [ + base bytestring Cabal cereal cpphs filepath haskeline megaparsec + mtl options parallel text wl-pprint ]; homepage = "https://github.com/listofoptions/delta-lambda"; description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)"; @@ -3840,7 +3967,7 @@ self: { mkDerivation { pname = "DescriptiveKeys"; version = "0.0.4"; - sha256 = "fb48af0e7c334fd7981658cce9e48f9682607df5d9075351afda8f6c2bbb917b"; + sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v"; libraryHaskellDepends = [ base containers xmonad xmonad-contrib ]; homepage = "https://bitbucket.org/dibblego/descriptive-keys/"; description = "A library for specifying xmonad key bindings with functionality"; @@ -3854,7 +3981,7 @@ self: { mkDerivation { pname = "Dflow"; version = "0.0.1"; - sha256 = "38862cf11b5b430155220b7e499524f8e364a2991f13de22ded92ddf5cd1ff01"; + sha256 = "00gzs5fdybfrvqidw4qzk6i69qzq4jaljzhb49ah2hsv3gqjr1iq"; libraryHaskellDepends = [ base containers QuickCheck stm time ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-quickcheck2 @@ -3871,7 +3998,7 @@ self: { mkDerivation { pname = "Diff"; version = "0.3.4"; - sha256 = "77b7daec5a79ade779706748f11b4d9b8f805e57a68e7406c3b5a1dee16e0c2f"; + sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp"; libraryHaskellDepends = [ array base pretty ]; testHaskellDepends = [ array base directory pretty process QuickCheck test-framework @@ -3886,7 +4013,7 @@ self: { mkDerivation { pname = "DifferenceLogic"; version = "0.1.0.4"; - sha256 = "2a250e6644f69b05a9dc9a8d8e1074ee75e41c428f15327fa7ca383d97b1977a"; + sha256 = "0ylpn6bksf6alxzk45cg88ff8xgffh88x3csvjlhb6zn8ik0w99a"; libraryHaskellDepends = [ base containers fgl FirstOrderTheory HUnit ]; @@ -3903,7 +4030,7 @@ self: { mkDerivation { pname = "DifferentialEvolution"; version = "0.0.2"; - sha256 = "3c01318d2dd8ca39e108ed0a6891b7890414daad335b4931172d99610179267c"; + sha256 = "0z16g40n369d2wqljnrkmpd18149ny8nh2pd13hkkjnq5n6k209w"; libraryHaskellDepends = [ base deepseq fclabels mtl mwc-random parallel primitive vector ]; @@ -3920,7 +4047,7 @@ self: { mkDerivation { pname = "Digit"; version = "0.0.3"; - sha256 = "1cc52cd735b007f2b98e4ff49b0a524ba0d456b2d5b77c31f797a73a93afba31"; + sha256 = "0cdsmy9km9wpywqprdymn9bd982ba859px2giswz41xh6pbjri8w"; libraryHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -3938,7 +4065,7 @@ self: { mkDerivation { pname = "DigitalOcean"; version = "0.1.1.0"; - sha256 = "e4d3252564049ffc9d355c2f34dcb8494df651ecfaf13bf0b4c68cd982045027"; + sha256 = "09sh0j1dk366nkq3pwgsxi8zcka9p3f38bsw6nfzr7q4chjjblz4"; libraryHaskellDepends = [ aeson base bytestring containers exceptions lens mtl text transformers unordered-containers vector wreq @@ -3954,7 +4081,7 @@ self: { mkDerivation { pname = "DimensionalHash"; version = "0.1.5.2"; - sha256 = "27b120463c8a749b2e6dc3ce0a20ff1037abffdb187982d03349ac610b4f6f2d"; + sha256 = "0bbg9w5n3b296g884y8qvgzsndqhzwh0mkn3dlp9nx4a7i321c97"; libraryHaskellDepends = [ base ]; description = "An n-dimensional hash using Morton numbers"; license = stdenv.lib.licenses.bsd3; @@ -3966,7 +4093,7 @@ self: { mkDerivation { pname = "DirectSound"; version = "0.0.0"; - sha256 = "dfcfe228f6cdadbddccfd66c0cf3eae0653f64be52ff48e6e3b69ca16cf0e8f4"; + sha256 = "1x78y1na375nwgk4izsjprj3yrg0xbrhqv6nrzfbvbfdyqlf5kyz"; libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ dsound ]; homepage = "http://code.haskell.org/~bkomuves/"; @@ -3983,7 +4110,7 @@ self: { mkDerivation { pname = "DisTract"; version = "0.2.5"; - sha256 = "8bff696b2f7c75739f4a8fe22b6ebe514a5ce5f1cc359ed5f5942a2d1398d45e"; + sha256 = "0pnlk09jsallyparwdfcy7jmqjjiprp2pqlg9agp6xbw5xmnkzwb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4003,7 +4130,7 @@ self: { mkDerivation { pname = "DiscussionSupportSystem"; version = "0.11.0.3"; - sha256 = "434b7105ef891e8509678221f4cf2298d6823702d8f5a682c43a6503d6d80c47"; + sha256 = "0iqcv3b06r9sqj1adxfq08vq5mlq4b7z88c2cw4qa7l9xw2p2js3"; libraryHaskellDepends = [ base blaze-html blaze-markup html parsers ]; @@ -4019,7 +4146,7 @@ self: { mkDerivation { pname = "Dish"; version = "0.0.0.5"; - sha256 = "5d47cbf6804d16acf2c250d7672c3a769c89f2a137dfd2b7fd4de68e96071ff6"; + sha256 = "1xhz0yb8xrjdznvx5prpl7r8k73n78n6gmshqbraq5jdh3vcnisx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -4035,7 +4162,7 @@ self: { mkDerivation { pname = "Dist"; version = "0.4.0.0"; - sha256 = "71b3cfb410c08cf1692d4aa484b3190cc0840245adc23ea7ed8bb3e109a41c88"; + sha256 = "120wlh4y3cwbxnkkxhmd8l189h0c36rq992a5mlz336022sczcvi"; libraryHaskellDepends = [ base containers MonadRandom ]; testHaskellDepends = [ base containers MonadRandom ]; homepage = "https://github.com/wyager/Dist"; @@ -4051,7 +4178,7 @@ self: { mkDerivation { pname = "DistanceTransform"; version = "0.1.2"; - sha256 = "653aa31329530089c5d0b8224d0d014bb937d7bd6a71b0a1e348536cfad2e730"; + sha256 = "0c77sbx6qls8wfhv0wbappbkgfab046ls8mqs32qj02k549s6fk5"; libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit vector @@ -4065,7 +4192,7 @@ self: { mkDerivation { pname = "DistanceUnits"; version = "0.1.0.1"; - sha256 = "5aad6450a1dd79f783944269fd4c759f249c9cd3883e45134c7f586c09ce4653"; + sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/gambogi/DistanceUnits"; description = "A comprehensive distance library"; @@ -4081,7 +4208,7 @@ self: { mkDerivation { pname = "DnaProteinAlignment"; version = "0.0.0.1"; - sha256 = "a32f396fb76bca8833b9ba8b7105dc5dcf368288c1aa0a9ccf6a8f7aad228701"; + sha256 = "00c74anpm3varyf0man1i213dksxvh2p32xsp4rqijkbnxpkjbx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4107,7 +4234,7 @@ self: { mkDerivation { pname = "DocTest"; version = "0.2.0.1"; - sha256 = "47205c0e6d5d9b6a90028181f35ebf0aa77d6bc503d2da887561fce8192839f1"; + sha256 = "1w9r50cyiz31fn4dmlh3qmmpv9qapxgg70c10a86m6sxdl75q827"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4124,7 +4251,7 @@ self: { mkDerivation { pname = "Docs"; version = "1.0.0"; - sha256 = "df6e26c757000d513d17c53e6db45eceb2a45b1bb94ba0184b92cf24aefd4dc2"; + sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz"; libraryHaskellDepends = [ base html ]; homepage = "http://ddiaz.asofilak.es/packages/Docs.html"; description = "Documentation types library"; @@ -4138,7 +4265,7 @@ self: { mkDerivation { pname = "DrHylo"; version = "0.0.2"; - sha256 = "071a7a3e51d10b770aa195224c44edb6832469808ea161f790be7d0f3efe47b3"; + sha256 = "1cs7zqz0yzdyj3vn38cfh1lj90xnxm24q8lml457f2yia4z7l6h7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4156,7 +4283,7 @@ self: { mkDerivation { pname = "DrIFT"; version = "2.4.2"; - sha256 = "742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0"; + sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -4174,7 +4301,7 @@ self: { mkDerivation { pname = "DrIFT-cabalized"; version = "2.3.0"; - sha256 = "949be8c0ccc9f8b1e5d97e139cabac21fa87aeb72ba40ad1e0c970f968c5674a"; + sha256 = "0jk7qmlgjw69w38hm91bnyp8gyi1mjmrq4vyv7jv3y69rk0fi6wl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base old-time process random ]; @@ -4189,7 +4316,7 @@ self: { mkDerivation { pname = "Dung"; version = "1.1"; - sha256 = "ebe94c91fcda450eb6c4c492dccb933b5194fc27ad9d2a127334a5f2f06d2fc2"; + sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cmdargs containers parsec ]; @@ -4208,7 +4335,7 @@ self: { mkDerivation { pname = "Dust"; version = "2.3.1"; - sha256 = "72ab2ae62f06dbac86cd5e6dbd595ca0673221075b9a580d812d9eaab2a85748"; + sha256 = "0j2pm2ram7idh46mi6jv0whk4rx0bicvsvayrn3arnq65zk2mavj"; libraryHaskellDepends = [ base binary bytestring cereal containers crypto-api directory Dust-crypto entropy ghc-prim network random random-extras random-fu @@ -4234,7 +4361,7 @@ self: { mkDerivation { pname = "Dust-crypto"; version = "0.1"; - sha256 = "3c7d01c4cbf975874270ac4379bab92549c5bbe6e8cdb1a312a349cd9bcf5784"; + sha256 = "112prydwsjd32aiv3kg8wsxwaj95p6x7jhxcf118fxgrrg202z9w"; libraryHaskellDepends = [ base binary bytestring cereal containers crypto-api cryptohash directory entropy ghc-prim network random random-extras random-fu @@ -4259,7 +4386,7 @@ self: { mkDerivation { pname = "Dust-tools"; version = "1.3.2"; - sha256 = "c4f2fef819b4e5a3fa4bcc3e1778f9784ac9f917dc130927c3c901400a3c34bc"; + sha256 = "1g1l7h5400f9qckhj4yw2zwwjjkqz5w1fgnc9gxa7rdl37wgxwn4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4285,7 +4412,7 @@ self: { mkDerivation { pname = "Dust-tools-pcap"; version = "1.3.1"; - sha256 = "b9e9af8c7293e9d48ee598d404bf563e2e7d08fbc6a3e1f1091e9f40999e9eeb"; + sha256 = "1swykscl17qy17qy38y6zc47sbiyaszh9m4qwn7d9sckfa6azsdr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4304,7 +4431,7 @@ self: { mkDerivation { pname = "DynamicTimeWarp"; version = "0.1.0.0"; - sha256 = "67c2a25b7c4032307f2c4df5efdb2edc38350c68cdbbabda3c21db2d055ea854"; + sha256 = "0m58bq2jvnr17kdapfydd063af6w5vdyzxad5izk0cj0gids5hk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base vector ]; @@ -4322,7 +4449,7 @@ self: { mkDerivation { pname = "DysFRP"; version = "0.1"; - sha256 = "4192bda1c59bc6561c93046676c37dcb1ce4e10f559f0a6282108b56a3d081cb"; + sha256 = "1jw1s2imd2qhh9i0m7sm1zhy876bgp1pcrh4jcf5dilvqnhvv4j1"; libraryHaskellDepends = [ base contravariant mtl time transformers ]; @@ -4336,7 +4463,7 @@ self: { mkDerivation { pname = "DysFRP-Cairo"; version = "0.1"; - sha256 = "eed4f4d9e22bb8418883fa8c012deca0bef4073a1787a510f8e66e9a3d7fe6dd"; + sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f"; libraryHaskellDepends = [ base cairo DysFRP gtk mtl ]; homepage = "https://github.com/tilk/DysFRP"; description = "dysFunctional Reactive Programming on Cairo"; @@ -4351,7 +4478,7 @@ self: { mkDerivation { pname = "DysFRP-Craftwerk"; version = "0.1"; - sha256 = "c157a58edef89efd6c52fa738a4d9447b5d42c6276333790e26d1018943f1566"; + sha256 = "0rhm7ya1h43dwa83fcvnc8nd9da7ji6qlwzsa9ngv7pqvs7aamy1"; libraryHaskellDepends = [ base cairo containers craftwerk craftwerk-gtk DysFRP DysFRP-Cairo gtk @@ -4367,7 +4494,7 @@ self: { mkDerivation { pname = "EEConfig"; version = "1.0"; - sha256 = "c165cba32a8efe0ff314610ede6e2c838bd16553d5c9449b8e9648d082fc73ae"; + sha256 = "1bkkzj1d0j4nisdl9jfmadjx32w35ipdw3k12krhzzlf5aiwnrf1"; libraryHaskellDepends = [ base containers ]; description = "ExtremlyEasyConfig - Extremly Simple parser for config files"; license = stdenv.lib.licenses.bsd3; @@ -4381,7 +4508,7 @@ self: { mkDerivation { pname = "Earley"; version = "0.11.0.1"; - sha256 = "c207a40926bb0b9de05641a0fc03c22849a2c7e0bc007d2ffef37f33793985b3"; + sha256 = "1cw575wk6zzkzqpps05ww33s4j98q81zr821avh9s2xv4q4s81y2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; @@ -4400,7 +4527,7 @@ self: { mkDerivation { pname = "Earley"; version = "0.12.0.0"; - sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337"; + sha256 = "0drkf9jc99vb82h0mb6x8plj1sn0ysdkmq5pqdyz7xq4ghj7srcq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; @@ -4422,7 +4549,7 @@ self: { mkDerivation { pname = "Ebnf2ps"; version = "1.0.15"; - sha256 = "0ecce7d721d6c8993fa6ba6cfb16f1101d85e00bbaf0b6941d36a00badea2b4b"; + sha256 = "0jrbxanhp81n3nabdw5s1gh8a78hy4bgnv5slqzrkj6n47bygk0f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4439,7 +4566,7 @@ self: { mkDerivation { pname = "EdisonAPI"; version = "1.3.1"; - sha256 = "95a3b8d01599520a50456219b5a2e9f7832bcddaaeb8e94ce777bd87a4a6b56e"; + sha256 = "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm"; libraryHaskellDepends = [ base mtl ]; homepage = "http://rwd.rdockins.name/edison/home/"; description = "A library of efficient, purely-functional data structures (API)"; @@ -4453,7 +4580,7 @@ self: { mkDerivation { pname = "EdisonCore"; version = "1.3.1.1"; - sha256 = "3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b"; + sha256 = "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry"; libraryHaskellDepends = [ array base containers EdisonAPI mtl QuickCheck ]; @@ -4469,7 +4596,7 @@ self: { mkDerivation { pname = "EditTimeReport"; version = "1.0"; - sha256 = "e04803689a2a2bd453e4c96587a13c7024abcd97036c96cedbd2c0328a104985"; + sha256 = "11a922535h6jvg79cv03jz6sn93h7jhqfrf9wi9x8arak9l06j70"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4489,9 +4616,9 @@ self: { mkDerivation { pname = "EitherT"; version = "0.2.0"; - sha256 = "5c6bc80ceae21f0ec21960f9b9a202ef09c70f1b6734d2d6e12ee0f6d3213eef"; + sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw"; revision = "1"; - editedCabalFile = "a1c6f78c9a4379af0738a6d4dee5d1781099c5c56acb0b39c45ad23b256e8c6e"; + editedCabalFile = "0vlcdqjkpljsqhwhpjvaqp2rj43qs7jxxm56703syya3ka6ggim1"; libraryHaskellDepends = [ base monad-control transformers transformers-base ]; @@ -4512,7 +4639,7 @@ self: { mkDerivation { pname = "Elm"; version = "0.13"; - sha256 = "b05ac9a427afe88e49cecbb0ee08f112e1a9f4c5fb011537a7eb84032000d7d0"; + sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4545,7 +4672,7 @@ self: { mkDerivation { pname = "Emping"; version = "0.6"; - sha256 = "795a809998003f79df41af44ddcfa8ab011d4fa16eed8a57d5eb03fb5c38308c"; + sha256 = "131h71fgn0zbsmbqmvbfl57is0dbm37xsi5g87gpjgq0k2cq0nkr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4562,7 +4689,7 @@ self: { mkDerivation { pname = "Empty"; version = "0.1.0.1"; - sha256 = "62afb83e3ca21f67181289f6496e566ffb2bbadfec91f170bc6f40a76212953d"; + sha256 = "0gcm29iafh3gpiqg34gcvyx2pyvgarp4kxl928c6f7x27hzbibv2"; libraryHaskellDepends = [ base containers ]; description = "A type class for empty containers"; license = stdenv.lib.licenses.bsd3; @@ -4573,7 +4700,7 @@ self: { mkDerivation { pname = "Encode"; version = "1.3.8"; - sha256 = "9f7c637e75f413fd7ba4c1d6f8592e87f74220a2ffe34ccba1b65b5d58690891"; + sha256 = "1488d5c5snxnl75lrqzzl8h45xw75rczimn1lixzs4zlfmz66z4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers mtl ]; @@ -4590,7 +4717,7 @@ self: { mkDerivation { pname = "EntrezHTTP"; version = "1.0.3"; - sha256 = "395c438c8b5b68fc0826e1946483d252a8936d5a91a25bf928eef113b4f9a89b"; + sha256 = "16x8z6s17wgf53wmp8lib9nr7a2jsa1n95714q4gqs2vif646p1r"; libraryHaskellDepends = [ base biocore bytestring conduit HTTP http-conduit hxt mtl network Taxonomy text transformers @@ -4606,7 +4733,7 @@ self: { mkDerivation { pname = "EnumContainers"; version = "0.1"; - sha256 = "6802cc98b4b39834d53c9e18c114aa0cc47ce7a46b58191a60c3dbb8d5bb9391"; + sha256 = "14ckpgaviny3c0d1jn3blkkpri0cm8ac264y7kak965knjccq0k8"; libraryHaskellDepends = [ base containers deepseq ]; description = "Simple Enum-class-based int containers"; license = stdenv.lib.licenses.bsd3; @@ -4618,7 +4745,7 @@ self: { mkDerivation { pname = "EnumMap"; version = "0.0.2"; - sha256 = "5f7e33f1845f6d620375e7e3792dddb9c3e83368cbdc7d69dbcbcf9268b872ec"; + sha256 = "1v3jp1l95kybvdlpvp6bd0ryihxrvlnpkqz7fl1n4vazhkqk6zjz"; libraryHaskellDepends = [ base containers ]; description = "More general IntMap replacement"; license = stdenv.lib.licenses.bsd3; @@ -4632,7 +4759,7 @@ self: { mkDerivation { pname = "Eq"; version = "1.1.3"; - sha256 = "4344182457c511c3a62755623bb8981ac57016b3523c510e9521f01ce9978e41"; + sha256 = "0hcfjzlirw11jl752g2jncb71i8sk2w3nqjm4ykc64f5awj1hi23"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4649,7 +4776,7 @@ self: { mkDerivation { pname = "EqualitySolver"; version = "0.1.0.2"; - sha256 = "2f50063e7fd1077c613ed39e5d0ca8b61462bba5c0f466d9ecb0d85a13fddf7a"; + sha256 = "0ynzzl9mmn5hxkcndx60lnxn455nm065v7nk7rhpq1yigwz0cl1g"; libraryHaskellDepends = [ base containers HUnit mtl union-find-array ]; @@ -4666,7 +4793,7 @@ self: { mkDerivation { pname = "EsounD"; version = "0.2"; - sha256 = "59b6f6676e5cd005e296ee8e8f0669522d981f94fb96874deb223133d09842b4"; + sha256 = "1d22k3836c92xd6qg5pvjhgrhbajd438z3pfjvi0bl2wdrkzddjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4684,7 +4811,7 @@ self: { mkDerivation { pname = "EstProgress"; version = "0.3.0.0"; - sha256 = "2371b9ee209aa190a95125fcd1a14a6d1e60d986c2554c149f0aeb21d894b197"; + sha256 = "15xijkc23sqakwa4qmf2hvcn07kd9ahx3z15a6lr18cs43pbjw93"; libraryHaskellDepends = [ ansi-terminal base mtl ]; homepage = "http://alkalisoftware.net"; description = "Methods for estimating the progress of functions"; @@ -4701,7 +4828,7 @@ self: { mkDerivation { pname = "EtaMOO"; version = "0.3.0.0"; - sha256 = "501344b7dfe9ec437fd137a247d785eed7d497f35daacd6aed3d940b8837c57c"; + sha256 = "0z656y40p51xxmmcvajxyfbx9mzfhpblg8ips5zl7v79vyvl84sh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4723,7 +4850,7 @@ self: { mkDerivation { pname = "Etage"; version = "0.1.12"; - sha256 = "4058f25a292aa7ed6133d438da7c8793d2334f6ea886225ebb8d981ff49168c6"; + sha256 = "1ik8j7s1z64dpdg251m8dr7k7llkhxydlf6l6dhyv9ra55dg4n20"; libraryHaskellDepends = [ base containers ghc mtl operational random SafeSemaphore time unix ]; @@ -4740,7 +4867,7 @@ self: { mkDerivation { pname = "Etage-Graph"; version = "0.1.8"; - sha256 = "82a65951481688ceac44da29e186ea605ce2e50d5b838b382cbb434ba0dafa77"; + sha256 = "0xzsvah4nhxv5hw8p0sv1pjy4p30xa3f2afs8jncx20n918mk9l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers Etage fgl mtl ]; @@ -4758,7 +4885,7 @@ self: { mkDerivation { pname = "Eternal10Seconds"; version = "0.2"; - sha256 = "b7575fb3789c8bdcc7970e3eb2ee80fb8f3e328fc38be97c3fbdb294b1fc014e"; + sha256 = "0kh1zjqr9cmx7xyfk2y3iwr3x3zvh3pb4ghfjz3xr2wwg2rmymxp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 SDL SDL-mixer ]; @@ -4775,7 +4902,7 @@ self: { mkDerivation { pname = "Etherbunny"; version = "0.3"; - sha256 = "d21e61cd45067d70944d1e9d1bd418e44d50b4891c3a8d53cc1c33234c47a932"; + sha256 = "0cm98x626cqwri9qsfhwi6s50kg433a1p78y9na70z868p6n27nj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4796,7 +4923,7 @@ self: { mkDerivation { pname = "EuroIT"; version = "2010.2.5"; - sha256 = "fb310916e307d5e88ceb9e71a735aa40aff95a5639abd141bfdfdee041dccba8"; + sha256 = "1a6bvi0y1pnzpx0x3arrardgkbs0m8ssfwcyxf6fim87wcb0jcgv"; libraryHaskellDepends = [ base ]; description = "Library for using euro currency, italian language"; license = stdenv.lib.licenses.bsd3; @@ -4808,8 +4935,8 @@ self: { }: mkDerivation { pname = "Euterpea"; - version = "2.0.2"; - sha256 = "9b7dfed82cceae3f1213c1dffee46d17a4d729626ad873175984567abab44db4"; + version = "2.0.3"; + sha256 = "0khr4yqrg258x0fqrhzpwrzzsmzwdk3x3b3vyyqqmy5vh9hagvfy"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -4827,7 +4954,7 @@ self: { mkDerivation { pname = "EventSocket"; version = "0.1"; - sha256 = "ad8ba46f5594da7d54fa5c1252ae9a2880a716e3c19d2ced5d485e2675458e0f"; + sha256 = "03wf8msjcpj8bpnjr7f1wcbag018kap544jwz9a7vnllamps92xd"; libraryHaskellDepends = [ base bytestring containers haskell98 mtl network ]; @@ -4845,7 +4972,7 @@ self: { mkDerivation { pname = "Extra"; version = "1.46.3"; - sha256 = "d0fb7267853f610a9b9e7d5e37ab39f6de2b99f21c15d44bffb6807459babcf6"; + sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh"; libraryHaskellDepends = [ base bytestring bzlib containers directory filepath HUnit mtl network-uri old-locale old-time pretty process pureMD5 QuickCheck @@ -4865,7 +4992,7 @@ self: { mkDerivation { pname = "FComp"; version = "1.0.2"; - sha256 = "367795bfcf982fe9efea55e3c60435d0ee9dc58b9f2c02009c7fad28f7807542"; + sha256 = "0hkmh3vjibbzkh004b4zig2rvvnh6l2cdqsmxbpyjbwqryzraxrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -4888,7 +5015,7 @@ self: { mkDerivation { pname = "FM-SBLEX"; version = "3.0.1"; - sha256 = "487dac912edc4b7dfd16171afda2fa6cd2a532d2fdb325f5ed2958ec11c663b1"; + sha256 = "1cb3qq8yqn19xpsjbczxs8rablkczaigs6hp2vypsjyw5s8sqza8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers haskell98 ]; @@ -4903,7 +5030,7 @@ self: { mkDerivation { pname = "FModExRaw"; version = "0.2.0.0"; - sha256 = "f46b377566b80a5b87b9ef92fce2473c16e3fd004a85f9924f9e23043b855f50"; + sha256 = "0l2zhlxh88wy9y9gk1aa03yy65iw8zigr4pgp63mn2mqcrskfszl"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ fmodex64 ]; homepage = "https://github.com/skypers/hsFModEx"; @@ -4917,7 +5044,7 @@ self: { mkDerivation { pname = "FPretty"; version = "1.1"; - sha256 = "b8ac0122e923b0e20cee6ba77ffb07dfeaa96a194cdc1622808e97f443a8eb42"; + sha256 = "0hpbm11z95wfh0i1dp2c35maksnz0zxpz9vbxq6f5c13x4i03b5q"; libraryHaskellDepends = [ base containers ]; homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html"; description = "Efficient simple pretty printing combinators"; @@ -4929,11 +5056,12 @@ self: { mkDerivation { pname = "FTGL"; version = "2.1"; - sha256 = "82bb01c58dce449902d54857b76146723c0d1fda118bd465963bf6be503ae62c"; + sha256 = "0b76798bxxivjrjx92qiv8ghsg3j8rhvfms8sl19ji6fip2h3fw2"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -4943,7 +5071,7 @@ self: { mkDerivation { pname = "FTGL-bytestring"; version = "2.0"; - sha256 = "c20b7fdc9fa350155072a1358890536f27478410d2f1c4d230dd3c129f78c887"; + sha256 = "11y8g2gi4g6x639c9wfj2224f9vgaf88hdd1f981al53kzf7y2y2"; libraryHaskellDepends = [ base bytestring StateVar-transformer transformers ]; @@ -4960,7 +5088,7 @@ self: { mkDerivation { pname = "FTPLine"; version = "1.4.1.1"; - sha256 = "b4a654625b7b405c076aff0f30e44c0d7ea14ed1f240b61c13b175339287d280"; + sha256 = "106jhy936xdi2cfbch7js57a2zhd9kj303zzd83mqh3vbdi599ml"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4979,7 +5107,7 @@ self: { mkDerivation { pname = "Facts"; version = "0.1.2"; - sha256 = "e5fc2a9ce5a3d4aa801e9d95c9c354def12dc69578aa4ce8924b556b244e0f05"; + sha256 = "018g9qj6nmabjbl4rakqjp32vwfyak1wk5cx3s0amm53wnf2mz75"; libraryHaskellDepends = [ AC-Angle base containers digits QuickCheck template-haskell ]; @@ -4993,7 +5121,7 @@ self: { mkDerivation { pname = "FailureT"; version = "15778.1"; - sha256 = "65049d3816998c0b81e826d37c719ec90c571f0c74ef9b8755ce63d2b9c612e2"; + sha256 = "1qhjqswx4qyfan3rpvvl1hgmf369krqprlr6x20hp34r2qw9s135"; libraryHaskellDepends = [ base base-unicode-symbols mmtl ]; description = "Failure Monad Transformer"; license = stdenv.lib.licenses.publicDomain; @@ -5005,7 +5133,7 @@ self: { mkDerivation { pname = "FastPush"; version = "0.1.0.3"; - sha256 = "61f383fa02c0c2e34e3905be1ededc0db65012e4a7d55bec747e756bacc7aa7b"; + sha256 = "0yxaqyn6nxbyfkn5pmd7wh951dhdvkg1xgh5757f7hn00bx87wv1"; libraryHaskellDepends = [ base STMonadTrans vector ]; homepage = "https://github.com/wyager/FastPush/"; description = "A monad and monad transformer for pushing things onto a stack very fast"; @@ -5019,7 +5147,7 @@ self: { mkDerivation { pname = "FastxPipe"; version = "0.2.0.0"; - sha256 = "4969694a810c1c6e22b58ab38a82c772eddf2e1e94fe1eb5a42d37b5a30aafc6"; + sha256 = "1img1aivadrdljsixzll3qpdzvbjqy18mcwanli6w70ch556jsa9"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring pipes pipes-attoparsec pipes-bytestring @@ -5034,7 +5162,7 @@ self: { mkDerivation { pname = "FenwickTree"; version = "0.1.2.1"; - sha256 = "9c172d62b24365e663a0355e8eaa34362a1a769c18a64391939a9b50e384f03c"; + sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww"; libraryHaskellDepends = [ base QuickCheck template-haskell ]; testHaskellDepends = [ base QuickCheck template-haskell ]; homepage = "https://github.com/mgajda/FenwickTree"; @@ -5050,7 +5178,7 @@ self: { mkDerivation { pname = "FermatsLastMargin"; version = "0.1"; - sha256 = "c80dc30a4cb5d5b27e254110ba2f20ea6aa8e506377ffb74d6d12923acf3591f"; + sha256 = "07sryfn26afisrsgnzrp0vjshspa40pvl4214mzb5mdm9h5c63f8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5070,7 +5198,7 @@ self: { mkDerivation { pname = "FerryCore"; version = "0.4.6.4"; - sha256 = "f7f110d4816e4cc9289dde8103b9aaba69d41cf217464f4978cd0cca6a5eb0b7"; + sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp"; libraryHaskellDepends = [ base containers HaXml mtl parsec pretty TableAlgebra template-haskell @@ -5085,7 +5213,7 @@ self: { mkDerivation { pname = "Feval"; version = "1.0.0.1"; - sha256 = "57d8d22edddce21abb7f690a3609a2daca841642d52e3641986d1e58a57b8b56"; + sha256 = "0mlbgfjmh7kdk10kcbnm88b89jnsl84kc2k9gyximqnwvlpd5n2p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl parsec ]; @@ -5102,7 +5230,7 @@ self: { mkDerivation { pname = "FieldTrip"; version = "0.2.7"; - sha256 = "2b9708c875ebd6bf11d4d79334a1098da5c4cd7f064e7b5196410e42d0afc184"; + sha256 = "1161mz8443j1jr8pnkh6gz6w99cd16hk94ypsh8vzmpbfp40i5rb"; libraryHaskellDepends = [ base GLUT graphicsFormats MemoTrie old-time OpenGL TypeCompose vector-space @@ -5120,7 +5248,7 @@ self: { mkDerivation { pname = "FileManip"; version = "0.3.3.1"; - sha256 = "b137f27cbb363f95eae3a757be02ce181a78f314283295ebbbe012efe73f1436"; + sha256 = "0dhl7zkyy4p0pgmraci82krph6hqrq1bwmx7wgm9agrnpdyg4dxi"; libraryHaskellDepends = [ base bytestring directory extensible-exceptions filepath mtl unix ]; @@ -5136,7 +5264,7 @@ self: { mkDerivation { pname = "FileManipCompat"; version = "0.18"; - sha256 = "601bcad3271ecaa9bf9e2e19cc6a4238900aab12d9473057abc1bdbf4e3e0130"; + sha256 = "0c017r7bzgf1mdbk0iyr2amhm41q89mcq69fkszskjhy4z9wl6v0"; libraryHaskellDepends = [ base bytestring directory filepath mtl unix-compat ]; @@ -5152,7 +5280,7 @@ self: { mkDerivation { pname = "FilePather"; version = "0.2.0"; - sha256 = "ad8324e3742a6289331c4e3cbd09dc3585bc05f59c94d348b02c00ed314492e7"; + sha256 = "1rwj8hqys01cn14d754wyl2vr19mvh4vsg2f3hrqjqiafkij90xd"; libraryHaskellDepends = [ base comonad comonad-transformers data-lens directory filepath mtl transformers @@ -5169,7 +5297,7 @@ self: { mkDerivation { pname = "FileSystem"; version = "1.0.0"; - sha256 = "8627e1e93c8b63d4b8ff9a64ecb9979213dacbfa7b48e8ece21e6fa9f6e5df63"; + sha256 = "0qyzwpvajvqywbnfhj3vzb5xl4wjjywyqr4szywd8qwb7kly29w6"; libraryHaskellDepends = [ base binary bytestring directory filepath mtl old-time ]; @@ -5184,7 +5312,7 @@ self: { mkDerivation { pname = "Files"; version = "0.1.1.1"; - sha256 = "9502b3b2b0dd3ea91da652ac616ebba1222882fabe9f540cf79c0e315a435b03"; + sha256 = "00sv8dd323lwyw6597xyza12h8m1pdp63b2jlqfsjgnxn2rb60lm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -5203,7 +5331,7 @@ self: { mkDerivation { pname = "Finance-Quote-Yahoo"; version = "0.8.0"; - sha256 = "dfc5aaf2f00f0e1b63e0483629feece8ccaa7d77b377ee2a380202996737e8b4"; + sha256 = "1d786xkrj0h270mfwxxkfxysmk78xkz2jdj8w1iin3hgy3ramifz"; libraryHaskellDepends = [ base bytestring http-conduit network old-locale time ]; @@ -5220,7 +5348,7 @@ self: { mkDerivation { pname = "Finance-Treasury"; version = "0.1.2"; - sha256 = "546960bad4932ea652189317b086864bbad18c965691cf95074c9880246f9d9f"; + sha256 = "17wxdwj8162c0yawz4anjs6d3fjbhs3b05wk319acblksjx60sal"; libraryHaskellDepends = [ base containers HTTP HTTP-Simple hxt hxt-filter network old-locale time @@ -5236,7 +5364,7 @@ self: { mkDerivation { pname = "FindBin"; version = "0.0.5"; - sha256 = "279c7967e0803ca3b9a0a1956ce7ba9b9a2294eb9f971bea8a557b5f80ddfda4"; + sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717"; libraryHaskellDepends = [ base directory filepath ]; homepage = "https://github.com/audreyt/findbin"; description = "Locate directory of original program"; @@ -5248,7 +5376,7 @@ self: { mkDerivation { pname = "FiniteMap"; version = "0.1"; - sha256 = "7ebe24ca2f3dd3822ef7bfbaf9917c5a831c9a8a527005e97488e957201ac6cd"; + sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky"; libraryHaskellDepends = [ base haskell98 ]; description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562"; license = stdenv.lib.licenses.bsdOriginal; @@ -5260,7 +5388,7 @@ self: { mkDerivation { pname = "FirstOrderTheory"; version = "0.1.0.6"; - sha256 = "f1884e300a05a1f253bf4bbddce633025a6da245ff119fe7c2432ad4278b81a4"; + sha256 = "1941ickx8aj3qbkry4gz8ni6snh26gkdrgabpx9z588518q4x27i"; libraryHaskellDepends = [ base containers Proper ]; description = "Grammar and typeclass for first order theories"; license = stdenv.lib.licenses.bsd3; @@ -5272,7 +5400,7 @@ self: { mkDerivation { pname = "FixedPoint-simple"; version = "0.6.1"; - sha256 = "9665ba95416c3d0d9cf54200e5e731128c806d44f9cecf81a0a6c4814fd0de61"; + sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn"; libraryHaskellDepends = [ base deepseq template-haskell ]; homepage = "https://github.com/TomMD/FixedPoint"; description = "Fixed point, large word, and large int numerical representations (types and common class instances)"; @@ -5286,7 +5414,7 @@ self: { mkDerivation { pname = "Flippi"; version = "0.0.5"; - sha256 = "89ae06853e95f399c5c6b5a10d6803dd775cdc9724e992774b545b36ec8045f0"; + sha256 = "1w25h3n3cnsl9dvr5s94jzf5qxyx0dl0v8dmqv2rkwwm7s2hdbl9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5303,7 +5431,7 @@ self: { mkDerivation { pname = "FloatingHex"; version = "0.4"; - sha256 = "b277054db48d2dec62e3831586f218cbe0a056dec44dbc032e9a73087425a24c"; + sha256 = "0k524ms0hwws5q1vqkf4vrba1q6b33r8c5c3wdifqbcdni6haxxj"; libraryHaskellDepends = [ base template-haskell ]; description = "Read and write hexadecimal floating point numbers"; license = stdenv.lib.licenses.bsd3; @@ -5314,7 +5442,7 @@ self: { mkDerivation { pname = "Focus"; version = "0.1.2"; - sha256 = "41e6d7ebdb1750c1878087bcca87e5c8099f0eda2a349f490c55a9d7ab812cb8"; + sha256 = "1f1ch6mxgaam1i4ryd1av879y2f8wn3wmg47h23w2l0pvgmxgrj1"; libraryHaskellDepends = [ base MissingH split ]; description = "Tools for focusing in on locations within numbers"; license = stdenv.lib.licenses.mit; @@ -5325,7 +5453,7 @@ self: { mkDerivation { pname = "Folly"; version = "0.2.0.1"; - sha256 = "6ae5a4c048262e89a653d04f7e56fa7f44499bcff681780f263f790c6c2a92a3"; + sha256 = "18wj59n0qy9z4q7pi0gnrydlji3zz9b7wkyhafk8jbi6930a9rba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec ]; @@ -5341,8 +5469,8 @@ self: { }: mkDerivation { pname = "FontyFruity"; - version = "0.5.3.2"; - sha256 = "87196e6f40bd60eafa415ac503a62d8dd7c318126bbb7cd1731821312e2ac515"; + version = "0.5.3.3"; + sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath text vector xml @@ -5359,7 +5487,7 @@ self: { mkDerivation { pname = "ForSyDe"; version = "3.1.1"; - sha256 = "172e73ddde923ea430701dd7f7d08b7f970cc46d3f989f81b732b7dbfdd4fc3d"; + sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp"; libraryHaskellDepends = [ array base containers directory filepath mtl old-time parameterized-data pretty process random regex-posix @@ -5373,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 = "451e874ad1c2dda4923ffe773e4039387b85196b5985958e21535cdecc53d113"; + 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"; @@ -5399,7 +5527,7 @@ self: { mkDerivation { pname = "ForkableT"; version = "0.1.0.2"; - sha256 = "723f5b05eacc15a27c40476a08e1c8cfb686b4f81097699654ac0419fc7bf953"; + sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj"; libraryHaskellDepends = [ base monad-control mtl resourcet ]; homepage = "https://github.com/exFalso/ForkableT/"; description = "Forkable monad transformers"; @@ -5410,13 +5538,14 @@ self: { "FormalGrammars" = callPackage ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring , cmdargs, containers, data-default, HaTeX, lens, mtl, parsers - , PrimitiveArray, semigroups, template-haskell, text, transformers - , trifecta, unordered-containers, vector + , PrimitiveArray, QuickCheck, semigroups, smallcheck, tasty + , tasty-quickcheck, tasty-smallcheck, tasty-th, template-haskell + , text, transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "FormalGrammars"; - version = "0.3.1.0"; - sha256 = "cc6d92eeda014b8f1b89eed81e11f9b7c4b9c150771f330e43092644754fbac8"; + version = "0.3.1.1"; + sha256 = "0khnd7y4bg62fvgvk1s470hdzp9fxcairghrdva22cflpflrkx2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5427,6 +5556,10 @@ self: { executableHaskellDepends = [ ansi-wl-pprint base cmdargs trifecta ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th + ]; homepage = "https://github.com/choener/FormalGrammars"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; @@ -5440,7 +5573,7 @@ self: { mkDerivation { pname = "Foster"; version = "1.1.2"; - sha256 = "ca2c7f580c33c9a7bf08d1138ef0906ce63d991bc99f2960de17303166b79270"; + sha256 = "0w4jnxk32c0pvrh2k7y93fckvrkcj3q8w4yi12zsgj9k1ic7yb6a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5459,7 +5592,7 @@ self: { mkDerivation { pname = "FpMLv53"; version = "0.1"; - sha256 = "d764b066e9ea9fd129cb4d30e4a4a80e27f880dce00986367682e60f488afb40"; + sha256 = "0h7vi940zrl2fqv8c2g0vj0gh9qfm2jf8c2drclx37zax5kb0r6p"; libraryHaskellDepends = [ base HaXml ]; homepage = "http://www.fpml.org/"; description = "A binding for the Financial Products Markup Language (v5.3)"; @@ -5473,7 +5606,7 @@ self: { mkDerivation { pname = "FractalArt"; version = "0.2.0.3"; - sha256 = "def0ff1b8d30d993c594d20a951318d8f29cd67943555e2439829d4fbc63a0fc"; + sha256 = "1z50cfy4z7c274j5wma3g7b9rwnq309ra2njjk2r7n9hildzzw6y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5493,7 +5626,7 @@ self: { mkDerivation { pname = "Fractaler"; version = "3"; - sha256 = "ae0c81e8b34cac290c08fefa7d30c5172fb41edbb51c8fa7bc807c5e5aa6d240"; + sha256 = "0h6jlrd5wz40pjkqy75mvcgb8bqpqlq7vypy1062kb2cngl8235f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5512,7 +5645,7 @@ self: { mkDerivation { pname = "Frames"; version = "0.1.9"; - sha256 = "18eaea64c8f3ff7156ca1dcc372bae3e8ff7538cffce4c415710eae770eb6b25"; + sha256 = "09bbxdqfgshhax0lrkpzii9zg3rymqmkgk0xr9b73zzkr1jfmshq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5533,7 +5666,7 @@ self: { mkDerivation { pname = "Frank"; version = "0.3"; - sha256 = "8163e0ba4df1d75243f94683fe7c15da744c9102fbf1e4e308d0ef87cb5229dd"; + sha256 = "1p99ab5qgvyh13iy9wgv0a8lqx6s2mygx0s6z51m5mzi9nxf0qw1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl newtype she void ]; @@ -5548,7 +5681,7 @@ self: { mkDerivation { pname = "FreeTypeGL"; version = "0.0.4"; - sha256 = "4e85f39777c29cc145b760289906b3a9f8e518296af258004223d87bbbdc5183"; + sha256 = "10sivjxppn138805iwka54cfby59nc39ja30nx2w3762fybz71af"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base freetype2 OpenGL ]; @@ -5562,7 +5695,7 @@ self: { mkDerivation { pname = "FunGEn"; version = "1.0.1"; - sha256 = "79c0d7b46d8d7002a9f7284f9fb4596cedebf906228af0272c0a227dc33654ad"; + sha256 = "1bal6v1ps8ha5hkz12i20vwypvbcb6s9ykr8yylh4w4ddnsdgh3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat GLUT OpenGL random ]; @@ -5580,7 +5713,7 @@ self: { mkDerivation { pname = "Fungi"; version = "1.0.6"; - sha256 = "8c395e61d78acff2c8a813c8532e9105dfb95cd2578367efb48d860a183a35a0"; + sha256 = "181m78c0m1ldnkpng0sps9fbkpq5j4p57j0km34g5kwasxhmwfcc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5598,7 +5731,7 @@ self: { mkDerivation { pname = "GA"; version = "1.0"; - sha256 = "e2c21dc7fa622c65e61cfa77092a5c2d67a171bb0b3b08b35560fb23e0bd55db"; + sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2"; libraryHaskellDepends = [ base directory random transformers ]; homepage = "http://boegel.kejo.be"; description = "Genetic algorithm library"; @@ -5610,7 +5743,7 @@ self: { mkDerivation { pname = "GGg"; version = "0.1.0.2"; - sha256 = "07864913862ad112531cf0d508da2d7a907521ce5160ce7b24fbd41fd2003f89"; + sha256 = "129z0391zm7v4ixwwq2irqhpb43s5pd0imgh3i9i5l9ahq9lk1h7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bimap ]; @@ -5625,7 +5758,7 @@ self: { mkDerivation { pname = "GHood"; version = "0.0.6"; - sha256 = "116b3974cd7e3600fd3724a74e08565edaeda92748156d7a21dd85563cb93b59"; + sha256 = "0n9vp4y5d1fx45x6s5a84ylyvnjyaq44x9r46zyh0dkyrms3jsqi"; libraryHaskellDepends = [ array base process ]; homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood"; description = "A graphical viewer for Hood"; @@ -5637,7 +5770,7 @@ self: { mkDerivation { pname = "GLFW"; version = "0.5.2.5"; - sha256 = "37c1d72bd878e9e58b8e4180f82aa5742a216bd92fd63c9da3d7e4e9b5e03a09"; + sha256 = "029sw2sykr6plffkrmigv5mj2aklllmgi021is5ybsbqv0mxgh9p"; libraryHaskellDepends = [ base OpenGL ]; librarySystemDepends = [ libX11 mesa ]; homepage = "http://haskell.org/haskellwiki/GLFW"; @@ -5650,7 +5783,7 @@ self: { mkDerivation { pname = "GLFW-OGL"; version = "0.0"; - sha256 = "20244bc81b86c79b4090dbffdb91cd4d4a495454acaf483795606574dbbb1085"; + sha256 = "118hpgdp8rb0jlvlibxcaia4jjjdrn8xpzyvj109piw63g44n910"; libraryHaskellDepends = [ base mtl OGL ]; librarySystemDepends = [ libX11 libXrandr ]; homepage = "http://haskell.org/haskellwiki/GLFW-OGL"; @@ -5666,7 +5799,7 @@ self: { mkDerivation { pname = "GLFW-b"; version = "1.4.8.1"; - sha256 = "438a49ec5cf6cbda95966fcc42750b9245f54fe7daf69a6493e7703c3f178ae9"; + sha256 = "1sca2wzkqw77jdj9mxnswx7zaicj1dsl5k3gjsaxmjznbkn4k2j3"; libraryHaskellDepends = [ base bindings-GLFW ]; testHaskellDepends = [ base bindings-GLFW HUnit test-framework test-framework-hunit @@ -5682,7 +5815,7 @@ self: { mkDerivation { pname = "GLFW-b-demo"; version = "1.0.6"; - sha256 = "a9f8857a185dcb4f82601611dfd4a4a5dad160227898a3d5a8c0e0b1f5020e07"; + sha256 = "01qf0bsv3q60m3as763q49hd3nm5lkady48nc214zjsx31x8by59"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5698,7 +5831,7 @@ self: { mkDerivation { pname = "GLFW-task"; version = "0.2.0"; - sha256 = "170544aab07174a107a6d236f159fe20e178feaba622b517917ce86e6ee71184"; + sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p"; libraryHaskellDepends = [ base GLFW monad-task OpenGL transformers ]; @@ -5713,7 +5846,7 @@ self: { mkDerivation { pname = "GLHUI"; version = "1.1.0"; - sha256 = "4a012b29ff3de29399efeea269773906d5b2f56a9eee925b37ecf30ccde07d10"; + sha256 = "043xw36hrwzc6xdr5vlydbsv5m8675vnk8pfxycr7qixzwljn0aa"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; @@ -5728,7 +5861,7 @@ self: { mkDerivation { pname = "GLM"; version = "0.7.0.0"; - sha256 = "2af28493755e53164ffcfe236fd5e071a2591ab3130ec1645cee1fe6dec0035c"; + sha256 = "0p03q3gfc7zfbijc23hkncd5k8kiw3any8zyzi7iclsyfn9q9wia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5754,7 +5887,7 @@ self: { mkDerivation { pname = "GLMatrix"; version = "0.1.0.1"; - sha256 = "64f3be373987c3fd41bfba94a68701b414e35ed2fb75862654e3504f6f06c88e"; + sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4"; libraryHaskellDepends = [ base OpenGLRaw ]; homepage = "https://github.com/fiendfan1/GLMatrix"; description = "Utilities for working with OpenGL matrices"; @@ -5767,7 +5900,7 @@ self: { mkDerivation { pname = "GLURaw"; version = "2.0.0.3"; - sha256 = "582cf8c0c1b8c0123ee9a8a06eba65fffded6decfe4e2e08bfea308f55f7ccee"; + sha256 = "1vncyxaqyc7apw42wkpyxinyvzgzcnx6x858x4z15h5qq70ghb2q"; libraryHaskellDepends = [ base OpenGLRaw transformers ]; librarySystemDepends = [ freeglut mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -5781,8 +5914,8 @@ self: { }: mkDerivation { pname = "GLUT"; - version = "2.7.0.11"; - sha256 = "da270ef3027f48fd62115e6f1e90a44334e3da5524e4619dbab6d186f5511b5d"; + version = "2.7.0.12"; + sha256 = "1dgix79r8jdp0b2ncx14v6abaqcanr3y91h1zr954vl3kyyidxb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5801,7 +5934,7 @@ self: { mkDerivation { pname = "GLUtil"; version = "0.9.1.1"; - sha256 = "be780905be2f45683bb7ea702ac87f7c9b30d7cfeadc0fce9d5a9d989533a38c"; + sha256 = "13536fari7askp70zp7arzbk16vwgz42lw7anwxnhi9gpq2hjy5y"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -5817,7 +5950,7 @@ self: { mkDerivation { pname = "GPX"; version = "0.8.0"; - sha256 = "f306dd0720b718ccfe4a78354089947da8ae195835d36a01e9f2ad8028a11b23"; + sha256 = "08qvl4l81bgjx40nmlrmb0csxa3xjj4l0dbq9bzcq65p403xs1pk"; libraryHaskellDepends = [ base comonad comonad-transformers containers data-lens hxt newtype xsd @@ -5834,8 +5967,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.1.8"; - sha256 = "236735a9ed98628d70c66f153378ff8a8b6e84c6e3d9ede1c1d0c2cc66e1fbca"; + version = "2.2.1"; + sha256 = "1g5712apfv1jzi12shpzfp16274gfbjgf7r49fp1dawxnj8j734g"; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear transformers @@ -5843,6 +5976,7 @@ self: { homepage = "https://github.com/tobbebex/GPipe-Core#readme"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-Collada" = callPackage @@ -5850,7 +5984,7 @@ self: { mkDerivation { pname = "GPipe-Collada"; version = "0.1.4"; - sha256 = "1c3ed97d4b4c0ad4b13d64d8d90af0e68efcc6e1179ccbe2e918f407caf61b2b"; + sha256 = "0aqvyv50gx0qx7icp70pw73gr3p6y05dkn347nqx82jc9dyxjghw"; libraryHaskellDepends = [ array base containers GPipe HaXml mtl Vec ]; @@ -5867,7 +6001,7 @@ self: { mkDerivation { pname = "GPipe-Examples"; version = "0.1"; - sha256 = "33ecb768e19336cf88a5468da0d7d30ce7514842df6c1a71adb0cc0aba132347"; + sha256 = "0ir32fx0mk5hmmqilv6z89453rqcsgbs13a6ln4cydlkw5lbgv1k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5879,19 +6013,12 @@ self: { }) {}; "GPipe-GLFW" = callPackage - ({ mkDerivation, base, exception-transformers, GLFW-b, GPipe - , transformers - }: + ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.3.0"; - sha256 = "f929bfa320a76ca8c9769bf38b9de6b8928b9ef63f9b09c31a9dfe209f8826b6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; - executableHaskellDepends = [ - base exception-transformers GPipe transformers - ]; + version = "1.4.1"; + sha256 = "0is6f58rs68pqnhqr26wj0nsaf2m6x40iaxvlq1w4m62f8n1g1kb"; + libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; @@ -5903,7 +6030,7 @@ self: { mkDerivation { pname = "GPipe-TextureLoad"; version = "1.0.4"; - sha256 = "644d39d318636749cd206275e7fde89a77fecb656ad21dad1744deedc724c7f9"; + sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4"; libraryHaskellDepends = [ base bitmap GPipe stb-image ]; homepage = "http://www.haskell.org/haskellwiki/GPipe"; description = "Load GPipe textures from filesystem"; @@ -5918,7 +6045,7 @@ self: { mkDerivation { pname = "GTALib"; version = "0.0.6"; - sha256 = "e837e1ee368df4a9d2bdbceea7612c27806f56ac1004c9d6ddec358e2c178782"; + sha256 = "10l72wn8wdgcvpbcj10hmib6z0175ihsgvmwpp9akx4d6vpf2dz8"; libraryHaskellDepends = [ base containers deepseq parallel template-haskell ]; @@ -5940,7 +6067,7 @@ self: { mkDerivation { pname = "Gamgine"; version = "0.5.1"; - sha256 = "ed466cb5abcbe273296c0f7d25f7399ea025b390e63038d4179e94515a6c591f"; + sha256 = "07srdid5354y2za3hc76j2rjb84y77vjaz8gdhlp7qnbmfsnqipd"; libraryHaskellDepends = [ array base bytestring composition cpphs data-lens directory filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show @@ -5958,7 +6085,7 @@ self: { mkDerivation { pname = "Ganymede"; version = "0.0.0.5"; - sha256 = "93b385f9ddb38854b724d760fdfc7239feeab118af3dba73f7414cd7ae33abba"; + sha256 = "1fmb6fpdfk21yxrvlgdg32qymzirfbygsq6p4jvm925kvpwqbcwk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5975,7 +6102,7 @@ self: { mkDerivation { pname = "GaussQuadIntegration"; version = "0.1"; - sha256 = "a2dfacf200b0dbfafd4c76e7e0c75532d46dec59db42f2fac5680c902ac0216d"; + sha256 = "0v91q0m90338qpxg4hnvb7n6vm1jap3y1rvn9kyzmnxh03rarpx2"; libraryHaskellDepends = [ base ]; description = "Non-adaptive Gaussian quadrature for numeric integraton"; license = stdenv.lib.licenses.bsd3; @@ -5986,7 +6113,7 @@ self: { mkDerivation { pname = "GeBoP"; version = "1.7.5"; - sha256 = "fdf0a97c6c81fbb88973e20167535959bbe0e781af69380ec1c44dc78b665093"; + sha256 = "14shcs5wfkf4q473hsdgh7ky1fsrb59nf0g2ff4viyw1diyakw7x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -6008,7 +6135,7 @@ self: { mkDerivation { pname = "GenI"; version = "0.24.3"; - sha256 = "17d041ad0816d799e2697ad785a479ee176c62c8e1994ae4c3bd7b25cc78b13e"; + sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6037,7 +6164,7 @@ self: { mkDerivation { pname = "GenSmsPdu"; version = "0.1"; - sha256 = "7fb12d37fcddcd8f3551a677bc8701cb0711e8fd00c5a13163f5a04bd1a941ef"; + sha256 = "1vs1m78lp87mccqs3i80zpl121yb063vqxx6a4sqzkfxzhvjvcbz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 QuickCheck random ]; @@ -6053,7 +6180,7 @@ self: { mkDerivation { pname = "Genbank"; version = "1.0.3"; - sha256 = "2baf631ac851b1c29ba531ae1c16b8ba3c4b672bac9d4840a3b9afc0a89d2b93"; + sha256 = "14rbknlc1bxrld04i7dc5dklng5sp0b1rbiilndw5cair0d67brb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6064,12 +6191,39 @@ self: { license = "GPL"; }) {}; + "Gene-CluEDO" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionSet, base, cmdargs, containers + , filepath, FormalGrammars, log-domain, PrimitiveArray + , PrimitiveArray-Pretty, QuickCheck, ShortestPathProblems, tasty + , tasty-quickcheck, tasty-th, text, vector + }: + mkDerivation { + pname = "Gene-CluEDO"; + version = "0.0.0.1"; + sha256 = "045h6p6n5rw6qb498hrgzgfddlj5hiij3zmbbs6p9nb9c6h03y48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion ADPfusionSet base containers filepath FormalGrammars + log-domain PrimitiveArray PrimitiveArray-Pretty + ShortestPathProblems text vector + ]; + executableHaskellDepends = [ base cmdargs filepath ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/Gene-CluEDO"; + description = "Hox gene clustering"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GeneralTicTacToe" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "GeneralTicTacToe"; version = "0.1.0.1"; - sha256 = "6f128cac6cdba15f1328dbb3bb55333b7e9cbb0a277de9a99144ff32a12ecf36"; + sha256 = "0dng5shk5zs4j6lyjz971axrqziv6davpcyv509mz8fvdjn8q4kg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -6084,7 +6238,7 @@ self: { mkDerivation { pname = "GenericPretty"; version = "1.2.1"; - sha256 = "175e334292904d365c630c9dfcc5a94f0c052a88a10d34513f39ebc36205672d"; + sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php"; libraryHaskellDepends = [ base ghc-prim pretty ]; homepage = "https://github.com/RazvanRanca/GenericPretty"; description = "A generic, derivable, haskell pretty printer"; @@ -6101,7 +6255,7 @@ self: { mkDerivation { pname = "GenussFold"; version = "0.0.0.2"; - sha256 = "55031cfaec4c75852f3c4796fbd97afb7d156eca00a9ceb7b56718c50785daaf"; + sha256 = "1byshl3wa637nnvwxa80r9p1azgvgbczp5j77hpqaxacxkx1q0sm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6125,7 +6279,7 @@ self: { mkDerivation { pname = "GeoIp"; version = "0.3"; - sha256 = "a1767993ed9d3d5ac0413c23268443ec65d3c7a26f77f5165799e1c345a973e0"; + sha256 = "1q3km52w7qcrawbgaxvglb3x6rgc8f22c8rw8705lgcxxn9pjxm1"; libraryHaskellDepends = [ base bytestring bytestring-mmap syb ]; description = "Pure bindings for the MaxMind IP database"; license = "unknown"; @@ -6137,7 +6291,7 @@ self: { mkDerivation { pname = "GeocoderOpenCage"; version = "0.1.0.1"; - sha256 = "ab70cbd8a73d45b6ed8c4d692e39e54180def339f29ff1ba9671f24d07e7bab0"; + sha256 = "1c5sww3lvwkijsxg37zj77rxx021wlwjwsadiknvci9xlzccnw5b"; libraryHaskellDepends = [ aeson base bytestring HTTP text ]; homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git"; description = "Geocoder and Reverse Geocoding Service Wrapper"; @@ -6150,7 +6304,7 @@ self: { mkDerivation { pname = "Geodetic"; version = "0.4"; - sha256 = "18a1d666a09672dcd295841a9abbdc86262797557be532f8f30fe3a461c160d9"; + sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q"; libraryHaskellDepends = [ base ]; homepage = "http://code.google.com/p/geodetic/"; description = "Geodetic calculations"; @@ -6162,7 +6316,7 @@ self: { mkDerivation { pname = "GeomPredicates"; version = "0.1"; - sha256 = "9ef18e39d9eda521e942198917914143b3303621975d13f64c3e7928608e4ca7"; + sha256 = "19scirh2hy9y9kv16pcp44v31cs3868ig28r8blj39gdv4wqxwcy"; libraryHaskellDepends = [ base ]; description = "Geometric predicates"; license = stdenv.lib.licenses.bsd3; @@ -6173,7 +6327,7 @@ self: { mkDerivation { pname = "GeomPredicates-SSE"; version = "0.2"; - sha256 = "9875982121d1260ab6441e4c89771489a676808431e95ad4a473eb208553ada2"; + sha256 = "18mdaf2j1svklka5ms9ihj07d9l92ivqjk0y8jv0l9ni44hrhxcq"; libraryHaskellDepends = [ base GeomPredicates ]; description = "Geometric predicates (Intel SSE)"; license = stdenv.lib.licenses.bsd3; @@ -6185,7 +6339,7 @@ self: { mkDerivation { pname = "GiST"; version = "0.0.1"; - sha256 = "2e450cc29ff9bf7b6021c35ddb1b92a0dafb98c74fd8535040ed9e78b1d47b7a"; + sha256 = "0ykvsjqpi7pd81857n2gqycgpnm0j8dxnpf345h7pgzrkz10qi9f"; libraryHaskellDepends = [ base text ]; description = "A Haskell implementation of a Generalized Search Tree (GiST)"; license = "GPL"; @@ -6199,7 +6353,7 @@ self: { mkDerivation { pname = "Gifcurry"; version = "2.1.0.0"; - sha256 = "51cf0949e4ea0ae9503887c0c8613d4bfee0b4bdce1d641cf0b2fd016124170c"; + sha256 = "030p4ihh3zdjy0f687ffpnsf1zjb7mhwih47718fj2pawi4hkksi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6219,7 +6373,7 @@ self: { mkDerivation { pname = "GiveYouAHead"; version = "0.2.2.3"; - sha256 = "6ec9389736df70f4b3fea2c897f0befc32cde16fceb955c1aad2f2270cf5c981"; + sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf"; libraryHaskellDepends = [ base directory extra old-time process ]; homepage = "https://github.com/Qinka/GiveYouAHead/"; description = "to auto-do somethings"; @@ -6234,7 +6388,7 @@ self: { mkDerivation { pname = "Glob"; version = "0.7.14"; - sha256 = "2837b88916e8ba4314fdbb556de8b0e7f577b848d3e80a08959b6ef47e1c842b"; + sha256 = "0aw43izg8vlvjl40ms6k92w7gxg7n3l6smdvzla47fp82s4vhdr8"; libraryHaskellDepends = [ base containers directory dlist filepath transformers transformers-compat @@ -6249,12 +6403,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_8_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.8.0"; + sha256 = "15p8nbi19mhl3iisngbawmdpvk8paaqq4248fqgan63q1sz13w1q"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { pname = "GlomeTrace"; version = "0.3"; - sha256 = "13b85492c285586f3075758e38ecad9bf9657073db01a4869fda21a329482258"; + sha256 = "0n1290ls68fsky3a80fvfdq6bycvmpn3i3kmflq6yn45qa959f0k"; libraryHaskellDepends = [ array base GlomeVec ]; homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Ray Tracing Library"; @@ -6267,7 +6445,7 @@ self: { mkDerivation { pname = "GlomeVec"; version = "0.2"; - sha256 = "201884b98a49cc0fa63799fc85b1852451733feebb87f242d3acce359b8a1e22"; + sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610"; libraryHaskellDepends = [ array base ]; libraryPkgconfigDepends = [ llvm ]; homepage = "http://www.haskell.org/haskellwiki/Glome"; @@ -6283,7 +6461,7 @@ self: { mkDerivation { pname = "GlomeView"; version = "0.3"; - sha256 = "784dd0a7e7b9e0b3536568012a05c5cda85e844512bf8e2b9a4dbd84c4a28f5e"; + sha256 = "0plglb289gadk8mqxgqj8n25xa6dql2jl0b8cm9v7q5rwykx0kbq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -6300,7 +6478,7 @@ self: { mkDerivation { pname = "GoogleChart"; version = "0.2"; - sha256 = "691b8271ce7c791ae17fffda24ed2c319f85f9b4d3669d0a79f529629b5eca71"; + sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9"; libraryHaskellDepends = [ base ]; homepage = "http://neugierig.org/software/darcs/browse/?r=google-chart;a=summary"; description = "Generate web-based charts using the Google Chart API"; @@ -6314,7 +6492,7 @@ self: { mkDerivation { pname = "GoogleCodeJam"; version = "0.0.3"; - sha256 = "e08209b95b264757ce8c4fc1422059c09910b38a4bdd22f6d4e51b24ab1cabdc"; + sha256 = "1p5b3jmj86z5skv25pabiari16f0b4h45hagik75fir6bfwhk0p0"; libraryHaskellDepends = [ array base containers mtl parallel safe split transformers ]; @@ -6330,7 +6508,7 @@ self: { mkDerivation { pname = "GoogleDirections"; version = "0.3.0.1"; - sha256 = "63c9350e9b970f96d5ccd57f86a0f45b954b145a38c37181c94629e4a338f3f4"; + sha256 = "1x7k72iy8aa6r60p3hrqb8a4p5avyjh8czymrkarc3wpkc73bjb3"; libraryHaskellDepends = [ AttoJson base bytestring containers dataenc download-curl ]; @@ -6347,7 +6525,7 @@ self: { mkDerivation { pname = "GoogleSB"; version = "0.1"; - sha256 = "880bb8b2a648de24e752457711e5f65f6e154098edf3a1a08db8a72c59bfd2bd"; + sha256 = "1gfjpxcjr9xqinha3wzdk101avjzyvji2xs5abkj9pj8lsrbh2w8"; libraryHaskellDepends = [ base binary Crypto haskell98 HTTP mtl network split ]; @@ -6361,7 +6539,7 @@ self: { mkDerivation { pname = "GoogleSuggest"; version = "0.0.4"; - sha256 = "2b4b276e2f5d2a728ac8d2e9d617febbbe5f1e6de16c034a9ee07a127f6a0ecb"; + sha256 = "1jqfd9zi4yp0kr506v71dlg5zgmvzqbxdsfjr2574ajx5xp2fjrb"; libraryHaskellDepends = [ base dataenc download-curl utf8-string xml ]; @@ -6376,7 +6554,7 @@ self: { mkDerivation { pname = "GoogleTranslate"; version = "0.0.5"; - sha256 = "46b1c5f78a0752cdb285383b97e8c66427a811dc8bdd028967b9747bbecc2043"; + sha256 = "0hr0rjz7nx5rcy4h5pcbvh8sh9v4qvl9ffrqhnrcslh7ibvwbca6"; libraryHaskellDepends = [ AttoJson base bytestring dataenc download-curl ]; @@ -6390,7 +6568,7 @@ self: { mkDerivation { pname = "GotoT-transformers"; version = "1.0.0.1"; - sha256 = "1e7ed7020302f606e7a172709a2e4b50e2bf50a9900b00328db1d9cbc40d3cf0"; + sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/gcross/GotoT-transformers"; description = "A monad and monadic transformer providing \"goto\" functionality"; @@ -6403,7 +6581,7 @@ self: { mkDerivation { pname = "Grafos"; version = "0.1.0.0"; - sha256 = "1df102c60f5874fb7afaf4b1ab73663d998165a09628f70711c3fba2afc9f498"; + sha256 = "167lr6ps5yy3243zfa4nl1jq369xcrrspcglz9xgnx2q1z305w8x"; libraryHaskellDepends = [ base ]; description = "Grafos Haskell"; license = stdenv.lib.licenses.bsd3; @@ -6417,8 +6595,8 @@ self: { }: mkDerivation { pname = "GrammarProducts"; - version = "0.1.1.2"; - sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2"; + version = "0.1.1.3"; + sha256 = "1mr5pdm0nprs997vq7xdk7f5m85pdyncgs8qnfy2fjcs5zl8zzr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6439,7 +6617,7 @@ self: { mkDerivation { pname = "Graph500"; version = "0.4.0"; - sha256 = "a99c2fdf01f89b35a3060691e16eca607c21337faed4025f220921424a161652"; + sha256 = "0lhn2r54488949gh5m5fgwrj2z30r9pf34860sikb6zq07gjz759"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6457,7 +6635,7 @@ self: { mkDerivation { pname = "GraphHammer"; version = "0.3"; - sha256 = "f5df913589a8c32d94c30385866097efb0bc8a24f094f866ddd4a3e1c51bea39"; + sha256 = "0fga3g2y38ylvmkgi57h4j5brc7gjxh8d183qfa2vhx8i4sr3pzm"; libraryHaskellDepends = [ array base containers Graph500 mtl stm time ]; @@ -6473,7 +6651,7 @@ self: { mkDerivation { pname = "GraphHammer-examples"; version = "0.3"; - sha256 = "bbd93fe66d79ca604a9dabafa43050325da0f28711ea09dfb60d618b406ee1a2"; + sha256 = "18p1dr08nq8dnvghkshihzra0p9ja0qa9bxbkm561jkrdpk3zndv"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -6489,7 +6667,7 @@ self: { mkDerivation { pname = "GraphSCC"; version = "1.0.4"; - sha256 = "789d93e6188845f009779b1c800b043f524587a21d324be8594d09b0f8e86cf1"; + sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq"; libraryHaskellDepends = [ array base containers ]; description = "Tarjan's algorithm for computing the strongly connected components of a graph"; license = stdenv.lib.licenses.bsd3; @@ -6497,16 +6675,15 @@ self: { "Graphalyze" = callPackage ({ mkDerivation, array, base, bktrees, containers, directory, fgl - , filepath, graphviz, old-locale, pandoc, process, random, text - , time + , filepath, graphviz, pandoc, process, random, text, time }: mkDerivation { pname = "Graphalyze"; - version = "0.14.1.1"; - sha256 = "9792207d74f5aff52b3e5b83378db480702b8b5e1b13e65113e2f32e7687ce9f"; + version = "0.15.0.0"; + sha256 = "1hw635fnpiylwf5vhxbxy9wrcp6qnadb1npi9zhk42akbnvzqh5c"; libraryHaskellDepends = [ array base bktrees containers directory fgl filepath graphviz - old-locale pandoc process random text time + pandoc process random text time ]; description = "Graph-Theoretic Analysis library"; license = "unknown"; @@ -6520,7 +6697,7 @@ self: { mkDerivation { pname = "Grempa"; version = "0.2.2"; - sha256 = "2eec38e7f2da31c08dbbd830fabb5ef5fbb8bbbd7de77b172ba57088e6ba0a70"; + sha256 = "0w0apbk8hw555cbpprvxpnxviyzmbsxzlc6qpf6w0cfsybkkiv1f"; libraryHaskellDepends = [ array base containers mtl QuickCheck template-haskell th-lift ]; @@ -6536,7 +6713,7 @@ self: { mkDerivation { pname = "GroteTrap"; version = "0.5.2"; - sha256 = "9c5197b6db4257c9def0f6f10c777dbe47ac73b3fd1864042b2ea9aa645ae270"; + sha256 = "0w72b9jama9f5c26867xndrsqixygmvhrwgny3gcjms2vfv9flcw"; libraryHaskellDepends = [ base mtl parsec syb ]; testHaskellDepends = [ base mtl parsec QuickCheck test-framework @@ -6557,9 +6734,9 @@ self: { mkDerivation { pname = "Grow"; version = "1.1.0.3"; - sha256 = "74acf9500f2a221b8cf9372739839516326c5845dc5b4531329bedef8aa584ed"; + sha256 = "1vc4ln5fzvcv68qlanyw8mc6qchnjn1kj9rpz661n8ia1x8gkb3l"; revision = "3"; - editedCabalFile = "e599aab8eefc612bbf1dbae0b60308305a9d3009dda186b228e4e8aeeda1f36a"; + editedCabalFile = "0spkl7nsxs7452r8d8fx14q9snih101vdq5s3nzjnqgwxswam6g5"; libraryHaskellDepends = [ array base bytestring clock containers deepseq definitive-base definitive-filesystem definitive-parser definitive-reactive @@ -6578,7 +6755,7 @@ self: { mkDerivation { pname = "GrowlNotify"; version = "0.4"; - sha256 = "055ae38bf888d1dd11a131e86c1d6cc0a4df85458faf25790433206ada08a28e"; + sha256 = "13m213d6l81k0iwjbbwg8n2xz960dhfnrs1il48xvlc8z25y6nh5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6599,7 +6776,7 @@ self: { mkDerivation { pname = "Gtk2hsGenerics"; version = "0.1"; - sha256 = "89166eb91f8af40e203b7fd158ea0065abe0bd6168301b47dc781c6f7d3947be"; + sha256 = "1gj775yny73qvi3inc38c6yy1av503m5ilbz7ch0xx4a3ywnw5l9"; libraryHaskellDepends = [ array base cairo containers glib gtk haskell98 mtl ]; @@ -6615,7 +6792,7 @@ self: { mkDerivation { pname = "GtkGLTV"; version = "0.2.0"; - sha256 = "e2d669c240b5d22cce22350b2808a3c0ed6a5de535564fbf742edf62d41b6cf6"; + sha256 = "1xkc3ga65prffjzlymimwmfnmvf0lc42h2rm4b72rlmm8316kmp2"; libraryHaskellDepends = [ base bitmap bitmap-opengl gtk gtkglext GtkTV OpenGL stb-image time ]; @@ -6629,7 +6806,7 @@ self: { mkDerivation { pname = "GtkTV"; version = "0.2.0"; - sha256 = "2898ec9cd89c8aa6efda5578bdd46537c9bef19624771df096738cf21e45bd4b"; + sha256 = "0jxx8lgg533kjvq1sxr4jvqvxj9pcpabsy2mvbpsd2lwv2ffr618"; libraryHaskellDepends = [ base gtk time TV TypeCompose vector-space ]; @@ -6645,7 +6822,7 @@ self: { mkDerivation { pname = "GuiHaskell"; version = "0.1.1"; - sha256 = "214c2fd5d3bf0c49006e597c2a90b142f68f0f66cc9951517b58ef45edcafee5"; + sha256 = "1rgyrbnlbvsqgd8m36fccq7qzxj2n682lz2rdq04j35zsgajyk11"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -6663,7 +6840,7 @@ self: { mkDerivation { pname = "GuiTV"; version = "0.4"; - sha256 = "b1ac48b2769fee02b86260635f627180fe9af90f45ee11196a000f54fb6ab696"; + sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i"; libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ]; homepage = "http://haskell.org/haskellwiki/GuiTV"; description = "GUIs for Tangible Values"; @@ -6678,7 +6855,7 @@ self: { mkDerivation { pname = "H"; version = "0.9.0.1"; - sha256 = "5fc04dfefcac9f6882cea9e65755479f7b1d853618c89258a005df63c8d57134"; + sha256 = "0d3isp467pq5l1c95j0q6s2isywz8xamgrm9rs16i7xczkz4vh2z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -6696,7 +6873,7 @@ self: { mkDerivation { pname = "HARM"; version = "0.1.4"; - sha256 = "568e218d1f488b5aea1a6287a03fb48334dea9d0e3c6455dcada625025208d56"; + sha256 = "0mld40jm0qnsr9flbip3s2lxwd43nhzs11v23bm5m2s83y6j33jn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -6714,7 +6891,7 @@ self: { mkDerivation { pname = "HAppS-Data"; version = "0.9.3"; - sha256 = "b23c6f4a949927194e47f9781edc3b7d38513210de4a24987859d68b375bc335"; + sha256 = "0df3bcvqpmjrg2c28jny20r52f3x7gf1wy7r8x71j9wrji56yg5j"; libraryHaskellDepends = [ base binary bytestring containers HAppS-Util HaXml mtl pretty syb syb-with-class template-haskell @@ -6731,7 +6908,7 @@ self: { mkDerivation { pname = "HAppS-IxSet"; version = "0.9.3"; - sha256 = "ebacd72e153bbcafb18bf4fa607550de98f8a991e9cfd8314b572cacf155a372"; + sha256 = "0wm3apqsqb2p9cqxikz9j6lzi66ya1sn1yplifqszg1v2lpdgb7b"; libraryHaskellDepends = [ base containers HAppS-Data HAppS-State HAppS-Util hslogger mtl syb syb-with-class template-haskell @@ -6749,7 +6926,7 @@ self: { mkDerivation { pname = "HAppS-Server"; version = "0.9.3.1"; - sha256 = "b03129f332c35cd558b0f32bc626321dcfa2647dd7ddf67f3403eca8c4c52038"; + sha256 = "0f10qp2aiv036izzdpfpgmja5kqx68kccazkn1cdap636brjjcdh"; libraryHaskellDepends = [ base bytestring containers directory HAppS-Data HAppS-IxSet HAppS-State HAppS-Util HaXml hslogger html HTTP mtl network @@ -6770,7 +6947,7 @@ self: { mkDerivation { pname = "HAppS-State"; version = "0.9.3"; - sha256 = "5099e635f8fcf56f775947a241a24e1aab6eb6d9fee0406e6a2169c4c8b331e4"; + sha256 = "1r1ing4c8s91d9p41q7yv6v6xaqs9si438j7b5vnzxgwz0syd6ah"; libraryHaskellDepends = [ base binary bytestring containers directory filepath HAppS-Data HAppS-Util HaXml hslogger hspread mtl network old-locale old-time @@ -6788,7 +6965,7 @@ self: { mkDerivation { pname = "HAppS-Util"; version = "0.9.3"; - sha256 = "f9120d256e37111b6203dfc4eb598dd438c87e53bb9eb37258c999dd49b8e655"; + sha256 = "0mg6p14xv6f9b1rb77mvadzchf6limcypi6z0di1n49pdqjhs4pr"; libraryHaskellDepends = [ array base bytestring directory hslogger mtl old-time process template-haskell @@ -6803,7 +6980,7 @@ self: { mkDerivation { pname = "HAppSHelpers"; version = "0.11"; - sha256 = "436125f649254804fdedae02429d6d558f0e0feb976e6348639019b180819dc3"; + sha256 = "1hwxh60b26chcd466vlpxc7hx3smdnfl40mfxpyh8j1597v2aqa3"; doHaddock = false; description = "OBSOLETE. Please use happstack-helpers"; license = stdenv.lib.licenses.bsd3; @@ -6814,7 +6991,7 @@ self: { mkDerivation { pname = "HCL"; version = "1.4"; - sha256 = "34678e9e5c122544751a4d9a75585720c5ad68c0b6a772f071a4dac0dab6ee37"; + sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; @@ -6832,7 +7009,7 @@ self: { mkDerivation { pname = "HCard"; version = "0.0"; - sha256 = "8b8489edeb912833eb024bb9492e5e9db475d7b26475f4a5d52b998ad80e722f"; + sha256 = "0bvj1vc8m69bsnjz8xb4nbbpbd4xbqp4kfab0bmk6a4ixgnqk14b"; libraryHaskellDepends = [ base mtl QuickCheck random random-shuffle ]; @@ -6847,7 +7024,7 @@ self: { mkDerivation { pname = "HCodecs"; version = "0.5"; - sha256 = "b1bf109a5e0877b47eb2f942ad0d1aa2368b9c006882ba07fe345dd0a90a1756"; + sha256 = "0mhp1alx0p9lzq3vm0k802f8ndm2386sshprn9zb8xq8bsd11gxi"; libraryHaskellDepends = [ array base bytestring QuickCheck random ]; @@ -6864,9 +7041,9 @@ self: { mkDerivation { pname = "HDBC"; version = "2.4.0.1"; - sha256 = "7a3ee21c41e716111c4a3742a66eb448683719a9384afbf7021c5942ac73d2ad"; + sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks"; revision = "1"; - editedCabalFile = "da1cef4f99bc200ef3c4c866519859dfee81457aff6a8fa7418c17f210a1e7fd"; + editedCabalFile = "1zg7l48g45wc86kqyspzg92q3vnzb6c52rn8qkrhw85wk57yy76s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6885,7 +7062,7 @@ self: { mkDerivation { pname = "HDBC-mysql"; version = "0.7.1.0"; - sha256 = "81c985d4a243c965930fb412b3175ca799ba66985f8b6844014fd600df1da7cf"; + sha256 = "1kx73pgh1mjg0526i2szk1kbm6d7bhbv64ml1y9nbja3lba8bjc1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring HDBC time utf8-string ]; librarySystemDepends = [ mysqlclient openssl zlib ]; @@ -6903,7 +7080,7 @@ self: { mkDerivation { pname = "HDBC-odbc"; version = "2.5.0.1"; - sha256 = "96000a9573e873d231ca09f974c4ff0c4d7ec86d7ec6ceaaeb0cc02fc5e6de99"; + sha256 = "16fywv2jzh0cxfmcxikydp47wk8czz279y89r8qx4wz8ffahl04n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6922,7 +7099,7 @@ self: { mkDerivation { pname = "HDBC-postgresql"; version = "2.3.2.4"; - sha256 = "71988482df2efc773e8272a041f46c61bb4357aa3856edbc69d3fb9d09c168fd"; + sha256 = "1zb8q44rvyykd6yfsmiqm9bl7fv1dks4383jh8z7gz1fvy18963i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6941,7 +7118,7 @@ self: { mkDerivation { pname = "HDBC-postgresql-hstore"; version = "0.0.1.2"; - sha256 = "2dc856b0f467b0d51c93965e31784606b247eac597dffd12847185e27150a718"; + sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d"; libraryHaskellDepends = [ attoparsec base containers HDBC text ]; homepage = "https://bitbucket.org/dpwiz/hdbc-postgresql-hstore"; description = "Manipulate data in PostgreSQL \"hstore\" columns"; @@ -6954,20 +7131,33 @@ self: { mkDerivation { pname = "HDBC-session"; version = "0.1.1.0"; - sha256 = "4ad37a6c9d17b8f2f049ec4f3c4ea5efc8d866b02b226c6c066ab11153fc80b9"; + sha256 = "1fc0zi9i3cba0rn6q8ibn1kdij7glm73qkzc97qg5f0pkmn7mlsa"; libraryHaskellDepends = [ base HDBC ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Bracketed connection for HDBC"; 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 }: mkDerivation { pname = "HDBC-sqlite3"; version = "2.3.3.1"; - sha256 = "a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea"; + sha256 = "1spbhvwwyj4q7li33kvw1bsr6m1xbnxipga67s7cdgvyf2mxk0x7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ]; @@ -6985,7 +7175,7 @@ self: { mkDerivation { pname = "HDRUtils"; version = "1.0.2"; - sha256 = "0f78820cedd8e9d8a5aa4d2a0f75116bce9d73daa0b94dfba62ce28b6b9f7e66"; + sha256 = "0rkykxmqpqiclvxlvfd0v9rrvkkb25shyajdmajxisfqxl684y0g"; libraryHaskellDepends = [ array base colour containers mtl unix ]; librarySystemDepends = [ pfstools ]; homepage = "http://vis.renci.org/jeff/pfs"; @@ -6999,19 +7189,41 @@ self: { mkDerivation { pname = "HERA"; version = "0.2"; - sha256 = "5e0f047c7dccdd23c66f0992d8154d7931c8c0bf329f967040f2ac4ff8f19922"; + sha256 = "08lry7w4zb7j81q9d7rjpz0chcbr9laxi4h9dz327pfcgmy083sy"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ mpfr ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mpfr;}; + "HFitUI" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, MissingH, mtl + , process, random, shakespeare, template-haskell, text, uuid + }: + mkDerivation { + pname = "HFitUI"; + version = "0.1.1.0"; + sha256 = "03v03adcqyf0ppbhx8jxmp1f4pzmqs5s43as21add2yl13rkwzm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html blaze-markup MissingH mtl process random + shakespeare template-haskell text uuid + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/iqsf/HFitUI.git"; + description = "The library for generating a graphical interface on the web"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HFrequencyQueue" = callPackage ({ mkDerivation, base, c-storable-deriving }: mkDerivation { pname = "HFrequencyQueue"; version = "0.2.0.0"; - sha256 = "b03c5de4cbb14d379f3555698a03a076fb2d10c748c2a7054b83c74f95e30626"; + sha256 = "09h6wfalziw39c2sghj8qw82vyvnl01qlsam6ngkfkdirgj5sg5h"; libraryHaskellDepends = [ base c-storable-deriving ]; homepage = "https://github.com/Bellaz/HfrequencyList"; description = "A Queue with a random (weighted) pick function"; @@ -7024,7 +7236,7 @@ self: { mkDerivation { pname = "HFuse"; version = "0.2.4.5"; - sha256 = "e28e0689dfe5f7bc312b842adb02e172b56c3f53a1819ebda7ab39eace6c24a1"; + sha256 = "1894dk7flfdblyyrx0d1acznrdbjw41dnal45cqvrxz5vy4hd3p2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring unix ]; @@ -7035,6 +7247,7 @@ self: { homepage = "https://github.com/m15k/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fuse;}; "HGE2D" = callPackage @@ -7043,7 +7256,7 @@ self: { mkDerivation { pname = "HGE2D"; version = "0.1.9.2"; - sha256 = "7b19fae05b9e60c03244f80abd46865ac7387f8fdb8ddadf24a199f44f507c65"; + sha256 = "0rbwa17z96d14kgxm3fvixzkiisshr3bs2pq8hrc0q4ybghgl6bv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLUT OpenGL safe time ]; @@ -7060,7 +7273,7 @@ self: { mkDerivation { pname = "HGL"; version = "3.2.3.1"; - sha256 = "d05dee7a9ebc45aba82922707c29033ca491a58adb88a63ab180d7459b163e55"; + sha256 = "0m9y2sdlbmw0n4xad26viajr391w0clpqw1256lanidwkrxfwpfh"; libraryHaskellDepends = [ array base X11 ]; description = "A simple graphics library based on X11 or Win32"; license = stdenv.lib.licenses.bsd3; @@ -7073,7 +7286,7 @@ self: { mkDerivation { pname = "HGamer3D"; version = "0.8.0"; - sha256 = "0c4f3277172120510faa8ca00b1400f5b0e74aab59fa84b7968f51f2868be99c"; + sha256 = "1779if3g4lcgjsvq9yjrmd5fgc7m00a0p84cm87m28112xvk4kqc"; libraryHaskellDepends = [ base bytestring cereal clock containers directory filepath fresco-binding messagepack text vect @@ -7091,7 +7304,7 @@ self: { mkDerivation { pname = "HGamer3D-API"; version = "0.1.6"; - sha256 = "b4603062e5a57617161bcf481a43bdebaeab23bbe518964996d98d3fc0889293"; + sha256 = "14wji303z3frjr4rc675pcispbpbpm1ilj6g3cb1fxm5wmi30q5l"; libraryHaskellDepends = [ base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding HGamer3D-SFML-Binding @@ -7109,7 +7322,7 @@ self: { mkDerivation { pname = "HGamer3D-Audio"; version = "0.5.0"; - sha256 = "6d296833e48616d0b5185b28108755814b235123e669d6db11810b2b3798df7d"; + sha256 = "0zfzk0vjn2w127dxcsg64d8j6jw1an3i0a2v32sx05l6whrnhabd"; libraryHaskellDepends = [ base containers HGamer3D-Common HGamer3D-Data HGamer3D-SFML-Binding ]; @@ -7124,7 +7337,7 @@ self: { mkDerivation { pname = "HGamer3D-Bullet-Binding"; version = "0.2.1"; - sha256 = "1e92883b5f9233a0d38b6a7382b42955d9ab9f911824cda273cd94fac24592c6"; + sha256 = "1ilj8p1gm56dffics90qj6gspnam56s84wvaig9s0cwjbwxqi4hy"; libraryHaskellDepends = [ base HGamer3D-Data ]; homepage = "http://www.hgamer3d.org"; description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings"; @@ -7138,7 +7351,7 @@ self: { mkDerivation { pname = "HGamer3D-CAudio-Binding"; version = "0.1.5"; - sha256 = "41f9a22c27d9e64bc9bbbbdca58b97c7674df1321abdb0e05391406ba173c9e0"; + sha256 = "1q69ffhnnh4iaghb1g8s6bqlsry7jy5sbp5vpg4lprnr4wna5ya1"; libraryHaskellDepends = [ base haskell98 HGamer3D-Data ]; librarySystemDepends = [ HGamer3DCAudio015 ]; homepage = "http://www.althainz.de/HGamer3D.html"; @@ -7154,7 +7367,7 @@ self: { mkDerivation { pname = "HGamer3D-CEGUI-Binding"; version = "0.5.0"; - sha256 = "a0a16eb06532ce9b3913eb6e56405ee485e1ae16a5ec4d05f4882663a57a07d2"; + sha256 = "1lh7gajn69l8yh2lvv552spf31g4br05cvpb2cwrpkijcnq6x8d0"; libraryHaskellDepends = [ base HGamer3D-Data ]; librarySystemDepends = [ CEGUIBase CEGUIOgreRenderer hg3dcegui050 @@ -7173,7 +7386,7 @@ self: { mkDerivation { pname = "HGamer3D-Common"; version = "0.5.0"; - sha256 = "706a8256cdeaa39e8c6df5aa13323777ed3be854e17169c0934b53484e428bce"; + sha256 = "1klb8974hlsbjg06jwg1akl3pvbp6wr17apmdn69x8zarmb84skh"; libraryHaskellDepends = [ base clock containers directory filepath FindBin HGamer3D-Data stm vect @@ -7191,7 +7404,7 @@ self: { mkDerivation { pname = "HGamer3D-Data"; version = "0.5.0"; - sha256 = "ffad03adf90ccf28d1f0237de6267247c637a5badd11203c1e66a7914609c10c"; + sha256 = "0361153939v63qy204fxpajkgij7f8kfcz93y38jikqcz6nh7bgz"; libraryHaskellDepends = [ base clock containers directory filepath FindBin stm vect ]; @@ -7206,7 +7419,7 @@ self: { mkDerivation { pname = "HGamer3D-Enet-Binding"; version = "0.5.0"; - sha256 = "8d7785b24bf4f73b854ee01ecb8568eb5f35f393e7ad6953deac6a3f0e50b628"; + sha256 = "0a5na073ysmcvr9nkbg7jgrkapzbd22wn7p09s2kpxzl9fr8axwd"; libraryHaskellDepends = [ base HGamer3D-Data ]; librarySystemDepends = [ enet hg3denet050 ]; homepage = "http://www.hgamer3d.org"; @@ -7222,7 +7435,7 @@ self: { mkDerivation { pname = "HGamer3D-GUI"; version = "0.4.0"; - sha256 = "4daf0c73e79ed5816f9e8c4705c55bb46a788ea69bdf37c1a011a4c4cd33d200"; + sha256 = "006j6g6w990il30kgpwvls77hsmlbg2haiwckrpq3mcywxrhrbsd"; libraryHaskellDepends = [ base HGamer3D-CEGUI-Binding HGamer3D-Data HGamer3D-WinEvent split ]; @@ -7241,7 +7454,7 @@ self: { mkDerivation { pname = "HGamer3D-Graphics3D"; version = "0.5.0"; - sha256 = "bec8d9b65641016d5907c1262afc4c107ad43efd13fd034838c250e0d48fcea8"; + sha256 = "1a6fizaf0l6271407z8kzlzd8yhh9ky2l9n10xcns0a1asvdkj5y"; libraryHaskellDepends = [ base containers directory filepath HGamer3D-CEGUI-Binding HGamer3D-Common HGamer3D-Data HGamer3D-Ogre-Binding @@ -7260,7 +7473,7 @@ self: { mkDerivation { pname = "HGamer3D-InputSystem"; version = "0.5.0"; - sha256 = "d0796ae39bbe6a4aafe25a5ebbaf6405d708d989f362fc86f3ca25c6ec2fecb6"; + sha256 = "1dpc5zncc9fayf3gqqpki7chimq5cjpvnpjswapllsmykginlyfh"; libraryHaskellDepends = [ base HGamer3D-Common HGamer3D-Data HGamer3D-SDL2-Binding HGamer3D-SFML-Binding @@ -7278,7 +7491,7 @@ self: { mkDerivation { pname = "HGamer3D-Network"; version = "0.5.0"; - sha256 = "d4fefd9198ad8e84aa245b5b0a870ac7682268d2e0ca042333496311c234b580"; + sha256 = "105m6k112qs96cih9jp0s9l24s671a3hlnsv4jm893mdk28zvznl"; libraryHaskellDepends = [ base HGamer3D-Common HGamer3D-Data HGamer3D-Enet-Binding ]; @@ -7295,7 +7508,7 @@ self: { mkDerivation { pname = "HGamer3D-OIS-Binding"; version = "0.1.5"; - sha256 = "ceeb51d04ecadfc00b80b253af078486a3c41ef3e67dac15fb887b7eb7d100d8"; + sha256 = "1n00s6vpwyw8zcasqzg6ycgc98w6hh3sylxjh05w1pya9v853syf"; libraryHaskellDepends = [ base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding ]; @@ -7314,7 +7527,7 @@ self: { mkDerivation { pname = "HGamer3D-Ogre-Binding"; version = "0.5.0"; - sha256 = "3c781efee88f3e18e1ec14ead9f288c535526dede7d6f9a6e65c2fe1277e55d4"; + sha256 = "1m2mgqky2bswwskgkmp7xmnm4df5i3rdkshlxkhihglgx3z1wy1w"; libraryHaskellDepends = [ base HGamer3D-Data mtl transformers ]; librarySystemDepends = [ hg3dogre050 OgreMain OgrePaging OgreProperty OgreRTShaderSystem @@ -7335,7 +7548,7 @@ self: { mkDerivation { pname = "HGamer3D-SDL2-Binding"; version = "0.5.0"; - sha256 = "1096cc9a78d19343d48fc56c78e4c4b7f6f5371eeec1a3e2e68869d3b47f4986"; + sha256 = "11j9gysd6sc8wvia7hgf3qvzbxmpqkj7hv65iza474yig2dcr5hh"; libraryHaskellDepends = [ base bytestring HGamer3D-Data utf8-string ]; @@ -7354,7 +7567,7 @@ self: { mkDerivation { pname = "HGamer3D-SFML-Binding"; version = "0.5.0"; - sha256 = "9bb04dc08486f61dc2b60c295fb1abc4515d341707aed377ff17bdde80790781"; + sha256 = "1087g60dxg8pzxvx7bh72ws5slf4mfqmya8cnv11vxl6hk04vc4v"; libraryHaskellDepends = [ base HGamer3D-Data ]; librarySystemDepends = [ hg3dsfml050 sfml-audio sfml-network sfml-system sfml-window @@ -7372,7 +7585,7 @@ self: { mkDerivation { pname = "HGamer3D-WinEvent"; version = "0.4.0"; - sha256 = "2a69a5cccddc774f24fd7135f73608005a5a40dc9d5258db3864fd7f1f957b34"; + sha256 = "0d3vjlgpzzb473dmhllxvi05lnh010vgfdbizlj4yxywrp6aas9a"; libraryHaskellDepends = [ base HGamer3D-Data HGamer3D-SDL2-Binding text ]; @@ -7390,7 +7603,7 @@ self: { mkDerivation { pname = "HGamer3D-Wire"; version = "0.3.3"; - sha256 = "e77c5309cbae5f19d598ca9ec4d335e63c1ba6a56a04fce7604e359ab453b170"; + sha256 = "0w5iafs9ldafc3kzq13alnk1ng766p9w97nak3aijpxfrc4m6z77"; libraryHaskellDepends = [ base containers HGamer3D HGamer3D-Audio HGamer3D-Data HGamer3D-GUI HGamer3D-InputSystem HGamer3D-WinEvent mtl netwire transformers @@ -7411,7 +7624,7 @@ self: { mkDerivation { pname = "HGraphStorage"; version = "0.0.3"; - sha256 = "ccb58118b1aef79d4ed66c3f89eba43c9dddc2e18393b14afaaa4b8d78fe70e1"; + sha256 = "1qbhzrw8sjxaz95b34w3w71dv79wlkmqjgvcsr79vxxfn4c83dfc"; libraryHaskellDepends = [ base binary bytestring containers data-default directory filepath lifted-base monad-control monad-logger resourcet text transformers @@ -7438,7 +7651,7 @@ self: { mkDerivation { pname = "HHDL"; version = "0.1.0.0"; - sha256 = "183c5e1307e60a255fc7cafeadf0261c13de49224c63ec44a373ad41cdb72588"; + sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q"; libraryHaskellDepends = [ base containers mtl template-haskell ]; homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/"; description = "Hardware Description Language embedded in Haskell"; @@ -7451,7 +7664,7 @@ self: { mkDerivation { pname = "HJScript"; version = "0.7.0"; - sha256 = "48b95ad85006d0229911a402eba89db7da453fa10ccaadcda8d1fc4075fd7077"; + sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8"; libraryHaskellDepends = [ base HJavaScript hsp mtl text ]; homepage = "http://patch-tag.com/r/nibro/hjscript"; description = "HJScript is a Haskell EDSL for writing JavaScript programs"; @@ -7467,7 +7680,7 @@ self: { mkDerivation { pname = "HJVM"; version = "0.1"; - sha256 = "99ce25c934bc43db62a9f752d54b34c2164ec4518cbbfad0b5474ab1f283bf47"; + sha256 = "0ixzhgrb2jj7np8gmfwca724w5n26i5xalppm5idnhxw6k4jbklr"; libraryHaskellDepends = [ base containers filepath haskell-src-exts mtl parsec process transformers @@ -7488,7 +7701,9 @@ self: { mkDerivation { pname = "HJavaScript"; version = "0.4.7"; - sha256 = "705f122cdf80d05ec3e345752cdb38268cfcc094267612482bb44ee316e66269"; + sha256 = "0sb2wqbf6kml5d414xi6jk0gr31673djqxa5wg1mxl40vwn14pvh"; + revision = "1"; + editedCabalFile = "05m2kgz0laxv9jl1qfc1sxndan9503010y3aadvfcsxi9cyg3j1j"; libraryHaskellDepends = [ base pretty ]; description = "HJavaScript is an abstract syntax for a typed subset of JavaScript"; license = stdenv.lib.licenses.bsd3; @@ -7503,9 +7718,9 @@ self: { mkDerivation { pname = "HLearn-algebra"; version = "1.1.0.1"; - sha256 = "aa04d725af69ba78d7c474c52ebd8de7aa7a25db7e0013cde5c42b8559000acc"; + sha256 = "1k0a01cqaay4wp6i603yvcjpmap7inyjxiblqkbpifk9mwjxf15a"; revision = "2"; - editedCabalFile = "640b0ad035c523ba7b520543910b428bf1c676b80eda8fa6575c497ff5d89889"; + editedCabalFile = "12cqv3spyjawayk8znhfp1vcdwcb885r2hq5a9xvl8y56p80l2v4"; libraryHaskellDepends = [ base ConstraintKinds containers deepseq hashable MonadRandom parallel random template-haskell vector vector-heterogenous @@ -7524,9 +7739,9 @@ self: { mkDerivation { pname = "HLearn-approximation"; version = "1.1.0"; - sha256 = "76a315bd7ce257fcfea4b06428287fce5281f7f3fb44d8209558121fa9bd19bf"; + sha256 = "1gqrpnliy4jqjlhdhi7vygvq2lnfgwl2hr5hlkzgqmz2gjyib8vn"; revision = "1"; - editedCabalFile = "7b0837f48941b5d4e09ed43f8f49511049b93b4404a4d5ae576ca44c9b61c5e1"; + editedCabalFile = "1qf5c6dlr93caypdb9048hxvjj8ha54qygylkvhd9da1i7s3f23v"; libraryHaskellDepends = [ base ConstraintKinds containers heap HLearn-algebra HLearn-datastructures HLearn-distributions list-extras vector @@ -7545,9 +7760,9 @@ self: { mkDerivation { pname = "HLearn-classification"; version = "1.0.1.3"; - sha256 = "0d6e4d8eb596aaa1395f8508f1c08f802e15cf2aff2bfa73ab9341684d008185"; + sha256 = "11c1016nhhckmdrzlazz5b7iabl0iz0g2245bwws3alnnn74svhd"; revision = "1"; - editedCabalFile = "a9a58cc0d1045dbc8d0d33d21be268baedaf2cf79d21232fbb3b4cd9b2cbedc1"; + editedCabalFile = "1hgdrfrdjk1vpcpj68cxywnazvdsd3i1plik1n6vqp84s708r9d9"; libraryHaskellDepends = [ base binary bytestring ConstraintKinds containers deepseq dlist hashable HLearn-algebra HLearn-distributions list-extras logfloat @@ -7566,7 +7781,7 @@ self: { mkDerivation { pname = "HLearn-datastructures"; version = "1.1.0"; - sha256 = "8b0f87a003feaccb557b055cf323dc6b85829ef22ffaa769336b2d7b1ad36b1a"; + sha256 = "06kbscd7nbbb6dlsgyigyag851bbvhiz6p05gdawpb7y0fh8f3wb"; libraryHaskellDepends = [ base ConstraintKinds containers deepseq HLearn-algebra list-extras MonadRandom QuickCheck vector @@ -7585,9 +7800,9 @@ self: { mkDerivation { pname = "HLearn-distributions"; version = "1.1.0.2"; - sha256 = "eef328acd2739a3022972a0c2de48e4b4325c5810543b60a207b3136a75669a7"; + sha256 = "19v9askkccbv405bchq5h72jahsbivj2s31ajwi316kksan2iwzf"; revision = "1"; - editedCabalFile = "58bb2e9dd62d8fba266d3f6148a8694aaba645aa6b75947d5ad65fe46cb957c7"; + editedCabalFile = "1ispp5nf8pynb9yr8xbbm92sdasad6l4hq9zdlkbm3rdssfjxfsq"; libraryHaskellDepends = [ array base ConstraintKinds containers deepseq erf gamma graphviz HLearn-algebra HLearn-datastructures hmatrix list-extras @@ -7608,7 +7823,7 @@ self: { mkDerivation { pname = "HList"; version = "0.4.2.0"; - sha256 = "cd99545a1dc4df7ceca09a93e4c4d391654a337882a25791f1c48e21317d7795"; + sha256 = "15bpglqj33n4y68mg8l2g0rllrcisg2f94wsl3n7rpy43md596fd"; libraryHaskellDepends = [ array base base-orphans ghc-prim mtl profunctors tagged template-haskell @@ -7627,7 +7842,7 @@ self: { mkDerivation { pname = "HListPP"; version = "0.2.1"; - sha256 = "0815e29c2828f4e43bda9ee0c809a0c932ba32c69441ecbd41b182bb7c461667"; + sha256 = "0rqn8rybp0mi86yyqhclqqrblcn9l04wiq4yv8xy9x1852ff4588"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -7644,7 +7859,7 @@ self: { mkDerivation { pname = "HLogger"; version = "0.0.1.0"; - sha256 = "97590a9d49facb51f368d39f6f923471d75ec3106026c8c543053a23d3f3bd2a"; + sha256 = "0amxyg9j6fh58g2wh9k0231mxmvi6j96z7ykd3rm3jzs96fhlncp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base old-locale time ]; @@ -7660,7 +7875,7 @@ self: { mkDerivation { pname = "HMM"; version = "0.2.1"; - sha256 = "4687a3304af6569734e2511341611281390eb017e3d2b8acd7fe99c2cca1c807"; + sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6"; homepage = "https://github.com/mikeizbicki/hmm"; description = "A hidden markov model library"; license = stdenv.lib.licenses.bsd3; @@ -7674,7 +7889,7 @@ self: { mkDerivation { pname = "HMap"; version = "1.2.7"; - sha256 = "806cbac1e1571c814af76ccf4058c5d9577b99018fd0c7ee5de993b343c60577"; + sha256 = "0xq5qr1v74z9bppcgl4g06cpnmyrqmc41kvcyx58272pw70vlv40"; libraryHaskellDepends = [ base data-default hashable mtl unordered-containers ]; @@ -7691,7 +7906,7 @@ self: { mkDerivation { pname = "HMarkov"; version = "1.0.1.1"; - sha256 = "f7b2753019c7348487d2b7df31f1b59522c008a90d59926a0f7fa6670fa89d03"; + sha256 = "00wxm07ng9kz1xm94n8dm44c08lmnpqk3pxpsa3q8d6734q7bcpp"; libraryHaskellDepends = [ base lens mtl random vector ]; testHaskellDepends = [ base lens mtl QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -7709,7 +7924,7 @@ self: { mkDerivation { pname = "HNM"; version = "0.1.2"; - sha256 = "3271e300282e539a8d532693dcfc789368d804577f2760928fa4675af92b6210"; + sha256 = "04325gwmlrx4iy9609vzaw2dhs4kg3ydr4r6af6rllrf500f6w9j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -7730,7 +7945,7 @@ self: { mkDerivation { pname = "HODE"; version = "2008.10.27"; - sha256 = "fbd9480f45fa79eacd433a3857cc594dc586a84115e615d46231325a775c233b"; + sha256 = "0fr3bivmlciicba1brhm86l8diadb765ff1s8g6ylygs8l7lingv"; libraryHaskellDepends = [ array base ]; librarySystemDepends = [ ode ]; description = "Binding to libODE"; @@ -7743,7 +7958,7 @@ self: { mkDerivation { pname = "HOpenCV"; version = "0.4.0.1"; - sha256 = "7e7be492466e675ceb60b823252fcb0e8a5d0847a76c680c2dfa2ea7e59cbec7"; + sha256 = "1ixykkjsfbps5l66hv578w45v2hfrcpja8xqc3mmqrvf8s9f8yvy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ allocated-processor base vector-space ]; @@ -7761,7 +7976,7 @@ self: { mkDerivation { pname = "HPDF"; version = "1.4.10"; - sha256 = "de2bfddd93eeef2129a2378e8dce486d086bec3c48ee2a1bf1a5fb01581607d4"; + sha256 = "1m072rc03yx5y4djmvj87kn6n23d9378v3ipl8lj3vzfjgfzsayy"; libraryHaskellDepends = [ array base base64-bytestring binary bytestring containers errors mtl random vector zlib @@ -7779,7 +7994,7 @@ self: { mkDerivation { pname = "HPath"; version = "0.0.2"; - sha256 = "9307edb3192efe5f81ea1b87bf9814887d9839086d2c2e398ed3becba0c71482"; + sha256 = "10hlqyhcpgnkiqwjwb3d10wrhzc82jcbz1qvxa0mzzif36rys1wk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -7803,7 +8018,7 @@ self: { mkDerivation { pname = "HPhone"; version = "0.0.1.2"; - sha256 = "b59b05042042e7bc440077494faf79684a47b963f023da18c9003d95a2880f39"; + sha256 = "0f8gi2i9ag80r4cdl8zhcfwlfjk8g6plyjbp012brrs24020b6xm"; libraryHaskellDepends = [ base containers phone-metadata regex-pcre ]; @@ -7817,7 +8032,7 @@ self: { mkDerivation { pname = "HPi"; version = "0.5.1"; - sha256 = "c9c6db4f2653826163dbf03a73423c78dc72c3764008281df8cd553b655905c2"; + sha256 = "1hh5b5jknmfdz0fjh220fv1p5p3q7i176fphvdin30jk4r7xpin9"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bcm2835 ]; homepage = "https://github.com/WJWH/HPi"; @@ -7831,7 +8046,7 @@ self: { mkDerivation { pname = "HPlot"; version = "0.3"; - sha256 = "1e6bb646a8c768ececb0af3ff233ecde02dbe791c492823c19d48d70bb204608"; + sha256 = "022642xp13fl34y854n4j7kxn0nyxhrz4gxgn3nfqs67m13bcsqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base glade glib gtk ]; @@ -7852,7 +8067,7 @@ self: { mkDerivation { pname = "HPong"; version = "0.1.2"; - sha256 = "f1efbbaf1140674d105e4e3648e720415b219f0cccbc50c23aa378ab27c1ff37"; + sha256 = "0dzzq4ksny537b151g6c1jgj2ns143klhdjfbq84srs026pvpvzi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -7872,7 +8087,7 @@ self: { mkDerivation { pname = "HROOT"; version = "0.9.0.1"; - sha256 = "e8a677131caf8cef55d725a00993a22ed63792900617baa0189be72639a483d5"; + sha256 = "1mc3lhwjdrwv32hbl5q6j293gmifla9hk815sxayz35g3h9pg9p8"; libraryHaskellDepends = [ base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist HROOT-io HROOT-math HROOT-tree template-haskell @@ -7888,7 +8103,7 @@ self: { mkDerivation { pname = "HROOT-core"; version = "0.9.0.1"; - sha256 = "053dd486a4b0872fee1536eb5fcec930868c132c664ab3f6b01cb436c76eaae3"; + sha256 = "1qxadv3kdd0wn3vb6jk65h9qr1ihr775zsrn2pp2z1xhlj3d8g85"; libraryHaskellDepends = [ base fficxx fficxx-runtime template-haskell ]; @@ -7905,7 +8120,7 @@ self: { mkDerivation { pname = "HROOT-graf"; version = "0.9.0.1"; - sha256 = "993866cd851a3fff908f5a4484b2ee217825f3a2a60ab0d124e6e3aca83e31a8"; + sha256 = "1a1i7slarqz64k8v02m6lbrjay11xsr88i2siy8gygqshp6ncf4r"; libraryHaskellDepends = [ base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell ]; @@ -7922,7 +8137,7 @@ self: { mkDerivation { pname = "HROOT-hist"; version = "0.9.0.1"; - sha256 = "4da911be3e79559af4cc7269db52e3cc6f380baaf9c302d06890a461b1a63015"; + sha256 = "059hlsqn394hd3805hzrm85khvycwd9dnsbjrks9lmbr7sz13aad"; libraryHaskellDepends = [ base fficxx fficxx-runtime HROOT-core template-haskell ]; @@ -7939,7 +8154,7 @@ self: { mkDerivation { pname = "HROOT-io"; version = "0.9.0.1"; - sha256 = "1cebc91e14a3ebe98db155efef448884cadab0344879efaa68d7fa7dfd8ca34b"; + sha256 = "0jx3ikypvynpd2mfyya86jqdmjl4i12fzvsmn66yksx32hgcksqw"; libraryHaskellDepends = [ base fficxx fficxx-runtime HROOT-core template-haskell ]; @@ -7956,7 +8171,7 @@ self: { mkDerivation { pname = "HROOT-math"; version = "0.9.0.1"; - sha256 = "2669f815a6b27dce14d561bdcb3d86ab7ea15c24ed9563e6893ab67a4c1d9d89"; + sha256 = "12cx3m67mdisi7k675gd4ifa2zmbhqywpgb1slacwzdjlqazhs96"; libraryHaskellDepends = [ base fficxx fficxx-runtime HROOT-core template-haskell ]; @@ -7973,7 +8188,7 @@ self: { mkDerivation { pname = "HROOT-tree"; version = "0.9.0.1"; - sha256 = "442e5c2a786b51b09229907f00b24021f5f1f5631ef8f5d5b4b582eaf28b0cf2"; + sha256 = "1whcigrfm0mmnkazby0ycgsz3x9182r00zwh569b0lbbg0m5qbj4"; libraryHaskellDepends = [ base fficxx fficxx-runtime HROOT-core template-haskell ]; @@ -7988,7 +8203,7 @@ self: { mkDerivation { pname = "HRay"; version = "1.2.3"; - sha256 = "ce12a6f6537a651870512087ede2ac897c1f1ee632327630a2a23160045ae02d"; + sha256 = "0bg0b8260cd2l8q7ccijwqg1yz49mkifv1r0a5q1hrbsagvac4nf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base directory haskell98 ]; @@ -8005,7 +8220,7 @@ self: { mkDerivation { pname = "HSFFIG"; version = "1.1.3"; - sha256 = "060120042cce5e48107a1772502330aa85d6079f08aaec3533b1ff0da978f383"; + sha256 = "10zkg2lhvzxi6csyrah8kw3xd1da60im0whpg884hpnf5h220086"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8027,7 +8242,7 @@ self: { mkDerivation { pname = "HSGEP"; version = "0.1.5"; - sha256 = "37bda533cc8a0dc1180c066a2d78923592b0e5af0332c4ab16ae6a80c228689a"; + sha256 = "16k853180smf2smw8ch3mzjv14imj9w2ssh61hcc23carhrsbg9p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8048,7 +8263,7 @@ self: { mkDerivation { pname = "HSH"; version = "2.1.3"; - sha256 = "54df051277d3dfe263277e2c2416ecb5f1515bc69729870f13749b495565670d"; + sha256 = "03b7cmalk6vl2c7qfacpqrdm3wdmxhb28b3y4xiy5pykfw90bpsl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8069,7 +8284,7 @@ self: { mkDerivation { pname = "HSHHelpers"; version = "0.24"; - sha256 = "8d04c19dd975c4d945c5ed4c17e18e85a6eaf370f95fd61bcb71ba34552fe257"; + sha256 = "0mz25xak9fkircdxcpzrf3rym9l5ivhifk7dqm2xki3mv6fw214d"; libraryHaskellDepends = [ base bytestring DebugTraceHelpers directory filepath HSH HStringTemplateHelpers MissingH mtl regex-pcre unix @@ -8083,8 +8298,8 @@ self: { ({ mkDerivation, base, containers, hashable, hashtables }: mkDerivation { pname = "HSet"; - version = "0.0.0"; - sha256 = "8b336a5f5c68d23683b7f69a5fcc02c7a9f869b7570799cf81cd26c37ea70426"; + version = "0.0.1"; + sha256 = "0snix2qdj1d66v6qj6fl0zizl617kjzbmxiswdd5i0b5lzjkpagb"; libraryHaskellDepends = [ base containers hashable hashtables ]; description = "Faux heterogeneous sets"; license = stdenv.lib.licenses.bsd3; @@ -8095,9 +8310,9 @@ self: { mkDerivation { pname = "HSlippyMap"; version = "2.2"; - sha256 = "a9943b4a20f22c3c0ac34f097abbc18c53ec5639e8e82d1e879c9ea4f69dc19e"; + sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559"; revision = "2"; - editedCabalFile = "31ff4b5f5128f8ebd327f4af1dbb711dbfc906757e97526497a58865f5d18347"; + editedCabalFile = "0iw3s7snb255jxj555vyfl3ckgqxf6xivbzl4z9ypy18a5glpzri"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/41px/HSlippyMap"; description = "OpenStreetMap (OSM) Slippy Map"; @@ -8112,7 +8327,7 @@ self: { mkDerivation { pname = "HSmarty"; version = "0.2.0.3"; - sha256 = "3883bd35c5ed53264bd9fa2284ad3c4bd0bbd4326d628fd171ac98b2f9eda71e"; + sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq"; libraryHaskellDepends = [ aeson attoparsec attoparsec-expr base HTTP mtl scientific text unordered-containers vector @@ -8124,6 +8339,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HSoM" = callPackage + ({ mkDerivation, array, arrows, base, containers, deepseq, Euterpea + , ghc-prim, HCodecs, markov-chain, pure-fft, random, UISF + }: + mkDerivation { + pname = "HSoM"; + version = "1.0.0"; + sha256 = "1hh23kid568yhc92j4j0xd18xxlfwgrdhmbpb3zvxzrg0ah0pxkk"; + libraryHaskellDepends = [ + array arrows base containers deepseq Euterpea ghc-prim HCodecs + markov-chain pure-fft random UISF + ]; + homepage = "http://www.euterpea.com"; + description = "Library for computer music education"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HSoundFile" = callPackage ({ mkDerivation, base, binary, bytestring, filepath, haskell98, mtl , parallel @@ -8131,7 +8364,7 @@ self: { mkDerivation { pname = "HSoundFile"; version = "0.2.2"; - sha256 = "eb437d156e51e5288c604bd967ae6b39e5e636ff0de9f1bf19527bfadb099f62"; + sha256 = "0qlz17dzlysj36zz3s8dzwvfdr9rdfp6gnabc262iraidqapshzb"; libraryHaskellDepends = [ base binary bytestring filepath haskell98 mtl parallel ]; @@ -8148,8 +8381,8 @@ self: { }: mkDerivation { pname = "HStringTemplate"; - version = "0.8.5"; - sha256 = "e02b3043f1a5f72db3a1a1075e7b641f266329b954ea7f2f6bd20266295b35ff"; + version = "0.8.6"; + sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty syb template-haskell text @@ -8166,7 +8399,7 @@ self: { mkDerivation { pname = "HStringTemplateHelpers"; version = "0.0.14"; - sha256 = "90eb59f9175e68bb26c0467b3f9751bed49587b135e93a02edf4a7da2112f9b5"; + sha256 = "1dgr28hxm9zlxl13ms9mn63rbm5ya6bkyys6q0kbns2y2zwmkswh"; libraryHaskellDepends = [ base containers directory FileManipCompat filepath HSH HStringTemplate mtl safe strict @@ -8182,7 +8415,7 @@ self: { mkDerivation { pname = "HSvm"; version = "0.1.0.2.89"; - sha256 = "49a9007eb3fb28d5c499ac64e3d3e796a1725c6be59932248c6198b3289b68d5"; + sha256 = "1mb8kclb7631ihj356g5ddf758cnwz9y6r5ck72daa7vndz01aa9"; libraryHaskellDepends = [ base containers ]; description = "Haskell Bindings for libsvm"; license = stdenv.lib.licenses.bsd3; @@ -8200,7 +8433,7 @@ self: { mkDerivation { pname = "HTF"; version = "0.13.1.0"; - sha256 = "1cb469ee21766fb7ad56fb42469709fac06214f7a33c39880134dfc2ea0de847"; + sha256 = "0iz81pmc5prl0643jg53ywa65h7s16blchpvasnvfvvn47p6kd0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8230,10 +8463,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.5"; - sha256 = "bca0bf130666e924abaf3daff22be6e27928f83f91d6a34cbc39616497908aed"; - revision = "2"; - editedCabalFile = "6b9a05236856d7cd5523b18339cc577f3d2522609558816b072f33aa94c9bbc9"; + version = "4000.3.7"; + sha256 = "1s7amm0wai6z4x2arrqh0h6n0gjbrqpkqyz9a7l38i78hkmwrh6m"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -8252,7 +8483,7 @@ self: { mkDerivation { pname = "HTTP-Simple"; version = "0.2"; - sha256 = "3c497bd3f970615d3a6ba03c20874fb42cc5c38879c02ab87b532f2790bd2489"; + sha256 = "1294pn82fbskgfw2mh3ri31wab5l9y3j0g50dcx5sqbhz79pnj9w"; libraryHaskellDepends = [ base HTTP network ]; doHaddock = false; homepage = "http://www.b7j0c.org/content/haskell-http.html"; @@ -8267,7 +8498,7 @@ self: { mkDerivation { pname = "HTab"; version = "1.6.3"; - sha256 = "fb135a114a105f719a47799fce96bf13aebff4bdeaed5d9782f89967997e1130"; + sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -8285,7 +8516,7 @@ self: { mkDerivation { pname = "HTicTacToe"; version = "0.2"; - sha256 = "0c3bef9d5462137f31bb06429c02d604e9f13452ab68b578b39f84ee29c97740"; + sha256 = "0h3pr4lyx14zndwbas5ba8sg3s84sq19qhh6pcqpy4v2ajfyyfqc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -8302,7 +8533,7 @@ self: { mkDerivation { pname = "HUnit"; version = "1.5.0.0"; - sha256 = "65c51d17ced1c0646d888cd8caf195df67f6fdc1394c34459bcfd1be0f9ddea0"; + sha256 = "186ykl7vxlfgkd2k8k1rq7yzcryzjpqwmn4ci1nn9h6irqbivib5"; libraryHaskellDepends = [ base call-stack deepseq ]; testHaskellDepends = [ base call-stack deepseq filepath ]; homepage = "https://github.com/hspec/HUnit#readme"; @@ -8310,12 +8541,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit_1_6_0_0" = callPackage + ({ mkDerivation, base, call-stack, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.6.0.0"; + sha256 = "1pnhwqq5v8h48gbp3ibv3skfj25mf4zs5svxcavq93p9cswycj3l"; + libraryHaskellDepends = [ base call-stack deepseq ]; + testHaskellDepends = [ base call-stack deepseq filepath ]; + homepage = "https://github.com/hspec/HUnit#readme"; + description = "A unit testing framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HUnit-Diff" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }: mkDerivation { pname = "HUnit-Diff"; version = "0.1"; - sha256 = "a61bb6cdc8d8baf196c9af502f06ecd478e0c2806f4951169c385b16b1e99a36"; + sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6"; libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ]; homepage = "https://github.com/dag/HUnit-Diff"; description = "Assertions for HUnit with difference reporting"; @@ -8324,20 +8569,21 @@ self: { }) {}; "HUnit-Plus" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers - , directory, hashable, hexpat, hostname, parsec, time, timeit + ({ mkDerivation, base, bytestring, Cabal, cmdargs, directory + , hashable, hexpat, hostname, parsec, text, time, timeit + , unordered-containers }: mkDerivation { pname = "HUnit-Plus"; - version = "1.1.0"; - sha256 = "9cde0930c46c02833e82b10519bcc841ce5186a62be3bb29971538e85a5fcb74"; + version = "2.0.0"; + sha256 = "1xbnpd2mxw7dbbix5sdhpdvfq79ssq40pi99wxrda0z5xdyy09dj"; libraryHaskellDepends = [ - base bytestring Cabal cmdargs containers hashable hexpat hostname - parsec time timeit + base bytestring Cabal cmdargs hashable hexpat hostname parsec text + time timeit unordered-containers ]; testHaskellDepends = [ - base bytestring Cabal cmdargs containers directory hashable hexpat - hostname parsec time timeit + base bytestring Cabal cmdargs directory hashable hexpat hostname + parsec text time timeit unordered-containers ]; homepage = "https://github.com/emc2/HUnit-Plus"; description = "A test framework building on HUnit"; @@ -8350,7 +8596,9 @@ self: { mkDerivation { pname = "HUnit-approx"; version = "1.1"; - sha256 = "d7cc9e120092e8f845b3347a5da99fab59135eda34c57871f3ff1f09224830a6"; + sha256 = "19ih90i0j7zzydqpii9lv9g16ndbkylmsyilnd2zis4j0099xk6p"; + revision = "1"; + editedCabalFile = "1h78rwj5vy88pdj192l57181z0617gn5p8psrgbz6qgimfq35dpw"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/goldfirere/HUnit-approx"; @@ -8367,7 +8615,7 @@ self: { mkDerivation { pname = "HXMPP"; version = "0.0.1.0"; - sha256 = "5a8343984de524e45e624249882d71862331e6f92dbaf1756920f3ecd42a9224"; + sha256 = "094j5bafrwr0d5sz3fidz7k328w6f4nqhja2c9gf89759nc470ss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8393,7 +8641,7 @@ self: { mkDerivation { pname = "HXQ"; version = "0.20.1"; - sha256 = "b7c385aff2e6f1c048eeffcae86b08e7ea5d432a9ca5975e6138c090d45943ad"; + sha256 = "1ba3b7a91h1qc5g9g9cw591mvsp711myijpzxr4c1wg6yapqbhxp"; libraryHaskellDepends = [ array base haskeline HTTP mtl regex-base regex-compat template-haskell @@ -8409,7 +8657,7 @@ self: { mkDerivation { pname = "HaLeX"; version = "1.2.6"; - sha256 = "5b4e22ecf647362f9d3f1908e9c211f34539c037881701f01b02414130fb7dd7"; + sha256 = "1mvxzcq42h823gq025w86z03jigk271fj20r7yfjydj7yvn24kjv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base HUnit mtl QuickCheck ]; @@ -8423,7 +8671,7 @@ self: { mkDerivation { pname = "HaMinitel"; version = "0.1.0.0"; - sha256 = "a810ac58ba5089b7fa5e1347f3c6a1b71571fd18a08463d3c362660e7ec1ee60"; + sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458"; libraryHaskellDepends = [ base bytestring serialport stm ]; homepage = "https://github.com/Zigazou/HaMinitel"; description = "An Haskell library to drive the french Minitel through a serial port"; @@ -8436,7 +8684,7 @@ self: { mkDerivation { pname = "HaPy"; version = "0.1.1.1"; - sha256 = "9fd74b2ce999bbf8b52cc2dbe2b17c84ee2804a09a74d7426407cf7bc4242052"; + sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz"; libraryHaskellDepends = [ base template-haskell th-lift ]; homepage = "https://github.com/sakana/HaPy"; description = "Haskell bindings for Python"; @@ -8456,7 +8704,44 @@ self: { mkDerivation { pname = "HaRe"; version = "0.8.4.0"; - sha256 = "733272478f0aa195c86a344b548bdfdc453c41eaf5b9bc482e5a8fa8f81615fb"; + sha256 = "1yqm2vwai3ss5r4brfgmx90kqifwvy5m8jrldb49b88aix3p4ckk"; + revision = "2"; + editedCabalFile = "1hwajkfskbnh3cn7jgiqp83vpfinnfn4pfzwkl6cwqi63iwy944p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cabal-helper containers directory filepath ghc ghc-exactprint + ghc-mod ghc-syb-utils hslogger monad-control mtl + Strafunski-StrategyLib syb syz + ]; + executableHaskellDepends = [ + base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple + ]; + testHaskellDepends = [ + attoparsec base base-prelude case-insensitive containers conversion + conversion-case-insensitive conversion-text Diff directory foldl + ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl + parsec turtle + ]; + homepage = "https://github.com/RefactoringTools/HaRe/wiki"; + description = "the Haskell Refactorer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HaRe_0_8_4_1" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, Cabal + , cabal-helper, case-insensitive, containers, conversion + , conversion-case-insensitive, conversion-text, Diff, directory + , filepath, foldl, ghc, ghc-exactprint, ghc-mod, ghc-syb-utils + , gitrev, hslogger, hspec, HUnit, monad-control, mtl + , optparse-applicative, optparse-simple, parsec + , Strafunski-StrategyLib, syb, syz, turtle + }: + mkDerivation { + pname = "HaRe"; + version = "0.8.4.1"; + sha256 = "16ld7lrdf6vjmxam4kfc6zyy2g4baw7mr9ha39nrxjq0p8d4hn3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8486,8 +8771,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.17.1.0"; - sha256 = "c497c6b2853018b09016c4422f22d18956881fc774066626d7c43c8b8f0917c3"; + version = "3.17.2.0"; + sha256 = "14bbxhipxd18h0dpmbc1m7wggg1bqzz0cjr7l27xks2k35ccllw5"; libraryHaskellDepends = [ base bytestring containers matrix parsec QuickCheck text transformers wl-pprint-extras @@ -8500,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 @@ -8507,7 +8814,7 @@ self: { mkDerivation { pname = "HaTeX-meta"; version = "1.2.1"; - sha256 = "b48b75ad94f50ebc2c5a40a8ce0178d39e002a576d704eba30895cd78740d6b1"; + sha256 = "1cfn823xfp4962x4ww3dawm017nkg00wxa20b8nbq3pmjjnpb2xl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -8521,15 +8828,14 @@ self: { "HaTeX-qq" = callPackage ({ mkDerivation, antiquoter, base, haskell-src-meta, HaTeX - , template-haskell, text, uniplate + , template-haskell, text }: mkDerivation { pname = "HaTeX-qq"; - version = "0.0.1.2"; - sha256 = "60db927820811c1bbc17890e21188caeb9441f40c6a5fb5c5436101eca4a0c61"; + version = "0.1.0.1"; + sha256 = "192gjv2289mfflwii3wf7q3aih8a99072n9adv3vx360mh08wbd8"; libraryHaskellDepends = [ antiquoter base haskell-src-meta HaTeX template-haskell text - uniplate ]; description = "Quasiquoters for HaTeX"; license = stdenv.lib.licenses.bsd3; @@ -8543,7 +8849,7 @@ self: { mkDerivation { pname = "HaVSA"; version = "0.1.0.2"; - sha256 = "f32a70eb352e2e571bfae1a12916ef140a180854bfba3deaa45fed77221103c2"; + sha256 = "1hh324i7gvazlkm3vfmzah41h2hlxwb2k8g1z8dmfbif6pmp0apk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base logict ]; @@ -8562,8 +8868,8 @@ self: { }: mkDerivation { pname = "HaXml"; - version = "1.25.3"; - sha256 = "6448a7ee1c26159c6c10db93757ed9248f647b1c0c431e7aead6aadd6d2307c7"; + version = "1.25.4"; + sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8582,7 +8888,7 @@ self: { mkDerivation { pname = "Hach"; version = "0.1.2"; - sha256 = "7e2b2fa79697ccf2f173c08207abb9e3dd89b5b070a1555504bd1403f5b3e7ae"; + sha256 = "1bp7ngsh655x0iamb8bhn2sqkpg3p6mhg0n0fgqz5k4pjskjyavy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network old-locale ]; @@ -8600,7 +8906,7 @@ self: { mkDerivation { pname = "HackMail"; version = "0.0.1"; - sha256 = "7cfd276ad164932459f1d997e20cc1e0039642b4a6bdf49403a46b5558e014c9"; + sha256 = "1j8lw1c5asx40fag9gd6ni19c0z0q46f55yry5cj94v4s5m2gzbw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8622,7 +8928,7 @@ self: { mkDerivation { pname = "Haggressive"; version = "0.1.0.4"; - sha256 = "e1ef43ae373cd6662cd335912ab140d00dd4723b4aabfb7b29624b5b178ac821"; + sha256 = "08f8i8bmnjv255xzpasa7drd83fh82qjm49mscn6dmiw6yp47vz1"; libraryHaskellDepends = [ base bytestring Cabal cassava containers directory HUnit PSQueue text tokenize tuple vector @@ -8639,7 +8945,7 @@ self: { mkDerivation { pname = "HandlerSocketClient"; version = "0.0.5"; - sha256 = "7b1fcafa55e0b32d35dbdb1ef6fb6487f54f471c018503e7de3c40732967e8ca"; + sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv"; libraryHaskellDepends = [ base bytestring network ]; homepage = "https://github.com/wuxb45/HandlerSocket-Haskell-Client"; description = "Haskell implementation of a HandlerSocket client (API)"; @@ -8653,7 +8959,7 @@ self: { mkDerivation { pname = "HandsomeSoup"; version = "0.4.2"; - sha256 = "0ae2dad3fbde1efee9e45b84b2aeb5b526cc7b3ea2cbc5715494f7bde3ceeefb"; + sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8671,7 +8977,7 @@ self: { mkDerivation { pname = "Hangman"; version = "0.1.0.2"; - sha256 = "b057343ce4b95177c01f3eec7a0c6c83190e2c0758d93bcaea437e70a1e88307"; + sha256 = "01w3x2hp0zj3xb53pnaq0wn0w6c3dh67mv1y3z07fldrwhy38mxh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random transformers ]; @@ -8691,7 +8997,7 @@ self: { mkDerivation { pname = "HarmTrace"; version = "2.2.0"; - sha256 = "dba4b284ea76b47ff3911129341037f54b4b1273d6dbae5a78faf0abe3285cd0"; + sha256 = "1l2w53ispw7sg1daxnynfc94njzm6w838a8ij7rpzd3nxa2b596v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8718,7 +9024,7 @@ self: { mkDerivation { pname = "HarmTrace-Base"; version = "1.5.3.1"; - sha256 = "aea6ef3010517315c58508554550bdc05a89b1eee8f077b45f1715835c3e99de"; + sha256 = "1plr7rf8658pbys7gw78xsqqjnn0pm84am88hp2iawsi20qfz9mf"; libraryHaskellDepends = [ base binary containers ghc-prim ListLike uu-parsinglib ]; @@ -8732,6 +9038,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HasCacBDD" = callPackage + ({ mkDerivation, base, Cabal, CacBDD, directory, process + , QuickCheck + }: + mkDerivation { + pname = "HasCacBDD"; + version = "0.1.0.0"; + sha256 = "1dp4glfvd3ihaq2k3y40h7yz29c5lh76mjdzjcqb0ixvkh13d7dy"; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ base process QuickCheck ]; + librarySystemDepends = [ CacBDD ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/m4lvin/HasCacBDD"; + description = "Haskell bindings for CacBDD"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {CacBDD = null;}; + "HasGP" = callPackage ({ mkDerivation, base, haskell98, hmatrix, hmatrix-special, mtl , parsec, random @@ -8739,7 +9063,7 @@ self: { mkDerivation { pname = "HasGP"; version = "0.1"; - sha256 = "fdbdc7e243eeb2a3bbfc2a074b502ca2acc52d73b1070630e4a45571c9a185eb"; + sha256 = "1sw5l74p2md4whq0c1xifcnwbb525i84n1razjxs7cpf8gicgggx"; libraryHaskellDepends = [ base haskell98 hmatrix hmatrix-special mtl parsec random ]; @@ -8756,7 +9080,7 @@ self: { mkDerivation { pname = "Haschoo"; version = "0.1.2"; - sha256 = "926122c6e49b5bb811a3c3cf5d7ed5869fdb0b5b8fc2cc79599e5306ae01054a"; + sha256 = "0jh506p0clwyb5wwrhlgbc5xp7w6smz5vky3lc8vhnwvwk324qcj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -8775,7 +9099,7 @@ self: { mkDerivation { pname = "Hashell"; version = "1.0"; - sha256 = "f4762565b0c18128b2c4ea8b0312b2f05aae15006a13e289e356c4937511c57a"; + sha256 = "0yn525sr7i2nwf4y44va00aswnphn89072zaqjr2i0f1n1jjaxpl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -8794,7 +9118,7 @@ self: { mkDerivation { pname = "HaskRel"; version = "0.1.0.2"; - sha256 = "e7ce026b9791b8fcdea89555a7545d0b4e212982b0aed4e67946a7970ae907a7"; + sha256 = "19q7x459g9s6g7kd9bmhh8lj2khbbmaafmcmm3ggrf4ijxmh5kp7"; libraryHaskellDepends = [ base containers directory ghc-prim HList tagged ]; @@ -8808,7 +9132,7 @@ self: { mkDerivation { pname = "HaskellForMaths"; version = "0.4.8"; - sha256 = "9298592ca32f853233abb0f1d0d34b6e51118dc0d66ed9822442d61c8db4c27a"; + sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j"; libraryHaskellDepends = [ array base containers random ]; homepage = "http://haskellformaths.blogspot.com/"; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; @@ -8820,7 +9144,7 @@ self: { mkDerivation { pname = "HaskellLM"; version = "0.1.2"; - sha256 = "98690014b2f5a577bc331ce4fb86a97c2c5b002044b0b189b391c2f64bb0582d"; + sha256 = "0baqn15zdhlinf4v3c244005nb3wm63gpr0w6fy7g9gmn8a00scq"; libraryHaskellDepends = [ base hmatrix ]; description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm"; license = "GPL"; @@ -8832,7 +9156,7 @@ self: { mkDerivation { pname = "HaskellNN"; version = "0.1.3"; - sha256 = "b9c28beee5b16df75e7a28a17b053ab57cd2c140c64018ccc03328db27c4b244"; + sha256 = "0i5jqhkxna1kq361hh66830x4z5m782pp898g9ggfvdiwpp8phmr"; libraryHaskellDepends = [ base hmatrix random ]; description = "High Performance Neural Network in Haskell"; license = "GPL"; @@ -8846,7 +9170,7 @@ self: { mkDerivation { pname = "HaskellNet"; version = "0.5.1"; - sha256 = "3245d31ad76f9f9013a2f6e2285d73ed37376eeb073c100b9a6d19e87f0ca838"; + sha256 = "0f581izyh6bdk85i0g07xdp3fdzdfdfjiqpnl89r17vgswdd6i9j"; libraryHaskellDepends = [ array base base64-string bytestring cryptohash mime-mail mtl network old-time pretty text @@ -8863,7 +9187,7 @@ self: { mkDerivation { pname = "HaskellNet-SSL"; version = "0.3.3.0"; - sha256 = "177d462b939dcb1ebab9cabf5ab5d49d969c80a8de1732bc6e1613780b8fd5f4"; + sha256 = "1x6miw5ph4qndsy345yym209r5lxsjsmmgyap6x1xjwxjcmlcz8p"; libraryHaskellDepends = [ base bytestring connection data-default HaskellNet network tls ]; @@ -8881,7 +9205,7 @@ self: { mkDerivation { pname = "HaskellTorrent"; version = "0.1.1"; - sha256 = "41e5569acf22bc4d0811b78b876ef50548cdb33105146f3e3f5c1604688ec937"; + sha256 = "0dy9irl085jw7wz6y50566rwsj05ymp8g2xp2444vg12ryd5dra1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -8900,7 +9224,7 @@ self: { mkDerivation { pname = "HaskellTutorials"; version = "0.0.0.1"; - sha256 = "f82081639f548e54dc63277b06f2d0b5fe2c22c3275896a1e76b7cdc4847ce3e"; + sha256 = "0gnf8x4dqz3bwyhrcn17qci2rzmms3r0cyr7cgf593jlkxiq287q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs text ]; @@ -8917,7 +9241,7 @@ self: { mkDerivation { pname = "Haskelloids"; version = "0.1.1"; - sha256 = "e8e32560c4b1fc56af633a99b9099f3e2838491730b1f5fb2c9cc0757f0e276c"; + sha256 = "0v171rzpbh4w5kxzbc9h2x4kha1ykw4vk69scfpmdz5iqih2bqz8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -8929,6 +9253,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Hastodon" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types + , MissingH, text + }: + mkDerivation { + pname = "Hastodon"; + version = "0.1.0"; + sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit http-types MissingH text + ]; + homepage = "https://github.com/syucream/hastodon"; + description = "mastodon client module for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "Hate" = callPackage ({ mkDerivation, base, bytestring, GLFW-b, GLUtil, hpp, JuicyPixels , JuicyPixels-util, lens, mtl, multimap, OpenGL, random, stm @@ -8937,7 +9277,7 @@ self: { mkDerivation { pname = "Hate"; version = "0.1.4.3"; - sha256 = "527920c3f401113cf4123486fb578447916eae928923e7bb857ac14442f34e6e"; + sha256 = "0vjfyd149hbshnxyf8w9jap6x4a7hibzp1il2bs3q481yk1j0yaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8964,7 +9304,7 @@ self: { mkDerivation { pname = "Hawk"; version = "0.0.2"; - sha256 = "f831f526f793b56be5c9793dd80542fbdbfdd4b9127e3bc8938c77ad867ced3c"; + sha256 = "0g7dgj3asxwcjg43nzhjp7agvnzv882xhgbrr7jnpdckywkgacgq"; libraryHaskellDepends = [ base bytestring bytestring-trie cgi containers convertible data-default dataenc directory filepath hack HDBC HDBC-sqlite3 @@ -8988,7 +9328,7 @@ self: { mkDerivation { pname = "Hayoo"; version = "1.2.3"; - sha256 = "0c11fc8d3b12e9c18e8b52e00f09dd9fbe560f7841b54cee53fd38fe789bf32e"; + sha256 = "0bpkkdwgwf7xagp4rda1g07mdglzvl4hzq2jif7c3s8j7f6zq48c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -9009,7 +9349,7 @@ self: { mkDerivation { pname = "Hclip"; version = "3.0.0.4"; - sha256 = "d8c80bd2d035571cd76ce4f69453e9fcef4096dbc8868eb4cfcd7eb74fe5f712"; + sha256 = "04ppwm7vfzndrys8x1n8vfb41vzwx59r9xp4dkbiqmrms390pj6q"; libraryHaskellDepends = [ base mtl process strict ]; homepage = "https://github.com/jetho/Hclip"; description = "A small cross-platform library for reading and modifying the system clipboard"; @@ -9023,7 +9363,7 @@ self: { mkDerivation { pname = "Hedi"; version = "0.1.1"; - sha256 = "c94e69a83b49d24590171c42d64f283b15591cb3e6cc100c32fb59878a511a7c"; + sha256 = "0z0sa658fngv68611k76ncf5j59v517xchhw2y84blj97fl6jkn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9044,7 +9384,7 @@ self: { mkDerivation { pname = "HerbiePlugin"; version = "0.2.0.0"; - sha256 = "873fd791e311fb0bd0d4786ed8ef780aef6dff84ae0a2bd9626dbb8256e834ef"; + sha256 = "1vrlx1b85fvdcbcjn2mfhkznvvqag3pxhvkqsk80pyqiwf8xfgw7"; libraryHaskellDepends = [ base deepseq directory ghc mtl process split sqlite-simple template-haskell text @@ -9064,7 +9404,7 @@ self: { mkDerivation { pname = "Hermes"; version = "0.0.4"; - sha256 = "637503bfc4c404cb64e74ec6ddd234de392ce3a9915825cddb0b12b7f378bb48"; + sha256 = "0j5vg3rvf4hbvg6jan4im7ijqffy6k9dvijfwxjcn164qjzh6xb3"; libraryHaskellDepends = [ AES base bytestring cereal containers hslogger monads-tf network old-time random random-shuffle RSA SHA2 stm syb time transformers @@ -9083,7 +9423,7 @@ self: { mkDerivation { pname = "Hieroglyph"; version = "3.89"; - sha256 = "dae82ed9d04d3a108fd5205f0f5ccf547795cd8e02033689dde2588ec7dc7b36"; + sha256 = "0dkvvk3qwn72vn4kc0q2iv6raxslrxf0ypr0sn7i0fjds3cjxs6s"; libraryHaskellDepends = [ array base buster bytestring cairo colour containers glib GLUT gtk gtkglext IfElse mtl OpenGL parallel pretty random @@ -9101,7 +9441,7 @@ self: { mkDerivation { pname = "HiggsSet"; version = "0.1.1"; - sha256 = "81fadbba216060df911181286d8aea342a618a1b6f48b08040fd4f45eaa518cc"; + sha256 = "1k0qlpm4akzx820b0j3g3f562ailxa56sa41268xyq3046xdpyl1"; libraryHaskellDepends = [ base bytestring containers deepseq mtl text th-expand-syns TrieMap vector @@ -9117,7 +9457,7 @@ self: { mkDerivation { pname = "Hipmunk"; version = "5.2.0.17"; - sha256 = "48110b843cc660fa41c9521d9f57e61acd26cce99af94dff7865ac7fd30ebafb"; + sha256 = "1yxs1v9pzb35g3zlvycsx762dk8swrbry7ajr50zlq667j20n4a8"; libraryHaskellDepends = [ array base containers StateVar transformers ]; @@ -9126,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 @@ -9133,7 +9486,7 @@ self: { mkDerivation { pname = "HipmunkPlayground"; version = "5.2.1.1"; - sha256 = "47b34d8c80fe70e9c96f62e2eab6ba852f4fe072a6743157b47049085aa8aa1c"; + sha256 = "075am1d0hjbhnibk2x56fbh4ybw5pavfmqk2dz4yjw7yh264vcs7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -9152,7 +9505,7 @@ self: { mkDerivation { pname = "Hish"; version = "0.1.2.4"; - sha256 = "a9f723b5ff39cb738430f2425e6f2e764c8e5389c8a7a933c9280fd2d9a6b4ed"; + sha256 = "1vdllvcx43r8r4rsk9y8i59qwk3n5rpmwhpj62277jrrzysj7xx9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9171,7 +9524,7 @@ self: { mkDerivation { pname = "Histogram"; version = "0.1.0.2"; - sha256 = "b4af5f50e964e4acae2d7fb3ee2cda7eb02fe151c9d9fa2938fab0bbe850c001"; + sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl"; libraryHaskellDepends = [ base containers gnuplot ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -9183,7 +9536,7 @@ self: { mkDerivation { pname = "Hmpf"; version = "0.1"; - sha256 = "a7fb73c6f2b6b7638a7cc8b4c232987e41a52be89f99b481d8b8ffb17d6a8253"; + sha256 = "0lw2d9yv3zxqv20v96czx0msahbyk0rc5d68gj567dxnyb377yx7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -9202,7 +9555,7 @@ self: { mkDerivation { pname = "Hoed"; version = "0.3.6"; - sha256 = "8508f5077a0a45662af4dddd44bf1ce55fb4cd007b0246ce193ff6d439c351db"; + sha256 = "1nsiqcwx9xiz3774c0kv036v8pz53jzl9pfxyhm6ci8ag83za245"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9221,7 +9574,7 @@ self: { mkDerivation { pname = "HoleyMonoid"; version = "0.1.2"; - sha256 = "299f34a70c85f0f6858b7fb1af6b7466e81e543c4ad9d2007449d2dc977d4978"; + sha256 = "0y29gnbxrlj9fh0d5naa7ia1xs36fimszcbzif2zdw451jkk97r9"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/MedeaMelana/HoleyMonoid"; description = "Monoids with holes"; @@ -9236,7 +9589,7 @@ self: { mkDerivation { pname = "Holumbus-Distribution"; version = "0.1.1"; - sha256 = "e8b0c77059c59dc0103331c978c6deb8805e36b520404f85775780ed7c9714d6"; + sha256 = "1mhljxyfv02pfy2lyh10nlv5x05qvv37ij9i6c8c17f5b5qcgc78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9258,7 +9611,7 @@ self: { mkDerivation { pname = "Holumbus-MapReduce"; version = "0.1.1"; - sha256 = "081f43851af54e1d3dd3a3238005fd595fd3dde7a1ba1ecf6e91067efb911c37"; + sha256 = "0dqwj7xpw1lidv7ixfm1wzfx6psrzl2q08x3scyiskpm3a2l67q8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9281,7 +9634,7 @@ self: { mkDerivation { pname = "Holumbus-Searchengine"; version = "1.2.3"; - sha256 = "18afe54d818279e4fd08e96ad0b0df657c7a16adac4048fb9846ba111c91a0cf"; + sha256 = "1kx0j4f13fj6k3xlhh5cmlb7lz35vyqd0sp913yy8yc2h56ybbqq"; libraryHaskellDepends = [ base binary bytestring bzlib containers deepseq directory enummapset filepath hslogger hxt hxt-cache hxt-curl @@ -9302,7 +9655,7 @@ self: { mkDerivation { pname = "Holumbus-Storage"; version = "0.1.0"; - sha256 = "9814a8e05f979da49cc6c20ef728f569ff650aa81858d6a24168c0aef3a846ff"; + sha256 = "1zs6m3rsxh3886idcn0qm056bzv9yllgf3n2qsfa97cpbzhah54q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9320,7 +9673,7 @@ self: { mkDerivation { pname = "Homology"; version = "0.1.1"; - sha256 = "36656dabe90374fd548150a101322f9a24b0a0bd9f32f972f014eabb85779889"; + sha256 = "12cqfy2vpshly1rgjclzpnhb094s5wr038ahh5agsx03x6mnsr9n"; libraryHaskellDepends = [ base containers vector ]; homepage = "http://www.math.ucla.edu/~damek"; description = "Compute the homology of a chain complex"; @@ -9335,7 +9688,7 @@ self: { mkDerivation { pname = "HongoDB"; version = "0.0.1"; - sha256 = "3b15d27be5f106d99e482280e7cfc93b5d59ba7c82e9d76b29534ce9ceeebca5"; + sha256 = "19dwxv7fjk2k55mxgsc2gjx5jp9vr77yg01292gdj1piwmxx459v"; libraryHaskellDepends = [ attoparsec attoparsec-binary base blaze-builder bytestring directory enumerator hashable monad-control mtl unix @@ -9352,7 +9705,7 @@ self: { mkDerivation { pname = "HostAndPort"; version = "0.2.0"; - sha256 = "15a625f5e0f1a510fa1a307127abae2ae2589d9525ff60ed33be39230f335be6"; + sha256 = "1rjv6c7j6fdy6gnn1zr5jnfmiqiamsmjfw9h3bx119giw3sjb9hm"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base doctest hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -9366,7 +9719,7 @@ self: { mkDerivation { pname = "Hricket"; version = "0.1"; - sha256 = "028961465c34065ca179388435ef37f95d365465422bb44d9e43ac472585b532"; + sha256 = "0cmmhljlgb23kr6v8as2cma3cpgr6zpkb11qg6hmq1ilbi363282"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers ]; @@ -9384,7 +9737,7 @@ self: { mkDerivation { pname = "Hs2lib"; version = "0.6.3"; - sha256 = "b6a26938cb1385904abccebd2b224e1101d351c6c3c33256946ab505357c537a"; + sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9409,7 +9762,7 @@ self: { mkDerivation { pname = "HsASA"; version = "0.2"; - sha256 = "c18c8864aca2f11215f9b2cfb50b32d9e1bc4d6c3eb82b204199a23db017aecd"; + sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361"; libraryHaskellDepends = [ array base random ]; homepage = "http://repetae.net/recent/out/HsASA.html"; description = "A haskell interface to Lester Ingber's adaptive simulating annealing code"; @@ -9423,7 +9776,7 @@ self: { mkDerivation { pname = "HsHTSLib"; version = "1.3.2.0"; - sha256 = "d54c2cb03b042212b053011011249b24871155c32698cdc53694d618475b5555"; + sha256 = "0mambd3iimll6v2wv616qdai31r4kcj12401afq148h47fq2qk6m"; libraryHaskellDepends = [ base bytestring bytestring-lexing conduit-combinators containers inline-c mtl template-haskell @@ -9437,7 +9790,7 @@ self: { mkDerivation { pname = "HsHaruPDF"; version = "0.0.0"; - sha256 = "fa9e9f1a478a2d9f8ad5c45b87fa5d578bcdccac94bfaede89e28f1a66872efa"; + sha256 = "1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps"; libraryHaskellDepends = [ base ]; description = "Haskell binding to libharu (http://libharu.sourceforge.net/)"; license = stdenv.lib.licenses.bsd3; @@ -9451,7 +9804,7 @@ self: { mkDerivation { pname = "HsHyperEstraier"; version = "0.4"; - sha256 = "68e2dbcbe3e72b0f8c009bcd4d63be8b16d5e39cd8abca0a3e89d30bdfb3f660"; + sha256 = "0q7nngghplw97q5cmayqkkixa5lbprilvkcv0260yaz7wg5xpqk8"; libraryHaskellDepends = [ base base-unicode-symbols bytestring network text ]; @@ -9467,7 +9820,7 @@ self: { mkDerivation { pname = "HsJudy"; version = "0.2"; - sha256 = "704aca42fe2663025d917754a8e4096060fe72bccc9d60ad1fcbd877bcd4edfa"; + sha256 = "1ypdsjy7gn6b3ynn17fcpirgwq3017jahm3pj5fh4qr6zr1cljkh"; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ Judy ]; homepage = "http://www.pugscode.org/"; @@ -9477,13 +9830,14 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, integer-gmp, network, openssl - , time + ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network + , openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.1"; - sha256 = "03445cb1ed881f3a8825e375d87af92a5521549ab86042a5bd4d6052b4e7bfbd"; + version = "0.11.4.9"; + sha256 = "0y5khy8a1anisa8s1zysz763yg29mr6c9zcx4bjszaba5axyj3za"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring integer-gmp network time ]; @@ -9500,7 +9854,7 @@ self: { mkDerivation { pname = "HsOpenSSL-x509-system"; version = "0.1.0.3"; - sha256 = "5bdcb7ae2faba07a374109fea0a1431ae09d080f8574e60ab7a351b46f931f92"; + sha256 = "14hzjdpv8ld3nw5fcx451w49vq0s8fhs1zh984vpm85b5ypbgp2v"; libraryHaskellDepends = [ base bytestring HsOpenSSL unix ]; homepage = "https://github.com/redneb/HsOpenSSL-x509-system"; description = "Use the system's native CA certificate store with HsOpenSSL"; @@ -9513,7 +9867,7 @@ self: { mkDerivation { pname = "HsParrot"; version = "0.0.2.20150805"; - sha256 = "ea98d38cd15d82689a3f0b3010b00cf07d93a94820d11781c122af5fa89b3d34"; + sha256 = "0d1xkfl5zbr2q60igl9092lr6zgh1jq10c0b7yd6i0jxs66d767a"; libraryHaskellDepends = [ base bytestring HsSyck pretty pugs-DrIFT ]; @@ -9526,7 +9880,7 @@ self: { mkDerivation { pname = "HsPerl5"; version = "0.0.6.20150815"; - sha256 = "5f7c198b47a9aca65d6ca201fb3cad78327c7c1f3cb23a517de4322a42fd4896"; + sha256 = "15j8zm12lcp4gm8kmciw3xy7qckqmlygn0d2difsdb598y5ijz2z"; libraryHaskellDepends = [ base ]; description = "Haskell interface to embedded Perl 5 interpreter"; license = stdenv.lib.licenses.bsd3; @@ -9538,7 +9892,7 @@ self: { mkDerivation { pname = "HsSVN"; version = "0.4.3.3"; - sha256 = "87ddd1a22d3e2a6a5f3ee29d7e5b19a6a3352394082198bf2573fa2ad96fa4fb"; + sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7"; libraryHaskellDepends = [ base bytestring mtl stm ]; homepage = "https://github.com/phonohawk/HsSVN"; description = "Partial Subversion (SVN) binding for Haskell"; @@ -9551,7 +9905,7 @@ self: { mkDerivation { pname = "HsSyck"; version = "0.53"; - sha256 = "8efbb26aba294f495fa3615b496fe569fbc6189799899af8fdd546392d97249f"; + sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf"; libraryHaskellDepends = [ base bytestring hashtables syb utf8-string ]; @@ -9564,7 +9918,7 @@ self: { mkDerivation { pname = "HsTools"; version = "0.0.1.1"; - sha256 = "b4d879266ddb09abea653f7e27c2d318e7bd5f18aa551cd8908075d27774562d"; + sha256 = "0banfivx4xc0j3c1qmda31gvvrqqsg12fzizcpman2fvdlk7kn5l"; libraryHaskellDepends = [ base ghc-prim ]; description = "Haskell helper functions"; license = stdenv.lib.licenses.bsd3; @@ -9579,7 +9933,7 @@ self: { mkDerivation { pname = "Hsed"; version = "0.2.2"; - sha256 = "4a64103818e4896b61e260dce19dcd756419beaeff7fac8f3cbc52fc157b6227"; + sha256 = "09v2gcazqlmw7j7sqzzzmsz1jr3mrnfy3p30w9hnp2g430w10r2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9601,9 +9955,9 @@ self: { mkDerivation { pname = "Hsmtlib"; version = "2.8.8.8"; - sha256 = "4bc1d1af5f7d514b154691619beeb323d0730999628cfd07038961c673d165fd"; + sha256 = "1zb5s5rwcqc90c3zv332k44p7l13ngp9nqci8qalnlbxbypx3hab"; revision = "1"; - editedCabalFile = "01f30561cce8648a656f075ba1e1f8c23144e7f10c6377a7949881dc513f8a89"; + editedCabalFile = "12ca7x8xr0cqjjkpfqqcy7kl8cf2z3hs2nq7dxjqlr78rihhbwq1"; libraryHaskellDepends = [ base containers parsec pretty process smtLib transformers ]; @@ -9620,7 +9974,7 @@ self: { mkDerivation { pname = "HueAPI"; version = "0.2.7"; - sha256 = "041a08272fadadeac496f04d5fd3f9a4da8a4122fed2c0b9ec3e875d5273b900"; + sha256 = "005rfd95v1ryxjww1lpy490qmnm4z79mykghjv2fmbdd5wkhh6h4"; libraryHaskellDepends = [ aeson base containers lens lens-aeson mtl transformers wreq ]; @@ -9637,7 +9991,7 @@ self: { mkDerivation { pname = "HulkImport"; version = "0.1.0.3"; - sha256 = "70d0a2a086dab3c2f08592cc421f2f005ec65dd00b83a42c957a54bfd39496cd"; + sha256 = "1kcnjk9vym3sjlna90qbs1fwcph05wgl5k4jhpqc5cyshsha5l3h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base pretty text ]; @@ -9656,7 +10010,7 @@ self: { mkDerivation { pname = "Hungarian-Munkres"; version = "0.1.5"; - sha256 = "0d138c6c8247c4c503724e75651668f85d4f4fe4dbbc5f07271773a7337b503c"; + sha256 = "0g2hgcrsfwqp4w3mzg6vwi7lypgqd0b6axaff81wbi27h9n8q4qd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ array base Munkres random tasty tasty-quickcheck @@ -9666,12 +10020,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "Hydrogen" = callPackage + ({ mkDerivation, aeson, base, binary, directory, HFitUI, MissingH + , shakespeare, yaml + }: + mkDerivation { + pname = "Hydrogen"; + version = "0.1.0.0"; + sha256 = "10n45j8ri1svxhplpfj88riqk4qigzl02cqxkk3mrsahhgn6bkmp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary directory HFitUI MissingH shakespeare yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + 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 ({ mkDerivation, base, containers, directory }: mkDerivation { pname = "IDynamic"; version = "0.1"; - sha256 = "e83b1962e9cacd32779a0ce7c184041132cf179e9b1804ffec0bdccf3b1490dc"; + sha256 = "1p4h2hxwzp0bxkzh864vkqbwychi0j2c3rqck9vk5kfax5i1jfz8"; libraryHaskellDepends = [ base containers directory ]; description = "Indexable, serializable form of Data.Dynamic"; license = stdenv.lib.licenses.bsd3; @@ -9683,7 +10058,7 @@ self: { mkDerivation { pname = "IFS"; version = "0.1.1"; - sha256 = "b9033330795053590b313ea72cceb58a3bcffa27e56be60759fde95af55d4de4"; + sha256 = "1r2dbpsmmsgxb43ycsz54zxcyfwanp72r9ry645mjlshg4q360xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9702,7 +10077,7 @@ self: { mkDerivation { pname = "INblobs"; version = "0.1.1"; - sha256 = "20ace703a9b87ff6c9495f6f99213737bbde47b250415287954060a7fa303412"; + sha256 = "04il63xafq20jn3m4hahn93xxfrp6whrjvsz974zczxqm41ygb10"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -9720,7 +10095,7 @@ self: { mkDerivation { pname = "IOR"; version = "0.1"; - sha256 = "0a61884f2c134f9bd0a5ebff0103b539118a7845fd4d4adecdeaf20bd4d63646"; + sha256 = "0iinsva0pwparpg4lkgx8mw8l49rnl1h3zzblp89nkqk5i7qhq8a"; libraryHaskellDepends = [ base mtl ]; description = "Region based resource management for the IO monad"; license = stdenv.lib.licenses.bsd3; @@ -9734,7 +10109,7 @@ self: { mkDerivation { pname = "IORefCAS"; version = "0.2.0.1"; - sha256 = "abb984358deedcbc904899f19756487a86ce44264d520193c2158c9eca646e1b"; + sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb"; libraryHaskellDepends = [ base bits-atomic ghc-prim ]; testHaskellDepends = [ base bits-atomic ghc-prim HUnit QuickCheck time @@ -9750,7 +10125,7 @@ self: { mkDerivation { pname = "IOSpec"; version = "0.3"; - sha256 = "dedf2b3b1b25e07b30e9228c446d911414c58101a3f1f7bc0e544787ba159437"; + sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy"; libraryHaskellDepends = [ base mtl QuickCheck Stream ]; description = "A pure specification of the IO monad"; license = stdenv.lib.licenses.bsd3; @@ -9763,9 +10138,9 @@ self: { mkDerivation { pname = "IPv6Addr"; version = "0.6.3"; - sha256 = "d51d7316a72e7cbe680cafda0b422d07bf9755261f040061ae72351aaf470e02"; + sha256 = "00hf8ypildbjmrhh010z4rarggq75m10pnmg1ilbwz1flwb767fm"; revision = "1"; - editedCabalFile = "55425a8e76d1b236298bd447f5ff7d4280a8eb51e0c1e363ed2c6a418dadbb85"; + editedCabalFile = "11dvmn6l2sicxmiy7hg0a7msi022gpzzaiyliclkdcnifs75lhjm"; libraryHaskellDepends = [ attoparsec base iproute network network-info random text ]; @@ -9777,12 +10152,62 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.0.1"; + sha256 = "01s2lml150mcb9qfaq0i19fx8ri19c0dba3rzl0q9w30kv8ykxyz"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "IPv6DB" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger + , hedis, hspec, http-client, http-types, IPv6Addr, mtl + , optparse-applicative, text, unordered-containers, vector, wai + , wai-logger, warp + }: + mkDerivation { + pname = "IPv6DB"; + version = "0.2.1"; + sha256 = "1730whn02k1d9w6znfiibz8slwwnbrm1z47s544c24vdziwfh54v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring fast-logger hedis http-types IPv6Addr mtl + optparse-applicative text unordered-containers vector wai + wai-logger warp + ]; + testHaskellDepends = [ + aeson base hspec http-client http-types vector + ]; + homepage = "http://ipv6db.cybervisible.com"; + description = "A RESTful Web Service for IPv6-related data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { pname = "IcoGrid"; version = "0.1.2"; - sha256 = "16317e247510e2bc1e4920f21299e06af7c394543205f0b0e8ac35d70b16cb67"; + sha256 = "0ryb2q5xfddcx2qg019jajac7xvaw2ci5wi094gbrqhhflj7wc8n"; libraryHaskellDepends = [ array base GlomeVec ]; homepage = "http://www.haskell.org/haskellwiki/IcoGrid"; description = "Library for generating grids of hexagons and pentagons mapped to a sphere"; @@ -9795,7 +10220,7 @@ self: { mkDerivation { pname = "IfElse"; version = "0.85"; - sha256 = "8ad3bfc3e2c867e6330d9bff874b3105476c35b2e1638fd448f233e9f80addcd"; + sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa"; libraryHaskellDepends = [ base mtl ]; description = "Anaphoric and miscellaneous useful control-flow"; license = stdenv.lib.licenses.bsd3; @@ -9806,7 +10231,7 @@ self: { mkDerivation { pname = "Imlib"; version = "0.1.2"; - sha256 = "3ed318a7777a3b0752327b7b128edb3a1d562202b480a6d6b793b79ed90ebd1c"; + sha256 = "075x1vcrxdwknzbad05l08i5c79svf714yvv6990ffvsfykiilry"; libraryHaskellDepends = [ array base X11 ]; librarySystemDepends = [ imlib2 ]; license = stdenv.lib.licenses.bsd3; @@ -9817,7 +10242,7 @@ self: { mkDerivation { pname = "ImperativeHaskell"; version = "2.0.0.1"; - sha256 = "8b5f0b73ec0b16fba40aaaccd1e053408b2d1ec0eb6e2aceb0e73fc3e041fd1a"; + sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/mmirman/ImperativeHaskell"; description = "A library for writing Imperative style haskell"; @@ -9830,7 +10255,7 @@ self: { mkDerivation { pname = "IndentParser"; version = "0.2.1"; - sha256 = "520c9d235ff0afb9ce771bf1b596a5096c46e2204eb1be299670032b5a453351"; + sha256 = "0l9k8md2n0vhjqlvxcaf43i4cv09lnbbbw8vfz7bkbzhbwirs32j"; libraryHaskellDepends = [ base parsec ]; homepage = "http://www.cse.iitk.ac.in/~ppk"; description = "Combinators for parsing indentation based syntatic structures"; @@ -9842,7 +10267,7 @@ self: { mkDerivation { pname = "IndexedList"; version = "0.1.0.1"; - sha256 = "d57539709179de74c116781907d6a31d7b79979e957b308d00924889e3d8efc4"; + sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm"; libraryHaskellDepends = [ base PeanoWitnesses ]; homepage = "https://github.com/kwf/IndexedList"; description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous"; @@ -9855,7 +10280,7 @@ self: { mkDerivation { pname = "InfixApplicative"; version = "1.1"; - sha256 = "f7398e1b1b6c9337b6e238cfafd400d339a9fe04cf35aba272a6624b2d95800d"; + sha256 = "03c0jlnlnqm6faiandfg0kzajffk03aazkrqwav3g4vc3cdqwfgp"; libraryHaskellDepends = [ base haskell98 ]; description = "liftA2 for infix operators"; license = stdenv.lib.licenses.bsd3; @@ -9867,7 +10292,7 @@ self: { mkDerivation { pname = "Interpolation"; version = "0.3.0"; - sha256 = "1bf68489dafd52f25d93a3aad672a2dc7110d77ffb85348cb82c3e5a51e8cb10"; + sha256 = "046bx18mlgicp26391gvgzbi0wfwl9rddam3jdfz4lpxva4q9xhv"; libraryHaskellDepends = [ base haskell-src-meta syb template-haskell ]; @@ -9880,7 +10305,7 @@ self: { mkDerivation { pname = "Interpolation-maxs"; version = "0.3.0"; - sha256 = "f6ed200a65ee53f60c0fc2698fb6dc6154e891b37d2764d5b3f2101890690836"; + sha256 = "0dh8d681h47jngan89vxnf8yhm31vjv8ysf21w6gclzfcl521vgn"; libraryHaskellDepends = [ base syb template-haskell ]; description = "Multiline strings, interpolation and templating"; license = "unknown"; @@ -9893,7 +10318,7 @@ self: { mkDerivation { pname = "IntervalMap"; version = "0.5.2.0"; - sha256 = "031a491ae40c333a3227d147aae9ace42f2f4b535fcbbb991c6b4f35a1531684"; + sha256 = "110nafhkakvb3jcvpjszad5jybz4mklsliyi4wr3lcqcwhd4j6h3"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; benchmarkHaskellDepends = [ @@ -9912,7 +10337,7 @@ self: { mkDerivation { pname = "Irc"; version = "0.1.0.2"; - sha256 = "f18a2c7eb198c6223f02da7f5bea13f89652b8bebe1adb65fbd779e07f920162"; + sha256 = "0qh1j9zy0yfpzdjxn6mypsw555pq2gm5nzys08zj5ilqn5z2r2pi"; libraryHaskellDepends = [ base data-default mtl network transformers ]; @@ -9928,7 +10353,7 @@ self: { mkDerivation { pname = "IrrHaskell"; version = "0.2"; - sha256 = "8c75f12f9ef896886d4eea118aab5003c7cfc6ae170f0dd85993a02c562415c8"; + sha256 = "1j0m4ib2r84kb7c0s3qpmv3cziq3a2mql4ga9rnqi5pqkqpz2xcc"; libraryHaskellDepends = [ base random time ]; doHaddock = false; description = "Haskell FRP binding to the Irrlicht game engine"; @@ -9943,7 +10368,7 @@ self: { mkDerivation { pname = "IsNull"; version = "0.4.0.0"; - sha256 = "757a5088cc81795afd06410cbbe7e3ee27a734602c6db65de9111e5fd31ac019"; + sha256 = "06f03b9my7hix5fvcv9cc0saf9zfwgkvn3210vymlyc1rj450ykm"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring containers hspec HUnit QuickCheck @@ -9964,7 +10389,7 @@ self: { mkDerivation { pname = "JSON-Combinator"; version = "0.2.8"; - sha256 = "d8782aba8b5fb2fff5f6988722090d5d734da9e9e705d8c6f8ea6a5e82dab165"; + sha256 = "0rdiva15wspaz33dh1g7x6llswsx1l4j51wqyvszzcjzifx2ly6q"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-trie containers failure hjson json JSONb parsec text vector @@ -9979,7 +10404,7 @@ self: { mkDerivation { pname = "JSON-Combinator-Examples"; version = "0.0.1"; - sha256 = "8f7b52806a57cd9788391a7378a2e8f5d4b6a278b416eb4b81dcd2699fcbafe8"; + sha256 = "1s5grfgnklnwh55yn5mlg2ibdm7mx2i7hwqs7649gkapda054ywg"; libraryHaskellDepends = [ base bytestring json JSON-Combinator JSONb ]; @@ -9993,7 +10418,7 @@ self: { mkDerivation { pname = "JSONParser"; version = "0.1.0.2"; - sha256 = "724a71c2d97a470744949d37683565ee77890d144d5ded63098e557ad538deba"; + sha256 = "1fny73aplmcf15iyspad2h6qjxzfclsnhdwxji20fivsv7172jkj"; libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; @@ -10006,9 +10431,9 @@ self: { mkDerivation { pname = "JSONb"; version = "1.0.8"; - sha256 = "477eecd8af2f070ff648f576ee81ee04efa45cc77b606f7fc09b6f2c156df299"; + sha256 = "16gjdlajqvwvq1znyq3vqxfa9vq4xs0ywxpm93v0y1rgmzcfqzj7"; revision = "1"; - editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a"; + editedCabalFile = "06l6w3kcskfcy9i52m9d8chxxrk6dk5dvsmlvggylsapkid8bcj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10030,7 +10455,7 @@ self: { mkDerivation { pname = "JYU-Utils"; version = "0.1.1.2"; - sha256 = "895f8339b36ffa6a146209be8b08dfa8caf84178bb13bf71f0bbeeb67eeb6cb0"; + sha256 = "1c3cxdzbdvmvy1qvy4xvg10zijm8vw48pgh9c8a6mykgncwq6pw9"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath lazysmallcheck mtl mwc-random parallel process QuickCheck random @@ -10046,7 +10471,7 @@ self: { mkDerivation { pname = "JackMiniMix"; version = "0.1"; - sha256 = "17f335f1f374982adc4bb8553258bc1c4b5f2abb4b536b64d9303095c3747847"; + sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp"; libraryHaskellDepends = [ base hosc ]; homepage = "http://www.renickbell.net/doku.php?id=jackminimix"; description = "control JackMiniMix"; @@ -10060,7 +10485,7 @@ self: { mkDerivation { pname = "Javasf"; version = "0.0.1"; - sha256 = "50297780db65f009fa8f8b90680bcb8c96ed03949db5c7f494a4e8e0f0d46093"; + sha256 = "14v0skqf1s54jkscgdcxjh1yv5lcrc5ni44bizx0kw35vf07faah"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -10076,7 +10501,7 @@ self: { mkDerivation { pname = "Javav"; version = "0.0.4"; - sha256 = "098e1179abf010ac4a5d2485ea0b53c6e18cabce623e2526dc0f51b8028e5119"; + sha256 = "06aiiq1bhl8gvhk2agk2rsmqrqf6ac5ym194bm5aq47hmdwi33h9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -10090,7 +10515,7 @@ self: { mkDerivation { pname = "Jdh"; version = "0.1.0.1"; - sha256 = "8005db8ccfcdd6bab84fcfb8bfc2b357161d5999e6a0ff121bfdd4ab06ece77d"; + sha256 = "0zg7xh3apm7x3c9gz876k5cis5jpng1bzf6g9ywbmmndry6dn1c0"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/brunoczim/Json-Data-for-Haskell"; description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding"; @@ -10105,7 +10530,7 @@ self: { mkDerivation { pname = "JsContracts"; version = "0.5.3"; - sha256 = "0915ab4d92f72c4148bc1f1a2f19d494dd49e7364b342253bb991ed66e9b869e"; + sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10129,7 +10554,7 @@ self: { mkDerivation { pname = "JsonGrammar"; version = "1.0.5"; - sha256 = "25a476a80407037b8d951a1994186f8a6ec4883414fd4ad04b64425c59f2e18a"; + sha256 = "12p1y9cmqhk49g84mz8l6j4c8vladwc9868sjn6pn0q70jl7d915"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers language-typescript mtl stack-prism text unordered-containers vector @@ -10150,10 +10575,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.8"; - sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644"; - revision = "1"; - editedCabalFile = "5211841fbb8a9a7fe19ce715a749149ab03c28344531bc3163f8580b611a2e3e"; + version = "3.2.8.2"; + sha256 = "1s3qakm7jn2kjx59nlp81hkysz6bxidj3khd8xlny7x8gvjqjk5p"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10168,7 +10591,7 @@ self: { mkDerivation { pname = "JuicyPixels-canvas"; version = "0.1.0.0"; - sha256 = "95f5c368a7b6a7f9a5776abfca575925e3c84ffbfa2e5d3eb583bdf4f80ce978"; + sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm"; libraryHaskellDepends = [ base containers JuicyPixels ]; homepage = "http://eax.me/"; description = "Functions for drawing lines, squares and so on pixel by pixel"; @@ -10181,7 +10604,24 @@ self: { mkDerivation { pname = "JuicyPixels-extra"; version = "0.1.1"; - sha256 = "d37b257e7780e18a4e8335523b2f8962efb845da3b1dd84435a684b24a82b9fd"; + sha256 = "1zdrh95b51566m2dh79vv92vivv2i4pknlimhd78mqc0fxz2ayyk"; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "JuicyPixels-extra_0_2_1" = callPackage + ({ mkDerivation, base, criterion, hspec, JuicyPixels }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.2.1"; + sha256 = "0lai831n9iak96l854fynpa1bf41rq8mg45397zjg0p25w0i1dka"; + revision = "1"; + editedCabalFile = "0f42a7jirsk3ciyd081wcb2pkss34yzfwhaiaclgf17yiav4zzv0"; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; benchmarkHaskellDepends = [ base criterion JuicyPixels ]; @@ -10196,7 +10636,7 @@ self: { mkDerivation { pname = "JuicyPixels-repa"; version = "0.7.1.0"; - sha256 = "b8f11203dd397885fadfd66a03f3720f164fc17f964f3dba6a494afc8411267e"; + sha256 = "0zi6262gqjj9dax3skwngz0ly5hgfbrh6snnvzx8ay1rvl1i5wdq"; libraryHaskellDepends = [ base bytestring JuicyPixels repa vector ]; @@ -10211,7 +10651,7 @@ self: { mkDerivation { pname = "JuicyPixels-scale-dct"; version = "0.1.1.2"; - sha256 = "9abd9d00520424912201b58343f252362b9f34760023d3324732ca00a906fe96"; + sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -10228,7 +10668,7 @@ self: { mkDerivation { pname = "JuicyPixels-util"; version = "0.2"; - sha256 = "2c7b3fb6f3da6d77870bbc356db59afb05f1ab00392b060a8503b5895ee959ac"; + sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc"; libraryHaskellDepends = [ base JuicyPixels vector ]; homepage = "https://github.com/fumieval/JuicyPixels-util"; description = "Convert JuicyPixel images into RGBA format, flip, trim and so on"; @@ -10242,7 +10682,7 @@ self: { mkDerivation { pname = "JunkDB"; version = "0.1.1.0"; - sha256 = "bd093833eee79c6ec905cd7d0647b31a0e53c06a67c3a338c776f2e82e9cc83c"; + sha256 = "0g68khpfiwknqwwa7hv7db0563hsnd3hczfd0p4nx777xqrkh2dx"; libraryHaskellDepends = [ aeson base binary bytestring conduit data-default directory filepath mtl network resourcet @@ -10258,7 +10698,7 @@ self: { mkDerivation { pname = "JunkDB-driver-gdbm"; version = "0.1.1.0"; - sha256 = "528e24769b026f63aeaf60d84bbb78f9af2daff4e8fd13dcab675f6038511ae1"; + sha256 = "1q8sa4w60pv7mgf17zg8yjpjvbzrg2xlpn30myp66vq2kdv293jj"; libraryHaskellDepends = [ base bytestring conduit directory filepath JunkDB mtl resourcet ]; @@ -10273,7 +10713,7 @@ self: { mkDerivation { pname = "JunkDB-driver-hashtables"; version = "0.1.1.0"; - sha256 = "602f6c1d276a5aa257e62b4d89ff57ee807edfc95940cc524ebe917b3770050d"; + sha256 = "0385f0vpp4dy9r9cqh2rr7gpx07fazzqjk9bwrbs4nka4wfnqbv0"; libraryHaskellDepends = [ base bytestring conduit hashable hashtables JunkDB mtl resourcet ]; @@ -10286,7 +10726,7 @@ self: { mkDerivation { pname = "JustParse"; version = "2.1"; - sha256 = "4ac9bd0dbcd8ce638fc5bb28ce26600ef4734fef584b6b60348b2c177411349a"; + sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/grantslatton/JustParse"; description = "A simple and comprehensive Haskell parsing library"; @@ -10298,7 +10738,7 @@ self: { mkDerivation { pname = "KMP"; version = "0.1.0.2"; - sha256 = "16ee3b3c6515edce33355697297d9e3c5e78770c0dd1045816580210a5c3b791"; + sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base Cabal ]; homepage = "https://github.com/CindyLinz/Haskell-KMP"; @@ -10311,7 +10751,7 @@ self: { mkDerivation { pname = "KSP"; version = "0.1"; - sha256 = "c662e788017fb8122c3ac36946e95202871f8d7f0130717dd9cbf6ad76ca52a7"; + sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/frosch03/kerbal"; description = "A library with the kerbal space program universe and demo code"; @@ -10324,7 +10764,7 @@ self: { mkDerivation { pname = "Kalman"; version = "0.1.0.1"; - sha256 = "85e7a6a2a6b7edb257315ddfdb3454f893d6d92ff84f66b91b3a06018d54edd7"; + sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5"; libraryHaskellDepends = [ base hmatrix ]; homepage = "https://github.com/idontgetoutmuch/Kalman"; description = "A slightly extended Kalman filter"; @@ -10337,7 +10777,7 @@ self: { mkDerivation { pname = "KdTree"; version = "0.2.1"; - sha256 = "c1445c42b83a36eb03fa24116bdcda08943e956fceec943dff1d40ece19a41ee"; + sha256 = "1vj1kbhyqh0xzwyr9v6fdyakx508vbf6n494z81yndisp115qi61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -10354,7 +10794,7 @@ self: { mkDerivation { pname = "Ketchup"; version = "0.4.3"; - sha256 = "a11d258c574ac8be37b42cb2f1af0b9d2a7ae46f8a1cfb5687b90fc85cb7adb8"; + sha256 = "1f5dnxfch3xrhxbgn74adzj7lalx1fpz3cicnhvvxj2aay62a7d1"; libraryHaskellDepends = [ base base64-bytestring bytestring directory mime-types network text ]; @@ -10372,7 +10812,7 @@ self: { mkDerivation { pname = "KiCS"; version = "0.9.3"; - sha256 = "767f1aa98dff677686aff38b5bb1962362ab27bed64d5eea6a66907c55d1b77c"; + sha256 = "0z5ps5apr436dbm5wkfnpqksnqi3jsqmp2zkmy37crzzinlilzvn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10397,7 +10837,7 @@ self: { mkDerivation { pname = "KiCS-debugger"; version = "0.1.1"; - sha256 = "6156d3b57cec36347695e8d5c592f0ae6070c4002f1220c565cb3b8a68c46dc3"; + sha256 = "1hvdqil8lfybcp2j04ig03270q5fy29cbmg8jmv38dpcgjsx6mk1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10417,7 +10857,7 @@ self: { mkDerivation { pname = "KiCS-prophecy"; version = "0.1.1"; - sha256 = "593fb10ad3c59e45cbf8f6f8bfcff8556dcfd949014c5257b3a06ef544474750"; + sha256 = "0l278x2gavm0ndbm4k0197cwyvamz37vzy7nz35lb7n5sc5b2gsr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath KiCS ]; @@ -10433,7 +10873,7 @@ self: { mkDerivation { pname = "Kleislify"; version = "0.0.4"; - sha256 = "d4f78a0d7a526398301c5e959ae61151acc2325bdcf86e7a4b909cb3ba36ee38"; + sha256 = "0f7f6sxb774h9dx6xy6wbcrc5b2i27k9m5ay3hq9hqsjg86qmxyl"; libraryHaskellDepends = [ base ]; description = "Variants of Control.Arrow functions, specialised to kleislis."; license = stdenv.lib.licenses.bsd3; @@ -10444,7 +10884,7 @@ self: { mkDerivation { pname = "Konf"; version = "0.1.0.0"; - sha256 = "2623d1b198ae9e56ba3ea50ab7dfe876b73ff288b44fa54292272cc4d5ea7284"; + sha256 = "113jxbaw8b17j91aakxli3r3zdvnx3gvf2m57sx5d7mfk2qx28r6"; libraryHaskellDepends = [ base containers parsec ]; homepage = "http://www.gkayaalp.com/p/konf.html"; description = "A configuration language and a parser"; @@ -10457,7 +10897,7 @@ self: { mkDerivation { pname = "Kriens"; version = "0.1.0.1"; - sha256 = "5c8fa68abb1db66c234dcb378cf0de08b21e3e6a2daaf888feda5a0c0c22d9ac"; + sha256 = "1b6r4860qnnszs4giaidd8z1xch8vvq8qdyb9linrdhxpf5ad3sw"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/matteoprovenzano/kriens-hs.git"; description = "Category for Continuation Passing Style"; @@ -10472,7 +10912,7 @@ self: { mkDerivation { pname = "KyotoCabinet"; version = "0.1"; - sha256 = "169597fd8e8bd3ec8702c87f429d5eb33c8d5e2a49eb63266ab67c27efbdecd0"; + sha256 = "1l7cpppjfz5nd8k67ss959g8sg5kbsfl4zy80a3yrlwbivyrg58n"; libraryHaskellDepends = [ base bytestring extensible-exceptions ]; librarySystemDepends = [ kyotocabinet ]; homepage = "https://code.google.com/p/kyotocabinet-hs/"; @@ -10488,7 +10928,7 @@ self: { mkDerivation { pname = "L-seed"; version = "0.2"; - sha256 = "62f85b5dbd84e0ff75589f8d596b634ae78a82e827fe2fcbc6b4f2eb801844b6"; + sha256 = "1dj4320fpwmlqv5jzzi7x218mrsacdmmk3czb1szzq44pmfmpy32"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10507,7 +10947,7 @@ self: { mkDerivation { pname = "LATS"; version = "0.4.2"; - sha256 = "43eb07e25804a5c1f2671d0e845da2eca5910f13e92889c970ea4a5d4ef9a3b7"; + sha256 = "1dx3z575sjpaf34qja792c7r39gcl9fq83hxczrc3984b3i0gss3"; libraryHaskellDepends = [ base constraint-classes hmatrix semigroups vector ]; @@ -10523,7 +10963,7 @@ self: { mkDerivation { pname = "LDAP"; version = "0.6.11"; - sha256 = "01cb48801eb3033fbd8be6d755863e7fea7d9083afc76aff07b9c42f8e1890b3"; + sha256 = "1cwh3272zi5r0zznmixghf87vskz7s35bmz6ifyky0xk3s04ijq1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -10541,7 +10981,7 @@ self: { mkDerivation { pname = "LRU"; version = "0.1.1"; - sha256 = "16abc212ffe2e8db1044705077a098bb048995351ffb515c82be168fceeff77a"; + sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn"; libraryHaskellDepends = [ base containers QuickCheck ]; homepage = "http://www.imperialviolet.org/lru"; description = "Implements an LRU data structure"; @@ -10553,7 +10993,7 @@ self: { mkDerivation { pname = "LTree"; version = "0.1"; - sha256 = "7c37101ce51702ab17ba716d789f63ee20d0405df5fc885ee52d322fecf83852"; + sha256 = "0liqz3n2ycidwmg8iz7mbm0d087fcfgphvbip8bsn0hpwlf10dvw"; libraryHaskellDepends = [ base transformers ]; description = "Tree with only leaves carrying the data"; license = stdenv.lib.licenses.publicDomain; @@ -10566,7 +11006,7 @@ self: { mkDerivation { pname = "LambdaCalculator"; version = "0.2"; - sha256 = "d15c5e9262879997db9481387c62073b4efd788319a964351873c0d4bff51a81"; + sha256 = "108synzx9h3k30sn9a8rhdwgskiv0xi7qf41jkdrg6c7ca95wp6i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -10581,7 +11021,7 @@ self: { mkDerivation { pname = "LambdaDB"; version = "0.0.0.6"; - sha256 = "03a00a4282e5770270443f5038f6e64975940ee7d74d981bba1e50b4de92bf81"; + sha256 = "10dzjbgb8l0yp8drhkfpww798xa9wvv3hl1z8iq04xz5h910m803"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers transformers ]; @@ -10593,46 +11033,44 @@ self: { }) {}; "LambdaHack" = callPackage - ({ mkDerivation, array, assert-failure, async, base, binary - , bytestring, containers, data-default, deepseq, directory - , enummapset-th, filepath, ghc-prim, gtk, gtk2, hashable, hsini - , keys, miniutter, mtl, old-time, pretty-show, random, stm - , template-haskell, text, transformers, unordered-containers - , vector, vector-binary-instances, zlib + ({ mkDerivation, assert-failure, async, base, base-compat, binary + , bytestring, containers, deepseq, directory, enummapset-th + , filepath, ghc-prim, hashable, hsini, keys, miniutter, pretty-show + , random, sdl2, sdl2-ttf, stm, template-haskell, text, time + , transformers, unordered-containers, vector + , vector-binary-instances, zlib }: mkDerivation { pname = "LambdaHack"; - version = "0.5.0.0"; - sha256 = "2587949dcdd9f2336b5365031340a0e7aa7705b7ce088dafc9b14a208051f96f"; + version = "0.6.0.0"; + sha256 = "12bvsl4bshks02dqk09nzjz8jd8mspf408h88bmswsxyhq6r03gc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array assert-failure async base binary bytestring containers - data-default deepseq directory enummapset-th filepath ghc-prim gtk - hashable hsini keys miniutter mtl old-time pretty-show random stm - text transformers unordered-containers vector - vector-binary-instances zlib + assert-failure async base base-compat binary bytestring containers + deepseq directory enummapset-th filepath ghc-prim hashable hsini + keys miniutter pretty-show random sdl2 sdl2-ttf stm text time + transformers unordered-containers vector vector-binary-instances + zlib ]; - libraryPkgconfigDepends = [ gtk2 ]; executableHaskellDepends = [ - array assert-failure async base binary bytestring containers - data-default deepseq directory enummapset-th filepath ghc-prim - hashable hsini keys miniutter mtl old-time pretty-show random stm - template-haskell text transformers unordered-containers vector - vector-binary-instances zlib + assert-failure async base base-compat binary bytestring containers + deepseq directory enummapset-th filepath ghc-prim hashable hsini + keys miniutter pretty-show random stm template-haskell text time + transformers unordered-containers vector vector-binary-instances + zlib ]; testHaskellDepends = [ - array assert-failure async base binary bytestring containers - data-default deepseq directory enummapset-th filepath ghc-prim - hashable hsini keys miniutter mtl old-time pretty-show random stm - template-haskell text transformers unordered-containers vector - vector-binary-instances zlib + assert-failure async base base-compat binary bytestring containers + deepseq directory enummapset-th filepath ghc-prim hashable hsini + keys miniutter pretty-show random stm template-haskell text time + transformers unordered-containers vector vector-binary-instances + zlib ]; - homepage = "http://github.com/LambdaHack/LambdaHack"; + homepage = "https://lambdahack.github.io"; description = "A game engine library for roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; + }) {}; "LambdaINet" = callPackage ({ mkDerivation, base, containers, GLFW, GLFW-task, monad-task, mtl @@ -10641,7 +11079,7 @@ self: { mkDerivation { pname = "LambdaINet"; version = "0.2.0.0"; - sha256 = "933379242330b3f627786beae80513528e7d8cc801dfdf50962f85fd5b11b4c1"; + sha256 = "1hdl25dzv19gjr8dzpq1r267v3jj2c2yiskbg0kzdcrh4cj7jcwk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -10661,7 +11099,7 @@ self: { mkDerivation { pname = "LambdaNet"; version = "0.2.0.0"; - sha256 = "e4d7e6b1ec41283b4b19ba84ff4eb333fb82d0378fca46c208dfabb581194f1b"; + sha256 = "06sg360vbayz1314djlg6z885yrknd7gz15s355kna21xjqydmz4"; libraryHaskellDepends = [ base binary bytestring hmatrix random random-shuffle split ]; @@ -10679,7 +11117,7 @@ self: { mkDerivation { pname = "LambdaPrettyQuote"; version = "0.0.0.8"; - sha256 = "547978d457b13de9d05bd05e9f8461ed8100ffc337adf8ad391083a6fb4bb067"; + sha256 = "0rxh9gxsd0qh76nzib9pqgzh10gdc629ypnhbg8fjgdiaza7hyal"; libraryHaskellDepends = [ base DebugTraceHelpers HUnit lambda-ast mtl parsec QuickCheck syb template-haskell test-framework test-framework-hunit @@ -10703,7 +11141,7 @@ self: { mkDerivation { pname = "LambdaShell"; version = "0.9.3"; - sha256 = "5b46b71a862b931da758bc8a1bb3d69c831a54956bd3bd92c50f3237b8a51fdb"; + sha256 = "1nqzlnw3fchgqn9bvlvbjma1m0wwssrip2mwb2kiv4rbhqdbfijv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -10719,7 +11157,7 @@ self: { mkDerivation { pname = "Lambdajudge"; version = "1.0.0.4"; - sha256 = "652cc0c857d0fc65d405fdc62bd4e84d8bf18e878a2fbf66d79c087d38d3436d"; + sha256 = "0va3scw7s24wsxkbybwahy7g32sdx3a2pipx0pa6bz6haz4c0b35"; libraryHaskellDepends = [ base filepath hspec mtl process text ]; testHaskellDepends = [ base filepath hspec mtl process text ]; homepage = "http://venugangireddy.github.io/Lambdajudge/"; @@ -10735,7 +11173,7 @@ self: { mkDerivation { pname = "Lambdaya"; version = "0.3.0.0.0"; - sha256 = "9a54212c2fe90cad44bf64c2c6f696e71905e3b1e3fdff98fe0749a3b335fc52"; + sha256 = "0lpw6nrs6j87zscgzzg3n7iha6g7jvvcdhk4px2as3795wn22m4s"; libraryHaskellDepends = [ base binary mtl network pipes pipes-binary pipes-network pipes-parse @@ -10750,7 +11188,7 @@ self: { mkDerivation { pname = "LargeCardinalHierarchy"; version = "0.0.1"; - sha256 = "e221b2bb87d0e64b98a4c134ab868cfcc7e6928ecc5b2c474ecb17385211f829"; + sha256 = "0agq2593h5yb9r3jqnycis9fdizwij3and61ljc4prnhhyxv48g2"; libraryHaskellDepends = [ base ]; description = "A transfinite cardinal arithmetic library including all known large cardinals"; license = "unknown"; @@ -10764,7 +11202,7 @@ self: { mkDerivation { pname = "Lastik"; version = "0.7.0"; - sha256 = "b5e9ee213a087d5bc13574becd36bcfdf27a35907db3a882fd1ab74cc55708af"; + sha256 = "1bq8az2lrdqszn1aicvxj0spmwpxphvcvgkl6p0mnz8878hyxsdm"; libraryHaskellDepends = [ base bytestring containers directory filemanip filepath process pureMD5 SHA zip-archive @@ -10782,7 +11220,7 @@ self: { mkDerivation { pname = "Lattices"; version = "0.0.2"; - sha256 = "8eebdb8755fb27679b8c9dab7bbc73f46612d22c06286817414a62ac19b40430"; + sha256 = "0c04nhcsqqja84bnha065k914rplffy7pawxijdnf9zvan3xpswf"; libraryHaskellDepends = [ array base HaskellForMaths ]; testHaskellDepends = [ array base HaskellForMaths HUnit test-framework @@ -10799,7 +11237,7 @@ self: { mkDerivation { pname = "Lazy-Pbkdf2"; version = "2.1.2"; - sha256 = "8a39397ba2756a1a3a7a7802e5d4cb824377289acb8c21aec37a76494daba1a3"; + sha256 = "18x1md6ljxksqfp2336bk8l7fhw2rgafa0kqg8x1lskml9xkjfca"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base base16-bytestring binary bytestring cryptonite memory @@ -10813,7 +11251,7 @@ self: { mkDerivation { pname = "LazyVault"; version = "0.0.1"; - sha256 = "584eec70bff76a404cdc0f838c89c521bc059c3e1059ffe69faf4c2fd95f00f9"; + sha256 = "1y80bzcjyk5gkzkgyn8h7sf0bg11qn4qr0qgvi640spppxqfqkjq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath unix ]; @@ -10828,7 +11266,7 @@ self: { mkDerivation { pname = "Level0"; version = "1.0"; - sha256 = "bb7fce37969af879d8788f26054d6f7f484f5d1aa46ca541b54576512f46ffce"; + sha256 = "1kpz8qpm2xj5nm0sav5439flyj3zdx6ha9lgg3c7ky4sjqvwwzxv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory random SDL SDL-ttf ]; @@ -10846,7 +11284,7 @@ self: { mkDerivation { pname = "LibClang"; version = "3.8.0"; - sha256 = "945c53f04eba97e85aee1a434a79f09956b74a5c6c71d1e73faeb9574c0db9dc"; + sha256 = "1p5r1m65gfdf7zkx2wbcbi5bfmlry1wllhqsxrdfi5xs9vq56p4l"; libraryHaskellDepends = [ base bytestring filepath hashable mtl resourcet text time transformers transformers-base vector @@ -10867,7 +11305,7 @@ self: { mkDerivation { pname = "LibZip"; version = "1.0.1"; - sha256 = "a636e0202d2a3f60d894a814bd9834cf8c62313b67ccc48c295f02a4bebe425f"; + sha256 = "0ps2psza80jz566c9k377cqn536g6jcbs558jkc60gra5lhf0dm6"; libraryHaskellDepends = [ base bindings-libzip bytestring filepath mtl time utf8-string ]; @@ -10878,6 +11316,7 @@ self: { homepage = "http://bitbucket.org/astanin/hs-libzip/"; description = "Bindings to libzip, a library for manipulating zip archives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Limit" = callPackage @@ -10885,7 +11324,7 @@ self: { mkDerivation { pname = "Limit"; version = "1.0"; - sha256 = "017f92b222912828bf667dcd6dafc597cade7994290fcba26a27503c0861a8f9"; + sha256 = "1yd8c443ql17daicn3r9jiwxxjlpqnpnvkbxcszjha4i4ar94zq1"; libraryHaskellDepends = [ base ]; description = "Wrapper for data that can be unbounded"; license = stdenv.lib.licenses.mit; @@ -10897,7 +11336,7 @@ self: { mkDerivation { pname = "LinearSplit"; version = "0.2.1"; - sha256 = "b19dc6af1ee22a5dec923f32b68e1fcd678f996f4e7005d567f6fe4275a72d17"; + sha256 = "05rdlxsl5zpnczahaw2fdycqyryd3y7bccizjbn5sap23spwd7di"; libraryHaskellDepends = [ array base cmdargs haskell98 QuickCheck ]; @@ -10909,22 +11348,26 @@ self: { "LinguisticsTypes" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal - , cereal-text, deepseq, hashable, intern, log-domain, QuickCheck - , stringable, test-framework, test-framework-quickcheck2 - , test-framework-th, text, text-binary, vector-th-unbox + , cereal-text, containers, criterion, deepseq, hashable, intern + , log-domain, QuickCheck, string-conversions, tasty + , tasty-quickcheck, tasty-th, text, text-binary, utf8-string + , vector-th-unbox }: mkDerivation { pname = "LinguisticsTypes"; - version = "0.0.0.2"; - sha256 = "9f5a722b1f88207b42801a72b6fc95453f134b7a4252251876a4ef069b7b4bcb"; + version = "0.0.0.3"; + sha256 = "19s2xjzapkg8k8mcasv9llx825z12a5arai7crjfa6wx7l6v3d1d"; libraryHaskellDepends = [ aeson base bimaps binary bytestring cereal cereal-text deepseq - hashable intern log-domain QuickCheck stringable text text-binary - vector-th-unbox + hashable intern log-domain QuickCheck string-conversions text + text-binary utf8-string vector-th-unbox ]; testHaskellDepends = [ - aeson base binary cereal QuickCheck stringable test-framework - test-framework-quickcheck2 test-framework-th + aeson base binary cereal QuickCheck string-conversions tasty + tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq text ]; homepage = "https://github.com/choener/LinguisticsTypes"; description = "Collection of types for natural language"; @@ -10939,7 +11382,7 @@ self: { mkDerivation { pname = "LinkChecker"; version = "0.1"; - sha256 = "d85978754313fc5337d95723f9a6b2cdce82d8bcc4a865901fc0fe4a19f69403"; + sha256 = "00wlyqclmzn03y86ba64pkc85kndnakgj8spv4vm7z0k8dsphnfq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -10956,7 +11399,7 @@ self: { mkDerivation { pname = "List"; version = "0.6.0"; - sha256 = "03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889"; + sha256 = "12cql8hrahbv8srp2h0g1mwh0pc56w0dxmi2zxvdqbc0p0v25ph3"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/yairchu/generator/tree"; description = "List monad transformer and class"; @@ -10971,7 +11414,7 @@ self: { mkDerivation { pname = "ListLike"; version = "4.5.1"; - sha256 = "b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d"; + sha256 = "139aaraprdlana39bldxzrl1pnvymwpiwymikc1xjg2nbcrla1xp"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -10990,7 +11433,7 @@ self: { mkDerivation { pname = "ListTree"; version = "0.2.3"; - sha256 = "0b3aa1d34193d9f7f90b4afeea681a79ab1595e8e651cae093f8fca3c50f60cc"; + sha256 = "1k301z2s7z7qjghcllg6x2aibavr39lfmzja1gwzgnck879s2fhb"; libraryHaskellDepends = [ base directory filepath List transformers ]; @@ -11005,7 +11448,7 @@ self: { mkDerivation { pname = "ListWriter"; version = "0.1.0.0"; - sha256 = "48cc8ad0a69b47f5cfcbea55f2b221eda39403b31fec620392d721a572f500c3"; + sha256 = "1hq0ymraa8fpj81n5v0znc1r98zd46rg4mgarg7zaiwvlv88mk28"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/YLiLarry/ListWriter"; @@ -11018,7 +11461,7 @@ self: { mkDerivation { pname = "ListZipper"; version = "1.2.0.2"; - sha256 = "491929b44628dbcff91dbbc55dee1bcbaa6292c6fff42b07f9dd05416fff717c"; + sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9"; libraryHaskellDepends = [ base QuickCheck ]; description = "Simple zipper for lists"; license = stdenv.lib.licenses.bsd3; @@ -11029,7 +11472,7 @@ self: { mkDerivation { pname = "Logic"; version = "0.1.0.0"; - sha256 = "0170311de6b6f3f6bc190efd4cbb1ed29fc87920cdcf8f112d398b9880f7f44a"; + sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01"; libraryHaskellDepends = [ base ]; homepage = "http://gogotanaka.me/"; description = "Logic"; @@ -11051,7 +11494,7 @@ self: { mkDerivation { pname = "LogicGrowsOnTrees"; version = "1.1.0.2"; - sha256 = "f3f6e7ee3022a60d279eff5d27fd6d3a7ca25972f18077594f90a15ed9cf16fb"; + sha256 = "1yqnrzcmx8ch9xcpg07if9cs4z1sdpyjfpgzkqkhv9i263pfgxpk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11082,7 +11525,7 @@ self: { mkDerivation { pname = "LogicGrowsOnTrees-MPI"; version = "1.0.0.1.1"; - sha256 = "22f5bcb22e731984e40a76ae1d48b0e59329ac5d3bd633efef7cb8140de8146b"; + sha256 = "0sqlx06i9f3wxzpk7mivbnn2k4z5n141vbkn1bj886bk5srbrx92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11106,7 +11549,7 @@ self: { mkDerivation { pname = "LogicGrowsOnTrees-network"; version = "1.0.0.4"; - sha256 = "7a01eb40f87b5810bfccfb23d49e4a04f7bb630f201425caaa0eeb0a82d9b973"; + sha256 = "0wxrv610msqfmb52a5101xivpxq49agd88zvrjzi0n3vz10fn0bs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11132,7 +11575,7 @@ self: { mkDerivation { pname = "LogicGrowsOnTrees-processes"; version = "1.0.0.2"; - sha256 = "766b912ffe650e0ab7cd23a54b51fa440b9e411b63be1d520936bb815af93334"; + sha256 = "0d1kz5d83frn1591vgk33d0rw2s4z98lp993rnvhl3k5zqpr2svn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11158,7 +11601,7 @@ self: { mkDerivation { pname = "LslPlus"; version = "0.4.3"; - sha256 = "d36342b35c19a8c8596a8dcc85dc6c4f1b3a8374dce5808219f2ade886e89a37"; + sha256 = "0dwsx23fibgj36181rfwfj1kl6sgdkf8bk4dd9cwia0rbjrl4qyk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -11180,7 +11623,7 @@ self: { mkDerivation { pname = "Lucu"; version = "0.7.0.3"; - sha256 = "2b6d62567c4158723725917417718b0b5f6a30e4656e633be5b4dac45ef97027"; + sha256 = "09vhz5gc9nmlwlxn6vk5whq6lpqbidqifx4i4lvp4n21gib64v9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11203,7 +11646,7 @@ self: { mkDerivation { pname = "Lykah"; version = "0.0.2"; - sha256 = "1978ba358278a38cf7f22d60983c4b2d87111e785e9a24109b94e2aa26199cd5"; + sha256 = "1mcw34kamqllkc8296jyg0g131rd9cy9hq1dybvqr8vqh8svly0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11229,7 +11672,7 @@ self: { mkDerivation { pname = "MASMGen"; version = "0.5.0.0"; - sha256 = "ec88b0727eb25a3f9a7d5d71dbc3fe9e935cd11a1be698422d7b952a129bbab9"; + sha256 = "1fdskc92m5bv5m19irhv3b8mr4wyzv1xnwaxgnd3ynmjgrrb127c"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl ]; description = "Generate MASM code from haskell"; @@ -11242,7 +11685,7 @@ self: { mkDerivation { pname = "MBot"; version = "0.1.2.0"; - sha256 = "5edf898d58cfd9fbe4774993db794967e0af4c4202c8e43c788c05ef90a2f223"; + sha256 = "08zjla8fy1ccg0yf9j02896azq3795wxp4s9fzjgpnfgb26qkpsy"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; @@ -11256,7 +11699,7 @@ self: { mkDerivation { pname = "MC-Fold-DP"; version = "0.1.1.0"; - sha256 = "705fe0c8f5d1bb637b5c739196c8309710f942e55fc33397edeb934ba0eee640"; + sha256 = "0h76xsh4p4zbxnbk7hszwm1gj44p6349d4bkbixn7fyiyp4f0pvh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11280,7 +11723,7 @@ self: { mkDerivation { pname = "MFlow"; version = "0.4.6.0"; - sha256 = "4e93f7488152d88359fd100a742c2ea96788284d262f3cd1b50d936f80f1a342"; + sha256 = "0hm3y606z4qdnp8kqbr69ll8hrx95qn782hhzmcq7n2jh54gg4sf"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -11299,7 +11742,7 @@ self: { mkDerivation { pname = "MHask"; version = "0.3.0.0"; - sha256 = "6a67398197c1958f06bbb11a3dcd230f29a0ae31191f1a3676fe46a84848925a"; + sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/DanBurton/MHask#readme"; description = "The category of monads"; @@ -11312,7 +11755,7 @@ self: { mkDerivation { pname = "MSQueue"; version = "0.0.1"; - sha256 = "5e9c85341a23a1720beaf0e8ebaef2268ab970211ddd443f3ec4b3031471db13"; + sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y"; libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ]; homepage = "https://github.com/Julek"; description = "Michael-Scott queue"; @@ -11325,7 +11768,7 @@ self: { mkDerivation { pname = "MTGBuilder"; version = "0.2.0.1"; - sha256 = "77aa6e32de99cef6493a5dadd7bb2209faf16b4268ce70a46c62557f0e672843"; + sha256 = "0hr8cw77ymb2djj71kk889mz3yh94axxgbax794zdklrvqr6xakp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl parsec ]; @@ -11344,7 +11787,7 @@ self: { mkDerivation { pname = "MagicHaskeller"; version = "0.9.6.6.1"; - sha256 = "5f477822961bfdf7d3af73903877c1eb448ddbf323afc73f2f5da18f633a9e6e"; + sha256 = "0vly79iqz8ax5wzwgbr3ygdqsi7bq5vki43kmz9zgz8vjqi7hisz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11372,7 +11815,7 @@ self: { mkDerivation { pname = "MailchimpSimple"; version = "0.2.0.0"; - sha256 = "60f525ea74400168bc5a3d1d348c8ad3431baad772ff937982c02351bbfdc98d"; + sha256 = "13f9znxm28y0h9wr7zvjsym1nhykia63879xbay6h0a0fkm2bxb0"; libraryHaskellDepends = [ aeson aeson-lens base base16-bytestring bytestring cryptohash directory filepath http-conduit http-types lens safe text time @@ -11389,9 +11832,9 @@ self: { mkDerivation { pname = "MaybeT"; version = "0.1.2"; - sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632"; + sha256 = "0cmnfs22ldai0z172rdsvryzsh33a70yax21v03nhr92a4b62plr"; revision = "1"; - editedCabalFile = "399ec60488680853ace716790b8ebaeee1a74da8a24ced5b5caaea4341b88580"; + editedCabalFile = "1045p10l7smabidysk52m16sgqgfpa70ny8nwyn56238i02cd7ir"; libraryHaskellDepends = [ base mtl ]; description = "MaybeT monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -11403,7 +11846,7 @@ self: { mkDerivation { pname = "MaybeT-monads-tf"; version = "0.2.0.1"; - sha256 = "9d1c094635773a24e6e12b5fa1b0041dd5e997f61bde4cb686c1ca468d4d9b0c"; + sha256 = "034v9n6ldjn1hsv4rphvysbykm8x0jqa2prbw7k28fkp6m30j74x"; libraryHaskellDepends = [ base monads-tf transformers ]; description = "MaybeT monad transformer compatible with monads-tf (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -11415,7 +11858,7 @@ self: { mkDerivation { pname = "MaybeT-transformers"; version = "0.2"; - sha256 = "9e4621e689c0cbcbee7f53a5c40cf8d7aabbc982084ca3989eef60df6f433ca1"; + sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily"; libraryHaskellDepends = [ base monads-fd transformers ]; description = "MaybeT monad transformer using transformers instead of mtl"; license = stdenv.lib.licenses.bsd3; @@ -11429,7 +11872,7 @@ self: { mkDerivation { pname = "MazesOfMonad"; version = "1.0.9"; - sha256 = "02075be1011adc99f69f6438a30b8da4b397aef9dcbaec23134a7524cbc73310"; + sha256 = "041kqz5j8xaa2ciyrfnwz6p9gcx4il5s6f34kzv9kp0s07hmn1q2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -11446,7 +11889,7 @@ self: { mkDerivation { pname = "MeanShift"; version = "0.1"; - sha256 = "3c15fad58a94bfa708398ca990179e82ca860f3f3a167effd27d303cf879cb66"; + sha256 = "0rnbg7w3qc3xsbzpw5is7w7qdjl2kqbr1acc744aggwlibazl59w"; libraryHaskellDepends = [ base vector ]; description = "Mean shift algorithm"; license = stdenv.lib.licenses.bsd3; @@ -11458,7 +11901,7 @@ self: { mkDerivation { pname = "Measure"; version = "0.0.2"; - sha256 = "ba090d3a19d6a2426d60e738283a8eccaf5fce096263bf8231fbb2e4e5f4c8ef"; + sha256 = "1vy8ykjy9cpv661byqv21775zbyciqx2hf77c1nl58nn34x0s2ds"; libraryHaskellDepends = [ base ]; description = "A library for units of measurement"; license = stdenv.lib.licenses.bsd3; @@ -11470,7 +11913,7 @@ self: { mkDerivation { pname = "Mecha"; version = "0.0.0.0"; - sha256 = "5c2c92bdb2e808a01430a0b3a4c0e666e6cc644c1f1dd9527c07858a61de0de3"; + sha256 = "1qqdvrhqm187gi9dj78z9ijcrrk6wv0a9cx060aa0278nayr4b2w"; libraryHaskellDepends = [ base machines ]; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; @@ -11483,7 +11926,7 @@ self: { mkDerivation { pname = "Mechs"; version = "0.0.0.0"; - sha256 = "612a9965148844bdc7c0981d1b3cc1a40a805a9d062362b19cc85adf7cee7503"; + sha256 = "00vmxrydynn8kjqn48q6kmd802m4q4y1n7cqq33vsi482ijrjak1"; libraryHaskellDepends = [ base machines ]; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; @@ -11495,8 +11938,8 @@ self: { ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; - version = "0.6.7"; - sha256 = "cdab03dc1394e982dd3144ac433b7548d51a55a1c44ddb864e5ac14057c41672"; + version = "0.6.8"; + sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base newtype-generics ]; @@ -11512,7 +11955,7 @@ self: { mkDerivation { pname = "MetaHDBC"; version = "0.1.4"; - sha256 = "d9531441f95f459a1e5bc4eb4051e6589aa099cb255d9303cefdd97599d88750"; + sha256 = "0l47v2cpbngxrq1r6p95rfcs16jqwr8l1sy4bcg9liazz50i8lyr"; libraryHaskellDepends = [ base convertible hashtables HDBC HDBC-odbc mtl template-haskell ]; @@ -11526,7 +11969,7 @@ self: { mkDerivation { pname = "MetaObject"; version = "0.0.6.20150815"; - sha256 = "4b51fa6f27dd0d687acc0220e338fd45cbe0d7d25b6f1c4799ff6c4eb6577d3d"; + sha256 = "0gbxayv4wv7zk53iqvsvsbby1js5zlwf6802rix6h3fx4xpzllab"; libraryHaskellDepends = [ base containers stringtable-atom ]; description = "A meta-object system for Haskell based on Perl 6"; license = stdenv.lib.licenses.bsd3; @@ -11537,7 +11980,7 @@ self: { mkDerivation { pname = "Metrics"; version = "0.1.2"; - sha256 = "9df832cee4d6fa42667b1ee1a985f2366a1771f84409b7b9414d284af78045cf"; + sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x"; libraryHaskellDepends = [ base hstats ]; homepage = "http://github.com/benhamner/Metrics/"; description = "Evaluation metrics commonly used in supervised machine learning"; @@ -11552,7 +11995,7 @@ self: { mkDerivation { pname = "Mhailist"; version = "0.0"; - sha256 = "939163fe285c2b2b6b2a6febc4adb21248de836690d1537c79a667370557baef"; + sha256 = "1vxsaw2kfrx6g5y57lchcs1xwj0jnanw9svg59mjnasw53z674ck"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -11571,7 +12014,7 @@ self: { mkDerivation { pname = "Michelangelo"; version = "0.2.4.0"; - sha256 = "fe8645825ceda5943c474ed5440eb2f945e8f74b00ace7ba01a339fa60cac93b"; + sha256 = "0fy9r9hglfd306xfgb009gvyhigrn8749maf8wy999gdbj14b1py"; libraryHaskellDepends = [ base bytestring containers GLUtil lens linear OpenGL OpenGLRaw WaveFront @@ -11588,7 +12031,7 @@ self: { mkDerivation { pname = "MicrosoftTranslator"; version = "0.1.0.1"; - sha256 = "0855cf30d5a70c5cc908c8c84e17e2c325cbc669fe678d074ae88253d23d3120"; + sha256 = "081i7p9570p8983qsrzyd73cn9f3w8blxj68134mq357slqcym88"; libraryHaskellDepends = [ aeson base bytestring datetime exceptions http-client lens text transformers url wreq xml @@ -11605,7 +12048,7 @@ self: { mkDerivation { pname = "MiniAgda"; version = "0.2017.2.18"; - sha256 = "bce3d9eb1b99f620cae1fd35046e6829deb564846b1f847168924de251b87d68"; + sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -11627,7 +12070,7 @@ self: { mkDerivation { pname = "MissingH"; version = "1.4.0.1"; - sha256 = "283f2afd46625d98b4e29f77edadfa5e6009a227812ee2ece10091ad6a7e9b71"; + sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; libraryHaskellDepends = [ array base containers directory filepath hslogger HUnit mtl network old-locale old-time parsec process random regex-compat time unix @@ -11646,10 +12089,10 @@ self: { ({ mkDerivation, base, glib, template-haskell }: mkDerivation { pname = "MissingK"; - version = "0.0.0.2"; - sha256 = "0360502acec1fbd91ca0ee5a7ed92d0a7f025b3a6e9a53647924f878cbfbd633"; + version = "0.0.1"; + sha256 = "1x8ygk64v1crj92zwdv2jh7rw5n53k0wx0bkjmkjn2x1vklsdinz"; libraryHaskellDepends = [ base glib template-haskell ]; - homepage = "http://www.keera.es/blog/community/"; + homepage = "http://www.keera.co.uk/blog/"; description = "Useful types and definitions missing from other libraries"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -11661,7 +12104,7 @@ self: { mkDerivation { pname = "MissingM"; version = "0.0.4"; - sha256 = "ba63ffe7543d2562624b7751908cd24414cd73474bc7ed841d1c6129809371a6"; + sha256 = "19kijf02jq8w3n2fvisb8xrws524sa690lbp9di6499xakkzyqxs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -11676,7 +12119,7 @@ self: { mkDerivation { pname = "MissingPy"; version = "0.10.6"; - sha256 = "467af3ec2a77529add93a716de64e3fb5d55701a306a4ae519ca485cc455200d"; + sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6"; libraryHaskellDepends = [ anydbm base MissingH ]; homepage = "http://github.com/softmechanics/missingpy"; description = "Haskell interface to Python"; @@ -11689,7 +12132,7 @@ self: { mkDerivation { pname = "Modulo"; version = "0.2.0.1"; - sha256 = "387e8b66b5a1c0e8a2115ea778db8af5543039d1ab531bed893664b7b3a320d9"; + sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq"; libraryHaskellDepends = [ base numeric-prelude ]; description = "Modular arithmetic via Numeric-Prelude"; license = stdenv.lib.licenses.gpl2; @@ -11700,7 +12143,7 @@ self: { mkDerivation { pname = "Moe"; version = "0.1"; - sha256 = "63158b58fc5483a45269c37b66d92b3b980817fbcc340eca2d4f6beeed3167da"; + sha256 = "1nk767nywssg5p50wd6czcbhi61v5gcncyy3d59a90slzic8n5b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLUT random ]; @@ -11716,7 +12159,7 @@ self: { mkDerivation { pname = "MoeDict"; version = "0.0.4"; - sha256 = "6896d22e1ce081b55fb461fc260ea3613218009ff2c600901a8c4f2f7feef66e"; + sha256 = "0vpnxrzjykwc3a801ipjkw01hck1lc72dz31nigvb0g03hpd55k8"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -11733,7 +12176,7 @@ self: { mkDerivation { pname = "MonadCatchIO-mtl"; version = "0.3.1.0"; - sha256 = "18c24e23bcb14ccfe3d46012b7935a0f7927eff298c7d6f76b087fc4c6715961"; + sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq"; libraryHaskellDepends = [ base extensible-exceptions MonadCatchIO-transformers ]; @@ -11748,7 +12191,7 @@ self: { mkDerivation { pname = "MonadCatchIO-mtl-foreign"; version = "0.1"; - sha256 = "56c9f548cc2cae4a40f55997e56dd28020ec558217df6d6d4db4bf28c32ed849"; + sha256 = "0jfq5v1jigxl9mnnvpqph9ayq840s9nyb5srym04mbicri4gbjan"; libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ]; description = "Polymorphic combinators for working with foreign functions"; license = stdenv.lib.licenses.bsd3; @@ -11762,7 +12205,7 @@ self: { mkDerivation { pname = "MonadCatchIO-transformers"; version = "0.3.1.3"; - sha256 = "10a49c32c22123e053377fe558d0c136c2b3746d15954d60f66f6bc80f0404bd"; + sha256 = "1g840h7whsvgyrh4v58mdmsb7hinq785irbz6x9y08r1q8r9r90h"; libraryHaskellDepends = [ base extensible-exceptions monads-tf transformers ]; @@ -11778,7 +12221,7 @@ self: { mkDerivation { pname = "MonadCatchIO-transformers-foreign"; version = "0.1"; - sha256 = "dc8798506d027f474abb1a07b7c60dc6b5abcd107d630c031d518b8f0e77111c"; + sha256 = "070ifw78z2si3l1hqqvx236spdf61p3bf1qspd54fzq2dm89i1yw"; libraryHaskellDepends = [ base MonadCatchIO-transformers primitive transformers ]; @@ -11795,7 +12238,7 @@ self: { mkDerivation { pname = "MonadCompose"; version = "0.8.4.2"; - sha256 = "71c3a63f4e3592a2f918e1433fecf1f8e75293ded6369c82b12a76e3d88bac78"; + sha256 = "0y5cigcf6xian619qdnnvs9m5rzqy7n3yhz133ws54im9qzsdhvi"; libraryHaskellDepends = [ base data-default ghc-prim kan-extensions mmorph monad-products mtl parallel random transformers transformers-compat @@ -11812,7 +12255,7 @@ self: { mkDerivation { pname = "MonadLab"; version = "0.0.2"; - sha256 = "c7757b2022c9100c72397c2135b33af25d5fc40f775f94b41a2973287b871ddd"; + sha256 = "1p8xhxxjhwr93as98pvp1z25ypgj7arka8bw75r0q46948h7nxf7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec template-haskell ]; @@ -11828,7 +12271,7 @@ self: { mkDerivation { pname = "MonadPrompt"; version = "1.0.0.5"; - sha256 = "b012cbbe83650f741c7b7f6eafcc89dec299b0ac74a758b6f3a8cdfc5d3bbeda"; + sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh"; libraryHaskellDepends = [ base mtl ]; description = "MonadPrompt, implementation & examples"; license = stdenv.lib.licenses.bsd3; @@ -11841,7 +12284,7 @@ self: { mkDerivation { pname = "MonadRandom"; version = "0.5.1"; - sha256 = "9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87"; + sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy"; libraryHaskellDepends = [ base fail mtl primitive random transformers transformers-compat ]; @@ -11854,7 +12297,7 @@ self: { mkDerivation { pname = "MonadRandomLazy"; version = "0.1.1.1"; - sha256 = "0289455d870512953d9e9f30e21d31f26469c0de4fca55abcce2f496cc1b1c7f"; + sha256 = "0zqw3g69dx72rjmmbjjgvv06jr7j64fy4c4zkqyra4h5hxflb282"; libraryHaskellDepends = [ base MonadRandom mtl random ]; description = "Lazy monad for psuedo random-number generation"; license = stdenv.lib.licenses.bsd3; @@ -11866,7 +12309,7 @@ self: { mkDerivation { pname = "MonadStack"; version = "0.1.0.3"; - sha256 = "9fbd6311057ae23e48894ea61b87b8af2a263c1ffc91f2abc563d7de4e60563b"; + sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/bhurt/MonadStack"; description = "Generalizing lift to monad stacks"; @@ -11879,7 +12322,7 @@ self: { mkDerivation { pname = "Monadius"; version = "0.99"; - sha256 = "1db15aecfb5281bd04af14810a2287a8bcf1a90f4dc0f1f6c594366fad4d054b"; + sha256 = "0jq59nnnydllqpvg3h2d1ylz3g58hwi0m08lmw2bv0ajzgn5mc8x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base directory GLUT OpenGL ]; @@ -11896,7 +12339,7 @@ self: { mkDerivation { pname = "Monaris"; version = "0.1.8"; - sha256 = "8bc5319d6490e7a7c89a4849cba77c2a5bb07dbc152b753f0b5688c00187cf57"; + sha256 = "0myghw0w122n1czpaaqmpiyv0nragjkwnja8kb4agrwhcjfk3icb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -11913,7 +12356,7 @@ self: { mkDerivation { pname = "Monatron"; version = "0.3.1"; - sha256 = "06213877722f21ee5e8e2299b81766aa7bdbab5bd383e5d3ab883e5718eea008"; + sha256 = "0250xqc5fgl8mg9yb0ykbfmxnyxacqbvi692irgfw89gf9vkh886"; libraryHaskellDepends = [ base ]; description = "Monad transformer library with uniform liftings"; license = stdenv.lib.licenses.bsd3; @@ -11925,7 +12368,7 @@ self: { mkDerivation { pname = "Monatron-IO"; version = "1.0"; - sha256 = "605bcdc40eaa189f9f4e447b0de931a62860149a91f36098959c76b2bff36d6b"; + sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0"; libraryHaskellDepends = [ base Monatron transformers ]; homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO"; description = "MonadIO instances for the Monatron transformers"; @@ -11938,7 +12381,7 @@ self: { mkDerivation { pname = "Monocle"; version = "0.0.4"; - sha256 = "be04e7f8dd8f9047b3534e67769de2138308f1f170354ff781a644ab9f121add"; + sha256 = "1p8s2agsni56h7vlydbhy7qhi0qkwafpcrsfafrlg44gvpwff15y"; libraryHaskellDepends = [ base containers haskell98 mtl ]; description = "Symbolic computations in strict monoidal categories with LaTeX output"; license = stdenv.lib.licenses.bsd3; @@ -11950,7 +12393,7 @@ self: { mkDerivation { pname = "MorseCode"; version = "0.0.5"; - sha256 = "1f8855fdf26b8f02f7dbd2b7b8450a9022f8052f4568d36cc267b513a6f2f4b5"; + sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z"; libraryHaskellDepends = [ base containers split ]; description = "Morse code"; license = stdenv.lib.licenses.gpl3; @@ -11963,7 +12406,7 @@ self: { mkDerivation { pname = "MuCheck"; version = "0.3.0.4"; - sha256 = "19c850758616259d2a232ff6d1cf654043ef1143fbfdcad13ba695ffab1b77a0"; + sha256 = "183p3fmzz5d67g8wmzgv8c8yyhs0cp7x3xig4cm9s98nhrsm1j0r"; libraryHaskellDepends = [ base directory hashable haskell-src-exts hint mtl random syb temporary time @@ -11983,7 +12426,7 @@ self: { mkDerivation { pname = "MuCheck-HUnit"; version = "0.3.0.4"; - sha256 = "122ed915acb4347e2c962ef62a19d15bf851acbe7e247d75123afe4fb9d3a517"; + sha256 = "05x5sfwlzzis29sps93ypsn53y2vs4cjmxifjqn7wd5lmhaxjbhj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base HUnit MuCheck ]; @@ -11999,7 +12442,7 @@ self: { mkDerivation { pname = "MuCheck-Hspec"; version = "0.3.0.4"; - sha256 = "bc16ce3c7cecbec9ee9323e7fa4369f438e8713c1ec873ca61d042a4ad691a31"; + sha256 = "0c8sd6ns8hnhc7577j0y7iqyhf7ld51zmrr3jgpckgpcghycw5mw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hspec hspec-core MuCheck ]; @@ -12015,7 +12458,7 @@ self: { mkDerivation { pname = "MuCheck-QuickCheck"; version = "0.3.0.4"; - sha256 = "131b470565afa63308c5c92b0a4c83ba92535de8dc589982748c4970f81644e0"; + sha256 = "1q242vw70jccfj19jn6wx1fm74mshd60lay9ql4379mgcl2lf6qk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base MuCheck QuickCheck ]; @@ -12031,7 +12474,7 @@ self: { mkDerivation { pname = "MuCheck-SmallCheck"; version = "0.3.0.4"; - sha256 = "316e15b540ed194c534f62b063a71f85aa180b39edf1274f796be965297d79a5"; + sha256 = "19brgllnbsbbg57jgwgd745iial53ykn7c329x9lq6gd82siavii"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base MuCheck smallcheck ]; @@ -12047,7 +12490,7 @@ self: { mkDerivation { pname = "Munkres"; version = "0.1"; - sha256 = "29708d54b5a19d8015d9517fb6b6508f983722c92598bbac8bba014d3d7b3599"; + sha256 = "169mgcyls0dsifnbp615r4i3g64ga2vbczsiv4aq17d1nma8sw19"; libraryHaskellDepends = [ array base ]; description = "Munkres' assignment algorithm (hungarian method)"; license = stdenv.lib.licenses.bsd3; @@ -12058,7 +12501,7 @@ self: { mkDerivation { pname = "Munkres-simple"; version = "0.1.0.1"; - sha256 = "2b0b964aad3898d2053d411f93f8cf52f85ce57b73cbd41d2c112d98f119bb4c"; + sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb"; libraryHaskellDepends = [ array base bimap containers Munkres ]; description = "Simple and typesafe layer over the Munkres package"; license = stdenv.lib.licenses.bsd3; @@ -12074,7 +12517,9 @@ self: { mkDerivation { pname = "MusicBrainz"; version = "0.2.4"; - sha256 = "d221f8752fe4c0abdb6e681b1b1811af067b2bc202fa3ef869c5cebe631c3db8"; + sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj"; + revision = "1"; + editedCabalFile = "1bnj0wq9q6y2pxjnl1rk5ybdj16g17g7qkzrfnjrwmm7iq8xbm62"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra HTTP http-conduit http-types monad-control resourcet text time time-locale-compat @@ -12085,24 +12530,83 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "MusicBrainz_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , HTTP, http-conduit, http-types, monad-control, resourcet, text + , time, time-locale-compat, transformers, vector, xml-conduit + , xml-types + }: + mkDerivation { + pname = "MusicBrainz"; + version = "0.3"; + sha256 = "1c0vl5zkb8628k5222fg6z806byjqnsxr0h3yw86fzwhgkxqywd4"; + revision = "1"; + editedCabalFile = "1bv1nwl4pijgiw4zpnw6b15d7phj6b8chiqvv42s8vrq51crdvm6"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra HTTP http-conduit + http-types monad-control resourcet text time time-locale-compat + transformers vector xml-conduit xml-types + ]; + homepage = "http://floss.scru.org/hMusicBrainz"; + description = "interface to MusicBrainz XML2 web service"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MusicBrainz-libdiscid" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { pname = "MusicBrainz-libdiscid"; version = "0.5.0.0"; - sha256 = "455dc26fec79b05ad661f75cd7051e3017565ad9042739ce0c64778fe0badc95"; + sha256 = "15fwpbh8yxv41k73j9q4v5d5c5rh3q2xfp7pc7b5mc3rxipw4pa5"; libraryHaskellDepends = [ base containers vector ]; homepage = "https://github.com/atwupack/MusicBrainz-libdiscid"; description = "Binding to libdiscid by MusicBrainz"; license = "LGPL"; }) {}; + "MutationOrder" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps + , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs + , containers, deepseq, directory, DPutils, file-embed, filepath + , FormalGrammars, log-domain, parallel, PrimitiveArray + , PrimitiveArray-Pretty, QuickCheck, serialize-instances + , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text + , unordered-containers, vector, vector-strategies + , ViennaRNA-bindings, zlib + }: + mkDerivation { + pname = "MutationOrder"; + version = "0.0.0.2"; + sha256 = "0bzk2n84j2w1j11b8pi5505kdad3fzr4m86qwkwc9kmv2l25j680"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring + cereal cereal-vector containers deepseq directory DPutils filepath + FormalGrammars log-domain parallel PrimitiveArray + PrimitiveArray-Pretty serialize-instances ShortestPathProblems text + unordered-containers vector vector-strategies ViennaRNA-bindings + zlib + ]; + executableHaskellDepends = [ + base bytestring cmdargs file-embed filepath + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/MutationOrder"; + description = "Most likely order of mutation events in RNA"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MyPrimes" = callPackage ({ mkDerivation, base, containers, time }: mkDerivation { pname = "MyPrimes"; version = "0.1.0.0"; - sha256 = "9e7ed5da25bbfe833bdd89673fd1d1491ae481756df5d4e51491f009b90398af"; + sha256 = "1bwq0fwhkw4i2kjx9xbdfn0y86j9s78kyrw9vlxq7zmv4pddazly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -12119,7 +12623,7 @@ self: { mkDerivation { pname = "NGrams"; version = "1.1"; - sha256 = "cc0a244b0f62ddd9ece292cbb6fce63a2d4b423ca2940e2f1aedfdd92c803cda"; + sha256 = "1niwh0ndkzgd38phx5527i14nb9swvybdjwjwbndkpb21x5j82nc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HCL HTTP network regex-compat ]; @@ -12133,7 +12637,7 @@ self: { mkDerivation { pname = "NMap"; version = "0.12"; - sha256 = "84133b162935f6f249fd8a7d19dcf378482fec0d292df929cee2dd4984281ab5"; + sha256 = "1d8s5224kpg2rqlzjb991pn2yj3qygf1jzcazm4z5xim54b3n4w4"; libraryHaskellDepends = [ base containers ]; description = "A transparent nested Map structure"; license = "LGPL"; @@ -12146,7 +12650,7 @@ self: { mkDerivation { pname = "NTRU"; version = "1.0.0.1"; - sha256 = "4639599d4459e01a6876a2d51847d2d72161616d4dcda18d7e9e5d5e02b02cc1"; + sha256 = "1h9cn015wpcygs6s3kaddmhn28fps93iimd2frl1mq2r8jfmjfa6"; libraryHaskellDepends = [ arithmoi base bytestring containers crypto-api polynomial random SHA split @@ -12164,7 +12668,7 @@ self: { mkDerivation { pname = "NXT"; version = "0.2.5"; - sha256 = "fc644fb66a152bf4642fa08b6e3baf92670b822b433f8793e7a9ea4a0bfa0c13"; + sha256 = "04qcz85lmsm9wy9qfgs35f10nrwjmwxnx2x05xjg8aqmdav4yr7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12189,7 +12693,7 @@ self: { mkDerivation { pname = "NXTDSL"; version = "0.4"; - sha256 = "05110380357a644ed73f5671705ee97887f0491eaa0509b3b7901559c27ff684"; + sha256 = "117ngz15j5chnyrhj1da3r4z11vqx5g70wan7zblwr3s6n006485"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12207,7 +12711,7 @@ self: { mkDerivation { pname = "NameGenerator"; version = "0.0.1"; - sha256 = "2e7983afdeebabd32562b26cfc1b133aa7967174c65a671ac5b4bbd60949ecff"; + sha256 = "1zzc944xdfxlqld6fnn6fiqrd9rs2cdzqv5jc8jx7azbvspq6y9f"; libraryHaskellDepends = [ base containers random ]; homepage = "http://github.com/pommicket/name-generator-haskell"; description = "A name generator written in Haskell"; @@ -12220,7 +12724,7 @@ self: { mkDerivation { pname = "NanoProlog"; version = "0.3"; - sha256 = "b63ae436a8acd35c212d8268db6b32805db079ec0f06acb43d52a3c3fee75272"; + sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ListLike uu-parsinglib ]; @@ -12231,27 +12735,22 @@ self: { }) {}; "NaturalLanguageAlphabets" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary - , bytestring, cereal, cereal-text, containers, criterion, deepseq - , file-embed, hashable, hashtables, intern, LinguisticsTypes - , mwc-random, QuickCheck, random, stringable, system-filepath - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-binary, unordered-containers, vector, vector-th-unbox + ({ mkDerivation, aeson, attoparsec, base, binary, cereal + , containers, criterion, deepseq, file-embed, hashtables + , LinguisticsTypes, mwc-random, QuickCheck, random, tasty + , tasty-quickcheck, tasty-th, text, unordered-containers, vector }: mkDerivation { pname = "NaturalLanguageAlphabets"; - version = "0.1.0.0"; - sha256 = "c233d60b74a4131705e36b5873fae2973f168b8c1c0717055c6d546d40ac6215"; + version = "0.1.1.0"; + sha256 = "12yv4fp9wd8crlz17kfa4h6ccv1amgk0an51g2r8vx6nrgvnkl7z"; libraryHaskellDepends = [ - aeson array attoparsec base bimaps binary bytestring cereal - cereal-text deepseq file-embed hashable intern LinguisticsTypes - QuickCheck stringable system-filepath text text-binary - unordered-containers vector vector-th-unbox + aeson attoparsec base file-embed LinguisticsTypes text + unordered-containers ]; testHaskellDepends = [ - aeson base binary cereal LinguisticsTypes QuickCheck stringable - test-framework test-framework-quickcheck2 test-framework-th text - unordered-containers + aeson base binary cereal LinguisticsTypes QuickCheck tasty + tasty-quickcheck tasty-th text unordered-containers ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashtables LinguisticsTypes @@ -12268,7 +12767,7 @@ self: { mkDerivation { pname = "NaturalSort"; version = "0.2.1"; - sha256 = "49fd310566c86d85714a1839f1bc845891771dbc023a0befee16f073bbac50f6"; + sha256 = "1xjhmjxp7w0nxvphnfh2phfpg4aqhjyg2f8q99qqavf8cq2k3za9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring strict ]; @@ -12284,7 +12783,7 @@ self: { mkDerivation { pname = "NearContextAlgebra"; version = "0.1.0.2"; - sha256 = "77e6bd6cb609bc8730c72cca98d04f78292ebd8fe52c2a0c903cfe2950629b5b"; + sha256 = "0nwvc982kziwj062lb75iyyjwabq9z89ijicqwq8gg09nrnbvrkp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -12302,7 +12801,7 @@ self: { mkDerivation { pname = "Neks"; version = "0.5.0.0"; - sha256 = "88d9af4e8e26ab61c29cb52b7118e08cd52b5b55e1f750a5bf82cc5c1f9b7020"; + sha256 = "083hkcgmrk42pyjm1xz1amdjpmccw0c72axmkk163ar6ir7aznc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12323,7 +12822,7 @@ self: { mkDerivation { pname = "NestedFunctor"; version = "0.2.0.2"; - sha256 = "651c4617b2bcb9cedff0a8e52c9ecda1177b65b5a9bce4390b16cfae2010bbce"; + sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735"; libraryHaskellDepends = [ base comonad distributive ]; homepage = "https://github.com/kwf/NestedFunctor"; description = "Nested composition of functors with a type index tracking nesting"; @@ -12336,7 +12835,7 @@ self: { mkDerivation { pname = "NestedSampling"; version = "0.1.4"; - sha256 = "9b86f50098712548a652a2da3ef7df91c1271e39e564e83f01abcc45adb4b4e9"; + sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv"; libraryHaskellDepends = [ base random vector ]; homepage = "https://github.com/ijt/haskell_nested_sampling"; description = "A port of John Skilling's nested sampling C code to Haskell"; @@ -12348,7 +12847,7 @@ self: { mkDerivation { pname = "NetSNMP"; version = "0.3.2.5"; - sha256 = "e036a091b68190b8a6491cde1e14189f00c0c04de05a07a12678dc48d587543f"; + sha256 = "0gslhzalip3q4shhfnp09p0c004z30a1xphw96kbi441ns8s0dp0"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net_snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; @@ -12366,7 +12865,7 @@ self: { mkDerivation { pname = "Network-NineP"; version = "0.4.1"; - sha256 = "9d7a456c672c1e7ef1075e27654b21ecacd8062917e1482c8060e404f3960f4a"; + sha256 = "0jhgjvrh9r30h0n4iq8p543dib7c455na9sy0zqpw7iccxn4aylx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12383,7 +12882,7 @@ self: { mkDerivation { pname = "NewBinary"; version = "0.2.1"; - sha256 = "f8d3db5b0c70c2641bb8725764b6298c51dffa0a1c17d7e5e98c31d4270ce732"; + sha256 = "0cp71hkx8cccx7jxf5qw1bxdylcc56v68mvjp0dn9hkh1idxplzq"; libraryHaskellDepends = [ array base integer ]; description = "A binary I/O library"; license = "unknown"; @@ -12395,7 +12894,7 @@ self: { mkDerivation { pname = "NineP"; version = "0.0.2.1"; - sha256 = "4bb1516b9fb340118960043e0c72aa62316be8ff3f78cc8c1354e2fac96dd8cc"; + sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab"; libraryHaskellDepends = [ base binary ]; homepage = "http://9ph.googlecode.com"; description = "9P2000 in pure Haskell"; @@ -12409,7 +12908,7 @@ self: { mkDerivation { pname = "Ninjas"; version = "0.1.0.0"; - sha256 = "154af665ed36c48b8c5c86fab42cf4f0a42504f107b46cbcc1a49e7a3603e873"; + sha256 = "0wz80cv7m7m4q6y6rd07y422b97hyhnb9yl6bj68pi1nxmjzcjhm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -12430,7 +12929,7 @@ self: { mkDerivation { pname = "NoSlow"; version = "0.2"; - sha256 = "9d80f0545ce4220e504bc9f6ba8a20737da7299f14620957f7a741db3bda21df"; + sha256 = "1pr1v8xxnhd7yxbhjqhlkwlsfzbk425bmxn99d80w8p4biag104x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -12448,7 +12947,7 @@ self: { mkDerivation { pname = "NoTrace"; version = "0.3.0.1"; - sha256 = "a8efac60b33bb9a50b08036b94b75746150aa79e2cf4a10f3c627f4982cd5f4f"; + sha256 = "0kszrn14jzv27h7s3x1ckskhl5a6ayvr8sq3105sbf9vndharvx8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/CindyLinz/Haskell-NoTrace"; @@ -12461,7 +12960,7 @@ self: { mkDerivation { pname = "Noise"; version = "1.0.6"; - sha256 = "d8efb502664cb4db7d1b12169e22fbd0bb03bfd035c4a716a415621a2dc25e6a"; + sha256 = "0sjyq8nilqhmlhbagi1ms2zh7fyhzci9w5hj3dyxpd2ccq1bbvyq"; libraryHaskellDepends = [ array base data-default vector ]; description = "A Haskell coherent noise generator based on libnoise"; license = stdenv.lib.licenses.bsd3; @@ -12475,7 +12974,7 @@ self: { mkDerivation { pname = "Nomyx"; version = "0.7.6"; - sha256 = "23628112dc562a1e8a1e9971bba710359153228055555ace4fce3d466f8e79fd"; + sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -12500,7 +12999,7 @@ self: { mkDerivation { pname = "Nomyx-Core"; version = "0.7.6"; - sha256 = "3837a6685371eff15c0da491fa7e5550a6e7fbbdadc9fe85d1728a71d503469b"; + sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq"; libraryHaskellDepends = [ acid-state aeson base blaze-html blaze-markup bytestring data-lens data-lens-fd data-lens-template DebugTraceHelpers deepseq directory @@ -12523,7 +13022,7 @@ self: { mkDerivation { pname = "Nomyx-Language"; version = "0.7.6"; - sha256 = "898eae368fabce7fd66be2ca84f43fd7c7c0888ba3d9d1a9b8d12b8b4db54959"; + sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9"; libraryHaskellDepends = [ base Boolean containers data-lens data-lens-fd data-lens-template DebugTraceHelpers ghc mtl old-locale random safe time @@ -12542,7 +13041,7 @@ self: { mkDerivation { pname = "Nomyx-Rules"; version = "0.1.0"; - sha256 = "0583d0f857c4eb643ffbdb13227700d1db6b6a8f8f6b3ef1ad4d9f6277bb7f9a"; + sha256 = "16kzpdvn57sdmpqkwswgixm6pnyi01vj44yvzczn9sy4azwd10q5"; libraryHaskellDepends = [ base containers ghc hint-server hslogger mtl old-locale safe stm time time-recurrence @@ -12563,7 +13062,7 @@ self: { mkDerivation { pname = "Nomyx-Web"; version = "0.7.6"; - sha256 = "67c9f60b48e542fca25628dbdb96ae34371ef7e123c18d6da440c3bf8e497ba4"; + sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring data-lens data-lens-fd fb filepath happstack-authenticate happstack-server hscolour mtl @@ -12582,7 +13081,7 @@ self: { mkDerivation { pname = "NonEmpty"; version = "0.1"; - sha256 = "b4bfaeac23a0c7d86e0e1a0f132e18e906dbf9a83cf9f2155b651916d2d9cc5b"; + sha256 = "0nycv791c6b5bcaz5y9wm3wxn1p930p163qs1rpdiix04fnaxgxl"; libraryHaskellDepends = [ base ]; description = "Library providing a non-empty list datatype, and total functions operating on it"; license = stdenv.lib.licenses.bsd3; @@ -12595,7 +13094,7 @@ self: { mkDerivation { pname = "NonEmptyList"; version = "0.0.9"; - sha256 = "a287105d312c0f9ee9b039899ede26b44e6b7b370b0914a46e7693ae8e2fa124"; + sha256 = "09515y7ax4vndsj1828b6xxnnkml4vg9x29rn3lrw3rc65fi11x2"; libraryHaskellDepends = [ base category-extras QuickCheck Semigroup test-framework test-framework-hunit test-framework-quickcheck2 @@ -12611,7 +13110,7 @@ self: { mkDerivation { pname = "NumInstances"; version = "1.4"; - sha256 = "cbdb2a49346f59ceb5ab38592d7bc52e5205580d431d0ac6d852fd9880e59679"; + sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/conal/NumInstances"; description = "Instances of numeric classes for functions and tuples"; @@ -12623,7 +13122,7 @@ self: { mkDerivation { pname = "NumLazyByteString"; version = "0.0.0.1"; - sha256 = "1acb8424c116f25df398a92011d48f2a8cc58f25e1fe39fd983d7dd521198a9d"; + sha256 = "17ca34hxaz9xk3ykkzp14n7wb31aiza12859k3rmvwhnq4j89jqs"; libraryHaskellDepends = [ base binary bytestring ]; description = "Num, Enum, Eq, Integral, Ord, Real, and Show instances for Lazy ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -12634,7 +13133,7 @@ self: { mkDerivation { pname = "NumberSieves"; version = "0.1.2"; - sha256 = "825b71db4e602592b89b187084d4081538b3f108dce63621cd6744baa3211ef1"; + sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2"; libraryHaskellDepends = [ array base ]; homepage = "http://patch-tag.com/r/lpsmith/NumberSieves"; description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient"; @@ -12647,7 +13146,7 @@ self: { mkDerivation { pname = "NumberTheory"; version = "0.1.0.1"; - sha256 = "e0cc1d5500b4d719b846c3e96ef4e4b04e620b40acc5e4b5c942495537ee1da9"; + sha256 = "1a8xxqvmaja2r6sy9idc805n4kmhwks6xsf38sw1kmxl01aivk70"; libraryHaskellDepends = [ base containers primes ]; testHaskellDepends = [ base containers HUnit primes ]; description = "A library for number theoretic computations, written in Haskell"; @@ -12660,7 +13159,7 @@ self: { mkDerivation { pname = "Numbers"; version = "0.2.1"; - sha256 = "e73d1706aaefd21ca1edf84854df6bf6043b8b7d650e1d3d05cb64454d1a3bfc"; + sha256 = "1z1v396lar6b0lyis3k5gn5kn17ndggm8j7qxnhirlpgm831fgg7"; libraryHaskellDepends = [ base random ]; homepage = "http://page.mi.fu-berlin.de/aneumann/numbers/index.html"; description = "An assortment of number theoretic functions"; @@ -12674,7 +13173,7 @@ self: { mkDerivation { pname = "Nussinov78"; version = "0.1.0.0"; - sha256 = "504bdbbe64289faa8050d6a806af21107265838e21f2e392f18e63776cac38c9"; + sha256 = "1j9qmin7fqwfy69f7wi1is1nawhh46phda6na20am7r8cjzdnjsh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12691,7 +13190,7 @@ self: { mkDerivation { pname = "Nutri"; version = "0.1"; - sha256 = "b28cd8c652a0588c8db01547fd426ab3720ad9cf6796a2ccbcb2fce67fe9f8d4"; + sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/frosch03/Nutri"; description = "A little library to calculate nutrition values of food items"; @@ -12704,7 +13203,7 @@ self: { mkDerivation { pname = "OGL"; version = "0.0.3"; - sha256 = "15a357d6628414f3a2e67dc594e1fe22c9047026f191217c26ab849145bc14f1"; + sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm"; libraryHaskellDepends = [ base mtl ]; homepage = "http://haskell.org/haskellwiki/OGL"; description = "A context aware binding for the OpenGL graphics system"; @@ -12719,7 +13218,7 @@ self: { mkDerivation { pname = "OSM"; version = "0.6.4"; - sha256 = "297b4db6b90a128b1e91522e4cb036fe48b82f1435cf6371b41a02464136c0d4"; + sha256 = "1m606r0lc0hsniqn7krm2hpvhj7y6sq4qbjjj4g8n4hap6v4syr9"; libraryHaskellDepends = [ base comonad-transformers containers data-lens hxt newtype ]; @@ -12734,7 +13233,7 @@ self: { mkDerivation { pname = "OTP"; version = "0.0.0.1"; - sha256 = "aba94f7d6afb16fe3c890b4e9fa3ee1a7432181d9b15fcac6360f41da6f39d6d"; + sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb"; libraryHaskellDepends = [ base Crypto time ]; testHaskellDepends = [ base Crypto time ]; homepage = "https://github.com/matshch/OTP"; @@ -12747,7 +13246,7 @@ self: { mkDerivation { pname = "Object"; version = "1.0"; - sha256 = "c92dcbf7b82b24b38ae1c06e9c0998bff6dd5ef6b44fd4857676230008c69916"; + sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9"; libraryHaskellDepends = [ base containers ghc template-haskell ]; homepage = "https://github.com/yokto/object"; description = "Object oriented programming for haskell using multiparameter typeclasses"; @@ -12762,7 +13261,7 @@ self: { mkDerivation { pname = "ObjectIO"; version = "1.0.1.1"; - sha256 = "5e9a7b2b393d653755b447d258e6317b121332169e033e14ed46d330db610ab9"; + sha256 = "1f8ac7dk1ls6xla3w0wy2qr164kv67k5ilj7niakfr9x74mpp6jy"; librarySystemDepends = [ comctl32 comdlg32 gdi32 kernel32 ole32 shell32 user32 winmm winspool @@ -12778,7 +13277,7 @@ self: { mkDerivation { pname = "ObjectName"; version = "1.1.0.1"; - sha256 = "72dbef237580fd4e8567de2de752835bbadd3629f486d1586486d49a49aad210"; + sha256 = "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/svenpanne/ObjectName"; description = "Explicitly handled object names"; @@ -12793,7 +13292,7 @@ self: { mkDerivation { pname = "Obsidian"; version = "0.4.0.0"; - sha256 = "b6cfeea9713bb5eeb20a3eeece383e11df2ef78eab10ad2c64e7513603325dd0"; + sha256 = "1l2x681kclg7chnas45bivvjxpqi7qwcxviy1arfxd9vf6lyxkxn"; libraryHaskellDepends = [ base containers cuda language-c-quote mainland-pretty mtl mwc-random process rdtsc text value-supply vector @@ -12809,7 +13308,7 @@ self: { mkDerivation { pname = "Octree"; version = "0.5.4.3"; - sha256 = "4fd8aa7fbbcc2387e06159b0d96c8ede26812ebe85b5d6931ce4bb8b1972b465"; + sha256 = "0rdlf8cqpfz43j9xddc5pqp829nyirndkc2rc7h8f8ycpdzsmn2g"; libraryHaskellDepends = [ AC-Vector base QuickCheck ]; testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ]; homepage = "https://github.com/mgajda/octree"; @@ -12822,7 +13321,7 @@ self: { mkDerivation { pname = "OddWord"; version = "1.0.1.0"; - sha256 = "a143467e9491fdf3b7149b381bb41d6720b946ebd33231ccb0adad1dc5bd4329"; + sha256 = "0aa3pp2ivbddn3632cnkxd3bj8373ns1nf4v2jvz7zcijiz4chx1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "http://www.gekkou.co.uk/"; @@ -12836,7 +13335,7 @@ self: { mkDerivation { pname = "Omega"; version = "1.0.3"; - sha256 = "b2386093f0223326e8fe9d6984fb41f813e1581fc1f6affbd6abe57cb2e8aa15"; + sha256 = "05dax2r7rrdbsvxszxn13xcf24zq87xq8scxzvl2ccr2y29n0f5j"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HUnit ]; description = "Integer sets and relations using Presburger arithmetic"; @@ -12855,7 +13354,7 @@ self: { mkDerivation { pname = "OnRmt"; version = "1.0.0.0"; - sha256 = "4d9627999b89d50f8211a5cba8ea5821493bfdec8a9de76ee8f39bd4e8003218"; + sha256 = "061j03ld96zkx1pfg7caxkyknj91b3maijx52610zmc9kfcjg5jd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12885,20 +13384,33 @@ self: { mkDerivation { pname = "OneTuple"; version = "0.2.1"; - sha256 = "4b6f74b6d92df112b0f4eaf15ccdc5fbb763d59f07e9a2afa5690ef89159a2f4"; + sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; }) {}; + "Only" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "Only"; + version = "0.1"; + sha256 = "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb"; + revision = "1"; + editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr"; + libraryHaskellDepends = [ base deepseq ]; + description = "The 1-tuple type or single-value \"collection\""; + license = stdenv.lib.licenses.bsd3; + }) {}; + "OpenAFP" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, hashable, hashtables, mtl, process, regex-compat }: mkDerivation { pname = "OpenAFP"; - version = "1.4.2"; - sha256 = "80558f9ac3512a98e25ace02ceed4ad5ddcf8727335b54c2b9ef3fee7ccf1e75"; + version = "1.4.3"; + sha256 = "0ziwg4l5ycmymimbwm4qrf1pqwkjy39nl302ld6z33flpmcrs1s7"; libraryHaskellDepends = [ array base binary bytestring containers directory hashable hashtables mtl process regex-compat @@ -12917,7 +13429,7 @@ self: { mkDerivation { pname = "OpenAFP-Utils"; version = "1.4.1.3"; - sha256 = "c0ab6bd24d16ec864a2ab399c60f9d694dc4b512fb139728a6fa5d0025a31898"; + sha256 = "160qlcjh0pgslql9f4zv2asw8kb9kl7wd6dk5958dv0n9p96pay0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -12937,7 +13449,7 @@ self: { mkDerivation { pname = "OpenAL"; version = "1.7.0.4"; - sha256 = "3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118"; + sha256 = "067in6qb2i0xwy6bnkxfhzbn7gq88cf03p8421al6y23zv2gd29r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12954,7 +13466,7 @@ self: { mkDerivation { pname = "OpenCL"; version = "1.0.3.4"; - sha256 = "fd8807fa5b78349d52218bde599d7b8e422f4c7e231a276406b52c62616b9811"; + sha256 = "04cqddhn4b5m0rj2f6i3gr62yhlfgffmkplb4599sd3qbgx0g27x"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ OpenCL ]; libraryToolDepends = [ c2hs ]; @@ -12970,7 +13482,7 @@ self: { mkDerivation { pname = "OpenCLRaw"; version = "1.0.1001"; - sha256 = "07501b636c29dcec37992e008f09f0cb5dafcaa83d1db9e0605c8edb6ba636a9"; + sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07"; libraryHaskellDepends = [ base bytestring mtl ]; homepage = "http://vis.renci.org/jeff/opencl"; description = "The OpenCL Standard for heterogenous data-parallel computing"; @@ -12983,7 +13495,7 @@ self: { mkDerivation { pname = "OpenCLWrappers"; version = "0.1.0.3"; - sha256 = "1a913126fdf547e8c895aef4c29aac65aa901138e4dd095b70925c3da5119576"; + sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s"; libraryHaskellDepends = [ base bytestring mtl ]; homepage = "https://github.com/jkarlson/OpenCLWrappers"; description = "The OpenCL Standard for heterogenous data-parallel computing"; @@ -12997,8 +13509,8 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "3.0.1.0"; - sha256 = "f45c0c65aa31108391d5d86bb65b3e945e0c1102b7d09db4b356c060f3afa2da"; + version = "3.0.2.0"; + sha256 = "1yqf8li6h2cwd7s3n99afmqyx628v9xkrf6jy8n4sqadf9cr9ags"; libraryHaskellDepends = [ base bytestring containers GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -13013,7 +13525,7 @@ self: { mkDerivation { pname = "OpenGLCheck"; version = "1.0"; - sha256 = "59391672b6cd5a1f62816c18a6a5624f49745022c05ad2cfddcc4a0353e34f7e"; + sha256 = "0zjgwd9h6jncvp7x4nn049878jagcajsc63ch5i1ynndnrr1cfar"; libraryHaskellDepends = [ base checkers haskell98 OpenGL QuickCheck ]; @@ -13029,7 +13541,7 @@ self: { mkDerivation { pname = "OpenGLRaw"; version = "3.2.4.0"; - sha256 = "e3f9910be96b375fdf30db5a2cb6d55869eab11d507aa14edee177495c7dcb2e"; + sha256 = "0bnbgmf4jxz1vr7a2yjh3nqylsaqsnv2qnnv63gmydvbx45r3yg3"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -13044,7 +13556,7 @@ self: { mkDerivation { pname = "OpenGLRaw21"; version = "2.0.0.2"; - sha256 = "e1af60d7b2b931310b8c04427993b8ea072230d1acdf851cffad506e25e7cfcd"; + sha256 = "1kfgwwjnwl5dzwf8bpxcs4q241zap29pjhh4ih5k2cdrnbbn1bz1"; libraryHaskellDepends = [ OpenGLRaw ]; description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core"; license = "unknown"; @@ -13058,7 +13570,7 @@ self: { mkDerivation { pname = "OpenSCAD"; version = "0.3.0.2"; - sha256 = "1d55f995c05b7d5c85dffaf8e58b0fc731899e941a7ef415fa7be30292b16711"; + sha256 = "04b7n6905qvvz8az8zhsjjg8jcf71y5yby7svy2mqzavq2azjm8x"; libraryHaskellDepends = [ base colour containers filepath semigroups ]; @@ -13077,7 +13589,7 @@ self: { mkDerivation { pname = "OpenVG"; version = "0.7.0"; - sha256 = "727fe87ac349d9424fd536352e03290c09c9c1aa35f45de6de8772c61735a929"; + sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj"; libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ]; homepage = "http://code.google.com/p/copperbox/"; description = "OpenVG (ShivaVG-0.2.1) binding"; @@ -13090,7 +13602,7 @@ self: { mkDerivation { pname = "OpenVGRaw"; version = "0.4.0"; - sha256 = "a2971a855bb8eae79b87e0e43f417bcace87619d5fcd569fe96674e1d02aafb9"; + sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2"; libraryHaskellDepends = [ base OpenGLRaw ]; homepage = "http://code.google.com/p/copperbox/"; description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation)."; @@ -13103,7 +13615,7 @@ self: { mkDerivation { pname = "Operads"; version = "1.0"; - sha256 = "130b8ce62168206b8feb0506a6804dc86a171391f6ea9f821c9cf7f6330508ad"; + sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk"; libraryHaskellDepends = [ array base containers mtl ]; homepage = "http://math.stanford.edu/~mik/operads"; description = "Groebner basis computation for Operads"; @@ -13116,7 +13628,7 @@ self: { mkDerivation { pname = "OptDir"; version = "0.0.3"; - sha256 = "1850d5012d5bcf7b9e1704fc755ba03afa82a6065496235a4ed9f3d14ed165ad"; + sha256 = "1bb5s57d3wyr9rd275jl0sk85yisl1dpbz042yg7pksv5l0xal0q"; libraryHaskellDepends = [ base hashable syb ]; description = "The OptDir type for representing optimization directions"; license = stdenv.lib.licenses.bsd3; @@ -13129,7 +13641,7 @@ self: { mkDerivation { pname = "OrPatterns"; version = "0.1"; - sha256 = "21849cfbf91abe7f7146887be47409f8ae858d746e8188dca708be33ed126f3a"; + sha256 = "0fkg2bnk7gh8lzf8i0bffj6qbbpq15sf8yw88rqpzghsz7xrr111"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta mtl split syb template-haskell @@ -13146,7 +13658,7 @@ self: { mkDerivation { pname = "OrchestrateDB"; version = "1.0.0.3"; - sha256 = "5f693e961bc4db8a8bad1cdeb942e40c8660ac594a36c44a577fbafbda922234"; + sha256 = "0d12jbdgpfkzax5c8djab6n611hcwi1bkphwmn5qmny43fb3wsaz"; libraryHaskellDepends = [ aeson base bytestring HTTP http-conduit http-types lifted-base ]; @@ -13167,7 +13679,7 @@ self: { mkDerivation { pname = "OrderedBits"; version = "0.0.1.2"; - sha256 = "14855fdeda5822ea54c588085f98984062d5a7febc8cbb6e8b8f62de28375df5"; + sha256 = "1xax6wldwqlgidpbp35wzskxaqj0k2c5y248qmafl8jqvbg5z18l"; libraryHaskellDepends = [ base bits primitive vector vector-algorithms ]; @@ -13185,7 +13697,7 @@ self: { mkDerivation { pname = "Ordinals"; version = "0.0.0.2"; - sha256 = "5153e441ca200a3aef7c733c2c2fde7c373ee7d2f0a46067b8db34413339b313"; + sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi"; libraryHaskellDepends = [ base ]; homepage = "http://patch-tag.com/r/kyagrd/Ordinals/"; description = "Ordinal arithmetic"; @@ -13197,7 +13709,7 @@ self: { mkDerivation { pname = "PArrows"; version = "0.1.1"; - sha256 = "17589865c3aa8c7415b9da80d67e09c9e06be83b53f22d00b8dca7fdc5c1b322"; + sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p"; libraryHaskellDepends = [ base containers ghc-prim mtl ]; homepage = "http://www.cs.helsinki.fi/u/ekarttun/PArrows/"; description = "Arrow parser combinators similar to Parsec"; @@ -13209,9 +13721,9 @@ self: { mkDerivation { pname = "PBKDF2"; version = "0.3.1.5"; - sha256 = "c2b425a4b758b6979d8578492b39b3c02c1dcc39e3123129999cd51b86644a52"; + sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62"; revision = "1"; - editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e"; + editedCabalFile = "0gnvhijrjj39z9y4m1ic2nys2yi3ida7yh93b9q88r6i02m2k23f"; libraryHaskellDepends = [ base binary bytestring Crypto random ]; description = "Make password-based security schemes more secure"; license = stdenv.lib.licenses.bsd3; @@ -13223,7 +13735,7 @@ self: { mkDerivation { pname = "PCLT"; version = "0.1"; - sha256 = "38bdd54152d7a947b0a50c45225b4b472caa07682e0d39bfd6cd18f0db5daa4c"; + sha256 = "0k5abpdz066dsszkj39fd03slb279ddj4i8clnq4gafpa90xbg9q"; libraryHaskellDepends = [ base bytestring containers mtl utf8-string ]; @@ -13240,7 +13752,7 @@ self: { mkDerivation { pname = "PCLT-DB"; version = "0.1.1"; - sha256 = "0ebb9ce053758ed31854c0740af3a625b5dc8850a3910192ce94ae7965ac6559"; + sha256 = "0nb5mijpkbllrs9034d3a24drd95lvrhlx60ahcd73kmagh9rfqf"; libraryHaskellDepends = [ base bytestring containers convertible HDBC HDBC-postgresql mtl PCLT @@ -13256,7 +13768,7 @@ self: { mkDerivation { pname = "PDBtools"; version = "0.0.3"; - sha256 = "d80810bd44765b86c0ebf247f32ddded301eddb587fe12a0bdc378ee6b8fb0c4"; + sha256 = "1i5hixmywy63pnh15zl7npfiwc7dvlnz6izjxg08cnvn8jyi026q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; @@ -13270,7 +13782,7 @@ self: { mkDerivation { pname = "PPrinter"; version = "0.1.0"; - sha256 = "ec536f3b39f0e1cead0c1309af12bafa2298fe5cc395d7c817cc028275969bb9"; + sha256 = "1fcvjrsq40nc2z4dg5f3bkz9h8psp89ay28k1jnwxqgh74xnylzc"; libraryHaskellDepends = [ base containers ]; description = "A generic derivable Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -13282,7 +13794,7 @@ self: { mkDerivation { pname = "PSQueue"; version = "1.1"; - sha256 = "a8e0871ad10f916f55c3b9baec53eff23c4e97e09cf96d6c66771789e00a49cc"; + sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58"; libraryHaskellDepends = [ base ]; description = "Priority Search Queue"; license = stdenv.lib.licenses.bsd3; @@ -13294,7 +13806,7 @@ self: { mkDerivation { pname = "PTQ"; version = "0.0.7"; - sha256 = "15d6f4eb1a2ff9b94a94e1b3e2991bbcf36f24b640c635216b2c767a912fcd5d"; + sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13314,7 +13826,7 @@ self: { mkDerivation { pname = "PUH-Project"; version = "0.1.0.1"; - sha256 = "3ae48511d92c0d0794b1de80363ab718400e9a44f80cb0e4f03b225ed4c0c522"; + sha256 = "08n5q3a5w8ivy3jb037q8jd0wh0qnwx3d06yn6a0f39cv48qbr1s"; libraryHaskellDepends = [ base bytestring containers directory mime-mail network old-locale persistent persistent-sqlite persistent-template pwstore-fast @@ -13334,7 +13846,7 @@ self: { mkDerivation { pname = "PageIO"; version = "0.0.3"; - sha256 = "53f224ffa8891f5f21a82140b6d8a63babe4e1d24a5c92de58774b482b87d65e"; + sha256 = "0pnnhwmlhjvpb3g94p2asbhy9arvlvcbch11m0hmy7w9m3zj9wjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13360,7 +13872,7 @@ self: { mkDerivation { pname = "Paillier"; version = "0.1.0.3"; - sha256 = "e2bfd82dcfe0e5d18af6fc0b6208e476cb4fe5291f8f6c2f05b7a808b5388b49"; + sha256 = "0jcb72shia5p0lpnr3qz57jlzjvnwh4642zwys5d3rg0rwnxigz2"; libraryHaskellDepends = [ base crypto-numbers crypto-random ]; testHaskellDepends = [ base crypto-numbers crypto-random HUnit QuickCheck test-framework @@ -13378,7 +13890,7 @@ self: { mkDerivation { pname = "PandocAgda"; version = "2.3.3.0.2"; - sha256 = "602e964e7227fa38e51f17f6a0497da967d1b36bfbacc500a91bc5e872af69bc"; + sha256 = "1g39mxrfii8vm40cbb7vdfrx2rx9gm4s1xhp3zjkiyi7f979cbk0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13400,7 +13912,7 @@ self: { mkDerivation { pname = "Paraiso"; version = "0.3.1.5"; - sha256 = "4448a2a736f5fec503927d6dc9b5729ef67c818bd2ee14044bcf6c0614951525"; + sha256 = "098mjla0cv6g9c219vnjif0prxlyfaswjvbxj81wbzpm6sks4j24"; libraryHaskellDepends = [ array base containers directory failure fgl filepath mtl numeric-prelude random text typelevel-tensor vector @@ -13425,7 +13937,7 @@ self: { mkDerivation { pname = "Parry"; version = "0.1.0.0"; - sha256 = "9a587206cc456cce1e36c50efbba247b167c280df1471ff8b7c0437594bfc04b"; + sha256 = "0jy0pya7ahy0nzw1yizi1ll7q5kv4jxgn3n56qgcwv25rh374n4s"; libraryHaskellDepends = [ base binary bytestring containers directory ghc-prim network old-locale process random RSA SafeSemaphore time unix @@ -13441,7 +13953,7 @@ self: { mkDerivation { pname = "ParsecTools"; version = "0.0.2.0"; - sha256 = "ef4843353127aa3e6f6ab0aece9f4245225d375802921e151a1751d797857a87"; + sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g"; libraryHaskellDepends = [ base parsec ]; description = "Parsec combinators for more complex objects"; license = stdenv.lib.licenses.gpl3; @@ -13452,7 +13964,7 @@ self: { mkDerivation { pname = "ParserFunction"; version = "0.1.0"; - sha256 = "38f795f1317f8b1af702b6bd210a29d21799797c001e2a462b4b63e65b0d1250"; + sha256 = "0l0j1mdycqsb5d32l7h0giwrj5yj54523gdn0bvim2vz67qrbxrq"; libraryHaskellDepends = [ base containers parsec ]; description = "Parse and evaluate mathematical expressions"; license = stdenv.lib.licenses.bsd3; @@ -13463,7 +13975,7 @@ self: { mkDerivation { pname = "PartialTypeSignatures"; version = "0.1.0.1"; - sha256 = "0382fdb6e7f3992acb7a8959f98ed58af96a15a73bae24c556e9acecd80a8011"; + sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3"; libraryHaskellDepends = [ base containers syb template-haskell ]; homepage = "http://code.haskell.org/~aavogt/PartialTypeSignatures"; description = "emulate partial type signatures with template haskell"; @@ -13475,7 +13987,7 @@ self: { mkDerivation { pname = "PasswordGenerator"; version = "0.1.0.0"; - sha256 = "fc436e7823fb378cedea25e52715245ecd647995c7066e3c54c189782bf59d8a"; + sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw"; libraryHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/VictorDenisov/PasswordGenerator"; description = "Simple library for generating passwords"; @@ -13488,7 +14000,7 @@ self: { mkDerivation { pname = "PastePipe"; version = "1.8"; - sha256 = "9f6a2b7351ef710875195e6e1286ee0e468d39c352d114139a041ced674fee81"; + sha256 = "10gf9xkys704k89i9lajqcwqsihfxs314vjy35shhwgga5rjnslz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cmdargs HTTP network network-uri ]; @@ -13505,7 +14017,7 @@ self: { mkDerivation { pname = "PathTree"; version = "0.1.1.0"; - sha256 = "18f88853bfe2e2b1a5961765ca4874dc58418dbb480781a9446deca7654918e7"; + sha256 = "1rqq95jsgv3d8jlq21s8pf6l2n6wfi4clr8pjsjv3qp2px9qiy0q"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -13521,7 +14033,7 @@ self: { mkDerivation { pname = "Pathfinder"; version = "0.5.10"; - sha256 = "0ee705ceabee7bcc69bac8ef16a9ebfa2af3c4fb1747927eadcc4d2bc7b968cc"; + sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ libxml2 ]; description = "Relational optimiser and code generator"; @@ -13534,7 +14046,7 @@ self: { mkDerivation { pname = "Peano"; version = "0.0.4"; - sha256 = "bf62662a7279aadd5bc1e434dab355fa3e53b2f2c0c702db4a9ce1f900b9446b"; + sha256 = "0ss4p40gkqcw9bdh5iy0yar56gpsanrxld74q5dxvakrf8m6cqmz"; libraryHaskellDepends = [ base ]; description = "simple Peano numbers"; license = stdenv.lib.licenses.bsd3; @@ -13545,7 +14057,7 @@ self: { mkDerivation { pname = "PeanoWitnesses"; version = "0.1.0.0"; - sha256 = "ef55355140c40adccaa566c214e1d2fb60c3efb539216c1f4134bf21349703bd"; + sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg"; libraryHaskellDepends = [ base ]; description = "GADT type witnesses for Peano-style natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -13559,7 +14071,7 @@ self: { mkDerivation { pname = "PerfectHash"; version = "0.1.5"; - sha256 = "3c59408ee1d6fef7a6f8d5c778947503a6eb21c861d0a9ad9be39847ae75173a"; + sha256 = "0fhpfnp4g673kfnskl31r0hyp9h3fna7iiymz2kggznnw6740n9w"; libraryHaskellDepends = [ array base binary bytestring containers digest time ]; @@ -13574,7 +14086,7 @@ self: { mkDerivation { pname = "PermuteEffects"; version = "0.2"; - sha256 = "94f8e7b2b24e48acd8e90a145981af7eb7563fc5ae932282181370bbf0d6b552"; + sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l"; libraryHaskellDepends = [ base ReplicateEffects ]; homepage = "https://github.com/MedeaMelana/PermuteEffects"; description = "Permutations of effectful computations"; @@ -13592,7 +14104,7 @@ self: { mkDerivation { pname = "Phsu"; version = "0.1.0.3"; - sha256 = "a913a073fd785e1b8b1adcf515fc4d9727834bb03982374ade7a38df1f86c689"; + sha256 = "12f6hqgxyf3svr53g0irn15q69wp9py1bxfw3a5inpkqzmrs04x9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13613,7 +14125,7 @@ self: { mkDerivation { pname = "Pipe"; version = "2.1.2"; - sha256 = "19fa8409407d698e57a41b2ec5ef0dda23e5e43628221cb9df89425eaecca390"; + sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr"; libraryHaskellDepends = [ base filepath process unix ]; homepage = "http://iki.fi/matti.niemenmaa/pipe/"; description = "Process piping library"; @@ -13625,8 +14137,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "Piso"; - version = "0.1"; - sha256 = "03455602293e88a9860129f0c2825db907257923dabf5fa9684de955b6e27088"; + version = "0.2"; + sha256 = "07rzwkhz4b6nymygrhcz07dxl8fnvfrmfpcdj9qz3mwrcyf1kp9n"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/MedeaMelana/Piso"; description = "Partial isomorphisms"; @@ -13641,7 +14153,7 @@ self: { mkDerivation { pname = "PlayHangmanGame"; version = "0.2"; - sha256 = "8ff24efea2b1b2f7125065f75e471337f9813fd86381ff66d900a966beb25b9d"; + sha256 = "17avnaz6da80v5kgz0b3v0zq3y9p2d3mxxv5a09ggcmilbz4xwlg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13659,7 +14171,7 @@ self: { mkDerivation { pname = "PlayingCards"; version = "0.3.0.0"; - sha256 = "d35c58dcfb206e6b66bb421bbe1c3a980a16dae2adfcd5fd456c24eb9af104f3"; + sha256 = "1wq4y6dfn93c8pyxbz5dwbd1c2lq78fbw6s2pdk6nvi0zgf5hp6k"; libraryHaskellDepends = [ base HUnit MonadRandom QuickCheck random-shuffle ]; @@ -13675,8 +14187,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.11.0.0"; - sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9"; + version = "0.11.2.0"; + sha256 = "1jxxvd49b40gsrd5vppfd1f94h166475mxy8f0bhbjmpngdhjdcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13695,7 +14207,7 @@ self: { mkDerivation { pname = "PlslTools"; version = "0.0.2"; - sha256 = "2431e54883239aca764058e71345d20205247b92a90a381f74c992389d0c9ece"; + sha256 = "1kly1jfki4n9fhgkh2m9j9xj8182s92i7rsq81vcm6i3hd4fac94"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13713,7 +14225,7 @@ self: { mkDerivation { pname = "Plural"; version = "0.0.2"; - sha256 = "1c95f7ee047d09a142bc132cd74de22255805a9f39d605b5c5ba1f356fe0ea10"; + sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w"; libraryHaskellDepends = [ base containers regex-tdfa ]; description = "Pluralize English words"; license = stdenv.lib.licenses.gpl3; @@ -13724,7 +14236,7 @@ self: { mkDerivation { pname = "Pollutocracy"; version = "1.0"; - sha256 = "908b0a7f8c81ade7a69e3816a6437cad7aa1620e8bad3a07175a39e34808cb0c"; + sha256 = "036b114f6fas2w3kmbcb1ria2ymdgi1sc5iqkskfgbc1iizhm2wh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base clock GLUT random ]; @@ -13738,7 +14250,7 @@ self: { mkDerivation { pname = "PortFusion"; version = "1.2.1"; - sha256 = "7eef41029de0916d7bcb7eab021535e6c0b16c0e911ffb54ebfbcdf78e2a09d8"; + sha256 = "1n095a7ggkgvxdagn7wi1rnb3h766lah5avyrdxnv4g0kl143vvy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring network splice ]; @@ -13753,12 +14265,13 @@ self: { mkDerivation { pname = "PortMidi"; version = "0.1.6.1"; - sha256 = "b89e9293d5b80d23b197dbb9bf196737765c66ffe96eaabdb9517fe20b516690"; + sha256 = "1436a45y4zsip6yslvp9zxk5qxipcwcvzffvjyqj63dqsn9r57mq"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; homepage = "http://github.com/ninegua/PortMidi"; description = "A binding for PortMedia/PortMidi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage @@ -13766,7 +14279,7 @@ self: { mkDerivation { pname = "PostgreSQL"; version = "0.2"; - sha256 = "39f3553a9b1b4bb112890edfd5e4cbcc1ac4d3aa04026018fdff558f981fb85c"; + sha256 = "0p5q3yc8ymgzzlc600h4mb9w86ncrgjdbpqfi49b2jqvkcx5bwrr"; libraryHaskellDepends = [ base mtl ]; description = "Thin wrapper over the C postgresql library"; license = "unknown"; @@ -13782,8 +14295,8 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.8.0.0"; - sha256 = "b4af0d0d8502dc8ba8985cd70b69a0220a70e8d44a2ee4dfa73db1bce5774445"; + version = "0.8.0.1"; + sha256 = "1x9qmm9bq14dv7abxbmbij1mfyj3pmrmn61yy09zs52m247pvrwi"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector deepseq DPutils hashable log-domain OrderedBits primitive QuickCheck smallcheck @@ -13808,7 +14321,7 @@ self: { mkDerivation { pname = "PrimitiveArray-Pretty"; version = "0.0.0.2"; - sha256 = "87d0b2c42dc47f3c6c42b94dcd543b09bdc512e67f81c7ab72368cc374bc894d"; + sha256 = "0kc9pisc731nfamwg0bzwq9cbg897dacskdr89n3qzy45p2b5l47"; libraryHaskellDepends = [ base diagrams diagrams-contrib diagrams-lib diagrams-postscript diagrams-svg filepath log-domain split @@ -13828,7 +14341,7 @@ self: { mkDerivation { pname = "Printf-TH"; version = "0.1.1"; - sha256 = "7ddb98d79c320b71c5ffd9f2a0eda2f1898f31ff53ee5f84dfc95c108ada2f58"; + sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx"; libraryHaskellDepends = [ base haskell98 pretty template-haskell ]; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13839,7 +14352,7 @@ self: { mkDerivation { pname = "PriorityChansConverger"; version = "0.1"; - sha256 = "410971d9e48f7d9ddd722d1a785e2d0fb62c384f9f12cf7b9f651a9b95f6a808"; + sha256 = "0258ysarn6k5kxxwy4lz9ww2rdhg5mg7h6idfbfrszcgwkcp22a1"; libraryHaskellDepends = [ base containers stm ]; description = "Read single output from an array of inputs - channels with priorities"; license = "LGPL"; @@ -13851,7 +14364,7 @@ self: { mkDerivation { pname = "ProbabilityMonads"; version = "0.1.0"; - sha256 = "03fadcd3afd29529f36e5c1d058dec489e0361a0a4cbeb8308e012ec437ab26e"; + sha256 = "0vmjg91yq4p0121ypjx4l1hh77j8xj6ha7awdvrjk5fjmz9xryh3"; libraryHaskellDepends = [ base MaybeT MonadRandom mtl ]; description = "Probability distribution monads"; license = stdenv.lib.licenses.bsd3; @@ -13863,7 +14376,7 @@ self: { mkDerivation { pname = "PropLogic"; version = "0.9.0.4"; - sha256 = "1e53bd81f90f4068270a1cfc3518a76703b5b40826761177a6f8bd2279ec23bf"; + sha256 = "1gr3xiwj5ggqlrvi2xi612sba0v7lwc3bz0w18knhh0gz60vslqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base old-time random ]; @@ -13878,7 +14391,7 @@ self: { mkDerivation { pname = "Proper"; version = "0.5.2.0"; - sha256 = "661e878b8b9372f197fefbda7159a5e45b0b52658843123fca76ac6de1ce1279"; + sha256 = "0y8jrvhnvb3nr8zi4hw8cm90nnz4lmcp3npvzsbz2wlkif5qf7k6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers syb ]; @@ -13894,7 +14407,7 @@ self: { mkDerivation { pname = "ProxN"; version = "0.0.1"; - sha256 = "2d3ec242b45f43b7819166ccc38562298823ba4f6ba367aef8f7c2c5e69ba357"; + sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/exFalso/ProxN"; description = "Proximity sets in N dimensions"; @@ -13911,7 +14424,7 @@ self: { mkDerivation { pname = "Pugs"; version = "6.2.13.20150815"; - sha256 = "4251b2e55a384c82c60303c0b703ef12c0916370572ad830649f03f0df27fd70"; + sha256 = "0w7x4zgz00wzchqdhajpf1ir3h0jxw1vgh030g384k1qbbjv4la2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13933,7 +14446,7 @@ self: { mkDerivation { pname = "Pup-Events"; version = "1.0"; - sha256 = "d24bd5cf1a473ee9d8e2aad941b3d1d46957cd1ba79dc0963e0d078c7087f28f"; + sha256 = "13zjhxq8q1qd7sbc17d73g6mfsfls6rl3ndawbcfjgj73b7xajyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13952,7 +14465,7 @@ self: { mkDerivation { pname = "Pup-Events-Client"; version = "1.1.4"; - sha256 = "7577018493e23b02c53d062e0905c4ff49916a0d50da2084ca67fa30ad9cdbac"; + sha256 = "1b6vkjnk1yk7ra221njh1mm92jgzqh2hjbh67p2h4fz2jf202xvm"; libraryHaskellDepends = [ base network parsec Pup-Events-PQueue stm transformers ]; @@ -13967,7 +14480,7 @@ self: { mkDerivation { pname = "Pup-Events-Demo"; version = "1.3"; - sha256 = "ab77f85722035512e59a6a150c461851ac56fd09b23227eab45355c5180a8e19"; + sha256 = "06cf18ccamaknkm2fcmj17ymdb2i3130q5bakbji4m8349bzhxxb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13984,7 +14497,7 @@ self: { mkDerivation { pname = "Pup-Events-PQueue"; version = "1.0"; - sha256 = "9dc77106f3eb2bccc96d29ecc24a40a7883d431f160a2d0a717116f93b8ecf6a"; + sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx"; libraryHaskellDepends = [ base stm ]; description = "A networked event handling framework for hooking into other programs"; license = stdenv.lib.licenses.gpl3; @@ -13997,7 +14510,7 @@ self: { mkDerivation { pname = "Pup-Events-Server"; version = "1.2"; - sha256 = "b6011465718ff007796ca124331a84ffafae585cb72c4f763363f4cde15fc4a2"; + sha256 = "18n4bzhwvx336dv4yb5pbicaxbzzhhd36951diwhgw4gf5ji80dn"; libraryHaskellDepends = [ base network parsec Pup-Events-PQueue stm transformers ]; @@ -14010,7 +14523,7 @@ self: { mkDerivation { pname = "QIO"; version = "1.3"; - sha256 = "e81da8f965cc031009fd9005f5cc253b83466bc0a14a2857d73c2c902ab6aba7"; + sha256 = "19xbnqm90b1wsxbjhjm1q1mld0rv4p6ga1chzl4i00yccpwsh7g8"; libraryHaskellDepends = [ base containers mtl old-time random ]; homepage = "https://github.com/alexandersgreen/qio-haskell"; description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; @@ -14023,7 +14536,7 @@ self: { mkDerivation { pname = "QLearn"; version = "0.1.0.0"; - sha256 = "87d899997011c59e0f1f1a7efa434aa026e5c67f13681cdbe68ac8d300db736d"; + sha256 = "0vbkvc0d7j4awvdiqs0kgz3fa9m0991zlzhs3w7rxi8if2crkn47"; libraryHaskellDepends = [ base random vector ]; homepage = "poincare.github.io/QLearn"; description = "A library for fast, easy-to-use Q-learning"; @@ -14036,7 +14549,7 @@ self: { mkDerivation { pname = "QuadEdge"; version = "0.2"; - sha256 = "67800f1b75c3f1c21bbf537e24caac20d0c78b96560bdc055013ad1b11eb7cb8"; + sha256 = "1f3wxc8ipb8ka02xq2snjs5wgl10mk528zjkpwdw5wf3fldhz037"; libraryHaskellDepends = [ base random vector ]; description = "QuadEdge structure for representing triangulations"; license = stdenv.lib.licenses.bsd3; @@ -14048,7 +14561,7 @@ self: { mkDerivation { pname = "QuadTree"; version = "0.11.0"; - sha256 = "ce22be7f089d90babe9e46217cc99cb5da0c7771739423e7c6cec3b94da294e2"; + sha256 = "1qlll96vkhyfqvkj753kf5vhrnmmkk4pq8a6kszbm44x11zvw8nf"; libraryHaskellDepends = [ base composition lens ]; testHaskellDepends = [ base composition lens QuickCheck ]; description = "QuadTree library for Haskell, with lens support"; @@ -14063,7 +14576,7 @@ self: { mkDerivation { pname = "QuasiText"; version = "0.1.2.6"; - sha256 = "e801d269e25263645ee66fc090040fe9b9c8a8e5bf10485801dd7a5a30e0f119"; + sha256 = "06giw0q5lynx05c4h45zwnlcifg91w291h3gwrg68qsjw9lx40g8"; libraryHaskellDepends = [ attoparsec base haskell-src-meta template-haskell text th-lift-instances @@ -14082,7 +14595,7 @@ self: { mkDerivation { pname = "Quelea"; version = "1.0.0"; - sha256 = "b30b6516160a7d3ab9db3c1341b69c35f0a9230ac23bb819a7b42be48a67d7e3"; + sha256 = "1qypcy5f8axllwcvhfy218iskw1mkjv424rwvfwklz8a2qb6a2xk"; libraryHaskellDepends = [ base bytestring cassandra-cql cereal containers derive directory lens mtl optparse-applicative process random template-haskell text @@ -14099,7 +14612,7 @@ self: { mkDerivation { pname = "QuickAnnotate"; version = "0.6"; - sha256 = "6bb7e18367dff603fa099ad53fc34efce3b892dba5acd0ead1ae3fa372a4f076"; + sha256 = "0xphlira6gxfs7md1b55vf9biqzw9v1kzmcs17x07xnzcy1y3dvb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -14115,9 +14628,9 @@ self: { mkDerivation { pname = "QuickCheck"; version = "1.2.0.1"; - sha256 = "8daee0117004a5c8962092a1eadfafc31f86d1b37fb15f5619962c05d8dab7bf"; + sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; revision = "2"; - editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9"; + editedCabalFile = "1nahg4xzlx3hnw60ybzljka3lag3n0iysgnyppahrsblmryg01lg"; libraryHaskellDepends = [ base random ]; homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; @@ -14132,7 +14645,7 @@ self: { mkDerivation { pname = "QuickCheck"; version = "2.9.2"; - sha256 = "155c1656f583bc797587846ee1959143d2b1b9c88fbcb9d3f510f58d8fb93685"; + sha256 = "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m"; libraryHaskellDepends = [ base containers random template-haskell tf-random transformers ]; @@ -14144,12 +14657,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_10_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, random + , template-haskell, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.10.0.1"; + sha256 = "0bml00g26vyky6mhfhkzh0rsafcxfkrdvk1imvlb2l4mrli0bm80"; + libraryHaskellDepends = [ + base containers deepseq random template-haskell tf-random + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { pname = "QuickCheck-GenT"; version = "0.2.0"; - sha256 = "2d33ca9912e9a04c21cbde7f11b2b233455fcead3e4e6aaba9700097f8276c6d"; + sha256 = "0vbc4zw9f03hm6mnlkiymp75yi9knar12zyyrchlr8792acwlcrd"; libraryHaskellDepends = [ base mtl QuickCheck random ]; homepage = "https://github.com/nikita-volkov/QuickCheck-GenT"; description = "A GenT monad transformer for QuickCheck library"; @@ -14162,7 +14694,7 @@ self: { mkDerivation { pname = "QuickCheck-safe"; version = "0.1.0.2"; - sha256 = "2b6e41260800d399487537d186b1f8f55efb0ad26502333a956ecace9350f8f8"; + sha256 = "1y7qa29wxjkfjlx360k5s85gnppmz2qqdl9pfm49klq010k42vib"; libraryHaskellDepends = [ base QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -14173,7 +14705,7 @@ self: { mkDerivation { pname = "QuickCheckVariant"; version = "0.2.0.0"; - sha256 = "5ad8557a69793d00facc27a8f3eb9edd7bfde8cd923ea51465a9bfa0a7e7d682"; + sha256 = "10nnwyks1gx9claaagljrplgsyyxkvmz7a17rkx00gbrd5x5bn2s"; libraryHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/sanjorgek/QuickCheckVariant"; description = "Generator of \"valid\" and \"invalid\" data in a type class"; @@ -14188,7 +14720,7 @@ self: { mkDerivation { pname = "QuickPlot"; version = "0.1.0.1"; - sha256 = "02864cb2f1abcea25b5956421cfdd596c3b4d3ceafcd54d3aad26f443ba53fb5"; + sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14208,7 +14740,7 @@ self: { mkDerivation { pname = "Quickson"; version = "0.2"; - sha256 = "6f517503074bce301373c260d0feb3c42d2c04e0869a49d7baac732a198d28d7"; + sha256 = "1mr8ilcjlwxcpbblk6l6w022qbf4ngzd0q62fc9k1kjb0w1palbg"; libraryHaskellDepends = [ aeson attoparsec base bytestring either text ]; @@ -14225,7 +14757,7 @@ self: { mkDerivation { pname = "R-pandoc"; version = "0.2.2"; - sha256 = "988608b7353738a664a0557be210e82fd0db8e4a116577221fddc6b9b86d69cd"; + sha256 = "1kb9dnwbkinx3wi7fr8i9a7dpl1gx08f4ysml1jacf1p6nvhi1lq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14244,7 +14776,7 @@ self: { mkDerivation { pname = "RANSAC"; version = "0.1.0.2"; - sha256 = "f8950593e10356339951a41d5331db83fcb41e8d2bb7b26a36d37140ae0367e7"; + sha256 = "1rv70fp40wfk6rmb5drbilgb9z43vcqm67d4a6ck6mh3w69hb5gq"; libraryHaskellDepends = [ base random vector ]; testHaskellDepends = [ base HUnit lens linear test-framework test-framework-hunit vector @@ -14258,7 +14790,7 @@ self: { mkDerivation { pname = "RBTree"; version = "0.0.5"; - sha256 = "3873669ec394e570ebdb76682d60fb4713aa15719d5ff425eeab475a4058865c"; + sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq"; libraryHaskellDepends = [ base ]; homepage = "git://github.com/wuxb45/Haskell-RBTree.git"; description = "Pure haskell Red-Black-Tree implemetation"; @@ -14272,7 +14804,7 @@ self: { mkDerivation { pname = "RESTng"; version = "0.1"; - sha256 = "52113fbc7974f3c25e6e8c1c447d5b88ea6001091cb5ce921d238e653fd056b9"; + sha256 = "1fans0znb3i33n9cxd8w140n1sl8bdyl874cdrgc5wvlg6y3y4aj"; libraryHaskellDepends = [ base HDBC HDBC-postgresql mtl old-time parsec redHandlers xhtml yuiGrid @@ -14290,7 +14822,7 @@ self: { mkDerivation { pname = "RFC1751"; version = "0.3.1.0"; - sha256 = "d19f8c3020e76c45343a746442efbeabc7e60a80d1fdf8a11e5c29723d4937c8"; + sha256 = "1j1p94yp4aaw3shzizfih05fdixbpvpl4r3l78s4av7740q8r7yi"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary bytestring HUnit QuickCheck test-framework @@ -14308,7 +14840,7 @@ self: { mkDerivation { pname = "RJson"; version = "0.3.7"; - sha256 = "367489f04afa9704342939a23c30e1a54eaa89edc3c75e8c8f94b4193d837413"; + sha256 = "04vlhcyikd4liy65xiy3xn4slkm5w4q3r8ir54s095zs9bq8jx1n"; libraryHaskellDepends = [ array base bytestring containers iconv mtl parsec syb-with-class ]; @@ -14324,7 +14856,7 @@ self: { mkDerivation { pname = "RMP"; version = "0.0.2"; - sha256 = "5ea196839f6e0d0cb6ec5fff637dbf841617d3ec3305295b349798f311a7912d"; + sha256 = "0bcilw8z764p6idjj19kxk9if5l4pxyn7zszxjv0q3bfky1rd8ay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ allocated-processor base ]; @@ -14346,7 +14878,7 @@ self: { mkDerivation { pname = "RNAFold"; version = "1.99.3.4"; - sha256 = "26d522483e5f7e17fe6798911a53c6237315ea53457b7b1def22b76c63269e64"; + sha256 = "0r4y4rinrdr2xwfpnys5agm1awr3qr9im4cqczz1fzjz7r425m96"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14370,7 +14902,7 @@ self: { mkDerivation { pname = "RNAFoldProgs"; version = "0.0.0.3"; - sha256 = "97539e46522664e6aa92fa5a3d06d5f82f1659cc5178fb25ee874307505dbeae"; + sha256 = "1bmybm80fhw7xqjzny2iricicbzqsl33snpsjamfcr16a939wlwp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -14393,7 +14925,7 @@ self: { mkDerivation { pname = "RNAdesign"; version = "0.1.2.2"; - sha256 = "4f955d9cbc1a12b90f60779a9626d27a2e0d3bd48ae453c94900cee6235faee1"; + sha256 = "1qdfbwiydkh0974m7r4ashxhsbkss8k9d6kpc07vj4hspjf5v5ag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14415,7 +14947,7 @@ self: { mkDerivation { pname = "RNAdraw"; version = "0.2.0.1"; - sha256 = "bd0903068505a4252e92d49d89fd3a8e0a495183c5faef86b05a2c02f4a505b5"; + sha256 = "1d85lps04b2sn23fzyn5hd8lj2lf7byqk7flj8p2b905hl3062dx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14440,8 +14972,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.3.1"; - sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3"; + version = "1.3.7"; + sha256 = "19a8hb92jvklnfw38xpzdxvh7d9jyrak2nhmxrl9bkgfha4jfm6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14470,7 +15002,7 @@ self: { mkDerivation { pname = "RNAwolf"; version = "0.4.0.0"; - sha256 = "7603e38d6938a086780d93f8509d80bfb9501649d31263c9a3ef9180d0a3f1e8"; + sha256 = "1s7ilg8814gglg4n64nk94b51fdzh2fm1y4k1mw8d81qd66y60vn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14492,7 +15024,7 @@ self: { mkDerivation { pname = "RSA"; version = "2.2.0"; - sha256 = "293056d43352716d7f9501aac7ac9871c338f00d40c97a54c927a798f8a4f2d7"; + sha256 = "1mzjlkw9i9r7r5a7mja01pq3ihvik2ncgah1jmznswaj6ga5cc19"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA ]; @@ -14504,6 +15036,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "RSA_2_3_0" = callPackage + ({ mkDerivation, base, binary, bytestring, crypto-api + , crypto-pubkey-types, DRBG, QuickCheck, SHA, tagged + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "RSA"; + version = "2.3.0"; + sha256 = "0csk933gb2ayijxx6ar110lmsbvgyn7p5bqln3g2qbfxz73nvrzf"; + libraryHaskellDepends = [ + base binary bytestring crypto-api crypto-pubkey-types SHA + ]; + testHaskellDepends = [ + base binary bytestring crypto-api crypto-pubkey-types DRBG + QuickCheck SHA tagged test-framework test-framework-quickcheck2 + ]; + description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Raincat" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time @@ -14511,7 +15064,7 @@ self: { mkDerivation { pname = "Raincat"; version = "1.2"; - sha256 = "93ce80efedffc63e49bcd3e5745521fa810e438cd2f601de54bca9d9e59eddff"; + sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -14521,6 +15074,7 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Random123" = callPackage @@ -14531,7 +15085,7 @@ self: { mkDerivation { pname = "Random123"; version = "0.2.0"; - sha256 = "c4633bc61f2178931cf8f25cb16bb3f760d57060d7c50882bcfe2a3c8cb306a3"; + sha256 = "18q6nf63qapypj10iifpc1qdaq7pndmv2p7jz0f96y113z33nqy4"; libraryHaskellDepends = [ array base data-dword random ]; testHaskellDepends = [ base HUnit QuickCheck random test-framework test-framework-hunit @@ -14548,7 +15102,7 @@ self: { mkDerivation { pname = "RandomDotOrg"; version = "0.2.1"; - sha256 = "8cf82860c1f3d5cd1a04cd654f2b76bd0dc3fefe38ac1337df5b732288cdca65"; + sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c"; libraryHaskellDepends = [ base HTTP-Simple network ]; description = "Interface to random.org"; license = stdenv.lib.licenses.publicDomain; @@ -14560,7 +15114,7 @@ self: { mkDerivation { pname = "Randometer"; version = "0.1.0.1"; - sha256 = "e6d9cf2b9d6db8ff279ff0813c5e9b4d19bc697fbe3979233480becb8449d2aa"; + sha256 = "1anj962cpgl06hipjfdygxlvq6adkdg3r0ghkwkzzf3dklmwzng6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random-fu ]; @@ -14574,7 +15128,7 @@ self: { mkDerivation { pname = "Range"; version = "0.1.0.0"; - sha256 = "10e7ee42c0e9670e13fdc955ebbbe6afc5532fd6a664291352eb97a31128a91c"; + sha256 = "0759508s75zba89jjr56sqpm7idgwsxynmf9zl9hwrz9q11fxrqh"; libraryHaskellDepends = [ base ]; description = "Data structure for managing ranges"; license = stdenv.lib.licenses.bsd3; @@ -14586,7 +15140,7 @@ self: { mkDerivation { pname = "Ranged-sets"; version = "0.3.0"; - sha256 = "14a0913c91f2c1e44aec0c042afb05f518d9fe718ecc34bd3ad6473f9aa6a0aa"; + sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l"; libraryHaskellDepends = [ base HUnit QuickCheck ]; homepage = "http://code.haskell.org/ranged-sets"; description = "Ranged sets for Haskell"; @@ -14598,7 +15152,7 @@ self: { mkDerivation { pname = "Ranka"; version = "0.1"; - sha256 = "3960114faec46cc14faf80856b8fba9cd7e6a701e9bdc19e5ab2c9200208c0b5"; + sha256 = "1df010121jdjbagc3gg906kydmwwpa7np1c0mx7w2v64mr7i2q1r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -14618,7 +15172,7 @@ self: { mkDerivation { pname = "Rasenschach"; version = "0.1.3.2"; - sha256 = "4657bacee6bbdc17481174ee6a444cd77e72775d772e2f7f6db8b9e6a95f64f2"; + sha256 = "1wk4bylydfdqdmzjybkpbmvp4znp9i26mvkl2541gp5vwv7blms6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -14638,10 +15192,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.1"; - sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef"; - revision = "1"; - editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089"; + version = "0.7.2.1"; + sha256 = "0x2dyk72krfxwz2kk7w8cr8ws9imv7c2sgy1v4nsffjsb94qcvbz"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -14655,7 +15207,7 @@ self: { mkDerivation { pname = "ReadArgs"; version = "1.2.3"; - sha256 = "9f4b2a9dfa9f0d851f79853a56ffde3b35e218d5f2bf8354c91a1344a1251a69"; + sha256 = "0s8s4nhl84qsr5a87gzjslcf4d9vvvzmcfl5g4gqa3czzafjljwz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base system-filepath text ]; @@ -14675,7 +15227,7 @@ self: { mkDerivation { pname = "Redmine"; version = "0.0.8"; - sha256 = "0f0460459b9293b95f55ea966891daf04552de4c8d950da79963fe8b9552acd2"; + sha256 = "1lmcaaaqpzk3k6khv5cd9kg54ighva8ni5paamgvk4wjkd2n010g"; libraryHaskellDepends = [ aeson base bytestring connection containers HTTP http-client-tls http-conduit http-types MissingH network resourcet text time @@ -14697,7 +15249,7 @@ self: { mkDerivation { pname = "Ref"; version = "0.1.1.0"; - sha256 = "15920fe1123d96b8717710e170d4095fe9fca1de0a4e6d045b6a35bfe49a1197"; + sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://bitbucket.org/carter/ref"; description = "Generic Mutable Ref Abstraction Layer"; @@ -14712,7 +15264,7 @@ self: { mkDerivation { pname = "RefSerialize"; version = "0.4.0"; - sha256 = "05b25eb1ab943d96119aa2acca678fc8f194c3411af521e3835f4de5c752bbb2"; + sha256 = "1cmvab3yakazhgij3x8s871r9wf8ixkwmb52k88rcgclmfqmxch5"; libraryHaskellDepends = [ base binary bytestring containers hashtables stringsearch ]; @@ -14727,7 +15279,7 @@ self: { mkDerivation { pname = "Referees"; version = "0.0.0"; - sha256 = "f9407b81a917b01d3d89d34ebbbd319c07a5f4742fe9d5c0224d96428a50d71c"; + sha256 = "076pa25455jd4b0dbs9gfksaa1ww66yvnknki4yivc0pm60pnh7r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14749,7 +15301,7 @@ self: { mkDerivation { pname = "RepLib"; version = "0.5.4"; - sha256 = "986447e27a4eb12408b9571f51c766612f31f99c40e94d031c796387ce24838d"; + sha256 = "13c34k78fqvr3h1lvsa0kkwk2bv1cv3m27spp4429cafgbi4fr4q"; libraryHaskellDepends = [ base containers mtl template-haskell transformers ]; @@ -14763,7 +15315,7 @@ self: { mkDerivation { pname = "ReplicateEffects"; version = "0.3"; - sha256 = "4794e0eee76ea15e2090f2dd0dc6171144f8affae91bc8ae68e31597975d96a4"; + sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/MedeaMelana/ReplicateEffects"; description = "Composable replication schemes of applicative functors"; @@ -14777,7 +15329,7 @@ self: { mkDerivation { pname = "ReviewBoard"; version = "0.2.2"; - sha256 = "e54852f764d3a2b13d5a19ab6bfe454dfc705cf8ec06fc5bbf4f781aebd12cbf"; + sha256 = "1grcs7mily2gpxdzq1pcz1f71z2d8pz6paqrb8yv38nkckvm4j75"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base HTTP json mtl network random ]; @@ -14794,7 +15346,7 @@ self: { mkDerivation { pname = "RichConditional"; version = "0.1.0.0"; - sha256 = "5caa6c1b74782a5ed2f1d43d389a6a56c92e343c3e1437a95226e4c227a3b718"; + sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/avieth/RichConditional"; description = "Tiny library to replace classic if/else"; @@ -14812,7 +15364,7 @@ self: { mkDerivation { pname = "Rlang-QQ"; version = "0.3.1.0"; - sha256 = "121e05ebb444c85fc4ad2b1cdeac4f7b140a5604c48b11cedc88b97d72658366"; + sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj"; libraryHaskellDepends = [ array base binary bytestring Cabal containers data-binary-ieee754 directory filepath haskell-src-meta HList lens mtl process repa SHA @@ -14835,7 +15387,7 @@ self: { mkDerivation { pname = "RollingDirectory"; version = "0.1"; - sha256 = "9bf4be9099226cb3445c6cde7a801ba9d152fd1e9b95f36c39f7a29d52838457"; + sha256 = "0mw4hd99v8pp75ng75cv3vym5ld93f07mpkcbi2b6v12k68bxx4v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -14856,19 +15408,30 @@ self: { mkDerivation { pname = "RoyalMonad"; version = "1000.9"; - sha256 = "99bf6ccf65077396f305d18993c23ab8acb85fc38e2bed82638bc4918ee13dbe"; + sha256 = "1gixw6793i4bcf1fsawfqdgvib5q7b1972fi0prrcwq7cp7nrgwr"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/atzeus/RoyalMonad"; description = "All hail the Royal Monad!"; license = stdenv.lib.licenses.bsd3; }) {}; + "RtMidi" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "RtMidi"; + version = "0.1.0.0"; + sha256 = "087p4smmbi56y962lchgs2a6q78jab58bl6c5sxir7973hplyly6"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/riottracker/RtMidi"; + license = stdenv.lib.licenses.mit; + }) {}; + "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: mkDerivation { pname = "RxHaskell"; version = "0.2"; - sha256 = "740f96baaf41bccfdb51f5a2cdded0d6dc584a9e55becb4cfe9be476e7d69d5f"; + sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl"; libraryHaskellDepends = [ base containers stm transformers ]; homepage = "https://github.com/jspahrsummers/RxHaskell"; description = "Reactive Extensions for Haskell"; @@ -14884,7 +15447,7 @@ self: { mkDerivation { pname = "SBench"; version = "0.2.0"; - sha256 = "554568a9ed1cc6be2ff7d08996b18f6ee3f5653391ef078b190005cb79c3a97a"; + sha256 = "0ym9qdwwn180365hgvwi6djzbqvfiyqrd2fhywpvxihwxnlnhiam"; libraryHaskellDepends = [ base bytestring cassava criterion deepseq directory filepath gnuplot hp2any-core parsec process utf8-string vector @@ -14899,34 +15462,24 @@ self: { mkDerivation { pname = "SCalendar"; version = "0.1.0.0"; - sha256 = "896fbdaa6db59df65666f68d622841d4df46196b207eb1e37d5b592850767537"; + sha256 = "0dvmfr82hnavgpiv2zi0dccldpyl84l653gncrbgd7dmdnmbsvw9"; + revision = "1"; + editedCabalFile = "0vcdmzisi7v7jsm6bj34q43f42ab0bhq992lyq740ickzp3a6k22"; libraryHaskellDepends = [ base containers text time ]; homepage = "https://github.com/sebasHack/SCalendar"; - description = "Library for managing calendars and resource availability"; + description = "XXXX"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "SConfig" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "SConfig"; - version = "0.2.0.0"; - sha256 = "df83eddc9ac14bbc5240901a42c7fe91b60bb390da1967db561f154abf365a0c"; - libraryHaskellDepends = [ base containers ]; - homepage = "https://github.com/fgaz/SConfig"; - description = "A simple config library"; - license = stdenv.lib.licenses.mit; - }) {}; - "SDL" = callPackage ({ mkDerivation, base, SDL }: mkDerivation { pname = "SDL"; version = "0.6.5.1"; - sha256 = "864c336c8b7f9f9b0239ce2d62521c4e2fd101e67f8cde6d5c2fe8bc47ff43e9"; + sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"; revision = "1"; - editedCabalFile = "233e3fde4727ca7b597e0bf86619c6b862c32445191a37b7a536a3188634473e"; + editedCabalFile = "0gj76j31i8rnlnvkf6hr8ljc6qmqqqcndy0bgrcppji78zg3ygi3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ SDL ]; description = "Binding to libSDL"; @@ -14938,7 +15491,7 @@ self: { mkDerivation { pname = "SDL-gfx"; version = "0.6.0.2"; - sha256 = "ab0035335a2193d8fd3e468bc2e5ba74b086516b62bad35415153606a2770dc5"; + sha256 = "1i8dfyi0cdhm2mad7fk2dd8qdc3lpbjw52s67vyxi4r1b8rka05b"; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; @@ -14950,9 +15503,9 @@ self: { mkDerivation { pname = "SDL-image"; version = "0.6.1.2"; - sha256 = "01892919dc9576c9a7b7c6698f2308c9caca61afa5550197be1fdb1231e56df9"; + sha256 = "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281"; revision = "1"; - editedCabalFile = "7e837026adb1262504d8bc4799628961f66200ad1a5f25e2b6b5842f0618dd6b"; + editedCabalFile = "0syx3032z15mnvi2apqsml065xk1i5i9jixwv022a9mimlk710vy"; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; @@ -14964,9 +15517,9 @@ self: { mkDerivation { pname = "SDL-mixer"; version = "0.6.2.0"; - sha256 = "1969170ee9d20811697f1f3d3150d388d45a809ea3d72495980da0968e5719ba"; + sha256 = "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r"; revision = "1"; - editedCabalFile = "9f17a645f815b3a0f47507263f0d2a8f57ff9d6893c8c967a7241e16e68b7ca4"; + editedCabalFile = "193wigk1c7i4lxkwkj4kd2fzymwg586ky9h7fpsa1cqmz12sc5wz"; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -14978,7 +15531,7 @@ self: { mkDerivation { pname = "SDL-mpeg"; version = "0.0.1"; - sha256 = "92e7888962a00f053ad671b6a3c2e407605c785ccca7459ab790591fcf49a443"; + sha256 = "0hx4977iynchnyd4b9ycbiw5qq07wk1a7dkisqx0a3x0ca4qirwj"; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; @@ -14990,7 +15543,7 @@ self: { mkDerivation { pname = "SDL-ttf"; version = "0.6.2.2"; - sha256 = "1621e4f1262f0c63aef84e02a9f53515ddcc4fce92a50d6954d947598a527499"; + sha256 = "16blaa55jiyrailhv9cjrr7wrp8m6pssj0jfz2p6631g4vqy888n"; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; @@ -15002,7 +15555,7 @@ self: { mkDerivation { pname = "SDL2-ttf"; version = "0.1.0"; - sha256 = "06a20c0c8652c3c2ed53db5e638c44cb7b3f2199bc490324dfb72001e344cf0e"; + sha256 = "03ng8kih285pvwj06jdwk4hkyyyb8j666pnvagnw5hsjhq60r8h6"; libraryHaskellDepends = [ base SDL2 ]; librarySystemDepends = [ SDL2_ttf ]; description = "Binding to libSDL-ttf"; @@ -15018,7 +15571,7 @@ self: { mkDerivation { pname = "SFML"; version = "2.3.2.4"; - sha256 = "0aad64bf7b91f5cc212e80982578c626e8d1aedc97a1487aa3bb45460a5f5bc3"; + sha256 = "1hsvbw54cidvldx4i8cpvjpd3s16qrw2b6405qhwrxcigfzn9b8a"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ csfml-audio csfml-graphics csfml-network csfml-system csfml-window @@ -15038,7 +15591,7 @@ self: { mkDerivation { pname = "SFML-control"; version = "0.2.0.2"; - sha256 = "2fa99f0c2710ded653b8faffb9702cde5f62b746316854b233bf9634924f3000"; + sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g"; libraryHaskellDepends = [ base mtl SFML template-haskell ]; homepage = "https://github.com/SFML-haskell/SFML-control"; description = "Higher level library on top of SFML"; @@ -15051,7 +15604,7 @@ self: { mkDerivation { pname = "SFont"; version = "0.1.1"; - sha256 = "119070e8d6dc72c0195e68c05c5614d6a639abf5ab12b667a5e84e00b4dffe1c"; + sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i"; libraryHaskellDepends = [ array base SDL Sprig ]; homepage = "http://liamoc.net/static/SFont"; description = "SFont SDL Bitmap Fonts"; @@ -15064,7 +15617,7 @@ self: { mkDerivation { pname = "SG"; version = "1.0"; - sha256 = "5b06339b45d73c79cef7c952afc39699cd83638876bb6693528d2e5e2e2d412a"; + sha256 = "0aj15lp5wbldaa9ndfvni1iq7kcrjv1syln9yz77jg6p8ndk61jv"; libraryHaskellDepends = [ base mtl ]; description = "Small geometry library for dealing with vectors and collision detection"; license = stdenv.lib.licenses.bsd3; @@ -15076,7 +15629,7 @@ self: { mkDerivation { pname = "SGdemo"; version = "1.1"; - sha256 = "66f3c364997b8e420650c686116f312b4fac9d2b338a1ebd88e910cc8b47fa38"; + sha256 = "0f7s8y5wq479i2yix2ik5ffsqkrb65pi31n6a03453kvk5jc7wv6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT OpenGL SG ]; @@ -15090,7 +15643,7 @@ self: { mkDerivation { pname = "SGplus"; version = "1.1"; - sha256 = "639702205bd0f11aabd6fd8fe025bfb21e9af40d6af4d48c3c5b086ecf8299e3"; + sha256 = "1qwrhb7nw22v7j6d9x3a1ps9l7mjpwjy13zxssmimwfhbch055v3"; libraryHaskellDepends = [ base mtl ]; description = "(updated) Small geometry library for dealing with vectors and collision detection"; license = stdenv.lib.licenses.bsd3; @@ -15103,7 +15656,7 @@ self: { mkDerivation { pname = "SHA"; version = "1.6.4.2"; - sha256 = "c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c"; + sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring ]; @@ -15120,7 +15673,7 @@ self: { mkDerivation { pname = "SHA2"; version = "0.2.5"; - sha256 = "804824c6df6520af89451f0b4aa7c58a7d5d29ca5bdc5195f3d5f423864a47ff"; + sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40"; libraryHaskellDepends = [ AES base bytestring monads-tf transformers ]; @@ -15135,13 +15688,14 @@ self: { mkDerivation { pname = "SMTPClient"; version = "1.1.0"; - sha256 = "d3e9be4675439b58f62dbd0abb2fa4234061a08ea50562d8183f0ec28890d21e"; + sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk"; libraryHaskellDepends = [ base containers extensible-exceptions hsemail network old-locale old-time ]; description = "A simple SMTP client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SNet" = callPackage @@ -15151,7 +15705,7 @@ self: { mkDerivation { pname = "SNet"; version = "0.1.0"; - sha256 = "2955c41e872833d4b631d0c6de58d5912ed39320ab589e9cfdd4edf258149aa6"; + sha256 = "19ls2icg5vflznf9wn5b429x6blismcdxinh66vd8cr8hwgc8m99"; libraryHaskellDepends = [ base bindings-DSL containers data-default lens mtl transformers ]; @@ -15169,7 +15723,7 @@ self: { mkDerivation { pname = "SQLDeps"; version = "0.1"; - sha256 = "f7ed82bfb390e30aa25709e80bd30e6b7659327f7601d4d7d055c2c372dfa4b7"; + sha256 = "1dx4vxrc7hjms3bx80bngwr5jxkb1v9hps09ayi0mqwhnfzq5vgp"; libraryHaskellDepends = [ base hashable HDBC HDBC-sqlite3 mtl unordered-containers ]; @@ -15182,7 +15736,7 @@ self: { mkDerivation { pname = "STL"; version = "0.3.0.4"; - sha256 = "298b4cdeaa80c28ae773c135405e04bb8112ec5dee3f0c1b35eb7de9d703ba5a"; + sha256 = "0nms0gbyjzgb6ldhqgzfbpn150dv0ig40df1fgkqmhl0mbg4r2r9"; libraryHaskellDepends = [ attoparsec base bytestring cereal text ]; homepage = "http://github.com/bergey/STL"; description = "STL 3D geometry format parsing and pretty-printing"; @@ -15194,7 +15748,9 @@ self: { mkDerivation { pname = "STMonadTrans"; version = "0.4.3"; - sha256 = "574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db"; + sha256 = "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp"; + revision = "1"; + editedCabalFile = "09kqrv9a4yhsdpix49h9qjw0j2fhxrgkjnfrnyxg1nspmqrvl50m"; libraryHaskellDepends = [ array base mtl ]; testHaskellDepends = [ array base Cabal mtl ]; description = "A monad transformer version of the ST monad"; @@ -15208,7 +15764,7 @@ self: { mkDerivation { pname = "SVG2Q"; version = "0.3"; - sha256 = "b8feb8f712856d02a9b5026eff2a240b93073fe54112241343b391df1810991d"; + sha256 = "07cr20cdz4dk8c9j84j1wlzhg4qb4hmgyvh2nnlh4vc52bvvizmq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15229,7 +15785,7 @@ self: { mkDerivation { pname = "SVGFonts"; version = "1.6.0.1"; - sha256 = "f727ef24f8591c2d6aea64d85c569db56db5324093dcf569d417ac6b1582d0f0"; + sha256 = "1w6hh8anpb0psilzbp4k80rbavdmkmb5rn34x9m2s72rz0jfy9zp"; libraryHaskellDepends = [ attoparsec base blaze-markup blaze-svg bytestring cereal cereal-vector containers data-default-class diagrams-core @@ -15244,7 +15800,7 @@ self: { mkDerivation { pname = "SVGPath"; version = "1.1.2"; - sha256 = "e452034117aa3d4e35a87795eb0c273b726f48880899a5a6455b1a9bc3ad99a8"; + sha256 = "1a4rmp1rn6jv8nkab688i146ywiv4w6fp5bpm0slwgda2x0h6lp4"; libraryHaskellDepends = [ base parsec ]; description = "Parsing the path command of SVG"; license = stdenv.lib.licenses.bsd3; @@ -15257,7 +15813,7 @@ self: { mkDerivation { pname = "SWMMoutGetMB"; version = "0.1.1.1"; - sha256 = "60b2a2188eaeb2b32bfae2b74a0b61daa25f3c5470cb2babf8082b8a52828f69"; + sha256 = "0scgh998laq8z2mjpjvhahy5z8nsc45lmdz2z8mv7cmfiqca5ck0"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 pipes-binary pipes-bytestring pipes-parse split @@ -15275,7 +15831,7 @@ self: { mkDerivation { pname = "SableCC2Hs"; version = "0.0.1.0"; - sha256 = "d449d446e1917c746d036fc1a5dc72e09439b223874ef9f4889e970b4e98cfea"; + sha256 = "1sngk170p5wyi3sgjkl74fr3k570fbfabhbg0dnp8z4iw53d8jfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers ]; @@ -15293,7 +15849,7 @@ self: { mkDerivation { pname = "Safe"; version = "0.1"; - sha256 = "43980da212a6feda3177c8cec276ccbf2d6704a98b941703e9d29761482e7179"; + sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623"; libraryHaskellDepends = [ base ]; homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php"; description = "Library for safe (pattern match free) functions"; @@ -15305,9 +15861,9 @@ self: { mkDerivation { pname = "SafeSemaphore"; version = "0.10.1"; - sha256 = "21e5b737a378cae9e1faf85cab015316d4c84d4b37e6d9d202111cef8c4cef66"; + sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91"; revision = "1"; - editedCabalFile = "1b168ec8de4b3958df15b33ba9ab60d8a651d9dd4ea36891d4c31ae81e7ec1cc"; + editedCabalFile = "1k61gqgfh6n3sj8ni8sfvpcm39nqc2msjfxk2pgmhfabvv48w5hv"; libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore"; @@ -15320,7 +15876,7 @@ self: { mkDerivation { pname = "Salsa"; version = "0.2.0.2"; - sha256 = "edf10725602ec9e32b2b8fea0fe881d1ccbd302cf5ef016c2c48e91922af2524"; + sha256 = "0915mwi1ksa85in03vzm5hqbvk6ih7l0zslg5cmy7j9fc0jhgwgd"; libraryHaskellDepends = [ base bytestring file-embed ]; librarySystemDepends = [ glib mono ]; homepage = "http://haskell.org/haskellwiki/Salsa"; @@ -15338,7 +15894,7 @@ self: { mkDerivation { pname = "Saturnin"; version = "0.1.0.2"; - sha256 = "59e34bfb8bc08ec95f24f09d3f9b3896ad76720237f228d59b1858e1f309df38"; + sha256 = "0f6z17ry2n0qkgajiwip09r7dbcn72dkz7gh4igwk3n0igxlpqsr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15361,7 +15917,7 @@ self: { mkDerivation { pname = "SciFlow"; version = "0.5.3.1"; - sha256 = "8d8408047e57b245ea66577ded733244959c507ff1e2d014b3d3d9cfd66fdbf0"; + sha256 = "1w6vdzbcznfkncad1qpigx89r5a469ryszapcvm4bcjpgq20i14d"; libraryHaskellDepends = [ base bytestring cereal containers directory exceptions executable-path fgl graphviz lens lifted-async mtl @@ -15380,7 +15936,7 @@ self: { mkDerivation { pname = "ScratchFs"; version = "0.1.0.2"; - sha256 = "f0b35cfc2a5fe3e24cf76ac83ce8062155403b877ac8197ac3e51dbf2c048130"; + sha256 = "0c410hnby7g5qdx1kj3shwxl0m910vl3rj3ayx6f5qsz5by5rczh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15400,7 +15956,7 @@ self: { mkDerivation { pname = "Scurry"; version = "0.0.3"; - sha256 = "1261aefae7076bed3ae941e1794ed8c576f76a01c5e1b30745e05ffd51549447"; + sha256 = "0iwlai8zspz08l3v7qf505mgfxn5v177kqa1x4xfssq7wzxawq8j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15418,7 +15974,7 @@ self: { mkDerivation { pname = "SegmentTree"; version = "0.3"; - sha256 = "6188c1b1276d7fa0391098a563df73dd522d20b57dc5321fe3418a9e3ca84fc1"; + sha256 = "1hagm0y9x2j1wcgk5ibxnlh2slnxfggn79cq20ws0zvd4yqw3231"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -15426,6 +15982,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SelectSequencesFromMSA" = callPackage + ({ mkDerivation, base, biocore, biofasta, bytestring, ClustalParser + , cmdargs, containers, directory, either-unwrap, filepath, matrix + , parsec, process, text, text-metrics, transformers, vector + , ViennaRNAParser + }: + mkDerivation { + pname = "SelectSequencesFromMSA"; + version = "1.0.3"; + sha256 = "0i2nzwv0czg1igyfiyk5n748j15fcavn84dwxibiqf48wzjz9gsc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base biocore biofasta bytestring ClustalParser cmdargs containers + directory either-unwrap filepath matrix parsec process text + text-metrics transformers vector ViennaRNAParser + ]; + executableHaskellDepends = [ + base cmdargs directory either-unwrap + ]; + description = "SelectSequences is a tool for selection of a represenative subset of sequences from a multiple sequence alignment in clustal format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Semantique" = callPackage ({ mkDerivation, base, bytestring, classify, containers, mongoDB , mtl, network, process, split, tagsoup, text @@ -15433,7 +16013,7 @@ self: { mkDerivation { pname = "Semantique"; version = "0.3.0"; - sha256 = "2833c17d3b9cd6d872c999b940a7f601921f8fb4869611783eb99b52372563d0"; + sha256 = "1l334lvm56xr7rw135l6nj7iz4h1yskl1fcrr5rdimlw7dyw2cr8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15450,7 +16030,7 @@ self: { mkDerivation { pname = "Semigroup"; version = "0.0.7"; - sha256 = "a65f0934221cbec4a53205cc965d3fd3875512cd254ee6619102e407ca0fbcd5"; + sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6"; libraryHaskellDepends = [ base bytestring containers mtl ]; homepage = "https://bitbucket.org/dibblego/semigroup/"; description = "A semigroup"; @@ -15462,7 +16042,7 @@ self: { mkDerivation { pname = "SeqAlign"; version = "0.1.0.0"; - sha256 = "c5d2b6ca6bad69d7891418cbca0a11b1035ff4b5620017918d7c2415a21d666e"; + sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5"; libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; @@ -15476,7 +16056,7 @@ self: { mkDerivation { pname = "SessionLogger"; version = "0.3.0.0"; - sha256 = "83216a15e2bc48a9657d28b12852082c46e304968470cedb518a989b1cd5f2fd"; + sha256 = "1zgjslf9p64aa7dwww44jq2f6iic1192ic98gmjsjj5ww8anl8c3"; libraryHaskellDepends = [ base directory filepath hslogger mtl old-locale random time ]; @@ -15491,8 +16071,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.4.5"; - sha256 = "53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7"; + version = "0.4.6"; + sha256 = "1g5ihsma3zgb7q89n2j4772f504nnhfn065xdz6bqgrnjhkrpsqi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15515,9 +16095,9 @@ self: { mkDerivation { pname = "Shellac"; version = "0.9.9"; - sha256 = "e64d4e16b10a79bd4a149e695873382ebf733f8915ae6791b08c494bea48a700"; + sha256 = "005793m4njccn28ngbhmi4zp7grf71rmhscy2i5bsy8an4b4wkg6"; revision = "1"; - editedCabalFile = "3ffcc6aa147ae304774ddde0cd56e92f8d913f12d2e4a7d7fc0e66b7019007db"; + editedCabalFile = "1nq7j00vfrhfzkbsgr6j28zr339gx5bcvq6x9mvh9qvs2jmcdz1z"; libraryHaskellDepends = [ base directory mtl unix ]; homepage = "http://rwd.rdockins.name/shellac/home/"; description = "A framework for creating shell envinronments"; @@ -15529,9 +16109,9 @@ self: { mkDerivation { pname = "Shellac-compatline"; version = "0.9.9"; - sha256 = "255b987acc54eccc6f6cb56ca6ee635fa2c0ab4e1ea1de1edd307a147553b162"; + sha256 = "0qmiadsi8yihvlgdx88y9smw18jzcgpacv5mdipwrv2lrix9hnr5"; revision = "1"; - editedCabalFile = "40f9d22abf36bdd38d2d5816851d279d1d33f6a5db365c83f34912f965be4873"; + editedCabalFile = "0ws8prjzj4j9yf1mqdnvlpv367cx4wfqa5jq5n6x7g9npwmd5ya0"; libraryHaskellDepends = [ base Shellac Shellac-readline ]; homepage = "http://rwd.rdockins.name/shellac/home/"; description = "\"compatline\" backend module for Shellac"; @@ -15543,9 +16123,9 @@ self: { mkDerivation { pname = "Shellac-editline"; version = "0.9.9"; - sha256 = "87e12d5ab838d6ff004f0172c1b868e0ead3ae8fbf122286e221b60e67694e9c"; + sha256 = "172fd5khxdi1wa3244mziypd7sp0d2wc2wh19w0gzmiqp1d2vqc7"; revision = "1"; - editedCabalFile = "db50092611da270eff784c8cb0015967b43278132dd6d4c891ba508beda1caf3"; + editedCabalFile = "1wyal7nqnl5sj74d9mid2dw35d37b40v132cg3zhw9ys24k0jl6v"; libraryHaskellDepends = [ base editline Shellac ]; homepage = "http://rwd.rdockins.name/shellac/home/"; description = "Editline backend module for Shellac"; @@ -15558,7 +16138,7 @@ self: { mkDerivation { pname = "Shellac-haskeline"; version = "0.2.1"; - sha256 = "046a34e2c01f2a883fab67dd0ade226b5b6cf48da689a51526730bfa90141552"; + sha256 = "0lhm2j8gl2vk4qasb2d6ips6qnvb4bg0mpb7mczqhahzq3i38sh4"; libraryHaskellDepends = [ base haskeline mtl Shellac ]; description = "Haskeline backend module for Shellac"; license = stdenv.lib.licenses.bsd3; @@ -15569,21 +16149,43 @@ self: { mkDerivation { pname = "Shellac-readline"; version = "0.9.9"; - sha256 = "351fbc5e9a44abd2d3de95428a2b76c79974579c25cb76a8a7da7c1690eb8851"; + sha256 = "0lc8xf81cz6slyl7djr5kibp96f7fqmqlhlmvv9x5as4k9gbq7rm"; revision = "1"; - editedCabalFile = "1a1a54835703473ce18eb322e133610694af3e81ccca1c563e5bc46a033e3705"; + editedCabalFile = "019p7q1nmi2v7rb1rjnch4zaz506c4ry28mkivhkqiq3ay1m86hs"; libraryHaskellDepends = [ base readline Shellac ]; homepage = "http://rwd.rdockins.name/shellac/home/"; description = "Readline backend module for Shellac"; license = stdenv.lib.licenses.bsd3; }) {}; + "ShortestPathProblems" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionSet, base, FormalGrammars + , log-domain, PrimitiveArray, QuickCheck, tasty, tasty-quickcheck + , tasty-th, text, vector + }: + mkDerivation { + pname = "ShortestPathProblems"; + version = "0.0.0.1"; + sha256 = "1p8xbrchk13mrij4vs0licblh3siq6m3kiz0l2n38xbmcc43zh8f"; + libraryHaskellDepends = [ + ADPfusion ADPfusionSet base FormalGrammars log-domain + PrimitiveArray text vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/ShortestPathProblems"; + description = "grammars for TSP and SHP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ShowF" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ShowF"; version = "0.1.1"; - sha256 = "d0f9ade81af6e341a5e6a99ba456a08d55a36f78963f6e9c41d0d941208904db"; + sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/conal/ShowF/"; description = "Show for * -> *"; @@ -15595,7 +16197,7 @@ self: { mkDerivation { pname = "Shrub"; version = "0.1.0.0"; - sha256 = "a8a0081970dbffd0b09f5dc9d2509bddb50d3127bdaddedc7aeea98fb3b7b980"; + sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858"; libraryHaskellDepends = [ base ]; description = "4-way trie fuzzy search"; license = stdenv.lib.licenses.bsd3; @@ -15606,7 +16208,7 @@ self: { mkDerivation { pname = "Shu-thing"; version = "1.1.3"; - sha256 = "3be209bad2521e6e1b5144483dd03e73db6f3a19469211c04c316e3c5a67bba0"; + sha256 = "185vcxd3qvii9k0134j634x6znvk7v83sj24a4dnw7jjsax0kqiv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT ]; @@ -15621,7 +16223,7 @@ self: { mkDerivation { pname = "SimpleAES"; version = "0.4.2"; - sha256 = "7213b531e9f9a49f6ec23f36d2c6bf552ae9c571c9b239b8c8be5198f9eb0569"; + sha256 = "0s85xgwrhldyr2w3kcn9f72yjajmpz3d4dizq9p9z97rx4qva4vj"; libraryHaskellDepends = [ base binary bytestring mwc-random ]; description = "Fast AES encryption/decryption for bytestrings"; license = stdenv.lib.licenses.bsd3; @@ -15632,7 +16234,7 @@ self: { mkDerivation { pname = "SimpleEA"; version = "0.2.1"; - sha256 = "7923b3d815b83de0b3e36c8a7b26547de694d059459b58fcb752a2117caa3562"; + sha256 = "0qimm9y138jjnzy5i6s5b7899rkxahk7p2kcwfry0gdq2pcb68vr"; libraryHaskellDepends = [ base mersenne-random-pure64 MonadRandom ]; @@ -15647,7 +16249,7 @@ self: { mkDerivation { pname = "SimpleGL"; version = "0.9.3"; - sha256 = "19968a2beff81a94fb5eaf044ad94d425149ebdce5833a0a637ae3280b26c730"; + sha256 = "0c674q5jiqvscc53m0z5vkmljla29pcll15gbvxr86pqxwmqm5hr"; libraryHaskellDepends = [ base GLFW JuicyPixels OpenGL SimpleH vector ]; @@ -15663,7 +16265,7 @@ self: { mkDerivation { pname = "SimpleH"; version = "1.2"; - sha256 = "acfe142fdaecc57a316791fb6d92fc9561c466f198b5bc4eafbd98aae9f5053c"; + sha256 = "0g05yplsm65xmx7brdcqy5kc8qcmzj96vywicwqpmigcv8pi9zmc"; libraryHaskellDepends = [ base bytestring clock containers cpu directory filepath network time unix @@ -15682,7 +16284,7 @@ self: { mkDerivation { pname = "SimpleLog"; version = "0.1.0.3"; - sha256 = "7ce9dc8f7175ddcd93583e49401e5b5b7b57d6f245e890df08f75dd6556dd289"; + sha256 = "12fjdmaxcpgp13gr1s25ybb5fysvbcg40j9yb29wvpbmf67xrsbw"; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring containers directory ForkableT monad-control mtl old-locale resourcet semigroups stm @@ -15700,8 +16302,8 @@ self: { }: mkDerivation { pname = "SimpleServer"; - version = "0.1.1.1"; - sha256 = "e3f3d556ad866c442183788f64d97e4e55e50bedcab4bfef65803352146bdeb4"; + version = "0.1.1.2"; + sha256 = "0nb8j2sgbmf0nk4fbs2y4a4kdiv3vxc7qqaczl40b11l60qz4ab3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15720,7 +16322,7 @@ self: { mkDerivation { pname = "SimpleTableGenerator"; version = "0.2.0.0"; - sha256 = "1b58efcfa9689b1d1c82c5e3016b15d3eaa6d104303feabb31064dff16fe71ad"; + sha256 = "1bbizqbgyk8666xylgrh0k8sdsnk2mmh3qy5h8f1v6v8m77yyn0v"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base Cabal ]; description = "Simple table generator"; @@ -15728,12 +16330,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Sit" = callPackage + ({ mkDerivation, array, base, containers, data-lens-light, mtl }: + mkDerivation { + pname = "Sit"; + version = "0.2017.5.2"; + sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base containers data-lens-light mtl + ]; + homepage = "https://github.com/andreasabel/Sit"; + description = "Prototypical type checker for Type Theory with Sized Natural Numbers"; + license = "unknown"; + }) {}; + "SizeCompare" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "SizeCompare"; version = "0.1"; - sha256 = "478504d5fdf1789ced9361c7234d038217129d9aa27d647388da0756dfdba338"; + sha256 = "0f53vggmc1ysi1rn8zd2kafi45w20d6j7iv1jgnrqy7izpah91a7"; libraryHaskellDepends = [ base containers ]; description = "Fast size comparison for standard containers"; license = "GPL"; @@ -15746,7 +16364,7 @@ self: { mkDerivation { pname = "Slides"; version = "0.1.0.9"; - sha256 = "2a969435dc7025a0e1d7ae2fe28db3dd8c71f010790c3545bceba118e65bd049"; + sha256 = "0jfhbgk1i8gbpi2ka33r23q7336xnf6y4bxfszhs09bhvhsr95ia"; libraryHaskellDepends = [ base colour diagrams-lib diagrams-svg file-embed regex-applicative ]; @@ -15763,7 +16381,7 @@ self: { mkDerivation { pname = "Smooth"; version = "0.1.0.1"; - sha256 = "8dfdc9f4c3fa9fec50f0c9afbbdf1b164174a72161ca7b34fcfadd1d782b9467"; + sha256 = "0rwl5dw1vpgszhs7pjk146kp8h8n3ggvpby9y18fr7zsqgsckzcd"; libraryHaskellDepends = [ base containers DifferenceLogic FirstOrderTheory HUnit Proper ]; @@ -15777,7 +16395,7 @@ self: { mkDerivation { pname = "SmtLib"; version = "0.1.0.0"; - sha256 = "6133bcb354742ffc6b46e221887a1c3935768a975cd02966c46e2dab06fdad72"; + sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1"; libraryHaskellDepends = [ base parsec transformers ]; homepage = "https://github.com/MfesGA/HsmtlibParser"; description = "Library for parsing SMTLIB2"; @@ -15793,7 +16411,7 @@ self: { mkDerivation { pname = "Snusmumrik"; version = "0.0.1"; - sha256 = "534f22cd28443ca2cd27b3bd7a7e0167193641b5505cc1d253ee6c0b47228db8"; + sha256 = "1f4d493hnv7fag9c2p2hnm0kc6b705z7mgdk4z6s4g24536j4ksk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15816,7 +16434,7 @@ self: { mkDerivation { pname = "SoOSiM"; version = "0.2.1.0"; - sha256 = "b7b2a9aafa91a97d4fb81504109e75bffa17b9f908aaad5b644f90e4e0a40b3e"; + sha256 = "0ghblkhf942gcidsvah8z6wigymzfng1010mp17pvacizamakcmp"; libraryHaskellDepends = [ base concurrent-supply containers monad-coroutine mtl stm transformers @@ -15834,7 +16452,7 @@ self: { mkDerivation { pname = "SoccerFun"; version = "0.5.3"; - sha256 = "1219c1cdf6f9cbfd6dfe27c22fc86c12e47625bddf1f973da50fdd4f51ddb789"; + sha256 = "12dpvm8lzp8gllyrf7yzpljpdr0jdk42zhi7zrnzvjzryv6w268j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15854,7 +16472,7 @@ self: { mkDerivation { pname = "SoccerFunGL"; version = "0.5.3"; - sha256 = "4eabc997d8e247d127c5cfa07242cb87ba868bf9893f93773e6a155350b4450a"; + sha256 = "02j5ni8565ba7rvr6gw9z65qdfl7rd17586gqlkx2iz2v2bwkasf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15872,7 +16490,7 @@ self: { mkDerivation { pname = "Sonnex"; version = "0.1.0.3"; - sha256 = "aa7daf85955ef1db716594997e5cb3b7bc13b0c65be372e82c83d60339e10a3b"; + sha256 = "0fqaw4wh7ml35kl75qsvqsq17g5pndf7x6clcmqxpwayjn2syzda"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/Zigazou/Sonnex"; @@ -15888,7 +16506,7 @@ self: { mkDerivation { pname = "SourceGraph"; version = "0.7.0.7"; - sha256 = "93734a272f17f6ff463c8ee7d016cd8a5f8fbace8eb5ceb99a4696fd729f99d4"; + sha256 = "1m4rkxrgv5j6kawwxdcfrsx8ypwarlbd1rwf7i3gzxhp5wkllwwk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15908,7 +16526,7 @@ self: { mkDerivation { pname = "Southpaw"; version = "0.1.0.2"; - sha256 = "f8da4e5ab633be375d39fef22c5cea2aa28fe3c92e443084c035fb6c565832fe"; + sha256 = "1zijb1b6ryrmq2230i1fr7iqz8iax9f2rwpy75fkggiknrd4xnpq"; libraryHaskellDepends = [ ALUT base bytestring cairo containers filepath GLFW-b gtk3 JuicyPixels OpenAL OpenGL vector Win32 @@ -15921,8 +16539,8 @@ self: { ({ mkDerivation, array, base, HGL, random, Yampa }: mkDerivation { pname = "SpaceInvaders"; - version = "0.4.2"; - sha256 = "03993ad20fb5142605b7b94208825ee7b847934435efcd720acc8c517d49bec5"; + version = "0.4.4"; + sha256 = "0jiah6b1crg6pw64a218ssnhymf27yw3icjc81mdqxl3bqx9wqz9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base HGL random Yampa ]; @@ -15939,9 +16557,9 @@ self: { mkDerivation { pname = "SpacePrivateers"; version = "0.1.0.0"; - sha256 = "70e6061caa2b7eed8be2d120ba165365e008c37a510290c8f89b926d6702473e"; + sha256 = "0gj709knv4lvz34900jigb1hiq35acbbl86iwa5yszibm8f0drkh"; revision = "1"; - editedCabalFile = "b59d607892ad860616cef196c83ff54388204102eae597acf88467a2f54764bf"; + editedCabalFile = "1gv48zss4rw4z2n9grga090j1223ylzwi5pirqb0d1mdj9w617dm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15959,7 +16577,7 @@ self: { mkDerivation { pname = "SpinCounter"; version = "0.0.1"; - sha256 = "22060672e6d23e14116b1925b3357d92d91adb1b956f2b7c75784ca192c9c9e5"; + sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2"; libraryHaskellDepends = [ base monad-loops ref-mtl stm ]; homepage = "https://github.com/Julek"; description = "Lock free Spin Counter"; @@ -15971,8 +16589,8 @@ self: { ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; - version = "0.3.1"; - sha256 = "335e13554aa0a13c97b4f9258be904e3007c35a56e8131bdb363c5f7930fc521"; + version = "0.3.2"; + sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -15991,9 +16609,9 @@ self: { mkDerivation { pname = "Spock"; version = "0.12.0.0"; - sha256 = "8392d1ee34b46238c6bfe951080f06e11e1f3622d8402e7762c70aa61430e3d9"; + sha256 = "1ng360aac2n7c9vjwh6q48v1y7p10q7hhlg9pz33hqml6kpd34l3"; revision = "1"; - editedCabalFile = "88a5e8b3c6fb8b7b23bb5b6f37a4ac071842fba1420d6bd835d9ac7085753529"; + editedCabalFile = "0a9mfn2p1b6r6pc6n3a2l7xl4607mjj3fvsvpcipp2zvqsryi9c8"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -16014,9 +16632,9 @@ self: { mkDerivation { pname = "Spock-api"; version = "0.12.0.0"; - sha256 = "8cfdbcbd2fa426c595fb7d29f8a6395dea17476c15d5ae863da2605b1c6ebe00"; + sha256 = "005ydqf5nq527n3axm8mdi3igsjx76kghabxzfawa9m45yyvrzcc"; revision = "1"; - editedCabalFile = "7fb9f5bacb759e7763ff03fb910b6d7ff3a19436bf70ba7bd0f9e54801541d70"; + editedCabalFile = "0w0xah0lirgrs1xvlw5z6saa3wvzdl5r3yq3zxipg7kmrfxgbfbz"; libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; @@ -16030,7 +16648,7 @@ self: { mkDerivation { pname = "Spock-api-ghcjs"; version = "0.12.0.0"; - sha256 = "84a707da5f84417f5387731497bd51b8d80210b2be97e6afaa79b887568ea501"; + sha256 = "00d5irb8gf3rmapyd5xyn8805n5qa6yrf53khx9pyhc4bzd0g9w4"; libraryHaskellDepends = [ aeson base bytestring ghcjs-base hvect Spock-api text ]; @@ -16045,7 +16663,7 @@ self: { mkDerivation { pname = "Spock-api-server"; version = "0.12.0.0"; - sha256 = "29734206823875ec71d7cad14bf012adb70b01700975e2181a7cb52713b131ce"; + sha256 = "1kiin49jgdbw38cf4x89f00hpdxd2bq4plfasxqyqx9qh8344wr9"; libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; @@ -16057,7 +16675,7 @@ self: { mkDerivation { pname = "Spock-auth"; version = "0.2.0.1"; - sha256 = "a05fdae300281affe0ca45c2f2338f62afdd01da5ea8bf7c8a1958895ba199ed"; + sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0"; libraryHaskellDepends = [ base http-types Spock text time ]; homepage = "https://github.com/agrafix/Spock-auth"; description = "Provides authentification helpers for Spock"; @@ -16075,9 +16693,9 @@ self: { mkDerivation { pname = "Spock-core"; version = "0.12.0.0"; - sha256 = "e69b70ea3027fa644d546bcae25bbf75e38abd6f4a7f88f0628fea6e16e97895"; + sha256 = "15bqx4b6xslgcbq8hzsadyyqmqvmpxdy5jkbai6n9yi763m716z6"; revision = "1"; - editedCabalFile = "183fb6ab42002aff45add4cc8808ba29d8c6e7939c8cdc2877f100a4669d6676"; + editedCabalFile = "0xk6kmka807ifwldr34wjgkwdn19p848ik6lmm2zyah08amvcgqq"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers cookie directory hashable http-api-data http-types hvect mtl @@ -16100,7 +16718,7 @@ self: { mkDerivation { pname = "Spock-digestive"; version = "0.3.0.0"; - sha256 = "09b6109853feb5f1bb4453cd74b9aa65f3b1fcdab5601e0ccd8dd08165f2acfa"; + sha256 = "1ymcy9jq3l4drl61wq5mvbyb3wv5mawp9kak8jxz3dgyafc11dh9"; libraryHaskellDepends = [ base digestive-functors http-types mtl Spock-core text unordered-containers wai @@ -16116,7 +16734,7 @@ self: { mkDerivation { pname = "Spock-lucid"; version = "0.3.0.0"; - sha256 = "9291c9105d45f1807a63a633475b8e32ad9f9b99d3eff0db247079d69f707f3c"; + sha256 = "0g3zf2gxcybh4kdz1vykk6drzb9jirdlfcx6cdx81wa5bl8ck4cj"; libraryHaskellDepends = [ base blaze-builder lucid Spock transformers ]; @@ -16130,7 +16748,7 @@ self: { mkDerivation { pname = "Spock-lucid"; version = "0.4.0.0"; - sha256 = "09ca1adac56dd7c1bd465d5a893f592e8b352337ab834418fa98d55eadabf26c"; + sha256 = "0v7jmfnmxmcqz8c490xb6wikb2rfb4zqjnjx8syw3mvdqpd1mjh9"; libraryHaskellDepends = [ base lucid Spock transformers ]; homepage = "http://github.com/aelve/Spock-lucid"; description = "Lucid support for Spock"; @@ -16145,7 +16763,7 @@ self: { mkDerivation { pname = "Spock-worker"; version = "0.3.1.0"; - sha256 = "edc009d59fe528ab3bee887b8092f720a8a4ee85b550dec065964ed55c76dc4b"; + sha256 = "0jywfrfdaklncp0dwl5mhppa9a10yy980yw8xqxsna75kzahkh7d"; libraryHaskellDepends = [ base containers errors lifted-base mtl Spock stm text time transformers vector @@ -16161,7 +16779,7 @@ self: { mkDerivation { pname = "SpreadsheetML"; version = "0.1"; - sha256 = "28ac9a7eaee61471aae34a0530c1dafc7987c85c0b2ecac4da1a50c5c074a391"; + sha256 = "14d3fk0cal0svb2clbhbbk48fygwvb0k01aawfm72576mrz9mb18"; libraryHaskellDepends = [ base xml ]; description = "Write support for Excel's SpreadsheetML format"; license = stdenv.lib.licenses.bsd3; @@ -16172,7 +16790,7 @@ self: { mkDerivation { pname = "Sprig"; version = "0.1.1"; - sha256 = "76d1c04b622f998bda5b6a90329314b60f4923b2d0a96dd1d87127c360d05d1a"; + sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn"; libraryHaskellDepends = [ base SDL ]; homepage = "http://liamoc.net/static/Sprig"; description = "Binding to Sprig"; @@ -16185,7 +16803,7 @@ self: { mkDerivation { pname = "Stack"; version = "0.3.2"; - sha256 = "2ba17b68a6daef6040f30cfd6b0044380890bc9f7faf8ab21192ff467d2757e5"; + sha256 = "1rap4xyldzwj26r8mbvzkyy9021q8h06pz8cyd061vyslrl7p89b"; libraryHaskellDepends = [ base nats stm ]; homepage = "https://en.wikipedia.org/wiki/Stack_(abstract_data_type)"; description = "Stack data structure"; @@ -16197,7 +16815,7 @@ self: { mkDerivation { pname = "Stasis"; version = "0.0.1"; - sha256 = "0833e8942085e4ef8c74e40736deafea42725a9b80b6a686fbfb3c0806abccdf"; + sha256 = "1pycmc30hg7vzf3addl0kdd74hpamzg3c1z4fj6fzr4542afhcq8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -16213,7 +16831,7 @@ self: { mkDerivation { pname = "StateVar"; version = "1.1.0.4"; - sha256 = "7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7"; + sha256 = "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks"; libraryHaskellDepends = [ base stm transformers ]; homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; @@ -16225,7 +16843,7 @@ self: { mkDerivation { pname = "StateVar-transformer"; version = "1.0.0.0"; - sha256 = "a00d8eb64012b7563d48ad42d5b49c768208da7eb6540ec455c479f325ef77b5"; + sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://github.com/seagull-kamome/StateVar-transformer"; description = "State variables"; @@ -16237,7 +16855,7 @@ self: { mkDerivation { pname = "StatisticalMethods"; version = "0.0.0.1"; - sha256 = "2647a85aa5d29898230cea576176f3e115f3beab27629fff10bbdb99998920c1"; + sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6"; libraryHaskellDepends = [ base statistics tuple vector ]; homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/"; description = "Collection of useful statistical methods"; @@ -16251,8 +16869,8 @@ self: { }: mkDerivation { pname = "StockholmAlignment"; - version = "1.0.1"; - sha256 = "04ae48d0061e8c7b8120c924677c33179cd837b2171e295c30558ad31583867f"; + version = "1.1.1"; + sha256 = "085kw1rw4dkyivjpm7l5alj0x9cgzd8c2ai4f2k1kkcwjkhbpllv"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools SVGFonts text vector @@ -16269,7 +16887,7 @@ self: { mkDerivation { pname = "Stomp"; version = "0.1.1"; - sha256 = "968fb85a6b94b60c16ad96e8169202082a33f54dcf5d705c1b4096a5a05db139"; + sha256 = "0fdibnhab5j03df70pfg9psk6ah80a91ds4nmlb0rdlldddbi3wn"; libraryHaskellDepends = [ base binary bytestring network time utf8-string ]; @@ -16284,7 +16902,7 @@ self: { mkDerivation { pname = "Strafunski-ATermLib"; version = "1.6.0.3"; - sha256 = "fc378082e94514decc28de2820c498986d53a61b359d3b3c9189fa591af92cb2"; + sha256 = "1cicz4d5kyl9j4y3p79m3fk56vcqk3220a6y536dw525x6180dzw"; libraryHaskellDepends = [ base containers ]; description = "An abstract data type designed for the exchange of tree-like data structures"; license = stdenv.lib.licenses.bsd3; @@ -16298,7 +16916,7 @@ self: { mkDerivation { pname = "Strafunski-Sdf2Haskell"; version = "1.0.0.2"; - sha256 = "602c6ee481b3b6a9eb7ca8f0eb2682fb9af165e01057b5cf1d13d04b8ef4e340"; + sha256 = "0h73yj74pl0k3p7vamqhw1jz36pvh8kfpw58gkmskdmkh7j6wb30"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -16315,7 +16933,7 @@ self: { mkDerivation { pname = "Strafunski-StrategyLib"; version = "5.0.0.10"; - sha256 = "308a1a051df6bb617c9d37bda297fdbedfb8b4c7f6ea5864443cfb9f15e80cc2"; + sha256 = "1hhcx0arzyrw8ij5ispnqysbipxyznbs5g9pkmy63fzn3l2im2ih"; libraryHaskellDepends = [ base directory mtl syb transformers ]; description = "Library for strategic programming"; license = stdenv.lib.licenses.bsd3; @@ -16328,7 +16946,7 @@ self: { mkDerivation { pname = "StrappedTemplates"; version = "0.2.0.2"; - sha256 = "d078997983ace38c0f908e325d213f81474466e45dcf51c6e53765b17ed61674"; + sha256 = "0x0nsrzb2r9pwp353ksxwik48iw17whmsclfj07qrqxchdwrjy6h"; libraryHaskellDepends = [ base blaze-builder bytestring containers filemanip filepath mtl parsec text transformers @@ -16345,7 +16963,7 @@ self: { mkDerivation { pname = "StrategyLib"; version = "4.0.0.0"; - sha256 = "b31b841c5af0020c31fb923ca6a98d894c390e542f44a217892fd4cb7db353eb"; + sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk"; libraryHaskellDepends = [ base mtl ]; homepage = "http://naesten.dyndns.org:8080/repos/StrategyLib"; license = stdenv.lib.licenses.unfree; @@ -16356,7 +16974,7 @@ self: { mkDerivation { pname = "Stream"; version = "0.4.7.2"; - sha256 = "990be249b3ef1b0075563026d4d2c803b86e3cbf168965ba6f9f2b4227a007d1"; + sha256 = "1l87l0kl4awzdyx6b28npwy6xf03r39d89iharsh06zgnd4y42wr"; libraryHaskellDepends = [ base lazysmallcheck QuickCheck ]; description = "A library for manipulating infinite lists"; license = stdenv.lib.licenses.bsd3; @@ -16367,7 +16985,7 @@ self: { mkDerivation { pname = "StrictBench"; version = "0.1.1"; - sha256 = "751caae386b89d7031288d8233e61aa4eeb5b3cecacb991048af5028f33994d0"; + sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m"; libraryHaskellDepends = [ base benchpress parallel ]; homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/"; description = "Benchmarking code through strict evaluation"; @@ -16380,7 +16998,7 @@ self: { mkDerivation { pname = "StringUtils"; version = "0.2.0.0"; - sha256 = "da88bf375d0889b428fb725c454d44c1c06a526477a18d20356a605554ab48c6"; + sha256 = "1ij8mda5aq3a6lh8v8bpci96mh618i6lap3jzclb9288blvvz26s"; libraryHaskellDepends = [ base ]; description = "String manipulation utilities"; license = stdenv.lib.licenses.lgpl3; @@ -16396,7 +17014,7 @@ self: { mkDerivation { pname = "SuffixStructures"; version = "0.0.1.0"; - sha256 = "8b0e6349f1a3e19e81380d87bc7745a91fd6e6d39d058bb08925c96b80264968"; + sha256 = "0s294s06pj95i6q8n1cxsgkdc7x98mvvr1qd720rxqd3y54n63lb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16422,7 +17040,7 @@ self: { mkDerivation { pname = "SybWidget"; version = "0.5.6"; - sha256 = "c82cb1593932bed3858b4b10ca44198980593d0356ea8e69fd433b90e8557754"; + sha256 = "0m3papl90fs3zmlqxsjn0cymk049352cl42bif2x7gij75cv2b68"; libraryHaskellDepends = [ base containers mtl syb-with-class template-haskell TypeCompose ]; @@ -16438,7 +17056,7 @@ self: { mkDerivation { pname = "SyntaxMacros"; version = "1.0.3"; - sha256 = "ccef54664f442a1871531a541c08af28b91694f58dfbcc04fb468037cf9ebb94"; + sha256 = "155vkv7kg026zc2crywdyna1df98mw41qm0sadqihaj49xk59vyc"; libraryHaskellDepends = [ AspectAG base containers HList ListLike template-haskell TTTAS uu-parsinglib uulib @@ -16457,7 +17075,7 @@ self: { mkDerivation { pname = "Sysmon"; version = "0.1.2"; - sha256 = "e3aa721caa64934bdf9823638305f588a4edbe15058b1b2bcb4ab2b8c718d7ff"; + sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3"; libraryHaskellDepends = [ base ConfigFile filepath fingertree Glob MissingH mtl old-locale pretty statistics template-haskell time vector @@ -16475,7 +17093,7 @@ self: { mkDerivation { pname = "TBC"; version = "0.0.3"; - sha256 = "c3b6ef59bba3e6f6eb4e2293e9a79d16067fd0c817f91e8836ab9201f664c380"; + sha256 = "1063ckv034mb6s41xy8pr387y1hnknkyk4r29vmzdrm3pdcyzdn3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16496,7 +17114,7 @@ self: { mkDerivation { pname = "TBit"; version = "0.4.2.3"; - sha256 = "3a73b3904666d571790c1b5127cb6e028fc26608a99e0b6f78d3aac185e7c1af"; + sha256 = "1by1wy2w3ankg1php7m911kc53q2dv5jfl8v1iwp3mb68s8b6wrs"; libraryHaskellDepends = [ base containers deepseq fgl free hmatrix integration list-extras mtl numeric-tools parallel @@ -16513,7 +17131,7 @@ self: { mkDerivation { pname = "TCache"; version = "0.12.1"; - sha256 = "f134b45fcdd127fa1a4214f01d44dc34e994fed137cec63f4c4ea632363ab7bd"; + sha256 = "1gdp78v359jf9hzwdkips7z99s9lvi21vw0l88dgl9yirmgv8d7i"; libraryHaskellDepends = [ base bytestring containers directory hashtables mtl old-time RefSerialize stm text @@ -16527,7 +17145,7 @@ self: { mkDerivation { pname = "THEff"; version = "0.1.4"; - sha256 = "4857093c5be0c15557a5c1b06d6dd16e65ff6da0a9362b1d6ee3614d476af266"; + sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8"; libraryHaskellDepends = [ base template-haskell ]; description = "TH implementation of effects"; license = stdenv.lib.licenses.bsd3; @@ -16539,7 +17157,7 @@ self: { mkDerivation { pname = "TTTAS"; version = "0.6.0"; - sha256 = "978746bb5372a1dddb322a7364366a8f3ca8091d054b4870f193903760cfe3a2"; + sha256 = "18p3rxh3g44ky5q4hjq53l4shg4gd8v68wra6bdxv8bjafxld1wp"; libraryHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS"; description = "Typed Transformations of Typed Abstract Syntax"; @@ -16551,7 +17169,7 @@ self: { mkDerivation { pname = "TV"; version = "0.5.0"; - sha256 = "6bf7dba5fef81d4bb428a0f4419c8e8d14e93e9bc6a1d0e85fd35e2f7791e96f"; + sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb"; libraryHaskellDepends = [ base DeepArrow TypeCompose ]; homepage = "http://haskell.org/haskellwiki/TV"; description = "Tangible Values -- composable interfaces"; @@ -16565,7 +17183,7 @@ self: { mkDerivation { pname = "TYB"; version = "0.2.3"; - sha256 = "b6fc2644d012c727faabd74c2c6520ea7b204118b9237d2230d194f09a91bce5"; + sha256 = "1rdwj6dg156i60i7s8xr310j0yza41jjqk6pmgx2giqjs122dz5n"; libraryHaskellDepends = [ array base containers mtl template-haskell transformers ]; @@ -16581,7 +17199,7 @@ self: { mkDerivation { pname = "TableAlgebra"; version = "0.7.1"; - sha256 = "7f11ed02510cd2a86a6356ea0a4356fc18d1e34b8c54a8858f9e4efbbd9513cb"; + sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz"; libraryHaskellDepends = [ base containers HaXml mtl pretty template-haskell ]; @@ -16594,7 +17212,7 @@ self: { mkDerivation { pname = "Tables"; version = "0.1.0.2"; - sha256 = "793a4754d85b109d8904cdb973f9ab61583c7d19773d4a0e3bbb428e17574609"; + sha256 = "02a6awbqwhmv7c74lgbp35ykqn31mgwp7ffd0j4rs42vv1a4ffkr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cookbook ]; @@ -16608,7 +17226,7 @@ self: { mkDerivation { pname = "Tablify"; version = "0.8.2"; - sha256 = "e3ebf5677e991f12667935176e4f31cf092d1617ab66bae4ccb3be0c658b8383"; + sha256 = "10w3idjhrgmkrkjblrmb2wb2s2fg657nw5rmg5k147wrgrkzbsz3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec xhtml ]; @@ -16624,7 +17242,7 @@ self: { mkDerivation { pname = "Tahin"; version = "0.1.2"; - sha256 = "c89b2b2bc837985fb697eec2f9f39ad6acb1a8d45beafb9b41cc6bcb1a231923"; + sha256 = "08qr4cdcnsyc86dzpsjvsjlb3b6nkbrzkhpfjyv5z61pr0mjp6y8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base64-bytestring bytestring text ]; @@ -16643,7 +17261,7 @@ self: { mkDerivation { pname = "Tainted"; version = "0.1.0.2"; - sha256 = "8b56335f2a61f3a9ab420f698bd052f1aef52fd59a6e2aad511c62417e4059d6"; + sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/RossMeikleham/Tainted"; description = "Tainted type, and associated operations"; @@ -16655,7 +17273,7 @@ self: { mkDerivation { pname = "Takusen"; version = "0.8.7"; - sha256 = "9e9fe740a9030e27ee84343a7e308853b0e5d50371a841d9a3979a9f8d99ac57"; + sha256 = "0mxck66rz6lplgcl3a3i0gaybc2ki0q7wfilhkp2f3h3m50fg7wy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; @@ -16669,7 +17287,7 @@ self: { mkDerivation { pname = "Tape"; version = "0.4.0.0"; - sha256 = "77199900d9deff059a92de2e10f13e55b2c4e074ddd16714c1c3b2c88ea1c6b4"; + sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp"; libraryHaskellDepends = [ base comonad distributive Stream ]; homepage = "https://github.com/kwf/Tape"; description = "Bidirectionally infinite streams, akin to the tape of a Turing machine"; @@ -16684,7 +17302,7 @@ self: { mkDerivation { pname = "Taxonomy"; version = "1.0.2"; - sha256 = "343e94d5cd555a99b242b50d253b0862c2174f7d3ea2b4935cdac642a414d21c"; + sha256 = "076j2jj45insbj9v98iygm7ighk210xja3dm8ar9jnjmrpar8gil"; libraryHaskellDepends = [ aeson base bytestring either-unwrap fgl graphviz parsec text vector ]; @@ -16700,7 +17318,7 @@ self: { mkDerivation { pname = "TaxonomyTools"; version = "1.0.1"; - sha256 = "e424ba53cf01ba63d58c83745a56e0f2eada4eb6b5ce0c30f280e0ad2955cb95"; + sha256 = "15fballsvq40y8q0rkmmnr7dmspjw1b5lx43ikan7fh1rx9vl974"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -16719,7 +17337,7 @@ self: { mkDerivation { pname = "TeaHS"; version = "0.3.1"; - sha256 = "96d5fa830ecd90a31baf261713e741dd3211bf7f68f49bfcb1fe093e6fa6468c"; + sha256 = "1326lrpkw2gyn7y9px38gyzi2cnx87ki65r6mwds746d1s1zmmcn"; libraryHaskellDepends = [ array base containers mtl SDL SDL-image SDL-mixer SFont Sprig ]; @@ -16734,7 +17352,7 @@ self: { mkDerivation { pname = "Tensor"; version = "1.1.0.1"; - sha256 = "55840a4fe93deaddb568492e2be4f6908de1dd18db85b73c766b7dcda4b311e1"; + sha256 = "1q8infjcszbbfqybg1fv33fy33chyvj2nbj9d2sxvsixx57hm12m"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/svenpanne/Tensor"; description = "Tensor data types"; @@ -16746,7 +17364,7 @@ self: { mkDerivation { pname = "TernaryTrees"; version = "0.2.0.2"; - sha256 = "9937a648eeb4c1a1530158361540710f6e31e0056b459eac77da04ca52aca41a"; + sha256 = "06m4mi9cl16sfyn9wibb0ph32vhgf501adjq059s3hdlxr4acdwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary ]; @@ -16762,9 +17380,9 @@ self: { mkDerivation { pname = "TestExplode"; version = "0.1.0.0"; - sha256 = "4133d9f69e7df366ac374ccb42bd9801ae66c0cd29f9f20ab849d1d8f8e79664"; - revision = "3"; - editedCabalFile = "8c288eba01903e9c55bb60350b9a607f88b6a8537c2156bdbed5aa9be071a804"; + sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1"; + revision = "4"; + editedCabalFile = "04qpbdcpfayghrc4hgy9bacg3s5cqfhjgmbmdba00wmqlja0yz8d"; libraryHaskellDepends = [ base containers directory fgl graphviz interpolatedstring-perl6 mtl process text @@ -16780,7 +17398,7 @@ self: { mkDerivation { pname = "Theora"; version = "1.0"; - sha256 = "2f02b05f75561bbf59275d52309e79a402eab3fef23db73161dc9bc57b3d89bf"; + sha256 = "1gw97mxwb6ywc4qvfggjzsryl0m4g6g30ljx4xcvy6snfmgv00ig"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ogg theora ]; license = "GPL"; @@ -16792,7 +17410,7 @@ self: { mkDerivation { pname = "Thingie"; version = "0.80"; - sha256 = "8ae35e5711cf126fff0477b987c02ed0ae47c16bd229c2be7fc59cbbc5bc863a"; + sha256 = "0fl6pk2vp765gyzc4afjdg0lgbnh5v08gfbp0kzny4ng25bmxqwa"; libraryHaskellDepends = [ base cairo gtk mtl ]; description = "Purely functional 2D drawing"; license = stdenv.lib.licenses.bsd3; @@ -16804,7 +17422,7 @@ self: { mkDerivation { pname = "ThreadObjects"; version = "0.0"; - sha256 = "bf62a5e4183bbc8768e79a3d4631f564c2fc3c6e782067869c3e94c1a7d9ec66"; + sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz"; libraryHaskellDepends = [ base ]; description = "Mutable objects that reside in their own threads"; license = stdenv.lib.licenses.gpl3; @@ -16816,9 +17434,9 @@ self: { mkDerivation { pname = "Thrift"; version = "0.6.0.1"; - sha256 = "db972c282932a51a069a2301cb6f71d4eb019873bf2d3f90f457028abf49647a"; + sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv"; revision = "1"; - editedCabalFile = "56a8ab041685777391702f1475e5c2a3462b36765bd53de2e21e1f55aa5999d9"; + editedCabalFile = "1ncrb6m5a7qywbi3vmavfqv2nim3qbjpa51gf28p6xw52q2apa2n"; libraryHaskellDepends = [ base binary bytestring ghc-prim HTTP network ]; @@ -16833,7 +17451,7 @@ self: { mkDerivation { pname = "Tic-Tac-Toe"; version = "0.1.0.2"; - sha256 = "bfe5dd9b3bc2b7396282fe3036b096a3dfcac19d73ad10fc8609fb4e59c8c799"; + sha256 = "16f7r1clxyq9hvy11bbkkp0wmpx3jsq3cc7yh9i3kdy27fdxvrdz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base safe ]; @@ -16849,7 +17467,7 @@ self: { mkDerivation { pname = "TicTacToe"; version = "0.0.1"; - sha256 = "843b472d9e878994cf41b863cba9323d2c01ffefa94d6877e3d4167b63868214"; + sha256 = "0542hripn5nlwdvnhkd9xzzh2b1x6alwnqxq877r92c7kqnlffw4"; libraryHaskellDepends = [ base containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -16864,7 +17482,7 @@ self: { mkDerivation { pname = "TigerHash"; version = "0.2"; - sha256 = "333631a1620819fd3500125f631d84ded06945b73aeb42af1c77577a7cf8f40a"; + sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik"; libraryHaskellDepends = [ base binary bytestring dataenc ]; description = "TigerHash with C implementation"; license = stdenv.lib.licenses.gpl2; @@ -16878,7 +17496,7 @@ self: { mkDerivation { pname = "TimePiece"; version = "0.0.5"; - sha256 = "72fdcc586dfdfb9c1968e7f86d4ff2d5c6f5fc9e3b8215dfd78724e7ff248efa"; + sha256 = "1ylf4kzyf947szgib0ivkvygbinmy97nvy77d0crryzxdmccrzbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16899,7 +17517,7 @@ self: { mkDerivation { pname = "TinyLaunchbury"; version = "1.0.1"; - sha256 = "6991d5a0e9a09c04a7ac32c7a386173431d04d75c8e2bcd107f42d7c516baaf7"; + sha256 = "1xxadd8pqbgl0z8vrqn8fm6x0c9l2y3a7irjmjkh9750x6hdb4b9"; libraryHaskellDepends = [ base mtl ]; description = "Simple implementation of call-by-need using Launchbury's semantics"; license = stdenv.lib.licenses.bsd3; @@ -16911,7 +17529,7 @@ self: { mkDerivation { pname = "TinyURL"; version = "0.1.0"; - sha256 = "507340820d644cc84d5e92673858f302640d4e7c5f71102a945ff438b8a10b79"; + sha256 = "0y8bl6w3ix2zjhm10wazgi70sr02ydc3hrwjbr6whk341n140wsh"; libraryHaskellDepends = [ base HTTP network ]; description = "Use TinyURL to compress URLs"; license = stdenv.lib.licenses.bsd3; @@ -16923,7 +17541,7 @@ self: { mkDerivation { pname = "Titim"; version = "0.2.3"; - sha256 = "5bed63fd43f6f02c9b06c748902dd6ddb07c65a40688d24a81fda68cc6da1fe9"; + sha256 = "1s8zvb38r9pxh55d5206lijprc6xsqnr0j670sdjrw7n8gyn7vav"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers matrix random ]; @@ -16937,7 +17555,7 @@ self: { mkDerivation { pname = "Top"; version = "1.7"; - sha256 = "3d8da13be43fa6393d660bc0ec17c4336a93d8f0ac5808c6274149af3866717a"; + sha256 = "0ykicqwayja14z30hn5cy3c96sikqhbyrh0bcqykk9izwhxs339x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; @@ -16955,7 +17573,7 @@ self: { mkDerivation { pname = "Tournament"; version = "0.0.1"; - sha256 = "53161b646dde077f6bef2bb796a65da9965f94cdd105bc55f74e9737ae66effb"; + sha256 = "1yzgcsp3g5sfyxavq1firna5z5m9bnk9ddrbxxmpy1yydmj1n5jk"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl QuickCheck test-framework @@ -16972,7 +17590,7 @@ self: { mkDerivation { pname = "TraceUtils"; version = "0.1.0.2"; - sha256 = "267cfc9366ad5ad50f12c09b8bac6d8eb044377050049022d7779d66bd4f4151"; + sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/Peaker/TraceUtils"; description = "Functions that should have been in Debug.Trace"; @@ -16984,9 +17602,9 @@ self: { mkDerivation { pname = "TransformeR"; version = "0.1.0.0"; - sha256 = "5fb5ff75d4d54c56a26c12abdebb421d9b78ed1419c2cde8bc8e59344dfd3af0"; + sha256 = "1w1szm6k8ncfpklcvhhr2knpi6qx8axxxaqjdji5ck6msiszzdaz"; revision = "1"; - editedCabalFile = "5b1cee36dc005c693c765b6ca9422ec3aae7b98ea0d4ab68e27b198c2b4214be"; + editedCabalFile = "1ghl88mqq6bvw9lapm50iswygan35r1ajv2vfqy6jp00vhvfw72v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts mtl parsec ]; @@ -17003,7 +17621,7 @@ self: { mkDerivation { pname = "TransformersStepByStep"; version = "0.1.1.0"; - sha256 = "3784e2398da4c09b7b3179f826e1f5da59c57cea81ff094edbf5a7f80cd4a8b1"; + sha256 = "1cd8sh6gi9zmvd70kzw1x9ycanfsyphjdy3r65xrph54ilwy511p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl ]; @@ -17018,7 +17636,7 @@ self: { mkDerivation { pname = "Transhare"; version = "0.9"; - sha256 = "668030dae27efa11ba8f3937c051eac2b79d8cfc4b79be2d8ee1e0014da3c112"; + sha256 = "04n1ld6h3q71iqnvwyabzj69vdy2x98w0drriyx13ykywbd31036"; libraryHaskellDepends = [ base containers ]; description = "A library to apply transformation to containers so as to maximize sharing of unchanged subcomponents"; license = stdenv.lib.licenses.bsd3; @@ -17029,7 +17647,7 @@ self: { mkDerivation { pname = "TreeCounter"; version = "0.0.2"; - sha256 = "54fd5c837a9193e97d490ec3169f5cb3d5c1cf821bdfccc7894f53f7d0269119"; + sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal"; libraryHaskellDepends = [ base ref-mtl stm ]; homepage = "https://github.com/Julek"; description = "Wait-free Tree Counter"; @@ -17042,7 +17660,7 @@ self: { mkDerivation { pname = "TreeStructures"; version = "0.0.2"; - sha256 = "5dfb5bacaddc363e88706bd8fead6f977f635bc7fd6c891d28e838148d0992d1"; + sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx"; libraryHaskellDepends = [ base ]; homepage = "http://www.github.com/bhickey/TreeStructures"; description = "A collection of heaps and search trees"; @@ -17055,7 +17673,7 @@ self: { mkDerivation { pname = "TreeT"; version = "0.0"; - sha256 = "0df7ef29c8737ccf8daf10fb8a2b33768ad64526619365a4807a5a4697253334"; + sha256 = "0d1k4nblcnksh2j6b4v14r2xd2kn6cmqmyqhmy6wyz3kr0lyzxqd"; libraryHaskellDepends = [ base containers transformers ]; description = "Transformer for Data.Tree"; license = stdenv.lib.licenses.publicDomain; @@ -17066,7 +17684,7 @@ self: { mkDerivation { pname = "Treiber"; version = "0.0.4"; - sha256 = "4d8eef82810106d23463bfcd43dbb63becb7a96d6f873ba17213ffe1c34d4d27"; + sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd"; libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ]; homepage = "https://github.com/Julek"; description = "Lock free Treiber stack"; @@ -17081,7 +17699,7 @@ self: { mkDerivation { pname = "TrendGraph"; version = "0.1.0.1"; - sha256 = "77fe6851ae96cf929a14290f4e2a790a3f8b587f1f5b68674240ddb6688db4e5"; + sha256 = "1rdlimlbdpa089knhnqzgxc8ngqag4m4w3r92jd95kwnmr8nizkp"; libraryHaskellDepends = [ base containers diagrams-cairo diagrams-lib mtl optparse-applicative time @@ -17099,7 +17717,7 @@ self: { mkDerivation { pname = "TrieMap"; version = "4.1.0"; - sha256 = "845dca9ad94e7411a4ef341f5f508abaae91394e501d6f8c92ac0ca5038d9993"; + sha256 = "14wril1sa35cja66y7ah9qwr3bmsi985y7rlxyj12x2fv6dclpc4"; libraryHaskellDepends = [ base bytestring containers primitive template-haskell th-expand-syns transformers unpack-funcs vector @@ -17116,7 +17734,7 @@ self: { mkDerivation { pname = "Twofish"; version = "0.3.2"; - sha256 = "aaf8c0bd1bcf04fdbd447d6fbadba2f5ac1cd1345a43578a988f7727504967af"; + sha256 = "1bv79582fxwgk255fhss6k8irb7mlbdvlvvx8jyzs16g3fyw1y5a"; libraryHaskellDepends = [ array base binary bytestring cereal crypto-api largeword mtl tagged ]; @@ -17136,7 +17754,7 @@ self: { mkDerivation { pname = "TypeClass"; version = "0.2.1"; - sha256 = "1bcae261f6b74a0a4aea65cf1258721f8b98464788fcbae882a0f790f8ab3e33"; + sha256 = "0crymgw91xx0hblbmz488x39i2qzf9c15kv5x950ljmpyrhy5jhv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -17153,7 +17771,9 @@ self: { mkDerivation { pname = "TypeCompose"; version = "0.9.12"; - sha256 = "3a182c2cc93f8291b3aedfc32c0b1faa84a982601c1a24cbe7fe1ecc50e333e2"; + sha256 = "1qikwd8cq7pywz5j86hwc21ak15a3w5jrhyzmsrr30izr4n2q61s"; + revision = "1"; + editedCabalFile = "0j27xdfim7a6a16v834n3jdp1j7bsr3yn19bnfwni3xsvrc732q3"; libraryHaskellDepends = [ base base-orphans ]; homepage = "https://github.com/conal/TypeCompose"; description = "Type composition classes & instances"; @@ -17165,7 +17785,7 @@ self: { mkDerivation { pname = "TypeIlluminator"; version = "0.0"; - sha256 = "0c3e7734e5c6852ac2c2fae80f1a68d45dda440d56ad34134a70f332a33e9309"; + sha256 = "02ck7sik5wvh989k9ban1m2dlpfld0d0zs7sqb12m1f6wls7fghc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 ]; @@ -17180,7 +17800,7 @@ self: { mkDerivation { pname = "TypeNat"; version = "0.4.0.1"; - sha256 = "e62ef42bad43ca0487d59fe7840313e31fe47a05f210cf37786dd6f5897504f3"; + sha256 = "1wq4fn4zbmkdg0vwy47j0mxf87z32c1q9rwzsn3h9jj3mlmz8bp6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/avieth/TypeNat"; description = "Some Nat-indexed types for GHC"; @@ -17193,7 +17813,7 @@ self: { mkDerivation { pname = "TypingTester"; version = "0.2.0.0"; - sha256 = "d650609a7e073ec772940572b059236b536b4c75644e2c4ad9c484025bdd1c1f"; + sha256 = "07qwvmdh5164v552qkk4fm66nlvb4dcv0wh5jircfgh7gsd60l6n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers directory time ]; @@ -17209,7 +17829,7 @@ self: { mkDerivation { pname = "UISF"; version = "0.4.0.0"; - sha256 = "1d2084f1c81364b830fab4937901b83bee08addf6ea4e8123573b084cd80f3e7"; + sha256 = "1rzkh36q9c3k6l9fi93fvynhivivp00pk4xlz8qbhr0kr3qq880x"; libraryHaskellDepends = [ array arrows base containers deepseq GLUT OpenGL stm transformers ]; @@ -17225,7 +17845,7 @@ self: { mkDerivation { pname = "UMM"; version = "0.3.1"; - sha256 = "b0e0697180aaa359a733dd6eba62a1f313491480ff57cf5cf366dacf26dd334d"; + sha256 = "0k9kvlkcznk6ydfcymzzh0a4j4zkl5iblvnx6fkmk8xah1qnkq5h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -17245,7 +17865,7 @@ self: { mkDerivation { pname = "URLT"; version = "0.14"; - sha256 = "7a3cf19bb5d070a27d4fafe88789b4660f192af41431d120a743db3858f61493"; + sha256 = "14qlyrc3ins3lwhd2c8lyhm1j3v6nj4qgs5g9xys4w6hnndz2g3s"; libraryHaskellDepends = [ applicative-extras base Consumer happstack-server hsp hsx mtl QuickCheck regular template-haskell @@ -17260,7 +17880,7 @@ self: { mkDerivation { pname = "URLb"; version = "0.0.1"; - sha256 = "b9dba10748c51f3f47d3f58a45dd80eaa327006251989f97237e2d94cef9c2d0"; + sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; homepage = "http://github.com/solidsnack/URLb"; description = "DEPRECATED A simple, liberal URL parser"; @@ -17274,7 +17894,7 @@ self: { mkDerivation { pname = "UTFTConverter"; version = "0.1.0.1"; - sha256 = "c4384218099d24e3002267c5ca2d2d168d65177f6b7c839e7fddb8eca84bc58d"; + sha256 = "13f59flfrf6xgyg86z3bgwbnb38n5lnwmib7480f694x14c44f64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17299,7 +17919,7 @@ self: { mkDerivation { pname = "Unique"; version = "0.4.6.1"; - sha256 = "8b9648383b28087fedf16b7bcb7c6c2137873a59af2d1ef8460fba1c902a84f9"; + sha256 = "1yc45a81rfhg8vw1wbdgb4x8fdr1diycnyvby7npy2187cw4i5lb"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -17315,7 +17935,7 @@ self: { mkDerivation { pname = "Unixutils"; version = "1.54.1"; - sha256 = "f9295529744cb2658364956f376ff506dc1876eb2b0148e5b09c1a4bc4732644"; + sha256 = "0i16fg24n6lwn3jlh09bxdv1ip06ympkfvwmcj1nbcjcfhlmaagr"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mtl process process-extras pureMD5 regex-tdfa unix zlib @@ -17330,7 +17950,7 @@ self: { mkDerivation { pname = "Unixutils-shadow"; version = "1.0.0"; - sha256 = "277bfb031b827570f155e67ee06531da92495c8f589fa8913c70cb2cf0a3a886"; + sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7"; libraryHaskellDepends = [ base unix ]; homepage = "http://src.seereason.com/haskell-unixutils-shadow"; description = "A simple interface to shadow passwords (aka, shadow.h)"; @@ -17342,7 +17962,7 @@ self: { mkDerivation { pname = "Updater"; version = "0.3"; - sha256 = "e0cfe9572c1561741dc35c73f40335c98cb96801993a232b033e92e66f2a3e47"; + sha256 = "0iry59pyd4iy0cmj6flr05lbk3696l1z8wswqcfp8q8m5ibykkz0"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/yokto/Updater"; description = "Monadic FRP library based on stm"; @@ -17354,7 +17974,7 @@ self: { mkDerivation { pname = "UrlDisp"; version = "0.1.7"; - sha256 = "f7ef9c0b2e92b7ac90a03de4dfb1df1f900e502cf7b391cb4752277d66d941f8"; + sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp"; libraryHaskellDepends = [ base cgi MaybeT mtl ]; homepage = "http://www.haskell.org/haskellwiki/UrlDisp"; description = "Url dispatcher. Helps to retain friendly URLs in web applications."; @@ -17367,7 +17987,7 @@ self: { mkDerivation { pname = "Useful"; version = "0.0.6"; - sha256 = "a4a48b812de89807a9c4e13749c22c05dd800fc74dedde2e580627013132ab07"; + sha256 = "01xb68qh29q6b0pdxvadqw7q1p855k14jdz1qjlhg6785n0qp954"; libraryHaskellDepends = [ base containers random ]; description = "Some useful functions and shorthands"; license = stdenv.lib.licenses.bsd3; @@ -17378,7 +17998,7 @@ self: { mkDerivation { pname = "UtilityTM"; version = "0.0.4"; - sha256 = "05a9cbb51bf34ff04d88734b54eed82149ed5abc15fa116a5d590cae091f5ed6"; + sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/tonymorris/utility-tm"; description = "Utility functions that are missing from the standard library"; @@ -17390,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.2"; - sha256 = "5fa26bab55d5566cf512412256b06072e286707718532cd4132ce330ad9f437e"; + 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 ]; @@ -17418,7 +18038,7 @@ self: { mkDerivation { pname = "Validation"; version = "0.2.0"; - sha256 = "e383aa5d20ae03716bb50e57036915234a3ec3089a8fa7b28af2ade2918b5583"; + sha256 = "10smif8y5bgjiarag3ws131kwji32mlh6mqfnmmp20xf41fsm0z3"; libraryHaskellDepends = [ base bifunctors semigroupoids semigroups ]; @@ -17433,7 +18053,7 @@ self: { mkDerivation { pname = "Vec"; version = "1.0.5"; - sha256 = "f523945104cf8d8c11f0299dc8a3fb9579d4eaf8d20a1403fbe2d8764729d343"; + sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm"; libraryHaskellDepends = [ array base ghc-prim ]; homepage = "http://github.net/sedillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; @@ -17445,7 +18065,7 @@ self: { mkDerivation { pname = "Vec-Boolean"; version = "1.0.6"; - sha256 = "13ea1c747329764c0415a989e930994a20411bb10fa490cfceb4b60699bfbd7f"; + sha256 = "0zxxpychddmlrv7r190gn4dl282ak4qfk2d92l24qxi9fds1rshk"; libraryHaskellDepends = [ base Boolean Vec ]; description = "Provides Boolean instances for the Vec package"; license = stdenv.lib.licenses.bsd3; @@ -17457,7 +18077,7 @@ self: { mkDerivation { pname = "Vec-OpenGLRaw"; version = "0.2.0.1"; - sha256 = "95ae058417ea29e0b82727ccbae5f5bd541a54f0a70a4855c9d38d8b910e5163"; + sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm"; libraryHaskellDepends = [ base OpenGLRaw Vec ]; homepage = "http://www.downstairspeople.org/darcs/Vec-opengl"; description = "Instances and functions to interoperate Vec and OpenGL"; @@ -17470,7 +18090,7 @@ self: { mkDerivation { pname = "Vec-Transform"; version = "1.1"; - sha256 = "cccd1b5402249cb392d0083719cd772459c69d7b7a4e9b0201ad2319df4c914b"; + sha256 = "0jwi9kgij8xd0419nkksgffwcn94fz6ijdq8s29b771409a1pkfc"; doHaddock = false; homepage = "https://github.com/tobbebex/Vec-Transform"; description = "This package is obsolete"; @@ -17483,7 +18103,7 @@ self: { mkDerivation { pname = "VecN"; version = "0.0.2"; - sha256 = "42ebc6f44794140c66d7557656404e3e17c6d62a071fa325e7d1beb47b8b68c3"; + sha256 = "1hv8idxv9gniwwjs67q75bbcc5ry9r05cxjmsxk0q54l8zscdss2"; libraryHaskellDepends = [ base Peano ]; description = "a simple peano-indexed vector type"; license = stdenv.lib.licenses.bsd3; @@ -17494,7 +18114,7 @@ self: { mkDerivation { pname = "Verba"; version = "0.1.2.0"; - sha256 = "f5c68bcb9ea60f75f853fecb0b399cf1794caebe4ab3bfcb0ea5e9d8fb4f2fba"; + sha256 = "1fig9zxxisd51v5vzcsapsp4qygikhwhpjzyagw7a3x6kv5qpipm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers matrix ]; @@ -17509,13 +18129,14 @@ self: { }: mkDerivation { pname = "ViennaRNA-bindings"; - version = "0.233.1.1"; - sha256 = "8435afc87b0265175eef88b586e69934e8404bd5126b6d6f5969c6486ce31b1a"; + version = "0.233.1.2"; + sha256 = "1iq4f15znpmfs5i6i3cvrzkn220apxj4rp720yyh0xbji211wg3d"; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ array base QuickCheck tasty tasty-hunit tasty-silver tasty-th ]; + testToolDepends = [ c2hs ]; homepage = "https://github.com/choener/ViennaRNA-bindings"; description = "ViennaRNA v2 bindings"; license = "unknown"; @@ -17529,7 +18150,7 @@ self: { mkDerivation { pname = "ViennaRNAParser"; version = "1.3.2"; - sha256 = "daff4df1a477ee3df01b30cda344e889818b761748e2b9aee0b8e2f46e0fa844"; + sha256 = "0i581xpg9qmqw2pbkqj82xv8p0c9x12a7k9h3gq3vvkplkqlvzys"; libraryHaskellDepends = [ base parsec ParsecTools process transformers ]; @@ -17538,12 +18159,34 @@ self: { license = "GPL"; }) {}; + "Villefort" = callPackage + ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, random + , scotty, split, text, time + }: + mkDerivation { + pname = "Villefort"; + version = "0.1.0.8"; + sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base FindBin HDBC HDBC-sqlite3 mtl random split time + ]; + executableHaskellDepends = [ + base HDBC HDBC-sqlite3 scotty split text time + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/Chrisr850/Villefort#readme"; + description = "Villefort is a task manager and time tracker written in haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Vulkan" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "Vulkan"; version = "0.1.0.0"; - sha256 = "e1cb8411cf76d254fa1c708f498442a27fe1c2783d7aa04f887ca9608b21fcca"; + sha256 = "1jpw465n1abwi17s0yixg31f2zx28a24k3vh3kx59lknrw8q9jz1"; libraryHaskellDepends = [ base ]; description = "A binding for the Vulkan API"; license = stdenv.lib.licenses.bsd3; @@ -17554,7 +18197,7 @@ self: { mkDerivation { pname = "WAVE"; version = "0.1.3"; - sha256 = "277a96f392efc43d0580ffb960126f531b7d5af557375c9a6a9a711a7c52f4b1"; + sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -17572,7 +18215,7 @@ self: { mkDerivation { pname = "WL500gPControl"; version = "0.3.4"; - sha256 = "fb415178a8e0dd808c4b76ff050634fd0c60e5242baf7247db1c95230659723d"; + sha256 = "0gbjb432758wvd3p5brb4kjn037x6h30bzvn9f681pg0m1w52hgv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -17588,7 +18231,7 @@ self: { mkDerivation { pname = "WL500gPLib"; version = "0.3.1"; - sha256 = "faf199f7d1ca246971cab7625db56f072ee8b37508f56a9fa45042f47c318097"; + sha256 = "15w065yg8hjhljgnmx88fnryhbh7dysmsqmpr9qnj96as7vrkwgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base curl mtl tagsoup ]; @@ -17605,7 +18248,7 @@ self: { mkDerivation { pname = "WMSigner"; version = "0.1.0.0"; - sha256 = "d834165aaaee428d254ad357b8d57d17698cedeea44a5608d10243ebbccba846"; + sha256 = "0im8rfyfnhq2s445cjm4xvnqqs8pgpavhmyk98jqshpfm9d1cd6q"; libraryHaskellDepends = [ base base64-bytestring binary bytestring cryptohash directory lens mtl random split vector @@ -17623,7 +18266,7 @@ self: { mkDerivation { pname = "WURFL"; version = "0.1"; - sha256 = "73c77a329f21de85110e23f57232e52f3425417391c68fe2279f77effcd76e8f"; + sha256 = "13vfszyfyxwz4zi8zilifd0jad1gwlr75x931q8qbpi1kwr7mivk"; libraryHaskellDepends = [ base haskell98 parsec ]; description = "Convert the WURFL file into a Parsec parser"; license = stdenv.lib.licenses.bsd3; @@ -17635,7 +18278,7 @@ self: { mkDerivation { pname = "WXDiffCtrl"; version = "0.0.1"; - sha256 = "13fc9556ff5e4a608d8cd314d8938ffd1705e467928d81a6efb38d3710d1686f"; + sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k"; libraryHaskellDepends = [ base containers wx wxcore ]; homepage = "http://wewantarock.wordpress.com"; description = "WXDiffCtrl"; @@ -17650,7 +18293,7 @@ self: { mkDerivation { pname = "WashNGo"; version = "2.12.0.1"; - sha256 = "d2d945bd20dea9613a6ceb11f7fed7b93db2ca1e6a4457544ac9edeb3067a985"; + sha256 = "11d9cwqfpvf999a5fi3a3v5b4gdrszzgf4gbdhx63afy42ylbnfj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17670,7 +18313,7 @@ self: { mkDerivation { pname = "WaveFront"; version = "0.5.0.0"; - sha256 = "c2fa7005b6a6e5fc5ec0eb965b9fafe13f477f5fc8079fa4e0e0d417b785887d"; + sha256 = "0zc8hnvigm70w2j9y1y8bxzlfgz1mygmp5pbq1ggrrd6nq2p1yn2"; libraryHaskellDepends = [ attoparsec base Cartesian containers either filepath lens linear QuickCheck text transformers vector @@ -17687,7 +18330,7 @@ self: { mkDerivation { pname = "Weather"; version = "0.1.0.4"; - sha256 = "dbf64ceb70be6869a2965c0e7d05e09e888e22e3f63079dfa11039fbccbfb93c"; + sha256 = "0g5rpz6gnf8hl7gpjc7nwci8x24yw02ps3jwjsi6js5yf3mlrxnv"; libraryHaskellDepends = [ aeson base bytestring HTTP text unordered-containers ]; @@ -17701,7 +18344,7 @@ self: { mkDerivation { pname = "WebBits"; version = "2.2"; - sha256 = "5fec0e64d9913a0b9b46d236b2fb1d0ceb689633e6901bf46fe6d47797b435bb"; + sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z"; libraryHaskellDepends = [ base containers mtl parsec pretty syb ]; homepage = "http://github.com/brownplt/webbits"; description = "JavaScript analysis tools"; @@ -17715,7 +18358,7 @@ self: { mkDerivation { pname = "WebBits-Html"; version = "1.0.2"; - sha256 = "543da5bb6a8284817337c7114e1a5e2d57d1f3de0951a2f23ca231709228ada1"; + sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal"; libraryHaskellDepends = [ base containers mtl parsec pretty syb WebBits ]; @@ -17732,7 +18375,7 @@ self: { mkDerivation { pname = "WebBits-multiplate"; version = "0.0.0.1"; - sha256 = "632f8d613f16df243a0591fa2a848d332a84364b1c6f6dd75b860737a28b6dc8"; + sha256 = "1j3difi3f1w6bgbnsvqw9cv88aikin22myli0lx29pqn7xhqsbv3"; libraryHaskellDepends = [ base multiplate multiplate-simplified transformers WebBits ]; @@ -17749,7 +18392,7 @@ self: { mkDerivation { pname = "WebCont"; version = "0.0.1"; - sha256 = "267a3f3d016145646c414047e9fea28305aefda2150d7018e028433cc18f25d3"; + sha256 = "1lr5iz0kqhr8w0c7038mlbysw1c3lbzfjis085n68ib104ykyyi6"; libraryHaskellDepends = [ applicative-extras base concatenative containers formlets happstack-server happstack-state happstack-util mtl utf8-string @@ -17766,7 +18409,7 @@ self: { mkDerivation { pname = "WeberLogic"; version = "0.1.2"; - sha256 = "5f9862063a98a6fb431755cf37d6cbdc4193606a48f67ba7ed2062e1074e875a"; + sha256 = "0nl79q3y2qi0xnkppxj8d9h96hfwrgb3gksm2x1zp9lq7836562z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec ]; @@ -17786,7 +18429,7 @@ self: { mkDerivation { pname = "Webrexp"; version = "1.1.2"; - sha256 = "4b167df8b1326e1bb44d1e384fe2a7fd13831ae1d599480e7faa76d25e3269c7"; + sha256 = "1iv969gd4xmagw74i6fmw4d864zxlzi4yf0y9ns1nvijn7w7s5jb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17814,7 +18457,7 @@ self: { mkDerivation { pname = "Wheb"; version = "0.3.1.0"; - sha256 = "1affec4db10dba9767960ad2f2744f0f34116d0ee970347cceee2bf12901a28f"; + sha256 = "13x204lz2azfrry38w791rni2d0g9xsg5lhajrkrgfhdn56yrzqs"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive containers cookie http-types mtl pwstore-fast stm text time transformers unix uuid @@ -17835,7 +18478,7 @@ self: { mkDerivation { pname = "WikimediaParser"; version = "0.1"; - sha256 = "32f41ed23148dc10b65a0dd850576f6bdba8bbfef19ba0e79a1b93403e72f767"; + sha256 = "0rzpf8z414qvkbks16zizsxsinvbdxbm1n0dbav11p286791xx1j"; libraryHaskellDepends = [ base parsec ]; description = "A parser for wikimedia style article markup"; license = stdenv.lib.licenses.bsd3; @@ -17849,7 +18492,7 @@ self: { mkDerivation { pname = "Win32"; version = "2.3.1.1"; - sha256 = "5c57f6ca9e13bb9e945bfe25b85390451fff589ae5e1e2522fc939a144c7a588"; + sha256 = "1255qx2a2ff95x9f5qg5k9cgy7s5j19vh9gybfa9xfqkkv5gcmsw"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ advapi32 gdi32 shell32 shfolder user32 winmm @@ -17861,33 +18504,32 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_5_1_0" = callPackage + "Win32_2_5_4_1" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 - , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm + , msimg32, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.5.1.0"; - sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52"; + version = "2.5.4.1"; + sha256 = "0r1xzm0w3kg8rqq24j17405ic6yix53r9sq9wpl4zl2sajg3w66c"; libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ - advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32 - winmm + advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm ]; homepage = "https://github.com/haskell/win32"; description = "A binding to part of the Win32 library"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; - ntdll = null; shell32 = null; shfolder = null; shlwapi = null; - user32 = null; winmm = null;}; + shell32 = null; shfolder = null; shlwapi = null; user32 = null; + winmm = null;}; "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: mkDerivation { pname = "Win32-console"; version = "0.1.0.0"; - sha256 = "69d8cc973b9d08571e01eb33aca6840aae4a084e80e55313c878ac3602712704"; + sha256 = "0117f413db3qr09m7rc09q44mbhahjkaqczb04g5f24x7fbwrn39"; libraryHaskellDepends = [ base Win32 ]; description = "Binding to the Win32 console API"; license = stdenv.lib.licenses.bsd3; @@ -17899,7 +18541,7 @@ self: { mkDerivation { pname = "Win32-dhcp-server"; version = "0.3.2"; - sha256 = "3f6fd5dcd65f0883f40a5e3ee9467df0039abf7fc4f5cf0a119c56696d120664"; + sha256 = "0r0629nnjmlw245czxf4gyzrl0zhgm3fjgjy1bs8622zsvfdavrz"; libraryHaskellDepends = [ base text Win32 Win32-errors ]; homepage = "http://github.com/mikesteele81/win32-dhcp-server"; description = "Win32 DHCP Server Management API"; @@ -17912,7 +18554,7 @@ self: { mkDerivation { pname = "Win32-errors"; version = "0.2.2.1"; - sha256 = "61803f36a418726540f230df294b8a86331a8ffa1b79d04e3398064af7a9efec"; + sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031"; libraryHaskellDepends = [ base template-haskell text Win32 ]; homepage = "http://github.com/mikesteele81/win32-errors"; description = "Alternative error handling for Win32 foreign calls"; @@ -17925,7 +18567,7 @@ self: { mkDerivation { pname = "Win32-extras"; version = "0.2.0.1"; - sha256 = "f0dc0e62d87114953e111bb3c8a09f90d5dba490007c4f26d8b892a3f4c69902"; + sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h"; libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ imm32 msimg32 ]; homepage = "http://hub.darcs.net/shelarcy/Win32-extras/"; @@ -17939,7 +18581,7 @@ self: { mkDerivation { pname = "Win32-junction-point"; version = "0.2.1.1"; - sha256 = "81a4c662c07ca698434775c9fdfdaf6d80eff3ccb0515bec449f71721bdc74df"; + sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941"; libraryHaskellDepends = [ base text Win32 Win32-errors ]; homepage = "http://github.com/mikesteele81/Win32-junction-point"; description = "Support for manipulating NTFS junction points"; @@ -17952,7 +18594,7 @@ self: { mkDerivation { pname = "Win32-notify"; version = "0.3.0.1"; - sha256 = "c49159d8154f9ff7d30207901125ceadc2aa94baa3b2996ff0884e9f0158eb7f"; + sha256 = "0zzbb00rykl8y1prkcm3paaamhmdrqji34070b9zg7sg2pc5k4f4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory Win32 ]; @@ -17966,7 +18608,7 @@ self: { mkDerivation { pname = "Win32-security"; version = "0.1.1"; - sha256 = "9eca6c3efea64d83ee3aaf2ec0706695087e98e47c77163ac497f70ad4f90436"; + sha256 = "0dh4z7a0mxwpqhx1cxvwwjc7w24mcrqc0bmg7bp86kd6zqz6rjly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text Win32 Win32-errors ]; @@ -17981,7 +18623,7 @@ self: { mkDerivation { pname = "Win32-services"; version = "0.3"; - sha256 = "5aa626c00d3c255a0d20fad34f2c96661d31825f12e19f8a7848144d4ef16b1f"; + sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js"; libraryHaskellDepends = [ base Win32 Win32-errors ]; librarySystemDepends = [ Advapi32 ]; homepage = "http://github.com/mikesteele81/win32-services"; @@ -17997,7 +18639,7 @@ self: { mkDerivation { pname = "Win32-services-wrapper"; version = "0.1.3.0"; - sha256 = "cd4ba155ec34e9d4cafe90d2033b1e2791e266f0b65d2044d1503db6447030da"; + sha256 = "1nihf12bcgahs5220pdny1kf54973qxh7llhzv5d9s9lxias2jyd"; libraryHaskellDepends = [ base directory filepath Win32 Win32-errors Win32-services ]; @@ -18013,7 +18655,7 @@ self: { mkDerivation { pname = "Win32-shortcut"; version = "0.0.1"; - sha256 = "5c2d67d8ca20d1a7452f3a0c3258e9d8b6540b40401a81dd199e56809144ffb7"; + sha256 = "1dzz8j8q0mly37fq26j0805m9dnqx5c3431s5x2sgl90rbc6fbaw"; libraryHaskellDepends = [ base mtl th-utilities Win32 ]; librarySystemDepends = [ libossp_uuid ole32 ]; homepage = "https://github.com/opasly-wieprz/Win32-shortcut"; @@ -18029,7 +18671,7 @@ self: { mkDerivation { pname = "Wired"; version = "0.3"; - sha256 = "d20022114fd9b284df7390704ed0d7260827ae7453e512cbac63929c0872fd93"; + sha256 = "14zxf849r4k3mk5i5rakfjp2f216sz84ww4hfggq9cnr9w8j406j"; libraryHaskellDepends = [ base chalmers-lava2000 containers mtl QuickCheck ]; @@ -18039,38 +18681,39 @@ self: { }) {}; "WordAlignment" = callPackage - ({ mkDerivation, ADPfusion, AlignmentAlgorithms, ascii-progress - , attoparsec, base, bytestring, cmdargs, containers - , control-monad-omega, deepseq, file-embed, fmlist, FormalGrammars + ({ mkDerivation, ADPfusion, aeson, AlignmentAlgorithms, attoparsec + , base, bimaps, bytestring, cmdargs, containers, data-default + , deepseq, DPutils, file-embed, filepath, fmlist, FormalGrammars , ghc-prim, GrammarProducts, hashable, intern, lens - , LinguisticsTypes, NaturalLanguageAlphabets, parallel, primitive - , PrimitiveArray, QuickCheck, strict, stringable, template-haskell - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-format, transformers, tuple-th, unordered-containers - , vector + , LinguisticsTypes, mtl, NaturalLanguageAlphabets, parallel, pipes + , primitive, PrimitiveArray, split, strict, tasty, tasty-quickcheck + , tasty-silver, tasty-th, template-haskell, text, text-format + , transformers, tuple-th, unordered-containers, vector }: mkDerivation { pname = "WordAlignment"; - version = "0.1.0.0"; - sha256 = "0182ffbf3dfddcabd73dce16eef232fce5c680125391ce881ddf2b81c97593d0"; + version = "0.2.0.0"; + sha256 = "1k0i8pbmap8mk9hm03nbgzgy5kw4pdpqqkdp8gnfq05mdmh35kcw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ADPfusion AlignmentAlgorithms attoparsec base bytestring containers - control-monad-omega deepseq file-embed fmlist FormalGrammars - ghc-prim GrammarProducts hashable intern lens LinguisticsTypes - NaturalLanguageAlphabets primitive PrimitiveArray strict stringable - template-haskell text text-format transformers tuple-th - unordered-containers vector + ADPfusion aeson AlignmentAlgorithms attoparsec base bimaps + bytestring containers data-default deepseq DPutils file-embed + fmlist FormalGrammars ghc-prim GrammarProducts hashable intern lens + LinguisticsTypes mtl NaturalLanguageAlphabets pipes primitive + PrimitiveArray strict template-haskell text text-format + transformers tuple-th unordered-containers vector ]; executableHaskellDepends = [ - ascii-progress base bytestring cmdargs containers file-embed intern - LinguisticsTypes NaturalLanguageAlphabets parallel strict text - unordered-containers vector + aeson base bytestring cmdargs containers data-default DPutils + file-embed intern lens LinguisticsTypes mtl + NaturalLanguageAlphabets parallel pipes strict text text-format + transformers unordered-containers vector ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base bytestring containers DPutils filepath + NaturalLanguageAlphabets split tasty tasty-quickcheck tasty-silver + tasty-th text ]; homepage = "https://github.com/choener/WordAlignment"; description = "Bigram word pair alignments"; @@ -18083,7 +18726,7 @@ self: { mkDerivation { pname = "WordNet"; version = "1.1.0"; - sha256 = "5380d6e5b9c36d2b34437d01b9f0fff49fc07b2788f45e04d7df291867ef842c"; + sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k"; libraryHaskellDepends = [ array base containers filepath ]; description = "Haskell interface to the WordNet database"; license = stdenv.lib.licenses.bsd3; @@ -18095,7 +18738,7 @@ self: { mkDerivation { pname = "WordNet-ghc74"; version = "0.1.3"; - sha256 = "2867dc9c3a3c47f349137ee251d91aa0610ddb1f0fd89610766d28ae96e765a9"; + sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8"; libraryHaskellDepends = [ array base containers filepath ]; description = "Haskell interface to the WordNet database"; license = stdenv.lib.licenses.bsd3; @@ -18107,7 +18750,7 @@ self: { mkDerivation { pname = "Wordlint"; version = "0.2.0.4"; - sha256 = "a5f978de7e4c837993496bf9b88678f9f8245b7510cd8f7bc79d4feb0914a021"; + sha256 = "08d02h4ynkwxqxxqzk8hfmdj9y7rg23biybb969pk0scgvg7iyd5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base boxes cmdargs ]; @@ -18126,9 +18769,9 @@ self: { mkDerivation { pname = "Workflow"; version = "0.8.3"; - sha256 = "c89b4b3a4a29fe576f8972ffa1e698eff8ac0ceb433642fc0b3f9c0308d22123"; + sha256 = "08r1s840771z1gy44dj3xc6ary7gk3ka3zvji5pmgzi998x4p6y8"; revision = "1"; - editedCabalFile = "1be542eaf091e04c561a2a589f37330b0a65d6d3d5a44609c197a74e8385c64b"; + editedCabalFile = "0jy6hn1lx9wpq44ld96msgb6a2hb6cvryn1a39b4rq4iy3m45r8v"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions extensible-exceptions mtl old-time RefSerialize stm TCache vector @@ -18143,7 +18786,7 @@ self: { mkDerivation { pname = "WxGeneric"; version = "0.8.1"; - sha256 = "c0b43c5b236b4e258ab7617a4dea640eeabbdeb7259c0ffe425f731c566d6b53"; + sha256 = "0lvbdmb1qwsz8bz0z715nzgbpshfckm4syk1ny52akkb4ddkrd60"; libraryHaskellDepends = [ base containers mtl SybWidget wx wxcore xtc ]; @@ -18160,7 +18803,7 @@ self: { mkDerivation { pname = "X11"; version = "1.8"; - sha256 = "541b166aab1e05a92dc8f42a511d827e7aad373af12ae283b9df9982ccc09d8e"; + sha256 = "13lxq36856fzp61y4api78vssykyh8fm2aplr0nsj18ymdm1c6sl"; libraryHaskellDepends = [ base data-default ]; librarySystemDepends = [ libX11 libXext libXinerama libXrandr libXrender @@ -18177,9 +18820,9 @@ self: { mkDerivation { pname = "X11-extras"; version = "0.4"; - sha256 = "ea08c3f71e2f14374c56bbb9050df3eec81ff6b44a6d8e396892b5f612c8f2b2"; + sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a"; revision = "1"; - editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c"; + editedCabalFile = "0g7zmmnfz2bkhsk8r7jyrw1s3kdpjz9yichjcgp48kgvs6n1bczp"; libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ libX11 ]; description = "Missing bindings to the X11 graphics library"; @@ -18192,7 +18835,7 @@ self: { mkDerivation { pname = "X11-rm"; version = "0.2"; - sha256 = "23934dece742f54d7505ce5cda525d59aadcb2f0cfa35d5a6bf2c9d494a25d86"; + sha256 = "11jxlaad9jgjddd5v8ygy2rdrajrbm9dlp6f0mslvxa2wzn4v4r3"; libraryHaskellDepends = [ base X11 ]; description = "A binding to the resource management functions missing from X11"; license = stdenv.lib.licenses.bsd3; @@ -18204,7 +18847,7 @@ self: { mkDerivation { pname = "X11-xdamage"; version = "0.1.2"; - sha256 = "5bae74d1ab40ca375331ac0c7f92a9655340839c7b1d2f4c00206cd07bc2cd64"; + sha256 = "0r6dq9xx0v100162y7bvkj1l0lv5m697y35c659kgjj0mg8p9bjv"; libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ Xdamage ]; homepage = "http://darcs.haskell.org/X11-xdamage"; @@ -18218,7 +18861,7 @@ self: { mkDerivation { pname = "X11-xfixes"; version = "0.1.1"; - sha256 = "d38f206149128b071b4df92132701fc94f957912a4b4122bf25be6e531f69073"; + sha256 = "0wwhyqqybrjvy8mi5d5429wraky93xq348gr9ldhg2qj95hj13yk"; libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ Xfixes ]; homepage = "https://github.com/reacocard/x11-xfixes"; @@ -18232,7 +18875,7 @@ self: { mkDerivation { pname = "X11-xft"; version = "0.3.1"; - sha256 = "4eba3fee62570e06447654030a62fb55f19587884bc2cef77a9c3b2c3458f8d1"; + sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf"; libraryHaskellDepends = [ base utf8-string X11 ]; libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; @@ -18244,7 +18887,7 @@ self: { mkDerivation { pname = "X11-xshape"; version = "0.1.1"; - sha256 = "5098376a0e6c79a0b66a47f2aba9f2c97dd066003209fa3bb00e4608180de7a6"; + sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h"; libraryHaskellDepends = [ base X11 ]; homepage = "http://darcs.haskell.org/X11-xshape"; description = "A binding to the Xshape X11 extension library"; @@ -18256,7 +18899,7 @@ self: { mkDerivation { pname = "XAttr"; version = "0.1.1"; - sha256 = "c7681961f3530523c5ab61cf09f349331a414fd7ae5dcc5c7fd408c033b86a9b"; + sha256 = "16vap0rw026lgxfcqpdfsx7l26ik97rhkkv1mg2j61akydhijs67"; libraryHaskellDepends = [ base unix ]; description = "Read, set, and list extended attributes"; license = "GPL"; @@ -18267,7 +18910,7 @@ self: { mkDerivation { pname = "XInput"; version = "0.1"; - sha256 = "094a387fcb4fcf954914c8f99d26ac5bb5426f3e2c893e0c41bc0eb4197b60ce"; + sha256 = "1kk0gccv83mw8463x29c7rpl5davmhk9vyf82i4rbksgrdzkhjh9"; libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ xinput ]; homepage = "http://code.fac9.com/xinput/"; @@ -18281,7 +18924,7 @@ self: { mkDerivation { pname = "XMLParser"; version = "0.1.0.6"; - sha256 = "d2cc3144a74de8aaa20e9467e25d981b63598736b603921b10d9ddb47be36d79"; + sha256 = "0ybdwdxv9pfr20dr40xn6s3mjqqvk1fy4rwl1siams2dlx233k6j"; libraryHaskellDepends = [ base parsec ]; homepage = "xy30.com"; description = "A library to parse xml"; @@ -18294,7 +18937,7 @@ self: { mkDerivation { pname = "XMMS"; version = "0.1.1"; - sha256 = "1d27c0429d615c34e9a78449d522b68b18487750ae8f629de4699bcbc11a8522"; + sha256 = "08l53b0wp6v9wjfn53xfa1vlh64bnqidajc4lzlk8p31km1c09qx"; libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ xmmsclient xmmsclient-glib ]; homepage = "http://kawais.org.ua/XMMS/"; @@ -18310,7 +18953,7 @@ self: { mkDerivation { pname = "XMPP"; version = "0.1.2"; - sha256 = "ebd8ade16b5655ee41f0fa5e0824478f98d1c524f6ebeef11f5b583a93bafe0d"; + sha256 = "03gypa9kln2v3zqyxszn4k2x364g8wj0hppsy10ywmandghsvn7b"; libraryHaskellDepends = [ base haskell98 hsdns mtl network parsec random utf8-string ]; @@ -18327,7 +18970,7 @@ self: { mkDerivation { pname = "XSaiga"; version = "1.5.0.0"; - sha256 = "395e8e9710edac5a9c9355d52fc08cc293d76a6fbda12b7cc1d173d8d10f8e6c"; + sha256 = "0v4f1z8xhwyiq5y2p8dxdxmdg4y2ik02zmamjff5mb7d22bqwpir"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18347,7 +18990,7 @@ self: { mkDerivation { pname = "Xauth"; version = "0.1"; - sha256 = "ba332dea9ec152b3f676d22461eee81a657e16987c3dfb8249e9dbe0cda56ed7"; + sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; @@ -18361,7 +19004,7 @@ self: { mkDerivation { pname = "Xec"; version = "0.1.6"; - sha256 = "88bb3aed99daed6962650a98680b615627f0ca31fc8b09f5fab2c4b4c5107ed8"; + sha256 = "1n3y232v9i5jzbshk2zw675g09snc45ni60acmi6kvfsk7nkmfw8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -18378,7 +19021,7 @@ self: { mkDerivation { pname = "XmlHtmlWriter"; version = "0.0.0.1"; - sha256 = "61d2b890f166239a0997622f123bea14067e25e48b2ce565b3801b8ff7b66537"; + sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://github.com/mmirman/haskogeneous/tree/XmlHtmlWriter"; description = "A library for writing XML and HTML"; @@ -18391,7 +19034,7 @@ self: { mkDerivation { pname = "Xorshift128Plus"; version = "0.1.0.1"; - sha256 = "bd09b98dfbb9125a21684e9495d4a624f34ae4912337fb658101edc46e7ce185"; + sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kanaihiroki/Xorshift128Plus"; description = "Pure haskell implementation of xorshift128plus random number generator"; @@ -18407,7 +19050,7 @@ self: { mkDerivation { pname = "YACPong"; version = "0.1"; - sha256 = "85c3315de599e67253cca2f4270b13d8491faa33aeacef90b9a51cfcd70e56e4"; + sha256 = "1r2n1vbzq755p68fzb5f6fm1yjfq2c5jgx52ri9p5rlrwmfk3hw5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -18425,7 +19068,7 @@ self: { mkDerivation { pname = "YFrob"; version = "0.4"; - sha256 = "2e5aba7ff70395f62225f4a83c2e220af2824f9f25d35d5087d549947d3af79e"; + sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif"; libraryHaskellDepends = [ array base HGL Yampa ]; homepage = "http://www.haskell.org/yampa/"; description = "Yampa-based library for programming robots"; @@ -18448,7 +19091,7 @@ self: { mkDerivation { pname = "Yablog"; version = "0.2.0"; - sha256 = "737b4a1ab300cc2d5b8689640b51092b5a54d8ad4cb4bb451699b2367caa4761"; + sha256 = "0qa7m9y3dclr2r2vpd2cmpc58nib158hnr49hrdjvk00ncd4lyvk"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -18475,9 +19118,9 @@ self: { mkDerivation { pname = "YamlReference"; version = "0.10.0"; - sha256 = "4d89cd7714f25c82c6a49a99e8d8b1789640222a1b5863da0a7aa3f4566b9205"; + sha256 = "01cjddbg98vs1bd66n0v58i415kqn7cfi6cslk384p7j2ivwv2ad"; revision = "1"; - editedCabalFile = "987331ab821e7171c21f2b79eb678f2ece44759d4eb1155e5ca93ac2396a99dd"; + editedCabalFile = "1pcrd8ww4fm9big1bcafkmsl9kifixkyny9b3z172w8yhamk2wwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18499,8 +19142,8 @@ self: { ({ mkDerivation, base, deepseq, random }: mkDerivation { pname = "Yampa"; - version = "0.10.5"; - sha256 = "ebb5fb1091f913b246fb2e9dd8278d642dbb88bfd248e34fff1ac796299cf6d7"; + version = "0.10.6"; + sha256 = "060aglv38snkf9p9d46mnvny517xvyzz561vlm8myxzx3jm38lsn"; libraryHaskellDepends = [ base deepseq random ]; testHaskellDepends = [ base ]; homepage = "http://www.haskell.org/haskellwiki/Yampa"; @@ -18514,7 +19157,7 @@ self: { mkDerivation { pname = "Yampa-core"; version = "0.2.0"; - sha256 = "b78b1367c404e50021a7f17748d894e0c74a8b22dc8e48c7fbceea8fa4adaf1a"; + sha256 = "06mgmnj8zsnfzg3li3nw4a5lmiz0jkc4hxzilwhh1r84qiki72xp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random vector-space ]; @@ -18530,7 +19173,7 @@ self: { mkDerivation { pname = "YampaSynth"; version = "0.2"; - sha256 = "a1c6a0ea57aee855ca3f558f1b6d7ec167abb57333052d8a9f7b46ef323d0a09"; + sha256 = "028a7lrfyikvky52s19kffssnry1grnip3sm7z55bs5fazma1im1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -18547,7 +19190,7 @@ self: { mkDerivation { pname = "Yocto"; version = "0.1.0"; - sha256 = "d73cb870d3a2016fd2b79f63c9dc9d69f4f9dd6d71b80c90506715c1f30937cf"; + sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p"; libraryHaskellDepends = [ base containers parsec ]; homepage = "https://github.com/ajg/yocto"; description = "A Minimal JSON Parser & Printer for Haskell"; @@ -18561,7 +19204,7 @@ self: { mkDerivation { pname = "Yogurt"; version = "0.4.1"; - sha256 = "d8b96bcbd0b5b77efb66d9b652b5534ec6d66f9ca28cdb44ff0a58fd648fdf11"; + sha256 = "04fzixjgsn0azx2dp352kipxdijfafsm5dnrcvxpxdxms35npffq"; libraryHaskellDepends = [ base containers mtl network old-locale process readline regex-posix syb time @@ -18579,7 +19222,7 @@ self: { mkDerivation { pname = "Yogurt-Standalone"; version = "0.4"; - sha256 = "148a42ca193e142449c5867f1893cb767b9f274bb8fdaab78dd0f2c671553394"; + sha256 = "151kamqwdwnhinvsmzdq9ckryyvnrf9ihzw6qm4j851y375452hl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -18598,9 +19241,9 @@ self: { mkDerivation { pname = "ZEBEDDE"; version = "0.1.0.0"; - sha256 = "27b4f25adda6a500627a9311fe4c74c92dae0a18789cc7ea8e828c74a0ba05c5"; + sha256 = "1i85pah79342ivmcg73q305awbf9fi6gw4ckg9i019d6vmdg5d17"; revision = "5"; - editedCabalFile = "5974fb98c510f354b64292143938ae0ccaebf69acd95400b5ac0cdb1d7deba9d"; + editedCabalFile = "17dsvvbv3kf0b85l15fdkbvfpjhcmqw3j54j8av59wqhqncgnx2r"; libraryHaskellDepends = [ base vect ]; description = "Polymer growth simulation method"; license = stdenv.lib.licenses.bsd3; @@ -18613,7 +19256,7 @@ self: { mkDerivation { pname = "ZFS"; version = "0.0.2"; - sha256 = "f9fbe01ab8ffe70ac2bd8a5bb55cd56f4ecf030274a305f31391b1c0e76397d7"; + sha256 = "1mwpcgkw1cci2grhb8vl081wykkgsmfbanwapp10mrzzp0df1yzr"; libraryHaskellDepends = [ base CC-delcont containers mtl network unix ]; @@ -18628,7 +19271,7 @@ self: { mkDerivation { pname = "ZMachine"; version = "0.0"; - sha256 = "63651245799f1948622f80c42d8e074aa17a7993404a916b28267d91d02c00e8"; + sha256 = "1s005k892z9651mr2jj0jdwpm8aa0y72vi405xi4h6czg52i4rb3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base gtk mtl random ]; @@ -18642,7 +19285,7 @@ self: { mkDerivation { pname = "ZipFold"; version = "0.1.4"; - sha256 = "c06a41ed6bb1901a5ebab046a81e19dbe727c558834892b1441244c312bd9615"; + sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0"; libraryHaskellDepends = [ base TypeCompose ]; homepage = "http://haskell.org/haskellwiki/ZipFold"; description = "Zipping folds"; @@ -18654,7 +19297,7 @@ self: { mkDerivation { pname = "ZipperAG"; version = "0.9"; - sha256 = "29774627c34cede63f6de1638f96e626284669742991a764c9b0e4a14f46805a"; + sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9"; libraryHaskellDepends = [ base syz ]; homepage = "www.di.uminho.pt/~prmartins"; description = "An implementationg of Attribute Grammars using Functional Zippers"; @@ -18668,7 +19311,7 @@ self: { mkDerivation { pname = "Zora"; version = "1.2.0"; - sha256 = "71d4df73f9f4377c2cf09d6bc0e8f26cd75da102dd2ff52d94095b8fb017d1fa"; + sha256 = "1yni2yq8ynq9jhnzabyx0ahmvmvcyblc0swxy0n7qdzlz5rxzm3i"; libraryHaskellDepends = [ base bytestring containers directory fgl graphviz random shelly text @@ -18684,7 +19327,7 @@ self: { mkDerivation { pname = "Zwaluw"; version = "0.1"; - sha256 = "419fadba4077db63d2104ca196e64b343cfbc0c55859665860f7bf12ed663bb3"; + sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/MedeaMelana/Zwaluw"; description = "Combinators for bidirectional URL routing"; @@ -18699,7 +19342,7 @@ self: { mkDerivation { pname = "a50"; version = "0.5"; - sha256 = "407f49e1a7f851e9abb09f3494f34749475f55548bcb6f5260d1e5813370d649"; + sha256 = "0jfnf0rq3rfic196zjwbaiamyis98zrr8d4zn2myjlgqlzhljzs0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -18715,7 +19358,7 @@ self: { mkDerivation { pname = "abacate"; version = "0.0.0.0"; - sha256 = "af0d3d6e860826a12029fa048f8616713ffb8374ce9a13119567ba73ecb0bad3"; + sha256 = "1lxsn3n77fk7jl8i76nffj1zngvi2s38y17s54ha29h8hrp3s3dg"; libraryHaskellDepends = [ base parsec text ]; testHaskellDepends = [ base HUnit text ]; homepage = "http://github.com/marcotmarcot/abacate"; @@ -18730,7 +19373,7 @@ self: { mkDerivation { pname = "abc-puzzle"; version = "0.2.1"; - sha256 = "8deb8fb78bd903be9909947095d5d94967989eda98cee43ed6915dca93142644"; + sha256 = "0i162j9wlpcisqzf9klqvag9hrs9v7araw4l16cvw0yrifvqzswd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -18749,7 +19392,7 @@ self: { mkDerivation { pname = "abcBridge"; version = "0.15"; - sha256 = "45fef882d6e9c3f7ad48621fc835417df5c161c6743ebc4e4d3cabe9445b113c"; + sha256 = "0g0ibd2fkarw9m7bqgklqrhw3xbx84swh7v292nzghz9ss1gizj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18771,7 +19414,7 @@ self: { mkDerivation { pname = "abcnotation"; version = "1.9.0"; - sha256 = "804c9df346b08ed489f4e2f6b82ccd7f9a5bfb8c87f2b29603125aad707bb76e"; + sha256 = "0vmpgdqasnhj0fbb5wl7ikxmp6kzrlnbixp2yj4x93mh8vrrsk40"; libraryHaskellDepends = [ base parsec prettify process semigroups ]; @@ -18788,9 +19431,9 @@ self: { mkDerivation { pname = "abeson"; version = "0.1.0.1"; - sha256 = "2c781d0a5f17d546dbd6dc2bb337bc3c27233780aa474b9a8668ea33dd4345bc"; + sha256 = "1g258gfk7sk8hsd4nixah0vj69rwphvv6aywsvdldm8pbw51sy1c"; revision = "1"; - editedCabalFile = "fc1839c19327f8fb9b36d2aa6dd133e3d391696183b3292894f9f7e1ca188727"; + editedCabalFile = "09w7335f3xzrjhl2kcw3c5lr3lz36g8nvanj6sdzpy17jg0kj67w"; libraryHaskellDepends = [ aeson base base64-bytestring bson bytestring data-default-class scientific text time unordered-containers uuid vector @@ -18808,7 +19451,7 @@ self: { mkDerivation { pname = "abnf"; version = "0.4.1.0"; - sha256 = "f9b5e111e060c2283beb296a8ad4ec28a1abd3da2602a735d017f8f4f45262cb"; + sha256 = "1jv2absg9y0ps0ssf0i6vb9sp898xka8lsi9xcxjihk0w08y3dgr"; libraryHaskellDepends = [ attoparsec base containers megaparsec text ]; @@ -18826,7 +19469,7 @@ self: { mkDerivation { pname = "abstract-deque"; version = "0.3"; - sha256 = "09aa10f38193a8275a7791b92a4f3a7192a304874637e2a35c897dde25d75ca2"; + sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9"; libraryHaskellDepends = [ array base containers random time ]; homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "Abstract, parameterized interface to mutable Deques"; @@ -18840,7 +19483,7 @@ self: { mkDerivation { pname = "abstract-deque-tests"; version = "0.3"; - sha256 = "5f17fb4cc26559f81c777f494622907e8927181175eaa172fb6adbf14b2feba5"; + sha256 = "19gb5x5z3nvazdra3skm24c2g2byj0i4cjbzfwfghnb5q96gn5sz"; libraryHaskellDepends = [ abstract-deque array base containers HUnit random test-framework test-framework-hunit time @@ -18859,7 +19502,7 @@ self: { mkDerivation { pname = "abstract-par"; version = "0.3.3"; - sha256 = "248a8739bd902462cb16755b690b55660e196e58cc7e6ef8157a72c2a3d5d860"; + sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4"; libraryHaskellDepends = [ base deepseq ]; homepage = "https://github.com/simonmar/monad-par"; description = "Type classes generalizing the functionality of the 'monad-par' library"; @@ -18871,7 +19514,7 @@ self: { mkDerivation { pname = "abstract-par-accelerate"; version = "0.3.3"; - sha256 = "e4dbe142b15b5cfade9a8da12397752e448d6a2a84b9335010ce6ff12a18274c"; + sha256 = "0k1730mg2vyf21837fc459m8si1ffnbj78cdkbgglp2vn51f3nz4"; libraryHaskellDepends = [ abstract-par accelerate array base vector ]; @@ -18888,7 +19531,7 @@ self: { mkDerivation { pname = "abt"; version = "0.1.1.0"; - sha256 = "c90bc229e962799ab80b4ba8fc9fe962e2570cf818222dffd0ec19dbefffebc1"; + sha256 = "1hgbzzpxn6gcs3zjs8hqz065gqk2x6gzra2b1fw9lyb2x4lw42y9"; libraryHaskellDepends = [ base profunctors transformers transformers-compat vinyl ]; @@ -18902,7 +19545,7 @@ self: { mkDerivation { pname = "ac-machine"; version = "0.2.0.5"; - sha256 = "2482425924af29da76abc529bb6b57d507753dc1eac642e89d00d082dab64203"; + sha256 = "00s2nvd85l00kpl45ipaq4ypa1ymaxmvnaf5mdvdladg4icl50i4"; libraryHaskellDepends = [ base hashable unordered-containers vector ]; @@ -18916,7 +19559,7 @@ self: { mkDerivation { pname = "ac-machine-conduit"; version = "0.1.0.0"; - sha256 = "837eae5d369b4c53293b66c4c5a6c3156ffcdc4ec08dc199c7cb7e4ee95e56db"; + sha256 = "1nsnbvllwznbqycw33f09vfgqvqmqfkcbi367clm6k4v6rfswzl3"; libraryHaskellDepends = [ ac-machine base conduit text ]; description = "Drive Aho-Corasick machines in Conduit pipelines"; license = stdenv.lib.licenses.bsd3; @@ -18931,9 +19574,9 @@ self: { mkDerivation { pname = "accelerate"; version = "0.15.1.0"; - sha256 = "db0f9a5bd8ba6e264561bb62b213384e70baae6fe90208ea2ee101f553556b1d"; + sha256 = "07bbam9za0g15vm0h0p9dypblw2f709v4qmvc52jcvmsv1drl3yv"; revision = "1"; - editedCabalFile = "12863bb93be03eaa18f06354aae0c3ba7a13a6a229d44d69c1b84b2f1873ff35"; + editedCabalFile = "0dgzfcc2yjxqq5llvm19lak16ymsqghalm33y0calgp07fwkp1hj"; libraryHaskellDepends = [ array base containers fclabels ghc-prim hashable hashtables pretty template-haskell unordered-containers @@ -18943,6 +19586,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate_1_0_0_0" = callPackage + ({ mkDerivation, base, base-orphans, containers, deepseq, directory + , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables + , mtl, pretty, template-haskell, time, transformers, unique, unix + , unordered-containers + }: + mkDerivation { + pname = "accelerate"; + version = "1.0.0.0"; + sha256 = "04pix2hazqafyb3zr8ikn1acrc77f9r9061fygpblbl5fxmk9g96"; + revision = "1"; + editedCabalFile = "1n6mhckkry2ga6w5yhc9s37saf055jfs2ixi1g0np5cca6027h10"; + libraryHaskellDepends = [ + base base-orphans containers deepseq directory exceptions fclabels + filepath ghc-prim hashable hashtables mtl pretty template-haskell + time transformers unique unix unordered-containers + ]; + homepage = "https://github.com/AccelerateHS/accelerate/"; + description = "An embedded language for accelerated array processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-arithmetic" = callPackage ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck , utility-ht @@ -18950,7 +19616,7 @@ self: { mkDerivation { pname = "accelerate-arithmetic"; version = "0.1"; - sha256 = "0f7d4142618ba5d134cd0bf4d20f7e5f3df171cbf05c7d3526a6a50dd0ffa20a"; + sha256 = "02m2zz80v9d64qspsp7hrdqz2gazgq7x5x0brlsd39cbc5142z8g"; libraryHaskellDepends = [ accelerate accelerate-utility base QuickCheck utility-ht ]; @@ -18963,15 +19629,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-bignum" = callPackage + ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion + , ghc-prim, llvm-hs-pure, mwc-random, tasty, tasty-quickcheck + , template-haskell, vector, vector-th-unbox, wide-word + }: + mkDerivation { + pname = "accelerate-bignum"; + version = "0.1.0.0"; + sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx + base criterion mwc-random vector vector-th-unbox wide-word + ]; + homepage = "https://github.com/tmcdonell/accelerate-bignum"; + description = "Fixed-length large integer arithmetic for Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-cublas" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda - , accelerate-io, accelerate-utility, base, cublas, cuda, random - , utility-ht, vector + , accelerate-io, accelerate-utility, base, cublas, cuda, hmatrix + , pooled-io, random, timeit, utility-ht, vector }: mkDerivation { pname = "accelerate-cublas"; - version = "0.0"; - sha256 = "4c27f8f6dca4c6e822cc731fe89ab90712f29acb341ad856791aa97db15199b5"; + version = "0.1"; + sha256 = "06khcx5db470p95fgz8r9m01ppx5rkrs1mslgypgxdxgriks39y6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18980,9 +19674,13 @@ self: { ]; executableHaskellDepends = [ accelerate accelerate-arithmetic accelerate-cuda accelerate-utility - base cublas random + base random ]; - homepage = "http://code.haskell.org/~thielema/accelerate-cublas/"; + benchmarkHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-cuda accelerate-utility + base cuda hmatrix pooled-io random timeit utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/accelerate-cublas/"; description = "Basic Linear Algebra using native CUBLAS library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18990,18 +19688,20 @@ self: { "accelerate-cuda" = callPackage ({ mkDerivation, accelerate, array, base, binary, bytestring - , cryptohash, cuda, directory, fclabels, filepath, hashable - , hashtables, language-c-quote, mainland-pretty, mtl, old-time - , pretty, process, SafeSemaphore, srcloc, template-haskell, text - , transformers, unix, unordered-containers + , containers, cryptohash, cuda, directory, fclabels, filepath + , hashable, hashtables, language-c-quote, mainland-pretty, mtl + , old-time, pretty, process, SafeSemaphore, srcloc + , template-haskell, text, transformers, unix, unordered-containers }: mkDerivation { pname = "accelerate-cuda"; - version = "0.15.1.1"; - sha256 = "6140c60df329f78d77d258ae3029522cb7a3fb038c531e23792dd8b307ff379d"; + version = "0.17.0.0"; + sha256 = "10mnsl5bclqf1k9yjadxy4zsj6pm4qbsx2hkrrhkjxfvhcba3wcb"; + revision = "3"; + editedCabalFile = "04w0gy775lxjgvvg1mbyrz0xzbdrc0dzbygy4vi52j0y9lygb4vm"; libraryHaskellDepends = [ - accelerate array base binary bytestring cryptohash cuda directory - fclabels filepath hashable hashtables language-c-quote + accelerate array base binary bytestring containers cryptohash cuda + directory fclabels filepath hashable hashtables language-c-quote mainland-pretty mtl old-time pretty process SafeSemaphore srcloc template-haskell text transformers unix unordered-containers ]; @@ -19017,8 +19717,8 @@ self: { }: mkDerivation { pname = "accelerate-cufft"; - version = "0.0.0.1"; - sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d"; + version = "0.0.1"; + sha256 = "0w7j5d2ncabz2ca4q53i07jybwsc116l38q71z2jl842lrlc1vc2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -19032,37 +19732,41 @@ self: { }) {}; "accelerate-examples" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, accelerate-fft - , accelerate-io, ansi-wl-pprint, array, attoparsec, base, binary - , bmp, bytestring, bytestring-lexing, cereal, containers, criterion - , directory, ekg, fclabels, filepath, gloss, gloss-accelerate - , gloss-raster-accelerate, gloss-rendering, HUnit, mwc-random - , normaldistribution, primitive, QuickCheck, random, repa, repa-io - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-algorithms + ({ mkDerivation, accelerate, accelerate-fft, accelerate-io + , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint + , array, base, binary, bmp, bytestring, bytestring-lexing, cereal + , colour-accelerate, containers, criterion, directory, fclabels + , filepath, gloss, gloss-accelerate, gloss-raster-accelerate + , gloss-rendering, HUnit, lens-accelerate, linear + , linear-accelerate, matrix-market-attoparsec, mwc-random + , normaldistribution, pipes, QuickCheck, random, repa, repa-io + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "0.15.1.0"; - sha256 = "2191601709da693aedb29f570e44b899b5132d2bc05fe618bc93608a43fec4a2"; - revision = "1"; - editedCabalFile = "77df83db322287253ea831448eced5c2adff5fe3edc413392cfb0eb8bdb0833b"; + version = "1.0.0.0"; + sha256 = "1s85mh1grdncxakby200awaa5h79i805ijgsxq524gd2dm4dqnd6"; + revision = "2"; + editedCabalFile = "0ckm9ydfdrpwvmi9hdmvfbpfgs0k24rg1xjjskxqzvx79qlph5qn"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - accelerate accelerate-cuda ansi-wl-pprint base containers criterion - directory ekg fclabels HUnit mwc-random QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 + accelerate accelerate-llvm-native accelerate-llvm-ptx + ansi-wl-pprint base containers criterion directory fclabels HUnit + linear mwc-random QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-cuda accelerate-fft accelerate-io array - attoparsec base binary bmp bytestring bytestring-lexing cereal - containers criterion directory fclabels filepath gloss - gloss-accelerate gloss-raster-accelerate gloss-rendering HUnit - mwc-random normaldistribution primitive QuickCheck random repa - repa-io test-framework test-framework-hunit - test-framework-quickcheck2 vector vector-algorithms + accelerate accelerate-fft accelerate-io array base binary bmp + bytestring bytestring-lexing cereal colour-accelerate containers + criterion directory fclabels filepath gloss gloss-accelerate + gloss-raster-accelerate gloss-rendering HUnit lens-accelerate + linear-accelerate matrix-market-attoparsec mwc-random + normaldistribution pipes QuickCheck random repa repa-io scientific + test-framework test-framework-hunit test-framework-quickcheck2 + vector vector-algorithms ]; homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; @@ -19071,13 +19775,20 @@ self: { }) {}; "accelerate-fft" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, base, cuda, cufft }: + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, bytestring + , carray, cuda, cufft, fft, file-embed, storable-complex + }: mkDerivation { pname = "accelerate-fft"; - version = "0.15.1.0"; - sha256 = "fd2648931ce4607aba4ad527691a4bba0f043ea4182a160aa8f024152101a702"; + version = "1.0.0.0"; + sha256 = "1qw4ln9xamv86lvb7y5xfzs12br4jbszai17jlagffmc6rnlhjkq"; + revision = "1"; + editedCabalFile = "101gc2wjisilgs0mib8l31sy6m6w04c0jp0zzr20p5j1gr3qjlnd"; libraryHaskellDepends = [ - accelerate accelerate-cuda base cuda cufft + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base bytestring carray cuda cufft fft + file-embed storable-complex ]; homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; @@ -19092,7 +19803,7 @@ self: { mkDerivation { pname = "accelerate-fftw"; version = "0.0"; - sha256 = "7a8678f28b621d2e0f4414f3e6e7b4a21bf290088de64714ea1942dd8dd2ce0d"; + sha256 = "03ffsa6xshhrx8a4grld128g46x2nkkydwql8h7jw7b2igr7i1ks"; libraryHaskellDepends = [ accelerate accelerate-io base carray fft storable-complex ]; @@ -19110,7 +19821,7 @@ self: { mkDerivation { pname = "accelerate-fourier"; version = "0.0.1"; - sha256 = "3ce3fbeaa6f7b280ffcca54fd524f4666487bb79813cf7a3f98601517cd87f82"; + sha256 = "10kzv1y520c6z6izfg41g6xqfr36yhjdakx5rkzq1cpplvmgpqrw"; libraryHaskellDepends = [ accelerate accelerate-arithmetic accelerate-utility base containers QuickCheck transformers utility-ht @@ -19135,15 +19846,15 @@ self: { }: mkDerivation { pname = "accelerate-fourier-benchmark"; - version = "0.0"; - sha256 = "ea65bce4c026c4ac47a34ed80d5901f2b14d06c94dbe7693acce58a992d5e998"; + version = "0.0.0.1"; + sha256 = "0zgn0k1n5fhas1k95yazq9zjlh1qd5m1m78c5vgs4ndpwy3kgb1p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ accelerate accelerate-cuda accelerate-cufft accelerate-fftw accelerate-fourier base criterion ]; - homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/"; + homepage = "http://hub.darcs.net/thielema/accelerate-fourier-benchmark/"; description = "Compare different implementations of the Fast Fourier Transform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19155,8 +19866,8 @@ self: { }: mkDerivation { pname = "accelerate-io"; - version = "0.15.1.0"; - sha256 = "d531fc6c950a6fcf0bdd72c65438c27fbffe2f3043444128979490d53fc7677c"; + version = "1.0.0.0"; + sha256 = "0h5nr0n1cdch20ld7s7mchr7wciasac4rmf4w2z61a48nj2knayi"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; @@ -19166,12 +19877,75 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-llvm" = callPackage + ({ mkDerivation, abstract-deque, accelerate, base, chaselev-deque + , containers, data-default-class, dlist, exceptions, fclabels + , llvm-hs, llvm-hs-pure, mtl, mwc-random, unordered-containers + , vector + }: + mkDerivation { + pname = "accelerate-llvm"; + version = "1.0.0.0"; + sha256 = "1kwck1rc2ipcblvjpqblmycm7j4w14635iblfgczydzzyw6x9smh"; + revision = "7"; + editedCabalFile = "1m3v55by11q4411wgj9623wdp0i6cnprykgwmklsmxf1gvf9d43x"; + libraryHaskellDepends = [ + abstract-deque accelerate base chaselev-deque containers + data-default-class dlist exceptions fclabels llvm-hs llvm-hs-pure + mtl mwc-random unordered-containers vector + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-llvm-native" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, containers + , directory, dlist, fclabels, libffi, llvm-hs, llvm-hs-pure, mtl + , time + }: + mkDerivation { + pname = "accelerate-llvm-native"; + version = "1.0.0.0"; + sha256 = "0m88pfx5zrr843m48yxlm2bfxl6d1ni27gsvv0qv1pcy9sviijid"; + revision = "2"; + editedCabalFile = "13akqlpn0vdxwpd4f4l9l71rx8nb5mkj9zklcv9rs38yay7y3an4"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base containers directory dlist fclabels + libffi llvm-hs llvm-hs-pure mtl time + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-llvm-ptx" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , containers, cuda, directory, dlist, fclabels, filepath, hashable + , llvm-hs, llvm-hs-pure, mtl, pretty, time, unordered-containers + }: + mkDerivation { + pname = "accelerate-llvm-ptx"; + version = "1.0.0.1"; + sha256 = "0s01vfqrg6kg2jkg9dkj98b7xr88m519drs73x5ffj6xdgq6b57z"; + revision = "1"; + editedCabalFile = "0r9j7pnhfxvx1qv3xn877mbr1pfwqh0nhm436cpqanqrj7sk876n"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring containers cuda + directory dlist fclabels filepath hashable llvm-hs llvm-hs-pure mtl + pretty time unordered-containers + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-random" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { pname = "accelerate-random"; version = "0.15.0.0"; - sha256 = "6d2600b2b4eac2246658e926a088447b1aa8add76994071a3cf8a5c455081ef3"; + sha256 = "1wqy11aw99gq7hd0g539synsh6kv8j4a09p9b1k29hpanjr009kd"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -19186,9 +19960,9 @@ self: { mkDerivation { pname = "accelerate-typelits"; version = "0.1.0.0"; - sha256 = "956e31783b2d6929bc33736af96d528ffbcb8d40bad8a6639496e5fd84c8a120"; + sha256 = "0851r22gvrcnjiisdn5s826wpywga9nzjskk6fy2js9d7dw32vlm"; revision = "2"; - editedCabalFile = "943e69f04f202c193de0de06d4c70918c2ca8a2f1fa0f9b7cf6e0d501ff196d5"; + editedCabalFile = "1mcny4gm03bfryvzk80z5y5cmhhq173x81nyw0yijb109zq6jgll"; libraryHaskellDepends = [ accelerate accelerate-random base mwc-random QuickCheck smallcheck ]; @@ -19206,7 +19980,7 @@ self: { mkDerivation { pname = "accelerate-utility"; version = "0.1.1"; - sha256 = "570f779a9ef35e6ddbbf2843cad38148c7c07f21686fbc4f4c87c3579de34135"; + sha256 = "0da1wffmghw79i7vqvv845zw1is8h79wlhr8pzdnsppkksd7f3sp"; libraryHaskellDepends = [ accelerate base utility-ht ]; homepage = "http://hub.darcs.net/thielema/accelerate-utility/"; description = "Utility functions for the Accelerate framework"; @@ -19219,7 +19993,7 @@ self: { mkDerivation { pname = "accentuateus"; version = "0.9.4"; - sha256 = "1e82b7b3c5f6e6d980242d3819f379a8c0d5fdfe34c17cf55eef0fcd02d20f9a"; + sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy"; libraryHaskellDepends = [ base bytestring HTTP json network text ]; homepage = "http://accentuate.us/"; description = "A Haskell implementation of the Accentuate.us API."; @@ -19232,7 +20006,7 @@ self: { mkDerivation { pname = "access-time"; version = "0.1.0.4"; - sha256 = "fa598105be558f8d079bda919eb14ab5fdba490f04acc34146c8459b65456f8e"; + sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs"; libraryHaskellDepends = [ base filepath old-time time unix ]; homepage = "http://www.github.com/batterseapower/access-time"; description = "Cross-platform support for retrieving file access times"; @@ -19245,7 +20019,7 @@ self: { mkDerivation { pname = "accuerr"; version = "0.2.0.2"; - sha256 = "4f6a8230d2ad3bc274dea234208ce4f5282e2d9413a5da1f5505fc55a2fa9a36"; + sha256 = "0dlszai5bz05algxm98kjhnjwa7mwj620d52vrsc4fxds8q84sjg"; libraryHaskellDepends = [ base bifunctors lens semigroups ]; homepage = "http://www.github.com/massysett/accuerr"; description = "Data type like Either but with accumulating error type"; @@ -19259,7 +20033,7 @@ self: { mkDerivation { pname = "ace"; version = "0.6"; - sha256 = "d3472b659d26cf7ea9afa207ec24ac0314598de997722e636e9bfa24b3900738"; + sha256 = "0f07j2rj9ylvdrijwwlpx66mj503mhjfq1x2mylpxkr6kmjjniyk"; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup data-default parsec text ]; @@ -19279,7 +20053,7 @@ self: { mkDerivation { pname = "acid-state"; version = "0.14.2"; - sha256 = "86dc1ebbcb4870e1c233764c3e038f38c8c8802694440baf83c3f7dc05ebe5c0"; + sha256 = "1h75xc2xrxy3hfphni4l4s0cij1qiw1kwk3n6g1f2w28rfxixp46"; libraryHaskellDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -19302,7 +20076,7 @@ self: { mkDerivation { pname = "acid-state-dist"; version = "0.1.0.1"; - sha256 = "868d3c28720d6757609ee8247634a04d49884cf0a049b1fca8fe542ddcc69eab"; + sha256 = "1awyqvf2sm7ym3yb2jd0y168hjadl0s7c978krh5frqdf8l3r3c6"; libraryHaskellDepends = [ acid-state base bytestring cereal concurrent-extra containers filepath mtl safe safecopy semigroups stm transformers @@ -19326,7 +20100,7 @@ self: { mkDerivation { pname = "acid-state-tls"; version = "0.9.2"; - sha256 = "f1fe502f2dff0374a401f15db4fe4afe82493c4dc945da6a8f7aeb3a7ac88313"; + sha256 = "04w3r1x3msvsixmdlif99ly4k0py9bzb8pgi06j780zz5lpm1zpi"; libraryHaskellDepends = [ acid-state base directory HsOpenSSL network safecopy ]; @@ -19341,7 +20115,7 @@ self: { mkDerivation { pname = "acl2"; version = "0.0.1"; - sha256 = "8f11af048dd74ef814dfcf20052ac359713650eb272bd841ca71d1317bd3942f"; + sha256 = "0bwlsdxk3lbir90xhar7xd83cwarqcm0a86gvwaghknpil2ay4cg"; libraryHaskellDepends = [ base process ]; description = "Writing and calling ACL2 from Haskell"; license = stdenv.lib.licenses.bsd3; @@ -19352,7 +20126,7 @@ self: { mkDerivation { pname = "acme-all-monad"; version = "0.1.0.0"; - sha256 = "fb2dcbc36232d9a93dcff35ecdcb3c26a32dd653d3c665157a524b6f423d5ee1"; + sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv"; libraryHaskellDepends = [ base transformers ]; description = "A monad which is powerful enough to interpret any action"; license = stdenv.lib.licenses.publicDomain; @@ -19364,7 +20138,7 @@ self: { mkDerivation { pname = "acme-box"; version = "0.0.0.0"; - sha256 = "1b51150b9cddf25c036f297658e17e7f9e68e15298774f2441dae0992457d558"; + sha256 = "0n6mawj9kq6s84j4yxwqabhni7kzgvhmhxi9dw1mrwnxkh5ial8v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -19380,7 +20154,7 @@ self: { mkDerivation { pname = "acme-cadre"; version = "0.1"; - sha256 = "718954cdc4c7eba1c6f24935726909ed888f12711040d2eacb87948c086694d9"; + sha256 = "1nclcq48r547rgmd4h0hf498z27d15lp4da9yb3a3sy7qk6m92bi"; libraryHaskellDepends = [ base ]; description = "car, cdr and more"; license = stdenv.lib.licenses.publicDomain; @@ -19390,8 +20164,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "acme-cofunctor"; - version = "0.1.0.0"; - sha256 = "d5ecbe477dd579fec0c6f6ad5d8f05d884de65af6570d519703896ecfe08311a"; + version = "0.1.1.0"; + sha256 = "0ydlnp0bbl5haci3a5x59sj2biylmpkqwzy749fhp8jn1cr8fg4x"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jaspervdj/acme-cofunctor"; description = "A Cofunctor is a structure from category theory dual to Functor"; @@ -19403,7 +20177,7 @@ self: { mkDerivation { pname = "acme-colosson"; version = "0.1"; - sha256 = "6c27d923310196d1196bba42fb151e572b6b5854f0cd618b197a82c5c156d655"; + sha256 = "0mfnav0wb0ks365n3kghaic6nasp3qaznhmsdccx35h164ixj9vc"; libraryHaskellDepends = [ base random ]; description = "Determines whether it is numberwang"; license = stdenv.lib.licenses.bsd3; @@ -19414,7 +20188,7 @@ self: { mkDerivation { pname = "acme-comonad"; version = "0.1.0.0"; - sha256 = "1a75f1f516870cfe2de7cd6c9fda7f8e54fcd7c4c0134c3c0a9abad7385580e9"; + sha256 = "1sc0alwdgfls18y4q4y0qkbzqm4fgzd9yv6dwwnzw3472vsz2x8s"; libraryHaskellDepends = [ base comonad ]; description = "A more efficient dualization"; license = stdenv.lib.licenses.bsd3; @@ -19426,7 +20200,7 @@ self: { mkDerivation { pname = "acme-cutegirl"; version = "0.2.0.0"; - sha256 = "7f2c87f308c5fdcd3f0e715393561280858dad55b310fcf25f97e06c997570ef"; + sha256 = "1vvhfncnrq4pbzrgq45kannqv1c029b96lvi1qzwvzf513rqfb3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -19441,7 +20215,7 @@ self: { mkDerivation { pname = "acme-default"; version = "0.1.0"; - sha256 = "375e166dafd8af2c3318ced8f48bfb237378fa69935fd864803bf131ef177d42"; + sha256 = "0hkx2zpk3w9vh1jdhpwkd7x7hwr3zf5z9n6f30rjrbyqmxnicpip"; libraryHaskellDepends = [ base ]; homepage = "http://hub.darcs.net/esz/acme-default"; description = "A class for types with a distinguished aesthetically pleasing value"; @@ -19453,7 +20227,7 @@ self: { mkDerivation { pname = "acme-dont"; version = "1.1"; - sha256 = "c32231ff8548bccd4f3bafcc9b1eb84947a2e5e0897c50c048e0e7609fc443ce"; + sha256 = "1kj3qjgn1rz093050z49w3js4is9p0g9pk5g7d7wvg28hpzk28n3"; libraryHaskellDepends = [ base ]; description = "A don't construct"; license = stdenv.lib.licenses.bsd3; @@ -19464,7 +20238,7 @@ self: { mkDerivation { pname = "acme-flipping-tables"; version = "0"; - sha256 = "a71c3bd27e878d2501bc2eeee2a426cceebda53e36bfd9dc218fa963187f85f6"; + sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jystic/acme-flipping-tables"; description = "Stop execution with rage"; @@ -19472,12 +20246,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "acme-functors" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-functors"; + version = "0.1.0.0"; + sha256 = "0b99f1js5w5904rw20xfmg8sfv0l8fdcnp90jx4rrczcirp6h6iq"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/chris-martin/acme-functors"; + description = "The best applicative functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-grawlix" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "acme-grawlix"; version = "0.1.0.2"; - sha256 = "56f3f73854e790aab0f41a209033f4b6893dc418cc8fef6a448b8fb046dc0c9c"; + sha256 = "170cvi3b13wb8imfz3yc3323v2dnyhrr080syjqam477ahwggwsn"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kadoban/acme-grawlix"; description = "More readable names for commonly used symbols"; @@ -19489,7 +20275,7 @@ self: { mkDerivation { pname = "acme-hq9plus"; version = "0.1"; - sha256 = "07856883a46fa23f98e51ba489420107e57b1237cbf5bed762b03a72a4f64435"; + sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/joeyadams/haskell-acme-hq9plus"; description = "An embedded DSL for the HQ9+ programming language"; @@ -19504,7 +20290,7 @@ self: { mkDerivation { pname = "acme-http"; version = "0.2.3"; - sha256 = "c2d0991eccec3ded951ca60de542cb1474fa921e6480a35154ad8bac76a0bd87"; + sha256 = "11xxl1var2xdai8s70343s9glx0lrd1fa3d63jaysggcrhg9kl62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -19520,7 +20306,7 @@ self: { mkDerivation { pname = "acme-inator"; version = "0.1.0.0"; - sha256 = "d37f74ce98de9e3a8fd42492bf53ec99a8e80c0445186fa846abe6acf06f3bc0"; + sha256 = "1h1vdzqarrmb8sl6y6250h6fia4rxi9vz4i4sj7km7nyk3778zyk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -19535,7 +20321,7 @@ self: { mkDerivation { pname = "acme-io"; version = "0.1.0.1"; - sha256 = "8b0d441cdc3389bbd3672b43ca3685d1a8ce2c43da0aae9a2d8735bf58fb2c24"; + sha256 = "091czdcbydc75ndaw2ns8cncxa6ihlvclhrbcz9vp29kvhf483cb"; libraryHaskellDepends = [ base ]; homepage = "N/A"; description = "The only true way to do IO in Haskell!"; @@ -19548,7 +20334,7 @@ self: { mkDerivation { pname = "acme-iot"; version = "0.1.0.1"; - sha256 = "fd0d6193f7dc9d17f6a8e1c5a37c85574636cad13e1d84f3f66b4e9f58be8378"; + sha256 = "0y43prc9ykkbyvrq879ys753cijphmya7ig1m3v1g7fwyy9n23gx"; libraryHaskellDepends = [ base ghc-prim mtl transformers ]; description = "IO monad transformer"; license = stdenv.lib.licenses.mit; @@ -19559,7 +20345,7 @@ self: { mkDerivation { pname = "acme-kitchen-sink"; version = "0.1.0.0"; - sha256 = "252007a08308670edeef46742da25169025f44b52da8c1ce55fe0fd37c3ea82c"; + sha256 = "0b587ryd63zyap7c3a1dnm25y0k9a6i2sx26xzg0wrq8hfh0f815"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/marcosdumay/acme-kitchen-sink"; description = "A place for dumping that does-not-feel-right code while you improve it"; @@ -19571,7 +20357,7 @@ self: { mkDerivation { pname = "acme-left-pad"; version = "3.0"; - sha256 = "acbac093f071fc08b8cd4081c3e3675d369304626bcba85ef011ddc169f9370d"; + sha256 = "039pz5lw3p8iy1gaijvbc8296djxcziw70a0rnw0iz3iy29w1fmc"; libraryHaskellDepends = [ base text ]; description = "free your haskell from the tyranny of npm!"; license = stdenv.lib.licenses.agpl3; @@ -19583,7 +20369,7 @@ self: { mkDerivation { pname = "acme-lolcat"; version = "0.1.1"; - sha256 = "6228b1679885fef0c29e3e9a27cb8b273e1d68d700e9b7b1d2823d9af2d23a22"; + sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32"; libraryHaskellDepends = [ base parsec random random-shuffle text ]; homepage = "https://github.com/llelf/acme-lolcat"; description = "LOLSPEAK translator"; @@ -19595,7 +20381,7 @@ self: { mkDerivation { pname = "acme-lookofdisapproval"; version = "0.1"; - sha256 = "3a423e4d0045d75951b9b1b2a4ba53c0a8363eb9ddab6cc71a7a91b014db9da4"; + sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/llelf/acme-lookofdisapproval"; description = "Express your disapproval"; @@ -19607,7 +20393,7 @@ self: { mkDerivation { pname = "acme-memorandom"; version = "0.0.3"; - sha256 = "115a0f491fb5f3ae4ddfb54305f837fcdb46a0a10bb3eb1a3d24bab35aedd3d0"; + sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi"; libraryHaskellDepends = [ base MemoTrie random ]; homepage = "https://github.com/ion1/acme-memorandom"; description = "Memoized random number generation"; @@ -19619,7 +20405,7 @@ self: { mkDerivation { pname = "acme-microwave"; version = "0.1.0.2"; - sha256 = "6948517284fa20e90169073c6d04fa3de1303b8ba7039ab00d44c81a59e7d48c"; + sha256 = "136lwxcimj241nq9l0x7icxk1q9xz826sg07d40yj87shir52j39"; libraryHaskellDepends = [ base ]; description = "The eighth wonder of the world, kitchen math!"; license = stdenv.lib.licenses.bsd3; @@ -19630,7 +20416,7 @@ self: { mkDerivation { pname = "acme-miscorder"; version = "0.1.0.0"; - sha256 = "44826a0f6d37ccd99a3173cda9ecbc754e81feff10610cc011ab2fba89d10ea0"; + sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4"; libraryHaskellDepends = [ base random ]; description = "Miscellaneous newtypes for orderings of discutable use"; license = stdenv.lib.licenses.publicDomain; @@ -19642,7 +20428,7 @@ self: { mkDerivation { pname = "acme-missiles"; version = "0.3"; - sha256 = "e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b"; + sha256 = "0nvkgdj04i21gq5k541an8zjz0hzzy7dpi384yrhcyh14jsxhqz5"; libraryHaskellDepends = [ base stm ]; description = "Cause serious international side effects"; license = stdenv.lib.licenses.publicDomain; @@ -19653,7 +20439,7 @@ self: { mkDerivation { pname = "acme-now"; version = "1.0.0.1"; - sha256 = "55f34fa960eecf16317414f4bfc4baa4966164b95526f8f65900e4d39bd5d952"; + sha256 = "0lnrsndx7r00b7vgh9jmp5j635m4pb2bzx0lfhqidkzfc2llzwsm"; libraryHaskellDepends = [ base time ]; description = "An interface to the philosophical and metaphysical \"now\""; license = stdenv.lib.licenses.publicDomain; @@ -19665,7 +20451,7 @@ self: { mkDerivation { pname = "acme-numbersystem"; version = "0.3.0.0"; - sha256 = "07ed4a91c5cfc38c4d44120c927082000558068274fbb11ff646b7dab46eb9dc"; + sha256 = "1p5rdssdmds6yqgv3yvlh835h180h9q9430j8i6qrhygqn8lmv87"; libraryHaskellDepends = [ base template-haskell ]; description = "Define the less than and add and subtract for nats"; license = stdenv.lib.licenses.bsd3; @@ -19677,7 +20463,7 @@ self: { mkDerivation { pname = "acme-omitted"; version = "3.0.0.0"; - sha256 = "4966ce601eb6493739244af36f55e22a080bcc1ea9ab9476a801bd3ca30002ac"; + sha256 = "1b0202ikrg81m1v99ax93v60n21aw9anzwsa4hwkfjdn3rhcwrj9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/joachifm/acme-omitted#readme"; @@ -19690,7 +20476,7 @@ self: { mkDerivation { pname = "acme-one"; version = "0.0.2"; - sha256 = "6bed9ce93f0c6efabc63addcafbaf732187d7a111975541127a9948788e94f87"; + sha256 = "11sgx648g5594w8m8x8r25x7s61jyyxazp5dcfyglvhc7zlrrvbb"; doHaddock = false; homepage = "https://github.com/ion1/acme-zero-one"; description = "The identity element of package dependencies"; @@ -19702,7 +20488,7 @@ self: { mkDerivation { pname = "acme-operators"; version = "0.2.0.0"; - sha256 = "3c80f60d4add0170b1a0a94d53abfc6d14a2a4efc7c3dd9ecf5a840d6f14c1f1"; + sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/phadej/acme-operators#readme"; description = "Operators of base, all in one place!"; @@ -19715,7 +20501,7 @@ self: { mkDerivation { pname = "acme-php"; version = "0.0.5"; - sha256 = "545ecb6260ebb26336bdc41fbee7f0e48de390f220ff57ec1cce2c1661bc4ece"; + sha256 = "1kjfpihicb6f3kn5gzr0ya8f73g4y3kvw7y4plv67cpbc1icnpjl"; libraryHaskellDepends = [ acme-left-pad base ]; homepage = "http://hackage.haskell.org/package/acme-php-0.0.5/src/docs.html"; description = "The flexibility of Haskell and the safety of PHP"; @@ -19728,7 +20514,7 @@ self: { mkDerivation { pname = "acme-pointful-numbers"; version = "0.1.2.4"; - sha256 = "c9d733ac1df9b8294c6f6f99d0c9610d2b77a7fc98a6d4279f2feeb29aa0f509"; + sha256 = "02gml2db5vigkwkx99lqzjkpfaqdc74x16bgdx62kf7r3nn37my9"; libraryHaskellDepends = [ base split ]; description = "Make more than one point in numeric literals"; license = stdenv.lib.licenses.bsd3; @@ -19739,7 +20525,7 @@ self: { mkDerivation { pname = "acme-realworld"; version = "0.1.1"; - sha256 = "19b90d7c8603ed633ce0faf9f223be0d6056bf68f57ac94a3b2c4228218bd039"; + sha256 = "0ffhichjhhic7d5cjypmd2zmcq0dpqiz5ygsw0y67v83hry0vf8r"; libraryHaskellDepends = [ base ]; description = "Primitives for manipulating the state of the universe"; license = stdenv.lib.licenses.bsd3; @@ -19750,7 +20536,7 @@ self: { mkDerivation { pname = "acme-safe"; version = "0.1.0.0"; - sha256 = "c87ce02c7188303b2a109e0c81e8c5a074c35d3fc3ebddde31a9903d5621bb2e"; + sha256 = "0bmv45b3v45967gdvsy37xfw6x50qpl8234y20m3nc48f4nf0z68"; libraryHaskellDepends = [ acme-dont base ]; homepage = "http://github.com/fgaz/acme-safe"; description = "Safe versions of some infamous haskell functions such as fromJust"; @@ -19764,7 +20550,7 @@ self: { mkDerivation { pname = "acme-schoenfinkel"; version = "0.1.1"; - sha256 = "4da179d999d1b430d48fe4e61bf764a08d277abf439a0f735912e1db77cc6b4b"; + sha256 = "0jvbrivxpq8jb5rhz6j3pxx2g3d0ckviprp4iza31d6ik7cpk8ad"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -19780,7 +20566,7 @@ self: { mkDerivation { pname = "acme-smuggler"; version = "0.1.0.1"; - sha256 = "740ecdf25dd30475f44b865490b8efecfb39621e91569c988d21ca0762946ac7"; + sha256 = "1ivajii0gji1inc9qmli3ri3kyzcxyw90m469gs7a16kbprcs3kl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/benclifford/acme-smuggler"; @@ -19793,7 +20579,7 @@ self: { mkDerivation { pname = "acme-strfry"; version = "0.1"; - sha256 = "8b2208e73aaab38d3a948a8be016a7d0ac651d980b2d0a0dfe700ad1fdb4dde4"; + sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ehird/acme-strfry"; description = "A binding to the glibc strfry function"; @@ -19806,7 +20592,7 @@ self: { mkDerivation { pname = "acme-stringly-typed"; version = "1.0.0.0"; - sha256 = "ce045ee38baade76be3e83f59f709b28bd4dec4d8ef8c8156b09f255dbd69ba3"; + sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f"; libraryHaskellDepends = [ base ]; description = "Stringly Typed Programming"; license = stdenv.lib.licenses.bsd3; @@ -19818,7 +20604,7 @@ self: { mkDerivation { pname = "acme-strtok"; version = "0.1.0.3"; - sha256 = "c828c77a49e89e25fabb077f8f28c304a98635af7971cc2da113b3ffbc47d2aa"; + sha256 = "1anj8yygzcqkl4nwqwbrmwsqda84qcl8yzq7pgx2b7p895xcfa68"; libraryHaskellDepends = [ base mtl ]; description = "A Haskell port of the C/PHP strtok function"; license = stdenv.lib.licenses.publicDomain; @@ -19829,7 +20615,7 @@ self: { mkDerivation { pname = "acme-timemachine"; version = "0.0.1.0"; - sha256 = "6be7e0cef59212ac8431073f1934645bf3ab859d5f9a3f23d1df3c482cb0dcb5"; + sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb"; libraryHaskellDepends = [ base ghc-prim mtl transformers ]; description = "An easy way to perform and unperform IO and other stateful actions"; license = stdenv.lib.licenses.bsd3; @@ -19840,7 +20626,7 @@ self: { mkDerivation { pname = "acme-year"; version = "2016"; - sha256 = "b43d1f33434930d8f6f2971eef34bd12c305f3976d7115688b87b00c85f170ff"; + sha256 = "1zvhy62hrc47idl1awbdjzrhbhqjplsfy7lpybvdhc298criygdl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; benchmarkHaskellDepends = [ base criterion ]; @@ -19854,7 +20640,7 @@ self: { mkDerivation { pname = "acme-zero"; version = "0.0.2"; - sha256 = "c68d82cbf3bda44ce0b63055a751ab81a681e375a6bff979c29c63a4da85a419"; + sha256 = "06d4hpda8qwwq9wzkgx6fpiq39l1md8sfm9hnvh4r95xyg5q53f6"; doHaddock = false; homepage = "https://github.com/ion1/acme-zero-one"; description = "The absorbing element of package dependencies"; @@ -19867,7 +20653,7 @@ self: { mkDerivation { pname = "action-permutations"; version = "0.0.0.1"; - sha256 = "a419ee59f996e5305afd96336a561a9fcf26844362eaa32ab6b747a8f9fd1466"; + sha256 = "0rhlzpwshixpnqma7sk28f22dkwz39b6lcwnzmd31rcnz5cyw6d4"; libraryHaskellDepends = [ base ]; description = "Execute a set of actions (e.g. parsers) in each possible order"; license = stdenv.lib.licenses.bsd3; @@ -19879,8 +20665,10 @@ self: { }: mkDerivation { pname = "active"; - version = "0.2.0.12"; - sha256 = "55281f8fad2b2776969d04d1769fb99498477b58570e02f7a5c69022e3a8b91e"; + version = "0.2.0.13"; + sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; + revision = "2"; + editedCabalFile = "1ml42hbvfhqzpdi1y5q6dqp4wq6zqb30f15r34n9ip9iv44qjwwf"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -19902,7 +20690,7 @@ self: { mkDerivation { pname = "activehs"; version = "0.3.1"; - sha256 = "0c0ab3ef3338d713d0bde0ce288199ce28c6401e27545691f04e08450403ea0f"; + sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -19922,7 +20710,7 @@ self: { mkDerivation { pname = "activehs-base"; version = "0.3.0.4"; - sha256 = "92d516583737ceb2272807eab8280ebb3b36e679c5a219ca9813d0c695efb13e"; + sha256 = "0gmixyawdl0kk351k8n5g7k3cfxv1qlbish750kv5kip6xc1dmcj"; libraryHaskellDepends = [ base QuickCheck ]; description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; @@ -19934,7 +20722,7 @@ self: { mkDerivation { pname = "activitystreams-aeson"; version = "0.2.0.2"; - sha256 = "1252d328e4dad9e18f6bd188961ffc4ce12eefe35a3ecccb693297a057c512ec"; + sha256 = "1v0jqmbs15rjd75wqgjswgpjxqaczhgrd26idf7y3nfswhld6lhj"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; @@ -19949,7 +20737,7 @@ self: { mkDerivation { pname = "actor"; version = "0.1.1"; - sha256 = "6589dd602fb3fdbedd6553c2500b6bc36da6bc714ec07d8238131aefb22787c5"; + sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5"; libraryHaskellDepends = [ base haskell98 stm time ]; homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html"; description = "Actors with multi-headed receive clauses"; @@ -19958,14 +20746,15 @@ self: { }) {}; "ad" = callPackage - ({ mkDerivation, array, base, comonad, containers, criterion - , data-reify, directory, doctest, erf, filepath, free, nats - , reflection, transformers + ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad + , containers, criterion, data-reify, directory, doctest, erf + , filepath, free, nats, reflection, transformers }: mkDerivation { pname = "ad"; - version = "4.3.2.1"; - sha256 = "84de5524f60a088f4a326956434c74f32b9c4961be616fb3f1fbea620413e39d"; + version = "4.3.3"; + sha256 = "0anvcw3zdslmbjra8h75s5fwcl7d1i79ydvdcd0vwz6m0cbqrf3j"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection transformers @@ -19982,7 +20771,7 @@ self: { mkDerivation { pname = "adaptive-containers"; version = "0.3"; - sha256 = "1387d8f5e89f452da04d59c0e97154345571fa7c952d1dfb012f39584afc009a"; + sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~dons/code/adaptive-containers"; description = "Self optimizing container types"; @@ -19995,7 +20784,7 @@ self: { mkDerivation { pname = "adaptive-tuple"; version = "0.2.0"; - sha256 = "218f0271298f9a42aad50c10cc042388c62d1619624b750f0b665be4f068c4cd"; + sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1"; libraryHaskellDepends = [ base template-haskell type-level ]; homepage = "http://inmachina.net/~jwlato/haskell/"; description = "Self-optimizing tuple types"; @@ -20009,7 +20798,7 @@ self: { mkDerivation { pname = "adb"; version = "0.1.0.0"; - sha256 = "a00146b86834664784452d1e210f6e808354a19740aeb71eb0288e577fdbbd9d"; + sha256 = "17dxvdzmg3i8n0gbgbj0jyhm90w0dq7j27id8n24frild2w4c0d0"; libraryHaskellDepends = [ base bytestring cereal containers mtl network ]; @@ -20026,7 +20815,7 @@ self: { mkDerivation { pname = "adblock2privoxy"; version = "1.4.2"; - sha256 = "2c42c4a75720d8a988898440d06df15b10a2ff1de88fe793de7b7cfe415a339e"; + sha256 = "17ikb90zwz3vvs9yg3z83pzs442vy5nx0h44i64akn10aykw8hic"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -20045,7 +20834,7 @@ self: { mkDerivation { pname = "addLicenseInfo"; version = "0.1"; - sha256 = "3c4b5d38fcd60c73a77e276e1f3e34c5d2cebb1fdc8cc8fc6c38c01541659314"; + sha256 = "054kcm0ibh1qdkyci36w3yxwxln56hz1yvi7gskp636nzhw5sjrw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -20061,7 +20850,7 @@ self: { mkDerivation { pname = "adhoc-network"; version = "1.0.3"; - sha256 = "e70ca6886bd4a2b17cf92b94a848e7ac3e3ac75718e692d63ad98ec07bcd0df2"; + sha256 = "1whdrmxw13nr7bb95rhqaz3klgmcwx4ai51bz5yb38nldf4ac377"; libraryHaskellDepends = [ base bytestring containers Crypto dataenc HaXml hsgnutls network old-locale parsec pkcs1 random time utf8-string xml-parsec @@ -20079,7 +20868,7 @@ self: { mkDerivation { pname = "adict"; version = "0.4.1"; - sha256 = "f8edd2ae3ceadb7a4bf4005f6218caa3a51e9e2e3171021edf2c52ce4a2a831f"; + sha256 = "07w3595cwlicvwg04w9i5sg1x9d3r8c64pq0yi5pmnza7jpd5vgq"; libraryHaskellDepends = [ array base binary containers dawg PSQueue vector ]; @@ -20101,9 +20890,9 @@ self: { mkDerivation { pname = "adjunctions"; version = "4.3"; - sha256 = "b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc"; + sha256 = "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r"; revision = "1"; - editedCabalFile = "f88c4f5440736d64ad6a478e9feccc116727b5dc616fc6535cfe64ff75a2e980"; + editedCabalFile = "1079l9szyr7ybi9wcvv1vjsjfrqirkn9z3j7dann8vbk81a4z37q"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -20119,7 +20908,9 @@ self: { mkDerivation { pname = "adler32"; version = "0.1.1.0"; - sha256 = "578cb9ea7451dc905a22de15e46f8d6fc27f76e4c6f75352a70ebfe53a6928ec"; + sha256 = "1v18d4xfbgqflx957xy6wiv7zhkgimpy85fy49d91p2ifkmbk32p"; + revision = "1"; + editedCabalFile = "087fykdlay78g9zg1w6a36xwd4pizcyi5wqzvj7cw5sh6gq493km"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ base bytestring hspec ]; @@ -20135,7 +20926,7 @@ self: { mkDerivation { pname = "adobe-swatch-exchange"; version = "0.2.0"; - sha256 = "fb52d7cf35da9d8e512279660ea627779673c61047444d99bb158a1a20ef8649"; + sha256 = "0jc6xwh1m2hmpfclsi27233775kp4yk0wrkr498qx7fs6p7xflpv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20158,7 +20949,7 @@ self: { mkDerivation { pname = "adp-multi"; version = "0.2.3"; - sha256 = "4728f3d87728adead1d6ebb33e032dd05673cc43573dc00d52a9522154f7b5d2"; + sha256 = "1lmmyxa22lm9a86w0gap8g676mnh5l1kxczbsv8ymb98fzcg6a27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers htrace ]; @@ -20179,7 +20970,7 @@ self: { mkDerivation { pname = "adp-multi-monadiccp"; version = "0.2.1"; - sha256 = "dae838558f728af3cf1e58aaccfcc66fe66a0d3d33332eb365d710e71facf48f"; + sha256 = "13zlmhgyf46pcnrjwcrk7l6nmrkgqvycrajq3v7z72kjixakis6s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ adp-multi base containers monadiccp ]; @@ -20203,9 +20994,9 @@ self: { mkDerivation { pname = "aeson"; version = "0.7.0.6"; - sha256 = "645531759ba18105cadf024415e1be60353ad704ac686ff5ee67c7f4754d4e6f"; + sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; revision = "1"; - editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001"; + editedCabalFile = "00fhxw6x58aq2k4frj4nvky4jnagq4p0ylwfwjc3vnfq7lsa31wb"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist ghc-prim hashable mtl old-locale scientific syb template-haskell text time @@ -20233,7 +21024,7 @@ self: { mkDerivation { pname = "aeson"; version = "0.11.3.0"; - sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9"; + sha256 = "1sgcjmf945hazdfx7iyr60w0x9l3y292q2k13zcjihl1g32zl9pk"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist fail ghc-prim hashable mtl scientific syb tagged template-haskell text time @@ -20263,7 +21054,9 @@ self: { mkDerivation { pname = "aeson"; version = "1.0.2.1"; - sha256 = "e0a66fba0a9996063d0e241b0b868c6271b6aeb457821a78bfcaac5d84c89066"; + sha256 = "0rlhr225vb6apxw1m0jpnjpbcwb2ij30n6r41qyhd5lr1ax6z9p0"; + revision = "1"; + editedCabalFile = "1wfplxb4bppx2bqxbwprl09w9h9bfwn4ak97g8nrdrm30xfqv16g"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20282,19 +21075,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_1_0_0" = callPackage + "aeson_1_2_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, QuickCheck, quickcheck-instances - , scientific, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , time-locale-compat, unordered-containers, uuid-types, vector + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, unordered-containers, uuid-types + , vector }: mkDerivation { pname = "aeson"; - version = "1.1.0.0"; - sha256 = "5810fc5f664855ba6457d119fffd176ee93e60a27e88f5eedc349d7d75f18880"; + version = "1.2.1.0"; + sha256 = "0wwa2i8jy3q7i8mys8hmy1nhis2a7hbs1bbfpmbj7xcvxpdhy5wn"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20303,7 +21097,7 @@ self: { testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit QuickCheck + ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck quickcheck-instances scientific tagged template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat unordered-containers uuid-types vector @@ -20319,7 +21113,7 @@ self: { mkDerivation { pname = "aeson-applicative"; version = "0.1.0.0"; - sha256 = "1f8f9bd254cfc56f44a9c1994815a3c8ebd36978ca12378a42aed2172cbd8b5e"; + sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz"; libraryHaskellDepends = [ aeson base text unordered-containers ]; homepage = "https://github.com/gregwebs/aeson-applicative-dsl"; description = "make To/From JSOn instances from an applicative description"; @@ -20335,7 +21129,7 @@ self: { mkDerivation { pname = "aeson-better-errors"; version = "0.9.1.0"; - sha256 = "68f001bf055ec7b755d91019f2a0ef136307d157a231acddad6b4cc561f67327"; + sha256 = "09vkyrhwak3bmpfsqcd2az8hfqqkxyhg468hv5avgisy0nzh3w38"; libraryHaskellDepends = [ aeson base bytestring dlist mtl scientific text transformers transformers-compat unordered-containers vector void @@ -20352,7 +21146,7 @@ self: { mkDerivation { pname = "aeson-bson"; version = "0.3.0"; - sha256 = "c94a02a032c7ada488bc2dc50c751e7fdf7773d5d425e784db6e066c4acf9028"; + sha256 = "0a4hrx56q1kfvf2ff9flsmrpgpvz3rshri9dpj4a9bf76ah04jn9"; libraryHaskellDepends = [ aeson array attoparsec base bson bytestring containers text unordered-containers vector @@ -20369,7 +21163,7 @@ self: { mkDerivation { pname = "aeson-casing"; version = "0.1.0.5"; - sha256 = "cfec563dc6822f035858a7190153d8818c200be565806b43b70f198bf5410577"; + sha256 = "0xq587sqn68gnx1np035wl5j1341v19h26d7b1c06bw2qqymdv6g"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base tasty tasty-hunit tasty-quickcheck tasty-th @@ -20383,7 +21177,7 @@ self: { mkDerivation { pname = "aeson-coerce"; version = "0.1.0.0"; - sha256 = "489c3b6f2c9c667fdda9ccdf3df16bd3f329b1e2d4645b393f905c3e61dad744"; + sha256 = "0i6pv9hkwp4h7wwmnr6lwaqjkwykdgqkvpycm7fpyrlw5ipkp728"; libraryHaskellDepends = [ aeson base bytestring containers text ]; homepage = "https://github.com/lichtzwerge/aeson-coerce#readme"; description = "Initial project template from stack"; @@ -20400,9 +21194,9 @@ self: { mkDerivation { pname = "aeson-compat"; version = "0.3.6"; - sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142"; - revision = "4"; - editedCabalFile = "534f6f1d1b09f88910407d670dfc9283ceaf824bf929373e0be1566f206011a3"; + sha256 = "0hnifh46g218ih666gha3r0hp8bahcl9aj1rr4jqyw2gykcnb8vs"; + revision = "6"; + editedCabalFile = "1hvq2pp7k2wqlzd192l7dz1dhld7m3slhv84hnmh4jz8g618xzsc"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions hashable nats scientific semigroups tagged text time @@ -20419,16 +21213,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-compat_0_3_7" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , base-compat, base-orphans, bytestring, containers, exceptions + , hashable, nats, QuickCheck, quickcheck-instances, scientific + , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.7"; + sha256 = "053wa7j82pymr633vakpdandrddg083zcmv76g9sbawcsfiw5whv"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-iso8601 base base-compat bytestring + containers exceptions hashable nats scientific semigroups tagged + text time time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable nats QuickCheck quickcheck-instances + scientific semigroups tagged tasty tasty-hunit tasty-quickcheck + text time time-locale-compat unordered-containers vector + ]; + homepage = "https://github.com/phadej/aeson-compat#readme"; + description = "Compatibility layer for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-diff" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory + ({ mkDerivation, aeson, base, bytestring, directory, doctest , edit-distance-vector, filepath, Glob, hashable, hlint, mtl , optparse-applicative, QuickCheck, quickcheck-instances , scientific, text, unordered-containers, vector }: mkDerivation { pname = "aeson-diff"; - version = "1.1.0.0"; - sha256 = "eeeb97b3f40485e7234427f192c66d044c0a25a1b7a24d91870e85fb226c1086"; + version = "1.1.0.2"; + sha256 = "05kpznfzsa4kvanm8nhj40lz6f8zx6vd4jacih2r05i63ph0qyrd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20439,8 +21261,8 @@ self: { aeson base bytestring optparse-applicative text ]; testHaskellDepends = [ - aeson base bytestring directory filepath Glob hlint QuickCheck - quickcheck-instances text unordered-containers vector + aeson base bytestring directory doctest filepath Glob hlint + QuickCheck quickcheck-instances text unordered-containers vector ]; homepage = "https://github.com/thsutton/aeson-diff"; description = "Extract and apply patches to JSON documents"; @@ -20458,9 +21280,9 @@ self: { mkDerivation { pname = "aeson-extra"; version = "0.4.0.0"; - sha256 = "78ecedf65f8b68c09223912878e2a055aa38536489eddc9b47911cbc05aba594"; - revision = "2"; - editedCabalFile = "205ca010ed9726b27ebe1f63fe6260dc26b327e2998cc4bc744a30bd3b708c3b"; + sha256 = "1555mc2vq74i8ydxrvc9ci9kiajml3i7ha4i4f9c0s4bbzvfvv3q"; + revision = "3"; + editedCabalFile = "11wps0p4wrm68zzck6km0yxj988xnkcbaww1vlyd02jv3vzyb16z"; libraryHaskellDepends = [ aeson aeson-compat attoparsec base base-compat bytestring containers exceptions hashable parsec recursion-schemes scientific @@ -20484,7 +21306,7 @@ self: { mkDerivation { pname = "aeson-filthy"; version = "0.1.1"; - sha256 = "58fda3fb2ba49a952242d570bce4fa2cae47c0a47957e5f4b9ef66b9de5663cb"; + sha256 = "1jv3avgbjrpgp7sfamvrlk04gbiczbjbqw6m88i9b6m45gxs7zaq"; libraryHaskellDepends = [ aeson base bytestring text unordered-containers ]; @@ -20499,8 +21321,8 @@ self: { ({ mkDerivation, aeson, base, text, unordered-containers, vector }: mkDerivation { pname = "aeson-flat"; - version = "0.1.0.0"; - sha256 = "1db507abdb802732ffa3444cb227411ad68b430692578fc79e7c19b7165a6214"; + version = "0.1.1"; + sha256 = "00c8l22fqhqy94n19m0i0zsb3237zvkz6031rfhblfyj56k56kqw"; libraryHaskellDepends = [ aeson base text unordered-containers vector ]; @@ -20518,7 +21340,7 @@ self: { mkDerivation { pname = "aeson-flatten"; version = "0.1.0.2"; - sha256 = "2799b6a41aa112de21605a4407b7efef175fbd2a2fb72b37ec554f150398684d"; + sha256 = "0kb8k01iaksmxhvjpdrg5aymy5zgxyvhfi2sc0hxw4m13ajbd697"; libraryHaskellDepends = [ aeson base text unordered-containers ]; testHaskellDepends = [ aeson base bytestring hspec ]; homepage = "https://github.com/j1r1k/aeson-flatten#readme"; @@ -20531,7 +21353,7 @@ self: { mkDerivation { pname = "aeson-generic-compat"; version = "0.0.1.0"; - sha256 = "d4a05e4d351350f4ce7e270c85dcd990c81d879fd1208a6371865f5b2190d3ad"; + sha256 = "1bfkj0hmnpw6f5iql86iky3ivj4hv7f8a317gv7g8l0k6m6mx86l"; libraryHaskellDepends = [ aeson base ]; description = "Compatible generic class names of Aeson"; license = stdenv.lib.licenses.bsd3; @@ -20545,8 +21367,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.0.7.0"; - sha256 = "de379a3727b81d537bd068d2b22dec4631daf193b992d4a0d9a878535eae41d8"; + version = "1.0.8.0"; + sha256 = "1k5chasmpn834pjhfyfjmkmx7dzxy3bw9rkphk6dmp7kp41ygyai"; libraryHaskellDepends = [ aeson base bifunctors deepseq lens servant-docs swagger2 text unordered-containers @@ -20565,7 +21387,7 @@ self: { mkDerivation { pname = "aeson-iproute"; version = "0.1.1"; - sha256 = "9fc733cbe7d47e69b33a0003a73e82f337846006de672f87ce1eafbe6bc159af"; + sha256 = "1bsrq5mvxbqyrs3jyryy0rh88dzkh8zaf0q07arnjznlwz5k7iwz"; libraryHaskellDepends = [ aeson base iproute text ]; homepage = "https://github.com/greydot/aeson-iproute"; description = "Aeson instances for iproute types"; @@ -20577,7 +21399,7 @@ self: { mkDerivation { pname = "aeson-json-ast"; version = "0.1.1"; - sha256 = "ff45897bfecd8cd29c7464a60c97829361569285300bb5d30a01c97519512d5d"; + sha256 = "0p9da4cpbj811b9va2rhhn95cqckhabhr9k4fjfd536dzrxqjigz"; libraryHaskellDepends = [ aeson base json-ast ]; homepage = "https://github.com/sannsyn/aeson-json-ast"; description = "Integration layer for \"json-ast\" and \"aeson\""; @@ -20591,7 +21413,7 @@ self: { mkDerivation { pname = "aeson-lens"; version = "0.5.0.0"; - sha256 = "7ace668031da8119439e21b6ccbe329d37c533be2f5c5612389107d2676728df"; + sha256 = "1pr8cxkx41wi7095cp1gpqrwadwx6azcrdi1kr1ik0fs6606dkks"; libraryHaskellDepends = [ aeson base bytestring lens text unordered-containers vector ]; @@ -20608,9 +21430,9 @@ self: { mkDerivation { pname = "aeson-native"; version = "0.3.3.2"; - sha256 = "d0b95fff53727f3840595c6b305f04d9cc71040ace7079b357a7358d3242b1e8"; + sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh"; revision = "1"; - editedCabalFile = "c9519a30bce75564cfbe84aade5ffb99fad12ecea1c7d2c362cca2234b8ae497"; + editedCabalFile = "15z4i95j78nccb1x5ix1rqpd3ylrzdgxxal4pv7n8mg7phq9llf9"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual-native bytestring containers deepseq hashable mtl old-locale syb text time @@ -20629,7 +21451,7 @@ self: { mkDerivation { pname = "aeson-parsec-picky"; version = "0.1.0.1"; - sha256 = "f617704188453e639d60ea9ac24d6c161affb517581cfff6dfbd2b580ccaea62"; + sha256 = "0qpar865haxxvzvgy72q2yszy6hndi6w56pac2fn6gj5i10p05zn"; libraryHaskellDepends = [ aeson base parsec scientific text unordered-containers vector ]; @@ -20645,7 +21467,7 @@ self: { mkDerivation { pname = "aeson-prefix"; version = "0.1.0.2"; - sha256 = "4ba024dfcad59a90319eedf5d0a61e427fda29c3f0d3c2369ed1ad8790327ef9"; + sha256 = "1yby6a88gbfikqvc5lzhqclxlzs23skd1xgdkqqr16nmrbgj982b"; libraryHaskellDepends = [ aeson base mtl text unordered-containers vector ]; @@ -20662,7 +21484,7 @@ self: { mkDerivation { pname = "aeson-pretty"; version = "0.7.2"; - sha256 = "6408b8b2bcd12cf591e4b93b4d9f5143449b33a59fbd3653f328e2515040570d"; + sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20683,8 +21505,8 @@ self: { }: mkDerivation { pname = "aeson-pretty"; - version = "0.8.2"; - sha256 = "6cb429821040bdd6f819b1c6170cac630a4155fa57fa24eb3d496c06030fb9b0"; + version = "0.8.5"; + sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20706,8 +21528,8 @@ self: { }: mkDerivation { pname = "aeson-qq"; - version = "0.8.1"; - sha256 = "2dcd2392902baac446e317621df509b09db9dca9b8c9187e53701226f18013fd"; + version = "0.8.2"; + sha256 = "0ln13jqyfh5726hdrk1rad9a6cgrrj201plmwcfcpvq18v4m5ckd"; libraryHaskellDepends = [ aeson attoparsec base base-compat haskell-src-meta parsec scientific template-haskell text vector @@ -20716,7 +21538,7 @@ self: { aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec parsec scientific template-haskell text vector ]; - homepage = "http://github.com/zalora/aeson-qq"; + homepage = "https://github.com/sol/aeson-qq#readme"; description = "JSON quasiquoter for Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -20729,7 +21551,7 @@ self: { mkDerivation { pname = "aeson-quick"; version = "0.1.1.2"; - sha256 = "e666a7f2caad674fa95774beebacb4a8edd8bb0801b30aa7ac77904221b8372c"; + sha256 = "0b1pp0hl543pmjkhmcq112xxivd8njnfpgklayllyrxdrbrafrp6"; libraryHaskellDepends = [ aeson attoparsec base deepseq text unordered-containers vector ]; @@ -20754,9 +21576,9 @@ self: { mkDerivation { pname = "aeson-schema"; version = "0.4.1.1"; - sha256 = "30e95de2018a74ba0883f681723a0797d08c52b73433e5f70e86c71ad64abcc5"; + sha256 = "1idw9bb1miw61vvyacrlnx98rl4p0wx750gnhc4blx4a07i5vs9h"; revision = "1"; - editedCabalFile = "8eaab2581d0f6108befe4112cd0749876e14670ebebcff228f07985c508589e6"; + editedCabalFile = "1rl9hm85r607iwigzg5y1rki8vl7943ws4j1zsz0hq8g3mcb5alf"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -20779,7 +21601,7 @@ self: { mkDerivation { pname = "aeson-serialize"; version = "0.0.0"; - sha256 = "a1e0ee1a8db3f00c990e20b1015644dfaec76772966a54716c4fcc58ea5f1404"; + sha256 = "010lbzm5ik2gdiqm8slnf9kwgbnz8ib03c901schrw5kildfxq51"; libraryHaskellDepends = [ aeson base cereal ]; testHaskellDepends = [ aeson base cereal hspec HUnit ]; description = "Simple serialization functions for aeson types"; @@ -20793,7 +21615,7 @@ self: { mkDerivation { pname = "aeson-smart"; version = "0.2.0.0"; - sha256 = "6538a6f8226c5899a19914fdaa0e1904c58377e1b95465ed9ada9e66a63062e4"; + sha256 = "1r3262k6d7nskbnnam5rw5vq7i84347amz8lk6hrjn3c4bwacf35"; libraryHaskellDepends = [ aeson base data-default template-haskell text unordered-containers vector @@ -20811,7 +21633,7 @@ self: { mkDerivation { pname = "aeson-streams"; version = "0.1.0"; - sha256 = "45a057c36b0783fcf39e1916bcda71e22c1309bb9308d08e5bdfb92c378db3d6"; + sha256 = "1mmkilvjrffzbf7d024kpc4i6b72f7dbq5hrkvrzr0q7dg1mg825"; libraryHaskellDepends = [ aeson attoparsec base bytestring HsOpenSSL http-streams io-streams ]; @@ -20828,7 +21650,7 @@ self: { mkDerivation { pname = "aeson-t"; version = "0.0.5"; - sha256 = "6d4e1764a676d7958219a82341682888db39ca4b437b24e7aa7791a7bb9cf8d6"; + sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd"; libraryHaskellDepends = [ aeson base bytestring text unordered-containers vector ]; @@ -20847,7 +21669,7 @@ self: { mkDerivation { pname = "aeson-toolkit"; version = "0.0.1"; - sha256 = "83323407652dab284537d49269f9c2460344a7d66f985f30e8c454fe89238b1d"; + sha256 = "07cb4f4zwm64x0q5z63gsskl80s6qbwnk4nl6x2jiardcl3k8cl3"; libraryHaskellDepends = [ aeson base bytestring failure text ]; testHaskellDepends = [ base hspec ]; description = "A generalization of Aeson over Failure"; @@ -20861,9 +21683,9 @@ self: { mkDerivation { pname = "aeson-utils"; version = "0.3.0.2"; - sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f"; - revision = "4"; - editedCabalFile = "48548049168c1e48d31414994dcea638dec56dba620c1752b41d4fa975b7020e"; + sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi"; + revision = "5"; + editedCabalFile = "0v6p99nb8s61lc07a93xv94lfb4ybmv8aiqjq77lncs6qgpp97xf"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -20872,16 +21694,17 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific - , success, text, unordered-containers, vector + ({ mkDerivation, aeson, base-prelude, json-pointer + , json-pointer-aeson, mtl-prelude, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.11.4"; - sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e"; + version = "0.12.2"; + sha256 = "1hyw3338wiv3p3p0fnwzmdhds239bzkpqvqjjfdnmygi0nql8nnf"; libraryHaskellDepends = [ - aeson base-prelude mtl-prelude scientific success text - unordered-containers vector + aeson base-prelude json-pointer json-pointer-aeson mtl-prelude + scientific text transformers unordered-containers vector ]; homepage = "https://github.com/sannsyn/aeson-value-parser"; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; @@ -20893,7 +21716,7 @@ self: { mkDerivation { pname = "aeson-yak"; version = "0.1.1.1"; - sha256 = "68eaed01e8d928870dc8c3f3530a3c77aaf8ef1bec86928f2382b9e0af81a260"; + sha256 = "0q52h6py1fc24f7r51pc3gpziakp7h557wy3r06qfa6rx00yvsk8"; libraryHaskellDepends = [ aeson base ]; homepage = "https://github.com/tejon/aeson-yak"; description = "Handle JSON that may or may not be a list, or exist"; @@ -20903,16 +21726,17 @@ self: { "affection" = callPackage ({ mkDerivation, babl, base, clock, containers, gegl, glib - , monad-loops, mtl, sdl2, text + , monad-loops, monad-parallel, mtl, sdl2, text }: mkDerivation { pname = "affection"; - version = "0.0.0.5"; - sha256 = "4d5f2d6257d6dcb6fe7b1658bead8e0c48451414d434d44e5492709b81ac43e7"; + version = "0.0.0.6"; + sha256 = "0fc071zl68acm01ik4v1admy0hs4jp787kpadw9ddavwykmr6jdz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - babl base clock containers gegl glib monad-loops mtl sdl2 text + babl base clock containers gegl glib monad-loops monad-parallel mtl + sdl2 text ]; homepage = "https://github.com/nek0/affection#readme"; description = "A simple Game Engine using SDL"; @@ -20927,7 +21751,7 @@ self: { mkDerivation { pname = "affine-invariant-ensemble-mcmc"; version = "0.2.0.0"; - sha256 = "65ee8788c39b1c054bf345fb914e3543b7f3209f63796f4bf21d58e27eb2d484"; + sha256 = "116ln9zf4n0xy95nyyb3kwhg7ds36m793ys5yd5ha74vqf48gvk5"; libraryHaskellDepends = [ base containers mwc-random primitive split vector ]; @@ -20937,6 +21761,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "affinely-extended" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "affinely-extended"; + version = "0.1.0.0"; + sha256 = "1bldljkgsb9v7ss3l87mm4r9wjpp3z02hjnfdnp84pmaj0b34vam"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/clintonmead/affinely-extended"; + license = stdenv.lib.licenses.mit; + }) {}; + "afis" = callPackage ({ mkDerivation, base, byteable, bytestring, crypto-random , cryptohash, HUnit, mtl, packer, QuickCheck, test-framework @@ -20945,7 +21780,7 @@ self: { mkDerivation { pname = "afis"; version = "0.1.2"; - sha256 = "c9b1e505b0451b3050ee05af15c26462d38b2544f37df03ee3e37fcd571ef85e"; + sha256 = "0ppq3rbwszz3wczg0zgk8hjqplv2ck11bbq5xr8306s5n02ybcf9"; libraryHaskellDepends = [ base byteable bytestring crypto-random cryptohash packer ]; @@ -20966,7 +21801,7 @@ self: { mkDerivation { pname = "afv"; version = "0.1.1"; - sha256 = "7307e0613e15bc8c6c5fc2354931a181cd524ee69f4c85bf87f2465fcbede21a"; + sha256 = "06p2xp5myipjhyzqak4zwr755kc1l4qljdf2bxn8rg0m7rhy01vk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -20983,7 +21818,7 @@ self: { mkDerivation { pname = "ag-pictgen"; version = "1.0.0.0"; - sha256 = "3afe523fe3beae494e274e21258f8d69abb1d228f207fd1e286b8d23180bb97c"; + sha256 = "0z5r1cc273bb50ggs1zj539b3av9in7ja8af4x74kbmywczm5zis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers uuagc uulib ]; @@ -21000,7 +21835,7 @@ self: { mkDerivation { pname = "agda-server"; version = "0.1.1"; - sha256 = "ea5d9712aaff8c4d1779e8eb8b1aa4c4c41073c0026a1aae8ef3ab3cfdd71d1c"; + sha256 = "070xszykrazkisp1lsh2q1ri1i64lhd8psz8g4blv37zm899fpga"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -21018,8 +21853,10 @@ self: { }: mkDerivation { pname = "agda-snippets"; - version = "2.5.1"; - sha256 = "9dd2d5fe077df8e6f6af96615e653a4d147e4e51429f022fd69451054b2056d6"; + version = "2.5.2"; + sha256 = "1bfjbxgmy0nxfjcsqqp4snshmx3ka7rjij4pdw46ax6jlsap2w1f"; + revision = "1"; + editedCabalFile = "1lyagh0psry89lh7j8r7gq9ar1a4zgs75mdfrm40wym9h3hcwm1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21038,8 +21875,8 @@ self: { }: mkDerivation { pname = "agda-snippets-hakyll"; - version = "0.1.2.1"; - sha256 = "9f9b2e72b7c2d0aeed1cc8255c50464915f78665ae8c61e8466567ac22d3b6cf"; + version = "0.1.2.2"; + sha256 = "1bwia22d78wjm33vhsxrx5jchcjvqwl95d1ikkhm9dhraba38z1h"; libraryHaskellDepends = [ agda-snippets base directory filepath hakyll network-uri pandoc pandoc-types @@ -21059,7 +21896,7 @@ self: { mkDerivation { pname = "agentx"; version = "0.2.0.0"; - sha256 = "e61dc3994aaf70cf8823064d56e839ee1af18ae6be30e294214f759064ccb65e"; + sha256 = "0pmnrij90xag46af4c5yws5g26pf77l5ck864f4cyw5g9acw67g6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21077,7 +21914,7 @@ self: { mkDerivation { pname = "agum"; version = "2.6"; - sha256 = "35ce62ef518591fb1f81f9a17b420b7bc629f9b0c58fe950973d9fb72da758c8"; + sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -21087,12 +21924,17 @@ self: { }) {}; "aig" = callPackage - ({ mkDerivation, base, base-compat, mtl, QuickCheck, vector }: + ({ mkDerivation, base, base-compat, mtl, QuickCheck, tasty + , tasty-ant-xml, tasty-quickcheck, vector + }: mkDerivation { pname = "aig"; - version = "0.2.4"; - sha256 = "ac0e06a707b7488de7e1f9d7b123703e2df14763f9e6448d67c4dd20ffdc88eb"; + version = "0.2.5"; + sha256 = "115rp0iymwnvd69ymp9kdvc812axrgn2qzwqnqlx4gpn05wh8brr"; libraryHaskellDepends = [ base base-compat mtl QuickCheck vector ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-ant-xml tasty-quickcheck + ]; description = "And-inverter graphs in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21104,7 +21946,7 @@ self: { mkDerivation { pname = "air"; version = "2015.5.4"; - sha256 = "5271aa9bed499454943c1d645feb2bb715bc07dc5b5f556bbb38ce0abbfe3fbd"; + sha256 = "1g9zzsxhmkiqpdmmapsvvh3vq5dp5gmmyr0x7ja59529xndslwaj"; libraryHaskellDepends = [ array base bytestring containers directory filepath mtl text time ]; @@ -21120,7 +21962,7 @@ self: { mkDerivation { pname = "air-extra"; version = "2015.5.4"; - sha256 = "2735bb2762eede3bb36ef4f1dccb694d0fe1aa4c3c1c941bc045ce94a50f601e"; + sha256 = "07k01yjr9kj5q0dr871w9jmf23sdd75xrwgldsrkpppfc8kvnd97"; libraryHaskellDepends = [ air array base bytestring containers directory filepath parallel parsec regexpr text time @@ -21135,7 +21977,7 @@ self: { mkDerivation { pname = "air-spec"; version = "2013.7.1"; - sha256 = "dd71db18db9240ff30fefb4ed16b82d9acf97d859696fcfa6fde555b00129e68"; + sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx"; libraryHaskellDepends = [ base hspec text ]; homepage = "https://github.com/nfjinjing/air-spec"; description = "air spec helper"; @@ -21147,7 +21989,7 @@ self: { mkDerivation { pname = "air-th"; version = "2014.11.17"; - sha256 = "f892a115f7af4326aeba6629e928b59d5cba97a77add7d8fce9447beb1291766"; + sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq"; libraryHaskellDepends = [ air base template-haskell ]; homepage = "https://github.com/nfjinjing/air-th"; description = "air"; @@ -21164,7 +22006,7 @@ self: { mkDerivation { pname = "airbrake"; version = "0.2.0.0"; - sha256 = "18ea70dab5f581154e659b4d6959893505561dc437c21da496136ddeb284e50f"; + sha256 = "03z5hjrdwv8kjsj1vhipqhfmc19mi5cnjkcvcm71b0gmnpd71shq"; libraryHaskellDepends = [ base blaze-markup bytestring directory exceptions filepath http-conduit monad-control network semigroups template-haskell text @@ -21188,7 +22030,7 @@ self: { mkDerivation { pname = "airship"; version = "0.6.0"; - sha256 = "e4ca2be5c5dfcd51dfd95449b108ed9bb463b3fdeae45449ecba9f8271051fd6"; + sha256 = "1mhz0mqq57xsxi4m9r7aznrn7d4vxl4b2jalv7gm3kfzqpjjpjp4"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring bytestring-trie case-insensitive containers cryptohash directory @@ -21212,8 +22054,8 @@ self: { }: mkDerivation { pname = "airtable-api"; - version = "0.2.0.1"; - sha256 = "e17565f18a0ecee13f9650a350f4731e20a21df03c350a8aa6bfe30b37233230"; + version = "0.3.2.4"; + sha256 = "0fnykbknnsj97xmk3h81633h11hlq3i8356y3snkavp683p26i7l"; libraryHaskellDepends = [ aeson base bytestring hashable lens text time unordered-containers wreq @@ -21225,66 +22067,68 @@ self: { }) {}; "aivika" = callPackage - ({ mkDerivation, array, base, containers, mtl, random, vector }: + ({ mkDerivation, array, base, binary, containers, deepseq, mtl + , mwc-random, random, vector + }: mkDerivation { pname = "aivika"; - version = "5.0.1"; - sha256 = "ec5dd90074c05a947f3c1506fb58d7ab0eae497b31c2bba9641c9ff3cbf5ca57"; + version = "5.2"; + sha256 = "19d9bshjf5sivgzcbb0yl00i1z1kq3jr6xr7gddikh9wl0flnp9r"; libraryHaskellDepends = [ - array base containers mtl random vector + array base binary containers deepseq mtl mwc-random random vector ]; - homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; license = stdenv.lib.licenses.bsd3; }) {}; "aivika-branches" = callPackage ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , random + , mwc-random, random }: mkDerivation { pname = "aivika-branches"; - version = "0.1.3"; - sha256 = "d14dac2f3d59a8e51acf4eb078e67910cbf4c52f5acc91f54af6431618f41fb3"; + 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/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; "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.3.1"; - sha256 = "e5db4e1da578aa873d1777a82ce3ab84af8fc58cc55ac76d19835bb4e004e852"; + 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/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; "aivika-experiment" = callPackage - ({ mkDerivation, aivika, base, containers, directory, filepath, mtl - , network-uri, parallel-io, split + ({ mkDerivation, aivika, aivika-transformers, base, containers + , directory, filepath, mtl, network-uri, parallel-io, split }: mkDerivation { pname = "aivika-experiment"; - version = "4.0.3"; - sha256 = "fb9fabcb770b87bbd4bcf1da33172c8e3e548ce12be6ddeb58076d55e7191dec"; + version = "5.0"; + sha256 = "1bcmkpzdmca0xcnvmbvsb5g0gsrxbrhf7lc3nig472w0pxa0xhg9"; libraryHaskellDepends = [ - aivika base containers directory filepath mtl network-uri - parallel-io split + aivika aivika-transformers base containers directory filepath mtl + network-uri parallel-io split ]; - homepage = "http://github.com/dsorokin/aivika-experiment"; + homepage = "http://www.aivikasoft.com"; description = "Simulation experiments for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21295,13 +22139,13 @@ self: { }: mkDerivation { pname = "aivika-experiment-cairo"; - version = "4.3.1"; - sha256 = "ab5df1225bb9a35c14fe06e32a04249b945448172649ca5f2893294097d6a45c"; + version = "5.0"; + sha256 = "1ybynnr9yiv9vi3v1zww9hlf7klm6kggs56basgpn7lzv5qdaz07"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-cairo ]; - homepage = "http://github.com/dsorokin/aivika-experiment-cairo"; - description = "Cairo backend for the Aivika simulation library"; + homepage = "http://www.aivikasoft.com"; + description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21312,13 +22156,13 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "4.3.2"; - sha256 = "819e5f3d0c36cddf108979c816ee96fbe8da54d097939971501677cdabd2bed9"; + version = "5.0"; + sha256 = "0hmdb6bk8iy3y4dq5pkf1yqwgxl3mjyhl4lqjj0pz24bxxwlg33z"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split ]; - homepage = "http://github.com/dsorokin/aivika-experiment-chart"; + homepage = "http://www.aivikasoft.com"; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21329,62 +22173,79 @@ self: { }: mkDerivation { pname = "aivika-experiment-diagrams"; - version = "4.3.1"; - sha256 = "f664ee412a4ba768532953372a00fad17ffe3dad99a5a5dd785c59c916218bde"; + version = "5.0"; + sha256 = "013l4zp8pxz34xjkl7q9hwy4sk75k8gdwhg5kc5hsmw9nm47xa72"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-diagrams containers filepath ]; - homepage = "http://github.com/dsorokin/aivika-experiment-diagrams"; - description = "Diagrams backend for the Aivika simulation library"; + homepage = "http://www.aivikasoft.com"; + description = "Diagrams-based charting backend for the Aivika simulation library"; + 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.1.1"; - sha256 = "6867ddbe564dbf99a5bc4acd942896068f2953de28efe86a02a638dc6450e1d7"; + 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/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; license = stdenv.lib.licenses.bsd3; }) {}; "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.1.2"; - sha256 = "fb60a9126563c09f44e915991f655cb062807deb3c8a51892d6bfba97d30de7a"; + 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/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Soft real-time simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; "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.0.1"; - sha256 = "7a4e0088489642819513ab9acc0e05ab2ec94e4fddf5ac2df519740e7d7333d9"; + 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/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21398,7 +22259,7 @@ self: { mkDerivation { pname = "ajhc"; version = "0.8.0.10"; - sha256 = "1a5ee944f7717d8fbbfb2cb33a4531aac0b2e776c44478006bf13cef1f6059f4"; + sha256 = "1x2rc0gyyg7idc07hi64fvkv5h5a652kmcrczfxqyzbiyx2fjphs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21422,7 +22283,7 @@ self: { mkDerivation { pname = "al"; version = "0.1.4.1"; - sha256 = "30e58c4459630e669c1029afe845f5fa9e33b140fc4983f5d086cec41850b3d6"; + sha256 = "1mmka0cc9kl6s3sq6jgw82qk77psym2yibr922f6c3k3b528rr9h"; libraryHaskellDepends = [ base mtl ]; libraryPkgconfigDepends = [ openal ]; libraryToolDepends = [ c2hs ]; @@ -21437,7 +22298,7 @@ self: { mkDerivation { pname = "alarmclock"; version = "0.4.0.2"; - sha256 = "a84c412ac9ded121d1916ce05c9b5e33e35d0fdba1ae86a8202021ff1b28e91c"; + sha256 = "077950dzy89042l8dbm1vc7mvqrkbsdmrq3cj78j3lfyr4m42k58"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -21451,7 +22312,7 @@ self: { mkDerivation { pname = "alea"; version = "0.5.2.0"; - sha256 = "093cf33b6f3127cbb49ccfc6ad11183a4ef48b302fdb5771190eb497f0f9cb4f"; + sha256 = "0kybz7q9gd0f35qmgnrg625z8kis308svingkjscn9ridwxz6g09"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -21462,16 +22323,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "alerta" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, containers + , data-default, http-api-data, http-client, servant, servant-client + , servant-server, text, time + }: + mkDerivation { + pname = "alerta"; + version = "0.1.0.4"; + sha256 = "107qdab0wag38qj5j5wl0r3zp7zyhm2zj3c12zmksq4g5bzki8cb"; + libraryHaskellDepends = [ + aeson aeson-pretty base containers data-default http-api-data + http-client servant servant-client servant-server text time + ]; + 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 - ({ mkDerivation, array, base, containers, directory, happy, process - , QuickCheck + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, happy, process, QuickCheck }: mkDerivation { pname = "alex"; version = "3.2.1"; - sha256 = "a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c"; + sha256 = "0v0f4fvb6gqjrxq6k3r7qxjwy2m9462c92vpbidawkwzfbnggrx4"; + revision = "1"; + editedCabalFile = "1nl05l0dkai8i9x9fx288ka010hp6yhy3dmvfhjkqpfakimfcs1s"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; executableHaskellDepends = [ array base containers directory QuickCheck ]; @@ -21489,7 +22372,7 @@ self: { mkDerivation { pname = "alex-meta"; version = "0.3.0.9"; - sha256 = "d933ff9ee92f2372bebef64c1780e20e8ff8bbbde6d53749c2b0892364ba0221"; + sha256 = "0882p9j272dhq94kgmg6pnxzi3qfwa01fk7npsz748rgx6ggycyr"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -21503,8 +22386,8 @@ self: { ({ mkDerivation, base, deepseq, template-haskell, text }: mkDerivation { pname = "alex-tools"; - version = "0.1.1.0"; - sha256 = "c0a1c33e24955a7e2536ef5ad7614b227523330ed4c68724fda47ba4ba368d86"; + version = "0.2.0.0"; + sha256 = "0vhqq8d138hgjas6697pwzij6wqc9pn8ix64bs17mhiyq3ygmyvg"; libraryHaskellDepends = [ base deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; @@ -21517,9 +22400,9 @@ self: { mkDerivation { pname = "alfred"; version = "0.5"; - sha256 = "76bbd427610242c87a94f65cbaabb8350d307f78d09f6e8c569327f14c99cab0"; + sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn"; revision = "1"; - editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581"; + editedCabalFile = "10b5gn9rs3d7p685iak2idgdm2h1z7lx4w6zaaad5hrgcyxbkr06"; libraryHaskellDepends = [ aeson base bytestring hexpat http-conduit http-types network-uri text xmlgen @@ -21538,7 +22421,7 @@ self: { mkDerivation { pname = "alga"; version = "0.2.2"; - sha256 = "3e90507199b1eb960bdad6bf6a531068cc60898d1fa289d52fa230500ee920f2"; + sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21567,7 +22450,7 @@ self: { mkDerivation { pname = "algebra"; version = "4.3"; - sha256 = "394c839f094d0b2f41ea95a87e9a0bd1831657020b9d7c9fa87f4e97fca6c1c0"; + sha256 = "1h61lvy9fkkzm2gpr78b09bid0yi1fd7xa4mx90jy2sd16gq6k1r"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void @@ -21584,7 +22467,7 @@ self: { mkDerivation { pname = "algebra-dag"; version = "0.1.1.1"; - sha256 = "c92be90690f1ae2b0ae2a49c054007721db98afd025120025f23d863e45a26df"; + sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9"; libraryHaskellDepends = [ aeson base containers fgl mtl parsec template-haskell transformers ]; @@ -21601,7 +22484,7 @@ self: { mkDerivation { pname = "algebra-sql"; version = "0.3.0.0"; - sha256 = "f23f5dee89beaef9211eb245fe9310c71fbfaa86fa7ad324e7cad71e274e75f3"; + sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21624,7 +22507,7 @@ self: { mkDerivation { pname = "algebraic"; version = "0.1.0.2"; - sha256 = "905b4727b737349d9754059cd7dd3d729ab8d34913b46532304980bf1337fb95"; + sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh"; libraryHaskellDepends = [ accelerate base ]; homepage = "https://github.com/wdanilo/algebraic"; description = "General linear algebra structures"; @@ -21637,19 +22520,35 @@ self: { mkDerivation { pname = "algebraic-classes"; version = "0.7.1"; - sha256 = "2c7f14f25fad0fa316de29fa34fbb73ca61e1a7b4aa9f79a8c437abe3f1e1770"; + sha256 = "0w0p3qzvwyj3ijdggaaagcd1x9iwnzxk9yi9vqba63xdbzr18zrc"; libraryHaskellDepends = [ base syb template-haskell ]; homepage = "https://github.com/sjoerdvisscher/algebraic-classes"; description = "Conversions between algebraic classes and F-algebras"; license = stdenv.lib.licenses.bsd3; }) {}; + "algebraic-graphs" = callPackage + ({ mkDerivation, array, base, containers, criterion, extra + , QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.0.4"; + sha256 = "1d8f92vlq7j0k578qkx92ffavwjxmdry8zncjm0vmvkl3nb4i4zm"; + libraryHaskellDepends = [ array base containers ]; + testHaskellDepends = [ base containers extra QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion ]; + homepage = "https://github.com/snowleopard/alga"; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { pname = "algebraic-prelude"; version = "0.1.0.1"; - sha256 = "8bb052b29571d4c07c03d14eb17f9d302f18e619bbe743509b9ec6e4fde2192d"; + sha256 = "0b8rwbyy9ilykd847rxv37k1hbrhkmzv2kni0dyc1m3ijnr55c4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21668,7 +22567,7 @@ self: { mkDerivation { pname = "algo-s"; version = "0.1.0.0"; - sha256 = "bcc19378479a54e8c6604f5805d4b7bfb11de264c51e021c1ef099dc39021443"; + sha256 = "0hql08wxr6gh3qf047n5cki1vcdznza0an2gc33fhm4s8xw97hdw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21691,7 +22590,7 @@ self: { mkDerivation { pname = "align"; version = "0.1.1.2"; - sha256 = "093b9727c3f485035efb0467a5e612034b7a75ae7a086adb1ca6a87790e967af"; + sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9"; libraryHaskellDepends = [ base containers transformers vector ]; description = "Sequence alignment algorithms"; license = stdenv.lib.licenses.bsd3; @@ -21702,7 +22601,7 @@ self: { mkDerivation { pname = "align-text"; version = "0.1.0.1"; - sha256 = "02ca5c06d069f641427cc3a8885f60845c147b27125137e5425cc0d869a2c8ee"; + sha256 = "1vn8l9lxih2w8bjkfl8j4xxi8p44c1gqia63gi143xk9s035rjh2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base optparse-applicative text ]; @@ -21717,7 +22616,7 @@ self: { mkDerivation { pname = "aligned-foreignptr"; version = "0.1"; - sha256 = "00b0e740cc0e79f4c8cc33b5bc4f898f64529e54ba5cefd25380113011b8b642"; + sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "An aligned ForeignPtr type"; @@ -21729,7 +22628,7 @@ self: { mkDerivation { pname = "allocated-processor"; version = "0.0.2"; - sha256 = "b504c33e889f4888ba3ad22ac31fa794cfd6c848991e96dacb568b93001e1f4a"; + sha256 = "0jhz3q0972snrgd9c7lr934ddkwllwgw6anj7ax8hj4zi0zc615m"; libraryHaskellDepends = [ base vector-space ]; description = "Functional combinators for monadic actions that require allocation and de-allocation"; license = stdenv.lib.licenses.bsd3; @@ -21740,7 +22639,7 @@ self: { mkDerivation { pname = "alloy"; version = "1.2.2"; - sha256 = "f0a389f7008687b6244b7d6bb5598e1d0bd1e089c96c7a45cfc0f0160feac343"; + sha256 = "0hy3x87idw60rx2plv69i7hd22qxircvasvx9cjbd1w603vqk8zh"; libraryHaskellDepends = [ base containers mtl syb vector ]; description = "Generic programming library"; license = stdenv.lib.licenses.bsd3; @@ -21751,7 +22650,7 @@ self: { mkDerivation { pname = "alloy-proxy-fd"; version = "1.0.0"; - sha256 = "5ce651ee340400ceee7c1f6bfc56473f31269ea3e5e1974eb18002679b2f13ba"; + sha256 = "1fhk5ydnf0l0n579gqg5lfg2cc9z8xbgqsqzgkpcw0046kp53rjw"; libraryHaskellDepends = [ alloy base mtl ]; description = "Some add-on instances for the Alloy library"; license = stdenv.lib.licenses.bsd3; @@ -21762,7 +22661,7 @@ self: { mkDerivation { pname = "almost-fix"; version = "0.0.2"; - sha256 = "20597d015fe9b6bb6bfcb0eaee3eb58b28e38a1f4f43049ad0aeebcc6409a70f"; + sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90"; libraryHaskellDepends = [ base ]; description = "Recurse while a predicate is satisfied"; license = stdenv.lib.licenses.bsd3; @@ -21777,7 +22676,7 @@ self: { mkDerivation { pname = "alms"; version = "0.6.7"; - sha256 = "b7aa2734042296ad0d3bf1fb0b49b1b81a59aad372b15fd415b6892e6f9e2cf6"; + sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -21799,7 +22698,7 @@ self: { mkDerivation { pname = "alpha"; version = "1.0.15"; - sha256 = "09d8dcaeb8fa8d25a7c10215773039963d824f92897051fc7b9d9533bd9c82bd"; + sha256 = "1gc2kjyk75cxggy52w49j97q4gcn74q7f582q6kjb3gsp2pdrn09"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -21820,7 +22719,7 @@ self: { mkDerivation { pname = "alphachar"; version = "0.0.1"; - sha256 = "3b0e0f756de147603602b45e8d5018abd705d3a4c73ca662f306daec65e7b75d"; + sha256 = "0pdpwxjyrnh6ydiacg67lk9hbmxb3188spml08v60iz1dmshy3iv"; libraryHaskellDepends = [ base lens parsers ]; testHaskellDepends = [ base directory doctest filepath parsec QuickCheck template-haskell @@ -21839,7 +22738,7 @@ self: { mkDerivation { pname = "alpino-tools"; version = "0.2.0"; - sha256 = "39986d30c2afa423bb9f024001506ca44678611ce257cc8188652a7769ae00ea"; + sha256 = "1sh0mrlpfak5i20wqmz23ihphim4di802h02kyxj795gq8q6v61r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21862,7 +22761,7 @@ self: { mkDerivation { pname = "alsa"; version = "0.4"; - sha256 = "af2623551cf94a07ad53a263bdf63c6f14d24da88c5533050a869fca4584b67d"; + sha256 = "0zdnhi2wm7w6182k6mccm16x453g7kvbsqx2afnhfjpr3iaj69mg"; libraryHaskellDepends = [ array base extensible-exceptions sample-frame ]; @@ -21878,12 +22777,13 @@ self: { mkDerivation { pname = "alsa-core"; version = "0.5.0.1"; - sha256 = "eb50495ef05ecc7c06a0147da7f0d3efde832a44d23caaf5172dc114882270ab"; + sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b"; libraryHaskellDepends = [ base extensible-exceptions ]; libraryPkgconfigDepends = [ alsaLib ]; homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = stdenv.lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage @@ -21893,7 +22793,7 @@ self: { mkDerivation { pname = "alsa-gui"; version = "0.1"; - sha256 = "dafec5f40b61a4a903260e3b7908921d5dd792fc6dac1849305243d926939e7d"; + sha256 = "0zcyjckdjhsj614iib3dzj9dfp8xj847jfqf4q1sk9311gscbzns"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -21912,7 +22812,7 @@ self: { mkDerivation { pname = "alsa-midi"; version = "0.4.0.1"; - sha256 = "c3cb39ff34f83b54a7c3273b76471ca8d9376c525f38e36de386c31ccd18acb6"; + sha256 = "1dmc336irhw6wdny6f2za9n3gnd83i3pcfr7qfkm8fzq6kzkkjy3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21931,13 +22831,14 @@ self: { mkDerivation { pname = "alsa-mixer"; version = "0.2.0.3"; - sha256 = "f76deb4081a2ce4a765e78a017b2e13c073d2aaa5a2d2652fd5e635dd169cf8d"; + sha256 = "13fgd78msqsyzm92cbasm8m3s1rww6r1g83qbrv4mkm2h50fnvgp"; libraryHaskellDepends = [ alsa-core base unix ]; librarySystemDepends = [ alsaLib ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/ttuegel/alsa-mixer"; description = "Bindings to the ALSA simple mixer API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -21947,7 +22848,7 @@ self: { mkDerivation { pname = "alsa-pcm"; version = "0.6.0.4"; - sha256 = "9aae1379903b8445073f8a2b6ccf86b904b4045247747516530a165a3f76ca2a"; + sha256 = "0anafqzml5haacb7ax27a82b815rhv7nqawa7w3lb11vj1wi7bls"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21958,6 +22859,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -21965,7 +22867,7 @@ self: { mkDerivation { pname = "alsa-pcm-tests"; version = "0.1"; - sha256 = "330806eac691a87340d3ba43d1b1b402b65acd2a2db27f92281acb308e9319ae"; + sha256 = "1bhrjf731jqs5297zcid5b6mmdh2njqx2hxssd077a4iqvm0c21k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa base ]; @@ -21982,7 +22884,7 @@ self: { mkDerivation { pname = "alsa-seq"; version = "0.6.0.7"; - sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778"; + sha256 = "0y5pw2qsga19l79pmmrxc3m7w60yrw9scl9bb71z1alk97ia3k86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21993,6 +22895,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -22000,7 +22903,7 @@ self: { mkDerivation { pname = "alsa-seq-tests"; version = "0.1"; - sha256 = "fa00a082bc210dff36d7eb33a06a9f6a701ba43805d2487fa93fabea1b0f4147"; + sha256 = "0is11wdymarzm5zlilh572j1nw3akxma0czbswvgy391pj1a007s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa base ]; @@ -22014,7 +22917,7 @@ self: { mkDerivation { pname = "altcomposition"; version = "0.2.3.0"; - sha256 = "35fbf66ebc949163977f3894e12bdd83c563b24a317684fd6ead48093a338cc9"; + sha256 = "1jcc6cx0jj5ddvyq8xii9ar67ic3vlmy351qgybn74clpipgdyrm"; libraryHaskellDepends = [ base composition ]; homepage = "https://github.com/jcristovao/altcomposition"; description = "Alternative combinators for unorthodox function composition"; @@ -22026,7 +22929,7 @@ self: { mkDerivation { pname = "alternative-extra"; version = "0.1.0.0"; - sha256 = "896aadd55ce70bbd339838596878eae9fabf469dc46d383e96036234e096ced0"; + sha256 = "1l6fjvh38qh3jqz3hvf4km3bzyp9x9w6hn9qk0rvs2z7bkasssl9"; libraryHaskellDepends = [ base ]; description = "Extra utilities for alternatives"; license = stdenv.lib.licenses.bsd3; @@ -22039,9 +22942,9 @@ self: { mkDerivation { pname = "alternative-io"; version = "0.0.1"; - sha256 = "90e98870a6117db09f1ce54c025944a174e643d1149d5ee76782c311d9ba1e06"; + sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch"; revision = "2"; - editedCabalFile = "08531a3a2f2c8e6c4d44a1b201feb1ec354332f75e39d635318d8f6e31e5f15a"; + editedCabalFile = "0npiwlqnx3wd64sxcfayywr46dgcn7z03cm18i6nr3ic5wx1llq8"; libraryHaskellDepends = [ base lifted-base monad-control transformers transformers-base ]; @@ -22054,8 +22957,8 @@ self: { ({ mkDerivation, base, mmorph, transformers }: mkDerivation { pname = "alternators"; - version = "0.1.1.0"; - sha256 = "f95d9a4826c57194e2a22e41a9f0eaef0e96cf95f6372179aa7c47bc3ca8f627"; + version = "0.1.1.1"; + sha256 = "03ivs1iwqgyf5slhyv0alkvik3jn49dqbhqs1vi4h9gwdc9d8l4n"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/louispan/alternators#readme"; description = "Handy functions when using transformers"; @@ -22067,7 +22970,7 @@ self: { mkDerivation { pname = "altfloat"; version = "0.3.1"; - sha256 = "88aa9ab42a196bcb405a86fc3512910ad2920aa00571fa3439577d19e8eb15d8"; + sha256 = "1n0mxgl1jzap74sglw85l0595lhaj493bz46b90cnsqr5as9mal8"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; homepage = "http://repo.or.cz/w/altfloat.git"; description = "Alternative floating point support for GHC"; @@ -22080,7 +22983,7 @@ self: { mkDerivation { pname = "alure"; version = "0.1"; - sha256 = "16ed602e80594f59851fc50df8dc31477a3b7f1914335a53a263bfd530e234db"; + sha256 = "1nrlw8qdbgv3l99mlcql35zknyj767fgh3f53y2mjksrh0p61v8n"; libraryHaskellDepends = [ base OpenAL ]; librarySystemDepends = [ alure ]; description = "A Haskell binding for ALURE"; @@ -22096,7 +22999,7 @@ self: { mkDerivation { pname = "amazon-emailer"; version = "0.4.0.0"; - sha256 = "bdff0ca31dc36a29dc59a8de81c7deeb04211ed7a1eb817a7fd27cb6b0091569"; + sha256 = "0s8m16qbcz6jgxx83sx1swg2217bvv3q3pm8b7f2jsn33nihrzxx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -22115,7 +23018,7 @@ self: { mkDerivation { pname = "amazon-emailer-client-snap"; version = "0.1.1.1"; - sha256 = "6b6a15b0116dea99f3af40a7e607d40e3e8179e5d619e2646a5c60a6be2d550d"; + sha256 = "03am5nzacq2wd9jf46fnwmwq2ghfsh3yd9s0mzrrkskd26q1askb"; libraryHaskellDepends = [ base mtl snap snaplet-postgresql-simple text ]; @@ -22134,7 +23037,7 @@ self: { mkDerivation { pname = "amazon-products"; version = "0.1.0.1"; - sha256 = "541f661a0c501beb045320734e3180735a02e1803d5e740898def4bfc632c883"; + sha256 = "10y86b3bzx6yk0478pixh3hh4nkkh0qlwwr0ac2fn6sh1hd6c7sl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22161,7 +23064,7 @@ self: { mkDerivation { pname = "amazonka"; version = "1.4.5"; - sha256 = "86e7b7ef0dea4a6bc9a7644ec17908a3d9f781ac1190fcb4bd33690b8bca885c"; + sha256 = "0p48ra5hns9kpnsgr40imj0zgnd311ww2kk4lz4nnjpa1ppvgrw6"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-conduit ini mmorph monad-control mtl resourcet @@ -22180,7 +23083,7 @@ self: { mkDerivation { pname = "amazonka-apigateway"; version = "1.4.5"; - sha256 = "cccd4f7832b75b3df0de5946fdc0d9277fe2e267fce7a93524ebc609234d0e4a"; + sha256 = "0jhf9lihkipb4hsskrzwczif4zr7v70gsijrvvq3snxp69w4zkfc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22199,7 +23102,7 @@ self: { mkDerivation { pname = "amazonka-application-autoscaling"; version = "1.4.5"; - sha256 = "e6b4e51be8eb4279e0a5daa81b858e6b7a35a7005d48e038c1b53d5c9feec24e"; + sha256 = "0kn2xsgmqgdmq4wf0j2x02kkaykbis2ipa6slph7jhpbx0dybd76"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22217,7 +23120,7 @@ self: { mkDerivation { pname = "amazonka-appstream"; version = "1.4.5"; - sha256 = "7f15da60e2afdf90ea98bec5734c5f387e2676fd7ef9a1388501396f7782517c"; + sha256 = "0z2ih9vnyf81hlwa3ybyzmv2cziqbx677idyk3m91pxgw9hdl5bz"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22236,7 +23139,7 @@ self: { mkDerivation { pname = "amazonka-autoscaling"; version = "1.4.5"; - sha256 = "f887bf9f7ff88edc228dee99a858a097e6235f066886430ce4d7c5dc339e6bda"; + sha256 = "1nkbkqrxrifpwh6471k80rgj7rlpl1cai6gfilidr3pqgygvz1zq"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22254,7 +23157,7 @@ self: { mkDerivation { pname = "amazonka-budgets"; version = "1.4.5"; - sha256 = "a1363b6057e1e85b9e4a18491056f8eeeee7dbd4798cc3292ba89fb4e7ea1d8b"; + sha256 = "12qxxbkv97x85clw733rskdygvpfz1b10j8q9ag5ps71axh3ndm1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22273,7 +23176,7 @@ self: { mkDerivation { pname = "amazonka-certificatemanager"; version = "1.4.5"; - sha256 = "9990c1090044eb24013197b94bb923e800c6312c87c89f4caae6bbe36c0632b0"; + sha256 = "1c1j0rnf7fz6m969zj475hqwc0784fwlpfcp640j9ss4004w344r"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22291,7 +23194,7 @@ self: { mkDerivation { pname = "amazonka-cloudformation"; version = "1.4.5"; - sha256 = "fac2471ee46e386baa7751ac091194d90f84c96eb0c0a1094e790ecb62ddb7f6"; + sha256 = "1xmpvmicn3kr9q4s3h5hdv4q83yrjh8hkb2ifym6nf3fwhg4ghps"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22309,7 +23212,7 @@ self: { mkDerivation { pname = "amazonka-cloudfront"; version = "1.4.5"; - sha256 = "0e89f49e5ab607a45f5ac94d9b47d3102c11c5d7b7249eb0303e9350a3a5aad1"; + sha256 = "1ldalnim14ry62q9w95psz2i2b0hsd3rnkf9b9gs81xnbagg928f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22327,7 +23230,7 @@ self: { mkDerivation { pname = "amazonka-cloudhsm"; version = "1.4.5"; - sha256 = "0114a91437d3dfa7e03e656750a47fe2b4c223ec5c4a66ad533bd0893c77a837"; + sha256 = "0dx8fwy8kl1vafnncjjwxhiw5d72gyj50rv57vhagpyk6waaj501"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22345,7 +23248,7 @@ self: { mkDerivation { pname = "amazonka-cloudsearch"; version = "1.4.5"; - sha256 = "62c42b596e1682e438966f536db36e284926141487dd9c49a634f3ffacba325b"; + sha256 = "0nrjpangzwrllr4rrpc72ha2cj98dsrnslvgjqwf90hndrcjpi32"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22363,7 +23266,7 @@ self: { mkDerivation { pname = "amazonka-cloudsearch-domains"; version = "1.4.5"; - sha256 = "e0090397d9d6ce30a99537bb5041b6085aa758502a809d8e5744cd222fea028a"; + sha256 = "12h2x8pj5ka4ay79v01aa1cafnh8nr0m1frpjnlk1knnv6bh62g0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22381,7 +23284,7 @@ self: { mkDerivation { pname = "amazonka-cloudtrail"; version = "1.4.5"; - sha256 = "45e80bd1a66402e9a56355a88bfaa3407fd9549f3ee66a9d9a344fccfaccc276"; + sha256 = "0xn2rkxcqkrlkafnmriykxadjzs0lgx8pa2mcfjyj0k4lv8hps25"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22399,7 +23302,7 @@ self: { mkDerivation { pname = "amazonka-cloudwatch"; version = "1.4.5"; - sha256 = "00e6b5f8d949ed5b4d4c7fc2c8264677018c54d7e5f36a6ead297da22f8c2201"; + sha256 = "0092ihps4z99mmp6mwz5sxa8q0bp8qkcihkz9i6mpva9v7wbbrh0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22417,7 +23320,7 @@ self: { mkDerivation { pname = "amazonka-cloudwatch-events"; version = "1.4.5"; - sha256 = "b1a2b8119e6c104e2820febd9a743c74b220ea70b2fdb4d464a8edc0bdc9fc7d"; + sha256 = "0zgwr6yw1vd8ckab9zdjf3m21ckl7is9mggy40l4w43ckq8vi8mi"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22435,7 +23338,7 @@ self: { mkDerivation { pname = "amazonka-cloudwatch-logs"; version = "1.4.5"; - sha256 = "10cffb3ce3f6ee216b740b78d56a3689b7f1d4e0e367c92afac8f4d412799032"; + sha256 = "0clhg49d9x68z8mcjrz3w3ag3dw96rmday0bfimj3vpnwcygpkqh"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22453,7 +23356,7 @@ self: { mkDerivation { pname = "amazonka-codebuild"; version = "1.4.5"; - sha256 = "24426e202b2171181bd3b0ffe8fa2e2032561d233fa36f1fe0dfb890887afdd0"; + sha256 = "1l7xga491f6zw0gnz8rz4cfmcci05vxfizxhscdihw915ch6whi4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22472,7 +23375,7 @@ self: { mkDerivation { pname = "amazonka-codecommit"; version = "1.4.5"; - sha256 = "fc8fed2cedf92680d4cffe7467c6b33259a0fb9b2461f11017eb85ce1a668063"; + sha256 = "0qw0cqdcx1gb2w8g2q94kgxs0n9jng36fx7yrza809prxlnfv3zw"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22490,7 +23393,7 @@ self: { mkDerivation { pname = "amazonka-codedeploy"; version = "1.4.5"; - sha256 = "b1f0222e0d3504c116f5b1ff6d4769edafe7655bb0fd0deaa955689e9f7071b7"; + sha256 = "1dvif2grws2mm7m0vzdhbdjygbzdd53nvzxiylbc211m1lp25w5i"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22508,7 +23411,7 @@ self: { mkDerivation { pname = "amazonka-codepipeline"; version = "1.4.5"; - sha256 = "6608a8f8f1adc996cbba830988cde869c425b1bc779bdb7f259d619f654646ec"; + sha256 = "1v268rjryqcx4mzxp6vppjqjbi39x36qh2c3pb5rdjddy7wah236"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22526,7 +23429,7 @@ self: { mkDerivation { pname = "amazonka-cognito-identity"; version = "1.4.5"; - sha256 = "2cac79694e1b0c0a694525904bf8031d57a79c5fee2dda16b1126655ccf50d06"; + sha256 = "01hdyp65arhjn4bdlbgfbyfafmqx0gw4p4158mlhl30v9rlpkb1c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22544,7 +23447,7 @@ self: { mkDerivation { pname = "amazonka-cognito-idp"; version = "1.4.5"; - sha256 = "bcf273498b47ecdfe30922bc22ad68d8d04773fd1a4ede8d98b6598cd7126618"; + sha256 = "06362bbqqndnk26xwkhszmrlgl6qd2nj5g1217ixzv27id4p7wmw"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22562,7 +23465,7 @@ self: { mkDerivation { pname = "amazonka-cognito-sync"; version = "1.4.5"; - sha256 = "1331523164798c0162904f58d95a100fec9527652fcdebb81846c460a6344edf"; + sha256 = "1psf6jk61i2632wfpk9gclkrbv0g21ddjn2gj1i0333rchqm4c8k"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22580,7 +23483,7 @@ self: { mkDerivation { pname = "amazonka-config"; version = "1.4.5"; - sha256 = "775c5b9ff6efb185ee6954aaf57f607ac1fcc386daf6a7aa7071e7364c7fbe24"; + sha256 = "095ygx63drvif2magxnshv1zrhbsc1zzbajld7p8bcggysgmnp3p"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22603,7 +23506,7 @@ self: { mkDerivation { pname = "amazonka-core"; version = "1.4.5"; - sha256 = "db13e1d0ced722c21187815f34975d08a6e5a432ed58c17b3bbac75389cdee7f"; + sha256 = "0zzfrn4m7ixs7dxw2n7d6ajfb9h8bnbk8pw1hw8w48nprv8f24yv"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -22628,7 +23531,7 @@ self: { mkDerivation { pname = "amazonka-datapipeline"; version = "1.4.5"; - sha256 = "258812a9a3c553bf56e8d18f32ff69d28860f65664fb2510e5f5b1ff3ff25cb5"; + sha256 = "1dawy8zzzcgmwl82byv4avv6126jd7zk53yix1bbyly5lfli5215"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22646,7 +23549,7 @@ self: { mkDerivation { pname = "amazonka-devicefarm"; version = "1.4.5"; - sha256 = "ea472974c93f360186baea4a5b746ac37ff1c573c778b747c9be479dda458802"; + sha256 = "00l88pd9sixyr53vfy67fg2z2zy3d9s5njpapa302dizr5s2jiza"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22664,7 +23567,7 @@ self: { mkDerivation { pname = "amazonka-directconnect"; version = "1.4.5"; - sha256 = "52139e543342d60607fc24e0ff5a25e38dc8868590aefbabf659bced71b3dea9"; + sha256 = "1afyndqyvg2rysmzpblhhn3ci3g34mdgzq14zh3hdmj26da9w4sj"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22682,7 +23585,7 @@ self: { mkDerivation { pname = "amazonka-discovery"; version = "1.4.5"; - sha256 = "df5781938eda734bcce63fc6f7b674422bfa1dde5dbdf46d6cc1cf7bcdbcadb8"; + sha256 = "1f5dpk6ppky1dinz9gaxvqfzlas2fjvggiizwv64nwysis9q2myz"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22700,7 +23603,7 @@ self: { mkDerivation { pname = "amazonka-dms"; version = "1.4.5"; - sha256 = "334209b75c646cb4783ec19b98bece9274291402627bc65a86180bffb15171fc"; + sha256 = "1z3ia6qzy2qqhrdccyv208a2jx4jrsz9i6y17rwb8v34bjvhjhik"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22718,7 +23621,7 @@ self: { mkDerivation { pname = "amazonka-ds"; version = "1.4.5"; - sha256 = "e711f34752793135a9bc088789f69482faf3044d23394c0455a8873ec76944dd"; + sha256 = "1pa4d73kx1x8al24qf939l2g7yl2jkv8k1q8pjlkacbra93z64g7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22736,7 +23639,7 @@ self: { mkDerivation { pname = "amazonka-dynamodb"; version = "1.4.5"; - sha256 = "74b23d5a012af7b2f3a14001a41496e22bdc61884aa52b8aac7f687c64bcd762"; + sha256 = "0qnppij7qs3zmj52p9aai1hxqaz2jqaa80a0l7rv5xra05d3vckl"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22754,7 +23657,7 @@ self: { mkDerivation { pname = "amazonka-dynamodb-streams"; version = "1.4.5"; - sha256 = "83a340d763fbcd62b0b6f4c09358646516c7949b5f86423d4263874175e1feed"; + sha256 = "1vgyw5sl31v388yl51jzkfacf5k5cic97h7lnsq65kgvcgbl18w3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22772,7 +23675,7 @@ self: { mkDerivation { pname = "amazonka-ec2"; version = "1.4.5"; - sha256 = "e4a4938f947b6d69b799b5abc47a2d36e57ba68fdcc51a10b01c2566510cd498"; + sha256 = "166l1i8nc98wn081mifwiyk7pr9n5mxc9axmk6vnjvbvjj7r7974"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22791,7 +23694,7 @@ self: { mkDerivation { pname = "amazonka-ecr"; version = "1.4.5"; - sha256 = "c3fa1094ea22402a87f4803301b74081bfd3a6dd1db42536ade0994548fd690c"; + sha256 = "0339zm44b6g0mlv2bd0xvnkd7gw182vh2cw0yj3jlh12xaa11yn3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22809,7 +23712,7 @@ self: { mkDerivation { pname = "amazonka-ecs"; version = "1.4.5"; - sha256 = "ba72592448eee9123acc7b700067343712c6c05f0635d6a52ebdcf3c08e2c414"; + sha256 = "0564w843rkxx5sjxcd86bz0cc4ip6ikh0w3vrhx15sgf90j5jwms"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22827,7 +23730,7 @@ self: { mkDerivation { pname = "amazonka-efs"; version = "1.4.5"; - sha256 = "e8fba140dc9ca493da92ba57873b54e4488ad63d1a7e6b914b0149338cb52c50"; + sha256 = "0l1cnn636j819f8nnzhs7pb8lj74ahxqfmxsjbd9794wvi0a3yz8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22845,7 +23748,7 @@ self: { mkDerivation { pname = "amazonka-elasticache"; version = "1.4.5"; - sha256 = "6f592d7af0a9b0433ab9332bbfbb84b3b75c27b6a4df45006ff096c261be45bb"; + sha256 = "1fs5prhw55phdw04bpx4nqkmrdxkhjxvyarkp4x47c59y1x2snbg"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22863,7 +23766,7 @@ self: { mkDerivation { pname = "amazonka-elasticbeanstalk"; version = "1.4.5"; - sha256 = "e3ac291b93b951ab557ff82bed2cbe702e56b8b24e5f95e3330777fb82df59f8"; + sha256 = "1y2rvy1gnxq76girapsfnaw5cbkhpqnfsazqgxasnldrjcdjkb73"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22881,7 +23784,7 @@ self: { mkDerivation { pname = "amazonka-elasticsearch"; version = "1.4.5"; - sha256 = "bdc5f8bf276fde27b5357048f77b261569cddc1ffe1de2ff1035e436b9255303"; + sha256 = "00sk4nwkdr1m23zy47gy3zfcss8m4rxzfj3h6nsjgpkg4yzziidx"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22899,7 +23802,7 @@ self: { mkDerivation { pname = "amazonka-elastictranscoder"; version = "1.4.5"; - sha256 = "306760ad72bae83f29cfa574caac2646e3eac6935596d0e7ed66201b8e2c123b"; + sha256 = "0fqj5j71n836xpkx15jmjg3fmqs64snclx55rwlkzs5sfann0rrh"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22917,7 +23820,7 @@ self: { mkDerivation { pname = "amazonka-elb"; version = "1.4.5"; - sha256 = "e6ca6ef93fc988ff9cb4314ff6668f415ea4306d41a5e8c555d6deefd210eb62"; + sha256 = "0qpb239fzpnnap2yi9a1dlqa8pj1ixkgckrinjfgz2697zwnxjp6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22935,7 +23838,7 @@ self: { mkDerivation { pname = "amazonka-elbv2"; version = "1.4.5"; - sha256 = "fa4c8d492f85be81c2ad3d47f08d464acb7003e9fb003724daa8992de75dd847"; + sha256 = "0iyqbpkjv6d8v8j3f07vx41p1jsa8s6z0irxmp183gl55x4qsk7s"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22954,7 +23857,7 @@ self: { mkDerivation { pname = "amazonka-emr"; version = "1.4.5"; - sha256 = "2c99f0be432d535e7e55a958cb6d8c65e9e48dc5f337daf61705aa2de0e924b7"; + sha256 = "1dr4x7h2vah52zvdldzkqn6y9sb5iinwnn59amz5wlrd8fzg169c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22972,7 +23875,7 @@ self: { mkDerivation { pname = "amazonka-gamelift"; version = "1.4.5"; - sha256 = "e05847758651f3f658c1db3275798deffaabc4eb0ed1e1e2bc87ef1608dc8152"; + sha256 = "0ll1vh41dvw7pkif3l8fxg2apypgimwpacnvq5cgdwsihrslfn70"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -22990,7 +23893,7 @@ self: { mkDerivation { pname = "amazonka-glacier"; version = "1.4.5"; - sha256 = "9ca17da801fa3b470796a4285e5d45592005d2d9ec96bb3d9298868535ad52e3"; + sha256 = "1qsjmlsqb1lqj8yvp5pcv790a82r8mfmwa54jq3lffzs06l7v8cw"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23008,7 +23911,7 @@ self: { mkDerivation { pname = "amazonka-health"; version = "1.4.5"; - sha256 = "ec1def33813329c965a92c4becd7b942750c8da9b1f81b00b673aa676c1e2e61"; + sha256 = "0q9f3rn6gakknq01py5im66hqxa2p7byqjrcm5jwja9kh4ryy7gc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23027,7 +23930,7 @@ self: { mkDerivation { pname = "amazonka-iam"; version = "1.4.5"; - sha256 = "c37c6081febdce459a9683ac9ea22f45161dd86d56f452e2699f819a729068ca"; + sha256 = "1jk8j1r9m0czd7i55x2ndpc1s5j55yi9xb43jsd4bkmxzs0n0z63"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23045,7 +23948,7 @@ self: { mkDerivation { pname = "amazonka-importexport"; version = "1.4.5"; - sha256 = "24b131fbf1af88531c1688541cc357e22cc4cd770a5a691ea59b02bd3959c5ec"; + sha256 = "1v65b4wvs0lvllg6jnhafz6w8b72az1iqm482qf5725gy7xk3c94"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23063,7 +23966,7 @@ self: { mkDerivation { pname = "amazonka-inspector"; version = "1.4.5"; - sha256 = "8408f9535fbd5c3136a2adc5afb7d698520db7a5577c598c8d7ed02e9d9aa78a"; + sha256 = "12m7kafjxl3yin65jz2plnvhsllqssvsziddl8v32p5xbx9zj244"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23081,7 +23984,7 @@ self: { mkDerivation { pname = "amazonka-iot"; version = "1.4.5"; - sha256 = "bac8bb743fc67bbcd62b2c636c922af58d0866df1859cd266ceda2f1d3d66293"; + sha256 = "14v2sv9z38pddhkcsn8qvxk0i3gm5a96qqrc5gbbqyy67xsbpj5s"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23099,7 +24002,7 @@ self: { mkDerivation { pname = "amazonka-iot-dataplane"; version = "1.4.5"; - sha256 = "3b3dc22d05f534fefb163600963793dbcd9d077200255f7ce106fe54f6d4d962"; + sha256 = "0qnrskv59zh6w5y5y980f83rvkfvjcvrc01n2vxzwd7m0lnw4g9v"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23117,7 +24020,7 @@ self: { mkDerivation { pname = "amazonka-kinesis"; version = "1.4.5"; - sha256 = "69661eeaf4b9c9e8082d3e576eb705ae8de3c3e90c814f90bc0cbd0e2f1ea24d"; + sha256 = "0kd23qphxg8cpj84z08cx71y73df0nvnwmry5l4fijdrykm1wrk9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23135,7 +24038,7 @@ self: { mkDerivation { pname = "amazonka-kinesis-analytics"; version = "1.4.5"; - sha256 = "36917ed8d951b2cae224f1fd1f41a94741d5a51d7606de11af28f3bb63e5908a"; + sha256 = "12lhwmivpwr8mw8xw1kn3njxaha7m50izzgi4kicmcjiv7c7x49n"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23154,7 +24057,7 @@ self: { mkDerivation { pname = "amazonka-kinesis-firehose"; version = "1.4.5"; - sha256 = "fcdccc16e54f79b99d98e32790284ea0d64207bce0e0405e9cfd7632d24ce103"; + sha256 = "00z19k934xpxkig41q70ph3l5mm09ql909z3k2fvjyagwlbcrp7w"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23172,7 +24075,7 @@ self: { mkDerivation { pname = "amazonka-kms"; version = "1.4.5"; - sha256 = "8578614ba763ed460f78b55ae975680b43d856a7c57d7380c034097d1c68f0f6"; + sha256 = "1xphd0f7s29lq2076zf5lxbdhhqbd1syjnmmg07ldvb3lx5n2y45"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23190,7 +24093,7 @@ self: { mkDerivation { pname = "amazonka-lambda"; version = "1.4.5"; - sha256 = "b210aa40ff787d5c848278609b9a9b4d001f1c0a38b965488e6d416af949cf22"; + sha256 = "08ng97wnlhbdir46bf9q18f1y02dkfd9nq3qha25qzbqzx0al45j"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23199,6 +24102,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lightsail" = callPackage @@ -23208,7 +24112,7 @@ self: { mkDerivation { pname = "amazonka-lightsail"; version = "1.4.5"; - sha256 = "9204a4a4d70e8edd998011a5e3216f269ba291e004d3ad88a343d1c097c3e980"; + sha256 = "1079qfbw1la3lf4avlq4w28s56r6dwhy798ih2cxv3hfsyja814j"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23227,7 +24131,7 @@ self: { mkDerivation { pname = "amazonka-marketplace-analytics"; version = "1.4.5"; - sha256 = "43d428b51e7a38aac08c64dc2dc01e98021a11b5fa9d178c351808d4f109ab28"; + sha256 = "0a5b17qx820q6n61g7gsnl8il0lq3v02vp34ik0alf3s3ssjim23"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23245,7 +24149,7 @@ self: { mkDerivation { pname = "amazonka-marketplace-metering"; version = "1.4.5"; - sha256 = "76144fe48a26014c40ec0fca4f828c9e4b5dfd08f1efc0ffb5b3b1829d8e3cde"; + sha256 = "1piwisfq5cdknpzw1vzi13ymsjwyij14zjhgxi04q096ibj4y53n"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23263,7 +24167,7 @@ self: { mkDerivation { pname = "amazonka-ml"; version = "1.4.5"; - sha256 = "579b0d042abdc637d14f394a89b2e192b1c5e1bc82fff1c666e6f5eac9544865"; + sha256 = "0ra8ak4ymxg6cv3g3zw2pkhwbccjw6r8jjir9z8kgimx5820v6sp"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23281,7 +24185,7 @@ self: { mkDerivation { pname = "amazonka-opsworks"; version = "1.4.5"; - sha256 = "c91802c8bdcf0d259d86b382e5ce1fb25795e73810631f9367d5603afc2f8d34"; + sha256 = "0d4d5zy3lq6mcy9iyqqh73kramxj3z7fb0mkhsfja3fgpp404669"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23299,7 +24203,7 @@ self: { mkDerivation { pname = "amazonka-opsworks-cm"; version = "1.4.5"; - sha256 = "5791722b0bb3783dfc11ddffa284024b5317f3da817040b4a6389b6dec9d29d3"; + sha256 = "1lr9kpn6v6rqlss40w41vbriflsb0a2a5zyx27y3sy5k1cmp54ap"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23318,7 +24222,7 @@ self: { mkDerivation { pname = "amazonka-pinpoint"; version = "1.4.5"; - sha256 = "91267103b0453e5f56ef6e01f24a139ea2c4020a8344cd8664e7958f9ac1bcdd"; + sha256 = "1pdwq6d8z5g7cj3csi43181c98ly2d5g40bfxxb5ygj5n01p29li"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23337,7 +24241,7 @@ self: { mkDerivation { pname = "amazonka-polly"; version = "1.4.5"; - sha256 = "b5d5e2347c9a98daf4182e16a8100c6c1ffe5ed86d9adc69ae888c5aaeb3cec6"; + sha256 = "1infnfp5m348mrlxr6kdv1ggw7vc1h8ah5if33sdm64sghsf5mdm"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23356,7 +24260,7 @@ self: { mkDerivation { pname = "amazonka-rds"; version = "1.4.5"; - sha256 = "8377e03b84e6d8d8ec2417046ce3d67bc052632fc05d92f2f6299e6808c2a30b"; + sha256 = "02x3q846i7i9yvr94pf05xim5h3vsvinq10p4kndin76hhxy0xw3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23375,7 +24279,7 @@ self: { mkDerivation { pname = "amazonka-redshift"; version = "1.4.5"; - sha256 = "b7ecd60b51ff6b28d3435ef716485a2ebb1e3863a13cdb90b4ceb2ec65ffa84a"; + sha256 = "0jm8zxjyrcnfnj8dng51ccw1xfrfb941dxsy8g9jhszza45xdv5p"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23393,7 +24297,7 @@ self: { mkDerivation { pname = "amazonka-rekognition"; version = "1.4.5"; - sha256 = "a6c3aec679aa4b7c4484644b22738fb9611dffe72c38fd80ecf1c19c067a25be"; + sha256 = "1gi5g839rhgixj0gsf1cwzzisqdrixrj4jv4hi27qjxag73axhx6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23412,7 +24316,7 @@ self: { mkDerivation { pname = "amazonka-route53"; version = "1.4.5"; - sha256 = "68f49826d8f594abc99311081a9d8224f6e79457e6118c5bc7a55bd4aed8425d"; + sha256 = "0pa2v2pd8nx5qxdqq4g6ayafgxi4hafil20ijg4sp57mv0k9ix38"; libraryHaskellDepends = [ amazonka-core base text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23430,7 +24334,7 @@ self: { mkDerivation { pname = "amazonka-route53-domains"; version = "1.4.5"; - sha256 = "1fb74290a0c019f4dfa1fba75b553efd90c440fb3f4a89fba66dd5ec7ad4fd3d"; + sha256 = "0ggxsixfrmbdlvxqjjizzd0c947x7ramp9zvl7gz86f0l2845dqz"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23448,7 +24352,7 @@ self: { mkDerivation { pname = "amazonka-s3"; version = "1.4.5"; - sha256 = "78297e966eac3ba9045612c8e09d3e6e34c83b5dfb3d59e489edc7cd3a2fe4ad"; + sha256 = "1bg45wxcvizdi7j5jggvblxwhd3f7sfy1j0jaq2ajfxcdsb7wabq"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23468,7 +24372,7 @@ self: { mkDerivation { pname = "amazonka-s3-streaming"; version = "0.1.0.4"; - sha256 = "ecd0dfe5b024a326e96224ba6f406b44f1279eaef4d44904167a8f5a1f3d881d"; + sha256 = "07c87lgmm3vs2q24km7lmsg2gwa4dd06zfi4cbljd8r4n3jxzl7c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23485,7 +24389,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "amazonka-s3-streaming_0_2_0_1" = callPackage + "amazonka-s3-streaming_0_2_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet @@ -23493,8 +24397,8 @@ self: { }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.1"; - sha256 = "714c62e6b903dfc968f72c3966ffbce14dd1f885f4c95a34a7bd1a49e84c6966"; + version = "0.2.0.3"; + sha256 = "1pndy65mk3kjl51jr75k1dk182wsbzfd2q9zsvcxpalfs0nsaf30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23519,7 +24423,7 @@ self: { mkDerivation { pname = "amazonka-sdb"; version = "1.4.5"; - sha256 = "fdec685f8184680eaea76456db18cd552ccb77fd40e941d3590f2f57f2bec6b2"; + sha256 = "1cn6pvr5fbqgb79l3sa0zmvwnb2mrlcdnmk4lyp0ws44h5gniv7x"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23537,7 +24441,7 @@ self: { mkDerivation { pname = "amazonka-servicecatalog"; version = "1.4.5"; - sha256 = "a5e0106a155a5bd51ac6bb8f2d1037419a621fe5402f2a0888399bb98f74d6e7"; + sha256 = "1rynfj7vk6rri042lbs0wlgn56j16w82v3xvqqddanss2mm11q55"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23556,7 +24460,7 @@ self: { mkDerivation { pname = "amazonka-ses"; version = "1.4.5"; - sha256 = "a30f23624dcba2d779dc67a13e9b6f9092f7526e1bf54290fdd0684ae42e1329"; + sha256 = "0a8k5vj4ls6hzn845x8vdr9gg4lhdydkx8b7viwxg8nb9mi263x3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23574,7 +24478,7 @@ self: { mkDerivation { pname = "amazonka-shield"; version = "1.4.5"; - sha256 = "8c2ec2c561fca8653d33136d0f93f6dc4cd4de1b15a0cc00e5eb0ec9d7242fdc"; + sha256 = "1p1g4kbwj3pbwl0cr80m3ggd8k6wys9hyv8k6cynba7wc72w4blc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23593,7 +24497,7 @@ self: { mkDerivation { pname = "amazonka-sms"; version = "1.4.5"; - sha256 = "4a6ffbf02c58db9928517f48d392d7068a5439b39a7a119a727a9c6dd7b0da78"; + sha256 = "0y6sn3bnv73sfad12ylsncwm92h6sy9d6j3za4l9knsq5kqgnvsa"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23612,7 +24516,7 @@ self: { mkDerivation { pname = "amazonka-snowball"; version = "1.4.5"; - sha256 = "e27f2c73800874531269dae80e823575ac71820453f1b8c6e406d542ed831e1e"; + sha256 = "07hyhgnl5m86wk3biwak0j173b3m6n10xs6sd4956x08h1rjqzz2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23631,7 +24535,7 @@ self: { mkDerivation { pname = "amazonka-sns"; version = "1.4.5"; - sha256 = "e875c23e6a55cb9753d84f1dab58a39728b9c1ec6b1834db8b5b5d150f888681"; + sha256 = "10c6i07iapavigdk863bxk0vja4pldcan7agv19rgjsmd8zc4xg8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23649,7 +24553,7 @@ self: { mkDerivation { pname = "amazonka-sqs"; version = "1.4.5"; - sha256 = "90a38f27bdbe229300cf4a64a253078e51703ad76eb799b597f2ff580fac52dd"; + sha256 = "1pajmh7mizzjjysrkdvfswx70lcf0x9s4r2arw0968myplkqz8wh"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23668,7 +24572,7 @@ self: { mkDerivation { pname = "amazonka-ssm"; version = "1.4.5"; - sha256 = "fbd16ca62f55f53904e78db6e6e3832b94b84541ca22271cd73c51ab7150df52"; + sha256 = "0lnza1qsnl9wswf2f8na852vi51bhgiyddldww23kxam5yk6rlgv"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23686,7 +24590,7 @@ self: { mkDerivation { pname = "amazonka-stepfunctions"; version = "1.4.5"; - sha256 = "990379c5baff3e530eea53dbd00a43bf49868d81bdc4abd057e6d9ea6ef05218"; + sha256 = "062jy1pfmng6az8api5xh66qcjdz8c5d1nskx8756gpzpb2pj0wr"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23705,7 +24609,7 @@ self: { mkDerivation { pname = "amazonka-storagegateway"; version = "1.4.5"; - sha256 = "8cdf92d74e7911efabb6cc67bbcdaecbcf71363fc1277b5eb1cadc8c4cf21aeb"; + sha256 = "1sqsy968rp6an5g7n9y17wv73kybmv6vnrycnsmyy4br9vbr5pwc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23723,7 +24627,7 @@ self: { mkDerivation { pname = "amazonka-sts"; version = "1.4.5"; - sha256 = "b83baf2122c0c30f52a5e7f9d896b2d9b623ed768e61bf7e9d246534f36de3d5"; + sha256 = "1mg3dprk8r94kmzbyqcffvnj7dnrnabdiyg7lm90zhy048hsyfxq"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23741,7 +24645,7 @@ self: { mkDerivation { pname = "amazonka-support"; version = "1.4.5"; - sha256 = "135f841dfa793226d7b5d166dfa1d8f0c4fce632228329052178389791db8e2b"; + sha256 = "0awfvf8rff3q442jk0r26bkgri7hv2hxyrninpbjcckrz8fq8pqk"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23759,7 +24663,7 @@ self: { mkDerivation { pname = "amazonka-swf"; version = "1.4.5"; - sha256 = "4397c168cb7bb864e8819ac12e76b9b86885721fda9bc97f42bd6482d7279928"; + sha256 = "0a4r4zbq4r5x89zwk6ys3xr8as5qp5v2xhcsh7l69f3vrdlc35s3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23781,7 +24685,7 @@ self: { mkDerivation { pname = "amazonka-test"; version = "1.4.5"; - sha256 = "988872cbcd4b102f1fd45a5160b81026087bf4eec1c982dcaaa3df8296b75e3a"; + sha256 = "0fjynyb85px3mbf85jf1xvs7n21622w60lasshgjy42brp5p524q"; libraryHaskellDepends = [ aeson amazonka-core base bifunctors bytestring case-insensitive conduit conduit-extra groom http-client http-types process @@ -23800,7 +24704,7 @@ self: { mkDerivation { pname = "amazonka-waf"; version = "1.4.5"; - sha256 = "fdc63d12726b015627b135539c732116e96b947be9a774df72ee1d1646cff155"; + sha256 = "0mgirx31c7gffbgp99z9gfa6ps8n45rrqlrmn4kmc0bbf893vipx"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23818,7 +24722,7 @@ self: { mkDerivation { pname = "amazonka-workspaces"; version = "1.4.5"; - sha256 = "356c5f0267aa61f4cc3181a8719f7e3a3d9244c473c728aaaba0b4babcb7a7df"; + sha256 = "1px7nyybmd50mfm2iivkqi294g9sgsgp3a41676g8qdacw15yv1m"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23836,7 +24740,7 @@ self: { mkDerivation { pname = "amazonka-xray"; version = "1.4.5"; - sha256 = "e133389857343433d017950ec6b9c853d884d391b91986691f9e6afeeecee250"; + sha256 = "0l72rvpgwsly3xlqc6drj79q9n2kr2wwc3lm2z836d1layc3hcz1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring tasty tasty-hunit text @@ -23859,7 +24763,7 @@ self: { mkDerivation { pname = "amby"; version = "0.3.2"; - sha256 = "fa7b70c21377bb19396a69a5782abb0400ce19d99082d6a9f191c790a5049369"; + sha256 = "0sck0jjr1iwiy6lxd0lhv4cww004pcm7i9b9d8wikfvp2g170yzs"; libraryHaskellDepends = [ base bytestring cassava Chart Chart-cairo Chart-diagrams colour containers data-default data-default-class datasets either @@ -23884,7 +24788,7 @@ self: { mkDerivation { pname = "ampersand"; version = "3.1.0"; - sha256 = "f52e3339321a5bac4539c4e5ab8cc91190499db43520bfdc2b63e8093df36744"; + sha256 = "0i37ycyhks335gfby81mnjflk40ir66aprf4752sqnqs68wk6bpm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -23914,7 +24818,7 @@ self: { mkDerivation { pname = "amqp"; version = "0.14.1"; - sha256 = "500465d278790117e08b7c5aa2c9f917a93cf3a87e81c079d509cd5fd52d300b"; + sha256 = "02rh5pamzk89smww10bym3rkra8pz74s4nkwigh1f0brg396a12h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23933,6 +24837,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.15.1"; + sha256 = "17pgwa810w8f3kqhxp850hwkr9yqi0sydy4sc6wxxfi4pwy5xvld"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + homepage = "https://github.com/hreinhardt/amqp"; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -23940,8 +24873,8 @@ self: { }: mkDerivation { pname = "amqp-conduit"; - version = "0.2.0.0"; - sha256 = "cb2bf9a5752cf5b03b955a522403d1cb1a6554133a0b6fcf9f762d21aebf8ad6"; + version = "0.3.0.0"; + sha256 = "0w4i8jk7s8j341nx6qsmvlj7n2nnpwy3vzvkfnbzkphy0abyg0yn"; libraryHaskellDepends = [ amqp base conduit exceptions lifted-base monad-control mtl resourcet text transformers transformers-base @@ -23963,7 +24896,7 @@ self: { mkDerivation { pname = "amqp-worker"; version = "0.2.4"; - sha256 = "cc46b8d7f02c02dacc3e7a7c7d5e6c0d2338aec9afc4ca8e4f8c0d4f616a405f"; + sha256 = "0ps0d9hly3cc9y7cmi5gr6p3h8qddig7sz3s7v6dl0icy3bvhinc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23983,7 +24916,7 @@ self: { mkDerivation { pname = "amrun"; version = "0.0.0.5"; - sha256 = "1ff735e5138ca7c2cd5b3009f5163f48af427e9b8c076f273562672535fc0af8"; + sha256 = "1y0azhsjarv26lkny1wckdz45bs87wbga29hbg6w59wc2gjkbxqz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base deepseq parsec ]; @@ -23999,7 +24932,7 @@ self: { mkDerivation { pname = "analyze"; version = "0.1.0.0"; - sha256 = "af261961e6229173ff4e54c46b7bed8ba4b5ced5ad18888bc7c804fc316b4445"; + sha256 = "0ia4dcqzq168qy5qh65dsp7bb94bxmxnpi2l9vzp7492wrhij9mg"; libraryHaskellDepends = [ aeson base binary bytestring cassava exceptions foldl free hashable lucid text unordered-containers vector @@ -24020,7 +24953,7 @@ self: { mkDerivation { pname = "analyze-client"; version = "0.1.0.2"; - sha256 = "5a6fa9bfcd6b40bb195eff29dfe67242072bc9c186f9f8927383216174cb9a89"; + sha256 = "12csrds628c3ff9giyc6q74jn1s2fbkdyagzbqcvnh3brnzsjvss"; libraryHaskellDepends = [ base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time @@ -24038,7 +24971,7 @@ self: { mkDerivation { pname = "anansi"; version = "0.4.8"; - sha256 = "aa08d4dcf76ad4d98d20fc2fd30df6fd02bc1ac07d7de01ce320e6ae92cff9bb"; + sha256 = "1fzrry9axri0wcff0zbxq0dbq0pxyq6x6bzw426xkm3ayzfd825a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24061,7 +24994,7 @@ self: { mkDerivation { pname = "anansi-hscolour"; version = "0.1.2"; - sha256 = "bcbbea9c098532e9b43bc83e4906879f427b4df44cd9ca4ca26a54a62821d339"; + sha256 = "0ffk44lacm3al96cmnacyi6pnhlzhw34jgn87fsfjcl516ffmfxw"; libraryHaskellDepends = [ anansi base bytestring containers hscolour monads-tf text ]; @@ -24077,7 +25010,7 @@ self: { mkDerivation { pname = "anansi-pandoc"; version = "0.1.3"; - sha256 = "b1dfde3b67cb7cc95f7c6c5bd82a915c4361e8d24e2565eedabcf2321638438f"; + sha256 = "13s370b35wmwvbp6a9afsbl62hswj4mdhnvcgigwjz6bcwxxxpxi"; libraryHaskellDepends = [ anansi base bytestring containers monads-tf pandoc text ]; @@ -24095,7 +25028,7 @@ self: { mkDerivation { pname = "anatomy"; version = "0.4"; - sha256 = "241c64a8eb4bc2eadbbb1ad307078d9140013e2693f30d5c4f3daeff5d1fea77"; + sha256 = "0xza3xfzzbix9xf0vwwk4qz02h4iil3hglqspgdymhjbxfl68714"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24119,7 +25052,7 @@ self: { mkDerivation { pname = "android"; version = "0.0.2"; - sha256 = "85b112bebb356f4def496e61421651b9e81060af8cab107dbadaf075ae9ac0f2"; + sha256 = "1wn0kap7bw6sp9yi1awcmxh11s5ra4b44qbf97plsvrmpfz15cc5"; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/keera-studios/android-haskell"; description = "Android methods exposed to Haskell"; @@ -24135,7 +25068,7 @@ self: { mkDerivation { pname = "android-lint-summary"; version = "0.2.1"; - sha256 = "a1bfbfddc1c16150a882388c51b6174fc17c7a804c26e49c5ecbc8e5baab62ea"; + sha256 = "1sk2mfxfbj6bbsff89jch1x7rhag2yv5331qhal50qf1q7fvzgx1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24164,9 +25097,9 @@ self: { mkDerivation { pname = "angel"; version = "0.6.2"; - sha256 = "caff0b06481dc3858b059e2faa12afdad66152c0341020dc53cceacf28e2e358"; + sha256 = "0n73w8lczsncagf2041lq1963mnsmw9albwy0n5qbhqx9030pzya"; revision = "1"; - editedCabalFile = "b8dc3c8526dde130a1acd260a062b184f0c614cb459116455d8637a83702a23f"; + editedCabalFile = "0gx208vshdw6bm2id4a5rcacdw44n5ia0q6jmjhk1qfx4s2krp5q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -24192,7 +25125,7 @@ self: { mkDerivation { pname = "angle"; version = "0.8.1.0"; - sha256 = "2439f9267cd299c73e418354e97f884777107078590d1bbf5ccd825ff27e8ba1"; + sha256 = "18cbgvr5z0ndbjzin3arg1q10xs7i1zyjm4384zcg6fjghkgjf94"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24218,13 +25151,26 @@ self: { mkDerivation { pname = "animalcase"; version = "0.1.0.2"; - sha256 = "117b8a5021cab8d1ca9f968784d1d092418aa136a0ab7ff4a370239a7dd24b33"; + sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi"; libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/ibotty/animalcase"; description = "Convert camelCase to snake_case and vice versa"; license = stdenv.lib.licenses.mit; }) {}; + "animate" = callPackage + ({ mkDerivation, base, hspec, vector }: + mkDerivation { + pname = "animate"; + version = "0.0.0"; + sha256 = "08d8kfmqayr1nfn4nxrjfvcgn3jjz457r7jbq06vimkmjz1fagb9"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec vector ]; + homepage = "https://github.com/jxv/animate#readme"; + description = "Animation for sprites"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "anki-tools" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory , exceptions, filepath, mtl, scientific, sqlite-simple, text, time @@ -24233,7 +25179,7 @@ self: { mkDerivation { pname = "anki-tools"; version = "0.1.0.0"; - sha256 = "a90256daf1b04e8c85d95bed5f58708ea4a03bfec4abd81e90db4b375374db3b"; + sha256 = "0fyvfi9kfjyvj0gdiay4zqxs194ff1c5zvavv62qqkmhy7d5c0m9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24253,7 +25199,7 @@ self: { mkDerivation { pname = "annah"; version = "1.0.0"; - sha256 = "a07a92ebc41ac5af31cce2b41c9dd311f92ca52e05c2aaea756aebdcceb00389"; + sha256 = "1283n37drsvafpmamhh55sjjry8isffird72rhqszi8sqkmr4ym0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24274,7 +25220,7 @@ self: { mkDerivation { pname = "annihilator"; version = "0.1.0.0"; - sha256 = "d70391510f1edc498e8b746737500d378dd5cebd75fc953ee7bb75279cbfc001"; + sha256 = "00f0pyf2fxdvwwz9bz3mpp7db39p1m83frvlif74kp0y1x8r20yp"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/Shou/annihilator#readme"; description = "Semigroups with annihilators and utility functions"; @@ -24286,9 +25232,9 @@ self: { mkDerivation { pname = "annotated-wl-pprint"; version = "0.7.0"; - sha256 = "0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18"; + sha256 = "061xfz6qany3wf95csl8dcik2pz22cn8iv1qchhm16isw5zjs9hc"; revision = "1"; - editedCabalFile = "5d6e26cfeb17a187e992d482d8811d89df6a061f2bf0c6dba120d1dd3111138d"; + editedCabalFile = "138k24qxvl90l7dwdw1b3w36mpw93n0xi0nljblqg88pxg7jcvjx"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; description = "The Wadler/Leijen Pretty Printer, with annotation support"; @@ -24300,7 +25246,7 @@ self: { mkDerivation { pname = "anonymous-sums"; version = "0.6.0.0"; - sha256 = "c7c5c13cb19ce97fdb621794cd1de7e34ab7aba8bdc5bcc9309107b1ff3ec2ad"; + sha256 = "1bf27vzv21wi634vridxm2mvfjp3wwfwv50pcbdpzscwn4yc3if7"; libraryHaskellDepends = [ base lens template-haskell ]; homepage = "http://www.github.com/massysett/anonymous-sums"; description = "Anonymous sum types"; @@ -24312,7 +25258,7 @@ self: { mkDerivation { pname = "anonymous-sums-tests"; version = "0.4.0.0"; - sha256 = "0bc000e28170968316920d342b08af5fab81eaa19ce4ef5fa216d9df473bee28"; + sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b"; libraryHaskellDepends = [ anonymous-sums base QuickCheck ]; homepage = "http://www.github.com/massysett/anonymous-sums"; description = "QuickCheck functions to accompany the anonymous-sums package"; @@ -24328,9 +25274,9 @@ self: { mkDerivation { pname = "ansi-pretty"; version = "0.1.2.1"; - sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6"; - revision = "2"; - editedCabalFile = "7d10d2f8605d932394138b76880eb08db72606730394c7f6a895f923e608ba65"; + sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h"; + revision = "3"; + editedCabalFile = "046w5nybk8fyhicw5wy7qchbx9k4sib189afj2gysrsblj0ki864"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -24342,14 +25288,14 @@ self: { }) {}; "ansi-terminal" = callPackage - ({ mkDerivation, base, unix }: + ({ mkDerivation, base }: mkDerivation { pname = "ansi-terminal"; - version = "0.6.2.3"; - sha256 = "4dc02cb53e9ca7c8800bbdfc0337b961e5a945382cd09a6a40c6170126e0ee42"; + version = "0.6.3.1"; + sha256 = "15c0c0vb66y3mr11kcvgjf4h0f7dqg7k1xq7zzq9fy11r7h9i3s5"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base unix ]; + libraryHaskellDepends = [ base ]; homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; @@ -24360,7 +25306,7 @@ self: { mkDerivation { pname = "ansi-wl-pprint"; version = "0.6.7.3"; - sha256 = "3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708"; + sha256 = "025pyphsjf0dnbrmj5nscbi6gzyigwgp3ifxb3psn7kji6mfr29p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; @@ -24374,7 +25320,7 @@ self: { mkDerivation { pname = "ansigraph"; version = "0.3.0.2"; - sha256 = "d3cefc45710751473685ca621969e04e9bc27218ecc581d3c38164c81df05a20"; + sha256 = "082sy0fwhr41qg9q3igc31rc56sfw1lijqnahlv4fl87f52zrknk"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -24390,7 +25336,7 @@ self: { mkDerivation { pname = "antagonist"; version = "0.1.0.30"; - sha256 = "e601f6619590b3027113c596115abdc8d46bdb43ad177b0b78cd83010255faad"; + sha256 = "1bgsal1030ydg05pn5xd8gdnpm68pmd135n52dqh5cwhjmhzc0g6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24414,7 +25360,7 @@ self: { mkDerivation { pname = "antfarm"; version = "0.1.0.0"; - sha256 = "4dc7c0e40f1678f2dd3120c209dd8bfdcaabc58b673882c12fd802b54f7354e8"; + sha256 = "1s2lfd7va0nq5z0q4f37ig2spjpxigfhkhi067fz4y0n1zjc1isd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24439,7 +25385,7 @@ self: { mkDerivation { pname = "anticiv"; version = "0.1.0.5"; - sha256 = "f03bbab75225647bbd53462bbaa9114e4994b07b59d7e3a85d4f3deaa750bd6b"; + sha256 = "0sxxa2kylgagbnlf7msrgfq98jaf26lvlas6afypnr15aavvlfzh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24462,8 +25408,8 @@ self: { }: mkDerivation { pname = "antigate"; - version = "2.0.1"; - sha256 = "69047d6143571082d63cd9b59cf42b63203be56674707bb17f767e812771a26d"; + version = "2.0.2"; + sha256 = "1s1m0k2r18jvz14nqy07m1jm87cdk0n5x2r1xznyfbcik7081ywb"; libraryHaskellDepends = [ base bytestring data-default deepseq exceptions failure http-client http-conduit resourcet safe text transformers @@ -24479,7 +25425,7 @@ self: { mkDerivation { pname = "antimirov"; version = "0.1.0"; - sha256 = "38a628a36affb43a949815591b252ff023348ddcda40da3614a064c1a12b5e29"; + sha256 = "0aay5fhw2r502hvdlh6svj6k88zh5wjinn8mk2a3md7zdaiji9iq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers QuickCheck ]; @@ -24494,7 +25440,7 @@ self: { mkDerivation { pname = "antiprimes"; version = "0.1.0.1"; - sha256 = "8e8b457ec223b9df3c3036d1c5fd1fd4c62144a911a4284a3e38fc2a1a9c292b"; + sha256 = "0ar9khd2mz1q7r52i90im5223inl3zywbl9n60ydzf93q9z4b2wf"; libraryHaskellDepends = [ base primes ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wokibe/antiprimes#readme"; @@ -24507,7 +25453,7 @@ self: { mkDerivation { pname = "antiquoter"; version = "0.1.1.0"; - sha256 = "3ec665651a974b5574de44a2e3ae479a2d8ccb73ee64e364b0eb7c755a8c65e3"; + sha256 = "1qv5iid7az7bn1jf6r7ffg5qqbcs8ypf78j4vrs5ajwp39jnbiiy"; libraryHaskellDepends = [ base syb template-haskell ]; description = "Combinator library for quasi- and anti-quoting"; license = stdenv.lib.licenses.bsd3; @@ -24520,7 +25466,7 @@ self: { mkDerivation { pname = "antisplice"; version = "0.17.1.1"; - sha256 = "a2e6407db5c32760f9ede11b610f452f235827ae7bf80c0142aa18e3b2f365fa"; + sha256 = "1yk5yfrf665a880hry3vmqkmh8rg8l7n26z1xpwn09y3nmyl1rm2"; libraryHaskellDepends = [ base chatty chatty-utils haskeline mtl template-haskell text time transformers @@ -24538,7 +25484,7 @@ self: { mkDerivation { pname = "antlrc"; version = "0.0.2"; - sha256 = "ed213e6b5c5963157c02d0bbdaad14c7c4acbd21b4da37de96314863371353c2"; + sha256 = "1hjk2cvn6j1ijvg3gnml46ysri672jnxmfyh09y1aqsrbimkw8gd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell98 ]; @@ -24558,7 +25504,9 @@ self: { mkDerivation { pname = "anydbm"; version = "1.0.7"; - sha256 = "d33410fc5fad79bd5a5bcc24248f6e5a7a3133ede5111c31a8c58068b219b3e7"; + sha256 = "1rxk36r6i065m0qiq4g5xlrk2yjsds7j896cbddbsyddbzy10d6k"; + revision = "1"; + editedCabalFile = "1iny2zl44lbyv266al9047mkj51510vany6nfyq0xi7h7ak3wb13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl ]; @@ -24576,7 +25524,7 @@ self: { mkDerivation { pname = "aosd"; version = "0.2.1"; - sha256 = "06eea06ed5dd81649b97d27643cde2831e61f9ffde7d326f62c8622baf1faa7e"; + sha256 = "0zma3ypjnqn8c9pk4zfyzzwn27l3wb6l6xnjjydn90fxsmpa1vh6"; libraryHaskellDepends = [ base bindings-DSL cairo colour monad-control pango transformers X11 ]; @@ -24594,7 +25542,7 @@ self: { mkDerivation { pname = "ap-reflect"; version = "0.3"; - sha256 = "fae1845bea949bd04ed83fd508ab80947587056c0f2902bce08861a0b61a109a"; + sha256 = "16hh3ava0qc8w2y04a8gdh2qfxclh2mhim9zv17d16wlx9dq9qgs"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/cmc-msu-ai/ap-reflect"; description = "Partial evaluation reflection a la simple-reflect"; @@ -24609,9 +25557,9 @@ self: { mkDerivation { pname = "apache-md5"; version = "0.6.1.4"; - sha256 = "c84f882f6aca7b72d89ee662d358f40fe89ab3267ec418f3bee24a0d80b096b7"; + sha256 = "1dwnn200sjp2pvriii3y4srrms0gyicd6qp6kvc74yyad8pqhky8"; revision = "2"; - editedCabalFile = "e41d43eba938331a51fb0ead7cd004c6f539820c06aed48a77eb67e04eee39f2"; + editedCabalFile = "1wirxr7f0rzbfy5d9bh61j13kxf60k87rb8fzd8ilcrqm7ml67g4"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -24636,7 +25584,7 @@ self: { mkDerivation { pname = "apelsin"; version = "1.2.3"; - sha256 = "54a4544b4e88766dabdc7e2d88ea14731f686158793b798b7d5bfa06ee214721"; + sha256 = "08a747p0dyjvgn5pjfvrb1hnh7vk2km8hbbyvjmnsxl89r5m992l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -24658,7 +25606,7 @@ self: { mkDerivation { pname = "api-builder"; version = "0.12.0.0"; - sha256 = "d1ca9125a15cb70d7dfe85d04ab75e9d34620a58ca109b139b401578bda14b99"; + sha256 = "16abl6yph5a0kc9rn46ab0564d4xbsvlml45zryhvdswl4jr3jni"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls http-types text tls transformers @@ -24679,8 +25627,8 @@ self: { }: mkDerivation { pname = "api-field-json-th"; - version = "0.1.0.1"; - sha256 = "88befb216037f0460950cd91960db2ba7789231b6ab829b04b2b9dd60a007626"; + version = "0.1.0.2"; + sha256 = "097pn19247g73rw0si33m5l1w797s9759ma3ki9h90dwd4w9rm5q"; libraryHaskellDepends = [ aeson base lens split template-haskell text ]; @@ -24695,7 +25643,7 @@ self: { mkDerivation { pname = "api-opentheory-unicode"; version = "1.2"; - sha256 = "08558a637339b4d291ee499ccd37a05969f372966fcc7cd740b933de569eebd7"; + sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88"; libraryHaskellDepends = [ base bytestring opentheory-unicode ]; testHaskellDepends = [ base bytestring directory opentheory-unicode @@ -24715,7 +25663,7 @@ self: { mkDerivation { pname = "api-tools"; version = "0.5.2"; - sha256 = "86f742435d8dae3ffea3f6085c6f94342f25eafc00be1c985d3a0212a39aa25d"; + sha256 = "0pd2kaii40isbnc1rgh0zkm2abrljipmq27nlgz3zbldbm1l5xw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24757,7 +25705,7 @@ self: { mkDerivation { pname = "apiary"; version = "2.0.2"; - sha256 = "b9a08995b45d7b9bbea2239a417ce0409c5c36515cda412fdc62f8e64e9bb594"; + sha256 = "155mkd7fdy32vhpl3njwa4v5r720w1y436i3laz9nysxnjaqk85r"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -24785,9 +25733,9 @@ self: { mkDerivation { pname = "apiary-authenticate"; version = "1.4.0"; - sha256 = "40dbdb0d6799ba7091ae9b72929c7d62a74dd251b5a6e01f8979314d75dbd107"; + sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; revision = "5"; - editedCabalFile = "34972b3238ea7fe3423f720891b9fb97614165da20b4751a09d0b26d3253cd4a"; + editedCabalFile = "0jndacr6vcnh14d7bd10v9jl2qcpzfwr223j7x1f6zza70r2p5rl"; libraryHaskellDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types @@ -24807,9 +25755,9 @@ self: { mkDerivation { pname = "apiary-clientsession"; version = "1.4.0"; - sha256 = "a6bba1337d2ee7ded7303f2801b09b9d93cdafb93f5115328c797bef3e6126fd"; + sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; revision = "3"; - editedCabalFile = "4f89144896c4424f795151ea1e90863feb968314d18250e8aa78e71a2aaf6c1a"; + editedCabalFile = "06kcmwm1mrvqmbl510ni2j1rdsrzhs81xsjia5wlyhn4jr4192ag"; libraryHaskellDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -24827,9 +25775,9 @@ self: { mkDerivation { pname = "apiary-cookie"; version = "1.4.0"; - sha256 = "3dcf4cf38377685340ec5c6ab105a0df3ba2b0a4d0d7079fc88593bd15eeeb04"; + sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; revision = "4"; - editedCabalFile = "ecc5670e535c8eb25acf5cc8973555dc1b8f4384e76f35472ceba3a9e4b78561"; + editedCabalFile = "0qc5nzjak8zb5i3kavz7hi1qy6ywalsrgj2wrxdb53jwac76gigc"; libraryHaskellDepends = [ apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing @@ -24845,9 +25793,9 @@ self: { mkDerivation { pname = "apiary-eventsource"; version = "1.4.0"; - sha256 = "a7c9f566fea8501864ac194d744dfe94c0ee04d174ccb51161c4a64243bd0176"; + sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; revision = "2"; - editedCabalFile = "0ffc00bdbd735fd5ee59130daa2b6800dc66306bc3da2fccb48145961b04cc95"; + editedCabalFile = "15fc0hdrcic1nk62znn3dcq6dp00d0msl38kb7pdapvkpnyh1z0g"; libraryHaskellDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -24863,9 +25811,9 @@ self: { mkDerivation { pname = "apiary-helics"; version = "1.4.0"; - sha256 = "0a4dc7d59aa5cc626922d10e61bfad4fd56628c48701919d51b239f5a175a9e2"; + sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a"; revision = "2"; - editedCabalFile = "82a65528a2b50525b5e4c06eef79248592d529739d4159a171407a212d3a2797"; + editedCabalFile = "15r778nj2yj0f6hmjhcxfclxb4l54iwyyvn0wjsja1dml8l5b9l2"; libraryHaskellDepends = [ apiary base bytestring data-default-class helics helics-wai monad-control text transformers types-compat vault wai @@ -24883,7 +25831,7 @@ self: { mkDerivation { pname = "apiary-http-client"; version = "0.1.3.0"; - sha256 = "ed66cb3783158a7fce4409a61d8c20fa06ee2d083dbae37b086fa49af6663adc"; + sha256 = "1p1scvv9m93g11xy7fix10nyw1ps4261v9h98k77z2hmhcvwnrpd"; libraryHaskellDepends = [ apiary base bytestring bytestring-builder http-client http-types text transformers types-compat wai @@ -24902,9 +25850,9 @@ self: { mkDerivation { pname = "apiary-logger"; version = "1.4.0"; - sha256 = "884cf856a25685db351f76ab2df43126456cfe4c1a8640b72ac055623518c05d"; + sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; revision = "4"; - editedCabalFile = "44884053de8a5d4c2b3e6a97f7b9592477cdbb1f6970d2d223cb2f1f557743e3"; + editedCabalFile = "1qs3fxaiybyb4g9d4w393yxwsxr4b6wzg5va7qmlqpcavr9l1224"; libraryHaskellDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base @@ -24923,9 +25871,9 @@ self: { mkDerivation { pname = "apiary-memcached"; version = "1.4.0"; - sha256 = "7e3d225c9ac983d798b88a1e8ebc0221852174d0f0765daa8e9e20e6d79193e7"; + sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby"; revision = "2"; - editedCabalFile = "3a79077bacef2ea2448b870b099c41d8a4cb726cfbd82bd1310e7f9801bf1de7"; + editedCabalFile = "1rqxpw0rhzqf678jpn7vdircp96q86f0j2w7id2a4bpgmixhfy9s"; libraryHaskellDepends = [ apiary base bytestring data-default-class memcached-binary monad-control text transformers types-compat @@ -24944,9 +25892,9 @@ self: { mkDerivation { pname = "apiary-mongoDB"; version = "1.4.0"; - sha256 = "8d97a32e5d55334d1a4f5d318d6a590a74c0b8ad6c84877956728318b89f36eb"; + sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; revision = "2"; - editedCabalFile = "de12b5ad3582eb1287753d02751b63f66ea84001d0fea9b15f34ff92675760de"; + editedCabalFile = "1pk0axkr5zrlbyqskznh050ahvpnccdpa0ixfn3i5sw26nnva4ny"; libraryHaskellDepends = [ apiary base bson data-default-class lifted-base monad-control mongoDB resource-pool text time transformers types-compat @@ -24965,9 +25913,9 @@ self: { mkDerivation { pname = "apiary-persistent"; version = "1.4.0"; - sha256 = "09c6c5730d6ad65b544e994f2d73f5412aae92aac093fd308234c8bea68f4a02"; + sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; revision = "3"; - editedCabalFile = "8235c7aa7dd8f1ca78cc288abfed6e796da50b95040ae72bfd304c2115a2239e"; + editedCabalFile = "17i3l8aj2k1hzlmyf2h4jl5savbrdvnvz2i8riwcmwfqgnmcfdc2"; libraryHaskellDepends = [ apiary apiary-logger base monad-control monad-logger persistent resource-pool resourcet transformers transformers-base types-compat @@ -24987,9 +25935,9 @@ self: { mkDerivation { pname = "apiary-purescript"; version = "1.4.0"; - sha256 = "5f0e15fb72ae61b44349488bb945c1cd9d63b54986c73bbbd9cb207531172d7c"; + sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz"; revision = "2"; - editedCabalFile = "915a9c1861d5c4425a2ef6b721dbbf952801304aa1d9197f2f03758f7e554fff"; + editedCabalFile = "1zsgamz8yx835xziknd198q02a4mpzdj3dzn5rd45i6mc4c9qnli"; libraryHaskellDepends = [ apiary base bytestring data-default-class filepath Glob parsec purescript text transformers types-compat unordered-containers @@ -25005,9 +25953,9 @@ self: { mkDerivation { pname = "apiary-session"; version = "1.4.0"; - sha256 = "434cd8b985a95bd4c72dde7ac521768d1c1402f3cc8b4835dded6736bdbcd74a"; + sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; revision = "3"; - editedCabalFile = "1983d57af9d671319eaa96f055995e8de55d50ab52c5bdf1f210ae66c4a5d913"; + editedCabalFile = "04yrlp26dbhhybqvviajmd85vrcdbscmbw4nmag32wfnz5xdb0qr"; libraryHaskellDepends = [ apiary base types-compat wai web-routing ]; @@ -25024,9 +25972,9 @@ self: { mkDerivation { pname = "apiary-websockets"; version = "1.4.0"; - sha256 = "e15e7e9281b72d9fa2419c1d3dbbf0c11e08dc139fe0d0242a5612a181ff545b"; + sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; revision = "2"; - editedCabalFile = "72d8024aad88c6ea1185776d4612d05f68202ce78ab21d79edde2803c3bc15e9"; + editedCabalFile = "1s8mpk1h6a6yxmwivclawwn20s2zs094cvbphl8ymil8mm505n3j"; libraryHaskellDepends = [ apiary base wai-websockets web-routing websockets ]; @@ -25041,7 +25989,7 @@ self: { mkDerivation { pname = "apioiaf-client"; version = "0.2.1.0"; - sha256 = "15561082ee74c3a64786347f9d8206896b70b1d3475e9dfa0318e2ed84703c6a"; + sha256 = "0siwf22fvqhq0gx9spj7sfqp0sw90s19szrlhr3sdhvlxs110mhm"; libraryHaskellDepends = [ aeson base bytestring lens wreq ]; testHaskellDepends = [ base ]; homepage = "https://github.com/kberger/anapioficeandfire-haskell#readme"; @@ -25058,7 +26006,7 @@ self: { mkDerivation { pname = "apis"; version = "0.0.1"; - sha256 = "f8988b196e83e1bfc445f05cb3a860ed54bcabce3ecd44094d1347a757e85b1e"; + sha256 = "07jvx1bsfiqk9l4l9k9yrsmvqm7dc2lb6p7h8p2bzqc3dqcqp67q"; libraryHaskellDepends = [ aeson base containers deepseq directory ecma262 exceptions filemanip filepath hslogger hxt mtl opendatatable split @@ -25081,7 +26029,7 @@ self: { mkDerivation { pname = "apotiki"; version = "0.5.2"; - sha256 = "e73a4d8fd2175715e0391715a3fb5a3c0ee5b188587c3a5c93baf8a9150d30e6"; + sha256 = "1rih1lasky5sjdf3lz2qi2qya3iwbbxs658p77h1amqpsa7lsfp7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25107,7 +26055,7 @@ self: { mkDerivation { pname = "app-lens"; version = "0.1.0.3"; - sha256 = "ecb966a61eee1465d2e89d98ee2dfbdd52c7bc37707e817809ff520c91f9d744"; + sha256 = "0i6pz68hqlpz15w82zkh6yycflnxzcnyx64xx396a57f3sk6dfgc"; libraryHaskellDepends = [ base containers lens mtl ]; benchmarkHaskellDepends = [ base containers criterion deepseq lens mtl @@ -25124,8 +26072,8 @@ self: { }: mkDerivation { pname = "app-settings"; - version = "0.2.0.10"; - sha256 = "88dd9df76930467c14b764108cda92676a6702f68ad38a09c26e740bce29ac28"; + version = "0.2.0.11"; + sha256 = "1cahrpf42g5ids4k6hlzys1kmbgy1ypgax9ljckwymafradcc53a"; libraryHaskellDepends = [ base containers directory mtl parsec text ]; @@ -25142,7 +26090,7 @@ self: { mkDerivation { pname = "appar"; version = "0.1.4"; - sha256 = "58ea66abe4dd502d2fc01eecdb0828d5e214704a3c1b33b1f8b33974644c4b26"; + sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq"; libraryHaskellDepends = [ base bytestring ]; description = "A simple applicative parser"; license = stdenv.lib.licenses.bsd3; @@ -25156,7 +26104,7 @@ self: { mkDerivation { pname = "appc"; version = "0.0.6"; - sha256 = "ba4a9a1cc478b98eb8d6498535f903cbc66e708a6cba6d7abb59ea74e53cda62"; + sha256 = "0qns7kjp9sjrpdx6vfkci9q6xinb0gwkb1a9ssw8xfbqqhf9ljms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25179,7 +26127,7 @@ self: { mkDerivation { pname = "applicative-extras"; version = "0.1.8"; - sha256 = "285fa07fedb7c53fe0f9e2e72ba1e85fe8cac66f04b6f0f4b426a0b52b727aeb"; + sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/chriseidhof/applicative-extras/"; description = "Instances for Applicative"; @@ -25193,7 +26141,7 @@ self: { mkDerivation { pname = "applicative-fail"; version = "1.1.1"; - sha256 = "81009f9845d4eacfcbaad4a3214036b7a2dfa703687d6bfacb48fbf6b7067385"; + sha256 = "11bk0svzdys8rgx6nzb80fkxz8mp6r0238ylmb5wzsnl8nc9y041"; libraryHaskellDepends = [ base bifunctors dlist mtl transformers transformers-base ]; @@ -25211,7 +26159,7 @@ self: { mkDerivation { pname = "applicative-numbers"; version = "0.1.3"; - sha256 = "80abc54b03853dbdcc10a53ae19f9938381f42727037092226ea59f3fda1d266"; + sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0"; libraryHaskellDepends = [ base ]; homepage = "http://haskell.org/haskellwiki/applicative-numbers"; description = "Applicative-based numeric instances"; @@ -25225,7 +26173,7 @@ self: { mkDerivation { pname = "applicative-parsec"; version = "0.1.0.0"; - sha256 = "3d67780128bd15d5cd0a03745f632e9c05b6a95564baa44466f262756992c28b"; + sha256 = "12y2j9lpaqpjcr2a9fk4anlvc1cw5rimyx031b6xa5dx500phrrx"; libraryHaskellDepends = [ base containers lens mtl text ]; testHaskellDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -25241,9 +26189,9 @@ self: { mkDerivation { pname = "applicative-quoters"; version = "0.1.0.8"; - sha256 = "f45d567b408bacb17ef567857affb5cdf69299dd5b57fd559370a291404ba282"; + sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl"; revision = "1"; - editedCabalFile = "5786bfaf50dbb1e35310eb17f4e090eabfd015c754f551cf637cf63be8b48d31"; + editedCabalFile = "0ccdnkl3pxkwcg7m3xalqwax1gzaj3hg85zb219y7cfva2pvz1jp"; libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; description = "Quasiquoters for idiom brackets and an applicative do-notation"; license = stdenv.lib.licenses.bsd3; @@ -25257,7 +26205,7 @@ self: { mkDerivation { pname = "applicative-splice"; version = "0.0.0.0"; - sha256 = "8a75dc608c12e1d33213fd7db7423ab545fa00dda300b804992b8de5cd12a32a"; + sha256 = "0am32b6yb39bk42bh053vl0glidm791bfzgx2crd7q8jiihdqxca"; libraryHaskellDepends = [ base haskell-src-exts haskell-src-meta mtl syb template-haskell ]; @@ -25267,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 @@ -25275,8 +26255,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.3.0.1"; - sha256 = "1754bd300db92fdf668d4698af053d4da686512264275478946b7e0710c5e814"; + version = "0.4.0.0"; + sha256 = "1s25nlkbfzjr6b5psii3n7hmwvg7lgvaljp1ilq5y82rq8sfyxps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25303,7 +26283,7 @@ self: { mkDerivation { pname = "apportionment"; version = "0.0.0.2"; - sha256 = "352d9564ffdb01d3312a1087f8badc544b3478185cbc27d4ca29fc1f18c9f82b"; + sha256 = "0azqr4c1zz19rba2gg2w31w38jslvjxgi1qh58qx60fvzxj9ab9m"; libraryHaskellDepends = [ base containers utility-ht ]; homepage = "http://hub.darcs.net/thielema/apportionment"; description = "Round a set of numbers while maintaining its sum"; @@ -25320,7 +26300,7 @@ self: { mkDerivation { pname = "approx-rand-test"; version = "0.2.1"; - sha256 = "81d4b44621cb43f8c9ecbc90fd71c953826dc4c6c0790ad1e40770e774e15c9d"; + sha256 = "17aww5sffw07wk8hlyf0qv26v0jkr5qzv45wxk4zhhyb453b9m41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25343,19 +26323,19 @@ self: { }) {}; "approximate" = callPackage - ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, doctest, filepath, ghc-prim, hashable, hashable-extras - , lens, log-domain, pointed, safecopy, semigroupoids, semigroups - , simple-reflect, vector + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, directory, doctest, filepath, ghc-prim + , hashable, lens, log-domain, pointed, safecopy, semigroupoids + , semigroups, simple-reflect, vector }: mkDerivation { pname = "approximate"; - version = "0.2.2.3"; - sha256 = "20fdc16cbd36bd592c6e2c5b6bd38866e8c3eb010e71607e6f609e6355302bac"; + version = "0.3"; + sha256 = "0zg94yqbm6iasjkf8bxz1bnwc3gx5lh6603cvab8rrxz4xm7k27j"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq ghc-prim hashable - hashable-extras lens log-domain pointed safecopy semigroupoids - semigroups vector + base binary bytes cereal comonad deepseq ghc-prim hashable lens + log-domain pointed safecopy semigroupoids semigroups vector ]; testHaskellDepends = [ base directory doctest filepath semigroups simple-reflect @@ -25371,7 +26351,7 @@ self: { mkDerivation { pname = "approximate-equality"; version = "1.1.0.2"; - sha256 = "03a11e2bde0b81fcb97947d5dc4302d6712af9d9d405a4968e006ea3caf2bb5f"; + sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883"; libraryHaskellDepends = [ base type-level-natural-number ]; homepage = "http://github.com/gcross/approximate-equality"; description = "Newtype wrappers for approximate equality"; @@ -25383,7 +26363,7 @@ self: { mkDerivation { pname = "ar-timestamp-wiper"; version = "0.1.0"; - sha256 = "3fcf5dc856ed7cd722073a8c1f2b556e9c62628e08fe40311f0cc4c31bf861be"; + sha256 = "1gk1z0dw7i0c3wql1zh8iri6573falmiz31s0widfz7dav45vkrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -25401,7 +26381,7 @@ self: { mkDerivation { pname = "arb-fft"; version = "0.3.0.0"; - sha256 = "4788916d5a3a5a5844ff1cf0b3a28d577aeacd3c214b58ccaee7552bd3c40fcc"; + sha256 = "1k0gqk9jnmg7mv65hjr17k6ylyjpinib7w0wzx25hnisb9nr3227"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25425,7 +26405,7 @@ self: { mkDerivation { pname = "arbb-vm"; version = "0.1.1.20"; - sha256 = "684fda58cae1f7a4e11acc368d4c5eed1894004f96d09cd92e223d6a5b56614c"; + sha256 = "0k31ardnlg925vcrrl4n9w09867dbr68sdnc3bhs9xz1r9cdlkv8"; libraryHaskellDepends = [ base bytestring cereal containers directory mtl pretty ]; @@ -25445,8 +26425,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.9.0.12"; - sha256 = "3bdd4171a6d68ff3604eb752d04fdc6e819ab90f021e65ff12f5f6c7e62e87cf"; + version = "0.9.0.13"; + sha256 = "0ga0jq47s83w36ipmz1wdcrg6ir5z2klppx6kcxpmkikf8f85gl9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25475,7 +26455,7 @@ self: { mkDerivation { pname = "archive"; version = "1.2.12"; - sha256 = "39184dfed32f9dc6fe8fde0d4e937d749675ef6a84e7bb968c98585d6bcbaf65"; + sha256 = "0rdgrdmmsn4qijbbprw4dbppb5klgn9lw3fyizzcd79gsgz4s61r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25495,7 +26475,7 @@ self: { mkDerivation { pname = "archiver"; version = "0.6.2.1"; - sha256 = "428223fb0944894f262f5ce76ebd2d69615c30875a6225f24f1652909092fba5"; + sha256 = "19gvja890lhn9zr2aqjshwq5qqb95nynxrsw5wk4z2a417xj70j2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base curl HTTP network ]; @@ -25514,7 +26494,7 @@ self: { mkDerivation { pname = "archlinux"; version = "1.3"; - sha256 = "a2cb945735719b5e40450ac9d5d8d6fe1b2b4c90043ce43040b82397867d3714"; + sha256 = "051pgn39f8xq80qf8g04j162n6zysvcdbj8a8m05x6vi6mbr9jx2"; libraryHaskellDepends = [ base Cabal containers directory filepath pretty ]; @@ -25532,7 +26512,7 @@ self: { mkDerivation { pname = "archlinux-web"; version = "0.1"; - sha256 = "88e468f17ef1f58682f15494703c652b1b3b95094483c368cd9008577b9ff2e7"; + sha256 = "1rzjkxxmf24hrmlc70s416akn6rbcly7152ly618dxgigvqnir48"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25556,7 +26536,7 @@ self: { mkDerivation { pname = "archnews"; version = "0.2"; - sha256 = "da3fd4073fb2528961a2a9d5e7e144e7fb4f360e2a81acf74cc63bcc0437ebec"; + sha256 = "1v7b6w2cqfy69kvsr09a1qv4zyz78khygmd9l9hqjlmj7w3x8gys"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25576,9 +26556,9 @@ self: { mkDerivation { pname = "arena"; version = "0.1"; - sha256 = "4b15bd66601e043b6c24ba74ac2e2123ef46832b9bf48eaef66770dfbba5e8e5"; + sha256 = "1rg8lnxxyw37ysp8xx4v5f1ldvr344paqx5s4in3n10yc1kbs5ab"; revision = "1"; - editedCabalFile = "fa9abdbd4a0df1eddd4c061f9e2b0d2ebe5ac7fae0a462d26024c2ba17c00139"; + editedCabalFile = "0f81q0bvmhi4c3965970zb3mmgif1lmrw7q69kfyvw8d9ayvv6ps"; libraryHaskellDepends = [ base bytes bytestring containers digest directory filepath mtl persistent-vector safe semigroups unix @@ -25600,7 +26580,7 @@ self: { mkDerivation { pname = "arff"; version = "0.1.0"; - sha256 = "45c1aebf62d65e89da12f82f131735f27db005f84b25e5f12e4f4f4227998ad7"; + sha256 = "1mwak4kl4ksg5vqya9abz02v0zgj6lbi6bzq2bd8jpnncazsxha5"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing bytestring-show old-locale time @@ -25616,7 +26596,7 @@ self: { mkDerivation { pname = "arghwxhaskell"; version = "0.8.2.0"; - sha256 = "6b88ad21393cde84f137f280826de31f121f35cf99c6c3472e423611723cdd5b"; + sha256 = "0nyx7ir12dj25r3w7ilrrwsiy4hzwdnq507j6zqq9piw74hsv23b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory wx ]; @@ -25635,7 +26615,7 @@ self: { mkDerivation { pname = "argon"; version = "0.4.1.0"; - sha256 = "d93c50ae118a4493bdc5ed94e5f3d1eaa434e78422c79e28476329bad4475bea"; + sha256 = "1sjv8zablab38wl9xir2hkkk997as7ryb57dqnyr6i4a26p50g6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25661,7 +26641,7 @@ self: { mkDerivation { pname = "argon2"; version = "1.2.0"; - sha256 = "a579557bf24cc5d3cfd787dea648e6b94c6a89abffdaa7af8978fa4316a4fcff"; + sha256 = "1zzwlhb47ykqi6psgnpzmf4nlk5rwr4adpl7sz7x7iacy9xmayd5"; libraryHaskellDepends = [ base bytestring text transformers ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck text @@ -25677,7 +26657,7 @@ self: { mkDerivation { pname = "argparser"; version = "0.3.4"; - sha256 = "e645c7a587d1a82f4e550fc5ac22c4c615c1c59429f2cff52dd393ca2a91ed7a"; + sha256 = "0ypdj4mcm4yk5pswzwi9jk2w25f6qhiari8gam72za6ihyjwfig6"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HTF HUnit ]; description = "Command line parsing framework for console applications"; @@ -25692,7 +26672,7 @@ self: { mkDerivation { pname = "arguedit"; version = "0.1.0.1"; - sha256 = "0657b7fbfb06b495c17369c6c902244280f545bea531f0904c8344256baa469f"; + sha256 = "17s6m9mjai439j8g0cd5pr2zb0224h1ckik9fg0rbd06zgxvfmq6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25713,7 +26693,7 @@ self: { mkDerivation { pname = "ariadne"; version = "0.1.2.3"; - sha256 = "e322ce03c8247071a83a8baeeae9dfe8d263a81ae74e4466a1841f48fcb01e0a"; + sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25740,7 +26720,7 @@ self: { mkDerivation { pname = "arion"; version = "0.1.0.8"; - sha256 = "1c3fe9db9733470f21b013d4368c2a02feba35ca172c3cf6cb1f3c5cff5af980"; + sha256 = "107rbbzmqg0zrgv3qb0pr8svmzh25a63dm0kn0hhyirkjzdyjgqw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -25764,7 +26744,7 @@ self: { mkDerivation { pname = "arith-encode"; version = "1.0.0"; - sha256 = "a83230d5d237ba3d12ed23418488bc522d0eb0add734b55f184c35c1981415f3"; + sha256 = "1wqm2jcc2dac31gvad6pmnq0wbajpj488h93xl93vfipsbak0cm8"; libraryHaskellDepends = [ arithmoi array base binary Cabal containers fgl hashable unordered-containers @@ -25784,7 +26764,7 @@ self: { mkDerivation { pname = "arithmatic"; version = "0.1.0.3"; - sha256 = "5825d0d6a8c000ec334b3a6eaa4601a8e329c672bb230b01a564dd2a87a2b45f"; + sha256 = "0pxlla3jmpb4ll0hn8xvfb32kqx8053alvis9cryq060m3bd09aq"; libraryHaskellDepends = [ base ]; description = "do things with numbers"; license = stdenv.lib.licenses.bsd3; @@ -25798,7 +26778,7 @@ self: { mkDerivation { pname = "arithmetic"; version = "1.2"; - sha256 = "f3ef6add91a72f24640b9f4836b322c9278609558b09ef0c592df9194c6f377a"; + sha256 = "0yipdx61ky9db46fy2cbal4qc9y94arkcj4z1dj28bx7j7fnmvzk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25827,7 +26807,7 @@ self: { mkDerivation { pname = "arithmoi"; version = "0.4.3.0"; - sha256 = "daa3343d4be19d0a8574c542c9188f6f3075098c86c69d3bc66acd5091d5d196"; + sha256 = "15nisn8m1kbaqqxrvil6ih4pac3giwccjhn5fj2hm7g19cyk98ys"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers ghc-prim integer-gmp mtl random @@ -25843,12 +26823,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 + , tasty-smallcheck, transformers + }: + mkDerivation { + pname = "arithmoi"; + version = "0.5.0.1"; + sha256 = "1hny1xnkwi0ahzdw4d1pfskdi416wl6k6p4pfzqssj79bhlpp6vg"; + configureFlags = [ "-f-llvm" ]; + libraryHaskellDepends = [ + array base containers exact-pi ghc-prim integer-gmp + integer-logarithms mtl random + ]; + testHaskellDepends = [ + base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion integer-logarithms random + ]; + homepage = "https://github.com/cartazio/arithmoi"; + description = "Efficient basic number-theoretic functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "armada" = callPackage ({ mkDerivation, base, GLUT, mtl, OpenGL, stm }: mkDerivation { pname = "armada"; version = "0.1"; - sha256 = "816deba97cab5b0acc93e3e3dd81720176cd732661fad7aec997e40a344bd5a3"; + sha256 = "18ym9cs0mr4pr6pdgyk14rrwsxh1fa0xvqz3jg60lnxbgjlynvc1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT mtl OpenGL stm ]; @@ -25862,7 +26870,7 @@ self: { mkDerivation { pname = "arpa"; version = "0.0.0.0"; - sha256 = "a39843fd9c4fb503f711e79bc989c2be4515cd312cec81077f3174a7363ac88e"; + sha256 = "13n878vafx1igw3q3v1c676iaidyqa4wk6z727vh7dagkkyl7653"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -25882,7 +26890,7 @@ self: { mkDerivation { pname = "arpack"; version = "0.1.0.0"; - sha256 = "166ab4f3172c51ef666c09947feed28e35f6f7f6a4d53e46b7d0a4a6a56c4a10"; + sha256 = "042adjjsd96hnx33xmd4yvvzcdcfsbp7z509dikfyl9c2zrv8shn"; libraryHaskellDepends = [ base concurrent-extra containers control-monad-loop data-default hmatrix ieee754 storable-complex transformers vector @@ -25897,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 = "89c96958578da5051f684e38dacad7558ec023a7b08f97eb19876dba08ce2223"; + version = "0.5.2.0"; + sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -25918,7 +26926,7 @@ self: { mkDerivation { pname = "array-forth"; version = "0.2.1.4"; - sha256 = "b5c02405214a5216299069c4050ad5302ab7f8473171bbf3464ca6f8fc9d720e"; + sha256 = "03kjkpygi9jc8vrvnw9i8zwbfaihsl50bi39j0liclja442j9h5m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25940,7 +26948,7 @@ self: { mkDerivation { pname = "array-memoize"; version = "0.6.0"; - sha256 = "76c88cb3ed04875821a5601f6a1c40f4e15ef8cb36e8a3d4004df956d1db05dc"; + sha256 = "1p05vg8mdyad03aa7s1nrgw5xqgl80f6l7v0llhmi1q4xnrqrj3n"; libraryHaskellDepends = [ array base ]; description = "Memoization combinators using arrays for finite sub-domains of functions"; license = stdenv.lib.licenses.bsd3; @@ -25953,7 +26961,7 @@ self: { mkDerivation { pname = "array-primops"; version = "0.2.0.0"; - sha256 = "ea6b68b54d21f4f6810f7e6a26c4af9dc216bdef5f44b67ea021be097f2a960a"; + sha256 = "02ln59zhkgi1l1zbci2zxyyidhlxmz22csky1y0zdx119nsnhsza"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim QuickCheck tasty tasty-quickcheck @@ -25969,19 +26977,31 @@ self: { mkDerivation { pname = "array-utils"; version = "0.3"; - sha256 = "56cdcb53e0e36a9d9a92682282dba88f4c9fae1a18b9891b3a593650577d07be"; + sha256 = "1gh7gmbm0djr78dqkf8q3ap9yk4gm3dq48k8jad9ssp3w19wpkan"; libraryHaskellDepends = [ array base ]; description = "Primitive functions for updating many elements in mutable arrays at once"; license = stdenv.lib.licenses.bsd3; }) {}; + "arrow-extras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "arrow-extras"; + version = "0.1.0.1"; + sha256 = "0v3ab3h3rg38dvmyqqfsysgfpib8i81s87wr965cf7lxhfx3lg61"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/louispan/arrow-extras#readme"; + description = "Extra functions for Control.Arrow"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "arrow-improve" = callPackage ({ mkDerivation, arrows, base, pointed, profunctors, semigroupoids }: mkDerivation { pname = "arrow-improve"; version = "0.1.0.0"; - sha256 = "87732be0845b028324507888f36b976258523711474cb0b00a445243ce46f45e"; + sha256 = "0ppl8v746lj41aqb0k2724vm4n32jxmz723qa0j860jvhkh2nww7"; libraryHaskellDepends = [ arrows base pointed profunctors semigroupoids ]; @@ -25996,7 +27016,7 @@ self: { mkDerivation { pname = "arrow-list"; version = "0.7"; - sha256 = "33f836f23648aa2cea11533f7a9941127c397eecdca105b2084dded9e039d5d8"; + sha256 = "1n6m77hdkpjd12r0b8fwxiz3jz0j86cplgsk27m2raj86vr3dy1k"; libraryHaskellDepends = [ base containers mtl ]; homepage = "https://github.com/silkapp/arrow-list"; description = "List arrows for Haskell"; @@ -26008,7 +27028,7 @@ self: { mkDerivation { pname = "arrowapply-utils"; version = "0.2"; - sha256 = "31c2b7f29d84c72e51d75bd388012faeeb124d167ff6ddb64baa3066d8adea0b"; + sha256 = "02zampc6cc5a9fvdvxkz2r6i5sxf5w0qilsvsx8jxiw4kprbghii"; libraryHaskellDepends = [ base ]; description = "Utilities for working with ArrowApply instances more naturally"; license = stdenv.lib.licenses.bsd3; @@ -26020,7 +27040,7 @@ self: { mkDerivation { pname = "arrowp"; version = "0.5.0.2"; - sha256 = "9d1aef80d0dde1a87c520783d219aa6d3b694008fe2990a169abc68e70d11a28"; + sha256 = "0a0ss5q8ximbd6hr0agy1106jfvdm8cx50q7a9yaiqfxs20fy6lx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers haskell-src ]; @@ -26030,12 +27050,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arrowp-qq" = callPackage + ({ mkDerivation, array, base, containers, haskell-src + , template-haskell, transformers + }: + mkDerivation { + pname = "arrowp-qq"; + version = "0.1"; + sha256 = "05cj6drvnk74bcjkr1pqj65c57y09gwmribii887jvg6p77abkgv"; + libraryHaskellDepends = [ + array base containers haskell-src template-haskell transformers + ]; + homepage = "http://www.haskell.org/arrows/"; + description = "quasiquoter translating arrow notation into Haskell 98"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "arrows" = callPackage ({ mkDerivation, base, Stream }: mkDerivation { pname = "arrows"; version = "0.4.4.1"; - sha256 = "5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2"; + sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v"; libraryHaskellDepends = [ base Stream ]; homepage = "http://www.haskell.org/arrows/"; description = "Arrow classes and transformers"; @@ -26047,7 +27084,7 @@ self: { mkDerivation { pname = "artery"; version = "0.1.1"; - sha256 = "19ab592489c73529276f1bd40e9822772f65974dfecffb701092352bae9248bb"; + sha256 = "1fs8jap2ndcj21qgpkzy9nbnabvp4ac0xm0vdwkjjdf7i4j5kaqr"; libraryHaskellDepends = [ base containers profunctors transformers ]; @@ -26059,22 +27096,22 @@ self: { "arx" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-nums, containers, file-embed, parsec, process - , shell-escape, template-haskell + , bytestring-nums, containers, file-embed, hashable, parsec + , process, shell-escape, template-haskell }: mkDerivation { pname = "arx"; - version = "0.2.2"; - sha256 = "a294fdbeb0e5da2762e855620c75289fbac09872efa76c14e1a47dd2d2ef8011"; + version = "0.2.3"; + sha256 = "1dlxc36sfsk0mc196v9z0kzgbz9qg2ln8ds8d2lmvi8zqyl9v0ha"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring bytestring-nums containers - file-embed parsec process shell-escape template-haskell + file-embed hashable parsec process shell-escape template-haskell ]; executableHaskellDepends = [ attoparsec base blaze-builder bytestring bytestring-nums containers - file-embed parsec process shell-escape template-haskell + file-embed hashable parsec process shell-escape template-haskell ]; homepage = "http://github.com/solidsnack/arx/"; description = "Archive execution tool"; @@ -26086,9 +27123,9 @@ self: { mkDerivation { pname = "arxiv"; version = "0.0.1"; - sha256 = "b0b731fa2a38b038af86627e11bc00bcbdefc8c4a4bd3bd2d8842308c8465ac1"; + sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh"; revision = "1"; - editedCabalFile = "746311e6003440248df63acd19e428cbdbf5c95cdd3ee0993d2c89c7b2ceada7"; + editedCabalFile = "19xdrsrcg29c7ncy0gnxbk4zbnyb53j1kk9sys6j8h1l03k12qvl"; libraryHaskellDepends = [ base parsec split tagsoup ]; homepage = "http://github.com/toschoo/Haskell-Libs"; description = "A client for the Arxiv API"; @@ -26100,7 +27137,7 @@ self: { mkDerivation { pname = "ascetic"; version = "0.0.0.4"; - sha256 = "134f75c63a466d492005faa3a323cd798c8f2b8d71804807dcb69b9530bab1b0"; + sha256 = "1c5ip8q9b6xnvh3li03iilmqz33rrlis78zs0lh4jva67b37akqk"; libraryHaskellDepends = [ base MissingH ]; description = "Generic markup builder"; license = stdenv.lib.licenses.mit; @@ -26113,7 +27150,7 @@ self: { mkDerivation { pname = "ascii"; version = "0.0.4.1"; - sha256 = "fbee4b1b3429ab7c95e87644a9571d6c53ae9efd08671ac979cd4efd8615fcf6"; + sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable text ]; @@ -26123,12 +27160,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ascii-art-to-unicode" = callPackage + ({ mkDerivation, base, comonad, doctest, strict }: + mkDerivation { + pname = "ascii-art-to-unicode"; + version = "0.1.0.1"; + sha256 = "1c9fgswj4sbgcx76c2a41mx8jhi9a28vc43w57cmzm7hgp8pxan3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base comonad ]; + executableHaskellDepends = [ base strict ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/fmthoma/ascii-art-to-unicode#readme"; + description = "ASCII Art to Unicode Box Drawing converter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { pname = "ascii-cows"; version = "0.0.2.0"; - sha256 = "f8a387478eba76fc0616bd0c891bf18afbb9ebc55f0cedfb143a6355b196b635"; + sha256 = "0ddnjsqmaqrs2kxys32zqpmvkyway4dqj35x2q3gqxmsir3qg8zq"; libraryHaskellDepends = [ base random-extras random-fu text ]; homepage = "http://github.com/passy/cows-hs"; description = "A collection of ASCII cows. Moo."; @@ -26140,7 +27193,7 @@ self: { mkDerivation { pname = "ascii-flatten"; version = "0.1.1.0"; - sha256 = "6b561658a8d7eb1737374eece298cf49dc773ca4a5b93c3c4df11e60d9ed6fcd"; + sha256 = "1kbgxpcn07pi9ly3rfd5lhy7gp29rycf5v2f6wvigsypm1c1cmkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -26158,7 +27211,7 @@ self: { mkDerivation { pname = "ascii-progress"; version = "0.3.3.0"; - sha256 = "7e3fa6b80c09a83c9ba8a0644ef304ca92d65b76383b8dd023ff9f89ebec913e"; + sha256 = "0glixkmqk7zz4g88sfrqfrdxd4na0krlwr50m2dkra091jwacgvy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26179,7 +27232,7 @@ self: { mkDerivation { pname = "ascii-table"; version = "0.3.0.0"; - sha256 = "c9e548aafcdc778811230075f65050edab27627140ac5c3102db779ea927998e"; + sha256 = "13lr4ylrwxyv08qmrb20f5i2gazda18gcx804c8qhxywzjm4irf9"; libraryHaskellDepends = [ aeson base containers dlist hashable text unordered-containers vector wl-pprint-extras @@ -26196,7 +27249,7 @@ self: { mkDerivation { pname = "ascii-vector-avc"; version = "0.1.0.0"; - sha256 = "e4f37b6e17bb2400354db3783206ebaa6d41e4549b08a4c757f41d2030e3a726"; + sha256 = "09m7wcq207glaz3s824vakj42vdaxc334y5k9lsh095v2xp7pwz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26217,7 +27270,7 @@ self: { mkDerivation { pname = "ascii85-conduit"; version = "0.1.0.0"; - sha256 = "856abadac7fa9e61307089f0455df72ff6de4cee7b297bf6e72bcbe183e138a4"; + sha256 = "191qw61y3jrbwzv7nabvxr6dxxigyxflbw49f0q637psqzdblsl5"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit hspec ]; description = "Conduit for encoding ByteString into Ascii85"; @@ -26233,7 +27286,7 @@ self: { mkDerivation { pname = "asciidiagram"; version = "1.3.3"; - sha256 = "694948f5f408aa7dfcab17ffefb74e413f1d3dacf2c523bfbf9ecaf972645f18"; + sha256 = "062zcirgkjlypyzj7igjmhyisgs19svyzzqpmgy7vah8ykslhjb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26253,7 +27306,7 @@ self: { mkDerivation { pname = "asic"; version = "1.2"; - sha256 = "cf393fbf5b2c7893bc53b1da4db79c366d537a4ec5cc1d4537ca90089a9bf770"; + sha256 = "0w7pkfd0i46a6x2ivk659rx56v9nkjvlvnmiafy96y1cbfzkyffg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ asil base bytestring utf8-string ]; @@ -26271,7 +27324,7 @@ self: { mkDerivation { pname = "asil"; version = "1.2"; - sha256 = "9d63a2a19e6e7598018abd3bd9f7698664e1db6beca412a8773ca4a9676bf9fe"; + sha256 = "1zprddksk91wfyl1597cdgdy2r46d7vxjfxxi80rhxbfkshs4qwx"; libraryHaskellDepends = [ array base binary bytestring containers data-binary-ieee754 directory filepath haskell-src-exts mtl pretty utf8-string uuagc @@ -26288,9 +27341,9 @@ self: { mkDerivation { pname = "asn1-data"; version = "0.7.2"; - sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1"; + sha256 = "18dc4d71pvp5q6npxicqqj3fk6n39lm98450vvhgg4y9rc1rr6c3"; revision = "1"; - editedCabalFile = "1543bc1ee13d3f4b9ee6f9445edede596d5fe7f8a4551333b54634aad5b112a3"; + editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal mtl text ]; @@ -26300,31 +27353,13 @@ self: { }) {}; "asn1-encoding" = callPackage - ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl - , tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "asn1-encoding"; - version = "0.9.4"; - sha256 = "a78058f7db08fbd72f2b40c72af324a4d31ea95d70b4bfa372107b980394dde8"; - libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; - testHaskellDepends = [ - asn1-types base bytestring hourglass mtl tasty tasty-quickcheck - text - ]; - homepage = "http://github.com/vincenthz/hs-asn1"; - description = "ASN1 data reader and writer in RAW, BER and DER forms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asn1-encoding_0_9_5" = callPackage ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl , tasty, tasty-quickcheck, text }: mkDerivation { pname = "asn1-encoding"; version = "0.9.5"; - sha256 = "1e863bfd363f6c3760cc80f2c0d422e17845a9f79fe006030db202ecab5aaf29"; + sha256 = "0adgbamyq0mj1l1hdq4zyyllay714bac1wl0rih3fv1z6vykp1hy"; libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; testHaskellDepends = [ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck @@ -26333,7 +27368,6 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-parse" = callPackage @@ -26341,7 +27375,7 @@ self: { mkDerivation { pname = "asn1-parse"; version = "0.9.4"; - sha256 = "c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708"; + sha256 = "025prsihk5g6rdv9xlfmj0zpa0wa3qjzj5i4ilzvg7f6f3sji8y6"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring ]; @@ -26355,7 +27389,7 @@ self: { mkDerivation { pname = "asn1-types"; version = "0.3.2"; - sha256 = "0c571fff4a10559c6a630d4851ba3cdf1d558185ce3dcfca1136f9883d647217"; + sha256 = "05vjchyqiy9n275cygffhn0ma7fz7jx52j0dcdm9qm8h9bziymqc"; libraryHaskellDepends = [ base bytestring hourglass memory ]; homepage = "http://github.com/vincenthz/hs-asn1-types"; description = "ASN.1 types"; @@ -26368,7 +27402,7 @@ self: { mkDerivation { pname = "asn1dump"; version = "0.1.0"; - sha256 = "47d2f16ca97224fe7a67d7316943df5143db969b48a6183a71e3deb900e86d16"; + sha256 = "05kdx00bkpp3f4x1i9j8kfbdnhsivx1njcfpcxxgw93jm5ng3lj7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -26379,12 +27413,23 @@ 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 { pname = "assembler"; version = "0.0.1"; - sha256 = "1a0bd26ce9c09050a7d7d55fcc1aeb54cf114f71498b115a2c91e1339b753cb3"; + sha256 = "1crwfndk7qci5id132s9f57i3kslxcdcqpymsykm1460x5nd42qs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ghc-binary parsec ]; @@ -26401,7 +27446,7 @@ self: { mkDerivation { pname = "assert"; version = "0.0.1.2"; - sha256 = "26e1f26aadab9615aa6a13fe6a233675af4c1613ab2e2dc37071a29ad4cdcc5f"; + sha256 = "0pycrpa9m8kif31jsbmb2cb4rbvm6qinmzhkdam1b5mbmmmg5q96"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring Cabal directory filepath system-posix-redirect @@ -26416,7 +27461,7 @@ self: { mkDerivation { pname = "assert-failure"; version = "0.1.1.0"; - sha256 = "a13e63825502aa2568fd531fef8422676246e63b3e905c94108827eb21a4b225"; + sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1"; libraryHaskellDepends = [ base pretty-show text ]; homepage = "https://github.com/Mikolaj/assert-failure"; description = "Syntactic sugar improving 'assert' and 'error'"; @@ -26430,7 +27475,7 @@ self: { mkDerivation { pname = "assertions"; version = "0.1.0.4"; - sha256 = "487ec9ffc04507eff67fe762f65b275835d8ee02221223300c0bccbccc3257ac"; + sha256 = "1b2p6b6brk0b1hq264i20bpdhdaq4xdzcqp7gzvfy1s5q3zwjzj8"; libraryHaskellDepends = [ ansi-terminal base containers ]; testHaskellDepends = [ base interpolate process ]; description = "A simple testing framework"; @@ -26442,7 +27487,7 @@ self: { mkDerivation { pname = "assimp"; version = "0.1"; - sha256 = "f0136d61be5b8e58c7117d81d55f8a1fb18556f80a585a8c5b013604b6390e4a"; + sha256 = "0jhf76v08dh1bf65ln0az1b8bc8zi9gxb0bx273mi3jvprhns4zh"; libraryHaskellDepends = [ base haskell98 vect ]; librarySystemDepends = [ assimp ]; libraryToolDepends = [ c2hs ]; @@ -26451,12 +27496,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) assimp;}; + "ast-monad" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ast-monad"; + version = "0.1.0.0"; + sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/mkdag/ast-monad#readme"; + description = "A library for constructing AST by using do-notation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ast-monad-json" = callPackage + ({ mkDerivation, ast-monad, base, hspec, text }: + mkDerivation { + pname = "ast-monad-json"; + version = "0.1.0.1"; + sha256 = "0a0pzcma574rrx6klfgk16y6ng22glwj1l5c3rz5w32a22ildfz6"; + libraryHaskellDepends = [ ast-monad base text ]; + testHaskellDepends = [ ast-monad base hspec text ]; + homepage = "https://github.com/mkdag/ast-monad-json#readme"; + description = "A library for writing JSON"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "astar" = callPackage ({ mkDerivation, base, hashable, psqueues, unordered-containers }: mkDerivation { pname = "astar"; version = "0.3.0.0"; - sha256 = "2117c007d5daa88401a49c994b8e3361ddae331d458b1a403fac2a4f304b9b87"; + sha256 = "11wv9cq4yamc7x01m2s53lrsxpb16f74p6cwlh0q9a6ssl3w05r1"; libraryHaskellDepends = [ base hashable psqueues unordered-containers ]; @@ -26472,7 +27543,7 @@ self: { mkDerivation { pname = "astrds"; version = "0.1.1"; - sha256 = "fa6b33559e99940af41e104af554cc826735d61438ff0ebb14fe866a7e3162fd"; + sha256 = "1zb265z6m1py2jxhxzrq2kb3arw2riagajhh3vs0m54rkrak6szs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -26484,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 @@ -26492,7 +27581,7 @@ self: { mkDerivation { pname = "astview"; version = "0.1.4"; - sha256 = "f42772a41c1803733423af36e95721171b9afdef9a6beb1ddf20934dd7e26453"; + sha256 = "0lv4wbblv4r0vwfynswsxzyrl6qp45byjdmg4cs760qq3jj749zl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -26509,7 +27598,7 @@ self: { mkDerivation { pname = "astview-utils"; version = "0.1"; - sha256 = "d6bb2e6f129e6c852480403c09c1ee8887936af4b424ce5f88a735569fa518e7"; + sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn"; libraryHaskellDepends = [ base containers syb ]; description = "Interfacing between hint and astview"; license = stdenv.lib.licenses.bsdOriginal; @@ -26521,8 +27610,8 @@ self: { }: mkDerivation { pname = "async"; - version = "2.1.1"; - sha256 = "24134b36921f9874abb73be90886b4c23a67a9b4990f2d8e32d08dbfa5f74f90"; + version = "2.1.1.1"; + sha256 = "1qj4fp1ynwg0l453gmm27vgkzb5k5m2hzdlg5rdqi9kf8rqy90yd"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -26537,7 +27626,7 @@ self: { mkDerivation { pname = "async-ajax"; version = "0.2.0.0"; - sha256 = "11eab7c772155f6219dc37d24f7601192e9f16de81fdf53b794920e2d6145204"; + sha256 = "012j2kbf4829g4xzbzc1vqb9ybhr05v4zlipvhcn4pqmfb3vgshi"; libraryHaskellDepends = [ async base ghcjs-ajax text ]; homepage = "https://github.com/agrafix/ghcjs-ajax#readme"; description = "Crossbrowser async AJAX Bindings for GHCJS"; @@ -26551,7 +27640,7 @@ self: { mkDerivation { pname = "async-dejafu"; version = "0.1.3.0"; - sha256 = "d893a14c85af9cb947e3b3298b77c3665112a54cc8876dca8fc08e6871952afd"; + sha256 = "1z9ajmqni3n0iz56v1y89jji4lb6qdvqnadkwd3vk75ghm6a34yq"; libraryHaskellDepends = [ base concurrency exceptions ]; testHaskellDepends = [ base concurrency dejafu HUnit hunit-dejafu @@ -26566,13 +27655,26 @@ self: { mkDerivation { pname = "async-extra"; version = "0.1.0.0"; - sha256 = "47cf509bc09d106cd229c4568e4c02ce085b2541e856b3be0c75cf62217dc02a"; + sha256 = "0an0glhn5kvm1jzb6mp884jmn26f0968wmn45796q44xq2dm1ks7"; libraryHaskellDepends = [ async base containers deepseq ]; homepage = "https://github.com/agrafix/async-extra#readme"; description = "Useful concurrent combinators"; license = stdenv.lib.licenses.mit; }) {}; + "async-extra_0_2_0_0" = callPackage + ({ mkDerivation, async, base, deepseq, split }: + mkDerivation { + pname = "async-extra"; + version = "0.2.0.0"; + sha256 = "0hyc27mphjpc7m9khs47ch0q6j6hy2hmibk82vzrfmc3rfjxa1hd"; + libraryHaskellDepends = [ async base deepseq split ]; + homepage = "https://github.com/agrafix/async-extra#readme"; + description = "Useful concurrent combinators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-extras" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base , monad-control, SafeSemaphore, stm, transformers-base @@ -26580,7 +27682,7 @@ self: { mkDerivation { pname = "async-extras"; version = "0.1.3.2"; - sha256 = "ac26da945147b74c5f1a29c7765e08d081d15dea5e609e5dc086a7b09efa32c7"; + sha256 = "1irjzagb19w6q1frwq2yx9fx30fh11g7dir939glrds7a6adl9mc"; libraryHaskellDepends = [ async base lifted-async lifted-base monad-control SafeSemaphore stm transformers-base @@ -26596,7 +27698,7 @@ self: { mkDerivation { pname = "async-io-either"; version = "0.1.0.4"; - sha256 = "f0326b543a51cf06e3bd8375d2ce18d6a60f7dd413bac1e740dc90083cbc7a6a"; + sha256 = "0sksphy0i46w83kw3fhksiyhz9nn337d4xc3ppihdksi79a6ncph"; libraryHaskellDepends = [ async base retry transformers ]; homepage = "https://github.com/mankyKitty/async-io-either#readme"; description = "Could be useful"; @@ -26608,7 +27710,7 @@ self: { mkDerivation { pname = "async-manager"; version = "0.1.1.0"; - sha256 = "93199c669c6fcf28f9676ae482e98416ff784ede72a6cfeb51afd8e9811d5c00"; + sha256 = "002w3n0ykn5ga7mwz9kjvr77izqnhklq5r3aczwjikvgkik9q6ck"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base stm unordered-containers ]; @@ -26626,7 +27728,7 @@ self: { mkDerivation { pname = "async-pool"; version = "0.9.0.1"; - sha256 = "54c7cc38f00e85978c59569744ca11802a28a93d9a7bbfc83d87c72158bee28b"; + sha256 = "12z2prc23iw77p4byyws7nljhal0275495snb669g18fy0wcrisl"; libraryHaskellDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -26639,12 +27741,103 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "async-refresh" = callPackage + ({ 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.2"; + sha256 = "1hq1h9ngvg12rwn2xbby69w9y19gm4qaqzdfc1iv5019l5kqncls"; + libraryHaskellDepends = [ + base 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 text + ]; + homepage = "https://github.com/mtesseract/async-refresh"; + description = "Package implementing core logic for refreshing of expiring data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "async-refresh-tokens" = callPackage + ({ mkDerivation, async-refresh, base, bytestring, criterion + , formatting, HUnit, lens, lifted-async, monad-control + , monad-logger, safe-exceptions, stm, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "async-refresh-tokens"; + version = "0.1.0"; + sha256 = "0ghrqdw2cfw42x7dlq7r1hfv70gvp07wkpmbhkja23llzjf1wd1y"; + libraryHaskellDepends = [ + async-refresh base bytestring formatting lens lifted-async + 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; + }) {}; + + "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 + , test-framework-hunit, transformers-base + }: + mkDerivation { + pname = "async-timer"; + version = "0.1.4.0"; + sha256 = "00kdhxq0wpml4f7gdjvr2h8km8i3yj68bawpa229rzpp0y0yp3k3"; + libraryHaskellDepends = [ + base lifted-async lifted-base monad-control safe-exceptions + transformers-base + ]; + testHaskellDepends = [ + base containers criterion HUnit lifted-async test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "asynchronous-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "asynchronous-exceptions"; version = "1.1.0.1"; - sha256 = "1ad5b98f306f55365f27909eafa753f747f36c3ede2b62cb605107c36714dd6d"; + sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/feuerbach/asynchronous-exceptions"; description = "Distinguish between synchronous and asynchronous exceptions"; @@ -26657,7 +27850,7 @@ self: { mkDerivation { pname = "aterm"; version = "0.1.0.1"; - sha256 = "706ae520b6356ac41957c43670876383c8533d23cbbdc8b2c71c999f63944a09"; + sha256 = "02aajiirz68wqyrcigfb4cym7j43cf3p0dn4awcw8simnqhfaskh"; libraryHaskellDepends = [ array base containers ghc-prim ]; homepage = "https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk/atermlib"; description = "serialisation for Haskell values with sharing support"; @@ -26669,7 +27862,7 @@ self: { mkDerivation { pname = "aterm-utils"; version = "0.2.0.2"; - sha256 = "40ce898c1159d27c2bc6cf20100d57736afc6ae9a0d81a208740d1dc5b15d37b"; + sha256 = "0yyk2mdxrla0hwh1mn50x5mgqskkaw6i086gqqmprljr2668kkj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ]; @@ -26685,7 +27878,7 @@ self: { mkDerivation { pname = "atl"; version = "17072"; - sha256 = "3aee6a8ddfe9d9b0db710889fb49b8a08662ee3026153e15ca83100e2a34a07a"; + sha256 = "0ym06hm0w443r8akw59663p651m0p14zp288f7dv1ng9vy6nmvis"; libraryHaskellDepends = [ base ]; description = "Arrow Transformer Library"; license = stdenv.lib.licenses.bsd3; @@ -26697,12 +27890,12 @@ self: { , configurator, containers, cryptohash, hostname, http-client , http-client-tls, http-media, http-types, jwt, mtl, network , network-api-support, network-uri, snap, snap-core, split, text - , time, time-units, transformers + , time, time-units, transformers, zlib }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.7.0.1"; - sha256 = "febe860cd0151f4b26c9180c71ca7526b99c204e20dc5b03e8a63b827214ee9a"; + version = "0.8.0.0"; + sha256 = "1gja0q9bxr86wd4cwi6w4iv5bimb37jk7gy5bzc727fp2k75ja42"; libraryHaskellDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers @@ -26710,11 +27903,12 @@ self: { http-types jwt mtl network network-api-support network-uri snap snap-core split text time time-units transformers ]; + libraryPkgconfigDepends = [ zlib ]; homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core"; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) zlib;}; "atlassian-connect-descriptor" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cases, HUnit @@ -26723,8 +27917,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.4.1"; - sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8"; + version = "0.4.5.0"; + sha256 = "0dzswy71awgxqchb3ydq8idxlvqaalal45fx5prhr7xg4077apm0"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -26745,7 +27939,7 @@ self: { mkDerivation { pname = "atmos"; version = "0.4.0.0"; - sha256 = "4bc25f5e4a93440f61495cc2fd33a06a1f0bd1193977937ebf1e83e22fb21999"; + sha256 = "168rn8py50qypxz96xrr378hn7val0rzvhjw95hhyi4k99g5zhjb"; libraryHaskellDepends = [ base dimensional ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -26759,7 +27953,7 @@ self: { mkDerivation { pname = "atmos-dimensional"; version = "0.1.2"; - sha256 = "2d8d4ba5079055577ccf71e59bdae68e329b403456f758181a680efbc36534a7"; + sha256 = "19rlcp1zn3k838c5ixsn6i09nclfwvd9prbirxy5fmch0yjlp39d"; libraryHaskellDepends = [ atmos base dimensional ]; description = "dimensional wrapper on atmos package"; license = stdenv.lib.licenses.bsd3; @@ -26770,7 +27964,7 @@ self: { mkDerivation { pname = "atmos-dimensional-tf"; version = "0.1.2"; - sha256 = "154e24d2d7bc76a8b08f5f542626256c8c79d6031fb8341be06ab375efd9e215"; + sha256 = "05g2v7ppbcvaw0dk9f0z0gb7k33c4lk2cm2ziyqahxmwsz928khm"; libraryHaskellDepends = [ atmos base dimensional-tf ]; description = "dimensional-tf wrapper on atmos package"; license = stdenv.lib.licenses.bsd3; @@ -26785,7 +27979,7 @@ self: { mkDerivation { pname = "atndapi"; version = "0.1.1.0"; - sha256 = "1c4be357e322c13dd0197252fca5a2eff6ebdd913920e2a9ae66e295aadbfeda"; + sha256 = "1npyvfm9bqk6msly481rj7fypxpglajzqlkj3783vh92wdby6jqw"; libraryHaskellDepends = [ aeson base bytestring conduit data-default http-conduit http-types lifted-base monad-control monad-logger mtl parsec resourcet text @@ -26807,7 +28001,7 @@ self: { mkDerivation { pname = "atom"; version = "1.0.13"; - sha256 = "0720875ecde70f5b006a511852df7a3d47279c6553f517a3803b8b80d3f83484"; + sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807"; libraryHaskellDepends = [ base bimap containers mtl process syb ]; homepage = "http://tomahawkins.org"; description = "An EDSL for embedded hard realtime applications"; @@ -26820,8 +28014,8 @@ self: { }: mkDerivation { pname = "atom-basic"; - version = "0.2.4"; - sha256 = "b37fb9757b78ff4a8e6586815cb2b9768c73f58cc3f27f635a4ab63736d529eb"; + version = "0.2.5"; + sha256 = "1vkm5wfsgprs42qjzxchgrpxj3xalpg2zd79n9isvlxsp1krdgi4"; libraryHaskellDepends = [ base base64-bytestring bytestring network network-uri text time ]; @@ -26839,7 +28033,7 @@ self: { mkDerivation { pname = "atom-conduit"; version = "0.4.0.1"; - sha256 = "62965b9adac9b4fefda18a2aceb464b15e15c0ef267edba80372e8c3225b5ccf"; + sha256 = "1kswbcic7s3j0fldnzi6xz01apmicjscwalal7yzxd69vad5p5k2"; libraryHaskellDepends = [ base blaze-builder conduit conduit-combinators lens-simple mono-traversable parsers safe-exceptions text time timerep @@ -26855,7 +28049,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "atom-conduit_0_4_0_2" = callPackage + "atom-conduit_0_4_0_3" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators , data-default, hlint, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty @@ -26864,8 +28058,8 @@ self: { }: mkDerivation { pname = "atom-conduit"; - version = "0.4.0.2"; - sha256 = "dca5d06000961b82120440b17ff241dc785426b2bf50071f1979f8d4f6e839ff"; + version = "0.4.0.3"; + sha256 = "0pl5p9zj33fjjgrxkyj2y45r3qyl5p8z9g17zg19gvqzszsk3vr1"; libraryHaskellDepends = [ base blaze-builder conduit conduit-combinators lens-simple mono-traversable parsers safe-exceptions text time timerep @@ -26887,7 +28081,7 @@ self: { mkDerivation { pname = "atom-msp430"; version = "0.5.3"; - sha256 = "9a4973653ad4652192e2069584a186cfd630f7300f890ca564a3ade1ca78010a"; + sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs"; libraryHaskellDepends = [ atom base mtl ]; homepage = "https://github.com/eightyeight/atom-msp430"; description = "Convenience functions for using Atom with the MSP430 microcontroller family"; @@ -26895,12 +28089,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "atomic-modify" = callPackage + ({ mkDerivation, base, stm }: + mkDerivation { + pname = "atomic-modify"; + version = "0.1.0.0"; + sha256 = "138nm3mgrr8yk4dlk4zlrxzrqp250wxl0sj3qbb3n1vyx5mhw02y"; + libraryHaskellDepends = [ base stm ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "A typeclass for mutable references that have an atomic modify operation"; + license = stdenv.lib.licenses.asl20; + }) {}; + "atomic-primops" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; version = "0.8.0.4"; - sha256 = "47e1e393848c0538aa1733a90a63bd08a00915ec7499d90014aaecc792db9864"; + sha256 = "0r4qvf9cgv5a2h0dk6blxhahk808pmihma9k2ym3h1cchj9y7qa7"; libraryHaskellDepends = [ base ghc-prim primitive ]; homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "A safe approach to CAS and other atomic ops in Haskell"; @@ -26914,9 +28120,9 @@ self: { mkDerivation { pname = "atomic-primops-foreign"; version = "0.6.2"; - sha256 = "f5ced9cbff2cfabde28dab10f953162e3654a962f075e8e828d668d27b5ecddd"; + sha256 = "1pfdbrxx4s6n53lfhxghcalm8dif2r9zj45bipibvyiczz5xkkpm"; revision = "1"; - editedCabalFile = "fd1067adbd96e923226347dccaa9e3e221439702fe7824c86db44eb5b7f6c318"; + editedCabalFile = "0663ysvvakmldp428y7y0abl68g2wflwmp27cci27scnpnnnf47x"; libraryHaskellDepends = [ base bits-atomic ]; testHaskellDepends = [ base bits-atomic HUnit test-framework test-framework-hunit time @@ -26932,7 +28138,7 @@ self: { mkDerivation { pname = "atomic-primops-vector"; version = "0.1.0.1"; - sha256 = "07ef111ffb8ba7804862d6843a2006b714a9d76f261e9831249a9d1f7ba49554"; + sha256 = "0m4mlixiz7cs4hqrh7i6dzbsj55p0qh3m16nc94819wbzcgi3vq7"; libraryHaskellDepends = [ atomic-primops base primitive vector ]; testHaskellDepends = [ base vector ]; description = "Atomic operations on Data.Vector types"; @@ -26947,7 +28153,7 @@ self: { mkDerivation { pname = "atomic-write"; version = "0.2.0.5"; - sha256 = "dbc7b4c31c734ad12d8f6c05b5d1384ee57f50ad8ff1a703d560b39e2f0458c5"; + sha256 = "1iaq0hprxcv0sl1sgwcgmm87zraf738va1bciwnx2jkk3k1v9iyv"; libraryHaskellDepends = [ base bytestring directory filepath temporary text unix-compat ]; @@ -26967,7 +28173,7 @@ self: { mkDerivation { pname = "atomo"; version = "0.4.0.2"; - sha256 = "a8f38a901f07059717b062e237ad077d5c7b238d864c67330a25fed424317e41"; + sha256 = "0hby64jd9zi518rnfk46ilipnp3x0ynkgqk2n0brf1873y88mwx8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26992,7 +28198,7 @@ self: { mkDerivation { pname = "atp-haskell"; version = "1.14"; - sha256 = "350bd95dee79275f6ee1929f8ea4940a2a909f8ab8133f20c0c3c4abbfec04d0"; + sha256 = "1l04xjzspi63q0h3y4xqiagr0ahajjj8x7wjw5p5y9vrxrfxj2rm"; libraryHaskellDepends = [ applicative-extras base containers extra HUnit mtl parsec pretty template-haskell time @@ -27008,7 +28214,7 @@ self: { mkDerivation { pname = "atrans"; version = "0.1.1.0"; - sha256 = "9119df84f2dacc53935238c4c225f26937e25898d91b8c2d973e4cf467249b66"; + sha256 = "0rlv4ikz8k1yjwnqq6yrk1cf4dv9y8jw5i1qaa9m7k6sya2dy6ci"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/aphorisme/atrans"; description = "A small collection of monad (transformer) instances"; @@ -27020,7 +28226,7 @@ self: { mkDerivation { pname = "attempt"; version = "0.4.0.1"; - sha256 = "b0e7e461d07a4ebc5364b048748bdbe6bee742eb1504213242730aa31b0178bf"; + sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh"; libraryHaskellDepends = [ base failure ]; homepage = "http://github.com/snoyberg/attempt/tree/master"; description = "Concrete data type for handling extensible exceptions as failures. (deprecated)"; @@ -27034,7 +28240,7 @@ self: { mkDerivation { pname = "attic-schedule"; version = "0.2.0"; - sha256 = "23c66396ce46fdb6c617b074257dbda3172e5621bc8079dcc1849c09ed6f35e3"; + sha256 = "1qrmdznhk744q7f7k05w45b2w5x3pmyjax5h2z3bdza6rsb67ii3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -27056,7 +28262,7 @@ self: { mkDerivation { pname = "atto-lisp"; version = "0.2.2.2"; - sha256 = "24bacde886e3ee8adf50cb33f34b935a254cdd415bebd7c81ac75b8dfb0a0066"; + sha256 = "0rh01bxqsny73b4dgssv87flq9asjd5z6cyba3gqmvp3hvlcvfi4"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers deepseq text @@ -27080,7 +28286,7 @@ self: { mkDerivation { pname = "attoparsec"; version = "0.13.1.0"; - sha256 = "52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64"; + sha256 = "0r1zrrkbqv8w4pb459fj5izd1h85p9nrsp3gyzj7qiayjpa79p2j"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -27104,7 +28310,7 @@ self: { mkDerivation { pname = "attoparsec-arff"; version = "0.0"; - sha256 = "047b5a786f704e20fdb102754c35b12ae91d61551133d026d4ae557c8b01c9c9"; + sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "An ARFF file parser using Attoparsec"; license = stdenv.lib.licenses.gpl2; @@ -27115,7 +28321,7 @@ self: { mkDerivation { pname = "attoparsec-binary"; version = "0.2"; - sha256 = "05e6445b20b396c99275de3e37bf8bb18559a5666ad5136907857bf574e77a0b"; + sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "Binary processing extensions to Attoparsec"; license = stdenv.lib.licenses.bsd3; @@ -27126,7 +28332,7 @@ self: { mkDerivation { pname = "attoparsec-conduit"; version = "1.1.0"; - sha256 = "3e809f4e354ef392cd7266dc35b8f660cb5810974159c5106a0c3ed7bf1db6a3"; + sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y"; libraryHaskellDepends = [ base conduit ]; doHaddock = false; homepage = "http://github.com/snoyberg/conduit"; @@ -27139,7 +28345,7 @@ self: { mkDerivation { pname = "attoparsec-csv"; version = "0.1.1.0"; - sha256 = "f7f8436b8d5bc5f846c6cb25041768bdbb4fb6d9d8be66af481144a885787f39"; + sha256 = "0fbzg22shi0i92pndgnqv6v4zfxxd0bh89fbqr3giiavimml7y7p"; libraryHaskellDepends = [ attoparsec base text ]; homepage = "https://github.com/robinbb/attoparsec-csv"; description = "A parser for CSV files that uses Attoparsec"; @@ -27152,8 +28358,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "0.1.1.2"; - sha256 = "65ff7d4a796ea2c1991aeda1e288f0ff931e5fb1831d6571faa3cf68a9367b58"; + version = "1.0.2"; + sha256 = "0qkjl80vmprqq8fd6ksxaqmqq5izd1cg7c8v98s8j59kdzw322ab"; libraryHaskellDepends = [ attoparsec attoparsec-time base base-prelude bytestring scientific text time @@ -27168,7 +28374,7 @@ self: { mkDerivation { pname = "attoparsec-enumerator"; version = "0.3.4"; - sha256 = "be95a763ebbec5529f486e62e49ce6709f14e688138fc36cff5590613690f588"; + sha256 = "127mj0v6342mzxnc73qki3k197vhwsff8qkf92gm5idyxdisg5dy"; libraryHaskellDepends = [ attoparsec base bytestring enumerator text ]; @@ -27182,12 +28388,24 @@ self: { mkDerivation { pname = "attoparsec-expr"; version = "0.1.1.2"; - sha256 = "8d4cd436112ce9007d2831776d4c5102a5322c48993229d2d41e259c07bb457c"; + sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d"; libraryHaskellDepends = [ attoparsec base ]; description = "Port of parsec's expression parser to attoparsec"; license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec-iso8601" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, text, time }: + mkDerivation { + pname = "attoparsec-iso8601"; + version = "1.0.0.0"; + sha256 = "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a"; + libraryHaskellDepends = [ attoparsec base base-compat text time ]; + homepage = "https://github.com/bos/aeson"; + description = "Parsing of ISO 8601 dates, originally from aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attoparsec-iteratee" = callPackage ({ mkDerivation, attoparsec, base, bytestring, iteratee , transformers @@ -27195,7 +28413,7 @@ self: { mkDerivation { pname = "attoparsec-iteratee"; version = "0.4.0"; - sha256 = "5a5cbcd73aa9219efae6038af2012c4b59b1b95e2e7ffbc40a113e3226eca7c8"; + sha256 = "1j57xhk34ghi1b2gnzrfbswv2nab5h0z52h3wvx9w8d97bbvqp2s"; libraryHaskellDepends = [ attoparsec base bytestring iteratee transformers ]; @@ -27212,7 +28430,7 @@ self: { mkDerivation { pname = "attoparsec-parsec"; version = "0.1.3"; - sha256 = "f8f3dcb1417720d352c7401917b66f3d2c1d6ef3b1fa744ca8486bc667702356"; + sha256 = "0mi3f1kwcss8m1679ymiydp1sb1xdyv1f6a0qx9d683p86qxrwzq"; libraryHaskellDepends = [ attoparsec base parsec text ]; testHaskellDepends = [ attoparsec base hspec markdown-unlit QuickCheck text @@ -27226,7 +28444,7 @@ self: { mkDerivation { pname = "attoparsec-text"; version = "0.8.5.3"; - sha256 = "258c59ab01b7bc7bd6ba614a8209272b18caaf894e594b8d02082a1d2e1504e3"; + sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315"; libraryHaskellDepends = [ array attoparsec base containers text ]; homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home"; description = "(deprecated)"; @@ -27239,7 +28457,7 @@ self: { mkDerivation { pname = "attoparsec-text-enumerator"; version = "0.2.0.1"; - sha256 = "ff85052120fc1fac70f67d97f918d284760456096bab9313d03290102567ce31"; + sha256 = "0cffcwji141js09r7avb15b08xl4s8cgk5vxyrqaq7zw40hhb1gz"; libraryHaskellDepends = [ attoparsec-text base enumerator text ]; description = "(deprecated)"; license = stdenv.lib.licenses.mit; @@ -27248,17 +28466,19 @@ self: { "attoparsec-time" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest - , filepath, text, time + , filepath, scientific, text, time }: mkDerivation { pname = "attoparsec-time"; - version = "0.1.1"; - sha256 = "9789759199654f3767823b62bb48182b5f83226ebde3ec74e31863309a77a362"; - libraryHaskellDepends = [ attoparsec base-prelude text time ]; + version = "0.1.3.2"; + sha256 = "0p7lzqn9is04gp98278ygbwx1ass7ami32nybx6d9n77iz2habp0"; + libraryHaskellDepends = [ + attoparsec base base-prelude scientific text time + ]; testHaskellDepends = [ base base-prelude directory doctest filepath ]; - homepage = "https://github.com/sannsyn/attoparsec-time"; + homepage = "https://github.com/nikita-volkov/attoparsec-time"; description = "Attoparsec parsers of time"; license = stdenv.lib.licenses.mit; }) {}; @@ -27268,7 +28488,7 @@ self: { mkDerivation { pname = "attoparsec-trans"; version = "0.1.1.0"; - sha256 = "472999fbb9ba157b4cdabb3fd933b9e3c8414879843963ab1c21e708e1a14b53"; + sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7"; libraryHaskellDepends = [ attoparsec base transformers ]; homepage = "https://github.com/srijs/haskell-attoparsec-trans"; description = "Interleaved effects for attoparsec parsers"; @@ -27276,12 +28496,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "attoparsec-uri" = callPackage + ({ mkDerivation, attoparsec, base, bytedump, n-tuple, strict, text + , vector + }: + mkDerivation { + pname = "attoparsec-uri"; + version = "0.0.1"; + sha256 = "0bjfk1ljm16kzb3415973w5z3zhjbb2yyphwr6v3givszgwryq6g"; + libraryHaskellDepends = [ + attoparsec base bytedump n-tuple strict text vector + ]; + homepage = "https://github.com/athanclark/attoparsec-uri#readme"; + description = "URI parser / printer using attoparsec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attosplit" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { pname = "attosplit"; version = "0.1.0.0"; - sha256 = "e4f9ae353ebeb1e2c36aa905838a2545a6e25826c72e1a3aee808064d3445007"; + sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4"; libraryHaskellDepends = [ attoparsec base bytestring ]; homepage = "http://projects.haskell.org/attosplit"; description = "Split a lazy bytestring at boundaries defined by an attoparsec parser"; @@ -27294,7 +28530,7 @@ self: { mkDerivation { pname = "atuin"; version = "0.1.1"; - sha256 = "537e67f5ba092f3ca95af187b4a47420380fb5f66fb4bbe777beaa34e8b6aef2"; + sha256 = "1wmfnvl39amyfzkvpd3gysshyf10fjjb91zibalkqbq9pbsnfzjk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -27307,15 +28543,22 @@ self: { }) {}; "audacity" = callPackage - ({ mkDerivation, base, deepseq, utility-ht }: + ({ 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"; - sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed"; + version = "0.0.1.2"; + sha256 = "1df9vk6f1gj0jpj3rmq63s3xjqc5p02hprfvq1nqgws0vfnp5lab"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq utility-ht ]; - homepage = "http://code.haskell.org/~thielema/audacity"; + 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; @@ -27330,7 +28573,7 @@ self: { mkDerivation { pname = "audiovisual"; version = "0.0"; - sha256 = "70dcafa4522d6b0cf13076872bf92069611775e370c2033d8ea35051f6d64c62"; + sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h"; libraryHaskellDepends = [ base boundingboxes colors deepseq directory filepath free freetype2 hashable JuicyPixels JuicyPixels-util lens linear mtl objective @@ -27348,7 +28591,7 @@ self: { mkDerivation { pname = "augeas"; version = "0.6.1"; - sha256 = "45e763193c57505975c331f51fba1440db5c98fce95732d6d89499084fa2e623"; + sha256 = "08z6l97hi6clv3b34mz9zjc5rns02jx1zx9iqdsmjl2p7hcn7rs5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory unix ]; @@ -27369,7 +28612,7 @@ self: { mkDerivation { pname = "augur"; version = "2008.11.17"; - sha256 = "d97550b21210b51a1b58ca530ecb3595d7c57b61ac4f9f2f04a49a9ffe706bcb"; + sha256 = "1jvbf3z9z6m40hprykxcc5xwbmwm6p5hwlyab0dimd8h2ar50xfr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -27387,17 +28630,15 @@ self: { }: mkDerivation { pname = "aur"; - version = "6.0.0"; - sha256 = "d70c3c5954b7003b6ea71266acf1de22e8ecd9e6a4288368ec7a084db02dcdbe"; - revision = "1"; - editedCabalFile = "4a58f5e075ddc72a9701937c3d1dd1da4d13095ee307e0918cad04311c99578e"; + version = "6.0.0.1"; + sha256 = "1ip97gnny26h5ayq7x0yx4afls3nhd1kfhqz3l3bsjq7fvkn8jx0"; libraryHaskellDepends = [ aeson base http-client servant servant-client text ]; testHaskellDepends = [ base http-client http-client-tls tasty tasty-hunit ]; - homepage = "https://github.com/aurapm/aura"; + homepage = "https://github.com/fosskers/haskell-aur"; description = "Access metadata from the Arch Linux User Repository"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -27410,7 +28651,7 @@ self: { mkDerivation { pname = "aur-api"; version = "0.1.2.1"; - sha256 = "8262daf22fa46e3eaba2dffc97bfac7c7146b8cac371cd4161b0e03e1cbed744"; + sha256 = "0i6ppqf3xq5hc50wswf3raw4cwbwmjzrgz6zlamkwvm45zrdlql2"; libraryHaskellDepends = [ aeson base bytestring exceptions hspec http-client http-client-tls mtl text @@ -27430,7 +28671,7 @@ self: { mkDerivation { pname = "authenticate"; version = "1.3.3.2"; - sha256 = "a65ff7791e646ea847fc6b8369addeecf6d2c3055a0b7ebe1421881103656e30"; + sha256 = "0c3fcl1i32112jz7w2ss0p1x5xpcvsnnk0vbzi3shvk43rwzfpx6"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive conduit containers http-conduit http-types monad-control @@ -27447,7 +28688,7 @@ self: { mkDerivation { pname = "authenticate-kerberos"; version = "1.0.0"; - sha256 = "b839b22799a8f002bcf22b865e664bc197f136a064b37adb30b8136253ec681a"; + sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq"; libraryHaskellDepends = [ base process text ]; homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; @@ -27459,7 +28700,7 @@ self: { mkDerivation { pname = "authenticate-ldap"; version = "0.0.3"; - sha256 = "c553e23553500dabb18f0a5f997d564a5f5b03934eec08ff95805079e8205df3"; + sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5"; libraryHaskellDepends = [ base LDAP text transformers ]; homepage = "http://github.com:mlitchard/authenticate-ldap"; description = "LDAP authentication for Haskell web applications"; @@ -27475,7 +28716,9 @@ self: { mkDerivation { pname = "authenticate-oauth"; version = "1.6"; - sha256 = "d26d9f10fd57e06fa2af066df65e578ff3ec7541efc3e6648b29a743b13f8375"; + sha256 = "0xc37yql79r9idjfdhzg85syrwwgaxggcv86myi6zq2pzl89yvfj"; + revision = "1"; + editedCabalFile = "1fxwn8bn6qs8dhxq0q04psq7zp1qvw1b6g3vmsclgyj9p7kr77ms"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -27491,7 +28734,7 @@ self: { mkDerivation { pname = "authinfo-hs"; version = "0.1.0.0"; - sha256 = "e5d2f6b8d158b84a29001d779447e463d70403ebeb0fde4bea0dbd283cf160cb"; + sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5"; libraryHaskellDepends = [ attoparsec base network text ]; homepage = "http://github.com/robgssp/authinfo-hs"; description = "Password querying for .authinfo"; @@ -27506,7 +28749,7 @@ self: { mkDerivation { pname = "authoring"; version = "0.3.4"; - sha256 = "6402eecdfb6945f2f0c8b62afc3795fde0454ed3fe4c19de66ee6236577edd49"; + sha256 = "0jfxgrbkcqpfcvg1jk7ysd74bq7xjlvzqamnr3qg4ib9zg6yw0k4"; libraryHaskellDepends = [ ansi-wl-pprint base citation-resolve containers data-default haskell-src-meta HaTeX lens mtl parsers safe template-haskell text @@ -27526,7 +28769,7 @@ self: { mkDerivation { pname = "auto"; version = "0.4.3.1"; - sha256 = "c6e26d1cbb17e3645e55bc8e9432b124520fbcba5ff32445acd4260c25cd3b41"; + sha256 = "0h9vrljhq9nlmi2j9wszpay0yli4n4r993mwamg69qqppcf6vqn6"; libraryHaskellDepends = [ base base-orphans bytestring cereal containers deepseq MonadRandom profunctors random semigroups transformers @@ -27541,7 +28784,7 @@ self: { mkDerivation { pname = "auto-update"; version = "0.1.4"; - sha256 = "5e96c151024e8bcaf4eaa932e16995872b2017f46124b967e155744d9580b425"; + sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/yesodweb/wai"; description = "Efficiently run periodic, on-demand actions"; @@ -27553,7 +28796,7 @@ self: { mkDerivation { pname = "autoexporter"; version = "1.0.0"; - sha256 = "459baf1bbb143a92a25f1de7b9ec416a5ee214bb763bfb5f5e49e10678aba0f3"; + sha256 = "1wx0mdw0dqa9brgznfvnpcaf4pka87nbkrqxbyi94fhlpcdsz6s5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -27570,7 +28813,7 @@ self: { mkDerivation { pname = "autom"; version = "0.1.0.3"; - sha256 = "40ddb2e519a584624d2e7228f52f48ad5ee57675d46edf2ef4f55b703663c6bf"; + sha256 = "1gy6ccv70nzmyhpdyvnlfmvfapmd90pzaa3j5r6n515537jv5pa0"; libraryHaskellDepends = [ base bytestring colour ghc-prim gloss JuicyPixels random vector ]; @@ -27587,7 +28830,7 @@ self: { mkDerivation { pname = "automitive-cse"; version = "0.0.1.0"; - sha256 = "d383db093ae4ec27661b43e381049257d102892a3891de00b345565d87d15b8e"; + sha256 = "13jvs63msmj5nc0dx49q5a4h5lapj8283qs33dk2gv74784xp0yk"; libraryHaskellDepends = [ base bytestring cereal cryptonite memory ]; @@ -27605,7 +28848,7 @@ self: { mkDerivation { pname = "automotive-cse"; version = "0.1.8.0"; - sha256 = "6d13185816e92bc6bd146030525c19980ceb1c12887b08e93fa46b7a9fb9db71"; + sha256 = "0wfvp6gplsx47zlhhyw828ffn34q35f54c302jywcaz92rc1h4vd"; libraryHaskellDepends = [ base bytestring bytestring-short cereal cryptonite memory ]; @@ -27626,9 +28869,9 @@ self: { mkDerivation { pname = "autonix-deps"; version = "0.3.0.0"; - sha256 = "9baa7c387af363674385b7bdb5df57904dd752ebb5a73fde53d492dab8d9e256"; + sha256 = "0mp2v6wdm4nlagg3z9xmxd9dfkchazgvbgdphm1nfqzkg8w7ralv"; revision = "1"; - editedCabalFile = "505749d414987733b04b399a581731ed9d8550de1d9d07d9bb55b6305ca26637"; + editedCabalFile = "0dv6l9f31djmpgchg78xvr88b7gd64bmi6ir9fq36xwq2ka4jmsh"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring conduit containers errors filepath lens libarchive-conduit mtl optparse-applicative process @@ -27645,9 +28888,9 @@ self: { mkDerivation { pname = "autonix-deps-kf5"; version = "0.3.0.0"; - sha256 = "c19068cbae9ba93f0b1e634ee948c52f6680ef886b779183622800d3457f555a"; + sha256 = "0njmgx2x6018ca1r2xvbi3pq0rigqm4fjkk33q5kzacvmv5ni461"; revision = "1"; - editedCabalFile = "a59bffb60ab47fb89ca0846c8fdcb68d31386196232cdeea327e3f9f2f329563"; + editedCabalFile = "0qwm68prygvy6bmdwb13jrhkhccdnvf8yv44l2fbhzxl1avgz6x5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27666,7 +28909,7 @@ self: { mkDerivation { pname = "autoproc"; version = "0.2.1"; - sha256 = "cf4c46c463fe3812d2c1bf915b5d7dfa5549f33a942b1c08615523772461e98f"; + sha256 = "13z9c4j7f8smc441qawl7brljmgsgmfmp4dzq7914f7ycg24ck6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory mtl process unix ]; @@ -27680,7 +28923,7 @@ self: { mkDerivation { pname = "avahi"; version = "0.1.1"; - sha256 = "002a431d7d5d5a1d47827756f97a24ca88cdfc88127b687cd0e88d7133e04b2c"; + sha256 = "0b2bw0rp33g8s1y6hyqji3ycv26a4ixgjmkph93isnjxglfl6ah0"; libraryHaskellDepends = [ base dbus-core text ]; description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)"; license = stdenv.lib.licenses.bsd3; @@ -27692,7 +28935,7 @@ self: { mkDerivation { pname = "avatar-generator"; version = "0.1.0.1"; - sha256 = "ff87c2530ce71ae090c4f29d41c0765652746a93b91f99a53d5125a3dd37369c"; + sha256 = "171n6zfs69ai7njrj7xrjdm78ljnfv0437gjqj8f06p71i9w51zz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base JuicyPixels random ]; @@ -27707,9 +28950,9 @@ self: { mkDerivation { pname = "average"; version = "0.6.1"; - sha256 = "3029e01ef5c46892eb0b6561283635a6da409b59a3c1cf93d1092cd6f87c138f"; + sha256 = "13qkgkwdcb09s69wzhd3b6dl1nm66lv2hqb51gmr4s64ylgf0a9h"; revision = "1"; - editedCabalFile = "90c8c1d4ece76a1f1b43f1a6bef7ba15340a2bec8e2efbb465884d6b50b5d174"; + editedCabalFile = "0x6inm86nkc8cnsgnblfxhmhld0mpbvvx9pi8cdiysp7xkac3j4h"; libraryHaskellDepends = [ base semigroups vector-space ]; description = "An average (arithmetic mean) monoid"; license = stdenv.lib.licenses.bsd3; @@ -27725,9 +28968,9 @@ self: { mkDerivation { pname = "avers"; version = "0.0.17.1"; - sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5"; - revision = "7"; - editedCabalFile = "fb4e416f91c130daa956139b2d2cac7c92735879c699802e7f2acb0115eb671f"; + sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; + revision = "12"; + editedCabalFile = "0qkaww4mvkhc56vkfqi6a7i0hkdy6zwshlqyd0cnw2p1b6cv6zy1"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -27744,7 +28987,7 @@ self: { aeson base criterion mtl network-uri resource-pool rethinkdb-client-driver text ]; - description = "empty"; + description = "Server-side implementation of the Avers storage model"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -27756,7 +28999,9 @@ self: { mkDerivation { pname = "avers-api"; version = "0.0.18.0"; - sha256 = "b1ba2ad32420636bf298efa7d4ff42fda9501672306f04b11c91aee1fe7805c5"; + sha256 = "1i85g3zf3bli3jqh8vrhf8b51agx8bzx99zgk3r6nqr04k9jmfmi"; + revision = "1"; + editedCabalFile = "0znsxj4igjrgs1xg8x8s9vg88830cvrqb880v9gchn1wp34lfihv"; libraryHaskellDepends = [ aeson avers base bytestring cookie http-api-data servant text time vector @@ -27774,7 +29019,9 @@ self: { mkDerivation { pname = "avers-api-docs"; version = "0.0.18.0"; - sha256 = "38a9f290cfd92ee922253337b30297dd5d3fa0db28c5aad5a0e6d01a205efca1"; + sha256 = "18gwbqh1ml76l3asmi98vfh3ypfxjw1b6drk4lifjbnrry8g5a9q"; + revision = "1"; + editedCabalFile = "04j51gdx19bi3pcqj4dh70xw7fjjimvps75mihf8aq5ixmyxxbr3"; libraryHaskellDepends = [ aeson avers avers-api base cookie lens servant servant-swagger swagger2 text unordered-containers @@ -27795,7 +29042,33 @@ self: { mkDerivation { pname = "avers-server"; version = "0.0.18.0"; - sha256 = "44ea17fd5f2351ae0c63d630f3c4a4879541f47b63b57bd447683d4644901cf7"; + sha256 = "1xqwj124cgb88za7pdb3ggs435c7lk2g6c6ncc6awl93bzyigsj4"; + revision = "1"; + editedCabalFile = "0ngmb2w7yql2gix5hq5jk057xazdq8ffax39gw20pa68npfgg1g6"; + 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; + }) {}; + + "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 @@ -27819,7 +29092,7 @@ self: { mkDerivation { pname = "aviation-cessna172-diagrams"; version = "0.0.2"; - sha256 = "ca9d567106b63c285f6ce149019073a04ecd020e3dc1bda91bcd843e4afae417"; + sha256 = "05z4z953x16d3flvvh9x1q1cskm0ff802jg1digjhg5n0rqmd7fa"; libraryHaskellDepends = [ aviation-cessna172-weight-balance aviation-units aviation-weight-balance base colour diagrams-cairo diagrams-core @@ -27843,7 +29116,7 @@ self: { mkDerivation { pname = "avl-static"; version = "0.1.0.0"; - sha256 = "20b0a9f7a858d980dadc96704709e5e2e1d448dcb17aa53f6064ad7a332f348f"; + sha256 = "13rl5wrpmbb4c0zsaymivi4d9qg2wl4lfw4nvkd81naqm3vskc10"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -27858,7 +29131,7 @@ self: { mkDerivation { pname = "avr-shake"; version = "0.0.1.2"; - sha256 = "60102786473f189ea0f97d97b91d9de5a2867dde466b96386c28afbe22e056cc"; + sha256 = "1k2nw0ibxbr8dhw9css6vryqd8p5klfvk5vxz6h9w61z8y32f430"; libraryHaskellDepends = [ base dependent-sum mtl process shake ]; homepage = "https://github.com/mokus0/avr-shake"; description = "AVR Crosspack actions for shake build systems"; @@ -27873,7 +29146,7 @@ self: { mkDerivation { pname = "avwx"; version = "0.3.0.2"; - sha256 = "b4299cc4e05a4c94f53d06f05b30baac1e15c59663b59afd1dd32417a280fb0a"; + sha256 = "02pvh2i1f96k3pyrmdb3jv2ia7mcp8q5pw067psr8k2sw329qadl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base HTTP lens parsers text ]; @@ -27891,7 +29164,7 @@ self: { mkDerivation { pname = "awesome-prelude"; version = "0.1.0.0"; - sha256 = "cf5edb7500a02aaba7400f3baab984680898dbedc0cf5b09ded2ca40568e6e57"; + sha256 = "0mvfirb41jnjvq4mpky0xpdrh238hjwslfqg82ksnam001sxnpng"; libraryHaskellDepends = [ base ]; homepage = "https://notabug.org/koz.ross/awesome-prelude"; description = "A prelude which I can be happy with. Based on base-prelude."; @@ -27906,7 +29179,7 @@ self: { mkDerivation { pname = "awesomium"; version = "0.1.0.0"; - sha256 = "02ab23a054aab002dd2ddc32aa896966a8627da33911e523a20d67c2a94da861"; + sha256 = "0qd89nlw4rqdl8iya49rldyn5a36d64slcnw5pfh5c5aajh27aq2"; libraryHaskellDepends = [ aeson attoparsec awesomium-raw base containers text vector ]; @@ -27920,7 +29193,7 @@ self: { mkDerivation { pname = "awesomium-glut"; version = "0.1.0.0"; - sha256 = "edfe81d9c3bc77dd1da7c46d5b92a21b1f6e10f53967f0d2294648d1237eb09c"; + sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd"; libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ]; description = "Utilities for using Awesomium with GLUT"; license = stdenv.lib.licenses.lgpl3; @@ -27932,7 +29205,7 @@ self: { mkDerivation { pname = "awesomium-raw"; version = "0.1.0.0"; - sha256 = "cbdbce6189dcf74993971c87f1afc6ebf8490d875c71aab526c8a3f5b2a65136"; + sha256 = "0djilsrgb8y84ssslwawhw6lky7bqspz31qwjy9lkxywi5hwxnyb"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ awesomium ]; libraryToolDepends = [ c2hs ]; @@ -27956,7 +29229,9 @@ self: { mkDerivation { pname = "aws"; version = "0.16"; - sha256 = "84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c"; + sha256 = "1710jajfla76igqrb2hv455gqhr4wap8225z1bffvjgk4w1cddc4"; + revision = "1"; + editedCabalFile = "0q4nbmi6s2zzp9jc4hwvdml101xskgindv0scyjjzcvl2cfa0zk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27985,7 +29260,7 @@ self: { mkDerivation { pname = "aws-cloudfront-signer"; version = "1.1.0.3"; - sha256 = "389a125ad8e06e79db8d4d7144dd5254bc3ebde81588fa9ece0b661cf72ad681"; + sha256 = "10fn5bviqrhbrsggm20mx2ykxg2labfl8wadipdpjvp0v1d156iq"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-bytestring bytestring crypto-pubkey-types RSA time @@ -28003,9 +29278,9 @@ self: { mkDerivation { pname = "aws-configuration-tools"; version = "0.1.0.0"; - sha256 = "6b94bd4f41fc9a4ff58dd8741ba0cb618d804ca0362c6804348ecb5842831c77"; + sha256 = "0xqwhd15ijwf6h26hb1nl16813b1rfh1nx6qipslz6pw857vv53b"; revision = "2"; - editedCabalFile = "536eacac6f54fbeb3e823d5b751eaa8cf1bb45a69f1d0bf54bdbff6245eb93e9"; + editedCabalFile = "1sckxd2n5zyv9gshn7czlr2vpwccm8g7anrxh8zfpysldynaqvjk"; libraryHaskellDepends = [ aws aws-general aws-kinesis base base-unicode-symbols bytestring configuration-tools mtl text transformers @@ -28023,7 +29298,7 @@ self: { mkDerivation { pname = "aws-dynamodb-conduit"; version = "0.1.0.6"; - sha256 = "170d0c83bfc29fc9df118467c15d0c8cfc68d7e4b5788ef95ba8518bd8e95b97"; + sha256 = "15svx7c8nld8bgwqwy5mwkbniz4c1ifw2rw427gwk7y2py1hq38p"; libraryHaskellDepends = [ aeson attoparsec-trans aws base bytestring conduit containers http-conduit http-types json-togo resourcet text transformers @@ -28044,7 +29319,7 @@ self: { mkDerivation { pname = "aws-dynamodb-streams"; version = "0.1.0.0"; - sha256 = "22137e5436c28c481bcb93b86a24ad5d5dcbe7904b292d58dc5e86a3a98c157b"; + sha256 = "0yqmijls71jyvic2saabj3kwnpaxmlj6mf4krcdli3626ra7w4r2"; libraryHaskellDepends = [ aeson attoparsec aws aws-general base base-unicode-symbols base16-bytestring base64-bytestring byteable bytestring @@ -28059,29 +29334,30 @@ self: { "aws-ec2" = callPackage ({ mkDerivation, aeson, aws, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , conduit-extra, containers, cryptohash, http-conduit, http-types - , mtl, optparse-applicative, resourcet, scientific - , template-haskell, text, time, unordered-containers, vector - , xml-conduit, yaml + , base64-bytestring, blaze-builder, blaze-markup, byteable + , bytestring, conduit-extra, containers, cryptohash, exceptions + , http-conduit, http-types, iproute, mtl, optparse-applicative + , resourcet, scientific, template-haskell, text, time + , unordered-containers, vector, xml-conduit, yaml }: mkDerivation { pname = "aws-ec2"; - version = "0.3.3"; - sha256 = "8d52e45cf9c37d728d1c76db6653ff56dbec853c1b924b46b1519387cc2aa3f4"; + version = "0.3.7"; + sha256 = "1pg3f8v2zdx83raw54rn0bkb2h3bmksgrxb35pjg44rqjxdj82zk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aws base base16-bytestring base64-bytestring blaze-builder - byteable bytestring conduit-extra containers cryptohash - http-conduit http-types mtl resourcet scientific template-haskell - text time unordered-containers vector xml-conduit + blaze-markup byteable bytestring conduit-extra containers + cryptohash exceptions http-conduit http-types iproute mtl resourcet + scientific template-haskell text time unordered-containers vector + xml-conduit ]; executableHaskellDepends = [ aeson aws base bytestring containers optparse-applicative text unordered-containers vector yaml ]; - homepage = "https://github.com/zalora/aws-ec2"; + homepage = "https://github.com/memcachier/aws-ec2"; description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -28095,7 +29371,7 @@ self: { mkDerivation { pname = "aws-elastic-transcoder"; version = "0.2.0.2"; - sha256 = "896b7cdb17313b8a5e848de797ab61a3d1ab3779b6bf2d571cda50e5317ebe09"; + sha256 = "02dygqqyal6s3ibjvgxng4vspld3c6mrgrwdhig8lfri2zdpqsw9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28121,7 +29397,7 @@ self: { mkDerivation { pname = "aws-general"; version = "0.2.2"; - sha256 = "32bbac44b37056c861cd762172b504605b810e7873a2889b69f80b13f8195e23"; + sha256 = "08sy37w162zqd6dqi8kkg0782nv00jsp48bnrmhwhmkhnd2arfrj"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring blaze-builder byteable bytestring case-insensitive cryptohash deepseq hashable http-types @@ -28148,7 +29424,7 @@ self: { mkDerivation { pname = "aws-kinesis"; version = "0.1.5"; - sha256 = "3f2a155f4da902ffbcf243bfdd42f0d8396e9f3378608abc2845b3fc8b73f15a"; + sha256 = "0npiff5zrcs552y8lq3q6fgnwffqy11dvgs3yaygy0m99mgiaaiz"; libraryHaskellDepends = [ aeson aws aws-general base base64-bytestring blaze-builder bytestring conduit conduit-extra deepseq http-conduit http-types @@ -28177,9 +29453,9 @@ self: { mkDerivation { pname = "aws-kinesis-client"; version = "0.4.0.2"; - sha256 = "9dd7dfb150fba911b57722fe452b244924cc8460cceaf5fc455c72dbb0d0cfef"; + sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx"; revision = "1"; - editedCabalFile = "4bd055f19f3ced5d6f52eec169220d7c5159cfa521128a3118aedecc9c3ad2f3"; + editedCabalFile = "1wyj7afcrpmf30qql4i1lp7mjlbw1li6khgfa9pmvv9wkzqmbl2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28209,7 +29485,7 @@ self: { mkDerivation { pname = "aws-kinesis-reshard"; version = "0.1.0.1"; - sha256 = "d6d2b95013ae338cba04d19f35e9233eeb4298bde3e2db5fce3f66d3741af1ec"; + sha256 = "1v7i39sd6rizrrgxpqp3pnc45sry4glkb7yi0jx8qcxf2d8bklnn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28239,7 +29515,7 @@ self: { mkDerivation { pname = "aws-lambda"; version = "0.1.0.1"; - sha256 = "0959e5714d666412ddffb11ac13e3b1c00125564c4061ae0e1cde7ed0dc2c9b7"; + sha256 = "1dy9q86yvrydw7h1l1n4ciai400w7czc26mizzfi4r369mqyan89"; libraryHaskellDepends = [ aeson aws-general base base-unicode-symbols bytestring containers exceptions filepath http-client http-types lens lens-action @@ -28251,6 +29527,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aws-mfa-credentials" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base + , exceptions, filelock, filepath, freer-effects, ini, lens + , optparse-applicative, optparse-text, process, text, time + , unordered-containers + }: + mkDerivation { + pname = "aws-mfa-credentials"; + version = "0.1.0.0"; + sha256 = "10dq62h3xkm4wi1wsrrqkpjk22p86csn2h08z9x0nm7gcj857rr0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amazonka amazonka-core amazonka-sts base exceptions filelock + filepath freer-effects ini lens optparse-applicative optparse-text + process text time unordered-containers + ]; + homepage = "https://github.com/TaktInc/aws-mfa-credentials"; + description = "Keep your AWS credentials file up to date with MFA-carrying credentials"; + license = stdenv.lib.licenses.asl20; + }) {}; + "aws-performance-tests" = callPackage ({ mkDerivation, aeson, async, aws, base, bytestring , configuration-tools, containers, dlist, errors, http-client, lens @@ -28260,7 +29558,7 @@ self: { mkDerivation { pname = "aws-performance-tests"; version = "0.1.1"; - sha256 = "1c06449bc8a23844ea703be05212462e0ee5ac9ea8a9d66a279c0701a75436d5"; + sha256 = "1m9najkh21ww4xmddad8ksnfa3if8q955q1vf3m48f52r2dl81hw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28286,7 +29584,7 @@ self: { mkDerivation { pname = "aws-route53"; version = "0.1.2.2"; - sha256 = "eaddcf6c4903ab17c6a963bbb2228581c016026f2e4d9cc26db2ed527487d05b"; + sha256 = "0nyhhxs55vdjdp19qk9fdw11dh41hlib5fv3m731gaq395nczpga"; libraryHaskellDepends = [ aws base bytestring containers http-conduit http-types old-locale resourcet text time xml-conduit xml-hamlet @@ -28307,7 +29605,7 @@ self: { mkDerivation { pname = "aws-sdk"; version = "0.12.4"; - sha256 = "2b17ef4d7b4dafe9a50b967685627c43405792a8c6ab498cb0dec7d6dc74bc7e"; + sha256 = "0zmwfkfddiyyn264kay6m295fh23gii8axln1fjykbsdgd6yy5rb"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit conduit-extra containers data-default http-conduit http-types iproute lifted-base @@ -28334,7 +29632,7 @@ self: { mkDerivation { pname = "aws-sdk-text-converter"; version = "0.4.1"; - sha256 = "ce1318fcd18b191477d7e5a45bef4a62988a876a57c86e4cd01a26ea1e610713"; + sha256 = "04q7c4gfl9hss166xj2pda3qm6329bpmp975sxvi86cbs7y1h4yf"; libraryHaskellDepends = [ base bytestring iproute safe strptime template-haskell text time time-locale-compat @@ -28357,7 +29655,7 @@ self: { mkDerivation { pname = "aws-sdk-xml-unordered"; version = "0.3.1"; - sha256 = "cd1a21ed61a5173f26019c1ff945a985ca4ba7934ccc80622addc46b83a12039"; + sha256 = "0f90l61npi6x59i81k2cjfklpjl5m52zj7ww04k3y5x5c7nj26nd"; libraryHaskellDepends = [ aws-sdk-text-converter base conduit containers lifted-base mtl resourcet text unordered-containers xml-conduit xml-types @@ -28380,7 +29678,7 @@ self: { mkDerivation { pname = "aws-sign4"; version = "1.1.0.1"; - sha256 = "10ca8ce6cccd77d126b5640c36c665a17b187ba985c752e2d49f92f7d06d84cb"; + sha256 = "1jw4dp8gg4lzski55iw5m5xihyx1cp33c334nlkd2xydrkk8rjhh"; libraryHaskellDepends = [ aws base blaze-builder byteable bytestring case-insensitive cryptohash http-types old-locale safe time @@ -28398,16 +29696,16 @@ self: { "aws-simple" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs - , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet - , text, unordered-containers + , base, bytestring, conduit, lens, mtl, resourcet, text, timespan + , unordered-containers }: mkDerivation { pname = "aws-simple"; - version = "0.3.0.0"; - sha256 = "52fe1741cb4685b56bf9690273e2dc68626165aff4f59a13d82005c15962076d"; + version = "0.4.0.0"; + sha256 = "0q5wj9hb4lndyqxqbnx7fngipafq67sdjzr9hmz1g7n2n1xl71mg"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder - bytestring conduit lens mtl resourcet text unordered-containers + amazonka amazonka-core amazonka-s3 amazonka-sqs base bytestring + conduit lens mtl resourcet text timespan unordered-containers ]; homepage = "https://github.com/agrafix/aws-simple#readme"; description = "Dead simple bindings to commonly used AWS Services"; @@ -28424,7 +29722,7 @@ self: { mkDerivation { pname = "aws-sns"; version = "0.1"; - sha256 = "f5cadcfc0191fd2e2764cfb6c64366845e82ae3dfd7d82f62ea6af601b952eec"; + sha256 = "1v1fjldn1bx65vv84zgx7np84pl4cr1wddngchkjxzci07ydrjpm"; libraryHaskellDepends = [ aeson aws aws-general base blaze-builder bytestring conduit containers http-conduit http-types parsers QuickCheck resourcet @@ -28440,6 +29738,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "axiom" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , ghcjs-perch, mtl, transformers, transient, transient-universe + }: + mkDerivation { + pname = "axiom"; + version = "0.4.5"; + sha256 = "0z08zgqab3i3ipwry828fy5j1m1r5n6lw4mjsria07crq7ny8z3i"; + libraryHaskellDepends = [ + base bytestring containers directory ghcjs-perch mtl transformers + transient transient-universe + ]; + homepage = "https://github.com/transient-haskell/axiom"; + description = "Web EDSL for running in browsers and server nodes using transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "axiomatic-classes" = callPackage ({ mkDerivation, base, containers, control-invariants, lens , monad-loops, mtl, portable-template-haskell-lens, QuickCheck @@ -28449,7 +29765,7 @@ self: { mkDerivation { pname = "axiomatic-classes"; version = "0.1.0.0"; - sha256 = "d0ca9598451c66a2070a33fea29a7479acd9f742455c95b3fbfd0005375e0929"; + sha256 = "0a89bqvha07xzfrrap258bvxkb3rfjda5zik183s4rhw8nc9bjnh"; libraryHaskellDepends = [ base containers control-invariants lens monad-loops mtl portable-template-haskell-lens QuickCheck quickcheck-report @@ -28466,8 +29782,8 @@ self: { }: mkDerivation { pname = "azubi"; - version = "0.2.0.1"; - sha256 = "9c772283727f23f433bb3617917ad7318c179a7e34b9bc890ab42ca20e9bd651"; + version = "0.2.0.2"; + sha256 = "00jnj7wfb588q6pll8l39prmn335cfcd5j1wwlcfanbznpz02nav"; libraryHaskellDepends = [ base Diff directory filepath options process unix ]; @@ -28488,7 +29804,7 @@ self: { mkDerivation { pname = "azure-acs"; version = "0.0.1.1"; - sha256 = "b43c0f5098d04479c56960d1de54850ee7befb35e002524941a5776baa27fb25"; + sha256 = "09gv4ym6nxx5854m40p06pxvxrqfhmadxlb0d72pji6hk180yg5l"; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra connection http-conduit http-types network time @@ -28506,7 +29822,7 @@ self: { mkDerivation { pname = "azure-service-api"; version = "0.1.0.0"; - sha256 = "0fba3a22a18bab53531230e734ce5eec4cd6e377a29b017a638f238726498b27"; + sha256 = "09wb94k8f8wgcdx036x2fzixck7cbv739rrh299m7awbl4i3mfhg"; libraryHaskellDepends = [ base binary bytestring case-insensitive certificate crypto-pubkey-types http-conduit hxt hxt-xpath pretty resourcet tls @@ -28526,7 +29842,7 @@ self: { mkDerivation { pname = "azure-servicebus"; version = "0.1.6.0"; - sha256 = "23d47ab6ed45c46be18b1eafc10061f040ec6a87451b1d5d8a2d844a8253e8c5"; + sha256 = "1ig8af14m11di9fis6s5hxmfqh7hc40c3bqyighnpi25xnv7mm13"; libraryHaskellDepends = [ aeson async attoparsec azure-acs base bytestring case-insensitive conduit connection http-client http-conduit http-types network text @@ -28547,7 +29863,7 @@ self: { mkDerivation { pname = "azurify"; version = "0.4.0.5"; - sha256 = "2f397c5993965e3aa377463f04254fcc62a546c088be15b4e367f3887fbc135b"; + sha256 = "0nqkpizqiwv7wfs1bgl8q13aaqnc9wjh8gs6fyiklplnjdcpqf9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28576,7 +29892,7 @@ self: { mkDerivation { pname = "b-tree"; version = "0.1.2"; - sha256 = "201ba85e9a14b13adc759734ef0cda7ec16d5efc64189eac59f206ed734745a4"; + sha256 = "19258xrys1pjb6n9w634zig6vhbyv86fyd4pfpf3mc8lk9gah6r0"; libraryHaskellDepends = [ base binary bytestring containers directory errors filepath lens mmap mtl pipes pipes-interleave transformers vector @@ -28599,8 +29915,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.31"; - sha256 = "8dcc9b68a88f6f73a0c1af060bbc7607e8894e741665fdecd40dfa842c187c95"; + version = "0.5.32"; + sha256 = "0d3ymgk83kfxzfd0a9x97sjcax4vd27p2dskpfiykqsn7wgylhhw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28627,7 +29943,7 @@ self: { mkDerivation { pname = "babl"; version = "0.0.0.2"; - sha256 = "c06c27e50875ab4fca4322112648006c49dc06158457fdb405df50eac9223245"; + sha256 = "0i9j4b4yll6z0nsgsmw42l3dqjbc0142c4928g54zavm13jjfv60"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ babl ]; libraryPkgconfigDepends = [ babl ]; @@ -28642,7 +29958,7 @@ self: { mkDerivation { pname = "babylon"; version = "0.3"; - sha256 = "0e6e87ee55be91093e36fe048a9ef3efd712bcd3b8eac3ece6a9bd9648b09e89"; + sha256 = "12cyn149dgd9wvnc7smqsfy15mzgyfg8l17y6qz0k4dyapp8fvhf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28660,7 +29976,7 @@ self: { mkDerivation { pname = "backdropper"; version = "1.2"; - sha256 = "5e522f3aa25ad7ba5060df41b095621d182c1908d9d740b64e963ee7c505bbfc"; + sha256 = "1z5v0p2yfgln9sv41myr10cjq60xcaav0hfzc18bmmssl8x2yljy"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -28671,6 +29987,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "backprop" = callPackage + ({ mkDerivation, ad, base, bifunctors, criterion, deepseq + , directory, generics-sop, hmatrix, microlens, microlens-mtl + , microlens-th, mnist-idx, mtl, mwc-random, profunctors, reflection + , tagged, time, transformers, transformers-base, type-combinators + , vector + }: + mkDerivation { + pname = "backprop"; + version = "0.0.3.0"; + sha256 = "1rjqv29fk0yqbqygnhm14zrjigicsgbiq5gcvr8j4kqkb8s9l6df"; + libraryHaskellDepends = [ + ad base generics-sop microlens microlens-mtl microlens-th mtl + profunctors reflection tagged transformers-base type-combinators + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory generics-sop hmatrix + mnist-idx mwc-random time transformers type-combinators vector + ]; + homepage = "https://github.com/mstksg/backprop"; + description = "Heterogeneous, type-safe automatic backpropagation in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -28678,7 +30018,7 @@ self: { mkDerivation { pname = "backtracking-exceptions"; version = "0.1.0.0"; - sha256 = "e29a9e117daeb62cbb1070fe947c97288df21fa05b3711f2da5c7b6649259fd4"; + sha256 = "1m4z4m4ncyswvbr12dsvl0gz5398jxy99zkh22xjrdmfgl8rx6p2"; libraryHaskellDepends = [ base either free kan-extensions mtl semigroupoids semigroups transformers @@ -28694,7 +30034,7 @@ self: { mkDerivation { pname = "backward-state"; version = "0.1.0.2"; - sha256 = "5579bc4be23e25324129dae278a768fb804909e64044de6581d7be2136a87daa"; + sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/luqui/backward-state"; description = "A state monad that runs the state in reverse through the computation"; @@ -28707,7 +30047,7 @@ self: { mkDerivation { pname = "bacteria"; version = "1.1"; - sha256 = "6557c0567da7d9ff9da386a2b9e327858dc32ea185a41574769802b446b9c7a7"; + sha256 = "19y7p53b80lqfrs1b945l4pc73c54zivk8l6lffzznd7gmbc0mv5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gd X11 ]; @@ -28721,7 +30061,7 @@ self: { mkDerivation { pname = "bag"; version = "0.1"; - sha256 = "99ae38d2f41d6a763f85a03239aee8f29523fb84c118b533b1358deaf27bc7a2"; + sha256 = "18n7ggrfm39mn4rva661hkxj75gjx2p3jcm0hlzpcshxyk93iblr"; libraryHaskellDepends = [ base ]; description = "A simple stable bag"; license = stdenv.lib.licenses.mit; @@ -28739,7 +30079,7 @@ self: { mkDerivation { pname = "bake"; version = "0.5"; - sha256 = "1cc3b57b6270a2c80f0b0a8b90fc3929eb0d1da9e113d18bc10d92b40a2d60f5"; + sha256 = "1xb05l5b94hdq65x24z1m4fhvsr977y912qa1c7wi8khc9xvbhqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28761,6 +30101,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ballast" = callPackage + ({ mkDerivation, aeson, base, bytestring, either-unwrap, hspec + , hspec-expectations, http-client, http-client-tls, http-types + , text, time, transformers, unordered-containers, utf8-string + , vector + }: + mkDerivation { + pname = "ballast"; + version = "0.1.0.0"; + sha256 = "1skzfj5l4j1jgpc0dlqmwpysa4bf9f9jpllz6zqb17zknicd77qf"; + libraryHaskellDepends = [ + aeson base bytestring either-unwrap hspec hspec-expectations + http-client http-client-tls http-types text time transformers + unordered-containers utf8-string vector + ]; + testHaskellDepends = [ + base bytestring either-unwrap hspec hspec-expectations text time + ]; + homepage = "https://github.com/bitemyapp/ballast#readme"; + description = "Shipwire API client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bamboo" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , directory, filepath, gravatar, hack, hack-contrib, haskell98, mps @@ -28770,7 +30134,7 @@ self: { mkDerivation { pname = "bamboo"; version = "2010.2.25"; - sha256 = "b166e81cbb9962a4784a159c2168a8c4dfeef699a7565998ef07cf9d98f5266d"; + sha256 = "0v96ync9vkq7xyc5jmm7k7vfxpy4m1l2370m99wa8qlrpcffhrmi"; libraryHaskellDepends = [ base bytestring containers data-default directory filepath gravatar hack hack-contrib haskell98 mps mtl network old-locale old-time @@ -28790,7 +30154,7 @@ self: { mkDerivation { pname = "bamboo-launcher"; version = "2010.2.25"; - sha256 = "ad6d32100a34c256de43d4f8efcc93762736d2ce6fdc2155056eae2ec798e2f6"; + sha256 = "1xp2k33jxbkf0maj3p3grv93c9vnjg6fzy6l8gg5dhil18834vdd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28810,7 +30174,7 @@ self: { mkDerivation { pname = "bamboo-plugin-highlight"; version = "2009.7.5"; - sha256 = "0cabc85ce1232c51454c35c7a4d9acb19e7cd2830494a5b166607375abba1039"; + sha256 = "0f8hpampawv0csqsb504hg97r7mimkcs9irm9i2m2b13w5fciaqc"; libraryHaskellDepends = [ bamboo base bytestring hack hack-contrib highlighting-kate hxt mps xhtml @@ -28829,7 +30193,7 @@ self: { mkDerivation { pname = "bamboo-plugin-photo"; version = "2009.7.5"; - sha256 = "50c9c65f674560f0f3ee668bde418839e6cdedb3fca5a5ef43bc42cd204033a6"; + sha256 = "19ik80hcshmw8gpsb9gwngnwvriri10xx2v6xvrz0q25cxgwdjah"; libraryHaskellDepends = [ base bytestring data-default directory filepath hack hack-contrib haskell98 hxt mps utf8-string xhtml @@ -28848,7 +30212,7 @@ self: { mkDerivation { pname = "bamboo-theme-blueprint"; version = "2010.2.25.1"; - sha256 = "fd8be619f0b0f3066631ac9b471333425dbc7d597e4cc9437874926ac5df90f1"; + sha256 = "1wchvz2nm4klg11wjk3yb5yvqpa26c9lg6xc65k0dwxhy0cyd2zx"; libraryHaskellDepends = [ bamboo base bytestring containers data-default gravatar hack hack-contrib hcheat mps network rss utf8-string xhtml @@ -28869,7 +30233,7 @@ self: { mkDerivation { pname = "bamboo-theme-mini-html5"; version = "2009.11.27"; - sha256 = "a6257e155686423d9a2553e9c846b49264a9a616d849a7331cef1982b14cf00b"; + sha256 = "02zh9jqq46gg3hrsfjfq2skajr4jni3cisak4nd3shl6aqapw9d6"; libraryHaskellDepends = [ bamboo base base64-string bytestring cgi containers data-default directory filepath gravatar hack hack-contrib haskell98 hcheat moe @@ -28889,7 +30253,7 @@ self: { mkDerivation { pname = "bamse"; version = "0.9.5"; - sha256 = "c8f016f0b599cbea967aeb308e0e463fe5e641656a3cf7b5b7c5559cb9f7d3db"; + sha256 = "1nykyywrqmf5nyszfg3acm0ydr9z8q78wc7bgabfmjwrnpq1dw68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28905,7 +30269,7 @@ self: { mkDerivation { pname = "bamstats"; version = "0.4"; - sha256 = "44642317eb9ba0a1935bf14e70f80da99ac51ee1f8bdfeb647018944e021137d"; + sha256 = "0z8k47h492818yvgxggqw4gcb6m91pw70kpibf9s384vxcbj6r24"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ base cmdargs samtools ]; @@ -28919,7 +30283,7 @@ self: { mkDerivation { pname = "bank-holiday-usa"; version = "0.1.1"; - sha256 = "5fbd4b6a9cc86717530430dae50e6fe2fc049d336e97c8bb7ebcec25d738448b"; + sha256 = "12s473bjbv5wgsxwi5vf6ffh9z72dw7fbnih0i9ifry8kim4pgaz"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit QuickCheck time ]; homepage = "https://github.com/tippenein/BankHoliday"; @@ -28932,7 +30296,7 @@ self: { mkDerivation { pname = "bank-holidays-england"; version = "0.1.0.5"; - sha256 = "0619db7812762ea3af48db434dbcad81e26525d733126073dfe3dbd357a83760"; + sha256 = "0q1pm1bx7nz3vxrn04ikswjnbql1mny4shyv92ps6bkn29wdn686"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; homepage = "https://bitbucket.org/davecturner/bank-holidays-england"; @@ -28947,7 +30311,7 @@ self: { mkDerivation { pname = "banwords"; version = "0.2.0.1"; - sha256 = "d627b46520274c921a92d76bcf75ab9e68325456c1dad9f53332440f0cf8b68e"; + sha256 = "13mnz060yi1j6gsxknn1ara34s4ymdswysypj8d94k1741jv89yn"; libraryHaskellDepends = [ attoparsec base bytestring data-default text vector ]; @@ -28966,7 +30330,7 @@ self: { mkDerivation { pname = "barchart"; version = "0.1.1.1"; - sha256 = "feed5f59c6f721f7d73eac1be53e7982c19ac96dd46b6601c3ed83d974511298"; + sha256 = "160ja5sdk0zdqc0ncsyldp4rmhc2g4zfa6xc7vbzf8gpqrcmzvgy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv diagrams filepath ]; @@ -28982,7 +30346,7 @@ self: { mkDerivation { pname = "barcodes-code128"; version = "0.1.0"; - sha256 = "af4ec35570d85202ee03e51b75967ffc586a852e8e9c712e3b2fd9aba0ec7491"; + sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg"; libraryHaskellDepends = [ base bytestring HPDF ]; description = "Generate Code 128 barcodes as PDFs"; license = stdenv.lib.licenses.mit; @@ -28994,7 +30358,7 @@ self: { mkDerivation { pname = "barecheck"; version = "0.2.0.8"; - sha256 = "470d1042ec1a345f8c4d131828918d977085500eeef340b0c2ca85fd32254a42"; + sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7"; libraryHaskellDepends = [ base containers QuickCheck text time ]; homepage = "http://github.com/massysett/barecheck"; description = "QuickCheck implementations for common types"; @@ -29010,7 +30374,7 @@ self: { mkDerivation { pname = "barley"; version = "0.3.0.2"; - sha256 = "50ec73e7fc50355d5f2e2b7a074f0df9cc1bd279c6f1a0ac039770da571aff45"; + sha256 = "0igz39bxlw4p0fna1wf6g791pk7r1m7hfyib5rgmsdahzkkp7v2h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29027,7 +30391,7 @@ self: { mkDerivation { pname = "barrie"; version = "0.4.1"; - sha256 = "dba75cfbe104624461975d2475e3002964c3d5b671a75ec919638c6d5a543982"; + sha256 = "10iraid6v333374mx9vinvaw6r1903ipa92xjxhl8qh4w7xmr9yv"; libraryHaskellDepends = [ base containers filepath glib gtk ]; homepage = "http://thewhitelion.org/haskell/barrie"; description = "Declarative Gtk GUI library"; @@ -29042,7 +30406,9 @@ self: { mkDerivation { pname = "barrier"; version = "0.1.1"; - sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9"; + sha256 = "1n8yx66lvyn90ixyvpjafrmhpgnznnqj9il5rixlr651xq0xm5b3"; + revision = "1"; + editedCabalFile = "167akvi72l47gcqbq5609m24469pq0xmv0kjbmivnrxs796gh890"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29053,7 +30419,7 @@ self: { base bytestring lens-family-core tasty tasty-golden ]; homepage = "https://github.com/philopon/barrier"; - description = "Shield.io style badge generator"; + description = "Shields.io style badge generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -29063,7 +30429,7 @@ self: { mkDerivation { pname = "barrier-monad"; version = "0.1.0.1"; - sha256 = "d5962991329b0922df49fb5010045dc6ea9b6eda849f5ffcd67466cb83609604"; + sha256 = "014nc21wnrklsvy5z7w4v9p9psn6bl210l7v97gj42cv6a8jk5nm"; libraryHaskellDepends = [ base comonad mtl transformers ]; description = "Implementation of barrier monad, can use custom front/back type"; license = stdenv.lib.licenses.publicDomain; @@ -29075,7 +30441,7 @@ self: { mkDerivation { pname = "base"; version = "4.9.1.0"; - sha256 = "7a5b85805f06f869ca86f99e12cb098c611ab623dd70305ca2b389823d71fb7e"; + sha256 = "0zpvf4yq52dkl9f30w6x4fv1lqcc175i57prhv56ky06by08anvs"; libraryHaskellDepends = [ ghc-prim integer-gmp rts ]; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; @@ -29086,20 +30452,32 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, unix }: mkDerivation { pname = "base-compat"; - version = "0.9.1"; - sha256 = "1033b48146b9ffcf4f7c75a321ea0b1525c1b662230f46c41957a1b501b6464a"; + version = "0.9.3"; + sha256 = "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; }) {}; + "base-feature-macros" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-feature-macros"; + version = "0.1.0.1"; + sha256 = "1v4a0jmjjqirfxvwim7gsrn5vj0p6la6fncy6k4v2va0p8xaggmp"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "Semantic CPP feature macros for base"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "base-generics" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-generics"; version = "0.1.0.1"; - sha256 = "bab2aaa9a35d39ab5aa07999ca68bb619e24abb4c5863584fa379c6b0c9d66a6"; + sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/HaskellZhangSong/base-generics"; description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well."; @@ -29112,7 +30490,7 @@ self: { mkDerivation { pname = "base-io-access"; version = "0.4.0.0"; - sha256 = "c3886b6203a5f963dcb249efb7bc87c33b17e5cc97276d91c38248019b451134"; + sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/bheklilr/base-io-access"; description = "The IO functions included in base delimited into small, composable classes"; @@ -29125,7 +30503,7 @@ self: { mkDerivation { pname = "base-noprelude"; version = "4.9.1.0"; - sha256 = "11611df31326a31694f13393d1ee1d3c684c2688eeaca8d8627f40ac9435f895"; + sha256 = "15gq6naaqh3zcbcaib7fi0k4qs1w3ppd34rky6a1d8r62grisq8i"; libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "https://github.com/hvr/base-noprelude"; @@ -29138,7 +30516,7 @@ self: { mkDerivation { pname = "base-orphans"; version = "0.5.4"; - sha256 = "04075283606b3633f4b0c72f849a6df1b0519421ad099d07d3e72de589056263"; + sha256 = "0qv20n4yabg7sc3rs2dd46a53c7idnd88by7n3s36dkbc21m41q4"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/haskell-compat/base-orphans#readme"; @@ -29146,24 +30524,51 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_6" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: + mkDerivation { + pname = "base-orphans"; + version = "0.6"; + sha256 = "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/haskell-compat/base-orphans#readme"; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; version = "1.0.1.1"; - sha256 = "dccf0a9a3b45f950bac92b6d87997c0a2a4304e40027204b12d018698b7a31b5"; + sha256 = "1d9iga5nj66h295j09q0wh246ahagjcqfv9br6x51ya57fd0mkyw"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed solely from the \"base\" package"; license = stdenv.lib.licenses.mit; }) {}; + "base-prelude_1_2_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-prelude"; + version = "1.2.0.1"; + sha256 = "17hivs7lmsglagdlzxd9q9zsddmgqin2788mpq911zwnb57lj6l1"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/base-prelude"; + description = "The most complete prelude formed solely from the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-unicode-symbols" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-unicode-symbols"; version = "0.2.2.4"; - sha256 = "a2f841430fec32edba778b74bde83bf0170ada7c5e2e59d7187c8f06d92dcca9"; + sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52"; libraryHaskellDepends = [ base ]; homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; @@ -29175,7 +30580,7 @@ self: { mkDerivation { pname = "base16-bytestring"; version = "0.1.1.6"; - sha256 = "5afe65a152c5418f5f4e3579a5e0d5ca19c279dc9bf31c1a371ccbe84705c449"; + sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs"; libraryHaskellDepends = [ base bytestring ghc-prim ]; homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; @@ -29189,7 +30594,7 @@ self: { mkDerivation { pname = "base32-bytestring"; version = "0.2.1.0"; - sha256 = "74bee674a45705347954f4e7e6eda01c123751fa51ac846b7ff97e39b81b187c"; + sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl"; libraryHaskellDepends = [ base bits-extras bytestring cpu ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion ]; @@ -29203,7 +30608,7 @@ self: { mkDerivation { pname = "base32string"; version = "0.9.1"; - sha256 = "9e931613aeba5f630f9292fc99131388f406e4b34d8f050515ed93aaf632ea32"; + sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy"; libraryHaskellDepends = [ aeson base binary bytestring text ]; testHaskellDepends = [ base binary bytestring hspec text ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -29218,7 +30623,7 @@ self: { mkDerivation { pname = "base58-bytestring"; version = "0.1.0"; - sha256 = "c2dbf598f3415053e12cca84b90fa7c0c1b02f3b784cce0157264baebf2d40d3"; + sha256 = "1ls05nzswjr6aw0wwk3q7cpv1hf0lw7vk16a5khm6l21yfcgbny2"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring quickcheck-assertions quickcheck-instances tasty @@ -29237,7 +30642,7 @@ self: { mkDerivation { pname = "base58address"; version = "0.4"; - sha256 = "eafcd789caed5a39a9e85eddc5ecf7554a812779eed302ebe45e98d479ea257c"; + sha256 = "0z15x9wx962ywkmh5lzfg4kq2jjmyzncbpayx2lkjnpdra4xgz7a"; libraryHaskellDepends = [ base binary bytestring containers cryptohash ]; @@ -29255,7 +30660,7 @@ self: { mkDerivation { pname = "base58string"; version = "0.10.0"; - sha256 = "3b72607dd76e30a5054acea656c3805f7191e27d67884a7db5fbc73c17e9c088"; + sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv"; libraryHaskellDepends = [ aeson base binary bytestring text ]; testHaskellDepends = [ base binary bytestring hspec text ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -29270,7 +30675,7 @@ self: { mkDerivation { pname = "base64-bytestring"; version = "1.0.0.1"; - sha256 = "ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50"; + sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring containers HUnit QuickCheck test-framework @@ -29288,7 +30693,7 @@ self: { mkDerivation { pname = "base64-conduit"; version = "1.0.0.1"; - sha256 = "e9993085827215538c236b0300a94c57e513e884bf965714011818ef86ddf01f"; + sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit ]; @@ -29307,7 +30712,7 @@ self: { mkDerivation { pname = "base64-string"; version = "0.2"; - sha256 = "3ec896ca7261ad4ddeffbaa3bdf4d5cb61775250c303fca9929aa9a56acc705e"; + sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y"; libraryHaskellDepends = [ base ]; homepage = "http://urchin.earth.li/~ian/cabal/base64-string/"; description = "Base64 implementation for String's"; @@ -29321,7 +30726,7 @@ self: { mkDerivation { pname = "base91"; version = "2.1.0"; - sha256 = "d68a86077e9a982f7344e1b596a92d7a6d50e3388b7f99a4b2e4525bf8d1e9d3"; + sha256 = "1lz9s7w5nlp4naj9jzwb73im0vbs5nlrddg18irjz64sgq3qd2nn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mono-traversable ]; @@ -29341,7 +30746,7 @@ self: { mkDerivation { pname = "basex-client"; version = "0.2.0.0"; - sha256 = "90f165babb781cb9a38107c32bd9c0d2cbee836f2120c7c2bf39b1e1a5ef1d0d"; + sha256 = "038xxyjy3c9rpz1cf811dy1yxjyjq3cjphq7h6ivj73qpfx6bwch"; libraryHaskellDepends = [ base network pureMD5 utf8-string ]; description = "A BaseX client for Haskell"; license = stdenv.lib.licenses.mit; @@ -29354,7 +30759,7 @@ self: { mkDerivation { pname = "bash"; version = "0.1.8"; - sha256 = "c070fd6efd7d750fcd1302589b251689de854f0bf5047f6282766fb2ba8267f3"; + sha256 = "1wv7haxb4vvnh9i7y17m1d7qbpl92qjrnn022g6hyxbxzmpgsw60"; libraryHaskellDepends = [ base binary bytestring containers hxt-regex-xmlschema mtl SHA shell-escape @@ -29364,39 +30769,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "basic-lens" = callPackage + "basic-cpuid" = callPackage ({ mkDerivation, base }: mkDerivation { - pname = "basic-lens"; - version = "0.0.0"; - sha256 = "d2ee8a48909db7f6bbf3deae03d9cfbbdfcce86932f0cae8fb59bf6d0c10ed61"; - revision = "1"; - editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170"; + 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 { + pname = "basic-lens"; + version = "0.0.2"; + sha256 = "1qnlzxbwz9fh78sw78xs0sf3wx94m5ipw1adfaf02d291z81mrys"; + libraryHaskellDepends = [ base template-haskell ]; description = "Basic lens type and functions"; license = stdenv.lib.licenses.bsd3; }) {}; "basic-prelude" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "basic-prelude"; - version = "0.6.1"; - sha256 = "6c2b905777d6e22157da48d7e3d5f3862e0698736afbf4f237fff9d14e803061"; - libraryHaskellDepends = [ - base bytestring containers filepath hashable lifted-base ReadArgs - safe text transformers unordered-containers vector - ]; - homepage = "https://github.com/snoyberg/basic-prelude"; - description = "An enhanced core prelude; a common foundation for alternate preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "basic-prelude_0_6_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector @@ -29404,7 +30799,7 @@ self: { mkDerivation { pname = "basic-prelude"; version = "0.6.1.1"; - sha256 = "f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7"; + sha256 = "1irfz57w4966y1vxkgh6bqxdlw3jijwz1pmq3qz9748linnpicgp"; libraryHaskellDepends = [ base bytestring containers filepath hashable lifted-base ReadArgs safe text transformers unordered-containers vector @@ -29419,8 +30814,8 @@ self: { ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { pname = "basic-sop"; - version = "0.2.0.0"; - sha256 = "8bec41c8501e9db661eea4d789ba167b6d0492c8fa69233826644c388656a891"; + version = "0.2.0.2"; + sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7"; libraryHaskellDepends = [ base deepseq generics-sop QuickCheck text ]; @@ -29434,7 +30829,7 @@ self: { mkDerivation { pname = "baskell"; version = "0.1.1"; - sha256 = "b484ca78f28edaf76ea8ba507ff8ad39fda544ee6f4c4465c5249ef2332367ed"; + sha256 = "1vb74crz57i4qmjl8k3gxr2abz9rmpw7yl5sm1pggnlfy9wcm15l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29451,7 +30846,7 @@ self: { mkDerivation { pname = "batch-rename"; version = "0.1.1.0"; - sha256 = "c22af153685c355df65c048986da2b9e5133f3892bc398dcf88aa1a6e864645e"; + sha256 = "0pk4cklad8caz3f9ihrbi7rk6lcy5gd8d284bkv5sdawd19z2an2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath Glob ]; @@ -29460,12 +30855,45 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "batchd" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, containers + , cryptonite, data-default, dates, directory, esqueleto, filepath + , Glob, http-client, http-client-tls, http-types, libssh2 + , monad-logger, monad-logger-syslog, mtl, optparse-applicative + , parsec, persistent, persistent-postgresql, persistent-sqlite + , persistent-template, process, readline, resourcet, scotty, syb + , template, template-haskell, text, th-lift, time, tls + , transformers, unix, unordered-containers, vault, wai, wai-cors + , wai-extra, wai-middleware-static, warp, x509-store, yaml + }: + mkDerivation { + pname = "batchd"; + version = "0.1.0.0"; + sha256 = "1axj4w0g34fgnn89l6f2zxbx172z6yq98clksp2bqxmnswza7di2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring connection containers cryptonite data-default + dates directory esqueleto filepath Glob http-client http-client-tls + http-types libssh2 monad-logger monad-logger-syslog mtl + optparse-applicative parsec persistent persistent-postgresql + persistent-sqlite persistent-template process readline resourcet + scotty syb template template-haskell text th-lift time tls + transformers unix unordered-containers vault wai wai-cors wai-extra + wai-middleware-static warp x509-store yaml + ]; + homepage = "https://github.com/portnov/batchd"; + description = "Batch processing toolset for Linux / Unix"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "battlenet" = callPackage ({ mkDerivation, aeson, base, containers, http-conduit, text }: mkDerivation { pname = "battlenet"; version = "0.2.0.0"; - sha256 = "aa775ac1f5ae6b30208d56f12580247dbaefd4dd5c8dcba192495d6a2c8af4db"; + sha256 = "1nzli8n6lpa9jahwp3awvpafzfkx4j02bwanilh30sxfyp0mlxxa"; libraryHaskellDepends = [ aeson base containers http-conduit text ]; @@ -29480,7 +30908,7 @@ self: { mkDerivation { pname = "battlenet-yesod"; version = "0.2.0.0"; - sha256 = "df03b4fc8e3b5ca453cf7bc28c7f3ff7714baedb2654356494dc06053341df14"; + sha256 = "056z84rha1nwjij3am16vfp4nwgp7xzqrhkvrx9s8p1vivyb80yz"; libraryHaskellDepends = [ base battlenet http-conduit text yesod-core ]; @@ -29502,7 +30930,7 @@ self: { mkDerivation { pname = "battleships"; version = "1.0.0"; - sha256 = "8db2614e525344a663f4961130fa819b582adedfef02c99be50799362336e9e5"; + sha256 = "1rg96qikd687wndwj0pgvzg2ln4vh7x304cnyiisci2ka9763cld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29533,7 +30961,7 @@ self: { mkDerivation { pname = "bayes-stack"; version = "0.2.0.1"; - sha256 = "b4744dcd95d77bd49dbeabef9e498db5ff410a7ebacb6ab665eab9d6ada5e4db"; + sha256 = "1nz4lnnxdfgacnv6mjxsgq543zxmim4rxvxbpsfx8yypjp6lsx5l"; libraryHaskellDepends = [ base cereal containers deepseq digamma enummapset gamma ghc-prim logfloat mtl mwc-random pretty random-fu random-source rvar @@ -29550,7 +30978,7 @@ self: { mkDerivation { pname = "bbdb"; version = "0.5"; - sha256 = "03a1cc86802658fe10d6967d6d29ce07451173ae8f8d0197758fc7108139ee8e"; + sha256 = "13pf760i1iwgfnbh33cgmrri2i87rqlnszcnsq8gwn16h23cr883"; libraryHaskellDepends = [ base mtl parsec ]; homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html"; description = "Ability to read, write, and examine BBDB files"; @@ -29564,7 +30992,7 @@ self: { mkDerivation { pname = "bbi"; version = "0.1.0"; - sha256 = "4fd495f092457cca89e8e4562f735022507085b0c928b7d8fe92ea020fa32878"; + sha256 = "0y18lc7h5sljzvcbfa69n22p0l12a1rjymp4x24wlz25jbq9bm2g"; libraryHaskellDepends = [ base bytestring cereal conduit containers mtl zlib ]; @@ -29577,7 +31005,7 @@ self: { mkDerivation { pname = "bcrypt"; version = "0.0.10"; - sha256 = "0498f9ff8df2bd0bcb4cd718c6fccd01f29837de164e24624fa32e0bfeed0eb6"; + sha256 = "1dhfxpz0nbm39xi28khnvqvriwh1rpycc66p9k5hpggjipzzk604"; libraryHaskellDepends = [ base bytestring data-default entropy memory ]; @@ -29592,7 +31020,7 @@ self: { mkDerivation { pname = "bdd"; version = "0.2.0.0"; - sha256 = "98a8b2ae926daa85d989c917442e4101e511eb97e0747d6ac631e789f5c41c9e"; + sha256 = "17hwqksqkrriqrm7sx70jzmi3r8184p485y9i7cqbakdjapb5a4q"; libraryHaskellDepends = [ base HUnit mtl transformers ]; testHaskellDepends = [ base directory HUnit mtl process test-framework @@ -29609,7 +31037,7 @@ self: { mkDerivation { pname = "bdelta"; version = "0.1.1.1"; - sha256 = "9ce7c5228bb7750050b6cd3b7a9f942f9669a181bd61a300eea445ee1bbdea9f"; + sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/joeyadams/haskell-bytestring-delta"; description = "Simple, fast binary diff/patch"; @@ -29621,7 +31049,7 @@ self: { mkDerivation { pname = "bdo"; version = "1.0.1"; - sha256 = "0259e3a8e8a5a8cbc9f0d7458e4de16c2e13dfa41dde5fba47dc3e61033d8cd7"; + sha256 = "1mwc7l1n2gnw8yx5zphxlkgi6bkcw56qwifpy34wpa55x2lf6n82"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base network text url ]; @@ -29638,7 +31066,7 @@ self: { mkDerivation { pname = "beam"; version = "0.3.2.0"; - sha256 = "1a6facf70119515b46b05e336bff59254d8e69f38cfeca6a65625e130fb26b5a"; + sha256 = "0nkbn87i6pk2cmmcmzlcydlqwk95b7znncsyn135nl8r07vsqvqs"; libraryHaskellDepends = [ base conduit containers convertible HDBC HDBC-sqlite3 microlens mtl pretty semigroups tagged text time uniplate @@ -29657,7 +31085,7 @@ self: { mkDerivation { pname = "beam-th"; version = "0.2.0.0"; - sha256 = "d1a7938b5dda902e9c50566b70c9243bd6900285db0724f176ec200423c6d408"; + sha256 = "026lqqih887cfvqj81yvhl191miv4k4p0ssna2f2x46sbn5r79yi"; libraryHaskellDepends = [ base beam microlens mtl template-haskell th-expand-syns transformers @@ -29680,7 +31108,7 @@ self: { mkDerivation { pname = "beamable"; version = "0.1.1.1"; - sha256 = "473c8e6f1c3fcbd5ea637489948fab7528b2bcb28105691e956695493d380d19"; + sha256 = "068d70ylk5b6jlg6j1c1nayb4a3mmf7r92blcgmdbjrz3ipqwg27"; libraryHaskellDepends = [ base blaze-builder bytestring ghc-prim integer-gmp murmur-hash ]; @@ -29702,7 +31130,7 @@ self: { mkDerivation { pname = "bearriver"; version = "0.10.4"; - sha256 = "c1117be28a5852f92fcdc08143b0c430b34e0c571652a439dd9a27baba9a3e2b"; + sha256 = "0arykaxbl9wsvlws8lhnaw64xcrhqjq470f0rlpzjljqibi7n4f1"; libraryHaskellDepends = [ base dunai mtl transformers ]; homepage = "keera.co.uk"; description = "A replacement of Yampa based on Monadic Stream Functions"; @@ -29714,7 +31142,7 @@ self: { mkDerivation { pname = "beautifHOL"; version = "0.11"; - sha256 = "f12f28bac7d1c9b6db82c58ecb5c9eeff1afddc495a8c5cf310b4074c30f6496"; + sha256 = "15k41z1p8h0b677wba4mqkfszwggkrfcp3n5hbdvdjfiqyx2hbzi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base haskell98 mtl ]; @@ -29731,9 +31159,9 @@ self: { mkDerivation { pname = "bed-and-breakfast"; version = "0.4.3"; - sha256 = "dfb8b41460db8e35b28405ac03fa02e1056034516e64dcb34eb9acb9c1390305"; + sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z"; revision = "1"; - editedCabalFile = "3efbed0b49112bb9addddcd87fdb8ffe58f14497c16a2aba9deb39e10dae0d4f"; + editedCabalFile = "0kqdmq6y2fgbknx2lsn1jx2g2n7yizdpzn6wvnnvjaqi945yvyry"; libraryHaskellDepends = [ array base binary deepseq template-haskell ]; @@ -29744,6 +31172,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beeminder-api" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, data-default-class + , data-default-instances-base, http-conduit, http-types, lens + , monad-control, mtl, resourcet, scientific, text, time + , transformers, transformers-base, universe, universe-base + , unordered-containers, vector + }: + mkDerivation { + pname = "beeminder-api"; + version = "1.0"; + sha256 = "0yvk51s7pajndzh3sy6jsq1yg2myvn7i211b0g50n1afh96mf84j"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + data-default-class data-default-instances-base http-conduit + http-types lens monad-control mtl resourcet scientific text time + transformers transformers-base universe universe-base + unordered-containers vector + ]; + description = "Bindings to the beeminder.com JSON API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bein" = callPackage ({ mkDerivation, base, bytestring, containers, convertible, Crypto , directory, filepath, happstack-server, happstack-util, hdaemonize @@ -29753,7 +31205,7 @@ self: { mkDerivation { pname = "bein"; version = "0.3.3"; - sha256 = "909976d41ee5a723a8eb0e6ebda267f748b74a220f04ed2780b8b59594f806eb"; + sha256 = "1sq6z2a9bddqh0kys10g495bfj7pcyibsvhfxfl279z53va7d6ch"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29773,8 +31225,8 @@ self: { }: mkDerivation { pname = "bench"; - version = "1.0.2"; - sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e"; + version = "1.0.5"; + sha256 = "0fm92vwavgnh7pm0491vy5x21wylckga4a2n765nbw5hzmk9pz92"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29791,7 +31243,7 @@ self: { mkDerivation { pname = "benchmark-function"; version = "0.1.0.1"; - sha256 = "6ce46b2f88b444b14594d4b6f3b2b491005b211f2daa95f16aac9be3680193ff"; + sha256 = "1zwk05lf76xcdbqrbaid3whmn04injrg7dnlji2v2i5li0pnpr3c"; libraryHaskellDepends = [ base process random time ]; homepage = "xy30.com"; description = "Test the time it takes to run a haskell function"; @@ -29803,7 +31255,7 @@ self: { mkDerivation { pname = "benchpress"; version = "0.2.2.9"; - sha256 = "15c696bdde79a1acf31633a81def65cec8c04bee14cf8b0d0fa6a32d995a4aab"; + sha256 = "1asabacjv8x61w6qpkqlxr5w1j6fcppiva1k2vrsr8brvsyrdihm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -29818,7 +31270,7 @@ self: { mkDerivation { pname = "bencode"; version = "0.6.0.0"; - sha256 = "3b8efdfecee9bc486d9bcdbb633b7128ca235360f102478a7e0f8c895281f68a"; + sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv"; libraryHaskellDepends = [ base binary bytestring containers parsec ]; @@ -29834,7 +31286,7 @@ self: { mkDerivation { pname = "bencoding"; version = "0.4.3.0"; - sha256 = "8c5dd6aa1ea6ac20260fc5df8d94257acde5800de78ca278d1241e8fd01bcd38"; + sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ghc-prim mtl pretty text ]; @@ -29856,7 +31308,7 @@ self: { mkDerivation { pname = "bento"; version = "0.1.0"; - sha256 = "eba28420daba13af9de264ec0e3d605535496536b9aff9bc23798cdbcc209192"; + sha256 = "14li436dp33r4fygkbxr6rjljdamc0yhxv34wafsy4xsv8h898pb"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/tfausak/bento#readme"; description = "🍱 Manage stateful components"; @@ -29868,7 +31320,7 @@ self: { mkDerivation { pname = "berkeleydb"; version = "2008.10.31"; - sha256 = "775083f70fc92545268d4eb314e057f9517d56e845869cc022abf61040ec1fe3"; + sha256 = "1qqzxi011xmb4b09r1j5x1b7slgrazh19csfilk4a9f91zvq6l3p"; libraryHaskellDepends = [ base binary bytestring ]; librarySystemDepends = [ db ]; description = "Pretty BerkeleyDB v4 binding"; @@ -29885,7 +31337,7 @@ self: { mkDerivation { pname = "berp"; version = "0.0.2"; - sha256 = "0974f3484d3fc2e48cfb07aceff017757e7c7d93d35b56e58e3644eebc0dd518"; + sha256 = "066m1nyfwi1nivjmcnykjdypqzkm2zqfzb07zf6f9hiz9m4g6x09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29912,7 +31364,7 @@ self: { mkDerivation { pname = "bert"; version = "1.2.2.5"; - sha256 = "72b99fa9df51890bac1b725ccd4a4821f2540cfc71afb55d2f903ca75012716a"; + sha256 = "0ski298afg4h5xfvbbvizh659wi1915csp3j3fn0p2aivylrzfbj"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra containers mtl network parsec time unix void @@ -29931,7 +31383,7 @@ self: { mkDerivation { pname = "besout"; version = "0.2.0.1"; - sha256 = "41d3af0a84244fde61e4c902dd2e30e995a38df4e4f279cae6c1c968ac45662f"; + sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1"; libraryHaskellDepends = [ base ]; description = "Extended GCD of polynomials over F_p[x]"; license = stdenv.lib.licenses.bsd3; @@ -29948,7 +31400,7 @@ self: { mkDerivation { pname = "bet"; version = "0.1.2.3"; - sha256 = "a818d927e09c0386842658f70682089c16bc241961834af07fdbb0155015c13f"; + sha256 = "0gy12m81bc6vgzq4m0v134jbq5lw1210dxsq4s28c0www0kxj658"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29973,7 +31425,7 @@ self: { mkDerivation { pname = "betacode"; version = "0.1.0.0"; - sha256 = "eb605947326191c2f0fb956cd6bf5e4e3a39e419b11d1e0762640840ae16c467"; + sha256 = "0ry42sp40234c83iw7di37j3jfjfbszxcv4mzgqc54b1693mjq7b"; libraryHaskellDepends = [ attoparsec base errors hashable text text-icu ]; @@ -29988,7 +31440,7 @@ self: { mkDerivation { pname = "between"; version = "0.11.0.0"; - sha256 = "8337351326c5a613d9b7520b6a8203234c04454e23550a81739beaa6f671465d"; + sha256 = "0pa6f7vadslvff0hlm939r2h8k130f16l2sjnzci79n54q9kadw3"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/trskop/between"; description = "Function combinator \"between\" and derived combinators"; @@ -30000,7 +31452,7 @@ self: { mkDerivation { pname = "bf-cata"; version = "1.1"; - sha256 = "fcbf7d687adbbc8fa7d522b47d82581115d07453f08fa33b39a5132145f31739"; + sha256 = "0f8pyd2j24x574xs73zhadsd058ib217vd12snkqzg6vg9l7vgzw"; libraryHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; license = "LGPL"; @@ -30013,7 +31465,7 @@ self: { mkDerivation { pname = "bff"; version = "0.3.1.2"; - sha256 = "5d44be6c1890b08ed18b8ebac8cf2565747f2c20f143edb7c0d0c311e73dbec4"; + sha256 = "1i5y7pki3hyhq2vyshzi40n7yx354p7wiflfig8qxc4h31nbwi2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30030,7 +31482,7 @@ self: { mkDerivation { pname = "bff-mono"; version = "0.2.3"; - sha256 = "1913352257cdcc3196714c1e4a8db30f9619e6beddc758d03b2f0019b3745ce3"; + sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr"; libraryHaskellDepends = [ base containers mtl ]; homepage = "https://bitbucket.org/kztk/bff-mono/"; description = "\"Bidirectionalization for Free\" for Monomorphic Transformations"; @@ -30043,7 +31495,7 @@ self: { mkDerivation { pname = "bgmax"; version = "0.2.0.1"; - sha256 = "2e8abcb38c557c256d871f5df7566d02e74741bec24d86d2a65c97d6c1dc3b40"; + sha256 = "0h1vvk0xd5swlv98ckf2pr0lgrq2dmbgfp8zhxnjaz2mijrvr2if"; libraryHaskellDepends = [ attoparsec base bytestring time ]; homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; @@ -30058,7 +31510,7 @@ self: { mkDerivation { pname = "bgzf"; version = "0.1.0.0"; - sha256 = "3bcfc63b15d3eb0729193ec811ae2925e5febd1de0230876b9d1e8a68a59bcd2"; + sha256 = "1lmwb65ads6ip5v0h8z03nyzxr9556p13j1y34lhgsyk2lxwdkrv"; libraryHaskellDepends = [ base bytestring mtl parallel pipes streaming-commons ]; @@ -30076,7 +31528,7 @@ self: { mkDerivation { pname = "bibdb"; version = "0.5.3"; - sha256 = "8dcac183199d1bbfc7cd835f6d965ea9fedcc7874c9db458c221cede246ead12"; + sha256 = "04mddqjdxki1q9cb97achz3xrzm9bsb6spw3rp3vy6wx361w3jld"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30096,7 +31548,7 @@ self: { mkDerivation { pname = "bibtex"; version = "0.1.0.6"; - sha256 = "090a3b9589388bdf9d2bf60d8d1898aa0313a2874b551ba86cbbd049f3ee5f04"; + sha256 = "012zxvrlkl5vdjl1nmabhyi160xak0c8s3gn5ffxz2rqi6akn2h9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base latex parsec utility-ht ]; @@ -30112,7 +31564,7 @@ self: { mkDerivation { pname = "bidirectionalization-combined"; version = "0.1.0.1"; - sha256 = "d5c85467fe98881290a82417ce3482e88e2f782eddf514f63f2a8f07f957942d"; + sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30130,7 +31582,7 @@ self: { mkDerivation { pname = "bidispec"; version = "0.1.3"; - sha256 = "e41dbe6d53345d0893c2825e0316d9c99f685e58870e98b94894ed70e1d43079"; + sha256 = "0y9hskhp1vcl92wrh3l7b1g6i7y9v4b06pl2qa9hhp9ladnvw7g4"; libraryHaskellDepends = [ base bytestring mtl ]; description = "Specification of generators and parsers"; license = "LGPL"; @@ -30142,7 +31594,7 @@ self: { mkDerivation { pname = "bidispec-extras"; version = "0.1"; - sha256 = "3583e5fb2f6be1d4fd85adf4b60baa89b3810a27a84c40d3f8fb193c4cc4da46"; + sha256 = "0insqi63q6gvz39l0k584w583cw9m85vdx5dhpyx9qbb5zxyb0rm"; libraryHaskellDepends = [ base bytestring dataenc mtl ]; description = "Extra helper functions for bidirectional specifications"; license = "LGPL"; @@ -30156,16 +31608,15 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.4.1"; - sha256 = "3746f971f69ce31ced23d12e4785d96985f5c620ac7a26d5f4efead970c43b87"; - revision = "1"; - editedCabalFile = "64c592384987528035860a9b2b5d77995f16e9c7d138cf7310e1facd42e36505"; + version = "5.4.2"; + sha256 = "13fwvw1102ik96pgi85i34kisz1h237vgw88ywsgifsah9kh4qiq"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged template-haskell transformers transformers-compat ]; testHaskellDepends = [ - base hspec QuickCheck transformers transformers-compat + base hspec QuickCheck template-haskell transformers + transformers-compat ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; @@ -30177,7 +31628,7 @@ self: { mkDerivation { pname = "bighugethesaurus"; version = "0.1.0.0"; - sha256 = "3af008b07f35f4a83f53d5c119956195e2cc897396b63f3415cfa0f7561f13c8"; + sha256 = "1j0k3xbgg86g2ls3zdlnff4wrqlmc6aikhfmaczsix1mgyq0iw1s"; libraryHaskellDepends = [ base HTTP split ]; description = "API wrapper for Big Huge Thesaurus"; license = "GPL"; @@ -30190,7 +31641,7 @@ self: { mkDerivation { pname = "billboard-parser"; version = "1.0.0.1"; - sha256 = "055071b6a9ef63a46a6ac97ce1fdf407eef0460bd45f5331a65d9d4f78c111ca"; + sha256 = "1jhiq5w4z7axlqqm6pyl1d3g1vh7ykyy2z69d9ma8qzgm6v72l05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30215,7 +31666,7 @@ self: { mkDerivation { pname = "billeksah-forms"; version = "1.0.0"; - sha256 = "ba16b1337d896711c774214e2215b620f915dc4e289f6848f0db7560a7c09a24"; + sha256 = "094sq2kn0xfvy146i7r89vf1by90nqaj4ki1fk3i2rw9glrv25ms"; libraryHaskellDepends = [ base billeksah-pane billeksah-services Cabal containers directory filepath glib gtk mtl parsec pretty transformers @@ -30233,7 +31684,7 @@ self: { mkDerivation { pname = "billeksah-main"; version = "1.0.0"; - sha256 = "9ddada672e1f371ef4982e9fc8d46004282cdb9168ed075213b07fb81d36cfb7"; + sha256 = "1dyg6qfvhzxh2d90gvb8j7djqa04c3aci7rfk3s1wdqz5rkxmnlx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30255,7 +31706,7 @@ self: { mkDerivation { pname = "billeksah-main-static"; version = "1.0.0"; - sha256 = "fe483abfb484fd0f7a7a4c694da490e8129d237e996485e7ee421bf56da39fbc"; + sha256 = "1g4zldnza6s2xvkqar4rgqirs4p8j2j4ssacg9x0zzc4njzklj7y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30277,7 +31728,7 @@ self: { mkDerivation { pname = "billeksah-pane"; version = "1.0.0"; - sha256 = "6fab58f1f72a1732f17d35091908547ae003479c3d9484374ec08fe8da927fb2"; + sha256 = "1ckzjbdfi3y09qvq951xki3h7q3sah41j29mgpqk45rayzqmiavg"; libraryHaskellDepends = [ base billeksah-services containers directory filepath glib gtk mtl parsec pretty time transformers @@ -30295,7 +31746,7 @@ self: { mkDerivation { pname = "billeksah-services"; version = "1.0.0"; - sha256 = "96c79fe9a1babbd0fc9f6b5a0bd7b4cae4f49b2b8c08fdb157965366755e7a01"; + sha256 = "00bsbrsnclwnayqzs24c5fdz9r6ankbhnnkbkzyd1fxsl7lrziwn"; libraryHaskellDepends = [ base containers directory filepath mtl parsec pretty transformers ]; @@ -30311,8 +31762,8 @@ self: { }: mkDerivation { pname = "bimap"; - version = "0.3.2"; - sha256 = "148fc2d9784aa79faf49a979881a2304102a70d13e32fa8ce9f18ab466dc3db8"; + version = "0.3.3"; + sha256 = "1lca7bdw4bh8xj88g0h05dq43dis9ah858r2pbnkxgdwqxar70kk"; libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ base containers exceptions QuickCheck template-haskell @@ -30329,7 +31780,7 @@ self: { mkDerivation { pname = "bimap-server"; version = "0.1.0.1"; - sha256 = "09dfd1865812f40e317b610cbe05cc65ba6ea7215428748e1038ff7fc38ef535"; + sha256 = "0dgmiv1pzzrq22778a2l46knxfk5rh2vw331gcqhxx0jb23d3pq9"; libraryHaskellDepends = [ aeson base bimap binary directory http-types unix wai warp ]; @@ -30347,7 +31798,7 @@ self: { mkDerivation { pname = "bimaps"; version = "0.1.0.2"; - sha256 = "9774dd645620074f0b95d8c29183f4bf328944f571b2dbe9c0f02d508c6d9520"; + sha256 = "084mdn650bghq3lxpckiym28jcmzyj1r3hnqjl5ly1r0arjdsx4p"; libraryHaskellDepends = [ aeson base binary cereal cereal-vector containers deepseq hashable primitive storable-tuple unordered-containers vector @@ -30374,7 +31825,7 @@ self: { mkDerivation { pname = "binary"; version = "0.7.6.1"; - sha256 = "8f85cafc15be660757878a665d024ce595d4422fead174e20a501c9ec8f81067"; + sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -30390,7 +31841,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_8_4_1" = callPackage + "binary_0_8_5_1" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal , containers, criterion, deepseq, directory, filepath, HUnit, mtl , QuickCheck, random, tar, test-framework @@ -30398,10 +31849,8 @@ self: { }: mkDerivation { pname = "binary"; - version = "0.8.4.1"; - sha256 = "8d13c700fe96c84644a2af37003f488668fe9cd1f8e5b316fc929de26ce7e7ba"; - revision = "1"; - editedCabalFile = "56a00340fec65458e3c7cfe1d63651db09dd8d6ac925f843aefd2e98f4adbd50"; + version = "0.8.5.1"; + sha256 = "15h5zqfw7xmcimvlq6bs8f20vxlfvz7g411fns5z7212crlimffy"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -30424,7 +31873,7 @@ self: { mkDerivation { pname = "binary-bits"; version = "0.5"; - sha256 = "16534a018a4754d8d1eab051711c23fb741f41a0d141b289001c52824b5be794"; + sha256 = "1577bd5q4lhw024v4hfil10iyx7v4cf72ldhxb8xhm27i80lllqn"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring QuickCheck random test-framework @@ -30439,7 +31888,7 @@ self: { mkDerivation { pname = "binary-communicator"; version = "1.0.2.2"; - sha256 = "68c267c40d08bb0a574a35bb8bc2eab06172e1084fbf1fdeeb2d7015a9e56cf0"; + sha256 = "1w3cwnliaw1dxgg1zgsg13hp4qdhxb18pfrm99bhmfq81p26ghk8"; libraryHaskellDepends = [ base binary bytestring mtl ]; description = "Flexible way to ease transmission of binary data"; license = stdenv.lib.licenses.bsd3; @@ -30453,7 +31902,7 @@ self: { mkDerivation { pname = "binary-conduit"; version = "1.2.4.1"; - sha256 = "445cbb60bcff6da468e27b1db6a8d576b0b43ff284c3dcca4ae4c13f1ca6ca82"; + sha256 = "10nalqf3zhg49b5drhw4y8zv9c3nsnlbc7bvw9la8vgzpihbnp24"; libraryHaskellDepends = [ base binary bytestring conduit resourcet vector ]; @@ -30471,7 +31920,7 @@ self: { mkDerivation { pname = "binary-derive"; version = "0.1.0"; - sha256 = "7433551080e23843fb4ed8f819f2c04dca13eb7d37dbd36a30065358fa7564e5"; + sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl"; libraryHaskellDepends = [ base binary ghc-prim ]; description = "Automatic deriving of Binary using GHC.Generics"; license = stdenv.lib.licenses.gpl3; @@ -30483,7 +31932,7 @@ self: { mkDerivation { pname = "binary-enum"; version = "0.1.2.0"; - sha256 = "15e7d259293db928980579cc8898dc6d545ffeaa5be97635cb93bb65a6a68688"; + sha256 = "1246lsk6bfwkrcspdsavmbz5ym3dvjc8ik3r0nc2if9x55cx5rqm"; libraryHaskellDepends = [ base binary ]; homepage = "https://github.com/tolysz/binary-enum"; description = "Simple wrappers around enum types"; @@ -30497,8 +31946,8 @@ self: { }: mkDerivation { pname = "binary-ext"; - version = "1.0"; - sha256 = "0b7b4c7d4d2e5a08cf046eabbc66269aa187cfed4fcaeefcc5d95b4305a04837"; + version = "1.0.8.5.1"; + sha256 = "166c0wvmjpgpsm5s93clkp0ba50xyxinma4bkjxwqz3x1iv0gvzb"; libraryHaskellDepends = [ array base binary bytestring containers ]; @@ -30518,7 +31967,7 @@ self: { mkDerivation { pname = "binary-file"; version = "0.15.25"; - sha256 = "3f22fd8d60909e1f3f26e741ca5fa6126fa4de6427f5d3f7ce4c6fe3437ef6d0"; + sha256 = "1l7ngr1y6vscrvvx7x97ckga8vqjlrgwlhg74qziz7lhc26zs8iz"; libraryHaskellDepends = [ base bytestring monads-tf peggy template-haskell ]; @@ -30535,7 +31984,7 @@ self: { mkDerivation { pname = "binary-generic"; version = "0.2.1"; - sha256 = "ff69574128b926f4feeb161e2c4dd18be2e60bb32e7f9cb3239ce5cd8372cf30"; + sha256 = "0c6gfa1wvrcw4frrqzrfnc5ydqlbs56jq7hnxgzg89mr510mfsgz"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 syb text ]; @@ -30549,7 +31998,7 @@ self: { mkDerivation { pname = "binary-ieee754"; version = "0.1.0.0"; - sha256 = "15c489898bcd346b4067a27579cb5fc62e2fafecbec81ea0446165a24aee4d54"; + sha256 = "0m2dxr5a4rb18jh1xj5yxjpjybn6bz5pjxd2cx06nd6dif4qki0m"; libraryHaskellDepends = [ array base binary ]; homepage = "https://github.com/winterland1989/binary-ieee754"; description = "Backport ieee754 float double combinators to older binary"; @@ -30561,7 +32010,7 @@ self: { mkDerivation { pname = "binary-indexed-tree"; version = "0.1"; - sha256 = "8dd0f54f68c36f107dfbc35412e873c4bbf057d16629417df38e3996f9ac4bb3"; + sha256 = "1csbmkwrcfcfydyl2ab6s5bz1fy4fgl14m63zdyi0vy3d17zbl4d"; libraryHaskellDepends = [ array base ]; description = "Binary Indexed Trees (a.k.a. Fenwick Trees)."; license = "LGPL"; @@ -30575,7 +32024,7 @@ self: { mkDerivation { pname = "binary-list"; version = "1.1.1.2"; - sha256 = "6b21e58ea4091b9572cb24a92dfb1ddc14fcea82d2272d30a83eb1b430dd1878"; + sha256 = "0y0qvlqb9c9ym0q2s9yjhbmgq56w3pxjva94rdr9a6q9lj7fa8bb"; libraryHaskellDepends = [ base binary bytestring deepseq phantom-state transformers ]; @@ -30589,9 +32038,9 @@ self: { mkDerivation { pname = "binary-literal-qq"; version = "1.0"; - sha256 = "5506586d39e0d8b311516c05dc8eeaa8589782d0340cf45c853f68eab3687d4d"; + sha256 = "0kbxd2ryls1zhmfg831ls219fn58xa7dq1bca48v7n7075nmh1jm"; revision = "1"; - editedCabalFile = "61a53a601a913dd5fe5d52bc552f965d62d448ecea220dc1acb4884b67f54667"; + editedCabalFile = "0rs6ymklp25lmk0hs8paxi4d8qjxjqpmbg2jbpzdagci39h3m9b1"; libraryHaskellDepends = [ base template-haskell ]; description = "Extends Haskell with binary literals"; license = stdenv.lib.licenses.bsd3; @@ -30606,7 +32055,9 @@ self: { mkDerivation { pname = "binary-orphans"; version = "0.1.6.0"; - sha256 = "e0e1dc7e5f00feb225efde400988d5e0e199cc910446f05a40fecba7d55684a5"; + sha256 = "19c4avasgjzy81dg0ih4j769kqg0sn40jh6yxwjv5zh0bxzdrqg0"; + revision = "1"; + editedCabalFile = "1knb7lxgvhkai7p2qgb2zmqnrfm08liga6y794p9l5b5j0kcy55i"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -30622,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 @@ -30629,7 +32108,7 @@ self: { mkDerivation { pname = "binary-parser"; version = "0.5.2"; - sha256 = "712d30f26f8423704437e02bd5cc98cfff48fdbac0499e8cb41998f289245545"; + sha256 = "0iam4j4z560rnj69wjf0pbylizygk36daaz06x2708w4dzr30bbi"; libraryHaskellDepends = [ base-prelude bytestring success text transformers ]; @@ -30638,6 +32117,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "binary-parser_0_5_5" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, mtl + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "binary-parser"; + version = "0.5.5"; + sha256 = "1cs3zrhgnng2h84xnnvqcy6yrdm0xay1494dsa612y590s773aqx"; + revision = "3"; + editedCabalFile = "14n41yazmks2qw0v4krxcqw3ac0wdy2z53d0qz0rdjcd94fpghjf"; + libraryHaskellDepends = [ + base base-prelude bytestring mtl text transformers + ]; + testHaskellDepends = [ + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/binary-parser"; + description = "A highly-efficient but limited parser API specialised for bytestrings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-parsers" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-lexing, case-insensitive, criterion, deepseq @@ -30648,9 +32150,9 @@ self: { mkDerivation { pname = "binary-parsers"; version = "0.2.3.0"; - sha256 = "bc6195493b950efcbeb9ef54dfe47a6badf894dff934cf02a4b170331c1b217a"; + sha256 = "0yi13cf36w5ilh1cyd7rvyagibbbgbjdym7gp6zgq3lm7d4raqdw"; revision = "1"; - editedCabalFile = "25e07c108ea6f11588d74be3c3d7f3010859706961a9c3077546d4903d0a4f25"; + editedCabalFile = "09ag18yr1m26fl3w7ab1d5q5j201ygbw7qsbsy41bwd6iq87rq15"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing scientific ]; @@ -30675,7 +32177,7 @@ self: { mkDerivation { pname = "binary-protocol"; version = "1.0"; - sha256 = "7084bcca057dcb968587d9c67fbc34d4a384aaaacab39b4fb4e803210993c6c2"; + sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h"; libraryHaskellDepends = [ base binary bytestring mtl ]; homepage = "http://github.com/gcross/binary-protocol"; description = "Monad to ease implementing a binary network protocol"; @@ -30688,7 +32190,7 @@ self: { mkDerivation { pname = "binary-protocol-zmq"; version = "0.2"; - sha256 = "beaad38fb11794b368e69f3b84d46809440a1afae26110401c79c9c0a6b94a92"; + sha256 = "14jap6kc1jbr3i010qg2z8d0li09d3a88fwzwrlb750pn67x7amy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30707,7 +32209,7 @@ self: { mkDerivation { pname = "binary-search"; version = "1.0.0.3"; - sha256 = "b0e32df46aeddceac57bd6afa940f84f275f82fb251479e10fadd7c14414f6fa"; + sha256 = "1ypn2i2c3mxd1zhpj515zf15y9sgz10akbyngg2ymp7ddbs2vqxh"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base directory doctest filepath hspec QuickCheck @@ -30721,7 +32223,7 @@ self: { mkDerivation { pname = "binary-shared"; version = "0.8.3"; - sha256 = "830116505018fc43de09867bea9039b0bfa29e77564efa8c3f3b708933c098b2"; + sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3"; libraryHaskellDepends = [ base binary bytestring containers mtl ]; homepage = "http://www.leksah.org"; description = "Sharing for the binary package"; @@ -30733,7 +32235,7 @@ self: { mkDerivation { pname = "binary-state"; version = "0.1.1"; - sha256 = "f44da50068bf57b2bea5dc7ef70aa4bb6fb14272bde724fc887c57417dc7631b"; + sha256 = "06v3qxyl2mvwi3y29rxxf91b2vxvlh5gfznwlnzb4mxzd00aakgl"; libraryHaskellDepends = [ base binary bytestring containers mtl ]; description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads."; license = stdenv.lib.licenses.bsd3; @@ -30747,7 +32249,7 @@ self: { mkDerivation { pname = "binary-store"; version = "0.1.0.1"; - sha256 = "349fed71d8f2d7f74aa1026def2ae4ab61bac17f67055f827fe51af9516050f2"; + sha256 = "1wjhc18zj6p5gy15y1b7gz0vlqdbwhmfyv82l55ggmzjv1qyv7rl"; libraryHaskellDepends = [ base binary binary-list binary-transform bytestring bzlib deepseq reinterpret-cast @@ -30767,7 +32269,7 @@ self: { mkDerivation { pname = "binary-streams"; version = "0.1.0.1"; - sha256 = "bb12c7ed35d87f293ac6ab84412214e267daa167ab4c5eb503da1d9af42c4ece"; + sha256 = "1kjf5ks9l7fs0fsmwk5bcyhxlrz22hi4315bqqx2jzyq6pnwf4mv"; libraryHaskellDepends = [ base binary bytestring io-streams ]; testHaskellDepends = [ base binary bytestring Cabal cabal-test-quickcheck io-streams @@ -30784,9 +32286,9 @@ self: { mkDerivation { pname = "binary-strict"; version = "0.4.8.3"; - sha256 = "8eb8fb5bd9fdae7bc39df27e3273bdf7e7903c88c517c5646616dd8f04a92cb1"; + sha256 = "1c9cm428zp8ncrjca5y5i0y91rzppmrk4zpjkp1ppbpxv5dzpf4f"; revision = "1"; - editedCabalFile = "5d905811b3b81ca6d2bac8d764e732ca0595de486e568693ef9d228de1279df8"; + editedCabalFile = "1y4x4zhqs8lxxy9qcmkf93g9a1fa6bkn9my8pb9ac75qnc8mi42x"; libraryHaskellDepends = [ array base bytestring containers mtl ]; homepage = "https://github.com/idontgetoutmuch/binary-low-level"; description = "Binary deserialisation using strict ByteStrings"; @@ -30803,9 +32305,9 @@ self: { mkDerivation { pname = "binary-tagged"; version = "0.1.4.2"; - sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784"; - revision = "3"; - editedCabalFile = "6fd4d363bd8a64deacea2726daa15b67b4331f7d6b47de9980c11435564a3de1"; + sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri"; + revision = "7"; + editedCabalFile = "04l05gfbf3hf0pnkjpclyfqb9jaa665z4f89kf43lmd19qml6h04"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text @@ -30834,7 +32336,7 @@ self: { mkDerivation { pname = "binary-typed"; version = "1.0"; - sha256 = "85f3708802c52bca66bc5fdc560704cedd1cc63e313fcaab7638196ff7d05609"; + sha256 = "02ans3vny69qfsmwlgri7v31rpff0h3mdp2zpikclay50a471ww5"; libraryHaskellDepends = [ base binary bytestring murmur-hash ]; testHaskellDepends = [ base binary bytestring tasty tasty-hunit tasty-quickcheck @@ -30852,7 +32354,7 @@ self: { mkDerivation { pname = "binarydefer"; version = "1.2.2"; - sha256 = "77bc6c3a9e96808da81a7b06a5d8a67375b9679cd80520eb0a438e1b6729021b"; + sha256 = "06q255kip3j31bmj01fqkikvjxbklvcaa1kv3al8v04nkqx6rg3p"; libraryHaskellDepends = [ base ]; description = "Binary serialization with deferred loading"; license = stdenv.lib.licenses.bsd3; @@ -30866,7 +32368,7 @@ self: { mkDerivation { pname = "bind-marshal"; version = "0.1"; - sha256 = "26eb9954e33e39fcc4cd735731e3a7ab6baf90e3e2ed1eeb3e29f3df1857318f"; + sha256 = "13riawcdzwr97vmixvg2wf8aysxblzik2mvkrp2gqf9ywda9ksr6"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim monads-tf mtl numeric-prelude random stm strict transformers type-level-tf unix @@ -30882,9 +32384,9 @@ self: { mkDerivation { pname = "binding-core"; version = "0.2.2"; - sha256 = "3fee58e46c8a77a03629869d148ed91b9e740a224d3c044567c2ebc952b62763"; + sha256 = "0qr7nr9cksy2cx2h8g2d485797hvv67197c654va0xwadkj5iviz"; revision = "1"; - editedCabalFile = "1aeacdf0ebf89a2f515ab0ef767ed86f44b4b22f740ac23d1afd76df391955c6"; + editedCabalFile = "1ijm34wxyxpx38yw42kl5yrb8i3gv1z7dvxhb98jz6pqxgqcvshs"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base HTF HUnit QuickCheck random ]; homepage = "https://bitbucket.org/accursoft/binding"; @@ -30897,9 +32399,9 @@ self: { mkDerivation { pname = "binding-gtk"; version = "0.2.1"; - sha256 = "799ff85197ac4038d6b14efba48a2960b1312dab898674d8c40ecec047b0c850"; + sha256 = "0l68n13w1khfqkc791l9mcnk3cb0565a9ysfn7b3hh5cjx8zi7vr"; revision = "1"; - editedCabalFile = "9e435774bd5d6a7d9dd1e96dd9293d6a739f7ecde23838571d30866ac4628cb5"; + editedCabalFile = "1dcccb26m1ih3mbkhf72rmz9ywva7llxjvg9s6fpssjxpms5fhwy"; libraryHaskellDepends = [ base binding-core gtk mtl ]; testHaskellDepends = [ base binding-core directory gtk ]; homepage = "https://bitbucket.org/accursoft/binding"; @@ -30913,9 +32415,9 @@ self: { mkDerivation { pname = "binding-wx"; version = "0.2.1"; - sha256 = "91e4d03ac5ee7ea6c66c5c0fce1c1c476cdb75257c4ed544afd057079459cb1e"; + sha256 = "07nbb6a0fmyhmx2dakkw4msxnv273hfcw3swdk3aczpfqlxd1r4i"; revision = "1"; - editedCabalFile = "0307431866ac8b7f34ece32a684a3c70aa1b36ce74c05d815f249d1effe2efb2"; + editedCabalFile = "1cpgwbzix794by0mvh3lrqv1pakh7i56hap3xhs7z2xccqc461q3"; libraryHaskellDepends = [ base binding-core stm wx wxcore ]; testHaskellDepends = [ base binding-core directory wx ]; homepage = "https://bitbucket.org/accursoft/binding"; @@ -30929,7 +32431,7 @@ self: { mkDerivation { pname = "bindings"; version = "0.1.2"; - sha256 = "201a9d879af1dfdcb9ae4d775c14424eff7018db63c831f66fdf59e97c709f7d"; + sha256 = "0zczf1yfjnfzdzv33j33vcc71zsf88a5qxsdmswxrpzika3rs6i0"; libraryHaskellDepends = [ base ]; description = "Deprecated package"; license = stdenv.lib.licenses.bsd3; @@ -30940,7 +32442,7 @@ self: { mkDerivation { pname = "bindings-DSL"; version = "1.0.23"; - sha256 = "eb6c76448eeb2a9a17135b08eec0dd09e1917a9f6ab702cea0b2070bd19c10e7"; + sha256 = "1rqhkk8hn1xjl3705dvakxx93q89vp0fw22v2cbrlapbir27cv7b"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jwiegley/bindings-dsl/wiki"; description = "FFI domain specific language, on top of hsc2hs"; @@ -30952,7 +32454,7 @@ self: { mkDerivation { pname = "bindings-EsounD"; version = "0.1.0.1"; - sha256 = "ce5d54c92d37e67a62bcfa90d54f4151ce09a27e17166bd790fc4c60607b873a"; + sha256 = "0fl7gdh60k7wj3bnn5hpgsi0kkji857xb47spii7mrip5p4m8pff"; libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ]; libraryPkgconfigDepends = [ esound ]; homepage = "http://cielonegro.org/Bindings-EsounD.html"; @@ -30969,7 +32471,7 @@ self: { mkDerivation { pname = "bindings-GLFW"; version = "3.1.2.2"; - sha256 = "537385a35b0ca0f6980f9a785434dcca5e0f8b75475dafa2e9c9d719dd503fc9"; + sha256 = "1j9za3fikmy9x6iaypa7fn5hypnavhs58y4s1ycgd80cbfiqawsk"; libraryHaskellDepends = [ base bindings-DSL template-haskell ]; librarySystemDepends = [ libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr @@ -30991,7 +32493,7 @@ self: { mkDerivation { pname = "bindings-K8055"; version = "0.1.2"; - sha256 = "40e40cc74f8afbbab8518b985e20e29044a720a09a3d5c048c2ff504f7504f35"; + sha256 = "0daga3vh9x9gih25qgcsl0hafi4hw8h5x64ba6wbmywa9z3hrr20"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ K8055D ]; homepage = "https://github.com/jputcu/bindings-K8055"; @@ -31005,7 +32507,7 @@ self: { mkDerivation { pname = "bindings-apr"; version = "0.1"; - sha256 = "d324f6517ad3615aa7065e5f2a247f146655a7315ac70006ef0ded4bce0f873b"; + sha256 = "0fw71z74pv8dxw301iss66kmarhlgwj2lpsy0skmlqfkg98zc96k"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ apr ]; homepage = "http://cielonegro.org/Bindings-APR.html"; @@ -31019,7 +32521,7 @@ self: { mkDerivation { pname = "bindings-apr-util"; version = "0.1"; - sha256 = "9d93dae4cb05d24a2fe50778bdf972df23ca0be5e8f85a85bb744e757720206b"; + sha256 = "0sr041vpakklpf2mmy78wl5wl8yzfbwvsy07wlplmlh5rgjdm4wx"; libraryHaskellDepends = [ base bindings-apr bindings-DSL ]; libraryPkgconfigDepends = [ apr-util ]; homepage = "http://cielonegro.org/Bindings-APR.html"; @@ -31033,7 +32535,7 @@ self: { mkDerivation { pname = "bindings-audiofile"; version = "0.1.0.2"; - sha256 = "b21a7e8cb5ef8f6875b5880e1edb32415d8f5ad04374789e33688138868f4053"; + sha256 = "0ls0iy33i0b86fg7hx23s1d8ypa16bdiw3l8nmsni3zgnn67w6mj"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ audiofile ]; homepage = "http://cielonegro.org/Bindings-AudioFile.html"; @@ -31048,7 +32550,7 @@ self: { mkDerivation { pname = "bindings-bfd"; version = "1.2.0.0"; - sha256 = "04a3243a332831e9102936ac86a77ea6f7f6b4f88859efbc83e22b3047fe0530"; + sha256 = "0c05zr3k0az2hfyfync8z2sgdxx6gskqdb1n548fjc986cx298q4"; libraryHaskellDepends = [ array base containers unix ]; librarySystemDepends = [ bfd opcodes ]; libraryToolDepends = [ alex happy ]; @@ -31063,7 +32565,7 @@ self: { mkDerivation { pname = "bindings-cctools"; version = "3.6.1.0.1.0.0.1"; - sha256 = "28e3bfedbe0a26170e1a59fe903f04d53a833018c2fb01056166369b400517cc"; + sha256 = "1k0p0m09ndk6c42h3yy230q86fnm0hzr1zjr3871f9hapvnvzqr8"; libraryHaskellDepends = [ bindings-DSL ]; librarySystemDepends = [ dttools ]; homepage = "http://bitbucket.org/badi/bindings-cctools"; @@ -31079,9 +32581,9 @@ self: { mkDerivation { pname = "bindings-codec2"; version = "0.1.1.0"; - sha256 = "d6363eaa386fa3dd172d22826bd710db35a89e9640f46c9a822062275b3aeb56"; + sha256 = "0mpb79djfqi0had6rx20jsgahdfv23bnp0i25lbxv8vg72m3wdnn"; revision = "1"; - editedCabalFile = "48e69a5b497247c96ab7a6ed3ff818bef596c712249819e63a84c4667ef5d0b1"; + editedCabalFile = "1cfhymz6di447bk1k6142b3rdxdy33w3zvd6nxmcjivj95drmrj8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ]; @@ -31098,7 +32600,7 @@ self: { mkDerivation { pname = "bindings-common"; version = "1.3.4"; - sha256 = "8b55c6b28a4d7df6854d8b94933f58ca246e917b96080fa0f1ea92dbcb4675fd"; + sha256 = "1zbm8v5xp4pay6h0y24ngf8nw96ab0zr754b9n2zczadiarccmcb"; libraryHaskellDepends = [ base ]; description = "This package is obsolete. Look for bindings-DSL instead."; license = stdenv.lib.licenses.bsd3; @@ -31110,7 +32612,7 @@ self: { mkDerivation { pname = "bindings-dc1394"; version = "0.2.1"; - sha256 = "983b6814cfa968644b5ef5ad15758ed71683ff6e88ab0ee0598d6246ab12af1b"; + sha256 = "06xg2amlcqldb7h0xaw8dvzq65npirsibbgmbr5n8s59rwa6hfwq"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ dc1394 ]; libraryToolDepends = [ c2hs ]; @@ -31125,11 +32627,12 @@ self: { mkDerivation { pname = "bindings-directfb"; version = "0.1"; - sha256 = "f74277586542ec635a5a0013d6b81dcf62c6cada21570b52813dd9986050ab56"; + sha256 = "0mmba1h9in9xh590nmr1vb5ccqng3nwdc4q0b9d67v22cmc7fhpp"; libraryHaskellDepends = [ base bindings-DSL bindings-posix ]; libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -31137,7 +32640,7 @@ self: { mkDerivation { pname = "bindings-eskit"; version = "0.0.1"; - sha256 = "e258e097a6283246517cff353b3e573652f19443d85fb5dedc0d073fc9890e48"; + sha256 = "0j0fi74ky1qdvkgbapyq8fag2linawz3ndgzgi8lcci8lsby0n72"; libraryHaskellDepends = [ array base bindings-DSL ]; librarySystemDepends = [ eskit ]; libraryPkgconfigDepends = [ eskit ]; @@ -31152,7 +32655,7 @@ self: { mkDerivation { pname = "bindings-fann"; version = "0.0.2"; - sha256 = "07afc738076b0f4a5f8b5ad3acbf6ca82cbfe8d4268e5c1fcb5d2da592943ec3"; + sha256 = "1hryjj9aabaxrcgmr3i6sklbyb58djzsrlssidgll3vb0wwcgbq7"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ fann ]; description = "Low level bindings to FANN neural network library"; @@ -31165,7 +32668,7 @@ self: { mkDerivation { pname = "bindings-fluidsynth"; version = "0.2.1"; - sha256 = "cd0fae6cac7914a5bd9e5f61179755b45cf5576ca9d1f72c04443c3cdfdc2fbe"; + sha256 = "1gigvkgkqg240hnggld9dibzap5lanbifqazksysa53rminaw3yd"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ fluidsynth ]; homepage = "http://github.com/bgamari/bindings-fluidsynth"; @@ -31178,7 +32681,7 @@ self: { mkDerivation { pname = "bindings-friso"; version = "0.1.0.0"; - sha256 = "2c1ddbe83cad25dc321f49672a6c634d0bc258917c4a17d178c2619c3110e171"; + sha256 = "0wg120qrqqf2g38ifjkwj5cc42sdcdn2lrs93wrdq9dd7kldn79c"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ friso ]; description = "Low level bindings for friso"; @@ -31191,7 +32694,7 @@ self: { mkDerivation { pname = "bindings-glib"; version = "0.1.5"; - sha256 = "dd3f9c5630e7bb3d53ac9fbde0e7661bde23b6f4776ce7d2ff14dec5d777114a"; + sha256 = "0jhifzbwbphlzz9ffv3pyjv27phvcvky1gczmi9kvfz761b9qgyx"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ glib ]; description = "Low level bindings to GLib"; @@ -31203,7 +32706,7 @@ self: { mkDerivation { pname = "bindings-gobject"; version = "0.4"; - sha256 = "5b05bd465538bf9cb32a063942412f739faaaae3536879af771619900d784ce4"; + sha256 = "1r2cg06r068nfyppjs2kwfmam7vk5x0l4f865arrrgrqam3bs1av"; libraryHaskellDepends = [ base bindings-DSL bindings-glib ]; libraryPkgconfigDepends = [ glib ]; description = "Low level bindings supporting GObject and derived libraries"; @@ -31215,7 +32718,7 @@ self: { mkDerivation { pname = "bindings-gpgme"; version = "0.1.6"; - sha256 = "18e2389612197a80ea53c5a4fa9771c6e15efbabc9ab6195995714345d589457"; + sha256 = "0mwlb1fk852pk6an3ay9mgxmxqf6f6bzm965agm80yhr2ab3iqhq"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ gpgme ]; homepage = "http://bitbucket.org/mauricio/bindings-gpgme"; @@ -31228,7 +32731,7 @@ self: { mkDerivation { pname = "bindings-gsl"; version = "0.2.1"; - sha256 = "7e58214f7adaf83786514e0e0d9a68c062514e77dc388d015e8bb42bb299607b"; + sha256 = "0yv0k6r2pd4bbq0qsf6wfx752qn0d2d0s3jfa633gy6sg97j2n3y"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ gsl ]; description = "Low level bindings to GNU GSL"; @@ -31241,7 +32744,7 @@ self: { mkDerivation { pname = "bindings-gts"; version = "0.1.1"; - sha256 = "709e6d7e847dd132e4d8084140a18b5c773964c2e4a7b61f6739767e789f38da"; + sha256 = "1niqkxw7wxircwgvd9z4q9j3jxswifhl0h88v3j35lbxhiz6v7kh"; libraryHaskellDepends = [ base bindings-DSL bindings-glib ]; libraryPkgconfigDepends = [ gts ]; description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library"; @@ -31254,9 +32757,9 @@ self: { mkDerivation { pname = "bindings-hamlib"; version = "0.1.0.0"; - sha256 = "9f7671388fd67bfd86030f9ffc1f407eebebfa78b8fe3080b4b6615a74d949d9"; + sha256 = "1na9v5s5lqdnnj031zmqg3xfpsvy80gzr7qg0f3gsyyniww72xlz"; revision = "1"; - editedCabalFile = "1eea9735be1dd9f54d91406fbf56da41b8d68a3760ada5e4fc4caf0658c997c9"; + editedCabalFile = "1jcpr5c0dbsczkjabbb06y5ddf21v9bbyvs0j56zbn8xpqsrgshy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ]; @@ -31272,7 +32775,7 @@ self: { mkDerivation { pname = "bindings-hdf5"; version = "0.1"; - sha256 = "e9580189785ec35a4f49d4b4743f6185ac6343888df868da2a8d5dcb790dd774"; + sha256 = "0x6p1mwwnpcd5bd6iy4di11n7b45c4zp9d6l957mmhsyg24h2n79"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Project bindings-* raw interface to HDF5 library"; license = stdenv.lib.licenses.bsd3; @@ -31283,8 +32786,8 @@ self: { ({ mkDerivation, base, bindings-DSL, blas, liblapack }: mkDerivation { pname = "bindings-levmar"; - version = "1.1.0.3"; - sha256 = "809175b1ebd5675506755e53901104ea52cdc68e761c7ce01df54ace11b249b5"; + version = "1.1.0.4"; + sha256 = "1dxr9lbgf08a143d4vm78d1iibafzjx6zdlvpdxfri1v523z3sgd"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ blas liblapack ]; homepage = "https://github.com/basvandijk/bindings-levmar"; @@ -31298,7 +32801,7 @@ self: { mkDerivation { pname = "bindings-libcddb"; version = "0.3"; - sha256 = "de7bf3abe6a00bdef2843caedd6cc895751113cb47ef110ae32f1ec1496ecfc3"; + sha256 = "1hygdr4w27igwc513vs7rc9i2xcmr1ndvbiwhkrdw2x0wsmz6yyy"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libcddb ]; homepage = "http://bitbucket.org/mauricio/bindings-libcddb"; @@ -31311,7 +32814,7 @@ self: { mkDerivation { pname = "bindings-libffi"; version = "0.3"; - sha256 = "c9319828c5745872f748069af37743559078a4e228c7de257547692b5286418c"; + sha256 = "1321hr92nsa7fljxxir8waj7i42m8dvz76h693vp4n3lqll9hcf9"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libffi ]; description = "Low level bindings to libffi"; @@ -31323,7 +32826,7 @@ self: { mkDerivation { pname = "bindings-libftdi"; version = "0.1"; - sha256 = "d11c4bc57a849a9a5a426b54a2530f8dda097772b9b59dd48c5347d9f65c6a1e"; + sha256 = "07kabkvdjiskika9vddrf9vhknld1x9s4m3b89d9m6l4gb2ln76i"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libftdi libusb ]; description = "Low level bindings to libftdi"; @@ -31336,7 +32839,7 @@ self: { mkDerivation { pname = "bindings-librrd"; version = "0.2.0.1"; - sha256 = "1e59848307a649924813dbe238e35fcf257a2cd3d6d163d8392f249d0dc0d0b7"; + sha256 = "1dyhq06rs91g77c67lfnscn7l9fgbzikiqnv2d494jd60y1q8n8y"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ librrd ]; homepage = "http://cielonegro.org/Bindings-librrd.html"; @@ -31352,7 +32855,7 @@ self: { mkDerivation { pname = "bindings-libstemmer"; version = "0.1.0.0"; - sha256 = "226520baaad79625cf89b462d27ac642c63da2641c2b8bad4afb3ae06f56f40e"; + sha256 = "03plarpy0fpv9anqnaqwcji3vij2qrxd4qmli77jb5npmax20r92"; libraryHaskellDepends = [ base bindings-DSL resourcet transformers ]; @@ -31367,7 +32870,7 @@ self: { mkDerivation { pname = "bindings-libusb"; version = "1.4.5.0"; - sha256 = "c6a82f6fe365dda64682ba6f5079e20763d0b6e9c7d9f62256912fcccd4ddd76"; + sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libusb ]; homepage = "https://github.com/basvandijk/bindings-libusb"; @@ -31380,7 +32883,7 @@ self: { mkDerivation { pname = "bindings-libv4l2"; version = "0.1"; - sha256 = "4fbc8d81187c743450dda30d7b38b351aa77bd89041baccc6ad41af10a6c6168"; + sha256 = "0s31dh5g26nldb6aq6q4i6ypgajincw7n3d3vm838x3w320qvg2g"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ v4l2 ]; homepage = "https://gitorious.org/hsv4l2"; @@ -31394,7 +32897,7 @@ self: { mkDerivation { pname = "bindings-libzip"; version = "1.0.1"; - sha256 = "908d060360d66974b1d9400dea28a1dce35a88baf5d73a6e3c12be8e74cda2ec"; + sha256 = "1v52rms8xghj7ip3mmzmpa45mqywl4lfl3a0v6qp8sfnc01hd3ch"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libzip ]; homepage = "http://bitbucket.org/astanin/hs-libzip/"; @@ -31407,7 +32910,7 @@ self: { mkDerivation { pname = "bindings-linux-videodev2"; version = "0.1"; - sha256 = "b8250c711aa5c9f8034204f770b4d9ae5005ffc9125ad36ad0a10642f44411df"; + sha256 = "1pqi8ks441m1s1md6nhjr7zhal5fv6s71xq4881zijd539qhq9dq"; libraryHaskellDepends = [ base bindings-DSL ioctl ]; homepage = "https://gitorious.org/hsv4l2"; description = "bindings to Video For Linux Two (v4l2) kernel interfaces"; @@ -31420,12 +32923,13 @@ self: { mkDerivation { pname = "bindings-lxc"; version = "0.2.1"; - sha256 = "4fee45e55c7cb2ae75a83005213eb7aa2dae7ee97704db3e0cd4ae918ae13087"; + sha256 = "11rhw6593bnl1hzdn13px5zawbdanwz2219hm1ssxckwbkjlbvjg"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ lxc ]; homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -31433,7 +32937,7 @@ self: { mkDerivation { pname = "bindings-mmap"; version = "1.0"; - sha256 = "cd8e045221aabd352f1c6028f28f509becc8c3b6a02b4b6d4412b96a7e710da7"; + sha256 = "19qdf5z6mf8j8inlnax0nv1wiv4va27z4a303hpkbgda459093nd"; libraryHaskellDepends = [ bindings-posix ]; description = "(deprecated) see bindings-posix instead"; license = stdenv.lib.licenses.bsd3; @@ -31444,7 +32948,7 @@ self: { mkDerivation { pname = "bindings-monetdb-mapi"; version = "0.1.0.0"; - sha256 = "63efa91e5c3224666cdda44762e830339ed311148392d14c651b54048ad5218a"; + sha256 = "12i1sn508m0vcm6d34l32h8x77ik63l64ix4vmn6c91jbhgakvv3"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ monetdb-mapi ]; description = "Low-level bindings for the MonetDB API (mapi)"; @@ -31457,7 +32961,7 @@ self: { mkDerivation { pname = "bindings-mpdecimal"; version = "0.8.0.0"; - sha256 = "458a10151e6a22a78ca8360573f3d842f4396ba5cd606fdd95cdb6ac774426a2"; + sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5"; libraryHaskellDepends = [ base bindings-DSL ]; homepage = "http://www.github.com/massysett/bindings-mpdecimal"; description = "bindings to mpdecimal library"; @@ -31472,7 +32976,7 @@ self: { mkDerivation { pname = "bindings-nettle"; version = "0.4"; - sha256 = "f006e0348c2afe3f335c18255bc40d1ec85e5a531f2a6d5d15743fb3baf4d685"; + sha256 = "11fnyjxb6gvl2mfnsahzadd5xj0y1p25n98qbhrkzziaihsf01ph"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ nettle ]; testHaskellDepends = [ @@ -31488,7 +32992,7 @@ self: { mkDerivation { pname = "bindings-parport"; version = "0.0.4"; - sha256 = "723c4aafa7dd8375340b9c957fd238426e4812bd917980667c607f7c292380e0"; + sha256 = "1q404clpqzv0gik80ycipl94hvj27397z5cw1cs7b0yxlypllg3j"; libraryHaskellDepends = [ base bindings-DSL ]; description = "parport bindings"; license = stdenv.lib.licenses.bsd3; @@ -31499,7 +33003,7 @@ self: { mkDerivation { pname = "bindings-portaudio"; version = "0.2"; - sha256 = "362cfad6f1527d887224564682a7ff8f40c73ceed8ee803c78609bc523bab74b"; + sha256 = "0jxpp8iwb6v0g0y81vnqxqycfh4gzykq4ijn4ir8hzajy7bglb1n"; libraryHaskellDepends = [ base bindings-DSL vector ]; libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; @@ -31511,7 +33015,7 @@ self: { mkDerivation { pname = "bindings-posix"; version = "1.2.6"; - sha256 = "cefd0c942dab939ea0c944f56a430aef9fc1afeb66dd74de75af38e0161eeafb"; + sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to posix"; license = stdenv.lib.licenses.bsd3; @@ -31522,7 +33026,7 @@ self: { mkDerivation { pname = "bindings-potrace"; version = "0.1"; - sha256 = "cdfe731190059b63501e6f9a9ee08f317fce820351ea3f3ca720d2445c42686d"; + sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ potrace ]; homepage = "https://github.com/rwbarton/bindings-potrace"; @@ -31535,7 +33039,7 @@ self: { mkDerivation { pname = "bindings-ppdev"; version = "0.0.3"; - sha256 = "f879b217f8418e13ee0dc8e592f7a8ce7ac45f5b5af1aba05bead20b9320fda2"; + sha256 = "18px429hplpabfhapwasbdgw8ynfm3vr5rf81pp173j1z0bv4ygq"; libraryHaskellDepends = [ base bindings-DSL ioctl ]; description = "PPDev bindings"; license = stdenv.lib.licenses.bsd3; @@ -31548,7 +33052,7 @@ self: { mkDerivation { pname = "bindings-saga-cmd"; version = "0.1.1.1"; - sha256 = "be2e08afae8f81997bd11a1710e4c3ffb3372014b82a7cc182e0b9f0f5376586"; + sha256 = "11k56zsz1fg0hb0pqamq2hh3gczzqgj105qss5xrk0cgmsphhbmy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31567,21 +33071,21 @@ self: { mkDerivation { pname = "bindings-sane"; version = "0.0.1"; - sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b"; + sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ saneBackends ]; homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {saneBackends = null;}; + }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage ({ mkDerivation, base, bindings-DSL, scsynth }: mkDerivation { pname = "bindings-sc3"; version = "0.4.1"; - sha256 = "adc7595676edbb7407f0a51405441635c16e6270085751821c7065293f34771f"; + sha256 = "07vp6hzjjrbh3j152mq8f1i6xh9m2r20a555y03p9fzdfrb5kixd"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ scsynth ]; homepage = "https://github.com/kaoskorobase/bindings-sc3/"; @@ -31595,7 +33099,7 @@ self: { mkDerivation { pname = "bindings-sipc"; version = "1.1"; - sha256 = "6de6370cf130d88599f1e7ff389da60089c952bdf2a8f4b699a4000e679b4ae4"; + sha256 = "1r2akdkhw054k6vg9a7jpm9ck280lsfkizz7y6cqbn1hy463grkd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -31612,7 +33116,7 @@ self: { mkDerivation { pname = "bindings-sophia"; version = "0.2.0.2"; - sha256 = "26c60fe133928e674f2076cb0185d006aa150e5f106e2ae2bfa9eb6c4f5d313a"; + sha256 = "0fiibm7nrsx9pzi2lvhhbw71bah6s22h3jvn417ng3lj6ghhzii6"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Low-level bindings to sophia library"; license = stdenv.lib.licenses.bsd3; @@ -31623,7 +33127,7 @@ self: { mkDerivation { pname = "bindings-sqlite3"; version = "1.0.3"; - sha256 = "81f377b3bdd5f388c2885631c14a56c09502441dcb84dde0d10f94defa516038"; + sha256 = "0f30a7xdx50gs7hdv16b3m2055f0ar5c2cani318iwympnrpgww1"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ sqlite ]; description = "Low level bindings to sqlite3"; @@ -31635,7 +33139,7 @@ self: { mkDerivation { pname = "bindings-svm"; version = "0.2.1"; - sha256 = "2b8459b795d39998f1dec01dfd7ede4690265c15bb5bcab4f0ae61246cf7d5da"; + sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b"; libraryHaskellDepends = [ base bindings-DSL ]; homepage = "http://github.com/tanimoto/bindings-svm"; description = "Low level bindings to libsvm"; @@ -31647,7 +33151,7 @@ self: { mkDerivation { pname = "bindings-uname"; version = "0.1"; - sha256 = "130e75c3fd95e232452c7d903efbfab2d2ff6c9d455b617adeaebe5d60235cd3"; + sha256 = "1lsw4dh5vgmfvrx62ns5kmngzlmjzbxkx43x5i2k5qlmzp1pa3hk"; libraryHaskellDepends = [ base ]; description = "Low-level binding to POSIX uname(3)"; license = stdenv.lib.licenses.publicDomain; @@ -31658,7 +33162,7 @@ self: { mkDerivation { pname = "bindings-wlc"; version = "0.1.0.7"; - sha256 = "633d9ebb1aa9a20f8a49c1a84003cb2baedb0341bbcfd354d11aae380d672422"; + sha256 = "08i4cw6kibhss5ad7kxv841xpbibrc1l1a619650z8m93axrwgb3"; libraryHaskellDepends = [ base bindings-DSL convertible ]; librarySystemDepends = [ wlc ]; testHaskellDepends = [ base ]; @@ -31673,7 +33177,7 @@ self: { mkDerivation { pname = "bindings-yices"; version = "0.3.0.2"; - sha256 = "247eb63716c11cdda9275e2e726153cf19dd1a4bbd457170a2384cc55d4d18b5"; + sha256 = "1d8q9mfwak1ql9q72idx9cdds6fgadhp4bjy4ylxs7612qvvczi4"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp yices ]; description = "Bindings to the Yices theorem prover"; @@ -31686,9 +33190,9 @@ self: { mkDerivation { pname = "bindynamic"; version = "1.0.0.0"; - sha256 = "f1e9c392ea6a9be6a4d7200ed8060e5560ac6881c65c9423cc6e63d2bbe7246e"; + sha256 = "0vi4wyxx4qvfrhir8p66h5laqq2m1q3dh3i0syjfd6vaxa9c7sgi"; revision = "1"; - editedCabalFile = "d2dca13b71f94e70829d5d290af936fd21d93e1fb9f6b89a8540cd6f40a0a7e5"; + editedCabalFile = "1rd7l106zka0hndbixmr3wzdj8gx6vwhlaaxkn170kprf4xs3p6j"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; homepage = "https://github.com/lspitzner/bindynamic"; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; @@ -31703,7 +33207,7 @@ self: { mkDerivation { pname = "binembed"; version = "0.1.0.3"; - sha256 = "7950ed58ae4892cab5fcd0527c1df5e0ca24d687673ce7f5da0d19e9b0d06c98"; + sha256 = "163cs2qfj68dvbsyfg37hzb29jp0ylfpqlnhzjswm4j8mrcfsl3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring Cabal ]; @@ -31722,7 +33226,7 @@ self: { mkDerivation { pname = "binembed-example"; version = "0.1.0.3"; - sha256 = "3e0ef2fa2f794c559351c38c891b5a90d92157018d2e8f241f53a0f1b6349c1a"; + sha256 = "06lw6jvg382k3wj8ybld05bj3nchb8dqk363a69mak3r5zxg43iy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -31739,7 +33243,7 @@ self: { mkDerivation { pname = "bini"; version = "0.1.5"; - sha256 = "b83bc415d2d08bfbaadccd8723ad4945d0cb4c519a414cc28a56572b9cd08cb4"; + sha256 = "1d4cs2f2nmsnib14qhcsa56cpl2596nj71ydvjmgp2yhs8aw8fxq"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 ]; @@ -31754,7 +33258,7 @@ self: { mkDerivation { pname = "bio"; version = "0.5.3"; - sha256 = "42c8f9b83fea6bf51356afe1251910ba4421e0af0bb4f26431eaf385971d7eed"; + sha256 = "1vby3nbqbwza65jg5d0bmzh22i5s20cjbqdgaq9zasza7ywgkj22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31773,7 +33277,7 @@ self: { mkDerivation { pname = "bioace"; version = "0.0.1"; - sha256 = "6f43645b2a0ccbca20069aa25fae6fc2ae1704a3a0c48b069852fbfb8ce16222"; + sha256 = "08k2w66gpysjk038pi50lc21gbn2dyp5z8ls0qhcmjqc59dn8hvg"; libraryHaskellDepends = [ base bioalign biocore bytestring parsec ]; @@ -31787,7 +33291,7 @@ self: { mkDerivation { pname = "bioalign"; version = "0.0.5"; - sha256 = "b9152e81abbd7c79099520b69aeca3ff21970f1151b3c072a2994ea31b7acf00"; + sha256 = "006gg8ds6klrl9rc1csi247rf8gzlgn9mdi0jl4pjz5xmf0jw5dr"; libraryHaskellDepends = [ base biocore bytestring ]; homepage = "https://patch-tag.com/r/dfornika/biophd/home"; description = "Data structures and helper functions for calculating alignments"; @@ -31799,7 +33303,7 @@ self: { mkDerivation { pname = "biocore"; version = "0.3.1"; - sha256 = "212b7d7395138d4c231968e1f5bb047c03f61adc6c5eb36162602f42c24db41a"; + sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1"; libraryHaskellDepends = [ base bytestring stringable ]; description = "A bioinformatics library"; license = "LGPL"; @@ -31810,7 +33314,7 @@ self: { mkDerivation { pname = "biofasta"; version = "0.0.3"; - sha256 = "6221a89cde259e8f9a2d4da11230a8a53d78b24d3367e70be5e7b1279e06e7d0"; + sha256 = "1l770sg2gcg7wl5yfrrk9nr7hgd5m0q158ad5nd8z7i5vsfah8b2"; libraryHaskellDepends = [ base biocore bytestring ]; homepage = "https://patch-tag.com/r/dfornika/biofasta/home"; description = "Library for reading fasta sequence files"; @@ -31822,7 +33326,7 @@ self: { mkDerivation { pname = "biofastq"; version = "0.1"; - sha256 = "74e51887569c4900f5de266eca0dd28082c8abdf6ef0f34787a91baec562a310"; + sha256 = "0453cb2sw6x9hx3z7w3fvymwi0l0s86wlvi6vvsh0jcwas3iirbl"; libraryHaskellDepends = [ base biocore bytestring ]; homepage = "http://biohaskell.org/"; description = "A library for reading FASTQ files"; @@ -31832,21 +33336,21 @@ self: { "biohazard" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base-prelude , binary, bytestring, bytestring-mmap, containers, directory - , exceptions, filepath, hashable, iteratee, ListLike, primitive - , random, scientific, stm, text, transformers, unix - , unordered-containers, vector, vector-algorithms, vector-th-unbox - , zlib + , exceptions, filepath, hashable, ListLike, monad-control + , primitive, random, scientific, stm, text, transformers + , transformers-base, unix, unordered-containers, vector + , vector-algorithms, vector-th-unbox, zlib }: mkDerivation { pname = "biohazard"; - version = "0.6.10"; - sha256 = "d966220ae495fb0b4ac792ac02aea3a8786f7a792ce7dcf0e88d4ee27378ebda"; + version = "0.6.13"; + sha256 = "0w9skla3h9a0l9aq8fyak72nsqh7ww91p5xlsza6jf1735903s55"; libraryHaskellDepends = [ aeson async attoparsec base base-prelude binary bytestring bytestring-mmap containers directory exceptions filepath hashable - iteratee ListLike primitive random scientific stm text transformers - unix unordered-containers vector vector-algorithms vector-th-unbox - zlib + ListLike monad-control primitive random scientific stm text + transformers transformers-base unix unordered-containers vector + vector-algorithms vector-th-unbox zlib ]; homepage = "http://github.com/udo-stenzel/biohazard"; description = "bioinformatics support library"; @@ -31866,7 +33370,7 @@ self: { mkDerivation { pname = "bioinformatics-toolkit"; version = "0.3.1"; - sha256 = "f453503831f8a495bcc39e6fe3275f26bd2d50916b09415551b41a316998d543"; + sha256 = "0hymk1lk26mla5al22bbj582vg96bwky6vwyqfy9b97q64w50lzl"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring bytestring-lexing case-insensitive clustering conduit-combinators containers @@ -31896,7 +33400,7 @@ self: { mkDerivation { pname = "biophd"; version = "0.0.8"; - sha256 = "7475e8126b9801c76ddb0d8eb93c0bb8e4a3edd3ec02631e4ee2ff1ecc767d5c"; + sha256 = "0p3xfv61xzz29qg660pcsgns7r5q1cybk3hdvdnwf0cqdc9fhxbl"; libraryHaskellDepends = [ base binary biocore bytestring parsec text time time-locale-compat ]; @@ -31913,7 +33417,7 @@ self: { mkDerivation { pname = "biopsl"; version = "0.4"; - sha256 = "b2be254020a276df342ede835a1c1b1b989763098d7d8a5536c0b86c5f7a3bed"; + sha256 = "1v9vg9gnrf606raqlzcd15irg60v3cf5m0yy5qsdyxm24102bgmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base biocore bytestring ]; @@ -31930,7 +33434,7 @@ self: { mkDerivation { pname = "biosff"; version = "0.3.7.1"; - sha256 = "982f238e056c3d65bae94c505da61e91239b624a8446ecee3b03eae258c7bad7"; + sha256 = "1mxsqxcf5sh37gpfqil499i9n8wi3sk5sl2cx6x6agbc0n726bwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary biocore bytestring ]; @@ -31950,7 +33454,7 @@ self: { mkDerivation { pname = "biostockholm"; version = "0.3.4"; - sha256 = "e753e20bc28169ec5c9f56fe977853e21be4ab150f8b0bccae226ae910656712"; + sha256 = "04k7cl8fjsi2mv60p2qg2nmy86z2adw9gzjnkxffqsc1q85y4lz7"; libraryHaskellDepends = [ attoparsec attoparsec-conduit base biocore blaze-builder blaze-builder-conduit bytestring conduit containers deepseq @@ -31972,7 +33476,7 @@ self: { mkDerivation { pname = "bird"; version = "0.0.19"; - sha256 = "1fbbb73a2b6d926b04958af5ca47e2d7b4152ded065a223a2bf7a17959036870"; + sha256 = "0w380dcpk8gp5cx24nh6xlnibd6pw93wmxcajl26p4kd5cxbgfqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31990,7 +33494,7 @@ self: { mkDerivation { pname = "bit-array"; version = "0.1.2"; - sha256 = "1607bc652aea885589414071dd290657296bbec21c235f4f1f2889715bc87e3c"; + sha256 = "0g3yr1dp32983x7my8qwqaz6naap0qlxswa0864mb27a59jvq1qn"; libraryHaskellDepends = [ base numeric-qq ]; testHaskellDepends = [ base directory doctest filepath ]; homepage = "https://github.com/nikita-volkov/bit-array"; @@ -31999,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 @@ -32006,7 +33531,7 @@ self: { mkDerivation { pname = "bit-vector"; version = "0.2.0"; - sha256 = "e11768da70972a7697dcfd3323f38656b9f19f83e720d706fd58c83555a870c0"; + sha256 = "1h3hm1akbj2qzl3df877hfgz3fanhvrj6czxvjbpcalpf3d6h5z1"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector @@ -32022,7 +33547,9 @@ self: { mkDerivation { pname = "bitarray"; version = "0.0.1.1"; - sha256 = "b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802"; + sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj"; + revision = "1"; + editedCabalFile = "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45"; libraryHaskellDepends = [ array base ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "Mutable and immutable bit arrays"; @@ -32038,7 +33565,7 @@ self: { mkDerivation { pname = "bitcoin-api"; version = "0.12.1"; - sha256 = "c978de1519b24c5c04ff518ad1209f74f91df31d65e23592dc639219df6b3e30"; + sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69"; libraryHaskellDepends = [ aeson base base58string binary bitcoin-block bitcoin-script bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text @@ -32061,7 +33588,7 @@ self: { mkDerivation { pname = "bitcoin-api-extra"; version = "0.9.1"; - sha256 = "c423c6007d0f830dd2bbc0e1bc9219980e6fb2bde684890e265e1bfce4bdd7fc"; + sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4"; libraryHaskellDepends = [ base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit lens stm stm-chans stm-conduit text transformers @@ -32082,7 +33609,7 @@ self: { mkDerivation { pname = "bitcoin-block"; version = "0.13.1"; - sha256 = "d7f57c0fe71045dab85d223dc15d64db3a15cc7fd8446bfe4ebd98cd9d417d5a"; + sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp"; libraryHaskellDepends = [ base binary bitcoin-tx bitcoin-types bytestring cryptohash hexstring largeword lens @@ -32104,7 +33631,7 @@ self: { mkDerivation { pname = "bitcoin-hs"; version = "0.0.1"; - sha256 = "a9782eee40af1ab626c030cbfbec4a0302aefbf670b1006a3fe321f9f0707507"; + sha256 = "01vmf3qgj8g37xm01cbhyvxsw0h39bngpjrhq0kbc6mg83p2wy59"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-prim HTTP json mtl network network-uri old-locale random time @@ -32121,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 = "b723c4f808fd3e517bdacd27e59f08410a600a05ebea2ca6baf5cafa64490fa2"; + 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 @@ -32162,7 +33697,7 @@ self: { mkDerivation { pname = "bitcoin-rpc"; version = "0.5.0.1"; - sha256 = "e2c2d59b0ea84d1b56059c3af38fc6767c6c48b39b9da6a358d2033e0620a52f"; + sha256 = "0bx54033w0yjb2isd7cvnd46qz3nqs7z6flw0mb1nkd81sdxbhp2"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers ghc-prim HTTP mtl network text unix unordered-containers watchdog @@ -32184,7 +33719,7 @@ self: { mkDerivation { pname = "bitcoin-script"; version = "0.11.1"; - sha256 = "398c1d86e918731b5b2026351bb3b0b90b20606517e7c21e42f05d6c6e197b4c"; + sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r"; libraryHaskellDepends = [ base base16-bytestring binary bytestring text ]; @@ -32201,7 +33736,7 @@ self: { mkDerivation { pname = "bitcoin-tx"; version = "0.13.1"; - sha256 = "3bb88265353066c394e96a56b2dc555fa13d37ca7f820978b793196c6829cc00"; + sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v"; libraryHaskellDepends = [ base binary bitcoin-script bitcoin-types bytestring cryptohash hexstring lens @@ -32221,7 +33756,7 @@ self: { mkDerivation { pname = "bitcoin-types"; version = "0.9.2"; - sha256 = "b72f9448508b64706d5f443748dc9b8abde8e749959187ce3d8356cde0d6c40b"; + sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp"; libraryHaskellDepends = [ base base58string binary bytestring hexstring text ]; @@ -32238,7 +33773,7 @@ self: { mkDerivation { pname = "bitly-cli"; version = "0.1.2"; - sha256 = "2d08261ae905fa57d8010600c9db39886868a662333dd6895d94a554c6a3c33c"; + sha256 = "0g63lg3599clbn4xcg9kcak6hs4877dwj00607c5gyh5x4d2c21d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32255,7 +33790,7 @@ self: { mkDerivation { pname = "bitmap"; version = "0.0.2"; - sha256 = "b578f508a416cb41523bfad5b977059c04862e583cd0edf1a18a51abf37299ba"; + sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)"; @@ -32267,7 +33802,7 @@ self: { mkDerivation { pname = "bitmap-opengl"; version = "0.0.1.5"; - sha256 = "fba6d684213fbf56f8ca1109ec4087433dfe9f1a780ae8ef03e5b8b837b801f3"; + sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv"; libraryHaskellDepends = [ base bitmap OpenGL ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for Data.Bitmap."; @@ -32281,7 +33816,7 @@ self: { mkDerivation { pname = "bitmaps"; version = "0.2.6.3"; - sha256 = "e086fceb434566e770aeff2a142a4b774a451c6ab343798de58eb6bafd5a6eb1"; + sha256 = "1cbfbbyvmdlfwn6pjhxkd8f4ajkp9cm18apzmrqffrj58gmzr1p0"; libraryHaskellDepends = [ array base binary bitmap bytestring cereal containers monad-state stb-image string-class tagged zlib @@ -32293,15 +33828,16 @@ self: { }) {}; "bits" = callPackage - ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl + ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl , transformers }: mkDerivation { pname = "bits"; - version = "0.5"; - sha256 = "5834fbf0c5b4c5d0259f9aae9631c906e184a50606786132896307f15e406f1a"; + version = "0.5.1"; + sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; - testHaskellDepends = [ base directory doctest filepath ]; + testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/bits"; description = "Various bit twiddling and bitwise serialization primitives"; license = stdenv.lib.licenses.bsd3; @@ -32312,7 +33848,7 @@ self: { mkDerivation { pname = "bits-atomic"; version = "0.1.3"; - sha256 = "e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d"; + sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -32327,7 +33863,7 @@ self: { mkDerivation { pname = "bits-bytestring"; version = "0.1.0.1"; - sha256 = "d9e90f0b05589d9fcb4a807242a3b92e25786c118d168cbb7ccdbaf8076b6152"; + sha256 = "0lk1dc3zifndgjxqq5ld25n7h99fp6il4wl09b5rz7aq0l5hzsfr"; libraryHaskellDepends = [ base bits bytestring ]; testHaskellDepends = [ base bits bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion ]; @@ -32343,7 +33879,7 @@ self: { mkDerivation { pname = "bits-bytestring-lazy"; version = "0.1.0.1"; - sha256 = "f222dd064307db289e6aacbffdbede82c8b459d80cb85d328a82fe8ef125eaf5"; + sha256 = "1xga4pqqxzl2i8r5vf0cv1cv9j42vszgvgxcdag2inq78c3ds8pj"; libraryHaskellDepends = [ base bits bytestring ]; testHaskellDepends = [ base bits bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ @@ -32361,7 +33897,7 @@ self: { mkDerivation { pname = "bits-conduit"; version = "0.2.0.0"; - sha256 = "32b7f730be27810519f1ea32bdb82e25c187373dd407cdf0cbb629be6fa00f22"; + sha256 = "08hgl1pvwadnrgqcs1yl7lvqgh955swbscpay4chb097pqqggdrj"; libraryHaskellDepends = [ base bytestring conduit mtl ]; testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ]; benchmarkHaskellDepends = [ @@ -32377,7 +33913,7 @@ self: { mkDerivation { pname = "bits-extras"; version = "0.1.3"; - sha256 = "27a5dcf562e5f4c011421263859e09f65d4c382cd123abd73807f456f56cc96b"; + sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -32394,7 +33930,7 @@ self: { mkDerivation { pname = "bitset"; version = "1.4.8"; - sha256 = "08256dbb169a4ae122fcc8d73175bbd00f5a8c049756c240d7689bc547142141"; + sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; librarySystemDepends = [ gmp ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; @@ -32415,7 +33951,7 @@ self: { mkDerivation { pname = "bitspeak"; version = "0.0.3"; - sha256 = "337ca42275c69e49cebc1240b4fe1c5feda0b2955081c0f4ce74994b5389be09"; + sha256 = "02dyi59lp6blrvsc10ahjnra1vaz3kzb8h0jpk74k7n6flia8z1k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32434,7 +33970,7 @@ self: { mkDerivation { pname = "bitstream"; version = "0.2.0.4"; - sha256 = "5e0b7c80707ea244ff68e3f04073cb13764b3355fefc670e81e0fab4a5c900c8"; + sha256 = "1j00r6jv9yp0h476gz7yalrlnxhkrdrl1w73d3zl98kyf207q2sy"; libraryHaskellDepends = [ base base-unicode-symbols bytestring vector ]; @@ -32452,7 +33988,7 @@ self: { mkDerivation { pname = "bitstring"; version = "0.0.0"; - sha256 = "886bab3b4eb262d1c26fc28c0f1a23616ae458325da930110905737336e9a2c7"; + sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "Lazy bit strings"; @@ -32473,7 +34009,7 @@ self: { mkDerivation { pname = "bittorrent"; version = "0.0.0.3"; - sha256 = "d62af0bd19edefeea7cc55760c9d344646dc88eeae9bcaf656b48e61315eab94"; + sha256 = "155bbqqn33mlavvcm6xfxs4dqij66jfhqxjmrjkyxvzd36yz0ann"; libraryHaskellDepends = [ aeson base base16-bytestring base32-bytestring base64-bytestring bencoding binary binary-conduit bits-extras BoundedChan bytestring @@ -32500,7 +34036,7 @@ self: { mkDerivation { pname = "bitvec"; version = "0.1.0.2"; - sha256 = "62be501c4b407dff41c4faaecfd74b9eba6ae87f7d5de98339097b79f9b84995"; + sha256 = "15a9p3wpjyq9761yjpbxgzl6mfly9gbwzbpsqi0zyza09cf51gk2"; libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ base HUnit primitive QuickCheck test-framework test-framework-hunit @@ -32516,7 +34052,7 @@ self: { mkDerivation { pname = "bitwise"; version = "0.1.1.1"; - sha256 = "cde04615108c8e1e4b9f3a6fd7115b6fe40068385489fc5fc3d41e3700d69486"; + sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -32534,8 +34070,8 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.11.0.0"; - sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20"; + version = "0.11.0.1"; + sha256 = "1711zfb7hl31xwpcwkxjnsmn541hzzk01fwa5rf1hhmxhpxmfslj"; libraryHaskellDepends = [ aeson base bytestring deepseq exceptions http-client http-client-tls http-types microlens microlens-th network @@ -32555,7 +34091,7 @@ self: { mkDerivation { pname = "bizzlelude"; version = "1.0.1"; - sha256 = "0b1fa2c6e0ab2fa3830bbd41a18d93e34f8f035b1c7439fa1424e38a5f44a399"; + sha256 = "16d38igqmqr42kx3jx0wbc1qykz3jf6s2hdx1f1s6bxbw33a47qb"; libraryHaskellDepends = [ base containers directory text ]; homepage = "http://github.com/TheBizzle"; description = "A lousy Prelude replacement by a lousy dude"; @@ -32567,7 +34103,7 @@ self: { mkDerivation { pname = "bk-tree"; version = "0.1.1"; - sha256 = "e4aba27740ee95ca2b45c9a9713599288221117c6a4123e08b39e52de07c642b"; + sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/bitonic/language-spelling"; description = "BK-tree implementation"; @@ -32582,7 +34118,7 @@ self: { mkDerivation { pname = "bkr"; version = "0.1.2"; - sha256 = "ba5f1f1f2dfdfe9511234a9cf209ec5b1c323bf0e7394cb91f171be36d1224fe"; + sha256 = "1zi429ny66qp3ywlqfg7y0xk472vxh4z572a4c8rbzpx5lgiypxs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32604,7 +34140,7 @@ self: { mkDerivation { pname = "bktrees"; version = "0.3.1"; - sha256 = "c9c247363b2ac469f4beabe6202a5165d7e0fb0521a89e2204d62b6011f951b4"; + sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9"; libraryHaskellDepends = [ array base containers ]; description = "A set data structure with approximate searching"; license = stdenv.lib.licenses.bsd3; @@ -32615,7 +34151,7 @@ self: { mkDerivation { pname = "bla"; version = "2009.10.20"; - sha256 = "1776b32ec39a040052363546288404dc663b38ad52f2affeae721c43aa3960fd"; + sha256 = "1zb076m4673jmvzazwjjmlw3nrnw0j22hiim6r90014sqcpb6xhp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 unix ]; @@ -32633,7 +34169,7 @@ self: { mkDerivation { pname = "black-jewel"; version = "0.0.0.1"; - sha256 = "8a7a714ed99e2b923cb0a7c483d1b8c28da452ff69c32ccf6d40ebc26a9b26ce"; + sha256 = "1ki6kdmc5ss0dp7jrhv9zx9a93f2p38q7i57n0y94awyv5772yla"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32655,7 +34191,7 @@ self: { mkDerivation { pname = "blacktip"; version = "0.1.0.1"; - sha256 = "c2586ed12cbb75556411fe6e00d6a66fa548c02e5140c833a4dd6044062d408b"; + sha256 = "12s05l348q6xlhrwhh2i5v04i9bglvb00vpy25j5axdv5k8nwn62"; libraryHaskellDepends = [ base bitwise bytestring deepseq deepseq-generics locators network-info safe split system-fileio system-filepath time @@ -32677,7 +34213,7 @@ self: { mkDerivation { pname = "blake2"; version = "0.2.0"; - sha256 = "07d910e3f5c6e98f5a6b9d53dbe5f52506c3859b513bc7493b52552a28382cfc"; + sha256 = "1z1c70l2lmaj7d4wffsikf2w61i5ypjxnlwxddd8zsf6ypii1n87"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring hlint QuickCheck tasty @@ -32694,7 +34230,7 @@ self: { mkDerivation { pname = "blakesum"; version = "0.5"; - sha256 = "0fa8de7d3748d23b1a5fd0e52856458d1eb962b170deeb5f5281332c93db6396"; + sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g"; libraryHaskellDepends = [ base bytestring text vector ]; homepage = "https://github.com/killerswan/Haskell-BLAKE"; description = "The BLAKE SHA-3 candidate hashes, in Haskell"; @@ -32709,7 +34245,7 @@ self: { mkDerivation { pname = "blakesum-demo"; version = "0.5"; - sha256 = "a9925be27059bd9cb54b86f3337410d173c5c77b29fab9c9b9e098e60a0007b4"; + sha256 = "1d07005fd670p74vkyi9gg3wawyi21s37ww69fsrrgarf3i5p4m9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32731,9 +34267,9 @@ self: { mkDerivation { pname = "blank-canvas"; version = "0.6"; - sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; - revision = "9"; - editedCabalFile = "14307379cfd353cceede81149b2cae2f357d27ee23816203fd1757804e6b5b48"; + sha256 = "1cs81ykw1y2q1kwkdni5w9jxa8bc31b118diaqzf870bqm7mq3ia"; + revision = "11"; + editedCabalFile = "1n5sf249kcrk276hdj68g7v6fmhfg6wfwaaibqx2am86iz8dvr06"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour containers data-default-class http-types kansas-comet mime-types @@ -32753,7 +34289,7 @@ self: { mkDerivation { pname = "blas"; version = "0.7.6"; - sha256 = "912e904b8ae923520c3ac4707abb28322a96009daf9ec88baffe5ebd049fcee0"; + sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli"; libraryHaskellDepends = [ base ieee QuickCheck storable-complex ]; homepage = "http://github.com/patperry/blas"; description = "Bindings to the BLAS library"; @@ -32766,7 +34302,7 @@ self: { mkDerivation { pname = "blas-hs"; version = "0.1.1.0"; - sha256 = "80e06b0927982b391d239f8656ed437cd29665969d1a078ea4e42a2bf196b086"; + sha256 = "11mhjvqjnap4lj70f6lxjrjrdlkw8gnmd1lz4cfkjawq4w4npq40"; libraryHaskellDepends = [ base storable-complex ]; librarySystemDepends = [ blas ]; testHaskellDepends = [ base vector ]; @@ -32781,7 +34317,7 @@ self: { mkDerivation { pname = "blastxml"; version = "0.3.2"; - sha256 = "0c0089c42306c8189a9a26905677372d26adfde03772ae79b4742771d0de986a"; + sha256 = "0slqvv8729vlniwswwipw3yss9id6xvmd416kad1ij064g28j00c"; libraryHaskellDepends = [ base biocore bytestring parallel tagsoup ]; @@ -32797,7 +34333,7 @@ self: { mkDerivation { pname = "blatex"; version = "0.1.0.9"; - sha256 = "b449673cae228ce4b761b5a4c3ae72aa04e1e90c14770b2488ebedccc51a2aa0"; + sha256 = "181a3b2wrvgbi0j0nxql1kly215afapc795mc6vy9312mqy6fjdl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32814,7 +34350,7 @@ self: { mkDerivation { pname = "blaze"; version = "0.0.2"; - sha256 = "68dcce9a0535bb6e4dcea68c4ff9cedab83509644204dfea2d9256e90667c606"; + sha256 = "01n6cw3fjmlj5pmdy122ch4kbf6srvwlz356rr6nxfrm0ndcxp38"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -32825,7 +34361,7 @@ self: { mkDerivation { pname = "blaze-bootstrap"; version = "0.1.0.1"; - sha256 = "53b54c0b55ae7a436ec7e5d4e29d50fceb1ccd459ef715236358a3c661d05163"; + sha256 = "0qsis1hwd8sqcciibxwy8p6irszwa2fy5m75qxp46ymfal5lrdak"; libraryHaskellDepends = [ base blaze-html text ]; homepage = "http://github.com/agrafix/blaze-bootstrap"; description = "Blaze helper functions for bootstrap pages"; @@ -32840,7 +34376,7 @@ self: { mkDerivation { pname = "blaze-builder"; version = "0.4.0.2"; - sha256 = "9ad3e4661bf5556d650fb9aa56a3ad6e6eec7575e87d472e8ab6d15eaef163d4"; + sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -32856,7 +34392,7 @@ self: { mkDerivation { pname = "blaze-builder-conduit"; version = "1.1.0"; - sha256 = "638e76ea91eef2d92bd88f0c47a311ae29d090e9add00c979f2b5806e9b0be77"; + sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3"; libraryHaskellDepends = [ base conduit ]; doHaddock = false; homepage = "http://github.com/snoyberg/conduit"; @@ -32871,9 +34407,9 @@ self: { mkDerivation { pname = "blaze-builder-enumerator"; version = "0.2.1.0"; - sha256 = "50f52918a130e81971d01782ead343cdc9bfbf7270ec1e5630943e6b5d23bf96"; + sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah"; revision = "1"; - editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae"; + editedCabalFile = "1bjgki6c3glllf49qpmw08c75mzgv6cldxc8c75cy8hx60rnsy98"; libraryHaskellDepends = [ base blaze-builder bytestring bytestring-builder enumerator streaming-commons transformers @@ -32891,7 +34427,7 @@ self: { mkDerivation { pname = "blaze-colonnade"; version = "1.1.0"; - sha256 = "194fd18e3d911dbe4b4f229df37b90e739fbb3c389a9c85cf9333f5a7159b37b"; + sha256 = "0yxkb5qmlgrkz5fciac9qfrznfg7j1xz77929x5vw7ci7n7d2kqr"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text ]; @@ -32907,7 +34443,7 @@ self: { mkDerivation { pname = "blaze-from-html"; version = "0.4.0.1"; - sha256 = "88fcd55af8a8c4fa611ee28adc27210f7de12556a9099aa702e98f176d461a15"; + sha256 = "058s8rnig3z90akrl2d9aqjy2z8g44kxr2p23rhzmi58z1ddbz48"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32926,7 +34462,7 @@ self: { mkDerivation { pname = "blaze-html"; version = "0.8.1.3"; - sha256 = "8c16e717d353f981e0cd67b50f89ef6f94ab9c56662b3e58bd8a6c552433d637"; + sha256 = "0dyn6cj5av4apmc3wav6asfap53gxy4hzdb7rph83yakscbyf5lc"; libraryHaskellDepends = [ base blaze-builder blaze-markup bytestring text ]; @@ -32948,7 +34484,7 @@ self: { mkDerivation { pname = "blaze-html"; version = "0.9.0.1"; - sha256 = "aeceaab3fbccbf7f01a241819e6c16c0a1cf19dccecb795c5de5407bc8660a64"; + sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf"; libraryHaskellDepends = [ base blaze-builder blaze-markup bytestring text ]; @@ -32970,7 +34506,7 @@ self: { mkDerivation { pname = "blaze-html-contrib"; version = "0.2.2"; - sha256 = "8e81227953a9e75634263f5087e856fe3e217322ec556bc2f162d0d2d6df2028"; + sha256 = "0a10vzbd5l32y716nmgc49rj2gpyavl8fl1z4qs5drx9adwj50cf"; libraryHaskellDepends = [ base blaze-html cgi data-default network safe text ]; @@ -32985,7 +34521,7 @@ self: { mkDerivation { pname = "blaze-html-hexpat"; version = "0.1.0.0"; - sha256 = "6f9ed6e2d77b6a5e2d812ba56b7380cc8cf4e8067f406663f9b49db8b92f7c85"; + sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg"; libraryHaskellDepends = [ base blaze-html bytestring hexpat text ]; homepage = "https://github.com/jaspervdj/blaze-html-hexpat"; description = "A hexpat backend for blaze-html"; @@ -33000,7 +34536,7 @@ self: { mkDerivation { pname = "blaze-html-truncate"; version = "0.3.0.0"; - sha256 = "74fda4e761d0eddfa2ed392967333d884a150bb41141dea88a89851955c7f2b3"; + sha256 = "1czjqxaik1c9ialdwh8inh5iajl87lrnfa9rxnidzvfhc7ks9zbl"; libraryHaskellDepends = [ base blaze-markup bytestring html-truncate tagsoup text ]; @@ -33017,7 +34553,7 @@ self: { mkDerivation { pname = "blaze-json"; version = "0.2.1"; - sha256 = "0375c434a578dc5cad4fa6bd8331e75434b8998153e077af64dae382c8de19cb"; + sha256 = "1jqrvv485qyscjppgq2kh6cvhd2lwwqq7gd69ynmrp3qllsc8x83"; libraryHaskellDepends = [ base bytestring bytestring-builder containers data-default-class text @@ -33040,7 +34576,7 @@ self: { mkDerivation { pname = "blaze-markup"; version = "0.7.1.1"; - sha256 = "638da5984ecd5bcc87f5836786ff93352058a8856bea428d7ffd25bc26c54303"; + sha256 = "00s3qlkbq9gxgy6l5skbhnl5h81mjgzqcrw3yn3wqnyd9scab3b3"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck @@ -33059,7 +34595,7 @@ self: { mkDerivation { pname = "blaze-markup"; version = "0.8.0.0"; - sha256 = "19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f"; + sha256 = "03sl7xs6vk4zxbjszgyjpsppi1cknswg7z7rswz2f0rq62wwpq8r"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck @@ -33076,7 +34612,7 @@ self: { mkDerivation { pname = "blaze-shields"; version = "0.1.1.11"; - sha256 = "e68503738f527bd439bcff52726297d26a0c15e8ce71eb72a4edeaff6ffea4d6"; + sha256 = "1mm4zrpzzspdlirfnwffx0ahqsnjjxi74lpzphwx8ysjixrh71g6"; libraryHaskellDepends = [ base blaze-html blaze-markup blaze-svg text ]; @@ -33089,8 +34625,8 @@ self: { ({ mkDerivation, base, blaze-markup, mtl }: mkDerivation { pname = "blaze-svg"; - version = "0.3.6"; - sha256 = "90dff37d78bffe5ee2587bab4281c158d5d1bd3901fe359bfdcc1cb6fb387179"; + version = "0.3.6.1"; + sha256 = "0q5a4wam0sidng0cfsivwkyph9snyilk7rsdx4vb6wz9l6xz397n"; libraryHaskellDepends = [ base blaze-markup mtl ]; homepage = "https://github.com/deepakjois/blaze-svg"; description = "SVG combinator library"; @@ -33105,7 +34641,7 @@ self: { mkDerivation { pname = "blaze-textual"; version = "0.2.1.0"; - sha256 = "1042795ab0bab891c034c24a51bafecbb89870ccd28af39534ab3d9ae7f46c2d"; + sha256 = "0bbcykkrlgdb6jaz72njriq9if6bzsx52jn26k093f5sn1d7jhhh"; libraryHaskellDepends = [ base blaze-builder bytestring ghc-prim integer-gmp old-locale text time vector @@ -33126,7 +34662,7 @@ self: { mkDerivation { pname = "blaze-textual-native"; version = "0.2.1.1"; - sha256 = "4d0f00d0ac1295153c000a89e91ab7626a1b4ddc138be31087bd3049896b6fe0"; + sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd"; libraryHaskellDepends = [ base blaze-builder bytestring ghc-prim integer-gmp old-locale text time vector @@ -33142,7 +34678,7 @@ self: { mkDerivation { pname = "blazeMarker"; version = "0.1.0.0"; - sha256 = "0c0dedca6cee4a5547a73f3a825925ca447bc8a86d8cf8ac41aa9fdfa91ffd0d"; + sha256 = "03gx3ylxz7xa86ngi33dm347ni6a4mcq4fizlx3majpfdk5fs38c"; libraryHaskellDepends = [ base blaze-html blaze-markup ]; description = "..."; license = stdenv.lib.licenses.mit; @@ -33155,7 +34691,7 @@ self: { mkDerivation { pname = "blazeT"; version = "0.0.5"; - sha256 = "81d25882110a62ba8ef99f76f35a98c58ec034f283244d5af6506832991e7091"; + sha256 = "14bh3sck4s2hyrd4s943y8sc13n5k1dg6xlzz67blqha2615ill1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring mtl text @@ -33168,29 +34704,28 @@ self: { "ble" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, d-bus - , data-default-class, hslogger, hspec, microlens, microlens-ghc - , microlens-th, mtl, QuickCheck, quickcheck-instances, random, stm - , text, transformers, uuid + , data-default-class, hslogger, hspec, markdown-unlit, microlens + , microlens-ghc, mtl, process, QuickCheck, quickcheck-instances + , random, stm, text, transformers, uuid }: mkDerivation { pname = "ble"; - version = "0.2.0.0"; - sha256 = "c8961033317b333de25d2fa49375b309b17aa1d825bb4030cc0cc990df6655e1"; + version = "0.4.0.0"; + sha256 = "0c4m9ia92djr8lhp6n1zwwxskr344322m8g24ka4skbrp1vy3qnd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal containers d-bus data-default-class - microlens microlens-ghc microlens-th mtl random text transformers - uuid + microlens microlens-ghc mtl random text transformers uuid ]; executableHaskellDepends = [ - base bytestring cereal containers d-bus data-default-class - microlens microlens-ghc microlens-th mtl random stm text + base bytestring cereal containers d-bus data-default-class hslogger + markdown-unlit microlens microlens-ghc mtl random stm text transformers uuid ]; testHaskellDepends = [ base bytestring cereal containers d-bus data-default-class hslogger - hspec microlens microlens-ghc microlens-th mtl QuickCheck + hspec microlens microlens-ghc mtl process QuickCheck quickcheck-instances random text transformers uuid ]; homepage = "http://github.com/plow-technologies/ble#readme"; @@ -33204,7 +34739,7 @@ self: { mkDerivation { pname = "blink1"; version = "0.4"; - sha256 = "128bba0aa3247b4a6546c41b0b7f85ad1869c0ec8aaa20ff2bbb8b89c9e38714"; + sha256 = "0547wg4qk2xv5gzj1alaxk06j65dhmzhn6y48rjllyr4lc5bm2qj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text unix usb vector ]; @@ -33222,7 +34757,7 @@ self: { mkDerivation { pname = "blip"; version = "0.2.1"; - sha256 = "c742a094cd863b4021fdab70f4e75b13a8a5e5c2f3f5091475bf21ac9c6c9f46"; + sha256 = "0ilzdjfaq8dzfla0kxgkqbjsba0kbgkz8w5bzlhl0fw6rnaa0hn7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -33242,7 +34777,7 @@ self: { mkDerivation { pname = "bliplib"; version = "0.2.1"; - sha256 = "1f17b3e1bbd88bbb12992ed16c0733d714f66600d7f9eb11780249efd181b444"; + sha256 = "0i5lh78yyj82g08ypyfp01kgc56p6c3nrl9fk49bp2yqpghv65qz"; libraryHaskellDepends = [ base binary bytestring containers mtl pretty utf8-string ]; @@ -33252,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 @@ -33259,7 +34819,7 @@ self: { mkDerivation { pname = "blockhash"; version = "0.1.0.0"; - sha256 = "81e50f190a92639b5d6545d544500001c6567fbda18338a9238b1809bc4d5449"; + sha256 = "0jal9ny0j64b4flki0x1pmzmdih101849ma5cmfrnqwj18chzrc1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33280,7 +34840,7 @@ self: { mkDerivation { pname = "blocking-transactions"; version = "0.1.0.5"; - sha256 = "fa3e685693150cf03957abf7ed7da6825b6396b8419da9931b0718384091b403"; + sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps"; libraryHaskellDepends = [ base containers parallel ]; homepage = "http://www.downstairspeople.org/git/blocking-transactions.git"; description = "Composable, blocking transactions"; @@ -33295,7 +34855,7 @@ self: { mkDerivation { pname = "blogination"; version = "0.5"; - sha256 = "cffde658235332148228b317a0f22d3fe990142d34ef1eeb569f2cf1a364b02d"; + sha256 = "0bdhcjiz2b4zavmixvrl5la91s9z5pra05xk52118cjk4dcfdzfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33319,7 +34879,7 @@ self: { mkDerivation { pname = "bloodhound"; version = "0.12.1.0"; - sha256 = "da3ed23c1cc9cfc1d1b44c1255522f6c164b8ed53d2e008c92789e72a232e46c"; + sha256 = "0v746ai757kqja600bixsn74n5kc5x95a4jcnk8w3ky93hyd4gns"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -33337,7 +34897,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bloodhound_0_13_0_0" = callPackage + "bloodhound_0_14_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, errors, exceptions, generics-sop, hashable , hspec, http-client, http-types, mtl, mtl-compat, network-uri @@ -33347,8 +34907,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.13.0.0"; - sha256 = "65217195be1d4d29c99bfc05712e3aa6ed9f67d8e12180e703b67be1b093c4f9"; + version = "0.14.0.0"; + sha256 = "1vpfsly1y6iryl2swaaid8jpfni886fanh3mp893fxgyzbn7n6rf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -33376,7 +34936,7 @@ self: { mkDerivation { pname = "bloodhound-amazonka-auth"; version = "0.1.1.0"; - sha256 = "cf92a14be0e0d5552f2b00cdb19ab320f93ae612b92589999b674a3984858504"; + sha256 = "0145hn23jjk7kfcqj9dr2bk3my90nfdb3k805cpmbmg0w15s34ng"; libraryHaskellDepends = [ amazonka-core amazonka-elasticsearch base bloodhound exceptions http-client http-types time transformers uri-bytestring @@ -33398,7 +34958,7 @@ self: { mkDerivation { pname = "bloomfilter"; version = "2.0.1.0"; - sha256 = "6c5e0d357d5d39efe97ae2776e8fb533fa50c1c05397c7b85020b0f098ad790f"; + sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc"; libraryHaskellDepends = [ array base bytestring deepseq ]; testHaskellDepends = [ base bytestring QuickCheck random test-framework @@ -33417,7 +34977,7 @@ self: { mkDerivation { pname = "bloomfilter-redis"; version = "0.1.0.3"; - sha256 = "2d7285018f40345aac3f5bab4d17b95cb469b071e1beb75d7f48dfc09cf51a73"; + sha256 = "0wqsynfc1ps8gxfvggp1f6q6kd2wp4blvasv7yn5ld20iw0qawid"; libraryHaskellDepends = [ arithmoi base binary bytestring hashable hedis ]; @@ -33438,7 +34998,7 @@ self: { mkDerivation { pname = "blosum"; version = "0.1.1.4"; - sha256 = "44b12d24d56bfadec7a53c1d620e1cc52f4126ba01ab541a135b187846c10380"; + sha256 = "1003q537h62v2cd59aq1p8k42by53h76479wlp3xxykbslj2vca4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33459,7 +35019,7 @@ self: { mkDerivation { pname = "bloxorz"; version = "0.1.2"; - sha256 = "9c675f2d148cfda55fde7fb09223b30763e06066823231049b4d14158bde3e33"; + sha256 = "0cryvs5ia52dkc232cl2crhf0qq7ncir5c3zvrgsbzcc2hnmyrww"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLFW OpenGL ]; @@ -33474,7 +35034,7 @@ self: { mkDerivation { pname = "blubber"; version = "0.0.1"; - sha256 = "4d77ede2f3584ebb54208d402e20fd621029fa9b10a2029f8987ef67f805832d"; + sha256 = "0bc30pw6gvw7i6gh58hhkgx2j432zlh2wh4d41abnkjqygifsxsd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -33494,7 +35054,7 @@ self: { mkDerivation { pname = "blubber-server"; version = "0.0.1"; - sha256 = "45424b0cdcc2522f38ac495cea54bdae2dd04348fbae9272cf5030413549c589"; + sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cereal containers random ]; @@ -33508,6 +35068,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bluemix-sdk" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-types + , text, vector + }: + mkDerivation { + pname = "bluemix-sdk"; + version = "0.1.1.0"; + sha256 = "0ljpjk7wd11y90maib0vyx8y6v96b6ng9skdig136xjfy27vv82r"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types text vector + ]; + homepage = "https://github.com/agrafix/bluemix-sdk#readme"; + description = "Bindings to Bluemix APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bluetile" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, filepath , glade, gtk, gtk2, mtl, process, random, regex-compat, unix @@ -33516,7 +35092,7 @@ self: { mkDerivation { pname = "bluetile"; version = "0.6"; - sha256 = "42e14f961760de26cbae93f45009a522052e90c4b96246f2bd6ebd8e40b7ae8f"; + sha256 = "13xfnx08xgbfppr4cqmrqj82w192ll4m1x4kmv5jdpk02yb4zqa2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -33536,7 +35112,7 @@ self: { mkDerivation { pname = "bluetileutils"; version = "0.2"; - sha256 = "f57d9d259dbeaf3b91e0baddc28f15bb89d0ed6490df733b48ad56507246cae2"; + sha256 = "1qna8rr50mmd90xp7pwhcknx12dv2n7w5pdsw28kpbxykljrszgm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gtk ]; @@ -33553,7 +35129,7 @@ self: { mkDerivation { pname = "blunt"; version = "1.0.2"; - sha256 = "0cce0e687baa915e5c08272ea9e5858beda4fd2f459bfbc0022dedbce5e515dc"; + sha256 = "1p0mwpjvrv9d0b0gp6s55zys9vcbhpjsjbi711f5x4dagdl0xkhc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33573,21 +35149,35 @@ self: { mkDerivation { pname = "bmp"; version = "1.2.6.3"; - sha256 = "3cc63de40fe088ce4d1c869180fd2309bcec35a940c9e3d1904d3520ca2fdacc"; + sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "https://github.com/benl23x5/bmp"; description = "Read and write uncompressed BMP image files"; 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 }: mkDerivation { pname = "board-games"; - version = "0.1.0.5"; - sha256 = "b03ba53621f7ebd508d1f910f71492252a7181cc3485ecf7ae874eb634bd5d5e"; + version = "0.1.0.6"; + sha256 = "0qry0kacwaiwdcc2wxz08qimvzj9y0vmyc0cc5yq1lyx1sx6wghp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33613,9 +35203,9 @@ self: { mkDerivation { pname = "bogocopy"; version = "0.1.0.2"; - sha256 = "4b2d4e376b8908805a09404fac4a7b73efd3f4549a515eb8e180fe46221de834"; + sha256 = "0d783li4dzl0w6w5wlcsaksd7vvkgd5aqks015d80249dcvlwbab"; revision = "2"; - editedCabalFile = "bf8d78b2879369efdce0953e4613ca0dd1712c4e051adc5e5f66feda39757a5a"; + editedCabalFile = "0nksflwxmzk6bxgdq6h59qn73l8dr89lcglmw3ffysckhyr7i3dz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -33634,7 +35224,7 @@ self: { mkDerivation { pname = "bogre-banana"; version = "0.0.1"; - sha256 = "916f9f154c4646c999d9688fe985463b969188711e85ef9cef5f2f1d42aa997e"; + sha256 = "0zlrm911sbszxyffz18yf64935iv8s2yk3v8v6cwjij69haryvwi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33653,8 +35243,8 @@ self: { }: mkDerivation { pname = "bolt"; - version = "0.3.0.1"; - sha256 = "dd7f157db6fe2c6cac86a19803ac56ed132d8aa27f602a98e3506d2765b23ff9"; + version = "0.3.1.0"; + sha256 = "0r3pyl170h3xyq4400j40ijp2j3nzh1sqlh0qd0fb140qcwvr35h"; libraryHaskellDepends = [ base bifunctors bytestring cereal containers hashable network network-uri scientific text transformers unordered-containers @@ -33677,9 +35267,9 @@ self: { mkDerivation { pname = "boltzmann-samplers"; version = "0.1.0.0"; - sha256 = "5707065a83cb30223ffedbd740ac07d3d879bb0895ba7666d23d659e3b69883f"; + sha256 = "0gw8d4xrwr9xs9k7dflm12xpkn6k0yn41myvzqzj4c6bhdd0c1sp"; revision = "1"; - editedCabalFile = "203beaed2fdb6bbbd42cfa264f9fe1ef2ba4a69f4c92a85864317ffdd43a6a03"; + editedCabalFile = "00va7bagszricicai4jckyka8azgw6gly9ps5kabnsyv5znylfr0"; libraryHaskellDepends = [ ad base containers hashable hmatrix ieee754 MonadRandom mtl QuickCheck transformers unordered-containers vector @@ -33697,8 +35287,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.8.0.0"; - sha256 = "9ba0c8b618d342575d480488783117ea99dc19b0b5485192e3757cdbe267ccf7"; + version = "0.10.0.0"; + sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33729,7 +35319,7 @@ self: { mkDerivation { pname = "bond-haskell"; version = "0.1.5.0"; - sha256 = "db62f0b0913e92c1892cdbeeb67a0397e911eae67aa3de8255bc61d19fb18606"; + sha256 = "01l6n6gx2qdwan1dx8vswvm13scp0dxbdvnv5j4w34iyj6qg0qnv"; libraryHaskellDepends = [ aeson array base binary bond-haskell-compiler bytestring containers deepseq extra hashable mtl scientific text unordered-containers @@ -33756,7 +35346,7 @@ self: { mkDerivation { pname = "bond-haskell-compiler"; version = "0.1.5.0"; - sha256 = "08fcc16b2990bb16ad43fa9cccb460f8299243ddc4a277395bc230021a5ebc13"; + sha256 = "04xwbqd04c62bcwpg8n4vm1r4agqc2scr77s8fnidfwh55mw3z08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33779,7 +35369,7 @@ self: { mkDerivation { pname = "bookkeeper"; version = "0.2.4"; - sha256 = "0f75317b35b8c4984fd9e1c0f3a33179387648b1aad33efc7a00d0cc0b7e1f9f"; + sha256 = "17qzgq5wrl00gby3xlxan547cf3r66iz7h71v57rii5q6mxk2x8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33806,7 +35396,7 @@ self: { mkDerivation { pname = "bookkeeper-permissions"; version = "0.1.0.0"; - sha256 = "66ea36897fd62e23eaf4de657e12c43067d86f86b441ecb819c4216889fc7cb4"; + sha256 = "1d3wzj4nh8f436wfqhdlhrpxhrrhqh97wrfyykm26bnngy4kdsk6"; libraryHaskellDepends = [ base bookkeeper type-level-sets ]; homepage = "https://github.com/pkamenarsky/bookkeeper-permissions"; description = "Permissions for bookkeeper records"; @@ -33819,7 +35409,7 @@ self: { mkDerivation { pname = "bookkeeping"; version = "0.2.1.1"; - sha256 = "d920c7865a11a35af8147e79e2c48028831d5f6c0227cdf2ee65ec32b0e17fb5"; + sha256 = "1dbzw6q35v35xvrcs9q2digiv0r8h32f4yby2kw5m8qiba3cf86r"; libraryHaskellDepends = [ base dlist mtl text time ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; @@ -33828,12 +35418,16 @@ self: { }) {}; "bookkeeping-jp" = callPackage - ({ mkDerivation, base, bookkeeping, doctest, Glob }: + ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable + , text, time + }: mkDerivation { pname = "bookkeeping-jp"; - version = "0.1.0.1"; - sha256 = "10cb27933f689d38c0bc6e24ae6b1a06cdd9f69aef83dc6aa779c9872410cde5"; - libraryHaskellDepends = [ base bookkeeping ]; + version = "0.1.1.0"; + sha256 = "1hmh8q041p0f4v58ywpwd833v7k0jg900r1la3wh4x1h08bxmbxm"; + libraryHaskellDepends = [ + base bookkeeping mono-traversable text time + ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; @@ -33845,7 +35439,7 @@ self: { mkDerivation { pname = "bool-extras"; version = "0.4.0"; - sha256 = "c1e8cfc6e716f089a7d24fe0cb33e2f4792ff97f81084604139d5902dc201501"; + sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61"; libraryHaskellDepends = [ base ]; homepage = "http://tom.lokhorst.eu/bool-extras"; description = "A fold function for Bool"; @@ -33859,7 +35453,7 @@ self: { mkDerivation { pname = "boolean-like"; version = "0.1.1.0"; - sha256 = "6ca47b21a6d98161edfd94f4d5a19daacc13d229b87a0c107e868ff0259658b8"; + sha256 = "1f2qjqjz13w6gq80qymq57917k5aknhxbx4lzpnn30frlqhpp93c"; libraryHaskellDepends = [ attoparsec base bytestring containers semigroups text vector ]; @@ -33873,7 +35467,7 @@ self: { mkDerivation { pname = "boolean-list"; version = "0.1.0.1"; - sha256 = "ac02910213e71b1e8f4d0de1227e7463836ee1e1985626effe1bf41af5b8e077"; + sha256 = "0xz0p3simx0vzvpjcmlqw7hnx0v3fiz25q8d9n7iw6z72c1920mc"; libraryHaskellDepends = [ base bytestring HUnit ]; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; @@ -33888,9 +35482,9 @@ self: { mkDerivation { pname = "boolean-normal-forms"; version = "0.0.0.1"; - sha256 = "2c8a8a9b2e868e29fab7467272c6c54792417bcd8c0e349963b3aff82137c287"; + sha256 = "11y26whzibxkcfck83lcrmxl34j7qp374wj6nzx2k3l65sdqm2ic"; revision = "1"; - editedCabalFile = "c4ca8c0d91be170e201800c3c26de19dea859afa56d69bdab323315e31a74075"; + editedCabalFile = "0xa0lwqmwc93ngd9pmjnzad8bslxw5nw5hq030h0w5xyj46qrjn4"; libraryHaskellDepends = [ base cond containers ]; testHaskellDepends = [ base cond containers QuickCheck tasty tasty-quickcheck @@ -33905,7 +35499,7 @@ self: { mkDerivation { pname = "boolexpr"; version = "0.1"; - sha256 = "b6a386d2aed46d7e81c93b90fe60914cd57dee19c3621d7760ecd24b19496893"; + sha256 = "14v894clplpcc1visqn337p7vmacj5hgx41vr60pwvflmv98d8xn"; libraryHaskellDepends = [ base parsec ]; description = "Boolean expressions with various representations and search queries"; license = stdenv.lib.licenses.bsd3; @@ -33916,7 +35510,7 @@ self: { mkDerivation { pname = "bools"; version = "0.1.1"; - sha256 = "356681052e693ac02e0ab5bcb5f3cf426761cf1d4c3309cc0ee80e510718a700"; + sha256 = "0057303m23p81v60jcsc3p7n2rs2rzrvbg5m18pc0fk95q2q2rim"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -33927,9 +35521,9 @@ self: { mkDerivation { pname = "boolsimplifier"; version = "0.1.8"; - sha256 = "096fa9377241520ee114403fd53b51a7369187fb4dca65f19f85a727d689828f"; + sha256 = "13w2i7b2g9w5kzqnbjjdzf3r2dm7a4xxags02khhwlj1f8vsjvq9"; revision = "1"; - editedCabalFile = "d05220c8f3aaeb0c5f6f92cd6c3d869b7f5253b66cdb6d5d392b9198ec061577"; + editedCabalFile = "0xqm0vn9i49b75fnvnvcnr9m4zwvhqynrkcjdxghrsxayg420lnh"; libraryHaskellDepends = [ base containers ]; description = "Simplification tools for simple propositional formulas"; license = stdenv.lib.licenses.bsd3; @@ -33941,8 +35535,8 @@ self: { }: mkDerivation { pname = "boomange"; - version = "0.1.3.2"; - sha256 = "0a0d3eab319a67e76c0552a6d7bee457b7e102a2b10a9ba56b186dccfa008069"; + version = "0.1.3.3"; + sha256 = "0am2b5f6a47khka31mxynl9j2fisa6zyfk3ca8yna02hdkw3rlf6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -33960,7 +35554,7 @@ self: { mkDerivation { pname = "boombox"; version = "0.0"; - sha256 = "e48f0f1ee83d128bab671f1ac0077faa13e5f61f89031b77de151d1fcc8704fc"; + sha256 = "1z04hz61y78mvrvin0w93zvfa4xagw3w06hzcymqn4ixx0g0z3z4"; libraryHaskellDepends = [ base bytestring comonad semigroupoids semigroups transformers ]; @@ -33974,7 +35568,7 @@ self: { mkDerivation { pname = "boomerang"; version = "1.4.5.2"; - sha256 = "86de45d4407deba2f5441e3867fdc603a7b0cee35080bed181fdefe2c8a0a2be"; + sha256 = "1gm2l34f5vzxh78vx02hwg7b19q3qvynff0y8kss5svx83a4bpl6"; libraryHaskellDepends = [ base mtl template-haskell text ]; description = "Library for invertible parsing and printing"; license = stdenv.lib.licenses.bsd3; @@ -33988,7 +35582,7 @@ self: { mkDerivation { pname = "boomslang"; version = "0.0.4"; - sha256 = "d0a6daa9d7fe0a4b3ab224bbb35e6599be26feb9adb413fad98e345a3459187b"; + sha256 = "0yqqb4s5ld4fv7x17d5dp7z2dglrcmgb7fr4n8x4n2pysylxm9nh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34005,7 +35599,7 @@ self: { mkDerivation { pname = "bootstrap-types"; version = "0.3"; - sha256 = "84b0c14c4d7c12beadef4b2950b888065e6e94dd0a08bcdfa5f43db4111db5a5"; + sha256 = "19dm3l8v8ggllpgvq20avna6wph6i2w50aabxynvw4kw9m6c3c44"; libraryHaskellDepends = [ base text ]; description = "Bootstrap CSS Framework type-safe interface"; license = stdenv.lib.licenses.mit; @@ -34022,7 +35616,7 @@ self: { mkDerivation { pname = "borel"; version = "0.18.0"; - sha256 = "a390410ad6d62f79e35509c9bc3e9ac24bccc4b74220428dbb4e210a0ef54a35"; + sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453"; libraryHaskellDepends = [ aeson async attoparsec base bimap cassava ceilometer-common chevalier-common configurator containers errors hslogger lens @@ -34049,7 +35643,7 @@ self: { mkDerivation { pname = "boring-game"; version = "0.1.0.1"; - sha256 = "51cc6d7b7cdda9ca35021c7005d75773119bdb3331f5fb40c750c9e231392b81"; + sha256 = "109b74qy5jahqx0gpx9i6gdrn4bkazbhaw0w08swmafxgixnvk2i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gloss ]; @@ -34065,7 +35659,7 @@ self: { mkDerivation { pname = "boring-window-switcher"; version = "0.1.0.4"; - sha256 = "4f9f7dbe3ad1e3f5ad40a79e59e03e3598c9be7a91afe9d3ffb7148fd3063196"; + sha256 = "15ii0v9qy55pzz9ykbwigazck61m7vh5k7m782nzbqyi7az7v7sg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gtk transformers X11 ]; @@ -34080,7 +35674,7 @@ self: { mkDerivation { pname = "bot"; version = "0.3"; - sha256 = "2c57b733057d4fe697f554aeb37bbafb09d15f64f1b5f9e5c41f25b10d0b3a33"; + sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc"; libraryHaskellDepends = [ arrows base Stream ]; homepage = "http://haskell.org/haskellwiki/Bot"; description = "bots for functional reactive programming"; @@ -34093,7 +35687,7 @@ self: { mkDerivation { pname = "both"; version = "0.1.1.0"; - sha256 = "6f4ee8b7745fb3054282240fe941dd74cf2481f1a07b170d211c2b8791340e8e"; + sha256 = "13hf6j8qfaqw446ifyx0y60j9kvlvm0yj3r4h910bcszfjvyhkkg"; libraryHaskellDepends = [ base semigroups zero ]; homepage = "https://github.com/barrucadu/both"; description = "Like Maybe, but with a different Monoid instance"; @@ -34105,7 +35699,7 @@ self: { mkDerivation { pname = "botpp"; version = "0.1"; - sha256 = "dc118d7cc2a08124a2981227360684774a31903e091ee75f50b600393f812647"; + sha256 = "0ir6h4zkj05na1gyf7h97s832jkphh33c9qjk2i290d0q9y8s4fw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -34115,22 +35709,25 @@ self: { }) {}; "bound" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad - , directory, doctest, filepath, hashable, hashable-extras - , prelude-extras, profunctors, template-haskell, transformers - , vector + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest + , functor-classes-compat, hashable, mmorph, profunctors + , template-haskell, transformers, transformers-compat, vector, void }: mkDerivation { pname = "bound"; - version = "1.0.7"; - sha256 = "ad0388ade83ca0b3cf02b182e663f553a83b3a8116ada8f39543318bf516340e"; + version = "2"; + sha256 = "0z63k6kkj43rvwzsy7rbrxz97f8clq87ajbdv7768xziw4mb022x"; + revision = "1"; + editedCabalFile = "1sdsshbvhv955ncgxygzl4mfkkk76rdkilwc70w04j9jmbvj5p6j"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bifunctors binary bytes cereal comonad hashable - hashable-extras prelude-extras profunctors template-haskell - transformers + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell transformers transformers-compat ]; testHaskellDepends = [ - base directory doctest filepath prelude-extras transformers vector + base deriving-compat doctest functor-classes-compat transformers + transformers-compat vector void ]; homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; @@ -34143,7 +35740,7 @@ self: { mkDerivation { pname = "bound-gen"; version = "0.1.0.2"; - sha256 = "97436491bc61df00f175ceb2da50fb6dd561a76c45e50d6b4901b493c8da84c6"; + sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp"; libraryHaskellDepends = [ base bound monad-gen mtl ]; description = "Unwrap Scope's with globally fresh values"; license = stdenv.lib.licenses.mit; @@ -34155,7 +35752,7 @@ self: { mkDerivation { pname = "bounded-tchan"; version = "0.2.3"; - sha256 = "3ccd1447154c137d61f665793cd098765e47247037b5c960019e063f7e438789"; + sha256 = "12c78dz3y1ly05hckd9pf0j4fpknk383qyb5yrhps4sc2m3i9k9w"; libraryHaskellDepends = [ base stm ]; description = "Bounded Transactional channels (queues)"; license = stdenv.lib.licenses.bsd3; @@ -34166,7 +35763,7 @@ self: { mkDerivation { pname = "boundingboxes"; version = "0.2.3"; - sha256 = "e80947aa2c2c7f11e7eb2eb088a463d1cd1cdf03790e4c2746b629dcb1737564"; + sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/fumieval/boundingboxes"; description = "A generic boundingbox for an arbitrary vector"; @@ -34181,7 +35778,7 @@ self: { mkDerivation { pname = "bower-json"; version = "1.0.0.1"; - sha256 = "7aa954e2b1bf79307db710c158108bd9ddb45b333ca96072cdbfaf96c77b7e73"; + sha256 = "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs"; libraryHaskellDepends = [ aeson aeson-better-errors base bytestring deepseq ghc-prim mtl scientific text transformers unordered-containers vector @@ -34199,7 +35796,7 @@ self: { mkDerivation { pname = "bowntz"; version = "1"; - sha256 = "d65ddea77c5b9ef49a90afb68dc515dc2dcbd08dd0f768ca3309b1b353d9ae2c"; + sha256 = "0b5fv59v7c896g56ixyhip8cnbfw2p2qvdmgj2dg97jvgjkxwpfn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34215,7 +35812,7 @@ self: { mkDerivation { pname = "box-tuples"; version = "0.1.0.0"; - sha256 = "713ef3146ce16ab075f3e4a4b3e28a5c7252b0eebf10775fe43b4415a7f07ad6"; + sha256 = "1mksy2kiai1vwigpf45zxsq54wjwibib7974ydsv0sp1dhag6gki"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; license = stdenv.lib.licenses.mit; @@ -34226,7 +35823,7 @@ self: { mkDerivation { pname = "boxes"; version = "0.1.4"; - sha256 = "4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8"; + sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base QuickCheck split ]; description = "2D text pretty-printing library"; @@ -34238,7 +35835,7 @@ self: { mkDerivation { pname = "bpann"; version = "0.1.1"; - sha256 = "889fd9484e2e5a3fe3cc37e35adade0619d759c113118a4f67e94fa2bfef8809"; + sha256 = "02c8xyzs4kz9cx7ql48kq5cxf686vvd5mqrprkikynif9r4dk7w8"; libraryHaskellDepends = [ base random split ]; description = "backpropagation neuronal network"; license = stdenv.lib.licenses.bsd3; @@ -34251,7 +35848,7 @@ self: { mkDerivation { pname = "braid"; version = "0.1.0.0"; - sha256 = "19a5f45ca45b30fcd09fe2909d3c07169a5c5216efbe4d2df7fcbc4f0b28ed99"; + sha256 = "16gd505lzg7wywnlvgpg2r95r6hn0wy9v472kz8gqc2vlifg998r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34272,7 +35869,7 @@ self: { mkDerivation { pname = "brain-bleep"; version = "0.1.0.1"; - sha256 = "043d66bf97458ccf83129c29574e44b0704b04602f5450562f72fa9bb2b3a9a1"; + sha256 = "18d9nfr9pykj5xb50m1gc024nw5h8i75facw2a1wz325jyzncg84"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers parsec ]; @@ -34285,7 +35882,7 @@ self: { mkDerivation { pname = "brainfuck"; version = "0.1.0.3"; - sha256 = "0db5370311ec8a3a1673fd04e502fd10e0afa0df5ee25d3a917937d3d9668bf6"; + sha256 = "1xlbcvcx6dvrj4x5vqjyvyhazq0hzl1fa17xfcb3m2pc241kgd8d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base mtl ]; @@ -34299,7 +35896,7 @@ self: { mkDerivation { pname = "brainfuck-monad"; version = "0.5.0"; - sha256 = "4fdc46d934c22725840721310bdd225c859f585c4ec8b60761d0acc774382337"; + sha256 = "0dr371scgb6hc43vdj2fbic9z1aw4bfhnc910y22a9y26kcldp2g"; libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; license = stdenv.lib.licenses.bsd3; @@ -34310,7 +35907,7 @@ self: { mkDerivation { pname = "brainfuck-tut"; version = "0.7.0.2"; - sha256 = "fd5ebdd26c1bcee0e064288e71f92bc8f458768058bfbbaa368f562f44090939"; + sha256 = "0f891522ymlg6smbpgsqh1v5ix685gwp33i8ckhf1khvdk9bsppx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -34320,12 +35917,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brainheck" = callPackage + ({ mkDerivation, base, containers, criterion, lens, megaparsec, mtl + , optparse-applicative, recursion-schemes, text, vector + }: + mkDerivation { + pname = "brainheck"; + version = "0.1.0.3"; + sha256 = "0b153bjibqm6qicnh3r42fcv4w2c4qagllg0f1k5gxg903954xma"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers lens megaparsec mtl recursion-schemes text vector + ]; + executableHaskellDepends = [ base optparse-applicative text ]; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://github.com/vmchale/brainheck#readme"; + description = "Brainh*ck interpreter in haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "break" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "break"; - version = "1.0.1"; - sha256 = "28e0cff1cc4f96aa19ebaac3caad4ca6851e89cd26bd48c4de4f611cbcf95166"; + version = "1.0.2"; + sha256 = "0wpj29a8lpimb0mjif4f6jmx6q9pkpkn5xplmkbjzkqgxi0bp23n"; libraryHaskellDepends = [ base mtl transformers ]; description = "Break from a loop"; license = stdenv.lib.licenses.bsd3; @@ -34337,7 +35954,7 @@ self: { mkDerivation { pname = "breakout"; version = "0.0.2"; - sha256 = "990fd8a8640c396b700531cb12eecb56a988b6ca9be21642146b494252161a13"; + sha256 = "04qs2r944jbb2i11dqlvrav8iaanrgp15jri0mq6nf8ccjldh3wr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskgame mtl SDL ]; @@ -34356,7 +35973,7 @@ self: { mkDerivation { pname = "breve"; version = "0.4.4.0"; - sha256 = "1701c1550b07051e9c6f1c89713a2d3c6d5feb348e04e5bd957952543b8f72de"; + sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34376,7 +35993,7 @@ self: { mkDerivation { pname = "brians-brain"; version = "0.0.1"; - sha256 = "56650c0cbe9d921a7509818dcf29bf406130fc8a310af74aad482c6c29fb2f29"; + sha256 = "0a9gzclnqb28mm5gf2iiiby30qa0pwlwz3c115sim4lxpq60qran"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base parallel random SDL ]; @@ -34393,8 +36010,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.17.1"; - sha256 = "8c7ae11cbe393d3498e8e4a2e2b6eb1ee8b0582b3724fe6e844104e479c48511"; + version = "0.17.2"; + sha256 = "0ahwmrchy3wk6fvi1rfawzfyn7p4fsw4bpi16rf093f3nhilw5dd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34407,6 +36024,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.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 word-wrap + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brillig" = callPackage ({ mkDerivation, base, binary, cmdargs, containers, directory , filepath, ListZipper, text @@ -34414,7 +36054,7 @@ self: { mkDerivation { pname = "brillig"; version = "0.3.1"; - sha256 = "163dcdf8f211792199324d7bca2a355be09d41399af188d76ba6a9d21c11f5a1"; + sha256 = "18gm24fd5ad6dgbqiwcs750rvq2v6lmclysd6acj2y8iybwcsg8n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34433,7 +36073,7 @@ self: { mkDerivation { pname = "broadcast-chan"; version = "0.1.1"; - sha256 = "ad5bd65a301aff6df38c4111f02e73cce3bcfed7bfae6c66c2e70310f1e985f2"; + sha256 = "1wl5x7qi00z7q9k6rbmzszzbrqycfcpg04a1ikrnvzqs61ddcnxd"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/merijn/broadcast-chan"; description = "Broadcast channel type that avoids 0 reader space leaks"; @@ -34445,7 +36085,7 @@ self: { mkDerivation { pname = "broccoli"; version = "0.4.1.0"; - sha256 = "90c782cdb5693684da773bb6f34ea9922afd8ce3148f99c9bd7d6897138d9620"; + sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh"; libraryHaskellDepends = [ base containers stm time ]; description = "Small library for interactive functional programs"; license = stdenv.lib.licenses.bsd3; @@ -34457,7 +36097,7 @@ self: { mkDerivation { pname = "broker-haskell"; version = "0.1.0.0"; - sha256 = "6d0c74a52f20ba2dd33a5c396498045da877955e8b02ca67c2266abeeab1bf4b"; + sha256 = "0jxzn7mbwsi6q9kwl0lbbsapga2x0jc68faw7b9jvfi05yjp833d"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ broker ]; testHaskellDepends = [ base bytestring hspec ]; @@ -34467,12 +36107,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {broker = null;}; + "browscap" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ini, lens, lrucache + , mtl, text, unordered-containers, wreq + }: + mkDerivation { + pname = "browscap"; + version = "0"; + sha256 = "05igmcjb2hijym0bzxy6ppzchxvwlszxqkzzwyqwpcbiyc54i94h"; + libraryHaskellDepends = [ + base bytestring deepseq ini lens lrucache mtl text + unordered-containers wreq + ]; + homepage = "https://oss.xkcd.com"; + description = "A reader and interface for the Browser Capabilities Project data files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bsd-sysctl" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "bsd-sysctl"; version = "1.0.7"; - sha256 = "de8c9e2b6d0fa64f7e33885392a05b450e30da35d80de10f37c918ac8d2e1aa3"; + sha256 = "18qs5s6sq6696w7y23fq6pd303j5bfh94lw86dz4z9hgdlmrx36y"; libraryHaskellDepends = [ base ]; description = "Access to the BSD sysctl(3) interface"; license = stdenv.lib.licenses.bsd3; @@ -34487,7 +36144,7 @@ self: { mkDerivation { pname = "bson"; version = "0.3.2.3"; - sha256 = "9b3aba435365cdfbbd0ba8ccb3400e961d56329da57f6de2e1e391004c374982"; + sha256 = "10j96x6014g3w7i6szx5klr5c7cn1r0b7k581fyzpkb5ad1vlflv"; libraryHaskellDepends = [ base binary bytestring cryptohash data-binary-ieee754 mtl network text time @@ -34506,7 +36163,7 @@ self: { mkDerivation { pname = "bson-generic"; version = "0.0.8.1"; - sha256 = "9b9f8d160c7d813224946f194f82bf38a2299b6eb9d643f590ed7616a226877e"; + sha256 = "0zl74si1cxpdj3sl7mmrdsdjk8iqpy14y6bgjhj350bx1hb8v7wv"; libraryHaskellDepends = [ base bson ghc-prim text ]; description = "Generic functionality for BSON"; license = stdenv.lib.licenses.bsd3; @@ -34518,7 +36175,7 @@ self: { mkDerivation { pname = "bson-generics"; version = "0.0.1"; - sha256 = "b7bf01e812043d15091baf5855f99e996a1bd8e81407cdbf33bd81e9627d2e0e"; + sha256 = "03ifgmifk0dx6fzws1qlx3c1nslrkvwman5g3c4iag842bl03gxp"; libraryHaskellDepends = [ base bson ghc-prim ]; description = "Generics functionality for BSON"; license = stdenv.lib.licenses.bsd3; @@ -34530,7 +36187,7 @@ self: { mkDerivation { pname = "bson-lens"; version = "0.1.1"; - sha256 = "d73bb417def2d8cb1efebfc22482a859e119bcc4005dd10106c82dff5ceeb160"; + sha256 = "0q5ixrfgybf80q0x2p80qjy1kqarm2129hmzzqgcpn7jvqbv8fyp"; libraryHaskellDepends = [ base bson lens text ]; homepage = "https://github.com/jb55/bson-lens"; description = "BSON lenses"; @@ -34543,7 +36200,7 @@ self: { mkDerivation { pname = "bson-mapping"; version = "0.1.5.1"; - sha256 = "3f8eeb235b75a265bbc32b0fd808319144096d306f9bf1ed4434a28dd24facde"; + sha256 = "1pmc9z98v8il8knz36vg61nhji4i644dh3rbqfxnb8kmbciyp3iz"; libraryHaskellDepends = [ base bson template-haskell text th-lift ]; @@ -34559,7 +36216,7 @@ self: { mkDerivation { pname = "bspack"; version = "0.0.4"; - sha256 = "eba20bf4322d3fedf703f47623663f75313f4d76aa783da42f65753b340bfc5b"; + sha256 = "0nzw1cs3nxb55yj3sy5afr6kycbm7xk26xpl0gvysgrd6bs0p8pb"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring mtl tasty tasty-hunit tasty-quickcheck @@ -34577,13 +36234,38 @@ self: { mkDerivation { pname = "bsparse"; version = "0.0.5"; - sha256 = "4a5041fcb820b87369776573825909d93e8690a883f1d5ee4e2dad89a944968b"; + sha256 = "12wn8jlqkb9d9vpdbwc3m288cgnr15cq4wv5fxlp7f10p3y42l2a"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/vincenthz/hs-bsparse"; description = "A simple unassuming parser for bytestring"; 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 @@ -34592,7 +36274,7 @@ self: { mkDerivation { pname = "btree-concurrent"; version = "0.1.5"; - sha256 = "a6e27939b020678ed7638590b483f55bfd1dba944abaef63effefa3de21cfcf5"; + sha256 = "1xgw3ki3vypyxxiyzfjajjx1vzavyn1v9445cgbqwrr0n0wpkqm6"; libraryHaskellDepends = [ array base base64-bytestring bytestring cereal containers directory filepath hashable mtl random snappy stm time @@ -34612,7 +36294,7 @@ self: { mkDerivation { pname = "btrfs"; version = "0.1.2.3"; - sha256 = "7efc0b5c65623dcf60910baf896aec7da7ac2df4231f03a3072c78fb5b2fb88d"; + sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring time unix ]; @@ -34634,7 +36316,7 @@ self: { mkDerivation { pname = "buchhaltung"; version = "0.0.5"; - sha256 = "38a63a043e6360c393400c90b59102f5295e9603379c8d5838bf2cf0e2527569"; + sha256 = "0sbmabig0b5z71c8v71p0fb5wagm0a8vb40c829w6q337q23m9iq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34669,7 +36351,7 @@ self: { mkDerivation { pname = "buffer-builder"; version = "0.2.4.4"; - sha256 = "01c0bafb776784a08c041abfc89c3eaee3236bf5555b98e9542676dc43db2dd8"; + sha256 = "1n1dvd1xqxi6aklrhnsmymmj7qxf7sfcigqs0j6a1137fzxvmh01"; libraryHaskellDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -34696,9 +36378,9 @@ self: { mkDerivation { pname = "buffer-builder-aeson"; version = "0.2.0.4"; - sha256 = "7aa47be52be4a264bbbabc38a1d51f24b3176e32263a6e795daa96d12f545c4e"; + sha256 = "0kjwahpx35mabmwnwfi669p1gcr43zas2f5wpaxn98p45gjpp93s"; revision = "1"; - editedCabalFile = "09657c97cf5ad79da78f230540398a9a99a8bb6cd99bba89a24d741372444b84"; + editedCabalFile = "112b8ir16x2dla4vm6yrdjxsi6csi8wl0193iykrvmssrybpqr89"; libraryHaskellDepends = [ aeson base buffer-builder bytestring integer-gmp scientific unordered-containers vector @@ -34721,7 +36403,7 @@ self: { mkDerivation { pname = "buffer-pipe"; version = "0.0"; - sha256 = "0875b6e41988f70e20d2e9d1a092ae03d545954732f93d65a3481b5c4b52dccf"; + sha256 = "1kywa95mq6s8ldjkvy9j8yalbm83ms9a1lg9s8h0xxw837jbcx88"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -34736,7 +36418,7 @@ self: { mkDerivation { pname = "buffon"; version = "0.1.0.0"; - sha256 = "2da56227ede11731a35f076629a3d8dbe3af4f5ab09713e2f418c6affe136a1c"; + sha256 = "073a2gzazihqyki175xhb97szqyvv2ijjrh7byik25z1xlkn599d"; libraryHaskellDepends = [ base monad-primitive mwc-random mwc-random-monad primitive transformers @@ -34747,6 +36429,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bug" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "bug"; + version = "1.0.1"; + sha256 = "1xfynvp5fyn46gg3p5qq9cmb1dnw2dyf3bz6w5wdvikfvs19dwhq"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/nikita-volkov/bug"; + description = "Better alternatives to the \"error\" function"; + license = stdenv.lib.licenses.mit; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -34755,7 +36449,7 @@ self: { mkDerivation { pname = "bugzilla"; version = "0.2.1.1"; - sha256 = "ad30a9b8cbe7e9b994d6898ff68007e0c5a5a45b873e9a52dd51cf68d5945ea5"; + sha256 = "19ayjkaniksivm99lgl7bfjabig00y0gd3w9ssabksg7rfwajc5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34774,7 +36468,7 @@ self: { mkDerivation { pname = "buildable"; version = "0.1.0.3"; - sha256 = "fdbe2c5a274998a7d2f881361b30accdff5386bb471c78244c135533457d3bcb"; + sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx"; libraryHaskellDepends = [ base bytestring containers dlist text ]; description = "Typeclass for builders of linear data structures"; license = stdenv.lib.licenses.mit; @@ -34788,8 +36482,8 @@ self: { }: mkDerivation { pname = "buildbox"; - version = "2.1.9.2"; - sha256 = "7f9a3d82643b2d300cee11da526359cb4480388a9c7b9e7be6d8a0abce1053ce"; + version = "2.1.9.3"; + sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5"; libraryHaskellDepends = [ base bytestring containers directory exceptions mtl old-locale pretty process stm temporary text time @@ -34805,7 +36499,7 @@ self: { mkDerivation { pname = "buildbox-tools"; version = "1.5.3.1"; - sha256 = "8ef88a2fdc331547cca2145a6e64845729270bb79fc6be5fff81daae6ad32e48"; + sha256 = "0j1fsdmaxnl1zxgvxilznw5jfaaphij6wnhllb64f59kvhpqmy4f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base buildbox parseargs ]; @@ -34826,7 +36520,7 @@ self: { mkDerivation { pname = "buildwrapper"; version = "0.9.1"; - sha256 = "23239b1b5c18418648aba4efea6f33176c827b082d80ada8a646fd1af11695c5"; + sha256 = "1icm2vqimza6lslav01d11xq4v0p6dpymvx4md48ch8qbhdrn8r3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34859,7 +36553,7 @@ self: { mkDerivation { pname = "bullet"; version = "0.2.4"; - sha256 = "f6ad58f558c911570894b2700054c8ff5ff3323e21ad201e4218e06eeeec7a3a"; + sha256 = "0fksxkp6xq0q88g21b917qrg6pzzr1a00w5jjh45f4f9b3smibgn"; libraryHaskellDepends = [ base vect ]; libraryPkgconfigDepends = [ bullet ]; libraryToolDepends = [ c2hs ]; @@ -34876,9 +36570,9 @@ self: { mkDerivation { pname = "bumper"; version = "0.6.0.3"; - sha256 = "7cfce3a38be30744a2eb322ad1e5271cd665fa62b4fe21bdf9aa00fcdbc4daa8"; + sha256 = "1a6sqkdzq05az6yj3zmlcbx6bmhw4zjx2aijxfi481z3ifiy7z3w"; revision = "3"; - editedCabalFile = "1cd28042d55e1292a7ca8cdbb43afd5a170db915f91a2e0d3aa210da6b918e64"; + editedCabalFile = "0r4fj5mxl452786jw6pr2nwhs5sszlxb9nwcrakr44jysm181lhw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34889,12 +36583,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "burnt-explorer" = callPackage + ({ mkDerivation, aeson, base, bitcoin-script, bytestring, process + , scientific + }: + mkDerivation { + pname = "burnt-explorer"; + version = "0.1.1"; + sha256 = "1swv8xy06bk3wkhg788mzlpgwghyp7v3g3c22c09jji9kxwsgslv"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bitcoin-script bytestring process scientific + ]; + 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 ({ mkDerivation, base, criterion, deepseq }: mkDerivation { pname = "burst-detection"; version = "1.0"; - sha256 = "953742286dddadd2bd54e13a72916044e1c1a7acada5a5e5d12759c29ac4f9dd"; + sha256 = "1pgrqjdc4n97s7jsb9ddmjkw3qa4c28p4fp1ajyx5bfxdll44dwm"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; @@ -34910,7 +36623,7 @@ self: { mkDerivation { pname = "bus-pirate"; version = "0.7.0"; - sha256 = "932b9ba9210db4b63ffa1ac58072718d0118ba69ccecb1000a540084ed38507f"; + sha256 = "0zsh73nq802l180b3v6cd6x1h0cdf5r81i8sz8zvdd0d46lrnawk"; libraryHaskellDepends = [ base bytestring errors serialport transformers ]; @@ -34926,7 +36639,7 @@ self: { mkDerivation { pname = "buster"; version = "2.51"; - sha256 = "efffb20a6686c4430d008b85a66b83079f4b43796a960e85356a957f943e078a"; + sha256 = "12h77sa7z5ba6n2hx5kag51lp7q7hdmsd1cb006l7i46cq5b5zzg"; libraryHaskellDepends = [ base binary bytestring containers dataenc mtl old-locale parsec pretty time @@ -34944,7 +36657,7 @@ self: { mkDerivation { pname = "buster-gtk"; version = "2.0"; - sha256 = "a13dd06f6ecd1265e319cb87ae4048176805ed8d7103f90f6c05b3d373e355aa"; + sha256 = "1ajmwdrx7cq5dh7zj0viipnhas0p910ax1yb37ina4nddrpx0gd1"; libraryHaskellDepends = [ base binary buster bytestring containers dataenc gtk mtl old-locale parsec pretty time @@ -34962,7 +36675,7 @@ self: { mkDerivation { pname = "buster-network"; version = "1.2"; - sha256 = "71bc99106bf655f17a5d55cf432d1205a02903dce131fe587083e7c67ce1df9e"; + sha256 = "17nzw5ycdrw3f1cgwcg1vh1jk80528nl7ksmbmxg2mgndc89kg3i"; libraryHaskellDepends = [ base binary buster bytestring containers dataenc haxr HTTP mtl network old-locale pretty time @@ -34982,7 +36695,7 @@ self: { mkDerivation { pname = "bustle"; version = "0.5.4"; - sha256 = "921c2cbbb957dcb02c3aa8fd1eeff3534cb437fa9eeca1c25206ad1e741a3f14"; + sha256 = "051z39s1xb86ab1a3v4yz8vv8k2kygpixzd878nb1p2pp6xjq74j"; isLibrary = false; isExecutable = true; libraryPkgconfigDepends = [ system-glib ]; @@ -35001,6 +36714,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {system-glib = pkgs.glib;}; + "butcher" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, either, extra + , free, microlens, microlens-th, mtl, multistate, pretty + , transformers, unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.1.0.0"; + sha256 = "0z80gkx1b69742a784d95864rf9kqww702xcg9hfl8ra1ah45d96"; + libraryHaskellDepends = [ + base bifunctors containers deque either extra free microlens + microlens-th mtl multistate pretty transformers unsafe void + ]; + homepage = "https://github.com/lspitzner/butcher/"; + description = "Chops a command or program invocation into digestable pieces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "butterflies" = callPackage ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw , OpenGLRaw21, repa, repa-devil @@ -35008,7 +36740,7 @@ self: { mkDerivation { pname = "butterflies"; version = "0.3.0.1"; - sha256 = "631cdc6b4e299c14f2687cb6ed7baab5b0ae353aa34fb6f09e46594a9a93f235"; + sha256 = "0dgjjfd4lna6kvqbckx378ssxc5mm9xyvdkwd3r197199rmxq733"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -35027,7 +36759,7 @@ self: { mkDerivation { pname = "bv"; version = "0.4.1"; - sha256 = "dd092150f1792e76e168365d69798d3a27b911ce9de8b21a47c5fed42acf45bb"; + sha256 = "1fs5rwmd9zn58wdb5s4xrq8vj9rsimwnjp9nd3hpcbkry58222fx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; @@ -35042,8 +36774,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.2.3.0"; - sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c"; + version = "0.2.4.0"; + sha256 = "1vvyjs8lgqn97li68kvy971m4rbzfk30y40li59jzzy35533lhw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35061,7 +36793,7 @@ self: { mkDerivation { pname = "bytable"; version = "0.1.0.0"; - sha256 = "b6a6cce6fcd3ec094211e7937cbe9a89c741820200c0286fca225e1069829e74"; + sha256 = "0x4yh9li0pi2r9pjih000a143iw9kaz7r4z72510kv6kzkkcr9mn"; libraryHaskellDepends = [ base bytestring word24 ]; description = "data from/to ByteString"; license = stdenv.lib.licenses.bsd3; @@ -35073,7 +36805,7 @@ self: { mkDerivation { pname = "byteable"; version = "0.1.1"; - sha256 = "243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2"; + sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/vincenthz/hs-byteable"; description = "Type class for sequence of bytes"; @@ -35085,7 +36817,7 @@ self: { mkDerivation { pname = "bytedump"; version = "1.0"; - sha256 = "ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd"; + sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -35099,7 +36831,7 @@ self: { mkDerivation { pname = "byteorder"; version = "1.0.4"; - sha256 = "bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919"; + sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x"; libraryHaskellDepends = [ base ]; homepage = "http://community.haskell.org/~aslatter/code/byteorder"; description = "Exposes the native endianness or byte ordering of the system"; @@ -35107,19 +36839,22 @@ self: { }) {}; "bytes" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, containers - , hashable, mtl, scientific, text, time, transformers - , transformers-compat, unordered-containers, void + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest + , cereal, containers, directory, doctest, filepath, hashable, mtl + , scientific, text, time, transformers, transformers-compat + , unordered-containers, void }: mkDerivation { pname = "bytes"; - version = "0.15.2"; - sha256 = "0bfaaf70154d3622be1ee620dd75e9c93cf4d4a21544d83f281d01439f261f34"; + version = "0.15.3"; + sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific text time transformers transformers-compat unordered-containers void ]; + testHaskellDepends = [ base directory doctest filepath ]; homepage = "https://github.com/ekmett/bytes"; description = "Sharing code for serialization between binary and cereal"; license = stdenv.lib.licenses.bsd3; @@ -35130,7 +36865,7 @@ self: { mkDerivation { pname = "byteset"; version = "0.1.1.0"; - sha256 = "13499c5b279f022097e9ae1d0aeef3fcea12b7f18f50157d4950aec58741afa1"; + sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k"; libraryHaskellDepends = [ base binary ]; description = "Set of bytes"; license = stdenv.lib.licenses.bsd3; @@ -35144,7 +36879,7 @@ self: { mkDerivation { pname = "bytestring"; version = "0.10.8.1"; - sha256 = "2d615f5b4cd76251663ea67355589742950590bf766e487961fbfc816e58fc9b"; + sha256 = "16zwb1p83z7vc5wlhvknpy80b5a2jxc5awx67rk52qnp9idmyq9d"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; testHaskellDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -35164,7 +36899,7 @@ self: { mkDerivation { pname = "bytestring-arbitrary"; version = "0.1.1"; - sha256 = "bbe78d37e9788ecf6fc4d64633047579b66e71ffcab70cbc8be100a722056efd"; + sha256 = "1zbf0liaf071ify0rdyazxqnxdkrfl236innqipwz3kqx4vqvrxv"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; benchmarkHaskellDepends = [ @@ -35181,7 +36916,7 @@ self: { mkDerivation { pname = "bytestring-builder"; version = "0.10.8.1.0"; - sha256 = "6d7404773621efb88b256ff88912a7dbcebc7fb86d27868ef58478249892dbc2"; + sha256 = "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d"; libraryHaskellDepends = [ base bytestring deepseq ]; doHaddock = false; description = "The new bytestring builder, packaged outside of GHC"; @@ -35193,9 +36928,9 @@ self: { mkDerivation { pname = "bytestring-class"; version = "0.0.0.1"; - sha256 = "7d80db8549d933273db4b058e61f532338de2fbce3b9c455b490de0c405ec5fc"; + sha256 = "1z65br00rplhniaw9fg3phpxwf13acgycn5hnhyjfcyr962xp03x"; revision = "1"; - editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417"; + editedCabalFile = "05q4ilixyd4zc15imh7x7gqwv4pmicyjj9zx5fhx1p1ps89jiap3"; libraryHaskellDepends = [ base bytestring utf8-string ]; description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -35210,9 +36945,9 @@ self: { mkDerivation { pname = "bytestring-conversion"; version = "0.3.1"; - sha256 = "13b7ea48737dc7a7fd4c894ff1fb9344cf8d9ef8f4201e813d578b613e874ef8"; + sha256 = "1y2fhwz632sp7n0iw87lz2g8vks4jgxz2kw99kysgivxfd4fmdqk"; revision = "2"; - editedCabalFile = "c3a83596c9955edb5558503dfd698d9a99e0da65bdf53edf6eceacef98200cf5"; + editedCabalFile = "1x8c42cfzb6fdvgkxxdxcpdf16csimlzsgahb1axnplmr6b3ba63"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive double-conversion text ]; @@ -35232,7 +36967,7 @@ self: { mkDerivation { pname = "bytestring-csv"; version = "0.1.2"; - sha256 = "19480f2f60c474b18ef507a657daa63b18a40f97a3171883cf9d4b33169df874"; + sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r"; libraryHaskellDepends = [ array base bytestring dlist ]; homepage = "http://code.haskell.org/~dons/code/bytestring-csv"; description = "Parse CSV formatted data efficiently"; @@ -35245,7 +36980,7 @@ self: { mkDerivation { pname = "bytestring-delta"; version = "0.1.0.1"; - sha256 = "38f0bfff325b9424678aeea05142c83e406fe0e6004da895d608d8385c4c0547"; + sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/joeyadams/haskell-bytestring-delta"; description = "Simple, fast binary diff/patch"; @@ -35259,9 +36994,9 @@ self: { mkDerivation { pname = "bytestring-from"; version = "0.3"; - sha256 = "c4def9c8f930ed9c1717fd4547016062c3f7065df341853245bb6212f3cd120c"; + sha256 = "030jrpri4qmv8lr8ahgkbl3gghv2c00lfigx2wbrrv9hz74gkpn4"; revision = "1"; - editedCabalFile = "b6efc5572f7f26aa1bcc4d930391cb9f0144f6e3df107838ee0adc28d73caa3a"; + editedCabalFile = "0fma7kbjip0axqw7h46zwgv480czrf8h74sdrhdsl9kz5xbwbvxn"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck @@ -35277,7 +37012,7 @@ self: { mkDerivation { pname = "bytestring-handle"; version = "0.1.0.5"; - sha256 = "a2c426f35ba32822e45bcc2e6d4945bbb2ee10b8540bb0965ab6f3304325bb83"; + sha256 = "10xv4m1k1wxnbabb02slp08fxcmv8m4nsbncbgj24a53bgrjdi52"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -35293,7 +37028,7 @@ self: { mkDerivation { pname = "bytestring-lexing"; version = "0.5.0.2"; - sha256 = "01f9add3f25067a89c5ae9ab1f2fd8ab75ec9f386987ee0d83f73ec855b43f73"; + sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "Parse and produce literals efficiently from strict or lazy bytestrings"; @@ -35305,7 +37040,7 @@ self: { mkDerivation { pname = "bytestring-mmap"; version = "0.2.2"; - sha256 = "7bbcaeeccec5cf448ba59c9ed4de95bcc47b11ae2b9bcddb6201decb88eb69af"; + sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v"; libraryHaskellDepends = [ base bytestring unix ]; homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/"; description = "mmap support for strict ByteStrings"; @@ -35317,7 +37052,7 @@ self: { mkDerivation { pname = "bytestring-nums"; version = "0.3.6"; - sha256 = "bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd"; + sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; @@ -35331,9 +37066,9 @@ self: { mkDerivation { pname = "bytestring-plain"; version = "0.1.0.2"; - sha256 = "9e2dfbba5b90c6b121953f8a18afbab4041c5a26b8af350360ec888a6ce6fddd"; + sha256 = "1pgxwrn8m27cc01kbbxq4rd1q15lpapii2izjlhv3ilhbfxgnbcy"; revision = "1"; - editedCabalFile = "cab22ad55f84b4ec53b0506c4d50d5f29a2235e377444dda20e5897d0adb5632"; + editedCabalFile = "0cjnvc57v2g543d4si3pwcsj56pjsm84sv2hn19yrd44bzajmcna"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim hashable ]; @@ -35347,7 +37082,7 @@ self: { mkDerivation { pname = "bytestring-progress"; version = "1.0.7"; - sha256 = "97b0950b6dff0154aa463f1e2921dc560478e1156e482bd5bde8a62bd3f83730"; + sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p"; libraryHaskellDepends = [ base bytestring terminal-progress-bar time ]; @@ -35365,9 +37100,9 @@ self: { mkDerivation { pname = "bytestring-read"; version = "0.3.1"; - sha256 = "0048cd84ec6c0c684fa8bb65bc20f280ee3e3dc164bf02d59ba139e8caaac635"; + sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00"; revision = "3"; - editedCabalFile = "cc2bffb995e06c44359a91c95da55ebe952656fe4320f57d86aa2daf3eb29195"; + editedCabalFile = "15cin8zaybdahryza823zrb2d5dybsjmvjcik8sl8v70jnwzyayc"; libraryHaskellDepends = [ base bytestring types-compat ]; testHaskellDepends = [ base bytestring doctest tasty tasty-quickcheck @@ -35387,7 +37122,7 @@ self: { mkDerivation { pname = "bytestring-rematch"; version = "0.1.0.0"; - sha256 = "705df0968c0ddd9422b12f9837520b1f2f2cc93be31a47c94f8899abeb0dd307"; + sha256 = "01yk1pmsp6c89z4lf6p37g4jqbqz1d93g61gn4i99p8dijbg0pbh"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec HUnit rematch ]; doHaddock = false; @@ -35402,7 +37137,7 @@ self: { mkDerivation { pname = "bytestring-short"; version = "0.1.0.0"; - sha256 = "39b303951403758dcf626f48e4501b93865d3b4d52d90ae594bbe91a4fc9fca6"; + sha256 = "19pwr57imsdvjkjhmnaj9lxmv1lk3d8f8j3gcb7qsx832jah7crr"; libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring QuickCheck ]; description = "Backport copy of ShortByteString"; @@ -35416,9 +37151,9 @@ self: { mkDerivation { pname = "bytestring-show"; version = "0.3.5.6"; - sha256 = "29242efd16951ebba888218c469a99ff25b19ab74ee1e0d7b4db09b8800a0812"; + sha256 = "04h81a0bh2fvnkby1qafnydb29gzk6d4d311i2lbn7lm2vyjw919"; revision = "1"; - editedCabalFile = "a923f5b218cbfc39a6fea6e8d5cb09bb96373e4b2ca8dfd11b1c05253088d858"; + editedCabalFile = "0n6qi0q2a18w3g8xza1c9cz3g5mv175xbs56zsk3kz6b32rga8x9"; libraryHaskellDepends = [ array base binary bytestring containers integer-gmp ]; @@ -35427,6 +37162,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-strict-builder" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-strict-builder"; + version = "0.4.5"; + sha256 = "1kpkz1vd1g4y0wlpp6r77vgwas28s34drdn46mpzfb54a6cjs6fg"; + libraryHaskellDepends = [ + base base-prelude bytestring semigroups + ]; + testHaskellDepends = [ + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/bytestring-strict-builder"; + description = "An efficient strict bytestring builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-time" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec , QuickCheck, text, time @@ -35434,7 +37192,7 @@ self: { mkDerivation { pname = "bytestring-time"; version = "0.1.0"; - sha256 = "824afd4536f2062ffb16169b0989dc26890a83cd1515dff34e33b826608a7603"; + sha256 = "00vni9h2df1k9vrxy58mrn1hm296vj4hk6qn2vxjy1pj6r2zsjl2"; libraryHaskellDepends = [ attoparsec base bytestring text time ]; testHaskellDepends = [ attoparsec base bytestring Cabal hspec QuickCheck text time @@ -35452,7 +37210,7 @@ self: { mkDerivation { pname = "bytestring-tree-builder"; version = "0.2.7.1"; - sha256 = "ae03a5b2e24068870dfcff6c6dc8d6d243aaebdb7c66746d499e7cf6cfd16bd5"; + sha256 = "1mbbs77zcz4y95np8rkwvgmslhyjsv46sv7zzh6qfs20waraa0xf"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -35473,7 +37231,7 @@ self: { mkDerivation { pname = "bytestring-trie"; version = "0.2.4.1"; - sha256 = "2fe4feb526a03d32aaf673506623b3af4ce3fee126f745a8852c5fd676a61363"; + sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "An efficient finite map from (byte)strings to values"; @@ -35487,7 +37245,7 @@ self: { mkDerivation { pname = "bytestring-typenats"; version = "1.0.0"; - sha256 = "b02618cf4130b1b83e93670d3d5cf8436cc8ae49ffafa2298156506b35642381"; + sha256 = "1093chsnnl2nh4ls5bzz96pchv23z1f3s3b7jczbic9h877ih9mh"; libraryHaskellDepends = [ base binary blake2 bytestring cereal cryptohash deepseq entropy QuickCheck @@ -35505,7 +37263,7 @@ self: { mkDerivation { pname = "bytestringparser"; version = "0.3"; - sha256 = "0d0b686fcb68901a54045377e003aeb9b6fd6877c107b2e830254e12eeda29bd"; + sha256 = "1g99vbp14ki563lb41y1fxlgvdmrmq1y0xsk0ia1m438rdpnh2qd"; libraryHaskellDepends = [ base ]; description = "Combinator parsing with Data.ByteString.Lazy"; license = stdenv.lib.licenses.bsd3; @@ -35517,7 +37275,7 @@ self: { mkDerivation { pname = "bytestringparser-temporary"; version = "0.4.1"; - sha256 = "eda2b21f45cc42f057f8afdee0969cbdec9b91f7ded3c0e6d7f555580cee2a05"; + sha256 = "019axq65hmgmszkc1lyyyy8rpv5xkjbf1pmgz1bz0hnc8lgv58pd"; libraryHaskellDepends = [ base ]; description = "Combinator parsing with Data.ByteString.Lazy"; license = stdenv.lib.licenses.bsd3; @@ -35528,7 +37286,7 @@ self: { mkDerivation { pname = "bytestringreadp"; version = "0.2"; - sha256 = "ee9426929030f4cb020b817cf4492f21d8d11ca23e2568e41c3ebd2f0e181d1e"; + sha256 = "07hx3072zg9y3kj6h99yl8fd3n115x4z8z411c1cpx1hj292d57f"; libraryHaskellDepends = [ base bytestring ]; description = "A ReadP style parser library for ByteString"; license = stdenv.lib.licenses.bsd3; @@ -35540,7 +37298,7 @@ self: { mkDerivation { pname = "bzlib"; version = "0.5.0.5"; - sha256 = "9ee7d0ac7461b330820af928c13c6668bf4fe3601f171c42432a85c33718017e"; + sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bzip2 ]; description = "Compression and decompression in the bzip2 format"; @@ -35555,7 +37313,7 @@ self: { mkDerivation { pname = "bzlib-conduit"; version = "0.2.1.4"; - sha256 = "2d707004ccc83d9aa283805574c7253db5089854abb3a7350587de62f2b2fd1d"; + sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d"; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl resourcet @@ -35576,7 +37334,7 @@ self: { mkDerivation { pname = "c-dsl"; version = "0.3.1"; - sha256 = "fc9a30c237a4c0c077871a59dc0cb47634ea66271e115bc25ef1dc6c441b1212"; + sha256 = "04hj3d26rp7ibv15n48y4xkfld3nnh6dqn8shxvw1h546z1316pw"; libraryHaskellDepends = [ base language-c ]; description = "A higher level DSL on top of language-c"; license = stdenv.lib.licenses.mit; @@ -35588,19 +37346,40 @@ self: { mkDerivation { pname = "c-io"; version = "0.1.0"; - sha256 = "e2e203b1e95f95455f902d0cef3bdda0f78e78ffadade0b14713f72c33e344fd"; + sha256 = "1za4wcrjrxqk8yqy1bddzxw8xxx0vlxyy31dj1glb5azx6qh7qp2"; libraryHaskellDepends = [ base ]; description = "C IO"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "c-mosquitto" = callPackage + ({ mkDerivation, base, bytestring, containers, inline-c, mosquitto + , options, primitive + }: + mkDerivation { + pname = "c-mosquitto"; + version = "0.1.0.1"; + sha256 = "0scghhz6d9i3rbdl95dvfc03ds99nx0hgmsx29n1d8v8bvvmkpz4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers inline-c primitive + ]; + librarySystemDepends = [ mosquitto ]; + executableHaskellDepends = [ base options ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/tolysz/c-mosquitto#readme"; + description = "Simpe mosquito MQTT binding able to work with the Amazons IoT"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) mosquitto;}; + "c-storable-deriving" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "c-storable-deriving"; version = "0.1.3"; - sha256 = "68432da5e33d769c514402ad00bcd66c6a2742dd238825b4988476e5f4c9a67f"; + sha256 = "0zx6r7sfaxl4k2s2b213vm12fskcssy01b828i8rqxixwfjjshv8"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/maurer/c-storable-deriving"; description = "Generate C-like storable instances from datatypes"; @@ -35612,7 +37391,7 @@ self: { mkDerivation { pname = "c0check"; version = "0.2"; - sha256 = "350a80a434370c575da0832d5edfc211184284aef797fba08d0697dd18da9f2a"; + sha256 = "0alzv8cdv5q6inhgp5zpms24460iqbgmwbc3l1fmf31p6jj802im"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base c0parser ]; @@ -35625,7 +37404,7 @@ self: { mkDerivation { pname = "c0parser"; version = "0.2"; - sha256 = "9c9df54d0044a203eef921aff79d5c7f1d90f1634fa44c0808e5cf0646d4cb44"; + sha256 = "0i6bsi30dkz51044r92gcgqr07bzbjfzgbr1z7p078j4016zb7cw"; libraryHaskellDepends = [ base parsec ]; description = "Simple C0 Parser"; license = "GPL"; @@ -35636,7 +37415,7 @@ self: { mkDerivation { pname = "c10k"; version = "0.5.0"; - sha256 = "a981fcdf496ea9ebfc5a610febb41fd31bcce9d92ed077a6973bdc92268dc2c4"; + sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9"; libraryHaskellDepends = [ base network unix ]; homepage = "http://github.com/kazu-yamamoto/c10k"; description = "C10k server library using prefork"; @@ -35651,7 +37430,7 @@ self: { mkDerivation { pname = "c2ats"; version = "0.1.0.1"; - sha256 = "fd0b1a15d6545948ed719d77d3cd5cab528e3de2ff1dce371871114fb47c226f"; + sha256 = "0vr2gjs4y4bi30vww7gzw8yqwlmbbk6x6xwxf7nlhnalsqail2zx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35674,7 +37453,7 @@ self: { mkDerivation { pname = "c2hs"; version = "0.28.1"; - sha256 = "95b04ef42cf43a1078e9c8a4bf9264dd26e8653b441b3fb7f2296c8b3a0752bb"; + sha256 = "1fsj0wx8nv19yavky6s47djyh9nxcj9bz968x5w10fpl5ks4xc4m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35690,12 +37469,37 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "c2hs_0_28_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , dlist, filepath, HUnit, language-c, pretty, process, shelly + , test-framework, test-framework-hunit, text, transformers + }: + mkDerivation { + pname = "c2hs"; + version = "0.28.2"; + sha256 = "17hgj8s08lh7mjddbsahdgssk80wpkhc4qspfc34k7zyr9w185zl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bytestring containers directory dlist filepath + language-c pretty process + ]; + testHaskellDepends = [ + base filepath HUnit shelly test-framework test-framework-hunit text + transformers + ]; + homepage = "https://github.com/haskell/c2hs"; + description = "C->Haskell FFI tool that gives some cross-language type safety"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "c2hs-extra" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { pname = "c2hs-extra"; version = "0.1.0.0"; - sha256 = "f22faa55babb95ac1acb29c775ebf9cf0fd1673985c802bd5b6037d6db558b3d"; + sha256 = "0gcbapdxcdv0bfyh5j4575kx23ygz7mpbir9rcdar5dvp9aslbzj"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ c2hs ]; homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; @@ -35710,7 +37514,7 @@ self: { mkDerivation { pname = "c2hsc"; version = "0.6.5"; - sha256 = "edfddd27e6329a620c8722a38f4ae2f1daea67f57c717d428ec3266e49fcb030"; + sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35729,8 +37533,8 @@ self: { }: mkDerivation { pname = "cab"; - version = "0.2.16"; - sha256 = "f9f9f9c178ad486ff29186b519d6993a8429c3fa34a43d8ed42525c20df5585f"; + version = "0.2.17"; + sha256 = "0lnd8m10999jxyx6x5plbrm135p7bv9q67c80h4l4gy49h07sr87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35751,9 +37555,9 @@ self: { mkDerivation { pname = "cabal"; version = "0.0.0.0"; - sha256 = "7a06b65d9d4ddb38f54e865e38742d7b600e0f646f0e07ce9015659ff7563bf6"; + sha256 = "1xivavvryr8mj370f3kgch7hwq3v5ms3hpl69vskinsdkmfvc1ks"; revision = "2"; - editedCabalFile = "3aaac7f6716c93dec3f62f807a2ab25217f419fa30f566a3d9c4ad939e075bb6"; + editedCabalFile = "1djv0yg97bf4v6indx9hz8cz85sjn8m7m01gyv1xx4vcf7vcgais"; libraryHaskellDepends = [ base youProbablyWantCapitalCabal ]; doHaddock = false; description = "placeholder for Cabal package, you want the upper case Cabal"; @@ -35768,7 +37572,7 @@ self: { mkDerivation { pname = "cabal-audit"; version = "0.3.0.0"; - sha256 = "3bc16b5a0a77c298caa147b91eb4d997babee0583d9b9d5b4aa3b944d4e48e09"; + sha256 = "02cfwka49fd399drv6rxb3hbxflpv6s1xfa7l759ihkp19d6ph9v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35787,8 +37591,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "1.0.5"; - sha256 = "10a81b97a6d993c37778b5840be9a7a67ab47feb59cec3550e345ab5239c8e62"; + version = "1.1.0"; + sha256 = "12p5k0b4q66lbcsc59nvn7pnvwf627hfyrnl1p5nymirwkb4w4bl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35812,7 +37616,7 @@ self: { mkDerivation { pname = "cabal-cargs"; version = "0.7.11"; - sha256 = "160d44411a0a8fe922ae1aa192de5b481d4354d5df4e863d2782f49f0ab57277"; + sha256 = "0xvjnl59zx424wyqcknzsma467a8bgg9588smqifk3qa390l838n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35832,7 +37636,7 @@ self: { mkDerivation { pname = "cabal-constraints"; version = "0.0.0.1"; - sha256 = "b05df399f159ef43eb633eb4bdabc6a821cc5b27864337ba918b478f681c641a"; + sha256 = "06k43il8yiwbj6x3fhw64xdwq8d8qsmvvd1ycgml7vsry6cz6pdh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal optparse-applicative ]; @@ -35850,7 +37654,7 @@ self: { mkDerivation { pname = "cabal-db"; version = "0.1.12"; - sha256 = "c788de6c8c2de1b89e117c3001ecdd3fc3bd717d93e9aedf6ae0411596d413de"; + sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35873,8 +37677,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.6"; - sha256 = "8ef80d1bc5b3085475c3486c900defb0aeae2ef5ff23bf6d41653d12a3e7e4de"; + version = "4.35.9"; + sha256 = "1d7xd9v8gc0ahyx557470dw01s3zs6vz594a4hy95bgx5d45s357"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35898,7 +37702,7 @@ self: { mkDerivation { pname = "cabal-dependency-licenses"; version = "0.2.0.0"; - sha256 = "1731299d3764dd56fe93da2df0b32ce6d4e794e9a68a3dff96cf84a63fb5341e"; + sha256 = "07ilnlzsd16gjvzkv2m6x6afgm765jrz0bfsjgz5dpb46yfjjc8p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35917,7 +37721,7 @@ self: { mkDerivation { pname = "cabal-dev"; version = "0.9.2"; - sha256 = "081b3a32ef5b7b993d09774cc8568bd6e74651aae3be1740b5a71d8dec5de28c"; + sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35937,7 +37741,7 @@ self: { mkDerivation { pname = "cabal-dir"; version = "0.1.0.4"; - sha256 = "8f175e700688ebd2cff0277763c6606fdbad9fb587132c1a0b0e05ba1229784d"; + sha256 = "0kbq549bl18f1cd2q4w7nngsvnvgc3366xr7y37x5sw80rq5w5wg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal directory filepath ]; @@ -35949,10 +37753,10 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1"; - sha256 = "7c769d62029d10f8861d88f48080a64f875346b74028ed2fd808d674accc6147"; + version = "1.0.2"; + sha256 = "0h3wsjf2mg8kw1zvxc0f9nzchj5kzvza9z0arcyixkd9rkgqq6sa"; libraryHaskellDepends = [ base Cabal directory filepath ]; - homepage = "https://github.com/phadej/cabal-doctests"; + homepage = "https://github.com/phadej/cabal-doctest"; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -35963,7 +37767,7 @@ self: { mkDerivation { pname = "cabal-file-th"; version = "0.2.4"; - sha256 = "0b55d7ffacd0c6324fa7c8b8f148e788e6b899fb9bf8795285dea66575bed91c"; + sha256 = "076rprsnb9nyhm97ky4vzfcvirl8wx4g3f68lx7k5inhmkzxfm8b"; libraryHaskellDepends = [ base Cabal directory pretty template-haskell ]; @@ -35978,7 +37782,7 @@ self: { mkDerivation { pname = "cabal-ghc-dynflags"; version = "0.1.0.1"; - sha256 = "0e71145e966f450737f1598e20964e9453f64b69f6459a9dfa4a015e7ea57d8e"; + sha256 = "13kxlmz5w0aazafrlignd55zclwl9sb213jry4vhfibgjrg18w8f"; libraryHaskellDepends = [ base Cabal ghc transformers ]; homepage = "http://github.com/bgamari/cabal-ghc-dynflags"; description = "Conveniently configure GHC's dynamic flags for use with Cabal projects"; @@ -35991,7 +37795,7 @@ self: { mkDerivation { pname = "cabal-ghci"; version = "0.3"; - sha256 = "86235def38b7303a73337f506be9c051b5eca18cfa7160123db88a5cf7beeef4"; + sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -36011,7 +37815,7 @@ self: { mkDerivation { pname = "cabal-graphdeps"; version = "0.1.3"; - sha256 = "2a419ca25fe5f8c346d520ccbce0b43701be976edf736bf3b046287ca6db75c8"; + sha256 = "1j3mvfk7qa26n3rnnwyzdsbvw09pnkhbrk10sm3c7y75byi9qh9a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36031,9 +37835,9 @@ self: { mkDerivation { pname = "cabal-helper"; version = "0.7.3.0"; - sha256 = "794055f5205dd029aceb2fe9aac183880d2b4ef005d1096ee3052710d01192a4"; + sha256 = "194j278109q5wdp0kl85y172n3c8hg0sms9gxfn2kl2x43smah3r"; revision = "1"; - editedCabalFile = "1ec0e453ac2b600db0767b99546f963f50436186f55f7794cef81f803a2c1b4a"; + editedCabalFile = "0jhv5hx807zqrsa7fpzmhrhl6l1zjrpm96bvfsq0sq1bmi9y9h0y"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -36063,8 +37867,8 @@ self: { }: mkDerivation { pname = "cabal-info"; - version = "0.1.0.0"; - sha256 = "d7623ce69cdf180f3266cc14fcf4e53f4d5b2c4d9cb359f145a730878096fc6d"; + version = "0.2.1"; + sha256 = "1gf4f80964l9mj53rn0anciz6p0035lrcc0lxbnh5dgh3iiap14l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36090,7 +37894,9 @@ self: { mkDerivation { pname = "cabal-install"; version = "1.24.0.2"; - sha256 = "2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0"; + sha256 = "1q0gl3i9cpg854lcsiifxxginnvhp2bpx19wkkzpzrd072983j1a"; + revision = "1"; + editedCabalFile = "0v112hvvppa31sklpzg54vr0hfidy1334kg5p3jc0gbgl8in1n90"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36123,7 +37929,7 @@ self: { mkDerivation { pname = "cabal-install-bundle"; version = "1.18.0.2.1"; - sha256 = "584783f74c4cc703cf6b50f9263db4b0075fbca33a22b576c42da2616f854f3f"; + sha256 = "0gsghmpn38idqivba8islfy5y1xhnhyjdyahdg7h7isc9kvq6isq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36144,7 +37950,7 @@ self: { mkDerivation { pname = "cabal-install-ghc72"; version = "0.10.4"; - sha256 = "afd6439fc675f76c4a7922f3d5382f3d1a9e7494a9b9c7edc5f0ff55783afeb9"; + sha256 = "1fgy79w5bzzhqpnwgfd9jis9w6ix5wwdbwr2g556rxvmqsgl7mmg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36165,7 +37971,7 @@ self: { mkDerivation { pname = "cabal-install-ghc74"; version = "0.10.4"; - sha256 = "adbeb4e70ed854c7e18ef41d766fc5130f641e483b82acff8e6a6c0a012c53eb"; + sha256 = "1ssk5h0hlv3aivzsr0iv90g683qkqmppc7glivhwfm6q1vkv9gmd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36185,7 +37991,7 @@ self: { mkDerivation { pname = "cabal-lenses"; version = "0.4.9"; - sha256 = "59bb6a13229fbb28a481cb8839369cfd0e30c2d9f65a93f3ee8240ad19288238"; + sha256 = "0f4250cssh42xvrr6npnv71303pxkhv3k26bh6j2ifwz489nmfsr"; libraryHaskellDepends = [ base Cabal either lens strict system-fileio system-filepath text transformers unordered-containers @@ -36202,7 +38008,7 @@ self: { mkDerivation { pname = "cabal-macosx"; version = "0.2.4.0"; - sha256 = "41fb5231327860676eb4496fedba4da7df00f7cff969589a86e4b687177788fa"; + sha256 = "1yl8fwbqgdp4hsd5hsgrrzvh1px79nxfsvs9nip6fq3q68qm5ys1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36229,7 +38035,7 @@ self: { mkDerivation { pname = "cabal-meta"; version = "0.4.1.3"; - sha256 = "a6fdda58755c31683e88ffbc4eeed65f49698a8d7b4769bed6c9a237c5b66892"; + sha256 = "14k8nv2kg8n9ssz6jivvin56jjazsvp4xg7zi0z6hcawfmcdmzd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base shelly system-filepath text ]; @@ -36251,7 +38057,7 @@ self: { mkDerivation { pname = "cabal-mon"; version = "1.0.2"; - sha256 = "22e2d4a7faf7ece320ce4938c658e59fe9002ea14d12543343cadba109e57e94"; + sha256 = "153ywl4s3nya8crm84jdl4p01sczwmcccf29rqhf7v7pzakx9qi2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36269,7 +38075,7 @@ self: { mkDerivation { pname = "cabal-nirvana"; version = "0.2.2.1"; - sha256 = "938e5e0269f61181be16b9c7ec9cbedad954b4174cac1493a833cd5031859cb2"; + sha256 = "1clwhlqm1k9km29i9b2c2ys59nfspsffrixr2sz824gnd415x3lk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36281,12 +38087,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabal-plan" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , bytestring, containers, directory, filepath, mtl, text + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.1.1.0"; + sha256 = "0sgaysfgv6z0mvyvzrly4xmj273mwq96zygbq6j5vjhqp1zdacxa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal base bytestring containers mtl text + ]; + homepage = "https://github.com/hvr/cabal-plan"; + description = "Library and utiltity for processing cabal's plan.json file"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cabal-progdeps" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-progdeps"; version = "1.0"; - sha256 = "2eee8fb8cba8e30ecfb1c85262f927669181dbfe9c25d63094893487ea85e23b"; + sha256 = "0fz2hpm8fd49jhqdc9cwzvdq34b64zwn4ln8n77hxqx8rfw8zvif"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal directory filepath ]; @@ -36302,7 +38130,7 @@ self: { mkDerivation { pname = "cabal-query"; version = "0.1"; - sha256 = "8a9baadce9cfd1196462e7c47ac2bdd23fbe2affaa8e77e842da46fe2c229648"; + sha256 = "0j4n48ngwins8bl7g3mazwmbwgyjpp17mi77c9j1klfgx7fam6wa"; libraryHaskellDepends = [ base bytestring Cabal derive ghc MissingH mtl tar template-haskell uniplate @@ -36319,8 +38147,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.11"; - sha256 = "c705a4fc4bcdf64989d26b94b52381ab465db542e0a99e8614ced9fe872ed9d5"; + version = "0.11.1"; + sha256 = "1pqj1i22icx6fzhfy1nmkcnfazakx0240i9dg6pm9q0g97cqaknv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36336,7 +38164,7 @@ self: { mkDerivation { pname = "cabal-scripts"; version = "0.1.1"; - sha256 = "445304a8f8efcd60bfe5ab4d60bfe833962a35f40d1dc6a9694db30d93e84faa"; + sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "Shell scripts for support of Cabal maintenance"; @@ -36348,7 +38176,7 @@ self: { mkDerivation { pname = "cabal-setup"; version = "1.2.1"; - sha256 = "7589e307e85c1dac32ff9c33e089203aaf310230124e251ab2b2bd3a7bb4344c"; + sha256 = "0k1lnixkmgdjn8d2akhj60133brs424y0cwwzwraq7awx03y72bm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; @@ -36365,7 +38193,7 @@ self: { mkDerivation { pname = "cabal-sign"; version = "0.4.1.0"; - sha256 = "13db5029af43356ea6046ab1ecd12ea6d9dfff5daa3793e0d3feaa0a26c91ead"; + sha256 = "1b8yr4k0mapysgh96dxabpzxznd65v8yrcba0jk6wda3mwlm1nqk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36383,7 +38211,7 @@ self: { mkDerivation { pname = "cabal-sort"; version = "0.0.5.3"; - sha256 = "0c7bd60b1919edae4844850ce9f88a39c647b3911b3fda221cbf2c288f9c228c"; + sha256 = "1312kj7jhb5z3hidlgqvj6rlgiiribwfj3458i4axv8r345xcyqc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36404,7 +38232,7 @@ self: { mkDerivation { pname = "cabal-src"; version = "0.3.0.2"; - sha256 = "49616c6e93f0e6df7204f97c7903b52c62b76b29368c697fd65af79be66bede6"; + sha256 = "1rpddgk9pxsssrznk31n55mvfqicnl1pjz7r0irdzrphjdp6qqa9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36422,7 +38250,7 @@ self: { mkDerivation { pname = "cabal-test"; version = "0.1"; - sha256 = "5d19f8d90cf9c758f385c19e8effa66aa650a9ab6be7a2282e7478f90f1e0885"; + sha256 = "11883q7zjy3l5qla5rvbmflm19kalvzqx7n1hprmiizr1kczh6ax"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36440,7 +38268,7 @@ self: { mkDerivation { pname = "cabal-test-bin"; version = "0.1.5"; - sha256 = "07551e89dae1704a30144dda2f28dd4d0fcababe1a48cd2b31096e93d3835ae2"; + sha256 = "1qjshg9r6vh964mwsj0spsxcl3sdvll2znjd2hq4lw71va4iwm87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath unix ]; @@ -36455,7 +38283,7 @@ self: { mkDerivation { pname = "cabal-test-compat"; version = "0.2.0.0"; - sha256 = "b8654a0c916ef6340d6491380cb51e989ff804225d721598523ad9a07ef69d96"; + sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq"; libraryHaskellDepends = [ base Cabal QuickCheck ]; homepage = "http://twitter.com/khibino/"; description = "Compatibility interface of cabal test-suite"; @@ -36466,8 +38294,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.7"; - sha256 = "a48e74605af551a527987ad35ead89ae07477ffa1216165af35b9b0fdada0621"; + version = "0.1.8"; + sha256 = "11i7726z7ic7xb3ssx69938ipanqasrdl055ym2swm9s2jmc9k6x"; libraryHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; @@ -36480,7 +38308,7 @@ self: { mkDerivation { pname = "cabal-uninstall"; version = "0.1.6"; - sha256 = "22c6ad9465150be1575877365d29f557e181013f44c7fadb615b10803e62417b"; + sha256 = "0ys1c8z8042vc7dzmis47w0q3qapyllmsdkpb1by22qmcnaavii2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath mtl process ]; @@ -36493,7 +38321,7 @@ self: { mkDerivation { pname = "cabal-upload"; version = "0.4"; - sha256 = "7f81f4779c99591251229d107dfcfa83e55a0fcb666d5288b56f69d01b3c6716"; + sha256 = "05k77hdx0sbgnn454vb6rc7mmrc3zby7s44x498i4ncrkivz90bz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath HTTP network ]; @@ -36509,7 +38337,7 @@ self: { mkDerivation { pname = "cabal2arch"; version = "1.1"; - sha256 = "1fb18ba9ed506788f1b6c2f977ee6aead0b7edb9cd2bdae2cd210949d307616a"; + sha256 = "0sk10z9lj291rpidlaydp7nvgl7adbp7gyf2nvqqhrshxnlqpc8z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36527,7 +38355,7 @@ self: { mkDerivation { pname = "cabal2doap"; version = "0.2"; - sha256 = "542548fb6c5852bb8494d645352f54a31d4a3751dca9fd544a13e15f13860cdb"; + sha256 = "1nqchq9mzq8k99agvafwa4vll7d3ahpkaifnjj2bnljqdkxlh9al"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36544,7 +38372,7 @@ self: { mkDerivation { pname = "cabal2ebuild"; version = "0.0.15.9"; - sha256 = "54288f0813b2a83fffe7664574e00556f7bf96c195b2df67652fcf5fa128d785"; + sha256 = "11fp52hmzkrgcmkxzclmq6bbzxsn0ph78ib6wzzkza5j2c48ya2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -36561,7 +38389,7 @@ self: { mkDerivation { pname = "cabal2ghci"; version = "0.0.1.1"; - sha256 = "4fe78699cf2a022552a2b7ce6f22e96fbbf1499c7d776cd1320a1d5744bee3b9"; + sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36575,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.1"; - sha256 = "6874df33b6a208d7715f673ceded9e09a7e8188a0a94651b14e208b928256f6e"; + 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"; @@ -36617,7 +38448,7 @@ self: { mkDerivation { pname = "cabal2spec"; version = "1.0"; - sha256 = "52db417cd69007f01eead1fc78f517412b8c3aadb18bedf01aee588324cfc823"; + sha256 = "08y8rwj86n7f3bqfv2ximlx8qas12zspiz6ix8gg01whsry43nsj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36637,7 +38468,7 @@ self: { mkDerivation { pname = "cabalQuery"; version = "0.1.0.1"; - sha256 = "6d81b9e7eaf8d75c167e4f63de0dc54c46ccdcebe2d3a156bde68f80a0d3bca4"; + sha256 = "195wsfh813z6pmba3lz2xgfcqijcql6xwqsggqb5rmzqxbkvk0bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal pretty ]; @@ -36655,7 +38486,7 @@ self: { mkDerivation { pname = "cabalg"; version = "0.2.9"; - sha256 = "7716a76cf1078e0435d00f5bf10cbb5faf390e80b182596de19e8d1756a27909"; + sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath process ]; @@ -36672,7 +38503,7 @@ self: { mkDerivation { pname = "cabalgraph"; version = "0.1"; - sha256 = "7ecf056138a31a7cdc39198895dabd264f0e1a0ab0c2ef9ab92ac02f840dfccd"; + sha256 = "1kgw1n22zh1ap6dfzhmh18d0wkr6ppd9b20r77f7q6m371hhbkvy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36684,12 +38515,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabalish" = callPackage + ({ mkDerivation, base, Cabal, classy-prelude, directory, filepath + , optparse-applicative, text + }: + mkDerivation { + pname = "cabalish"; + version = "0.1.0.2"; + sha256 = "0yd170jghy94clj5rc4v3fb8f8581vafagv1mv3hkafqjrkwdvpi"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal classy-prelude directory filepath optparse-applicative + text + ]; + homepage = "https://github.com/RobertFischer/cabalish#readme"; + description = "Provides access to the cabal file data for shell scripts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabalmdvrpm" = callPackage ({ mkDerivation, base, Cabal, cabalrpmdeps, haskell98 }: mkDerivation { pname = "cabalmdvrpm"; version = "0.0.1"; - sha256 = "860125c65ae2ec7a1c07fc07d9488aa1f03cb05d3723d96282787217c956f35d"; + sha256 = "0pgkav4ifwkqh9idj8rpbnq3rw51i94dj1zw0wf7mv72bb32a0c6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ]; @@ -36705,7 +38556,7 @@ self: { mkDerivation { pname = "cabalrpmdeps"; version = "0.0.4"; - sha256 = "21cfdb0d7e1c85d074eee5c59c5e2baacdb03c9a6cbb16be9d69bfb42e5f7fa6"; + sha256 = "19kzbwpb9gv9knz1dfvck8yb1kda5dg9rig5xrsd118wgq6xpkr1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath haskell98 ]; @@ -36721,7 +38572,7 @@ self: { mkDerivation { pname = "cabalvchk"; version = "0.3"; - sha256 = "02478381b2a90078622cb7b9909bfbd64e7c7d9b587e7f1d4e532ec8c9f722aa"; + sha256 = "1ai2yz4whbjk9qfpyzjqkdypqknnzfdr1fdp5ii7h059na0q6iq2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; @@ -36737,7 +38588,7 @@ self: { mkDerivation { pname = "cabin"; version = "0.1.0.3"; - sha256 = "b357aeb338c5d93fcee4fbf4bd8eb29d4a62bcf0fc754301b65496ac9fe94172"; + sha256 = "0wj1x6gsr5jlnq0l6xgwy2y64jlxna7bvx7vwk73znf572rswmxk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36753,7 +38604,7 @@ self: { mkDerivation { pname = "cabocha"; version = "0.1.0.0"; - sha256 = "8e67cef4ae2c82a39ee13f424e1d2ca277cc980678f852dd0c2b194fdb80386a"; + sha256 = "0siqh3dly69b1kfm5y3q0sccqxx25hflwhizw6ga70icmvscwrwf"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ cabocha ]; testHaskellDepends = [ base text-format ]; @@ -36769,7 +38620,7 @@ self: { mkDerivation { pname = "cache"; version = "0.1.0.0"; - sha256 = "149ee40a6452297c61bfba2aa2ee9d7c18cf1a3d51f59cf1a8765d6dddb0fbd0"; + sha256 = "1l7vn3fnspbnm3qrrxai7ldcy63wkppa4amspxhpqaajch5f97hl"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; @@ -36784,7 +38635,7 @@ self: { mkDerivation { pname = "cached-io"; version = "1.1.0.0"; - sha256 = "353267bfc4de538ed0811cc4ce9d77683dc7c92654519a29e483d582ba781f30"; + sha256 = "0c0zg2x85mc3whlrllal4v4wfgb8fyfwxi0wh788wlyyqjznfcim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base stm time transformers ]; @@ -36801,7 +38652,7 @@ self: { mkDerivation { pname = "cached-traversable"; version = "0.1.0.1"; - sha256 = "663752f2d34c05643cc2c0ec91fdb31d3a1953760796f351f43802dfb0911416"; + sha256 = "05hlj6qdy0iqyi8z75h7fr9ijfhxngyr3v60q8y681acsgr54dv6"; libraryHaskellDepends = [ base binary bytestring containers directory filepath mtl ]; @@ -36817,8 +38668,8 @@ self: { }: mkDerivation { pname = "cacophony"; - version = "0.9.1"; - sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02"; + version = "0.9.2"; + sha256 = "05h30ixcw6m2ghy5m3cf1z4j8ips4h3ph6kgi78c3dp6491k6rpv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36839,12 +38690,41 @@ 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 { pname = "caf"; version = "0.0.3"; - sha256 = "481d0924cbb3674618391a0bbfe2d10781aa1a0df5942ee924fa71379d1b34fb"; + sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8"; libraryHaskellDepends = [ base ]; homepage = "http://sites.google.com/site/cafwiki/"; description = "A library of Concurrency Abstractions using Futures"; @@ -36856,7 +38736,7 @@ self: { mkDerivation { pname = "cafeteria-prelude"; version = "0.1.0.0"; - sha256 = "345760ecd93d1e63939ef9fcd27214c01163b2f71d3a77fc46e9b18f5ad5cac7"; + sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/Scott-Fleischman/cafeteria-prelude"; description = "Prelude subsets—take only what you want!"; @@ -36872,7 +38752,7 @@ self: { mkDerivation { pname = "caffegraph"; version = "0.1.0.2"; - sha256 = "e2d9c0593aef2ad38777a28be21d88dc9e40f5044570fcec667e2ef5fc11e4fb"; + sha256 = "1yz427ygabkycvngqw250ksl17nwi0fy52x2fy3x6apg79cw1ng2"; libraryHaskellDepends = [ base bytestring containers fgl filepath graphviz language-lua lens mtl optparse-applicative process protocol-buffers @@ -36890,7 +38770,7 @@ self: { mkDerivation { pname = "cairo"; version = "0.13.3.1"; - sha256 = "a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a"; + sha256 = "0nk77lixlf6j3a2870mbakcznigrf43m6ac1xn35d1v3dmy1kjm3"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring mtl text utf8-string @@ -36906,7 +38786,7 @@ self: { mkDerivation { pname = "cairo-appbase"; version = "0.4"; - sha256 = "82ffb1ad2cbe61e5d95991b223f66d1800db8370ed946f1af13ab8838a902185"; + sha256 = "1191j2587f1sy4d6z57df21xn00qdpv27clib7cyaqdy5jnv3zw2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cairo glib gtk ]; @@ -36922,7 +38802,7 @@ self: { mkDerivation { pname = "cake"; version = "1.1.0.1"; - sha256 = "6a05ffe381b39db71efaba1b3e84c7483fdf74d5ec6b796f050fe087c6fb1a99"; + sha256 = "168szg38gq0g0mppjszcsmsdygs8qy23w6xsz8gbg7dkh7izy1ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36947,7 +38827,7 @@ self: { mkDerivation { pname = "cake3"; version = "0.6.5"; - sha256 = "7b6ec21ac935a057e6c78d0509cd0df0520954cfea2395e25b6767a352bd1bb9"; + sha256 = "1f8vpm9a6rv7bgi9a8zarxa0jlph1p6hj1cdqzk5g81mr4dc4vkv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36974,7 +38854,7 @@ self: { mkDerivation { pname = "cakyrespa"; version = "0.0.29"; - sha256 = "ddbb90b43b56057a6f12bc51588f0ee84c7081daaa8c4e8285e2fe7fe7bb5ea8"; + sha256 = "1a2ypgkpzzp2hn14x35ava0p0k781s7mhldw29ppl1an7fs91fyx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36991,7 +38871,7 @@ self: { mkDerivation { pname = "cal3d"; version = "0.1"; - sha256 = "060f26197f1969ba7d2e7b0a3c72767ae932fdc3d3b929b4dde92077bf5497ac"; + sha256 = "1b4pajzpf879vns2kffkqgyk5sbsfrr3q2kv5ryvls8rgwcjc3q6"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ cal3d ]; homepage = "http://haskell.org/haskellwiki/Cal3d_animation"; @@ -37005,7 +38885,7 @@ self: { mkDerivation { pname = "cal3d-examples"; version = "0.1"; - sha256 = "8057aeafe7279d4740cdc3964149de4822d7a18a3f6a4d7a33debfc05bd846ba"; + sha256 = "1fj6v1dw1gyy6dx4ssiziahxf8j8vr4l35n3rm04g797wypswmw0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ]; @@ -37020,7 +38900,7 @@ self: { mkDerivation { pname = "cal3d-opengl"; version = "0.1"; - sha256 = "c269646464707fe10e53722053588cf703fe777b738b7dbcb008f056380fca0a"; + sha256 = "02na1ww5dw08n2y7v2vkgdvzw0zpiic5683jac7f2zvhcij68sf2"; libraryHaskellDepends = [ base cal3d OpenGL ]; homepage = "http://haskell.org/haskellwiki/Cal3d_animation"; description = "OpenGL rendering for the Cal3D animation library"; @@ -37033,7 +38913,7 @@ self: { mkDerivation { pname = "calc"; version = "0.1"; - sha256 = "bc63933d2a8208986422e7caa3b49d098bc472391766b1b29dc8b82664c779c0"; + sha256 = "1h3rqxj2df68knrb2rhp75rc92q9knsa7jp749j9h24258yr6qxw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base harpy haskell98 mtl ]; @@ -37049,7 +38929,7 @@ self: { mkDerivation { pname = "calculator"; version = "0.4.1.2"; - sha256 = "a96befbbc0d91c7f141a99f44f5eda56651383481b16bea0356758b8f1dfd21d"; + sha256 = "07fjvzqvhn376nhbw5hv921i6ranv9g4zx4r38a7y76rq2xyysx9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37072,7 +38952,7 @@ self: { mkDerivation { pname = "caldims"; version = "0.1.0"; - sha256 = "005e2f1be21fb7eede9defca7aa59284d50952908efb7cc206bc22a8e0eb8f56"; + sha256 = "0mlgxghah8mw0v17rywfj190kmc4jajpmjpgkpgfxdqzw8djyph0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37093,7 +38973,7 @@ self: { mkDerivation { pname = "caledon"; version = "3.2.2.0"; - sha256 = "684d9af96e1ed25e995f5ec9c7205b32c0af77d52a24d053b4a90c673658656d"; + sha256 = "0vb5b0v6f359ni9x091asmvszh1jbchcgjaybycmxlhydvwrlkb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37109,7 +38989,7 @@ self: { mkDerivation { pname = "calendar-recycling"; version = "0.0"; - sha256 = "a33e62c5bdbbece82491b6b795510496467df9993c715c819a7aad7707ee7963"; + sha256 = "0qvrxq3pgbbska0mqw9wk7wpsiln0i8rbdxnj4jfiv5vpp2n4gm3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37130,7 +39010,7 @@ self: { mkDerivation { pname = "call"; version = "0.1.4.2"; - sha256 = "2fe8f1ade21ea24c67ab2447189f756b75a60cbb4d2221a0058bc62050c00461"; + sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37153,7 +39033,7 @@ self: { mkDerivation { pname = "call-haskell-from-anything"; version = "1.0.1.0"; - sha256 = "1a33bc1a6f4f91f434a57bab242c9d46244bf73702432cbd8de6019595f7bffc"; + sha256 = "1z5zyyara0g6inyjqhq26zvln926kln29avvllsg94agdwdbqcqs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37171,7 +39051,7 @@ self: { mkDerivation { pname = "call-stack"; version = "0.1.0"; - sha256 = "f25f5e0992a39371079cc25c2a14b5abb872fa7d868a32753aac3a258b83b1e2"; + sha256 = "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base nanospec ]; homepage = "https://github.com/sol/call-stack#readme"; @@ -37188,7 +39068,7 @@ self: { mkDerivation { pname = "camfort"; version = "0.901"; - sha256 = "2aaf96c527f649e209b9fbe46e6d31cd4707b9d2aa514b4dfac55422bdf4992c"; + sha256 = "0b4ryjyj4m65z96lnldasawhfiyd65nnxr7vp44y4jgn4z2rdbra"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37210,17 +39090,51 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "camfort_0_902" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim + , happy, hmatrix, hspec, lattices, matrix, mtl, partial-order + , QuickCheck, sbv, syb, syz, text, transformers, uniplate, vector + }: + mkDerivation { + pname = "camfort"; + version = "0.902"; + sha256 = "0pakm4zdygzxpfnvxmn88pc1y1dx33xw71lkg0hbxj1k4dn4651q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers directory fgl filepath + fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl + partial-order sbv syb syz text transformers uniplate vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + array base binary bytestring containers directory fgl filepath + fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl + partial-order QuickCheck sbv syb syz text transformers uniplate + vector + ]; + testHaskellDepends = [ + array base binary bytestring containers directory filepath + fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv + text uniplate + ]; + description = "CamFort - Cambridge Fortran infrastructure"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "camh" = callPackage ({ mkDerivation, base, bytestring, Imlib, terminfo }: mkDerivation { pname = "camh"; - version = "0.0.2"; - sha256 = "577045c8c3b819a1e815864c67cbacfcd18ae26b5c92c792e48e33db7ccf6176"; + version = "0.0.3"; + sha256 = "0r6wzn9kxwinfa383lbxsjlrpv4v2m72qzpsyc9gcigvd5h7zhzz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Imlib terminfo ]; homepage = "not yet available"; - description = "Image converter to 256-colored text"; + description = "write image files onto 256(or 24bit) color terminals"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37232,7 +39146,7 @@ self: { mkDerivation { pname = "campfire"; version = "0.2.1"; - sha256 = "6485a3fe48c088459bb76ec34550df2f40d97358d18695401fb7e266d669a51a"; + sha256 = "06m5d7b6dqmp3x09b1nib1rxjh1gvx84bhvfnydlb26093za71b4"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers filepath http-enumerator http-types mtl old-locale process text time @@ -37249,7 +39163,7 @@ self: { mkDerivation { pname = "canonical-filepath"; version = "1.0.0.3"; - sha256 = "8e43893518f47e86cc859546534b2bb886c2f89bea3af5ab5cd33f043669e935"; + sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf"; libraryHaskellDepends = [ base deepseq directory filepath ]; homepage = "http://github.com/nominolo/canonical-filepath"; description = "Abstract data type for canonical file paths"; @@ -37262,7 +39176,7 @@ self: { mkDerivation { pname = "canteven-config"; version = "1.0.0.0"; - sha256 = "a994222fbc6957be65eb555b9acba14ca73d52a6ac42743fbb4f4a3508077cb6"; + sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559"; libraryHaskellDepends = [ base unix yaml ]; description = "A pattern for configuring programs"; license = stdenv.lib.licenses.asl20; @@ -37276,8 +39190,8 @@ self: { }: mkDerivation { pname = "canteven-http"; - version = "0.1.3.0"; - sha256 = "d427d5bc77861c2a648a604443f2a5ca882b911487ac313dbb5db6b0271870d4"; + version = "0.1.4.0"; + sha256 = "0zxs8ciyv3zb109an3qkw2c7kbg0zgs6cx1phndyl61wxf6vbqa6"; libraryHaskellDepends = [ base bytestring canteven-log directory exceptions filepath http-types mime-types monad-logger template-haskell text time @@ -37294,7 +39208,7 @@ self: { mkDerivation { pname = "canteven-listen-http"; version = "1.0.0.1"; - sha256 = "80035ba4bd16e308dd27008aa989efcbd9bedb96c6a84ca651ebef6fbeb781c5"; + sha256 = "1ic1nyz6zvzba6k4ra66jvdvxnfbxy4sk2h04zfhiqqnpnj5n0w0"; libraryHaskellDepends = [ aeson base ]; description = "data types to describe HTTP services"; license = stdenv.lib.licenses.asl20; @@ -37308,8 +39222,8 @@ self: { }: mkDerivation { pname = "canteven-log"; - version = "2.0.0.1"; - sha256 = "11cd21b4912b5ddd32515f8a0097fff5fc6642371647269a200d3063cf7452c9"; + version = "2.0.1.0"; + sha256 = "0w7hzhb13g62l08ggld3rj9aamw1jhjkir1bpzc73bl59ls4gdgy"; libraryHaskellDepends = [ aeson base bytestring directory fast-logger filepath monad-logger template-haskell text time transformers yaml @@ -37325,7 +39239,7 @@ self: { mkDerivation { pname = "canteven-parsedate"; version = "1.0.1.2"; - sha256 = "8522cd860b42f3b953c122d928a46c5b2c8640d26ec46dec1c975a94b8208ab7"; + sha256 = "1dwa42w98nlp3kn6vi3fs908cb2vdjj2in92q59vkws21f3cs8l5"; libraryHaskellDepends = [ base time timezone-series tz ]; testHaskellDepends = [ base Cabal old-locale time timezone-series tz @@ -37342,7 +39256,7 @@ self: { mkDerivation { pname = "canteven-template"; version = "0.1.0.0"; - sha256 = "c9c1e542c81288537211ed6d80c0cdc53bd1ec8967146337a2a2364286acc586"; + sha256 = "11n5mj344dm2l8vn6537i7nd2fy5rp080vgd25r5720jr11fbhf9"; libraryHaskellDepends = [ base blaze-html bytestring data-default markdown template-haskell text @@ -37359,7 +39273,7 @@ self: { mkDerivation { pname = "cantor"; version = "0.4"; - sha256 = "e36330c9cf27759773099057d66e93c6a2bb16a772722a96cb99bb97c446bd99"; + sha256 = "16dx8v29gfwrrfb2lwkjlwbbp8n6jdpdcmwh15rrfx97rz4k0qz3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37384,7 +39298,7 @@ self: { mkDerivation { pname = "cao"; version = "0.1.1"; - sha256 = "6d2abd0b0aadcc201887a9676fe38d32644de22bb3c835d9d7b729159d10b866"; + sha256 = "0rmq22fiaadpszckbj5k5gi4sr1jipinyrx9hwc21k5d185vsakd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37403,7 +39317,7 @@ self: { mkDerivation { pname = "cap"; version = "1.0.1"; - sha256 = "253c8267ea9570db869acc3e7a3197c719c1479385000608044ed2e261e92291"; + sha256 = "1492x5hy5ljf0h40c045jd3w26f7jwqplgncka3dnw4mx9kq4g15"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers haskell98 ]; @@ -37417,7 +39331,7 @@ self: { mkDerivation { pname = "capped-list"; version = "1.2"; - sha256 = "29f664c033a6bbca03ae2fd196b57e9947c5650c97ac4da13355293bb73e336a"; + sha256 = "0sik7svknaam6fhlvb4p1ijwaiwrgssrdl9gmq1wmfx66g069xi9"; libraryHaskellDepends = [ base ]; description = "A list-like type for lazy sequences, with a user-defined termination value"; license = stdenv.lib.licenses.bsd3; @@ -37428,7 +39342,7 @@ self: { mkDerivation { pname = "capri"; version = "0.1"; - sha256 = "27da85e58be530a1f9e03544e8ca3d105f56ff0ca994c32e162bd8fdbcfd5943"; + sha256 = "0hsrznygvn1b2qpc75591kzmcpqh7p5fhi1mw3ws2c75igjqbni7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37448,7 +39362,7 @@ self: { mkDerivation { pname = "car-pool"; version = "0.0.1"; - sha256 = "30aaf499ee387edfc52256638077f190b9fbbbdee3efb53da166d61e2d26c7f8"; + sha256 = "1y674qnixmk6l4yvbvz3vsxzpfchy5vq0qsn4b2xyziqxscz9aih"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37472,7 +39386,7 @@ self: { mkDerivation { pname = "caramia"; version = "0.7.2.2"; - sha256 = "fa3129d63816e1ccb47a57808ece432a2b6ab652eeba15ac6a76d6799af277b3"; + sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37488,6 +39402,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "carbonara" = callPackage + ({ mkDerivation, base, mysql-simple, postgresql-simple, split, time + }: + mkDerivation { + pname = "carbonara"; + version = "0.0.1"; + sha256 = "09xz6g873714z5wpnrv01mardshhngk5b34sckdl9rqjil64v5vn"; + libraryHaskellDepends = [ + base mysql-simple postgresql-simple split time + ]; + homepage = "https://github.com/szehk/Haskell-Carbonara-Library"; + description = "some spaghetti code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "carboncopy" = callPackage ({ mkDerivation, base, bytestring, filepath, haskell98, IfElse , MissingH @@ -37495,7 +39424,7 @@ self: { mkDerivation { pname = "carboncopy"; version = "0.1.2"; - sha256 = "71a8862ee790bf6e996c23fe3cf564182760a5b727ca9431f67be2c6803520f2"; + sha256 = "1wi06n0cdqkvyqqr9ji7nyjn09qqckskrzi3djcnxgwhwwp8da3i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37515,7 +39444,7 @@ self: { mkDerivation { pname = "carettah"; version = "0.5.1"; - sha256 = "aabf95661b42aac4a3cefdf352c3de545e822f2bb6d8d7609f1033c34cc41f4c"; + sha256 = "0k0zqi6c6cqhkxhdgn5n5cpq4pjlvv1m5wzxrsiw9aj23dk9bgxa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37534,8 +39463,8 @@ self: { }: mkDerivation { pname = "carray"; - version = "0.1.6.5"; - sha256 = "6b253bd77cbe3cf1ed05ed60fa45f72f2ed5f6a0db5395ba26d58317b146786b"; + version = "0.1.6.7"; + sha256 = "0b5zabyfzi60llvimk2hfw93r38qfl3z5kjhp71rdgqj0alaxmx9"; libraryHaskellDepends = [ array base binary bytestring ix-shapable QuickCheck syb ]; @@ -37552,7 +39481,7 @@ self: { mkDerivation { pname = "carte"; version = "0.1.0.0"; - sha256 = "3a6a40c11fa4544082a752630e381b89e9a16b305f967fcf0ff6eb8f358b5136"; + sha256 = "0djiicsqzszn1z7pz5jz61ms3sc93cw0wqsjly140m543z0l0sis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -37573,7 +39502,7 @@ self: { mkDerivation { pname = "cartel"; version = "0.18.0.2"; - sha256 = "7b27aa2cbeb73b1d5bf93214f290275025c3231fee23b32d80de104ec76ec270"; + sha256 = "0w62dv3lw46yh0nv68zf3wiw69ah4y8g451jz5disfxppqnal9vv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37601,7 +39530,7 @@ self: { mkDerivation { pname = "casa-abbreviations-and-acronyms"; version = "0.0.1"; - sha256 = "5ebea4d5c229fbbf97fac6cd91016ef41fe712995d6f8719db330c2753e0ec8a"; + sha256 = "12pcw19jf31kvccqfvsxk49ff7zldq0r3kf6zabvzyr9qbas9gjy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -37621,7 +39550,7 @@ self: { mkDerivation { pname = "casadi-bindings"; version = "3.1.0.3"; - sha256 = "c9a2e3b246b344f48a771c419db3cdddda7f71c1995d184340d91817bebf6439"; + sha256 = "0fb4pyz1f66r811ihpcrq5qpznnxrnrrsh8wfy5g8i5k8srf78n9"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -37644,7 +39573,7 @@ self: { mkDerivation { pname = "casadi-bindings-control"; version = "2.0.0.1"; - sha256 = "5c940b6d73306f5454629827b103b3c399f4037452294e1847ab1d72777a970e"; + sha256 = "03lpg9vp47db8wc4waajfh1z96f3nc1v29wqc9a58vrhfdnhp52w"; libraryHaskellDepends = [ base casadi-bindings-core casadi-bindings-internal vector ]; @@ -37661,7 +39590,7 @@ self: { mkDerivation { pname = "casadi-bindings-core"; version = "3.1.0.0"; - sha256 = "360f2cd21f2cb418b56b9a487333b1d18dbc86def6ab659a3061080b1194e623"; + sha256 = "08z6jh8hn23162d6baznvs3br3fin4rp6j4sdfsiid1c3z92q3rn"; libraryHaskellDepends = [ base casadi-bindings-internal containers vector ]; @@ -37676,7 +39605,7 @@ self: { mkDerivation { pname = "casadi-bindings-internal"; version = "0.1.5.0"; - sha256 = "c24100f6de46d5a6ba21af67fca017ac67a7da2c945863b5d2879012c05bf35c"; + sha256 = "0p7kbg015447sasn6n4l5kdafrxc2yhgqrxg46xadma6vvv00hf2"; libraryHaskellDepends = [ base containers vector ]; librarySystemDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; @@ -37692,7 +39621,7 @@ self: { mkDerivation { pname = "casadi-bindings-ipopt-interface"; version = "1.9.0.3"; - sha256 = "4a54d5348287bf8d9d955c2a29d3887f0f592ecd516b4782f93123c810bd38c0"; + sha256 = "1h1qpl8ch8riz614fssirlp5j3vzi39jjajwjnfqvgw7h8sdam2a"; libraryHaskellDepends = [ base casadi-bindings-core casadi-bindings-internal vector ]; @@ -37709,7 +39638,7 @@ self: { mkDerivation { pname = "casadi-bindings-snopt-interface"; version = "1.9.0.3"; - sha256 = "5c2bb4286c559e031bf0dab80f1fa43522d25cc71e389fa6513fb4dcf65acf6b"; + sha256 = "0sygbbvdrd1za6k9yf0yqxfd48imlhghzf6sy0dh77jmdhlb8asw"; libraryHaskellDepends = [ base casadi-bindings-core casadi-bindings-internal vector ]; @@ -37726,7 +39655,7 @@ self: { mkDerivation { pname = "cascading"; version = "0.1.0"; - sha256 = "bec8cf0bc910b0a58f23132934fca720b00fdca3d4391dd6a03601459c823f71"; + sha256 = "0w9zhaf4a09nl3b1sffllgf0zc10lzy38a8k4f7sbc0hr45wzj5y"; libraryHaskellDepends = [ base blaze-builder bytestring colour containers lens mtl text utf8-string web-routes @@ -37741,7 +39670,7 @@ self: { mkDerivation { pname = "case-conversion"; version = "0.2"; - sha256 = "d8ac5def42d113050ccfc8724ea7408d4f748e2daa942a23b053d5b5602bb9cd"; + sha256 = "1kdr5dhbbmakn0ijm55a5n778kwd82klwwn8rw60a4yi8bpmvb6q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -37758,8 +39687,8 @@ self: { }: mkDerivation { pname = "case-insensitive"; - version = "1.2.0.8"; - sha256 = "27aa610a7e0128c346d4a5cddb5d395a85b0889e4a9912acbb3b9ccbc4e99f68"; + version = "1.2.0.10"; + sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -37777,7 +39706,7 @@ self: { mkDerivation { pname = "case-insensitive-match"; version = "0.1.1.0"; - sha256 = "4f5003124b840d05d60e0256d18ae25aa4d5fd78d106c821f26687392adba437"; + sha256 = "0dx4vcm3k1v6y8hwh1nig3yxb92swa5d2mh21vb0a3c49c906l2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -37797,7 +39726,7 @@ self: { mkDerivation { pname = "cased"; version = "0.1.0.0"; - sha256 = "8394e6705ed83152875e1de1c51c54c26b04a2359919d8958d66997b2b60ad23"; + sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/jb55/cased"; description = "Track string casing in its type"; @@ -37813,7 +39742,7 @@ self: { mkDerivation { pname = "cases"; version = "0.1.3.2"; - sha256 = "9ecf632f7751aac2ed7ec93407f9499237316f2eb50f331bb4969abf3359a8a9"; + sha256 = "1ad8b4rvz6lnnhdk63xm5rpk2dwj97whfd69gvnw5ajifwpn7kwy"; libraryHaskellDepends = [ attoparsec base-prelude loch-th text ]; testHaskellDepends = [ base HTF HUnit loch-th placeholders QuickCheck text @@ -37832,7 +39761,7 @@ self: { mkDerivation { pname = "cash"; version = "0.1.0.1"; - sha256 = "074697c7d286fa263d8f5242de917912d0a5e121d87414c9d16f957ddb18965f"; + sha256 = "0pwn33dpv5bgs74i8x6q47hsbl0jg68xwhjjiwyjdyl6sb3rfih7"; libraryHaskellDepends = [ base deepseq haskell98 HaXml network parallel pretty ]; @@ -37846,30 +39775,23 @@ self: { ({ mkDerivation, base, split }: mkDerivation { pname = "casing"; - version = "0.1.1.0"; - sha256 = "db3ba2aa997885da68348ff8c71e98434edc5a80e8e665154ccbf6f9ee3b63fb"; + version = "0.1.2.1"; + sha256 = "0f56060n78jy7f6mm14h2g9w48cgsxrjixm65x3mm4a2xpkg5gx8"; libraryHaskellDepends = [ base split ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; }) {}; "casr-logbook" = callPackage - ({ mkDerivation, base, casr-logbook-html, casr-logbook-meta - , casr-logbook-meta-html, casr-logbook-reports - , casr-logbook-reports-html, casr-logbook-reports-meta - , casr-logbook-reports-meta-html, casr-logbook-types, digit - , directory, doctest, filepath, lucid, QuickCheck, template-haskell - , time + ({ mkDerivation, base, containers, digit, directory, doctest + , filepath, lens, lucid, QuickCheck, template-haskell, text, time }: mkDerivation { pname = "casr-logbook"; - version = "0.2.2"; - sha256 = "2eeb37db62ead7f718d4ef252e6492f4d2ff827fc24cc58f8da6f3205fe37fb6"; + version = "0.3.0"; + sha256 = "1hbrvwpr5crrnqwsi9i2pcw89rpy5fy3dg40al1318lmxp6miznh"; libraryHaskellDepends = [ - base casr-logbook-html casr-logbook-meta casr-logbook-meta-html - casr-logbook-reports casr-logbook-reports-html - casr-logbook-reports-meta casr-logbook-reports-meta-html - casr-logbook-types digit lucid time + base containers digit lens lucid text time ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -37888,7 +39810,7 @@ self: { mkDerivation { pname = "casr-logbook-html"; version = "0.0.3"; - sha256 = "3eb3cd24aa8ec50bc83a3e0e1b0864050d7d3e7d601a67c033ae88be362494bb"; + sha256 = "1fwl4hvbx25f6g06f6k0glz7s385ch41n3iy7b40picfm8jcvcry"; libraryHaskellDepends = [ base casr-logbook-types digit lens lucid text time ]; @@ -37908,7 +39830,7 @@ self: { mkDerivation { pname = "casr-logbook-meta"; version = "0.0.4"; - sha256 = "8f8ee4b7b59a3f5719a92c7c17f2f83e9087345657c6805d139bf5af1d9a6c90"; + sha256 = "143ck8fszxcv2dfq1ijpaqs8g41yz3r1fz1cm4cmfgwsnnvy93lg"; libraryHaskellDepends = [ base casr-logbook-types lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -37926,7 +39848,7 @@ self: { mkDerivation { pname = "casr-logbook-meta-html"; version = "0.0.4"; - sha256 = "52eb8640d21e88f9ee34800b52f6413a4d2d6d31eda01781fe2056aad24504b5"; + sha256 = "1d848p9almi0zs0ig87d65njsk9s87v542w06kpgk20ys908dssj"; libraryHaskellDepends = [ base casr-logbook-html casr-logbook-meta casr-logbook-types lens lucid text @@ -37947,7 +39869,7 @@ self: { mkDerivation { pname = "casr-logbook-reports"; version = "0.0.2"; - sha256 = "31148b8982cce8933515b3033ba86e2032abc32ce9edec8d6037a0f86039cf8f"; + sha256 = "13yg75hgi81pc26yrvg95k1snci0dsl3n0xk2lsr7s6cha4qn51i"; libraryHaskellDepends = [ base casr-logbook-types containers lens time ]; @@ -37967,7 +39889,7 @@ self: { mkDerivation { pname = "casr-logbook-reports-html"; version = "0.0.2"; - sha256 = "a088b0a9640eb3f0dcf8638f067d40c7324315f43457b30a96a73000b94647e1"; + sha256 = "1qa78swh0c57jq5b6mrlyhal6cn781yhd3v3z3fg1cqfcjlv1250"; libraryHaskellDepends = [ base casr-logbook-html casr-logbook-reports casr-logbook-types containers lens lucid text time @@ -37988,7 +39910,7 @@ self: { mkDerivation { pname = "casr-logbook-reports-meta"; version = "0.0.3"; - sha256 = "16feedd8270795b81a25a37bbf039050f3a489c205bdeaabd087b5685ec024b6"; + sha256 = "1di4q1g6idc7s2mymg85qa4s9wshj01vyyx34ldbi5874zcfvzhn"; libraryHaskellDepends = [ base casr-logbook-meta casr-logbook-types lens ]; @@ -38009,7 +39931,7 @@ self: { mkDerivation { pname = "casr-logbook-reports-meta-html"; version = "0.0.3"; - sha256 = "c17169e9505b77b2d1660ef389decba56c8d1e8573891e58138ea85a490ef125"; + sha256 = "09gi1r4mma4f2dc1x2bkhlg8sv55rgg8kwqfcv8v4xsva3lnjwf1"; libraryHaskellDepends = [ base casr-logbook-meta casr-logbook-meta-html casr-logbook-reports casr-logbook-reports-html casr-logbook-reports-meta @@ -38031,7 +39953,7 @@ self: { mkDerivation { pname = "casr-logbook-types"; version = "0.0.2"; - sha256 = "3bab91dd5632ba6c67a2b4942caeafefbf9af4c7fdd69ca61e25f5eb5eafcbb6"; + sha256 = "1dnbmxgfpx953sk9rmpxqzs9mgzgmyp2r55ll9knrfijavfr3arv"; libraryHaskellDepends = [ base containers digit lens time ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -38049,7 +39971,7 @@ self: { mkDerivation { pname = "cassandra-cql"; version = "0.5.0.2"; - sha256 = "a4a8b6f6cdd6f0fb54bcbd2d04a0a7c64a8c6aa68b5c0089a67dc35fb7be60da"; + sha256 = "1nk0psvmzhvxls4h0p4blrm8qjn6lyh08bdxpiagpw6nrpvbda54"; libraryHaskellDepends = [ base bytestring cereal containers cryptohash Decimal hslogger MonadCatchIO-transformers mtl network resource-pool stm text time @@ -38065,7 +39987,7 @@ self: { mkDerivation { pname = "cassandra-thrift"; version = "0.8.5.1"; - sha256 = "8c77b9c1f82a41e496201b42217984e7ca610897646953bc65dc59311e88b542"; + sha256 = "0hmmi0g32nfwcny56sb4jw463jp7hiwj2hhv42bf8h9az30vjxwc"; libraryHaskellDepends = [ base bytestring containers Thrift ]; homepage = "http://cassandra.apache.org/"; description = "thrift bindings to the cassandra database"; @@ -38082,9 +40004,9 @@ self: { mkDerivation { pname = "cassava"; version = "0.4.5.1"; - sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f"; + sha256 = "17wxrwq977nyi225zlg3wj32f0ypyvikznhw59k0hxb4vkljlqkw"; revision = "1"; - editedCabalFile = "c04d2ca56a5c725b3044ccf06c6fd09ff47265e3a1e125ae364363bfed2a0314"; + editedCabalFile = "05035bnvyqs36sp2bqd1wdjp5x4zs1pnrw6c8hq5nwjwdajjqkf0"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -38103,6 +40025,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava_0_5_0_0" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring + , bytestring-builder, containers, deepseq, hashable, HUnit, Only + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, unordered-containers, vector + }: + mkDerivation { + pname = "cassava"; + version = "0.5.0.0"; + sha256 = "1fdydyl2qn8qgjcrdij3gff13zwzp2fqmr3a8g0j35qfhq4lnzl4"; + libraryHaskellDepends = [ + array attoparsec base bytestring bytestring-builder containers + deepseq hashable Only text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + unordered-containers vector + ]; + homepage = "https://github.com/hvr/cassava"; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-conduit" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, criterion, mtl, QuickCheck @@ -38111,7 +40058,7 @@ self: { mkDerivation { pname = "cassava-conduit"; version = "0.3.5.1"; - sha256 = "45853e32dbac212d41d800c539c7d9184e05d0b7b48df458a7963138449a75d5"; + sha256 = "1mbmk923hccnlxcg93dlnz80akhqv73kki80v10js8dcvcr3x1a5"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit conduit-extra containers mtl text @@ -38125,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 @@ -38132,9 +40102,9 @@ self: { mkDerivation { pname = "cassava-megaparsec"; version = "0.1.0"; - sha256 = "8d77229766aec5e9e31e145138be981cca791699a3d66010619604827c590702"; + sha256 = "00h7b5y8414nc4861mm3k4b7kjhwk2z3hl8l3viykidfcsbj4xwd"; revision = "4"; - editedCabalFile = "ce616d726f30d6015744bc8087cadb575f16c1e51d20b507dcd75dbeca25119e"; + editedCabalFile = "17hi4p5bwpfpvh3va80xwp0icpspvg58g05w8ibh3mihdxr6sqff"; libraryHaskellDepends = [ base bytestring cassava containers megaparsec unordered-containers vector @@ -38153,8 +40123,10 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.3.0.0"; - sha256 = "81a4548c78474d025c525728a57616a657e5d59c377625c54ebb3f1818f5c49b"; + version = "0.3.0.1"; + sha256 = "178d1sbfvscbmgwm5basbzciflrj6i6w55w1pmm6wyiibfbcwapf"; + revision = "1"; + editedCabalFile = "0wik7fy8qs1971bxziap6lkc8pxl83mz642gprh07qrx3kfx0qs1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38174,7 +40146,7 @@ self: { mkDerivation { pname = "cassette"; version = "0.1.0"; - sha256 = "fd40b3fd44eebce549216f3a4c1852f5b109edddfff3d6d7e243b64574981613"; + sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x"; libraryHaskellDepends = [ base ]; description = "A combinator library for simultaneously defining parsers and pretty printers"; license = stdenv.lib.licenses.bsd3; @@ -38191,7 +40163,7 @@ self: { mkDerivation { pname = "cassy"; version = "0.7.1"; - sha256 = "0ef87e18a5e8faf5c353a36375bd2b56aa73651294d131c1550df7998feda15a"; + sha256 = "0nm1xn7rkxqdap0k3lcl29jp7ajn5fypaqx3ag1zbyp8llc7xy0f"; libraryHaskellDepends = [ aeson async attoparsec base binary bytestring cassandra-thrift cereal conduit containers data-default errors exceptions mtl @@ -38216,7 +40188,7 @@ self: { mkDerivation { pname = "castle"; version = "0.1.0.1"; - sha256 = "6a16bfd1c29d94789af6e61eae1d7949685e9becfc0f39f17cb3d34f11dbcd40"; + sha256 = "0h6dvc8lzlxkgkqkj3zwxjdmws29g4fsw7p6ysd7i54xqb8vy5ka"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38234,7 +40206,7 @@ self: { mkDerivation { pname = "casui"; version = "0.3"; - sha256 = "fc15678e54cf70db356163c9d3d0c8a90e28d2cbeb1d9071037888d75b7a50ee"; + sha256 = "1vjhg9dxg23q0dqr07gbrg92h3m9r38d7jb3c4sxnw6gaj76f5gw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gtk haskell98 mtl parsec ]; @@ -38249,7 +40221,7 @@ self: { mkDerivation { pname = "catamorphism"; version = "0.5.1.0"; - sha256 = "782ea7852cbc3f092cb00ac48b5aeec4121fcde5b58718744d85f141416e18d2"; + sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; @@ -38262,7 +40234,7 @@ self: { mkDerivation { pname = "catch-fd"; version = "0.2.0.2"; - sha256 = "3dbb21228ea97426b266ffd3930f75e9e553fd7290b7bd8d6dfd488ff7ccdb15"; + sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://github.com/sonyandy/catch-fd"; description = "MonadThrow and MonadCatch, using functional dependencies"; @@ -38275,7 +40247,7 @@ self: { mkDerivation { pname = "categorical-algebra"; version = "0.0.0.1"; - sha256 = "f46e7787eca3f60a54ba00d8980cfc48075a3ed2a486c62a56845b574b0aa6cf"; + sha256 = "1kx6195mfnw4aqmcd1m4s8z5l1s8zh69in00p9a0mxm3xj3pfvpl"; libraryHaskellDepends = [ base newtype pointless-haskell void ]; description = "Categorical Monoids and Semirings"; license = stdenv.lib.licenses.bsd3; @@ -38287,7 +40259,7 @@ self: { mkDerivation { pname = "categories"; version = "1.0.7"; - sha256 = "c29dcec070073f3fdb13f0265e2efc4f2f88522292189690351a70f24cd830a2"; + sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2"; libraryHaskellDepends = [ base void ]; homepage = "http://github.com/ekmett/categories"; description = "Categories"; @@ -38306,7 +40278,7 @@ self: { mkDerivation { pname = "category-extras"; version = "1.0.2"; - sha256 = "984d06bdc6604133b1ccecd927e86a51a604714aa49094161a08a086c3d51799"; + sha256 = "168psp1qd80838b9945499qh99jidbl2gngcrjqk6hb0qsyhckcq"; libraryHaskellDepends = [ adjunctions bifunctors categories comonad comonad-extras comonad-transformers comonads-fd contravariant distributive either @@ -38328,7 +40300,7 @@ self: { mkDerivation { pname = "category-printf"; version = "0.1.1.0"; - sha256 = "51b6e8bef10f4e17a11b553cd2ea04dca728f27f171464c14ffdf359abbd0ba5"; + sha256 = "198bpnmmkwzx9z0n850pgzr2i9yw0kmd4g2m3fhifkhgy6zfidji"; libraryHaskellDepends = [ base bytestring comonad text ]; description = "Highbrow approach to type-safe printf format specifications"; license = stdenv.lib.licenses.bsd3; @@ -38339,7 +40311,7 @@ self: { mkDerivation { pname = "category-traced"; version = "0.1.0.1"; - sha256 = "20dcb78f02c43f1dab7a7a4cb250404221dc46bbfe1075a3a200e72b77078701"; + sha256 = "00c70xvjprq0laipa47ypd3dq8a2818b4k3sgamisgy40a7vgp10"; libraryHaskellDepends = [ base categories ]; description = "Traced monoidal categories"; license = stdenv.lib.licenses.bsd3; @@ -38354,7 +40326,7 @@ self: { mkDerivation { pname = "catnplus"; version = "0.1.0.0"; - sha256 = "72b17e8a2b104b9d194802b97f5ababd3000635b74b1f6596b9d09b81fa67511"; + sha256 = "04bmlqgvh2cxddczdcblbdih0c5xp9d7zf8290crsjqh5f57xcbj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38372,9 +40344,9 @@ self: { mkDerivation { pname = "cautious-file"; version = "1.0.2"; - sha256 = "38fa615f6b2154c65016662d7fa7c173c2f56ae3621b469aa6016795f9b385eb"; + sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq"; revision = "1"; - editedCabalFile = "c6183204fc6d4767c8b8c4b954f6908fd376054c28904866a90a66497970d893"; + editedCabalFile = "14yqf1wljrham5k4i4189h2pdlwgj3v59ff4p346fivdzh234666"; libraryHaskellDepends = [ base bytestring directory filepath unix ]; @@ -38390,8 +40362,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.0"; - sha256 = "bdd21a245b6db5102d11096746edd85545d150ee835c0324e554d8b812ee6571"; + version = "0.4.1"; + sha256 = "11q92jbc4sgvif6akd5vvsdj3ncx0xhwk0mimyc55m4m7srjdplq"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -38409,7 +40381,7 @@ self: { mkDerivation { pname = "cayley-dickson"; version = "0.3.1.0"; - sha256 = "bcba575db8a9ed81d1c9d8e048642577bfb28b9e3b761334a187ad2fabb404c3"; + sha256 = "1hq4njmjzbc7l4s16xivks5v5gvp4mj4iq6qr78q3vd9p1fmgfmw"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base random ]; homepage = "https://github.com/lmj/cayley-dickson"; @@ -38426,7 +40398,7 @@ self: { mkDerivation { pname = "cblrepo"; version = "0.24.0"; - sha256 = "03c1728d5f5ac702e334d3b7ccf0ceb42c00f93dba6cce2cdd655f5d74f4af7a"; + sha256 = "0ymgyis5spv5vlncwv5s7pwh0b5lrvqcrdyk6kih5issby6p5h83"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -38447,7 +40419,7 @@ self: { mkDerivation { pname = "cci"; version = "0.3.1"; - sha256 = "87390d636e6877bfb982ce60b3accef9d73153ea03632cec967526eb8eb96a5f"; + sha256 = "0pvap67fn9kmjvn2qqq3x99k3mzrrsnb6q6fhawvyxv8drihsfc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -38466,7 +40438,7 @@ self: { mkDerivation { pname = "ccnx"; version = "0.0.0"; - sha256 = "0776e3c546363b07b579dc5bc37334f68f804a1bfbd0a32333d0b63fb5a9f6a1"; + sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://tomahawkins.org"; description = "A Haskell implementation of the CCNx network protocol"; @@ -38481,7 +40453,7 @@ self: { mkDerivation { pname = "cctools-workqueue"; version = "3.6.1.0.1.0.0.1"; - sha256 = "c3f2c6eeef5ea217a1be3eb9641cc92390af18a6d462d8f401612fe244fe0cdb"; + sha256 = "1nqczr2f4bv107sdhqnllqcaz413r4f69f9ypshig8jyxzpcdwn3"; libraryHaskellDepends = [ bindings-cctools bytestring lens monad-loops unix ]; @@ -38499,7 +40471,7 @@ self: { mkDerivation { pname = "cedict"; version = "0.2.5"; - sha256 = "7e8b51af665a499902021faa5530f84cb5281813d9b9a9d6bb57787a40e3d08e"; + sha256 = "13nhwd07ly2ppgbakffr2cc2idacz0q5bahz0819jjascspm32vy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38517,7 +40489,7 @@ self: { mkDerivation { pname = "cef"; version = "0.1.4"; - sha256 = "8564580a312cfee425d2d40e3b99283a05c50f4cdf2f283bc892c19c6fbec4cb"; + sha256 = "1jy4prprrhcjr0xjhbyz9h7wa19s52ckn3nls8jy9zic6455hr45"; libraryHaskellDepends = [ base bytestring text time ]; testHaskellDepends = [ base directory doctest filepath ]; homepage = "http://github.com/picussecurity/haskell-cef.git"; @@ -38525,6 +40497,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cef3-raw" = callPackage + ({ mkDerivation, base, bindings-DSL, cef, gtk2 }: + mkDerivation { + pname = "cef3-raw"; + version = "0.1.0"; + sha256 = "1ff9n9m3hd2kw212zqdvasbglfmv0yl9vv2q518xgb9zlkccj3p7"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ cef ]; + libraryPkgconfigDepends = [ gtk2 ]; + description = "Raw CEF3 bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {cef = null; gtk2 = pkgs.gnome2.gtk;}; + + "cef3-simple" = callPackage + ({ mkDerivation, base, cef3-raw }: + mkDerivation { + pname = "cef3-simple"; + version = "0.1.0"; + sha256 = "0h4k5mcbpxxv7nd9vf3nc2ynsnncc97q3q5s58gj10q2qpmvl1v7"; + libraryHaskellDepends = [ base cef3-raw ]; + description = "Simple wrapper around cef3-raw"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ceilometer-common" = callPackage ({ mkDerivation, base, bimap, binary, bytestring, containers , data-ordlist, foldl, hspec, lens, lens-properties, mtl, pipes @@ -38534,7 +40532,7 @@ self: { mkDerivation { pname = "ceilometer-common"; version = "0.2.3"; - sha256 = "fad2955f09f526c66afd6a2021fb4b744088f81314c6c6dc36dc1f61e68118ff"; + sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps"; libraryHaskellDepends = [ base bimap binary bytestring containers foldl lens pipes siphash template-haskell text vaultaire-common @@ -38555,7 +40553,7 @@ self: { mkDerivation { pname = "cellrenderer-cairo"; version = "1.0.0.0"; - sha256 = "fca3c3c7012a29f72f7bf8912c524d1058e5152eaf051ea65e0ee65c03ce8d15"; + sha256 = "05cdrq1mrrhfbsk1w1dg5qayan0h9m92r4gqgcpzfa9a073w78zw"; libraryHaskellDepends = [ base cairo glib gtk mtl ]; libraryPkgconfigDepends = [ gtk2 ]; libraryToolDepends = [ c2hs ]; @@ -38564,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 @@ -38574,7 +40595,7 @@ self: { mkDerivation { pname = "cerberus"; version = "0.1.0.0"; - sha256 = "11c9b5aa94939e289869a1a98cf60b6081b1be8ba5d75a66cf4ed8be0faa5c8e"; + sha256 = "13jwm87vxn2frxk5mmx5ifzb30b01gv8rad1d6c2i7lkjjmbbj8i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38600,7 +40621,7 @@ self: { mkDerivation { pname = "cereal"; version = "0.5.4.0"; - sha256 = "daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7"; + sha256 = "1rzyr8r9pjlgas5pc8n776r22i0ficanq05ypqrs477jxxd6rjns"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -38620,7 +40641,7 @@ self: { mkDerivation { pname = "cereal-conduit"; version = "0.7.3"; - sha256 = "05bf926a6292ad6e17f2667c248c33f820266ea8a703749923cc936a824c00a2"; + sha256 = "18h09j16m4yc4fcp80x7m1p2c87q6f628z36y8bnxbcjc9m95gq5"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet transformers ]; @@ -38637,7 +40658,7 @@ self: { mkDerivation { pname = "cereal-derive"; version = "0.1.1"; - sha256 = "8b3ba3942d518a46e172e36cce0e7bc226b788c62ab8e5d86f3c6f2c7278b412"; + sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb"; libraryHaskellDepends = [ base cereal ghc-prim ]; description = "Automatic deriving of Serialize using GHC.Generics"; license = stdenv.lib.licenses.gpl3; @@ -38649,7 +40670,7 @@ self: { mkDerivation { pname = "cereal-enumerator"; version = "0.3.1"; - sha256 = "d35ac7fb71e14cae6b045a0d21f9884322c9fb015422474dce4f937d1c91fa52"; + sha256 = "0lpsj4f7v4sgrr6lf8jl07xwj8j3i3wj23as0imswk71f7xwfnnk"; libraryHaskellDepends = [ base bytestring cereal enumerator ]; description = "Deserialize things with cereal and enumerator"; license = stdenv.lib.licenses.publicDomain; @@ -38661,7 +40682,7 @@ self: { mkDerivation { pname = "cereal-ieee754"; version = "0.1"; - sha256 = "5af05b446448b04ecc457a3627d5daf82362aa216f0789fcc044aef4e31722bf"; + sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s"; libraryHaskellDepends = [ array base cereal ]; homepage = "http://github.com/jystic/cereal-ieee754"; description = "Floating point support for the 'cereal' serialization library"; @@ -38677,7 +40698,7 @@ self: { mkDerivation { pname = "cereal-io-streams"; version = "0.0.1.0"; - sha256 = "b32bb775ec6f93fcc7246b5903473c893995b45d11f82c29913a20f459e568f1"; + sha256 = "1wb8wmcz881sj4ljry0ibns9afc97i3h6nbb4k3zr4vgxisvfaxk"; libraryHaskellDepends = [ base bytestring cereal io-streams ]; testHaskellDepends = [ base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty @@ -38701,7 +40722,7 @@ self: { mkDerivation { pname = "cereal-plus"; version = "0.4.2"; - sha256 = "71ffb40ea0e400d27dc89bb7e3dfbd8b54fb26e07b71bdd7ecff2f0ef95a01c9"; + sha256 = "1j81bbwhwbzzxkbvswbvw0kgnm4bppgy7dwvr1yx4074l07b9zvi"; libraryHaskellDepends = [ array base bytestring cereal containers errors hashable hashtables mmorph mtl stm text time unordered-containers vector @@ -38725,7 +40746,7 @@ self: { mkDerivation { pname = "cereal-streams"; version = "0.0.1.0"; - sha256 = "f2f7852ee6a64bfe8d526ee46d178973a58079c8a3f8390f2a367546b4d8b7cc"; + sha256 = "1k5pv2s4cx9n587kky53r1wq19bki4bnvr3faa6zwjx6wqp8bxzj"; libraryHaskellDepends = [ base bytestring cereal io-streams ]; testHaskellDepends = [ base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty @@ -38745,7 +40766,7 @@ self: { mkDerivation { pname = "cereal-text"; version = "0.1.0.2"; - sha256 = "3c7a15f4681fa53b66dcd5165f31f56ff9751a752ac5123ecc5bcf5c3ea0354c"; + sha256 = "0k1ml0z5rksvrhz15i9afld7bybgylqmy5nmvik3p98zd3s1ayiw"; libraryHaskellDepends = [ base cereal text ]; homepage = "https://github.com/ulikoehler/cereal-text"; description = "Data.Text instances for the cereal serialization library"; @@ -38757,7 +40778,7 @@ self: { mkDerivation { pname = "cereal-vector"; version = "0.2.0.1"; - sha256 = "ff0685a6c39e7aae32f8b4165e2ae06f284c867298ad4f7b776c1c1b2859f933"; + sha256 = "0czrb4l1n73cfxxlzbcqfa34qa3gw0m5w5mlz0rawylyqfk8a1pz"; libraryHaskellDepends = [ base bytestring cereal vector ]; testHaskellDepends = [ base cereal QuickCheck vector ]; homepage = "https://github.com/acfoltzer/cereal-vector"; @@ -38773,9 +40794,9 @@ self: { mkDerivation { pname = "certificate"; version = "1.3.9"; - sha256 = "e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1"; + sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6"; revision = "1"; - editedCabalFile = "6b4b703a1c34a9fa3e0223f3ff2796183c7b9b7351da1ad34478225637e837ba"; + editedCabalFile = "1fipx0vmc8kq8k9imnjiffdpng0qjqkzzwr308zgma9l3hx70jvb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38795,7 +40816,7 @@ self: { mkDerivation { pname = "cf"; version = "0.4.2"; - sha256 = "f2852d1f13c434f5e49ed319afc8f1a79cbb5e06d4235e5b342dc44cba6c2519"; + sha256 = "0695djx4ri1d6idmw8yl0rgbp757y74ay6fkkvjgad642cgjv1gj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -38814,7 +40835,7 @@ self: { mkDerivation { pname = "cfipu"; version = "1.1.0.4"; - sha256 = "327e57024225f24baa82e88b8c9a2cbfea1fa982e1f90b3f1b16e9dc57c48fd3"; + sha256 = "1lwgqibxrs8n3czhpyg1halizsmz5jd8r2z8ham4pwi58815fzij"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38834,7 +40855,7 @@ self: { mkDerivation { pname = "cflp"; version = "2009.2.1"; - sha256 = "7e83e7f9871040f856ef4b8bbb286dc6a4d7c60b78684c5de5e223e508484406"; + sha256 = "01j4904fa8z2wmflqs3q1g3dg966dllbp2sbxxbghh0hhzwyg0vy"; libraryHaskellDepends = [ base containers control-monad-omega HUnit incremental-sat-solver level-monad logict MonadRandom mtl random stream-monad syb @@ -38853,7 +40874,7 @@ self: { mkDerivation { pname = "cfopu"; version = "1.0.0"; - sha256 = "7fac407bbab277e0dc28e4b3ffcf5f2e35ddbefa615af256406086d6188da1ed"; + sha256 = "1vd1ilcdd1k081bg4nk1zazdsd9fbz7zzcz453ff0xxjp9xl1b3z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38872,7 +40893,7 @@ self: { mkDerivation { pname = "cg"; version = "0.0.9.0"; - sha256 = "f4ee74928f521b0cbc76b0bc64e76a2c658863130d76b1f658c1fa1ef2649a6a"; + sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38892,7 +40913,7 @@ self: { mkDerivation { pname = "cgen"; version = "0.0.5"; - sha256 = "0807822d8eaec236d895d2b6c77a22fc2c16088838d8d85eb1d556fe8eb269a2"; + sha256 = "18k9na7gwmnmn5gdin1qi041cb7w49xcgdnjjpc3dhmfiqnq41q8"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -38914,7 +40935,7 @@ self: { mkDerivation { pname = "cgi"; version = "3001.3.0.2"; - sha256 = "92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1"; + sha256 = "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj"; libraryHaskellDepends = [ base bytestring containers exceptions mtl multipart network network-uri parsec time xhtml @@ -38930,7 +40951,7 @@ self: { mkDerivation { pname = "cgi-undecidable"; version = "3000.0.0"; - sha256 = "4bddf6f79aa990a55b2ae4acd526b0325520edf59df911ca680fa57134c003f6"; + sha256 = "1xh3q0s7398gd3513ycxypnj0m9jn0kdbb7459dsb459kbvzdpab"; libraryHaskellDepends = [ base cgi mtl ]; description = "Undecidable instances for the cgi package"; license = stdenv.lib.licenses.bsd3; @@ -38941,9 +40962,9 @@ self: { mkDerivation { pname = "cgi-utils"; version = "0.2.1"; - sha256 = "f7b0d806ab13edb839f16cfa41c5c098b6fa7287386108b38680fc1506965457"; + sha256 = "0msljq31bz40hsrhhq9qhxrgmdlqq32l3ykcy4wviv8kmc3dic7p"; revision = "1"; - editedCabalFile = "df1cb1e658d9b79adde373fc31a1d7553a4803f8967c760abf233e75913ddd52"; + editedCabalFile = "0lnx7n8pagi3pw57cz4nz01lhfjmsyhk3z3kwgfrmdyrb3kb276z"; libraryHaskellDepends = [ base cgi containers mtl random ]; homepage = "http://github.com/chrisdone/haskell-cgi-utils"; description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)"; @@ -38960,8 +40981,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.6.16"; - sha256 = "7161e331f409ee95abfab14f720ad300ce4c9bd37a9fae74de6643c0f30b134b"; + version = "6.6.17"; + sha256 = "18si8gmgkfzky9rd53llz489j2wgzaw2b7hgr1djlc9yvp5h7482"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38981,7 +41002,7 @@ self: { mkDerivation { pname = "chain-codes"; version = "0.3.0.0"; - sha256 = "66a2a9b72210ddf2fc2c9030c0b45d71f76b316ef3cea7b3ccaf4bca1ec7866f"; + sha256 = "0vw6qwgcljxgrjrsgkpkdqqnpxvibnsc0c4h5kyg5p8h4avsk8k6"; libraryHaskellDepends = [ base containers JuicyPixels ]; testHaskellDepends = [ base containers hspec JuicyPixels ]; homepage = "http://github.com/Fuuzetsu/chain-codes"; @@ -38994,7 +41015,7 @@ self: { mkDerivation { pname = "chalk"; version = "0.1.0.2"; - sha256 = "f24e9f7990a72ffcdc2b5a6613780b04c319bdc4151794b8afc3675bf3f8dec7"; + sha256 = "1iyyz3rmnry3myw985qmqjyikhq41dw16rjs5gfgqbx7j1wrykpj"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/joom/chalk"; description = "Terminal string styling"; @@ -39008,7 +41029,7 @@ self: { mkDerivation { pname = "chalkboard"; version = "1.9.0.16"; - sha256 = "696963d4c4e43cf84e5e00af6c1d812e9f095df9d778efd79be3fc4f7d77061d"; + sha256 = "0786fxylzz73kgbyyy6pz5fhk7rfh4fnrbq0br7ghg74qka66sb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39026,7 +41047,7 @@ self: { mkDerivation { pname = "chalkboard-viewer"; version = "0.1"; - sha256 = "023e840acca9f6c7d171c3f29b92aa7cd889e3fd20e0cf8d06ed21694eb876bf"; + sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2"; libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ]; homepage = "http://ittc.ku.edu/~andygill/chalkboard.php"; description = "OpenGL based viewer for chalkboard rendered images"; @@ -39039,7 +41060,7 @@ self: { mkDerivation { pname = "chalmers-lava2000"; version = "1.6.1"; - sha256 = "ebe5152611cdf34269942bf61c9e009596ec5c15ed797f89d5f9854f00ba9c89"; + sha256 = "12cwp804z1grsn4pyygd2mffr5lm02g1rxibjill5wyd24k1brgb"; libraryHaskellDepends = [ array base process random ]; homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf"; description = "Hardware description EDSL"; @@ -39051,7 +41072,7 @@ self: { mkDerivation { pname = "chan-split"; version = "0.5.0"; - sha256 = "2c2f2f9e90d5ee0e283eeae7e3ff727763165476ea1d0983d16f18e158cffbd7"; + sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc"; libraryHaskellDepends = [ base stm ]; homepage = "http://brandon.si/code/module-chan-split-released/"; description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class."; @@ -39063,7 +41084,7 @@ self: { mkDerivation { pname = "change-monger"; version = "0.0"; - sha256 = "4225ef32f9bc7ab40b7e1a68c2646872051edd1010932f060b8390072d60381c"; + sha256 = "071qc0nhg4431c32z4qh23fiw1bjd1jc4s0sgq5v8ymwz4rfy9a2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -39080,7 +41101,7 @@ self: { mkDerivation { pname = "charade"; version = "0.1.1.2"; - sha256 = "c4d02c8bf96b82a2ccd081aefde69e966136fc018bf3313dd4a5cec1c417286e"; + sha256 = "0vi82z2c3km5shyk3wwb07y3cqcnkvkgvbl1s36a50kbz65jrl64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39104,7 +41125,7 @@ self: { mkDerivation { pname = "charset"; version = "0.3.7.1"; - sha256 = "3d415d2883bd7bf0cc9f038e8323f19c71e07dd12a3c712f449ccb8b4daac0be"; + sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x"; libraryHaskellDepends = [ array base bytestring containers semigroups unordered-containers ]; @@ -39117,8 +41138,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "charsetdetect"; - version = "1.0"; - sha256 = "f7d8e6a38572ed4e0789279ff9726a7a2b192e3f8c099cc54484c47acd1660f0"; + version = "1.1.0.2"; + sha256 = "1rnm36lvh1g4i9pz87jqqznn8d9pmxlin549ch0nacpi0bn3k0sy"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://www.github.com/batterseapower/charsetdetect"; description = "Character set detection using Mozilla's Universal Character Set Detector"; @@ -39131,7 +41152,7 @@ self: { mkDerivation { pname = "charsetdetect-ae"; version = "1.1.0.2"; - sha256 = "1393fae432a88fbc5fda643cf545a91469a341218e72464960bde48b27ba0fbe"; + sha256 = "1ghgp8kqpr5xc14lcwlf450s6s8lm52zag34v9gvr3x86bjgm4qk"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/aelve/charsetdetect-ae"; description = "Character set detection using Mozilla's Universal Character Set Detector"; @@ -39143,7 +41164,7 @@ self: { mkDerivation { pname = "chart-histogram"; version = "1.1"; - sha256 = "08900a6889b97a75cbcd94fc5ccc817dc63f5d30739ab2738611499d9841db69"; + sha256 = "0sfv86c9sj8ihrrv56kk61fkzikxh765rz4lrp5paymri5l0m408"; libraryHaskellDepends = [ base Chart ]; description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; @@ -39158,7 +41179,7 @@ self: { mkDerivation { pname = "chart-unit"; version = "0.1.0.0"; - sha256 = "623d5e89b846bacc55a659e1e976da6c5c9de686ae5b088d5b9660dc082d5e8e"; + sha256 = "13jy5l4dqq4nbf6hhnxfhvk9sp3cv9vfkqarlrawrfj6p24mwgb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39176,6 +41197,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.2"; + sha256 = "06yilm8ldkf59vxycydfhn990x6lmykgma2nwc87mxnqc6820a22"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base colour diagrams-lib diagrams-svg foldl formatting lens linear + numhask numhask-range text + ]; + executableHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chaselev-deque" = callPackage ({ mkDerivation, abstract-deque, abstract-deque-tests, array , atomic-primops, base, containers, ghc-prim, HUnit, test-framework @@ -39184,7 +41232,7 @@ self: { mkDerivation { pname = "chaselev-deque"; version = "0.5.0.5"; - sha256 = "4d58f8d56228e9f5bea2a65717dea65106323cb5ead9b5f39f904dac5c0043f4"; + sha256 = "1x2301faqkchkzrvbnganly341jilvg1fmx6lazgbs98cbazhn2d"; libraryHaskellDepends = [ abstract-deque array atomic-primops base ghc-prim transformers vector @@ -39209,8 +41257,8 @@ self: { }: mkDerivation { pname = "chatter"; - version = "0.9.0.0"; - sha256 = "edf8212aeb172c7ba63be8d72eded4f7ca3eb0c29fbf78b134d7a9e64f989f5a"; + version = "0.9.1.0"; + sha256 = "1q2jb2hycxqa9ka9q7yyl5ckvcc1mdiklwivms1mm4qylwaqmgy0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39242,7 +41290,7 @@ self: { mkDerivation { pname = "chatty"; version = "0.7.0.1"; - sha256 = "663d7bee8df42287cefa88f8c072981a2475e22d722046cd3ab6e6bdc775ec34"; + sha256 = "0d7cfp3vvrmn7b6lc83j5pi7a90sk1rc1y48zb78f8plipp7ngb6"; libraryHaskellDepends = [ ansi-terminal base chatty-utils directory mtl process random setenv template-haskell text time transformers unix @@ -39258,7 +41306,7 @@ self: { mkDerivation { pname = "chatty-text"; version = "0.6.2.1"; - sha256 = "820f5d1f6b7cc52430ee835ce0f7779b41987a6b492bee2466b957c03780c301"; + sha256 = "00f3h0vw0mxrcqjfwas9ddx9hhcvfzvy0p43xqq29ibwdcgms3w2"; libraryHaskellDepends = [ base chatty transformers ]; homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; @@ -39271,7 +41319,7 @@ self: { mkDerivation { pname = "chatty-utils"; version = "0.7.3.4"; - sha256 = "dac3ce02d2c0b14258d8de258a3c0d8749d5c8466ed002ffb9df671d8899e1b6"; + sha256 = "1dp1k641sryzp7zh5l3f8v4dajc71ly8l9fyv1c45cf0s81cxhys"; libraryHaskellDepends = [ base mtl text transformers ]; homepage = "http://hub.darcs.net/enum/chatty-utils"; description = "Some utilities every serious chatty-based application may need"; @@ -39279,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 @@ -39286,9 +41357,9 @@ self: { mkDerivation { pname = "cheapskate"; version = "0.1.0.5"; - sha256 = "7a63b7ffc4976d006c5f693569a5ffd7a887e83d126d1dce9bbe8b5fbaabfa32"; + sha256 = "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"; revision = "1"; - editedCabalFile = "29f13526ac3bce29f1bf861959a4e731b3a03a1af15fafecdd7f89d6b2b508d5"; + editedCabalFile = "1m88nnrdd2bzvpnaypzi38xa1criwyj5j6c6pzqjkkivmhk3bw99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39308,7 +41379,7 @@ self: { mkDerivation { pname = "cheapskate-highlight"; version = "0.1.0.0"; - sha256 = "5af7afb26b4ea80952963b44db695cbf18da34d3e8a7d32382a7dbfa4832d370"; + sha256 = "0w6k694gmnx7h8ix79z8scsdl65zbilxni1vjr90ka2fdfrazxss"; libraryHaskellDepends = [ base blaze-html cheapskate highlighting-kate text ]; @@ -39322,7 +41393,7 @@ self: { mkDerivation { pname = "cheapskate-lucid"; version = "0.1.0.0"; - sha256 = "f582e512befd2707a7056c1d15541967de2e0ce5702bc2197a3fced58a777245"; + sha256 = "0ibjfy5dbkizg8cw4avhwl62xpk735a1a7bc0nkhf9zxpq9fb0pm"; libraryHaskellDepends = [ base blaze-html cheapskate lucid ]; homepage = "http://github.com/aelve/cheapskate-lucid"; description = "Use cheapskate with Lucid"; @@ -39336,7 +41407,7 @@ self: { mkDerivation { pname = "cheapskate-terminal"; version = "0.1.0.0"; - sha256 = "8601c50c9979b463bf695d41d4111bdb0d7824f9600306b08b874bacea1fe9b9"; + sha256 = "1fg93zmaqjw7ifq0c0v0z4j7h3fv3c8x8haxd6zn7d3rk46ca0c6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39358,31 +41429,16 @@ self: { }) {}; "check-email" = callPackage - ({ mkDerivation, base, bytestring, email-validate, resolv }: - mkDerivation { - pname = "check-email"; - version = "1.0"; - sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7"; - revision = "1"; - editedCabalFile = "39f8616eeee765838400cd6754f864e9e65e8a89123327161227b6a424c20d75"; - libraryHaskellDepends = [ base bytestring email-validate ]; - librarySystemDepends = [ resolv ]; - description = "Confirm whether an email is valid and probably existant"; - license = stdenv.lib.licenses.bsd3; - }) {resolv = null;}; - - "check-email_1_0_2" = callPackage ({ mkDerivation, base, bytestring, email-validate, resolv }: mkDerivation { pname = "check-email"; version = "1.0.2"; - sha256 = "1c2615fadba09a5d7aa5c68648d12218a595efb759842fb4f524cf380afa9327"; + sha256 = "09wkz853ikr4yns2z12rnzprb98q4b8li1n6lmx5v6m0vgx1a9hw"; libraryHaskellDepends = [ base bytestring email-validate ]; librarySystemDepends = [ resolv ]; homepage = "https://github.com/qoelet/check-email#readme"; description = "Confirm whether an email is valid and probably existant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {resolv = null;}; "check-pvp" = callPackage @@ -39392,7 +41448,7 @@ self: { mkDerivation { pname = "check-pvp"; version = "0.0.1"; - sha256 = "2e158e7826ade55941c90d72fa240965f547241db5b544c267c96fde43a8b0a3"; + sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -39410,7 +41466,9 @@ self: { mkDerivation { pname = "checked"; version = "0.1.0.1"; - sha256 = "adea2330a33548439be112ac9ecbacfa45bd4282def658108a57b4d83a268002"; + sha256 = "00l04qxdid2pi885ixnyh91bsigsmk5rxb0jw6dl6j1mlcq27smd"; + revision = "1"; + editedCabalFile = "110g32gvn5cjdf4cbvv642asziinsh50b1c5675qzza77jg7hwid"; libraryHaskellDepends = [ base ]; description = "Bounds-checking integer types"; license = stdenv.lib.licenses.bsd3; @@ -39421,8 +41479,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { pname = "checkers"; - version = "0.4.6"; - sha256 = "2adc9cd2bfcc5c7bf8dbcf79160344757392a29b55ca131cda48e60168df970f"; + 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; @@ -39435,7 +41493,7 @@ self: { mkDerivation { pname = "chell"; version = "0.4.0.1"; - sha256 = "5f0abd31f4b00483e4667090c89828eda6a1c6ba5d77ecec418ad0fe972a6951"; + sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz"; libraryHaskellDepends = [ ansi-terminal base bytestring options patience random template-haskell text transformers @@ -39450,7 +41508,7 @@ self: { mkDerivation { pname = "chell-hunit"; version = "0.2.1"; - sha256 = "00f423ea3ef78f24ba2d9077db267fa9d30e47fa1b80ebafcaf2d5879214d400"; + sha256 = "006l2j98gmgjrapyp00vz93hxlx9gwkdnxwh5nx293zp7vm27x00"; libraryHaskellDepends = [ base chell HUnit ]; homepage = "https://john-millikin.com/software/chell/"; description = "HUnit support for the Chell testing library"; @@ -39463,7 +41521,7 @@ self: { mkDerivation { pname = "chell-quickcheck"; version = "0.2.5"; - sha256 = "9a119daa3ff6046efd3024c48356b76650d01c27734f6b9b66259b59ba657309"; + sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs"; libraryHaskellDepends = [ base chell QuickCheck random ]; homepage = "https://john-millikin.com/software/chell/"; description = "QuickCheck support for the Chell testing library"; @@ -39476,7 +41534,7 @@ self: { mkDerivation { pname = "chesshs"; version = "0.2.1"; - sha256 = "db31b42771c43c6811389a17f5e276dd83d807784246ec25e5651c97c78acd37"; + sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv"; libraryHaskellDepends = [ array attoparsec base bytestring containers ]; @@ -39493,7 +41551,7 @@ self: { mkDerivation { pname = "chevalier-common"; version = "0.6.0"; - sha256 = "3aff57938dcdc844cf0d8b29ed28eeeaaba3a8e2e6eb6808983d0addca62e739"; + sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs"; libraryHaskellDepends = [ base bifunctors bytestring cereal locators mtl network network-uri protobuf text unordered-containers vaultaire-common zeromq4-haskell @@ -39510,7 +41568,7 @@ self: { mkDerivation { pname = "chitauri"; version = "0.1.0.1"; - sha256 = "ebb349aa92c3c2e9d326f42b6d47769aaa57b9ea21b77ade24326be86f8d2445"; + sha256 = "0i94impyhsrj4kg7mdr1xawmgalsfr3nsazl4v9ykhn3jam4kczb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -39527,8 +41585,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "choice"; - version = "0.2.0"; - sha256 = "89a70894e54acc8e1a178e6110f46b0efed6e8389c7fec9060048d154aa1f72e"; + version = "0.2.1"; + sha256 = "163p6ji6gsr0lgxvldnz0rmcbckfk75wpq0xn1n41fbhxzchr2gi"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mboes/choice#readme"; description = "A solution to boolean blindness"; @@ -39540,7 +41598,7 @@ self: { mkDerivation { pname = "choose"; version = "0.1.0.0"; - sha256 = "e369ec4b733c8ad0e2eb151e171cb1fd4b1f13536975ace6533a437d6ca0fecf"; + sha256 = "1kzyl1n7shrsagkaqxb9ac9iyjzxn4f1f7hmxgid12iwfd5yqsg3"; libraryHaskellDepends = [ base MonadRandom ]; description = "Choose random elements from a stream"; license = stdenv.lib.licenses.asl20; @@ -39551,7 +41609,7 @@ self: { mkDerivation { pname = "choose-exe"; version = "0.1.0.0"; - sha256 = "f842c1f033185fe429a777f65476494a9ce1e9b8d4d3d42f1e6335978c1d8b1b"; + sha256 = "06wb3n69fdb33qpx9lylp3ly372a95v59xkplwly8pqq6gqc2hpq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base choose optparse-applicative text ]; @@ -39568,8 +41626,8 @@ self: { }: mkDerivation { pname = "chorale"; - version = "0.1.7"; - sha256 = "5c7ae9e2ee593295ae158046ceef0c3c5868bc5c890eb1f6e2e4be511e251e5d"; + version = "0.1.8"; + sha256 = "0k7xavjscl0xpjrz0w3nh473clkaw58126xch66qykm3l361zgc4"; libraryHaskellDepends = [ base containers safe ]; testHaskellDepends = [ base containers HUnit ieee754 QuickCheck safe test-framework @@ -39588,7 +41646,7 @@ self: { mkDerivation { pname = "chorale-geo"; version = "0.1.2"; - sha256 = "acc8d32f5c4652e58cae069df232cf487479d8cda92b444e0c797c3cc2f895a3"; + sha256 = "18wmz313qz3r1i748ax9rpc7jx28rwrg5786ms6falj6bhpx7j5c"; libraryHaskellDepends = [ base binary chorale ]; testHaskellDepends = [ base binary chorale HUnit ieee754 QuickCheck test-framework @@ -39607,7 +41665,7 @@ self: { mkDerivation { pname = "chp"; version = "2.2.0.1"; - sha256 = "822476732bae22b90174fdee21036be1681201597777d9eae991e80ecd40e0a3"; + sha256 = "18z0836hxs4ix7mdjxvpb40i4s71dc1j3vpxfh0vj8mf5drpc942"; libraryHaskellDepends = [ base containers deepseq extensible-exceptions pretty stm ]; @@ -39622,7 +41680,7 @@ self: { mkDerivation { pname = "chp-mtl"; version = "1.0.0"; - sha256 = "9fac30f3d042fe29f0848ea438822a3801a6ee760e76233ffbc3a60a13ed24f4"; + sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z"; libraryHaskellDepends = [ base chp chp-plus mtl ]; homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/"; description = "MTL class instances for the CHP library"; @@ -39637,7 +41695,7 @@ self: { mkDerivation { pname = "chp-plus"; version = "1.3.1.2"; - sha256 = "1f70ae988d9fe5d5830f044472de1d8581090ef3477b26dc2e944b221c76e5a0"; + sha256 = "1875fqf24jwl5vf2cys7yc70k0c53pg74i041y1xbrczincaww0z"; libraryHaskellDepends = [ base chp containers deepseq extensible-exceptions HUnit pretty QuickCheck stm @@ -39655,7 +41713,7 @@ self: { mkDerivation { pname = "chp-spec"; version = "1.0.0"; - sha256 = "b13da7269e2189c3dc3addb0837d07772ddb24ed34b909d6bf6b21cec035344a"; + sha256 = "0jil6p0cw8bbpzb0kf9lxljdnbbp0xyq7c6x7bfc7291kqkafgdi"; libraryHaskellDepends = [ base containers deepseq mtl pretty TypeCompose ]; @@ -39670,7 +41728,7 @@ self: { mkDerivation { pname = "chp-transformers"; version = "1.0.0"; - sha256 = "43603e90ffb74b8eefec05ff3ea95cb42fe2d2371a8584a10bdad62e2f669034"; + sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23"; libraryHaskellDepends = [ base chp chp-plus transformers ]; homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/"; description = "Transformers instances for the CHP library"; @@ -39683,7 +41741,7 @@ self: { mkDerivation { pname = "chronograph"; version = "0.2.0.1"; - sha256 = "e229751fc8b687d79033549b97d784a18b3c98254a73bc3c809288712d54c263"; + sha256 = "0qy2ahnp324jh0ybqwsa4nc3r2x1hkbrg6sl6f8dg1xnr0gpaag2"; libraryHaskellDepends = [ base deepseq ghc-prim thyme vector-space ]; @@ -39692,6 +41750,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "chronologique" = callPackage + ({ mkDerivation, base, hourglass, hspec, QuickCheck, time }: + mkDerivation { + pname = "chronologique"; + version = "0.2.1.0"; + sha256 = "13lrngxfbsfsmqph8slh8zn7hvvihbwzc6cna315kjzhi3a3mwbm"; + libraryHaskellDepends = [ base hourglass time ]; + testHaskellDepends = [ base hourglass hspec QuickCheck ]; + description = "Time to manipulate time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chronos" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable , HUnit, primitive, QuickCheck, test-framework @@ -39700,7 +41770,7 @@ self: { mkDerivation { pname = "chronos"; version = "0.4"; - sha256 = "547910db795b52bc6aea1202fc2db32324697cad4cba6677edba043fc3c28751"; + sha256 = "0lc7qb1ky15sxmvndfjcmmy6j913ncnzq0hjx9mbqljvg7di0yal"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -39721,7 +41791,7 @@ self: { mkDerivation { pname = "chu2"; version = "2012.11.20"; - sha256 = "3f364deec95014e56d5d15410b1ede411ed5a392ae9539a25568e908ff240307"; + sha256 = "01q34kzhisb8ani3k5dfjaixa7j1vqg0nh8mbmnya52hr7p4sdiz"; libraryHaskellDepends = [ base bytestring data-default hack2 hack2-handler-snap-server utf8-string @@ -39739,7 +41809,7 @@ self: { mkDerivation { pname = "chuchu"; version = "0.4.5"; - sha256 = "0cdb5b369c9e1876bd031281cbfaf3081c7132b2b88f72f4bd3cd2572ef5be13"; + sha256 = "04xyylp5gliwpps753xqn8r72708ygxcp08j0fypc64ykhv5pnqc"; libraryHaskellDepends = [ abacate ansi-wl-pprint base cmdargs lifted-base monad-control parsec text transformers @@ -39758,7 +41828,7 @@ self: { mkDerivation { pname = "chunked-data"; version = "0.3.0"; - sha256 = "e1be9da64c3682fd907aa9f1a118e8bfba7964d509fddf54bd245b199dc15f2f"; + sha256 = "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1"; libraryHaskellDepends = [ base bytestring containers semigroups text transformers vector ]; @@ -39772,7 +41842,7 @@ self: { mkDerivation { pname = "chunks"; version = "2007.4.18"; - sha256 = "7f3a9042423f7ed4484cdc2d8fe25e7af33f4de38c16a3defba5db053f8dbc61"; + sha256 = "0qdwilzhbnx5zgga65lcwd6kzwvsbvi8ybfw9i4d8ziz89190fkz"; libraryHaskellDepends = [ base haskell98 parsec template-haskell ]; homepage = "http://www.wellquite.org/chunks/"; description = "Simple template library with static safety"; @@ -39785,7 +41855,7 @@ self: { mkDerivation { pname = "chunky"; version = "0.1.0.0"; - sha256 = "6746c6d0f4ce1721a4b1f711f1760a1713369d3e9227348275755d5cd686e589"; + sha256 = "12g5hvb5qpbmfn1389wj7sfkc4qp19vg24gpn6j225yfyk8ccik7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring text ]; @@ -39801,13 +41871,26 @@ self: { mkDerivation { pname = "church-list"; version = "0.0.2"; - sha256 = "bc87a1a726027f6184756ae2155fbaf9d27ef098b8031b927997a9742ce32d76"; + sha256 = "0xidwcn79acpg691n0xqk3q7xlprp9gibqkafn262zq24sks31xw"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "Removed; please see fmlist"; 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 @@ -39816,7 +41899,7 @@ self: { mkDerivation { pname = "cielo"; version = "0.1.2.0"; - sha256 = "9c7df3e4d019a625c143f6ace77e282389651197b5d7b5fd9d502dec0ca24020"; + sha256 = "0820l86fqbahkpyvbmxmjw8nb29351zfgb7n8g0jb9hrs3jg6zcw"; libraryHaskellDepends = [ aeson base bytestring convertible data-default http-client http-types lens mtl template-haskell text uuid wreq @@ -39837,7 +41920,7 @@ self: { mkDerivation { pname = "cil"; version = "0.1.1"; - sha256 = "5f11907c80d6c83a8851d0e156ca3439a375a8696e368c41956370837d935939"; + sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az"; libraryHaskellDepends = [ base bytestring language-c ]; homepage = "http://tomahawkins.org"; description = "An interface to CIL"; @@ -39850,7 +41933,7 @@ self: { mkDerivation { pname = "cinvoke"; version = "0.1"; - sha256 = "82ead108765cbdfe4bdc8a5aeaab112cfcbc82e7af70735de36c6668d53a3f5a"; + sha256 = "0niz7banhrkcwdfp6w5gwy1brz1c26mylnlavi5zxgawfq4d3sl2"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ cinvoke ]; homepage = "http://haskell.org/haskellwiki/Library/cinvoke"; @@ -39864,7 +41947,7 @@ self: { mkDerivation { pname = "cio"; version = "0.1.0"; - sha256 = "8bdebb177fb1c24b5d6eeb10503866c000c2295cbbdb0d237c2340e9dd622814"; + sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb"; libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ]; homepage = "https://github.com/nikita-volkov/cio"; description = "A monad for concurrent IO on a thread pool"; @@ -39881,7 +41964,7 @@ self: { mkDerivation { pname = "cipher-aes"; version = "0.2.11"; - sha256 = "d3b171895698c73da24d7ce97543f725d26637f038de670c0fd4012ca7f95015"; + sha256 = "05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem ]; @@ -39905,7 +41988,7 @@ self: { mkDerivation { pname = "cipher-aes128"; version = "0.7.0.3"; - sha256 = "6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a"; + sha256 = "0fif8626z1p2q6734sjb69s1ascwmqiv9dkmzir7166ipjlbw9vg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39928,7 +42011,7 @@ self: { mkDerivation { pname = "cipher-blowfish"; version = "0.0.3"; - sha256 = "8f41170a851dba6d0b6f07298af3213baca09ab2a8aaf2adb733631feb3b6641"; + sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem vector ]; @@ -39954,7 +42037,7 @@ self: { mkDerivation { pname = "cipher-camellia"; version = "0.0.2"; - sha256 = "8d0cd137cdb890646bb5d3bb52b20fa6d74e1b0c35d7d524d60edd9d43ace2a7"; + sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem vector ]; @@ -39980,7 +42063,7 @@ self: { mkDerivation { pname = "cipher-des"; version = "0.0.6"; - sha256 = "85f1bccdec625a120ecf83b861afcb6478f8f899ceaa06fc083e642b54ff4ac7"; + sha256 = "1isazxa2nr1y13y0danfk7wghy34rfpn3f43rw714nk2xk6vrwc5"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem ]; @@ -40006,7 +42089,7 @@ self: { mkDerivation { pname = "cipher-rc4"; version = "0.1.4"; - sha256 = "c67e731bc9e7f3882e33609c3d9ec97b4e9bbd2f95cd882926acfb621970384d"; + sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types ]; @@ -40028,7 +42111,7 @@ self: { mkDerivation { pname = "cipher-rc5"; version = "0.1.0.2"; - sha256 = "ad060a752c1b4965e0a8165ddbedaeb28b0e224995de4a2a7fb49263b1873451"; + sha256 = "0l9lhyqn74mlgwm4mplm94i0x2xjmvnxnp8nm3h6aj8v5ishl1md"; libraryHaskellDepends = [ base split ]; homepage = "http://github.com/fegu/cipher-rc5"; description = "Pure RC5 implementation"; @@ -40040,7 +42123,7 @@ self: { mkDerivation { pname = "ciphersaber2"; version = "0.1.1.2"; - sha256 = "d64c809fff4312d71cf93b462c76a4f23b763d95b70d305b1091f3d5d240efb3"; + sha256 = "1czg839dbwwi21dk03dpjlypcfzjliv2qiivz4fdf4j3zygq0k6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring ]; @@ -40055,7 +42138,7 @@ self: { mkDerivation { pname = "circ"; version = "0.0.4"; - sha256 = "ccce2238cb77669521e3a1252b917361f9b0242e2c7e0368038145ece53c7558"; + sha256 = "0n3m7kjyqic10dl06zic5qjb1yb1ff8jn9d1wchrarkprcw25knc"; libraryHaskellDepends = [ base directory mtl ]; description = "A Compiler IR Compiler"; license = stdenv.lib.licenses.bsd3; @@ -40065,8 +42148,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "circle-packing"; - version = "0.1.0.5"; - sha256 = "041ad1ce696a66f747bb4c65102387cd15b7b026a4b1462d19b341733c2f5c9f"; + 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; @@ -40080,7 +42163,7 @@ self: { mkDerivation { pname = "circlehs"; version = "0.0.3"; - sha256 = "aa5906bc29992227953845a4b39da6e3faf78a4520d5a85b2e0266daa0013ecf"; + sha256 = "1kry06hdlrh25rdsim908n5ggyp3lsfv792572ajf8lr56y0cnda"; libraryHaskellDepends = [ aeson base http-client http-client-tls mtl servant servant-client text time transformers unordered-containers @@ -40096,7 +42179,7 @@ self: { mkDerivation { pname = "cirru-parser"; version = "0.0.2"; - sha256 = "3ff792385f4b0362b3454186f5ae891b649b67e5a527a294cefd27be32621687"; + sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz"; libraryHaskellDepends = [ aeson base text vector ]; homepage = "https://github.com/Cirru/parser.hs"; description = "Cirru Parser in Haskell"; @@ -40112,7 +42195,7 @@ self: { mkDerivation { pname = "citation-resolve"; version = "0.4.3"; - sha256 = "34c01af0f429736013c520721da0ca038575079256c03e08b4e14fa80f0da6f4"; + sha256 = "1x561l7shkz1nh43xh2nj83pb183rah1swi0ql9n0wr9ykq1mh1l"; libraryHaskellDepends = [ aeson base bytestring citeproc-hs containers curl data-default directory download-curl either lens mtl process safe text @@ -40135,7 +42218,7 @@ self: { mkDerivation { pname = "citeproc-hs"; version = "0.3.10"; - sha256 = "1928db4f4c00f6722281f25171fc58412ec74c5e42adfc901a33a20dd10e65b9"; + sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r"; libraryHaskellDepends = [ base bytestring containers directory filepath hexpat hs-bibutils HTTP json mtl network network-uri old-locale pandoc-types parsec @@ -40155,7 +42238,7 @@ self: { mkDerivation { pname = "citeproc-hs-pandoc-filter"; version = "0.1"; - sha256 = "d276c62b696b8d70dd5e7c3a5de94d0a554b708523f4937b6f78770f2aaf9acf"; + sha256 = "1kwsmwm0yxvqdxxr7x13hmq4nm8a9plmsfkwbvfp13bbd4mwcxnj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40175,7 +42258,7 @@ self: { mkDerivation { pname = "cityhash"; version = "0.3.0.1"; - sha256 = "26f6b94f21f530fce2e4772de0d2ecad159d4cb6b5144ea17f536abb33d620db"; + sha256 = "1nr0sqrvnsjkgyhlw55mnr69s5ddxk9f0bbpwkigqc7m457vkxi6"; libraryHaskellDepends = [ base bytestring largeword ]; testHaskellDepends = [ base bytestring largeword QuickCheck test-framework @@ -40186,6 +42269,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cj-token" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, containers, either + , hspec, jwt, QuickCheck, text, text-conversions, time + }: + mkDerivation { + pname = "cj-token"; + version = "0.0.1"; + sha256 = "0s65q242fn19bjx2alk1bx34sy19bq118qzxl3wngldn1gn6idvm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring containers either jwt text + text-conversions time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hspec jwt QuickCheck text text-conversions time + ]; + description = "A new Haskeleton package"; + license = stdenv.lib.licenses.isc; + }) {}; + "cjk" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, text , text-icu @@ -40193,7 +42298,7 @@ self: { mkDerivation { pname = "cjk"; version = "0.1.0.1"; - sha256 = "742732f475e8842168cf8d4ad69e292e1c9538bd297cec2a980c4ebcc7e019e4"; + sha256 = "1r0rw33vqkhck0mfqz19plw9a71f56gdcjldrxl23178fps349vl"; libraryHaskellDepends = [ attoparsec base bytestring containers text text-icu ]; @@ -40211,7 +42316,7 @@ self: { mkDerivation { pname = "clac"; version = "0.5.0"; - sha256 = "48f9a94ed851f59143a5a143662c12e763cdbcd46a72f2a6f04257a2ea804aaa"; + sha256 = "1ajah3ma4ms2y2kg4wkasjycsqz728n6chx1lm1r3xaiv17akya8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40233,8 +42338,8 @@ self: { }: mkDerivation { pname = "clafer"; - version = "0.4.4"; - sha256 = "285e0dc889526f37f7bcc6418699b5465c269a9e6cb17a9219405089c644f21f"; + version = "0.4.5"; + sha256 = "1llr7mnlh8msn9plgnnj73w3jqlcwn8v9k2m58520l9q2zfvf68b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40267,8 +42372,8 @@ self: { }: mkDerivation { pname = "claferIG"; - version = "0.4.4"; - sha256 = "7eecfddae7d82ba90fba1e68ab19513f5eb056ed3741f6b577b5b41d8728eeb4"; + version = "0.4.5"; + sha256 = "1jv1bl9fzbahhk0g64n611h9hipkr4zcasj2dw5w5v2nqlwrwdjj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40298,8 +42403,8 @@ self: { }: mkDerivation { pname = "claferwiki"; - version = "0.4.4"; - sha256 = "993d093d554939dd4570ce7d54df818b5c249f7434c90d68d89f5e537dbff028"; + version = "0.4.5"; + sha256 = "0rjppdxxzaf3898jklq4c0b7zjnkg6zcqr5nxbrabmvm2l53a4p0"; libraryHaskellDepends = [ base clafer containers directory gitit MissingH mtl network network-uri process SHA split time transformers transformers-compat @@ -40319,7 +42424,7 @@ self: { mkDerivation { pname = "clang-pure"; version = "0.2.0.2"; - sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c"; + sha256 = "0k30w0hdvhvdbv03jjs0284639njlcs60fljfffskmpslcxqzm7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40337,7 +42442,7 @@ self: { mkDerivation { pname = "clanki"; version = "1.2.7"; - sha256 = "f28d13ff92d1bf4a556009c207f39c9c8e12573930f93941121efc5e329e2576"; + sha256 = "0xi5kqr5xz0y290kky9h75bi53lwkkrhghh9c1almgyijbzi73gj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40356,7 +42461,7 @@ self: { mkDerivation { pname = "clarifai"; version = "0.2.0.0"; - sha256 = "4a382f92c21d1571861ddb557f721edce63c9b356960ea74a779175e13c41d2d"; + sha256 = "0b8xqh9mw5vrlxsflq396ndkrrnw3rr7ymfv3n37258xqa92yf2a"; libraryHaskellDepends = [ aeson base bytestring containers easy-file HTTP http-client lens lens-aeson scientific text unordered-containers vector wreq @@ -40375,7 +42480,7 @@ self: { mkDerivation { pname = "clash"; version = "0.1.3.11"; - sha256 = "1dfa7702639d1261a49934cad944272a094a30f099faacda2e77fbe3cd83ed10"; + sha256 = "047dhg6y7yvp5vdarylry0q4l29a4x2dkjilk6j624lxcc17gyhx"; libraryHaskellDepends = [ base containers data-accessor data-accessor-template directory filepath ghc haskell98 pretty prettyclass template-haskell tfp @@ -40398,11 +42503,13 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.7.0.1"; - sha256 = "74ccedf030ca1ee3c09c51b6e9fbb7caef4693f1ae0610694d03b9398d9ced56"; - isLibrary = false; + version = "0.7.2"; + sha256 = "1fjimvj07mc8d8z6i9sl9ifyvcil262p53bz6gap833jrirqd3yh"; + revision = "1"; + editedCabalFile = "1np4zs8bqdvzlls8c8zpiwqq91bvx2aiz7qpvza0fzdvc0df2cmj"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ array base bifunctors bytestring clash-lib clash-prelude clash-systemverilog clash-verilog clash-vhdl containers deepseq directory filepath ghc ghc-boot ghc-typelits-extra @@ -40410,6 +42517,7 @@ self: { haskeline lens mtl process text time transformers unbound-generics uniplate unix unordered-containers ]; + executableHaskellDepends = [ base ]; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; @@ -40426,8 +42534,10 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.7"; - sha256 = "867a976ec5a436e953cd342ee3cff0fbeb54d32fb412ae5cade43bcb80aaab96"; + version = "0.7.1"; + sha256 = "1mml3f10mdirlihjnbzjh3jjnmvgcqfqs16k22a13m8pd4whcw88"; + revision = "2"; + editedCabalFile = "1b8d63wisrizirkyrl58840bfnknjy049sm43zhhr9nbw6fn2c51"; libraryHaskellDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers data-binary-ieee754 deepseq directory errors fgl @@ -40442,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 = "84da3f9ea59db5e2594d6c207aa8be6219331c7cfa08415e791af1f65ebf6941"; - 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; @@ -40457,18 +42571,20 @@ self: { ({ mkDerivation, array, base, constraints, criterion , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, integer-gmp, lens, QuickCheck - , reflection, singletons, template-haskell + , ghc-typelits-natnormalise, half, integer-gmp, lens, QuickCheck + , reflection, singletons, template-haskell, vector }: mkDerivation { pname = "clash-prelude"; - version = "0.11"; - sha256 = "e73490ee73228af3b2a7dca432a226a45bf5d8a52791134a99d4eeb32ac8043a"; + version = "0.11.2"; + sha256 = "1ccbcqkqcq5kyfjfvpkis2z40ishc4yqjjjswfsg92qrklk38wcl"; + revision = "2"; + editedCabalFile = "16ak462j0722lvy8ajn2yv400z9jgv8c3l151pmfwh893q6b0i3l"; libraryHaskellDepends = [ array base constraints data-binary-ieee754 data-default deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection - singletons template-haskell + ghc-typelits-natnormalise half integer-gmp lens QuickCheck + reflection singletons template-haskell vector ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ @@ -40485,7 +42601,7 @@ self: { mkDerivation { pname = "clash-prelude-quickcheck"; version = "0.1.2.1"; - sha256 = "1c1c0e373578e15b04b92bdf2b857192bd855005ce3e2f7436b4572a1ee5c5ba"; + sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w"; libraryHaskellDepends = [ base clash-prelude QuickCheck ]; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; @@ -40498,8 +42614,8 @@ self: { }: mkDerivation { pname = "clash-systemverilog"; - version = "0.7"; - sha256 = "1189f40348bb48d002614c3d9fbed3c228e71ab5a9a33c056256e1e763bf47bb"; + version = "0.7.2"; + sha256 = "056m8ynwq3y11zkkx9nkkmvamnm2m3337vk8lkx90pk96nvdiaiy"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl hashable lens mtl text unordered-containers wl-pprint-text @@ -40516,8 +42632,8 @@ self: { }: mkDerivation { pname = "clash-verilog"; - version = "0.7"; - sha256 = "4a10084bd2333333af2c1616a030c57fb959f73639647ae2b6788d1d5f79e4ef"; + version = "0.7.2"; + sha256 = "09bfrhhiml6m0qssvr18p38ypyxj1zp7vxgci974gd6k597ihi2k"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl hashable lens mtl text unordered-containers wl-pprint-text @@ -40534,8 +42650,8 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.7"; - sha256 = "6fb6c1dfa951021307bf121cb9ed622c3b726c20d2f0b873751fbd9329458af1"; + version = "0.7.2"; + sha256 = "1c63m2gcifak0v38rsmv4j521br84jaspdb193a66957qisvfsvs"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl hashable lens mtl text unordered-containers wl-pprint-text @@ -40551,7 +42667,7 @@ self: { mkDerivation { pname = "classify"; version = "2013.11.6.1"; - sha256 = "997fcd7b96a5148657219106f6af0bee4d07bc6785a12bdd66e42d0cf1f3a40d"; + sha256 = "03d4ygqhqbg4cvfjp8c5cyy0fkgf1fpzc1li45bqc555jrxwszwr"; libraryHaskellDepends = [ base containers mtl ]; description = "Library for classification of media files"; license = stdenv.lib.licenses.publicDomain; @@ -40564,7 +42680,7 @@ self: { mkDerivation { pname = "classy-influxdb-simple"; version = "0.2.1.0"; - sha256 = "75b4a50512fd4d9cc785620b1bd01c683cc6cb8940157b8e871fa89ec7c95961"; + sha256 = "0qarr73rxa0zhy77n5a0i75wcg383k81n2v2hp3rqkgx282sbd3m"; libraryHaskellDepends = [ aeson async-io-either base bytestring lens mtl scientific text time vector wreq @@ -40581,7 +42697,7 @@ self: { mkDerivation { pname = "classy-parallel"; version = "0.1.0.0"; - sha256 = "3b0887ff82ea1d20426f0eba6dd23827ee1655790a0e322e619f3bf1ce98d16d"; + sha256 = "0vfik37g2fwzc4p343hag5aidvi77396vfhfdx1207gahbzqf21v"; libraryHaskellDepends = [ base lifted-base monad-control parallel resourcet transformers ]; @@ -40591,38 +42707,6 @@ self: { }) {}; "classy-prelude" = callPackage - ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim - , hashable, hspec, lifted-async, lifted-base, monad-unlift - , mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, safe-exceptions, say - , semigroups, stm, stm-chans, text, time, time-locale-compat - , transformers, transformers-base, unordered-containers, vector - , vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "1.2.0"; - sha256 = "74ca864563ae2b6e048f86ec3be256192e81d12fbef0723d2aa2ee3d1d71fd70"; - libraryHaskellDepends = [ - async base basic-prelude bifunctors bytestring chunked-data - containers deepseq dlist exceptions ghc-prim hashable lifted-async - lifted-base monad-unlift mono-traversable - mono-traversable-instances mtl mutable-containers primitive - safe-exceptions say semigroups stm stm-chans text time - time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude_1_2_0_1" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift @@ -40635,7 +42719,7 @@ self: { mkDerivation { pname = "classy-prelude"; version = "1.2.0.1"; - sha256 = "a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34"; + sha256 = "0d7s3z4vbp2pq696m0yc1ccd51d3qvz7f50ya7xijfx7771y0zm4"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -40662,7 +42746,7 @@ self: { mkDerivation { pname = "classy-prelude-conduit"; version = "1.2.0"; - sha256 = "24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f"; + sha256 = "0zzc6095205qf58qnnagfnb90svlc0m4hw2q79kd4x6d8b80s294"; libraryHaskellDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet transformers void @@ -40684,7 +42768,7 @@ self: { mkDerivation { pname = "classy-prelude-yesod"; version = "1.2.0"; - sha256 = "01cfe84ab5de0b803dc68a2bee5f5bfa4b9daf948974113ef9af9dd99c003fd5"; + sha256 = "1m9z02fdk7dgz4z12x49jjprsjzsbdgywawaqqyq02yynm5fikq1"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -40701,7 +42785,7 @@ self: { mkDerivation { pname = "classyplate"; version = "0.3.0.0"; - sha256 = "a422c975aa2e1fd56ad44261f45023d555a777a81bee672de547c7b7ff7c4bc6"; + sha256 = "1ijbgkzvgis7wlnngvhvm1vsfmfm4d8g8qa2simda7rfm9swj8m4"; libraryHaskellDepends = [ base template-haskell type-list ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; @@ -40711,8 +42795,8 @@ self: { ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { pname = "clay"; - version = "0.12.1"; - sha256 = "ede3726dd63325e491fec82490929f2d084442290251f4b978293df1e42b867a"; + version = "0.12.2"; + sha256 = "12p9hrky0dynsraz46ddhr4ah5aw9kragvcd5xza7j388ni9b2za"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-expectations mtl text ]; homepage = "http://fvisser.nl/clay"; @@ -40736,7 +42820,7 @@ self: { mkDerivation { pname = "clckwrks"; version = "0.24.0.3"; - sha256 = "aeeaf7c0275295ae45d21721fe9a454ab9fa67991495849eff076344b84a1eb0"; + sha256 = "1c0y9aw48qq7zyg8958lk5kzmfaa8ndgw88ps92sx5aj4z0ggsmf"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -40762,7 +42846,7 @@ self: { mkDerivation { pname = "clckwrks-cli"; version = "0.2.17.1"; - sha256 = "d3f5546425c363b8d25d9d5060839431176829c017994709fc0060868ced25ea"; + sha256 = "1si5xn68cq00zh4lg68pq0lnh5rijj1n0l4xbp9bhqy34mj59xfk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40782,7 +42866,7 @@ self: { mkDerivation { pname = "clckwrks-dot-com"; version = "0.3.11"; - sha256 = "009c6533f3aea2d73d07ce2b9e0f6e94cd86de9802000a1200c0e31492e66938"; + sha256 = "0f39ws919qy00090l002k3g8dkcldq7rwayf0wyxg8mfycrnb700"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40808,7 +42892,7 @@ self: { mkDerivation { pname = "clckwrks-plugin-bugs"; version = "0.7.5"; - sha256 = "db1da270750e2327e15b28a0f29d6b51e42844e91d5af102e6082e8de68e4451"; + sha256 = "0la4ivk8sbh8wq1g2nhxx522ir2idffz5818bghjf8qffmqa47fv"; libraryHaskellDepends = [ acid-state attoparsec base cereal clckwrks clckwrks-plugin-page containers directory filepath happstack-authenticate happstack-hsp @@ -40833,7 +42917,7 @@ self: { mkDerivation { pname = "clckwrks-plugin-ircbot"; version = "0.6.17.2"; - sha256 = "683b9db965858f5ff428175e7d3e0e3822278a182fb1d96aec727d7132a00a2b"; + sha256 = "0aqal0r72zbjximdkc9g3252f8iq1qz7sphp53s5z3w5cnwrsfv8"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks containers directory filepath happstack-hsp happstack-server hsp @@ -40857,7 +42941,7 @@ self: { mkDerivation { pname = "clckwrks-plugin-media"; version = "0.6.16.3"; - sha256 = "26f77337fa1e9c429462f49616432b2bace533cced64961f32761abe7d9054cf"; + sha256 = "1kslj1yvw6kn68grcr7drhrybb1b5d1id5plcaa4570yz8vp7xr6"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -40882,7 +42966,7 @@ self: { mkDerivation { pname = "clckwrks-plugin-page"; version = "0.4.3.9"; - sha256 = "4e3095f11f8b627cb74779aaa7356a5a19ed6ce9eade1af741e7417aab4b43e4"; + sha256 = "1r239fmplhg787vimppax5nfs6asd8ssgakr8yvpqqlb3zqrac2f"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -40904,7 +42988,7 @@ self: { mkDerivation { pname = "clckwrks-theme-bootstrap"; version = "0.4.2.1"; - sha256 = "44c1fda59c72b807c4abe63d19c98de1b0523d78dd3392bb68064dd3f18878d6"; + sha256 = "1mkqi3qx6k86d2xr4cyxg0ym5c71ip4ijgg6mg20gf3jkjjzvha4"; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins @@ -40922,7 +43006,7 @@ self: { mkDerivation { pname = "clckwrks-theme-clckwrks"; version = "0.5.2.1"; - sha256 = "67ea142d0d66357957589bfa29148398799b1771452dd706b9f73a75ced6f392"; + sha256 = "14pksv77afppp43dfba5f4brnycqhca2kylvb1bpjdb61lni9sk7"; libraryHaskellDepends = [ base clckwrks containers happstack-authenticate hsp hsx2hs mtl text web-plugins @@ -40938,7 +43022,7 @@ self: { mkDerivation { pname = "clckwrks-theme-geo-bootstrap"; version = "0.1.1"; - sha256 = "f3a816c8ef4259d1931789814c39ef6411d2aa80bf97e568b1008cdfe099b1e3"; + sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k"; libraryHaskellDepends = [ base clckwrks hsp text ]; homepage = "http://divshot.github.com/geo-bootstrap/"; description = "geo bootstrap based template for clckwrks"; @@ -40951,9 +43035,9 @@ self: { mkDerivation { pname = "cld2"; version = "0.1.0.1"; - sha256 = "0d8e9a77b80fc40e160fcfb04c55265444c34f7f7ded41e6d8ef04573cb8523b"; + sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd"; revision = "1"; - editedCabalFile = "60506ceb359329f803a733a06f9a6060a31cab7e86dd4a8e3fd843953cb4cfbd"; + editedCabalFile = "1gfgnhy9ahyq7y74mpc6gsmir8v0c2d6z81klw1zhack6pmnql30"; libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; @@ -40965,8 +43049,8 @@ self: { }: mkDerivation { pname = "clean-home"; - version = "0.0.4"; - sha256 = "42307b2fdcf750a64cae131845e39964a47adb1e1b16ba19497f4ab907250969"; + version = "0.0.5"; + sha256 = "1c6gn0rkb3c92hgc1blkbf21s62j1r7vqs2p8mmr6my5g52lvif1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40983,7 +43067,7 @@ self: { mkDerivation { pname = "clean-unions"; version = "0.1.1"; - sha256 = "4144d228eac2d94e6079c441b619ce901d8d05f3cc4730f9574c3ea34b908cf8"; + sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/fumieval/clean-unions"; description = "Open unions without need for Typeable"; @@ -40998,7 +43082,7 @@ self: { mkDerivation { pname = "cless"; version = "0.3.0.0"; - sha256 = "0f06437973de1c36c1ac2472091a69c2684db40ba12f881592f1f08e8584629b"; + sha256 = "16v2hj2qxw7ij8aqhbx11fs4ss62d4d0jwi4mk0kc76yfdwl61hg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41016,7 +43100,7 @@ self: { mkDerivation { pname = "clevercss"; version = "0.2.4"; - sha256 = "d47eaabad3d4bf7a1ef7d852c4171ae905a49b013f04d60e39c0043952fbcc5a"; + sha256 = "0nnczd93j160747dc11z06ds81g938bw8lnqywg7mgylsfxalznl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl parsec ]; @@ -41034,7 +43118,7 @@ self: { mkDerivation { pname = "cli"; version = "0.1.2"; - sha256 = "580a31fc25eb988dbb5ad3aebfb72d49f089cbee9693edf78dae722b2fde4acb"; + sha256 = "1jsavqpjnwmfipvyv4wnxv5qkw295nvvzbnkbaxqv67b4py322jq"; libraryHaskellDepends = [ base mtl terminfo transformers ]; testHaskellDepends = [ base directory QuickCheck tasty tasty-quickcheck transformers @@ -41051,7 +43135,7 @@ self: { mkDerivation { pname = "cli-builder"; version = "0.1.0"; - sha256 = "0a72dbaa461d913c4cb8e0315d00148e9106da9558281bf803b3fbad33ad24e5"; + sha256 = "1r94mlrsvyxk0gw1na2qjpd0d4cf2h05scg0p163r48x8smdnwha"; libraryHaskellDepends = [ base either exceptions optparse-applicative transformers ]; @@ -41069,7 +43153,7 @@ self: { mkDerivation { pname = "click-clack"; version = "1.0.1"; - sha256 = "a8359ffc25bb582b231eccc5c1fa0cdb5ba6dd50f89685b9e21d0b14016efb59"; + sha256 = "0ngvdq0i82qxwawqb5pqa3fscnyv1kxc3ifc3qijnn5v4py9ydd8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41090,7 +43174,7 @@ self: { mkDerivation { pname = "clientsession"; version = "0.9.1.2"; - sha256 = "5915adc4de26d2a8b03f1a445bac0b0f5d10a5b0380a4eed71b79a20a727d068"; + sha256 = "0s6h4ykj16mpf7nlw2iqn2ji0p8g1fn5ni0s7yqaili6vv2as5ar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41114,7 +43198,7 @@ self: { mkDerivation { pname = "clif"; version = "0.1.0.0"; - sha256 = "5c39d33787674c4452fab56f8166920525254e0dd095bdd64e3e51a97285d9c6"; + sha256 = "1inrhmrajl9y9vbbv5fh1m72a985j9k82vxmz9948k37hwvx6faw"; libraryHaskellDepends = [ base containers QuickCheck ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th @@ -41135,7 +43219,7 @@ self: { mkDerivation { pname = "clifford"; version = "0.1.0.14"; - sha256 = "99e4e4e2cfb64d47ea4b90e23422cdd654a975d11f1e23886819466014dfbd03"; + sha256 = "00xxvwa60ihrd24267hzs5ssjm6nrli39qlh9gm4fkdnrzif9r4r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41164,7 +43248,7 @@ self: { mkDerivation { pname = "clippard"; version = "0.1.1"; - sha256 = "6814350ec951b207741ab17a8a5011e2ff1fa0691b97fe3c897bd21c8f381162"; + sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538"; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/Raynes/clippard"; description = "A simple Haskell library for copying text to the clipboard in a cross-platform way"; @@ -41177,7 +43261,7 @@ self: { mkDerivation { pname = "clipper"; version = "0.0.1"; - sha256 = "20dbc176eeacd3514d1f3d32fe24159c9a3ae19553a8db67561ea47040439668"; + sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/chetant/clipper"; description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)"; @@ -41193,7 +43277,7 @@ self: { mkDerivation { pname = "clippings"; version = "0.2.0"; - sha256 = "8562481c8ba001b6c401d6ebfacd458fe44b19676ce8bd2e8694cd45cf825bdb"; + sha256 = "1nsvhb7lbkclhqpbvs3ccwclpr4g8p6zmsyn072bc0d0icf4hql5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41215,7 +43299,9 @@ self: { mkDerivation { pname = "clist"; version = "0.1.0.0"; - sha256 = "eddf07964751b51550c5197f39cc772418b0fa7d2ad6cf762af589ce9bd973cb"; + sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd"; + revision = "1"; + editedCabalFile = "00lxh1v7dcylvm62a2bgzncfcla0b4l1nkhx8q1m3201fzwba22m"; libraryHaskellDepends = [ base base-unicode-symbols peano ]; homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; @@ -41224,21 +43310,21 @@ self: { }) {}; "clit" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base + ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base , bytestring, data-default, directory, http-client, http-client-tls , http-types, lens, megaparsec, MissingH, optparse-applicative , split, text }: mkDerivation { pname = "clit"; - version = "0.3.1.0"; - sha256 = "1e8f6dfb1c868b979722ec855b8b75165a61bf41a210a2c29a408573c9bc8085"; + version = "0.4.0.6"; + sha256 = "14rl2sq1i0y8myhczs84mfyn7qcw7np63x6fv2krz6w24nakyih9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint authenticate-oauth base bytestring - data-default directory http-client http-client-tls http-types lens - megaparsec MissingH optparse-applicative split text + ansi-wl-pprint authenticate-oauth base bytestring data-default + directory http-client http-client-tls http-types lens megaparsec + MissingH optparse-applicative split text ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; @@ -41253,7 +43339,7 @@ self: { mkDerivation { pname = "cloben"; version = "0.1.0.3"; - sha256 = "c2b7d36c7ad47ed45c1b7328da1f0d6d22727134eab7a2bd3447815b2ed0f3db"; + sha256 = "1nzks0p5p0a76jys5dza6iqp48kd1lgxla3k3dfd8znlg9nd7dy2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41270,7 +43356,7 @@ self: { mkDerivation { pname = "clock"; version = "0.7.2"; - sha256 = "886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f"; + sha256 = "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/corsis/clock"; @@ -41283,7 +43369,7 @@ self: { mkDerivation { pname = "clock-extras"; version = "0.1.0.2"; - sha256 = "a9ed097aa9d48b53c6a555bc5f67e347249b08e2252dd4fc998fb4ab42edda59"; + sha256 = "0nfsxm1apd4gk7yd8b95w849n927wdkmzg2mlp3572ylm5x0kvd9"; libraryHaskellDepends = [ base clock ]; testHaskellDepends = [ base hspec ]; description = "A couple functions that probably should be in the 'clock' package"; @@ -41297,7 +43383,7 @@ self: { mkDerivation { pname = "clocked"; version = "0.4.1.3"; - sha256 = "287272104ea5944b9c3c89178e5995838f61cceb31ab0319a77f1ca5a32536fd"; + sha256 = "1z9n4nisa73zlwch7arixg6633w3jmcqw5w97jf4p5559q874wi8"; libraryHaskellDepends = [ base clock containers MonadCatchIO-transformers transformers ]; @@ -41315,7 +43401,7 @@ self: { mkDerivation { pname = "clogparse"; version = "0.2"; - sha256 = "7d65bfde034f16b9064d997fe9cecbeedafab85a06d5cebad85e726222cfc59e"; + sha256 = "17n5rwi64wjyv2xcxm86bawgmnpfrg7fjzwr9l3bj5jg0ggbyrbx"; libraryHaskellDepends = [ attoparsec base bytestring filepath text time timezone-olson timezone-series @@ -41333,7 +43419,7 @@ self: { mkDerivation { pname = "clone-all"; version = "0.1.0.0"; - sha256 = "09dc42cceff97d531fffaab5b223a06d4655f6ce985e7a74e4e1becb310b2ed6"; + sha256 = "1mif1cqwpgp1wis7lplqrvv5aikdl0iv5ddazwgm6zgrxz645p09"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41351,7 +43437,7 @@ self: { mkDerivation { pname = "closure"; version = "0.1.0.0"; - sha256 = "8ecb1fa2557e86907512f65e4fdbd37ca772186d7421888a7801c82bf9a42cfd"; + sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf"; libraryHaskellDepends = [ base hashable unordered-containers ]; homepage = "http://github.com/tel/closure"; description = "Depth- and breadth-first set closures"; @@ -41369,7 +43455,7 @@ self: { mkDerivation { pname = "cloud-haskell"; version = "0.3.0.0"; - sha256 = "d7ca57607e3f802eea1c86efbcf8e7805281ec716bc5cfc5758ea0ddedab48e7"; + sha256 = "1rs8mgnxv84ffp2wzibbf7n82ll0wzwbrvw63km2x01zgrh5gjnp"; libraryHaskellDepends = [ distributed-process distributed-process-async distributed-process-client-server distributed-process-execution @@ -41384,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 @@ -41391,7 +43504,7 @@ self: { mkDerivation { pname = "cloudfront-signer"; version = "0.0.0.1"; - sha256 = "9f7b834f9b4bace4c3bbaa12fbdf209acea1106f84b6c388d43d074116cd72c6"; + sha256 = "1ikjrlb421rxsj4c7dl4dw8a3kls43gzn4mapg1y9b2bkd7q6ywz"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-bytestring bytestring crypto-pubkey-types old-locale RSA time @@ -41402,6 +43515,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cloudi" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , network, time, unix, zlib + }: + mkDerivation { + pname = "cloudi"; + version = "1.7.1"; + sha256 = "12kk359wfkwsc62bb6f0ak5gzkwdw4gmcfmj9ryqrjcc2irlnbk1"; + libraryHaskellDepends = [ + array base binary bytestring containers network time unix zlib + ]; + homepage = "https://github.com/CloudI/cloudi_api_haskell"; + description = "Haskell CloudI API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cloudyfs" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , datetime, filepath, HFuse, HTTP, regex-base, regex-tdfa, tagsoup @@ -41410,7 +43540,7 @@ self: { mkDerivation { pname = "cloudyfs"; version = "0.0.2"; - sha256 = "8fd3c25a498606ae5739051ba43cf26453c7635de5688c77b87ebc09061adb49"; + sha256 = "0jfv3830kg3yp1vqqs75bmiwflv4y8ya86q575bsw1l695dc5lwg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41423,12 +43553,117 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clr-bindings" = callPackage + ({ mkDerivation, base, clr-host, clr-marshal, clr-typed, pipes + , template-haskell, text + }: + mkDerivation { + pname = "clr-bindings"; + version = "0.1.0.0"; + sha256 = "1rqj81bzqhfz32sf6yningzpd4xp32myknnv0c1vbzkz19cklma1"; + libraryHaskellDepends = [ + base clr-host clr-marshal clr-typed pipes template-haskell text + ]; + testHaskellDepends = [ base ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-bindings"; + description = "Glue between clr-host and clr-typed"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clr-host" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, file-embed + , filepath, glib, mono, transformers + }: + mkDerivation { + pname = "clr-host"; + version = "0.1.0.0"; + sha256 = "1pci1za3vsz77bib5vpwy8ayj89271nbkmg2rpgdkl4aclq3wzaw"; + revision = "1"; + editedCabalFile = "05g7njrwd3wih0ypp4x32mgfpr81f8pir58c7g7hqmnn839k2c89"; + setupHaskellDepends = [ + base Cabal directory filepath transformers + ]; + libraryHaskellDepends = [ base bytestring file-embed ]; + librarySystemDepends = [ glib mono ]; + testHaskellDepends = [ base ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; + description = "Hosting the Common Language Runtime"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + + "clr-inline" = callPackage + ({ mkDerivation, base, bytestring, Cabal, clr-host, clr-marshal + , containers, criterion, directory, extra, filepath, here, hspec + , lens, process, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "clr-inline"; + version = "0.1.0.0"; + sha256 = "0f9ksnc072li1mpnj024pric8hr526rdnag3x1p30x3xffp92i5l"; + libraryHaskellDepends = [ + base bytestring Cabal clr-host clr-marshal containers directory + extra filepath here lens process template-haskell temporary text + transformers + ]; + testHaskellDepends = [ base hspec text ]; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell"; + description = "Quasiquoters for inline C# and F#"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clr-marshal" = callPackage + ({ mkDerivation, base, clr-host, text }: + mkDerivation { + pname = "clr-marshal"; + version = "0.1.0.0"; + sha256 = "17cphaxqz4m29iid409zqrfypawxs4khmh643vi2s7m704hcf3jk"; + libraryHaskellDepends = [ base clr-host text ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal"; + description = "Marshaling for the clr"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "clr-typed" = callPackage + ({ mkDerivation, base, clr-marshal, ghc-prim, text, tuple }: + mkDerivation { + pname = "clr-typed"; + version = "0.1.0.0"; + sha256 = "07qi8g7lh8h9lph088p5zx4qjp6na1239pwjr5s8lgiq069gmn99"; + revision = "1"; + editedCabalFile = "02fsha9hir0yqnn9b9dgpg345313n660j9mhdmsya0r3k8fhmn2b"; + libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ]; + testHaskellDepends = [ base ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-typed"; + description = "A strongly typed Haskell interface to the CLR type system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clr-win-linker" = callPackage + ({ mkDerivation, base, directory, pipes, pipes-safe, process }: + mkDerivation { + pname = "clr-win-linker"; + version = "0.1.0.0"; + sha256 = "10p4f2ql7yj7cpvjmhmyk6y00h7jb4lb53qqbj3bc7ip4m6y346v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory pipes pipes-safe process + ]; + homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/utils/clr-win-linker"; + description = "A GHC linker wrapper tool to workaround a GHC >8.2 bug"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cltw" = callPackage ({ mkDerivation, base, curl, mtl, random, tagsoup }: mkDerivation { pname = "cltw"; version = "1.1.4"; - sha256 = "09936f4cb9fc0a309ae1e3fb28477d6d236a14fac4ead92ee8bb3e8b18d4d122"; + sha256 = "08nishc8ngmvx0pdksn4z8a6l8vdgm3jiyz3w6d302pwp566z4q9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base curl mtl random tagsoup ]; @@ -41444,7 +43679,7 @@ self: { mkDerivation { pname = "clua"; version = "0.3"; - sha256 = "7b0fbab3f4ff823243e6a2f9a88ef9cf90385fb12104e50eefc8d9b4b4bcf077"; + sha256 = "0xzhpjsb9nf8xw7fa111n5gki46gz67aiyd2wr1k50pzyjrvl3vv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41461,7 +43696,7 @@ self: { mkDerivation { pname = "clumpiness"; version = "0.17.0.0"; - sha256 = "fd4b303d206eaf242c779bb65c42256e42220c8497a6bcf3bc59589b9396c495"; + sha256 = "15f4js9rnn2rpkrvr9lphh624hkf4m15rdlvfwn29bvf40yk0jzx"; libraryHaskellDepends = [ base containers tree-fun ]; description = "Calculate the clumpiness of leaf properties in a tree"; license = stdenv.lib.licenses.gpl3; @@ -41472,7 +43707,7 @@ self: { mkDerivation { pname = "cluss"; version = "0.3"; - sha256 = "effd03b754a93b2b3e973e83fb47e961e5a7bfb67002f92d67dff28f9ca8b3e0"; + sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/Kinokkory/cluss"; description = "simple alternative to type classes"; @@ -41489,7 +43724,7 @@ self: { mkDerivation { pname = "clustering"; version = "0.3.1"; - sha256 = "bc69248083d4c7f7ed32b1f0971d18a52414fd0ee8bc1f05fea8e4538fe87f86"; + sha256 = "11kzx27m7r58zq2izg781vyi895530frgw5i6bnzgiylhf028sdw"; libraryHaskellDepends = [ base binary containers matrices mwc-random parallel primitive unordered-containers vector @@ -41513,7 +43748,7 @@ self: { mkDerivation { pname = "clustertools"; version = "0.1.5"; - sha256 = "78eec3a52f3d6e32e955ba9a97462d8aee1378a57becb9601371aa903f76c646"; + sha256 = "0in6fqzr1aki2dhbkv3vlmw17vla5m39g6msaplk4vix5yjw7vkq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41532,7 +43767,7 @@ self: { mkDerivation { pname = "clutterhs"; version = "0.1"; - sha256 = "b423463110ae35991f5612f86ef60cc73e44ca803c388ab197d14b0cd8359455"; + sha256 = "0mcl6pc0qjyijyqqlf1wh3548gn71kv6xy0jaqgrjddf20qlc8xl"; libraryHaskellDepends = [ array base cairo glib gtk haskell98 mtl X11 ]; @@ -41550,7 +43785,7 @@ self: { mkDerivation { pname = "cmaes"; version = "0.2.2.1"; - sha256 = "f5606c1eb628b6c67dd47856bdfea31c5fa70170c7b7070b4a4da730632e1f64"; + sha256 = "0r0z5rik19sd985hgdy7f00sfpqwlgzbsmkqsiywddi8nqg6qq7m"; libraryHaskellDepends = [ base mtl process safe strict syb ]; testHaskellDepends = [ base doctest doctest-prop mtl process random syb vector @@ -41565,8 +43800,8 @@ self: { }: mkDerivation { pname = "cmark"; - version = "0.5.5"; - sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2"; + version = "0.5.5.1"; + sha256 = "03asbd7vnjjnxppvaxz8jinkafh53kqrhp1ji051yq8amgr63d32"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -41583,7 +43818,7 @@ self: { mkDerivation { pname = "cmark-highlight"; version = "0.2.0.0"; - sha256 = "de769cd703d3fcd5d69428477184fad57019db55a71b1315a9bbb54317f0812b"; + sha256 = "0aw1y0bl7ddvm4ai66x7apdijw6mza272ir8jkbdbz6k0gbrqxny"; libraryHaskellDepends = [ base blaze-html cmark highlighting-kate text ]; @@ -41597,7 +43832,7 @@ self: { mkDerivation { pname = "cmark-lucid"; version = "0.1.0.0"; - sha256 = "d2927b9fed0e32fe7afc539e7b427e0a95f8c9297bb6bc531101b476ba8a3c03"; + sha256 = "00rwiax7dd01259vrdkv574zi58agr17p7jkzixgwchfxngpp4nj"; libraryHaskellDepends = [ base cmark lucid ]; homepage = "http://github.com/aelve/cmark-lucid"; description = "Use cmark with Lucid"; @@ -41610,8 +43845,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.1.0.3"; - sha256 = "08cf3bb1bf87e7e9685fb24f3204df7023b0c5f0bfd6d16c950cba3507651441"; + version = "0.2.0.0"; + sha256 = "0xrss1vlbcswk2izpjh34vxnkjaim6pxih00vv13hcarip17qs4f"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -41628,7 +43863,7 @@ self: { mkDerivation { pname = "cmath"; version = "0.3"; - sha256 = "d5b6919c88b1d1726ab4309ed5cc94b09e521e5a1174b069229757ba1e1369c1"; + sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~dons/code/cmath"; description = "A binding to the standard C math library"; @@ -41643,7 +43878,7 @@ self: { mkDerivation { pname = "cmathml3"; version = "0.1"; - sha256 = "cd244f14fc45845d351bdc5a6ba9ece748a11c16779471baa381b945dbc70656"; + sha256 = "0mh6qzdlbfc1lfx7353p2qfa2j77xjlnnnnw3csmv125zha4y96d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41663,7 +43898,7 @@ self: { mkDerivation { pname = "cmd-item"; version = "0.0.1.0"; - sha256 = "c2e0d3628136527fcd418efe51085e94a6a4e703e72b395c47c3363136b05cd1"; + sha256 = "1lawn0v32dn38xf3jaz70gks99llbq453zlf876pylinh5id7q62"; libraryHaskellDepends = [ base containers templater text ]; testHaskellDepends = [ base hspec hspec-laws HUnit QuickCheck quickcheck-instances text @@ -41680,8 +43915,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.14"; - sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58"; + version = "0.10.17"; + sha256 = "1nklhglfa83s9rd8x4j40bvnzdvd81pwdq902sv51mnfyk5a8drl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41699,7 +43934,7 @@ self: { mkDerivation { pname = "cmdargs-browser"; version = "0.1.3"; - sha256 = "a0fd5a45d98723938525f44d1022e09333177c74d06fa7e5a76b627de0160fcc"; + sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41717,7 +43952,7 @@ self: { mkDerivation { pname = "cmdlib"; version = "0.3.6"; - sha256 = "5643d219c371f903c3f877b5955de4ca99a723bc96165f4f629d3e3dbc3fb357"; + sha256 = "0mxk7yy3sglxc97my5lnphisg6fawifrbdbpz31h7ybiqccx4hsn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl split syb transformers ]; @@ -41733,7 +43968,7 @@ self: { mkDerivation { pname = "cmdtheline"; version = "0.2.3"; - sha256 = "042c4f995a8e6e336451d11702f341dbe31d9e6e0b956acd5f92b1d7c9c88bcb"; + sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04"; libraryHaskellDepends = [ base containers directory filepath parsec pretty process transformers @@ -41753,7 +43988,7 @@ self: { mkDerivation { pname = "cml"; version = "0.1.3"; - sha256 = "f096f829721334f460d71d43051eb1ef16deea673e2c93d8787f2aa4c801d5c3"; + sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/cml/"; description = "Events and Channels as in Concurrent ML"; @@ -41765,7 +44000,7 @@ self: { mkDerivation { pname = "cmonad"; version = "0.1.1.1"; - sha256 = "530bb4369dcfac4157d59aee898145a006dfc496ed4a17a12578bcaa2fe44d1d"; + sha256 = "07adwhpsmg3q4nhifjpdjv2dy1m08n0qkvlssmbl3b6gklvb82sk"; libraryHaskellDepends = [ array base ]; description = "A library for C-like programming"; license = stdenv.lib.licenses.bsd3; @@ -41779,7 +44014,7 @@ self: { mkDerivation { pname = "cmph"; version = "0.0.1"; - sha256 = "6308ca284f03d6b6a7cd2664bdab2e503079096a8457d95ff45ac305dfac923c"; + sha256 = "0g4jmkghbhssyigxjmw4d84pjc2h5smvsr16rnkvdmh39wlcl233"; libraryHaskellDepends = [ array base bytestring containers ]; librarySystemDepends = [ cmph ]; testHaskellDepends = [ @@ -41796,7 +44031,7 @@ self: { mkDerivation { pname = "cmu"; version = "1.10"; - sha256 = "fe15496a9c3026924eb54252c93948b5a32925beba265d0a994287b2ae368c7e"; + sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers ]; @@ -41805,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 @@ -41814,7 +44078,7 @@ self: { mkDerivation { pname = "cnc-spec-compiler"; version = "0.2.0.1"; - sha256 = "6009a1d320b1ace68bcea267ef30430c1ea66c3e2816d7911e717d6d3e7dd859"; + sha256 = "0nfqglz6szbi3s8xf5i87rnac7hc8cqfyrx2rs5ydb5i439s22b0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41833,7 +44097,7 @@ self: { mkDerivation { pname = "cndict"; version = "0.8.2"; - sha256 = "17401b89b5f1709df605808daec4147607800beedae79e172bbed794e0cd865d"; + sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p"; libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; @@ -41846,7 +44110,7 @@ self: { mkDerivation { pname = "code-builder"; version = "0.1.3"; - sha256 = "559e47a44cec85a8e95df92e5d2693cacc9761503c30be3b83eaebd95360a4ab"; + sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm"; libraryHaskellDepends = [ base containers ]; description = "Simple system for generating code"; license = stdenv.lib.licenses.bsd3; @@ -41856,8 +44120,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.1.2"; - sha256 = "aef2b0b043767ef28496aa6b8c744db8185492c0d1e94e567a62eb4fdcaa3b09"; + version = "0.1.3"; + sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/code-page"; @@ -41867,23 +44131,24 @@ self: { "codec" = callPackage ({ mkDerivation, aeson, base, binary, binary-bits, bytestring - , data-default-class, mtl, template-haskell, text, transformers - , unordered-containers + , generic-arbitrary, mtl, profunctors, tasty, tasty-quickcheck + , template-haskell, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "codec"; - version = "0.1.1"; - sha256 = "3351aa3747ae92db463706c527d1723c22c34dc280ccd14e530f1ca1555b6c3a"; + version = "0.2.1"; + sha256 = "0a2vqaislh9jwqb5jr59s448456iawc4cs0b1c6dkhq8h6sn3hpz"; libraryHaskellDepends = [ - aeson base binary binary-bits bytestring data-default-class mtl - template-haskell text transformers unordered-containers + aeson base binary binary-bits bytestring mtl profunctors + template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base binary binary-bits bytestring data-default-class mtl - template-haskell text transformers unordered-containers + aeson base binary bytestring generic-arbitrary tasty + tasty-quickcheck ]; homepage = "https://github.com/chpatrick/codec"; - description = "First-class record construction and bidirectional serialization"; + description = "Simple bidirectional serialization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -41895,7 +44160,7 @@ self: { mkDerivation { pname = "codec-libevent"; version = "0.1.2"; - sha256 = "14983b281a62947824c7f6d774852cf8963b1ef711b4f82c395816a37b53679f"; + sha256 = "17v7adxs65jq74ngid0iywg3p5pq5j2p9mznqwj7i53238l3p60l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41916,28 +44181,50 @@ self: { mkDerivation { pname = "codec-mbox"; version = "0.2.0.0"; - sha256 = "94094b42a472016be310aba00f25a8f442231c9820be08539337786a9e39764d"; + sha256 = "0kbn76g6ly1pjd9higi0k0f26hplm0jhz85b23inn0bjli14n2cl"; libraryHaskellDepends = [ base bytestring ]; description = "A library to read and write mailboxes in mbox format"; 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, safe, split + , containers, curl, hpc, HUnit, process, regex-posix, retry, safe + , split }: mkDerivation { pname = "codecov-haskell"; - version = "0.4.0.2"; - sha256 = "5c375baf7257ae6d490964df8169687df9eb1fa98178729d9c714baf62da3b78"; + version = "0.5.0"; + sha256 = "0g9m1z4qpjgyav8wa10cxdprsgf0b5ij430ql7jyw4sj20warhfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cmdargs containers curl hpc safe split + aeson base bytestring cmdargs containers curl hpc retry safe split ]; executableHaskellDepends = [ aeson async base bytestring cmdargs containers curl hpc process - regex-posix safe split + regex-posix retry safe split ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/guillaume-nargeot/codecov-haskell"; @@ -41953,7 +44240,7 @@ self: { mkDerivation { pname = "codemonitor"; version = "0.2"; - sha256 = "ac86edc30a979d975ab16416ce916b0d4015f48b44f6ac032e72f50a4ce35e92"; + sha256 = "14jywd60mxbj5q1srxj4igs1ah0ddf8ww5k4n5d9g7cp1b1yv1mc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41971,9 +44258,9 @@ self: { mkDerivation { pname = "codepad"; version = "0.1"; - sha256 = "215704a914c2006369c63cf6000385b2ece643839a8c0f2398353f46f65a5b0e"; + sha256 = "03jvbbv4cgrmk0ihz34shd1ydv5jhl1h1xiwqrln60622jlh8mr1"; revision = "3"; - editedCabalFile = "6f9d1a534fa6ff720347aa10521a99456aa4b9e2a95b45f71cadb06074277c86"; + editedCabalFile = "11kw4xs61c5d3kvlanx9waws8sj5k4d5445a8w1p5zx69x9im7bg"; libraryHaskellDepends = [ base curl mtl network tagsoup ]; homepage = "http://github.com/chrisdone/codepad"; description = "Submit and retrieve paste output from CodePad.org."; @@ -41982,37 +44269,44 @@ self: { }) {}; "codeworld-api" = callPackage - ({ mkDerivation, base, blank-canvas, mtl, random, text, time }: + ({ mkDerivation, base, blank-canvas, cereal, cereal-text + , containers, hashable, mtl, random, text, time + }: mkDerivation { pname = "codeworld-api"; - version = "0.2.0.0"; - sha256 = "b6a5d936bdc8aa1f18d949102646990eeaaa26647f81e2c58bf92cb18e2ecdb9"; - libraryHaskellDepends = [ base blank-canvas mtl random text time ]; + version = "0.2.1.0"; + sha256 = "0llvmw7p5csjfky4ajmwwkb4k5i2pb1vcpla94y3xydlm8pwpn4i"; + libraryHaskellDepends = [ + base blank-canvas cereal cereal-text containers hashable mtl random + text time + ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codex" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash - , directory, either, filepath, hackage-db, http-client, lens - , machines, machines-directory, MissingH, monad-loops, network - , process, tar, text, transformers, wreq, yaml, zlib + ({ mkDerivation, ascii-progress, base, bytestring, Cabal + , containers, cryptohash, directory, either, filepath, hackage-db + , http-client, lens, machines, machines-directory, MissingH + , monad-loops, network, process, tar, text, transformers, wreq + , yaml, zlib }: mkDerivation { pname = "codex"; - version = "0.5.0.2"; - sha256 = "491064e6cf6b1afc6be30b061f6876b1d9da1ecc769fc74f485853b5bab8d907"; + version = "0.5.1.2"; + sha256 = "0w9m737v3fdgslqdfw16bq7hhsimjazdxrd4r5kzpm0jai39707r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers cryptohash directory either - filepath hackage-db http-client lens machines machines-directory - process tar text transformers wreq yaml zlib + ascii-progress base bytestring Cabal containers cryptohash + directory either filepath hackage-db http-client lens machines + machines-directory process tar text transformers wreq yaml zlib ]; executableHaskellDepends = [ - base bytestring Cabal directory either filepath hackage-db MissingH - monad-loops network process transformers wreq yaml + ascii-progress base bytestring Cabal directory either filepath + hackage-db MissingH monad-loops network process transformers wreq + yaml ]; homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; @@ -42027,7 +44321,7 @@ self: { mkDerivation { pname = "codo-notation"; version = "0.5.2"; - sha256 = "78eb57004541ed29eb4c54196b91ac2dd1028a3315f51cd4dc00debfc0938eaf"; + sha256 = "1bwfjg0bzph0vka1rx8m6f505l9dmj8nn6al9kmjkva18l05gsvq"; libraryHaskellDepends = [ base comonad haskell-src-meta parsec template-haskell uniplate ]; @@ -42040,7 +44334,7 @@ self: { mkDerivation { pname = "cofunctor"; version = "0.1.0.1"; - sha256 = "379110f43cfbabf3f13023390ce69208bb3bd37374f3453578e3277a5898c476"; + sha256 = "0xn4k1c7l9z3g0slbwvlfg9kpfq8jbk0qf9363qz7azv7ks1149p"; libraryHaskellDepends = [ base ]; description = "DEPRECATED: use the \"contravariant\" package"; license = stdenv.lib.licenses.bsd3; @@ -42055,7 +44349,7 @@ self: { mkDerivation { pname = "cognimeta-utils"; version = "0.1.2"; - sha256 = "b4782dabe5db7b382d792bd9332df597d47f125668bdc094031df5d3142e7801"; + sha256 = "00bq5qad7x8x0fac1gb8aq97zm4pylnk7n9bg4nkhyyvwnmjsy5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42082,8 +44376,8 @@ self: { }: mkDerivation { pname = "coin"; - version = "1.2"; - sha256 = "d046c554fbb2111641744507625518b8a3b012fcbe8c7a88e3ce971291f47907"; + version = "1.2.1"; + sha256 = "0076dvka5c0m3smppp58lklnf26ry9kibzyiy4yx1ygw5rn7m7pc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42111,7 +44405,7 @@ self: { mkDerivation { pname = "coinbase-exchange"; version = "0.3.0.0"; - sha256 = "930a8971e2e558f1acfcf7ff545a6ca919ec7e11eb9c9b3fa4c50b94c6c5930b"; + sha256 = "02wkqp3982y5lhzrp77b25zfq6d9did59zzpzjng2n75w9qqj2lk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42137,6 +44431,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "coincident-root-loci" = callPackage + ({ mkDerivation, array, base, combinat, containers, random, tasty + , tasty-hunit, transformers + }: + mkDerivation { + pname = "coincident-root-loci"; + version = "0.2"; + sha256 = "0p6wm5gd57m809cqr0p3hb29drs1q25f539j2pf1cw03hlkahpxh"; + libraryHaskellDepends = [ + array base combinat containers random transformers + ]; + testHaskellDepends = [ + array base combinat containers tasty tasty-hunit + ]; + homepage = "http://code.haskell.org/~bkomuves/"; + description = "Equivariant CSM classes of coincident root loci"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "colada" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores @@ -42145,7 +44458,7 @@ self: { mkDerivation { pname = "colada"; version = "0.8.4.0"; - sha256 = "e34f1a7ce3b421d6a31544f07319948f875b48e3376756d0632a8b0b45ae369a"; + sha256 = "16inmr2hp2racg85crrpwd45p1wgjhcp7w242nixc8dlwdy1lkz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42170,7 +44483,7 @@ self: { mkDerivation { pname = "colchis"; version = "0.2.0.3"; - sha256 = "6be5248e49359254c7818aac0561236743b4c2b5427fa5014e2503726aaf0aba"; + sha256 = "1fhamxm740r59q0sazs2np1b8hv74dhhbb4ah73m94im96729rbb"; libraryHaskellDepends = [ aeson base conceit network network-simple pipes pipes-aeson pipes-attoparsec pipes-network text transformers @@ -42185,7 +44498,7 @@ self: { mkDerivation { pname = "cold-widow"; version = "0.1.2"; - sha256 = "2452aff29af68c8c093ebf492e5e6598a90bac3be64f48c081864dd7c02515e4"; + sha256 = "1r0m4p0dfkc6h704hkz67fn0pacqcmg2wjdz7q4qr37nkbrayli4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -42203,7 +44516,7 @@ self: { mkDerivation { pname = "collada-output"; version = "0.6"; - sha256 = "fdf013f5ef6f765015d55e9afcd870557535da6377ad9b2d9006f4f42515d3cc"; + sha256 = "1k6k2ljz9x06j0nrpbbpcgd3axamf3cgr6jyslam0xkgxzsi7w7x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42221,7 +44534,7 @@ self: { mkDerivation { pname = "collada-types"; version = "0.3"; - sha256 = "88f59074a3d2ed819d809e6bb3955771d64a1432017103391ff25a46fdf0812b"; + sha256 = "0aw1y3ylcnpj3wwh6w8168a4mmkiayav6swyh2fq3vfjlds91xc8"; libraryHaskellDepends = [ base containers enumerable OpenGL tuple tuple-gen vector ]; @@ -42235,7 +44548,7 @@ self: { mkDerivation { pname = "collapse-util"; version = "0.1.0.1"; - sha256 = "47ce281530a3003933483c9e4eeee2320e5ee396c549042383a34a2ed267240b"; + sha256 = "02r4cz92wjm3hcih8jf5jvimw3ijwbp4x7iw90rkj05360ajikj7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -42250,7 +44563,7 @@ self: { mkDerivation { pname = "collection-json"; version = "0.1.0.0"; - sha256 = "8ca99eb2c0a6cb48d7982ba1316d4ef411a38ec9490c3b231e99001dd251f7db"; + sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc"; libraryHaskellDepends = [ aeson base bytestring text ]; homepage = "https://github.com/danchoi/collection-json.hs"; description = "Collection+JSON hypermedia type tools"; @@ -42263,7 +44576,7 @@ self: { mkDerivation { pname = "collections"; version = "0.3.1.1"; - sha256 = "ef3075c5034bf45bafa6c3a1ffda219c25377094c06dd1dc235b722926aab328"; + sha256 = "0a5km8k2jwjv4gfd2vf0jiq3f9cw47dgz8f3lspmpx2b0g2pac7g"; libraryHaskellDepends = [ array base bytestring containers QuickCheck ]; @@ -42277,9 +44590,9 @@ self: { mkDerivation { pname = "collections-api"; version = "1.0.0.0"; - sha256 = "b4dc47ec1552b66e69a465e9f974c8afab914b6a85f8214398969b1daf0efc6d"; + sha256 = "0vgw1spiv6wnk11j3y45d95r3axgr1sgksb5lilnxdjj2pn4gp5l"; revision = "2"; - editedCabalFile = "b497904367aafbe7949dfa846aa34eec27b9ee99bc61ee2f665d48fdf83e7d1c"; + editedCabalFile = "073x7vwgsj2xcqpywqdwk7pbj9zc9sinm17sknafgyxacx1r15xl"; libraryHaskellDepends = [ array base QuickCheck ]; homepage = "http://code.haskell.org/collections/"; description = "API for collection data structures"; @@ -42294,7 +44607,7 @@ self: { mkDerivation { pname = "collections-base-instances"; version = "1.0.0.0"; - sha256 = "f3df97932f34c33d6a26f675dbbe9dd474266f348c3aed9cbd63488dffe5865b"; + sha256 = "0nw6wpzqsj33pnffsflc6ipjcx6lknzdnxgn4rm3vhrl5y9rgpzk"; libraryHaskellDepends = [ array base bytestring collections-api containers ]; @@ -42309,7 +44622,7 @@ self: { mkDerivation { pname = "colock"; version = "0.2.2"; - sha256 = "6175f073e27b7ff981db88b115e338cea54f7360cddb4a9f98219cc1062b7e40"; + sha256 = "0h3y5c3c3711k2glmnydc1rlz9ff73iibcc8vf0zjzvvw9rz0xb1"; libraryHaskellDepends = [ base unix ]; description = "thread-friendly file locks that don't block the entire program"; license = "LGPL"; @@ -42322,7 +44635,7 @@ self: { mkDerivation { pname = "colonnade"; version = "1.1.0"; - sha256 = "e86e90e2eb8e983a0916b8651b248ad9d11202add0cab034f609d5e80923eafc"; + sha256 = "1z7a4c4yim89yqsb1jnhml115lfri8j1nrdq2q4km64fxgi90vp8"; libraryHaskellDepends = [ base bytestring contravariant profunctors text vector ]; @@ -42341,7 +44654,7 @@ self: { mkDerivation { pname = "color-counter"; version = "0.1.2.2"; - sha256 = "39c79b3aa79621505f343c9e5c9f9907a2b50aae385d5f86259ccb94cb96df6f"; + sha256 = "0vyzjv5r9jww4n35yp9qmq5bb8h7k6gmr7iw6igm08cnlwx9pirr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42363,7 +44676,7 @@ self: { mkDerivation { pname = "colorful-monoids"; version = "0.2.1.0"; - sha256 = "426e36c9219ebc19108f0968aee8900bad7642937b5800d6045c5085c2b06532"; + sha256 = "0ck5n318al2w0kb00n3vjd17db8bj3laws09iw81kg4y474kcvj2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/minad/colorful-monoids#readme"; @@ -42376,7 +44689,7 @@ self: { mkDerivation { pname = "colorize-haskell"; version = "1.0.1"; - sha256 = "03764374bd1aed5c63e20517441ccaae7c95cb2fa9e416da952f26be8dba9aec"; + sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base haskell-lexer ]; @@ -42391,7 +44704,7 @@ self: { mkDerivation { pname = "colorless"; version = "0.0.0"; - sha256 = "1ae808ffc4522981fd50833e5384173b72dae3c6b9e609f9dbfa791b625ee22c"; + sha256 = "0b72bri1nygsvgwhkrmrqvixlwiv2y256gl3a3yq2aajqkzhis0s"; libraryHaskellDepends = [ base megaparsec pregame ]; homepage = "http://github.com/jxv/colorless#readme"; description = "Yet another IDL for RPC"; @@ -42403,9 +44716,9 @@ self: { mkDerivation { pname = "colors"; version = "0.3.0.2"; - sha256 = "155ea3ac3cb65482236e4a997706ac431d3edababe6858640827c1cc8bc56d3d"; + sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm"; revision = "1"; - editedCabalFile = "b49946d81e0089d4d80191523839f934802975ede3b9fd9521ead9e591142560"; + editedCabalFile = "0q152j8ybnga46azvfg3xmsjk01lz4wkhlli07cd92803vc4d6dl"; libraryHaskellDepends = [ base lens linear profunctors ]; homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; @@ -42417,13 +44730,26 @@ self: { mkDerivation { pname = "colour"; version = "2.3.3"; - sha256 = "8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2"; + sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd"; libraryHaskellDepends = [ base ]; homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; license = stdenv.lib.licenses.mit; }) {}; + "colour-accelerate" = callPackage + ({ mkDerivation, accelerate, base }: + mkDerivation { + pname = "colour-accelerate"; + version = "0.1.0.0"; + sha256 = "1clcn0ipcrifcxqqb72k1xnga005v1ih79q8164ycsh2hgkdm4ij"; + libraryHaskellDepends = [ accelerate base ]; + homepage = "https://github.com/tmcdonell/colour-accelerate"; + description = "Working with colours in Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colour-space" = callPackage ({ mkDerivation, base, colour, constrained-categories, JuicyPixels , linear, linearmap-category, manifolds, semigroups, vector-space @@ -42431,7 +44757,7 @@ self: { mkDerivation { pname = "colour-space"; version = "0.1.3.0"; - sha256 = "d8e324ce287c9607c0358a70ecc02ee5a1c071661b020dac4a0d674b94b55119"; + sha256 = "06ainna4nrqd9an0s0hvcrqw18g55v0fqw4a6p00g5kw53729qyq"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -42449,7 +44775,7 @@ self: { mkDerivation { pname = "coltrane"; version = "0.1.0.0"; - sha256 = "ca95b5b07c9b17f57798275458234a2fbef341a246b7c4b6bc2a5affa3cb2a8c"; + sha256 = "131arfizyniapjvc9ds6l90z7gig98imhm17k1vza5wvgjqbb5fa"; libraryHaskellDepends = [ base bytestring HTTP http-types HUnit mtl regex-compat text wai wai-extra warp @@ -42465,7 +44791,7 @@ self: { mkDerivation { pname = "com"; version = "1.2.3.1"; - sha256 = "f5085572cd0b0c8f8fdf115fad5c842657e803c70b2ce1c230ee452f87a9dff8"; + sha256 = "1y6zm63jyigf631f2b0bqw1yhmr6hifaspqivy7qy30brmr5a27m"; doHaddock = false; description = "Haskell COM support library"; license = stdenv.lib.licenses.bsd3; @@ -42479,7 +44805,7 @@ self: { mkDerivation { pname = "combinat"; version = "0.2.8.2"; - sha256 = "d0426b33f1b948f6fbe2a396ff1cabfb3acf6072ab27fffaeebc47140a9af044"; + sha256 = "0i7hk8518ixwxvxgy9xbf9hcyfpvmcfgz5m3wbxzcj5ry4rnnhnh"; libraryHaskellDepends = [ array base containers random transformers ]; @@ -42500,7 +44826,7 @@ self: { mkDerivation { pname = "combinat-diagrams"; version = "0.2"; - sha256 = "70c8f0126c8c92588a45136f928398e08fc4f4e03f8e8573679328db0d41a94a"; + sha256 = "0jm9846xna4kcxrqb3izw3sc93z0k21r4vqk8n55i4lcdh9g1j3h"; libraryHaskellDepends = [ array base colour combinat containers diagrams-core diagrams-lib linear transformers @@ -42518,7 +44844,7 @@ self: { mkDerivation { pname = "combinator-interactive"; version = "0.1.2"; - sha256 = "84494a9d77282847954e3de8d71fb8023c07ef92ea325c1a81cac83b02f1ad7b"; + sha256 = "0yxdy413pj6ah4d5qcpajbphfg02p0gxgs1x9salfa18fyflljc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42541,7 +44867,7 @@ self: { mkDerivation { pname = "combinatorial-problems"; version = "0.0.5"; - sha256 = "a0a0e700307362308a62c4b8f02ce7d03177380a602162755cdd98284cd471cc"; + sha256 = "1k3isi62i66xbisn48b018w7fcfhwwng1f64ca530qkk600fg850"; libraryHaskellDepends = [ array base bytestring bytestring-lexing containers parsec random ]; @@ -42556,7 +44882,7 @@ self: { mkDerivation { pname = "combinatorics"; version = "0.1.0"; - sha256 = "2af52830c0548d0e6eacd1f762dd1d8ff8b747da4043891be6662bc73c1d2b80"; + sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Efficient computation of common combinatoric functions"; @@ -42570,7 +44896,7 @@ self: { mkDerivation { pname = "combobuffer"; version = "0.2"; - sha256 = "5066b4be6b4b47eec38baefa3c1945ef93cb3541c56b8c6fcfd6f89a588a4dff"; + sha256 = "1zsdi9c9my6nrxpqqsy584swp4zg8lckrymfig1ywisbdfzb8rjh"; libraryHaskellDepends = [ base containers template-haskell vector vector-space ]; @@ -42586,8 +44912,8 @@ self: { }: mkDerivation { pname = "comfort-graph"; - version = "0.0.1"; - sha256 = "81487e3610993d2939bf1777823357095645f710d1bee94dd4dd0fa052b428a0"; + version = "0.0.2"; + sha256 = "0gpvx1c3k30h3rkv02f8lcakbg8h38k2s9hj76ar1xy3i9qw2sgc"; libraryHaskellDepends = [ base containers QuickCheck transformers utility-ht ]; @@ -42600,12 +44926,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "comic" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "comic"; + version = "0"; + sha256 = "00y23pd6pp4siggs0wkf102phi961dyfffbj5wjsvmhlg2nv5hg3"; + libraryHaskellDepends = [ aeson base text ]; + homepage = "https://oss.xkcd.com/"; + description = "A format for describing comics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comma" = callPackage ({ mkDerivation, attoparsec, base, QuickCheck, text }: mkDerivation { pname = "comma"; version = "1.1.0"; - sha256 = "fec0b23d79c39f3d19660dd2c7652c868de64590f8a9efe0115ab4b08b33befb"; + sha256 = "1yxy6f5v1d2s27hfzagqj12yd3c65ijwglhdcqckv7y3g4yv5h7y"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base QuickCheck text ]; homepage = "https://github.com/lovasko/comma"; @@ -42618,7 +44957,7 @@ self: { mkDerivation { pname = "command"; version = "0.1.1"; - sha256 = "1c0a9bddc3518e08eedb61197389fe7dc53c7927a75dace3466dfc1872894662"; + sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw"; libraryHaskellDepends = [ base deepseq process ]; homepage = "https://github.com/nh2/command"; description = "Conveniently run shell commands"; @@ -42632,7 +44971,7 @@ self: { mkDerivation { pname = "command-qq"; version = "0.3.0.0"; - sha256 = "c5cb03a4123f38620b3bfb6e6d3b737591008cbb58c6e7656a49c9c21e590eaf"; + sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5"; libraryHaskellDepends = [ base process template-haskell text ]; testHaskellDepends = [ base doctest hspec template-haskell text ]; homepage = "http://biegunka.github.io/command-qq/"; @@ -42645,7 +44984,7 @@ self: { mkDerivation { pname = "commander"; version = "0.1.0.0"; - sha256 = "acfa4916071c9b67551c08340af0ef764170c5b64c969e7f1dff8edc0786f425"; + sha256 = "09glhq3xr3pz3mzrx5jcnv2p0hbnxzq0ld083iang6qw0wb4kymc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl transformers ]; @@ -42666,7 +45005,7 @@ self: { mkDerivation { pname = "commodities"; version = "0.2.0.1"; - sha256 = "fa58f2c3c5acf6f14d0079d8cd2d944c6e35c4bd12c128904021094e8c059130"; + sha256 = "0c4i0n64w2918282ih8jpp23avjcjhnwvn3r016z3xmcqp1z4n7s"; libraryHaskellDepends = [ base comonad containers distributive failure keys lens linear mtl numbers parsers PSQueue semigroupoids semigroups split text thyme @@ -42688,7 +45027,7 @@ self: { mkDerivation { pname = "commsec"; version = "0.3.5"; - sha256 = "f5d93bd74020fcdfa3541bf9e0f4096333191f806ba85bc11949546c0eba50d3"; + sha256 = "1lshp876qm29370mpa3bh0gijcv317sf1y8vajixzz1083bkpngm"; libraryHaskellDepends = [ base bytestring cipher-aes128 crypto-api network ]; @@ -42705,7 +45044,7 @@ self: { mkDerivation { pname = "commsec-keyexchange"; version = "0.3.3"; - sha256 = "365fd0db7498d350659e8eaecea6e574cf097ec8c00a72969fd92541b63b40b0"; + sha256 = "1c207fv429frkyb742n0r1z0kkvlwnkcxblfkrjm1lwqfkdx0prn"; libraryHaskellDepends = [ base bytestring cereal cipher-aes128 commsec crypto-api crypto-pubkey-types cryptohash-cryptoapi DRBG monadcryptorandom @@ -42724,7 +45063,7 @@ self: { mkDerivation { pname = "commutative"; version = "0.0.1.4"; - sha256 = "0de746012c73543b5dcf649434046e36d5e158e0967e8e2ae122e85d5457c9cf"; + sha256 = "1ky9axa5vs12w4m8wzlnw1cf3m9ndq239534rxfknm3k5h0ldrqd"; libraryHaskellDepends = [ base random semigroups ]; testHaskellDepends = [ base QuickCheck quickcheck-instances random semigroups tasty @@ -42736,19 +45075,20 @@ self: { }) {}; "comonad" = callPackage - ({ mkDerivation, base, containers, contravariant, directory - , distributive, doctest, filepath, semigroups, tagged, transformers - , transformers-compat + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , contravariant, distributive, doctest, semigroups, tagged + , transformers, transformers-compat }: mkDerivation { pname = "comonad"; - version = "5"; - sha256 = "78e5b19da5b701d14ceb2ca19191cc6205b2024ff2f71b754f5e949faa19cb2a"; + version = "5.0.1"; + sha256 = "0ga67ynh1j4ylbn3awjh7iga09fypbh4fsa21mylcf4xgmlzs7sn"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat ]; - testHaskellDepends = [ base directory doctest filepath ]; + testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/comonad/"; description = "Comonads"; license = stdenv.lib.licenses.bsd3; @@ -42761,7 +45101,7 @@ self: { mkDerivation { pname = "comonad-extras"; version = "4.0"; - sha256 = "c264dd957f2ee50f133cf63ac818f3659f5d8350a56adda52d9881bbb2e93447"; + sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62"; libraryHaskellDepends = [ array base comonad containers distributive semigroupoids transformers @@ -42777,7 +45117,7 @@ self: { mkDerivation { pname = "comonad-random"; version = "0.1.2"; - sha256 = "5ebdd4677d4b1de6246c4c6045c39fdf24b043b28f0b4733d7cada9b91984a86"; + sha256 = "11jak28rpnnaswrlf2wgn91v096zkz1laq2cdhjfc7abgmkx9gay"; libraryHaskellDepends = [ base category-extras random ]; description = "Comonadic interface for random values"; license = "unknown"; @@ -42789,7 +45129,7 @@ self: { mkDerivation { pname = "comonad-transformers"; version = "4.0"; - sha256 = "dfec0c4ce1eccd34c228951454a8f2ebab0bfbdf1cde68a70688196db2b9ff8f"; + sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z"; libraryHaskellDepends = [ base comonad ]; doHaddock = false; homepage = "http://github.com/ekmett/comonad-transformers/"; @@ -42802,7 +45142,7 @@ self: { mkDerivation { pname = "comonads-fd"; version = "4.0"; - sha256 = "3a70386e2ef3d6f444585f082de42e842a47dfe7bdbd807550839faf1bd8b7a7"; + sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s"; libraryHaskellDepends = [ base comonad ]; doHaddock = false; homepage = "http://github.com/ekmett/comonads-fd/"; @@ -42816,7 +45156,7 @@ self: { mkDerivation { pname = "compact"; version = "0.1.0.1"; - sha256 = "ee8533e16b94bbbf3519ccad26f3e569d60d33a5a9d2e3636e0764aff7b2d653"; + sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; homepage = "https://github.com/ezyang/compact"; @@ -42830,7 +45170,7 @@ self: { mkDerivation { pname = "compact-map"; version = "2008.11.9"; - sha256 = "7ea5d68219aca29f43cd37910db9c7921d65ee57652fc573546bd1c575796266"; + sha256 = "0rk2g5swblbbairwabv5azp6a7cjqywhv49prm1rz8mc361dd9by"; libraryHaskellDepends = [ array base binary bytestring containers ]; @@ -42839,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 @@ -42846,7 +45207,7 @@ self: { mkDerivation { pname = "compact-socket"; version = "0.1.0.0"; - sha256 = "e758ee08d3013aebc013fe2d5eb1f529db56ea0f926bd2ba7bc1266cc1c9ee3b"; + sha256 = "0fzfr70nq9n1gfxd4swj1zm5dnr9ynqmwbgy2g0fnfh1sc4fwn77"; libraryHaskellDepends = [ base binary bytestring compact deepseq directory filepath network unix @@ -42861,9 +45222,9 @@ self: { mkDerivation { pname = "compact-string"; version = "0.3.1"; - sha256 = "48da37dc629ee3bfe55d05d5284c2c6b067deb034cf3feab3982572910ed980a"; + sha256 = "02lqxl82jmw276mzxwsc0gmps1kb5i62im85bpjvzqwycbf3gnj8"; revision = "1"; - editedCabalFile = "12c9508bf68b6da11d38adb71248376aeb23eaf7cd6ae1b4571c83d748079c0d"; + editedCabalFile = "03cw0x4dg0qwaysf2sndyzm27sva6x415dxd70fs2vcbys5m1j8j"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://twan.home.fmf.nl/compact-string/"; description = "Fast, packed and strict strings with Unicode support, based on bytestrings"; @@ -42876,19 +45237,31 @@ self: { mkDerivation { pname = "compact-string-fix"; version = "0.3.2"; - sha256 = "f620377ff715dfc740cf48f5af82afb4b2afaca9e7bf76ef397ee39c2b053f98"; + sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://twan.home.fmf.nl/compact-string/"; description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; license = stdenv.lib.licenses.bsd3; }) {}; + "compactable" = callPackage + ({ mkDerivation, base, containers, transformers, vector }: + mkDerivation { + pname = "compactable"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "compactmap" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: mkDerivation { pname = "compactmap"; version = "0.1.4.2"; - sha256 = "36fd80c2f29446bba183c3b7182de9d869a1718c456ae3463ea66b332e6cf6ec"; + sha256 = "1v7ndhp36sx67r3f6sj5iiqs2sfqx4niidy3hfhvnillyb181z9n"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A read-only memory-efficient key-value store"; @@ -42900,7 +45273,7 @@ self: { mkDerivation { pname = "compare-type"; version = "0.1.1"; - sha256 = "4bb3e899e63e63d6787ed191f1800606666e88f18693c810b8abe38ba21dd7e8"; + sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/Kinokkory/compare-type"; description = "compare types of any kinds in haskell"; @@ -42915,8 +45288,8 @@ self: { }: mkDerivation { pname = "compdata"; - version = "0.10.1"; - sha256 = "61572f134ec555695905c28db76c8f1f50df531337e56d5c74a16a52c58840cb"; + version = "0.11"; + sha256 = "1h8ri808zaggfi4n4anq8sdz76f8pij9p5g9wpf4w6zvcghg5jn4"; libraryHaskellDepends = [ base containers deepseq derive mtl QuickCheck template-haskell th-expand-syns transformers tree-view @@ -42940,10 +45313,8 @@ self: { }: mkDerivation { pname = "compdata-automata"; - version = "0.9"; - sha256 = "6eba64e2cbb12d2494c9d10bdbe7ccd3d552dec2ced1fcaf41d952ee89329bc2"; - revision = "1"; - editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130"; + version = "0.9.1"; + sha256 = "1d4q6ssck7jknkxarkz3zcgc5mk60f16wp58kzf1dgv2ar42w4cy"; libraryHaskellDepends = [ base compdata containers projection ]; benchmarkHaskellDepends = [ base compdata containers criterion projection @@ -42961,7 +45332,7 @@ self: { mkDerivation { pname = "compdata-dags"; version = "0.2"; - sha256 = "ec8806f65eb818bbaef9156da0191df49c6400fb3594046d8f6c1106aa93bb7c"; + sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c"; libraryHaskellDepends = [ base compdata containers mtl unordered-containers vector ]; @@ -42983,7 +45354,7 @@ self: { mkDerivation { pname = "compdata-param"; version = "0.9.1"; - sha256 = "ec97eadb9f09933c482f6f68014902e7ab531fa7f04033c40d2a0b1f42b6371d"; + sha256 = "079pnr11y2ra1p236h7hlwgm7az7094h2s3g5x43r4q9kzdym5zc"; libraryHaskellDepends = [ base compdata mtl template-haskell transformers ]; @@ -42997,23 +45368,22 @@ self: { }) {}; "compensated" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad - , deepseq, directory, distributive, doctest, filepath + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, distributive, doctest , generic-deriving, hashable, lens, log-domain, safecopy , semigroupoids, semigroups, simple-reflect, vector }: mkDerivation { pname = "compensated"; - version = "0.7"; - sha256 = "af6a245921b80c5384d64e217fdf2122ea069e8733bd57e9c0135bfd94b5e9b2"; + version = "0.7.1"; + sha256 = "05vpx3jqb8m1naz1ka88kl2jfcf9snfhizb5mg6z2vf1w4axj7w6"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive - generic-deriving hashable lens log-domain safecopy semigroupoids - semigroups vector + hashable lens log-domain safecopy semigroupoids semigroups vector ]; testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect + base doctest generic-deriving semigroups simple-reflect ]; homepage = "http://github.com/analytics/compensated/"; description = "Compensated floating-point arithmetic"; @@ -43026,7 +45396,7 @@ self: { mkDerivation { pname = "competition"; version = "0.2.0.0"; - sha256 = "f68f78e6d4f68912ec01e24da4e3641cfe55aeafbfc666318aa9a3a8bc59861d"; + sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn"; libraryHaskellDepends = [ base filepath parsec ]; homepage = "github.com/yanatan16/haskell-competition"; description = "Helpers and runners for code competitions"; @@ -43039,7 +45409,7 @@ self: { mkDerivation { pname = "compilation"; version = "0.0.0.3"; - sha256 = "34e6ecf09fe1f0c2fd258a4069b800ef3b35c66a3f4ad1f5534165a764b83728"; + sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril"; libraryHaskellDepends = [ base MissingH ]; description = "Haskell functionality for quickly assembling simple compilers"; license = stdenv.lib.licenses.gpl3; @@ -43053,7 +45423,7 @@ self: { mkDerivation { pname = "compiler-warnings"; version = "0.1.0"; - sha256 = "8cf4c57e1b4d61b1163969faa6e9f2cb8f22073fa75bf982d9b8a328225f5ce3"; + sha256 = "1qswbwi2i8xqv61gjnx77w3j53ybyblsdyk974bb2qad3dzcbx4c"; libraryHaskellDepends = [ base binary parsec text ]; testHaskellDepends = [ base binary parsec tasty tasty-hunit tasty-quickcheck tasty-th text @@ -43067,10 +45437,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "complex-generic"; - version = "0.1.1"; - sha256 = "9422670fd08f3daaae823466398a9d4b9b2d8b4b9d568380833c5c391e679896"; + version = "0.1.1.1"; + sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz"; libraryHaskellDepends = [ base template-haskell ]; - homepage = "https://gitorious.org/complex-generic"; + homepage = "https://code.mathr.co.uk/complex-generic"; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43081,7 +45451,7 @@ self: { mkDerivation { pname = "complex-integrate"; version = "1.0.0"; - sha256 = "d23130086dffc463153a2fa7e0fa79edd871d6eb4edcd30e64c2911cf1750e60"; + sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/hijarian/complex-integrate"; description = "A simple integration function to integrate a complex-valued complex functions"; @@ -43095,7 +45465,7 @@ self: { mkDerivation { pname = "complexity"; version = "0.1.3"; - sha256 = "929ac3292c1ea9aa9536b9718e2af4022a164c047d098c1fcb0a408f479a9999"; + sha256 = "16crk93qyh0arcgqq2bx0i61cah2yhm8wwdr6sasma8y5hlw76lj"; libraryHaskellDepends = [ base Chart colour data-accessor hstats parallel pretty time transformers @@ -43110,7 +45480,7 @@ self: { mkDerivation { pname = "compose-ltr"; version = "0.2.3"; - sha256 = "f76dbb87f336da695e921f7f65913e1a5cbe7db06898d678c2310356ae9727af"; + sha256 = "1br7jyp5c0riq9wdd638n1yvwp0s7s8nazqzj9g6kninyf3vnvgp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "More intuitive, left-to-right function composition"; @@ -43123,19 +45493,124 @@ self: { mkDerivation { pname = "compose-trans"; version = "0.1"; - sha256 = "3f612fc9ad34e8b7a6f23d5f55a7cfcef5fbb3ce9f2a053499d22d6727684e5c"; + sha256 = "0p2fd0knfbfjk4s0aalzrsrzpxffrykmaprxyakbgs1lmp4jyq9z"; libraryHaskellDepends = [ base mtl ]; description = "Composable monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "composite-aeson" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base + , composite-base, containers, contravariant, generic-deriving + , hashable, hspec, lens, mmorph, mtl, profunctors, QuickCheck + , scientific, tagged, template-haskell, text, time + , unordered-containers, vector, vinyl + }: + mkDerivation { + pname = "composite-aeson"; + version = "0.4.2.0"; + sha256 = "06zaji95znvy5v9qmyczdncqgdmp2jkibqimchziayjs1vcmb8bg"; + libraryHaskellDepends = [ + aeson aeson-better-errors base composite-base containers + 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 mmorph mtl + profunctors QuickCheck scientific tagged template-haskell text time + unordered-containers vector vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "JSON for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "composite-aeson-refined" = callPackage + ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl + , refined + }: + mkDerivation { + pname = "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "composite-base" = callPackage + ({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl + , profunctors, QuickCheck, template-haskell, text, transformers + , transformers-base, vinyl + }: + mkDerivation { + pname = "composite-base"; + version = "0.4.2.0"; + sha256 = "0mfz7xpkl3lxg3pfk83mba7kb9phpcc4cnvimpphfcbwpzx8qcqw"; + libraryHaskellDepends = [ + base exceptions lens monad-control mtl profunctors template-haskell + text transformers transformers-base vinyl + ]; + testHaskellDepends = [ + base exceptions hspec lens monad-control mtl profunctors QuickCheck + template-haskell text transformers transformers-base vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Shared utilities for composite-* packages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "composite-ekg" = callPackage + ({ mkDerivation, base, composite-base, ekg, ekg-core, lens, text + , vinyl + }: + mkDerivation { + pname = "composite-ekg"; + version = "0.4.2.0"; + sha256 = "06lb5djs1w9gby7f192wssxwbik2lpigzsfv25z5pchf8iab4f9d"; + libraryHaskellDepends = [ + base composite-base ekg ekg-core lens text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "EKG Metrics for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "composite-opaleye" = callPackage + ({ mkDerivation, base, bytestring, composite-base, lens, opaleye + , postgresql-simple, product-profunctors, profunctors + , template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-opaleye"; + version = "0.4.2.0"; + sha256 = "0id817bwss3haskvfpn86bqsva8a0ahwbgbzh5zbyiwc5vqksnkx"; + libraryHaskellDepends = [ + base bytestring composite-base lens opaleye postgresql-simple + product-profunctors profunctors template-haskell text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Opaleye SQL for Frames records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "composition" = callPackage ({ mkDerivation }: mkDerivation { pname = "composition"; version = "1.0.2.1"; - sha256 = "7123300f5eca5a7cec4eb731dc0e9c2c44aabe26b37e6579582a7267d9f7ad6a"; + sha256 = "0smdyzcnfwiab1wnazmk4szali1ckh7dqcdp9vn7qnnabq7k08vi"; description = "Combinators for unorthodox function composition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -43145,7 +45620,7 @@ self: { mkDerivation { pname = "composition-extra"; version = "2.0.0"; - sha256 = "c998244a8fd160af3dd7ee93c417f665af51a46a04ce6b7d4623f46596ba7129"; + sha256 = "0abipab6bx138rynpkh4daj53bv5yqbw94zfswysyq6iix529669"; libraryHaskellDepends = [ base composition contravariant ]; description = "Combinators for unorthodox structure composition"; license = stdenv.lib.licenses.bsd3; @@ -43156,7 +45631,7 @@ self: { mkDerivation { pname = "composition-tree"; version = "0.2.0.3"; - sha256 = "40243191eb557a9a5d7a6986dee5aa56968a3f36901a2ca6035310cfc4b255cc"; + sha256 = "1k2mnb2cy42k0fk2q6lh6qzqm5jnmbjxx1k9g9frlyjmxf8k2920"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/liamoc/composition-tree"; @@ -43170,7 +45645,7 @@ self: { mkDerivation { pname = "compound-types"; version = "0.1.3.1"; - sha256 = "81c67beb0379502875e2fbec9c346db7221f598197534064a4b4bd3d4ae930f2"; + sha256 = "1wihx553vgdllij40lwph5ciy8mpdls9rv7vw9sjhl3r0gmppil1"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base-prelude ]; homepage = "https://github.com/nikita-volkov/compound-types"; @@ -43186,9 +45661,9 @@ self: { mkDerivation { pname = "compressed"; version = "3.10"; - sha256 = "9cd5724f8ad297b00924bdcf9b641f614122385c8aad8f2682cece20880549f8"; + sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw"; revision = "1"; - editedCabalFile = "0ab968cb9d6a6da40cb91befc6051d91b77039f8f64442eecf7a61bd508f61bb"; + editedCabalFile = "1fv1ix8bsqbsrzp44i7nz0wp1dwi3l2wdvqvp46a8vbakp5nif8a"; libraryHaskellDepends = [ base comonad containers fingertree hashable keys pointed reducers semigroupoids semigroups unordered-containers @@ -43204,7 +45679,7 @@ self: { mkDerivation { pname = "compression"; version = "0.1"; - sha256 = "f932b25c4a9fef0a363eb3a924f4293df1ca4796899807af2a76b7134341c733"; + sha256 = "0cy7851i7dvn5aphg649jr3wmw9x57s29adk7qv0mvwz99fb4cpr"; libraryHaskellDepends = [ base mtl ]; homepage = "http://urchin.earth.li/~ian/cabal/compression/"; description = "Common compression algorithms"; @@ -43219,7 +45694,7 @@ self: { mkDerivation { pname = "compstrat"; version = "0.1.0.2"; - sha256 = "6f4246375cd943bb340defc347b8bb2c850210b4c578ba87cf937f3db1dfbdc9"; + sha256 = "1jdxvyqkszwkry3vly65nh80519cpfw4ghzg1lsbnhyrbhvlchkg"; libraryHaskellDepends = [ base compdata mtl template-haskell th-expand-syns transformers ]; @@ -43236,7 +45711,7 @@ self: { mkDerivation { pname = "comptrans"; version = "0.1.0.5"; - sha256 = "753e4c630f36e077205c05a191081c431ef088e443befdd50b3eda05403a2017"; + sha256 = "05r07900bniy1gazvgj3wj4g07j33h493885bhh7gq1n1xilqgkm"; libraryHaskellDepends = [ base compdata containers deepseq deepseq-generics ghc-prim lens template-haskell th-expand-syns @@ -43262,7 +45737,7 @@ self: { mkDerivation { pname = "computational-algebra"; version = "0.5.0.0"; - sha256 = "fce631557cfcef120382e91744279f5e7a61c0afaae95cf2159195f7e57fda49"; + sha256 = "0jfsgzjzg5ci2pr5rsdamz062yjykwkl85z9h81i5vzwgiak3rpw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43299,7 +45774,7 @@ self: { mkDerivation { pname = "computations"; version = "0.0.0.0"; - sha256 = "c0880c60e06b1248fc14122be16963bb8f7efad092be9e4f10e017fc6a1bcfcf"; + sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260"; libraryHaskellDepends = [ base ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/computations"; description = "Advanced notions of computation"; @@ -43311,7 +45786,7 @@ self: { mkDerivation { pname = "concatenative"; version = "1.0.1"; - sha256 = "ed5997924518f0ca6b8afcd4e1ee10d30675bb4c4ba164a4d70b4ddbd8c6bc17"; + sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty"; description = "A library for postfix control flow"; @@ -43324,7 +45799,7 @@ self: { mkDerivation { pname = "conceit"; version = "0.4.0.0"; - sha256 = "8972aafc4143cf2f6039d99747a9f1d191762636fd4453e7fc5bdb7c604a980b"; + sha256 = "02wq99h7rnsvzkkm6i7x6qk7d4fiy6llg5yr75h2zks387yalwl9"; libraryHaskellDepends = [ base bifunctors semigroupoids semigroups void ]; @@ -43332,12 +45807,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concise" = callPackage + ({ mkDerivation, base, bytestring, lens, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "concise"; + version = "0.1.0.0"; + sha256 = "0ga10djxmc5n37cf5iazkwivfxipav0q2gb8mbkbg3wnn1qhqxmm"; + libraryHaskellDepends = [ base bytestring lens text ]; + testHaskellDepends = [ + base bytestring lens QuickCheck quickcheck-instances tasty + tasty-quickcheck text + ]; + homepage = "https://github.com/frasertweedal/hs-concise"; + description = "Utilities for Control.Lens.Cons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "concorde" = callPackage ({ mkDerivation, base, containers, process, safe, temporary }: mkDerivation { pname = "concorde"; version = "0.1"; - sha256 = "40b0e947ae41e7fc2699181264b556c76d53656874c100729352fd6564a60324"; + sha256 = "0903lrj6bzajjdr01hbld1jm6vf7assn84hqk4kgrrs1mr3ykc20"; libraryHaskellDepends = [ base containers process safe temporary ]; description = "Simple interface to the Concorde solver for the Traveling Salesperson Problem"; license = stdenv.lib.licenses.bsd3; @@ -43353,7 +45846,7 @@ self: { mkDerivation { pname = "concraft"; version = "0.9.4"; - sha256 = "030f63c8c08dba11ac85b08746a145df45276930de8fc937ecf6260b1cac079f"; + sha256 = "17q7mhf0n9pnxhvwk3yy61ljfifz8nhld1xhhnn13fldq34663q3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43376,7 +45869,7 @@ self: { mkDerivation { pname = "concraft-hr"; version = "0.1.0.2"; - sha256 = "81fc81a15bd38916dab18a83a5d303c6097a7ad297511538f32088d9b1175460"; + sha256 = "0q2l2yqxk210ycw1alcps9x7l2f60g9sb0wan7d1d2fkbfhq3z41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43398,7 +45891,7 @@ self: { mkDerivation { pname = "concraft-pl"; version = "0.7.4"; - sha256 = "83bfddfb8099d468ae3237b40ee698d2655aaa0447f60b365c11d0f3da1e187a"; + sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43413,16 +45906,25 @@ self: { }) {}; "concrete-haskell" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck - , text, thrift, unordered-containers, vector + ({ mkDerivation, attoparsec, base, bytestring, containers + , directory, filepath, hashable, megaparsec, mtl + , optparse-applicative, process, QuickCheck, scientific, tar, text + , thrift, time, unordered-containers, uuid, vector, zlib }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.4"; - sha256 = "6fbe447023cb0b5f7b3753e354af34c8a35f1497b5829a907728e336de64eb2b"; + version = "0.1.0.8"; + sha256 = "10pr4c48kdgbm365y4jjwk5ba3xvi90p1n8m94161y1j4bs1zzvm"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers hashable QuickCheck text thrift - unordered-containers vector + attoparsec base bytestring containers directory filepath hashable + megaparsec mtl process QuickCheck scientific tar text thrift time + unordered-containers uuid vector zlib + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath optparse-applicative + process text vector zlib ]; homepage = "https://github.com/hltcoe"; description = "Library for the Concrete data format"; @@ -43437,7 +45939,7 @@ self: { mkDerivation { pname = "concrete-relaxng-parser"; version = "0.1.1"; - sha256 = "aac9e15b435ccf26a45b2167facdc9fd6700356a2781f37c09cd324790788bf0"; + sha256 = "1w4bg284fcnd15yg7097d8sh0rzxr76zlrr1bfj2dksw8ddy3jda"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -43455,9 +45957,9 @@ self: { mkDerivation { pname = "concrete-typerep"; version = "0.1.0.2"; - sha256 = "f72a41d9d8315528c7b0e13bf61e6122c7d236cb529c207cfb431cf272439e1f"; + sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app"; revision = "1"; - editedCabalFile = "cdcd034ff6ff0e8cf9313f312294e12494f3f021c4bf562b9c1365b91715ff4e"; + editedCabalFile = "0kpz2lbvjr8kkhmmdgy447qg7514w6a24c9z67wqq3pzyr7h7kfd"; libraryHaskellDepends = [ base binary hashable ]; testHaskellDepends = [ base binary hashable QuickCheck test-framework @@ -43475,9 +45977,9 @@ self: { mkDerivation { pname = "concurrency"; version = "1.0.0.0"; - sha256 = "541f9e730c18464ec8399214097a5fb62cfce319baa3495bf3349e0f4d9cf19d"; + sha256 = "17giki6hz7ilyddlk8xs37izqb5nbxx0j54j7744wihq1irrw7sl"; revision = "1"; - editedCabalFile = "3de0faeb048451ba463026c4d88e9cedf21470c4568a044be0b4bff460ad1c90"; + editedCabalFile = "140wmmhg9gxlw15h92jnqiq19wpdkj7dii16613bllc40kmzmq1x"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -43487,14 +45989,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_1_1_0" = callPackage + "concurrency_1_1_2_1" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.1.1.0"; - sha256 = "f955671cc7814d06d99a84f003423d8903604cdc9911d7f4986acaa39c519973"; + version = "1.1.2.1"; + sha256 = "0gadbm9z9qbm208md5f811hz9f2ljw0z9dyldpgklqvic1n8w5xi"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -43510,7 +46012,7 @@ self: { mkDerivation { pname = "concurrent-barrier"; version = "0.1.2"; - sha256 = "bb8e1e37c1a49735fb1eca9bb1b0ee2684c9714fd60f4d311e33a359f8e92d8e"; + sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jsgf/concurrent-barrier"; description = "Simple thread barriers"; @@ -43524,7 +46026,7 @@ self: { mkDerivation { pname = "concurrent-dns-cache"; version = "0.0.1"; - sha256 = "62c316082f91b0183355741aba5b2b4796663521ad607d43107e4692d5518b2b"; + sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43546,8 +46048,8 @@ self: { }: mkDerivation { pname = "concurrent-extra"; - version = "0.7.0.10"; - sha256 = "6f27cc0a90f5f25b3c0a1e9e3c0e3b407538908c061c5b7da34461b76e1adc12"; + version = "0.7.0.11"; + sha256 = "0bvfgm26hyix074c36l7cqdq40xx8zzml6v50qdfly04g1bb05m5"; libraryHaskellDepends = [ base stm unbounded-delays ]; testHaskellDepends = [ async base HUnit random stm test-framework test-framework-hunit @@ -43565,8 +46067,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.2.3.3"; - sha256 = "e5204231e35181e56b9313f6dbe83d531b3f6c3f6dfbe3a1c465e5b6b2a24924"; + version = "0.3.1"; + sha256 = "0n04gnnv323fk1h9mp8krqbl2v6ljjv1vzw5df38cxvj2xd64y94"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -43586,7 +46088,7 @@ self: { mkDerivation { pname = "concurrent-output"; version = "1.7.9"; - sha256 = "343c9685d24795bb38761f5c3600df5c67dbc6d410e5e0b862aa8d092e4e10d5"; + sha256 = "1m8h9qp0k3dacawf1r8hsk3dnrswvw03cp0zfqwbp5a7sa2rcg1l"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -43595,12 +46097,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_0" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.0"; + sha256 = "1cjqmz8iwy2inpf3lfd6y687j7ckwjsrqb7g9adsbwl8w1cnfw99"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "concurrent-rpc"; version = "0.1.0.0"; - sha256 = "efed4a49b87a1f8f51cea08f3cd842bdd3735bd191ab7c20de92746bbae2114c"; + sha256 = "0k0iwax6nx4jvqh7rawis5dp7lxx8bc3r3x0rr8qy7vsp14lmvgg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/lpeterse/haskell-concurrent-rpc"; description = "An abstraction for inter-thread RPC based on MVars"; @@ -43612,7 +46131,7 @@ self: { mkDerivation { pname = "concurrent-sa"; version = "1.0.1"; - sha256 = "a6997893de2546e223d4edc0830cbfa3c60220ae078ef536145d161837e0fbeb"; + sha256 = "1szvw0vih5jx2hvgb3h7mqh05im3pw687h7dshiy4ii5vs9pi6d6"; libraryHaskellDepends = [ base MonadRandom ]; description = "Concurrent simulated annealing system"; license = stdenv.lib.licenses.bsd3; @@ -43623,7 +46142,7 @@ self: { mkDerivation { pname = "concurrent-split"; version = "0.0.1"; - sha256 = "60793c8eeff1fa0fe03910951d1925f3c66aec61ead64bf3f98dd6110a05b8e7"; + sha256 = "1rxq0l513mldz7rlpmpac7n6mipk4lciv58h77h0zypixy73qyb0"; libraryHaskellDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -43634,7 +46153,7 @@ self: { mkDerivation { pname = "concurrent-state"; version = "0.6.0.0"; - sha256 = "e6071814c277106cb13b458a7161dd42269e9a7c2419b17992a1908a7fb3342d"; + sha256 = "0b9lndzqm451j9wv2694gjd9w9j2vmhp32j57fqnq43pq8a1h1z6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base exceptions mtl stm transformers ]; @@ -43649,7 +46168,7 @@ self: { mkDerivation { pname = "concurrent-supply"; version = "0.1.8"; - sha256 = "ccf827dcd221298ae93fad6021c63a06707456de0671706b44f1f2fed867f21f"; + sha256 = "07zjczcgxwpi8imp0w86vrb78w067b322q5d7zlqla91sbf2gy6c"; libraryHaskellDepends = [ base ghc-prim hashable ]; testHaskellDepends = [ base containers ]; homepage = "http://github.com/ekmett/concurrent-supply/"; @@ -43662,9 +46181,9 @@ self: { mkDerivation { pname = "concurrent-utilities"; version = "0.2.0.0"; - sha256 = "d108b831e0631c1d3d9b5e2dbfb335b63997206384b7a069978c95a2a1af918a"; + sha256 = "12limyhs55ccjxls1dw4cch9ffdn6nrvybaykcyis733w0qvh26i"; revision = "1"; - editedCabalFile = "2b711482a361d04696567a2d07b866747e1fcd12a70b081dab94887d94cf4f6a"; + editedCabalFile = "0sjgrya7v24lmcfhh2x72b6iyzklcsw0fbbsasb4dl31lf118w9b"; libraryHaskellDepends = [ base ]; homepage = "-"; description = "More utilities and broad-used datastructures for concurrency"; @@ -43676,7 +46195,7 @@ self: { mkDerivation { pname = "concurrentoutput"; version = "0.2.0.2"; - sha256 = "481dd3e34600d55ad8a956c2368f1842a6af86ff1e5eb1d87a36f7ca9538a339"; + sha256 = "0fd372awmxrngbcb2phyzy3az9j2327kdhjnm7c5mm808vix67a8"; libraryHaskellDepends = [ base ]; description = "Ungarble output from several threads"; license = stdenv.lib.licenses.bsd3; @@ -43687,7 +46206,7 @@ self: { mkDerivation { pname = "cond"; version = "0.4.1.1"; - sha256 = "039c76e43b5484bdc78627f50740106ae2844b3c877d92b5228de9106997ac8b"; + sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kallisti-dev/cond"; description = "Basic conditional and boolean operators with monadic variants"; @@ -43701,7 +46220,7 @@ self: { mkDerivation { pname = "condor"; version = "0.3"; - sha256 = "a79b44fb76db86e6ed54de6f94aa121bca34ae7f479978479f940968969b112a"; + sha256 = "0ahikfb6h2clkx3pi6a7gyp39jhv2am98vyyaknyd1nvfvxl96x7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary containers glider-nlp text ]; @@ -43722,7 +46241,7 @@ self: { mkDerivation { pname = "condorcet"; version = "0.0.1"; - sha256 = "cd9a8323491635b9a25495e281a676b7a6f56770187acbaa07c95a6773454ee5"; + sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd"; libraryHaskellDepends = [ array base ]; homepage = "http://neugierig.org/software/darcs/condorcet"; description = "Library for Condorcet voting"; @@ -43735,7 +46254,7 @@ self: { mkDerivation { pname = "conductive-base"; version = "0.3"; - sha256 = "97a3a733949176c3eeeba581d37407dc6270471220a6093b08f440cfada3bac9"; + sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp"; libraryHaskellDepends = [ array base containers random stm time ]; homepage = "http://www.renickbell.net/doku.php?id=conductive-base"; description = "a library for live coding and real-time musical applications"; @@ -43747,7 +46266,7 @@ self: { mkDerivation { pname = "conductive-clock"; version = "0.2"; - sha256 = "b790a02835ba51b95f61e92fcbb9c35d6bdc58574fcabd469661b40249a095de"; + sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p"; doHaddock = false; homepage = "http://www.renickbell.net/doku.php?id=conductive-clock"; description = "a library for displaying musical time in a terminal-based clock"; @@ -43761,7 +46280,7 @@ self: { mkDerivation { pname = "conductive-hsc3"; version = "0.3.1"; - sha256 = "eaced5f31e79f4b5aaa6d72d13a4bc4ea56f547977d28cf1c26ef63aca3903fc"; + sha256 = "1z037753mxkfqbqqrlkpg5a6z9afpjj16bfplsmbbx3r3vrxbkpa"; libraryHaskellDepends = [ base conductive-base conductive-song containers directory filepath hosc hsc3 random @@ -43777,7 +46296,7 @@ self: { mkDerivation { pname = "conductive-song"; version = "0.2"; - sha256 = "71e71a09990c2a1f979203d6d436c9f4e39c705132832176f3833962b6d46d99"; + sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi"; libraryHaskellDepends = [ base conductive-base random ]; homepage = "http://www.renickbell.net/doku.php?id=conductive-song"; description = "a library of functions which are useful for composing music"; @@ -43787,16 +46306,16 @@ self: { "conduit" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, exceptions , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl - , mwc-random, QuickCheck, resourcet, safe, split, transformers - , transformers-base, vector + , mwc-random, primitive, QuickCheck, resourcet, safe, split + , transformers, transformers-base, vector }: mkDerivation { pname = "conduit"; - version = "1.2.9"; - sha256 = "8adf9d8916dcb7abf86c4c82cc1c92e99dea8d0a9a5835302a824142d214cf06"; + version = "1.2.11"; + sha256 = "1xx8vj2azbzr2skcrpcy02hgnik01i6hcx01h0mjd4fr0hzl4rhb"; libraryHaskellDepends = [ - base exceptions lifted-base mmorph monad-control mtl resourcet - transformers transformers-base + base exceptions lifted-base mmorph monad-control mtl primitive + resourcet transformers transformers-base ]; testHaskellDepends = [ base containers exceptions hspec mtl QuickCheck resourcet safe @@ -43816,9 +46335,9 @@ self: { mkDerivation { pname = "conduit-audio"; version = "0.2.0.2"; - sha256 = "e23cf60d1e70a65560308517db79ba150456fcf9f24a0d77f5e6f96cdf1aef0b"; + sha256 = "02zg3bgnryg6ymvhsjpjz7y5c10mp9wxn5w561h5b9kh3q6zcg72"; revision = "1"; - editedCabalFile = "3c61190def62e1eaf73fe7921fe09df99f2c4e6b4397f852ed7e7fba345128ff"; + editedCabalFile = "1zr8a4sblzvyxm9gi5s3dd72r7zrkph1z4p77zvymqb2xw6ijq9w"; libraryHaskellDepends = [ base conduit vector ]; homepage = "http://github.com/mtolly/conduit-audio"; description = "Combinators to efficiently slice and dice audio streams"; @@ -43832,9 +46351,9 @@ self: { mkDerivation { pname = "conduit-audio-lame"; version = "0.1.2"; - sha256 = "07bbd0c82daff28e9b4dd147cee0cbca5ee74a50bdc5de5a5d905a8848573a5d"; + sha256 = "0p9sax48hnlhbmddxidxa15ffpnarghcwiyi9ndqxwmg5p4d1fq7"; revision = "1"; - editedCabalFile = "5359747af74efab99b94c924a4a0e29ab2ad8e290fd6beddeaacfad6f54086bb"; + editedCabalFile = "1fw683sxdymcxbfvxmhg567avclswaha8969jjdvkyjfyxx78nak"; libraryHaskellDepends = [ base bytestring conduit conduit-audio resourcet transformers vector ]; @@ -43853,9 +46372,9 @@ self: { mkDerivation { pname = "conduit-audio-samplerate"; version = "0.1.0.2"; - sha256 = "e8ee6621926909df05f91f969e95a2bde85d0fe09f17d54ea8fa2a6ff93adedd"; + sha256 = "1pfy7bwnyapsm17da5wzw07mvs5xlaarx5hzz42xy2b9j8hndvp8"; revision = "1"; - editedCabalFile = "3e2613f2a9f915d915e23f12fde64abac36679a149080d817b98a2e6361d8436"; + editedCabalFile = "0dl43lvfd8lqgf0hs229l5wndhxs9bkgs4izw8axj5grm7r169iy"; libraryHaskellDepends = [ base conduit conduit-audio resourcet transformers vector ]; @@ -43874,9 +46393,9 @@ self: { mkDerivation { pname = "conduit-audio-sndfile"; version = "0.1.2"; - sha256 = "7e499e45b4e7c92e02ce8dc52a4c482b05f2fc611bd46ac868aea8190e53fae6"; + sha256 = "1rpsac71ka5fd346mm0vc7yg419b9162micdrq12xjg7ni2rwjby"; revision = "1"; - editedCabalFile = "92be6b314eb2b0e0435f2778e0bce09d91614cf5bb26387e3c45cc6507c2a496"; + editedCabalFile = "15m4q83nbk257iz3h9mvym6634cxw2yf0y17bx1y1c5j9qqnpglj"; libraryHaskellDepends = [ base conduit conduit-audio hsndfile hsndfile-vector resourcet transformers @@ -43896,8 +46415,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.1.0"; - sha256 = "ff1f16f24e2c186ce5d61f079b318e2f58c4bc3a4a2c8d9011d001512786335a"; + version = "1.1.1"; + sha256 = "0609miq03lq9visfb2dqqsxghmvgzm24pq39mqby1jnnah6yh8m0"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -43922,7 +46441,7 @@ self: { mkDerivation { pname = "conduit-connection"; version = "0.1.0.3"; - sha256 = "798eb9c87a37f8f8a15a8edc6674f975dad38ed8c19acf52b6439f88c280439a"; + sha256 = "16j3h318i7s3nr9cz6n1v27d7nkmz5s6dp4fbahziy1pgb4bk3kr"; libraryHaskellDepends = [ base bytestring conduit connection resourcet transformers ]; @@ -43944,8 +46463,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.15"; - sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d"; + version = "1.1.16"; + sha256 = "1mgqc34i6ccq5bjkkn943gfa3w0lhddi3am0fd5afnazrnxc2wmx"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -43975,7 +46494,7 @@ self: { mkDerivation { pname = "conduit-find"; version = "0.1.0.3"; - sha256 = "498de0dc5056a2863df72b710acf571379f241ca1bd8b634dd620eddf1beeb8d"; + sha256 = "13gbpvqxs3k2vlsbdn0vr90z4y8kaz7hlw9bywyqd8jna3ff13a9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44008,7 +46527,7 @@ self: { mkDerivation { pname = "conduit-iconv"; version = "0.1.1.1"; - sha256 = "54a25274f4f3590a6b35ac86a3753dc867a505867cae5d363f775781f4b6ac05"; + sha256 = "01dcnvs82mvp7wv5vbkwhq2sary87mss71mc6mmhlngkyis558jl"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit mtl QuickCheck test-framework @@ -44027,7 +46546,7 @@ self: { mkDerivation { pname = "conduit-merge"; version = "0.1.2.0"; - sha256 = "4d332f30af4c79c345af81072396b33e1dc26f35c9e6d9a6e51559cc46c0ce1e"; + sha256 = "07nfq13cqn8mwnkdkrn96mpw479ynfb261w1mx2w6yacmwq2ycsd"; libraryHaskellDepends = [ base conduit mtl ]; homepage = "https://github.com/cblp/conduit-merge#readme"; description = "Merge multiple sorted conduits"; @@ -44041,7 +46560,7 @@ self: { mkDerivation { pname = "conduit-network-stream"; version = "0.2"; - sha256 = "6457bfc4c3dd4c72a1be60c3f3e5a236f7c3ba7aa3b93d97ed93ccf387580032"; + sha256 = "0ch0b23z7k4kxnbkvfd3gaxc7xrnlbjz7hv0pshp4k6xqg2bymv4"; libraryHaskellDepends = [ base bytestring conduit mtl network-conduit resourcet ]; @@ -44051,17 +46570,17 @@ self: { }) {}; "conduit-parse" = callPackage - ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers - , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text - , transformers + ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint + , mtl, parsers, resourcet, safe, safe-exceptions, tasty + , tasty-hunit, text, transformers }: mkDerivation { pname = "conduit-parse"; - version = "0.1.2.0"; - sha256 = "15621f6b0e452d30fbd7738d98a6dfcdcb078f4d51044ed6e32ea227f07bce17"; + version = "0.1.2.1"; + sha256 = "0yc3mkg3fic5bpjsffghidk51sx5dhzvyc1h94ppic9mym985fwd"; libraryHaskellDepends = [ - base conduit dlist mtl parsers safe safe-exceptions text - transformers + base conduit conduit-combinators dlist mtl parsers safe + safe-exceptions text transformers ]; testHaskellDepends = [ base conduit hlint mtl parsers resourcet safe-exceptions tasty @@ -44069,7 +46588,7 @@ self: { ]; homepage = "https://github.com/k0ral/conduit-parse"; description = "Parsing framework based on conduit"; - license = "unknown"; + license = stdenv.lib.licenses.publicDomain; }) {}; "conduit-resumablesink" = callPackage @@ -44079,7 +46598,7 @@ self: { mkDerivation { pname = "conduit-resumablesink"; version = "0.1.1"; - sha256 = "cfb58e4789b05c9d52129ffb3e11e1ed4aa0e4a316297def868d4089a1bd0daf"; + sha256 = "1bqdpnhqjh4dhvppsa8nlgja0jpdw48kxywz2999sp5hi53qxdfg"; libraryHaskellDepends = [ base conduit void ]; testHaskellDepends = [ base bytestring conduit hspec transformers void @@ -44097,7 +46616,7 @@ self: { mkDerivation { pname = "conduit-tokenize-attoparsec"; version = "0.1.0.0"; - sha256 = "cbb8e1127c64338baba4dba836ffa1b034f4d85967fa983a334e84e56dad00af"; + sha256 = "1bq0mmnyb12f6cx9iyk7b7cg8d5hl7zkda6vljmqncv4gh9f3f6b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44117,7 +46636,7 @@ self: { mkDerivation { pname = "conf"; version = "0.1.1.0"; - sha256 = "dcadeb99e11e6110c6afa0849702b490c7803131c780d5fd8f33221448c8b9d7"; + sha256 = "1mxrr14188ikizyxb06764qq1iwhnh19g150mz310q8yw6cypbfw"; libraryHaskellDepends = [ base haskell-src ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit test-framework-th @@ -44134,9 +46653,9 @@ self: { mkDerivation { pname = "conf-json"; version = "1.1"; - sha256 = "3d870c1fade614cac69169404ea6b1d6318a8026e121a14937a0e8e74ca1fe49"; + sha256 = "0jgyl56fgs506x4s28g14s08lcfnn6k4wh39j73cl576mlghr1rx"; revision = "6"; - editedCabalFile = "8e300dbe34fc4677039940c6d91fb746a086097b276356b43019fecf24fadbb7"; + editedCabalFile = "1dyvz8jczzhr62s5cqr7gc4qd826nwgxkij0k41pfipw6jz0sc4f"; libraryHaskellDepends = [ aeson base bytestring directory ]; testHaskellDepends = [ aeson base binary bytestring directory hspec QuickCheck @@ -44153,7 +46672,7 @@ self: { mkDerivation { pname = "conffmt"; version = "0.2.3.0"; - sha256 = "f4146a3ce79dec05c3dd551d3f58f55d28fc5722b02302d36178778fba83ebbb"; + sha256 = "1fzbhfx8yxvqc79h48xh49bzqa2xymc3y7amvp1hbv4xwwy6l57l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44172,7 +46691,7 @@ self: { mkDerivation { pname = "config-ini"; version = "0.1.2.0"; - sha256 = "d3a2b77545fba315db644ce177248e59f918cf4b6e17123c04d66e8bb3c7ee15"; + sha256 = "05gfqyrqnvnn0hy145vf9g7iiyariqj7gqacckdib8zv8msvg8nk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44196,7 +46715,7 @@ self: { mkDerivation { pname = "config-manager"; version = "0.3.0.1"; - sha256 = "8b025eb8870a68d061526d76e55c860cc75ff5c61cb23a27b65d6fa0450732e3"; + sha256 = "1qrj0x2s0vsxnqkkmchwqvsmziqchrffaxkda9hx0s0ahyw5w0lb"; libraryHaskellDepends = [ base filepath parsec text time unordered-containers ]; @@ -44209,12 +46728,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "config-schema" = callPackage + ({ mkDerivation, base, config-value, containers, free + , kan-extensions, pretty, semigroupoids, text, transformers + }: + mkDerivation { + pname = "config-schema"; + version = "0.5.0.0"; + sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli"; + libraryHaskellDepends = [ + base config-value containers free kan-extensions pretty + semigroupoids text transformers + ]; + testHaskellDepends = [ base config-value text ]; + homepage = "https://github.com/glguy/config-schema"; + description = "Schema definitions for the config-value package"; + license = stdenv.lib.licenses.isc; + }) {}; + "config-select" = callPackage ({ mkDerivation, base, directory, filepath, unix, vty-menu }: mkDerivation { pname = "config-select"; version = "0.0.1"; - sha256 = "9e0c6ae70eafa6879b7ae012d3c2e58b77b360a9e2a4a75e8fbaf8c204d12eac"; + sha256 = "1b1fs42c5y5sixgag972m5hb6xwbwp1d64p0gadqg9mg1vknl34y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44229,8 +46766,8 @@ self: { ({ mkDerivation, alex, array, base, happy, pretty, text }: mkDerivation { pname = "config-value"; - version = "0.5"; - sha256 = "2a2d825c1f23516c64d5ca6b587951b80be44006c09832177e61cfc0743692fa"; + version = "0.6.3"; + sha256 = "0c7ghasn06m4mlhk3lg5pxpssbsr4l88ibi6vzvp8ylbqha0b3gn"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; @@ -44242,10 +46779,8 @@ self: { ({ mkDerivation, base, config-value, text }: mkDerivation { pname = "config-value-getopt"; - version = "0.1.0.0"; - sha256 = "00b65bcf60b26f7004665f183d7114dfb6380230c2f50e093403ca8a74bfaccb"; - revision = "1"; - editedCabalFile = "bcabc9ce380b21989fc45664b654c2cf1474bd3dc4caa1a7961f8d1181fbd49b"; + version = "0.1.1.0"; + sha256 = "0ypg8wl17vqdqsk1gpaba11v63xmqysfp4cd4ii8zha7pfmlhb4c"; libraryHaskellDepends = [ base config-value text ]; homepage = "https://github.com/GaloisInc/config-value-getopt"; description = "Interface between config-value and System.GetOpt"; @@ -44262,7 +46797,7 @@ self: { mkDerivation { pname = "configifier"; version = "0.1.1"; - sha256 = "52cbd5b32d438766e655104e583baa5379e618bc2526382c970bde313db72e11"; + sha256 = "049fnwyk3phbjwn3h9i5phcfcyakm8xmhkhhapk6d1s35nrxbjsj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44285,7 +46820,7 @@ self: { mkDerivation { pname = "configuration"; version = "0.1.1"; - sha256 = "61f6c9cb5368c2706f86cc399aea4eacd07e5f3028322f66bf96e6be6e2f0ccb"; + sha256 = "1jqc5xpbxrlnpxk2yci861gpxl5c9vm9lffchrpp1hk8ag5wkxk1"; libraryHaskellDepends = [ base containers ]; description = "Simple data type for application configuration"; license = stdenv.lib.licenses.bsd3; @@ -44304,7 +46839,7 @@ self: { mkDerivation { pname = "configuration-tools"; version = "0.2.15"; - sha256 = "8231a7a893add8ae78ccb2b25e0fa98b0c0fd7d7a5f6e2e88d3711e93576121e"; + sha256 = "07hjfqsyj49piplf5xm5szbhy34bm47mxcmjriwaxn5djflafcc2"; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base-unicode-symbols base64-bytestring bytestring Cabal case-insensitive connection @@ -44332,7 +46867,7 @@ self: { mkDerivation { pname = "configurator"; version = "0.3.0.0"; - sha256 = "6eb9996b672e9f7112ca23482c42fa533553312c3c13f38a8a06476e67c031b4"; + sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf"; libraryHaskellDepends = [ attoparsec base bytestring directory hashable text unix-compat unordered-containers @@ -44353,7 +46888,7 @@ self: { mkDerivation { pname = "configurator-export"; version = "0.1.0.1"; - sha256 = "9dbd62ef29c97792ccdfdb1b3b79aedfa527dce49a9ac5054f21b29a7f9b824c"; + sha256 = "0k42kdzrmci19w2wb6lswkf2g9fzmrwkn6yvvz694xy957pn5gcx"; libraryHaskellDepends = [ base base-compat configurator pretty semigroups text unordered-containers @@ -44373,7 +46908,7 @@ self: { mkDerivation { pname = "configurator-ng"; version = "0.0.0.1"; - sha256 = "3a367ad5dd04bddb891600899b99cbefa4bb53e44c83ebab114dacd1b68f012b"; + sha256 = "0aq1iyvd3b2d26myp0scwi9vp97grfcrp2802s4xpg84vpapldis"; libraryHaskellDepends = [ attoparsec base bytestring critbit data-ordlist directory dlist fail hashable scientific text unix-compat unordered-containers @@ -44394,7 +46929,7 @@ self: { mkDerivation { pname = "confsolve"; version = "0.5.5"; - sha256 = "2f631b8794d54e118d40c663db03695a6c7bf8c2d42bf4b4882aae7165969973"; + sha256 = "0wwrjrjp3biai2sg8aylqbw7nv2sd41xnqy6826i2knmjj3inqrg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44410,7 +46945,7 @@ self: { mkDerivation { pname = "congruence-relation"; version = "0.1.0.0"; - sha256 = "1b853725f02a7e72f3d00f4e3c5c66280a7864a4626f27beeb41ad5bfc9a44de"; + sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v"; libraryHaskellDepends = [ array base containers ]; description = "Decidable congruence relations for Haskell: up to you whether this is a joke"; license = stdenv.lib.licenses.mit; @@ -44422,7 +46957,7 @@ self: { mkDerivation { pname = "conjugateGradient"; version = "2.2"; - sha256 = "ca1b40dfb3227ebfb90dd052fc6e0c12339d93f409e18cea95900795839143c7"; + sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya"; libraryHaskellDepends = [ base containers random ]; homepage = "http://github.com/LeventErkok/conjugateGradient"; description = "Sparse matrix linear-equation solver"; @@ -44437,7 +46972,7 @@ self: { mkDerivation { pname = "conjure"; version = "0.1"; - sha256 = "e3029e41dc934475021ed389a76bb4e6036c8e970e948eff2a98db0c481a4309"; + sha256 = "02a33940rnwq5bzqx50fjy76q0z6nimsg2fk3q17ai4kvi0rw0p3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44454,7 +46989,7 @@ self: { mkDerivation { pname = "conlogger"; version = "0.1.0.1"; - sha256 = "037e195fa7a7d6dbca2b18660bd1e2f595b1ba416495c759c28cc8ab8fb0b7af"; + sha256 = "1bxpn27spj4cq9cwg5b486xb35gmwb8hnrhq5g5dpmm7lxgijzh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -44472,8 +47007,8 @@ self: { }: mkDerivation { pname = "connection"; - version = "0.2.7"; - sha256 = "46d452dc92ebc6e851a9f9ac01dd2d29df846795dfce039cf07ba7102a323235"; + version = "0.2.8"; + sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -44491,7 +47026,7 @@ self: { mkDerivation { pname = "connection-pool"; version = "0.2.1"; - sha256 = "2364c5a7b5d0dbeb00478070a4e527ab019ffb86e14e726a2a9ee56f8cb884dc"; + sha256 = "1p44p266zrcy59m74kp1hvxry0db4zjs8w408w0fpnyhnnkwar13"; libraryHaskellDepends = [ base between data-default-class monad-control network resource-pool streaming-commons time transformers-base @@ -44508,7 +47043,7 @@ self: { mkDerivation { pname = "consistent"; version = "0.1.0"; - sha256 = "f8d983c3c3bc4f0928681c98dac459c18d4dbe64c575d260ac4576e8866a0833"; + sha256 = "0cq8da3fhxj5mihd4xf5cjz4v3f1b72dm60wd0l0jkxwqg1q7ngq"; libraryHaskellDepends = [ base lifted-async lifted-base monad-control stm transformers transformers-base unordered-containers @@ -44527,7 +47062,7 @@ self: { mkDerivation { pname = "console-program"; version = "0.4.2.1"; - sha256 = "fe8af591d5adcc26c3c8d7cb8830c8e162e8b7cfd3fd53fd36d17a90c1685bc1"; + sha256 = "1havd30r0yni6vym7zfkryvyhqp1r0q8ijypr31jdk5dsn8zb2py"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht @@ -44537,12 +47072,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "console-prompt" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "console-prompt"; + version = "0.1"; + sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/jlamothe/console-prompt"; + description = "console user prompts"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "console-style" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "console-style"; version = "0.0.2.1"; - sha256 = "6d818ea841d7acfe6c42cc3fc7751e324656abfd0509ce470bc8bdbf52d1bd7f"; + sha256 = "0zxxs59bzgf81d3ww285znmmciij3rswfgyc89ngxb6p86l8x0bd"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/minad/console-style#readme"; description = "Styled console text output using ANSI escape sequences"; @@ -44554,7 +47101,7 @@ self: { mkDerivation { pname = "const-math-ghc-plugin"; version = "1.0.0.0"; - sha256 = "b4fd39a813f905c3174b8600958383d3be89cf6325d3b12a23d876efb41e92b9"; + sha256 = "1fcj3ssfyxnq4cmb3lr5cg7qkgnkhf1ra0469cbw61gr2fl3kzdl"; libraryHaskellDepends = [ base containers ghc ]; testHaskellDepends = [ base directory process ]; homepage = "https://github.com/kfish/const-math-ghc-plugin"; @@ -44568,7 +47115,7 @@ self: { mkDerivation { pname = "constrained-categories"; version = "0.3.0.1"; - sha256 = "a21cb119f0eda4631e89e3b1d8210bc623ea12e721f5c415d8ada410081aea7d"; + sha256 = "0zga3841195dv0aw9x91ww9fl8y61chxicg3i4g6797dy0cv2752"; libraryHaskellDepends = [ base tagged void ]; homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; @@ -44581,7 +47128,7 @@ self: { mkDerivation { pname = "constrained-dynamic"; version = "0.1.0.0"; - sha256 = "20952857c40fcb730584000d2a98e6a89f9f457b86e5e035ae055b40919c8f49"; + sha256 = "0jcgkj8l0nq5mqsy1rc6gd2rz7x8wsc2l380hh2p7jqgqibji590"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dynamic typing with retained constraints"; @@ -44589,17 +47136,24 @@ self: { }) {}; "constrained-monads" = callPackage - ({ mkDerivation, base, containers, doctest, QuickCheck - , transformers + ({ mkDerivation, base, containers, criterion, deepseq, doctest + , free, nat-sized-numbers, QuickCheck, smallcheck, transformers + , vector }: mkDerivation { pname = "constrained-monads"; - version = "0.1.0.0"; - sha256 = "1822fb5f5bec60b9c7efc11b776718bcdc66399a8c34687fe6173975ec010184"; - libraryHaskellDepends = [ base containers transformers ]; + version = "0.5.0.0"; + sha256 = "1h07vgn8cw42ckdy20xwz7rrny2d4v2gsmkb8i0qrly4bqa8sqcf"; + libraryHaskellDepends = [ + base containers deepseq free transformers + ]; testHaskellDepends = [ base containers doctest QuickCheck transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq nat-sized-numbers QuickCheck + smallcheck transformers vector + ]; homepage = "https://github.com/oisdk/constrained-monads#readme"; description = "Typeclasses and instances for monads with constraints"; license = stdenv.lib.licenses.mit; @@ -44611,7 +47165,7 @@ self: { mkDerivation { pname = "constrained-normal"; version = "1.0.2"; - sha256 = "4c3dae1c10a037f152b5904048b9d55f2f17d2dfddcf96ae4a5de666b1e000d7"; + sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac"; libraryHaskellDepends = [ base ]; homepage = "http://dx.doi.org/10.1145/2500365.2500602"; description = "Normalised Deep Embeddings for Constrained Type-Class Instances"; @@ -44623,21 +47177,32 @@ self: { mkDerivation { pname = "constraint-classes"; version = "0.5.1"; - sha256 = "5e26e76d7d1bcbdf77a384ffc74eb36a39f82e23a29d3ee80b6bf29ab7ce6921"; + sha256 = "08b9rsvrmwkb1gl3x7d24cpghfband7cgzw4ldvxzjqvgmnyf9jy"; libraryHaskellDepends = [ base constraints transformers ]; homepage = "http://github.com/guaraqe/constraint-classes#readme"; description = "Various typeclasses using ConstraintKinds"; license = stdenv.lib.licenses.bsd3; }) {}; + "constraint-manip" = callPackage + ({ mkDerivation, base, indextype }: + mkDerivation { + pname = "constraint-manip"; + version = "0.1.0.0"; + sha256 = "1janlm8nicnj11yy35b8n73dik6bib5aqphgl248c2kn2lgs7fj8"; + libraryHaskellDepends = [ base indextype ]; + description = "Some conviencience type functions for manipulating constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "constraints" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl , transformers, transformers-compat }: mkDerivation { pname = "constraints"; - version = "0.9"; - sha256 = "b7b4135ceacdd18d291bbd83277cc21bbb066d0e16ce35f879619f17c1c8d29d"; + version = "0.9.1"; + sha256 = "11d76051i2a335bvack04dqvsz4zhgcms1jxlvy4a4c670l02vi7"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl transformers transformers-compat @@ -44652,7 +47217,7 @@ self: { mkDerivation { pname = "constructible"; version = "0.1.0.1"; - sha256 = "30aab02b0ee5befec3da9ad1bdea0e605bf60a90f9866031c2c69314a0487d34"; + sha256 = "0d3x92h194y6q8qn11prj05gcnv01vmbvlcsvb1zxgp51qmv1aih"; libraryHaskellDepends = [ arithmoi base binary-search complex-generic ]; @@ -44667,7 +47232,7 @@ self: { mkDerivation { pname = "constructive-algebra"; version = "0.3.0"; - sha256 = "3dfc28bb02704074d4ebb0e75d1b0e0701b6b840eb686e0ee47ff082e7064b9d"; + sha256 = "17ab0vkq5w3zwh76ws7b82wbc0871qdmvrxhxga78h3h0axjiz1x"; libraryHaskellDepends = [ base QuickCheck type-level ]; description = "A library of constructive algebra"; license = stdenv.lib.licenses.bsd3; @@ -44684,7 +47249,7 @@ self: { mkDerivation { pname = "consul-haskell"; version = "0.4.2"; - sha256 = "b10812b70dfbce7037f9f23eda71fa2fa6fc97ed309bd63c00f226522d30d80a"; + sha256 = "02nq60nm49pj00ydd6rhxnbzr9igz9qxlgpjz4vp1kpv1nvi425i"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring connection either exceptions http-client http-client-tls http-types lifted-async @@ -44709,9 +47274,9 @@ self: { mkDerivation { pname = "consumers"; version = "2.0"; - sha256 = "467af01ed4ce5f5240c16a0693e32f27f1f098723d11c7f1eab004d08f285995"; + sha256 = "15ar527x015hxbqwf49xfacg1w975zir61kaq5054pyfshgg0yj6"; revision = "1"; - editedCabalFile = "5f7410822e5c36feeb12b24e3bbcb02bb6ed295812ef013913e2afa81f1980c8"; + editedCabalFile = "1j4034gsibz22cwh3vqjb0lyvdibn2y3nkmj2bmzwdjw5s110x2z"; libraryHaskellDepends = [ base containers exceptions hpqtypes lifted-base lifted-threads log monad-control mtl stm time transformers-base @@ -44730,7 +47295,7 @@ self: { mkDerivation { pname = "container"; version = "1.0.2"; - sha256 = "413ef2df4f8f99c8ba85547435d816eee87a72784e08aae49563bba112f41b79"; + sha256 = "0y8vyh9a3fv3jpjal22fg1r7ms7f2vc3ax2lhnxci6cg9zgz4gj1"; libraryHaskellDepends = [ base containers data-default data-layer functor-utils lens lens-utils mtl template-haskell text transformers transformers-base @@ -44747,7 +47312,7 @@ self: { mkDerivation { pname = "container-builder"; version = "0.1"; - sha256 = "279fc326fa7e013d41203828591b70dbd316eca2010e9f01bebdfa6186539cee"; + sha256 = "1vlwaf363ymxpq0ry3h1lbn1dlyvf0dmja1q410ks0byz8kc77r7"; libraryHaskellDepends = [ base vector ]; homepage = "https://github.com/andrewthad/container-builder#readme"; description = "Functions for building containers from a known number of elements"; @@ -44759,7 +47324,7 @@ self: { mkDerivation { pname = "container-classes"; version = "0.0.0.0"; - sha256 = "fb9a562f8f114996ec8ec584c06836122892cd9fac7236c75061df742b28bda2"; + sha256 = "18mx50mp9pv1a33kcwmckz6r4a0j6rlc1165ivn9cj8iiwpmd6pv"; libraryHaskellDepends = [ base ]; description = "Generic classes for interacting with different container types"; license = stdenv.lib.licenses.bsd3; @@ -44770,24 +47335,24 @@ self: { mkDerivation { pname = "containers"; version = "0.4.2.1"; - sha256 = "556720da0be90d23a82927acbf741f770d17f13fdcf313ba2c5f65d369f7b283"; + sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm"; revision = "2"; - editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8"; + editedCabalFile = "1j3hr5gqq14bj0yxaz2nyv106zgqf1s12m90y0sgw7xmw1xpipsc"; libraryHaskellDepends = [ array base deepseq ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_10_1" = callPackage + "containers_0_5_10_2" = callPackage ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq , ghc-prim, HUnit, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.10.1"; - sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347"; + version = "0.5.10.2"; + sha256 = "08wc6asnyjdvabqyp15lsbccqwbjy77zjdhwrbg2q9xyj3rgwkm0"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -44809,7 +47374,7 @@ self: { mkDerivation { pname = "containers-benchmark"; version = "1.1.0.0"; - sha256 = "a09ee8011bcd47c43ff803784b62c0b2f992605426cdb4d266cac7c71f450886"; + sha256 = "11h88lgwgiyacv9b9k96aih95ydjq1i4ny03z0zw8iyd3c0yi7m0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44826,7 +47391,7 @@ self: { mkDerivation { pname = "containers-deepseq"; version = "0.1.0.1"; - sha256 = "8114b5bf3c5bc1c8afba3ecf4dd3389c251602259e1b2e97becf3b63243c2d51"; + sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541"; libraryHaskellDepends = [ base containers deepseq ]; description = "Provide orphan NFData instances for containers as needed. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -44837,7 +47402,7 @@ self: { mkDerivation { pname = "containers-unicode-symbols"; version = "0.3.1.1"; - sha256 = "4655f286a2d116cb5f2b89f472df54df739bf904ac8e932b2fd34d3f713e9b31"; + sha256 = "0ccv7rqkykfk5wmr73mc0kwrnwyzakgp5x495dgwn5nila3g4ma6"; libraryHaskellDepends = [ base base-unicode-symbols containers ]; homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; @@ -44853,7 +47418,7 @@ self: { mkDerivation { pname = "context-free-grammar"; version = "0.1.0"; - sha256 = "410d97240c586354d7cb68e8032886174a87f2e50c797289e700c73420da4687"; + sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1"; libraryHaskellDepends = [ array base containers control-monad-omega dlist mtl pretty template-haskell @@ -44873,7 +47438,7 @@ self: { mkDerivation { pname = "context-stack"; version = "0.1.0.1"; - sha256 = "dd8cf31cac9477345e720d6edaa350f316bcb46290adb75031c40ca236eda178"; + sha256 = "0y51xlva4364658bgbchcasbq5pka2ixlvhdf9g38xwlmhfg736x"; libraryHaskellDepends = [ base classy-prelude mtl unordered-containers ]; @@ -44890,7 +47455,7 @@ self: { mkDerivation { pname = "continue"; version = "0.2.0"; - sha256 = "2a95bffad99731fff9b38999035ba0ffc9de2acad1d5d68d241bcdfa17e6d847"; + sha256 = "0iyqwqbzmk8v4j6xdmfir8mdxjgzl1dh76c9ngwzyccpv7xbz59a"; libraryHaskellDepends = [ base bifunctors monad-control mtl semigroupoids transformers transformers-base @@ -44905,7 +47470,7 @@ self: { mkDerivation { pname = "continued-fractions"; version = "0.9.1.1"; - sha256 = "d0da6d0fca5f1ae750b53951ea50d22523a79b346028a50970add6fa950f173f"; + sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh"; libraryHaskellDepends = [ base ]; homepage = "/dev/null"; description = "Continued fractions"; @@ -44919,7 +47484,7 @@ self: { mkDerivation { pname = "continuum"; version = "0.1.0.7"; - sha256 = "a6bbd7bee80d5216e4678fc9bdf85f4136b079ed8d2e2cf8585c76420bb0386e"; + sha256 = "0viqn05l4xjwb3w2qbldxmwv0dj1bzwbvjcgczj1clhdx2zdgfx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44937,7 +47502,7 @@ self: { mkDerivation { pname = "continuum-client"; version = "0.1.0.0"; - sha256 = "f338dd2f4480d64d1f6d1d9527deff62e6ccc7e5687c5ba6225ea901c56f6763"; + sha256 = "0qv7dz2h3aay4ak5nz38wp3wrrk2zzg2g58xdlglvml08hpxsf7k"; libraryHaskellDepends = [ base bytestring cereal containers mtl nanomsg-haskell time ]; @@ -44952,7 +47517,7 @@ self: { mkDerivation { pname = "contravariant"; version = "1.4"; - sha256 = "e1666df1373ed784baa7d1e8e963bbc2d1f3c391578ac550ae74e7399173ee84"; + sha256 = "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1"; libraryHaskellDepends = [ base semigroups StateVar transformers transformers-compat void ]; @@ -44968,7 +47533,7 @@ self: { mkDerivation { pname = "contravariant-extras"; version = "0.3.3.1"; - sha256 = "f35d9df4d1c0fa767afca6500c6ab598f052128abc513259930ef5b6bc7c79d5"; + sha256 = "1mbrgjybdx8fjdck4ldwi8955w4qnmm0ql56zix7dyn0s7s9spgk"; libraryHaskellDepends = [ base-prelude contravariant template-haskell tuple-th ]; @@ -44982,7 +47547,7 @@ self: { mkDerivation { pname = "control-bool"; version = "0.2.1"; - sha256 = "e46a85d2985a65f8d7ecbcdab0cfb12734b4d6e4c558631e6ab01fe742ed5581"; + sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/fumieval/control-bool"; description = "Useful combinators for boolean expressions"; @@ -44994,7 +47559,7 @@ self: { mkDerivation { pname = "control-event"; version = "1.2.1.1"; - sha256 = "c59453ad675b3bbcbec10e5a662846a0fce0343d6e5878d558247edb758b9a43"; + sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565"; libraryHaskellDepends = [ base containers stm time ]; description = "Event scheduling system"; license = stdenv.lib.licenses.bsd3; @@ -45006,7 +47571,7 @@ self: { mkDerivation { pname = "control-monad-attempt"; version = "0.3.0.1"; - sha256 = "bac8217c9980bccfce3381ea6a28eb0e117d9aaf99f2cc3c2e5ffad5f6111690"; + sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; libraryHaskellDepends = [ attempt base transformers ]; homepage = "http://github.com/snoyberg/control-monad-attempt"; description = "Monad transformer for attempt. (deprecated)"; @@ -45021,7 +47586,7 @@ self: { mkDerivation { pname = "control-monad-exception"; version = "0.11.2"; - sha256 = "970459a274585c2704699059be0a7bd4b144d1c0a5473d53210430e362d1b56d"; + sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p"; libraryHaskellDepends = [ base failure lifted-base monad-control monadloc transformers transformers-base @@ -45038,7 +47603,7 @@ self: { mkDerivation { pname = "control-monad-exception-monadsfd"; version = "0.10.3"; - sha256 = "35da0c839c04b5407deb959c6aab6009a7b1223b9a3d84627a7218e433eefec7"; + sha256 = "1izyxqry863jg9i88gcs7cib39q9c2mnm74mxdyl1d84kj1hrnim"; libraryHaskellDepends = [ base control-monad-exception monads-fd transformers ]; @@ -45055,7 +47620,7 @@ self: { mkDerivation { pname = "control-monad-exception-monadstf"; version = "0.10.3"; - sha256 = "ea9bc0ed343b1067f2df3e699cdb053c265622b9ae585e9422cbdcf2c2f144e2"; + sha256 = "1qj4y71g5p6b4aa5wn5fp4i5c9iw0pdrqs9yvzr6f41v6knw16za"; libraryHaskellDepends = [ base control-monad-exception monads-tf transformers ]; @@ -45069,7 +47634,7 @@ self: { mkDerivation { pname = "control-monad-exception-mtl"; version = "0.10.3"; - sha256 = "d1d2657a3d638d2ddce9f38e2c15dd6f2d06aa67c959269abbda89c6fab098f3"; + sha256 = "1wwqn3xcd2fspfd2cnf9cym0cbbgvlajr3pkx7f2v3b37mx6blni"; libraryHaskellDepends = [ base control-monad-exception mtl ]; doHaddock = false; homepage = "http://pepeiborra.github.com/control-monad-exception"; @@ -45082,7 +47647,7 @@ self: { mkDerivation { pname = "control-monad-failure"; version = "0.7.0.1"; - sha256 = "78524bf400bcd382bada63479e5d32be627199d9f6ec2d780ca84317162760bc"; + sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq"; libraryHaskellDepends = [ base failure transformers ]; homepage = "http://github.com/pepeiborra/control-monad-failure"; description = "A class for monads which can fail with an error. (deprecated)"; @@ -45095,7 +47660,7 @@ self: { mkDerivation { pname = "control-monad-failure-mtl"; version = "0.7.1"; - sha256 = "12d9b9cd2cc0f9a5f51145511e3c86a4a4c9b1ab0915d17742670c8077413149"; + sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j"; libraryHaskellDepends = [ base failure mtl ]; homepage = "http://github.com/pepeiborra/control-monad-failure"; description = "A class for monads which can fail with an error for mtl 1 (deprecated)"; @@ -45108,7 +47673,7 @@ self: { mkDerivation { pname = "control-monad-free"; version = "0.5.3"; - sha256 = "61eeb33b98fe2cd7c78a4878b2c33ca82475696e3d7425bdca11bddb1857fcc5"; + sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1"; libraryHaskellDepends = [ base deepseq transformers ]; homepage = "http://github.com/pepeiborra/control-monad-free"; description = "Free monads and monad transformers"; @@ -45121,9 +47686,9 @@ self: { mkDerivation { pname = "control-monad-free"; version = "0.6.1"; - sha256 = "fea9173d3c29729a8e0789d654bf3b16928e0b740465bd8798ac2cfeec492286"; + sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy"; revision = "1"; - editedCabalFile = "d08dceee154098bee492a1c00ef699a2a3a0e8a3851c5d49ccd49d5645a501a4"; + editedCabalFile = "1901lm2md7flri4ms745lgla18x2k7v0xh51jbjbx6202ppcx3fh"; libraryHaskellDepends = [ base prelude-extras transformers ]; homepage = "http://github.com/pepeiborra/control-monad-free"; description = "Free monads and monad transformers"; @@ -45135,7 +47700,7 @@ self: { mkDerivation { pname = "control-monad-loop"; version = "0.1"; - sha256 = "f29b08497897268daf4c547390dad69f4ee00032082e3d5305c33e6eee257300"; + sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj"; libraryHaskellDepends = [ base transformers transformers-base ]; homepage = "https://github.com/joeyadams/haskell-control-monad-loop"; description = "Simple monad transformer for imperative-style loops"; @@ -45147,7 +47712,7 @@ self: { mkDerivation { pname = "control-monad-omega"; version = "0.3.1"; - sha256 = "383b98ecf5db5add42f318672af9eb1c8b9d99ec42d48c240e209a93b5cf1186"; + sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/luqui/control-monad-omega"; description = "A breadth-first list monad"; @@ -45159,7 +47724,7 @@ self: { mkDerivation { pname = "control-monad-queue"; version = "0.2.0.1"; - sha256 = "d428f7e761024716118605107b8f2f4b9d721f1163bd36865b969f3892f6d1b5"; + sha256 = "1dfiys93i7wnbf33dgb324gp57ab5y7pn405hq8iciq2c7kzfa6l"; libraryHaskellDepends = [ base ]; description = "Reusable corecursive queues, via continuations"; license = stdenv.lib.licenses.bsd3; @@ -45170,7 +47735,7 @@ self: { mkDerivation { pname = "control-timeout"; version = "0.1.2"; - sha256 = "6f7bf5981f2179658658116d6efd44bb6b51ed70036d4438e39339d508333dbc"; + sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg"; libraryHaskellDepends = [ base containers stm time ]; description = "Timeout handling"; license = stdenv.lib.licenses.bsd3; @@ -45181,7 +47746,7 @@ self: { mkDerivation { pname = "contstuff"; version = "1.2.6"; - sha256 = "0300643fc8877c0ad604d2a4607c6a7aa5117940c875ed4e019049a9a85e8267"; + sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003"; libraryHaskellDepends = [ base transformers ]; homepage = "http://haskell.org/haskellwiki/Contstuff"; description = "Fast, easy to use CPS-based monad transformers"; @@ -45193,7 +47758,7 @@ self: { mkDerivation { pname = "contstuff-monads-tf"; version = "0.2.1"; - sha256 = "05f647352b54179e2f76a36f7686c13473f554cf7467cfba14c4549095399e48"; + sha256 = "0j4y76ar0m642jxcyrvlrxagawrlq637cvx3fqprw5sl5cslgxh5"; libraryHaskellDepends = [ base contstuff monads-tf ]; description = "ContStuff instances for monads-tf transformers (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -45205,7 +47770,7 @@ self: { mkDerivation { pname = "contstuff-transformers"; version = "0.1.1"; - sha256 = "262a527d696e3252ee000e528936b2a64990a7e19277e61c8917f715eed4bb2c"; + sha256 = "0b5vskp1bxqpi4ffcxwjw6kr0jd6n8v8jlhf03p54ckfd5ym4ai6"; libraryHaskellDepends = [ base contstuff transformers ]; description = "Deprecated interface between contstuff 0.7.0 and the transformers package"; license = stdenv.lib.licenses.bsd3; @@ -45217,7 +47782,7 @@ self: { mkDerivation { pname = "converge"; version = "0.1.0.1"; - sha256 = "72df25e93cd41af26c17c28d6c0930b22d51c903ee4fc181ca76c2fbe6a94878"; + sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj"; libraryHaskellDepends = [ base ]; homepage = "/dev/null"; description = "Limit operations for converging sequences"; @@ -45229,9 +47794,9 @@ self: { mkDerivation { pname = "conversion"; version = "1.2.1"; - sha256 = "c97771da92f229886f1a3033253a63bb429244f06a7cd877bdd633b4e4b82108"; + sha256 = "0211p3jb8cynpmvxhz3ay1294hmvccx2acrh39pqhagjjbd72xy9"; revision = "1"; - editedCabalFile = "8db4210950736e54be5cd7f7076c19e05d06fb48673eb23638093246a1e7199e"; + editedCabalFile = "17hrwyhlcch970vb4gk793xhcpg035n0gxypbjz58vkka04j3d4d"; libraryHaskellDepends = [ base-prelude ]; homepage = "https://github.com/nikita-volkov/conversion"; description = "Universal converter between values of different types"; @@ -45243,7 +47808,7 @@ self: { mkDerivation { pname = "conversion-bytestring"; version = "1.0.1"; - sha256 = "90e3a027b17282a83809b67cdffdf5b8fc181d2c6b0d1011a95bf25c05387079"; + sha256 = "0ybh702mrwjvm48i03bb5hfiiz5qypyxyz5n14wai0kjn4ks1qwh"; libraryHaskellDepends = [ base-prelude bytestring conversion ]; homepage = "https://github.com/nikita-volkov/conversion-bytestring"; description = "\"Conversion\" instances for the \"bytestring\" library"; @@ -45255,7 +47820,7 @@ self: { mkDerivation { pname = "conversion-case-insensitive"; version = "1.0.0.0"; - sha256 = "97b591d3acf63efa882b7fd8d2e024b2564010034a766369cb985e66a32cae92"; + sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp"; libraryHaskellDepends = [ case-insensitive conversion ]; homepage = "https://github.com/nikita-volkov/conversion-case-insensitive"; description = "\"Conversion\" instances for the \"case-insensitive\" library"; @@ -45269,7 +47834,7 @@ self: { mkDerivation { pname = "conversion-text"; version = "1.0.1"; - sha256 = "3069670a34b7bd114ec1aa6a16b0ff1b4323ed8107186ad5b77013efe26b9b59"; + sha256 = "0ncvdgify4vhnzanl607h7nj6hqvzyq1csmaq5713gdp6h56fs9h"; libraryHaskellDepends = [ base-prelude bytestring conversion conversion-bytestring text ]; @@ -45285,7 +47850,7 @@ self: { mkDerivation { pname = "convert"; version = "1.0.2"; - sha256 = "388502eb341523d153276e510815c5b2d1fa83c125c5da6b19844bb084149e6f"; + sha256 = "0vwy2j2b0jw435mxmi95q61zmldjqlahhlbf4x9x28qm6kmh519q"; libraryHaskellDepends = [ base bytestring containers either lens mtl old-locale old-time template-haskell text time @@ -45304,7 +47869,7 @@ self: { mkDerivation { pname = "convert-annotation"; version = "0.5.0.1"; - sha256 = "11a2eb8d8f02fd28bb1772aa42fea95dcc9ef8e4c8843f44e401c8a0749c1fa5"; + sha256 = "198zkisa1j01wi23z168wkw9xk2xm7z45akj2yxjiz82iy6yp8hi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45328,7 +47893,7 @@ self: { mkDerivation { pname = "convertible"; version = "1.1.1.0"; - sha256 = "e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c"; + sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45346,7 +47911,7 @@ self: { mkDerivation { pname = "convertible-ascii"; version = "0.1.0.1"; - sha256 = "5cea401d103279b35868253b45877ee518cae5e86912623b65f1834132c0ee7b"; + sha256 = "0yzfq0r430ziclxn44k9x3jwl675gs3lafr5d1cb6y9j20fl1sjw"; libraryHaskellDepends = [ ascii base base-unicode-symbols blaze-builder bytestring convertible-text failure text @@ -45364,7 +47929,7 @@ self: { mkDerivation { pname = "convertible-text"; version = "0.4.0.2"; - sha256 = "df8dc391ff4d82e3d18b049e3c4db50198aa1345c101d088683a075d5ba217f3"; + sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45382,7 +47947,7 @@ self: { mkDerivation { pname = "cookbook"; version = "3.0.1.1"; - sha256 = "63919cc80135e854317bc68a34d62ecf5bcd5a96e7bb66a01e706a520b6eba2d"; + sha256 = "0bdsdq5m4skh3sh6dfz7jrdcsnyg5vb392n6gcqm9s1m0749r4b3"; libraryHaskellDepends = [ base directory strict ]; description = "Tiered general-purpose libraries with domain-specific applications"; license = stdenv.lib.licenses.bsd3; @@ -45396,7 +47961,7 @@ self: { mkDerivation { pname = "cookie"; version = "0.4.2.1"; - sha256 = "06413091908e20ce154effdcd354d7eea1447380e29a8acdb15c3347512852e4"; + sha256 = "1r2j518lfcswn76qm6p2h1rl98gfsxad7p7z9qaww84fj28k0h86"; libraryHaskellDepends = [ base blaze-builder bytestring data-default-class deepseq old-locale text time @@ -45417,7 +47982,7 @@ self: { mkDerivation { pname = "coordinate"; version = "0.1.2"; - sha256 = "dba23e66c6669344571ee24b7ce65b3817241a4211e608cfb879daa4e5dbf052"; + sha256 = "0lphvgjs9nkrp37hirhi88d285rqbgk7qjz23rbl94v6qrk3x8nv"; libraryHaskellDepends = [ base lens transformers ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -45434,10 +47999,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "2.2.0"; - sha256 = "5ab66248bbfb63435ffb931323be965dfec045c4a56c16ebfb77b7a9020c4853"; - revision = "3"; - editedCabalFile = "5566482d53a961c2f08f95f8b1aa7ddae00120ffa29e99df936e9221beac6d6c"; + version = "2.2.1"; + sha256 = "04bfrxvz04jcc1favl21xb4qbj3gd0par0xg1f11r5s73ldnghb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45460,8 +48023,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "2.2.0"; - sha256 = "e9b9f55242db21d02080a9c96266967e84f9d49e74231526a49778913d6e7e9c"; + version = "2.2.1"; + sha256 = "1wyw1jiicx39x7iscy9rld7pnfpan8xfp8lphn7b658hipw0v4aq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45482,8 +48045,8 @@ self: { }: mkDerivation { pname = "copilot-cbmc"; - version = "2.2.0"; - sha256 = "ac9fe6c89c28864be84cc4fc9724d9081f1b118c798567541a9c2380f23cae0e"; + version = "2.2.1"; + sha256 = "0xcm6qgylhvnjaih1jbl4dripik10nqm6536rdspj6kzg81qifd9"; libraryHaskellDepends = [ base bytestring copilot-c99 copilot-core copilot-sbv directory pretty process @@ -45499,8 +48062,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "2.2.0"; - sha256 = "2a9a6c7954d66179b03654cf04297800de015ba9b11f76b9e80b02c290f060a1"; + version = "2.2.1"; + sha256 = "1mzxb24chxfrkpr4487dxkwbnhaysyxsrv4y38ma76nq141xr105"; libraryHaskellDepends = [ base containers dlist mtl pretty pretty-ncols random ]; @@ -45514,10 +48077,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "2.2.0"; - sha256 = "35bbc98550819f06978a73f5d19e15f93463b4b0a8cc6eae33cef45f30bf127c"; - revision = "1"; - editedCabalFile = "7ab61bdf2be4f514ad0b5241d32dd28ab67ecfcc865883f6d6811a9b4e7050af"; + version = "2.2.1"; + sha256 = "1pv54iwzcyvw46xq6am2l23sw223n8b9fqc910dkf2kjr6y6q6v8"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -45533,12 +48094,12 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "2.2.0"; - sha256 = "a6ae67ceb7fd7b63e7fa13af7f2039a606be8932430a702a9d7b8c7674f50b2b"; + 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; @@ -45550,8 +48111,8 @@ self: { }: mkDerivation { pname = "copilot-sbv"; - version = "2.2.0"; - sha256 = "8d657406fa3c846b14b05948857fce47dc66ba5eb73140ae6855dd98f6859dae"; + version = "2.2.1"; + sha256 = "00gym2xadw7zi5mrkfrnvxi6cr7c5rgmbwiflrif63j2q7v0z25l"; libraryHaskellDepends = [ base containers copilot-core directory filepath pretty sbv ]; @@ -45566,8 +48127,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "2.2.0"; - sha256 = "c24948bd2fcfc695f5ebf61116a72a75d6e0fbcadbbb91a5cbde4083285cf30c"; + 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 @@ -45584,9 +48145,9 @@ self: { mkDerivation { pname = "copr"; version = "1.1.1"; - sha256 = "dce6829db3ed8b6c8949e00af8e2d798174280758d23309f497f7b143330ef7d"; + sha256 = "0zgg60ri8yvz96gk08wdfn0445wqszigh2p0964nr2zdnffq5rnw"; revision = "1"; - editedCabalFile = "ef9fb8be7d257feae9e4647de62d489860e2bd6510e34a35465cf5b763fa2425"; + editedCabalFile = "0994z9ivgxaw8qslmqqhcnyy4q4q90nyczb4wklylzr5gnzbi7zg"; libraryHaskellDepends = [ aeson base bytestring containers HsOpenSSL http-streams io-streams semigroups text @@ -45603,7 +48164,7 @@ self: { mkDerivation { pname = "core"; version = "0.5"; - sha256 = "9fb1840f37a40c40bcfeb838ee45d6e44fa5ee31aa4d50044114d938da720fbb"; + sha256 = "1fqgfbd3in8l84250kda67paakz4sr2ywf5qzsy403546w7q9ccz"; libraryHaskellDepends = [ base bytestring parsec pretty ]; description = "External core parser and pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -45616,8 +48177,8 @@ self: { }: mkDerivation { pname = "core-compiler"; - version = "0.1.0.0"; - sha256 = "06fe348263225cf8410f59b848e2f91ee1618735cde87ac0ec2989b76af8072e"; + version = "0.1.0.1"; + sha256 = "0qyrqarqf35z9kp2znaq3qvfpkjlvyahkvarr1jhl2z12alfvzns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45636,7 +48197,7 @@ self: { mkDerivation { pname = "core-haskell"; version = "0.6.4"; - sha256 = "b9e39fc2240a618708add5c8e162cf5c3712ef935a06a01e3bbc1b89ae9055f2"; + sha256 = "1wjmj2p8j6xw7cga01jsjgpi4dswrxif3j6mml48fq8a4k19zqxr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -45656,7 +48217,7 @@ self: { mkDerivation { pname = "corebot-bliki"; version = "0.2.2.0"; - sha256 = "0f076d6196c08942b739699c7313c76a2e047994a8fdc8042b05f2c017f9ee82"; + sha256 = "10pfz4bw1wh55c2cizd8jiwh8bkaqw9p773976vl52f0jrhns1qg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45680,7 +48241,7 @@ self: { mkDerivation { pname = "coroutine-enumerator"; version = "0.1.1"; - sha256 = "e7429de12e84f6cbde0d23069ebcd22954fc94cd5a1e12b95235f05dfc854be6"; + sha256 = "1rjbhpy5vw1maawi47jsrnagqm19say9w1i31pgcpxl45vhrshp7"; libraryHaskellDepends = [ base enumerator monad-coroutine ]; homepage = "http://trac.haskell.org/SCC/wiki/coroutine-enumerator"; description = "Bridge between the monad-coroutine and enumerator packages"; @@ -45693,7 +48254,7 @@ self: { mkDerivation { pname = "coroutine-iteratee"; version = "0.1.1"; - sha256 = "8d838a6295c45459324342e7bc455075ec2e014eab31629e27e3b3cb27c991f9"; + sha256 = "1ycir4kwpcz34yg64cdb9q0jxv3ma12vrrs28cr5jm64jmi8m0wd"; libraryHaskellDepends = [ base iteratee monad-coroutine ]; homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee"; description = "Bridge between the monad-coroutine and iteratee packages"; @@ -45706,7 +48267,7 @@ self: { mkDerivation { pname = "coroutine-object"; version = "0.3.0"; - sha256 = "cf0fb74baee84167898e899f9e5779c0c71c9d2967fc4a52d25941aeddf0f7c1"; + sha256 = "1hgpy3fswhars994mz3756firiy0g5brx7w9is4nfhg8mr5vf3yg"; libraryHaskellDepends = [ base either free mtl transformers ]; description = "Object-oriented programming realization using coroutine"; license = stdenv.lib.licenses.bsd3; @@ -45719,7 +48280,7 @@ self: { mkDerivation { pname = "couch-hs"; version = "0.1.6"; - sha256 = "079b3eb630f4841e54b2bed0d9e1e514d627e186c5be51ba35f3cf0465053d57"; + sha256 = "0mrx0mjh9kzk6nx53gn5hvhjgmhlwphxkl5yn9a1x17l62v3x6q7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45741,7 +48302,7 @@ self: { mkDerivation { pname = "couch-simple"; version = "0.0.1.0"; - sha256 = "bf62acc13979f31c729e2aba4bb00ad451f026dbdb725ecedd122a806051ab9d"; + sha256 = "17dba5h80ahjvp75wwnvvckg0lfl1aq4pfiakrr1rwvr770sqqmz"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring data-default exceptions http-client http-types integer-gmp mtl text transformers @@ -45770,7 +48331,7 @@ self: { mkDerivation { pname = "couchdb-conduit"; version = "0.10.6"; - sha256 = "54897f96994f1725b2dff75d3e19f862d180fa7a884b09cb03c2a66a8abce566"; + sha256 = "0rp5pj56m9n20g5hjjw8gbx81lb2z0ckwpgpvyr2a5sgk6b7z2al"; libraryHaskellDepends = [ aeson attoparsec attoparsec-conduit base blaze-builder bytestring conduit containers data-default http-conduit http-types lifted-base @@ -45800,7 +48361,7 @@ self: { mkDerivation { pname = "couchdb-enumerator"; version = "0.3.7"; - sha256 = "f6a2e4d01e7b1ff3127f5ddf5219e8ef31d734d4405ea8c1951eb2d58251000a"; + sha256 = "02h0a61dbchyjp0shpj0shsdfcggx0cm5psxgw9g67vv3v8f98pn"; libraryHaskellDepends = [ aeson attoparsec attoparsec-enumerator base bytestring enumerator http-enumerator http-types lifted-base monad-control text @@ -45824,7 +48385,7 @@ self: { mkDerivation { pname = "count"; version = "0.0.1"; - sha256 = "fdcd6dd6c9587df80e9dc5ee540e9e68b149b07b7c71aeff7397609943dee2ab"; + sha256 = "1az2vr1rjq4pfgzswwbwgfq4kcb8kq759vn5kl7ghzaqr7b6vkgx"; libraryHaskellDepends = [ base ]; description = "Bijective mappings between values and possibly infinite prefixes of [0..]"; license = stdenv.lib.licenses.bsd3; @@ -45837,7 +48398,7 @@ self: { mkDerivation { pname = "countable"; version = "1.0"; - sha256 = "f9a0eb6f697a044bdf72e9c08126d4cb0f2d6de82cce07e55cb87ddbae6a0e6c"; + sha256 = "0v0fdapdnzdqbkjhgkicx1njs3ybshk83h79fbgln13sd5pyp87r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring silently tasty tasty-golden tasty-hunit @@ -45854,7 +48415,7 @@ self: { mkDerivation { pname = "countable-inflections"; version = "0.2.0"; - sha256 = "1ee92bece3c2bbf153dac013ee854fe8132702ee74cb61c07e7999ca1e35496d"; + sha256 = "0va96lgcm6brgv063jvlxq12f4z89y2yw4y0v99z3fy2wgn2ps8y"; libraryHaskellDepends = [ base bytestring exceptions pcre-utils regex-pcre-builtin text ]; @@ -45869,7 +48430,7 @@ self: { mkDerivation { pname = "counter"; version = "0.1.0.1"; - sha256 = "5fcde1f42a49b8376319db7a8e986c727e8c67c3766fa6f958f82c032f19cf5d"; + sha256 = "0pfg34ph6b7qb3wscvvnqdkqqzkjdjc8wynv35ikgf295bsf3kaz"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/wei2912/counter"; description = "An object frequency counter"; @@ -45877,12 +48438,30 @@ 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 { pname = "country-codes"; version = "0.1.3"; - sha256 = "062843cebfcb4df513e4688456311f07a2eb693935a053ce2eade2c8d586d1b5"; + sha256 = "1dfihvawiqmd5v75781m75lyp8h73wqmd138wh9zakfbpz746a06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base shakespeare text ]; @@ -45899,8 +48478,8 @@ self: { }: mkDerivation { pname = "courier"; - version = "0.1.1.4"; - sha256 = "e4e808d564166d79b819c6736fb445486530be1271365c3e75cb5f3e3a2ed9a3"; + version = "0.1.1.5"; + sha256 = "1lrlqdxd19yj05hhvla1nc4a81rqkf2r4a6sffqlgqrxyd7ng7mc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45924,7 +48503,7 @@ self: { mkDerivation { pname = "court"; version = "0.1.0.1"; - sha256 = "bf285d7d1071029b189098e0b137e89d54887661f1a4d55d4d4e4d6790a463fb"; + sha256 = "1yv3lj86fkaf9mfxb97ic5v8hm4xx0vv3q4qj0c9n0ki21ymsa5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -45942,7 +48521,7 @@ self: { mkDerivation { pname = "coverage"; version = "0.1.0.4"; - sha256 = "d9b7499e5f806d4f841b52230faa752de383fa4e4129054d52ebabb4f7e782da"; + sha256 = "1nl2wzvv9azba96haaa19vx87qrdfnm0y8sj3f24yvc0byg4kdyr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; homepage = "https://github.com/nicodelpiano/coverage"; @@ -45958,7 +48537,7 @@ self: { mkDerivation { pname = "cpio-conduit"; version = "0.7.0"; - sha256 = "8f0be7538b234496ef3b2fb2633336908ae99040ecb6d9832b3dbd1d0750f513"; + sha256 = "04zma03ivg9x5f1xkdpc828fk2lh6qrn7cig7gprci13id9yf2wg"; libraryHaskellDepends = [ base base16-bytestring binary bytestring conduit conduit-extra ]; @@ -45979,7 +48558,7 @@ self: { mkDerivation { pname = "cplex-hs"; version = "0.5.0.2"; - sha256 = "f39aa34ede9d79444fd6b4d8a3ca492bdce1b16054df5fa11b76acdb7eb81616"; + sha256 = "05hnp1zdpb3n3fhmzpslc2qy3p1b975a7n5lsr7l8ycxvr7a76pk"; libraryHaskellDepends = [ base containers hashable mtl primitive transformers unordered-containers vector @@ -45998,7 +48577,7 @@ self: { mkDerivation { pname = "cplusplus-th"; version = "1.0.0.0"; - sha256 = "12e7a49040c11a6a73b7e07d21248d80ac76d383461849ba22329a96cbb0ba3e"; + sha256 = "0gmsn35rd6ij4ax4j626hg9pdb40ilj22zg0nxrnl6n1828a9rqj"; libraryHaskellDepends = [ base bytestring containers process template-haskell ]; @@ -46014,8 +48593,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.20.3"; - sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91"; + version = "1.20.8"; + sha256 = "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46029,28 +48608,6 @@ self: { license = "LGPL"; }) {}; - "cpphs_1_20_4" = callPackage - ({ mkDerivation, base, directory, filepath, old-locale, old-time - , polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.4"; - sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory filepath old-locale old-time polyparse - ]; - executableHaskellDepends = [ - base directory filepath old-locale old-time polyparse - ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cprng-aes" = callPackage ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion , crypto-random, mtl @@ -46058,7 +48615,7 @@ self: { mkDerivation { pname = "cprng-aes"; version = "0.6.1"; - sha256 = "64592a01de8c6683c5e29f538dceee918887ffe211d87214a2e38559d72c21f3"; + sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4"; libraryHaskellDepends = [ base byteable bytestring cipher-aes crypto-random ]; @@ -46077,9 +48634,9 @@ self: { mkDerivation { pname = "cprng-aes-effect"; version = "0.1.0.2"; - sha256 = "cbe94de1ebbaba64233d5f6bfbdddbd62b210d04ddcd71eb366ccbebe4818310"; + sha256 = "0443h7jfpjvc6vmp3kfx0h6j2aynvgfznssz7lin9fmsxghlvsfb"; revision = "1"; - editedCabalFile = "b9752152bb1764da66976eaf18776b09dabf80eeb6f252bcee0da10fa0a1057e"; + editedCabalFile = "0zh5l6h0z88dxsy55wmnxs0bznh9ddviibvfjxkdlr0ppd922xdr"; libraryHaskellDepends = [ base cprng-aes crypto-random crypto-random-effect extensible-effects @@ -46095,7 +48652,7 @@ self: { mkDerivation { pname = "cpsa"; version = "3.3.2"; - sha256 = "0e0d19ea96de4ab9cf21bef285b04bd68e0c00796d52f36b86c30653c30c3b1d"; + sha256 = "079v1k1m61n3hrmz6lkdg400r3nn9fq8bwmy477vjjnyjvm1j38f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers parallel ]; @@ -46108,7 +48665,7 @@ self: { mkDerivation { pname = "cpu"; version = "0.1.2"; - sha256 = "5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974"; + sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -46122,7 +48679,7 @@ self: { mkDerivation { pname = "cpuid"; version = "0.2.3"; - sha256 = "f8198ab4408219fe001c0a50908af38a766e2a0b3afb8260307838e5517add88"; + sha256 = "126xg98yaf3q61h85yrs1cm6wxlayf590l0a3h0gw6c282s8l6gq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-accessor enumset ]; @@ -46136,7 +48693,7 @@ self: { mkDerivation { pname = "cpuinfo"; version = "0.1.0.1"; - sha256 = "d1b3e3992cc0c82edfb21f30e1684bb66e6a3cb23a26b777a079702362d05655"; + sha256 = "0mans1i26w3rl1vvf9isn8y6lvmn9dlf2c0znbgjxj605jcy7cyi"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ]; homepage = "https://github.com/TravisWhitaker/cpuinfo"; description = "Haskell Library for Checking CPU Information"; @@ -46148,7 +48705,7 @@ self: { mkDerivation { pname = "cpuperf"; version = "0.1.1"; - sha256 = "809aaf4757f81db6563ddb1ff8122fff246cde64305ab5a98bbfcfa746cdd5f6"; + sha256 = "1xnmrm3agkxziflvanihckg6q97z5w9gh7yv7mbbc7gqax3sz6l0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl process ]; @@ -46163,7 +48720,7 @@ self: { mkDerivation { pname = "cpython"; version = "3.4.0"; - sha256 = "75424a6d82ca641a2d95eb25c298ee6ec40d974957d75056bb98b5757fe0c7c8"; + sha256 = "1j67w1zpbdcqpdb51msp96bhvi3fxscc49gbjlnilr6ah9nllhkm"; libraryHaskellDepends = [ base bytestring text ]; libraryPkgconfigDepends = [ python34 ]; libraryToolDepends = [ c2hs ]; @@ -46180,7 +48737,7 @@ self: { mkDerivation { pname = "cql"; version = "3.1.1"; - sha256 = "45b0d9599dfb6b5df02eb17e18d45cef8abd7e175d4eb7f99ab94f9d50866da3"; + sha256 = "18vdhr89skxrkbwvfkjx2xzbv2pgbka1hzmi5vq5sszvkmcxkc25"; libraryHaskellDepends = [ base bytestring cereal Decimal iproute network template-haskell text time transformers uuid vector @@ -46205,7 +48762,7 @@ self: { mkDerivation { pname = "cql-io"; version = "0.16.0"; - sha256 = "82e5aff9b929fd9dec92760b9d0e75ca509ce2619942628e5c7e3a66f4204004"; + sha256 = "012043s6cfkybj764hlrc7i9ql6afl79s2vnjbn9vz99p7wszrc2"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptohash data-default-class exceptions hashable HsOpenSSL iproute lens @@ -46223,7 +48780,7 @@ self: { mkDerivation { pname = "cqrs"; version = "0.9.1"; - sha256 = "b5f0f5c9169ae733525c186ab5c7b3dbc3621d8375e66acbfb0872c350b31fd6"; + sha256 = "1mhznd8c6wh8zg5nmrkmhcfn5hyvng3vashqbi937rws2v4zbw5m"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "Command-Query Responsibility Segregation"; @@ -46237,7 +48794,7 @@ self: { mkDerivation { pname = "cqrs-core"; version = "0.10.0"; - sha256 = "21d7b9b86fa7dd697df2740cdde23079f081b2bdbe851d87889eca4ebc835f9c"; + sha256 = "172zhfy4xjlyi23iv1dypnr83w3r63ids33ly9ynkpd7dywbkmr1"; libraryHaskellDepends = [ base bytestring containers deepseq io-streams transformers uuid-types @@ -46256,7 +48813,7 @@ self: { mkDerivation { pname = "cqrs-example"; version = "0.10.0"; - sha256 = "fe5348c0b29e59b313d9e0a8c9a427994038279de66fce52d88ffc505e6157b0"; + sha256 = "1c2pc5g51z4gv19cwvz6klkkhh4r4yjcka70v49v6ncynb04hlzy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46276,7 +48833,7 @@ self: { mkDerivation { pname = "cqrs-memory"; version = "0.10.0"; - sha256 = "36f053bca39da3c8e98cc8771a0b982bcbc22ae500405ea4284b1100632798f0"; + sha256 = "1w4q4xih04ab52j5wh00wlmc5jrbk05ilxy8iklwi8wxlfy57w1n"; libraryHaskellDepends = [ base bytestring containers cqrs-core io-streams stm uuid-types ]; @@ -46295,7 +48852,7 @@ self: { mkDerivation { pname = "cqrs-postgresql"; version = "0.10.0"; - sha256 = "e4222248c3ff048a79c15a219a85c4b7f70ff0bfc3ef0fbc9d4b4f694ca0ea30"; + sha256 = "0c7al166jksbkny0zvy3pzq0zxxpqj2rl8asq5wql17zqd4248p4"; libraryHaskellDepends = [ base bytestring bytestring-lexing cqrs-core deepseq enclosed-exceptions io-streams postgresql-libpq resource-pool text @@ -46317,7 +48874,7 @@ self: { mkDerivation { pname = "cqrs-sqlite3"; version = "0.9.0"; - sha256 = "503bf0160bc823b99e19e4089bdd134eb76e37c30883d662135d64a9ce2fcf20"; + sha256 = "086g5z7ajr2x2didd0q8qcvnxdsf2gfrn27436gbj8y81cbg0fsh"; libraryHaskellDepends = [ base bytestring conduit cqrs-types direct-sqlite pool-conduit text transformers @@ -46338,7 +48895,7 @@ self: { mkDerivation { pname = "cqrs-test"; version = "0.9.0"; - sha256 = "f4958986d121ebba797be9274b3e8841bcf1f89422d4ab87b99318769a6087c4"; + sha256 = "1i47c2d7c64kp63spm12jkwg3g21i0z4n9z9gdwvmsr1s638k5gl"; libraryHaskellDepends = [ base bytestring conduit cqrs-types hspec HUnit pool-conduit stm transformers @@ -46356,7 +48913,7 @@ self: { mkDerivation { pname = "cqrs-testkit"; version = "0.10.0"; - sha256 = "50c8d272488a3b0ee41d2f6843608bb3d5be7b5c37bb32b5c5550ecaf0fce7d5"; + sha256 = "1mg7zkqcl3jmqnsk5frpbixvxmdkidh46s1g3pj0wfwa91rd5j2h"; libraryHaskellDepends = [ base bytestring containers cqrs-core deepseq hspec HUnit io-streams lifted-base random transformers uuid-types @@ -46371,7 +48928,7 @@ self: { mkDerivation { pname = "cqrs-types"; version = "0.9.1"; - sha256 = "68ec6f54afe655e764691f30c844778913957ad9f617e3f5587032307629276e"; + sha256 = "0vi755v30ckhb3sy65znv5x9a4w9fx2chc0zd5jffmg6mxa6zv38"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "Command-Query Responsibility Segregation. Modules for the basic types."; @@ -46385,7 +48942,7 @@ self: { mkDerivation { pname = "cr"; version = "1.2"; - sha256 = "c1c637b26cd6994c1c3747edcf951c8f83994000201cd7b0f459e485ae87ec80"; + sha256 = "107chyp8br2ryjqdf7100109k0wg3jawzva76wf4r6fndjr3gin1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46402,7 +48959,7 @@ self: { mkDerivation { pname = "crack"; version = "0.1"; - sha256 = "33ffccecbdad718720cf305cba7c4701fdedf880d297a423fa47013cd6dedc65"; + sha256 = "0rfwvvb3q0a7z8is95yjh3wfvz818xyblp1hrwh8fwddppncrzrk"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ crack ]; description = "A haskell binding to cracklib"; @@ -46415,7 +48972,7 @@ self: { mkDerivation { pname = "crackNum"; version = "1.9"; - sha256 = "a5a78b774e17837513b7c6048856c375457095898a59b7f3bbb7f49abb1639c5"; + sha256 = "1i9r2sxrmx5ppgrvfncai6ap0ibmqdb8h166nw9pb0qp9rvqp9x5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46442,7 +48999,7 @@ self: { mkDerivation { pname = "craft"; version = "0.0.0.1"; - sha256 = "34cb8c42afa115c0c834af170cb7c51a15fa8819e24bd310c1288a8ad6eb6ad3"; + sha256 = "1lvaxgb8m2i8q48d6jz2364gl58sqnvhq5xg6k4c05d1mx18rjrl"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-combinators conduit-extra containers cryptonite derive @@ -46465,7 +49022,7 @@ self: { mkDerivation { pname = "craftwerk"; version = "0.1"; - sha256 = "a39d24c7e05469883f35d642c393c04a8bca6d03d1bd41905fd5a981ddb00200"; + sha256 = "0002n3fq3afmby843gfi0dnwm2saq29w6hnn6lzqhsalw33j97d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour mtl vector-space ]; @@ -46480,7 +49037,7 @@ self: { mkDerivation { pname = "craftwerk-cairo"; version = "0.1"; - sha256 = "9f54fb8a2c38242f449649fc7912d9e0719fef76a736ea0a3a33912de841369a"; + sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z"; libraryHaskellDepends = [ base cairo craftwerk mtl ]; homepage = "http://mahrz.github.com/craftwerk.html"; description = "Cairo backend for Craftwerk"; @@ -46495,7 +49052,7 @@ self: { mkDerivation { pname = "craftwerk-gtk"; version = "0.1"; - sha256 = "ced95080b5b735d57a13b9082ebdadf5015926f4f49a3b181a3e974ba01f66a1"; + sha256 = "18b63yh4p5ry38c3p6plyhk5j0gmmnyjw25r2dxdaddpnn051nff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46514,7 +49071,7 @@ self: { mkDerivation { pname = "crawlchain"; version = "0.1.2.0"; - sha256 = "1016c3a0de17b1807443d342a281310bb81a13df36a33294ffe72bd6fdb13b9f"; + sha256 = "17rvn7yxcaz7zya358rnvw9imf0b660s4hnk8ds81c8pvshc65hh"; libraryHaskellDepends = [ base bytestring directory http-streams network-uri split tagsoup text time @@ -46535,7 +49092,7 @@ self: { mkDerivation { pname = "craze"; version = "0.1.3.0"; - sha256 = "b2707ee3c854a646ada8301383449c2a4e658bd7288984bb34b9007656a0b1db"; + sha256 = "1nxil1b7c05r6jxq9298sy5nakiaki2864rhm2nld9jlr3ipww5j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46565,7 +49122,7 @@ self: { mkDerivation { pname = "crc"; version = "0.0.1.1"; - sha256 = "e4bc5247baa81d1293f75de7e394176b275fda4793251ca0747862ab270096eb"; + sha256 = "1swn00ksnqkqfjh1q9ck8zd5y9vb2yaf7rsxyy9i47d8p93m5g74"; libraryHaskellDepends = [ base bytestring vector ]; testHaskellDepends = [ base bytestring conduit conduit-extra resourcet tasty tasty-golden @@ -46582,7 +49139,7 @@ self: { mkDerivation { pname = "crc16"; version = "0.1.1"; - sha256 = "7f1d9bfe18b26b45a42cbe3ee92e5385a7fe050b53c9042a39e4f92d30efa397"; + sha256 = "15x3xwq2vyg474m09jak1c2zx9w5acpfjgmy5jj4asxj33z9n7bz"; libraryHaskellDepends = [ base bytestring ]; description = "Calculate the crc16-ccitt"; license = stdenv.lib.licenses.bsd3; @@ -46594,12 +49151,28 @@ self: { mkDerivation { pname = "crc16-table"; version = "0.1"; - sha256 = "5f38e45b6ecf2cb4e63e88d470aa542760e6e58d42097ce44cc7c8c52a1f2475"; + sha256 = "0x943wmcbj679kj7q2a2ipjycq17ajm71m487vkb8b6gdrdy8f2z"; libraryHaskellDepends = [ array base ]; description = "Compute CRC16 checksums using a lookup table"; license = stdenv.lib.licenses.bsd3; }) {}; + "crdt" = callPackage + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "crdt"; + version = "0.2"; + sha256 = "1wh0abhnc69q4mkjxzhw3j3k3xwp9bwbccy4bwz70qn39g44q8nz"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck vector + ]; + homepage = "https://github.com/cblp/crdt#readme"; + description = "Conflict-free replicated data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "creatur" = callPackage ({ mkDerivation, array, base, binary, bytestring, cereal, cond , directory, exceptions, filepath, gray-extended, hdaemonize @@ -46609,8 +49182,10 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.14"; - sha256 = "040f72d38d7b83f7dc57da07e1f6570b65087c508aa9e3c10c426ee559c2d583"; + version = "5.9.16"; + sha256 = "03ipmz55cw6d8d79zv0m7cg8r6izdgy2v50xc8s7hk1sln86qbmx"; + revision = "1"; + editedCabalFile = "0vna37j7y2bzvhizizi69gghqqpz32w0aasy9xdaxpwq4y8wc83c"; libraryHaskellDepends = [ array base bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process @@ -46634,7 +49209,7 @@ self: { mkDerivation { pname = "credential-store"; version = "0.1.1"; - sha256 = "35087bea87d96fdeec351805f2bd7d8bf277e96e7b6689e33b6c4ce5314c35e2"; + sha256 = "1qim9hqyak3c7giqjrkvdvlpgwlbgnyz418q6pndwvyrhzm7n21m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46656,8 +49231,8 @@ self: { }: mkDerivation { pname = "credentials"; - version = "0.0.1.1"; - sha256 = "e9febd40fa2e4c551423ad9d7e323b2d10b1dc0dd56e551612e210f1e16a1e15"; + version = "0.0.2"; + sha256 = "12637ggwm4g81r2ilsjxvdcyj7di74fxaxsfwz9rrs80659h2myd"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb amazonka-kms base bytestring conduit cryptonite exceptions lens memory retry @@ -46678,10 +49253,8 @@ self: { }: mkDerivation { pname = "credentials-cli"; - version = "0.0.1.1"; - sha256 = "9abcaf0cbbb5e523d4ceeadff677844c5af668a5374a78ee5a004101fea90d70"; - revision = "1"; - editedCabalFile = "b64b55d3e9904385ed1f18bcf5e60baa7d8e06aeec6f29c8b9b1a9fc62a2f219"; + version = "0.0.2"; + sha256 = "103rc970bd86h2vdvi1br37a6a3vnj6mfrhg9vg1kjdf5cjvi56i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46705,9 +49278,9 @@ self: { mkDerivation { pname = "crf-chain1"; version = "0.2.2"; - sha256 = "18f2686ac1187fb1a0012e0b08f5ef9f959b26f72368917e1faae264f7ad156c"; + sha256 = "0v0mmpvn9qma3xz92s13ywk9p5czxzshh2rf06hb2zqqq5m6iwhq"; revision = "1"; - editedCabalFile = "a28bf6d6103c13301f352b2042eff9f7447ef623b5bbfd34c2d37121e049029a"; + editedCabalFile = "16h297h22wfkq8sgvfxm4gv7wi7pz7pl481b6lgk04rw23bgd2x2"; libraryHaskellDepends = [ array base binary containers data-lens logfloat monad-codec parallel random sgd vector vector-binary vector-th-unbox @@ -46726,7 +49299,7 @@ self: { mkDerivation { pname = "crf-chain1-constrained"; version = "0.3.2"; - sha256 = "4a3ab2ace6b29475e0fde27dde72ab274e109b5e7715f21b73b5d26c124eae0b"; + sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja"; libraryHaskellDepends = [ array base binary containers data-lens logfloat monad-codec parallel random sgd vector vector-binary vector-th-unbox @@ -46745,7 +49318,7 @@ self: { mkDerivation { pname = "crf-chain2-generic"; version = "0.3.0"; - sha256 = "bec3d92b03eb565f3b99d365c51160e833d948757a9d934c5d04e1e2b2289980"; + sha256 = "104r52rf5q84bm6977bsfm4djcz8c08warfkk4xmympb0cmxkhxy"; libraryHaskellDepends = [ array base binary comonad-transformers containers data-lens logfloat monad-codec parallel sgd vector vector-binary @@ -46764,7 +49337,7 @@ self: { mkDerivation { pname = "crf-chain2-tiers"; version = "0.2.4"; - sha256 = "21f66d385440e433b35dd621e34fdc887ac6aedf0cd1a00ee9e61845752eaa6b"; + sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1"; libraryHaskellDepends = [ array base binary comonad containers data-lens logfloat monad-codec parallel sgd vector vector-binary vector-th-unbox @@ -46784,7 +49357,7 @@ self: { mkDerivation { pname = "critbit"; version = "0.2.0.0"; - sha256 = "02a9d70aef2a8dc1c06fab7deeaa7abf7eb55c5cc2443f030e723b378e54aff5"; + sha256 = "1xdgaj73ffvj1q1kyi62bifbazmzgamfwzdbdz0c339axw5dga82"; libraryHaskellDepends = [ array base bytestring deepseq text vector ]; @@ -46813,9 +49386,9 @@ self: { mkDerivation { pname = "criterion"; version = "1.1.4.0"; - sha256 = "53a243fc759ed3100e71f96a5f6649658d076d91d52ce2853a6f8587aa3cfa76"; + sha256 = "0xps7jm8g1bg7a2y4b6mj5nhg3b595k5ysprf4711lwyfpy478jk"; revision = "1"; - editedCabalFile = "61a5386463efe3da9c0bc5d14f6074e500dc76fc62e2dda40eaf81955716fe41"; + editedCabalFile = "0hgy2rbrb0dg1sjdvqk2zivdq075fih4zlf51ffdmqzgcdj3i9b1"; libraryHaskellDepends = [ aeson ansi-wl-pprint base binary bytestring cassava code-page containers deepseq directory filepath Glob hastache js-flot @@ -46831,6 +49404,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers, transformers-compat, vector + , vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.2.1.0"; + sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat binary bytestring cassava + code-page containers deepseq directory exceptions filepath Glob + js-flot js-jquery microstache mtl mwc-random optparse-applicative + parsec statistics text time transformers transformers-compat vector + vector-algorithms + ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ + aeson base bytestring deepseq directory HUnit QuickCheck statistics + tasty tasty-hunit tasty-quickcheck vector + ]; + homepage = "http://www.serpentine.com/criterion"; + description = "Robust, reliable performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -46841,7 +49447,7 @@ self: { mkDerivation { pname = "criterion-plus"; version = "0.1.3"; - sha256 = "b471b64718bb4d943c9b84fa0dbfd57792aa449a396fba1476ebb3272ec4f688"; + sha256 = "127nqhp2gczbfqablvrrk92am4kpsnzhvyl4kcy98kdv313vcwdl"; libraryHaskellDepends = [ base criterion deepseq loch-th monad-control mtl optparse-applicative placeholders statistics string-conversions @@ -46867,7 +49473,7 @@ self: { mkDerivation { pname = "criterion-to-html"; version = "0.0.0.3"; - sha256 = "b627a4f4ef19ca7a7b7eff0fbc9b32d213cf683da04fc7c21dfcc6f799291d04"; + sha256 = "010x56czgipw3p1cfkx07mlcy4yj6advq3zzgrxpmjhrxzsa89xn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46886,7 +49492,7 @@ self: { mkDerivation { pname = "criu-rpc"; version = "0.0.2"; - sha256 = "9c9e267eea934021575c15acadb3642292a78a9ebad136563cec43d65d0160ce"; + sha256 = "1kk005fxchzc7ib3dldsks5ag4i2cjrsvb0mbibj2h4kx9z2d7lw"; libraryHaskellDepends = [ base criu-rpc-types lens-family network process proto-lens text unix @@ -46901,7 +49507,7 @@ self: { mkDerivation { pname = "criu-rpc-types"; version = "0.0.0.2"; - sha256 = "ffba61e1bcf0f6975f2411a2facfb4fcf2f5921c3adefdd0caa0b5e331bad586"; + sha256 = "11nmp8qy7dd0rb8gvpis3j9gbwpwnk7zm8hi4igrgxphpkhn3fpz"; setupHaskellDepends = [ base proto-lens-protoc ]; libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; libraryPkgconfigDepends = [ protobuf ]; @@ -46911,12 +49517,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; + "crjdt-haskell" = callPackage + ({ mkDerivation, base, containers, free, hedgehog, hspec, mtl, text + }: + mkDerivation { + pname = "crjdt-haskell"; + version = "0.3.0"; + sha256 = "1cxfmpvsm4zjaks6afcf7fjcr7k50p9nx2pasah6862j47j4npgc"; + revision = "1"; + editedCabalFile = "118xzpnj3mlhag71dhpr0lj35pfxkz5xgykw9wqjyfldqy53p00b"; + libraryHaskellDepends = [ base containers free mtl text ]; + testHaskellDepends = [ base containers hedgehog hspec mtl ]; + homepage = "https://github.com/amarpotghan/crjdt-haskell#readme"; + description = "A Conflict-Free Replicated JSON Datatype for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "crockford" = callPackage ({ mkDerivation, base, digits, QuickCheck, safe }: mkDerivation { pname = "crockford"; version = "0.2"; - sha256 = "463c5dbde6612479eae43915baa3501804520c4bd880fdc63a326c3085abfab9"; + sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26"; libraryHaskellDepends = [ base digits QuickCheck safe ]; description = "An implementation of Douglas Crockford's base32 encoding"; license = stdenv.lib.licenses.bsd3; @@ -46929,7 +49551,7 @@ self: { mkDerivation { pname = "crocodile"; version = "0.1.2"; - sha256 = "6800bfb7a0c1a5605dd44295308eb07047ea11bb967361799726a6e58b653bcf"; + sha256 = "1krvcn5yb9i6jxwn2wwnpc8ylivhn27315a2sifn19f1l2vvy038"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46951,7 +49573,7 @@ self: { mkDerivation { pname = "cron"; version = "0.5.0"; - sha256 = "ebffcf17d4ce054b50e97034ca94e73c82803494e0a507b49844740a968535b7"; + sha256 = "1drmhnb0lx24k2s0g9g0jhs810iwwyacld3hx584n1ffshbwzzzb"; libraryHaskellDepends = [ attoparsec base data-default-class mtl mtl-compat old-locale semigroups text time @@ -46966,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 @@ -46974,7 +49621,7 @@ self: { mkDerivation { pname = "cron-compat"; version = "0.2.6"; - sha256 = "ddddc399995d4e23eba6b17e75999332abd3f0ddb7af5d93ca7763d78704a74e"; + sha256 = "0km70j3xfqvpra9mvbxpvpqd7arjjfcpazmilvmj6kjxk6cw7pfx"; libraryHaskellDepends = [ attoparsec base mtl mtl-compat old-locale text time transformers-compat @@ -46994,7 +49641,7 @@ self: { mkDerivation { pname = "cruncher-types"; version = "1.1.0"; - sha256 = "302de122ae22bbe6365c924743991ae42bf3ccfed06b56e614c1be5d51dde04e"; + sha256 = "0kp0vm8mvgn12kk5csyhzv6g6az43acl6iwjbhvfdfr2mqif2b9h"; libraryHaskellDepends = [ aeson base containers lens text ]; testHaskellDepends = [ base hlint ]; homepage = "http://github.com/eval-so/cruncher-types"; @@ -47010,7 +49657,7 @@ self: { mkDerivation { pname = "crunghc"; version = "0.1.1.1"; - sha256 = "154ff77bcc1f4828c09d2f28748416664f080919358ad826b5e028d6760d6420"; + sha256 = "08341mvdca70nlkdi2im344hhkv62s278a1gkp02hj0zrixzfkqm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47022,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 @@ -47029,7 +49696,7 @@ self: { mkDerivation { pname = "crypto-api"; version = "0.13.2"; - sha256 = "5331d511a9761d5073e6661148234228d88f8ace14e2994171f0bcf5183e82ed"; + sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak"; libraryHaskellDepends = [ base bytestring cereal entropy tagged transformers ]; @@ -47046,7 +49713,7 @@ self: { mkDerivation { pname = "crypto-api-tests"; version = "0.3"; - sha256 = "f44aecdd4ceb9da9f38330e84d9c17745a82b0611085ebb34442d2dce4207270"; + sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl"; libraryHaskellDepends = [ base bytestring cereal crypto-api directory filepath HUnit QuickCheck test-framework test-framework-hunit @@ -47064,7 +49731,7 @@ self: { mkDerivation { pname = "crypto-cipher-benchmarks"; version = "0.0.5"; - sha256 = "185a750a8bc396f7c0dcef2b686be6f17cb0a9413c2ea7cea83beb611df8beb5"; + sha256 = "1ddyz0fn3srvm37afbiw86lv0z7iwrmnhazgvk0gg5n3ic57anhq"; libraryHaskellDepends = [ base byteable bytestring criterion crypto-cipher-types mtl pretty securemem @@ -47083,7 +49750,7 @@ self: { mkDerivation { pname = "crypto-cipher-tests"; version = "0.0.11"; - sha256 = "dfb670b73d4091b8683634d0d4d5a40576d573ad160650d5e518244ced8b98a7"; + sha256 = "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types HUnit mtl QuickCheck securemem test-framework test-framework-hunit @@ -47103,7 +49770,7 @@ self: { mkDerivation { pname = "crypto-cipher-types"; version = "0.0.9"; - sha256 = "2073f6b70df7916aebe2da49d224497183662d56d19da87b76f70039430c0a0f"; + sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0"; libraryHaskellDepends = [ base byteable bytestring securemem ]; homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Generic cryptography cipher types"; @@ -47118,7 +49785,7 @@ self: { mkDerivation { pname = "crypto-classical"; version = "0.2.0"; - sha256 = "8911490fc1f12ee76593552aa601f000359cafc4596eab7c98562d5bb8ded83e"; + sha256 = "0gnqvsw5nbank1yanvjrqjprqd80y00scajmjdjyfbpiq47lj4c9"; libraryHaskellDepends = [ base bytestring containers crypto-numbers crypto-random microlens microlens-th modular-arithmetic QuickCheck random random-shuffle @@ -47138,7 +49805,7 @@ self: { mkDerivation { pname = "crypto-conduit"; version = "0.5.5"; - sha256 = "ced360b56aba0d669e11af90fa603e68911e802f0e7d44750d5dcc3c64d5a47d"; + sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra crypto-api resourcet transformers @@ -47160,9 +49827,9 @@ self: { mkDerivation { pname = "crypto-enigma"; version = "0.0.2.8"; - sha256 = "7868ad36d39243fef45e1f76be73709778442ad69dc18ad8066650a748c6e837"; + sha256 = "0dz8qr4afl360vc8mhcxsqm48y4pf1rvwxhzbvsgwhwjscvass3q"; revision = "1"; - editedCabalFile = "7a7c682466a7ea07d0a755cb3f3c696083921734a90bcad745226b45b605a97e"; + editedCabalFile = "0zm90nv4asr28pbwl2x96hbr50v0d4y3zjsmlz80gsm7cqj6hz3s"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -47178,7 +49845,7 @@ self: { mkDerivation { pname = "crypto-multihash"; version = "0.4.2.0"; - sha256 = "01f5e71ade39dfaa1e8b8f690b9af976c693e644c4a18ec5968ab44713bd7e85"; + sha256 = "11bypl9lgd4ajv2qx8f48kk97iknz6d0nscgicgamprrvqdfgx81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47201,9 +49868,9 @@ self: { mkDerivation { pname = "crypto-numbers"; version = "0.2.7"; - sha256 = "420aeb17e9cdcfdf8c950c6c6f10c54503c5524d36f611aa7238e3fd65f189a6"; + sha256 = "19l9y5jzvqrqfam13xin9m9ca0s5ql86yv0cjn6dzkydx4byn2j2"; revision = "1"; - editedCabalFile = "2b493386b7605b70a67f751d6496e9feff8ef319a5294b122a3ff3895a8453ca"; + editedCabalFile = "1jjkhid8kwrz5894nad537rqxzzyx6b687bmgyk70nv0ny336j9b"; libraryHaskellDepends = [ base bytestring crypto-random ghc-prim integer-gmp vector ]; @@ -47225,7 +49892,7 @@ self: { mkDerivation { pname = "crypto-pubkey"; version = "0.2.8"; - sha256 = "c0ccf2f5c38517de1f1626cb0a2542f35aefad8842f8ad5c1fac0b8c9de8b56e"; + sha256 = "0vmmx2fqq2xc3xfavy22i2nyynpk88jhmjr62qgxw5w5qgsz5k60"; libraryHaskellDepends = [ base byteable bytestring crypto-numbers crypto-pubkey-types crypto-random cryptohash @@ -47253,7 +49920,7 @@ self: { mkDerivation { pname = "crypto-pubkey-openssh"; version = "0.2.7"; - sha256 = "849085c854c561b94974f2086bf1ad4004fb17be7168b75068ab0f2a330bab59"; + sha256 = "0ndb1crjl3xbd18bfs3ipqbzn120mpqnn27jfi4vjqf5ak48b444"; libraryHaskellDepends = [ asn1-encoding asn1-types attoparsec base base64-bytestring bytestring cereal crypto-pubkey-types pem @@ -47273,7 +49940,7 @@ self: { mkDerivation { pname = "crypto-pubkey-types"; version = "0.4.3"; - sha256 = "7ed9f52281ec4e34021a91818fe45288e33d65bff937f60334a3f45be5a71c60"; + sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby"; libraryHaskellDepends = [ asn1-encoding asn1-types base ]; homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; description = "Generic cryptography Public keys algorithm types"; @@ -47285,7 +49952,7 @@ self: { mkDerivation { pname = "crypto-random"; version = "0.0.9"; - sha256 = "170a7a18441379c2d1c19b502ee5919026a19adc6e78641cd4fb40b1d69a6904"; + sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp"; libraryHaskellDepends = [ base bytestring securemem unix vector ]; homepage = "http://github.com/vincenthz/hs-crypto-random"; description = "Simple cryptographic random related types"; @@ -47297,7 +49964,7 @@ self: { mkDerivation { pname = "crypto-random-api"; version = "0.2.0"; - sha256 = "56e9777061bd9ce553683d097ba3a11fdc371724060b62ca103f1f291f9f897c"; + sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan"; libraryHaskellDepends = [ base bytestring entropy ]; homepage = "http://github.com/vincenthz/hs-crypto-random-api"; description = "Simple random generators API for cryptography related code"; @@ -47311,9 +49978,9 @@ self: { mkDerivation { pname = "crypto-random-effect"; version = "0.2.0.4.1"; - sha256 = "9977b1c64a2bc8922705f7c3dea74b7e5199fda8d892ede1d35ba6134d0644be"; + sha256 = "1gj40r6i79jvsghyv4nqm3yrjlby9fkxxhzp0lkr5j1b9b3b2xwr"; revision = "1"; - editedCabalFile = "f217573816b1efe3fcc9b1dcbd6325015bc9a87872200547f56a80ec2b959c31"; + editedCabalFile = "0ccwjlmyr03aym3ha83jg2lcjnq14mivvp5ir7yf7vxi2qw5f5zj"; libraryHaskellDepends = [ base bytestring crypto-random extensible-effects securemem transformers @@ -47331,7 +49998,7 @@ self: { mkDerivation { pname = "crypto-rng"; version = "0.1.0.1"; - sha256 = "fa374420ae0290cdf9af3955f7b4e1c8bfd8d927c067d9394be6b8b90da0b5c2"; + sha256 = "1hmml06vkf769cwxjry04zcxigy8w6sgfm9rmzwwv402mqh48dzs"; libraryHaskellDepends = [ base bytestring crypto-api DRBG exceptions monad-control mtl transformers-base @@ -47346,7 +50013,7 @@ self: { mkDerivation { pname = "crypto-simple"; version = "0.1.0.0"; - sha256 = "a90f3e2643bbeee1849581df44e8705c296d590cc8e25e0b6bf5bebc9fe62e6e"; + sha256 = "0vifwsgvrgpmdc5mxqn81icnsaawf3l49pw1jn2f3vmv8ck3w3x9"; libraryHaskellDepends = [ base bytestring cryptonite ]; testHaskellDepends = [ base bytestring cryptonite hspec QuickCheck @@ -47364,7 +50031,7 @@ self: { mkDerivation { pname = "crypto-totp"; version = "0.1.0.1"; - sha256 = "bae10b9f72cc660261d2dd2c8b975efb8951b95eabbd7385252b83db959f726e"; + sha256 = "0vkjkyaxp0rb4n2p7gdbbswm32gvbsbqnb6xs9hh4rncfaghpqds"; libraryHaskellDepends = [ base bytestring cereal containers cryptohash tagged unix ]; @@ -47379,7 +50046,7 @@ self: { mkDerivation { pname = "cryptocipher"; version = "0.6.2"; - sha256 = "34b9e62dee36c4019dd0c0e86576295d0bd1bb573eeb24686ec635a09550e346"; + sha256 = "0ip3a2as0df6drl29sryayxx22sx55v6bs60s2fh3i1nxqnydf9l"; libraryHaskellDepends = [ base cipher-aes cipher-blowfish cipher-camellia cipher-des cipher-rc4 crypto-cipher-types @@ -47389,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 @@ -47397,7 +50088,7 @@ self: { mkDerivation { pname = "cryptohash"; version = "0.11.9"; - sha256 = "c28f847fc1fcd65b6eea2e74a100300af940919f04bb21d391f6a773968f22fb"; + sha256 = "1yr2iyb779znj79j3fq4ky8l1y8a600a2x1fx9p5pmpwq5zq93y2"; libraryHaskellDepends = [ base byteable bytestring cryptonite ghc-prim memory ]; @@ -47418,7 +50109,7 @@ self: { mkDerivation { pname = "cryptohash-conduit"; version = "0.1.1"; - sha256 = "ea516d898d3e34dae6be3e8bc59c9f61a61cb1222233dbfe84a84bb0ded4b4ce"; + sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga"; libraryHaskellDepends = [ base bytestring conduit conduit-extra cryptohash resourcet transformers @@ -47435,7 +50126,7 @@ self: { mkDerivation { pname = "cryptohash-cryptoapi"; version = "0.1.4"; - sha256 = "717a8664ebfaa1c31aaec1d78c9b7c776a5adcfdfc50ad88e21a34566f72058e"; + sha256 = "13h5f9pmcd0swa4asl7wzpf5lskpgjdqrmy1mqdc78gsxdj8cyki"; libraryHaskellDepends = [ base bytestring cereal crypto-api cryptonite memory tagged ]; @@ -47451,7 +50142,9 @@ self: { mkDerivation { pname = "cryptohash-md5"; version = "0.11.100.1"; - sha256 = "710bd48770fa3e9a3b05428c6dc77fb72c91956d334a1eb89ded11bb843e18f9"; + sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; + revision = "1"; + editedCabalFile = "1drxjsn5chi9zj3djj85s1d6xqlc28ji70zpyicxl5fals10n5w3"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -47470,7 +50163,9 @@ self: { mkDerivation { pname = "cryptohash-sha1"; version = "0.11.100.1"; - sha256 = "3c79af33542512442f8f87f6abb1faef7cd43bbfb2859260a33251d861eb0dab"; + sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; + revision = "1"; + editedCabalFile = "167i2mjyr18949xckzv6f782n763f6w9k114p6kq74gbmxqjvmqb"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -47489,7 +50184,9 @@ self: { mkDerivation { pname = "cryptohash-sha256"; version = "0.11.100.1"; - sha256 = "57b02338e9648639335788b422dd4c744543cb0991347472e2e3628a33c2f5d6"; + sha256 = "1mpmq8rqlqp3w9r78d4i175l6ibl9kfj5d48awrkk1k4x4w27c2p"; + revision = "1"; + editedCabalFile = "0ywdlxf2y46pi2p502zkqwf6zpiamxg5s2l178xkpjy1r02d9lhg"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -47508,7 +50205,9 @@ self: { mkDerivation { pname = "cryptohash-sha512"; version = "0.11.100.1"; - sha256 = "10698bb9575eaa414a65d9644caa9408f9276c63447406e0a4faef91db1071a9"; + sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; + revision = "1"; + editedCabalFile = "0aj9ryzdpxz79n5bs5wx56s9rjxm25dm7agxbyzqdr93wi2rj8ny"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -47532,9 +50231,9 @@ self: { mkDerivation { pname = "cryptol"; version = "2.4.0"; - sha256 = "d34471f734429c25b52ca71ce63270ec3157a8413eeaf7f65dd7abe3cb27014d"; + sha256 = "0k814z5y7aypbpvggsiy86l5fcgcf0rfc7575jsjb7226kvp2i6k"; revision = "1"; - editedCabalFile = "2bee5fb1a197ddde354e17c2b8b4f3081f005a133efe1eb2a021cedfd3b154f1"; + editedCabalFile = "1waln79xzki1l2r1xziy2dd007q8yfsbihhp9qsxxpcpl6qmzvib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47564,7 +50263,7 @@ self: { mkDerivation { pname = "cryptonite"; version = "0.21"; - sha256 = "639a66aee1c3fa64161b1886d319612b8ce92f751adde476fdc35aea730262ee"; + sha256 = "1vk209rylnn3zmvf9p8sflpyk31bc4cx71hq3cb69yn3w6p6d6k3"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -47577,20 +50276,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptonite_0_22" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, integer-gmp - , memory, tasty, tasty-hunit, tasty-kat, tasty-quickcheck + "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.22"; - sha256 = "4be312a42a12ccd2ca60272ef485664f242c7ed89fa1909ba36a54c5fb6ff5f0"; + version = "0.24"; + sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp"; libraryHaskellDepends = [ - base bytestring deepseq ghc-prim integer-gmp memory + base bytestring deepseq foundation ghc-prim integer-gmp memory ]; testHaskellDepends = [ base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion memory random + ]; homepage = "https://github.com/haskell-crypto/cryptonite"; description = "Cryptography Primitives sink"; license = stdenv.lib.licenses.bsd3; @@ -47605,7 +50308,7 @@ self: { mkDerivation { pname = "cryptonite-conduit"; version = "0.2.0"; - sha256 = "15edae989ad62b0bdaf817bba8e711323b22d3a3466025f778a54757ba567628"; + sha256 = "0a3nasx5fix5g3vjaq26lg9j4frj27ksifqpz3d0naynkacaxv8m"; libraryHaskellDepends = [ base bytestring conduit conduit-extra cryptonite memory resourcet transformers @@ -47626,7 +50329,7 @@ self: { mkDerivation { pname = "cryptonite-openssl"; version = "0.5"; - sha256 = "a10bc2030bd3696c190562853a794c392ff1e5ab9b4adc6c05697526dc9ce25c"; + sha256 = "0p72kkf2cxb90mndqjlvmgjz2brr9iwkm1b20lcnqsfk1c1w42x1"; libraryHaskellDepends = [ base bytestring cryptonite memory ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -47638,6 +50341,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "cryptonite-openssl_0_6" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, memory, openssl + , tasty, tasty-hunit, tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite-openssl"; + version = "0.6"; + sha256 = "19jhhz1ad5jw8zc7ia9bl77g7nw2g0qjk5nmz1zpngpvdg4rgjx8"; + libraryHaskellDepends = [ base bytestring cryptonite memory ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ + base bytestring cryptonite tasty tasty-hunit tasty-kat + tasty-quickcheck + ]; + homepage = "https://github.com/haskell-crypto/cryptonite-openssl"; + description = "Crypto stuff using OpenSSL cryptographic library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -47647,7 +50370,7 @@ self: { mkDerivation { pname = "cryptsy-api"; version = "0.2.1"; - sha256 = "7a7980ac98b202a60c88f2d77045df57ec607e4a993b2bd43c39137f0efcd6ce"; + sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs"; libraryHaskellDepends = [ aeson base bytestring deepseq either http-client http-client-tls old-locale pipes-attoparsec pipes-http text time transformers @@ -47663,7 +50386,7 @@ self: { mkDerivation { pname = "crystalfontz"; version = "0.1"; - sha256 = "bbbfc0aafde40383f027279010c2ece86004ded26d9da06f6476b2375102b092"; + sha256 = "14mh098kgckncips17bdsbg08q78xk1114174zq860z4znmc1gxv"; libraryHaskellDepends = [ base crc16-table MaybeT serialport ]; description = "Control Crystalfontz LCD displays"; license = stdenv.lib.licenses.bsd3; @@ -47675,7 +50398,7 @@ self: { mkDerivation { pname = "cse-ghc-plugin"; version = "0.1.1"; - sha256 = "2e11a8d5990a44138712065184c37d72c5b1d262c65d8575a6482e9623087d88"; + sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f"; libraryHaskellDepends = [ base ghc ]; homepage = "http://thoughtpolice.github.com/cse-ghc-plugin"; description = "Compiler plugin for common subexpression elimination"; @@ -47689,8 +50412,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.6.1"; - sha256 = "aa97c5076d7d1d217ea62027b7529b8acfb6539001aafa50da3064fb4afbf1c1"; + version = "0.7.0"; + sha256 = "1fxmfwc8ksyzjxjj64zbzgqgs0kk74a6rx6xqlyqg331drdrh00y"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -47708,8 +50431,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.1.0"; - sha256 = "3d42e34bb20823342974362c08f6bc386656922119020b34dbf92c39e72c8885"; + version = "5.2.1"; + sha256 = "1an6m2090xjrraibmbxagbwlakmg83d1d0wasr7njv3cihms2dbq"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -47726,8 +50449,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.2.0"; - sha256 = "901b7811a296ab59b2baecf161e69c478da2f4b9a1f8d24d5e0c7063704df475"; + version = "0.3.0"; + sha256 = "1x16h3zfxmmbkjc6l2w4q5j5q4v9b7x7p9dn8b8f113z73zc8djq"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -47743,8 +50466,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.3.1"; - sha256 = "c725eab85daca0de9dd689b40013f5af95089ef09539c009c58ebd020b161136"; + version = "0.0.3.2"; + sha256 = "09vyvai2k6id2vsnbxnv809v2bml0v8spsrfcdg2zgnxnjv9s4s4"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -47755,16 +50478,16 @@ self: { "csound-expression-typed" = callPackage ({ mkDerivation, base, Boolean, colour, containers , csound-expression-dynamic, data-default, deepseq, ghc-prim - , hashable, temporal-media, transformers, wl-pprint + , hashable, NumInstances, temporal-media, transformers, wl-pprint }: mkDerivation { pname = "csound-expression-typed"; - version = "0.1.0.0"; - sha256 = "ecff32336825df2197502e7b464c00b3fd1dc40eaab52f40cd9a585c4180e866"; + version = "0.2.0.1"; + sha256 = "1hihdgar789kbdb17a63h9cwsy4xz8mqlxq3919zj6cny87xl1af"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic - data-default deepseq ghc-prim hashable temporal-media transformers - wl-pprint + data-default deepseq ghc-prim hashable NumInstances temporal-media + transformers wl-pprint ]; homepage = "https://github.com/anton-k/csound-expression-typed"; description = "typed core for the library csound-expression"; @@ -47775,8 +50498,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.7.0"; - sha256 = "deb478e275edcf7dada65f57ace1989d3e9e8f1c2fe2ef81aa1c257f82236870"; + version = "0.0.8.0"; + sha256 = "18igbiwn8rc6q5w2fddhqp2m823fagcx6d2d5ma05l8milci2j1r"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -47790,7 +50513,7 @@ self: { mkDerivation { pname = "csp"; version = "1.3.1"; - sha256 = "d83c5e51dd32a796af8cfacac94312cb99691be30d924e159bc1c4b8cef9530b"; + sha256 = "02skz77bii61kcalx4hdwcdnk6fb291wkjpsijprd9rjvm8mwg6q"; libraryHaskellDepends = [ base containers mtl nondeterminism ]; testHaskellDepends = [ base nondeterminism tasty tasty-hunit ]; description = "Discrete constraint satisfaction problem (CSP) solver"; @@ -47804,7 +50527,7 @@ self: { mkDerivation { pname = "cspmchecker"; version = "1.0.0"; - sha256 = "6168f7bdaa7a58fcd201dfd0b5143dd35a01aeffda9d2ba03bcaf0f7b627e9fb"; + sha256 = "1yz94yvggw6a7fh2p7fszyp02nnk7labbl6z079gqn3smayzfs31"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47821,7 +50544,7 @@ self: { mkDerivation { pname = "cspretty"; version = "1.0"; - sha256 = "29a77c88684614ca41e88d8ee83b51cbd62ab12f7770701cb6699bc38d0a3909"; + sha256 = "029r1a6w76v9nqf70w3p5yqjmmnba4xyi3ldx10wl526d247r9r9"; libraryHaskellDepends = [ base containers pretty ]; description = "AST and pretty printer for CSPm"; license = stdenv.lib.licenses.bsd3; @@ -47833,7 +50556,7 @@ self: { mkDerivation { pname = "css"; version = "0.2"; - sha256 = "69cb9d55d466f1976888c4dd0cad01dcfaf59bcf942d663e2aa6a7029c6e0f94"; + sha256 = "150gdsf059x658z6cbclrydzbynw06nhrpf4i1l9gwb6siarvjv9"; libraryHaskellDepends = [ base mtl text ]; description = "Minimal monadic CSS DSL"; license = stdenv.lib.licenses.bsd3; @@ -47847,7 +50570,7 @@ self: { mkDerivation { pname = "css-syntax"; version = "0.0.5"; - sha256 = "3969e0bf83c81dd970cdde9bb07386071264f0f390215078eb86a5cfa1e50b9e"; + sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r"; libraryHaskellDepends = [ attoparsec base bytestring scientific text ]; @@ -47863,7 +50586,7 @@ self: { mkDerivation { pname = "css-text"; version = "0.1.2.2"; - sha256 = "dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987"; + sha256 = "11qrwrjqk2k4bm3bz1qcyscp146raz1hgpzynkd50yaq12n69xfz"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; homepage = "http://www.yesodweb.com/"; @@ -47876,7 +50599,7 @@ self: { mkDerivation { pname = "csv"; version = "0.1.2"; - sha256 = "8cf43442325faa1368f9b55ad952beccf677d9980cdffa3d70a7f204a23ae600"; + sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c"; libraryHaskellDepends = [ base filepath parsec ]; description = "CSV loader and dumper"; license = stdenv.lib.licenses.mit; @@ -47892,7 +50615,7 @@ self: { mkDerivation { pname = "csv-conduit"; version = "0.6.7"; - sha256 = "501e6b0b7c6f0e80ba381b5f18af5ec343eb5e1afb4f5fc4e5e318ce51eeb33d"; + sha256 = "0gdkxr8ww673wp25ykzv39gfnhy3bspihpqv72x803kggh5nn7jh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47919,7 +50642,7 @@ self: { mkDerivation { pname = "csv-enumerator"; version = "0.10.2.0"; - sha256 = "f01d002d7eabdbcc84d6c2b4e1d5372b05c9152ec63a596d1a3cc9cf73623f58"; + sha256 = "0n1zc9rwzj9w39nmjfn65qawj19b6zay3d62ss2crnxbgqnh07gh"; libraryHaskellDepends = [ attoparsec attoparsec-enumerator base bytestring containers directory enumerator safe transformers unix-compat @@ -47936,7 +50659,7 @@ self: { mkDerivation { pname = "csv-nptools"; version = "0.4.1"; - sha256 = "7e1da915fdf44b2f294e0220da085dafffba96483cfac67c7db2cf7847292821"; + sha256 = "0898553pikxjgmycdyiw92bbmzxgbl4dl8029qljyjzlzlasj7by"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47951,7 +50674,7 @@ self: { mkDerivation { pname = "csv-table"; version = "0.1.0.1"; - sha256 = "e91959b43226fe79dc00de47560cd25d0b24625c58c70058967d489d1656bcdc"; + sha256 = "1p5waqb9sj3xjrc01isqbii282sxs865ciyy03f7kzi66as5j6g9"; libraryHaskellDepends = [ base containers csv filepath process ]; homepage = "https://github.com/ucsd-progsys/csv-table"; description = "Scripts for manipulating tables stored as CSV files"; @@ -47965,7 +50688,7 @@ self: { mkDerivation { pname = "csv-to-qif"; version = "0.3.2"; - sha256 = "7d9cba937186c540a8dfc34e8b41c58855cdca15ea8163f1ff5fa4b85d0aded5"; + sha256 = "1mfy19fvi92zzzqn70ga2p5csmc8qm0qnkn3vyl41ic6f69vm73x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47982,7 +50705,7 @@ self: { mkDerivation { pname = "ctemplate"; version = "0.1"; - sha256 = "a8539c4d8480a51c1f20f6aa2a4cbfa799f9d793df70140066489c773fe0ba0b"; + sha256 = "02xsw0zpg728cq018w6zjgbzk6d7px62mapn40gir9c0hi6rqlx8"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ ctemplate ]; homepage = "http://darcs.imperialviolet.org/ctemplate"; @@ -47996,7 +50719,7 @@ self: { mkDerivation { pname = "ctkl"; version = "0.27.0.0"; - sha256 = "f580a4810dc5cad1525886831444e7540975700b2d6ff99e140673fa0978196b"; + sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m"; libraryHaskellDepends = [ array base ]; description = "packaging of Manuel Chakravarty's CTK Light for Hackage"; license = stdenv.lib.licenses.bsd3; @@ -48008,7 +50731,7 @@ self: { mkDerivation { pname = "ctpl"; version = "0.1.0.4"; - sha256 = "29eef56cbc972a03b9da43bd00a61bd8f9eab81d23dbcbf0e5e171b270f16c0f"; + sha256 = "03vcy5qb4wg1wpqcpnr33nwfmyfq3fk01ga3vawh6alppingbvi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base chatty-text chatty-utils ]; @@ -48028,7 +50751,7 @@ self: { mkDerivation { pname = "ctrie"; version = "0.1.1.0"; - sha256 = "8434b34f6c5980a8885eb0565c0d421c825a2b30574a367db2d121ed42fa5bb8"; + sha256 = "1f2vz91fs8fin9ykcjjp60mmm0hw886mqmmhbs4ai02rdi7v6d44"; libraryHaskellDepends = [ atomic-primops base hashable primitive ]; testHaskellDepends = [ base containers hashable QuickCheck test-framework @@ -48049,7 +50772,7 @@ self: { mkDerivation { pname = "cube"; version = "0.2.0"; - sha256 = "d71f6392f0323ab12da36c43e8780a39c3d547e217d63d19205f056839a30c6a"; + sha256 = "0shclcwnh1az40ckvmhpw93xbhrr19wfhhvclcnv2fijy29667yp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal containers STL ]; @@ -48067,7 +50790,7 @@ self: { mkDerivation { pname = "cubical"; version = "0.2.0"; - sha256 = "d285c5ed24f3743825209f1a427ba0c887f512e1293909d754b1e4a1d36884d8"; + sha256 = "1n44d39s3r5iakbhjf99w49gb1y8l1xl46lz40jkhx7k4knwb1fj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48087,7 +50810,7 @@ self: { mkDerivation { pname = "cubicbezier"; version = "0.5.0.0"; - sha256 = "96c2792707bc80a45a428886af97c1b4c7524a2e9ba0be13fa60d7bac879e508"; + sha256 = "0275g74bmmv0z89vx84v5r555ixlq6bsz1l889da905w0wkpkhln"; libraryHaskellDepends = [ base containers integration matrices microlens microlens-mtl microlens-th mtl vector @@ -48098,12 +50821,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cubicbezier_0_6_0_3" = callPackage + ({ mkDerivation, base, containers, fast-math, integration, matrices + , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty + , tasty-hunit, vector, vector-space + }: + mkDerivation { + pname = "cubicbezier"; + version = "0.6.0.3"; + sha256 = "05bkjjfbmmfc4mwvcpsnr3wrwf07bv9xdv3v6n7gwblnx5ywapjn"; + libraryHaskellDepends = [ + base containers fast-math integration matrices microlens + microlens-mtl microlens-th mtl vector vector-space + ]; + testHaskellDepends = [ base parsec tasty tasty-hunit ]; + description = "Efficient manipulating of 2D cubic bezier curves"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cubicspline" = callPackage ({ mkDerivation, base, hmatrix, safe }: mkDerivation { pname = "cubicspline"; version = "0.1.2"; - sha256 = "5b6ced9ca65b0d01ddceaf18605c8f915491d8d4a6aaef73475c4e8d4b1a9b79"; + sha256 = "0ycv395qskjw8xryzam6skc92m4iixf6065grvfh23avlsffsv2v"; libraryHaskellDepends = [ base hmatrix safe ]; description = "Natural cubic spline interpolation"; license = stdenv.lib.licenses.bsd3; @@ -48116,7 +50858,9 @@ self: { mkDerivation { pname = "cublas"; version = "0.2.1.0"; - sha256 = "3c6031d2f7332a6a2357a1ec9adc4ba1404c5c05cb5a42193847ceac7652a80b"; + sha256 = "02x8a9varkj770cl4nnb0mf4qh519gf9mv51awinlaikyz932q1w"; + revision = "1"; + editedCabalFile = "1myrmj4fc1nxgdlv5pmz30j4nlap7a6ylyc7bmrljpyjgciwg117"; libraryHaskellDepends = [ base cuda filepath language-c storable-complex template-haskell ]; @@ -48133,7 +50877,7 @@ self: { mkDerivation { pname = "cuboid"; version = "0.14.2"; - sha256 = "cbe47ad3b0ead8d98856f98ab6ce81d1a1fb7319700ee97169e9968692c38822"; + sha256 = "08l8qf98d5p9d5qyj3kh35rzp8fih77bd2pras4dkn7an39pmr6b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT Yampa ]; @@ -48148,10 +50892,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.7.5.2"; - sha256 = "749b2411255f699289d2989c8720b751940678bfbb621ccd8bb98eaf0a7b94d6"; - revision = "1"; - editedCabalFile = "dd05fcdff465dcbe7252532e3b9ba481d76548611e02bc28fce734378c093dee"; + version = "0.7.5.3"; + sha256 = "1xd7yyh9v8ndir98wgsbhkz8kfgd7xl58b423gw44c6i8wq3mky6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -48168,7 +50910,7 @@ self: { mkDerivation { pname = "cudd"; version = "0.1.0.4"; - sha256 = "d15b95b34d8d29d201cab78baf79c8e18636429ca5516d84dc03a26486b1d7a0"; + sha256 = "186pn63698h3vj26sld5ki13d1p1r1wsz2xpr80x4acd9nrranyi"; libraryHaskellDepends = [ array base mtl transformers ]; librarySystemDepends = [ cudd ]; libraryToolDepends = [ c2hs ]; @@ -48186,7 +50928,29 @@ self: { mkDerivation { pname = "cue-sheet"; version = "0.1.0"; - sha256 = "cb4d369b3eb3859b9006dce4f9b45a3b9dafb75370d02bf5f178f06905dd05f1"; + sha256 = "1w85vl2nkw3qy7sjpl3hafvsz79vbasgkr6w0s89p1dk7sdkckfb"; + libraryHaskellDepends = [ + base bytestring containers data-default-class exceptions megaparsec + mtl QuickCheck text + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-megaparsec QuickCheck text + ]; + homepage = "https://github.com/mrkkrp/cue-sheet"; + description = "Support for construction, rendering, and parsing of CUE sheets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cue-sheet_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck + , text + }: + mkDerivation { + pname = "cue-sheet"; + version = "0.1.1"; + sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd"; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec mtl QuickCheck text @@ -48207,7 +50971,7 @@ self: { mkDerivation { pname = "cufft"; version = "0.7.5.0"; - sha256 = "09bd838815a521b21b971c43e1eb0b79dfe54d848a3cf9d0137f3cdb414e1171"; + sha256 = "0w8i9r0xng3z2g8gjg4ahi6ybpvr1gmy2hqwjwdv48d52n487g89"; setupHaskellDepends = [ base Cabal directory filepath template-haskell ]; @@ -48224,7 +50988,7 @@ self: { mkDerivation { pname = "curl"; version = "1.3.8"; - sha256 = "9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e"; + sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ curl ]; description = "Haskell binding to libcurl"; @@ -48236,7 +51000,7 @@ self: { mkDerivation { pname = "curl-aeson"; version = "0.0.4"; - sha256 = "3defd8313d3e34657bd4c5aa7f0c4e1b7a6e533eaeffc1571eee2de31021f1ba"; + sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx"; libraryHaskellDepends = [ aeson base curl text utf8-string ]; homepage = "https://github.com/zouppen/haskell-curl-aeson"; description = "Communicate with HTTP service using JSON"; @@ -48248,9 +51012,9 @@ self: { mkDerivation { pname = "curlhs"; version = "0.1.6"; - sha256 = "6be0c9ea6cb295e2cf91db0b6a730477a54708f322fe5fbdbcf4dd9ba6cb07fa"; + sha256 = "1yh7rfk9ppglpjymzzi2yc44g9bp0irnl2yvj77y55djdkmckq3b"; revision = "1"; - editedCabalFile = "ac8dbe0348ce66746774f019fe62dbdaf40a200bed62f5b7fb0ecb9bd11cfa1c"; + editedCabalFile = "077s3k8rpjqfzfvzaqpd1ch0mx6svdigw6ghfikp8rnf901vx3dc"; libraryHaskellDepends = [ base bytestring rtld time ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/kkardzis/curlhs"; @@ -48264,7 +51028,7 @@ self: { mkDerivation { pname = "currency"; version = "0.2.0.0"; - sha256 = "bcd517f3d9f47f0dd3c4e802143159239e4a90db2fc552be4a99d759ffe9417a"; + sha256 = "0yj1x7zmkmwr9az55i9gvf84m7i3b4qi80p8qk9hszzlv7rigmdw"; libraryHaskellDepends = [ base containers hashable iso3166-country-codes ]; @@ -48280,7 +51044,7 @@ self: { mkDerivation { pname = "currency-convert"; version = "0.2.1.0"; - sha256 = "c4b7a948d5755a3e61bb33045e35205349294c8b38cc65c6b54d7d20089c3378"; + sha256 = "0y1kkh420zadnp36bk1qid62jjak40smw11kpdhkwnkmsm4akdy4"; libraryHaskellDepends = [ aeson base http-conduit text unordered-containers ]; @@ -48295,7 +51059,7 @@ self: { mkDerivation { pname = "current-locale"; version = "0.2.0.1"; - sha256 = "25fbab8e2f7a9673bebd2359c4b4e580df1b8d566c4160da3a40fcfb9d218fa2"; + sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5"; libraryHaskellDepends = [ base old-locale process split ]; homepage = "https://github.com/koterpillar/current-locale"; description = "Get the current system locale in System.Locale format"; @@ -48309,7 +51073,7 @@ self: { mkDerivation { pname = "curry-base"; version = "0.2.9"; - sha256 = "40049798fc9bec2ea15964ea7fd84d210b2d409320eb7fe25f6c57bcf4f3bc69"; + sha256 = "0sdwygsbqmvcbzi7zsr0jd02s2r19pc7zsk4b6hjxv4vzjc9f120"; libraryHaskellDepends = [ base containers directory filepath mtl old-time pretty syb ]; @@ -48326,7 +51090,7 @@ self: { mkDerivation { pname = "curry-frontend"; version = "0.2.12"; - sha256 = "9030b7ebe434c65e1a55634f54c293fa0b819f313a12371b8d41727e22d1fec5"; + sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ filepath ]; @@ -48344,7 +51108,7 @@ self: { mkDerivation { pname = "curryrs"; version = "0.2.0"; - sha256 = "1cdb55745936dbca5224dbb36a7006b85164a3bcc3e6af0c2670c0c0f8bb9adb"; + sha256 = "1nwspgwc1h3h4q6azrn3pjin8ldq0rq6mcyv4i9cmnrnb5s5bnqw"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; benchmarkHaskellDepends = [ base ]; @@ -48361,7 +51125,7 @@ self: { mkDerivation { pname = "cursedcsv"; version = "0.1.2"; - sha256 = "6c5b7b75bf05eb6d40762571928b2ba558ac00a653c8ce076fec497ea177b410"; + sha256 = "045lfyhpwjgcdw3wxj2klq0aqn555f5r4w95fr06vsq5pxspnnvc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48380,7 +51144,7 @@ self: { mkDerivation { pname = "curve25519"; version = "0.2.3"; - sha256 = "d3f48bd08fea16d270fe5785380ca163ab9ef83d72d3b9418ef5ee74c83b964f"; + sha256 = "0kwn7g479vpmir0vklvj7pw9xav3l463i1apzrqd45paiz88px6k"; libraryHaskellDepends = [ base bytestring crypto-api ]; testHaskellDepends = [ base bytestring crypto-api DRBG HUnit QuickCheck tagged @@ -48399,7 +51163,7 @@ self: { mkDerivation { pname = "curves"; version = "1.1.0.2"; - sha256 = "aa393af56cbd13832ce9ae5583e64780884f2f1888aa877d222901e74b618f1c"; + sha256 = "074gc55yf09949yqgal830plz2408zk86mdfx4n864xxdksklfda"; libraryHaskellDepends = [ base bytestring containers filepath HaXml JuicyPixels QuickCheck ]; @@ -48413,7 +51177,7 @@ self: { mkDerivation { pname = "custom-prelude"; version = "0.2.2.0"; - sha256 = "c67edf7134d4f45d3d6306fcd253d96d84391c21a676a3c18af6cf74e8bc9302"; + sha256 = "00lkpkl79kznib0s6xm644f3k13dv59x5z06ccymvx6l6iqxyzn6"; libraryHaskellDepends = [ base basic-prelude monad-loops ]; homepage = "https://github.com/ajnsit/custom-prelude"; description = "An enhanced prelude, serving as a foundation for my projects"; @@ -48421,13 +51185,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cutter" = callPackage + ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet + , utility-ht + }: + mkDerivation { + pname = "cutter"; + version = "0.0"; + sha256 = "1hka1k012d2nwnkbhbiga6307v1p5s88s2nxkrnymvr0db1ijwqi"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring explicit-exception spreadsheet utility-ht + ]; + description = "Cut files according to a position list"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cv-combinators" = callPackage ({ mkDerivation, allocated-processor, base, HOpenCV, vector-space }: mkDerivation { pname = "cv-combinators"; version = "0.2.0.2"; - sha256 = "fdb44fb8ed7ecadb8702eb6b610b45245dcfbac98ddd6cdb5122d4e9f0d98e7e"; + sha256 = "0zlfv7qfkm12a7dnrpcdr6xcyp948l5n2szb0a3xpjkyxnw4zd7x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48445,7 +51226,7 @@ self: { mkDerivation { pname = "cyclotomic"; version = "0.4.4.1"; - sha256 = "5940a639b7081a326719ba31b724b27e6febb609e8ef38c12b979986e58b2b17"; + sha256 = "05rbigjqd6cp5g0kivz816vfnvvyn8jbfcds35kk46h8nwwsch2r"; libraryHaskellDepends = [ arithmoi base containers ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; @@ -48461,7 +51242,7 @@ self: { mkDerivation { pname = "cypher"; version = "0.8.1"; - sha256 = "a330ba3acd374e50312f8c247d8c6270e25b7024ecbac800aa9fd924433ae938"; + sha256 = "0f79791j9nczm80cifpc4iq5pqkhca67s94c5wqm0kiprlxblc53"; libraryHaskellDepends = [ aeson attoparsec base bytestring classy-parallel conduit http-conduit http-types resourcet text transformers @@ -48472,6 +51253,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "czipwith" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.0.0"; + sha256 = "1q9cgig8zvycbfryb1ax35yq1x66qpc6a91qijbbfk1zsw7sz8j5"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + homepage = "https://github.com/lspitzner/czipwith/"; + description = "CZipWith class and deriving via TH"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -48482,8 +51276,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.5"; - sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06"; + version = "0.1.7"; + sha256 = "00bd001hxh68cwrv2597qg8rpcdz0n96nn31qkqgyhbc4lni72af"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48510,7 +51304,7 @@ self: { mkDerivation { pname = "d3d11binding"; version = "0.0.0.7"; - sha256 = "1f94c0d93b1446602198d7483f7cbf008d51a9dd65dd4a27758ae62e22ba9668"; + sha256 = "0s4np8i2xrlaflklmpb5vnlm3380pxy3yj6pk0hn0ihl7gcw150z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base c-storable-deriving vect Win32 ]; @@ -48530,7 +51324,7 @@ self: { mkDerivation { pname = "d3js"; version = "0.1.0.0"; - sha256 = "028f9b7933013bdd0ca90fcea6747295307a41ab2136cd6fd8d125ad9fdb3d73"; + sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2"; libraryHaskellDepends = [ base mtl random text ]; homepage = "https://github.com/nebuta/d3js-haskell"; description = "Declarative visualization on a web browser with DSL approach"; @@ -48543,7 +51337,7 @@ self: { mkDerivation { pname = "daemonize-doublefork"; version = "0.1.1"; - sha256 = "c25ff03326fa0efc10889c0e616d6d11c9347672c0073208d95221e73a3684bc"; + sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2"; libraryHaskellDepends = [ base directory unix ]; homepage = "https://github.com/scvalex/daemonize-doublefork"; description = "Start background daemons by double-forking"; @@ -48558,7 +51352,7 @@ self: { mkDerivation { pname = "daemons"; version = "0.2.1"; - sha256 = "17c5d6b41173aac225d4c9c2d126dfbf73439e841e5c6d0d301f06bac340c97d"; + sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48585,7 +51379,7 @@ self: { mkDerivation { pname = "dag"; version = "0.1.0.2"; - sha256 = "775f4306d1e701572785df01349a3c0888951b3769868b2c91f2f08fbff70e4e"; + sha256 = "0khfyyzqzw7jj4n8p1k96wdrb2087jd380fzhlkmf0g7s4346pvp"; libraryHaskellDepends = [ base constraints singletons ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-instances @@ -48603,7 +51397,7 @@ self: { mkDerivation { pname = "damnpacket"; version = "1.1.0"; - sha256 = "68284ed9c5cd54c5697f8202bcb8001d22497a5b225489729a660c4ba8a3bd1f"; + sha256 = "07xxlfl4n336k9r8jm12bdx4j8hx02wbq0l2gxlwam6dqpclwa38"; libraryHaskellDepends = [ attoparsec base bytestring fail html-entities template-haskell text th-lift-instances @@ -48623,7 +51417,7 @@ self: { mkDerivation { pname = "danibot"; version = "0.2.0.0"; - sha256 = "a8bd34d31eff0143a4e2fdc6cfd5070b37c5cfc8d087d21d742f3f9b0b720fa3"; + sha256 = "18qgf85rngrgfhfx51yhr37wadqb0zawzipxwaj460gz3v9k9gd8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48644,7 +51438,7 @@ self: { mkDerivation { pname = "dao"; version = "0.1.0.1"; - sha256 = "69520629b7e657dc129d3f32822c1c7c9d5073cb67c1a77f2e228941f1d04a31"; + sha256 = "0caas3ql32925rzsghb7rdrm17bw3hn84cizkl9dqmz6nwlhclk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48674,7 +51468,7 @@ self: { mkDerivation { pname = "dapi"; version = "0.2.0.0"; - sha256 = "5f52db8731dd704a351a15adcc62df83cd325bdb281cbe9c41424f8cc521b145"; + sha256 = "0idi472qqks286fbw718vddk5kc3vxicrb8m38sllw6x663xnljz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48702,7 +51496,7 @@ self: { mkDerivation { pname = "darcs"; version = "2.12.5"; - sha256 = "355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553"; + sha256 = "0lrm0sal5pl453mkqn8b9fc9l7lwinc140iqihya9g17bk408nrm"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -48740,7 +51534,7 @@ self: { mkDerivation { pname = "darcs-benchmark"; version = "0.1.9"; - sha256 = "72fb05e54492627cfabd1af3486cb7e294383eed08d6c86931972aa3952790e3"; + sha256 = "1qwh4yas6alp65lwimh8xlz3i572nxn4iwqsppx7qqlj8kjhbyvj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48765,7 +51559,7 @@ self: { mkDerivation { pname = "darcs-beta"; version = "2.7.99.2"; - sha256 = "4508a56509987daaa956497d462e8409050ceada9fd4df0e65109e2826f26f4a"; + sha256 = "0jkgy8k2i7hhcl7dzm4zvbm0q189hhp4cza9aslslzcq15jsa225"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48795,7 +51589,7 @@ self: { mkDerivation { pname = "darcs-buildpackage"; version = "0.5.12"; - sha256 = "0e2389815667e3e626dda98479b631845837d3778dd880c50992a3ffd6c90231"; + sha256 = "0c82r7bgz8wj172q1n4dfz9kfn4466v7k159vlkfdqv7as0qj8qf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48815,7 +51609,7 @@ self: { mkDerivation { pname = "darcs-cabalized"; version = "2.0.2.2"; - sha256 = "2d98a879ca40a3f68d6b64e4d69895377988e1cb6a3421a2b999d1fac1d881d1"; + sha256 = "1lc1v30zmlcrp6i22d3arghqhy9pjncddr34df6zd8s0r9wsi61d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48838,7 +51632,7 @@ self: { mkDerivation { pname = "darcs-fastconvert"; version = "0.2.1"; - sha256 = "3ac1b843c8d61300ce53c2b44890af872cb3cbff1549795ba598159be8d889a8"; + sha256 = "1a49v3l9n5cqlmdpjj8mzz5v6b47my84id62ag7004ynr11vih9s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48857,7 +51651,7 @@ self: { mkDerivation { pname = "darcs-graph"; version = "1.0"; - sha256 = "6633e9fe4746723dbb10f8010a67a2eaf27885d62df2e3e829ba6569e9258004"; + sha256 = "01404plnjrds57lf7widss2piwpal9khl0gq22xkswj68zzfjcv6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48875,7 +51669,7 @@ self: { mkDerivation { pname = "darcs-monitor"; version = "0.4.2"; - sha256 = "d8aa968f6ce573e8df62dce2f60d948a13ca94da02658744fe5dad1f1575e666"; + sha256 = "0rp6flaizbaxzr28fr82vaacl4wajh6zdqnwcbgyhwz5dj7rdanq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48892,7 +51686,7 @@ self: { mkDerivation { pname = "darcs-scripts"; version = "0.1.1"; - sha256 = "6acde756a7a679e845b58a42fa88bb85a6943e04725ec7a2c785d984340afa19"; + sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "Shell scripts for support of darcs workflow"; @@ -48906,7 +51700,7 @@ self: { mkDerivation { pname = "darcs2dot"; version = "0.1.0.1"; - sha256 = "938712de23d7d46b6f7e9a6f69cd9122dee48bcc34e32218c807bb3b45ccd064"; + sha256 = "0r6hri2kpfq7r0c25qrlrj5y9pi2j76njvwsgrpnpm6p4gg151wk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48929,7 +51723,7 @@ self: { mkDerivation { pname = "darcsden"; version = "1.1.1"; - sha256 = "85011d74d264d2dcf4a90665da5c7a17da77a3d74160309d16b12ea38c3ae8b7"; + sha256 = "1dz87a6a6bmi2sfk0q21syipgnhpg9fdlr86m7sdrlk4s9s1s0c5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48955,7 +51749,7 @@ self: { mkDerivation { pname = "darcswatch"; version = "0.4.4"; - sha256 = "4ecffe205bf1ae1e9b50807d414ce6f72b28231a7b1dcc94f56641fae9e580be"; + sha256 = "1gl0wplzlhb6ynacq7bv38ijhazpwr642zc0a2dixbpibchgxksf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48977,9 +51771,9 @@ self: { mkDerivation { pname = "darkplaces-demo"; version = "0.1"; - sha256 = "6e484df96e6207a2b2f2f0207ac9820227edc6ab3d779120b5a2626b1d3a5755"; + sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f"; revision = "1"; - editedCabalFile = "d16b0f7e29060476084a0457d38e524e1965b05e591af570197f287d574a8d01"; + editedCabalFile = "00cd99bpsa3z35qga6jrbsq6a6afaa7d6mq49847c10655z0ysyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49005,7 +51799,7 @@ self: { mkDerivation { pname = "darkplaces-rcon"; version = "0.1"; - sha256 = "e5ec14c2e14516ced46fb815c643183508abbc6420cf1e0b48f428f9cd92fd59"; + sha256 = "0ngxjb6zja7l905ixkr0cjyan21m311wc5dqdzacw5j5w7119v75"; libraryHaskellDepends = [ base byteable bytestring cryptohash network time ]; @@ -49025,7 +51819,7 @@ self: { mkDerivation { pname = "darkplaces-rcon-util"; version = "0.1.1"; - sha256 = "8fe2da4a1838e678a8848608ad39e5d8c892a9c9c91933d79f6f8ba70c4869f7"; + sha256 = "1xv9906ag2vgkzbk66f9r6lr5j6qwlwss246hjl7iriq315dmqlg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49054,7 +51848,7 @@ self: { mkDerivation { pname = "darkplaces-text"; version = "0.2.1"; - sha256 = "35131f15db7b21c8a0ab21b84837c350666be05632181ab30d1bcc5b00c8da8a"; + sha256 = "12nsr005pk0v1nril61javh6nrjhqcvlif11mfhch8bvvcaiy4rm"; libraryHaskellDepends = [ ansi-terminal array base bytestring text utf8-string vector ]; @@ -49073,7 +51867,7 @@ self: { mkDerivation { pname = "dash-haskell"; version = "1.1.0.2"; - sha256 = "d20cfdc67ba8ffd968c2b1ffcb3022bfda7cf7f650c42eeab34216ca845742c0"; + sha256 = "1h22ay2cl5j2ngm2xi2hyvvprnmz48qcpzxiq9ldkzx8gg3gs36j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -49092,7 +51886,7 @@ self: { mkDerivation { pname = "data-accessor"; version = "0.2.2.7"; - sha256 = "3465227ad5f81059a885d354e2f3c108d550287580e6939e18350fa65e78c2ed"; + sha256 = "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l"; libraryHaskellDepends = [ array base containers transformers ]; homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; @@ -49104,7 +51898,7 @@ self: { mkDerivation { pname = "data-accessor-monadLib"; version = "0.0.1"; - sha256 = "1185f90348212ae07cb77a0f5a5e90f8366d0107d3607ab467c4674972e53e50"; + sha256 = "0l1ywmr4jry4cys7lq6k0w0nsdpqj1g5l3vsnxyf0ai1901zk18i"; libraryHaskellDepends = [ base data-accessor monadLib ]; description = "Accessor functions for monadLib's monads"; license = "unknown"; @@ -49116,7 +51910,7 @@ self: { mkDerivation { pname = "data-accessor-monads-fd"; version = "0.2.0.3"; - sha256 = "1ff628067c081547764a92eb039ce8bfa5d79191832fcfde4beea88c4b996efb"; + sha256 = "1yvfk55qra7f9ggcybw3j68xg9dzx2f07swj99v4f588gh32ixhz"; libraryHaskellDepends = [ base data-accessor monads-fd transformers ]; @@ -49131,7 +51925,7 @@ self: { mkDerivation { pname = "data-accessor-monads-tf"; version = "0.2.1.4"; - sha256 = "b312502ff7adf92e87df67dd81b4e9eaf026bca8aa40929bdb1ae900ac57538b"; + sha256 = "12skayn01s8svfdr4h5am2y2dw7ax6s83pb7vy3jxyddywpm04mk"; libraryHaskellDepends = [ base data-accessor monads-tf transformers ]; @@ -49146,7 +51940,7 @@ self: { mkDerivation { pname = "data-accessor-mtl"; version = "0.2.0.4"; - sha256 = "10cf9166e2e046076b7e58987718e57b31408e7cada9f26c8ff111e0379814c5"; + sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh"; libraryHaskellDepends = [ base data-accessor mtl ]; homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Use Accessor to access state in mtl State monad class"; @@ -49159,7 +51953,7 @@ self: { mkDerivation { pname = "data-accessor-template"; version = "0.2.1.13"; - sha256 = "ea947385d3619cecf628221316bd5b441889f548b999b017b353581a1e7a3958"; + sha256 = "0n1rg8g1ln2kncbv16dr93sqj624bfyic4r253vfr731sf2p757a"; libraryHaskellDepends = [ base data-accessor template-haskell utility-ht ]; @@ -49173,7 +51967,7 @@ self: { mkDerivation { pname = "data-accessor-transformers"; version = "0.2.1.7"; - sha256 = "20c8823dc16c7ca6f55c64eb5564c9aae4b5565406987a046ded2ea73618e07a"; + sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10"; libraryHaskellDepends = [ base data-accessor transformers ]; homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Use Accessor to access state in transformers State monad"; @@ -49185,7 +51979,7 @@ self: { mkDerivation { pname = "data-aviary"; version = "0.4.0"; - sha256 = "b60b765cb7c8b3c704c539cde308651d83164d4c5a0da17ae97ca1c4cfa2500e"; + sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn"; libraryHaskellDepends = [ base ]; homepage = "http://code.google.com/p/copperbox/"; description = "Combinator birds"; @@ -49197,7 +51991,7 @@ self: { mkDerivation { pname = "data-base"; version = "1.1"; - sha256 = "1d85ee03627495104cd73e8f4fc2459f3ff2e873a46cbd0db9708c6168ae25d1"; + sha256 = "1l95mrl6333hp46vsv54fglg4gwz8p14z3rysx6115blc81yx18x"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/wdanilo/data-base"; description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism"; @@ -49205,12 +51999,34 @@ 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 { pname = "data-binary-ieee754"; version = "0.4.4"; - sha256 = "59975abed8f4caa602f0780c10a9b2493479e6feb71ad189bb10c3ac5678df0a"; + sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr"; libraryHaskellDepends = [ base binary ]; homepage = "https://john-millikin.com/software/data-binary-ieee754/"; description = "Parser/Serialiser for IEEE-754 floating-point values"; @@ -49222,7 +52038,7 @@ self: { mkDerivation { pname = "data-bword"; version = "0.1.0.1"; - sha256 = "70f01f857865edcf1d1d20128b0202320b1635cc03b00954b6d1447cd699db7d"; + sha256 = "0zfvk7b7qi6inra0kc03rhsic2rj0818n4i03lfwzvb5g22izw3h"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/mvv/data-bword"; @@ -49235,9 +52051,9 @@ self: { mkDerivation { pname = "data-carousel"; version = "0.1.0.0"; - sha256 = "505ba1c890aacf7b91745c64de05e5d8ca5d28154265e1c723fc0a850439e1ee"; + sha256 = "1vp17428a2pw4g3y2ra22ll5vjnqwl2xwr2wfj8ppkxaj34a2nsh"; revision = "1"; - editedCabalFile = "56aa17d4ad0390625d0694ff6f8e281720d96bdabc678cc10934ac9becc663ea"; + editedCabalFile = "1sk3qvn9pb1l170qqrxwv9mxj80p5276zzwl0rfn5403mpa1gajn"; libraryHaskellDepends = [ base containers lens ]; description = "A rotating sequence data structure"; license = stdenv.lib.licenses.mit; @@ -49248,7 +52064,7 @@ self: { mkDerivation { pname = "data-category"; version = "0.6.2"; - sha256 = "8e82d0b076c9330ad99b39d6f934401ddb71400b51c259a3fd974cfa99bdec4e"; + sha256 = "0kpcpnczlk4pznimkhji1d073nqx80sgkmirkgchlcy9fsqd10lf"; homepage = "http://github.com/sjoerdvisscher/data-category"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; @@ -49259,7 +52075,7 @@ self: { mkDerivation { pname = "data-cell"; version = "1.0.0.2"; - sha256 = "f9a91186a977d9a8c7f06d1a6b05d8e9a30c69a9b49196118920e517cc54910e"; + sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/zadarnowski/data-cell"; description = "Generic cellular data representation library"; @@ -49270,8 +52086,8 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { pname = "data-check"; - version = "0.1.0"; - sha256 = "587cd23689719faeee59c94d7ca4b79bdbe293ea43bf7e64f547160a66bc9ae7"; + version = "0.1.1"; + sha256 = "00di2szqavzmbx4y5b6dq7qalm5pgalb19lfqcdawd5n61fj2gq1"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/data-check"; @@ -49284,7 +52100,7 @@ self: { mkDerivation { pname = "data-checked"; version = "0.3"; - sha256 = "dc87d09c7c8587c9e6e372166e8de3b42c2cd804a493ff100c253e4d713c5676"; + sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw"; libraryHaskellDepends = [ base deepseq ]; homepage = "https://github.com/mvv/data-checked"; description = "Type-indexed runtime-checked properties"; @@ -49295,8 +52111,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.1.0"; - sha256 = "ba0abd2e139d7ac6548cedd785edb3e4e809c1c116c3059d72590b0635166db6"; + version = "0.1.2.0"; + sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -49308,7 +52124,7 @@ self: { mkDerivation { pname = "data-concurrent-queue"; version = "0.3.0.0"; - sha256 = "bb4e206a60521ec22dc9420c5ae96c282a1906399edcbed1a96abf5bf025b666"; + sha256 = "0rmn4pq5pgvam78vxp4y7431jai8dklml322r4nw47jjc1m20kmv"; libraryHaskellDepends = [ base stm ]; description = "A Library for directional queues"; license = stdenv.lib.licenses.mit; @@ -49320,7 +52136,7 @@ self: { mkDerivation { pname = "data-construction"; version = "1.1"; - sha256 = "e8e55864def9f07c65137535d4494b694203e724e450494f89b502751d92b341"; + sha256 = "0hdkj8fpa0mmi57ljl744kkh6hk99d4x8dbm2djprw7rvrj5irg8"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/wdanilo/data-construction"; description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer"; @@ -49334,7 +52150,7 @@ self: { mkDerivation { pname = "data-cycle"; version = "0.1.2"; - sha256 = "0f206c5ee2baf2bf53aea755eb8ce15cb9e88eb247a002bda291afbdc914eacc"; + sha256 = "1k7a2k4vvbwilayh5827na7fifaww66fnmd7mr9vzwmsw9g6q80g"; libraryHaskellDepends = [ base collections-api collections-base-instances ]; @@ -49351,7 +52167,7 @@ self: { mkDerivation { pname = "data-default"; version = "0.7.1.1"; - sha256 = "b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511"; + sha256 = "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh"; libraryHaskellDepends = [ base data-default-class data-default-instances-containers data-default-instances-dlist data-default-instances-old-locale @@ -49365,7 +52181,7 @@ self: { mkDerivation { pname = "data-default-class"; version = "0.1.2.0"; - sha256 = "4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56"; + sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag"; libraryHaskellDepends = [ base ]; description = "A class for types with a default value"; license = stdenv.lib.licenses.bsd3; @@ -49384,7 +52200,7 @@ self: { mkDerivation { pname = "data-default-extra"; version = "0.1.0"; - sha256 = "7feaac7ae76fae615736d9a1577cb26ebd11a9cae48c88235821497fd5dee5f9"; + sha256 = "1yg5vvapyj91b0iqi374rali3gbfn9y5g8fr6rbn3bkgwxxarskz"; libraryHaskellDepends = [ base data-default-class data-default-instances-bytestring data-default-instances-case-insensitive @@ -49407,7 +52223,7 @@ self: { mkDerivation { pname = "data-default-generics"; version = "0.3"; - sha256 = "db07eb55dba3b763292ea58e64e04f52257c9cb70aeee2e6f73d12316c8e522b"; + sha256 = "0asjirn324ixyzkf5vhanyf7q9aj9zh693m55qln7dx3vdayn1yv"; libraryHaskellDepends = [ base bytestring containers dlist ghc-prim old-locale text time unordered-containers vector @@ -49425,7 +52241,7 @@ self: { mkDerivation { pname = "data-default-instances-base"; version = "0.1.0.1"; - sha256 = "844fe453f674b6b0998da804465914abce8936c5e640d8bb8bff37ad07d7a17a"; + sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in base"; license = stdenv.lib.licenses.bsd3; @@ -49436,9 +52252,9 @@ self: { mkDerivation { pname = "data-default-instances-bytestring"; version = "0.0.1"; - sha256 = "4c431278d0dc1054fd531281db70d8615f88d9b2a29924aba2567fb3cf647220"; + sha256 = "083jck7v6zsnlamj96d2nbcqhpv1v1qdp08jagym846ws1w14hsc"; revision = "1"; - editedCabalFile = "592075c7d9f5bde9fe98d31dd2b7412cdb4bb29158b49bee04379fe0895aed3e"; + editedCabalFile = "0gpdba4y17rp0kp9pd2qj6r4pnrc86vx47fkk3zfkggmv73pa82r"; libraryHaskellDepends = [ base bytestring data-default-class ]; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString"; @@ -49451,9 +52267,9 @@ self: { mkDerivation { pname = "data-default-instances-case-insensitive"; version = "0.0.1"; - sha256 = "430135708ad9d0730a4c3a3d1eb574bdc6f07547a5a9c5f30202e1e786070ab4"; + sha256 = "1d0a0y3fgq820brwbad58xsz1imxfjsiwg9s9h577l6ri9q3a0a3"; revision = "1"; - editedCabalFile = "45a89ccc5e4e6dbca37c7c0826c1f1c75d774d49afa9ce94f0412edee53f1371"; + editedCabalFile = "0w8k7zjxwbj1y2acxadg956pfpf7y70jc23wgjivqvafbv69ra25"; libraryHaskellDepends = [ case-insensitive data-default-class ]; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instance for CI type from case-insensitive package"; @@ -49466,7 +52282,7 @@ self: { mkDerivation { pname = "data-default-instances-containers"; version = "0.0.1"; - sha256 = "a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a"; + sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5"; libraryHaskellDepends = [ base containers data-default-class ]; description = "Default instances for types in containers"; license = stdenv.lib.licenses.bsd3; @@ -49477,7 +52293,7 @@ self: { mkDerivation { pname = "data-default-instances-dlist"; version = "0.0.1"; - sha256 = "7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959"; + sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x"; libraryHaskellDepends = [ base data-default-class dlist ]; description = "Default instances for types in dlist"; license = stdenv.lib.licenses.bsd3; @@ -49488,7 +52304,7 @@ self: { mkDerivation { pname = "data-default-instances-new-base"; version = "0.0.2"; - sha256 = "831df35c14859b066767b56c746611aa9268e6352d2a45f6704d3859bf3ef143"; + sha256 = "0hzi7szmjf2df3v4aaid6pk6i4ma25k78v5mcxkhd6w52ifg67c3"; libraryHaskellDepends = [ base data-default-class ]; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types in newer versions of base package"; @@ -49501,7 +52317,7 @@ self: { mkDerivation { pname = "data-default-instances-old-locale"; version = "0.0.1"; - sha256 = "60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802"; + sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"; libraryHaskellDepends = [ base data-default-class old-locale ]; description = "Default instances for types in old-locale"; license = stdenv.lib.licenses.bsd3; @@ -49512,9 +52328,9 @@ self: { mkDerivation { pname = "data-default-instances-text"; version = "0.0.1"; - sha256 = "db5d4c46cf36ce5956ffd0affe0f2c48e1c000b9bd61821d3e6c1b0171060cdf"; + sha256 = "1pqc0rqh26vc7qfq4qdxp40c1qa85h7zxbyhzxb5kkinrx34qpfv"; revision = "1"; - editedCabalFile = "5a8acbe0d420430c2cc2dc7865fa69d179c9ad43dda47aefcc6560fed72e2204"; + editedCabalFile = "01125vbzwq35rkppm96x8fnwjyfid7x6ay6wq8n0qhr0skhcp2js"; libraryHaskellDepends = [ base data-default-class text ]; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) Text and Text Builder"; @@ -49527,9 +52343,9 @@ self: { mkDerivation { pname = "data-default-instances-unordered-containers"; version = "0.0.1"; - sha256 = "b382a7ea90fd61127782e95fa5e7ee3a17969b762bf0aac4efd15fa7c2552fc0"; + sha256 = "1h1gap1afpyixz2amw1bfsdrc5rsxvksapz9h9vi4qgxj3mag0mk"; revision = "1"; - editedCabalFile = "fc2e79e605ef4fd67f222d11f43aaed40fbc08e3ca421cd29f5982a391f90ebe"; + editedCabalFile = "1ghfz68s70jrkz91qhnawc4bq3ylmqxg849d49zxckzg0pk7jbpw"; libraryHaskellDepends = [ data-default-class unordered-containers ]; @@ -49544,9 +52360,9 @@ self: { mkDerivation { pname = "data-default-instances-vector"; version = "0.0.1"; - sha256 = "9ac84473a3af8b0c5e795ea5f84a34a0c18c3b2d5e17ce428206203f9d794666"; + sha256 = "0rj6g6fky806h91cw5sy5lxqrhd06i5gi9ayg5g0r2xgldrl9j4s"; revision = "1"; - editedCabalFile = "8a78beb491235231802c98fb1a58fea519359be1c9374b9f08d37feed34a385e"; + editedCabalFile = "0piq9b9ywzyk12glndy9w6dka6d5zrc1mywq5j032li3j6sbwy4a"; libraryHaskellDepends = [ data-default-class vector ]; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types defined in vector package"; @@ -49562,7 +52378,7 @@ self: { mkDerivation { pname = "data-dispersal"; version = "1.0.0.2"; - sha256 = "86af3b6970bf6d06b8ff27246af8e87f7b3734573c2d31b5d73105a83a69dcf4"; + sha256 = "1x6wd4xah19isysk2b9waws3fyvzx3w6l917zyw0cvdzf1lkpbw6"; libraryHaskellDepends = [ AES array base binary bytestring entropy finite-field matrix secret-sharing syb vector @@ -49577,14 +52393,45 @@ 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 }: mkDerivation { pname = "data-dword"; - version = "0.3.1"; - sha256 = "0aa84874feca89e86320915e07e5c48c303e34bbcaf6a1c77dbe03f7fba601ea"; + version = "0.3.1.1"; + sha256 = "0dgs30yvs7cpikf6f2x4r7rb1f4fv3xi2rgr579af8nhrb2d6z7p"; libraryHaskellDepends = [ base data-bword ghc-prim hashable template-haskell ]; @@ -49602,7 +52449,7 @@ self: { mkDerivation { pname = "data-easy"; version = "0.7.0"; - sha256 = "301dbacdd9d89109701702b5ff3b97c007e657a1a255c8fd926146babf2726d8"; + sha256 = "1n164yzvlik1jbywhmd2l5byc1y0jwxzzd822xq0k4fqv76vl79h"; libraryHaskellDepends = [ base containers safe ]; testHaskellDepends = [ base containers directory errors haskell-src-exts hlint hspec HUnit @@ -49619,7 +52466,7 @@ self: { mkDerivation { pname = "data-elf"; version = "0.2"; - sha256 = "07b24983181705980c1b772c59f87a5ba1e43c6a94d704b2aca00ba4de769d3e"; + sha256 = "0glxfvga82x0mjr09mwld8yf98avgbw5jb3p3c69h18p321lkch7"; libraryHaskellDepends = [ base data-flags data-serializer data-sword ]; @@ -49635,7 +52482,7 @@ self: { mkDerivation { pname = "data-embed"; version = "0.1.0.0"; - sha256 = "180c54a1b5db9905454386c8161e18cb8c8e733897e17b4f0c67390d3869f7de"; + sha256 = "1pppd4w0sfb71i7ppqcp71rqx36b30g1dj468d2hb6fvnnhm830q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49652,12 +52499,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-emoticons" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "data-emoticons"; + version = "0.1.0"; + sha256 = "0brfvlx7hihgnlc87r3n17dncbydfwxs49dc8kgppxycqqss6vh1"; + libraryHaskellDepends = [ base ]; + description = "Combinator emoticons: data-aviary in the flavor of emoticons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-endian" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-endian"; version = "0.1.1"; - sha256 = "8c1d4f30374f8331d31f4d7c6b39284331b6b9436e7b50f86547417bd05f2ac0"; + sha256 = "1h1abz87nha7cpw50yvf8fwvcca350wnnz2d3z9k30sg6wq4y7cc"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mvv/data-endian"; description = "Endian-sensitive data"; @@ -49669,9 +52527,9 @@ self: { mkDerivation { pname = "data-extend-generic"; version = "0.1.0.0"; - sha256 = "b5cf36c5ccf72a400bc8dca3a983c3a4b65a7788fbd07eca93e5b23dca27f1bd"; + sha256 = "1ggi4z53vcp5jg57xl7vi1vmmdm4qf1sk8ywr05l0apprk2kdkxm"; revision = "2"; - editedCabalFile = "6d1bf0f2f19daf06b81fe4108a37bf889c9b96905920d3aa04846f0b5d05b6b3"; + editedCabalFile = "1cxn0mfhnvw40jmd682rj2b9p748pwvql4743yw0dbwxy7rg06vd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "http://github.com/ylilarry/data-extend-generic"; @@ -49684,7 +52542,7 @@ self: { mkDerivation { pname = "data-extra"; version = "2.5.5"; - sha256 = "815db3afa7d28f606a72a5de59fc59c3263312db39eae08d2f423dfceb50c45f"; + sha256 = "0py4a3mzqga25y6y1sirvc9369n3b7y5kpm5f9m613yjlypv6pc1"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -49697,7 +52555,7 @@ self: { mkDerivation { pname = "data-filepath"; version = "2.2.0.0"; - sha256 = "c79d7a7373f71ca35a346bf112fb6a338e9ed9a13100c24d3cf3e12cc0d3e1d0"; + sha256 = "1l71sg02rqgk7i6w401il7crx3ikdbxi5wbb6ida677pfdrpm7f7"; libraryHaskellDepends = [ base bifunctors ghc-prim semigroups split template-haskell ]; @@ -49714,7 +52572,7 @@ self: { mkDerivation { pname = "data-files-gen"; version = "0.0.0.1"; - sha256 = "8da5e450dce9d20d31014d107c9359e00544bda02b13cc2f31b4277a6b5d23de"; + sha256 = "1pi3bmmpl9xl64pwq4rbl2yl81g0b69pq42d04qhvlp9vi8f99cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49734,7 +52592,7 @@ self: { mkDerivation { pname = "data-fin"; version = "0.1.1.3"; - sha256 = "3e5367284ffade4bdb7d8fc9ae3692a2d73d033cb060be13297f1cf9486ec30a"; + sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry"; libraryHaskellDepends = [ base lazysmallcheck prelude-safeenum QuickCheck reflection smallcheck tagged @@ -49750,7 +52608,7 @@ self: { mkDerivation { pname = "data-fin-simple"; version = "0.1.0.0"; - sha256 = "e6e6e7c30c69cfe5ec67f0763c880d28e37d05c336e9b5c76c53e549c71a129f"; + sha256 = "17qj3b3lkrakdk3vbs9nqc2pvqr81n43qxphcznfbkv91k1ygrp6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/seagull-kamome/data-fin-simple"; @@ -49763,8 +52621,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; - version = "0.0.3"; - sha256 = "f6c69e973a110c36c738d9f37bf3092eff5d25ec11782c301e255844b5010e57"; + version = "0.0.4"; + sha256 = "1446gvgq5xfsixcm63fyi4qv15kqxdfw2b2bzwm3q303n0xd5ql5"; + revision = "1"; + editedCabalFile = "1y2rimg0wpvk6sgc30csz211220im5dm7zzm86yqyx9b3yxzk177"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; @@ -49776,7 +52636,7 @@ self: { mkDerivation { pname = "data-fix-cse"; version = "0.0.2"; - sha256 = "e22697076125286a36cab1e7cb3f8367368d8ed72d9c86fc105ab792a3c5c6f6"; + sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; libraryHaskellDepends = [ base containers data-fix transformers ]; homepage = "https://github.com/anton-k/data-fix-cse"; description = "Common subexpression elimination for the fixploint types"; @@ -49788,7 +52648,7 @@ self: { mkDerivation { pname = "data-flags"; version = "0.0.3.3"; - sha256 = "a1e390d6a58b45c5f9a193c8244badf31f104fad26d5178298c8043ad136faaa"; + sha256 = "1aps6v8kl168k211gm96mm7i07zkmm5j9j4kl7wwaicblpb91qx1"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/mvv/data-flags"; description = "A package for working with bit masks and flags in general"; @@ -49800,19 +52660,32 @@ self: { mkDerivation { pname = "data-flagset"; version = "1.0.0.0"; - sha256 = "82aba0f5410728a2fdfe2888960f218453b42f4f73eb018493536fb158fefb79"; + sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2"; libraryHaskellDepends = [ base ]; description = "An efficient data type for sets of flags"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-forest" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "data-forest"; + version = "0.1.0.4"; + sha256 = "0nq0y7s4lciaghf0d3xcpy13na7cv3irvr07gq7k3f75lzjj4309"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "A simple multi-way tree data structure"; + license = stdenv.lib.licenses.asl20; + }) {}; + "data-fresh" = callPackage ({ mkDerivation, base, free, transformers }: mkDerivation { pname = "data-fresh"; version = "0.2013.251.0"; - sha256 = "c11d5445f43f7cdf9525ce81678bd2dde61931793ecc149c26bca2b37d05e3c3"; + sha256 = "1hz30myv78mw4sf19k1yg4qikrnxsa5ng0ff4naxyz1zyi2m87f1"; libraryHaskellDepends = [ base free transformers ]; description = "Interface and functor transformers for fresh values"; license = stdenv.lib.licenses.bsd3; @@ -49823,7 +52696,7 @@ self: { mkDerivation { pname = "data-function-meld"; version = "0.1.1.0"; - sha256 = "8dbf298b64856e65dce50b235a804a10d654c0ca6b78a20ca1e841ce8668d63e"; + sha256 = "0gnnd23cwhg8l46a4y3brb059mhh9a05l8qbwpf6avl5cj5jkgwd"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/erisco/data-function-meld"; description = "Map the arguments and return value of functions"; @@ -49835,7 +52708,7 @@ self: { mkDerivation { pname = "data-function-tacit"; version = "0.1.0.0"; - sha256 = "8ab215951769ddd4ab8cd2cec0aa3f2eee9ac3e80b47caf4d57f7fcb2a53b53b"; + sha256 = "0fxmacmcnzvzspscliqbx31rmvif7ymc1knjijmx9pb92yaibcla"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/erisco/data-function-tacit"; description = "Write functions in tacit (pointless) style using Applicative and De Bruijn index notation"; @@ -49847,7 +52720,7 @@ self: { mkDerivation { pname = "data-has"; version = "0.2.1.0"; - sha256 = "c13dd9875174926b41911a826bbf6d616ceabc56d27017a76a39d097e170f890"; + sha256 = "147qf3hrgl1rdakifw6jasyflv31dnznp0hsj50np4kla63xjgf1"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion transformers ]; homepage = "https://github.com/winterland1989/data-has"; @@ -49862,7 +52735,7 @@ self: { mkDerivation { pname = "data-hash"; version = "0.2.0.1"; - sha256 = "9117dd49013ca28ff188fc71c3595ac3af23d56d301c1f39bac93d44d8c60bbe"; + sha256 = "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -49880,7 +52753,7 @@ self: { mkDerivation { pname = "data-interval"; version = "1.2.0"; - sha256 = "75129fd2944ad2c7dcc808571e9f2fc5b6e99ee9b7d9cad0429364908b403b8d"; + sha256 = "139v825r0r4k8b8cmndpx6gfkdn55ygiwmq8r3fcgljajk99y4km"; libraryHaskellDepends = [ base deepseq extended-reals hashable lattices ]; @@ -49898,7 +52771,7 @@ self: { mkDerivation { pname = "data-inttrie"; version = "0.1.2"; - sha256 = "8ddae7ad7d3cafdf349d93c0eed5767ab1213d854980bc28d7d935163c5f1df9"; + sha256 = "1y8xbwy1cdfrswlbr029hlyj3cbsfvayxh4kklsdzbrwgnnygnld"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/luqui/data-inttrie"; description = "A lazy, infinite trie of integers"; @@ -49910,7 +52783,7 @@ self: { mkDerivation { pname = "data-ivar"; version = "0.30"; - sha256 = "62b96f30b8b7b6a5abe2839bdf27c665e2b2e84f55e931b4b793e509e3aecbee"; + sha256 = "1vnbmvihkrcknys33sam9zlb5qk5qqkxz6w3wamsbdmpp0q6zfb2"; libraryHaskellDepends = [ base containers ]; description = "Write-once variables with concurrency support"; license = stdenv.lib.licenses.bsd3; @@ -49922,7 +52795,7 @@ self: { mkDerivation { pname = "data-json-token"; version = "0.1.0.0"; - sha256 = "c58910c76fe08d082f174e7a6e8f04388e9e1bf9326ec4f4dd69908ce6ecfe2d"; + sha256 = "0bgyxkk8r439vpsc8vijz4drx3iq0j7nwyjf2wphi3g0dz3i12f5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -49940,7 +52813,7 @@ self: { mkDerivation { pname = "data-kiln"; version = "0.1.0.0"; - sha256 = "de4621bb587fb96878b2b9a3de7eee161c4e404e543318ac64071d2f6fbdf38e"; + sha256 = "13pkpmpjy787cjn1hcsl9r04w70nxrzdx8xrn9w6ifbzb2xj2iny"; libraryHaskellDepends = [ base containers data-fix IfElse mtl transformers ]; @@ -49955,7 +52828,7 @@ self: { mkDerivation { pname = "data-layer"; version = "1.0.4"; - sha256 = "3c11be8dc0da7f4cb080023e2d0ae9f58ad202e193c6f1aea015b7b7873a936d"; + sha256 = "0vck7a3vgdqml2pg3ilkw41d52pmx452sgh2h2q4qzysq26vw49w"; libraryHaskellDepends = [ base convert data-construction lens ]; homepage = "https://github.com/wdanilo/layer"; description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead."; @@ -49968,7 +52841,7 @@ self: { mkDerivation { pname = "data-layout"; version = "0.1.0.0"; - sha256 = "a5070520bcb6c3d8e7dcc969d94ac35c8bc5894abf45b65155b58571f82619f1"; + sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5"; libraryHaskellDepends = [ base bytestring vector ]; homepage = "http://github.com/jystic/data-layout"; description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\"."; @@ -49982,7 +52855,7 @@ self: { mkDerivation { pname = "data-lens"; version = "2.11.1"; - sha256 = "fbbe0bb7d754fa9bced7c89a0629146618ab204cbe7a7ea26b1fa9746ac73c32"; + sha256 = "0ciwqxm79a8zdfi7wymy9hhan6362hlhd6n8sz79pyjlsyvhpgpv"; libraryHaskellDepends = [ base comonad containers semigroupoids transformers ]; @@ -49996,7 +52869,7 @@ self: { mkDerivation { pname = "data-lens-fd"; version = "2.0.6"; - sha256 = "e95a54e60369b8dfe4fd378df178c759aec9ecb050f6eb35c5dfb0ad0e72dd81"; + sha256 = "10fxf87avc6zqlsypxjhn3nckbjrqxwg339pzpjdzf390gk58np9"; libraryHaskellDepends = [ base comonad data-lens mtl transformers ]; @@ -50010,7 +52883,7 @@ self: { mkDerivation { pname = "data-lens-ixset"; version = "0.1.4"; - sha256 = "a1186fa7823dab18ec0c6c8593e2dae10f791db007d41095f32af07399933f3b"; + sha256 = "0frzjfcp7w1ayfai1m07n0fpj3z1vbi971bc1kn1iarxhakny651"; libraryHaskellDepends = [ base data-lens ixset ]; testHaskellDepends = [ QuickCheck ]; homepage = "https://github.com/dag/data-lens-ixset"; @@ -50024,7 +52897,7 @@ self: { mkDerivation { pname = "data-lens-light"; version = "0.1.2.2"; - sha256 = "72d3e6a73bde4a32eccd2024eb58ca96da962d4b659d76baed4ab37f28dcb36e"; + sha256 = "0vmkvhl7zcsaxnx7d7b59cnrdnlnr9cfn910rpn34jny7fkydlvj"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/feuerbach/data-lens-light"; description = "Simple lenses, minimum dependencies"; @@ -50036,7 +52909,7 @@ self: { mkDerivation { pname = "data-lens-template"; version = "2.2"; - sha256 = "f50b0f5364c5d8a11278722ccb2faf2b7c4451001b34b4f55150599484182af0"; + sha256 = "1w1a32298naha7sv8d0v018l8z1bmwpwnb3jg09a3n65ci9hy2zm"; libraryHaskellDepends = [ base data-lens template-haskell ]; homepage = "http://github.com/roconnor/data-lens-template/"; description = "Utilities for Data.Lens"; @@ -50048,19 +52921,31 @@ self: { mkDerivation { pname = "data-list-sequences"; version = "0.1"; - sha256 = "684f915a5a4244162706dcd67848df7f37f2b603df7600ca6b1accd7a9317e64"; + sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jkramer/data-list-sequences"; description = "Utilities for working with sequences within lists"; license = stdenv.lib.licenses.gpl3; }) {}; + "data-list-zigzag" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "data-list-zigzag"; + version = "0.1.1.0"; + sha256 = "1pywxmwjlhf81vcb6ivcnf341hlmilgf77pi5kj5iad1hdznkp1y"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/erisco/data-list-zigzag"; + description = "A list but with a balanced enumeration of Cartesian product"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-map-multikey" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "data-map-multikey"; version = "0.0.1.2"; - sha256 = "6ed634f52207a9add10882ab03f17abfea5d91e310a0ec3f54197163bf980412"; + sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf"; libraryHaskellDepends = [ base containers ]; homepage = "http://github.com/jhickner/data-map-multikey"; description = "Data.Map with multiple, unique keys"; @@ -50073,7 +52958,7 @@ self: { mkDerivation { pname = "data-memocombinators"; version = "0.5.1"; - sha256 = "b4341d2024b84a43f92edc39f6d6766bf4f0f00a40fd834b9f6f8e987b606ed7"; + sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l"; libraryHaskellDepends = [ array base data-inttrie ]; homepage = "http://github.com/luqui/data-memocombinators"; description = "Combinators for building memo tables"; @@ -50087,8 +52972,8 @@ self: { }: mkDerivation { pname = "data-msgpack"; - version = "0.0.9"; - sha256 = "432b1e3f1cfbfe7cb165b139cb7379906b0f3126c381a64160aeb1f393b04b5c"; + version = "0.0.10"; + sha256 = "0vpv4l6phsa9b3l0wxk798w9kzkc454v2kk554rcmz94wq3k6n61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50109,12 +52994,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-msgpack-types" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack-types"; + version = "0.0.1"; + sha256 = "1658jhg09gsfb0ajcdfx4k78pwd19inbffg1qr0a4hwn12gi77sj"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable QuickCheck text + unordered-containers vector void + ]; + homepage = "http://msgpack.org/"; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-named" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, text }: mkDerivation { pname = "data-named"; version = "0.6.1"; - sha256 = "515e245a63c8ee278633edb368c3eaa474750bdaa0f0e5554e4d6038c295b093"; + sha256 = "14xhjp13hq2d9raybw50v85pax54xb1niczd6f32gvn8cdd28pji"; libraryHaskellDepends = [ attoparsec base binary containers text ]; homepage = "https://github.com/kawu/data-named"; description = "Data types for named entities"; @@ -50126,7 +53028,7 @@ self: { mkDerivation { pname = "data-nat"; version = "0.1.2"; - sha256 = "1540be01a754638b1f45d2d386e9ec68fc7dad83da83a67c34c7ff0e209bfdfb"; + sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m"; libraryHaskellDepends = [ base semigroups ]; homepage = "http://github.com/glehel/data-nat"; description = "data Nat = Zero | Succ Nat"; @@ -50139,7 +53041,7 @@ self: { mkDerivation { pname = "data-object"; version = "0.3.1.9"; - sha256 = "14250ab80e6a1c235efcda2ad8c61194dfdee9dec1a31c3c844656c4e710157d"; + sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; libraryHaskellDepends = [ base bytestring failure text time ]; homepage = "http://github.com/snoyberg/data-object/tree/master"; description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; @@ -50154,7 +53056,7 @@ self: { mkDerivation { pname = "data-object-json"; version = "0.3.1.8"; - sha256 = "130ff587725b72dda9206586b444e43f93233df12620581dc185ce4b248ef31b"; + sha256 = "06zkiqj4pkl5q4fmh816y4yj74rzwi2b91k542lxswjvfa3za3qk"; libraryHaskellDepends = [ base bytestring bytestring-trie convertible-text data-object failure JSONb text @@ -50172,7 +53074,7 @@ self: { mkDerivation { pname = "data-object-yaml"; version = "0.3.4.2"; - sha256 = "5785ea86b5c2da50edc5dc595d9deadae0a5868f294a6b9664f1aceb38c949a1"; + sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50190,7 +53092,7 @@ self: { mkDerivation { pname = "data-or"; version = "1.0.0.5"; - sha256 = "9defb64f1c7210460a940beb7f32ba1c79f363fbf3a5bd126feb876930c6e672"; + sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "A data type for non-exclusive disjunction"; @@ -50202,7 +53104,7 @@ self: { mkDerivation { pname = "data-ordlist"; version = "0.4.7.0"; - sha256 = "6f6c1e7a9a9155ad78ca78cb9abd6f7e2e1c78b3e549b179dc0874e6428f490d"; + sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g"; libraryHaskellDepends = [ base ]; description = "Set and bag operations on ordered lists"; license = stdenv.lib.licenses.bsd3; @@ -50213,7 +53115,7 @@ self: { mkDerivation { pname = "data-partition"; version = "0.3.0.0"; - sha256 = "4bcab7b5da1044e7877e1c5b223175224e770dbf787148954cecba83d3732816"; + sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/luqui/data-partition"; description = "A pure disjoint set (union find) data structure"; @@ -50225,7 +53127,7 @@ self: { mkDerivation { pname = "data-pprint"; version = "0.2.4.1"; - sha256 = "0c06aae83e1e41883927fbaa008964acd7d6b005a0f7e44c95fa5062943e0f83"; + sha256 = "10qg7sa64l7sjm6f9xx00nqddmxccj4h1apv4wwqhh8y7vlal1hc"; libraryHaskellDepends = [ base deepseq mtl parallel pretty time ]; description = "Prettyprint and compare Data values"; license = stdenv.lib.licenses.bsd3; @@ -50237,7 +53139,7 @@ self: { mkDerivation { pname = "data-quotientref"; version = "0.1"; - sha256 = "489e7108071f45f1abf862f91594ab643cc561cb18bdaec4a7f30c0ea7aa917a"; + sha256 = "0ylimakhw37klz2axg8qrdhwag34mfa1byb2z2mz2i8z0w4737j8"; libraryHaskellDepends = [ base ]; description = "Reference cells that need two independent indices to be accessed"; license = stdenv.lib.licenses.bsd3; @@ -50252,7 +53154,7 @@ self: { mkDerivation { pname = "data-r-tree"; version = "0.0.5.0"; - sha256 = "de6f7956043503f86e45d6a76d39a7d3b45c0ef004324ac159d0f50f04a8fcfd"; + sha256 = "1zgwm020zxfhb70llch4y075rd6klwwnv9yn8mpgh0rm0ib7jvyy"; libraryHaskellDepends = [ base binary deepseq ]; testHaskellDepends = [ base binary containers HUnit QuickCheck test-framework @@ -50268,7 +53170,7 @@ self: { mkDerivation { pname = "data-ref"; version = "0.0.1.1"; - sha256 = "a4dabee83c7419199791d0ebf7870f926b1ca834a361ecfeb3c134f7fa64f268"; + sha256 = "0s7jckxgfd61ngzfqqd36jl1qswj1y3zgsyhj6bij6bl7klbxnm4"; libraryHaskellDepends = [ base stm transformers ]; homepage = "http://wiki.haskell.org/Mutable_variable"; description = "Unify STRef and IORef in plain Haskell 98"; @@ -50280,9 +53182,9 @@ self: { mkDerivation { pname = "data-reify"; version = "0.6.1"; - sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202"; + sha256 = "00mjv6dc3fwhbqzrll02qxilwpfypahkzcdqnv17c4nbjqg0ldb1"; revision = "1"; - editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447"; + editedCabalFile = "0ixlibqrz7fd4bg9vnnd431a9kqvz4ajx8sbgyvpx9l2yjrabwzp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -50296,7 +53198,7 @@ self: { mkDerivation { pname = "data-reify-cse"; version = "0.0.3"; - sha256 = "59186a2290a630d53fb2d796d9cca1260dbd70fa414814778e1cab0aeeba4e6e"; + sha256 = "0vjfpbp0maqwirvi8j21z9qbs396l76dk5npn8zxac56j0i6l62r"; libraryHaskellDepends = [ base containers data-reify ]; description = "Common Sub-Expression Elimination for graphs generated by Data.Reify."; license = stdenv.lib.licenses.bsd3; @@ -50307,7 +53209,7 @@ self: { mkDerivation { pname = "data-repr"; version = "1.0"; - sha256 = "4939d7b8a7debb9a98cad8f468e07dcc7cd6424fdfd51dc4da74a35ff6536492"; + sha256 = "14k4agv5z8vlvb21vmfz9x1dcz6cgph6ix6qrac9mfyylywdffa9"; libraryHaskellDepends = [ base generic-deriving lens ]; homepage = "https://github.com/wdanilo/data-repr"; description = "Alternative to Show data printing utility"; @@ -50320,7 +53222,7 @@ self: { mkDerivation { pname = "data-result"; version = "1.0"; - sha256 = "b266c0184e55ed2fe7af03cf837a2666c6c3265b5de9d5f7416926f981bf0605"; + sha256 = "0186py0zj9k987vxbsaxbckc7ik64rx87kq3mzkjzvam9qcc0rmj"; libraryHaskellDepends = [ base poly-control prologue ]; homepage = "https://github.com/wdanilo/data-result"; description = "Data types for returning results distinguishable by types"; @@ -50333,7 +53235,7 @@ self: { mkDerivation { pname = "data-rev"; version = "0.1.0.1"; - sha256 = "81ce8fb0d8bf1172f3869e67b5911b358bef10880011be1935d130bdf7b8788d"; + sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1"; libraryHaskellDepends = [ base bytestring containers text vector ]; homepage = "https://github.com/jxv/data-rev"; description = "A typeclass for reversing order of contents"; @@ -50346,7 +53248,7 @@ self: { mkDerivation { pname = "data-rope"; version = "0.3"; - sha256 = "88f39dba154ee62ccab9b8ccd22142c56a878c21b0bfca14d96a9436c1375f1b"; + sha256 = "06sz6z0kd53av4acmgxh4668fsn588hx5k5qp752rrjf2nx9vww8"; libraryHaskellDepends = [ base bytestring bytestring-mmap unix ]; description = "Ropes, an alternative to (Byte)Strings"; license = "GPL"; @@ -50358,7 +53260,7 @@ self: { mkDerivation { pname = "data-rtuple"; version = "1.0"; - sha256 = "4e2824b8d23d5eafce4c5f86a90fb58d97f461b45a287006f37cf8f2bd09fb05"; + sha256 = "01gv16yz5y3wyc370a2snihz95wdnl7sk1jz9k7aypixsaw28a2f"; libraryHaskellDepends = [ base lens typelevel ]; homepage = "https://github.com/wdanilo/rtuple"; description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes."; @@ -50373,7 +53275,7 @@ self: { mkDerivation { pname = "data-serializer"; version = "0.3"; - sha256 = "c8befa7acf0293b0a367bf8100d19e8cf1ad4b4b48358394daa578103a505e2e"; + sha256 = "0bjya0x10y55vaa86da89d5svwcckv8h10dzcyiv14q2rxxgmgn8"; libraryHaskellDepends = [ base binary bytestring cereal data-endian parsers semigroups ]; @@ -50390,7 +53292,7 @@ self: { mkDerivation { pname = "data-size"; version = "0.1.1.7"; - sha256 = "fe286e41e1cb08d117536dd503381e5c47fb2f5c0fb40f4c6a4f3aa1601a2f48"; + sha256 = "0j1g39ha2fjgd960zd0gbhpznisw3qw07mbdacbx226bw50nwa7y"; libraryHaskellDepends = [ base bytestring containers deepseq text ]; @@ -50403,7 +53305,7 @@ self: { mkDerivation { pname = "data-spacepart"; version = "20090215.0"; - sha256 = "330fdfbcfcf5fb8211a8bf7e8bfafb14c8f4efb535c1edc464df2eb9a227df40"; + sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk"; libraryHaskellDepends = [ base vector-space ]; homepage = "http://code.haskell.org/data-spacepart"; description = "Deprecated. Now called \"spacepart\". Space partitioning data structures."; @@ -50420,7 +53322,7 @@ self: { mkDerivation { pname = "data-store"; version = "0.3.0.7"; - sha256 = "6d85d661c40003ccb28bce8a8a2ca3fd2945234f338532b6ecde7bee46136033"; + sha256 = "0cv02d3fwyyyxjv3519k9wilaagxlcn8m2nfifrcq0q0qihxd1bd"; libraryHaskellDepends = [ base cereal containers deepseq lens safecopy transformers ]; @@ -50447,7 +53349,7 @@ self: { mkDerivation { pname = "data-stringmap"; version = "1.0.1.1"; - sha256 = "415d3000ef4d3dec1cd2df04fbad184aeea8ddc04cc4fe2401b943538b9f4b36"; + sha256 = "0djbky5m6hxr04jgxi2cq3fsivja32nzn16zs8ffqgadxw030pa1"; libraryHaskellDepends = [ base binary containers deepseq ]; testHaskellDepends = [ base containers deepseq ghc-heap-view HUnit QuickCheck @@ -50465,7 +53367,7 @@ self: { mkDerivation { pname = "data-structure-inferrer"; version = "1.0"; - sha256 = "899b42ac23f5a0643aa3402fe923f97657850a14a7f31fe59673d51ca6f66b4a"; + sha256 = "0jkbysk1rmbkjvjizwx72h58amvnz4iyjbs0lcx6987m4fn456w9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50485,7 +53387,7 @@ self: { mkDerivation { pname = "data-sword"; version = "0.2.0.1"; - sha256 = "d2348ed2515a484866d92185640db0d20991ec9b0c6a891ed229ff41d5f304d1"; + sha256 = "1l84ygal3zr9s8g8jshckgn922fjn06n9191v5k4hj2sa798wd6j"; libraryHaskellDepends = [ base data-bword hashable template-haskell ]; @@ -50500,7 +53402,7 @@ self: { mkDerivation { pname = "data-tensor"; version = "0.1.0.0"; - sha256 = "c88613f44b62ed4cc6cf268f419d1e99d6bffd5b1b24dd87bea6433ae4d3d248"; + sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8"; libraryHaskellDepends = [ base ]; homepage = "https://bitbucket.org/tdammers/data-tensor"; description = "Tensor and Group typeclasses"; @@ -50515,7 +53417,7 @@ self: { mkDerivation { pname = "data-textual"; version = "0.3.0.2"; - sha256 = "44c530b081a486c50d668004637814223d1f1890716d39f7b692c83644d29830"; + sha256 = "0c4qs923dj4jnvvkjvbij0c1yg922iw66140cq6wb1m4h6q31ia4"; libraryHaskellDepends = [ base bytestring parsers text text-latin1 text-printer ]; @@ -50535,7 +53437,7 @@ self: { mkDerivation { pname = "data-timeout"; version = "0.3"; - sha256 = "50a143a474206780a10fee19f4d8572c9c65b060d79fadad9f61c114ba70caac"; + sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah"; libraryHaskellDepends = [ base data-textual parsers tagged text-printer transformers-base ]; @@ -50549,18 +53451,30 @@ self: { mkDerivation { pname = "data-transform"; version = "0.1.0.1"; - sha256 = "868aed778aa6cb91cd9e43ee238c18e1e3f4e4f9e038a5c907e54bf6a4fd66c5"; + sha256 = "1ib6znjgcjz50z4saf70z7jg9qz132627vj3kv6r3jx6i9vyv2l6"; libraryHaskellDepends = [ base containers mtl ]; description = "Functions to transform data structures"; license = stdenv.lib.licenses.bsd3; }) {}; + "data-tree-print" = callPackage + ({ mkDerivation, base, pretty, syb }: + mkDerivation { + pname = "data-tree-print"; + version = "0.1.0.0"; + sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5"; + libraryHaskellDepends = [ base pretty syb ]; + homepage = "https://github.com/lspitzner/data-tree-print"; + description = "Print Data instances as a nested tree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-treify" = callPackage ({ mkDerivation, base, containers, ty }: mkDerivation { pname = "data-treify"; version = "0.3.4"; - sha256 = "6966917338d1283747ece373b9ea08584eb50a56bd208119cda438004586ac0f"; + sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9"; libraryHaskellDepends = [ base containers ty ]; homepage = "http://ittc.ku.edu/~andygill/data-reify.php"; description = "Reify a recursive data structure into an explicit graph"; @@ -50572,7 +53486,7 @@ self: { mkDerivation { pname = "data-type"; version = "0.1.0"; - sha256 = "7263c2c4f8b9d1f984c3e481b83b15132ce3c0f3be3a1d0cf05da74ba3d57cf4"; + sha256 = "1x3wsnilp9sxy061sfmyyg0f6b0k2lxvi0g4qf2gkldrz32c4qvj"; libraryHaskellDepends = [ base ]; description = "Basic type wrangling types and classes"; license = stdenv.lib.licenses.bsd3; @@ -50584,7 +53498,7 @@ self: { mkDerivation { pname = "data-util"; version = "0.5"; - sha256 = "b2efae3502106d841bcc1d728334ed019c36656645127726517807a701c9177e"; + sha256 = "0zhpr40sf1vqa4k7f4j5crjkd701xls86whxrhdq8v8h08ssxvxj"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/cutsea110/data-util"; description = "utilities for handle data"; @@ -50596,7 +53510,7 @@ self: { mkDerivation { pname = "data-variant"; version = "0.28.0.5"; - sha256 = "b3c2af96b46dffd5ba62e2dab6d8761f8f86f1f61eb1d90f52e87724f0192a86"; + sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk"; libraryHaskellDepends = [ base safe ]; homepage = "https://bitbucket.org/tdammers/data-variant"; description = "A variant data type, useful for modeling dynamically-typed programming languages"; @@ -50611,7 +53525,7 @@ self: { mkDerivation { pname = "database-migrate"; version = "0.2.0"; - sha256 = "fe2f5e3332d883425da78eaee1b0d360da6f5773519f341c3bf87d1f0a1a1dc2"; + sha256 = "1hhx3851yzgq7cf397sifdbnznk0sfqf3blflxfl50yq68rmwbzy"; libraryHaskellDepends = [ base bytestring cmdargs containers directory either filepath lens postgresql-simple text time transformers @@ -50626,7 +53540,7 @@ self: { mkDerivation { pname = "database-study"; version = "0.0.1"; - sha256 = "a73d412476ae3a21f78051df671262b105f62a00c7b2947070a89c6b883a17ab"; + sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7"; libraryHaskellDepends = [ base containers ]; homepage = "http://dbs.informatik.uni-halle.de/Lehre/LP09/"; description = "Demonstrate how a database can be implemented the functional way"; @@ -50642,7 +53556,7 @@ self: { mkDerivation { pname = "datadog"; version = "0.1.0.1"; - sha256 = "c31855ea4008644941320574cfdff1085e8c160414288e528af8ad1fd5bc0e16"; + sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663"; libraryHaskellDepends = [ aeson auto-update base buffer-builder bytestring lens lifted-base monad-control network old-locale text time transformers-base @@ -50658,7 +53572,7 @@ self: { mkDerivation { pname = "dataenc"; version = "0.14.0.7"; - sha256 = "f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3"; + sha256 = "1wwgm7wakkz6v94lyxyd3yi21l3h28sss4xxdb3d770vmjhp1lzr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers ]; @@ -50676,7 +53590,7 @@ self: { mkDerivation { pname = "dataflow"; version = "0.7.3.0"; - sha256 = "312f2f0497cbd7e34d6eb3c4f1d113443e5375346b70628c0a22211e4baf883a"; + sha256 = "0fl8mx5iw8921a664w3b6ism6gj42g8z3i5kdr6y7mybjw22ybri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50700,7 +53614,7 @@ self: { mkDerivation { pname = "datalog"; version = "0.2.0.2"; - sha256 = "0665f0580449d79218b71b5a4d4ff3d1a9b9e678eecc9a0530482169dcabd2d9"; + sha256 = "1nfjmgf6j8a8602rmk7fg3kbkafiyd7lsnhvnwc95ms90icg0r86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50727,7 +53641,7 @@ self: { mkDerivation { pname = "datapacker"; version = "1.0.1"; - sha256 = "8f2aad20f035ae5278946b77934b22f63b859aff32c074ade3e6e4c5c90fd281"; + sha256 = "10fj1z4wbr76wfnp9h1jzyd8afzn495r6xvbjiw55bimy0hasalg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50746,7 +53660,7 @@ self: { mkDerivation { pname = "datasets"; version = "0.2.1"; - sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277"; + sha256 = "0xqjxgpdmbdmi28d5wr3sxz9n3km3i0s0i8668d9p2rmjf89wgdg"; libraryHaskellDepends = [ aeson base bytestring cassava directory file-embed filepath hashable HTTP stringsearch text time vector @@ -50756,20 +53670,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "datasets_0_2_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, directory - , file-embed, filepath, hashable, microlens, stringsearch, text - , time, vector, wreq + "datasets_0_2_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cassava + , directory, file-embed, filepath, hashable, microlens + , stringsearch, text, time, vector, wreq }: mkDerivation { pname = "datasets"; - version = "0.2.3"; - sha256 = "f155d4aea31d03fd14c7050793d9e90685ba8858460ce7c3716919bd00c12ea4"; + version = "0.2.4"; + sha256 = "1l5djdv1fvqymkc5q10zwzhjwphxpw1wpr5d8rqf3z2kym3k0h2r"; libraryHaskellDepends = [ - aeson base bytestring cassava directory file-embed filepath - hashable microlens stringsearch text time vector wreq + aeson attoparsec base bytestring cassava directory file-embed + filepath hashable microlens stringsearch text time vector wreq ]; - homepage = "https://github.com/glutamate/datasets"; + homepage = "https://github.com/filopodia/open/datasets"; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -50782,7 +53696,7 @@ self: { mkDerivation { pname = "dataurl"; version = "0.1.0.0"; - sha256 = "b1e72b48dbe72520f0b43b06ae75cb025e9750213982583f527e16b605660fb2"; + sha256 = "1chgcq2vc5kya8zmi0ir4589fph2rdssw1ivnkq209g7vd42prxi"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring text ]; @@ -50799,7 +53713,7 @@ self: { mkDerivation { pname = "date-cache"; version = "0.3.0"; - sha256 = "abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f"; + sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb"; libraryHaskellDepends = [ base bytestring ]; description = "Date cacher"; license = stdenv.lib.licenses.bsd3; @@ -50810,7 +53724,7 @@ self: { mkDerivation { pname = "date-conversions"; version = "0.1.0.0"; - sha256 = "16b3c0ab70c86b25af6202f5a4a9df442d3cdc095b18fd61082659524eac880c"; + sha256 = "0348mi754n9611hzs62v17f3qba4vyls9x82capjasy8f2mw1cqn"; libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; homepage = "https://github.com/thoughtbot/date-conversions#readme"; @@ -50823,7 +53737,7 @@ self: { mkDerivation { pname = "dates"; version = "0.2.2.1"; - sha256 = "6dbd2a18aa21435341ab4f537899b60eac38de384597efd2e9eb8c95030c8c09"; + sha256 = "02cc1h1rb37bx79fz5s573g3ib0fnscphlsgmd0m6hr1m8c2mgbd"; libraryHaskellDepends = [ base base-unicode-symbols parsec syb time ]; @@ -50840,7 +53754,7 @@ self: { mkDerivation { pname = "datetime"; version = "0.3.1"; - sha256 = "333c7577c5051eb23d172568b9d4fe186f8b5bc750ba1d09822c275d76edbd4a"; + sha256 = "0jmxxmv5s9rch84ivfjhqxdqnvqqzvabjs152wyv47h5qmvpag1k"; libraryHaskellDepends = [ base old-locale old-time time ]; testHaskellDepends = [ base HUnit old-locale old-time QuickCheck test-framework @@ -50860,7 +53774,7 @@ self: { mkDerivation { pname = "datetime-sb"; version = "0.2.4"; - sha256 = "4e56759835f76e1dbe5d9dda022e0eb62af253c5d202146bdd0cb7d824b057dc"; + sha256 = "1p2pn0jdidqcvmmi80njqm9z4amn1qp05nlxbnz1svpp6nc7amjf"; libraryHaskellDepends = [ base old-locale old-time time ]; testHaskellDepends = [ base HUnit old-locale old-time QuickCheck test-framework @@ -50877,7 +53791,7 @@ self: { mkDerivation { pname = "dawdle"; version = "0.1.0.2"; - sha256 = "6228a3bd300d3577936cea83bd25cad3b015977eeb4b7ba7c18b0665da941856"; + sha256 = "0mhqjkd6a1lbq6kpnjzbgsbibc6kr8jvv0zadj9pfd8d62ys6a32"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec pretty text time ]; @@ -50895,7 +53809,7 @@ self: { mkDerivation { pname = "dawg"; version = "0.11"; - sha256 = "299dfabdea78a7a89ab22f22b60963747f29a23f1a349aca36241b7361e17377"; + sha256 = "0xvkw5hp66r46v59ld0s7yi2jzvlcc4vc8ignadai9vqxayzm799"; libraryHaskellDepends = [ base binary containers mtl transformers vector vector-binary ]; @@ -50912,7 +53826,7 @@ self: { mkDerivation { pname = "dawg-ord"; version = "0.5.1.0"; - sha256 = "d9129acfb71ce41b6994d2c72a040319fc85af408226122d3958d5617e8922e9"; + sha256 = "1s92i5z63maq74ni49l282pqbz0r0c22miyjjilipr0wnz7rl4nr"; libraryHaskellDepends = [ base containers mtl transformers vector ]; @@ -50930,7 +53844,7 @@ self: { mkDerivation { pname = "dbcleaner"; version = "0.1.1"; - sha256 = "8c45177c9f36943a7aa332534d7e120b5c1a50f8d628d6d56ef49cd21ca08ad8"; + sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc"; libraryHaskellDepends = [ base postgresql-simple text ]; testHaskellDepends = [ base hspec postgresql-simple text ]; description = "Clean database tables automatically around hspec tests"; @@ -50943,7 +53857,7 @@ self: { mkDerivation { pname = "dbf"; version = "0.0.0.2"; - sha256 = "c216e6fa2cb5794e3f81a1d47163ad6e7e9b827d73e8cf2ad471f7bad6215edd"; + sha256 = "1pay47bbmxvishmczs3kgn19nzkfmmip3m51h4zlwydm5kxfc5n2"; libraryHaskellDepends = [ base binary bytestring monad-loops rwlock ]; @@ -50959,7 +53873,7 @@ self: { mkDerivation { pname = "dbjava"; version = "1.7"; - sha256 = "ae4ce9d32216b54605d0e52dda740ddf8fb33e078fa6f03531594a8d8602bf1b"; + sha256 = "06xz0a38sjjr64sz19lg0wzb73yz1msdlbg5s02ldd8n4b9yjk5f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50981,7 +53895,7 @@ self: { mkDerivation { pname = "dbm"; version = "0.3"; - sha256 = "f6963467efbe00300472b4d30bd7ab11db6b50c183e89d31fbac5080f922eb9c"; + sha256 = "177b4bwq0l5czcqrvs43q586pnqimgbhplxlf823005yxxkk95pn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51001,7 +53915,7 @@ self: { mkDerivation { pname = "dbmigrations"; version = "2.0.0"; - sha256 = "bd95b2082c34487277f4b6cf1407729881a847a837829d5b68307931a0a11bfe"; + sha256 = "1zhvl6h32y9hd1drv0ipm13si0cqf83i9kxnyivp4j1l5h4b55dx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51026,7 +53940,7 @@ self: { mkDerivation { pname = "dbmigrations-mysql"; version = "2.0.0"; - sha256 = "45bd44c9e46bff2923634030ea6f54b9df93ef3b2ea38749c5263f7e00421f5c"; + sha256 = "0p0z8807wgr6qm4qg8rf7gpr7pxraipylc20ccijkzvbwk4l9ga5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51048,7 +53962,7 @@ self: { mkDerivation { pname = "dbmigrations-postgresql"; version = "2.0.0"; - sha256 = "fcf753778e2e071c8fa452c585b93c27c973bedee5fe9cb608e3fdbfe83ec92f"; + sha256 = "0by97vlbzzg312v9rzp5vsz77j977jwqbiajlj7iq1rfirvm7xzw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dbmigrations HDBC-postgresql ]; @@ -51065,7 +53979,7 @@ self: { mkDerivation { pname = "dbmigrations-sqlite"; version = "2.0.0"; - sha256 = "0ca8140ac27919890c93f45c20bdd25b4c190eec60a330069d89cb8b9a481320"; + sha256 = "080k92d8pjw9kl3318v0xh71jk2vsayj0p7ljc68j6brq8519a0c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dbmigrations HDBC-sqlite3 ]; @@ -51082,8 +53996,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "0.10.12"; - sha256 = "f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54"; + version = "0.10.13"; + sha256 = "1jksgv3c2bhi9d3kshllx6j1znyqmx189j6yml7j9gm0m3xsx55a"; libraryHaskellDepends = [ base bytestring cereal containers libxml-sax network parsec random text transformers unix vector xml-types @@ -51095,7 +54009,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq ]; doCheck = false; - homepage = "https://john-millikin.com/software/haskell-dbus/"; + homepage = "https://github.com/rblaze/haskell-dbus#readme"; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -51107,7 +54021,7 @@ self: { mkDerivation { pname = "dbus-client"; version = "0.4.1"; - sha256 = "58ea9c43eeab968225abecdcb752297d0af87bb8ac13cd9524ed4ba76630e07c"; + sha256 = "0z7061kafjzd4jaws4xcp1xzh2kx559bgp7cmcjq55mbxr1rrsjq"; libraryHaskellDepends = [ base containers dbus-core monads-tf text transformers ]; @@ -51125,7 +54039,7 @@ self: { mkDerivation { pname = "dbus-core"; version = "0.9.3"; - sha256 = "cabddfbc4ff452f114f242dd364c91705448de9993230acf04b8461bfd380384"; + sha256 = "110373yinimq0k7hl8wkk7g4hm3hj563dpa2y8ag2lpl9yydzgfa"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 libxml-sax network parsec text unix vector xml-types @@ -51143,7 +54057,7 @@ self: { mkDerivation { pname = "dbus-qq"; version = "0.1.0"; - sha256 = "bdcbcbacf054a57551ebb21584847b20316954d819f805b96f5eea75b61de035"; + sha256 = "0dg03nv7bsjydywhby0rv1a6jc90gf2885djxd8pb9aly2ncpjxx"; libraryHaskellDepends = [ base containers dbus parsec template-haskell ]; @@ -51160,7 +54074,7 @@ self: { mkDerivation { pname = "dbus-th"; version = "0.1.2.0"; - sha256 = "58560b8ae7215786b6d632e05a0ab74665abc59b66e18555493dd937cbee4909"; + sha256 = "02a9xv5kgn9x95aqbqb6kg2snra6nw55mq1jssv8cmr1wy50nmjq"; libraryHaskellDepends = [ base containers dbus syb template-haskell text ]; @@ -51175,7 +54089,7 @@ self: { mkDerivation { pname = "dbus-th-introspection"; version = "0.1.0.0"; - sha256 = "42c5e05f11789d9c738b5ce9495e0a25f15738db85637c49a5bb03c1ed768481"; + sha256 = "10c4fvnw20xvlm4pqqw5vcw5gw9519g4ksawidrrr7bq25gy1ia2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51197,7 +54111,7 @@ self: { mkDerivation { pname = "dclabel"; version = "0.9.0.0"; - sha256 = "39eee5fff3f8d776fc4c152d4d4d837c496a7fc96f9eaf9fe428f575e5c2cb2e"; + sha256 = "0bnbqbjpbx98wjgsz7kgr5znljbwhd6lsb8m9ky7dmzqygzybvir"; libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ base bytestring cereal containers QuickCheck quickcheck-instances @@ -51217,7 +54131,7 @@ self: { mkDerivation { pname = "dclabel-eci11"; version = "0.3"; - sha256 = "d364b95d3aee48dfedb31cb8998903853d53edd536cf7b3ffdf263476e4cccad"; + sha256 = "1bfc9ip4fqzjzlzppkrnspnm6gc50f4rkf0wngnxyj7f79fvjr6k"; libraryHaskellDepends = [ base pretty QuickCheck ]; description = "The Disjunction Category Label Format"; license = stdenv.lib.licenses.bsd3; @@ -51230,7 +54144,7 @@ self: { mkDerivation { pname = "dcpu16"; version = "0.1.0.2"; - sha256 = "92de2844f087051e94be731f127b06c1cdb4ed3747b82c8ab33fc4feedcdc7fc"; + sha256 = "1z67rpnzxi1znf52rf276znv9kf10rxi47vkpsa1w1c7y122iplj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51248,7 +54162,7 @@ self: { mkDerivation { pname = "ddate"; version = "0.1.0.0"; - sha256 = "c5b2865267163dd4055533a874c72e77d4749293975f639fe1e229c38ec580d7"; + sha256 = "1mw0qn7c6ag2w6gn6pwpjf979m3p5v3p9a1kal2x8g8ncx98dcn5"; libraryHaskellDepends = [ base dates time ]; description = "Discordian Date Types for Haskell"; license = stdenv.lib.licenses.gpl2; @@ -51261,7 +54175,7 @@ self: { mkDerivation { pname = "ddc-base"; version = "0.4.2.1"; - sha256 = "0870bebdecf1f86a9280d1ca5addf382ad3af75c502ecebf448a64cf9402b3fc"; + sha256 = "1z5k0aacyr4a8jzwwbjhbkvkmbc2ygfmmjnih296my7ixjyvww08"; libraryHaskellDepends = [ base containers deepseq parsec transformers wl-pprint ]; @@ -51280,7 +54194,7 @@ self: { mkDerivation { pname = "ddc-build"; version = "0.4.3.1"; - sha256 = "859a925c0e0c9d8f833f3fe3d74ff11a1962cd45c43a143baaefa13bc0c7e3a7"; + sha256 = "19z3qz03p8ggm8xi8fn48p6n468sy57xgqrz7y1qz78c1rf956l5"; libraryHaskellDepends = [ base containers ddc-core ddc-core-babel ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra ddc-source-tetra @@ -51297,7 +54211,7 @@ self: { mkDerivation { pname = "ddc-code"; version = "0.4.3.2"; - sha256 = "ed5f1c3040824a3cfabff7339a9fbfb6619650b41838e5bf36e01144832c50a5"; + sha256 = "19ah5j1l84g06szyaf0qni89cqdnpygrlczppzx3qjl280q1qpzd"; libraryHaskellDepends = [ base filepath ]; homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler base libraries"; @@ -51311,7 +54225,7 @@ self: { mkDerivation { pname = "ddc-core"; version = "0.4.3.1"; - sha256 = "2623e282b5231e5841f85a3d175f39e7145f1ae138341c001e3e649fdebc634c"; + sha256 = "0k33pkg9yr1y3q01qd1qw4d5y57775gifgasz10mh7i3nn1f48r6"; libraryHaskellDepends = [ array base containers deepseq directory filepath inchworm mtl parsec text transformers wl-pprint @@ -51327,7 +54241,7 @@ self: { mkDerivation { pname = "ddc-core-babel"; version = "0.4.3.1"; - sha256 = "2f8a06a7c450a0ff3861b8eb039d0556176761a1ae1272348c86736af05a6ff3"; + sha256 = "1wvgbbq6lww6ihs744mfl5hnf5sn0nfh7sxqc4wgz82hqjkhd2ig"; libraryHaskellDepends = [ base containers ddc-core ddc-core-tetra ]; @@ -51344,7 +54258,7 @@ self: { mkDerivation { pname = "ddc-core-eval"; version = "0.4.1.3"; - sha256 = "adfbec804f60893af7b8c6dd6de7cd1acdd6aadf0d3fcaa4bd44b972e8e72168"; + sha256 = "0s11wzl75fa4pnjclgqdvymddk8srpknvpf6p3vkm2b09y0fryxd"; libraryHaskellDepends = [ array base containers ddc-base ddc-core deepseq mtl transformers ]; @@ -51362,7 +54276,7 @@ self: { mkDerivation { pname = "ddc-core-flow"; version = "0.4.3.1"; - sha256 = "d96b2eabc2d6ce67cce7113d466b9735f4821d8669d8c174aebcf597f8cf49f7"; + sha256 = "1xs9rzw9gxdwmrsc3n39hqfq5x1mjxmlcg8iwz66gknnqamjwsyr"; libraryHaskellDepends = [ array base containers ddc-core ddc-core-salt ddc-core-simpl ddc-core-tetra deepseq limp limp-cbc mtl transformers @@ -51380,7 +54294,7 @@ self: { mkDerivation { pname = "ddc-core-llvm"; version = "0.4.3.1"; - sha256 = "73ef5bddd33a5f43d620e9dddf256ae83ed510bded8bfd686bca7a3568080db1"; + sha256 = "1c8d11l3aynaddlgv2zdpl8dagp8d8jxzpg943b46prssgfmpvvk"; libraryHaskellDepends = [ array base bytestring containers ddc-core ddc-core-salt ddc-core-simpl mtl text transformers @@ -51398,7 +54312,7 @@ self: { mkDerivation { pname = "ddc-core-salt"; version = "0.4.3.1"; - sha256 = "fa2fe30ac85ec6a2bc4ee4341908fb15d3aec083947ca3448aa49a033e80ec8e"; + sha256 = "13pch0z076m4i92a6z4lhg0axlqmzc41jd749sya5ijyr05f6bzs"; libraryHaskellDepends = [ array base containers ddc-core deepseq mtl text transformers ]; @@ -51415,7 +54329,7 @@ self: { mkDerivation { pname = "ddc-core-simpl"; version = "0.4.3.1"; - sha256 = "8e11babb0d783c523906300f9e4659c56636140e2950ce89dce8bb5403920148"; + sha256 = "0j01j81m9fz8vj4wwl191qa3crn5b539w3rh0qwm4g3q1nxvl4cf"; libraryHaskellDepends = [ array base containers ddc-core deepseq mtl transformers ]; @@ -51432,7 +54346,7 @@ self: { mkDerivation { pname = "ddc-core-tetra"; version = "0.4.3.1"; - sha256 = "c8448ca089d02f7d6547ed00a14802f3dd7826a31883a75e5bb6d60241c07a79"; + sha256 = "0ybsq10h5mmnbdgag0qqlck7ipgk094a207d8xjpsbyhi6h8qi68"; libraryHaskellDepends = [ array base containers ddc-core ddc-core-salt ddc-core-simpl deepseq mtl pretty-show text transformers @@ -51452,7 +54366,7 @@ self: { mkDerivation { pname = "ddc-driver"; version = "0.4.3.1"; - sha256 = "6671df11413d64b4644a5ccd0f113e1b785fbae06eff750d3538704389845b24"; + sha256 = "092vhj4l6w1q6l6pbzvfw2x5yy0v7q8hzkaw99jb8r1x848xywb6"; libraryHaskellDepends = [ base containers ddc-build ddc-core ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra ddc-source-tetra @@ -51469,7 +54383,7 @@ self: { mkDerivation { pname = "ddc-interface"; version = "0.4.1.3"; - sha256 = "6e68e8ae8ea7f7ff507d238541536959298068e62985e4305d3df5457fb77a5d"; + sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f"; libraryHaskellDepends = [ base containers ddc-base directory ]; homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler user interface support"; @@ -51484,7 +54398,7 @@ self: { mkDerivation { pname = "ddc-source-tetra"; version = "0.4.3.1"; - sha256 = "9d8494fb36b8034159a2304f9fd8e549d249427218462e4ab4f9d44582f9f69f"; + sha256 = "17znz614bm7rni52wihqf914klj9wpc9ykrhl9cl20xq6vxr914x"; libraryHaskellDepends = [ array base containers ddc-core ddc-core-salt ddc-core-tetra deepseq mtl pretty-show text transformers @@ -51504,7 +54418,7 @@ self: { mkDerivation { pname = "ddc-tools"; version = "0.4.3.1"; - sha256 = "56a692eb50e10e24286362d1aa46141c76ae2374050b077f54c14bb958bbf0a5"; + sha256 = "19ghpdcbjjy1aizhf2q5fhiswxhw2i3amlb2ccl283p1a3mr59jn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51526,7 +54440,7 @@ self: { mkDerivation { pname = "ddc-war"; version = "0.4.1.3"; - sha256 = "5e8051ebf83213093e4b3409dfee7dae3e15a7500f39c913af8fbfdcc2273079"; + sha256 = "0y9h4z1drgwgmw9wjf8ga2kiagmfgppdy29l9cz0j4rjz3mm302y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51545,7 +54459,7 @@ self: { mkDerivation { pname = "ddci-core"; version = "0.2.1.2"; - sha256 = "801b01f0000bc019947c1816ceb5ae6cb4bfa0e878da4e647d89c1bb236693f0"; + sha256 = "1w4kcqivphc9gmj4xnkqx2hbzd3cmssww5hqgja1kh0b03q026w0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51567,7 +54481,7 @@ self: { mkDerivation { pname = "dead-code-detection"; version = "0.8.1"; - sha256 = "6b69771ae3dac21d73ccd6fbb145dac98cf3f661787f2c59ecd6ee26726bc1fb"; + sha256 = "1yy1ddr2dvnnxicjqzvqc7vg7369v92v3yynririvhnswcd7fsbb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51592,7 +54506,7 @@ self: { mkDerivation { pname = "dead-simple-json"; version = "0.1.2"; - sha256 = "f9feb24297c8e052ac0593077f76a8f4dc4427b77adb09e998744fd8ef499783"; + sha256 = "10wp97pxhkvlk3lhknvsnwkl9p7lm1v7y1wk0nn55q68jx1b5zpr"; libraryHaskellDepends = [ base containers parsec template-haskell transformers vector ]; @@ -51606,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 = "16b14ad562ef5895462b59790f42d591d977e1433c4c2763a3a6a34e052e0d56"; + 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 @@ -51636,7 +54550,7 @@ self: { mkDerivation { pname = "debian-binary"; version = "0.0.1"; - sha256 = "d89123fc880de17634dffa08682a942eb3d8a67998e24b68f3f08a1bb0a2cb4c"; + sha256 = "0k6blaq1p2phydl4pqlqg6kdicrfjhm6h27svws7dq8di3y274fq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath HSH ]; @@ -51652,7 +54566,7 @@ self: { mkDerivation { pname = "debian-build"; version = "0.10.1.0"; - sha256 = "a41033dee53346bda2f77a4192f85b54dbe3d25ef9b1fd158fdc09b4411e90b4"; + sha256 = "1d4h3r0v82fwiwazvcgrbv9f7nslbgw94hbsyyibsiikwpg36454"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51669,18 +54583,47 @@ self: { mkDerivation { pname = "debug-diff"; version = "0.1"; - sha256 = "8de679b042eff7fd19ffeae8af395a934e61213204d030b2c5a24079457269a6"; + sha256 = "19k9f92pjh52qnr31l0468hn2klkb8wszs7azwczvxzg8aq7krld"; libraryHaskellDepends = [ base groom process temporary ]; description = "Display a colorized diff between two Haskell values"; license = stdenv.lib.licenses.bsd3; }) {}; + "debug-me" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, cereal, containers + , cryptonite, directory, filepath, graphviz, http-client + , http-client-tls, http-types, memory, mime-mail, network + , network-uri, optparse-applicative, posix-pty, process, protobuf + , sandi, stm, stm-chans, terminal-size, text, time + , unbounded-delays, unix, unordered-containers, utf8-string, uuid + , wai, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "debug-me"; + version = "1.20170510"; + sha256 = "0lxzy58a1qyl3vwhn9faiibsfrkaqxylvsdxhfki1x03amwzwnyw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base bytestring cereal containers cryptonite directory + filepath graphviz http-client http-client-tls http-types memory + mime-mail network network-uri optparse-applicative posix-pty + process protobuf sandi stm stm-chans terminal-size text time + unbounded-delays unix unordered-containers utf8-string uuid wai + wai-websockets warp websockets + ]; + homepage = "https://debug-me.branchable.com/"; + description = "secure remote debugging"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "debug-time" = callPackage ({ mkDerivation, base, clock, containers }: mkDerivation { pname = "debug-time"; version = "0.1.0.1"; - sha256 = "6076a78e42012a902b8ee157ec9069ca3148cb89ca659e4dff5267f11aca4d99"; + sha256 = "16adr8dg2rsjzx6rwrfai75lhcfad68fqmz1iqmr0ah18a7afxk0"; libraryHaskellDepends = [ base clock containers ]; testHaskellDepends = [ base ]; homepage = "http://github.com/LukaHorvat/debug-time#readme"; @@ -51693,7 +54636,7 @@ self: { mkDerivation { pname = "decepticons"; version = "0.1.0.0"; - sha256 = "7bccd3aa39b5bc4dcfa359bbad9565d75ee4720d5f08596adf30de960513d7ba"; + sha256 = "1fnp2c2rdpihvxm5j22z1mrf8pnpcnasvfsrlg7lvg5m76md7k3v"; libraryHaskellDepends = [ base comonad-transformers ]; description = "The categorical dual of transformers"; license = stdenv.lib.licenses.bsd3; @@ -51705,7 +54648,7 @@ self: { mkDerivation { pname = "decimal-arithmetic"; version = "0.4.0.0"; - sha256 = "b632462fcc18b8b6f4f0eb21b2b29c6075f7335dcad1ddb1a268264c513b4d0f"; + sha256 = "03sd7d8lq9k8laqxvlfablrzfxb0kjrb48gby3sbdf0qrhplccmn"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/verement/decimal-arithmetic#readme"; @@ -51722,7 +54665,7 @@ self: { mkDerivation { pname = "declarative"; version = "0.5.1"; - sha256 = "4ed591067e741682da3f319284dbf1d77c70bdf9d5c78e32575d5018d3f4c624"; + sha256 = "0966yk9ihl2xawr8xiymz6yp0z6py7dq94ii7zd845klgq393maf"; libraryHaskellDepends = [ base hasty-hamiltonian kan-extensions lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice @@ -51740,7 +54683,7 @@ self: { mkDerivation { pname = "decode-utf8"; version = "1.2"; - sha256 = "f0e2fc4060dcbf995a8552a302afeb7dab9469c9349081366aa4bd22c341b282"; + sha256 = "10mj871j5gd4d8v8341lr5lr9avxxfph58sjhmd9kgywc10grqph"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51755,7 +54698,7 @@ self: { mkDerivation { pname = "decoder-conduit"; version = "0.0.1.1"; - sha256 = "8719937a665bd8b59e186419b6a5e3b8c57fb277562fb18f2b68b44e28cbb37c"; + sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7"; libraryHaskellDepends = [ base binary bytestring conduit ]; homepage = "https://github.com/hansonkd/decoder-conduit"; description = "Conduit for decoding ByteStrings using Data.Binary.Get"; @@ -51771,7 +54714,7 @@ self: { mkDerivation { pname = "dedukti"; version = "1.1.4"; - sha256 = "4d9c67f653b2044b64296ee2079f128d8e9073d9ccea2317a27dd4240a12e32c"; + sha256 = "0b7328529m3xl8bj7sncv5rr13ld2aghgqkf55j4n15jagv6g72d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ time unix ]; @@ -51793,7 +54736,7 @@ self: { mkDerivation { pname = "deepcontrol"; version = "0.5.4.3"; - sha256 = "2e943a13531120a5c3df908c849d0697c22ef82e6dc4bf102f6fe39e9faa0e35"; + sha256 = "0d8fmagrxqvg5w8bzi3d5vw2xhlp0sfq934hvz1sa80iac9km51f"; libraryHaskellDepends = [ base mmorph mtl transformers ]; testHaskellDepends = [ base containers doctest HUnit mtl QuickCheck safe transformers @@ -51811,9 +54754,9 @@ self: { mkDerivation { pname = "deeplearning-hs"; version = "0.1.0.2"; - sha256 = "0da58dd777b5a9d097cef43dede6f72cca18d56577cab131106bfaa7634f82b3"; + sha256 = "1cw29xisgykb20qv3jkpcpaiijicyzkfsgglrsbx1admfzbqv98d"; revision = "1"; - editedCabalFile = "eca23efe079b6311afd52bf1a70f8b9617c2b943e13b2ddb0ac2be5249622afa"; + editedCabalFile = "1yiac94m5gn21bdjsfz18fww45wnic7sgw9bsnpi2qwv0zz3x8pc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51837,7 +54780,7 @@ self: { mkDerivation { pname = "deepseq"; version = "1.3.0.1"; - sha256 = "9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19"; + sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp"; libraryHaskellDepends = [ array base ]; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; @@ -51851,7 +54794,7 @@ self: { mkDerivation { pname = "deepseq"; version = "1.4.2.0"; - sha256 = "de0aa1291790409fe36e8b9bdf3c1f340661290eb3258876af2b07b721e94951"; + sha256 = "0la9x4hvf1rbmxv8h9dk1qln21il3wydz6wbdviryh4h2wls22ny"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base HUnit test-framework test-framework-hunit @@ -51869,9 +54812,9 @@ self: { mkDerivation { pname = "deepseq-bounded"; version = "0.8.0.0"; - sha256 = "2e20a5473b923b4e3527efe98e99938103147adba99feec58b3aafd7a2c750a4"; + sha256 = "192hqyidgbrsig2yx7x9vdx180w1jfcqxsgg4wslwfwj7d3sa81f"; revision = "1"; - editedCabalFile = "069cbb8f36cafb3c95ed203fc94c7e5c14f6814f9d0d5a43666b18bf57e59b8b"; + editedCabalFile = "12wvwmbvy63bcr1ml3cx9y0zc52wgr6cjgr0xnakryya6s7vp706"; libraryHaskellDepends = [ array base cpphs deepseq deepseq-generics generics-sop mtl parallel random syb @@ -51893,7 +54836,9 @@ self: { mkDerivation { pname = "deepseq-generics"; version = "0.2.0.0"; - sha256 = "b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d"; + sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; + revision = "1"; + editedCabalFile = "055m914q7a19jagpxh65d8m67z1nl0h7cz77y1r0zp1qmpkisg82"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -51908,7 +54853,7 @@ self: { mkDerivation { pname = "deepseq-magic"; version = "1.0.0.3"; - sha256 = "d71fbbe20170f26eb66085599fd79b54c190844314ad51c2bf373a06abd4d196"; + sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ezyang/deepseq-magic"; description = "Deep evaluation of data structures without NFData"; @@ -51920,7 +54865,7 @@ self: { mkDerivation { pname = "deepseq-th"; version = "0.1.0.4"; - sha256 = "c5a4b8e6173163cdf5cee22e21267507161cb2222bfcff855822dcfc2244938b"; + sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base deepseq template-haskell ]; description = "Template Haskell based deriver for optimised NFData instances"; @@ -51933,7 +54878,7 @@ self: { mkDerivation { pname = "deepzoom"; version = "0.1"; - sha256 = "13c9e8dd1f15518227e688f17738a28c726eeb0cb18676a6122810ecbc993ac2"; + sha256 = "1hisk6yfq4182ak7d1mi1kmnwwlcl8w7gwc8wqkq4l8m3zfyij8k"; libraryHaskellDepends = [ base directory filepath hsmagick ]; description = "A DeepZoom image slicer. Only known to work on 32bit Linux"; license = stdenv.lib.licenses.bsd3; @@ -51945,7 +54890,7 @@ self: { mkDerivation { pname = "defargs"; version = "0.3"; - sha256 = "6f32a30b2b10a793a2807faf15324ad92cbc9c6564fbabc900517235103fe3e7"; + sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg"; libraryHaskellDepends = [ base cluss ]; homepage = "https://github.com/Kinokkory/defargs"; description = "default arguments in haskell"; @@ -51960,7 +54905,7 @@ self: { mkDerivation { pname = "definitive-base"; version = "2.3"; - sha256 = "896bf09e3c25f0c00a4469d95f2886e3ba2208d3139817adec088569e6b1d488"; + sha256 = "126ln7k6k188xjnig60ksc425fp3hql5znb98h5c1w157jgg0sw9"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim GLURaw OpenGL OpenGLRaw primitive vector @@ -51979,9 +54924,9 @@ self: { mkDerivation { pname = "definitive-filesystem"; version = "1.2"; - sha256 = "2d22b782dfb24050df054b85ff1662f3042c49edad2bb98aa8ebe3f8224a802d"; + sha256 = "0bc098igiqzbm25bjaxdxm4jq17kc8bgz1ab0pgm0h5jvy1bf8id"; revision = "1"; - editedCabalFile = "3a78d4d8aaa291ca95d889b62a979c4132bbe6f91073ab2bd9fdb0d55ed63121"; + editedCabalFile = "089isrgdbc7xv4msnwqhz7kbncj1kjbjmdl9v2awm4d2mbcd8y1s"; libraryHaskellDepends = [ array base bytestring clock containers deepseq definitive-base definitive-reactive directory filepath old-locale primitive time @@ -52002,9 +54947,9 @@ self: { mkDerivation { pname = "definitive-graphics"; version = "1.2"; - sha256 = "d97f94941ee794043846991cc648cbe3d51659d4390864e3ba8626aa844c012a"; + sha256 = "0ah19j2al9l6pbin821rsicidmg3rd4cc74r8qw095773sa98zyr"; revision = "1"; - editedCabalFile = "a6d867ea8098390daff40c088c81f854ca054f9a0c8b097f9194be329416baed"; + editedCabalFile = "1vds2sa35gllj5zhk2qck97hbjjlz20qq20cyjphsfcqh3m6gn56"; libraryHaskellDepends = [ array base binary bytestring clock containers cpu deepseq definitive-base definitive-parser definitive-reactive GLFW @@ -52025,7 +54970,7 @@ self: { mkDerivation { pname = "definitive-parser"; version = "2.1"; - sha256 = "b0daf9e7628cd18be904eab9005e0d02fdb8fd706426d46b3256ee335f3f876a"; + sha256 = "0sl77xgk7vjn69mx89k4f3yviz821mg01fga0klqplcccbkzknmh"; libraryHaskellDepends = [ array base bytestring containers cpu deepseq definitive-base ghc-prim GLURaw OpenGL OpenGLRaw primitive utf8-string vector @@ -52043,9 +54988,9 @@ self: { mkDerivation { pname = "definitive-reactive"; version = "1.0"; - sha256 = "a3f6d300a30914183662e01ddd1e56965188b76d459c765fefd297298049633e"; + sha256 = "0gk39602k5yjxxgpd725dnvqhlcnaqgds7g0c8v1h509lc0d7xm3"; revision = "1"; - editedCabalFile = "8c3c6afcc4ce7569ede32c8006d1d66fb10448321159f875d1dec03419bd7797"; + editedCabalFile = "15vpplck9h6ys5szhn8i69409cbgsv8hd01cwgnnjxffqky6lg4c"; libraryHaskellDepends = [ array base bytestring clock containers deepseq definitive-base primitive vector @@ -52064,9 +55009,9 @@ self: { mkDerivation { pname = "definitive-sound"; version = "1.0"; - sha256 = "f2ef71f24583d0614da0a560ad9e2d502f6b5f6076b10c5927173ab2d5816406"; + sha256 = "01k4h7av4fhp4xchrcbnc1gnnbsh5ngasq55l16n3l438pr73vzj"; revision = "1"; - editedCabalFile = "1491f0a01f47b84ea8f01a94492738a7f3b5fe7c68c805cca8701926cc443d71"; + editedCabalFile = "0w9x8k62c6bhm360bj38gkzbbwx770klk50sy2l4xf273yhg148l"; libraryHaskellDepends = [ alsa-core alsa-pcm array base bytestring clock containers deepseq definitive-base primitive sample-frame storable-record vector @@ -52084,7 +55029,7 @@ self: { mkDerivation { pname = "deiko-config"; version = "0.5.0.0"; - sha256 = "5e52ad0f6dac9c2c73065abcc0fc01b3c3e1130b5c3b51205605a45ac709117e"; + sha256 = "0zhi173mm905aqh52fsw1c9y3hxk07yc1g2s0rrjr75cdl7ssljy"; libraryHaskellDepends = [ array base containers exceptions mtl parsec text transformers ]; @@ -52102,7 +55047,7 @@ self: { mkDerivation { pname = "dejafu"; version = "0.4.0.0"; - sha256 = "876c92c590cce573cb600a1bb575b42ed2c2fb332c59803c5f0667a675df80d4"; + sha256 = "1m40vxsscrq6bwy80n9c6gxw5lifnisva6qac35p7rfcj32r4v47"; libraryHaskellDepends = [ base concurrency containers deepseq dpor exceptions monad-loops mtl ref-fd semigroups transformers transformers-base @@ -52112,18 +55057,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_0_5_1_2" = callPackage + "dejafu_0_7_0_2" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , monad-loops, mtl, random, ref-fd, semigroups, transformers + , leancheck, mtl, random, ref-fd, semigroups, transformers , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.5.1.2"; - sha256 = "0e6114f59678ff0c5a9f5a4561f9b1ae4d87c77c50fd498e447ca7f67eae6d4c"; + version = "0.7.0.2"; + sha256 = "0l2as53zmsr94sf2kh1h5mj1ra1gpnzik2yqj0nj56cxys6sm6iy"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions monad-loops mtl - random ref-fd semigroups transformers transformers-base + base concurrency containers deepseq exceptions leancheck mtl random + ref-fd semigroups transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; @@ -52136,7 +55081,7 @@ self: { mkDerivation { pname = "deka"; version = "0.6.0.2"; - sha256 = "44baa0f9c38fb3d606904873334aa3ab3721c73e48756fe916e7490e765943d0"; + sha256 = "1l23b5v0wjg72vlnyxa87v3j2dxbld536ws8j03ddcwgqgws1fj4"; libraryHaskellDepends = [ base bytestring parsec transformers ]; librarySystemDepends = [ mpdec ]; homepage = "https://github.com/massysett/deka"; @@ -52152,7 +55097,7 @@ self: { mkDerivation { pname = "deka-tests"; version = "0.6.0.2"; - sha256 = "c95fbf3d7a0637d0fea763e6961ef29838eb8a1e0a45f6585e6813a3d8364220"; + sha256 = "08226vca64v8brcgci8a3s5fnf4qy8g9drk3lzzd0dq6g8yvypy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deka QuickCheck ]; @@ -52174,7 +55119,7 @@ self: { mkDerivation { pname = "delaunay"; version = "0.1.0.2"; - sha256 = "6dbfde3c642685a7ad8725eac5e6c7f1adca61ad785f692615d38d3d8110aa90"; + sha256 = "145a220kv3fk2lk6jpvqmmhwmbgiqzkcbsi5hynsg196chydxgvd"; libraryHaskellDepends = [ AC-Vector base hashable unordered-containers ]; @@ -52191,7 +55136,7 @@ self: { mkDerivation { pname = "delay"; version = "0"; - sha256 = "2b8afda39ec409e088ea589631c47bb412f281444df481ffdf76101a8b74fbfb"; + sha256 = "1yzvfj5il43nvzzq3x2d8j0z44mlgg2335jqxa4f02f4ksizv2ib"; libraryHaskellDepends = [ base dimensional exceptions mtl time unbounded-delays ]; @@ -52206,7 +55151,7 @@ self: { mkDerivation { pname = "delicious"; version = "0.3.4"; - sha256 = "a030b08b33f803b43914f2a28e55058d5d414610af4a148c968cb3ff9ef0a2b7"; + sha256 = "1dx2y2ggzcwcjs618jmg21342pcd0maqx8pj2hwv80zq6f5v0c50"; libraryHaskellDepends = [ base bytestring curl feed json nano-md5 xml ]; @@ -52223,7 +55168,7 @@ self: { mkDerivation { pname = "delimited-text"; version = "0.3.0"; - sha256 = "053074240aaae39a3236b9a702626932d5d5c79a4927c60afe8b8f6ac9d6c656"; + sha256 = "0mn6sv4nm3wbzq5cc9s9kb3xbm9jd5i059xr6qr9mqxa18j78c05"; libraryHaskellDepends = [ attoparsec base binary bytestring bytestring-show ]; @@ -52237,7 +55182,7 @@ self: { mkDerivation { pname = "delimiter-separated"; version = "0.1.0.0"; - sha256 = "0682662d702022579f40b411b234d36982faca72ff3ca7f9942c62ab6f4cce9d"; + sha256 = "17ff9ipsnqicjkwsfg7zfb5gm0k9scsb44dl82gmf8i0f0nnd0h6"; libraryHaskellDepends = [ base uhc-util uulib ]; homepage = "https://github.com/atzedijkstra/delimiter-separated"; description = "Library for dealing with tab and/or comma (or other) separated files"; @@ -52251,9 +55196,9 @@ self: { mkDerivation { pname = "delta"; version = "0.2.1.2"; - sha256 = "d259f9be51562f4ae4bb9a1853e0e5a2aecfbdb70a5a536e17360feddc164a64"; + sha256 = "0r2a2vffs3rn2xp56nhanyywzbm2wph5664spgj4lbsna6zgjnfj"; revision = "2"; - editedCabalFile = "630e85a07132fe54b49c71f855b3d633982026d78120279e00888bc95a9d14dd"; + editedCabalFile = "1p8lkmdck2w802g2f841swk2161kssrmby3ikjs59zijf6h8a3k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52276,7 +55221,7 @@ self: { mkDerivation { pname = "delta-h"; version = "0.0.3"; - sha256 = "8f037078a3ab300fd035058e65b27783d20dbb27e83dcbf50b842775f7834079"; + sha256 = "0ya0hgvpa9w41gswngg84yxhvll3fyr6b3h56p80yc5bldw700wg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52296,7 +55241,7 @@ self: { mkDerivation { pname = "delude"; version = "0.1.0.3"; - sha256 = "7c16e61353db13bf446b24ffb97e8ec526579312d0907e56e8c64b62c09f064f"; + sha256 = "0kq6kz064jy6x1b7x46h2a9mf9n5irzbkzr4dd2by4yvac9yc5kw"; libraryHaskellDepends = [ base ]; description = "Generalized the Prelude more functionally"; license = stdenv.lib.licenses.mit; @@ -52307,7 +55252,7 @@ self: { mkDerivation { pname = "demarcate"; version = "0.1.0"; - sha256 = "43b745fbc969084aaf3bb04f779162a001f83b08caeb1dff9395e760c8991e8c"; + sha256 = "130yk7461rwmjgzivsya10xzh0d0ca8pfkxh7fpll239r7xlbds3"; libraryHaskellDepends = [ base free transformers ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/fizruk/demarcate"; @@ -52321,7 +55266,7 @@ self: { mkDerivation { pname = "denominate"; version = "0.5.0"; - sha256 = "61a6c5aa370d03ddbcf5349032d97991e240a8ac0d1acbafaa9a723344c84d1a"; + sha256 = "06jdr1236wlsmapwn6hdmjl41qlig7ck541lynyds0qd6ymcb9k1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -52341,7 +55286,7 @@ self: { mkDerivation { pname = "dense"; version = "0.1.0.0"; - sha256 = "29fd49d5ebaede4ba4da04a263f2f2dbb168bf94327e21517a9519f34dcfd7b3"; + sha256 = "1cyprx6z66cmg98j2zijjjznicfvybr678h4vaj4ppmfxgalkz99"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens linear primitive semigroupoids template-haskell transformers @@ -52361,7 +55306,7 @@ self: { mkDerivation { pname = "dependent-map"; version = "0.2.4.0"; - sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; + sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx"; libraryHaskellDepends = [ base containers dependent-sum ]; homepage = "https://github.com/mokus0/dependent-map"; description = "Dependent finite maps (partial dependent products)"; @@ -52373,7 +55318,7 @@ self: { mkDerivation { pname = "dependent-state"; version = "1.0.1"; - sha256 = "093aa20845a345c1d44e3d0258eadd6f8c38e3596cd6486be64879d0b60e7467"; + sha256 = "0rvl1svd0ya8wrmlimkcb7iki33gvpm5h0ix9vac2id38l4a4fh9"; libraryHaskellDepends = [ base lens mtl prologue ]; homepage = "https://github.com/wdanilo/dependent-state"; description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; @@ -52386,7 +55331,7 @@ self: { mkDerivation { pname = "dependent-sum"; version = "0.4"; - sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; + sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mokus0/dependent-sum"; description = "Dependent sum type"; @@ -52398,11 +55343,12 @@ self: { }: mkDerivation { pname = "dependent-sum-template"; - version = "0.0.0.5"; - sha256 = "b23f584da3a5d8bc3b625a186ab696bed5a8a63d71129485b9fb49262a600765"; + version = "0.0.0.6"; + sha256 = "1bcipqkkgj1afi2ax726gbvp9haqghvm5016rawx3jj9364v8k4r"; libraryHaskellDepends = [ base dependent-sum template-haskell th-extras ]; + testHaskellDepends = [ base dependent-sum ]; homepage = "/dev/null"; description = "Template Haskell code to generate instances of classes in dependent-sum package"; license = stdenv.lib.licenses.publicDomain; @@ -52415,7 +55361,7 @@ self: { mkDerivation { pname = "depends"; version = "0.0.1"; - sha256 = "f8114e2c2f72e7d3e6726229567afa1e1228bce32c78c09e389be8d23b5c8378"; + sha256 = "0y43bhxx5s4v72gc0y1cwfy2h4hyz9x5cab2fbkd7rvj5wn4w4gq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52437,7 +55383,7 @@ self: { mkDerivation { pname = "dephd"; version = "0.1.6"; - sha256 = "309639c8e2d8dc218bc8b5f5d1f5045341995e281467e18a5ab24e7ea4a5f861"; + sha256 = "0qgqlnj7wkmjba5f2rql51g9jhak0ksx3xdmr25j3p6qwb43k5ih"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52454,7 +55400,7 @@ self: { mkDerivation { pname = "deque"; version = "0.2"; - sha256 = "86768d22492c58b35688c28592b222cb16cc996ca6576b35add9c54a470d3e56"; + sha256 = "0miy1m3lmifrmlsnnmx6djcwq5nb4ar951f2i1bb6n1c94i8sxl6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/deque"; description = "Double-ended queue"; @@ -52468,7 +55414,7 @@ self: { mkDerivation { pname = "dequeue"; version = "0.1.12"; - sha256 = "c70aedbb1965affe07b7151f12e9a8e42f2cb54652bb0a0bbc5d0ba8e21721ab"; + sha256 = "1ar12ziah2sxph5hmfsj8ssjqbz4m3li47qmnw3zxbv536xys2n7"; libraryHaskellDepends = [ base QuickCheck safe ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; @@ -52481,7 +55427,7 @@ self: { mkDerivation { pname = "derangement"; version = "0.1.0"; - sha256 = "00b2620ca4943017cbeefd16af0e808cd62536e1e2911fddf9eaca66d729828f"; + sha256 = "13w257bndjpaz7fiz4g2w4v2bmlch07ay5pxxv5ifc4llh665ch0"; libraryHaskellDepends = [ base fgl ]; description = "Find derangements of lists"; license = "GPL"; @@ -52493,7 +55439,7 @@ self: { mkDerivation { pname = "derivation-trees"; version = "0.7.3"; - sha256 = "5ec7f59b65b87ed19129a04dac123c0a25494453c8bcc97d0e49c58fe73ec715"; + sha256 = "05f77vkqzia91rywkg68ad24j98a7h9aqkd0568x2zmqcndzbisy"; libraryHaskellDepends = [ applicative-extras base labeled-tree mtl ]; @@ -52509,8 +55455,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.1"; - sha256 = "8544ac13c09059acd2914da86506206879e3feb375361fc5e312548c4d9b6d72"; + version = "2.6.2"; + sha256 = "0chig7nl4d6j4asvkk9sd4pyg647ca09mwwzzg5bkh6y91aj161g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52528,7 +55474,7 @@ self: { mkDerivation { pname = "derive-IG"; version = "0.1.1"; - sha256 = "99bf95f72fdb5a3f6777432ac9e3d408ed24ba1718ed723eeb6fadb1a490ef2d"; + sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr"; libraryHaskellDepends = [ base instant-generics template-haskell ]; homepage = "http://github.com/konn/derive-IG"; description = "Macro to derive instances for Instant-Generics using Template Haskell"; @@ -52541,7 +55487,7 @@ self: { mkDerivation { pname = "derive-enumerable"; version = "0.1.1.0"; - sha256 = "5777fdf3313a2a2c39d03690069c12f5554bf6c941097fa0cd1956d693f5f023"; + sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp"; libraryHaskellDepends = [ base data-default ]; homepage = "https://github.com/mgoszcz2/derive-enumerable"; description = "Generic instances for enumerating complex data types"; @@ -52556,7 +55502,7 @@ self: { mkDerivation { pname = "derive-gadt"; version = "0.1.1"; - sha256 = "a69d2d88ac37562d30da64522cc2b4dab414be88fa1b45887fc14136d658db68"; + sha256 = "0s6vb3b3chf1gy44a6zsi2z19d6snk12qlk4v8q2smipmj42v7d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52575,11 +55521,11 @@ self: { ({ mkDerivation, base, semigroups, template-haskell }: mkDerivation { pname = "derive-monoid"; - version = "0.0.0"; - sha256 = "d0da3cac1639996e2095ae3058ec32704ec85e2e95d61415d8896090f58255d3"; + version = "0.0.1"; + sha256 = "1laix5isk8lnp2dl7lsm06vb2yafqgsh55fnhaakdg0k0nd98x4r"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base semigroups template-haskell ]; + libraryHaskellDepends = [ base template-haskell ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base semigroups ]; homepage = "https://github.com/sboosali/derive-monoid#readme"; @@ -52593,7 +55539,7 @@ self: { mkDerivation { pname = "derive-storable"; version = "0.1.0.6"; - sha256 = "692a0f29e0959a51d3159f6ca0bb2c9d95fd38cc2ed9d8d26b242f998dd9b012"; + sha256 = "04mhv66rjbr4dg9din9frhwgv5cx5jxs0v4z2p9m36lmw0lhyak9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; @@ -52607,7 +55553,7 @@ self: { mkDerivation { pname = "derive-storable-plugin"; version = "0.1.0.2"; - sha256 = "d9b080fb359169b2edd8e32cef46681666204673bd460e24dcd6bfb13ec8abcd"; + sha256 = "1kdbr0zb3gynvhj0wimxfd320rhnd13fyb73v3nv4sci6pxq1c6r"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; homepage = "https://www.github.com/mkloczko/derive-storable-plugin/"; description = "GHC core plugin supporting the derive-storable package"; @@ -52622,7 +55568,7 @@ self: { mkDerivation { pname = "derive-topdown"; version = "0.0.0.2"; - sha256 = "176502a815b4c4e889e9b06de3ae68aa5d6645a75bfd49c69532e91930a6aa3d"; + sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p"; libraryHaskellDepends = [ base derive mtl template-haskell template-haskell-util ]; @@ -52637,7 +55583,7 @@ self: { mkDerivation { pname = "derive-trie"; version = "0.2.1"; - sha256 = "ccca249c26c02501cc1566b9b95fa697ec5146a9ce499ada8a5fe5022b3a8385"; + sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc"; libraryHaskellDepends = [ array base containers template-haskell ]; homepage = "http://github.com/baldo/derive-trie"; description = "Automatic derivation of Trie implementations"; @@ -52652,8 +55598,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.3.5"; - sha256 = "0a165c8eeb78349ded41cf51750753cdd0e25c139171789f7a4b0c6be4ccd231"; + version = "0.3.6"; + sha256 = "0v9m76hjrlrcbyawdp04y1vv0p867h3jhy00xjxgmqq5cm0sn7qc"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell transformers transformers-compat @@ -52672,7 +55618,7 @@ self: { mkDerivation { pname = "derp"; version = "0.1.6"; - sha256 = "136a001ad5afc5db65495832a539ab027e2685ce5f6ed82d5fb72a29314a1e3d"; + sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk"; libraryHaskellDepends = [ base containers ]; description = "Derivative Parsing"; license = stdenv.lib.licenses.bsd3; @@ -52683,7 +55629,7 @@ self: { mkDerivation { pname = "derp-lib"; version = "0.0.0.1"; - sha256 = "1d6c500058ffcdbd29ecddfbdef67149bf2974e253d2ee98f94ca719001f0849"; + sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x"; libraryHaskellDepends = [ base derp ]; homepage = "http://darcsden.com/kyagrd/derp-lib"; description = "combinators based on parsing with derivatives (derp) package"; @@ -52696,7 +55642,7 @@ self: { mkDerivation { pname = "descrilo"; version = "0.1.0.4"; - sha256 = "17a392388b1e6f7206d720aca846c2da1a50a6cd1a0f5a97bba3d7be6c412142"; + sha256 = "0hi185nbxmx3pfbml3qsrnk506nsq93aib10sw374vqyicw958qp"; libraryHaskellDepends = [ base ]; description = "Loads a list of items with fields"; license = stdenv.lib.licenses.gpl3; @@ -52709,7 +55655,7 @@ self: { mkDerivation { pname = "descriptive"; version = "0.9.4"; - sha256 = "795ec65756bf87ec6ea4c92d85a25d0eb0d8cfa1df40685ddcf74b83099bba2f"; + sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr"; libraryHaskellDepends = [ aeson base bifunctors containers mtl scientific text transformers vector @@ -52729,7 +55675,7 @@ self: { mkDerivation { pname = "desert"; version = "0.1.0.6"; - sha256 = "6f844fe193bf0930f8c1382d0cb60e14cc1bb4672ab610d30cef8a7e5bcd474f"; + sha256 = "0ks7rmdpx2pg1k9i1diacys1pk0l1sv0qb9qq7w302dzjghlz13g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52748,7 +55694,7 @@ self: { mkDerivation { pname = "despair"; version = "0.0.6"; - sha256 = "6ca60cf6b0539ea70f4712144f1778c5464d3b369408c99f54e5bdbed7d3815a"; + sha256 = "0nl1sgbvxgg5ajgwj24l6qxlsin5g0bly50j8w7sg7jkn3v0r9kc"; libraryHaskellDepends = [ base random ]; description = "Despair"; license = stdenv.lib.licenses.bsd3; @@ -52759,7 +55705,7 @@ self: { mkDerivation { pname = "deterministic-game-engine"; version = "0.4.0"; - sha256 = "3adffba07d4fdca79909331ec0029e09cf7895cadada5613f3e359d777c8bcc1"; + sha256 = "1hdwr1vxfng3yc9mdnnsraapikq9kq1c07ik16csgp2ggnhgpprs"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/TGOlson/deterministic-game-engine"; @@ -52775,7 +55721,7 @@ self: { mkDerivation { pname = "detrospector"; version = "0.3"; - sha256 = "96755100ab9d5b038a5ac5642be9ec2a071cc77f52e702a1a90bfe249f5a4d3b"; + sha256 = "0fsdbagj9zhbm6hh5rsjgz3iq1raxkljnr65ba506nwxmc052xcn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52791,7 +55737,7 @@ self: { mkDerivation { pname = "deunicode"; version = "0.1"; - sha256 = "2e95b08fb1cd88908ca4b50531ed849cdddc263edaa0da691d30490986695323"; + sha256 = "08skd630jj9h3mlxm86s7qkdrpcwhknk21dmlj69126dn67v159f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring utf8-string ]; @@ -52807,7 +55753,7 @@ self: { mkDerivation { pname = "devil"; version = "0.1.1.0"; - sha256 = "c4654ab78f7473d8099bac553bcfa0a597508d8d2f49b4255853650d48fdb9d8"; + sha256 = "1n5rzm40srakb0jv8j9gin6m15x5l37knmdckc4xhwvliyvllrf4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52824,7 +55770,7 @@ self: { mkDerivation { pname = "dewdrop"; version = "0.1"; - sha256 = "1650846ada2fa4d8e48e7a9e5a2b744d97f10625facb51eff24b5218464327f6"; + sha256 = "1xi78d31hljbybpm3jzs4l3g35sdfhmmm7ksivjdi91gv9m88l0n"; libraryHaskellDepends = [ base bytestring containers elf hdis86 syb ]; @@ -52839,7 +55785,7 @@ self: { mkDerivation { pname = "dfrac"; version = "0.1.2.0"; - sha256 = "c7ffbce9085601838c0a716d0fb4430ca77e10c7a695ee68caab1504ed2a78f9"; + sha256 = "1ybq5bnh85dbr9lfx5d6qw87x9qc8fs0yvbi1a6860an13lvrzy7"; libraryHaskellDepends = [ base scientific ]; description = "A package for precise decimal arithmatic using rationals"; license = stdenv.lib.licenses.mit; @@ -52853,7 +55799,7 @@ self: { mkDerivation { pname = "dfsbuild"; version = "1.0.2"; - sha256 = "bd0039edd7b0ee2c035739d2fcd19ed4cfa4b33840b71887289ca98ad666055a"; + sha256 = "0nh5cvb8macw523iids072rs9kylkv8zrliraw1jrvmhsznkj05x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52870,7 +55816,7 @@ self: { mkDerivation { pname = "dgim"; version = "0.0.3"; - sha256 = "c615817f03ffc8794af3409143708c32d95b05516dc1548cc8af65ae9c772eaf"; + sha256 = "1brffyfawrdgr2659hbda42mpn9jiiq474a0yd57kj7z0dzq25f6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/musically-ut/haskell-dgim"; @@ -52884,7 +55830,7 @@ self: { mkDerivation { pname = "dgs"; version = "0.2"; - sha256 = "dddee01c6e6079e0ca62c1e34278b2bc78ce17c0c737b23ca5730c0f71a71d80"; + sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx"; libraryHaskellDepends = [ base HTTP mtl network split ]; homepage = "http://www.dmwit.com/dgs"; description = "Haskell front-end for DGS' bot interface"; @@ -52893,36 +55839,81 @@ self: { }) {}; "dhall" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , http-client, http-client-tls, lens, neat-interpolation - , optparse-generic, parsers, system-fileio, system-filepath, text - , text-format, transformers, trifecta, unordered-containers, vector + ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive + , charset, containers, http-client, http-client-tls, lens + , neat-interpolation, optparse-generic, parsers, system-fileio + , system-filepath, tasty, tasty-hunit, text, text-format + , transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.1.0"; - sha256 = "338152e2bd5e894f6d331f4c7230facb6585ebf789aab18b129d4873093f1302"; + version = "1.4.2"; + sha256 = "0wnfqm0478h9fqav13q6fqnj8fzbhigsndnasr0hbcjd3s3qvf0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring containers http-client - http-client-tls lens neat-interpolation parsers system-fileio - system-filepath text text-format transformers trifecta - unordered-containers vector + ansi-wl-pprint base bytestring case-insensitive charset containers + http-client http-client-tls lens neat-interpolation parsers + system-fileio system-filepath text text-format transformers + trifecta unordered-containers vector ]; executableHaskellDepends = [ base optparse-generic text trifecta ]; + testHaskellDepends = [ + base neat-interpolation tasty tasty-hunit text vector + ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-bash" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + , text-format, trifecta, vector + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.2"; + sha256 = "19nzf0wh7z3xjpkn48dmi66hqayjscwi3r2w0nkxpkwrcfagrkw2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text text-format vector + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text trifecta + ]; + description = "Compile Dhall to Bash"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dhall-check" = callPackage + ({ mkDerivation, base, containers, dhall, directory, filepath + , fsnotify, text, trifecta + }: + mkDerivation { + pname = "dhall-check"; + version = "1.1.0.0"; + sha256 = "0j8axynspdm9dmrxqq329cnbxjlynakcfr5xfszs1szhvylsqx8a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers dhall directory filepath fsnotify text trifecta + ]; + homepage = "https://github.com/anfelor/dhall-check#readme"; + description = "Check all dhall files in a project"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-json" = callPackage ({ mkDerivation, aeson, base, bytestring, dhall, neat-interpolation , optparse-generic, text, trifecta, vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.0"; - sha256 = "514e14a765b0fd360dad7aec62980ca02424d6670be9bf5b9a5a171835a7758d"; + version = "1.0.3"; + sha256 = "1q3b3vcvkpz5b79xcdh66p0vqqvjlnd52pvdanlf7vp819n2zsdy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52941,8 +55932,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.0.1"; - sha256 = "83e217056193e67bfa9b81074baeb0289372dd4bb185be4aff034956340d8f4c"; + version = "1.0.4"; + sha256 = "19sv7n3fn7vkrclmcbjn141ypxi4ja78ahlndnmci6vbv40hm2vf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52955,12 +55946,62 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-text" = callPackage + ({ mkDerivation, base, dhall, optparse-generic, text }: + mkDerivation { + pname = "dhall-text"; + version = "1.0.0"; + sha256 = "1xbgzvmxd9y1f58nh9a495rqn3s7yfq93l61by5g9sd81vvbcgqd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base dhall optparse-generic text ]; + description = "Template text using Dhall"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dhcp-lease-parser" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "dhcp-lease-parser"; + version = "0.1"; + sha256 = "00h40vr2x77ajv1kks9gdg7a6nmrykc8pjf13zs1bq3pvgygqacs"; + libraryHaskellDepends = [ + attoparsec base bytestring chronos ip text + ]; + testHaskellDepends = [ + attoparsec base bytestring chronos ip tasty tasty-hunit + ]; + 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, bytestring, QuickCheck, stm, tasty + , tasty-hunit, tasty-quickcheck, time, transformers + }: + mkDerivation { + pname = "di"; + 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, powerful, structured and typeful logging without monad towers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dia-base" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "dia-base"; version = "0.1.1.4"; - sha256 = "1fc6bbf2f60bdefbd516a84063100f63f9ea9a41188ea5eb8f67be7b01fd9e26"; + sha256 = "09lyzl0ppgk7izmsb3hq86dfmyb31w866h582vazpphbyvrbpihz"; libraryHaskellDepends = [ base deepseq ]; description = "An EDSL for teaching Haskell with diagrams - data types"; license = stdenv.lib.licenses.bsd3; @@ -52973,7 +56014,7 @@ self: { mkDerivation { pname = "dia-functions"; version = "0.2.1.5"; - sha256 = "aff8ffc4ff79a48f7b275cf84b5a97092e1a674e3c978fdae405d66c3cf732e1"; + sha256 = "1q9jywy6rmh5wkd8z5rw9rkilbh9jxd4py2w4xxqz93rzz2gzy5g"; libraryHaskellDepends = [ base containers data-pprint deepseq dia-base mtl xhtml ]; @@ -52989,7 +56030,7 @@ self: { mkDerivation { pname = "diagrams"; version = "1.4"; - sha256 = "8608f6fa682b8c43b9fbe7c42c033c7a6de0680bd7383f6a81ea8bca37999139"; + sha256 = "0fcik4vwm2zah5m3yf6p1dlf0vbs7h1jri77zfwl731bd3xgc246"; libraryHaskellDepends = [ diagrams-contrib diagrams-core diagrams-lib diagrams-svg ]; @@ -53004,9 +56045,9 @@ self: { mkDerivation { pname = "diagrams-boolean"; version = "0.1.0"; - sha256 = "c0b174cc23e6dc461e6ec6a68797a9552933e7d800e3e66ce85ef1ccf151b69e"; + sha256 = "17mna7qwrwayx1nfdqq0v3kk6aamm6bqg9n6dqg4dp764g679cf0"; revision = "2"; - editedCabalFile = "49fa3d3493471de57b921c41b986c3537a9cd30cf1f42eb7170a13293c70d596"; + editedCabalFile = "15nmf0y2j4qa2yvjxx7i1k9rqyjkqf3bjh8wj9xya7a7jcs3vyj9"; libraryHaskellDepends = [ base cubicbezier diagrams-lib ]; description = "deprecated, part of diagrams-contrib since 1.4"; license = stdenv.lib.licenses.bsd3; @@ -53023,7 +56064,9 @@ self: { mkDerivation { pname = "diagrams-builder"; version = "0.8.0.1"; - sha256 = "6e9b0eba4c9aa698ffdd21d55492b4cfd867cd4107ed8ccc591888cba7fe5b1c"; + sha256 = "072vzskwp20qb768rv87876ngn6gnj959m91vpzri9ls9jx0x6vf"; + revision = "1"; + editedCabalFile = "0r5w2n2y8w3ijzy5s603i8rcj8vl1ggzivw2nj2zbrginma27npc"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -53052,7 +56095,9 @@ self: { mkDerivation { pname = "diagrams-cairo"; version = "1.4"; - sha256 = "a94ec8bfdba325cf317368355eaa282bef3c75ed78e153ef400b8627575cea81"; + sha256 = "10gabibjg1hb83pm7qbqxmskrvrb52m5wdb8fcqwy9d3vfzwhkm9"; + revision = "1"; + editedCabalFile = "0xqjwxvhk45c202vlkbcl3kmp6rvwpyb1lzk4j3wnh5b9210v0y7"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -53072,7 +56117,7 @@ self: { mkDerivation { pname = "diagrams-canvas"; version = "1.4"; - sha256 = "30622ff2478391caf31dd8cc6842043f33409e97a3e5fd9f9ca6ee8264b576e9"; + sha256 = "1sbnnmj85vm6kjgzvrd3jyg40crz0i16ik6q3prwm4c38zr2yqih"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -53095,9 +56140,9 @@ self: { mkDerivation { pname = "diagrams-contrib"; version = "1.4.0.1"; - sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c"; - revision = "1"; - editedCabalFile = "58ebbd4d2285416111e8582c133d68ced6ecb5a2a94d5dc07cca899a971b02f8"; + sha256 = "033mapl075nlp1pfjg8p3sskv5bqclx5phsn3kpn11iwn6dbx50i"; + revision = "4"; + editedCabalFile = "147khgcda2kxv9qd2l0866af43fxikb4nclv9c25gys888r1mc5k"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -53113,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 @@ -53121,7 +56194,7 @@ self: { mkDerivation { pname = "diagrams-core"; version = "1.4"; - sha256 = "e5502f483dadb86056523d601a1037596ff49380b4c1cd00600183eab7992ae7"; + sha256 = "1rrak6vym0q1c00cvhdlh29z8vsr6w81lq1xa9b61f5d7m42yl75"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -53138,7 +56211,9 @@ self: { mkDerivation { pname = "diagrams-graphviz"; version = "1.4"; - sha256 = "483a41aaa9d73681ada40f8cfd3e967cf669f313200041eaf54db0800cca61d1"; + sha256 = "1lb1r8681c2dypm420102grnkxkwjqzgv30gljnq2dnpm6m42fj8"; + revision = "1"; + editedCabalFile = "0x1nsbp8np317qx96civ9bgknqhvjff7afcj24bg8ql56f5sd2cl"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -53152,7 +56227,7 @@ self: { mkDerivation { pname = "diagrams-gtk"; version = "1.4"; - sha256 = "b66bde621a09b79b99185af50b2d1ed0b2bd3988c95ed27c7e92e5383917eae9"; + sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; libraryHaskellDepends = [ base cairo diagrams-cairo diagrams-lib gtk ]; @@ -53171,7 +56246,7 @@ self: { mkDerivation { pname = "diagrams-haddock"; version = "0.4.0.1"; - sha256 = "594ed547bbbdce511f48048bc3626c134bc468133e908fe3512d2fadeb7342f4"; + sha256 = "1x22fgmssbrda7iqz41y2dlc8jqkdiic72q490gm3kmxpd3xakjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53200,7 +56275,7 @@ self: { mkDerivation { pname = "diagrams-hsqml"; version = "0.2.0.0"; - sha256 = "601b3c4a332ce0f4c4af5bc1f85f13fa698cc095698afcbeb523cd0353480439"; + sha256 = "0f84919h7k93nnzgr2k9jp08qsgs2dgzihavmz2g9q1c6d53q6v0"; libraryHaskellDepends = [ base colour containers diagrams-core diagrams-lib hsqml lens text transformers @@ -53219,7 +56294,7 @@ self: { mkDerivation { pname = "diagrams-html5"; version = "1.4"; - sha256 = "43653c946a4c2215d1fdf62e93f4b65ccd19c960aa8e1c7b8a4bd638fd71c1aa"; + sha256 = "1an1f7ykimjbi9xir3mac34ikkawnvs96bpnzp8ia8jcdaa3qra3"; libraryHaskellDepends = [ base cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative split @@ -53231,23 +56306,23 @@ self: { }) {}; "diagrams-lib" = callPackage - ({ mkDerivation, active, adjunctions, array, base, cereal, colour - , containers, criterion, data-default-class, deepseq, diagrams-core - , diagrams-solve, directory, distributive, dual-tree, exceptions - , filepath, fingertree, fsnotify, hashable, intervals, JuicyPixels - , lens, linear, monoid-extras, mtl, numeric-extras - , optparse-applicative, process, profunctors, semigroups, tagged - , tasty, tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers + ({ mkDerivation, active, adjunctions, array, base, bytestring + , cereal, colour, containers, criterion, data-default-class + , deepseq, diagrams-core, diagrams-solve, directory, distributive + , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable + , intervals, JuicyPixels, lens, linear, monoid-extras, mtl + , numeric-extras, optparse-applicative, process, profunctors + , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.0.1"; - sha256 = "5140b590c83047058d4253842ef1105b2ecf71d8dd72a280123c00b030a32dc6"; - revision = "1"; - editedCabalFile = "b099abcd3adb35dae8f260909ac343a82a1bf728f9d4529cac15fdae5dce5e8a"; + version = "1.4.1.2"; + sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb"; + revision = "3"; + editedCabalFile = "14ni87kwmjhbphcihiivvz0nxga355263q36wvbyvvjmxvbdj98n"; libraryHaskellDepends = [ - active adjunctions array base cereal colour containers + active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory distributive dual-tree exceptions filepath fingertree fsnotify hashable intervals JuicyPixels lens linear monoid-extras mtl @@ -53255,8 +56330,8 @@ self: { transformers unordered-containers ]; testHaskellDepends = [ - base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit - tasty-quickcheck + base deepseq diagrams-solve distributive lens numeric-extras tasty + tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion diagrams-core ]; homepage = "http://projects.haskell.org/diagrams"; @@ -53272,7 +56347,7 @@ self: { mkDerivation { pname = "diagrams-pandoc"; version = "0.3"; - sha256 = "7bc3593aa45454aff222f0e23abe2e4277af6cdf96e484a7e967c16e9a48a510"; + sha256 = "045592d6xhb7x6kq9r4nvxnayxs25sz3mqph4braym2llhx5khvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53296,7 +56371,7 @@ self: { mkDerivation { pname = "diagrams-pdf"; version = "0.3.1"; - sha256 = "7e9fa1dcaf72e53f7c418b73a3d8e1776c12deab709b9013a93fd89001472372"; + sha256 = "0wi38w0r1n1zm49r16vhmgg14v3pw7ca6wwb85y3zrbjmzfa37vy"; libraryHaskellDepends = [ base cmdargs colour diagrams-core diagrams-lib filepath HPDF lens monoid-extras mtl semigroups split vector-space @@ -53316,9 +56391,9 @@ self: { mkDerivation { pname = "diagrams-pgf"; version = "1.4"; - sha256 = "068f1fbc8c3ebdfa37d47e96e060b8040c7425c014aecd8e4f022477a51e6687"; + sha256 = "11v63sjpf9029y7cvbhlq0jp8304p1hf15kyshvzmg9yijy1z3q6"; revision = "1"; - editedCabalFile = "831aa29cc0f758091f2a7a288537b305dec5a846d178f8c55e31d37f33bc75b8"; + editedCabalFile = "1f3mphrpzlribv2zhy6i8slcbph5ncvqaa3s58ghjn7pq2fa46l3"; libraryHaskellDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -53338,7 +56413,7 @@ self: { mkDerivation { pname = "diagrams-postscript"; version = "1.4"; - sha256 = "fe58f0010520716f66802adb0c1f70f48e77e9c4fcea5441e5343f4c1a5f8db4"; + sha256 = "1d4dbwd4qgrlwm0m9spwqklpg3plf0ghrnrah1k6yw900l0z0n7y"; libraryHaskellDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist filepath hashable lens monoid-extras mtl semigroups split @@ -53355,7 +56430,7 @@ self: { mkDerivation { pname = "diagrams-qrcode"; version = "1.3"; - sha256 = "fd7f571bbdc392b1fb1872546b5980913efde1e3604fd1bc94225e7fd8b2a7dd"; + sha256 = "1pd7nbc7ypi2jjyd2kv0wghzsglih1cnnm3j33xv34n3pldmfzzx"; libraryHaskellDepends = [ array base colour diagrams-core diagrams-lib ]; @@ -53374,7 +56449,7 @@ self: { mkDerivation { pname = "diagrams-rasterific"; version = "1.4"; - sha256 = "daea2cddf5175044f606c36388e12a14b13fe0aa2b5ce9c039c349e9c46015a4"; + sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -53393,7 +56468,7 @@ self: { mkDerivation { pname = "diagrams-reflex"; version = "0.1"; - sha256 = "9dd7316c3a65c9f99254f12bd832e72da8af39277ced9ad16e53ee782afad73e"; + sha256 = "0gnpz8m7ivjkdv8rmvbw4wwsza1dwwrdhaziaj9gkjb579n33mwx"; libraryHaskellDepends = [ base colour containers diagrams-core diagrams-lib lens monoid-extras mtl reflex reflex-dom reflex-dom-contrib @@ -53411,7 +56486,7 @@ self: { mkDerivation { pname = "diagrams-rubiks-cube"; version = "0.2.0.1"; - sha256 = "f8f54e7f03489d737dd979a1cd35f8c5411b3c8de7379ba07c365d480ec38592"; + sha256 = "14l5qc74hp9ngjh9ndz7ily1nhf5z0swv8brv5yp77a80dzlxxgq"; libraryHaskellDepends = [ adjunctions base data-default-class diagrams-lib distributive lens ]; @@ -53422,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 = "71e53a4c8c2794719d057e6bf52b996b13d52ac9d62191df134ba05062453bde"; + 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; @@ -53442,7 +56522,9 @@ self: { mkDerivation { pname = "diagrams-svg"; version = "1.4.1"; - sha256 = "ce691378025835c7e794898a5f03299341f5f1e35a20de4afd12b1f9b0667f87"; + sha256 = "11vzcsqgkc8jzm5dw82swgqzahck541mz2l9jkkwfdaq09w16sff"; + revision = "1"; + editedCabalFile = "12cp0898pplap5skhq43xsxh0m2ilv5lz9zw2fhkkjmnr4pbl2dx"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -53458,7 +56540,7 @@ self: { mkDerivation { pname = "diagrams-tikz"; version = "0.6"; - sha256 = "5bb962177be4f912708cde2018b0fc4f6ccaafe83bddf8e433fb0ae37ba844e3"; + sha256 = "1qs4m1xy62pv6gjgip9vx2pwlv2gzjq1h86yiiq15yg4gcbn5fav"; libraryHaskellDepends = [ base diagrams-core diagrams-lib dlist mtl ]; @@ -53475,7 +56557,7 @@ self: { mkDerivation { pname = "diagrams-wx"; version = "0.1.1.0"; - sha256 = "472855bcd4f7df78002a35099ba9b0eb21e5473c30e6eff74ecc9dcafa35b9ba"; + sha256 = "1fmr6pxcm7fc9vvyzrih7i3ya8gbn2lrn29m5807ipzpsjy5aa27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53494,7 +56576,7 @@ self: { mkDerivation { pname = "dialog"; version = "0.3.0.0"; - sha256 = "e47fd86b383a2a7c710219873c916a63cd873ab4b7b67fb204a099f511691ad2"; + sha256 = "1lhsd48zb6d00jr7zdmpnhx8gkb3da8kr1qr09qpqais71mxhzz4"; libraryHaskellDepends = [ base bytestring filepath glib gtk3 open-browser text transformers webkitgtk3 @@ -53512,7 +56594,7 @@ self: { mkDerivation { pname = "dib"; version = "0.6.1"; - sha256 = "3465169e4968fb9b6c0bbd5f283e1778e429dd33005494707c3945fc6b9deb78"; + sha256 = "0y7bkmmzqi9rgiq98m006gfjkr3q2wz2hpxx1dn9pyv896g1cr9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53531,7 +56613,7 @@ self: { mkDerivation { pname = "dice"; version = "0.1"; - sha256 = "e13fe7dec8394aeddb71fb0e0ac68d8750096bfcc198a80d7bc30d94e01edde5"; + sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec random-fu transformers ]; @@ -53546,7 +56628,7 @@ self: { mkDerivation { pname = "dice-entropy-conduit"; version = "1.0.0.1"; - sha256 = "3ad040fc346586b96311ed44016e785815b075372e26890853666fcfa5eabc07"; + sha256 = "01xwxajwyvv6ac48j9if6xsv05aqg1p02i7d25ivk1k56ky41l1s"; libraryHaskellDepends = [ base bytestring conduit entropy transformers ]; @@ -53564,7 +56646,7 @@ self: { mkDerivation { pname = "dice2tex"; version = "0.1.0.1"; - sha256 = "a985961404bd7ceac10a1ea5ef0751643aecd506874c581a76a69e398479a841"; + sha256 = "0hd8g623k7m6fqd5hk470vayqfk4a43yz98y1b0ylz5x0ha9d1d9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -53577,7 +56659,7 @@ self: { mkDerivation { pname = "dicom"; version = "0.3.0.0"; - sha256 = "d616ae5db9863803c7502986925598be9774842e714ed9c4dfecdc5dce9f3d20"; + sha256 = "081xkz75vp7cvz2djkki5s2795xyk1ar51i9a33h6f46p5fsw5nn"; libraryHaskellDepends = [ base binary bytestring pretty safe time ]; @@ -53589,15 +56671,45 @@ self: { "dictionaries" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , data-default, directory, exceptions, filepath, text, time, zlib + , data-default, directory, exceptions, filepath, text, time + , transformers, zlib }: mkDerivation { pname = "dictionaries"; - version = "0.1.0.0"; - sha256 = "28b3ba1e9ad52ccf4f333861e22830da77ad915622fa1ffca87cff6e9716c0ab"; + version = "0.1.0.1"; + sha256 = "0ddyffg41vq23d3liaqgaxjkirgirj2zg11p3xkj5y8j09q2lwc9"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-default directory - exceptions filepath text time zlib + exceptions filepath text time transformers zlib + ]; + description = "Tools to handle StarDict dictionaries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dictionaries_0_2_0_2" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , criterion, data-default, deepseq, directory, exceptions, filepath + , hspec, QuickCheck, random, random-shuffle, tagged, text, time + , transformers, zlib + }: + mkDerivation { + pname = "dictionaries"; + version = "0.2.0.2"; + sha256 = "0zzzlk2479kk321f06aw5j5fkrza7nmg41f886b47bzd6mzmmnq8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers data-default deepseq + directory exceptions filepath tagged text time transformers zlib + ]; + executableHaskellDepends = [ + base bytestring containers criterion deepseq directory exceptions + filepath random random-shuffle tagged text transformers + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec QuickCheck + random tagged text time ]; description = "Tools to handle StarDict dictionaries"; license = stdenv.lib.licenses.bsd3; @@ -53609,9 +56721,9 @@ self: { mkDerivation { pname = "dictionary-sharing"; version = "0.1.0.0"; - sha256 = "8c3b5184d5d6056433d51a49c5402e4ab7b0260073d5342685b8e141d2be5a01"; + sha256 = "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc"; revision = "2"; - editedCabalFile = "71d347366e563d81041dc8b9c226a53bd98e2ba3774e17cacbd84d3726c3ab5f"; + editedCabalFile = "0pxbqck3fkfqrg51fkkplcmqxn9vllkc5ff83l282gandqv4glvi"; libraryHaskellDepends = [ base containers ]; description = "Sharing/memoization of class members"; license = stdenv.lib.licenses.bsd3; @@ -53622,7 +56734,7 @@ self: { mkDerivation { pname = "dictparser"; version = "0.3.0.0"; - sha256 = "11c074f738003e2e00e2f0dd615609c20848b04feb6a6695443727388a655df2"; + sha256 = "1wjxcn53h9rp8jancspb9yq4h26215b63pghw802wgh073vp9h0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec split ]; @@ -53639,7 +56751,7 @@ self: { mkDerivation { pname = "diet"; version = "0.0.1"; - sha256 = "9017825215947e15fb18795eba6456ae031178d51cc5dd4050d4cca27d757e62"; + sha256 = "0qkyfmys5k6la10dvi8wsmw120xfarjblpkr33xiazll2m9845wh"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/tonymorris/diet"; description = "Discrete Interval Encoding Tree"; @@ -53651,7 +56763,7 @@ self: { mkDerivation { pname = "diff-gestalt"; version = "0.2.0.0"; - sha256 = "734d221512635a874d5aa05704e3a101d7472cb0e30ac7f40ff24c7da6f258a9"; + sha256 = "1aaqyak7sk7j1zscf2p3n0n4gmq1l7ih8mx0b96qfnk328aj4kbk"; libraryHaskellDepends = [ base Diff KMP QuickCheck string-similarity ]; @@ -53666,7 +56778,7 @@ self: { mkDerivation { pname = "diff-parse"; version = "0.2.1"; - sha256 = "55513091b52d114f0a49d85f6ea75fea52415243913f3781d7c5340c7987bc45"; + sha256 = "0idwhxwhqd65sy0kfgwi8d942lpabyknwpyq9454y49dnn8k0lam"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; description = "A parser for diff file formats"; @@ -53680,7 +56792,7 @@ self: { mkDerivation { pname = "diff3"; version = "0.3.0"; - sha256 = "8dc57a5f7070efe7227d3afaf5cf4d084c134e2cc0426e98421cdb720cacea25"; + sha256 = "09gamh675nqw8ac6whn05i716k089p7zbyisglifgvvhf1gpmicd"; libraryHaskellDepends = [ base Diff ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -53695,7 +56807,7 @@ self: { mkDerivation { pname = "diffarray"; version = "0.1.1"; - sha256 = "9551b56b586ef7dffaf6bd492cbc38e37bd75d4e87c6963fa86d81fb7b88255d"; + sha256 = "0p95i1xzp0bdm0zrdil79rfxfyz372y2qjdxyvxdzxvfb1mvalcm"; libraryHaskellDepends = [ array base ]; description = "DiffArray"; license = stdenv.lib.licenses.bsd3; @@ -53708,7 +56820,7 @@ self: { mkDerivation { pname = "diffcabal"; version = "0.1.1"; - sha256 = "26b23aea4f2693c98cae7cda4265d1005dadc0f9be0bdcf650447049a250f43d"; + sha256 = "0ggla2i4jw24a3vdq2xyz70asp80s5jl5nkwms6ck4r69zm3mci6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -53729,7 +56841,7 @@ self: { mkDerivation { pname = "diffdump"; version = "0.7.5"; - sha256 = "7067a11970e06c653a64a0cc111cc39b17f0363c3c45041cfcbdc8e1fa80e123"; + sha256 = "08z1h3xf3j5xzhf08i9w7hvg05wvqcf13k50chx6av70f0cs2rvh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -53748,7 +56860,7 @@ self: { mkDerivation { pname = "difftodo"; version = "0.2.0"; - sha256 = "bdb2c473e15455ae2af37623283bb78fd6cf52491d86eb9a04b1241011fab899"; + sha256 = "16dqz88i095i0jdfp1hx959czmlgnwxjh8vnycmawmalw5rw9cmx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53771,7 +56883,7 @@ self: { mkDerivation { pname = "digamma"; version = "1.0"; - sha256 = "c6f6be6d43892ad434ce4a99323e1364560690bf005b2c3232f74a774c96a684"; + sha256 = "1156jr67fjpp68r2qnq0py80cmk42cz356aarqsd8al98dnvxxn6"; libraryHaskellDepends = [ base math-functions ]; homepage = "https://github.com/bgamari/digamma"; description = "A (deprecated) implementation of the digamma function"; @@ -53783,7 +56895,7 @@ self: { mkDerivation { pname = "digest"; version = "0.0.1.2"; - sha256 = "641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11"; + sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; @@ -53795,7 +56907,7 @@ self: { mkDerivation { pname = "digest-pure"; version = "0.0.3"; - sha256 = "bc24ef45e1bbd923afc3c36106e4e62059e22a4a101fd220489fb460ff946565"; + sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ array base bytestring digest QuickCheck ]; homepage = "http://github.com/danieldk/digest-pure"; @@ -53810,7 +56922,7 @@ self: { mkDerivation { pname = "digestive-bootstrap"; version = "0.3.0.0"; - sha256 = "5898973e9887a18b7763d0412b3b3569426fae506e2033608a9ec4e0c1eeec03"; + sha256 = "00zcxv0y1i4yi9h3683fa2p6yhk96lxjnhfhcdvqp8c7k0z9g62q"; libraryHaskellDepends = [ base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text @@ -53827,7 +56939,7 @@ self: { mkDerivation { pname = "digestive-foundation-lucid"; version = "0.0.0.1"; - sha256 = "71199b130d9d216769379562e155ca730e5b9641c0c1057b727d125ddcaaf5be"; + sha256 = "1gpmmbf5s4kxf9xhbhf086b5n3kkr9ay2qlm6xlnf8cx1l9rn6bi"; libraryHaskellDepends = [ base digestive-functors digestive-functors-lucid http-types lucid lucid-foundation text @@ -53845,7 +56957,7 @@ self: { mkDerivation { pname = "digestive-functors"; version = "0.8.2.0"; - sha256 = "af26f266d440812d0471c67ab63f14a164517c5685e9d6808501d8cb21b26d4a"; + sha256 = "0jkdn8hwpn01hn0ddsc5ary52r512hzvcyn6f422v0a0sikg49mg"; libraryHaskellDepends = [ base bytestring containers mtl old-locale text time ]; @@ -53868,7 +56980,7 @@ self: { mkDerivation { pname = "digestive-functors-aeson"; version = "1.1.21"; - sha256 = "1f294cf79bd20f872545b84cf88acc3745304d342ff0253c52e948e53d304e78"; + sha256 = "0y2f60yyaj79a8y2bw1g6i6k0i9prj5ghk5q8ljqf3yjkgvlqa8z"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -53890,7 +57002,7 @@ self: { mkDerivation { pname = "digestive-functors-blaze"; version = "0.6.1.0"; - sha256 = "4be758620386fc395367b15b81b9fb7373e5ee370ab9af52fa03b2c24c579f0d"; + sha256 = "03czax6c5ch3z99azf8a6zpfawvkzfwq2nxicx9kkz460di5irsb"; libraryHaskellDepends = [ base blaze-html blaze-markup digestive-functors text ]; @@ -53907,7 +57019,7 @@ self: { mkDerivation { pname = "digestive-functors-happstack"; version = "0.6.1.1"; - sha256 = "e5a9e9216372f0977f279005865e25eac25d0aece9d426963b6228c97b1ec134"; + sha256 = "0d613rxwja327fb2dm79xh55vhpa4mg8c1ch4xzrgw3jcchykag5"; libraryHaskellDepends = [ base bytestring digestive-functors happstack-server text ]; @@ -53924,7 +57036,7 @@ self: { mkDerivation { pname = "digestive-functors-heist"; version = "0.8.7.0"; - sha256 = "e6d1cc5ee7ec7c266b00fc42eba7a0f546e6166198758368042ab05cd19fa78e"; + sha256 = "13m7kz8mrc1a0il86xcqc4bfcipml2kynhpw01mjcz7cwxgcrlg6"; libraryHaskellDepends = [ base blaze-builder digestive-functors heist map-syntax mtl text xmlhtml @@ -53940,7 +57052,7 @@ self: { mkDerivation { pname = "digestive-functors-hsp"; version = "0.5.0"; - sha256 = "ac7d4e7e5eaa21079cb596ba8ff5c59c7dd3bd3df99a7b0ff56ab4996767c102"; + sha256 = "00n1cxkrkd3ayl7pp6pr7nyx6zcwqpsqzflnnnf0f8dabrz4wzdc"; libraryHaskellDepends = [ base digestive-functors hsp hsx text ]; libraryToolDepends = [ trhsx ]; homepage = "http://src.seereason.com/digestive-functors-hsp"; @@ -53954,7 +57066,7 @@ self: { mkDerivation { pname = "digestive-functors-lucid"; version = "0.0.0.4"; - sha256 = "21aef49fc72a46bc057a1f46f71c665946561a04b667af10581ff5f4dd07b0e0"; + sha256 = "1q5h0zfz9x8zb08ayrxn0hd5cijrcqfgfihzg82vqiiaqygz9bi1"; libraryHaskellDepends = [ base digestive-functors lucid text ]; homepage = "https://github.com/athanclark/digestive-functors-lucid"; description = "Lucid frontend for the digestive-functors library"; @@ -53969,9 +57081,9 @@ self: { mkDerivation { pname = "digestive-functors-scotty"; version = "0.2.0.2"; - sha256 = "9732a545196767e24697297da75275ec40a5d5d1e9db11e945d28d0ea70a953a"; + sha256 = "0flm1akhx3fj8pli3nz9s7asah7cfm9afz99jx3f4rv7352saclp"; revision = "1"; - editedCabalFile = "5d7d94c850207910683a4ac60426bf3fb0d62ba2d15cd0bfb758cbee51417580"; + editedCabalFile = "103m858yxjsqnyzx0p6il8mxdc1zpwk09ija79l10y90a3498zax"; libraryHaskellDepends = [ base bytestring digestive-functors http-types scotty text wai wai-extra @@ -53989,7 +57101,7 @@ self: { mkDerivation { pname = "digestive-functors-snap"; version = "0.7.0.0"; - sha256 = "240aefbab8343ab0c99cdf659e054a0c2c4293f32284b932aa7f3eb4f4cf749f"; + sha256 = "17vlrzsb8gkzm8rbk112yf9l4b0c982rwrfzkk4v0filp2xfy2i4"; libraryHaskellDepends = [ base bytestring containers digestive-functors directory filepath mtl snap-core text @@ -54007,7 +57119,7 @@ self: { mkDerivation { pname = "digit"; version = "0.2.9"; - sha256 = "2fa2ac71a50a23c289f1fd4962836984d7766f9dcce5fb33eeb26b22ff8715f9"; + sha256 = "1y8mhzzj4sxjxqrzprfckmppdmw4d61n4jgxy64w48qalmqsr8ig"; libraryHaskellDepends = [ base lens papa parsers semigroups template-haskell ]; @@ -54026,7 +57138,7 @@ self: { mkDerivation { pname = "digitalocean-kzs"; version = "0.1.0.3"; - sha256 = "cffe351e522de02dc4c3b8fb2616d83f27d178c572ab641f594a2d4d105c2f70"; + sha256 = "0w1gbh84sbaab4gn9avjqmwd29rzv0b2dyxqqg22vq1da8g3bzng"; libraryHaskellDepends = [ aeson base bytestring HTTP http-conduit http-types text transformers @@ -54043,13 +57155,30 @@ self: { mkDerivation { pname = "digits"; version = "0.3.1"; - sha256 = "a8499c9745dcf8a4e6c48594f555e6c6276e8d91c457dcc562a370ccadcd6a2c"; + sha256 = "0b3arnnwqw53cb2xqmy4j66nw9y6wrazb545qkka9y6w8nbrqjd8"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; description = "Converts integers to lists of digits and back"; license = stdenv.lib.licenses.bsd3; }) {}; + "dihaa" = callPackage + ({ mkDerivation, base, FontyFruity, JuicyPixels, Rasterific, vector + }: + mkDerivation { + pname = "dihaa"; + version = "0.2.1.2"; + sha256 = "1ii93jmrqs8rlx27rhykq4gqybm92908hg7kzin9ln7fg5ldvmlk"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base FontyFruity JuicyPixels Rasterific vector + ]; + homepage = "http://sha-bang.de"; + description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "dimensional" = callPackage ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit , numtype-dk, vector @@ -54057,7 +57186,7 @@ self: { mkDerivation { pname = "dimensional"; version = "1.0.1.3"; - sha256 = "3bc566a59227115325caec0ea00a35e025e5ea471a3ab531cf595e5365aa93a7"; + sha256 = "19wkm9jm6pjrrwqvafhs8zmfa9g06l5a03pcr8jm6497jajndi9v"; libraryHaskellDepends = [ base deepseq exact-pi numtype-dk vector ]; @@ -54073,7 +57202,7 @@ self: { mkDerivation { pname = "dimensional-codata"; version = "2014.0.0.0"; - sha256 = "45a4eac9e27997493f2bcb2977098ede8443c6eda263a447125446e203a7cae3"; + sha256 = "1qyalw1y4ijl293s8qx2xp34716yiq4pfafb5czlk5vrwb4ym925"; libraryHaskellDepends = [ base dimensional numtype-dk ]; homepage = "https://github.com/dmcclean/dimensional-codata"; description = "CODATA Recommended Physical Constants with Dimensional Types"; @@ -54086,13 +57215,26 @@ self: { mkDerivation { pname = "dimensional-tf"; version = "0.3.0.4"; - sha256 = "818bed66794f5669ddadb74887542ebe87df474d436f2ae0903b063909574d14"; + sha256 = "052daw4kj1ivj3h2lvs39m3xz1xy5ra8fj5pmpfnjmjgg5kfv2w1"; libraryHaskellDepends = [ base numtype-tf time ]; homepage = "http://dimensional.googlecode.com/"; description = "Statically checked physical dimensions, implemented using type families"; 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 @@ -54104,7 +57246,7 @@ self: { mkDerivation { pname = "dingo-core"; version = "0.2.0"; - sha256 = "c5e17ac151f2a792f4ed8c8ae8a1f2f1f57a50546ce54826464c606b60c911c0"; + sha256 = "1h0ir5h6nq2c8qk4irbcai87mxgiyahyi2lcxps959zja70pmqf5"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder blaze-html blaze-textual bytestring conduit containers cookie deepseq fclabels @@ -54125,7 +57267,7 @@ self: { mkDerivation { pname = "dingo-example"; version = "0.2.0"; - sha256 = "8bb87cc6f78f723d0f7794ba15244166a3ecd7d6396513fa3a073819d7408a56"; + sha256 = "0mla83bijf077bx16r9rsvbyr8v684j1bfllfw7kswlgyz37rf4b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -54145,7 +57287,7 @@ self: { mkDerivation { pname = "dingo-widgets"; version = "0.2.0"; - sha256 = "17d9b62bd0a824dc280aef8faadf4f5a1dbbf31fd5fa929d7bf6f26d98a0c1b4"; + sha256 = "1d61l2c6vwpngffr5ynm3zrvn7as9zgsm3zg18ldq958s0mvdn8p"; libraryHaskellDepends = [ aeson base blaze-html bytestring containers dingo-core fclabels file-embed shakespeare-js template-haskell text transformers @@ -54161,7 +57303,7 @@ self: { mkDerivation { pname = "diophantine"; version = "0.2.1.0"; - sha256 = "492a1f57732c0cbc55e9b04939d64153e26ddb251d8cd2a4c61fc6cd6b2a1985"; + sha256 = "118r59mwvihzqsjd530x4pdnvqjk87b3jjdhx5avq31cfdbiyaj9"; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ happy ]; homepage = "https://github.com/llllllllll/Math.Diophantine"; @@ -54177,7 +57319,7 @@ self: { mkDerivation { pname = "diplomacy"; version = "0.1.0.0"; - sha256 = "87bcb1b15d7470947a66f19a534ab145c185d928a3ade828fe2af2cee11cd87a"; + sha256 = "0ynq3khwxwiazqlfibd353cqbha5n55576picrx98w3lbnqv3g47"; libraryHaskellDepends = [ base containers HUnit parsec transformers TypeNat ]; @@ -54197,7 +57339,7 @@ self: { mkDerivation { pname = "diplomacy-server"; version = "0.1.0.0"; - sha256 = "36de8e6754843331fa36f1da296dd467dc6267a80bce3d907e4f73f4f2e4dcf6"; + sha256 = "1xnwwkrg8wsggs83vkhbm1kn5p37sinjknpi6vx32cw4aikqxpin"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -54217,7 +57359,7 @@ self: { mkDerivation { pname = "direct-binary-files"; version = "1.0"; - sha256 = "b9c5b6373027c177be13d7164a458581275ce37078dfd544b09ae6a7d1562632"; + sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr"; libraryHaskellDepends = [ base bytestring mtl ]; homepage = "http://ireneknapp.com/software/"; description = "Serialization and deserialization monads for streams and ByteStrings"; @@ -54230,7 +57372,7 @@ self: { mkDerivation { pname = "direct-daemonize"; version = "3.1"; - sha256 = "b0ef75dbdc491fe355837415d16cf654e06cbef62c86f45077ea4dea3fa22819"; + sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh"; libraryHaskellDepends = [ base unix ]; homepage = "http://dankna.com/software/"; description = "Library to switch to daemon mode using built-in OS facilities"; @@ -54244,7 +57386,7 @@ self: { mkDerivation { pname = "direct-fastcgi"; version = "1.0.3"; - sha256 = "e86887fc2456ccb5eb9fe97ee1a667e5c361a95a23f7d43582636a3ddf103f11"; + sha256 = "049z23gkssk3h8sx9xr3baln3hz5cykf2zp9kzmvbk2n4ky8fs78"; libraryHaskellDepends = [ base bytestring containers mtl network utf8-string ]; @@ -54262,7 +57404,7 @@ self: { mkDerivation { pname = "direct-http"; version = "0.6"; - sha256 = "ef6ed7385416fa2702bed89b61618c7f49dbb1b5b070664ac44b740b1e74f029"; + sha256 = "0aghfhg0nx2bqi56cw5hnnqxnjbziihn36yqpq12gyhnahwdfvpg"; libraryHaskellDepends = [ base bytestring containers direct-daemonize lifted-base monad-control mtl network old-locale SafeSemaphore time @@ -54279,7 +57421,7 @@ self: { mkDerivation { pname = "direct-murmur-hash"; version = "1.0.1"; - sha256 = "5810a52223263de42859aa4b81b6bb879a489e5b66f7eef07d037daaa1011b26"; + sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://ireneknapp.com/software/"; description = "An implementation of the MurmurHash3 algorithm"; @@ -54291,7 +57433,7 @@ self: { mkDerivation { pname = "direct-plugins"; version = "1.1"; - sha256 = "9941ed355917ef7fb92d12ed7fbbb44a36cef99853fd7f778e114f0d7a96c70d"; + sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr"; libraryHaskellDepends = [ base ghc ghc-paths ]; homepage = "http://dankna.com/software/"; description = "Lightweight replacement for Plugins, specific to GHC"; @@ -54305,8 +57447,8 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.19"; - sha256 = "f47e9b99888ddd9e3f3811a575590cbc35f4e41f0897f01f0d0b9b44c2e6eb3c"; + version = "2.3.20"; + sha256 = "0wdjmqfs968319nl6ikmrrjqajfcb48k11hmmljwg81n1sbdydbf"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text @@ -54323,7 +57465,7 @@ self: { mkDerivation { pname = "directed-cubical"; version = "0.1.2.0"; - sha256 = "7fd8ebe301af3355b3c4abc5cb45fe9559e2d3228319d668a027e6ea6db9c673"; + sha256 = "0wy6p5nymri7l1ldc6c34b9y4ncmzr2wpidbqjrmacxg07iypn3z"; libraryHaskellDepends = [ base bytestring containers deepseq hashable parallel QuickCheck unordered-containers vector @@ -54333,12 +57475,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_0" = callPackage + "directory_1_3_1_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.0"; - sha256 = "94b0d06aba8311e3b9dc8e460d4ad5b25fdfcc361eecb8e7ad68a18f171aa7f2"; + version = "1.3.1.1"; + sha256 = "0hlbvrlrh58imrf95qbjdk1pw6n1mph4cd1258pk2z938ivdsm2k"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -54355,7 +57497,7 @@ self: { mkDerivation { pname = "directory-layout"; version = "0.7.4.1"; - sha256 = "2ba10ddd9a1c1a35ce70c8e0bcdf0cbfdfcc087a4e689ec16c418b58b66b4742"; + sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b"; libraryHaskellDepends = [ base bytestring command-qq containers directory filepath free hspec lens semigroups template-haskell text transformers unix @@ -54376,7 +57518,7 @@ self: { mkDerivation { pname = "directory-listing-webpage-parser"; version = "0.1.1.0"; - sha256 = "9a5ccdaa4b4c747e07bb189096db626934782a8ceb8f86076f5b662ec49d670a"; + sha256 = "02k7kp22wrjvdw3qd3zbihm7hd39cbdrd40qpc3pwx2c9fmcsp4s"; libraryHaskellDepends = [ base bytestring network-uri tagsoup text time ]; @@ -54389,7 +57531,7 @@ self: { mkDerivation { pname = "directory-tree"; version = "0.12.1"; - sha256 = "e2084495b3a226cf54d949635c86fc14e89daa09d86cce39e3c3cf898ae6e517"; + sha256 = "05z5ws58kky3wcwwwv6q16m9vs0lzj35qqs9v5acy9m2nfal8272"; libraryHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ base directory filepath process ]; homepage = "http://brandon.si/code/directory-tree-module-released/"; @@ -54405,7 +57547,7 @@ self: { mkDerivation { pname = "dirfiles"; version = "0.1.0.9"; - sha256 = "262d20f56c1e4b32465122e76836d80b3c8754d7eab13a2856ce21a185dc0a4b"; + sha256 = "0jqavj2s28ffaql3mcgasxa8fg0bv0v6irr2a5334jqydksj0b96"; libraryHaskellDepends = [ aeson base containers hblock safecopy text time unordered-containers @@ -54420,8 +57562,8 @@ self: { }: mkDerivation { pname = "dirstream"; - version = "1.0.2"; - sha256 = "ff5e186dffbb2308a81312c17147609bc9d0352c829a3f138119810f4b70fa75"; + version = "1.0.3"; + sha256 = "1yga8qzmarskjlnz7wnkrjiv438m2yswz640bcw8dawwqk8xf1x4"; libraryHaskellDepends = [ base directory pipes pipes-safe system-fileio system-filepath unix ]; @@ -54434,7 +57576,7 @@ self: { mkDerivation { pname = "disassembler"; version = "0.2.0.1"; - sha256 = "2c8dcc423defcd6da7b0bb11d54cd148df809f89a267406b0c351dc3d3aae1f9"; + sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c"; libraryHaskellDepends = [ array base containers mtl parsec ]; homepage = "https://github.com/mgrabmueller/disassembler"; description = "Disassembler for X86 & AMD64 machine code"; @@ -54450,7 +57592,7 @@ self: { mkDerivation { pname = "discogs-haskell"; version = "0.0.5.0"; - sha256 = "acd7f94dfea9c72ecff0319507fba7962502d0d315824fdeb26f4d9a4a61ed42"; + sha256 = "0hpdc559lkbgnbg4z0hmsg8049cnlzxhg59iy37jxix9zr6zkmxc"; libraryHaskellDepends = [ aeson api-builder base bytestring data-default-class free http-client http-client-tls http-types network text time @@ -54466,37 +57608,82 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "discord-gateway" = callPackage + ({ mkDerivation, aeson, base, discord-types, hslogger, transformers + , url, websockets, wuss + }: + mkDerivation { + pname = "discord-gateway"; + version = "0.2.2"; + sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy"; + libraryHaskellDepends = [ + aeson base discord-types hslogger transformers url websockets wuss + ]; + homepage = "https://github.com/jano017/Discord.hs"; + description = "An API wrapper for Discord in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "discord-hs" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, data-default, hakyll, hashable, hslogger, http-client - , mmorph, mtl, pipes, req, split, stm, stm-conduit, text, time - , transformers, unordered-containers, url, vector, websockets, wuss + ({ mkDerivation, base, discord-gateway, discord-rest, discord-types + , hashable, mtl, url, websockets }: mkDerivation { pname = "discord-hs"; - version = "0.2.1"; - sha256 = "439cc60b1206c4709a9a28e9ac5c64f7fb6eb5e40014ef055624459842add95e"; - isLibrary = true; - isExecutable = true; + version = "0.4.2"; + sha256 = "0lv299wn7jisgavmcpm2h7vf9dalz5dmi6j8qvlbbiyqg1c0jn2a"; libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers data-default - hashable hslogger http-client mmorph mtl pipes req stm stm-conduit - text time transformers unordered-containers url vector websockets - wuss + base discord-gateway discord-rest discord-types hashable mtl url + websockets ]; - executableHaskellDepends = [ base hakyll split ]; 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-rest" = callPackage + ({ mkDerivation, aeson, base, bytestring, comonad, data-default + , discord-types, hashable, hslogger, http-client, mtl, req, stm + , text, time, url + }: + mkDerivation { + pname = "discord-rest"; + version = "0.2.2"; + sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3"; + libraryHaskellDepends = [ + aeson base bytestring comonad data-default discord-types hashable + hslogger http-client mtl req stm text time url + ]; + 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 + ({ mkDerivation, aeson, base, hashable, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "discord-types"; + version = "0.2.2"; + sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc"; + libraryHaskellDepends = [ + aeson base hashable text time transformers unordered-containers + vector + ]; + homepage = "https://github.com/jano017/Discord.hs"; + description = "Type information for discord-hs"; + license = stdenv.lib.licenses.mit; + }) {}; + "discordian-calendar" = callPackage ({ mkDerivation, base, time }: mkDerivation { pname = "discordian-calendar"; version = "0.1"; - sha256 = "4d88f65d97f04b11e03082e20a4b3044920f644a7babd2b1de689a9575746b7a"; + sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d"; libraryHaskellDepends = [ base time ]; homepage = "https://github.com/kallisti-dev/discordian-calendar"; description = "library for handling Discordian calendar dates"; @@ -54509,7 +57696,7 @@ self: { mkDerivation { pname = "discount"; version = "0.1.1"; - sha256 = "e99cb7fdd1896dd1e525616597f936c1305a657cea1ef82cc0b3dcfe5afa34e0"; + sha256 = "1q1lz9dgxp5kq0ngh7pagijmlc616vwrfrb14pjx2vc9s7yvg779"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ markdown ]; homepage = "http://github.com/lightquake/discount"; @@ -54525,7 +57712,7 @@ self: { mkDerivation { pname = "discrete-space-map"; version = "0.0.5"; - sha256 = "18c12b0b2bc2796e60f5b4e8d8e10ce3c788f4723161ab0f348e53eb72cd8268"; + sha256 = "0s42rmrfnlwf6h7snq9ifbs8iiz31khxis5lymh6wyf25c5jph8q"; libraryHaskellDepends = [ adjunctions base comonad distributive keys semigroupoids ]; @@ -54543,9 +57730,9 @@ self: { mkDerivation { pname = "discrimination"; version = "0.2.1"; - sha256 = "b431a43f635af98df8677a44c0e76726b95d12ea338e47db248aa3bbc3be2ccf"; + sha256 = "1krcpv1vp8wa4kdlg3ikx895vf96czkw0i3sczw8vyascczs8cdl"; revision = "1"; - editedCabalFile = "6adf13db8d07059ac4f484c51fc13a7a3ab00e0a2a9c02899a44fedd24b550f3"; + editedCabalFile = "1wshnljdvzj4ka4h571a187b0fks7b0izic4yk29l187ipdi7pva"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable primitive profunctors promises semigroups transformers @@ -54567,7 +57754,7 @@ self: { mkDerivation { pname = "disjoint-set"; version = "0.2"; - sha256 = "7f30afba02f282e1d3c9f163833ed65f665361400329c469e1cd916663a4a716"; + sha256 = "05m7liind4fdw5lw8a8381hm6rjzsqz86qzir79y30pj0axayc3z"; libraryHaskellDepends = [ base containers mtl transformers ]; testHaskellDepends = [ base containers HUnit mtl QuickCheck transformers @@ -54578,12 +57765,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "disjoint-set-stateful" = callPackage + ({ mkDerivation, base, hspec, primitive, ref-tf, vector }: + mkDerivation { + pname = "disjoint-set-stateful"; + version = "0.1.1.0"; + sha256 = "0fl3yii5pr41hy5fqg9vg902xq342l6xvfl6vb4nf15vbsff84c5"; + libraryHaskellDepends = [ base primitive ref-tf vector ]; + testHaskellDepends = [ base hspec primitive ref-tf vector ]; + homepage = "https://github.com/clintonmead/disjoint-set-stateful"; + description = "Monadic disjoint set"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "disjoint-sets-st" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "disjoint-sets-st"; version = "0.1"; - sha256 = "55b09b9c336493ec38b990114473d5aef7d9e9f503be33d71b523b28cb7dc47b"; + sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m"; libraryHaskellDepends = [ array base ]; homepage = "http://github.com/ppetr/disjoint-sets-st/"; description = "Imperative ST/IO based disjoint set data structure"; @@ -54595,21 +57796,41 @@ self: { mkDerivation { pname = "disk-free-space"; version = "0.1.0.1"; - sha256 = "f17a4f9c3b41083ccbb6c11b2debdbc705f86097b7459ff0f46cc01d2692381f"; + sha256 = "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi"; revision = "3"; - editedCabalFile = "71ac4e0b1a2917e1c5d9dc43c84fdfac1ec7d0d7648582d94e1ce69199971c74"; + editedCabalFile = "0x0wjycr3rhw9vcq51b4sz8cf7mcvx7whhywv72y25r9385lxb3i"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/redneb/disk-free-space"; description = "Retrieve information about disk space usage"; 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 { pname = "display-haskell-do"; version = "0.1.0.0"; - sha256 = "78c4fd335953e51394476a6643dac326645877c91f076f12079ebb595fd55948"; + sha256 = "0j2rsmgmkfwy0w96y1qzr5vmhr16qgd46rka8ya17rakb4rzvi3q"; libraryHaskellDepends = [ aeson base text ]; homepage = "https://github.com/KitFreddura/HaskellDO-Display"; description = "A display API for HaskellDO"; @@ -54617,12 +57838,12 @@ self: { }) {}; "disposable" = callPackage - ({ mkDerivation, base, dlist }: + ({ mkDerivation, base, dlist, ghcjs-base-stub }: mkDerivation { pname = "disposable"; - version = "0.1.1.0"; - sha256 = "719e8e28cfe3345c441478f9d88949767122d2708241a0e232e9fe672c662b12"; - libraryHaskellDepends = [ base dlist ]; + version = "0.2.0.4"; + sha256 = "0sn93wmwajzbdj6h4cjwmyj1mbn6ga9gw1i2sny4kvqarqny2gy2"; + libraryHaskellDepends = [ base dlist ghcjs-base-stub ]; homepage = "https://github.com/louispan/disposable#readme"; description = "Allows storing different resource-releasing actions together"; license = stdenv.lib.licenses.bsd3; @@ -54633,7 +57854,7 @@ self: { mkDerivation { pname = "dist-upload"; version = "0.0.4"; - sha256 = "e16850986695d826a7357270dacc527dcfb2bc99e8a003e266cdcb5ab1242fc5"; + sha256 = "1i9g4jqmmjydcvi07878k6yb5kvxab6dlw3j6nkjdn4mcsc50s71"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath process ]; @@ -54647,9 +57868,9 @@ self: { mkDerivation { pname = "distance"; version = "0.1.0.0"; - sha256 = "007cfb1c56ff8e8f905dad7c1630630162ffb8520925f028cf82e93ba7cd4a58"; + sha256 = "0n2arnkkpsc2rwlg0989aawgyqh1ccq1cz5dbn88z3pzaqfgnz00"; revision = "1"; - editedCabalFile = "b8629453e8a81834e23eb577c6b304891ff60f36b956d03e59da854ba8adda47"; + editedCabalFile = "0iysmnl4p1fsb4zd0mmr6q7zc7w90jrwcxxm7vi38658x19r8qmq"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/agrafix/distance#readme"; description = "Useful distance datatype and functions"; @@ -54661,7 +57882,7 @@ self: { mkDerivation { pname = "distance-of-time"; version = "0.1.2.0"; - sha256 = "f33ee0922bc8ad531407883de9ee70a396f53855f81e38f4ab1ddfb18432cd68"; + sha256 = "0s6d6a2b3pqxmgs3h7pqalwgb5m3f3pfjgc80wa57bf85f9f0gpk"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; homepage = "https://github.com/joshuaclayton/distance-of-time#readme"; @@ -54676,8 +57897,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.3.3.0"; - sha256 = "bc675fd3b93c7e51a923969220821ea1676c639ff9fd4e742bd864e90f2e368f"; + version = "0.3.4.0"; + sha256 = "1c7jf2czaaf24l22aw1j4yj9nksycvsvj708vzj9lb50zhdbpdgg"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -54696,9 +57917,9 @@ self: { mkDerivation { pname = "distributed-process"; version = "0.6.6"; - sha256 = "e881775dabea50ccd3370242c8a3acd87c9b8ce9e47f3d4c2d0a6b2ec7b3b7d0"; + sha256 = "1l5png3jwsqa5m63szz4x669nz6qmjiwhhh26z9wql7amdfpg0g8"; revision = "1"; - editedCabalFile = "5958661e4bceb18f38e9eb9828a58d1c811102f84a74376d7b18b88cde8ba1e7"; + editedCabalFile = "1rx1igg8rf0qgdnkfx2az011308winjji67bx4w8zcff9cg6cn2r"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -54724,7 +57945,7 @@ self: { mkDerivation { pname = "distributed-process-async"; version = "0.2.4"; - sha256 = "ebf1a907e2f857ff853eff2f9c096f8acf5db20938ccf0d51391164e986487ec"; + sha256 = "1v47cjc4w5li2gaz1k1q16r5vkwadw4rqbzz7s2zymzqw83skwgb"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-extras exceptions fingertree hashable mtl stm @@ -54751,7 +57972,7 @@ self: { mkDerivation { pname = "distributed-process-azure"; version = "0.1.0"; - sha256 = "4f64d22e0ff0dc94e6ecfd99cc7133ab5c5df4dbbe3415bd2c99fdaee98f8035"; + sha256 = "0dc0izlsxzcr5jyiad5yvgs5sp5b6dqwr6gxxkk99p7h1wpd4r2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54767,31 +57988,29 @@ self: { }) {}; "distributed-process-client-server" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, containers - , data-accessor, deepseq, distributed-process - , distributed-process-async, distributed-process-extras - , distributed-process-tests, fingertree, ghc-prim, hashable, HUnit - , mtl, network, network-transport, network-transport-tcp, rematch - , stm, test-framework, test-framework-hunit, time, transformers + ({ mkDerivation, ansi-terminal, base, binary, containers, deepseq + , distributed-process, distributed-process-async + , distributed-process-extras, distributed-process-systest + , exceptions, fingertree, ghc-prim, hashable, HUnit, mtl, network + , network-transport, network-transport-tcp, rematch, stm + , test-framework, test-framework-hunit, time, transformers , unordered-containers }: mkDerivation { pname = "distributed-process-client-server"; - version = "0.1.3.2"; - sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f"; - revision = "2"; - editedCabalFile = "aedbbade08de4e7483cc9bc84e41ca9e6227a279480e025a27c78f31f1775413"; + version = "0.2.3"; + sha256 = "17y2knzmd277b15hynz0hfz1r4i53mq9a5n14ja5kmm0rhkvpp84"; libraryHaskellDepends = [ - base binary containers data-accessor deepseq distributed-process - distributed-process-async distributed-process-extras fingertree - hashable mtl stm time transformers unordered-containers + base binary containers deepseq distributed-process + distributed-process-async distributed-process-extras exceptions + fingertree hashable mtl stm time transformers unordered-containers ]; testHaskellDepends = [ ansi-terminal base binary containers deepseq distributed-process distributed-process-async distributed-process-extras - distributed-process-tests fingertree ghc-prim HUnit mtl network - network-transport network-transport-tcp rematch stm test-framework - test-framework-hunit transformers + distributed-process-systest exceptions fingertree ghc-prim HUnit + mtl network network-transport network-transport-tcp rematch stm + test-framework test-framework-hunit transformers ]; homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; @@ -54806,7 +58025,7 @@ self: { mkDerivation { pname = "distributed-process-ekg"; version = "0.1.1.0"; - sha256 = "25c15ef930311ba0d6f56b460b60a2dd2e03a8dee1e80d47721b043713240a3a"; + sha256 = "0fha4h9kf10vf93hvs71vsl06bnxl9h0nikbypba06ri63wmxh95"; libraryHaskellDepends = [ base distributed-process ekg-core text unordered-containers ]; @@ -54828,9 +58047,9 @@ self: { mkDerivation { pname = "distributed-process-execution"; version = "0.1.2.2"; - sha256 = "9fbfca6b394e52af462586127a0edc2efc2a160ae8f69a9d34234a71e3dbf7b5"; + sha256 = "1dgpvgip2ji36jfrmxp818b2mz1fvh77l4l64m3ayljf75mwmgwz"; revision = "2"; - editedCabalFile = "cfd179986e0282f924ce5d7977a44fa31cc8de3115a5de842b9151f11b0578a2"; + editedCabalFile = "18kq0ldz2lci5f2dx98m67gch7539yj7fyaxrqjgk0h2dsc7klfg"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-client-server distributed-process-extras @@ -54863,8 +58082,10 @@ self: { }: mkDerivation { pname = "distributed-process-extras"; - version = "0.3.1"; - sha256 = "feeb3891a60c8f1833aec4e3a7eeae34a54f0baf83f6ebfb5610bb14b4f66bdc"; + version = "0.3.2"; + sha256 = "1cyw171wlhpcc2vp3zidwl1yb5qhp25icqnzg35cdnggh4w12crk"; + revision = "2"; + editedCabalFile = "04d3v54xyq4dq8al8zf3na0ccpvyzhdbsjq7mayq9ih7bf247s8c"; libraryHaskellDepends = [ base binary containers deepseq distributed-process exceptions fingertree hashable mtl stm time transformers unordered-containers @@ -54883,6 +58104,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-fsm" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , containers, data-accessor, deepseq, distributed-process + , distributed-process-client-server, distributed-process-extras + , distributed-process-systest, distributed-static, exceptions + , fingertree, ghc-prim, hashable, HUnit, mtl, network + , network-transport, network-transport-tcp, QuickCheck, rematch + , stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "distributed-process-fsm"; + version = "0.0.1"; + sha256 = "1fv0xc0gpdibvw2yjbl5sw1qa1a34awqkv6y4vwpvd1ms0jasff6"; + libraryHaskellDepends = [ + base binary containers deepseq distributed-process + distributed-process-client-server distributed-process-extras + exceptions mtl stm time transformers unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base binary bytestring containers data-accessor + deepseq distributed-process distributed-process-extras + distributed-process-systest distributed-static fingertree ghc-prim + hashable HUnit mtl network network-transport network-transport-tcp + QuickCheck rematch stm test-framework test-framework-hunit + test-framework-quickcheck2 time transformers unordered-containers + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-fsm"; + description = "The Cloud Haskell implementation of Erlang/OTP gen_statem"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-process-lifted" = callPackage ({ mkDerivation, base, binary, deepseq, distributed-process , distributed-process-monad-control, HUnit, lifted-base @@ -54893,7 +58147,7 @@ self: { mkDerivation { pname = "distributed-process-lifted"; version = "0.2.0.1"; - sha256 = "9f2d96e2148bdc3be54365810f2e8689e7ab2d133d6b8248701d997a92a32950"; + sha256 = "0l19lf97m68xf1484srx2cnsprw9hqp0z0b58gjkpp4b2ki9cbcz"; libraryHaskellDepends = [ base deepseq distributed-process distributed-process-monad-control lifted-base monad-control mtl network-transport transformers @@ -54917,7 +58171,7 @@ self: { mkDerivation { pname = "distributed-process-monad-control"; version = "0.5.1.2"; - sha256 = "284ff6a793a78e4d587cd5f408520b259e2e9d36ec9c69a161abe3103a18e0c7"; + sha256 = "1iz030x11qxbc6hnk77c6sfjx7i51d90ix6mgic4v3m7jfkzckr8"; libraryHaskellDepends = [ base distributed-process monad-control transformers transformers-base @@ -54935,7 +58189,7 @@ self: { mkDerivation { pname = "distributed-process-p2p"; version = "0.1.3.2"; - sha256 = "613c65aa986085e61cf65b55bf174cc2f31a79e5b666daf1ef402bcad940a28e"; + sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54959,7 +58213,7 @@ self: { mkDerivation { pname = "distributed-process-platform"; version = "0.1.0"; - sha256 = "752980d006aaa5319b91da7b5bd5124322552fff9e9cb7de816aff89b7f5ae2f"; + sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54992,7 +58246,7 @@ self: { mkDerivation { pname = "distributed-process-registry"; version = "0.1.0.2"; - sha256 = "ae2e6ec9de83344cbf33db09073343faba2f8e990e20e98dfebe80a9560875d2"; + sha256 = "1lkm11bak05yzs6yj80fk672zfps8crhf2fv6fzlqd43vv4nwbmf"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-client-server distributed-process-extras @@ -55021,9 +58275,9 @@ self: { mkDerivation { pname = "distributed-process-simplelocalnet"; version = "0.2.3.3"; - sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316"; + sha256 = "05j3n8gizfx0bbbv4wkqxk8ipbd9jxgg6pw51ap8bqbc5n7lk63v"; revision = "1"; - editedCabalFile = "4ccf03a12611141e322511b6370e2f757e215f17e68fc3f68485ec5b48fa8f70"; + editedCabalFile = "0w4gz945pv45hkvc73z62xgj2zkm5w73gdhi4lr1w50i4shh7ksc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55049,9 +58303,9 @@ self: { mkDerivation { pname = "distributed-process-supervisor"; version = "0.1.3.2"; - sha256 = "3e9b9c940afb67d41bb3ec50229ea972ffd386a2e424007b9cbacc361f053df4"; + sha256 = "1x1x0lgkdk5skixh0974la3d7zvjm6g24l7cncdx8rzv1aa9r6ry"; revision = "1"; - editedCabalFile = "b23308ae5fb7d64215ea9c5a25f92c8ccd7371437e63f4bd9968ab20bfa65e5d"; + editedCabalFile = "0paylszj1av8k6yz8qvy8dqp7kcc5kwjanlwx8al5mmpbyp0hcxj"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-client-server distributed-process-extras @@ -55080,7 +58334,7 @@ self: { mkDerivation { pname = "distributed-process-systest"; version = "0.1.1"; - sha256 = "a173434da0662635ecd4adebe49eedb5a0e4ec832020bf8e7c154c39b94e118e"; + sha256 = "13hi9swkjk0mgj7by810hgnf985mxngf9sxdskn3a9k6l16l6wx1"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static HUnit network network-transport random rematch @@ -55105,9 +58359,9 @@ self: { mkDerivation { pname = "distributed-process-task"; version = "0.1.2.2"; - sha256 = "ec25caf01b9185d166433246210be688a9733e73f54b03f91a910eaf2cd05c23"; + sha256 = "08sws0nay3li3bwh6jzmfcz77ac8wq5j2iij8dkd31ci3gqcl9gc"; revision = "1"; - editedCabalFile = "2881a849616f0f38ece555040465acf23dc273964282be1a3a00521eb0929c26"; + editedCabalFile = "09lwjaq1wlh078dbx0j2jrrw4ggjmijh812mwpn3h3vgc54si098"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-async distributed-process-client-server @@ -55138,7 +58392,7 @@ self: { mkDerivation { pname = "distributed-process-tests"; version = "0.4.7"; - sha256 = "8be7d1adf75753957925705fa1b5af20f3d90f71803352bd74e82484c46917b1"; + sha256 = "1c8pd7288978fjym4cw0f47xkwr0myss2pvh4mwralspyynx3rwb"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static HUnit network network-transport random rematch @@ -55163,7 +58417,7 @@ self: { mkDerivation { pname = "distributed-process-zookeeper"; version = "0.2.2.0"; - sha256 = "df15044fe0f74e4034be2f58d589e2ffa1e46c36e8024c07d6db56fe39697928"; + sha256 = "0a3rd4wzwmnvsq3lq0p86rnf98gzwa4xan1gpqs40kppw17h85fz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55189,7 +58443,7 @@ self: { mkDerivation { pname = "distributed-static"; version = "0.3.5.0"; - sha256 = "e57b27ddd13ae033a6de5513b5bba75ff123ebb381cf6ab79fe887899f1e51f9"; + sha256 = "1yai3sgqk1z8kyvnmkw1ngmj7wazlyxva4smvsk37q1ss7fjfyz5"; libraryHaskellDepends = [ base binary bytestring containers deepseq rank1dynamic ]; @@ -55202,8 +58456,8 @@ self: { ({ mkDerivation, array, base, containers, MonadRandom, random }: mkDerivation { pname = "distribution"; - version = "1.1.0.0"; - sha256 = "dbe2682b5fdf93c3e0d98f950926774a8c7bd9b443a41016e8f86e86e254810e"; + version = "1.1.1.0"; + sha256 = "1cc16020b8jifcqb2k61g9rv100i8iga7dfsi8jf502myvpgilpx"; libraryHaskellDepends = [ array base containers MonadRandom random ]; @@ -55215,20 +58469,17 @@ self: { "distribution-nixpkgs" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, doctest, hspec, language-nix, lens, pretty, process - , QuickCheck, split + , split }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.0.0.1"; - sha256 = "b69bfe3fcb58d484a2d35f36d918a9596256aa11f050ac2b93bc63058ffb1b48"; + version = "1.1"; + sha256 = "15m881mrhpqg1xjdjz65ym8pajp1nijrcvb6dx3vv55430cjw1qx"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers deepseq doctest hspec - language-nix lens pretty process QuickCheck split - ]; + testHaskellDepends = [ base deepseq doctest hspec lens ]; homepage = "https://github.com/peti/distribution-nixpkgs#readme"; description = "Types and functions to manipulate the Nixpkgs distribution"; license = stdenv.lib.licenses.bsd3; @@ -55241,7 +58492,7 @@ self: { mkDerivation { pname = "distribution-plot"; version = "1.0.0.0"; - sha256 = "361def9caab9df2ca5ba222c807ab1649347e430c05261e489a3a7f37a3b659a"; + sha256 = "16k57dxg79x3i7j62ln063j4g4v4n5x80b12pajjrpxrmaffy79n"; libraryHaskellDepends = [ base Chart Chart-cairo colour containers data-default-class distribution lens @@ -55260,9 +58511,9 @@ self: { mkDerivation { pname = "distributive"; version = "0.5.2"; - sha256 = "ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9"; + sha256 = "1nbcyysnrkliy7xwx6f39p80kkp0vlvq14wdj6r0m5c1brmbxqmd"; revision = "2"; - editedCabalFile = "29cf1ac04b774831a231c83cd13c4356c65dc657000f1a79ef3e42ad21e6e2f2"; + editedCabalFile = "1wp2wqhsshiyxxwil3q0az35vijn8cyd2g6866i32j3p9g01mkr9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -55281,7 +58532,7 @@ self: { mkDerivation { pname = "diversity"; version = "0.8.0.2"; - sha256 = "f8bea710958aff9169f150efc112ec871230eccf464315b956dccdd8460c7324"; + sha256 = "093k1i3dikfwaswiahs6rzn304l7xh9c3vshy5lr3zwajl8aggpq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55309,7 +58560,7 @@ self: { mkDerivation { pname = "dixi"; version = "0.6.9.2"; - sha256 = "39190af5648c2f39f133d140856d62cceefbe96f02a570bba68d442908dcb6d7"; + sha256 = "1mxnvh42ji4dlsxp1982dzlzpvncc9nqah6i6gqkjbwcckshl69r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55341,7 +58592,7 @@ self: { mkDerivation { pname = "djembe"; version = "0.1.1.2"; - sha256 = "522a89f1f9c29dfaf17b4dd0a0dcb7e88eba511948e8fd94ea618a4757eb7a28"; + sha256 = "0a3sxdblg2k1xaagvs28358vm3p8nzfa1l2dggqzm7f2z7qqjajj"; libraryHaskellDepends = [ base hmidi hspec lens mtl QuickCheck random ]; @@ -55357,7 +58608,7 @@ self: { mkDerivation { pname = "djinn"; version = "2014.9.7"; - sha256 = "4ff8346fb9e93055b93db16a283312ee8bda122db8e54520c299da81d6df2ddd"; + sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55374,7 +58625,7 @@ self: { mkDerivation { pname = "djinn-ghc"; version = "0.0.2.3"; - sha256 = "cb956aed69bc5c342b45ef1b1142b6555fd2865dde1a80ac6ab3ef86aca314a4"; + sha256 = "190llfn8dvxkdan806nybn3d4psmnr1126zg8lmk8p5wd7nnm5fb"; libraryHaskellDepends = [ async base containers djinn-lib ghc mtl transformers ]; @@ -55387,7 +58638,7 @@ self: { mkDerivation { pname = "djinn-lib"; version = "0.0.1.2"; - sha256 = "c0fe10b7aa5cb39f828e933925fc5bbf86c290bb7661021e4d9250ae8ed01011"; + sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0"; libraryHaskellDepends = [ base containers mtl pretty ]; homepage = "http://www.augustsson.net/Darcs/Djinn/"; description = "Generate Haskell code from a type. Library extracted from djinn package."; @@ -55399,7 +58650,7 @@ self: { mkDerivation { pname = "djinn-th"; version = "0.0.1"; - sha256 = "3ddec6df9153059aeef2153857ff642103c0a84915f97f8e4fd86c06d1372b21"; + sha256 = "089b6z8hcv6q9y77zy8m96lc00r1ckzmff0mybp9l1akj7gwdpix"; libraryHaskellDepends = [ base containers logict template-haskell ]; @@ -55414,7 +58665,7 @@ self: { mkDerivation { pname = "dlist"; version = "0.8.0.2"; - sha256 = "77397ecfb9a7cbfac15226cbe09ec156a3deb6e21c7af948bc8ab459e88641b1"; + sha256 = "1ca1hvl5kd4api4gjyhwwavdx8snq6gf1jr6ab0zmjx7p77pwfbp"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/spl/dlist"; @@ -55422,26 +58673,67 @@ 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 { pname = "dlist-instances"; version = "0.1.1.1"; - sha256 = "d14a10c06f52fb412b2c1066d729f5534aa43204221e7ba7d81d935c44ce4f5b"; + sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni"; libraryHaskellDepends = [ base dlist semigroups ]; homepage = "https://github.com/gregwebs/dlist-instances"; description = "Difference lists instances"; 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 { pname = "dmc"; version = "1.1"; - sha256 = "76467975ce4b2e65ae67c42e84a78fd995655f39754595e920b903b13009c2ae"; + sha256 = "1bn214qb20xr43lraibm75gnb5friykq8bn4cyp6abjbrrspjikn"; revision = "2"; - editedCabalFile = "a6e8ae3524d68892f9bd71b80c0cb52f4ef0c11ec7212b554f63e25ae65afde6"; + editedCabalFile = "1rpxbbk5mqk39xajn8f73v0z0kignl60rf3ippwr526n4hssxs56"; libraryHaskellDepends = [ base process ]; testHaskellDepends = [ base hspec process QuickCheck ]; homepage = "https://github.com/ciez/dmc"; @@ -55456,7 +58748,7 @@ self: { mkDerivation { pname = "dmenu"; version = "0.3.1.1"; - sha256 = "21447fcdd14d6355c5c6dd9b2d79f49f38bb24a81874a7c38dc05cdd5abbe634"; + sha256 = "0d76pdddsp60ip1sfx0qm0jbnf4zyiwjv6yxqv2maqsds76pyi11"; libraryHaskellDepends = [ base containers directory lens mtl process transformers ]; @@ -55472,7 +58764,7 @@ self: { mkDerivation { pname = "dmenu-pkill"; version = "0.1.0.1"; - sha256 = "e36f1317fa67dd56c2daf5193a91f33c26ffac481c90d1aadbdceecc5d9ebb78"; + sha256 = "0y5vkrfwrvnwvfmd340w92ngy9iwyf8kl6gmvb15dpb7z8bi6vz3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55490,7 +58782,7 @@ self: { mkDerivation { pname = "dmenu-pmount"; version = "0.1.0.1"; - sha256 = "c5cbdbea006bc4f62256b907c6845cbdabe6425116949f9af398770ba57f6643"; + sha256 = "0hv6gyjhnxwqyfd9z50na51fdaxxbj2cc1xraqigdi3b03mdpjy5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55508,7 +58800,7 @@ self: { mkDerivation { pname = "dmenu-search"; version = "0.1.0.1"; - sha256 = "8ab29fe89764bab3ed4f0d4f8d99145c9c43945ea37db4d04b313c74e4b33ec9"; + sha256 = "1j9yngj78g1i9g8b8zd3bsa4772w2jcqskqd9znv7fk4jzl9zcla"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55527,7 +58819,7 @@ self: { mkDerivation { pname = "dns"; version = "2.0.10"; - sha256 = "ba03bc8fe25b58fd066588569eb5707a245cb098181e2d5cca72c239849aa6a3"; + sha256 = "18x6ka23khkjr9f2s7hqk2q5q93sf2srwml8cl3gsn2vwa7vq0xs"; libraryHaskellDepends = [ attoparsec base binary bytestring bytestring-builder conduit conduit-extra containers iproute mtl network random resourcet safe @@ -55549,7 +58841,7 @@ self: { mkDerivation { pname = "dnscache"; version = "1.1.0"; - sha256 = "ab7fd38ca9b162299f9269a5d94565f504455d1c81bf8c2dd64047ed0e77972f"; + sha256 = "0bwpfw7fsis0sqnqrgw13ifla17mcm2xk9b9jagjjqmim66d6zxb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55566,7 +58858,7 @@ self: { mkDerivation { pname = "dnsrbl"; version = "0.0.3"; - sha256 = "b5a76d7f04b5d3393aa905d6b4afc50c74e5ddc957a38a8c0bf8578c9528b81f"; + sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm"; libraryHaskellDepends = [ base containers hsdns HUnit network ]; homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/"; description = "Asynchronous DNS RBL lookup"; @@ -55579,7 +58871,7 @@ self: { mkDerivation { pname = "dnssd"; version = "0.1.0.0"; - sha256 = "56cc66b4ba20bc2f554d9153c63706713fb3eba4c6b5944106d176c643f6de3d"; + sha256 = "0gfyyr1wcxni0r0r9df6lkmv6gvi0qvwclwi9majzg10pas6dk2n"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ dns_sd ]; homepage = "https://github.com/maxpow4h/dnssd"; @@ -55593,7 +58885,7 @@ self: { mkDerivation { pname = "do-list"; version = "1.0.1"; - sha256 = "b377193461b0ad7a81f9e66bcf10f8838b6f1e39f4a5de3b2e2f45c749c5b694"; + sha256 = "155nqm4wfi9g5qxxx9gl74g6z2w3z08cysz6z60pmbdhc4s1jxxk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion mtl text ]; @@ -55612,7 +58904,7 @@ self: { mkDerivation { pname = "doc-review"; version = "0.7.1"; - sha256 = "ce46c33676f61e6dbf715d2549e440ba2eb8a7268d81ab173a593e68ea7d0900"; + sha256 = "0009gpm6hgjr78bsp0cd4skvhbms83j4j9axf6zns7pnfqvc6inf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55635,7 +58927,7 @@ self: { mkDerivation { pname = "doccheck"; version = "0.1.0.0"; - sha256 = "8b8631b0a3162395bbeeaa2cd73969afdaddd73b2dd534dff711149d80b6b214"; + sha256 = "055jns09s50iyzgk9m9d7gbxvnmgd4wxfb5axsxra8qnlfq331lb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55655,7 +58947,7 @@ self: { mkDerivation { pname = "docidx"; version = "1.1.0"; - sha256 = "68e91713c5bc9167b4bc0363e31b62bc45995c890afe06cddacc585049bc4000"; + sha256 = "0020pi4m0n6cvb6hdzhai5f9jidwc8dy6qq3pjs6g4dwql9igsb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55669,25 +58961,33 @@ self: { }) {}; "docker" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection - , containers, data-default-class, http-client, http-client-tls - , http-types, lens, lens-aeson, mtl, network, process, QuickCheck - , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time, tls - , transformers, unordered-containers, x509, x509-store, x509-system + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , conduit-combinators, conduit-extra, connection, containers + , data-default-class, directory, exceptions, filemanip, filepath + , http-client, http-client-tls, http-conduit, http-types, lens + , 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, vector, x509, x509-store, x509-system + , zlib }: mkDerivation { pname = "docker"; - version = "0.3.0.1"; - sha256 = "410054ae9a047caff47af15a72d26a699b500f59cca3d6a66f54a5fc505a4ec7"; + version = "0.4.0.1"; + sha256 = "1nf860admbdhrbyyj8m7ymd9c390rnrn2nqb2gr3i8dk4rcm4hsf"; libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers data-default-class - http-client http-types mtl network scientific text time tls - unordered-containers x509 x509-store x509-system + 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 + 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"; @@ -55708,7 +59008,7 @@ self: { mkDerivation { pname = "dockercook"; version = "0.5.0.3"; - sha256 = "ba1e45921535e8fb4767c53e77ac48b3e99c0501acb0efb99ed100b6f3cae032"; + sha256 = "0cp0rbrvc06ikswyzc5c042rrsdk92n7fgn5cx3zps1m2n94a7ms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55735,7 +59035,7 @@ self: { mkDerivation { pname = "dockerfile"; version = "0.1.0.1"; - sha256 = "294ac0b6c0546da15bf5453d6006979aeb6f6b36f0566be75767f5021de00025"; + sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple DSL for describing and generating Dockerfile containers in Haskell"; @@ -55749,7 +59049,7 @@ self: { mkDerivation { pname = "docopt"; version = "0.7.0.5"; - sha256 = "15790808a4896bbf0748c1c0f3ab63c07aea4621d95b93a39886813f829d05ee"; + sha256 = "1vh5kn13z0c6k2ir6nyr453flyn0cfmz7h61903vysw9lh40hy8m"; libraryHaskellDepends = [ base containers parsec template-haskell th-lift ]; @@ -55770,7 +59070,7 @@ self: { mkDerivation { pname = "doctemplates"; version = "0.1.0.2"; - sha256 = "b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b"; + sha256 = "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers parsec scientific text unordered-containers vector @@ -55783,13 +59083,14 @@ self: { "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, process, QuickCheck - , setenv, silently, stringbuilder, syb, transformers, with-location + , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process + , QuickCheck, setenv, silently, stringbuilder, syb, transformers + , with-location }: mkDerivation { pname = "doctest"; - version = "0.11.1"; - sha256 = "5b6ab30f0bf4061707b7bb33445da4c8a00df3e8b3ed04cf7c86f18a6007ad2a"; + version = "0.11.3"; + sha256 = "0j3qbcvsc389g2y5k5xyln3cik7wfy8ii9c3jp665fywp28r1iys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55799,8 +59100,8 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit process QuickCheck setenv silently stringbuilder syb - transformers with-location + hspec HUnit mockery process QuickCheck setenv silently + stringbuilder syb transformers with-location ]; homepage = "https://github.com/sol/doctest#readme"; description = "Test interactive Haskell examples"; @@ -55814,7 +59115,7 @@ self: { mkDerivation { pname = "doctest-discover"; version = "0.1.0.7"; - sha256 = "ac6a65da517db7f264e65607a50b080b54f008ba592746ac11b7bb40107fbd70"; + sha256 = "0w5xgw841fxp26n4c9srp84g0m0b105sa1snwrjg5dvxa7d6asmc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55838,9 +59139,9 @@ self: { mkDerivation { pname = "doctest-discover-configurator"; version = "0.1.0.6"; - sha256 = "289f1b5dae7b8ae7cf1fe1f5450552988492cf04deb20e9577b1b5636e465dd8"; + sha256 = "1n2x8rp67ddifyahxcny0k7r514qa82lbxg13z7yg2kvmrfip7r8"; revision = "1"; - editedCabalFile = "79f62a00ff10acba4f850730ed2ffe99d5637bdfdb48f6fc4b92f03fbbb20a45"; + editedCabalFile = "0i8anaxkzw4j9gygcj6vvxxn7mcrzqpysc07hm7vmb0hzw02mxkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55862,7 +59163,7 @@ self: { mkDerivation { pname = "doctest-prop"; version = "0.2.0.1"; - sha256 = "4ab056cc370c320536976ce3c1648098ee60d7d60b9e770e556f013d0ad6aeaa"; + sha256 = "1amfsq53s0bgal77g7hbsvbn1vlqh1jc3qvcjwv0achc6z65dc2a"; libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base doctest HUnit QuickCheck ]; description = "Allow QuickCheck-style property testing within doctest"; @@ -55878,7 +59179,7 @@ self: { mkDerivation { pname = "docvim"; version = "0.3.2.1"; - sha256 = "fd4b9005f4da2cfeda35796233bed0e9217ca633cc13408442218c51e493074f"; + sha256 = "0kq7jgj533118a2404yc6fk7q8g9s2z36qkr6pdgwb6syh2r0jzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55906,7 +59207,7 @@ self: { mkDerivation { pname = "doi"; version = "0.0.2"; - sha256 = "202c7a5bf7b49077a287f6d73d55620684c3cbe8c6b0e30f66d333151bb259a5"; + sha256 = "19arn8diacykcq7y7c66x35w7106c9akvmznhyi7g45lyxdplb10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55932,7 +59233,7 @@ self: { mkDerivation { pname = "dom-lt"; version = "0.1.3"; - sha256 = "ea652b765850150b0da96a12573a807593564c214a3043613deeca441a6aa144"; + sha256 = "0i51d8d49jpf7mhl6c2a4565d4vmh0x5f4kam46hn5ahb1v2nrga"; libraryHaskellDepends = [ array base containers ]; description = "The Lengauer-Tarjan graph dominators algorithm"; license = stdenv.lib.licenses.bsd3; @@ -55946,7 +59247,7 @@ self: { mkDerivation { pname = "dom-parser"; version = "2.0.0"; - sha256 = "9de203857330d7d3b27e18e458a7548dc4e449bff3b7b95de2d40a1556cccf38"; + sha256 = "0f6grib1a2nlw9fvkdzkpx4y9i4dajkmir0qgsrd7mrhff2h7qlx"; libraryHaskellDepends = [ base case-insensitive containers lens mtl open-union scientific semigroups text transformers type-fun xml-conduit xml-lens @@ -55967,7 +59268,7 @@ self: { mkDerivation { pname = "dom-selector"; version = "0.2.0.1"; - sha256 = "42ac991bfc11576838c841b4712f2c162cb841389b28eb0aa4454732d3c9a3da"; + sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22"; libraryHaskellDepends = [ base blaze-html containers html-conduit parsec QuickCheck template-haskell text th-lift xml-conduit @@ -55988,7 +59289,7 @@ self: { mkDerivation { pname = "domain-auth"; version = "0.2.1"; - sha256 = "8ac8691b4a23352656fda46fb14e24f16399cbbcf73acf71f9c5853a2fe133ac"; + sha256 = "1b1kw4pkm1f5z5qwyfpppk5rjqzi4i7b2vx4zmb2cd9398dnkj4a"; libraryHaskellDepends = [ appar base binary blaze-builder bytestring containers crypto-pubkey-types dns iproute network RSA SHA @@ -56002,7 +59303,7 @@ self: { mkDerivation { pname = "dominion"; version = "0.1.1.0"; - sha256 = "bea01160caf8636409a3f07f3021c310ee81b67d6037fd62d533993ee746b112"; + sha256 = "04mi8vkkx69ksmigsdv0gnv83vhhqchk0zzhlc4n8qzqr9h1385y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers lens mtl random ]; @@ -56021,7 +59322,7 @@ self: { mkDerivation { pname = "domplate"; version = "0.1.0.1"; - sha256 = "645d9d390d9507ffe4fa3aead56c7ca012b1f0ec19ed5a7574b2fa7a7e975fda"; + sha256 = "1njzjxz7mymjfismmv8rxkqb24m0gindbsiszbjgy1wm1lwrspb4"; libraryHaskellDepends = [ base bytestring containers tagsoup text unordered-containers vector yaml @@ -56037,7 +59338,7 @@ self: { mkDerivation { pname = "dot"; version = "0.2.2"; - sha256 = "438175f3d74ef9770cba1a7148ddb7311e1ea53a19dc467cd8ee995ad73e9b48"; + sha256 = "0j4v7vbmm6gfv1y4dp0r7ajiw7iinzflhw8sp867gyafszrpb0a3"; libraryHaskellDepends = [ base impure-containers text ]; homepage = "https://github.com/andrewthad/dot#readme"; description = "Data types and encoding for graphviz dot files"; @@ -56052,7 +59353,7 @@ self: { mkDerivation { pname = "dot-linker"; version = "0.1.0.0"; - sha256 = "a1a1750cd3b5231f29fede26eb0e9dd52192203d64d54beed4cca6c0109f97fe"; + sha256 = "1zlpkw8c19ncskp4pmb47lh948fmkl7fn9nyzqliy8xmsc67b8d1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56077,7 +59378,7 @@ self: { mkDerivation { pname = "dot2graphml"; version = "0.1.0.2"; - sha256 = "31e20e5aa13bd4735b7f21078dbcf8703e147b008805712ac8f13547c4e58ebb"; + sha256 = "1fwfwp24fdgir0m721c801xi8gkhz2y8s1r1gxdp7m1vl5d0xqii"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers graphviz hxt text ]; @@ -56093,8 +59394,8 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.3.1.0"; - sha256 = "7f4e7c1717e486fd71a6d5507494d314a541e1c308787c7b49bfdbd77c868476"; + version = "0.3.4.0"; + sha256 = "0rbz73wfsw89pc4l06xqk3x9m5r43r0w1swbmnciwy238v9w7bz8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56122,7 +59423,7 @@ self: { mkDerivation { pname = "dotfs"; version = "0.1.1.3"; - sha256 = "2e112a0c1fbccb3a11cf82c3ef256ae5c853722c421037c7aa10d925770e4242"; + sha256 = "0hj21rvjbn8hmb3kf4225ir57j75d8jyzhw2rw8kmjxw3w62l49f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56151,7 +59452,7 @@ self: { mkDerivation { pname = "dotgen"; version = "0.4.2"; - sha256 = "cf0de20a435d74aeb9a32b8bcb3ebfa1b6659ac3f26edefe2df9e1aaf1481891"; + sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -56165,7 +59466,7 @@ self: { mkDerivation { pname = "dotnet-timespan"; version = "0.0.1.0"; - sha256 = "d8ca8dffbc916ff5139d6f0df4a22c947ab5f996c376f1ab8c2e120789209ac3"; + sha256 = "1hws424hf4ifijmz2xn3jvwvayll5jig83bgkl9zavwipkzqvjnq"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/YoEight/dotnet-timespan"; description = ".NET TimeSpan"; @@ -56179,7 +59480,7 @@ self: { mkDerivation { pname = "double-conversion"; version = "2.0.2.0"; - sha256 = "44cde172395401169e844d6791b6eb0ef2c2e55a08de8dda96551cfe029ba26b"; + sha256 = "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4"; libraryHaskellDepends = [ base bytestring ghc-prim text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit @@ -56196,8 +59497,8 @@ self: { }: mkDerivation { pname = "double-extra"; - version = "0.1.0.4"; - sha256 = "f7df3804982a8acb19b774080922b7625209abf14a328b2efaa39df4f6d7b6a0"; + version = "0.1.1"; + sha256 = "08r57jckhzav9vlbq0hk4sr2qv0fvapisr774xch0kmb443ij5dc"; libraryHaskellDepends = [ aeson base bytestring cassava deepseq double-conversion rawstring-qm text @@ -56212,19 +59513,31 @@ self: { mkDerivation { pname = "double-metaphone"; version = "0.0.2"; - sha256 = "2c8255787a90709b049fc6c10972bfe74b1678e479b0d5fa6ea1de113be43c97"; + sha256 = "15rwwhxi3pm1dvxdbc3rwiw1cjz7pxr0khf6kw29nw4hg9w5b0ic"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/christian-marie/double-metaphone"; description = "Haskell bindings to a C double-metaphone implementation"; license = "GPL"; }) {}; + "doublify-toolkit" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "doublify-toolkit"; + version = "0.0.1"; + sha256 = "0libb7w3a8ffcr08x6s3xqzhbkxb8n111f53g638jr0xpz3r98yv"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/doublifyapis/toolkit-haskell"; + description = "Doublify API toolkit for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "dove" = callPackage ({ mkDerivation, acl2, base }: mkDerivation { pname = "dove"; version = "0.0.0"; - sha256 = "8dcb014191b11835b56523b0940cc3c83cf4205d75a43ad5d274b1debb8d03a6"; + sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd"; libraryHaskellDepends = [ acl2 base ]; description = "The Dove verification language"; license = stdenv.lib.licenses.bsd3; @@ -56237,7 +59550,7 @@ self: { mkDerivation { pname = "dow"; version = "0.2.6"; - sha256 = "17371346730fb7d133671261c303b453a2e0bcfaeb83a68b441e350483565731"; + sha256 = "0capas1h8d8y8j5sd0zbzayf18jknh1w6q8jcwrx3dqgfd316dqp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -56252,7 +59565,7 @@ self: { mkDerivation { pname = "download"; version = "0.3.2.5"; - sha256 = "9ae6d92ae4fe7ec4ff7281896254a7794e4caf85b6743280afd2074865dd99c0"; + sha256 = "1h4rvmjlh1yjmy034x5nhnplqkkrlxa652c1fbzw8zpywhmdkrls"; libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/psibi/download"; @@ -56266,9 +59579,9 @@ self: { mkDerivation { pname = "download-curl"; version = "0.1.4"; - sha256 = "950ede497ff41d72875337861fa41ca3e151b691ad53a9ddddd2443285bbc3f1"; + sha256 = "1wf3pf2k4i6jvpfsjlxdj6v53qd33jj1z1ipaf3p47glgx4xw3lm"; revision = "2"; - editedCabalFile = "d4df109a694aacf11814f7d0ea8df2aa6b187ea894f1e6ae1bddae635f0a4e0c"; + editedCabalFile = "032f19gn7bnx3fpfdwclm1z1hsxaya6yml7p2hcg3b2ad6d11pyl"; libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ]; homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; @@ -56283,7 +59596,7 @@ self: { mkDerivation { pname = "download-media-content"; version = "0.0.0.1"; - sha256 = "e69bec8d560efd1f66de7c391af9b5214dda0812151a1649eb46e821411844ae"; + sha256 = "1bj4310j3s26xd4ic6hm284dlk91npwilfbwvrk1zz8fas6yr6z6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -56300,7 +59613,7 @@ self: { mkDerivation { pname = "dozenal"; version = "0.1.0.0"; - sha256 = "3448b747cb22e61f7939a56a3f238e72ed702d1d49899fa9dc787935a4ef1b6b"; + sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/siddhanathan/dozenal"; description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers"; @@ -56316,9 +59629,9 @@ self: { mkDerivation { pname = "dozens"; version = "0.1.1"; - sha256 = "7e16121b2ee5e4bbdda47c11d956828ed0e5646723ff2b6e469d3c950c6b7ac3"; + sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky"; revision = "1"; - editedCabalFile = "08e6297d7be6ec753261aa5cb8f265a6ba6c369f44d25f46f9784ae1d8a88e52"; + editedCabalFile = "0llfm3cf2jkqz535zlj4kwv6rfm6cprbhp5ac4r7bv76gdyjkrh8"; libraryHaskellDepends = [ aeson base bytestring data-default-class http-client http-types reflection scientific text transformers @@ -56334,7 +59647,7 @@ self: { mkDerivation { pname = "dph-base"; version = "0.7.0.1"; - sha256 = "be0477927fdbafb392d5d89a08d0a1cef17c01b38f07c255b3be3f4a12042ca7"; + sha256 = "19rc0h94lgxyndaw41wgnc0prwffl780i6nqsn9b7byvgy97f15y"; libraryHaskellDepends = [ array base ghc-prim pretty random vector ]; @@ -56351,7 +59664,7 @@ self: { mkDerivation { pname = "dph-examples"; version = "0.7.0.5"; - sha256 = "7fb2eddf79c9410126c15e063e609a6e97e52c338b79ac71499dd5fb344472e1"; + sha256 = "1qbj8hsgpmcx95qsqycb6cnfb5vfk9h3w1jyq4k02hf9g7gyvckz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -56371,7 +59684,7 @@ self: { mkDerivation { pname = "dph-lifted-base"; version = "0.7.0.1"; - sha256 = "138809530026ac8089510c008442ca64a3eafc88dd79480e1c9ed6fb56a2e3be"; + sha256 = "1gp3l9bgpmly3h74hyfxi3yfm8v4r918800ca64q1b16019hk20k"; libraryHaskellDepends = [ array base containers dph-base dph-prim-par ghc pretty random template-haskell vector @@ -56389,7 +59702,7 @@ self: { mkDerivation { pname = "dph-lifted-copy"; version = "0.7.0.1"; - sha256 = "b89ca3641c34a3366a5c67caabd04b235f74788d52e473d630a4d4bcb38a4a85"; + sha256 = "11aaiarvrm5463b77r2jimw78pr39g8apjk7bim3d8rl3ija775q"; libraryHaskellDepends = [ array base dph-base dph-prim-par ghc random template-haskell vector ]; @@ -56406,7 +59719,7 @@ self: { mkDerivation { pname = "dph-lifted-vseg"; version = "0.7.0.1"; - sha256 = "852823874c3869041e7ad2ae823c0f6f83513315148b013bfef617d3fc3c786e"; + sha256 = "0vkq7kyd65znzqxh32ql2lrm30vg1wy85bnjg8g08s9q9j3j6a45"; libraryHaskellDepends = [ array base containers dph-base dph-lifted-base dph-prim-par ghc pretty random template-haskell vector @@ -56422,7 +59735,7 @@ self: { mkDerivation { pname = "dph-par"; version = "0.5.1.99"; - sha256 = "274584ca29e8c9bac8113255e75c1202dd1f3646c9b6922edf61f7051f6a4f33"; + sha256 = "0csgd8ghbxv1vwp95dn98qv1zp8229fffm9j274bmjg857588i97"; doHaddock = false; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "(deprecated)"; @@ -56434,7 +59747,7 @@ self: { mkDerivation { pname = "dph-prim-interface"; version = "0.7.0.1"; - sha256 = "12c112d93d6705a5f21ec890f0c2ce248058f904e767237a3d2d1846fd1ba09e"; + sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j"; libraryHaskellDepends = [ base dph-base random vector ]; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell segmented arrays. (abstract interface)"; @@ -56449,7 +59762,7 @@ self: { mkDerivation { pname = "dph-prim-par"; version = "0.7.0.1"; - sha256 = "f786940755f304f5c3e047fff01470259f30390352ebf8ed2d2655b657cca78f"; + sha256 = "13x7ribvcm965pnzissj0cwk17r5f0ag1zs7w31za17kal3r91pp"; libraryHaskellDepends = [ base dph-base dph-prim-interface dph-prim-seq old-time random vector @@ -56467,7 +59780,7 @@ self: { mkDerivation { pname = "dph-prim-seq"; version = "0.7.0.1"; - sha256 = "195b86f6221adc186f3affaaed3610445712e66a7b9caad0fbc789b93f2ee9bb"; + sha256 = "1fz95qzvk2f7zg8am73vdbk14ms420vfvapz79piip0s4bv8cnqr"; libraryHaskellDepends = [ base dph-base dph-prim-interface ghc-prim primitive random vector ]; @@ -56482,7 +59795,7 @@ self: { mkDerivation { pname = "dph-seq"; version = "0.5.1.99"; - sha256 = "f7f9940a42e945c4390d470ff4768ee628717273ed506fe1e60541af08c64683"; + sha256 = "10s6qq4ayh85wvhnyl7dfdr72a76irvg83s71lww8ig988599ygp"; doHaddock = false; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "(deprecated)"; @@ -56496,7 +59809,7 @@ self: { mkDerivation { pname = "dpkg"; version = "0.0.3"; - sha256 = "b37c65b1df2b828d3f20c34498fb7725f9fc3d5ff4e8a0191edb4a8c779019af"; + sha256 = "1bqrj1vqqjnv3qcs1s7lbwyzry95fzxrhi6340zqv0ibvyqnaz5k"; libraryHaskellDepends = [ base bindings-DSL bytestring monad-loops ]; @@ -56514,7 +59827,7 @@ self: { mkDerivation { pname = "dpor"; version = "0.2.0.0"; - sha256 = "6efbcc42b845541148886ee92656bbfe6b90b1a0483180b9165d4b0b691ac8e2"; + sha256 = "1qn839lhnjsx2swq0ca8l2qr0szypdb2dsbfi1412m25p11cryvf"; libraryHaskellDepends = [ base containers deepseq random semigroups ]; @@ -56528,7 +59841,7 @@ self: { mkDerivation { pname = "drClickOn"; version = "0.1"; - sha256 = "232bf1b01f9af4b13f9d7ff8b504e3b952e19e6ae969876f81b4972e14ae2c83"; + sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/cwi-swat/monadic-frp"; description = "Monadic FRP"; @@ -56541,9 +59854,9 @@ self: { mkDerivation { pname = "draw-poker"; version = "0.1.0.1"; - sha256 = "a78832b02fe72bcf83ce1970ecb7a863500fb3987a6a0c912150ad211d3e6199"; + sha256 = "16b17qfj3bah468hqsksk2rhyl33m2vyqw0rrs1wyaz75yq35257"; revision = "1"; - editedCabalFile = "62a11039e0b634f0b372c28d87f6fe84f40a33981211c9f2bc077135abcef629"; + editedCabalFile = "0agnrsmkaw87pkrcj48jk0rhmx44zvv8g3f2farz0d5nw0wi18b2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random-shuffle safe ]; @@ -56559,7 +59872,7 @@ self: { mkDerivation { pname = "drawille"; version = "0.1.2.0"; - sha256 = "b8188ee87a06c168974c9655188450eb86c331c556decb31cf084efa846237df"; + sha256 = "1prpca2glkh8rwqwppjnqlqw71pba221hmcn9jbnih86gbl8w65q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -56576,7 +59889,7 @@ self: { mkDerivation { pname = "dresdner-verkehrsbetriebe"; version = "1.0.0"; - sha256 = "8c23ab7f2f3b8c7c885eb5f6fd9aff7f644656a07ad2a4b0cd13437f9201b20a"; + sha256 = "02mj0697yhqkrnqa9lksl1b4cr3zzydgvxmmbs47r31v5xzsn8wc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56599,7 +59912,7 @@ self: { mkDerivation { pname = "drifter"; version = "0.2.2"; - sha256 = "e47e0ceff7ff4e33c681719c6a1af3052f0c123c847dae2cb1fb73e08d3311e1"; + sha256 = "1q8i6f6y0wzvn4nawzc47h90qbq5ycd6m73ih7336kpzyzphqzp4"; libraryHaskellDepends = [ base containers fgl text ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck text @@ -56616,7 +59929,7 @@ self: { mkDerivation { pname = "drifter-postgresql"; version = "0.1.0"; - sha256 = "10df8309986c23f947949a28f9fb16ec6632f1d509ab0fe010a74f9068b90325"; + sha256 = "0983p5l90kx723h0zaq9spqk4rpc2vxzja4sji3zj8vck04q7pqh"; libraryHaskellDepends = [ base containers drifter either mtl postgresql-simple time ]; @@ -56630,12 +59943,12 @@ self: { }) {}; "drmaa" = callPackage - ({ mkDerivation, base, drmaa, inline-c, shelly, text }: + ({ mkDerivation, base, directory, drmaa, inline-c }: mkDerivation { pname = "drmaa"; - version = "0.1.1"; - sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567"; - libraryHaskellDepends = [ base inline-c shelly text ]; + version = "0.2.0"; + sha256 = "0hmyzlwqdj3cjnhjc4bk35wzxzzknl0fapqz119yahc03jrpcpg6"; + libraryHaskellDepends = [ base directory inline-c ]; librarySystemDepends = [ drmaa ]; description = "A minimal Haskell bindings to DRMAA C library"; license = stdenv.lib.licenses.bsd3; @@ -56652,7 +59965,7 @@ self: { mkDerivation { pname = "dropbox-sdk"; version = "0.3.1"; - sha256 = "c2f7531f7aa2e2026e92de784ec43e4534fbd06035d8cae79c2c4aaf429c0ae8"; + sha256 = "1s0aki1ayjickkkwmn1mc38gnd257v24wy6yj9p05qm2g8gm7xy2"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive certificate conduit HTTP http-conduit http-types json monad-control network old-locale @@ -56672,7 +59985,7 @@ self: { mkDerivation { pname = "dropsolve"; version = "0.1.2.1"; - sha256 = "f72dc80151190d4dc42fa0698ec383f9e5e2c7a234db85e12ebec9501ccb3bdb"; + sha256 = "1nrvrcf51jdy5vhqbnrllb3y5rgrhg1qwsd05z24s38ra40whbgp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -56691,7 +60004,7 @@ self: { mkDerivation { pname = "ds-kanren"; version = "0.2.0.1"; - sha256 = "d31d29f938bae1f4fccc8e66269c90760d908a32a49358c1850a5b594ac34f93"; + sha256 = "14sgqd55jnqahp0mi4x46a5903bnj2f2crlfrkyg9qds73wjj7fk"; libraryHaskellDepends = [ base containers logict ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A subset of the miniKanren language"; @@ -56699,6 +60012,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dsc" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, hspec + , QuickCheck, SimpleAES, string-conversions + }: + mkDerivation { + pname = "dsc"; + version = "0.2.0"; + sha256 = "04ym4b4rwn60knaamqdgw0jin889rghwv4i176z5m558g4jaai7g"; + libraryHaskellDepends = [ + base base64-bytestring bytestring SimpleAES string-conversions + ]; + testHaskellDepends = [ + base base64-bytestring bytestring hspec QuickCheck SimpleAES + string-conversions + ]; + homepage = "https://github.com/qoelet/dsc#readme"; + description = "Helper functions for setting up Double Submit Cookie defense for forms"; + license = stdenv.lib.licenses.mit; + }) {}; + "dsh-sql" = callPackage ({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring , bytestring-lexing, containers, Decimal, DSH, either, HDBC @@ -56709,7 +60042,7 @@ self: { mkDerivation { pname = "dsh-sql"; version = "0.2.0.2"; - sha256 = "a8e0b26973d9154517e973477fbe85d33d0e49c69b84266550dfdeb9dee22103"; + sha256 = "00r1wbgbkpnza1jjd14vqr4hwgfkhnz7yivkx4bla5frfdlv5q58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56735,7 +60068,7 @@ self: { mkDerivation { pname = "dsmc"; version = "0.1.0.1"; - sha256 = "45a9ff4df48bc5e887f41da37b03e96acaa637b777ec3a00cd004937fa12426d"; + sha256 = "0va22bx3fj80rl03mv3pnwvsdjkax41pp8qxyj3yiicbyi6zzaa5"; libraryHaskellDepends = [ attoparsec base bytestring containers entropy hslogger mwc-random parallel primitive repa strict transformers vector @@ -56752,7 +60085,7 @@ self: { mkDerivation { pname = "dsmc-tools"; version = "0.1.0.1"; - sha256 = "204badac3a0c1d2550c939f0c874a657b64ca5d9834505d069bc0dc7780b3e73"; + sha256 = "0wry1dwcf3dwd780aic3v6jlrdjplrsciw1rr582a78c7anasjr0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -56769,7 +60102,7 @@ self: { mkDerivation { pname = "dson"; version = "0.3.0.0"; - sha256 = "2d81d82fae1094ca89e098e94f28f8a196e7186d68f612fba92ad3808192f896"; + sha256 = "15pqja0q1lram7xi5xk8dlcfg5m1z0l4zscqw24wm50hmqpxi09d"; libraryHaskellDepends = [ base parsec ]; homepage = "https://github.com/lcycon/hs-dson"; description = "Haskell DogeScript Object Notation Parser"; @@ -56782,7 +60115,7 @@ self: { mkDerivation { pname = "dson-parsec"; version = "0.4.1.1"; - sha256 = "3ea53b41913dd9e0cc44c4000afb5377e7da78fd314363b5d6f77c0677fad4fd"; + sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y"; libraryHaskellDepends = [ base parsec ]; homepage = "https://github.com/alvare/dson-parsec"; description = "DSON parser"; @@ -56795,7 +60128,7 @@ self: { mkDerivation { pname = "dsp"; version = "0.2.3.1"; - sha256 = "d5c21c9bf0a7c40b4a7f1bfed04250251a770d3a3c1935ba0b358bc43191dda2"; + sha256 = "18nxj4qw92rm1fx3a69w786pf6i5a11d1zhvgx50pi57y2dirhnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base random ]; @@ -56810,7 +60143,7 @@ self: { mkDerivation { pname = "dstring"; version = "0.4.0.4"; - sha256 = "152b48970e4b4fdb0cf0c5ef53cda1e76dd82ea89e948a03eef020ed600bfe97"; + sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm"; libraryHaskellDepends = [ base base-unicode-symbols dlist ]; homepage = "https://github.com/basvandijk/dstring"; description = "Difference strings"; @@ -56825,7 +60158,7 @@ self: { mkDerivation { pname = "dtab"; version = "1.0.0.1"; - sha256 = "d696fd2a9019c9b4916831f88217f92f809dc4341b5ffc506f8e786d91bbe069"; + sha256 = "0sg0pf8nsy4fdx8gqpqv6k29v01gz4bq5y1id28v9j8rj0mgv5nn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56848,7 +60181,7 @@ self: { mkDerivation { pname = "dtd"; version = "1.1.0.2"; - sha256 = "d767ac62a1435a661d93bab3f0811ceccaf86fcdff64c66617369bc1bbae5887"; + sha256 = "11sqmsxw36rn2xkccr7zrmpzijpc3j0z1cxsjcfncnj3l5iaqryp"; libraryHaskellDepends = [ attoparsec attoparsec-conduit base blaze-builder conduit containers lifted-base monad-control network resourcet text transformers @@ -56867,7 +60200,7 @@ self: { mkDerivation { pname = "dtd-text"; version = "0.1.2.0"; - sha256 = "48ab2001214d9876a035c64ac66ecb919786539d5abbb930a9595d25ca7ffeb3"; + sha256 = "1czygz52aparm4qbkfsskm9qd5wirdpccjn66nh7d62d440j1as8"; libraryHaskellDepends = [ attoparsec base containers dtd-types text xml-types ]; @@ -56882,7 +60215,7 @@ self: { mkDerivation { pname = "dtd-types"; version = "0.3.0.1"; - sha256 = "4783851e854f163a863da519e371ba775edcdfee9c2cdcf21344d889568a56f0"; + sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7"; libraryHaskellDepends = [ base text xml-types ]; homepage = "http://projects.haskell.org/dtd/"; description = "Basic types for representing XML DTDs"; @@ -56895,7 +60228,7 @@ self: { mkDerivation { pname = "dtrace"; version = "0.1"; - sha256 = "393b9e0f3ed92d2b817ae162ad5478116d001ec8e05ddf3c65a0334029a45f63"; + sha256 = "0qszlhll0cx0clydypg0r0g00v8ig1aasqp1ga0jnbfr7q7rwfrr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -56910,7 +60243,7 @@ self: { mkDerivation { pname = "dtw"; version = "1.0.3.0"; - sha256 = "64bce3474a389a8227a7f1e5f9206b06856a488af8e534e7bb9c86590592b1f5"; + sha256 = "1xdij82mk1lwpgkk9rgqi946m186dchgkrgilwkq56iq993y7g34"; libraryHaskellDepends = [ base containers vector vector-space ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -56921,16 +60254,54 @@ 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 = "5e7d0abb471962df00c5adc53fa9a48f70c9695d5fdf225deecfa040116576a4"; - 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; }) {}; + "duckling" = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, bytestring + , containers, deepseq, dependent-sum, directory, extra, filepath + , hashable, haskell-src-exts, regex-base, regex-pcre, snap-core + , snap-server, tasty, tasty-hunit, text, text-show, time + , timezone-olson, timezone-series, unordered-containers + }: + mkDerivation { + pname = "duckling"; + version = "0.1.1.0"; + sha256 = "0c81cjah5iy3p2p9g4z1k0mxwg1256l93m53bnk7pr37439vwnx6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array attoparsec base bytestring containers deepseq + dependent-sum extra hashable regex-base regex-pcre text text-show + time timezone-series unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring directory extra filepath haskell-src-exts + snap-core snap-server text text-show time timezone-olson + timezone-series unordered-containers + ]; + testHaskellDepends = [ + aeson base tasty tasty-hunit text time unordered-containers + ]; + homepage = "https://github.com/facebookincubator/duckling#readme"; + description = "A Haskell library for parsing text into structured data"; + license = "unknown"; + }) {}; + "dump" = callPackage ({ mkDerivation, base, haskell-src-meta, hspec , interpolatedstring-perl6, QuickCheck, template-haskell, text @@ -56938,7 +60309,7 @@ self: { mkDerivation { pname = "dump"; version = "0.2.8"; - sha256 = "043eb0a2695b97df6a9feada6caf114561d4f26d46082d505fee51513be31c5c"; + sha256 = "0p0wwcxm2lgfbx82s226dprd8qa526pnrnpakxmdz5svd6ib0gh4"; libraryHaskellDepends = [ base haskell-src-meta interpolatedstring-perl6 template-haskell text @@ -56959,7 +60330,7 @@ self: { mkDerivation { pname = "dump-core"; version = "0.1.3"; - sha256 = "003fde9e29824a4dfc2523c29fefd873d4eae0c1e9a17547021aab5e738bd6c6"; + sha256 = "1innidrmxaqs093pb8g9q7hfmm3kv3przhi34py4sjl256gdwgq0"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath ghc monadLib text @@ -56973,7 +60344,7 @@ self: { mkDerivation { pname = "dunai"; version = "0.1.0.0"; - sha256 = "fa6908be1794caa9ad335f1acc92fd837c238a8f8dea9740dd875f212046500d"; + sha256 = "03ah8qh22pw7vm09gsldiy526z43zn9cq6jz6fnskjll2yz0hsgs"; libraryHaskellDepends = [ base transformers transformers-base ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -56991,7 +60362,7 @@ self: { mkDerivation { pname = "duplo"; version = "1.8.1"; - sha256 = "71106816e0d59f4e2e4cab27da8a47da5745ba07dae36d52e7f878aa0848c3cc"; + sha256 = "1k63904aly7qwx96vqys0yx4amys8y5dl9xb9hp4x7ymw0b6h43i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57024,7 +60395,7 @@ self: { mkDerivation { pname = "dustme"; version = "0.1.0.0"; - sha256 = "e0e9b1a28fef4f9b3230af437272661f3287cc13f8ddc0dd94f4177311ccaa69"; + sha256 = "0sdarh8p65zljkfw1pgq2g68fchzcrr74hxg60r9nkzgiyib3sg0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57048,7 +60419,7 @@ self: { mkDerivation { pname = "dvda"; version = "0.4"; - sha256 = "e87ac199fbfbe858913031525cf3c443b0cd8835364430d530d976fc6bdb0ae1"; + sha256 = "1q8avdmzqxnr63ak0i1n6n4cvc23qkrmqlii628mis7vzfcw2yp8"; libraryHaskellDepends = [ base containers hashable hashtables mtl unordered-containers vector ]; @@ -57067,7 +60438,7 @@ self: { mkDerivation { pname = "dvdread"; version = "0.1"; - sha256 = "1574e74c078841177b3ca2284e3742b628992d714ae1fb3d3183b34f72aab8d3"; + sha256 = "1lxqm9r4zcw364yzpqaaf4nrja5n88vlwa527ixifhc80x6ffx0m"; libraryHaskellDepends = [ base bytestring mtl ]; libraryPkgconfigDepends = [ dvdread ]; libraryToolDepends = [ c2hs ]; @@ -57081,7 +60452,7 @@ self: { mkDerivation { pname = "dvi-processing"; version = "0.3.1"; - sha256 = "8328acb050181a69e64aadcf102001554967da2e06aef56d41dad29d2b53e636"; + sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43"; libraryHaskellDepends = [ base bytestring filepath transformers ]; description = "Read/write DVI and TFM file"; license = stdenv.lib.licenses.publicDomain; @@ -57093,7 +60464,7 @@ self: { mkDerivation { pname = "dvorak"; version = "0.1.0.0"; - sha256 = "afc8ba89415a01039ccdc719b875826b6b12befb4a6a97bcd7544f22eaffb6cf"; + sha256 = "1kxnzzm24kslsyy9fsjazfz14svbh9svh6f7rnf060as864vmj5g"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/kvanberendonck/codec-dvorak"; @@ -57106,7 +60477,7 @@ self: { mkDerivation { pname = "dwarf"; version = "0.23"; - sha256 = "f4eb66aa1d9607bd3f5f4c1f30704a6aa79c0a2a3f2a3297c5e033240cfccb40"; + sha256 = "0h6bzh628cz0qnbk4aiz5859r9va99q307scbwzvs1wn3nm6dszl"; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for DWARF debug format"; license = stdenv.lib.licenses.bsd3; @@ -57119,7 +60490,7 @@ self: { mkDerivation { pname = "dwarf-el"; version = "0.2.1.1"; - sha256 = "3c24b3f26b2cde8837ac008c91691050b9c352fed93df9fcd3ab9f1af6006aa1"; + sha256 = "18ba03v1m7xbsgygjgfrzr9c7fah21lr3300mhvqipicdgrb691w"; libraryHaskellDepends = [ base binary bytestring containers transformers utf8-string ]; @@ -57134,7 +60505,7 @@ self: { mkDerivation { pname = "dwarfadt"; version = "0.4"; - sha256 = "1106b9c4bfc88dd4272c927f373a610bd341cb9091603e757ac061a1b4d9bf96"; + sha256 = "15mzv6sa2qf0g9skwq4ij35l3lqbc4x3fzwj5hkx93f8pz2bj1hi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57147,12 +60518,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dwergaz" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dwergaz"; + version = "0.2.0.0"; + sha256 = "02yp4z20sw1dm7dzi8gsp0qiziyaw1wqr9zgx47sr4cz071ibg8q"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/xngns/dwergaz"; + description = "A minimal testing library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dx9base" = callPackage ({ mkDerivation, base, Win32 }: mkDerivation { pname = "dx9base"; version = "0.1.1"; - sha256 = "71f8e2a11508bc6c1a3042d550268755970fe9c43e8bc54ed7e8c0e7faa5fc99"; + sha256 = "16gwlpxfgh78sx7cb2ryqklhz5smhwk51ma260d6rg082nhy5y3i"; libraryHaskellDepends = [ base Win32 ]; description = "Backend for a binding to the Microsoft DirectX 9 API"; license = stdenv.lib.licenses.bsd3; @@ -57164,7 +60548,7 @@ self: { mkDerivation { pname = "dx9d3d"; version = "0.1.1.1"; - sha256 = "325f9edb6cf6190d095824aa6ed29829c69ac4e8efeff2fecfd43ea9e4282ff9"; + sha256 = "1y9g53jajgnlrzzg5vzgx329mii9k396xai4b04hs6gndkdrwprj"; libraryHaskellDepends = [ base dx9base Win32 ]; librarySystemDepends = [ d3d9 ]; description = "A binding to the Microsoft DirectX 9 API"; @@ -57177,7 +60561,7 @@ self: { mkDerivation { pname = "dx9d3dx"; version = "0.1.1"; - sha256 = "c7b8bdb1950326178356bad5b845773a45a5a7bbbea9b98b4fb4bc300f5eb9d8"; + sha256 = "1n5rbq7k1g5l9y5vkadypfksai9sfx2vimdsas1if9h3jnqvvf67"; libraryHaskellDepends = [ base dx9base dx9d3d Win32 ]; librarySystemDepends = [ d3dx9 ]; description = "A binding to the Microsoft DirectX 9 D3DX API"; @@ -57185,6 +60569,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {d3dx9 = null;}; + "dyckword" = callPackage + ({ mkDerivation, ansi-terminal, base, exact-combinatorics, hspec + , text + }: + mkDerivation { + pname = "dyckword"; + version = "0.1.0.4"; + sha256 = "1904dy0f30jbv3b43vpkfsczr27xsfsnvmh21xhd9y4lvdah0rbr"; + libraryHaskellDepends = [ base exact-combinatorics text ]; + testHaskellDepends = [ ansi-terminal base hspec text ]; + homepage = "https://github.com/johanneshilden/dyckword#readme"; + description = "A library for working with binary Dyck words"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynamic-cabal" = callPackage ({ mkDerivation, base, containers, data-default, directory, doctest , filepath, ghc, ghc-paths, haskell-generate, haskell-src-exts @@ -57193,7 +60592,7 @@ self: { mkDerivation { pname = "dynamic-cabal"; version = "0.3.5"; - sha256 = "bcf32d088006ed4f69566bed68279119d4ee3c76ff3602157b1eeca12f1c793a"; + sha256 = "0fkr3hps3v0ygcah4dpzfqyfxm0rj4knivbbarllzv86h042vwxw"; libraryHaskellDepends = [ base containers data-default directory filepath ghc ghc-paths haskell-generate haskell-src-exts time void @@ -57215,7 +60614,7 @@ self: { mkDerivation { pname = "dynamic-graph"; version = "0.1.0.9"; - sha256 = "179f607c961865739ad0b6ba07d3e324473b4845d6173c0959e45e008b4f4a5d"; + sha256 = "0paa9y5h0pp4b44kq5yn8m43nir4wg9hgfmns2d76r8qjry617qp"; libraryHaskellDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes transformers @@ -57231,7 +60630,7 @@ self: { mkDerivation { pname = "dynamic-linker-template"; version = "0.1.1.0"; - sha256 = "1f9b2cb753c8cf649c08ca46a81d8e7dbf46d8be0a9962ced9c679530a3ef3a9"; + sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz"; libraryHaskellDepends = [ base containers template-haskell unix ]; homepage = "http://github.com/hsyl20/dynamic-linker-template"; description = "Automatically derive dynamic linking methods from a data type"; @@ -57246,7 +60645,7 @@ self: { mkDerivation { pname = "dynamic-loader"; version = "0.0.1"; - sha256 = "25a8b1552c12e36d72bbef11009ce55fa9410705b15f3f55467b38fe2e7327b2"; + sha256 = "1ci7fcpgwf3v8rakypxi0l3l3aazwnf004ggpdr6vqqj5iav3a15"; libraryHaskellDepends = [ base directory ghc-prim hashable hashtables time transformers ]; @@ -57259,8 +60658,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "dynamic-mvector"; - version = "0.1.0.4"; - sha256 = "a36fc29ba4b91d52beb1f2df6ba8a837c6f112ef31358b20f5d0056f20d788a6"; + version = "0.1.0.5"; + sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2"; libraryHaskellDepends = [ base primitive vector ]; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; @@ -57275,7 +60674,7 @@ self: { mkDerivation { pname = "dynamic-object"; version = "0.2.1"; - sha256 = "8bbaad97cfa7d31507accfdf12ed9ef8c4a88f8101c14b8da9086c829be6f2f7"; + sha256 = "1xzjwsdq4v08m66lph81h67sii7qkvni5pygmh3iblx7rybsvflb"; libraryHaskellDepends = [ base containers lens mtl QuickCheck text transformers ]; @@ -57298,7 +60697,7 @@ self: { mkDerivation { pname = "dynamic-plot"; version = "0.2.2.0"; - sha256 = "7f04a719fd74874eab8f362443ebdac8ad9caffd6271f72a8904f4723a2a9cf0"; + sha256 = "1w4w58x75x04i4mgfwb2znprrbf8vbml691niymlx1vlzlcsf13z"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -57320,7 +60719,7 @@ self: { mkDerivation { pname = "dynamic-pp"; version = "0.2.0"; - sha256 = "adad65d29f722f34b4c49764b0ec766f8996dd5121024f628fe15ad607d5c90f"; + sha256 = "03y9sl3xcnp1ixi4y0i1a7frd2bgfvnb0r4pqjs38bvjkz96bbdd"; libraryHaskellDepends = [ ansi-terminal base blaze-builder bytestring Cabal hashable unordered-containers utf8-string @@ -57342,7 +60741,7 @@ self: { mkDerivation { pname = "dynamic-state"; version = "0.2.2.0"; - sha256 = "48834fa08130e614764b8d675d0c98866c53425a4c50a0333d7ce21a7c1ac7cf"; + sha256 = "1ky739y1mqkw7lrs0l2cb9156v46k065srwd9dv19rihh6h4z0s8"; libraryHaskellDepends = [ base binary bytestring hashable unordered-containers ]; @@ -57361,7 +60760,7 @@ self: { mkDerivation { pname = "dynamodb-simple"; version = "0.4.0.0"; - sha256 = "62a0361b19d0929a95d1821f8214aa44a87b7ffe1e0405abd84b4f81fc16ca79"; + sha256 = "0yfa2vy82ksbv2mha10yzrzppa24m8a847w2s6arm4nh34dkd832"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop @@ -57391,7 +60790,7 @@ self: { mkDerivation { pname = "dynobud"; version = "1.9.1.0"; - sha256 = "3995a1186ca493ae30fc38b72fbfa49b8f4b5858e266a9b6b24135267deedde5"; + sha256 = "1rfxxryjcda1navajrp2b1c4p3wvljzjzdrqzhqax4x4dhca359r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57418,7 +60817,7 @@ self: { mkDerivation { pname = "dyre"; version = "0.8.12"; - sha256 = "e224305cc6b38b4143f49489931c2ea94b326915206d34eddf5b2ee2b5a71682"; + sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972"; libraryHaskellDepends = [ base binary directory executable-path filepath ghc-paths io-storage process time unix xdg-basedir @@ -57433,7 +60832,7 @@ self: { mkDerivation { pname = "dywapitchtrack"; version = "0.1.0.1"; - sha256 = "ee7d3dab776e190aa16c9403580597e5128ca7f32837a0dd5d75b377bd42b6ba"; + sha256 = "1fmn8aypgcvmbpfs0dr8yfkqq4p5jw2mh0wldjhhl6bffymkszgf"; libraryHaskellDepends = [ base bytestring transformers ]; description = "Bindings to the dywapitchtrack pitch tracking library"; license = stdenv.lib.licenses.mit; @@ -57445,7 +60844,7 @@ self: { mkDerivation { pname = "dzen-utils"; version = "0.1.1"; - sha256 = "c0e98d2d6f0ee80e3abac8987eb5885874ab9eb2b91cd64ce3cd5705883e4417"; + sha256 = "05s47s40amydwd6dc75rnaganx2qi2spx668p8x0xs0fdwnqvsf0"; libraryHaskellDepends = [ base colour process ]; description = "Utilities for creating inputs for dzen"; license = "GPL"; @@ -57457,7 +60856,7 @@ self: { mkDerivation { pname = "each"; version = "1.1.0.0"; - sha256 = "b4935754b33a1078e7ad652c321cd610071ae2c6a37e5812f5f9fc3a0dc2077a"; + sha256 = "0yh7q86kmz7ryl95hzm3qvi1l1qhsqf34b35mpkph41snda5g4xl"; libraryHaskellDepends = [ base dlist template-haskell ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/dramforever/each#readme"; @@ -57470,9 +60869,9 @@ self: { mkDerivation { pname = "eager-sockets"; version = "0.1"; - sha256 = "abbd5f7565685d756de895600b3f977863e56abd2a6dbda9b90a710841e1e881"; + sha256 = "10g8w50hhw8ap6lvsv9apmmfaqvqjwzhnq4mx1npapb8cmsmzgdb"; revision = "1"; - editedCabalFile = "2bf99bcdc9b979fbe9394e8b77bd1fa9b713da8e04981939cb0ae41b0b2a1963"; + editedCabalFile = "0qqr585ipr0arcwik604ivd17dx93yypg2sf77lznydrr76rpy9b"; libraryHaskellDepends = [ base bytestring network ]; description = "Socket operations with timeouts"; license = "unknown"; @@ -57484,7 +60883,7 @@ self: { mkDerivation { pname = "earclipper"; version = "0.0.0.1"; - sha256 = "9f0adbe9e9520657a1af71f45b7b0476447ab8466664ddfcb83e0e31394e6615"; + sha256 = "05b69qwk23iyp3ydsr368sw7li3n0ixmpx3imyhmf1jjx7lxn2lz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -57496,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 @@ -57503,7 +60913,7 @@ self: { mkDerivation { pname = "easy-api"; version = "0.1.0.0"; - sha256 = "2bd01b47d430c6eacd7842709866467a386282fcee012305732f2502cfda0432"; + sha256 = "0ch4vb7h499gfc2j60gfzj164f3s8rk9hw22g36ymiihsi3ipl1b"; libraryHaskellDepends = [ aeson base bytestring either http-conduit mtl resourcet text ]; @@ -57521,7 +60931,7 @@ self: { mkDerivation { pname = "easy-bitcoin"; version = "0.0.0.2"; - sha256 = "3b20ddd3f268e379bcf2a5c07f70de88ad5d936b59743caad10403f0e932f7b5"; + sha256 = "1dgp6blz00q4s6m3qx2rdf9mvbc8vrq7zh55yay7kqv8yb9xs81v"; libraryHaskellDepends = [ aeson base base16-bytestring binary byteable bytestring cryptohash deepseq lens postgresql-simple safe text @@ -57536,7 +60946,7 @@ self: { mkDerivation { pname = "easy-file"; version = "0.2.1"; - sha256 = "ff86e1b29284499bea5f1d0ff539b3ed64fa6d1a06c2243ca61f93be0202e56c"; + sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz"; libraryHaskellDepends = [ base directory filepath time unix ]; homepage = "http://github.com/kazu-yamamoto/easy-file"; description = "Cross-platform File handling"; @@ -57550,7 +60960,7 @@ self: { mkDerivation { pname = "easyjson"; version = "0.1.0.1"; - sha256 = "e2e9f5f68b94b89e766bc47bf81b0006a47852f524dde1960cf30ed6012686a4"; + sha256 = "19464q0xc3pk1jbf3p94ym97i90600dzhyy4ddv9xf4ligvgbsg2"; libraryHaskellDepends = [ base mtl parsec text unordered-containers vector ]; @@ -57565,7 +60975,7 @@ self: { mkDerivation { pname = "easyplot"; version = "1.0"; - sha256 = "1347b6a5d9a4eb01a4db858dcbf347fd056f423dd719f5dc955709d9f66b76a2"; + sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk"; libraryHaskellDepends = [ base process ]; homepage = "http://hub.darcs.net/scravy/easyplot"; description = "A tiny plotting library, utilizes gnuplot for plotting"; @@ -57579,9 +60989,9 @@ self: { mkDerivation { pname = "easyrender"; version = "0.1.1.2"; - sha256 = "303d5f310105be9afd27382134ff4d7802a899f980192953f46a9602ae2aa616"; + sha256 = "05m65ap055kayi9jj6c0z6csh0kq9pzk889q4zyrmgh504qmyg9h"; revision = "1"; - editedCabalFile = "26ce39b96e803d7176fd787298a8dd123f80bc67165bddda9bbb722dfa4bfd3e"; + editedCabalFile = "0gpx9gx2swmvkgddsnqncyy80gqjvnl9hwkqzmv72gc0dswkkki6"; setupHaskellDepends = [ base superdoc ]; libraryHaskellDepends = [ base bytestring containers mtl superdoc zlib @@ -57593,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 = "7ff2225d2081f0151f64cc53cea036f02188e278ba005b1e561e0d1701f0b031"; - 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" ]; }) {}; @@ -57614,7 +61024,7 @@ self: { mkDerivation { pname = "ebeats"; version = "0.1.0"; - sha256 = "13978e3478583df04499345586b124eb1ec200ec219d71b9532ee7ee86a17764"; + sha256 = "0r3pl63fxrrfafwp3791xh0c47pb4jqqcm9lk52g0gaqg0s8x5qk"; libraryHaskellDepends = [ base time ]; description = "Time in ebeats"; license = stdenv.lib.licenses.bsd3; @@ -57628,7 +61038,7 @@ self: { mkDerivation { pname = "ebnf-bff"; version = "0.1.1.0"; - sha256 = "683ce685b605b83feb795ec3a832e4e83c284ad7daa0bb8cb2a7d9c96bd27d80"; + sha256 = "103xs9mwknd7na6bp86ssx52hg78whraihsyg7mkzf05ns2ycg38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base parsec text ]; @@ -57647,7 +61057,7 @@ self: { mkDerivation { pname = "ec2-signature"; version = "3.1"; - sha256 = "e019622a3b773407757aaf215cc3a07029476a95583a6a473658544794f8fefb"; + sha256 = "1yzyz2a4fm2q6r3nlfjqjmm4fabhl31mq8dgg9shfd3p7cm646g0"; libraryHaskellDepends = [ base base64-bytestring bytestring http-types SHA ]; @@ -57668,7 +61078,7 @@ self: { mkDerivation { pname = "ec2-unikernel"; version = "0.9.2"; - sha256 = "61485223a42a58d52045c2a44ec7c125f636246cb6152548e706192aae6cde0a"; + sha256 = "02nydjp2l686wx42a5dndhj3dxi5q73lx9628lhdan1alhim4j31"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57687,7 +61097,7 @@ self: { mkDerivation { pname = "eccrypto"; version = "0.0.1"; - sha256 = "fd4adad1c85bbe1b001aef804584d87b7daadba2aa7310a319e59cc616a79cc9"; + sha256 = "1jcwlwbcd77536ii0wxalbdslzbvv224b07g3801pgjvr38xljpx"; libraryHaskellDepends = [ base bytestring cereal crypto-api SHA vector ]; @@ -57702,7 +61112,7 @@ self: { mkDerivation { pname = "ecdsa"; version = "0.2"; - sha256 = "16095f715c1fd26bb2381c0d9d147f1c0f6f1e65a99f8517e655baaf73aa008c"; + sha256 = "1300m9rszfjmwqbqb7x9clg6y3qwgwa9s38w72r6plhzbiqmy28n"; libraryHaskellDepends = [ base bytestring crypto-api crypto-pubkey-types hecc ]; @@ -57717,7 +61127,9 @@ self: { mkDerivation { pname = "echo"; version = "0.1.3"; - sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef"; + sha256 = "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh"; + revision = "1"; + editedCabalFile = "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -57733,7 +61145,7 @@ self: { mkDerivation { pname = "ecma262"; version = "0.0.0"; - sha256 = "f5216829a58e8490c074b4befc2a9cc34402d3c8f234107cc07d4afc9a2a71c3"; + sha256 = "1hvi5adgqjkxq1y10d7jr39h4i63khmgrgmlfk09114flllnh8gm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57753,7 +61165,7 @@ self: { mkDerivation { pname = "ecu"; version = "0.0.8"; - sha256 = "9203ab55db7e001e65286082a60b0cf6118e8b90dceffa93f0c25fee0f28cba9"; + sha256 = "1afb507ywpy2y29zmvywj25qw4gn1h5sd0k051jiw03yvdasn0wj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57772,9 +61184,9 @@ self: { mkDerivation { pname = "ed25519"; version = "0.0.5.0"; - sha256 = "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d"; + sha256 = "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"; revision = "2"; - editedCabalFile = "2e051ab9d98bc22e0c4afe09e763d3e8e0571ea51a3ae952db33ac89e58006b3"; + editedCabalFile = "1cq6h3jqkb1kvd9fjfhsllg5gq78sdiyf2gy9862xhlbv6wil19f"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring directory doctest filepath hlint QuickCheck @@ -57790,7 +61202,7 @@ self: { mkDerivation { pname = "ed25519-donna"; version = "0.1.1"; - sha256 = "6ddb25e72cb18b18e70ab9727a028c26acb0ffaa9dafafb42821c9f81d81f84e"; + sha256 = "0kpqh4fzij9152sazbwxmbzv1b16ih17lwmr1bkii2xi5kkjbnvd"; libraryHaskellDepends = [ base bytestring crypto-api ]; homepage = "github.com/tommd/hs-ed25519-donna"; description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)"; @@ -57804,7 +61216,7 @@ self: { mkDerivation { pname = "eddie"; version = "1.0.0"; - sha256 = "bd7f3cd868a32738e650f74c0a78f1f761ce742e35aa946ceb750c7a9bea02ff"; + sha256 = "1zq2xadpl33mxdn99aim5rscwqgpy5w0lk7pa3k3h9x3d3c3qzxx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57826,7 +61238,7 @@ self: { mkDerivation { pname = "ede"; version = "0.2.8.7"; - sha256 = "8b6be46bb0ef2b6503124fb1ae63c26e377013686fbb19ddd0ffeec3d3365e0a"; + sha256 = "02jy6v9w7vpzs3fikfvgd09p0dvfq9isxcag281naazgn1my8swb"; libraryHaskellDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory double-conversion filepath free lens mtl parsers scientific @@ -57846,7 +61258,7 @@ self: { mkDerivation { pname = "edenmodules"; version = "1.2.0.0"; - sha256 = "b2532f00ead8fe8198c6208d72da43b4a5366ecaa8ad2828f359704dd3d26af1"; + sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj"; libraryHaskellDepends = [ base containers deepseq parallel ]; homepage = "http://www.mathematik.uni-marburg.de/~eden"; description = "Semi-explicit parallel programming library"; @@ -57859,7 +61271,7 @@ self: { mkDerivation { pname = "edenskel"; version = "2.1.0.0"; - sha256 = "38c9f12163d2a58d429d8f0064b502b7da35095a6889170340ca38d203ffc5ad"; + sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q"; libraryHaskellDepends = [ base edenmodules parallel ]; description = "Semi-explicit parallel programming skeleton library"; license = stdenv.lib.licenses.bsd3; @@ -57874,7 +61286,7 @@ self: { mkDerivation { pname = "edentv"; version = "4.10.0"; - sha256 = "6258569b18219f897ce62c9494ac4e707ea190aefd90f4cda914d53d8ada6c4a"; + sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57894,7 +61306,7 @@ self: { mkDerivation { pname = "edge"; version = "0.9.1.1"; - sha256 = "8055258fe8230dec8574b7b37153b3e54efb29600492465f8024bea6cf9c7c7f"; + sha256 = "0zvwkk7sdgi4h1gld4h4c0lznkp5nd9p3cxpfj2yq393x27jamc0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57911,7 +61323,7 @@ self: { mkDerivation { pname = "edis"; version = "0.0.1.0"; - sha256 = "b21590a3ce7cc3314e9cf4b5bfba0f4997f050fe2087ab4b1852554914b6f6af"; + sha256 = "1bznnqa4jmaj315sp1r0zr8g15s91yxbzdglki733hvwrsir05dj"; libraryHaskellDepends = [ base bytestring cereal hedis ]; description = "Statically typechecked client for Redis"; license = stdenv.lib.licenses.mit; @@ -57925,9 +61337,9 @@ self: { mkDerivation { pname = "edit-distance"; version = "0.2.2.1"; - sha256 = "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a"; + sha256 = "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y"; revision = "1"; - editedCabalFile = "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"; + editedCabalFile = "1vjn4ryzdilz7l1ad7czh11nw48h5mj8if7ij3q0mmc3sffa8csd"; libraryHaskellDepends = [ array base containers random ]; testHaskellDepends = [ array base containers QuickCheck random test-framework @@ -57946,7 +61358,7 @@ self: { mkDerivation { pname = "edit-distance-vector"; version = "1.0.0.4"; - sha256 = "b7dfddd86d315ef1b0c86415f321efc04b4a1b47a7b13edafc73a6e81b620f1f"; + sha256 = "07qgc8dyi9kkzkd3xcd78wdlljy0xwhz65b4r2qg2piidpcdvpxp"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck quickcheck-instances vector @@ -57961,7 +61373,7 @@ self: { mkDerivation { pname = "edit-lenses"; version = "0.2"; - sha256 = "ca531695a14a2bb8e8e952ed401e4eefe1e6c48b5dfde5804ee76034705e37db"; + sha256 = "1nrpbrq38q779s0fbzaxig2fdqgg9qg41vajx7lbhasal6aiclya"; libraryHaskellDepends = [ base containers data-default lattices mtl ]; @@ -57975,7 +61387,7 @@ self: { mkDerivation { pname = "edit-lenses-demo"; version = "0.1.1"; - sha256 = "54ea931564d6bc92a6f6d6faf0202036f3fc5224c720b30ae9d2891015c9a474"; + sha256 = "0x54r4ai12fjx45b68674i9grwrn40hg1ynnysk95g6nchar7sjl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -57988,7 +61400,7 @@ self: { mkDerivation { pname = "editable"; version = "1.0.0.2"; - sha256 = "b17b208bb6fd39d62a90091640b39270fd0d24cd9bcc6f47f3a8f511d2025f96"; + sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi"; libraryHaskellDepends = [ base text vty vty-ui ]; homepage = "https://github.com/maxpow4h/editable"; description = "Interactive editors for Generics"; @@ -58001,7 +61413,7 @@ self: { mkDerivation { pname = "editline"; version = "0.2.1.1"; - sha256 = "9fb64f89a38ad847de7d3537e9dff75d8fcebd12fc789a175cc892a0e4873f80"; + sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/editline"; description = "Bindings to the editline library (libedit)"; @@ -58016,7 +61428,7 @@ self: { mkDerivation { pname = "editor-open"; version = "0.6.0.0"; - sha256 = "2fc5d19bce2d477935202a5a4522671529d0352a0ee28be1307f8ab391065265"; + sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58038,7 +61450,7 @@ self: { mkDerivation { pname = "editpipe"; version = "0.1.0.0"; - sha256 = "3a86d0e015ddd64c21516d4095d1cdf32d7b7f0bc7d9b8150995471519d37b0f"; + sha256 = "03vvscciaiwm14avinf71dzpnbgkrp8rah3da4hlrmnx2phd11is"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58056,7 +61468,7 @@ self: { mkDerivation { pname = "effect-handlers"; version = "0.1.0.8"; - sha256 = "2439a77b6ec8db236fc2809cb91219305a7071c72bfd68de795e01b3df9aa80c"; + sha256 = "0358kbgv60ayg7g6iz9bqxqp0nih349bk740q9pj7ny8drxsff94"; libraryHaskellDepends = [ base free kan-extensions mtl ]; testHaskellDepends = [ base hspec hspec-discover HUnit QuickCheck @@ -58072,7 +61484,7 @@ self: { mkDerivation { pname = "effect-monad"; version = "0.7.0.0"; - sha256 = "de9dbb8ee23595510e3674f090a1e066308f64174ef03dd99a5c75070d825416"; + sha256 = "05jlh86hfxawkbckvw2f2xj8yc36w2hr1w3l6q75359mwa7bp7fy"; libraryHaskellDepends = [ base type-level-sets ]; description = "Embeds effect systems into Haskell using graded monads"; license = stdenv.lib.licenses.bsd3; @@ -58087,7 +61499,7 @@ self: { mkDerivation { pname = "effective-aspects"; version = "0.1.0.0"; - sha256 = "5108cc8d15fea847499715e9de91ea19d7d56b03b5017115c415719458fb8c41"; + sha256 = "0hcczdc98w8mqhap20dm0dmxbmqrxa8xxs8mjx4lga7y2n6wq22i"; libraryHaskellDepends = [ base ghc-prim hashtables HUnit mtl QuickCheck ]; @@ -58109,7 +61521,7 @@ self: { mkDerivation { pname = "effective-aspects-mzv"; version = "0.1.0.1"; - sha256 = "723270ebcdccb379d3f03d89354aa56524b0e4939ad5142808ce46349c7db10e"; + sha256 = "03mignf38inf10l19mcsjgjb0935lm53b29xy39pkcycrpmp0ckj"; libraryHaskellDepends = [ base ghc-prim hashtables HUnit mzv QuickCheck ]; @@ -58128,7 +61540,7 @@ self: { mkDerivation { pname = "effects"; version = "0.2.3"; - sha256 = "80c116525a7aa51a779614dfb75f945954e1509eb424dbbf14fc0b1bf4a7959c"; + sha256 = "174mlzs1n2zw2jzxn95lkr8f2m2rjigvgpqljrvim9bsb991dhc0"; libraryHaskellDepends = [ base containers newtype-generics void ]; homepage = "http://github.com/sjoerdvisscher/effects"; description = "Computational Effects"; @@ -58140,7 +61552,7 @@ self: { mkDerivation { pname = "effects-parser"; version = "0.1"; - sha256 = "d914227168a339f3c24253aeb5f1316860c519e51428912d5102bc5952a3526e"; + sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r"; libraryHaskellDepends = [ base effects ]; homepage = "http://github.com/nybble41/effects-parser"; description = "Parser Effect for the Control.Effects Library"; @@ -58152,7 +61564,7 @@ self: { mkDerivation { pname = "effin"; version = "0.3.0.2"; - sha256 = "dd09e453c57987990865d8ff3b5e8ff26035a6087a31b5ecb4d1c3dfd785f014"; + sha256 = "057hhpbxzhyinknbacbs12k3aq7jixg3pzyqcl49k1vrqm9y82fx"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/YellPika/effin"; description = "A Typeable-free implementation of extensible effects"; @@ -58162,21 +61574,21 @@ self: { "egison" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq - , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit - , monad-parallel, mtl, parsec, process, random, regex-tdfa - , test-framework, test-framework-hunit, text, transformers - , unordered-containers, vector + , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit, mtl + , parallel, parsec, process, random, regex-tdfa, test-framework + , test-framework-hunit, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "egison"; - version = "3.6.4"; - sha256 = "8900413b3f0e42c0907bec37dfd2ed0d2f6c618836ea6054615a786ff4fcf5f3"; + version = "3.6.5"; + sha256 = "1fdlpk51y9ddwj5nky0k7shxm1z2nv0l3xfbfgmjcq44xc5wpzsn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers directory ghc ghc-paths haskeline - monad-parallel mtl parsec process random regex-tdfa text - transformers unordered-containers vector + array base containers directory ghc ghc-paths haskeline mtl + parallel parsec process random regex-tdfa text transformers + unordered-containers vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline @@ -58200,7 +61612,7 @@ self: { mkDerivation { pname = "egison-quote"; version = "0.2"; - sha256 = "f3b9aa2463787bd8c60919c3717ef2d3593fa743e3b3a2ed11155d4af28eabe2"; + sha256 = "1qmbivr4lp8m27ns5cz38fkkynfky9z73hqr173dhyvqccjamfgk"; libraryHaskellDepends = [ base egison mtl parsec template-haskell ]; @@ -58218,7 +61630,7 @@ self: { mkDerivation { pname = "egison-tutorial"; version = "3.6.2"; - sha256 = "b1dc21a80daacb240ad339bfcd895ee7e10f41560b14566766e168ab4606a2c0"; + sha256 = "1h520r3ans71crkmc50bar0hzqg7bs4wvgrrsc529jxa1nl23p5i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58238,7 +61650,7 @@ self: { mkDerivation { pname = "ehaskell"; version = "0.7"; - sha256 = "d2d69a10153f445857fb893b7b868dd138d0c0948efbb77cf0b8f89e2910f234"; + sha256 = "0d7j20lrxy5qy1ybgywfjk0d0f6iin37nfw9zdbmhi1z2l89mmnj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58258,9 +61670,9 @@ self: { mkDerivation { pname = "ehs"; version = "0.7.0"; - sha256 = "3d84485f15b876982c857a57e6e0fec85417c85eddd6b6f4344b3db30f8b934d"; + sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; revision = "3"; - editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; + editedCabalFile = "08l28ncsvjmic0pf29rcgzpp20smbmhcvarhwdhqx1mk0kkajzp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58280,9 +61692,9 @@ self: { mkDerivation { pname = "eibd-client-simple"; version = "0.0.4"; - sha256 = "2d18369ff6fddd45c19fb030cc7d1884e707c90aa1a1e89f74dd786c3f54dd92"; + sha256 = "14nxahznqy6xfjgyi8d11b4hgrw431ywqc5hkz0lbpgxysgkc61d"; revision = "1"; - editedCabalFile = "5154a0f9083521b4c60cee92f2614b253961fd1e2dd9e7c5b541630df8597d80"; + editedCabalFile = "103xb7w0sqs1np2ygn9d3vyn2f959dhz54pf1k3b889m13ws0m2i"; libraryHaskellDepends = [ base bytestring containers mtl transformers ]; @@ -58299,7 +61711,7 @@ self: { mkDerivation { pname = "eigen"; version = "2.1.6"; - sha256 = "dffdac84c2d3495f08d117765d499087454c96d526f375f85952ab7b40920709"; + sha256 = "0287j907pasjb7w7bwr6snb4qic7j14msxhps445yjfkqa2arzfz"; libraryHaskellDepends = [ base binary bytestring primitive transformers vector ]; @@ -58319,9 +61731,9 @@ self: { mkDerivation { pname = "either"; version = "4.4.1.1"; - sha256 = "b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3"; - revision = "1"; - editedCabalFile = "3276aff42f5ede169a424cdfbb69ae3ca7d9d4f95996e679c2d9ea1dae939db1"; + sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh"; + revision = "2"; + editedCabalFile = "1n7792mcrvfh31qrbj8mpnx372s03kz83mypj7l4fm5h6zi4a3hs"; libraryHaskellDepends = [ base bifunctors exceptions free mmorph monad-control MonadRandom mtl profunctors semigroupoids semigroups transformers @@ -58337,7 +61749,7 @@ self: { mkDerivation { pname = "either-unwrap"; version = "1.1"; - sha256 = "ccabd6f87118abc8dcba481b316c76b8195ac9e8a8f3ddb478de5eb64e2d2e3c"; + sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/gcross/either-unwrap"; description = "Functions for probing and unwrapping values inside of Either"; @@ -58349,7 +61761,7 @@ self: { mkDerivation { pname = "eithers"; version = "0.2.0"; - sha256 = "85e8f7b102565ace08fb9fba477de8b960ba782345d68839e241c3e7171e3c19"; + sha256 = "069w3qbyghs1w8wqimj54dwblq5rx1ylgflzzc4cwnjn0aqzgs45"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -58362,8 +61774,8 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.0.12"; - sha256 = "f30e8c1e76410c3c76ec8cf59f0e1a381a83d302c02b5a95049238aa50eb9844"; + version = "0.4.0.13"; + sha256 = "13xlggjcfmp8hr8sz74r0xms36rrfa86znazy2m6304dgscdbca4"; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core snap-server text time transformers unordered-containers @@ -58382,7 +61794,7 @@ self: { mkDerivation { pname = "ekg-bosun"; version = "1.0.8"; - sha256 = "8a12b4ee452e708e0e345963487341c48bf1936aabc47eef2e8b2efd69771b78"; + sha256 = "0y0vfxlzsblb5vppxi5bda9z32y485rlhqsr6h78ww1f8ppb84la"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -58399,7 +61811,7 @@ self: { mkDerivation { pname = "ekg-carbon"; version = "1.0.7"; - sha256 = "4dc63dc6fa6305a601152fa1a4f8e41f4d519e53967940bbc8565baf09b450a3"; + sha256 = "18shnh4synsnr2xl0ycnafg52k8zwkwa989g2l0sc1b3zb33vijd"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -58417,7 +61829,7 @@ self: { mkDerivation { pname = "ekg-cloudwatch"; version = "0.0.1.4"; - sha256 = "7e086bce6889e5355f15694ab9158ef584aed6060017428fc67e78b302cbe600"; + sha256 = "0076rc1b6y3yqs7l45q00vbax17miqavjjk92mgkbrc9d376n23y"; libraryHaskellDepends = [ amazonka amazonka-cloudwatch base ekg-core lens text time unordered-containers @@ -58438,7 +61850,7 @@ self: { mkDerivation { pname = "ekg-core"; version = "0.1.1.1"; - sha256 = "54de3df4b1b027aa2f3760b64f6a8c8134f3275b6d95bf1cf1fc0e74282939d6"; + sha256 = "1mir54l783pwy4fbz5bdbckz6d41iim4zdk06wpsl9xhn7s3vpjl"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -58448,6 +61860,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-elastic" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname + , http-client, lens, text, time, unordered-containers, wreq + }: + mkDerivation { + pname = "ekg-elastic"; + version = "0.2.2.0"; + sha256 = "06cfinya56nwwsa7990l20s427ksqva61dp4m7xffn2xqvmy48df"; + libraryHaskellDepends = [ + aeson base bytestring ekg-core hostname http-client lens text time + unordered-containers wreq + ]; + homepage = "https://github.com/cdodev/ekg-elastic"; + description = "Push metrics to elastic"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ekg-elasticsearch" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname + , http-client, lens, text, time, unordered-containers, wreq + }: + mkDerivation { + pname = "ekg-elasticsearch"; + version = "0.3.1.1"; + sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q"; + libraryHaskellDepends = [ + aeson base bytestring ekg-core hostname http-client lens text time + unordered-containers wreq + ]; + homepage = "https://github.com/cdodev/ekg-elasticsearch"; + description = "Push metrics to elasticsearch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ekg-influxdb" = callPackage ({ mkDerivation, base, clock, containers, ekg-core, libinfluxdb , text, time, unordered-containers, vector @@ -58455,7 +61901,7 @@ self: { mkDerivation { pname = "ekg-influxdb"; version = "0.1.0.0"; - sha256 = "8512eb20523c3b21811a3f61ab53ff91bfefdc8edea223bb9d9969a59c3935a4"; + sha256 = "191m76faascrknxj78nyivffzgwizx9snq9z3a0j2frwa8hfn4l5"; libraryHaskellDepends = [ base clock containers ekg-core libinfluxdb text time unordered-containers vector @@ -58470,8 +61916,8 @@ self: { }: mkDerivation { pname = "ekg-json"; - version = "0.1.0.4"; - sha256 = "6afc7c146e4891824bb672af94ef3cade56ebf17cc51a3ca9ffdd2ce4345e479"; + version = "0.1.0.5"; + sha256 = "0ml5pqp918k2zgpw10sjn0nca0ivzb871zxcg73samm1aypfrm8c"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -58487,7 +61933,7 @@ self: { mkDerivation { pname = "ekg-log"; version = "0.1.0.4"; - sha256 = "10827eaf0ba809fe1ea2f05e2a31e584f19354982436af8b73a2d7b422dbfbed"; + sha256 = "1vgvvcib9mx2ff5sydi4k1a97wc4wlqjlpphl8ggw2d81fppx0hh"; libraryHaskellDepends = [ aeson base bytestring directory ekg-core fast-logger filepath text time unix unordered-containers @@ -58505,7 +61951,7 @@ self: { mkDerivation { pname = "ekg-prometheus-adapter"; version = "0.1.0.3"; - sha256 = "4dc997621c16c704a2cb19629385c76d7736f6e0bff1400cc1a83d5fd65f724a"; + sha256 = "0jkjbzb5ygd8q4641wdzw3v3cxvdqy2r6qhrrfi09iqn3ii9gjad"; libraryHaskellDepends = [ base containers ekg-core microlens-th prometheus text transformers unordered-containers @@ -58523,7 +61969,7 @@ self: { mkDerivation { pname = "ekg-push"; version = "0.0.3"; - sha256 = "be683041cb6935aa194a9d241b5f11c2038b7056884fbc0a10ec1f148706b7fb"; + sha256 = "1yxp0s3i87zc205bqkw8arq8n0y225gin94x98csldb9rd0k0s5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58543,7 +61989,7 @@ self: { mkDerivation { pname = "ekg-rrd"; version = "0.2.1.69"; - sha256 = "7910a7b02c6f0e3137469f948b096a90c63f0234f9b24c928d85622f2107579c"; + sha256 = "172p0whjyql5in94rcpr6h13zilhd84qp54z8qvk23kg5jqaf43r"; libraryHaskellDepends = [ base directory ekg-core mtl process text time unordered-containers ]; @@ -58564,7 +62010,7 @@ self: { mkDerivation { pname = "ekg-statsd"; version = "0.2.1.0"; - sha256 = "d042792757f603a8b6d176ed04802b3c4f27079e90bc1ba9b78ea83a666d7711"; + sha256 = "04bpdmk3ma4fnylipg4hkq3jfkrw5f009vbns6vah0znawkpjhnh"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -58580,8 +62026,8 @@ self: { }: mkDerivation { pname = "ekg-wai"; - version = "0.1.0.0"; - sha256 = "48a7e64ac613caf2eea1db79a20785d66552ea0f6943941468b0b6e44dfa7798"; + version = "0.1.0.1"; + sha256 = "14vl5k7jq7p7fiwj9rbw3ng7j8cagydpw7zvf8qxbwxdz9xr655q"; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath http-types network text time transformers unordered-containers wai wai-app-static warp @@ -58596,7 +62042,7 @@ self: { mkDerivation { pname = "electrum-mnemonic"; version = "0.1.3"; - sha256 = "c05e2ddd4b18a0f8202e523032ed8cacd3cd57549c533154fb0bbc604b27aaf6"; + sha256 = "1xma4x5n1g0bzda32lwwaibwvlxciknk4c2j5qhgi80q9gfjspn0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; @@ -58604,13 +62050,26 @@ 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 }: mkDerivation { pname = "elerea"; version = "2.9.0"; - sha256 = "901221660b32597803b20fe2e78bb6f1f60f064d04671fb3f0baa05c87446681"; + sha256 = "10b68j3mr85sy2riyrq49l30zxpins5ygqhgn81phn9j1dk224lh"; libraryHaskellDepends = [ base containers transformers transformers-base ]; @@ -58623,7 +62082,7 @@ self: { mkDerivation { pname = "elerea-examples"; version = "2.9.0"; - sha256 = "8486b5458a3a176c2c558d7a0c639caacc27192e45711f12b0863e06b1ae9d36"; + sha256 = "0dlxmsqhcgl6n091ywa55qcjgk5akiihqyldaln6q5rsi92vb1l4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base elerea GLFW OpenGL ]; @@ -58636,7 +62095,7 @@ self: { mkDerivation { pname = "elerea-sdl"; version = "0.1.1"; - sha256 = "66e8885199241723e47de086267456990148ea98824dedc4a6434a60b97dcbb5"; + sha256 = "1dfbgnwn0jj3lv2fskc2k3m4h0crars2d1p0gpj265r4k58qis36"; libraryHaskellDepends = [ base elerea SDL ]; homepage = "http://github.com/singpolyma/elerea-sdl"; description = "Elerea FRP wrapper for SDL"; @@ -58648,7 +62107,7 @@ self: { mkDerivation { pname = "elevator"; version = "0.2.3"; - sha256 = "82b7050b33c3e4710d6afb99122c271592e72892a23d21de4191a559604ba0d4"; + sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2"; libraryHaskellDepends = [ base extensible transformers ]; homepage = "https://github.com/fumieval/elevator"; description = "Immediately lifts to a desired level"; @@ -58661,19 +62120,32 @@ self: { mkDerivation { pname = "elf"; version = "0.28"; - sha256 = "9e27129a3b10386e719e8caeed1cdff6a2a1f3a3c9a81ee493dfb6d11e9ff157"; + sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "https://github.com/wangbj/elf"; description = "Parser for ELF object format"; 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 { pname = "elision"; version = "0.1.3.2"; - sha256 = "5e40a0b20effd90f65817391b5eefed1450f90794af3a2a2048c46ef1ad00791"; + sha256 = "1487s0dfyilc0jia5wsag680yifizvpbb4bkh5jhzngz1sra0h2y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors ]; @@ -58690,14 +62162,16 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.4.0"; - sha256 = "45721d5ee406b21c9b9cab180a7a0ee618d8492aecd131080345d772e6b51fd9"; + version = "0.4.1"; + sha256 = "1wp813l6bdw5x7vpiq098v1gbxzvv3129n2rl4div9mrj53a3i2l"; + revision = "1"; + editedCabalFile = "05kk6lsh10ligdgj4dw0iyhvv0blnrcvmk94hn27qq70bpv8xcqz"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text ]; homepage = "https://github.com/agrafix/elm-bridge"; - description = "Derive Elm types from Haskell types"; + description = "Derive Elm types and Json code from Haskell types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58708,7 +62182,7 @@ self: { mkDerivation { pname = "elm-build-lib"; version = "0.14.0.0"; - sha256 = "45720345805bc88cdc1c35328eb1a2a6e3a18976b2d0fe8df90bea35b2f4108a"; + sha256 = "12hhyjr3bshbz66zxl5jfs4s3qx6laqqwcim3kf8rj2vh12h6wj5"; libraryHaskellDepends = [ base bytestring containers elm-compiler elm-core-sources file-embed template-haskell @@ -58730,7 +62204,7 @@ self: { mkDerivation { pname = "elm-compiler"; version = "0.15"; - sha256 = "b63049b22c05901b3538f3cc29c14a42b716bdc2c84e37cde83b44b9cc0f78bc"; + sha256 = "1g3q1z6bji1vx36kfkn8qayidds29b0jkk7k70sip4055jr4jc5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58764,7 +62238,7 @@ self: { mkDerivation { pname = "elm-core-sources"; version = "1.0.0"; - sha256 = "a403505d50cd6ff0d21243db55c6decc6dde14b88a6a393e2b6243f09f6620fb"; + sha256 = "1yr0csgz0hv25cz3jslap0adwvfcvv35bns32b9g0vyda1fm00x4"; libraryHaskellDepends = [ base bytestring containers file-embed template-haskell ]; @@ -58781,7 +62255,7 @@ self: { mkDerivation { pname = "elm-export"; version = "0.6.0.1"; - sha256 = "bf9862015918c72b54b421efcd9d858969dcd94ef0a3d0cb92d9bc0c4363f9d5"; + sha256 = "1mgrcd1hrg6rjb5x18zh9vcxqsc9hnfwvvr1nia2piqqb40n565z"; libraryHaskellDepends = [ base bytestring containers directory formatting mtl text time wl-pprint-text @@ -58802,7 +62276,7 @@ self: { mkDerivation { pname = "elm-export-persistent"; version = "0.1.2"; - sha256 = "bc45ef54b7538b0c8223a1b966cbd10a69dac3879897d2a75b148dcdc7d8de9d"; + sha256 = "17fyv33wv38lbfkx55wqhz1xls8as75ndfd14f10r2sknxafyidw"; libraryHaskellDepends = [ aeson base elm-export persistent scientific text unordered-containers @@ -58822,7 +62296,7 @@ self: { mkDerivation { pname = "elm-get"; version = "0.1.3"; - sha256 = "98c4f2ab71866fde7d39334ce360aa61a1f88759a2354b558153c0d0e43e2db6"; + sha256 = "1did7vjd1h2kh5alndd2b63zi8b1m9hf6k1k75yxwvw6f6mz5i4q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58844,7 +62318,7 @@ self: { mkDerivation { pname = "elm-hybrid"; version = "0.1.3.0"; - sha256 = "c911c4040e4d12ba65127a125c041bf0390da3b503d01913f269eeb9fb3272fe"; + sha256 = "1zkj6bxvkvk9y89ikl03nnihsfgh3c25q4ks29jvl4jd1q2c84f9"; libraryHaskellDepends = [ base directory filepath split text time ]; @@ -58862,7 +62336,7 @@ self: { mkDerivation { pname = "elm-init"; version = "1.0.5"; - sha256 = "29badb1eb03e5960da6f0d89cb7ba8211ca18dc687840c72c3cce9bef1b11270"; + sha256 = "0w0jn7qvxsfcqdr0r147qs6s2711m1xwp28ddzd60n9yn0gdpfi9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58881,7 +62355,7 @@ self: { mkDerivation { pname = "elm-make"; version = "0.1.2"; - sha256 = "4b07824806ada383d4095276450611fd71bade2faa3671479ed37bd76d8ad483"; + sha256 = "10yli9nxfyykkr3p2dma5zgblwgx2434axjj17a878xd0r4841sb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58904,7 +62378,7 @@ self: { mkDerivation { pname = "elm-package"; version = "0.5"; - sha256 = "b654ba7803ee1bf8dbb03bcf7f6194b41c53c545a351abeb4d8e17f704a19a23"; + sha256 = "08wsl42gf5wf9pmsnld38p2m675ljihpzkrvn3dzh6zf0dwblm5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58934,7 +62408,7 @@ self: { mkDerivation { pname = "elm-reactor"; version = "0.3.1"; - sha256 = "ea5dba281fcaed361807760c44fcc8797f11d04312165d5067999f87d9681549"; + sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58957,7 +62431,7 @@ self: { mkDerivation { pname = "elm-repl"; version = "0.4.1"; - sha256 = "a3080c260d3a59fbea0a4964ab1c7b0ea3bbf37b72003ec9456c1071f098de15"; + sha256 = "05fyk3q7243c8p4kw03jggrvp8qfgcfanr291bmgnn9s1lk0q253"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58982,7 +62456,7 @@ self: { mkDerivation { pname = "elm-server"; version = "0.11.0.1"; - sha256 = "e18db27a56d3a35384c9ca35cef6988369393bc705f64ec2508632526b85d35a"; + sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -59001,7 +62475,7 @@ self: { mkDerivation { pname = "elm-yesod"; version = "0.2"; - sha256 = "69b41cb55e48af15b0cf0d52c0a88629403810085c404afdc2945fcde11cea43"; + sha256 = "0hza3khwspwlqbyllh2w1083hh19hslc0lhdryq1bbs8bssird39"; libraryHaskellDepends = [ base blaze-markup Elm shakespeare-js text yesod-core ]; @@ -59015,7 +62489,7 @@ self: { mkDerivation { pname = "elo"; version = "0.1.0"; - sha256 = "2bdb18075718f17a84f1fa0190855f84fa5105b164c94d2fb4ac49447c5fca2d"; + sha256 = "0bfabxy48jdcnhplvjb4n42m3yl4by2r00gsy627mw8qaw3iinrb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty ]; homepage = "http://github.com/mfine/elo"; @@ -59029,8 +62503,8 @@ self: { }: mkDerivation { pname = "elocrypt"; - version = "0.4.1"; - sha256 = "8f2d96c3e91584e96d7a80f34577b541047220d1d9ca5d03c950985421ee5ac3"; + version = "1.0.0"; + sha256 = "0kpwzrj9rlq27rifdmx7pd1ax6d13dm1qw2hckzxf2xqv0w3pv6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base MonadRandom random ]; @@ -59045,6 +62519,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elsa" = callPackage + ({ mkDerivation, array, base, dequeue, directory, filepath + , hashable, json, megaparsec, mtl, tasty, tasty-hunit + , unordered-containers + }: + mkDerivation { + pname = "elsa"; + version = "0.2.0.1"; + sha256 = "1ipi0vi3mwxmcmqmjk93ips7z3casqxzbls80aw2ysj43ii89m21"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base dequeue directory filepath hashable json megaparsec mtl + unordered-containers + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; + homepage = "http://github.com/ucsd-progsys/elsa"; + description = "A tiny language for understanding the lambda-calculus"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -59052,7 +62549,7 @@ self: { mkDerivation { pname = "emacs-keys"; version = "0.0.2.0"; - sha256 = "f00a0409fae74f3af62e1497875f0e999df5333e5fc5b32095d9804babdcfd8b"; + sha256 = "12zxvjmlp06rjlhb7iaz7qrzb7cr1rgqg5ql5vv3lkz7z84h82ph"; libraryHaskellDepends = [ base split template-haskell th-lift xkbcommon ]; @@ -59072,7 +62569,7 @@ self: { mkDerivation { pname = "email"; version = "0.1.1.2"; - sha256 = "83b3801735ddb4835a442d2f6ab9b653468fbed45cf56f18db51d163d5288a90"; + sha256 = "144a53an7laivcc6zxawsjz8yijknswnlbrd8id87d6x6lbq1cw3"; libraryHaskellDepends = [ array base bytestring encoding HaskellNet hsemail old-locale old-time parsec process time @@ -59090,7 +62587,7 @@ self: { mkDerivation { pname = "email-header"; version = "0.4.0"; - sha256 = "16824082b726ac2cc4db2f5fe7e8ea435752c61fc432a7795ebcf024345aad52"; + sha256 = "0lmdb8s29w5wbrwsfcn43z354ms3xblffprgvg22rb16ny1410hn"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring case-insensitive containers exceptions text text-icu time @@ -59111,7 +62608,7 @@ self: { mkDerivation { pname = "email-postmark"; version = "0.2"; - sha256 = "de2b6b7ae3e472256377db8773528e070f96f937b4d76633d59abe2051f2eb9f"; + sha256 = "17zby98j1glsslrndmxl6zwrc3q7ir9771yvfxijawp4wdx6nayy"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers HTTP network ]; @@ -59121,30 +62618,47 @@ 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 = "aa7fd3f02c015bbc4ae67c2f3586f16c757d54a8cf09f7a04e70045828d9cb69"; - 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 { pname = "email-validate-json"; version = "0.1.0.0"; - sha256 = "0ce3fe7544bc4637efe69c897259435cf8cc60affbc8a8090d17df81aaa8dc19"; + sha256 = "06fwm2m83pqp1l4sij7vmxhcry2w8dcp52cwwvpkfimw8iszxqqc"; libraryHaskellDepends = [ aeson base email-validate text ]; homepage = "https://github.com/mwotton/email-validate-json#readme"; description = "Aeson instances for email-validate"; @@ -59159,7 +62673,7 @@ self: { mkDerivation { pname = "email-validator"; version = "0.0.3"; - sha256 = "f6a0ea5f924355c464790f12fc5af179ce8537c73adb9f410430e19b8f74202a"; + sha256 = "0ai0fj7rpq9h0i0rznrsqwvqbkkry5dgq4hgg5jc8ma3j9gym87n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -59184,7 +62698,7 @@ self: { mkDerivation { pname = "emailaddress"; version = "0.2.0.0"; - sha256 = "390b0aaf8fa2d3a694b812ad83fc0f26ed5c7172cc318a7d46c1fc3456d9c15c"; + sha256 = "0p61v5b39z618ryqlcfcf9qmrv961zy87b8jp2aadlx2iyphl2rr"; libraryHaskellDepends = [ aeson base bifunctors bytestring email-validate http-api-data opaleye path-pieces persistent postgresql-simple @@ -59204,7 +62718,7 @@ self: { mkDerivation { pname = "emailparse"; version = "0.2.0.6"; - sha256 = "a9e6e38fa3a75172e839b7ffd26af0842886c11571467cf98eaa133bda810258"; + sha256 = "0n02h7d3n4xaivwpqiki2p0qca44y1md5zxp77l74ld7lf7y7rm9"; libraryHaskellDepends = [ attoparsec base bytestring either either-unwrap mime MissingH strptime text text-icu time word8 @@ -59224,7 +62738,7 @@ self: { mkDerivation { pname = "embeddock"; version = "0.3.0.1"; - sha256 = "d9e5b08a795210d8b9ec47d29286ae82a35a7ec86f123f4fbb2ca8ef2dc7be07"; + sha256 = "01xyqwnyza1cpd7ky4kgr1z5m8w2ms395lj7xjwxh42jg65b1rfr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -59242,7 +62756,7 @@ self: { mkDerivation { pname = "embeddock-example"; version = "0.1"; - sha256 = "60b5f30ee25070e0c9b443d96b2e8dcc235bd982573ef811c8dc2d6adb3cac1f"; + sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0"; libraryHaskellDepends = [ base embeddock time ]; homepage = "https://github.com/nushio3/embeddock-example"; description = "Example of using embeddock"; @@ -59257,7 +62771,7 @@ self: { mkDerivation { pname = "embroidery"; version = "0.1"; - sha256 = "dd0be47995c14e4ce2825675b8cacb4abdb2b475582c72bf89bf8ba0ced613ef"; + sha256 = "1vqksv7a12xzi6zp4b2qfnsb5gaarg5bhxanhbi4qkn1jmwy82yx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59275,7 +62789,7 @@ self: { mkDerivation { pname = "emgm"; version = "0.4"; - sha256 = "e1167e176cccf02db57c9bfc2725747b4cdea0fbb04accc31998636e56e6ec32"; + sha256 = "0cpcwrb6wqwq371wqjmhzfhdwk3vfhjjgz4vgjsjvw6cdhbpw5p1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck syb ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM"; @@ -59289,7 +62803,7 @@ self: { mkDerivation { pname = "empty"; version = "9"; - sha256 = "a9099c3e5acb7cd4cdab93a7846237d750000b8894fc908ee311173bfcc2e72a"; + sha256 = "0ap7qby3n5qiwf791z4li05h0l6p6xi899wkmg6x8z6bb8z9q2d9"; doHaddock = false; description = "Ceci n'est pas une package"; license = stdenv.lib.licenses.bsd3; @@ -59300,7 +62814,7 @@ self: { mkDerivation { pname = "empty-monad"; version = "0.1.0.1"; - sha256 = "e5c61b20ce90d48d3eda2da1c1b55cac7b8bdeaba631acefbcca5f0c9c73c840"; + sha256 = "0h68fff0qpyapkpsqcd6mgg8nyxcbjsw389dv8z8vm4hrqh1pip5"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vadimvinnik/empty-monad"; description = "A container that always has no values"; @@ -59312,7 +62826,7 @@ self: { mkDerivation { pname = "enchant"; version = "0.1.0.0"; - sha256 = "553536cc63fa18dfa07441e03166f10ae71d19c6dbfd04a996a91c318be36dfc"; + sha256 = "1z3dwf5k2759jslh9zfvqqcivrqay5k33q21fjhdy67scg63cdam"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -59332,9 +62846,9 @@ self: { mkDerivation { pname = "enclosed-exceptions"; version = "1.0.2"; - sha256 = "7b9beab82d219c0dd879dfdef70fb74a4a7595b4dbd0baf7adb12cdbbe8189f1"; + sha256 = "1wc9h6zdnb5impvvml6vnjapajjanw7zgpnzg7c0v7115nwfm6vv"; revision = "1"; - editedCabalFile = "40b6f9bc9de19819e54b215008a8b60862f2558119dc49e7c747a5bac4435566"; + editedCabalFile = "0rjm8g2bm9a7qzklkp0rh5az4qh8nsl0hl119gjik671knygkdj0"; libraryHaskellDepends = [ base deepseq lifted-base monad-control transformers transformers-base @@ -59348,6 +62862,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "encode-string" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances + , text + }: + mkDerivation { + pname = "encode-string"; + version = "0.1.0.0"; + sha256 = "145r1il5s1a3rrrnwb6rq25fm5g1q3822r7pan2q5zwb0m9vy4zv"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances text + ]; + homepage = "https://github.com/minad/encode-string#readme"; + description = "Safe string conversion and encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "encoding" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat @@ -59355,7 +62886,7 @@ self: { mkDerivation { pname = "encoding"; version = "0.8.1"; - sha256 = "d96f985432a78693bfd26b4881ff3a139a15ad1f7abebacc771fed3eaa90adb9"; + sha256 = "1fddj2m3xv8zfz6bmgks3ynib6hk7bzq2j3bsazr71m769a9hvyr"; libraryHaskellDepends = [ array base binary bytestring containers extensible-exceptions ghc-prim HaXml mtl regex-compat @@ -59371,7 +62902,7 @@ self: { mkDerivation { pname = "encoding-io"; version = "0.0.1"; - sha256 = "7c567ca9cca8351bfec106ebb9aa79266d48ba7f46cf40d1cac05636985826fb"; + sha256 = "1yr6b2c3cmn0rb8l1ks6gyx4hv96g6mbksq6q7z1ndd8rjlpqmkw"; libraryHaskellDepends = [ base chunked-data deepseq transformers-base ]; @@ -59387,9 +62918,9 @@ self: { mkDerivation { pname = "endo"; version = "0.3.0.1"; - sha256 = "34048da71000312081715a95e35108e5526647232c857b3c8e13dbb69e364f6a"; + sha256 = "0sjg6sgbdnqkiqy7p19c4d3nclp5118y75asf60j0c8022kqs11l"; revision = "1"; - editedCabalFile = "7299a456be44c72431f9193f56bb9fb21e3f76746bd7affa433f2f0bede89eb7"; + editedCabalFile = "1dwyx3nhnbrz8gxazmvbfiv3y7mjkyxmcgqrz4qj9is4prba96bj"; libraryHaskellDepends = [ base between data-default-class mtl transformers ]; @@ -59405,8 +62936,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.15"; - sha256 = "fb9430bec86f82463b7314c9d699441bd96a1681d6b1fac0bfd2cb4be7b9f9df"; + version = "1.2.16"; + sha256 = "1h359zlxqz7px72lnl83pg6pqr0dpk8fqw4vw4hhpfvvqd35lw6y"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -59427,7 +62958,7 @@ self: { mkDerivation { pname = "engine-io-growler"; version = "0.1.0.1"; - sha256 = "4cf29b585a8212da3d2c834fa2b2a291a3ec1febb9f5ba676a55db84de6567fa"; + sha256 = "1yk7cpg89nsmd9kvmxdrxcgyr8wilara4kw35hyxl4l2b9c9pwjc"; libraryHaskellDepends = [ base bytestring engine-io growler http-types mtl pipes pipes-attoparsec pipes-wai socket-io text transformers @@ -59446,7 +62977,7 @@ self: { mkDerivation { pname = "engine-io-snap"; version = "1.0.4"; - sha256 = "687323f00aecb1196c5790aaac1361c055ffa3a1d4658a6ad963469e034779f0"; + sha256 = "1w3r8w1rwik3v5m8lrfll6izymf0c49sralhaxn1kcgc1bq26wv8"; libraryHaskellDepends = [ base bytestring containers engine-io io-streams lifted-base snap-core unordered-containers websockets websockets-snap @@ -59464,7 +62995,7 @@ self: { mkDerivation { pname = "engine-io-wai"; version = "1.0.6"; - sha256 = "9db83e3a8e5dc42089f7078b6cea87746bd96872516d688292bcf92719de104a"; + sha256 = "0jhhvqcjgydwja16hvaif9ldjsvlhzm6r2q7yy4j1i2xiqx3xf4x"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai @@ -59483,7 +63014,7 @@ self: { mkDerivation { pname = "engine-io-yesod"; version = "1.0.4"; - sha256 = "d569661729341eca76a4c04fea27e02fccf27978e61ca93848cd095f36dcdbc5"; + sha256 = "1ifvvhv5y2fd90waj776g1wz5k1gw0kylky0livcl7il54bncsfm"; libraryHaskellDepends = [ base bytestring conduit conduit-extra engine-io http-types text unordered-containers wai wai-websockets websockets yesod-core @@ -59497,7 +63028,7 @@ self: { mkDerivation { pname = "engineering-units"; version = "0.0.2"; - sha256 = "d2c640271c9ec07026eb76bb56c09f69988367c444886e46032c584b700973aa"; + sha256 = "1akk15q4nn1c0d36x224qikq7639kz05dfvnxck71h4y3hkl1inj"; libraryHaskellDepends = [ base ]; description = "A numeric type for managing and automating engineering units"; license = stdenv.lib.licenses.bsd3; @@ -59508,7 +63039,7 @@ self: { mkDerivation { pname = "entangle"; version = "0.1.1"; - sha256 = "2836f6645c71d68ad1fcc30b0f3186bc9cf85f0703f3c89da58564cd05eedabc"; + sha256 = "1g6sxq2wsr45lnfwiwq30xgzi75whqqhy2y3zk8qmmkibijgcdi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59521,11 +63052,14 @@ self: { }) {}; "entropy" = callPackage - ({ mkDerivation, base, bytestring, unix }: + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, unix + }: mkDerivation { pname = "entropy"; - version = "0.3.7"; - sha256 = "1ff020eba2edbb93c4b23297470f8c11d69d0ff1e1642d17cbab9d54a24befef"; + version = "0.3.8"; + sha256 = "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl"; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; @@ -59537,33 +63071,55 @@ self: { mkDerivation { pname = "enumerable"; version = "0.0.3"; - sha256 = "f88472c057c96bcbca7ab427e482d31aca2de40f0d9cbd281e6fd23c14f024ed"; + sha256 = "1v94y0a3rlkg3qlbv70d1zj2vjhssf1f89xlgb5cnsy9az07517q"; libraryHaskellDepends = [ base control-monad-omega tagged ]; description = "A typeclass for enumerating all values a type"; license = stdenv.lib.licenses.bsd3; }) {}; "enumerate" = callPackage - ({ mkDerivation, array, base, containers, deepseq, doctest - , ghc-prim, template-haskell, vinyl + ({ mkDerivation, array, base, containers, deepseq, ghc-prim, spiros + , template-haskell, vinyl }: mkDerivation { pname = "enumerate"; - version = "0.2.1"; - sha256 = "94a61aa2c25ef3ad6f3ccb7edd9899bfac771b11f138428d15d9c27a52c04f10"; + version = "0.2.2"; + sha256 = "1265ja5z3pqjp1kxlpw2q92hrm1gjsy4ad5v4y4x7jhac4rf8631"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers deepseq ghc-prim template-haskell vinyl + array base containers deepseq ghc-prim spiros template-haskell + vinyl ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; homepage = "https://github.com/sboosali/enumerate"; description = "enumerate all the values in a finite type (automatically)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "enumerate-function" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, doctest + , enumerate, exceptions, hspec, MemoTrie, QuickCheck, semigroups + }: + mkDerivation { + pname = "enumerate-function"; + version = "0.0.1"; + sha256 = "0cn06vjf26mnjgdzvx2gxfgk6kpfxj6rqdh0srzdl5yk0ckqc9px"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deepseq enumerate exceptions MemoTrie semigroups + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "http://github.com/sboosali/enumerate-function#readme"; + description = "simple package for inverting functions and testing totality, via brute enumeration of the domain"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "enumeration" = callPackage ({ mkDerivation, arith-encode, arithmoi, base, binary, Cabal , containers, heap, HUnit-Plus @@ -59571,7 +63127,7 @@ self: { mkDerivation { pname = "enumeration"; version = "0.1.0"; - sha256 = "73815ef9d5fada9b394a9beb47f1fb78169f78a6d44c0e9ce01dfa6945dda79d"; + sha256 = "17d7vm2nkyhxw2f0wk6llrw9y5kqzgqlgswv98wrpnpsspwmx0bk"; libraryHaskellDepends = [ arith-encode arithmoi base binary Cabal containers heap ]; @@ -59590,7 +63146,7 @@ self: { mkDerivation { pname = "enumerator"; version = "0.4.20"; - sha256 = "33e21054352bb579e8db8697256ff3c61b3dc862c567f9e0fc2509f95e2b4709"; + sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik"; libraryHaskellDepends = [ base bytestring containers text transformers ]; @@ -59604,7 +63160,7 @@ self: { mkDerivation { pname = "enumerator-fd"; version = "0.1.0.2"; - sha256 = "37894f7f9158dc30fcd81c46db72481cca3d45596e516937c506885acc9e7975"; + sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p"; libraryHaskellDepends = [ base enumerator mtl ]; homepage = "https://john-millikin.com/software/enumerator/"; description = "Enumerator instances for monads-fd classes"; @@ -59616,7 +63172,7 @@ self: { mkDerivation { pname = "enumerator-tf"; version = "0.1.1"; - sha256 = "57cb0bba42ebd944e42ca8c567d20e3a3e14acde7c8b5840a0dc16e0ae918768"; + sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp"; libraryHaskellDepends = [ base enumerator monads-tf ]; homepage = "https://john-millikin.com/software/enumerator/"; description = "Enumerator instances for monads-tf classes"; @@ -59628,7 +63184,7 @@ self: { mkDerivation { pname = "enumfun"; version = "0.5.1.0"; - sha256 = "acd941d794803ab684bc96fcfcd83807e324945ef35447b5afab08c460fd04bb"; + sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc"; libraryHaskellDepends = [ base enummapset-th ]; homepage = "https://github.com/liyang/enumfun"; description = "Finitely represented /total/ EnumMaps"; @@ -59644,7 +63200,7 @@ self: { mkDerivation { pname = "enummapmap"; version = "0.7.0"; - sha256 = "99c7611e3e080524e48f6d206e55a8453250fe94aa68a4ab397e4443aaf5349f"; + sha256 = "17rlynm46i3y76ms8s5ajkz50cj5m1anw83dizj281887qg63iwr"; libraryHaskellDepends = [ base contravariant data-default deepseq ghc-prim lens safecopy semigroups @@ -59666,7 +63222,7 @@ self: { mkDerivation { pname = "enummapset"; version = "0.5.2.1"; - sha256 = "0f77b5235f1ebdb423e5be2df9390edd7173f0a6531dd368b86c998ac3023805"; + sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg"; libraryHaskellDepends = [ base containers deepseq ]; homepage = "https://github.com/michalt/enummapset"; description = "IntMap and IntSet with Enum keys/elements"; @@ -59678,7 +63234,7 @@ self: { mkDerivation { pname = "enummapset-th"; version = "0.6.1.1"; - sha256 = "7cc2028dfb41b1450be788f4b600f602965c3f7f70428c586a7ba3c97556d52a"; + sha256 = "0anmarswk8vvd9c8qhkhgwzmr5h2yq0bdx48ww5lbca1zf6h5hkw"; libraryHaskellDepends = [ base containers deepseq template-haskell ]; @@ -59692,7 +63248,7 @@ self: { mkDerivation { pname = "enumset"; version = "0.0.4"; - sha256 = "bc00048a2908f3ee31af810d1eca9be805cb1bb2e0908d8c6bff94134fecfcb7"; + sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w"; libraryHaskellDepends = [ base data-accessor storable-record ]; description = "Sets of enumeration values represented by machine words"; license = stdenv.lib.licenses.bsd3; @@ -59703,7 +63259,7 @@ self: { mkDerivation { pname = "env-locale"; version = "1.0.0.1"; - sha256 = "f2f1feb9e3141984bda8e779c1a501fd9746994a4e12a2ad4eb47042c247fcf1"; + sha256 = "1wgw8z144w5l9sns44jf9acld5zx06jw2yg7m2yq868lwfwzxwgj"; libraryHaskellDepends = [ base old-locale time ]; homepage = "https://github.com/Ongy/locale-hs"; description = "A (non-forking) interface to the current locale"; @@ -59718,7 +63274,7 @@ self: { mkDerivation { pname = "env-parser"; version = "0.0.2.1"; - sha256 = "3907aa97cdaeff08507a4e3655c95f76966d128fce0dcb982528b6254bf4a68d"; + sha256 = "13d6yi5jbdi84nccn3ffiw96v5knbz4madjfg980izxfrnbsl1rr"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring containers http-types mtl network old-locale text time @@ -59736,8 +63292,8 @@ self: { }: mkDerivation { pname = "envelope"; - version = "0.2.1.0"; - sha256 = "af8a043b4a1890e927ecc23827c2018d816071cd2cc5344543287897457276fe"; + version = "0.2.2.0"; + sha256 = "1ybyhq3yfcyaj1q1pwm41xzyfjdkmy6lls0n7kn5ks06z7inykfg"; libraryHaskellDepends = [ aeson base http-api-data mtl text ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/envelope#readme"; @@ -59750,7 +63306,7 @@ self: { mkDerivation { pname = "envparse"; version = "0.4"; - sha256 = "bf9dd7cd0ed3c38f63ea45cbb496b58ad3d83022b5eab5a66bfeebec5982803d"; + sha256 = "0gc0h9cyrszydfkbbsmm48qdilwannbb9js5x9iqzhyk1v6xg7dz"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec text ]; homepage = "https://supki.github.io/envparse"; @@ -59765,7 +63321,7 @@ self: { mkDerivation { pname = "envy"; version = "1.3.0.2"; - sha256 = "4ca0af8de7d089cf9f1e16e46a6a1300e901907f4edb3a8d393e5af11868899b"; + sha256 = "16w9d0cg2niy766kmnsfgy803s802dm6mr0n3sgwz2fhwy6sz82c"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -59783,7 +63339,7 @@ self: { mkDerivation { pname = "epanet-haskell"; version = "2.0.12.4"; - sha256 = "1d6a8cd92ffb55b93d52af99c2f5f07c358c67bb2c7e47a813eec1493f2affca"; + sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx"; libraryHaskellDepends = [ base ]; homepage = "http://epanet.de/developer/haskell.html"; description = "Haskell binding for EPANET"; @@ -59796,7 +63352,7 @@ self: { mkDerivation { pname = "epass"; version = "0.2.1"; - sha256 = "d58fa2162973e885523ce55a3ccd811eee255fcc27663510ee4913f66fbce569"; + sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym"; libraryHaskellDepends = [ base stm time ]; homepage = "http://github.com/baldo/epass"; description = "Baisc, Erlang-like message passing supporting sockets"; @@ -59809,7 +63365,7 @@ self: { mkDerivation { pname = "epic"; version = "0.9.3.3"; - sha256 = "559844322f0f3c6d511d70e1a3166175f4aea084ea0e109b161b4d1d4296e82a"; + sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base Cabal directory mtl process ]; @@ -59826,9 +63382,9 @@ self: { mkDerivation { pname = "epoll"; version = "0.2.2"; - sha256 = "d7725bc62beaaf7d54d67928847621447ee4cab69aa9f83481e1acb2a8e9e147"; + sha256 = "0iz1x6lb5b71h4sgiacsnv5f8zj445v88a3rsra7vbza5g35nwnp"; revision = "1"; - editedCabalFile = "215673c26bb5d38b7655b5b52d6c21d65d228c4ac231606525991a60add70ab8"; + editedCabalFile = "1f0asynn06lr4mjn0cf29a624pfn45n2vddmamv8plxmdg176mi1"; libraryHaskellDepends = [ base unix ]; homepage = "https://gitlab.com/twittner/epoll"; description = "epoll bindings"; @@ -59841,7 +63397,7 @@ self: { mkDerivation { pname = "eprocess"; version = "1.7.2"; - sha256 = "726779125a7462d479625c71745b4b557e808f8b92be2ce19dab0522b17e18a4"; + sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj"; libraryHaskellDepends = [ base exceptions mtl ]; description = "Basic Erlang-like process support for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -59854,7 +63410,7 @@ self: { mkDerivation { pname = "epub"; version = "0.0.7"; - sha256 = "42f0ca61a43015f1bb3f90fb5bc12ed1f64f48bb0e9dc447787652da304e3241"; + sha256 = "0h9j9qqdllkng13w978fpd44zxni5v0mpywh7yxz259hlihwmw22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59871,7 +63427,7 @@ self: { mkDerivation { pname = "epub-metadata"; version = "4.5"; - sha256 = "19ae3914df5936908c8d7264ae5f1e310262fa06bd7e4390838892840e4c0349"; + sha256 = "0j839h7894l8hf846zmx0vx640ii3rgswr3jin690djrvwa3kbhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59896,7 +63452,7 @@ self: { mkDerivation { pname = "epub-tools"; version = "2.9"; - sha256 = "eb550fbc268852c3e3c29eab32c9c2d171b5b1326f5e9676f42d4802dafb0ea5"; + sha256 = "198fzgd04j1dyiv9cpkg6aqvawfiqb4k5awyqbiw6ll84sy0ymgb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -59918,7 +63474,7 @@ self: { mkDerivation { pname = "epubname"; version = "2.3.2"; - sha256 = "035218066f6d067692fbf2d65b992e9a44735eca0f9ed4072c9574437e897bd0"; + sha256 = "1l3vi5z46x4m5h3x97hgr9g76i4s5scmpmpjzf97c1kddw31hlh3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -59935,7 +63491,7 @@ self: { mkDerivation { pname = "eq"; version = "4.0.4"; - sha256 = "042f4c1e9eeb25a52c20623fc482cc00e3235198089c5b60bc36fa47ebacbde5"; + sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4"; libraryHaskellDepends = [ base semigroupoids ]; homepage = "http://github.com/ekmett/eq/"; description = "Leibnizian equality"; @@ -59948,8 +63504,8 @@ self: { }: mkDerivation { pname = "equal-files"; - version = "0.0.5.2"; - sha256 = "1c391e4f2e813d5aaaa77c849ce96f070fd0846d192fd0784fdf021075ebc91e"; + version = "0.0.5.3"; + sha256 = "1akj045b5554bmlbg94vaji1ly10n89xj1vip9ywamy5hv18bdz5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -59969,7 +63525,7 @@ self: { mkDerivation { pname = "equational-reasoning"; version = "0.4.1.1"; - sha256 = "0720b9bfd72a43fc8350e2ddfc57d96b5b1b548d802a1de0a28ca5310fcdf8c0"; + sha256 = "1h7qrl7k39cclbh1sal0ima1nnvbv5bzrpg2a21zqhrasyzvj807"; libraryHaskellDepends = [ base containers singletons template-haskell th-desugar void ]; @@ -59985,9 +63541,9 @@ self: { mkDerivation { pname = "equivalence"; version = "0.3.2"; - sha256 = "7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529"; + sha256 = "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx"; revision = "1"; - editedCabalFile = "c83ef0092c45011e4d58091d0d90fdd068ef8e04dddaf69e8df66631ef031604"; + editedCabalFile = "010n0gpk2rpninggdnnx0j7fys6hzn80s789b16iw0a55h4z0gn8"; libraryHaskellDepends = [ base containers mtl STMonadTrans transformers transformers-compat ]; @@ -60008,7 +63564,7 @@ self: { mkDerivation { pname = "erd"; version = "0.1.3.0"; - sha256 = "09b016a8a57003e92a3ea7f8150a4969fadd23b4bc21f245a0738a430e0e8e01"; + sha256 = "00cf1q7472kkl12z48dwnhixvyk99451by577qmfj0vhlnl1dc09"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60025,7 +63581,7 @@ self: { mkDerivation { pname = "erf"; version = "2.0.0.0"; - sha256 = "24f0b79c7e1d25cb2cd44c2258d7a464bf6db8079775b50b60b54a254616b337"; + sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14"; libraryHaskellDepends = [ base ]; description = "The error function, erf, and related functions"; license = stdenv.lib.licenses.bsd3; @@ -60036,7 +63592,7 @@ self: { mkDerivation { pname = "erf-native"; version = "1.0.0.1"; - sha256 = "6cb2b9ba4150f8da004cfcdbe15a3e7fa24ebd9b1713625fa1322714340f0344"; + sha256 = "0i031ws189rjl5gn44qpkfylx8kz7rdf3nzw9h0dmy2h86xbkckc"; libraryHaskellDepends = [ base polynomial ]; homepage = "http://code.haskell.org/~mokus/erf-native"; description = "Native Haskell implementation of the interface from the erf package"; @@ -60051,7 +63607,7 @@ self: { mkDerivation { pname = "erlang"; version = "0.2.2"; - sha256 = "892080e131621fb0ea585ed9e2497a3c367607319d3daa3ae03edaafd5f38b71"; + sha256 = "0wcbygaszniyw0xalgcx643pcdiwg94y5nayb3mb07v267hq0849"; libraryHaskellDepends = [ base binary bytestring directory filepath MissingH network random ]; @@ -60065,7 +63621,7 @@ self: { mkDerivation { pname = "eros"; version = "0.6.0.0"; - sha256 = "3c53decd098d5da2ae5bdc1fcdf1c4268ea3ccca7466e92f28518281b160205b"; + sha256 = "0nr0c2qq30ji50pyjrklrb6a73i6qkqws7ywbfpa4pcd176xwlrw"; libraryHaskellDepends = [ aeson base bytestring containers text ]; description = "A text censorship library"; license = stdenv.lib.licenses.bsd3; @@ -60079,7 +63635,7 @@ self: { mkDerivation { pname = "eros-client"; version = "0.5.0.1"; - sha256 = "8b6574cd7a65f61c309f07933eeb2443232d92337f8e4da2edd7ed15e124f196"; + sha256 = "15pi4khibvfpxni4v3kz6f92s8s34kmkx4q7kwq1rxk5gb6p8rcb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60097,7 +63653,7 @@ self: { mkDerivation { pname = "eros-http"; version = "0.6.0.1"; - sha256 = "d37729af17787e0d170441437aa96fe68b2e6cdca0cabb97c563ad2dbfe6ebb0"; + sha256 = "1c7bwszjvbb3qnbvpjm0vin2x2z6dylplhs10hbhszkq2ypjjxyk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60114,7 +63670,7 @@ self: { mkDerivation { pname = "errno"; version = "0.1"; - sha256 = "ca8170efa40857aa988e6cfd8f44bcbc7d64a80de0c53cd87297082696093d4a"; + sha256 = "0jix16b2c24pfbc3rig01nl68zdwpi28zzbciscalmq8lkpp10fa"; libraryHaskellDepends = [ base mtl ]; description = "a FFI utility"; license = stdenv.lib.licenses.bsd3; @@ -60125,7 +63681,7 @@ self: { mkDerivation { pname = "error-analyze"; version = "0.0.1"; - sha256 = "7e944f26c934f38e7baed53def81900188e9593dc119baef355bd2cd98350c75"; + sha256 = "0x8c6nccvljv6ppvl6f17mcyk201j20yygfmmrxqxwrlr4k4z53y"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HUnit tasty tasty-hunit text ]; description = "Parse ghc and cabal error messages and give their causes for easier resolution"; @@ -60137,7 +63693,7 @@ self: { mkDerivation { pname = "error-continuations"; version = "0.1.0.0"; - sha256 = "3ab057e6686e4d3f3e40266fefba2a314cff087db29e9274c4036447a14b6567"; + sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s"; libraryHaskellDepends = [ base either mtl transformers ]; homepage = "https://github.com/echatav/error-continuations"; description = "Error Continuations"; @@ -60150,7 +63706,7 @@ self: { mkDerivation { pname = "error-list"; version = "0.1.0.3"; - sha256 = "3248165acff3927d9e7f9aee206a146e285a9a17a7cd574b10a540f298be194c"; + sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j"; libraryHaskellDepends = [ base mtl text text-render ]; homepage = "http://github.com/thinkpad20/error-list"; description = "A useful type for collecting error messages"; @@ -60163,7 +63719,7 @@ self: { mkDerivation { pname = "error-loc"; version = "0.1.0.0"; - sha256 = "a52e905a87edc15a1788e38de53f600c1c4f744e3bb08ac7f3a25c7746610732"; + sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/joelteon/error-loc"; description = "An error replacement with call-site metadata"; @@ -60176,7 +63732,7 @@ self: { mkDerivation { pname = "error-location"; version = "0.1.5.5"; - sha256 = "2dfa1a0e258da3895f5225784b8d3c6ce874d16ab69c1df5eac298a7b61cd1bd"; + sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/gregwebs/ErrorLocation.hs"; description = "error functions that show file location information"; @@ -60190,7 +63746,7 @@ self: { mkDerivation { pname = "error-message"; version = "1.1"; - sha256 = "c91df7156f955fb26278224fdc3c6e1ffba079cebf356b56bd01f594072ddf76"; + sha256 = "0xnz5l3r9x81pmb6nddzrrws1yqzdqydqkr2g1ib4pwmdwazf7f9"; libraryHaskellDepends = [ ansi-wl-pprint base containers either-unwrap InfixApplicative mtl ]; @@ -60205,7 +63761,7 @@ self: { mkDerivation { pname = "error-util"; version = "0.0.1.1"; - sha256 = "68d133f2211d9be2f66f7529d1d2251ec13f12f9ccdd5f1c96be53f09cf3e193"; + sha256 = "14z1yffg0lxyjqf5zpfcz493zh8y4p9d2abmdzvf56qx47r37lb8"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/pmlodawski/error-util"; description = "Set of utils and operators for error handling"; @@ -60218,7 +63774,7 @@ self: { mkDerivation { pname = "errorcall-eq-instance"; version = "0.3.0"; - sha256 = "5546a810408b1d253dd439d58c570407f4f6e11a68f1f676f13daf85aa401c43"; + sha256 = "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm"; libraryHaskellDepends = [ base base-orphans ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "An orphan Eq instance for ErrorCall"; @@ -60232,7 +63788,7 @@ self: { mkDerivation { pname = "errors"; version = "2.1.3"; - sha256 = "201a1d9d2fba16dff734eb79e07f138718ed62f5a0a846cf0cee743828844df1"; + sha256 = "1wadhhl3hx7f1k7lda50ymifs6472dzy0ygb6kvxy5ms5yfis6i0"; libraryHaskellDepends = [ base safe transformers transformers-compat unexceptionalio ]; @@ -60240,6 +63796,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_2_1" = callPackage + ({ mkDerivation, base, exceptions, safe, text, transformers + , transformers-compat, unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.2.1"; + sha256 = "0cgmalid229snvn788sk2w16bqgfzgwc4ir2p60jvwqbj63yp5s1"; + libraryHaskellDepends = [ + base exceptions safe text transformers transformers-compat + unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -60247,7 +63820,7 @@ self: { mkDerivation { pname = "ersaconcat"; version = "0.0.1"; - sha256 = "7652c59b606769366babbff4b657cd8422ddb3f4aeb62afcc8ed0ce1a3ec139f"; + sha256 = "17qkxjiy237dr3y2mdmfyjrxs8l4rmbvdx5zmdmkcsb7c2dwalkn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60272,7 +63845,7 @@ self: { mkDerivation { pname = "ersatz"; version = "0.3.1"; - sha256 = "e9014d577c8bf077fdce57d60cc18c254635b9897513f1c7209c57e8687aa8c0"; + sha256 = "1h58g9lfhmww433z24vmi6wkaii5ik0hrmjprvypgw4bgibls0g9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60288,6 +63861,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ersatz_0_4" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest + , filepath, lens, mtl, parsec, process, temporary, transformers + , unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4"; + sha256 = "173k73dvbv528q6072b8k7xy9q6558rlmz7llkiym4g1j2xi37cf"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + homepage = "http://github.com/ekmett/ersatz"; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -60295,9 +63895,9 @@ self: { mkDerivation { pname = "ersatz-toysat"; version = "0.2.1.0"; - sha256 = "b83980c6f537ab812ac8605a9fe8c3bb9764bb5ae098e20ef882fd5aa824f7b6"; + sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq"; revision = "1"; - editedCabalFile = "146f86cb3df790cd26c0ec2f7061027257c7932a64ff8a6725eee5356a887776"; + editedCabalFile = "0xkpi1m3brgf4mkqmzv45a9wfmvj09hp0bzcq0kcv47p7p5qcvql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60317,7 +63917,7 @@ self: { mkDerivation { pname = "ert"; version = "0.0.2.1"; - sha256 = "2f0a2cddf236bef3c5902c183f516f0d58cb2cacf4cfdc07634f6592e33e8a45"; + sha256 = "0ica7vir4ragcc3xrkzlmhncnn0ddx8ky61cj32z7ginybfjq2ig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60340,7 +63940,7 @@ self: { mkDerivation { pname = "escape-artist"; version = "1.1.0"; - sha256 = "e2ccea8bfb7e5d6d094b70a47b1449affcffc3e94044351b6a1addcaaad451fe"; + sha256 = "1zjisjmcmp8sd8dkai20x71zzz5g94a7p93h9c4nspbyzf5ymk72"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring hspec QuickCheck silently text @@ -60358,7 +63958,7 @@ self: { mkDerivation { pname = "esotericbot"; version = "0.0.6"; - sha256 = "470f51be83e687f0b28c4377e5e46b0128953314b503f524b62008e748f2e764"; + sha256 = "0r77y94ff210nqjga0xm2hrraa01dgjfaxs3ijrg11z6hfz523s7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60384,8 +63984,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.5.1"; - sha256 = "76a75c84c4b4e0d41b28d8f8e73cc746282f5e7e50cfb11fcc252286950c87d9"; + version = "2.5.3"; + sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -60406,7 +64006,7 @@ self: { mkDerivation { pname = "ess"; version = "0.1.0.0"; - sha256 = "98ad5094a53857d5817e3e0b8e9b5572cfe80a6b3d139c5a0d863d9377d2b95f"; + sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/michaelochurch/ess"; description = "The type-level S combinator in Haskell"; @@ -60420,7 +64020,7 @@ self: { mkDerivation { pname = "estimator"; version = "1.2.0.0"; - sha256 = "8f6b232c0a7c264acc2c125eaddbaac9cbfaa8f2a083bdf3f9975c04cbba1299"; + sha256 = "168jpb5h8p4pz7rvv0x0yalgmjy9mbdssphj5k64l9kw18n26swg"; libraryHaskellDepends = [ ad base distributive lens linear reflection ]; @@ -60436,7 +64036,7 @@ self: { mkDerivation { pname = "estimators"; version = "0.1.4"; - sha256 = "9e3d655ca937477e3c281915c7b7ba0ee01c34cbb96b376b70e35464bc12f258"; + sha256 = "0n7j2ay68m73f1mkfsxrrcs1rq0fpavwf58r50y7wirpm5f6agcy"; libraryHaskellDepends = [ base binary containers deepseq list-tries MonadRandom mtl pretty prettyclass QuickCheck text @@ -60451,7 +64051,7 @@ self: { mkDerivation { pname = "estreps"; version = "0.3.1"; - sha256 = "f1be3703590f24ed6572e6bcde286ae56ce4c990e3df0fe5bf95326e9fc71780"; + sha256 = "100pqygnwclmpzjhzpz3j34y8v75d8ldxg76f9jys90gb41kggpi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60463,6 +64063,51 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "etc" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun + , text, unordered-containers, vector + }: + mkDerivation { + pname = "etc"; + version = "0.0.0.2"; + sha256 = "1cbxanxm7qpbsj3q5f6q4sn2krvfi3bm5yxi2qcxrqpjrhq31j8i"; + libraryHaskellDepends = [ + aeson base bytestring containers directory exceptions hashable + protolude text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers protolude tasty tasty-hunit + tasty-rerun text unordered-containers vector + ]; + homepage = "https://github.com/roman/Haskell-etc"; + description = "Declarative configuration spec for Haskell projects"; + license = stdenv.lib.licenses.mit; + }) {}; + + "etc_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , exceptions, hashable, protolude, tasty, tasty-hunit, tasty-rerun + , text, unordered-containers, vector + }: + mkDerivation { + pname = "etc"; + version = "0.2.0.0"; + sha256 = "16l5ap8ag2l3ks6pjwr49wk4njgap44kbxsqb69yr9lr81wrj9fv"; + libraryHaskellDepends = [ + aeson base bytestring containers directory exceptions hashable + protolude text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers protolude tasty tasty-hunit + tasty-rerun text unordered-containers vector + ]; + homepage = "https://github.com/roman/Haskell-etc"; + description = "Declarative configuration spec for Haskell projects"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "etcd" = callPackage ({ mkDerivation, aeson, async, base, bytestring, hspec , http-conduit, MonadRandom, mtl, text, time @@ -60470,9 +64115,9 @@ self: { mkDerivation { pname = "etcd"; version = "1.0.5"; - sha256 = "916fc01e40cc5488f54fea8c623b31087b364432a78acffd95825f5bd1311f2f"; + sha256 = "0bqz678mnpw2jpywz2m76923cyq864xn537a9zsqhm6c80gc0vwi"; revision = "1"; - editedCabalFile = "5cdbbc8d2aedc68e82e7c4d0cface390c3c68fb7ee7fb162d8123e42351f98fa"; + editedCabalFile = "1ylq3wsl4ghjv1ib2zzfny7wdhwhwfnczl64wy18xipd5a6vrnsw"; libraryHaskellDepends = [ aeson base bytestring http-conduit text time ]; @@ -60488,7 +64133,7 @@ self: { mkDerivation { pname = "eternal"; version = "0.1.7"; - sha256 = "151f824cb38176f0282802e03cccfc66a9e93798aba2c272d5062c727892d6b2"; + sha256 = "1cnnj9w74b06smrc58mbk0vykab6zk63rq0250lg0xl1nd6847qm"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base-unicode-symbols transformers utf8-string @@ -60505,8 +64150,8 @@ self: { }: mkDerivation { pname = "ether"; - version = "0.4.0.2"; - sha256 = "8b9dce4d444613dc46df988fa3a437297503e63ff29fd28113b35b98a8dcd953"; + version = "0.4.2.0"; + sha256 = "0pkr0sh6qd5in806gm8k2cgr8j4aaq4p4zk52b8g82kqjzwb20rf"; libraryHaskellDepends = [ base exceptions mmorph monad-control mtl template-haskell transformers transformers-base transformers-lift @@ -60519,6 +64164,131 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ether_0_5_1_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim + , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged + , tasty, tasty-quickcheck, template-haskell, transformers + , transformers-base, transformers-lift, writer-cps-mtl + }: + mkDerivation { + pname = "ether"; + version = "0.5.1.0"; + sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n"; + libraryHaskellDepends = [ + base exceptions mmorph monad-control mtl reflection tagged + template-haskell transformers transformers-base transformers-lift + writer-cps-mtl + ]; + testHaskellDepends = [ + base ghc-prim lens mtl QuickCheck tasty tasty-quickcheck + transformers + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens mtl transformers + ]; + homepage = "https://int-index.github.io/ether/"; + description = "Monad transformers and classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ethereum-analyzer" = callPackage + ({ mkDerivation, base, bimap, bytestring, containers + , ethereum-analyzer-deps, extra, fgl, graphviz, hexstring, hoopl + , hspec, text + }: + mkDerivation { + pname = "ethereum-analyzer"; + version = "1.3.0"; + sha256 = "18ri9wdcxh10sz5jlgsybjdvbwpcqbq2jjph15iwl4wwmlnzfqx1"; + libraryHaskellDepends = [ + base bimap bytestring containers ethereum-analyzer-deps extra fgl + graphviz hexstring hoopl text + ]; + testHaskellDepends = [ + base bytestring ethereum-analyzer-deps extra hoopl hspec text + ]; + homepage = "https://github.com/ethereumK/ethereum-analyzer"; + description = "A Ethereum contract analyzer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ethereum-analyzer-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit-combinators + , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions + , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl + , protolude, text, tostring, unordered-containers, vector + }: + mkDerivation { + pname = "ethereum-analyzer-cli"; + version = "1.3.0"; + sha256 = "0bbqvg6kl4dsfyh9gb9n0bys5v6c4clqf7sg91p5k0znap8sj06c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit-combinators directory + ethereum-analyzer ethereum-analyzer-deps exceptions hexstring + http-conduit json-rpc monad-logger mtl protolude text tostring + unordered-containers vector + ]; + executableHaskellDepends = [ + base ethereum-analyzer-deps hflags monad-logger protolude + ]; + homepage = "https://github.com/ethereumK/ethereum-analyzer"; + description = "A CLI frontend for ethereum-analyzer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ethereum-analyzer-deps" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring + , binary, bytestring, containers, deepseq, fast-logger, global-lock + , monad-logger, split, text + }: + mkDerivation { + pname = "ethereum-analyzer-deps"; + version = "1.3.0"; + sha256 = "102i96a150mm68cxy4qm8pfdzjm0m6ip846g08dzvdx8cl9si1iy"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base16-bytestring binary bytestring + containers deepseq fast-logger global-lock monad-logger split text + ]; + description = "Stripped dependencies of ethereum-analyzer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ethereum-analyzer-webui" = callPackage + ({ mkDerivation, aeson, base, bytestring, ethereum-analyzer + , ethereum-analyzer-deps, exceptions, hflags, http-media + , http-types, logging-effect, monad-logger, mtl, neat-interpolation + , optparse-applicative, prometheus-client, prometheus-metrics-ghc + , protolude, servant, servant-server, text, time, wai, wai-extra + , warp, wl-pprint-text + }: + mkDerivation { + pname = "ethereum-analyzer-webui"; + version = "1.3.0"; + sha256 = "0ffpgb4y25qkbzrarhcnzfq92fal5i1p986cy9ipg3dd7y7dham1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring ethereum-analyzer exceptions http-media + http-types logging-effect mtl neat-interpolation + optparse-applicative prometheus-client prometheus-metrics-ghc + protolude servant servant-server text time wai wai-extra warp + wl-pprint-text + ]; + executableHaskellDepends = [ + base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger + ]; + homepage = "https://github.com/ethereumK/ethereum-analyzer"; + description = "A web frontend for ethereum-analyzer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ethereum-client-haskell" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, data-default @@ -60530,7 +64300,7 @@ self: { mkDerivation { pname = "ethereum-client-haskell"; version = "0.0.4"; - sha256 = "cc2d4cda0e9f9ea0469b28ac3134128b913b498830fe90abc4ea92b98ede7b36"; + sha256 = "0dkvvs7bk4paqjmr1zihi14kp4cb28s33b18kd3a17lz1vd4qbfc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60557,7 +64327,7 @@ self: { mkDerivation { pname = "ethereum-merkle-patricia-db"; version = "0.0.1"; - sha256 = "287bf459d752346727085f2b1bcd1dc8786d2d732786ca53a2368d509562b65f"; + sha256 = "0pxncaam139nl99wm1i7fcnnsy683p6inasz10knfd2jsxcz8yr8"; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring binary bytestring cryptohash data-default ethereum-rlp leveldb-haskell nibblestring resourcet @@ -60580,7 +64350,7 @@ self: { mkDerivation { pname = "ethereum-rlp"; version = "0.0.1"; - sha256 = "25276bc29110900f8d1a5cf743ee3a1fe4d81d7ef2a3c8eb317d1ee11bb4a5c3"; + sha256 = "1hx5nhdy27kx67mwi8zjgqfxir0z7bp47xsw3a6hz40hj716n9r5"; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring ]; @@ -60599,7 +64369,7 @@ self: { mkDerivation { pname = "eths-rlp"; version = "0.1.0.0"; - sha256 = "aa24e8f30bbb1eff7bd4cbfc635224f772d5bdba26a1db6ef346415b8d2ea09b"; + sha256 = "16x05s6mnha6ydpdp896payxawpp4i967z6bsixzy7mv1gryh95a"; libraryHaskellDepends = [ base binary binary-strict bytestring ]; testHaskellDepends = [ base bytestring doctest hspec QuickCheck quickcheck-instances @@ -60615,7 +64385,7 @@ self: { mkDerivation { pname = "ety"; version = "0.1"; - sha256 = "57dc267d92cc3a935b6207a41bb595054f228e836e27e092ba01001c14e3bb98"; + sha256 = "165vwca1q001pa9f09vfhf724kq5jnsip907c9dr6fncj9yjdp2p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60635,7 +64405,7 @@ self: { mkDerivation { pname = "euler"; version = "0.9.2"; - sha256 = "054e53786a5f010afef5121639d270f4697d8d92f280651853cfd1858baff091"; + sha256 = "14ghmy5qblfgacc6b07jja6pssglf393j5hjypz0l0azd9w56kh5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hlint hspec process regex-posix xml @@ -60656,7 +64426,7 @@ self: { mkDerivation { pname = "euphoria"; version = "0.8.0.0"; - sha256 = "30703f7bc6063fbce127b0b1631ca4236ec59adfc2d7de436c7c5daaeafe118a"; + sha256 = "12hizvmalpbwdi1xxmy2vydcavi3lhf67cdh4zhvqgq6qrxkyw1h"; libraryHaskellDepends = [ base containers deepseq elerea enummapset-th hashable HUnit transformers unordered-containers @@ -60679,7 +64449,7 @@ self: { mkDerivation { pname = "eurofxref"; version = "0.2.1"; - sha256 = "a9238366d4eb8830b5c82f739b040cfa8ecd9201e07b9f09b68273e1671e4e7e"; + sha256 = "0zjf3rky2ww2nq4ryyz0069cv3ps1h29nwrgr2sk127bsik868x9"; libraryHaskellDepends = [ base bytestring conduit containers failure hexpat http-conduit http-types monad-control mtl time @@ -60691,15 +64461,14 @@ self: { "eve" = callPackage ({ mkDerivation, base, containers, data-default, free, hspec - , hspec-core, lens, mtl, pipes, pipes-concurrency, pipes-parse + , hspec-core, lens, mtl }: mkDerivation { pname = "eve"; - version = "0.1.0"; - sha256 = "18cc10498a3c663fed847eaa5caf910f613cca4c817e05a3e884b077b2122ed9"; + version = "0.1.8"; + sha256 = "1bhv9mh61f69xff5y8nagri1flc3m87sxx3b17kbxi5d2hhzsaqz"; libraryHaskellDepends = [ - base containers data-default free lens mtl pipes pipes-concurrency - pipes-parse + base containers data-default free lens mtl ]; testHaskellDepends = [ base data-default hspec hspec-core lens mtl @@ -60714,7 +64483,7 @@ self: { mkDerivation { pname = "event"; version = "0.1.4"; - sha256 = "6791d1402b4d77a11407ab592f65cb61ee60c5a80b99751c5d775afcc9d1824a"; + sha256 = "0jl2s74zqnkpblf7b68bm32n1vk1rdjjyndb0waa2xsd5d0d34b7"; libraryHaskellDepends = [ base containers semigroups transformers ]; @@ -60727,7 +64496,7 @@ self: { mkDerivation { pname = "event-driven"; version = "0.0.2"; - sha256 = "572d4e3eee8d12e0525c86fde21cdea5df1711c8cf0cb95d495af608666079ca"; + sha256 = "1jkrc1k0ixjs95fvj36gr08igpx5vqff5zc6bi9f04ldxqz4wbap"; libraryHaskellDepends = [ base monads-tf yjtools ]; description = "library for event driven programming"; license = stdenv.lib.licenses.bsd3; @@ -60739,7 +64508,7 @@ self: { mkDerivation { pname = "event-handlers"; version = "0.0.0.3"; - sha256 = "8d26d54ee234569b9aabbcd0cbecd2ee5fd8b21235db587e2121cf0667d82594"; + sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld"; libraryHaskellDepends = [ base containers ]; homepage = "http://code.haskell.org/~mokus/event-handlers"; description = "Event handlers"; @@ -60753,7 +64522,7 @@ self: { mkDerivation { pname = "event-list"; version = "0.1.1.3"; - sha256 = "f58250c839eab441221fdfcc82795f4a4bddd397cd08dc02729ebe3bb05e8416"; + sha256 = "05l4bsq3pglyf81dq26djz9xsjsabxwq5k6z3wi43d7a774510pm"; libraryHaskellDepends = [ base non-negative QuickCheck transformers utility-ht ]; @@ -60772,7 +64541,7 @@ self: { mkDerivation { pname = "event-monad"; version = "0.0.3"; - sha256 = "c4fd174c9b23eef22d9a94d3b8957d1ff66447ba0b8cd29fb3413512533a1ade"; + sha256 = "1phs799i4da1nfgx530bp93n9xhzgnavilwlk8nz5vi3kd61gzf4"; libraryHaskellDepends = [ base containers event-handlers haskell98 monad-loops mtl pretty prettyclass priority-queue stateref @@ -60788,7 +64557,7 @@ self: { mkDerivation { pname = "event-transformer"; version = "0.1.0.0"; - sha256 = "98eabb7332a88d39fcf8c208bb9890c692e49601674112c117d6eb8d4085436e"; + sha256 = "0vj3hm08vsyn2z0i4hb706bf94n6j2cbn262z3y3k3d869rvpslq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base transformers ]; @@ -60799,14 +64568,163 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eventful-core" = callPackage + ({ 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.3"; + sha256 = "1lify1ama6a479w0mcvr4qmp0mrfgwf6nsy902hrx20sn5ik02h9"; + libraryHaskellDepends = [ + aeson base containers contravariant http-api-data path-pieces + sum-type-boilerplate template-haskell text transformers uuid + ]; + testHaskellDepends = [ + 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"; + license = stdenv.lib.licenses.mit; + }) {}; + + "eventful-dynamodb" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base + , bytestring, conduit, eventful-core, eventful-test-helpers, hlint + , hspec, HUnit, lens, QuickCheck, quickcheck-instances, safe, text + , unordered-containers, vector + }: + mkDerivation { + pname = "eventful-dynamodb"; + version = "0.1.3"; + sha256 = "1ymzryyz77705vwb05nhjhw6sz2ksjfpld5g569pnbdlr03m257y"; + libraryHaskellDepends = [ + aeson amazonka amazonka-dynamodb base bytestring conduit + eventful-core lens safe text unordered-containers vector + ]; + testHaskellDepends = [ + aeson amazonka amazonka-dynamodb base bytestring conduit + eventful-core eventful-test-helpers hlint hspec HUnit lens + QuickCheck quickcheck-instances safe text unordered-containers + vector + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Library for eventful DynamoDB event stores"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "eventful-memory" = callPackage + ({ mkDerivation, base, containers, eventful-core + , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm + }: + mkDerivation { + pname = "eventful-memory"; + version = "0.1.3"; + sha256 = "0r35bg40j4bdpf5ibxi5acjnmdl9piaysyzswapwcjq4jyibcdk9"; + libraryHaskellDepends = [ + base containers eventful-core mtl safe stm + ]; + testHaskellDepends = [ + base containers eventful-core eventful-test-helpers hlint hspec + HUnit mtl safe stm + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "In-memory implementations for eventful"; + license = stdenv.lib.licenses.mit; + }) {}; + + "eventful-postgresql" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core + , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit + , mtl, persistent, persistent-postgresql, text + }: + mkDerivation { + pname = "eventful-postgresql"; + version = "0.1.3"; + sha256 = "0vc36qfi2q1im60nwzb9ivpsz7kk2y83rbzbbv4b2mjk3cvvjnyr"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common mtl + persistent text + ]; + testHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common + eventful-test-helpers hlint hspec HUnit mtl persistent + persistent-postgresql text + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Postgres implementations for eventful"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "eventful-sql-common" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl + , persistent, persistent-template, text, uuid + }: + mkDerivation { + pname = "eventful-sql-common"; + version = "0.1.3"; + sha256 = "0mddqciaiq90cgf0syw0y1qvvkpvqbx0lkx8mwz3g8zf57h98awc"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core mtl persistent + persistent-template text uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "Common library for SQL event stores"; + license = stdenv.lib.licenses.mit; + }) {}; + + "eventful-sqlite" = callPackage + ({ mkDerivation, aeson, base, bytestring, eventful-core + , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit + , mtl, persistent, persistent-sqlite, text, uuid + }: + mkDerivation { + pname = "eventful-sqlite"; + version = "0.1.3"; + sha256 = "08xk3kyxm23843kr2y9l39d9d9ykcahz2q2730c1skgnwcd3y0c2"; + libraryHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common mtl + persistent text uuid + ]; + testHaskellDepends = [ + aeson base bytestring eventful-core eventful-sql-common + eventful-test-helpers hlint hspec HUnit mtl persistent + persistent-sqlite text uuid + ]; + homepage = "https://github.com/jdreaver/eventful#readme"; + description = "SQLite implementations for eventful"; + license = stdenv.lib.licenses.mit; + }) {}; + + "eventful-test-helpers" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra + , hspec, monad-logger, text + }: + mkDerivation { + pname = "eventful-test-helpers"; + version = "0.1.3"; + sha256 = "16ba3184niy3dsh6h08czj7x0bd4abx7ji2aaddd5pvxra9494xl"; + libraryHaskellDepends = [ + 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"; + license = stdenv.lib.licenses.mit; + }) {}; + "eventloop" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-utilities , deepseq, network, stm, suspend, text, timers, websockets }: mkDerivation { pname = "eventloop"; - version = "0.8.2.1"; - sha256 = "aed31b9515e726ae439323590336295cbdcd9c530aebb95f976a1068fc4c6848"; + version = "0.8.2.5"; + sha256 = "0vl9kc0grhp72rlx922khvf5833qshyx4danismf8n5r3i9f7qr0"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -60823,8 +64741,8 @@ self: { }: mkDerivation { pname = "eventsource-api"; - version = "1.0.0"; - sha256 = "3d72797d5d9b81f2f5f1e613d6681983d9fd541a6b5dd773d92b1982ced422e8"; + version = "1.1.0"; + sha256 = "0khdp8z2lbp9337wxsqfb3dlnmjw8shwjaldx0xqikwyh6rrmix9"; libraryHaskellDepends = [ aeson base containers mtl protolude unordered-containers uuid ]; @@ -60840,8 +64758,8 @@ self: { }: mkDerivation { pname = "eventsource-geteventstore-store"; - version = "1.0.0"; - sha256 = "d14e33e0f73d2c6344d251253cd9f29551dd08ed627fa9b68845ac8e236dbafb"; + version = "1.0.1"; + sha256 = "19h7vvd2b52915i61lpaa0k3hgvhdz55y5rsp0aznv1m2f613nnh"; libraryHaskellDepends = [ aeson base eventsource-api eventstore mtl protolude ]; @@ -60862,7 +64780,7 @@ self: { mkDerivation { pname = "eventsource-store-specs"; version = "1.0.0"; - sha256 = "11aa3453084571533ae6c7367b2f4e41de7af78f99b4d79e6b9b935dd3399047"; + sha256 = "0iwh779mv4wvdfgdgd4rizvpmpj19qppndn7wqx56wa5119k9ahi"; libraryHaskellDepends = [ aeson base eventsource-api mtl protolude tasty tasty-hspec uuid ]; @@ -60877,8 +64795,8 @@ self: { }: mkDerivation { pname = "eventsource-stub-store"; - version = "1.0.0"; - sha256 = "6c50fd40a886098fb95f129d4769b68ffe3ffdb9135234d4db921ff6f5d17fef"; + version = "1.0.1"; + sha256 = "0knmyykgxs6fy4xpmn7zcm8h1psirgizfrk6iaisfncjw9xy387k"; libraryHaskellDepends = [ base containers eventsource-api mtl protolude stm ]; @@ -60897,7 +64815,7 @@ self: { mkDerivation { pname = "eventsourced"; version = "1.1.1.0"; - sha256 = "a1a8fe03a4b01b99dec67fa046c7df2a900dde4f18404a05e6e0ca7c14798284"; + sha256 = "1142g4a7rjp0wq2llh0q9zg0v41avz3ld83zqvg9j6xhlh1zxa51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60920,8 +64838,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.14.0.1"; - sha256 = "0daf1e7c51405053cbcb35ab53f8b1eaaa4e937b985c49762e9e6814f9b380d0"; + version = "0.14.0.2"; + sha256 = "1wvnwxn358vlcvxsiph1cm3iwsmggi348ljv8kknwv4vk43zm0b6"; libraryHaskellDepends = [ aeson array base cereal classy-prelude connection containers dns dotnet-timespan http-client mtl protobuf random semigroups stm time @@ -60938,12 +64856,60 @@ 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 { + pname = "every"; + version = "0.0.1"; + sha256 = "1rc0g5rn8hzglm2b4biaf8jvj5kb2j1s5vsxnm24q2gvrvjg03sx"; + libraryHaskellDepends = [ async base stm ]; + homepage = "https://github.com/athanclark/every#readme"; + description = "Run a process every so often"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "every-bit-counts" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { pname = "every-bit-counts"; version = "0.1"; - sha256 = "72133813f8de7a9cf0a6e0e9c8696a54a9d718d3fc817ba41e5cdbd27c4c2565"; + sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj"; libraryHaskellDepends = [ base haskell98 ]; homepage = "http://research.microsoft.com/en-us/people/dimitris/pearl.pdf"; description = "A functional pearl on encoding and decoding using question-and-answer strategies"; @@ -60958,7 +64924,7 @@ self: { mkDerivation { pname = "ewe"; version = "0.1.0.46"; - sha256 = "ce3c9bea5cad4c5e7e1d2243d3f67530c47b60dc9602106e0046924c9429ff1a"; + sha256 = "06pz56a4r4j601p100lnvih7pi1hfpvd6hr23mz5wk5dbkm9ng6f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60978,7 +64944,7 @@ self: { mkDerivation { pname = "ex-pool"; version = "0.2"; - sha256 = "6ad735f99183e91b93601ff7bd8b23ab556d8215f8590a3f118a3527687e4535"; + sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva"; libraryHaskellDepends = [ base exceptions hashable stm time transformers vector ]; @@ -60993,19 +64959,34 @@ self: { mkDerivation { pname = "exact-combinatorics"; version = "0.2.0.8"; - sha256 = "32a822b109ab6e9f62fe23d76bd5af593c20ba0e589005d3985ccda00dd4475e"; + sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Efficient exact computation of combinatoric functions"; license = stdenv.lib.licenses.bsd3; }) {}; + "exact-cover" = callPackage + ({ mkDerivation, base, containers, tasty, tasty-hunit }: + mkDerivation { + pname = "exact-cover"; + version = "0.1.0.0"; + sha256 = "0qnnr1ri953jybgifivpkjmnq72n67bm2rmiaqhzx4ck01x0grz4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; + homepage = "https://github.com/arthurl/exact-cover"; + description = "Efficient exact cover solver"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exact-pi" = callPackage ({ mkDerivation, base, numtype-dk }: mkDerivation { pname = "exact-pi"; version = "0.4.1.2"; - sha256 = "b2bbe6725fba3bd2f3a9506e2ff4f194fa6cdb918d59debabd5e1fc452fc45e3"; + sha256 = "1qs5zi9c87sypnxdwncdj7dnrylly7s2yvjhm7rx4fxsbxrfdfxj"; libraryHaskellDepends = [ base numtype-dk ]; homepage = "https://github.com/dmcclean/exact-pi/"; description = "Exact rational multiples of pi (and integer powers of pi)"; @@ -61020,7 +65001,7 @@ self: { mkDerivation { pname = "exact-real"; version = "0.12.2"; - sha256 = "b9ee21fee70de5b0daa317ed5e2f7f12bdc1240f6206f351fdfd60b344530a66"; + sha256 = "0rhaad2b6q7xzm8z61k21wjc3g8jgwpmxv8plgdb1r8dwzz23vmr"; libraryHaskellDepends = [ base integer-gmp memoize random ]; testHaskellDepends = [ base checkers directory doctest filepath groups QuickCheck random @@ -61038,7 +65019,7 @@ self: { mkDerivation { pname = "exception-hierarchy"; version = "0.0.0.2"; - sha256 = "8c899c08ce4cc7b3d599d1938ddfb12c03ac7b6088ed24a4ae1f62f1eb1d67d2"; + sha256 = "1lk73pmz2qhzmsj29vc8c1xsq0rcn7gqv4yik7av7iscrq49r2cc"; libraryHaskellDepends = [ base template-haskell ]; homepage = "yet"; description = "Exception type hierarchy with TemplateHaskell"; @@ -61051,7 +65032,7 @@ self: { mkDerivation { pname = "exception-mailer"; version = "0.4.1"; - sha256 = "43a8080ce813dc918dddf6a9372a84d938666fb8d8a96e1cb0b1d10752861f19"; + sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23"; libraryHaskellDepends = [ base hslogger mime-mail text ]; homepage = "https://github.com/drpowell/exception-mailer"; description = "Catch all runtime exceptions and send an email"; @@ -61065,7 +65046,7 @@ self: { mkDerivation { pname = "exception-monads-fd"; version = "0.2"; - sha256 = "71d3a82f85ba38164fdfb69f11aafd288cd13dad7763053070c88029608a30f3"; + sha256 = "1wrhi9h2k068f0q0aqvpmlyx3318znm137xnvx7icf5shlpsilvi"; libraryHaskellDepends = [ base exception-transformers monads-fd transformers ]; @@ -61081,8 +65062,8 @@ self: { }: mkDerivation { pname = "exception-monads-tf"; - version = "0.4"; - sha256 = "0fa6b5abb40ae3b1cb8664cd955ec37d7ff17e73ccddacdeebbc5bf2806a2a4d"; + version = "0.4.0.1"; + sha256 = "1wf1ab4wrrw3c8ifd44rgckqkkyc0pb3m7k0pnv22kfkcimz2hs4"; libraryHaskellDepends = [ base exception-transformers monads-tf transformers ]; @@ -61096,7 +65077,7 @@ self: { mkDerivation { pname = "exception-mtl"; version = "0.4.0.1"; - sha256 = "ec13bcbae6cdde218a7118a2bd3058493af09a330b86e28469a278c9b2cea134"; + sha256 = "0d51rsrcjy52d62f51hb6fdg0fj9b0qbv8hqf6523pndwsxbq4zc"; libraryHaskellDepends = [ base exception-transformers mtl transformers ]; @@ -61111,7 +65092,7 @@ self: { mkDerivation { pname = "exception-transformers"; version = "0.4.0.5"; - sha256 = "564caaaac6c2d1759a13d2c2c8a1d7a4b0109035558c4641fa7a8a378961088b"; + sha256 = "12q8c64kg2ksz90ld32m6n811c54syhwihnj2fd7blf2qsmalk2n"; libraryHaskellDepends = [ base stm transformers transformers-compat ]; @@ -61128,7 +65109,7 @@ self: { mkDerivation { pname = "exceptional"; version = "0.3.0.0"; - sha256 = "da866ed28ea14d245cc065271f4ddd6da0a91b83e8d83daddcd1ef0623e99f06"; + sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns"; libraryHaskellDepends = [ base exceptions ]; homepage = "https://github.com/"; description = "Essentially the Maybe type with error messages"; @@ -61143,9 +65124,9 @@ self: { mkDerivation { pname = "exceptions"; version = "0.8.3"; - sha256 = "4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be"; - revision = "1"; - editedCabalFile = "fc13261461399b8610d60468757f2fc0a62ed660dee998f4329e33dd76d2191b"; + sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd"; + revision = "2"; + editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -61163,7 +65144,7 @@ self: { mkDerivation { pname = "execs"; version = "0.1.0.0"; - sha256 = "024cb1f39efb7ab8e9bf2dbd9c4ef20872faf0dc4aa39c5f2070860cd455d313"; + sha256 = "04ykapa0r1kh41grr8savkqglwh8y979rg9dpzlvhypvkvrv2k02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -61181,7 +65162,7 @@ self: { mkDerivation { pname = "executable-hash"; version = "0.2.0.4"; - sha256 = "34eaf5662d90d3b7841f66b322ac5bc54900b0e3cb06792852b08b3c05a42ba4"; + sha256 = "191blh2kr2xha8l7j1nbwfq00jf5bfn25cv63y2bglwh5mkgbsil"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -61203,8 +65184,8 @@ self: { ({ mkDerivation, base, directory, filepath, unix }: mkDerivation { pname = "executable-path"; - version = "0.0.3"; - sha256 = "8c7215ed4c3cd558f89dc862d21cf9dab3c6b762f4f90c0c1be9e3141c46e5c9"; + version = "0.0.3.1"; + sha256 = "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww"; libraryHaskellDepends = [ base directory filepath unix ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "Finding out the full path of the executable"; @@ -61221,9 +65202,9 @@ self: { mkDerivation { pname = "exference"; version = "1.6.0.0"; - sha256 = "303f1deaba594489712351b969b6bc93dc27272b03848b28e44cfe61b5a5cad2"; + sha256 = "1lnalnsn3zjcwhl8p1035ckjgp4kpjv6kfai4dqqji2rpbm1sgrh"; revision = "3"; - editedCabalFile = "e3f9d32a394fc1790ce74c5a9ba629f97dbd3a11796d4ac1e5f642f76802cc56"; + editedCabalFile = "0mnc09lgfhpnwp0llvbr24xbszgr56k9nnjcww67khag74md7yg3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61247,8 +65228,8 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.3"; - sha256 = "4cda23481da99bf008046726ed4c31ecec5eb41222a11e067a4d7e0f2dda783a"; + version = "1.1.4"; + sha256 = "02w75q9k2w5ggribz4ifbh23smznmdp1698d2mip0c2f8p4klskl"; libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; @@ -61267,7 +65248,7 @@ self: { mkDerivation { pname = "exherbo-cabal"; version = "0.2.1.1"; - sha256 = "30b744eced087cbffc9b631e0e4cdd150bf78c13db2363411ddf3330a6c6da3d"; + sha256 = "0gfsqsk30cyz3m0n68yv2f6gf2qmvm60w7k3kgybyz08xpn49drh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61288,7 +65269,7 @@ self: { mkDerivation { pname = "exif"; version = "3000.0.0"; - sha256 = "911b286d849eeb12dde1cdb964ddeda4cfe6784de2008440e0d1713c66271470"; + sha256 = "0w0l4xk3qwfiw10880729mwfdkx4xpfn9ffdw7fi5swyhinjh6wi"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ exif ]; description = "A Haskell binding to a subset of libexif"; @@ -61297,25 +65278,25 @@ self: { }) {inherit (pkgs) exif;}; "exinst" = callPackage - ({ mkDerivation, aeson, base, bytes, constraints, deepseq - , generic-random, hashable, profunctors, QuickCheck, singletons - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal + , constraints, deepseq, hashable, profunctors, QuickCheck + , singletons, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "exinst"; - version = "0.3"; - sha256 = "3edfe07ca71b4c296349661f8f2d496100d3b44ae72af8ce1ab7f76f1adddb11"; + version = "0.4"; + sha256 = "0n7fk3gjwyvw8k9paznwfgc8bgg7aiz9brfzkcfl3q57hr84dwj9"; libraryHaskellDepends = [ - aeson base bytes constraints deepseq hashable profunctors - QuickCheck singletons + aeson base binary bytes cereal constraints deepseq hashable + profunctors QuickCheck singletons ]; testHaskellDepends = [ - aeson base bytes constraints deepseq generic-random hashable - profunctors QuickCheck singletons tasty tasty-hunit + aeson base binary bytes bytestring cereal constraints deepseq + hashable profunctors QuickCheck singletons tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/k0001/exinst"; - description = "Derive instances for your existential types"; + description = "Recover type indexes and instances for your existentialized types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -61325,7 +65306,7 @@ self: { mkDerivation { pname = "exinst-aeson"; version = "0.2"; - sha256 = "595b0b7b597f73c823a2ceb4758090f09a03b340351ce9abed2f94ece661168b"; + sha256 = "12qnc7kfr51gxnmyj71m82rh76phj207bd6fl8iwhwvzb5xhnnsr"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; @@ -61340,7 +65321,7 @@ self: { mkDerivation { pname = "exinst-bytes"; version = "0.2"; - sha256 = "d25e758ddd2353046204415655b20f7f3f0639db1cb8b8f5b6b24e498777b267"; + sha256 = "0rxjfy3ljkmjnvsvif0wvcwhcgvz1yr5amj10ii08lr3vn6papnj"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; @@ -61355,7 +65336,7 @@ self: { mkDerivation { pname = "exinst-deepseq"; version = "0.2"; - sha256 = "3fc11e61a23996cd923189bc1ef6d67f0c0d2190a021b73cc623476a78c12e61"; + sha256 = "0q9fq5w6lir3qqybf8d0j0hhs33zsvv1xg49669cv5irl9hixh9z"; libraryHaskellDepends = [ base constraints deepseq exinst ]; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `deepseq` library for your existential types"; @@ -61368,7 +65349,7 @@ self: { mkDerivation { pname = "exinst-hashable"; version = "0.2"; - sha256 = "be4da58f52ffeb99730063d8adc24a1b4635611b3f08f5bbff49fe9cc620e5f0"; + sha256 = "1w754339rzj9zyxza21z3dhkaihv9b1avn3301rrkszzaa7sakdy"; libraryHaskellDepends = [ base constraints exinst hashable singletons ]; @@ -61387,7 +65368,7 @@ self: { mkDerivation { pname = "existential"; version = "0.2.0.0"; - sha256 = "756bf090bdf84aae4ffb8f3f7ceefe95eb772853d71edc369dd789d9fde6136e"; + sha256 = "0vhkwvyxk2fpklvdq7npacl7gswmzvp7qgwgzd7swjpqpn8g0svm"; libraryHaskellDepends = [ base cereal constraints control-invariants lens portable-template-haskell-lens QuickCheck quickcheck-report @@ -61405,7 +65386,7 @@ self: { mkDerivation { pname = "exists"; version = "0.2"; - sha256 = "fe69c878ed93c8e5aade799c458edaca06b16c4548512ee8b4a0e32a8f13fbb8"; + sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy"; libraryHaskellDepends = [ base contravariant ]; homepage = "http://github.com/glehel/exists"; description = "Existential datatypes holding evidence of constraints"; @@ -61418,7 +65399,7 @@ self: { mkDerivation { pname = "exit-codes"; version = "0.1.1.0"; - sha256 = "0185d88b9594cd286d67bba6bf24ebe1be559310552ec7fe3f6d2b0f272f1f6d"; + sha256 = "0v8z5wkhyavd7zzcfbjm229mbgp1xcjbz9mvcxnjikcljn5xi181"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/JustusAdam/exit-codes"; description = "Exit codes as defined by BSD"; @@ -61430,7 +65411,7 @@ self: { mkDerivation { pname = "exp-extended"; version = "0.1.1.2"; - sha256 = "19807ac0d486cf493c1ffeab200514dd96f8b5914c506ea4bac10e1030b7ae7a"; + sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r"; libraryHaskellDepends = [ base compensated log-domain ]; homepage = "http://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; @@ -61446,7 +65427,7 @@ self: { mkDerivation { pname = "exp-pairs"; version = "0.1.5.2"; - sha256 = "8dadc2dc4b4f666c9fe70068634a1eb07598943d6ace86560878ed8ec0aeac9d"; + sha256 = "17dcmv08xvbq11b8dkka7na9hxdh3r566s00wygnqrjg9gfc5bcd"; libraryHaskellDepends = [ base containers deepseq ghc-prim wl-pprint ]; @@ -61464,7 +65445,7 @@ self: { mkDerivation { pname = "expand"; version = "0.0.1"; - sha256 = "5a2f0b07681eef3a866d8788aec594780fbc5df8127d543e20efa26b537e0a45"; + sha256 = "0i8agr9np8pg40z58z8jz1fvq3vqjk2sx247dn33mvqyd03hnbss"; libraryHaskellDepends = [ AspectAG base HList murder uu-parsinglib ]; @@ -61480,7 +65461,7 @@ self: { mkDerivation { pname = "expat-enumerator"; version = "0.1.0.3"; - sha256 = "bd0eb05a626be3af5eac5250a1961a64ed3619816bfb9bd29524499c94a2942a"; + sha256 = "0alllaa9qj94jp99pyvbh4ckdvb43aba2l2jmigazqvbc9db03mx"; libraryHaskellDepends = [ base bytestring enumerator hexpat text transformers xml-types ]; @@ -61497,7 +65478,7 @@ self: { mkDerivation { pname = "expiring-cache-map"; version = "0.0.6.1"; - sha256 = "0e3bc294978b46ee59bf0b4a7e7a5bd7ed5da7bc261ffebdb0cb1b60353c64b9"; + sha256 = "1fb47hsn06ybn2yzw7r6pjkmvvfpbdx7wjhbpxcywilbjyac4fqf"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -61514,7 +65495,7 @@ self: { mkDerivation { pname = "expiring-mvar"; version = "0.1"; - sha256 = "de9fc8b0e9d3041c928b810b23f228fa5ec20d4aa30835d093ba6d43463b6c56"; + sha256 = "0mkc7d346vdsjg83a253986w4pps53r262w1if91q16kx6qci7yy"; libraryHaskellDepends = [ base ]; description = "Create values which expire after a period of time"; license = stdenv.lib.licenses.bsd3; @@ -61525,7 +65506,7 @@ self: { mkDerivation { pname = "explain"; version = "0.1.0.1"; - sha256 = "a2cb9dd32999ef8261d87ada4d0533e9fb99bbe39f91b9924e0189570b8bc892"; + sha256 = "14n8ic5mg2819s9bk4czwfxrkyz96c2lvnksv1hq5vwr579rvjx2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -61542,7 +65523,7 @@ self: { mkDerivation { pname = "explicit-determinant"; version = "0.1.0.0"; - sha256 = "9ed4750f815408ee8d43185ba57f964e5bd093e8373b81621da5c3fde99a403c"; + sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jwaldmann/haskell-explicit-determinant"; description = "explicit computation of determinant of small matrices"; @@ -61554,8 +65535,8 @@ self: { ({ mkDerivation, base, deepseq, transformers }: mkDerivation { pname = "explicit-exception"; - version = "0.1.8"; - sha256 = "7fee7a3781db3c3bf82079e635d510088dbb6f4295fde887c603819ec14cd16f"; + version = "0.1.9"; + sha256 = "1kxx42kzm3r0mji7756yblpr7ys3lhx937jixgm8q1zsyg36m2hz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq transformers ]; @@ -61569,7 +65550,7 @@ self: { mkDerivation { pname = "explicit-iomodes"; version = "0.6.0.5"; - sha256 = "ed376a5af54934624af64bae2d2233d56366f2fe838c3e4ef537aa68fc0f3f47"; + sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd"; libraryHaskellDepends = [ base base-unicode-symbols tagged ]; homepage = "https://github.com/basvandijk/explicit-iomodes/"; description = "File handles with explicit IOModes"; @@ -61582,7 +65563,7 @@ self: { mkDerivation { pname = "explicit-iomodes-bytestring"; version = "0.2.0.2"; - sha256 = "129ac02fbe52ca948a0d9bdcfbda20e9b5fc30b48924a847fea83fd1e6a36d40"; + sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj"; libraryHaskellDepends = [ base bytestring explicit-iomodes ]; homepage = "https://github.com/basvandijk/explicit-iomodes-bytestring/"; description = "Extends explicit-iomodes with ByteString operations"; @@ -61595,7 +65576,7 @@ self: { mkDerivation { pname = "explicit-iomodes-text"; version = "0.1.0.8"; - sha256 = "cf576820f38d549ddd7870bbcdbad6b5aba1c89e1fcdf29643970719142fde8a"; + sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg"; libraryHaskellDepends = [ base explicit-iomodes text ]; homepage = "https://github.com/basvandijk/explicit-iomodes-text/"; description = "Extends explicit-iomodes with Text operations"; @@ -61608,7 +65589,7 @@ self: { mkDerivation { pname = "explicit-sharing"; version = "0.9"; - sha256 = "f8ca7db78e9f971019ae2b01683ca40dff7c24e86cbadd9aa3bf02134dd9504b"; + sha256 = "0jshv56i60mzlfddvfkcx0j7rzqdlhy6h09bmqci15wzisvpvjpq"; libraryHaskellDepends = [ base containers derive mtl template-haskell ]; @@ -61623,7 +65604,7 @@ self: { mkDerivation { pname = "explore"; version = "0.0.7.2"; - sha256 = "cc057ea8adeaa2ca16c34d2d7ce5a2966a432bcde26a28a8d7f14bc1137fa2a3"; + sha256 = "18x2gw9w2jzisyl2hsp2rlml6slnlbjpqbadqcbcm8pamnl7w1fc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base directory pngload ]; @@ -61641,9 +65622,9 @@ self: { mkDerivation { pname = "exposed-containers"; version = "0.5.5.1"; - sha256 = "6762b8c800e81710bb00ab345e61fcf3d76044eeb290dcdfc5b4bdde14249325"; + sha256 = "09ck4hadxgdlqpgxr45jxr261mzkzihmwd5b02xi05z8034bhqk7"; revision = "1"; - editedCabalFile = "25516f8a7288ce438b872a0d3054434c3ba48ce0ce8a57209ea6d78ce6e2665c"; + editedCabalFile = "0p36wbk8rmx6kqh5g2nfw26a8fsc8da3039ahy5l7kl8fa56yl95"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -61659,7 +65640,7 @@ self: { mkDerivation { pname = "expression-parser"; version = "0.1"; - sha256 = "1aa304d83d433b473596f47c8712a64670b812ae57a2a748f76b08c4840bb7d1"; + sha256 = "1ldp1f2c823byx4ag8jpmq9bhw26lq98fz7ljqslffs37pc098qs"; libraryHaskellDepends = [ base ]; description = "Generalization of parsec's expression parser"; license = stdenv.lib.licenses.bsd3; @@ -61672,7 +65653,7 @@ self: { mkDerivation { pname = "extcore"; version = "1.0.2"; - sha256 = "6790bef1e3dba2209c3744f1178cbbe9ee93d6b6e8cd0e33fea315bb5623f6b6"; + sha256 = "1dpn4dbbn5d3zqrhxkg8nvb97vp9pf61gwa46yf218nvwgqvx437"; libraryHaskellDepends = [ array base bytestring containers directory filepath mtl parsec pretty syb @@ -61691,7 +65672,7 @@ self: { mkDerivation { pname = "extemp"; version = "0.0.1"; - sha256 = "be83a40941c7c0c1f0b3e92cb6a7edad924ecbf9c7a1e13e7498c818f4fe6aed"; + sha256 = "1vbazvs1ij4qfhzf38f7z75lx4mdxnkvcb79ngqc3h67844s90xy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -61711,7 +65692,7 @@ self: { mkDerivation { pname = "extended-categories"; version = "0.2.0"; - sha256 = "e2e016c10bf167fe47277b8fedf3ad6c524c507dffabe7ebd8e5d1aff1fee9b5"; + sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72"; libraryHaskellDepends = [ base constraints ghc-prim tagged ]; homepage = "github.com/ian-mi/extended-categories"; description = "Extended Categories"; @@ -61727,9 +65708,9 @@ self: { mkDerivation { pname = "extended-reals"; version = "0.2.2.0"; - sha256 = "f24538c29ffadf26fb9e3808e0fd5f326623a4d2588d1a985894e951019e9a93"; + sha256 = "14wskq0m3sclb2c1m3aqsaj26rijbzyy021qkvxjdpzskz13higj"; revision = "1"; - editedCabalFile = "0d70181cd2955b402bc4ea02edb0cdbd0628ad74f7299f4b692f18a1da0fc7fc"; + editedCabalFile = "1z671zda261gd55ryagpfjnjh1mxrnqfs0paqhml0nwms8f1hw0d"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck test-framework test-framework-hunit @@ -61748,7 +65729,7 @@ self: { mkDerivation { pname = "extensible"; version = "0.3.7"; - sha256 = "05ae22329761fe7b455544013d13439fd5208b0191a97d9b3e3e81ec7a32e38e"; + sha256 = "13p369xfr09y7sdpvaci065j1mcz8c9ks0a4am2ppzk1jwr25bh5"; libraryHaskellDepends = [ base constraints monad-skeleton profunctors tagged template-haskell transformers @@ -61758,7 +65739,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extensible_0_4" = callPackage + "extensible_0_4_2" = callPackage ({ mkDerivation, base, comonad, constraints, criterion, deepseq , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton , mtl, primitive, profunctors, semigroups, tagged, template-haskell @@ -61766,8 +65747,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.4"; - sha256 = "f9fbd703c2ac7b2790446cb04281d3577848797d53413374e5c1987afcec3a1c"; + version = "0.4.2"; + sha256 = "1djsc3g3kvrm8n5sl5hbjv40fmclrdss9m9fdyl5cski1j94dhhk"; libraryHaskellDepends = [ base comonad constraints deepseq ghc-prim monad-skeleton mtl primitive profunctors semigroups tagged template-haskell @@ -61790,7 +65771,7 @@ self: { mkDerivation { pname = "extensible-data"; version = "0.1.0.4"; - sha256 = "cf2855cb8cd86ea5aa671482a9d15702b7d0c71ea6531088deb32611f8a06c90"; + sha256 = "143cl3w129mkvs410lx63v3x1dq2az8sk0hlcymaavnqik5maa6g"; libraryHaskellDepends = [ base data-lens hashable template-haskell unordered-containers ]; @@ -61807,8 +65788,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "1.11.0.4"; - sha256 = "af92fba899d4414f615341a7b4df6808d4f13140330f0962c9e0ef53f9227913"; + version = "1.11.1.0"; + sha256 = "1z2k79pxy73rh7fxp70zbnzrcnqs9kchwm6hciyl2wr66bf58v4b"; libraryHaskellDepends = [ base transformers transformers-base type-aligned void ]; @@ -61827,18 +65808,30 @@ self: { mkDerivation { pname = "extensible-exceptions"; version = "0.1.1.4"; - sha256 = "6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388"; + sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc"; libraryHaskellDepends = [ base ]; description = "Extensible exceptions"; license = stdenv.lib.licenses.bsd3; }) {}; + "extensible-sp" = callPackage + ({ mkDerivation, base, lens }: + mkDerivation { + pname = "extensible-sp"; + version = "0.1.0.0"; + sha256 = "0s51rvsg41dymk173fxf7065yynlgx234xjs149lzm00gcwv92r6"; + libraryHaskellDepends = [ base lens ]; + homepage = "https://github.com/githubuser/extensible-sp#readme"; + description = "light-weight, extensible sums and products over types and kinds"; + license = stdenv.lib.licenses.mit; + }) {}; + "external-sort" = callPackage ({ mkDerivation, base, binary, bytestring, EdisonAPI, EdisonCore }: mkDerivation { pname = "external-sort"; version = "0.2"; - sha256 = "291b74747478de0407d1bea721efb5160a3432d2bc6a62b9d9de1126201ff8c4"; + sha256 = "1i7q3wh2c4fyv6wn4smws8r382hnnppj39xys43h9pkqfis786r9"; libraryHaskellDepends = [ base binary bytestring EdisonAPI EdisonCore ]; @@ -61852,8 +65845,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.5.1"; - sha256 = "8f3397c7a176045f1bb3b2a181e36b54192cb6fb5e99a9d28552975130ec49fc"; + version = "1.5.3"; + sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -61865,6 +65858,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_6" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.6"; + sha256 = "1pqlggdbbhfj71yaby5595shf4hpzv9700sczksgy36qz9bfcrh7"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base clock directory filepath QuickCheck unix + ]; + homepage = "https://github.com/ndmitchell/extra#readme"; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -61872,7 +65885,7 @@ self: { mkDerivation { pname = "extract-dependencies"; version = "0.2.0.1"; - sha256 = "927fe70508cc8624585e31602c305281169e91270e10c624ae48cd7c0aac1c12"; + sha256 = "04hwmh57rka8mqjcc40f4y8rw5l1a8q2qq1ibrc291nc102yfzwj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61886,6 +65899,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "extractable-singleton" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "extractable-singleton"; + version = "0.0.1"; + sha256 = "1bf0naqx0gb66dr7g58lfaba87zmg09ynzdb3cyyymwcv4l1knp8"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/athanclark/extractable-singleton#readme"; + description = "A functor, where the \"stored\" value is isomorphic to Identity"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extractelf" = callPackage ({ mkDerivation, base, bytestring, bytestring-mmap, directory, elf , filepath, optparse-applicative @@ -61893,7 +65918,7 @@ self: { mkDerivation { pname = "extractelf"; version = "0.1.0.0"; - sha256 = "12dfbad45b41874d4cd2f77afaf9861bf38d68efc92a9e1b9efdfc0838fe8b8f"; + sha256 = "13wbzqw0iz7xkqdrwan9xxl8vwqvhvwzlypps964v1s1bgabmpqj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -61906,6 +65931,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "extralife" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, text, time + }: + mkDerivation { + pname = "extralife"; + version = "0.1.0.1"; + sha256 = "1244qnx99npwq4l6mw5ddh8qz3kcz54phhl2q0fxjmnfsfz8cs3n"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls text time + ]; + homepage = "https://github.com/wuest/haskell-extralife-api"; + description = "API Client for ExtraLife team and user data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ez-couch" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit @@ -61917,7 +65958,7 @@ self: { mkDerivation { pname = "ez-couch"; version = "0.7.0"; - sha256 = "c0980584148a3ca5c3e3dbd6031bc73f9c73b7bb5ae943ca452f537d66ce7c08"; + sha256 = "023wrrk7slrg8p547saspfvp771zqwdh7mnvwg1sag4a2j20b660"; libraryHaskellDepends = [ aeson attoparsec attoparsec-conduit base blaze-builder bytestring classy-prelude classy-prelude-conduit containers ghc-prim hashable @@ -61936,7 +65977,7 @@ self: { mkDerivation { pname = "faceted"; version = "0.0.2.0"; - sha256 = "0374e69df55022c99b537eebcd156bbed3ecea53285910eaf5fd5d9c4553ef2a"; + sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03"; libraryHaskellDepends = [ base free ]; homepage = "http://github.com/haskell-faceted/haskell-faceted"; description = "Faceted computation for dynamic information flow security"; @@ -61951,7 +65992,7 @@ self: { mkDerivation { pname = "factory"; version = "0.2.2.1"; - sha256 = "609110e81f03977ae089b8b5237339543d0023c8f02f5c16415ed79b4f9ca597"; + sha256 = "15x5ki7rpmsy84b5qbzhr0ih0gal75rj7ddqi7h7m5q33zl114b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61979,7 +66020,7 @@ self: { mkDerivation { pname = "factual-api"; version = "0.6.1"; - sha256 = "b7451a99bbe3626ad12e1fee646dff0435e64094d8d75e6eb3f81c418b9351da"; + sha256 = "1njijf5l277qndp5xmyqji0fcd84zxnn9vhz5v8nlqp3pfcilidp"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers curl dataenc hoauth HTTP MissingH text unordered-containers utf8-string vector @@ -61995,7 +66036,7 @@ self: { mkDerivation { pname = "fad"; version = "1.1.0.1"; - sha256 = "f5fd6064edcbef46e16342ee0db321f72d5202e3f7f06fb340c893a0dca8c502"; + sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/bjornbm/fad"; description = "Forward Automatic Differentiation"; @@ -62010,7 +66051,7 @@ self: { mkDerivation { pname = "fadno-braids"; version = "0.0.5"; - sha256 = "97f99926a2481fc9a0964b35b377ee206623d087b36a842fcbf66541890d39d8"; + sha256 = "1n1r1n4l2rgnrcpq8smkhz826ri0xrvv6dabjshcj7s8l8k9kycp"; libraryHaskellDepends = [ base containers data-default diagrams diagrams-lib diagrams-rasterific lens random transformers-compat @@ -62027,7 +66068,7 @@ self: { mkDerivation { pname = "fadno-xml"; version = "1.0.3"; - sha256 = "714e0e438827c4fee58fdced7cd018490f37705e830da428f77d58fa8268cccf"; + sha256 = "1kycd21gln3xywla83c3brq3f3s93387rvfwizjzxi17i11hwkki"; libraryHaskellDepends = [ base containers Decimal lens mtl parsec xml ]; @@ -62042,7 +66083,7 @@ self: { mkDerivation { pname = "fail"; version = "4.9.0.0"; - sha256 = "6d5cdb1a5c539425a9665f740e364722e1d9d6ae37fbc55f30fe3dbbbb91d4a2"; + sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d"; doHaddock = false; homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail"; description = "Forward-compatible MonadFail class"; @@ -62054,7 +66095,7 @@ self: { mkDerivation { pname = "failable-list"; version = "0.2"; - sha256 = "dd008e4a9bf81d04ab9a683ee25cb1265453e814219e5034964c594e6cc2002f"; + sha256 = "0bq0q9n4wnacjqs517i12kl56m16n5ff4gk8kamh87gqkd58w06x"; libraryHaskellDepends = [ base ]; description = "A list-like type for lazy streams, which might terminate with an error"; license = stdenv.lib.licenses.bsd3; @@ -62065,7 +66106,7 @@ self: { mkDerivation { pname = "failure"; version = "0.2.0.3"; - sha256 = "77285693b66edcc4a8a4c52807f25ed0232a8f89d82ef7abe5077f43ba60354a"; + sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; libraryHaskellDepends = [ base transformers ]; homepage = "http://www.haskell.org/haskellwiki/Failure"; description = "A simple type class for success/failure computations. (deprecated)"; @@ -62079,7 +66120,7 @@ self: { mkDerivation { pname = "failure-detector"; version = "0"; - sha256 = "3089dbca68f42f1d753175573e95ee9269102b88f9fcb572f00e6673b2a9ec7b"; + sha256 = "0yzcm6r76rhfy1rbbz7ri0mi0scjxsakwmvm65sisbzld35dp29h"; libraryHaskellDepends = [ base containers statistics time ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck time @@ -62093,7 +66134,7 @@ self: { mkDerivation { pname = "fair-predicates"; version = "0.1.1"; - sha256 = "46d61503d9bf93ebcddf2116c1a2958875cf7a1582fc28a4fe90efeade400cfc"; + sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6"; libraryHaskellDepends = [ base ]; homepage = "http://sebfisch.github.com/fair-predicates"; description = "Fair Predicates"; @@ -62105,7 +66146,7 @@ self: { mkDerivation { pname = "fake-type"; version = "0.2.0.0"; - sha256 = "3ce6a7298e92c836272d71fb9f604cb37d2c90a2394720c6b67c1b6f21063c54"; + sha256 = "0m1w0qhny6vwnv320irrla82qzdk9ih9zyvi5lkkdj4jiqlsgriw"; libraryHaskellDepends = [ base base-prelude split X11 ]; librarySystemDepends = [ libXtst ]; homepage = "http://github.com/aelve/fake-type"; @@ -62119,7 +66160,7 @@ self: { mkDerivation { pname = "faker"; version = "0.0.0.2"; - sha256 = "786a74e347813217f5c564e009ff70756e0952b64dc931d13f6ec5a6469780f2"; + sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq"; libraryHaskellDepends = [ base gimlh random split ]; homepage = "https://github.com/gazay/faker"; description = "Pure Haskell library for generating fake data"; @@ -62133,7 +66174,7 @@ self: { mkDerivation { pname = "falling-turnip"; version = "0.1.0.0"; - sha256 = "f341317b8935ca620d4e4e8074788c3e245f54ec3e566acd275c2ebea594b90c"; + sha256 = "035rjjjvwbjw4z6nlmiyxia5y91yiiw7902f9q6n5jimi5xk2hgk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -62153,7 +66194,7 @@ self: { mkDerivation { pname = "fallingblocks"; version = "0.1.4"; - sha256 = "20d3cfcbe4d1918ade5e4a3580c5ccbc5f43d8a1bf225058339a9106c76805a2"; + sha256 = "18h5d33hd4cs6dc508mzl7c46pxwrk2q0daabvg8m4fiwk5wzlr0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -62172,7 +66213,7 @@ self: { mkDerivation { pname = "family-tree"; version = "0.5.1"; - sha256 = "418b93abb88f8be75e39187416348125d367e0cb3a7a00cfe6f07c8fdc30402c"; + sha256 = "0b2063f8yz7hwv7h0yisrgh6glr5h4s1cx0q75gfg2wgp2mr72s1"; libraryHaskellDepends = [ base binary containers hashable intervals lens tables text time unordered-containers @@ -62188,7 +66229,7 @@ self: { mkDerivation { pname = "farmhash"; version = "0.1.0.5"; - sha256 = "0e685a5445f7bce88682d209bccb47d03f06065a627475df44a8e2af8bc20fa1"; + sha256 = "188gqa5szqm88kgpax32b830cgyh8z5vq2fjha3fig7p8ma5ls0f"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion ]; @@ -62205,7 +66246,7 @@ self: { mkDerivation { pname = "fast-builder"; version = "0.0.0.6"; - sha256 = "4a83c2fb4e21ec43d7cf9b2412286e1fea036f7c5cbfd4dcee8914f8b2ae9e1c"; + sha256 = "074ymsrgh549xvfd9gswgiph7shzdql1494vrzbl7v119vxw50sa"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; benchmarkHaskellDepends = [ @@ -62225,7 +66266,7 @@ self: { mkDerivation { pname = "fast-digits"; version = "0.2.1.0"; - sha256 = "ec84576e479202de8257c7c499b66e91bcf18444f7683475d74b575e166dd83b"; + sha256 = "0fyqdlb5wmsbsxsk8s7p8j2g3g4idsv9ki67ay1dw0lj8xp5g17c"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base digits QuickCheck smallcheck tasty tasty-quickcheck @@ -62244,7 +66285,7 @@ self: { mkDerivation { pname = "fast-logger"; version = "2.4.10"; - sha256 = "dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d"; + sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix unix-time @@ -62260,7 +66301,7 @@ self: { mkDerivation { pname = "fast-math"; version = "1.0.2"; - sha256 = "45101ddc8b86402e866ec029bcfbc2662779e578e43b40acd971a9f411e2be95"; + sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425"; libraryHaskellDepends = [ base ]; description = "Non IEEE-754 compliant compile-time floating-point optimisations"; license = stdenv.lib.licenses.bsd3; @@ -62271,7 +66312,7 @@ self: { mkDerivation { pname = "fast-nats"; version = "0.1.0.1"; - sha256 = "8197f83252621182c32350c20f995fb3ad3549499e2fbf2687235ff80024e3ce"; + sha256 = "1kp34h0ghpr3hwkbybwy954kbbdkbychzhjh4g1q44b2a8rgi5w1"; libraryHaskellDepends = [ base ]; description = "Natural Numbers with no overhead"; license = stdenv.lib.licenses.mit; @@ -62285,7 +66326,7 @@ self: { mkDerivation { pname = "fast-tags"; version = "1.3"; - sha256 = "d81da625154eccdf61c81db1f8d041055470c977a33ad29c302482d7441e1fdf"; + sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62312,13 +66353,13 @@ self: { }: mkDerivation { pname = "fast-tagsoup"; - version = "1.0.12"; - sha256 = "6447078da5a85c62528edab1a266ae8709811ba1d113f6dee1ec249e75e3904a"; + 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; }) {}; @@ -62327,7 +66368,7 @@ self: { mkDerivation { pname = "fast-tagsoup-utf8-only"; version = "1.0.5"; - sha256 = "c4b9bdb4bad204e180a9f9816920ec82321b27644587cc95140085bbe5835b83"; + sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4"; libraryHaskellDepends = [ base bytestring tagsoup text ]; homepage = "https://github.com/exbb2/fast-tagsoup"; description = "Fast parser for tagsoup package"; @@ -62342,7 +66383,7 @@ self: { mkDerivation { pname = "fasta"; version = "0.10.4.2"; - sha256 = "2b760dfd5029dee94d56010f8125f4317d6fa675a84817c352311d308d1897be"; + sha256 = "1glp326k079iab1ifj58fnk6yz9iyhjq23q1ar6ykpi9a3yhsxib"; libraryHaskellDepends = [ attoparsec base bytestring containers foldl lens parsec pipes pipes-attoparsec pipes-bytestring pipes-group pipes-text split text @@ -62357,7 +66398,7 @@ self: { mkDerivation { pname = "fastbayes"; version = "0.2.0.0"; - sha256 = "958d6da0e807f2294cff0b10c395eb0b734eea3d6ef1fc1d5da33dc4617619db"; + sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm"; libraryHaskellDepends = [ base hmatrix vector ]; homepage = "https://github.com/cscherrer/fastbayes"; description = "Bayesian modeling algorithms accelerated for particular model structures"; @@ -62370,9 +66411,9 @@ self: { mkDerivation { pname = "fastcgi"; version = "3001.0.2.4"; - sha256 = "b91faff0f2316105147d4d95bd4ff5f9f3437a8007aac93feb830094003fe152"; + sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr"; revision = "1"; - editedCabalFile = "74cd87692a90492171802f25c034ef047f0b68aaa1b53303d4e50ce3ec30e98a"; + editedCabalFile = "12p963nf6375sh1k7dd1m9l0nzq4xwsc099gh1qj2jch59lqgkbl"; libraryHaskellDepends = [ base bytestring cgi ]; librarySystemDepends = [ fcgi ]; description = "A Haskell library for writing FastCGI programs"; @@ -62387,7 +66428,7 @@ self: { mkDerivation { pname = "fastedit"; version = "0.1.0.0"; - sha256 = "d275d7642e611c5cd8ba8ac3759380f40ff486eb80afd4324bc396e396e5a52b"; + sha256 = "0ax5wnbf75n39crd9bw0xf3g83zlh29pbhwapbc5q7315rjdfxfj"; libraryHaskellDepends = [ base base-prelude bytestring containers hashable safe unordered-containers @@ -62408,7 +66449,7 @@ self: { mkDerivation { pname = "fastirc"; version = "0.2.0"; - sha256 = "a4c62fb47a03a68f08ec2207ef8b45d0bf49195f3e6989240103ce14f865aa35"; + sha256 = "0ddacpw19kh304j8js9ybwclkgyh8n5yy1r2xh48z9h3gas2zim4"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-show containers monadLib network-fancy @@ -62418,6 +66459,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fastparser" = callPackage + ({ mkDerivation, base, bytestring, bytestring-lexing, containers + , microlens, thyme, vector-space + }: + mkDerivation { + pname = "fastparser"; + version = "0.3.0"; + sha256 = "1dg7nsyn2qrf37x1512kzxhg2ldwkfngsy0jc4y2szd37i4iqqb4"; + revision = "1"; + editedCabalFile = "1qg6bbar66qxhnh3mdv41m9zrvggwnjszzr42z9x4gybx6anqzfi"; + libraryHaskellDepends = [ + base bytestring bytestring-lexing containers microlens thyme + vector-space + ]; + homepage = "https://github.com/bartavelle/fastparser#readme"; + description = "A fast, but bare bones, bytestring parser combinators library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fastpbkdf2" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , cryptonite, openssl, pbkdf, tasty, tasty-hunit @@ -62425,7 +66485,7 @@ self: { mkDerivation { pname = "fastpbkdf2"; version = "0.1.0.0"; - sha256 = "843103419b79f8fc21062e6842dace2a6e0c214f20c496a4268e1377c512f2f9"; + sha256 = "1ygj2b2pf4wf4sj9di109whhqviarvd44s1f0qhzry3rkd0h6cc4"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -62445,7 +66505,7 @@ self: { mkDerivation { pname = "fathead-util"; version = "0.1.0.0"; - sha256 = "a189bfd05292b26eb8e84261358e827b8d8cac56d6cf7c5096a6e94fb3dd5fb8"; + sha256 = "1f2zvnrlzsd6jr87rkynasn8r3bvha73aqa2x2w6xcljab8bz2d1"; libraryHaskellDepends = [ base bytestring cassava hxt network-uri text ]; @@ -62460,7 +66520,7 @@ self: { mkDerivation { pname = "fault-tree"; version = "0.0.0"; - sha256 = "e0af859850cdcfc2f577e639387f1e17b01cfe8b043bee12c215620da483a612"; + sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0"; libraryHaskellDepends = [ base yices ]; homepage = "http://tomahawkins.org"; description = "A fault tree analysis library"; @@ -62480,9 +66540,9 @@ self: { mkDerivation { pname = "fay"; version = "0.23.1.16"; - sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64"; - revision = "4"; - editedCabalFile = "efe4614bc8832765c649a86b4e4a8c26122af3a5a23cad77676e062e3a85f66c"; + sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4"; + revision = "7"; + editedCabalFile = "07iqrpg2hga3n8m08aq2zizvq27v8hyqzvx5sfz497whjxr9h358"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62504,7 +66564,7 @@ self: { mkDerivation { pname = "fay-base"; version = "0.20.0.1"; - sha256 = "59ce66ae8de469e47ff16e2b565a719c92a93bb0c06ef3f748164a40325dae9e"; + sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr"; libraryHaskellDepends = [ base fay ]; homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; @@ -62518,9 +66578,9 @@ self: { mkDerivation { pname = "fay-builder"; version = "0.2.0.5"; - sha256 = "116dea6dc304834be81d70faec7e3de1fd867ebbda0d02d3c1c6a0f96d2b31a2"; + sha256 = "18ii5dnzk866q79h43fspdz8dzg17mzfrykh3pl4p0q4qdnylv8i"; revision = "4"; - editedCabalFile = "75a6193b829d2d606a20782ca37f4ee8f02baa91d8f49f989e820e51710e3d26"; + editedCabalFile = "09ix1rqm23l2ksc9zx6qj6m2pw789rzs6b3q41m60bcxh8xik9km"; libraryHaskellDepends = [ base Cabal data-default directory fay filepath safe split text ]; @@ -62533,7 +66593,7 @@ self: { mkDerivation { pname = "fay-dom"; version = "0.5.0.1"; - sha256 = "e0f2e4dc11a13c4a9c43d707a3cf24bc1badb585540d24b29e8a6bc6ace1a6fe"; + sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0"; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; @@ -62545,7 +66605,7 @@ self: { mkDerivation { pname = "fay-geoposition"; version = "0.1.0.1"; - sha256 = "38ecfe36f4093ef046901856d15cde00d0fb1e0a71d0609543cac8fdb0e3b3e2"; + sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q"; libraryHaskellDepends = [ fay-base fay-text ]; homepage = "https://github.com/victoredwardocallaghan/fay-geoposition"; description = "W3C compliant implementation of GeoPosition API"; @@ -62557,7 +66617,7 @@ self: { mkDerivation { pname = "fay-hsx"; version = "0.2.0"; - sha256 = "b1fef2c647e7c067fbaffb33094c13c7c7a94c4cf0b1fbdefb4c1ee691b2f2d7"; + sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi"; libraryHaskellDepends = [ fay-base fay-jquery ]; homepage = "http://www.happstack.com/"; description = "Clientside HTML generation for fay"; @@ -62570,7 +66630,7 @@ self: { mkDerivation { pname = "fay-jquery"; version = "0.6.1.0"; - sha256 = "0ff57ef8115e5c3fce1c14cca2509713e945874a2a2976e4646559ff51006f13"; + sha256 = "04vg018zynb5ckj7ca9a9a3lbs8kjx8a5k0l3k73yp2y27w7xx8g"; libraryHaskellDepends = [ fay-base fay-text ]; homepage = "https://github.com/faylang/fay-jquery"; description = "jQuery bindings for Fay"; @@ -62582,7 +66642,7 @@ self: { mkDerivation { pname = "fay-ref"; version = "0.1.0.0"; - sha256 = "96a51eaec9088c16abf75b05c4549c2d0ff31c3fc576522bc77f0418557691b5"; + sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn"; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; @@ -62594,7 +66654,7 @@ self: { mkDerivation { pname = "fay-simplejson"; version = "0.1.3.0"; - sha256 = "b8d711a62c40b587b9266eef199ad83e2f0403c5883a8e1c75f5dc34e8368033"; + sha256 = "0cw06vl39p7mflf8wfl8ql1h8bryv2d1kvvf4swqgda05jk13mxq"; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/Lupino/fay-simplejson"; description = "SimpleJSON library for Fay"; @@ -62607,7 +66667,7 @@ self: { mkDerivation { pname = "fay-text"; version = "0.3.2.2"; - sha256 = "da2a75e803d6d41249f49fa7dd420bc984faaff5e44f697056c93336bf443be0"; + sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans"; libraryHaskellDepends = [ fay fay-base text ]; homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; @@ -62619,7 +66679,7 @@ self: { mkDerivation { pname = "fay-uri"; version = "0.2.0.0"; - sha256 = "d906cd3d903a8aa98388b4488a039a2a380bd4b0da3c63978da8b3f4e79364ef"; + sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr"; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; @@ -62630,29 +66690,29 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bytestring, cereal, conduit, conduit-extra , containers, crypto-api, cryptohash, cryptohash-cryptoapi - , data-default, hspec, http-conduit, http-types, HUnit, lifted-base - , monad-control, monad-logger, old-locale, QuickCheck, resourcet - , text, time, transformers, transformers-base, unordered-containers + , data-default, hspec, http-client, http-conduit, http-types, HUnit + , lifted-base, monad-control, monad-logger, old-locale, QuickCheck + , resourcet, text, time, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "fb"; - version = "1.0.13"; - sha256 = "52af3e05b5721b5d38fea9231e9fde68b0e1987c4cc979acaf6e2f940537935e"; - revision = "1"; - editedCabalFile = "ff5a76303ad659f13394147cf6a3bbc3ee25e0ddf2df684d5b9a199c546dc75c"; + version = "1.1.1"; + sha256 = "0rbzcnd0cw06vfyy3k5f1n0f8hr00ygn5pjdws7ayn2f2hsk9ln8"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash - cryptohash-cryptoapi data-default http-conduit http-types - lifted-base monad-control monad-logger old-locale resourcet text - time transformers transformers-base unordered-containers + cryptohash-cryptoapi data-default http-client http-conduit + http-types lifted-base monad-control monad-logger old-locale + resourcet text time transformers transformers-base + unordered-containers ]; testHaskellDepends = [ aeson base bytestring conduit containers data-default hspec http-conduit HUnit lifted-base monad-control QuickCheck resourcet text time transformers ]; - homepage = "https://github.com/prowdsponsor/fb"; + homepage = "https://github.com/psibi/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -62663,7 +66723,7 @@ self: { mkDerivation { pname = "fb-persistent"; version = "0.3.6"; - sha256 = "9a24e190b70fd3bcd5a70813e50872398217b24d39da76b175cbcbbd693580c6"; + sha256 = "1il06mlvvjybfnqpdnir9nr1g0irf84fa4q8lzavrlqgny8f294s"; libraryHaskellDepends = [ base cereal fb persistent text time ]; homepage = "https://github.com/prowdsponsor/fb-persistent"; description = "Provides Persistent instances to Facebook types"; @@ -62681,7 +66741,7 @@ self: { mkDerivation { pname = "fbmessenger-api"; version = "0.1.2.1"; - sha256 = "9df807a7c6ecf9dc374a17cbda52433b2567aa60753797497c7e043ef6837237"; + sha256 = "0dvjhgv3w13ygi4rfdvmc2m6f99v8d9dmjqp98vxrygcqskhgy4x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62707,7 +66767,7 @@ self: { mkDerivation { pname = "fca"; version = "0.1.0.2"; - sha256 = "770796b02fff924ee67749a10f3a286ef7348a656eb3a04f251ed691892868b0"; + sha256 = "1c38524r3mhy4m7s1cvfcn539xvf50x0z8a9fzk4x4pz5yq9c1vp"; libraryHaskellDepends = [ base bytestring containers cryptohash hashable text unordered-containers @@ -62724,7 +66784,7 @@ self: { mkDerivation { pname = "fcache"; version = "0.1.0.0"; - sha256 = "52340d228a564a7eb0fe84d386075af019540145fbe53b4e20925b746e3a0eae"; + sha256 = "1bhf79p78nwj4173prgv8l0m86ghb83qdlw4zsq7wjjni8i0sd2j"; libraryHaskellDepends = [ base containers hashable mtl unordered-containers ]; @@ -62741,7 +66801,7 @@ self: { mkDerivation { pname = "fcd"; version = "1.0.0.0"; - sha256 = "c6e28f9511a1ab3879ae1565f392b43c9d3d809e7a43a82bc07abf3d2cbc7bfc"; + sha256 = "1z3vphn3vgvsq0mshhvsks03v79wnj9g6r8mmrwkiax126aqzqn6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62760,7 +66820,7 @@ self: { mkDerivation { pname = "fckeditor"; version = "0.1"; - sha256 = "bd18cb1a282478e11d084c3d60fcac139c5e68e0c80801e5206146aed2b47afb"; + sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x"; libraryHaskellDepends = [ base cgi HaXml xhtml ]; homepage = "http://peteg.org/"; description = "Server-Side Integration for FCKeditor"; @@ -62775,7 +66835,9 @@ self: { mkDerivation { pname = "fclabels"; version = "2.0.3.2"; - sha256 = "4d5d83ffc3c8bc610e9c42e19c2e07a1ca68666310261de15703c605047182b0"; + sha256 = "1c42f420bih3azhis9hhcdk6ijm10wp9rqa2kh763g68qgzq6pad"; + revision = "3"; + editedCabalFile = "19gd2jwjpfrmq80gpjk05djhn42vvj88fgka5yr7yaq6mfx103by"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base HUnit mtl template-haskell transformers @@ -62791,7 +66853,7 @@ self: { mkDerivation { pname = "fclabels-monadlib"; version = "0.2.1"; - sha256 = "6de42ff53b6ae613cd49c5e9c6a0157201876c97c66baea75c565a7e737725c8"; + sha256 = "1j15fxrpwnjnbjkswsy6jxn8f0bj2nhcdsf5976i7rka7gsjzr3d"; libraryHaskellDepends = [ base fclabels monadLib ]; description = "MonadLib monadic interface for the \"fclabels\" package"; license = stdenv.lib.licenses.bsd3; @@ -62803,7 +66865,7 @@ self: { mkDerivation { pname = "fdo-notify"; version = "0.3.1"; - sha256 = "7083414bb25e3057f6444722288cebf4ad3e4c2616f95f26079c8c7762989fd8"; + sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh"; libraryHaskellDepends = [ base containers dbus ]; homepage = "http://bitbucket.org/taejo/fdo-notify/"; description = "Desktop Notifications client"; @@ -62817,7 +66879,7 @@ self: { mkDerivation { pname = "fdo-trash"; version = "0.0.0.2"; - sha256 = "7309b49bb844c59dc1abefd16d41a318fdd19f3cf514d963a679fb662b4fc213"; + sha256 = "04y29wmndyvrlrixj57m7jgx3z8qld0nvlggmg0rvia4p2dv82bk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62837,19 +66899,55 @@ self: { mkDerivation { pname = "feature-flags"; version = "0.1.0.1"; - sha256 = "0e4cf7db6791b0875975dfa001d71bf31797b2edbfd2424f6b6202ace7935ad3"; + sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/iand675/feature-flags"; description = "A simple library for dynamically enabling and disabling functionality"; license = stdenv.lib.licenses.mit; }) {}; + "feature-flipper" = callPackage + ({ mkDerivation, base, containers, hspec, mtl, text }: + mkDerivation { + pname = "feature-flipper"; + version = "0.2.0.1"; + sha256 = "16d9cx3cm5ljbi6f5xmnm654hfi8kkw5wrv077k0zv41wzkpn5md"; + libraryHaskellDepends = [ base containers mtl text ]; + testHaskellDepends = [ base containers hspec mtl ]; + homepage = "https://github.com/toddmohney/flipper#readme"; + description = "A minimally obtrusive feature flag library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "feature-flipper-postgres" = callPackage + ({ mkDerivation, base, bytestring, containers, feature-flipper + , hspec, monad-logger, mtl, persistent, persistent-postgresql + , persistent-template, text, time + }: + mkDerivation { + pname = "feature-flipper-postgres"; + version = "0.1.0.1"; + sha256 = "1mhwdqpy3l0dx7cwmxi67yp9mp223ang5vpawsh27ms0p8qbgp95"; + libraryHaskellDepends = [ + base bytestring containers feature-flipper monad-logger mtl + persistent persistent-postgresql persistent-template text time + ]; + testHaskellDepends = [ + base bytestring containers feature-flipper hspec monad-logger mtl + persistent persistent-postgresql + ]; + 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 ({ mkDerivation, base, bytestring }: mkDerivation { pname = "fec"; version = "0.1.1"; - sha256 = "cdcc6ad886afa4ec17c02f4d40790e33030df3dd721f618c5385500358683e13"; + sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://allmydata.org/source/zfec"; description = "Forward error correction of ByteStrings"; @@ -62863,9 +66961,9 @@ self: { mkDerivation { pname = "fedora-packages"; version = "0.0.3"; - sha256 = "133f5bbb01b60a2970ae4fe96616142f97911f14caafa77d2de5dc66cdd9d791"; + sha256 = "14fpv76ndp755mysgbya2hgr35rg2hb6dsagmrq2j2mn06xmngqk"; revision = "1"; - editedCabalFile = "b09d857e6d91527f8c9fbb8626e1610c5c7b994a6fcf30cd3328c668a6e8d33a"; + editedCabalFile = "0fnkx2k6iii86g6k1kvg9acpnp0cc7hjd1mvky67yllidmz8b7dh"; libraryHaskellDepends = [ aeson base bytestring containers HsOpenSSL http-streams io-streams lens text @@ -62887,7 +66985,9 @@ self: { mkDerivation { pname = "feed"; version = "0.3.12.0"; - sha256 = "cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942"; + sha256 = "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc"; + revision = "2"; + editedCabalFile = "0ggpqv0i2k38dl8dqwn159n7ys0xr8shrsr3l838883rs8rrnf1j"; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -62907,7 +67007,7 @@ self: { mkDerivation { pname = "feed-cli"; version = "2009.7.5"; - sha256 = "c158e90fef39477e9243a4c298a910d80a19c816f18c09b7e98dae2a0331143f"; + sha256 = "0gql641jmbldx6vhk37i2v41j2nq22lrihm48f97wirrxw7yjn61"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -62927,7 +67027,7 @@ self: { mkDerivation { pname = "feed-collect"; version = "0.2.0.2"; - sha256 = "87671ac61228d4b40337c5128528550511e05bc84484dabb8188fa16d5cb9b35"; + sha256 = "0dcvrgaidyl8h6xxm124r1dy0485all8a4n56w1v9m182b31lrw7"; libraryHaskellDepends = [ base data-default-class feed http-client http-client-tls time time-interval time-units timerep transformers utf8-string @@ -62944,7 +67044,7 @@ self: { mkDerivation { pname = "feed-crawl"; version = "0.1.2.0"; - sha256 = "ecbcd02bd7ba6f12420922027884d648444af98cd815a4c7bd9efeafe2747e34"; + sha256 = "0d3yfkiazzlypp3s85fqikwlli28ss27h0i215114vxsswmx1g7c"; libraryHaskellDepends = [ base bytestring conduit connection http-conduit http-types hxt network-uri text transformers @@ -62969,7 +67069,7 @@ self: { mkDerivation { pname = "feed-gipeda"; version = "0.3.0.1"; - sha256 = "5fa85807a74e5759635106deef4509e807d42f61d108d91645fe9cd0fec7a8cf"; + sha256 = "1kx8qzzd177y8lbdj26ic4px81z8152yzph6a5imjmsflw3mia2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63004,7 +67104,7 @@ self: { mkDerivation { pname = "feed-translator"; version = "0.1.0.2"; - sha256 = "9c879595e3196cb687d70366207e84b43f2b2e2d7d3d9060f354b9dd7eb2d544"; + sha256 = "0i6mn9zdvfalydh90gbx5lp2ngxlhiz20rh3sy3vcv0rwfarb1ww"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63025,7 +67125,7 @@ self: { mkDerivation { pname = "feed2lj"; version = "0.0.3.1"; - sha256 = "dbfaa122f2e57b93b8d9b856d9afb765486c866ee356ec66928676879a71a47a"; + sha256 = "0ym4f6d8fxl6j9kfqmp3ds36qj35nypxjmmqv6w96yz5y8ia3ynv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63043,7 +67143,7 @@ self: { mkDerivation { pname = "feed2twitter"; version = "0.2.0"; - sha256 = "3266b0fd515149975860abf31c2df73b5831ca35c6ab0f60a1607bfa8b3b14fe"; + sha256 = "1zhl7f5zlyv0l5h0zay66p532n1vywnirwxbc1c9fjaia7yv0rij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63065,7 +67165,7 @@ self: { mkDerivation { pname = "feldspar-compiler"; version = "0.7"; - sha256 = "10eed71aeb482faffc271ae17ca5680d3a03a424afb717b498c37ad297957d4e"; + sha256 = "0kkxjnbx4yn3k2s1gdxg4jj06fhdd2jprq8s4zyaybs8xcddgvhh"; libraryHaskellDepends = [ base Cabal containers data-default directory feldspar-language filepath ghc-paths mtl plugins plugins-multistage pretty process @@ -63094,7 +67194,7 @@ self: { mkDerivation { pname = "feldspar-language"; version = "0.7"; - sha256 = "3694980b8e9bed849209f33a8500f57b5565a598bc5e9e10279dfdbb1b16fa3f"; + sha256 = "0gzs2qdvpzcx4w89wpmwk2jnambvyl08afpk16989vcviq5ri51n"; libraryHaskellDepends = [ array base containers data-default data-hash data-lens deepseq monad-par mtl patch-combinators QuickCheck random syntactic tagged @@ -63118,7 +67218,7 @@ self: { mkDerivation { pname = "feldspar-signal"; version = "0.0.1.0"; - sha256 = "addfcd73ffcd2b2a8093bf4e0471b15590dd2d465e71542f9a4ffd5bbc03fe90"; + sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd"; libraryHaskellDepends = [ base base-compat feldspar-compiler feldspar-compiler-shim feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv @@ -63135,7 +67235,7 @@ self: { mkDerivation { pname = "fen2s"; version = "1.2"; - sha256 = "01655c64fbe99f248bddeb274e9f5c6acc633ee97992a2e5c537b5767b0e2104"; + sha256 = "01111rxpdd9pqpjs54krx4z67k3abjglw9zbvn5j97z9zdj5qr81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63156,7 +67256,7 @@ self: { mkDerivation { pname = "fences"; version = "0.1.1"; - sha256 = "ab1146b08a5ff512977f17d44a4995ee2aa04460c1af6dc2b38b5a933fc31f9b"; + sha256 = "16qzqczr6nlbng16vby1c12a0apfjm4lmm0pgybi5xaziaq4c4db"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "To be written"; @@ -63170,7 +67270,7 @@ self: { mkDerivation { pname = "fenfire"; version = "0.1"; - sha256 = "ceb9e5b8e3001f7143ae0c9cbd242bde3e2128d4fc3dd83ea6617ad53478046b"; + sha256 = "0sq4g0sdayk1lqzdhggwshl22gny5cjbv70cmr1p27q0wfwfbfff"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63183,12 +67283,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {raptor = null;}; + "fernet" = callPackage + ({ mkDerivation, aeson, base, binary, byteable, bytestring + , cryptonite, HUnit, memory, optparse-applicative, QuickCheck + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, time, unix + }: + mkDerivation { + pname = "fernet"; + version = "0.1.0.0"; + sha256 = "068imhyv12bd6299y0pa87xlqcaimn42h5yx91lzam077f013m9y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary byteable bytestring cryptonite memory time + ]; + executableHaskellDepends = [ + base bytestring memory optparse-applicative time unix + ]; + testHaskellDepends = [ + aeson base bytestring HUnit memory QuickCheck tasty tasty-golden + tasty-hunit tasty-quickcheck time + ]; + homepage = "https://github.com/rvl/fernet-hs"; + description = "Generate and verify HMAC-based authentication tokens"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fez-conf" = callPackage ({ mkDerivation, base, containers, regex-compat }: mkDerivation { pname = "fez-conf"; version = "1.0.3"; - sha256 = "0bb871f2bdaa8dd8842d118a384b411f5af465b792cd89a51a15d3f4f85c5abf"; + sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b"; libraryHaskellDepends = [ base containers regex-compat ]; homepage = "http://ui3.info/d/proj/fez-conf.html"; description = "Simple functions for loading config files"; @@ -63200,7 +67327,7 @@ self: { mkDerivation { pname = "ffeed"; version = "0.3.2"; - sha256 = "c27c6cacf6df3b43f10501c33edba2091b7b11a82cc02d36ba9c82026ad9e6a4"; + sha256 = "1976v5m050lwp8v2vh1cm08pn6q9lbdkxhq10pql6fyzysn6qz62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base HTTP json network utf8-string ]; @@ -63219,7 +67346,7 @@ self: { mkDerivation { pname = "fficxx"; version = "0.3.1"; - sha256 = "93888f04f6d65c92368b69f14e5744a2dcc5194c93eb4793ab21174344a48078"; + sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k"; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either errors filepath hashable haskell-src-exts lens mtl process pureMD5 @@ -63236,25 +67363,26 @@ self: { mkDerivation { pname = "fficxx-runtime"; version = "0.3"; - sha256 = "ab4563421558a4bf6a91e459cf700ca3eb58fe74ac72df073a4e648d1d94ffa2"; + sha256 = "18pzjhfqsr2f783xywmcfkz5isx31iqcyng4j5mbz92q2m166idb"; libraryHaskellDepends = [ base bytestring template-haskell ]; description = "Runtime for fficxx-generated library"; license = stdenv.lib.licenses.bsd3; }) {}; "ffmpeg-light" = callPackage - ({ mkDerivation, base, either, exceptions, ffmpeg, JuicyPixels - , libavcodec, libavdevice, libavformat, libswscale, mtl - , transformers, vector + ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg + , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale + , mtl, transformers, vector }: mkDerivation { pname = "ffmpeg-light"; - version = "0.11.3"; - sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb"; + version = "0.12.0"; + sha256 = "0cv8jq2if0pv40yp8inl3slsgs3z1rncffjgs2522qimq123rxcz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base either exceptions JuicyPixels mtl transformers vector + base bytestring either exceptions JuicyPixels mtl transformers + vector ]; libraryPkgconfigDepends = [ ffmpeg libavcodec libavdevice libavformat libswscale @@ -63271,7 +67399,7 @@ self: { mkDerivation { pname = "ffmpeg-tutorials"; version = "0.3.3"; - sha256 = "1bcf981e0ef809b67e7994d0c10b87ab6db50d0dd2fc5a98bd15f0fed7fd8c8c"; + sha256 = "134czpbzxw0mpnc5mz6j1l6vavdbhw5w3l4lg5zbc2gq1qg9ikqv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63289,8 +67417,8 @@ self: { }: mkDerivation { pname = "fft"; - version = "0.1.8.4"; - sha256 = "2ea96d3150c1fca6ae2d8f0cead263ea1deddc0be18727a0cf4030f2ef07e1b4"; + version = "0.1.8.6"; + sha256 = "0hjv3r09imb2ypgbz3qj9hf4f36v977z38gdcad3qa0334qdin1f"; libraryHaskellDepends = [ array base carray ix-shapable storable-complex syb transformers ]; @@ -63305,7 +67433,7 @@ self: { mkDerivation { pname = "fftwRaw"; version = "0.1.0.1"; - sha256 = "dfdb8165b63b335d7736f5e28ea5c8c4450569849a157a5485b98261674545cd"; + sha256 = "1ka58mkn30mrhma7l5cshilhaif4r2jqxqpm6rvmscrvnrjq3nyz"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ fftw ]; homepage = "https://github.com/adamwalker/haskell-fftw-simple"; @@ -63314,29 +67442,13 @@ self: { }) {inherit (pkgs) fftw;}; "fgl" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.5.3.0"; - sha256 = "d70cd8e2694311fae0b44fe0d1b342c95706ceffd3be66767e9027dfa5597e39"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - description = "Martin Erwig's Functional Graph Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl_5_5_3_1" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: mkDerivation { pname = "fgl"; version = "5.5.3.1"; - sha256 = "dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c"; + sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -63344,32 +67456,18 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage - ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: - mkDerivation { - pname = "fgl-arbitrary"; - version = "0.2.0.2"; - sha256 = "501d77f1f5efd952aaf06d35fc95bfd3a9bc93906f78a363766ec74d14d50b8b"; - libraryHaskellDepends = [ base fgl QuickCheck ]; - testHaskellDepends = [ base containers fgl hspec QuickCheck ]; - description = "QuickCheck support for fgl"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl-arbitrary_0_2_0_3" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { pname = "fgl-arbitrary"; version = "0.2.0.3"; - sha256 = "55ba994bdb884497b5e664b1c14969d66235ba2358eb38283aca21efded7c152"; + sha256 = "0ln1szgfy8fa78l3issq4fx3aqnnd54w3cb4wssrfi48vd5rkfjm"; libraryHaskellDepends = [ base fgl QuickCheck ]; testHaskellDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-extras-decompositions" = callPackage @@ -63377,7 +67475,7 @@ self: { mkDerivation { pname = "fgl-extras-decompositions"; version = "0.1.1.0"; - sha256 = "5a90cf8212f45dffab2b7397c63fbd3bb46a9dca4441513f965c8481e1d92d5d"; + sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s"; libraryHaskellDepends = [ base containers fgl ]; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "Graph decomposition algorithms"; @@ -63389,7 +67487,7 @@ self: { mkDerivation { pname = "fgl-visualize"; version = "0.1.0.1"; - sha256 = "b8e7f7b6a123ff22488f77a771cbd2cc285ef41299747662797abe9741778a6f"; + sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq"; libraryHaskellDepends = [ base dotgen fgl ]; description = "Convert FGL graphs to dot (graphviz) files"; license = stdenv.lib.licenses.bsd3; @@ -63404,7 +67502,7 @@ self: { mkDerivation { pname = "fibon"; version = "0.2.0"; - sha256 = "f46f824b90cb246ab3f14e6ea5f7e9234205a31cd375c25bfdbeb6578ce36aca"; + sha256 = "1jkawf65gdmyzmdw4xfk3jihahi3x7vsavjfy6rnl96bj15q4vzl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63423,13 +67521,34 @@ self: { mkDerivation { pname = "fibonacci"; version = "0.2.0.1"; - sha256 = "f338ff3c14dc2c7ea35186bd3e871e4b66cf0b3df0e3fb9bdfd76a693d5958a2"; + sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/sebfisch/fibonacci"; description = "Fast computation of Fibonacci numbers"; license = stdenv.lib.licenses.bsd3; }) {}; + "ficketed" = callPackage + ({ mkDerivation, async, base, binary, blaze-html, bytestring + , containers, directory, http-types, mime-types, MissingH + , optparse-applicative, socketed, text, wai, wai-app-static, warp + }: + mkDerivation { + pname = "ficketed"; + version = "0.1.0.0"; + sha256 = "0k51rb8mk5rvl78b7inp7fxn8g1jpifdpkbbkijhsx918va9mwcw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base binary blaze-html bytestring containers directory + http-types mime-types MissingH optparse-applicative socketed text + wai wai-app-static warp + ]; + description = "update statically hosted file in a push stule through socketed"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fields" = callPackage ({ mkDerivation, array, base, containers, fclabels, monads-fd , transformers @@ -63437,7 +67556,7 @@ self: { mkDerivation { pname = "fields"; version = "0.1.0"; - sha256 = "db60692cfaa106baa85beaa19d99675c29e7d64ffe9acab8bfb71c3f1488b977"; + sha256 = "0xxri0a3y75ppywcm6py9zbffaawcycrv8gabflbl1m1z8n6jq6v"; libraryHaskellDepends = [ array base containers fclabels monads-fd transformers ]; @@ -63454,7 +67573,7 @@ self: { mkDerivation { pname = "fields-json"; version = "0.2.2.3"; - sha256 = "a08580276a6b7357f08b8843120e9eed1f56ca360c2e4747b3698ca64a8a0c73"; + sha256 = "0wqci95ad339nd3lfbhc6v55c7zdkq714hw8igq5fwvbd8kq11d0"; libraryHaskellDepends = [ base base64-bytestring containers json mtl utf8-string ]; @@ -63467,7 +67586,7 @@ self: { mkDerivation { pname = "fieldwise"; version = "0.1.0.0"; - sha256 = "47eec77d3f34a55e8a0cab809d9181b36d80c4058ca22b5f128827306de1b4d6"; + sha256 = "1mmlw5nk09w829gjp8lc0p280vdkh68rv05b1j55x99l7xywgvj7"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components"; @@ -63480,7 +67599,7 @@ self: { mkDerivation { pname = "fig"; version = "1.4.0"; - sha256 = "b84f88c6a8716d7c9ab1103399a343960c2de025853cc8c12b2a72b7598c7d0d"; + sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq"; libraryHaskellDepends = [ base containers parsec pretty ]; homepage = "http://www.bergsoe.org/fig"; description = "Manipulation of FIG files"; @@ -63492,7 +67611,7 @@ self: { mkDerivation { pname = "file-collection"; version = "0.1.1.9"; - sha256 = "ec192c077b89f4a2b62ffb169e5d2c6f118bcd47c8fe144a45b7203948906c19"; + sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc"; libraryHaskellDepends = [ base bytestring clock directory zip-archive ]; @@ -63509,7 +67628,7 @@ self: { mkDerivation { pname = "file-command-qq"; version = "0.1.0.5"; - sha256 = "4b8d26ca3202af411b0fa8709207bead7d4c9f5d7d19f5793a71b8f0ad257119"; + sha256 = "06bi4nnz1f3i79wza6bxbnglqzddpq3r4w581wdl3bq26b52d3ab"; libraryHaskellDepends = [ base parsec process system-filepath template-haskell text ]; @@ -63526,7 +67645,7 @@ self: { mkDerivation { pname = "file-embed"; version = "0.0.10"; - sha256 = "f751925cec5773a4fad5a48ca0a86a21091ee5f1efccf618a64a89fa2cf5f711"; + sha256 = "04gpylngm2aalqcgdk7gy7jiw291dala1354spxa8wspxif94lgp"; libraryHaskellDepends = [ base bytestring directory filepath template-haskell ]; @@ -63543,7 +67662,7 @@ self: { mkDerivation { pname = "file-embed-poly"; version = "0.1.0"; - sha256 = "46c80ed8670818a2f92acc81fc11306e2f32cbe27496ed360093c57aa1f3a985"; + sha256 = "11d9yfhpmick00vfv5klwb5k4bvf608zr0fc5bws4608czc0xj26"; libraryHaskellDepends = [ base bytestring directory filepath template-haskell ]; @@ -63561,8 +67680,8 @@ self: { }: mkDerivation { pname = "file-location"; - version = "0.4.9"; - sha256 = "be29deb3c2267913f642e511deca988cedd287ae519012d01178d37d05f814dc"; + version = "0.4.9.1"; + sha256 = "0x29nz828dvl200h7rc5qzyknnzr99c7p2ag37j0lbk0im7vicpl"; libraryHaskellDepends = [ base containers HUnit lifted-base template-haskell th-orphans transformers @@ -63581,7 +67700,7 @@ self: { mkDerivation { pname = "file-modules"; version = "0.1.2.4"; - sha256 = "ffea2dbd51f77ed76f8559d8519674a1210611a35e2dbea72dfb41d7d5f0f235"; + sha256 = "0dgjy3axfhgv5nkvwbaylc8hc8d1fjb53n2rhmpxfzppa6yjvspz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63597,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 @@ -63605,7 +67743,7 @@ self: { mkDerivation { pname = "filecache"; version = "0.2.9"; - sha256 = "02e6cd64adeeab38b7f6425905332deb8f03824cb4f47a8b8855b846e195dd81"; + sha256 = "10fxjphldf2mi25pmx5l9j1073zb5lrhana2ysvkiazfmmjcvrh2"; libraryHaskellDepends = [ base exceptions hashable hinotify lens mtl stm strict-base-types unordered-containers @@ -63626,7 +67764,7 @@ self: { mkDerivation { pname = "filediff"; version = "2.0.0"; - sha256 = "37310b05b8d27238f8d4edc6b00c9f59e38d8c50bf438e12ee0f62a07c134095"; + sha256 = "15a02dya0qhgxq98whxza268vqsrkw6b1ipdskw3hwnjp02hnc9p"; libraryHaskellDepends = [ base bytestring data-default data-memocombinators directory either hashmap mtl rainbow tasty tasty-hunit text threads time @@ -63646,7 +67784,7 @@ self: { mkDerivation { pname = "filelock"; version = "0.1.0.1"; - sha256 = "ad8c63f27fec6396ac83981a67d5a799b6b614c119a35ebdf2d82b379795d763"; + sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/takano-akio/filelock"; description = "Portable interface to file locking (flock / LockFileEx)"; @@ -63660,7 +67798,7 @@ self: { mkDerivation { pname = "filemanip"; version = "0.3.6.3"; - sha256 = "8836da17baaaf02ca080c9990ece4e0b0c8d6a128f458f8b64fd07b225ca9846"; + sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8"; libraryHaskellDepends = [ base bytestring directory filepath mtl unix-compat ]; @@ -63674,7 +67812,7 @@ self: { mkDerivation { pname = "fileneglect"; version = "0.0.0.1"; - sha256 = "659cc5d7b6fa5949bc6a8a28d2c830f1d3386c78cf82ae95034b2d66309500e8"; + sha256 = "1s00jlq6cbab0fasx0ngg1n3ilzi634d4a4aday4jngsnvbwb735"; libraryHaskellDepends = [ base hinotify stm ]; description = "Block thread until a file stops being modified"; license = stdenv.lib.licenses.bsd3; @@ -63685,7 +67823,7 @@ self: { mkDerivation { pname = "filepath"; version = "1.4.1.2"; - sha256 = "7bfb0c8776dc161cf10e324b306f3a0c89db01803ee2f8c7e11fcf3cd9892bc3"; + sha256 = "1hrbi7ckrkqzw73ziqiyh00xp28c79pk0jrj1vqiq5nwfs3hryvv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/haskell/filepath#readme"; @@ -63699,7 +67837,7 @@ self: { mkDerivation { pname = "filepath-io-access"; version = "0.1.0.0"; - sha256 = "977bff7e3cb4876c67b98a4685fe734ee8000986ad8d68e2e9bb40eb94152b23"; + sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp"; libraryHaskellDepends = [ base base-io-access filepath ]; description = "IO Access for filepath"; license = stdenv.lib.licenses.gpl2; @@ -63713,7 +67851,7 @@ self: { mkDerivation { pname = "filepather"; version = "0.3.0"; - sha256 = "3b19c2d177aaefd83c399ec8d0bfff31c923393ee5389f63e1ed6668ab5516bf"; + sha256 = "1gqnanmnhrpdw5iryf757qwj7j9izyzx1j4y74ydivxafz8w469v"; libraryHaskellDepends = [ base comonad comonad-transformers data-lens directory filepath mtl transformers @@ -63723,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 @@ -63731,7 +67886,7 @@ self: { mkDerivation { pname = "filestore"; version = "0.6.3.1"; - sha256 = "816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de"; + sha256 = "1pnqb816syl8j03wfk1p96vqlb64xkl45cxlkmqsriwi4ar0svw1"; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -63751,7 +67906,7 @@ self: { mkDerivation { pname = "filesystem-conduit"; version = "1.0.0.2"; - sha256 = "411117244128d1feca8de9b636b0cc34d678e28440adfab4c19149ffd6a0ba15"; + sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1"; libraryHaskellDepends = [ base bytestring conduit containers system-fileio system-filepath text transformers unix @@ -63773,7 +67928,7 @@ self: { mkDerivation { pname = "filesystem-enumerator"; version = "0.1.1"; - sha256 = "2cfb4ebb09b14fc03c60c44eaffe4e0b9c76439f455fccadc2e58134fe2c9a11"; + sha256 = "04cs5kz390g5qanwqps5kx1pd70b9vzaykn4c0yc0kxi16xlxyrc"; libraryHaskellDepends = [ base enumerator system-fileio system-filepath transformers unix ]; @@ -63790,7 +67945,7 @@ self: { mkDerivation { pname = "filesystem-trees"; version = "0.1.0.6"; - sha256 = "50a36bfc69a738ffc71d50c27ff50531448fa234b25bc5ae658fe37b9383ddae"; + sha256 = "1bnxhf9ppqwgcnpcanxj6ji8yi1i0pspzhjh3p3zyf57d7y6p8sh"; libraryHaskellDepends = [ base cond containers data-lens-light deepseq directory dlist filepath mtl unix @@ -63801,12 +67956,34 @@ 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 { pname = "filtrable"; version = "0.1.0.5"; - sha256 = "6d2a75d6b69f8d0f538e680923e9f68c17ee6feaed505a2d86d9baae4784ce7e"; + sha256 = "0znfhi3sxfnrhqnmll7dx9pyw5wcyvlj62b8ir9hz3cznvb7aakd"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/strake/filtrable.hs"; description = "Class of filtrable containers"; @@ -63819,37 +67996,50 @@ self: { mkDerivation { pname = "final"; version = "0.1"; - sha256 = "c919f346d6b3228f8f3ef3c3899bb51cd1efe7a390256ffe950c9aea8b5f3ba1"; + sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9"; libraryHaskellDepends = [ base stm transformers ]; homepage = "http://github.com/errge/final"; description = "utility to add extra safety to monadic returns"; license = stdenv.lib.licenses.bsd3; }) {}; + "final-pretty-printer" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, exceptions, mtl + , temporary, text + }: + mkDerivation { + pname = "final-pretty-printer"; + version = "0.1.0.0"; + sha256 = "0p0g73nq7154msvzazkn79fjnkzd939chgmxqdi9xbcpq47zgac2"; + libraryHaskellDepends = [ + ansi-terminal base containers exceptions mtl temporary text + ]; + description = "Extensible pretty printing with semantic annotations and proportional fonts"; + license = stdenv.lib.licenses.mit; + }) {}; + "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 = "87db2a011a2662481f59ac03f64e95ef6692519386aee51417c3894c2174da22"; - revision = "1"; - editedCabalFile = "8a86eb5b9161789d9cd65fb4d555442e1b1eb89e46ce7f4db928f700f6ee05ef"; + 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; }) {}; @@ -63863,7 +68053,7 @@ self: { mkDerivation { pname = "find-conduit"; version = "0.4.4"; - sha256 = "5fcffee1299b0a779f2e0e32f5245b5834a097369f238570b6bb4e469154e196"; + sha256 = "15p1aj8lckmvnrq8a8wz6sbs0d2qbcjgachf5sgpf2lv57hzxksz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63893,7 +68083,7 @@ self: { mkDerivation { pname = "find-source-files"; version = "0.1.0.0"; - sha256 = "2c5307c3221ee9a932a93963d4d730ba1d84cce525c598571a4e4570d1753ec6"; + sha256 = "1iiyfp8p0iaf39brii95wp6887ds63bx8qrrm4raks8y4b1hflrc"; libraryHaskellDepends = [ base Cabal directory filepath mtl ]; homepage = "https://github.com/oisdk/find-source-files#readme"; description = "Initial project template from stack"; @@ -63907,7 +68097,7 @@ self: { mkDerivation { pname = "fingertree"; version = "0.1.1.0"; - sha256 = "160c5ba370d781dbf2920ddca870ce8596ab76729972535595bef835ee1cddf0"; + sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -63922,7 +68112,7 @@ self: { mkDerivation { pname = "fingertree-psqueue"; version = "0.3"; - sha256 = "9f8c2f1965ea7a618d969db6506c8f373c95e09072b2182de40713d265046c92"; + sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z"; libraryHaskellDepends = [ base fingertree ]; description = "Implementation of priority search queues as finger trees"; license = stdenv.lib.licenses.bsd3; @@ -63933,7 +68123,7 @@ self: { mkDerivation { pname = "fingertree-tf"; version = "0.1.0.0"; - sha256 = "b64da516e0db3c48d352587f0a4ba4e1199294fd035eeed9d27a437c3b6648c9"; + sha256 = "1ja8cqxpqhvssbcywph3zna946g1li5hlzsqab9lhg6vw0baakdn"; libraryHaskellDepends = [ base ]; description = "Generic finger-tree structure using type families"; license = stdenv.lib.licenses.bsd3; @@ -63947,7 +68137,7 @@ self: { mkDerivation { pname = "finite-field"; version = "0.9.0"; - sha256 = "8318c793c43cb30c8bf7f6fbea19e7d3e94cc1e81d849f821655efc3322ed408"; + sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643"; libraryHaskellDepends = [ base deepseq hashable singletons template-haskell ]; @@ -63963,10 +68153,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "finite-typelits"; - version = "0.1.1.0"; - sha256 = "40cbe752fa659fdebd5afeb7a15177746b08227cf6add085481b94f53f8c858b"; - revision = "1"; - editedCabalFile = "4c5ae66b960dcede29688c32b9fb0d839a4bfb53bcde8e13f6a62b7f4fd55b4f"; + version = "0.1.2.0"; + sha256 = "09qmif1xvfcaylz9zfa1w8bs9ls3pcip509b1iyka94p8c6j6liw"; libraryHaskellDepends = [ base deepseq ]; homepage = "https://github.com/mniip/finite-typelits"; description = "A type inhabited by finitely many values, indexed by type-level naturals"; @@ -63978,7 +68166,7 @@ self: { mkDerivation { pname = "first-and-last"; version = "0.1.0.1"; - sha256 = "f25888d5530a969c40555d3f947d1f5b2254afe33787a040a32663b3e7d3f9da"; + sha256 = "1nprsgkv6qr6ld0a11rpwfpm88jv3xyr8gsxam09r5haagaqhn7j"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/markandrus/first-and-last"; @@ -63992,7 +68180,7 @@ self: { mkDerivation { pname = "first-class-patterns"; version = "0.3.2.3"; - sha256 = "93de2ae56c0f90bb9f8938a5c653907a3c9b366087cc9f3751378eb7a6aa3714"; + sha256 = "051pmakbg3ipa4vrzk47c0v9ng3sj19wd99qi6gvp40gdkjjmplk"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/reinerp/first-class-patterns"; description = "First class patterns and pattern matching, using type families"; @@ -64006,7 +68194,7 @@ self: { mkDerivation { pname = "firstify"; version = "0.1"; - sha256 = "cdba128f045edde74622a139b8cb1b5e1182ea4e5a61d2f5722fe1ae5f0b05bd"; + sha256 = "1g851dgsxq9gfbsx4qas9vm844ay3g5vhfd1493fgpay0j7i5fnd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64025,7 +68213,7 @@ self: { mkDerivation { pname = "fishfood"; version = "0.0.1.6"; - sha256 = "45cca62a88480b05249d206b4090f310531da036477600843675565f32b3de05"; + sha256 = "01fyncr5ymkm6s200xj76sh1slqhyf840sr0klj0a2s8i0madk25"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64050,7 +68238,7 @@ self: { mkDerivation { pname = "fit"; version = "0.5.2"; - sha256 = "2e5ef15c5b4ea60f9861377a133801a3e2c28dcff74fa7aa5f9d8e6b115f3cf7"; + sha256 = "1xrwbw8np3lxbymafkzpry6w5qm304w16yipc6c0z9jfbdfg2pif"; libraryHaskellDepends = [ attoparsec base bytestring containers contravariant mtl text ]; @@ -64068,7 +68256,7 @@ self: { mkDerivation { pname = "fitsio"; version = "0.2"; - sha256 = "4fe968152b2a60f43ace145ac157fc0c55a54f7a7f92c975b61961660b68fa1f"; + sha256 = "07zsd05ncq8rnrswk4kzg97sam8czibw2nhlrqxg8q1a5canisag"; libraryHaskellDepends = [ base filepath mtl ]; librarySystemDepends = [ cfitsio ]; homepage = "http://github.com/esessoms/fitsio"; @@ -64078,20 +68266,18 @@ self: { }) {inherit (pkgs) cfitsio;}; "fitspec" = callPackage - ({ mkDerivation, base, cmdargs, haskell-src, haskell-src-exts - , leancheck, pretty, template-haskell + ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell }: mkDerivation { pname = "fitspec"; - version = "0.4.0"; - sha256 = "73dae591138ff5390be2b7f373a4f3bed89d4d39d26ac665f5f8cf5326aad5da"; + version = "0.4.1"; + sha256 = "0smv851kg4p4qfp29h85zm87x5y3qmqd3hxmznnf7cdp7arxgc74"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; testHaskellDepends = [ base cmdargs leancheck template-haskell ]; benchmarkHaskellDepends = [ - base cmdargs haskell-src haskell-src-exts leancheck pretty - template-haskell + base cmdargs leancheck pretty template-haskell ]; homepage = "https://github.com/rudymatela/fitspec#readme"; description = "refining property sets for testing Haskell programs"; @@ -64105,7 +68291,7 @@ self: { mkDerivation { pname = "fix-imports"; version = "1.0.5"; - sha256 = "0b072eec7895d3514276c2a25d6d56665dbabb46b13c22aeb5f560459216de05"; + sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64122,7 +68308,7 @@ self: { mkDerivation { pname = "fix-parser-simple"; version = "15320.3"; - sha256 = "482b98212e17df3cf871b63f11d41bc0801db9d391c0886506cb528179774553"; + sha256 = "0ls5fxwq2lnb0rjqih4isfwiv0603ga12gxnf7w3rpqp5qhrhas8"; libraryHaskellDepends = [ base mmtl ]; description = "Simple fix-expression parser"; license = "LGPL"; @@ -64134,7 +68320,7 @@ self: { mkDerivation { pname = "fix-symbols-gitit"; version = "0.1.0"; - sha256 = "dedcf982a893f66aec6c19a18816611b13e6f42d9818b5d405f7632e1afcdd05"; + sha256 = "01fxzhd2wqzp0paba64q5psfc4qvc4b8i88rdkn6mxlkm21gkp6y"; libraryHaskellDepends = [ base containers gitit ]; description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols"; license = stdenv.lib.licenses.bsd3; @@ -64146,7 +68332,7 @@ self: { mkDerivation { pname = "fixed"; version = "0.2.1.1"; - sha256 = "24a9e1e251998c9d06037bb771d9eab2980a91132de59a19d0166a1c51e715e2"; + sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/fixed"; description = "Signed 15.16 precision fixed point arithmetic"; @@ -64158,7 +68344,7 @@ self: { mkDerivation { pname = "fixed-length"; version = "0.2"; - sha256 = "3171f2d443171a8e92733b3935805c7d5b54eae1f39f9fd729a766f887a6389b"; + sha256 = "16rqls3zhrm757brz7zkw7m58nvxbj03af9vff98w6hp8gag4w9i"; libraryHaskellDepends = [ base non-empty tfp utility-ht ]; homepage = "http://hub.darcs.net/thielema/fixed-length/"; description = "Lists with statically known length based on non-empty package"; @@ -64170,7 +68356,7 @@ self: { mkDerivation { pname = "fixed-list"; version = "0.1.6"; - sha256 = "abf680e95d06d31eda26d20c7c61a91b30fbdeadc0e50804ceb97edfcf05fbbe"; + sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jvranish/FixedList/tree/master"; description = "A fixed length list type"; @@ -64182,7 +68368,7 @@ self: { mkDerivation { pname = "fixed-point"; version = "0.5.0.1"; - sha256 = "6af24469e8795e077bd8db05c03712c52b50a06239ff80f12a9691adc4e80f04"; + sha256 = "010gx32av4cn5bqq1zrrcah50ay528vw01fvv1xhfpkrx1ll9wka"; libraryHaskellDepends = [ base ]; description = "Binary fixed-point arithmetic"; license = stdenv.lib.licenses.mit; @@ -64194,7 +68380,7 @@ self: { mkDerivation { pname = "fixed-point-vector"; version = "0.5.0.1"; - sha256 = "03218312eadee2d9dcaae738bd19a01f88655cfd40dd75c322e9c4d008b13509"; + sha256 = "029mn44d1i794b1pbpa0zmf6b20zl0cvsf77mbfdkqnyx8986883"; libraryHaskellDepends = [ base fixed-point vector ]; description = "Unbox instances for the fixed-point package"; license = stdenv.lib.licenses.mit; @@ -64206,7 +68392,7 @@ self: { mkDerivation { pname = "fixed-point-vector-space"; version = "0.5.0.1"; - sha256 = "bd9d36f931bfbc6243cd83cc73c3f57aa24a29b8c52ce17869fce6e1f14b6281"; + sha256 = "10b29gqy3rpwd5wf2b65p0llm8ksyp1p7k43rm1n5g5z67wkd7dx"; libraryHaskellDepends = [ base fixed-point vector-space ]; description = "vector-space instances for the fixed-point package"; license = stdenv.lib.licenses.mit; @@ -64220,7 +68406,7 @@ self: { mkDerivation { pname = "fixed-precision"; version = "0.4.0"; - sha256 = "c6a172d9bd01353202508f6fa425a83dba8b41603112733a9e7f6b34b38a6faa"; + sha256 = "1akgiark8svzkqx764iic10qpfixm0js8vwga0134d81ppcp58f6"; libraryHaskellDepends = [ base hmpfr integer-gmp reflection tagged template-haskell ]; @@ -64235,7 +68421,7 @@ self: { mkDerivation { pname = "fixed-storable-array"; version = "0.3.1.1"; - sha256 = "f00a020ce3792737089cd7d544e0b35728c8c4d6f3b815fb6929742cb680656d"; + sha256 = "0vb5h2v2qx19d7xibf7ksv2cha2pngh49mfpkh43f9vrwc6042ph"; libraryHaskellDepends = [ array base tagged ]; description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead."; license = stdenv.lib.licenses.bsd3; @@ -64247,7 +68433,7 @@ self: { mkDerivation { pname = "fixed-vector"; version = "0.9.0.0"; - sha256 = "2cb64bfaa4c916c681c9a8240bb6edfad4878742003c3d099e770c592e8d4c87"; + sha256 = "11scilp5j33pkq4ksg008a3qgm7sxnv0n958r60wc5n9lkx4pdic"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; @@ -64261,7 +68447,7 @@ self: { mkDerivation { pname = "fixed-vector-binary"; version = "0.6.0.0"; - sha256 = "1e1e4edd907ac648cd1613f3a492db2c7e650a19cf229e1a8f8a8ac478e25efa"; + sha256 = "1yjyw9wc92laiwd9w8ng3456azicvf9a9wqk2v6liiksj3flw7hy"; libraryHaskellDepends = [ base binary fixed-vector ]; testHaskellDepends = [ base binary fixed-vector tasty tasty-quickcheck @@ -64277,7 +68463,7 @@ self: { mkDerivation { pname = "fixed-vector-cereal"; version = "0.6.0.0"; - sha256 = "c6da261e2b87b7fb16790b5180285f43545fdaf985ed007574c545e52e68c3cd"; + sha256 = "1kf3d0pfaif5fish1vc5z7d5ym23bwl80l8bg4bgpdw75cg2dnn6"; libraryHaskellDepends = [ base cereal fixed-vector ]; testHaskellDepends = [ base cereal fixed-vector tasty tasty-quickcheck @@ -64293,7 +68479,7 @@ self: { mkDerivation { pname = "fixed-vector-hetero"; version = "0.3.1.1"; - sha256 = "894c7364ea270326dc3e030559ec94e5c6e9f974c9345188cbeba8365a45deaf"; + sha256 = "1byy8md3da7brf452d69fkwykip5jkn5j1837vf2c0r7x9j76k49"; libraryHaskellDepends = [ base deepseq fixed-vector ghc-prim primitive transformers ]; @@ -64307,7 +68493,7 @@ self: { mkDerivation { pname = "fixed-width"; version = "0.1.0.0"; - sha256 = "c7e7a455513626b2ce6ddeb54036fd789d9e00b02ab4f13396b8add0c0e1b53f"; + sha256 = "0gxmw70d1bdqjqrz3d1an009x7bqzlv41dfydp7b49ina5as9ry7"; libraryHaskellDepends = [ base ]; description = "Fixed width subsets of an Int64/Word64"; license = stdenv.lib.licenses.bsd3; @@ -64319,7 +68505,7 @@ self: { mkDerivation { pname = "fixedprec"; version = "0.2.2.1"; - sha256 = "f17d0d70af22a2b629b909ee793e348ceb4640460464ff39abf4b53aa10d2269"; + sha256 = "0s921nhkmdglmcwzyr048r04dswc6hz7kvh9p4lvd8i2mxq0szgi"; libraryHaskellDepends = [ base random ]; description = "A fixed-precision real number type"; license = stdenv.lib.licenses.bsd3; @@ -64330,7 +68516,7 @@ self: { mkDerivation { pname = "fixedwidth-hs"; version = "0.4.0.1"; - sha256 = "fd8e2f72c2bd2f3b3bbd94f612960f6b10734e6e3d8c51c65164d9925c8b944c"; + sha256 = "0k4lidf95nb4a735331xdr77643b1yb15xllplxknbxxq9r2z3px"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring text ]; @@ -64350,7 +68536,7 @@ self: { mkDerivation { pname = "fixfile"; version = "0.7.0.0"; - sha256 = "b49027c747a7112256aec9b9ac33f4617c3ec0cfdd5943d7c81c6c9885f10b70"; + sha256 = "0w0by62rhv0wr3bl6nfxrz03wz31yhrsrff9mrb244d78z3jg45l"; libraryHaskellDepends = [ array base bytestring cereal containers directory filepath hashable hashtables lens mtl temporary vector @@ -64373,7 +68559,7 @@ self: { mkDerivation { pname = "fixhs"; version = "0.1.4"; - sha256 = "e2b3ad479e6d18edefaa5495693293bba81861a0c352767439bea326e6e8ae4f"; + sha256 = "0kxfx3k2d8xy75s7cln3l1hiia5vjcr6k5almbpys63dkr3svcz2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64398,7 +68584,7 @@ self: { mkDerivation { pname = "fixie"; version = "1.0.0"; - sha256 = "b016c231a391816d4dca407f06e64b87d1c29b55fddcae9e0fc28df942bc4f6d"; + sha256 = "0vagpi1gk3f21ygaxp7xandw5lc79gk0czs0r96nv0cilcqw45mh"; libraryHaskellDepends = [ base containers data-default-class either haskell-src-exts haskell-src-meta mtl template-haskell text th-orphans @@ -64418,7 +68604,7 @@ self: { mkDerivation { pname = "fixplate"; version = "0.1.7"; - sha256 = "5e515d0d6256482b13cb1bafcdbcc1e87d094a0e2cd3150b0d648c3577a1342f"; + sha256 = "0brll5vkb3341l5iblrc1r50jzg8q6ycvbqvrc9jnj2nc86mslay"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck @@ -64433,7 +68619,7 @@ self: { mkDerivation { pname = "fixpoint"; version = "0.1.1"; - sha256 = "eb7e0da7d9ba67c153b2df95732f529b9533e41194a848250e93dbfb02670116"; + sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb"; libraryHaskellDepends = [ base ]; homepage = "http://www.cse.unsw.edu.au/~rl/code/fixpoint.html"; description = "Data types as fixpoints"; @@ -64445,7 +68631,7 @@ self: { mkDerivation { pname = "fixtime"; version = "1.5.0.2"; - sha256 = "8503b41d8fa684d59f5cd061c4aaf9f9d6f11162280cff36123bf3103deb54f1"; + sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5"; libraryHaskellDepends = [ base time ]; homepage = "https://github.com/pharpend/fixtime"; description = "Some fixes to the time package"; @@ -64457,7 +68643,7 @@ self: { mkDerivation { pname = "fizz-buzz"; version = "0.1.0.3"; - sha256 = "642bf826fe8ef18d95a5f9640171b82f637a7717811bd87fe5ea14044e5616b0"; + sha256 = "1c0nar70857awmzxh6w12xvplqrgp1qh2r7rlnaqvwcfzqkghav4"; libraryHaskellDepends = [ base ]; description = "Functional Fizz/Buzz"; license = stdenv.lib.licenses.bsd3; @@ -64469,12 +68655,30 @@ self: { mkDerivation { pname = "fizzbuzz"; version = "0.1.0.0"; - sha256 = "9df26295f66eadacad9c44ca3195651b15f2da8789124b91704eedaef9192a46"; + sha256 = "0iia37wsxvaff28ln4l9hzdg458vcnak3jj4kjnsrbbfysan5wlx"; libraryHaskellDepends = [ base ]; description = "test"; 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 @@ -64482,10 +68686,8 @@ self: { }: mkDerivation { pname = "flac"; - version = "0.1.1"; - sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e"; - revision = "2"; - editedCabalFile = "2aa55d857d01dde6f3ae1ae7664a7f5ed94f4eb0ddeb9fd9b8a5e3c866a315d0"; + version = "0.1.2"; + sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions filepath mtl text transformers vector wave @@ -64507,10 +68709,8 @@ self: { }: mkDerivation { pname = "flac-picture"; - version = "0.1.0"; - sha256 = "3c36dff9cebb44502a69e300f233e792900d051bd7eadc2c7390feb53efb3293"; - revision = "1"; - editedCabalFile = "aafff32fbe612805b32e0497ec2132c5b0e329a8a5b13ce23df865ce6954cd00"; + version = "0.1.1"; + sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w"; libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; testHaskellDepends = [ base bytestring data-default-class directory flac hspec JuicyPixels @@ -64529,7 +68729,7 @@ self: { mkDerivation { pname = "flaccuraterip"; version = "0.3.7"; - sha256 = "b0cd908d8fe4cddc01e93cae85748717c41b183be5ce1a620ea6b4c776d4ba8f"; + sha256 = "13xssivcgd561ri1mkp57cc1pi0phxs8bbiwx40xrkg4iy6r1kdh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64545,7 +68745,7 @@ self: { mkDerivation { pname = "flamethrower"; version = "0.0.5.1"; - sha256 = "1d358cd572792b31ad714e8a799fd90bca098f47822d6afe83419c6b59f06e82"; + sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x"; libraryHaskellDepends = [ base template-haskell text ]; homepage = "https://charmander.me/flamethrower/"; description = "A template engine for HTML"; @@ -64558,7 +68758,7 @@ self: { mkDerivation { pname = "flamingra"; version = "0.2"; - sha256 = "054ee952793dfac199420c409613e2eaa275140aad56b418ee158709c5b08dab"; + sha256 = "1awdn32hk1qmxqcb8mmd18a7b8paw89rch0c8acw3yixg59fjkh5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -64570,12 +68770,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flat" = callPackage + ({ mkDerivation, array, base, bytestring, containers, cpu, deepseq + , derive, dlist, ghc-prim, mono-traversable, pretty, primitive + , tasty, tasty-hunit, tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "flat"; + version = "0.3"; + sha256 = "10kn80qydxmfkbgx0j35f478i781lhn52c76ijsww5iccm889ykw"; + libraryHaskellDepends = [ + array base bytestring containers cpu deepseq dlist ghc-prim + mono-traversable pretty primitive text transformers vector + ]; + testHaskellDepends = [ + base bytestring containers cpu deepseq derive ghc-prim pretty tasty + tasty-hunit tasty-quickcheck text + ]; + homepage = "http://github.com/tittoassini/flat"; + description = "Principled and efficient bit-oriented binary serialization"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "flat-maybe" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "flat-maybe"; version = "0.1.0.0"; - sha256 = "98ee27978642f7f07e48d7d7567e0cd1dc531a4a6e0e515e3f5cd343e6c9be4f"; + sha256 = "0kxyr7k47lsw7xg523kf98d57p6i1iz5dmyp91zg1xs2hsbjgvlq"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/AndrasKovacs/flat-maybe"; description = "Strict Maybe without space and indirection overhead"; @@ -64591,7 +68813,7 @@ self: { mkDerivation { pname = "flat-mcmc"; version = "1.5.0"; - sha256 = "87cea9deac6e2d32d9984741ba222ccb2fb0d5f8c58e843684476bfe7632f1fd"; + sha256 = "1zgi69vgwss7hhv893n5z3av0byb5hiblha7k3ck4bbfmkgakkl7"; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector @@ -64607,7 +68829,7 @@ self: { mkDerivation { pname = "flat-tex"; version = "0.3.1"; - sha256 = "574f88448cac7d5a0399e5e7518f5c7003dacf16a2767a6d925cd3606a224ed7"; + sha256 = "1msf49m61lswj9nplxm22v7xl0vhbj7m3rz5k41mlzdcii28hksp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec ]; @@ -64616,6 +68838,19 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "flay" = callPackage + ({ mkDerivation, base, constraints, tasty, tasty-quickcheck }: + mkDerivation { + pname = "flay"; + version = "0.1"; + sha256 = "18wdvidn1d4cnxcl11nfabqjqx5dpgvijim46wvp3dfvh8lc8kn4"; + libraryHaskellDepends = [ base constraints ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + homepage = "https://github.com/k0001/flay"; + description = "Work on your datatype without knowing its shape nor its contents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "flexible-defaults" = callPackage ({ mkDerivation, base, containers, template-haskell, th-extras , transformers @@ -64623,7 +68858,7 @@ self: { mkDerivation { pname = "flexible-defaults"; version = "0.0.1.2"; - sha256 = "827032cecf5e937d673f3a0b84fbbaba7c03fce6a567c15faf36865da9b76dc2"; + sha256 = "1hkdnylmv1inmxgw2rx5wvy06z5spbxq82rs7xkpv4syrz734w42"; libraryHaskellDepends = [ base containers template-haskell th-extras transformers ]; @@ -64637,7 +68872,7 @@ self: { mkDerivation { pname = "flexible-time"; version = "0.1.0.3"; - sha256 = "14a9f39943ff1a7491177d579b572f0e1f1c051a4b1ded767840978c4a06339d"; + sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l"; libraryHaskellDepends = [ base bytestring unix-time ]; homepage = "https://github.com/tattsun/flexible-time"; description = "simple extension of Data.UnixTime."; @@ -64650,7 +68885,7 @@ self: { mkDerivation { pname = "flexible-unlit"; version = "0.2013.314.0"; - sha256 = "4a80ab2d67a35c79cf3dce048644246108740367c777558a6c99f0efb0509a4b"; + sha256 = "0jwsa2qfzw4rdj55axy7cw1p82314i28c16f7p7pjp53cwnsp02a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -64664,7 +68899,7 @@ self: { mkDerivation { pname = "flexiwrap"; version = "0.1.0"; - sha256 = "6a35de47b8f31d4fa605b96d06c374cc25a4e0d26c31ad8138939c11074f746f"; + sha256 = "0vvl9w3i374k720sscbcsbha89fcfk1hcvdr0nk4y7gkp13xwdba"; libraryHaskellDepends = [ base data-type mtl QuickCheck ]; description = "Flexible wrappers"; license = stdenv.lib.licenses.bsd3; @@ -64676,7 +68911,7 @@ self: { mkDerivation { pname = "flexiwrap-smallcheck"; version = "0.0.1"; - sha256 = "a36ad62969cd8260d3fab23b00a6c41875a30c158ede2a0de9dd81f0155059b5"; + sha256 = "1dara0az10fxx46jmplf2l6a6x8qqjk00fxjzb9n10ndd4lxcsm3"; libraryHaskellDepends = [ base data-type flexiwrap mtl smallcheck ]; @@ -64692,7 +68927,7 @@ self: { mkDerivation { pname = "flickr"; version = "0.3.3"; - sha256 = "d49b8e161e7f3bc12545c5de8c9c5f69de103fbd8dbafa8aebeb3d413f19d189"; + sha256 = "12fi34zl2ggbxf5gmfldplzi1pk9byf8rpn58ljw2fvz3qb8x6yl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64704,14 +68939,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flight-igc" = callPackage + ({ mkDerivation, base, cmdargs, directory, filemanip, filepath + , hlint, mtl, parsec, raw-strings-qq, system-filepath, transformers + }: + mkDerivation { + pname = "flight-igc"; + version = "0.1.0"; + sha256 = "1cr25xhwmpzi0rg8znj1q7siy5skjm8q08ncgwvmd4h3mmdbb7xl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec ]; + executableHaskellDepends = [ + base cmdargs directory filemanip filepath mtl raw-strings-qq + system-filepath transformers + ]; + testHaskellDepends = [ base hlint ]; + homepage = "https://github.com/BlockScope/haskell-flight-igc#readme"; + description = "A parser for IGC files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "flippers" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "flippers"; version = "1.0.1"; - sha256 = "e3e2efcd85e9250cf682f16e65e89261724fb8fecd50d6133c38be635c909eeb"; + sha256 = "1swyj1f67giq7h9xcl6dzsw4ywk1jbl6avpihbv0q9g9hp6yzqp3"; revision = "1"; - editedCabalFile = "e908ada5c891a6ac39cefb7e41648606d1a5f1b1048281f93bd496c5f22d73b4"; + editedCabalFile = "1d3k5prcb5nl7gwq30h4n7qsbl86hrj42zpvrqwsr9lir2jss279"; libraryHaskellDepends = [ base ]; description = "Variations on flip for multiple arguments"; license = stdenv.lib.licenses.bsd3; @@ -64722,7 +68978,7 @@ self: { mkDerivation { pname = "flite"; version = "0.1.2"; - sha256 = "8d10ccb77a5ea1da2998f095243574205b9ccafc3a16587a8aff99c759246432"; + sha256 = "0ck44icwg6gzi9x5h5iszk59qnr0fhsj95ghk0lxm8aygavwq44d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers haskell98 parsec ]; @@ -64742,7 +68998,7 @@ self: { mkDerivation { pname = "flo"; version = "0.1.1"; - sha256 = "fde388779f96718c2cb786325a2b4b3daee1110dfde8b0b17c5350726193ba73"; + sha256 = "0wxsjdhp4l2kgjqv1s7x1l8y3bix9cmmlcl6nwn8qwcnkxvqiqzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64762,7 +69018,7 @@ self: { mkDerivation { pname = "float-binstring"; version = "0.2"; - sha256 = "b8fdaa7ef1ce32170be507e030a1adb6d77f45821e9dd13aa6fade1174989d35"; + sha256 = "0dcxk1s13ppslqxd378yh92pzmxnmnhk1q07wl5ifcnfy5zamzdq"; libraryHaskellDepends = [ attoparsec base split text ]; testHaskellDepends = [ attoparsec base hspec HUnit QuickCheck split text @@ -64777,7 +69033,7 @@ self: { mkDerivation { pname = "floating-bits"; version = "0.3.0.0"; - sha256 = "b2cf891588df5adc6633c26d8e75c582c0cecfcf7f48e3a889e8013d739ae2b2"; + sha256 = "1cp2k9rks0g8i6lf6j3zrz7wxh42qmsqwvf26dkdqnnzi0aqkkxj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; @@ -64791,7 +69047,7 @@ self: { mkDerivation { pname = "floatshow"; version = "0.2.4"; - sha256 = "0c4e9494df46120942b2078db53c16200b46eff603fca5ab85775a541f975dff"; + sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc"; libraryHaskellDepends = [ array base integer-gmp ]; homepage = "https://bitbucket.org/dafis/floatshow"; description = "Alternative faster String representations for Double and Float, String representations for more general numeric types"; @@ -64805,9 +69061,9 @@ self: { mkDerivation { pname = "flock"; version = "0.3.1.8"; - sha256 = "9634ce605c3b5579f4f1e53af7d93850ec23ffb2fd5b24e02974626af1712fbc"; + sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n"; revision = "2"; - editedCabalFile = "29ece5230bb5ae45a09939ac9ba85e75bd81cf645634b952e6f89486f9325177"; + editedCabalFile = "0xsi6bwqd57qwr9bjd2nck7q3gbmbsl9pb1rk6h4bbmm1ciybv19"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; @@ -64821,7 +69077,7 @@ self: { mkDerivation { pname = "flow"; version = "1.0.7"; - sha256 = "f1964913c5bbd81748610c2f66a7aa9750b25953e6940c0933b25d4b2f1b1f62"; + sha256 = "0qhz3cplnpdj6c4hr576adcv4l4pmakncbqcc541gn5vql9lk5pi"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; homepage = "https://github.com/tfausak/flow#readme"; @@ -64834,7 +69090,7 @@ self: { mkDerivation { pname = "flow-er"; version = "1.0.3"; - sha256 = "c89d6bb8f11517809b27c5bed59d082c1fbd26c33de6272bbe3a65ddc263dba6"; + sha256 = "19nvcg1dsr9spqmjgrixqckbs7rc12fxbgn54ydq05qmy6w6p7f8"; libraryHaskellDepends = [ base flow ]; testHaskellDepends = [ base doctest flow QuickCheck ]; homepage = "https://github.com/expede/flower#README"; @@ -64850,7 +69106,7 @@ self: { mkDerivation { pname = "flow2dot"; version = "0.9.0.3"; - sha256 = "231871514ff61c7b8d2f3e90d8156afea6ef19c502fef1277ebd6fcd2f07c6dd"; + sha256 = "1pf60wpwsvxxgqkz3zh2qlcyz9pyd8axi41y5y6pn77n9x8p2613"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64871,7 +69127,7 @@ self: { mkDerivation { pname = "flowdock"; version = "0.3.0.1"; - sha256 = "d1e46b71283915c74d5a02a21ae61ecb80029219ffffc86596239e671be7e9ab"; + sha256 = "1az9wwdng7i3jrjwizzz3690506b3vk1m8h2b96wf59r51qnpr6i"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring http-client http-client-tls lens lens-action mtl network pipes pipes-aeson pipes-http @@ -64894,7 +69150,7 @@ self: { mkDerivation { pname = "flowdock-api"; version = "0.1.0.0"; - sha256 = "cf1edb5c55d52c1834f864d1f887b2ed607f9f5b2c4b4053a47b7abfd4050b5c"; + sha256 = "0p0b0pabyykvli9l0jrcbfgpyq7dna3zilb4z0s1hb6mamfdn7ng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64931,7 +69187,7 @@ self: { mkDerivation { pname = "flowdock-rest"; version = "0.1.0.0"; - sha256 = "b9f2590d5a5a30b73b4b43c0e01af88ace3b64fa30a5c7a02221470bddb5fbae"; + sha256 = "1bpvnpfhnir14ahcg99hz9j3pklaz0df1h239cxvfc2sb86mkwmr"; libraryHaskellDepends = [ aeson ansi-wl-pprint base binary binary-orphans binary-tagged bytestring deepseq exceptions generics-sop hashable http-client @@ -64957,7 +69213,7 @@ self: { mkDerivation { pname = "flower"; version = "0.7.2"; - sha256 = "0b8d60e8af5114e496e401af344c3f7338ecb42c1b8b8a96220efa19d21a3465"; + sha256 = "0r9l3b91kyhf4ab8m2qv5jsfqf3k7x639bq1wjbf852imzl6138b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64974,7 +69230,7 @@ self: { mkDerivation { pname = "flowlocks-framework"; version = "0.1.3.1"; - sha256 = "48f1b40c603f430f6657270372717b2ce7fe900825b233d334dd89e704183fed"; + sha256 = "1v9z302fg2fx6k9k7ci5128gxrrcgdqp40r7axk0yhrzc06b9wa8"; libraryHaskellDepends = [ base containers syb ]; testHaskellDepends = [ base QuickCheck ]; description = "Generalized Flow Locks Framework"; @@ -64989,7 +69245,7 @@ self: { mkDerivation { pname = "flowsim"; version = "0.3.5"; - sha256 = "431a1e6219f879cc2d5f051db7216734078c678ca0ed0f5d86708a2c94106250"; + sha256 = "0l3222a2r2khhrfhzvd0iikqq1rlcwhvf785bwnwqygq35i1w6j3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65008,8 +69264,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.1.3"; - sha256 = "391f97abb8acac97b82d3b8a3ee3d62e2f76b566c01be2dff8835932fd85ae29"; + version = "0.5.3.4"; + sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -65027,7 +69283,7 @@ self: { mkDerivation { pname = "fltkhs-demos"; version = "0.0.0.7"; - sha256 = "4e78d6fc7e6983d53ed7a4f4625b6ff89e5c06eda116f64bd38ca360f6d83a7a"; + sha256 = "0yisv3v618wcsd5zc5m1xl35r7pqdxdn5x54swzdb0v9gvydcy2f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65044,7 +69300,7 @@ self: { mkDerivation { pname = "fltkhs-fluid-demos"; version = "0.0.0.6"; - sha256 = "37b6276ba4897bea3520e3bfa72e51225e6f3409e533777d4ef2502a57925052"; + sha256 = "0ljhj9bjll7j9rypfcz514s6ypi2a4paggz340sylyw9limjgdip"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring fltkhs ]; @@ -65059,7 +69315,7 @@ self: { mkDerivation { pname = "fltkhs-fluid-examples"; version = "0.0.0.3"; - sha256 = "29d569819feafbe4aa9deb6c78a2e3189780e1cbb4aa350a3e32aa18b6435bf0"; + sha256 = "1w2v8fv1iaij7q53bamlrghq15qqwfi7hv7bknmf9yzaky0nkm99"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring fltkhs ]; @@ -65073,7 +69329,7 @@ self: { mkDerivation { pname = "fltkhs-hello-world"; version = "0.0.0.2"; - sha256 = "c7f8e729ba129ba983624da2d8696629c3e476b80ae5ea76a28e1a37ceedade1"; + sha256 = "1qddxp73f6lfl9vfmr8ap1vf9hr9crlxi8jdca1sk6qjp8lygy67"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base fltkhs ]; @@ -65092,7 +69348,7 @@ self: { mkDerivation { pname = "fluent-logger"; version = "0.2.3.1"; - sha256 = "b719a5ad910bab70531b597a874de2c70754d6e176f3256f81b5e8ec24852755"; + sha256 = "0m97hljfrs5mh5pjbwvnw7b581y7w96qfyjr3d9p1aqbj6nsa6dp"; libraryHaskellDepends = [ base bytestring cereal containers messagepack network network-socket-options random stm text time vector @@ -65114,7 +69370,7 @@ self: { mkDerivation { pname = "fluent-logger-conduit"; version = "0.3.0.0"; - sha256 = "383d35fcd9a63574798badab5b76e96d0228c79d25b2b7ef7e0e67e0c36b417c"; + sha256 = "0z21dg1y0rqfgvpvgci5kp3jh0kdx5v5paxdidwp8dd6v7y3ag9q"; libraryHaskellDepends = [ base bytestring conduit fluent-logger resourcet transformers ]; @@ -65129,7 +69385,7 @@ self: { mkDerivation { pname = "fluidsynth"; version = "0.2.0.0"; - sha256 = "9a1848452f73e9b48b0fbf16c12f5db9eee30c8b8901ed5538599701f5c127a3"; + sha256 = "18r7q7sh35sr71ays0c9ic6f7vmrblpw25mz1y5v9sbk5x2lh64s"; libraryHaskellDepends = [ base bindings-DSL containers directory ]; librarySystemDepends = [ fluidsynth ]; homepage = "https://github.com/MostAwesomeDude/hsfluidsynth"; @@ -65144,7 +69400,7 @@ self: { mkDerivation { pname = "fmark"; version = "0.1.1"; - sha256 = "34815c78ae08cc8b87f6824238e2e8dd280c7913054a7f4b5d36f00a529b53ae"; + sha256 = "1bjkkd90mw1nbm5pyjh52dwhqa6xx3i3hhl2ys3qpk08mrw5r09l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65161,7 +69417,7 @@ self: { mkDerivation { pname = "fmlist"; version = "0.9"; - sha256 = "581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf"; + sha256 = "1gzwmsrbxk22v7syf8zfvxphm23dmjzfpysz6qww3qvib8wm64aq"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/sjoerdvisscher/fmlist"; description = "FoldMap lists"; @@ -65170,22 +69426,27 @@ self: { "fmt" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, containers, hspec, microlens, neat-interpolation - , text, text-format, vector + , bytestring, containers, criterion, deepseq, formatting, hspec + , interpolate, microlens, neat-interpolation, text, text-format + , time, time-locale-compat, vector }: mkDerivation { pname = "fmt"; - version = "0.0.0.4"; - sha256 = "bfc71940c7f5c90c72945906e0887eb71894858593d536cb43b04109fd82634f"; + version = "0.3.0.0"; + sha256 = "1dihbcawpf082maxw3g6gsp1n8cmfdil4llqa3wmf37dqyi2bvjm"; libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring microlens text - text-format + base base16-bytestring base64-bytestring bytestring containers + microlens text text-format time time-locale-compat ]; testHaskellDepends = [ base bytestring containers hspec neat-interpolation text vector ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq formatting interpolate + text text-format vector + ]; homepage = "http://github.com/aelve/fmt"; - description = "Nice formatting library"; + description = "A new formatting library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -65197,7 +69458,7 @@ self: { mkDerivation { pname = "fn"; version = "0.3.0.1"; - sha256 = "72cfbb697e52324f092a4436468f8f63dc063eeb6edbd4885a05d604af62d4bd"; + sha256 = "1gflcaph9mh5ba4d9nvfxcz0dp33iy7lcdj4584lycjjgrlvpkvj"; libraryHaskellDepends = [ base blaze-builder bytestring directory filepath http-types text unordered-containers wai wai-extra @@ -65219,7 +69480,7 @@ self: { mkDerivation { pname = "fn-extra"; version = "0.3.0.1"; - sha256 = "5aba71b4edc9b8550514d6d1ac2ce51e8f0959dd68f5d12909fb05e8a6fff207"; + sha256 = "01zjzykfh1gv14lx3xb8vmchk3qywlnarlfn2h2mbf69xns73fjs"; libraryHaskellDepends = [ base blaze-builder bytestring digestive-functors directory either fn heist http-types lens mtl resourcet text wai wai-extra wai-util @@ -65236,7 +69497,7 @@ self: { mkDerivation { pname = "focus"; version = "0.1.5"; - sha256 = "ef4b641e06207e4b3bfc2c1cbce062db86fe02956ca2294a3ae8c6b1e1ace7b1"; + sha256 = "1cg7mkhv3ip87952k8kcjl1gx1nvcbhbq71czhxlnzi00qg68jzg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/focus"; description = "A general abstraction for manipulating elements of container data structures"; @@ -65250,7 +69511,7 @@ self: { mkDerivation { pname = "fold-debounce"; version = "0.2.0.5"; - sha256 = "78c0ff60d8a69193fbd298ece7a20351566c0a5a9adadfae96ff15e902fa594d"; + sha256 = "0karz81fj5gzjspdznlsb856qmji0fifgv4qsbxr74d6v1hgzh3q"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; @@ -65267,7 +69528,7 @@ self: { mkDerivation { pname = "fold-debounce-conduit"; version = "0.1.0.5"; - sha256 = "253e73bcf6e1cb281acce2c9e39b00b2419032e4f1e0234bd19a473d210f84cc"; + sha256 = "1k441whksiwss55j7q7iwhr90hdj02dy7jg2rhd2ijz1ysy76gi5"; libraryHaskellDepends = [ base conduit fold-debounce resourcet stm transformers transformers-base @@ -65282,22 +69543,44 @@ self: { "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, mwc-random, primitive, profunctors - , text, transformers, vector + , contravariant, criterion, hashable, mwc-random, primitive + , profunctors, text, transformers, unordered-containers, vector }: mkDerivation { pname = "foldl"; - version = "1.2.3"; - sha256 = "fb081168f7736a04dc68db348d2e0bc58d535da5ed74c4394a022dbaa46d3f25"; + version = "1.2.5"; + sha256 = "0jzc00dqwkr3kvy40f8f9klh24s8zvhfk2flrlyichc6zcy5qbda"; libraryHaskellDepends = [ - base bytestring comonad containers contravariant mwc-random - primitive profunctors text transformers vector + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors text transformers + unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; }) {}; + "foldl_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, hashable, mwc-random, primitive + , profunctors, text, transformers, unordered-containers, vector + , vector-builder + }: + mkDerivation { + pname = "foldl"; + version = "1.3.0"; + sha256 = "1rinr1a18pjwlrk21d9sfg0f954cwdc3bk9jl276ypcf8ydy3yin"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors text transformers + unordered-containers vector vector-builder + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-incremental" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty @@ -65306,7 +69589,7 @@ self: { mkDerivation { pname = "foldl-incremental"; version = "0.2.0.0"; - sha256 = "f3c3352c7dc24f78fa25f804647f70e3daf612364d55c717f989c8a1164bae27"; + sha256 = "09xf9cba3j49z4bwfmad6q9gdnp3f1zn817q4px7hky2gln3bhzk"; libraryHaskellDepends = [ base containers deepseq foldl histogram-fill vector ]; @@ -65323,19 +69606,17 @@ self: { "foldl-statistics" = callPackage ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random - , profunctors, quickcheck-instances, semigroups, statistics, tasty + , profunctors, quickcheck-instances, statistics, tasty , tasty-quickcheck, vector }: mkDerivation { pname = "foldl-statistics"; - version = "0.1.4.2"; - sha256 = "1cfa6d6d36ff40529319a6f790bf130b6b4d650f1b8db5ee739cf4b44d5c8be0"; - libraryHaskellDepends = [ - base foldl math-functions profunctors semigroups - ]; + version = "0.1.4.6"; + sha256 = "05ibj8gw86n5jspn5qnvvqyihb1fanmk86xxrm04sghxbfc9szzy"; + libraryHaskellDepends = [ base foldl math-functions profunctors ]; testHaskellDepends = [ - base foldl profunctors quickcheck-instances semigroups statistics - tasty tasty-quickcheck vector + base foldl profunctors quickcheck-instances statistics tasty + tasty-quickcheck vector ]; benchmarkHaskellDepends = [ base criterion foldl mwc-random statistics vector @@ -65355,7 +69636,7 @@ self: { mkDerivation { pname = "foldl-transduce"; version = "0.5.2.0"; - sha256 = "c3d8e0ec48ab53c60dac03c7784b508b82da23a6e746b4f856415dbfe359a9b7"; + sha256 = "1dx9b7ivypa1avwb8ip7lqixm0lba15piiq3mh6wclxb93nf1n63"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers foldl free monoid-subclasses profunctors semigroupoids semigroups split text @@ -65380,7 +69661,7 @@ self: { mkDerivation { pname = "foldl-transduce-attoparsec"; version = "0.2.0.0"; - sha256 = "0bd4c213bd949f1aa1f6f849b9c5caee6d20a6756712efcae2e383b24fe62f73"; + sha256 = "0wrgwr7v50z3wb5fy4k7fnk20vgfrb2vjjgqyshim7wlpl9w5m0b"; libraryHaskellDepends = [ attoparsec base bytestring foldl-transduce monoid-subclasses text transformers @@ -65394,23 +69675,26 @@ self: { }) {}; "folds" = callPackage - ({ mkDerivation, adjunctions, base, bifunctors, comonad - , constraints, contravariant, data-reify, distributive, lens, mtl - , pointed, profunctors, reflection, semigroupoids, transformers - , unordered-containers, vector + ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal + , cabal-doctest, comonad, constraints, contravariant, data-reify + , deepseq, directory, distributive, doctest, filepath, lens, mtl + , pointed, profunctors, reflection, semigroupoids, semigroups + , transformers, unordered-containers, vector }: mkDerivation { pname = "folds"; - version = "0.7.1"; - sha256 = "e07adf0c9834b5f78180250d7fec6a56ba84c752cbe4c991d52efc6c60b7d25a"; - revision = "1"; - editedCabalFile = "1ef82fedd12e9e46055436c3bfa5992f595c08ca986012dc301fd76f0bcaf05f"; + version = "0.7.3"; + sha256 = "028akichhx88kyvl05c4yl4y89wwird76gjh8nmghzcdbylcpig7"; configureFlags = [ "-f-test-hlint" ]; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base bifunctors comonad constraints contravariant data-reify distributive lens mtl pointed profunctors reflection semigroupoids transformers unordered-containers vector ]; + testHaskellDepends = [ + base bytestring deepseq directory doctest filepath mtl semigroups + ]; homepage = "http://github.com/ekmett/folds"; description = "Beautiful Folding"; license = stdenv.lib.licenses.bsd3; @@ -65422,7 +69706,7 @@ self: { mkDerivation { pname = "folds-common"; version = "0.2.0.0"; - sha256 = "acfec09382339b2fe6f6a31efa19a12516efc8755c82dc91ae04cb88d2819eb5"; + sha256 = "1dcyh798ijq4ms8xr0jwfp4fy5i5l4czl7m3yvk2z6rkha9w1zmc"; libraryHaskellDepends = [ base containers folds ]; testHaskellDepends = [ base containers tasty tasty-quickcheck ]; description = "A playground of common folds for folds"; @@ -65434,8 +69718,8 @@ self: { ({ mkDerivation, base, xml }: mkDerivation { pname = "folgerhs"; - version = "0.1.0.0"; - sha256 = "fbaf6da3ce10a7bf33ab696b807e475613257080679a36933cb3097b82df7abf"; + version = "0.1.0.1"; + sha256 = "0kn89abvbk7faynhsyg177rayxddvwnkgsjb5cng8044n9glw9sb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base xml ]; @@ -65452,7 +69736,7 @@ self: { mkDerivation { pname = "follower"; version = "0.0.1"; - sha256 = "55bfc859d286639ab320188cbb8c8aed9828774934b3663eb103b0eb0cc0c847"; + sha256 = "0iy8q06fpc03n4z6dcrl95vji67dia6bp30q42rrlqw6s9cwigsm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65470,7 +69754,7 @@ self: { mkDerivation { pname = "foma"; version = "0.1.1.0"; - sha256 = "63791467c24e9092d9ec5b295a4702f0ef9e89f01d75bae941aff4ffe3223eaa"; + sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ foma ]; homepage = "http://github.com/joom/foma.hs"; @@ -65484,7 +69768,7 @@ self: { mkDerivation { pname = "font-awesome-type"; version = "0.1"; - sha256 = "f01932a0d8a2262c79b3eedc57611c53eb66997cd44882706ca2549ddf8c5cda"; + sha256 = "1njwikgrsm52diq84j6lgjcndssk3ihmgp7fndwjq9m2v2h346gh"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/spl/font-awesome-type"; description = "A Font Awesome data type enumerating all icon classes"; @@ -65496,7 +69780,7 @@ self: { mkDerivation { pname = "font-opengl-basic4x6"; version = "0.0.3"; - sha256 = "a9b3d1712ccb2dd9a100dd2a0b37fba09f729645285709e84148c73a1e5ad257"; + sha256 = "0myjb8g3mis887l0jmr88nb757x0zcvhnanx02hxjbfb5iqx3cx9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base OpenGL ]; @@ -65511,7 +69795,7 @@ self: { mkDerivation { pname = "foo"; version = "1.0"; - sha256 = "686fe0cb53b97ba9830c55a557a9c6eba671c9240927bed79bd56ed7645c2ab8"; + sha256 = "1f1abijdfvnmkgbvw9q94k4p39pbqslmg9am1j1sjyxrag5y0vv8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65528,7 +69812,7 @@ self: { mkDerivation { pname = "foobar"; version = "0.1.0.0"; - sha256 = "3cbf7d5eb5b7f6b9ad65b8fedcbe9caa02cc43ae374f30c0a001545e6724a2c4"; + sha256 = "1i524ikmwm01l3030krpmr1wq0makjzdrzmqcnnvkxmpnmg7vgrw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -65546,7 +69830,7 @@ self: { mkDerivation { pname = "for-free"; version = "0.1"; - sha256 = "146b503614dca73dc2821790b1cbc56afdc3468205c752f29d074bf474491511"; + sha256 = "048m95sg8jq7kpr55iq5h93c7zbaqp5v340phb13v9yw2hv50sql"; libraryHaskellDepends = [ base comonad comonad-transformers containers contravariant transformers @@ -65563,7 +69847,7 @@ self: { mkDerivation { pname = "forbidden-fruit"; version = "0.1.0"; - sha256 = "ada14657c2281f4e34973ca909b808bd4c4aee76b1cb89bea4409a7fa950aa6b"; + sha256 = "0sxaa2lpz6j0ljz8kjxifvp4lk5x12w0ka9wjws4w7r8q9bld8dd"; libraryHaskellDepends = [ base control-monad-loop hashable hashtables primitive transformers transformers-base vector @@ -65584,7 +69868,9 @@ self: { mkDerivation { pname = "force-layout"; version = "0.4.0.6"; - sha256 = "f7729855b1b14e0b255325faaca9f4834004e02bd21def6a865d2c55c734259d"; + sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; + revision = "1"; + editedCabalFile = "1ydj5ng7wsi9jg6xw9bg8c7wrsg2jpnvjkjvzxaf6n8sjs0gxhvw"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -65597,7 +69883,7 @@ self: { mkDerivation { pname = "fordo"; version = "0.1"; - sha256 = "59e9a76e1ada36b31f55fca0c0d99ebaec2781e0eb56b7de881bd9615d2e906e"; + sha256 = "0vlh5rfn3n8vi3gbfmpbw20jgv5skvcw187walgv6dns39pagsar"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process transformers ]; @@ -65611,7 +69897,7 @@ self: { mkDerivation { pname = "forecast-io"; version = "0.2.0.0"; - sha256 = "7ed54091d063fdf9ffca57c05a24769345b88a9e5bbb6c1f4037e01f70c69a9f"; + sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby"; libraryHaskellDepends = [ aeson base text ]; homepage = "https://github.com/stormont/forecast-io"; description = "A Haskell library for working with forecast.io data."; @@ -65624,7 +69910,7 @@ self: { mkDerivation { pname = "foreign-storable-asymmetric"; version = "0.0.1"; - sha256 = "b2ef068e1870698eece8bb813c2073cdaaabcd9693b0f44b9208dbf2cf0543de"; + sha256 = "1pj30p7z5nq8j95z9c4kjv6spandfch3r0dvx3n8wsbh3270dvxj"; libraryHaskellDepends = [ base ]; description = "Types and instances for implementing a Storable with different peek and poke"; license = stdenv.lib.licenses.bsd3; @@ -65635,7 +69921,7 @@ self: { mkDerivation { pname = "foreign-store"; version = "0.2"; - sha256 = "06718a214d068eaa494cc82376f23b2059a141b01048cd7efcf2176a6c3383dc"; + sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/chrisdone/foreign-store"; description = "Store a stable pointer in a foreign context to be retrieved later"; @@ -65647,9 +69933,9 @@ self: { mkDerivation { pname = "foreign-var"; version = "0.1"; - sha256 = "4d62cebaa790cc5364fdb4c4c6834cebef0d5dc1101714c109415e9bf0afaee7"; + sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd"; revision = "1"; - editedCabalFile = "f9c906434533279cfa8e2897c6eed6ed9c279f373efc5180bda76b704601fa1c"; + editedCabalFile = "077s05370sx7pn053z1y6ygjg77dsvpcd5r8ivx9q9rk8m1hdjgr"; libraryHaskellDepends = [ base stm transformers ]; homepage = "http://github.com/ekmett/foreign-var/"; description = "Encapsulating mutatable state in external libraries"; @@ -65663,8 +69949,8 @@ self: { }: mkDerivation { pname = "forest"; - version = "0.1"; - sha256 = "4de243b4eddddc534881617c6335e0658496ad67c2ebc65ba148b2965fe64460"; + version = "0.1.1.1"; + sha256 = "0g14zghqhajjbnkds26l09xfq8g7l2nykha3nsbg7f34v8d34yqp"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable profunctors semigroupoids ]; @@ -65678,7 +69964,7 @@ self: { mkDerivation { pname = "forger"; version = "0.0.0.0"; - sha256 = "3e1eb8d0c607f6f0d24700570a0908975bdb13d01df258b121df05ad9cd6d3af"; + sha256 = "1bykssfas1fz46qmiwhxs09xnnwp104hlmq08z9g1xh7qv8bh7iy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -65694,7 +69980,7 @@ self: { mkDerivation { pname = "forkable-monad"; version = "0.1.1"; - sha256 = "3084b8c019ca55774a20380023f81ca151bf0c2bffddc919a07321c74697ac5b"; + sha256 = "0nxcjx3cf8bkl0cwkpgz5c6byld13kw2601q4157fmfa370bi11h"; libraryHaskellDepends = [ base transformers ]; homepage = "http://code.google.com/p/forkable-monad/"; description = "An implementation of forkIO for monad stacks"; @@ -65702,6 +69988,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forma" = callPackage + ({ mkDerivation, aeson, base, containers, data-default-class, hspec + , mtl, text, unordered-containers + }: + mkDerivation { + pname = "forma"; + version = "0.2.0"; + sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00"; + libraryHaskellDepends = [ + aeson base containers data-default-class mtl text + unordered-containers + ]; + testHaskellDepends = [ aeson base hspec mtl text ]; + homepage = "https://github.com/mrkkrp/forma"; + description = "Parse and validate forms in JSON format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "formal" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers , directory, file-embed, HTTP, indents, interpolatedstring-perl6 @@ -65711,7 +70015,7 @@ self: { mkDerivation { pname = "formal"; version = "0.1.0"; - sha256 = "c520d4c55381a7c2015bb42069fe1b86d20957110841d3034be6d5c3932a0a7d"; + sha256 = "0z8a5a9w7mg69c1x6h8825bhkll63gz6j85lbc0w59w1ag2x8865"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65729,7 +70033,7 @@ self: { mkDerivation { pname = "format"; version = "0.1.0.0"; - sha256 = "f0d6174b92f9394ca8a87435daa397d3cd5a5641d2d8d0a61c111617215869ef"; + sha256 = "1vv9b0hif5hi3jkd1n6j85b5mkfkjyixldblm2l4qfgrj95igmph"; libraryHaskellDepends = [ haskell2010 parsec ]; testHaskellDepends = [ haskell2010 parsec QuickCheck ]; homepage = "https://github.com/bytbox/hs-format"; @@ -65743,7 +70047,7 @@ self: { mkDerivation { pname = "format-numbers"; version = "0.1.0.0"; - sha256 = "0ca4561b55c888552f7bf0eb68e97b62acedcb0d5e5e1cc4afd94402d01231a6"; + sha256 = "19ii2b804i6rmz21qpjy1p5yvb32gglniszhgcpmb268aldmd90c"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec text ]; homepage = "https://github.com/agrafix/format-numbers#readme"; @@ -65759,7 +70063,7 @@ self: { mkDerivation { pname = "format-status"; version = "0.2.0.0"; - sha256 = "58e8bd948b9961cfc749f99ce03cbd6a381dabac3610de584106b103c695d535"; + sha256 = "0dfmjp307c8685cdw41nmjmisf3aplyf177r973wyqcrifabvs2q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65778,7 +70082,7 @@ self: { mkDerivation { pname = "formattable"; version = "0.1.1"; - sha256 = "a717a8ba375c2f098d814bba93941dce960904c3767eff8d11cf501a840c372f"; + sha256 = "0brp1j21ll6g266zyzknqc20k5nf3na97fjbh66hjbsw6yxah5x7"; libraryHaskellDepends = [ base bytestring data-default-class old-locale text time ]; @@ -65799,7 +70103,7 @@ self: { mkDerivation { pname = "formatting"; version = "6.2.4"; - sha256 = "432db74037d3bc326ab70e6e033502f818d9694535dbfc4c949cb50f72f33367"; + sha256 = "0rrkydr0zdcwji6grnrm8mlxj67q08sh6vhfnxm35g6k6x0bfba3"; libraryHaskellDepends = [ base clock old-locale scientific text text-format time ]; @@ -65817,7 +70121,7 @@ self: { mkDerivation { pname = "forml"; version = "0.2"; - sha256 = "7bed2017895dceb0acd67e7290eea7ee79f92d06049df176b47f5503e0e00eaf"; + sha256 = "1bqfw3h06mbznivg37840qnzjygflzp90wkyssnb1kjxi4bj1vbv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65839,7 +70143,7 @@ self: { mkDerivation { pname = "formlets"; version = "0.8"; - sha256 = "8987fb8dd8adb29e7be13f6720b62d896b5de945e3dc97c7508cb39fe136a54b"; + sha256 = "0jx56vhrzcwca33rgp738plmssw95nv20rrzw5xrxcmdv26zp1w9"; libraryHaskellDepends = [ applicative-extras base blaze-html bytestring haskell98 syb transformers xhtml @@ -65857,7 +70161,7 @@ self: { mkDerivation { pname = "formlets-hsp"; version = "2.3.1"; - sha256 = "825f07e61a911e696e01b42eed3034837f26ab7aa3ebf3f56301ea997db6a0a6"; + sha256 = "19m0nryrksh1cgsz7sx3gamjczw36hqfsbml05p6j7li3bk0fpw2"; libraryHaskellDepends = [ applicative-extras base formlets haskell98 hsp hsx mtl ]; @@ -65874,7 +70178,7 @@ self: { mkDerivation { pname = "formura"; version = "1.0"; - sha256 = "85f87237328c583f9178a37223def73ac394be919cbb91896c54340a69cadc8c"; + sha256 = "136wr9lhld2ldj4r3fwwj6z99hrsyzg26wm3g28kyn4c68vp5y45"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65895,7 +70199,7 @@ self: { mkDerivation { pname = "forth-hll"; version = "0.1.0.0"; - sha256 = "e385e0be9de25f5a37cf94408c38ebfd7e79f50c6fcd16214b89b26e3b8bacc2"; + sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3"; libraryHaskellDepends = [ array-forth base free mtl ]; description = "A simple eDSL for generating arrayForth code"; license = stdenv.lib.licenses.gpl3; @@ -65910,7 +70214,7 @@ self: { mkDerivation { pname = "fortran-src"; version = "0.1.0.4"; - sha256 = "4e20fae7ff4448a98cb3e2a16ff66514d3510b82d58f4c7bc998ff24c2ac5708"; + sha256 = "022pmk129zwqr5xlr3ymh85m3lqlcpv6z8g2nf6ajj24zzkzl82f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65930,6 +70234,35 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "fortran-src_0_1_0_6" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , directory, fgl, filepath, GenericPretty, happy, hspec, mtl + , pretty, text, uniplate + }: + mkDerivation { + pname = "fortran-src"; + version = "0.1.0.6"; + sha256 = "1rmjcbhfh0j67ffrqg0qp4qsz7bv49k3iw40qy0kmwiivhkgbaxl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers directory fgl filepath + GenericPretty mtl pretty text uniplate + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + array base binary bytestring containers directory fgl filepath + GenericPretty mtl pretty text uniplate + ]; + testHaskellDepends = [ + array base binary bytestring containers directory fgl filepath + GenericPretty hspec mtl pretty text uniplate + ]; + description = "Parser and anlyses for Fortran standards 66, 77, 90"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foscam-directory" = callPackage ({ mkDerivation, base, directory, doctest, filepath , foscam-filename, lens, pretty, QuickCheck, template-haskell @@ -65938,7 +70271,7 @@ self: { mkDerivation { pname = "foscam-directory"; version = "0.0.8"; - sha256 = "0b5ba1bd30d081d5ce32beb92047e10978eb2050489317516d26b3a87061bb66"; + sha256 = "0rmvc5qaicr6dm8ig4s8a0hfny09w53j1fdy6b7db0fh62ys2nqb"; libraryHaskellDepends = [ base directory foscam-filename lens pretty trifecta utf8-string ]; @@ -65959,7 +70292,7 @@ self: { mkDerivation { pname = "foscam-filename"; version = "0.0.4"; - sha256 = "6df1e49071483b6e0fcb3a3ab5d24f3c4b23b7e18d5a33cef001a00d677d8fd2"; + sha256 = "1llggmkhv801y3736nldw6vj6jrw9z9bafisrc7nwfs8f68f9wbd"; libraryHaskellDepends = [ base bifunctors digit lens parsers semigroupoids semigroups ]; @@ -65980,7 +70313,7 @@ self: { mkDerivation { pname = "foscam-sort"; version = "0.0.3"; - sha256 = "dd248dd26bb9ab9da3c8ce88c53a268e869b0118817f1a3ee27a5d7ad7790a52"; + sha256 = "0lhag7bplpbsw8z1lzw1300rp1lf4qxcb26fr2irvaxrdg98s96x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66006,10 +70339,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.3"; - sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa"; - revision = "1"; - editedCabalFile = "d3e2dc092452ec38bd2b555ecb5c5aceecb21880810c115973bf5cf2b4e0da5b"; + version = "0.0.13"; + sha256 = "0pvmq3lkbdzj861l7jkf5xsib77j756y0vml8kgr2rckpz5qashh"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -66022,12 +70353,14 @@ self: { }) {}; "foundation-edge" = callPackage - ({ mkDerivation, base, bytestring, foundation }: + ({ mkDerivation, bytestring, foundation, text }: mkDerivation { pname = "foundation-edge"; - version = "0.0.1"; - sha256 = "8451eff606d689409ba70109a2fc6744ac849c56c0207a47275a4fadcf6ba257"; - libraryHaskellDepends = [ base bytestring foundation ]; + version = "0.0.2"; + sha256 = "1ddcw4a8gmlcb6pgy2sysp6inpm19i7j1cg9ix3z5fwkpxg2kr71"; + revision = "1"; + editedCabalFile = "01w5bjjavfq76s43c2f0wbna6rn6yilivsq7s8ws5i1kqav9yffx"; + libraryHaskellDepends = [ bytestring foundation text ]; homepage = "https://github.com/haskell-foundation/foundation-edge"; description = "foundation's edge with the conventional set of packages"; license = stdenv.lib.licenses.bsd3; @@ -66039,7 +70372,7 @@ self: { mkDerivation { pname = "fountain"; version = "0.1"; - sha256 = "f7181514a2d4b98353e32a3c1793458d45e2d86c954e4a85b01c8ba7f2cebf57"; + sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p"; libraryHaskellDepends = [ base containers random ]; homepage = "http://tomahawkins.org"; description = "A fountain codec"; @@ -66061,7 +70394,7 @@ self: { mkDerivation { pname = "fpco-api"; version = "1.2.0.5"; - sha256 = "42c14a8d2cca593bca6befc33d5ee6888abb2361c2d0a9e3b6c4df1ab75100e5"; + sha256 = "1r80a6vimpy4nviskl62c4ivp2l8wrg3vhzgdg53nnfa5j6lmha2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66089,7 +70422,7 @@ self: { mkDerivation { pname = "fpipe"; version = "0.0.1"; - sha256 = "28f3eea9ee9c8bb47139296ce5dfb4f27b2c9aee522ab03ae205f2e47d0ad9ac"; + sha256 = "1b6r19yy9wh5w8xb0ajjxsd2qyzjnkgyav1975qv92wwxslyxwr8"; libraryHaskellDepends = [ base ]; description = "F#-style composition and application"; license = stdenv.lib.licenses.bsd3; @@ -66100,7 +70433,7 @@ self: { mkDerivation { pname = "fpnla"; version = "0.1.1"; - sha256 = "64ef9ae47c812b94a693dabffc728abb480ab3b6c4f8814fa8d7eeb446741797"; + sha256 = "15qpfi3b9vnpm17q3y64nsrhlj5vi9rgrgysjfk98aw1gkj9mvv4"; libraryHaskellDepends = [ base ]; description = "A library for NLA operations"; license = stdenv.lib.licenses.bsd3; @@ -66115,7 +70448,7 @@ self: { mkDerivation { pname = "fpnla-examples"; version = "0.1.1"; - sha256 = "62dd137960e012f83450f67101b6f1d2a7ad7cfc814521bc5d19b327412e60dc"; + sha256 = "1p305r0jgcqrbny22ic1ziyav9yjy6v02wgna0sgh4p0c1wi7pb2"; libraryHaskellDepends = [ accelerate array base deepseq fpnla hmatrix linear-algebra-cblas monad-par parallel repa vector @@ -66139,7 +70472,7 @@ self: { mkDerivation { pname = "fptest"; version = "0.2.1.0"; - sha256 = "70d855b3f61de5666cb070132e5d9d8248b4a5b3a5ceb349247b897930d27c3d"; + sha256 = "0gbws8q7k2bv4i4v7km5nfjv8j42kmfjw4vhn1n6dr8xysrmbn3h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66164,7 +70497,7 @@ self: { mkDerivation { pname = "fquery"; version = "0.2.3"; - sha256 = "8bbbedcec2bd3f98ea91a187b3970de55a5e2c60ec96fe44b7609a9d122f039e"; + sha256 = "17h35w99v6k0nx2gx5pcc0n5wnp51nbv71x1j7m9hgxxqb7fvfwb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66179,7 +70512,7 @@ self: { mkDerivation { pname = "fractal"; version = "0.0.1"; - sha256 = "ba9d99f042e31646ab11d2f1be6a9221539331cd28842a0c1fba825849218547"; + sha256 = "0iw5454mi0ms3w62m118rlqr6lr1j9mbxwfj26mlc5p38bq9k7ds"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -66192,7 +70525,7 @@ self: { mkDerivation { pname = "fractals"; version = "0.1.0.0"; - sha256 = "3dbca177023352014cb5c61205a9a90a640a75a0557935126800e25f38f2424a"; + sha256 = "0jj2y8w5zqh0d093ayaml1shlr0am6lha4n6nm602lik09vs3g1x"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base integer-gmp QuickCheck ]; description = "A collection of useful fractal curve encoders"; @@ -66205,7 +70538,7 @@ self: { mkDerivation { pname = "fraction"; version = "0.1.0.6"; - sha256 = "ad3feed29d66091a87d26b697aee57fa2b6f952f4656af8127372eb5cecd532a"; + sha256 = "0ajkrp7babip4y0symj65yanyazsazp7lsbbsa3il2b6kp9fwgxd"; libraryHaskellDepends = [ base semigroups ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction"; description = "Fractions"; @@ -66217,7 +70550,7 @@ self: { mkDerivation { pname = "frag"; version = "1.1.2"; - sha256 = "20edd8b22badd08e12e17c4b0e15a3f29c989d1a8e4d423d0c26224d19b9f6f5"; + sha256 = "1xgnp4cls8i61hyl4kcf3afri77jlcahwjvww498xl5d5frdiv90"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base GLUT OpenGL random ]; @@ -66236,7 +70569,7 @@ self: { mkDerivation { pname = "frame"; version = "0.1"; - sha256 = "4a36bdd3daa0c5af0e3a9898fc876096f8c6a030fced884169645ae62266b651"; + sha256 = "0ldncqifcnk4d50qivgw62hcdy4nc23zr64q787azid0vb9vsdja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66256,7 +70589,7 @@ self: { mkDerivation { pname = "frame-markdown"; version = "0.1"; - sha256 = "ef149e015bd45d73ddf30ba17b82e7cdf18114d541bdc870f5d39bf67a62c173"; + sha256 = "0wy1c9xgd6ykymqciga1sla83wfdwy17p88bygfp6pflbc0rw57g"; libraryHaskellDepends = [ base frame pandoc ]; description = "A markdown to Frame GUI writer for Pandoc"; license = stdenv.lib.licenses.bsd3; @@ -66267,7 +70600,7 @@ self: { mkDerivation { pname = "franchise"; version = "0.0.6"; - sha256 = "7913c9681ed5c241b83c719d2ed5ed6fa59035ff9b6f6e402c3d32572ef78e90"; + sha256 = "144fywp5fcix5i06wvwvzwsr19bgxpajx7bi7jw43hnm3rlcj4vr"; libraryHaskellDepends = [ base ]; description = "A package for configuring and building Haskell software"; license = stdenv.lib.licenses.bsd3; @@ -66282,9 +70615,9 @@ self: { mkDerivation { pname = "fraxl"; version = "0.1.0.0"; - sha256 = "a630e66137612bea25fcc3f8eb8e76077e2bfa55e2a53e9d3a34bbf6de794160"; + sha256 = "0q21g7ggdfrl7afkx9g2apx2nzh7fs7fpy63zhjylav16xhycc56"; revision = "1"; - editedCabalFile = "f1776631452087d0e757f0746b3264f1cb49a2e49c19df807a2df0dc7c745cba"; + editedCabalFile = "1fjwfiydrw1dga0dy6cwwji4kjzichr6nx7hazkx11r08lqncxzi"; libraryHaskellDepends = [ async base dependent-map dependent-sum exceptions free mtl transformers type-aligned vinyl-plus @@ -66303,7 +70636,7 @@ self: { mkDerivation { pname = "freddy"; version = "0.1.2.0"; - sha256 = "c2644b80d5d4592b4703cd404828ff8a5e4a1e62638eb9d305d4127f8934b951"; + sha256 = "0ldr6j4py4nl0p9vk3k3c8g4lplazwl4hh6d0d3jnnflsn04nr62"; libraryHaskellDepends = [ amqp base broadcast-chan bytestring data-default random text uuid ]; @@ -66326,7 +70659,7 @@ self: { mkDerivation { pname = "free"; version = "4.12.4"; - sha256 = "c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784"; + sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9"; libraryHaskellDepends = [ base bifunctors comonad containers distributive exceptions mtl prelude-extras profunctors semigroupoids semigroups @@ -66342,7 +70675,7 @@ self: { mkDerivation { pname = "free-concurrent"; version = "0.1.0.1"; - sha256 = "9ff2ee86c7a56f0c080e32394a82be129cb0b198fb9327b265a0735161e751b1"; + sha256 = "1caiwxhm2wx0cnr2g4zvk2qv170jps14lf9j1q40qvx5qy3fxwlz"; libraryHaskellDepends = [ base type-aligned ]; homepage = "https://github.com/srijs/haskell-free-concurrent"; description = "Free monads suitable for concurrent computation"; @@ -66358,7 +70691,7 @@ self: { mkDerivation { pname = "free-functors"; version = "0.7.2"; - sha256 = "de9a834164e97e1b025ca01d58833e8d91afe68e7152e0af40e30050b3898121"; + sha256 = "08c1i6rm007382py0lkiivkaz4cd7s1mh7d0bh11nzp9ci0q76ny"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad constraints contravariant profunctors template-haskell transformers @@ -66379,7 +70712,7 @@ self: { mkDerivation { pname = "free-game"; version = "1.1.90"; - sha256 = "645706706f3afe39d55d8f7405e1186a71952bc96023d3272ddf4bd992bcebc5"; + sha256 = "1igbpj9djjyz5lkx68v0r4mrawba33hhax4gbpakkzisdxq0cmv4"; libraryHaskellDepends = [ array base boundingboxes colors containers control-bool directory filepath free freetype2 GLFW-b hashable JuicyPixels @@ -66399,7 +70732,7 @@ self: { mkDerivation { pname = "free-http"; version = "0.2.0"; - sha256 = "d873e7dcef909cf6ec38e00273531c2831cc9a5ab4f2b73de8ec39441a6454b7"; + sha256 = "1dslchd48fgcx0yvgwmlbadcqc983i9p60p073ngd74hxzfffwyq"; libraryHaskellDepends = [ base bytestring free http-client http-types mtl QuickCheck text time transformers @@ -66417,7 +70750,7 @@ self: { mkDerivation { pname = "free-operational"; version = "0.5.0.0"; - sha256 = "ab36043228216c039a4132c6ed7fe39d5f890d7d612ba4cceb5d9b434125353e"; + sha256 = "0gim4m0l76sxxg6a8av1gl6qjpwxwdzyviij86d06v1150r08dmb"; libraryHaskellDepends = [ base comonad-transformers free kan-extensions mtl transformers ]; @@ -66433,7 +70766,7 @@ self: { mkDerivation { pname = "free-theorems"; version = "0.3.2.0"; - sha256 = "5cf44dc92a25b80bfa3146b650fc2c1ab40746be358e06e75469498720fa18e4"; + sha256 = "1r0qz8h8fjb9akkhd3impr30gd0s5ky51dj667x0pf155b4lvx2w"; libraryHaskellDepends = [ base containers haskell-src haskell-src-exts mtl pretty syb ]; @@ -66449,7 +70782,7 @@ self: { mkDerivation { pname = "free-theorems-counterexamples"; version = "0.3.1.0"; - sha256 = "63adb51b031de074b8455c3dfe964652e011c98f74241cf6c72271eaeda605f3"; + sha256 = "1wq5lvnylw92qzv1q93liz4i3q2j8sbgwgaw8nw79q0x0cdvbbb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66469,7 +70802,7 @@ self: { mkDerivation { pname = "free-theorems-seq"; version = "1.0"; - sha256 = "cf6889cdd4ab3711aa6af9c9e22031dfb640335f6823977ae0c00b06cd9698e9"; + sha256 = "1scqjv6hc2y0w1x9f8v8bwrl1dnz64hf5jgrdam12dxbsk6qjs6g"; libraryHaskellDepends = [ array base bytestring containers free-theorems haskell-src mtl old-locale old-time parsec pretty syb utf8-string xhtml @@ -66486,7 +70819,7 @@ self: { mkDerivation { pname = "free-theorems-seq-webui"; version = "1.0.0.2"; - sha256 = "c5c7119ff7bd248688a88b1afad2e9d899b58b8c58409adf4d94f9d6c273a7af"; + sha256 = "1bx7fg1ddycl9pgrlh2qij5vb6fqx79gl6lbm248c95xyygi3iy5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66505,7 +70838,7 @@ self: { mkDerivation { pname = "free-theorems-webui"; version = "0.2.1.1"; - sha256 = "6a1dfa751221bb795fcd4aee8f5db49ffafaee36880ec03906bc8992ff72ade3"; + sha256 = "1qxdfbzr52dw0qww03l86vpgmylznifqzvjarmgpkfr129szl7ba"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66523,7 +70856,7 @@ self: { mkDerivation { pname = "free-vector-spaces"; version = "0.1.2.0"; - sha256 = "68aed93d6e73e9d4e68fceb63e5b276b79558474d66cf44df34be667db1ba4ce"; + sha256 = "1km43gdngrjbyd6z8v6nfj25aybb4xdkxdnfizkd9sbkdqyxkbk8"; libraryHaskellDepends = [ base lens linear MemoTrie vector vector-space ]; @@ -66538,9 +70871,9 @@ self: { mkDerivation { pname = "free-vl"; version = "0.1.4"; - sha256 = "57f63ed35b42fc54fefb3cc183d0655e0d6c4a28d5371dba00fc9c9d3fa602bf"; + sha256 = "1gq2lqzrv77w02x1sdym5156q3aycp887h9wzgz59z22bg9kxxjp"; revision = "1"; - editedCabalFile = "150ba489128fe05a830fe3aad3771e134222a9b7327dc43676ef70b3cc99219c"; + editedCabalFile = "1711k76b6w7gfqvc8z9jnylj4hhk3rvx7ap31y1mmq4g2a4s82qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -66559,7 +70892,7 @@ self: { mkDerivation { pname = "freekick2"; version = "0.1.2"; - sha256 = "728072d092ed14ec27144df8d488619824477eb6a8b1af03b2ffc102b47375f9"; + sha256 = "1ybmffs05hgzn81szcd8nrz4f94qc64d9y2d2hkyq57djb87503j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66579,13 +70912,14 @@ self: { mkDerivation { pname = "freenect"; version = "1.2.1"; - sha256 = "fca7aa958ec04396334b101679f8603850d7c6629770d5206d774e115cd70759"; + sha256 = "0n87sxf12kkpdlhdaw4pcb3dfl1qc3w7j5hh9crrchy0isasm9zw"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ freenect freenect_sync ]; libraryPkgconfigDepends = [ libfreenect ]; homepage = "https://github.com/chrisdone/freenect"; description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freenect; freenect_sync = null; libfreenect = null;}; @@ -66596,7 +70930,7 @@ self: { mkDerivation { pname = "freer"; version = "0.2.4.1"; - sha256 = "cb01c6609c789d363fbd72df110010cfda57c6b16a8f9d5f1ae02780f764c1d9"; + sha256 = "1nf1ckvq09z039grv3van735gnng20013pvjplzkd7bqkihcc0fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -66611,20 +70945,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "freer-converse" = callPackage + ({ mkDerivation, base, freer-effects, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "freer-converse"; + version = "0.1.0.0"; + sha256 = "00a9apnr6kpg29yi3nfdfqjdbyld1fj2w3dkpv3xf4z8l00lflxj"; + libraryHaskellDepends = [ base freer-effects text ]; + testHaskellDepends = [ + base freer-effects tasty tasty-hunit tasty-quickcheck text + ]; + description = "Handle effects conversely using monadic conversation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "freer-effects" = callPackage - ({ mkDerivation, base, criterion, free, hlint, mtl, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "freer-effects"; - version = "0.3.0.0"; - sha256 = "06b67cabe8141468a0bc55d6f39918fd0a037992e760411d116a36a22586d57f"; + version = "0.3.0.1"; + sha256 = "13acias1kk74761zspc48qzkkfmdk4136jg5sp85wfspkpb9gvka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hlint QuickCheck tasty tasty-hunit tasty-quickcheck + base QuickCheck tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion free mtl ]; homepage = "https://github.com/IxpertaSolutions/freer-effects"; @@ -66639,7 +70989,7 @@ self: { mkDerivation { pname = "freesect"; version = "0.8"; - sha256 = "08359ee19d661ae9c00056fe4067623a439ca5469f9c050fae548f5e7b800c94"; + sha256 = "150ch1xmx3slmq7hb74z8sjrqhrsc9kl1zjn030fj6k6kphrwd88"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66659,7 +71009,7 @@ self: { mkDerivation { pname = "freesound"; version = "0.3.0"; - sha256 = "be22e47c2e0ff3d72b243003ad21b1817d24e310ea8cdd94818ed5763db43e0f"; + sha256 = "03rynhypdmcfh6adv37a23ij8zc1n4hss0rh4hmxgwqg5ryf88my"; libraryHaskellDepends = [ aeson base blaze-builder bytestring data-default filepath http-types lens mtl network network-uri old-locale text time @@ -66680,7 +71030,7 @@ self: { mkDerivation { pname = "freetype-simple"; version = "0.1.0.1"; - sha256 = "5adbe5ddde58d84bce1c3953c6963334b1a032f0e4b26f5d720a046512f211e2"; + sha256 = "1qhiy896a10af9fnzcp4y0ra1c9l6fbcclrr3k74pn2qvvfybnss"; libraryHaskellDepends = [ base boundingboxes bytestring freetype2 linear ]; @@ -66694,8 +71044,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "freetype2"; - version = "0.1.1"; - sha256 = "da18f9d3047277ba47e162dafa0b2a4777bfb6157b39ad91f9e808ba36f65e99"; + version = "0.1.2"; + sha256 = "00p3zb5iip9ggkapw4jkmpypnl8s7l6q9mrl66q07schi0lq0zji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -66708,7 +71058,7 @@ self: { mkDerivation { pname = "french-cards"; version = "0.1.1"; - sha256 = "5c70660593be3ecf1af9a9a30a41498f36aa45bd69825bf7b3793187d7576fd3"; + sha256 = "1lvgazbqfcbrngvmp0k9pm2sldlg950hm8x9z4dcygmyjc2ncw2w"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; homepage = "https://github.com/tserduke/french-cards#readme"; @@ -66723,7 +71073,7 @@ self: { mkDerivation { pname = "fresco-binding"; version = "0.2.0"; - sha256 = "34a494a812bb61bf875c1442ec5cf9bf9c257e3972b07a7c384ca0870dfca975"; + sha256 = "0xd9zh6qg82c71y7mc3j75z2b75zz5ffqhhlbj3vyqdv2al9991l"; libraryHaskellDepends = [ base bytestring cereal containers messagepack text unix ]; @@ -66736,7 +71086,7 @@ self: { mkDerivation { pname = "fresh"; version = "0.1.1"; - sha256 = "7c3ec0bf64298a386c8e404da204831b61ab42c28c6969b2e5b1f255caf68190"; + sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw"; libraryHaskellDepends = [ base containers haskell-src-exts syb ]; homepage = "https://github.com/davidlazar/fresh"; description = "Introduce fresh variables into Haskell source code"; @@ -66752,9 +71102,9 @@ self: { mkDerivation { pname = "friday"; version = "0.2.3.1"; - sha256 = "0827492c1a6116baa5c4866539a4cfa0f6d81bf31f6573616bf5ac4484199613"; + sha256 = "04wn36249b7mddhp6r8zycdxixm0ryj3jrc6qjjvl5k138n4j9q8"; revision = "1"; - editedCabalFile = "a8b4d38b593d866bebbdf141273ce70d2af8ca3351af86ea334dd5bce9252e58"; + editedCabalFile = "0n1f4plvrmad6gm8dbsi6g5ghahdwwy2fhgippmnp1ixb65x7d58"; libraryHaskellDepends = [ base containers convertible deepseq primitive ratio-int transformers vector @@ -66775,7 +71125,7 @@ self: { mkDerivation { pname = "friday-devil"; version = "0.1.1.1"; - sha256 = "522563c7e1ff4dd85f34ad5f85ddb14da693f0fa494f17d0665e69aaee81e1a5"; + sha256 = "19g1h7palsaycv81fks9zbq979jdn7fqapxd6igxhkgzw73n69aj"; libraryHaskellDepends = [ base bytestring convertible deepseq friday transformers vector ]; @@ -66792,8 +71142,8 @@ self: { }: mkDerivation { pname = "friday-juicypixels"; - version = "0.1.2"; - sha256 = "2f8fca7cf49c86af592691bdaaada94ae768a9e054956759a860c9b59ae16ed1"; + version = "0.1.2.1"; + sha256 = "1x0s4m4zmmaz9sa000pwip6cagjza6c8w7i9zikpb8z7xn21i1na"; libraryHaskellDepends = [ base friday JuicyPixels vector ]; testHaskellDepends = [ base bytestring file-embed friday hspec JuicyPixels @@ -66809,7 +71159,7 @@ self: { mkDerivation { pname = "friday-scale-dct"; version = "1.0.0.1"; - sha256 = "0a40db255149c553169d8c2cc8f7ae11b511061b45a3e5c810f9be3390951b48"; + sha256 = "0j0vjn837gpr234fb8s53c313d8imvvwhb4cklb57ia9a4jxnh0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66826,7 +71176,7 @@ self: { mkDerivation { pname = "friendly-time"; version = "0.4"; - sha256 = "05da52b12137473d643798e4f651f7939cef8d3c4775efac0849bdaad394e3f4"; + sha256 = "1x73jk9smga912nfyxa77j6yz74kyx8zdr4q6xj3sirp46qm5nh5"; libraryHaskellDepends = [ base old-locale time ]; testHaskellDepends = [ base hspec old-locale time ]; description = "Print time information in friendly ways"; @@ -66838,9 +71188,9 @@ self: { mkDerivation { pname = "frisby"; version = "0.2"; - sha256 = "a3389559849cfc3284923d9b543897abc924c5c076a383890a6a8f21cf4d5247"; + sha256 = "0isj9p7j33va1a4q78vnq32j9jdbjww596rxja235z4whicraf53"; revision = "1"; - editedCabalFile = "12db65dfa550e3fb99cf8924ebf71c9308465391ee91a897741fdbcca65fe1c6"; + editedCabalFile = "1ip1bykcrnqzfjbsi4gfj59lc24k3kvyn949ryczpqshlpgnbnqj"; libraryHaskellDepends = [ array base containers mtl ]; homepage = "http://repetae.net/computer/frisby/"; description = "Linear time composable parser for PEG grammars"; @@ -66852,7 +71202,7 @@ self: { mkDerivation { pname = "from-sum"; version = "0.2.1.0"; - sha256 = "a1ed8a433b98df8a70be2f9199abae3e5ed7fb4c2f2b3fb1268b6b588f326667"; + sha256 = "0rv66a7mhswb4sqkyarg9kxxfpiymsmrk49gprq8mpwq7d1qmvd1"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/from-sum"; @@ -66867,7 +71217,7 @@ self: { mkDerivation { pname = "frontmatter"; version = "0.1.0.2"; - sha256 = "66eb97b0d5097397f0238b9af764a8c6ea2bb9a4a16cd1214051719fc313b99d"; + sha256 = "17dr2g1rywai80hx2v51ljwjpsn6m1jgg6lb4gq9fwq9snq9gsv6"; libraryHaskellDepends = [ attoparsec base bytestring yaml ]; testHaskellDepends = [ attoparsec base bytestring hspec QuickCheck text yaml @@ -66882,7 +71232,7 @@ self: { mkDerivation { pname = "frown"; version = "0.6.2.3"; - sha256 = "fcca75244343a976a397f7d50687a80d41192e9eaa47d77799d11892f5fe400c"; + sha256 = "0320zvsr466ik5vxfixakqp1jh8dm23hdmgpjyipdaa38cj7bjpw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory ]; @@ -66895,7 +71245,7 @@ self: { mkDerivation { pname = "frp-arduino"; version = "0.1.0.3"; - sha256 = "a5479d681b7886f937266046cc4f1c86e1f7300308695dc4a204b7e24a4fc500"; + sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://github.com/frp-arduino/frp-arduino"; description = "Arduino programming without the hassle of C"; @@ -66908,7 +71258,7 @@ self: { mkDerivation { pname = "frpnow"; version = "0.18"; - sha256 = "1fafa04d5ec57b49380ad23675075acf03ba63bcf92d52d1341bad265c64b0c7"; + sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz"; libraryHaskellDepends = [ base containers mtl transformers ]; homepage = "https://github.com/atzeus/FRPNow"; description = "Principled practical FRP"; @@ -66921,7 +71271,7 @@ self: { mkDerivation { pname = "frpnow-gloss"; version = "0.12"; - sha256 = "31a508edd53ab44c60960096213751fe8a5bcb3476fcc930e9239be022c3dcf7"; + sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i"; libraryHaskellDepends = [ base containers frpnow gloss mtl transformers ]; @@ -66937,7 +71287,7 @@ self: { mkDerivation { pname = "frpnow-gtk"; version = "0.11"; - sha256 = "0ca00921ccad223ea0c94cc95b6e13a90ba4a7b0e71f3fd9bfe5fd4ae5bb097b"; + sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c"; libraryHaskellDepends = [ base containers frpnow glib gtk mtl transformers ]; @@ -66946,12 +71296,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "frpnow-gtk3" = callPackage + ({ mkDerivation, base, containers, frpnow, glib, gtk3, mtl, text }: + mkDerivation { + pname = "frpnow-gtk3"; + version = "0.2.0"; + sha256 = "11mpr85myj0p9gj8hbyckgwskamd0ihdxsk39k3yphi7fbpsarg0"; + libraryHaskellDepends = [ + base containers frpnow glib gtk3 mtl text + ]; + homepage = "https://github.com/george-steel/frpnow-gtk3"; + description = "Program GUIs with GTK3 and frpnow!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "frquotes" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "frquotes"; version = "0.2.1"; - sha256 = "ccf01fffd0dee0a9662f63b6c22ca1f06d8a569adf960399fbc9bd6e2a58ac68"; + sha256 = "0s5cb0m6xgf9zfch75nzk9b8lvghl4nc5dk35xkakq6ys3zizw6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -66965,7 +71329,7 @@ self: { mkDerivation { pname = "fs-events"; version = "0.1"; - sha256 = "845fc3e10a326ac14e6213acf0b6e59143f911b6084ba680c848ffef5267864b"; + sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/nkpart/fs-events"; description = "A haskell binding to the FSEvents API"; @@ -66973,12 +71337,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fsh-csv" = callPackage + ({ mkDerivation, base, hint }: + mkDerivation { + pname = "fsh-csv"; + version = "0.2.0.0"; + sha256 = "1lhvq4pqgsc52hzgh39ijw4yqw6r4pgq7shv8y5xfgyjibzkmf8m"; + libraryHaskellDepends = [ base hint ]; + description = "csv parser for fsh"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fsharp" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "fsharp"; version = "0.0.4"; - sha256 = "a382429a5cc2ec186cb206d84f91ebb9a9c3c25b912445a4e90825ab17dc95e9"; + sha256 = "1scmvhbsn988x6j4a94ibg1c7adrxf8lzn06n9n1iv62bjd450m3"; libraryHaskellDepends = [ base ]; description = "some F# operators, high priority pipes"; license = stdenv.lib.licenses.bsd3; @@ -66991,7 +71367,7 @@ self: { mkDerivation { pname = "fsmActions"; version = "0.4.4"; - sha256 = "4c3748cd7537476ffab0683dc966296a374122becaae89f33a60041d241fe114"; + sha256 = "05713wj1s1307brqkbnapqi42dva55kcjgb8n3x6yirpfp6lhdsc"; libraryHaskellDepends = [ base containers fgl filepath graphviz MissingH mtl parsec pretty ]; @@ -67009,7 +71385,7 @@ self: { mkDerivation { pname = "fsnotify"; version = "0.2.1"; - sha256 = "ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b"; + sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb"; libraryHaskellDepends = [ async base containers directory filepath hinotify text time unix-compat @@ -67030,7 +71406,7 @@ self: { mkDerivation { pname = "fsnotify-conduit"; version = "0.1.0.0"; - sha256 = "925bd952deddc9728461c8b5e32b36be57b64693757c4d2ce03a58bdca090e9f"; + sha256 = "17qf175bsn1sw0n4sz3mjd3bcmxy6qmy7df8c6275jfxvr9djnwj"; libraryHaskellDepends = [ base conduit directory filepath fsnotify resourcet transformers ]; @@ -67050,7 +71426,7 @@ self: { mkDerivation { pname = "fst"; version = "0.10.0.1"; - sha256 = "fefef76c1d64c6518d6fb8298974e2372753202a0f6d5baa0160bb4248420aa4"; + sha256 = "190a89445fv006m5nv8g58h569rpw9s8jadqdy6m3ik43mnggzpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base mtl ]; @@ -67068,7 +71444,7 @@ self: { mkDerivation { pname = "fsutils"; version = "0.1.2"; - sha256 = "e8665aace36bdc631cd9abed10164a12eb332194c4cfeaee92d6858644229d1e"; + sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8"; libraryHaskellDepends = [ base directory filepath ]; homepage = "https://github.com/Raynes/fsutils"; description = "File system utilities for Haskell that are missing from built in libraries"; @@ -67076,6 +71452,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fswait" = callPackage + ({ mkDerivation, base, hinotify, optparse-applicative + , optparse-generic, semigroups, stm, system-filepath, text + , time-units, turtle + }: + mkDerivation { + pname = "fswait"; + version = "1.1.0"; + sha256 = "1iqnawsxrx21q9g34dc1pp451z9s37m7z3fswrwd8bs3fw9mgbb3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hinotify optparse-applicative optparse-generic semigroups stm + system-filepath text time-units turtle + ]; + 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 ({ mkDerivation, base, directory, fsnotify, optparse-applicative , process, regex-pcre-builtin, system-filepath, unix @@ -67083,7 +71480,7 @@ self: { mkDerivation { pname = "fswatcher"; version = "0.2.1"; - sha256 = "bf6a6c68bb6bb677d1c079fed88688588fb2536273c2007c530a2509cb49a78a"; + sha256 = "12m7975hj98aady01hkkc99v53sqi23dizkrq38pgdkbpdl6qsmz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67103,7 +71500,7 @@ self: { mkDerivation { pname = "ftdi"; version = "0.2.0.1"; - sha256 = "a892fae6e1c12c3fc1db3f10e84b99c46f6145ac3fb3bcad519bcb619f5dcebe"; + sha256 = "1gnfbngn3jwva6nvrcrzmi2n2vy4k55yh41zvg0kyb61w7kgm4m8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67121,7 +71518,7 @@ self: { mkDerivation { pname = "ftp-client"; version = "0.4.0.1"; - sha256 = "c4ae91a103e3b3288a803831d55e8ddde1f2c6946d3fc3ec27bfde8995f71b4c"; + sha256 = "0k0vyyaqkpmz4znc6gvdjk3g5qfximgdac9qh252icz30fhr3bn4"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -67139,7 +71536,7 @@ self: { mkDerivation { pname = "ftp-client-conduit"; version = "0.4.0.1"; - sha256 = "baabf54a382463cf91a147f9553edff86baf9b3554e69f2f3e612ea37c8e399f"; + sha256 = "17rrirya6bk17qprzrjl6ndsyszqvwz5bya7l68wyqr4715gbaxs"; libraryHaskellDepends = [ base bytestring conduit-combinators connection exceptions ftp-client resourcet @@ -67158,7 +71555,7 @@ self: { mkDerivation { pname = "ftp-conduit"; version = "0.0.5"; - sha256 = "af99d3cea5dcb06723e7511deb03fada21a026f579b5e1b55730656bc82b663d"; + sha256 = "0gb65g46nr9haysy3dbrylka08fsz81yn7aiwwingc6wlp7d76dg"; libraryHaskellDepends = [ base byteorder bytestring conduit MissingH network transformers utf8-string @@ -67170,17 +71567,17 @@ self: { }) {}; "ftphs" = callPackage - ({ mkDerivation, base, hslogger, MissingH, mtl, network, parsec - , regex-compat + ({ mkDerivation, base, bytestring, hslogger, MissingH, mtl, network + , parsec, regex-compat }: mkDerivation { pname = "ftphs"; - version = "1.0.9.1"; - sha256 = "ce0b05b2fc7f93a6195184ed1a8edee69a7a9cf4aa3d15ebeb25421715571bf2"; + version = "1.0.9.2"; + sha256 = "1ijpsclqkvmgj047kpa4bv58xh515cl7q5inamgc2cznr3qxn3zr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base hslogger MissingH mtl network parsec regex-compat + base bytestring hslogger MissingH mtl network parsec regex-compat ]; homepage = "http://software.complete.org/ftphs"; description = "FTP Client and Server Library"; @@ -67192,7 +71589,7 @@ self: { mkDerivation { pname = "ftree"; version = "0.1.3"; - sha256 = "75bc8b829bcb3e9cb6fc623db9b9a722268f411c603065fec9f43fcdad3c48d5"; + sha256 = "1ma87jnwsgzlr7z6ac303i0qy9i2lywvjgb2zjv9qgnbkf18pg3m"; libraryHaskellDepends = [ base ShowF type-unary ]; homepage = "https://github.com/conal/ftree/"; description = "Depth-typed functor-based trees, both top-down and bottom-up"; @@ -67206,7 +71603,7 @@ self: { mkDerivation { pname = "ftshell"; version = "0.3.0.1"; - sha256 = "195d3f7ad6ed76a6757246204af449ac8de2c33b4c47bdbbf1fd10fc9b5937cb"; + sha256 = "1jrpb6dzq47xy6xvsisc7g1y53dc97s4l826f9sscxpdsrx3yp8r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67222,7 +71619,7 @@ self: { mkDerivation { pname = "fugue"; version = "0.1"; - sha256 = "b98834285984356daf9db715cd30ff095412996d81ba9a75a972f5c828f0183c"; + sha256 = "0g0qy0lcixbjm5srmfl1dnci4m09zwqcs5dpknpnsdc4b4l3925r"; libraryHaskellDepends = [ base ]; description = "A recapitulated prelude with minimal dependencies and profligate exports"; license = stdenv.lib.licenses.bsd3; @@ -67233,7 +71630,7 @@ self: { mkDerivation { pname = "full-sessions"; version = "0.6.2.1"; - sha256 = "20d55ecc9355e5e4d6c87559c4c098013531e41cd4f57f55fe89caf7f20f3547"; + sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90"; libraryHaskellDepends = [ base ghc network ]; homepage = "http://www.agusa.i.is.nagoya-u.ac.jp/person/sydney/full-sessions.html"; description = "a monad for protocol-typed network programming"; @@ -67248,7 +71645,7 @@ self: { mkDerivation { pname = "full-text-search"; version = "0.2.1.3"; - sha256 = "f3de82428b67819c1284f18192922e20cda5cb3cdb447297018507b13e3ca368"; + sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers text vector ]; @@ -67268,7 +71665,7 @@ self: { mkDerivation { pname = "fullstop"; version = "0.1.4"; - sha256 = "6caa4776774bdeed62d41638cde47d675a245fa4622d44bc982fa244db148580"; + sha256 = "10452kdl98igk2y48bb2ligj8nk7gpjcsf0nsiifvpjbfxv4gakc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base split ]; @@ -67295,7 +71692,7 @@ self: { mkDerivation { pname = "funbot"; version = "0.5"; - sha256 = "7efaf158080ee56dec38b141a7856e872eb58703c2f5d5fa501804bdabb053aa"; + sha256 = "1ajkn2mvs10qa3xdbxf20f3vabl7ds2sfhdi73n6vr8f11cg3yky"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67319,9 +71716,9 @@ self: { mkDerivation { pname = "funbot-client"; version = "0.1.0.1"; - sha256 = "22072804b49929a100e92a067c7e79f6d30b506cbb3f3bb487db02501b33afba"; + sha256 = "1fmg6cdm00nvhys3ngxvdi80plzng5z7q1iax40a2acrnh22h1r2"; revision = "1"; - editedCabalFile = "449437e7cb240595b590cc3d34b0f08471870961bbf9faf9b4344646223c402b"; + editedCabalFile = "0as07hi4ciilnkwzmydvc44qfwc4y2q38gfcj2sra194rgkkg524"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring funbot-ext-events HTTP network-uri @@ -67337,7 +71734,7 @@ self: { mkDerivation { pname = "funbot-ext-events"; version = "0.3.0.0"; - sha256 = "088850454d4b5e0cedd7dd80aab4d5dbfda08b251b9f3d99a0506ea27814b01c"; + sha256 = "075h2iwa4vjhl2ckv7qv4n5s1zfvsnsam06xsznhqpjb9m2m1208"; libraryHaskellDepends = [ aeson base text ]; homepage = "https://notabug.org/fr33domlover/funbot-ext-events"; description = "Interact with FunBot's external events"; @@ -67352,7 +71749,7 @@ self: { mkDerivation { pname = "funbot-git-hook"; version = "0.1"; - sha256 = "7154955621144511ca6c68a2f56c6cf67f800c1269a4e82b687e6a6473ffa8dd"; + sha256 = "1pd8zxrn8skyd0myi93928680zzndingb8k8dk512i8l45b9am3i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67370,7 +71767,7 @@ self: { mkDerivation { pname = "funcmp"; version = "1.8"; - sha256 = "33fc37e8c05d665bc6a7a5b4406e433e19fe2c58421a034b76e1b412e8737526"; + sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k"; libraryHaskellDepends = [ base filepath process ]; homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; @@ -67385,9 +71782,9 @@ self: { mkDerivation { pname = "funcons-tools"; version = "0.1.0.0"; - sha256 = "99f2652af578a482d6f9253f9fffa057ab8fcb4272d32e6a78a23291a4fd96ef"; + sha256 = "1vwnznj92cm2g1m2xlvj8b5qzaspl3zrygr5z7b8593qylm6bwlr"; revision = "2"; - editedCabalFile = "fee9ad9bc35f0d9b37f5a219ca853dd55ff6baaa761e587b27ab4e6f00716014"; + editedCabalFile = "0530f406ykmb4xxmh7knmaxgcpym7n2wl6d2ylvrn3azqfdsvsgy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67407,7 +71804,7 @@ self: { mkDerivation { pname = "function-combine"; version = "0.1.0"; - sha256 = "29a64d9f05fa5ee3091639445aaa19a6fd6994d05888fd911f59cdb43aae0bd5"; + sha256 = "1m8bmqxb9kar3y8zv22qs2a6kzd636m5li1r2q4y6pps0nglv9i9"; libraryHaskellDepends = [ base data-type ]; description = "Combining functions"; license = stdenv.lib.licenses.bsd3; @@ -67419,7 +71816,7 @@ self: { mkDerivation { pname = "function-instances-algebra"; version = "0.1"; - sha256 = "fcf9b3a1c69f80ccaa8ed89cd37bdfdba158ad21225e5d32e2cf529fbba9be37"; + sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw"; libraryHaskellDepends = [ base numeric-prelude ]; homepage = "github.com/kreuzschlitzschraubenzieher/function-instances-algebra"; description = "Instances of the Algebra.* classes for functions"; @@ -67432,7 +71829,7 @@ self: { mkDerivation { pname = "functional-arrow"; version = "0.0"; - sha256 = "ba64e0b2ccddd40f9a386b7f067d2ed7740b324fdd73141633cae8572aee49d1"; + sha256 = "1la9xqm5gs6a6cb18wyx9wr0nx6p5ryhczvb72d0zm6xrjrf0r5s"; libraryHaskellDepends = [ base HList ]; description = "Combinators that allow for a more functional/monadic style of Arrow programming"; license = stdenv.lib.licenses.bsd3; @@ -67444,7 +71841,7 @@ self: { mkDerivation { pname = "functional-kmp"; version = "0.1.0.0"; - sha256 = "29de062f7d0d3fec1f6c15143037032bf27a30c313c4aa9befd041f13f70e2d0"; + sha256 = "1l72f0zz2hfhxydsmi0kqcq7mwib0cvk050mdhgyqgqdglphdpi9"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/mniip/functional-kmp"; description = "KMP implemented on haskell's built-in cons-cell-based lists"; @@ -67456,13 +71853,31 @@ self: { mkDerivation { pname = "functor-apply"; version = "0.11"; - sha256 = "793a6a40d6dd10031e164514752f45ce8d4b641fe87f23f00317a066d571504b"; + sha256 = "0jshf7and80p0gq26zz83xj4p3ff8lppa5252qg0646xsr06lfkr"; doHaddock = false; homepage = "http://comonad.com/reader/"; description = "This package has been subsumed by semigroupoids"; license = stdenv.lib.licenses.bsd3; }) {}; + "functor-classes-compat" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + , vector + }: + mkDerivation { + pname = "functor-classes-compat"; + version = "1"; + sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; + revision = "1"; + editedCabalFile = "04blby010250gyg0v7nwdr9hwzvkapmfy9xn5522h8jmb3yygh8l"; + libraryHaskellDepends = [ + base containers hashable unordered-containers vector + ]; + homepage = "https://github.com/phadej/functor-classes-compat#readme"; + description = "Data.Functor.Classes instances for core packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "functor-combo" = callPackage ({ mkDerivation, base, base-orphans, containers, data-inttrie, lub , type-unary, TypeCompose @@ -67470,7 +71885,7 @@ self: { mkDerivation { pname = "functor-combo"; version = "0.3.6"; - sha256 = "6152f1f5302b63fdc1c0de146278945f6f6038bdb1b7c3794cf24a59a3519bca"; + sha256 = "1jlva6imjjpj9iww7dxiplw60vszjiw6456yq30zsqrb63sz2lk1"; libraryHaskellDepends = [ base base-orphans containers data-inttrie lub type-unary TypeCompose @@ -67483,8 +71898,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "functor-infix"; - version = "0.0.4"; - sha256 = "2dac64ec872867c2365dd6318388c27da561f34ab285852ffba89965d15525d7"; + version = "0.0.5"; + sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/fmap/functor-infix"; description = "Infix operators for mapping over compositions of functors. Lots of them."; @@ -67496,7 +71911,7 @@ self: { mkDerivation { pname = "functor-monadic"; version = "0.1.0.3"; - sha256 = "8fe599835be9400e8ff70bfb65d3a734c1971afa051c4c8425c96a4cbcb5d9e1"; + sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ombocomp/FunctorMonadic/"; description = "Monad-style combinators for functors"; @@ -67508,7 +71923,7 @@ self: { mkDerivation { pname = "functor-utils"; version = "1.1"; - sha256 = "a054cbd84686777774b9e2c36c1b5ceaf8ca415a9755e922ff52137eb9ac36ba"; + sha256 = "1finmjwpw4sjzwifjmcpb90wmy7abhdnrhz2p5s7fxw68vccnm50"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/wdanilo/functor-utils"; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; @@ -67521,7 +71936,7 @@ self: { mkDerivation { pname = "functorm"; version = "1.0.1"; - sha256 = "3a77ff551fa07141f69b2909e791e575c8f804ef12729d87ce396f72bd7144a9"; + sha256 = "1aa4f6yp4vrrrs3rswhjxw2gij3mwn8yf299kgv42wd03xazyxrs"; libraryHaskellDepends = [ base ]; description = "Data.FunctorM (compatibility package)"; license = stdenv.lib.licenses.bsd3; @@ -67533,7 +71948,7 @@ self: { mkDerivation { pname = "functors"; version = "0.1"; - sha256 = "e6b96554d59b924f9960677137f2d4bc2417bac29b87083390d0020b6397d659"; + sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/aristidb/functors"; description = "(.:) and friends, syntax for Functor and Applicative."; @@ -67547,7 +71962,7 @@ self: { mkDerivation { pname = "funion"; version = "0.0.2"; - sha256 = "bbf330e07787adef884fcd3cfe5e119afd4bf189154bdfae78e7f5249e23f45d"; + sha256 = "0pgl4fg29xg7g2pdyjqmi7qlpzcs25ggwg6d9y4fzbc7fzh31wxv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67566,7 +71981,7 @@ self: { mkDerivation { pname = "funnyprint"; version = "0.0.5"; - sha256 = "8f13d87e1a47957cad27e4753af10d375406e503d90a9e1cb193aec68eeef99e"; + sha256 = "17prxs7cdblkn4f9w2nr0gjhcm1p1pqklxg44ynpr5a739zdh4wg"; libraryHaskellDepends = [ base hscolour ipprint ]; testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ]; benchmarkHaskellDepends = [ base criterion hscolour ipprint ]; @@ -67580,7 +71995,7 @@ self: { mkDerivation { pname = "funpat"; version = "0.1"; - sha256 = "dc2b226bbb72a65a5281e86d766b3f26b0b1a898d08cd53f0c6cb98a9ecb747d"; + sha256 = "0zblrfg8mfbc1hzxb36hk2lb3c167xmpcvg8h595m9kjpdmj4ayw"; libraryHaskellDepends = [ base mtl ]; description = "A generalization of pattern matching"; license = stdenv.lib.licenses.bsd3; @@ -67594,7 +72009,7 @@ self: { mkDerivation { pname = "funsat"; version = "0.6.2"; - sha256 = "c316ddc611a3504d05b1db7e7412e99c83c6d6c766504fe7d685c3bce3e8dec3"; + sha256 = "1hyyx3ivrhw5svklyl36qzbcd0wwx4978znvn42lsl53273ds5n3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67617,7 +72032,7 @@ self: { mkDerivation { pname = "fusion"; version = "0.2.0"; - sha256 = "95a8c2a5ee98fa16a548ec55a42c5a7dde2fce688df74cf884a777db654a486f"; + sha256 = "0vs899jxnxx7hkw4rxwdd372zpkxb8na8mgc92jidylqxsjw5a4m"; libraryHaskellDepends = [ base pipes-safe transformers void ]; testHaskellDepends = [ base directory doctest filepath ]; homepage = "https://github.com/jwiegley/fusion"; @@ -67631,7 +72046,7 @@ self: { mkDerivation { pname = "futun"; version = "0.1.0.2"; - sha256 = "6122312b750522313956ddd44d8de70d87ad4f0a033f5e4ed28d824c2b18d1ed"; + sha256 = "1vfi30mlr0lds975wgq3197sv1qdwy6lvm6xaqwk28h5flmk28k1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring network unix ]; @@ -67645,7 +72060,7 @@ self: { mkDerivation { pname = "future"; version = "2.0.0"; - sha256 = "318f8acee3681b60440a1ada300074d6fc0c0d6ce5fe4c2012ac75a74d0d7bbf"; + sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri"; libraryHaskellDepends = [ base ]; homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/future"; description = "Supposed to mimics and enhance proposed C++ \"future\" features"; @@ -67658,7 +72073,7 @@ self: { mkDerivation { pname = "future-resource"; version = "0.4.0.0"; - sha256 = "7bb20c997e7d486ef201d67da1116007fe841e63ac3b212b8d2b6413a59e9083"; + sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv"; libraryHaskellDepends = [ base transformers ]; description = "realtime resource handling with manual concurrency"; license = stdenv.lib.licenses.lgpl3; @@ -67671,7 +72086,7 @@ self: { mkDerivation { pname = "fuzzcheck"; version = "0.1.1"; - sha256 = "ecd664796e9cf5c608ca904897dd9ec18b471a86fcfb4216328382b28023d961"; + sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc"; libraryHaskellDepends = [ base lifted-base monad-control QuickCheck random transformers ]; @@ -67688,7 +72103,7 @@ self: { mkDerivation { pname = "fuzzy"; version = "0.1.0.0"; - sha256 = "820a7a2b52163c1ecf0924780604ec903979560901cc1b9f27a68ff17256e9cb"; + sha256 = "1jz9arrg33x64ygipk0115b7jfchxh20cy14177iwg0na8mpl2l2"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base HUnit ]; homepage = "http://github.com/joom/fuzzy"; @@ -67704,7 +72119,7 @@ self: { mkDerivation { pname = "fuzzy-timings"; version = "0.0.1"; - sha256 = "47d64c43601d1fdf3695bf6461d99d624078900d49612d703019d9e40978a4ea"; + sha256 = "1sm4g04y9n8r61q2sqa91n87hh32kpcn2r5zjlvdy7qxc11lrmj7"; libraryHaskellDepends = [ base containers glpk-hs mtl random time ]; @@ -67723,7 +72138,7 @@ self: { mkDerivation { pname = "fuzzytime"; version = "0.7.8"; - sha256 = "805ae4943fb04808e5e582919235a8e0f61ffc0878fbce41cea29d2609822a1c"; + sha256 = "071ah84jd7d2rr0wxyvq13y1zxp0m0sr54c2wpjhhj5h7yaf8nl0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -67742,7 +72157,7 @@ self: { mkDerivation { pname = "fwgl"; version = "0.1.4.0"; - sha256 = "428d265e21b498e90e74a3a695d1940e4264481d3eda0a9f5bb0e70031e15d8f"; + sha256 = "13sxw4qh1rxhbfghmniy3m468hhfjk8rb9m3fh7fk65l45g2d3a2"; libraryHaskellDepends = [ base hashable transformers unordered-containers vect vector Yampa ]; @@ -67759,7 +72174,7 @@ self: { mkDerivation { pname = "fwgl-glfw"; version = "0.1.1.1"; - sha256 = "043af8e10112bf529f4734d3337f2f8ae683bf59083d85350eba52c5387ffc1b"; + sha256 = "06zwgwwcalms1qsqag88b6zq7rla5xzk7lrl8ygm5gqj07hzhfh4"; libraryHaskellDepends = [ base fwgl gl GLFW-b hashable JuicyPixels transformers unordered-containers vect vector @@ -67777,7 +72192,7 @@ self: { mkDerivation { pname = "fwgl-javascript"; version = "0.1.1.1"; - sha256 = "858b6cc2cbba16819464446b174fb36108b76b1c503f20dbf1e41c3a470a7786"; + sha256 = "11kp193kl774y7dj0gsh3imvf231nd7ifss4cja825msrg16r2w5"; libraryHaskellDepends = [ base fwgl ghcjs-base hashable unordered-containers vect ]; @@ -67787,12 +72202,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fx" = callPackage + ({ mkDerivation, base, base-prelude, transformers }: + mkDerivation { + pname = "fx"; + version = "0.7"; + sha256 = "114psjyz9jvda86gk29x9xl2h1r6a6lxxhpl4zw5wkf3zszjsylc"; + libraryHaskellDepends = [ base base-prelude transformers ]; + homepage = "https://github.com/nikita-volkov/fx"; + description = "Horizontally composable effects"; + license = stdenv.lib.licenses.mit; + }) {}; + "g-npm" = callPackage ({ mkDerivation, base, HTTP, json }: mkDerivation { pname = "g-npm"; version = "0.1.0"; - sha256 = "e0633977ce6a89ac5f9a83575c36207e7e3dbcb8ee4db2552aca218b571f99ae"; + sha256 = "1blr3xbqn8fa59av4kgfp2y3szky40v5qmw3k9gsr2barrvkjqz0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HTTP json ]; @@ -67801,6 +72228,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "g4ip" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "g4ip"; + version = "0.1.0.0"; + sha256 = "11n0kq3gmmsb5gx796k1x0m20s9zwhx5bgq4ng8j8qwyzmrh4a7w"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/cacay/G4ip"; + description = "A theorem prover for propositional logic that uses G4ip"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gact" = callPackage ({ mkDerivation, base, biopsl, bytestring, cmdargs, hashable , unordered-containers @@ -67808,7 +72249,7 @@ self: { mkDerivation { pname = "gact"; version = "0.2"; - sha256 = "b8c762f4198bb7ec71ac399f1e97c0ffb93dcc1b64c9e7f3b47236ea8958395c"; + sha256 = "0p1rb24yldkjnkrygjb43g63vfgzq2bix7rrmiqyrdwb37s65ixq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67824,7 +72265,7 @@ self: { mkDerivation { pname = "game-of-life"; version = "0.1.0.5"; - sha256 = "8bd15d6d2ede2bae8b49d057d6c742a677e68e518159cd99c660b9fed8b53fda"; + sha256 = "1niznpcgxfb0qscwsnc1a67fcxx68b3xcmyh965swayy5rnmvlcb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base hscurses random text ]; @@ -67840,7 +72281,7 @@ self: { mkDerivation { pname = "game-probability"; version = "1.1"; - sha256 = "736e9eff22a455286adb2906076f1e52a93370e86528463c9fe93c010e4c82f2"; + sha256 = "1wl29h702g79kwy4ca35x1q37aaj3rphf1i9vdm2hmd44bzrwvkk"; libraryHaskellDepends = [ base containers probability random ]; description = "Simple probability library for dice rolls, card games and similar"; license = stdenv.lib.licenses.bsd3; @@ -67852,7 +72293,7 @@ self: { mkDerivation { pname = "game-tree"; version = "0.1.0.0"; - sha256 = "a512f90c97a312f8c0d4610d2c5472007ef0787b9046a64135b9a1f0c89d0fbd"; + sha256 = "1g8gkp4g18dr6m0scilhgdwg0zh0f9a2q3b1sk0gh4m3jw6gj4m5"; libraryHaskellDepends = [ base ]; description = "Searching game trees with alpha-beta pruning"; license = "GPL"; @@ -67863,7 +72304,7 @@ self: { mkDerivation { pname = "gameclock"; version = "1.0.4"; - sha256 = "14a817789f414bd6b2d9d646e016950ee06f915a1d2b4b23e688c6859ab059a4"; + sha256 = "192rn2d8bil8wqilnaqxba8nzq0fjlbf0innv6rdcjs1kxw1ga0l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cairo containers glib gtk time ]; @@ -67879,7 +72320,7 @@ self: { mkDerivation { pname = "gamma"; version = "0.9.0.2"; - sha256 = "983ac33f0141f576425ae85b883ba8241bdfc73ff48d7ea8124a05a731a8e427"; + sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; libraryHaskellDepends = [ base continued-fractions converge template-haskell vector ]; @@ -67893,7 +72334,7 @@ self: { mkDerivation { pname = "gang-of-threads"; version = "3.2.1"; - sha256 = "37d0004e9eba014ac16854c03a4938d87552d037c3500ffbff4705dc81a5473e"; + sha256 = "0gj7ln0xq1a7zzxhyl636z854xfq714kmh2ld30ll0dskr701l1p"; libraryHaskellDepends = [ base containers mtl stm transformers ]; description = "Non-deterministic parallelism with bags"; license = stdenv.lib.licenses.bsd3; @@ -67904,7 +72345,7 @@ self: { mkDerivation { pname = "garepinoh"; version = "0.9.9.2.1"; - sha256 = "a7b2e31484f7df98d7ca4a4084e6ab6a95677a9a84bcc23f93ac3e61a4e2d4b3"; + sha256 = "1cylwaj62gmcjczw5g44k9x6g5bamgk88h2arbbripzphhaf7cm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskeline transformers ]; @@ -67920,7 +72361,7 @@ self: { mkDerivation { pname = "garsia-wachs"; version = "1.2"; - sha256 = "dba83f2c31f67fd7d21d2ba13c3c1102c025a204b0435898e620a6c0b82d7a56"; + sha256 = "0mks5nwc19i0wsc5hhxh0ji2bh0224y3r89b3p9dfzzn64n3za6v"; libraryHaskellDepends = [ base ]; description = "A Functional Implementation of the Garsia-Wachs Algorithm"; license = stdenv.lib.licenses.bsd3; @@ -67931,7 +72372,7 @@ self: { mkDerivation { pname = "gasp"; version = "1.0.1.0"; - sha256 = "7f9dcc98599814557179e428e281a82ceebc8208a698d87e726c3f8307b033f9"; + sha256 = "1y9kn03q6gvcf9zdi656121brvicm20y4a74g5qma54qb6ccr7bz"; libraryHaskellDepends = [ base binary containers ]; description = "A framework of algebraic classes"; license = stdenv.lib.licenses.bsd3; @@ -67944,7 +72385,7 @@ self: { mkDerivation { pname = "gbu"; version = "0.1"; - sha256 = "e6b33291f01f504754ce2391bd79f596464e830eaceee06494aaee9161c10f7f"; + sha256 = "0zqgq5hr3vmajijf1vmc1s1lwilnymwvv493rra4fl0zy28k5cz6"; libraryHaskellDepends = [ base containers fgl Graphalyze haskell98 mtl regex-posix ]; @@ -67955,13 +72396,14 @@ self: { }) {}; "gc" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, hlint - , parallel + ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest + , filepath, hlint, parallel }: mkDerivation { pname = "gc"; - version = "0"; - sha256 = "0a699181d365bcec3e0da537a595c62ccf6d3a9df8865cb2ac5279421d6e9bcb"; + version = "0.0.1"; + sha256 = "15jz191njpd1jfx2x2xvqpvsz81mifspj37xhgqsxlk6vb2a3xb1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath hlint parallel @@ -67978,7 +72420,7 @@ self: { mkDerivation { pname = "gc-monitoring-wai"; version = "0.1.2"; - sha256 = "6a93786225da39924d00f35ea19cc45ee11d7bb6426f3364e94683ff6c352812"; + sha256 = "04i86mngz0s6x5j36vs2nrxivqayqjfa2ppk016r4ffs4mi7i4va"; libraryHaskellDepends = [ aeson base blaze-builder conduit http-types text transformers unordered-containers wai @@ -67998,7 +72440,7 @@ self: { mkDerivation { pname = "gcodehs"; version = "0.1.0.0"; - sha256 = "0ff4381453b8aefc09bede0b1a4e15e5bc81e0e6b5c6a3c8d23a8d6faf696db3"; + sha256 = "1cvdd6pnz39ssb4a7immwvh83g752m71l2yypq4zrbmqaca3ix0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68022,7 +72464,7 @@ self: { mkDerivation { pname = "gconf"; version = "0.13.1.0"; - sha256 = "57cfa606ef4dcd377e0d77d59b880439382ad05604b3e3d439fd64af64a21dad"; + sha256 = "1b8xl9jayr7x77af7cq4av82lf1r0j49pmbp1mz3gkadxw3adksp"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib text ]; libraryPkgconfigDepends = [ GConf ]; @@ -68038,7 +72480,7 @@ self: { mkDerivation { pname = "gd"; version = "3000.7.3"; - sha256 = "14aecb600d9a058b1905dfdef3d51a1eb11fb92f804fbaaa041103a0bfd97fb6"; + sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ expat fontconfig freetype gd libjpeg libpng zlib @@ -68055,7 +72497,7 @@ self: { mkDerivation { pname = "gdiff"; version = "1.1"; - sha256 = "0c2b042d177131ec5e691fd70452d5b828d8bed7c697169469f470b790430db4"; + sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/eelco/gdiff"; description = "Generic diff and patch"; @@ -68069,7 +72511,7 @@ self: { mkDerivation { pname = "gdiff-ig"; version = "0.1.1"; - sha256 = "a24a546e02759e15a25c8a74175e50b00b9338e3f339caf1dee880797de249d5"; + sha256 = "1ma9w9ypk078vvqwlfgkwcw962xha1g1fx4abji1b7km09p58jm2"; libraryHaskellDepends = [ array base ghc-prim instant-generics template-haskell ]; @@ -68086,7 +72528,7 @@ self: { mkDerivation { pname = "gdiff-th"; version = "0.1.0.7"; - sha256 = "5c6832e0de5b7cb35f388be0f2ef301fce1b4e6f0d86bbeec2f105304bfa0bc6"; + sha256 = "1ihbz95k01giqbpbp1hddx71pkhz63pz5q4b71gv6z2vvvh34s2w"; libraryHaskellDepends = [ base containers gdiff mtl template-haskell th-expand-syns uniplate ]; @@ -68106,7 +72548,7 @@ self: { mkDerivation { pname = "gdo"; version = "0.1.5"; - sha256 = "9c128b9e29799b761e289bbfa7125e655acc934a84615b84164f3ba8188d1627"; + sha256 = "09qnilcahfsg2s25nqc49a9wqnk5bq9aggwv50g7d6vr56g8n4lw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68122,7 +72564,7 @@ self: { mkDerivation { pname = "gearbox"; version = "1.0.0.5"; - sha256 = "e4e3547f2cd5eb3f4d46f867c64d370bdcbe23c3f617df8b31741dfcebdabf06"; + sha256 = "01mzvbmzq7bl665xy5znqcivxp0b6x6wcrzq8r6kzsym5izm9qz4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT OpenGLRaw Vec ]; @@ -68140,7 +72582,7 @@ self: { mkDerivation { pname = "geek"; version = "1.1.1.0"; - sha256 = "a05cdafc1aa14ba26efe997860da26edd66154b9eb69e8a833a063fc55d1a258"; + sha256 = "0n52s5azqqx06flfhsgbp5a63mpd4vd60y4rzrpa4jx13bydlp50"; libraryHaskellDepends = [ aeson aeson-pretty air air-extra air-th base bytestring containers curl data-default directory filepath fsnotify Glob hack2 @@ -68160,7 +72602,7 @@ self: { mkDerivation { pname = "geek-server"; version = "1.1"; - sha256 = "e2ae31c48c02100878adc408c24261dcc24351421df52b373e2c15451197a1a4"; + sha256 = "1951jw8la59c7qvjpx8x898l7hnwc51c4264mmw0h402ik233bp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68184,7 +72626,7 @@ self: { mkDerivation { pname = "gegl"; version = "0.0.0.5"; - sha256 = "e783b1718f06fea318730ec8f6fb6c7d89e66691fa5dfd779f40ba192b5c5920"; + sha256 = "082rbhmikfj0kxvzspgsj5kfd2bxdkxzdj0ffcca7zh6ixqv30z7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68207,7 +72649,7 @@ self: { mkDerivation { pname = "gelatin"; version = "0.0.0.3"; - sha256 = "181525849ef7b34b051906d333659623a1be4f981197ea185a0f3bfc60b63d1e"; + sha256 = "07ixnrhgqfqgb8cfm5qik17vx893jrjk7lq6342lpczpks22a58q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68231,7 +72673,7 @@ self: { mkDerivation { pname = "gemstone"; version = "0.3.0.1"; - sha256 = "80bcdd94c882e8786f6a5e48e5cd47a74eb98d0b330c3d5b8b822c3f6fa73179"; + sha256 = "0y9ilxpkyb42iddks31k1f6vjkm78z6yaj2yd9ppis42r2advg40"; libraryHaskellDepends = [ array base bitmap bitmap-opengl containers FTGL lens linear OpenGL random SDL SDL-image stb-image transformers @@ -68242,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 @@ -68249,7 +72709,7 @@ self: { mkDerivation { pname = "gencheck"; version = "0.1.1"; - sha256 = "393a785d946ed359cb0d78dcd2c3633912abd5f5e3783615a310e3fa47b841b9"; + sha256 = "1fa1p13zmqqhlcakcy73ypasn4ircg1x5p3q1p5mklvfjifphfir"; libraryHaskellDepends = [ base combinat containers ieee754 memoize random template-haskell transformers @@ -68265,7 +72725,7 @@ self: { mkDerivation { pname = "gender"; version = "0.1.1.0"; - sha256 = "18a8d0f61f9d3d93e6731a5ee56151f253e4b2275b46d4a62f7a809dc419d469"; + sha256 = "0sfl3729v03s5ykd8ijv4yrf8lzja5hyaphsfgk96gcx3zvd1a0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base text ]; @@ -68283,7 +72743,7 @@ self: { mkDerivation { pname = "genders"; version = "0.1.0.1"; - sha256 = "0f41be1270f74126f887ea18a6737c9116c9e505ccf461190ee37a9d24d6814a"; + sha256 = "0jl1sqj9syp31qcn3x6c0pjwj5ligirsc67ahzw2chgpf09bwh8g"; libraryHaskellDepends = [ base bytestring filepath vector ]; librarySystemDepends = [ genders ]; testHaskellDepends = [ base bytestring hspec network vector ]; @@ -68298,7 +72758,7 @@ self: { mkDerivation { pname = "gendocs"; version = "0.1.3"; - sha256 = "0e934bfd9dd84f4e069737352e1c3503eef81747564f3dfd51e47a4959522df8"; + sha256 = "1y1da9cljyp4a7yksksn8wbzivh36lf2wd9pjw34wkyqkpylp4qf"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring safe text ]; @@ -68314,8 +72774,8 @@ self: { }: mkDerivation { pname = "general-games"; - version = "1.0.2"; - sha256 = "1415c6cb8a2d37322e7568ae53ffca5d658aed6e47bbbefa5c59ed88c09b384e"; + version = "1.0.5"; + sha256 = "0lra0dn1nnvkbbc5x3sxn10z7vziwzvlvg153l3xi6daqhch6za2"; libraryHaskellDepends = [ base monad-loops MonadRandom random random-shuffle ]; @@ -68331,7 +72791,7 @@ self: { mkDerivation { pname = "general-prelude"; version = "0.1.2"; - sha256 = "cd1c16d3dfe82833a9b35df1072f98ae266ecdba1d99ef8a4691c67b5ab6a84e"; + sha256 = "0km8nrd7pili8s5fz68xpb6nw9mfk0phgwaxnflk6a78vz9ic76d"; libraryHaskellDepends = [ base lens pointless-fun strict system-filepath ]; @@ -68345,7 +72805,7 @@ self: { mkDerivation { pname = "generator"; version = "0.5.5"; - sha256 = "adc10917a37890e50301da83e73e949e57b1a0f91e3c1dc58245cab862169fe7"; + sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd"; libraryHaskellDepends = [ base List transformers ]; homepage = "http://github.com/yairchu/generator/tree"; description = "Python-generators notation for creation of monadic lists"; @@ -68357,7 +72817,7 @@ self: { mkDerivation { pname = "generators"; version = "1.0.3"; - sha256 = "587041fb4c32efa99463e1faafcef0d0311944525f0afffd6e124b0845efa144"; + sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q"; libraryHaskellDepends = [ base mtl random ]; homepage = "http://liamoc.net/pdf/Generator.pdf"; description = "Actually useful monadic random value generators"; @@ -68373,7 +72833,7 @@ self: { mkDerivation { pname = "generic-accessors"; version = "0.6.0.1"; - sha256 = "c6f4fd2a221a2368baff60132746e122dc2818bfe69c901b337ef448e70cf4c9"; + sha256 = "1jgl1kklix3y6cdr1776pwc2ip12w532f4v0zyx6h8qs48mgvx66"; libraryHaskellDepends = [ base binary cereal lens linear spatial-math TypeCompose ]; @@ -68390,10 +72850,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.8"; - sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb"; - revision = "3"; - editedCabalFile = "ed9572e401789a0bff470b31f6cb127e77a43a831ba07b5eb5705a3b770d2263"; + version = "0.2.0.9"; + sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -68402,12 +72860,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-arbitrary" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-arbitrary"; + version = "0.1.0"; + sha256 = "1imw36k5kxfl7ik0mzjxa8xzqg6hs3k253kpi19a9l53wxa0mwv9"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Generic implementation for QuickCheck's Arbitrary"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-binary" = callPackage ({ mkDerivation, base, binary, bytestring, ghc-prim }: mkDerivation { pname = "generic-binary"; version = "1.0.1"; - sha256 = "49c00e6cbe0d54fe72db40fedd92978833e78f5a0d0e26eb192194c14cd1ddc0"; + sha256 = "1h6xs56c351137mjc3hdba7yfcw8jy9dvzj0vdrgwm0dprn0xh29"; libraryHaskellDepends = [ base binary bytestring ghc-prim ]; description = "Generic Data.Binary derivation using GHC generics."; license = stdenv.lib.licenses.bsd3; @@ -68420,7 +72889,7 @@ self: { mkDerivation { pname = "generic-church"; version = "0.3.0.0"; - sha256 = "4c591d9f4c6d46394ce5f0eccd776fe81955edf99af592f7a87659c16d4384b3"; + sha256 = "1cw48dnw2nbnm3vr5xcsz7nma6g8dxvwvv7hwm63jikd9jgisnac"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -68435,9 +72904,9 @@ self: { mkDerivation { pname = "generic-deepseq"; version = "2.0.1.1"; - sha256 = "3b1a51507a4a3e9a9721126f6ca29fe6f97eb589605b5fec8925e674ee9f52f9"; + sha256 = "1yajkzp79ri5i7n5ynv0i6spxyg6kyi6qvqj46brlgjag98526iv"; revision = "1"; - editedCabalFile = "58ed9aeb48cc2a00e3122780fcbf2732c4d6fc46198434926a8b1bcc91d4a29b"; + editedCabalFile = "16x2sj8wq6wbda93910r8vyddi1j4yzzr0172bih0anc93mrmvaq"; libraryHaskellDepends = [ base ghc-prim ]; description = "Generic deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; @@ -68448,7 +72917,7 @@ self: { mkDerivation { pname = "generic-deriving"; version = "1.10.5"; - sha256 = "f6a2af9a96b22cdf496c7d6ef7bb6e8e365937ec61d788b08068f4fcf6854f0d"; + sha256 = "03aghpvgrx38h2q8imv1xhvmjdlfdsxzfvkxdi4xyb5jjsdaz8pn"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -68464,8 +72933,8 @@ self: { }: mkDerivation { pname = "generic-deriving"; - version = "1.11.1"; - sha256 = "b38d427f990f3080108c565a81284217290a47be63bab7bf59036ece2e2cb0e9"; + version = "1.11.2"; + sha256 = "1y92q4dmbyc24hjjvq02474s9grwabxffn16y31gzaqhm0m0z5i9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -68475,12 +72944,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-enum" = callPackage + ({ mkDerivation, array, base, bytestring, hspec }: + mkDerivation { + pname = "generic-enum"; + version = "0.1.1.0"; + sha256 = "1m4li9q7dcb82ls4dh4c9xb6mxqnz6lm5b94pr6wrjsnz5xni8xy"; + libraryHaskellDepends = [ array base bytestring ]; + testHaskellDepends = [ array base bytestring hspec ]; + description = "An Enum class that fixes some deficiences with Prelude's Enum"; + license = stdenv.lib.licenses.mit; + }) {}; + + "generic-lens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-lens"; + version = "0.2.0.0"; + sha256 = "05p53pqx0an32zdjj9x7dj4l04yh0p8rww32i8hh2ymg3h616apl"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/kcsongor/generic-lens"; + description = "Generic data-structure operations exposed as lenses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { pname = "generic-lucid-scaffold"; version = "0.0.1"; - sha256 = "3fcf7c6778d9be507c3854a8ac35f11347703234d8b0967e990f678ce1f0998e"; + sha256 = "13lry3hqqrqgk5z9dc6q6hr70iqky4ssra2l71y51gnrg1kprkrz"; libraryHaskellDepends = [ base lucid text ]; description = "General-purpose web page scaffold for Lucid"; license = stdenv.lib.licenses.mit; @@ -68495,7 +72988,7 @@ self: { mkDerivation { pname = "generic-maybe"; version = "0.3.0.4"; - sha256 = "a18fb3f81ab1a76de60f437ea6869cc2fb8e4cf4455e22aea00889a13f4f48bf"; + sha256 = "1gs89wzs3288l2p24pj5yi68xyy2kj3aczj31zk6v9xi3bwb73x1"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base bytestring containers deepseq directory doctest filepath @@ -68516,7 +73009,7 @@ self: { mkDerivation { pname = "generic-pretty"; version = "0.1.0"; - sha256 = "c75645a50f32fed0b7745d21b3fbb6e6d5e13f2f7f022968076a0fd757abe755"; + sha256 = "0mg7mdbxf3va0xl2j0kz5wzy3mg6nvxv68axfjvx1zij1yjlamn7"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring containers text vector ]; @@ -68530,30 +73023,26 @@ self: { }) {}; "generic-random" = callPackage - ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 - , MonadRandom, mtl, QuickCheck, transformers, unordered-containers - , vector - }: + ({ mkDerivation, base, boltzmann-samplers, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "0.4.0.0"; - sha256 = "68c5036f55584c5164c79a6adf6d9dc4435844fc98d206be80a1683cc4929f22"; - libraryHaskellDepends = [ - ad base containers hashable hmatrix ieee754 MonadRandom mtl - QuickCheck transformers unordered-containers vector - ]; + version = "0.4.1.0"; + sha256 = "1qif0cv7kzwvcmlldavbqih1mlzj65wrv80vgcavb1338f46zlfa"; + libraryHaskellDepends = [ base boltzmann-samplers QuickCheck ]; homepage = "http://github.com/lysxia/generic-random"; description = "Generic random generators"; license = stdenv.lib.licenses.mit; }) {}; - "generic-random_0_4_1_0" = callPackage - ({ mkDerivation, base, boltzmann-samplers, QuickCheck }: + "generic-random_0_5_0_0" = callPackage + ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "0.4.1.0"; - sha256 = "cad16f88436384b5157b1ba09d7931f2d31a60c46bab4669659bff7936032ee2"; - libraryHaskellDepends = [ base boltzmann-samplers QuickCheck ]; + version = "0.5.0.0"; + sha256 = "00v514nadzm1g7pni1jqmxyzxs03v4vqj9p1qrxa46grk8ya3zsf"; + revision = "1"; + editedCabalFile = "1570wshlwb3ikws578zmrpfd560lpnd1idfx2w8plcb1znw7z7fj"; + libraryHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/lysxia/generic-random"; description = "Generic random generators"; license = stdenv.lib.licenses.mit; @@ -68564,8 +73053,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-records"; - version = "0.1.0.0"; - sha256 = "3137b00c2f537640b77c39bdef0f0466768c1fcb0a66a797793cb383cc722454"; + version = "0.2.0.0"; + sha256 = "0xga8vm89xjgzmnz5032kqyq1q8nhbf01n55xjgda4kfjzkx1yr0"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kcsongor/generic-records"; description = "Magic record operations using generics"; @@ -68577,7 +73066,7 @@ self: { mkDerivation { pname = "generic-server"; version = "0.1"; - sha256 = "668a7619ec0528cea7c589a76b8deb978d41fead7f7e1a15e34d1bdeb07b832e"; + sha256 = "0bl3gfqdw6sdwcailzkzmpz433cpxf6np9w9qnkwwa05xhcpd2k6"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple generic TCP/IP server"; license = stdenv.lib.licenses.bsd3; @@ -68588,7 +73077,7 @@ self: { mkDerivation { pname = "generic-storable"; version = "0.1.0.0"; - sha256 = "b23bfe5f0b889e4dd1706260ebd4c312719ecc82e2c995df89a3902c8678cf04"; + sha256 = "016gg232r453i7grbjg2hb69ww8jqgafnq32f38lv7l81dgzwfxj"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim hspec QuickCheck ]; description = "Generic implementation of Storable"; @@ -68601,7 +73090,7 @@ self: { mkDerivation { pname = "generic-tree"; version = "15329.2"; - sha256 = "48ace4b95fefe33b154bf0c46401eff97527d1b2483f26b8a50eaa5988e23cbb"; + sha256 = "1frwwa45kahflnw2cgs8nb8jfxgrxw0n9i7h9cakpqzgbywy9b28"; libraryHaskellDepends = [ base ]; description = "Generic Tree data type"; license = "LGPL"; @@ -68612,7 +73101,7 @@ self: { mkDerivation { pname = "generic-trie"; version = "0.3.0.2"; - sha256 = "38319a5e95ed79e0e8924a69fc992c6fa38a3152a2539314ddd19d1a10abf8e9"; + sha256 = "1sgqmc81m7fivla96lx2a8qqm8vg5jczqsaajblf0ygdjmg9lc9q"; libraryHaskellDepends = [ base containers transformers ]; homepage = "http://github.com/glguy/tries"; description = "A map, where the keys may be complex structured data"; @@ -68625,7 +73114,7 @@ self: { mkDerivation { pname = "generic-xml"; version = "0.1"; - sha256 = "4d5a61c57aea8d28c3452574c8e0cf2f2e90dd1df8e4c5c9c9967190184fde21"; + sha256 = "08fy9wc90wcnr74wbr7q3pfr0bigrzhchx158p1ji3gagb2n2njd"; libraryHaskellDepends = [ base HaXml mtl syb-with-class template-haskell ]; @@ -68641,9 +73130,9 @@ self: { mkDerivation { pname = "generic-xmlpickler"; version = "0.1.0.5"; - sha256 = "d51760f5650051eebe561f2b18670657e8398014fa2a623c0e0169bfeca336af"; + sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; revision = "1"; - editedCabalFile = "eb0855e93042f13a9becd93e75ebc42edf67546ce5bb157152fdf32b6b4c380f"; + editedCabalFile = "03rq9imjpwzxa9qibfz5dia6gprfqkmpagnrxjdkmwa263lma27b"; libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt hxt-pickle-utils tasty tasty-hunit tasty-th @@ -68660,7 +73149,7 @@ self: { mkDerivation { pname = "generics-eot"; version = "0.2.1.1"; - sha256 = "89af298dd2ad37bc86ab240f3309451a6e66dd13dbf79227eb01832c3748d0d8"; + sha256 = "1n6h90vjr0q1xckr5xyv2gfncvhs8l4k63r4mf3bqdxdsa6jkbw9"; libraryHaskellDepends = [ base markdown-unlit ]; testHaskellDepends = [ base directory doctest filepath hspec interpolate markdown-unlit @@ -68672,23 +73161,38 @@ self: { }) {}; "generics-sop" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell }: + ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.2.4.0"; - sha256 = "481f73f122970efc24fe9dea71077e265d260834d975dd41395671d9a86a1863"; - libraryHaskellDepends = [ base ghc-prim template-haskell ]; + version = "0.2.5.0"; + sha256 = "1p2dsdjxl1ld40c890i4jagp48zxp3i2njr9jd9ma89ydkypr5zk"; + libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; }) {}; + "generics-sop_0_3_1_0" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: + mkDerivation { + pname = "generics-sop"; + version = "0.3.1.0"; + sha256 = "1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7"; + libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; + testHaskellDepends = [ base ]; + description = "Generic Programming using True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; version = "0.1.2.1"; - sha256 = "4e49d4cc580d45e25e0abdeee12b1191ae75937af1c7ca03333979584a8a525c"; + sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; + 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"; @@ -68700,19 +73204,69 @@ self: { mkDerivation { pname = "genericserialize"; version = "0.1"; - sha256 = "94198de08ed780ac414b24c7fb6c6edafc29276304a74b3958daed2f702eeb7e"; + sha256 = "0zpb5rq2zvfsb0wlp9q4cckjkz6sdrngpir49d0sr06pivh8s6cl"; libraryHaskellDepends = [ base ]; description = "Serialization library using Data.Generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genesis" = callPackage + ({ mkDerivation, base, directory, envparse, file-embed, filepath + , hspec, monad-control, monad-logger, monad-persist, persistent + , persistent-postgresql, persistent-sqlite, persistent-template + , resource-pool, template-haskell, text, text-conversions + }: + mkDerivation { + pname = "genesis"; + version = "0.0.1.0"; + sha256 = "15l23rf4ifqxziz3fa8ra2p7jch6ph651139cvpqszqbzm9wp4sc"; + libraryHaskellDepends = [ + base directory envparse file-embed filepath monad-control + monad-logger monad-persist persistent persistent-postgresql + persistent-template resource-pool template-haskell text + text-conversions + ]; + testHaskellDepends = [ + base hspec monad-control monad-logger monad-persist + persistent-sqlite persistent-template text + ]; + homepage = "https://github.com/cjdev/genesis#readme"; + description = "Opinionated bootstrapping for Haskell web services"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "genesis-test" = callPackage + ({ mkDerivation, base, envparse, genesis, hspec, hspec-expectations + , lifted-base, monad-control, monad-logger, monad-persist + , persistent-postgresql, persistent-template, text + , transformers-base + }: + mkDerivation { + pname = "genesis-test"; + version = "0.0.1.0"; + sha256 = "12s0vg0013465cpxxhyz0xw9sbhh8knkl988dq8jaxvl81d0jzj2"; + libraryHaskellDepends = [ + base genesis hspec hspec-expectations lifted-base monad-control + monad-logger monad-persist persistent-postgresql transformers-base + ]; + testHaskellDepends = [ + base envparse genesis hspec monad-logger monad-persist + persistent-template text + ]; + homepage = "https://github.com/cjdev/genesis#readme"; + description = "Opinionated bootstrapping for Haskell web services"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genetics" = callPackage ({ mkDerivation, base, random-fu }: mkDerivation { pname = "genetics"; version = "0.0.2"; - sha256 = "1bb6d305be02d74311861f5cbc08d97234ffb7aefc9d6f6b1959e8adefa90167"; + sha256 = "0rq1m7psvs2r35mnz7gwmsvzyd3jv44bqp0zhq8l7mq2pq2x7dhv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random-fu ]; @@ -68729,7 +73283,7 @@ self: { mkDerivation { pname = "geni-gui"; version = "0.24.1"; - sha256 = "c31ba633f7e7f36ecea30290076fc9806d5561378a45c8f532905585f63acfce"; + sha256 = "1kng7bv8amch6bswhica6xhmavc0r5phg402lg76xwz7ywrsc6y3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68751,7 +73305,7 @@ self: { mkDerivation { pname = "geni-util"; version = "0.24.1.1"; - sha256 = "d32dcd08b83d394e41c146f8f5c8412981a8245668cd584714602ea34178bdf9"; + sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68774,7 +73328,7 @@ self: { mkDerivation { pname = "geniconvert"; version = "0.20"; - sha256 = "8d17419856e72145f6dd291e1c8d537597b3765bd7d626dd19f6b68f9c81362f"; + sha256 = "0brnh6f8zdpn37fjdmnpbdvb75vmaf6iq7i9vpv4a8g7asc425wd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68792,7 +73346,7 @@ self: { mkDerivation { pname = "genifunctors"; version = "0.4"; - sha256 = "2df0f1cfa6861afa3eb5ecb1c87c405e30c07a843f588474902fa1531b848045"; + sha256 = "0ic0hhdm789gj1s88n1zhixc0c2y81ycicgcnlzgl6l6lv7z3w1d"; libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base containers mtl template-haskell ]; homepage = "https://github.com/danr/genifunctors"; @@ -68806,7 +73360,7 @@ self: { mkDerivation { pname = "geniplate"; version = "0.6.0.5"; - sha256 = "ec6bb3509d4882f6382166735c6dcd87faae60bd58eb70cd7190503c8bf39c05"; + sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; @@ -68817,8 +73371,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.4"; - sha256 = "1bbfc296d598d604e0cf4da0b4a23e36e73f019f83b7911e18621443f04e2c5f"; + version = "0.7.5"; + sha256 = "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; @@ -68832,7 +73386,7 @@ self: { mkDerivation { pname = "geniserver"; version = "0.24.1.1"; - sha256 = "6c9424b5fe9609efe5f08338819bd35f6a0861ab7237d431104fe14c0c542795"; + sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68852,7 +73406,7 @@ self: { mkDerivation { pname = "genprog"; version = "0.1.0.2"; - sha256 = "f9de4698dc4a96d5619791becb2f322ec5de3a6c5f64cff82f9d3bae09142ba9"; + sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr"; libraryHaskellDepends = [ base MonadRandom syb syz ]; homepage = "http://github.com/jsnajder/genprog"; description = "Genetic programming library"; @@ -68865,7 +73419,7 @@ self: { mkDerivation { pname = "gentlemark"; version = "1.0.0"; - sha256 = "b5daab4564d06ce09f77cd5c9c586f3a2293abb0e6ee91500b11f3ae4ad469b1"; + sha256 = "1cb9si5axwqi1d893vp6n2mr68isdxc9qp6dfygy0v6hci2spnmm"; libraryHaskellDepends = [ base parsec transformers ]; testHaskellDepends = [ base HUnit parsec transformers ]; homepage = "http://github.com/andriyp/gentlemark"; @@ -68878,8 +73432,10 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.3.1.0"; - sha256 = "fd79841970e8d29a204e8cdf540478760f2a488bde21583668a3e7d8526f588a"; + version = "0.3.2.0"; + sha256 = "0nwhp429dvaf04zwb3k4h1m8dbqpdk6hir0zi4sf22cz3ld654hs"; + revision = "1"; + editedCabalFile = "09lgp8v5i5ys56vigq80r1vgxglk7v50v3f5488kry92r5xl7z88"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -68887,14 +73443,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-bytestring" = callPackage + ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.0.0.1"; + sha256 = "0rvdh1pzj98f84j1pnvx6zwanp1mkf58wg7jz5ny7f1dj0f56kii"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring genvalidity genvalidity-hspec hspec QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.2.0.0"; - sha256 = "79cccb5ac44193287e65aaf751617e213e71b012cc96e31e42428cdfd9c63ce1"; + version = "0.2.0.1"; + sha256 = "0adg1v7ylwnakcjyrybiw2ajaps3g3k4lvykgajra490fj01dylp"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -68908,15 +73483,15 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, doctest, genvalidity, hspec, hspec-core - , QuickCheck, validity + ({ mkDerivation, base, doctest, genvalidity, genvalidity-property + , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.3.1.0"; - sha256 = "abead88444f51c39f59cf2b959ad0d9532f4b58b87cb9f53b6e6c0bc6f62ef5d"; + version = "0.4.0.0"; + sha256 = "1bb7f24kk5sly7vac2lvpzlprpw40f0zrfb380xbcp4lwmq56gsf"; libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity + base genvalidity genvalidity-property hspec QuickCheck validity ]; testHaskellDepends = [ base doctest genvalidity hspec hspec-core QuickCheck @@ -68934,8 +73509,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.0.1.0"; - sha256 = "58da64350fb137c8fae3a62450fe541adf66ddc4f2d42791350cb6085ac1b2b0"; + version = "0.0.1.1"; + sha256 = "0drx76mxmc7fkxd1vp466hnnirjsn2i8qb8wb80942nxj2hp9j3q"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -68949,14 +73524,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-binary" = callPackage + ({ mkDerivation, base, binary, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-binary"; + version = "0.0.0.0"; + sha256 = "1dip56yxpd3ilahcaxl5hdvd6agjqgyc838qv046aj1ykb81xfgx"; + libraryHaskellDepends = [ + base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for binary-related Instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-hspec-cereal" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-cereal"; - version = "0.0.0.0"; - sha256 = "1cbb1d37aed02b8aa75092b0ff7065bdd0238a02fd735a2b1e548be9e11e48de"; + version = "0.0.0.1"; + sha256 = "0y7x47xlskr0z85blms1xfgpd1hwk6ql8y71y1v03c5cd781dnkj"; libraryHaskellDepends = [ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -68967,14 +73559,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-hashable" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec + , genvalidity-property, hashable, hspec, hspec-core, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-hashable"; + version = "0.0.0.0"; + sha256 = "1smgzbjl3mc2lq5q3khk6sgym4p2zgcfin55d53c3zcsxg3hpbnc"; + libraryHaskellDepends = [ + base genvalidity genvalidity-hspec genvalidity-property hashable + hspec QuickCheck validity + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-hspec hashable hspec + hspec-core QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity"; + description = "Standard spec's for Hashable instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-path" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path , validity-path }: mkDerivation { pname = "genvalidity-path"; - version = "0.1.0.0"; - sha256 = "0b955a1e244c9fa2915212447b75ec862c3677a43e8b2654e368568ef6244b38"; + version = "0.1.0.2"; + sha256 = "1gpbms3ih8zcvs9dpfhxriwyws19kppx6nwsl3qfip7yggivig9x"; libraryHaskellDepends = [ base genvalidity path validity-path ]; testHaskellDepends = [ base genvalidity-hspec hspec path ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -68983,14 +73598,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-property" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, genvalidity + , hspec, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-property"; + version = "0.0.0.0"; + sha256 = "044gf9fcih3d5qwr5nk5c534nh814q7p6s9l4wq8crf38n12w82x"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard properties for functions on `Validity` types"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.3.1.0"; - sha256 = "84ca3ffc6717a1cf9c535a53e4f8451ae4878370870555bced73ea33fd724a02"; + version = "0.3.1.1"; + sha256 = "0ymfnhqbdsgclc7l96rncn37rdj45impzbhil58v8bz8xpxa7887"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -69004,14 +73636,16 @@ self: { }) {}; "genvalidity-time" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, time - , validity-time + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, time, validity-time }: mkDerivation { pname = "genvalidity-time"; - version = "0.0.0.0"; - sha256 = "6f0a0872e4163afbe03ebdca19cc3411ba60cfc8ff44db03cd06c66c4b974e3e"; - libraryHaskellDepends = [ base genvalidity time validity-time ]; + version = "0.0.0.2"; + sha256 = "0fck7f6ipizd05v56kgmsbkqr8nkxzb18kv1wmw9n7n6mdimjqv0"; + libraryHaskellDepends = [ + base genvalidity QuickCheck time validity-time + ]; testHaskellDepends = [ base genvalidity-hspec hspec time ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for time"; @@ -69028,7 +73662,7 @@ self: { mkDerivation { pname = "geo-resolver"; version = "0.1.0.1"; - sha256 = "b877048487a553e2c0ab8f698ac90e5facb24169d5f0c8cc11f36131a837af1a"; + sha256 = "06mg6yl32qgk276ciw6md50v5b2z1v4qlscgmg0f4lx5hy208xxq"; libraryHaskellDepends = [ aeson base blaze-builder bytestring http-conduit http-types text unordered-containers @@ -69050,7 +73684,7 @@ self: { mkDerivation { pname = "geo-uk"; version = "0.1.0.2"; - sha256 = "feb2d70452d160a342670c56eebd8f6b135d83661dfa6860cd528248fa9f27ad"; + sha256 = "1b97kzx4i0jjrmh6iyhxcs1ms4vbiyyywmhccx1a6q6ia82dgcpy"; libraryHaskellDepends = [ array base binary bytestring bzlib template-haskell th-lift ]; @@ -69064,7 +73698,7 @@ self: { mkDerivation { pname = "geocalc"; version = "1.0.0"; - sha256 = "4f7607849b34fc7a536c928aab946991298a4912f7d268d2a9bb21d867de6baf"; + sha256 = "1bvbvrkxh8dvm796ilpp294qlacid6aap2ljdi9pmz1lkf20fxjg"; libraryHaskellDepends = [ base ]; description = "Libary for calculating distances between two coordinates in WSG84"; license = stdenv.lib.licenses.bsd3; @@ -69077,7 +73711,7 @@ self: { mkDerivation { pname = "geocode-google"; version = "0.3"; - sha256 = "9dbdde3c68564bfaf4f1fd9844e9d1119eaef4833eaf6fd6348d9eb0c71cc468"; + sha256 = "0s643k3v17ld6kb6zbryhgsax7his7ll967xy7sgljsnd0ydxgcx"; libraryHaskellDepends = [ base containers hjson HTTP network network-uri ]; @@ -69093,7 +73727,7 @@ self: { mkDerivation { pname = "geodetic"; version = "0.1.4"; - sha256 = "df31e7a6d88b0e25baab02778130a913e94ad94e4052284d830ad03014f4861e"; + sha256 = "07l6yha31l0ahd6jhlj09vclms8km4q82xq2mfx2a3lbv2kffcfz"; libraryHaskellDepends = [ base coordinate lens optional radian ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -69111,7 +73745,7 @@ self: { mkDerivation { pname = "geodetics"; version = "0.0.4"; - sha256 = "237ea075d3cc8566d3694cdcbe1733f5fb74c7fe5e43b3a5fe501fb92e4cb4fe"; + sha256 = "1zml9hpbj7shzsjv6hsyzv3p9yzm6cbvxp2cd79nd1fcsdss0zi3"; libraryHaskellDepends = [ array base dimensional ]; testHaskellDepends = [ array base dimensional HUnit QuickCheck test-framework @@ -69128,7 +73762,7 @@ self: { mkDerivation { pname = "geohash"; version = "1.0.1"; - sha256 = "64173009447070e8dd1720ba82dddf0dbbed56826f81f7aa9c732484ed25bddd"; + sha256 = "1pdx4pnq893kkjmgg0bgh9bfvfqdvzfq5fi02zfyhw3h8h4k05v4"; libraryHaskellDepends = [ array base ]; description = "Geohash latitudes and longitudes"; license = stdenv.lib.licenses.bsd3; @@ -69141,7 +73775,7 @@ self: { mkDerivation { pname = "geoip2"; version = "0.2.2.0"; - sha256 = "04a29f729f3cbfd8bf1c5f041c0412a95a8c496b5215896e9393a6f5f84bd03e"; + sha256 = "0gnh9gwgb9lkjdp8j5ajdd4qqnm92821q12z3jzxigrwkxr9z8h4"; libraryHaskellDepends = [ base bytestring cereal containers iproute mmap reinterpret-cast text @@ -69159,7 +73793,7 @@ self: { mkDerivation { pname = "geojson"; version = "1.3.1"; - sha256 = "b4f6624c79d7f1ba66519b3711c2f67b682c6c7b126fb7b4ccf87edd4c7f9661"; + sha256 = "0qcngx6dszpqrjsbfvqjgdn2qs3vyv112dwva5kbmwfpg5665xml"; libraryHaskellDepends = [ aeson base lens semigroups text transformers validation vector ]; @@ -69178,7 +73812,7 @@ self: { mkDerivation { pname = "geojson-types"; version = "0.1.3"; - sha256 = "92f43434853cbe65289baa875088e6055df827b7a79fb952f1ad9e55e3ce6c82"; + sha256 = "10kcrvimb7mdy59bk7x7nwkzhp85ws4511xakcl6bgiwhls39x4j"; libraryHaskellDepends = [ aeson base bson bytestring lens text ]; homepage = "https://github.com/alios/geojson-types/"; description = "GeoJSON data types including JSON/BSON conversion"; @@ -69194,7 +73828,7 @@ self: { mkDerivation { pname = "geolite-csv"; version = "0.2"; - sha256 = "17b66c7164a2f93eb489611dde877617bf0cc1e1e995d7f502e4c71440151208"; + sha256 = "020j2m019iz40bsxg5g9w70hrgqpfs3xw7b1i6s3xyd2ciqnrdhp"; libraryHaskellDepends = [ base colonnade ip pipes siphon text ]; testHaskellDepends = [ base colonnade directory HUnit pipes pipes-bytestring pipes-text @@ -69211,7 +73845,7 @@ self: { mkDerivation { pname = "geom2d"; version = "0.2.2"; - sha256 = "239ff6b5c7a389022657dd92172fb5ae397c74dc4b0aae15e42cd2b3d3d1543f"; + sha256 = "0gsls79v7licwhasw2jbvis7qfdfnlpig4nxawk052d3qyszd7r3"; libraryHaskellDepends = [ base ieee754 linear QuickCheck ]; testHaskellDepends = [ base ieee754 linear QuickCheck ]; description = "package for geometry in euklidean 2d space"; @@ -69226,7 +73860,7 @@ self: { mkDerivation { pname = "getemx"; version = "0.1"; - sha256 = "95dbc2281e7d8f04ae761592187f60bd745cd4b12966357aace093c98a21f8e1"; + sha256 = "1qgq465ck4z0mix3ari9n7a5qx5xc1zii4hmfsp093vx3qlc5nwm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69244,7 +73878,7 @@ self: { mkDerivation { pname = "getflag"; version = "1.0"; - sha256 = "4c4a71ce5e88b73175eaf374213287f232c374083707b71bd78c52bb2a43594b"; + sha256 = "0jsr8cmbnllcswdvf1rp11sc6cpjhwr22x7kx9sk3dw8bv772jjc"; libraryHaskellDepends = [ base ]; description = "Command-line parser"; license = stdenv.lib.licenses.mit; @@ -69257,8 +73891,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.13"; - sha256 = "d193384dca0c9fdd8492ee888b1b8954b247f83ead6e4f3f81ded94377aaa34a"; + version = "0.13.0.1"; + sha256 = "10sfab5frm53bll8kh6bkwg0y0cv47740sxy6gsnd9fycvixf0k9"; libraryHaskellDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -69276,7 +73910,7 @@ self: { mkDerivation { pname = "getopt-simple"; version = "0.1.0.2"; - sha256 = "f79efd9bef4e4f0ce678fdaaf99ca3f1f70f2dc815c16439d9f97e399805c4dd"; + sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp"; libraryHaskellDepends = [ base containers ]; homepage = "https://bitbucket.org/dpwiz/getopt-simple"; description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy."; @@ -69293,7 +73927,7 @@ self: { mkDerivation { pname = "gf"; version = "3.8"; - sha256 = "6f51fd2054fdcf58f62c149d9fc5995759bb227d33f600e594b16c7aea35ba09"; + sha256 = "02ds6pm7lv5ijkjh1xikglibnnapk72rz78l5kv5ikzxahhgslbg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69323,7 +73957,7 @@ self: { mkDerivation { pname = "ggtsTC"; version = "0.5"; - sha256 = "b2377f72e8cf1a226493ee9aae3fff07dab89bd6857b45ac2f59723a32b0b14c"; + sha256 = "0k5in0r3lwjr5yn4ayw5ssdvinh7zwzsx6pfjdj246ngx1r7ydxj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers parsec ]; @@ -69340,7 +73974,7 @@ self: { mkDerivation { pname = "gh-pocket-knife"; version = "0.1.0.0"; - sha256 = "b84246f29e756be1ec851f1ee3be710de6366dda4fd4c972afbfc77cbed1a6bf"; + sha256 = "1gx6s6z7rixzmxrckm2gv9nkdrhdf6zf67hzhpnf2svmkvr4chmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69360,7 +73994,7 @@ self: { mkDerivation { pname = "ghc-boot"; version = "8.0.2"; - sha256 = "f703203a2460f31f05af3aa82d23f314a5d7a077db0b324da238a3f1d9328460"; + sha256 = "0q446bcz38rql96k42yvfyhdg98lycijva1smw2izwv04hx200zp"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -69374,7 +74008,7 @@ self: { mkDerivation { pname = "ghc-boot-th"; version = "8.0.2"; - sha256 = "5d00e271f2dd83ff2c69df4d3c17ced26eaffd5a65898b2a04b0dc75f99bf8f0"; + sha256 = "1w7qkgwpbp5h0hm8p2b5bbysyvnjrqbkqkfzd4ngz0yxy9qy402x"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -69388,7 +74022,7 @@ self: { mkDerivation { pname = "ghc-core"; version = "0.5.6"; - sha256 = "ec34f3e5892be7c2b52945875cd330397eca3904ae1d9574559855817b8b7e85"; + sha256 = "11byidxq2mcqams9a7df0hwwlzir639mr1s556sw5rrbi7jz6d7c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69406,7 +74040,7 @@ self: { mkDerivation { pname = "ghc-core-html"; version = "0.1.4"; - sha256 = "657888cb64b681d6131536567848179a578955ae8b465ab715ef8b53d215a2fb"; + sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69422,7 +74056,7 @@ self: { mkDerivation { pname = "ghc-datasize"; version = "0.2.0"; - sha256 = "d0077d0b7f8672e0a54c3b265c25075ef447c2053466cb0b9ab012aeb1cfb472"; + sha256 = "0wmlryqsw4mhk85wnril0p14gx2y0wjmq9iv9jjy0wl6gw5ps1yh"; libraryHaskellDepends = [ base deepseq ghc-heap-view ]; homepage = "http://felsin9.de/nnis/ghc-datasize"; description = "Determine the size of data structures in GHC's memory"; @@ -69436,9 +74070,9 @@ self: { mkDerivation { pname = "ghc-dump-tree"; version = "0.2.0.2"; - sha256 = "a89a52e448926eab7ecd97ba7081b858486bcaf487cd800403c3e2a0a76a9cc3"; + sha256 = "1hwwdaks1qn30c281kc7yk56nj2qp20p1flprmzanvlj93j556m8"; revision = "3"; - editedCabalFile = "b6d735f4e90a0c006513f1efc963d7b45bae8a95e0bee736e7e1fb55553643b8"; + editedCabalFile = "1f236rambyz1wwvfggp0jn5awnxlsxiwkvzi2djh030ax7s3bmxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69460,7 +74094,7 @@ self: { mkDerivation { pname = "ghc-dup"; version = "0.1"; - sha256 = "552a865f2fb4c11a52b44124690771a155f13f8997025c710f0370f797e5842b"; + sha256 = "0aw4wnbzfw031xqmq0lpi4zz2md1f43nj921ni91mhdl5xgqcajm"; libraryHaskellDepends = [ base ghc ]; description = "Explicitly prevent sharing"; license = stdenv.lib.licenses.bsd3; @@ -69473,9 +74107,9 @@ self: { mkDerivation { pname = "ghc-events"; version = "0.4.4.0"; - sha256 = "ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d"; + sha256 = "0vagr03rivl5ymcnkxnzb1x5b4cr6xknnkwmfliqfrc1hhjgcaxb"; revision = "1"; - editedCabalFile = "a52145a9a2f5e75daa15fd0ecc22262a93f1213351cb37b6df84ca0a828fdc65"; + editedCabalFile = "0rfwiy10mjl4vyv3gjsi6chz34ra4qicq3px2nm5vrzmlalla8d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69491,6 +74125,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-events_0_6_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers }: + mkDerivation { + pname = "ghc-events"; + version = "0.6.0"; + sha256 = "0s87rrap5j9xca8l1x6gi8nmx3w6fn4avckn1i9hx4d1v7fajz97"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg , filepath, ghc-events, lens, mtl, optparse-applicative, parsec @@ -69499,9 +74151,9 @@ self: { mkDerivation { pname = "ghc-events-analyze"; version = "0.2.4"; - sha256 = "6161f5491a34252289c8265c7c48c5a70c1e2a69ffbfe64800cfdc3a8d3d4dd9"; + sha256 = "1nad7n6kmp6g014fdgzzd4m1w357qm47qp16r24j499l394zaqb1"; revision = "1"; - editedCabalFile = "3224314053b1774c18a19a558be964916f87e146f7ce47970a5de65a1bc962bc"; + editedCabalFile = "1g32r4dmmrjx1ablgkpp8vhqfvwicklqnmcsl4c4qxxiad03291j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69521,7 +74173,7 @@ self: { mkDerivation { pname = "ghc-events-parallel"; version = "0.5.0.1"; - sha256 = "7e994b7a184e5c5559e871ff7e8bfb1e1ef90e7ae29de0a8a2f58e5a0db438a0"; + sha256 = "181qnh6mm3pmlalf17g2g87gj7hyzf5pxzvix1cmap2f31x4p6by"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69545,8 +74197,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.3.0"; - sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d"; + version = "0.5.3.1"; + sha256 = "0wip93rawhzvbza8km925v43f7h271lj7byzwia5dqj3hqxbiwjl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69561,12 +74213,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_5_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.5.4.0"; + sha256 = "1kpfk81iir3dn4420lczwal9bhs787z24g05vdd0g44jcp07d6nk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "ghc-gc-tune"; version = "0.3"; - sha256 = "3c692f4e050361caa22296bec6ed3857e813ce29017f44a7893fa46a901b173e"; + sha256 = "0ghp3f86m91zi6kl8zq157717s2p73nwdgln4aiclq830m72ys9w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath process ]; @@ -69580,7 +74256,7 @@ self: { mkDerivation { pname = "ghc-generic-instances"; version = "0.1.0.0"; - sha256 = "f0905739f35dbf7fa133f6f96cc2f421f2a0dd2714b4a7ecf5dc15c481aac408"; + sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h"; libraryHaskellDepends = [ base ghc ]; homepage = "https://github.com/alanz/ghc-generic-instances"; description = "Derived instances of GHC.Generic of the GHC AST"; @@ -69594,8 +74270,8 @@ self: { }: mkDerivation { pname = "ghc-heap-view"; - version = "0.5.7"; - sha256 = "4b6cbb42c256987e55b5d6136f4c7efb560a5ea1fd34d4878dcec1fe9aa71524"; + version = "0.5.9"; + sha256 = "1brjvyqd4bzzc1vhljbf5qv9lyf55myyvnz1zx9nngfwsh7a6cf6"; libraryHaskellDepends = [ base binary bytestring containers ghc template-haskell transformers ]; @@ -69614,7 +74290,7 @@ self: { mkDerivation { pname = "ghc-imported-from"; version = "0.3.0.6"; - sha256 = "1a3ea468eb0b326c1794f7ec20c3d0e8493ff3d8fe67fd7e234ca56d26915bbe"; + sha256 = "1gjvj4k6v9ac4dzgsrzyv3rkyjg8s31j1v7pjhbnqchbxdla8ghs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69646,7 +74322,7 @@ self: { mkDerivation { pname = "ghc-make"; version = "0.3.2"; - sha256 = "7219fedf1a74c04af08cb177b2d984f4298a6bc12229d8218b6169fdea8a6b83"; + sha256 = "10vbibmgssb1ichxha92q5mqlaglhkcv4xxiikq4mh3l3bgzw6bj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69662,7 +74338,7 @@ self: { mkDerivation { pname = "ghc-man-completion"; version = "0.0.0.3"; - sha256 = "172827e9729068cd7eeae668cd74105b9a04187693419c5ddb01cf7aabb11e23"; + sha256 = "08qyn6mpmkq1vdfrqhckfqc096jv21scss76x9zcss4hfbljfa0p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec process ]; @@ -69683,9 +74359,9 @@ self: { mkDerivation { pname = "ghc-mod"; version = "5.7.0.0"; - sha256 = "2aab240c89ab6513807cea4e2065d474274a5ae20f8edc4f77df8e2eafb9e5ca"; + sha256 = "1jp5p6pjx3nzfx7xr3hgw9d4l9vlsijj0kpagj016rdbi4629ara"; revision = "1"; - editedCabalFile = "2a98257b2c370e8d557b4924c77e088d8220e17558317174dfc35b2e0c94d1e3"; + editedCabalFile = "1qyijh62wny3vxs72caqfphj10ld11zcf929gdaqs3ip5ixjb61a"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -69711,13 +74387,60 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "ghc-mod_5_8_0_0" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper + , containers, criterion, deepseq, directory, djinn-ghc, doctest + , extra, fclabels, filepath, ghc, ghc-boot, ghc-paths + , ghc-syb-utils, haskell-src-exts, hlint, hspec, monad-control + , monad-journal, mtl, old-time, optparse-applicative, pipes + , process, safe, semigroups, shelltest, split, syb + , template-haskell, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "ghc-mod"; + version = "5.8.0.0"; + sha256 = "1yf4fkg1xj1b66jg6kikzc6djad1xi44y7ark7ghgif0ab0g6rn3"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths + ghc-syb-utils haskell-src-exts hlint monad-control monad-journal + mtl old-time optparse-applicative pipes process safe semigroups + split syb template-haskell temporary text time transformers + transformers-base + ]; + executableHaskellDepends = [ + base binary deepseq directory fclabels filepath ghc monad-control + mtl old-time optparse-applicative process semigroups split time + ]; + testHaskellDepends = [ + base cabal-helper containers directory doctest fclabels filepath + ghc ghc-boot hspec monad-journal mtl process split temporary + transformers + ]; + testToolDepends = [ shelltest ]; + benchmarkHaskellDepends = [ + base criterion directory filepath temporary + ]; + homepage = "https://github.com/DanielG/ghc-mod"; + description = "Happy Haskell Hacking"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {shelltest = null;}; + "ghc-mtl" = callPackage ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl }: mkDerivation { pname = "ghc-mtl"; version = "1.2.1.0"; - sha256 = "934e36c03ae0cbf59d6eb6d626983a3e520c6101417284b0a652db74e333d940"; + sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk"; libraryHaskellDepends = [ base exceptions extensible-exceptions ghc mtl ]; @@ -69733,7 +74456,7 @@ self: { mkDerivation { pname = "ghc-options"; version = "0.2.0.0"; - sha256 = "75443492d1e6eb65b536087aafc84655bbad6026d28ecda950b3cd67d5d44369"; + sha256 = "0sa3skangkdka2lwv3nj4rhavfsm8v4ayyh86ssnbsz6s6938i3m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69758,7 +74481,7 @@ self: { mkDerivation { pname = "ghc-parmake"; version = "0.1.9"; - sha256 = "381973ada7fc3e944dab09ff35d3b26070b1585f5a115fc2ddb09508c1e11c5e"; + sha256 = "0phww70hi5dhvp15y4asbxcb2w30nb9kbzq9md6r8gpwlynp669q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69781,7 +74504,7 @@ self: { mkDerivation { pname = "ghc-parser"; version = "0.1.8.0"; - sha256 = "494e9df73942c5e77e01c331eaee94438c15c711d78f48c1d1c4d8977ffb5152"; + sha256 = "0ljizdzrgn64s70li3yp273ib323jkpflcf305zfgia277vrskj9"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; homepage = "https://github.com/gibiansky/IHaskell"; @@ -69795,9 +74518,9 @@ self: { mkDerivation { pname = "ghc-paths"; version = "0.1.0.9"; - sha256 = "afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945"; - revision = "1"; - editedCabalFile = "b47858cf533ae8d72bd422106bcb9e075ae477ab2e537f59ffe437277840bcef"; + sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; + revision = "2"; + editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -69811,7 +74534,7 @@ self: { mkDerivation { pname = "ghc-pkg-autofix"; version = "0.2.0.1"; - sha256 = "e76bd4631e0a10d6db7610caabdfead4afd30a395b4cb4825f77f2eff4dca766"; + sha256 = "0rm7vksfzwkpby1b8k2v745d7bylxbgspjhhfvdxc40a3rix8sz7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69828,7 +74551,7 @@ self: { mkDerivation { pname = "ghc-pkg-lib"; version = "0.3.1"; - sha256 = "b3e106581e474cb32eb049bc8b49eedce82c8645b80fdf508a21d2c6ce5c7fce"; + sha256 = "1kkzbk7cdli1i98dy3xq8n32rs6wxr4qpg29n0pb6k273rc0dqdk"; libraryHaskellDepends = [ base Cabal directory filepath ghc ghc-paths ]; @@ -69843,7 +74566,7 @@ self: { mkDerivation { pname = "ghc-prim"; version = "0.5.0.0"; - sha256 = "44bbe4f0858f5101d860b7447a689bcd38a2451f4cc1d29f0de130cbd92bd6b2"; + sha256 = "1cnn5gcwnc711ngx5hac3x2s4f6dkdl7li5pc3c02lcghpqf9fs4"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -69857,7 +74580,7 @@ self: { mkDerivation { pname = "ghc-prof"; version = "1.3.0.2"; - sha256 = "99a13463bf12803c02071206b090c1e4a1364f6f0bbc4162155c478a2c740fa1"; + sha256 = "188gfhn8lisw2mi43g0bdx7kd8g4q68b01hj0w13r00jpxik98cr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69872,14 +74595,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-prof_1_4_0" = callPackage + "ghc-prof_1_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, scientific, tasty, tasty-hunit, temporary, text, time }: mkDerivation { pname = "ghc-prof"; - version = "1.4.0"; - sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253"; + version = "1.4.0.1"; + sha256 = "1q09v2b2nzddwwj76ig7d6ikxv8dnw7v3ngg781fsjvy14cljbmg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69900,7 +74623,7 @@ self: { mkDerivation { pname = "ghc-prof-flamegraph"; version = "0.1.2.1"; - sha256 = "0ba6b7e36d31c31f6f2e8f6cd54b7a75614aed9c0054618fdad5e2580c1cf35b"; + sha256 = "0nzk3h65iqnmva7n2m00kknllqbmg95xav4g5rpizhridpivg9hb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -69914,7 +74637,7 @@ self: { mkDerivation { pname = "ghc-server"; version = "1.2"; - sha256 = "b68988eb8182a2f686738f399d95679d4005e3127e49bc4b8ef020485b8be5c1"; + sha256 = "1hg5iddlh87hir5vqjby2bihah4xcyarsfcgff3gd8l2h7mqi2dn"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -69927,7 +74650,7 @@ self: { mkDerivation { pname = "ghc-session"; version = "0.1.2.1"; - sha256 = "c1e517fa3fe4fc12ce2d371a8a8b1e50fd1ec22edc94203f0566b23f501e6d0b"; + sha256 = "02vd3r83zck60lzj156w5v11xzah3s5ql6ip5p715z747zx1grf1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69948,7 +74671,7 @@ self: { mkDerivation { pname = "ghc-simple"; version = "0.4"; - sha256 = "aee9dee0ae551af8932864c3068ca47110450c2f4dd175bcc90406a839e6c941"; + sha256 = "0hf9wqwsh1h4r6y7blad5w64a43ilj60dhv4529zh6jmmvhdxsdf"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc ghc-paths ]; @@ -69963,9 +74686,9 @@ self: { mkDerivation { pname = "ghc-srcspan-plugin"; version = "0.2.2.0"; - sha256 = "e137ecf1d3463bdb806cc681a0375e4a60d054e71839660e223e92906a60aff1"; + sha256 = "1wdgc1m914iy4876cf8qwxad0q2abqvs10f6dj0dnfs6sgqyqdz1"; revision = "1"; - editedCabalFile = "3131594b5f9d1fc3ee35a5d8f87b1361840d02778080a6494beef514250e02c1"; + editedCabalFile = "1h821qji9xgf9d4sd040fw10v1312dxzin556ppc67wxbx5mjc9i"; libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; @@ -69977,7 +74700,7 @@ self: { mkDerivation { pname = "ghc-syb"; version = "0.2.0.0"; - sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67"; + sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0"; libraryHaskellDepends = [ base ghc ]; homepage = "http://github.com/nominolo/ghc-syb"; description = "Data and Typeable instances for the GHC API"; @@ -69986,15 +74709,17 @@ self: { }) {}; "ghc-syb-utils" = callPackage - ({ mkDerivation, base, ghc, syb }: + ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: mkDerivation { pname = "ghc-syb-utils"; - version = "0.2.3"; - sha256 = "7ef63fcfe829b621d5b947c6a4567de111976a463f2ffaf0fafc5e76776cbc67"; + version = "0.2.3.2"; + sha256 = "1h05blm311cg0ricd9skb0m115512mmrrp7g6qh4bbihjmy0l5nb"; libraryHaskellDepends = [ base ghc syb ]; + testHaskellDepends = [ base directory filepath ghc ghc-paths ]; 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 @@ -70002,7 +74727,7 @@ self: { mkDerivation { pname = "ghc-tcplugins-extra"; version = "0.2"; - sha256 = "f3542b6734b20e3e25f851589944d1d185533c0f0a5428eee86f422ad3687374"; + sha256 = "0x3kd39jlhkgx3p2hm0a1wy571fis529jn2iz0jkw3mj6ikjnm7k"; libraryHaskellDepends = [ base ghc ]; homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; description = "Utilities for writing GHC type-checker plugins"; @@ -70016,7 +74741,7 @@ self: { mkDerivation { pname = "ghc-time-alloc-prof"; version = "0.1.0"; - sha256 = "61a877a8f7a7dbfc8ceeac0e7b20f63a52183b7d1690d0557b4300c0bbfe30d5"; + sha256 = "1m9hzsxw0023gdax140nglxihlisyqh7n3mcxs6grnx7yyl7ga31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers text time ]; @@ -70029,17 +74754,29 @@ 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-tcplugins-extra + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp , singletons, tasty, tasty-hunit, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2.2"; - sha256 = "2e20c00c0aec2e865d270d39921b66f94cb85610e944a6da068dda5868ef86a2"; + version = "0.2.3"; + sha256 = "1fl1bbsn1hkz3i7100k1k0pwniv7iyxnq1l0i50gj5s8ygxi78zw"; libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-knownnat + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp singletons transformers ]; testHaskellDepends = [ @@ -70054,32 +74791,56 @@ self: { "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit - , template-haskell, transformers + , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.2.3"; - sha256 = "bd7828cf6c3062a785ad5c35a82d2229341acca4c2fd605c4718f6f595316133"; + version = "0.2.4"; + sha256 = "10iyngq3sqd01nrq5allc0q8s8zqvrp3j1yh02p3yyjijjnhm53n"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons template-haskell transformers ]; testHaskellDepends = [ base ghc-typelits-natnormalise singletons tasty tasty-hunit + tasty-quickcheck ]; homepage = "http://clash-lang.org/"; description = "Derive KnownNat constraints from other KnownNat constraints"; license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_3" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.3"; + sha256 = "0dq419pd8mf8x48wcr3ciygrwy40kvcl5iq307836ss2r506nrqc"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise singletons tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "http://clash-lang.org/"; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.2"; - sha256 = "b12e66e076e6f43eb1a8465e11b406518f86b955de3399ee8822880d4b794383"; + version = "0.5.3"; + sha256 = "07vdqa2zcivayk1zbj86ab25vawsgywpjng8ixxlsxzdf9arwhhi"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -70096,7 +74857,7 @@ self: { mkDerivation { pname = "ghc-typelits-presburger"; version = "0.1.1.0"; - sha256 = "bcb005e8c4ae609a75ceef344abe5b2282d23f0dc409426bda9965e02d2d4f92"; + sha256 = "14jg5lny0rcrv9ml42f41lzx50i2bfz4ld7grrsrlq5fqkl0bc5w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70108,6 +74869,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-usage" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-paths, unix }: + mkDerivation { + pname = "ghc-usage"; + version = "0.1.0.1"; + sha256 = "1x5c147r5qp7i4l46drqaqxlvyi38n8didzv577a8pcmy9r71pfx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ghc ]; + executableHaskellDepends = [ base ghc-paths unix ]; + description = "Print minimal export lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-vis" = callPackage ({ mkDerivation, base, cairo, containers, deepseq, fgl , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers @@ -70116,7 +74892,7 @@ self: { mkDerivation { pname = "ghc-vis"; version = "0.8"; - sha256 = "e8e808c0155396ba391da1f3289df042088aa7af432ae554964ea4896e1c870d"; + sha256 = "03c73ip8k92fjrafaaj3mykql222y2fjiwx13lwvm5jk2p00is78"; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl svgcairo text transformers xdot @@ -70134,7 +74910,7 @@ self: { mkDerivation { pname = "ghci"; version = "8.0.2"; - sha256 = "986d4d8e2ae1077c9b41f441bb6c509cb5d932fc13d3996a1f00481c36dde135"; + sha256 = "0dg1vlv1qj003xm9klqkzhrdkdcwa1nbnhgl86dpq1z15a74svcq"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot template-haskell transformers unix @@ -70149,7 +74925,7 @@ self: { mkDerivation { pname = "ghci-diagrams"; version = "0.1.1"; - sha256 = "3cec737a321ff8b7c8f16c00847dc14296a654bbc3b9c3dfdc6a902666a99eca"; + sha256 = "1jlym5k2d43avkgw7ff3pdaad5j2q5yq803cy74bgy0z69x77v1w"; libraryHaskellDepends = [ base cairo colour diagrams gtk ]; description = "Display simple diagrams from ghci"; license = stdenv.lib.licenses.bsd3; @@ -70163,7 +74939,7 @@ self: { mkDerivation { pname = "ghci-haskeline"; version = "0.2"; - sha256 = "1eeb6af9177667fab653b55f0fecb2834a3be28a7f7b1576fbbfb4dabbcf4206"; + sha256 = "01j2ryxxmd5zzdv1ayvzibi3njl3nbn0ypxmafvglrvn2zwnmsqy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -70181,7 +74957,7 @@ self: { mkDerivation { pname = "ghci-history-parser"; version = "0.1.0.2"; - sha256 = "0e6d39875a54a7744fedd73103301d188ec291d9da2f7abc6c85b87143b1f068"; + sha256 = "0s7hn51p3f45djy7lbysv68w53hq3lq06cfpxm7p99slba3kjv8f"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base doctest hspec parsec ]; description = "parse output of ghci \":history\" command"; @@ -70194,7 +74970,7 @@ self: { mkDerivation { pname = "ghci-lib"; version = "0.1.0.0"; - sha256 = "7fccf7e97b1a6fe6823d3beb7e366c3142b5a6b863e8a95080659aac3f0b8f1a"; + sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z"; libraryHaskellDepends = [ base ghc MissingH ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for interactively evaluating Haskell code"; @@ -70210,9 +74986,9 @@ self: { mkDerivation { pname = "ghci-ng"; version = "10.0.0"; - sha256 = "a78909a528b79ec14649c528bb47bbec02c535b75b654978a97359e7c9bd39dd"; - revision = "3"; - editedCabalFile = "0deaf1cd57dd29c65fe31d4679d171336a07382cede88770f36e6d24cb3568cc"; + sha256 = "1p9rpp4yfnbkm5w4jravnwswa0pcpd3vna65953c37mp52jhk2d7"; + revision = "4"; + editedCabalFile = "1hrrcyxbd00fjv03aifp6i1p3q4m6jh580g1jl28189a9wyfb37f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -70230,7 +75006,7 @@ self: { mkDerivation { pname = "ghci-pretty"; version = "0.0.2"; - sha256 = "45db55bfae7e9efae3e4f264d005256cb84f4c5cb730391aaa44596558a15e07"; + sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5"; libraryHaskellDepends = [ base hscolour ipprint ]; homepage = "https://github.com/larskuhtz/ghci-pretty"; description = "colored pretty-printing within ghci"; @@ -70245,7 +75021,7 @@ self: { mkDerivation { pname = "ghcid"; version = "0.6.6"; - sha256 = "62f567852111da733b6feedbfb37ff561889e27af63d16df048f37a4bfeb6ab0"; + sha256 = "1c3axfzs8dwg0kgicggngbi8j62nzwvzpnzfdwxp7nhi462ngxb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70270,19 +75046,37 @@ self: { mkDerivation { pname = "ghcjs-ajax"; version = "0.2.0.0"; - sha256 = "865da70c859da72171d6adbbf8a55023ed2f625d1fbcc0838921217bdaa5c279"; + sha256 = "0yf2lpd7n891i61w1g0zbmi2zv93a2jzifxdsrqj39wxhl6afpc6"; libraryHaskellDepends = [ aeson base http-types text ]; homepage = "https://github.com/agrafix/ghcjs-ajax#readme"; description = "Crossbrowser AJAX Bindings for GHCJS"; license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-base-stub" = callPackage + ({ mkDerivation, aeson, attoparsec, base, deepseq, ghc-prim + , primitive, scientific, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "ghcjs-base-stub"; + version = "0.1.0.2"; + sha256 = "1x8gsv5g6asxh4z3ni7n5zypsrlj6snrp2d376dk9lkz1is8k432"; + libraryHaskellDepends = [ + aeson attoparsec base deepseq ghc-prim primitive scientific text + transformers unordered-containers vector + ]; + homepage = "https://github.com/louispan/javascript-stub#readme"; + description = "Allow GHCJS projects to compile under GHC and develop using intero"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghcjs-codemirror" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghcjs-codemirror"; version = "0.0.0.1"; - sha256 = "dcd9f5288d7624c8a2a5bf8440d9de6ab8400707d366180b13cc3f472280a513"; + sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ghcjs/CodeMirror"; description = "Installs CodeMirror JavaScript files"; @@ -70293,8 +75087,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.7.0.4"; - sha256 = "1c9e57e7de17179c2aca7c6a0417304fa2229b498431f1137dc0a606d8315bac"; + version = "0.9.1.1"; + sha256 = "1932qq067cfl0g87457qgk4zdxxr4fx2an37z8l0zw1x221yi696"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -70305,14 +75099,21 @@ self: { }) {}; "ghcjs-dom-hello" = callPackage - ({ mkDerivation, base, ghcjs-dom, mtl }: + ({ mkDerivation, base, ghcjs-dom, jsaddle, jsaddle-warp + , jsaddle-webkit2gtk, mtl + }: mkDerivation { pname = "ghcjs-dom-hello"; - version = "4.0.0.0"; - sha256 = "c4ce7931a8121f7f3c78df896af8449eeca4fd11abdd90b4fa338fa207da6c6d"; - isLibrary = false; + version = "6.0.0.0"; + sha256 = "16f69w53a3vcfnb805nyn257465gvyv2981gsggvpkzvyqklsp74"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ base ghcjs-dom mtl ]; + libraryHaskellDepends = [ + base ghcjs-dom jsaddle jsaddle-warp mtl + ]; + executableHaskellDepends = [ + base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl + ]; homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; @@ -70323,8 +75124,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.7.0.3"; - sha256 = "3ec7c0973dfce18d77df9b6162c29c4af6ea2356da679510c034ae8c31a4c029"; + version = "0.9.1.0"; + sha256 = "120i3j07lk75lk59gi6pg56dka35r0vh97kj22cj4472qz0ix3sp"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -70336,8 +75137,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.7.0.4"; - sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619"; + version = "0.9.1.1"; + sha256 = "1hx8w7x5j2gznkk32yplnnm657hyfk41lcxl4iinsjkm0lrlq54i"; description = "DOM library using JSFFI and GHCJS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -70349,7 +75150,7 @@ self: { mkDerivation { pname = "ghcjs-dom-webkit"; version = "0.3.1.0"; - sha256 = "5daeb086c811405e20b30315180d689f3f5399a7eec5c1f896d160c9a36891f0"; + sha256 = "1w4id2iwjq6ijvwc3igflycm6gwzd06ih583nch5wh0ir23b1bjx"; libraryHaskellDepends = [ base glib gtk3 text transformers webkitgtk3 ]; @@ -70365,7 +75166,7 @@ self: { mkDerivation { pname = "ghcjs-hplay"; version = "0.3.4.2"; - sha256 = "c3d9e5108b4792fc6fd9ef079cb4f4a6e9a21195e68f5b0d53d43ad7f79149d5"; + sha256 = "1ma9j7vxffnlac6mp3z6jl8s5sd6yjs9q1zgv5pzr4j7ic8fbnf3"; libraryHaskellDepends = [ base containers ghcjs-perch mtl transformers transient transient-universe @@ -70383,7 +75184,7 @@ self: { mkDerivation { pname = "ghcjs-hplay"; version = "0.4.2"; - sha256 = "abab4f37c8168fca3c9c82b3349ac817c0771b6b09cc09a1eb6cce46bd0bdc2d"; + sha256 = "0bfw1fyldkkcxfhhkk09dcdpgh0pr2d39cw2khycm3qnr0vlzaxb"; libraryHaskellDepends = [ base bytestring containers directory ghcjs-perch mtl transformers transient transient-universe @@ -70398,8 +75199,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "ghcjs-perch"; - version = "0.3.3.1"; - sha256 = "5a9e656474f2b57c18ed028217f7c44d00468ca2b8d433422b049084143a1275"; + version = "0.3.3.2"; + sha256 = "1ng6wpx6kp8rxmxwf0ns0q0jas2gl2s2mv1dlq59xbsikdly3km7"; libraryHaskellDepends = [ base transformers ]; description = "GHCJS version of Perch library"; license = stdenv.lib.licenses.mit; @@ -70410,7 +75211,7 @@ self: { mkDerivation { pname = "ghcjs-promise"; version = "0.1.0.3"; - sha256 = "2395a17260e27ac252df2a5968de8ee5f0cf55d970c2fbe6fb27b2ccf01af81b"; + sha256 = "06zq3bqcrci7zgkgphkhv5awzw75ivg6hn9avx9c4yp2c1ra3593"; libraryHaskellDepends = [ base ghcjs-base protolude ]; homepage = "https://github.com/vwwv/ghcjs-promise"; description = "Bidirectional bidings to javascript's promise"; @@ -70425,7 +75226,7 @@ self: { mkDerivation { pname = "ghcjs-vdom"; version = "0.2.0.0"; - sha256 = "4a53dba09fc79b495f172584d0fa4e60d14453466098d9e221c8f3d0dc5d68c5"; + sha256 = "1ib8bpfd1wy847idk6308r9l9lb09vxd11152xglk6y7kyhdnlsa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70444,9 +75245,9 @@ self: { mkDerivation { pname = "ghcjs-websockets"; version = "0.3.0.5"; - sha256 = "f879f2ccfd4a98dfbe23b7e12aebda5207acfe10bcf3d67ec7d00ca06e83a7ce"; + sha256 = "1km7hdpa036hqxzddwxw23zaq1sjvbmjmqdp4fzdz62azp6g4ygq"; revision = "1"; - editedCabalFile = "1901cc0693c96bc77c6484ac202ce8e6302c2eb2eb6b986a054aaaad9901b2ff"; + editedCabalFile = "1zxj06csvaja0mm9hszbn8p2qc76x0n21b44ciycfsy9jc3cq08r"; libraryHaskellDepends = [ base base64-bytestring binary bytestring ghcjs-base text ]; @@ -70460,7 +75261,7 @@ self: { mkDerivation { pname = "ghcjs-xhr"; version = "0.1.0.0"; - sha256 = "14e8a6342d2ef912e14cd5a4bdc9f8712a6a92e43b2acc87d8e030085a51d91e"; + sha256 = "07nra5d0hc70v23wqaivwj96lakiz34vv96m9khi5y9f5lsads0l"; libraryHaskellDepends = [ base ghcjs-base text ]; homepage = "https://github.com/tdammers/ghcjs-xhr"; description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS"; @@ -70478,7 +75279,7 @@ self: { mkDerivation { pname = "ghclive"; version = "0.1.0.2"; - sha256 = "08bae27ee5b18d232f24a2586d9124d5fd212087489f0c914ff216aa13d8d566"; + sha256 = "0rnmv09sl5pj9y8hr7s8hwh23zfm4j8nsn524hpj73diwmzf5fh8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70501,7 +75302,7 @@ self: { mkDerivation { pname = "ghczdecode"; version = "0.1.0.1"; - sha256 = "89165d96224447f3e33dfe71fff83df210cea7d99d159c3fd8af32f6355dc6fa"; + sha256 = "1yn6blszccmgv0zrq5cxv6kww47j7pwgywgy7piz6is44ab5s5l9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base zenc ]; @@ -70518,7 +75319,7 @@ self: { mkDerivation { pname = "ght"; version = "0.4.0.1"; - sha256 = "8ca3d8b7310c391f2e3e5aea689d306680310db98b19c85db1adbf74f4b0990e"; + sha256 = "03lrn3s79gxdn5fwh6cbp46k303662fnisjs7qp1yf8c66vxi8wc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70540,8 +75341,8 @@ self: { }: mkDerivation { pname = "gi-atk"; - version = "2.0.11"; - sha256 = "32594ce32ab70fcf7b7e4d2fd212a4714c72d28776be7649f88a989b40632d9b"; + version = "2.0.12"; + sha256 = "1d15ylg9p46csmb8nicir1bg011gd4h123xfmvq8ksm7g85an9hk"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -70556,21 +75357,19 @@ self: { "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-cairo"; - version = "1.0.11"; - sha256 = "a70bbb9b120d10c95e1bc603511d542b38cecf1025bed870e6dbe2bd2d7e552f"; + version = "1.0.12"; + sha256 = "1q1bc1fqbk4cxqp99wyjhdp2wpgr9pakrr0pfsss9s9amb0kw98k"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; + libraryPkgconfigDepends = [ cairo ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -70578,7 +75377,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) cairo;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -70587,8 +75386,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "3.0.11"; - sha256 = "b1947f5abad3e500ac748ccea44275050c8a7261d0f81e49aee21a4266cf34b1"; + version = "3.0.12"; + sha256 = "1ridy0bj5s0zfawy7i1qf7n24d0wwbmyr04h1ss03zsx1jg5y66q"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib @@ -70596,7 +75395,6 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; @@ -70605,51 +75403,44 @@ self: { "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf - , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.11"; - sha256 = "068c4e9df68a03180dc0f174414af010877ffc781d35d2776e01a63bd1a80149"; + version = "2.0.12"; + sha256 = "0kxqg74rxv5z3bd5sgx5rzm2hhc565nm4ab2vhfdy4lvmscwq9gr"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; doHaddock = false; - preConfigure = '' - export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0 - export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0 - ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gdk_pixbuf; - inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) gdk_pixbuf;}; "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gio"; - version = "2.0.11"; - sha256 = "d63f1c32a935cb818f8f2c1d70dbf4f71cc65a23e200744a93dee66ade50f039"; + version = "2.0.12"; + sha256 = "13ancpyxlzrqyz8jwjizs7nmys9wmmh1k90armmlah03xlsssjz6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject @@ -70658,8 +75449,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.11"; - sha256 = "3779ee7c9e97a96b05f43607adbde81addf0451b0a1f21e94a9a4353cec1fde2"; + version = "1.0.12"; + sha256 = "1fbyr65pc1i264f0cn43g1cbdzkvc5m0cdd997m2sx77nlc481m8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject haskell-gi haskell-gi-base @@ -70675,47 +75466,43 @@ self: { "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-glib"; - version = "2.0.11"; - sha256 = "f707cc142c6c7a202b86a5804af38c53fd74c99ee2092946e3f39451220d94e9"; + version = "2.0.12"; + sha256 = "0pbfr8jgavg3csxbmjq6rv7hqj9g2h8b02ji1d3pjcpdmnzhh3mx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gobject"; - version = "2.0.11"; - sha256 = "fcfe35af13e118db109b9b0d969b89bb5c2a0162a1c3d1fc9413cafcd173058c"; + version = "2.0.12"; + sha256 = "19d9agggpldzifjgc7g84lqk4vp3jd9lbbnrw5k8h4f37hq0n4c2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -70724,8 +75511,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.11"; - sha256 = "36e63c2330cb274ac6ac8b1a5d4b06a590e10d91ed4209555a72a85dc0c2591a"; + version = "1.0.12"; + sha256 = "08131f3smycwdpgpx2gkyb3aq3hi1g9gr4zx3isqi2pff7z2qrnb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -70741,72 +75528,114 @@ self: { "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi + , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.11"; - sha256 = "faca30e17c95fc5fc00e72bbaef20bbb9edf2a4785f6bad6f6b4a742006d2f5d"; + version = "1.0.12"; + sha256 = "1aidn8kc3i81hdh1xpiyv0nh4n0ncwdfyigv5n64jdf9j7faqp3z"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base - , haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base + , text, transformers }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.11"; - sha256 = "ca1cf846609ee3a340161747df48885432304b4a4339d3328d3f8b5e683ff577"; + version = "1.0.13"; + sha256 = "1s3x30d65yl908hwy67mb9a7c55lrypiaxjq13j7fhl99clppy6b"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; - "gi-gstvideo" = callPackage + "gi-gstpbutils" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstaudio, gi-gsttag, gi-gstvideo + , gstreamer-pbutils, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { - pname = "gi-gstvideo"; - version = "1.0.11"; - sha256 = "9f2b49fc2ee31fb4ee4f2bf82f509a8b9d4dc963eff0da62efa6b60e760f42e7"; + pname = "gi-gstpbutils"; + version = "1.0.12"; + sha256 = "1skbvijcnjd2nqic2q2ggqfbz1amrxpy7gkbmvsgv4qzxgywsyv3"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio + gi-gsttag gi-gstvideo haskell-gi haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ gstreamer-pbutils ]; + doHaddock = false; + 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 + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gi-gst, gi-gstbase, gstreamer-tag, haskell-gi + , haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-gsttag"; + version = "1.0.12"; + sha256 = "1xn4aav9gz08wakgsspm385iv7gvd9v1xkisgnl64lwlgah7rkh2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gstreamer-tag ]; + doHaddock = false; + 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 + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi + , haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-gstvideo"; + version = "1.0.12"; + sha256 = "0vi9c6bbqdl0x58nykmqyiffdvcs2mcgnd02kdpb2a7x2plfnvxs"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase + haskell-gi haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -70815,8 +75644,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.11"; - sha256 = "a4bce9a9ea706a880bb9e8f6a2f8eb872b66acf550f8f42dd13a552b4d725f3f"; + version = "3.0.15"; + sha256 = "176hvvrl2w71dy096irazr83v07qd8nixl6gsihn2i9caaxn4scb"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -70825,7 +75654,6 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; @@ -70839,8 +75667,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.4.0"; - sha256 = "2e7ce60dded6d70a4598001469894d1f415bc28d600e5a6ac9f4558c624200e4"; + version = "0.3.4.3"; + sha256 = "0ypvb5iklmw7k7j1jzd62arbn875hwyg0lcx1z24csyin6gl7zda"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -70858,8 +75686,8 @@ self: { }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.11"; - sha256 = "4d64ad35431052f221a37998b8ca7fa8850a9a98d2741133f64f978b2e3bcad7"; + version = "2.0.12"; + sha256 = "0agqq13nc73c8m0cbk0c3gx5jdgmwv6kzpmiai33qyhyva7jn2jx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk @@ -70876,70 +75704,68 @@ self: { "gi-gtksource" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-gtk, gi-pango, gtksourceview, haskell-gi, haskell-gi-base + , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base , text, transformers }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.12"; - sha256 = "b7babfb18749b73f32dab35c464f641381b1ebc333cbdd6fe2167825db45476c"; + version = "3.0.13"; + sha256 = "0fg6pzrs1r43gfcsmah7rm3p03pry84nryjv1p0ckd5g083pln6z"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gtksourceview ]; + libraryPkgconfigDepends = [ gtksourceview3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gtksourceview;}; + }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk + , haskell-gi-base, text, transformers, webkitgtk24x-gtk3 }: mkDerivation { pname = "gi-javascriptcore"; - version = "3.0.11"; - sha256 = "88f288c8e70dace97422b7385f77a4d7f856e4a2f5940abc4d41947ec76bb250"; + version = "3.0.12"; + sha256 = "1wfcl5b8kwngy433k74r0nfyx170wyyg9qx5axalvwxk7n3vjyz6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; - "gi-javascriptcore_4_0_11" = callPackage + "gi-javascriptcore_4_0_12" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk + , haskell-gi-base, text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.11"; - sha256 = "d67899269ffeba7fa266644fb6d540c74d36fa9e15ca1890fc2c6bb1fa19e066"; + version = "4.0.12"; + sha256 = "1wwpapn0w461njr13raws2i7aazkrsw1254aim0a2lc6h0xapbg3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -70948,8 +75774,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.11"; - sha256 = "206eaf4d06e5837e21f665212517c27c201e48bb306ea0ea77e05ce9e8d059ce"; + version = "0.7.12"; + sha256 = "0rc9frrg43blwsxpjyqjrrrjgq10p1hpnfrp1vd6jq3prbh0pp36"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject @@ -70963,23 +75789,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libnotify;}; + "gi-ostree" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text + , transformers + }: + mkDerivation { + pname = "gi-ostree"; + version = "1.0.3"; + sha256 = "0b9x7w6v8w62wbvwc2p3fk5q2mar7db9ch1a0idf8s667jhmzdfj"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ ostree ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "OSTree bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + }) {inherit (pkgs) ostree;}; + "gi-pango" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, pango, text, transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text + , transformers }: mkDerivation { pname = "gi-pango"; - version = "1.0.12"; - sha256 = "8a2badc09262448996bc3b4b82d6fdc69b423d4a34d57cdc859c89f8ae74250d"; + version = "1.0.13"; + sha256 = "0nrkaq135gb14zahd5805lkbi81vavbzs9cdxw5p33im62dihbzl"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ]; + libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -70988,40 +75835,33 @@ self: { description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-glib, gi-gobject, gi-pango, gobjectIntrospection, haskell-gi - , haskell-gi-base, pango, system-cairo, system-pango, text - , transformers + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi + , haskell-gi-base, pango, text, transformers }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.12"; - sha256 = "e24214f43c50ecb1077168298bf48e447ddcb80ee8c8452fc02ef04df971a787"; + version = "1.0.13"; + sha256 = "0gs9cpd1a8imkqcd995hp6kjk6v8ai6mlqc9rm5jv0hvicjr948g"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ - gobjectIntrospection pango system-cairo system-pango - ]; + libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${system-pango.dev}/share/gir-1.0''; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${system-pango.dev}/lib/pkgconfig:${system-cairo.dev}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs pangocairo cairo-gobject)" + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango; system-cairo = pkgs.cairo; - system-pango = pkgs.pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -71030,8 +75870,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.11"; - sha256 = "76ec68a35a83c99d3c8fd3374b02b0fede275ced4c21d4c967d817411a8c581b"; + version = "0.18.12"; + sha256 = "04dza9hh8bbn5i6qhk5140ii5nxd9xpz6xfcfd8a08r0bsav35zp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject @@ -71045,6 +75885,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) poppler;}; + "gi-secret" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text + , transformers + }: + mkDerivation { + pname = "gi-secret"; + version = "0.0.2"; + sha256 = "18f2nyx79bk9mixmi5xbzmvylb4q1gxgqzynl2y77zhd3q3fcgzc"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ libsecret ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Libsecret bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) libsecret;}; + "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text @@ -71052,8 +75913,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.11"; - sha256 = "5488104e98b7a295b44990d0063b162c951b8a1eec5df35a42bd4ba828dbd0ad"; + version = "2.4.12"; + sha256 = "04jzgcbacs3ynn7flg94a2vggf6npb9iv6nfvjbzkghrdw0ncp97"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -71073,8 +75934,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.13"; - sha256 = "4dfce5aefb7e2e8daad8be77f3c64580bd5c1b90287513153f668497308c1b40"; + version = "2.91.14"; + sha256 = "1xvv91q99918rbbkk3q2vy8sg22dh835ih51mibmz994r4pgh82s"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject @@ -71092,73 +75953,71 @@ 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, webkit + , text, transformers, webkitgtk24x-gtk3 }: mkDerivation { pname = "gi-webkit"; - version = "3.0.11"; - sha256 = "d707c10a9f758d5bee1fe59639fb6773a1fcdb596bc86b46c7ce19639556ff3f"; + version = "3.0.12"; + sha256 = "0r195s3fx2nkks4mzv4zi7a9isd4qkwvxfb9v5fknz46virppm01"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring 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 ]; - libraryPkgconfigDepends = [ webkit ]; + 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; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkit2gtk, webkitgtk + , transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.11"; - sha256 = "bc43fb893695cd0395ffdd3381e857d5201e2a7209feb6f6024e0d832219070b"; + version = "4.0.12"; + sha256 = "1c392g4gk8mzrkr6d4rw6nbriyqc41nzl8svwpg0xa2bwpakz33z"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkit2gtk-web-extension, webkitgtk + , text, transformers, webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.11"; - sha256 = "b16b5b2f54bceaa777c64bb5ed19244815892dafcd8b4ce949c6a858ccf19033"; + version = "4.0.12"; + sha256 = "0xyaxm0b9kijzpxf3dn0x6s9k0shkj7la7nyc4f5a04nkndv0gsi"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk-web-extension = null; inherit (pkgs) webkitgtk;}; + }) {webkitgtk-web-extension = null;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -71168,7 +76027,7 @@ self: { mkDerivation { pname = "giak"; version = "0.1.0.1"; - sha256 = "13cbbbec91cf23cc178843525c03cf5bba162842a8ddc4259ab3efdbe18b6073"; + sha256 = "0wv0ighxpvxkk8jw9pd888l1dfjvrw1mqlj3i0bwq8ygj7nbpjqk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71186,7 +76045,7 @@ self: { mkDerivation { pname = "gimlh"; version = "0.1.3.0"; - sha256 = "5468c82185ea26b8660faafeb65021ec49328091cb882bd4b87ef01c9c7badc3"; + sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l"; libraryHaskellDepends = [ base split ]; homepage = "https://github.com/gazay/gimlh"; description = "Haskell parser for GIML"; @@ -71202,7 +76061,7 @@ self: { mkDerivation { pname = "ginger"; version = "0.3.9.1"; - sha256 = "28f26b37cd2daedd841516f0e538877f84932a9813096a34e8c820de44c0323c"; + sha256 = "0g1jq12dw868x0s6l28kk0m9713zhwwfbw0n2n2dvbidrlvnpwi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71225,7 +76084,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ginger_0_5_1_2" = 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 @@ -71233,8 +76092,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.5.1.2"; - sha256 = "f6eb7424e05408227d405607c12e6efce129da54693c6c56527a42cff9c82077"; + version = "0.5.3.0"; + sha256 = "049ys725scrrkxc2q4wx085hbzdnjpm1jd9wqraqg5fa23vpfy34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71266,7 +76125,7 @@ self: { mkDerivation { pname = "ginsu"; version = "0.8.2.2"; - sha256 = "81d4b247b5454245c581a6412d0ac1699c2ff4c64f366a3fa61be3fe3ae43518"; + sha256 = "061mwhxgxqqvlqznldjgqvs2z739q452shd6h72lahj5nm3v5m41"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71287,7 +76146,7 @@ self: { mkDerivation { pname = "gio"; version = "0.13.3.1"; - sha256 = "ac63f42321800731b9dc1f753f27ee877c04fdf7bcbcab0e2c57348a4739d827"; + sha256 = "09yq753qld2p5h7apg5wyzyh8z47xqkkyx8zvjwk21w044iz8qxc"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring containers glib mtl @@ -71306,8 +76165,8 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.3.3.1"; - sha256 = "be7aafd3390c5d498c39482ff862a302c3bf2d7cecdba4940141297728bbb143"; + version = "0.3.3.2"; + sha256 = "04rdrq9c75q6pw6q3d41yiqx3agx7db1qx2dqdk7mlwjp3iy1h1r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71330,7 +76189,7 @@ self: { mkDerivation { pname = "giphy-api"; version = "0.5.2.0"; - sha256 = "447111d3fa32a76ffc50b26fbec59d9e9a097d7e2facb04a7a272cb9abd97ce9"; + sha256 = "1sbwv6mvjb17g95b1b1ggryhk6lykp2vwvxja3y6z9rjzb9i2wa4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71355,7 +76214,7 @@ self: { mkDerivation { pname = "gist"; version = "0.1"; - sha256 = "817a3ff4fa8a57047fd5960d1a63a71998d2d9b3be641bfa346c490cd483edc9"; + sha256 = "1jgdhga0qjbc6kx1nr5yngcx560rlxiil3cnsmzh8mwazbs3yyl1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71376,7 +76235,7 @@ self: { mkDerivation { pname = "git"; version = "0.2.0"; - sha256 = "d773dcfdd34b2b4ca34a1e84fac7c80f44c0ea0f89378ab3d161683c8acd8ea8"; + sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp"; libraryHaskellDepends = [ base byteable bytestring containers cryptonite hourglass memory mtl patience random system-fileio system-filepath unix-compat @@ -71398,7 +76257,7 @@ self: { mkDerivation { pname = "git-all"; version = "1.5.0"; - sha256 = "7f30de421293f76b735ac70da794a4104c7fbde18bf4a254f43520cb6b76db71"; + sha256 = "0wfvfrmwn81myiaa5x4bw6ypyk0hljaaf3f7b9rnpxwk291dwc3z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71419,22 +76278,22 @@ self: { , directory, disk-free-space, dlist, dns, edit-distance, esqueleto , exceptions, fdo-notify, feed, filepath, free, git, gnupg , hinotify, hslogger, http-client, http-conduit, http-types, IfElse - , lsof, magic, MissingH, monad-control, monad-logger, mountpoints + , lsof, magic, memory, monad-control, monad-logger, mountpoints , mtl, network, network-info, network-multicast, network-uri , old-locale, openssh, optparse-applicative, path-pieces, perl , persistent, persistent-sqlite, persistent-template, process , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore - , sandi, securemem, shakespeare, socks, stm, stm-chans, tasty - , tasty-hunit, tasty-quickcheck, tasty-rerun, template-haskell - , text, time, torrent, transformers, unix, unix-compat - , unordered-containers, utf8-string, uuid, wai, wai-extra, warp - , warp-tls, wget, which, yesod, yesod-core, yesod-default - , yesod-form, yesod-static + , sandi, securemem, shakespeare, socks, split, stm, stm-chans + , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , template-haskell, text, time, torrent, transformers, unix + , unix-compat, unordered-containers, utf8-string, uuid, wai + , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core + , yesod-default, yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20170301.1"; - sha256 = "f416c02fabefb28e346b3bb6723141b0ff9785575e78e4d1e9ab5982cf6389de"; + version = "6.20170520"; + sha256 = "05r701gd7jqjcxcvm8l11fb04z8rqjalf4z8id693q9c2x29pkzq"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -71445,7 +76304,7 @@ self: { isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse MissingH process unix unix-compat + hslogger IfElse process split unix unix-compat ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring @@ -71453,12 +76312,12 @@ self: { conduit-extra containers crypto-api cryptonite data-default DAV dbus directory disk-free-space dlist dns edit-distance esqueleto exceptions fdo-notify feed filepath free hinotify hslogger - http-client http-conduit http-types IfElse magic MissingH + http-client http-conduit http-types IfElse magic memory monad-control monad-logger mountpoints mtl network network-info network-multicast network-uri old-locale optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi - securemem shakespeare socks stm stm-chans tasty tasty-hunit + securemem shakespeare socks split stm stm-chans tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time torrent transformers unix unix-compat unordered-containers utf8-string uuid wai wai-extra warp warp-tls yesod yesod-core yesod-default @@ -71468,9 +76327,13 @@ self: { bup curl git gnupg lsof openssh perl rsync wget which ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; installPhase = "make PREFIX=$out BUILDER=: install"; - checkPhase = "./git-annex test"; + checkPhase = '' + ln -sf dist/build/git-annex/git-annex git-annex + ln -sf git-annex git-annex-shell + export PATH+=":$PWD" + git-annex test + ''; enableSharedExecutables = false; homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; @@ -71489,7 +76352,7 @@ self: { mkDerivation { pname = "git-checklist"; version = "1.0.0.0"; - sha256 = "c218a7b14140a33a9dc8aa467b7a03c6ffa7aff6a6b20646994531d9ee5e8ee0"; + sha256 = "1q4fbvpdjca5k530dcm6yspsgzy60dx7nimar2fkm8s086qsf662"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71508,7 +76371,7 @@ self: { mkDerivation { pname = "git-date"; version = "0.2.2"; - sha256 = "94e56e2abd30951ae711a7ff47f3ab2072ebc7cfb14e1bc48711e027cf458d7a"; + sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl"; libraryHaskellDepends = [ base bytestring time utf8-string ]; testHaskellDepends = [ base bytestring old-locale QuickCheck test-framework @@ -71527,7 +76390,7 @@ self: { mkDerivation { pname = "git-embed"; version = "0.1.0"; - sha256 = "76cbc25c114ec69ab7c291cdca0c1fb703642dce9564d9409afa17e195013d7b"; + sha256 = "0yrx06ay25zsk90djr4mrqnn80xp3w6cmkciqavrmijf25fc5jvn"; libraryHaskellDepends = [ base directory filepath process template-haskell ]; @@ -71544,9 +76407,9 @@ self: { mkDerivation { pname = "git-fmt"; version = "0.4.1.0"; - sha256 = "a9c10f79f92b6a1650f4eac002542a35dda0048ed68d670602e97615b879e97d"; + sha256 = "0zg9g6w1axp90836g3fniq2a1p9m59a05h7ayi81csibz5whzhd9"; revision = "1"; - editedCabalFile = "96d1979715bb9d13c2ac5a2698a47c58c755cf6177bd84178fd646efc16f7fa9"; + editedCabalFile = "1abzdz0yyinniwbq9gbpc77mbisqgjj9h9jsmk1177dv2nbrglcn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71567,7 +76430,7 @@ self: { mkDerivation { pname = "git-freq"; version = "0.0.3"; - sha256 = "a237869ac82825596f90169d46ed2b95f16c6350bf53f1861671214c173d3be3"; + sha256 = "1qrv7lblq8bi2s3g2lxza1inrwcm5gnld78nj1pmj998r2d8cdx2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71592,7 +76455,7 @@ self: { mkDerivation { pname = "git-gpush"; version = "3.1.0.1"; - sha256 = "cf8c8058f4f7f280e02d8ebb93e18a08b519c2679c4acc943b74d723842ca98e"; + sha256 = "13m95j227mvl7facqjlwcz11kd88ibhr7fwf5ph81wppyic8136g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71611,7 +76474,7 @@ self: { mkDerivation { pname = "git-jump"; version = "0.1.0.3"; - sha256 = "5eca5084dd2796d41d1e18d95465016c41b4ea7270d0fc17b769e492bc58e3c2"; + sha256 = "1hp3b2y95r39nwbzrl3hfbmb8hbc05jm9n8q3qfx95i7vn251jjy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base base-compat process ]; @@ -71627,8 +76490,8 @@ self: { }: mkDerivation { pname = "git-mediate"; - version = "1.0.2"; - sha256 = "1b0811b1d26a11f564b6136fed1fc440711f9554433d25475e03d3e5dd28306c"; + version = "1.0.3"; + sha256 = "01lvw1lb2xfp9yyvj1053cczi1jfzvcxn5q5ls3jzc4g979grw18"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71650,7 +76513,7 @@ self: { mkDerivation { pname = "git-monitor"; version = "3.1.1.5"; - sha256 = "52a6c8360c32ad1bfc21dedf03177e36f587412284cb31d4070d066a1b65154b"; + sha256 = "0jqmcldnl1hd0za33jw4490qgx9ngqbh7pyy47y1pb9j1hvci9jj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71671,7 +76534,7 @@ self: { mkDerivation { pname = "git-object"; version = "0.0.2"; - sha256 = "550631462687e4e1b6b04aa91ad0eaa9abad467b1bf2e0e308cbd4686ca19ac3"; + sha256 = "1hwsl5n6im6b13iy1whvgd3avax9xb81maaan2vf3r474r3321jm"; libraryHaskellDepends = [ attoparsec attoparsec-enumerator base bytestring directory enumerator filepath zlib-enum @@ -71685,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 = "d24c576c4a033f051d1f7a76a0e203ba00c9844bad1236d86974a136ebd25a6e"; + 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"; @@ -71718,7 +76581,7 @@ self: { mkDerivation { pname = "git-sanity"; version = "0.1.0.0"; - sha256 = "82a36d28e63e8f6c0e0f5f110a421817caa60874e1dee12891f95069d5ebdcfb"; + sha256 = "1yywxganjl7rj4lf3pp1fh4adjhp3110l4az1w76r3rywql6v8w2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71741,9 +76604,9 @@ self: { mkDerivation { pname = "git-vogue"; version = "0.2.1.1"; - sha256 = "b01a260ce29defca47ef49d29ea345fa97a9f65c6014b8a5a2e8ed4b3f4850d5"; + sha256 = "1mah90zlpvg8lajvh530bkvak5zs8nirxlj9xx3wmvwxw862c6mh"; revision = "1"; - editedCabalFile = "193c61303ed316e082e851b6d414755d6045291969fb0004080effdfe47af802"; + editedCabalFile = "00pqgbjdzzqf10201yv934llaq2xflad9djix21f05nk7qq62g0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71770,8 +76633,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.6"; - sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49"; + version = "1.3.7"; + sha256 = "1bs4lg8r03gkcq65q0wh94angaylkqwc2cbik0jldp6j2cdl6f6w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process text unix ]; @@ -71791,7 +76654,7 @@ self: { mkDerivation { pname = "gitcache"; version = "0.3"; - sha256 = "52d2a4243eb1a385bee7665259efbba41a33e1ad57e59c59912b56d469a21e5d"; + sha256 = "0p8yl9lx8mibj5crrrapmphk66m4pgpmjlk6wyz8b8xi7qja9ljj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71810,7 +76673,7 @@ self: { mkDerivation { pname = "gitdo"; version = "0.1.0.0"; - sha256 = "b4f58c6569168fa04e39685a5a7898bf9da61ec1379e6650cb96e986b350364f"; + sha256 = "0krna2rqdscnrd86d7ipq4gad7dzk1w5lnk8757a13qnd5jqrxdl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71835,9 +76698,9 @@ self: { mkDerivation { pname = "github"; version = "0.15.0"; - sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609"; - revision = "2"; - editedCabalFile = "dfa08cdd826d10c2b751d80356cb956f38dddd4b7247fdb0beeefb6f98e94373"; + sha256 = "02fnxbz1in5fsacfsm39i7dgpk1waqqkhkdxa77bl6b68ifc74gh"; + revision = "3"; + editedCabalFile = "03x27qmqvs4xc9ic0219d69jhwpsk552nr7wdgzyi005l1jhs12h"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -71866,7 +76729,7 @@ self: { mkDerivation { pname = "github-backup"; version = "1.20170301"; - sha256 = "5e6215f3feac9dc8871e42e554decf6049df2f18f3d84fb8906fe0c3849378b0"; + sha256 = "1c3qjf2c7q3gj2w4zn7k30pxyjb0rzg59ra23s3wi7dczvriaqjy"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -71893,7 +76756,7 @@ self: { mkDerivation { pname = "github-post-receive"; version = "1.2.0.1"; - sha256 = "1898710f45cce786e9ea8b252b4052d3b6a2d91ccd70c3ac567cf4916d4e6d93"; + sha256 = "14vd9rnr3x3wasnc6w6d3kcs5dnka902n9cbxblqdryc8l7p360q"; libraryHaskellDepends = [ aeson base bytestring containers email-validate http-types text wai wai-logger warp @@ -71910,8 +76773,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.0.1"; - sha256 = "a0e58b9e855cdf8617ba42436c974776800573951dcf680ec3072651fc10c5b5"; + version = "1.0.3"; + sha256 = "1jq69syllagq6g04wlsii2w2nqlck9g9dzs1dscwdbaal0907ck9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71933,7 +76796,7 @@ self: { mkDerivation { pname = "github-tools"; version = "0.1.1"; - sha256 = "d6aa2c877079bf89188d8bbbb006df135e481ce047ba26be4c8f7566d44257ad"; + sha256 = "1bap8ba6cxcg9jz2dfj7w0f4hphkvw3b1fwbilc8kgvrf23jrann"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71954,7 +76817,7 @@ self: { mkDerivation { pname = "github-types"; version = "0.2.1"; - sha256 = "cce4ea461b3ea7c92d130181244cfe7f29c10aecc7e7a980ee6722b6d6af7867"; + sha256 = "0rvqmzbbc8k7xs0akry7xh5c2abzzr6290812cnwk9ry3d3fmr6c"; libraryHaskellDepends = [ aeson base text time ]; testHaskellDepends = [ aeson aeson-pretty base hspec hspec-smallcheck http-conduit @@ -71969,7 +76832,7 @@ self: { mkDerivation { pname = "github-utils"; version = "0.1.0"; - sha256 = "458940e4566ef14b14d6700e2fd581e99f115b6f6ce31d085b293cac7e0eefb4"; + sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5"; libraryHaskellDepends = [ base basic-prelude github text ]; homepage = "https://github.com/greenrd/github-utils"; description = "Useful functions that use the GitHub API"; @@ -71984,7 +76847,7 @@ self: { mkDerivation { pname = "github-webhook-handler"; version = "0.0.8"; - sha256 = "1d908854606683c236720c2de3988ae723591be02b1c668bd8ba0ffa03b34fea"; + sha256 = "1sjgnc1zl3xsv25nc71bw0dmj8z7iacf6b8cf8vc50v6c1a8i40x"; libraryHaskellDepends = [ aeson base bytestring cryptohash github-types text transformers uuid vector @@ -72000,7 +76863,7 @@ self: { mkDerivation { pname = "github-webhook-handler-snap"; version = "0.0.7"; - sha256 = "d4f526f4027a0c1cd9bdf455fbfb0c1742539eb3379b22ba59f1647133202c91"; + sha256 = "149c40rp2r7ib6x256rpnfg56hhp1kxznmglppciq33s0bs2dxfl"; libraryHaskellDepends = [ base bytestring case-insensitive github-types github-webhook-handler snap-core uuid @@ -72017,7 +76880,7 @@ self: { mkDerivation { pname = "gitignore"; version = "1.1"; - sha256 = "59cc0668488d3fc587b48b04293cd67fcefde64125fefc4f1d0f5682b9401084"; + sha256 = "110h82wq4mhg3m7zrzi587kgvkkzsqy2j14bnj3wagwd91l0dk2r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72043,7 +76906,7 @@ self: { mkDerivation { pname = "gitit"; version = "0.12.2.1"; - sha256 = "15114e589f90bb4361fda3cbaec23c82c2a765f4e09debc93b2b46ac698053f4"; + sha256 = "1x2kh1lsqiib7g4yp7g0yijsghl27k1axjx3zmhl7fwhkxc4w48m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72075,7 +76938,7 @@ self: { mkDerivation { pname = "gitlib"; version = "3.1.1"; - sha256 = "dd68758b62fb0ca52f3ed851d2e68779770b1d83f2dd846528c3538aabf395ef"; + sha256 = "1vwmyfmqlly351jq9pgjhcfhnxvrhzkd4lfq7qpsa37vca5pas6x"; libraryHaskellDepends = [ base base16-bytestring bytestring conduit conduit-combinators containers directory exceptions filepath hashable lifted-async @@ -72097,7 +76960,7 @@ self: { mkDerivation { pname = "gitlib-cmdline"; version = "3.1.0.2"; - sha256 = "13dc42fc66f1a99519b7efb818f00cb6b820e806487daa533680d762f46d31b7"; + sha256 = "1dridps65mw06r9slza80vl21f5n1kq1if7gnwcrbagicvy45p0k"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators containers directory exceptions gitlib monad-control mtl old-locale parsec @@ -72120,7 +76983,7 @@ self: { mkDerivation { pname = "gitlib-cross"; version = "3.1.0"; - sha256 = "30c4418f394ffe0db3ff4de627a08b19aaab9c5ad79f997421ca2da7e6994c45"; + sha256 = "0iack7kafbfa45s9k7ypbafapahrifh2grjdzyrhvzjg767l3i1h"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base gitlib gitlib-cmdline gitlib-libgit2 gitlib-test hspec @@ -72142,9 +77005,9 @@ self: { mkDerivation { pname = "gitlib-libgit2"; version = "3.1.1"; - sha256 = "fc2806ebc1bb51f5043a0d5091c5045be40bf82cae3296213b353507b8c868bb"; + sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w"; revision = "1"; - editedCabalFile = "15ea81db4b514f97392188994df86421d9a8cb76cfb0558de3fc9ba60903a16c"; + editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators containers directory exceptions fast-logger filepath gitlib hlibgit2 lifted-async @@ -72172,7 +77035,7 @@ self: { mkDerivation { pname = "gitlib-s3"; version = "3.1.0.1"; - sha256 = "1559a3d7a3716a0f4f34cc2089e73eb08ba6f01e91e6603125f21e6f9b119ded"; + sha256 = "1vcx26dny7pj4lqn1rli3vqad2xh7vkqj86c6i7hyskilgbs6n8m"; libraryHaskellDepends = [ aeson attempt aws base bifunctors binary bytestring conduit conduit-combinators data-default directory exceptions filepath @@ -72195,7 +77058,7 @@ self: { mkDerivation { pname = "gitlib-sample"; version = "3.1.0"; - sha256 = "acbad8151ca6e337ec03cf946f7fe7e8cf27dfca4d06eef8ab33e4d9a7f6a3df"; + sha256 = "1px3yskxkr1kmgwfw1jdrbgjgkz8wxznz56g0gn3gqx63haxifmc"; libraryHaskellDepends = [ base exceptions gitlib mtl transformers ]; @@ -72211,7 +77074,7 @@ self: { mkDerivation { pname = "gitlib-test"; version = "3.1.0.3"; - sha256 = "fe0abfa269dabd63d60f856db0a82c88d6bd059de1d4d84dccaf846a1a38291f"; + sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators exceptions gitlib hspec hspec-expectations HUnit monad-control tagged text time @@ -72229,7 +77092,7 @@ self: { mkDerivation { pname = "gitlib-utils"; version = "1.2.0"; - sha256 = "166a6e4c709319aedb314515a04300ba0586a815c4a78cf181931a47eb533b20"; + sha256 = "081vagmlf6lkh7qqr9y42nl8c1ds011s05a567dsw6ckf166wshn"; libraryHaskellDepends = [ base bytestring conduit data-default failure gitlib hex lifted-base system-fileio system-filepath tagged text transformers @@ -72247,7 +77110,7 @@ self: { mkDerivation { pname = "gitrev"; version = "1.2.0"; - sha256 = "4391e34edb5caaab901c6faa4369b246b6896c747869f6ab85b6db5524003102"; + sha256 = "00ii00j5bnxnhnmzcsbqfin8kdj6n9ll7akg3j8apajwvd7f74a3"; libraryHaskellDepends = [ base directory filepath process template-haskell ]; @@ -72256,6 +77119,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitrev_1_3_1" = callPackage + ({ mkDerivation, base, base-compat, directory, filepath, process + , template-haskell + }: + mkDerivation { + pname = "gitrev"; + version = "1.3.1"; + sha256 = "0cl3lfm6k1h8fxp2vxa6ihfp4v8igkz9h35iwyq2frzm4kdn96d8"; + libraryHaskellDepends = [ + base base-compat directory filepath process template-haskell + ]; + homepage = "https://github.com/acfoltzer/gitrev"; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , conduit-combinators, conduit-extra, criterion, directory, doctest @@ -72265,7 +77145,7 @@ self: { mkDerivation { pname = "gitson"; version = "0.5.2"; - sha256 = "671dd6e7aa64ea0bb77e2db3d97bbce545a32c132015c81feebb3ff087ec2196"; + sha256 = "15i1xj3z0gxvxqgwh5902cna6ig5pixxkcrdgsvhpsk4mbkxc7b7"; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring conduit-combinators conduit-extra directory errors filepath flock lifted-base @@ -72289,13 +77169,13 @@ self: { }: mkDerivation { pname = "gitter"; - version = "0.1"; - sha256 = "640371046315d609811e3062edc202e386722165f84fbe1f15e22a5e2d66324a"; + 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; }) {}; @@ -72307,7 +77187,7 @@ self: { mkDerivation { pname = "givegif"; version = "1.0.0.0"; - sha256 = "7fb3016bf4451326113062b5890011c88cc03a6f2c247df244456b520699d01b"; + sha256 = "06yhk4354ss58kr7s91cdwxc13682408kdb2608jc4s5yimh3cvz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72333,7 +77213,7 @@ self: { mkDerivation { pname = "gjk"; version = "0.0.0.1"; - sha256 = "8a1dc10dffd485632bb519db13abbfd6a6f9c3cbdc12f33a8c8c6a0359dc104f"; + sha256 = "0kqhvich6slcihxg64nwrg1zk9nnpymi7nqrnlmn71flzw6w27ca"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/zaidan/gjk#readme"; @@ -72342,16 +77222,18 @@ self: { }) {}; "gl" = callPackage - ({ mkDerivation, base, containers, directory, filepath, fixed, half - , hxt, mesa, split, transformers + ({ mkDerivation, base, Cabal, containers, directory, filepath + , fixed, half, hxt, mesa, transformers }: mkDerivation { pname = "gl"; - version = "0.7.8.1"; - sha256 = "ed792ee75d32489857295ef9ae6a4a49900e2ed4a01cd2bac9fdd17959a6219a"; + version = "0.8.0"; + sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; + setupHaskellDepends = [ + base Cabal containers directory filepath hxt transformers + ]; libraryHaskellDepends = [ - base containers directory filepath fixed half hxt split - transformers + base containers fixed half transformers ]; librarySystemDepends = [ mesa ]; description = "Complete OpenGL raw bindings"; @@ -72363,7 +77245,7 @@ self: { mkDerivation { pname = "gl-capture"; version = "0.1.0.0"; - sha256 = "039579a83a8a359466aedb87515b4e67ab96db451fb96454e3ae86751db08a5d"; + sha256 = "0pcan0fpb1mfwda69f8z8pdrdav79rdm31yvmrk98dca7al7k583"; libraryHaskellDepends = [ base bytestring OpenGL ]; description = "simple image capture from OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -72376,8 +77258,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "0.3.1"; - sha256 = "419c5ec7c93c981ced838d6711e18565883abbb3b229d34a6fc904722e678ec8"; + version = "0.3.2"; + sha256 = "0zyv16gyfjq9mz826zq9q5kqz73y7cp7cbz2cbvb11adbci4pj1r"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -72397,7 +77279,7 @@ self: { mkDerivation { pname = "glade"; version = "0.13.1"; - sha256 = "6bb9c72052085c83c1810f1389875d260b9d65f1ea4c4e64022270291ae9be45"; + sha256 = "0idyx4d2jw1209j4wk7ay5jrs2r6bn3qj4qgh70q6p08a8hcgfbb"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ libglade ]; @@ -72412,7 +77294,7 @@ self: { mkDerivation { pname = "gladexml-accessor"; version = "0.0"; - sha256 = "c317d2d1db4c2270b606c940db32aff4a5c6860215230dfa938d56adf7547f1a"; + sha256 = "06kzakvssmldjgx0s8qm0a3cd9glmwrdnh690sv708jcvg8x45y3"; libraryHaskellDepends = [ base glade HaXml template-haskell ]; description = "Automagically declares getters for widget handles in specified interface file"; license = stdenv.lib.licenses.bsd3; @@ -72427,7 +77309,7 @@ self: { mkDerivation { pname = "glambda"; version = "1.0.1"; - sha256 = "da42696d4ad985cd10d249457d801a234c04a29ef08acdbbd91544dabce2d16f"; + sha256 = "0vyiwaydli0mv6xwv2phksi08k133a07sia9s88cv1fr99nnjhns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72449,7 +77331,7 @@ self: { mkDerivation { pname = "glapp"; version = "0.1.0.1"; - sha256 = "1f563f7be9ad067166ffc6b1d7ca454c4b2b22057583103a44b28574013cdb1c"; + sha256 = "076v7h0p91dj8hx110vm0li2njsc8p5dgcf6zxk721mdx5xkymhz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers GLFW-b lens mtl OpenGL ]; @@ -72467,9 +77349,9 @@ self: { mkDerivation { pname = "glasso"; version = "0.1.0"; - sha256 = "683dc39377d9a8e51667deef16e2b215d20d393f1eb323f6b06ec217dddb73c5"; + sha256 = "1ibkvgfighkfn3v27cqy7wwhvlhmnbi1dvyycwbfba6rfy9w6gb8"; revision = "1"; - editedCabalFile = "abf1b0cb0b9cc8c106f833a2549e2be95111a58296d6cc01c39e18c03abef797"; + editedCabalFile = "15zppqxc064yqc0wrmlnhaji2lg95fg598ikz03c3j4w1g5v1wdb"; libraryHaskellDepends = [ base vector ]; description = "Graphical Lasso algorithm"; license = stdenv.lib.licenses.bsd3; @@ -72480,13 +77362,26 @@ self: { mkDerivation { pname = "glaze"; version = "0.2.0.2"; - sha256 = "16b27081d6c2dac74748e6dbcbfdc6855d48c2ebc730648bf74d34ae6a44c92c"; + sha256 = "0b698imawd2dyy5n8c67xg14hpc5qvywpnz6913wgnn2ss0p1chn"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/louispan/glaze#readme"; description = "Framework for rendering things with metadata/headers and values"; license = stdenv.lib.licenses.bsd3; }) {}; + "glaze_0_3_0_1" = callPackage + ({ mkDerivation, base, lens }: + mkDerivation { + pname = "glaze"; + version = "0.3.0.1"; + sha256 = "18925rqf3ah1k7xcb15zk0gcbc4slvvhr5lsz32fh96gid089cdv"; + libraryHaskellDepends = [ base lens ]; + homepage = "https://github.com/louispan/glaze#readme"; + description = "Framework for rendering things with metadata/headers and values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glazier" = callPackage ({ mkDerivation, base, lens, mmorph, mtl, profunctors , semigroupoids, transformers @@ -72494,7 +77389,7 @@ self: { mkDerivation { pname = "glazier"; version = "0.7.0.0"; - sha256 = "13eb88a1df905d3ea2671803e8c4f456671223c490b0116779af28298e7ab428"; + sha256 = "0a5lga72ja5gg5ki3c4hqhii4rsnyk2fh0qqcyi3wpchvyhqisqk"; libraryHaskellDepends = [ base lens mmorph mtl profunctors semigroupoids transformers ]; @@ -72503,19 +77398,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glazier_0_11_0_0" = callPackage + "glazier_0_11_0_1" = callPackage ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids , transformers }: mkDerivation { pname = "glazier"; - version = "0.11.0.0"; - sha256 = "8ef0c04025f7d6942eeee13f9f376ed8019e38b6cd48e1eaffff5f5cd789c0ff"; + version = "0.11.0.1"; + sha256 = "0ihbnrbpizjdsqbryqgxl1gwg3343ip9yc9vzhchn523g4f06l8i"; libraryHaskellDepends = [ base lens mmorph mtl semigroupoids transformers ]; homepage = "https://github.com/louispan/glazier#readme"; - description = "Composable widgets framework"; + description = "Composable widgets framework with enhanced with transformers and lens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -72527,7 +77422,7 @@ self: { mkDerivation { pname = "glazier-pipes"; version = "0.1.4.0"; - sha256 = "351c8002e893ad8cbb6a8eeb2b54c79b3b13665f110180a52d297f85d0a086cc"; + sha256 = "1k46l388azr95njq008ibxk16fwvqxa2pswfdaxqrbckx018071m"; libraryHaskellDepends = [ base glazier lens mmorph mtl pipes pipes-concurrency pipes-misc stm stm-extras transformers @@ -72537,6 +77432,89 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glazier-pipes_0_1_5_1" = callPackage + ({ mkDerivation, base, glazier, mmorph, pipes, stm, stm-extras + , transformers + }: + mkDerivation { + pname = "glazier-pipes"; + version = "0.1.5.1"; + sha256 = "1b6iyjxzk0mnl1vh3772nddpi2haafc74i6n17da0hc69m5087cx"; + libraryHaskellDepends = [ + base glazier mmorph pipes stm stm-extras transformers + ]; + homepage = "https://github.com/louispan/glazier-pipes#readme"; + description = "A threaded rendering framework using glaizer and pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-react" = callPackage + ({ mkDerivation, base, containers, deepseq, disposable, dlist, free + , ghcjs-base-stub, glazier, javascript-extras, lens, mmorph, mtl + , pipes-concurrency, profunctors, semigroupoids, stm, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "glazier-react"; + version = "0.6.0.0"; + sha256 = "06myq4g4g4n61l601848irqjribrlq3f4wa9cqkzl19wbfsxbdsp"; + libraryHaskellDepends = [ + base containers deepseq disposable dlist free ghcjs-base-stub + glazier javascript-extras lens mmorph mtl pipes-concurrency + profunctors semigroupoids stm text transformers + unordered-containers + ]; + homepage = "https://github.com/louispan/glazier-react#readme"; + description = "ReactJS binding using Glazier and Pipes.Fluid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-react-examples" = callPackage + ({ mkDerivation, base, containers, disposable, dlist, free + , ghcjs-base-stub, glazier, glazier-react, glazier-react-widget + , javascript-extras, lens, mmorph, mtl, pipes, pipes-concurrency + , pipes-misc, stm, text, transformers, unordered-containers + }: + mkDerivation { + pname = "glazier-react-examples"; + version = "0.6.0.0"; + sha256 = "1a1abb24kfnfqvgrxs8hfpxgfyhiqwc13pgdpsq6rk0c1ys9vhzm"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers disposable dlist free ghcjs-base-stub glazier + glazier-react glazier-react-widget javascript-extras lens mmorph + mtl pipes pipes-concurrency pipes-misc stm text transformers + unordered-containers + ]; + homepage = "https://github.com/louispan/glazier-react#readme"; + description = "Examples of using glazier-react"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-react-widget" = callPackage + ({ mkDerivation, base, containers, disposable, dlist, free + , ghcjs-base-stub, glazier, glazier-react, javascript-extras, lens + , mmorph, mtl, pipes-concurrency, stm, transformers + }: + mkDerivation { + pname = "glazier-react-widget"; + version = "0.6.0.0"; + sha256 = "1b7ywbyv2maqk8fdxx7g847gh5i25rsxyjy458ysy9gydswngrla"; + libraryHaskellDepends = [ + base containers disposable dlist free ghcjs-base-stub glazier + glazier-react javascript-extras lens mmorph mtl pipes-concurrency + stm transformers + ]; + homepage = "https://github.com/louispan/glazier-react-widget#readme"; + description = "Generic widget library using glazier-react"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gli" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , friendly-time, http-client, http-client-tls, http-conduit @@ -72545,9 +77523,9 @@ self: { mkDerivation { pname = "gli"; version = "0.0.1.1"; - sha256 = "0f328a32ec9d700fc89d4e517917f5d47053ff822ad3eb29129100cc43f6943b"; + sha256 = "0fwlyr1wq04i28lyplrahbzm6w6lylbpjlafkp40yw4xxhr8lchg"; revision = "1"; - editedCabalFile = "209b399769c48d612e034f597367705b1cea6a3eccabaf35213af7429e1d273f"; + editedCabalFile = "0gr73ng45xrs44sszayc7rmfl72vf1kp6nag0cp633f4d6bkk6r0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72570,7 +77548,7 @@ self: { mkDerivation { pname = "glib"; version = "0.13.4.1"; - sha256 = "f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630"; + sha256 = "0c16wddkq3ysbcgdngli7g2b680niavwi45km3551k4l83nh4wpm"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -72587,8 +77565,8 @@ self: { }: mkDerivation { pname = "glicko"; - version = "0.1.1.0"; - sha256 = "740b5850982ea36f750c137930bf6e070b365618a547a520fcdab34fd4f913e9"; + version = "0.1.1.1"; + sha256 = "1hsa50qanq44kxnayd4g5winbqk4lqccsd05hksnxqi2ql9aj3pi"; libraryHaskellDepends = [ base containers data-default deepseq lens parallel statistics ]; @@ -72603,7 +77581,7 @@ self: { mkDerivation { pname = "glider-nlp"; version = "0.4"; - sha256 = "84b8d06e47dcbfba91bcbfe22caee05e9e1db034a03ebde4d4d6054fb30d5588"; + sha256 = "122m1nrly1fnskjbsgm06jq1v7jyw2p2rqmzpj8vmgyw8xpd1f44"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base Cabal containers hspec text ]; homepage = "https://github.com/klangner/glider-nlp"; @@ -72617,7 +77595,7 @@ self: { mkDerivation { pname = "glintcollider"; version = "0.0.2"; - sha256 = "51125933afe1acd62a5577c168ed418ca5bdfea584509ed2d688dddd9900fdf5"; + sha256 = "1xgx02cxvpc8sv99wl44lpzbv9cc87nnihbpalmddb71mwrmj4ji"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ppm split ]; @@ -72627,24 +77605,25 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring - , bytestring, Cabal, config-value, containers, directory, filepath - , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core - , kan-extensions, lens, network, process, regex-tdfa, socks, split - , stm, text, time, transformers, unix, unordered-containers, vector - , vty + , bytestring, Cabal, config-schema, config-value, containers + , 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.20.2.1"; - sha256 = "95b148b68701f7a1f521e0884ab405fe61bbb5a4a1a47d399e536cad1a400110"; + version = "2.23"; + sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - async attoparsec base base64-bytestring bytestring config-value - containers directory filepath gitrev hashable hookup HsOpenSSL - irc-core kan-extensions lens network process regex-tdfa socks split - stm text time transformers unix unordered-containers vector vty + async attoparsec base base64-bytestring bytestring config-schema + 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 ]; @@ -72661,7 +77640,7 @@ self: { mkDerivation { pname = "gll"; version = "0.4.0.3"; - sha256 = "9be9e20690fa8e54e6068eaa89c676a704438efa40c2ccfd8e7d8f9a7b5d418f"; + sha256 = "13s1bmxrm3vxivywrhj0za746157fv38kalf0vk593psj03f5scv"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; @@ -72677,7 +77656,7 @@ self: { mkDerivation { pname = "glob-posix"; version = "0.1.0.1"; - sha256 = "3245382c77ebaceea958ef62510d073b96e10a43bf69536cf9079d69da363caf"; + sha256 = "1brw6vd6k787z5n56sdz8c5f35iv0w6m2qpgb2lyxb7bfwn3hi9j"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory filepath tasty tasty-expected-failure tasty-hunit @@ -72698,7 +77677,7 @@ self: { mkDerivation { pname = "global"; version = "0.2.1.0"; - sha256 = "2890cbcc2bbd64570998e43f4e60f23f462c80993ab61a02c9dd270ba0c6a901"; + sha256 = "00d9qsh0n9yxr411mdisk602qiizy9h4wgz4k04mfr5x5g6cp418"; libraryHaskellDepends = [ base haskell-src-exts haskell-src-exts-qq loch-th SafeSemaphore stm syntax-trees-fork-bairyn tagged template-haskell @@ -72717,7 +77696,7 @@ self: { mkDerivation { pname = "global-config"; version = "0.3.1"; - sha256 = "0aff4ba14b837e8c2eba87e75c1ce60b20a8a088bce0003a12a5ff0c6429e8e6"; + sha256 = "1rp855j0rzx528x01q5wi2hah80bwqf5rrw7p8p8qzl39fhlpzqa"; libraryHaskellDepends = [ base data-default global-variables transformers ]; @@ -72736,7 +77715,7 @@ self: { mkDerivation { pname = "global-lock"; version = "0.1"; - sha256 = "b76b112d9976e8f438313b2768b5552e2f22d2a108f4fcaa029971f354fa5a2c"; + sha256 = "0b2sz9ag6wcr0amgrx08l7924brfansnh9rv64wg9s3nk4ni2sxp"; libraryHaskellDepends = [ base ]; description = "A global lock implemented without unsafePerformIO"; license = stdenv.lib.licenses.bsd3; @@ -72747,7 +77726,7 @@ self: { mkDerivation { pname = "global-variables"; version = "1.0.1.1"; - sha256 = "f7ef3f7f9aa26f4f13590785939c321d3a4c33ec9fc35ca2c724846fb081703b"; + sha256 = "0fvhh6q6z114qyi5rhwzxhrlqfhx6af97187b49lyvx2k9zkzvzp"; libraryHaskellDepends = [ base containers stm ]; description = "Namespaced, global, and top-level mutable variables without unsafePerformIO"; license = stdenv.lib.licenses.bsd3; @@ -72761,7 +77740,7 @@ self: { mkDerivation { pname = "glome-hs"; version = "0.61"; - sha256 = "486fb6ca0bd4e348e047b96bd523f3737b0a1467010230deec69800277273219"; + sha256 = "069j4xvh5039xkg300h1cwa0lyvkycixasxr8zh4iqyl1g5bcvs8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72786,7 +77765,7 @@ self: { mkDerivation { pname = "gloss"; version = "1.9.2.1"; - sha256 = "142075276d59889cd86db181765c095b858f94ad643b62f60bc2104ec52167ba"; + sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -72803,7 +77782,7 @@ self: { mkDerivation { pname = "gloss"; version = "1.10.2.5"; - sha256 = "e5c7c345892829f72966b5ade73b98702fe3a0c325e27c7b92e24c1a5ddc42c5"; + sha256 = "1ia2vifilk72j9xprqi5qfhf6bvhk0xygbdmcqlzfa98i52w7iz5"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -72812,14 +77791,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_11_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.11.1.1"; + sha256 = "0lyns4jzh4najgbavlhalix6br1dc0smqrakj46ls30jp909bq0l"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + homepage = "http://gloss.ouroborus.net"; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { pname = "gloss-accelerate"; - version = "1.9.0.0"; - sha256 = "3bf746a687ed23fbb19d6ac358cad52dfeb06301315ac4e69d221c6a5139798f"; - revision = "1"; - editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff"; + version = "2.0.0.0"; + sha256 = "1hfiy2j7850yisbakz5nadr6l9k5maqq5mvg1xhak9jj1k1ji9if"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -72830,12 +77824,13 @@ self: { ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.10.2.3"; - sha256 = "8874065cdd7184ebf0fea50543ad31de6bca8f9d264e018f9d8a458e8bdbc675"; + version = "1.11.1.1"; + sha256 = "1wi3mrx8wzmsjz8al284rzgpsn9z77yw9l8p802hbld2hwf5d9z1"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-banana" = callPackage @@ -72843,9 +77838,9 @@ self: { mkDerivation { pname = "gloss-banana"; version = "0.1.0.4"; - sha256 = "43bead428a366f7b13b2c33dfcb7cf497d2beadcbafa51f6bf7d63e67c6ef77f"; + sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3"; revision = "1"; - editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a"; + editedCabalFile = "0nia67zywmxyvcnlk0a906dijh9h7m6w48330n9gs2mjkhkyqb13"; libraryHaskellDepends = [ base gloss reactive-banana ]; homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; @@ -72858,7 +77853,7 @@ self: { mkDerivation { pname = "gloss-devil"; version = "0.2"; - sha256 = "557fdd1f79cc3d46116f92dd992c7e2805ca6024d808795baad553f247f0fc9d"; + sha256 = "17gwy13z4lymm9dpj26q4ihcl198gqn9kpcjdw8lcgfcg4gxszsm"; libraryHaskellDepends = [ base bytestring gloss repa repa-devil ]; description = "Display images in Gloss using libdevil for decoding"; license = stdenv.lib.licenses.bsd3; @@ -72872,8 +77867,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.10.2.4"; - sha256 = "ef1adf43066757d82adc16b4bde4f19a73653b837112ca41713ad16e230cac62"; + version = "1.11.1.1"; + sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72883,6 +77878,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-game" = callPackage @@ -72890,7 +77886,7 @@ self: { mkDerivation { pname = "gloss-game"; version = "0.3.3.0"; - sha256 = "00a50dcb84a14f323dfadd1d51597a8f04cafe03648bb8922d66d3e400306906"; + sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980"; libraryHaskellDepends = [ base gloss gloss-juicy ]; homepage = "https://github.com/mchakravarty/gloss-game"; description = "Gloss wrapper that simplifies writing games"; @@ -72903,7 +77899,7 @@ self: { mkDerivation { pname = "gloss-juicy"; version = "0.2.2"; - sha256 = "fbbe471b65dbeb2e40f04f39c6498fde07d84d2122169c01528bb826a3423ef0"; + sha256 = "1w1y8aijdf4ba80rq5i2456xh1yyix4wcfagy102xsyvcldlggpv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72923,26 +77919,27 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.10.2.4"; - sha256 = "f9875344822a1bbb4b937605e1b1483b25559c186db94033c97117f6148cdef5"; + version = "1.11.1.1"; + sha256 = "0ikwg3ckq82qysbc3jisvxylcq13x7cnwyci6gi6dys64vmrfy17"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-raster-accelerate" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, base, gloss + ({ mkDerivation, accelerate, base, colour-accelerate, gloss , gloss-accelerate }: mkDerivation { pname = "gloss-raster-accelerate"; - version = "1.9.0.0"; - sha256 = "288e1937da8a28e947bafd55624bffb469c84ef031b23b895589deac205ef24d"; + version = "2.0.0.0"; + sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; libraryHaskellDepends = [ - accelerate accelerate-cuda base gloss gloss-accelerate + accelerate base colour-accelerate gloss gloss-accelerate ]; description = "Parallel rendering of raster images using Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -72954,7 +77951,7 @@ self: { mkDerivation { pname = "gloss-rendering"; version = "1.10.3.5"; - sha256 = "00c68518b2eb62f086257238034a18065faa7939369a5b2986c2f461e6a80d73"; + sha256 = "0wqdm3k63x62hqlmp6in75wslpq631506f3j4n3g0qpbn8c8bih0"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; @@ -72962,12 +77959,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_11_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.11.1.1"; + sha256 = "1x2a8w49ik4w03wzf31icqbpr7fds9a1c7w263xwpm1445nrl2hz"; + libraryHaskellDepends = [ + base bmp bytestring containers GLUT OpenGL + ]; + description = "Gloss picture data types and rendering functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-sodium" = callPackage ({ mkDerivation, base, gloss, sodium }: mkDerivation { pname = "gloss-sodium"; version = "0.1.0.0"; - sha256 = "eaa725c9ddafd54386ea2f4875376d1990b45b879c3dd0801409d81bd6c7f279"; + sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za"; libraryHaskellDepends = [ base gloss sodium ]; homepage = "https://github.com/Twey/gloss-sodium"; description = "A Sodium interface to the Gloss drawing package"; @@ -72981,7 +77992,7 @@ self: { mkDerivation { pname = "glpk-hs"; version = "0.5"; - sha256 = "a36ed027a55343864388f6c301279a2fb3ec06e7929f369e386120db7d2c99e9"; + sha256 = "1scr5iyxn83172g3d7wjww3frcrgk8kh3hzni11qchskllkx0vm3"; libraryHaskellDepends = [ array base containers deepseq gasp mtl ]; librarySystemDepends = [ glpk ]; description = "Comprehensive GLPK linear programming bindings"; @@ -72997,7 +78008,7 @@ self: { mkDerivation { pname = "glue"; version = "0.2.0"; - sha256 = "784692e29ea1f5effe4ca98732431b77b2595baa5220394c1561b803e4309b2a"; + sha256 = "0alv63j07f312m63j82jm9dmkckp3d1k51x99kzfzxd1kvi94ikq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73025,8 +78036,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.4.9"; - sha256 = "4c83dc5503aab468fa198433d0601eed88f55f366adde9bd329730bb4ecd9d95"; + version = "0.5"; + sha256 = "0wza8cmschfh6kk21wm2bz12ly3in7kf0cv6jma0a78fiphdwg2q"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -73049,8 +78060,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.4.9"; - sha256 = "56c4a2782f74ee90aec320e2b393bae098ff7d0786bd5cf143260446ba23bd0c"; + version = "0.5"; + sha256 = "0x89h04j8z58nd1cx6rxn0hgjgb24kdzgl21m2xrlj7h1fp9fwfi"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -73073,8 +78084,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.4.9"; - sha256 = "373c5792acba3ebc4f032a8e718681b89e0f3807c7e5c6563fa28cdf0e42203f"; + version = "0.5"; + sha256 = "0ckbmjizfclpdyzrc85l9hh79yl82rmbkim5gq543qnppi1pn4h6"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -73096,8 +78107,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.4.9"; - sha256 = "2bea50121582b00107e452b48a6d70de47d8942461448efaec46cbf6739b977c"; + version = "0.5"; + sha256 = "10nw8bzxbcghyy9xyb69ka3a3w66fysczhhgrshy462ihpw8p8bw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73115,7 +78126,7 @@ self: { mkDerivation { pname = "gluturtle"; version = "0.0.58.1"; - sha256 = "178658ce4f76ac0a855ca9123cdc8bda0ecc5531356551c00ba6de98dcbd934b"; + sha256 = "0jwkppf9ipm61g052r9m65awq3nsigf3q4m9bj2hmb3n9z75i1hp"; libraryHaskellDepends = [ base convertible GLUT stm yjsvg yjtools ]; @@ -73131,7 +78142,7 @@ self: { mkDerivation { pname = "gmap"; version = "0.1"; - sha256 = "f974492f3d58cebf13e81f7d525a0535ad317eb4f0c2e4e405aadd6ee7079d4f"; + sha256 = "0kwx0zknxpda0pjf9hphniz33b9m0md54z8zx09vzkjq7lpljx7r"; libraryHaskellDepends = [ array AvlTree base COrdering QuickCheck random ]; @@ -73147,7 +78158,7 @@ self: { mkDerivation { pname = "gmndl"; version = "0.4.0.2"; - sha256 = "a8fe331eadf12cd74be57d5f31ff805996a782a4819296427cef612b89b02713"; + sha256 = "04r7n24jnqgggi19d4l1lj1ag5jrh3zk2pvxwm5xfb7imlg37zm8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73164,7 +78175,7 @@ self: { mkDerivation { pname = "gnome-desktop"; version = "1.0.0.0"; - sha256 = "0617c537bdc13fbc426d4f658ca18a71c1819798b699dd066bc353a22644fd46"; + sha256 = "0ipx8hka4ly3dc3dv6dnk2bq3hbiiahqqragdm1bqgy1plvwa5q6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73181,7 +78192,7 @@ self: { mkDerivation { pname = "gnome-keyring"; version = "0.3.1"; - sha256 = "880a62a69025a1b8ceae8eb896adf1e78cabfcd0a2fb4e8f8ddfe31e49f4ca21"; + sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8"; libraryHaskellDepends = [ base bytestring text time ]; librarySystemDepends = [ gnome_keyring ]; libraryPkgconfigDepends = [ gnome_keyring ]; @@ -73199,7 +78210,7 @@ self: { mkDerivation { pname = "gnomevfs"; version = "0.11.0"; - sha256 = "b74ef051b47371f74f31f69265a90c2a6f21b5218ca949761082b030138b8d3c"; + sha256 = "0g4dic9k1c4221v4kacc46sj2vra1jlnb4pn657zfwbkni8z0kmp"; libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; @@ -73220,8 +78231,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.2.4"; - sha256 = "0781dbaaece9a06a2ded982b193e6a5fed7a4a36f4e3ac031f89d710e97dfafd"; + version = "0.2.10"; + sha256 = "1x5libj6rwrf39m1ksz5gzqldd7xy07glgk47cvjlszs9l5cq5i2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73250,7 +78261,7 @@ self: { mkDerivation { pname = "gnuidn"; version = "0.2.2"; - sha256 = "61346b1f764cead5633bdc83f7dc9836b1627f484984094cdffa95dfd365b96f"; + sha256 = "0vxrcp9xz5gsvx60k12991zn5c9nk3fgg0yw7dixbsjcfqgnnd31"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ libidn ]; libraryPkgconfigDepends = [ libidn ]; @@ -73275,7 +78286,7 @@ self: { mkDerivation { pname = "gnuplot"; version = "0.5.4.1"; - sha256 = "fa54c95f5dad96e3af6a13429cf6852bffe97bd52bdd99bdce60ca9e78bee8f7"; + sha256 = "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73293,7 +78304,7 @@ self: { mkDerivation { pname = "gnutls"; version = "0.2"; - sha256 = "c0e6fddf92d48d1e6ab0d93af8104cc83d250eab7b3d369780ef72801aa8b7b0"; + sha256 = "1c5pm0d80wpgh2bkcgbvmc72agf89h8ghfnrn1m1x3fljbgzvrn0"; libraryHaskellDepends = [ base bytestring monads-tf transformers ]; librarySystemDepends = [ gnutls ]; libraryPkgconfigDepends = [ gnutls ]; @@ -73307,9 +78318,9 @@ self: { mkDerivation { pname = "goa"; version = "3.3"; - sha256 = "f3d73cd8ad48749890c42fddc154e30eeaa29f70bd6ab78da4a162e24584357c"; + sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk"; revision = "1"; - editedCabalFile = "5ae2bd1f4c29e22070fa32e5c126066813467ffe71a912148304d6f30d200137"; + editedCabalFile = "0dq1406z7mh4hca15abizrzlc4v80qkc3r9jz9q21qi99hgvvqjs"; libraryHaskellDepends = [ base directory filepath process ]; description = "GHCi bindings to lambdabot"; license = stdenv.lib.licenses.bsd3; @@ -73323,7 +78334,7 @@ self: { mkDerivation { pname = "goal-core"; version = "0.1"; - sha256 = "84b932f82d35eeb3908f5c0c63c7f801de0307439794a1f2049d26bf8e346686"; + sha256 = "11k66j7by9lx0kra354p8c3h7ph1z33n632wiy8b7vim5pw35fc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73341,7 +78352,7 @@ self: { mkDerivation { pname = "goal-geometry"; version = "0.1"; - sha256 = "e0bf529b38ea7fa1ed9405db3386bd5206cced8fcc33761cfcbb220d373edc74"; + sha256 = "0x6w7qvhs8mvzhf7ccyciznwq1jjpn337nq5jkns2zza72dm5gz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base goal-core hmatrix vector ]; @@ -73358,7 +78369,7 @@ self: { mkDerivation { pname = "goal-probability"; version = "0.1"; - sha256 = "d48a3518ef4de905dc0cf402dc1b658151e4394af5fc6cd23b39b3831915902d"; + sha256 = "0bch2lcq7crr7g96rz7m98wy8lc1cldxq0pl1kf0bsadxwc3b2nl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73379,7 +78390,7 @@ self: { mkDerivation { pname = "goal-simulation"; version = "0.1"; - sha256 = "5787cc79ee00478faa9e89ac39c04b8589834c1635f31ba184f70df349678201"; + sha256 = "00c2cx4z63gphjhipwrm2r6872c59g03kb49ksm8yiq0xrwwr1sp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73402,7 +78413,7 @@ self: { mkDerivation { pname = "goat"; version = "1.0.0"; - sha256 = "4f1329355c52d45ccc915001dae10e563402188cb3c486491cbd8c0c73046cef"; + sha256 = "1vvc0irhr35x3i4qdi5kihc04d2n1vhxl0ahj765rm2jbhsjj4sg"; libraryHaskellDepends = [ base bytestring cereal floating-bits safe split ]; @@ -73420,7 +78431,7 @@ self: { mkDerivation { pname = "goatee"; version = "0.3.1.2"; - sha256 = "a9a1332749575de3b300b83b1b5109916252cb2024a21f1b8b22597f0227e1d3"; + sha256 = "1lz14w17yn92icdiz8i4435m4qli158infxq02ry6pap94kk78d9"; libraryHaskellDepends = [ base containers mtl parsec template-haskell ]; @@ -73438,7 +78449,7 @@ self: { mkDerivation { pname = "goatee-gtk"; version = "0.3.1.1"; - sha256 = "f50b4234de6f16b33d11f367bc0eca1eb6bbc02c28f8ec75631790e0c36cf75d"; + sha256 = "0pgpdk1y140pcdsyry185k0bpdhyr87bqrzk24yv65kgvqs442zm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73453,12 +78464,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gochan" = callPackage + ({ mkDerivation, array, base, criterion, ghc-prim, hspec + , hspec-core, primitive, random, vector, vector-algorithms, weigh + }: + mkDerivation { + pname = "gochan"; + version = "0.0.2"; + sha256 = "1r8spv8ls1x032r0bcljc4qdhy671cv26dvglhjrgxamqgwy9izk"; + revision = "1"; + editedCabalFile = "19sl0lpj79wjb7qip48aghd689a9ybbarmvb2lihn26iwksnnwq5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base ghc-prim primitive random vector vector-algorithms + ]; + executableHaskellDepends = [ base criterion random weigh ]; + testHaskellDepends = [ base hspec hspec-core ]; + homepage = "http://github.com/cstrahan/gochan"; + description = "Go-style channels"; + license = stdenv.lib.licenses.mit; + }) {}; + "gofer-prelude" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "gofer-prelude"; version = "2.30.3"; - sha256 = "8e987b680ecb6dd76a325bd3ee0b0f09515eb5a479194a96b646c0ceb71b14f2"; + sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://code.haskell.org/~dons/code/gofer-prelude"; description = "The Gofer 2.30 standard prelude"; @@ -73477,7 +78510,7 @@ self: { mkDerivation { pname = "gogol"; version = "0.1.1"; - sha256 = "1dee6d069d6c239c8afa2240bdfc4e9674e9e648822617574732e4dc74834db2"; + sha256 = "1cjdhdsdrr1j8xbif9l293kfjx4n9vybsh12za59q8vckl36vvhx"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit conduit-extra cryptonite directory exceptions filepath gogol-core http-client @@ -73490,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 @@ -73500,8 +78533,8 @@ self: { }: mkDerivation { pname = "gogol"; - version = "0.2.0"; - sha256 = "5ccc62171ca67889d5e55263627c775b3242bdfa6489b509ae03ceb3d6886c8f"; + version = "0.3.0"; + sha256 = "0cb4kbdw8gyd8h0wkw8h55jabd7i1q523ki9ssjn19inb5pgjwv2"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit conduit-extra cryptonite directory exceptions filepath gogol-core http-client @@ -73520,19 +78553,19 @@ self: { mkDerivation { pname = "gogol-adexchange-buyer"; version = "0.1.1"; - sha256 = "d4c9ce149988ca4b2abce408785bfd43da80b55f125a6fc17b639fa4bb8c9a59"; + sha256 = "0ncsijxs97v3gg0nynhjbysq1nj3zmdph274phm4pjl8k4acxjfl"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; 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 = "3d873f33e21113ba0fb37d23596cdc12afcb5945996b11ad9f80c7b584c73cf4"; + version = "0.3.0"; + sha256 = "1hn2cn3p7jkqvpy0qq3hakcnrns4j2j961zg4xbb8z4mjjj3fgm8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; @@ -73545,19 +78578,19 @@ self: { mkDerivation { pname = "gogol-adexchange-seller"; version = "0.1.1"; - sha256 = "43b6f2037ef3cb44caf371f7639a7e024f27ee13f3d72c1497e0fe05d8c5920b"; + sha256 = "02wjqpc0bzp0jwa2rmzk2gp2fkq2gsd67xviyg549jzkgq1z5dj3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; 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 = "47de32da4902d6b04b97986bf30d604422946866f6150163f117584da79ef3be"; + version = "0.3.0"; + sha256 = "1r8pvad01qjdv040agfisnj0183la74p44hvppa0zzbjsybv5n99"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; @@ -73570,19 +78603,19 @@ self: { mkDerivation { pname = "gogol-admin-datatransfer"; version = "0.1.1"; - sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9"; + sha256 = "1a9p2n7n0mq4c8xiwqdfvkrgywq8yla0y34qqj27q5zd2rqn142c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; 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 = "50960b0cd3048d7a3b9860d97f2fd02affea4dd735bc28b4603b3656dba7ef2a"; + version = "0.3.0"; + sha256 = "1qjlhg4kgfy93rl2nzivvdhjpyaf4csm4nl097ny649dmxjjf1q9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; @@ -73595,19 +78628,19 @@ self: { mkDerivation { pname = "gogol-admin-directory"; version = "0.1.1"; - sha256 = "7898cdfac19619b73175762cce67d30baf9d1772524daf72b000e834a0cd6ef2"; + sha256 = "1wkfrnh39s00n1raykajf8brvbqbsdkwwb3nflqvf6cnq7xcv63q"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; 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 = "df04ced257650903e50ab444c50f4e4e29e33f37a6a54b4995d4e3c3cdb20772"; + version = "0.3.0"; + sha256 = "0pb3ymvx6hw46i1iwrvc4zv7mkmjwjk8w4q6h91jph7kv98kpmpk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; @@ -73620,19 +78653,19 @@ self: { mkDerivation { pname = "gogol-admin-emailmigration"; version = "0.1.1"; - sha256 = "61e9ccb239c95b1ff9da6d4fe9d6c234468a4c21e13b92f6bff65e9831a15990"; + sha256 = "142rl4qrhppnpzv94fz14568liilqbbfjkvdvbwiyny976rcrsb1"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; 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 = "b37267faa6cae7e9e911f0952acbaf558fc0626da4650299141e84f28f4b58d2"; + version = "0.3.0"; + sha256 = "1d7w4fv4v54mja7yx8rf29ms1hbjnkjgly54fqx5h4xyfgypymca"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; @@ -73645,31 +78678,44 @@ self: { mkDerivation { pname = "gogol-admin-reports"; version = "0.1.1"; - sha256 = "5621ea9daeb864dcd0c5bb576645bbf5b6726da2e9313cd6b2514c7e2e394ccd"; + sha256 = "1kac74p7wk2inbb3qcg9l9np5dpmpd2ncmxvqp8dqr5qmsfyl8an"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Reports SDK"; 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 { pname = "gogol-adsense"; version = "0.1.1"; - sha256 = "725fda77a7215af5828d7f97236b25faf4e1f2120aba1006ede26fcd4c6dd1bc"; + sha256 = "1g6idm6csvz2xl311fha2brf3x7s4mmj75vzin1gani1lxvxlpvj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; 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 = "96fd93139c8ba6746dc42df54a42a7288d8c874b4be973216cfb16b195a4db4c"; + version = "0.3.0"; + sha256 = "0dispksc95m3ig409f44fl57jz4lqnhljhk6y957d520sf1arv53"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; @@ -73682,19 +78728,19 @@ self: { mkDerivation { pname = "gogol-adsense-host"; version = "0.1.1"; - sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112"; + sha256 = "04l1ay8xd6m42s6gdny74yr6y1lg2xagkfqfh4cwmg5kyrykypih"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; 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 = "f52fc7f8b5e07bfd193a428476e7c255e9910505d151ef96848519c44e0c73b3"; + version = "0.3.0"; + sha256 = "1rvglzr4a2lilknrdjla0s47gdkp5n2z6kpwcl0gfgdr00fbrcrw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; @@ -73707,19 +78753,19 @@ self: { mkDerivation { pname = "gogol-affiliates"; version = "0.1.1"; - sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c"; + sha256 = "074s8rz6gky3sf7wqgkvba42l8rjkid5g1x31ycsrl7cc033c3dr"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; 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 = "83b7d65c19295f276e31fd798eff9a01268dea90419315304be7a6abced94387"; + version = "0.3.0"; + sha256 = "1h7kx1ra0vz8pgvcjvj5ip44h077s9q5m7ixplq5vzrr4wdbrvvf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; @@ -73732,19 +78778,19 @@ self: { mkDerivation { pname = "gogol-analytics"; version = "0.1.1"; - sha256 = "7a557b0fabb3697434ba97aeae564d2a428b19b701dced5176822c0a388d1922"; + sha256 = "08hrilw0lb42fr8yvp01nwcqnhia9mbaxblpp8s78sdkmc7pnmbs"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; 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 = "3854fc9b147867dcbdc5517fe2616936bf2dd2699f75463976113c031af429da"; + version = "0.3.0"; + sha256 = "0myggz1cxq88q3s1sbw5v5zhcmrybjkqj9zd0ap6x4sa7qrp7dys"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; @@ -73757,19 +78803,19 @@ self: { mkDerivation { pname = "gogol-android-enterprise"; version = "0.1.1"; - sha256 = "bc669a71e754e18c3c52099e6101cf882288c365e388cd5f4c208c576aaae124"; + sha256 = "0971m9m5g3109igwv273cp1qh8l8rw0n37h9a8y8rqalwxqrlrmw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; 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 = "e1761fcfaea7541e219180c6cbad01663b96c6340c58cf059361ea3daf45d5ea"; + version = "0.3.0"; + sha256 = "0lnliq42ykmizlr8g43ic99lzk5rc7j1l3dl81xbymw0dq0frbcm"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; @@ -73782,19 +78828,19 @@ self: { mkDerivation { pname = "gogol-android-publisher"; version = "0.1.1"; - sha256 = "0e199dffb26576d64183fd0aa40fc16f4cd2fd1e0ee3b7b083002784c03e1efc"; + sha256 = "1z0y7v0889q0hfqbgqqf3vyx4k3gq47s82pxhd0xcxk5nbzrs68f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; 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 = "c27db46fc5a29f077a79d6fac7af161e891d9931554aed4e3cfa5a18cc380da3"; + version = "0.3.0"; + sha256 = "1cf449zz6ahnqa71fqa25brj5h11xhbq4chw4hn2vczjwz8s6vrv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; @@ -73807,19 +78853,19 @@ self: { mkDerivation { pname = "gogol-appengine"; version = "0.1.1"; - sha256 = "cbf11c854ea9ba24012260cb0e78c3e09b918a05d5569f39633523852ecd9561"; + sha256 = "0qcmrlp8a8rmccwrymnm0n5936z0qdw0xjv0480j9fm99s2irwfb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; 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 = "f59ca638940b39c3b4f1a1a7c5d1951ff53ba0ba29d0b9cf8e4e816fa4d235e5"; + version = "0.3.0"; + sha256 = "131m4hqf84j4r2xjdbpsp95iww4sbxyw3lvn80pnddrzmvaj52hr"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; @@ -73832,19 +78878,19 @@ self: { mkDerivation { pname = "gogol-apps-activity"; version = "0.1.1"; - sha256 = "bb9c6aed68dc586ede859a2e71c48037c260fc6df2b1a4d4df22dfd411a0eb13"; + sha256 = "04zbl08x9pr2vzaa9cgjdpy61hiph3272blshpg6wn6wd3nnm75v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; 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 = "b5cb8d5a54165e3bcda3a27ce284bd93bc0b0792b344c6595079df6de4844988"; + version = "0.3.0"; + sha256 = "0ci85yml0sjjkwxcyfnb1xsw93zkvll0n6fb35kci1h07ywvl8d2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; @@ -73857,19 +78903,19 @@ self: { mkDerivation { pname = "gogol-apps-calendar"; version = "0.1.1"; - sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67"; + sha256 = "0rxw2v523n97nz60zss9qki47paaidglh9qy6lv98ya5fdazgsyb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; 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 = "1b1772c5c1084ffd1aef4f3c71afba297823362ef7c674cdf53cf86bfe4ffcae"; + version = "0.3.0"; + sha256 = "0gjill8hdkhp385i0ay6isb8rm6zcxh6ymdb7389wv6nhzpf5p3x"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; @@ -73882,19 +78928,19 @@ self: { mkDerivation { pname = "gogol-apps-licensing"; version = "0.1.1"; - sha256 = "dcc448bef918990ea339cdf1ac1cf46a5665254c7aab5e1a12d637c31f0c3bca"; + sha256 = "1jiv1hgw6dyn28d5xavs9hjnamkayhfarwfd76ihx68qz6z4ii6w"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; 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 = "1d568798f981d73a4114a58a195ceef17eba6166b07a15036d131c5d8ac46a86"; + version = "0.3.0"; + sha256 = "0l7yknlp4c2qh0a86q504a6h0gnb0s8jd4glii30qsnim52pijhp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; @@ -73907,19 +78953,19 @@ self: { mkDerivation { pname = "gogol-apps-reseller"; version = "0.1.1"; - sha256 = "70dd84674f162012bf0767fdd610bfd85cac9fb083112e38023a44eab6ceee7b"; + sha256 = "0yzfrsvfli1s08w2w4c3n2gsqp6qpw8ddzb70yzi480n9xkq9pbh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; 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 = "97cfd83d01034d0d4c6b8dbe6203da51d0f9c33e3690a38cc0688bdaa41ef60b"; + version = "0.3.0"; + sha256 = "119mlxr6yxmym9pgcmhix9m2s1s9i5zgh2pa3zzayk0jnqjjdpn4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; @@ -73932,19 +78978,19 @@ self: { mkDerivation { pname = "gogol-apps-tasks"; version = "0.1.1"; - sha256 = "dc68e8b33ec9f34b4b35af210c05fa5b70aadf0b6d7ee634eda5b1dbc5e9feda"; + sha256 = "1npyx72xpcd5xlsfczkd1ggslw2vz82hq8dg6m5lpwy97sryhs6w"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; 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 = "5090d963d887943fc3723396355f746bd84f05df294c04e3c4a1d01a8b84179d"; + version = "0.3.0"; + sha256 = "0mcnz2qiymjriqplypzl3gycn9cyc362a38962b4ci7g718wx74v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; @@ -73957,19 +79003,19 @@ self: { mkDerivation { pname = "gogol-appstate"; version = "0.1.1"; - sha256 = "489c7b6ff30176dbf470509864c1820186cd9c435daef45542dc2d95e429f6e5"; + sha256 = "1rgn57j9abfw89az9bjx8ffcv1h1hb0n962hf3sdnxh1ydppp728"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; 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 = "0fcf974036e78e6fb429702a2485ae7c7613b89380c26044e18ce5839658c4ae"; + version = "0.3.0"; + sha256 = "129f5gdiq5gbdi6dg6ddz1cq2m0jjp48q7vk5lkxrr82iig05jkw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; @@ -73982,19 +79028,19 @@ self: { mkDerivation { pname = "gogol-autoscaler"; version = "0.1.1"; - sha256 = "cb9f8bfdb42a3d8a019d006a54b0c94242c029831fc89c3b16cf89c9e0ab69b9"; + sha256 = "1fb9mghck2fg2qxrrj0zhclw0hj2r6q58sh0kl0qlg9ankyqp7yb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; 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 = "99ddf55dc78ecd3b4745259615016b677d0343b31d7c9adc9fbba1d1eb34779c"; + version = "0.3.0"; + sha256 = "0insf84wrnn98yqfm6scfmzjnxdj9hikz7wy0cg0vk25dpc2mhp0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; @@ -74007,19 +79053,19 @@ self: { mkDerivation { pname = "gogol-bigquery"; version = "0.1.1"; - sha256 = "0943370cc3d7932bb813156c17bef39e0cb4b7db73ccf4471e114ede297da2d3"; + sha256 = "1lx2gllxwkhi3r3z9k3kvfvv834yyfz1fv0m2fw2p4ypqc63fhq9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; 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 = "c3ce3a5677375f6ead59d90fa4589bf1d42ee0dc3ceeda25c0700551918e98be"; + version = "0.3.0"; + sha256 = "1zs497pxcpd87rhblg02bvi0wsqj16ym74v3kgm2mhwfw4spqv9z"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; @@ -74032,19 +79078,19 @@ self: { mkDerivation { pname = "gogol-billing"; version = "0.1.1"; - sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8"; + sha256 = "1s59i7rd77a782wsw6av3xssh7byzfhgq9js6izaihz6nxvki409"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; 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 = "52d867cda0d2acbd9fe4381379ab80a9821709b02ef358423d60dc83ba1bf3e9"; + version = "0.3.0"; + sha256 = "12scf28cj2rr0r4z1g0y4ik22gd3yh5sy2wdllydi05qv1cffqbf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; @@ -74057,19 +79103,19 @@ self: { mkDerivation { pname = "gogol-blogger"; version = "0.1.1"; - sha256 = "561dac9e87c7cf0930854e42ef9eb71ae3352a1267896dbee3c63cbcbadd326e"; + sha256 = "0vijvnxbqg66wfz6v2b728m3bqqsnygfyhjfhlq0kky7hygaq7an"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; 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 = "4a65b159bb5d7f55dee7bdcb7aa594c0f7de1014bbe01f8796ed06b400bb5f04"; + version = "0.3.0"; + sha256 = "08p1hjm29xsmvbb9dj7krr7i1wapn32g9wh283ia2zajys6zscl7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; @@ -74082,19 +79128,19 @@ self: { mkDerivation { pname = "gogol-books"; version = "0.1.1"; - sha256 = "0d6e9b1cecf375bc6503ece1582ffc55e151f182497ac5f6da7a1a8312356926"; + sha256 = "09k96l9866ksvbvcayj9hbqm3qamzhpmiqgc0djvqxgkxhf9nvhd"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; 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 = "bd0b528943aeb018809ba7309e5c3b45061b90101f695a050b9cae6ac876e30c"; + version = "0.3.0"; + sha256 = "08g2ah36fk3a6val2p1wczd9b3h7zqp1a4ka7nrn3f9m04say5hs"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; @@ -74107,19 +79153,19 @@ self: { mkDerivation { pname = "gogol-civicinfo"; version = "0.1.1"; - sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442"; + sha256 = "0hnlspkcb7zq9cb52pb3m89lwg3pawv8i8lx9y3c51ww474m9hsk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; 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 = "6c33f17eaf8eda636b54c6f6e863d73a3ebbd8edf9ed5b0c22cd548ff9f653c3"; + version = "0.3.0"; + sha256 = "0sgw2jgwki4nmyg9igavf8g2myxr8qnf4nif00jn236rg26pfr2d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; @@ -74132,19 +79178,19 @@ self: { mkDerivation { pname = "gogol-classroom"; version = "0.1.1"; - sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a"; + sha256 = "16knr6rf9j3w9cvs240kbmf031fqjjfdrahfw23dyr0qbmra2qby"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; 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 = "b7b101543bcb5e1316dc41d48bcb49f6b516cd38727e5bc052e44198c1f7b230"; + version = "0.3.0"; + sha256 = "1bij8szdrxlcfz8xl5472k8rfl10ffnq7hlq38za2pmm9jfhn2dn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; @@ -74157,19 +79203,19 @@ self: { mkDerivation { pname = "gogol-cloudmonitoring"; version = "0.1.1"; - sha256 = "da90cc22762d8d9b145f06ce2d4861c7b97004730f64a3f7c84b0b0b35c64daa"; + sha256 = "1ajdqqshn2sbr3vs6r0gfc271ff7c542vkh6bwa9p39dfqicr46s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; 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 = "e2567828a7e50ab4eaef10b82cfea1b97476dc44388cb5ba8b2ca56cf1530790"; + version = "0.3.0"; + sha256 = "01mfc8f6vl3n499p4f70inak68g83yxc5pci485sxgwvfx078glx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; @@ -74182,19 +79228,19 @@ self: { mkDerivation { pname = "gogol-cloudtrace"; version = "0.1.1"; - sha256 = "8977ed4b61beed09daab23f5f2d1ab5495de96963970164153640a4af2e9f095"; + sha256 = "15ghx7r4l2k4ad0icw1rjsbdx5almg8z5x93mgd0kvdyc55ysxw9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; 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 = "3799a1febfe93fce7040eda7e870c6d22bed46b9c23820f8bbbc2157fb65542b"; + version = "0.3.0"; + sha256 = "1r2whm4s5dwhg9davw9qpcabwhpasyfd7qkjw471xnpnwrq4vcb6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; @@ -74207,19 +79253,19 @@ self: { mkDerivation { pname = "gogol-compute"; version = "0.1.1"; - sha256 = "8b84d7cea48923e3df6221ec28ed6f62a31803036cae73449ee16680b6fa51aa"; + sha256 = "1ajizav80rp1kr277bkc0c1ii8v2dznjiv11cbgy68w9lk7dg14b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; 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 = "0264743c5b76e8c1c4c522f2d560de91618353594a45647c9b330db97b9adf62"; + version = "0.3.0"; + sha256 = "0v902dgjn0hzf42di0kr159p9scpnsha7wxap4fj933x5pv7c97s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; @@ -74232,19 +79278,19 @@ self: { mkDerivation { pname = "gogol-container"; version = "0.1.1"; - sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1"; + sha256 = "1c9337c8iq3vrzf17kcikr0n0h18hwazvrzn7v1a3wrqjcisl3lv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; 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 = "3db448086fc5cd9c2ba967096ebadb44497b00305285cb51a21fd92002f3bcbb"; + version = "0.3.0"; + sha256 = "1vxl3k48mdfn3rnlld5rmgkjv30pfvg9agz6k2v9pbci5i9kbl8i"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; @@ -74256,8 +79302,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-containerbuilder"; - version = "0.2.0"; - sha256 = "5566c8f5ffd62882234b98470e2affe5e0df720aca2b2e097519b7576ffbd1f7"; + version = "0.3.0"; + sha256 = "15k8d8b58hggfw5izdmzkl44jkaiv1l0gfx237ciwmjjvaw5fdfy"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; @@ -74275,9 +79321,9 @@ self: { mkDerivation { pname = "gogol-core"; version = "0.1.1"; - sha256 = "8f6c7dee658281c5d006c5ec4b475665544989c4d9141737e040857e15f3d483"; + sha256 = "10ylycapx1a0w0vif56rqj4ljm35ar3lpv650v8cb0c2cpp7sv4g"; revision = "1"; - editedCabalFile = "54bcd3f073a1f1d76726446c4efb96c8b573c3020ffbf6296313c9f6f76d1436"; + editedCabalFile = "0dhldpvzdj8kcclzdyqg0b1p7df8jvxlwv244rkxgwd1fgqd7g2l"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit dlist exceptions hashable http-api-data http-client @@ -74290,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 @@ -74299,8 +79345,8 @@ self: { }: mkDerivation { pname = "gogol-core"; - version = "0.2.0.1"; - sha256 = "62e65a36ec74bca9599741c27f0f9b7432b5db362e1670a6bff5c90468112f0e"; + version = "0.3.0"; + sha256 = "140chk0fb35zi7y0p908c7irwhqcgdw45iqpmrzzf2p238wlza7z"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit dlist exceptions hashable http-api-data http-client @@ -74319,19 +79365,19 @@ self: { mkDerivation { pname = "gogol-customsearch"; version = "0.1.1"; - sha256 = "f90d8c865d67c75dea23df6e073c63958ffba49326c72b18b5c0ad50b4c17879"; + sha256 = "0ybqq6s51bf0nlc2pir6jfjgp3wmccy0fvnz4gm5viv7bn38q3gr"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; 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 = "c96cdef0a652a7859bf5d8dbc8d6c3c05339d4be28d6f34454b337186af15e72"; + version = "0.3.0"; + sha256 = "075r7j4z9i1jbw6hznrq3ndb23yrp9xpqmwq64laqmh4mw3c47zj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; @@ -74344,19 +79390,20 @@ self: { mkDerivation { pname = "gogol-dataflow"; version = "0.1.1"; - sha256 = "b7903a479c90d03b778d868da6ae2e4a9603203a19dac3fc875195e99ef6b75c"; + sha256 = "0p5pysgfk5aihzyc7nhr78h075ja5spad3c6imvkpl4hki3km45p"; libraryHaskellDepends = [ base gogol-core ]; 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 = "45590531284533737405e6cfb7d4ee00c29c262a25926a86dcb0089f81bc12ff"; + version = "0.3.0"; + sha256 = "1cvzhvfipjpvprhgw2rdw9xsrkyka7cdfdk9716x4admly221qcx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; @@ -74369,19 +79416,19 @@ self: { mkDerivation { pname = "gogol-dataproc"; version = "0.1.1"; - sha256 = "39fae5e8e1b91b22f1548238cf7974b2c103ade75a8ac138cf203cf8dcde4b8b"; + sha256 = "12sbvvfghg10rwwc32jswynh7hdjfiwwyf42akqj46xrw7lfbyir"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; 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 = "7b79a0dee033c647982e6883ac0cc57475624a7a8ca86ec3a5bd44e073ea0533"; + version = "0.3.0"; + sha256 = "1b1s148xslz23ibcrx0gifim6kc5f3fsgfdnwh2n4bp0djvp8zy0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; @@ -74394,19 +79441,19 @@ self: { mkDerivation { pname = "gogol-datastore"; version = "0.1.1"; - sha256 = "bbf5137dc5f4a43c17b65f2320eb075b7a61e8e85f7ebaffbcffe929d8134175"; + sha256 = "0xa12gc2ksgzpkzvlzjzx3l62yjv0zmj08sznqbkr97lqmyi7xdv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; 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 = "5cd4a693a90ea2cae406aace00a441398071ae41f61b194562f37eaf4fec3857"; + version = "0.3.0"; + sha256 = "0wdxvslimfhfm0nw8qv88av14gxjpfif9rxxp3gv8png0qf1qs25"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; @@ -74419,19 +79466,19 @@ self: { mkDerivation { pname = "gogol-debugger"; version = "0.1.1"; - sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2"; + sha256 = "18mwpx20can2ppa0pjgyydajwcsmwqd870wrfvl4nsppaxfyrvai"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Debugger SDK"; 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 = "142b93f72a911e2f039d7b85e5a2b55c85fd631a3251f7089b78ee1496a882e2"; + version = "0.3.0"; + sha256 = "05qjl7lg62xc5y6yycn98yk6d0qpk60caafw7q9drrgrdz5k7s7v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Debugger SDK"; @@ -74444,19 +79491,19 @@ self: { mkDerivation { pname = "gogol-deploymentmanager"; version = "0.1.1"; - sha256 = "73da04a5597395624bf6dfb3d5c73775dab4e8ef857a282efa25f5eaa2439b03"; + sha256 = "00wv8fifmx95z8p2hyl5xzlb9nkm6z3xbcyzyr5n55bkb6jh9nkk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; 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 = "5dda38584d10a85f90aff0a1d8636c8f1e5b2e7a78a332b41352b1b2a565ac03"; + version = "0.3.0"; + sha256 = "01lc27xp2gry9fws5ysq46hld30fxh4lfr7p9lw4985ir82llb9s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; @@ -74469,19 +79516,19 @@ self: { mkDerivation { pname = "gogol-dfareporting"; version = "0.1.1"; - sha256 = "241afa2485a43ee29a93142fc931d8fa4b723389efa99a9c9b8e6f26f278d522"; + sha256 = "08nmg3r2cvwfkff9maggi4rp4jzsv0qwjbqljfdf4gm4hljgl6i4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; 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 = "9295a5968c696d814fd77f099fbf1fd2dd89357582ae2c2cf8ddeb5b40502c24"; + version = "0.3.0"; + sha256 = "0dhayxwi4pjbj73gxflgk1gp3dvjw4vb07ai9nq22flac1xl1si7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; @@ -74494,19 +79541,19 @@ self: { mkDerivation { pname = "gogol-discovery"; version = "0.1.1"; - sha256 = "5b8ed6b1ea962001f9b64584aa2334987d974b10073e3211f2f1a510f2dd1bfe"; + sha256 = "1zhvvpr119giy88k4gh7215rfzcq6hism125nvwh284nxaqxd3jv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; 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 = "556992c0da8ad27206211845ab46fbf7dffdad55a9c1ca4274da0df672a896c4"; + version = "0.3.0"; + sha256 = "1j2j3zxqq95cd50cdwsvyn633x61fwlghld8nhn1hy12g9l7xdf8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; @@ -74519,19 +79566,19 @@ self: { mkDerivation { pname = "gogol-dns"; version = "0.1.1"; - sha256 = "77448be65e876e0ab9c9bdc2db24a7847eda846a567ed9f9c63b844917d97136"; + sha256 = "0dkiv4blk11vqvwxjzjnda2dlzl4lwjdphmxr6whlvl7bvk8ni3p"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; 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 = "bf24d5a57f7d316a49b3b413ba4c9aa94a164a009f3911f86be19386b204be87"; + version = "0.3.0"; + sha256 = "18af36fx7w0ybcfiacfih7fyvri0rxlm4920yigmgsx551rgrm5l"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; @@ -74544,19 +79591,19 @@ self: { mkDerivation { pname = "gogol-doubleclick-bids"; version = "0.1.1"; - sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a"; + sha256 = "0any741rgz8qcsj7x0z04777wbpv863j3gk812c8kpw9qpn9ks50"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; 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 = "19f2d882820a756ddc7ad6d22b91ae1198e2ff53db2ad03c897e241a61c4b73c"; + version = "0.3.0"; + sha256 = "0gqlxdnxf2hqdaczvd0gi3ch3p23lk9mjd0xk03h6lhr8c2mx60c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; @@ -74569,19 +79616,19 @@ self: { mkDerivation { pname = "gogol-doubleclick-search"; version = "0.1.1"; - sha256 = "15a954b3e17f5592d787ada7997cca04d9249e0ccfd432c1e52ae1d83769af60"; + sha256 = "0q5gd4vxiq9awp0k5m6g1jg29n84r9y9k9xdhzbr4mbzw6rm9a8m"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; 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 = "8ecfa7547c2d08a2d8d39389c4a889bdc32eaf63ae4b80ec2b1be36f969887cb"; + version = "0.3.0"; + sha256 = "1wwsv0gbqcjd6xmz7pqjv9hyfg20hwwnxld46yjgiwsyadxrd54d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; @@ -74594,19 +79641,19 @@ self: { mkDerivation { pname = "gogol-drive"; version = "0.1.1"; - sha256 = "6e46b5ba960ef8481fdcaba84ef006169ff075d63fc6e4dc6cd84e0805e6d46c"; + sha256 = "0v6lwq2hhknqdkff9iizsrsz17qn0vq4xa5bvhgliy0fjsxbaikf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; 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 = "dc68e0331e441b6b9488fbc29b5864b9955dc3978c7092340870191a8f86cc6c"; + version = "0.3.0"; + sha256 = "1l353bwhkw1a3pv2ngjddgiilazq4qds3askkxxyajxzy5f19blz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; @@ -74618,8 +79665,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-dynamiclinks"; - version = "0.2.0"; - sha256 = "8ba21d6d26785e0c43493ba2a035cc3d5eb07f663dff57c166113580a8f1161e"; + version = "0.3.0"; + sha256 = "096rc42f6ajw7biys45zaz4wgwxyqh67js6ihj8aqi4w1b05j3zz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; @@ -74632,19 +79679,19 @@ self: { mkDerivation { pname = "gogol-firebase-rules"; version = "0.1.1"; - sha256 = "981f91ad921d35eb303fb3d9c6d77c7d507ee89bece51baa7d8b8c7951e25fc2"; + sha256 = "1hjzw98pk34bgnm1prgckgl7wl3xgkbwdndk7wqfnd8xjanr27wq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; 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 = "96ba97607341e89c5ca376f6ab77076b9caae896f91c219711ba9e97f2a8bd43"; + version = "0.3.0"; + sha256 = "0mrq1gp3s770lybwlzy126g8fx1kasqfh1qjd8lczga186972pqq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; @@ -74657,19 +79704,19 @@ self: { mkDerivation { pname = "gogol-fitness"; version = "0.1.1"; - sha256 = "0826b140ea187306c0d22fc444b98b060191d185ed125f89044d4c56eeec5601"; + sha256 = "00anxkp5ck2d0j4my4pdhp8r2086ifwl9i1gsb00cwqqx90b29h8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; 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 = "bf8f4136d3cec3e34057731ca02b1ad97e9a6bb15e72ed89a1eb072cca433d8c"; + version = "0.3.0"; + sha256 = "1awl1c1z4bcph8b6wgw34vyly7r6svs9h276h8h97z427006p1mv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; @@ -74682,19 +79729,19 @@ self: { mkDerivation { pname = "gogol-fonts"; version = "0.1.1"; - sha256 = "57f3e537cf035d7fe0355be1014f3df559caec6f736badfcb86e91a58b084167"; + sha256 = "0rs1125sb4bfp3yassvkdznclngm7m7h3qav6ph7yp83rwvybwsp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; 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 = "b4a7ae314ea71acaecb7a60463230d48213b5f4d41f6e82962064bab39309f06"; + version = "0.3.0"; + sha256 = "0p2ckncnrdgkjqp67l0mygqp80nkp7w3p7plhmraxw2wrjpy15mv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; @@ -74707,19 +79754,19 @@ self: { mkDerivation { pname = "gogol-freebasesearch"; version = "0.1.1"; - sha256 = "0bc23693f49976034cba11ad70a00a76625907856f02c4d9931f1d01cb51751c"; + sha256 = "073ma75h278zjgcw80kghl3mjqkn1ah71b8ip9606xlryj9kdhhb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; 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 = "b37d8631971615d6e04c1a3b46386336462b3bd63d3ea4e3ab9ba2130398c45f"; + version = "0.3.0"; + sha256 = "02m2cpf6jdvd2km3gjvhvhkq3cgy7ijy5abwkrpcwvjzl1hps2vc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; @@ -74732,19 +79779,19 @@ self: { mkDerivation { pname = "gogol-fusiontables"; version = "0.1.1"; - sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14"; + sha256 = "052agk6abqn70qyipn4xk4yhvjxczv94dw5cx2zy14yxi0gsp9fx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; 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 = "a8a9c0a90d7dea80b4f76047da04e107c45d4eb6a7ffff7ce418f0eaa79ca159"; + version = "0.3.0"; + sha256 = "0icaa7zdblgs180gww0w4ffffim9fzb4qbl1pwjyvxa6b7vhrks7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; @@ -74757,19 +79804,19 @@ self: { mkDerivation { pname = "gogol-games"; version = "0.1.1"; - sha256 = "1292b79718319d125e61ebf1a514c52f72d524c867fce7a8e04b40c98529e0ca"; + sha256 = "1jp0562wjh2bw2lfgz37r0jdawigqlaabwgbc5g1579i32bvg4hj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; 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 = "caab93ef1124477ee354bdaf9d9b193c48261cc0adba82d8aa712d4c7b6c7ff5"; + version = "0.3.0"; + sha256 = "0r0x1g8wkq6vn4hk655wkl8fpfjlqppb0w9gscz99qsvv1gm16dz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; @@ -74782,19 +79829,19 @@ self: { mkDerivation { pname = "gogol-games-configuration"; version = "0.1.1"; - sha256 = "3abec569eb661666b51ca5585b64adbef3990d8db5991516d6414d6c2068b35f"; + sha256 = "0pxkd0h6qka1sqb1b6dmil6rkwxymmj5nn553jsnc5k6xdlwbgis"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; 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 = "5df2b8b8610e31aeea29f67793377b310aaf16ecb8b18fd4e42a23750ae0c6a5"; + version = "0.3.0"; + sha256 = "04g2kiyzhnyczxl6648gzl14wfszxiihyajvc7428whp54b3b4yg"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; @@ -74807,19 +79854,19 @@ self: { mkDerivation { pname = "gogol-games-management"; version = "0.1.1"; - sha256 = "ebd148164e36e7d6f42066bce24055029044af1022c906c1f63f99af6dd25e78"; + sha256 = "0y2ys9nsz69zyv0hdj9222pl9402am0f5g3643sddrrn9qb4ilgb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; 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 = "dfe5b07bd33e2f7997c82e6ffbd01427ad02bbc2a225ac4629c480ce0d1f00c6"; + version = "0.3.0"; + sha256 = "192phwrhnsnanq3gf7ss3dsflvnkzf058r1jnb9vqf5035mckb4p"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; @@ -74832,19 +79879,19 @@ self: { mkDerivation { pname = "gogol-genomics"; version = "0.1.1"; - sha256 = "9adf145bd9534fac9b3a16d177099fc50ba0d914635817e16cd51dfaac578c80"; + sha256 = "104cayngl7fmdkhifn332kcs02y5kw4pgl8n7adsqkskv5di9pws"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; 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 = "10ef615601475e3baec18567b442fdca5a239f1caf67de66f5703cd00eee1b56"; + version = "0.3.0"; + sha256 = "0d9i4jlv09fc4ry6qsdypkmx3faj6i5m9c6xv3xys1d06v4mzxkf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; @@ -74857,19 +79904,19 @@ self: { mkDerivation { pname = "gogol-gmail"; version = "0.1.1"; - sha256 = "7459c4abfdbe582f3027fda96821cf0c2baa93cdc4c00a4c3303b0aedf7886f5"; + sha256 = "1xc6g3gsxc036d60mh64rn9slaqcrwhniagx4wq2yn5yznmw8nbl"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; 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 = "ab972260ba64d358dbb71200b438b042c5549e75a110f2cdcf15f5be332afaf5"; + version = "0.3.0"; + sha256 = "0h9z55bcdyp0as0jzv5wj89v71fz2n75pg8dhwg90iw1pp3rrg83"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; @@ -74882,19 +79929,19 @@ self: { mkDerivation { pname = "gogol-groups-migration"; version = "0.1.1"; - sha256 = "2670e78a424cac61d6fc948f4fa0d64bfd878878f0130263b74ac22737e385fd"; + sha256 = "1zc5wcvjghjanxih44zhg248gzabssh4z3wlzkb63b2c8a5ffw16"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; 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 = "933e7453e808e3878f38b0263bfd5b48b698284b370b951a99a6dd858bbeabe2"; + version = "0.3.0"; + sha256 = "0c676dk7x62bdv8nr8wsk1icd7v93060zjbzwzl2xi46q0j59dmk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; @@ -74907,19 +79954,19 @@ self: { mkDerivation { pname = "gogol-groups-settings"; version = "0.1.1"; - sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed"; + sha256 = "1vg1dkz0g5vx84blkyivw2fmhqpk5xx3y677xgjzns7rj7myzrf8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; 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 = "a9239bbb414bc01dc3639d6c808cbbfa681125fc6aa13708c6f6d9c8f24e7ee6"; + version = "0.3.0"; + sha256 = "1xy466x9xcbi7scf7fpnc5cy47hgsmdcg17hqzys4bp86sdc6738"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; @@ -74931,8 +79978,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-iam"; - version = "0.2.0"; - sha256 = "c793665c0cf11fbf609cbc22399b84dd060411524210544ec848eb73f2136f58"; + version = "0.3.0"; + sha256 = "1fn8jx5hq4dxh2i1xf4cbmbsbjwxcplxxh7har1ai4z9ya1zghxs"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity and Access Management (IAM) SDK"; @@ -74945,19 +79992,19 @@ self: { mkDerivation { pname = "gogol-identity-toolkit"; version = "0.1.1"; - sha256 = "25e5c7eba65629c70297c05327cd9321bef58ec3ad5b58559b0064fc8de7915b"; + sha256 = "0nwiwy6zqr00kdamhnxdqf7gbgi1jg6jfly0jw1cfaanlvmwgr95"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; 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 = "835f936b942a60c3d4290cdbb66d7f8ea36697c8a8192ea7b4613ccc194cbc94"; + version = "0.3.0"; + sha256 = "1mdkzd5gb8nlaf5nj04fsl97ghyzpkmr4w93pcd5vsr8yxy3lkwz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; @@ -74970,19 +80017,19 @@ self: { mkDerivation { pname = "gogol-kgsearch"; version = "0.1.1"; - sha256 = "851191e764c93914fcda810cd103a4fbaca3b45c6a47c2a1d699198a81d5f337"; + sha256 = "0dzksn0ql6crsshw4ivabjsa7b7vlh1x2341vby18ff9ckkr24c5"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Knowledge Graph Search SDK"; 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 = "e693a96569b16252ca14a7d684e51652b58d691456ab008b74c4276c29cf1a22"; + version = "0.3.0"; + sha256 = "0kldw64ff2p8h8mfdfbplxfk3jinxc8ibr33wa1qzpfzixb72v2n"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Knowledge Graph Search SDK"; @@ -74994,8 +80041,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-language"; - version = "0.2.0"; - sha256 = "88233a59c4f1f6319be39332a231aa823a262580b442f875e8e358698dc18fcf"; + version = "0.3.0"; + sha256 = "0ny2d5bv9dxn1w8rwzv5m7lr5g8akrxqvfhs15bwk87fxdainz5j"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Natural Language SDK"; @@ -75008,19 +80055,19 @@ self: { mkDerivation { pname = "gogol-latencytest"; version = "0.1.1"; - sha256 = "90caade46451279a4645a71dba459c807d35ded423413e2e2f45078a538ef3cd"; + sha256 = "1kgkir9ql1s55wp3wh93skg3azc0ki2vl7d78m39l9sickjavjlh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; 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 = "8ae96a0d45874f2bd8733d2e7194ba875e09bf081a6425ff943e6ffff367d894"; + version = "0.3.0"; + sha256 = "1gdllvcp6s7rf4093xl2fxq3bvqkrysnrs2s4abyppq54p4s6afk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; @@ -75033,19 +80080,19 @@ self: { mkDerivation { pname = "gogol-logging"; version = "0.1.1"; - sha256 = "2320ad07e231bdbdcb0e39f702917224e29999041266e9b3a4a67b5ee0854456"; + sha256 = "0mj4hph5wyx6ljryjrhj0jcrkqi4fa8h5xrr1v5vvg9iw83ss813"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Logging SDK"; 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 = "cd2d8c6d2f72f27fd8ac911ebbdcb8acfad84597036a5cf81f5857cd6985dfad"; + version = "0.3.0"; + sha256 = "1i5q2qqr041qxn458a6300z07idbz17srix9kr2sm3mxbvc5h04g"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Logging SDK"; @@ -75057,8 +80104,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-manufacturers"; - version = "0.2.0"; - sha256 = "7d7001d2593365a23ab809a815934e3cf2327f1a40d5597a2fc012bd87df0f36"; + version = "0.3.0"; + sha256 = "0211aq7gjmpkhvcqf7fyrwrhdfsn8k5g1qw9gjsisxq0m873i6w0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Manufacturer Center SDK"; @@ -75071,19 +80118,19 @@ self: { mkDerivation { pname = "gogol-maps-coordinate"; version = "0.1.1"; - sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89"; + sha256 = "12cbbvgmfz4zd942byzlzy2pk71z2l4sl94p55z36hg7c8014q2v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; 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 = "414b03bd9c3679df9c923dd71aa9ecf35fe29c7e17f33630583a2e4e563f30b4"; + version = "0.3.0"; + sha256 = "1ajgf2g9yad6zwhap8b0qigf0nfsw5k3132ksnzkcrfflz74swvn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; @@ -75096,19 +80143,19 @@ self: { mkDerivation { pname = "gogol-maps-engine"; version = "0.1.1"; - sha256 = "fb267eb453a2d915629882f448f28488c6d60ccbd8a64071723e5da566616ef4"; + sha256 = "1x3fc5kaap9yf9ql19nqrc6ddil8hkr4ix42k1i1bnd2afs7w9pv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; 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 = "aafe4135dcaf7329f86fe80f73b419619765e8ea30db249a912db62c9f0bfb1f"; + version = "0.3.0"; + sha256 = "15a6z7kxvad3ylr1pkwqlimzbwsk0p8qblfnwgnjbl3mr681xdvv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; @@ -75121,19 +80168,19 @@ self: { mkDerivation { pname = "gogol-mirror"; version = "0.1.1"; - sha256 = "0fb991b8d71f238d3706d7d944271a291aa41172f3a6730fbd2e411128f44eed"; + sha256 = "1vafyhl12h9fpl7p79pkf88s86i938kl9nfp0qvqs8qzsyw93f8g"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; 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 = "0c60337f67257069096fc1187a48569a3b370d705f80b40c3c7dfcc0f701408b"; + version = "0.3.0"; + sha256 = "0ckh2bkjd8c7ybc2yc295wgn0z9kmp471kfkxkjl3swb9dab3fhm"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; @@ -75145,8 +80192,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-ml"; - version = "0.2.0"; - sha256 = "88202ed828ba87713a522423c2b29add4f7f9fcb9de52101bd5deabd5a2ab44c"; + version = "0.3.0"; + sha256 = "1qkk8v0yhdyphi5r18x4wawvhn0vwsfbz0gjvrf5mr0sdd80qhav"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; @@ -75159,19 +80206,19 @@ self: { mkDerivation { pname = "gogol-monitoring"; version = "0.1.1"; - sha256 = "906a513ac17c82c932b50045ca61bf91625d88a8cc962a4d9b0831a218ca3e61"; + sha256 = "0q9yr8ca4c88kd6jm5ncm245sqlipxhwli80nlrck0kwq4x52slh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Monitoring SDK"; 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 = "e0f505881e97c1fa3d85e8eb12a827928ad8c253c6689ba436ab6fa2886cbf21"; + version = "0.3.0"; + sha256 = "03jslg15crnngarylydybb48vwq338hsb260mk4riahkg78kd7ga"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Monitoring SDK"; @@ -75184,19 +80231,19 @@ self: { mkDerivation { pname = "gogol-oauth2"; version = "0.1.1"; - sha256 = "d2c60dc2976a6d32f980d67d60e54735ac45e265c73956d7b32fa29918c10207"; + sha256 = "01q2q4c9k8igngbmcff7cpi4bb1m8zjn0zfnh3wk4vbajz10vinj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; 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 = "7bd97bebf58e0aac97e84f86bad65d077bec7f8ead67b2b0518e9d0173284a8f"; + version = "0.3.0"; + sha256 = "0fdjq6kvh04csi29g4nagmji5vqprvwra2gas42n79rq2qhxfx5n"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; @@ -75209,19 +80256,19 @@ self: { mkDerivation { pname = "gogol-pagespeed"; version = "0.1.1"; - sha256 = "a2071deb9101e80f6ffdf6d1945d21df433a256f666e7e0a8e3f1642817c2dd1"; + sha256 = "1l9dgj0l45iziq57wvk6dwjklhyz45fr9lgnzmphzs01j7mis1x2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; 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 = "e5033e168843a2c821d22cf94a8e5402b0908335bdef6baa626a8fe27857dc10"; + version = "0.3.0"; + sha256 = "1k6n60w4z77fyy5bnsab8bdgr490zfb753m3ljsc7vxwqqfiqhrx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; @@ -75234,19 +80281,19 @@ self: { mkDerivation { pname = "gogol-partners"; version = "0.1.1"; - sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc"; + sha256 = "1g6890q7gl6yyl10jqr694j4ha4v80aiapkmbz1h0zma91kkb4m2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; 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 = "3bce3a43fc727b78b0d90d566a6769ff704eb4764948d0d2c328d95d5c24722c"; + version = "0.3.0"; + sha256 = "0xhhmsplvfmsi860skrgpzzz3lixa0qcx73w9cv6da679fh0ddfv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; @@ -75259,19 +80306,19 @@ self: { mkDerivation { pname = "gogol-people"; version = "0.1.1"; - sha256 = "adbb0f4b9df631ddca20f269f7a3518aeefbaab8b0ae51e0568a4e1d0e5abc76"; + sha256 = "0xmwb871sklaavh53bmhp2mgpvlaa6izfsgj435dscgnkm5hzfxd"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; 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 = "18b1c3d8b916acd8e53c618c00f7e6f06dd310840a7a2f242f271635409bd9bb"; + version = "0.3.0"; + sha256 = "0j2frq599kjrv0wl9bpmpglw51wcjid2ysmm50hhlpbv78z55sfv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; @@ -75284,19 +80331,19 @@ self: { mkDerivation { pname = "gogol-play-moviespartner"; version = "0.1.1"; - sha256 = "d674196adb4deb01578cb93290953c8d8fb88a741937f8f5a53ebc57e8552623"; + sha256 = "08r6apl5gg1ylpszhdqrfj5bi3wd7jar0cmriibh3ssdvdm1jx6n"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; 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 = "397206cf5681131cdd97191b9b98151c468923c6df6df73d8391e600036d8b44"; + version = "0.3.0"; + sha256 = "0v1cs21y94m4ma414nann6k1mc0jfdyj5ariy9bm6hyqbd3c60zc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; @@ -75309,19 +80356,19 @@ self: { mkDerivation { pname = "gogol-plus"; version = "0.1.1"; - sha256 = "a8f2751e8b1c2b55481592b7644672972f3d983fc2c7d3ede9ac696e9c3626d1"; + sha256 = "1l966sf6wsdcx7nx7iy27yc3sbwpf9369dwj2m45aaqwicg7bwm8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; 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 = "32f64fd22d7a2290fe7ef29edf2a982cfe2c76fb9817d068733837bdca48d8da"; + version = "0.3.0"; + sha256 = "0qwswkjcv0i8m23y7dm9yrk343m3kdckg6srzi9q2jfip6h9hv8v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; @@ -75334,19 +80381,19 @@ self: { mkDerivation { pname = "gogol-plus-domains"; version = "0.1.1"; - sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea"; + sha256 = "1smg96g30sdadyhlkx06vbc7jqifj7grj8csc92874vrximv9kvw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; 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 = "c5497f9e0637a5e657cfbbf3003e4101de371b407e81e0df8a89db0979dc0a9b"; + version = "0.3.0"; + sha256 = "0d0aijvdl2z9prv6qs6qriw54d6z9ljpl2nc5zwwk3647s62kvvi"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; @@ -75359,19 +80406,19 @@ self: { mkDerivation { pname = "gogol-prediction"; version = "0.1.1"; - sha256 = "7317244d941417971e93b42bc6a4a87220bafdc943e3ab752890380875a37e58"; + sha256 = "0n3yldshhf4h51sspqs3r7yvl83jm2jccaxljcg9f5qlji6j85vk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; 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 = "91c34600473b3e09b0e6a0bcf151b4e7d5120a8d0ad7fd6a225cb9312f2e8ba7"; + version = "0.3.0"; + sha256 = "136jrwlwwygz4icl8c5c1bj1l7j9lypc5qxkygs6azc3x3l8ih6g"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; @@ -75384,19 +80431,19 @@ self: { mkDerivation { pname = "gogol-proximitybeacon"; version = "0.1.1"; - sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2"; + sha256 = "1cjgsmwrad8bi4vyxgfsfjbw3ks0dh805vrcig8f156jg0l7zvwn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; 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 = "5bff5ddbf059ca8fa55a19f9a892339ef50acb5e5864016cc5a6eae58def1456"; + version = "0.3.0"; + sha256 = "1f54km4v9mgil6p12vvziwv5v00d23l5rvk66yl4h614mh402m2v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; @@ -75409,19 +80456,19 @@ self: { mkDerivation { pname = "gogol-pubsub"; version = "0.1.1"; - sha256 = "ffc159c780ed332cc287ecc953501f405d77c9cb69074601b51f7e36b1d61d18"; + sha256 = "060xssqkczhznl0lc1v9rg4pfpa03x857jgchz12qczdh33mkhgz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; 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 = "643868bfe3e341d81c576e6a274676d5fda86ad542dc8a8021f82570a51a5ed3"; + version = "0.3.0"; + sha256 = "1c2qwqmq3bjfcd322kpyyxfdhsbyxq3r2v614v14dm0kr4cxqnik"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; @@ -75434,19 +80481,19 @@ self: { mkDerivation { pname = "gogol-qpxexpress"; version = "0.1.1"; - sha256 = "436863f8807d67f615ff615f3c7a3b38f50f1fbdb3ae9351391c4a559aca24be"; + sha256 = "1gi4rad5ajhw758r7bmkplghzx9q7dx3qpv1zwazcrvxh3w66s23"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; 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 = "a62fbb56b641032b33b55d26235df766db1e2cca27f307054fcd0e48d5bb7813"; + version = "0.3.0"; + sha256 = "10v82f2bkn4i0w8gq79skagksi13p5i3280cb50x206a8cy9j350"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; @@ -75459,19 +80506,19 @@ self: { mkDerivation { pname = "gogol-replicapool"; version = "0.1.1"; - sha256 = "e2a0a6a0da1ffc95eee4d233d85bbb6097466fc644ae73c7600477d2b2845b75"; + sha256 = "0xavhjrd4xq4c33p7bj4qrpld5v0pddxhcyjwkp9bz0zvahad872"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; 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 = "82331105facb5afe1d86fdaa1dfd8da0c17ea76b4b5af559e1fb8dfda8ddc245"; + version = "0.3.0"; + sha256 = "1kjkf7bykmz5wzndj7h0yzwfds56m34d0jvq7m1rkhp2qnn1v1jl"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; @@ -75484,19 +80531,19 @@ self: { mkDerivation { pname = "gogol-replicapool-updater"; version = "0.1.1"; - sha256 = "2cb4678f91f2c8eff2ebf9c84bcdef003abb3e1fcc120dc4d36879e676c71927"; + sha256 = "09qrqxvfcyb8sg20s4nc3wzbnfh0xz6lpj7rxgrfzj7jj67ngd1c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; 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 = "0d35642fdc7d5c319501bd091e1225b516249ef0f082290e8b1750c44c9037b8"; + version = "0.3.0"; + sha256 = "14gm5wfay5d079hn39fcjwxfsz8pd02cc60id7jsxxc4jbyxjq42"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; @@ -75509,19 +80556,19 @@ self: { mkDerivation { pname = "gogol-resourcemanager"; version = "0.1.1"; - sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577"; + sha256 = "0xw5c54s1p2dlww5102b7nir6iis938038hb5k9k25nia5xx64di"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; 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 = "32c1537b1a8238e8c91f67a6289fc07d72c596a4b0b3625306565465173f2445"; + version = "0.3.0"; + sha256 = "0n2j9liwx5zd2flzmrq2z2hahbbgw2wx53d6nqykvaf5g3vc6l6b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; @@ -75534,19 +80581,19 @@ self: { mkDerivation { pname = "gogol-resourceviews"; version = "0.1.1"; - sha256 = "76457816587d173633ae5e421617e384599f104079a7f5db3ce954174a59b823"; + sha256 = "08xqb551fm797kdzb9vr8089ync4wcbichjymqrkc5vxb0b7hibn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; 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 = "fb8024792a51e8c7a2d4a93edd3b2d4d8d6b03d826ffdadcbfb26cd4d07bc171"; + version = "0.3.0"; + sha256 = "114gjdxzm4kq3ibk32dzy73zvmp9ls9bzb4k7szdkxr922861akp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; @@ -75558,8 +80605,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-runtimeconfig"; - version = "0.2.0"; - sha256 = "d4b92f4929007d2da9741c46907137a30a8fb308f0defabe4b64b1c8af58a681"; + version = "0.3.0"; + sha256 = "004k1zy27gk98xh0h3c7ll3zxk2qif31znwnnyyxi30gmwlg19sj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; @@ -75571,8 +80618,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-safebrowsing"; - version = "0.2.0"; - sha256 = "32b972796fddf933ef21c28b4904b7f9192459a5e7b98ce46adca4f3f2d3a171"; + version = "0.3.0"; + sha256 = "0sxhc8l7ck20zbn2h7zgcywkygh0gp3mzg0mkgvx1qs4hp0nryvq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; @@ -75585,19 +80632,19 @@ self: { mkDerivation { pname = "gogol-script"; version = "0.1.1"; - sha256 = "30b61c4088de0564cafe8fea83d9bd3666db7c3236b6c7b153b6794007f1dd0f"; + sha256 = "03yxy43l0ydnafqwgdin69ydnrinppcq7slgzv5681fyi101rdih"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; 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 = "e2572e207591d10c8a7eaff165ccb54286ca2b041c4ea2323d010c186ada47cb"; + version = "0.3.0"; + sha256 = "1l2bd93zndmi4zy28ygq63cz020q83viz2pyzy1j0hk0inji9k81"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; @@ -75609,8 +80656,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicecontrol"; - version = "0.2.0"; - sha256 = "0f94288509755891bb1195911a1cb367b1a9304ff1acb30d6713c5d776fb3c27"; + version = "0.3.0"; + sha256 = "0lfw9592arh01d3swxyp97glxqzc3cvcd3mn6pcm5q6dsjnda1hi"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; @@ -75622,8 +80669,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicemanagement"; - version = "0.2.0"; - sha256 = "0b0e654df7bf54672ff8b34feff48208a07ec8215c69f7665946f4b3386a762d"; + version = "0.3.0"; + sha256 = "0qasq71k1bm9pm298sdivgnnr1sx9701nhmdn82lx8qglnxvd4v3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Management SDK"; @@ -75636,19 +80683,20 @@ self: { mkDerivation { pname = "gogol-sheets"; version = "0.1.1"; - sha256 = "44b3028332b6bbfa3243e3085777b5a85a3361a75b6733c563b2462a764da678"; + sha256 = "0y569mv2limjcg2k6rsvlxhk6nm8nmvmf2738crgmfxn6a1h5cs4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; license = "unknown"; + 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 = "8494db34d160118c23391864c3d3602179313cd81a874fd2c19059309b6a37e0"; + version = "0.3.0"; + sha256 = "1kj179262lada2dh3pq129kc6p0rdzppxhmyglin5p2nnlzmkm9d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; @@ -75661,19 +80709,20 @@ self: { mkDerivation { pname = "gogol-shopping-content"; version = "0.1.1"; - sha256 = "28c77ade1591d243933517cda460edf2f30b2682ccd3e14007cc5383bc65551f"; + sha256 = "07smcny86lyc0x0f3lych8k0pwzjxmha9k8p6n9l7lli2pg7mir8"; libraryHaskellDepends = [ base gogol-core ]; 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 = "f64953dd9618c5dbf1904df08b4211afb1e06109cf053e3e1244e3b167645662"; + version = "0.3.0"; + sha256 = "05q68x2krghnv0j7f7bizhqpjgni2lqm03bp74ydcy7f2y675i55"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; @@ -75686,19 +80735,19 @@ self: { mkDerivation { pname = "gogol-siteverification"; version = "0.1.1"; - sha256 = "eb2d75deeb35168af169ed77ce69d1e12e888128c3a3a77df7e0fcc98b0cfbe1"; + sha256 = "1qgv1j5wkz70yxysg8y3520qhbp1s5lwwxzdd7qql5imxgg7abgb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; 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 = "1f743419a85baafdfa1cbbea01f6f1cfbcf23ae95943517166ae7518cbfc0a32"; + version = "0.3.0"; + sha256 = "0pi4ljv20p5xjw11p99hksn8qz284pjv9f36i7hsdlf5bjd3v1dh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; @@ -75710,8 +80759,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-slides"; - version = "0.2.0"; - sha256 = "e51390bc85a54109473bf24b7434f0f7dd5ec189cc9b76a6201f9a26c6d4ac4c"; + version = "0.3.0"; + sha256 = "1bqyq767c4w8m2w9i78vn6psnv68687l0kwf6kbmn150gvg9c1mb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Slides SDK"; @@ -75724,19 +80773,19 @@ self: { mkDerivation { pname = "gogol-spectrum"; version = "0.1.1"; - sha256 = "31329fe1e2304d729bc1c36204d466140ebf6ed68183a22f3527eb609ef82ec1"; + sha256 = "1h9fz2g61sr76lps50w1srpby3hlcva08qn3q6dp4k9hwbhrycii"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; 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 = "268d3a60b2f05702ff63fbaf56d485e36089691c83e1a2a491419e3b547b6f7e"; + version = "0.3.0"; + sha256 = "0b596ajxy6ph28l46wnh03cr264ry4yki197bxls8spvzf8pwf5b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; @@ -75749,19 +80798,19 @@ self: { mkDerivation { pname = "gogol-sqladmin"; version = "0.1.1"; - sha256 = "6f7baa334dfe6e2cc430a1692d48ca20ec656ab10ff504f8f77dbde382c241bf"; + sha256 = "1gs1qa1f7gbxyzw09x8gn5m6bv10r942ssd16322qvpy9lrslyvg"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; 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 = "d7cb8593629a7694b12ef4e1249158883e4334d8d1d68ef8612f987aa1dfe153"; + version = "0.3.0"; + sha256 = "164w0sqy75m1dsvi64kyrihy647j2gm0k7kar46m9wvym1gvcr3r"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; @@ -75774,19 +80823,19 @@ self: { mkDerivation { pname = "gogol-storage"; version = "0.1.1"; - sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72"; + sha256 = "0wmahrs83qwpjjlj0brj6rvyrbq6b0i75a5nvzbvqyz3c12z7x3s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; 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 = "158528dc7488c5ac987c2cd05e9d1d15576aa9085d8c1ed3bfb9f3cba517d8da"; + version = "0.3.0"; + sha256 = "18n4grbbwwg0ymh0gp6qhqdw7v9x81y70lxmslql0w9dlirg959v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; @@ -75799,19 +80848,19 @@ self: { mkDerivation { pname = "gogol-storage-transfer"; version = "0.1.1"; - sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745"; + sha256 = "0id7rjd6nlcy4hagcpmaqwsrskq00dfh3n3hdaad7dfka5ziackz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; 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 = "64aa9748678d9ed6785cd0475b1711b13389b83c84dc99c71cd4fde2dbde3f1e"; + version = "0.3.0"; + sha256 = "0iwal6slja14gbdw2xjs79y3c6l56c1hvv0gyip3b3pz5i2xh4zb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; @@ -75824,19 +80873,19 @@ self: { mkDerivation { pname = "gogol-tagmanager"; version = "0.1.1"; - sha256 = "8dfe4001b9df03cc812ae11d7c9f91dd063da3fc26242426b409b5dd6ae420ee"; + sha256 = "1vi0wimdvd89nhk28916zjiks1nxj6gpq7g15a0wq0yzp40l1zld"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; 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 = "fc589362f09adf19a1b4e1b2609d4787eb7df73a27ff6f433fecb4614bd0543f"; + version = "0.3.0"; + sha256 = "0hsplk3yvkdglv38pl9cckc6csh23adasyvfdzw08kfbk8b1llgp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; @@ -75849,19 +80898,19 @@ self: { mkDerivation { pname = "gogol-taskqueue"; version = "0.1.1"; - sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c"; + sha256 = "076ya8j1g3lp1kpq3yk89i4hb36pd2qx4503vxzgr0pv72dv75s7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; 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 = "5b172c962a9aca7eed4cb4af3e05ccebef93b80584fb6fc902b1c462a8b5b8a6"; + version = "0.3.0"; + sha256 = "0irzyv80q2n4jv144rryv5xqbg51gqyws1pnvpdi5lddq90yvjq3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; @@ -75874,19 +80923,19 @@ self: { mkDerivation { pname = "gogol-translate"; version = "0.1.1"; - sha256 = "208cf8e92f66cfe35502a07eceb929a63f836af5802344d0b43796cf81c4edaa"; + sha256 = "1apdqj0wz5ipnk8488w0ymm86gx656wwwzm009ay7kv65zlzi310"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; 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 = "b965db2484daf4e5d91594d5e7eed8aa020c99ae1512925718c23406a55e78cc"; + version = "0.3.0"; + sha256 = "0bwmymiz1whc2rffxzlkva72j5cq51y8gxfl7lq5bg668p3grcvk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; @@ -75899,19 +80948,19 @@ self: { mkDerivation { pname = "gogol-urlshortener"; version = "0.1.1"; - sha256 = "d958cba0e06b15512713ad893ae1a8a47f0654b2b734d06c91f23dd781fa7cf8"; + sha256 = "1y3wza0xfggjj5nd0d5pn9a0czx4m3hkm2dd2ckm25bbw2hcnn6r"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; 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 = "6bb29a4f08babe57deff1ce6d4ee045266cdfdc91ace37d821962801717e8672"; + version = "0.3.0"; + sha256 = "1hmwk3pfxzyv0hxn33jms7c72yl8pnqnbfpza53ljq0abd749fcv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; @@ -75924,19 +80973,19 @@ self: { mkDerivation { pname = "gogol-useraccounts"; version = "0.1.1"; - sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647"; + sha256 = "0iw6xx2s021vfyy7p7w81r53arv1paqkdzbldy60knx0rscssr20"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; 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 = "91504ac3cbdb11a45ee6762799bfefb3be973b8883ab84254c3bb3101eb9cc67"; + version = "0.3.0"; + sha256 = "0fzmq082x0vvml8c0pxhb3vrnvizmq9cmh8y30yapkad7xwgx3i9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; @@ -75949,19 +80998,19 @@ self: { mkDerivation { pname = "gogol-vision"; version = "0.1.1"; - sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565"; + sha256 = "0rd5j18b02vvl9if9i5ldr9rxdcfcdx5frh3bh6yncf1sbh6q176"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; 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 = "6c87358e77e3565249701b36d8e5fa552f454dfd496c1f65f6586a5781846071"; + version = "0.3.0"; + sha256 = "1ssdz7cv3v3hz024m3djv4asj6lpd4c7a3dzrnxm9ipfbfmjb5f9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; @@ -75974,19 +81023,19 @@ self: { mkDerivation { pname = "gogol-webmaster-tools"; version = "0.1.1"; - sha256 = "cfe78f510843473f6195b870de4de782cb5309e58f85af4afcb015c889fc9608"; + sha256 = "024nzj4wh5dhzi5az1cgwl4m7jw2wx6xww5qjmhkyis3118qzryg"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; 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 = "00633481f3965ecaf2a3d6b56e4d67d8d13bb901b9023d613b4c527f7a5da04b"; + version = "0.3.0"; + sha256 = "0rkpjwnb064i7256j0q8gnkynny596qrg79h2wviadmifz9gyixp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; @@ -75999,19 +81048,20 @@ self: { mkDerivation { pname = "gogol-youtube"; version = "0.1.1"; - sha256 = "a9a9b267bef13f1dcfebd49a2d049a125c5774eba6774e1c8384570e80404f8b"; + sha256 = "12sg8200wmw4hcf4wxx6xds5fp0jk822v6nlxg7isgziprkv5ad9"; libraryHaskellDepends = [ base gogol-core ]; 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 = "425ead26d5096dc3fff0333971b79e7cd4b2ee49b52efdb1609a5ca557b29005"; + version = "0.3.0"; + sha256 = "1sv7djr2x73n3w0cbxncyzz64kxn7pwydcyznqipni7xv6hi5s1j"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; @@ -76024,19 +81074,19 @@ self: { mkDerivation { pname = "gogol-youtube-analytics"; version = "0.1.1"; - sha256 = "98297021605ee870f20dcd4c8d8724d8390f9564a4acac237210632b70f7c91b"; + sha256 = "06y9yxq2nqqhf8isrb54cjahyffq4j3qsk6d1pr71s2yc0hp0acq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; 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 = "0e888dce3cba650909e577641d7e60b19e521db3c48b36d83cf7f0e8300a451b"; + version = "0.3.0"; + sha256 = "10888jai56jpw6snssclldmxn2my9vadrqm14dmrhl6sr3mabdbh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; @@ -76049,19 +81099,19 @@ self: { mkDerivation { pname = "gogol-youtube-reporting"; version = "0.1.1"; - sha256 = "96d1bf151a30efa99e0ee01407ed1d3356bbc61bf696e691ba344a2eeae35e2c"; + sha256 = "0b2ywgm2wjilpa8yd5pn3g3bnmik3pnhf5701sgakvrh38avzlcn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; 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 = "f116487fb543dc596485ce07bf9b17f3867197871ff434a9de68414706a92d39"; + version = "0.3.0"; + sha256 = "0j8xalrigh3rvxb8z009s6bs34nw68kwjvczm1hlx1fcifgjrp4f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; @@ -76074,7 +81124,7 @@ self: { mkDerivation { pname = "gooey"; version = "0.1.0.0"; - sha256 = "f224cc55134f260e9b5edd908f4534a41a2c47a63388c9b34022d58fe95e545a"; + sha256 = "0njlbvlqzm9282rwk21klr3jq6m46i2qz46xbsdhw9jg2dawq97j"; libraryHaskellDepends = [ base renderable transformers varying ]; description = "Graphical user interfaces that are renderable, change over time and eventually produce a value"; license = stdenv.lib.licenses.mit; @@ -76089,7 +81139,7 @@ self: { mkDerivation { pname = "google-cloud"; version = "0.0.4"; - sha256 = "09a77ce6846ea0c5f9d7e5578dcddcbaf4905437445edb45c2da35456324fb9a"; + sha256 = "16pv4iiladfsq92xnpj46xa91x5svk6qsmz5szwwb83fhkk7r9q9"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types mtl random scientific stm text time unordered-containers @@ -76103,7 +81153,7 @@ self: { mkDerivation { pname = "google-dictionary"; version = "0.1.0.2"; - sha256 = "cf3ccd3920cf9325c25201d6be8f6f5cf98d957cdd23ffe3de0d3cc990272b8a"; + sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g"; libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ]; homepage = "https://github.com/mitchellwrosen/google-dictionary-api"; description = "Simple interface to the google.com/dictionary API"; @@ -76119,7 +81169,7 @@ self: { mkDerivation { pname = "google-drive"; version = "0.4.1"; - sha256 = "f3f742eccf51897db9da71ea1cad0d2632122e94ee98f160e20fef75b58b17f2"; + sha256 = "1whpifspbvqgw9hg367fjhp14ci61nnirskivawpv2airzn45xzk"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra directory filepath http-conduit http-types mtl random resourcet text time @@ -76141,7 +81191,7 @@ self: { mkDerivation { pname = "google-html5-slide"; version = "2011.0"; - sha256 = "f4d7b8b06cc9b23c6e6401ebb58741c1842131a34cb8a69036dc511281a36b72"; + sha256 = "0wkblf0i4lfw6s8adf2clcqj3161863vbsq1cip3rcn9djqbimzl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76160,7 +81210,7 @@ self: { mkDerivation { pname = "google-mail-filters"; version = "0.0.1.2"; - sha256 = "dafa3e765f9f875ae2601e2854e36500204469d1833b1da0cc08e9dc8c0b4ce5"; + sha256 = "1rac1f6drs88rjh1sfw3s5ll8800cpim8a0yc3i5m1wzbxv3xyns"; libraryHaskellDepends = [ base containers google-search text time xml-conduit ]; @@ -76171,15 +81221,16 @@ self: { }) {}; "google-maps-geocoding" = callPackage - ({ mkDerivation, aeson, base, http-client, servant, servant-client - , text + ({ mkDerivation, aeson, base, google-static-maps, http-client + , servant, servant-client, text }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.1.0.1"; - sha256 = "58cd8efd50ebeaf4a5630f4548065c1e05ce6a39367d9ccaa0e1ccc67be3f531"; + version = "0.3.0.0"; + sha256 = "1cirpv7ckxnly56ia7wd67djkas99yp9b9qb3cvi996jgwwl7d8i"; libraryHaskellDepends = [ - aeson base http-client servant servant-client text + aeson base google-static-maps http-client servant servant-client + text ]; homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme"; description = "Google Maps Geocoding API bindings"; @@ -76193,7 +81244,7 @@ self: { mkDerivation { pname = "google-oauth2"; version = "0.2.2"; - sha256 = "3230c41fc67242671c517e4483dfd9612f58495389ff2413f0f33444e0448058"; + sha256 = "0n408kh48d7ky09j9zw9ad4mhbv1v7gq6i3ya4f6fhkjqqgw8c1j"; libraryHaskellDepends = [ aeson base bytestring HTTP http-conduit ]; @@ -76207,15 +81258,15 @@ self: { "google-oauth2-for-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, http-types, req, time, wai, warp + , hspec, http-types, req, time, unix, wai, warp }: mkDerivation { pname = "google-oauth2-for-cli"; - version = "0.1.0.0"; - sha256 = "ccbb42b8d946442399d057cf211df23f46a8d95bd82a6965bc078e5385d2232d"; + version = "0.1.0.1"; + sha256 = "1n1pm91mx7i22iynipknjjkwh7pzr0ga7zg7v3dazqwvh6pps6w1"; libraryHaskellDepends = [ - aeson base bytestring directory filepath http-types req time wai - warp + aeson base bytestring directory filepath http-types req time unix + wai warp ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme"; @@ -76231,7 +81282,24 @@ self: { mkDerivation { pname = "google-oauth2-jwt"; version = "0.1.3"; - sha256 = "1597575b4d03fea87e7411dd905b2db59221a6050986bd4cffadf4473da1c00b"; + sha256 = "02y0l4ylgx5dzx6bv1h90nk234mm5mdr1p8ifizaizh39mdmg5qm"; + libraryHaskellDepends = [ + base base64-bytestring bytestring HsOpenSSL RSA text unix-time + ]; + homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; + description = "Get a signed JWT for Google Service Accounts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "google-oauth2-jwt_0_2_2" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.2.2"; + sha256 = "0alvq0sxmzi1mxc7bahwxydbgmhp8hva0w8p9h6cb1fh2vam5p1q"; libraryHaskellDepends = [ base base64-bytestring bytestring HsOpenSSL RSA text unix-time ]; @@ -76246,13 +81314,34 @@ self: { mkDerivation { pname = "google-search"; version = "0.2.0.0"; - sha256 = "199ed69f577e4c65f64858648aaf366d8c8e6def4742ad2949c650367d14c2ca"; + sha256 = "1jn22iykcl6694lsshj7xxnqx33d6spqlr2q93v6ak3yaygxd7hr"; libraryHaskellDepends = [ base free nats text time ]; homepage = "https://github.com/liyang/google-search"; description = "EDSL for Google and GMail search expressions"; license = stdenv.lib.licenses.bsd3; }) {}; + "google-static-maps" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytedump + , bytestring, cryptonite, double-conversion, http-client + , JuicyPixels, memory, MissingH, network-uri, servant + , servant-client, servant-JuicyPixels, text, utf8-string + }: + mkDerivation { + pname = "google-static-maps"; + version = "0.4.0.0"; + sha256 = "0r1ln013939vw6jqs1hdljyk2z7wxq2jjwr5v8pci2dcii9ryph1"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytedump bytestring cryptonite + double-conversion http-client JuicyPixels memory MissingH + network-uri servant servant-client servant-JuicyPixels text + utf8-string + ]; + homepage = "https://github.com/mpilgrem/google-static-maps#readme"; + description = "Bindings to the Google Static Maps API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "google-translate" = callPackage ({ mkDerivation, aeson, base, bytestring, http-api-data , http-client, servant, servant-client, text, transformers @@ -76260,7 +81349,7 @@ self: { mkDerivation { pname = "google-translate"; version = "0.3"; - sha256 = "b89c6761fe3a8f4331f35a48b6758968449c2228fa00a68a69ccc9b11d9a1f64"; + sha256 = "0r0zk8fv3jfcd65ac07s50i9qi38i5svcj2sycql73rszrhng75q"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client servant servant-client text transformers @@ -76277,7 +81366,7 @@ self: { mkDerivation { pname = "google-translate"; version = "0.4"; - sha256 = "acd1fe031674f578e83e7736335bfa9999b430c19afbd5ca89aae97179be4929"; + sha256 = "0aa9prwp3sdai75dbywsq4qb96crz9dk6dkp7vl7ixbl2q1zxldc"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client servant servant-client text transformers @@ -76295,7 +81384,7 @@ self: { mkDerivation { pname = "googleplus"; version = "0.3.1.1"; - sha256 = "4f8a695b9a92c042242c1be8e58e5e18cd2e6819bd6dd29fe2003c8672dece10"; + sha256 = "046fvrr8cg00wagx4vdx35l2xk8qbs7fbs0v5hj45h4jk9dnk2jg"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers enumerator haskell98 http-enumerator http-types mtl text time timerep transformers url @@ -76314,7 +81403,7 @@ self: { mkDerivation { pname = "googlepolyline"; version = "0.1.0.2"; - sha256 = "cd593a0c783733beb8300fc9141331fe29d9430f06b0282d75bdc18b4a785c85"; + sha256 = "11awg158phdxflnjic061x1xjagy649i9j8g62wbwcrpg063lnfd"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -76334,7 +81423,7 @@ self: { mkDerivation { pname = "gopher-proxy"; version = "0.1.1.1"; - sha256 = "8d85cc17d211d6c7600ff8b1da3bd0b5fbbe0bcd2ffd6629719a94674b4acf4d"; + sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76353,7 +81442,7 @@ self: { mkDerivation { pname = "gopherbot"; version = "0.1.0"; - sha256 = "cfca9d1268eba520c14e24093b0f459d58c822045e307e89bbba9c7480ee4461"; + sha256 = "0qa4xs07975spf4pwc2y0hichn4x8l7kn2949v0j19gbd099vjng"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76372,7 +81461,7 @@ self: { mkDerivation { pname = "gore-and-ash"; version = "1.2.2.0"; - sha256 = "4192efc2afac62ba0fb5d1b591a387e8bc4c346fdcd6ceb1f0d568cd8027cace"; + sha256 = "1kna4y0css6my2qwxmnwdws4rg78hyir3dfinl7vlqmcmz1fz4j1"; libraryHaskellDepends = [ base containers deepseq exceptions hashable linear mtl parallel profunctors random semigroups time transformers @@ -76391,7 +81480,7 @@ self: { mkDerivation { pname = "gore-and-ash-actor"; version = "1.2.2.0"; - sha256 = "0de7d9391e0760193904ea91d6cc3f499a155923bc31bb9130d3fe694eda9a10"; + sha256 = "044sv976kznk628vncdw4dcib6j97z6dd4ga0hwijq073qwxkrqd"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash hashable mtl resourcet transformers transformers-base unordered-containers @@ -76410,7 +81499,7 @@ self: { mkDerivation { pname = "gore-and-ash-async"; version = "1.1.1.0"; - sha256 = "ed0c0ee1404d68675b03cf133d0af8ecb9553ba2ce279e32c353db55957ebd18"; + sha256 = "065xgsambnskqcr9w9yfl8xmbfgcz053s4yg0ddnfs2d83hhw37d"; libraryHaskellDepends = [ async base containers deepseq exceptions gore-and-ash hashable mtl resourcet transformers transformers-base unordered-containers @@ -76435,7 +81524,7 @@ self: { mkDerivation { pname = "gore-and-ash-demo"; version = "1.2.0.0"; - sha256 = "73bfb46b00664c92376e3c2ffff7df7e54552b077c9c8ae146117d31d2465309"; + sha256 = "02ak8v932z8i8vhqm73w0wmmam3yvzvzybrwdqvr4k3601mv9gvk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76458,7 +81547,7 @@ self: { mkDerivation { pname = "gore-and-ash-glfw"; version = "1.1.2.0"; - sha256 = "43fc8a90e985baa99334c11f48f87c166145bc9b597c7751cce0e18b282a483e"; + sha256 = "0gj858l8pqg0ri8pfz2rkfy4aq8ngkw4h7y16j9skfl5x688mz23"; libraryHaskellDepends = [ base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl transformers unordered-containers @@ -76476,7 +81565,7 @@ self: { mkDerivation { pname = "gore-and-ash-lambdacube"; version = "0.2.0.0"; - sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d"; + sha256 = "0za002vs32khgbqjpxrxq9344aw2jfwk9c0c2kvw9kwf804vvhk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76497,7 +81586,7 @@ self: { mkDerivation { pname = "gore-and-ash-logging"; version = "2.0.1.0"; - sha256 = "6ce12cadec13514b91593dd9cc33d3deb1cdd9bd13fec92b98d985934fa72149"; + sha256 = "0j91lx7r71frk0mwkzhkppcwvcfyscrwrn9xb68lnl8kxjnjrqbc"; libraryHaskellDepends = [ base containers deepseq exceptions extra gore-and-ash hashable mtl resourcet text text-show transformers transformers-base @@ -76519,7 +81608,7 @@ self: { mkDerivation { pname = "gore-and-ash-network"; version = "1.4.0.0"; - sha256 = "d1bea115605525454c300419c1860168fd38e414a3760b2f6e1ef2793f5bfece"; + sha256 = "1kpybczpkwhydqphnxm32kj3izb8063c26846164a9amc0as3gni"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions extra ghc-prim gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network @@ -76540,7 +81629,7 @@ self: { mkDerivation { pname = "gore-and-ash-sdl"; version = "2.1.1.0"; - sha256 = "8bc3bac8c1297f9110481b4fe9b75e9817952521e12af6ccfde5cd1fd589618c"; + sha256 = "1331i7aizkg5zp6gcap144jra5wqbsvyjkqv90892zr9q74bmhwb"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash lens linear mtl resourcet sdl2 text transformers transformers-base @@ -76561,7 +81650,7 @@ self: { mkDerivation { pname = "gore-and-ash-sync"; version = "1.2.0.1"; - sha256 = "e4c919188198e1c6740cd17f782ddb08bfac928448e84b77fba4987e94f262dc"; + sha256 = "1p32yaa7x654zdvlps28hj9argq8vcnphzyi1iscdqcqh4c1kjg4"; libraryHaskellDepends = [ base bytestring cereal containers deepseq exceptions gore-and-ash gore-and-ash-actor gore-and-ash-logging gore-and-ash-network @@ -76581,7 +81670,7 @@ self: { mkDerivation { pname = "gpah"; version = "0.0.2"; - sha256 = "b92f0c4e15a1b0401294277a77d25817870b527ed19c046d0273bce68a019fff"; + sha256 = "1zwz065fdg3k09nh976igr90p1qpb397fyi7jh941c512m70qbxr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76599,7 +81688,7 @@ self: { mkDerivation { pname = "gpcsets"; version = "0.9.2.0"; - sha256 = "4827ff862df2f527eb175e2c66c2eeaee9813f99868a55371faa2c67ac99a0ba"; + sha256 = "1fm0k6n6fb5a3wvmb2l6k4zq3sdfxv16cb2y2zmjgxgj5n3gy9s8"; libraryHaskellDepends = [ base ]; description = "Generalized Pitch Class Sets for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -76612,7 +81701,7 @@ self: { mkDerivation { pname = "gpio"; version = "0.1.0.2"; - sha256 = "0b04f0cf97b096edf50770b0c20abc69823374ae8dbafbf696c42f13a5f2a576"; + sha256 = "0xm5yaji6by4jvvgpfldmrs370k9ph5c5c3h0zsyv5mhjz7z010b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76632,7 +81721,7 @@ self: { mkDerivation { pname = "gpolyline"; version = "0.1.0.1"; - sha256 = "28b3a644853ba6f0a7d6465d8d62646a10c995008a799ae67e728c8cf4a17a05"; + sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8"; libraryHaskellDepends = [ base split ]; homepage = "https://github.com/fegu/gpolyline"; description = "Pure module for encoding/decoding Google Polyline"; @@ -76647,7 +81736,7 @@ self: { mkDerivation { pname = "gps"; version = "1.2"; - sha256 = "1984c24bbec7214b1adcda48b53ded59fdb21d2eeb19793ac59c2e9cb63638cf"; + sha256 = "1krq6sv9qblwqlx7j6gb5qfv5zarxlyvaj6svhd4n8f7pr5w510r"; libraryHaskellDepends = [ base pretty prettyclass statistics text time vector ]; @@ -76668,7 +81757,7 @@ self: { mkDerivation { pname = "gps2htmlReport"; version = "0.3.1"; - sha256 = "e8f5bdaba6dd7b45a06a8e3f0e88df1e2568c6ccb4fa611556bef2c10d0bcad8"; + sha256 = "1n6a1c6w3wmyaqan3ymlrk36h98yvy40wgwfdah4ayyxlsmvvxg8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76689,7 +81778,7 @@ self: { mkDerivation { pname = "gpx-conduit"; version = "0.1.1"; - sha256 = "44d6933bf085085ab2f0ffb67dd417577e33f8edf637d63a4e6679d0af05cb39"; + sha256 = "0ffb0npx0yb69qxdcdznxpw36zjp2za7vdpzy2r5l245y0xr7mj4"; libraryHaskellDepends = [ attoparsec base conduit filepath monad-control old-locale text time void xml-conduit xml-types @@ -76706,7 +81795,7 @@ self: { mkDerivation { pname = "graceful"; version = "0.1.1.5"; - sha256 = "19ae6a0ca0cb26c6453520ccec8e5f29b57d1a18c84991cff181176f03f084ce"; + sha256 = "1kl4y01ny5w1y77r2jf830d7vd99by7frk106m2wc9nbl066mbhr"; libraryHaskellDepends = [ base directory network stm unix ]; testHaskellDepends = [ base directory filepath hspec network process stm unix @@ -76723,7 +81812,7 @@ self: { mkDerivation { pname = "graflog"; version = "6.1.5"; - sha256 = "8e784641738220a999963e36b9e1b10b88a767bd79763481da5e2f47e4f37ddd"; + sha256 = "1pbxygj4fbsyva0k8xkrpmksg20bn7hvjdiyjscsj842fd0lcy4f"; libraryHaskellDepends = [ aeson base bytestring containers mtl text text-conversions ]; @@ -76743,7 +81832,7 @@ self: { mkDerivation { pname = "grammar-combinators"; version = "0.2.7"; - sha256 = "ad4d785dc98ba645f815ca3fb846b0744357c555ee71534e7829a4078e08f1fc"; + sha256 = "1z7i1270g919g1756wgfap2mfhvln13bhgya2pw4b9lbr5fphkdd"; libraryHaskellDepends = [ base containers enumerable fgl graphviz MaybeT mtl multirec parsec template-haskell text uu-parsinglib @@ -76754,14 +81843,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "grammatical-parsers" = callPackage + ({ mkDerivation, base, checkers, containers, criterion, deepseq + , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes + , tasty, tasty-quickcheck, testing-feat, text, transformers + }: + mkDerivation { + pname = "grammatical-parsers"; + version = "0.1"; + sha256 = "0bk85y27mbbxq2rp9f68ym2f1s2l36d126hahy25svdiqcq6s1ss"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers monoid-subclasses parsers rank2classes transformers + ]; + executableHaskellDepends = [ + base containers monoid-subclasses rank2classes + ]; + testHaskellDepends = [ + base checkers doctest monoid-subclasses parsers QuickCheck + rank2classes tasty tasty-quickcheck testing-feat + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq monoid-subclasses rank2classes + text + ]; + 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 ({ mkDerivation, base, colour, containers, fraction, grapefruit-frp , grapefruit-records, grapefruit-ui }: mkDerivation { pname = "grapefruit-examples"; - version = "0.1.0.6"; - sha256 = "d12f367a313bebb5d793a152ab59223ada856fb4150428d994f30b87ae60e99b"; + version = "0.1.0.7"; + sha256 = "0517f70i8qiqfxkyp5nf4w6pcb9p4caz0jm43acfk8ingf1syljz"; libraryHaskellDepends = [ base colour containers fraction grapefruit-frp grapefruit-records grapefruit-ui @@ -76778,8 +81898,8 @@ self: { }: mkDerivation { pname = "grapefruit-frp"; - version = "0.1.0.6"; - sha256 = "4e661fd1f137e438e1fa82d2d2bba7e9df24f5cf2e08027b2085793bc0c08ec0"; + version = "0.1.0.7"; + sha256 = "132jd2dxj964paz6dcyb6sx25dkv271rl2fgw05c7zawrrfnrkxs"; libraryHaskellDepends = [ arrows base containers fingertree semigroups TypeCompose ]; @@ -76793,8 +81913,8 @@ self: { ({ mkDerivation, arrows, base, grapefruit-frp }: mkDerivation { pname = "grapefruit-records"; - version = "0.1.0.6"; - sha256 = "f5b41878c93312c4149b8c44dbc51bef35de6f9ab9b0d6a5e898f3285c5c99e4"; + version = "0.1.0.7"; + sha256 = "0j1jy4rq11gk7j08cz7skdqlbnjrciiv0vi491lvmbbwmvf15cd6"; libraryHaskellDepends = [ arrows base grapefruit-frp ]; homepage = "https://grapefruit-project.org/"; description = "A record system for Functional Reactive Programming"; @@ -76808,8 +81928,8 @@ self: { }: mkDerivation { pname = "grapefruit-ui"; - version = "0.1.0.6"; - sha256 = "16c7d95fa20d962c72dcc25d13ccd60d625f6c8fee6ea2b7d8a66dc1725f8fc9"; + version = "0.1.0.7"; + sha256 = "1r2wpn982z33s0p6fgdgslgv9ixanb2pysy71j20cfp1xzh13hdj"; libraryHaskellDepends = [ arrows base colour containers fraction grapefruit-frp grapefruit-records @@ -76827,8 +81947,8 @@ self: { }: mkDerivation { pname = "grapefruit-ui-gtk"; - version = "0.1.0.6"; - sha256 = "1f3411ae628b64f842a205e22226bc651e698dd368950d0063bf8ef3f1a7ba42"; + version = "0.1.0.7"; + sha256 = "0ix6dilj3xv2cvihwq8cfykr8i1yq9w1bn86248r5bg5vhfn4g28"; libraryHaskellDepends = [ base colour containers fraction glib grapefruit-frp grapefruit-records grapefruit-ui gtk3 transformers @@ -76846,7 +81966,7 @@ self: { mkDerivation { pname = "graph-core"; version = "0.3.0.0"; - sha256 = "378f0baa40ebbb78e8c389f79e363eb573cdf182f799684d2f3d6ac51b10e854"; + sha256 = "0m7820dwasix5x6ni6gphbqwswxm7qv9xxw9qgl7ifzb82m0p3rp"; libraryHaskellDepends = [ base containers deepseq hashable mtl safe unordered-containers vector @@ -76867,7 +81987,7 @@ self: { mkDerivation { pname = "graph-generators"; version = "0.1.3.0"; - sha256 = "1fe09712b7c52b18da467facf0ffb78e7de515113401b5c2d8adf7fb13603d50"; + sha256 = "0l1xc09zpxxdv31ba09l24ayazcfnzzz1b3z8vd1hay5nw99gq0z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76890,7 +82010,7 @@ self: { mkDerivation { pname = "graph-matchings"; version = "0.1.0.0"; - sha256 = "7b155de108fc4abf89143c1be095600260bda7be74adb9c5eb131ac047d8f337"; + sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv"; libraryHaskellDepends = [ base containers fgl ]; description = "An implementation of algorithms for matchings in graphs"; license = stdenv.lib.licenses.lgpl21; @@ -76900,8 +82020,8 @@ self: { ({ mkDerivation, base, base-unicode-symbols, containers, mtl }: mkDerivation { pname = "graph-rewriting"; - version = "0.7.8"; - sha256 = "cece8e180698771b872f2ab18cf73eafa4704fcd0e1b0e94a1924d6f9cc2b688"; + version = "0.7.10"; + sha256 = "14gggfh1z6p4i8x8pf5744a6jbw7wz7kvdqvlzmmf6rf5cb68a35"; libraryHaskellDepends = [ base base-unicode-symbols containers mtl ]; @@ -76918,7 +82038,7 @@ self: { mkDerivation { pname = "graph-rewriting-cl"; version = "0.2.2"; - sha256 = "2033b1f4a3c39f6f64ea1a7a9ca6975c683382190806042a57c97fbb87669e67"; + sha256 = "0rwycs3vnzy9awm081h836136s2wjyk9qyhsx9j6z7y3lgsb2cr0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76937,8 +82057,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-gl"; - version = "0.7.6"; - sha256 = "a6157c17e07fbf167b64ebfa51e256794fd99ce1fff4ede88035d8c9e4299239"; + version = "0.7.8"; + sha256 = "0fqfylas4y7993riw9vf2ppazk1wgpzxrd8a0avf5s63s0w29hm7"; libraryHaskellDepends = [ AC-Vector base base-unicode-symbols containers GLUT graph-rewriting graph-rewriting-layout OpenGL @@ -76956,8 +82076,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-lambdascope"; - version = "0.5.8"; - sha256 = "e56293febd459060627af0912e7c1d0a0d6840fa31c2d5e9fcc1ca9bf9914db1"; + version = "0.5.10"; + sha256 = "0sz87nsn7ff0k63j54rdxp5v9xl926d47fkfa0jjnmdjg1xz2pn4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76977,8 +82097,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-layout"; - version = "0.5.4"; - sha256 = "052f1d481edf398cfd486849d981de20a298842a75a20864190b921af8fd7d92"; + version = "0.5.6"; + sha256 = "0h8inqg673kb6kwvsgl0hi44yil08775rw9l5bq9g8qzldz34z85"; libraryHaskellDepends = [ AC-Vector base base-unicode-symbols graph-rewriting ]; @@ -76994,8 +82114,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-ski"; - version = "0.6.5"; - sha256 = "019378940fb886e668a57a580b2df65309ab80def00555c77cf75b224923ac1a"; + version = "0.6.7"; + sha256 = "1ahwm3dlvy9aaara644m4y0s89xgjcgm2hpkc92z2wmdfydc05g6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77014,8 +82134,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-strategies"; - version = "0.2.4"; - sha256 = "6230a111c89e765aba002eaf62db138e7ec848474f78b300c21b7d7e087caa57"; + version = "0.2.6"; + sha256 = "0paacz014jvxixqscd2nlny7x4vd735qqw0zbxsyxr3qz9jxjll9"; libraryHaskellDepends = [ base base-unicode-symbols containers graph-rewriting ]; @@ -77032,8 +82152,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-trs"; - version = "0.1.7"; - sha256 = "e5e3a8e1bf70e39a933cd0b4d395eaf4c912cdbb547926b6a26472163fdbe92e"; + version = "0.1.9"; + sha256 = "0wygasyj35sa05vvcmkk8ipdla3zms85pvq48jq1rl2gnk79f2jy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77054,8 +82174,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-ww"; - version = "0.3.5"; - sha256 = "649160c0315861f275012e891a074a96aa6f59a3890f2e69f9612a1d91dece5a"; + version = "0.3.7"; + sha256 = "07fjl05w1lidmwh7iz9km3590ggxncq43rmrhzssn49as7basah8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77073,7 +82193,7 @@ self: { mkDerivation { pname = "graph-serialize"; version = "0.2"; - sha256 = "e434c40477bc664da18a6ff3dbf796dcf3109c6d54cea1a491e6757f5fc138a9"; + sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74"; libraryHaskellDepends = [ array base bytestring containers ]; homepage = "http://github.com/nominolo/graph-serialize"; description = "Serialization of data structures with references"; @@ -77087,7 +82207,7 @@ self: { mkDerivation { pname = "graph-utils"; version = "0.3.7"; - sha256 = "4e53e6355b1b72d1465e8ba516e2e62b9f836008fa9667526ed63df05134941b"; + sha256 = "06wl6i8z0gfndr96g5ps11h877rbwvi1d9cbbr3d2whvbcsyclsf"; libraryHaskellDepends = [ base containers fgl mtl parsec syb template-haskell ]; @@ -77104,7 +82224,7 @@ self: { mkDerivation { pname = "graph-visit"; version = "0.1.0.2"; - sha256 = "1858477f514df85d7eb5ae51d6ab9da605dd335d0c6fa23bb08994793107d229"; + sha256 = "0afj0wqpk549n0xs4vqcblrxs1d6knmxcldfnmz5vy2da5zlfn0q"; libraryHaskellDepends = [ base containers data-lens data-lens-template mtl ]; @@ -77120,7 +82240,7 @@ self: { mkDerivation { pname = "graph-wrapper"; version = "0.2.5.1"; - sha256 = "8361853fca2d2251bd233e18393053dd391d21ca6f210b2bc861b0e0f4c2e113"; + sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ array base containers deepseq hspec QuickCheck @@ -77137,7 +82257,7 @@ self: { mkDerivation { pname = "graphbuilder"; version = "0.1.0.0"; - sha256 = "4b887840c5d12efbf45dfeb3f488771c0a9d5deb4a62668d6f462a3ccafa127e"; + sha256 = "0zhjzb53qaj6dy6ncqjaxdfrs2hwfy4g9czybpsgnbniqm07i22b"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl QuickCheck test-framework @@ -77156,7 +82276,7 @@ self: { mkDerivation { pname = "graphene"; version = "0.1.0.4"; - sha256 = "0680af897f76bf5831bf73705ece15b9543d93e2e9586ed6f049e8e1303c0527"; + sha256 = "09q57hqf3s29y3b6wn79wa9ksm5r2p75ww3kpwqmigvngy4sz006"; libraryHaskellDepends = [ base bifunctors containers hashable lens-family lens-family-core mtl transformers @@ -77174,7 +82294,7 @@ self: { mkDerivation { pname = "graphics-drawingcombinators"; version = "1.5.1"; - sha256 = "4e8ffecad64bc9529869059a62c3dc2ca177465dc8c3890e0be6b74b4aa61148"; + sha256 = "0j0ilr54pdz61c78khy8bm37g89cvk1n56h5d6c55jabsv5gx3sf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77193,7 +82313,7 @@ self: { mkDerivation { pname = "graphics-formats-collada"; version = "0.3.1"; - sha256 = "7bed3e6e9075dc8963b0b3c3c7b43b9c100be13b1b4709273b516cd4050bddcd"; + sha256 = "1kfx1c2x8v2i7ckhjiqv7ghhn44w7fscghxkn1iqkp3mj1p3xvbv"; libraryHaskellDepends = [ base bitmap-opengl containers hxt OpenGL stb-image transformers ]; @@ -77208,7 +82328,7 @@ self: { mkDerivation { pname = "graphicsFormats"; version = "0.1"; - sha256 = "d0a2959f88ce429c81970d314df1a0fde1123572f3e1206c7658618c2c90982d"; + sha256 = "0bcqj0n8qqaqfrn21qgkf8si5qgxl3qlsc8djy0rqhnfi2grb8nh"; libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ]; description = "Classes for renderable objects"; license = stdenv.lib.licenses.bsd3; @@ -77222,7 +82342,7 @@ self: { mkDerivation { pname = "graphicstools"; version = "0.2.2"; - sha256 = "e8ea7bc869663f487cd1abe06168035b7b21348cb344b035d1b41de70d479f41"; + sha256 = "0hcz8w6yf7dls4sv0i5kihs22ysv0dl63q5bs5y4hgv6d747psp8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77241,8 +82361,8 @@ self: { }: mkDerivation { pname = "graphmod"; - version = "1.3"; - sha256 = "8f9197bd25aa79974e31fe81498cca7920d33979fe9b49084023ca9965e71910"; + version = "1.4"; + sha256 = "11gikmhdamsi900nk206hwm9fjjhdcsspj6aa06i8wqg8g4zbblq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77258,7 +82378,7 @@ self: { mkDerivation { pname = "graphql"; version = "0.3"; - sha256 = "7f141c9507c135baf49491461060333e30128b49287f9b72de2875cef8420ba2"; + sha256 = "18hb8bwcwx98vrr9nzr8965i4c1y6dh10ilijksbldf10yaiq53z"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base tasty tasty-hunit text ]; homepage = "https://github.com/jdnavarro/graphql-haskell"; @@ -77275,7 +82395,7 @@ self: { mkDerivation { pname = "graphql-api"; version = "0.1.2"; - sha256 = "8620df9b4750b3b6003d3efe6ba74e27581f3df042c7333ce0bd9c6e9e2e8c13"; + sha256 = "04wc5sg6x75xw0y37is2y0yiyn179sknpziy7l0bdcsh8ydxy846"; libraryHaskellDepends = [ aeson attoparsec base containers exceptions protolude QuickCheck scientific text transformers @@ -77300,7 +82420,7 @@ self: { mkDerivation { pname = "graphs"; version = "0.7"; - sha256 = "eea656ac6092eac99bafc0b7817efa34529b895408fc1267a5b573fb332f6f4c"; + sha256 = "0k3g5wrznwxmlmki5z08aj4rnlilz9z83dy0mydwksljc2n5d9pf"; libraryHaskellDepends = [ array base containers transformers transformers-compat void ]; @@ -77309,6 +82429,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphted" = callPackage + ({ mkDerivation, base, indexed }: + mkDerivation { + pname = "graphted"; + version = "0.3.1.0"; + sha256 = "0y2nqsygqcxb0w7x1irikqqx10m209nihqmxqy1s18snrlvh06c9"; + libraryHaskellDepends = [ base indexed ]; + homepage = "https://github.com/aaronfriel/graphted#readme"; + description = "Graph indexed monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "graphtype" = callPackage ({ mkDerivation, base, containers, dotgen, haskell-src-exts , haskell98, uniplate @@ -77316,7 +82448,7 @@ self: { mkDerivation { pname = "graphtype"; version = "0.2.0"; - sha256 = "71b964e4d634a09131a07a3f24f718c251811d296ded1611bffc8e45daa3cb8e"; + sha256 = "13nblgd4b3pwpw8idvbd54fq2lf233vj8gvsl0qr381lsvj69fbi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77337,7 +82469,7 @@ self: { mkDerivation { pname = "graphviz"; version = "2999.18.1.2"; - sha256 = "b08c2026d3810c15f6ad49a07fd7b879978d958fa477b369b719ec00741c85fc"; + sha256 = "1z453is01v0rnxlv6xx4iyaqv5vrp3bpz829mpv1a341sck2135h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77353,6 +82485,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphviz_2999_19_0_0" = callPackage + ({ mkDerivation, base, bytestring, colour, containers, criterion + , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath + , polyparse, process, QuickCheck, temporary, text, transformers + , wl-pprint-text + }: + mkDerivation { + pname = "graphviz"; + version = "2999.19.0.0"; + sha256 = "1sh4zqirblgnkmi4pl6fhd084p3mdx242db5wqikzpn9jzqpy2mg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring colour containers directory dlist fgl filepath + polyparse process temporary text transformers wl-pprint-text + ]; + testHaskellDepends = [ + base containers fgl fgl-arbitrary filepath QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; + homepage = "http://projects.haskell.org/graphviz/"; + description = "Bindings to Graphviz for graph visualisation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "graql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, markdown-unlit , process, regex-posix, scientific, text @@ -77360,7 +82518,7 @@ self: { mkDerivation { pname = "graql"; version = "0.1.1"; - sha256 = "2173fcd327ea273c8ef30077c3e875242a6fe3b9ae19af07accc78671ec75800"; + sha256 = "002qqwg6fy6cmh3sy6dfp7inyai4fplc6xq0yf73q9za4z9zqwr1"; libraryHaskellDepends = [ aeson base containers process regex-posix scientific text ]; @@ -77380,7 +82538,7 @@ self: { mkDerivation { pname = "grasp"; version = "0.1.0.0"; - sha256 = "54a2bae281c97f655b025bd50c0fd27f09eb7d6926ed9b57807b4e5d96ab5a2f"; + sha256 = "0bssmfb5skkvh1brpv96d5yyn2bzs87hrmav09dnazy9h7ibm8jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77404,7 +82562,7 @@ self: { mkDerivation { pname = "gravatar"; version = "0.8.0"; - sha256 = "6f6000acaea47f3fc8711f5a2a62d5fbe96f5bb698fcb997f9f07ffe3102f4d7"; + sha256 = "1mzl08qzwzzhz6bvkz4qnrdnzsgvsmi2lnhzf743yzx4msn00q3g"; libraryHaskellDepends = [ base bytestring data-default HTTP pureMD5 text ]; @@ -77418,7 +82576,7 @@ self: { mkDerivation { pname = "gray-code"; version = "0.3.1"; - sha256 = "5b0d04f6fe4c90157d669119c39da6d349a06eca3a7a834b7a5dcb5e89a8172c"; + sha256 = "0b0pm24mxjsxg95q6yisr9pa0jfklsfw66cicryib42czvv083av"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "http://bitbucket.org/astanin/hs-gray-code"; @@ -77433,7 +82591,7 @@ self: { mkDerivation { pname = "gray-extended"; version = "1.5.2"; - sha256 = "d56ae799ff03d5c4a4350d260be822cd3b3ff6fc8ed5e4b04f513579485fc9ca"; + sha256 = "1jn9bx47jdai9yqf9mcfzkv3yfyd4bl0n9hd6njc9m83zycyfsnm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -77452,7 +82610,7 @@ self: { mkDerivation { pname = "graylog"; version = "0.1.0.1"; - sha256 = "2d8173e61da8d02c39cb95e6ccea8a167c792f682a496aed5fe4edfd0e6a0082"; + sha256 = "10h0d87gvvg4bznnlj9ad0ppjz0nibmcrrlmrcwjrl583pk7709d"; libraryHaskellDepends = [ aeson aeson-casing base bytestring network random scientific text time vector @@ -77472,7 +82630,7 @@ self: { mkDerivation { pname = "greencard"; version = "3.0.4.2"; - sha256 = "be6423983f12b4e24bc3293102844b10ba83433d394a8b9d24b9688dabb989ee"; + sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -77488,7 +82646,7 @@ self: { mkDerivation { pname = "greencard-lib"; version = "3.0.1"; - sha256 = "6d122277ead225b67f0fa25e693937ca787e0524eb06efe659ad2ccaa61910a9"; + sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd"; libraryHaskellDepends = [ array base containers greencard pretty ]; homepage = "http://www.haskell.org/greencard/"; description = "A foreign function interface pre-processor library for Haskell"; @@ -77503,7 +82661,7 @@ self: { mkDerivation { pname = "greg-client"; version = "1.0.2"; - sha256 = "3692e75904ed52ef6dfd1a76ffe989ac81dbaf8f5901a16c2529c4621f2ec4dc"; + sha256 = "1p645qgn5i194mna20ariypxp0dci7lzyxhszmnyylpd0icyg4in"; libraryHaskellDepends = [ base binary bytestring clock hostname network stm system-uuid time ]; @@ -77521,7 +82679,7 @@ self: { mkDerivation { pname = "gremlin-haskell"; version = "0.1.0.2"; - sha256 = "3e33c59fb09c435d89c30fe7ae7dff88246f05d6ad43bd9fcf27c47bd68353aa"; + sha256 = "1ajkhgb7pi17rygvshxdsq2ny948zxysxrqgqf4mshwwn2gwacry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77538,6 +82696,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "grenade" = callPackage + ({ mkDerivation, ad, base, bytestring, cereal, constraints + , containers, criterion, deepseq, exceptions, hedgehog, hmatrix + , MonadRandom, mtl, primitive, random, reflection, singletons, text + , transformers, typelits-witnesses, vector + }: + mkDerivation { + pname = "grenade"; + version = "0.1.0"; + sha256 = "1xy5ybc2g5wsd8zljflh95mn5maald21v77ckzgg4hvrb2j98z4v"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq exceptions hmatrix + MonadRandom mtl primitive singletons text vector + ]; + testHaskellDepends = [ + ad base constraints hedgehog hmatrix MonadRandom mtl random + reflection singletons text transformers typelits-witnesses vector + ]; + benchmarkHaskellDepends = [ base bytestring criterion hmatrix ]; + description = "Practical Deep Learning in Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greplicate" = callPackage ({ mkDerivation, base, directory, doctest, filepath, lens , QuickCheck, template-haskell @@ -77545,7 +82727,7 @@ self: { mkDerivation { pname = "greplicate"; version = "0.0.2"; - sha256 = "c73d6b8f586e6004d3d66bb7b5d1402941021ce8d29a309fbb61c45f28753ce5"; + sha256 = "1r9wfll5zi31pfgk16njx0f04h99838vbdvbsv9h8q3fb27nngf7"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -77561,8 +82743,8 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.7"; - sha256 = "5369d0ab7b98b926951e81a65a349f11ab6badd71f65555d713428664c1e017c"; + version = "7.8.8"; + sha256 = "174x6x4aflv75k89nvpnpwd5201c5375vb0yk4p0ilidqi7kza90"; libraryHaskellDepends = [ base cereal containers ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -77579,7 +82761,7 @@ self: { mkDerivation { pname = "gridbounds"; version = "0.0.0.1"; - sha256 = "100a017e6286ec0cc738099982643ea0e0016076d2d48e11f71a061da1641eea"; + sha256 = "1shycjhis1hsyw8qxm6jfrh03q507rj85689733hrv46c9z022hh"; libraryHaskellDepends = [ base earclipper gjk gridbox ]; testHaskellDepends = [ base earclipper gjk gridbox hspec ]; homepage = "https://github.com/zaidan/gridbounds#readme"; @@ -77593,7 +82775,7 @@ self: { mkDerivation { pname = "gridbox"; version = "0.3.0.0"; - sha256 = "912792b8f7df3d343f68caafe4bae91ef138686073c80a7f9486cbdb77a0aa45"; + sha256 = "0idal1vxpjw6jizhmj3kc1l3iw8yx6xf9byad0zk8gfzyyw949wi"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/zaidan/gridbox#readme"; @@ -77609,7 +82791,7 @@ self: { mkDerivation { pname = "gridfs"; version = "0.1.0.2"; - sha256 = "e5230fd91b586e3760f56e7f94ab334886784302395cf392246d452ce3c248c5"; + sha256 = "1ia8qbijqibd4j9g6p1r091pi1j86fmr8zvfymh3fvjq3gchy8z5"; libraryHaskellDepends = [ base bson bytestring conduit conduit-extra monad-control mongoDB mtl pureMD5 resourcet tagged text time transformers @@ -77627,7 +82809,7 @@ self: { mkDerivation { pname = "gridland"; version = "0.1.0.3"; - sha256 = "2936472e5eb065e1fe28bd5d2f9d524be8d63f6eba0627527acf1668ec38b760"; + sha256 = "0q5p73n6h5ngg992f1msdqzxds2baafjypdx53zf2rdhbqp4fdi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77646,7 +82828,7 @@ self: { mkDerivation { pname = "grm"; version = "0.1.1"; - sha256 = "fda67b7be712ecf94798b74f6466e3d5a571a8539137b33af65b1916462a44fd"; + sha256 = "1za45931c6avyqxb6dwiafl739fmwdk68kxpk13zkv0jwxxpp9px"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77665,11 +82847,14 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "groom"; - version = "0.1.2"; - sha256 = "0e820122cad388f31c3ef0815d7ff93b9e95a8fdec0d6c560c379fe0ecfdb010"; + version = "0.1.2.1"; + sha256 = "17g51p15209wwgq83clsd97xvy4kchbx8jzh74qgc9hvmz9s9d56"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts ]; + executableHaskellDepends = [ base ]; description = "Pretty printing for well-behaved Show instances"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.bsd3; }) {}; "gross" = callPackage @@ -77677,7 +82862,7 @@ self: { mkDerivation { pname = "gross"; version = "0.1.0.0"; - sha256 = "76468df752590a960a9132da267d42d040d5fff58530ac7783642c818d95783c"; + sha256 = "0g3qjn6q2b34hdvsqc45ypzxah6h89yjdnijj459c2jrabvqsikn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ncurses ]; @@ -77695,7 +82880,7 @@ self: { mkDerivation { pname = "groundhog"; version = "0.8"; - sha256 = "16955dfe46737481400b1accd9e2b4ef3e7318e296c8b4838ba0651f7d51af1c"; + sha256 = "075ga5yiyrd0if1v9j4nw8c76gpgnkidkk0s1d082x3k8vz5v58n"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring containers monad-control mtl resourcet scientific text time @@ -77715,7 +82900,7 @@ self: { mkDerivation { pname = "groundhog-converters"; version = "0.1.0"; - sha256 = "394f213aba5f33fa564dbdb22cbaec38ad1a4fd6e779704700b0cf1b0e7f90ed"; + sha256 = "1vchgw71pkxh013p0yg7sr7imb9qxjx2rcmx9mbglcszp8x22krr"; libraryHaskellDepends = [ aeson base bimap bytestring containers ]; testHaskellDepends = [ aeson base bimap bytestring containers groundhog groundhog-sqlite @@ -77734,7 +82919,7 @@ self: { mkDerivation { pname = "groundhog-inspector"; version = "0.8"; - sha256 = "d43df51f3feb32a8981df6850f35e55d3eed7ec2a5ac28ead4093947740b076e"; + sha256 = "0vh71ds4ff89skm2ib55q9zfsgjxwlshz1gn3ncahcpb7wgzagfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77759,7 +82944,7 @@ self: { mkDerivation { pname = "groundhog-mysql"; version = "0.8"; - sha256 = "51ad8be513110081fff4333ae532b35e7ac5b35c4673e4c982bc0eca6c485666"; + sha256 = "0rjn91ncl3mwhb4y8ws6bjrwayjyncrfafikykzq200i2gjqpbai"; libraryHaskellDepends = [ base bytestring containers groundhog monad-control monad-logger mysql mysql-simple resource-pool resourcet text time transformers @@ -77777,8 +82962,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.8"; - sha256 = "78a5acb35b9b1dae9a9076e41db2dde46198b8e8494baaac98c6fdfc64b77f8d"; + version = "0.8.0.1"; + sha256 = "1s4m1g14jv88qxb2ynj92agjf3z2sa8xibgjgvwn7p3hn4zz73md"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers groundhog monad-control postgresql-libpq postgresql-simple resource-pool @@ -77797,7 +82982,7 @@ self: { mkDerivation { pname = "groundhog-sqlite"; version = "0.8"; - sha256 = "7dcbbd4bcf9b38408bc29608a514a2b535c85490e4649090c342603c91283092"; + sha256 = "14ih528kqq22qf890r74j1achddml8aaa24nqa5l0f4vrx5vvjvx"; libraryHaskellDepends = [ base bytestring containers direct-sqlite groundhog monad-control resource-pool resourcet text transformers unordered-containers @@ -77814,7 +82999,7 @@ self: { mkDerivation { pname = "groundhog-th"; version = "0.8"; - sha256 = "cef719b550e0c411fabf177e53466db7734d06ad6494d0548fa8b9aad7a72ec3"; + sha256 = "1hrflzbsmfd8ixad1534ml34swxpdm356zhppzx13i70a2sikxyf"; libraryHaskellDepends = [ aeson base bytestring containers groundhog template-haskell text time unordered-containers yaml @@ -77824,6 +83009,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "group-by-date" = callPackage + ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript + , pathtype, time, transformers, unix-compat, utility-ht + }: + mkDerivation { + pname = "group-by-date"; + version = "0.1.0.1"; + sha256 = "08gzxskp996m92pn49zz5h8543rnn6jk5vffgb8iiwvrzsa4xn0d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base explicit-exception filemanip hsshellscript pathtype time + transformers unix-compat utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/group-by-date/"; + description = "Shell command for grouping files by dates into folders"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "group-with" = callPackage ({ mkDerivation, base, Cabal, containers, hspec, hspec-expectations , QuickCheck @@ -77831,7 +83035,7 @@ self: { mkDerivation { pname = "group-with"; version = "0.2.0.3"; - sha256 = "eb179700db93ad736cf13520a105dd344f1c170952bcbdd1ad7e51b3244342de"; + sha256 = "1pj28cjb6lbymp8vvg2j14biqkrlvl2s281my5n77bckvc09f5zb"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base Cabal containers hspec hspec-expectations QuickCheck @@ -77849,7 +83053,7 @@ self: { mkDerivation { pname = "grouped-list"; version = "0.2.1.2"; - sha256 = "5bc49f34b1d9759a819c919971d789b14d37a8e22de811a5fc062675e3f8e875"; + sha256 = "0xg8z3ipa9h6zjji3s1dwal3fkdii7bp36cikj0rlxfrn4s9zi2v"; libraryHaskellDepends = [ base containers deepseq pointed ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -77863,7 +83067,7 @@ self: { mkDerivation { pname = "groupoid"; version = "0.1.0"; - sha256 = "1fe01616b2c1a4296133acbcb84a5c3964295e713a4018cfdd8446e112a6f23e"; + sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z"; libraryHaskellDepends = [ base ]; homepage = "http://code.google.com/p/copperbox/"; description = "A Groupoid class"; @@ -77875,7 +83079,7 @@ self: { mkDerivation { pname = "groupoids"; version = "4.0"; - sha256 = "6671953fa0970c13ac8014278fcd6227b4c07e1a69d5a23965e2df1418218a22"; + sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6"; libraryHaskellDepends = [ base semigroupoids ]; doHaddock = false; homepage = "http://github.com/ekmett/groupoids/"; @@ -77888,7 +83092,7 @@ self: { mkDerivation { pname = "groups"; version = "0.4.0.0"; - sha256 = "d328395164033e310148d57d5be86fc6cc4dbc97b4296b91f235b213cc80e8ce"; + sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k"; libraryHaskellDepends = [ base ]; description = "Haskell 98 groups"; license = stdenv.lib.licenses.bsd3; @@ -77904,7 +83108,7 @@ self: { mkDerivation { pname = "growler"; version = "0.6.0"; - sha256 = "e560344ffae87dd5159bf45e822f1c2970eb0e14031dbcc3439a4d70c59f7e6a"; + sha256 = "0skykz2p0kcs8g1vq7832h7fnw193hpq4pplkcaxazg8z97k8q75"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive either http-types lens monad-control mtl pipes pipes-aeson pipes-wai @@ -77925,7 +83129,7 @@ self: { mkDerivation { pname = "gruff"; version = "0.4"; - sha256 = "ae08f3b01988d5a7c3761ad43df355c5148b3511693eb86a83ab7879ccbcba0b"; + sha256 = "02xspk67jy5bhdmbhgk924sqn565aprkvm0sfv1sgmc836qg625f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ruff ]; @@ -77945,7 +83149,7 @@ self: { mkDerivation { pname = "gruff-examples"; version = "0.4"; - sha256 = "65c48c95c591f8fbda19e0dd19c74af1caaea979ecbdd5a4d8f793eba4d65482"; + sha256 = "10jlssjfp4zpv2jdbggcg6lsxjpi9b3ikpg037dgpy4iqnaqri35"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77962,7 +83166,7 @@ self: { mkDerivation { pname = "gsasl"; version = "0.3.6"; - sha256 = "786036025e5d5649c029c1db23c395e1592c073a58848ae4afe4f2797de1f931"; + sha256 = "0cgrw5ypkwp4mzj8m12q783jqng1jp1j7ny15704jmjxbq13cq3q"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ gsasl ]; homepage = "https://john-millikin.com/software/haskell-gsasl/"; @@ -77975,7 +83179,7 @@ self: { mkDerivation { pname = "gsc-weighting"; version = "0.2.2"; - sha256 = "e5a2652a4d32ea292c311c7c6165fcfbae34436a886aad8a492c003371910079"; + sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5"; libraryHaskellDepends = [ base hierarchical-clustering ]; description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting"; license = stdenv.lib.licenses.bsd3; @@ -77985,8 +83189,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "gsl-random"; - version = "0.5.0"; - sha256 = "d2adccfe625d3cb5046ae5bb3c7a23d23697d1fc2c6a717df75f75aba2881c2e"; + version = "0.5.1"; + sha256 = "1s26ilz5s82ja103sf9a8dvjs6ah1xwinf7n3694qricid4qskjb"; libraryHaskellDepends = [ base vector ]; homepage = "http://github.com/patperry/hs-gsl-random"; description = "Bindings the the GSL random number generation facilities"; @@ -77999,7 +83203,7 @@ self: { mkDerivation { pname = "gsl-random-fu"; version = "0.0.0.1"; - sha256 = "1191092243b4cf6a89e6c1e123bc537ed5d0bcc18be7ad1ead26583dffa8c5e1"; + sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i"; libraryHaskellDepends = [ base gsl-random random-fu ]; homepage = "http://code.haskell.org/~mokus/gsl-random-fu"; description = "Instances for using gsl-random with random-fu"; @@ -78014,7 +83218,7 @@ self: { mkDerivation { pname = "gsmenu"; version = "3.0"; - sha256 = "8e2012af7393d781a65d1615a852c15534ba5b5500bda2f39c16ccea92a9ad95"; + sha256 = "15ddm69fmk0nkkrs5g80amdvld2mq59ah58nbnk83mwkffpi484f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78032,8 +83236,8 @@ self: { }: mkDerivation { pname = "gssapi"; - version = "0.1.0.0"; - sha256 = "72b7c687414bb370ff6a857ddbcfe00a804d3f2e4ca563c0783a68f6f875b0fd"; + version = "0.2.0.0"; + sha256 = "1kvyy05m3wcvcp76ap4i499j5mmm7dlz49i0m0a5vanpn2jfpkwy"; libraryHaskellDepends = [ base bytestring resourcet transformers ]; librarySystemDepends = [ gssapi_krb5 krb5 ]; homepage = "https://github.com/ondrap/gssapi"; @@ -78048,8 +83252,8 @@ self: { }: mkDerivation { pname = "gssapi-wai"; - version = "0.1.0.0"; - sha256 = "1a2b844a611f4615d948baa7253099f5acab01529005d522b46db839833f371f"; + version = "0.1.2.1"; + sha256 = "0n9295ql2zrsipnf91af24lcc35f8l6d6313cz8xiyx4dhf1arln"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive gssapi http-types vault wai wai-extra @@ -78062,22 +83266,22 @@ self: { "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib - , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl + , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl }: mkDerivation { pname = "gstreamer"; version = "0.12.8"; - sha256 = "ff437ed983c8d7d38add69a601707f86fcfcbc1a079c4463e67cb6a1dfcf69ad"; + sha256 = "1bb9rzgs3dkwwril97073aygrz46gxq039k9vn5d7my8hgcpwhzz"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring directory glib mtl ]; - libraryPkgconfigDepends = [ gst_plugins_base gstreamer ]; + libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = null; inherit (pkgs) gstreamer;}; + }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -78086,7 +83290,7 @@ self: { mkDerivation { pname = "gt-tools"; version = "0.2.1"; - sha256 = "701daead5b7134c7300ce127882210f183ed83b16c19daf49a5dbe6d5f676cd6"; + sha256 = "1mkccxgnvgjxkbsdl6bcn61yv0zi20i8h9z11hqcfd3ibfnsw7bh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78104,7 +83308,7 @@ self: { mkDerivation { pname = "gtfs"; version = "0.1"; - sha256 = "51ef576831a83652447a9d89163c703cd26cb788d8f167a7379f2779fb081154"; + sha256 = "0m0i13xpj9wz6ykngwfqi2vnrliwf0y1d2cxg9254dm865l5gvsi"; libraryHaskellDepends = [ base csv directory filepath rowrecord split ]; @@ -78120,7 +83324,7 @@ self: { mkDerivation { pname = "gtk"; version = "0.14.6"; - sha256 = "707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327"; + sha256 = "09w3f2n2n9n44yf2li3ldlb3cxhbc0rml15j9xqamw5q1h90cybh"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers gio glib mtl pango text @@ -78137,13 +83341,13 @@ self: { }: mkDerivation { pname = "gtk-helpers"; - version = "0.0.7"; - sha256 = "671bf6f447083c6a60fb862cd694f3944248167a5291ff58d4f39c9cce1fa433"; + version = "0.0.9.1"; + sha256 = "06clzm1lz0n9z8h8pnggdx710msnwmwcf8kzvp5crdbdi9v7y0di"; libraryHaskellDepends = [ array base gio glib gtk mtl process template-haskell ]; homepage = "http://keera.es/blog/community"; - description = "A collection of auxiliary operations and widgets related to Gtk"; + description = "A collection of auxiliary operations and widgets related to Gtk+"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -78152,7 +83356,7 @@ self: { mkDerivation { pname = "gtk-jsinput"; version = "0.0.0"; - sha256 = "6071b47725d2b8e3363a3eeb30c1068d171e9c5fef37966619f41c89be99543a"; + sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0"; libraryHaskellDepends = [ base gtk json transformers ]; homepage = "http://github.com/timthelion/gtk-jsinput"; description = "A simple custom form widget for gtk which allows inputing of JSON values"; @@ -78166,7 +83370,7 @@ self: { mkDerivation { pname = "gtk-largeTreeStore"; version = "0.0.1.0"; - sha256 = "20325ca217f5622cedc86995613777a843dd696999683aaf6c13bf13ea6eed5b"; + sha256 = "0nzddvm17gqkdjpkls4rd5lxshx8fwvn35b9r3njqqpm2yi5qci0"; libraryHaskellDepends = [ base containers glib gtk3 mtl nested-sets ]; @@ -78181,8 +83385,8 @@ self: { }: mkDerivation { pname = "gtk-mac-integration"; - version = "0.3.3.1"; - sha256 = "af651245db161e1b46f5a54ec04f908c40bbd7dc1f73df7531da8c78d2716b39"; + version = "0.3.4.0"; + sha256 = "0irf8smnpsym2lkw6gslk31zibn7alp7g32cmq4062mgnlwlawn4"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; @@ -78199,7 +83403,7 @@ self: { mkDerivation { pname = "gtk-serialized-event"; version = "0.12.0"; - sha256 = "2eeb454a0ffae025b7c9a5556029b6f5121246cdb0af1e48d21c95931a9f083e"; + sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf"; libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; @@ -78215,7 +83419,7 @@ self: { mkDerivation { pname = "gtk-simple-list-view"; version = "0.0.0"; - sha256 = "9a7be4ca800103ed93506b1acb1182b97b38647a6fca014b0026257195820ee3"; + sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws"; libraryHaskellDepends = [ base gtk ]; homepage = "http://github.com/timthelion/gtk-simple-list-view"; description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views"; @@ -78227,7 +83431,7 @@ self: { mkDerivation { pname = "gtk-toggle-button-list"; version = "0.0.0"; - sha256 = "061ca145243fb7d764e43e2bc420248bb1021ba2f437b4143c1850e2ba3d0b92"; + sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706"; libraryHaskellDepends = [ base gtk ]; homepage = "http://github.com/timthelion/gtk-toggle-button-list"; description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists"; @@ -78239,7 +83443,7 @@ self: { mkDerivation { pname = "gtk-toy"; version = "0.2.0"; - sha256 = "d83594e48c60f2e088d590976990823631f2df9ee55a94f17c8c17581898c37d"; + sha256 = "0zf3k0c5h5wcgkqr8np5kvgz4c9nha86k5whsn4f1wk0ikj98dfq"; libraryHaskellDepends = [ base containers gtk ]; description = "Convenient Gtk canvas with mouse and keyboard input"; license = stdenv.lib.licenses.bsd3; @@ -78251,7 +83455,7 @@ self: { mkDerivation { pname = "gtk-traymanager"; version = "0.1.6"; - sha256 = "cb30f5d55430836032abc876706af0a61de996c9e2b5a4b41c029d3149683642"; + sha256 = "0hind14k37823jsa9dg2r6bfj7d6y1m70xn8mcr610rhakazac6b"; libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ gtk2 x11 ]; homepage = "http://github.com/travitch/gtk-traymanager"; @@ -78266,7 +83470,7 @@ self: { mkDerivation { pname = "gtk2hs-buildtools"; version = "0.13.2.2"; - sha256 = "c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b"; + sha256 = "0jzvxlssqmd2dpnm35qpaq5xv5jk7hhy87594m74xv0ihygvbr65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78287,7 +83491,7 @@ self: { mkDerivation { pname = "gtk2hs-cast-glade"; version = "0.10.1.1"; - sha256 = "a64f3baf3fcdb06b540ced7b802bd828908bd3c47b2d63fec6ade451e070fe2b"; + sha256 = "0azyf3h53r5dqvz66bbvqk9qp418v0mq0yzd1ia6pc6d7ypknkx6"; libraryHaskellDepends = [ base glade gtk gtk2hs-cast-glib hint template-haskell ]; @@ -78301,7 +83505,7 @@ self: { mkDerivation { pname = "gtk2hs-cast-glib"; version = "0.10.1.1"; - sha256 = "b70afb2ba95cba85313441d229534083761e991243e46ef001ae43f1fd0f5faf"; + sha256 = "1bsz1zyz2hxf07q6xr232aciwxl3819jklj16hqqbfjwm4mzn2mp"; libraryHaskellDepends = [ base glib ]; description = "A type class for cast functions of Gtk2hs: glib package"; license = "unknown"; @@ -78314,7 +83518,7 @@ self: { mkDerivation { pname = "gtk2hs-cast-gnomevfs"; version = "0.10.1.2"; - sha256 = "af9c1f5163f92e9b64d4dc35dc334fa03c379842de84056c0ec5eaa7b6ce793a"; + sha256 = "0fkrrsvagsn51rn0b16y8ac3fg509wrxqdfwsij9nbprcd8iz75g"; libraryHaskellDepends = [ base gnomevfs gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell ]; @@ -78330,7 +83534,7 @@ self: { mkDerivation { pname = "gtk2hs-cast-gtk"; version = "0.10.1.2"; - sha256 = "72d041d664204d3e1eec9dd913780a606309b89f295810c6badfa6d62a60a695"; + sha256 = "15d6c0mdd9nzpb310n19kyw0jqv019w17ncxxhg3wk90ckb43l3j"; libraryHaskellDepends = [ base gtk gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell ]; @@ -78346,7 +83550,7 @@ self: { mkDerivation { pname = "gtk2hs-cast-gtkglext"; version = "0.10.1.2"; - sha256 = "a96adb8fe07ba89b23117b26e427489404d9a7234afb9c55e41508043982a416"; + sha256 = "05m4h8wh820mwiarrysa4fkxj14l90ky89kv24irpa3vw27xnsm9"; libraryHaskellDepends = [ base gtk2hs-cast-glib gtk2hs-cast-th gtkglext hint template-haskell ]; @@ -78362,7 +83566,7 @@ self: { mkDerivation { pname = "gtk2hs-cast-gtksourceview2"; version = "0.10.1.2"; - sha256 = "014db9540c4df797c1b6c1d276d52c819c4af087c9428d659a9030c9a750ccbb"; + sha256 = "1fyca2kwjc4hk9jqshn9hzq4m7415kapdln1nv0rgxsd1iabjk81"; libraryHaskellDepends = [ base gtk2hs-cast-glib gtk2hs-cast-th gtksourceview2 hint template-haskell @@ -78377,7 +83581,7 @@ self: { mkDerivation { pname = "gtk2hs-cast-th"; version = "0.10.1.0"; - sha256 = "fd8e81d477d096a7f21a7e536e4050716bbdbeef24d5f39d101c3bdac0c247a5"; + sha256 = "19a7qb0dlfqw22fz7m94xyzbssvia106wlvy3brag5nhfza833px"; libraryHaskellDepends = [ base hint template-haskell ]; description = "A type class for cast functions of Gtk2hs: TH package"; license = "unknown"; @@ -78389,7 +83593,7 @@ self: { mkDerivation { pname = "gtk2hs-hello"; version = "1.1.0.0"; - sha256 = "44ae9a25b173ccf7f4f8dfb8cb80cbabbafc2f52468cdc512fc84e8e9a37a84e"; + sha256 = "0km86yd8wkn85x8xr326a8pzrfmbrf0cpf6zz3sggk3kn4jrmbj4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base glib gtk3 transformers ]; @@ -78404,7 +83608,7 @@ self: { mkDerivation { pname = "gtk2hs-rpn"; version = "0.2.1"; - sha256 = "716794f2a620e942b4f50daeae68515fb879a7e3338cb9cd671891054c9b9107"; + sha256 = "01wikd60b48qcz6vk31kwfkpkf2za5laxbhdyns45s90lvr98rvi"; libraryHaskellDepends = [ base cairo glib gtk mtl ]; description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation"; license = "LGPL"; @@ -78418,7 +83622,7 @@ self: { mkDerivation { pname = "gtk3"; version = "0.14.6"; - sha256 = "f4c0d3c51a5e06e5f6a8fcfc2a1303e0a3ed0242309fc6c1b9603be9de1f4258"; + sha256 = "0n223zgfjfv0p70wd7rh881fv8z00c9jmz7wm3vfa1jy3b2x7h7l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; @@ -78437,8 +83641,8 @@ self: { }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.3.1"; - sha256 = "a5ba824ffc75f48c35e779f045cae753a0cdee9f78d69bbd9b9c5260d54ee0fc"; + version = "0.3.4.0"; + sha256 = "0cdx0qzmwz3bbg374c9nvwqsxgvc5c2h8i6m0x6d0sm714d8l0ac"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; @@ -78455,7 +83659,7 @@ self: { mkDerivation { pname = "gtkglext"; version = "0.13.1.1"; - sha256 = "70f0b6e42dd8635d5c4d852e497b0bd34683a363e7c016bfc8e5d11e84036497"; + sha256 = "15v40f21xlg5r2zidh77cfiq6ink1dxljbl59mf5sqyq5pjbdw3h"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ gtkglext ]; @@ -78472,7 +83676,7 @@ self: { mkDerivation { pname = "gtkimageview"; version = "0.12.0"; - sha256 = "43066260e89a0bf1bfb3c2d0f08bfe479e4e505f2a0d05d86c04e257df59ae69"; + sha256 = "0sdfb7gmgqh4dkc0a39abx84x7j7zs5z1l62nfzz22wsx1h641j3"; libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; @@ -78491,7 +83695,7 @@ self: { mkDerivation { pname = "gtkrsync"; version = "1.0.4"; - sha256 = "bc13dbcb3a30693d8cbf1f7d9df646439b2cfd5339bb954812b2ae2bebe3f57c"; + sha256 = "0z7mwgmjpbmj2949bfrragyjr6s38vv9sz8zpy63ss9h7b5xn4xw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78510,7 +83714,7 @@ self: { mkDerivation { pname = "gtksourceview2"; version = "0.13.3.1"; - sha256 = "a1c5ebc07faa5b2809d424b3ded5e9cfa0a5338b51c7989e2a0271d016c5fe53"; + sha256 = "0lzyqlbd0w825ag9iisiicrsb86gx7axxcr4sh4jhnxagz0fpid1"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl text @@ -78523,28 +83727,28 @@ self: { "gtksourceview3" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib - , gtk2hs-buildtools, gtk3, gtksourceview, mtl, text + , gtk2hs-buildtools, gtk3, gtksourceview3, mtl, text }: mkDerivation { pname = "gtksourceview3"; version = "0.13.3.1"; - sha256 = "9a7e12fda53d532668ee7f830c0aacf43c8a0c9a65f571fa81088a7372383b7b"; + sha256 = "0yrv71r772h8h7x73xb5k868lg7lmh50r0vzxrl2clrxlpyi4zls"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl text ]; - libraryPkgconfigDepends = [ gtksourceview ]; + libraryPkgconfigDepends = [ gtksourceview3 ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) gtksourceview;}; + }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: mkDerivation { pname = "guarded-rewriting"; version = "0.1"; - sha256 = "c96957369ca2e8e9372c8d587f7e636ad0a4f68b9195a80cbfd81346da356910"; + sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9"; libraryHaskellDepends = [ base instant-generics ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/GuardedRewriting"; description = "Datatype-generic rewriting with preconditions"; @@ -78557,7 +83761,7 @@ self: { mkDerivation { pname = "guess-combinator"; version = "0.1.1"; - sha256 = "f2d7ae4b4958fa198dacbe7579e9a330e01ec39f766905f2d0f32d66e84752f5"; + sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj"; libraryHaskellDepends = [ base HList ]; homepage = "http://code.atnnn.com/project/guess"; description = "Generate simple combinators given their type"; @@ -78570,7 +83774,7 @@ self: { mkDerivation { pname = "guid"; version = "0.1.0"; - sha256 = "b9dfaeffaaeb9e00f63a3af0e72e518231a93158c7e0ea0416cf62888af84eca"; + sha256 = "1jjfz258hqng2q2fmq67b0qsjcc2a4pfgw1s7bv017pbmbzsxpxr"; libraryHaskellDepends = [ base bytestring text uuid uuid-types ]; testHaskellDepends = [ base HUnit ]; description = "A simple wrapper around uuid"; @@ -78583,7 +83787,7 @@ self: { mkDerivation { pname = "gulcii"; version = "0.2.0.3"; - sha256 = "49d052b38c4684c377d71e28978c0578b196b7b11d861ddec6754307fcdb063d"; + sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; @@ -78598,7 +83802,7 @@ self: { mkDerivation { pname = "gutenberg-fibonaccis"; version = "1.1.0"; - sha256 = "62a7f3c1fb8fd91d884b8eeb0a9e0684ee8be3056da07d1c962927b8ada37f6f"; + sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/justinhanekom/gutenberg-fibonaccis"; description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project"; @@ -78610,7 +83814,7 @@ self: { mkDerivation { pname = "gyah-bin"; version = "0.2.2.3"; - sha256 = "88187793a26b91d7ba609886e617db7f55a61d17d0ad2d301f6a905da2de22a7"; + sha256 = "19r2vsi5v43a3wq2vbfh2wfscmbzvcbyd1lqc2xdg4bbla9pf648"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base extra GiveYouAHead ]; @@ -78627,7 +83831,7 @@ self: { mkDerivation { pname = "h-booru"; version = "0.3.0.0"; - sha256 = "861c40c4eb8a0620e1f5e0c045824b2df57a20083d1b9ba418b911598663556c"; + sha256 = "0v2mcf35j4dr32j9n6rx10h7mx9d9f14bh70yphj01laxg240746"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78652,7 +83856,7 @@ self: { mkDerivation { pname = "h-gpgme"; version = "0.4.0.0"; - sha256 = "35755834fd45de534ddbdbc66df6f1b1623410971d647bcb2e465879ca5f056d"; + sha256 = "0v85bz57jn265v5pnr0xjw838qmiy7v6vinvvd6m7pj5zls5hx9m"; libraryHaskellDepends = [ base bindings-gpgme bytestring either time unix ]; @@ -78673,7 +83877,7 @@ self: { mkDerivation { pname = "h-reversi"; version = "0.1.0.3"; - sha256 = "919633a7c253004c166b06a1b390581519f3164a2e9ca83ac4cbffe178392ee2"; + sha256 = "1qif75wf3zybqhxai71f98bg668mb28b7886dcb4q02kqakk75li"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78698,7 +83902,7 @@ self: { mkDerivation { pname = "h2048"; version = "0.2.0.1"; - sha256 = "d9b1d7750e1c7a4de1bf591c548d70af991f94969a581292bcb06eb8cc2119e9"; + sha256 = "1s8r476bhvmhpj914n4sjsa1z6dgf26m872rpzhlsyhw1rsxgcfr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78714,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 @@ -78721,7 +83937,7 @@ self: { mkDerivation { pname = "hArduino"; version = "1.1"; - sha256 = "eb04ab1d680c9174296c85c9bdd64097f499fd5636fd193c2b18de47cd27fbf6"; + sha256 = "1xpv4z6lgphq5cy1kz9navyrkx4p83bbvjc5dhlp948cd0fsn17b"; libraryHaskellDepends = [ base bytestring containers mtl serialport time ]; @@ -78735,7 +83951,7 @@ self: { mkDerivation { pname = "hBDD"; version = "0.0.3"; - sha256 = "f31db3310060c783cfa41720605f6baf52ac89cab0471c2cf0ae24ca918448ca"; + sha256 = "1jj8hj8wl95fy0n1qixhra4sqlmgddgn080plk7q7iv000qv67gk"; libraryHaskellDepends = [ base ]; description = "An abstraction layer for BDD libraries"; license = "LGPL"; @@ -78748,7 +83964,7 @@ self: { mkDerivation { pname = "hBDD-CMUBDD"; version = "0.0.3"; - sha256 = "49bd34911f24402a1b05a1a258cc35cd7c6d9ba5e622c0731678446c1289fb9a"; + sha256 = "16pvi496qi3q2rrw08p6lndnsz6d6p65i8m10ldjlh143y8k9ga9"; libraryHaskellDepends = [ base containers deepseq hBDD unix ]; librarySystemDepends = [ bdd mem ]; libraryToolDepends = [ c2hs ]; @@ -78764,7 +83980,7 @@ self: { mkDerivation { pname = "hBDD-CUDD"; version = "0.0.3"; - sha256 = "0a4a48997832ec00ae4fba8b1989656b77f40298b88a55da2223c83b84b424e5"; + sha256 = "1r94nj23pj134bd5b2mqk01g8xvbcn4ik2xs9yp01v1jg2clhjha"; libraryHaskellDepends = [ base containers deepseq hBDD unix ]; librarySystemDepends = [ cudd epd mtr st util ]; libraryToolDepends = [ c2hs ]; @@ -78774,6 +83990,22 @@ self: { }) {cudd = null; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; + "hCM" = callPackage + ({ mkDerivation, base, hashable, haskell-src }: + mkDerivation { + pname = "hCM"; + version = "0.1.0.0"; + sha256 = "0fdbl5c2pd9cf6fhblqxw4i8aqkzfh517m8wdi3i4i5ir9q0yljc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hashable haskell-src ]; + executableHaskellDepends = [ base hashable ]; + testHaskellDepends = [ base hashable ]; + homepage = "https://github.com/MarekSuchanek/hCM"; + description = "Conceptual modelling support for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "hCsound" = callPackage ({ mkDerivation, base, c2hs, csound64, libsndfile, monads-tf , transformers, vector @@ -78781,7 +84013,7 @@ self: { mkDerivation { pname = "hCsound"; version = "0.4.2"; - sha256 = "a2795fef85ebeefbab97d974673c00199dee26902fce642632955e098e639f7c"; + sha256 = "0z4zcf70jplm68k69kigj0kfx78r00y6fx6rjymzpvpbhppmyyd2"; libraryHaskellDepends = [ base monads-tf transformers vector ]; librarySystemDepends = [ csound64 libsndfile ]; libraryToolDepends = [ c2hs ]; @@ -78795,7 +84027,7 @@ self: { mkDerivation { pname = "hDFA"; version = "0.0.2"; - sha256 = "15d6ac1259763c8e6b565b82166a982a6c577d4b5e649f138183ea2f3c0edaab"; + sha256 = "1ays1qy2zsl3h49ryr2y9dymfv1ak1m1d0jvarmqwg3nb49armhm"; libraryHaskellDepends = [ base containers directory process ]; description = "A simple library for representing and minimising DFAs"; license = stdenv.lib.licenses.bsd3; @@ -78807,7 +84039,7 @@ self: { mkDerivation { pname = "hF2"; version = "0.2"; - sha256 = "9fc5e73caf796f89a544937ca7acd57893026a099ca4456aba4d78a55d1807f8"; + sha256 = "1y0731fsay2dp9m4b94w15m054vqsnnafz4k8jjqjvvrmwyfgicz"; libraryHaskellDepends = [ base cereal vector ]; description = "F(2^e) math for cryptography"; license = stdenv.lib.licenses.bsd3; @@ -78821,7 +84053,7 @@ self: { mkDerivation { pname = "hGelf"; version = "0.1"; - sha256 = "bc63290e1a875c275f59c2a39a7d2f1e21ec18a377de9f210162775435706f4a"; + sha256 = "0jkgf0sm8xv204hrzpkplccfq88y5xyrm8y2b5gjfp473872jqxw"; libraryHaskellDepends = [ aeson base bytestring cereal network old-time pureMD5 QuickCheck text time zlib @@ -78838,7 +84070,7 @@ self: { mkDerivation { pname = "hLLVM"; version = "0.5.0.1"; - sha256 = "ff73d243cc6f59d49b14e23ce37678372d236144e46781082ea287a8c301c257"; + sha256 = "0my2071si1x25q482rz48ihj6b9pg1vf6g722jdx8nbgri1x4wzz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78862,7 +84094,7 @@ self: { mkDerivation { pname = "hMollom"; version = "0.4.0"; - sha256 = "e555e663f11149e082a4be12d57f8deb918b8e1d113bcc6a7d27fac6ea9e30bf"; + sha256 = "1grhkvmcdyi7gmmcqfqi3n78p4gbimzxa4mylj1f0j8iy5iycmg5"; libraryHaskellDepends = [ aeson attoparsec base bytestring Crypto dataenc ghc-prim HTTP mtl old-locale old-time pureMD5 random time @@ -78888,7 +84120,7 @@ self: { mkDerivation { pname = "hOpenPGP"; version = "2.5.5"; - sha256 = "1801efa965085572197253eb77bfaf2fc2a20c18d93c43c436d506237871ad54"; + sha256 = "0m5df5w261nm6v246g6r306a5higmyzpgsskf8cp4m88cnlyy08q"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors binary binary-conduit byteable bytestring bzlib conduit @@ -78934,7 +84166,7 @@ self: { mkDerivation { pname = "hPDB"; version = "1.2.0.9"; - sha256 = "444b884c1e9af07ae75784d13c83736bcd94b7d766e2ec11d696e8adef8f8ecd"; + sha256 = "1kcfizpsvs4nsq8yrqk6syvr9kbbff1krlc4azkpmw4s3r68hjs4"; libraryHaskellDepends = [ AC-Vector base bytestring containers deepseq directory ghc-prim iterable mmap mtl Octree parallel QuickCheck tagged @@ -78954,7 +84186,7 @@ self: { mkDerivation { pname = "hPDB-examples"; version = "1.2.0.7"; - sha256 = "3330e001829767acfa862897c4df85d5d349e6fd2630f7d7ac7e6f5d4fde981b"; + sha256 = "06wqvr7msvvymkbzfc16zpk4klymhpgw95r8hvxaqrwph80y0c1k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78978,7 +84210,7 @@ self: { mkDerivation { pname = "hPushover"; version = "0.2"; - sha256 = "a3a9f127207032dd7aee3c5690b2d5b4c7030205393608b8765601267cd36392"; + sha256 = "14k3sdy2c0anfsw0hdir0l107ixlsnr90miwxrxdsckh40kz3ad3"; libraryHaskellDepends = [ aeson base bytestring http-conduit network text ]; @@ -78993,7 +84225,7 @@ self: { mkDerivation { pname = "hR"; version = "0.1.1"; - sha256 = "8cc67518f63bf56966f069660476309682661dc11c13de77fb5ac6ae5f1d80cd"; + sha256 = "1kc03mgsxijszdvxw4qwq4fnd0ln61v08rk9y1k6kx9vyqc7bilc"; libraryHaskellDepends = [ array base containers unix ]; description = "R bindings and interface"; license = stdenv.lib.licenses.bsd3; @@ -79005,7 +84237,7 @@ self: { mkDerivation { pname = "hRESP"; version = "0.1.0.0"; - sha256 = "3ea116a4ba2a768de90100d515f37025d9982587132f4e185293292f5ed019a1"; + sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y"; libraryHaskellDepends = [ attoparsec base bytestring ]; homepage = "https://github.com/yihuang/hresp"; description = "haskell implementation of RESP (REdis Serialization Protocol)"; @@ -79020,7 +84252,7 @@ self: { mkDerivation { pname = "hS3"; version = "0.5.9"; - sha256 = "7ee0ba24b01cdefc02f683aef16d33ac146928ae75a00e566673be12960cc759"; + sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79040,7 +84272,7 @@ self: { mkDerivation { pname = "hScraper"; version = "0.1.0.0"; - sha256 = "955cb0d84ebfcddd252aadb6dcc565de4db2e16324623d25cac7159c79c3c16a"; + sha256 = "0sn1qdwrq5f7r8jksqi4cghv4kfycp2xrdmd58jxvkdz9vcb0p4m"; libraryHaskellDepends = [ base bytestring directory HTTP http-conduit http-types parsec process regex-compat text transformers @@ -79057,7 +84289,7 @@ self: { mkDerivation { pname = "hSimpleDB"; version = "0.3"; - sha256 = "4a4da7bf0d7cbdbe546ebc19c218feef22afb958d2221ae367b3f2b3c47bb510"; + sha256 = "045mgg2b7wmkcziil8njb2wsy8pgzqcc46dwdrabxgbw1nzsfkaa"; libraryHaskellDepends = [ base bytestring Crypto dataenc HTTP hxt network old-locale old-time utf8-string @@ -79072,7 +84304,7 @@ self: { mkDerivation { pname = "hTalos"; version = "0.2"; - sha256 = "37261526551aa558b33a382a2b90d26a52437a5717918fe4e32fadcb33b58916"; + sha256 = "05l9nlrwpb9gwgj8z48paxx46lkasa82naiq7armi98salk1a9ip"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base ]; homepage = "https://github.com/mgajda/hTalos"; @@ -79086,7 +84318,7 @@ self: { mkDerivation { pname = "hTensor"; version = "0.9.1"; - sha256 = "b342d7c115af9b33a18b22b439ffc86d9141027a5ce657f6f95ee3bdf8fff523"; + sha256 = "08zmzzwbvqsyz7v5grjwg81434bdr3zkkd12ifhk76xg2p0xfhmk"; libraryHaskellDepends = [ base containers hmatrix random ]; homepage = "http://perception.inf.um.es/tensor"; description = "Multidimensional arrays and simple tensor computations"; @@ -79098,7 +84330,7 @@ self: { mkDerivation { pname = "hVOIDP"; version = "1.0.2"; - sha256 = "ccb6682f76b4da00094aeb5fe4704e9b2e13cff8013bf97e9220e73083212a65"; + sha256 = "0r9a461k1rr0j9zgjfq1z37i6blv9rqf8pzb984h1nmlfqpnidnc"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ array base hmatrix ]; @@ -79114,9 +84346,9 @@ self: { mkDerivation { pname = "hXmixer"; version = "0.3.0.0"; - sha256 = "9dc090e3a3c914b3f1e2304e28ef2f021372fa5b7705d327f6767f1bcda33cd9"; + sha256 = "1n9wlg6inzvnyqkx61bpbgx744q25zpjhkihwbqv6569lgir1h4x"; revision = "2"; - editedCabalFile = "ba9345a3146b34d0101920f9efd6af7f435188dd7ae53b50d76cc0851f13014f"; + editedCabalFile = "0kq12cgqbh3csx83prbsvn452hvzmzbfzy90348d0d3b2jilb4xs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79133,7 +84365,7 @@ self: { mkDerivation { pname = "haar"; version = "0.1"; - sha256 = "3b58835fc39fa1a54ab3530b5d2dce69beee082f9ed6d93b6045644c5331bff6"; + sha256 = "1xmz659lqr25c0xxkmly5w4fxgk9rqnms2sknd5ab8czqdgq6n1v"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -79154,7 +84386,7 @@ self: { mkDerivation { pname = "habit"; version = "0.2.2.0"; - sha256 = "59aa5d9f13c7aefd9f8134d764b2f8f8fb9a3b42cb7a42737296e36618e9cf22"; + sha256 = "08ngx4c6dqwnf9rl4ynb88xrmyzqz2r69mrlh6gzvbn72fgmvajr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79175,7 +84407,7 @@ self: { mkDerivation { pname = "hable"; version = "0.3.1"; - sha256 = "836a85271112fe458f75084144d871c5562a0590c11d9ab52ed248312852091e"; + sha256 = "07h9a8l32j6j5ssrl7f1j02jlmn5f7c48h88fn7lbzhj24kqasl3"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mekeor/hable"; description = "customizable pretty printer library for tables"; @@ -79190,7 +84422,7 @@ self: { mkDerivation { pname = "hablog"; version = "0.5.1"; - sha256 = "1a533a209b3db3035f155461ab900f6bdfd5654658a7450586257a34b604129d"; + sha256 = "178j0jv38yi5hq2lb9sq8rjxbpvb1y8anqal2mgh7crxkch3llqs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79209,7 +84441,7 @@ self: { mkDerivation { pname = "hacanon-light"; version = "2008.10.28"; - sha256 = "472141ff0559ea44154f34df1cf6298994d6cb4fb0fc469b37ffd649ce731c54"; + sha256 = "0m0wfg74kmpz6ydldz5h9z5xd54957v1rprl9wal9sjr0pzl28a7"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Template Haskell framework for automatic FFI code generation"; license = stdenv.lib.licenses.bsd3; @@ -79220,7 +84452,7 @@ self: { mkDerivation { pname = "hack"; version = "2012.2.6"; - sha256 = "b95559d2571bd1e1ec1973f4c40f7a904d54c98e4689e80a4a746aa35c522e73"; + sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr"; libraryHaskellDepends = [ base bytestring data-default ]; homepage = "http://github.com/nfjinjing/hack/tree/master"; description = "a Haskell Webserver Interface"; @@ -79235,7 +84467,7 @@ self: { mkDerivation { pname = "hack-contrib"; version = "2010.9.28"; - sha256 = "e10a8cc3547682cdddec880556a7d678b92ab92acbcba674de249bcf99430fe4"; + sha256 = "1r0g8fcwz6r4vrsadjyb5awjmfbqsskmc1c8xkfwv0knak1qq2p1"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring cgi containers data-default directory filepath hack haskell98 mps network old-locale old-time @@ -79254,7 +84486,7 @@ self: { mkDerivation { pname = "hack-contrib-press"; version = "0.1.2"; - sha256 = "5904a8dfddcdea509a2c1db8789da38e1c19a98d13ff65d748b4334408ef678b"; + sha256 = "12v7xw448cxl93bnbzqkinlij74flffpif0x5jd51sndvpgsh12r"; libraryHaskellDepends = [ base bytestring bytestring-class containers hack json mtl parsec press @@ -79272,7 +84504,7 @@ self: { mkDerivation { pname = "hack-frontend-happstack"; version = "2009.6.24.1"; - sha256 = "81c378530edac00e027269e3a78087ddcb9d9133b9bb6baa7e999669895493f4"; + sha256 = "1x4kaj4nk5lrgsm6pfxr6f8rvjyxhy0agqv9f810xh6s1r9pihw1"; libraryHaskellDepends = [ base bytestring containers hack happstack-server network utf8-string @@ -79288,7 +84520,7 @@ self: { mkDerivation { pname = "hack-frontend-monadcgi"; version = "0.0.3.1"; - sha256 = "6290fa77d8ef64be4235a7bb7b31211d37b6b7b5f951118b956d802d09710a54"; + sha256 = "0m0af44jv03djn5i2lgrnnvvcdqx44qppfx76m1bwr7gv1vzm432"; libraryHaskellDepends = [ base bytestring cgi containers hack ]; description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -79299,7 +84531,7 @@ self: { mkDerivation { pname = "hack-handler-cgi"; version = "0.2.0.2"; - sha256 = "5d5c3b94664fc81638cd512382adf4f0a52583e2ce39de32864aad4692dea85e"; + sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x"; libraryHaskellDepends = [ base bytestring hack ]; homepage = "http://github.com/snoyberg/hack-handler-cgi/tree/master"; description = "Hack handler using CGI protocol. (deprecated)"; @@ -79314,9 +84546,9 @@ self: { mkDerivation { pname = "hack-handler-epoll"; version = "0.1.3"; - sha256 = "02dd1477efcc58da6f790cccb4b0e928d209c13b19723a8a1f89a19ed0e18c60"; + sha256 = "0q4cw789x8c93y53lwhr7g0hkli8x6qb9k0cg5pxln6cxxvi9p82"; revision = "1"; - editedCabalFile = "e237061a017229aaa9f0afcfed7c3d331b95a992ed71124a0a3131e96887f139"; + editedCabalFile = "0fgihxlfjc9i19514wgdjalra6rk7myfvkxgy2lslabj04d0cdz2"; libraryHaskellDepends = [ base containers data-default epoll failure hack HTTP network unix utf8-string @@ -79334,7 +84566,7 @@ self: { mkDerivation { pname = "hack-handler-evhttp"; version = "2009.8.4"; - sha256 = "9fce27e21919e6fae13825ac06ee25cb6aa1f5f8a57da33cea6daa2793a609a8"; + sha256 = "1a09ls9jgakdx8ya6zd5z3ss2snb4pp0db1573hzmrhr37i2gklz"; libraryHaskellDepends = [ base bytestring bytestring-class containers data-default hack hack-contrib network @@ -79351,7 +84583,7 @@ self: { mkDerivation { pname = "hack-handler-fastcgi"; version = "0.2.0.1"; - sha256 = "d92ad8b7846aaabe596c3d2e34af2761555adcde44937837c0c8e394c780540b"; + sha256 = "02slh33r9qy8q0vpi4s4vvf5lmb14ypk8bixdicvxakahjvxhanr"; libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ]; librarySystemDepends = [ fcgi ]; homepage = "http://github.com/snoyberg/hack-handler-fastcgi/tree/master"; @@ -79367,7 +84599,7 @@ self: { mkDerivation { pname = "hack-handler-happstack"; version = "2009.12.20"; - sha256 = "e4c169c7c4f9e011d0067bff441ecedc82c23fe46d0ceaa88aa95cf5c2656381"; + sha256 = "10b3cp1gap59ialfl33dwhzw50nwrqg49zvv0v813q7rqk3nkhg4"; libraryHaskellDepends = [ base bytestring cgi containers data-default hack happstack-server mtl network @@ -79385,7 +84617,7 @@ self: { mkDerivation { pname = "hack-handler-hyena"; version = "2010.3.15"; - sha256 = "582c592a585691d5db1a6bcd24d62cf312a2d55a8502cc6c17ffaa18e2f41fdc"; + sha256 = "1p0zyki1iapz2xncq0l5bbas44pk5kb29kbb3bdxb4anb0m5jb2q"; libraryHaskellDepends = [ base bytestring containers data-default hack hyena network ]; @@ -79400,7 +84632,7 @@ self: { mkDerivation { pname = "hack-handler-kibro"; version = "2009.5.27"; - sha256 = "221d75aff4a82c5dcfef3e70e76f0104f17019be5b0decf25719927c6e06c35f"; + sha256 = "0py30rp7r4hrazrfq3avpqcp1w8405pyfw1yxz7msb58yjppa792"; libraryHaskellDepends = [ base cgi data-default hack kibro network ]; @@ -79417,7 +84649,7 @@ self: { mkDerivation { pname = "hack-handler-simpleserver"; version = "0.2.2"; - sha256 = "7ee8c60dd571480e5f9e08b31674c7a2af564e6458d8e235c4f3cffef27df1dc"; + sha256 = "1p7igprgxkzkqhsy5n2qci75dbx2qxs1dcq8krghwj3isl6wds3y"; libraryHaskellDepends = [ base bytestring failure hack network web-encodings ]; @@ -79432,7 +84664,7 @@ self: { mkDerivation { pname = "hack-middleware-cleanpath"; version = "0.0.1.1"; - sha256 = "c4c615d3c5df0a9d9cf1b2b239a9c81ad0de8837a7fc660a1cc34e1ea7540704"; + sha256 = "0107ajkiwkn33h56dz576y4dxl0sr2lkkcmjy6f9s2nzqp9ibin4"; libraryHaskellDepends = [ base bytestring hack split web-encodings ]; @@ -79449,7 +84681,7 @@ self: { mkDerivation { pname = "hack-middleware-clientsession"; version = "0.0.1.1"; - sha256 = "2e1cc4a9eed29fee88a231c37ac024192e9f09a62a7d35c8c32c39a837159440"; + sha256 = "0h4l2lvshf9cqg43az9alq4rybhr4k07mhrila4fx7yjxslw871f"; libraryHaskellDepends = [ base clientsession hack old-locale predicates time web-encodings ]; @@ -79464,7 +84696,7 @@ self: { mkDerivation { pname = "hack-middleware-gzip"; version = "0.0.0.1"; - sha256 = "e040a672e00a391be308d0b9e87d6680acf68818d333ed3d21efc0349211e5f4"; + sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70"; libraryHaskellDepends = [ base hack split zlib ]; homepage = "http://github.com/snoyberg/hack-middleware-gzip/tree/master"; description = "Automatic gzip compression of responses. (deprecated)"; @@ -79478,7 +84710,7 @@ self: { mkDerivation { pname = "hack-middleware-jsonp"; version = "0.0.2.1"; - sha256 = "3c820f0d4671ddf5f60ca853c64e0cccda434a154866c15b71c500a00321f43c"; + sha256 = "0g7l441s0065f5dw2rj82m547nnc1i7cclx81kvgbpbi8q6hz0iw"; libraryHaskellDepends = [ base bytestring bytestring-class hack web-encodings ]; @@ -79493,7 +84725,7 @@ self: { mkDerivation { pname = "hack2"; version = "2014.11.17"; - sha256 = "48b84c2c5f9c314e90b36b4d6992045e93f36dc6b0dfb4be671a95ad63fbd2ac"; + sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28"; libraryHaskellDepends = [ base bytestring data-default ]; homepage = "https://github.com/nfjinjing/hack2"; description = "a Haskell Webserver Interface (V2)"; @@ -79507,7 +84739,7 @@ self: { mkDerivation { pname = "hack2-contrib"; version = "2015.5.4"; - sha256 = "739350c083d429d69f3b06ae47153b7e0c2ed8e271bf5fae0309b8b2d4b26ded"; + sha256 = "1vbdnbab5f090fp5zgviwbc2w33y7calgbh67fgxcaflhg0514vk"; libraryHaskellDepends = [ air base bytestring containers data-default directory filepath hack2 network-uri text time @@ -79525,7 +84757,7 @@ self: { mkDerivation { pname = "hack2-contrib-extra"; version = "2014.12.20"; - sha256 = "949765c6186f95fafea5167c460026a494e2385b25db5987289c8d5432ddafd7"; + sha256 = "1mxgvlr593cw523mknr5bcwf55544q04cz0nlpzgm5bg3336b5wl"; libraryHaskellDepends = [ air air-extra base bytestring cgi containers data-default directory filepath hack2 hack2-contrib network old-locale old-time time @@ -79542,7 +84774,7 @@ self: { mkDerivation { pname = "hack2-handler-happstack-server"; version = "2011.6.20"; - sha256 = "fdcec314674580aed6442c60d21a578111a23b9438006bc261d70803dccfb684"; + sha256 = "115nrzf0626pc716n01qjhxs44c1awdd4q1c8kbax025cwac7kpx"; libraryHaskellDepends = [ base bytestring cgi containers data-default enumerator hack2 happstack-server mtl network @@ -79562,7 +84794,7 @@ self: { mkDerivation { pname = "hack2-handler-mongrel2-http"; version = "2011.10.31"; - sha256 = "3c14b449b0381e9dab115798e01cb323bd49317717f336ba37c9d8015056d5df"; + sha256 = "1pymar803n696yx3dwqpfwqlkg93ncff162p26mrs7iqn14v851w"; libraryHaskellDepends = [ aeson air attoparsec base blaze-builder blaze-textual bytestring containers data-default directory enumerator hack2 mtl network safe @@ -79582,7 +84814,7 @@ self: { mkDerivation { pname = "hack2-handler-snap-server"; version = "2015.3.9"; - sha256 = "07ae1572e333536bab33e6b12acc472504b4eb7e7741142d08e4124299ad45e3"; + sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7"; libraryHaskellDepends = [ air base blaze-builder bytestring case-insensitive containers data-default directory enumerator hack2 mtl network snap-core @@ -79601,7 +84833,7 @@ self: { mkDerivation { pname = "hack2-handler-warp"; version = "2012.5.25"; - sha256 = "25a78ed33e0d6a609412f257c6164855cd1cd45dd1a7c5aea374f6921c9c14dc"; + sha256 = "1p0lkhf95xkllfpcb9yibpa1rkam90bccmzj2aa60shd7v9qx9r5"; libraryHaskellDepends = [ air base data-default hack2 hack2-interface-wai warp ]; @@ -79618,7 +84850,7 @@ self: { mkDerivation { pname = "hack2-interface-wai"; version = "2017.1.4"; - sha256 = "db7e508b87c8bb0a0b0eb4a00558ca5feadd4ddbf290da5cc5bb3511a37352ea"; + sha256 = "1sjjffii2ddvqmfdm47jvd6xvsjzr9c0b85l1q5hmfy8hy5m0znv"; libraryHaskellDepends = [ base bytestring case-insensitive containers data-default hack2 http-types network safe wai @@ -79636,9 +84868,9 @@ self: { mkDerivation { pname = "hackage-db"; version = "1.22"; - sha256 = "4d32a368f8d41cba824bc7a1869d9b8df0e845496a4610f6e7f32791083f1066"; + sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd"; revision = "1"; - editedCabalFile = "b5277a8cbbfcfba81f29db4910003c2fa7e34c06bceb4f3e7318510e1ce74376"; + editedCabalFile = "0xj3wwf0wl8qfcz4zsxw0r6f79rg7h010jfv54gsiyzwpf67l9xm"; libraryHaskellDepends = [ base bytestring Cabal containers directory filepath tar utf8-string ]; @@ -79656,7 +84888,7 @@ self: { mkDerivation { pname = "hackage-diff"; version = "0.1.0.1"; - sha256 = "251410eafa7672c817ef5b697798770b37795e9699e42059aeba9e4b82b4d002"; + sha256 = "00nhnj14p7msmrcj1r4rjrg7jdqbfyc7fsavxwbwhwknzbm10515"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79681,7 +84913,7 @@ self: { mkDerivation { pname = "hackage-mirror"; version = "0.1.1.1"; - sha256 = "d710bae7061d831ae6c018691011344dd8cf93b08b950944aed7c119fbee8eae"; + sha256 = "1blfxvxikhfpmr20k5cbn29wzn2d6h8i0s8qq3k1m0qx0vkvl46p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79707,7 +84939,7 @@ self: { mkDerivation { pname = "hackage-plot"; version = "0.2.1"; - sha256 = "a1aa7276d17c2a9fdb54bcdb0a4a396a51e6037cc82bc223c1e14bdb54b57487"; + sha256 = "11vlnmadnjz1q4iw4ay8gh1yclba7550mnxwakdryakws5v75am1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79725,7 +84957,7 @@ self: { mkDerivation { pname = "hackage-processing"; version = "0.0.0.1"; - sha256 = "98de2ade50bf613a9172322b00d05c9d40a51e8f65aedfe4a876ed9c3b4f8b67"; + sha256 = "0rwb9wxrrvbnm3jdzbk5iwgaah4xbk800arjfa8klqdza3g2mplq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal containers hackage-db ]; @@ -79744,7 +84976,7 @@ self: { mkDerivation { pname = "hackage-proxy"; version = "0.3.0.1"; - sha256 = "d7031df4aeeb2bb49eb6fa869147a039f70cb6267256d7d93767597080ac2cee"; + sha256 = "1vicmj070nb76zcxfmkj4sv0rxrrl13r31psnsgb8azbmvs1s0yp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79767,9 +84999,9 @@ self: { mkDerivation { pname = "hackage-repo-tool"; version = "0.1.1"; - sha256 = "23f6c2719d42ce51ae8fe9dc6c8d9c8585265486df81d4ca483b28cc917064f4"; - revision = "1"; - editedCabalFile = "0ff107dc07dc9099ef89c1195c1bc26f482ed25bc0d858422ed3c870e7179d0e"; + sha256 = "1x34f28wqa1v935d90fzhra2d1c5kj6nrp79iyp53kj2kmqw5xi3"; + revision = "2"; + editedCabalFile = "04mlgliz33sb9dwzayd858b42pa30a7wpcd9jgmk1kc59dlv1y38"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79793,9 +85025,9 @@ self: { mkDerivation { pname = "hackage-security"; version = "0.5.2.2"; - sha256 = "507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41"; - revision = "2"; - editedCabalFile = "678fde798c4291a66cc8d0497c1df558292dd8526b46132d6c651dc090ef0e5a"; + sha256 = "0h9wag599x9ysdrgwa643phmpb1xiiwhyh2dix67fji6a5w86yjh"; + revision = "4"; + editedCabalFile = "154xjzmzg14zcqxzhcf0kmdmm6hwnhx19x6kddakkrylfqap14j2"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -79818,9 +85050,9 @@ self: { mkDerivation { pname = "hackage-security-HTTP"; version = "0.1.1"; - sha256 = "cd22ac26027df4a6f9c32f57c18a2fad6b69249e79aeeb4081128fd188cd1332"; + sha256 = "0chkrn4d33qjh50fpbkrkqj6jsxd5y5c2mrgqgwsdx3x08kaq8nd"; revision = "1"; - editedCabalFile = "7285a235c94e56319275337ad1c82b3f84982e58f1b1fdb3a88d7b3c2d966286"; + editedCabalFile = "11k2jqnkqywdm2rzvcgib0p9i11z5g4d2yikfn932mjfr4ss51bj"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -79843,7 +85075,7 @@ self: { mkDerivation { pname = "hackage-server"; version = "0.5.0"; - sha256 = "31346fa172d5173c11952ae4872abcb81fde8e5574a7355f877994a729135ef7"; + sha256 = "1xsy2clsg53rhxgkb9vlan7dw7xqphm8gr1ajl8kq5ymfahnyd1i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79874,7 +85106,7 @@ self: { mkDerivation { pname = "hackage-sparks"; version = "0.5.1"; - sha256 = "dc62a250f7f0415eb941365fb1228719e9c7f8afdeb193fb8e7aa2b042db832c"; + sha256 = "0b43vd1b18ksivxr7cfymzwcgs8rhwib2prn86wmwhghyx8a4qnw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79894,7 +85126,7 @@ self: { mkDerivation { pname = "hackage-whatsnew"; version = "0.1.0.1"; - sha256 = "0d20f9aff145861f0746950028304a285968a72c5d3aeec797d9826dbca1e02d"; + sha256 = "0bg0l6y6v0nrjz3ywfjx5jknhn9898q2h04m8q3iz1j5y6pzj80d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79912,7 +85144,7 @@ self: { mkDerivation { pname = "hackage2hwn"; version = "0.5.1"; - sha256 = "d8403b64be50b21d3256ed9f57bb2c839230a1030e58dd7b0aa1b7f3023b776d"; + sha256 = "0vbp7c1g7dx119xxsn0f0fhk14l35jxmg7zdaqr1vcjhprj3nh6q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base download feed tagsoup ]; @@ -79927,7 +85159,7 @@ self: { mkDerivation { pname = "hackage2twitter"; version = "0.2.1"; - sha256 = "f8497d395dfe466697cf2da21b3ef7ede9e78619a9a2ebe0a018f61a53a1308c"; + sha256 = "131hl59imxhql3hfp8m9363fgsgdywz1p8idrybncipyblwpsjgq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base feed feed2twitter ]; @@ -79944,7 +85176,7 @@ self: { mkDerivation { pname = "hackager"; version = "1.3.0.1"; - sha256 = "699643e74c114f9b6bfc0f0c517381bb36620f6b5cd0dd2b6a5d57b651e3eb5c"; + sha256 = "0p7bwd8vcmsxd8mxvl2wdc7n4dmvh5rm230gzimrnkqi9kkl75k9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79962,8 +85194,33 @@ self: { }: mkDerivation { pname = "hackernews"; - version = "1.1.1.0"; - sha256 = "6544eb03de96d0c9b6de1556b8efba3b4265f84ab65a351068fdad199c9fe844"; + version = "1.1.2.0"; + sha256 = "07hsky158rgl3v70vrvfj1babvk9ad3pmasvx5sd932rkdwmz8g5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base http-client http-types QuickCheck quickcheck-instances + servant servant-client string-conversions text + ]; + executableHaskellDepends = [ base http-client http-client-tls ]; + testHaskellDepends = [ + aeson base hspec http-client http-client-tls QuickCheck + quickcheck-instances + ]; + description = "API for Hacker News"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hackernews_1_2_0_0" = callPackage + ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls + , http-types, QuickCheck, quickcheck-instances, servant + , servant-client, string-conversions, text + }: + mkDerivation { + pname = "hackernews"; + version = "1.2.0.0"; + sha256 = "08akddv2n1zll630vqi5i9ja1q99zp75hbx1jkgzp9ly81pdf1v7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79985,7 +85242,9 @@ self: { mkDerivation { pname = "hackertyper"; version = "0.1.0.1"; - sha256 = "ee158162d356a3e1422eb994b21db9e9a369b6f8ec57a8b85be4a0838c3b879d"; + sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf"; + revision = "1"; + editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -80002,7 +85261,7 @@ self: { mkDerivation { pname = "hackmanager"; version = "0.1.0.0"; - sha256 = "8a5cebf772c8f99b2e56deb9f64a90344ded1528ac1a9967eab2776d72053546"; + sha256 = "0iim0mr6sxxjx9krj6mc50aysk9lj15gdffyaqp9pyf8fbvynp4a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80027,8 +85286,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.5.2"; - sha256 = "fa38878313ab5075d86438d3853760b48c5a943a822a91f6a4057424abed7c63"; + version = "0.5.3"; + sha256 = "1ywmrr2frvp3pz4c6dvsp9vqwykhbwbdaykjpsyrjq0idn47akhf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80055,7 +85314,7 @@ self: { mkDerivation { pname = "hactor"; version = "1.2.0.0"; - sha256 = "1e39fbab2768fae514dc955feb83cd571a034feea6e806288a5775f7b88bf649"; + sha256 = "0jgnifwgfxapi8l0ds56xr7h66jprn1ynpwmvhafbyk84ymznf8y"; libraryHaskellDepends = [ base containers monad-control mtl resourcet stm stm-chans transformers-base @@ -80071,7 +85330,7 @@ self: { mkDerivation { pname = "hactors"; version = "0.0.3.1"; - sha256 = "403651a53a264f6b89ccbd093f73529b7198eb15158c79db97deda97f6a0ac5b"; + sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/treep/hactors"; description = "Practical actors for Haskell"; @@ -80086,7 +85345,7 @@ self: { mkDerivation { pname = "haddock"; version = "2.16.1"; - sha256 = "46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6"; + sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -80103,8 +85362,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { pname = "haddock"; - version = "2.17.2"; - sha256 = "9dd499b022b775b1168c2a8fc940a8cca5eec2416289277a8f59d7321117bb15"; + version = "2.17.5"; + sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -80124,7 +85383,7 @@ self: { mkDerivation { pname = "haddock-api"; version = "2.15.0.2"; - sha256 = "87228957b713ed087fdeb1031dc2af5bdf20c24377218100c5063d3c5ae4b5bd"; + sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7"; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-paths haddock-library xhtml @@ -80143,7 +85402,7 @@ self: { mkDerivation { pname = "haddock-api"; version = "2.16.1"; - sha256 = "e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea"; + sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2"; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-paths haddock-library xhtml @@ -80161,10 +85420,8 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.17.3"; - sha256 = "8d35a256c2ee07083c1e1a8b08e536069ffdad27598bed69d88847fb51234dc7"; - revision = "1"; - editedCabalFile = "5d33603e8e6befb2c2ed2dd8c5029b78e1377a387b165671105cadb9cb7df4f8"; + version = "2.17.4"; + sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss"; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-boot ghc-paths haddock-library transformers xhtml @@ -80182,7 +85439,7 @@ self: { mkDerivation { pname = "haddock-leksah"; version = "2.6.0"; - sha256 = "106966d5ee7f88e652c81244837a5237926cb8123b9957ca6c74f93e61b4a6a8"; + sha256 = "1a56nihkxybldk55g69v2aw6r4ipa9x86i0jr19fd23zxvancs8h"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -80201,7 +85458,7 @@ self: { mkDerivation { pname = "haddock-library"; version = "1.2.1"; - sha256 = "0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056"; + sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g"; libraryHaskellDepends = [ base bytestring deepseq transformers ]; testHaskellDepends = [ base base-compat bytestring deepseq hspec QuickCheck transformers @@ -80218,8 +85475,8 @@ self: { }: mkDerivation { pname = "haddock-library"; - version = "1.4.2"; - sha256 = "e8edf0714ef3c0e64ad61db6e9f3c1ca0980941b4e9128c94881588cdb4168dc"; + version = "1.4.3"; + sha256 = "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p"; libraryHaskellDepends = [ base bytestring deepseq transformers ]; testHaskellDepends = [ base base-compat bytestring deepseq hspec QuickCheck transformers @@ -80236,7 +85493,7 @@ self: { mkDerivation { pname = "haddock-test"; version = "0.0.1"; - sha256 = "fce8e5e2c45604f6032dffa896acbaf1aadf73dcc38992a466c6749e9d75a8ab"; + sha256 = "1ax8fnfrwx66csj952f3virxzapipan9da7z5l1zc12nqkifbs7w"; libraryHaskellDepends = [ base bytestring Cabal directory filepath process syb xhtml xml ]; @@ -80254,7 +85511,7 @@ self: { mkDerivation { pname = "haddocset"; version = "0.4.2"; - sha256 = "a8f687bb96989a85dc56a208e04bde55f4a6c4473d6ff42ff2ae0d6a62511290"; + sha256 = "140ja5i6l3dfy8pz8vrx8z2adx2mvr5y0252avf8b6lqjsxqgxm8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80275,9 +85532,9 @@ self: { mkDerivation { pname = "hadoop-formats"; version = "0.2.1.1"; - sha256 = "ea95ddbf658574d2ecb7183cc4cb933027db8e828abb3263fbb0d7f1653268f0"; + sha256 = "1w3869jz3mxhzdik5fwaha7dn9rhjg5w8g0qnznd4x45cnzxv5ga"; revision = "1"; - editedCabalFile = "59248cb9b3f28b9f003d694ee356a13ff1313c8edd3bf2963c154ce7e1de0553"; + editedCabalFile = "0lq5vvhyfk0m7jbg4fyxiqy33w9zl5bf6kk97l09z2zjnfwqq92r"; libraryHaskellDepends = [ attoparsec base bytestring text vector ]; librarySystemDepends = [ snappy ]; testHaskellDepends = [ base bytestring filepath text vector ]; @@ -80296,7 +85553,7 @@ self: { mkDerivation { pname = "hadoop-rpc"; version = "1.1.0.0"; - sha256 = "81de43a08f3aad3370fead1ac2f576425de3ea02913f0c854319c05c46defcf9"; + sha256 = "1ygwvr35rh0r8f2hqgwi0bmf6pa2fvsw46mdzrq37b9siyh47pl1"; libraryHaskellDepends = [ attoparsec base bytestring cereal exceptions gsasl hashable monad-loops network protobuf random socks stm text transformers @@ -80318,7 +85575,7 @@ self: { mkDerivation { pname = "hadoop-tools"; version = "1.0.1"; - sha256 = "1f911291ab75f3ec970d428c0d8335ec7891a0fffe4bcad6df4ba37f5c45a81b"; + sha256 = "06x88mf7z8sbvzbcljzyzyh92y7c6n1hv3221nbyrwvmmf8i548z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80343,7 +85600,7 @@ self: { mkDerivation { pname = "haeredes"; version = "0.4.4"; - sha256 = "bdc2446b176c50d4f0fb5a52aaa7c0f4369999adc50be74935bea59a5f2964ac"; + sha256 = "1b3455grm9dy6m4yf2y5mncrjdplq2kslljszgqd8l3c2xml9hmx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80365,7 +85622,7 @@ self: { mkDerivation { pname = "haggis"; version = "0.1.3.0"; - sha256 = "68f91cffb7c2078b5c33daba0d88c46e97f3c245d811d507fa42f06567c0cf38"; + sha256 = "0f6gq1knbw22z83xa4fq8p1g75vfqj40vfns6df8n1y2nzziryb8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80388,7 +85645,7 @@ self: { mkDerivation { pname = "haha"; version = "0.3.1.1"; - sha256 = "203889a745cc8929d46b976fe0cfdcaf6f610c4872aaad36b7dee6a4a7f1daed"; + sha256 = "1vfsy6ks9rnynwvavakj90662vxgvk7y0vwpdga2k2fc8nkqjf10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers time ]; @@ -80403,7 +85660,7 @@ self: { mkDerivation { pname = "hahp"; version = "0.1.3"; - sha256 = "1f09efd95604fa3443a2e611d94f5362f9c8223e3dce77ceadea235ddb4d34cd"; + sha256 = "1k9l9pdms8zamp77gkix7qiciyb2ad7xj4g6l91k9yh4avcyy28z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80422,8 +85679,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.2.0.0"; - sha256 = "139200be3876156fc26fff1fe0e7ca94b8807e1e13004329800204763ee9f728"; + version = "0.2.1.0"; + sha256 = "054iyikik4n2qkpbpc4p1jikj7z6vgvcjhm3ay9mi9zwmz0mb3f8"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -80437,6 +85694,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hail" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, http-client + , lens, lens-aeson, netrc, network-uri, optparse-applicative + , parsec, process, text, wreq + }: + mkDerivation { + pname = "hail"; + version = "0.1.0.3"; + sha256 = "1nh76kk3bfnx802kc6afj6iw1xkj5s4sz07zwmhq32fvqbkmw889"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath http-client lens lens-aeson + netrc network-uri optparse-applicative parsec process text wreq + ]; + homepage = "https://github.com/TaktInc/hail"; + description = "A service for pull-based continuous deployment based on hydra"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hailgun" = callPackage ({ mkDerivation, aeson, base, bytestring, email-validate , exceptions, filepath, http-client, http-client-tls, http-types @@ -80444,13 +85721,14 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.2"; - sha256 = "f0b8e11e2a09d0d737620ed46e8029c5679cfe392c47df4be5ee3ba63a114ff1"; + 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; }) {}; @@ -80460,7 +85738,7 @@ self: { mkDerivation { pname = "hailgun-send"; version = "0.1.1.1"; - sha256 = "86a154980b751d629e357548a5e3df3bb957a6e53f123193a74d73b7cafbbbb3"; + sha256 = "1cxvzg5bfwsdly9k24izwnk5gf9vvzisaj3m6ng647bm1fc598c6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80478,7 +85756,7 @@ self: { mkDerivation { pname = "hailgun-simple"; version = "0.1.0.0"; - sha256 = "30526e6b7ec6083b090e880ef6fe942cc8425d3b2700bac565e4fc6629ec2954"; + sha256 = "0m19xhlndz74cp2vl0177dfl5j1cjkzgc3l81q4kn266grmnwlih"; libraryHaskellDepends = [ base email-validate hailgun mtl text transformers ]; @@ -80501,7 +85779,7 @@ self: { mkDerivation { pname = "hails"; version = "0.11.2.1"; - sha256 = "ecb8d9a72d3b839c2ae28ec919c36f64e006b1ff711cd43e3a5df7fb703c84e8"; + sha256 = "1s447iqgpxsx78zd873izyqhdq34dz1ikjcfw8m9r0rv5nkxkf7c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80536,7 +85814,7 @@ self: { mkDerivation { pname = "hails-bin"; version = "0.1.1.1"; - sha256 = "793b8b139eb3ce287a9597d3f7135115d379aa8f92df5c93c71f41386bf1d800"; + sha256 = "006qy5mkhh8zqy9mrpwjiym7klqma49zglwpjmx2ikmkkq9qnfvr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80556,7 +85834,7 @@ self: { mkDerivation { pname = "hairy"; version = "0.1.3"; - sha256 = "57d1cb7c8f7efa95ee5e20b9ac7376f1312be204f507e65837a58e96e4f36fa6"; + sha256 = "19kgygj9d3m56xcfc1zm0ki2ncgifrrsrf90bvp9bykyixycplap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80588,7 +85866,7 @@ self: { mkDerivation { pname = "hakaru"; version = "0.1.4"; - sha256 = "0e0aadcfc3b112603e20837be836ab49f8988181c4f9fa23610fdfc92412750c"; + sha256 = "033m28jckpqgc4izmyf4h60riy29mcvfhyw340z604miqg7ss2hf"; libraryHaskellDepends = [ aeson array base bytestring cassava containers directory hmatrix integration logfloat math-functions monad-loops mwc-random parallel @@ -80615,7 +85893,7 @@ self: { mkDerivation { pname = "hake"; version = "1.3.8.1"; - sha256 = "2ba472d61f8396a237fc52430fc3aa996a46683c0c651862f79d18b38c211e40"; + sha256 = "0h0y466b664xyxi1hr8c7il4cslrmb1hyhsjzhvs55l33zb7591b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath mtl time ]; @@ -80630,7 +85908,7 @@ self: { mkDerivation { pname = "hakismet"; version = "0.1"; - sha256 = "a425893886961e8cdbf54a23be4186307a05558bfab9709703769b60d5b7b5b5"; + sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4"; libraryHaskellDepends = [ base HTTP network ]; homepage = "https://code.reaktor42.de/projects/hakismet"; description = "Akismet spam protection library"; @@ -80638,6 +85916,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakka" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "hakka"; + version = "0.2.0"; + sha256 = "02rd2sw4a6ayr4kqqvkr14gxbpd3y9m92m9kvkk5m5701l1nz0xq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base transformers ]; + executableHaskellDepends = [ base ]; + description = "Minimal akka-inspired actor library"; + license = stdenv.lib.licenses.mit; + }) {}; + "hako" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, QuickCheck , template-haskell, text, transformers @@ -80645,7 +85937,7 @@ self: { mkDerivation { pname = "hako"; version = "1.0.0"; - sha256 = "35df93d935c18ebde3f2a4c5127c45b8e242547b231dd58f52007a214a099cbd"; + sha256 = "1gcw15522yh0aa7xa793gda45qmq8my15id4ybivv3n16pcr7prm"; libraryHaskellDepends = [ base haskell-src-meta parsec template-haskell text transformers ]; @@ -80668,8 +85960,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.5.1"; - sha256 = "8deca33939717372ca227559dfe82aa0b02af49b19e9ea60051f555dcee2cfe6"; + version = "4.9.7.0"; + sha256 = "1zy2328lj7k6j0h7nrcd998sk1hbcl67yzaiysaxyif5c60l05ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80698,13 +85990,57 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; + "hakyll_4_9_8_0" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptohash, data-default, deepseq, directory + , filepath, fsnotify, http-conduit, http-types, lrucache, mtl + , network, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base + , regex-tdfa, resourcet, scientific, system-filepath, tagsoup + , tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, utillinux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.9.8.0"; + sha256 = "0jjy1j79vzkdpi2ksql5bzwv2bw3bk6h0jgi73ngj8lkrm6q80b3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptohash data-default deepseq directory filepath fsnotify + http-conduit http-types lrucache mtl network network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-base regex-tdfa resourcet scientific system-filepath tagsoup + text time time-locale-compat unordered-containers vector wai + wai-app-static warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptohash data-default deepseq directory filepath fsnotify + http-conduit http-types lrucache mtl network network-uri + optparse-applicative pandoc pandoc-citeproc parsec process + QuickCheck random regex-base regex-tdfa resourcet scientific + system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text + time time-locale-compat unordered-containers vector wai + wai-app-static warp yaml + ]; + testToolDepends = [ utillinux ]; + homepage = "http://jaspervdj.be/hakyll"; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: mkDerivation { pname = "hakyll-R"; version = "0.1.0.3"; - sha256 = "6365011bd83dd4346ea7cae7f9cd8d1b942436a4dee523c493ea6409fdad206b"; + sha256 = "0sr0mpyhjr7ajg227rfylhv2950vip6zkryalxp39m1xv0dh2rb3"; libraryHaskellDepends = [ base directory filepath hakyll pandoc process ]; @@ -80720,7 +86056,7 @@ self: { mkDerivation { pname = "hakyll-agda"; version = "0.1.10.1"; - sha256 = "83fa165cc9e485f8a84a73ff754e7315efdad7fb5c5a27c7798c89002d1a0c4d"; + sha256 = "0k8c38nh12ccg73jfnjwzgbxmvqmfd77bzvk9algi1g4r5f1dyl3"; libraryHaskellDepends = [ Agda base containers directory filepath hakyll mtl pandoc transformers xhtml @@ -80736,7 +86072,7 @@ self: { mkDerivation { pname = "hakyll-blaze-templates"; version = "0.1.1.0"; - sha256 = "32dc93abc20b115b36c97ce92496994d911e59c87d98ce7c9ddd0b4d711eb485"; + sha256 = "11dl3rqls2yxkmycx63xr1cix4adk6b29sbwr4v5n48bqamr7p1j"; libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ]; description = "Blaze templates for Hakyll"; license = stdenv.lib.licenses.bsd3; @@ -80748,7 +86084,7 @@ self: { mkDerivation { pname = "hakyll-contrib"; version = "0.1.0.1"; - sha256 = "244416d4679e7e61ea6218ddb43ca1a5bb3387dd084b58b0ebb028c3a3a24370"; + sha256 = "0w23laiw6a5hxfq5hjq8vn3k7fx5l4yb9p8qcbm62zlycza1ci14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hakyll pandoc ]; @@ -80766,7 +86102,7 @@ self: { mkDerivation { pname = "hakyll-contrib-csv"; version = "0.1.0.2"; - sha256 = "b7deef8642a4da8194878c4b32b13925bd9e9ea5edfce68e870383a18b4f0def"; + sha256 = "1vqd9y5s30q3hy7fdz7dlng9xg9576qk4jwchya83nm48a3fzpmp"; libraryHaskellDepends = [ base blaze-html bytestring cassava hakyll vector ]; @@ -80784,7 +86120,7 @@ self: { mkDerivation { pname = "hakyll-contrib-elm"; version = "0.1.0.1"; - sha256 = "8bcb079e6b599059a17672b8664036d07775c3870cd1840d9bf09d5ebbfbf42b"; + sha256 = "0azlzfxmx7ghkc6q9l8chz1paxyh6r06df3jfshmk42rdfg0gjwb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80802,7 +86138,7 @@ self: { mkDerivation { pname = "hakyll-contrib-hyphenation"; version = "0.1.0.3"; - sha256 = "55c9e6a0c47ceb36eb439578ab013c8effa91b585deb932631f13d1777d46b56"; + sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam"; libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ]; homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation"; description = "automatic hyphenation for Hakyll"; @@ -80818,7 +86154,7 @@ self: { mkDerivation { pname = "hakyll-contrib-links"; version = "0.2.0.0"; - sha256 = "c5c79903e90dbde4ca8794c5b4c7677d4b2a352342629139269277cc2e42ef3f"; + sha256 = "0gzg88pcqxwj4qwr2qj24csjljvxcz3v9iclhz5f9g8dx41rkiy5"; libraryHaskellDepends = [ base binary containers hakyll pandoc pandoc-types parsec ]; @@ -80837,7 +86173,7 @@ self: { mkDerivation { pname = "hakyll-convert"; version = "0.2.0.0"; - sha256 = "27feaacd5a6c6d9f633bfb0ffc731528f216bd295d4a801b2bcbd47af5ed985c"; + sha256 = "0p4qxpspmm6b5cdq0jjx56yidwi82mrzq3zv7diryvbcbb6smzi7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80859,7 +86195,7 @@ self: { mkDerivation { pname = "hakyll-elm"; version = "0.2.1"; - sha256 = "f3e248d6ea8426434f68dc45c2269dfd205f143c8c91b7a95780289d5567fc2d"; + sha256 = "0bgwcxarsa40aylvg4cc7ha5y87xklkc4ifwd17l69l4xbb4iqpk"; libraryHaskellDepends = [ base blaze-html blaze-markup Elm hakyll mtl ]; @@ -80868,13 +86204,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hakyll-favicon" = callPackage + ({ mkDerivation, base, filepath, hakyll }: + mkDerivation { + pname = "hakyll-favicon"; + version = "0.1.0"; + sha256 = "02j2mljq07vpfc5k3f959704lv31s23vfnm47nyx51425x74x17r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base filepath hakyll ]; + executableHaskellDepends = [ base hakyll ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/elaye/hakyll-favicon#README.md"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hakyll-filestore" = callPackage ({ mkDerivation, base, filestore, hakyll, time, time-locale-compat }: mkDerivation { pname = "hakyll-filestore"; version = "0.1.5"; - sha256 = "f013b519a8fd552f21ca5b487ea01436e3c649cdc34fe907035a46ff74e83e3a"; + sha256 = "0fiyx1sgyijs0c3yjky3rm4wdqrn2jh7wj2vr8hjymgxm0cva4zh"; libraryHaskellDepends = [ base filestore hakyll time time-locale-compat ]; @@ -80889,7 +86240,7 @@ self: { mkDerivation { pname = "hakyll-ogmarkup"; version = "3.0"; - sha256 = "c7b1584e06384b18d2e1bc07ce55fbfc22c40592f330e4e155be7732bc641021"; + sha256 = "088hcjy34xxyaphy8c7kj82w88pwzdaww1xww791hjrq0r75icf7"; libraryHaskellDepends = [ base hakyll ogmarkup ]; homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; description = "Integrate ogmarkup document with Hakyll"; @@ -80904,7 +86255,7 @@ self: { mkDerivation { pname = "hakyll-sass"; version = "0.2.3"; - sha256 = "ebc3abf417733f776e0235573b9b36113c130d0b1e7748361ff0d649bad67422"; + sha256 = "08klssx4kmph3wv4hxqy1c6i6g0i6sdknmrm09p7fgvk2zsaphzb"; libraryHaskellDepends = [ aeson-pretty base data-default-class filepath hakyll hsass ]; @@ -80919,7 +86270,7 @@ self: { mkDerivation { pname = "hakyll-series"; version = "0.1.0.1"; - sha256 = "5dc50cd068aa082a2b5bf7d0beb6114ff1b0d7cd817b5ce0ef439798dda706b1"; + sha256 = "1c86lzfri5s3xzh5qyw1rpbv1wag26vbxl7pbcmjl25ad380riax"; libraryHaskellDepends = [ base containers hakyll ]; homepage = "https://github.com/oisdk/hakyll-series"; description = "Adds series functionality to hakyll"; @@ -80934,9 +86285,9 @@ self: { mkDerivation { pname = "hakyll-shakespeare"; version = "0.1.0.0.2"; - sha256 = "ebaa9c1cf33b3c59e91f7000ae4fc320f8b7d6c47c3a0088da9604c91dc9d0ad"; + sha256 = "1bfhr4fwj14nva400fkwqkbbgy10qd7sw03h3zlmjg1vycf9rapb"; revision = "1"; - editedCabalFile = "8e81f615162a066f96dff257a9efea27478c87cd345bb708d1cdd4ba565c838d"; + editedCabalFile = "13c3bibbmm6ds44bfnrlrn3qqir7xbpsjmzjvyb6y1ia2qazd0cf"; libraryHaskellDepends = [ base blaze-html containers hakyll shakespeare text ]; @@ -80953,7 +86304,7 @@ self: { mkDerivation { pname = "halberd"; version = "0.1.2.9"; - sha256 = "327fd38ee6ab51d7ed7f716c38847829306ba9b168a1bf54e0af269c3e0b19b5"; + sha256 = "1d8r1cz9q9mgw1abz8b8n6lnnc19g223hv3igznxfldbws7d6zrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80980,7 +86331,7 @@ self: { mkDerivation { pname = "half"; version = "0.2.2.3"; - sha256 = "85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c"; + sha256 = "0p4sb7vv9cljv48wlx65wgdnkryrk5d6yfh7g4yrm20w1p449hl5"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/half"; description = "Half-precision floating-point"; @@ -80995,7 +86346,7 @@ self: { mkDerivation { pname = "halfs"; version = "2.0"; - sha256 = "6d2a2125bae7acfde46c554a0ee0d133fd685f43bb42247eafbb327037c087cc"; + sha256 = "1k47q0vp0cmvmxz28hmv8dgniz9ks7h0wjjmdkjgvb77p8jj2akd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81016,7 +86367,7 @@ self: { mkDerivation { pname = "halipeto"; version = "2.4.1"; - sha256 = "ab2d561f56c31bf0dffc77902414987fd4fd3bcb5e690a5491358f00ab71deaa"; + sha256 = "1anyf6mh13rmj5a0lsayrcxzvm3zk0a2943pzkgz06y3aqgmcbdb"; libraryHaskellDepends = [ base directory HaXml pandoc ]; homepage = "http://github.com/peti/halipeto"; description = "Haskell Static Web Page Generator"; @@ -81032,7 +86383,7 @@ self: { mkDerivation { pname = "halive"; version = "0.1.3"; - sha256 = "e80cb5da27691a969de1e9526bfe24cabb3bfa5f170b2af6066885518d6ece65"; + sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81054,23 +86405,16 @@ self: { }) {}; "halma" = callPackage - ({ mkDerivation, async, base, containers, data-default - , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl - , mvc, pipes, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, timeit + ({ mkDerivation, aeson, base, containers, data-default + , diagrams-lib, grid, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "halma"; - version = "0.2.0.1"; - sha256 = "4c1b2990d2cbe3b46f5895cf9db75aaabbdf3a9e31df09d3c9fc5528a36c6011"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "0hnm9ic18fivcf0wjmz6sap8b249g5f0bzq4pranxl822n4gcjnf"; libraryHaskellDepends = [ - base containers data-default diagrams-lib grid - ]; - executableHaskellDepends = [ - async base data-default diagrams-cairo diagrams-gtk diagrams-lib - gtk mtl mvc pipes timeit + aeson base containers data-default diagrams-lib grid ]; testHaskellDepends = [ base containers grid HUnit QuickCheck test-framework @@ -81082,12 +86426,58 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "halma-gui" = callPackage + ({ mkDerivation, async, base, data-default, diagrams-cairo + , diagrams-gtk, diagrams-lib, gtk, halma, mtl, mvc, pipes, timeit + }: + mkDerivation { + pname = "halma-gui"; + version = "0.1.1.0"; + sha256 = "0qc8i75h8xa7nwzpv62bck404f4jji3nmjgyid06r52rb3cr5h18"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base data-default diagrams-cairo diagrams-gtk diagrams-lib + gtk halma mtl mvc pipes timeit + ]; + homepage = "https://github.com/timjb/halma"; + description = "GTK application for playing Halma"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "halma-telegram-bot" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, diagrams-cairo, diagrams-lib, directory, exceptions + , filepath, halma, http-client, http-client-tls, megaparsec, mtl + , optparse-applicative, semigroups, servant-client, telegram-api + , temporary, text, transformers, vector + }: + mkDerivation { + pname = "halma-telegram-bot"; + version = "0.1.0.0"; + sha256 = "1ynwmyvwyn6nxpdvq3pqyxfjyz702icri3r0vywcriw63ld32zhb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default + diagrams-cairo diagrams-lib directory exceptions filepath halma + http-client http-client-tls megaparsec mtl optparse-applicative + semigroups servant-client telegram-api temporary text transformers + vector + ]; + homepage = "https://github.com/timjb/halma"; + description = "Telegram bot for playing Halma"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haltavista" = callPackage ({ mkDerivation, base, hint, process }: mkDerivation { pname = "haltavista"; version = "0.1.0.1"; - sha256 = "4ef4365228a5e3036e84ab1c90c6ef54c7e746e77a658cb13c16c9ee56a45850"; + sha256 = "0l2qlibfxj8n7jqqqrbswx3fgislxz39075bhip07qx55193dx2f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hint process ]; @@ -81103,7 +86493,7 @@ self: { mkDerivation { pname = "halvm-web"; version = "0.3.0.0"; - sha256 = "d1f2da05f50c235cf01112b5d31dfc4e7aa0b0cfc7b3bdaaf735190dd3535992"; + sha256 = "14jrag9hs69myymbvcy7ryqa0yjfzhfx7d8j27q5q8qcyl2xmwni"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81121,7 +86511,7 @@ self: { mkDerivation { pname = "hamid"; version = "0.10"; - sha256 = "6873f382abbf70cd81a7c06c77be57966b21f0b200d46e3fe6785e7ed314e9a4"; + sha256 = "19792k9pwpkqwqznxm00nbq22swnayz7fv60ly0wsw5zmf1g6wv8"; libraryHaskellDepends = [ base HCodecs newtype ]; description = "Binding to the OS level Midi services (fork of system-midi)"; license = stdenv.lib.licenses.bsd3; @@ -81135,9 +86525,9 @@ self: { mkDerivation { pname = "hamilton"; version = "0.1.0.0"; - sha256 = "2c8653d3272e7fa59bfef888771ebafb8e265ba10ee03cdb8b73b5bc3bcf98d7"; + sha256 = "1mwqrwxvrdbkigdkrq0fl5djd3pvp8g7g27qzsdsazrf4z9m71ic"; revision = "2"; - editedCabalFile = "f0a9099cd8474b2fff95c7f027c10b6a3cc43cce1be1a7bebf6914b4a2c2a49d"; + editedCabalFile = "17d4qaib8539pyzagq8vrqyc8g3a1g0jgw67jpzjyjs7v2f0kagh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81159,7 +86549,7 @@ self: { mkDerivation { pname = "hamlet"; version = "1.2.0"; - sha256 = "d1c94b259163cb37f5c02ef3418ebf4caf8d95c8ee00588d4493aa3aae1a8a66"; + sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; @@ -81174,7 +86564,7 @@ self: { mkDerivation { pname = "hampp"; version = "0.2.1"; - sha256 = "9413abd81035cd51ce1b17f1f819f29a4bd658a30070acddd38fe66e02d4f478"; + sha256 = "0y7lsh16xrlgsgfsqw00ldcdcjwsy8cziw8p3g753k9m23can4wl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81195,7 +86585,7 @@ self: { mkDerivation { pname = "hamsql"; version = "0.9.0.0"; - sha256 = "bb8c90e637cbe5fce26ef80ea6c2a078cdbdc06b927ba08f63b7b0ad23bb90b9"; + sha256 = "1fchpcisvc5pcf7s0ywjdg0bvkbql31ac3pqdvigrrfb6zk9135v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81216,7 +86606,9 @@ self: { mkDerivation { pname = "hamtmap"; version = "0.3"; - sha256 = "d4d107ece7ffa69528a720763a0741dcab4773646df974596220d745250fd911"; + sha256 = "04fr1wjlbmr0c9cp9ybdcirlgayw843klxi0lwl9b9pzwzn0glfl"; + revision = "1"; + editedCabalFile = "1dik6zsi0x310m2x9qy64c0b4bd2gag1l6v1nsh09xqj7vlfpp5v"; libraryHaskellDepends = [ array base deepseq hashable ]; homepage = "https://github.com/exclipy/pdata"; description = "A purely functional and persistent hash map"; @@ -81224,6 +86616,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hamtsolo" = callPackage + ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary + , bytestring, conduit, conduit-combinators, conduit-extra + , exceptions, optparse-applicative, resourcet, stm-conduit, unix + , word8 + }: + mkDerivation { + pname = "hamtsolo"; + version = "1.0.0"; + sha256 = "0lpac24fayd9s40b39l46aak9d51vv3bjslg0drgj2xlp1d9w60y"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-combinators conduit-extra exceptions optparse-applicative + resourcet stm-conduit unix word8 + ]; + homepage = "https://github.com/tfc/hamtsolo#readme"; + description = "Intel AMT serial-over-lan (SOL) client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hamusic" = callPackage ({ mkDerivation, base, containers, directory, filepath, haskore , HaXml, musicxml, non-negative, process @@ -81231,7 +86645,7 @@ self: { mkDerivation { pname = "hamusic"; version = "0.1.2.1"; - sha256 = "36027361339369ace8402ac480dc6a23ac1b907f090527a876ce21675ff3dfbd"; + sha256 = "1gfzydgnf8fffsl2f189gy81pb13dbf81i1a83laqsck6dhp60in"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81250,7 +86664,7 @@ self: { mkDerivation { pname = "handa-data"; version = "0.2.9.9"; - sha256 = "b60feddecff35e6e2e39aece7db409408006628329693c1a869b2798fcc0aed1"; + sha256 = "1ldfq3y9h9wvhqd3qs99hdi0d02016s7vkmf74p6wppkrzgfs3xn"; libraryHaskellDepends = [ base ]; homepage = "https://bitbucket.org/functionally/raft"; description = "This package is deprecated. It formerly contained Haskell utilities for data structures and data manipulation."; @@ -81267,7 +86681,7 @@ self: { mkDerivation { pname = "handa-gdata"; version = "0.7.0.3"; - sha256 = "2141499190ee2342c11da8409ff0ec18b6e11a44c90ba46ec57923bfff0ca6e6"; + sha256 = "1rm61kzvy8vrqmpa82y98hdf3dhqxkq9yh583p0l48zfj28ljh91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81293,7 +86707,7 @@ self: { mkDerivation { pname = "handa-geodata"; version = "0.2.0.1"; - sha256 = "5644276f84f844f285398f6e2a275d8b659ba38baaa5d9b338615fc68de91174"; + sha256 = "0x0ix66wcpv172rxk9daifirnrcbblkjlvlg762z4i7qhipjfi2n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81314,7 +86728,7 @@ self: { mkDerivation { pname = "handa-opengl"; version = "0.1.13.1"; - sha256 = "2142f14c2193deeabb49743cce5dd9d1c2f5ac3b5a3effee293cee0ba5268b2a"; + sha256 = "0alb4sjhpviw57pgygjs7fngbhniv5fwwg3l96xymplk456g2hi1"; libraryHaskellDepends = [ aeson array base binary data-default GLUT OpenGL opengl-dlp-stereo split vector-space @@ -81329,24 +86743,24 @@ self: { mkDerivation { pname = "handle-like"; version = "0.1.0.3"; - sha256 = "edcd3e5084837272dec6a0f6b77f53c148f77290a618c4b38ca37c8b2fa17cc0"; + sha256 = "1h3wl4pqnz53ijrw8656j1rgfj61adzvgxm0qvg74wl3hi83xkgd"; libraryHaskellDepends = [ base bytestring ]; description = "HandleLike class"; license = stdenv.lib.licenses.bsd3; }) {}; "handsy" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, operational - , process-extras, retry, shell-escape, split, tasty, tasty-hunit - , tasty-th, transformers + ({ mkDerivation, base, bytestring, data-default-class, errors + , lifted-base, operational, process-extras, retry, shell-escape + , split, tasty, tasty-hunit, tasty-th, transformers }: mkDerivation { pname = "handsy"; - version = "0.0.14"; - sha256 = "be7efb53d3e4b1e20c9f3624db8bf3186bc98ddd52783602b09a0f84e4fd5ea8"; + version = "0.0.14.1"; + sha256 = "0iid60ah0vrw7npwn18b4vwl7vxwhki07zd29dnrji8f2srap634"; libraryHaskellDepends = [ - base bytestring data-default-class operational process-extras retry - shell-escape split transformers + base bytestring data-default-class errors lifted-base operational + process-extras retry shell-escape split transformers ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-th @@ -81365,7 +86779,7 @@ self: { mkDerivation { pname = "handwriting"; version = "0.1.0.3"; - sha256 = "7e1b406d19b2f39b34910462dce214c7ca91bb9d78bf9fafb9f906dd44d5beaa"; + sha256 = "1amysm2ds1prp6przgvqknxr3jn72kidqqh4j4s9pwxj35nl06vy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81386,7 +86800,7 @@ self: { mkDerivation { pname = "hangman"; version = "1.0.3"; - sha256 = "3eae81d96619f167dbfefd8946daf7b62e5f98d263d9a6e131e9ab888ff8064d"; + sha256 = "0k86z27qiaz967hsdnb3sac5ybmnyzd4d2gxzvdngw8rcvcq3biy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl random utility-ht ]; @@ -81402,7 +86816,7 @@ self: { mkDerivation { pname = "hannahci"; version = "0.1.4.2"; - sha256 = "c0def692076e9fa1e0f1a2869a3dcccf2eff3ffbd8bc81b8350fe9ecf44f4e1c"; + sha256 = "072f9zsfrs8g6nw83g6qzczzybngrhyrm1m2y7ha37vf0y9gdpn0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81417,19 +86831,18 @@ self: { "hans" = callPackage ({ mkDerivation, array, base, BoundedChan, bytestring, cereal - , containers, cryptonite, hashable, heaps, memory, monadLib - , psqueues, QuickCheck, random, tasty, tasty-ant-xml - , tasty-quickcheck, time, unix + , containers, hashable, heaps, monadLib, psqueues, QuickCheck + , random, SHA, tasty, tasty-ant-xml, tasty-quickcheck, time, unix }: mkDerivation { pname = "hans"; - version = "3.0.1"; - sha256 = "24da2418908a3297901c8b7e273b70a44a6b7255659de31b76afa4e3ffcc57ad"; + version = "3.0.2"; + sha256 = "14gmjkvd1x825p5rma9yp99kkl6mxbh79s776x5087y0mjv5w8j9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base BoundedChan bytestring cereal containers cryptonite - hashable heaps memory monadLib psqueues random time unix + array base BoundedChan bytestring cereal containers hashable heaps + monadLib psqueues random SHA time unix ]; testHaskellDepends = [ base bytestring cereal QuickCheck tasty tasty-ant-xml @@ -81445,7 +86858,7 @@ self: { mkDerivation { pname = "hans-pcap"; version = "0.1.0.2"; - sha256 = "1a119ed589eb8da99a741b6a8e67927897cd1b543ee8cd54728f50a39308f283"; + sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s"; libraryHaskellDepends = [ base bytestring hans pcap ]; homepage = "https://github.com/tolysz/hans-pcap"; description = "Driver for real ethernet devices for HaNS"; @@ -81458,7 +86871,7 @@ self: { mkDerivation { pname = "hans-pfq"; version = "0.1.0.0"; - sha256 = "0bd42928994193ca980944eb74baacc439851fe12365556ab141248fa2be5a1e"; + sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b"; libraryHaskellDepends = [ base bytestring hans pfq ]; homepage = "https://github.com/tolysz/hans-pfq"; description = "Driver for real ethernet devices for HaNS"; @@ -81473,9 +86886,9 @@ self: { mkDerivation { pname = "haphviz"; version = "0.2.0.1"; - sha256 = "3271b7fa3364dd3d41ad186c886107827ec733a792f9b0f383c09b9dc5796103"; + sha256 = "00v1g72rv6y0hgrv1ycjlwrwfzl20xhqhv0qmm0kvpb46gxbfw9j"; revision = "1"; - editedCabalFile = "1da984c52a02dbea9a2add72cf90555e5b2d72cb4557064dc2ac630809b3edf2"; + editedCabalFile = "1wpdnc4hhqxcq96hcms5rdr2snsyan8cywnx5adfmnq25b2q9a8x"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base checkers hspec QuickCheck quickcheck-text text @@ -81493,7 +86906,7 @@ self: { mkDerivation { pname = "hapistrano"; version = "0.2.1.2"; - sha256 = "23ad0b7a3702fad6fd19b82ffc2db2ef99308c1ed6b73c3bdad700e08a44ed09"; + sha256 = "02gd8j5f006pv8xkrdyn3s6316ggn8nzqbxq37yxdyh26xx0pb93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81509,15 +86922,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hapistrano_0_3_1_0" = callPackage + "hapistrano_0_3_2_2" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath, hspec , mtl, optparse-applicative, path, path-io, process, stm, temporary , time, transformers, yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.1.0"; - sha256 = "41d680421dad0d83f7c05f7271788955ff332c6acd83cc9aa1a6af776b1c7a6a"; + version = "0.3.2.2"; + sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81542,7 +86955,7 @@ self: { mkDerivation { pname = "happindicator"; version = "0.0.4"; - sha256 = "839871e4907761a877af82160ada207ae5c16034f168ff1b5a4a7c5afb651eb4"; + sha256 = "1d0ycpxmlz2ab8dzys7i6ihc3rbs43d0l5l2mxvshqbpj3j73643"; libraryHaskellDepends = [ array base bytestring containers glib gtk mtl ]; @@ -81558,7 +86971,7 @@ self: { mkDerivation { pname = "happindicator3"; version = "0.2.1"; - sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326"; + sha256 = "09h3077s61krg814aw2whgc869m6ff96rrxfk6rjpjy71lkmcl92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base glib gtk3 ]; @@ -81574,7 +86987,7 @@ self: { mkDerivation { pname = "happraise"; version = "0.1"; - sha256 = "2f5c58ee6d82a0405fe1f7e73a1481018995490276d65cf33e13769e68748bed"; + sha256 = "1vcbfil9wxhk7vrmrmkn094rb281h4a3mrzpw5gl1842dpp5hp1g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath ]; @@ -81589,7 +87002,7 @@ self: { mkDerivation { pname = "happs-hsp"; version = "0.1"; - sha256 = "bd677ce5dd13940f9241672b28b7df106cdbf1a20ca3eff1398d560831582f50"; + sha256 = "0l1gb0qhhmld77qyz8qclbqxnv0hvyvjhav78690z50kvpjpqrxx"; libraryHaskellDepends = [ base bytestring HAppS-Server hsp mtl plugins ]; @@ -81604,7 +87017,7 @@ self: { mkDerivation { pname = "happs-hsp-template"; version = "0.2"; - sha256 = "e80cc49c31ba6a99d2981607802e83394e77261ef7f2f261b5ffff9fe68d2115"; + sha256 = "0591ipk9zzzznmhz5wpp3qk7fkirhcp801qnk399jsms66fc8378"; libraryHaskellDepends = [ base bytestring containers directory filepath HAppS-Server hinotify hsp mtl network plugins RJson @@ -81624,7 +87037,7 @@ self: { mkDerivation { pname = "happs-tutorial"; version = "0.9.5"; - sha256 = "f67a4cfed5b8dd4ff0b87d529482a94aceb59c91235900b26a26e7772d3a73de"; + sha256 = "1pkk78npgrr6dar00n93j6fbbkjam6198lkxp3q4zpdqspz4qypn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81644,7 +87057,7 @@ self: { mkDerivation { pname = "happstack"; version = "7.0.2"; - sha256 = "d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5"; + sha256 = "1dfmfyrynggf1ff6364kb9a53rm64zhirx6ispnhykwdf60zbm6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base happstack-server ]; @@ -81663,7 +87076,7 @@ self: { mkDerivation { pname = "happstack-auth"; version = "0.2.1.1"; - sha256 = "c46f1112e2754f5227f75bfd047cd658ed8caa5aec051aecd42d20835016cd55"; + sha256 = "0mfd2r88681dskn1l1gcbam8rvaqsry09zavywkm4kvmw8912vy4"; libraryHaskellDepends = [ base bytestring containers convertible happstack happstack-data happstack-ixset happstack-server happstack-state mtl old-time @@ -81689,7 +87102,7 @@ self: { mkDerivation { pname = "happstack-authenticate"; version = "2.3.4.7"; - sha256 = "6c2d83aa09fe2fb630a1aaca8b25e7e09b0a91b475f24e5dfb0c307c8f34b607"; + sha256 = "01xn6j7pqc0czdflxwkmnj8hm6z0wwjqpjmal4qbcbzy16m86bbc"; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default email-validate filepath @@ -81711,7 +87124,7 @@ self: { mkDerivation { pname = "happstack-clientsession"; version = "7.3.1"; - sha256 = "5b83ea0dae41857ec9ba6de68842633e85297660565e15c739d238f51b3f86ea"; + sha256 = "1sl67wdzaf6j773iapjnc1v2k19ycd18irkdpb4px1a1mq6ym0sv"; libraryHaskellDepends = [ base bytestring cereal clientsession happstack-server monad-control mtl safecopy transformers-base @@ -81729,7 +87142,7 @@ self: { mkDerivation { pname = "happstack-contrib"; version = "0.2.1"; - sha256 = "e550c0e74b1873ac051a886626f44571cf8543e179096f391f1cbecaa4750d33"; + sha256 = "0cqdfnjcmghw3wwny2brw51qbkvi8ps2crl8382sqwqq9gkw0l75"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81751,9 +87164,9 @@ self: { mkDerivation { pname = "happstack-data"; version = "6.0.1"; - sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c"; + sha256 = "0v2ln4mdnild72p02mzjn8mn5srvjixsjqjgkdqzshvxjnnm95l8"; revision = "1"; - editedCabalFile = "dbf53b1d5012ac975d184455269f3d631ba2352e9642b707b98465c47225fd06"; + editedCabalFile = "01px4mrc8rc4p43vfhln5qss46v37ngjcma431frgb0ja0fkpxfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81774,7 +87187,7 @@ self: { mkDerivation { pname = "happstack-dlg"; version = "0.1.2"; - sha256 = "170b3b80176648e26c5689b31763183c73cd68011ad1b8a7bfdc824c8470a8fe"; + sha256 = "1zm8f224r0nwpykvil8s05lcswrw31iigcw9arnf4j362y03n2qp"; libraryHaskellDepends = [ applicative-extras base bytestring containers formlets happstack-server mtl random template-haskell time xhtml @@ -81796,7 +87209,7 @@ self: { mkDerivation { pname = "happstack-facebook"; version = "0.30"; - sha256 = "0c517c663da5323fe6677fa73f8ba862725e1bb813566af63d38ee1f6716cde5"; + sha256 = "1rfd2rkizviq7pv6lmhkp0dmwwk2m25kz9vzczk3ycm57mk7ql8c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81820,7 +87233,7 @@ self: { mkDerivation { pname = "happstack-fastcgi"; version = "0.1.5"; - sha256 = "10c9cde8a3f01f5cb648c93266fb72ba662c75d4de07eff657c8896e03016b67"; + sha256 = "0rvb041nx2f8azvfy1yysisjqrmsfbxnccn992v5q7zhlglcvj8h"; libraryHaskellDepends = [ base bytestring cgi containers fastcgi happstack-server mtl utf8-string @@ -81836,7 +87249,7 @@ self: { mkDerivation { pname = "happstack-fay"; version = "0.2.0"; - sha256 = "457b43d3ff5f15d7fc2a49c6731aef9f40a142305b23daaf1fdde832e23c9dd7"; + sha256 = "1mwx7ki35s6x3ypxl8sv611a2h4zxwd77ij95bydf5azzz9l6ys5"; libraryHaskellDepends = [ aeson base fay happstack-fay-ajax happstack-server mtl ]; @@ -81851,7 +87264,7 @@ self: { mkDerivation { pname = "happstack-fay-ajax"; version = "0.2.0"; - sha256 = "92c8511adda63943e40e19c87ef5ceb7f6ff194ec2ed26cbc3db59eeebdeb37d"; + sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j"; libraryHaskellDepends = [ fay-base fay-jquery ]; homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; @@ -81868,7 +87281,7 @@ self: { mkDerivation { pname = "happstack-foundation"; version = "0.5.9"; - sha256 = "b6f06231981f1bcb8357925cd5638c01e01a4fdd9b43c9b05b5bf262aa39c176"; + sha256 = "0xn176m65wjvbfqcjhwvvm7imq01iiixap4jay1wn6qzk0qn5w5n"; libraryHaskellDepends = [ acid-state base happstack-hsp happstack-server hsp lifted-base monad-control mtl reform reform-happstack reform-hsp safecopy text @@ -81884,7 +87297,7 @@ self: { mkDerivation { pname = "happstack-hamlet"; version = "7.0.4"; - sha256 = "2a11133ff0e8ffecc5f3ae51dcfdef1210c37bca221933f54d8bae8fbd7f22d0"; + sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a"; libraryHaskellDepends = [ base happstack-server shakespeare text ]; homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; @@ -81899,7 +87312,7 @@ self: { mkDerivation { pname = "happstack-heist"; version = "7.2.4"; - sha256 = "a30946c3fba8e02a3bae88256b9ce8090ae873d026e3cf2a8d11a193b877a1ab"; + sha256 = "1ax1fyw9788iilmczqr6s1ryh2h9x2f6n9c8mqxjmq58zg1lc2d3"; libraryHaskellDepends = [ base blaze-builder bytestring either filepath happstack-server heist mtl text @@ -81921,7 +87334,7 @@ self: { mkDerivation { pname = "happstack-helpers"; version = "0.56"; - sha256 = "0288a6166bfe571d96f94182fd876d97fee57445de9dca77fc51c8fe58bb3a7b"; + sha256 = "0yrspdcgxj2izivwm7fy8msfbzlpdn3zv0j1z6b1smzydcbad202"; libraryHaskellDepends = [ base bytestring containers DebugTraceHelpers directory filepath happstack-data happstack-ixset happstack-server happstack-state @@ -81941,8 +87354,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.1"; - sha256 = "bbc884e4a5ca78faf08e17799c1d037622e377915ece889674004e0e54109617"; + version = "7.3.7.2"; + sha256 = "1r4mlbzn1ca3q94ly81alz4741q3v6b3655k0kd5ysahq5yy6p9w"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -81959,7 +87372,7 @@ self: { mkDerivation { pname = "happstack-hstringtemplate"; version = "7.0.4"; - sha256 = "c46977de7d3406a0e79b927d4b9ea7bce522ad849d752f22ae6de5dfe33692dd"; + sha256 = "1pcj6vixzrbdmqi2yxcxhjnj5rdwlyg4nzcjkgks01ilgpg7fsf4"; libraryHaskellDepends = [ base bytestring happstack-server hslogger HStringTemplate mtl ]; @@ -81976,7 +87389,7 @@ self: { mkDerivation { pname = "happstack-ixset"; version = "6.0.1"; - sha256 = "d122eeff5fa0e0321a8a76d2b1ff39f9d99cc70df5dc13be9db970e723b0d0c2"; + sha256 = "1hnhn0iyfw5rknz17p7m1p3rrngr77zv3lkni8d35q50bzzyw8ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81997,7 +87410,7 @@ self: { mkDerivation { pname = "happstack-jmacro"; version = "7.0.11"; - sha256 = "29c6b844d91fb7288c5264312c0cd203d964cfb0a13f98a5551699350fdbdf1c"; + sha256 = "076zvc7kb68nanjrhgx1n37n9n83s862qcb4aa62idqzv52biii9"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -82012,7 +87425,7 @@ self: { mkDerivation { pname = "happstack-lite"; version = "7.3.6"; - sha256 = "e85659a3346f4aeb579dc2ef000e95c59ccc8c06afcea269daafb827ebba7fd7"; + sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8"; libraryHaskellDepends = [ base bytestring happstack-server mtl text ]; @@ -82028,7 +87441,7 @@ self: { mkDerivation { pname = "happstack-monad-peel"; version = "0.1"; - sha256 = "3e2ffcf489e3b2da331d177d5cd3ed4f73c11187d9c38b1ffcfb8a533cd4d46c"; + sha256 = "0v6lshy572pvzhgqphyrhw8w2wsgxp9mqz8p3lrxmcp3i7sgqbry"; libraryHaskellDepends = [ base happstack-server monad-peel mtl transformers ]; @@ -82044,7 +87457,7 @@ self: { mkDerivation { pname = "happstack-plugins"; version = "7.0.2"; - sha256 = "2e2a6ad3d0fd2f661a20e643095fe95a0462daa14974f5a70a6de573e603f01f"; + sha256 = "07zh0gk77rbd1akzax29l7d6412sx5ghjhz640d6cbzxs39nlaif"; libraryHaskellDepends = [ base happstack-server mtl plugins-auto template-haskell th-lift ]; @@ -82065,8 +87478,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.6.3"; - sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef"; + version = "7.4.6.4"; + sha256 = "1fd19qxpdj7iz4rjjwgi527naiw32l09gazr39skgzzf7m8ckiml"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -82091,7 +87504,7 @@ self: { mkDerivation { pname = "happstack-server-tls"; version = "7.1.6.2"; - sha256 = "bc3e5a908871f1a242e099ff401e45284dcec07e8842e033d5f457ac7bd2f0d5"; + sha256 = "1mghs9xsqmzlslry0hl8gv0cwk988lg41zwrw11a5wbii285lgmw"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -82111,7 +87524,7 @@ self: { mkDerivation { pname = "happstack-server-tls-cryptonite"; version = "0.1.1"; - sha256 = "5866fa63a5193a5ec2b9a10783c5a43069fde3a53f531ab1627872dd760385f8"; + sha256 = "1y450dvdswkqcaqillrzlpizss9hlk2q61x1p715wfhrlmizlrjq"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class extensible-exceptions happstack-server hslogger network sendfile time tls unix @@ -82129,7 +87542,7 @@ self: { mkDerivation { pname = "happstack-state"; version = "6.1.4"; - sha256 = "09f7d8eaa7eec13f99d59b7c5bf7e88b3d2889b6879f0f54731a9c6f4801d7f5"; + sha256 = "1xfp0546z70sfda0z7w7ns4jhgcbx3vmnz4vsnckzhgflzmdixq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82149,8 +87562,8 @@ self: { }: mkDerivation { pname = "happstack-static-routing"; - version = "0.4.2"; - sha256 = "0226f61e3ddd3dd832cdf93123812ab5b31418cdeeef9753d24f2ae82a490b3d"; + version = "0.6.0.0"; + sha256 = "18r7nb6558yvspc486sxckb8708wsvgqgagaycg1qbdxbfhnshhg"; libraryHaskellDepends = [ base containers happstack-server list-tries transformers ]; @@ -82169,7 +87582,7 @@ self: { mkDerivation { pname = "happstack-util"; version = "6.0.3"; - sha256 = "10de089778b70311d290420c7e6ad987da711b1c1961436ccf26c7cf4bd31a43"; + sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82192,7 +87605,7 @@ self: { mkDerivation { pname = "happstack-yui"; version = "7373.5.3"; - sha256 = "d17a3b8aed3e7d2bf33881964a24e260fed311578bdc74e903b7e5dab11c199d"; + sha256 = "178r3jqxmrdp0glp9p4baw8x7zk0w8j4m5l173rjnz9yxn53nyni"; libraryHaskellDepends = [ base boomerang bytestring containers directory happstack-jmacro happstack-server hsp interpolatedstring-perl6 jmacro mtl pretty @@ -82206,15 +87619,18 @@ self: { }) {}; "happy" = callPackage - ({ mkDerivation, array, base, containers, mtl, process }: + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, mtl, process + }: mkDerivation { pname = "happy"; version = "1.19.5"; - sha256 = "62f03ac11d7b4b9913f212f5aa2eee1087f3b46dc07d799d41e1854ff02843da"; - revision = "1"; - editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c"; + sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32"; + revision = "2"; + editedCabalFile = "1dvhv94lzmya938i5crshg9qbx7dxvkyxkhfbqimxkydxn7l2w7w"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; executableHaskellDepends = [ array base containers mtl ]; testHaskellDepends = [ base process ]; homepage = "http://www.haskell.org/happy/"; @@ -82229,7 +87645,7 @@ self: { mkDerivation { pname = "happy-meta"; version = "0.2.0.9"; - sha256 = "6fa5083d41a9e0b6e6d0150a9b2f6e2292af005fd9fd8efd24e1a4a72daf6bf0"; + sha256 = "1w3bmwnsg9714kyqxzfrbw0az4i2dqprn2hms3kbdq5984yhi9bg"; libraryHaskellDepends = [ array base containers haskell-src-meta mtl template-haskell ]; @@ -82246,7 +87662,7 @@ self: { mkDerivation { pname = "happybara"; version = "0.0.1"; - sha256 = "3b77027ac1c33b37fb0a401a7e6678a999eed2b626c77b9f09ed1c203757e2d2"; + sha256 = "1lp2awvj077d16gppir6nv9fx6d9g1k7w6j01bxkffy3q5x04xrv"; libraryHaskellDepends = [ aeson base filepath http-types lifted-base monad-control mtl text time transformers transformers-base @@ -82266,7 +87682,7 @@ self: { mkDerivation { pname = "happybara-webkit"; version = "0.0.1"; - sha256 = "dc910e37f72fb26f49fd4c8f81bee669fd10c81652c36ab03d8d4bea2737849c"; + sha256 = "17446wkyljwd7nq6mhsj2v411zb9wsz833sczm4nzcigywvhx4fw"; libraryHaskellDepends = [ aeson base bytestring case-insensitive data-default directory filepath happybara http-types lifted-base monad-control mtl network @@ -82283,7 +87699,7 @@ self: { mkDerivation { pname = "happybara-webkit-server"; version = "0.0.1"; - sha256 = "11ea82ca95bd880e62585a81107964a28e1523c7eb9da9fdc322bc5dd38b096e"; + sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi"; libraryHaskellDepends = [ base directory filepath process ]; homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server"; description = "WebKit Server binary for Happybara (taken from capybara-webkit)"; @@ -82298,7 +87714,7 @@ self: { mkDerivation { pname = "hapstone"; version = "0.2.0.1"; - sha256 = "3d0e5f37edddf252df8c6f4291ba73c0c2331053086cd7583810644e1555e016"; + sha256 = "05p0alalwr0h71cdfv08ac837hn0ffx92hkgikgm5wnxxlvmy3ix"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ capstone ]; libraryToolDepends = [ c2hs ]; @@ -82318,7 +87734,7 @@ self: { mkDerivation { pname = "haquery"; version = "0.1.1.3"; - sha256 = "6a07f654bee6628fee163d7203380ac8b55f1e916ad47d22d8ec43c841803096"; + sha256 = "15ihh10whhzcv0i7vm3aj4g5zdf818w06wix2vp8yqp6pragc1va"; libraryHaskellDepends = [ base containers parsec split tagsoup text transformers ]; @@ -82332,8 +87748,8 @@ self: { }: mkDerivation { pname = "har"; - version = "0.1.1.0"; - sha256 = "e387def36cc56e1953fc0746a711d06fe8e641711b666b36be02bbe529d6a174"; + version = "0.4.0"; + sha256 = "1g3s1r0bxcn7b27ghd02bkn1pdpk92hzlzgb9c9wm9022nrswdzz"; libraryHaskellDepends = [ aeson base bytestring directory filepath text ]; @@ -82350,7 +87766,7 @@ self: { mkDerivation { pname = "harchive"; version = "0.2"; - sha256 = "35fd37eb05770a6d039ede545467bc132c780f29fa915006fe5a27db6c2c8880"; + sha256 = "10485indn9sszq3514gs547phb0kpikm8m6ykq1ns2kp0pmkgz9m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82370,7 +87786,7 @@ self: { mkDerivation { pname = "hardware-edsl"; version = "0.1.0.1"; - sha256 = "cb208be2c2db96264ff37bfcc81810e127d9e6faf15ab48cebe7251bd55fc38c"; + sha256 = "1363bzain9g7xf6b8npizbkdj9z120cciz3vyd7jd5nvqbi8n86b"; libraryHaskellDepends = [ array base bytestring constraints containers language-vhdl mtl operational-alacarte pretty syntactic @@ -82388,7 +87804,7 @@ self: { mkDerivation { pname = "hark"; version = "0.2"; - sha256 = "a4a39c2db70def71c6629658e202d6dcf707565593d114b20c6b7f4247efbcf3"; + sha256 = "1wxwxx3l4zvb1jr19lckamb0gxywsq1f4n4ncb373vqdnwnrr8x4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82409,7 +87825,7 @@ self: { mkDerivation { pname = "harmony"; version = "0.1.1.0"; - sha256 = "453e3a4db149729e19bcbd6970abf0ed9d3c25dfffeac2c3cb5be3dcfdddc5dd"; + sha256 = "1pf5vpyxrqsvrg1w5spzvwjkr7gdy2mp0sdxphcrwwj9n56klgj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82433,7 +87849,7 @@ self: { mkDerivation { pname = "haroonga"; version = "0.1.7.1"; - sha256 = "4fd4e816f713fc1ed3170f7c5ae75180071e6907bb004e16ff5fe1100c328648"; + sha256 = "0j4668611qazzwb4w05v0xliw1w0a7kmlz0g2z9ixz0kywbfim2g"; libraryHaskellDepends = [ base bindings-DSL monad-control resourcet transformers ]; @@ -82450,7 +87866,7 @@ self: { mkDerivation { pname = "haroonga-httpd"; version = "0.1.1.0"; - sha256 = "af689fe7e4af0a9be26166d5f0d616e62a1980b209fdc1933db6850fe759859c"; + sha256 = "1745b7khz1dn7n9w3z89na01jap62vbg1mb6c7i9n2mgwkkrys5g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82467,7 +87883,7 @@ self: { mkDerivation { pname = "harp"; version = "0.4.2"; - sha256 = "7faa6236d0381e5caeacb4a7acb912c328b4d5f58944f238d478d972c6f19cf3"; + sha256 = "1wwwy7375nbqshwg4i49ypav8a632awsr9xlmjp5q7iqs0v65akz"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/seereason/harp"; description = "HaRP allows pattern-matching with regular expressions"; @@ -82481,7 +87897,7 @@ self: { mkDerivation { pname = "harpy"; version = "0.6.0.2"; - sha256 = "3e3b8654983d17d29544379d5579f240d7c2bd2dcd30194e1bd94987f9548be6"; + sha256 = "1rlbakwqfjfr3d71jc6d5nyw5ms0y9wmb79p8jax45rxk1a8cfry"; libraryHaskellDepends = [ array base containers disassembler mtl parsec pretty template-haskell @@ -82499,7 +87915,7 @@ self: { mkDerivation { pname = "harvest-api"; version = "0.1.0"; - sha256 = "052cf4dff75657fb7c7e74ea6fb3af542180b520d64b6a4197ef62e8acc1b7d1"; + sha256 = "1ldpq6nfhqpgjx0nljyn42sq08almyrnzsklgrygnmsnyzgz8b05"; libraryHaskellDepends = [ aeson base bytestring http-client mtl servant servant-client text time transformers @@ -82518,7 +87934,7 @@ self: { mkDerivation { pname = "has"; version = "0.5.0.1"; - sha256 = "5a5cdc8fafbb89a79e6831a707ce303c18edf54e0b389aab9dc6302532e4cd7f"; + sha256 = "0zydwhr2ac66knmrlf0b9vsys61w6370g9rid2gag2dvmy7xqp2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base QuickCheck ]; @@ -82533,7 +87949,7 @@ self: { mkDerivation { pname = "has-th"; version = "0.1"; - sha256 = "843d3c4a0e47fe4d3c20838649bf915f6026a43f3898c7f8739ef7575173d97b"; + sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4"; libraryHaskellDepends = [ base has template-haskell ]; homepage = "http://github.com/chrisdone/has-th"; description = "Template Haskell function for Has records"; @@ -82544,15 +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.1"; - sha256 = "c715475ce67d5b311f6dc252d2d2e58cac9a12e417c007e28635c30c8ca619b1"; + version = "0.1.2.1"; + sha256 = "08pa4df4klijdxpbfkqiqfjrcwl3ip3gwg84kx1zg9wpnvdbjn4l"; 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 @@ -82568,7 +87984,7 @@ self: { mkDerivation { pname = "hascal"; version = "3.0.1"; - sha256 = "012e1ed3ac556697f5b1c6888bdf0e6cab126a3fa0e01f2f07c52469856a3145"; + sha256 = "0i9ida2nj9650wpizq507xm15avc1vgqp266n7srfrjmmk9iwbh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default split ]; @@ -82588,7 +88004,7 @@ self: { mkDerivation { pname = "hascar"; version = "0.2.1.1"; - sha256 = "ff801c3a9595b9afa732194b7d992e1b1a264813f04bdf7bb1de097a7b5c4086"; + sha256 = "11j0bixpl2fyn5xxyjzh2d42c6hv5scpsjqr6akszfcmjlx1r07z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82615,7 +88031,7 @@ self: { mkDerivation { pname = "hascas"; version = "1.2.0"; - sha256 = "99c670290558ffc2686040e36c8411be63e6210065621a8be6c427406731b1ff"; + sha256 = "1zxi65kl09y4ws5ilqk500hycqxy2626rqs0c1lc5zsq0llp1ilr"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 mtl network safe-exceptions stm template-haskell uuid @@ -82637,7 +88053,7 @@ self: { mkDerivation { pname = "hascat"; version = "0.2"; - sha256 = "4745cc43b3795342d52adb1fe0eb5a9819f80f5c9d8d8662a4c77128e8c0e913"; + sha256 = "04z9q3l2hwf7lii8d3cxbh7zh6cqbbmy07yv5bal4lvrnd1wqia7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82657,7 +88073,7 @@ self: { mkDerivation { pname = "hascat-lib"; version = "0.2"; - sha256 = "12e7d9c7f0f188fedd7c8acfcb2b7ba7cfd879b039ffb9ef825d6c6f5f8f4c50"; + sha256 = "0l2cixgnyv2xhbpvkzrrn1wxikx7gcmwpkwagkfzx27iy33xkrqj"; libraryHaskellDepends = [ base bytestring containers directory haskell98 HaXml html HTTP mtl network old-locale old-time parsec plugins xhtml @@ -82674,7 +88090,7 @@ self: { mkDerivation { pname = "hascat-setup"; version = "0.2"; - sha256 = "d16b5e3f9938b014f8efdeaa02db0182d3f722fcc4c465c108227b70b25f0a15"; + sha256 = "058abyr70yr2130nbi64zhigglw207dh5anyxzw19c1qk4zmwsyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82696,7 +88112,7 @@ self: { mkDerivation { pname = "hascat-system"; version = "0.2"; - sha256 = "24351baec7d7fc3cb3815b0265695ff19f2dff9ef35f467bd19d664ac3b14bb9"; + sha256 = "1fabn71llrlxs5xlcpzkkvzjv7zibxlna0jvh6rkrz6pqyp1nd94"; libraryHaskellDepends = [ base bytestring containers hascat-lib HaXml HTTP mtl network old-time parsec plugins unix @@ -82714,7 +88130,7 @@ self: { mkDerivation { pname = "hash"; version = "0.2.0.1"; - sha256 = "3d8b7d07109319bc9149342758072764a4c87da7daee3e9e22fa993fef8f46cd"; + sha256 = "1ka6izpkz6gs4ag3xvnslxywi9344w3mh9rl968vq6ck203pv2rx"; libraryHaskellDepends = [ base bifunctors bytestring data-default generic-deriving hashable lens transformers @@ -82727,18 +88143,20 @@ self: { }) {}; "hashable" = callPackage - ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit - , integer-gmp, QuickCheck, random, siphash, test-framework + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.2.5.0"; - sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc"; + version = "1.2.6.1"; + sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll"; + revision = "2"; + editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text + base bytestring deepseq ghc-prim integer-gmp text ]; testHaskellDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -82759,9 +88177,9 @@ self: { mkDerivation { pname = "hashable-extras"; version = "0.2.3"; - sha256 = "03e0303a50e265d8682402152c90e199d0f4685a1e553bf20a380652d6f06b6a"; + sha256 = "0skby3b541iq1br3nm8yb9lg9l4rw682q5824ildhrg2a0x31q03"; revision = "1"; - editedCabalFile = "8d70988312a39286abbbbbcae27964def38ed93ae680fad6c2900d5a962948c7"; + editedCabalFile = "1is856b5l3chqbbgm0767bcqxwyyciwy5jmvpfmqd4m32a1rhw4d"; libraryHaskellDepends = [ base bifunctors bytestring hashable transformers transformers-compat @@ -82780,7 +88198,7 @@ self: { mkDerivation { pname = "hashable-generics"; version = "1.1.10"; - sha256 = "8b116058f419dc4b371dd539817d3fd064b697ccdca0a01c66a8ce0f010f931b"; + sha256 = "06wk1w0hzkm8cqfa186wrjbvcr6h7xyq2ffm3lvlpp0ryic604cb"; libraryHaskellDepends = [ base ghc-prim hashable ]; testHaskellDepends = [ base ghc-prim hashable QuickCheck test-framework @@ -82793,14 +88211,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hashable-orphans" = callPackage + ({ mkDerivation, base, hashable, sorted-list, time }: + mkDerivation { + pname = "hashable-orphans"; + version = "0"; + sha256 = "0mpvfhf07swhj7vb9mrrrbq4a4il0i49nlzh2157kf66a891ih47"; + libraryHaskellDepends = [ base hashable sorted-list time ]; + homepage = "https://oss.xkcd.com/"; + description = "Provides instances missing from Hashable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hashable-time" = callPackage ({ mkDerivation, base, hashable, time }: mkDerivation { pname = "hashable-time"; - version = "0.2"; - sha256 = "97b722ab467fae0d499de91bfaf3d6e346c7c1cac126796f0031aee5dbfe2b0a"; - revision = "1"; - editedCabalFile = "b925aba56f1b9a5a1952fae307eaf8ee653293b68651d3807c3852dc4c771d35"; + version = "0.2.0.1"; + sha256 = "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -82813,9 +88241,9 @@ self: { mkDerivation { pname = "hashabler"; version = "2.0.0"; - sha256 = "6a2bd750238fb73bbef9572fc553aee6d0cc82326970a8598d9eb8b6ef923cf3"; - revision = "1"; - editedCabalFile = "c86a0c3e2fbc461ab3e75631a456f416ec9c57b7d48558ae0ad76fb4c48c3284"; + sha256 = "1wrwjbpvdf4yimcshw396a1crl76mr9wabspz6z3pdwg4d8dfava"; + revision = "2"; + editedCabalFile = "0plq6sfzplpg7lc9s2jsnj3l53z1v614h4ni3fvnw4hxj0n4cykv"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp primitive template-haskell text @@ -82832,7 +88260,7 @@ self: { mkDerivation { pname = "hashed-storage"; version = "0.5.11"; - sha256 = "734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569"; + sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82849,9 +88277,9 @@ self: { mkDerivation { pname = "hashflare"; version = "0.1.0.0"; - sha256 = "2a58cbb78bf8263dc80d384264ba969edb91d4685e87c01b62a48d12fb60e82b"; + sha256 = "0az8c3xi53d4c8dw11syd3a93nwyjsx68hiq1p43s9pqifvwnn1a"; revision = "2"; - editedCabalFile = "accd8a66c743cbd6580182c1a85916dd6422d67a1587b7e2927849cd53e38f9a"; + editedCabalFile = "16lgwd9wsjbqjbibg1qmgbb24r6x2rcsihc205cddjs3qxk8mkdc"; libraryHaskellDepends = [ base containers simple-money ]; description = "A library for working with HashFlare.io contracts and hashrates"; license = stdenv.lib.licenses.bsd2; @@ -82862,7 +88290,9 @@ self: { mkDerivation { pname = "hashids"; version = "1.0.2.3"; - sha256 = "ecd74235e8f729514214715b828bf479701aa4b777e4f104ea07534a30822534"; + sha256 = "0d15h8q4llq7x82g3r3pnyj1lw3ryj5q4nvi2i152agpx0sl5mzc"; + revision = "1"; + editedCabalFile = "0yp2lsk906qibir9r3lvln44y8lpjx34w7kmwkqw1a5irzpnxnyc"; libraryHaskellDepends = [ base bytestring containers split ]; testHaskellDepends = [ base bytestring containers split ]; homepage = "http://hashids.org/"; @@ -82878,9 +88308,9 @@ self: { mkDerivation { pname = "hashing"; version = "0.1.0.1"; - sha256 = "e5a4a19c6cd6f0a0adda381db76d608d23f8d303e68f1d744735433f91f49410"; + sha256 = "044lyj8kyhrm8xs1v3z60g9zh8wdc1nvf79qvans1w6ndjfa3975"; revision = "2"; - editedCabalFile = "98861f16791946cdf28e3c7a6ee9ac8b72d546d6e33c569c7087ef18253294e7"; + editedCabalFile = "1rwl68jiivw7f2f5cg73sr3dawlbmklnwyiwivrcsihrg4b1z1lq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring ]; @@ -82900,7 +88330,7 @@ self: { mkDerivation { pname = "hashmap"; version = "1.3.2"; - sha256 = "01409d423e27f529602b376cfb506afe7a47f73b2ca1e362638c4fccfbba5796"; + sha256 = "15jppbxwqkwccdif789c7gvlfypyd98gnv1p5dh2kx977r19sh01"; libraryHaskellDepends = [ base containers deepseq hashable ]; homepage = "https://github.com/foxik/hashmap"; description = "Persistent containers Map and Set based on hashing"; @@ -82914,7 +88344,7 @@ self: { mkDerivation { pname = "hashring"; version = "0.0.0"; - sha256 = "320595f4c3df4d855197fb23d3b27f6a92b3538aebcde8514f273f0fbc8a0917"; + sha256 = "05q9iay0ygr79x8yikgbi99v74kagyrd68zvjx8qakfzqgs9a19j"; libraryHaskellDepends = [ base containers hashable ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -82932,7 +88362,7 @@ self: { mkDerivation { pname = "hashtable-benchmark"; version = "0.1.1"; - sha256 = "73f338327ec8f5a30e29c5f43848617b837381c182d892a7a40a33ecd835b57f"; + sha256 = "0zxm6pcfqcqaljkr5n42q60p70vvc543ix65547a7xf8gqr3iwvk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82948,8 +88378,8 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.1.0"; - sha256 = "ef5122c8f3b72d1e817a4f2adb410ad88b30818934a276b7184790697f4fdcac"; + version = "1.2.1.1"; + sha256 = "0lg9fb73w4awpcfr161xpz8y6z9lkfb5jii5ak34a1iijd55azr2"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -82966,7 +88396,7 @@ self: { mkDerivation { pname = "hashtables-plus"; version = "0.2.0"; - sha256 = "871e368990821dcddbd85f2247894ca0c0e5392647ea5a39f0d18c5702ab323d"; + sha256 = "0g9jmc15g36iy0wmmsj74qwybh509j4lf8jzv3dws7c2j24kc7l7"; libraryHaskellDepends = [ base hashable hashtables loch-th placeholders ]; @@ -82986,7 +88416,7 @@ self: { mkDerivation { pname = "hasim"; version = "0.1.2"; - sha256 = "f6a074bbc8ed8483a5e859608b349e2f13fcaa581c4bf85c53076a900509960f"; + sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://huygens.functor.nl/hasim/"; description = "Process-Based Discrete Event Simulation library"; @@ -83001,9 +88431,9 @@ self: { mkDerivation { pname = "hask"; version = "0"; - sha256 = "69ac3c6296c1a70e7f856e43a3415376631e4c5ec4c506e9f2d4deee549707b1"; - revision = "1"; - editedCabalFile = "04abcba45a7fbaa11d7f3bd9834f1e70a30f356ae871e59ab472f20d4cd60026"; + sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39"; + revision = "2"; + editedCabalFile = "19gb0kn40nd9904adiqpj5h3pcsic6nqflzh8nvpvblphrn5npxs"; libraryHaskellDepends = [ base constraints ghc-prim reflection tagged transformers void ]; @@ -83020,7 +88450,7 @@ self: { mkDerivation { pname = "hask-home"; version = "2009.3.18"; - sha256 = "284c981fceb7bb04a9660e380fdf74d536097b155934c9b75d5b32ef439b1089"; + sha256 = "128hkd1yycjvbnvwjd2r2mxhjdnmfkghyf0fcslh9fxprqgrhk18"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83040,7 +88470,7 @@ self: { mkDerivation { pname = "haskades"; version = "0.2.1"; - sha256 = "e61a06335d1a8899656aefa24439b06715e20db30f997a322ee6adfedfa78fa5"; + sha256 = "19cglzgzxbg65qr7m68gnc6y45b7n0wl98pgd9jrk20sblrhc6p6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83059,7 +88489,7 @@ self: { mkDerivation { pname = "haskakafka"; version = "1.2.0"; - sha256 = "eb4b010f0662f15b987bec00fa093c75726af94131e039fda63436ed87bc1c22"; + sha256 = "08hwpj3ysdillvykkq1i87wnlwkm7h4zl07cgfc5pwb20q7h2jzb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83083,8 +88513,8 @@ self: { }: mkDerivation { pname = "haskanoid"; - version = "0.1.5"; - sha256 = "2a2270b3e941ec942c7d12f641bcf651895f42341514759b1edb77390d205ecc"; + version = "0.1.5.2"; + sha256 = "1hw4ylwwsmp59ifw8s4w1394gv7p2xc6nvqajfmil0p8r8s6r1pf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83104,7 +88534,7 @@ self: { mkDerivation { pname = "haskarrow"; version = "0.0"; - sha256 = "3eeee1ec757fe1249a4e0af0df3df199c44a93975b09603959543e1b2d068906"; + sha256 = "01l90qningjlb4wn02avjy9lmi4ry4yxzw0a9sd29qbzfpnf3viy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83122,7 +88552,7 @@ self: { mkDerivation { pname = "haskbot-core"; version = "0.1"; - sha256 = "e4fc1b4a03cad870dd42a564d3902cd6ceec0a8d8e2ca1413069ed27de93982a"; + sha256 = "0alqjgg2gvb9610s2b4fil5frknn5j8d6r558bfp1n6a0d51pz74"; libraryHaskellDepends = [ aeson base bytestring connection containers http-conduit http-types monads-tf stm text wai warp @@ -83147,7 +88577,7 @@ self: { mkDerivation { pname = "haskdeep"; version = "0.2.0.1"; - sha256 = "7d179798dc1da77a07b9969c9e11ceb5d4a93fe692f20f30c7d6379a3a4f9d59"; + sha256 = "0ncx9wx9ldynqwq0zwljwqzskm5mrq8rx74np43pm9qxvjc9f5vx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83169,8 +88599,8 @@ self: { }: mkDerivation { pname = "haskdogs"; - version = "0.4.5"; - sha256 = "910043c589d093935d99d060f110482b13c76496d215de4d49a276237d8331cc"; + version = "0.5.0"; + sha256 = "16ba13qihpxfvb65szzs5ajhk854c0yii939xavwq76dk0cr01w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83189,7 +88619,7 @@ self: { mkDerivation { pname = "haskeem"; version = "0.7.16"; - sha256 = "d60c34634579508f8e875d3e4c1fd63eb07baf1b657a4f5c5ab72b81a3a2af3a"; + sha256 = "0fmglaiq2axpb9f4yyk53fpppc1ysqglqgjxhy78yl3r8mik836n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83202,14 +88632,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_3_1" = callPackage + "haskeline_0_7_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.3.1"; - sha256 = "7bec719c44d03cc78eb343f7927b1fc0482380384eed506ecb1644b86c62db22"; + version = "0.7.4.0"; + sha256 = "0y1rspmgmgfvx91zkwwgfnfwvdp7q4zxcfl2hq81fcqpi5bgbmcs"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process terminfo @@ -83226,7 +88656,7 @@ self: { mkDerivation { pname = "haskeline-class"; version = "0.6.2"; - sha256 = "d4d55f005b13e98a83273e8a7648a2a54e638b36c31639bff38c09febac0ed75"; + sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl"; libraryHaskellDepends = [ base haskeline mtl ]; homepage = "http://community.haskell.org/~aslatter/code/haskeline-class"; description = "Class interface for working with Haskeline"; @@ -83234,14 +88664,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskeline-repl" = callPackage + ({ mkDerivation, ansi-terminal, base, haskeline, mtl, safe }: + mkDerivation { + pname = "haskeline-repl"; + version = "0.4.0.0"; + sha256 = "0bbjbrhxdms8wbv1dh129l2pkqw5rfva26121ayfx5vr8h7aa7zf"; + libraryHaskellDepends = [ ansi-terminal base haskeline mtl safe ]; + homepage = "https://github.com/githubuser/haskeline-repl#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskelisp" = callPackage ({ mkDerivation, base, containers, mtl, protolude, text }: mkDerivation { pname = "haskelisp"; version = "0.1.1.0"; - sha256 = "1a5e1901451ecf5a3152a77686c7c625ea934f11f5cef22ffa38b5ae28ead372"; + sha256 = "0wnkx8laxd9qz8pz5kpm257r7si5qv3qcxm7a8qmmkqy8l0ijphs"; revision = "1"; - editedCabalFile = "a1b283345ab2aa1553f6293a7b261e973bcb546a0eaecbfd76a9fd5978052041"; + editedCabalFile = "0h900mw5kzd9fvywpbhfd9acnfwp3qk7nfi9yr9ibamjb8s87cm1"; libraryHaskellDepends = [ base containers mtl protolude text ]; homepage = "http://github.com/githubuser/haskelisp#readme"; description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; @@ -83258,7 +88699,7 @@ self: { mkDerivation { pname = "haskell-aliyun"; version = "0.1.0.0"; - sha256 = "8a1cb84f31013ddda1ffcfa11dce3c45dbc8cb444537537d4dd80f97d5a1a1c5"; + sha256 = "1id1l7arf3yq9mym6ds58k5wins57k71v8fgzyhxsg81657vh74a"; libraryHaskellDepends = [ aeson base base64-bytestring basic-prelude blaze-builder bytestring case-insensitive conduit Crypto data-default http-conduit @@ -83281,7 +88722,7 @@ self: { mkDerivation { pname = "haskell-awk"; version = "1.1.1"; - sha256 = "ed7d04bef1156ee5c76f91100579f95c1eb89979f7238ad2d59c0b88b5fbdb68"; + sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83308,7 +88749,7 @@ self: { mkDerivation { pname = "haskell-bcrypt"; version = "0.3.2"; - sha256 = "427c3f95a0b9e3bd53a8d4b17b5f44bf3656ae1d5cfa93e48f2be85e6ea48a5a"; + sha256 = "0nlalip5xs1bizj97yjw3np5cdmz8igppcflm19vvqxrl2akyz22"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring QuickCheck random ]; homepage = "http://www.github.com/zbskii/haskell-bcrypt"; @@ -83323,7 +88764,7 @@ self: { mkDerivation { pname = "haskell-brainfuck"; version = "0.1.0.1"; - sha256 = "284b4d5afd722e819eb1378b970be1dc6eae834309a811eb4d52021719b5d08b"; + sha256 = "12yhnlcif0jj9pmi3a098f1swvnww45rg2rpn6g82bkjzmd4sjr8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring mtl parsec ]; @@ -83344,7 +88785,7 @@ self: { mkDerivation { pname = "haskell-cnc"; version = "0.1.3.200"; - sha256 = "0d3627cb100946002de9af73310630f4f7782b6186bbc40bfa067bb57a933374"; + sha256 = "0x1kjdxbayq6z85w9fw6c4mpixzl60332wxgx4nh0ih9235jfdhd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83363,7 +88804,7 @@ self: { mkDerivation { pname = "haskell-coffee"; version = "0.1.0.2"; - sha256 = "674eb2c80b5b88ca9f571b5d025620508b4d1f164878a512dac3f680fd24e9c7"; + sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7"; libraryHaskellDepends = [ base process ]; description = "Simple CoffeeScript API"; license = stdenv.lib.licenses.gpl3; @@ -83376,7 +88817,7 @@ self: { mkDerivation { pname = "haskell-compression"; version = "0.2"; - sha256 = "4b8dea429507697df12dfeeae6e0963e1db11f7c1d153cb8d0198353cb87127c"; + sha256 = "0z0jhz5m70qrs2w3q58xghgv279yjvhfdspy5pqpss87jm1fm3ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83395,13 +88836,30 @@ self: { mkDerivation { pname = "haskell-course-preludes"; version = "0.0.0.4"; - sha256 = "567eaa088b72851edf306ade995cafade1ec6e47ff81c32d66f96bcdba821be4"; + sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn"; libraryHaskellDepends = [ base deepseq ]; description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality"; license = stdenv.lib.licenses.mit; 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 @@ -83411,7 +88869,7 @@ self: { mkDerivation { pname = "haskell-docs"; version = "4.2.7"; - sha256 = "e82a15f6e8b6572754036427af862981d5fc22904b0c3af4d6fddc63fb1463d5"; + sha256 = "1mb32kxn7p7xsvs3l32bj0igrmc1563ay9v40da2fmxnx3v1aap8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83431,7 +88889,7 @@ self: { mkDerivation { pname = "haskell-eigen-util"; version = "0.1.0.4"; - sha256 = "0ba52c28e224551368a6129421e4e5a81c47db0c5d50399adb3dadbe9d6f5d9b"; + sha256 = "16sxdyfvxb9xvfd3jl2x1kdlf758wpj2350jlrl16m94w8l2r98b"; libraryHaskellDepends = [ base eigen vector ]; testHaskellDepends = [ base eigen vector ]; homepage = "https://github.com/dilawar/haskell-eigen-util#README.md"; @@ -83444,7 +88902,7 @@ self: { mkDerivation { pname = "haskell-exp-parser"; version = "0.1.1"; - sha256 = "a53cfae87b679f24b5c0a14a72be35760525bcad28b2fc0c870c19c09f2f975c"; + sha256 = "0p4p5ygw068chw6grci8mny2a1bn6nz74jm1q2sj97v7gglglg55"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/emilaxelsson/haskell-exp-parser"; @@ -83457,9 +88915,9 @@ self: { mkDerivation { pname = "haskell-fake-user-agent"; version = "0.0.2"; - sha256 = "a39b379651027d108b0e2d984f6f511b689965d457b9df3ffbc0979727ee70bb"; + sha256 = "1fvhxqkrg5y0zczxzfapsijrjs0va5plz61d1s5i0z82a6b3g6x3"; revision = "1"; - editedCabalFile = "65dd13a2e59f64c981bacaf839f8f1ee14a505f68bb1ca2173bd48c15698f80e"; + editedCabalFile = "03pqk1bc2j5xfchwmccbyq2sa57fy7w3ky6apa0wjr4zwni17pb5"; libraryHaskellDepends = [ base bytestring lens tagsoup wreq ]; description = "Simple library for retrieving current user agent strings"; license = stdenv.lib.licenses.publicDomain; @@ -83474,7 +88932,7 @@ self: { mkDerivation { pname = "haskell-formatter"; version = "1.0.0"; - sha256 = "eb9c24f60e59b87ac111ce0078a2fec5f53ee30d65aa577508d6def14e692c57"; + sha256 = "0mrcd57g3pnn11smgak51pikxxf5zsi7h06f270pmf2r1vv2977b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83503,7 +88961,7 @@ self: { mkDerivation { pname = "haskell-ftp"; version = "0.1.0.1"; - sha256 = "372a4ccca765c0ce7ce3251233abe70c8d92743380973904de0f0f830b9c661c"; + sha256 = "0736kh5q63qgvq23k5w06ds9538cwymk64i5wdycxh35lz64qaip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83529,7 +88987,7 @@ self: { mkDerivation { pname = "haskell-generate"; version = "0.2.4"; - sha256 = "5ee6043024baf2cf79be13505e51f8ec3dab6aacb64df2ebb62f385ecf1b0c88"; + sha256 = "120c3g7mwf1gnvmz4kdnmimanggcz18mwl0kprwwzwms4hq09rjy"; libraryHaskellDepends = [ base containers haskell-src-exts template-haskell transformers ]; @@ -83540,27 +88998,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-gi" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl - , pretty-show, process, regex-tdfa, safe, text, transformers - , xdg-basedir, xml-conduit + "haskell-gettext" = callPackage + ({ mkDerivation, base, binary, bytestring, bytestring-trie + , containers, filepath, haskell-src-exts, mtl, old-locale, parsec + , text, time, transformers, uniplate }: mkDerivation { - pname = "haskell-gi"; - version = "0.20"; - sha256 = "9eec8bad2539b01d833f31cde7dbbe3cc911ab7ba89b68b20d4b2dfc0716d6f6"; + pname = "haskell-gettext"; + version = "0.1.1.0"; + sha256 = "1kfqrm90my0h15f1x6n4fzzf9fvyicg87fqwbal37hj888jb0gv8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers directory filepath haskell-gi-base - mtl pretty-show process regex-tdfa safe text transformers - xdg-basedir xml-conduit + base binary bytestring bytestring-trie containers mtl parsec text + time transformers + ]; + executableHaskellDepends = [ + base filepath haskell-src-exts old-locale time uniplate + ]; + description = "GetText runtime library implementation in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-gi" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.20.2"; + sha256 = "1dnavj0qpcljakmb5jnv0hqds8a0zqn5ycn0xq5fls20fmw9j5gh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe text + transformers xdg-basedir xml-conduit ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; executableHaskellDepends = [ base containers directory filepath haskell-gi-base pretty-show text ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; @@ -83570,8 +89051,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.20"; - sha256 = "d62e8b11d67441974e7cb52b0a30e7a1efe6051ddde62c48fe276185c670b80a"; + version = "0.20.3"; + sha256 = "07ggfmbr9s4c1ql4cyyk64fbig5k2mpc25371zrrj44yc6ai2xz1"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -83579,6 +89060,21 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-go-checkers" = callPackage + ({ mkDerivation, base, containers, gloss }: + mkDerivation { + pname = "haskell-go-checkers"; + version = "0.1.1.0"; + sha256 = "1b6j3w1cxznzgzzncxccdrqmxj233whmkbhg96rd7kshhx21rhd2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base containers gloss ]; + homepage = "https://github.com/prateekkumarweb/haskell-go-checkers"; + description = "Go and Checkers game in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-google-trends" = callPackage ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens , regex-base, regex-posix, tagsoup, text, wreq @@ -83586,9 +89082,9 @@ self: { mkDerivation { pname = "haskell-google-trends"; version = "0.0.2"; - sha256 = "e125197433c5eccbfe9b373f2f1a501d9fff56697524333d8d6a44f7f93b5f47"; + sha256 = "0isz7gwzfi3ailyk693md5bgz7qxa0d2ygrpkgzcpv656ds1j9g1"; revision = "1"; - editedCabalFile = "e667493c8945f7f8fcaa3f847c9ee8e0016079d237f75320182d12d9fa674f79"; + editedCabalFile = "0yagczxdj4id30h57xrps9wn00g0x2g7r11zmbygixs5i4y4jrz6"; libraryHaskellDepends = [ base bytestring haskell-fake-user-agent lens regex-base regex-posix tagsoup text wreq @@ -83600,14 +89096,14 @@ self: { "haskell-igraph" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs - , colour, data-default-class, hashable, hxt, igraph, primitive - , random, split, tasty, tasty-golden, tasty-hunit - , unordered-containers + , colour, data-default-class, data-ordlist, hashable, hxt, igraph + , matrices, primitive, random, split, tasty, tasty-golden + , tasty-hunit, unordered-containers }: mkDerivation { pname = "haskell-igraph"; - version = "0.2.2"; - sha256 = "33673e6369f2b83c9103367af9b4050c3a6ed71ebbb3033a601a1e4c65f57a7d"; + version = "0.3.0"; + sha256 = "1d0phlb2c7dibvs6ayvwgqslkzxmvcij7iw9mqxqk67zp12ga0pv"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing colour data-default-class hashable hxt primitive split unordered-containers @@ -83615,7 +89111,7 @@ self: { librarySystemDepends = [ igraph ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base random tasty tasty-golden tasty-hunit + base data-ordlist matrices random tasty tasty-golden tasty-hunit ]; description = "Imcomplete igraph bindings"; license = stdenv.lib.licenses.mit; @@ -83628,14 +89124,15 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.1"; - sha256 = "c708c2d5fa7e48c205aeaf1661b07dc52ec4d6e459f3544585b71dbc63f3be92"; + 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; @@ -83646,7 +89143,7 @@ self: { mkDerivation { pname = "haskell-in-space"; version = "0.1.1"; - sha256 = "e4887aa03e55a4fc4357b50a8fc24514ff750805a42ceca9f2c901d5872e9fe5"; + sha256 = "1rcz5s3xa0f9yalyqb540l47bzql8p18y2mmax1zr92m7sh7m274"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HGL random ]; @@ -83664,7 +89161,7 @@ self: { mkDerivation { pname = "haskell-kubernetes"; version = "0.5.0"; - sha256 = "f81d4713d2588d95c276768e7845f505b7d5c44b8febf2a34e373a35945ba52d"; + sha256 = "0bd5bfa3afip9siz5swg9g2dbdq5ym2pi3knfv19b3aqs89lf7gq"; libraryHaskellDepends = [ aeson base bytestring containers either http-api-data http-types lens network-uri QuickCheck quickcheck-instances scientific servant @@ -83681,7 +89178,7 @@ self: { mkDerivation { pname = "haskell-lexer"; version = "1.0.1"; - sha256 = "d7d42ab3c4bc2f0232ede8b005fb9de57f862ee4c1c83aa61e1022346fc84366"; + sha256 = "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p"; libraryHaskellDepends = [ base ]; description = "A fully compliant Haskell 98 lexer"; license = stdenv.lib.licenses.bsd3; @@ -83692,7 +89189,7 @@ self: { mkDerivation { pname = "haskell-menu"; version = "0.2.1"; - sha256 = "c43b6ba537425f02a52e7065224de0a399eadd1e2436f3553d8bc0b1057a48a3"; + sha256 = "18s8g82v3h4b7maz6di43vfym6d3w16j4rbh5sjh4ps26yjnnfy4"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/jlamothe/haskell-menu"; description = "A simple menu system for Haskell programs"; @@ -83704,7 +89201,7 @@ self: { mkDerivation { pname = "haskell-modbus"; version = "0.3.2"; - sha256 = "ce3f139ca327ebec546ceecd48995063d6902f79c2e29ea6ca091482dee16c21"; + sha256 = "08bcw7g84509rak9xqn2g4pr1mk3a2clikgfdiafrsr7lff16gyf"; libraryHaskellDepends = [ array base bytestring cereal ]; testHaskellDepends = [ array base bytestring cereal hspec ]; homepage = "http://www.github.com/jhickner/haskell-modbus"; @@ -83717,7 +89214,7 @@ self: { mkDerivation { pname = "haskell-mpfr"; version = "0.1"; - sha256 = "9bd1ddbdff533479d69fb5a94a018aea93a5578c2be70446595f87f6b41172ad"; + sha256 = "1bbj26sgd1szb5309rrbiibsb4zai80lmadmkzb7jd2kzyyxvlcv"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; homepage = "http://github.com/comius/haskell-mpfr"; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; @@ -83732,7 +89229,7 @@ self: { mkDerivation { pname = "haskell-mpi"; version = "1.4.0"; - sha256 = "c0aa02ffe77d4a39d5b33e3f846e7615c78b2ddfb6b36c9cdec335edb79488ab"; + sha256 = "1aw8jjvysdf3vsf6rcxnvwnqpiqmfrp88gryngakjjkxwzzh5an0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83756,7 +89253,7 @@ self: { mkDerivation { pname = "haskell-names"; version = "0.8.0"; - sha256 = "963b20f77a12fcfc0e8811d891b86aaaa7fe5cbb44365d60eb17f6b7de93ee88"; + sha256 = "127fjggbgxhpxdh5sdj4pdfgx9xadaw93n0ii07grz0jgbvj0fwn"; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath haskell-src-exts mtl transformers traverse-with-class uniplate @@ -83783,7 +89280,7 @@ self: { mkDerivation { pname = "haskell-neo4j-client"; version = "0.3.2.4"; - sha256 = "30eea529b6d8bd4b887cec7a6b210dd80223d97811bb26042b0c1ccfc8c381c2"; + sha256 = "1hl1qg4cy70c5c22dfqig3cj60nq1lhnnypcgj44pgfqnqlsbvih"; libraryHaskellDepends = [ aeson base bytestring containers data-default hashable HTTP http-client http-client-tls http-conduit http-types lifted-base mtl @@ -83809,7 +89306,7 @@ self: { mkDerivation { pname = "haskell-openflow"; version = "0.0.0.1"; - sha256 = "6d56fb780b4f653dae59427e945fd73445b183f4610ef3c8f94a9e48f89e3fff"; + sha256 = "1zrzkvw4i7jaz74g63k1yj1v2i9lsxgr8zj2b6p3srag1dwgnmkd"; libraryHaskellDepends = [ base bytestring cereal network network-info ]; @@ -83828,7 +89325,7 @@ self: { mkDerivation { pname = "haskell-packages"; version = "0.5"; - sha256 = "c61f282e6425ba506e5bd288462e63ec14c13d28b1d1d6e9e989198acbffd02c"; + sha256 = "0b6hzz5ql6c9x7lxdldi50yw257cccp4d26jbdp51fi5chp2h7y6"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged @@ -83847,7 +89344,7 @@ self: { mkDerivation { pname = "haskell-pdf-presenter"; version = "0.2.5"; - sha256 = "4317f7c11ff0f4e67734a42e24ba207846f31cb253908505dea853dbe8b1c387"; + sha256 = "11y3n7ldnlx8vq2qb42kn8fg6ikq42x28bm46ivydx7h3z0zf5s3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83872,7 +89369,7 @@ self: { mkDerivation { pname = "haskell-platform-test"; version = "2010.2.0.0"; - sha256 = "93af73125b9b9feb76a11d0ff6e333a6cba56f25f9a95841a546a5d9efad264e"; + sha256 = "0ki6mppxk9a6lm0miagr4mpsbjx66gizc3qxl5vfp7wvbc977bwk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83898,7 +89395,7 @@ self: { mkDerivation { pname = "haskell-player"; version = "0.1.3.3"; - sha256 = "e28e264e3ca75dbc254aa57b96cdeb3dee163ced9f259e22c21e2a20db44e5c4"; + sha256 = "1i758kdj0ahyq8i9w9czxly1dvixxg6rcyx598jvqpd77i72d3p2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83920,7 +89417,7 @@ self: { mkDerivation { pname = "haskell-plot"; version = "0.1.0.0"; - sha256 = "f16e55085e33d192f24e15e11c110338b508217157c33f5362d02e3dfe148a37"; + sha256 = "0dwa2kz3sbnhc99kzhspf4hhid9q0c8irq8m9vr95l9kbq45avpi"; libraryHaskellDepends = [ base Chart Chart-cairo Chart-gtk colour data-default lens math-functions vector @@ -83938,9 +89435,9 @@ self: { mkDerivation { pname = "haskell-proxy-list"; version = "0.0.1"; - sha256 = "cf379730ef04111dcedb0b6b4f92d9e175486f98f3a46a1fdf55fd835757666a"; + sha256 = "0sk6axbq7zamvwgnm97kk1plhxg1v694ysqbvg71s484xwq9fdyg"; revision = "1"; - editedCabalFile = "36b1057bb6e8c17e489aa2efda8b02d6f55c9b381bc18280c6e2ee4fd352c201"; + editedCabalFile = "00f2ab9lzvp2qs085h8v72dmrxfn0a5xmvx2k947xhg8nrxhbc9n"; libraryHaskellDepends = [ base base64-string bytestring lens random regex-base regex-posix text wreq @@ -83955,7 +89452,7 @@ self: { mkDerivation { pname = "haskell-qrencode"; version = "1.0.4"; - sha256 = "12a2c616b61dfb8d19046d9ba30d7aeedb122ff8d876dbad9ba1eb4dfe7506b3"; + sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ qrencode ]; homepage = "https://github.com/jamessanders/haskell-qrencode"; @@ -83968,7 +89465,7 @@ self: { mkDerivation { pname = "haskell-read-editor"; version = "0.1.0.0"; - sha256 = "ea4d6469f7f3b661ee08f74f53291f9361bd53bef5a6e645c5a96b8d3b345d23"; + sha256 = "08sx6hxqssx9qm2yd9pmpr9vsqck3wlm6kzp13p63dpkyxln8kga"; libraryHaskellDepends = [ base directory process ]; testHaskellDepends = [ base directory hspec process ]; homepage = "https://github.com/yamadapc/haskell-read-editor"; @@ -83984,7 +89481,7 @@ self: { mkDerivation { pname = "haskell-reflect"; version = "0.9"; - sha256 = "d6ff34d5ad94815cec56e3a747817a2929cdadb2a354007b1efe02992ed2db84"; + sha256 = "116vs8p9j0py3rxh0m53nanwsa99ga0lg9z3avn5r0clmpak9zyn"; libraryHaskellDepends = [ base containers hint MonadCatchIO-mtl mtl parsec template-haskell transformers @@ -83999,7 +89496,7 @@ self: { mkDerivation { pname = "haskell-rules"; version = "0.1.0.1"; - sha256 = "e6c357a23888313d9f2cfab4e72805a2d91507378063ec861b22b56e5f60a80d"; + sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6"; libraryHaskellDepends = [ base syb ]; description = "A DSL for expressing natural deduction rules in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -84013,7 +89510,7 @@ self: { mkDerivation { pname = "haskell-spacegoo"; version = "0.2.0.1"; - sha256 = "1eb3faa9a7f6a5870337eeb0bb3ad915f58987dfe4643fe95c91cbb2738ddd3c"; + sha256 = "0g6ximrv5jwibklkyr74vy3qkx8mv4xbpc7f6w1qg9gnlylzmcqy"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra mtl pretty pretty-show text vector vector-space @@ -84027,7 +89524,7 @@ self: { mkDerivation { pname = "haskell-src"; version = "1.0.2.0"; - sha256 = "2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6"; + sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -84042,7 +89539,7 @@ self: { mkDerivation { pname = "haskell-src-exts"; version = "1.18.2"; - sha256 = "31583804dcec5c200bcf184db8a2eb33fdcc3354b011c6485370be63b2710943"; + sha256 = "0hq9f6r67gkhad4cc4dhahrwrz9kxfibhk8qrw5j0p7cvh23hn1i"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -84063,7 +89560,7 @@ self: { mkDerivation { pname = "haskell-src-exts"; version = "1.19.1"; - sha256 = "f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971"; + sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -84082,7 +89579,7 @@ self: { mkDerivation { pname = "haskell-src-exts-prisms"; version = "1.18.2.0"; - sha256 = "5b731238acbd9aa50337d3f4ca18199e6a76825596ba48628ef623ccdeacf399"; + sha256 = "16gkmkgcq8zniri4iflnan17csly34ccmx6k6w1sb6mxmhw14wsv"; libraryHaskellDepends = [ base haskell-src-exts lens template-haskell ]; @@ -84099,7 +89596,7 @@ self: { mkDerivation { pname = "haskell-src-exts-qq"; version = "0.7"; - sha256 = "b61fd34e379b80c45013ba70441261ab41d49f60c12dab880b487edabc99a82f"; + sha256 = "0bx8k6ydlzj81f4anbf1c2gx8hdbc4948w5s2d8c904v6x7d67xn"; libraryHaskellDepends = [ base haskell-src-exts haskell-src-meta syb template-haskell ]; @@ -84114,7 +89611,7 @@ self: { mkDerivation { pname = "haskell-src-exts-simple"; version = "1.19.0.0"; - sha256 = "41bc9166e7d08bb18b5309eb2af00ce122c70eeffd047da47e9e2d9db89a2406"; + sha256 = "01i4kaw9sbcygsj7s17xxw7cf8p11kq2msq9af5v32yhwxk93g21"; libraryHaskellDepends = [ base haskell-src-exts ]; homepage = "https://github.com/int-e/haskell-src-exts-simple"; description = "A simplified view on the haskell-src-exts AST"; @@ -84129,7 +89626,9 @@ self: { mkDerivation { pname = "haskell-src-meta"; version = "0.7.0.1"; - sha256 = "428e5a1c90c645d4c9cb54f984721b1b21e494677d1d7d8e7206f6c0e9286a3a"; + sha256 = "0fka53lw1xh6fa77s7bxcyaf888v3dr89yalrg4x8if6j0f5m3j2"; + revision = "1"; + editedCabalFile = "0g6jslwrz934hpq8x0b7r50rk2q96raw5a6s4mxanjx36g19rrgp"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -84137,6 +89636,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_8_0_1" = callPackage + ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb + , template-haskell, test-framework, test-framework-hunit + , th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.8.0.1"; + sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + testHaskellDepends = [ + base haskell-src-exts HUnit pretty template-haskell test-framework + test-framework-hunit + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -84144,7 +89664,7 @@ self: { mkDerivation { pname = "haskell-src-meta-mwotton"; version = "0.1.0"; - sha256 = "d622d4edeae11c2dd808828bdd968957e5d8486e30f6fd3c9e81efdae5b8c011"; + sha256 = "04f0p3jxmvw1kqygvxihdr4dirapi6bdv2w213c2s771xbnx88nn"; libraryHaskellDepends = [ base containers ghc-prim haskell-src-exts pretty syb template-haskell @@ -84158,8 +89678,8 @@ self: { ({ mkDerivation, base, doctest, lens, semigroups, text, time }: mkDerivation { pname = "haskell-time-range"; - version = "0.2.0.0"; - sha256 = "73c6258304465cd4e243287e7012a9630a6835025104414105c29c9e9f5503c7"; + version = "0.2.0.1"; + sha256 = "1xhf68b5a8x6fpjv5w3dc41jc1nv5mdipimxa2g3xhk72761b4r4"; libraryHaskellDepends = [ base lens semigroups text time ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/mankyKitty/haskell-time-range#readme"; @@ -84176,7 +89696,7 @@ self: { mkDerivation { pname = "haskell-token-utils"; version = "0.0.0.6"; - sha256 = "39ddabf1f1efed180befd86b5bfcd4e2a230b296d558c55907e75abc13a7df92"; + sha256 = "14nzlw9vqnp70xcwan6mjsr318p2sky5nsyqxw5iivggy7qspp9r"; libraryHaskellDepends = [ base containers dual-tree ghc ghc-paths ghc-syb-utils haskell-src-exts monoid-extras mtl pretty rosezipper semigroups syb @@ -84199,7 +89719,24 @@ self: { mkDerivation { pname = "haskell-tools-ast"; version = "0.5.0.0"; - sha256 = "69f8feebf6ffbb942f7e0ca9b0e6a258a83f4acda13977e99b4568d36e9dee77"; + sha256 = "0xzfkmpd6s25kglpffd1rm53za2qlbkb1a8cgqpr9fzzyvmzxy39"; + libraryHaskellDepends = [ + base ghc mtl references template-haskell uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskell-tools-ast_0_8_0_0" = callPackage + ({ mkDerivation, base, ghc, mtl, references, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "0.8.0.0"; + sha256 = "15d588xnmghq116g4bg0jv10z5xzs54ln4da58dzm0d8241bmcd0"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -84217,7 +89754,7 @@ self: { mkDerivation { pname = "haskell-tools-ast-fromghc"; version = "0.2.0.0"; - sha256 = "f603ff60149bea2a85c2fa0c6d83acb3545c365ab26dadb2eafe5012d889ede6"; + sha256 = "1rpdi7c14l7yxarasvdjb8v5qm5kmj1ns37sqa2jmslv2ihgy0zn"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell uniplate @@ -84235,7 +89772,7 @@ self: { mkDerivation { pname = "haskell-tools-ast-gen"; version = "0.2.0.0"; - sha256 = "734e462a7af5cfe15560c77bde51e7111bf771621f5fb02c01bb8e26dba93170"; + sha256 = "0w1im7djd3mv04nb0pqzc9qzf6qiwx8xwyy7c1ay3kzmg8m4ckkk"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl references @@ -84253,7 +89790,7 @@ self: { mkDerivation { pname = "haskell-tools-ast-trf"; version = "0.2.0.0"; - sha256 = "4dfc8d6a80c392c82063b720723634780af9a53535928274c863ab4c66353677"; + sha256 = "0xrn6mk4rav3r1s854im6njzj2kq6hv7485pcchci4n3h1m8vz2d"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references uniplate ]; @@ -84271,7 +89808,7 @@ self: { mkDerivation { pname = "haskell-tools-backend-ghc"; version = "0.5.0.0"; - sha256 = "eb8d8b2367020d851f83a2a9fccda813da6537a38c7065e92237f769e7bd2fe8"; + sha256 = "1s1gppknkxrp4blnaw4clcvnbnhkm36zrad2hcgqa382cwiqp3gb"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -84282,6 +89819,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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.8.0.0"; + sha256 = "076kb9hcjina0d5dcwslbxhkja3p2m2fyxs88ywyqlciry2wdw2n"; + libraryHaskellDepends = [ + 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"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, haskell-tools-ast @@ -84291,7 +89847,7 @@ self: { mkDerivation { pname = "haskell-tools-cli"; version = "0.5.0.0"; - sha256 = "08796a6d02d06c9cd68936436a452e82c90468e1420d3f02b3ed040f117d2c14"; + sha256 = "051cgl8hy17dnc13y3a2w5l09jc25r2nlhrni7b9qv6h09nnly88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84312,6 +89868,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 + , process, references, split, strict, tasty, tasty-hunit, time + }: + mkDerivation { + pname = "haskell-tools-cli"; + version = "0.8.0.0"; + sha256 = "02f5fhb20wb49gchqx8mjc6khdlc3g6lfawxl3v0xr8fargyyiz5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath ghc ghc-paths haskell-tools-ast + haskell-tools-prettyprint haskell-tools-refactor mtl references + split strict + ]; + executableHaskellDepends = [ base directory process split ]; + testHaskellDepends = [ + base bytestring directory filepath knob tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath knob split time + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Command-line frontend for Haskell-tools Refact"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -84321,7 +89907,7 @@ self: { mkDerivation { pname = "haskell-tools-daemon"; version = "0.5.0.0"; - sha256 = "588ef66d492b16d6d76a34111dc43fc3243c4bff48d6f5aa2281c72ae365925a"; + sha256 = "0nljcpijmiw14amgbmj8zx5kq9637z21s49ldbbxc5ib95nzd3jq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84340,6 +89926,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 + , network, process, references, split, strict, tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "0.8.0.0"; + sha256 = "0fd9pxyxsfy09ks21nsk6khx97mb73kvjk6hg3wc8qcffxng9m69"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers Diff directory filepath ghc + ghc-paths haskell-tools-ast haskell-tools-prettyprint + haskell-tools-refactor mtl network process references split strict + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc HUnit network process + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools refactor that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -84348,7 +89962,7 @@ self: { mkDerivation { pname = "haskell-tools-debug"; version = "0.5.0.0"; - sha256 = "b70796a99599cb051d2bbad5b02863245c8eae9732aa96ff3bc038e7b114dc27"; + sha256 = "09yw2jqyff607gzrdaijjyp8wp14cclb1mds5cfhbjwrjnlrc1xp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84362,6 +89976,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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.8.0.0"; + sha256 = "0j9gd562kmmanqx9kbs1kks68pksnxgf55rghl8ip3j8a3h93smy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-prettyprint + haskell-tools-refactor references template-haskell + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -84373,7 +90010,38 @@ self: { mkDerivation { pname = "haskell-tools-demo"; version = "0.5.0.0"; - sha256 = "4b5dd31ee4a5342a49e07c8c48daccc98f7dd16afab819e370b944f45ec2618c"; + sha256 = "1331q9gg8i5rf3iikf7sdb8pv3y9rkd4i33ww14jld55whgd6pab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor http-types mtl + references transformers wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 + , haskell-tools-refactor, http-types, HUnit, mtl, network + , references, tasty, tasty-hunit, transformers, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "0.8.0.0"; + sha256 = "14l8zwzi4nzx1ddq2sbazr5faf0y241ppx9df5q9n0v24aclmxd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84400,7 +90068,7 @@ self: { mkDerivation { pname = "haskell-tools-prettyprint"; version = "0.5.0.0"; - sha256 = "4690b95cd4e2d53547dd854d792dd1731c85470e97c1e0d6ed1df951b951367c"; + sha256 = "0z1na6wm3y8xxpbf1hcp1r3qa73ks4npjkc5vm3kbmg2sifbk426"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split uniplate ]; @@ -84410,6 +90078,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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.8.0.0"; + sha256 = "19bx0fzgvin78iilw32klmjr0z0c9cw1x0xx1nj8mbi44c5rcb64"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -84421,7 +90107,38 @@ self: { mkDerivation { pname = "haskell-tools-refactor"; version = "0.5.0.0"; - sha256 = "41dcc1a933623fd172776800473596d7d5fa84b68a96042361d474c76db35df8"; + sha256 = "1y2xndnwfx6lc4ih95lans2gmmfpjqslf038fxrd2gv26flw3p21"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "0.8.0.0"; + sha256 = "1k9mq164v7nm83dykdgmzxfdqmyk5p35lgzvnmw9mh43rrnnw8vd"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -84449,7 +90166,30 @@ self: { mkDerivation { pname = "haskell-tools-rewrite"; version = "0.5.0.0"; - sha256 = "abbd76e8709b6fff25c6da010447ab5ad06381169fbf191470178eb8412dbc94"; + sha256 = "155w5m0vi3hpf0a1kgwz2s0n7l2smd3h80fsqqjzyvwvf3l7dgdb"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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.8.0.0"; + sha256 = "076dc91swh42rs80ijbjrbzab1m9vjdzvy7z9r7znmrhy951ck5c"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -84475,7 +90215,7 @@ self: { mkDerivation { pname = "haskell-tor"; version = "0.1.2"; - sha256 = "643fb2b1064482fbb636b1cac76721bec73e52257e3a88f98039d0d7d1d2d84b"; + sha256 = "0jyqsb8xgl1rh3wqhfky4m93xixy45kwgjmi6svgp0j40sqv4gv4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84504,7 +90244,7 @@ self: { mkDerivation { pname = "haskell-type-exts"; version = "0.1.0"; - sha256 = "28fd71761896d7569deaa69b6af55e1e36ae5a53ce5a3595c8f3b521d3d33414"; + sha256 = "051lsg9j3dgkr2akannfaddawdhybvsnm6x6xafmdmwn31v73z98"; libraryHaskellDepends = [ base containers haskell-src-exts pretty ]; @@ -84519,7 +90259,7 @@ self: { mkDerivation { pname = "haskell-typescript"; version = "0.1.0.0"; - sha256 = "687028547acd68f1d6c2fe71b25883c3ecdb89dd3364e71e57b419a6ec18653b"; + sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38"; libraryHaskellDepends = [ base process ]; description = "Simple TypeScript API"; license = stdenv.lib.licenses.gpl3; @@ -84531,7 +90271,7 @@ self: { mkDerivation { pname = "haskell-tyrant"; version = "0.4"; - sha256 = "27d1c018e2db191c27973cf06cf052f320a71d98af5081108e285e3ac10e10df"; + sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97"; libraryHaskellDepends = [ base binary bytestring network ]; homepage = "https://github.com/PeterScott/haskell-tyrant"; description = "Haskell implementation of the Tokyo Tyrant binary protocol"; @@ -84546,7 +90286,7 @@ self: { mkDerivation { pname = "haskell-updater"; version = "1.2.10"; - sha256 = "e9712ccaa38bb2ca4242272eee72c72e5b2d0943d7d35c846fccdd89a5428e7d"; + sha256 = "0zcf8ajqkpfcdy25rlyp8c4jsnrfqxrfwbi7891cmclblg52qwg9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -84564,7 +90304,7 @@ self: { mkDerivation { pname = "haskell-xmpp"; version = "1.0.2"; - sha256 = "a9345eb03a7ea0dc4a50af3a916ad2c455fb2232c6d36830afc8e70d6c259dfc"; + sha256 = "1z4x4mn0vry8mwq6ily668ignmf4s9m92fmga15dr83y7aq5wd59"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84582,7 +90322,7 @@ self: { mkDerivation { pname = "haskell2010"; version = "1.1.2.0"; - sha256 = "957ccb3008bcfd099e72b0fee1649de9ab30eb40e74b41aa573c9685c0da0ae8"; + sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m"; libraryHaskellDepends = [ array base ghc-prim ]; homepage = "http://www.haskell.org/onlinereport/haskell2010/"; description = "Compatibility with Haskell 2010"; @@ -84597,7 +90337,7 @@ self: { mkDerivation { pname = "haskell98"; version = "2.0.0.3"; - sha256 = "bd5d4652f699caa1b1c654dc9ca94ecc2181b453c4f65999915abd63e75ba090"; + sha256 = "1450bgkn7gasj6cmkxn4afs828fc9slrrp2lqsqs3jlryr94cpdx"; libraryHaskellDepends = [ array base directory old-locale old-time process time ]; @@ -84614,7 +90354,7 @@ self: { mkDerivation { pname = "haskell98libraries"; version = "2.0.0.2"; - sha256 = "28a2acbdfd16833457350127c5964d277c36c5679d5db129d299eff7f6e492b5"; + sha256 = "1dcjwkvggvwrs8lv2pcxcz2kcz179nbca9q16mbk90qnznysr8i8"; libraryHaskellDepends = [ array base directory old-locale old-time process time ]; @@ -84631,7 +90371,7 @@ self: { mkDerivation { pname = "haskelldb"; version = "2.2.4"; - sha256 = "be90caa6cf54521704ba877645043a24f19166870ceccf8a61faf322fe4a0c39"; + sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y"; libraryHaskellDepends = [ base containers directory mtl old-locale old-time pretty time ]; @@ -84646,7 +90386,7 @@ self: { mkDerivation { pname = "haskelldb-connect-hdbc"; version = "0.1.0.0"; - sha256 = "740a1e94f7762d244393ccde1141166a9f6501f8df42e54c6e6ff5319c7331d1"; + sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl"; libraryHaskellDepends = [ base containers haskelldb HDBC ]; homepage = "http://twitter.com/khibino"; description = "Bracketed HDBC session for HaskellDB"; @@ -84661,7 +90401,7 @@ self: { mkDerivation { pname = "haskelldb-connect-hdbc-catchio-mtl"; version = "0.1.0.0"; - sha256 = "bc17845ea053740c2e29650ec083d5b3d4c168a9241156749c0a5e76b2494feb"; + sha256 = "1ssg96r7cphakis5c494m5lc3m5ksn1w03k554p0qx2kl1g885xw"; libraryHaskellDepends = [ base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl ]; @@ -84678,7 +90418,7 @@ self: { mkDerivation { pname = "haskelldb-connect-hdbc-catchio-tf"; version = "0.1.0.0"; - sha256 = "84c3bbf9596da89459ea80f46f634b005e403f84d9256ee39229529f115a0a9b"; + sha256 = "16qab88ryli9jbinw9frhhzl0ph09dinzx40x9cr9a3db7wvphw4"; libraryHaskellDepends = [ base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-transformers transformers @@ -84696,7 +90436,7 @@ self: { mkDerivation { pname = "haskelldb-connect-hdbc-catchio-transformers"; version = "0.1.0.0"; - sha256 = "47961d8db314d85a779aae0c251f3f0be06ec629348dc88b33ff2bc2e8346b41"; + sha256 = "0hbb6klc4azz6f5wi39l5736xq0b7wgja35fk9vmmn0lnf6iv5j7"; libraryHaskellDepends = [ base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-transformers transformers @@ -84714,7 +90454,7 @@ self: { mkDerivation { pname = "haskelldb-connect-hdbc-lifted"; version = "0.1.0.0"; - sha256 = "8a0bb4fa66ce353825bc0cea5583bc449a6d4fc85c2f9b1953a3e5ba8e8256fb"; + sha256 = "1ysnha7bmrd3accrnbswr17nv6j4pj1mbshcphjkhdffcvxb82wa"; libraryHaskellDepends = [ base haskelldb haskelldb-connect-hdbc HDBC lifted-base monad-control transformers-base @@ -84730,7 +90470,7 @@ self: { mkDerivation { pname = "haskelldb-dynamic"; version = "1.0.0"; - sha256 = "caa84303097f958a7b019a6c3458a85db20d747288941616774265253bf7b171"; + sha256 = "0wdiywxjara2fwb1d548f9s0vcjxm1c38v4s05xqm5bz141l7a6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ]; @@ -84748,7 +90488,7 @@ self: { mkDerivation { pname = "haskelldb-flat"; version = "1.0.1"; - sha256 = "a10f611e9b664cf273d83d70e8d7c1213ed72a96f685921eecebba7f4255e538"; + sha256 = "0f75am17zfpbxhg951gnjqmdfgi1q7byhw1xv1rz4k36kcg623x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84767,7 +90507,7 @@ self: { mkDerivation { pname = "haskelldb-hdbc"; version = "2.2.4"; - sha256 = "42270f14d5138b2e69ddd61684ce13080853519b29c2082698949ec12d4cc70b"; + sha256 = "02y79hnw37llk0k0ihi9kd8m62082g7885nnvmljx2qksla0y9s2"; libraryHaskellDepends = [ base containers convertible haskelldb HDBC mtl old-time ]; @@ -84784,7 +90524,7 @@ self: { mkDerivation { pname = "haskelldb-hdbc-mysql"; version = "0.1.1"; - sha256 = "222a20cf8b2e35db430f099f4151519d422d221ef0470034c75d98a8b394c85a"; + sha256 = "0nn8jjrsi62xqws00izh3qi2shlxa58l37q91x1xnd9fig7j0ai2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84802,7 +90542,7 @@ self: { mkDerivation { pname = "haskelldb-hdbc-odbc"; version = "2.1.2"; - sha256 = "d7e0d357c0661a870220b3428b15d23c3a5030737b8213ad663e4d43638c07f9"; + sha256 = "1y87iiil6k9ycsni70kvfcq50fiws8aqnhmk4018f6k6q1bx7q6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84821,7 +90561,7 @@ self: { mkDerivation { pname = "haskelldb-hdbc-postgresql"; version = "2.1.2"; - sha256 = "ef40ab98dafa5b67d9b6da1afdbf2b6bdc3d54cdfb14cd82bbc0ed2f841f9b21"; + sha256 = "08cv3y22zvf0pf1cs57vrma3vp3b5fzzs6nsnvcnfnzsvacanh7g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84841,7 +90581,7 @@ self: { mkDerivation { pname = "haskelldb-hdbc-sqlite3"; version = "2.1.2"; - sha256 = "46ab9510762d9f558d878abe28bdcdfb293531af7bdf5b6f5adca3093f15b761"; + sha256 = "0qdp2lzhk8ywb9pmppvvmwqkaagvrnyjiglahy6mb7rdfq89bas6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84858,7 +90598,7 @@ self: { mkDerivation { pname = "haskelldb-hsql"; version = "1.0.0"; - sha256 = "a0d365607c04a2310a14eb9367067ad0e418da3d09d1a90fd70cdf207ac42a48"; + sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0"; libraryHaskellDepends = [ base haskelldb hsql mtl old-time ]; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for HSQL"; @@ -84873,7 +90613,7 @@ self: { mkDerivation { pname = "haskelldb-hsql-mysql"; version = "1.0.0"; - sha256 = "7576321aa9e470ec24995ce088cc650bacd1dd83d8d177bd3c1c8a25d3ce3427"; + sha256 = "09rlrv9jb2hw7jypglfqhgfx3b0bcp68iq2wk4jfqw74m4d34xkm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84892,7 +90632,7 @@ self: { mkDerivation { pname = "haskelldb-hsql-odbc"; version = "1.0.0"; - sha256 = "cad837818ac99d032ee38e99c5283df87127f8836b3f326862499c413a5927a3"; + sha256 = "18r7b4x43729c9l34gvbhgw2fwgq7llcb6cfwcp077f9ia0kgn6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84911,7 +90651,7 @@ self: { mkDerivation { pname = "haskelldb-hsql-oracle"; version = "1.0.0"; - sha256 = "a9dff51a3a8b05d56dffab14975701f49585aa707a6857a814d2aeb8527d4648"; + sha256 = "0j26gm9bibnj2jl5fs3sf2m8b5gl05brf55bzxnxa1cb78dgbpx9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84930,7 +90670,7 @@ self: { mkDerivation { pname = "haskelldb-hsql-postgresql"; version = "1.0.0"; - sha256 = "5b6fa0800ebda784a4bbaeca76c9937d6ebb5b7dc282ed1e31089684137f3bb4"; + sha256 = "1d1vgw9q95h864gfv0n2gmdvnvkxjg4pdjmfpfj899xx1s0a0vsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84949,7 +90689,7 @@ self: { mkDerivation { pname = "haskelldb-hsql-sqlite"; version = "1.0.0"; - sha256 = "1cc2353c04fbe6efc8f220a5498bd0640f14d8f0763377a9b9447b166ff54843"; + sha256 = "0hs8ympicys4p6lpfcvny3c183v4s25lk990yb4fzrpv0hy3bhhw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84968,7 +90708,7 @@ self: { mkDerivation { pname = "haskelldb-hsql-sqlite3"; version = "1.0.0"; - sha256 = "85e58615bd36af8b5bcd2bb1af24de6ab2ef1f96de2473c2eb7c00719cc8b487"; + sha256 = "11xlr2f7203wxg17696yjqgyzckavqjazc9brmdqpbrnplaqdrc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84985,7 +90725,7 @@ self: { mkDerivation { pname = "haskelldb-th"; version = "2.1.0"; - sha256 = "cbabcf99fe125bf4064b5fc89d42f1dc860c69eab750975d9898268fc1df908b"; + sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb"; libraryHaskellDepends = [ base haskelldb mtl template-haskell ]; homepage = "http://trac.haskell.org/haskelldb-th"; description = "Template Haskell utilities for HaskellDB"; @@ -84998,7 +90738,7 @@ self: { mkDerivation { pname = "haskelldb-wx"; version = "1.0.0"; - sha256 = "1e8a89f51ca1cde14e41a085f69d7dee015b76bb146f6501200055bf4015c504"; + sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy"; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for WXHaskell"; license = stdenv.lib.licenses.bsd3; @@ -85014,7 +90754,7 @@ self: { mkDerivation { pname = "haskellscrabble"; version = "2.2.2"; - sha256 = "d7f890fc2f981d58843bbbd8a68e7cbbecc303ddb47e45db6d9a062e2bf1e47c"; + sha256 = "0z74y4mjw1lsdpdlazmlvl1w7v5vgj7adn5v7f25h7cq5zy91y6p"; libraryHaskellDepends = [ array arrows base containers errors listsafe mtl parsec QuickCheck random safe semigroups split transformers unordered-containers @@ -85037,7 +90777,7 @@ self: { mkDerivation { pname = "haskellscript"; version = "0.2.3"; - sha256 = "c3d189736e4128d93514397f9b3faf20fa20c3e3ac673b37cfb095d1efda3b4b"; + sha256 = "0jrvvbpx35dhrwvknrxcwg1j1yi0mwzrnzrr2hsxja21drrqklf3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85058,7 +90798,7 @@ self: { mkDerivation { pname = "haskelm"; version = "0.1.12.0"; - sha256 = "1e4559e472d5a3641a54728fccdbcafb4f15c3c1845fbd2ff2fd19cc5c3af7af"; + sha256 = "1bzp79fcq6gxy8pvspw4q71iakzvrbdwr3vjahd698ymfbj5ji8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85089,7 +90829,7 @@ self: { mkDerivation { pname = "haskelzinc"; version = "0.3.0.9"; - sha256 = "1a047ba85cbddf9a89d51799fb60231b5ca05a340c0baeefbac227637f97e5ed"; + sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s"; libraryHaskellDepends = [ base containers filepath parsec3 pretty process ]; @@ -85102,7 +90842,7 @@ self: { mkDerivation { pname = "haskgame"; version = "0.0.6"; - sha256 = "7fd312bb8773362525d23786a1915f14eb81063e071c9dc3b215b5d4ce842d18"; + sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz"; libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ]; homepage = "http://haskell.org/haskellwiki/HaskGame"; description = "Haskell game library"; @@ -85117,7 +90857,7 @@ self: { mkDerivation { pname = "haskheap"; version = "0.1.2"; - sha256 = "194b8be2d0c9d741905ac2d10f4adc340612a9f1c813103bd8428f28307e4eb0"; + sha256 = "1c2fgqq2i3s2v0xi04y8y6li41ilvi50zlf2ba843my9s3i8njqr"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types network old-locale text time unordered-containers @@ -85136,7 +90876,7 @@ self: { mkDerivation { pname = "haskhol-core"; version = "1.1.0"; - sha256 = "bddb4053c5a671935fd6c95378ae5e584c95c503d40723eddbef617ad7f29f6e"; + sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx"; libraryHaskellDepends = [ acid-state base containers deepseq filepath ghc-prim hashable mtl parsec pretty safecopy shelly template-haskell text text-show @@ -85156,7 +90896,7 @@ self: { mkDerivation { pname = "haskintex"; version = "0.7.0.1"; - sha256 = "7647f19964cce0be886ff01a4c53f902b4dd995d005090724a57bd4cc6dae31b"; + sha256 = "06z3vb34rgap99r90l00bncxvd02z59lq6phdy4bxq6ccjcz2ivn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85176,7 +90916,7 @@ self: { mkDerivation { pname = "haskmon"; version = "0.2.2.0"; - sha256 = "8bdf7eb4ca3f41d24b3d05195835215b20327d034752fd18149c132dd82d7f0c"; + sha256 = "033z5pc2s4ww2hcgslj70dyk482v44smh6857m5x4h9zras7xpwb"; libraryHaskellDepends = [ aeson base bytestring containers http-streams io-streams time vector @@ -85195,7 +90935,7 @@ self: { mkDerivation { pname = "haskoin"; version = "0.1.0.2"; - sha256 = "0c3de9ef72c73a96f3b7e8e605e43a0b16d2b2f47855251d6b609a1237177050"; + sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c"; libraryHaskellDepends = [ aeson base binary byteable bytestring containers cryptohash deepseq either json-rpc mtl pbkdf split text @@ -85212,7 +90952,7 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, byteable + ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable , bytestring, cereal, conduit, containers, cryptohash, deepseq , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf , QuickCheck, safe, scientific, secp256k1, split @@ -85222,8 +90962,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.4.0"; - sha256 = "151f82fd98b3527a873af081acecc8585a747f077e3513597d1c85921ee3eff1"; + version = "0.4.2"; + sha256 = "0nyla9kqgyjahnpf3idi7kzyx8h7q92vk3jql1gl9iq8q9acwnzk"; libraryHaskellDepends = [ aeson base base16-bytestring byteable bytestring cereal conduit containers cryptohash deepseq either entropy largeword mtl murmur3 @@ -85231,7 +90971,7 @@ self: { time vector ]; testHaskellDepends = [ - aeson base bytestring cereal containers HUnit largeword mtl + aeson base binary bytestring cereal containers HUnit largeword mtl QuickCheck safe scientific secp256k1 split string-conversions test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector @@ -85250,7 +90990,7 @@ self: { mkDerivation { pname = "haskoin-crypto"; version = "0.0.1.1"; - sha256 = "e934183202a51465b77fde444ad2c84f2e15a2ee86b4d55943524d3ce47d5901"; + sha256 = "00argpj3qkaj8dcxbd46xsi1abjgr394li6ygyvna55508r1hd79"; libraryHaskellDepends = [ base binary byteable bytestring containers cryptohash haskoin-util mtl QuickCheck @@ -85279,8 +91019,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.4.0"; - sha256 = "e4e021ba7c2be81410866301eb0efe672fa258825675f882f032af0a50cbc96b"; + version = "0.4.2"; + sha256 = "0khgdr5qql716d1klajs4y0mkyz0d9h3drahhv8062k64n7a989s"; libraryHaskellDepends = [ aeson async base bytestring cereal concurrent-extra conduit conduit-extra containers data-default deepseq either esqueleto @@ -85308,7 +91048,7 @@ self: { mkDerivation { pname = "haskoin-protocol"; version = "0.0.1.1"; - sha256 = "5bbc6c71231b4e4bb7a66aa0142f3d1c65b3272ff46af04b6abb3ceabd662564"; + sha256 = "0r15csyylg5vd95z0spl5wkv6r8w7lpi983alsvlnkhv4dqnrg2v"; libraryHaskellDepends = [ base binary bytestring haskoin-crypto haskoin-util QuickCheck ]; @@ -85330,7 +91070,7 @@ self: { mkDerivation { pname = "haskoin-script"; version = "0.0.1"; - sha256 = "21d027aa089809e7412574c3494483001e18252c439119386491c8cd3b2c9ca2"; + sha256 = "18lw5hxwvj4ichw1k4a35hjih7h0hd24khvl4m0yf2cq12m2gl11"; libraryHaskellDepends = [ base binary bytestring haskoin-crypto haskoin-protocol haskoin-util mtl QuickCheck @@ -85354,7 +91094,7 @@ self: { mkDerivation { pname = "haskoin-util"; version = "0.0.1.1"; - sha256 = "dc3d4700ee9a4afcb1ee00e52f4af781313c83bf69674bb853175d8db7da0342"; + sha256 = "0hh3vavqsp8pafw4nrv9py1kqcc1yx52zr80xsqzqjlsxq04fgfw"; libraryHaskellDepends = [ base binary bytestring either mtl QuickCheck ]; @@ -85382,8 +91122,8 @@ self: { }: mkDerivation { pname = "haskoin-wallet"; - version = "0.4.0"; - sha256 = "9bc185a7e5571c3ae7e2c34acc4345cbe808d1a314208795ef7f89c6cf3a0b09"; + version = "0.4.2"; + sha256 = "0ykjz5qy69mpz4gnwd25lv0jqb3vamk5z6i4pw1zcm5c413fqdm5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85395,7 +91135,10 @@ self: { stm stm-chans stm-conduit string-conversions text time transformers-base unix unordered-containers yaml zeromq4-haskell ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + aeson aeson-pretty base haskoin-node monad-logger persistent-sqlite + resourcet string-conversions unordered-containers zeromq4-haskell + ]; testHaskellDepends = [ aeson base bytestring containers directory haskoin-core haskoin-node HUnit monad-logger mtl persistent persistent-sqlite @@ -85417,7 +91160,7 @@ self: { mkDerivation { pname = "haskoon"; version = "0.3.1.1"; - sha256 = "34d125ead181f92c20f9c68e19ea2b6cc0df99d006c202438d38eabb6be0c5e5"; + sha256 = "1rf5w1mvpsiqim1h5hh6s2cxzh3c5gm1k3n6z4h2ryc1s7m2bl9l"; libraryHaskellDepends = [ base bytestring cgi directory fastcgi filepath hslogger hsp hsx MaybeT MissingH mtl network regex-posix safe utf8-string @@ -85434,7 +91177,7 @@ self: { mkDerivation { pname = "haskoon-httpspec"; version = "0.5.0.1"; - sha256 = "df747afa2fa84ddd32ebad0dbfe3fbab94fde5b6fbafdb842c41b9a222f73015"; + sha256 = "059hywia5fa15j2dpbzvnvjzv55bzgivy3ddxcrdskd85zx7lx6z"; libraryHaskellDepends = [ base bidispec bytestring haskoon hslogger HTTP httpspec mtl network ]; @@ -85451,7 +91194,7 @@ self: { mkDerivation { pname = "haskoon-salvia"; version = "0.4.0.2"; - sha256 = "139a2650c76e3d679a859f053495b732df030a3f5498e9b55e7de497da071a34"; + sha256 = "0d0s0zd9gr3xbssyk62l7w507prjnyak81czhnd6fgbfqx82d6hk"; libraryHaskellDepends = [ base bytestring cgi fclabels haskoon hslogger HTTP monads-fd mtl network salvia salvia-protocol transformers @@ -85469,7 +91212,7 @@ self: { mkDerivation { pname = "haskore"; version = "0.2.0.8"; - sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429"; + sha256 = "0aflqgvkabgscpkii7aiqfffb15nc90chp4q8xrl3bp8c3i4bb5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85495,7 +91238,7 @@ self: { mkDerivation { pname = "haskore-realtime"; version = "0.2"; - sha256 = "aec4fb20124137eabddaa6849bce03714fc9c01937632adf48fe12727774143a"; + sha256 = "0fhlfivp44py93gjlqrp370cjkvi0g79p156vayylds128hgpi5f"; libraryHaskellDepends = [ base bytestring data-accessor directory event-list haskore midi non-negative old-time process transformers unix utility-ht @@ -85515,7 +91258,7 @@ self: { mkDerivation { pname = "haskore-supercollider"; version = "0.3"; - sha256 = "be63b076574e91734cbc7833739195a574acc6ee21a2766d32c52bb4c35c3f13"; + sha256 = "04rzbk1v8ay569npd8i1xv3aqx55jn8p6cvqpi6774afaxvb0qxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85537,7 +91280,7 @@ self: { mkDerivation { pname = "haskore-synthesizer"; version = "0.0.3.3"; - sha256 = "64ddc8bf5a6b5c7f7f0986aada8016c8a09ca21ef3e3320565006bea53a3a4ee"; + sha256 = "1vm4ld9ylsq0cl2k5qzk3si9r8682s0dmal615zpyp3bbazwipb4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85555,7 +91298,7 @@ self: { mkDerivation { pname = "haskore-vintage"; version = "0.3"; - sha256 = "0bd49a041c73292d195897a1e8a73713669b09b1a73f3e29251f72223da708ab"; + sha256 = "1aq8lwyj4whz4llkwgx7n44rnrhk6ykyi8cpb0cjsabk3h29mm0b"; libraryHaskellDepends = [ base ]; homepage = "http://haskell.org/haskore/"; description = "The February 2000 version of Haskore"; @@ -85569,7 +91312,7 @@ self: { mkDerivation { pname = "hasktags"; version = "0.69.3"; - sha256 = "4e069aa63c2a7d762332d1acbc12a3d705abdc5e24c06d55129e1a3fd66e5afa"; + sha256 = "1yjsdvb3y6ly29anvh14bvfan1fplc9brb6i68ipcz9a7jk9l1jf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85584,12 +91327,71 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskus-binary" = callPackage + ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils + , mtl, QuickCheck, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "haskus-binary"; + version = "0.6.0.0"; + sha256 = "0r0np4kdvyfslgjqs983dzv4xi5s62splahn2ra55qjbm8lpmps0"; + libraryHaskellDepends = [ + base bytestring cereal haskus-utils mtl + ]; + testHaskellDepends = [ + base bytestring haskus-utils QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "http://www.haskus.org/system"; + description = "Haskus binary format manipulation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-system-build" = callPackage + ({ mkDerivation, base, directory, filepath, hashable, haskus-utils + , optparse-applicative, optparse-simple, process, simple-download + , temporary, text, yaml + }: + mkDerivation { + pname = "haskus-system-build"; + version = "0.7.0.0"; + sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath hashable haskus-utils optparse-applicative + optparse-simple process simple-download temporary text yaml + ]; + homepage = "http://www.haskus.org/system"; + description = "Haskus system build tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-utils" = callPackage + ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl + , stm, stm-containers, tasty, tasty-quickcheck, template-haskell + , transformers, vector + }: + mkDerivation { + pname = "haskus-utils"; + version = "0.7.0.0"; + sha256 = "0s28m6bhc5a1q3z7r1pd9f1l0nhsk5lnsi8y9zqadyg8j4jcv9kx"; + libraryHaskellDepends = [ + base containers extra file-embed list-t mtl stm stm-containers + template-haskell transformers vector + ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + homepage = "http://www.haskus.org/system"; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haslo" = callPackage ({ mkDerivation, base, mtl, old-time, QuickCheck, time, wtk }: mkDerivation { pname = "haslo"; version = "0.1.3"; - sha256 = "748ea9490a714ce5277225dcecc0b0b61ac594a8bca7f7639b69128e526c3f46"; + sha256 = "0iizdi98w4k9kdizg9xwm2aca6mnn30frp15f8kyak3i194sk3kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl old-time wtk ]; @@ -85606,7 +91408,7 @@ self: { mkDerivation { pname = "hasloGUI"; version = "0.1"; - sha256 = "9d92327775c126dead6798103b5ed638cf2167d707cccf036be1a9637dba5b0d"; + sha256 = "03avp9yn7ag1dc1wzk07sxkj3krqsrg3n44qcynxw9n1fmvk54lx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85619,14 +91421,15 @@ self: { }) {}; "hasmin" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, doctest - , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec, matrix - , mtl, numbers, optparse-applicative, parsers, QuickCheck, text + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, directory, doctest, doctest-discover, gitrev, hopfli + , hspec, hspec-attoparsec, matrix, mtl, numbers + , optparse-applicative, parsers, QuickCheck, text }: mkDerivation { pname = "hasmin"; - version = "0.3.1.3"; - sha256 = "b5297b795fba11f2644c9211b60cf535ca8d67aea6059714e7948d8261ddc9d8"; + version = "0.3.2.2"; + sha256 = "0522rp8cicvizvr183vfr07a5c8a98hz7g6m6pjjk1vzf95b7w20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85641,7 +91444,8 @@ self: { attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl QuickCheck text ]; - homepage = "https://github.com/contivero/hasmin/"; + benchmarkHaskellDepends = [ base criterion directory text ]; + homepage = "https://github.com/contivero/hasmin#readme"; description = "\"A CSS Minifier\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85652,7 +91456,7 @@ self: { mkDerivation { pname = "hasparql-client"; version = "0.1"; - sha256 = "f526cdfdf54014ec4cf35de93a9e7360b4bb92ac80caccac46d478406a9bc0d2"; + sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm"; libraryHaskellDepends = [ base HTTP monads-fd network xml ]; homepage = "https://github.com/lhpaladin/HaSparql-Client"; description = "This package enables to write SPARQL queries to remote endpoints"; @@ -85665,7 +91469,7 @@ self: { mkDerivation { pname = "haspell"; version = "1.1.0"; - sha256 = "417842bc66321e4e214b1ed6c14d1e837a1a64f5bc0bc37b7f15e52d9f6c3022"; + sha256 = "08ihdjgjvr8mgxxw62xwymj1lyl33r6w3mhy9chlw7ijcsy44y21"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ aspell ]; homepage = "https://github.com/otters/haspell"; @@ -85686,7 +91490,7 @@ self: { mkDerivation { pname = "hasql"; version = "0.19.16"; - sha256 = "b207195a7de0798f325b338b72059b9ef43546796401604b4a7a04a32be011c0"; + sha256 = "1h0iw0ms613s995n00b4g533bx4ykc2p52rkbcr8yyg0gmd1j1xj"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras @@ -85708,6 +91512,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_18" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, deepseq, dlist, either, hashable + , hashtables, loch-th, mtl, placeholders, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.18"; + sha256 = "0k922mrj055rklb071z50m0y84wrfyivpm06k4fnxqwph728nzm6"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist either + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors semigroups text transformers vector + ]; + testHaskellDepends = [ + data-default-class QuickCheck quickcheck-instances rebase rerebase + tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + criterion data-default-class deepseq dlist either hashable + profunctors scientific text time transformers uuid vector + ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -85715,7 +91554,7 @@ self: { mkDerivation { pname = "hasql-backend"; version = "0.4.3"; - sha256 = "4df97b42c47d026b6371e423211805a061ffed4df464a9cecfe7f378c8362a88"; + sha256 = "121a6v47iwz7rz7ajr7l9pnzyqd00lc228z4f5inn0kxqi17pyad"; libraryHaskellDepends = [ base base-prelude bytestring either free list-t text transformers vector @@ -85735,7 +91574,7 @@ self: { mkDerivation { pname = "hasql-class"; version = "0.0.1.0"; - sha256 = "f46dc9cd83ba0f121f8c67c10cf25d199218b4d303aed008084655fdb60aa681"; + sha256 = "10d61avgsma6104d1bh3sfs1i4hrbpr0rhb7ihgi43xshg6wjvgl"; libraryHaskellDepends = [ base bytestring contravariant data-default-class generics-eot hasql text time vector @@ -85759,8 +91598,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.1"; - sha256 = "9f0b1bf2ea1634f2f2da0727bfab331722c71573a3574f65423cada54da7c902"; + version = "0.4.2"; + sha256 = "0mkmn2myga4r0fanb3mh3dwdlhv0mjfqqv4wk1fbx7zncgmciwlw"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -85777,16 +91616,16 @@ self: { "hasql-cursor-transaction" = callPackage ({ mkDerivation, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, hasql, hasql-transaction - , transformers + , bytestring-tree-builder, contravariant, contravariant-extras + , hasql, hasql-transaction, transformers }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6"; - sha256 = "07b991914a5664378ab358536ba36ea9c54f7771c41c7eed6688053fa289c2f6"; + version = "0.6.1"; + sha256 = "1gw5dfg2qh38sbi2n4bhf3vhyh9rynj3gq02vv5i49r10kqdfs2g"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant - hasql hasql-transaction transformers + contravariant-extras hasql hasql-transaction transformers ]; homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction"; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; @@ -85802,7 +91641,7 @@ self: { mkDerivation { pname = "hasql-generic"; version = "0.1.0.4"; - sha256 = "d60dbe2e88395a878c7e920e49a5a7d8b3aae63b5c63bf73659d120cdc14fa82"; + sha256 = "10ps2kf0q4lxcmrvyqsw7gkamcyqlyjlj3ljgs68fniri0pbw3fn"; libraryHaskellDepends = [ aeson base binary-parser bytestring containers contravariant generics-sop hasql postgresql-binary scientific text time uuid @@ -85822,9 +91661,9 @@ self: { mkDerivation { pname = "hasql-migration"; version = "0.1.3"; - sha256 = "2d49e3b7a5ed775150abf2164795b10d087d2e1c714b0a8320f0c0094df068b3"; + sha256 = "1cv8y16hkh7h421hljvi3hp7s20dn6alf5pjmd852xzdlnvy6j9d"; revision = "1"; - editedCabalFile = "571db02447c6691e7307dd00ff2a6836ed3bacd1ec95b45f057e30e78b07da94"; + editedCabalFile = "156s0y5yfc3y0mgv95gcs6n3pv9nd0mgy06x0xriwsf68wjb07ap"; libraryHaskellDepends = [ base base64-bytestring bytestring contravariant cryptohash data-default-class directory hasql hasql-transaction text time @@ -85845,7 +91684,7 @@ self: { mkDerivation { pname = "hasql-optparse-applicative"; version = "0.2.1"; - sha256 = "170d8a1322866f048d5d05c19cd04f881bbaee0dc4a06a3503280c7a8491d5ea"; + sha256 = "1snmj627l3180csnm8641ppbl6w89z89rh85bn6h8vw6489ql38p"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -85859,7 +91698,7 @@ self: { mkDerivation { pname = "hasql-pool"; version = "0.4.1"; - sha256 = "cc6fdd5a088999609b63c46ca888ddfaa73f28fb36bf007c73379e6b9779c60d"; + sha256 = "03f6g6bnp7ipfdy01grnzcl3z9zsvn4ahv64cfdn16c911ddsvyc"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; homepage = "https://github.com/nikita-volkov/hasql-pool"; description = "A pool of connections for Hasql"; @@ -85879,7 +91718,7 @@ self: { mkDerivation { pname = "hasql-postgres"; version = "0.10.6"; - sha256 = "068c8de6696ae07a490e14fe83367fc383f2a6a41b9e64c688938f64bc04ec48"; + sha256 = "0j7c0jy693wki33697hvljkg50y3gwv87zhl1r4pmq3ad7k8v306"; libraryHaskellDepends = [ aeson attoparsec base-prelude bytestring either free hashable hashtables hasql-backend list-t loch-th mmorph placeholders @@ -85909,7 +91748,7 @@ self: { mkDerivation { pname = "hasql-postgres-options"; version = "0.1.6"; - sha256 = "079556e632a048df511add7252ecd965e9df4b9e4af356a2c86f90ea64e713b3"; + sha256 = "1cqkwxjfm43gr2i5dwsakr5xzsb5v7n54wnx398xyj506bk5d587"; libraryHaskellDepends = [ base-prelude hasql-postgres optparse-applicative ]; @@ -85925,7 +91764,7 @@ self: { mkDerivation { pname = "hasql-th"; version = "0.2.1"; - sha256 = "af86c90705ad5590c4a6d0e86bf8082904f739e862993b3233a0fede2fadd651"; + sha256 = "0lfnmlpxxzm06cr3p6b2x0wzf11913w6ps6hlv290mdd0l3wk1mg"; libraryHaskellDepends = [ base-prelude bytestring template-haskell text ]; @@ -85942,7 +91781,7 @@ self: { mkDerivation { pname = "hasql-transaction"; version = "0.5"; - sha256 = "1cd433ed77a59beac628d7ebba945aafc62c55e2f092f682f60ca89a33e0b341"; + sha256 = "0hdkw0rrma0cys1gd4phw9ajrimgbaabmsyp533fm6x5fznk7m0w"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -85962,9 +91801,9 @@ self: { mkDerivation { pname = "hastache"; version = "0.6.1"; - sha256 = "8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464"; - revision = "4"; - editedCabalFile = "10661eb3aea897aae7d81242de0dbba4eb412ee282d3a7343ed88ce626fd6bd8"; + sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc"; + revision = "5"; + editedCabalFile = "0fwd1jd6sqkscmy2yq1w3dcl4va4w9n8mhs6ldrilh1cj6b54r3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85990,7 +91829,7 @@ self: { mkDerivation { pname = "hastache-aeson"; version = "0.1.1.0"; - sha256 = "361a6102a9cf43facbd75e7d339efed28511ea78f0b667090b75a92c6f3c7371"; + sha256 = "0wbk7ipjrabm1c4ngdphg3m131fjzsg36zaysz5zlhygm41626in"; libraryHaskellDepends = [ aeson base bytestring containers hastache scientific text unordered-containers vector @@ -86005,7 +91844,7 @@ self: { mkDerivation { pname = "haste"; version = "0.1.1"; - sha256 = "d22e0568df4f3cc6182aaec8f1e3150ae73bd11e32076bc9a8d6064a4e34e3ef"; + sha256 = "1vz36i74l1nnm34nn1rj3v8kprqa2piz3j5f58cccg2gvxl0abnj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base curl filepath mtl ]; @@ -86023,7 +91862,7 @@ self: { mkDerivation { pname = "haste-compiler"; version = "0.5.5.1"; - sha256 = "c93d1dce0f0024ecae56019b1c7a5b68ca37cf32ba7a8ee7b2f248981af4865c"; + sha256 = "0p46yhd9hj7jnbkqwyms6b7kgjk8bdx1r6q1aspfq9001z71sgf9"; configureFlags = [ "-fportable" ]; isLibrary = true; isExecutable = true; @@ -86044,7 +91883,7 @@ self: { mkDerivation { pname = "haste-gapi"; version = "0.1.0.1"; - sha256 = "007f67b874d4f7328ad5825f0220327d5ad26673f1fb69eff6989434390d7f1f"; + sha256 = "07vz1lwk954qyvpnkyzifdkd4nkx68h04pw2sn535xylfjw6fzq0"; libraryHaskellDepends = [ base data-default haste-compiler transformers ]; @@ -86059,7 +91898,7 @@ self: { mkDerivation { pname = "haste-markup"; version = "0.0.1.0"; - sha256 = "c142e266bf76804ed2dffc9e76b4e0e32c59c55aa1e125846182732531a9380b"; + sha256 = "02rqm4qjaww2c622bqd1bb2mjb73w2s7d7pwvz94x03npxkf4hn1"; libraryHaskellDepends = [ base containers directory filepath haste-lib ]; @@ -86074,7 +91913,7 @@ self: { mkDerivation { pname = "haste-perch"; version = "0.1.0.9"; - sha256 = "88c57103d12d7f0976fd6ff0adc64ac5fb826f67e25219e46b206b782b5422a9"; + sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8"; libraryHaskellDepends = [ base haste-compiler transformers ]; homepage = "https://github.com/agocorona/haste-perch"; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; @@ -86091,7 +91930,7 @@ self: { mkDerivation { pname = "hastily"; version = "0.1.0.6"; - sha256 = "d001119682dc0389bbac946793401209c7286a01d9b157fab638ac8fda78a72e"; + sha256 = "0bm7g3d8zb1qnvx5gcfr05m2iiq929096rwlmjxqj0ywhab120fh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86116,7 +91955,7 @@ self: { mkDerivation { pname = "hasty-hamiltonian"; version = "1.3.0"; - sha256 = "15f713bc72cda97a5efad2c75d38915f3b765966142710f069db72ff49eefb31"; + sha256 = "0cgvxr4zywnvd7q109qlcrcpcfszj4w5viyjz9g7mafdfay17xqm"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -86135,9 +91974,9 @@ self: { mkDerivation { pname = "hat"; version = "2.9.0.0"; - sha256 = "2e557847aca6531307d0fd9d5f453ea6663a0f7fd41d89896d50455a037e4b17"; + sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f"; revision = "1"; - editedCabalFile = "b02535be9ba2feeb0fb04f6f88cdec934286b740eec1472ee9e3de0eb56857f3"; + editedCabalFile = "1wspd2shxpp3x4p4ghgf82vqchlkxk6qhvsgn07ypzm2kfz3a9dh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86160,7 +91999,7 @@ self: { mkDerivation { pname = "hatex-guide"; version = "1.3.1.6"; - sha256 = "7ad7cf5f94d5e684891cdbd6f74d1bb8843564390929d0802fd359a05f5da56d"; + sha256 = "0vd5bmgs0nfk5y0d0a8975j3b15q3d6zgmnv3j4q9rnmjigwzmvs"; libraryHaskellDepends = [ base blaze-html directory filepath HaTeX parsec text time transformers @@ -86171,23 +92010,22 @@ self: { }) {}; "hath" = callPackage - ({ mkDerivation, base, cmdargs, MissingH, process, split, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, cmdargs, process, split, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "hath"; - version = "0.3.0"; - sha256 = "a1d7e9643a4f09395f1af453beffca2b371c4bac6003ba16fc5aa1b41c6177fe"; + version = "0.4.2"; + sha256 = "1x8xmrsircrpk19jz2w5n2nq29qq576ci4pq1vx0ps3w1pkzh9ds"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cmdargs MissingH split tasty tasty-hunit tasty-quickcheck + base cmdargs split tasty tasty-hunit tasty-quickcheck ]; testHaskellDepends = [ - base cmdargs MissingH process split tasty tasty-hunit - tasty-quickcheck + base cmdargs process split tasty tasty-hunit tasty-quickcheck ]; - homepage = "http://michael.orlitzky.com/code/hath.php"; + homepage = "http://michael.orlitzky.com/code/hath.xhtml"; description = "Hath manipulates network blocks in CIDR notation"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -86202,7 +92040,7 @@ self: { mkDerivation { pname = "hats"; version = "0.1.0.1"; - sha256 = "687c20c67e79522cf286bc61c15e9434acdb9743183cb7cd296b82af856eb830"; + sha256 = "0c5qds2sz0kb576vfg0q8fbxpb1ljigc2qdwhvr2qlkrgv320z38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86232,7 +92070,7 @@ self: { mkDerivation { pname = "hatt"; version = "1.5.0.3"; - sha256 = "e403602f924c0a1859dbe7f9446138300f024223e8c12126e509917d808af235"; + sha256 = "0dgjia07v489wlk23hg84d1043rh71hl9yg7vdcih2jcj8pn00z4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86247,6 +92085,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haven" = callPackage + ({ mkDerivation, base, bytestring, containers, http-conduit + , http-types, mtl, SHA, xml + }: + mkDerivation { + pname = "haven"; + version = "0.1.0.0"; + sha256 = "161m2msqr30460m9k1s67w3d05gil9d9gdhizl8rshll8pjhl6hg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers http-conduit http-types mtl SHA xml + ]; + description = "Recursively retrieve maven dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haverer" = callPackage ({ mkDerivation, base, basic-prelude, containers, errors, lens , MonadRandom, mtl, random-shuffle, tasty, tasty-hunit @@ -86255,7 +92110,7 @@ self: { mkDerivation { pname = "haverer"; version = "0.3.0.0"; - sha256 = "17f8f2c5ca254c4e4cb0f1e0f867ad3fbb5554b9b2a002c2fb029ea524a794dc"; + sha256 = "1p4llwjab7h2zg10585jp5a5bfrzmmkziq7in164wk15rb2z5y0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86280,7 +92135,7 @@ self: { mkDerivation { pname = "hawitter"; version = "0.4"; - sha256 = "acb7a4c3c10cdf5f867c91b325d7e9885c681e23e61d62f14ff4043831110f83"; + sha256 = "10qg24qkh17l9zqn47g64cg6hp48x7bjbcwigj35zpqcq71s9dxc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86302,7 +92157,7 @@ self: { mkDerivation { pname = "hax"; version = "0.0.2"; - sha256 = "0ed30e279a8519572333385e0d8ca707a96b98245d0885dc272ddd086fd9f241"; + sha256 = "0hgjv5phip9d4zf8a22x4jc6pa87ly60spiq6cimf6c5k8khxlqf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86330,7 +92185,7 @@ self: { mkDerivation { pname = "haxl"; version = "0.5.0.0"; - sha256 = "dcc94089593a159b20e6f29eeeb7dd8caec0e0e8abcee8533321f2e9a96dd1e8"; + sha256 = "1s6idnlykwi16d9yikmbx3hc1blcvnvyx7pjwqh9n59sb64l1jfw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86356,7 +92211,7 @@ self: { mkDerivation { pname = "haxl-amazonka"; version = "0.1.1"; - sha256 = "3cdf3ee6bd46ee461e4ae640d300533229c1d4f9ab0489f613a1ec387fa270c6"; + sha256 = "1ikhl9zkiv512gv8j15bz7ac2a9jac0d6h7698g4dvj6ppk3xprw"; libraryHaskellDepends = [ amazonka amazonka-core async base conduit hashable haxl transformers @@ -86375,7 +92230,7 @@ self: { mkDerivation { pname = "haxl-facebook"; version = "0.1.0.0"; - sha256 = "5809694e88020c2378da747a60980599a81a5ff34a4b5561cf4e870235f30d55"; + sha256 = "0m8dycsh51sfrxhmajsaydgima4r0nc60yklv9w26302i176j2aq"; libraryHaskellDepends = [ aeson async base conduit data-default fb hashable haxl http-client-tls http-conduit resourcet text time transformers @@ -86399,7 +92254,7 @@ self: { mkDerivation { pname = "haxparse"; version = "0.3.1.0"; - sha256 = "d2f833c2f78d471817c4a9cddd566cc82f8247a938eb04ed47dafa302bac7a8a"; + sha256 = "12ksmhmk1yns8znh9srqm53q4by8dibdvkd9qhbihiwdyz137y6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86426,7 +92281,7 @@ self: { mkDerivation { pname = "haxr"; version = "3000.11.2"; - sha256 = "ebcda06d7ee79d5e635a7ec34f86400dd54ddd2434eda082aac6d3c8fd6e8b47"; + sha256 = "0iwbdvywily6ma1a1v9l4kflvm8d8234zhvyb9imx7g7grns1kgb"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -86444,7 +92299,7 @@ self: { mkDerivation { pname = "haxr-th"; version = "3000.5"; - sha256 = "2e6aef7e357aefaf3cb559c12ebb0196692d5c1095dc98889279ccc24e262fc0"; + sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif"; libraryHaskellDepends = [ base haxr template-haskell ]; homepage = "http://www.haskell.org/haxr/"; description = "Automatic deriving of XML-RPC structs for Haskell records"; @@ -86459,7 +92314,7 @@ self: { mkDerivation { pname = "haxy"; version = "1.0.1"; - sha256 = "6db58fd3433a7c92d660f1c21b11edb739f5cdbe21b47d99336fab2928cd8f4c"; + sha256 = "0k4grll2kavg6fcpvd11pv6zafdpxl8iphpic3b94z1s8g9qzdbd"; libraryHaskellDepends = [ base bytestring data-default-class hostname HTTP http-server mtl url @@ -86477,7 +92332,7 @@ self: { mkDerivation { pname = "hayland"; version = "0.1.0.1"; - sha256 = "c0b7497cb3117593495e5c69a831625289f86f7585c3e82ea7c82bedf0d2f136"; + sha256 = "0dpisbqfsay8lwpfihw5fmpzi2ajc8qshsawbr4r6x8indy4kdy0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86498,7 +92353,7 @@ self: { mkDerivation { pname = "hayoo-cli"; version = "0.1.0.4"; - sha256 = "405361c83e2b06a82fc60128ed82781c779501feaff1a1a8f543d57ee7ed8e17"; + sha256 = "05wfxpkpxma3ynla3wdgzq0raxqwg21fsa01qqpsh1ib7v462ls0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86518,7 +92373,7 @@ self: { mkDerivation { pname = "hback"; version = "0.0.3"; - sha256 = "b2d4f95942a8dc84d893d99c2f4673f83a0a2494cd6f9800069431a069239d07"; + sha256 = "01wx4dls0ccl0q09hvydjhj0lfpqfd32z76rjgc89p5889czkm5j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86539,7 +92394,9 @@ self: { mkDerivation { pname = "hbayes"; version = "0.5.2"; - sha256 = "c284e97dd276ed5371dee4b53da9e124adb4e958cd89d6d9ca1b27b506e416f5"; + sha256 = "1x8nwh3ba9qvrbcxd2fdb3lv9b94w6lkvdg4vrqm7vbns9yyk162"; + revision = "2"; + editedCabalFile = "19nclaq6y157gn8k4sl79rm30ws5gcykiq4zjmcnm7d5c1rm4dhn"; libraryHaskellDepends = [ array base binary boxes containers directory filepath gamma HUnit mtl mwc-random parsec pretty QuickCheck random split statistics @@ -86564,7 +92421,7 @@ self: { mkDerivation { pname = "hbb"; version = "0.4.0.2"; - sha256 = "96a7b9e844293b91c0aa4044d2d17cfe6070c4fe7d28c3dac8302d02f6d216f2"; + sha256 = "1whnsbv04b9hr3dc6a3xzv270q7ygk8x4i20mb092fr98klbk9wn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86581,7 +92438,7 @@ self: { mkDerivation { pname = "hbcd"; version = "1.0"; - sha256 = "b8915c3a40aa07b507e9cc8b3024906808af63c1890f030b741e4153096994be"; + sha256 = "1glld44m6h8yfh5h63w9q5isy238j0j312ycx43va1xa80x5r4dq"; libraryHaskellDepends = [ base bytestring Decimal digits split ]; description = "Packed binary-coded decimal (BCD) serialization"; license = stdenv.lib.licenses.mit; @@ -86594,7 +92451,7 @@ self: { mkDerivation { pname = "hbeanstalk"; version = "0.2.4"; - sha256 = "feaf97fd18fedb3e5abf337e61c98a03108d917d9f87f885c8d02b6b838aac8f"; + sha256 = "13xcia1nnayhr22zi1wzgn8qs403ib4n2zikpxd3xnzy33yrgbzy"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers network ]; @@ -86610,7 +92467,7 @@ self: { mkDerivation { pname = "hbeat"; version = "0.1.2"; - sha256 = "5776e815f293c6baa8a859141dcbb49a418880b39b8af7fe676fd7783997fad1"; + sha256 = "1lgsjwwpimvgczzgg2lvnf08hhcsnk5is52rm2lbmilky8ayhxjp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86630,9 +92487,9 @@ self: { mkDerivation { pname = "hblas"; version = "0.3.2.1"; - sha256 = "3e159cc8c98735861edad47cd4da11bd5862bb629601a9bc441960c921ae8215"; + sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y"; revision = "2"; - editedCabalFile = "48b2f43d8ac30594dc0fbcadc4f4a7a478394da7f223bc909aa18bdcadb99d09"; + editedCabalFile = "02cxp6nxr2x1ka8bq8zjlx6kjy54lzsc9bdw1zf981f3i8yz9cj8"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ blas liblapack ]; testHaskellDepends = [ base HUnit tasty tasty-hunit vector ]; @@ -86650,9 +92507,9 @@ self: { mkDerivation { pname = "hblock"; version = "0.1.0.2"; - sha256 = "7bf0dc5ef70b033464462e741d5cb8c5b1f6c91436dee178bd4c8e1c0591103d"; + sha256 = "0g8hj42ir3jcpmwf3pin2k4zdcf5p1f1sx1f8rj380qbyxgdrw3v"; revision = "1"; - editedCabalFile = "0182ceac5536afe15ee507e30953ff97f890facf3f15f2766f74f6312036eca6"; + editedCabalFile = "19pc6qh33xkldxvg459zrzx91y4pzx9hkqq7wmgf3brnanncx0h1"; libraryHaskellDepends = [ aeson base blaze-markup bytestring cereal containers deepseq hashable path-pieces safecopy text unordered-containers uuid vector @@ -86675,7 +92532,7 @@ self: { mkDerivation { pname = "hbro"; version = "1.7.0.0"; - sha256 = "f00f064cfe00d662b32d93ab3ae4fca204ae0cab44f115b6ef0be0f44e02a36f"; + sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86704,7 +92561,7 @@ self: { mkDerivation { pname = "hbro-contrib"; version = "1.7.0.0"; - sha256 = "55398cdfcc3b0437d57798765fd5b04253d7d20e05b4c4f56a7d670832659508"; + sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86731,9 +92588,9 @@ self: { mkDerivation { pname = "hburg"; version = "1.1.3"; - sha256 = "fe1ce07466f899d4149f68fdef21f1969228f8cc7db26f5c23b058c7a4d651ba"; + sha256 = "1fjissjcfn5h4df6zckxrkw2i4lny4hyzzb8kwad96gqcrsf077y"; revision = "2"; - editedCabalFile = "c60173c9ea5804ed889632498f121be17ad755fef0486bedf6009bee9538b7ce"; + editedCabalFile = "1kmp72ayx6q0yvnnnj7hzraxfyp13c98yj9jjs4fs12qxb4p60f6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86751,7 +92608,7 @@ self: { mkDerivation { pname = "hcc"; version = "0.0.0"; - sha256 = "97409bf32c59323ad64bcfe10eff7fc17c35089052c0f76611eb055813fd4c11"; + sha256 = "04aczl9mh1gb25kggh2jj043az61gzzhxqfg9gb3lcjr5krrnh4p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring language-c ]; @@ -86766,7 +92623,7 @@ self: { mkDerivation { pname = "hcg-minus"; version = "0.15"; - sha256 = "b9b422e807f030b35c2d01971dfff9806a11fdb20f506ffde004a4933571e011"; + sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r"; libraryHaskellDepends = [ base colour ]; homepage = "http://rd.slavepianos.org/t/hcg-minus"; description = "haskell cg (minus)"; @@ -86780,7 +92637,7 @@ self: { mkDerivation { pname = "hcg-minus-cairo"; version = "0.15"; - sha256 = "090b4ad88bb25bdb4290d2cc357f920b478cfebf96ad89ad930c7edc14824f00"; + sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9"; libraryHaskellDepends = [ base cairo colour filepath hcg-minus utf8-string ]; @@ -86794,7 +92651,7 @@ self: { mkDerivation { pname = "hcheat"; version = "2010.1.16"; - sha256 = "42f96b9075a7ac6a068945edc5490a0f4a0955b1a83d15cfc249c159c2b58fbb"; + sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2"; libraryHaskellDepends = [ base mps ]; homepage = "http://github.com/nfjinjing/hcheat/"; description = "A collection of code cheatsheet"; @@ -86809,7 +92666,7 @@ self: { mkDerivation { pname = "hchesslib"; version = "0.1.0.0"; - sha256 = "3bcb0946c2caf1bc91634ddf51d6e80110c9b6e529e49d83a5ad1d64532be880"; + sha256 = "10785d9n87ddln1rvr19wnvcj401x3b53psdcf8vrwfaq930kjrv"; libraryHaskellDepends = [ array attoparsec base containers text ]; testHaskellDepends = [ array attoparsec base containers hlint hspec QuickCheck text @@ -86829,7 +92686,7 @@ self: { mkDerivation { pname = "hcltest"; version = "0.3.7"; - sha256 = "ed3530f93c1af0a1fc1fec67d3ee32f5b4a6fcf200c3803124f8fabee0041dc3"; + sha256 = "1hqx0khbxypq4hqq1hq0ybyadd7m6bpd6rzc3zya3w0s7kwk0dgd"; libraryHaskellDepends = [ base bytestring directory dlist either filepath free lens mmorph monad-control mtl optparse-applicative process random-shuffle split @@ -86849,7 +92706,7 @@ self: { mkDerivation { pname = "hcoap"; version = "0.1.2.1"; - sha256 = "eb7c7d22922b758708c4789d53f237b251718a64d163e13807787ad8213782d6"; + sha256 = "1ml26whxhykq0wwf2qyicj572ldj6zr577bqqh48fx9bj8i7sz7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86866,6 +92723,36 @@ 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 + }: + mkDerivation { + pname = "hcoord"; + version = "1.0.0.0"; + sha256 = "0dw0pvrnv3pkkf1lzcqzyv2yjycqk8hanh2a2s5dzidwbm26vhpm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl regex-pcre ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base data-default HUnit ieee754 mtl ]; + homepage = "https://github.com/danfran/hcoord#readme"; + description = "Easily convert between latitude/longitude, UTM and OSGB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hcron" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , old-locale, pretty, process, random, stm, time @@ -86873,7 +92760,7 @@ self: { mkDerivation { pname = "hcron"; version = "0.0.0.3"; - sha256 = "075b1f2a403ff42e60389b2a0bb583f02b496ef35a1beff97ded3923154a7832"; + sha256 = "0ckq98aj6fgdgpwyy6ssydp4jazhhfshnalv71h2xx1z80m1ynq7"; libraryHaskellDepends = [ base bytestring containers directory mtl old-locale pretty process random stm time @@ -86890,7 +92777,7 @@ self: { mkDerivation { pname = "hcube"; version = "0.1.1"; - sha256 = "d99d5d18aba9cc3806ad0883128076273f0f3bf7bc925a8bc1625a8e54012fc0"; + sha256 = "1h1g05a8wnk2q65mm4mwywxhygr7fs0150q8ml33ik59mcc5v7fr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86908,13 +92795,14 @@ self: { ({ mkDerivation, base, bluetooth, cwiid, unix }: mkDerivation { pname = "hcwiid"; - version = "0.0.5"; - sha256 = "9d249bc8263cb0ad576c64a71bbdd42fb423d2bfb5a2e9cdf449b5d0e64cc136"; + version = "0.0.6.1"; + sha256 = "1c7lglbc4zf77b8nfc7jbk4d7v7n7asi451wrmyxsw6nzqlvib91"; libraryHaskellDepends = [ base unix ]; librarySystemDepends = [ bluetooth cwiid ]; homepage = "https://github.com/ivanperez-keera/hcwiid"; description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage @@ -86923,8 +92811,8 @@ self: { }: mkDerivation { pname = "hdaemonize"; - version = "0.5.2"; - sha256 = "1f21059958fbf6de2299b281cf269104c5e314df6ff1da852fbd1b021c44a052"; + version = "0.5.3"; + sha256 = "06311jjqwxrhgis638p03nlziprawjmzpnvn8xpvh4gd8is4r251"; libraryHaskellDepends = [ base bytestring extensible-exceptions filepath hsyslog mtl unix ]; @@ -86933,6 +92821,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hdaemonize_0_5_4" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions, filepath + , hsyslog, mtl, unix + }: + mkDerivation { + pname = "hdaemonize"; + version = "0.5.4"; + sha256 = "0r6bfb2bc9lg4iywbql7ik9swvvn4lfhq0qn7r20v4gq5fkpwgvw"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions filepath hsyslog mtl unix + ]; + homepage = "http://github.com/greydot/hdaemonize"; + description = "Library to handle the details of writing daemons for UNIX"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hdaemonize-buildfix" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog , mtl, unix @@ -86940,7 +92845,7 @@ self: { mkDerivation { pname = "hdaemonize-buildfix"; version = "0.4.5"; - sha256 = "c619d495a01b6958d81e93966ed38e47827e716d9852d2a30cbe28c5cef96496"; + sha256 = "15k4z77caa5y1jix4llqdmqpx0j7iv9nx5lk3vc5hs8vl2ax86f6"; libraryHaskellDepends = [ base extensible-exceptions filepath hsyslog mtl unix ]; @@ -86957,7 +92862,7 @@ self: { mkDerivation { pname = "hdbc-aeson"; version = "0.1.3.2"; - sha256 = "a599a965f9724dfa7f8e25b0b3967a2033a2c33b7fbd40c4fc8aaac2fb0f7711"; + sha256 = "04bp1zxw5alazk241gbz7g1s4cr0gabb7c15irzzlkbjz5jsk6d5"; libraryHaskellDepends = [ aeson base convertible HDBC scientific text unordered-containers vector @@ -86973,7 +92878,7 @@ self: { mkDerivation { pname = "hdbc-postgresql-hstore"; version = "0.0.1.1"; - sha256 = "92ab052490fd6f205c65aa9601cf0a6d61ef5450441a978cb6046ef570d59f0c"; + sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj"; libraryHaskellDepends = [ attoparsec base containers HDBC text ]; homepage = "http://bitbucket.com/dpwiz/hdbc-postgresql-hstore"; description = "Manipulate data in PostgreSQL \"hstore\" columns"; @@ -86986,7 +92891,7 @@ self: { mkDerivation { pname = "hdbc-tuple"; version = "0.0.1"; - sha256 = "ad71396fe0f8c834f24e3d263496c3966c232fbfa81f38e51b2bb0816856ad94"; + sha256 = "155darl83c1b3gjkh7x8pwpj6v4nqfb389ix9vr39j7qw1pkjwdd"; libraryHaskellDepends = [ base convertible HDBC typical ]; description = "Type save tuples for HDBC"; license = "GPL"; @@ -87003,7 +92908,7 @@ self: { mkDerivation { pname = "hdbi"; version = "1.3.0"; - sha256 = "82355e0e767a0a449454ecb493cb535225d1642bcc9a2897c878d27434de117d"; + sha256 = "0z8ivqs79lkqr2bji6nc5djd29ajag5r7d7caja482ksfq75wdc2"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers Decimal deepseq old-locale stm template-haskell text time uuid @@ -87029,7 +92934,7 @@ self: { mkDerivation { pname = "hdbi-conduit"; version = "1.3.0"; - sha256 = "f235073547bc19a08d29ecc3d2e56a05a1d4910897b46a37d53b14822a1a2cf3"; + sha256 = "1wrc38m8451vslvnmd4p128x9885dbjx5hzc566s06dw8wshfdgj"; libraryHaskellDepends = [ base conduit hdbi resourcet transformers ]; @@ -87054,7 +92959,7 @@ self: { mkDerivation { pname = "hdbi-postgresql"; version = "1.3.0"; - sha256 = "3dbc951d54013afe2daf574bae3535d0f4deb6743151241faa8b14d6e8b84cba"; + sha256 = "1fjcp3ldc54bm8gj8l9ifjvdxx6h6lsswjspmwnzwfh1ahfrbg1x"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring hdbi mtl old-locale postgresql-libpq postgresql-simple safe text time uuid @@ -87079,7 +92984,7 @@ self: { mkDerivation { pname = "hdbi-sqlite"; version = "1.3.0"; - sha256 = "04bc007103828e002cd8c02c16d07db9e8218f3a29eda838cf664112762f6e0f"; + sha256 = "03vf5xv14hb6rwwaiv997a7j3s5rgp81cb60v0n013l20dqh1g04"; libraryHaskellDepends = [ base blaze-builder bytestring direct-sqlite hdbi text ]; @@ -87102,7 +93007,7 @@ self: { mkDerivation { pname = "hdbi-tests"; version = "1.3.0"; - sha256 = "e5491fa9113eee7e5e9b89042bfae811bc3d117c77998d70d5d4818436937967"; + sha256 = "0rvrjcv890flsmq8v6bpgh8kvg0ix3x2n149kdg7xviy26liyjg5"; libraryHaskellDepends = [ base bytestring containers Decimal hdbi HUnit ieee754 QuickCheck quickcheck-assertions quickcheck-instances stm test-framework @@ -87122,7 +93027,7 @@ self: { mkDerivation { pname = "hdevtools"; version = "0.1.5.0"; - sha256 = "ed81236f3809a367c5f4401905ae283f8de92cd5b26c0b8370586ab7690d04e7"; + sha256 = "1rq41mlvfsjqf21hnv5jslnfk39z52p0a6a0yk2ng8q971pj70gd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87141,7 +93046,7 @@ self: { mkDerivation { pname = "hdf"; version = "0.15"; - sha256 = "732e5765796abb6e2b6b0e8ebe572511d8c6006d2f41b8806b1eb6ea294fce86"; + sha256 = "11nf9wlymdhydf0bhh9gdl0cdn0i4mbvx3hfdcmnxfvag5jmfbkk"; libraryHaskellDepends = [ base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash process split transformers @@ -87157,7 +93062,7 @@ self: { mkDerivation { pname = "hdigest"; version = "1.0"; - sha256 = "6e103070d2851e203242e974b670366cfa9fab9ff593df987e6039c92c92a9f2"; + sha256 = "1wm9j8ncjfb0gscdz4zmkymrzykc6rqbcx7988r207l5s9q3043f"; libraryHaskellDepends = [ base cgi Crypto network parsec random time ]; @@ -87171,7 +93076,7 @@ self: { mkDerivation { pname = "hdirect"; version = "0.21.0"; - sha256 = "c2db117dcc9e9a293dc409ecc7813aaab52d891e0e26328f2866c50966eafeec"; + sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base haskell98 pretty ]; @@ -87189,7 +93094,7 @@ self: { mkDerivation { pname = "hdis86"; version = "0.2"; - sha256 = "7ab68d30a31e621962eedc72e427f17e6e38536e9c475023d9cccebd30692863"; + sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks"; libraryHaskellDepends = [ base bytestring containers QuickCheck ]; homepage = "https://github.com/kmcallister/hdis86"; description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64"; @@ -87202,7 +93107,7 @@ self: { mkDerivation { pname = "hdiscount"; version = "0.1.0.0"; - sha256 = "c0dfe335a447ecb0d611a8f7bcaa11cf7b9b639cd1eca2f7e558be53a6bed37c"; + sha256 = "0z6kpsk57gjqwpvs5v6ikiirnyyg26mbrxx827bb1v27lhsy7py0"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ markdown ]; homepage = "https://github.com/jamwt/hdiscount"; @@ -87216,7 +93121,7 @@ self: { mkDerivation { pname = "hdm"; version = "0.0.1"; - sha256 = "f06d97c5445a1856bfdd35f321b35c6300a83af417b8416409e34681f922f8e1"; + sha256 = "1qgq4bwq2ip315j43f0pyhxah033bjrj3wrmvnzmc62s8k2rfvgh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory process unix vty ]; @@ -87226,21 +93131,22 @@ self: { }) {}; "hdo" = callPackage - ({ mkDerivation, aeson, base, bytestring, comonad, data-default - , free, iproute, lens, mtl, network-uri, optparse-applicative - , pretty, process, random, tagged, text, time, transformers, unix - , unordered-containers, vector, wreq + ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad + , data-default, free, http-conduit, iproute, lens, mtl, network-uri + , optparse-applicative, parsec, pretty, process, random, tagged + , text, time, transformers, unix, unordered-containers, vector }: mkDerivation { pname = "hdo"; - version = "0.2"; - sha256 = "4d031d84de97173db977731938918166f9dc54240ee53cac24d0ccf79b96c547"; + version = "0.5"; + sha256 = "0nixnhj4pm05q1sgislyd46pdfk8i8hn5jy9d9jrh79cm6rznmas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring comonad data-default free iproute lens mtl - network-uri pretty process random tagged text time transformers - unix unordered-containers vector wreq + aeson base bytestring case-insensitive comonad data-default free + http-conduit iproute lens mtl network-uri parsec pretty process + random tagged text time transformers unix unordered-containers + vector ]; executableHaskellDepends = [ aeson base bytestring comonad data-default free iproute network-uri @@ -87259,8 +93165,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.1.0"; - sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df"; + version = "0.5.2.0"; + sha256 = "144ap99ps0hicmndd0zk3ywbangjyrd9c7h90cxn5ikjp78h58xc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87286,7 +93192,7 @@ self: { mkDerivation { pname = "hdph"; version = "0.0.1"; - sha256 = "ca24e2151ddc8e632acb676eb282d1e8ee7419cd375a75de0b8c5d90594ac484"; + sha256 = "116499cr0pcc1gg7aniprlcp9vp8s61b4vk7rcm673nw3lay496a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87312,7 +93218,7 @@ self: { mkDerivation { pname = "hdph-closure"; version = "0.0.1"; - sha256 = "a81923db3300cdde075e66b5da3b4b474bbf5aa4bc506cd183ef6e7962b99565"; + sha256 = "0rcmp5i7jvpghg8nql5wlidbyjs79cxxmdb6bq3xxk806gdj66d8"; libraryHaskellDepends = [ array base bytestring cereal containers deepseq template-haskell ]; @@ -87329,7 +93235,7 @@ self: { mkDerivation { pname = "hdr-histogram"; version = "0.1.0.0"; - sha256 = "f8780c975a6d918c04eaef674a90a13b84f1d671079ebd6ffd7447378511762c"; + sha256 = "0b3n262kfivlzmpvv7h7f7bg311vl684lrzgx828r4bdbabhqy7q"; libraryHaskellDepends = [ base deepseq primitive QuickCheck tagged vector ]; @@ -87350,7 +93256,7 @@ self: { mkDerivation { pname = "headergen"; version = "0.2.0.0"; - sha256 = "ea76d9d8398ebae12ca608d4818e53ecb4685eff2ac6701499a2902457bd81c1"; + sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87368,7 +93274,9 @@ self: { mkDerivation { pname = "heap"; version = "1.0.3"; - sha256 = "9bd57e9ca3480d4322ccc5ec094767ee2a64425b2d4022065a8f36b44aabf402"; + sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv"; + revision = "1"; + editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -87376,11 +93284,14 @@ self: { }) {}; "heaps" = callPackage - ({ mkDerivation, base, directory, doctest, filepath }: + ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest + , filepath + }: mkDerivation { pname = "heaps"; - version = "0.3.3"; - sha256 = "04e358d3e6d8ca7786749b6d3945e18159506f8b21ca48b1913c771dcaae1537"; + version = "0.3.4.1"; + sha256 = "1y9g3hkwxqy38js24954yprbhryv7bpa7xhxwv7fhnc4bc4nf9bw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/heaps/"; @@ -87394,7 +93305,7 @@ self: { mkDerivation { pname = "heapsort"; version = "0.1.0"; - sha256 = "0aa7894611c78f93db49ece38d3731c20469d091db1ec9977e5e63285dd2fc3b"; + sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ array base ]; @@ -87403,6 +93314,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heatshrink" = callPackage + ({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty + , tasty-golden, tasty-hunit, text + }: + mkDerivation { + pname = "heatshrink"; + version = "0.1.0.0"; + sha256 = "0zzk9mpg430fw4jvb9vyszmdv8vyrbjs65b6dmh7n87b5ldi3par"; + libraryHaskellDepends = [ base bytestring cereal ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring cereal pcre-heavy tasty tasty-golden tasty-hunit + text + ]; + homepage = "https://github.com/fpinsight/heatshrink#readme"; + description = "Compression and decompression using heatshrink"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -87410,7 +93340,7 @@ self: { mkDerivation { pname = "hebrew-time"; version = "0.1.1"; - sha256 = "c7997ee86df43d5d734df63c5e091543bb7fd75a93d530c1857067e27a8b7932"; + sha256 = "0ckridxf4rvhhp0k1mckbbbpzfs32l4mwg7n9mrmsggldpl7x6f7"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -87426,7 +93356,7 @@ self: { mkDerivation { pname = "hecc"; version = "0.4.1.1"; - sha256 = "dd6b48dc6b60bf4323f52f1232f9cf47e4d74026246168a3e020a2ab684df0dc"; + sha256 = "1p7h9mlap8i0w2inhq944r0dgr27rzwk44igylil7gv0dgf4hsyx"; libraryHaskellDepends = [ base cereal crypto-api hF2 ]; description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -87434,30 +93364,65 @@ self: { }) {}; "heckle" = callPackage - ({ mkDerivation, base, blaze-html, directory, filepath - , optparse-applicative, optparse-generic, pandoc, pandoc-types + ({ mkDerivation, base, blaze-html, directory, pandoc, pandoc-types , process, split, tagsoup, time }: mkDerivation { pname = "heckle"; - version = "2.0.1.9"; - sha256 = "b8a14e8e80dfc0190088e8f05baf9b47c46ac72e6b8ec5f36be244087b0469ba"; + version = "2.0.2.1"; + sha256 = "1giq352z5hsa4j27mnzr07fzf3lfcndbh9ni3gdsa43rhkgn8kcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html directory filepath pandoc pandoc-types process - split tagsoup time - ]; - executableHaskellDepends = [ - base directory filepath optparse-applicative optparse-generic - process split + base blaze-html directory pandoc pandoc-types process split tagsoup + time ]; + executableHaskellDepends = [ base directory process split ]; homepage = "https://github.com/2016rshah/heckle"; description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hedgehog" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , 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.5"; + sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring 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 + ]; + testHaskellDepends = [ + base containers pretty-show text transformers + ]; + homepage = "https://hedgehog.qa"; + description = "Hedgehog will eat all your bugs"; + license = stdenv.lib.licenses.bsd3; + 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 @@ -87466,8 +93431,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.7"; - sha256 = "594c2d210745a72559de6a6a5f3fa646bf400fd0bb990c8f29d3390d1a2d6d87"; + version = "0.9.8"; + sha256 = "0qmfscq26f5n3a7xvc2ffg20gcg73y85w01s1vgpwpz55y62jbl2"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq mtl network resource-pool scanner stm text time unordered-containers vector @@ -87489,7 +93454,7 @@ self: { mkDerivation { pname = "hedis-config"; version = "0.0.3"; - sha256 = "4b5ca50be0cca3ec217d4305c61472944cd97705622d7298eca7a18f037ce858"; + sha256 = "0n78gh1qz8d7xjc74bb20mvxjk4lf8acc1a3glhyr8ycw05sap2b"; libraryHaskellDepends = [ aeson base bytestring hedis scientific text time ]; @@ -87505,7 +93470,7 @@ self: { mkDerivation { pname = "hedis-monadic"; version = "0.0.4"; - sha256 = "1c6113dd9fe35d4c3ea7249f8eb19a6db8dff2e99d1f7b129bc217a332618094"; + sha256 = "1540c4ra65y2kc97n7wxx7rdzf3dkaqqx7r4lwz4qpg3kzfi6q8w"; libraryHaskellDepends = [ base hedis monad-control mtl transformers transformers-base transformers-compat @@ -87520,7 +93485,7 @@ self: { mkDerivation { pname = "hedis-namespace"; version = "0.1.0.0"; - sha256 = "3937dec2f23486380417142ef1342413be5bb7507ea11d3c22b94e4e510ddae1"; + sha256 = "1qfs1m8lwkmr48y1v8bya2vmpghk4hsg2bhl2w23i1ilyb1dwdrr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hedis mtl ]; @@ -87539,7 +93504,7 @@ self: { mkDerivation { pname = "hedis-pile"; version = "0.6.3"; - sha256 = "1611814eb26fd85527d82a03f18376517e1d8a92e421e3f19cd3d50d897a9c2b"; + sha256 = "0awwga4hvmfkkkqy68g4ja51szjifs1z20rav0kmbn3gn978248n"; libraryHaskellDepends = [ base binary bytestring hedis hedis-tags string-conversions transformers @@ -87559,7 +93524,7 @@ self: { mkDerivation { pname = "hedis-simple"; version = "0.1.0.0"; - sha256 = "5b9dbfa52f334c5a8b9a6a42251d3bb8a6d21e6e5660628cc48a95f1f0cd07b7"; + sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av"; libraryHaskellDepends = [ base bytestring either hedis mtl ]; homepage = "http://github.com/sanetracker/hedis-simple"; description = "A simplified API for hedis"; @@ -87574,7 +93539,7 @@ self: { mkDerivation { pname = "hedis-tags"; version = "0.2.3"; - sha256 = "3a3490dbd352d1c16fe2fcc7c26f0fa11192f43243d5341893b21b338cc83235"; + sha256 = "0d9jr26366xjjcc39ma36bs944d11xpw5izww9pw3lajsgdr0d1s"; libraryHaskellDepends = [ base bytestring hedis ]; testHaskellDepends = [ base bytestring hedis HUnit lifted-base test-framework @@ -87595,7 +93560,7 @@ self: { mkDerivation { pname = "hedn"; version = "0.1.8.2"; - sha256 = "2f8ae0ddaa65133f971e75106ef4f408bc7e8c439b9ce46117352c566efec195"; + sha256 = "15f1zrp5cb1m2xhy974v8f67xg08yks6w43m3sbky4v5mbfy12ig"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq mtl scientific stringsearch text time time-locale-compat utf8-string @@ -87617,7 +93582,7 @@ self: { mkDerivation { pname = "hein"; version = "0.1.0.5"; - sha256 = "c0801015827966d4d59579fec24b3cf413bdffe6ca4ffe7ffca93b0bf74d6c7c"; + sha256 = "0z3c9pvhnfx9zizzwkyawvzvs4zl7i5w5zkrjpax8rkrh8ai1060"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87642,9 +93607,9 @@ self: { mkDerivation { pname = "heist"; version = "1.0.1.0"; - sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb"; + sha256 = "1jwbqr2n7jv8cykjgg1a0bdwjszmrbg5qflikvmkyiy1pz0z6kzx"; revision = "4"; - editedCabalFile = "d6925d28dee1606c73a16d86ce362e5e6faace458e1dff1fded52c0deac590eb"; + editedCabalFile = "1swhqpm0sb6mvqgzy7cf8p7alvsy5qvcx1kdl5rnqq71vql5v4nn"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -87679,7 +93644,7 @@ self: { mkDerivation { pname = "heist-aeson"; version = "0.5"; - sha256 = "aca56019ef0582098bb775ca4aaacace38098263870358ae954aff0756e619d4"; + sha256 = "1m0rwrb0gzsajnp5h0w7cf10jf6fram4mjkmny5hk0h5xwcn19dc"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers heist monads-fd text vector xmlhtml @@ -87694,7 +93659,7 @@ self: { mkDerivation { pname = "heist-async"; version = "0.6.0.0"; - sha256 = "94a272d73c0aa83de6f2bc525e42b0aae0d6bce8f57ae3b436463aa31d1b4b99"; + sha256 = "16ab3cfs6fj66ssf6ypmx2yddq5an115wlmwybk3va0a7kbp58ll"; libraryHaskellDepends = [ base heist template-haskell text xmlhtml ]; @@ -87711,9 +93676,9 @@ self: { mkDerivation { pname = "helf"; version = "0.2016.12.25"; - sha256 = "7d96b7bb7716b16d0b7b744629b3702766ec5e825cdd9b5015ada24d34a71a0e"; + sha256 = "03hslws4v8md2m89ppawh9gfqri7f2rjjiklgc5nvc8nfyxvg5kx"; revision = "1"; - editedCabalFile = "a3d5ffe78978b357890472700f2c0d5ac796f312909777476d89941753994385"; + editedCabalFile = "11a3k59ig549dm3pg5wh2brrdiss1ln0yw3j0j4mgcvqi7kzzmd3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87733,9 +93698,9 @@ self: { mkDerivation { pname = "helics"; version = "0.5.1"; - sha256 = "4cbc6fe323dd997d17b7c3724ec229d78209796133611af3379c7e5ab320721a"; + sha256 = "06kj42rmlzlw6zrilq9kc5whk0np5714wwn3nwbpv6fx4ginzg2c"; revision = "1"; - editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d"; + editedCabalFile = "0gfadz4f5hdp985br18a6rrwh5b40nsf71054b539xi2glc351v9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87758,7 +93723,7 @@ self: { mkDerivation { pname = "helics-wai"; version = "0.5.1"; - sha256 = "61ac00d92870d2c5cb86fb15bcea21a0522bf12665f35b5c2a300ca7094d2b83"; + sha256 = "10rb9l4sf31h59f5pwv54vqjnlm047mbq5gvhv5wblkh53ch1b31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87775,7 +93740,7 @@ self: { mkDerivation { pname = "helisp"; version = "0.1"; - sha256 = "017d79b3e896d5516e3a60da0cc3d5bff9b15496c6d2b815196d1036872c89c8"; + sha256 = "1j495j3kc43d34aviln6jrab3ydzsp1hrnk079p53mcnx2rpjz81"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl parsec process ]; @@ -87791,7 +93756,7 @@ self: { mkDerivation { pname = "helium"; version = "1.8.1"; - sha256 = "b2c0c29c31f495c4d4ab55bec3cfa84dba19efc3cdf2e699bcc350ee0a44936f"; + sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87815,7 +93780,7 @@ self: { mkDerivation { pname = "helium-overture"; version = "1.0.0"; - sha256 = "fcdb214bfc8af76a689aa228b13ca33e1ff8e66a1f185b7cb46f9c9cd78c2bff"; + sha256 = "1zrbikbrr73gniy5n60zdbkgh7rylcyb2a52k9l6mxwazi5j3nzw"; libraryHaskellDepends = [ base bytestring deepseq lifted-base mtl random text transformers ]; @@ -87833,7 +93798,7 @@ self: { mkDerivation { pname = "helix"; version = "0.9.5"; - sha256 = "20e24be12f0db6cf15ec66d28e20e0a14f1fcba79a728aad3843d48f4f581fab"; + sha256 = "1aqzb17qzm2372nqlwlslz5iykx1w0h8xlk6xhawzdhd5zhlpqi0"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -87859,7 +93824,7 @@ self: { mkDerivation { pname = "hell"; version = "2.1"; - sha256 = "d452d5dfbd2afde437b5247009ecb42a07cbd3059a7536055d683c92d29cbdcd"; + sha256 = "1kdxkk994g38bl2kcxcs0p9wn1rankn0jw14nlvy9z9appgxalnl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87882,7 +93847,7 @@ self: { mkDerivation { pname = "hellage"; version = "0.1.1"; - sha256 = "e5445656b4a38e6863e67e692b44e3285602c2724655ef8c9a90338f05011fbf"; + sha256 = "1gqz042qycwhka6fyma6fb104mi8wd22nsbywrini3m3nib5ci75"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87904,7 +93869,7 @@ self: { mkDerivation { pname = "hellnet"; version = "0.1.1"; - sha256 = "a69a9bb754224082b110d4011b33ce64b39162e9f37dd64fc681a6b16cca6439"; + sha256 = "0fb4r9nb39l1qr7xczgkx5i93cv4rqrin0fl22qq4h12ajvrp6m6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87926,7 +93891,7 @@ self: { mkDerivation { pname = "hello"; version = "1.0.0.2"; - sha256 = "a7c0b5a2a9e29b07f36904944e47ad6796db6af3b9431cba6b92b0bcb23bd8f4"; + sha256 = "1x6q7frbrc4jdfx1qhxrydmdp5k7mm3lx504d7rhg6z2m6ibbh57"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -87942,9 +93907,9 @@ self: { mkDerivation { pname = "helm"; version = "1.0.0"; - sha256 = "2db4102c179de11b62551c2e73477773fb603c5749dda0caac53bf038bef630c"; + sha256 = "0333xy5h7gskmk5a1pa9awy61yvkfx3p6bhwami1pqcx2wn11d1d"; revision = "1"; - editedCabalFile = "d302a857ec4bfaf720ba5f2345fe2cc3df5d61d920173172ca092671340f700f"; + editedCabalFile = "03vh1ws729h9r9r325r0v5hmvpy35kz4a8szp8hggyjbxibsh0nk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87966,7 +93931,7 @@ self: { mkDerivation { pname = "help-esb"; version = "0.1.6"; - sha256 = "268040d97cbfd240f5c145837ec50559c9a98a98f7be73635bb3c1d19f6fc03b"; + sha256 = "0fy0dygx3hdkbdip7gppk25akjar0p2px0s5q7sl1lmzgkcl1016"; libraryHaskellDepends = [ aeson base bytestring containers MissingH network network-uri text uuid @@ -87984,7 +93949,7 @@ self: { mkDerivation { pname = "hemkay"; version = "0.2.0"; - sha256 = "34b0caaaf402359b7b1c9474818509245a0f6b422be81cd477470211efb7c199"; + sha256 = "16f1nzpi20j7fza1rs1b89mhyni4162q2x4l3ixrnd82yjmcmc1l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88000,7 +93965,7 @@ self: { mkDerivation { pname = "hemkay-core"; version = "0.1.4"; - sha256 = "09fdc4c089abc6bf1089283e53a37fbffe52ea018b42b17e1bdc7a990e0a242f"; + sha256 = "0br41879jynw3dzb2hlb07m55zmzgyim6gi8i48bzimbi70c9z89"; libraryHaskellDepends = [ array base binary bytestring ]; description = "A device independent module music mixer"; license = stdenv.lib.licenses.bsd3; @@ -88016,7 +93981,7 @@ self: { mkDerivation { pname = "hemokit"; version = "0.6.6"; - sha256 = "83ee3c5ace9f86602249ed3d66f0b4d81dfea97b477685ef43a097417713df55"; + sha256 = "0mfz2dvl35x08gpqaxj7gflzw7fqnkq6cggd94i611lzrrd3rvl3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88044,7 +94009,7 @@ self: { mkDerivation { pname = "hen"; version = "0.1.3"; - sha256 = "9446fd9879835fd107f71e1e127c9f1f59771f3de4a62cba4ca00a567b5e26e6"; + sha256 = "1ri6brxmc2m09jx2r9p47lgpfn8zkxy147hyyw3x2pw3g6cgsill"; libraryHaskellDepends = [ base bitset exceptions mtl transformers uuid ]; @@ -88065,7 +94030,7 @@ self: { mkDerivation { pname = "henet"; version = "1.3.9.3"; - sha256 = "58957f9aa80bec0dcab3b3d656019bd9f114675d881140583cc4b07caca5a55e"; + sha256 = "0pm5lnn7rc647ic404c8bmki9wfrkc0mdmmkng50vv0bm2d7z5aq"; libraryHaskellDepends = [ base bitset bytestring network typesafe-endian ]; @@ -88079,7 +94044,7 @@ self: { mkDerivation { pname = "hepevt"; version = "0.5"; - sha256 = "7f883a4f0461856aed1ae688879346406b43ee42934488d292f6b3f5ddf7fa2c"; + sha256 = "0b7syzfzbcznjb98hi4k8bp46ss08s9qg2763bnnm1b10i7km23z"; libraryHaskellDepends = [ bytestring haskell2010 lha ]; description = "HEPEVT parser"; license = stdenv.lib.licenses.mit; @@ -88091,7 +94056,7 @@ self: { mkDerivation { pname = "her-lexer"; version = "0.1.1"; - sha256 = "be8add2ffa92ccd7fa3a8a9dab57bc4856559fba63012771c9beb68f32227dc1"; + sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my"; libraryHaskellDepends = [ base mtl split ]; homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she"; description = "A lexer for Haskell source code"; @@ -88104,7 +94069,7 @@ self: { mkDerivation { pname = "her-lexer-parsec"; version = "0.0.0"; - sha256 = "f6d1f3fbfccaeb97f0efc90e83156dc18a33545a082b8860cf517635636a6cbe"; + sha256 = "1gkcd9ikaxjirxh8haq8b9a372n1dlaq63n9xzq9gsyazkxz7lgn"; libraryHaskellDepends = [ base her-lexer parsec transformers ]; description = "Parsec frontend to \"her-lexer\" for Haskell source code"; license = stdenv.lib.licenses.publicDomain; @@ -88118,7 +94083,7 @@ self: { mkDerivation { pname = "herbalizer"; version = "0.4.9"; - sha256 = "46772794de683dd90b3c09dd5fb57e01af6aec0fb2aea6ba26e3c47083f2a1be"; + sha256 = "1gm1ya1p1i734sxadbmj1zn6mbq1gssmzp897h5xjgb8vsa2fxs6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88136,8 +94101,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.9"; - sha256 = "c6e87d889bbfa414b7a4dcad0dc55aae1158630065d5f52408fe8b72adc8ff38"; + version = "1.2.11"; + sha256 = "1jpcwzi5pq82zlv1w987dlpfyi566gvabaj2wywyr9i95hv97jk8"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -88151,7 +94116,7 @@ self: { mkDerivation { pname = "heredoc"; version = "0.2.0.0"; - sha256 = "c90d9fc61cb8cd812be510845493b6a6eddcc4b772581fd40a9433ed8f130f40"; + sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://hackage.haskell.org/package/heredoc"; description = "multi-line string / here document using QuasiQuotes"; @@ -88165,7 +94130,7 @@ self: { mkDerivation { pname = "heredocs"; version = "0.1.4"; - sha256 = "3f879b0e2f34d98f670e6a210f1bc61d9c4a9505c147c7ec93576f54fe69c56f"; + sha256 = "0vy5d7z58vspjgncfiy10nalm70xqqdhy8ba1rkqzn9l5w79p1rz"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -88181,7 +94146,7 @@ self: { mkDerivation { pname = "herf-time"; version = "0.2.2"; - sha256 = "9554f70b4399e11d8ea1a49c03ec80d27e471e1a94bbb1542ea5b85aa821d68e"; + sha256 = "13nn46l5mf555rab3fwl38g4fznjh3n07754l671vqcr8c5zfm4m"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; @@ -88197,9 +94162,9 @@ self: { mkDerivation { pname = "hermit"; version = "1.0.1"; - sha256 = "3fac7822e9de5b081bf18a087dcd61d2eab26aa7ec6570a785aadd0c3e909249"; + sha256 = "0jcjj0z0rpdahnkp0rgclxmb5snjc76ps24ay4dhhnyyx4i7ib1z"; revision = "1"; - editedCabalFile = "113c7ce268a0d0c16da03dc2f160e33bd7fe55c0f4135236477f33e44de3059c"; + editedCabalFile = "1705wd6y8cvz8wv544zlq1azxmrvwdhg3hixl1nw3l50d3i7qg0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88225,7 +94190,7 @@ self: { mkDerivation { pname = "hermit-syb"; version = "0.1.0.0"; - sha256 = "3d181379d568479c4d2935e6dd6e6a00eb6b5ac8081e28ae6de66084f0b1e0a4"; + sha256 = "1970n7q88q76dnp2h7h8r1d6psq0d9pdvrim556rqiv8smwi661x"; libraryHaskellDepends = [ base containers ghc ghc-prim hermit syb template-haskell ]; @@ -88239,7 +94204,7 @@ self: { mkDerivation { pname = "hero-club-five-tenets"; version = "0.3.0.3"; - sha256 = "b706afb5213aa5be028e27193e2df10e8f5de7ad1952f41bb16796949fbada3b"; + sha256 = "0fyspagr95k7n4dz8lhrmpkmv3qfy4nkw697iq1bx99s46ssy1mp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random text ]; @@ -88254,7 +94219,7 @@ self: { mkDerivation { pname = "heroku"; version = "0.1.2.3"; - sha256 = "53748229bd82fc9b24c682b278c4f58256086bc3dcc9ed6b96f4c86a6fd38dbe"; + sha256 = "1gldsdpnmj7ljrmyvjfwqdmhhml2yp27icl2qqj9pz42pllq4x2k"; libraryHaskellDepends = [ base network-uri text ]; testHaskellDepends = [ base hspec network-uri text ]; homepage = "https://github.com/gregwebs/haskell-heroku"; @@ -88269,7 +94234,7 @@ self: { mkDerivation { pname = "heroku-persistent"; version = "0.2.0"; - sha256 = "f0c2101361dbdc91aecd642f07099bb421b5abca00284f69a7406ad56dbfc80c"; + sha256 = "0368pxnxasj0lxllya00ramva8dlkc4hfbv4rnp93p6vc49i1hph"; libraryHaskellDepends = [ base bytestring heroku persistent-postgresql text ]; @@ -88287,7 +94252,7 @@ self: { mkDerivation { pname = "herringbone"; version = "0.1.1"; - sha256 = "b37248062624c51e3b7a5a6d99744d26089902cf2e94fec837a5dad888f8edf6"; + sha256 = "1xpdz24dinm56z4gx51frw19j2169ms9jvasg8xixi944q34hwmk"; libraryHaskellDepends = [ base bytestring containers directory http-types mtl old-locale process process-listlike system-fileio system-filepath text time @@ -88305,7 +94270,7 @@ self: { mkDerivation { pname = "herringbone-embed"; version = "0.1.1"; - sha256 = "0686594f29deaee24a9b8c1eefc4cc608365b35d862b0fba22cb82e79298200a"; + sha256 = "02i0k29fg0nb4ax0yaw6bnrnb0v0rk2fy7lckd5f5bny557mk1h6"; libraryHaskellDepends = [ base bytestring file-embed herringbone system-fileio system-filepath template-haskell text @@ -88322,7 +94287,7 @@ self: { mkDerivation { pname = "herringbone-wai"; version = "0.1.1"; - sha256 = "0ea034a1efa9a58feaca4f208ddc0ddc564da651b784c1d355fe2b8c13b280cf"; + sha256 = "1kw0n89qqazyap9w315pa6k4smnw1pf8s82grbm8z9d9xyhk980f"; libraryHaskellDepends = [ base bytestring herringbone http-types system-fileio system-filepath text time wai wai-app-static @@ -88333,24 +94298,26 @@ self: { }) {}; "hesh" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdtheline - , containers, cryptohash, directory, filemanip, filepath - , hackage-db, haskell-src-exts, parsec, process, template-haskell - , text, time, transformers, uniplate + ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdargs + , containers, cryptohash, data-default, directory, exceptions + , filemanip, filepath, hackage-db, haskell-src-exts, parsec + , process, template-haskell, text, time, transformers, uniplate + , unix }: mkDerivation { pname = "hesh"; - version = "1.5.0"; - sha256 = "1e79b396d448fd7e98c293c14efed69e65ece14a5fd77bb408b8e4d0a5a024f6"; + version = "1.11.0"; + sha256 = "1c704x1k2sbj87a4risy0d2aj5plf41205cn12f2q9w2agh3zv2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filemanip parsec process template-haskell text transformers + base exceptions filemanip parsec process template-haskell text + transformers ]; executableHaskellDepends = [ - aeson base bytestring Cabal cartel cmdtheline containers cryptohash - directory filepath hackage-db haskell-src-exts parsec process text - time uniplate + aeson base bytestring Cabal cartel cmdargs containers cryptohash + data-default directory filepath hackage-db haskell-src-exts parsec + process text time uniplate unix ]; homepage = "https://github.com/jekor/hesh"; description = "the Haskell Extensible Shell: Haskell for Bash-style scripts"; @@ -88365,7 +94332,7 @@ self: { mkDerivation { pname = "hesql"; version = "0.8"; - sha256 = "8a57e56ac331fc63517a00ce7ab0069ee3f30ab8f0b84a112992233b56a9b5f7"; + sha256 = "1xxmm5b3n8wj548lmf7hp05g7qwy0sq7mkh0g98n7z1iqdmfamwa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88383,7 +94350,7 @@ self: { mkDerivation { pname = "hetero-dict"; version = "0.1.1.0"; - sha256 = "880b8f1659099bfb7656b9aa854255b3612bc52633736d3a1246752450a33169"; + sha256 = "0s9ild828xa628x6swrk4v2jnqdkam18bamrarvgp6q9b4b8y2w8"; libraryHaskellDepends = [ aeson base primitive template-haskell text unordered-containers ]; @@ -88399,7 +94366,7 @@ self: { mkDerivation { pname = "hetero-map"; version = "0.21"; - sha256 = "677e2bbc0774b93e7b2e9d887535b0a07895c001d88f0a99c4af283fcf90dfba"; + sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/luqui/hetero-map"; description = "Pure heterogeneous maps"; @@ -88408,15 +94375,16 @@ self: { "heterocephalus" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist - , doctest, Glob, parsec, shakespeare, template-haskell, text + , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text + , transformers }: mkDerivation { pname = "heterocephalus"; - version = "1.0.4.0"; - sha256 = "4a208830f15a3575f10c238bed8ff09827483eec94b8cc068c6907d2106f982a"; + version = "1.0.5.0"; + sha256 = "1qhm8vq8dncmqd9mjqghw1b327brjc9ij9pxjbkpk0lppx3pgsnw"; libraryHaskellDepends = [ - base blaze-html blaze-markup containers dlist parsec shakespeare - template-haskell text + base blaze-html blaze-markup containers dlist mtl parsec + shakespeare template-haskell text transformers ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/heterocephalus#readme"; @@ -88424,13 +94392,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "heterolist" = callPackage + ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata + }: + mkDerivation { + pname = "heterolist"; + version = "0.2.0.0"; + sha256 = "0pf15l4ry7i8dhga7l5fpk2girxbplym4csl9vg230xp58h4m8gj"; + libraryHaskellDepends = [ + base constraint-manip indextype polydata + ]; + testHaskellDepends = [ + base constraint-manip hspec indextype polydata + ]; + description = "A heterogeneous list type"; + license = stdenv.lib.licenses.mit; + }) {}; + "hetris" = callPackage ({ mkDerivation, array, base, hscurses, ncurses, old-time, random }: mkDerivation { pname = "hetris"; version = "0.2"; - sha256 = "dd2399c0ab8d0bdc03c2cc41ed814b99c1ef083b425af0e3c1fdac3f7d7e406a"; + sha256 = "0sj0grykzb7xq7iz0nj27c4fzhcr9f0yshfcq81xq2wdmg09j8yx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base hscurses old-time random ]; @@ -88447,7 +94432,7 @@ self: { mkDerivation { pname = "heukarya"; version = "0.2.0.2"; - sha256 = "afb321566f3276d7f5c6ad9241b7a8db14f3aea3e7547e006448b6cc92f08ef9"; + sha256 = "1ycfy29crdj8ch07wm77lfpg656vm2vl34mdqvsxfxijdxb23cxg"; libraryHaskellDepends = [ base containers deepseq parallel random text ]; @@ -88462,7 +94447,7 @@ self: { mkDerivation { pname = "hevolisa"; version = "0.0.1"; - sha256 = "5a28d8c5ba95676ca664982ea66bbbe3c8eee04f04d6b7c537966f9b1bee47fb"; + sha256 = "1ys7xqdrnvwn6z2vgmh49zhfxj73pdmscblqcjk6qrwmpb2xha2s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88480,7 +94465,7 @@ self: { mkDerivation { pname = "hevolisa-dph"; version = "0.0.1"; - sha256 = "6b8e2b6a8996a47b8e72ea68e9b1c18cd4d738f90408bb8b2eede4315ab75e4b"; + sha256 = "0jsynxd33r7d5s5vn204z4wdgm4cq6qyjs7afa77p94ni5m2p3kb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88496,7 +94481,7 @@ self: { mkDerivation { pname = "hex"; version = "0.1.2"; - sha256 = "12ee1243edd80570a486521565fb0c9b5e39374f21a12f050636e71d55ec61ec"; + sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj"; libraryHaskellDepends = [ base bytestring ]; description = "Convert strings into hexadecimal and back"; license = stdenv.lib.licenses.bsd3; @@ -88507,7 +94492,7 @@ self: { mkDerivation { pname = "hexdump"; version = "0.1"; - sha256 = "0c5a26f9e093392fc39abdd6b8d788e4abbd8f4ecdaf362c1c99439cac9d5004"; + sha256 = "012hknn9qhwr3hn3dbyd9s7vvaz4i3bvimmxkb1jyfckw3wjcnhc"; libraryHaskellDepends = [ base ]; description = "A library for forming hexdumps"; license = stdenv.lib.licenses.publicDomain; @@ -88518,7 +94503,7 @@ self: { mkDerivation { pname = "hexif"; version = "0.2.0.0"; - sha256 = "14d344b138c1858d314df98f3b6676e75f7af523aad4ed9c8bac9264f42e5bab"; + sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql"; libraryHaskellDepends = [ base binary bytestring filepath ]; homepage = "http://www.github.com/hansroland/hexif"; description = "Reading Exif data form a JPEG file with Haskell"; @@ -88530,8 +94515,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.3.1"; - sha256 = "90d31d91beb87bfb9c0f1b867061b3db6d14dcbf9da87a483d620617aca0b1b0"; + version = "0.3.2"; + sha256 = "0vyv45s6nqhbgkzxcgx1ihmif0d7sxmfafqc2xcmcm2vg4jb7ls4"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -88540,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 = "39e6a1a30e80873165c3287a5b84de325c0b1dee1ddfd271daa360c1b15e0e2e"; + 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 @@ -88565,7 +94551,7 @@ self: { mkDerivation { pname = "hexpat-iteratee"; version = "0.6"; - sha256 = "165b8087dad4b9876155a24e15f9971ab0e710c1cfcc9a32a4289487737e9881"; + sha256 = "10cqgrrqg518lhr9mk6gq48fgc0sjzwiakm2amhqgfflva3q0nqn"; libraryHaskellDepends = [ base bytestring containers extensible-exceptions hexpat iteratee List parallel transformers @@ -88582,8 +94568,8 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.4"; - sha256 = "35783e1bb8654ac74866b7910f7f58385a78d0005d05c26bc7efd36ca9827978"; + version = "0.1.5"; + sha256 = "13965xm8anbhq8xpg0y5a5aw9xy2gzn5zm1w64p96sdzklw5xrna"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; @@ -88600,7 +94586,7 @@ self: { mkDerivation { pname = "hexpat-pickle"; version = "0.6"; - sha256 = "35fd19c2eb6ffaf2bd248e2fae0a3f0d546155044b9d15f872bd935f13d101cc"; + sha256 = "1k01s49mz4xxfbw1b7ab0ian2m0d7w5awbwf4jyz5ykgxg11kz9m"; libraryHaskellDepends = [ base bytestring containers extensible-exceptions hexpat text utf8-string @@ -88618,7 +94604,7 @@ self: { mkDerivation { pname = "hexpat-pickle-generic"; version = "0.1.7"; - sha256 = "3a5655154f8ad30501a6327d4b4b0ceeb7a9758bea4024b0fce84da7822d1050"; + sha256 = "0l0h5n1afkg8zjq28h7aidsskdzf1i5lnz9jlq0hblwa9wamamis"; libraryHaskellDepends = [ base bytestring hexpat text ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -88634,7 +94620,7 @@ self: { mkDerivation { pname = "hexpat-tagsoup"; version = "0.1"; - sha256 = "529d54a4e42e917310a81b9a09eb3999034aff3341dcda2982a016b50c210111"; + sha256 = "0481446ba5m0h8lxmp216gzll0wr77mhk6hvm087749fwjj597aj"; libraryHaskellDepends = [ base hexpat tagsoup ]; description = "Parse (possibly malformed) HTML to hexpat tree"; license = stdenv.lib.licenses.bsd3; @@ -88647,7 +94633,7 @@ self: { mkDerivation { pname = "hexpr"; version = "0.0.0.0"; - sha256 = "9b97a71dc842c30d17fe9fe8863ab9641ded3ef7010494c6157918dafa5ff572"; + sha256 = "0wpmbzxdl63r2p398101ywzfs7b4p4x8ds4zzqbhvhs2r0fsg5wv"; libraryHaskellDepends = [ base data-ref either mtl parsec transformers ]; @@ -88664,7 +94650,7 @@ self: { mkDerivation { pname = "hexquote"; version = "0.1"; - sha256 = "0843617c10e81c7c5f133004649a5b6662f01eaf13375af95adb8b3085d5203b"; + sha256 = "0fr0sn2k12yvbbwmldqkmwgg0qk6bfd6811h2dgpq77821y62hq8"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell ]; @@ -88680,7 +94666,7 @@ self: { mkDerivation { pname = "hexstring"; version = "0.11.1"; - sha256 = "40d8dbfe22f572ffdb73f28c448b228a75008e83cc3bf78e939add0c9d800914"; + sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20"; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring text ]; @@ -88695,7 +94681,7 @@ self: { mkDerivation { pname = "hext"; version = "0.1.0.4"; - sha256 = "a2e76f7f25853d5533dcec2819c6c1e267d53828088498861be3d493ee6b1451"; + sha256 = "0l8ldgp97m733f39i10850wdarz2q731ja7cvhrmagc54mznzrx2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88718,7 +94704,7 @@ self: { mkDerivation { pname = "heyefi"; version = "1.1.0.0"; - sha256 = "ddbb1e25fd3b46ce1fc867563215392d2a5c0d85f1f7f864d3a3dce36954cc13"; + sha256 = "04ycaily7p53sdjgixzihl6mqaid74ak4mk7r0gwwiivzljixfyx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88744,7 +94730,7 @@ self: { mkDerivation { pname = "hfann"; version = "0.4.2"; - sha256 = "5a25fc2af7f99f1ba0d25394f7f98c657c24aa5d9a193bfdce71981f3311f926"; + sha256 = "09pr24riz63irvykn6csbnm28z35ikwzg52ksah1p7zrywmgq9as"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -88763,7 +94749,7 @@ self: { mkDerivation { pname = "hfd"; version = "0.0.2"; - sha256 = "a44cc58088e771ec0ead9e5eda187ce412e50f5e9e1aaaed5664cd0fcd81c0d8"; + sha256 = "1n60h76hzkb4avnsl6lybq7ya4p4ghcdlplyml7fqwg7i20cak54"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88780,7 +94766,7 @@ self: { mkDerivation { pname = "hfiar"; version = "2.1.1"; - sha256 = "e1b46428ae814b7d1a8dbfaf805b8a4e518eda4e28f919b317a5b5dbd81858cb"; + sha256 = "1jsq33cdpdd52yriky989vd8wlafi9dq1bxzild7sjw1mql69d71"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base eprocess mtl ]; @@ -88796,9 +94782,9 @@ self: { mkDerivation { pname = "hflags"; version = "0.4.2"; - sha256 = "2cd30d637f4011d9b614698ef7f7bf1f55c45900e6683d60c7b17af5750f2cc5"; + sha256 = "1i9c1xszaymiqxh3ss7601cw8m8zpzvzg3k92jvdj4a0gxihvlrc"; revision = "1"; - editedCabalFile = "4165343ab35bbf063b872c69a353f1bffb962ce75bd66d7c1478a8083c7a5acd"; + editedCabalFile = "1kasg8y0ia3q2iy6vmjvwwn9dyxzy59s6s9chwxhdgsvncx38ra1"; libraryHaskellDepends = [ base containers template-haskell text ]; homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; @@ -88806,20 +94792,22 @@ self: { }) {}; "hfmt" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, Cabal, Diff, directory - , filepath, haskell-src-exts, hindent, hlint, HUnit - , optparse-applicative, pipes, pretty, stylish-haskell - , test-framework, test-framework-hunit, text + ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal, Diff + , directory, exceptions, filepath, haskell-src-exts, hindent, hlint + , HUnit, optparse-applicative, path, path-io, pipes, pretty + , stylish-haskell, test-framework, test-framework-hunit, text + , transformers, yaml }: mkDerivation { pname = "hfmt"; - version = "0.0.2.3"; - sha256 = "22ced71f926ecece0ab3b33fdfabd004fb1812eaab1f2234280e012cbf2aba98"; + version = "0.1.1"; + sha256 = "0cg5vaihyrdsigpvj82a2xdmq6wj1vbqg10ldcp4c2pxwsgz97mh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal directory filepath haskell-src-exts hindent hlint HUnit - pipes stylish-haskell text + base bytestring Cabal directory exceptions filepath + haskell-src-exts hindent hlint HUnit path path-io pipes + stylish-haskell text transformers yaml ]; executableHaskellDepends = [ ansi-wl-pprint base Diff optparse-applicative pipes pretty @@ -88840,7 +94828,7 @@ self: { mkDerivation { pname = "hfoil"; version = "0.2.0.2"; - sha256 = "417e52d9817d74051e41ff1c24434be002fa32d04fa271d220a2b11ca8f3964b"; + sha256 = "0jwnyfl1rcd2439738jgs0rgl0p09d1j877z84g0ax3xh7cm4zj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88858,7 +94846,7 @@ self: { mkDerivation { pname = "hformat"; version = "0.1.0.1"; - sha256 = "62830d91b7d338f2fee8c3aa2b6ab874d6340ed84b0a67dd0f31fbcad6d08d0c"; + sha256 = "034ds3bcmyri1zfnf2jbv0739mklp1m2pan3x3zg4f6kny8hv0v2"; libraryHaskellDepends = [ base base-unicode-symbols text ]; testHaskellDepends = [ base base-unicode-symbols hspec text ]; homepage = "http://github.com/mvoidex/hformat"; @@ -88866,13 +94854,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hformat_0_2_0_0" = callPackage - ({ mkDerivation, base, base-unicode-symbols, hspec, text }: + "hformat_0_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec + , text + }: mkDerivation { pname = "hformat"; - version = "0.2.0.0"; - sha256 = "a949d752095cdc21a2e48ab4adf068ba67e5e53fa394e6fae9f29fe156dccefb"; - libraryHaskellDepends = [ base base-unicode-symbols text ]; + version = "0.3.0.0"; + sha256 = "00l0jcigcrk8yphfgyd8kzc06k7rlka26qc565w4rj9s9dn67y6s"; + libraryHaskellDepends = [ + ansi-terminal base base-unicode-symbols text + ]; testHaskellDepends = [ base base-unicode-symbols hspec text ]; homepage = "http://github.com/mvoidex/hformat"; description = "Simple Haskell formatting"; @@ -88885,7 +94877,7 @@ self: { mkDerivation { pname = "hfov"; version = "1.0.2"; - sha256 = "34810fc4760503f9fbb929134dced7f4274d4167351636d5dd531950bbac1c13"; + sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nornagon/hfov"; description = "Field-of-view calculation for low-resolution 2D raster grids"; @@ -88900,7 +94892,7 @@ self: { mkDerivation { pname = "hfractal"; version = "0.4.2.5"; - sha256 = "bff00c6a27455b70326087f3c2dd7e9185ac84f5f2fbdeabda8a425cf9e91818"; + sha256 = "060qx7wmqhlavamxxyzjyn2ar1cigvfw5ww7c0r70ns54xm0rw5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88920,7 +94912,7 @@ self: { mkDerivation { pname = "hfsevents"; version = "0.1.6"; - sha256 = "74c3f3f3a5e55fff320c352a2d481069ff915860a0ab970864c6a0e6b65d3f05"; + sha256 = "019zbnvfd866ch49gax0c1c93zv92142saim1hrgypz5lprz7hvl"; libraryHaskellDepends = [ base bytestring cereal mtl text ]; librarySystemDepends = [ Cocoa ]; libraryToolDepends = [ CoreServices ]; @@ -88928,6 +94920,7 @@ self: { description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; @@ -88936,7 +94929,7 @@ self: { mkDerivation { pname = "hfusion"; version = "0.0.6.1"; - sha256 = "f948b5f64537130f547896ba3a3611284f945d9458345f3d96c21a8d58d4f116"; + sha256 = "05pisic8s6n2jqymyd2qjifr8kr824v3mflng1a0y4rp8pvbaj7r"; libraryHaskellDepends = [ base containers haskell-src mtl pretty syb ]; @@ -88953,7 +94946,7 @@ self: { mkDerivation { pname = "hg-buildpackage"; version = "1.0.4"; - sha256 = "186257f596849e789a4f3a17c574692e717d427510e332ae24b1673e1a5d5133"; + sha256 = "0csibld3wrxi4jp35qqhfm17sw9fd5sca5rs9yd7i7l4jvsmfqhq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88970,7 +94963,7 @@ self: { mkDerivation { pname = "hgal"; version = "2.0.0.2"; - sha256 = "f1b642052ea8f168dfeba8bcac1a2b697a86eb6a70dc6aca130490e27f441c9f"; + sha256 = "17qw8izy54042g56mp3hdbmqcyk95cdarg58xggniwd85q2l5dpi"; libraryHaskellDepends = [ array base containers mtl ]; description = "library for computation automorphism group and canonical labelling of a graph"; license = "GPL"; @@ -88981,7 +94974,7 @@ self: { mkDerivation { pname = "hgalib"; version = "0.2"; - sha256 = "3c57cb3e3b5ce2ec7686a443f5215e7e02e6bf138c41776b0e6dbc1c60a54821"; + sha256 = "08a8lmh1rg3d1rmpfhcc2fzyc0kybqhzahx4hrvfrqjw7czcnmrw"; libraryHaskellDepends = [ array base haskell98 mtl ]; description = "Haskell Genetic Algorithm Library"; license = stdenv.lib.licenses.publicDomain; @@ -88996,7 +94989,7 @@ self: { mkDerivation { pname = "hgdbmi"; version = "0.2"; - sha256 = "64b2da438b023c731b12375fb65cc638eb41c5c814100727623b81a4d2bcd5bd"; + sha256 = "1gfmpk9a909vc8khf40lr32l3srqqrfbcprp28dp6g02id1xmck4"; libraryHaskellDepends = [ base parsec process stm unix ]; testHaskellDepends = [ base directory HUnit process template-haskell temporary @@ -89016,7 +95009,7 @@ self: { mkDerivation { pname = "hgearman"; version = "0.1.0.2"; - sha256 = "b37b94d79007088191990734ae23f71bd9efbef4a14ba0a01af733a34fbbd12d"; + sha256 = "0bfipd7s6czp3aha0jx1yjzfzn8vywiswd07k68q2207j3br8yxk"; libraryHaskellDepends = [ base binary bytestring monad-control mtl network resource-pool transformers transformers-base unordered-containers @@ -89031,7 +95024,7 @@ self: { mkDerivation { pname = "hgen"; version = "1.4.0"; - sha256 = "65c5543d966c3023bb6778a941a84f5b7648c51e8a203543c2d58b3c29a81fa4"; + sha256 = "190zm0lkr2ymq91ka84a3v2lhxjv9yl43abqcyxj6c3cjqym9ib5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89048,7 +95041,7 @@ self: { mkDerivation { pname = "hgeometric"; version = "0.0.2.2"; - sha256 = "4d53479a52a9b5778406ca6a0825b9eda8f5f16980c6461b29e328ba6a058650"; + sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd"; libraryHaskellDepends = [ base containers ]; homepage = "ftp://ftp.cs.man.ac.uk/pub/toby/gpc/"; description = "A geometric library with bindings to GPC"; @@ -89067,7 +95060,7 @@ self: { mkDerivation { pname = "hgeometry"; version = "0.6.0.0"; - sha256 = "328e0e4438b729084b301b22f31d9f880157a5b317eacc48ddcf585d685bf0de"; + sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89095,7 +95088,7 @@ self: { mkDerivation { pname = "hgeos"; version = "0.1.8.0"; - sha256 = "e7937a4f26ad057720f215ff51969972b4dd44ca1d817242377e3adb97c2d891"; + sha256 = "14fqqabxnfky6x17508xr92dvd3jk6b53zqmy8h7f1dd4r7pm4z7"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ geos_c ]; testHaskellDepends = [ base MissingH ]; @@ -89112,9 +95105,9 @@ self: { mkDerivation { pname = "hgettext"; version = "0.1.30"; - sha256 = "26453a4d359c99c41d462db9f8c9144d172523b3fa7076117a877e6c43f3ffdd"; + sha256 = "1pgzyd1nqzl7g88pcw7sncija5sd2k4zif9d8qfw96cw6m6kli96"; revision = "2"; - editedCabalFile = "b2aff15e79fb791bf70c0d12182e79b7e686b356f0637d9355c4c823c1a9c5c8"; + editedCabalFile = "1j65m70j7j64an9psqzhasrqdrmpg4p1h4hd1kvinygvg5gg3bxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89128,15 +95121,15 @@ self: { }) {}; "hgis" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, cairo - , Chart, Chart-cairo, Chart-diagrams, colour, composition + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart + , Chart-cairo, Chart-diagrams, colour, composition , data-binary-ieee754, data-default, directory, filepath, hspec , lens, monad-loops, optparse-applicative, transformers }: mkDerivation { pname = "hgis"; - version = "0.1.1.2"; - sha256 = "fe9ba90e951533980aff909f6c53a33d2e1960ddb5eb547a4650564a0ee4bb5f"; + version = "0.1.3.5"; + sha256 = "1vmx21s0q9w21118m60hzrfk1p704m7675k7idrqlwd4da54ib7c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89145,14 +95138,13 @@ self: { directory filepath lens monad-loops optparse-applicative transformers ]; - libraryPkgconfigDepends = [ cairo ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/vmchale/hgis#readme"; description = "Package and command-line for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo;}; + }) {}; "hgithub" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring @@ -89162,7 +95154,7 @@ self: { mkDerivation { pname = "hgithub"; version = "0.1.0"; - sha256 = "543089b1c045a6d38fc3f173d79e226725a8de2d696b0ea82deb14f2d35fbd15"; + sha256 = "05dxbz9z457b5nl0wsv95pgah9b74agdfwziqf7x79j5q2qqjc2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89181,7 +95173,7 @@ self: { mkDerivation { pname = "hgl-example"; version = "0.0.2"; - sha256 = "b973e9554656b996993ba58a56806524024d27450fa80e2fe5218c1147942f2e"; + sha256 = "0bigji3i3311wlphxa0g8lkls0i4cn05d2m57fcrdfan8rayjwxr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89198,7 +95190,7 @@ self: { mkDerivation { pname = "hgmp"; version = "0.1.0.1"; - sha256 = "51f63355e712854dd3b5785accef36fdca2538f443fd6690d8276a32e8b86c3a"; + sha256 = "0fkcp3l34si7v286dza3yhw2bjpx6vpwqnkqnp9lv18jwxak7xji"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://code.mathr.co.uk/hgmp"; @@ -89213,7 +95205,7 @@ self: { mkDerivation { pname = "hgom"; version = "0.6"; - sha256 = "bbea4b39837a577d51c0c4204df123cb5d2db2e2642df7a80105d61e6e73ad2a"; + sha256 = "0amdfdp1xmh506lgfbb4war2spfb4gqls864q18psmvshcwlpsmv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89230,7 +95222,7 @@ self: { mkDerivation { pname = "hgopher"; version = "0.1.0.0"; - sha256 = "8ed7f3298557486c934aa8cc2f20166e1b6a6e620df9bb6e4e4ab3e2505cde48"; + sha256 = "0j6ybi8f5csa9rpbpy8dc9p6l6vf2qh2zk589a9nqj2phllz7mwf"; libraryHaskellDepends = [ base bytestring network ]; description = "Gopher server"; license = stdenv.lib.licenses.bsd3; @@ -89244,7 +95236,7 @@ self: { mkDerivation { pname = "hgrev"; version = "0.2.1"; - sha256 = "0bb7b8f2fbb23e94bfacaf171d6affa13093ce2045ceeb1af47b783b51d5874d"; + sha256 = "0kc7sm8kny3vyhdfpkj543796c51zxm1s5xgmjzr8gmjzgrbidqb"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -89260,7 +95252,7 @@ self: { mkDerivation { pname = "hgrib"; version = "0.3.1.0"; - sha256 = "d3e0d4b1088934c230c566458e327b535733de602aa96ca68fc9236b65e3d73b"; + sha256 = "0fypwdjnn8y9iyk6ra9ac3g36mskgcr8wib6qlqc4d4912qx9q6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base transformers ]; @@ -89278,7 +95270,7 @@ self: { mkDerivation { pname = "hharp"; version = "0.1.1.1"; - sha256 = "f5868e6f1f34f5448c4865f286ba06b186a47fc61894d20707dedb2b9214b65e"; + sha256 = "0pmn2j92pnyy0w3x550qqrzs91mi0sx8dwk592649x9l3xpqx1pm"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ harp ]; homepage = "http://www.harphttp.org"; @@ -89295,7 +95287,7 @@ self: { mkDerivation { pname = "hi"; version = "1.2.0.1"; - sha256 = "c2758df75bec2f971d85f4f681d56c42f28adb013058e445851cbc94a209828e"; + sha256 = "13l216i99g0whm2y8n1h07dqmwj2dkaq3xplhlfrfbzcbgvqsxf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89327,7 +95319,7 @@ self: { mkDerivation { pname = "hi3status"; version = "0.1.1.0"; - sha256 = "de4c03916349148592e2f3b92a26f5f0b315762b8af61cfe41b556f427a43366"; + sha256 = "0riklhkz8mmm87z1rxla5dv1bczhylk2mfgkwa98a529cf8h6k6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89347,7 +95339,7 @@ self: { mkDerivation { pname = "hiccup"; version = "0.40"; - sha256 = "e5f5f633d30b60f55d5d172357a017ae7d70f8b3d345de6cfec1fc7e63c97fea"; + sha256 = "1skzr5ipxz61zrndwifkngw70zdf2yh5f8qpbmfzaq0bscrzdxg5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89365,7 +95357,7 @@ self: { mkDerivation { pname = "hichi"; version = "0.0.1"; - sha256 = "784f70cfbfe9cf73da4e5c452c794cfbafe682a5e06e31419436d89f38c6acb8"; + sha256 = "1f5cqqw9zn1nji0k2vp0ln1fdbzv9iwjqiaw9vd77kz9pz7p0kvq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bytestring mtl network ]; @@ -89379,7 +95371,7 @@ self: { mkDerivation { pname = "hid"; version = "0.2.2"; - sha256 = "0dd5c562b871626cfad11846d0d3b788823adc12fe009403a42e5f56108773d2"; + sha256 = "1lkkhw85cprflh1r807y2bf3m0l8nz9x0ihqs7x6qqkip1icbm8d"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ hidapi ]; libraryToolDepends = [ c2hs ]; @@ -89395,7 +95387,7 @@ self: { mkDerivation { pname = "hidapi"; version = "0.1.4"; - sha256 = "fc40ea58320f9f1459a8da6463419bb15930d2e6d8273d5592cde509d4c96a75"; + sha256 = "0xbar7a0krfdj9aks9yqwv930ndikd0n6r6sm1ci97qg69cflh7w"; libraryHaskellDepends = [ base bytestring deepseq deepseq-generics ]; @@ -89406,12 +95398,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {systemd = null;}; + "hidden-char" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "hidden-char"; + version = "0.1.0.0"; + sha256 = "1dy9sxc9nl1qdcpvgqwv6m54ccbqk31p806gfhiv7whr95zqwpc0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/rcook/hidden-char#readme"; + description = "Provides getHiddenChar function"; + license = stdenv.lib.licenses.mit; + }) {}; + "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: mkDerivation { pname = "hieraclus"; version = "0.1.2.1"; - sha256 = "ef9eec9bf69d8c788bae17b5856c3b7411e27ab9868c26ca002dee2f5b75d285"; + sha256 = "11fjfmdjzvid0352d346p5xf44bl7dn8bd8pms5pi34xysdyr7pg"; libraryHaskellDepends = [ base containers HUnit mtl multiset ]; description = "Automated clustering of arbitrary elements in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -89424,7 +95429,7 @@ self: { mkDerivation { pname = "hierarchical-clustering"; version = "0.4.6"; - sha256 = "75f17f09b9c38d51a208edee10da2f4706ee784b5cdfe8efc31f7f86bbcdccb1"; + sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; @@ -89438,7 +95443,7 @@ self: { mkDerivation { pname = "hierarchical-clustering-diagrams"; version = "0.3.2"; - sha256 = "5923407983deb4b77da5af13ad764a3c3fb083aa1f2665c889961c8ae1f7cc1a"; + sha256 = "06ncyzhql74ni746a9hzma1v0grw99vas4xglmyvgd6yhdwl08sr"; libraryHaskellDepends = [ base diagrams-lib hierarchical-clustering ]; @@ -89456,7 +95461,7 @@ self: { mkDerivation { pname = "hierarchical-exceptions"; version = "1.0.1"; - sha256 = "b52a5a13d417a65eec7ca10211a8a1ec988142f6b3c06651953496ffe6e1f0fb"; + sha256 = "1yzhw7kgz5iljm8ndh5kyr18367cl6l120m1gkn5x9hpsh9mlamm"; libraryHaskellDepends = [ base template-haskell ]; description = "Template Haskell functions to easily create exception hierarchies"; license = stdenv.lib.licenses.asl20; @@ -89472,7 +95477,7 @@ self: { mkDerivation { pname = "hierarchy"; version = "0.3.1.2"; - sha256 = "d0ac3d7099930278da265c1f4fd384e061636834243eb1cf935530bdf66d541d"; + sha256 = "07aldpvbsc2mjg7v2gi46il66qg0hk9ly7sw4vd7h0lkk5q3vb6h"; libraryHaskellDepends = [ base exceptions free mmorph monad-control mtl pipes semigroups transformers transformers-base transformers-compat @@ -89494,7 +95499,7 @@ self: { mkDerivation { pname = "hiernotify"; version = "2011.4.12"; - sha256 = "05628dad56d84d198acb15d7c903d55b76af9ff31abf7d3cf1c932b04ce4afc6"; + sha256 = "1imgwi6b0cn9y4y7vgqsyfgsyxjvsl1wkmqmrf51jkfqasnqsqh5"; libraryHaskellDepends = [ base directory filepath mtl old-time stm timers-updatable ]; @@ -89510,8 +95515,8 @@ self: { }: mkDerivation { pname = "hifi"; - version = "0.1.0.0"; - sha256 = "6afe6184c86e888a56452a1593830d8fb9514a74d943d9abec7fbc4164fe20de"; + version = "0.1.2.0"; + sha256 = "0zhraby44j5zjrvjmqj22sa15qsl5jxhfs07gkggc8zfahvg822d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89520,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; }) {}; @@ -89530,7 +95535,7 @@ self: { mkDerivation { pname = "highWaterMark"; version = "0.1.1"; - sha256 = "37858277dac56c5befdd854cba392ed69969b0e9f903773d2500b8bc7f869baf"; + sha256 = "1bwvhrzvrf004lypf0zrx6q6k6fn5qwvlk45vppmnv65v9vq519p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ghc ]; @@ -89548,7 +95553,7 @@ self: { mkDerivation { pname = "higher-leveldb"; version = "0.4.0.0"; - sha256 = "6d671cba2f5cd85c350e5ac847688faf955004aa980922c68c0249b012bfcc84"; + sha256 = "116cpw9b0j82ik3242cqm82515dgixl4gj2s1qsmrn2w5yx1qrvd"; libraryHaskellDepends = [ base bytestring cereal data-default exceptions leveldb-haskell lifted-base monad-control mtl resourcet transformers @@ -89569,9 +95574,9 @@ self: { mkDerivation { pname = "higherorder"; version = "0.0"; - sha256 = "5fc7ed69f3b128fee776837270358f77c82693bf951b9e36d1d75325d3849819"; + sha256 = "06cqhk9jalyps4v9w6wmpy9jdj3piwsp0wl3fvkzwa5iydlyvisz"; revision = "1"; - editedCabalFile = "c587250ea9c4828876f3837e82e5b1543e0dc2cc59bb4ec59ce0d947bae3d459"; + editedCabalFile = "0nflwfx4gng0kk2lxfsrrk10sgjln7jq4zl3ydv8i0n4m472b1y5"; libraryHaskellDepends = [ base ]; description = "Some higher order functions for Bool and []"; license = stdenv.lib.licenses.bsd3; @@ -89585,7 +95590,7 @@ self: { mkDerivation { pname = "highjson"; version = "0.4.0.0"; - sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962"; + sha256 = "0qk9l84arc1qhagjmvna7l69s196ndhbs8ndxngdb7dx3bnhbsy3"; libraryHaskellDepends = [ aeson base hvect lens text ]; testHaskellDepends = [ aeson base hspec lens QuickCheck text ]; benchmarkHaskellDepends = [ @@ -89604,7 +95609,7 @@ self: { mkDerivation { pname = "highjson-swagger"; version = "0.4.0.0"; - sha256 = "2df02d2fd764fd5386094de59e181314ba152bd87dc2905d9869fefd4cb87e1f"; + sha256 = "07vyp16gvzk9k1fr1hkxv0mibfhl2cc9xrad16357zb4swpjvw1d"; libraryHaskellDepends = [ base highjson hvect insert-ordered-containers lens swagger2 text ]; @@ -89625,7 +95630,7 @@ self: { mkDerivation { pname = "highjson-th"; version = "0.4.0.0"; - sha256 = "f30c4937a9db6eb1cea8b9efef76855af3b4745e3a620798681b8cf3c73202c5"; + sha256 = "1i826b3z730vd2c0fqisbrsb9wsshmvfzvxrm37b2vnvm4vlj37k"; libraryHaskellDepends = [ aeson base highjson highjson-swagger swagger2 template-haskell text ]; @@ -89639,13 +95644,45 @@ 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 }: mkDerivation { pname = "highlight-versions"; version = "0.1.3.6"; - sha256 = "7b752972d159fd1ef0458b310830ada06db3190716e44053110b3a46584fb3fd"; + sha256 = "1zdk9xc4cfhb259l1r0n0wcv6vd0mlq0hccb8pq1xzars5r2jxbv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89662,7 +95699,7 @@ self: { mkDerivation { pname = "highlighter"; version = "0.2.2"; - sha256 = "3d88a570d7e682cab28652ebc585a790a9e061c5be1d998573e23dd19e0d68f4"; + sha256 = "1x381ngd2gg2ff2rj7dyqmhy1achly2wbssjhsrcm0p6sxqab21x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89679,7 +95716,7 @@ self: { mkDerivation { pname = "highlighter2"; version = "0.2.5"; - sha256 = "917718f0633c61184c5f768a817002bb8c8138759c846d245e1ea62862ffcdbe"; + sha256 = "1gndzxi2i9hybqj6v14wflw8335v09q832knbx61hq9wcgq1hxwi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89697,7 +95734,7 @@ self: { mkDerivation { pname = "highlighting-kate"; version = "0.6.4"; - sha256 = "d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf"; + sha256 = "1bqv00gfmrsf0jjr4qf3lhshvfkyzmhbi3pjb6mafbnsyn2k7f6q"; configureFlags = [ "-fpcre-light" ]; isLibrary = true; isExecutable = true; @@ -89719,8 +95756,8 @@ self: { }: mkDerivation { pname = "hills"; - version = "0.1.2.4"; - sha256 = "d886279bb0c6fe69be9e9d3e520e3ff70fee99eeca7b517c69c4ffa706555643"; + version = "0.1.2.5"; + sha256 = "02zmjc056phi8xcdx8i86xms5204q1zkcg9c5dbd8phm11a5n3iz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89739,7 +95776,7 @@ self: { mkDerivation { pname = "himerge"; version = "0.20"; - sha256 = "0050ccd646e67c3c0cc95b773d0700654c0a99b76a64bf8f65fce3ea79a17947"; + sha256 = "0ivrl5wymqzwcn7vyr3anychlk35003ksxsvr463qz768vbcql00"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89759,7 +95796,7 @@ self: { mkDerivation { pname = "himg"; version = "0.1.0.0"; - sha256 = "23016aa72e85101e10aa336491f92b43cbb27e048d05d6fbd17a58674c4aca27"; + sha256 = "09ya9966fn3ss7xxc1cd0izb5js35gwr2r1km881w4455sknl093"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89783,7 +95820,7 @@ self: { mkDerivation { pname = "himpy"; version = "0.5.0"; - sha256 = "2f62c7cd9a0532d42e33bca6fedab7167bf76249dc2d0d6b3451210cd3deef66"; + sha256 = "0rpgvv9hq8ai6imhsbfw95igfyqnnzdgx9mw6cpd8ch5kb6wfqig"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89805,8 +95842,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.2.2"; - sha256 = "1fc9a92a501552b17219a13fd691e380cc2e2bbf4d768788f13b47639ff4237d"; + version = "5.2.3"; + sha256 = "1wjcgkgqcvr1q0b7dckhg12ai6zgmvvnv2b3zgfkyqy1h9qhj7wk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89826,7 +95863,7 @@ self: { base bytestring criterion deepseq directory exceptions ghc-prim haskell-src-exts utf8-string ]; - homepage = "http://www.github.com/chrisdone/hindent"; + homepage = "https://github.com/commercialhaskell/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -89838,7 +95875,7 @@ self: { mkDerivation { pname = "hindley-milner"; version = "0.1.0.0"; - sha256 = "d29f6fd4871c953fa016dd8cb8dadcf0ed0535947bb8e89c8acb12a78d6964ac"; + sha256 = "1b34d66sf4nbiaffif3vjhshbvghvkdbi36x2sh3z58whza6z7yj"; libraryHaskellDepends = [ base containers data-fix mtl transformers ]; @@ -89855,7 +95892,7 @@ self: { mkDerivation { pname = "hinduce-associations-apriori"; version = "0.0.0.0"; - sha256 = "ff14ddaf10b064975fe10c60adecc71d27c4f43c36e45c7878dbd7dcab504c00"; + sha256 = "002ca2mxrmyvg1w5rr1n7ksc89qxqznasq0cw5grfr5h22pxs57z"; libraryHaskellDepends = [ base containers deepseq hinduce-missingh parallel vector ]; @@ -89869,7 +95906,7 @@ self: { mkDerivation { pname = "hinduce-classifier"; version = "0.0.0.1"; - sha256 = "ea536f4e5b111f1e97dccdcfa74d67603dd115f6b3d5aa69145edfd94d48bdb1"; + sha256 = "1cdx916xkpsy2ilsmmdkyqax2gb0cx6sgkydvjbiw7qibd76ylza"; libraryHaskellDepends = [ base hinduce-missingh layout ]; description = "Interface and utilities for classifiers"; license = stdenv.lib.licenses.bsd3; @@ -89882,7 +95919,7 @@ self: { mkDerivation { pname = "hinduce-classifier-decisiontree"; version = "0.0.0.1"; - sha256 = "b4c5a4e9c14e47f02f3d5afc05c7ae5369aab77c6a427664615ef8bb1625bfc1"; + sha256 = "1hdz4lbbpy2yc5j7chkagjvslsakmv3hbz2s7lpz0isfq7ls9idl"; libraryHaskellDepends = [ base convertible hinduce-classifier hinduce-missingh layout ]; @@ -89898,7 +95935,7 @@ self: { mkDerivation { pname = "hinduce-examples"; version = "0.0.0.2"; - sha256 = "9c2c064171367a992efe5ac535700bd1275ec1e49422d016f6ab441911cb569e"; + sha256 = "17jnrc8iji5byqbd08llwk0mw9yi1dq3biaszqp9jyinf50hcb4w"; libraryHaskellDepends = [ base containers convertible csv hinduce-associations-apriori hinduce-classifier hinduce-classifier-decisiontree hinduce-missingh @@ -89913,7 +95950,7 @@ self: { mkDerivation { pname = "hinduce-missingh"; version = "0.0.0.0"; - sha256 = "3f49b5de2e40a348642a941135ae4796d75569afc3a374628b986f88d1770698"; + sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/roberth/hinduce-missingh"; description = "Utility functions"; @@ -89925,7 +95962,7 @@ self: { mkDerivation { pname = "hinotify"; version = "0.3.9"; - sha256 = "f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99"; + sha256 = "16fzql0s34my9k1ib4rdjf9fhhijkmmbrvi148f865m51160wj7j"; libraryHaskellDepends = [ async base containers directory unix ]; testHaskellDepends = [ base directory ]; homepage = "https://github.com/kolmodin/hinotify.git"; @@ -89940,7 +95977,7 @@ self: { mkDerivation { pname = "hinotify-bytestring"; version = "0.3.8.1"; - sha256 = "f67eacc194a427d48358fc63c5a896fdadbe996f15e55f423f6a9148204eac7b"; + sha256 = "0yxc9qh4i4ba7x15zr8mdycvxbgxjslcaqzwb21x89x4jk0sqzpn"; libraryHaskellDepends = [ base bytestring containers directory unix ]; @@ -89959,7 +95996,7 @@ self: { mkDerivation { pname = "hinquire"; version = "0.1.1"; - sha256 = "a187676d2e93a17fa003b05612ab28aa49fa077b4b0a5d969d7162e143c4a0d6"; + sha256 = "1mm0qi1y2qkiknb5s2jbgc3zljda52mi4mmh0fh7z8ck5rnng1x1"; libraryHaskellDepends = [ base bifunctors QuickCheck test-framework test-framework-quickcheck2 test-framework-th @@ -89981,7 +96018,7 @@ self: { mkDerivation { pname = "hinstaller"; version = "2008.2.16"; - sha256 = "0c5172fb5b64d7c3d9a2908c9cb0936e7a2a606e20fa6e8ebc361e8e52c7aed1"; + sha256 = "1ldfqx98w7inpj76xyi0drh2lykfjfq9r34hlbcw7mv4bgxp4l8c"; libraryHaskellDepends = [ base bytestring Cabal directory filepath process template-haskell ]; @@ -89998,7 +96035,7 @@ self: { mkDerivation { pname = "hint"; version = "0.6.0"; - sha256 = "dc3d3a0ede8e03265bc93456d10cea93fbc4fe8e445e80b7abea71a484421ab9"; + sha256 = "1f8s8a2a8wgamfvq0pj4ivzc9ywkx86d2milr5djc0wfvq73lgfw"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-paths mtl random unix ]; @@ -90010,13 +96047,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_7_0" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-paths, HUnit, mtl, random, unix + }: + mkDerivation { + pname = "hint"; + version = "0.7.0"; + sha256 = "0mc17qdq0wb57zgh755viwcnby2jkmyv9r7fvq5jwsxx91c776i9"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-paths mtl random unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit + ]; + homepage = "https://github.com/mvdan/hint"; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: mkDerivation { pname = "hint-server"; version = "1.4.3"; - sha256 = "fecb7fd63ff216054ba1a6569b85757ae6227ce6aa2b0b55ea1c35a54a45ffdd"; + sha256 = "1pgz8m5aad8wx9ahnaxawry25rksfn2rnmm6l55ha5pj7zb7zjzy"; libraryHaskellDepends = [ base eprocess exceptions hint monad-loops mtl ]; @@ -90034,8 +96091,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.5.0.1"; - sha256 = "0c25984c5713318e00990d0a787fb3d788fe0211273d1f7901a8d590b4d3a700"; + version = "0.5.0.2"; + sha256 = "1ib8wnpkd8ng6w0wb8hhn1122rqdq4q961b10rvw4jl6bfzkwasb"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite exceptions lifted-async lifted-base memory monad-control monad-logger mtl @@ -90057,7 +96114,7 @@ self: { mkDerivation { pname = "hinvaders"; version = "0.1"; - sha256 = "108430a374bb8b3dee663726bb57a16cd121d3fe96352d051f77cd13d9d76507"; + sha256 = "01v5szci7kbp3w2jsdcnzv9j3lbcl5bvn9ipcvp3v2xvfjik110h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 random ]; @@ -90072,7 +96129,7 @@ self: { mkDerivation { pname = "hinze-streams"; version = "1.0"; - sha256 = "58b37e10f96dfa63abe32cbacada854aa850856f0ee3b9fc1736a9a11997f28c"; + sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq"; libraryHaskellDepends = [ base haskell98 Stream ]; homepage = "http://code.haskell.org/~dons/code/hinze-streams"; description = "Streams and Unique Fixed Points"; @@ -90088,15 +96145,15 @@ self: { }: mkDerivation { pname = "hip"; - version = "1.5.2.0"; - sha256 = "4f5eecf455df1d5a0a577abfefd48e519be8f57f9c47ca2edf31dc0982b7dc46"; + version = "1.5.3.0"; + sha256 = "07jgqz5dz8qk96xz0q92hpn172jaqivfmn0mrynhicmvkx7a7izr"; libraryHaskellDepends = [ base bytestring Chart Chart-diagrams colour deepseq directory filepath JuicyPixels netpbm primitive process repa temporary vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ - base criterion deepseq repa repa-algorithms + base criterion deepseq repa repa-algorithms vector ]; homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; @@ -90114,9 +96171,9 @@ self: { mkDerivation { pname = "hipbot"; version = "0.5"; - sha256 = "1a064b44ee92b6b6554ef5a2304d19ebf59699e896844203685ff326ee4a9e29"; + sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs"; revision = "1"; - editedCabalFile = "6ac1673be45c18dc010eeeef508a021ec9fef4e0a4e05864733f91aec8508ab8"; + editedCabalFile = "1f4aa34ax49zfdj5iq54w3sgxj8y0a551vzf1q0xq62wwhxnghba"; libraryHaskellDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri @@ -90138,7 +96195,7 @@ self: { mkDerivation { pname = "hipchat-hs"; version = "0.0.4"; - sha256 = "6a712f0a4148e80cd0b5eb9c9b1a2165420a6781c72eaa298a1106d77e50c02f"; + sha256 = "0by0a1zdf1hii8lslbn7h5khlhk544d9p77bnp80rs288452ywba"; libraryHaskellDepends = [ aeson aeson-casing async base bytestring either http-client lens network-uri postgresql-simple servant servant-client split @@ -90155,7 +96212,7 @@ self: { mkDerivation { pname = "hipe"; version = "0.2.0.0"; - sha256 = "5095bcdbddb5de034d75ac12e783a4684454792e7c371bd4a23deebcebe70af9"; + sha256 = "1y8awzmvrvixlba1ndvw5rwm8i38lj1yf4mcfm6h7pmmvpdvr5ah"; libraryHaskellDepends = [ base containers hgeometry hxt parsec split text text-format ]; @@ -90170,7 +96227,7 @@ self: { mkDerivation { pname = "hips"; version = "0.1"; - sha256 = "79d73cda138038529f1aefb414685b2b298c236257720fb7e2b35db8d48a7954"; + sha256 = "0m3ribabhpdkwavhywjpc8iqqa9bbdl19d7g3agm4f402gd3rmvr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90188,7 +96245,7 @@ self: { mkDerivation { pname = "hircules"; version = "0.4.1"; - sha256 = "1d9f0ff9c4596d128df8502b5fdb3c0903257a17bd9ef7b41508b011470d49c4"; + sha256 = "1i291m3i3c082nsgg7mx2xx2a0q97kdmyashz26i4varqkwhz7qx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90208,7 +96265,7 @@ self: { mkDerivation { pname = "hirt"; version = "0.0.1.1"; - sha256 = "1b14b4f4d8618afb4c734e2bda2f649edd31cddcca65929d7811f427e9239669"; + sha256 = "0scn4gljgx0ig2fr4rfavk6k3pcychpxlasffd6gp2k1v3sb850v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90229,7 +96286,7 @@ self: { mkDerivation { pname = "hissmetrics"; version = "0.5.1"; - sha256 = "cd3068da1f8892d9b3f409c0681164088db12535a3191ba4acf06bf26cf7e0e7"; + sha256 = "1rz0yxng4szhmjj1n6d36ljv3388ch8nih09yjrxk4l83zd6hc6d"; libraryHaskellDepends = [ base bytestring conduit http-conduit http-types text time ]; @@ -90247,7 +96304,7 @@ self: { mkDerivation { pname = "hist-pl"; version = "0.3.2"; - sha256 = "eb78b24aad7e2e7c480dff146819ed70af797e129cccf3d966d08b41dc988605"; + sha256 = "01c6k3f432yhcvcz7k4w29z7kbvhxlcnh57z1m47qbkymm5b4y7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90270,7 +96327,7 @@ self: { mkDerivation { pname = "hist-pl-dawg"; version = "0.2.1"; - sha256 = "4f4225b4edc73b7dbc42f93287b76734138da665d3a633ddafb1191297e210be"; + sha256 = "1ghhwabi46dimzfk79nkcnk8s4rlcyvqfcpr8ay7sfy7xns2ahjg"; libraryHaskellDepends = [ base binary containers dawg text text-binary ]; @@ -90286,7 +96343,7 @@ self: { mkDerivation { pname = "hist-pl-fusion"; version = "0.5.3"; - sha256 = "036b5311881e37b00024ebcce86cfb453ab1827c609b8a01c9a08337384e5547"; + sha256 = "0ism9qw3g0x0r40qm6v0gj1b2fj5zdnfik7b4h0b0dqyi08m6sq3"; libraryHaskellDepends = [ base binary containers dawg hist-pl-dawg hist-pl-lexicon polimorf text text-binary @@ -90304,7 +96361,7 @@ self: { mkDerivation { pname = "hist-pl-lexicon"; version = "0.6.1"; - sha256 = "1333640e60d59980e2a38d81daa70c04edd23c4c55787175350513428b0a58ad"; + sha256 = "1baq1a5l44q56msp2y2m9hyd5v841jkxm0cdlgi816fmc0768cqk"; libraryHaskellDepends = [ base binary containers dawg directory filepath hist-pl-dawg hist-pl-types pipes text transformers @@ -90320,7 +96377,7 @@ self: { mkDerivation { pname = "hist-pl-lmf"; version = "0.1.0"; - sha256 = "75f33f9ff5c5fd29d37f11eeacbc0d6ff7a58879ee70b6190f13bde84af8db90"; + sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm"; libraryHaskellDepends = [ base hist-pl-types polysoup text ]; homepage = "https://github.com/kawu/hist-pl/tree/master/lmf"; description = "LMF parsing for the historical dictionary of Polish"; @@ -90333,7 +96390,7 @@ self: { mkDerivation { pname = "hist-pl-transliter"; version = "0.1.1"; - sha256 = "2b6f88a11e6802e452ad43293dad326f068e6476aebacb9e5610a863a0e7de90"; + sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb"; libraryHaskellDepends = [ base parsec ]; homepage = "https://github.com/kawu/hist-pl/tree/master/transliter"; description = "A simple EDSL for transliteration rules"; @@ -90345,7 +96402,7 @@ self: { mkDerivation { pname = "hist-pl-types"; version = "0.1.0"; - sha256 = "3bd142adc913d4c3dfe095abe6ff48722fab5e8c7e23c2c7045771d683542344"; + sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v"; libraryHaskellDepends = [ base binary text text-binary ]; homepage = "https://github.com/kawu/hist-pl/tree/master/types"; description = "Types in the historical dictionary of Polish"; @@ -90360,7 +96417,7 @@ self: { mkDerivation { pname = "histogram-fill"; version = "0.8.5.0"; - sha256 = "fbdd167d6f27c0d88f9aa8647ae95a313101c63a827275ac8d016d6028975133"; + sha256 = "0csijwl60v81inn7awl27b302c9ibblplr58ka7xih17dxyidpgv"; libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; benchmarkHaskellDepends = [ base criterion mwc-random vector ]; homepage = "https://github.com/Shimuuar/histogram-fill/"; @@ -90373,7 +96430,7 @@ self: { mkDerivation { pname = "histogram-fill-binary"; version = "0.8.5.0"; - sha256 = "1eefe685953e205c8dfb9003f56e28bd17b673c0e6bd5455bb59d9a50b6b7b36"; + sha256 = "0dkvdc5sbnarpdam9gg6q1rvc5xx51pga0whzf6mq81yjn2ydvqy"; libraryHaskellDepends = [ base binary histogram-fill vector ]; homepage = "https://github.com/Shimuuar/histogram-fill/"; description = "Binary instances for histogram-fill package"; @@ -90385,7 +96442,7 @@ self: { mkDerivation { pname = "histogram-fill-cereal"; version = "0.8.5.0"; - sha256 = "38e36d11e6de32b2fd955a66961bfca4f81711e139cee680264c5c76962952cd"; + sha256 = "1kaj56b7cp2c4s0fdkirw48igy54zhdrcrjsjpyv4cnywq8nvqrq"; libraryHaskellDepends = [ base cereal histogram-fill vector ]; homepage = "https://github.com/Shimuuar/histogram-fill/"; description = "Binary instances for histogram-fill package"; @@ -90399,7 +96456,7 @@ self: { mkDerivation { pname = "historian"; version = "0.0.1"; - sha256 = "268b006916b1d4bcfc5090d47c2b5ae677f8c2e10c1be47f24538a04b095ead1"; + sha256 = "1lgajnq092jk4izy86qcw71ghxz6b8mprm4ha3ybrm5i2rlh12r6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90419,7 +96476,7 @@ self: { mkDerivation { pname = "hit"; version = "0.6.3"; - sha256 = "db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471"; + sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90442,7 +96499,7 @@ self: { mkDerivation { pname = "hit-graph"; version = "0.1"; - sha256 = "90f144bb07dae291346186d7f10a697038176be3692b6d19abc60511cca32272"; + sha256 = "0wi2lg6121f6mccnsav9wdmiff3hd45g3mw6c4s93qns0yxl9wch"; libraryHaskellDepends = [ base containers fgl hashable hit transformers unordered-containers ]; @@ -90458,7 +96515,7 @@ self: { mkDerivation { pname = "hjcase"; version = "0.2.0.0"; - sha256 = "53c2db8dd460ad2b49eeb5df1b5e0a27e5ae92573c785886914d4c2c89583734"; + sha256 = "0d1pb24jqk2dj635hy1way9axr9719g1ppxmxr4jpbb0sj6xphjk"; libraryHaskellDepends = [ aeson base bytestring HUnit test-framework test-framework-hunit text unordered-containers vector @@ -90474,7 +96531,7 @@ self: { mkDerivation { pname = "hjpath"; version = "3.0.1"; - sha256 = "12aa694ac8f1ef4bd26e46504c183fee2f3087b5f85365bb07f9602222efbf72"; + sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj"; libraryHaskellDepends = [ base containers hjson parsec ]; homepage = "http://bitcheese.net/wiki/code/hjpath"; description = "XPath-like syntax for querying JSON"; @@ -90488,7 +96545,7 @@ self: { mkDerivation { pname = "hjs"; version = "0.2.1"; - sha256 = "117e44a03323603941365c80830d04da85a46a90d9fa0321ea82cdd575ac643e"; + sha256 = "0gk4misxbkc2x8hh7ynrj1ma91fs0h6q702w6r0kjq136fh48zhi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90507,7 +96564,7 @@ self: { mkDerivation { pname = "hjsmin"; version = "0.2.0.2"; - sha256 = "bec153d2396962c63998eb12d0a2c7c9f7df6f774cb00e41b6cdb1f5a4905484"; + sha256 = "112lj2jgbcfdnr0hxc2cfxpxzxy9qyid04pbk0wwcqk977957hdy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90527,7 +96584,7 @@ self: { mkDerivation { pname = "hjson"; version = "1.3.2"; - sha256 = "684699c938131f1e394b90546e8bbe1249a3eebfe7b5a6a96b544b7c7d79a9e4"; + sha256 = "1r59g5ypqjsldflsddg7pzpa6j8jps5nwm4h9cwiw7qk734rjik8"; libraryHaskellDepends = [ base containers parsec ]; description = "JSON parsing library"; license = stdenv.lib.licenses.bsd3; @@ -90538,7 +96595,7 @@ self: { mkDerivation { pname = "hjson-query"; version = "1.0.2"; - sha256 = "9d56f4ef84397f490c444e292e0edebbb750feb57216970e4818fc5b6a36486a"; + sha256 = "0sj86rm5pz0q9079f5kjnpz51dxvvq72waaf8h64jzrrhkpz8mlx"; libraryHaskellDepends = [ base containers hjson ]; description = "library for querying from JSON"; license = stdenv.lib.licenses.bsd3; @@ -90550,8 +96607,8 @@ self: { }: mkDerivation { pname = "hjsonpointer"; - version = "1.1.0.2"; - sha256 = "fe6826b2ede3ce7541e5c88bda78dd66cc76725f14b06533bb5ecadddcb2cc65"; + version = "1.1.1"; + sha256 = "0pqdhi36xb4sj25kgrn77rnawg6bzk6snslwyr8nfgfg43j0vcg3"; libraryHaskellDepends = [ aeson base hashable QuickCheck semigroups text unordered-containers vector @@ -90565,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 @@ -90575,7 +96656,7 @@ self: { mkDerivation { pname = "hjsonschema"; version = "1.5.0.1"; - sha256 = "1ac15c8f32621c50fa4b445a0f17ac7a58dc716867aed4f6e1bb7478d0e288a3"; + sha256 = "18w8wb87hx5vw7vd9bk7d1qxqn3smhbhynj49gx507326a7mrh8s"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -90592,12 +96673,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "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 + , QuickCheck, scientific, semigroups, text, unordered-containers + , vector, wai-app-static, warp + }: + mkDerivation { + pname = "hjsonschema"; + version = "1.6.3"; + sha256 = "1phvxkwqxzsi7jzxs4z2zsak7hsgfqvld7m95jk1a0qysxf9gzx3"; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed filepath hashable + hjsonpointer http-client http-types pcre-heavy profunctors + protolude QuickCheck scientific semigroups text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring directory filepath hjsonpointer hspec + profunctors protolude QuickCheck semigroups text + unordered-containers vector wai-app-static warp + ]; + homepage = "https://github.com/seagreen/hjsonschema"; + description = "JSON Schema library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hkdf" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }: mkDerivation { pname = "hkdf"; version = "0.0.1.1"; - sha256 = "5a1a00abb49577abed25c76b75592ab3bbffe696b1b5884af5d0ea35b8cb7463"; + sha256 = "0qvlrfw3bsnhym58iddijvkgzfxk59cpasy74pnsnxwmnjmh06js"; libraryHaskellDepends = [ base byteable bytestring cryptohash ]; testHaskellDepends = [ base byteable bytestring cryptohash hspec ]; homepage = "http://github.com/j1r1k/hkdf"; @@ -90613,7 +96722,7 @@ self: { mkDerivation { pname = "hlatex"; version = "0.3.1"; - sha256 = "1ea8a1097244818b694afd3f71aa2e56e8873b3019d3dcc973885be491a28d8e"; + sha256 = "13ldla8y8nw8fg4xrlqr60xqgs2n5sm72gzx99lqp0a4f84s3a0y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90632,7 +96741,7 @@ self: { mkDerivation { pname = "hlbfgsb"; version = "0.0.1.0"; - sha256 = "bd19cedef0448d9360136b256ca1aeac5b97804bc48129e233f997b8722a5959"; + sha256 = "0nar59rbi5zr6gi2k0f49f09fnxcmshnq9bb2dh973a4y3gcw6dx"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ gfortran ]; libraryToolDepends = [ gfortran ]; @@ -90652,7 +96761,7 @@ self: { mkDerivation { pname = "hlcm"; version = "0.2.2"; - sha256 = "ca9883b6be64d7c82748f530d33d9ae9e37c5912aada28444c4c5c370560d893"; + sha256 = "14yqc02kfp2c9i22inma29cprqz9k8yx6c7m90kwimv4psv8766a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90674,7 +96783,7 @@ self: { mkDerivation { pname = "hleap"; version = "0.1.2.7"; - sha256 = "4e539d4ed4ad9777c464639cfecb9a897dabf89fff0e9c80539fff96cce3eee2"; + sha256 = "1qpfwg69dzwzaf09q3pzkzwanzc9kb5zx733ck27g5xdsi79slsf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90692,51 +96801,52 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers - , criterion, csv, data-default, directory, file-embed, filepath - , hashable, haskeline, 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.1"; - sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5"; - revision = "1"; - editedCabalFile = "d33edead74698ee1e7f3e5f167bfd8e32664d520df69092f5ac48f0816939aaf"; + 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 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 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 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 - 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"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -90748,8 +96858,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.1"; - sha256 = "182b8bdaf2b4b7d621a8570f0fa81a34de4f34f1a41f8dca6d60c05dd5701b1c"; + version = "1.3"; + sha256 = "0kl0sc11181bgpz65b5xg9l1hxdaai27icx13x15kwlc01jf9rcc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90759,7 +96869,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -90770,7 +96880,7 @@ self: { mkDerivation { pname = "hledger-chart"; version = "0.16.1"; - sha256 = "96a91cb36df98f7c43805c7dea6ec0e65115a8945ff5ddf043294731c03065fa"; + sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90787,15 +96897,15 @@ self: { ({ mkDerivation, base, hledger-lib, text, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.7"; - sha256 = "54ff8674369de54eeb6e62a7a11c9e98c2c4c32730f48d2e714bc304417df6f4"; + version = "0.2.0.9"; + sha256 = "0ajjiz6jvm45j472f0ypxk33hc47rg0zs9ylkcrkvvk9992x7lnq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ gebner peti ]; + maintainers = with stdenv.lib.maintainers; [ gebner ]; }) {}; "hledger-iadd" = callPackage @@ -90806,8 +96916,10 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.2"; - sha256 = "7ec0817c2c9c20c05c6496eca6264124139e7575e452ada5b1fd225c97533083"; + version = "1.2.2"; + sha256 = "1d12fjqyrj0wy8iq096h8mq2v76j8ihc2d8j1xc5qckw2g29539a"; + revision = "3"; + editedCabalFile = "12ghp6d74iyd7h4hjnar7gfz3nal4f9z9lv8rwr5hy8a9xsinbfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90835,7 +96947,7 @@ self: { mkDerivation { pname = "hledger-interest"; version = "1.5.1"; - sha256 = "0a02354f4e8d53e75817e05b140c4760220ac4e414fbf9772abe4f20a9f90da6"; + sha256 = "19hdz6lj0kxy59vzkyqlwk20l8k08w618nz02xcfflwd9r7ka0ha"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90853,8 +96965,8 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.10"; - sha256 = "98106ff70769503a8056da205dcca59bc8b1fd6b2a9e1e47c56c90a4f373add4"; + version = "0.1.1.11"; + sha256 = "1rxpv70xfr7z8yn65dcac1a7l4mb2p1z30ld4bw75gr34lkirb1y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90862,42 +96974,39 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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, parsers, pretty-show - , regex-tdfa, safe, semigroups, split, system-filepath - , test-framework, test-framework-hunit, text, time, transformers - , trifecta, 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.1"; - sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556"; - revision = "1"; - editedCabalFile = "cf72c68e9c71bc059e7ea98e764837e649ec9ecda073ac936e5fb71e06115724"; + 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 parsers pretty-show - regex-tdfa safe semigroups split system-filepath text time - transformers trifecta 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 parsers - pretty-show regex-tdfa safe split system-filepath test-framework - test-framework-hunit text time transformers trifecta uglymemo - utf8-string + 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"; description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "hledger-ui" = callPackage @@ -90909,10 +97018,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.1.2"; - sha256 = "5cc85502297f3ccf31990ebbe60178ee9f90ea434e86756f39e2848f0ae788d1"; - revision = "2"; - editedCabalFile = "b8f09f1a5411bec106f6f507a5d71eea67685f6271c716e390b4f6513c7acddd"; + version = "1.3"; + sha256 = "0bixkihc2hcf98xpnb9a8lnqi5rcg2pj6d78w4pzwzd83vkmr1rj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90923,7 +97030,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -90934,7 +97041,7 @@ self: { mkDerivation { pname = "hledger-vty"; version = "0.16.1"; - sha256 = "0805483dd2369b68b55628ffb87c43b691e1e1e44041ebf7fed99adfaf4a5881"; + sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90957,10 +97064,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.1"; - sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca"; - revision = "1"; - editedCabalFile = "fbc15617f161701111b55e6d19f2fa0b4bac297c0db23194ca5c5d9d87a8301d"; + version = "1.3"; + sha256 = "01y8djakr4r0jm5wyi6fbp911y3i82r1xmfi4gm9sgf27fi6a3i4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90989,7 +97094,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -90999,7 +97104,7 @@ self: { mkDerivation { pname = "hlibBladeRF"; version = "0.1.0.6"; - sha256 = "bc663bf05dd04294b24810a3e9991b0769190899f4849195697412e09d2a6196"; + sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw"; libraryHaskellDepends = [ base bindings-DSL bytestring ]; libraryPkgconfigDepends = [ libbladeRF ]; testHaskellDepends = [ base hlint ]; @@ -91014,7 +97119,7 @@ self: { mkDerivation { pname = "hlibev"; version = "0.4.0"; - sha256 = "dc37dafa42fad03228f353eaa0cda8d57eaf2f8c2558c3de29d2425526e02610"; + sha256 = "0416w0k5ahnj57gc6n15ihpsyznmm36s1sjkycl35l7s8bxdldyw"; libraryHaskellDepends = [ base network ]; librarySystemDepends = [ ev ]; homepage = "http://github.com/aycanirican/hlibev"; @@ -91028,7 +97133,7 @@ self: { mkDerivation { pname = "hlibfam"; version = "0.2"; - sha256 = "cd87f9f3f9718e00643b311f7e3cee1a8347003598a125e7d0b8de2bb0e33d83"; + sha256 = "10rxwfq2ppmqs3kjb8cq6l04g0qsxqy7w7ri7dj013kiz7rzk1yd"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ fam ]; description = "FFI interface to libFAM"; @@ -91041,7 +97146,7 @@ self: { mkDerivation { pname = "hlibgit2"; version = "0.18.0.16"; - sha256 = "199e4027faafe0a39d18ca3168923d44c57b386b960c72398df1c0fb7eff8e5e"; + sha256 = "0plfzxzgph7iilwp434ndcw7pia47n96hcfa32fs7q5gz8kl17hr"; libraryHaskellDepends = [ base bindings-DSL zlib ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base process ]; @@ -91051,18 +97156,20 @@ self: { }) {inherit (pkgs) git; inherit (pkgs) openssl;}; "hlibsass" = callPackage - ({ mkDerivation, base, hspec, libsass }: + ({ mkDerivation, base, Cabal, directory, hspec, libsass }: mkDerivation { pname = "hlibsass"; - version = "0.1.5.0"; - sha256 = "ce3e9a15d01c1b61d41b03e9b05ecd9b4b9aaf6da7d591086181b74e18d25bb8"; + version = "0.1.6.0"; + sha256 = "1plw99ri6xnrjdgrbmwzrw0hdr2m0f38zwr6yagigqfq2b72d21x"; configureFlags = [ "-fexternallibsass" ]; + setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsass ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/jakubfijalkowski/hlibsass"; description = "Low-level bindings to Libsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsass;}; "hlint" = callPackage @@ -91073,7 +97180,7 @@ self: { mkDerivation { pname = "hlint"; version = "1.9.41"; - sha256 = "2d9299f7952af44b2f06a67af917859fd51e1056c7d405f0930769ea1e093fb4"; + sha256 = "1d1z14gfls87jgq0bm67aq81xmczhlbzjym60qplpx1ajpvrk4id"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91087,12 +97194,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlint_2_0_9" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, directory, extra, filepath, haskell-src-exts + , hscolour, process, refact, text, transformers, uniplate + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "2.0.9"; + sha256 = "1bd5nizx1dbzhrfcr9mgpjvg4b6f6z73jvslkbialp7g9pkr6a95"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmdargs containers cpphs directory + extra filepath haskell-src-exts hscolour process refact text + transformers uniplate unordered-containers vector yaml + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/hlint#readme"; + description = "Source code suggestions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { pname = "hlogger"; version = "0.0.3.0"; - sha256 = "8ed88ca5ef4e0c0997f468ada7c80cc608912da6306d87f9d914f4e3bbd572e0"; + sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f"; libraryHaskellDepends = [ base old-locale time ]; homepage = "http://www.pontarius.org/sub-projects/hlogger/"; description = "Simple, concurrent, extendable and easy-to-use logging library"; @@ -91107,7 +97238,7 @@ self: { mkDerivation { pname = "hlongurl"; version = "0.9.3"; - sha256 = "65d3cbcdb1de5f90358bd314b7fb11929aadf95f63e409df035efe24373b52da"; + sha256 = "1njj7cvj9zjy0gghkr33bzwsv6lj27xvf56kicsr0pyyn76wplv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base curl json ]; @@ -91123,7 +97254,7 @@ self: { mkDerivation { pname = "hls"; version = "0.15"; - sha256 = "d4a423f6817c9a6a6bdf4afa5ac24279cfaeb0ddb25db71343bd4f6cb7776240"; + sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l"; libraryHaskellDepends = [ base containers hcg-minus hps ]; homepage = "http://rd.slavepianos.org/t/hls"; description = "Haskell Lindenmayer Systems"; @@ -91135,9 +97266,9 @@ self: { mkDerivation { pname = "hlwm"; version = "0.1.0.2"; - sha256 = "8370a8e6d386a8342d9c4a683b3c085890ee092e95549737ccf26b4fc62fba8d"; + sha256 = "13ds5z34yszjrhvrfm4m5q4yx42q10y3ns2akhnk9a46sgkahw43"; revision = "1"; - editedCabalFile = "5375f1b11a455cfd90aeedf16499c79fc541857e7c73d4bdb41a704f2a561283"; + editedCabalFile = "10qjaqm4yw0snjyx8wvwgs2l3iczqycn9wgdms8gsp253aqz2xak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base stm transformers unix X11 ]; @@ -91152,7 +97283,7 @@ self: { mkDerivation { pname = "hly"; version = "0.15"; - sha256 = "48c270fbd3ad721fc7563d2ebce4430aba3542d48bc8ae1b6b6ebc34b0fb5aa4"; + sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8"; libraryHaskellDepends = [ base directory filepath hmt process ]; homepage = "http://rd.slavepianos.org/t/hly"; description = "Haskell LilyPond"; @@ -91167,7 +97298,7 @@ self: { mkDerivation { pname = "hmark"; version = "1.2"; - sha256 = "eff5358aedb4e8740f05f72cb198986dad28766b6ddf84598d0cb256166491e8"; + sha256 = "1s4ichb5dchcimcq9pvdddv2ibbdk2cb2b7p0l7p9s5lxn53bxgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91185,7 +97316,7 @@ self: { mkDerivation { pname = "hmarkup"; version = "3000.0.1"; - sha256 = "a210e8e4a58994b1d244f0e64d8a1b8050f0913b81a9e8dcdf2d80159a0cce5c"; + sha256 = "0p6f1jd1b01dvzffiac17f8z0l403f54vrph8k9b3549lpjfh452"; libraryHaskellDepends = [ base containers mtl network parsec xhtml ]; @@ -91201,7 +97332,7 @@ self: { mkDerivation { pname = "hmatrix"; version = "0.18.0.0"; - sha256 = "35766dfb4af7227a881ef1c8b740a9b5c09253f21e23ae295a5341511a913cfe"; + sha256 = "1ziwj4d52hakb8lsw8qyy99r5h5mm50bgj7i3s47l8pp9bxnsxim"; configureFlags = [ "-fopenblas" ]; libraryHaskellDepends = [ array base binary bytestring deepseq random split storable-complex @@ -91219,7 +97350,7 @@ self: { mkDerivation { pname = "hmatrix-banded"; version = "0.0.0.2"; - sha256 = "cb3b825d4eef1813bd1bdf43199c200d254f0d7ad78ff1ad6b0ce3752ed33b32"; + sha256 = "0civscp7bqqcdfnz33ypg86ly98d42f1jhyz3fyi667g9rfq4fyb"; libraryHaskellDepends = [ base hmatrix transformers ]; librarySystemDepends = [ liblapack ]; homepage = "http://hub.darcs.net/thielema/hmatrix-banded/"; @@ -91233,7 +97364,7 @@ self: { mkDerivation { pname = "hmatrix-csv"; version = "0.1.0.2"; - sha256 = "6b5abd3d3c0b4d121006bdfd622989150e0a8c69234c3e63f616579fe8ef7631"; + sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb"; libraryHaskellDepends = [ base bytestring cassava hmatrix vector ]; homepage = "https://github.com/grtlr/hmatrix-csv"; description = "CSV encoding and decoding for hmatrix"; @@ -91245,7 +97376,7 @@ self: { mkDerivation { pname = "hmatrix-glpk"; version = "0.6.0.0"; - sha256 = "c1ca26cf362f5255dc9d399615c683f1fd7de9154f3202468edf6c9c4184af74"; + sha256 = "0x5ghi0rqv6zir304cjg2plpvzgihg31b5irkpf5alig6v7jdjn1"; libraryHaskellDepends = [ base containers hmatrix ]; librarySystemDepends = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; @@ -91260,7 +97391,7 @@ self: { mkDerivation { pname = "hmatrix-gsl"; version = "0.18.0.1"; - sha256 = "fda5c3b067bb2e47fac80995c0722bdbdf9f9320ea8a04fc2eca30f3fea9d455"; + sha256 = "0mflm7zg6c6a5vy092pa429rzpyv5drc1589r3x4fbmvcyqc79gx"; libraryHaskellDepends = [ array base hmatrix process random vector ]; @@ -91277,7 +97408,7 @@ self: { mkDerivation { pname = "hmatrix-gsl-stats"; version = "0.4.1.6"; - sha256 = "1bf5bb87312525256868872a5d51e43d851b75ef549a8834052263171b91cd71"; + sha256 = "0wfdj4difqr20ls8i6jlxxsip19xwi8msal7d1l2a995663vpx8v"; libraryHaskellDepends = [ base binary hmatrix storable-complex vector ]; @@ -91292,7 +97423,7 @@ self: { mkDerivation { pname = "hmatrix-mmap"; version = "0.0.5"; - sha256 = "0df95f0bdfb3baab6ca4982b86617aed503640b8084283038118128e7b70e10f"; + sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d"; libraryHaskellDepends = [ base hmatrix mmap ]; homepage = "http://github.com/alanfalloon/hmatrix-mmap"; description = "Memory map Vector from disk into memory efficiently"; @@ -91305,7 +97436,7 @@ self: { mkDerivation { pname = "hmatrix-nipals"; version = "0.2"; - sha256 = "322bdf452889dbaeccca42e28afb3ebd85bf594da754cdee2a1f43121dbfd529"; + sha256 = "0afmpwfi4hqz5bpcsm579mcvz1dx7vxqmqj2rb6axnw9512xyarj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix ]; @@ -91315,12 +97446,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-nlopt" = callPackage + ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }: + mkDerivation { + pname = "hmatrix-nlopt"; + version = "0.1.0.0"; + sha256 = "12h2svm2x3bc9ivii90f8cr4npwpagchazlmgj36x381aqradsf2"; + libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/peddie/hmatrix-nlopt"; + description = "Interface HMatrix with the NLOPT minimizer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-quadprogpp" = callPackage ({ mkDerivation, base, hmatrix, QuadProgpp, vector }: mkDerivation { pname = "hmatrix-quadprogpp"; version = "0.3.0.1"; - sha256 = "b4a9284ad7af2a6f3e4bb57fa38160b2f4131959ff82f7e2ef74a7bdc753d1d4"; + sha256 = "1m6iag3vv9vlxzigg0pzb4ci7x5jc20s6zxm9cz6yamgsx52iadl"; libraryHaskellDepends = [ base hmatrix vector ]; librarySystemDepends = [ QuadProgpp ]; description = "Bindings to the QuadProg++ quadratic programming library"; @@ -91333,7 +97478,7 @@ self: { mkDerivation { pname = "hmatrix-repa"; version = "0.1.2.2"; - sha256 = "51c3a46800aea072258b05047cb0c6f24999bbb626268ce32809c5872e0e71be"; + sha256 = "1gki1qp8gi8953iqq9i6nsxrjjgjqsq7q105icjp585f01la9hsi"; libraryHaskellDepends = [ base hmatrix repa vector ]; homepage = "http://code.haskell.org/hmatrix-repa"; description = "Adaptors for interoperability between hmatrix and repa"; @@ -91346,7 +97491,7 @@ self: { mkDerivation { pname = "hmatrix-special"; version = "0.4.0.1"; - sha256 = "72a9c9c559da6b6314e6042ddfd53d638fdf1b819978a630fc339e0859c3ec4e"; + sha256 = "0kpcqdchi7ikzhqacy4rh4dxz3v37paxyb84wqa66sysb72wkabj"; libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Interface to GSL special functions"; @@ -91361,7 +97506,7 @@ self: { mkDerivation { pname = "hmatrix-static"; version = "0.3.0.2"; - sha256 = "f1fd51e1869285c0d079b1df99c64e21d8c246b6605ee9bd8d4c654626925de2"; + sha256 = "1qjxj8k4cracinyyjpk0nr3c5n119v39kpxig78c11cjhvhm3zgi"; libraryHaskellDepends = [ array base haskell-src-meta hmatrix parsec template-haskell tfp ]; @@ -91377,8 +97522,8 @@ self: { }: mkDerivation { pname = "hmatrix-svdlibc"; - version = "0.4.0"; - sha256 = "774504e862542f90441701122638c4ce11aa94792d270045eb0f0997e6f874a2"; + version = "0.4.1"; + sha256 = "1vyjrwd06xaslriylh5qq20iy194d8p2ja97rn2h2gk30dk98dja"; libraryHaskellDepends = [ base hmatrix vector ]; testHaskellDepends = [ base hmatrix hspec QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion hmatrix vector ]; @@ -91395,7 +97540,7 @@ self: { mkDerivation { pname = "hmatrix-syntax"; version = "0.1.2.1"; - sha256 = "0b0d000f1c9d282c63997139fe2908523744c5a37e9ad00688c94180486fc563"; + sha256 = "0qy5dx480hf9i03d16kylg2l8dsj10lzwfbik5ijqa4x3h7h038b"; libraryHaskellDepends = [ base haskell-src-exts haskell-src-meta hmatrix template-haskell ]; @@ -91412,7 +97557,7 @@ self: { mkDerivation { pname = "hmatrix-tests"; version = "0.6.0.0"; - sha256 = "30a61b749705b0291ffe03514545ecf24989554f6a4632b5a73f72daade1c4d7"; + sha256 = "1my4w6nxlwizlysk4ika9xaqjjgjxi2lal83zqgjkc05jxs1p9ih"; libraryHaskellDepends = [ base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random ]; @@ -91431,7 +97576,7 @@ self: { mkDerivation { pname = "hmeap"; version = "0.15"; - sha256 = "7001c536e953d3fd5b34d6abec31b248324a2cfc84128f9a0bf269fabbb811a6"; + sha256 = "19hip2xzlsgj1fd8y4l4zhn4lcj8n8qyrayn6idzvlskx4vca0bh"; libraryHaskellDepends = [ array base bytestring bytestring-lexing delimited-text parsec ]; @@ -91448,7 +97593,7 @@ self: { mkDerivation { pname = "hmeap-utils"; version = "0.14"; - sha256 = "082f0813f5da160f41ca630c8075aa0f4044f17557e13997cba2cf7dfcdfd5b6"; + sha256 = "1dnmvzy7vkx2rfbkkqapfpql8h0gm9sq0333r90hy5nsyl9hhbq8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91468,7 +97613,7 @@ self: { mkDerivation { pname = "hmemdb"; version = "0.4.0.0"; - sha256 = "bc8c323bff436e9789d131ce226e42df561f80fedb1d9b818ffb5b15a74dbf7d"; + sha256 = "0zdz9nkianzviy0rn7fvzs01ymnz89p25kiis64rfvj3zwxk535w"; libraryHaskellDepends = [ base binary containers monad-stm stm transformers ]; @@ -91481,7 +97626,7 @@ self: { mkDerivation { pname = "hmenu"; version = "0.1.0.1"; - sha256 = "374320143bdac2e9771639b8d30492791c2c34641f496cea618ccbd0fdb7a37a"; + sha256 = "0ym3nzyx1jwcc7m6qj8zchs2q73rj82d7f1r2rvykhns7ca20hrp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base MissingH process ]; @@ -91495,7 +97640,7 @@ self: { mkDerivation { pname = "hmidi"; version = "0.2.2.1"; - sha256 = "5e81917354f6bf85a398b1fd5c910e4545c0a20c27f5858eadeb5b94bb2c4e97"; + sha256 = "15sf5jxr8nzbmn78bx971jic0ia51s8mrzdik2iqbgznairr30ay"; libraryHaskellDepends = [ base stm ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "Binding to the OS level MIDI services"; @@ -91509,7 +97654,7 @@ self: { mkDerivation { pname = "hmk"; version = "0.9.7.4"; - sha256 = "c952fbf1dcf7dc99958a92efa387004ba600ed168c5b2ae221327909a79a23a1"; + sha256 = "1893kakhjy9j47i2lnwc2vnh19jb023s7vwjiaarkp7pvkqznln9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -91530,7 +97675,7 @@ self: { mkDerivation { pname = "hmm"; version = "0.2.1.1"; - sha256 = "61e06e1daca7f0f2add080e35011672aa8ccf20f650a1a010a1e690a2d8bed21"; + sha256 = "08gdicnhls8y180il2k51zrcra1acw8m1qw0s2nz5w57mhfnxq31"; libraryHaskellDepends = [ array base data-memocombinators list-extras logfloat ]; @@ -91548,7 +97693,7 @@ self: { mkDerivation { pname = "hmm-hmatrix"; version = "0.0.1"; - sha256 = "903cf5d3bfaea8383d6242e3e48d807cf07b954217a0948aae78dbabc79e71ce"; + sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h"; libraryHaskellDepends = [ array base containers explicit-exception hmatrix lazy-csv non-empty random semigroups transformers utility-ht @@ -91567,7 +97712,7 @@ self: { mkDerivation { pname = "hmp3"; version = "1.5.2.1"; - sha256 = "63d125153a4cee4fe562b5f33450a7c3a200c7be15aefb95ba4c2a1a9bffd84d"; + sha256 = "0kfqzydilajcpaazpbhmpv3h18n3lx839wxmcbjlzvjc78ajblb3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91586,7 +97731,7 @@ self: { mkDerivation { pname = "hmpfr"; version = "0.4.2.1"; - sha256 = "ccb27dec6053e05b58ba6c1b27373ed78fb91ee0792c08158c59eec409ac0a11"; + sha256 = "048amh4w9vjrihahhb3rw0gbk3yp7qvjf6vcp9c5pq2kc3n7vcnc"; libraryHaskellDepends = [ base integer-gmp ]; librarySystemDepends = [ mpfr ]; homepage = "https://github.com/michalkonecny/hmpfr"; @@ -91603,7 +97748,7 @@ self: { mkDerivation { pname = "hmt"; version = "0.15"; - sha256 = "498df72d63766f4b8ea3a98d09d7bfd73c14743b9d0885b80dae509ba07e3314"; + sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9"; libraryHaskellDepends = [ array base bytestring colour containers data-ordlist directory filepath lazy-csv logict multiset-comb parsec permutation primes @@ -91621,7 +97766,7 @@ self: { mkDerivation { pname = "hmt-diagrams"; version = "0.15"; - sha256 = "95be338168d2b2e92c2bfc09977e3b5c78213410f6ab1de3043d8cbfc258c4bc"; + sha256 = "1g64b31bz31x0kiivazn20s22y2w7dz9f2gw5cnfkcnjd20k7glm"; libraryHaskellDepends = [ base cairo colour filepath hcg-minus hcg-minus-cairo hmt html-minimalist process xml @@ -91638,7 +97783,7 @@ self: { mkDerivation { pname = "hmumps"; version = "0.1.1"; - sha256 = "c2ca741b0ed9316a69b3d1eae08f4c6ef44e2e40482cb0f903d2fd7d9aee7119"; + sha256 = "06bixsd7vzfj0gwv0b2880p4xx3f9j7y1snindlnlcfr1qdp9jn2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91659,7 +97804,7 @@ self: { mkDerivation { pname = "hnetcdf"; version = "0.4.0.0"; - sha256 = "70ea9ddc84b29848fc000d9eaaea5d7d6273597662437591354a8b5c12b2d795"; + sha256 = "15fpn895r2sa6n8pahv2frcp6qkxbpmam7hd03y4i65jhkf9vskh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91689,7 +97834,7 @@ self: { mkDerivation { pname = "hnix"; version = "0.3.4"; - sha256 = "ec890845cc8a782ff8a2e7a2dcbaf763d5ddb3ff202293f701828d04a85adbf2"; + sha256 = "1wnvbal093c207vr68i0zyrxvmb3yyxdr8p7lbw2yy4ari2hi2gc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91715,7 +97860,7 @@ self: { mkDerivation { pname = "hnn"; version = "0.3"; - sha256 = "d99d8546cd6f34d3ab63d92c36bf46124ce10618d77de04c0d3ac65c12fd1543"; + sha256 = "0hqmzl95riis1m6f0zfp303f2k0j8szkcb6rcfmx6d3grm38b7fr"; libraryHaskellDepends = [ base binary bytestring hmatrix mwc-random random vector vector-binary-instances zlib @@ -91730,22 +97875,62 @@ self: { mkDerivation { pname = "hnop"; version = "0.1"; - sha256 = "225bf9f244298337b0634bb9905eace0c3eea9faa9e2fff4a30c1fcbea4bdc69"; + sha256 = "0sfw9gmcn7qclgsgzqm9zalyxhz0mig91fabcfq3g0r98krgjnr2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; license = stdenv.lib.licenses.unfree; }) {}; + "hnormalise" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , attoparsec-iso8601, base, bytestring, conduit + , conduit-combinators, conduit-extra, containers, criterion + , deepseq, directory, hspec, hspec-attoparsec, hspec-core + , hspec-expectations, ip, lifted-base, monad-control, monad-loops + , mtl, optparse-applicative, permute, random, resourcet, text, time + , transformers-base, unix, unordered-containers, word8, yaml + , zeromq4-conduit, zeromq4-haskell + }: + mkDerivation { + pname = "hnormalise"; + version = "0.4.2.0"; + sha256 = "1h38qr8d8dbn81bghh3imb7jink6b06wadbpyg4axfr39s21xvkg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring + containers directory ip permute text time unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring + conduit conduit-combinators conduit-extra containers directory ip + lifted-base monad-control monad-loops mtl optparse-applicative + resourcet text time transformers-base unix word8 yaml + zeromq4-conduit zeromq4-haskell + ]; + testHaskellDepends = [ + aeson attoparsec attoparsec-iso8601 base conduit-extra hspec + hspec-attoparsec hspec-core hspec-expectations ip text time + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base criterion deepseq random text + ]; + homepage = "https://github.com/itkovian/hnormalise#readme"; + description = "Log message normalisation tool producing structured JSON messages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ho-rewriting" = callPackage ({ mkDerivation, base, compdata, containers, mtl, patch-combinators }: mkDerivation { pname = "ho-rewriting"; version = "0.2"; - sha256 = "c962e3c2b5e7943bfbc7c781070b35cb81d4c39d2afc221c207dc4bb38785acd"; + sha256 = "1kasg0wbpi3x40f25z1akp1x90fb6l5hg0f7qzxkp577np1f6qn9"; revision = "1"; - editedCabalFile = "564496857e81054420e85172517d838ecd0b7d0cca6f324c52b92ef5a2fe820c"; + editedCabalFile = "0342zsigabmra9634vya1iyhpkcfhdym2wjix0h481c1gs2rci2n"; libraryHaskellDepends = [ base compdata containers mtl patch-combinators ]; @@ -91764,7 +97949,7 @@ self: { mkDerivation { pname = "hoauth"; version = "0.3.5"; - sha256 = "17cb7fe7f07d84c6dfeb77932e7a441482e0ff121893d79be2c7af26761b731b"; + sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp"; libraryHaskellDepends = [ base binary bytestring crypto-pubkey-types curl dataenc entropy mtl old-locale random RSA SHA time utf8-string @@ -91781,7 +97966,7 @@ self: { mkDerivation { pname = "hoauth2"; version = "0.5.7"; - sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec"; + sha256 = "1v5rx50hcnaqnvyg3n671sf7vhbn8jmzay9lxd5pq85qf15nw6bv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91793,19 +97978,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_0_5_8" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types - , text, unordered-containers + "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 = "0.5.8"; - sha256 = "caacec1259455de9d1cb78c38fe8ca4dabc901e5b9fd8a9e7d17eaca0a820e60"; + version = "1.3.0"; + sha256 = "1aymrl28gs4dlzfxcnglfhnxk9l9ws0va0yvi1a966yfp0ps7w1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring http-conduit http-types text - unordered-containers + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson ]; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; @@ -91821,7 +98007,7 @@ self: { mkDerivation { pname = "hob"; version = "0.0.1.0"; - sha256 = "4c7610f0e8558d68940535814999b467e55d2a03c58005ca4301d158f8ea5ad4"; + sha256 = "1m2sxbw5il818g50b0650cm5vrb7njclk09m0na6i3amx3q10xjc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91848,7 +98034,7 @@ self: { mkDerivation { pname = "hobbes"; version = "0.2.2"; - sha256 = "ad8b5044cf198b6590f572992554e29f9a6ac08ae23618b64421e154da3031df"; + sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91867,9 +98053,9 @@ self: { mkDerivation { pname = "hobbits"; version = "1.2.3"; - sha256 = "88a6dfa9ea8f800b6d916c0f6e92875d9132003eacde013210d97bdc999840f3"; + sha256 = "1ws0k2cxqyyr20r03pmc7q0354axhy96w3vcj5nhp04gxalxz9l8"; revision = "1"; - editedCabalFile = "3341a9644e507027bb3b890c7adba0e0c93a18f80173504ae45c1ad569d716bc"; + editedCabalFile = "1g0nsxlxa6jwwi550wq1z0c3mjg0l3dpl3497fxjfw2h9rjajh9k"; libraryHaskellDepends = [ base deepseq haskell-src-exts haskell-src-meta mtl syb tagged template-haskell th-expand-syns transformers @@ -91886,7 +98072,7 @@ self: { mkDerivation { pname = "hocilib"; version = "0.2.0"; - sha256 = "7c29cc84e7ac320cd1ddfb9d387d19c7c03fea3eedfb41713115d0e94aeafb78"; + sha256 = "0y7vx95fkl0m65ql3yzd7vm3zh6735yki7gvvp8hqcmcwy2cqabw"; libraryHaskellDepends = [ base bytestring containers inline-c template-haskell ]; @@ -91907,7 +98093,7 @@ self: { mkDerivation { pname = "hoe"; version = "1.1.0"; - sha256 = "60bb1df0c5314fd318935fd47bd258e7d103744d42e8bc3e7220414a2512053d"; + sha256 = "0g8528jllh90f8zbrs229ms07lg7b397pm2zjccd6kriqpq1vfv0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91924,7 +98110,7 @@ self: { mkDerivation { pname = "hofix-mtl"; version = "1.0"; - sha256 = "6defa97fe708cda43b87eff95fe86473f6413e97e70c75383fd694dd726b9af6"; + sha256 = "1xlsddrdv56n7ww7a377jwz43xkkckl5zygghwxs9k88wxzskvvd"; libraryHaskellDepends = [ base mtl star-to-star template-haskell ]; description = "defining @mtl@-ready monads as * -> * fixed-points"; license = "unknown"; @@ -91938,7 +98124,7 @@ self: { mkDerivation { pname = "hog"; version = "0.1.1"; - sha256 = "2dace9ad6cd0659e36c79ec113958c3b20351249365a2979e517ee5fab3fb756"; + sha256 = "0mmp7ymmzvhpwmwjjnin9493a81vijai7hcyqwv9wrfhdjnykb1d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91956,7 +98142,7 @@ self: { mkDerivation { pname = "hogg"; version = "0.4.1.2"; - sha256 = "9c4e1821558dde698e35db775b4f1b2a1fff399e583a6c67bfcd6508d55b4f36"; + sha256 = "0djgbgahhrfdpxknqfjqkqwzy7ra3d7mnxyv6n76kpldalhihklw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91968,12 +98154,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hoggl" = callPackage + ({ mkDerivation, aeson, base, base64-string, either, formatting + , hashable, http-client, http-client-tls, mtl, optparse-applicative + , servant, servant-client, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "hoggl"; + version = "0.2.0.0"; + sha256 = "0kblkirivnw3ylaifdpa8acy2armxxkl9hbqymg2qfiiwnbgg2wh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-string either formatting hashable http-client + http-client-tls mtl servant servant-client text time transformers + unordered-containers + ]; + executableHaskellDepends = [ + base either http-client http-client-tls optparse-applicative + servant-client text time transformers + ]; + description = "Bindings to the Toggl.com REST API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hogre" = callPackage ({ mkDerivation, base, cgen, cgen-hs, grgen, OGRE, OgreMain }: mkDerivation { pname = "hogre"; version = "0.1.5"; - sha256 = "e404ec94260538ebdba51dffad8d24f5e6e959381461e43af50521c9a8b3af59"; + sha256 = "0ndgnflcj885ylxf8q8l71cykrpm4j6svzqxlpdynf054safq174"; libraryHaskellDepends = [ base cgen ]; librarySystemDepends = [ OgreMain ]; libraryPkgconfigDepends = [ OGRE ]; @@ -91990,7 +98201,7 @@ self: { mkDerivation { pname = "hogre-examples"; version = "0.1.4"; - sha256 = "af68f11d0778ed4c3b9645d92cc39b9e06f2bd1fef03bdb95240af021926f883"; + sha256 = "10zq4qch5bs0aawvs0zg3yyz41lykg1jrna5jqxlrvbq0wfz2s5g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hogre ]; @@ -92006,7 +98217,7 @@ self: { mkDerivation { pname = "hois"; version = "0.1.0.0"; - sha256 = "93b0a206c243f4cf313d12e4d90bf3f88c378cee8d4d4911b2c79fa35c3b8b2b"; + sha256 = "0awb7dfa77y7n88ljkcdxs63g37qyc5xkr0j7lqwzx23q83a5c4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -92022,20 +98233,31 @@ self: { mkDerivation { pname = "hoist-error"; version = "0.1.0.2"; - sha256 = "1fd00441ad981323aed41442896d3a262ce29dc54771e654a952944a73530591"; + sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; revision = "2"; - editedCabalFile = "fca4ac245a1bddf638317290deb580d05d1539c6a700b02744ce61e259e2e879"; + editedCabalFile = "0yg8w9cy4qff8hkv0057qqwiapfhh2sxx43j64wgdp8vb8jar97w"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; }) {}; + "hol" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hol"; + version = "1.0"; + sha256 = "02hzkx4zz47fky24ybjiqp6zfj77h13q06jipmc4rh15fz26q282"; + libraryHaskellDepends = [ base ]; + description = "Higher order logic"; + license = stdenv.lib.licenses.mit; + }) {}; + "hold-em" = callPackage ({ mkDerivation, base, random, safe }: mkDerivation { pname = "hold-em"; version = "0.1.0.0"; - sha256 = "99e415c95ae946bce74ada24304271b9c87b9ec341266adad40535fda3a158c8"; + sha256 = "1j2ql6izsd85skd6l9j1qfg7pj5rf513096s9bkvqip9bb4ibr4r"; libraryHaskellDepends = [ base random safe ]; description = "An engine for Texas hold'em Poker"; license = stdenv.lib.licenses.bsd3; @@ -92047,7 +98269,7 @@ self: { mkDerivation { pname = "hole"; version = "0.1.1"; - sha256 = "cc0c35a3803d6b3d5d59467bffabc62da49d4d907a3bfdc82ab1ac34f9416a15"; + sha256 = "05ba87wk9b5i5b4gsfvsj16rv91dqsmzyys6b5fkssrxh2ika36c"; libraryHaskellDepends = [ base containers ]; description = "Higher kinded type removal"; license = stdenv.lib.licenses.bsd3; @@ -92059,7 +98281,7 @@ self: { mkDerivation { pname = "holey-format"; version = "2.1.0"; - sha256 = "c1aadd830dbd955d827e7a0662d9ea2d2b91ed3bd7118edbc35a4f7f8871c68d"; + sha256 = "13f6f647ykssqgdqw4fp7gnr2ardxbcn41ksgs15v5dx1n1xvan1"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -92075,7 +98297,7 @@ self: { mkDerivation { pname = "holy-project"; version = "0.2.0.1"; - sha256 = "b0f60f48377986212ee45a7ab360f4ef32578d4fa4b65cc21132f9c1e90a2814"; + sha256 = "05181blw3y9j2715rdm49y6mfcpgyihb6yjswhp231kr6x40zxmh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92104,7 +98326,7 @@ self: { mkDerivation { pname = "homeomorphic"; version = "0.1"; - sha256 = "cce4b27e9d415fe3678db0a26d99ade60e0c4aebc6082bfe7d520bf0db2aa1f2"; + sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c"; libraryHaskellDepends = [ base containers mtl QuickCheck ]; homepage = "http://www-users.cs.york.ac.uk/~ndm/homeomorphic/"; description = "Homeomorphic Embedding Test"; @@ -92117,7 +98339,7 @@ self: { mkDerivation { pname = "hommage"; version = "0.0.6"; - sha256 = "932d4d2adb93f678dd6deb2ff20b7a0859abd527447db35a4cec54f8c0d87f14"; + sha256 = "053zv30ghm7c9idb6za44zasnn88g85z4bzbdpfpixlkvcm4sbck"; libraryHaskellDepends = [ array base directory haskell98 random time ]; @@ -92131,7 +98353,7 @@ self: { mkDerivation { pname = "hommage-ds"; version = "0.0.5"; - sha256 = "648b229e3911102e4cbe670c88ede2fddc1b14e68f610b2a170ef269f4bfdc3e"; + sha256 = "0gnwpzs6kwhf2wm0nqcgwqa1pp7xwbnqh337pr62w40i76g252v4"; libraryHaskellDepends = [ array base DirectSound haskell98 hommage ]; @@ -92146,7 +98368,7 @@ self: { mkDerivation { pname = "homoiconic"; version = "0.1.2.0"; - sha256 = "5cc9625bec641625b17cd262864580dc2940bb5c141254cdb64dcc7e0fc681bd"; + sha256 = "1gc1qq7pxk2dnv6m84hlbjxl0afwh12qcqnjgjqja5k4xidn5jaw"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; homepage = "github.com/mikeizbicki/homoiconic"; @@ -92162,7 +98384,7 @@ self: { mkDerivation { pname = "homplexity"; version = "0.4.3.4"; - sha256 = "49620a1746c1e29d069028806da2b2d694e65e7407227d02ca5640cfcb4d3be7"; + sha256 = "1rrv9p5wyh2nr817s8h7figfd56nnai6v018j039vqn18qbhlqj9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92184,7 +98406,7 @@ self: { mkDerivation { pname = "honi"; version = "0.1.0.0"; - sha256 = "d1f97235b6ff4bc498807024a27aeca9d345ddec31f9f63e086d24854e0c3c3c"; + sha256 = "0g1w1i78a93d10zgdy9ixkflblx9xixa493hh2cc8jzznqsp5yfi"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ freenect OpenNI2 ]; testHaskellDepends = [ base hspec HUnit ]; @@ -92199,7 +98421,7 @@ self: { mkDerivation { pname = "honk"; version = "1.3.0.0"; - sha256 = "0efade5c453d04dcef66575e99c38353dec42fbd05ac31c7dfafaa8464e15280"; + sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf"; libraryHaskellDepends = [ base ]; homepage = "https://lambda.xyz/honk/"; description = "Cross-platform interface to the PC speaker"; @@ -92213,7 +98435,7 @@ self: { mkDerivation { pname = "hoobuddy"; version = "0.1.0.1"; - sha256 = "cdaa04576caa7c638d55eece107775136651a5a27e4b25cb1163bb1c01343850"; + sha256 = "0l1q6h0irfv3275jajvylajm2rhkfmvi1kpfan6n6z5adibh9and"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92231,9 +98453,9 @@ self: { mkDerivation { pname = "hood"; version = "0.3"; - sha256 = "f1962dfb05d01a345335872fa36509999755c71a9381b4941bd04a9cb72b6122"; + sha256 = "08k15fvrqjnh3fab90ck3b3mb5wr15js6bw76m9k86nh0pxjv5pi"; revision = "1"; - editedCabalFile = "f9b9df9c7f747b1da4f96477fab00305b5a28132eabc224e76db75b1bae34a64"; + editedCabalFile = "0r2awfxb2xfvfr725g7a6a0s5d850fqglxv4z6j1syvlgyfdzfgr"; libraryHaskellDepends = [ array base FPretty ghc-prim ]; homepage = "http://ku-fpg.github.io/software/hood"; description = "Debugging by observing in place"; @@ -92245,7 +98467,7 @@ self: { mkDerivation { pname = "hood-off"; version = "0.2"; - sha256 = "ccde80c586484a59e404f05455e85cebf483869dbc0dba75611f46e81d363297"; + sha256 = "15rj6qfyhihzc5svl3dwkn387x7bbkl5am7h0kj5jjj8hv2q1pnc"; libraryHaskellDepends = [ base ]; description = "Dummy package to disable Hood without having to remove all the calls to observe"; license = stdenv.lib.licenses.bsd3; @@ -92257,7 +98479,7 @@ self: { mkDerivation { pname = "hood2"; version = "0.2.1"; - sha256 = "02f42887e0917e943342a6bfc628c030d837780f6d55c0b07255712fe90fd147"; + sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02"; libraryHaskellDepends = [ array base ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood"; description = "Debugging by observing in place"; @@ -92271,7 +98493,7 @@ self: { mkDerivation { pname = "hoodie"; version = "0.1.0.0"; - sha256 = "dc388c411cb3d11ffd2eb096d162a733581f558e929e66f1f57b0cf4b1be7ce0"; + sha256 = "1q3wpsqz833vypqnd7ljiraiyn1klxid35mh5vyizldk3i0qqf6w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92289,7 +98511,7 @@ self: { mkDerivation { pname = "hoodle"; version = "0.5"; - sha256 = "051f80685b81a75cf0890dd96be703de6f8d7c9ae7487c3856b6feca71ac1de6"; + sha256 = "1rhxmiqwmzmnaqw7qj77k9y8svyy0gknpn8di7q5r9w1bdl807q5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92310,7 +98532,7 @@ self: { mkDerivation { pname = "hoodle-builder"; version = "0.4"; - sha256 = "f350ef1032d6052290d5bd228758564a6f5972808eedaa15878746fb65e3ac04"; + sha256 = "015cwdjznil7hwasmvcfh1r5jvsaarc8f8mxsn8241fn688fyl7k"; libraryHaskellDepends = [ base blaze-builder bytestring double-conversion hoodle-types lens strict text @@ -92334,7 +98556,7 @@ self: { mkDerivation { pname = "hoodle-core"; version = "0.16.0"; - sha256 = "6a92a9946102d3d340a4383c3a9d679033e6640abcdd905c4176ae5c7a4a3eec"; + sha256 = "1v1y99x5rbkn85f91pdw19jfccwhcyfklg1qli0d7lq2c6aak4ka"; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary bytestring cairo cereal configurator containers coroutine-object @@ -92363,7 +98585,7 @@ self: { mkDerivation { pname = "hoodle-extra"; version = "0.1"; - sha256 = "1eeaba3cc1e215cdd3254dd4ae55e97ff90311aba8f976c946f614a222261dd7"; + sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92387,7 +98609,7 @@ self: { mkDerivation { pname = "hoodle-parser"; version = "0.4"; - sha256 = "2e8c05e4c4d66a35a833a5a35d7c91c33a183c4e24861c7367fb5c54b488517a"; + sha256 = "0yjii2s58p7vcxrir1i49qy1hfn3j5y5v8x56fl3asnnqkj0b31f"; libraryHaskellDepends = [ attoparsec base bytestring containers directory either hoodle-types lens mtl strict text transformers xournal-types @@ -92407,7 +98629,7 @@ self: { mkDerivation { pname = "hoodle-publish"; version = "0.2.1"; - sha256 = "5de77eb3a3ab92b61a7018345c8a94e86c6d4df74849504487edc9e1d57613bf"; + sha256 = "1gqkfvay3jgdhx250ja8yx6nsv78jj55qd0qf0dbd4mblfrpxrsx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92434,7 +98656,7 @@ self: { mkDerivation { pname = "hoodle-render"; version = "0.6"; - sha256 = "47070f0ace7d68e22b78ad37bc4f8420390021c371c465b93a3da15b3768d4e3"; + sha256 = "1qyld0vmp89x7awnbi3iqchh0f90hi7vqdxdg0my4s3xrq50y1s7"; libraryHaskellDepends = [ base base64-bytestring bytestring cairo containers directory filepath gd gtk3 hashable hoodle-types lens monad-loops mtl poppler @@ -92453,7 +98675,7 @@ self: { mkDerivation { pname = "hoodle-types"; version = "0.4"; - sha256 = "1db3356172cbae0bef43a36719d669f4f82ee8e237e8a58c754489dec5ea33b6"; + sha256 = "1dikxb2xx2a4fn6abs1pwbl2xy7ld7b1jrx38gphpbnbf9hkbcqx"; libraryHaskellDepends = [ aeson base bytestring cereal containers lens mtl strict text uuid vector @@ -92473,8 +98695,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.9"; - sha256 = "93f584c5f7fc6a57ee50803ae8df5e6c41051a3177044b273cb7fbcd39d11874"; + version = "5.0.12"; + sha256 = "024knipmwl75gq56phjwpa61gzac8alw46k6lcgfg7v9dglz2dqx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92500,7 +98722,7 @@ self: { mkDerivation { pname = "hoogle-index"; version = "0.4.4"; - sha256 = "bc18c8e83c50057dc7e62e795fdaca1a5225dc4324c4d7a5153a17b6202918c6"; + sha256 = "1ihq54hbc5rs2njxgi148gf2alhsrbd5yy9fwv3ps1ah7klch65w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92518,7 +98740,7 @@ self: { mkDerivation { pname = "hooks-dir"; version = "0.1.1.0"; - sha256 = "ab685c202841e2d35d225b151786133309af38694818ac7aefc84e44ebc58d3f"; + sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b"; libraryHaskellDepends = [ base directory process text ]; homepage = "https://github.com/ibotty/hooks-dir"; description = "run executables in a directory as hooks"; @@ -92528,15 +98750,14 @@ self: { "hookup" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system - , network, openssl, socks, template-haskell + , network, openssl, socks }: mkDerivation { pname = "hookup"; - version = "0.1.0.0"; - sha256 = "0b321b470cb66f8b0d1611cbe26ec6d0c8904f984456bd2fbe292fb2efd8a580"; + version = "0.1.1.0"; + sha256 = "11gbk92wqcakmqqrvggjypxxpgdccacqbrrzicwy8113hd6kiw75"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system network socks - template-haskell ]; librarySystemDepends = [ openssl ]; homepage = "https://github.com/glguy/irc-core"; @@ -92551,7 +98772,7 @@ self: { mkDerivation { pname = "hoopl"; version = "3.10.2.1"; - sha256 = "7c06a2a9e8871eff74fdbbf2aa0a2201a31a5687f5acf7a5ba8a3611325440b0"; + sha256 = "1c20ahr12dlapajzgb7mhxb1m8q1485amwmvzmsgy7l7x2ls41kw"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers filepath mtl parsec test-framework @@ -92573,7 +98794,7 @@ self: { mkDerivation { pname = "hoovie"; version = "0.1.1"; - sha256 = "891056abfca2c3ec1deb108870ee9ad945987697ee56a0406edbf17be43488bc"; + sha256 = "1g486kj7pwfvdr0a0mpfjxv9hifrkbp7120hxcfyrhx2zjmmc449"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92595,7 +98816,7 @@ self: { mkDerivation { pname = "hopencc"; version = "0.1.0.0"; - sha256 = "dc4379ad9c203841b93dac39a59f30019ea84685d5562434bf1f2790076cf4f9"; + sha256 = "1ygldh3r09qzpws28mnmhm3ai7h162gsafdc7nwl2f10kjnpjhyw"; libraryHaskellDepends = [ base bytestring utf8-string ]; libraryPkgconfigDepends = [ opencc ]; libraryToolDepends = [ c2hs ]; @@ -92613,7 +98834,7 @@ self: { mkDerivation { pname = "hopencl"; version = "0.2.1"; - sha256 = "68627a79e3a415bcbec696ab64a1cf67bd7d811970ae30d642d8f1e24396b9cd"; + sha256 = "1kdrjr1y5wfq8bb31bkh360pvgb7ryhn9awnqszbq5d4wdwplqk8"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ OpenCL ]; libraryToolDepends = [ c2hs ]; @@ -92640,7 +98861,7 @@ self: { mkDerivation { pname = "hopenpgp-tools"; version = "0.19.4"; - sha256 = "e656cd989833c6d318d5c44931ef5a8cd98bb0ebb4bab70a2d2f701091d0abd8"; + sha256 = "1n5bs28i0w1g5l5bgfmlxfq8pnccbbpk2jf4slcd7iikk2ccsmp6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92660,15 +98881,19 @@ self: { }) {}; "hopenssl" = callPackage - ({ mkDerivation, base, bytestring, mtl, openssl }: + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , HUnit, openssl + }: mkDerivation { pname = "hopenssl"; - version = "1.7"; - sha256 = "9ee64bb5834e475a6bdfa1fb578e6a966f74bebb8be95685a9d695cffb4c46ff"; - libraryHaskellDepends = [ base bytestring mtl ]; + version = "2.2.1"; + sha256 = "1pxbs1k8sizvvz1nn1zv2i5grn0w11s9g09z07w5f80kbz0slcbh"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base doctest HUnit ]; homepage = "http://github.com/peti/hopenssl"; - description = "FFI bindings to OpenSSL's EVP digest interface"; + description = "FFI Bindings to OpenSSL's EVP Digest Interface"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) openssl;}; @@ -92683,7 +98908,7 @@ self: { mkDerivation { pname = "hopfield"; version = "0.1.0.2"; - sha256 = "fc8729fbd142945258092585e6f3afe83bf123310b7673d3c83837074819f9b2"; + sha256 = "1cpr3540fdrqr39p6xhb64iz2fz8mzryd19515c55522s7xjk1zw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92713,7 +98938,7 @@ self: { mkDerivation { pname = "hopfield-networks"; version = "0.1.0.0"; - sha256 = "4d23b2be13a23382ab3b691edf8d826a3b01fd97a1ee7c26532a1f6da66472b4"; + sha256 = "1d3jcjk6s7raack7rvm1jzyh2fvaha6xy7k97fmq4cx22fzb48sd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base matrix MonadRandom split vector ]; @@ -92733,8 +98958,8 @@ self: { ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: mkDerivation { pname = "hopfli"; - version = "0.2.1.1"; - sha256 = "6cc5b278396c2c6d24bb3cca9458366d1444208b32e49f658e75efbd803b1fdf"; + version = "0.2.2.1"; + sha256 = "061as7aa806xzcpch35isrkqbgqhwdy48fs049f491wwb47xqwad"; libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; homepage = "https://github.com/ananthakumaran/hopfli"; @@ -92748,8 +98973,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.3.1"; - sha256 = "be94bd36afde578e202b39f865a9f342acc97367bfaf942b49cd2bd19aee9b96"; + version = "0.3.2"; + sha256 = "04ah438igxykyspzlhpa5y50z1accrb9sxhv2sn8riqfhdz2sych"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -92765,8 +98990,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.3.2"; - sha256 = "eaf41f874e0d26720c374430798e77e2f334de7936b313546b2293bb9c3767eb"; + version = "0.3.3"; + sha256 = "18n48kkf6pcmcwb85a74kqh84aadpm1s9jv1r56b43rya8ra3mgw"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -92777,12 +99002,14 @@ self: { }) {}; "hoppy-runtime" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.3.0"; - sha256 = "44463a38c42a61789f723a538a5c3df0eac312c08dbac81a10642a8bffaba9d9"; - libraryHaskellDepends = [ base containers ]; + version = "0.3.1"; + sha256 = "0cbnhpwy3m0l7gcarg7xr1f5y6nwdnfa269vvza0fm4fhf3lz6g5"; + libraryHaskellDepends = [ + base Cabal containers directory filepath + ]; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Runtime support"; license = stdenv.lib.licenses.asl20; @@ -92794,7 +99021,7 @@ self: { mkDerivation { pname = "hoppy-std"; version = "0.3.0"; - sha256 = "4bf6cbf4456ac92517bb19a044863e509e20ca7965f1a8324bcd4848f5c4fb65"; + sha256 = "0rgvqkslhj6d9craiwb5g75217jh7s34980rpcbjbjba8pscpxjb"; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator ]; @@ -92808,23 +99035,28 @@ self: { ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring , conduit, conduit-extra, containers, deepseq, directory, filepath , http-conduit, http-types, optparse-applicative, parallel, process - , QuickCheck, resourcet, scientific, text, transformers, vector + , QuickCheck, resourcet, text, transformers, vector }: mkDerivation { pname = "hops"; - version = "0.5.0"; - sha256 = "94045ae1eed0a54e62e144943c132df95ca1c9804722bb773852077e745be607"; - isLibrary = false; + version = "0.7.2"; + sha256 = "16a1ygxv4isw5wiq5dhjn4xdlr67zy1ngn61mwilgwkvwj0cjxc3"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base bytestring conduit + conduit-extra containers deepseq directory filepath http-conduit + http-types optparse-applicative resourcet text transformers vector + ]; executableHaskellDepends = [ aeson ansi-terminal attoparsec base bytestring conduit conduit-extra containers deepseq directory filepath http-conduit - http-types optparse-applicative parallel resourcet scientific text + http-types optparse-applicative parallel resourcet text transformers vector ]; testHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq process - QuickCheck scientific text vector + aeson attoparsec base bytestring containers deepseq directory + filepath process QuickCheck text transformers vector ]; homepage = "http://akc.is/hops"; description = "Handy Operations on Power Series"; @@ -92839,7 +99071,7 @@ self: { mkDerivation { pname = "hoq"; version = "0.3"; - sha256 = "67bd939f6932ed6910cccd07d180745ae5b91aa854ae73d85f3344f571c02c41"; + sha256 = "0h9cq1qzai1kbzc77bjlm0dbkrasfj0d21ydrh86kv9jd6gr7gb7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92859,9 +99091,9 @@ self: { mkDerivation { pname = "hora"; version = "2.0.2"; - sha256 = "a2d9eb1f89bf71f7060768e715fddd1e9478af192b353977c14c5524f2daba27"; + sha256 = "09xsvbr28macq5vkjd9b36ppi50yvpyibrv80w3gfwdzi4gypnd2"; revision = "1"; - editedCabalFile = "ba7e38c8bb60d028a6869e1d7ecd07354e783b2c8b5da6f135c4ef740ccf41a1"; + editedCabalFile = "18a1rw679vy46pqscpcb5hxphkim0z6pw7cyhsk2il30pg43hzms"; libraryHaskellDepends = [ base binary time timezone-series ]; testHaskellDepends = [ base binary hspec QuickCheck time timezone-olson timezone-series @@ -92877,7 +99109,7 @@ self: { mkDerivation { pname = "horizon"; version = "0.1.1"; - sha256 = "a4793eac44e445ef4ecb8ef3de1c4308c91ba7368051737fcbec65da413ca2e3"; + sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4"; libraryHaskellDepends = [ AC-Angle base time ]; homepage = "https://github.com/intractable/horizon"; description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates"; @@ -92892,9 +99124,9 @@ self: { mkDerivation { pname = "horname"; version = "0.1.3.0"; - sha256 = "e9a6cfb0ba87f063f04a7273d476b200905625ce60b00d87c8995332b1b7f218"; + sha256 = "067jnyqk4lwrr23hvc30rqjmd400n9vd8wvj9bq67w47paqcz9p9"; revision = "1"; - editedCabalFile = "94e798feada4d4014ee1438672fe57e6181f1b9b64bc92858644037a77678f81"; + editedCabalFile = "10cgcxvpl0s4hs2r5g34kcdiy676azz751j3w5703m54mpz9irwl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92914,7 +99146,7 @@ self: { mkDerivation { pname = "hosc"; version = "0.15"; - sha256 = "8e35a78a5619f57148a07e0b5995c209175a0ae3f1f4e1c5c8c9dc54822de2fa"; + sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf"; libraryHaskellDepends = [ base binary blaze-builder bytestring data-binary-ieee754 network time transformers @@ -92936,7 +99168,7 @@ self: { mkDerivation { pname = "hosc-json"; version = "0.15"; - sha256 = "1176584e51da323ed80d556957ca07869cbb32758dbef8f34b4eda922d995a69"; + sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring hosc json text unordered-containers utf8-string vector @@ -92954,7 +99186,7 @@ self: { mkDerivation { pname = "hosc-utils"; version = "0.15"; - sha256 = "b4b6662ea50a20009c4b0c03b638675fbf20f69389fa432ca91e6f515e4c657e"; + sha256 = "0zk59ig52vqym4n47yl9jgv21gszcwwbc0qc9ff0080allp6ddml"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92972,7 +99204,7 @@ self: { mkDerivation { pname = "hostname"; version = "1.0"; - sha256 = "9b43dab1b6da521f35685b20555da00738c8e136eb972458c786242406a9cf5c"; + sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv"; libraryHaskellDepends = [ base ]; description = "A very simple package providing a cross-platform means of determining the hostname"; license = stdenv.lib.licenses.bsd3; @@ -92983,7 +99215,7 @@ self: { mkDerivation { pname = "hostname-validate"; version = "1.0.0"; - sha256 = "7fafb1e0cfe19d453030754962e74cdb8f3e791ec5b974623cbf26872779c857"; + sha256 = "0my8g4kqf9mz7ii79ff53rwkx3yv9kkn4jbm60q4b7g1rzhb3bvz"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "Validate hostnames e.g. localhost or foo.co.uk."; license = stdenv.lib.licenses.bsd3; @@ -92996,7 +99228,7 @@ self: { mkDerivation { pname = "hosts-server"; version = "0.1.1"; - sha256 = "1eab2b1e7cfdb7e32494323008a0957dc5399568a009bdf5a83816868a7ab3bc"; + sha256 = "1g5kga58c5iqm3svs2d0d2akkibxjnh0hc1jjhjf7dzxghg2paqy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93015,7 +99247,7 @@ self: { mkDerivation { pname = "hothasktags"; version = "0.3.8"; - sha256 = "07b00026a1b8e47719736ae6c64fe2396396c50c8367f82361e6fa4142dcf301"; + sha256 = "00gkvi143yp6c4izhrw31k2rcqrrw97wdrkafccpgr5ql4k01c07"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93033,7 +99265,7 @@ self: { mkDerivation { pname = "hotswap"; version = "0.1.9.13"; - sha256 = "1ba28b05a598b4e1212c78c63dd2e064444030aeb169fc8854d85dcff723c1b0"; + sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv"; libraryHaskellDepends = [ base plugins ]; homepage = "https://github.com/mikeplus64/hotswap"; description = "Simple code hotswapping"; @@ -93048,7 +99280,7 @@ self: { mkDerivation { pname = "hourglass"; version = "0.2.10"; - sha256 = "d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80"; + sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time @@ -93066,7 +99298,7 @@ self: { mkDerivation { pname = "hourglass-fuzzy-parsing"; version = "0.1.0.1"; - sha256 = "67f8ff2a79d3cc1c2b19ef124aba3118650d4e151da519f1f0a0188b7ee015a1"; + sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37"; libraryHaskellDepends = [ base hourglass parsec ]; homepage = "https://gitlab.com/doshitan/hourglass-fuzzy-parsing"; description = "A small library for parsing more human friendly date/time formats"; @@ -93074,6 +99306,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hourglass-orphans" = callPackage + ({ mkDerivation, aeson, base, hourglass, hspec, hspec-expectations + , text + }: + mkDerivation { + pname = "hourglass-orphans"; + version = "0.1.0.0"; + sha256 = "0r1x6w5zpszr783gzsl3v2fizas4mh5wwgdgdnr93lydngrsj2wz"; + libraryHaskellDepends = [ aeson base hourglass ]; + testHaskellDepends = [ + aeson base hourglass hspec hspec-expectations text + ]; + homepage = "https://github.com/psibi/hourglass-orphans#readme"; + description = "Orphan Aeson instances to hourglass"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "houseman" = callPackage ({ mkDerivation, base, bytestring, directory, dotenv, hspec , interpolate, io-streams, mockery, mtl, optparse-generic, parsers @@ -93083,7 +99332,7 @@ self: { mkDerivation { pname = "houseman"; version = "0.1.0"; - sha256 = "542e790677bcacd177e5dc74c355dfc444f33d596e6229db563615ec7276a19c"; + sha256 = "1751frrfq59navdjjqkfb4yz6i64vxaw6x6wwmvx3b5wfw37jbjl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93112,7 +99361,7 @@ self: { mkDerivation { pname = "hp2any-core"; version = "0.11.2"; - sha256 = "3e583e758f048a030b2e08f2d5950a4b620d9ccff97510afb91a22fede4abcbe"; + sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y"; libraryHaskellDepends = [ attoparsec base bytestring containers directory filepath network old-locale process time @@ -93131,7 +99380,7 @@ self: { mkDerivation { pname = "hp2any-graph"; version = "0.5.4.2"; - sha256 = "34a62dfaa5ef2f86906f3db54175edd6ca0d843ea843d704eeb7186171ac41fa"; + sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hp2any-core OpenGL ]; @@ -93154,7 +99403,7 @@ self: { mkDerivation { pname = "hp2any-manager"; version = "0.4.6"; - sha256 = "3b2b557562c6d46dc7e20aec6a21cee63dd678c67f9f32a8d001fbbfa91f7290"; + sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93172,7 +99421,7 @@ self: { mkDerivation { pname = "hp2html"; version = "0.2"; - sha256 = "8a37889619567261adbc9cb635cdf129aad776e65348250bc534350348e16087"; + sha256 = "11v0w5406d9lql5jaj2kwrvdgai9y76kbdlwpjnn2wjn36b8hdwa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers filepath ]; @@ -93182,22 +99431,54 @@ 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 = "8c6cd408b7dc2bdb60aee98b6781773df5be80c339612173fc9043490342aaae"; + 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; }) {}; + "hpack_0_17_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , containers, deepseq, directory, filepath, Glob, hspec + , interpolate, mockery, QuickCheck, temporary, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.17.1"; + sha256 = "0lxpjv5j3bg725n1kqjgpcq3rb3s7zc1w3j5snc92ayk8fxpbd3n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers deepseq directory + filepath Glob text unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base base-compat bytestring containers deepseq directory + filepath Glob text unordered-containers yaml + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers deepseq + directory filepath Glob hspec interpolate mockery QuickCheck + temporary text unordered-containers yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , containers, deepseq, directory, filepath, Glob, hspec @@ -93206,8 +99487,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.17.0"; - sha256 = "d2578aca1a302f5424c32a81eb15a41797e72d17c0c2eab7c236c513c4657464"; + version = "0.18.1"; + sha256 = "1ssawa6187m0xzn7i5hn154qajq46jlpbvz1s28qk4bigpv38m7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93231,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 = "0.14.6"; - sha256 = "80a439b06603e48f338ad4a08b0ffc54c0f0f97584a265f5fab5b31d8c03cb1c"; + 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"; @@ -93268,7 +99549,7 @@ self: { mkDerivation { pname = "hpaco"; version = "0.28.0.5"; - sha256 = "a96b02990a6a420c09a1a99de6d54e98778649aad51ebb992f8d48cf3919060e"; + sha256 = "03h634wwyj4d5ycvn7nmm94qcxwq9vayd7d9l44hqhka1ach4sx9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93288,7 +99569,7 @@ self: { mkDerivation { pname = "hpaco-lib"; version = "0.28.0.5"; - sha256 = "157bcd30eb92a3e7a7d0ced0323c43b11517c1d878c75d3af146c770e3acd4d8"; + sha256 = "1n6lmkip1is6y4x5vivqv30if5di8cy35l6fs2kyg8wjxcqcsyqm"; libraryHaskellDepends = [ aeson base bytestring containers data-variant file-embed filepath mtl parsec safe split strict transformers @@ -93307,7 +99588,7 @@ self: { mkDerivation { pname = "hpage"; version = "0.12.2"; - sha256 = "129d599b5d4e766974bebb2bf4351e167e52fbaefb50252c9571ed4207c4826a"; + sha256 = "0sl2qh3l5vbijln2al7vmvxm4zhn3qsz8axvprs6jxjfbndmk78j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93326,7 +99607,7 @@ self: { mkDerivation { pname = "hpapi"; version = "0.0.1.0"; - sha256 = "5abcb6a590de65be0f6db0a591ef77743fddf1321a0c2886715aa75a4db60758"; + sha256 = "0n07nr6mm9ssf632h30s6bqxsgvlfzpr39dhdl7vwrfyj2jvdg2s"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ papi ]; description = "Binding for the PAPI library"; @@ -93346,7 +99627,7 @@ self: { mkDerivation { pname = "hpaste"; version = "1.2.0"; - sha256 = "d53ac03b69bbe3d31f328d8492ac9b27226afa4552cff02dfb2895912a760ddd"; + sha256 = "1p8dfqm93598zcnz1ksj8px6l8i7kfn9514d68gx7qxvd4xw0fnm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93371,7 +99652,7 @@ self: { mkDerivation { pname = "hpasteit"; version = "0.3.3"; - sha256 = "95abf4cfa363118ca603296e671029b146b5bdaa32393ea353562a7b5fc045ca"; + sha256 = "1jj5q1gpnajnafikwf9jmayvaimi5486fvi90fk8q4b3lg7z9awm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93392,7 +99673,7 @@ self: { mkDerivation { pname = "hpath"; version = "0.8.0"; - sha256 = "83f5077527f698c1cae9152d33710a0b6c8bee0227c81078a992b750fefbaba7"; + sha256 = "19xbzgz51dwjm5w11j170bp8nv0b19qk6b8mx75c367n4xshgxc3"; libraryHaskellDepends = [ base bytestring deepseq exceptions hspec simple-sendfile unix unix-bytestring utf8-string word8 @@ -93411,7 +99692,7 @@ self: { mkDerivation { pname = "hpc"; version = "0.6.0.3"; - sha256 = "16dac73e55899815a32715c35fa5986da077d7e7887ce8ef1c72b4f33a73a2aa"; + sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn"; libraryHaskellDepends = [ base containers directory filepath time ]; @@ -93427,8 +99708,8 @@ self: { }: mkDerivation { pname = "hpc-coveralls"; - version = "1.0.8"; - sha256 = "431db6ee058bf459c3e433c2d9ad89f1fcb344590745c3f62d0b744fc7d288b1"; + version = "1.0.10"; + sha256 = "1nfhh5ryz943v2wvbc3rgs2825gbpbhp233xjl2n49kddb9w08p2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93452,7 +99733,7 @@ self: { mkDerivation { pname = "hpc-strobe"; version = "0.1"; - sha256 = "ac0072560d9c663fcf199c0fd73301c0235d8e741bdfa24fac041971dc25fcb9"; + sha256 = "1fgw4pf72684mi7s5pqvfj75s8y004rxf3ww377kyrlw1mb7405c"; libraryHaskellDepends = [ base filepath hpc ]; description = "Hpc-generated strobes for a running Haskell program"; license = stdenv.lib.licenses.bsd3; @@ -93465,7 +99746,7 @@ self: { mkDerivation { pname = "hpc-tracer"; version = "0.3.1"; - sha256 = "918e884a60d10c3e8c01f68396a14a3aa2d99800001cf111b326dd40a9f250d5"; + sha256 = "1mahyall1p96nc8z270002cdk8is9ahrd0zn0663w36ic158i3li"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93484,7 +99765,7 @@ self: { mkDerivation { pname = "hpdft"; version = "0.1.0.4"; - sha256 = "51ba7bc799184d8fa1fbb27845d0424e6e84b504fce0bd3d047333a31d16b9e7"; + sha256 = "1rxr2qfs6cvk0hyvvq7w0jsq8vjf8b84ay5jzfhqyk8qk73ppfji"; libraryHaskellDepends = [ attoparsec base binary bytestring containers directory file-embed parsec text utf8-string zlib @@ -93495,6 +99776,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hpg" = callPackage + ({ mkDerivation, base, random }: + mkDerivation { + pname = "hpg"; + version = "0.7"; + sha256 = "0p2a8h9z5kbqpb99rclgkll1yv2in2fni5xvhrrzyphyhpqi1f6a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base random ]; + homepage = "https://darcs.alokat.org/hpg"; + description = "a simple password generator"; + license = stdenv.lib.licenses.isc; + }) {}; + "hpio" = callPackage ({ mkDerivation, async, base, base-compat, bytestring, containers , directory, doctest, exceptions, filepath, hlint, hspec, mtl @@ -93503,8 +99798,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.8.0.7"; - sha256 = "a003f549f3d7b44c87980fc31cdf5083c7cfd8ad651d5e4cd56448d67a8ee630"; + version = "0.8.0.10"; + sha256 = "05cpfym6jb27z557i1954jnz9v3ghjg45h4rjfl9ql54cx6bx429"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93521,7 +99816,7 @@ self: { exceptions filepath hlint hspec mtl mtl-compat QuickCheck text transformers transformers-compat unix unix-bytestring ]; - homepage = "https://github.com/dhess/hpio"; + homepage = "https://github.com/quixoftic/hpio"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93533,7 +99828,7 @@ self: { mkDerivation { pname = "hplayground"; version = "0.1.3.1"; - sha256 = "7b052c254d1256f7413a2c5ebf9899c8539ba6255398b30ab88a1a020089d997"; + sha256 = "15yri40046lap05b762k4nk9nly8k6cbypic790zfmhj9ljjq1bv"; libraryHaskellDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -93549,7 +99844,7 @@ self: { mkDerivation { pname = "hplaylist"; version = "0.2"; - sha256 = "de3cd65835325e1872633f524d7426ace820b9727c32677e73914a8796beb307"; + sha256 = "01xkpsb8fjlifdz6fckwfawj1s5c4rs4slizcdr1hpij6mcdcg6y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath process ]; @@ -93566,7 +99861,7 @@ self: { mkDerivation { pname = "hpodder"; version = "1.1.6"; - sha256 = "aa7128db85cb96bfb584846269fe4e0cfe612b1b5415ac87ebce753ce125293e"; + sha256 = "0gi94phkqxffxf3sq5al3cmn3zhc9vz6jql4hjsvz5nbhpdjhwda"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93586,7 +99881,7 @@ self: { mkDerivation { pname = "hpp"; version = "0.4.0"; - sha256 = "05923e6dacc0549f50ff342a3eb2b6782fe3cdc4c6190eea0e4cabc17f429f5d"; + sha256 = "0pcz89zw3asc1vm0w6f6qk6y6bvqnsr3wailzx89ym60minkx4h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93609,9 +99904,9 @@ self: { mkDerivation { pname = "hpqtypes"; version = "1.5.1.1"; - sha256 = "b99c214d7cc83573f5bf295837b42a13a4057dc9cab701b25798086f0d54795a"; + sha256 = "0nkrah6ny24qayr03dyar5yhb90k5as3fn19pzsp6df8gi6j375r"; revision = "1"; - editedCabalFile = "6915ef5e4cd5c22aee26cf85b2d6b86947ada1b0c39d39b6cadcc6bf572e454c"; + editedCabalFile = "0k255rbvzinwrav3k7f3n2hssiv9p3bb51fg4vp2mhnm9igfy5b9"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class exceptions lifted-base monad-control mtl resource-pool text text-show time @@ -93633,17 +99928,22 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, exceptions, fields-json, hpqtypes, lifted-base, log - , monad-control, mtl, text, text-show + , monad-control, mtl, safe, tasty, tasty-hunit, text, text-show + , transformers }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.2.4"; - sha256 = "3a195eba52d0454a573c5c820af3db45359bc4f7a8fd88c935f00a8496b12118"; + version = "1.3.0.0"; + sha256 = "10n97i18g94j8xc7zayp03a3b59kzjyhxs1kg06cy1npgbn8kvlz"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions - fields-json hpqtypes lifted-base log monad-control mtl text + fields-json hpqtypes lifted-base log monad-control mtl safe text text-show ]; + testHaskellDepends = [ + base exceptions hpqtypes lifted-base log tasty tasty-hunit text + transformers + ]; homepage = "https://github.com/scrive/hpqtypes-extras"; description = "Extra utilities for hpqtypes library"; license = stdenv.lib.licenses.bsd3; @@ -93657,8 +99957,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.0"; - sha256 = "6e4aedf9a421f01a22ca7a2f50b064917b4ef895d76174f59bc44ca1cc6f2f73"; + version = "2.4.2"; + sha256 = "085imrvkxvw06sg8wcgzba9jw8hficizjf6lmqk4ai6ahpgmml6s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93688,7 +99988,7 @@ self: { mkDerivation { pname = "hprotoc-fork"; version = "2.0.16.1"; - sha256 = "3971dc76b9e6ea2a281d00e648b46454230f3b9e2d0065e3f8c63056496c77b9"; + sha256 = "1fbpdi4mcc66z3ina01dkqxhy8slcjs4irh03ll2msp6p5vdqw9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93714,7 +100014,7 @@ self: { mkDerivation { pname = "hps"; version = "0.15"; - sha256 = "30df792e10ce0a2d2886ce5b6b081e95640cc00d02d9f2aa6426e7919eccb54e"; + sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hcg-minus ]; @@ -93728,7 +100028,7 @@ self: { mkDerivation { pname = "hps-cairo"; version = "0.11"; - sha256 = "e741e016ad94279108e11fbc1977f6d5b145b49506d599086a98e1880d06d3f7"; + sha256 = "1xyk0q6qiqcqd849km86jns4bcfmyrvikg0zw44929wlmlbf0hg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cairo gtk hps ]; @@ -93744,7 +100044,7 @@ self: { mkDerivation { pname = "hps-kmeans"; version = "0.1.0.0"; - sha256 = "cc21a972364cb294bffe0365014a79fd490369984412044c00d19d4976f63e70"; + sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc"; libraryHaskellDepends = [ base vector ]; homepage = "http://stathacking.com/hps-kmeans"; description = "A nice implementation of the k-Means algorithm"; @@ -93757,7 +100057,7 @@ self: { mkDerivation { pname = "hpuz"; version = "1.1.2"; - sha256 = "13e6c357228dabab1414da694476c873811d7537f5fe8fc14ff6c6c156836912"; + sha256 = "04k9hdbc3ipn9z0qzzpm6xsiv0bkr1v48sfs2haapawd49bw7rhk"; libraryHaskellDepends = [ array base bytestring parsec ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/ccasin/hpuz"; @@ -93771,7 +100071,7 @@ self: { mkDerivation { pname = "hpygments"; version = "0.2.0"; - sha256 = "92c55c9217b261fd9bbd041acc0907234740c49e3b304d31ea54c64df5dc2c38"; + sha256 = "0f1cvkslvijlx8qlsc1vkv240ir30w4wq6h4pndzsqdj2y95ricj"; libraryHaskellDepends = [ aeson base bytestring process process-extras ]; @@ -93786,7 +100086,7 @@ self: { mkDerivation { pname = "hpylos"; version = "1.0"; - sha256 = "0af208f05e222bb1a4b150f832c9cd3535ed24f8d3669693fc83bc357af2b7ed"; + sha256 = "1vdpy9x3bg43zj9rcrnkz0jfsd9mrp4k5y2hn6jb2ar2bvq0iwha"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93803,7 +100103,7 @@ self: { mkDerivation { pname = "hpyrg"; version = "0.1.0.0"; - sha256 = "5c6f97a6eeb7afeb0b117209de76c72ea4d4d3d05462a2079cf8806e7ff4ad01"; + sha256 = "00ddyiznx07qkh3s4qjls39x991fqxvdw2bj245ypbxpxsk9fvsw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93815,24 +100115,24 @@ self: { "hquantlib" = callPackage ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl - , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck - , statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, vector, vector-algorithms + , hmatrix-special, HUnit, mersenne-random-pure64, parallel + , QuickCheck, random, statistics, test-framework + , test-framework-hunit, test-framework-quickcheck2, time, vector + , vector-algorithms }: mkDerivation { pname = "hquantlib"; - version = "0.0.3.3"; - sha256 = "208839f68a4af5f3b0e09214623c8e166f768a46b6cdc7369937ab73e8d78c28"; - revision = "1"; - editedCabalFile = "64f94ba75cb01860e3a31eb2ff872e79ec18dc773545ac487c9404f37b500878"; + version = "0.0.4.0"; + sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random - parallel statistics time vector vector-algorithms + base containers hmatrix hmatrix-gsl hmatrix-special + mersenne-random-pure64 parallel random statistics time vector + vector-algorithms ]; executableHaskellDepends = [ - base containers mersenne-random parallel + base containers mersenne-random-pure64 parallel time ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -93851,7 +100151,7 @@ self: { mkDerivation { pname = "hquery"; version = "0.1.1.0"; - sha256 = "c849769d0b233f8cde0a447664b126dff40eb242cc92259b2d86bb38f75a145e"; + sha256 = "0phlbbvkifw65ndjb4nc8ar0xx6z4sqn8xj41bg8qgr31ffpcjf8"; libraryHaskellDepends = [ base containers parsec text xmlhtml ]; testHaskellDepends = [ base bytestring filepath HUnit parsec test-framework @@ -93866,7 +100166,7 @@ self: { mkDerivation { pname = "hranker"; version = "0.1.1"; - sha256 = "ed7c9e82263619844cf5971a91023c7fac8df368230b3484e996dd92a5c4e241"; + sha256 = "0hg2qjjr5pcnx62382r3d3rqvb3z7h1926lpym68869n4s19wz7d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HCL NonEmpty ]; @@ -93882,7 +100182,7 @@ self: { mkDerivation { pname = "hreader"; version = "1.1.0"; - sha256 = "2a2b02c059b343ab7ff0d340b6545a003b0d563fb8a1ad2d53d6c2f4759a7d3a"; + sha256 = "0fkxk9sz9hnnacnsv8dq7xb0sfq0b9abch6ky1zsnhxkb7004ara"; libraryHaskellDepends = [ base exceptions hset mmorph monad-control mtl tagged transformers transformers-base @@ -93899,8 +100199,8 @@ self: { }: mkDerivation { pname = "hreader-lens"; - version = "0.1.2.0"; - sha256 = "4d44e22ce21015f02007168bf07ae27d589e2e265a019b02410ba4b176d87728"; + version = "0.1.3.0"; + sha256 = "1l02fplf2gjns869rhlwzglg08gl8cpjciv9fh05rg74dhn0m3s0"; libraryHaskellDepends = [ base comonad hreader hset lens lens-action profunctors ]; @@ -93915,7 +100215,7 @@ self: { mkDerivation { pname = "hricket"; version = "0.5"; - sha256 = "ee901dde72538136de81f0e0613ffb5db2a75de4fb2f79c4826cc499014f17fe"; + sha256 = "1zhp9w0rki3chb27jbzvwifsgcjxzczn3q7hh7g3d0akfbg1v47f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers ]; @@ -93925,6 +100225,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hriemann" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , hostname, kazura-queue, network, protocol-buffers + , protocol-buffers-descriptor, text, time, unagi-chan + }: + mkDerivation { + pname = "hriemann"; + version = "0.2.1.0"; + sha256 = "06r6rgkr21vjk81msdkj4lcabfxwayvvxz6pwss1bw8fmrwkcl3k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers criterion hostname kazura-queue + network protocol-buffers protocol-buffers-descriptor text time + unagi-chan + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/shmish111/hriemann"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hruby" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck , ruby, scientific, stm, text, unordered-containers, vector @@ -93932,7 +100256,7 @@ self: { mkDerivation { pname = "hruby"; version = "0.3.4.3"; - sha256 = "a1fe68e20ffeae12b12a0f156e58c020c4d2da85dcd773ae4350f7b79aacf9cc"; + sha256 = "1k7rmjdbgxsh8fp77mywhpdd5i10q1c6w58g5aqi5bpy1zi6izm1"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -93951,7 +100275,7 @@ self: { mkDerivation { pname = "hs-GeoIP"; version = "0.3"; - sha256 = "8e5ff6a132d8944336f10dcaa69d8852cdd7953a5ff18248ae06cb2819a1ab8c"; + sha256 = "135bl4cjijq6mr485waz7aaxgkaji2fsdjhdy4v4756q6ahzcpwf"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ GeoIP ]; homepage = "http://github.com/ozataman/hs-GeoIP"; @@ -93965,7 +100289,7 @@ self: { mkDerivation { pname = "hs-bibutils"; version = "5.5"; - sha256 = "95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d"; + sha256 = "0pf5lh179rw9jkmw16ss3kiwydlj6zgfk868mjl5s57kx55z7ycm"; libraryHaskellDepends = [ base syb ]; homepage = "http://istitutocolli.org/repos/hs-bibutils/"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; @@ -93979,7 +100303,7 @@ self: { mkDerivation { pname = "hs-blake2"; version = "0.0.2"; - sha256 = "043efd374194998f4ea54a3e43713fb6a2c6f233673eb0deadf8950f22c31e44"; + sha256 = "0i0yqci0z5gqmpgb0gk76grcd8mn7xql6gjalm78z6cl84vzsgh4"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libb2 ]; testHaskellDepends = [ @@ -94000,7 +100324,7 @@ self: { mkDerivation { pname = "hs-captcha"; version = "1.0"; - sha256 = "c8eab698e6e32221b2f77c99f823fe9ee4b636ae115da0bb0ca05a14e93cad09"; + sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8"; libraryHaskellDepends = [ base bytestring gd random ]; homepage = "http://www.dankna.com/software/"; description = "Generate images suitable for use as CAPTCHAs in online web-form security"; @@ -94012,7 +100336,7 @@ self: { mkDerivation { pname = "hs-carbon"; version = "0.1.1.0"; - sha256 = "a360d5ec2f060681bdfd4232830e71a34463c0bd2f2ee4089b6df75d30b9313b"; + sha256 = "0frip4q5vxvdkc4f8bigpp066i53f4786cj2znyq21h65zndaq53"; libraryHaskellDepends = [ base deepseq mtl parallel random ]; testHaskellDepends = [ base HUnit ]; description = "A Haskell framework for parallel monte carlo simulations"; @@ -94026,7 +100350,7 @@ self: { mkDerivation { pname = "hs-carbon-examples"; version = "0.0.0.1"; - sha256 = "5f307372920791a5211effd6ee1904256b472ba5ab6cdb27253e7faac7378fc1"; + sha256 = "1hcg6z3slzry4lkxnv5bllmlfsr50hcyxmpz3qhsb487j9r76c2z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94044,7 +100368,7 @@ self: { mkDerivation { pname = "hs-cdb"; version = "0.1.1"; - sha256 = "80fe9453431fedf4d075a1b663f51c42c9d61a91b53ba89252f8cc5acbf8f31e"; + sha256 = "07pkz35mmk7qaa9ahfxmj4dddja23ksn7dm1fp8g9v8z8d9r9zl0"; libraryHaskellDepends = [ array base bytestring bytestring-mmap directory filepath mtl ]; @@ -94064,7 +100388,7 @@ self: { mkDerivation { pname = "hs-di"; version = "0.3.0"; - sha256 = "aaa77e275f54f912cb134de6bdf6981df797207df45dd318dbb30aade4668bde"; + sha256 = "1plbcvjas2mkvccd6pglglh9gxqxk3vbvrjd2g5i5yalbwkpx9xa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94090,7 +100414,7 @@ self: { mkDerivation { pname = "hs-dotnet"; version = "0.4.0"; - sha256 = "a790c77a525cb2217df6c5f97516514564f1f6b0ca4afa009a45b061f60f50d0"; + sha256 = "1l2h1zv63c25k80gljnan3vg2r25a4b7byf5yryj3cjwa9xcg457"; libraryHaskellDepends = [ base ghc-prim ]; librarySystemDepends = [ ole32 oleaut32 ]; description = "Pragmatic .NET interop for Haskell"; @@ -94106,7 +100430,7 @@ self: { mkDerivation { pname = "hs-duktape"; version = "0.1.5"; - sha256 = "716ea1f8a7414c64d03d2b7adcf47d1f29c0e2f916d8d550da63c834640683f4"; + sha256 = "1x430rj39j33v98dbn0nz7ic0a8zgpsdqyib7p868k21lzwa2vki"; libraryHaskellDepends = [ aeson base bytestring text transformers unordered-containers vector ]; @@ -94127,7 +100451,7 @@ self: { mkDerivation { pname = "hs-excelx"; version = "0.6.0.0"; - sha256 = "850ed56a4d92ad05db4616fa7ce3b2a6db08024f469856434099588e9a72178a"; + sha256 = "12hpfad8wn4r811md6269w10inx6nbipryhn8vdhbbcj9mmda3l5"; libraryHaskellDepends = [ base bytestring containers mtl text time xml-conduit zip-archive ]; @@ -94141,7 +100465,7 @@ self: { mkDerivation { pname = "hs-ffmpeg"; version = "0.3.4"; - sha256 = "a1607f5db460afca8c8d5af25eb50da15b29f7d6ad63f7ecd3daac3b5a6ea248"; + sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51"; libraryHaskellDepends = [ base bytestring haskell98 ]; homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg"; description = "Bindings to FFMPEG library"; @@ -94154,7 +100478,7 @@ self: { mkDerivation { pname = "hs-fltk"; version = "0.2.5"; - sha256 = "fde3fd46ae27c8f0f3ce3ca9d51f284482094f8e239bd08e98e0d71484777d59"; + sha256 = "0nbxfy219mz0k27d16r3ir7hk0j450gxba9wrvrz1j17mr3gvqzx"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ fltk fltk_images ]; homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/"; @@ -94168,7 +100492,7 @@ self: { mkDerivation { pname = "hs-gchart"; version = "0.4.1"; - sha256 = "a9905eb488ba0032d4f8c550a28de0ee93ae3eb18cc215caee2de2f9db9bbe5a"; + sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459"; libraryHaskellDepends = [ base mtl ]; homepage = "http://github.com/deepakjois/hs-gchart"; description = "Haskell wrapper for the Google Chart API"; @@ -94183,7 +100507,7 @@ self: { mkDerivation { pname = "hs-gen-iface"; version = "0.5.0"; - sha256 = "9acf324e7610af9440a9e4a65a3fd291b51246f3240888bd77aeccfb8fbd7fd7"; + sha256 = "1mvzpn7zpk5ffyyqh214yd315dcis8zmm9p4m5099bqhfr735kws"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94202,7 +100526,7 @@ self: { mkDerivation { pname = "hs-gizapp"; version = "0.1.0.3"; - sha256 = "95e9b95af8b680a110e14592cfee0a2725c081996210042e08c98a52e5d0fcc8"; + sha256 = "1j7ws3jm52n910p08432k60w09971bpcz4j5w48a305nz1dbkscm"; libraryHaskellDepends = [ base containers directory filepath parsec process ]; @@ -94216,7 +100540,7 @@ self: { mkDerivation { pname = "hs-inspector"; version = "0.5.2.0"; - sha256 = "c85b9792dde90be15eddedcf8737e0704e40cecb7b839f95e9f6816d0a953171"; + sha256 = "0w9ijl56v0gnx6arz0vvrg740kkhw0vqgkzdvmgf22z9vn99fny8"; libraryHaskellDepends = [ base haskell-src ]; testHaskellDepends = [ base haskell-src hspec ]; description = "Haskell source code analyzer"; @@ -94232,7 +100556,7 @@ self: { mkDerivation { pname = "hs-java"; version = "0.3.4"; - sha256 = "07ffa9e97e200af838c27a137e5d2f0240bd38772a35018ad14973972eff66e3"; + sha256 = "1qv6zwp9fws9s6502d9afwwbsh025xfpw4vsq8wgh2i0gvlskzq7"; libraryHaskellDepends = [ array base binary binary-state bytestring containers control-monad-exception data-binary-ieee754 data-default directory @@ -94248,7 +100572,7 @@ self: { mkDerivation { pname = "hs-json-rpc"; version = "0.0.0.1"; - sha256 = "6cc85a11e851c13c1e0c2a0981a094c9bc0b58e515b57be05e60317a27f59f62"; + sha256 = "0qlzylkplcb0bvh7pd8mwmc0pg69jjh8229a1hg3rhaix08mmj3c"; libraryHaskellDepends = [ aeson base bytestring HTTP network text ]; @@ -94267,7 +100591,7 @@ self: { mkDerivation { pname = "hs-logo"; version = "0.5.1"; - sha256 = "2344114e3b463c6e274854f25a91b6a07de9815c50e9375e38c789c0ae24f97a"; + sha256 = "0ypr4jpc12f771g3gsahbj0yjzd0ns8mmwjl90knwg267d712i13"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94293,7 +100617,7 @@ self: { mkDerivation { pname = "hs-mesos"; version = "0.20.3.0"; - sha256 = "b095ec5641e2819926e4324539bcbbd3c1c859cee5ec424bb697db12cb7035b5"; + sha256 = "1d9mf35i5nwpnr5l5v75rrcwihfkpfy3ji9jwhk9k0g285bfr5dh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94310,12 +100634,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; + "hs-multiaddr" = callPackage + ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap + , filepath, hspec, iproute, multihash, sandi + }: + mkDerivation { + pname = "hs-multiaddr"; + version = "0.1.0.1"; + sha256 = "0bac505a3fvz46zbh60vl0m6jj5snjbmj925vxhv6bpdydidi8hw"; + libraryHaskellDepends = [ + base bytes bytestring cereal filepath iproute multihash sandi + ]; + testHaskellDepends = [ + base bytestring either-unwrap hspec iproute multihash sandi + ]; + homepage = "https://github.com/MatrixAI/haskell-multiaddr#readme"; + description = "Multiaddr Library for LibP2P"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: mkDerivation { pname = "hs-nombre-generator"; version = "0.2.1.0"; - sha256 = "9c3cf49fdd13b07c11cc3406486863b0ccf48c8067ad8a18c368ae122d3a62ae"; + sha256 = "1bk278ni5bk8qcc8mbb7h26g9k5hcdl4h1ilrh8prc0kvngz8g4w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HandsomeSoup hxt random ]; @@ -94331,7 +100675,7 @@ self: { mkDerivation { pname = "hs-pgms"; version = "0.1.0.1"; - sha256 = "6070cadc719ce83ce68cd497c069f35c85672c1ee0750701aa78fe8a1e989a18"; + sha256 = "064sk0g8mzkqm80hfxg03qn6g1awydlw15ylikk3rs4wf7fclw30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base MonadPrompt mtl random ]; @@ -94348,7 +100692,7 @@ self: { mkDerivation { pname = "hs-php-session"; version = "0.0.9.3"; - sha256 = "0e717e90933f9e861d9cf374baa0dedac51d8ae7a1746ef2f7bd098fe38c8df7"; + sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/elblake/hs-php-session"; description = "PHP session and values serialization"; @@ -94360,9 +100704,9 @@ self: { mkDerivation { pname = "hs-pkg-config"; version = "0.2.1.0"; - sha256 = "104e39324e9ece701a21bf3f428b5d0382fd8f426b65b4ef1f54ab41cc9d6227"; - revision = "1"; - editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784"; + sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh"; + revision = "2"; + editedCabalFile = "1kj5lrv2a9mgzqbwkznpsgjgs5s9wnwrcsab2mykxpkm8f71nk81"; libraryHaskellDepends = [ base data-default-class text ]; homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; @@ -94379,7 +100723,7 @@ self: { mkDerivation { pname = "hs-pkpass"; version = "0.4"; - sha256 = "ae16f7a94c6e6284107c959684bea153fbde98a9fd7ee5cb7b495ca4a2a04c06"; + sha256 = "01jcl2ia8p29gg5yazpxm6cdxyskl6z895lmgh888qkf9jlzf5mf"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit directory filesystem-conduit old-locale random shakespeare-text shelly @@ -94397,7 +100741,7 @@ self: { mkDerivation { pname = "hs-popen"; version = "0.1.0.0"; - sha256 = "408177b6e822f5bfde0897563dafbefa29be68491d6c7418b802d90ce26cb681"; + sha256 = "10dndki0rn82p0c78v0x95lbwagspspksmlp13gbzx92x2v7g0a0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -94412,7 +100756,7 @@ self: { mkDerivation { pname = "hs-re"; version = "0.1.0"; - sha256 = "6bf143a1d791e34af15c80210073465446dbf1f453ff5d414833452f1dd4a767"; + sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb"; libraryHaskellDepends = [ array base regex-base regex-posix ]; description = "Easy to use Regex"; license = stdenv.lib.licenses.mit; @@ -94427,7 +100771,7 @@ self: { mkDerivation { pname = "hs-scrape"; version = "0.1.0.0"; - sha256 = "dbf8b3f9d74708510bd6327efa86d7488a38830402eb363be18c0dd94fcbbf70"; + sha256 = "0w5zrd7xj3ccw4xkdsq20j1ki2j8sy3glzijsq5m2227szwv7y6v"; libraryHaskellDepends = [ base bytestring containers data-default exceptions hspec html-conduit lens retry safe text transformers url wreq xml-conduit @@ -94441,6 +100785,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-server-starter" = callPackage + ({ mkDerivation, base, directory, HUnit, network, temporary, unix + }: + mkDerivation { + pname = "hs-server-starter"; + version = "0.1.0.1"; + sha256 = "03rqiq40r8vh1kp8fbpj77q1p71h1jh53awsc9v1l28z3680h4kf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory network ]; + testHaskellDepends = [ base HUnit network temporary unix ]; + homepage = "https://github.com/hiratara/hs-server-starter"; + description = "Write a server supporting Server::Starter's protocol in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -94448,7 +100808,7 @@ self: { mkDerivation { pname = "hs-twitter"; version = "0.2.8"; - sha256 = "f056b212006bcd5dc14ead931356fc7c94d17db8b78a004cabbd967670690be5"; + sha256 = "1r8bd5q7d5mxmd6012mpp1yx353wzib174xd9v0mvkbb009b4mph"; libraryHaskellDepends = [ base HTTP json mime network old-locale old-time random utf8-string ]; @@ -94462,7 +100822,7 @@ self: { mkDerivation { pname = "hs-twitterarchiver"; version = "0.2"; - sha256 = "8f6158df101b35ecfef31bf8095b66421b594fc400d59b841edd38611b62f51c"; + sha256 = "077mc8dn2f6x3s29pm80qi7mj6s2crdhky0vygzfqd8v23gmhqcg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HTTP json mtl network pretty ]; @@ -94477,7 +100837,7 @@ self: { mkDerivation { pname = "hs-vcard"; version = "0.1"; - sha256 = "25fc5cebe2008015768b3b5d6185307b13d36d3644a6db5bc3918d38977e6761"; + sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15"; libraryHaskellDepends = [ base old-locale time ]; homepage = "http://qrcard.us/"; description = "Implements the RFC 2426 vCard 3.0 spec"; @@ -94492,7 +100852,7 @@ self: { mkDerivation { pname = "hs-watchman"; version = "0.0.0.3"; - sha256 = "d1cd8bda7c98111f8e20850a49587e1970b8593b9e2572070011cde61fa110b3"; + sha256 = "1cqhl4gydk8i003p49cy7dcvhw0rgrc4j2l54271y4cqgkd8pkfi"; libraryHaskellDepends = [ async base binary bytestring containers filepath network process temporary @@ -94514,7 +100874,7 @@ self: { mkDerivation { pname = "hs2048"; version = "0.1.0"; - sha256 = "faceda8c73f3f5e977ef4edcea339399ea639ee151fc411f0111ad8021a7a9c2"; + sha256 = "1hm9lwhq1b8i04gl3z2iw6g67slrjcrymp2fxxvykxgkff6dmkps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random ]; @@ -94538,7 +100898,7 @@ self: { mkDerivation { pname = "hs2bf"; version = "0.6.2"; - sha256 = "95ba3fa0b17bdd9efc8a8203611c11174aada4f9fff14c62f199b3f840bfa0d3"; + sha256 = "1lx0px0gicwry5i4rwgzz6jasjhp24f620w2iby9xpbvn6h3zflm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94557,7 +100917,7 @@ self: { mkDerivation { pname = "hs2dot"; version = "0.1.4"; - sha256 = "fd2a874e3fa254235bbaaf8ceb5afa2360714447180ca3b7ed96367b3165cb5d"; + sha256 = "0pfbclqpndlnxnvs630q8x272q13z9dfp35gp9dj6m527x78fapx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94574,15 +100934,26 @@ self: { mkDerivation { pname = "hsConfigure"; version = "0.1.0.2"; - sha256 = "6cf0e57e4b7c9bdfcb1a9d6c88cc0d35402ec10a242cef0d01a50d2885fa3aa5"; + sha256 = "199sza2jh3d5046yyb141b0jwh1m1p68hv4x3b5xz6vw9dzfbw3c"; revision = "2"; - editedCabalFile = "ab3264ebf799e07e40fd913b9061197b346a7d84145908566155231e62a45c02"; + editedCabalFile = "00jwlii1w8smc5b0hn8lhiynld3v35hr0fwizm07xq4ryzmn8cmb"; libraryHaskellDepends = [ base directory filepath process unix ]; homepage = "http://github.com/YoshikuniJujo/hsConfigure/wiki"; description = "By using this package, you can make application configurable"; 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 @@ -94590,7 +100961,7 @@ self: { mkDerivation { pname = "hsSqlite3"; version = "0.1"; - sha256 = "ca7c9828c37c4f452063147edf3a1347f9f5afd21c5cf547fbe233ce18d7ba72"; + sha256 = "0wmsswccwcz2zd3zap0wsapzbya72cxdyzhlcch4akvwqcl9hz6a"; libraryHaskellDepends = [ base bindings-sqlite3 bytestring mtl utf8-string ]; @@ -94604,7 +100975,7 @@ self: { mkDerivation { pname = "hsXenCtrl"; version = "0.2.0"; - sha256 = "379faf489cf541d64ec6938d04e8449046bbf168c2c48d748980a53b99a7b57f"; + sha256 = "0zxmlyckp9c0i5s8vi62d3qvnilh8kl093ckqr7dchgmki4az7rp"; libraryHaskellDepends = [ array base bytestring dlist mtl ]; librarySystemDepends = [ xenctrl ]; homepage = "http://haskell.org/haskellwiki/HsXenCtrl"; @@ -94620,8 +100991,8 @@ self: { }: mkDerivation { pname = "hsass"; - version = "0.4.0"; - sha256 = "512faf0e01e720395699066139379fb2e5e5f456f465c72d58282b75b6ec0f9d"; + version = "0.4.1"; + sha256 = "1k7v2m4k90dg5hbkswf2ff5nm6ri58nlmc1jq9lwv6dxiqbm3nv7"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -94632,6 +101003,7 @@ self: { homepage = "https://github.com/jakubfijalkowski/hsass"; description = "Integrating Sass into Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsay" = callPackage @@ -94639,7 +101011,7 @@ self: { mkDerivation { pname = "hsay"; version = "1.1.0"; - sha256 = "34ef6fd63f7b35eef1357160c1ae1e07fe8ebbd2a8ff2a87d9ae8114883f5961"; + sha256 = "0qar7y4190dfv63jmzx8saxqxzh73spc2q3i6pqywdbv7zb6zvrl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Hclip HTTP process unix ]; @@ -94655,7 +101027,7 @@ self: { mkDerivation { pname = "hsb2hs"; version = "0.3.1"; - sha256 = "8ad800820554f273ada083dfce2f463d920fb1ceb053255023a4c883b090f9d8"; + sha256 = "1n7rj2q87j544d82alxhrsqhz4ix8qpwxpw3l2np7wjl0n101n4a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94672,7 +101044,7 @@ self: { mkDerivation { pname = "hsbackup"; version = "0.1.1"; - sha256 = "bf9472ba5168f346bd87243d7b25aab45b4177b2c4b456a52bb5b1e3065934bc"; + sha256 = "1g1lb43f7cdm5fjmdd64n9vl2nxlm8jpng94hyyldwv8a6x7555z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94689,7 +101061,7 @@ self: { mkDerivation { pname = "hsbc"; version = "0.1.1.0"; - sha256 = "812c30f8901fb82b50b6e17a5d219687fecb00bb65938b2af0610965c28dc4b1"; + sha256 = "1cf4ip16a2b1y0m8p4v5pc0cpzl7jqhmsyp1nr82pf0zj3w30b41"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base text vector ]; @@ -94706,7 +101078,7 @@ self: { mkDerivation { pname = "hsbencher"; version = "1.20.0.5"; - sha256 = "30f94d5d1fd68cfbe814571786dee348d3aa6607463973c78cd83603820517bb"; + sha256 = "1fqp0n106dnqik3p6fa60xkamls8wgg8c5sp2klgp36n3xflvy9h"; libraryHaskellDepends = [ async base bytestring containers data-default directory filepath GenericPretty io-streams mtl process random time unix @@ -94728,7 +101100,7 @@ self: { mkDerivation { pname = "hsbencher-codespeed"; version = "0.1.0.1"; - sha256 = "85a228b4f7e5317c2034d6f50baf08758c1944806df5b08ac0a0fd3a0e5370a8"; + sha256 = "1a3hac73mzd0q25b1xbdh121k33m12phpxfn6hh7qcg5yys2i8l5"; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hsbencher HTTP http-conduit http-types json mtl network resourcet @@ -94747,7 +101119,7 @@ self: { mkDerivation { pname = "hsbencher-fusion"; version = "0.3.15.2"; - sha256 = "994c15a8b1231964e96f43abb435701556094f834c455bc5d7a5e7fd4b95e276"; + sha256 = "0xp2jm5zvrx5sz2mniachd7hjmhmf0sv9as3dzln8693n6l1ak4r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94767,8 +101139,8 @@ self: { ({ mkDerivation, base, containers, directory, filepath, process }: mkDerivation { pname = "hsc2hs"; - version = "0.68.1"; - sha256 = "507bf174c7ab14667d452efb6b539798a944f2a5fd4cd45120a1afb8551ebe75"; + version = "0.68.2"; + sha256 = "061ns6ig52pcjwi9cgdcasya4cgm3zlb5s2mzq9p01vw4iy702gn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94787,7 +101159,7 @@ self: { mkDerivation { pname = "hsc3"; version = "0.15.1"; - sha256 = "0aae1ad15dd2698e7b035ce512b9963364fa668ccac66c4aa1670b8433c1a5a9"; + sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha"; libraryHaskellDepends = [ base binary bytestring containers data-default data-ordlist directory filepath hashable hosc network process random safe split @@ -94804,7 +101176,7 @@ self: { mkDerivation { pname = "hsc3-auditor"; version = "0.15"; - sha256 = "c39410b6a2512cc4f315296924bae559cfaf8919a2d0bd72fbb122700df0e40a"; + sha256 = "02p4y06p08mizdrbvl52364szksrwnx28s992prw8b2ilav11563"; libraryHaskellDepends = [ base filepath hmt hosc hsc3 hsc3-sf-hsndfile ]; @@ -94818,7 +101190,7 @@ self: { mkDerivation { pname = "hsc3-cairo"; version = "0.14"; - sha256 = "3ad66f4f8d17dda98ab3cdf762aa3930aeaf82fba2db70d78bc74fada5abc2b8"; + sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis"; libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ]; homepage = "http://rd.slavepianos.org/?t=hsc3-cairo"; description = "haskell supercollider cairo drawing"; @@ -94833,7 +101205,7 @@ self: { mkDerivation { pname = "hsc3-data"; version = "0.15"; - sha256 = "ed2072aaa1ea34aa95a5ee6819d8f4d74341508de8687b396f94472795cd410c"; + sha256 = "0321rnajfiwldwwpns78im842hypykc1js7flnasld7al6m7487d"; libraryHaskellDepends = [ base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot hsc3-sf-hsndfile safe split SVGPath xml @@ -94849,7 +101221,7 @@ self: { mkDerivation { pname = "hsc3-db"; version = "0.15"; - sha256 = "747d622739ff652fa2478f8ee0cd1d483c8d4ef69b96639da98436d40086436a"; + sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl"; libraryHaskellDepends = [ base hsc3 safe ]; homepage = "http://rd.slavepianos.org/t/hsc3-db"; description = "Haskell SuperCollider Unit Generator Database"; @@ -94861,7 +101233,7 @@ self: { mkDerivation { pname = "hsc3-dot"; version = "0.15"; - sha256 = "15a4fa74e42db672219c23ef3eb7dda7588a548bc9ee1e7cae7a08fe4b7862b2"; + sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m"; libraryHaskellDepends = [ base directory filepath hsc3 process ]; homepage = "http://rd.slavepianos.org/t/hsc3-dot"; description = "haskell supercollider graph drawing"; @@ -94875,7 +101247,7 @@ self: { mkDerivation { pname = "hsc3-forth"; version = "0.15"; - sha256 = "9c22fa0d9da9e9667b9f355604ecd1a24f9a6f9e35ab02a80b9b8b900337782c"; + sha256 = "0b3q6w1r12wv1fl05armkrprlkx2s7n08mimkxxndsd9kl6zl8lw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94897,7 +101269,7 @@ self: { mkDerivation { pname = "hsc3-graphs"; version = "0.15"; - sha256 = "6868d3cb0493d3e2898dfc3296b4656a1819bc3ffdc8804a8a7c72a8017da9b4"; + sha256 = "1d59gl0shwkwi9581j7x7yy1j63acns9ccpwin4y5lwk0k5x6s38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94922,7 +101294,7 @@ self: { mkDerivation { pname = "hsc3-lang"; version = "0.15"; - sha256 = "0ec6d7f76d191e6097e46d72a22eb1ecc42d2238f412272de40c1088d64c1627"; + sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf"; libraryHaskellDepends = [ array base bifunctors bytestring containers data-default data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom @@ -94941,7 +101313,7 @@ self: { mkDerivation { pname = "hsc3-lisp"; version = "0.15"; - sha256 = "1d08f8d832a76df1b8d675ea61f5d521b4ed66d8baff6ce0aeded1bde38d85cc"; + sha256 = "1k45ipivvlfymvh6rzxsv1kfvd11spsn3skmsswg2vd76bcgh20x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94961,7 +101333,7 @@ self: { mkDerivation { pname = "hsc3-plot"; version = "0.15"; - sha256 = "63d2e35837e403fad8dcd063f81b1dedbb1978c2192ea12677115d4cca24b6ec"; + sha256 = "1v5n4k54qp8ifwka2bhrq9w1kfzd3ldzhqyhvkcgl0z46xcf7lk3"; libraryHaskellDepends = [ base directory filepath hosc hsc3 hsc3-lang process split statistics vector @@ -94980,7 +101352,7 @@ self: { mkDerivation { pname = "hsc3-process"; version = "0.10.0"; - sha256 = "ace3a309858541f5ec377403391d71176653601bcac3fa69adfa9576a74ae6c0"; + sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94997,7 +101369,7 @@ self: { mkDerivation { pname = "hsc3-rec"; version = "0.14.1"; - sha256 = "d4dd8e94f65c8caf3e437f6c49a345048c14138c6b070018a815c440f2260155"; + sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl"; libraryHaskellDepends = [ base hsc3 ]; homepage = "http://rd.slavepianos.org/?t=hsc3-rec"; description = "Haskell SuperCollider Record Variants"; @@ -95012,7 +101384,7 @@ self: { mkDerivation { pname = "hsc3-rw"; version = "0.15"; - sha256 = "17fd21044aec0ee2b70118b3da1d63cfc9d1f89d2b98bf8ae39c381b14e096c9"; + sha256 = "1jcnw0a1nf4wwf5bz61bkpwd3jfgccfxmcqq06vy43pc98223z8p"; libraryHaskellDepends = [ base directory haskell-src-exts parsec polyparse split syb transformers @@ -95033,7 +101405,7 @@ self: { mkDerivation { pname = "hsc3-server"; version = "0.10.0"; - sha256 = "57bcb588adc0cabc5114919c32c240be63de704545b4803ac44e447364059c02"; + sha256 = "00lw0mj76i2fqhx81d258mqdwqxy8313574i2i8vrjn0mn4bbg2p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95056,7 +101428,7 @@ self: { mkDerivation { pname = "hsc3-sf"; version = "0.15"; - sha256 = "27f3f4e7dbd9738d423fe12547e6da12ef45da4a281e6eb1833a8bb8217ee3b5"; + sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7"; libraryHaskellDepends = [ base bytestring hosc ]; homepage = "http://rd.slavepianos.org/t/hsc3-sf"; description = "Haskell SuperCollider SoundFile"; @@ -95070,7 +101442,7 @@ self: { mkDerivation { pname = "hsc3-sf-hsndfile"; version = "0.15"; - sha256 = "512895c97b150d59a5a7b026f6a842accde1932492b78de5c5f428f484d67a86"; + sha256 = "11ksss2g8a7lqpjqvdwj4j9y3kdc8algc9mhlyjmj38mgg4raa2i"; libraryHaskellDepends = [ array base hsc3-sf hsndfile hsndfile-vector vector ]; @@ -95084,7 +101456,7 @@ self: { mkDerivation { pname = "hsc3-unsafe"; version = "0.14"; - sha256 = "d28f7fa55216e4d0199b9d8d008627d866fb95300ef88530fc1882d04fc7dc4f"; + sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj"; libraryHaskellDepends = [ base hsc3 ]; homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe"; description = "Unsafe Haskell SuperCollider"; @@ -95099,7 +101471,7 @@ self: { mkDerivation { pname = "hsc3-utils"; version = "0.15"; - sha256 = "3d664fffb74e758265d504ca3707c542364912263ba7ce1f87f26461cd176fdf"; + sha256 = "1pvg2z6n2r7jhwgwx9rv4q94jdj2ql3kgjh4smjq4xafnzzlyrix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95121,7 +101493,7 @@ self: { mkDerivation { pname = "hscaffold"; version = "0.4.5.0"; - sha256 = "8f94525878efbe2f6c8ce80717027596d9e004a5b3ca86f1c3db8bcb2cbd365e"; + sha256 = "0pinplncp2yvqgqqdjmkll2f1ncnfl11f1z8iin2zgpgg1c5554g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95149,7 +101521,7 @@ self: { mkDerivation { pname = "hscamwire"; version = "0.2.1"; - sha256 = "6c796c6f8a379559b8e089fc2193b8de2edd0a76dba270b06fa2417002e3962a"; + sha256 = "0alnwc170hd2dyq718nvfq5dsbnyp29j3z49w2w5k59pi9pnqybc"; libraryHaskellDepends = [ array base time unix ]; librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ]; description = "Haskell bindings to IIDC1394 cameras, via Camwire"; @@ -95164,7 +101536,7 @@ self: { mkDerivation { pname = "hscassandra"; version = "0.0.7"; - sha256 = "c419ce941fe74b481a477437f84e136b70313f803826ab2e1ef8eaace609591a"; + sha256 = "06jr17karspq3qpan9iqh0zk2w3b2d7ghdvl8wd4hjz73yacw6f4"; libraryHaskellDepends = [ base bytestring cassandra-thrift containers mtl network old-time Thrift @@ -95180,7 +101552,7 @@ self: { mkDerivation { pname = "hscd"; version = "0.0.3"; - sha256 = "599631ee86846a6cb5e5417007abf2dbd383ddbc9d64d04869cbbda0d61b4ef2"; + sha256 = "1wjf3gba1gfbd54d0r4xpkfq7lyvyamhfw21wnsnqsl4hvp335jr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ]; @@ -95196,7 +101568,7 @@ self: { mkDerivation { pname = "hsclock"; version = "1.0"; - sha256 = "ce9a53a4f1aa45813d8a40f38afc528fc032a1d114e602d4b363ec9db01b053d"; + sha256 = "0g853fq9vv33nga05rhls6hk5h4gaby8mws0i8yq2iday6j576nf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cairo glib gtk old-time ]; @@ -95211,7 +101583,7 @@ self: { mkDerivation { pname = "hscolour"; version = "1.24.1"; - sha256 = "e46fe3de8ed6f96e2216b94b7608d01919bc86b15dd8d0ec7e71c0e7e5bf79c8"; + sha256 = "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -95229,7 +101601,7 @@ self: { mkDerivation { pname = "hscope"; version = "0.4.3"; - sha256 = "6d632a174906977d51d06a368437cdc83fdce9888eb362135e9dc0249258532a"; + sha256 = "0ajkb2929h4xbq9n5cwfi3lxqgy8rlvq8dkas18pv5q694bjlqvd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95250,7 +101622,7 @@ self: { mkDerivation { pname = "hscrtmpl"; version = "1.5"; - sha256 = "808a80880f2880432fd6c27c99aeb841d325afdad36f0aae7a5a45f512206589"; + sha256 = "12b5409gaiasgap0lvykvapjbls1p2p9jz62sqpl70181y4812l0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory process time ]; @@ -95260,18 +101632,21 @@ self: { }) {}; "hscuid" = callPackage - ({ mkDerivation, base, containers, formatting, hostname, random - , text, time, transformers, unix + ({ mkDerivation, base, containers, criterion, hostname, mwc-random + , random, text, time, transformers, unix }: mkDerivation { pname = "hscuid"; - version = "1.2.0.0"; - sha256 = "b4b03b2005cc3e6651b2e221ce5dcdf73026b8f6ab175d0f5a8fe6b427ebb505"; + version = "1.2.0.1"; + sha256 = "0dn0kikx3zjzj9x8fkr046l4s0j7cs61d4ksw1fpwqyg5jwkzhmj"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base formatting hostname random text time transformers unix + base hostname mwc-random random text time transformers unix ]; - testHaskellDepends = [ base containers ]; - homepage = "https://github.com/eightyeight/hscuid"; + executableHaskellDepends = [ base criterion ]; + testHaskellDepends = [ base containers text ]; + homepage = "https://github.com/crabmusket/hscuid"; description = "Collision-resistant IDs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95282,9 +101657,9 @@ self: { mkDerivation { pname = "hscurses"; version = "1.4.2.0"; - sha256 = "728533d95eedf42c485ad493031eae5b07cab4b797d1b0ec6576d07208404e57"; + sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj"; revision = "1"; - editedCabalFile = "185f294036aaced6a4cf72c994339286e8e7886f5a327c3ccac898066985c528"; + editedCabalFile = "0a65hmlhd668r8y7qcjsdy4fgs46j8rr9jbjryjddkma6r02jpqq"; libraryHaskellDepends = [ base exceptions mtl old-locale old-time unix ]; @@ -95298,7 +101673,7 @@ self: { mkDerivation { pname = "hscurses-fish-ex"; version = "1.3.1"; - sha256 = "fad7a0fca21b9130869df65773df120e0cdbf7e4c53e55ca12d402cac616ebe8"; + sha256 = "1s7b2v3cl0nl2b55agn5wkvxn30f2bgp6mznkn33148vlbya1mzs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hscurses random safe unix ]; @@ -95313,7 +101688,7 @@ self: { , data-default, deepseq, directory, exceptions, filepath, fsnotify , ghc, ghc-boot, ghc-paths, ghc-syb-utils, haddock-api , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens - , lifted-base, monad-control, monad-loops, mtl, network + , lifted-base, mmorph, monad-control, monad-loops, mtl, network , optparse-applicative, process, regex-pcre-builtin, scientific , simple-log, syb, template-haskell, text, text-region, time , transformers, transformers-base, uniplate, unix @@ -95321,15 +101696,15 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.2.2.0"; - sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932"; + version = "0.2.5.0"; + sha256 = "12x26y11xd5h0j3s2j3pvfjak6mbdc417brhx6zva9k1x4lijagm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal containers cpphs data-default deepseq directory exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils haddock-api - haskell-src-exts hdocs hformat hlint HTTP lens lifted-base + haskell-src-exts hdocs hformat hlint HTTP lens lifted-base mmorph monad-control monad-loops mtl network optparse-applicative process regex-pcre-builtin scientific simple-log syb template-haskell text text-region time transformers transformers-base uniplate unix @@ -95356,7 +101731,7 @@ self: { mkDerivation { pname = "hsdif"; version = "0.14"; - sha256 = "b54676cfaaf943ad1a1dcf605524e57568caf47e26768c0325cedf8abed1b5f3"; + sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm"; libraryHaskellDepends = [ base bytestring hosc ]; homepage = "http://rd.slavepianos.org/?t=hsdif"; description = "Haskell SDIF"; @@ -95369,7 +101744,7 @@ self: { mkDerivation { pname = "hsdip"; version = "0.1"; - sha256 = "04f196ad26e6f69284f569d7b208c4ed80d7be68bd0af0b81932b3251cbb1c43"; + sha256 = "0hqwpcf2bcrj36wg02mxd2zdg07dqh4b5mv9yn295xp64snrdw84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cairo containers HUnit parsec ]; @@ -95384,7 +101759,7 @@ self: { mkDerivation { pname = "hsdns"; version = "1.7"; - sha256 = "48960ac9e1f0d1e338170aac35f6fd7e064a3b36314894f4a968113385205cd3"; + sha256 = "1lsw422k64b8m7s98j1i6qxll1kyzpv3bb0a2wwf7lghw74hm5j8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network ]; @@ -95402,7 +101777,7 @@ self: { mkDerivation { pname = "hsdns-cache"; version = "1.0.4"; - sha256 = "31a18caf24e40456bb65cac139ecf2124c640c3724bafef98f02184fa71008b8"; + sha256 = "1f0822kly602izwzxfi46w668k0jybn3khfacnxmc1744jpqr89i"; libraryHaskellDepends = [ base hsdns network SafeSemaphore text time unordered-containers ]; @@ -95417,7 +101792,7 @@ self: { mkDerivation { pname = "hse-cpp"; version = "0.2"; - sha256 = "eeb0168c00bf5dd2975faf3f5915035c73b40063b1f315ce3fd58f66a6ae4b4c"; + sha256 = "0k2bmsk6d3ym7z71bwxicc0b8wsw0camjgxgbybx4pdz0261dc7f"; libraryHaskellDepends = [ base cpphs haskell-src-exts ]; description = "Preprocess+parse haskell code"; license = stdenv.lib.licenses.mit; @@ -95430,7 +101805,7 @@ self: { mkDerivation { pname = "hsebaysdk"; version = "0.4.0.0"; - sha256 = "0738d0df113b15bb9148ecbe02f0a34562c557d8f64b65065122925e29df8901"; + sha256 = "00c9vwlmx4i2a436ajznv1bwaqj5lgq05gpc928vn59v27gx0f07"; libraryHaskellDepends = [ aeson base bytestring http-client http-types text time transformers unordered-containers @@ -95444,12 +101819,12 @@ self: { ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: mkDerivation { pname = "hsemail"; - version = "1.7.7"; - sha256 = "25aac3890ff09812be47639ad52cd7be622dc9b193e5a0be115bda12ffcd989b"; + version = "2"; + sha256 = "1nd8pzsdan6zxddm96xswcm67g43zkbj1rm3m3wx3as4jj3qmw7m"; libraryHaskellDepends = [ base mtl old-time parsec ]; - testHaskellDepends = [ base doctest hspec old-time parsec ]; - homepage = "http://github.com/peti/hsemail"; - description = "Internet Message Parsers"; + testHaskellDepends = [ base doctest hspec mtl old-time parsec ]; + homepage = "https://github.com/peti/hsemail#readme"; + description = "Parsec parsers for the RFC2822 Internet Message format"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -95459,7 +101834,7 @@ self: { mkDerivation { pname = "hsemail-ns"; version = "1.3.2"; - sha256 = "9afc3dda1ad6b6a04f3851b40dc82b165bdd27400bbdfc4f2fd21fb5b4bda00d"; + sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s"; libraryHaskellDepends = [ base mtl old-time parsec ]; homepage = "http://patch-tag.com/r/hsemail-ns/home"; description = "Internet Message Parsers"; @@ -95475,7 +101850,7 @@ self: { mkDerivation { pname = "hsenv"; version = "0.5"; - sha256 = "0338efdfda4a8e5383dc577cbaa19a9254b63ded06c104557ac90cd3d14d52ce"; + sha256 = "1kjj9p8x6369g9ah9h86xlyvcm4jkahvlz2pvj1m73javbgyyf03"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95493,7 +101868,7 @@ self: { mkDerivation { pname = "hserv"; version = "0.1.0.3"; - sha256 = "4382033dac11c95c2d08b200b7a88bfa33588eaddba98f304cbf3d6e479b76b7"; + sha256 = "1dvnkd3nwgdz9hq8zafvmn75hczsiflbf05j10nmrj8imhyh70j3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs wai-app-static warp ]; @@ -95507,7 +101882,7 @@ self: { mkDerivation { pname = "hset"; version = "2.2.0"; - sha256 = "b8747a0826aeaca2ca814e7a334f9de5a02f36ac83faea5e1c32c8f6040bf130"; + sha256 = "0c7i1c2gdj1j3igfmyl3mhv2z875km7k6yjfh75a5b5f4q47lx5q"; libraryHaskellDepends = [ base deepseq tagged type-fun ]; testHaskellDepends = [ base HUnit tagged ]; homepage = "https://bitbucket.org/s9gf4ult/hset"; @@ -95521,8 +101896,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.0"; - sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f"; + version = "0.6.1.1"; + sha256 = "029zlchaijhv5rmd0llmqp1wpaskjfp8alhqh0bisz4sjgk2qw1p"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -95539,7 +101914,7 @@ self: { mkDerivation { pname = "hsfacter"; version = "0.2.1"; - sha256 = "18ac5293ed38dd53aa82792f1c66029bb0e8db1027afd404c7a55fe981b7f7c8"; + sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q"; libraryHaskellDepends = [ base containers language-puppet text ]; homepage = "http://lpuppet.banquise.net"; description = "A small and ugly library that emulates the output of the puppet facter program"; @@ -95552,7 +101927,7 @@ self: { mkDerivation { pname = "hsfcsh"; version = "0.0.1"; - sha256 = "0c4fa3442e8da7b003e21e472cec2f0d18188ae86ab081d69d8e6a3ec67481b9"; + sha256 = "1fc1fk33wslfkpb83c3ax251h60d5zn2qiqyw81v19wd5r2a6kqc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95569,7 +101944,7 @@ self: { mkDerivation { pname = "hsfilt"; version = "0.1.0.0"; - sha256 = "88f87fc0952fc8ea8894c3fddf060fc5ad01b70f37db4268de9c8c438c2b7318"; + sha256 = "063k5f64734wvrl45nrp1yvh3bf51w3dzzf3jj4fmj1gjp07zy48"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ghc ]; @@ -95583,7 +101958,7 @@ self: { mkDerivation { pname = "hsgnutls"; version = "0.2.3.2"; - sha256 = "d54a46500f0fefab2ffa3d36d39d36efa812580163251621904a62b226faa3d9"; + sha256 = "1nd3z8kb4qjaj0hic9b305c15a7g6sfx6dixz8pspvqg1x84cjnm"; libraryHaskellDepends = [ base bytestring mtl old-time ]; librarySystemDepends = [ gcrypt gnutls ]; homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls"; @@ -95597,7 +101972,7 @@ self: { mkDerivation { pname = "hsgnutls-yj"; version = "0.2.3.3"; - sha256 = "1cecc821949e4d737652044bb5db9603e56dc3e11e0202f6b757cc2ef73cb615"; + sha256 = "05dn7kvjxk2pnzv040hyw71nvr83jvdvajq4a9v76kcyjhhwiv0w"; libraryHaskellDepends = [ base bytestring mtl old-time ]; librarySystemDepends = [ gcrypt gnutls ]; homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls"; @@ -95611,7 +101986,7 @@ self: { mkDerivation { pname = "hsgsom"; version = "0.2.0"; - sha256 = "b6895c0a61f024f4c4793789b3f403cc034f4fb7933caf98ae5dd598b7a28380"; + sha256 = "1043lavrimaxmscayg4knx7ly0yc0gsb729pg72g897hc455r2dn"; libraryHaskellDepends = [ base containers random stm time ]; description = "An implementation of the GSOM clustering algorithm"; license = stdenv.lib.licenses.bsd3; @@ -95625,7 +102000,7 @@ self: { mkDerivation { pname = "hsgtd"; version = "0.2"; - sha256 = "86616afa153ffaab71a71ff0cd1bdf8b9ecedca2abcd3525f30ddb0f3f295167"; + sha256 = "0rsi54zhznqdycjkbkdblbfcx7lbvwdwvw0zlxqspyiz2px6lqc6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95641,7 +102016,7 @@ self: { mkDerivation { pname = "hsharc"; version = "0.14"; - sha256 = "6e1b64b855ccadd417305ded3a4b08fd833a99f9f8ed6c3cbb88fc18c901f1d7"; + sha256 = "1mzi074iiz48pcy6rvgqz6ckm0zx115kmvax60bx9bfcanw686vf"; libraryHaskellDepends = [ base xml ]; homepage = "http://rd.slavepianos.org/?t=hsharc"; description = "Haskell SHARC bindings"; @@ -95656,7 +102031,7 @@ self: { mkDerivation { pname = "hsignal"; version = "0.2.7.5"; - sha256 = "0f61f820556c431c3811643cc40e49a6d6c68075da1be0b39298a41c1c7119ac"; + sha256 = "1b0rf4f1r94qjary06ysfn0cdmm6947c8g3424w1qhvcalhghq8g"; libraryHaskellDepends = [ array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats hstatistics mtl storable-complex vector @@ -95675,7 +102050,7 @@ self: { mkDerivation { pname = "hsilop"; version = "0.2.0.0"; - sha256 = "5bafb93485ef7a4da921a248824770c3df38a86d20f88b79538ac0d76933d026"; + sha256 = "09nh6dlxgh4aadwqpy10dnl3ipy3f13q4j5246llsypghlsbkbsv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95693,8 +102068,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.2"; - sha256 = "0c66301edd1225d92271d9235b847a0c8bf526bc49865852adef1f355bfd5937"; + version = "0.8.3"; + sha256 = "1hfhni85518hqvq3gzllc2mj83z1fwqlsfh2ida5pn8lg2j9ix2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95717,7 +102092,7 @@ self: { mkDerivation { pname = "hsini"; version = "0.5.0"; - sha256 = "d1c2075b6d35c2139db86ba6c514b8855f97f03acfde121cd6a9065ba5ebb499"; + sha256 = "16dlxfjmn1m9sqf15png7bq9fpw5p0acb9kbp2fi7himdmdhghni"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers HUnit mtl parsec QuickCheck tasty @@ -95732,7 +102107,7 @@ self: { mkDerivation { pname = "hsinstall"; version = "1.5"; - sha256 = "77848b03600f68d6cceab565aa6ac165c11855c061cbd27b03b4edb3985c1a1c"; + sha256 = "070sbjcb7vdl0dxx5jv1q1aiihb5q5malrdmxb6dcs0gc01qp13p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -95741,12 +102116,27 @@ 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 { pname = "hskeleton"; version = "0.1.1"; - sha256 = "5ca8bd48b3b7c5129211152e0589e6eb1d8a38bff39130e1e5f7672472ec0638"; + sha256 = "0f06xir28rzpwphk14gkpww8l7gbws4habhm26915idpnd4bva2w"; libraryHaskellDepends = [ base Cabal ]; description = "Skeleton for new Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -95758,7 +102148,7 @@ self: { mkDerivation { pname = "hslackbuilder"; version = "0.0.2"; - sha256 = "b8140af5f5726b53aa2f16a54a57f295e65285fe8e3a34e3e74f2a0c0d9f9c48"; + sha256 = "0j4wkw6hqajgwzik8flfzs2m5rlmy9blm98n5ym56svjypshl55q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95775,7 +102165,7 @@ self: { mkDerivation { pname = "hslibsvm"; version = "2.89.0.1"; - sha256 = "4e9bee5bce423698d686eb48ae6736b96455954383e1310208fc462141e05503"; + sha256 = "00smw10j2ipw10133qc38famar5r6rkswj7bhvb9hdj2rrdyx6sf"; libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ svm ]; description = "A FFI binding to libsvm"; @@ -95789,7 +102179,7 @@ self: { mkDerivation { pname = "hslinks"; version = "0.6.1"; - sha256 = "a11f557a5eaa5688c7585ed26834c8f5ed27a57d67756c82b09f4d3a776311b7"; + sha256 = "1dqicdvklkczn216qxb7gnjjgvgmr0s6iljyb33qhmmabrx5a7x1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95806,7 +102196,7 @@ self: { mkDerivation { pname = "hslogger"; version = "1.2.10"; - sha256 = "d7ca6e94a4aacb47a8dc30e3960ab8deff482d2ec9dca9a87b225e03e97e452b"; + sha256 = "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp"; libraryHaskellDepends = [ base containers directory mtl network old-locale process time unix ]; @@ -95822,7 +102212,7 @@ self: { mkDerivation { pname = "hslogger-reader"; version = "1.0.2"; - sha256 = "b41559e1f35f0fa38dde62c79c408aaf7452bdb347c726041db67914f83c204f"; + sha256 = "0kr07kw18ydn3l22dis7nfym4x5gi909riv2vs6s63szyghmj5dl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base hslogger text time ]; @@ -95840,7 +102230,7 @@ self: { mkDerivation { pname = "hslogger-template"; version = "2.0.4"; - sha256 = "e8a251f7d50d1bd9a095062e9a8783f140b6f3a995e05257bccb0e36ccb7e7b9"; + sha256 = "1fg7nz63c3nbpibm5q4mm7rvch7ihf3rlbh6jnhdj6qdspvm38p8"; libraryHaskellDepends = [ base hslogger mtl template-haskell ]; description = "Automatic generation of hslogger functions"; license = stdenv.lib.licenses.publicDomain; @@ -95852,7 +102242,7 @@ self: { mkDerivation { pname = "hslogger4j"; version = "0.2"; - sha256 = "b66ca641c584532f3aaf5166c2be49f3292e32cce688865e92cf5f8b6463d757"; + sha256 = "0mypcdj8npygj9g8d276rhr2wagk96zc4rjimwx2ylw4qm0scv5n"; libraryHaskellDepends = [ hslogger ]; doHaddock = false; homepage = "http://hslogger4j.googlecode.com/"; @@ -95871,7 +102261,7 @@ self: { mkDerivation { pname = "hslogstash"; version = "0.4.2"; - sha256 = "88a4a555b3342e4ffd0f930793e56da9c9405731a8c066237ee36402f2a5be80"; + sha256 = "105ylpr04r73gqindh5865bl1jd9dpjr61wk1zylybilndasb948"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default hedis http-client @@ -95895,7 +102285,7 @@ self: { mkDerivation { pname = "hslua"; version = "0.4.1"; - sha256 = "2df2b4f0566ef2244506f9830e0207fce3bece7c331129f69f446c722136173f"; + sha256 = "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lua5_1 ]; @@ -95907,6 +102297,26 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; + "hslua_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit + , lua5_1, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "hslua"; + version = "0.5.0"; + sha256 = "06qp857wicgyl6k0mm4d0vfg5gi56yvx00377r26l176rha0l9vb"; + configureFlags = [ "-fsystem-lua" ]; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ lua5_1 ]; + testHaskellDepends = [ + base bytestring hspec hspec-contrib HUnit QuickCheck + quickcheck-instances text + ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_1;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text @@ -95914,8 +102324,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "0.1.0.0"; - sha256 = "62564714c0952da7f631f60ad502863376aad1963aa80d2365d5765f93872ff7"; + version = "0.1.0.4"; + sha256 = "179dgqx6827l7bk7h1dxpwprijdqgmjqxn5g5cfqa3mkzpgc51x8"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -95937,7 +102347,7 @@ self: { mkDerivation { pname = "hsmagick"; version = "0.5"; - sha256 = "5710926dd9efc9b28183dfe26be7cec9f77a0d58201e27c9071568dd1a5fdfad"; + sha256 = "1bfzbwddss0m0z4jf7i0b06pmxy9rvknpqnzhf0v5jggv5nr442p"; libraryHaskellDepends = [ base bytestring directory filepath pretty process ]; @@ -95964,7 +102374,7 @@ self: { mkDerivation { pname = "hsmisc"; version = "1.2"; - sha256 = "528563ea0af5d4c94b8e225257077c6b7e91b99cfb9f421c8057e1a2485056d8"; + sha256 = "1n2na14a5qaph0f457zvkjwr2zkbgh3mfli2ir5wkm7m1bm671aj"; libraryHaskellDepends = [ base containers mtl old-locale parsec time ]; @@ -95979,7 +102389,7 @@ self: { mkDerivation { pname = "hsmtpclient"; version = "1.0"; - sha256 = "4f73a384e908b730f7a55f4c78985c5f7ca94bfea0ca972d193616c432cfeb21"; + sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg"; libraryHaskellDepends = [ array base directory network old-time ]; homepage = "http://code.google.com/p/hsmtpclient/"; description = "Simple SMTP Client"; @@ -95992,7 +102402,7 @@ self: { mkDerivation { pname = "hsndfile"; version = "0.8.0"; - sha256 = "e97e7ef4c26b0dba9400d9a77d3d5001735f64094b93f9733443f58f7f568efb"; + sha256 = "1ywfarzqzxa36irzk4sb15j5ywq1a0ypv9yr02abl3bbqbs7wzp9"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsndfile ]; libraryToolDepends = [ c2hs ]; @@ -96006,7 +102416,7 @@ self: { mkDerivation { pname = "hsndfile-storablevector"; version = "0.5.2"; - sha256 = "3f6d1571b557940afa03bc3cd7de687e50eff9f76751507ed8b1477b49e0f2d8"; + sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z"; libraryHaskellDepends = [ base hsndfile storablevector ]; homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile (Data.StorableVector interface)"; @@ -96018,7 +102428,7 @@ self: { mkDerivation { pname = "hsndfile-vector"; version = "0.5.2"; - sha256 = "2ffe11eb9a3e63aae24e8e06d2e04e8ca4a617ccf1238843cc71517a905b2895"; + sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig"; libraryHaskellDepends = [ base hsndfile vector ]; homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile (Data.Vector interface)"; @@ -96032,7 +102442,7 @@ self: { mkDerivation { pname = "hsnock"; version = "0.5.1"; - sha256 = "1c2e9bb9ea7d92b9935ae8afa2b8a4febf382e8bc27c770d4e274ed1b2a704c2"; + sha256 = "1hh4lyrd2ki79q6pfz62icp3igzyljwa5bz8ba9vk4kxxawrnbhw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec readline ]; @@ -96052,7 +102462,7 @@ self: { mkDerivation { pname = "hsnoise"; version = "0.0.2"; - sha256 = "f4d705f523c6f5980400985abaff75fb64d435b37fcb1d2c3e349c577fbd1d39"; + sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl"; libraryHaskellDepends = [ base vector ]; homepage = "https://github.com/colinhect/hsnoise"; description = "A coherent 3d noise library"; @@ -96064,7 +102474,7 @@ self: { mkDerivation { pname = "hsns"; version = "0.5.3"; - sha256 = "6e41661adfa0947ea92863ea98f7e3c4a42cae3c663a8d9993ab43420b4c7f64"; + sha256 = "0r3z9h5l4hxbjfcqsfk67jp2r964wgvrisk352lpx550vwd6chbf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base network pcap ]; @@ -96081,7 +102491,7 @@ self: { mkDerivation { pname = "hsnsq"; version = "0.1.2.0"; - sha256 = "cb1199e0eef3440f7fc8b9539400a51981a10c12dd1f12adb63989ac9c671532"; + sha256 = "0chmcyfar29rnsni47yx286a308rll098lxrr1zhyi7kxvh9j4fb"; libraryHaskellDepends = [ aeson async attoparsec attoparsec-binary base bytestring containers hostname hslogger mtl network pipes pipes-attoparsec pipes-network @@ -96099,7 +102509,7 @@ self: { mkDerivation { pname = "hsntp"; version = "0.1"; - sha256 = "cd2b45ace6764395f0574ce995c0db0c3769dd032086c35f675b4a1fbea1855f"; + sha256 = "0pw5l6z1yjjvcxgw71i00gfnjdqcvg09bsacazq9ahvnwsn4aayd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base mtl network old-time random ]; @@ -96118,7 +102528,7 @@ self: { mkDerivation { pname = "hsoptions"; version = "1.0.0.0"; - sha256 = "c13af099d97541e419c1929d0b12506b573092235a0d79cb1b7af1a7ea8b9ab0"; + sha256 = "1c4sigmagwbs3g5pj3as4f930mvba090p7cjq4cy8hbmv6cz0fn1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96137,29 +102547,27 @@ self: { }) {}; "hsoz" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, byteable, bytestring, case-insensitive - , containers, cryptonite, data-default, either, errors, exceptions - , hashable, http-client, http-conduit, http-types, HUnit, lens - , lucid, memory, mtl, network, optparse-applicative, QuickCheck - , scientific, scotty, securemem, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , uri-bytestring, vault, wai, warp + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, cryptonite, data-default, either + , errors, exceptions, hashable, http-client, http-conduit + , http-types, HUnit, lens, lucid, memory, mtl, network + , optparse-applicative, QuickCheck, scientific, scotty, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uri-bytestring, vault, wai + , warp }: mkDerivation { pname = "hsoz"; - version = "0.0.0.4"; - sha256 = "a007f1ed9937208c613cbd854d103b09c54bdc35f972186d43adf0e3795dd058"; - revision = "1"; - editedCabalFile = "00802583e500dd540bb78ae2e03802dcb5965e3bc9338616d72149cbeea12073"; + version = "0.0.1.0"; + sha256 = "0r1dxaxrx0cha13dl1137ggl191jpf60h5s7xs5wqdvgavwfw965"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring byteable - bytestring case-insensitive containers cryptonite data-default - either errors exceptions hashable http-client http-types lens - memory mtl network scientific scotty securemem text time - transformers unordered-containers uri-bytestring vault wai warp + aeson attoparsec base bytestring case-insensitive containers + cryptonite data-default either errors exceptions hashable + http-client http-types lens memory mtl network scientific scotty + text time transformers unordered-containers uri-bytestring vault + wai warp ]; executableHaskellDepends = [ aeson base bytestring case-insensitive containers cryptonite @@ -96183,7 +102591,7 @@ self: { mkDerivation { pname = "hsp"; version = "0.10.0"; - sha256 = "4ed3905a9db91001bde09f060290833af462e87e35476ab0def1579a1ff7ceab"; + sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf"; libraryHaskellDepends = [ base mtl text ]; homepage = "http://hub.darcs.net/nibro/hsp"; description = "Haskell Server Pages is a library for writing dynamic server-side web pages"; @@ -96195,7 +102603,7 @@ self: { mkDerivation { pname = "hsp-cgi"; version = "0.4.4"; - sha256 = "36049bd050c56d27584448934e6575a9453184c1abcc2f120b4cc4fa31f53d54"; + sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n"; libraryHaskellDepends = [ base containers harp hsp network ]; homepage = "http://code.google.com/p/hsp"; description = "Facilitates running Haskell Server Pages web pages as CGI programs"; @@ -96208,7 +102616,7 @@ self: { mkDerivation { pname = "hsparklines"; version = "0.1.0"; - sha256 = "c68f5cbbbd1c755b8bfc906b4cc8a02ebd2dc06f4e0cfffe784f15758023ea83"; + sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6"; libraryHaskellDepends = [ base bytestring dataenc gd ]; homepage = "http://www.jasani.org/search/label/hsparklines"; description = "Sparklines for Haskell"; @@ -96223,8 +102631,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.0"; - sha256 = "a9b1e3ce4e7ad04634a4eec62249f877d8a2203bdd38192dee9a57714c779fe1"; + version = "0.3.4"; + sha256 = "0nxj9aq59c02sdhz5nz5c3klcsglb4gpchah0b82fjbiphbs8sxb"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -96246,7 +102654,7 @@ self: { mkDerivation { pname = "hspear"; version = "0.14"; - sha256 = "30c41dcd085dc934db18dc2a2f6ba7c3f68c7504df9d805a6e0eeb776bda6ac0"; + sha256 = "1h3av9mpgsqfdrd817fz0isqrxn3lxmjyanw33dk9jax136ivi1h"; libraryHaskellDepends = [ base bytestring bytestring-lexing split utf8-string zlib ]; @@ -96263,8 +102671,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.4.2"; - sha256 = "48b7e342c0990ae38373acbb7cac5a2ef9b1bb2cca8bdf41a896f1593e677484"; + version = "2.4.3"; + sha256 = "0dvfmzys2vcgaghmqdmq91j416vn556scdyx96gy0q8l8ziqhwrs"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -96279,6 +102687,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_4_4" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.4.4"; + sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh"; + libraryHaskellDepends = [ + base call-stack hspec-core hspec-discover hspec-expectations HUnit + QuickCheck transformers + ]; + testHaskellDepends = [ + base call-stack directory hspec-core hspec-discover + hspec-expectations hspec-meta HUnit QuickCheck stringbuilder + transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -96286,7 +102718,7 @@ self: { mkDerivation { pname = "hspec-attoparsec"; version = "0.1.0.2"; - sha256 = "ea7a8b3f2989abde8c8537cec1a2ae312e88df80086b9b01ed12e5324137fb64"; + sha256 = "0r7v6x0k5r8jxl0rnsq8h3gqhbiimsic3kiphn6dxaw954zqnypa"; libraryHaskellDepends = [ attoparsec base bytestring hspec-expectations text ]; @@ -96302,8 +102734,8 @@ self: { ({ mkDerivation, base, checkers, hspec }: mkDerivation { pname = "hspec-checkers"; - version = "0.1.0.1"; - sha256 = "9703ad134d1711b17301d760cebc36814c48a0e4e5712590514c93e6ec278dab"; + version = "0.1.0.2"; + sha256 = "16by6gw5gg4sifb44w0cdabrfhh7398kvgivf83bixbwabf7knz7"; libraryHaskellDepends = [ base checkers hspec ]; testHaskellDepends = [ base checkers hspec ]; description = "Allows to use checkers properties from hspec"; @@ -96315,7 +102747,7 @@ self: { mkDerivation { pname = "hspec-contrib"; version = "0.4.0"; - sha256 = "6f9e2201ee176c723f91ee932b7fc8b677e0d54376f897f52c133c8ca9860c16"; + sha256 = "05hchslqqg0k5ksrgy3n8gay0xxnr1zjp4zfj4zp4v0pxq0j57kg"; libraryHaskellDepends = [ base hspec-core HUnit ]; testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; homepage = "http://hspec.github.io/"; @@ -96331,8 +102763,10 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.4.2"; - sha256 = "393ba143901824579b736fb4313c7e07e57eda45580e657bf24d1b1c32c0a318"; + version = "2.4.3"; + sha256 = "0mg1144azwhrvk6224qnn7gbjyqlpq4kbxqns0hh4gwvg4s6z7bw"; + revision = "1"; + editedCabalFile = "0shqhsss67lhp2kn7spjn9ngfhlf6cnsrn66s6h1wk4f9k24lf5v"; libraryHaskellDepends = [ ansi-terminal array async base call-stack deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -96349,12 +102783,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_4_4" = callPackage + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, temporary, tf-random, time, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.4.4"; + sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0"; + libraryHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently temporary tf-random time + transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.4.2"; - sha256 = "8c9ad7bc21eabcc28526e8fd8e12927c0d659c9b3179e665c30b175fa5011d2c"; + version = "2.4.3"; + sha256 = "0kmld0l61xr3qyjx2b2c61n5w1axy53ybbxnvhh404yxj747agda"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -96365,12 +102826,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_4_4" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta }: + mkDerivation { + pname = "hspec-discover"; + version = "2.4.4"; + sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ base directory filepath hspec-meta ]; + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { pname = "hspec-expectations"; version = "0.8.2"; - sha256 = "819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef"; + sha256 = "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1"; libraryHaskellDepends = [ base call-stack HUnit ]; testHaskellDepends = [ base call-stack HUnit nanospec ]; homepage = "https://github.com/hspec/hspec-expectations#readme"; @@ -96385,7 +102863,7 @@ self: { mkDerivation { pname = "hspec-expectations-lens"; version = "0.4.0"; - sha256 = "13f01bae9ff6dac00e332540d300cd0788faca601a0c5e4708afae228ac5899d"; + sha256 = "17c9qn525bmg113mw30sc35gm207rl0d6h156c7c1npnkyp1pw0k"; libraryHaskellDepends = [ base hspec hspec-expectations HUnit lens ]; @@ -96399,8 +102877,8 @@ self: { ({ mkDerivation, base, hspec-expectations, transformers }: mkDerivation { pname = "hspec-expectations-lifted"; - version = "0.8.2"; - sha256 = "2b629013b07f69b2dbbe1462f067f097a9f28beae2eb222b1255ff45327cecef"; + version = "0.10.0"; + sha256 = "0a1qwz0n80lph8m9cq6cb06m8bsmqgg8ifx0acpylvrrkd8g3k92"; libraryHaskellDepends = [ base hspec-expectations transformers ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; @@ -96414,7 +102892,7 @@ self: { mkDerivation { pname = "hspec-expectations-pretty"; version = "0.1"; - sha256 = "c5767d10b298f74b79c66a37b649352529f9251fc4c8e338d66354b112bb1df5"; + sha256 = "1x8xpc9b2m33sqwf7j643wjzja956m4vcdvaqrwlpxwqn887sxn5"; libraryHaskellDepends = [ base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo ]; @@ -96431,7 +102909,7 @@ self: { mkDerivation { pname = "hspec-expectations-pretty-diff"; version = "0.7.2.4"; - sha256 = "1bbfd524330be3cb0b27945556d01f48e3005e042ee475cdf6e441ba21b51b0a"; + sha256 = "02hvnlhvlhg4yv6pbr1f0ig01qs83z85cmcl4w5wpqqb6cjdbgqv"; libraryHaskellDepends = [ ansi-terminal base Diff hscolour HUnit nicify-lib text ]; @@ -96446,7 +102924,7 @@ self: { mkDerivation { pname = "hspec-experimental"; version = "0.1.0"; - sha256 = "f53c0653ab2ee17b249d691e2b8f5627f61f2788107782b0aa3d905c444feca4"; + sha256 = "197c9x25r41xmaq84xqhi0kizxi7as7jn7k9klj7pq9fmd9hcg7m"; libraryHaskellDepends = [ base hspec HUnit QuickCheck ]; testHaskellDepends = [ base hspec-meta ]; description = "An experimental DSL for testing on top of Hspec"; @@ -96462,7 +102940,7 @@ self: { mkDerivation { pname = "hspec-golden-aeson"; version = "0.2.0.3"; - sha256 = "cd99f2ba6423706197e8dccb290816cbf50779849eddd3f60e1ca7df62c703fb"; + sha256 = "1yq3qxidz9qw1vvd7pcyhiwhgxfb2q42kjywx2bn2w13cjxg56fd"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck quickcheck-arbitrary-adt random transformers @@ -96484,7 +102962,7 @@ self: { mkDerivation { pname = "hspec-hashable"; version = "0.1.0.0"; - sha256 = "11cc546fc714d7e084d251577a3e6e5238309144f536914411f58c69a6e014bf"; + sha256 = "1gqlw2k6k37m25292dpm8j8k0f2jdqz7lmsisa2f1mqlqxpm9k0i"; libraryHaskellDepends = [ base hashable hspec QuickCheck ]; testHaskellDepends = [ base hashable hspec hspec-core QuickCheck silently @@ -96494,12 +102972,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, hspec, hspec-core }: + mkDerivation { + pname = "hspec-hedgehog"; + version = "0.0.0.1"; + sha256 = "08689r0s7qkj7gkkz20z3qhka69b0lvvmcr3zg28yy5x7wgdbi9v"; + libraryHaskellDepends = [ base hedgehog hspec-core ]; + testHaskellDepends = [ base hedgehog hspec hspec-core ]; + homepage = "https://github.com/erikd/hspec-hedgehog/"; + description = "Hedgehog support for the Hspec testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-jenkins" = callPackage ({ mkDerivation, base, blaze-markup, hspec }: mkDerivation { pname = "hspec-jenkins"; version = "0.1.1"; - sha256 = "c27f15e835ff5c1bb07096aee66f8845b691306353eb58d0378169ed1da05899"; + sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2"; libraryHaskellDepends = [ base blaze-markup hspec ]; homepage = "https://github.com/worksap-ate/hspec-jenkins"; description = "Jenkins-friendly XML formatter for Hspec"; @@ -96512,7 +103004,7 @@ self: { mkDerivation { pname = "hspec-laws"; version = "0.0.0"; - sha256 = "125025ee689e3b3a828cde1616e788a2c966ef7679472cb5ecd27e20ecd5ac96"; + sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j"; libraryHaskellDepends = [ base hspec QuickCheck ]; testHaskellDepends = [ base hspec markdown-unlit QuickCheck ]; description = "Document and test laws for standard type classes"; @@ -96526,7 +103018,7 @@ self: { mkDerivation { pname = "hspec-megaparsec"; version = "0.3.1"; - sha256 = "826f8169bc2ce9f056be8f2b1bb00039eb1a0114015b3db71509e3e0c871514d"; + sha256 = "0kaif74f1qq92nvksnq12h0imsrr02q1nawgprbg1s9cpilq2vw2"; libraryHaskellDepends = [ base containers hspec-expectations megaparsec ]; @@ -96546,7 +103038,7 @@ self: { mkDerivation { pname = "hspec-meta"; version = "2.3.2"; - sha256 = "59b1ba3f32f443fdcdef345905a4d0b60c31c36894e56d34a9ac6cf406578a8b"; + sha256 = "12waaw3g8v5cm4s6vrcld31k235ns2j0an9lxz6zshzl68zvmcar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96563,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 @@ -96570,7 +103089,7 @@ self: { mkDerivation { pname = "hspec-monad-control"; version = "0.1.0.0"; - sha256 = "44041ea85c2629fe01bcdfbb78b46e52957c4c0d4a6caacda679c90c9f253e1f"; + sha256 = "07ry4nghrjbrlv6slv2a1m67r5ajdss7ifyzph0zwa96bjl1w124"; libraryHaskellDepends = [ base hspec-core monad-control transformers transformers-base ]; @@ -96579,6 +103098,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hspec-pg-transact" = callPackage + ({ mkDerivation, base, bytestring, hspec, pg-transact + , postgresql-simple, resource-pool, text, tmp-postgres + }: + mkDerivation { + pname = "hspec-pg-transact"; + version = "0.1.0.2"; + sha256 = "030wy3ajlfd7pi6gwfn6xcsl2yi0gvznxl8m7kq001bkiabjmv55"; + libraryHaskellDepends = [ + base bytestring hspec pg-transact postgresql-simple resource-pool + text tmp-postgres + ]; + 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 ({ mkDerivation, base, containers, hspec, hspec-contrib, hspec-core , hspec-expectations, HUnit, process, regex-posix, temporary @@ -96587,7 +103124,7 @@ self: { mkDerivation { pname = "hspec-server"; version = "0.4.1"; - sha256 = "b838b80a5be1f347d8def2caec7124fcce23a44b3661123168ac32ecc62e769d"; + sha256 = "17bn5v3fqcmcd0qi4q9n9fj27kpw4iqyrjpjvvc4gwz1bc5bhf5q"; libraryHaskellDepends = [ base containers hspec hspec-core hspec-expectations HUnit process regex-posix temporary transformers @@ -96606,7 +103143,7 @@ self: { mkDerivation { pname = "hspec-setup"; version = "0.2.1.0"; - sha256 = "abd91c97ca341f3111b318e7a203daf083424b180ba3bd00fc7e5d9ba2c177d0"; + sha256 = "1l3pq6i9npbyzh0bv8qb315l50zhv81s5rqqnc8k27rlrabirndb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96632,7 +103169,7 @@ self: { mkDerivation { pname = "hspec-shouldbe"; version = "0.0.1"; - sha256 = "2346d714fef3b7867202d4c32c224ce9376df2ef6b6990619c42748f37419e2c"; + sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3"; libraryHaskellDepends = [ hspec test-shouldbe ]; description = "Convenience wrapper and utilities for hspec"; license = stdenv.lib.licenses.mit; @@ -96644,7 +103181,7 @@ self: { mkDerivation { pname = "hspec-slow"; version = "0.1.0.0"; - sha256 = "18bacf99cc3f081b65a0c3317ba8b291c1279bcba92c00e53f6fd25d71df70db"; + sha256 = "1nvhvxqmvlkg7zjh0b59rfdjghcinal7ncf3l1jin21zrjcwzfhq"; libraryHaskellDepends = [ base hspec mtl stm time transformers ]; testHaskellDepends = [ base hspec mtl stm ]; homepage = "https://github.com/bobjflong/hspec-slow#readme"; @@ -96657,7 +103194,7 @@ self: { mkDerivation { pname = "hspec-smallcheck"; version = "0.4.2"; - sha256 = "ba09d4b2eb1c6ff2d680aa09b36eb6c0b395cc258ae716b8d1db511073385ed3"; + sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds"; libraryHaskellDepends = [ base hspec-core smallcheck ]; testHaskellDepends = [ base hspec hspec-core QuickCheck smallcheck @@ -96670,15 +103207,16 @@ self: { "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core - , hxt, lens, mtl, snap, snap-core, text, transformers + , HUnit, hxt, lens, mtl, snap, snap-core, text, transformers }: mkDerivation { pname = "hspec-snap"; - version = "1.0.0.0"; - sha256 = "e3afa22d1c68a9db41463b115f432ac01d80fee706ae58bf2cf00d6d4f7b0e65"; + version = "1.0.0.2"; + sha256 = "0d2mr14ksyjvzaprakfqb5pdrsdgxi8jlfa4a2bwd3yfsdmj8pp5"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup - hspec hspec-core hxt lens mtl snap snap-core text transformers + hspec hspec-core HUnit hxt lens mtl snap snap-core text + transformers ]; testHaskellDepends = [ aeson base bytestring containers digestive-functors directory @@ -96696,7 +103234,7 @@ self: { mkDerivation { pname = "hspec-stack-rerun"; version = "0.1.0.3"; - sha256 = "0f6714da2beb48b5882a17fb45e83d778ce5a6b12f60a83c75ae3391fee16deb"; + sha256 = "1svdw7z92cxfflyahq1gn6kfb33p7pl4byqp5a4baj7b5gd18rqg"; libraryHaskellDepends = [ base directory hspec safe strict ]; homepage = "https://github.com/mwotton/hspec-stack-rerun#readme"; description = "Simple project template from stack"; @@ -96708,7 +103246,7 @@ self: { mkDerivation { pname = "hspec-structured-formatter"; version = "0.1.0.3"; - sha256 = "b23e1dfc676bcc43fc9f79a076152a02a48525bdbb609d94f9e66eb831a80f01"; + sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj"; libraryHaskellDepends = [ base hspec ]; license = stdenv.lib.licenses.mit; }) {}; @@ -96720,7 +103258,7 @@ self: { mkDerivation { pname = "hspec-test-framework"; version = "0.1.0"; - sha256 = "bbd1425564db0ef61379e3501782ca9e8eba2b347c7f980c9152ade889f5348f"; + sha256 = "13rlyn4yibajj469hzvw6hmvm3lyra11fl73g49zc3nvcial5ldv"; libraryHaskellDepends = [ base hspec hspec-contrib hspec-core HUnit QuickCheck ]; @@ -96736,7 +103274,7 @@ self: { mkDerivation { pname = "hspec-test-framework-th"; version = "0.1.0"; - sha256 = "aa5edfeefe8bba50618e3ca75efa15f1e6f029f2a59b08a292e5ebe957deffaa"; + sha256 = "1apzvrbyksz5jai0i6x5y8lz1rpi2px5x9rwirhm1flbzvpdypma"; libraryHaskellDepends = [ base hspec-test-framework language-haskell-extract template-haskell ]; @@ -96751,7 +103289,7 @@ self: { mkDerivation { pname = "hspec-test-sandbox"; version = "0.1.0"; - sha256 = "d72305f8611b8f0191432eb51204164d948776f7aa552819efbee818eaa5e7cd"; + sha256 = "1kg7lpm1is5yxwcjhmdayxv8g52d2q215d9f8f8h33qvc7w0a8yp"; libraryHaskellDepends = [ base hspec hspec-core test-sandbox ]; testHaskellDepends = [ base hspec test-sandbox ]; description = "Hspec convenience functions for use with test-sandbox"; @@ -96767,7 +103305,7 @@ self: { mkDerivation { pname = "hspec-wai"; version = "0.8.0"; - sha256 = "8b7ee2cf41bd29cc674da762a46b928557a4c42df564e2a9427b1526273a1141"; + sha256 = "0h8i78kjc5bv8aly4r7m5p2a8mw5j9ms8qm79mkwqadx877y4zlb"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive hspec-core hspec-expectations http-types QuickCheck text transformers wai @@ -96790,7 +103328,7 @@ self: { mkDerivation { pname = "hspec-wai-json"; version = "0.8.0"; - sha256 = "4679308198b7b247094696da5524e50e1dbc92da49bdd44627c105ccdf6b86e8"; + sha256 = "1s46dggwq1f14x3d9ga9va9bq78fwlj5bnln8q4lgcmpk20k0ya6"; libraryHaskellDepends = [ aeson aeson-qq base bytestring case-insensitive hspec-wai template-haskell @@ -96809,7 +103347,7 @@ self: { mkDerivation { pname = "hspec-webdriver"; version = "1.2.0"; - sha256 = "05d0f818de7f21e3dcb10860f60fe53b393fad75892ec1c520815dd53a0385c8"; + sha256 = "1j450cxdapc1432w2bl9fnnkyf9vwl7zcq08n7ff68bzvqcgil05"; libraryHaskellDepends = [ aeson base data-default hashable hspec hspec-core HUnit lifted-base stm text transformers unordered-containers webdriver @@ -96825,9 +103363,9 @@ self: { mkDerivation { pname = "hspec2"; version = "0.6.1"; - sha256 = "c4d5b728d158b764a04b458db85a55c5896e5c7635f529fa831e6143f2a99b7e"; + sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; revision = "1"; - editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f"; + editedCabalFile = "0zqh0f7d89aw3ib7mx2wlkpc166f3zipgka4m54y2shcz3rbl7nl"; libraryHaskellDepends = [ base hspec hspec-discover ]; homepage = "http://hspec.github.io/"; description = "Alpha version of Hspec 2.0"; @@ -96839,7 +103377,7 @@ self: { mkDerivation { pname = "hspecVariant"; version = "0.1.0.1"; - sha256 = "d54fcc1e543c718732088e6579401cba5b62e01f1b9021429e958e3e2ba2866e"; + sha256 = "0vl6l8mkx3lmkr12340v3zh64nxs3i07jrcf10r8fw9wahgcqkym"; libraryHaskellDepends = [ base hspec QuickCheckVariant ]; homepage = "https://github.com/sanjorgek/hspecVariant"; description = "Spec for testing properties for variant types"; @@ -96853,7 +103391,7 @@ self: { mkDerivation { pname = "hspkcs11"; version = "0.3"; - sha256 = "c95ba5b7a560b0e1d2b1e11fec7dca72a253232ba9def3081b2313c8b103f7b1"; + sha256 = "1cgp0fqwh4r33c4g7pm95cim78kjr9yyq7z1n79f3c30lnvsany9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96876,7 +103414,7 @@ self: { mkDerivation { pname = "hspr-sh"; version = "0.3"; - sha256 = "eacc267c2e0f11edf7757039b5b6a4563f54ecc16a6f6fc56d858ef49e78d8e2"; + sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a"; libraryHaskellDepends = [ base old-time ]; homepage = "http://www.cs.chalmers.se/~d00nibro/hsp/"; description = "Session handler for HSP"; @@ -96890,7 +103428,7 @@ self: { mkDerivation { pname = "hspread"; version = "0.3.3"; - sha256 = "6e8a9ecc1a6b1cc767aa188e2f4c04b77b321fd14000cac8f71dd6a7b82afbfc"; + sha256 = "1z7v5awagmhxyz4cl020s4gk4yxp0i62z3hqm9kwf73b3b69x2kf"; libraryHaskellDepends = [ base binary bytestring containers extensible-exceptions network ]; @@ -96904,7 +103442,7 @@ self: { mkDerivation { pname = "hspresent"; version = "0.2.2"; - sha256 = "07c881323c0c14388e14477bb98917f8b86f13ef8e70bb5022416e44911f8e74"; + sha256 = "0x4f3y8l8vj1498bnw4fxw9nzf7q2y4vjys72j73h50c7hr83j07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring vty ]; @@ -96923,7 +103461,7 @@ self: { mkDerivation { pname = "hsprocess"; version = "0.3"; - sha256 = "bf28226f86505997b6908681fae2c9c7ba25660defdc7b9cff763e87e27887bc"; + sha256 = "1g47g3i8fgknzyf7pp7g1mk2bfn7r7igm0c6j2v9fnahhrpj4a5z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; @@ -96945,7 +103483,7 @@ self: { mkDerivation { pname = "hsql"; version = "1.8.2"; - sha256 = "7e2d32eb0d3a1e30ec8fe02ff41b8975298249ccf54ef2e9774260eb05b1a344"; + sha256 = "0i53n42ynq22fzlz4kpmri4q4abmi4dz8bz0izn307is1pmk4bby"; libraryHaskellDepends = [ base old-time ]; description = "Database access from Haskell"; license = stdenv.lib.licenses.bsd3; @@ -96956,9 +103494,9 @@ self: { mkDerivation { pname = "hsql-mysql"; version = "1.8.3"; - sha256 = "499261d57532d01083e8a2f47edc71062490635975f391ae3a35e42c4b966420"; + sha256 = "0834jr5jrr1m7ap93wvmb5ir0906f7f7xx52x21i1l1jfpan34j9"; revision = "1"; - editedCabalFile = "e1bbb71ecb6e310acf23a93e4a5e0121c8bd332e7a81dfa5bfe27ae94cbf14ab"; + editedCabalFile = "1aqlpx6fjyp2pyjxz0bs5qrvvj1105g4lgm94g7hlcbfrcgbgfz1"; libraryHaskellDepends = [ base Cabal hsql ]; librarySystemDepends = [ mysqlclient ]; description = "MySQL driver for HSQL"; @@ -96971,7 +103509,7 @@ self: { mkDerivation { pname = "hsql-odbc"; version = "1.8.2"; - sha256 = "2e38527c1f29738907386231e1d161a64567f5ce0c8ab8965a52be1ebcfce953"; + sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ unixODBC ]; description = "A Haskell Interface to ODBC"; @@ -96983,7 +103521,7 @@ self: { mkDerivation { pname = "hsql-postgresql"; version = "1.8.2"; - sha256 = "3f3189c61daed7c4c45b37b683ee1da1ab91ec32cda7c36abf5b5e75a992407a"; + sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ postgresql ]; description = "A Haskell Interface to PostgreSQL via the PQ library"; @@ -96995,7 +103533,7 @@ self: { mkDerivation { pname = "hsql-sqlite3"; version = "1.8.2"; - sha256 = "94f95e93117f8bba01f4c098cd37a730a015baa7660a3eebcd4e85491c71c795"; + sha256 = "15f7f4f4k1afrpmkw2k6lyx1b81hlwvwv660yh0vm2vz269mxycl"; libraryHaskellDepends = [ base hsql ]; librarySystemDepends = [ sqlite ]; description = "SQLite3 driver for HSQL"; @@ -97009,7 +103547,7 @@ self: { mkDerivation { pname = "hsqml"; version = "0.3.4.1"; - sha256 = "716112897561a16031057ae9edf08056a6daf3621e9b9afeb7b980dfae38ef63"; + sha256 = "0qzg72pdz05rnzz9m6qycbrxm9jnh3qfvsbs0lqn18b1fn4i4qbi"; libraryHaskellDepends = [ base containers filepath tagged text transformers ]; @@ -97021,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 @@ -97028,7 +103567,7 @@ self: { mkDerivation { pname = "hsqml-datamodel"; version = "0.2.0.2"; - sha256 = "fbab7cc84a7a8938438b35d3c59f75dedf5a66b46719f044a7c869e227f7dcec"; + sha256 = "1v6wywky4sf8lx2g06b7nik5mpyyfngwblrmid1ki2bs9b47razv"; libraryHaskellDepends = [ base hsqml template-haskell text ]; libraryPkgconfigDepends = [ qt5 ]; homepage = "https://github.com/marcinmrotek/hsqml-datamodel"; @@ -97044,7 +103583,7 @@ self: { mkDerivation { pname = "hsqml-datamodel-vinyl"; version = "0.3.0.1"; - sha256 = "b75630e22b253bcdc2760adc9e6e1e39e03ae24e2bbbebab923892f8ccd09fe0"; + sha256 = "1q4zs36gi4iqjamypfrb9vi3mq1r3rp9xp0afv1csfr55gi30mmp"; libraryHaskellDepends = [ base exceptions hsqml-datamodel type-list vinyl ]; @@ -97059,7 +103598,7 @@ self: { mkDerivation { pname = "hsqml-demo-manic"; version = "0.3.4.0"; - sha256 = "a663ed9f750a0d0f0a37a2640212ea992dc025912d723e8944e9875295699626"; + sha256 = "09lnd6am51z98j4kwwidj4jw0bcrx8904r526w50y38afngysqx6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97078,7 +103617,7 @@ self: { mkDerivation { pname = "hsqml-demo-morris"; version = "0.3.1.1"; - sha256 = "15d6fd3a62ccd3988eafafb0707775b6a0c7c749073644da30e0550bbd01d998"; + sha256 = "166r06yhnmg063d48dh7973wg85nfmvp1c5gmy79ilycc8xgvmhm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97097,7 +103636,7 @@ self: { mkDerivation { pname = "hsqml-demo-notes"; version = "0.3.3.0"; - sha256 = "23a0e790d4e91d455f1b20f1ef1992e0749142098d12b6a9d90ab2ab29d6543e"; + sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97114,13 +103653,14 @@ self: { mkDerivation { pname = "hsqml-demo-samples"; version = "0.3.4.0"; - sha256 = "225fa4100ae9842f014aff0b13b0e03e95947f81e7b5ea30f98c2c47be620279"; + sha256 = "0y82caz4fb4cz4qfmdg7h5zr959yw2q162zz980jz179188a8pr2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ]; 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 @@ -97130,7 +103670,7 @@ self: { mkDerivation { pname = "hsqml-morris"; version = "0.2.0.0"; - sha256 = "5d95e76968cbe2dec2b8ba79cf936d1b9d6530b6e3969d189f4f528a72883ae2"; + sha256 = "1qisi1r8lljgkwc9v5p3nqq6b78vdn9wyydsp31dxqnbd1lyg5ax"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97150,9 +103690,9 @@ self: { mkDerivation { pname = "hsreadability"; version = "1.0.0.0"; - sha256 = "5cd9ace845845d6ea76c5100fd149e0c9c60206d39fe96e9954869d94fc79a60"; + sha256 = "0q4sqx7xjsa8jplrdzirdlh6170ckqags02idjknwpc48plarnaw"; revision = "1"; - editedCabalFile = "e0b87a28497a4730024ce1459c7812d519027e8b90aa863dac85dd251558fa23"; + editedCabalFile = "08zsb0ajbpc5mhyqdalhidz046fm29w9qig19h130ivs94l7mf70"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring data-default http-conduit http-types text xsd @@ -97173,7 +103713,7 @@ self: { mkDerivation { pname = "hsrelp"; version = "0.1.0.1"; - sha256 = "8175a950537100b7c997d9abb4334f9313a707d7bb6d64f746b3314b069d91b1"; + sha256 = "1ccikl34ncdk8vvn8vdvsw3sf4wk9wrv9ayrjz4vf03iad8ajxc1"; libraryHaskellDepends = [ attoparsec base bytestring network utf8-string ]; @@ -97187,7 +103727,7 @@ self: { mkDerivation { pname = "hsseccomp"; version = "0.2.0.1"; - sha256 = "b138481c5b6ca765e06cfdad0d6efbb40c3241f09569fbd9645ca19b0bdd372f"; + sha256 = "0brpvl5rp8awckcznscmy10k435lzdp0vbgxdkh6b9vcbcf4hf5i"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ seccomp ]; testHaskellDepends = [ base tasty tasty-hunit unix ]; @@ -97200,8 +103740,10 @@ self: { ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { pname = "hsshellscript"; - version = "3.3.4"; - sha256 = "3bd909d227215e0de6d6a42af736ccc21c360b677b9bff5b9c366859f582b54e"; + version = "3.4.1"; + sha256 = "0y7byqjcq8qwxz754v5z9s9h3y9g9384fmh02mri8lxdc0934931"; + revision = "1"; + editedCabalFile = "1gfz3ipvippjb8lmhi7j7di2pignibj1x662m1b2qhcpyhlqnabp"; libraryHaskellDepends = [ base directory parsec random unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://www.volker-wysk.de/hsshellscript/"; @@ -97214,7 +103756,7 @@ self: { mkDerivation { pname = "hssourceinfo"; version = "0.0.2"; - sha256 = "0a07297e034caa209e9fb418ad92c57a01ed3cea6e8ceac9ad3e8c40aae6e11d"; + sha256 = "07g1wsm4131ymp4ym33fx8yfs0bsqn9as65lkyg21ajc0dz2j1qa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97232,7 +103774,7 @@ self: { mkDerivation { pname = "hssqlppp"; version = "0.6.0"; - sha256 = "7052d03cfb1251f806999fee3566dc7ecc838fe1db1025ed1ac2de34774e0cbc"; + sha256 = "1g0c9rvk9pn23bnja46vw67q7k3yvik3bvlzk43ghl8jzcyd0lkh"; libraryHaskellDepends = [ base containers mtl parsec pretty pretty-show syb text transformers uniplate @@ -97254,7 +103796,7 @@ self: { mkDerivation { pname = "hssqlppp-th"; version = "0.6.0"; - sha256 = "546e917a7e737a8e7dc78d19c15d85aae8ec98857357706e74f19f4347635785"; + sha256 = "11apcd3l77zifip70mvkhncfrs5ahmfw26cdqxyqwykkgrx92vjl"; libraryHaskellDepends = [ base hssqlppp syb template-haskell text ]; @@ -97274,7 +103816,7 @@ self: { mkDerivation { pname = "hstatistics"; version = "0.3"; - sha256 = "7af3f698d1bded8690b1ec05017ae05310fad1f2d25ec138fb72994b0812eeec"; + sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs"; libraryHaskellDepends = [ array base hmatrix hmatrix-gsl-stats random vector ]; @@ -97288,7 +103830,7 @@ self: { mkDerivation { pname = "hstats"; version = "0.3.0.1"; - sha256 = "3045b303073165a1a90bb369cd530012b625e3b7e4e815c14af9b4beecfa19a8"; + sha256 = "1a0rzbnbxd7r9b0ibs74nzijbdhj019wssdk1fls2r9i0w1v6i9h"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/haas/hstats"; description = "Statistical Computing in Haskell"; @@ -97301,7 +103843,7 @@ self: { mkDerivation { pname = "hstatsd"; version = "0.1"; - sha256 = "446779594257c0fa02d5271c997ee0c22f74f7636d89e34394ad87e5bd285824"; + sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4"; libraryHaskellDepends = [ base bytestring mtl network text ]; homepage = "https://github.com/mokus0/hstatsd"; description = "Quick and dirty statsd interface"; @@ -97315,7 +103857,7 @@ self: { mkDerivation { pname = "hstest"; version = "0.0.1"; - sha256 = "ed99d06c79f40f74451156a58949b2341f8fc363da080a645b962a8156a1db29"; + sha256 = "0afvl5b82alnbdj0l26scg1qy7rln94qk9an252p83zlg5nd16gd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97332,7 +103874,7 @@ self: { mkDerivation { pname = "hstidy"; version = "0.2"; - sha256 = "baef749c93e274212d953c9e97bcd461c891f3f682e0e866b182d80d686f5ac2"; + sha256 = "1hjsdxl0vn42n5kfiq42yvrr3j31sjy9g7iwjlnj2x72jff79vxs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell-src-exts ]; @@ -97351,7 +103893,7 @@ self: { mkDerivation { pname = "hstorchat"; version = "0.1.1.0"; - sha256 = "6ccc80734d0b0e234e83ae8ad9a05537fdfe86b52dbef6f1d2073f6c9cd107b5"; + sha256 = "1d87s6f6qgq7sbqzdgidnn3gxz9panhdk2mfhd7263hb9mrq1k3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97379,7 +103921,7 @@ self: { mkDerivation { pname = "hstox"; version = "0.0.1"; - sha256 = "6d62ca0a9f393f731f168457a1fd24ab6ea3a9fee721676323cc592c519a2e0a"; + sha256 = "02ifk98jqnfc4dinf8g7zsls6vmb4kys2mw42qgp6grrkw5clqkd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97404,7 +103946,7 @@ self: { mkDerivation { pname = "hstradeking"; version = "0.1.0"; - sha256 = "9c98dc4c8d97951e9d62237476c3236c7c3f75e82d450491cccf6ea3a0db9e83"; + sha256 = "10wyvfha6vngrj8h8i9dx1skyz3c4g1pcx13cafix5cpim6dr64w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97427,7 +103969,7 @@ self: { mkDerivation { pname = "hstyle"; version = "0.2.0.3"; - sha256 = "6558a2ee8cc68e1e47a966218e285b1de1a1dbfd585c12230d9aa6f64989c3a8"; + sha256 = "1a63i54zd9ls1lii4p2qzpds3q8xbcl8w8b6m53ix3n6ikpa4n35"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97446,7 +103988,7 @@ self: { mkDerivation { pname = "hstzaar"; version = "0.9.4"; - sha256 = "a1f468ebb366f25a5d29263b6123803bc310b5abd9d87634e03922d09021d171"; + sha256 = "0wfi468d08irw0s7dn6rmfsi1hrvh0in2fr655fmmwk6ngmnix51"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97468,7 +104010,7 @@ self: { mkDerivation { pname = "hsubconvert"; version = "0.0.2"; - sha256 = "3c79a8425f3debb7a91bba0bf1d967d112659e2f9db61df919a91f12716f87ea"; + sha256 = "1sl7dxqi47x937wivdlx5yg6a4niczcz22xs3flvgsrxbx1ahy9w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97482,6 +104024,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsudoku" = callPackage + ({ mkDerivation, base, bytestring, gi-gtk, HandsomeSoup + , haskell-gi-base, hspec, http-client, http-client-tls, hxt + , QuickCheck, text + }: + mkDerivation { + pname = "hsudoku"; + version = "0.1.1.0"; + sha256 = "1sq498shkr9xvzrg7spwvsfrnp0d414vcb6iv6pcy7h1jsplrgaz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring gi-gtk HandsomeSoup haskell-gi-base http-client + http-client-tls hxt text + ]; + executableHaskellDepends = [ + base bytestring gi-gtk HandsomeSoup haskell-gi-base http-client + http-client-tls hxt text + ]; + testHaskellDepends = [ + base bytestring gi-gtk HandsomeSoup haskell-gi-base hspec + http-client http-client-tls hxt QuickCheck text + ]; + homepage = "https://github.com/marcelmoosbrugger/hsudoku"; + description = "Sudoku game with a GTK3 interface"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsverilog" = callPackage ({ mkDerivation, base, containers, hspec, hspec-contrib , hspec-expectations-lifted, shakespeare, text, transformers @@ -97489,7 +104060,7 @@ self: { mkDerivation { pname = "hsverilog"; version = "0.1.0"; - sha256 = "ea28a7bc660e00cb99681a3ee95ff56088bf237aff090e7852992414e82763e2"; + sha256 = "1qk34zl1894ra9w0w2gzg8ivz230ymgyjghsd2cwn00fcsyafa7a"; libraryHaskellDepends = [ base containers shakespeare text transformers ]; @@ -97507,7 +104078,7 @@ self: { mkDerivation { pname = "hswip"; version = "0.3"; - sha256 = "0119356ed576c3fb79d2c5dc35fe0e393679eff9b3a92baa39ff7a2b9dbdd486"; + sha256 = "11nlpnfjnypz76m2padkz7ppjdir1vz3bp65s9wzphvnsmp3a681"; libraryHaskellDepends = [ base haskell98 mtl ]; librarySystemDepends = [ ncurses readline swipl ]; description = "embedding prolog in haskell"; @@ -97521,9 +104092,9 @@ self: { mkDerivation { pname = "hsx"; version = "0.10.5"; - sha256 = "9b8cf0a88719607de4e11dfd2811ffe43487ed2d77624e0351df40133c12c410"; + sha256 = "046428y16h6za41lwqkp5pnqfd74zw8jiz8xw7j7sq0rhylg134v"; revision = "1"; - editedCabalFile = "994fc0bb4928745f31c6c50279271b3463e2d5a8ce88cf2ede1edaf8d71e75ec"; + editedCabalFile = "1v3m3vbzinhyvqpcz26fm3ay4qrl3ckpj0n5qqqmyx1896xw0kwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ]; @@ -97538,7 +104109,7 @@ self: { mkDerivation { pname = "hsx-jmacro"; version = "7.3.8"; - sha256 = "97c7efa3f8acc5159d697e080fb9ed7abddfca64e4f03d67cb66583fd7114495"; + sha256 = "15a427bkyn36rdkkvw74ck5dzgbsxnwhy23yd6fibidcz2iyziwp"; libraryHaskellDepends = [ base hsp jmacro mtl text wl-pprint-text ]; @@ -97552,7 +104123,7 @@ self: { mkDerivation { pname = "hsx-xhtml"; version = "0.4.4"; - sha256 = "824e184fe16f540bc279f58d01f0f3c0187b502ed065b281e94a5be90974a180"; + sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2"; libraryHaskellDepends = [ base hsx mtl ]; homepage = "http://code.google.com/hsp"; description = "XHTML utilities to use together with HSX"; @@ -97566,8 +104137,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.0"; - sha256 = "987e6ce1eb612680dd3668a5f3347a6be9f6a78c54dbf5e3aabc0f8b4f991170"; + version = "0.14.1"; + sha256 = "191rzsxnilkps20pp124pfbq8blf6g1b3gj1z6h0aa73hhf07c73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97584,7 +104155,7 @@ self: { mkDerivation { pname = "hsyscall"; version = "0.4"; - sha256 = "8d8ad7d8d9b6d5aa1df39b59c40985526632345a3a8c890e567a3ebe4f18517b"; + sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aycanirican/hsyscall"; description = "FFI to syscalls"; @@ -97597,7 +104168,7 @@ self: { mkDerivation { pname = "hsyslog"; version = "4"; - sha256 = "33d5fca76dbf8f1675258e81af5e53ee7c659cfee9cc78ea202c78ba05003a49"; + sha256 = "0j9s002vly1c43m7ik79zsf6az7fadgaz0cf4msid3xzdnkzrm9k"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring QuickCheck ]; homepage = "http://github.com/peti/hsyslog"; @@ -97606,6 +104177,24 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hsyslog_5_0_1" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: + mkDerivation { + pname = "hsyslog"; + 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"; + description = "FFI interface to syslog(3) from POSIX.1-2001"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hsyslog-udp" = callPackage ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text , time, unix @@ -97613,7 +104202,7 @@ self: { mkDerivation { pname = "hsyslog-udp"; version = "0.1.2"; - sha256 = "1a6e1d18039150a6036003b5bfc40bdde9650e6eee67404bc9ee4aecf7baa4ae"; + sha256 = "1bm4pbvyqjpfr55l0rzfdq76bsfx1g2bzd83c01scl4i0cc1svhs"; libraryHaskellDepends = [ base bytestring hsyslog network text time unix ]; @@ -97629,7 +104218,7 @@ self: { mkDerivation { pname = "hszephyr"; version = "0.2"; - sha256 = "9175c7cdae7e37f86cd28b38c213b00c458b789758bb675e2012c2b68e91f418"; + sha256 = "067lj67bdhhj41g6gfsqjxw8ni8cn09w4f4bs9nghdvymv6wfxci"; libraryHaskellDepends = [ base bytestring mtl time ]; librarySystemDepends = [ com_err zephyr ]; description = "Simple libzephyr bindings"; @@ -97644,9 +104233,9 @@ self: { mkDerivation { pname = "htaglib"; version = "1.0.4"; - sha256 = "0b23c25f6ef721e193176fd2c4e491376235c5cb04dea0d75ebf721bd10b40a7"; + sha256 = "19s01g8inwmzbvbs1ph4rg2kaqipj7jc9lkg2y9y28gpdrgw48qb"; revision = "1"; - editedCabalFile = "beb694fc3cccb59cf1f9e3a8568325673cc9d7733c2118681eeb9c9a2bfc127c"; + editedCabalFile = "0z0jzhmrm77b3rl1h89wfgbwjg374n1mda73z7qrrdfc7ky99dmy"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; @@ -97655,14 +104244,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; - "htaglib_1_1_0" = callPackage + "htaglib_1_1_1" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , taglib, text, transformers }: mkDerivation { pname = "htaglib"; - version = "1.1.0"; - sha256 = "e2d2c9df136823d4c88f5e6f2c8053a713e326ec2b0de9e0e00410997c99ff00"; + version = "1.1.1"; + sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3"; libraryHaskellDepends = [ base bytestring text transformers ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; @@ -97677,7 +104266,7 @@ self: { mkDerivation { pname = "htags"; version = "1.0.1"; - sha256 = "537e8409085a21c4dce83a2aab46d99db80764a0efbe7c61ab11ff17e96f8d18"; + sha256 = "064ddzligzqimdhprgpgl1j0gf4xv53anaisx3fc88as104q8zjk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97694,7 +104283,7 @@ self: { mkDerivation { pname = "htar"; version = "0.4.0.2"; - sha256 = "7f788adcf99d32461f2a9eeb2731ab7a6c1689304cc0aa7013d33108f03ea596"; + sha256 = "15m57vq0hcfk2dqamh2c624icv3smcqjgswy58glcclxz7f8ly3z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97710,7 +104299,7 @@ self: { mkDerivation { pname = "htaut"; version = "0.1.1.0"; - sha256 = "f4d07cc1fe6417b66dbc7faf44bb501398fe8fc2c2f904a1319b4c21187d6fa2"; + sha256 = "18kgglc22k4v66hh9yf2qa7zx60ka2xl9bvzpinvc5v4zv0prl7l"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ailrun/htaut#readme"; description = "Tautology Proving Logic in Haskell"; @@ -97722,7 +104311,7 @@ self: { mkDerivation { pname = "htestu"; version = "0.1.1.2"; - sha256 = "d67c265aff02e0a203df5dced00c2ef432154c206fa6b33cabc684afef40254f"; + sha256 = "0kr583psz166mcyb79kg4161acpl5q6d1kjxvw1s5q02zxd2cz6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random ]; @@ -97740,7 +104329,7 @@ self: { mkDerivation { pname = "htiled"; version = "0.1.4.0"; - sha256 = "f78d4ff35328922613c93b4348738547bd55a3a196965a7e84e9e6289ba5aec1"; + sha256 = "1hdflndjirp9hiz5m5lnl6imbga7hmrlhhrvr49jd4i8agrlz3gp"; libraryHaskellDepends = [ base base64-bytestring bytestring containers filepath hxt split zlib @@ -97754,7 +104343,7 @@ self: { mkDerivation { pname = "htime"; version = "0.3.1"; - sha256 = "b92bc79630a7a7ca8d53a86a17f444ac409c21984467db55c68145c3d68dc793"; + sha256 = "14y7ipbc6ic1qraxnrs4k0hrqh5c8ks1fsm8af6wm9x762bcfaxr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process time ]; @@ -97762,12 +104351,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htlset" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "htlset"; + version = "0.1.0.0"; + sha256 = "18wbw6zfb424xq3m05hjxypiiaqc75nd365y9l8035dvi29mfbnf"; + libraryHaskellDepends = [ base containers ]; + homepage = "https://github.com/kelemzol/htlset"; + description = "Heterogenous Set"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "html" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "html"; version = "1.0.1.2"; - sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061"; + sha256 = "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c"; libraryHaskellDepends = [ base ]; description = "HTML combinator library"; license = stdenv.lib.licenses.bsd3; @@ -97781,9 +104382,9 @@ self: { mkDerivation { pname = "html-conduit"; version = "1.2.1.1"; - sha256 = "98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8"; + sha256 = "1a5878axl1w65rv3g76d8fwgzbwazikna885jz5156zrrdq79hlq"; revision = "1"; - editedCabalFile = "de32ca4d6df94a7c027a11db1b2e32ef1a7ccfe0565923f24528613ade821343"; + editedCabalFile = "0hqkhbg3lq988pr26nanw37pq6pg68p1pnqig817qjprdm6wlcny"; libraryHaskellDepends = [ base bytestring conduit conduit-extra containers resourcet tagstream-conduit text transformers xml-conduit xml-types @@ -97803,7 +104404,7 @@ self: { mkDerivation { pname = "html-email-validate"; version = "0.2.0.0"; - sha256 = "3d2a3ec75b638cec71df57512473052d485dc118aec4662d5a8dae5e95aa6daf"; + sha256 = "1bvdmaamxbldb8nndi5f330msj1d0mrj8lapvxqyr333bg3kwaix"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec QuickCheck regex-pcre-builtin text @@ -97819,8 +104420,8 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.1.3"; - sha256 = "6bb2ae9f6b65b5652854e78ece26d7c78e4c5eef6c7f5a75ee88e6730469bc1d"; + version = "1.1.4"; + sha256 = "1h4jjy1fqzfcj49q99iprnz4ifaznacxnryq9bx8abxqsss22p0d"; libraryHaskellDepends = [ attoparsec base-prelude text unordered-containers ]; @@ -97838,7 +104439,7 @@ self: { mkDerivation { pname = "html-kure"; version = "0.2.1"; - sha256 = "1428b6f5b30beb88e28925e26a498874592aa46fa51f05fc00db2b6bf270e2f4"; + sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l"; libraryHaskellDepends = [ base hxt kure ]; homepage = "www.ittc.ku.edu/csdl/fpg/software/html-kure"; description = "HTML rewrite engine, using KURE"; @@ -97850,7 +104451,7 @@ self: { mkDerivation { pname = "html-minimalist"; version = "0.15"; - sha256 = "b2f0c7fb6b0f04249b61c76ec22655c8808af15a239177ce523cf5c0d092101b"; + sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j"; libraryHaskellDepends = [ base xml ]; homepage = "http://rd.slavepianos.org/t/html-minimalist"; description = "Minimalist haskell html library"; @@ -97864,7 +104465,7 @@ self: { mkDerivation { pname = "html-parse"; version = "0.2.0.0"; - sha256 = "9c9f8401dc86ea3a9612bfc0d430a03b7e9130183f0b8dc1fa100cd0bbb84a92"; + sha256 = "14jap2xx030hzb0qs2rz30q92zivl0qd9h5z2ab3msl6vh0q97ww"; libraryHaskellDepends = [ attoparsec base deepseq text ]; benchmarkHaskellDepends = [ attoparsec base criterion deepseq tagsoup text @@ -97879,7 +104480,7 @@ self: { mkDerivation { pname = "html-rules"; version = "0.1.0.1"; - sha256 = "fcd2f2e15cdb9e77c7d2fb8db77be393c66fc376e3e7f7d03759315a43c712cc"; + sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw"; libraryHaskellDepends = [ base lens mtl tagsoup transformers ]; homepage = "http://github.com/kylcarte/html-rules/"; description = "Perform traversals of HTML structures using sets of rules"; @@ -97895,7 +104496,7 @@ self: { mkDerivation { pname = "html-tokenizer"; version = "0.4.1"; - sha256 = "1076a72985763dec5d5da3793ae3e4c11cc5c8993b56a31b60f192eee0ed17c1"; + sha256 = "1h8pxphfx4pic0ds6mivk74ca761wkiklyd3bmfyqgbnhllsfxhh"; libraryHaskellDepends = [ attoparsec base-prelude case-insensitive conversion conversion-case-insensitive conversion-text text @@ -97914,7 +104515,7 @@ self: { mkDerivation { pname = "html-truncate"; version = "0.3.0.0"; - sha256 = "24dceeb9d4287c294b83da58022cf8aa3e4d0a9dae06ae235ae49c805e9bc6b4"; + sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14"; libraryHaskellDepends = [ base tagsoup ]; homepage = "https://github.com/mruegenberg/html-truncate"; description = "A HTML truncator"; @@ -97929,7 +104530,7 @@ self: { mkDerivation { pname = "html2hamlet"; version = "0.3.0"; - sha256 = "bfb6c9d66fddbc38ce205d9c5133eb94336c0f762cc1d015597b529bca6f89d8"; + sha256 = "1n49dz59nlkvb4ax1h9cfq7nqcwlxcrm372x4373ig6xdzbckdmz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97946,7 +104547,7 @@ self: { mkDerivation { pname = "html5-entity"; version = "0.2.0.3"; - sha256 = "2e067939e2c7d1a204ee219651f6c31205eed3ff6f43e0852ffc5bd5a1feb52e"; + sha256 = "0bmmzshxanzw5y2y0hvgzz9yw18jqgv535i1xq2a5lf7w8wpj1if"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers text ]; @@ -97961,7 +104562,7 @@ self: { mkDerivation { pname = "htn"; version = "0.1.0.0"; - sha256 = "13f49c161f754d3bac7a08227b949c7a34c7658f22476fcc99f26c0d8e673ce5"; + sha256 = "1r9wcy70sv7jk766yir2ixjwfd3skja7n8h8gan3nkbm3wb9rx0k"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; homepage = "https://github.com/y-kamiya/htn-haskell#readme"; @@ -97974,7 +104575,7 @@ self: { mkDerivation { pname = "htodo"; version = "0.0.4"; - sha256 = "555092cf22a95162b0142333583c95659505236f5262eea222f010793d27632b"; + sha256 = "0av34wypj47h4aifwqjjdwihb5b5jly5hcr32jq64ld94b7r4l2m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HDBC HDBC-sqlite3 ]; @@ -97991,7 +104592,7 @@ self: { mkDerivation { pname = "htoml"; version = "1.0.0.3"; - sha256 = "08f8d88a326f80fb55c0abb9431941c3a2a30f2d58f49c94349961ceeb4c856f"; + sha256 = "0vw59kmwwqcr6ja9rx2q5l7s78n384cl7fdbq1azp03g6a5diy08"; libraryHaskellDepends = [ aeson base containers old-locale parsec text time unordered-containers vector @@ -98014,7 +104615,7 @@ self: { mkDerivation { pname = "htrace"; version = "0.1"; - sha256 = "9dee29cd8f34466f592c50de344c26da350773f4cbf089ee164fdd6b6ee2212b"; + sha256 = "0ar1w9p6ppag2vp8kw6byirhfdfs4r639pjh5icnyiiliz6jkvlx"; libraryHaskellDepends = [ base ]; description = "Hierarchical tracing for debugging of lazy evaluation"; license = stdenv.lib.licenses.bsd3; @@ -98025,7 +104626,7 @@ self: { mkDerivation { pname = "hts"; version = "0.15"; - sha256 = "c21b19b50cf5d7e8da10eebdfa453d4a86d6207a3df3ccdb4c97e8a6e5d40950"; + sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2"; libraryHaskellDepends = [ base hmt xml ]; homepage = "http://rd.slavepianos.org/t/hts"; description = "Haskell Music Typesetting"; @@ -98041,7 +104642,7 @@ self: { mkDerivation { pname = "htsn"; version = "0.1.1"; - sha256 = "e5de5e6bc8f2edaaf2f650a1de6c59bc64eba0a56c7f1d98755d1423441f7088"; + sha256 = "123h3x22652xfnc1szvclnhfnr5wb5ndx8ahyvramvgjr1mmxpp5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98061,7 +104662,7 @@ self: { mkDerivation { pname = "htsn-common"; version = "0.0.2"; - sha256 = "25b04dafb1797eb7697d3bc2049284ffc218cb34d058aced3741d93a9001977b"; + sha256 = "0ywp0683mna16znsqn6h6k5iihpzhj909hivgmlvfzkrn6plvc15"; libraryHaskellDepends = [ ansi-terminal base hslogger transformers ]; @@ -98079,7 +104680,7 @@ self: { mkDerivation { pname = "htsn-import"; version = "0.2.4"; - sha256 = "036794975f6d809c5960686e48761c1420dc4e559181a9fee7b52172144aa0d6"; + sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98104,7 +104705,7 @@ self: { mkDerivation { pname = "http-accept"; version = "0.2"; - sha256 = "3112c86be446d52b0b65b698ff79a95bfcdc77e1ea91dd44356e3d99329f7cc7"; + sha256 = "1ivwkwr9jgbf6m2dv4gaw5vxrz2vm5wzz65ncl5jpma6wimwh4ii"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/singpolyma/http-accept"; description = "Functions for working with HTTP Accept headers"; @@ -98112,19 +104713,21 @@ self: { }) {}; "http-api-data" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , doctest, filepath, hashable, hspec, HUnit, QuickCheck + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring + , Cabal, cabal-doctest, containers, directory, doctest, filepath + , hashable, hspec, http-types, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat , unordered-containers, uri-bytestring, uuid, uuid-types }: mkDerivation { pname = "http-api-data"; - version = "0.3.5"; - sha256 = "3711ac5f97afe8e89d1f8959138de8f2b3afd8ec30f9c6f3eebbfb2caa2fbc45"; - setupHaskellDepends = [ base Cabal directory filepath ]; + version = "0.3.7.1"; + sha256 = "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bytestring containers hashable text time time-locale-compat - unordered-containers uri-bytestring uuid-types + attoparsec attoparsec-iso8601 base bytestring containers hashable + http-types text time time-locale-compat unordered-containers + uri-bytestring uuid-types ]; testHaskellDepends = [ base bytestring directory doctest filepath hspec HUnit QuickCheck @@ -98140,7 +104743,7 @@ self: { mkDerivation { pname = "http-attoparsec"; version = "0.1.1"; - sha256 = "43e16753f5e4126aaec41aac67562e38151fc6de9c2b10eace35841e9d48888a"; + sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3"; libraryHaskellDepends = [ attoparsec base bytestring http-types ]; homepage = "https://github.com/tlaitinen/http-attoparsec"; description = "Attoparsec parsers for http-types"; @@ -98148,37 +104751,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client_0_4_31_2" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, exceptions, filepath - , ghc-prim, hspec, http-types, mime-types, monad-control, network - , network-uri, random, streaming-commons, text, time, transformers - , zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.4.31.2"; - sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - exceptions filepath ghc-prim http-types mime-types network - network-uri random streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie @@ -98188,8 +104760,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.6.1"; - sha256 = "2c304337b88ea48cf4b1c4e4ac12ec48c5f3a241f3ab44a57965c1d9d06a2bed"; + version = "0.5.7.0"; + sha256 = "18zza3smv5fn5clgq2nij0wqnakh950xif9lwlfqbkam5k1flhg2"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -98216,7 +104788,7 @@ self: { mkDerivation { pname = "http-client-auth"; version = "0.1.0.1"; - sha256 = "441a92ab423615e740fd39784c3dfc0cd4c66b5fddd3c21f730ea3113e574c1f"; + sha256 = "07scawz138qffcgw5lyxbxmwdm0czhylqy1rzm0ff59n8amr46j4"; libraryHaskellDepends = [ base base64-string blaze-builder bytestring case-insensitive conduit crypto-conduit http-client http-conduit pureMD5 resourcet @@ -98232,7 +104804,7 @@ self: { mkDerivation { pname = "http-client-conduit"; version = "0.3.0"; - sha256 = "2934dd952999bdb87a0c1ccabfdaf985db82a12227cbaf358373b9797cc25b4c"; + sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19"; libraryHaskellDepends = [ base http-client ]; doHaddock = false; homepage = "https://github.com/snoyberg/http-client"; @@ -98247,7 +104819,7 @@ self: { mkDerivation { pname = "http-client-lens"; version = "0.1.0"; - sha256 = "37cab1344deaf1b54c9e63f76cd21f37cda4023560072b30e7135d982f1fb8d8"; + sha256 = "1n5q3wprhp8kwwq2n1v06l1a9k9p3z96rxv3kr6bbwga9lsb3jip"; libraryHaskellDepends = [ base bytestring http-client http-types lens network ]; @@ -98262,7 +104834,7 @@ self: { mkDerivation { pname = "http-client-multipart"; version = "0.3.0.0"; - sha256 = "2fb33407176843b1495835aa3fed618398057e86eff99c4baa0fa2628636eaa3"; + sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg"; libraryHaskellDepends = [ base http-client ]; doHaddock = false; homepage = "https://github.com/snoyberg/http-client"; @@ -98276,8 +104848,8 @@ self: { }: mkDerivation { pname = "http-client-openssl"; - version = "0.2.0.4"; - sha256 = "28dddd694ed91174c2544dd388d3550df5c79d5cc4be7e4b260a825ebde1afed"; + version = "0.2.0.5"; + sha256 = "1kv0f76sa6pkjgm5hjy1zf5p1k60r0crpj00glrjzgh0i1l0gr51"; libraryHaskellDepends = [ base HsOpenSSL http-client network ]; testHaskellDepends = [ base HsOpenSSL hspec http-client http-types @@ -98296,7 +104868,7 @@ self: { mkDerivation { pname = "http-client-request-modifiers"; version = "0.1"; - sha256 = "b944faca62c140e1e478b4f110f3c46d5e8b6d1a7d60408074dd02f888c8a6ad"; + sha256 = "1bd6r24gh0nxfj040q3x39nqnpkdqkri1wdlg3jf2h61cb5gli5r"; libraryHaskellDepends = [ base bytestring exceptions http-client http-media http-types network network-uri @@ -98314,7 +104886,7 @@ self: { mkDerivation { pname = "http-client-session"; version = "0.1.2"; - sha256 = "9cb4f452fa5465f6247dae835e6097c6d46f177804cb6121d61f4706ad3c9e65"; + sha256 = "0rcy7jnhciqzsqhn3jq4g0bnzm66jxh5x0xfgljgcralz99g9d4w"; libraryHaskellDepends = [ base-prelude bytestring either http-client mtl-prelude ]; @@ -98330,7 +104902,7 @@ self: { mkDerivation { pname = "http-client-streams"; version = "0.3.1.0"; - sha256 = "1fb9a61ef1b4af41dd3c1dfc9b683c8f56ed4d0963cd5212a129159510053ce1"; + sha256 = "1q9w0l89a599l4955kb3156ysmlg7il9pz0x7kfl3bxly4gadf8z"; libraryHaskellDepends = [ base bytestring HsOpenSSL http-client http-client-openssl io-streams mtl transformers @@ -98340,28 +104912,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client-tls_0_2_4_1" = callPackage - ({ mkDerivation, base, bytestring, connection, data-default-class - , hspec, http-client, http-types, network, tls - }: - mkDerivation { - pname = "http-client-tls"; - version = "0.2.4.1"; - sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3"; - revision = "1"; - editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c"; - libraryHaskellDepends = [ - base bytestring connection data-default-class http-client network - tls - ]; - testHaskellDepends = [ base hspec http-client http-types ]; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-client-tls" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , containers, criterion, cryptonite, data-default-class, exceptions @@ -98370,8 +104920,8 @@ self: { }: mkDerivation { pname = "http-client-tls"; - version = "0.3.4"; - sha256 = "37693b0ebcfa6ce796abf39647ff4df17361ab1ab1f999ac10faba67d3042bc1"; + version = "0.3.5.1"; + sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1"; libraryHaskellDepends = [ base bytestring case-insensitive connection containers cryptonite data-default-class exceptions http-client http-types memory network @@ -98393,7 +104943,7 @@ self: { mkDerivation { pname = "http-common"; version = "0.8.2.0"; - sha256 = "2915e77b0d000a617d4c1304fdc46f45b70acc0942670066a95b2c8d4e504593"; + sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive directory mtl network text transformers unordered-containers @@ -98413,8 +104963,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.3.1"; - sha256 = "53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e"; + 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 @@ -98442,8 +104992,8 @@ self: { }: mkDerivation { pname = "http-conduit-browser"; - version = "2.0.0.0"; - sha256 = "3885fe04cd87526c082e906a1d29ce9088ca456cfe3dc121cf4ef34ac2d28feb"; + version = "2.0.0.1"; + sha256 = "0h8kqjpw859q8kafplbxz5hn7zva71ym25z7vf5vz0pwiw2587wv"; libraryHaskellDepends = [ base bytestring conduit containers cookie data-default exceptions http-client http-conduit http-types lifted-base monad-control @@ -98469,7 +105019,7 @@ self: { mkDerivation { pname = "http-conduit-downloader"; version = "1.0.30"; - sha256 = "aaecfd7acae1a6d75fc0c9c115e897c3b5dbba52d210a991bd57334746e41cd4"; + sha256 = "1m0wwi34fcsppn8sj46jaaxdpdf3jzl1bhf9q1gxg9p1r9xgvv5a"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types lifted-base mtl network @@ -98488,7 +105038,7 @@ self: { mkDerivation { pname = "http-date"; version = "0.0.6.1"; - sha256 = "f2e106603e2b3f710f1189e478f6c20067d9a9d21a20a633fe362b3f91807636"; + sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj"; libraryHaskellDepends = [ array attoparsec base bytestring ]; testHaskellDepends = [ base bytestring doctest hspec old-locale time @@ -98504,7 +105054,7 @@ self: { mkDerivation { pname = "http-dispatch"; version = "0.6.2.0"; - sha256 = "8838082ba44fe02bda80830c74552e6f28093617ad75c6614e199168ea7677d3"; + sha256 = "1lvpfvm6i48r9rhwcxdd2wv0ja3g5rap8343h3d2pq2glhmhhf48"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive http-client http-client-tls http-types @@ -98523,9 +105073,9 @@ self: { mkDerivation { pname = "http-encodings"; version = "0.9.3"; - sha256 = "76dbd6c38d885cc6d260b59945cc0cd6c6087bb078a01be5384a2e2f14fe492c"; + sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn"; revision = "3"; - editedCabalFile = "5d6088d3d3691cec6febb92f81d5034a69bcf6d319230d5a478d79cb79b0e6f9"; + editedCabalFile = "1yg6n1wwnycd8xd0s8qrsgvbqsaa0gaq2bxrxdpyq739sg9qhq2x"; libraryHaskellDepends = [ base bytestring HTTP iconv mime mtl parsec text utf8-string zlib ]; @@ -98544,7 +105094,7 @@ self: { mkDerivation { pname = "http-enumerator"; version = "0.7.3.3"; - sha256 = "463f4a7086ee9226ad882ddeb51d5086b237204ef2e0780e1c544eb2debd8283"; + sha256 = "10w2ppgb4kjl3h77iq7j9qh3gcl6a0fvbpidi2njd4pfhrq4lgs6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98565,7 +105115,7 @@ self: { mkDerivation { pname = "http-grammar"; version = "0.1.0.0"; - sha256 = "47d093d24dacfda6880b2f920768323bd292fdebc70ad24d90eb2977b81d07f4"; + sha256 = "1x073nw7fagbj16x42n7xgyr5liv69l0g4ig1f4adzdc9p997l27"; libraryHaskellDepends = [ attoparsec base bytestring ]; homepage = "https://github.com/owensmurray/http-grammar"; description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules"; @@ -98581,7 +105131,7 @@ self: { mkDerivation { pname = "http-kinder"; version = "0.2.0.0"; - sha256 = "333a6e8bada98a8f027107aa10bff866b838f42bd2a0b10bed3702a17329fe26"; + sha256 = "09py55rs20ipxl5v386j5gs3if36z2zi1ah7f418z2m9mn5nwfik"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-media http-types singletons text time @@ -98603,7 +105153,7 @@ self: { mkDerivation { pname = "http-kit"; version = "0.5.1"; - sha256 = "487cd630f7ec3c1d50e22d9566bfa56ab7b7409e0927edaf21692ea596de96eb"; + sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28"; libraryHaskellDepends = [ base bytestring case-insensitive http-types ]; @@ -98623,7 +105173,7 @@ self: { mkDerivation { pname = "http-link-header"; version = "1.0.3"; - sha256 = "59bd2db4e7d14b6f7ce86848af5e38b4bd2e9963e9ffe5068c7b1a710dbdd7fe"; + sha256 = "1znppl6p26kvih3fbzz9cfcjxgdl71gayj38x1y6yjyiwys2vgar"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-conversion errors http-api-data network-uri text @@ -98647,9 +105197,9 @@ self: { mkDerivation { pname = "http-listen"; version = "0.1.0.0"; - sha256 = "e0eb0bb8898084fe07ddead700e42de294f70b6a62ee4c2e3c9c3d4b3f2595b1"; + sha256 = "1ccm4lzlngcw7hp4rvk2d85zg5725pj01mzavl3zx140i6w0psz0"; revision = "2"; - editedCabalFile = "968de91e5c6c468a62f8f5bff6b465dea5fcd0d33b024dc81df1a9cea9beb2ef"; + editedCabalFile = "1vxjpslwxagi3p44s0ivsg8gr9fycnsgdgzmz1i8likcbhgfk3cn"; libraryHaskellDepends = [ base bytestring exceptions HTTP network transformers ]; @@ -98665,7 +105215,7 @@ self: { mkDerivation { pname = "http-media"; version = "0.6.4"; - sha256 = "ef762cf50854250e4247b744decbebe4d3d188dbc19bfd90aa344ed3c61cc9d3"; + sha256 = "1ly93k3d6kilma8gv6y1vf4d3lz4xg5xwi5p8x10w9al13sjqxpg"; libraryHaskellDepends = [ base bytestring case-insensitive containers ]; @@ -98678,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 @@ -98686,7 +105258,7 @@ self: { mkDerivation { pname = "http-monad"; version = "0.1.1.1"; - sha256 = "ad3ea0bc4a95cf66b442d69084f99906e79bcd431ae1c0eb0237fb1ee7276355"; + sha256 = "0mb34zkixyrp0bmw1q8s8g6rprq6k7wq946n8as6dkwm9aya0gmd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98703,8 +105275,8 @@ self: { }: mkDerivation { pname = "http-pony"; - version = "0.1.0.5"; - sha256 = "255ca693eeb4cff7c3315e75fe63414b987f56a0424ec80e579d2c0f357f78e1"; + version = "0.1.0.7"; + sha256 = "1zlz9fmnhaxb38axscmpda4iqsv8idv3wq116pr449dvxs5kj721"; libraryHaskellDepends = [ base bytestring exceptions network pipes pipes-network pipes-safe transformers @@ -98724,7 +105296,7 @@ self: { mkDerivation { pname = "http-pony-serve-wai"; version = "0.1.0.4"; - sha256 = "c1e3a9a1ce94dd4e60e5bb9d673aa618c6d8edcbd1c340f7a9742eaf91eddc05"; + sha256 = "01fwxn8sybklm7vl1hyirgnxiihqlqx6g7dvwmh4xpclrshskqy1"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring case-insensitive http-pony-transformer-http http-pony-transformer-startline @@ -98740,7 +105312,7 @@ self: { mkDerivation { pname = "http-pony-transformer-case-insensitive"; version = "0.1.0.2"; - sha256 = "399b3dffbe4ee4f6723ac92c3f6914bfa261499977919752de7e69bc0ac7cb91"; + sha256 = "14fbqw5bqsbyvr99g4bpk54n38mz2ilkyb6979rgdr2fpvzkv6rr"; libraryHaskellDepends = [ base case-insensitive lens profunctors ]; homepage = "https://github.com/nfjinjing/http-pony-transformer-case-insensitive"; description = "Tag http headers as case insensitive"; @@ -98754,7 +105326,7 @@ self: { mkDerivation { pname = "http-pony-transformer-http"; version = "0.1.0.3"; - sha256 = "b5e19a0a77ede213c89524609ef401c6d8d5c0c4350a3aae1d161d9c1e294fdd"; + sha256 = "1pag54g9q78n3np3l2imqk0dbn6607s9wq14jp417qpdfw59mqdm"; libraryHaskellDepends = [ attoparsec base bytestring pipes pipes-attoparsec transformers ]; @@ -98767,7 +105339,7 @@ self: { mkDerivation { pname = "http-pony-transformer-startline"; version = "0.1.0.1"; - sha256 = "797995f992cc366b94c16f3e85d5c5cadec3fc4475f72511472d12f2ec67bf39"; + sha256 = "0fdzczng44id8w8jbxvm8kyc7pnaqpaqagkgq6a6ndncjbwraybr"; libraryHaskellDepends = [ attoparsec base bytestring http-types lens ]; @@ -98785,7 +105357,7 @@ self: { mkDerivation { pname = "http-proxy"; version = "0.1.0.5"; - sha256 = "4406e4f19ae08d4d281d15a76c19c0661fcb7c5b9bf93c0f279001ac761894d8"; + sha256 = "1n4l31vaq0ch4w7krycvbdycn7v6q0cnr9qm3ll4v3g0kbqy81j4"; libraryHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing case-insensitive conduit conduit-extra http-client http-conduit @@ -98811,7 +105383,7 @@ self: { mkDerivation { pname = "http-querystring"; version = "1.0"; - sha256 = "a69e29840dbbe6fd924ec660cdcab0660283ce0387f3b768b9febd9b38ea4158"; + sha256 = "0n21x8w9pggyp5lbgww70g7860k6n35csq669s9gvrmv1n22k7m6"; libraryHaskellDepends = [ base bytestring containers http-types ]; testHaskellDepends = [ base bytestring containers doctest hspec http-types QuickCheck @@ -98830,7 +105402,7 @@ self: { mkDerivation { pname = "http-response-decoder"; version = "0.2.3"; - sha256 = "4e0f0ac43f33b811ef8b35715f207318034625547259f8b65c1566702a909f31"; + sha256 = "0cczj0m70rhmbjvghnbjahjlc0qqfch5yw9migpi3f1k7z20l3sf"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder case-insensitive http-client http-types matcher profunctors text @@ -98850,8 +105422,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.4.3.2"; - sha256 = "c2b3300bf43a9810e8642dd7fa44ecfb5e0ce1055dc01e0b604ae9a99fbfd77a"; + version = "0.4.4"; + sha256 = "0y29jn65llbljpalshic673yxfd6jrpn057sx4xaf14pgcx99ahw"; libraryHaskellDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default-class http-client http-types @@ -98875,7 +105447,7 @@ self: { mkDerivation { pname = "http-server"; version = "1.0.6"; - sha256 = "5cd44741053aef8ba7bd6b6d8d0a8048a171db42e2b7cb5013a99fcd754143b5"; + sha256 = "1da385swv7x92d8cpdz28bdp38a8h058svbbpnkqpvrs0m0lgm2w"; libraryHaskellDepends = [ base HTTP mime network network-uri text unix url utf8-string ]; @@ -98889,7 +105461,7 @@ self: { mkDerivation { pname = "http-shed"; version = "0.1"; - sha256 = "bb31968733cbe9d369c651b166f1ecbac9d325c371a9b2fd9723f79953224b2b"; + sha256 = "0asb499rkxr3jzyv5abiqcjx7jdsxkqndcaiqrlx7sfb6f3rccdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network ]; @@ -98900,17 +105472,20 @@ self: { "http-streams" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations - , http-common, HUnit, io-streams, lifted-base, mtl, network - , network-uri, openssl-streams, snap-core, snap-server - , system-fileio, system-filepath, text, transformers + , base64-bytestring, blaze-builder, bytestring, Cabal + , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec + , hspec-expectations, http-common, HUnit, io-streams, lifted-base + , mtl, network, network-uri, openssl-streams, snap-core + , snap-server, system-fileio, system-filepath, text, transformers , unordered-containers }: mkDerivation { pname = "http-streams"; - version = "0.8.4.0"; - sha256 = "d8778352ca3d87b7ea6839d9c26e20d89792e723a6b63e399d19e7811aaf4793"; + version = "0.8.5.3"; + sha256 = "1qz55rxzd98d00qdp5hp60i5cc8f0hfir6dhq15z2jzj5bsz9nna"; + revision = "1"; + editedCabalFile = "0ki3gv5lhs69hj17ng4asyqaw4wcjjpwqda79az9wkizxyvbc0ay"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -98925,7 +105500,7 @@ self: { system-fileio system-filepath text transformers unordered-containers ]; - homepage = "http://research.operationaldynamics.com/projects/http-streams/"; + homepage = "http://github.com/afcowie/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -98938,7 +105513,7 @@ self: { mkDerivation { pname = "http-test"; version = "0.2.5"; - sha256 = "06254d86b26a7df3ac6e5bee7e8c4cf74bdde12e825567a10ca81c8ae6fdb3a3"; + sha256 = "18xkzpk8l7581jhnfmc25vhxsjzp9j67xvjvdsng6zbana34s986"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98958,7 +105533,7 @@ self: { mkDerivation { pname = "http-trace"; version = "0.1.1.1"; - sha256 = "45cffb7421c45bc2dd7edc523bcf7383df285e0be24c7e79b742b35995ba4c15"; + sha256 = "05acpaamkcs2nxwpwk721dg2ipw3fg7knlnwgvfw4ny445sgpks5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98979,7 +105554,7 @@ self: { mkDerivation { pname = "http-types"; version = "0.9.1"; - sha256 = "7bed648cdc1c69e76bf039763dbe1074b55fd2704911dd0cb6b7dfebf1b6f550"; + sha256 = "0l7mnvqyppxpnq6ds4a9f395zdbl22z3sxiry1myfs8wvj669vbv"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive text ]; @@ -98997,7 +105572,7 @@ self: { mkDerivation { pname = "http-wget"; version = "0.6.2.3"; - sha256 = "dd9da1c130553752be306aaf03a413234f2bad3b953a5ec2ea6a46d4ef236fe9"; + sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx"; libraryHaskellDepends = [ base failure process transformers ]; homepage = "http://github.com/snoyberg/http-wget/tree/master"; description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)"; @@ -99015,7 +105590,7 @@ self: { mkDerivation { pname = "http2"; version = "1.6.3"; - sha256 = "61620eca0f57875a6a9bd24f9cc04c301b5c3c668bf98f85e9989aad5d069c43"; + sha256 = "0hww0rfsv6lqx62qzycbcqy5q6rh9k09qkyjkdm5m1sp1z50wqk1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99041,7 +105616,7 @@ self: { mkDerivation { pname = "httpd-shed"; version = "0.4.0.3"; - sha256 = "b0ff87d81e61f788d3920d952e4469d984742ba49c006df086c159886bf09218"; + sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-uri ]; @@ -99057,7 +105632,7 @@ self: { mkDerivation { pname = "https-everywhere-rules"; version = "0.1.0"; - sha256 = "d74e41d6fb34499918d55f955e252570ecc92768241aa17310e237b4e5b21e9c"; + sha256 = "170ynbjv8dz221rs26i4d0kwkv3h4ljmx5azslc9jj9lzgb42knp"; libraryHaskellDepends = [ attoparsec base errors functor-infix http-client https-everywhere-rules-raw lens network pipes string-conversions @@ -99079,7 +105654,7 @@ self: { mkDerivation { pname = "https-everywhere-rules-raw"; version = "4.0"; - sha256 = "c6b7a6c928d8ed10e3b366e742ff034b67f4b545c34a79694bf05b41acfda37e"; + sha256 = "0zm3znn42nzh9dlpjjn38nsz8rsb0gzl5rv6ngii1vfq534sddy6"; libraryHaskellDepends = [ base directory filepath functor-infix text ]; @@ -99097,7 +105672,7 @@ self: { mkDerivation { pname = "httpspec"; version = "0.3.0.1"; - sha256 = "bbb4163981210083aca4ff403e34320edda6a135106a4c454f4a3271749ef0ed"; + sha256 = "1vghkrs72cja9x2lqshh6nhsdp8f68s3wh7zljn86011h4widd5v"; libraryHaskellDepends = [ base bidispec bytestring cgi containers encoding filepath HTTP hxt hxthelper MissingH mtl network pretty safe @@ -99112,7 +105687,7 @@ self: { mkDerivation { pname = "htune"; version = "0.2"; - sha256 = "026663c771180a31767d19b6ac21c3412304fd3f63d4d88f4b65fb7e166a81c6"; + sha256 = "1il1d8b7xyv59f7xim337zyh88s1qchsrdhrgmv322hqf73n6rh2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa-pcm base carray fft gloss ]; @@ -99126,7 +105701,7 @@ self: { mkDerivation { pname = "htzaar"; version = "0.0.2"; - sha256 = "ab5d4bd286a00a2038aedb28f0cca761a2b23cbed2a445b51d04fa20100ee489"; + sha256 = "12g41q821yh43nslb96jpqyb58k1lz6g0a6vmqw202m0hv94npdb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base OpenGL random SDL ]; @@ -99143,7 +105718,7 @@ self: { mkDerivation { pname = "hub"; version = "1.9.0.1"; - sha256 = "61f71c22ea76cd3a192aa12431884a8f061230fe5bffea02f51fd7305b530c82"; + sha256 = "10hcaddk1mqzyl1fmzsvzqq141lg9a43295158ckmkbnx8i1rxv1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99161,7 +105736,7 @@ self: { mkDerivation { pname = "hubigraph"; version = "0.3.2"; - sha256 = "24a06ec63e1c574d4687588306e4972dc2a46e9da41771668690ade1315dbda6"; + sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814"; libraryHaskellDepends = [ base containers haxr mtl ]; homepage = "http://ooxo.org/hubigraph/"; description = "A haskell wrap for Ubigraph"; @@ -99176,7 +105751,7 @@ self: { mkDerivation { pname = "hubris"; version = "0.0.3"; - sha256 = "341dbe825a8e52d340b67db87364e12a31cbe90bf7f4bb489f8b59c8be1db88c"; + sha256 = "135q3nzchncbkx4bpx7p1glwnc9aw5j77f3xnr0d6llfba1bw79l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99199,7 +105774,7 @@ self: { mkDerivation { pname = "huckleberry"; version = "0.10.0.2"; - sha256 = "a2c93662cb65817e5415271f7fb0b7cc8fa27d0374d0a90d4c7ec1762dc75e2a"; + sha256 = "0ajyqwnpdhby9h6skl3l0dys53ycnyq7y7r72ma7x0b5rdi3djd2"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mitsuji/huckleberry#readme"; description = "Haskell IOT on Intel Edison and other Linux computers"; @@ -99213,7 +105788,7 @@ self: { mkDerivation { pname = "huff"; version = "0.1.0.1"; - sha256 = "ff2e9051fb45d4694bf2e1a0a84452943856b043cf58cbcb1755ac424212ca3b"; + sha256 = "0fya29145b2m2z5wnn6g8fq5cf4la92ai871y95nkm25zd8r0bpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99233,7 +105808,7 @@ self: { mkDerivation { pname = "huffman"; version = "1.0.1"; - sha256 = "43933e2b7f2256420bc9ae28c9e22d6d2b40ce2f79105519825912a3c9a634a4"; + sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3"; libraryHaskellDepends = [ base containers fingertree ]; description = "Pure Haskell implementation of the Huffman encoding algorithm"; license = stdenv.lib.licenses.bsd3; @@ -99246,7 +105821,7 @@ self: { mkDerivation { pname = "hugs2yc"; version = "0.1.1"; - sha256 = "ea90c2d2ba2b17dc2a9540dee21ee700630ebecaaec1d36524082300b96cacae"; + sha256 = "1bmcdjwh08q84ijx7hdfraz0wqq0wwgf5pj0jlmdq5rbpb9c547a"; libraryHaskellDepends = [ base containers directory filepath mtl parsec uniplate ycextra yhccore @@ -99266,7 +105841,7 @@ self: { mkDerivation { pname = "hulk"; version = "0.2.0"; - sha256 = "624e9ef6c3fa0b436afee182e35e364e23c959803a16b88ef139c619c2d2006f"; + sha256 = "0vq0sb11kiiry67bh5ish1cwj8sf6rgf70p1zrm462zsqgv9wkk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99284,12 +105859,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "human-parse" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "human-parse"; + version = "0.1.0.0"; + sha256 = "00jngz0v32jd90hq22zshp3ldfrjfkdik9pf6ab4n2bd2mql3va5"; + libraryHaskellDepends = [ base text ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "A lawless typeclass for parsing text entered by humans"; + license = stdenv.lib.licenses.asl20; + }) {}; + "human-readable-duration" = callPackage ({ mkDerivation, base, criterion, doctest, Glob }: mkDerivation { pname = "human-readable-duration"; version = "0.2.0.3"; - sha256 = "93f3a91a2994588728ae757dcca5104e18a570b3591773aa7f03c524c97599da"; + sha256 = "1nlrfp4j9i83gym765srndqaa62f22jwqzbmmql8fn4l54dakwwk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; benchmarkHaskellDepends = [ base criterion ]; @@ -99298,6 +105885,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "human-text" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "human-text"; + version = "0.1.0.1"; + sha256 = "0i3z7hmlq7d3kcbx81rkm828l8wv7bv8q9la7cx0l7df9anri7za"; + libraryHaskellDepends = [ base text ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "A lawless typeclass for converting values to human-friendly text"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hums" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , ConfigFile, containers, directory, filepath, HaXml, http-types @@ -99308,7 +105907,7 @@ self: { mkDerivation { pname = "hums"; version = "0.7.0"; - sha256 = "19f64c73fd7f88561ba932e28f22ea94a70ac83eecce07ee65c6663a905d69f1"; + sha256 = "1wb9bn83lrn6cpp0gkpc7v40m9wlx8i8zqijm4dmd23zzmrlrxhr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99329,7 +105928,7 @@ self: { mkDerivation { pname = "hunch"; version = "0.2.0"; - sha256 = "52e214b7b9af8fed9735ab65d1c241f2f11204909b4b29345054557dfd236331"; + sha256 = "0cb34gypsmala0s2jjwvj0215wgj871d2rdb6nbyv3xgp6vi9qjj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99351,20 +105950,20 @@ self: { mkDerivation { pname = "hunit-dejafu"; version = "0.3.0.3"; - sha256 = "c9adfd6bd611e296c4e78b67d23d73cdec71cadd0f876be9a508ce5dc414b120"; + sha256 = "085i2k25vkh8lplnp1qgvp573v6dfcyx4rwbwz29dqhisrmzvbf9"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_0_4_0_0" = callPackage - ({ mkDerivation, base, dejafu, exceptions, HUnit, random }: + "hunit-dejafu_0_6_0_0" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.4.0.0"; - sha256 = "70c53e26261d0075807635c135ead2a8b96a5fec004e9f50ee9043ead136e216"; - libraryHaskellDepends = [ base dejafu exceptions HUnit random ]; + version = "0.6.0.0"; + sha256 = "0nw906gq8jzn6kr7iq40qna3r3q1s0dvfyxz84xfp5452g56a1ah"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -99376,7 +105975,7 @@ self: { mkDerivation { pname = "hunit-gui"; version = "0.1.4"; - sha256 = "c0f0c4da19cfc04bf2bf3f50ccd21fbba1ca588f0851eb989020e3dbe513fe73"; + sha256 = "0wzy2gjxpqr0j2cfnl88ixccm8dv3z9cql1zpzr4ph6g37dc9w60"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ]; @@ -99392,7 +105991,7 @@ self: { mkDerivation { pname = "hunit-parsec"; version = "0.3"; - sha256 = "80e46f5d7a31de3445052dccd68b52985d2e1bb8289b93afd7c631e983453421"; + sha256 = "089l8n1yjcf6sypr76r8p0djwpcqaa5xdk1d0m2k9piig9fnzr40"; libraryHaskellDepends = [ base HUnit parsec ]; description = "An HUnit Testable instance for Parsec parser unit tests"; license = stdenv.lib.licenses.bsd3; @@ -99403,7 +106002,7 @@ self: { mkDerivation { pname = "hunit-rematch"; version = "0.1.0.1"; - sha256 = "fa1512a6caa2f7fb70bf48a57835808517a2ac9082f2d6815b56398ba87145f6"; + sha256 = "1xj5f6l8nfanbf0xdwl2j2na45w5h0spi9a8pxqgpxx2rak145gs"; libraryHaskellDepends = [ base HUnit rematch ]; testHaskellDepends = [ base hspec HUnit rematch ]; homepage = "github.com/tcrayford/rematch"; @@ -99419,7 +106018,7 @@ self: { mkDerivation { pname = "hunp"; version = "0.1"; - sha256 = "91e9f6936380fbfc2b1099ae790a6570905f8c61af88e9891a0f5a9af16a074c"; + sha256 = "0k07dbqrlnhg3a4yk25gc665z43hcl57kblr20mzryw0cf9zdsci"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99444,7 +106043,7 @@ self: { mkDerivation { pname = "hunt-searchengine"; version = "0.3.0.1"; - sha256 = "8653aa01b4894f664c13a97148030a1f5d18bf7ead0357f01fb471894ac017f9"; + sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring containers data-default data-r-tree data-stringmap deepseq dlist filepath hslogger @@ -99473,7 +106072,7 @@ self: { mkDerivation { pname = "hunt-server"; version = "0.3.0.2"; - sha256 = "e66d294e034bb1f87224922751ad5ddef5cf231408be29175e3a00794fb26ba5"; + sha256 = "19bbn97pj01sbqbjkgh82hiwzxfybnnm29wj4irgicab0d72jvg6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99498,7 +106097,7 @@ self: { mkDerivation { pname = "hunt-server-cli"; version = "0.2.0.0"; - sha256 = "7f251f579616ce244e77259552b26a96c035fac1e25376764aacde280d78b4de"; + sha256 = "1pmlg06jipmc99v7clz2q7x3bh4ndar55595fx729khnjrbiy9bz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99522,9 +106121,9 @@ self: { mkDerivation { pname = "hup"; version = "0.2.0.0"; - sha256 = "add1d919aa2a1fd1ea914cd92c4ac3a5b24f9291a336393fd44f5b53052898ae"; + sha256 = "1blq502m6nsgshzkjdm3j694zcm5qd52rnacj7md27ram8cxkldd"; revision = "1"; - editedCabalFile = "a9563b96beaf19663d3878e50ae4f2b3ad37b3ebf154f32366da2e4f34f8d091"; + editedCabalFile = "14fhz0s4ybnscqiz6m7ixfrkgbdkybj0mrbq70ync6dgpsb3nmm9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99549,7 +106148,7 @@ self: { mkDerivation { pname = "hurdle"; version = "0.4.0"; - sha256 = "8ee3bd3ba360ad3b85a9b5bca14c71bba0aae770a17288818f5e9cb9cf360f8e"; + sha256 = "13hg6v7vk72yiy0qhwm1f3ksm85vf56a3g5mm62kpbb0lcxvvqwf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99562,17 +106161,19 @@ self: { }) {}; "hurriyet" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, http-client - , http-client-tls, text + ({ mkDerivation, aeson, base, bytestring, containers, here, hspec + , http-client, http-client-tls, mtl, text }: mkDerivation { pname = "hurriyet"; - version = "0.1.0.0"; - sha256 = "ed580d1bbb870e3c1a95d777ff83cde2120b8d9dde57700352080ce35ea7131e"; + version = "0.2.0.0"; + sha256 = "1czdal0dxic0gw5qjp29jcbq8z0syffgrfmdqcg579y37ah1hgqg"; libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls text + aeson base bytestring http-client http-client-tls mtl text + ]; + testHaskellDepends = [ + aeson base bytestring containers here hspec text ]; - testHaskellDepends = [ base hspec ]; homepage = "https://github.com/yigitozkavci/hurriyet-haskell"; description = "Haskell bindings for Hurriyet API"; license = stdenv.lib.licenses.bsd3; @@ -99587,7 +106188,7 @@ self: { mkDerivation { pname = "husk-scheme"; version = "3.19.3"; - sha256 = "04817e7375296f24e9c28a93ec43d3b18e1717d45aeaa653cd46dc3be08d642d"; + sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99610,7 +106211,7 @@ self: { mkDerivation { pname = "husk-scheme-libs"; version = "0.0.1"; - sha256 = "92bd9dbac5dc4264123e512650f43f56be6ec6ba993d35065cfdade304e788a1"; + sha256 = "18c8ww2f7bgxbh33agcrpb36xgjn7zs509ji7q968hnwqnx9vgcj"; libraryHaskellDepends = [ array base containers husk-scheme json mtl transformers ]; @@ -99626,7 +106227,7 @@ self: { mkDerivation { pname = "husky"; version = "0.4"; - sha256 = "6fb5394d663c1944b9b86318d7d7117b92fd0f109efa571bd6dc9235e5d4da8c"; + sha256 = "136sskjkb4nwsqdmgyly207zv4kv27bxf633p2wl869wcr6kkdbg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99646,7 +106247,7 @@ self: { mkDerivation { pname = "hutton"; version = "1.0.0"; - sha256 = "11ead4c07258ba73d8129cb1a7ac4f9a9ab042ebd15b5e40372459d09ea23b8b"; + sha256 = "12rvlagd0n946x05wnyixd1b16ls9ynagccw2bc77fjqfb0d9shi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99664,7 +106265,7 @@ self: { mkDerivation { pname = "huttons-razor"; version = "0.1.1.0"; - sha256 = "5a9cf6f8ac793e507ae0d591aa0e1b4b7987eec1441d7d6c7f6454279e8797f3"; + sha256 = "1wwphyg2fm34gxn7s7a4q7p8fyab3c7am4fmw1x50gkrmkwgd72s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec parsec-numbers ]; @@ -99679,7 +106280,7 @@ self: { mkDerivation { pname = "huzzy"; version = "0.1.5.5"; - sha256 = "b751430f716caa7ff53ba78a484329224c1333e8f850d3cf84a77d6d011a1045"; + sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp"; libraryHaskellDepends = [ base easyplot ]; description = "Fuzzy logic library with support for T1, IT2, GT2"; license = stdenv.lib.licenses.mit; @@ -99691,7 +106292,7 @@ self: { mkDerivation { pname = "hvect"; version = "0.4.0.0"; - sha256 = "cb50ef1a7f189f8c217a7d0d55b5568b2fa9bbe415b14ce114a93d2e1d5e30b6"; + sha256 = "1dihbqfjwgd92khlrc8mwjxsjbwbassma3bxg8hqr7qqgwdfyl6b"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/agrafix/hvect"; @@ -99706,7 +106307,7 @@ self: { mkDerivation { pname = "hw-balancedparens"; version = "0.1.0.0"; - sha256 = "c56ec15ed8f59afa54289362cf936564535843ea8f7ef9758093fd0a438169fe"; + sha256 = "1zk9h51hmzckh1szjzlgx91mhlv4cn9wyqlk51agm6pmv1gc2vn5"; libraryHaskellDepends = [ base hw-bits hw-excess hw-prim hw-rankselect-base vector ]; @@ -99729,7 +106330,7 @@ self: { mkDerivation { pname = "hw-bits"; version = "0.5.0.0"; - sha256 = "414f2603df8291564eb86edf445cb6a0945143e9ea49faedfc5aa99e950a235f"; + sha256 = "0pr31aarxaaszknzljgax51m3550nrf49pvfp175d4c2vw1jcks1"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse safe vector ]; @@ -99750,7 +106351,7 @@ self: { mkDerivation { pname = "hw-conduit"; version = "0.1.0.0"; - sha256 = "28bc7f865c5366b442743143fa5d5af9cd970bbd2acc549d27993ea49901491b"; + sha256 = "06s906cs8glr4yfm9k1apl5rgkgrb9fzlhrifi1b8rjkbj37zg18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99767,12 +106368,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-conduit_0_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec + , mmap, vector, word8 + }: + mkDerivation { + pname = "hw-conduit"; + version = "0.2.0.0"; + sha256 = "17b31pdxisv6ksvha6c5ydv549rjg9xy5q0zch8s5rg3a5f8az3j"; + libraryHaskellDepends = [ array base bytestring conduit word8 ]; + testHaskellDepends = [ base bytestring conduit hspec ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mmap vector + ]; + homepage = "http://github.com/haskell-works/hw-conduit#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-diagnostics" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "hw-diagnostics"; version = "0.0.0.5"; - sha256 = "5ceaec01c446c5a507e889f514201e4739ea6f1cc22a4c68894bb023257bd931"; + sha256 = "0cfrgcjj7c2bi5l4qan23ipylfa73qh19xc9x03sbia6qh0yrsjw"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; description = "Diagnostics library"; @@ -99786,7 +106406,7 @@ self: { mkDerivation { pname = "hw-eliasfano"; version = "0.1.0.1"; - sha256 = "14710bcbfe4e44bfe683fa0db73d9546268c24101770968c13083defca2048e6"; + sha256 = "1rj8435fyg882f69cw0p20j8q9j6jlyvf3gshgkbyi2fzv5hnw8l"; libraryHaskellDepends = [ base hw-bits hw-int hw-packed-vector hw-prim safe vector ]; @@ -99806,7 +106426,7 @@ self: { mkDerivation { pname = "hw-excess"; version = "0.1.0.0"; - sha256 = "4df4b44ec9c0ac60f11f1e9baf1aed39691dc214855980ab5d778a0a6f1742bb"; + sha256 = "1fs22xphm2kpbnmq0nc52k11ss9rxldaz6qy3zqn1b60r57b9x2d"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -99824,7 +106444,7 @@ self: { mkDerivation { pname = "hw-int"; version = "0.0.0.1"; - sha256 = "2f0759f63a77640a61300a2bb292518adca8782e7d099db4804bffac2d2da7cb"; + sha256 = "1jx75lnsrzsbh2s9s2bx5rwaip4aa69b4aqa61hhlr3p7bv5j1rg"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/haskell-works/hw-int#readme"; description = "Integers"; @@ -99842,7 +106462,7 @@ self: { mkDerivation { pname = "hw-json"; version = "0.4.0.0"; - sha256 = "addf66d70ee97249797e4967161f52cad0fe4c2cd1c426f51d349b0cbf31cc85"; + sha256 = "11fc66zhr6rl3psjdi6i5i6gxl6aa8gicrs9grwljwp91vbndpxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99885,7 +106505,7 @@ self: { mkDerivation { pname = "hw-json-lens"; version = "0.0.0.1"; - sha256 = "5f14595e525ddc73f564acc702d5828c639b0d23f06a421dde75ab7084100fe4"; + sha256 = "1r0g22271avmvqfl4sph4c6rnqwchbah5ixccksp7p2xa9g5j52z"; libraryHaskellDepends = [ ansi-wl-pprint array attoparsec base bytestring conduit containers dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-json @@ -99917,7 +106537,7 @@ self: { mkDerivation { pname = "hw-kafka-client"; version = "1.1.2"; - sha256 = "d96a9cfb09a10a1c4526a9a910f7212692c36c138bf5594468a5699f6f0ebb78"; + sha256 = "0y5v1rprysd5d125kxcb2dnc74i647vi1ad94r2iq2m117xrqsnr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99946,7 +106566,7 @@ self: { mkDerivation { pname = "hw-kafka-conduit"; version = "1.1.2"; - sha256 = "aa01650709e83e2a6014e47081248d6169fcab10e1b49a8c2b89928605693bcf"; + sha256 = "1krvd42qd4l95f69md7122mzqsb1ilj82w742ih2lgp8143na0da"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99971,7 +106591,7 @@ self: { mkDerivation { pname = "hw-mquery"; version = "0.1.0.1"; - sha256 = "724aa5b0490b57a89fb71b7042a3770f7978a4c975aa3d1b671576b0e83e113d"; + sha256 = "0g8i7vlb0xhmcwdkvakmr6j7hy8gfyil4w0vnygshmqb96qaajkj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base dlist ]; @@ -99989,7 +106609,7 @@ self: { mkDerivation { pname = "hw-packed-vector"; version = "0.0.0.1"; - sha256 = "b6980a80cb23cd6e889a4bb6302f684a158c9d81d7b80873812ea6b3c6014931"; + sha256 = "0ca9073b79ifh5rhif6ph6fqq5aad0pk1djbka46xk93rf00m65n"; libraryHaskellDepends = [ base bytestring hw-bits hw-int hw-prim hw-string-parse safe vector ]; @@ -100009,7 +106629,7 @@ self: { mkDerivation { pname = "hw-parser"; version = "0.0.0.1"; - sha256 = "9b08d5bc3441cfcaa91ae613655c47dfb4e988210245df7cada3dbc2a5128025"; + sha256 = "09c02ajw5nx3mmydyi82464fkd6z8xf6a4z63alwmks16jyda24v"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim mono-traversable text ]; @@ -100022,8 +106642,8 @@ self: { ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { pname = "hw-prim"; - version = "0.4.0.2"; - sha256 = "1702b32260020864157ccf118151012ca6856bf4618238032cd2f6d9b70a672a"; + version = "0.4.0.3"; + sha256 = "0025ilyzrhyjgc69jrkscy218gdscfq4mfh27a3f1niq67cpc2al"; libraryHaskellDepends = [ base bytestring vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; homepage = "http://github.com/haskell-works/hw-prim#readme"; @@ -100038,7 +106658,7 @@ self: { mkDerivation { pname = "hw-rankselect"; version = "0.8.0.0"; - sha256 = "db85437b77a44d887522b0019af08c8132c6132b5eaa9a2ebb0e4310b6ebaab5"; + sha256 = "1ddaxfv10hqfpcp9majy5c9wccl1ikq9l0dh49sqhkd4fxxl71fv"; libraryHaskellDepends = [ base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector ]; @@ -100058,7 +106678,7 @@ self: { mkDerivation { pname = "hw-rankselect-base"; version = "0.2.0.0"; - sha256 = "c853c19e0f3a7a388a0f315db36843d9e05bb986f6183641b7a04fe16f28afa4"; + sha256 = "195g51py2kx0nx0kc67nhswmpq6r8dlb6p9i1y53hyis1ygc2ly8"; libraryHaskellDepends = [ base hw-bits hw-int hw-prim hw-string-parse safe vector ]; @@ -100079,7 +106699,7 @@ self: { mkDerivation { pname = "hw-string-parse"; version = "0.0.0.3"; - sha256 = "6f5898c63b0b1e0fe7f7d8825f00a728904eba18eefc1353fc72d88a3aabee0a"; + sha256 = "02pfmcx8mn3jzi9i7z7f32x4x418lw05z0nqyzkhy7hb7g39hn3g"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; homepage = "http://github.com/haskell-works/hw-string-parse#readme"; @@ -100095,7 +106715,7 @@ self: { mkDerivation { pname = "hw-succinct"; version = "0.1.0.1"; - sha256 = "002c578c1ff7a33cbef089b2a943218777c14125629f6bf63dea9e7c8e3749db"; + sha256 = "1ns96y77r7pa7pv6p7v24m0w2xw7451skcl9y2z3r8zp3y65fb00"; libraryHaskellDepends = [ attoparsec base bytestring conduit containers hw-balancedparens hw-bits hw-prim hw-rankselect hw-rankselect-base mmap @@ -100114,7 +106734,7 @@ self: { mkDerivation { pname = "hw-vector"; version = "0.0.0.1"; - sha256 = "0381d90756d46dc2aff60ce122a128234a7ab23d2285c37bf775b4a03d1ab074"; + sha256 = "0x5h38ys1d3myxxw71927nr7lji352hj5q8cyspw4vflaq3xk083"; libraryHaskellDepends = [ base bytestring hw-prim vector ]; testHaskellDepends = [ base hspec QuickCheck vector ]; homepage = "http://github.com/haskell-works/hw-vector#readme"; @@ -100133,7 +106753,7 @@ self: { mkDerivation { pname = "hw-xml"; version = "0.0.0.1"; - sha256 = "79ff61e2ea455ca08924e223a9285b016af8e16b216dd25f039709eac4846a15"; + sha256 = "05bahk2fl2cp0dgx4v91dghzhsh1bclaj8z24j4s0p25xbi63zvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100170,7 +106790,7 @@ self: { mkDerivation { pname = "hwall-auth-iitk"; version = "0.1.0.1"; - sha256 = "823a2278ff213e3581854a09a81a5ff72d2ddb7668c1af116bc3969c9e6f7d45"; + sha256 = "0ibxdyg9r5n3dc8szhb8fvdjsbgpbwdah2aahn0kagi1zxw24fl2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100189,7 +106809,7 @@ self: { mkDerivation { pname = "hweblib"; version = "0.6.3"; - sha256 = "1e8ee12baac496d56831935a60e78f54eb43d2b7268bf7d31acb6b9a63e9b50d"; + sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy"; libraryHaskellDepends = [ attoparsec base bytestring containers mtl text transformers ]; @@ -100212,9 +106832,9 @@ self: { mkDerivation { pname = "hworker"; version = "0.1.0.1"; - sha256 = "34cbcc4db8f190ab0dc02a072adcf1fc75b7beab7e545982872bf265a1223f1d"; + sha256 = "079z4ahnbwibhy15jm3ymfzbfxgwy7f2l1raq06sp47ip16wrjrl"; revision = "1"; - editedCabalFile = "c5f32a8283ca858e67b2a49a51c41b36aa661228eca1bc6fc4c22293ddbe4b70"; + editedCabalFile = "0w2bpvfr68n2qipvr8gc5096dain3g2536m4n9kqx1fahf12mwy5"; libraryHaskellDepends = [ aeson attoparsec base bytestring hedis text time uuid ]; @@ -100235,9 +106855,9 @@ self: { mkDerivation { pname = "hworker-ses"; version = "0.1.1.0"; - sha256 = "dd5330691585b39ff0ddba8eb7edd2129a5610bae8a0493c2855f2786a3581c7"; + sha256 = "1iw16mm7iwjm50y4k878p885d6hjsbnvg3msvpq9zcw52mlk0lyx"; revision = "1"; - editedCabalFile = "884c06fd223afeaf51e216d500ad6350c7c8a4fe11e826b6a6191e5c10927f6d"; + editedCabalFile = "0vbzj885q7hrlsv2ds0izsjciishcfnh1m8nw98szzis4byhck48"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-ses base hworker lens text time unordered-containers @@ -100255,7 +106875,7 @@ self: { mkDerivation { pname = "hws"; version = "1.1.0.1"; - sha256 = "f968d7937299fa022589a14c30cb6f4a34257bc72055d365a8ab32b7f8020e34"; + sha256 = "0d0f0bwbfcmbm1jx6m90qxxjad2adz5k0k51i4jh5ylrfa9xfs7r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100274,7 +106894,7 @@ self: { mkDerivation { pname = "hwsl2"; version = "0.4.0.0"; - sha256 = "2000137fd0c5374e582d963f2c352390fb55be91f91a1d9f433a42c1050c0838"; + sha256 = "0f081h2w2his8fgis6prj6z5bywh4csjqgwn5mc4wdy5s1zi6010"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring quickcheck-properties tasty tasty-quickcheck @@ -100293,7 +106913,7 @@ self: { mkDerivation { pname = "hwsl2-bytevector"; version = "0.1.0.0"; - sha256 = "e98a476d3f7503044b62d4e38f31df6afd2fefcb00f1ecf35ced6d320b62da4d"; + sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9"; libraryHaskellDepends = [ base bytestring fingertree hwsl2 ]; homepage = "https://github.com/srijs/hwsl2-haskell-bytevector"; description = "A hashed byte-vector based on algebraic hashes and finger trees"; @@ -100306,7 +106926,7 @@ self: { mkDerivation { pname = "hwsl2-reducers"; version = "0.1.0.0"; - sha256 = "fdbcfc5e05628adae70497a5c65552efb077aace12385037e5ee85b0c582f7e0"; + sha256 = "1q7phb2v11gfwlvm0f0jrsm7gc7ga9awd9cp0kkxm2k20mggrg7x"; libraryHaskellDepends = [ base bytestring hwsl2 reducers semigroups ]; @@ -100321,7 +106941,7 @@ self: { mkDerivation { pname = "hx"; version = "0.4"; - sha256 = "2b0776d8982494344940f1633f1fafbb845574e4aac8996ea52fe967287e9313"; + sha256 = "04wkgql6gs9glmp9kj5awis5b15vmwgkyqzi814k9514k3c7c1rb"; libraryHaskellDepends = [ base ]; description = "Haskell extras (missing utility functions)"; license = stdenv.lib.licenses.mit; @@ -100334,7 +106954,7 @@ self: { mkDerivation { pname = "hxmppc"; version = "0.2.3"; - sha256 = "4972e692bad4327f63f607a87c4e877d4f34415433c370889bd697a4590f31bb"; + sha256 = "1fri1xcs95ynkf471hrkai0k8kvxhx77ra07yripycnlpa9fcwj9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100356,7 +106976,7 @@ self: { mkDerivation { pname = "hxournal"; version = "0.6.6.1"; - sha256 = "982ea5c9cf72fc6bd42486b31c64678e2e95c8e2d32a88e6d9c5314be66364ba"; + sha256 = "1fk4cgk4ncf5v7k8hankwb49ablfcxj1rcw64ka6pz3jrz4sablq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100381,7 +107001,7 @@ self: { mkDerivation { pname = "hxt"; version = "9.3.1.16"; - sha256 = "0d55e35cc718891d0987b7c8e6c43499efa727c68bc92e88e8b99461dff403e3"; + sha256 = "1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri @@ -100399,7 +107019,7 @@ self: { mkDerivation { pname = "hxt-binary"; version = "0.0.2"; - sha256 = "5cab3cf4694082e8120ec97db4b7cf1c07a5a37fb938fd0bd071a6c528f06bc1"; + sha256 = "1hbby0lcb9kis05zsf5rgyisa1qwryvv8zf91q9fi0j0d7s3rasw"; libraryHaskellDepends = [ base binary bytestring bzlib deepseq haskell98 hxt ]; @@ -100416,7 +107036,7 @@ self: { mkDerivation { pname = "hxt-cache"; version = "9.1.0.2"; - sha256 = "5899644e5fa375ec8417febd8dbdcbdda50822963f91a9fdedfc95e706a6e41f"; + sha256 = "07z4lq3fg5gwxpysk49zjqi0i9fxrfyqvggy2y2fqxd3bx7696aq"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath hxt SHA time unix-compat @@ -100431,7 +107051,7 @@ self: { mkDerivation { pname = "hxt-charproperties"; version = "9.2.0.1"; - sha256 = "e46614d6bf0390b2a6a1aeeb0771e6d366944da40fb21c12c2f8a94d1f47b4d6"; + sha256 = "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/UweSchmidt/hxt"; description = "Character properties and classes for XML and Unicode"; @@ -100443,7 +107063,7 @@ self: { mkDerivation { pname = "hxt-css"; version = "0.1.0.3"; - sha256 = "0244fc145d5923df0522ad80949e9b221b01a028c755ebfc4740339881ef65b7"; + sha256 = "1dv5xy0rhcs08zyfnmf752h026r2kfg9905d482xy8srblagqi02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hxt parsec split ]; @@ -100457,7 +107077,7 @@ self: { mkDerivation { pname = "hxt-curl"; version = "9.1.1.1"; - sha256 = "cdc1cc8bf9b8699cabdee965c9737d497c199b5cf82eabc66a5fe3f2ffb3c5ea"; + sha256 = "1sn5ngzz5qszdb3anbpqbjdijz29gmrwjrg9vsmrqsdqz65wrhfd"; libraryHaskellDepends = [ base bytestring curl hxt parsec ]; homepage = "https://github.com/UweSchmidt/hxt"; description = "LibCurl interface for HXT"; @@ -100469,7 +107089,7 @@ self: { mkDerivation { pname = "hxt-expat"; version = "9.1.1"; - sha256 = "10d9c43c20c82e879fbc06944fcfed373f8b43bd3e0a44f9c712db30a27022d6"; + sha256 = "1mi2f2i31nqjqzwl82iypm1qngrpxp7lz506pjgqfbn840yc9n8h"; libraryHaskellDepends = [ base bytestring hexpat hxt ]; homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Expat parser for HXT"; @@ -100482,7 +107102,7 @@ self: { mkDerivation { pname = "hxt-extras"; version = "0.4.1"; - sha256 = "617d8b0e220843609ab517ab1ebb58f140b95ca69f7930cf5df26da1329b68af"; + sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1"; libraryHaskellDepends = [ base hxt ]; homepage = "http://code.google.com/p/hxt-extras/"; description = "Extra functions for HXT"; @@ -100496,7 +107116,7 @@ self: { mkDerivation { pname = "hxt-filter"; version = "8.4.2"; - sha256 = "4065fba5fb10c829378780a1f58b46b032da438ccf0b56bc13aca5c20ebcb14b"; + sha256 = "0jxiph7c59dc2fy5c2ygii1xlcmh8s5zb8c0hwvjkj0hzfjznra0"; libraryHaskellDepends = [ base containers directory filepath haskell98 HTTP HUnit hxt network parsec process @@ -100514,7 +107134,7 @@ self: { mkDerivation { pname = "hxt-http"; version = "9.1.5.2"; - sha256 = "6fa19d03991d53c34f4525a4fdfaafde56dd48459093b4502832a1fdd9dfdd0b"; + sha256 = "02yxvzczv89j518b94wh8m4dsmnymzxgv9158m7w6lqxk41rv8bg"; libraryHaskellDepends = [ base bytestring HTTP hxt network network-uri parsec ]; @@ -100528,9 +107148,9 @@ self: { mkDerivation { pname = "hxt-pickle-utils"; version = "0.1.0.3"; - sha256 = "9ddba19f27d9d8c155012da4dd9598fb318cab862da10f14ee4bc3eb5321a9c5"; + sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx"; revision = "1"; - editedCabalFile = "6e5b20a313d64274a19307afe4319e236b8547ef8e611ea1da54c945e41db099"; + editedCabalFile = "16dh3pj4bjalvahiwqcfxx3qasr3kqqy9bq7jfhp8hnn2fij0nvf"; libraryHaskellDepends = [ base hxt mtl ]; homepage = "https://github.com/silkapp/hxt-pickle-utils"; description = "Utility functions for using HXT picklers"; @@ -100544,7 +107164,7 @@ self: { mkDerivation { pname = "hxt-regex-xmlschema"; version = "9.2.0.3"; - sha256 = "f4743ba65498d6001cdfcf5cbc3317d4bc43941be5c7030b60beb83408c892b0"; + sha256 = "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"; libraryHaskellDepends = [ base bytestring hxt-charproperties parsec text ]; @@ -100564,7 +107184,7 @@ self: { mkDerivation { pname = "hxt-relaxng"; version = "9.1.5.5"; - sha256 = "0efe2de0abc71f9cef655e52543528c4ab8ed1793be58afe6f1734d8cb3f441f"; + sha256 = "07s47z5xhd0pdzz8mr9vg78qxay450sm8ljycpprq7y7mgh2vzhf"; libraryHaskellDepends = [ base containers hxt hxt-charproperties hxt-regex-xmlschema network-uri parsec @@ -100581,7 +107201,7 @@ self: { mkDerivation { pname = "hxt-tagsoup"; version = "9.1.4"; - sha256 = "d77b290d63acf0ac8e5a07c5c69753f9984b97e0c9d2c0befadd7dd5b144b283"; + sha256 = "10xj8jqxazfxzazc1ln9w2blp67rafbwdi87ba7arw5ccc6jjyyp"; libraryHaskellDepends = [ base hxt hxt-charproperties hxt-unicode tagsoup ]; @@ -100595,7 +107215,7 @@ self: { mkDerivation { pname = "hxt-unicode"; version = "9.0.2.4"; - sha256 = "7b5823f3bd94b57022d9d84ab3555303653c5121eaaef2ee1fd4918f3c434466"; + sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v"; libraryHaskellDepends = [ base hxt-charproperties ]; homepage = "https://github.com/UweSchmidt/hxt"; description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"; @@ -100608,7 +107228,7 @@ self: { mkDerivation { pname = "hxt-xpath"; version = "9.1.2.2"; - sha256 = "50377cb5fc17a31091ef41d648cb26ce8d8bd52f9dc639e5b654b118804e9872"; + sha256 = "0wlq9s01icalnvjkkilx5zaqp3ff4v5limj1xy8i18qpzjspqdsh"; libraryHaskellDepends = [ base containers directory filepath hxt parsec ]; @@ -100624,7 +107244,7 @@ self: { mkDerivation { pname = "hxt-xslt"; version = "9.1.1.1"; - sha256 = "32f9501cb020941b4eac9c511965d1fc3d5a1cba8f01b6be90a5a9c5e53f1308"; + sha256 = "020k7zjwbad5j2zbc0cgp8f5lggws5jijlcwmi71p510n0f51y9j"; libraryHaskellDepends = [ base containers directory filepath hxt hxt-xpath parsec ]; @@ -100638,7 +107258,7 @@ self: { mkDerivation { pname = "hxthelper"; version = "0.2.2"; - sha256 = "619ae58bdb9bfed588dca6310671df4b41cc83ecd15b3d8bb7cded5d710d82c6"; + sha256 = "1il21mqmvvfdny5ksnyixj1wqhabvxqhccd6vj4dbzlvvf5yb6k1"; libraryHaskellDepends = [ base bytestring encoding hxt mtl ]; description = "Helper functions for HXT"; license = "LGPL"; @@ -100650,7 +107270,7 @@ self: { mkDerivation { pname = "hxweb"; version = "0.1"; - sha256 = "e88b115f42892ae77a264fc3fe693231c9d9537d1888a417f0c256e8a9f35139"; + sha256 = "0faiyflyhmn2y0bs920qgm9xkj9i69lzxhsg4rxffal989gi32z8"; libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ]; description = "Minimal webframework using fastcgi, libxml2 and libxslt"; license = stdenv.lib.licenses.bsd3; @@ -100662,7 +107282,7 @@ self: { mkDerivation { pname = "hyahtzee"; version = "0.2"; - sha256 = "bb326e105267a1a2f8f694fcae70ae4f7a99a7a9046883702a31eae41ef3697f"; + sha256 = "0zv9ycgf9sii59q86s04m6krjyjgmrqaxz4lyvwa58b7a886wcmv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers HUnit random ]; @@ -100679,7 +107299,7 @@ self: { mkDerivation { pname = "hyakko"; version = "0.6.7"; - sha256 = "93637316f8dab220e15d5b9f953d48aae32e2831abbe34964cb716e015e401cd"; + sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100698,7 +107318,7 @@ self: { mkDerivation { pname = "hybrid"; version = "2.0"; - sha256 = "3c2dda5af2d5ccd7daaf68af4bc8d22e53de2096bf665bfd8ce99d6f354b6617"; + sha256 = "05v69csnz7g9ikymnrmzjqhdwlrfsb44pbv8mzddgk6my9ddlb9w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100715,9 +107335,9 @@ self: { mkDerivation { pname = "hybrid-vectors"; version = "0.2.1"; - sha256 = "2edcd8fcfedc76a944ac690bfc257f2974100df6484c6c20883d27773836cca2"; + sha256 = "18nc6qw7f9rxi0h6qk28yq6i0x19gwjzq2v9mi2ajxnwzvydip1f"; revision = "1"; - editedCabalFile = "f07302db04c6d19bf5ab00c084e0ec4fb72955b7bd258e77b4881a21a263e3c4"; + editedCabalFile = "1i73cfi226l8nivqw9dxnxajkdsgxkh89h00mgsrplf60kdh4wzh"; libraryHaskellDepends = [ base deepseq primitive vector ]; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; @@ -100729,7 +107349,7 @@ self: { mkDerivation { pname = "hydra-hs"; version = "1.0.0.2"; - sha256 = "1af52ef504d1b1712d1e640bcdffe1464a5dbd19e0e976ce5a6f50fbacc25da3"; + sha256 = "18sxqangnl3gbb77dsg036ymsjj6w7zws2v43qnp3cfi0ksjxx8s"; libraryHaskellDepends = [ base hmatrix ]; librarySystemDepends = [ sixense_x64 ]; testHaskellDepends = [ base ]; @@ -100749,7 +107369,7 @@ self: { mkDerivation { pname = "hydra-print"; version = "0.1.0.3"; - sha256 = "3199332c8853117fe6f41a9874cd2388bd3d371bdb6dad3ef0ff9643d4b88f99"; + sha256 = "16cgp3a475pzy0zasvfv3cvkvgc84g6p960sykk7y4aki0n3769i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100779,7 +107399,7 @@ self: { mkDerivation { pname = "hydrogen"; version = "0.3.0.0"; - sha256 = "916c372aaab01b9389649e92f4a4adc61161ae27ff8b137635407bc6f7d6042b"; + sha256 = "0aq4svvwcys06mv172zz4yp624f6mnjg94lycj4r66xhm8m3fv4i"; libraryHaskellDepends = [ base bytestring containers mtl pretty text ]; @@ -100798,7 +107418,7 @@ self: { mkDerivation { pname = "hydrogen-cli"; version = "0.14"; - sha256 = "2b01d1b8e94bf1f518c7cb5a83734040eb5143cbd573ff6d59e17d62d2271f0e"; + sha256 = "03hz4z964zg1b5nzywymrd1m3ss081rq6nnbqwcgbwabx6wd209b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100818,7 +107438,7 @@ self: { mkDerivation { pname = "hydrogen-cli-args"; version = "0.17"; - sha256 = "84f6f223f1fb049ad35403ffb873bc2aa275bb8af01f9ba84ea06eef68c157f1"; + sha256 = "1wapq5lfyvm09sl9n7zhiaxpb8iapirvizq3ak9rl17vy4iz5xl4"; libraryHaskellDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; @@ -100833,7 +107453,7 @@ self: { mkDerivation { pname = "hydrogen-data"; version = "0.14"; - sha256 = "08410a47248787a5dee10ebea1415da2c7f0c2745f862b6af825c6acf4292435"; + sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88"; libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ]; homepage = "https://scravy.de/hydrogen-data/"; description = "Hydrogen Data"; @@ -100846,7 +107466,7 @@ self: { mkDerivation { pname = "hydrogen-multimap"; version = "0.3"; - sha256 = "23c58559d7b25b252abd6f09ba1f4e75c3f9d43a115ff7b408bf755f90426646"; + sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93"; libraryHaskellDepends = [ base containers ghc-prim ]; homepage = "https://scravy.de/hydrogen-multimap/"; description = "Hydrogen Multimap"; @@ -100859,7 +107479,7 @@ self: { mkDerivation { pname = "hydrogen-parsing"; version = "0.17"; - sha256 = "49c0035739668fa0bb6fd22e7d6d661f219155956b7662d7c9340ce073a43955"; + sha256 = "0m9rliry031lr7bn4xkbjmar288zcrnpsbnjdyxs13v675bh7h29"; libraryHaskellDepends = [ base containers hydrogen-prelude parsec ]; @@ -100878,7 +107498,7 @@ self: { mkDerivation { pname = "hydrogen-prelude"; version = "0.20"; - sha256 = "2799201f435bc6d9f7236cbf3e463bfb5ea0eb196178fbf12f683cad4bcae3a1"; + sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697"; libraryHaskellDepends = [ array base binary bytestring cereal containers directory filepath hashable hydrogen-multimap hydrogen-version network process random @@ -100895,7 +107515,7 @@ self: { mkDerivation { pname = "hydrogen-prelude-parsec"; version = "0.17"; - sha256 = "b08a86bfad3219398abe4065b7750c421bc6cfc532b3df97f1c6b03ec7ddbb41"; + sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh"; libraryHaskellDepends = [ base hydrogen-prelude parsec ]; homepage = "http://scravy.de/hydrogen-prelude-parsec/"; description = "Hydrogen Prelude /w Parsec"; @@ -100910,7 +107530,7 @@ self: { mkDerivation { pname = "hydrogen-syntax"; version = "0.17"; - sha256 = "bb2140dbb66482245a11e4b946649d3fcca50c3a5a96f627df4307e8048e469e"; + sha256 = "17j6iq2fh1s3vwkzd5js786abk1zkmj4dfg425d290k4nvdl08dv"; libraryHaskellDepends = [ base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid @@ -100927,7 +107547,7 @@ self: { mkDerivation { pname = "hydrogen-util"; version = "0.8"; - sha256 = "4885259b31365ae9210d9fb0c6d482c0625184652493aa45c6cd03a784b3e293"; + sha256 = "14z2nf2af0ydqr2sm4r4cn252qn0hbacdc4z1lhyjnin66djb1a8"; libraryHaskellDepends = [ base containers hydrogen-prelude parsec time ]; @@ -100942,7 +107562,7 @@ self: { mkDerivation { pname = "hydrogen-version"; version = "1.4"; - sha256 = "68b8ea8a188fd861ae7f0629bdda35723ca59563f67cfda279117c00374d6313"; + sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38"; libraryHaskellDepends = [ base ]; homepage = "https://scravy.de/hydrogen-version/"; description = "Hydrogen Version Type"; @@ -100957,7 +107577,7 @@ self: { mkDerivation { pname = "hyena"; version = "0.1.0.1"; - sha256 = "5102c802d080ba230f1ac9ba9ecc625640a67a3ee17002ef009c6dbf01a72921"; + sha256 = "0899lw0vyvcw03ph4w717rxach2ncb69xfn9387j7fl0s01ch0ji"; libraryHaskellDepends = [ base bytestring containers directory extensible-exceptions filepath mtl network network-bytestring unix @@ -100976,7 +107596,7 @@ self: { mkDerivation { pname = "hylide"; version = "0.1.5.1"; - sha256 = "160e2d915caa220b410f5e1ccbbaaa215c6cf1390a51ff2b1d27bccceb82df67"; + sha256 = "0ryzhbmwrg173lmzyl8a77qnqp11maxcn72y1x0hn8mabj8js3hn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hylogen vector-space ]; @@ -100994,7 +107614,7 @@ self: { mkDerivation { pname = "hylogen"; version = "0.1.5.1"; - sha256 = "3d07172627f22cfba684d15fcbf27079b5542a049734f67fbf1c7b5c8f5d4941"; + sha256 = "0ha9bn7mqyqwpxzzcd4p0hm59dbrf3rcnpyihjkgnb7j4wk1f1rx"; libraryHaskellDepends = [ base data-reify vector-space ]; homepage = "https://github.com/sleexyz/hylogen"; description = "GLSL embedded in Haskell"; @@ -101008,7 +107628,7 @@ self: { mkDerivation { pname = "hylolib"; version = "1.5.3"; - sha256 = "8b3c5ffe38b149ba990bf2afd508dfa372b44eb09930497cc8c45276f87df5ca"; + sha256 = "1jpmgpw7cln4r1y4jc4rn17b8wm3vw4dbbzj1fcvljdi73z5yg4b"; libraryHaskellDepends = [ array base containers mtl pretty random uniplate ]; @@ -101022,7 +107642,7 @@ self: { mkDerivation { pname = "hylotab"; version = "1.2.1"; - sha256 = "3c1c3b3276639a954892a93d5ce673cc0fc91f00f869fb527804addbc5e9d677"; + sha256 = "0xynx72xpb84g19gnsgq00gwj3ycfgk5qgd9j949b6k3fqr3n71w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hylolib mtl ]; @@ -101037,7 +107657,7 @@ self: { mkDerivation { pname = "hyloutils"; version = "1.0"; - sha256 = "d03ee75ef3def52a0ffa8872b7873bdaed55718ee25dc0f92aaa33098723c1de"; + sha256 = "1pn14f3hjcxa5bww0pg2irqmbvfs7f3vfwl8z87jmxfyydgffgnh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -101052,8 +107672,8 @@ self: { ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; - version = "0.1.0.0"; - sha256 = "04c76c0c88f658e9878f8090cc2e1351977128861ce4c03ce52d11c42e44b3da"; + version = "0.1.0.1"; + sha256 = "0jzfij3wqnyj7yf4ip8a8y0kz8zj9ci8gsjxf4m4hr5zsh90bas4"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; @@ -101065,8 +107685,8 @@ self: { }: mkDerivation { pname = "hyper-extra"; - version = "0.1.0.0"; - sha256 = "1c36de58e0f51cfc3f47c83185c9d08539491d208c3b956f7de1119cd94858c8"; + version = "0.1.0.1"; + sha256 = "1ffbp3qqplfys3yhy3mm8k76xnfzkmyk1zsgmcw4hn4phmqbkdvc"; libraryHaskellDepends = [ base diagrams-lib diagrams-svg hyper svg-builder text ]; @@ -101081,8 +107701,8 @@ self: { }: mkDerivation { pname = "hyper-haskell-server"; - version = "0.1.0.0"; - sha256 = "dcbd3d4e9b4026d6531fb54041e5ce595cec4094098a902d9e24c8f7b69516b8"; + version = "0.1.0.1"; + sha256 = "147jwzv9jym0bimlvaxgwyf0081vw0zb4sw7xs5c783ci5qdgc23"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -101100,7 +107720,7 @@ self: { mkDerivation { pname = "hyperdrive"; version = "0.1"; - sha256 = "e9336664adca49057b9b94d56dd2417692d30e9a99067e122b9aab80b3ee6f43"; + sha256 = "0hvgxsrq1aws5c97w1lrk87d74kn8796vmclkdxhajfammj6ccz9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101119,7 +107739,7 @@ self: { mkDerivation { pname = "hyperfunctions"; version = "0"; - sha256 = "757ebcac2afdab089b9c1bb5e7b6ea7642d450e430b6c97f3089d38fc5138560"; + sha256 = "0q452g2qzlw961zwkdihwi8d8hknxavfgd8vkjdhiazx5anbqzkm"; libraryHaskellDepends = [ adjunctions base distributive profunctors transformers ]; @@ -101130,20 +107750,21 @@ self: { }) {}; "hyperloglog" = callPackage - ({ mkDerivation, approximate, base, binary, bits, bytes, cereal - , cereal-vector, comonad, deepseq, directory, distributive, doctest - , filepath, generic-deriving, hashable, hashable-extras, lens + ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal + , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory + , distributive, doctest, filepath, generic-deriving, hashable, lens , reflection, safecopy, semigroupoids, semigroups, simple-reflect , siphash, tagged, vector }: mkDerivation { pname = "hyperloglog"; - version = "0.4.0.4"; - sha256 = "34d7a2db30d680bc38ab7fa3488e9182adacee65a751b75cc5e99eb9f39b9847"; + version = "0.4.1"; + sha256 = "08r0yrnfjcfv0p14p69dqjrsmff4alx5yykkq06mig0wycl4v4q0"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive hashable hashable-extras lens reflection - safecopy semigroupoids semigroups siphash tagged vector + deepseq distributive hashable lens reflection safecopy + semigroupoids semigroups siphash tagged vector ]; testHaskellDepends = [ base directory doctest filepath generic-deriving semigroups @@ -101162,7 +107783,7 @@ self: { mkDerivation { pname = "hyperloglogplus"; version = "0.1.0.0"; - sha256 = "339da5d125bc24561b37c950cb16375424bb7831d50cc6b34adeefb0361821ca"; + sha256 = "1ji130vb1vyy9arwc36m65wbn92l6wbcnl696wdmc95w4p8sb79k"; libraryHaskellDepends = [ base bits containers murmur-hash semigroups vector ]; @@ -101180,7 +107801,7 @@ self: { mkDerivation { pname = "hyperpublic"; version = "0.1.1"; - sha256 = "ed576a468e9e55ebb442db8b3b75fbb5583e57ce573256672efaaa067a425f1e"; + sha256 = "07jz89x0daps5rkmccjprrbkwn5mzdskp2yv8asfnmcyir36lmzd"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-enumerator http-types ]; @@ -101195,7 +107816,7 @@ self: { mkDerivation { pname = "hyphenate"; version = "0.1"; - sha256 = "a4cfd81d3dc1a2d5904d0b9baff712380cd49ef7279a8daa349643a0422bd75e"; + sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4"; libraryHaskellDepends = [ base containers ]; homepage = "http://www.alpheccar.org"; description = "Text hyphenation algorithm"; @@ -101209,7 +107830,7 @@ self: { mkDerivation { pname = "hyphenation"; version = "0.6"; - sha256 = "2f673666c18f63581422f7c6389b78b0ff754406671296a3d680d417942512f7"; + sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg"; libraryHaskellDepends = [ base bytestring containers unordered-containers zlib ]; @@ -101222,6 +107843,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hyphenation_0_7" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers + , doctest, unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.7"; + sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring containers unordered-containers zlib + ]; + testHaskellDepends = [ + base containers doctest unordered-containers + ]; + homepage = "http://github.com/ekmett/hyphenation"; + description = "Configurable Knuth-Liang hyphenation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -101233,7 +107875,7 @@ self: { mkDerivation { pname = "hypher"; version = "0.1.5"; - sha256 = "133a1cc83a68cf77bf3614b48ea69833c9d15a9eb3f3100b6a58116ad4bfb460"; + sha256 = "0q5lpza6l4aqd85i1wxkkrdd3j9kk2k8xd0l6szpgkv87b41qfhk"; libraryHaskellDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base monad-control mtl resourcet @@ -101258,7 +107900,7 @@ self: { mkDerivation { pname = "hzaif"; version = "0.1.0.0"; - sha256 = "1d600bf4940412059c0d3916573fd2042c3695d627993fb1277b38e241fa9a55"; + sha256 = "0mcsz90y4f3v4yqkz697ssakcb04s8zmf5ir1nf0a4h4jks0nq0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101271,6 +107913,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hzenhan" = callPackage + ({ mkDerivation, base, containers, QuickCheck, text }: + mkDerivation { + pname = "hzenhan"; + version = "0.0.1"; + sha256 = "1n7nrkngr395n6dhgdkqwbx2dmq6hmmfggyv62nr29kxf580hd8k"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base containers QuickCheck text ]; + homepage = "https://github.com/karky7/hzenhan#readme"; + description = "Zenhan library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hzk" = callPackage ({ mkDerivation, base, bytestring, resource-pool, tasty , tasty-hunit, time, zookeeper_mt @@ -101278,7 +107933,7 @@ self: { mkDerivation { pname = "hzk"; version = "2.1.0"; - sha256 = "4c4d3e60a2e763099dcf155ca2c32e884a4464785bd7fb839adcb8cf87829bc9"; + sha256 = "1jcvha3wzf6wka1zpmsvg1j48jl85v1s4p0mryfhjqz7l9h3wkac"; libraryHaskellDepends = [ base bytestring resource-pool time ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ @@ -101299,7 +107954,7 @@ self: { mkDerivation { pname = "hzulip"; version = "1.1.1.3"; - sha256 = "a49c129e665984ebfc013bffdf7f997b76e7362fb66d622e5f43a35ba1468661"; + sha256 = "0qc68shmp8s3bwp64vdn5wvffxkvk5zxzzrv07yfp12rcsg15754"; libraryHaskellDepends = [ aeson base bytestring conduit exceptions http-client http-client-tls http-types lens lens-aeson mtl stm stm-conduit text @@ -101323,9 +107978,9 @@ self: { mkDerivation { pname = "i18n"; version = "0.4.0.0"; - sha256 = "7e0df375883fb3428b0cd20aac1163ea38de80fd3499ec3007979b36fe2f93fa"; + sha256 = "1ylk5zz3d6wp0wqfr69lzn0dwf7acc8sq2nj1j5l5crzi1sz63by"; revision = "1"; - editedCabalFile = "af77b0f384e54fb72e7c4e757cff397ab4b6743c982c6f2349e2844aac8bb1eb"; + editedCabalFile = "1sxiifn4m17294inyb4q7isbdd3s77zpqxafghpbfkz5hkrv0xxg"; libraryHaskellDepends = [ base containers directory filepath mtl parsec text transformers ]; @@ -101346,7 +108001,7 @@ self: { mkDerivation { pname = "iCalendar"; version = "0.4.0.3"; - sha256 = "bc06a08165e2c135a2c98d0ca08cfd2b0862134337342b9f3da65f878c4e7a35"; + sha256 = "0dbs9s68fpx67ngjnd1p8c9n421bzn6a034dr6i3bhg2cn0s01mw"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers data-default mime mtl network network-uri old-locale parsec text @@ -101362,7 +108017,7 @@ self: { mkDerivation { pname = "iException"; version = "0.0.1"; - sha256 = "f7c8ed3664c44f8fce891addc48051d181c0a4d47f1796a4e724855af681303d"; + sha256 = "0g9hh7v5m194wyj9c5vzsjjc10fia60c9p8si778yky4chvfvj7p"; libraryHaskellDepends = [ base interleavableIO mtl ]; description = "Version of Control.Exception using InterleavableIO."; license = "unknown"; @@ -101376,7 +108031,7 @@ self: { mkDerivation { pname = "iap-verifier"; version = "0.1.0.1"; - sha256 = "0a6a27ead1a4f82e30c1dc9e2a9fedb6983272010833fc1ac508172ffa2cc555"; + sha256 = "0mf55kx2y5q8qldgqcq805r3565nxngjm7nwq4q2xy54s7m2fsha"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring conduit http-conduit monads-tf text transformers @@ -101392,7 +108047,7 @@ self: { mkDerivation { pname = "ib-api"; version = "0.1.0.1"; - sha256 = "336bb043a50a68001635ffb03d2c175e92b7a7d05393b098ffa8ae5dcfd25c7f"; + sha256 = "0zswsb7mvbm8zycb14sks2kvg4jy2wn3vc7z6lb00s0alm1v0srk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring network ]; @@ -101412,7 +108067,9 @@ self: { mkDerivation { pname = "iban"; version = "0.1.1.1"; - sha256 = "e9e2ef69259edb58988ab147fbd71d75f7c1a1015220e40cca4e1c68d5fc9c91"; + sha256 = "14cwzkanh72fr86f882j06hw3xvm3pbznixiiac5inwy4mlyzqp9"; + revision = "1"; + editedCabalFile = "1gsc8dbsc0pfcabj8j61151mcfbdfbpd6sz7dmfnm3yqxms3dsvg"; libraryHaskellDepends = [ base containers iso3166-country-codes text unordered-containers ]; @@ -101427,7 +108084,7 @@ self: { mkDerivation { pname = "ibus-hs"; version = "0.0.0.1"; - sha256 = "4166d8e641a88eb71b10d0d6717384518bf7c1f426af5c29788d6a0d3c812d7b"; + sha256 = "0yrdh4y0ssldg0lmrbr6yk0zg2sihirp3mnh20dvg3m887kdhrj1"; libraryHaskellDepends = [ base dbus directory unix xdg-basedir ]; homepage = "https://github.com/Ongy/ibus-hs"; description = "A simple uncomplete ibus api"; @@ -101441,7 +108098,7 @@ self: { mkDerivation { pname = "ical"; version = "0.0.1"; - sha256 = "f5e45df4249aa90a87080ef6714d77d8e961c5ba50e6813062379fcdaea7d882"; + sha256 = "10nqlypcv7rpc8q83rjhpb2n3sfqfx6p3xhf123hmacs4ks5vr7m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101459,7 +108116,7 @@ self: { mkDerivation { pname = "icon-fonts"; version = "0.2.1.0"; - sha256 = "74fb7d6c38d772b2288a43c3418e46ff35759394ea397072d374d25d77ee0f44"; + sha256 = "0i0gxrvmvlklsdr70fgajj9padgz8s743hs3i8lb4wnp71n7vyvl"; libraryHaskellDepends = [ base ]; description = "Package for handling icon fonts in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -101470,7 +108127,7 @@ self: { mkDerivation { pname = "iconv"; version = "0.4.1.3"; - sha256 = "36425168e3314bc83ba5ee95152872d52e94ee0f9503f3591f84d458e005b554"; + sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin"; libraryHaskellDepends = [ base bytestring ]; description = "String encoding conversion"; license = stdenv.lib.licenses.bsd3; @@ -101483,7 +108140,7 @@ self: { mkDerivation { pname = "iconv-typed"; version = "0.2.0.0"; - sha256 = "3d43bb14e87d77ffbe2bfe9d5d8de7df8c83561eb46ca834a2086a27b090a2a8"; + sha256 = "1a52j2q2fsh8l8sahv5l3rb8736zwy6mv7gy5fzgyxvxx0abnhrx"; libraryHaskellDepends = [ base bytestring iconv shelly template-haskell text ]; @@ -101507,9 +108164,9 @@ self: { mkDerivation { pname = "ide-backend"; version = "0.10.0.1"; - sha256 = "07186ec1d8135e94fac39c16fc10145c3a6cee957b96fa739f240afd0ae5faf0"; + sha256 = "1w7swl5gs2i4kxrzm5kvjpp6qfjw2h8gq5lwqgx98phkv30nw607"; revision = "1"; - editedCabalFile = "cf76e099362742622e03b1463e55eb77e4488755afbc768fe2aca9e8c163662d"; + editedCabalFile = "0bb6cg0yiadcwa7pdg5gan3lir3pxdakwimi0cp64hi76scy0xng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101549,9 +108206,9 @@ self: { mkDerivation { pname = "ide-backend-common"; version = "0.10.1.2"; - sha256 = "031028f38e1a6174a58665cecd882356c6ca7579c6c21a9e2461f13d81a5915b"; + sha256 = "0nwiln0kvwb14jg1mhn6g5swmijn4f4cvkk5hsjp8q8sivrjh403"; revision = "1"; - editedCabalFile = "c4caa9457f4890700a79c91a9c71d11785bc43bb4bb7564e01e6b787736b9dd9"; + editedCabalFile = "1ncxddrqgdz60575ddsbpd1vr18ps5qrq6n9g4571428gx2skjn4"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring binary bytestring bytestring-trie containers crypto-api data-accessor directory @@ -101569,7 +108226,7 @@ self: { mkDerivation { pname = "ide-backend-rts"; version = "0.1.3.1"; - sha256 = "407e6c80dedc129f22e9564f447314f4053d1cc6ca244b7c9ff755e82f7d41fe"; + sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0"; libraryHaskellDepends = [ base ]; description = "RTS for the IDE backend"; license = stdenv.lib.licenses.mit; @@ -101585,7 +108242,7 @@ self: { mkDerivation { pname = "ide-backend-server"; version = "0.10.0.2"; - sha256 = "e5290e08247cc77b7736016342d743c01d850b01e38193bfa2b897d19accfe5f"; + sha256 = "0pzyrjdd35xqlazr70g3045qa7f08gbl4qq16rvppivw4h40wag5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -101606,7 +108263,7 @@ self: { mkDerivation { pname = "ideas"; version = "1.6"; - sha256 = "dea77dafcb95fb2cfab6218bb0b242829c6c90a540da33fd082967cda84a8476"; + sha256 = "0xl49alcsrr913yk7nj0ln86r7428arb12r1nvx2rywmrfppv9yy"; libraryHaskellDepends = [ base cgi containers Diff directory filepath parsec QuickCheck random time uniplate wl-pprint @@ -101623,7 +108280,7 @@ self: { mkDerivation { pname = "ideas-math"; version = "1.2"; - sha256 = "22e7c39305e12987142080a8c792f0a21c1978784afbec9aabb31df6a5cf77e8"; + sha256 = "1s3pryjzc7dkmfdfrysag1w1j752y29cga4040a8fag10n9w7rr2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -101640,7 +108297,7 @@ self: { mkDerivation { pname = "idempotent"; version = "0.1.2"; - sha256 = "402e120c269e1dccdbfef77f95672bf674a11462a4dfd497c514945a8b995ca2"; + sha256 = "18jwk65mm50lqnbx9px4c8aa2x7n5dkrazzpzvdwq7cy4q614bj0"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; homepage = "https://github.com/prophile/idempotent"; @@ -101651,14 +108308,18 @@ self: { "identicon" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels - , random, tf-random + , QuickCheck, random, tf-random }: mkDerivation { pname = "identicon"; - version = "0.2.0"; - sha256 = "c9d22c41893f50ac6c096c11ac037f91153cd3b324c76bcbdd3277b2761cb346"; + version = "0.2.2"; + sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; + revision = "1"; + editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr"; libraryHaskellDepends = [ base bytestring JuicyPixels ]; - testHaskellDepends = [ base bytestring hspec JuicyPixels ]; + testHaskellDepends = [ + base bytestring hspec JuicyPixels QuickCheck + ]; benchmarkHaskellDepends = [ base bytestring criterion JuicyPixels random tf-random ]; @@ -101675,8 +108336,8 @@ self: { }: mkDerivation { pname = "identifiers"; - version = "0.4.0.0"; - sha256 = "0e9504c56888e35664840027b8fa38f9cd16ef6b19adf0a1aee7a86208436552"; + version = "0.4.3.0"; + sha256 = "0i27cg4p4nzzwxc54041n2675iv42j4zby3nn4bi0vi1bbwkxl20"; libraryHaskellDepends = [ base binary cereal containers deepseq hashable ListLike text unordered-containers @@ -101700,7 +108361,7 @@ self: { mkDerivation { pname = "idiii"; version = "0.1.3.3"; - sha256 = "10f1b88fdc02f11e1d7d5d309d637ed3b032976ed4c0fc90985c6a53a42aa984"; + sha256 = "11595aj56sjwk28grh6ldsbk5c6kgrirsc2xglfixw82vj7viw8h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101722,7 +108383,7 @@ self: { mkDerivation { pname = "idna"; version = "0.3.0"; - sha256 = "97ffb01fea8e905e37e2cc900500f04845191090877469c96fbf12c5d3ad8213"; + sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp"; libraryHaskellDepends = [ base punycode stringprep text ]; description = "Implements IDNA (RFC 3490)"; license = stdenv.lib.licenses.bsd3; @@ -101733,7 +108394,7 @@ self: { mkDerivation { pname = "idna2008"; version = "0.0.1.0"; - sha256 = "9f7e4a3605827fcb8cf28552ccb85fa8e8ea3b2dae04d66b31657a18f215a6dd"; + sha256 = "1pd62pr1hyk565mxc15f5lxyms58bywcqll5ya6cnzw20lv4lzlz"; libraryHaskellDepends = [ base punycode split ]; description = "Converts Unicode hostnames into ASCII"; license = stdenv.lib.licenses.bsd3; @@ -101747,7 +108408,7 @@ self: { mkDerivation { pname = "idringen"; version = "0.1.0.3"; - sha256 = "b478a71aabb0b82f39b61515cf4a0fbe9fbbd5f8beccba09ec0b8a192a96e32a"; + sha256 = "0ap3jqm1k2hbxh4vmk5yz3avp7xy1x5cy58mnqwjzf5hmcdafy5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101764,31 +108425,31 @@ self: { "idris" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary - , blaze-html, blaze-markup, bytestring, cheapskate, containers - , deepseq, directory, filepath, fingertree, fsnotify, gmp - , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty - , tasty-golden, tasty-rerun, terminal-size, text, time - , transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , blaze-html, blaze-markup, bytestring, cheapskate, code-page + , containers, deepseq, directory, filepath, fingertree, fsnotify + , gmp, haskeline, ieee754, libffi, mtl, network + , optparse-applicative, parsers, pretty, process, regex-tdfa, safe + , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size + , text, time, transformers, transformers-compat, trifecta, uniplate + , unix, unordered-containers, utf8-string, vector , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "0.99"; - sha256 = "f124c22a56d3547f878fdcfcddb36884bf69279411a724bb18b7829e8bdfa4e9"; + version = "1.0"; + sha256 = "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async base base64-bytestring binary blaze-html blaze-markup bytestring - cheapskate containers deepseq directory filepath fingertree - fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process regex-tdfa safe split terminal-size text - time transformers transformers-compat trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances - zip-archive + cheapskate code-page containers deepseq directory filepath + fingertree fsnotify haskeline ieee754 libffi mtl network + optparse-applicative parsers pretty process regex-tdfa safe split + terminal-size text time transformers transformers-compat trifecta + uniplate unix unordered-containers utf8-string vector + vector-binary-instances zip-archive ]; librarySystemDepends = [ gmp ]; executableHaskellDepends = [ @@ -101809,7 +108470,7 @@ self: { mkDerivation { pname = "ieee"; version = "0.7"; - sha256 = "758ede0080500e365eb211e5213307321a24f3f31486b74a866c120a82af7032"; + sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/patperry/hs-ieee"; description = "Utilities for dealing with IEEE floating point numbers"; @@ -101821,7 +108482,7 @@ self: { mkDerivation { pname = "ieee-utils"; version = "0.4.0"; - sha256 = "f3391c158a7f8cc772e9abd5beaf6bbf20589cc812573ae72cc6fd2d7ba88814"; + sha256 = "0548m1xjvzf65kkklmqjr2f5h85zdfpvxmdbx5rcg33zi8aiqfgk"; libraryHaskellDepends = [ base ]; description = "ieee-utils"; license = stdenv.lib.licenses.bsd3; @@ -101833,7 +108494,7 @@ self: { mkDerivation { pname = "ieee-utils-tempfix"; version = "0.4.0.1"; - sha256 = "831543e027e9a3aefc7f3df9eff52914f847cc301b9eb80e749ee0e1ec9e1574"; + sha256 = "0x0mkvnf3q4yfh7bi7hv6364gy0l57syzy9xgzyax8z94zh465c3"; libraryHaskellDepends = [ base ]; description = "ieee-utils"; license = stdenv.lib.licenses.bsd3; @@ -101844,7 +108505,7 @@ self: { mkDerivation { pname = "ieee754"; version = "0.8.0"; - sha256 = "0e2dff9c37f59acf5c64f978ec320005e9830f276f9f314e4bfed3f482289ad1"; + sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; @@ -101856,7 +108517,7 @@ self: { mkDerivation { pname = "ieee754-parser"; version = "0.1"; - sha256 = "3b064492031e7cf7647dde86e92a4b6b526a08e68d40c09ccb96d5989afcfe1a"; + sha256 = "06pyzjd9imcnrffc0h4dwq46llkb9cmfk1nygmjgfz0y0f9481iv"; libraryHaskellDepends = [ base binary bytestring ]; license = "GPL"; }) {}; @@ -101866,7 +108527,7 @@ self: { mkDerivation { pname = "if"; version = "0.1.0.0"; - sha256 = "28f673e867dbe0f51324d97fcb7884673a34912593746520a470116b167a141d"; + sha256 = "078lg8b6n4bhlhh6ax4k4n8k8fk7hiwcnzyr4h9zbq6vczl77xi8"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/winterland1989/if"; description = "(?) and (?>) conditional operator"; @@ -101880,7 +108541,7 @@ self: { mkDerivation { pname = "ifcxt"; version = "0.1.1"; - sha256 = "cc01adb330a6bbe0574d1e437ac98d79c274b44225a89599e43c3aad66555d55"; + sha256 = "0maxamkasfiwwjcrba158as79hkrip4plhqy9mby1fx662rss0fc"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "http://github.com/mikeizbicki/ifcxt"; @@ -101893,8 +108554,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "iff"; - version = "0.0.5"; - sha256 = "26ec287bfa3039429d21af00f98b9a7723922dab71d721c54fc7cd9f464bc1e3"; + version = "0.0.6"; + sha256 = "0dr8w7lqb1yv4zg8mkqjws215pm5h9zd3n2g6wnpwc41hj04b23b"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://code.haskell.org/~thielema/iff/"; description = "Constructing and dissecting IFF files"; @@ -101909,7 +108570,7 @@ self: { mkDerivation { pname = "ifscs"; version = "0.2.0.0"; - sha256 = "3854b5c8ddf09967ffd45f5d88feb6760fed24e95671f050e3ccd13a8d91e598"; + sha256 = "1675j66kmlfcwd8g0wanx4jfs3vnnvz8hpazskzng6ghvp4bam1q"; libraryHaskellDepends = [ base containers failure ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -101928,7 +108589,7 @@ self: { mkDerivation { pname = "ig"; version = "0.8"; - sha256 = "9b369d234f787c06847a55cc4150aa3dafa30b3f0ba2be6539196c1c02ac0fcf"; + sha256 = "1kqgmh11qv0r75jvx8hb7w5s7brxm9843k2mga20cz3q9wirsdlv"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit conduit-extra crypto-api cryptohash cryptohash-cryptoapi data-default @@ -101948,7 +108609,7 @@ self: { mkDerivation { pname = "ige-mac-integration"; version = "0.1.0.1"; - sha256 = "c66239bcafaa90d8e8bc532340897fb43f15d3615cb55619a7fd9430766189a4"; + sha256 = "1949c5v3157xlwcmddawc79iagxlgy4l08skpkldi45amyy3jqn6"; libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; @@ -101967,7 +108628,7 @@ self: { mkDerivation { pname = "ignore"; version = "0.1.1.0"; - sha256 = "aaf481fdab8bdc5a506e4726eadf56697726f82086a3cd0439526b9442c73575"; + sha256 = "0x9mqx198ssj742cv8w643w2cxv9avgyl9j7dr85mp4bmgyq3x5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101987,7 +108648,7 @@ self: { mkDerivation { pname = "igraph"; version = "0.1.1"; - sha256 = "4d4303f6a3c4188352965ac3f7fcee6b01cd046a8ce0abe78897561e830f0b25"; + sha256 = "098b1y1iwmlpi3kspq4cd82cs0bbxvygghssjr986664lgv06hsd"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -102004,9 +108665,9 @@ self: { mkDerivation { pname = "igrf"; version = "0.2.0.0"; - sha256 = "a1dea6b576654e8fdbbe0ad9639e99a05f43ae4e0a434dddbc6cece0335c3712"; + sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1"; revision = "1"; - editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f"; + editedCabalFile = "0kqyrvv7wnr35nlyip14g1shjb8zfqg7x4vm0qqhc57vc6s6qqbx"; libraryHaskellDepends = [ ad base polynomial ]; homepage = "https://github.com/dmcclean/igrf"; description = "International Geomagnetic Reference Field"; @@ -102026,7 +108687,7 @@ self: { mkDerivation { pname = "ihaskell"; version = "0.8.4.0"; - sha256 = "f77909f31fc5c8b0792460c09248a3b4f2a54cbbce060d393bd542c4fae27f27"; + sha256 = "09vzwbxc8hnm7cwhs1nfpd6abwmlld495h304iwv1j653zrhjygp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102061,7 +108722,7 @@ self: { mkDerivation { pname = "ihaskell-aeson"; version = "0.3.0.0"; - sha256 = "a716703680e95ecd6c1e9bd93819c2aeeeec248397024b84f5ad22caf15c4b40"; + sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring here ihaskell text ]; @@ -102076,7 +108737,7 @@ self: { mkDerivation { pname = "ihaskell-basic"; version = "0.3.0.0"; - sha256 = "1c1ee80276e7950370b8b3fe61fc6764e60fb41d1adab5028e74e865a0e964ed"; + sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw"; libraryHaskellDepends = [ base ihaskell ]; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; @@ -102089,7 +108750,7 @@ self: { mkDerivation { pname = "ihaskell-blaze"; version = "0.3.0.0"; - sha256 = "eba41d50a7d9af9fd9e1a9e0d1346ec77dd564866c673dcad905ea69c38f83c6"; + sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b"; libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; @@ -102104,7 +108765,7 @@ self: { mkDerivation { pname = "ihaskell-charts"; version = "0.3.0.0"; - sha256 = "c3919848c37f067299e9e24daa725b81af140f4a69b5ff3ad1618f92baaf915a"; + sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3"; libraryHaskellDepends = [ base bytestring Chart Chart-cairo data-default-class directory ihaskell @@ -102122,7 +108783,7 @@ self: { mkDerivation { pname = "ihaskell-diagrams"; version = "0.3.1.0"; - sha256 = "1f137977fde3cc9f3efbd2b5c1a21e06cbfdee6eab1c096c8fc1429dbba907a3"; + sha256 = "18q7m6xrshn1ixn0j75bdvpgvjq63sic3dfjzcz9zk73zmvpj4qz"; libraryHaskellDepends = [ active base bytestring diagrams diagrams-cairo diagrams-lib directory ihaskell text @@ -102138,7 +108799,7 @@ self: { mkDerivation { pname = "ihaskell-display"; version = "0.1.0.0"; - sha256 = "800e5324e52abaa01e31f0123e4596e9df614684b01a5b91906d8c37d3866eb1"; + sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0"; libraryHaskellDepends = [ base classy-prelude ihaskell ]; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; @@ -102151,7 +108812,7 @@ self: { mkDerivation { pname = "ihaskell-hatex"; version = "0.2.1.0"; - sha256 = "11999ba26d5d09a1f51f88907ca52dcbff9b7714e3f8b66d2bb150cd975a1525"; + sha256 = "098mbabwsl5i5dnvdy732ivrpzyb5njpr4483zss22axdni9p68i"; libraryHaskellDepends = [ base HaTeX ihaskell text ]; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for hatex"; @@ -102167,7 +108828,7 @@ self: { mkDerivation { pname = "ihaskell-inline-r"; version = "0.1.1.0"; - sha256 = "e6584ad3c1140ebbcf26c37ae668b00c8b033574f380b11f486c69f1eb58665a"; + sha256 = "0nk6b3mz2sbc90gv307kfhsh72qcn1lfcyn34v7vn3hlq79lln76"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring filepath ihaskell ihaskell-blaze inline-r template-haskell temporary @@ -102184,7 +108845,7 @@ self: { mkDerivation { pname = "ihaskell-juicypixels"; version = "0.3.0.0"; - sha256 = "1e4ce2bcede2d2a3a808078f83aecc24dba6220913af34f4ff907c400aa5fa2a"; + sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y"; libraryHaskellDepends = [ base bytestring directory ihaskell JuicyPixels ]; @@ -102201,7 +108862,7 @@ self: { mkDerivation { pname = "ihaskell-magic"; version = "0.3.0.0"; - sha256 = "b45999a7fec36b642e05d739af16999b80677998d09d756bc6aa0d1314f35b16"; + sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl"; libraryHaskellDepends = [ base base64-bytestring bytestring ihaskell ipython-kernel magic text utf8-string @@ -102219,7 +108880,7 @@ self: { mkDerivation { pname = "ihaskell-parsec"; version = "0.3.0.0"; - sha256 = "c422accbff5cf785799c3596eb5712d4fd90eef13b071c2263488880ece62a58"; + sha256 = "0n1awvn81228cci1q1rvy7p91zfl29byp5imkiwqbxswzz5sq8n4"; libraryHaskellDepends = [ aeson base here ihaskell parsec random text unordered-containers ]; @@ -102234,7 +108895,7 @@ self: { mkDerivation { pname = "ihaskell-plot"; version = "0.3.0.0"; - sha256 = "0106697f8f81ea5fac13c1e8572aef3362cd00f6affbb8464c5b939d2c15179f"; + sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1"; libraryHaskellDepends = [ base bytestring ihaskell plot ]; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; @@ -102250,7 +108911,7 @@ self: { mkDerivation { pname = "ihaskell-rlangqq"; version = "0.3.0.0"; - sha256 = "52c59fed843f2451c4d888d9e1a5f00370799ba114dab799294d885007e55ef0"; + sha256 = "1w2ywl3m122d56cvgnhll6dpjw03y2jy3nc8v325291zhknrziaj"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat @@ -102268,7 +108929,7 @@ self: { mkDerivation { pname = "ihaskell-widgets"; version = "0.2.3.1"; - sha256 = "77ff4cce8bf62831ccb22984bc9539accfb72eafdf5f36fcdcdd7b85f6e5c32b"; + sha256 = "0ay3wpv8ayyxvky3cpyzmwpbgkxc76avr119nb632a7nig74rzvp"; libraryHaskellDepends = [ aeson base containers ihaskell ipython-kernel scientific singletons text unix unordered-containers vector vinyl @@ -102279,6 +108940,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihs" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "ihs"; + version = "0.1.0.0"; + sha256 = "178psggvaad58kxfjgg3i4a8xgggn3gjcsi8y2f302dfza8kvlwa"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base process ]; + homepage = "https://github.com/minad/ihs"; + description = "Interpolated Haskell"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "ihttp" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contstuff, enumerator, netlines, network @@ -102286,7 +108961,7 @@ self: { mkDerivation { pname = "ihttp"; version = "0.3.0"; - sha256 = "f5974c244f47ca05aaaf40f963539aa71106a494fb8ffcf0d8e90ddf98489be5"; + sha256 = "1rcv92cdy3g9v3qgr3zvjjj0c4d7k99n7ya0mym0bjj79wj4r5zm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102304,7 +108979,7 @@ self: { mkDerivation { pname = "ilist"; version = "0.2.0.0"; - sha256 = "ffbfab4804e01a4b36caa3f75d77535084d6165ed6c92c0df4329b9238e03cef"; + sha256 = "1vrww0w956rjyh6jrjfnbqbdd12hadvmvxx3r8v4n6p00i4apgzz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec transformers ]; benchmarkHaskellDepends = [ @@ -102315,6 +108990,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ilist_0_3_1_0" = callPackage + ({ mkDerivation, base, criterion, hspec, lens, loop, transformers + , vector + }: + mkDerivation { + pname = "ilist"; + version = "0.3.1.0"; + sha256 = "15zy584mjk85kr69acs1r7dfsr7g2mgy2bbfyrla5rbp23fy3678"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec transformers ]; + benchmarkHaskellDepends = [ + base criterion lens loop transformers vector + ]; + homepage = "http://github.com/aelve/ilist"; + description = "Optimised list functions for doing index-related things"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "illuminate" = callPackage ({ mkDerivation, alex, array, base, containers, filemanip, filepath , hscolour, html, utf8-string, xhtml @@ -102322,7 +109016,7 @@ self: { mkDerivation { pname = "illuminate"; version = "0.1"; - sha256 = "65c2cb06a676d17114fab562884bd91ed2d88fc1f2a9d8e8805eada6b480329a"; + sha256 = "16ijh2sadbayh3ldiagjq67xilhyv55qhqmmz8a73lbnlq3cphk5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102342,9 +109036,9 @@ self: { mkDerivation { pname = "image-type"; version = "0.1.0.0"; - sha256 = "7af29056bd7e8f841a4d963eca12dfe3e4c47951781d8f07f2c14af20a2b2577"; + sha256 = "0xr55c5g4jn1y83qy7bqa5ww9r73vw9clgln9ld893vypmb91wks"; revision = "1"; - editedCabalFile = "47033c893690f2cea85ba867343f277a8e2594f9010a5466a39dc7f3c4d682f2"; + editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/Icelandjack/Image-type"; description = "Determine the type of an image by reading the first bytes"; @@ -102356,7 +109050,7 @@ self: { mkDerivation { pname = "imagefilters"; version = "0.1"; - sha256 = "7e500386a3010b4114917223903f27c10e40ae1e314b52ae06df54cd51e7ead8"; + sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y"; libraryHaskellDepends = [ base gd ]; homepage = "https://github.com/tchannel/imagefilters"; description = "Image Filters (contrast, brightness, gaussian blur, etc)"; @@ -102371,7 +109065,7 @@ self: { mkDerivation { pname = "imagemagick"; version = "0.0.4.2"; - sha256 = "1956fd48139c43e73528c358021595c1b867abb6fba8bc0334770f74d4089178"; + sha256 = "0y4i13a783vp6h1vra7vnsmngf61jlah4n6350syfhww2d4gsmhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102397,7 +109091,7 @@ self: { mkDerivation { pname = "imagepaste"; version = "0.2.0.1"; - sha256 = "fbee1a3964b4f290e90c930a45643dcb1d376b06c06af1bf35150a457815a1cc"; + sha256 = "1k512mw4a2hm6nzz2sn00rmkf7fb7mj4a2lk1klr1wmlchwimvpv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102417,7 +109111,7 @@ self: { mkDerivation { pname = "imagesize-conduit"; version = "1.1"; - sha256 = "31c5784578b305921b89f7ab6fca35747e5a35f12884770b78c31e3a0a01ac19"; + sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions ]; @@ -102431,24 +109125,25 @@ self: { "imap" = callPackage ({ mkDerivation, attoparsec, base, bytestring, connection - , data-default, derive, either, exceptions, hslogger, HUnit, list-t - , monadIO, mtl, QuickCheck, random, rolling-queue, stm, stm-delay - , tasty, tasty-hunit, tasty-quickcheck, text, transformers, word8 + , containers, derive, either, exceptions, hslogger, HUnit, list-t + , monadIO, mtl, network, pipes, QuickCheck, random, rolling-queue + , stm, stm-delay, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, word8 }: mkDerivation { pname = "imap"; - version = "0.2.0.3"; - sha256 = "912e050ba15043cbc05782bd5a6069d249402f86a41d17e0761fd6153a5a5f88"; + version = "0.3.0.2"; + sha256 = "1mcfmzqiwiasbaakz8w1cq4zj04jh61sppn1c88cvvkmi28qpwqa"; libraryHaskellDepends = [ - attoparsec base bytestring connection data-default derive either - exceptions hslogger list-t monadIO random rolling-queue stm + attoparsec base bytestring connection containers derive either + exceptions hslogger list-t network pipes random rolling-queue stm stm-delay text transformers word8 ]; testHaskellDepends = [ - attoparsec base bytestring connection data-default derive either - exceptions hslogger HUnit list-t monadIO mtl QuickCheck random - rolling-queue stm stm-delay tasty tasty-hunit tasty-quickcheck text - transformers word8 + attoparsec base bytestring connection containers derive either + exceptions hslogger HUnit list-t monadIO mtl network pipes + QuickCheck random rolling-queue stm stm-delay tasty tasty-hunit + tasty-quickcheck text transformers word8 ]; description = "An efficient IMAP client library, with SSL and streaming"; license = stdenv.lib.licenses.bsd3; @@ -102462,7 +109157,7 @@ self: { mkDerivation { pname = "imapget"; version = "0.0.3"; - sha256 = "bb60d130f9a166f5735a40eba7d23ecdcec2e4fc677b78650eb5a3f3075cd340"; + sha256 = "0h6kbh3z78xm1rjphyv7zkjc5knd7v9agss0b9rzarm1z4qd2q5v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102481,7 +109176,7 @@ self: { mkDerivation { pname = "imbib"; version = "1.0.0"; - sha256 = "7f1f3326f2534ba3427d1dadea50b853170de055cfaa9547ee11ab6a9ae46174"; + sha256 = "0x31wjd6maqixr3rbangaph0s5skp18fmb8xgm1a6jsky8k367vz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102501,7 +109196,7 @@ self: { mkDerivation { pname = "imgurder"; version = "1.2"; - sha256 = "5d667e0960a3af9574f8a2c71fc79599e50779be1153a38614219023b01bca94"; + sha256 = "156a3fq274112j3a6lqiprwhgrcrjp3izix2z1s9bbx3c04pwrjx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102530,7 +109225,7 @@ self: { mkDerivation { pname = "imm"; version = "1.1.0.0"; - sha256 = "528437eaca7d756d2c0787504018f532a4ea531f97b5401e58161f9bd6c03f56"; + sha256 = "0mizq3b9n7qnb0g41dcp3x9ym91jylc40l470wn6sxbxrbm3g12j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102549,6 +109244,41 @@ self: { license = "unknown"; }) {}; + "imm_1_2_0_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base + , blaze-html, blaze-markup, bytestring, case-insensitive + , chunked-data, comonad, conduit, conduit-combinators, connection + , containers, directory, dyre, fast-logger, filepath, free + , hashable, HaskellNet, HaskellNet-SSL, http-client + , http-client-tls, http-types, mime-mail, mono-traversable + , monoid-subclasses, network, opml-conduit, optparse-applicative + , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text + , time, timerep, tls, transformers, uri-bytestring, xml + , xml-conduit, xml-types + }: + mkDerivation { + pname = "imm"; + version = "1.2.0.0"; + sha256 = "1bpcsahzvf4qa1pzga84wqflk259wcqd41r3rfxk2w3rzdlns999"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup + bytestring case-insensitive chunked-data comonad conduit + conduit-combinators connection containers directory dyre + fast-logger filepath free hashable HaskellNet HaskellNet-SSL + http-client http-client-tls http-types mime-mail mono-traversable + monoid-subclasses network opml-conduit optparse-applicative rainbow + rainbox rss-conduit safe-exceptions tagged text time timerep tls + transformers uri-bytestring xml xml-conduit xml-types + ]; + executableHaskellDepends = [ base free ]; + homepage = "https://github.com/k0ral/imm"; + description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "immortal" = callPackage ({ mkDerivation, base, lifted-base, monad-control, stm, tasty , tasty-hunit, transformers, transformers-base @@ -102556,7 +109286,7 @@ self: { mkDerivation { pname = "immortal"; version = "0.2.2"; - sha256 = "b3858f3830f5eacd7380184d57845ba6b1aee638193fbbf2b285cc31e2c3623a"; + sha256 = "0fk2qgi33k45nbrbngqr73kaxcd6bf25fk8qh1rwvspm60w8z1dk"; libraryHaskellDepends = [ base lifted-base monad-control stm transformers-base ]; @@ -102576,7 +109306,7 @@ self: { mkDerivation { pname = "imparse"; version = "0.0.0.3"; - sha256 = "cf259d1141910ced182db15bb647d43b1e1a19370d222b4bf82a8d5650fa7795"; + sha256 = "15bpz985d39az15jn8hd6wcil7ivsi3vcnxi5lcfs34i848rs9fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102602,9 +109332,9 @@ self: { mkDerivation { pname = "imperative-edsl"; version = "0.7"; - sha256 = "1a207736fb6b84e5316bbbe95593b464fe7f155db65e89fbac78b59d0e05f5f7"; + sha256 = "1xzm0l79vdbqmkxqjpmnblapzzk4nj9mbsdvdcqyb13bzcv7f80s"; revision = "2"; - editedCabalFile = "c0d206bbb494b14bb4f2bbcbab994dc65fde03edb3f898d3ede7492578774f97"; + editedCabalFile = "15sgfxw2ajg7xp9riy5kxl1xwpy69ncspjxvyas4pcclnjxhdln0"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -102628,7 +109358,7 @@ self: { mkDerivation { pname = "imperative-edsl-vhdl"; version = "0.3.2"; - sha256 = "2bc6771e4dad56aba06441139c4649232cd876ec56d87bc96e57430096843098"; + sha256 = "161hhjb00hspdv4ppn2nxivdhb139539q4s1cjhanmmd9lg7giib"; libraryHaskellDepends = [ base bytestring constraints containers language-vhdl mtl operational-alacarte pretty syntactic @@ -102649,7 +109379,7 @@ self: { mkDerivation { pname = "implicit"; version = "0.1.0"; - sha256 = "f3120deca5f140e91ebf1af9ff035ca0a469024bd4e8855132aa24781f65d09b"; + sha256 = "16yhclgph95a698qbs6l9c16k950bh1zzy8spwgfjh7ilpn0s4pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102677,9 +109407,9 @@ self: { mkDerivation { pname = "implicit-logging"; version = "0.2.0.0"; - sha256 = "81b1c538b50963067410e7cbb6d60f42c0e90f068518d20505cc942e633ec3e3"; + sha256 = "1qy37rijx56c0l2x46450q7ykh221zbbdjz721s0cqq9nlwcbcc1"; revision = "1"; - editedCabalFile = "da2dc77f11f48a07772f4528408f90fad91d0c413d4bf855f14670df5765a60b"; + editedCabalFile = "02x6cmbxyw26y5azhjrx8461vngsj27l0a255xvhg2pl25zwfbfs"; libraryHaskellDepends = [ base mtl time transformers ]; homepage = "https://github.com/revnull/implicit-logging"; description = "A logging framework built around implicit parameters"; @@ -102692,7 +109422,7 @@ self: { mkDerivation { pname = "implicit-params"; version = "0.2.1"; - sha256 = "11d98bcb69c30abe29d229f2807e16381de2302a7473c53d2823b8cead0b40b5"; + sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i"; libraryHaskellDepends = [ base data-default-class ]; homepage = "http://github.com/duairc/implicit-params"; description = "Named and unnamed implicit parameters with defaults"; @@ -102705,7 +109435,7 @@ self: { mkDerivation { pname = "imports"; version = "0.2.0.0"; - sha256 = "8a423866bce4862f65926a67519f23c3262ea2f85f01104a5a2e03ee63f2dc61"; + sha256 = "0qfwy9iyw0rfb95100azz2i2w9n34fgm2rvaj9jjz1p4pik3hhla"; libraryHaskellDepends = [ base directory filepath mtl ]; testHaskellDepends = [ base directory filepath mtl ]; homepage = "https://github.com/CindyLinz/Haskell-imports"; @@ -102719,7 +109449,7 @@ self: { mkDerivation { pname = "impossible"; version = "1.0.0"; - sha256 = "7f4f8d20bea5ee0c125218276d6e252d85c748808fc7f8ec5d6990aa84e277e2"; + sha256 = "1qkpwa2am439bpngiiwgh14cg19d4mp6s9qqa890rvm5pqh8skvz"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/wdanilo/impossible"; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; @@ -102727,12 +109457,56 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "imprevu" = callPackage + ({ mkDerivation, aeson, base, Boolean, Cabal, containers + , DebugTraceHelpers, ghc, Imprevu, lens, monad-loops, mtl, NoTrace + , old-locale, random, safe, semigroups, shortcut, stm, time + , time-recurrence, validation + }: + mkDerivation { + pname = "imprevu"; + version = "0.1.0"; + sha256 = "1a8asdjmrydf7i0n3qipwrl6hpsrpmpwz05877853ypg6ik8zm1q"; + libraryHaskellDepends = [ + aeson base Boolean containers DebugTraceHelpers ghc lens + monad-loops mtl NoTrace old-locale random safe semigroups shortcut + stm time time-recurrence validation + ]; + testHaskellDepends = [ base Cabal Imprevu ]; + homepage = "http://www.nomyx.net"; + description = "Reactive programming language based on a DSL"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {Imprevu = null;}; + + "imprevu-happstack" = callPackage + ({ mkDerivation, base, blaze-html, Cabal, containers + , DebugTraceHelpers, ghc, happstack-server, HTTP, imprevu, lens + , monad-extras, mtl, NoTrace, old-locale, reform, reform-blaze + , reform-happstack, safe, stm, text + }: + mkDerivation { + pname = "imprevu-happstack"; + version = "0.1.0"; + sha256 = "06zhckxn6s20jdifizhwac0z5l5knv15lx9wn7ailf7y558789ar"; + libraryHaskellDepends = [ + base blaze-html containers DebugTraceHelpers ghc happstack-server + HTTP imprevu lens monad-extras mtl NoTrace old-locale reform + reform-blaze reform-happstack safe stm text + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "Imprevu support for Happstack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "improve" = callPackage ({ mkDerivation, base, mtl, yices }: mkDerivation { pname = "improve"; version = "0.4.0"; - sha256 = "ea98772782c4faa11001ccf018d74203cb15fc86520d4ad6647118311f3d1c7d"; + sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a"; libraryHaskellDepends = [ base mtl yices ]; homepage = "http://github.com/tomahawkins/improve/wiki/ImProve"; description = "An imperative, verifiable programming language for high assurance applications"; @@ -102748,7 +109522,7 @@ self: { mkDerivation { pname = "impure-containers"; version = "0.4.0"; - sha256 = "6e311d28492f515a786a35652f6b52d822821e3c3f2a5513e23551eab04b933b"; + sha256 = "0fwk9fqfll9mw89maaiz7hg848nqa9mjyr9md9w5ll9g94l1scbf"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; @@ -102766,7 +109540,7 @@ self: { mkDerivation { pname = "inc-ref"; version = "0.3.0.0"; - sha256 = "b403f23ba47896e5a7aa04829f47e8d87959d2da0d2d4e8eac4109ccdb2a2243"; + sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/jfischoff/inc-ref"; description = "A STM reference useful for incremental computing"; @@ -102780,7 +109554,7 @@ self: { mkDerivation { pname = "inch"; version = "0.2.0"; - sha256 = "b1d9a71a676026e88d4d32e482ea2cd7633b568635ba3b6d072b16a0be2fc215"; + sha256 = "05f25yza05ib0xnkpfimhrb3nqyp5km85r1j9n6yh9k0cwdagndi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102801,7 +109575,7 @@ self: { mkDerivation { pname = "inchworm"; version = "1.0.2.1"; - sha256 = "ec3b3d9035dffb6fa9f062a54273b1eb68556b6d5ac23c3e262acad0b34ddda5"; + sha256 = "19fx9nrx1jia4qz3rhjsdmmmas7bn5rl59b2y2lnzyyz6n83sfzc"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/DDCSF/inchworm"; description = "Inchworm Lexer Framework"; @@ -102815,7 +109589,7 @@ self: { mkDerivation { pname = "include-file"; version = "0.1.0.3"; - sha256 = "208f1f3bdc717f5f953cb7c9935c84d6a6291b7cd5ed8a22fa8567184be33d29"; + sha256 = "0a9xwd5ihrw5z8i8mvfmghdjk9nnhif97jdp7jamyzvivhxiz3r0"; libraryHaskellDepends = [ base bytestring random template-haskell ]; @@ -102833,7 +109607,7 @@ self: { mkDerivation { pname = "incremental-computing"; version = "0.0.1.0"; - sha256 = "7c596494b118619707bedaea799fa23b70a456c4d94188eb83a7afff4b0348f9"; + sha256 = "1ya80d5zzbx7hgmqhhfrqiba8w1vlagpksnspq3rfq8qn6a68nbw"; libraryHaskellDepends = [ base containers dlist fingertree order-maintenance transformers ]; @@ -102855,7 +109629,7 @@ self: { mkDerivation { pname = "incremental-maps"; version = "0.0.0.0"; - sha256 = "452cb1c8b711514f97d9a6dcc8a44e044302b1ad5c2fdc2e637896f69724f59b"; + sha256 = "16zm4jbzd5kqccpdqbswmnqh4hq49sjcip56v6blyl8inz4b2b25"; libraryHaskellDepends = [ base containers dlist fingertree order-maintenance transformers ]; @@ -102877,8 +109651,8 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.2.5"; - sha256 = "7d0fd208e86d383ec00ceabc6c229d66ae35726862b003820df06e855ea87ac1"; + version = "0.2.5.1"; + sha256 = "1kdrpwnj3sbil0mhmqspi2jbh1pibrzaybyijcknvvvm5ldrgafz"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck @@ -102896,7 +109670,7 @@ self: { mkDerivation { pname = "incremental-sat-solver"; version = "0.1.8"; - sha256 = "1afd2bc324e3220ed7d2ef539793b608c2d83adb9602c81a97912b44f694e5a8"; + sha256 = "1a75jkv48awijwdch0lnvcxdihh8ns9rflzgsbbhw8p34k1jpz8s"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://github.com/sebfisch/incremental-sat-solver"; description = "Simple, Incremental SAT Solving as a Library"; @@ -102910,7 +109684,7 @@ self: { mkDerivation { pname = "increments"; version = "0.1.0.4"; - sha256 = "317592eb290638a51e70464d55d0befde7fe033022f319b52b41b8e443b34a37"; + sha256 = "0dsand1y9f215fsikwr2601zxrzxpv85aka6f0gaaf0657mr4x9i"; libraryHaskellDepends = [ base beamable bytestring containers ghc-prim ]; @@ -102930,7 +109704,7 @@ self: { mkDerivation { pname = "indentation"; version = "0.3.1"; - sha256 = "5b374defe3f6823dfcab8028ea152b2237246191659303e2d362daa4fc2faad1"; + sha256 = "1lda5zya9nk2sgi074v5j5hj8dr25cayla40mgy3v0pnwgplsdsv"; libraryHaskellDepends = [ base indentation-core indentation-parsec indentation-trifecta mtl parsec parsers trifecta @@ -102945,7 +109719,7 @@ self: { mkDerivation { pname = "indentation-core"; version = "0.0"; - sha256 = "4fd2f02756ce9abffd080c5d5e830616ddfb63109871ad5c5f6c24a636ca78d9"; + sha256 = "1nbqr8vac93cbxfaswcq21izpp8n0s1mwp8c13yvz6nfaqkz1ljg"; libraryHaskellDepends = [ base mtl ]; homepage = "https://bitbucket.org/adamsmd/indentation"; description = "Indentation sensitive parsing combinators core library"; @@ -102959,7 +109733,7 @@ self: { mkDerivation { pname = "indentation-parsec"; version = "0.0"; - sha256 = "5152bc8e47b2d5fffce4e0e9ac0d07fa38040aa36bf1a5788adedbb2369dcd7c"; + sha256 = "0z6dklvb5nyyi9wabwbblc508f7s0w6srsg0wkygzmdj8y7bqlji"; libraryHaskellDepends = [ base indentation-core mtl parsec ]; testHaskellDepends = [ base parsec tasty tasty-hunit ]; homepage = "https://bitbucket.org/adamsmd/indentation"; @@ -102974,7 +109748,7 @@ self: { mkDerivation { pname = "indentation-trifecta"; version = "0.0.1"; - sha256 = "c71e7f7416e2e0154cc8bfbef28a964771545700a4eb9af00a7e24b6dff8e6aa"; + sha256 = "1ap6z3gvc93y1bq9msx401bm8wa7js5g5gmzr161bq722rs7y7n7"; libraryHaskellDepends = [ base indentation-core mtl parsers trifecta ]; @@ -102989,7 +109763,7 @@ self: { mkDerivation { pname = "indentparser"; version = "0.1"; - sha256 = "5c1dd6eeeb8fb5e136528df6ffb7c0041e708b63f0bcd4e55fa297d960fd2b90"; + sha256 = "141bzmhdk5x2bzjx9g7hcf5p07h4q2vzzxlda8vf3dcgxgpdc7aw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec ]; @@ -103003,7 +109777,7 @@ self: { mkDerivation { pname = "indents"; version = "0.4.0.0"; - sha256 = "9478d3f8ea4dd412ffc56225c4727f295b81daffba408bf1e757b4b23859d495"; + sha256 = "15flb4wb5d2pwzqqnh5szzd82nr9gxrc89b2qpzi5m2dxbwd6y4l"; libraryHaskellDepends = [ base mtl parsec ]; testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; homepage = "http://github.com/jaspervdj/indents"; @@ -103016,7 +109790,7 @@ self: { mkDerivation { pname = "index-core"; version = "1.0.4"; - sha256 = "75d1b87ad536cc0b36cc99d38cbff18b4fdd82d2921a0a81fe81ee0dc4c98e04"; + sha256 = "014fr720vvl1zs0hl6ljsa1dskwby6zqrlwrrhv0pk1nsmxbilbm"; libraryHaskellDepends = [ base ]; description = "Indexed Types"; license = stdenv.lib.licenses.bsd3; @@ -103027,7 +109801,7 @@ self: { mkDerivation { pname = "indexed"; version = "0.1.3"; - sha256 = "ef84090ec6bf79e7dc6e9d570fc370c9eea6cd251d3c023979f6e1f8d3fbf5c2"; + sha256 = "1hpmzg9ziqgng4wh4g0x4p6sdvn9f31hymwxdvfffydzqq70k17g"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/reinerp/indexed"; description = "Haskell98 indexed functors, monads, comonads"; @@ -103040,7 +109814,7 @@ self: { mkDerivation { pname = "indexed-do-notation"; version = "0.1"; - sha256 = "c9e958fb47ce04d214e015164f3b2453e8ea5990c25a9fb8a729bc2f255cdb83"; + sha256 = "10yvbhjjzg19lyw9ynn2j1cyms2k4hxly5hmw0ad416f8zxmisf9"; libraryHaskellDepends = [ base haskell-src-meta indexed template-haskell ]; @@ -103054,7 +109828,7 @@ self: { mkDerivation { pname = "indexed-extras"; version = "0.2"; - sha256 = "b01fe384c942d57a62a6416f3a312e8436ce54a664421311b104f8f8a6982b9f"; + sha256 = "17rbk2kgiy04n48i6hk4lracwdl45qqklvs1lri7mma2r62f67xh"; libraryHaskellDepends = [ base bifunctors indexed mtl pointed ]; homepage = "https://github.com/reinerp/indexed-extras"; description = "Indexed functors, monads and comonads that require extensions to Haskell98"; @@ -103067,7 +109841,7 @@ self: { mkDerivation { pname = "indexed-free"; version = "0.3.1"; - sha256 = "bd363584d8370af21b440d47d8a11e5332bf6db30d2d6a6b30c0f9ef61dfe284"; + sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx"; libraryHaskellDepends = [ base indexed ]; homepage = "https://github.com/fumieval/indexed-free"; description = "indexed monads for free"; @@ -103078,10 +109852,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "indextype"; - version = "0.1.0.0"; - sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498"; - revision = "2"; - editedCabalFile = "daa67f59c54d4c61f73317a1edc7ee86e59327df0eade3a8db6e348a80b8d2d5"; + version = "0.2.0.0"; + sha256 = "1fwpygmnlwm4h2mp7vwv1kwsbl5agzlc1cq0icijjm5jgw50ns4v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; @@ -103093,7 +109865,7 @@ self: { mkDerivation { pname = "indian-language-font-converter"; version = "0.2"; - sha256 = "c85e1aa01dba45ae2943080ef23c07976c8404134e8533b8a2db41b1877780b7"; + sha256 = "1dw0fy3v2hfvlaw371af2c288v4p0wyg43h88clswids3nh1lpn8"; libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; license = stdenv.lib.licenses.bsd3; @@ -103106,7 +109878,7 @@ self: { mkDerivation { pname = "indices"; version = "1.7.1"; - sha256 = "8505d262f5ae056e83be32084d93bb1472194c4c4d2b8e442fb3c5845f02c6eb"; + sha256 = "1sy609gq9idk5x28wasd9i61jwhlpf9ls21jps1nw1dfymid41c5"; libraryHaskellDepends = [ base tagged template-haskell ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -103125,7 +109897,7 @@ self: { mkDerivation { pname = "indieweb-algorithms"; version = "0.1.0"; - sha256 = "3417c4dc270ca59b7731319e7e4009a0f5f464d038814a2db2ceac079dcc80b2"; + sha256 = "1cl0rjfhgb6fn8nlm09qs1jg9xd01507x7ii65vrp98c4zfc85rl"; libraryHaskellDepends = [ aeson base bytestring containers data-default either http-link-header lens lens-aeson microformats2-parser network-uri @@ -103147,7 +109919,7 @@ self: { mkDerivation { pname = "inf-interval"; version = "0.1.0.2"; - sha256 = "19dca54b693752560022a8510d43fc651aebc6658ecbb66b0892f202d4afd221"; + sha256 = "08fjmza05wlj11mvdjwfcp3fn6k5zi1hsld84805clipd55sbp0r"; libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; homepage = "https://github.com/RaminHAL9001/inf-interval"; @@ -103163,7 +109935,7 @@ self: { mkDerivation { pname = "infer-upstream"; version = "0.1.1.0"; - sha256 = "ca81b05583e7a8feadc3457676bcf970c4f94206f23d5894c31f4b1ba5b46887"; + sha256 = "11v8njjinjqzqfa5hggj0r1gki3hz6y7cxj5qfnzxa77hdav10fa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103183,7 +109955,7 @@ self: { mkDerivation { pname = "infernu"; version = "0.0.0.1"; - sha256 = "1697a74440cbd7209317393fae5be1993bcae70b8ec79cf070f6fa7e0bfd8a54"; + sha256 = "0m4azl5pxypnf3q9riwf1gkwlfwrw5dswgrr2y9j1myb812ag5qn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103202,7 +109974,7 @@ self: { mkDerivation { pname = "infinite-search"; version = "0.12"; - sha256 = "813c347230aa7b73da97f7d699a65727a73091e1349c1e7b2941598bd2494ea3"; + sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/luqui/infinite-search"; description = "Exhaustively searchable infinite sets"; @@ -103215,7 +109987,7 @@ self: { mkDerivation { pname = "infinity"; version = "0.3"; - sha256 = "4b7d057669014a4f084e43dbb7768491ff01730aad73f7f03f95ab67893254b4"; + sha256 = "1d2l6a4ngawm7zqgfwxd19rh3zwihivbgns39q44yjh1d5v0azab"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103230,7 +110002,7 @@ self: { mkDerivation { pname = "infix"; version = "0.1.1"; - sha256 = "d8b42c13db9af14e75bc1c20144655f706f2099ad2bdb703e169abbd0867d494"; + sha256 = "156lcw4bvav9w41vggfjk84z41ppam31880wpislxwcsvc9jrd6q"; libraryHaskellDepends = [ base containers haskell-src ]; homepage = "http://www.cs.mu.oz.au/~bjpop/code.html"; description = "Infix expression re-parsing (for HsParser library)"; @@ -103245,7 +110017,7 @@ self: { mkDerivation { pname = "inflections"; version = "0.3.0.0"; - sha256 = "0391cb804f012fb27edc9d11c45bb60412bd703b5a7ebca5ccbf776d338926f1"; + sha256 = "1w96i4rnsxxzrjjvqzjs7dqbs4h4nrdw84cxvizb4bq19y0cp483"; libraryHaskellDepends = [ base exceptions megaparsec text unordered-containers ]; @@ -103262,7 +110034,7 @@ self: { mkDerivation { pname = "inflist"; version = "0.0.1"; - sha256 = "9c59ec33093f7da92b46fe04ffeeddff798d3504d23aa1a5062cc2a35b393c6b"; + sha256 = "0srw75ds7hic0sjs2fnj0hsqsygzvppgy17y8qmsjz9z14ryqncw"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://bitbucket.org/eegg/inflist"; @@ -103280,8 +110052,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.0.0"; - sha256 = "6b86e068856689490a006dcaeac1f47fc8deb3d678bd0ddd9dad7c78cff396ad"; + version = "1.2.2"; + sha256 = "09fabf4yx0k1rb6i2msmlszvx1v318n35gmc9aakvicnzkvxarrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103308,7 +110080,7 @@ self: { mkDerivation { pname = "informative"; version = "0.1.0.27"; - sha256 = "d03ffde1e85025fa10866db27b7c222a509fc18bfe1004016a49563a104a0616"; + sha256 = "05h69883lmj9d80h847yig0ryl1a49y7pckdhq8gl9ahx3hzsgyh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103332,7 +110104,7 @@ self: { mkDerivation { pname = "ini"; version = "0.3.5"; - sha256 = "bfd3836dfe38440987ce53f7eeffee00b54e3b7e4c0cd81ba315932cd7562cc6"; + sha256 = "1iicavbjr4qmlcdxh32cgqxlxd80xvzyxxskrs3hji1qzrnq7lxz"; libraryHaskellDepends = [ attoparsec base text unordered-containers ]; @@ -103348,7 +110120,7 @@ self: { mkDerivation { pname = "ini-qq"; version = "0.1.0.0"; - sha256 = "8c5e9da0f3307de0e3c291dc108fbbcac832fae7bb974f64961813dca4e8faeb"; + sha256 = "1szsx2jdq4qqjrj4z5xvwzx35j6apf7i1p4iqbiy0z9hyfh9splc"; libraryHaskellDepends = [ base ini template-haskell text ]; testHaskellDepends = [ base HUnit ini raw-strings-qq text ]; homepage = "https://github.com/kseo/ini-qq#readme"; @@ -103363,7 +110135,7 @@ self: { mkDerivation { pname = "inilist"; version = "0.2.0.0"; - sha256 = "6a789313821150d1cf9e5c4fd4038f6647aeecaa48d987758b401a26950f27e7"; + sha256 = "1rr71yajc6j0idsqgna8mbnawiv6iw1x8kswkv7x2l0ih89r6y3a"; libraryHaskellDepends = [ base bifunctors containers safe trifecta ]; @@ -103383,7 +110155,7 @@ self: { mkDerivation { pname = "inject"; version = "0.1.0"; - sha256 = "18cbee154485ac3368f988a6a26a1f504d9c68805672c63d4a7571d7670fa866"; + sha256 = "0rm81xkxfwbm98ywcwjnh1l9qkah3xma59l8z5l37b458hayxjqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base process text ]; @@ -103400,7 +110172,7 @@ self: { mkDerivation { pname = "inject-function"; version = "0.2.1.0"; - sha256 = "b4b5722b50fb138d84b89bb183f447ba9579d4ed75fc663f207e70c17f1688c7"; + sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/skypers/inject-function"; description = "Monadic functions with injected parameters"; @@ -103418,7 +110190,7 @@ self: { mkDerivation { pname = "inline-c"; version = "0.5.6.1"; - sha256 = "2daf717e6fc0046ccb6563557825fe26fcdc327c55b9771aa7b4c51473e6eb4e"; + sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103441,7 +110213,7 @@ self: { mkDerivation { pname = "inline-c-cpp"; version = "0.1.0.0"; - sha256 = "2e179756d13191e7c75522e7fda1b4ed9bfbe870484fb27479ab332bee396a45"; + sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf"; libraryHaskellDepends = [ base inline-c template-haskell ]; testHaskellDepends = [ base ]; description = "Lets you embed C++ code into Haskell"; @@ -103455,7 +110227,7 @@ self: { mkDerivation { pname = "inline-c-win32"; version = "0.1"; - sha256 = "75c6780424cbd3b58480aa10399c65965525ec3bd645696f0eb5567d6c2b4590"; + sha256 = "14255dn7smmm1rpnjifn7gn2amcncnf3j45ah22bblyb4h27iikm"; libraryHaskellDepends = [ base containers inline-c template-haskell Win32 ]; @@ -103473,7 +110245,9 @@ self: { mkDerivation { pname = "inline-java"; version = "0.6.1"; - sha256 = "f722733b43839d12f936c5d2e3e8f2d33aae6752a605d4582959a7ad71ce2045"; + sha256 = "0i90rrqsv9sr55cd81d6a9kswfnkyblf7ln56vwi57c38cxp68pp"; + revision = "1"; + editedCabalFile = "1kz51n1fbj9zv2109ciyd9myralrlbr2ym0c4kkgbdjkivp9lxy8"; libraryHaskellDepends = [ base binary bytestring Cabal containers directory distributed-closure filepath ghc-heap-view inline-c jni jvm @@ -103489,7 +110263,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-java_0_6_2" = callPackage + "inline-java_0_6_5" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , directory, distributed-closure, filepath, ghc-heap-view, hspec , inline-c, jni, jvm, language-java, process, singletons, syb @@ -103497,8 +110271,8 @@ self: { }: mkDerivation { pname = "inline-java"; - version = "0.6.2"; - sha256 = "9c162f26c77d1030f0f5054394265aab7fded1c83df67b3ea8fe7e4bb68aa8c5"; + version = "0.6.5"; + sha256 = "1pqai3jblcz52z76hwshzzajpnb5c62bs0i1b87hk8f8s0isask9"; libraryHaskellDepends = [ base binary bytestring Cabal containers directory distributed-closure filepath ghc-heap-view inline-c jni jvm @@ -103526,7 +110300,7 @@ self: { mkDerivation { pname = "inline-r"; version = "0.9.0.1"; - sha256 = "e95ba2d92f514a102675365e74c87442a2620fad54d3e1ecd15cf1a7253ec2af"; + sha256 = "1by27qjsgwaws7nf3lslml7n58j2fk478pinflk10jji5zcs4nz9"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions mtl pretty primitive process reflection setenv @@ -103551,12 +110325,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) R;}; + "inliterate" = callPackage + ({ mkDerivation, base, blaze-html, cheapskate, containers + , haskell-src-exts, lucid, lucid-extras, plotlyhs, text, time + }: + mkDerivation { + pname = "inliterate"; + version = "0.1.0"; + sha256 = "17z3s5w49x8j57v6myz2r6i0knnm60ydg3y8d0v008xrwdjcr5id"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html cheapskate containers haskell-src-exts lucid + lucid-extras plotlyhs text time + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base text ]; + homepage = "https://github.com/diffusionkinetics/open/inliterate"; + description = "Interactive literate programming"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {lucid-extras = null;}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { pname = "inquire"; version = "0.1"; - sha256 = "88f2c4383615c53c0bc6a66c59d6b620c6bf02d4065a6c5ba6411dfb78930ca3"; + sha256 = "18qcjdwgn7a1lrdnqnh6sh1bzii0nvb5jv56qq5kri8m6qwc9wl8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aether base text ]; @@ -103572,10 +110368,10 @@ self: { }: mkDerivation { pname = "insert-ordered-containers"; - version = "0.2.0.0"; - sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e"; - revision = "4"; - editedCabalFile = "b4b8544fe733ff569ff0f726a632c9c10831f3c7bff804ec5d75f62225363fa5"; + version = "0.2.1.0"; + sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; + revision = "3"; + editedCabalFile = "0ik4n32rvamxvlp80ixjrbhskivynli7b89s4hk6401bcy3ykp3g"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -103595,7 +110391,7 @@ self: { mkDerivation { pname = "inserts"; version = "0.1.2"; - sha256 = "e710388992f7cb45f4262a0f2c315242deddddfa07c2c8f6d7523cd19cf6e2d4"; + sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477"; libraryHaskellDepends = [ attoparsec base bytestring dlist ]; homepage = "http://github.com/tel/inserts"; description = "Stupid simple bytestring templates"; @@ -103610,7 +110406,7 @@ self: { mkDerivation { pname = "inspection-proxy"; version = "0.1.0.3"; - sha256 = "3ee20645dc7a11df5c05ef80596e06998c33a954e3a30e3efc61e8451a17b326"; + sha256 = "09mk2wd4bs31zhz0x8z3ajlk734r0rp5k07g0mfdy4bsvi2hdqiy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103628,7 +110424,7 @@ self: { mkDerivation { pname = "inspector-wrecker"; version = "0.1.0.0"; - sha256 = "71bcfb62046ae519c66e8eefd71a77753512d06b2fa73e523bcdb3585fda42ed"; + sha256 = "1va2v9gmicyd7d93x9rgdg814dbmfwddgvwfdv31krba0iigpg3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103649,7 +110445,7 @@ self: { mkDerivation { pname = "instance-control"; version = "0.1.1.1"; - sha256 = "664d0863d74823565b834ffca1913f2e74386478b231a44e0e2e282a4ac3fb31"; + sha256 = "0cgvqd52la1f1r7a8cdjg1j3hx1f7y8s3z2ghddmc8s8sxihhkb6"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/lazac/instance-control"; description = "Controls how the compiler searches for instances using type families"; @@ -103663,7 +110459,7 @@ self: { mkDerivation { pname = "instant-aeson"; version = "0.2"; - sha256 = "98d43d18aec3de9bd52c9c162eabbc736d4a50ad27fd5a9ade54888b5f6ba222"; + sha256 = "08m2ddgqp22lvsd5mz97mm84lvbkpjmjw5lw5karppn3mqc3vm4q"; libraryHaskellDepends = [ aeson base instant-generics ]; testHaskellDepends = [ aeson base instant-generics tasty tasty-quickcheck @@ -103681,7 +110477,7 @@ self: { mkDerivation { pname = "instant-bytes"; version = "0.2"; - sha256 = "e70cc805ca399ac0e413a30de053c5abbce7f4d2698f49976d299fdd2074f9f5"; + sha256 = "1xgrfhhdv7r9dnblk3v9sbsfgg5bqm9y03d32gjc16irr82wh377"; libraryHaskellDepends = [ base bytes instant-generics ]; testHaskellDepends = [ base bytes instant-generics tasty tasty-quickcheck @@ -103697,7 +110493,7 @@ self: { mkDerivation { pname = "instant-deepseq"; version = "0.2"; - sha256 = "606ffaffb09ad1bb1d766499a589b16531e9a4c7978734a349975248a4e60e21"; + sha256 = "088fwsj4hllp96ik91wpqyjfjcb5n64sb6b4fqfvplcsn3zzlvv0"; libraryHaskellDepends = [ base deepseq instant-generics ]; homepage = "https://github.com/k0001/instant-deepseq"; description = "Generic NFData instances through instant-generics"; @@ -103710,9 +110506,9 @@ self: { mkDerivation { pname = "instant-generics"; version = "0.6"; - sha256 = "b15e0566c0b060341e11ddd6bae9550c9a73c1b75c0e9acd6dc9092f4ce7ef15"; + sha256 = "05ggwx62y2f9dp6rl3jwnz0p76hcaplvmmnx24g38q5hq1k0apmi"; revision = "1"; - editedCabalFile = "1c1174f7546fceb789fcc40882eb731a21cb88165dac4e59129ff2ec1a11a2fc"; + editedCabalFile = "1z5224dfrwlz29clxb2x2s4cn88sfgmq4264zj4vgkkgakvp848w"; libraryHaskellDepends = [ base containers syb template-haskell ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; @@ -103725,7 +110521,7 @@ self: { mkDerivation { pname = "instant-hashable"; version = "0.2"; - sha256 = "8bf851b902126e91845e28cf6443d119ce675724c2e664562f8dd76664403a77"; + sha256 = "0xrs81j6dmwd5xb69rn24ibngkhrs51n9kr8bs292vhj0awm3y4b"; libraryHaskellDepends = [ base hashable instant-generics ]; homepage = "https://github.com/k0001/instant-hashable"; description = "Generic Hashable instances through instant-generics"; @@ -103738,9 +110534,9 @@ self: { mkDerivation { pname = "instant-zipper"; version = "0.0.0"; - sha256 = "8c10863c481e49b17636a381b184b5e1ee100e5567d026d4fa95e652e987a53d"; + sha256 = "0gd5hzlm5rlmzba2dl37al711vp1nn2b30d36rvb2j8y90y8c44c"; revision = "1"; - editedCabalFile = "a0e15510d3e3eefaa18d20fbfce7a1840519e160e2a8a8b36c498a3664b9c037"; + editedCabalFile = "0dy0p5j3d2j9djrsia72c3hij1c4l7kzryr0inhzmvp3sc85bqd0"; libraryHaskellDepends = [ base instant-generics mtl ]; description = "Heterogenous Zipper in Instant Generics"; license = "GPL"; @@ -103755,7 +110551,7 @@ self: { mkDerivation { pname = "instapaper-sender"; version = "0.1.0.2"; - sha256 = "c14b27275628ae15c4d9c4f617a65cd5ff6be2a8e59a8e8d30da79e4ecb1c199"; + sha256 = "16f1n7nf8yfs626qx6p5m3i6pzymbjk1gxn4v721bbi8aqkjfjy1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103772,7 +110568,7 @@ self: { mkDerivation { pname = "instinct"; version = "0.1.0"; - sha256 = "885e1b10c9ed900b4ef41b6f1feb4ecbe241b642408ac7d8b041a6dde42f0972"; + sha256 = "0wh95zjdv9j1n3ccg2j08av43qnb9vmiyvqvyi70p47dr481npl8"; libraryHaskellDepends = [ base containers mersenne-random vector ]; description = "Fast artifical neural networks"; license = stdenv.lib.licenses.bsd3; @@ -103783,7 +110579,7 @@ self: { mkDerivation { pname = "instrument-chord"; version = "0.1.0.10"; - sha256 = "d6094aaef5498a377ef3efa8b4d5acf3c3457d9d7ddad161fe86288f729777ad"; + sha256 = "1bbpjxr8ya46zrhx3nkxkmylbhzkmkav9a7gydz3g2j9ynp4l2fn"; libraryHaskellDepends = [ array base containers music-diatonic ]; homepage = "https://github.com/xpika/chord"; description = "Render Instrument Chords"; @@ -103797,9 +110593,9 @@ self: { mkDerivation { pname = "int-cast"; version = "0.1.2.0"; - sha256 = "6bfa10f7296fb0bf63d9078e2c7520112a22988f04202c3eb25e060bde1ddd3d"; - revision = "1"; - editedCabalFile = "4aacf85f637814a493046953cc39cc8dca530f8d2df7ce3b37222c2e991b5621"; + sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb"; + revision = "2"; + editedCabalFile = "14i728sy9y38zjm9xcjqyg9jjnayzdpzplpff2cdpc9jk596fmcs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -103815,9 +110611,9 @@ self: { mkDerivation { pname = "integer-gmp"; version = "1.0.0.1"; - sha256 = "ef11daab7d7007b6be61846350a947173c46475c833623bcac45aa532ec3c121"; + sha256 = "08f1qcp57aj5mjy26dl3bi3lcg0p8ylm0qw4c6zbc1vhgnmxl4gg"; revision = "1"; - editedCabalFile = "616d1775344a82a0ae1db1791fba719f4682a1ace908582ac4026db14231d4d5"; + editedCabalFile = "1mfl651b2v82qhm5h279mjhq4ilzf6x1yydi3npa10ja6isifvb1"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -103832,7 +110628,29 @@ self: { mkDerivation { pname = "integer-logarithms"; version = "1.0.1"; - sha256 = "0f453f8eb8b19122eac37d04ea95e9da5f9f07eb9ad750c174c3522e7d3a784c"; + sha256 = "0k3q79yjwln3fk0m1mwsxc3rypysx6ayl13xqgm254dip273yi8g"; + revision = "1"; + editedCabalFile = "1kk94f88qnmvwya9afpr4gqygvg02qc8m571hvd6fmwgsfvphv1y"; + 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-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 @@ -103849,7 +110667,7 @@ self: { mkDerivation { pname = "integer-pure"; version = "1.0"; - sha256 = "aad7e53d99e6d04a38f4d062829db45d58f18e1dbbfb0507bc6e81c4ab713053"; + sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa"; homepage = "http://projects.haskell.org/~malcolm/integer-pure"; description = "A pure-Haskell implementation of arbitrary-precision Integers"; license = stdenv.lib.licenses.bsd3; @@ -103861,7 +110679,7 @@ self: { mkDerivation { pname = "integer-simple"; version = "0.1.1.1"; - sha256 = "766b4b9de5c5c7cf77191b32462155b3c7bd34d035abb1af5f6369cb097510fd"; + sha256 = "1z8hfl4wnsb3bypv3arms0sbvixkalhlcchv35vwziy5wnflnsvn"; libraryHaskellDepends = [ ghc-prim ]; description = "Simple Integer library"; license = stdenv.lib.licenses.bsd3; @@ -103872,7 +110690,7 @@ self: { mkDerivation { pname = "integration"; version = "0.2.1"; - sha256 = "0c27385eadc10a580e78f7b7d4bc919c346b2c9b1e73aea7e7804d824d53582f"; + sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc"; libraryHaskellDepends = [ base parallel ]; homepage = "https://github.com/ekmett/integration"; description = "Fast robust numeric integration via tanh-sinh quadrature"; @@ -103887,7 +110705,7 @@ self: { mkDerivation { pname = "intel-aes"; version = "0.2.1.1"; - sha256 = "a9b231a7c0286a3082786f50e9e86c05f49696749d70a2d7abe953eb694b9e85"; + sha256 = "11cy9dlynlz9mgbs4w4xfjb9dx05dklfjl3gg2130si8q2kk3cm9"; libraryHaskellDepends = [ base bytestring cereal crypto-api DRBG largeword process random rdtsc split tagged time unix @@ -103904,7 +110722,7 @@ self: { mkDerivation { pname = "interchangeable"; version = "0.2.0.0"; - sha256 = "b059fa9b5b5e74fdd271d012abc2b4082304425eaa2e2a4f4e914c4117ef0fe4"; + sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/arowM/interchangeable"; description = "A type class for interchangeable data"; @@ -103916,7 +110734,7 @@ self: { mkDerivation { pname = "interleavableGen"; version = "0.0.1"; - sha256 = "e25e6cf754dc86511c36698c71eecbf7f738495c1f0a0971641dbdcb98539481"; + sha256 = "10clafccpg8xciqhj2hzbi4kixzprgp733396qf531nwakvnqpp2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory haskell-src hint mtl ]; @@ -103930,7 +110748,7 @@ self: { mkDerivation { pname = "interleavableIO"; version = "0.0.1"; - sha256 = "48e10af5ffdb8205ff62f8c76b745e737e334786f0641483dcdf1b6bb2cb4da6"; + sha256 = "19jdrfr6n6yzvj1i8r7hhr3k6zkkbrs6pizqcbzhb0nvzzshmqa8"; libraryHaskellDepends = [ base mtl ]; description = "Use other Monads in functions that asks for an IO Monad"; license = "unknown"; @@ -103942,7 +110760,7 @@ self: { mkDerivation { pname = "interleave"; version = "1.0"; - sha256 = "0ca9f428b006d8445f985dd7cb433ce396e13b73771be9c6e655d59c17ee5118"; + sha256 = "062ixqbrrmamwv3fj6vpfcxy35p37i1wpmsxk1gl9n06n0lg9a8c"; libraryHaskellDepends = [ base ]; description = "Combinators for supporting interleaving of different behaviours"; license = stdenv.lib.licenses.bsd3; @@ -103953,7 +110771,7 @@ self: { mkDerivation { pname = "interlude"; version = "0.1.2"; - sha256 = "fa4c020618645e47a6b9fe3795becc6b4cc621a5b2999bea5d5fba0a2c113bfa"; + sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s"; libraryHaskellDepends = [ base ]; homepage = "http://malde.org/~ketil/"; description = "Replaces some Prelude functions for enhanced error reporting"; @@ -103967,8 +110785,8 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.8"; - sha256 = "5eb16c248a0528543702ae17452c8cdb31d525f1bc95b4e9ea146682fab93100"; + version = "0.2.0.1"; + sha256 = "0jrmxph2m0ql48k6l743dhk4hdjxpdm7qqflwk2n3pw58ffajsk8"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable @@ -103985,7 +110803,7 @@ self: { mkDerivation { pname = "intern"; version = "0.9.1.4"; - sha256 = "60fe200de0a1906fe22105e5c284c19b89172e5223d01abcd73fd1584b56d26a"; + sha256 = "0snjar5mil9zsyy1ml13a8p1g2cvq62c5r8547i6z451w06j1zk0"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -104001,7 +110819,7 @@ self: { mkDerivation { pname = "internetmarke"; version = "0.0.3"; - sha256 = "fff4b7fe9d027075430a7201a096953bef07c46b2f22fd6172693268f3dec6be"; + sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104021,9 +110839,9 @@ self: { mkDerivation { pname = "intero"; version = "0.1.20"; - sha256 = "e93fd2df3a3cd1c6a0203420a94b0329c08b51a51ef8d5ec5a38efe61469da77"; + sha256 = "0xysd4afdvrqbbndby0ylm8qph190d5sj81l42hcdl9w7bgx4gz9"; revision = "1"; - editedCabalFile = "144efed4811883db90813e73814074f1b1527d49c62b24f7583e693ef168f8b9"; + editedCabalFile = "1fgqd3qkws9yb3vj8ay695ym5cgifi082wryh68dp0qqh7agwkhl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104045,7 +110863,7 @@ self: { mkDerivation { pname = "interpol"; version = "0.2.3"; - sha256 = "83fcd5945a52428d3e088e6198a6ec07316288b6c7598609f563f8970d9d5c85"; + sha256 = "11awkl6rgy33yl4qcnf7ns464c87xjk9hqcf10z8shjjbaadbz43"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -104069,7 +110887,9 @@ self: { mkDerivation { pname = "interpolate"; version = "0.1.0"; - sha256 = "2d1a6d5d19fe19d2fa4c7552ef7fd26a26ddfe13d80f458cec03afd030088c72"; + sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id"; + revision = "1"; + editedCabalFile = "0ld319k9phmp6dp8m87bdhqp5519dxggf8r2a5z8hkznyjpa131j"; libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; testHaskellDepends = [ base bytestring haskell-src-meta hspec QuickCheck @@ -104079,6 +110899,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "interpolate_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-meta, hspec + , QuickCheck, quickcheck-instances, template-haskell, text + }: + mkDerivation { + pname = "interpolate"; + version = "0.1.1"; + sha256 = "120ygxs8vfsjcc7xr9v8p8bcyqidhlg1rd568ym2bsl1nhx4h22b"; + libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; + testHaskellDepends = [ + base bytestring haskell-src-meta hspec QuickCheck + quickcheck-instances template-haskell text + ]; + homepage = "https://github.com/sol/interpolate#readme"; + description = "String interpolation done right"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "interpolatedstring-perl6" = callPackage ({ mkDerivation, base, bytestring, haskell-src-meta , template-haskell, text @@ -104086,7 +110925,7 @@ self: { mkDerivation { pname = "interpolatedstring-perl6"; version = "1.0.0"; - sha256 = "65e0b2ad2d7482755570637212417b84d1db3bcc3cd1aa348b6b37f57911a1d3"; + sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text ]; @@ -104100,7 +110939,7 @@ self: { mkDerivation { pname = "interpolatedstring-qq"; version = "0.2"; - sha256 = "385f9944e72257d72e9c52f04bf720cde3a8b742bd8ce9212a210fc2f04b16af"; + sha256 = "1bqn9gqc43r158hyk35x8avsiqyd43vlpw2jkhpdfmr2wx29jprq"; libraryHaskellDepends = [ base haskell-src-meta-mwotton template-haskell ]; @@ -104115,7 +110954,7 @@ self: { mkDerivation { pname = "interpolatedstring-qq-mwotton"; version = "0.1.1"; - sha256 = "7341ed85e824f47c0dc01cf0a9711be3e53c72ab8e03eee8b3a0d0c525f190b3"; + sha256 = "1cwhy4jwbl50nglfw0wfmdr3rrg33dqskw0wq06prx14x22yshbk"; libraryHaskellDepends = [ base haskell-src-meta-mwotton template-haskell ]; @@ -104128,15 +110967,15 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; - version = "0.1"; - sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa"; + version = "0.1.0.1"; + sha256 = "0j19k0j4ys7wd4p6knkvr4p5didavq9j3y1vgncwd5r0gm43wsdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ array base containers QuickCheck utility-ht ]; - homepage = "http://code.haskell.org/~thielema/interpolation/"; + homepage = "http://hub.darcs.net/thielema/interpolation/"; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -104149,9 +110988,9 @@ self: { mkDerivation { pname = "interruptible"; version = "0.1.1.1"; - sha256 = "d3ef92f178d03041edc7845dd3c3ac90a3e5c6b74b5ca1bca65246ac90af1e5c"; + sha256 = "0p0ymy8aqijjlsya2p2bnz3fb8whmk1x6pc4qznl2c6hg3qr5vyk"; revision = "2"; - editedCabalFile = "995d15d4358b5c31e289ac2840132c938c2635ae359e3624af7157e71667ce80"; + editedCabalFile = "106fcwbffmvimwj3d7immqsjd34k5h9l0a5ci7i32p4b6pa1apcr"; libraryHaskellDepends = [ base either lifted-base monad-control transformers ]; @@ -104167,7 +111006,7 @@ self: { mkDerivation { pname = "interspersed"; version = "0.1.2"; - sha256 = "9d17ade3b92e1009f212b96fc29db058fb2cc5640fbd3fada0498ebb4d500cfc"; + sha256 = "1z0ca16vp3j9l2nkzg8gck2jrysqn2fw4vxr2br0j41fp7iss5wx"; libraryHaskellDepends = [ base base-prelude transformers ]; homepage = "https://github.com/nikita-volkov/interspersed"; description = "An abstraction over interspersing monadic actions"; @@ -104179,9 +111018,9 @@ self: { mkDerivation { pname = "interval"; version = "1.20160821"; - sha256 = "773ef5d0296c8639d4aa47dad4bdbdec7a28dd476765f133fc8dd629293acadd"; + sha256 = "1pfa78ljkmldzhrz2rb78zfjhypcpnyx9nj7mba3k1kc578gagkp"; revision = "1"; - editedCabalFile = "fa0c92596237e63a8804b9a208bc185945100d0932e8481348990f1c16d586a8"; + editedCabalFile = "1a46slb1q3wr909lis1j146i0iar32y0i8mr0j43mripc9cr437s"; libraryHaskellDepends = [ base deepseq fingertree ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Intervals with adherences"; @@ -104193,29 +111032,50 @@ self: { mkDerivation { pname = "intervals"; version = "0.7.2"; - sha256 = "0dd04a7dfd0ac6b364c66b78dafa48739c5116253078d4023e104f5e99d5fe28"; + sha256 = "0a7ysncmwkqh7q1d8y1h4lb5373k93xdly3bqrjb7ihazmylml0d"; libraryHaskellDepends = [ array base distributive ghc-prim ]; homepage = "http://github.com/ekmett/intervals"; description = "Interval Arithmetic"; license = stdenv.lib.licenses.bsd3; }) {}; + "intervals_0_8" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, directory + , distributive, doctest, filepath, ghc-prim, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "intervals"; + version = "0.8"; + sha256 = "1i78h7plzckdjs9qr2p1qldhb5gv7v1cl01r27sf1hg2x9gr88v4"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ array base distributive ghc-prim ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "http://github.com/ekmett/intervals"; + description = "Interval Arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , cryptohash, directory, filepath, hscurses, mtl, network-fancy - , random, safe, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time - , transformers, vector + , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath + , hscurses, mtl, network-fancy, random, RSA, safe, SDL, SDL-gfx + , SDL-mixer, SDL-ttf, stm, time, transformers, vector }: mkDerivation { pname = "intricacy"; - version = "0.6.2"; - sha256 = "dce6907980d4b3e9eace2e4e5f5192459992a365d12d2c22860ff1afe2ffb5c7"; + version = "0.7.0.1"; + sha256 = "05nz32z4gyjprh22dddwk3jb45nl2bm558d1sh09g4n2rvx0m4i7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base binary bytestring containers cryptohash directory - filepath hscurses mtl network-fancy random safe SDL SDL-gfx - SDL-mixer SDL-ttf stm time transformers vector + array base binary bytestring containers crypto-api + crypto-pubkey-types cryptohash directory filepath hscurses mtl + network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm + time transformers vector ]; homepage = "http://mbays.freeshell.org/intricacy"; description = "A game of competitive puzzle-design"; @@ -104230,8 +111090,8 @@ self: { }: mkDerivation { pname = "intro"; - version = "0.1.0.8"; - sha256 = "09c570361dddf8c67572acffc7fd6c93bdfa1c8143d2f7eb9aec0ad5db4f21bf"; + version = "0.1.0.10"; + sha256 = "1na12wh1fz0zjd6ibz5piq9bhj50q827mskcs88fn47zsrxnr30w"; libraryHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra hashable mtl safe string-conversions tagged text transformers @@ -104248,24 +111108,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "intro_0_1_0_10" = callPackage + "intro_0_3_0_1" = callPackage ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, lens, mtl, safe - , string-conversions, tagged, text, transformers - , unordered-containers, writer-cps-mtl + , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe + , text, transformers, unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.1.0.10"; - sha256 = "1c8c6c7bd6ff10eb10d26cea7a04c2a048b8128eb7fc154d931f7c17201741d9"; + version = "0.3.0.1"; + sha256 = "0yc163r255w7df0hjly30bh5dqgx38f1z5lk3x3i7jh93j97cpn0"; libraryHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra - hashable mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl + hashable mtl safe text transformers unordered-containers + writer-cps-mtl ]; testHaskellDepends = [ base bifunctors binary bytestring containers deepseq dlist extra - hashable lens mtl safe string-conversions tagged text transformers + hashable lens mtl QuickCheck safe text transformers unordered-containers writer-cps-mtl ]; homepage = "https://github.com/minad/intro#readme"; @@ -104279,9 +111138,9 @@ self: { mkDerivation { pname = "intro-prelude"; version = "0.1.0.0"; - sha256 = "602df3463f556cfff5b3784b7b49f0548768f11e7651175fae1028f4565faaba"; + sha256 = "1fmabxbg8a0hmrgiflbn3vqni1sly14pnjvqngszyv2m7x3g6bb0"; revision = "1"; - editedCabalFile = "a6ffadd4b02b26ea9170eae2f37ee3f5af32cb128a3c1d1099b34b86daec5de6"; + editedCabalFile = "1rjxxkd8cjxkk481sg4a2b5k5bzmwdzg7qpaf28yl9ibn3aavzx6"; libraryHaskellDepends = [ intro ]; testHaskellDepends = [ intro ]; doHaddock = false; @@ -104300,7 +111159,7 @@ self: { mkDerivation { pname = "introduction"; version = "0.0.1.0"; - sha256 = "4a061e4d863526c583d95907b9be1e11e6fd1ccb757d360c4bd3c3fe0214cd3c"; + sha256 = "0g6d2h1gxhyk9c63czbmrcfgvrhi3szbj1srv61wa9imhr6iw1ja"; libraryHaskellDepends = [ async base bytestring containers deepseq exceptions filepath ghc-prim lifted-base monad-control mtl path path-io safe stm @@ -104321,7 +111180,7 @@ self: { mkDerivation { pname = "introduction-test"; version = "0.0.1.0"; - sha256 = "398191ff93488b86d4f58fb675403ccfe84c5eb50a06a16d8eec8033eb3f31bb"; + sha256 = "1fri7zmk707cirns21hanmg4rs6g7i07bdlgypa8d2s8jgzr309r"; libraryHaskellDepends = [ base bytestring containers filepath genvalidity genvalidity-containers genvalidity-hspec genvalidity-text hspec @@ -104338,7 +111197,7 @@ self: { mkDerivation { pname = "intset"; version = "0.1.1.0"; - sha256 = "60d2c3923889cc99ede3544cd0576cc4927098dec4e49ba8aa86a8273ee29610"; + sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0"; libraryHaskellDepends = [ base bits-extras bytestring deepseq ]; homepage = "https://github.com/pxqr/intset"; description = "Pure, mergeable, succinct Int sets"; @@ -104354,17 +111213,17 @@ self: { }: mkDerivation { pname = "invariant"; - version = "0.4"; - sha256 = "dccf2790eb545d167623c0133aa0838d714004bfd158e3c9dfaca38497aef316"; + version = "0.4.2"; + sha256 = "1m5iaj7w4srg0qcd5dga8aphkwapxmhh54f4pi1bc67i17zl99ss"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell transformers transformers-compat unordered-containers ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; homepage = "https://github.com/nfrisby/invariant-functors"; - description = "Haskell 98 invariant functors"; - license = stdenv.lib.licenses.bsd3; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; }) {}; "invertible" = callPackage @@ -104375,7 +111234,9 @@ self: { mkDerivation { pname = "invertible"; version = "0.2.0.2"; - sha256 = "eee1b66f20190b5cc87122e22c664422df4188b38f81e896e8381bf2f58385a8"; + sha256 = "1a45hgsz46rqx2bfi0cgnf443pr28ik2rqi2f745q2qr41pvdqgf"; + revision = "1"; + editedCabalFile = "1jbk0mcn66j2931yka1923j7k45jgv6174q8rr3plidyn8fgm2hg"; libraryHaskellDepends = [ base haskell-src-meta invariant lens partial-isomorphisms semigroupoids template-haskell transformers TypeCompose @@ -104386,12 +111247,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "invertible-hlist" = callPackage + ({ mkDerivation, base, HList, invertible }: + mkDerivation { + pname = "invertible-hlist"; + version = "0.2.0.2"; + sha256 = "1824j4k8y5mn16vyk1h3mb72gr19j6rc833w24yqjxjlqw81y3y5"; + libraryHaskellDepends = [ base HList invertible ]; + description = "invertible functions and instances for HList"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "invertible-hxt" = callPackage + ({ mkDerivation, base, hxt, hxt-charproperties, invertible, mtl }: + mkDerivation { + pname = "invertible-hxt"; + version = "0.1"; + sha256 = "154fm1slk8cn3dqyniz0wqb2gq4byshj1gjbzpc37fb7cs2bmlxd"; + libraryHaskellDepends = [ + base hxt hxt-charproperties invertible mtl + ]; + description = "invertible transformer instances for HXT Picklers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "invertible-syntax" = callPackage ({ mkDerivation, base, partial-isomorphisms }: mkDerivation { pname = "invertible-syntax"; version = "0.2.1"; - sha256 = "774147d1c65a1e0259bf8b0e26d97966f2bf4d8908dfca29d9221d05f03bd14f"; + sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp"; libraryHaskellDepends = [ base partial-isomorphisms ]; homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse"; description = "Invertible syntax descriptions for both parsing and pretty printing"; @@ -104406,7 +111292,7 @@ self: { mkDerivation { pname = "io-capture"; version = "1.0.0"; - sha256 = "86885b68cb9d198f3ebf80d8d5ea46a15976b8257bc86fae50d680c4eae5c847"; + sha256 = "0iy8wpmc906na2p6zj3v4nw7cnd18vmdbn40pwz8y6cxrdl5p246"; libraryHaskellDepends = [ base bytestring streaming-bytestring unix ]; @@ -104426,7 +111312,7 @@ self: { mkDerivation { pname = "io-choice"; version = "0.0.6"; - sha256 = "612b281110d18615000704f24fdb54a3b4401f7a39dcfe358433d7b4c22e1cef"; + sha256 = "1vqw5v1b9mrkhhszxp1rg8gl1d53akdlzwh40w01b1ni208jhav1"; libraryHaskellDepends = [ base lifted-base monad-control template-haskell transformers transformers-base @@ -104443,7 +111329,7 @@ self: { mkDerivation { pname = "io-machine"; version = "0.2.0.0"; - sha256 = "05dcc8d5fcbb6f0d7f3519488ebf743eaa776bc93c2f8b0d4bbd866ac1331ccb"; + sha256 = "1jqw6g0nm1mx9c6qnbrwr5mpgaiyfjzqwj0r6mzhsvxvzkawip05"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base ]; homepage = "https://github.com/YoshikuniJujo/io-machine#readme"; @@ -104456,7 +111342,7 @@ self: { mkDerivation { pname = "io-manager"; version = "0.1.0.2"; - sha256 = "bf0aa7740a8aaf31fc4f2570a47957365ae7d9248edd309e694053f1cd804138"; + sha256 = "0f21h36z2ls0d6g31pcf4kcyfninaxws8w159zy33bwa19saf2mz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -104470,7 +111356,7 @@ self: { mkDerivation { pname = "io-memoize"; version = "1.1.1.0"; - sha256 = "c753a1b1a2fb286bf608d6467e6e7599cde8e641c619885197f298bf1b2f483d"; + sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7"; libraryHaskellDepends = [ async base ]; homepage = "https://github.com/DanBurton/io-memoize"; description = "Memoize IO actions"; @@ -104482,7 +111368,7 @@ self: { mkDerivation { pname = "io-reactive"; version = "0.1.1"; - sha256 = "76bfcb26687d42669acf8f26ff4136d61a85dba502c5e3daaf10506c10433826"; + sha256 = "09iq8c86ql0hmzdf7i82lpdqa6nn6r0zy9lgryd6chkxd0kcpgvn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -104497,7 +111383,7 @@ self: { mkDerivation { pname = "io-region"; version = "0.1.1"; - sha256 = "ee303f66c2b3d33fae877b0dbb7c64624109fc759dffa669ca182e387f1015f1"; + sha256 = "1w8m21zkhbhqr9lsdzwxfpy0jhb2ciybn3bvhyp3zlxkq9k3yc7f"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base hspec transformers ]; homepage = "https://github.com/Yuras/io-region/wiki"; @@ -104510,7 +111396,7 @@ self: { mkDerivation { pname = "io-storage"; version = "0.3"; - sha256 = "9a0df5cc7ff2eeef11e29e1362fea284f535bc2fe67469bba6dbc41c4f5b49bd"; + sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs"; libraryHaskellDepends = [ base containers ]; homepage = "http://github.com/willdonnelly/io-storage"; description = "A key-value store in the IO monad"; @@ -104526,10 +111412,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.3.6.0"; - sha256 = "5e2ae8363cc30d69687db98bfa6711ec53b3b104fcc1829c1e62d8de3d249e3d"; - revision = "1"; - editedCabalFile = "2e5ea27945eb6c0f4260a482cc77c6ebebdf160cd00fa86130f4d31342fa994f"; + version = "1.3.6.1"; + sha256 = "0a1nr29qg5z0fqjnivzzy69bfxv7r9aw9yf2i53alcmiqjmx9p18"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -104545,6 +111429,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams_1_4_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , deepseq, directory, filepath, HUnit, mtl, network, primitive + , process, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, vector + , zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.4.0.0"; + sha256 = "03lk73smhqvw6lxp4j0kxlkd87vaxaz2avpy7k533fxv1jk3sfbd"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -104552,7 +111463,9 @@ self: { mkDerivation { pname = "io-streams-haproxy"; version = "1.0.0.1"; - sha256 = "c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f"; + sha256 = "0zwjdsg1pcxzd8s0d308q4jhx0pfrk2aq8q039gs8k9y8h9cbh64"; + revision = "2"; + editedCabalFile = "1zm580jcncmh667k51k47xwwhd171r3f0h00d25hi6isq812ia40"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -104572,7 +111485,7 @@ self: { mkDerivation { pname = "io-streams-http"; version = "0.2.1.2"; - sha256 = "63d6bc557bf0950386e3b35e21c33c6a945fd4ed9f748ab7e0ab926686f84365"; + sha256 = "0ra3z236d4mbw2vqlx4zxpa5z53a7k1j2pmkwf3075ghgdavrmk3"; libraryHaskellDepends = [ base bytestring http-client http-client-tls io-streams mtl transformers @@ -104586,9 +111499,9 @@ self: { mkDerivation { pname = "io-throttle"; version = "0.1.0"; - sha256 = "49b27cb7f0d57fe2679c6c18e0f3d1ff3b11de4cf3b526db9ad00063d3a27710"; + sha256 = "043plb9n606hkbdjddgk9kg12fzzs7ry063ckiky4zymy2vprcj9"; revision = "1"; - editedCabalFile = "c3903532515f76e374229ea572d11f7ab02a560062425f33649399c5ac61a16e"; + editedCabalFile = "0vm1c6ncb6ckchrmyhk201b2mc3s3z8p59cy49sf6xjza4r3b463"; libraryHaskellDepends = [ base SafeSemaphore threads ]; testHaskellDepends = [ base ]; homepage = "http://github.com/rodrigosetti/io-throttle"; @@ -104601,7 +111514,7 @@ self: { mkDerivation { pname = "ioctl"; version = "0.0.1"; - sha256 = "1a9f21bc8f03d4729ef936d543d463e9ab5656699b2cf27fb344b4c6693d9067"; + sha256 = "0rwh7mlwdd24ndzz4b4vd5b5daz9cga47m9nz6g75m03iyy237qs"; libraryHaskellDepends = [ base network unix ]; description = "Type-safe I/O control package"; license = stdenv.lib.licenses.mit; @@ -104612,9 +111525,9 @@ self: { mkDerivation { pname = "ion"; version = "1.0.0.0"; - sha256 = "24a364e30e6baeb531c8f040d3cea6d368c6457cabe58a21fb98f21333b7cc0d"; + sha256 = "03fcnwri7wlqzchqmrdbgi2wcs6klv7d6h7hr0qvbbkb1vin98r4"; revision = "1"; - editedCabalFile = "468bd67b256d96d6a7950870abb2c90f98815b759f89658022ece91fe234c3d9"; + editedCabalFile = "1nf36ki1zsgc4a06b2czfmdq360gr6ranw08jnkxd5kd4mxxd2s6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104634,7 +111547,7 @@ self: { mkDerivation { pname = "ioref-stable"; version = "0.1.1.0"; - sha256 = "f4f6c82ca430fb8aac93e48d95212aab9c41700af203ad0a74dcbd578e0991c7"; + sha256 = "1iwi1675ggfwfh5as0zj19q4375b58hrb3g4jfn8myrhlhncixpl"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/cocreature/ioref-stable#readme"; description = "iorefs with a unique stable index"; @@ -104646,7 +111559,7 @@ self: { mkDerivation { pname = "iostring"; version = "0.0.0.0"; - sha256 = "d6865def561239a0e148d78c8e03a950308bcda45e70272ab6a64420d12a112f"; + sha256 = "0bqi5b8j0i56nqm2fw2ylk6qnc2hm41qx36p93hs0f8javpmv1nn"; libraryHaskellDepends = [ base bytestring path text ]; homepage = "http://cs-syd.eu"; description = "A class of strings that can be involved in IO"; @@ -104658,7 +111571,7 @@ self: { mkDerivation { pname = "iothread"; version = "0.1.0.0"; - sha256 = "a03b253219cb41b8e28c11d007295bab9e5cf5fa36814c23c082f46ac1d27edb"; + sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/tattsun/iothread"; description = "run IOs in a single thread"; @@ -104671,7 +111584,7 @@ self: { mkDerivation { pname = "iotransaction"; version = "0.1"; - sha256 = "8c857bbe3676b4c038baba534e4a487ccde478041b35af07d8a33b2e6acc9c7a"; + sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc"; libraryHaskellDepends = [ base ]; homepage = "https://bitbucket.org/dshearer/iotransaction/"; description = "Supports the automatic undoing of IO operations when an exception is thrown"; @@ -104686,8 +111599,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.9"; - sha256 = "19f99c1b673f9ca924a78888fb22ae2d534b0165653c3bdd3f8332ac7ca26a0e"; + version = "0.9.2"; + sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -104711,7 +111624,7 @@ self: { mkDerivation { pname = "ip-quoter"; version = "1.0.1.1"; - sha256 = "94c4369d0a83ed5f8a0bb8057d297935f19e7a51a568f4c5348936e9053929a0"; + sha256 = "1819742yjdl96k2z8s55a5x9xw9mg4lps1dq1f55zvc31afkdi4l"; libraryHaskellDepends = [ base cpu network template-haskell ]; testHaskellDepends = [ base cpu network tasty tasty-hunit ]; homepage = "https://github.com/shlevy/ip-quoter"; @@ -104724,7 +111637,7 @@ self: { mkDerivation { pname = "ip2location"; version = "8.0.4"; - sha256 = "047e160706a8ab86a0800f9535a18af28e8257efa16e8ccac577d934bf293e3b"; + sha256 = "0fry56zk9nbpqp58qvm1xxbq53pjiahkb58gh2h8dax80q3iczh4"; libraryHaskellDepends = [ base binary bytestring iproute ]; homepage = "http://www.ip2location.com"; description = "IP2Location Haskell package for IP geolocation"; @@ -104736,10 +111649,8 @@ self: { ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { pname = "ip6addr"; - version = "0.5.2"; - sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f"; - revision = "1"; - editedCabalFile = "f59669c0e8198ef3c56ecff75b7304d379fc1bbd5485114e3be6774d0d07037c"; + version = "0.5.3"; + sha256 = "1ih3dsqahn1c8nhs7w4idzpz0qb7amqhs25wnip5ly4iwsa0ky8z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs IPv6Addr text ]; @@ -104755,7 +111666,7 @@ self: { mkDerivation { pname = "ipatch"; version = "0.1.1"; - sha256 = "b8d1a4f99effe3ef05930935aa7aafbfa2a11da568b8588092f4ba28d002cea7"; + sha256 = "19yf0b82ifplja05if38llfs38mzmxxald89jc2yzqzzkvws9ldq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104775,7 +111686,7 @@ self: { mkDerivation { pname = "ipc"; version = "0.0.5"; - sha256 = "0d196e3ea379567f529dd06a0dc1cb6192e99a1c1191328c9e41e88082303c34"; + sha256 = "0d1w62181s21ks63548i3jdfk4k1rg0hssnhkm97ymkrlcz6w68d"; libraryHaskellDepends = [ base binary bytestring dlist mtl network network-bytestring stm ]; @@ -104790,7 +111701,7 @@ self: { mkDerivation { pname = "ipcvar"; version = "0.0.1"; - sha256 = "7664f9a64d91a9a0f20ec8fb74a15fe97ce1e6dff242edfc00932731fb00b720"; + sha256 = "085p03xk29wk03yfshpjvzkf2z79byhp9yy81vra1aci9nkgjr3n"; libraryHaskellDepends = [ base binary bytestring directory unix ]; testHaskellDepends = [ base hspec unix ]; description = "Simple inter-process communication through IPCVars"; @@ -104805,7 +111716,7 @@ self: { mkDerivation { pname = "ipopt-hs"; version = "0.5.1.0"; - sha256 = "aaf193c06daed43998d4d37f7916d8c1bb73b61e01815755eff61bd2c472344a"; + sha256 = "0jilfb2d46znxxamg0813sv77fy1v0b7jzyksjc3km5fdp097wda"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104817,14 +111728,14 @@ self: { description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) ipopt; nlopt = null;}; + }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;}; "ipprint" = callPackage ({ mkDerivation, base, haskell-src, sr-extra }: mkDerivation { pname = "ipprint"; version = "0.6"; - sha256 = "1a241f79219fe0daac1b4c61d4fa14f2c8fd8a8bf5b9cd8e4f80d206bca3a823"; + sha256 = "08x8lfy0dll09y7cvfgmif5gvj7j2kxd8qac3fndmq4z45wiy90s"; libraryHaskellDepends = [ base haskell-src sr-extra ]; description = "Tiny helper for pretty-printing values in ghci console"; license = stdenv.lib.licenses.bsd3; @@ -104837,7 +111748,7 @@ self: { mkDerivation { pname = "iproute"; version = "1.7.1"; - sha256 = "57b8d03ca8ce92f8ec1334564f3edff53a0621ccbc43c00ba02eaa5007ee3eee"; + sha256 = "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -104857,7 +111768,7 @@ self: { mkDerivation { pname = "iptables-helpers"; version = "0.5.0"; - sha256 = "f214ba973c439c64683106276ecf06f789e2e039183dc0d25f4feb44c63bbb8f"; + sha256 = "13xv7g349ssgbz9c0g8q77hf52gp0v7nw9q665l697237jbvl57j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104879,7 +111790,7 @@ self: { mkDerivation { pname = "iptadmin"; version = "1.3.4"; - sha256 = "95243bf80e2cb51a8c1ae8635607136c5004f35215ee3d965e5ef592f0f556cf"; + sha256 = "1ksnypq95xaybsb3vvhmabrh8l3c2c3mcqz83a61md9c1vw3n94m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104903,7 +111814,7 @@ self: { mkDerivation { pname = "ipython-kernel"; version = "0.8.4.0"; - sha256 = "ac4c822836d5b2cecf7ac4c61fe32ed876b09d18bcbe44760a6096bcd7338264"; + sha256 = "0r426gbvr5k019v49gmw32fv0xnq5viizin4gb7wxcnm6ql84k5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104924,7 +111835,7 @@ self: { mkDerivation { pname = "irc"; version = "0.6.1.0"; - sha256 = "3816ead4dfb32d61c03265e3a2a45053508cb27ca3132595773a27ef381637e1"; + sha256 = "1q9p2qwfy9rsfyaja4x3gjr8ql2ka2ja5qv56b062bdkvzafl5iq"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -104939,7 +111850,7 @@ self: { mkDerivation { pname = "irc-bytestring"; version = "0.1"; - sha256 = "a7c559cacb6aeb8288385f2d2099389173abeae730e884fea28b93d347f2c426"; + sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7"; libraryHaskellDepends = [ attoparsec base bytestring ]; homepage = "https://github.com/kallisti-dev/irc-bytestring"; description = "serialization and parsing of IRC messages"; @@ -104954,7 +111865,7 @@ self: { mkDerivation { pname = "irc-client"; version = "0.4.4.1"; - sha256 = "38d105cd429eb4937be8e5586c3ae268d420ce927894940670993abcc863ecf6"; + sha256 = "1xpccg4bqflrf039953qjb721m38w8x6qn75x1xr7d4y8b6hbl9q"; libraryHaskellDepends = [ base bytestring conduit connection irc-conduit irc-ctcp network-conduit-tls old-locale stm stm-conduit text time tls @@ -104970,32 +111881,13 @@ self: { mkDerivation { pname = "irc-colors"; version = "0.1"; - sha256 = "00ce2cda8c9bbf76c96838c4e2f51a667a6a0e242a670730fa879b15f04283f6"; + sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0"; libraryHaskellDepends = [ base text ]; description = "Colourize your IRC strings"; license = stdenv.lib.licenses.bsd3; }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text - , time, tls, transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.2.2.0"; - sha256 = "b66e058a66e9cd782f065be6b100bb80157c55d733db6691112a70e9aab13065"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls profunctors text time tls transformers - x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_2_2_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation @@ -105003,7 +111895,7 @@ self: { mkDerivation { pname = "irc-conduit"; version = "0.2.2.1"; - sha256 = "9640c826f27f262cbe6877cb3757548fd6e052d6e27a64bfba41875856a1721a"; + sha256 = "06kjl5b5i1s1pazn8yp2sr9f1mlgaibkgjvpd2z2q9kzy8kchh4n"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -105012,7 +111904,6 @@ self: { homepage = "https://github.com/barrucadu/irc-conduit"; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -105021,10 +111912,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.2.0.1"; - sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a"; - revision = "1"; - editedCabalFile = "fd862f303735a1a3c2f7913d5f6834a2711c20aacdabb98515504b8a4de986a6"; + version = "2.3.0"; + sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -105041,7 +111930,7 @@ self: { mkDerivation { pname = "irc-ctcp"; version = "0.1.3.0"; - sha256 = "d67cd91a5521173565033777cea76636e4d2be6e6224f681392d9e726f4bb79a"; + sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n"; libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/barrucadu/irc-ctcp"; description = "A CTCP encoding and decoding library for IRC clients"; @@ -105049,18 +111938,20 @@ self: { }) {}; "irc-dcc" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, errors + ({ mkDerivation, attoparsec, base, binary, bytestring , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network , path, safe-exceptions, tasty, tasty-hspec, tasty-quickcheck , transformers, utf8-string }: mkDerivation { pname = "irc-dcc"; - version = "2.0.0"; - sha256 = "af21bb0929ead7439e0d45ce4db1c35799949d91c8dd8f25f048826498483115"; + version = "2.0.1"; + sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; + revision = "3"; + editedCabalFile = "1kc4yzm5k0s069dhyncj5rmxnbfjjn8ynx182wp9v5qhylgicx98"; libraryHaskellDepends = [ - attoparsec base binary bytestring errors io-streams iproute - irc-ctcp mtl network path safe-exceptions transformers utf8-string + attoparsec base binary bytestring io-streams iproute irc-ctcp mtl + network path safe-exceptions transformers utf8-string ]; testHaskellDepends = [ base bytestring hspec-attoparsec iproute network path tasty @@ -105081,7 +111972,7 @@ self: { mkDerivation { pname = "irc-fun-bot"; version = "0.6.0.0"; - sha256 = "1284142d5957d8b30975fb9178908cec8414d60cebd5b5e6d04af6c41809cd82"; + sha256 = "10nd14cc9xjas3kbbmgb1kb1917cij87i4gvfl4v7n2pb4ni910j"; libraryHaskellDepends = [ aeson auto-update base case-insensitive clock containers data-default-class fast-logger formatting irc-fun-client @@ -105102,7 +111993,7 @@ self: { mkDerivation { pname = "irc-fun-client"; version = "0.5.0.0"; - sha256 = "a8a6bb0835fd2ff4b0697306d76d639802ced44dba23b8e661ed8e4aea31525a"; + sha256 = "0njj67m4m3pdc7kbh8xs9pacw0lqcdnxf1kkd6qg8bzx6l4bp9m8"; libraryHaskellDepends = [ auto-update base bytestring connection data-default-class fast-logger hashable irc-fun-messages irc-fun-types text time @@ -105121,7 +112012,7 @@ self: { mkDerivation { pname = "irc-fun-color"; version = "0.2.1.0"; - sha256 = "f8423b38b4309fa55af87cd6b3fabe277b47c77fe412cc660712d41663f0bc87"; + sha256 = "11xwy1iidm0j0xkcq4p4gz3lfyr7pvxb7mkwz1dab7rhnhw3nhpq"; libraryHaskellDepends = [ base dlist formatting irc-fun-types text text-show ]; @@ -105137,7 +112028,7 @@ self: { mkDerivation { pname = "irc-fun-messages"; version = "0.4"; - sha256 = "f983bf1cea8f06ac87782d2cc00a38dbc45feb0a3055028170b76a7263422153"; + sha256 = "0lr189ip4smpf20h4m9h1bmmzi6v705c0b1dg23sq1lgx8fbz0zr"; libraryHaskellDepends = [ base irc-fun-types regex-applicative text ]; @@ -105151,7 +112042,7 @@ self: { mkDerivation { pname = "irc-fun-types"; version = "0.2"; - sha256 = "37d2d2d933112e877cd4e8f2b4f8661f715b55206687eb91a4d7e6afaed30997"; + sha256 = "15q9sfpazrnplj8yp1v641amnw8zcvwb9wp8siy8fbhi6gcx5lip"; libraryHaskellDepends = [ base hashable text ]; homepage = "http://hub.darcs.net/fr33domlover/irc-fun-types"; description = "Common types for IRC related packages"; @@ -105164,8 +112055,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5"; - sha256 = "eaeb733a499645645dc146f9e8b39766df2bae3924dcf00e98132dd2410e5ead"; + version = "0.6.5.1"; + sha256 = "1cam9f7ppxj7yh1am0qjkh8b19haggrqdmkd26xik1ymn7nq9iyd"; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network parsec random SafeSemaphore stm time unix @@ -105181,7 +112072,7 @@ self: { mkDerivation { pname = "ircbouncer"; version = "0.2.0"; - sha256 = "f5a75465ad5af3decac2d88d6b3f24fd1a6e744cf321fbd0b713df847aaac0ae"; + sha256 = "1bn0m9x89pqknz8gn8gk9is6w6px4hznp3fqqb5dxwssmmjm99zm"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -105192,7 +112083,7 @@ self: { mkDerivation { pname = "ireal"; version = "0.2.3"; - sha256 = "928294da41708e1036283aee492be120e478c0994998df50af533898c9c9bc73"; + sha256 = "0wxwr74rhf2kmx8dz629k707ir10w4mlkvis50v113kh87d990lj"; libraryHaskellDepends = [ base QuickCheck ]; description = "Real numbers and intervals with relatively efficient exact arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -105208,7 +112099,7 @@ self: { mkDerivation { pname = "iridium"; version = "0.1.5.6"; - sha256 = "18a0ee5f08996a263dcf484bb48749d6a3df502729a7c386b5b7133b80f23577"; + sha256 = "0xrmya03n4xpnn3c79r94x8dz8yn963v8js8rwyjcslr11gyx80q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105231,7 +112122,7 @@ self: { mkDerivation { pname = "iron-mq"; version = "0.1.1.0"; - sha256 = "9936b04b59c48f5e197c17b8a5f35a4637d0233b6483dbec09af9b18898a21fa"; + sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr"; libraryHaskellDepends = [ aeson base http-client lens text wreq ]; homepage = "https://github.com/arnoblalam/iron_mq_haskell"; description = "Iron.IO message queueing client library"; @@ -105246,7 +112137,7 @@ self: { mkDerivation { pname = "ironforge"; version = "0.1.0.36"; - sha256 = "86aee52c1b9752a32a750cdc28c23e6d6a520872ed178000ad6cb04308bcda85"; + sha256 = "11fsph447c3cml0805zdf8454skd7v12ip0cflma6llp3cnfbbl6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105265,11 +112156,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "is"; - version = "0.2"; - sha256 = "502c962d45859050455057be9886e8944e300ef690a56605c91aca76fdcd19c6"; + version = "0.4"; + sha256 = "0bg7irvyzmlay3xkwsqn08waiylpllyvpkj3n3vwib6iwizqnqkz"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; - description = "Pattern predicates using TH"; + description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -105281,7 +112172,7 @@ self: { mkDerivation { pname = "isdicom"; version = "0.0.2"; - sha256 = "37f074017c3aa1f5dd5bc3cca6e332fa0c322ad7350d1f3ad054354fb64dc915"; + sha256 = "05f99nv4ydals0x1y39mswm3437s6bisdk63bgfzb89sgh0p9w1p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -105299,7 +112190,7 @@ self: { mkDerivation { pname = "isevaluated"; version = "0.3.0.2"; - sha256 = "a51da5092ea7cae41a16fa840609c19cc6c2a8b56e129168a3c5f731f24ac081"; + sha256 = "10f09br33xy5ldl924kfnnlc5ilwq44hd17s2qdf9jm75q4sa7d5"; libraryHaskellDepends = [ base vacuum ]; description = "Check whether a value has been evaluated"; license = stdenv.lib.licenses.mit; @@ -105311,7 +112202,7 @@ self: { mkDerivation { pname = "isiz"; version = "0.0.1"; - sha256 = "1a20826305c276fc277040b73f527f2dcc618a7b91ee92bcdaf4a0cf62f4164c"; + sha256 = "0k0nyiicz87lvay95vligf563k1dgx93zds0f0kzqxn20miq480s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gtk3 ]; @@ -105324,7 +112215,7 @@ self: { mkDerivation { pname = "islink"; version = "0.1.0.0"; - sha256 = "cfbf9c1a6dc46327b7ed7bf9336e245a255626c9d04aeba3d887d90f26d2aed7"; + sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg"; libraryHaskellDepends = [ base unordered-containers ]; homepage = "https://github.com/redneb/islink"; description = "Check if an HTML element is a link"; @@ -105338,7 +112229,7 @@ self: { mkDerivation { pname = "ismtp"; version = "4.0.2"; - sha256 = "15ceeef4bbca3ea7a602e2e0e9b79bdefd75a13acf069906740fdc93c8cd7e6a"; + sha256 = "0skyrp497p0gfh39j1ng7ahpbzfykfvykq720akafgnapgsfxkhm"; libraryHaskellDepends = [ base bytestring containers contstuff dnscache enumerator lifted-base monad-control netlines network vector @@ -105353,7 +112244,9 @@ self: { mkDerivation { pname = "iso3166-country-codes"; version = "0.20140203.8"; - sha256 = "b4d6e01cd61bcaef9a8e455c331a8e7a2298531cb587ef6f23675eae7a6b0a36"; + sha256 = "0dhaddxawpk74dpyz1xm3i9rh8ksiqd36p25isdfzjhvsqff1mml"; + revision = "1"; + editedCabalFile = "0n01pmvkqi0w9l203i1v7kb6bb867plv4h5hmzlkpnhrf5abf0zf"; libraryHaskellDepends = [ base ]; description = "A datatype for ISO 3166 country codes"; license = "LGPL"; @@ -105364,7 +112257,7 @@ self: { mkDerivation { pname = "iso639"; version = "0.1.0.3"; - sha256 = "124b8322fabaedb4de3dbc39880b36d0eab0e28d5775954aadb6630bc0da25e8"; + sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/HugoDaniel/iso639"; description = "ISO-639-1 language codes"; @@ -105378,7 +112271,7 @@ self: { mkDerivation { pname = "iso8583-bitmaps"; version = "0.1.0.0"; - sha256 = "0dff97867871024dd86f0cae1211918dc09e052009ff55f72fe9057f9f47d570"; + sha256 = "0w6m8ygpy1g95zvmbzq9402rxh4dj48i5bhcdzc4s0kig239gzqd"; libraryHaskellDepends = [ base binary bytestring containers parsec syb template-haskell th-lift @@ -105393,7 +112286,7 @@ self: { mkDerivation { pname = "iso8601-time"; version = "0.1.4"; - sha256 = "761d737ea0841ee8fd3660cfe20041e9458be8ab424de8b3b661bb249b930126"; + sha256 = "09h1jfdj9fv1nsryhka2mgl8nig9840f5kv06vyyh7l4l1z767bn"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit time ]; homepage = "https://github.com/nh2/iso8601-time"; @@ -105409,7 +112302,7 @@ self: { mkDerivation { pname = "isobmff-builder"; version = "0.11.3.0"; - sha256 = "578e440f473427c7e413075de294830118a49e8043c8be75a6db9c158c5c7f42"; + sha256 = "0hkzbj61b76vlrsvxj23h2ga8601hfaf4p872gjcf9rl8w7l93jp"; libraryHaskellDepends = [ base bytestring data-default mtl pretty-types singletons tagged template-haskell text time type-list type-spec vector @@ -105434,7 +112327,7 @@ self: { mkDerivation { pname = "isohunt"; version = "0.1.3"; - sha256 = "fc1ac52fa488271661019a1decbd503f9adea7b93e7e4008c413e4fa59af2da1"; + sha256 = "189dmxczmr0kqh440ziyp6kxx6iza2yyq7cs05hic9w8lhpwa6pw"; libraryHaskellDepends = [ aeson base bytestring data-default ghc-prim http-conduit text unordered-containers uri vector @@ -105451,8 +112344,28 @@ self: { }: mkDerivation { pname = "isotope"; - version = "0.3.3.0"; - sha256 = "e08fac7483c11f37786f5f98f6f7d1e58a456d1470c3f0f35bc9326e88c1fa2e"; + version = "0.4.0.0"; + sha256 = "19wy290r1n7xkpr3qpw4samgbrnpdv5iljfx3cspix27gfmw0384"; + libraryHaskellDepends = [ + base containers megaparsec template-haskell th-lift + ]; + testHaskellDepends = [ + base containers hspec megaparsec QuickCheck + ]; + homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md"; + description = "Isotopic masses and relative abundances"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "isotope_0_5_0_1" = callPackage + ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck + , template-haskell, th-lift + }: + mkDerivation { + pname = "isotope"; + version = "0.5.0.1"; + sha256 = "0mpbyr6qv7pmabry8wp1cby8zyc44sigl8fvsav32ac7g311k9pa"; libraryHaskellDepends = [ base containers megaparsec template-haskell th-lift ]; @@ -105470,7 +112383,7 @@ self: { mkDerivation { pname = "ispositive"; version = "0.2"; - sha256 = "05803c16d6ff6ce25a4d31a3693dd40724e2b71e1f6dc7f75d32311fac10db56"; + sha256 = "0mnv22n1yc9jbpvwfv8z3svy4907shynk8ri9mdf4v7zsqb3r005"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Positive integers test"; @@ -105484,7 +112397,7 @@ self: { mkDerivation { pname = "itanium-abi"; version = "0.1.0.0"; - sha256 = "937395ed097f0dcc6b7c958a4b115f819e4b244a783f759c90774a896a8cdca7"; + sha256 = "19ywiim8jjkpj2f7agvq98j4p7l1bw8lp2lmgimwq3bz17nrawwk"; libraryHaskellDepends = [ base boomerang text transformers unordered-containers ]; @@ -105503,7 +112416,7 @@ self: { mkDerivation { pname = "itemfield"; version = "1.2.5.0"; - sha256 = "161eaf7aba4d4b25db8e3095e579cbc486f39a5c335c5bd9711e996f58912f11"; + sha256 = "049gj5c6z68yf7cmnp1kbjdg71n4rdwyb59hivdjajsdp9xay7hn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105530,7 +112443,7 @@ self: { mkDerivation { pname = "iter-stats"; version = "0.1.0.4"; - sha256 = "e1600f0cea9d7e288fe01e7fecb2a024def5cef4713eacaeb33e85a16fefdbdd"; + sha256 = "1pfvxxps319ynfpaqgkiyk7gbpi4l2rfqzqyw27jhzlxx860yq71"; libraryHaskellDepends = [ base heap iteratee ListLike mtl ]; testHaskellDepends = [ base heap HUnit iteratee ListLike mtl statistics test-framework @@ -105550,7 +112463,7 @@ self: { mkDerivation { pname = "iterIO"; version = "0.2.2"; - sha256 = "f593ffddc77eff88026a4b0f0c1bc1496c9113d11f02fdfe4c3511413f570033"; + sha256 = "0cq0awzl249m9kzgs0hzs49r2v29q4dhq3sbd818izvyqzfzz4zm"; libraryHaskellDepends = [ array attoparsec base bytestring containers filepath HsOpenSSL ListLike mtl network old-locale process stringsearch time unix @@ -105567,7 +112480,7 @@ self: { mkDerivation { pname = "iterable"; version = "3.0"; - sha256 = "6cd13d621144e937cc88acfed1663bd2e208dcbe54be4bad1f7b7279250a87a4"; + sha256 = "194718jpjwkv3ynlpgjlpvf0iqnj7dkd3zmci363gsa425i3vlbc"; libraryHaskellDepends = [ base mtl tagged template-haskell vector ]; @@ -105585,9 +112498,9 @@ self: { mkDerivation { pname = "iteratee"; version = "0.8.9.6"; - sha256 = "3760121c55677da5fef1b2d8e876f3b272d18e9ad5b3d1e8db5971b4307685f9"; + sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p"; revision = "1"; - editedCabalFile = "e1131efd9c4dd62fa28d403381c498e652294254687b985fc6d26f5a9c7065d9"; + editedCabalFile = "1nb5f2f5lvyjqrgrhyv8ai12jlp6k3282cs0ini2zmjdkkyiw4z1"; libraryHaskellDepends = [ base bytestring containers exceptions ListLike monad-control parallel transformers transformers-base unix @@ -105612,7 +112525,7 @@ self: { mkDerivation { pname = "iteratee-compress"; version = "0.3.3.1"; - sha256 = "84aa9b9992e17def07fc647109f8d5e83ac66491993bf31c47a85714dd1dbcc8"; + sha256 = "1j5w3pfi8mx88wfg6fwrj5jccfp8spw0jwb4zh3yyzg1jacrpal4"; libraryHaskellDepends = [ base bytestring iteratee mtl ]; librarySystemDepends = [ bzip2 zlib ]; description = "Enumeratees for compressing and decompressing streams"; @@ -105627,7 +112540,7 @@ self: { mkDerivation { pname = "iteratee-mtl"; version = "0.5.0.0"; - sha256 = "008a7dfc38986daf8b164472dd739b8185b5564246858450d093b04753056e28"; + sha256 = "0a3f0m9lgc4ks18891a689bbb1c1kdrxswj42s5syvcq73y7v2h0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105646,7 +112559,7 @@ self: { mkDerivation { pname = "iteratee-parsec"; version = "0.0.6"; - sha256 = "4898ffe9ca9a33233b1eeb0d14c4e21d2bf7daf746eb260dbc0e087a07764ee9"; + sha256 = "1saffq3pl20fph6jdss6yzdgfaqxwb2183gb3qxj6cwsrblzz628"; libraryHaskellDepends = [ base iteratee ListLike parsec reference transformers ]; @@ -105660,7 +112573,7 @@ self: { mkDerivation { pname = "iteratee-stm"; version = "0.1.2"; - sha256 = "1d5c127f686f832ce9dff0f55981a242fc9132e6faea1c4ea97bb20332bc26a4"; + sha256 = "1916phr07ckvm571rspswqr93z22la0mkxghvzljr0vgd1zi4p0x"; libraryHaskellDepends = [ base iteratee stm stm-chans transformers ]; @@ -105677,7 +112590,7 @@ self: { mkDerivation { pname = "iterio-server"; version = "0.3"; - sha256 = "1630137d7c0902045fc32e686a6234653a7669ca10566d57cbd10c108d2fe0fb"; + sha256 = "1yz05y6i036irdbnsmhhr9lpcfk56ii6ls1fqdgh80h9giyi6c0n"; libraryHaskellDepends = [ base bytestring filepath iterIO ListLike monadIO mtl network split transformers unix @@ -105693,7 +112606,7 @@ self: { mkDerivation { pname = "ivar-simple"; version = "0.3.2"; - sha256 = "1cc082416e63598212cba91aa14199732e70a05a9c3d512230119ac866b3a752"; + sha256 = "0lm7ndkci6hi60i52gcwbah70bkkk50s26m9rc984nb3dr0q5h0w"; libraryHaskellDepends = [ base ]; description = "Write once concurrency primitives"; license = stdenv.lib.licenses.mit; @@ -105706,9 +112619,9 @@ self: { mkDerivation { pname = "ivor"; version = "0.1.14.1"; - sha256 = "90f91a08095f7bd37615bec3108a3f2a1d7783193924b3b78659f3dba79b3e65"; + sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych"; revision = "1"; - editedCabalFile = "32900700e14c90c9c9aad7d7790c36540bad4c7a4af16cfdc1c16c6289902635"; + editedCabalFile = "0d96j24n4v61q7ynrwaag96as2sl6q67kmypmb4wk42cw400g41j"; libraryHaskellDepends = [ base binary containers directory haskell98 mtl parsec ]; @@ -105725,10 +112638,8 @@ self: { }: mkDerivation { pname = "ivory"; - version = "0.1.0.5"; - sha256 = "437d5bc2fa69037e6fa5beb7d0a7b27f4d7e92404531b698be5a84946294a158"; - revision = "1"; - editedCabalFile = "0fa37aeb8c009a31030e0fe7fbb278907c41909c0f06d74b9942adbf58fc446f"; + version = "0.1.0.6"; + sha256 = "13akncp29sqidkqxfbv6k2gadipdzvnk6svgwm1p29xr5wxfizca"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-lift @@ -105747,7 +112658,7 @@ self: { mkDerivation { pname = "ivory-artifact"; version = "0.1.0.5"; - sha256 = "7a2bac5f9abebc2edbad78b010056a6a75722681ec0c636951bc044774ee7934"; + sha256 = "0d3rxrs4f15wa5ln637ch4k74xbad82i1c3qmpdjxg5yk9gsqavs"; libraryHaskellDepends = [ base directory filepath HStringTemplate text utf8-string ]; @@ -105765,9 +112676,9 @@ self: { mkDerivation { pname = "ivory-backend-c"; version = "0.1.0.5"; - sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535"; - revision = "1"; - editedCabalFile = "d628f3ab8d4d61816af6f9ff9fb34bf8cbcf28d2ff75246aa86303a59c457d1a"; + sha256 = "0dg5408il1s9z1v69k8vw80ypmkbanvqfsw8a5gi8l3b9xinjzg0"; + revision = "3"; + editedCabalFile = "09r09jbbj6a3qm07gj64pbszs72kpvab0320flg6rq9ng2pswv49"; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib @@ -105786,7 +112697,7 @@ self: { mkDerivation { pname = "ivory-bitdata"; version = "0.2.0.0"; - sha256 = "a386f786f49c444beaa033ca82850eaa2e0a8e0b2886c35af458648c5257180f"; + sha256 = "03qqax98qr2qyidc71i81f70lbma1s2q5jikl3m4ni4wyj3gg1m3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105806,7 +112717,7 @@ self: { mkDerivation { pname = "ivory-eval"; version = "0.1.0.5"; - sha256 = "059811a8cfe1f77c4bb5c21690999a3a1544dd30fd56f89d7957c71e5534f662"; + sha256 = "0qpn6iaixispg6fzhmpx63fl859skacr05n2nm5prxz1ryl13605"; libraryHaskellDepends = [ base base-compat containers ivory monadLib ]; @@ -105827,9 +112738,9 @@ self: { mkDerivation { pname = "ivory-examples"; version = "0.1.0.5"; - sha256 = "539b65b7068f7dbcb128401ac4ec8c08ee2a0db074087cd923bbf38daf530356"; + sha256 = "0mh3afpqvwxv4gcpq23ln06jmvh8iknc86j052qvqzcg0svnb6sk"; revision = "1"; - editedCabalFile = "a83f6151b08ade845ef527ad07fcee41ac20bc02ba02fc8ee3786c278685da39"; + editedCabalFile = "0ffshn32fv3qwf7gq0ms0ay21b21xvy0gb97ymg89plan18n2gx8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105847,7 +112758,7 @@ self: { mkDerivation { pname = "ivory-hw"; version = "0.1.0.5"; - sha256 = "9379da7f7e30587f79d8de501725d9c8b0eeb7105db2362a5889d82163ca4140"; + sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck"; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory hardware model (STM32F4)"; @@ -105862,7 +112773,9 @@ self: { mkDerivation { pname = "ivory-opts"; version = "0.1.0.5"; - sha256 = "36bbf696b1f711885a2493233d09a304686572ff32d0e7e8f30c0a8ebc139340"; + sha256 = "0h4k2fy8w2hcyglfgl1jzxr6as04lc4ks8wk4id8h4gpn6bgdfrn"; + revision = "1"; + editedCabalFile = "1mn1jrpwzm1pcmw942i0kg0na56zagxsqcqs9y32j1xnlkgljkpn"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -105881,7 +112794,7 @@ self: { mkDerivation { pname = "ivory-quickcheck"; version = "0.2.0.5"; - sha256 = "9a93f90f18b2a9e508ef4f25d980cdb39e2ac3a11061878cbb9028c40fb953f0"; + sha256 = "1w2kp47w8a4hpf68fq8hl71jm7mkrn0dj9agxw4fbadj307zk4ws"; libraryHaskellDepends = [ base base-compat ivory ivory-backend-c ivory-eval monadLib QuickCheck random @@ -105903,7 +112816,7 @@ self: { mkDerivation { pname = "ivory-serialize"; version = "0.1.0.5"; - sha256 = "4ef3bcafba676e83cff6c4ede3b931124069d3baad87568e641cefccb2db1a9a"; + sha256 = "16hsvfrcrvqwcj75d1xdpb9njh0j66wy7vf4yv7q6vk7papvrwsf"; libraryHaskellDepends = [ base base-compat filepath ivory ivory-artifact monadLib ]; @@ -105917,7 +112830,7 @@ self: { mkDerivation { pname = "ivory-stdlib"; version = "0.1.0.5"; - sha256 = "af6ed58d447a770deb83c854c4a611bd0fee36efb59feb5afc0729ac8be7abe9"; + sha256 = "1sdbwy5sqa87zidfp7xmxwvfw3xx26kc8m68hgmhsxvs8j6xavmg"; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory standard library"; @@ -105932,7 +112845,7 @@ self: { mkDerivation { pname = "ivy-web"; version = "0.2"; - sha256 = "386c6babe87ee8fcaa2f1258b28e9ccb9d400d6d347119a3f4d80a01296a5c54"; + sha256 = "0m2wd8lh22nqyjiijw9ldl6l17fbkj7b4n0j5ymgrs3yx2mnnv1q"; libraryHaskellDepends = [ base invertible-syntax partial-isomorphisms snap snap-core ]; @@ -105947,7 +112860,7 @@ self: { mkDerivation { pname = "ix-shapable"; version = "0.1.0"; - sha256 = "5007ffb6a8a7bb490f962cedceed5ceb7c435126d09bc565441070cbfda79222"; + sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh"; libraryHaskellDepends = [ array base ]; description = "Reshape multi-dimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -105958,7 +112871,7 @@ self: { mkDerivation { pname = "ixdopp"; version = "0.1.3"; - sha256 = "a4114a212e5110fc688435575dd9703e98f38030dfc07a091e630932ede776ee"; + sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base preprocessor-tools syb ]; @@ -105973,9 +112886,9 @@ self: { mkDerivation { pname = "ixmonad"; version = "0.57"; - sha256 = "f354ef7938e3e5d91dd0af3d422081ca78c396f0063f2dc97a864b73537718cd"; + sha256 = "1k8qfx9p6jw6gb4jsgq6y2bc6y6ah4h44gdgs0fxkrg371wyym7k"; revision = "1"; - editedCabalFile = "589fe683da9065a906b2f156d8335050fc9de4c1514a6582c88a0d12c3c68b18"; + editedCabalFile = "064bqv1i43car216ajjiq7j9vz2ha0rxhmpin83ajrchva1yd7sq"; libraryHaskellDepends = [ base ghc-prim ]; description = "Embeds effect systems into Haskell using parameteric effect monads"; license = stdenv.lib.licenses.bsd3; @@ -105989,7 +112902,7 @@ self: { mkDerivation { pname = "ixset"; version = "1.0.7"; - sha256 = "2f0e5a581b1d3c5e4685da8b109b2089177632fe8931ae68f5973fba687b42d1"; + sha256 = "1la2gdlblgwpymlawcc9zqr7c5w942di12yshm35wg0x3dc5l3ig"; libraryHaskellDepends = [ base containers safecopy syb syb-with-class template-haskell ]; @@ -106006,7 +112919,7 @@ self: { mkDerivation { pname = "ixset-typed"; version = "0.3.1"; - sha256 = "b41863c89610460d8bd0879cf77fd9b010f85f662c7edc4c57e79ab6cd00b575"; + sha256 = "0xdm036vd6p7ax6dqziccrgzh45hv5zzg747s25hsihhjv46665l"; libraryHaskellDepends = [ base containers deepseq safecopy syb template-haskell ]; @@ -106025,7 +112938,7 @@ self: { mkDerivation { pname = "iyql"; version = "0.0.7"; - sha256 = "040327633b0159de9abc2fb065fc2aa92a95db1c992daebd441ff154bf3c69c9"; + sha256 = "1jb97jzm9w8z8jyswbcr3kdraam95by6bc1gpjddwn817dijf0q4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -106045,7 +112958,7 @@ self: { mkDerivation { pname = "j2hs"; version = "0.99.1"; - sha256 = "62cdf7f209a2ddaaadf1a09e6dd68285c419f5f49eac52ce3b0cd0d4f32c9a3a"; + sha256 = "0fls5krx9l0c7g755b4yyksiki45hbb6v7m0y6nsmpd217rggkb2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -106063,7 +112976,7 @@ self: { mkDerivation { pname = "ja-base-extra"; version = "0.2.1.0"; - sha256 = "5575e318795d0c95c0cad7e291c50ea0bfccc06b4fe698eec0cad6a7be84a498"; + sha256 = "1654hjzagmnaq3p9irjgdg0crgx01v2r3qnprb09a32xg4cf6xam"; libraryHaskellDepends = [ base ]; description = "Extra functions I require in base"; license = stdenv.lib.licenses.bsd3; @@ -106076,7 +112989,7 @@ self: { mkDerivation { pname = "jack"; version = "0.7.1.1"; - sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40"; + sha256 = "0h3c62knq5hblsplgp25wm94hbv6id8c97wv8xgzbvalj4lmsyyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106094,7 +113007,7 @@ self: { mkDerivation { pname = "jack-bindings"; version = "0.1.1"; - sha256 = "75d5c41c64a876fc7da68126a1ef626d7d1039748b6b98816cfef3f32316bfbe"; + sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm"; libraryHaskellDepends = [ base mtl ]; libraryPkgconfigDepends = [ libjack2 ]; libraryToolDepends = [ c2hs ]; @@ -106108,7 +113021,7 @@ self: { mkDerivation { pname = "jackminimix"; version = "0.1"; - sha256 = "cdd9c064a88ec6a081ab7082f6827be4c9b2b3bdbb703c758dba0d57deabda0f"; + sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd"; libraryHaskellDepends = [ base hosc ]; homepage = "http://www.renickbell.net/doku.php?id=jackminimix"; description = "control JackMiniMix"; @@ -106121,7 +113034,7 @@ self: { mkDerivation { pname = "jacobi-roots"; version = "0.2.0.4"; - sha256 = "4cc6e6b6b4b644e21907c5563616873bd3d1ce98aed87418f514bc52a5e077ea"; + sha256 = "1skpw2jm5g0lylc79n5fk37d3lrvhwb3cmn50wcy4i5nnjvfdijc"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ghorn/jacobi-roots"; @@ -106137,7 +113050,7 @@ self: { mkDerivation { pname = "jail"; version = "0.0.1.1"; - sha256 = "7fef11e3918e90a797be20e4cbb9532da875c4e45363bf623885fd900b1fbf73"; + sha256 = "0wxz3w5r1zc571ibyqskwk27ba1dafwwpr10psbsg44fj7ii3vvz"; libraryHaskellDepends = [ base containers directory monads-fd transformers ]; @@ -106151,7 +113064,7 @@ self: { mkDerivation { pname = "jailbreak-cabal"; version = "1.3.2"; - sha256 = "212a8bbc3dfc748c4063282414a2726709d651322f3984c9989179d2352950f4"; + sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; @@ -106166,7 +113079,7 @@ self: { mkDerivation { pname = "jalaali"; version = "0.2.0"; - sha256 = "a01e8ade25f87e0c20c946b77be3a446e7ffa2870b601b001931ae837ef6b908"; + sha256 = "025ryrz87bii3401nq0bhyigzrs6lkippds6r4h0qzpq4pg8l7m0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base deepseq time ]; @@ -106184,7 +113097,7 @@ self: { mkDerivation { pname = "jalla"; version = "0.2.0.1"; - sha256 = "8050dd412323a369e57e7269f55e80862053f051673768e4f701699864705488"; + sha256 = "122lf1j9hs81yzj6hdv7a7q56846h1ggasbjgvjnk8r34d0xsl40"; libraryHaskellDepends = [ base base-orphans convertible mtl QuickCheck random ]; @@ -106208,7 +113121,7 @@ self: { mkDerivation { pname = "jammittools"; version = "0.5.3"; - sha256 = "2e6ab2632c50b2141ec9ab885db21f9ec8ad4d8499507d5f6a8ede49955764d1"; + sha256 = "1lb4ayalkplfd9gpsl4rhi6svj4y3yr5v25br4g19cjh5iiv4sif"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106222,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 @@ -106229,7 +113155,7 @@ self: { mkDerivation { pname = "jarfind"; version = "0.1.0.3"; - sha256 = "1c4c7301832195ff81ba2b255499a889958e333aebfaa889e323a30926c2dd31"; + sha256 = "0cfxq8k0k8r3wf4siypb78rqx5c9m2cm899bpa0zz591hc0p6k0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106243,6 +113169,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jarify" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, process + , regex-tdfa, temporary, text, zip-archive + }: + mkDerivation { + pname = "jarify"; + version = "1.0"; + sha256 = "0xlk07vcizp9rms5d28klidcf535ncffcx75rwixhvlii2qmyjn7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ + base bytestring directory filepath process regex-tdfa temporary + text zip-archive + ]; + doHaddock = false; + description = "Jarification of Haskell sources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jason" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, vector @@ -106250,7 +113197,7 @@ self: { mkDerivation { pname = "jason"; version = "0.1.0.1"; - sha256 = "a36a5f9cf93da0c03ede25407ce724c0b8f8e13285074f8bea57e50ea4e49d04"; + sha256 = "014xwjj0xrapxa5ly1w56bhzif604kkpqh15vqzc181xz6f5ysm3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106269,7 +113216,7 @@ self: { mkDerivation { pname = "java-adt"; version = "0.2016.11.28"; - sha256 = "874de697e2bee902ba89b4527459eabbd8b6f6b3d63df1946ea22dfdad2092dc"; + sha256 = "1p4j42nzsbd2dsag2gfnngvbdn5vx9cp8lmli6x05sdywabyckc7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base pretty ]; @@ -106287,7 +113234,7 @@ self: { mkDerivation { pname = "java-bridge"; version = "0.20130606.3"; - sha256 = "a790433ec3b76103a9af94decac64923f08e3bb28f8852c31b3a0f5fac2cd59a"; + sha256 = "16nm5jn5y3rs3g1m524gn8xqxw13973cmpllmylh6qdpqcz47457"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106308,7 +113255,7 @@ self: { mkDerivation { pname = "java-bridge-extras"; version = "0.99"; - sha256 = "fbc357580cb8ff22a98d0294e5e1f15dbec38c594b3178e3594ad35e20a85d72"; + sha256 = "0wjxm0h5xlsab7iphcabb66c7gjxy7hyb502inlj5zxq1ic5ghzv"; libraryHaskellDepends = [ base java-bridge transformers ]; description = "Utilities for working with the java-bridge package"; license = stdenv.lib.licenses.mit; @@ -106320,7 +113267,7 @@ self: { mkDerivation { pname = "java-character"; version = "0.0.4"; - sha256 = "c81c2044a1b3ad7ea14c2be8652f927fe02595b012bd86cfbd4365554baa48d7"; + sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768"; libraryHaskellDepends = [ base diet ]; homepage = "https://github.com/tonymorris/java-character"; description = "Functions to simulate Java's Character class"; @@ -106332,7 +113279,7 @@ self: { mkDerivation { pname = "java-poker"; version = "0.1.2.0"; - sha256 = "031e0b69cb30ac98acfc59b067ccc73fdda6b2abe446f3fc501c56593e83c213"; + sha256 = "04y2hcz5jmhwa3yg6ip4mfradp9zqz66gc2rzjn9ib1hrdlhn7h3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random-shuffle ]; @@ -106347,7 +113294,7 @@ self: { mkDerivation { pname = "java-reflect"; version = "0.99"; - sha256 = "8c0f0b24318054a73317aef3262791b11652b34f23f8288dd6104386d8c0aeed"; + sha256 = "1vdfq3c8chqhss6jiy139yrm45mij4kjdwxf2wrsfm4064j0n3wc"; libraryHaskellDepends = [ base containers hx java-bridge ]; description = "Tools for reflecting on Java classes"; license = stdenv.lib.licenses.mit; @@ -106362,7 +113309,7 @@ self: { mkDerivation { pname = "javaclass"; version = "0.0.1"; - sha256 = "d449613b21b5d124c9bbde4ba2354af57122f5364c29fc188371b39a64d164f5"; + sha256 = "1xb4s5j9mcvihccgqaac6vsj4wgm98ss4jyypg4j9ldm44xn2jfl"; libraryHaskellDepends = [ base bytestring greplicate lens semigroupoids semigroups tagged tickle @@ -106377,12 +113324,17 @@ self: { }) {}; "javascript-extras" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: mkDerivation { pname = "javascript-extras"; - version = "0.1.0.0"; - sha256 = "cf74b6c2be87ee5bc96b5ff47335a8eb2d879d7ec83bf6c83be609293f40f4be"; - libraryHaskellDepends = [ base ]; + version = "0.3.1.0"; + sha256 = "05y7343ybgbaydckgssb22c789bawvk6x95vbrarzf3m5brlgw7a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq ghcjs-base-stub parallel text + ]; + executableHaskellDepends = [ base ghcjs-base-stub ]; homepage = "https://github.com/louispan/javascript-extras#readme"; description = "Extra javascript functions when using GHCJS"; license = stdenv.lib.licenses.bsd3; @@ -106395,7 +113347,7 @@ self: { mkDerivation { pname = "javasf"; version = "0.1.0"; - sha256 = "fca40ac4eb55211840d8d059e571000420e9e2a4f9605fae838e5ed8328a1a4d"; + sha256 = "0k8si8rdhplfhfp5yq7rlkifj80401qyanfhv101h8amxg20m97w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -106415,7 +113367,7 @@ self: { mkDerivation { pname = "javav"; version = "0.1.1"; - sha256 = "ad143ee98872c2856fe8af2a7909a8e6c7c8fadfa93ec4253a54a61a5fbaf0cf"; + sha256 = "1kzhp9gim9jl78jw8gm9vzxciiz6m04pjamgx1pqbhkji3lkw55d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -106435,7 +113387,7 @@ self: { mkDerivation { pname = "jcdecaux-vls"; version = "0.1.0"; - sha256 = "1ac9e98c45802d28f680a79703ae668e40b97e71dd8aa1696cb5a7708daf5985"; + sha256 = "11army6p19xmdils32nxf5zbjh4fcsp075x7h3v2hbc08n6fkj8s"; libraryHaskellDepends = [ aeson base bytestring http-conduit text transformers ]; @@ -106452,7 +113404,7 @@ self: { mkDerivation { pname = "jdi"; version = "0.0.3"; - sha256 = "cbb26b34123df1018e12120603fe568a61bd1a4158971272a4673c6fd78ff6cb"; + sha256 = "1jznizbnyg37lir155sq84dbsqcaavz061hj2a703w9x28s6pcnb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106467,24 +113419,51 @@ self: { "jenga" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , http-conduit, http-types, text + , http-conduit, http-types, optparse-applicative, text, yaml }: mkDerivation { pname = "jenga"; - version = "0.1.0.0"; - sha256 = "4468d8a1c55009b146b8294ab9ed677b5c7a5e3d0fbae1825a5aebcd509412d0"; + version = "0.1.1.0"; + sha256 = "0a8njzqrjkq47shbczbhpl2k0raff71zyff8gr1zj58piwadaf8k"; + revision = "1"; + editedCabalFile = "01764pa86dbll242ky92spzvy71qc6bv4y97m9f6m41agw1ha4b4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers http-conduit http-types text + yaml ]; - executableHaskellDepends = [ base text ]; + executableHaskellDepends = [ base optparse-applicative text ]; homepage = "https://github.com/erikd/jenga"; description = "Generate a cabal freeze file from a stack.yaml"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jenkinsPlugins2nix" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bimap + , bytestring, containers, cryptohash, hnix, http-conduit, mtl + , optparse-applicative, tasty-hspec, text, zip-archive + }: + mkDerivation { + pname = "jenkinsPlugins2nix"; + version = "0.2.0.2"; + sha256 = "04ddcri3rwszxjl65c5kha6lkrf3w89gfri2cdghdq0znl51hvf5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base bytestring containers cryptohash + hnix http-conduit mtl text zip-archive + ]; + executableHaskellDepends = [ + ansi-wl-pprint base bimap optparse-applicative text + ]; + testHaskellDepends = [ base containers tasty-hspec text ]; + homepage = "https://github.com/Fuuzetsu/jenkinsPlugins2nix#readme"; + description = "Generate nix for Jenkins plugins"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jespresso" = callPackage ({ mkDerivation, arrows, base, bytestring, cmdargs , data-default-class, data-default-instances-base, Diff, directory @@ -106495,7 +113474,7 @@ self: { mkDerivation { pname = "jespresso"; version = "1.0.2"; - sha256 = "cd5e20c7c41ae3fb72552c0416256a509fdb10a3998f9437fcdbf48430176a72"; + sha256 = "0wka2wq89x6vzhvr93wrlc8dp7shd8jic11camrgpqqsqk3j0pnd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106525,7 +113504,7 @@ self: { mkDerivation { pname = "jmacro"; version = "0.6.14"; - sha256 = "acb9411ab79f192a4ae0cd67cb45abbacef19c7a59d3199db36348b015df9920"; + sha256 = "084rvwav0j33nffiklsrgafg3kmsmd2wnrydw152l6cznwd43fdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106550,7 +113529,7 @@ self: { mkDerivation { pname = "jmacro-rpc"; version = "0.3.2"; - sha256 = "a32f53b97bc84e79834df4c4630745c6b07ae46b45bc2ca2d43d91a38571c5d9"; + sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring containers contravariant jmacro mtl scientific split text unordered-containers @@ -106568,7 +113547,7 @@ self: { mkDerivation { pname = "jmacro-rpc-happstack"; version = "0.3.2"; - sha256 = "99cdee3c1a5bd4499acf8decb2e76af48e7da7ccba01d51b86f65ea92944b064"; + sha256 = "0r5h8hlsjppnhqdxa0dsrjkpv3pldbkv5v4dryd4km2v38yfxkcr"; libraryHaskellDepends = [ aeson base blaze-html bytestring containers happstack-server jmacro jmacro-rpc mtl @@ -106585,7 +113564,7 @@ self: { mkDerivation { pname = "jmacro-rpc-snap"; version = "0.3"; - sha256 = "48aea4a4ba90532ca105b6b274060a47a1c509b8346e0db1b61365c2a9e8dfeb"; + sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8"; libraryHaskellDepends = [ aeson base bytestring containers jmacro jmacro-rpc mtl snap-core ]; @@ -106601,7 +113580,7 @@ self: { mkDerivation { pname = "jni"; version = "0.2.3"; - sha256 = "ba48cfc823de07255421301a02248043bccaf8201d1bc6a7956b86f6c972c904"; + sha256 = "0169fb4zd1kbjnkwc6qx43wcmg23h0j046ih45a2a1yy4g4cyj5s"; libraryHaskellDepends = [ base bytestring containers inline-c singletons thread-local-storage ]; @@ -106612,14 +113591,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) jdk;}; - "jni_0_3_0" = callPackage + "jni_0_3_1" = callPackage ({ mkDerivation, base, bytestring, choice, containers, cpphs , inline-c, jdk, singletons, thread-local-storage }: mkDerivation { pname = "jni"; - version = "0.3.0"; - sha256 = "1d92d232180f5ebcb4e6017febc5f7b5320ccc49bcbc3787c62eb94195a60e08"; + version = "0.3.1"; + sha256 = "00acvi2yz2f61xqbck4k2zi87s7zx99z551zwi4llmaqlnz16ipd"; libraryHaskellDepends = [ base bytestring choice containers inline-c singletons thread-local-storage @@ -106642,7 +113621,7 @@ self: { mkDerivation { pname = "jobqueue"; version = "0.1.6"; - sha256 = "e960c4f3320336d998ada5df27f356a93e89ac5402a5fe75d0c56ef8355dd595"; + sha256 = "15fmblszhvn5s1szx982ajn8jgm9avrjgpx5mncdjdh36brw8q79"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers data-default fast-logger HDBC HDBC-sqlite3 hslogger hzk lifted-base @@ -106664,7 +113643,7 @@ self: { mkDerivation { pname = "join"; version = "0.4"; - sha256 = "1d2379c651afbcddf93a5ed8e8fbe91a853f8404f4f2fe3018ff7008db66a92f"; + sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx"; libraryHaskellDepends = [ base haskell98 multisetrewrite stm ]; homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html"; description = "Parallel Join Patterns with Guards and Propagation"; @@ -106672,12 +113651,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "join-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, lens, text, url, wreq }: + mkDerivation { + pname = "join-api"; + version = "0.0.0.0"; + sha256 = "17jncdby098hdap21yx4m827x9y6by62khzyb6bglb28sq0yskqh"; + libraryHaskellDepends = [ + aeson base bytestring lens text url wreq + ]; + homepage = "https://github.com/cotrone/join-api#readme"; + description = "Bindings for Join push notifications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "joinlist" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "joinlist"; version = "0.3.0"; - sha256 = "656cfe066805002043d6e82435c3758fb453279361a56d920987c045bdf75442"; + sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35"; libraryHaskellDepends = [ base ]; homepage = "http://code.google.com/p/copperbox/"; description = "Join list - symmetric list type"; @@ -106692,7 +113685,7 @@ self: { mkDerivation { pname = "jonathanscard"; version = "0.1.1"; - sha256 = "e8955d5c093ffd98e16889ecfd5ecfce9799eef64042ea6837d457c55b2d8d7f"; + sha256 = "0zwd5mdwamyl6xlflhj0yvp9k5yfrxggvv49d3hriz9z15f5v5g8"; libraryHaskellDepends = [ base bytestring containers HTTP json mtl network old-locale time ]; @@ -106707,7 +113700,7 @@ self: { mkDerivation { pname = "jort"; version = "1.0.0"; - sha256 = "a389558e0b2d93b1752ed6fe5c457e5890aa03ae4257ec7725d66f822fca36b0"; + sha256 = "1c1nr8pq4vyn4mvyqms2mq1sm42qgr2mrznn5rsv34rd1f75b2d3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base gtk ]; @@ -106725,8 +113718,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.5.0.2"; - sha256 = "25958a11561f56363bb7dcdcd1ebbc97bf231ee68ed393b117c90fff0cf07abc"; + version = "0.5.0.4"; + sha256 = "164cgpz7a9yyd861y43ljw7wkjajvp7ylli4j2qyq4947v7ibxg9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106748,6 +113741,39 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "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, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + 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 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 semigroups tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + homepage = "https://github.com/frasertweedale/hs-jose"; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -106755,8 +113781,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.7.5"; - sha256 = "53e3e9441b7d6d987920749edd61ab15e6e526856822e7d6c27cab302eedcdea"; + version = "0.7.6"; + sha256 = "0kf9v9l1v7ixwpjaq1vc7lrg2669zddvsq8394yhxsgdyyrsi82a"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite either memory mtl text time unordered-containers vector @@ -106777,7 +113803,7 @@ self: { mkDerivation { pname = "jpeg"; version = "0.0.1.1"; - sha256 = "1d27b81dc995ddbd579e4a55dbc6795fa25014afff13c57df4eefe20f255cec2"; + sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx"; libraryHaskellDepends = [ base mtl ]; description = "A library for decoding JPEG files written in pure Haskell"; license = stdenv.lib.licenses.bsd3; @@ -106788,7 +113814,7 @@ self: { mkDerivation { pname = "js-flot"; version = "0.8.3"; - sha256 = "1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a"; + sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; homepage = "https://github.com/ndmitchell/js-flot#readme"; @@ -106801,7 +113827,7 @@ self: { mkDerivation { pname = "js-good-parts"; version = "0.0.7"; - sha256 = "e54cf3774b5f91bf47f84ce6162fc1739112dddae7c80c4d1b4a4488681f7944"; + sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75"; libraryHaskellDepends = [ base wl-pprint ]; homepage = "https://github.com/sseefried/js-good-parts.git"; description = "Javascript: The Good Parts -- AST & Pretty Printer"; @@ -106814,7 +113840,7 @@ self: { mkDerivation { pname = "js-jquery"; version = "3.1.1"; - sha256 = "d72f67d72bd71d675bcdc75dd280c4a27d90784eb51c661a3da567e0186f2a04"; + sha256 = "011adwcf0rx57ld6c75m9rw90zd2qj0d4pf7rmdnf7fp5gbnfbyp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; doCheck = false; @@ -106823,34 +113849,65 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "js-jquery_3_2_1" = callPackage + ({ mkDerivation, base, HTTP }: + mkDerivation { + pname = "js-jquery"; + version = "3.2.1"; + sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HTTP ]; + doCheck = false; + homepage = "https://github.com/ndmitchell/js-jquery#readme"; + description = "Obtain minified jQuery code"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "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, vector + , lens, primitive, process, random, ref-tf, scientific, stm, text + , time, transformers, unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.8.0.1"; - sha256 = "de68f74a6a546b91ce0a1a74512db7d1a7a583a4455d0de5ef9d300cf179cb3b"; + 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 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsaddle-clib" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, jsaddle + , text + }: + mkDerivation { + pname = "jsaddle-clib"; + version = "0.9.0.0"; + sha256 = "10ycmp3pnkh18d8xv44gj392h7xzfmnyl0qkfv0qx0p7pn9vn6zz"; + libraryHaskellDepends = [ + aeson base bytestring data-default jsaddle text + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsaddle-dom" = callPackage ({ mkDerivation, base, base-compat, jsaddle, lens, text , transformers }: mkDerivation { pname = "jsaddle-dom"; - version = "0.7.1.0"; - sha256 = "e93ea7dccd9aa640226a162fb6674b0c71c7acebf0ce9b85d76b0d388f06d53a"; + version = "0.9.1.0"; + sha256 = "16dgcdj1x58gpkqvz434f0ysyhwpy1dwqxs6bd24875n1hxjim77"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -106864,7 +113921,7 @@ self: { mkDerivation { pname = "jsaddle-hello"; version = "2.0.0.0"; - sha256 = "941a047559384486151b6a1ec58a4cb5ad8663c636f2de9a70b739f52eeac0ae"; + sha256 = "1bn0x8pgafdpf2ddxwinqriqdbdm9j5ca7ka3caqci1qb5sh86ll"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base jsaddle lens text ]; @@ -106876,21 +113933,24 @@ self: { "jsaddle-warp" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive - , process, QuickCheck, ref-tf, stm, text, time, transformers, wai - , wai-websockets, warp, websockets + , doctest, filepath, foreign-store, ghc-prim, http-types, jsaddle + , lens, network, primitive, process, QuickCheck, ref-tf, stm, text + , time, transformers, wai, wai-websockets, warp, webdriver + , websockets }: mkDerivation { pname = "jsaddle-warp"; - version = "0.8.2.0"; - sha256 = "e9616e7bedb12c1b37ab1e82c065d7b6de6f341ec4cb01748e623a583c834f11"; + version = "0.9.3.0"; + sha256 = "0lcwg3lgh6bah8zqjzk7hfy8pcjhjlq5a22y83332qn4ms9hfw8l"; libraryHaskellDepends = [ - aeson base containers http-types jsaddle stm text time transformers - wai wai-websockets warp websockets + aeson base bytestring containers foreign-store http-types jsaddle + stm text time transformers wai wai-websockets warp websockets ]; testHaskellDepends = [ - base bytestring deepseq doctest filepath ghc-prim jsaddle lens - primitive process QuickCheck ref-tf + aeson base bytestring containers deepseq doctest filepath ghc-prim + http-types jsaddle lens network primitive process QuickCheck ref-tf + stm text time transformers wai wai-websockets warp webdriver + websockets ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -106904,8 +113964,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.8.2.2"; - sha256 = "d9444c5ec1ef4abe74410beddf8a892f97d98d836501dd05169c962a3e108353"; + version = "0.9.0.0"; + sha256 = "1qrrvfr9ha5v43940ppdf3ngrig1s324482aaxsnpj2s7jxmqsa6"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix @@ -106923,8 +113983,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkitgtk"; - version = "0.8.2.2"; - sha256 = "ef64f87f898566ff786ef6632800f0c0700b78137e65250e313c67683bb3d457"; + version = "0.9.0.0"; + sha256 = "036k7ni5ki1p6f3hxkzyq2nskqxjbdg4kp9j5r2jzphp1cr8r9li"; libraryHaskellDepends = [ aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore gi-webkit haskell-gi-base jsaddle text unix @@ -106936,12 +113996,16 @@ self: { }) {}; "jsaddle-wkwebview" = callPackage - ({ mkDerivation, aeson, base, bytestring, jsaddle }: + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , jsaddle + }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.8.2.0"; - sha256 = "aa7968119b68ed7166482f2bfb217e942fbd2ead932fc2f349894fa149d2dfb6"; - libraryHaskellDepends = [ aeson base bytestring jsaddle ]; + version = "0.9.0.0"; + sha256 = "1yy7m60h6kcqb97qwhrh3kbxrz981njff2f23x1axfrb2jc3mby4"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default jsaddle + ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -106954,7 +114018,7 @@ self: { mkDerivation { pname = "jsc"; version = "0.1.1.1"; - sha256 = "ec23fb15e81a8a5d48974a753a3db81f56d9a3420f804ecf7e643bbd99bdbba2"; + sha256 = "18mvpncvsfv4gv7lx00g8aixjmhzp0yklxaajx45v2hsx0azn8zc"; libraryHaskellDepends = [ base jmacro lens template-haskell text transformers webkitgtk3 webkitgtk3-javascriptcore @@ -106969,7 +114033,7 @@ self: { mkDerivation { pname = "jsmw"; version = "0.1"; - sha256 = "f87901fc858e38c5c13f4870196cf511b365f869dedb678aa5f80050a0e066e4"; + sha256 = "1r36w2h5007qln56gnyyd7w6bcqiymn1jw287z0waf4fhpy02ygq"; libraryHaskellDepends = [ base DOM mtl WebBits ]; description = "Javascript Monadic Writer base package"; license = stdenv.lib.licenses.bsd3; @@ -106983,7 +114047,7 @@ self: { mkDerivation { pname = "json"; version = "0.9.1"; - sha256 = "96b57e4d167e45dc80aeff872a922ae9cdb953a1ded29ebbb51019b68f0085a2"; + sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn"; libraryHaskellDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -106999,7 +114063,7 @@ self: { mkDerivation { pname = "json-api"; version = "0.1.1.2"; - sha256 = "b5bab272ea259c5868d65ab1dbb2967c557219c95fe8aef7d6cd7cd6e8075d24"; + sha256 = "092x0zldcz6dsvvsxs2zr4cp4mbwjsrdpcassrl5i715x9rb5fmm"; libraryHaskellDepends = [ aeson base containers data-default lens lens-aeson text unordered-containers url @@ -107021,7 +114085,7 @@ self: { mkDerivation { pname = "json-assertions"; version = "1.0.9"; - sha256 = "5a046e3559638d902adbf01d8ba99c3e3aef01e4c1ee26b5701ebdcd7a0f980b"; + sha256 = "02wq1xxcvg8yf2sjdvn1wh0yyfiykjlqn7ghvcm913b3b4snw12s"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -107037,8 +114101,8 @@ self: { }: mkDerivation { pname = "json-ast"; - version = "0.3"; - sha256 = "877c8fde915cae37aa24a3d1c98dab75a81aa00a86aa7077b766ab5033c516b9"; + version = "0.3.1"; + sha256 = "1fn41v8k1lac6mavxjxxd9dwcbkkhvwjhqikhkv94jmd75qpdz8j"; libraryHaskellDepends = [ base scientific text unordered-containers vector ]; @@ -107054,8 +114118,8 @@ self: { }: mkDerivation { pname = "json-ast-json-encoder"; - version = "0.1"; - sha256 = "c0e75b796effda6b295d21c2ea99f992425f7085a07513b95c9943377eb87233"; + version = "0.1.1"; + sha256 = "0jjig4qg8d4wmnhr3r5ijl1z3hv0vnhk0rfjnw2i0j7nx68fc6di"; libraryHaskellDepends = [ base-prelude contravariant contravariant-extras json-ast json-encoder scientific text unordered-containers vector @@ -107071,7 +114135,7 @@ self: { mkDerivation { pname = "json-ast-quickcheck"; version = "0.2"; - sha256 = "41a6cab47756614727427311c08326ae960d7b88c21a5c9c5910f29a66e6cd04"; + sha256 = "016dwrk9mwhhb6f5q6n2i1xhv5mf4s1w04bk88klfqanfyscm9j1"; libraryHaskellDepends = [ base json-ast QuickCheck quickcheck-instances ]; @@ -107090,7 +114154,7 @@ self: { mkDerivation { pname = "json-autotype"; version = "1.0.15"; - sha256 = "4552e903a49953d48a5f60fb8532b51c40f3061c39cc842d6282ab42f6bbe045"; + sha256 = "0ig0pgv45aw2c8nq9k1r3h3g6h0wnlr8byv0by5d8lwrlh1yjlj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107121,7 +114185,7 @@ self: { mkDerivation { pname = "json-b"; version = "0.0.4"; - sha256 = "faa938a92e9bf15d6ec717cfbe96525275d8cded98967db083fb3bf7b8569b71"; + sha256 = "0wcvaswgffzvhfq7v5lqxp6xhxajaabbxkqpqxp5vwcv5slkiags"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107145,7 +114209,7 @@ self: { mkDerivation { pname = "json-builder"; version = "0.3"; - sha256 = "b5ef217d5432e8e962fac45f5a266993a0ea26d29c2580b93d0c9988d7480b4d"; + sha256 = "0k8b93bqi68c7nwq09cws8kfm84kd4k5lpy4z9ifks1jaiyj3vxm"; libraryHaskellDepends = [ base blaze-builder blaze-textual bytestring containers text unordered-containers utf8-string vector @@ -107162,7 +114226,7 @@ self: { mkDerivation { pname = "json-bytes-builder"; version = "0.5"; - sha256 = "b2c1114ef0a164fdf6b5c0899790fd5c91fa98b66b4a65475ba82829a5efa3ad"; + sha256 = "1bd3xyjjja58bd3najkbnscgm4awzn89g2f0npvgsr51y1713hdj"; libraryHaskellDepends = [ base base-prelude bytestring scientific semigroups text ]; @@ -107180,7 +114244,7 @@ self: { mkDerivation { pname = "json-encoder"; version = "0.1.8"; - sha256 = "812a1c1f5d03882f6022febd65ad14c1d0bcfbbb5e3b588e349b3e243e82973f"; + sha256 = "0gwph8z28glv6j75hfsypgxvrl612jnnbggy49h2z203blgiqal1"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras scientific semigroups text @@ -107198,7 +114262,7 @@ self: { mkDerivation { pname = "json-enumerator"; version = "0.0.1.2"; - sha256 = "2dd58e7a85c2b45f78767e21069b2b6597e848e6c6339b678670ef5b42cdfc21"; + sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d"; libraryHaskellDepends = [ base blaze-builder blaze-builder-enumerator bytestring containers enumerator json-types text transformers @@ -107216,7 +114280,7 @@ self: { mkDerivation { pname = "json-extra"; version = "0.2.0.0"; - sha256 = "f8d8c1721f148ff2c3ed02a55944804cf050fcec3587935a0e076fc61c608a93"; + sha256 = "14wac0fccvq71rd971rmxky51w2ch125k982xp1z53ql3xrc3n7q"; libraryHaskellDepends = [ aeson base bytestring data-default template-haskell unordered-containers yaml @@ -107227,6 +114291,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "json-feed" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "0.0.2"; + sha256 = "0ka8g2d3hn8z122k8r7gxs8m72s4ys46j6s2yc2ys045r1fhzlc1"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + homepage = "https://github.com/tfausak/json-feed#readme"; + description = "JSON Feed"; + license = stdenv.lib.licenses.mit; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -107235,7 +114319,7 @@ self: { mkDerivation { pname = "json-fu"; version = "0.1.1"; - sha256 = "4920e87a973b4ae700a7a5b5fb33006dd706057c6a440553e522e4174dd11725"; + sha256 = "098ps56igr12wm9hai3agh2hdmvd00rzpdd5lw0ffjivjxxfh829"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers hashable mtl syb text time unordered-containers vector @@ -107257,8 +114341,8 @@ self: { }: mkDerivation { pname = "json-incremental-decoder"; - version = "0.1.1"; - sha256 = "015c9e90dbb90ec08ebb2b5e8fbe5b4858defbeabc2f69b0b6aad1128208513d"; + version = "0.1.2"; + sha256 = "19nlcm83093qzl5yjvgyqmlq4rxc0dn6c666i60g4xa33r6dh7c2"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring ghc-prim hashable interspersed matcher monad-par scientific success supplemented text @@ -107279,7 +114363,7 @@ self: { mkDerivation { pname = "json-litobj"; version = "0.1.0.0"; - sha256 = "4ac4bd3cc6a559d48445577763497f24b0fdd748bab81d241c1392abd8a41ce6"; + sha256 = "1rhwlkcap4hk3hj1vf5s93bzvc14gx4n6xsp8n2d8nd5qqybvi2a"; libraryHaskellDepends = [ base json ]; testHaskellDepends = [ base hspec json QuickCheck ]; homepage = "https://github.com/jonathankochems/json-litobj"; @@ -107293,7 +114377,7 @@ self: { mkDerivation { pname = "json-pointer"; version = "0.1.2.1"; - sha256 = "00afa88ed665122abf33ebfabc35f46f10e977fa106bed71facfcfb5b591d1aa"; + sha256 = "1anij6svbkygz9qyssqhz9vyj43gyhsvrypb6fzjl4k5ss7aibq0"; libraryHaskellDepends = [ attoparsec base-prelude text ]; homepage = "https://github.com/sannsyn/json-pointer"; description = "JSON Pointer parsing and interpretation utilities"; @@ -107306,8 +114390,8 @@ self: { }: mkDerivation { pname = "json-pointer-aeson"; - version = "0.1.1"; - sha256 = "009a92279d7965bea1a8d57751cf27de1f1a30d5afb1e8f80a813b866eba03d1"; + version = "0.1.2"; + sha256 = "0ipqndmzqfc9n6g2xsjigd1a73cd1qhf9p2wb36mjyl5c2pqsa3x"; libraryHaskellDepends = [ aeson base-prelude json-pointer unordered-containers vector ]; @@ -107323,7 +114407,7 @@ self: { mkDerivation { pname = "json-pointer-hasql"; version = "0.1.1"; - sha256 = "f0626791ea35094e72eaabc2f5b9ea40ae8ace274129f16da8b36e26ce1016b9"; + sha256 = "1f8n2372cvmkm1nz2aa14z78mbj0xawzbhmbx9r4w29mxa8nfqph"; libraryHaskellDepends = [ base-prelude hasql json-pointer text ]; testHaskellDepends = [ aeson either hasql json-pointer rebase transformers @@ -107341,7 +114425,7 @@ self: { mkDerivation { pname = "json-python"; version = "0.4.0.1"; - sha256 = "c983c5781fd50cb44336d21e7d0e8619bd1e8aa131af43baa71d085c3765433d"; + sha256 = "0ga3clvmq20xlyx47bril651xg8rhq77s7nj6r1v836m3xwcb0y9"; libraryHaskellDepends = [ aeson base bytestring containers pureMD5 template-haskell ]; @@ -107358,9 +114442,9 @@ self: { mkDerivation { pname = "json-qq"; version = "0.4.1"; - sha256 = "a61e1dcd911f8f24b1ae050d7728a19170a06b426b68d6d3c053424922d8ee66"; + sha256 = "0rpfv0i4jhjkq39xcs3b89ms0w4il4l7f385msqj93qzj76is7m6"; revision = "1"; - editedCabalFile = "e070ffde0263105ed21f178ab669dcfeb9593302a2971b76d99bb0b5aac9f85b"; + editedCabalFile = "0nzqr6mbbc4vv5v1p5x208rmkfgyvilvd2hp3z95w4330bggyw70"; libraryHaskellDepends = [ base haskell-src-meta parsec template-haskell ]; @@ -107380,7 +114464,7 @@ self: { mkDerivation { pname = "json-rpc"; version = "0.7.1.1"; - sha256 = "e7587e2a4bdbfcee27aaf28718f9ff9199a4f5f6d742a93b9b077e4df49ff247"; + sha256 = "0izjkzs4szh7kcxsjhnpyvss96cizzwii1zjm8kyxz6v9cm7wn77"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra deepseq hashable lifted-async monad-control monad-logger mtl QuickCheck stm @@ -107405,7 +114489,9 @@ self: { mkDerivation { pname = "json-rpc-client"; version = "0.2.5.0"; - sha256 = "5349f5c0b0fa8f6c5433152d6effc10846cfb3480e78c5aa99adb7540bcff49c"; + sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; + revision = "1"; + editedCabalFile = "14dx9a1cb6813vgxp86f9w7fcx5cw8xr0af2wsz3fcfzh7if5paq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107430,7 +114516,7 @@ self: { mkDerivation { pname = "json-rpc-generic"; version = "0.2.1.2"; - sha256 = "946b5f28b789c6a943601215a20e4a9f53ffbd12070cc1166ed89528cf1c0dda"; + sha256 = "1nhd3k7ji5fqdqbc23072ayzylwz987a458jc11skil9nwl5yswl"; libraryHaskellDepends = [ aeson aeson-generic-compat base bytestring containers dlist scientific text transformers unordered-containers vector @@ -107451,7 +114537,9 @@ self: { mkDerivation { pname = "json-rpc-server"; version = "0.2.6.0"; - sha256 = "169e9997734bd1d7d07a13b5ae0223d5363c43de93b0d5fbb845a598f9eaccf5"; + sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; + revision = "1"; + editedCabalFile = "0r0lshhf40l5a88axrzwp28r3bfa013z4m34n7rh50b19dqik8jw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107475,9 +114563,9 @@ self: { mkDerivation { pname = "json-schema"; version = "0.7.4.1"; - sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96"; - revision = "6"; - editedCabalFile = "b6211ab8989ce7d576cac285b7d17f2e50ee79139545e2e84b2dd319904360b2"; + sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; + revision = "8"; + editedCabalFile = "052pfjcqx0hgzk0s7sxi5598ikh0lnhcd51h8qsggwgwg1vxnvrc"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -107496,8 +114584,8 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.2.0.1"; - sha256 = "ca02139ca3a5041225f684080067c5ec8c5e0ce3421a5eea9d273db377d005c9"; + version = "0.2.0.3"; + sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -107514,7 +114602,7 @@ self: { mkDerivation { pname = "json-state"; version = "0.1.0.1"; - sha256 = "f10aa7fcf498ed25d6b90a616f0749d8089169e678116a01c3052780579d64f7"; + sha256 = "1xv4kmbq09q5qc0nl4bqwrlr226q943nyq8ap7b2bvcqykyaf2pi"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring libgit time-units ]; @@ -107531,7 +114619,7 @@ self: { mkDerivation { pname = "json-stream"; version = "0.4.1.3"; - sha256 = "1e281cfddd1c71b40e8a4b8a75dbd0c1f16b1e349edcbc5e44e45c25241ff9dc"; + sha256 = "1p7r3wj2ap748igbrp4y6hg6pwf1s3dpb2jbi87b8w8wvpyiqa0y"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -107553,7 +114641,7 @@ self: { mkDerivation { pname = "json-togo"; version = "0.1.1.0"; - sha256 = "830224c0bf74c70a3c4035f432874348bb4d883a0027b94d9194321df66c802b"; + sha256 = "0aw0dkv1scllj56vj9q07a44vfs88f3k5x1m80y0mivlpz0280l3"; libraryHaskellDepends = [ aeson attoparsec attoparsec-trans base bytestring scientific text transformers unordered-containers vector @@ -107571,7 +114659,7 @@ self: { mkDerivation { pname = "json-tools"; version = "0.5.0"; - sha256 = "6ee24c93da6d76e5b6024e53cac0360f36c4479a6d364debbb1e0440b0863e8e"; + sha256 = "13iyhsq4010ypgmlsdkdk93w8dhg6v0cllsf0avfaxkdva9lrqkf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107583,12 +114671,35 @@ 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 { pname = "json-types"; version = "0.1"; - sha256 = "b6e16d9417ece7f41a960e0793b925ec4918e31ea8046f96972d36b071721121"; + sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn"; libraryHaskellDepends = [ base containers text ]; description = "Basic types for representing JSON"; license = stdenv.lib.licenses.mit; @@ -107601,7 +114712,7 @@ self: { mkDerivation { pname = "json2"; version = "0.8.3"; - sha256 = "289f98c84aab889762c0e1a57c26df07dfe3202f0d4b291114d9aee9d931fdf0"; + sha256 = "1w7x67cykbnr2h8jjjqd5whf7pq7vwk7r9g1q1i9g25b9b49i7r8"; libraryHaskellDepends = [ base blaze-builder bytestring containers json2-types mtl old-locale parsec pretty time utf8-string @@ -107618,7 +114729,7 @@ self: { mkDerivation { pname = "json2-hdbc"; version = "0.5.1"; - sha256 = "b20db63e92693467de93b64adae747362b5c86e7d12558386369d4ea91818bba"; + sha256 = "1flbh68ymm39ccw5h9fiwy35qarn8zkxljmnjgg6fd39j8zbc3dj"; libraryHaskellDepends = [ base containers HDBC json2 json2-types time utf8-string ]; @@ -107632,7 +114743,7 @@ self: { mkDerivation { pname = "json2-types"; version = "0.1"; - sha256 = "f97ee727b721cf7b9d9775bc8cb97c19b4ce6b8d8b1b2e1547734364a2ab253f"; + sha256 = "0gr5mfi68hvk8wajw6wbimmwxd0rgjwqrg3mjyfppkr1nwkyfzpr"; libraryHaskellDepends = [ base containers ]; description = "Defined JSON data types and function for renders JSON to string"; license = stdenv.lib.licenses.bsd3; @@ -107643,7 +114754,7 @@ self: { mkDerivation { pname = "json2yaml"; version = "0.3.2.3"; - sha256 = "b6a5efda5ffcc0fcc2a644b6e7904ed2ad0fb46f811ac9fa1f3b95fcf3c3e9c6"; + sha256 = "1ip9qgrzr59v3zxcj6l1dys0zbfj9s8fgdj4lv1grh7wbzdfz9dn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring yaml ]; @@ -107652,6 +114763,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jsonextfilter" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , monads-tf, optparse-applicative, process, scientific, string-qq + , text, unordered-containers, vector + }: + mkDerivation { + pname = "jsonextfilter"; + version = "0.1.0.0"; + sha256 = "0mm1q3fplxig32qi3iyish6ba40j7n13wg40l0266fiy2dsccbbc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers monads-tf + optparse-applicative process scientific string-qq text + unordered-containers vector + ]; + homepage = "https://github.com/mackeyrms/jsonextfilter#readme"; + description = "Filter select values in JSON objects to unix programs"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsonresume" = callPackage ({ mkDerivation, aeson, base, bytestring, old-locale, text, time , unordered-containers @@ -107659,7 +114791,7 @@ self: { mkDerivation { pname = "jsonresume"; version = "0.1.0.1"; - sha256 = "441dea0a84413c07ac51eebe70b63cd4f4653a2c0148b941cca90628170b7b92"; + sha256 = "14kv1cbjh1m9ri0vjj015hx6bx6l7jv71gpfa6n0fg21hh5fl7a4"; libraryHaskellDepends = [ aeson base bytestring old-locale text time unordered-containers ]; @@ -107677,7 +114809,7 @@ self: { mkDerivation { pname = "jsonrpc-conduit"; version = "0.3.0"; - sha256 = "9e2407e7a2f086d2d4c3ec7e8952a663bca6e487936d147cfb643dfcd1d1014e"; + sha256 = "0kh1s78zqgb4zdy18vckhzjadg33lr98jzpcqgad51phlbkhf94y"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers @@ -107697,7 +114829,7 @@ self: { mkDerivation { pname = "jsonschema-gen"; version = "0.4.0.0"; - sha256 = "c456517514189da2cc725819515e6f54f7f02bc5c9aecbe43759e9e38e42174f"; + sha256 = "0kqp8a7f7sar6zjcpbn9qlmz1xsldxg526aqfb6a578q2ism2mn4"; libraryHaskellDepends = [ aeson base bytestring containers scientific tagged text time unordered-containers vector @@ -107719,7 +114851,7 @@ self: { mkDerivation { pname = "jsonsql"; version = "0.1.2.1"; - sha256 = "93234e108034457f59e078cd2d6205a7ed4218262f0c7a39a91600e915b7966b"; + sha256 = "0swnnwayj00nm4wpl31g4qc45vd70mi2vkbqw1cpyi9lh084w8wk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107741,7 +114873,7 @@ self: { mkDerivation { pname = "jsontsv"; version = "0.1.7.0"; - sha256 = "fddad9ed97a9ad685d3f4a38e7b5b42f5ce964136232a6b2c9920ce3aa2b41bb"; + sha256 = "1fs15fmf634jr6racck22djfjp1gnjsyff2a7xfnibd9jznxknpx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107755,6 +114887,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsonxlsx" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , HUnit, old-time, optparse-applicative, scientific, string-qq + , text, time, unordered-containers, vector, xlsx + }: + mkDerivation { + pname = "jsonxlsx"; + version = "0.1.0.1"; + sha256 = "0q64z7hw9mr3lpz02dcqybw4jxjc3glagyj4va9cgipfxxxjcy27"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers HUnit old-time + optparse-applicative scientific string-qq text time + unordered-containers vector xlsx + ]; + homepage = "https://github.com/mackeyrms/jsonxlsx#readme"; + description = "json to xlsx converter"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jspath" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, JSONb , utf8-string @@ -107762,7 +114916,7 @@ self: { mkDerivation { pname = "jspath"; version = "0.1"; - sha256 = "c7a2104a737035f72807f03e4a44f0ea7e238470901980f8180e2b776335581c"; + sha256 = "072q6mipfaqf33w806chf2226zpay124lgph0wlgfdbhfd5118n7"; libraryHaskellDepends = [ base bytestring bytestring-trie JSONb utf8-string ]; @@ -107781,7 +114935,7 @@ self: { mkDerivation { pname = "juandelacosa"; version = "0.1.1"; - sha256 = "87e36dacdce82577ee52c1d87bdcf75e8e7e3230e42242f8c9b08f98c6c11f18"; + sha256 = "060zq739i3xhr7w448p460r7x3jyyzf7pn61abp7f9g8vjn6vqw7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107802,7 +114956,7 @@ self: { mkDerivation { pname = "judy"; version = "0.3.0"; - sha256 = "f483c31bcab0383a9db31ec41b527b3125e12ea302e126ec3ce45d2bb6a2cb9d"; + sha256 = "17fblav2npg47kn2dq82lcpf299igd91pi0ynffklf5hr8dw70zl"; libraryHaskellDepends = [ base bytestring ghc-prim ]; librarySystemDepends = [ Judy ]; testHaskellDepends = [ base hspec QuickCheck ]; @@ -107818,8 +114972,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.1"; - sha256 = "4393aae302e034c95e2c3cff57f432c322db7ecf21580295310648c73bc09bbf"; + version = "0.1.0.3"; + sha256 = "0czb1vb1nwn1wzx52vpvnpki2kfwwb775wg512rn46snm5wibvzv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107839,8 +114993,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.16"; - sha256 = "5eac14b5102b5be904142843977560cddf4829182637e059cd09e7a384b7052f"; + version = "0.2.17"; + sha256 = "0r57bcg21pnw9qgqp82c60lr8p4m4xv0ml01l3wzzb7vahnxalir"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107858,7 +115012,7 @@ self: { mkDerivation { pname = "jump"; version = "0.0.0.0"; - sha256 = "3144c838fb44e18619f9dfb0e28284264e9c0a26b33e91fbad98921e66f07ea4"; + sha256 = "193yy1k1x4lqmpxr2gmk4q59qki6hj1f5c6zz4cqdqa4zcwchi1i"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base criterion hspec ]; homepage = "http://github.com/commercialhaskell/jump#readme"; @@ -107871,7 +115025,7 @@ self: { mkDerivation { pname = "jumpthefive"; version = "0.0.1"; - sha256 = "f436832dcb69748e532a7847531bbef357401bcb3adfc386edf2283a273cb77a"; + sha256 = "0ymp7hkkla7jxn3c7prsrcdl0mzkpqdm6ivq599qwx39rcnq6dpl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parallel ]; @@ -107889,7 +115043,7 @@ self: { mkDerivation { pname = "jupyter"; version = "0.9.0"; - sha256 = "93a049ba794d61c5cdef5523610bbdddcdc4527576bbaf997051da020074064c"; + sha256 = "0k06fh005njif2cszfvnfm9c9kfxpl5n28smxz6waqadg6x4k84k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107916,7 +115070,7 @@ self: { mkDerivation { pname = "jvm"; version = "0.1.2"; - sha256 = "0d20fc48b951e3decaa96e9ec13b60d4d45213b54d0f41323340fec1c27e2136"; + sha256 = "0di1gv1c3zj06cr423sdnl9m5m6lc0xw37kfm75dxqsip54gq80d"; libraryHaskellDepends = [ base bytestring distributed-closure jni singletons text vector ]; @@ -107927,16 +115081,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "jvm_0_2_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, distributed-closure - , hspec, jni, singletons, text, vector + "jvm_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, choice, criterion + , distributed-closure, hspec, jni, singletons, template-haskell + , text, vector }: mkDerivation { pname = "jvm"; - version = "0.2.0"; - sha256 = "f766db5293100de25605f883170d4869fcca7b99e1ae2b2d418cdb92eca7ccce"; + version = "0.2.2"; + sha256 = "1xfi63qw8lz82b1mjji3bxacpl9q0kf86h7dcbjgiw2bqq65xcak"; libraryHaskellDepends = [ - base bytestring distributed-closure jni singletons text vector + base bytestring choice distributed-closure jni singletons + template-haskell text vector ]; testHaskellDepends = [ base bytestring hspec text ]; benchmarkHaskellDepends = [ base criterion jni ]; @@ -107953,7 +115109,7 @@ self: { mkDerivation { pname = "jvm-parser"; version = "0.2.1"; - sha256 = "39eed730f80b4eaa7eab3a6e1f14833e2aea194c7453ac06c5d066af83eb1166"; + sha256 = "0rhixf1syrnhql3aqlvl9hcylaiyhca1yvismdzalkhbz0qdgvir"; libraryHaskellDepends = [ array base binary bytestring containers data-binary-ieee754 fgl fingertree pretty zlib @@ -107969,9 +115125,9 @@ self: { mkDerivation { pname = "jvm-streaming"; version = "0.1"; - sha256 = "45788461c552dc2cdcbbe389f3783c67942341e38fa7ba17bd0a906db573d256"; - revision = "1"; - editedCabalFile = "f0e204ab4b6d0a8aedb7105800727d22a990a4761787d5abfaa70d016832b184"; + sha256 = "0mnjffsnv40aplbvm9wgwd0j75377iwg72g3pgf2rp2jqmhq8y25"; + revision = "3"; + editedCabalFile = "1hfjr9q08kvwdj828pl41zfig0c721sj1ni8p01rb9ck9pv97fap"; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm singletons streaming ]; @@ -107989,7 +115145,7 @@ self: { mkDerivation { pname = "jvm-streaming"; version = "0.2"; - sha256 = "2251efe0192d36845ac852357a6af923950f7e9cb007900c40cc6a1d116c30bb"; + sha256 = "1frhdh8issnc806901xhkiz0z593z5m7ldajr1d88did37hfyl92"; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm singletons streaming ]; @@ -108010,9 +115166,9 @@ self: { mkDerivation { pname = "jwt"; version = "0.7.2"; - sha256 = "17967413d21399596a236bc8169d9e030bb85e2b1c349c6e470543767cc20a31"; + sha256 = "0c8aq9y7chq58xp9qd0w5dgbh2q3ksfidj3b4dm5k68ks89p95hp"; revision = "1"; - editedCabalFile = "b5858c05476741b4dc7f9f075bb8c8aca128ed25a9f325d937d370aa3d4910e1"; + editedCabalFile = "1q8h94yslw6k6zcjbwx94pnji8dcr2w5n1wzgzfb8hb78w2qr1dm"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite data-default http-types memory network-uri scientific semigroups text time @@ -108037,7 +115193,7 @@ self: { mkDerivation { pname = "kademlia"; version = "1.1.0.0"; - sha256 = "de03367642be75a42615414d26df1eb09861a807e49544aa6546d70533d55e72"; + sha256 = "0wjyslrhbms6cnm495g40yl6365h3vgjcka12lka8xdy89v3c0yy"; libraryHaskellDepends = [ base bytestring containers mtl network stm transformers transformers-compat @@ -108058,7 +115214,7 @@ self: { mkDerivation { pname = "kafka-client"; version = "0.7.0.1"; - sha256 = "51b9180a78da95ad92a009165ad0bb068ec22374561fd70f6f79389af4d0e794"; + sha256 = "1577s3s9lf3rdw7xf7snfhiw53h6pg85l5h9l29av5fsg051ifai"; libraryHaskellDepends = [ base bytestring cereal digest dlist network snappy time zlib ]; @@ -108078,7 +115234,7 @@ self: { mkDerivation { pname = "kafka-device"; version = "0.2.1.2"; - sha256 = "281d1155594a4a4f44c71042e41c5151f10370d3a96a6159ae9a42c60898463b"; + sha256 = "0fs6k04cchlsmrcn2sm9sdq07waia4ff8hhhqx24yjjab5ai2798"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108098,7 +115254,7 @@ self: { mkDerivation { pname = "kafka-device-glut"; version = "0.2.1.2"; - sha256 = "69a4fbd1015b765ab5e0ef7d81a9bd6db578545b7f69cfd96681c8052b87c146"; + sha256 = "0in1hwmhbj41cvcwysbzbda7idbdpnlq2zggw2smlxjv078zp939"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLUT kafka-device OpenGL ]; @@ -108116,7 +115272,7 @@ self: { mkDerivation { pname = "kafka-device-joystick"; version = "0.2.1.2"; - sha256 = "e07acdef7bc09038d20b5b6ab4a228fcd41877e00fde257d41014a4197c4f49e"; + sha256 = "17plqjbl2jh185yjbphgw1viim7w52ib8sjv1g93i460ggpwsyp0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108136,7 +115292,7 @@ self: { mkDerivation { pname = "kafka-device-leap"; version = "0.2.1.2"; - sha256 = "c16b2c2ea6d79354bef02ace9f86c44e2627bb5de8506935715618a2b81f9693"; + sha256 = "14wn3ywa462nf4snjl78bnxjf9jfqj39zkiay2z594yplqp2qsy1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108158,7 +115314,7 @@ self: { mkDerivation { pname = "kafka-device-spacenav"; version = "0.2.1.2"; - sha256 = "39f0acf5ad9b6d4f4b53724080c7467aeadb6d93f76691143ec1599a1d713737"; + sha256 = "0drpf4frlnf17qa92rppjdnxpsks8v3q0h3jad5lyvcvmpssrw1r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108178,7 +115334,7 @@ self: { mkDerivation { pname = "kafka-device-vrpn"; version = "0.2.1.2"; - sha256 = "9adcd43ec1851ac26083c629b07744d12150dd6dbb13f2a468d904dbb6f3b17e"; + sha256 = "0zmiyfvdn16rd2jg44xvdpfm08fi8ivv0af6hdhc46l5q4zd9p4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base kafka-device vrpn ]; @@ -108196,7 +115352,7 @@ self: { mkDerivation { pname = "kaleidoscope"; version = "0.1.0.0"; - sha256 = "01deac5b0a468c9be7dc9b13c01a152dbc185fe64b51c4f0947fad619fd751f5"; + sha256 = "1xaisygn3bbzjkqc8labwrgiig1d2ldc04wvvkkrp32619dsrph1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108220,7 +115376,7 @@ self: { mkDerivation { pname = "kalman"; version = "1.0.0.2"; - sha256 = "817cc80d31a8c06864978991b7c16fb11c5910f113d7f2157fff45504c4e3c07"; + sha256 = "01rw9r650igzgwaz5mqky485j75idz0vg4c9jxj6ih58646whz41"; libraryHaskellDepends = [ base hmatrix random-fu random-fu-multivariate vector ]; @@ -108236,16 +115392,16 @@ self: { "kan-extensions" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, mtl, semigroupoids, tagged - , transformers + , contravariant, distributive, fail, free, mtl, semigroupoids + , tagged, transformers }: mkDerivation { pname = "kan-extensions"; - version = "5.0.1"; - sha256 = "01de9fe57064a125ecb1d1161519df27043c2058ca246bbd5cd2d73c899ba0e2"; + version = "5.0.2"; + sha256 = "0bj88bgwxlx490f5r979idsm9dpdsb0ldzar9sa0jhj2jn2xx7hw"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant - distributive free mtl semigroupoids tagged transformers + distributive fail free mtl semigroupoids tagged transformers ]; homepage = "http://github.com/ekmett/kan-extensions/"; description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"; @@ -108257,7 +115413,7 @@ self: { mkDerivation { pname = "kangaroo"; version = "0.4.0"; - sha256 = "dd8c9e43f2870cbe2b70c1b3b0d510b9bfdd8a05703cbcec78a2f50c5b38ebd0"; + sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x"; libraryHaskellDepends = [ array base ]; homepage = "http://code.google.com/p/copperbox/"; description = "Binary parsing with random access"; @@ -108270,7 +115426,7 @@ self: { mkDerivation { pname = "kanji"; version = "2.0.0"; - sha256 = "1547515b9f21d2b7ebd493770291d0a31905f957adb0a077b3846d935822053c"; + sha256 = "0g0549c96vc4ndvs1c5dazwha6d3s28h4xwkskmvgli1kxdm2iqm"; libraryHaskellDepends = [ base bytestring containers microlens text ]; @@ -108287,9 +115443,9 @@ self: { mkDerivation { pname = "kansas-comet"; version = "0.4"; - sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1"; - revision = "9"; - editedCabalFile = "6b788670bd0b22096693d6fca5770c5522bc3c89c9ca12123034f7957172a38a"; + sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; + revision = "11"; + editedCabalFile = "0l56snbdxbcwrmh7gna4237873d366dfbwp59a4wq1s51clhmb4z"; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time transformers unordered-containers @@ -108308,7 +115464,7 @@ self: { mkDerivation { pname = "kansas-lava"; version = "0.2.4.4"; - sha256 = "ed44a01f95c72580c3e198ea43f42a582ec44bbdc8897629fe37f874208f6c5d"; + sha256 = "0pbciwh79y1pzqlpd2f8pm5w8bjq5bs47slqw71q09f7jlgs0i7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108329,7 +115485,7 @@ self: { mkDerivation { pname = "kansas-lava-cores"; version = "0.1.2.2"; - sha256 = "15502f0da60b224fc6b5a6fed21c2507c34ddbdbc51377736c3bc254186ad01c"; + sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108350,7 +115506,7 @@ self: { mkDerivation { pname = "kansas-lava-papilio"; version = "0.3.1"; - sha256 = "1e805c00181d992744de32fce6a83bcd3c8f359c1572a03e5e4c1cfa7c740e59"; + sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y"; libraryHaskellDepends = [ ansi-terminal base bytestring data-default directory filepath kansas-lava kansas-lava-cores netlist network sized-types @@ -108365,7 +115521,7 @@ self: { mkDerivation { pname = "kansas-lava-shake"; version = "0.2.0"; - sha256 = "34837e499a3007fb9eeb84e7c0bfd7c3c3d53e9cb84a8a8851e98b1c84f4f6a4"; + sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl"; libraryHaskellDepends = [ base hastache kansas-lava shake text ]; description = "Shake rules for building Kansas Lava projects"; license = stdenv.lib.licenses.bsd3; @@ -108379,7 +115535,7 @@ self: { mkDerivation { pname = "karakuri"; version = "0.1.1"; - sha256 = "6c9ce1adae30c14d58ab8247efbf1fdedd8a6af45e9b271f59b9277c499f447b"; + sha256 = "0ys4kx4pq9xrb4gjg6syyim8mpfy3yzyyiw2mdc4vh9hmsny373c"; libraryHaskellDepends = [ base comonad containers minioperational mtl transformers ]; @@ -108389,6 +115545,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "karps" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring + , binary, bytestring, containers, cryptohash-sha256, deepseq + , either, exceptions, formatting, hashable, hspec, lens + , monad-logger, mtl, QuickCheck, random, raw-strings-qq, scientific + , semigroups, SHA, text, text-format, transformers + , unordered-containers, vector, wreq + }: + mkDerivation { + pname = "karps"; + version = "0.2.0.0"; + sha256 = "06z010p2f0xzv69kp6csl68b3bl3cds6in6vvb80s4gjwkrj5v9k"; + libraryHaskellDepends = [ + aeson aeson-pretty base base16-bytestring binary bytestring + containers cryptohash-sha256 deepseq either exceptions formatting + hashable lens monad-logger mtl QuickCheck random scientific + semigroups SHA text text-format transformers unordered-containers + vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers formatting hspec QuickCheck + raw-strings-qq text vector + ]; + homepage = "https://github.com/krapsh/kraps-haskell"; + description = "Haskell bindings for Spark Dataframes and Datasets"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "karver" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec, text , unordered-containers, vector @@ -108396,7 +115581,7 @@ self: { mkDerivation { pname = "karver"; version = "0.1.2"; - sha256 = "21defef8ec665b7642e0b8b335389a05ca30483661fc0baaf16833a93a877d65"; + sha256 = "0rbxhwxajcv8y6m0pz316r431jh5k8w3bcxqw117cnv6xkwgxpi1"; libraryHaskellDepends = [ aeson attoparsec base bytestring text unordered-containers vector ]; @@ -108415,18 +115600,54 @@ self: { , semigroups, string-conv, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, text, time , time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers + , transformers-compat, unagi-chan, unix, unordered-containers }: mkDerivation { pname = "katip"; - version = "0.3.1.4"; - sha256 = "04778447b9446aaad4206f4acc1c7d19322f13f467418461ad4a5fec981b8493"; + version = "0.3.1.5"; + sha256 = "1mnrs6ji7bqh9lrb9bzcxb4c1a60mzf8xkzgk6yi8ijxxv5ch8zn"; libraryHaskellDepends = [ - aeson 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 unix - unordered-containers + 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_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 @@ -108453,8 +115674,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.3.0.2"; - sha256 = "bc23e4565f2bd6627b456c210e2b74e333e743da46354be90062d1c9ed0039ed"; + 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 @@ -108482,7 +115703,7 @@ self: { mkDerivation { pname = "katt"; version = "0.2.0.3"; - sha256 = "0f56961a30d2c5e7aabc07f93a512d55aac5e6bed026ca0d3fe73f9ef21071c3"; + sha256 = "1hvi23r9wgz77w6wl9nhpvkcbajm5m8kmy87pjmfgifj60d9cmhg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108506,7 +115727,7 @@ self: { mkDerivation { pname = "kawaii"; version = "0.0.1.1"; - sha256 = "9b7e66ffbb281d4cf4cab30a9b4aed4c7593875bb637f192a629fce3595f42c0"; + sha256 = "1h22bxcy7z19ls9g2dxnbf3r6xacxm59n2mkrbs4q798pgznczlv"; libraryHaskellDepends = [ base bytestring containers data-default hakyll lens lifted-base monad-control monad-logger mtl optparse-applicative safe @@ -108531,8 +115752,8 @@ self: { }: mkDerivation { pname = "kawhi"; - version = "0.2.1"; - sha256 = "ad98cce9b302fae9fca60ba25f9256b5c4db7e3b8340225a8e3041f45af0f677"; + version = "0.2.3"; + sha256 = "0in0z9hsl1kkgzx0ifrna6ddmxj4r138icf1liwl7awbiv4jn9n2"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-conduit http-types mtl safe scientific text @@ -108542,11 +115763,35 @@ self: { scientific smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck text ]; - homepage = "https://github.com/hamsterdam/kawhi"; + homepage = "https://github.com/thunky-monk/kawhi"; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; }) {}; + "kawhi_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-client + , http-conduit, http-types, mtl, safe, scientific, smallcheck + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text + }: + mkDerivation { + pname = "kawhi"; + version = "0.3.0"; + sha256 = "0kx4lbyfh7brfg6vr05xcwa233lzld0pm3isvc4pr8fs7mx3h893"; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-client http-conduit + http-types mtl safe scientific text + ]; + testHaskellDepends = [ + aeson base bytestring exceptions http-client http-types mtl + scientific smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text + ]; + homepage = "https://github.com/thunky-monk/kawhi"; + description = "stats.NBA.com library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kazura-queue" = callPackage ({ mkDerivation, async, atomic-primops, base, containers, criterion , deepseq, doctest, exceptions, free, hspec, hspec-expectations @@ -108555,7 +115800,7 @@ self: { mkDerivation { pname = "kazura-queue"; version = "0.1.0.2"; - sha256 = "0ed0544bdfea6364acabaebb8e07ba36ee98dcf9c6afca4241e8f87613dddc7b"; + sha256 = "0yywvl9pdy78851cmby6z7f9ivinp83qxfxfmfn68qzavx5m9l0f"; libraryHaskellDepends = [ async atomic-primops base containers primitive ]; @@ -108575,7 +115820,7 @@ self: { mkDerivation { pname = "kbq-gu"; version = "0.2"; - sha256 = "cf48b063dc5d647c9b51f216a9d412c68d86eb271871d438e977f149a90f7fea"; + sha256 = "1skz1yllkwbpx4wd8w8q4zmqd3f62baaj5pja6dpqr2xviiv0j6g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -108592,7 +115837,7 @@ self: { mkDerivation { pname = "kcd"; version = "0.2.0.0"; - sha256 = "5d69a5acf138e90f2993fdb5c5b1e3802d7d153b82a2b51b5df16f8ba48835a3"; + sha256 = "18rmi2j8nvzibldvb8l27capsbc0wfqwbdgxjclhzs9qy6naasax"; libraryHaskellDepends = [ base conduit conduit-parse exceptions lens resourcet text xml-conduit xml-types @@ -108609,7 +115854,7 @@ self: { mkDerivation { pname = "kd-tree"; version = "0.1.0"; - sha256 = "a7da66764e9e030d36a3d5dc10a718818b5b4fed9728a5cbfa5af497aea23c49"; + sha256 = "0j9wlap9gx2szb5saa4pxm7mp2w132ki1p6mlcv0s0wy9rv6dnm7"; libraryHaskellDepends = [ base lens linear vector vector-algorithms ]; @@ -108626,7 +115871,7 @@ self: { mkDerivation { pname = "kdesrc-build-extra"; version = "0.1.1"; - sha256 = "c54e90038834f626e95b05ceb8faf6f2feee18c2017521611cb15ba84ee96c1d"; + sha256 = "07bcx57ahnxi3ihj2x81q8cfxzpjyvxbikh5bgljdxili01r0kn5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108645,7 +115890,7 @@ self: { mkDerivation { pname = "kdt"; version = "0.2.4"; - sha256 = "bc0f8f9ac0cb01466273171f47b627abe170d1130bd59657fb9198b4f9479f9a"; + sha256 = "16lz8zwv964izdbrdm8b2g8p1qdb4yv4f7qpfdi4c0fbq2d8y3xw"; libraryHaskellDepends = [ base deepseq deepseq-generics heap ]; testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ]; benchmarkHaskellDepends = [ @@ -108667,7 +115912,7 @@ self: { mkDerivation { pname = "keenser"; version = "0.1.0.0"; - sha256 = "947e825cb31c93077fd90d978d5d04dfbb3fa2def8a634fbf71a7b8c4422919d"; + sha256 = "17ci4928qyqsyzxk99pqvsi3zfyz0ifqv5qdv5zhg4qwndf84zll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108690,7 +115935,7 @@ self: { mkDerivation { pname = "keera-callbacks"; version = "0.1"; - sha256 = "38da91a06a3d243bf901853df29c1a797081e5d4750de4d1743619f5c178fdf5"; + sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq"; libraryHaskellDepends = [ base mtl ]; description = "Mutable memory locations with callbacks"; license = stdenv.lib.licenses.bsd3; @@ -108703,7 +115948,7 @@ self: { mkDerivation { pname = "keera-hails-i18n"; version = "0.0.3.3"; - sha256 = "9134831fd898a7a519556f7aec5879f24992cf2bbb698cb775d93aff7a15302a"; + sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i"; libraryHaskellDepends = [ base directory filepath glib hgettext MissingK setlocale utf8-string @@ -108719,7 +115964,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-controller"; version = "0.0.3.3"; - sha256 = "ebdb74680c84599849ccd7258c53cda8906c3628cc097279970343503f2b1903"; + sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb"; libraryHaskellDepends = [ base ]; homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Gtk rails - Gtk-based controller for MVC applications"; @@ -108733,7 +115978,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-environment-gtk"; version = "0.0.3.3"; - sha256 = "b9f2a9f1e0fd5ddba0729dd829be11389c4773fdf2388f6dad5b2fd4430a632e"; + sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr"; libraryHaskellDepends = [ base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view keera-hails-mvc-view-gtk @@ -108751,7 +115996,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-model-lightmodel"; version = "0.0.3.4"; - sha256 = "208515f5cbcfb650db9b49e1ef5cb6e4970c676c941c73e792c86164e2bdb820"; + sha256 = "085qppi68qf8jbkp674ldikhr5z4nrffzqa9kgdm1dngrgsib190"; libraryHaskellDepends = [ base containers keera-hails-reactivevalues MissingK stm template-haskell @@ -108769,7 +116014,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-model-protectedmodel"; version = "0.0.3.5"; - sha256 = "5db339932fecf5f91547d0daf8d12c777ce45df54d3edfe9fbf40e6942085592"; + sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx"; libraryHaskellDepends = [ base containers keera-hails-reactivevalues MissingK stm template-haskell @@ -108785,7 +116030,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-solutions-config"; version = "0.0.3.3"; - sha256 = "a1a3e437e3f1052252a2f95afcbebc9ee9bb703ea20fddad205970ec0ab48699"; + sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1"; libraryHaskellDepends = [ base directory filepath MissingK ]; homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Gtk rails - Easy handling of configuration files"; @@ -108802,7 +116047,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-solutions-gtk"; version = "0.0.3.4"; - sha256 = "b51a7461f3fb665fbf08e56ef5fc00fe52091baa38a53b3827bb6764edd75307"; + sha256 = "01sksznn8rxv4ww3p99qm8dhjlpy03ygavp512zmyrpvydhp86mm"; libraryHaskellDepends = [ base gtk hslogger HTTP keera-hails-mvc-environment-gtk keera-hails-mvc-model-protectedmodel keera-hails-mvc-view @@ -108820,7 +116065,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-view"; version = "0.0.3.3"; - sha256 = "17151bd00efff334fa5ec681cce35a793acdd185a14c6707fa45ad21f85d7c4a"; + sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p"; libraryHaskellDepends = [ base ]; homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Gtk rails - Generic View for MVC applications"; @@ -108832,7 +116077,7 @@ self: { mkDerivation { pname = "keera-hails-mvc-view-gtk"; version = "0.0.3.3"; - sha256 = "9f744992c6cfba879f83e44f6c0b7b1cc707cfa30ff9f4980a03850c6a6ee4fb"; + sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z"; libraryHaskellDepends = [ base gtk gtk-helpers keera-hails-mvc-view ]; @@ -108848,7 +116093,7 @@ self: { mkDerivation { pname = "keera-hails-reactive-fs"; version = "0.0.3.4"; - sha256 = "9e1574e7c7ce070fe3440dc6404e46572718f2e2f68154eda2ad77042ea436fa"; + sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy"; libraryHaskellDepends = [ base directory fsnotify keera-hails-reactivevalues system-filepath ]; @@ -108865,7 +116110,7 @@ self: { mkDerivation { pname = "keera-hails-reactive-gtk"; version = "0.3"; - sha256 = "7b647e929779e021a324864ad370998eafc47cbc985a181f84816bd2004c722c"; + sha256 = "0b3j9h0d4sw1hhgihnlqpiyc9bwfk5qd6jl64jij3q3rjy97wr3v"; libraryHaskellDepends = [ base bytestring cairo glib gtk gtk-helpers keera-hails-reactivevalues mtl transformers @@ -108881,7 +116126,7 @@ self: { mkDerivation { pname = "keera-hails-reactive-network"; version = "0.0.3.3"; - sha256 = "4375703d2bee8e599f2a4ea30da436ed0f00a54cb31edd8e99c6dae2b76ce98c"; + sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3"; libraryHaskellDepends = [ base keera-hails-reactivevalues network ]; @@ -108897,7 +116142,7 @@ self: { mkDerivation { pname = "keera-hails-reactive-polling"; version = "0.0.3.3"; - sha256 = "0862e35b2987e79acc10d1e7c651327ec089180a079ad2842ede7892245c13ce"; + sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8"; libraryHaskellDepends = [ base keera-callbacks keera-hails-reactivevalues ]; @@ -108912,7 +116157,7 @@ self: { mkDerivation { pname = "keera-hails-reactive-wx"; version = "0.0.3.3"; - sha256 = "7c95b6d4e5eb1fb584bcffe2e517b7b4818aa196a1358c42ce7664fe1cc6330a"; + sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw"; libraryHaskellDepends = [ base keera-hails-reactivevalues wx wxcore ]; @@ -108929,7 +116174,7 @@ self: { mkDerivation { pname = "keera-hails-reactive-yampa"; version = "0.0.3.3"; - sha256 = "813ff459dbff0c042e1cdb64be67e8e7412d9bcb01427efd4b5c077653f63dd8"; + sha256 = "1n1xyr9pc1sw9gypwhh1rfdjshg7x1kvwr6v3hp0837zvdcz8gw1"; libraryHaskellDepends = [ base keera-callbacks keera-hails-reactivevalues time Yampa ]; @@ -108944,7 +116189,7 @@ self: { mkDerivation { pname = "keera-hails-reactivelenses"; version = "0.0.1"; - sha256 = "1dd8aaa86cef010f783f525cc7d1e49aa0c3e39926f89325ec7a638e0cd3e2b0"; + sha256 = "1c72sc68wqvsxhjr7y16k7iw784swk8wfp2j7xw0y0ggdjlamn0x"; libraryHaskellDepends = [ base keera-hails-reactivevalues lens ]; homepage = "http://www.keera.es/blog/community/"; description = "Reactive Haskell on Rails - Lenses applied to Reactive Values"; @@ -108959,8 +116204,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactivevalues"; - version = "0.2.2.1"; - sha256 = "27785b27fafb6249a538d400dd47405fa66fc5267de1f17b7ff7a4a4fe738566"; + version = "0.2.2.2"; + sha256 = "0iwx40gmcmj9pz0qi6058pbn665q0ca6qc7jnk88k42nqvjm1i8h"; libraryHaskellDepends = [ base contravariant ]; testHaskellDepends = [ base directory filepath hlint HUnit mtl process QuickCheck @@ -108985,8 +116230,8 @@ self: { }: mkDerivation { pname = "keera-posture"; - version = "0.2.3"; - sha256 = "ab35dd2ebf2cd49602cc47e40a35d79f3a2f113214689ad2306ac09d0aee6952"; + version = "0.2.4.3"; + sha256 = "0kaka302qgax29583kvzhyl6fffzmywh3fk398xhzvixmza9k7sl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109016,7 +116261,7 @@ self: { mkDerivation { pname = "keiretsu"; version = "0.4.4"; - sha256 = "69098f3227a34abc55b13abe920dafa5adce2c9168ed5ede8db611b055d79c2f"; + sha256 = "0bwwsxav04dnipg5xvb8j4ncxbd5mw6r5gisn5avqjm34wr8y2b9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109042,7 +116287,7 @@ self: { mkDerivation { pname = "keter"; version = "1.4.3.2"; - sha256 = "332c962cb73a5cf8213fb137b67e1ac8902a91489a5769ed990abf79a5374a8f"; + sha256 = "13sa6yjpkgqak7nnjmws928jm46839zbcdxi7whzhp1snwn9cb1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109071,7 +116316,7 @@ self: { mkDerivation { pname = "kevin"; version = "0.11.0"; - sha256 = "21f3e784c1d61b5b96268550de7452e97cafd1d11649e0d63ca8214848830f02"; + sha256 = "00hghd44h8d87kbf0j8ns78syz79a9sdwl454sb5n6ynq62fgwr1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109089,7 +116334,9 @@ self: { mkDerivation { pname = "keycode"; version = "0.2.2"; - sha256 = "56f9407cf182b01e5f0fda80f569ff629f37d894f75ef28b6b8af3024343d310"; + sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; + revision = "1"; + editedCabalFile = "0pyh8cadgw8pn9xdg8lbvsh108i84iaynia8j42qmgmls2zakvja"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -109103,7 +116350,7 @@ self: { mkDerivation { pname = "keyed"; version = "0.3.0.0"; - sha256 = "b85cbba508e47c61bc49a3651068f7a86285501bbe0af66d90bb2eb5c8b6a360"; + sha256 = "0q53nv4babmvj1nzc2my3d88aqm8yxl10rd396y62z7412jvnp5q"; libraryHaskellDepends = [ base containers vector ]; homepage = "https://github.com/wyager/keyed"; description = "Generic indexing for many data structures"; @@ -109116,7 +116363,7 @@ self: { mkDerivation { pname = "keyring"; version = "0.1.0.5"; - sha256 = "9565c1b08e1b5b4a11d4f3df30fe053893c6228dc79f3766602837074a2901f8"; + sha256 = "1y015550fdr8c1k3g7y7ilicd4rq0pz31pzksh8llnqvisqc2rcm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base udbus ]; @@ -109134,9 +116381,9 @@ self: { mkDerivation { pname = "keys"; version = "3.11"; - sha256 = "0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2"; + sha256 = "1cn45h27hxwb4ci1iyd2qn0fzyb2y85qq4821a9xm37bwsvrgwqc"; revision = "1"; - editedCabalFile = "b1a0c0d734a3dba396f4df1418e521da6f2287a56ed344ddda78d6133d27cfd3"; + editedCabalFile = "1lyg4wyi7mkqvbfl9lvfln3j4vys47jih56zyjba7nx36kbw185i"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups transformers transformers-compat unordered-containers @@ -109159,7 +116406,7 @@ self: { mkDerivation { pname = "keysafe"; version = "0.20170303"; - sha256 = "1785ee897795fcde79ef96742b473f84705335a22d6f033981163cf8a3a9b45a"; + sha256 = "0nmlm6izhg0nh4wh6vrdl8sm6w447x3jnx4nxxwxxz4mfy4yx18p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109188,7 +116435,7 @@ self: { mkDerivation { pname = "keystore"; version = "0.8.0.0"; - sha256 = "45c57cffd3690fc3c20531645eca8bda86a8c6b4cbf6e40f80cb4f874ecb9e12"; + sha256 = "04lyrd78fkybh07y9xnbnk3ai1nsig55wr1i0p1c63v9sgzpria5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109216,7 +116463,7 @@ self: { mkDerivation { pname = "keyvaluehash"; version = "0.3.1.2"; - sha256 = "f49da00974d20f22cb7cc528718432b31a859fd3825ad33ffc12f7d01d23f0be"; + sha256 = "1gph4cfx1xqjzhzx6nl2sfgqa6mk6a272a65gk5j43yjfh4s17gl"; libraryHaskellDepends = [ array base binary bytestring derive directory filepath hashable mmap storable-record @@ -109233,7 +116480,7 @@ self: { mkDerivation { pname = "keyword-args"; version = "0.2.0.2"; - sha256 = "5d92ce609e8927566da40d3735b5a4fe94a0425455d0567fafe73402101592a1"; + sha256 = "18cj2l804d77mxzmdl2mai1a157yljskadqdlinmc9w9krhcx4jx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec ]; @@ -109257,7 +116504,7 @@ self: { mkDerivation { pname = "khph"; version = "0.1.0"; - sha256 = "dd0d4a800053df2e991c29a045934e194c648474d4d2d1053671e055f062e2f7"; + sha256 = "1xz2cbq5bq3i6q2x3lnlfj268k0r9s9lb8193jcjxpsk0204l3fx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109275,7 +116522,7 @@ self: { mkDerivation { pname = "kibro"; version = "0.5.0"; - sha256 = "9a3665c0f98d0e84ba2e3eea61011101687158b743b16bb8b8c382ef25e9de79"; + sha256 = "0yfyx4jyz0n3p2w6pca3nxc72s01240n3siy5sx883ldz706adls"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -109289,7 +116536,7 @@ self: { mkDerivation { pname = "kicad-data"; version = "0.4.0"; - sha256 = "a55a3cc07dd96b4de4a2a9bbe8f1fc9e1a73da6bd999fe145a31f2e4f2731e25"; + sha256 = "098yfgrf9wiib8agx6frdgd766lyzkqyifx9lbj4ssyrgp03qnm5"; libraryHaskellDepends = [ base ieee754 lens-family parsec parsec-numbers pretty-compact ]; @@ -109310,7 +116557,7 @@ self: { mkDerivation { pname = "kickass-torrents-dump-parser"; version = "0.0.1"; - sha256 = "9393792a8e26ffd2a899fa6eabc5d2464b04de0067fa6fa95212745df6011baf"; + sha256 = "1bqv07v5sx0jaalnzyk703g08js6sb2snvpsk6ld5zr6iqm7k4wk"; libraryHaskellDepends = [ base bytestring cassava text vector ]; testHaskellDepends = [ base bytestring cassava hspec hspec-expectations string-qq text @@ -109329,7 +116576,7 @@ self: { mkDerivation { pname = "kickchan"; version = "0.1.0.4"; - sha256 = "c70287e1679793b766b4e02b5843435fe4339d871ee67406abe588fa4443b7be"; + sha256 = "1gmp8d2gm275mc379rhyhyfk7r2z8d1mhaz0nikbg4wpczhqf0n7"; libraryHaskellDepends = [ base containers primitive vector ]; testHaskellDepends = [ base containers HUnit primitive QuickCheck test-framework @@ -109347,7 +116594,7 @@ self: { mkDerivation { pname = "kif-parser"; version = "0.0.3"; - sha256 = "73744691ffb8561317311dde8967d0d4edee4fabdf805ab1638f5544495b0ab5"; + sha256 = "1d8abd4l8mcgcfqmm06zmd7yxvfls1kqkphx64bi6mmqzy8lcx3k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109363,7 +116610,7 @@ self: { mkDerivation { pname = "kinds"; version = "0.0.1.5"; - sha256 = "e5893d8a0fe0f73f74737309821db4da5c01631d4b17663497b31e6bc1122e99"; + sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5"; libraryHaskellDepends = [ base ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/kinds"; description = "Emulation of subkinds and subkind polymorphism"; @@ -109378,7 +116625,7 @@ self: { mkDerivation { pname = "kit"; version = "0.7.12"; - sha256 = "3c6ec5721ee0f32fec8b11a73c49ceed1a93354307600a804aedafa365d8a714"; + sha256 = "0557v1js7bzd9a00lq078csr66pdrr4kr9qiign2zwz03rrcaviw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109397,7 +116644,7 @@ self: { mkDerivation { pname = "kmeans"; version = "0.1.3"; - sha256 = "3d9e24a12ce01354c2a731ee079144c3bea2c9f011ffd51db82e5c26da1a2c0b"; + sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix"; libraryHaskellDepends = [ base ]; description = "K-means clustering algorithm"; license = stdenv.lib.licenses.bsd3; @@ -109411,7 +116658,7 @@ self: { mkDerivation { pname = "kmeans-par"; version = "1.5.1"; - sha256 = "2c19fbd9e353d8ba20b215ea31bc03c85b755cb6170392e8d37e4bea520eff20"; + sha256 = "087z1r9fljvysgl940qpnrf7any80fy33shmn8hbmn2kwgczn69c"; libraryHaskellDepends = [ base metric parallel semigroups vector ]; testHaskellDepends = [ base hspec metric normaldistribution parallel QuickCheck semigroups @@ -109431,7 +116678,7 @@ self: { mkDerivation { pname = "kmeans-vector"; version = "0.3.2"; - sha256 = "bb2d34b3681d3e86b9b829f85163c5ad49a7ca20d034c6015def63ce6b1b7cb2"; + sha256 = "1ckw3dmwwqzgbl0wcd6h435afjddqmim3y19p2wqcghxd2rk8bdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl vector ]; @@ -109442,14 +116689,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kmp-dfa" = callPackage + ({ mkDerivation, array, base, QuickCheck }: + mkDerivation { + pname = "kmp-dfa"; + version = "0.1.0.1"; + sha256 = "0h0jk0pidikk655yw8nwmgrvwknhikjmalhizqspfd28w9ijxprg"; + libraryHaskellDepends = [ array base QuickCheck ]; + testHaskellDepends = [ array base QuickCheck ]; + homepage = "https://github.com/paolino/kmp-dfa"; + description = "KMP algorithm implementation, based on Deterministic Finite State Automata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "knead" = callPackage ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record , storable-tuple, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.2.0.1"; - sha256 = "767515c8db0abff908d927354a027cb4f2cac929cb768302ba3900c050ad945c"; + version = "0.2.2"; + sha256 = "0vkynmxm5cql7bv8m5s44a1gpwahya4hp8p6n6j20ninfcc69xkg"; libraryHaskellDepends = [ base llvm-extra llvm-tf storable-record storable-tuple transformers utility-ht @@ -109465,7 +116725,7 @@ self: { mkDerivation { pname = "knead-arithmetic"; version = "0.0.0.1"; - sha256 = "7ed408c73d015d564af551611e9a28784afa6bd4d012a7a03b0fb44b0886b928"; + sha256 = "0a5rhq44pd0g7fhaf4nhsimzljkq52d1wqaiym55cp817p3him3y"; libraryHaskellDepends = [ base knead llvm-extra llvm-tf utility-ht ]; @@ -109480,7 +116740,7 @@ self: { mkDerivation { pname = "knob"; version = "0.1.1"; - sha256 = "8c2c84cfa20f3a2d7ca0636d2b3f2822c62501358075bfa356eb964b803e1217"; + sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c"; libraryHaskellDepends = [ base bytestring transformers ]; homepage = "https://john-millikin.com/software/knob/"; description = "Memory-backed handles"; @@ -109494,7 +116754,7 @@ self: { mkDerivation { pname = "knots"; version = "0.1.0.1"; - sha256 = "04811f9a7daa8fc3b3035f5aa7d8516e7349fafafa2ad30c94372ae4ec3362fb"; + sha256 = "1yv26gnf8aipjh6d6apszbx4jwvfa7cafnjz0frw73xagnd1z084"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109511,7 +116771,7 @@ self: { mkDerivation { pname = "koellner-phonetic"; version = "0.0"; - sha256 = "6f26961a1cb19c549c8071e51de821283ba9c9d2c2955fb0b7c127a2f75bef64"; + sha256 = "0r7gbgvs49y1nyq5z5f2sb4sjfr847l1vrbih2f5975i3hd9c9kg"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base HUnit ]; doHaddock = false; @@ -109527,7 +116787,7 @@ self: { mkDerivation { pname = "kontra-config"; version = "0.1"; - sha256 = "16b17e815e4c5060bda5b1db97c3d8a531e792fd1fdc9440e414af55812c2541"; + sha256 = "0h955j0mbbqlwi099p0zzn9ffcd5v31rgnxilnyn0l2cbs0pxc8n"; libraryHaskellDepends = [ base bytestring data-default exceptions text transformers-base unjson utf8-string yaml @@ -109547,7 +116807,7 @@ self: { mkDerivation { pname = "kontrakcja-templates"; version = "0.1"; - sha256 = "48a6e6138592e56eed9ab28254fa2bdff68d037f7ca7b546635df54640631b08"; + sha256 = "020vcd04dxaxcd3bb9vwgw1qvxnz5gx590mjkbnnxrcjhl9yd9j8"; libraryHaskellDepends = [ base bytestring containers directory HStringTemplate html MissingH mtl old-time parsec transformers utf8-string @@ -109569,9 +116829,9 @@ self: { mkDerivation { pname = "koofr-client"; version = "1.0.0.3"; - sha256 = "2ab6f0af8be4f1912ad06ad860db993f9c33c8f0206f87ff0b566b7dda54e7af"; + sha256 = "1bz7akd7sssn1gzqfvr0y343771zk7dn1n3as0m93wg4ifpz1dia"; revision = "1"; - editedCabalFile = "1bee9d4fc76133cecb131ba5ddc21278a871761d5e2225d4077f249b1ebb5161"; + editedCabalFile = "0qaipcg9n93z0za2a8jy3mv73a3q2b1dv98v2g5wwcv1qx7rvvhv"; libraryHaskellDepends = [ aeson base bytestring filepath http-client http-client-tls http-types mtl @@ -109586,7 +116846,7 @@ self: { mkDerivation { pname = "korfu"; version = "0.2"; - sha256 = "9f036ee1c568bf1cecc1467e161b837e2886074a686ec3b85aa7503f906b96d7"; + sha256 = "1mwndf83yl57bawc6vk8983qca3yhcdiczj6q7n1rgv8qphnw0wz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109604,9 +116864,9 @@ self: { mkDerivation { pname = "kqueue"; version = "0.2"; - sha256 = "700c6daf8a3f6ff1dbbc7f8ef10f3acb2ffddb4ccc65a68fa533907802f67369"; + sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h"; revision = "1"; - editedCabalFile = "cea5494eb8fc333d8f9d35768eea1c813620f39e35f1a37feae1811aa57b9850"; + editedCabalFile = "0l4qgfjim0g1x9zs7w9mkvrj0dl13km8wximkn7ksczwp174k9ff"; libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://github.com/hesselink/kqueue"; @@ -109622,9 +116882,9 @@ self: { mkDerivation { pname = "kraken"; version = "0.0.3"; - sha256 = "4001e1c545155434985f7ca93b5d1bcc6a465c83c58d4bb41a60bbfe521b1e9d"; + sha256 = "178y3d9gxfv03as4p3f5hdf4csnc3dfkpabwbyc38m0m8p2y20a0"; revision = "1"; - editedCabalFile = "03085f9b1e839e82a6bfef3778f95f327c55bbd247727d0929b0758bd801a136"; + editedCabalFile = "0dm107c8nxdh544pswj7saxmaz1jbzwphdzgpyk857l33sdmy203"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -109642,7 +116902,7 @@ self: { mkDerivation { pname = "krapsh"; version = "0.1.9.0"; - sha256 = "fc8466f7c7e1b06d5873f476d2542f1a6449f943c801fb64b78b8c67edb6aaf0"; + sha256 = "1w5anvnng34bnxjgn0f88gwljr0s5xad4xplfdc6vc71qzvnd17w"; libraryHaskellDepends = [ aeson aeson-pretty base base16-bytestring binary bytestring containers cryptohash-sha256 deepseq exceptions formatting hashable @@ -109668,7 +116928,7 @@ self: { mkDerivation { pname = "krpc"; version = "0.6.1.0"; - sha256 = "49f45d457b2c63e12b6115c735f87b0d99e738ab4e6b198797e43a081579b051"; + sha256 = "0ldhg4ahhfp4jy3ijssfmcwfg68dggw3biqmc4my2qrcgd2mvx29"; libraryHaskellDepends = [ base bencoding bytestring containers data-default-class lifted-base monad-control monad-logger mtl network text transformers @@ -109691,18 +116951,30 @@ self: { mkDerivation { pname = "ks-test"; version = "0.1"; - sha256 = "d537aa3d9e92079954403025da0fe00711d8d03dc6d13cbab279681eb95d49f6"; + sha256 = "1xj9bnwiws3rnax3rlf67p8dh487w07xl99h81a9j1wjkqysldym"; libraryHaskellDepends = [ base gamma random-fu roots vector ]; description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; license = stdenv.lib.licenses.publicDomain; }) {}; + "ksystools" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "ksystools"; + version = "0.1.0.0"; + sha256 = "0lvdb3z73nm5csnrvjd3dvzxm411ns8wz07wcpaxqk26szc5igv1"; + libraryHaskellDepends = [ base directory ]; + homepage = "https://github.com/kisom/ksystools#readme"; + description = "System management tooling"; + license = stdenv.lib.licenses.mit; + }) {}; + "ktx" = callPackage ({ mkDerivation, base, bytestring, egl, glew, OpenGL }: mkDerivation { pname = "ktx"; version = "0.2"; - sha256 = "aeefa9e99b0533239710f0f8c2786c48370f6deb424fa3a49e579b748fe0f2e8"; + sha256 = "1s7jw27p96spksja6ks2xdnhyds8diwc5y7h22bj6cq5kglskvxf"; libraryHaskellDepends = [ base bytestring OpenGL ]; libraryPkgconfigDepends = [ egl glew ]; homepage = "https://github.com/corngood/ktx"; @@ -109716,7 +116988,7 @@ self: { mkDerivation { pname = "kure"; version = "2.16.12"; - sha256 = "4c3e7d60fc33254f80ee5535d4fb5b254c1f52ab5f8ea1105eafcb2e637025d9"; + sha256 = "1n95f1ijxjxgbq8a33jzmd91yk15bgxx8damxs04y99kzih7sgjc"; libraryHaskellDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -109728,7 +117000,7 @@ self: { mkDerivation { pname = "kure-your-boilerplate"; version = "0.1.3"; - sha256 = "2b342a06b652e6b7bbafdcdc5e60128c7886d5f677652ad8dc4194ef42afcc2d"; + sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b"; libraryHaskellDepends = [ base kure template-haskell ]; homepage = "http://ittc.ku.edu/~andygill/kure.php"; description = "Generator for Boilerplate KURE Combinators"; @@ -109741,7 +117013,7 @@ self: { mkDerivation { pname = "kyotocabinet"; version = "0.1.4"; - sha256 = "03f1943d7c0bb40d2e259a2ccc93efabe00bf9f7943d5d611921ba40a7af7973"; + sha256 = "0wvrmykl1fi135hmsgclyzwhpq5bxy9wqb4s4lp0vd0bghyr9w83"; libraryHaskellDepends = [ base bytestring cereal ]; librarySystemDepends = [ kyotocabinet ]; homepage = "https://github.com/bitonic/kyotocabinet"; @@ -109754,7 +117026,7 @@ self: { mkDerivation { pname = "l-bfgs-b"; version = "0.1.0.1"; - sha256 = "c793456b91118d5a7023c8d75d3ef89c34e3f8a0571cb5b093adae9b059eff7a"; + sha256 = "0ypzkq2rpbmdjfqba72pl3wf6d4wz0z5vmy84dq5m38ij5mlb4y7"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ lbfgsb ]; homepage = "http://nonempty.org/software/haskell-l-bfgs-b"; @@ -109767,8 +117039,8 @@ self: { ({ mkDerivation, base, text, time }: mkDerivation { pname = "l10n"; - version = "0.1.0.0"; - sha256 = "56f935a18248473cada2bca5cef2c5e98fbab77a02f5bb075ecdc90750de6531"; + version = "0.1.0.1"; + sha256 = "182w8l9h2zw8lxr1fahnmcasbd09z2z00ii7gkmq2y95dm3k4w0a"; libraryHaskellDepends = [ base text time ]; homepage = "https://github.com/louispan/l10n#readme"; description = "Enables providing localization as typeclass instances in separate files"; @@ -109780,7 +117052,7 @@ self: { mkDerivation { pname = "labeled-graph"; version = "1.0.0.0"; - sha256 = "f9b8ac5e727e29c326c06417d99e55d777625d3a5f43314dec1bc100a9dd1618"; + sha256 = "060nvnlh1h8vxi6k2hsz79fn4xypangdj5v4q0kc6abyf9garf7r"; libraryHaskellDepends = [ base labeled-tree ]; description = "Labeled graph structure"; license = stdenv.lib.licenses.bsd3; @@ -109792,7 +117064,7 @@ self: { mkDerivation { pname = "labeled-tree"; version = "1.0.0.0"; - sha256 = "471f18851740747fdeaf5ac53799f65e5632e035a6d7db2f0cc2975f58f4d6b2"; + sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7"; libraryHaskellDepends = [ base ]; description = "Labeled tree structure"; license = stdenv.lib.licenses.bsd3; @@ -109803,7 +117075,7 @@ self: { mkDerivation { pname = "labels"; version = "0.3.2"; - sha256 = "c4060c9fe6adb9f8c34f21acf761a4a5e0f45c4d580a27ead0f05ea2717e0a31"; + sha256 = "0c8agrqs4pphs3m2f2jq9mfg9q55lihzgb119z1zifddwsghq1n4"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/chrisdone/labels#readme"; description = "Anonymous records via named tuples"; @@ -109818,7 +117090,7 @@ self: { mkDerivation { pname = "laborantin-hs"; version = "0.1.5.2"; - sha256 = "9a05f214e60c047bd9537f97d24dbd978111a4ce5ff6730f747cc045766a6fa1"; + sha256 = "18bgd9v4bh3wfh7p7xjzrsj130cppm6x55vzagcpn10cwqag41cs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109843,7 +117115,7 @@ self: { mkDerivation { pname = "labyrinth"; version = "0.5.0.0"; - sha256 = "943938a0cf91e5bb5a4df08c26eac00445f6d4d845898f00e7482222de1e25fa"; + sha256 = "1yi53vg248j8ww08z2a5v3agci84q3m2d37h9mdbprciryh3hfcl"; libraryHaskellDepends = [ base containers derive lens monad-loops MonadRandom mtl parsec random safecopy template-haskell transformers @@ -109869,7 +117141,7 @@ self: { mkDerivation { pname = "labyrinth-server"; version = "0.1.4.1"; - sha256 = "5c993072ac910b7206829acbf3238852f3c38dc86403152014972bcceb47bd02"; + sha256 = "00mx8zmwqawp2hh1a0v4r26w7wsji0iz7jwsh83742wimir316aw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109899,8 +117171,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.4.2"; - sha256 = "3a7f28b66e015a8aafe7af45cfe2da0fec32bdd2ff4f4634def64cce033878c9"; + version = "0.4.3"; + sha256 = "07n5acnrwy991qsx0bg1hbpxky0nxwybnh1zs08n4jmbl10rvsrs"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -109916,7 +117188,7 @@ self: { mkDerivation { pname = "lagrangian"; version = "0.6.0.1"; - sha256 = "5b1cabf2012f0b8e66e47c532d4c14f8cffa8d9ef0cc54a3d782606bbdab541e"; + sha256 = "07jlmfynnq42syim9k7hks6zmkzq2i62slvwwik8w2rg07ran72v"; libraryHaskellDepends = [ ad base hmatrix nonlinear-optimization vector ]; @@ -109938,7 +117210,7 @@ self: { mkDerivation { pname = "laika"; version = "0.1.3.1"; - sha256 = "a1873cd1fb75cc1ff45cca4565cf950ce25fa63bb4d15231349131f07fd63e2f"; + sha256 = "0brysrzz0cci6hqm5ldl7fk5zqhcjp7naifabks1zk3mzg8kr1x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109956,7 +117228,7 @@ self: { mkDerivation { pname = "lambda-ast"; version = "0.0.12"; - sha256 = "ae24f8a90b50bfc95b008003392bd92bb332e25804dacc73f2f3cf0d0f77201e"; + sha256 = "07i0fw7hvkzky9rwrnh4b3i35crbv4mkj0w001dwkgsh1flzh95f"; libraryHaskellDepends = [ base ]; description = "Lambda Calculi Abstract Syntax Trees"; license = stdenv.lib.licenses.bsd3; @@ -109967,7 +117239,7 @@ self: { mkDerivation { pname = "lambda-bridge"; version = "0.1"; - sha256 = "432f86cabf25808903c29b9e19af637f5282e4a6c4301c9670cd09b315e13862"; + sha256 = "0qiqw4av62fdf2b1qc64lvj84lkzcfpik7lvq81qk015pz58cbs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -109979,20 +117251,20 @@ self: { }) {}; "lambda-calculator" = callPackage - ({ mkDerivation, base, hlint, hspec, HUnit, optparse-applicative - , parsec, Shellac, Shellac-readline + ({ mkDerivation, base, containers, hlint, hspec, HUnit + , optparse-applicative, parsec, Shellac, Shellac-readline }: mkDerivation { pname = "lambda-calculator"; - version = "1.1.1"; - sha256 = "9dec187ddefcf7276e845a50f3dc74a61ab4347c196d8f8165b1ddfa2f2dcc84"; + version = "2.0.0"; + sha256 = "1bqlx04rp3ycqzy4x92nd9826pnzyd51k5vkaksxj3vj9nr2ycg5"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base parsec ]; + libraryHaskellDepends = [ base containers parsec ]; executableHaskellDepends = [ base optparse-applicative Shellac Shellac-readline ]; - testHaskellDepends = [ base hlint hspec HUnit ]; + testHaskellDepends = [ base containers hlint hspec HUnit ]; homepage = "https://github.com/sgillespie/lambda-calculus#readme"; description = "A lambda calculus interpreter"; license = stdenv.lib.licenses.mit; @@ -110004,7 +117276,7 @@ self: { mkDerivation { pname = "lambda-canvas"; version = "0.1"; - sha256 = "2231d5a0563a722c2d3cc704edf203b73366c8006097a69cf44102a6030f9493"; + sha256 = "14wl1w1sc0j1yjfad5v00346ccxp0grfs1677hnjqwisashdac92"; libraryHaskellDepends = [ base GLUT mtl OpenGL time ]; description = "Educational drawing canvas for FP explorers"; license = stdenv.lib.licenses.mit; @@ -110019,7 +117291,7 @@ self: { mkDerivation { pname = "lambda-devs"; version = "0.4.0"; - sha256 = "306ff1c56c0b938b38a31beb07c857e7199063f3571d4865dbce9551293352c8"; + sha256 = "1j2j6clm35ffvdjlh7apydir06g7az40gsqvlcw8p4qbdk2z2vrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110044,7 +117316,7 @@ self: { mkDerivation { pname = "lambda-options"; version = "0.9.0.1"; - sha256 = "50684829a88a83492caa34eeddce64bb33fed56dad683f8454ddb03afbd4049b"; + sha256 = "16q4skxkmc6xaj23ys5ddpazwcxvck7dvvilm8n4k0wam0llhs2h"; libraryHaskellDepends = [ base containers mtl read-bounded ]; homepage = "https://github.com/thomaseding/lambda-options"; description = "A modern command-line parser for Haskell"; @@ -110057,7 +117329,7 @@ self: { mkDerivation { pname = "lambda-placeholders"; version = "0.0.0.0"; - sha256 = "ed0d787de92a61f81a6dbbc8c2c953d26673637b0d6197070e5a16857d297e68"; + sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mmirman/lambda-placeholders"; description = "A library to emulate laceholders similar to Scala"; @@ -110071,7 +117343,7 @@ self: { mkDerivation { pname = "lambda-sampler"; version = "1.0"; - sha256 = "caa0d9284dc39ca81a8ff86e4c675d24937dbbe7b6298d9c0aa13524e12d1af2"; + sha256 = "1whs5phj8dd11af8sadnwyxpv4r4bmklqvpqiwdai7639lldk86a"; libraryHaskellDepends = [ base MonadRandom mtl transformers ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -110087,7 +117359,7 @@ self: { mkDerivation { pname = "lambda-toolbox"; version = "1.0.1"; - sha256 = "352ed6da674cddecbd4a59785142995a557abf2e7010108618aa5a82797b21d4"; + sha256 = "1m11gdwq4nma3231043h5szplmask5152y2r9ayyrpacczddcbim"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -110102,7 +117374,7 @@ self: { mkDerivation { pname = "lambda2js"; version = "0.1.0.1"; - sha256 = "75285559fe329da8d788d1b493aa1aea631b12d4595db2ecfed75ef474535258"; + sha256 = "0n2jadsg8pnpzvnb4parsh91nqza3am97d6ii3bsi79jzrcmaa3m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec ]; @@ -110117,7 +117389,7 @@ self: { mkDerivation { pname = "lambdaBase"; version = "0.0.2.0"; - sha256 = "cd12817d945ac61194656962b81a390532fca954647e7c9ea262d178635f82a5"; + sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base parsec ]; license = stdenv.lib.licenses.mit; @@ -110129,7 +117401,7 @@ self: { mkDerivation { pname = "lambdaFeed"; version = "0.3.1"; - sha256 = "08123f5c02d14f84b9a8494d0cfcd7b1da5b1cb7d5533671a30ba7d4a304513e"; + sha256 = "0gji0jix99qbldqkclymnwf5pnmiszy0qka9m2wq8kyi09f3y4h8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 html ]; @@ -110146,7 +117418,7 @@ self: { mkDerivation { pname = "lambdaLit"; version = "0.1.1.0"; - sha256 = "10f41b51abb7b0ab6791addaaa2c41612c4d80e79bb79183ff9913844d2281f7"; + sha256 = "1xw1496q84wrzy1r3dwvwy04sb3184namnmdj5kspc5pmd8ipx0h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110166,7 +117438,7 @@ self: { mkDerivation { pname = "lambdabot"; version = "5.1.0.1"; - sha256 = "24dc7cd5081c443933ce40a1c18c8f492dec436c67d71b7728f23acceca9bda4"; + sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110192,7 +117464,7 @@ self: { mkDerivation { pname = "lambdabot-core"; version = "5.1.0.1"; - sha256 = "ebb542e189ce551c79e3d89f9a0c2898e545abb8c6bf19655b0ec8052cd28970"; + sha256 = "0w49s8n0bj0fbdjikgy6p2mlbrcq5069m7yqwdwiqmffi7hl5dgb"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -110218,7 +117490,7 @@ self: { mkDerivation { pname = "lambdabot-haskell-plugins"; version = "5.1.0.1"; - sha256 = "fccf7635ec1074196695b424261fb243a2b6b71e25110131fbad13278cc6b3da"; + sha256 = "1nmkqs62f4xdzcqh24953svvd8j3n8gjc95ljmk1jx0hxhspdkzw"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -110240,7 +117512,7 @@ self: { mkDerivation { pname = "lambdabot-irc-plugins"; version = "5.1.0.1"; - sha256 = "4e50f2430da752ac36e23cf87ce5b2db9e42cf2e76b48447d2fbc882cdeab1ab"; + sha256 = "1axixb6q5j7vs93q9d3n5v7l57nvnbjpry1ww8vaqlm71m1z4l2f"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -110260,7 +117532,7 @@ self: { mkDerivation { pname = "lambdabot-misc-plugins"; version = "5.1.0.1"; - sha256 = "7a424f1c3919c0e34378ce6187e88b456f264bdf3ddf3d2d6f800631cf2fe1ad"; + sha256 = "1bg15z7k21l0dwnkvprxvx5jcvs5igl8fqffg11y7h0r74f4yhks"; libraryHaskellDepends = [ base bytestring containers filepath hstatsd lambdabot-core lifted-base mtl network network-uri parsec process random random-fu @@ -110281,7 +117553,7 @@ self: { mkDerivation { pname = "lambdabot-novelty-plugins"; version = "5.1.0.1"; - sha256 = "f11918f9fbd0b1c49e69864e7a3a6f4669c4791d5ed9103473c88928c2b557c7"; + sha256 = "1ispnp12i2f8fcs11nay3mww8sa6dwx7lkl6d6gc9cfhzgwih6gi"; libraryHaskellDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -110299,7 +117571,7 @@ self: { mkDerivation { pname = "lambdabot-reference-plugins"; version = "5.1.0.1"; - sha256 = "9713547bd30e5a84ebc9f672aa09ea4f677277a4a42412bdf2ff06aae110a968"; + sha256 = "0s5923hsl1pzyayi4954livp4rsgx84slwpnr7mq8nhfsdxm84wp"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -110316,7 +117588,7 @@ self: { mkDerivation { pname = "lambdabot-social-plugins"; version = "5.1.0.1"; - sha256 = "82502bebb4f51ace089dbccd97e7e699a05d580d33199f743f039e2e96c786dc"; + sha256 = "1p46qyb2x7h37xs9y69k1mc5v84rwvkrgkdwkl4cw6pmnkmjnl42"; libraryHaskellDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -110330,7 +117602,7 @@ self: { mkDerivation { pname = "lambdabot-trusted"; version = "5.1.0.1"; - sha256 = "f92c7d46bca96da2f7dbc7dbc71f90bf911364aba8470a78447a75b25fbf1b87"; + sha256 = "11qvpxgv4xbs8iw0lix8mdj174dzj0gwgny7vgvs4vd9pi37sb7r"; libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ]; homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot trusted code"; @@ -110345,9 +117617,9 @@ self: { mkDerivation { pname = "lambdabot-utils"; version = "4.2.2"; - sha256 = "a715912af48c3fcd56a5c786f7f3c831d2008909cf985fb7b21ded6d6c4ebf56"; + sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7"; revision = "3"; - editedCabalFile = "f54d43d6964d63f1d8796606419b512a6e7b87b1defe960748c27c7417f59a08"; + editedCabalFile = "024sylbp8z62903rdznyn63pnviaa6dl21k6g7cg2qsdjvb46kgm"; libraryHaskellDepends = [ base binary bytestring containers haskell-src mtl network old-time process random regex-compat regex-posix syb tagsoup unix @@ -110366,7 +117638,7 @@ self: { mkDerivation { pname = "lambdacat"; version = "0.1.1"; - sha256 = "79857fc94a4526bdd5263c8ee9d04c42c4b2b84914671e6c58d1885829f8a7a2"; + sha256 = "18m7z0lmi26ib1n1wrql96wb5i229k8fk3iw4vavs9j59b4pz1br"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110388,7 +117660,7 @@ self: { mkDerivation { pname = "lambdacms-core"; version = "0.3.0.2"; - sha256 = "e6d816746634e502964259abd842d5eaaf1ceaa5bae30e71233e32f6ab8f1755"; + sha256 = "0m8piymzcciy4dqhxqxslpm1rbzasm1diasr8ab05r9lcrs1dn76"; libraryHaskellDepends = [ base blaze-html bytestring containers data-default esqueleto file-embed friendly-time gravatar lists mime-mail old-locale @@ -110411,7 +117683,7 @@ self: { mkDerivation { pname = "lambdacms-media"; version = "0.4.0.0"; - sha256 = "acac0386aedea9331d48b3d4c28af1ab5f91610acc409925114c2b7b2f16036f"; + sha256 = "0vq32qppnasc24jrjh6c19hr2pxby65c5m5k90fk7afyms307b5c"; libraryHaskellDepends = [ base directory filepath lambdacms-core persistent shakespeare text time yesod yesod-form @@ -110427,7 +117699,7 @@ self: { mkDerivation { pname = "lambdacube"; version = "2008.12.25"; - sha256 = "6b40b96bfaadecd28234cbaebe1865c6cc2e46969eb6f1a9bcad517df4629ce3"; + sha256 = "1qwwcbs7slddpjlz3dlyjr32xk66clcbxbnb6j1d5v5dz9mvjh3b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base editline mtl pretty ]; @@ -110441,7 +117713,7 @@ self: { mkDerivation { pname = "lambdacube-bullet"; version = "0.2.1"; - sha256 = "9badc01807b1869e918450ae7ca29549ad05f51b0da047ba6d0e8070df46dbf2"; + sha256 = "1wnv8vgp100fdnx4g80d3gshbba9jni7rbjhhj8rx1mi0wcc1bcv"; libraryHaskellDepends = [ base bullet lambdacube-engine mtl vector ]; @@ -110460,7 +117732,7 @@ self: { mkDerivation { pname = "lambdacube-compiler"; version = "0.6.0.1"; - sha256 = "48e0869887cf6e01abe45e95f117c6bb2e50c4d1f0c23895a59438da19fad4e7"; + sha256 = "1rylz8cxlf4llnakihphs7250bmvqqbz35aywjmh2vnghyc8dq28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110483,7 +117755,7 @@ self: { mkDerivation { pname = "lambdacube-core"; version = "0.2.0"; - sha256 = "34cd373d9f23db1bdb2654d7d60d330aaa3256e2647a3300e4aa0503c3e03600"; + sha256 = "001nw31h61dawh036yk4w9b35aha6c6xdmsl4vdipnr3kwykgk9l"; libraryHaskellDepends = [ base bytestring bytestring-trie containers mtl vector ]; @@ -110500,7 +117772,7 @@ self: { mkDerivation { pname = "lambdacube-edsl"; version = "0.2.0"; - sha256 = "1549874c3dd242c502ca24f818ecf93e7bc38b2974af2516d307f2c4a09e8ba2"; + sha256 = "18lbkshc9wh7scb2bbvl565w6yryz7n1iy14r81cahnj7m68fj8m"; libraryHaskellDepends = [ base bytestring bytestring-trie containers ghc-prim lambdacube-core mtl vector @@ -110520,7 +117792,7 @@ self: { mkDerivation { pname = "lambdacube-engine"; version = "0.2.4"; - sha256 = "6eb4d86760a1fe4d5fc4a5b38593cb293d3064cf98fb660277b559ea2d08b7f5"; + sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f"; libraryHaskellDepends = [ array base binary bitmap bytestring bytestring-trie containers directory filepath mtl OpenGLRaw stb-image uulib vect vector @@ -110537,7 +117809,7 @@ self: { mkDerivation { pname = "lambdacube-examples"; version = "0.2.2"; - sha256 = "690132f41ac9d1d81c57fe2e3010674f81c3858f385f627d8597aeb998058492"; + sha256 = "14l40ncbkblphmyn4prqiy2w70agcw830bpyawfdilf93bs340b9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110555,8 +117827,8 @@ self: { }: mkDerivation { pname = "lambdacube-gl"; - version = "0.5.2.3"; - sha256 = "be33bde75e5753c134cba7dd2e98e8f31870bd0bfb3787659a3cf357c677dd2b"; + version = "0.5.2.4"; + sha256 = "1qbf81fv66l0d0j2n1zlf3l2wlmr0wby0j4ckkims2biyzf9pflx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110574,7 +117846,7 @@ self: { mkDerivation { pname = "lambdacube-ir"; version = "0.3.0.1"; - sha256 = "1f28588141a7f2b5ac9847f2f35c8129e68273a3804748a71f06cd728fa001f7"; + sha256 = "1xq1l27p5k863yklhiw0ldrq5ri9h5fg7wj7k2nbbwm7860mha0z"; libraryHaskellDepends = [ aeson base containers mtl text vector ]; description = "LambdaCube 3D intermediate representation of 3D graphics pipelines"; license = stdenv.lib.licenses.bsd3; @@ -110589,7 +117861,7 @@ self: { mkDerivation { pname = "lambdacube-samples"; version = "0.2.0"; - sha256 = "a1098254e7ceabf4f6ab1d8cb644211c824546748b2577e0783b20454469897e"; + sha256 = "0zl9d524a81vg3h7f9cbfi34b0hw452bd30xmgvg9ayfwxa842d1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110604,15 +117876,17 @@ self: { }) {}; "lambdatex" = callPackage - ({ mkDerivation, async, base, containers, directory, HaTeX, hspec - , mtl, QuickCheck, quickcheck-text, text, transformers + ({ mkDerivation, async, base, containers, directory, filepath + , HaTeX, hspec, mtl, QuickCheck, quickcheck-text, text + , transformers }: mkDerivation { pname = "lambdatex"; - version = "0.1.1.0"; - sha256 = "ab86128908697c0f595076b36769e26365d927ade325879d9b350deb489c0164"; + version = "0.2.0.0"; + sha256 = "1affvm2cr8k3zwjq79rcl6gqnd9yv2gw9h7mj09wrrwplgqrzn34"; libraryHaskellDepends = [ - async base containers directory HaTeX mtl text transformers + async base containers directory filepath HaTeX mtl text + transformers ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-text text @@ -110634,7 +117908,7 @@ self: { mkDerivation { pname = "lambdatwit"; version = "0.1.0.0"; - sha256 = "5d5252eda31531f4d707eee5dc64a4fcfe6adae922919fc4f36382832dacb806"; + sha256 = "01mqmhnq70k3yg29z492x7d6mzpwlijdrrgf0zbz8c8mlgnm4ljx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110655,7 +117929,7 @@ self: { mkDerivation { pname = "lambdaya-bus"; version = "0.0.0.2"; - sha256 = "350df664157d067a7166cf620b24222ccfa09f761bb7e430705e19f58249a0f5"; + sha256 = "1xd0961ga6ayf0qf9dqvfsgs1krc48j0nqngcrqpl1kx2mjgc39m"; libraryHaskellDepends = [ base clash-prelude Lambdaya template-haskell ]; @@ -110671,7 +117945,7 @@ self: { mkDerivation { pname = "lambdiff"; version = "0.1"; - sha256 = "9eb31fc64858e76f9c3474b7fdc5d38c43238ccfd3f3a277dbc1ee0432f99b76"; + sha256 = "0xlvz4r09vn1vdvs5wykry626hwcsg2zvdvl6jf6zrsq9331zcwy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110690,8 +117964,8 @@ self: { }: mkDerivation { pname = "lame"; - version = "0.1.0"; - sha256 = "af72ca85baee296af9577c307f263e9590841063903b7feaaae164fd50692e4c"; + version = "0.1.1"; + sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath text transformers wave @@ -110714,7 +117988,7 @@ self: { mkDerivation { pname = "lame-tester"; version = "1.2.1"; - sha256 = "f13129313c8c0fe5757e5ff62ba9a326f19724568dd9e311c341df21633512a6"; + sha256 = "19hj6mij3ps1qc8y7ncdaqj9gw96lfljpxjzgrsya3wc7hqjjcgi"; libraryHaskellDepends = [ base bifunctors containers semigroups validation ]; @@ -110730,7 +118004,7 @@ self: { mkDerivation { pname = "language-asn1"; version = "0.5"; - sha256 = "e3fef756ed6c53c0e9d5058291071ca804f47a418ad0cada816bb440c3c45191"; + sha256 = "14aiqk1l1d3bh7dcml4a85xg81583h3r30h5splw0lvcxmbggzp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec syb ]; @@ -110746,8 +118020,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.6.2"; - sha256 = "63b3201611262cf8aad5b836b2bbe673a6b718bd1a05d16289e3adc790b08ce8"; + version = "0.7.0"; + sha256 = "0w7r5ngpz3ifahjfccz6ma9m2jdmn5nqimk5154hk35skcjwrswx"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ base parsec process QuickCheck tasty tasty-expected-failure @@ -110766,7 +118040,7 @@ self: { mkDerivation { pname = "language-boogie"; version = "0.2"; - sha256 = "3da4e53dd7733e217b755346a67e8a1ef868b00c2ddd938de082d0f8464fd698"; + sha256 = "166n9x3gil42w26r7p9d1jq6iy0yi9zacijkfmxj2gkkswyyb91x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110790,7 +118064,7 @@ self: { mkDerivation { pname = "language-c"; version = "0.5.0"; - sha256 = "86d58bc017a7bba157fc4d5d0ab9e3a3d3f3a2f98bfe46b5b0d5d72a0f5d2222"; + sha256 = "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6"; libraryHaskellDepends = [ array base bytestring containers directory filepath pretty process syb @@ -110801,14 +118075,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c_0_6" = callPackage + "language-c_0_6_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb }: mkDerivation { pname = "language-c"; - version = "0.6"; - sha256 = "5699cd7d386ae5a583d703bbc1c83b46faa618f3e53ff7fe9a97f6c7acb36be6"; + version = "0.6.1"; + sha256 = "1s1pz8lxnc3fbs84a4spayzrww1avkn7jszmazn90r740jfxrji3"; libraryHaskellDepends = [ array base bytestring containers directory filepath pretty process syb @@ -110826,7 +118100,7 @@ self: { mkDerivation { pname = "language-c-comments"; version = "0.3"; - sha256 = "c2652b01c50aa2afcbb87da3300198aba531c4d3b4afb5efc1ec7e719c8bace6"; + sha256 = "1rmciff72zpcq7pvbbxlsg2339dbk00k18vxp35sz8haql0jnrf2"; libraryHaskellDepends = [ array base language-c ]; libraryToolDepends = [ alex ]; homepage = "http://github.com/ghulette/language-c-comments"; @@ -110842,7 +118116,7 @@ self: { mkDerivation { pname = "language-c-inline"; version = "0.7.10.0"; - sha256 = "d1d882c8312bcbc37869b96a5c5a16733db9c917566f11a18a4799fcc6814b94"; + sha256 = "152bh73gr6a7iahi2vsn2z4vjgbk2rd5qsmrd5wc7jrb67485n6i"; libraryHaskellDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell @@ -110861,8 +118135,10 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.7.1"; - sha256 = "5583e92748e6b4cac01536bff86eb119e424e136e03bb3ea0d2db3217328f88c"; + version = "0.11.7.3"; + sha256 = "0lj16igd9m3kgq41bbrs0f73m4vrys43787bizay6in1sxaxq6wf"; + revision = "1"; + editedCabalFile = "0p0ljjpgpfnj7f83cqx1pgqrdn5fkwfcca38qxv387nbq0b8zd1k"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -110878,7 +118154,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c-quote_0_11_7_2" = callPackage + "language-c-quote_0_12" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -110886,8 +118162,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.7.2"; - sha256 = "5654187eaa82afe2b7ad959436b35c561fa5bc5b68af5624ab204e9db3591508"; + version = "0.12"; + sha256 = "14wxbis9zm3zlc3q430is50nk5k2hqx4lracwm2ca7qlg854h2hj"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -110898,7 +118174,7 @@ self: { base bytestring HUnit mainland-pretty srcloc symbol test-framework test-framework-hunit ]; - homepage = "http://www.drexel.edu/~mainland/"; + homepage = "https://github.com/mainland/language-c-quote"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -110909,7 +118185,7 @@ self: { mkDerivation { pname = "language-cil"; version = "0.4.0"; - sha256 = "20c46cc14d63a752a6c20e71a58c590a4405bd158e1f5155edee273be177a084"; + sha256 = "1150fzhkn9zfxmam27wf2nyhai0ab66aaw8fqak559v39p0nri10"; libraryHaskellDepends = [ base bool-extras ]; homepage = "https://github.com/tomlokhorst/language-cil"; description = "Manipulating Common Intermediate Language AST"; @@ -110924,7 +118200,7 @@ self: { mkDerivation { pname = "language-conf"; version = "0.2.2.0"; - sha256 = "f7413ee42c06fb62b47965e2aa1a03355e609177c5d2590d9d129ec0c2a8a39a"; + sha256 = "16m3m31c17hjkl6mkln5fy8n0pim0cdamqk5g6s65yq65kj3whgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110946,7 +118222,7 @@ self: { mkDerivation { pname = "language-css"; version = "0.0.3"; - sha256 = "2f459ba844a6df5e2c2ba8f696ae15e14263ddc259c771c81885909f118015bc"; + sha256 = "1g0mh08rz44533473isrqbfn6hp12np9dxm85cn5xpx68jl9ni9g"; libraryHaskellDepends = [ base pretty ]; description = "CSS 2.1 syntax"; license = stdenv.lib.licenses.bsd3; @@ -110957,7 +118233,7 @@ self: { mkDerivation { pname = "language-dart"; version = "0.2.0.0"; - sha256 = "41b144aa3af001345cf5b2b2a249f332608d8fb7915b97f93c078dc0b4b4e9c5"; + sha256 = "1ig9njsc13877kwrfnwiny7qsq1jyd4s5cmjymf380gh7am49ca1"; libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base hspec raw-strings-qq ]; homepage = "https://github.com/kseo/language-dart#readme"; @@ -110966,26 +118242,28 @@ self: { }) {}; "language-dockerfile" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, free, Glob - , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck + ({ mkDerivation, aeson, base, bytestring, directory, filepath, free + , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck , ShellCheck, split, template-haskell, test-framework - , test-framework-hunit, th-lift, th-lift-instances, transformers + , test-framework-hunit, text, th-lift, th-lift-instances + , transformers, unordered-containers, yaml }: mkDerivation { pname = "language-dockerfile"; - version = "0.3.5.0"; - sha256 = "9667fd70217ebf229369fbaf906bf74926a8ef1651fd965862c47082d09342e5"; + version = "0.3.6.0"; + sha256 = "1dqvnz81qbaabc3sx3lqi725hwvw7dk36v7xvvbpkmy2zl0xv3pn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring free mtl parsec pretty ShellCheck split - template-haskell th-lift th-lift-instances transformers + aeson base bytestring directory filepath free Glob mtl parsec + pretty ShellCheck split template-haskell text th-lift + th-lift-instances transformers unordered-containers yaml ]; testHaskellDepends = [ - base bytestring directory filepath free Glob hspec HUnit mtl parsec - pretty process QuickCheck ShellCheck split template-haskell - test-framework test-framework-hunit th-lift th-lift-instances - transformers + aeson base bytestring directory filepath free Glob hspec HUnit mtl + parsec pretty process QuickCheck ShellCheck split template-haskell + test-framework test-framework-hunit text th-lift th-lift-instances + transformers unordered-containers yaml ]; homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; @@ -110997,7 +118275,7 @@ self: { mkDerivation { pname = "language-dot"; version = "0.1.0"; - sha256 = "15418f000c45efd129d98698d3258ff7996c66c7c9374072334868d2550b1581"; + sha256 = "108m1dax4s286dr40dy9qxk6r6gpiwjx7646v4lx3vs51h08yh8m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; @@ -111008,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 = "df1e3f0d3096d522f278c644d3efbedabee29e2babfdf9d497287550f017883e"; - revision = "2"; - editedCabalFile = "c65730a251b7051a95c3ce313b16502830d2685fb7f88eabde1f323b388acd72"; + 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 @@ -111040,7 +118316,7 @@ self: { mkDerivation { pname = "language-ecmascript-analysis"; version = "0.9.2"; - sha256 = "afb477f63477edd7cd21c817dc2e7f7addede510eff60df07d76daeddf8ba691"; + sha256 = "14d6iggyvnkngpq0vxpg23jyvpbsgwpdq5y8476xgvbp6kv7gd5g"; libraryHaskellDepends = [ base containers language-ecmascript parsec uniplate ]; @@ -111057,7 +118333,7 @@ self: { mkDerivation { pname = "language-eiffel"; version = "0.1.2"; - sha256 = "95d1ffd31ff6bedf71300d7e5f75cb5bc204f5f7744325127ef592ee5c1875ec"; + sha256 = "1v3m31ffx4pmgq92ahvlyzsh9hjvrdsmyzhd61qxzgpn3z9zzlcm"; libraryHaskellDepends = [ array base binary bytestring containers deepseq derive ghc-prim hashable lens mtl parsec pretty text unordered-containers @@ -111075,7 +118351,7 @@ self: { mkDerivation { pname = "language-fortran"; version = "0.5.1"; - sha256 = "44cd3f3e76dc627cce8f442dbaf4f1d54b1db633c313868c8ad1d5dbe16e7f9a"; + sha256 = "16kzdvhxpmfiia68c4y36fv1sjymy7sblba4iz77qqnwfqz3zka4"; libraryHaskellDepends = [ array base haskell-src parsec syb ]; libraryToolDepends = [ alex happy ]; description = "Fortran lexer and parser, language support, and extensions"; @@ -111087,7 +118363,7 @@ self: { mkDerivation { pname = "language-gcl"; version = "0.2"; - sha256 = "2e5366663d4f1487cceb93e3182a62949758f87f7b652074d53af2047f22d08b"; + sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf"; libraryHaskellDepends = [ base bifunctors parsers ]; description = "Something similar to Dijkstra's guarded command language"; license = stdenv.lib.licenses.mit; @@ -111101,7 +118377,7 @@ self: { mkDerivation { pname = "language-glsl"; version = "0.2.0"; - sha256 = "236348543fb992e7cc563f80e1118ba942527ad295eba1a9466a30165cfcaef2"; + sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec prettyclass ]; @@ -111113,12 +118389,32 @@ 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 { pname = "language-go"; version = "0.8"; - sha256 = "6cffbe5f179a62b6afc17ce4f477f32751d52971a028e97e25789c5e4228a4dc"; + sha256 = "1p545115x73q4mzfja50f4lxal97ydvz9r3wq6pvcqls2xgvxzvc"; libraryHaskellDepends = [ array base parsec utf8-string ]; description = "A library for analysis and synthesis of Go code"; license = "GPL"; @@ -111130,7 +118426,7 @@ self: { mkDerivation { pname = "language-guess"; version = "0.1.2"; - sha256 = "e08e6e05f45d03659d813caf03905a6ac314b83b39cd4d12b1ac8205039bb63d"; + sha256 = "0gdnkc1hb0mcn494vk9r7fw19hvaba807brwh6fna0sxyh2nx3p0"; libraryHaskellDepends = [ base bytestring cereal containers ]; description = "Guess at which language a text is written in using trigrams"; license = stdenv.lib.licenses.bsd3; @@ -111142,7 +118438,7 @@ self: { mkDerivation { pname = "language-haskell-extract"; version = "0.2.4"; - sha256 = "14da16e56665bf971723e0c5fd06dbb7cc30b4918cf8fb5748570785ded1acdb"; + sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl"; libraryHaskellDepends = [ base regex-posix template-haskell ]; homepage = "http://github.com/finnsson/template-helper"; description = "Module to automatically extract functions from the local code"; @@ -111157,7 +118453,7 @@ self: { mkDerivation { pname = "language-hcl"; version = "0.1.2.0"; - sha256 = "e2219cfb72ed5b3f0d449513d4315c4f13e2a739fa6f9f15b810d8f1a91f4120"; + sha256 = "08213ylz3n0hp0aryvzs76ky44sgbhqx84wm8h6kynzdfbxrq8g2"; libraryHaskellDepends = [ base deepseq directory filepath megaparsec pretty scientific semigroups text unordered-containers @@ -111182,7 +118478,7 @@ self: { mkDerivation { pname = "language-java"; version = "0.2.8"; - sha256 = "0b789e089e4b18bf6248c2a1a9f3eff23cc19548899899f912597a1c33e9c367"; + sha256 = "0ry3x4riqyjr2bwrk64992aw2g7jxzrsk8f291iby62bkq49wy0b"; libraryHaskellDepends = [ array base cpphs parsec pretty ]; libraryToolDepends = [ alex ]; testHaskellDepends = [ @@ -111202,7 +118498,7 @@ self: { mkDerivation { pname = "language-java-classfile"; version = "0.2.0"; - sha256 = "8ebd823a604da485cc3026d0db0332f03898f7fe252c846c3500ec5cfadff45f"; + sha256 = "0pzlvzx5rv006mn88b15zvvrhf7h681xpl166368b92dc0x85gcf"; libraryHaskellDepends = [ array base binary bytestring containers data-binary-ieee754 data-flags deepseq language-java LibZip mtl parsec utf8-string @@ -111219,8 +118515,8 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.6.0.9"; - sha256 = "a86b98d4fb8c27bbe54f7bedecde2acfea7e7d8e30a55434fd971b15238932cc"; + version = "0.6.0.10"; + sha256 = "0m1yk0v4myzjjv3czhavwlsgzp8ffpmbkwks97d3yipl1d0lrwfa"; libraryHaskellDepends = [ array base blaze-builder bytestring containers mtl text utf8-string ]; @@ -111242,9 +118538,9 @@ self: { mkDerivation { pname = "language-kort"; version = "0.1.0.0"; - sha256 = "2082166bcf06325d23fb221b84756216a0efdf67e9bd1faf9cdb417048fb1936"; + sha256 = "0dhrzd470hfvkjpizgg9czgyz80nc9sq86r2zcimsch6rxmid0i0"; revision = "1"; - editedCabalFile = "970931caa4cb222825b70791198b4adc27877dbab25f0fb912348556e347fbf7"; + editedCabalFile = "1xzv8zimd19l2awhypxjp9yqf9yw9a5ik487nwjjh8nblk5322cp"; libraryHaskellDepends = [ base base64-bytestring bytestring random razom-text-util regex-applicative smaoin text text-position utf8-string @@ -111267,7 +118563,7 @@ self: { mkDerivation { pname = "language-lua"; version = "0.10.0"; - sha256 = "0c2012b6dfe5127158d8300cca11c18ef3be428e010e05d4bd6e1ec9f3fd3c62"; + sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c"; libraryHaskellDepends = [ array base bytestring deepseq text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -111289,7 +118585,7 @@ self: { mkDerivation { pname = "language-lua-qq"; version = "0.1.0.0"; - sha256 = "d2f90a5b5051aa2591960a10d00a0d9ae6392360d32bf361d068e06c0ecde04d"; + sha256 = "0kg0rl76rq38s1hz6aykc0ikkrls1l5d040ajs8jbajia1dhmyfj"; libraryHaskellDepends = [ base haskell-src-meta language-lua mtl syb template-haskell text ]; @@ -111309,7 +118605,7 @@ self: { mkDerivation { pname = "language-lua2"; version = "0.1.0.5"; - sha256 = "4f24d7b015dbe1c7e9d1ead835ce426223531b8b6f408ee97b3d18904424393d"; + sha256 = "0g9r4i29061xgglqwh3gicdm68v28b73bn7as7lwgqfv2nqdf92g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111332,7 +118628,7 @@ self: { mkDerivation { pname = "language-mixal"; version = "0.1"; - sha256 = "65b38dc828f19beba75454c0e62b556822aab747ef65f3495cc0ae01409ff239"; + sha256 = "0fgjkx003bn0bi4z6rgg8yvsl8k8almydh2lajkyp6zi5348vcv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; @@ -111350,9 +118646,9 @@ self: { mkDerivation { pname = "language-nix"; version = "2.1.0.1"; - sha256 = "f0147300724ac39ce388cd6cd717ac3ccc6ed1884ffaafebb18d0f3021e01acf"; + sha256 = "1kqsw0hk03wdn7mszyjgi38nxk1wmhbxfv6di3irrhsaf807657h"; revision = "1"; - editedCabalFile = "d1a9aa97815bb3e764fce7e3d9d9ec5dd75f7f1645ff130ad0335395c91561ff"; + editedCabalFile = "1zv12p4ralrks0517zs52rzmzmsxxkcxkqz7zijfgcsvh6bsmafi"; libraryHaskellDepends = [ base base-compat Cabal deepseq lens pretty QuickCheck ]; @@ -111372,7 +118668,7 @@ self: { mkDerivation { pname = "language-objc"; version = "0.4.2.8"; - sha256 = "5b9acdc7765ed601acf923eac8dd2f97f447fac0f50b03d7547314b8be431d37"; + sha256 = "0dqx8fzbh53kakbh62zmq3x4gx4p5zfwisi3z6n03mjyfv3wv6jv"; libraryHaskellDepends = [ array base bytestring containers directory filepath newtype pretty process syb @@ -111389,7 +118685,7 @@ self: { mkDerivation { pname = "language-openscad"; version = "0.1.7"; - sha256 = "2db783c05f3b846c65142e444ed291d1f5ad3ad3d6d3dc548b37f1c268319aa3"; + sha256 = "18ws65lc5w9pidadrlynscxavxfij794wi1f2ijnr11vbz087drd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring ]; @@ -111407,7 +118703,7 @@ self: { mkDerivation { pname = "language-pig"; version = "0.3.0.1"; - sha256 = "c281be626aab3a5272fd56211ef2a61c753a174816cce0574e35425146fd68d3"; + sha256 = "1lv8zm352him9rby1k0n90bklx8wlvr1w8anzmr54fmbd9ibx0f2"; libraryHaskellDepends = [ base Cabal containers parsec pretty-tree ]; @@ -111434,8 +118730,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.5.1"; - sha256 = "4c33feba8e2b3654d25d7cb3d7a881b1f1228196db2d0335a0a83c995b5f19d4"; + version = "1.3.7"; + sha256 = "1vjmb41hh47gmqv3g7f28rkb3lj8hqpdc7pvs6qa9f6pmqi98m4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111464,50 +118760,6 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; - "language-puppet_1_3_6" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec - , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec - , memory, mtl, operational, optparse-applicative, parallel-io - , parsec, pcre-utils, process, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.6"; - sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory either exceptions - filecache formatting hashable hruby hslogger hspec http-api-data - http-client lens lens-aeson megaparsec memory mtl operational - parsec pcre-utils process random regex-pcre-builtin scientific - semigroups servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -111515,7 +118767,7 @@ self: { mkDerivation { pname = "language-python"; version = "0.5.4"; - sha256 = "ba93508e5e7b6b3c881eb9b04f9032c2e8c5f20255d812a0a365eba82ffbf129"; + sha256 = "0agizcpsisv5lfh15n2m0brcbs626a84zc5r3s43qsvvbs7514xs"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -111523,6 +118775,7 @@ self: { homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python-colour" = callPackage @@ -111530,7 +118783,7 @@ self: { mkDerivation { pname = "language-python-colour"; version = "0.1"; - sha256 = "ffbe07bb62aca31cf11e9725a4489275dbd415459614b3b25c94d40676c857b3"; + sha256 = "1cspr1v0dm4lbjrb654n8lax9nvmj94a89cp3vqir8xccaxhggpz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111547,13 +118800,14 @@ self: { mkDerivation { pname = "language-python-test"; version = "0.5.4"; - sha256 = "e39155a758660df916f3b0f7942a7997e1460e3071d5ef7893a5adb4bb39ed8e"; + sha256 = "13pd76xv9bd5jdwfzmbi6074dqcpg4m99xxhycbgj3b6b2kmb4g3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base language-python ]; homepage = "http://github.com/bjpop/language-python-test"; description = "testing code for the language-python library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-qux" = callPackage @@ -111563,7 +118817,7 @@ self: { mkDerivation { pname = "language-qux"; version = "0.2.0.0"; - sha256 = "1214e38b1ce62f40f43982667d61ccb3f9419f9854008d0d34910f285801ca75"; + sha256 = "0xfa05c2h3wi6h6qs02lk2gl3ydkrihpsrl277s40bz63j5y650j"; libraryHaskellDepends = [ base containers either indents llvm-general-pure mtl parsec pretty transformers @@ -111574,13 +118828,27 @@ 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 }: mkDerivation { pname = "language-sh"; version = "0.0.3.1"; - sha256 = "b334cd7565b39561ecb60af6b371a0f3e431837e4830497aaf61451d9af5d28b"; + sha256 = "12yjynd1sib1mxx4jc28gs1k3r7kl1qv7xhanvn635dkcmswsd5k"; libraryHaskellDepends = [ base directory filepath mtl parsec pcre-light ]; @@ -111598,7 +118866,7 @@ self: { mkDerivation { pname = "language-slice"; version = "0.3.0.0"; - sha256 = "fe3788523faa8b914984fcb2f3e191b36ee7817c48c263cb3f62701b7e202fb5"; + sha256 = "1d9g41z1nw327z5n7hj8gj0yfvmkj7hz7cpwhi4r32xa7x98hdzy"; libraryHaskellDepends = [ base bytestring parsec transformers ]; testHaskellDepends = [ base bytestring HUnit parsec QuickCheck test-framework @@ -111617,7 +118885,7 @@ self: { mkDerivation { pname = "language-spelling"; version = "0.3.2"; - sha256 = "d50fb06fd80313372101704a2ba682a90e264ede098a1a738b2a2dc772e84f16"; + sha256 = "05jgx1rcfb9aidrim2h9vr72c3m9hak2njkh04hkf4q3v1pv03ym"; libraryHaskellDepends = [ array base bk-tree bytestring containers ListLike listlike-instances text tst vector @@ -111638,7 +118906,7 @@ self: { mkDerivation { pname = "language-sqlite"; version = "1.1"; - sha256 = "75242e5974d1a09f37bcf5142e99d5be1a9cf29e0028ea2a91a6e3d74db9ebd6"; + sha256 = "1mpbp56xgqx6j4mfla00kvr9q6mysncjw57mphvrz86ificjw93m"; libraryHaskellDepends = [ array base bytestring containers mtl template-haskell utf8-string ]; @@ -111656,7 +118924,7 @@ self: { mkDerivation { pname = "language-thrift"; version = "0.10.0.0"; - sha256 = "29fd9968799a7feb1321ac3976aeb94cbc5fc39fd073abc5e192990138a3d378"; + sha256 = "0y6klcw036cjw72snwyhkz1mzg2cp6p7cfdc449ynzwsg5l9kz99"; libraryHaskellDepends = [ ansi-wl-pprint base containers megaparsec scientific semigroups text transformers @@ -111675,7 +118943,7 @@ self: { mkDerivation { pname = "language-typescript"; version = "0.0.4"; - sha256 = "ed8b3c8c12d505ce2ae7bdec28bf8093c78442011573ffca12d2b053491b951e"; + sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd"; libraryHaskellDepends = [ base containers parsec pretty ]; homepage = "http://github.com/paf31/language-typescript"; description = "A library for working with TypeScript Definition files"; @@ -111687,7 +118955,7 @@ self: { mkDerivation { pname = "language-vhdl"; version = "0.1.2.8"; - sha256 = "6a245c5330b5df15ad3f8345a3351846bcedda6d4ea3f73a0156f3bf4292c580"; + sha256 = "1065j91bzwsn04xgg8sfdpdfvg2630ss6ic37ynibpxm619mq93a"; libraryHaskellDepends = [ base pretty ]; homepage = "https://github.com/markus-git/language-vhdl"; description = "VHDL AST and pretty printer in Haskell"; @@ -111699,7 +118967,7 @@ self: { mkDerivation { pname = "language-webidl"; version = "0.1.4.0"; - sha256 = "6420bab2e66d34bcf491e71c75a67753e35e5f1015747b3a256105f74915fd1a"; + sha256 = "06px2m4zf1b14lx7nx0m21gmxqskfyk7a777j7sbqd3dwsrbl834"; libraryHaskellDepends = [ base parsec wl-pprint ]; testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; @@ -111715,8 +118983,8 @@ self: { }: mkDerivation { pname = "large-hashable"; - version = "0.1.0.3"; - sha256 = "ece9da94f91dfb97f3507035f280fe89a9bed50cf1071aae1afbd5d288682d89"; + version = "0.1.0.4"; + sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; libraryHaskellDepends = [ aeson base base16-bytestring bytes bytestring containers scientific strict template-haskell text time transformers unordered-containers @@ -111743,7 +119011,7 @@ self: { mkDerivation { pname = "largeword"; version = "1.2.5"; - sha256 = "00b3b06d846649bf404f52a725c88349a38bc8c810e16c99f3100c4e1e9d7d46"; + sha256 = "0ikxklg4w30hyfcnrq8hr348p8s9hg42b9sj9x0byjb6hinv1cq0"; libraryHaskellDepends = [ base binary ]; testHaskellDepends = [ base binary bytestring HUnit QuickCheck test-framework @@ -111762,7 +119030,7 @@ self: { mkDerivation { pname = "lat"; version = "0.6"; - sha256 = "b6ff412595fa2d9ce88e980d972f4ba5364fdee1460afe180e7cec032663df6a"; + sha256 = "0snzcck07v3w1qcgw2j6w7g4ydm59cprf3cqivl9qbgsjljl3zxn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111782,7 +119050,7 @@ self: { mkDerivation { pname = "latest-npm-version"; version = "0.3.1"; - sha256 = "c0663c0d5cffc3512356f711b6aafb25daa1d1bc060aeb5db424a79622a0d27c"; + sha256 = "0z6jl0i9d9r4nifyn2h6pk8s3ni5zfmbc4gpaqim3hzzbh6kqrn0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111811,7 +119079,7 @@ self: { mkDerivation { pname = "latex"; version = "0.1.0.3"; - sha256 = "b742ff5c83f6019469e55d2f3559d8efbc7ce62607e5de76485a7cb314e636d2"; + sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp"; libraryHaskellDepends = [ base containers utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/LaTeX"; description = "Parse, format and process LaTeX files"; @@ -111824,8 +119092,8 @@ self: { }: mkDerivation { pname = "latex-formulae-hakyll"; - version = "0.2.0.2"; - sha256 = "82723a7eac09864eed8349b9b4cbef6f2eb85bb80950b427121c525e3c39bb65"; + version = "0.2.0.3"; + sha256 = "0mdfisdcsbr4q74h6zkrs6pacc2pxhq0dwh31jahpix5p8a07psn"; libraryHaskellDepends = [ base hakyll latex-formulae-image latex-formulae-pandoc lrucache pandoc-types @@ -111842,8 +119110,8 @@ self: { }: mkDerivation { pname = "latex-formulae-image"; - version = "0.1.1.2"; - sha256 = "92f1fa3233eef7992a6fcae9fa240c6859e63ff09d7e89ca212017b974f29f0d"; + version = "0.1.1.3"; + sha256 = "0qf4906n0vs231hiyq6lxck5h5k0gkp9fsn3b0apx94akhr6v0zh"; libraryHaskellDepends = [ base directory errors filepath JuicyPixels process temporary transformers @@ -111860,8 +119128,8 @@ self: { }: mkDerivation { pname = "latex-formulae-pandoc"; - version = "0.2.0.4"; - sha256 = "76013ba9f4b9f1631ac347c026799b4a70bcb3b8a6e07038218befc5d0ec8332"; + version = "0.2.0.5"; + sha256 = "023l02qlzhxkxkccbqlkhfipgis0657vpn8h6c6hdbc0cnl7cpg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111884,9 +119152,9 @@ self: { mkDerivation { pname = "latex-function-tables"; version = "0.1.0.0"; - sha256 = "7145b64e438624e8c5a3590c67f113df5010f8f28feb33aaa95602ef75939af4"; + sha256 = "1x4sjdsyy0jnm6m37swgybw10l6z2gqnf32rlg2yh9468d7bcibi"; revision = "1"; - editedCabalFile = "6bd3bb245f08cc610e07279a310ae99bd37ee797fda60c6fc84b13c9fb38bf83"; + editedCabalFile = "10xz73xwj4sbr1phr9pxjzkpxlwvx45336i70w763k08bwjbplvb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111910,9 +119178,9 @@ self: { mkDerivation { pname = "lattices"; version = "1.5.0"; - sha256 = "c6e3fb4334503b9087209195f40c96f56819497f999959358a2ff5d843a45d1f"; + sha256 = "07sxli1xix9gi8smk6crgx4ijs7mjq6g95ci423r0fsh6i1zpqy6"; revision = "1"; - editedCabalFile = "566d0c60f273b1d938dd9db805546fbcd4b53c132f1dfa259d6d23e212e88512"; + editedCabalFile = "04l5x09f48vdkljzl79g2cybbm5wdxa0bf4xvlwdkcbky9h0qvan"; libraryHaskellDepends = [ base containers deepseq hashable semigroups tagged universe-base universe-reverse-instances unordered-containers void @@ -111925,13 +119193,39 @@ 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 }: mkDerivation { pname = "launchpad-control"; version = "0.0.1.0"; - sha256 = "0223b73078105dc974814eea8bd237b84574f05f3b27b5767d7b44c74bcd7951"; + sha256 = "0lbrrm5wfi3vgmvba9rvbzq78idq6z98psjfh5scjp8hg0qbf8q2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111949,7 +119243,7 @@ self: { mkDerivation { pname = "lax"; version = "0.1.0.3"; - sha256 = "9e5105eb293e99fe2adc6ad80d674f4153a7610ba4bda1370365da428a98c089"; + sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy"; libraryHaskellDepends = [ base ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/lax"; description = "Lax arrows"; @@ -111961,7 +119255,7 @@ self: { mkDerivation { pname = "layers"; version = "0.1"; - sha256 = "ae553ef07a6117fe13d296abd7db21fee75453480440cba8e608a4d51fd7c8fa"; + sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/duairc/layers"; description = "Modular type class machinery for monad transformer stacks"; @@ -111976,7 +119270,7 @@ self: { mkDerivation { pname = "layers-game"; version = "0.5.2"; - sha256 = "fd6f64e4a61c9340c9d7d721b834879375e1c518161097b08f4a7b2e891169cc"; + sha256 = "1k39264jwysaiyq9f40n332y2xckhwsbh8fpsz4l14qwlvj68vzx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111993,7 +119287,7 @@ self: { mkDerivation { pname = "layout"; version = "0.0.0.2"; - sha256 = "89e2053308b369d1ce1f2c64a6a9213e5a5e1e2dcc7177a89ee32b55ec21d988"; + sha256 = "126r47n5aaz3ksl7fwfc5lg5wniy46lscr1c3z7d2sdk10rhbql9"; libraryHaskellDepends = [ base convertible hinduce-missingh ]; description = "Turn values into pretty text or markup"; license = stdenv.lib.licenses.bsd3; @@ -112004,7 +119298,7 @@ self: { mkDerivation { pname = "layout-bootstrap"; version = "0.2.2"; - sha256 = "11fb383fe7725186f75214521b5f0bf77b67ba6b7bbc4c7454c5a04768e1a066"; + sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi"; libraryHaskellDepends = [ base blaze-html containers text ]; homepage = "https://bitbucket.org/dpwiz/layout-bootstrap"; description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5"; @@ -112012,12 +119306,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "layout-rules" = callPackage + ({ mkDerivation, alex-tools, base, text }: + mkDerivation { + pname = "layout-rules"; + version = "0.1.0.1"; + sha256 = "0d296p1lwhcyn1ziqpf0gfp5i0b6lycw7d993gbxrn7lqap7f2mh"; + libraryHaskellDepends = [ alex-tools base text ]; + homepage = "https://github.com/elliottt/layout-rules"; + description = "A collection of different layout implementations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "lazy-csv"; version = "0.5.1"; - sha256 = "888bcbdd43886099f197c1c246cea324c97c076d4839e97eea0b8d6d7b49649f"; + sha256 = "17v495xnv38bx9zfjfa8dl3prj94lg74dhn1jzqrjq488gfwp2w8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -112032,7 +119338,7 @@ self: { mkDerivation { pname = "lazy-io"; version = "0.1.0"; - sha256 = "c953ce66bb15c763b7f0eac890f46d08b1a372b6ae558133a99ddccd39aa7b39"; + sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kawu/lazy-io"; description = "Lazy IO"; @@ -112044,7 +119350,7 @@ self: { mkDerivation { pname = "lazy-io-streams"; version = "0.1.0.0"; - sha256 = "beef343b717030f28fabb7e55bbf687d96769b16081ff8c0bd5bb73da3065d08"; + sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy"; libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = stdenv.lib.licenses.bsd3; @@ -112055,7 +119361,7 @@ self: { mkDerivation { pname = "lazy-search"; version = "0.1.1.0"; - sha256 = "dc186c44e9a06e2fd224a5844c8f45b661754e40a7ba2f87958b5d595c19dcc5"; + sha256 = "1ifw35f5jpcbjn3jzfm78177aqdn8n7lr1554k92yvm0x526q66w"; libraryHaskellDepends = [ base size-based ]; description = "Finds values satisfying a lazy predicate"; license = stdenv.lib.licenses.bsd3; @@ -112066,7 +119372,7 @@ self: { mkDerivation { pname = "lazyarray"; version = "0.1.3"; - sha256 = "f6dc33dd419979e6d95b9bfe332fc72407c5545bbf2c4f10fbb57987fab1822d"; + sha256 = "0bc2n7x8fydmzc84yb5zbdaca1r4qwpk7zlvbgcycycr87fk7p7n"; libraryHaskellDepends = [ array base ]; description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)"; license = stdenv.lib.licenses.bsd3; @@ -112078,7 +119384,7 @@ self: { mkDerivation { pname = "lazyio"; version = "0.1.0.4"; - sha256 = "8b54f0bccdc1c836393ce667ea0f1ad069d52c04762e61fad633d4d44916cf6c"; + sha256 = "0v6g2r4x9m1ksvx62bkn0hndasfh387ylrz67hwkdj61rnyg0m4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base transformers unsafe ]; @@ -112094,7 +119400,7 @@ self: { mkDerivation { pname = "lazyset"; version = "0.1.0.0"; - sha256 = "9e62ccd181117484c63920b8dfb8d385d23119e11595ab2aa045b272c55f4bad"; + sha256 = "1babbz2p5cj5l0map58mw4ck3ll5sfwdzf1077388x0ih78wqqly"; libraryHaskellDepends = [ base containers data-ordlist ]; testHaskellDepends = [ base containers data-ordlist HUnit ]; benchmarkHaskellDepends = [ @@ -112111,7 +119417,7 @@ self: { mkDerivation { pname = "lazysmallcheck"; version = "0.6"; - sha256 = "9dd4dfb590c77e4f6aff68296602de58422eed5e7148fc29190d875a4e7d0f53"; + sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x"; libraryHaskellDepends = [ base ]; homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/"; description = "A library for demand-driven testing of Haskell programs"; @@ -112123,7 +119429,7 @@ self: { mkDerivation { pname = "lazysplines"; version = "0.2"; - sha256 = "de00c0313670612ff9df5bacaf7196fa5379122e0165b718fa5677e5cd1adf64"; + sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y"; libraryHaskellDepends = [ base ]; description = "Differential solving with lazy splines"; license = stdenv.lib.licenses.bsd3; @@ -112135,7 +119441,7 @@ self: { mkDerivation { pname = "lbfgs"; version = "0.1"; - sha256 = "5d022edd4c7098d0651043cf032f7f611712ec9c10bafe520d51e06b83675338"; + sha256 = "0f2kcy1npq2i1m9gxfhhkkn145v1gwph7ks321jx163h9kfjw0jx"; libraryHaskellDepends = [ array base vector ]; description = "L-BFGS optimization"; license = "unknown"; @@ -112146,7 +119452,7 @@ self: { mkDerivation { pname = "lca"; version = "0.3"; - sha256 = "ea4f35072f7b1b217cb0d65493afd8e8449017c7062afe092768ed1219982e20"; + sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/lca/"; @@ -112159,7 +119465,7 @@ self: { mkDerivation { pname = "lcs"; version = "0.2"; - sha256 = "b4db67ead4e2f58c4d462d4c1006d2158744ef3ca8597295a1dfa08537401ff1"; + sha256 = "1w8z80vqb86zl6ap4nd87kpl91qms8310k1d8r6qrxg2skm6gnxl"; libraryHaskellDepends = [ array base ]; homepage = "http://urchin.earth.li/~ian/cabal/lcs/"; description = "Find longest common sublist of two lists"; @@ -112172,7 +119478,7 @@ self: { mkDerivation { pname = "ld-intervals"; version = "0.1.0.0"; - sha256 = "29d59e6a16c5dcae6abd6f941149cb5cd03ffcdf8f64b63fdca405c3da2429d6"; + sha256 = "1mi94kdc61d4vhzvcr4gvzy3zl2wrd4i353gpmmaxp652rm9xm99"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/savannidgerinel/intervals#readme"; description = "Data structures for representing arbitrary intervals"; @@ -112186,7 +119492,7 @@ self: { mkDerivation { pname = "lda"; version = "0.0.2"; - sha256 = "42c7216454c6c9404edb3afaf417f7250458c8240367024d19e6f1ebbc3ebe88"; + sha256 = "125y7syfpwg6356h4rq34k45h115ywbz9yisvd741jf6aij23is2"; libraryHaskellDepends = [ base containers ghc-prim mtl random-fu random-source rvar vector ]; @@ -112202,8 +119508,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.1.0"; - sha256 = "c4b10f1a57476139f1077f34e9d5f1cdde8673851eea3e596cfb28fe9c1c83a1"; + version = "0.2.0"; + sha256 = "0vs6n3q9svwhcp6853ipxmw1anmy8qfy3xajjsf7h4pjnqzy7g88"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers network semigroups stm text @@ -112221,7 +119527,7 @@ self: { mkDerivation { pname = "ldapply"; version = "0.2.0"; - sha256 = "485058de9f3b22897325a71fad13613db3829c84ceffe625872dcf348558f761"; + sha256 = "0qgpb22k9krdhwjydzyfhjf85crxc49ss7x74mrqj8ivkzg5hl28"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112240,7 +119546,7 @@ self: { mkDerivation { pname = "ldif"; version = "0.0.13"; - sha256 = "0a85736fab260470789772e75a1e180985fd55390f9a0790c3b9c6f7e566c055"; + sha256 = "0mf0cvjzgimrqf80g6hg75azv18930g5mrvjjxw70116mdpp718a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112264,7 +119570,7 @@ self: { mkDerivation { pname = "leaf"; version = "1.0.1.1"; - sha256 = "df40c69cc9e78f36b64cb5004b6ae79fbac80c0e3019f39b6ce709d54523f3b3"; + sha256 = "1czk4d2xa2g7djdz669h1q6ciflzwxm4n05m9jv3d3z7r6fcch6z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112283,7 +119589,7 @@ self: { mkDerivation { pname = "leaky"; version = "0.4.0.0"; - sha256 = "c02dfab3bf9e77bc1129fbeb211441cbd8112fb1ac75bed8742b3af6750d9a9d"; + sha256 = "17cs1mszcfibfkcbwxdcn4pi3n6b84a23szv548vqxwypyrzlbf0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112300,8 +119606,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.6.0"; - sha256 = "15651a9e1bb9b20e805a012be57082c5e2c1f59dde51c25f9fb88299150853ed"; + version = "0.6.2"; + sha256 = "0xqkf9ijghbcdypsdfd4ji9aqh43sq736db49y0kilw2hfqxj8pl"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/rudymatela/leancheck#readme"; @@ -112314,7 +119620,7 @@ self: { mkDerivation { pname = "leankit-api"; version = "0.4"; - sha256 = "278b739d6f28cf67cf4238efb8ddef850cf044e4bca683fcd3ab36260e4f5d91"; + sha256 = "14ax9w72cdmbsgy879mwwi2g0345xzfvivrq8b7ngkr8dyfp72r7"; libraryHaskellDepends = [ aeson base bytestring colour curl split ]; @@ -112327,9 +119633,9 @@ self: { mkDerivation { pname = "leapseconds"; version = "1.0"; - sha256 = "c69b5acaf60b610ac6bc68e45c1f96161b920547dc89821220b6836ba8dfd11e"; + sha256 = "07nivyl6p0xn409852fw8w2r46qnjqgmrr38pk30lq8byv55m6y6"; revision = "1"; - editedCabalFile = "4ffceb9290e689f9b707270ab393d57dacc9c69fc880252bfed608830a0b79d8"; + editedCabalFile = "1n3r1c58626nzqmjb068kz3ckb3xsn9v62i70yvzk2g6j29fpz2g"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base tasty tasty-hunit time ]; license = stdenv.lib.licenses.bsd3; @@ -112341,7 +119647,7 @@ self: { mkDerivation { pname = "leapseconds-announced"; version = "2017"; - sha256 = "7fdbc929cfcb87f1daa0d2a278aeb58264ee82bf96ece918013b5b942a477dab"; + sha256 = "1avx8wm98nrv04cfkv4npy1fwr42nnp7i8njl3dg31ybrwlwknvz"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base QuickCheck time ]; homepage = "https://github.com/bjornbm/leapseconds-announced"; @@ -112354,7 +119660,7 @@ self: { mkDerivation { pname = "leapseconds-announced"; version = "2017.1"; - sha256 = "0f9c1add6d3015df20b4ca2b6c0256af4b27732bee5467f3c85cbc698307f619"; + sha256 = "06gn0y1nkg2wr3rnfm7f5drjfjxgaq16qayanhhdy59hdpfim70g"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base QuickCheck time ]; homepage = "https://github.com/bjornbm/leapseconds-announced"; @@ -112368,7 +119674,7 @@ self: { mkDerivation { pname = "learn"; version = "0.1.1"; - sha256 = "f26e4aa36e63755620aefcc945977ddf6c0a0acce562a93b901daf572fb159c4"; + sha256 = "1i2rn4pmgbqxj0xsjqp5rh50lv6zgnblbjgwmqh5cxb3dsillvpj"; libraryHaskellDepends = [ base containers ]; description = "Learning Algorithms"; license = stdenv.lib.licenses.bsd3; @@ -112381,7 +119687,7 @@ self: { mkDerivation { pname = "learn-physics"; version = "0.6.0.2"; - sha256 = "0aa998b401ff2f4acbf611861e95e30340da594f4a4e8bbd6070bd30c9c5ccae"; + sha256 = "1bncqp4k1gbhc2yqnkja9xcxlh03wfaix1hiyv5llbzz06s9ia8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112403,7 +119709,7 @@ self: { mkDerivation { pname = "learn-physics-examples"; version = "0.5.0.1"; - sha256 = "73e0422c7890cd637c4d868408e5618c788557d0fc341923d32aeb54f061953b"; + sha256 = "0fwmc7q59srasciijd7ws1bqay4cc7jhi1469my67kchg0n45q3k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112421,7 +119727,7 @@ self: { mkDerivation { pname = "learning-hmm"; version = "0.3.2.2"; - sha256 = "3a730fa97866640d89f15a73fd7af0261e027c5d5a939231a38a5aead8494aa8"; + sha256 = "1a2a97cflnlalcqr54ssbmy047i6y1xgswssy64hsr36g2lhywrs"; libraryHaskellDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -112435,7 +119741,7 @@ self: { mkDerivation { pname = "leetify"; version = "0.1.0.1"; - sha256 = "795b64c6edfef43e700b5d6200a4a66764b35c827642e7316ec7a84af3c9d780"; + sha256 = "106pr7rlma67dqqyfhknh9fb6r37lsj00qjx1dq3xx7yxp368nvr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers ]; @@ -112448,19 +119754,19 @@ self: { "legion" = callPackage ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring , canteven-http, conduit, conduit-extra, containers - , data-default-class, data-dword, directory, exceptions, http-types - , monad-logger, network, Ranged-sets, scotty, scotty-resource, text - , time, transformers, unix, uuid, wai, wai-extra, warp + , data-default-class, data-dword, exceptions, http-types + , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm + , text, time, transformers, unix, uuid, wai, wai-extra, warp }: mkDerivation { pname = "legion"; - version = "0.9.0.0"; - sha256 = "a40c85edad14c4dca15d3d4ef6b3c240c5afb30a3798ab63acc43f6f1d5a08ce"; + version = "0.10.0.0"; + sha256 = "1pykk4bs5q3mgsj7d5x3lfb0agcrqc3ax745x1vnj9av9wrf2jbg"; libraryHaskellDepends = [ aeson base binary binary-conduit bytestring canteven-http conduit - conduit-extra containers data-default-class data-dword directory - exceptions http-types monad-logger network Ranged-sets scotty - scotty-resource text time transformers unix uuid wai wai-extra warp + conduit-extra containers data-default-class data-dword exceptions + http-types monad-logger network Ranged-sets scotty scotty-resource + stm text time transformers unix uuid wai wai-extra warp ]; homepage = "https://github.com/owensmurray/legion#readme"; description = "Distributed, stateful, homogeneous microservice framework"; @@ -112471,22 +119777,21 @@ self: { "legion-discovery" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal , canteven-http, canteven-log, conduit, containers - , data-default-class, ekg, graphviz, http-types, legion - , legion-extra, monad-logger, scotty, scotty-format - , scotty-resource, SHA, text, time, transformers, wai, wai-extra - , warp + , data-default-class, ekg, graphviz, http-api-data, http-grammar + , legion, legion-extra, monad-logger, mtl, servant-server, SHA + , text, time, wai, wai-extra, warp }: mkDerivation { pname = "legion-discovery"; - version = "0.3.0.0"; - sha256 = "a5bcbbcaec065c4f833b51c05e0379bce3e1f22ca70585b63878ef57dbabfc61"; + version = "1.0.0.1"; + sha256 = "1s87m65c891jp78rzx14bx4fk3qz3iafqc8phxjv839kih2gpsgb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base binary bytestring Cabal canteven-http canteven-log conduit containers data-default-class ekg graphviz - http-types legion legion-extra monad-logger scotty scotty-format - scotty-resource SHA text time transformers wai wai-extra warp + http-api-data http-grammar legion legion-extra monad-logger mtl + servant-server SHA text time wai wai-extra warp ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -112498,17 +119803,16 @@ self: { "legion-discovery-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , data-default-class, http-client, http-types, load-balancing - , network, resourcet, text, transformers + , http-client, http-types, load-balancing, resourcet, text + , transformers }: mkDerivation { pname = "legion-discovery-client"; - version = "0.1.0.3"; - sha256 = "4fd1c98dcade6f1251418f14537df3cffb4af814eca8074f7a06e0efdd67189b"; + version = "0.1.1.1"; + sha256 = "096zj3rc63wci6z1pqlwsmn22gn71rs1pildlizydf6xbpim0w95"; libraryHaskellDepends = [ - aeson base bytestring Cabal containers data-default-class - http-client http-types load-balancing network resourcet text - transformers + aeson base bytestring Cabal containers http-client http-types + load-balancing resourcet text transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/owensmurray/legion-discovery-client#readme"; @@ -112524,8 +119828,10 @@ self: { }: mkDerivation { pname = "legion-extra"; - version = "0.1.2.0"; - sha256 = "20619c18f0b4155fdef8a358338a987e41bc0ae3081990cdfcf3354cc4c67bec"; + version = "0.1.2.2"; + sha256 = "1p6wyggfi6dihw2lq53kyz8x4shriwnxm6avl77f5lmskr0grmig"; + revision = "1"; + editedCabalFile = "1pzqm1n2rnnv5i5fj5s6n79hyzp8sd2xid1h1i4jpwy6chnj060v"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring canteven-log conduit containers data-default-class data-dword directory legion network @@ -112553,9 +119859,9 @@ self: { mkDerivation { pname = "leksah"; version = "0.15.2.0"; - sha256 = "44be854eb7091fb383ddfbf497772d9a9b27c033a4e9ba9994c6a9b36d4e9606"; + sha256 = "01ln9rnv7af6jjcvmsd46g02g6ws5mvrgx7vvn1v67q9nx78bgj4"; revision = "1"; - editedCabalFile = "b5498ba06634ac70bf2bb4d09b85324a95a3b1b8bff92430ad761ae8280e0f47"; + editedCabalFile = "0iqg1qlfh6knmlq29ydzp2qs75aa6a2rpl5l5fzp1b1lcsh8njdm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112594,7 +119900,7 @@ self: { mkDerivation { pname = "leksah-server"; version = "0.15.2.0"; - sha256 = "62a6a781f60822273592f34b08da46afba214a337befb92764a08f54e2355241"; + sha256 = "0haj6pi593x0chkvkvvv6d523fmg8vd0hjzkj8sjf8h8ys0sg9k2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112618,6 +119924,7 @@ self: { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -112628,7 +119935,7 @@ self: { mkDerivation { pname = "lendingclub"; version = "0.1.1"; - sha256 = "dd71c97413e3e35a5a706f686d85e22b071435c417d26f7bfb6f17e24ec580e4"; + sha256 = "1r40qm7f45vgzdxnzlhpqhsi81rbwa2nss3gf1d5mqz32dscjwfx"; libraryHaskellDepends = [ aeson base blaze-builder bytestring HsOpenSSL http-streams io-streams mtl scientific text vector @@ -112653,9 +119960,9 @@ self: { mkDerivation { pname = "lens"; version = "4.15.1"; - sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6"; + sha256 = "19myn50qwr1f8g3cx4fvzajln428qb8iwyi4qa9p2y5rn56adyjw"; revision = "4"; - editedCabalFile = "e055de1a2d30bf9122947afbc5e342b06a0f4a512fece45f5b9132f7beb11539"; + editedCabalFile = "0f8mn6zgfclibdgy9v1ga550ysmh8biwbyvsjhi93grh5lddwmg0"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -112679,17 +119986,70 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens_4_15_3" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , Cabal, cabal-doctest, comonad, containers, contravariant + , criterion, deepseq, directory, distributive, doctest, exceptions + , filepath, free, generic-deriving, ghc-prim, hashable, hlint + , HUnit, kan-extensions, mtl, nats, parallel, profunctors + , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect + , tagged, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text + , th-abstraction, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.15.3"; + sha256 = "0znd63nkpdndpdgpvcwnqm31v4w2d1ipkj8lnnbsabbrhywknqd2"; + setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring comonad containers + contravariant distributive exceptions filepath free ghc-prim + hashable kan-extensions mtl parallel profunctors reflection + semigroupoids semigroups tagged template-haskell text + th-abstraction transformers transformers-compat + unordered-containers vector void + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving hlint HUnit mtl nats parallel QuickCheck + semigroups simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lens-accelerate" = callPackage + ({ mkDerivation, accelerate, base, lens }: + mkDerivation { + pname = "lens-accelerate"; + version = "0.1.0.0"; + sha256 = "0j4mbkpdwycpc4m9vh43ylxw1k7ayhbjm8r50jb1dha24fb3d9z4"; + libraryHaskellDepends = [ accelerate base lens ]; + homepage = "https://github.com/tmcdonell/lens-accelerate"; + description = "Instances to mix lens with accelerate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-action" = callPackage - ({ mkDerivation, base, comonad, contravariant, directory, doctest - , filepath, lens, mtl, profunctors, semigroupoids, semigroups - , transformers + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant + , directory, doctest, filepath, lens, mtl, profunctors + , semigroupoids, semigroups, transformers }: mkDerivation { pname = "lens-action"; - version = "0.2.0.2"; - sha256 = "e26c70b2de68a7cfbce97bcdabdcdfb45b2c50708207a14f8dd24c3e29c6d371"; - revision = "2"; - editedCabalFile = "f2f18c678cce0e700a1cb84a093a4643df46298adc5eb2ab6210f6fdcd7e0bfc"; + version = "0.2.1"; + sha256 = "07b5bh9m7brhwkpc0x3k9k4xvvs6r4g51fflsay1r4b1kl6zaabk"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids semigroups transformers @@ -112701,23 +120061,21 @@ self: { }) {}; "lens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, directory - , doctest, filepath, generic-deriving, lens, scientific, semigroups - , simple-reflect, text, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, doctest, generic-deriving, lens, scientific + , semigroups, simple-reflect, text, unordered-containers, vector }: mkDerivation { pname = "lens-aeson"; - version = "1.0.0.5"; - sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f"; - revision = "4"; - editedCabalFile = "6fde3d7feb42ad58f74e89202ec01d0397bd1c8bf00b2042edaa293479d70385"; + version = "1.0.1"; + sha256 = "1g8d6a7lhg6i1v56afm6x102pcxk0dxcyh2j7qqi62vp12kamljx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector ]; testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect + base doctest generic-deriving semigroups simple-reflect ]; homepage = "http://github.com/lens/lens-aeson/"; description = "Law-abiding lenses for aeson"; @@ -112729,7 +120087,7 @@ self: { mkDerivation { pname = "lens-datetime"; version = "0.3"; - sha256 = "bb1f8d7bf71c9ef8901bc39e2a2d629b1101307115c0c4d844fcbd8e86b6ccd4"; + sha256 = "1m6cns38xggw8kcc9h0mf4q024cvc8njm7n33f8gi7hwyxxqs7xv"; libraryHaskellDepends = [ base lens time ]; homepage = "https://github.com/nilcons/lens-datetime"; description = "Lenses for Data.Time.* types"; @@ -112743,7 +120101,7 @@ self: { mkDerivation { pname = "lens-family"; version = "1.2.1"; - sha256 = "41838eba3fa063dc467bbcd70f9395c8429c08ecab2ff779d01b459222cd9ab7"; + sha256 = "1dwsrli94i8vs1wzfbxbxh49qhn8jn9hzmxwgd3dqqx07yx8x0s1"; libraryHaskellDepends = [ base containers lens-family-core mtl transformers ]; @@ -112756,7 +120114,7 @@ self: { mkDerivation { pname = "lens-family-core"; version = "1.2.1"; - sha256 = "95e3b9876a6cdcc6865bfad22e04af41430c7a9a6bc96e9a25a2a35a841d19a4"; + sha256 = "190r3n25m8x24nd6xjbbk9x0qhs1mw22xlpsbf3cdp3cda3vkqwm"; libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 98 Lens Families"; license = stdenv.lib.licenses.bsd3; @@ -112767,13 +120125,25 @@ self: { mkDerivation { pname = "lens-family-th"; version = "0.5.0.0"; - sha256 = "948e6ad30a9869db5536d02356ba63e7ec1d9d8d04a0cff4c4252b49a4de959e"; + sha256 = "17lmvsj4jar5qkscz804infivv77cfx5c8yh6raxnscq1b9nm3ll"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; description = "Generate lens-family style lenses"; license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "lens-labels"; + version = "0.1.0.1"; + sha256 = "0yskbghzi5cqiqcrw1d6h98kd9m5i76xi6x343rflfkkng3725rl"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/google/proto-lens"; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-prelude" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , either, hashable, lens, mtl, text, time, transformers @@ -112782,7 +120152,7 @@ self: { mkDerivation { pname = "lens-prelude"; version = "0.2"; - sha256 = "b791b36b946f34dc0b3437a2923b670790d8a6cdec171c9ce4b13290b1471f29"; + sha256 = "0a8z8yqr0cmiwjf1q5zcrnkdi407cwxr58ip6h5xqd3gjimv74dp"; libraryHaskellDepends = [ array base bytestring containers contravariant either hashable lens mtl text time transformers unordered-containers vector @@ -112797,7 +120167,7 @@ self: { mkDerivation { pname = "lens-properties"; version = "4.11"; - sha256 = "3c0ccdd7cf33cc3c79a86bb51815ab1a402dbe4fdff317c3f05e15adcbb1e031"; + sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; @@ -112812,7 +120182,7 @@ self: { mkDerivation { pname = "lens-regex"; version = "0.1.0"; - sha256 = "4954b3ae395661e916c536bfe837c42a1cd8223ea81ffd86b1fdd9b6abfc5142"; + sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112833,7 +120203,7 @@ self: { mkDerivation { pname = "lens-simple"; version = "0.1.0.9"; - sha256 = "613d99b8074197f8a026a641a9940dd188e0d81e808169f420981a9ca15b832a"; + sha256 = "0al3bfhrq6lq43s6k0c03vcf126i1naajhd64shgi5s10yw9jgb1"; libraryHaskellDepends = [ base lens-family lens-family-core lens-family-th mtl transformers ]; @@ -112846,8 +120216,8 @@ self: { ({ mkDerivation, base, fclabels, generics-sop, transformers }: mkDerivation { pname = "lens-sop"; - version = "0.2.0.1"; - sha256 = "13a335a49acfef59ab8d39845a5bb174826c342c1705a96caa0c7d1fba6d7966"; + version = "0.2.0.2"; + sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z"; libraryHaskellDepends = [ base fclabels generics-sop transformers ]; @@ -112861,7 +120231,7 @@ self: { mkDerivation { pname = "lens-text-encoding"; version = "0.1.0.0"; - sha256 = "5b3b2202bf61431de89ddd0dd57ba5282a80cebaa835fd0a03f499c80e5aaafb"; + sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv"; libraryHaskellDepends = [ base bytestring lens text ]; homepage = "http://github.com/iand675/text-lens-encoding"; description = "Isomorphisms and prisms for text <=> bytestring conversions"; @@ -112874,7 +120244,7 @@ self: { mkDerivation { pname = "lens-time"; version = "0.1.0.0"; - sha256 = "ea17516a6fd2830112570dd574e0d6ce53f7a887832323ff60fe28894d4b37c3"; + sha256 = "1hrp9d6qja7yc3zj68w3hylgflyfsvh79m8daw9030yjdxm525za"; libraryHaskellDepends = [ base lens time ]; description = "lens for Data.Time"; license = stdenv.lib.licenses.mit; @@ -112886,7 +120256,7 @@ self: { mkDerivation { pname = "lens-tutorial"; version = "1.0.2"; - sha256 = "ef2638f69bfbb35f15adc20bde588419889eb0f7c899b3f03ae746fc08d1e1b5"; + sha256 = "1dg1s44gqip77bqb76f8yyq9x20rhicdw2y2mlamzczvkgv3h9pg"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; description = "Tutorial for the lens library"; @@ -112899,7 +120269,7 @@ self: { mkDerivation { pname = "lens-utils"; version = "1.2"; - sha256 = "2baa0afaf1cfd406335b940c9fc375ab5bbd0bb1f26fb8eca613b901e04d59fb"; + sha256 = "1ysr9ph03f8klvnbhvzjn45vsnxbfp1ry34lbcrhdm6gy7x0maib"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/wdanilo/lens-utils"; description = "Collection of missing lens utilities"; @@ -112912,9 +120282,9 @@ self: { mkDerivation { pname = "lens-xml"; version = "0.1.0.0"; - sha256 = "21ef72a6579a56528fd158aa9594e50257224cf77dcc303a5fd153a2097a1ba8"; + sha256 = "1a0vg84s4lyibwx31k3xyx624mq2wna9bajqs67m4mlsayk75vr1"; revision = "1"; - editedCabalFile = "5e9b888e270e22fee6210c9a6f329e31e80d4c0a54d064ef29ef969bc443b21d"; + editedCabalFile = "07dj8g29p5pg57pn9l2l1960vs1ikqr6z6hc47kgw8hf4y78i6sy"; libraryHaskellDepends = [ base lens xml ]; testHaskellDepends = [ base lens xml ]; homepage = "https://github.com/nkpart/lens-xml#readme"; @@ -112927,7 +120297,7 @@ self: { mkDerivation { pname = "lenses"; version = "0.1.7"; - sha256 = "a4cb3d1e654295470c1e8c215715780440d689b3922778eccabf09180bbce126"; + sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "http://github.com/jvranish/Lenses/tree/master"; description = "Simple Functional Lenses"; @@ -112940,7 +120310,7 @@ self: { mkDerivation { pname = "lensref"; version = "0.2"; - sha256 = "76919a922e1fbfa2c20f99356f4d65584fcb27a2043f6bdd6b28859d311c4436"; + sha256 = "0dj43hqrv198dgfnngq4l8kwnksqcm6nydcr1z1a5gqz5s99m4bn"; libraryHaskellDepends = [ base monad-control mtl transformers ]; testHaskellDepends = [ base ]; homepage = "http://www.haskell.org/haskellwiki/LGtk"; @@ -112957,8 +120327,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.8.0"; - sha256 = "108af2057f56b74a8a42e8f1bbb47e7af64cff612bb90f886e93f6118651154e"; + version = "1.0.9.0"; + sha256 = "14ygg1f8f2rpwvgjii3g8k6q87iy20i78n10ia2gggn6yhkdl0s4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112981,10 +120351,8 @@ self: { ({ mkDerivation, base, base-unicode-symbols, transformers }: mkDerivation { pname = "lenz"; - version = "0.1"; - sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397"; - revision = "1"; - editedCabalFile = "48a9254ce289eedf5db423844732c4b5a42798d94b3c2e82b4b9770f87c97f07"; + version = "0.1.2.1"; + sha256 = "058j5gkcz0dcwscnssjzxhkgkq5zxffbsj12dwbgiiyd57fwfv88"; libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; @@ -112998,7 +120366,7 @@ self: { mkDerivation { pname = "lenz-template"; version = "0.1"; - sha256 = "f03ca02d69c19f34c191f7cc41a15f167cba9e60c0791069eac7cd302a5877b1"; + sha256 = "1cbpb0m31kf7x9li0yf0c2gblz0nbyhl3k7pj70k97y1d4ns0g7h"; libraryHaskellDepends = [ base base-unicode-symbols containers lenz template-haskell ]; @@ -113012,7 +120380,7 @@ self: { mkDerivation { pname = "level-monad"; version = "0.4.1"; - sha256 = "0a0db3c067adbb2174587e787a9b672fa6fe88970bddf77c7544b2b52ff4b2d0"; + sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a"; libraryHaskellDepends = [ base fmlist ]; homepage = "http://github.com/sebfisch/level-monad"; description = "Non-Determinism Monad for Level-Wise Search"; @@ -113026,8 +120394,8 @@ self: { }: mkDerivation { pname = "leveldb-haskell"; - version = "0.6.4"; - sha256 = "25a8f9c2cdd5a32423389173a6323bd804689f69aee1082c57887ea74ead1b04"; + version = "0.6.5"; + sha256 = "0a3csz8zmjjp90ji1yqrc3h7rb1b612i6v4kfwxagswd0s4b05x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113052,7 +120420,7 @@ self: { mkDerivation { pname = "leveldb-haskell-fork"; version = "0.3.4.4"; - sha256 = "589935f658b432546ba3e82f1473c55365a2a3fd01e3751faa93f3c2a79f2c08"; + sha256 = "021ckykw5wwkm8gpbqq1znis4rakqmri8bz8ldmm8cmlb3v3b6aq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113073,8 +120441,8 @@ self: { ({ mkDerivation, base, bindings-levmar, hmatrix, vector }: mkDerivation { pname = "levmar"; - version = "1.2.1.6"; - sha256 = "90e6560a6d3e94ea6e0517079b4f00559725c120047ea98bb7500624e6a2747e"; + version = "1.2.1.7"; + sha256 = "07sdxa5xbgp26bjpchiy1g2n37chy95v0hfy8al5wyfbnlfws5xg"; libraryHaskellDepends = [ base bindings-levmar hmatrix vector ]; homepage = "https://github.com/basvandijk/levmar"; description = "An implementation of the Levenberg-Marquardt algorithm"; @@ -113087,7 +120455,7 @@ self: { mkDerivation { pname = "levmar-chart"; version = "0.2"; - sha256 = "5271f6dadec35b22d6fd00900992c819d2e7a7daa7e53016c9f19879a3684973"; + sha256 = "0ws9d2ipk67ir4b31rd7vakyglhrr290k400zpb24ny3vvdgcwaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Chart colour data-accessor levmar ]; @@ -113103,7 +120471,7 @@ self: { mkDerivation { pname = "lexer-applicative"; version = "2.1.0.1"; - sha256 = "3e9612800e7d70f997e0d3396628b91133568b9e85e2c160834d1eb96acca49c"; + sha256 = "1754rimbj7jdhdhc3ql5ks5mccqip4l6cffkw2bzjw3x1s0155iy"; libraryHaskellDepends = [ base regex-applicative srcloc ]; testHaskellDepends = [ base deepseq regex-applicative srcloc tasty tasty-hunit @@ -113118,7 +120486,7 @@ self: { mkDerivation { pname = "lfst"; version = "1.0.2"; - sha256 = "daf5167b5239834939082783c17b39bebf47400ccf2286077360a40902b1f1f4"; + sha256 = "1x7in410k930fc3qc8ng1i04ggxy75xw30r710wlk0rra9xidxfs"; libraryHaskellDepends = [ base containers doctest lattices ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/ci-fst/lfst"; @@ -113136,7 +120504,7 @@ self: { mkDerivation { pname = "lgtk"; version = "0.8.0.4"; - sha256 = "65571ad08db84660f9f2fee92b4ab7745fdaf2eae22dac111bfbdb8f6202f0ae"; + sha256 = "1bph09i8znzv3c8sqbg2xbrdlpvlnx52psgyybwn0imqip81lmv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113160,7 +120528,7 @@ self: { mkDerivation { pname = "lha"; version = "0.1.2"; - sha256 = "21ceb7eeb33769bc50022e422304006011da7366757e321310fedaa6410bb028"; + sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1"; libraryHaskellDepends = [ haskell2010 ]; homepage = "https://github.com/bytbox/lha.hs"; description = "Data structures for the Les Houches Accord"; @@ -113176,7 +120544,7 @@ self: { mkDerivation { pname = "lhae"; version = "0.0.3"; - sha256 = "e321777e626e5f35aa454661ef322419bd414caf25cf8d9f50bbb4c541470f88"; + sha256 = "120g8x0wbd5va2gqvkr5mx643g8r4hrfyqa68nm3apvfc9z7f8g3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113194,7 +120562,7 @@ self: { mkDerivation { pname = "lhc"; version = "0.10"; - sha256 = "23b3cd7479108864b5a167b3fd1b1f58bf49b1773f590c68c766dcd4a999a0f4"; + sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3"; isLibrary = false; isExecutable = true; homepage = "http://lhc.seize.it/"; @@ -113208,7 +120576,7 @@ self: { mkDerivation { pname = "lhe"; version = "0.5"; - sha256 = "4989ab085f6b9eb6faf666a418753645c8104276852d4c6e4cd186134b2ee220"; + sha256 = "08725r5i71ni9ip4qbc5fr111j256rsii936yvxbd7kbbw4ap2a9"; libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ]; description = "Parser and writer for Les-Houches event files"; license = stdenv.lib.licenses.mit; @@ -113222,7 +120590,7 @@ self: { mkDerivation { pname = "lhs2TeX-hl"; version = "0.1.4.5"; - sha256 = "34c5dbf422072e18590fa07d570518894f5c911b78a9027d11407eb3e38ca6d6"; + sha256 = "1mm6ikiv6zj025yh5abq3f8mqkw9302mfzd01xcihbh74bsdpi9l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113239,7 +120607,7 @@ self: { mkDerivation { pname = "lhs2html"; version = "0.999999"; - sha256 = "9b3176a491fa3bf55e3de1640dc4ef17124af8156c60d38bcea501ca8cbd9bb3"; + sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath Glob ]; @@ -113254,7 +120622,7 @@ self: { mkDerivation { pname = "lhs2tex"; version = "1.19"; - sha256 = "24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e"; + sha256 = "03mhhkrqjjqmmh18im8di1cl6wqv30lsib5hv73f0wsnv5bhbbi4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113270,7 +120638,7 @@ self: { mkDerivation { pname = "lhslatex"; version = "0.1.0.0"; - sha256 = "c71dddb6bd4bf15727822a8f18a627066ba01b7a140f01ffa33e87084ce8f54d"; + sha256 = "0kgmx160i1rylgzh23qlg8ds0sq64yk1i3rah8kmgwabpnvds7f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113289,7 +120657,7 @@ self: { mkDerivation { pname = "libGenI"; version = "0.16.1"; - sha256 = "bff2dc6597e84d8ab664dc82aaf9c736eb1ddf756db15f043186805e19bb67d8"; + sha256 = "1n37pccmx0466425zcbdfpgivsrnqzwsm0nwcjv8lkg8jxjxrwmz"; libraryHaskellDepends = [ base binary containers HUnit mtl parsec process QuickCheck ]; @@ -113306,7 +120674,7 @@ self: { mkDerivation { pname = "libarchive-conduit"; version = "0.1.0.0"; - sha256 = "045c321b10c1b77922347ba53c77b6b89fa37b787ecc46d9978c90cf7bb74e08"; + sha256 = "022fnxxwz44cjzcldk3yg1xs77xqnrvkr9bv6hi7kdy120dk4p04"; libraryHaskellDepends = [ base bytestring conduit resourcet transformers ]; @@ -113323,7 +120691,7 @@ self: { mkDerivation { pname = "libconfig"; version = "0.3.0.0"; - sha256 = "22605b11f7e9e9b9a94cbbc12172660e177e968384bbc462573c79c3bcdb5994"; + sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12"; libraryHaskellDepends = [ base binary cereal cereal-text deepseq hashable profunctors text text-binary transformers transformers-compat @@ -113345,7 +120713,7 @@ self: { mkDerivation { pname = "libcspm"; version = "1.0.0"; - sha256 = "3b1deccd3662c94cc27bd25f27dbd925529ea62719a285a5970ea87050441ced"; + sha256 = "1v8w8i871a0fjyjqb8hr4yk9wli5v7djfpyjgg14rjb26v6yq79v"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath graph-wrapper hashable hashtables mtl pretty text value-supply @@ -113364,7 +120732,7 @@ self: { mkDerivation { pname = "libexpect"; version = "0.3.2"; - sha256 = "4c678a92c503528b62b77ae69e1287fa7af3314f93a7953e79382e135462fa76"; + sha256 = "0xpsc9a16biqg4z9b9wk9wqz6ypshw99xrksnxi8nlh3qn98lrsc"; libraryHaskellDepends = [ base unix ]; librarySystemDepends = [ expect tcl ]; description = "Library for interacting with console applications via pseudoterminals"; @@ -113377,7 +120745,7 @@ self: { mkDerivation { pname = "libffi"; version = "0.1"; - sha256 = "48387067c0f33bcfadf7a3bebbf48a55294202500f2b754229ffc8f12cb4f23c"; + sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ ffi ]; libraryPkgconfigDepends = [ libffi ]; @@ -113390,7 +120758,7 @@ self: { mkDerivation { pname = "libgit"; version = "0.3.1"; - sha256 = "1d4c60dd987c363d77c4be947678d01a51ab4b568964c30a33827ccc854f7522"; + sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x"; libraryHaskellDepends = [ base mtl process ]; homepage = "https://github.com/vincenthz/hs-libgit"; description = "Simple Git Wrapper"; @@ -113403,8 +120771,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.11"; - sha256 = "1ce20578fea025dfed6613bad8b64fa35ae7d49b2ffba0fce559d7eeafbe10c8"; + version = "1.12"; + sha256 = "04mm5va8dzxhp65q404dq44zma9x069sw9hyqmz1xj7b9cwkigwn"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -113422,7 +120790,7 @@ self: { mkDerivation { pname = "libhbb"; version = "0.4.1.0"; - sha256 = "4807247c377442e07d050ae854ec6859b1678060a9ed81bb4348b870ad639e9f"; + sha256 = "17wycfnp1f288fxq3vd9c206gcard3n59s0a0myy0hkl6xy281s8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113446,7 +120814,7 @@ self: { mkDerivation { pname = "libinfluxdb"; version = "0.0.4"; - sha256 = "25b5bbc274c9e18bc46ea0271805adfcaaec6d46caa69eb465e0cbc03f63ef3f"; + sha256 = "0gzgcczw1jz0cns9x9na8rnyrapwml2ih9x0dv28pqf9fk1bpd95"; libraryHaskellDepends = [ base bytestring clock containers http-client http-client-tls http-types resource-pool stm text @@ -113466,7 +120834,7 @@ self: { mkDerivation { pname = "libjenkins"; version = "0.8.4"; - sha256 = "e7602fc1312661a8305e3ddb84b365cf520c74b9afbd4c5b741e05ab8fb71123"; + sha256 = "08qiny7sn18yfidlrgdgp5s0qlngcnrq9nrxbqqahq96670jyq77"; libraryHaskellDepends = [ async attoparsec base bytestring conduit containers free http-client http-conduit http-types monad-control mtl network @@ -113494,7 +120862,7 @@ self: { mkDerivation { pname = "liblastfm"; version = "0.6.0"; - sha256 = "2f00f7713e9c235e271c133a41f1806c193a03827b9c675f80b83cd11bc1d264"; + sha256 = "0r6jq4dx2g5qh1gng73vh81kl6bch3ql2fhk3hkmw8ww7rqzf01g"; libraryHaskellDepends = [ aeson base bytestring cereal containers cryptonite http-client http-client-tls network-uri profunctors semigroups text @@ -113513,31 +120881,36 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary - , boomerang, bytestring, containers, containers-unicode-symbols - , contravariant, data-default, data-textual, dns, exceptions - , filepath, hjsonschema, lens, machines, managed, mtl, network + , boomerang, bytestring, concurrent-machines, containers + , containers-unicode-symbols, contravariant, data-textual, dns + , exceptions, filepath, hjsonschema, lens, lifted-async + , lifted-base, machines, managed, monad-control, mtl, network , network-ip, parsers, pathtype, protolude, QuickCheck, random - , semigroups, stm, stm-containers, temporary, test-framework - , test-framework-quickcheck2, test-framework-th, text, text-icu - , text-icu-normalized, text-printer, time, transformers, zippers + , semigroups, stm, stm-chans, stm-containers, temporary + , test-framework, test-framework-quickcheck2, test-framework-th + , text, text-icu, text-icu-normalized, text-printer, time + , transformers, transformers-base, zippers }: mkDerivation { pname = "liblawless"; - version = "0.17.1"; - sha256 = "dbba3ab5865c0f957daf3ead4e3f7c16a44ba2e3c4fbbe4ced429f1c88e6f397"; + version = "0.24.0"; + sha256 = "1dqz2d8zgwb8i176fhga5637y8mfxiq0vq1ws0lsy9ijlpyiikmp"; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring - containers containers-unicode-symbols contravariant data-default - data-textual dns exceptions hjsonschema lens machines managed mtl - network network-ip parsers pathtype protolude QuickCheck random - semigroups stm stm-containers temporary text text-icu - text-icu-normalized text-printer time transformers zippers + concurrent-machines containers containers-unicode-symbols + contravariant data-textual dns exceptions hjsonschema lens + lifted-async lifted-base machines managed monad-control mtl network + network-ip parsers pathtype protolude QuickCheck random semigroups + stm stm-chans stm-containers temporary text text-icu + text-icu-normalized text-printer time transformers + transformers-base zippers ]; testHaskellDepends = [ - aeson base binary bytestring exceptions filepath network QuickCheck - semigroups stm temporary test-framework test-framework-quickcheck2 + aeson base binary bytestring exceptions filepath QuickCheck + temporary test-framework test-framework-quickcheck2 test-framework-th text time transformers ]; + homepage = "https://gitlab.com/theunixman/liblawless"; description = "Prelude based on protolude for GHC 8 and beyond"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113548,7 +120921,7 @@ self: { mkDerivation { pname = "liblinear-enumerator"; version = "0.1.2"; - sha256 = "226262bc6696573b9c347f283c7ae1ed54af8fd1e693afb101f90aebc0f1a0a7"; + sha256 = "19x0y70fn2pr06qsz4z6s67sym7dw5x3qa3z6jf3nmwncsy64qi2"; libraryHaskellDepends = [ base bindings-DSL enumerator mtl vector ]; @@ -113562,8 +120935,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "libltdl"; - version = "0.1.1"; - sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828"; + version = "0.1.1.1"; + sha256 = "0gqcg444dfsrnid7waxa14a20776ykyg6rnkg23xivs3lni7q341"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -113587,7 +120960,7 @@ self: { mkDerivation { pname = "libmolude"; version = "0.12.3"; - sha256 = "4914c6c7dbbf08d5ab03498654d096ee3b21385ecb5be5e2574b05215b2f55b2"; + sha256 = "1cjm5xdj21abazifanybbqw22fzfjv8591j90fmxa25zvg3wc529"; libraryHaskellDepends = [ aeson base base-unicode-symbols binary bytestring concurrent-machines containers containers-unicode-symbols @@ -113614,7 +120987,7 @@ self: { mkDerivation { pname = "libmpd"; version = "0.9.0.6"; - sha256 = "bdebb946bba078ed85de12d71ef2e7efa7f28c1ed806d9a390a20d5e4590c937"; + sha256 = "0dy9j12mw3d2j2ixj1nq3s6g59zgwzr1xmqjvs2ysy50pd3bksxx"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -113633,7 +121006,7 @@ self: { mkDerivation { pname = "libnotify"; version = "0.2"; - sha256 = "665603c8343e5c7773b4fba87edd146d2f4565e75087609d1874fc4523955f59"; + sha256 = "0nazjlilbz3l32fn11shwxjlabvd2kfpxa7vnirpfp1y6k406mk6"; libraryHaskellDepends = [ base bytestring glib gtk ]; librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; @@ -113647,7 +121020,7 @@ self: { mkDerivation { pname = "libnvvm"; version = "1.0.0"; - sha256 = "bdb65595a7f97512e47ca1c34697a65d25bb6d3604ad31f243d3ff64d0a56b03"; + sha256 = "00vblp869zyk8gr33b846rnvn9axlsbldhx1gkj14xgrlyambdmx"; libraryHaskellDepends = [ base bytestring cuda ]; librarySystemDepends = [ nvvm ]; libraryToolDepends = [ c2hs ]; @@ -113667,7 +121040,7 @@ self: { mkDerivation { pname = "liboleg"; version = "2010.1.10.0"; - sha256 = "461dfdf46c4cf1a1227841fb570ea9443d4e6d613b9ac37a730b797d038d60d3"; + sha256 = "1lv0il1psy8bfdxc76ivc5nlwga4m475gys1g0ia3wacdksgs7a6"; libraryHaskellDepends = [ base CC-delcont containers mtl template-haskell unix ]; @@ -113682,7 +121055,7 @@ self: { mkDerivation { pname = "libpafe"; version = "0.1.1.0"; - sha256 = "9a5b4a003f695166119a3823e27ec12afc57cc52794be1b9edaf16803c4a5ad0"; + sha256 = "1l2s98y805mgxnwy2jvrab65gz1aq5zf48rqk88nclb97w04lnws"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ pafe ]; testHaskellDepends = [ base bytestring iconv transformers ]; @@ -113696,7 +121069,7 @@ self: { mkDerivation { pname = "libpq"; version = "0.4.1"; - sha256 = "270ac70be12966fbc013408afdf9c0acb86da63e7b34e75fc39fe383bbfa4887"; + sha256 = "11s8zaxq7qwzqdgyfd3v7sk6vf5cq3wzv2j02g0gnri9w45wf2i7"; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; homepage = "http://github.com/tnarg/haskell-libpq"; @@ -113710,7 +121083,7 @@ self: { mkDerivation { pname = "librandomorg"; version = "0.0.1.0"; - sha256 = "b6cf23821a444e0e4f738d21b0a86dbb3bc172f86ba0be6445874b445c2aaf1f"; + sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn"; libraryHaskellDepends = [ base bytestring curl ]; homepage = "https://github.com/supki/haskell-random.org"; description = "Wrapper to Random.org API"; @@ -113726,7 +121099,7 @@ self: { mkDerivation { pname = "librato"; version = "0.2.0.1"; - sha256 = "e42365b06c6ee5d99742801330950a8e6fcb747974954f2f7dc3940dfa4418d0"; + sha256 = "1l0q8kx0v563glplz5blg5scnvwf1aak04w08abxkrbfdjq6a8z4"; libraryHaskellDepends = [ aeson attoparsec base bytestring either http-client http-conduit http-types mtl resourcet text unordered-containers uri-templater @@ -113745,7 +121118,7 @@ self: { mkDerivation { pname = "libravatar"; version = "0.4"; - sha256 = "32cade964a11e8474cdb23bcc5f9f8d6dbdc6186daeb191dc300d64eb7f21f2c"; + sha256 = "0b0zyavlxmh0qcfiksyshrhxrnynz3wwbg13vd64gs0i9abdxjij"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class dns memory random text uri-bytestring url @@ -113760,7 +121133,7 @@ self: { mkDerivation { pname = "libroman"; version = "3.1.1"; - sha256 = "f1c3f44561c9478072578dca2729ee6b31cb29589024bb8a6f4483243639cf87"; + sha256 = "11yg74v290s4dy5bn94hb0lwncbbxqljgjldaxr80iy9c52z9hzi"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://ahakki.xyz"; @@ -113775,8 +121148,8 @@ self: { }: mkDerivation { pname = "libssh2"; - version = "0.2.0.3"; - sha256 = "7caa9f23ae3ff54a819ff56bbecc7953fe39aa958c77feebd52849f2bf86cd75"; + version = "0.2.0.4"; + sha256 = "1abdd5k4pnfxpg1kg1kvmwgwv946zlndhnydhhphad2ah3d2pkjf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring network syb time ]; @@ -113786,6 +121159,7 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libssh2; ssh2 = null;}; "libssh2-conduit" = callPackage @@ -113795,7 +121169,7 @@ self: { mkDerivation { pname = "libssh2-conduit"; version = "0.1"; - sha256 = "10b1095e6048924247a097973c1c4849a5f4f9bffa53dc1e6b7712c6b191ecfe"; + sha256 = "1zpcj6qwc4kpdcgdqlzspzwz99a990f3r5wpl13l54j8c1g0kc8h"; libraryHaskellDepends = [ base conduit libssh2 monad-control stm transformers ]; @@ -113812,7 +121186,7 @@ self: { mkDerivation { pname = "libstackexchange"; version = "0.3.0.0"; - sha256 = "48203528e8e6d5210435e9a8e254267f4a43a0338031bb82044bb76366856803"; + sha256 = "00v8hmk67dsb0j1bncc06fh46jkz4raf5a796l223mg6x0l3a828"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers data-default http-conduit profunctors text @@ -113830,7 +121204,7 @@ self: { mkDerivation { pname = "libsystemd-daemon"; version = "0.1.0.1"; - sha256 = "c03dbef58f9d32fecce539cc3f118f43e9a92418736cb8b96960f87c14f3bfe6"; + sha256 = "1rmzyca7ry30d6wvhv3k30jaksa3iw8kzk1rwp6gwclxizsvwgf0"; libraryHaskellDepends = [ base bytestring network utf8-string ]; librarySystemDepends = [ systemd-daemon ]; libraryPkgconfigDepends = [ libsystemd-daemon ]; @@ -113850,9 +121224,9 @@ self: { mkDerivation { pname = "libsystemd-journal"; version = "1.4.1"; - sha256 = "6d23d1a7ba6cf2bb014955ce13b482f422f75264185b86323dc100aa288e3a1b"; + sha256 = "06rsiqlal0617lr8cnqqci9gf8plhas17kjm940vpwkcpakx28vd"; revision = "1"; - editedCabalFile = "5c775e26f3173d812a4080ea94b13d7cc25a350f59a800e3d403a05c04a9933c"; + editedCabalFile = "0g4km425r803skih1a2r1wsmmhkw7nqr9sl080m82g8pyck5wxsw"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe text transformers uniplate unix-bytestring unordered-containers uuid vector @@ -113869,7 +121243,7 @@ self: { mkDerivation { pname = "libtagc"; version = "0.12.0"; - sha256 = "4a6e34c8d110e1c27966c73c3199ba1ca733e1375ea4d933c3b9cfec9840f9b8"; + sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja"; libraryHaskellDepends = [ base bytestring glib ]; librarySystemDepends = [ taglib ]; libraryPkgconfigDepends = [ taglib ]; @@ -113884,7 +121258,7 @@ self: { mkDerivation { pname = "libvirt-hs"; version = "0.2.1"; - sha256 = "bdcdc7cc53ad2dfaa08513c163e72044d9bbd125afe0551fa0aa78ddfd5b740a"; + sha256 = "02klbgyxsy5al0gmbq5g4p8vpna443kn7h8khnhglbddag6cgkdx"; libraryHaskellDepends = [ base syb unix ]; libraryPkgconfigDepends = [ libvirt ]; libraryToolDepends = [ c2hs ]; @@ -113898,8 +121272,8 @@ self: { ({ mkDerivation, base, bytestring, cpu }: mkDerivation { pname = "libvorbis"; - version = "0.1.0.1"; - sha256 = "346fbe26e9229b1e7a8a1841b288b07ae683f6bfdbf2a6aea7caa752b6147b7a"; + version = "0.1.0.2"; + sha256 = "19mx07gvwsqhbish8cbbiplgpw75birn19sl0hhn2300kpryyxfb"; libraryHaskellDepends = [ base bytestring cpu ]; homepage = "https://github.com/the-real-blackh/libvorbis"; description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files"; @@ -113912,7 +121286,7 @@ self: { mkDerivation { pname = "libxls"; version = "0.2"; - sha256 = "c6c1185ffd7981c459cd785b0ff3ad40b868a1d6cbf8eb8bd106ec2374aa740e"; + sha256 = "03klm9s27v06s65ypy6bsshnif20mprhynvqrmcw90brzmgiihf6"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Bindings to libxls"; license = stdenv.lib.licenses.mit; @@ -113924,7 +121298,7 @@ self: { mkDerivation { pname = "libxml"; version = "0.1.1"; - sha256 = "d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07"; + sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libxml2 ]; description = "Binding to libxml2"; @@ -113939,7 +121313,7 @@ self: { mkDerivation { pname = "libxml-enumerator"; version = "0.5"; - sha256 = "ef96c33f75f638cfbe2f6ad46e301a496deb1141b641cd663973b8c049211057"; + sha256 = "0mqh454w1f3k75kcshdn848ynva938q6xm3a5yzcyf7nflzw75pg"; libraryHaskellDepends = [ base bytestring enumerator libxml-sax text transformers xml-types ]; @@ -113954,7 +121328,7 @@ self: { mkDerivation { pname = "libxml-sax"; version = "0.7.5"; - sha256 = "99141784cc0d6c5749f0df618b2d46922391eede09f4f9ccfc36fb58a9c16d51"; + sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r"; libraryHaskellDepends = [ base bytestring text xml-types ]; librarySystemDepends = [ libxml2 ]; libraryPkgconfigDepends = [ libxml2 ]; @@ -113968,7 +121342,7 @@ self: { mkDerivation { pname = "libxslt"; version = "0.1"; - sha256 = "aad8ea748a8c787bf791a83fb6e3937413a64d42318e1e9f5b0df150e747ffeb"; + sha256 = "1szz8zkm1w8dbfgix3ii896sc4vljgivcgx8j7vpny4ci9sfmn5a"; libraryHaskellDepends = [ base bytestring libxml ]; librarySystemDepends = [ xslt ]; description = "Binding to libxslt"; @@ -113981,7 +121355,7 @@ self: { mkDerivation { pname = "libzfs"; version = "0.2.0.0"; - sha256 = "85cce97cf4f0fa9be343427ecd3ab0d18c93e6264f1562eafd54fd59dbb06bbc"; + sha256 = "1g3bn3dmkzalzpm645ag4vk9736in0xcszj28girpyphyiyfkk45"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl transformers ]; @@ -114000,7 +121374,7 @@ self: { mkDerivation { pname = "licensor"; version = "0.2.0"; - sha256 = "87ec4cbc25e9efa51d4bf5d7904db62169807c164041995dacc77c165d3071e5"; + sha256 = "1rbi61ficz67mifrjha02ry80s91nr6r1mzm9cfsbvz94ny4rv47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114019,7 +121393,7 @@ self: { mkDerivation { pname = "life"; version = "0.1"; - sha256 = "586b8ac937bc7b966dbbdc7c02919488faa8f734522805d4c91e85015ad83a37"; + sha256 = "0drsv1d0318yr7a0aa2j6kvsiyl8jj8h4z6wpdnrcyxw6z4qlssq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base GLUT OpenGL random ]; @@ -114035,7 +121409,9 @@ self: { mkDerivation { pname = "lift-generics"; version = "0.1.1"; - sha256 = "07cf2cc4416fb7b0e45595da8a964459498da976e18cdcc169ac2416143930cb"; + sha256 = "1jrh74a1c95cd70xr371fslqsjar8jb8mnlmapjb1dvg8722rkq7"; + revision = "1"; + editedCabalFile = "03vpmdgarz41zx1q51a4bx3x3qfvs7wfnqym8xiv4i9sxdr82yy8"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell ]; @@ -114054,8 +121430,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.9.1.1"; - sha256 = "31ac44b834723c9b9d40a319135a712802f2690d700df283d0a380fcd8d48e40"; + version = "0.9.3"; + sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -114076,8 +121452,8 @@ self: { }: mkDerivation { pname = "lifted-base"; - version = "0.2.3.10"; - sha256 = "e677e560b176c40da2478d2f27dbeadc79630b2295ea3828603e0de4784d24fc"; + version = "0.2.3.11"; + sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control test-framework test-framework-hunit @@ -114099,7 +121475,7 @@ self: { mkDerivation { pname = "lifted-protolude"; version = "0.1.6"; - sha256 = "ad5cbb992e07d92bfc71cb566ac2472d4996a925b17bb92c1da3c7d97cdf31eb"; + sha256 = "1srivxydkix33lnbjyxi4nlrcj9d8z16lmnbf7y2pn875scvnp5d"; libraryHaskellDepends = [ async base bytestring containers deepseq exceptions ghc-prim lifted-async lifted-base mtl safe stm text transformers @@ -114114,9 +121490,9 @@ self: { mkDerivation { pname = "lifted-threads"; version = "1.0"; - sha256 = "7f7dd54c54b252f3f3884a18282364a2b785ace96e8922b1d013fd62573800eb"; + sha256 = "1sq071bn5z8ks2qj52bfx6n8bdx2chijh62ai3rz6lmjai6dazbz"; revision = "1"; - editedCabalFile = "9ca26a82d283f9c00a7de537198cd0ce1a05e6e802e0e7f82663c45242a9e973"; + editedCabalFile = "0wz9m5155i334vwfgq02x3k0a6nfs261jdz5gl5c1yc3sa16m8lw"; libraryHaskellDepends = [ base monad-control threads transformers-base ]; @@ -114132,7 +121508,7 @@ self: { mkDerivation { pname = "lifter"; version = "0.1"; - sha256 = "ecb2ef028cf858543708c7e9b27c00017eac5d4dd547426ddc99dcdcaa908085"; + sha256 = "11c0j2mdrp4rvinl4iym9mfsqzh101yb5sf710vm8n7qih1fzcpc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114149,7 +121525,7 @@ self: { mkDerivation { pname = "ligature"; version = "0.1.0.0"; - sha256 = "2bb369a7c271fccfccf974149bb4d4899ba674d6d021a66f8529de0b1705030e"; + sha256 = "03h30lbhppi9hmpsc8fhsrsad6w9sjs9n53lz76czz3iqaknkcrb"; libraryHaskellDepends = [ base text ]; description = "Expand ligatures in unicode text"; license = stdenv.lib.licenses.mit; @@ -114161,7 +121537,7 @@ self: { mkDerivation { pname = "ligd"; version = "0.2"; - sha256 = "376b3f4eed6211308bfa0f9a4d4fde9a6eb7d569affd8f5fca30654542e9aec3"; + sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/spl/ligd"; description = "Lightweight Implementation of Generics and Dynamics"; @@ -114176,7 +121552,7 @@ self: { mkDerivation { pname = "lightning-haskell"; version = "0.1.0.3"; - sha256 = "1930569f4d52ead5c72f3a8beeb9c9ba3cc805cb7d89832ffbcae997ead275c0"; + sha256 = "1h3msbm9gsfazcpq72bxrc2whg5sr6wyx2rs5z3xbsjj9ngmcc0r"; libraryHaskellDepends = [ aeson api-builder base blaze-html bytestring data-default-class free http-client http-client-tls http-types mtl network text @@ -114198,7 +121574,7 @@ self: { mkDerivation { pname = "lighttpd-conf"; version = "0.4"; - sha256 = "c835afb47ca0f6916ccfc94f9666ba884c70ac5f7c7d7275601e5f2eccd2b520"; + sha256 = "085msb62wpqyc1sp4zbwbyn70k48p9k9cky9rxn93xm0gjsaydf8"; libraryHaskellDepends = [ array base bytestring packedstring pretty template-haskell ]; @@ -114215,7 +121591,7 @@ self: { mkDerivation { pname = "lighttpd-conf-qq"; version = "0.5"; - sha256 = "d840cca76d6336c3df195b1e0a981e1d5c3eaac1d49c97c9c09f1b086d04a3d9"; + sha256 = "1nd30inhh6wzq34rg76lq6m3wp0x3sc0l7jv37gw6dk3dnkwqh6q"; libraryHaskellDepends = [ array base bytestring haskell-src-exts lighttpd-conf template-haskell @@ -114232,7 +121608,7 @@ self: { mkDerivation { pname = "lilypond"; version = "1.9.0"; - sha256 = "fc11db8e2c79a17137513ed1a0486d498a375922cdb3b8969c4baf57ee9c66d9"; + sha256 = "1nb6kkp5gbsbkjbbicyd49ckg2j9dm4a1l9ya4vp38br5j7dn4gw"; libraryHaskellDepends = [ base data-default music-dynamics-literal music-pitch-literal prettify process semigroups vector-space @@ -114249,7 +121625,7 @@ self: { mkDerivation { pname = "limp"; version = "0.3.2.1"; - sha256 = "53d6a827cc09868a0dab698d8c4abaab96453eb82a3ea5a8010c1f42e9c1a83b"; + sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th @@ -114265,7 +121641,7 @@ self: { mkDerivation { pname = "limp-cbc"; version = "0.3.2.1"; - sha256 = "5e76c9001938826f949f50a6712eb565cdbf0fba726d9ea13c75f3654dfa8a60"; + sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy"; libraryHaskellDepends = [ base containers limp vector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base limp ]; @@ -114280,7 +121656,7 @@ self: { mkDerivation { pname = "lin-alg"; version = "0.1.0.3"; - sha256 = "3e9622c7353f03d6a097ec4d12a5ba571d5c580811293c72ec8088434315dc79"; + sha256 = "0yfw2m1l7240xir3qa8i11c5q7appaji4kgcjyhdc0rz6p3j55iy"; libraryHaskellDepends = [ base NumInstances vector ]; description = "Low-dimensional matrices and vectors for graphics and physics"; license = stdenv.lib.licenses.bsd3; @@ -114292,19 +121668,49 @@ self: { mkDerivation { pname = "linda"; version = "0.1.2"; - sha256 = "85e81818bda1643d9874100dc1f14600a55421f4c19d48f2dfc9e70d9389a834"; + sha256 = "0d58i69hvry9vzr4i7f1yhhm99808vqw238hfjc3sr51plc1is45"; libraryHaskellDepends = [ base hmatrix HUnit ]; description = "LINear Discriminant Analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "linden" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, containers + , deepseq, delay, exceptions, filepath, hashable, hedis, http-types + , lens, monad-supply, mtl, random-fu, rosezipper, SHA, text, time + , unordered-containers, uuid, wai, wai-app-static, wai-cors + , wai-extra, warp, zlib + }: + mkDerivation { + pname = "linden"; + version = "0"; + sha256 = "05x9xbmk4irlk26rq84m761ahldxx6zwigf9s3zj133x7c7nq6ka"; + revision = "1"; + editedCabalFile = "0bvcyh2mryg78kd2yrxz0g67ry4bb23xvrg7pnl0jla49wzg8pjf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring containers deepseq delay + exceptions filepath hashable hedis http-types lens monad-supply mtl + random-fu rosezipper SHA text time unordered-containers uuid wai + wai-app-static wai-cors wai-extra zlib + ]; + executableHaskellDepends = [ + base containers hashable mtl random-fu rosezipper text uuid warp + ]; + homepage = "https://oss.xkcd.com/"; + description = "Zen gardening, based on l-systems"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lindenmayer" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "lindenmayer"; version = "0.1.0.1"; - sha256 = "c1979f5f74ae6fb4763806721dc9406e0241ff412e38739973507dbf1725ff1d"; + sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/reinh/hs-lindenmayer"; description = "L-systems in Haskell"; @@ -114320,7 +121726,7 @@ self: { mkDerivation { pname = "line"; version = "2.2.0"; - sha256 = "ab22bb9cccc8aafaa61a1a42e8c9b65bcd3995e269949a5e2df8ebd0677697a8"; + sha256 = "1a4pfrkx1szq5mg9m539waakkkavnv4yhhhs3akgman8rjfbn8mb"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 http-conduit http-types scotty text time transformers wai @@ -114335,12 +121741,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "line_3_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types + , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text + , time, transformers, wai + }: + mkDerivation { + pname = "line"; + version = "3.1.0"; + sha256 = "0s5cp8si8iabbm53jsicy158xym6jpxllykfwjsn1c13kydq40by"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 + http-conduit http-types scotty text time transformers wai + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 hspec + hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty + text time transformers + ]; + homepage = "https://github.com/noraesae/line"; + description = "Haskell SDK for the LINE API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "line-break"; version = "0.1.0.1"; - sha256 = "16a447a8f57319ff868d5c37c83150d38af607f2c085674a717d954cf77ecf5d"; + sha256 = "0pfggvvlr5bxf556g1f0y83zd2nka0qwhdswin3gy6bkynl4g90n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -114348,12 +121779,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "line-size" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "line-size"; + version = "0.1.0.0"; + sha256 = "1nvrbb44ws695622dnppx7xffbik6c7kqnfixrb3gqajc58jjyxs"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + homepage = "xy30.com"; + description = "Display the number of bytes of each line"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "line2pdf" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { pname = "line2pdf"; version = "0.0.7"; - sha256 = "253db37ee661b0003024b2ab23b9242f7c21597c4ebbf614b8cfc4d4a45c1375"; + sha256 = "0x8kbjjd9i6gp0agdfsfgicj2z1g4jwj7axj4hq01c31wrzb6g95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; @@ -114364,19 +121809,20 @@ self: { "linear" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, cereal, containers, deepseq, directory, distributive - , doctest, filepath, ghc-prim, hashable, HUnit, lens, reflection - , semigroupoids, semigroups, simple-reflect, tagged + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens + , reflection, semigroupoids, semigroups, simple-reflect, tagged , template-haskell, test-framework, test-framework-hunit , transformers, transformers-compat, unordered-containers, vector , void }: mkDerivation { pname = "linear"; - version = "1.20.5"; - sha256 = "61d8b7242f1e7c27925df7ffe1aa8b1fd732e61598f3af48b9999d8fb464cc0d"; + version = "1.20.6"; + sha256 = "1xcr36g6rr7k0vlzsh6szzxxrdi1f6vb9sxdilcpsb8xjvkk258m"; revision = "1"; - editedCabalFile = "59fb06c2c7326ffedc00c3b54a89fecf6bf664e9bea0845f5cd933249c0113d5"; + editedCabalFile = "0jgfgn0i5882yhmbqc1w9g7gk713l5r66xyaxiwg7nmw82smmakk"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection @@ -114384,8 +121830,8 @@ self: { transformers-compat unordered-containers vector void ]; testHaskellDepends = [ - base binary bytestring directory doctest filepath HUnit lens - simple-reflect test-framework test-framework-hunit + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector ]; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; @@ -114397,13 +121843,32 @@ self: { mkDerivation { pname = "linear-accelerate"; version = "0.2"; - sha256 = "e62ad99a2f2366c457a75eecba34c0fe8036ecf3f60d59ad41936b26f8af6310"; + sha256 = "0433mzw2cswk86nmj3gnygn3d07yq0sbmv2ylxbw8ri35yddjap6"; libraryHaskellDepends = [ accelerate base lens linear ]; homepage = "http://github.com/ekmett/linear-accelerate/"; description = "Instances to use linear vector spaces on accelerate backends"; license = stdenv.lib.licenses.bsd3; }) {}; + "linear-accelerate_0_4" = callPackage + ({ mkDerivation, accelerate, base, Cabal, cabal-doctest + , distributive, doctest, lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.4"; + sha256 = "03pma42zkk6cfisyfsjmb8496jkfqiab3my4wdahk8z9shmqa3rg"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + accelerate base distributive lens linear + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/linear-accelerate/"; + description = "Lifting linear vector spaces into Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-algebra-cblas" = callPackage ({ mkDerivation, base, ieee754, QuickCheck, storable-complex , test-framework, test-framework-quickcheck2, vector @@ -114411,7 +121876,7 @@ self: { mkDerivation { pname = "linear-algebra-cblas"; version = "0.1"; - sha256 = "71c03d8b48ba9098f3144669f2aab52f52bfdd7b434cde529ee4d1fc4fb04af3"; + sha256 = "1wsan17zrlg4kr9dwk23ggfvylignnmg4sa62krri45s925kvh3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114433,7 +121898,7 @@ self: { mkDerivation { pname = "linear-circuit"; version = "0.0"; - sha256 = "8daca90d45a7a0a99910e863f2bedaf46b4b7caaa32cc0ef58e4c4376d72b93e"; + sha256 = "0gmrf9nkgi74b3pw0b53m9y4nszlvazg4qz822csk8578l6skb4d"; libraryHaskellDepends = [ base comfort-graph containers hmatrix utility-ht ]; @@ -114452,7 +121917,7 @@ self: { mkDerivation { pname = "linear-grammar"; version = "0.0.2.1"; - sha256 = "273d7796a24d0a8773f9cb175f1878e5c9052822c28ae055585f990731836e03"; + sha256 = "00vfhcqhg6azb1ay12n248l0bjg5g0c5y5ybz5rqf2jdlab7fg97"; libraryHaskellDepends = [ base containers QuickCheck ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A simple grammar for building linear equations and inclusive inequalities"; @@ -114464,7 +121929,7 @@ self: { mkDerivation { pname = "linear-maps"; version = "0.6.1"; - sha256 = "3385bb02476f73cad97447e65a2e7751ccb233671262c4bc170f6f4e52bfe118"; + sha256 = "0671px94wvqg2yyc8qhjcwrv5k2ifwp5mrj7fkcwlwvg8w1bp19k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers HUnit ]; @@ -114480,7 +121945,7 @@ self: { mkDerivation { pname = "linear-opengl"; version = "0.3.0.0"; - sha256 = "d95cc9b0cce5162c0942550d4b8884fc13664994395237a8362279c0aa7ee01f"; + sha256 = "07z0gsmc0y926sl3flirji4nc4zwhj44n3am884jq5p5rjqcjp6r"; libraryHaskellDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; @@ -114495,7 +121960,7 @@ self: { mkDerivation { pname = "linear-vect"; version = "0.1.1.0"; - sha256 = "5ea6aa5361d1664bf82e4e48829a887cc3d2e11d064f439f9fd333fc2e08df44"; + sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy"; libraryHaskellDepends = [ base random ]; homepage = "https://github.com/capsjac/linear-vect"; description = "A low-dimensional linear algebra library, operating on the Num typeclass"; @@ -114508,7 +121973,7 @@ self: { mkDerivation { pname = "linearEqSolver"; version = "1.3"; - sha256 = "378b8a81d3175832cdb2a432cddaef016236a61c76f61fc6f4e4a92366885f2f"; + sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp"; libraryHaskellDepends = [ base sbv ]; homepage = "http://github.com/LeventErkok/linearEqSolver"; description = "Use SMT solvers to solve linear systems over integers and rationals"; @@ -114523,7 +121988,7 @@ self: { mkDerivation { pname = "linearmap-category"; version = "0.3.2.0"; - sha256 = "45932979d622e33de233a01e8e66e5925be9553caa246132705e36437580233d"; + sha256 = "0g93h1sl6djyf0r6295a7iayjnwjwmk8w7m06gi3vqr2srwjk4s5"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups tagged transformers vector @@ -114540,7 +122005,7 @@ self: { mkDerivation { pname = "linearscan"; version = "1.0.0"; - sha256 = "75a936a9eb2dfe95824556207cecb785570d33bca4f793614e4e26f344a4e18a"; + sha256 = "12p1li2g69jf9rhr7xx4phrhsmw5nzn7q82n8n19bzidxflkdabm"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -114557,7 +122022,7 @@ self: { mkDerivation { pname = "linearscan-hoopl"; version = "1.0.0"; - sha256 = "e5796e9b1ed7eeb08b954e483010e0bf9e6bb126da6c87f2ff2439323b6e8370"; + sha256 = "0w43dqxk4f94zzr8fv6s4sqnp7mzw0830j2fjn5v1vnp3sdnwyg5"; libraryHaskellDepends = [ base containers free hoopl linearscan QuickCheck transformers ]; @@ -114576,7 +122041,7 @@ self: { mkDerivation { pname = "linebreak"; version = "1.0.0.3"; - sha256 = "e70e7d1274c923f23506fbe41fc8c86247618a9dba24dc4c62dac9a85f15bab9"; + sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7"; libraryHaskellDepends = [ base hyphenation ]; homepage = "http://ariis.it/static/articles/linebreak/page.html"; description = "breaks strings to fit width"; @@ -114589,7 +122054,7 @@ self: { mkDerivation { pname = "linguistic-ordinals"; version = "0.1.0.1"; - sha256 = "68c0ada6fa1931d46310ad74891d0148ad6ad4912f3df28c3a67adeb961c540b"; + sha256 = "02sl3jbfpbb77a6g4g9gj7a6mba804fqjx5d21ix8c8rzakavh38"; libraryHaskellDepends = [ base text ]; homepage = "http://github.com/argiopetech/linguistic-ordinals"; description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)"; @@ -114603,7 +122068,7 @@ self: { mkDerivation { pname = "link-relations"; version = "0.1.1.0"; - sha256 = "3d6805c4e0f78239d3aedfa0baf9b488da9163058e5d4c58e4b7440b508cbb2a"; + sha256 = "0amvii80ni5pwic4qpcf0mir3nl8nkwvm86zmv9kk0ppw320as1x"; libraryHaskellDepends = [ base bytestring hashable unordered-containers uri-bytestring ]; @@ -114618,7 +122083,7 @@ self: { mkDerivation { pname = "linkchk"; version = "0.0.2"; - sha256 = "8d1b3b6f779c0199573ee6b68500a359cdb6439969c2a2c9a36f966591fdfa3b"; + sha256 = "0fzszn8nb5kglg4s5hk9k51vdkarlc08bdp67rbrj0cwfxpkn6wd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114635,7 +122100,7 @@ self: { mkDerivation { pname = "linkcore"; version = "0.4.1"; - sha256 = "01e128d244f6f1db4e1712802a632f3281036a1b06069b1bfb3eae3d14e63254"; + sha256 = "0m1jwqa3vbiyzcdrn1h63dm0709j5xijm00j2x7dpwgn8k92iq81"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114651,7 +122116,7 @@ self: { mkDerivation { pname = "linked-list-with-iterator"; version = "0.1.1.0"; - sha256 = "c6ae37cc9d123afcb92f28fef9c5dae6d3713489bdf7f73ac9af420bb3f11b89"; + sha256 = "128vy6rhnhmgr4xggxxxi4s73lz6vb2zkzi85ywzqfhjkp63gbn6"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/CindyLinz/Haskell-linked-list-with-iterator#readme"; @@ -114666,7 +122131,7 @@ self: { mkDerivation { pname = "linkedhashmap"; version = "0.4.0.0"; - sha256 = "d87310f12abcfe0b50e15ea896685152710b5b1a8a5e9b159223efb8d34b63af"; + sha256 = "1bv39g9vivr3j8arnpla39dhnwaja5l9da2yw580pzmw5bqi0wyq"; libraryHaskellDepends = [ base containers deepseq hashable unordered-containers ]; @@ -114685,18 +122150,24 @@ self: { "linklater" = callPackage ({ mkDerivation, aeson, base, base-prelude, bytestring, containers - , http-types, text, wai, wreq + , exceptions, http-types, lens, lens-aeson, mtl, safe-exceptions + , tasty, tasty-hunit, text, uri-bytestring, wai, wreq }: mkDerivation { pname = "linklater"; - version = "3.2.0.0"; - sha256 = "d9e5370d04d8849aa4c8df68d9a3bc7867c0a679f1a66f858be585e687b98695"; + version = "4.0.0.2"; + sha256 = "0kykg2s2czhapq0s17rwr195mjhh6qkbkbia75i3sr2mq9ypal8z"; libraryHaskellDepends = [ - aeson base base-prelude bytestring containers http-types text wai - wreq + aeson base base-prelude bytestring containers exceptions http-types + lens lens-aeson mtl safe-exceptions text uri-bytestring wai wreq + ]; + testHaskellDepends = [ + aeson base base-prelude bytestring containers exceptions http-types + lens lens-aeson mtl safe-exceptions tasty tasty-hunit text + uri-bytestring wai wreq ]; homepage = "https://github.com/hlian/linklater"; - description = "The fast and fun way to write Slack.com bots"; + description = "A Haskell library for the Slack API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -114708,8 +122179,8 @@ self: { }: mkDerivation { pname = "linode"; - version = "0.2.0.0"; - sha256 = "3a5c1d507121a40848217ad8e092c3347c1c26a1ada09ccfa1450b30d22d59fa"; + version = "0.3.0.0"; + sha256 = "17hk0k9d91wi28h5k90dng0b64bhl9scbj20pmvqbk8rin9kap3w"; libraryHaskellDepends = [ aeson async base binary bytestring containers errors lens process retry safe text transformers wreq @@ -114731,7 +122202,7 @@ self: { mkDerivation { pname = "linode-v4"; version = "0.1.0.4"; - sha256 = "f93c82446014d03ae3fa1dffc736bb8c884478d6cb81dafedba9168252b586e1"; + sha256 = "1qc6nm9845m9vgzdm0fbsrw4924cpcvcgzqxzbikml0lc1284g7r"; libraryHaskellDepends = [ aeson base bytestring http-conduit unordered-containers ]; @@ -114749,7 +122220,7 @@ self: { mkDerivation { pname = "linux-blkid"; version = "0.2.0.0"; - sha256 = "1dff1aa354d6f841e0363ae0a4877c0105645831d7b3018ad1f77d4016ffc719"; + sha256 = "06f7zwb40zgps6503cyp65c68181gj3s9q1s6vh43y6najiimzqx"; libraryHaskellDepends = [ base monad-control transformers transformers-base ]; @@ -114764,7 +122235,7 @@ self: { mkDerivation { pname = "linux-cgroup"; version = "0.1.1.2"; - sha256 = "c1bf7f5b28b77b87daf6fa4432461c30f774a1fa33f66969cc2e7963438ca135"; + sha256 = "0dd1ii1n6y9frilnkxikzahp9xrh3i334i7syvd8fyxp51dpzgy1"; libraryHaskellDepends = [ base filepath ]; description = "Very basic interface to the Linux CGroup Virtual Filesystem"; license = stdenv.lib.licenses.mit; @@ -114776,7 +122247,7 @@ self: { mkDerivation { pname = "linux-evdev"; version = "0.3.2"; - sha256 = "39e9a49a171065c18d4d32738366a83d0360f35a4f0f878e515d4464375b5211"; + sha256 = "04ajbcvn8i2xa678f3sgbbrn00rxm1k86wrj9n6w2r8h2yda9s9r"; libraryHaskellDepends = [ base bytestring time unix ]; homepage = "http://github.com/bgamari/linux-evdev"; description = "Bindings to Linux evdev input device interface"; @@ -114788,7 +122259,7 @@ self: { mkDerivation { pname = "linux-file-extents"; version = "0.2.0.0"; - sha256 = "6c7cd9e700f666f774736d31a0e6aa7bfe9bd1e075c11eed701ba95095fd9bd0"; + sha256 = "1l4vznam1a8vf3nixhbmw38rpzkvmbka0cbdfdsgfrpn03kxjz3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base unix ]; @@ -114802,7 +122273,7 @@ self: { mkDerivation { pname = "linux-inotify"; version = "0.3.0.1"; - sha256 = "34bc9c0f2c7b5a16284fd15ab8228a2b13d80407d06043517e79872b154e393a"; + sha256 = "0fir9qajp1vrgr8l6q6h0w2dh4rbi8ibhnni9wl1cnkv5h7rrg1l"; libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; license = stdenv.lib.licenses.bsd3; @@ -114813,7 +122284,7 @@ self: { mkDerivation { pname = "linux-kmod"; version = "0.1.0.1"; - sha256 = "9ac32a731276cddc7d0da1a92cc2ea2254a3bc8e4ce0b207c886bb91ee8a0bef"; + sha256 = "1vqbibp93fw6r03v5q2cisya6m12xb12rad11myxrkbn29rjmhws"; libraryHaskellDepends = [ base directory ]; libraryPkgconfigDepends = [ libkmod ]; homepage = "https://github.com/tensor5/linux-kmod"; @@ -114827,7 +122298,7 @@ self: { mkDerivation { pname = "linux-mount"; version = "0.2.0.1"; - sha256 = "d15bad134e7e80c450523cfa794ff9e4b75b4671eb3579c8a8cfbcaea2cd7c89"; + sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/tensor5/linux-mount"; description = "Mount and unmount filesystems"; @@ -114839,7 +122310,7 @@ self: { mkDerivation { pname = "linux-namespaces"; version = "0.1.2.0"; - sha256 = "585c69130dfcc499cfba00385ae7facc8ab9f2c26bdf746a6e25fc96d3b5f67b"; + sha256 = "0yznnp9rdz15drm79pvbqbrbk2nczbkmlf00pb7rki7w1l9njp2q"; libraryHaskellDepends = [ base unix ]; homepage = "https://github.com/redneb/hs-linux-namespaces"; description = "Create new or enter an existing linux namespaces"; @@ -114853,7 +122324,7 @@ self: { mkDerivation { pname = "linux-perf"; version = "0.3"; - sha256 = "2114d462f25efbc01c04d5ee8984b74bf3c677fc2e926b33d74e70bc9e9253a1"; + sha256 = "18akjagbqw2fswrnp4ifzivwdwsbny28kvnm0hfc1ysyy9id8511"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114876,9 +122347,9 @@ self: { mkDerivation { pname = "linux-ptrace"; version = "0.1.2"; - sha256 = "75108b21c04301c3f2e9f8912fcd2e101cd0ed6bbda79c27d68b79ba938ff643"; + sha256 = "0hzniy9vlycbsqkrr9xxdgnx070h5v6jz4gqx7rc60a3q0hqn43m"; revision = "1"; - editedCabalFile = "104fac22d2c56d66864f68408a17a93bdaa44d268fcddb6b9e5fca155a79242a"; + editedCabalFile = "0ai4g5d1bjjzkrmxpkcg4r6s9nivm4bqlh389y36cvf5s8iaqkqh"; libraryHaskellDepends = [ base bytestring mmap posix-waitpid process template-haskell unix ]; @@ -114892,7 +122363,7 @@ self: { mkDerivation { pname = "linux-xattr"; version = "0.1.1.0"; - sha256 = "e69537b1e88d9c465280ff4ed288ccf490fc9cd32e8b168f10f59d52aa2ef866"; + sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/tensor5/linux-xattr"; description = "Read, set and list extended attributes"; @@ -114906,7 +122377,7 @@ self: { mkDerivation { pname = "linx-gateway"; version = "0.1.0.2"; - sha256 = "98859b14ffb44511aea77dc384ffabb4c266ddcab85546bff351e0db37672a36"; + sha256 = "0diacwvxpq2iyfzlcmdqrbfndhmlmgzq9hvxlyp12idlzwa9p1cq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring network ]; @@ -114926,7 +122397,7 @@ self: { mkDerivation { pname = "lio"; version = "0.11.6.0"; - sha256 = "2643b4925f8d4d92cc9072dd5526b28eac6eb0e606861077f431495019efd4d3"; + sha256 = "1lylxwcm0j9iyivi11h6wsq6xb4fn8k5bpbjj3694kcdby9b8hr6"; libraryHaskellDepends = [ base bytestring containers hashable ]; homepage = "https://github.com/plsyssec/lio"; description = "Labeled IO Information Flow Control Library"; @@ -114940,7 +122411,7 @@ self: { mkDerivation { pname = "lio-eci11"; version = "0.2"; - sha256 = "88e512fac0f48cae26147ddf4e23055ba6374debdb0fcb67b3bd7160e7117487"; + sha256 = "11vl27kn0wdxndkwn3yvxd6kg9jv0lilxpvx2hkax37lq3x15rc8"; libraryHaskellDepends = [ array base bytestring containers dclabel-eci11 directory filepath mtl old-time SHA time unix @@ -114957,12 +122428,13 @@ self: { mkDerivation { pname = "lio-fs"; version = "0.0.1.2"; - sha256 = "c9620b6016fc436140ec6e64881fd4dfd73273141c6bf8b9a87d8d3741d6fdff"; + sha256 = "1zzxsr0kg3bxm2wzhsqw2irk5myzshgqhr3fxi062hzw2rh0nqn9"; libraryHaskellDepends = [ base bytestring containers directory filepath lio SHA unix xattr ]; description = "Labeled File System interface for LIO"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lio-simple" = callPackage @@ -114973,7 +122445,7 @@ self: { mkDerivation { pname = "lio-simple"; version = "0.0.2.2"; - sha256 = "a40400ab819299bf5346ca3cd2778af739d61b22ccca68bc8a2b2d33a78aadd9"; + sha256 = "1nddiakk6b9biay6ijnc48dxcfgpi9vx4g6a8r9vz6cjh6mh0154"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114995,7 +122467,7 @@ self: { mkDerivation { pname = "lipsum-gen"; version = "0.1.0.2"; - sha256 = "6c4caaecfd8fc61e0e6d516c8cde84d653392dd17fbd30bc2cc7c9caccee731d"; + sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; libraryHaskellDepends = [ base QuickCheck ]; description = "Generators for random sequences of English-like nonsense text"; license = stdenv.lib.licenses.bsd3; @@ -115011,7 +122483,7 @@ self: { mkDerivation { pname = "liquid"; version = "0.1.0.3"; - sha256 = "c14d1b3dfbabbc4892369a24f67d29f3a172e9de87ac0132bf3121f86bcee90b"; + sha256 = "02z9rrmzh89ipwr03b47vvlp58gk55yzc94s6s94ig5bzcyinkf1"; libraryHaskellDepends = [ aeson attoparsec base hashable lens lens-aeson mtl scientific semigroups text unordered-containers validation vector @@ -115034,13 +122506,13 @@ self: { , cmdargs, containers, deepseq, directory, dotgen, fgl , fgl-visualize, filemanip, filepath, ghc-prim, hashable, intern , located-base, mtl, ocaml, parallel, parsec, pretty, process, syb - , tasty, tasty-hunit, tasty-rerun, text, text-format, transformers - , unordered-containers, z3 + , tasty, tasty-hunit, tasty-rerun, text, text-format, time + , transformers, unordered-containers, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.5.0.1"; - sha256 = "7e14475ac33ed81983fb5b0fa2a1ad34ae0f449983f0a9cd432a7aa37875e53c"; + version = "0.6.0.1"; + sha256 = "1zbhspcwqx8lqdz4niikz5g2hd8rd2h5lda3rqpkl3z8nw0v7vql"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -115049,7 +122521,7 @@ self: { binary boxes bytestring cereal cmdargs containers deepseq directory dotgen fgl fgl-visualize filemanip filepath ghc-prim hashable intern located-base mtl parallel parsec pretty process syb text - text-format transformers unordered-containers + text-format time transformers unordered-containers ]; executableHaskellDepends = [ base ]; executableSystemDepends = [ ocaml ]; @@ -115060,48 +122532,46 @@ self: { homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ocaml; inherit (pkgs) z3;}; "liquidhaskell" = callPackage - ({ mkDerivation, aeson, array, base, bifunctors, bytestring, Cabal - , cereal, cmdargs, containers, cpphs, daemons, data-default - , deepseq, Diff, directory, filepath, fingertree, ghc, ghc-paths - , hashable, hpc, hscolour, liquid-fixpoint, located-base, mtl - , network, optparse-applicative, parsec, pretty, process, stm, syb - , tagged, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun - , template-haskell, temporary, text, time, transformers, unix + ({ mkDerivation, aeson, array, base, bifunctors, binary, bytestring + , Cabal, cereal, cmdargs, containers, data-default, deepseq, Diff + , directory, exceptions, filepath, fingertree, ghc, ghc-boot + , ghc-paths, ghc-prim, hashable, hint, hpc, hscolour + , liquid-fixpoint, located-base, mtl, optparse-applicative, parsec + , pretty, process, QuickCheck, stm, syb, tagged, tasty + , tasty-ant-xml, tasty-hunit, tasty-rerun, template-haskell + , temporary, text, text-format, th-lift, time, transformers , unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.6.0.0"; - sha256 = "4b5d6fc321c7b92b80b84bda67fc34e3f37f44d23dd60828ba9d9e3d7d645696"; - revision = "1"; - editedCabalFile = "3de51855d7c0c9dd89e345a9a27ff151baec1140b9e464ae91604cb5a885f4c9"; + version = "0.8.0.0"; + sha256 = "1jwh46z9d7ll380fygdk90zic9br723aag82w1cgllc1r5m8kqib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson array base bifunctors bytestring Cabal cereal cmdargs - containers cpphs data-default deepseq Diff directory filepath - fingertree ghc ghc-paths hashable hpc hscolour liquid-fixpoint - located-base mtl parsec pretty process syb template-haskell - temporary text time unordered-containers vector + aeson array base bifunctors binary bytestring Cabal cereal cmdargs + containers data-default deepseq Diff directory exceptions filepath + fingertree ghc ghc-boot ghc-paths ghc-prim hashable hpc hscolour + liquid-fixpoint located-base mtl parsec pretty process QuickCheck + syb template-haskell temporary text text-format th-lift time + transformers unordered-containers vector ]; executableHaskellDepends = [ - base bytestring cereal cmdargs daemons data-default deepseq - directory ghc liquid-fixpoint located-base network pretty process - unix unordered-containers + base cmdargs deepseq ghc ghc-boot hint liquid-fixpoint located-base + pretty process time ]; testHaskellDepends = [ - base containers directory filepath mtl optparse-applicative process - stm tagged tasty tasty-ant-xml tasty-hunit tasty-rerun transformers + base containers directory filepath liquid-fixpoint mtl + optparse-applicative parsec process stm syb tagged tasty + tasty-ant-xml tasty-hunit tasty-rerun text transformers ]; testSystemDepends = [ z3 ]; - homepage = "http://goto.ucsd.edu/liquidhaskell"; + homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -115109,7 +122579,7 @@ self: { mkDerivation { pname = "liquidhaskell-cabal"; version = "0.1.1.0"; - sha256 = "fe83b2153191e0280b8cf4bed982482642bad9fcb549d227942a7681a5d69763"; + sha256 = "0qwpssjq2xiajhkx4jdmzkcvlhi6921dkgplih5jiq4i64av50zy"; libraryHaskellDepends = [ base Cabal filepath ]; homepage = "https://github.com/spinda/liquidhaskell-cabal#readme"; description = "Liquid Haskell integration for Cabal and stack"; @@ -115122,7 +122592,7 @@ self: { mkDerivation { pname = "liquidhaskell-cabal-demo"; version = "0.1.1.0"; - sha256 = "471cb6630dbcdf1071da28c2affe74717f0d5e23b2205f353eab2aa905f41e22"; + sha256 = "08hyyh2sjamb7qsmy85j4dg0szvifkzazhi8v9qi1pxw1mivc727"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base liquidhaskell-cabal ]; @@ -115138,7 +122608,7 @@ self: { mkDerivation { pname = "lispparser"; version = "0.3.1"; - sha256 = "88034eeb852f838e1853a44de4f480b54a33bc0b8a1bd49fe04fdcfe2b7745c2"; + sha256 = "1hj5fwmzxp2gw2gx86wa1fy36jmmh3sf8kd4acc8x0rghpmlw0w8"; libraryHaskellDepends = [ base parsec ]; description = "Simple parser for LISP S-expressions"; license = stdenv.lib.licenses.bsd3; @@ -115149,7 +122619,7 @@ self: { mkDerivation { pname = "list-extras"; version = "0.4.1.4"; - sha256 = "3c6e701a1792c10a3fc1145305afa87ffa0184d99f72d443752ef23fbc997297"; + sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Common not-so-common functions for lists"; @@ -115161,7 +122631,7 @@ self: { mkDerivation { pname = "list-fusion-probe"; version = "0.1.0.6"; - sha256 = "7682145460eb6a18406743e74710acbefda2b836e82f73a8d46aab48d5baa6b1"; + sha256 = "1cd6pbaliavasjl76bz86swa5zdymh84grs3cx01hspbc1a190kn"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "testing list fusion for success"; @@ -115173,7 +122643,7 @@ self: { mkDerivation { pname = "list-grouping"; version = "0.1.1"; - sha256 = "74182f76b1af721ecea70d1ee1819eff7a1353e80af980e847174c9219322e71"; + sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l"; libraryHaskellDepends = [ base ]; homepage = "http://coder.bsimmons.name/blog/2009/08/list-grouping-module-released/"; description = "Functions for grouping a list into sublists"; @@ -115185,7 +122655,7 @@ self: { mkDerivation { pname = "list-mux"; version = "1.0"; - sha256 = "da5b52d5ba7d783630962f976761d6f6f4e2e5663b2dc0c32d2a9d674a58ff90"; + sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/hellertime/list-mux"; description = "List Multiplexing"; @@ -115200,7 +122670,7 @@ self: { mkDerivation { pname = "list-prompt"; version = "0.1.1.0"; - sha256 = "c7323c7a802940deba1a7be46265fd8c01f548174d5f08923a607e1730ca4dee"; + sha256 = "1vjdr8q1fzk07a90hpsd2x4ga0cczmjn5r3v3axdwh19h1x3qcn7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115223,7 +122693,7 @@ self: { mkDerivation { pname = "list-remote-forwards"; version = "0.0.1"; - sha256 = "da772a92043fcdfd60698bd24c03c1a73cd0531ab88923dd1dbe13ed091105af"; + sha256 = "1bq5244ys4xy3pfj72dq399x0g57q41lrllbd5hgvk9z0j92lxys"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115247,7 +122717,7 @@ self: { mkDerivation { pname = "list-t"; version = "1"; - sha256 = "519a68ce096452934a0d334e0081064139f08aaa0e1e2f81a627b16c28e88c15"; + sha256 = "05ccx0l6rc97ls0jy7hfma5g0fa10s0h0kik1m596lk41776i6ji"; libraryHaskellDepends = [ base base-prelude mmorph monad-control mtl transformers transformers-base @@ -115265,7 +122735,7 @@ self: { mkDerivation { pname = "list-t-attoparsec"; version = "0.4.1"; - sha256 = "49d74a5f8abd9246566231d8c26ff9d29a2ed91c3ff61ab182de133e7b0bfd44"; + sha256 = "0i7x1dxkw4yyhaqimxiz3kcjx6njz5pw5n1ic9b4d4mxi9glmms9"; libraryHaskellDepends = [ attoparsec base-prelude either list-t text transformers ]; @@ -115287,7 +122757,7 @@ self: { mkDerivation { pname = "list-t-html-parser"; version = "0.4.2"; - sha256 = "42bd5a8ad206aeb4ae4934c747164243084392ecdcf40ad5acc05a1760ad5836"; + sha256 = "0djqmmh1fnn0mkahmx6wxj94622388b4girl96pb9bh6sa55mga2"; libraryHaskellDepends = [ base-prelude case-insensitive conversion conversion-case-insensitive conversion-text either html-entities @@ -115310,7 +122780,7 @@ self: { mkDerivation { pname = "list-t-http-client"; version = "0.1.0.1"; - sha256 = "e20dce9470d93127649c8a46b534ec1bab7a64dce3366f3f6367ff1e9dc69d0b"; + sha256 = "02wxqsfixzv7ccznydp3vij7maqvxhsbailakij2fcfrf2acw3g2"; libraryHaskellDepends = [ base-prelude bytestring http-client list-t mtl-prelude ]; @@ -115327,7 +122797,7 @@ self: { mkDerivation { pname = "list-t-libcurl"; version = "0.3.1"; - sha256 = "f0c8aa894d73b5db7a6bfc5dcca9f7a83d43e722df7b1aa6fa485b34e6f8de2d"; + sha256 = "0bfyz3k38ns8zak1lyyz4bkl6gd8yylwqpgwddxdpdbk9n4smj7h"; libraryHaskellDepends = [ base base-prelude bytestring curlhs either list-t mtl-prelude resource-pool stm @@ -115345,7 +122815,7 @@ self: { mkDerivation { pname = "list-t-text"; version = "0.2.1"; - sha256 = "697fdc68a95e625ba02ee67737e647645da1da4d244f1ebc74fd3ba13b3d22b0"; + sha256 = "1c127lxs2fzxfjy1wkr49pda2pb48zk3fxz65sh5nqjym5ldqzv9"; libraryHaskellDepends = [ base-prelude bytestring list-t mtl-prelude text ]; @@ -115363,8 +122833,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.1"; - sha256 = "25f574da365db08d19fdb17f69a682de951850e471f4b9c051293aeddb86506a"; + version = "1.0.2"; + sha256 = "081sik71mli28lvai34zymcl58fiqcrbhzxdi6phmjizm5wj4pqi"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library"; @@ -115379,8 +122849,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.3"; - sha256 = "f5462fb3989c2687b4678aa427d61b0c2aa1793307a9f6e61c19aaecb2e19c35"; + version = "0.6.4"; + sha256 = "0l1qm1n3sh6shzcl4g00w705gx0xy8qwnj68dlm18hsa9y0z572h"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -115397,7 +122867,7 @@ self: { mkDerivation { pname = "list-zip-def"; version = "0.1.0.1"; - sha256 = "d0447f7e5347eb2b8e6d27ddcc647677b5e33a44c3e61995c2faa99deed3ca1d"; + sha256 = "07fasgp9vagsqaaikrn38hxf7dbpfrjcrp97dn72pss7adz7yi6h"; libraryHaskellDepends = [ base ]; description = "Provides zips where the combining doesn't stop premature, but instead uses default values"; license = stdenv.lib.licenses.publicDomain; @@ -115409,7 +122879,7 @@ self: { mkDerivation { pname = "listlike-instances"; version = "0.2.3.1"; - sha256 = "5583a4ee3265b297a84582c2af56eaa69ddb6bd753c11d77ff57777e2cb67056"; + sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm"; libraryHaskellDepends = [ base bytestring ListLike text vector ]; homepage = "http://jwlato.webfactional.com/haskell/listlike-instances"; description = "Extra instances of the ListLike class"; @@ -115422,7 +122892,7 @@ self: { mkDerivation { pname = "lists"; version = "0.4.2"; - sha256 = "965a9e475a09e96fb899527c12872c7eada9169b52e1fd33da863e03f58c5f62"; + sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln"; libraryHaskellDepends = [ base list-extras split ]; description = "Functions for dealing with lists"; license = stdenv.lib.licenses.bsd3; @@ -115433,7 +122903,7 @@ self: { mkDerivation { pname = "listsafe"; version = "0.1.0.1"; - sha256 = "1a073247edfbea7dd7b7f9629fc64ddd3bce67fa61695da23ff43fb31d398d69"; + sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs"; libraryHaskellDepends = [ base exceptions ]; homepage = "https://github.com/ombocomp/listsafe"; description = "Safe wrappers for partial list functions, supporting MonadThrow"; @@ -115448,7 +122918,7 @@ self: { mkDerivation { pname = "lit"; version = "0.1.10.0"; - sha256 = "549f3ad1a97c14c4bae4d74e49322efa5a10f5ad9056ab82b7d9529ae04f3636"; + sha256 = "0din9zh9llnrny1anmlhmpsi0nps5qr4jknpwjxc853wm78km7sl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115466,7 +122936,7 @@ self: { mkDerivation { pname = "literals"; version = "1.0"; - sha256 = "526848d8b01b84f6544fdcb400303f070dd3eabd151f811045476b0ceed6c41a"; + sha256 = "06n4svp0qss78l8827qmppmd63877wq01d6w9xagd10vn3c4hs2j"; libraryHaskellDepends = [ base ]; description = "Non-overloaded functions for concrete literals"; license = stdenv.lib.licenses.mit; @@ -115484,8 +122954,8 @@ self: { }: mkDerivation { pname = "live-sequencer"; - version = "0.0.5.2"; - sha256 = "848f38148ffbe61b0799aa471db89ade287fb06061a9b3dfbec248574dd192e1"; + version = "0.0.6"; + sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base event-list non-negative ]; @@ -115502,12 +122972,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "liveplot" = callPackage + ({ mkDerivation, andromeda, base, bytestring, containers, directory + , filepath, GLFW-b, GLUtil, lens, linear, mvc, OpenGL, pipes + , pipes-extras, pipes-misc, stm, time, transformers, Vec, vector + , vinyl, vinyl-gl + }: + mkDerivation { + pname = "liveplot"; + version = "0.0.1"; + sha256 = "1gqbw6r0vpj18ks7xhzcalkfcl13cjx50s3w5p5f3kn63wihh197"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + andromeda base bytestring containers directory filepath GLFW-b + GLUtil lens linear mvc OpenGL pipes pipes-extras pipes-misc stm + time transformers Vec vector vinyl vinyl-gl + ]; + executableHaskellDepends = [ base ]; + description = "Liveplotting"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {andromeda = null;}; + "ll-picosat" = callPackage ({ mkDerivation, base, picosat }: mkDerivation { pname = "ll-picosat"; version = "0.1.0.0"; - sha256 = "f01837f708aadef578a8b37ad426d3f9b42fc9f62f7025120163da482d63230d"; + sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ picosat ]; license = stdenv.lib.licenses.mit; @@ -115519,7 +123012,7 @@ self: { mkDerivation { pname = "llrbtree"; version = "0.1.1"; - sha256 = "c1c857fbce835cb8bd35a304ca66ce3deadf56e8022c04c87bf4df1a5cb8eb14"; + sha256 = "057bp1f1mpzlgg408b02x1bdzsixrrkcl1536nyvhp43rvxmgj61"; libraryHaskellDepends = [ base ]; description = "Purely functional sets and heaps"; license = stdenv.lib.licenses.bsd3; @@ -115533,7 +123026,7 @@ self: { mkDerivation { pname = "llsd"; version = "0.2.0.0"; - sha256 = "2fff9bd39961e34fbb670990bd0309684696723b6ffc3851f9666201a4523eec"; + sha256 = "1v1yaaj02qk6z58kiz3g7dr9cik8141vv409cyxlzqv1k79rpzrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115554,7 +123047,7 @@ self: { mkDerivation { pname = "llvm"; version = "3.2.0.2"; - sha256 = "39d744ff56a7b5d0827ec32e98b80414441103fdfd25e8e373a6a7b701aa6186"; + sha256 = "11k1m80vg9x6fgiyh9gxzl1i2i0l0jw9hbn3gs1d1dd7avzl9mrr"; libraryHaskellDepends = [ base bytestring containers directory llvm-base mtl process type-level @@ -115576,7 +123069,7 @@ self: { mkDerivation { pname = "llvm-analysis"; version = "0.3.0"; - sha256 = "13d5a1202cb920fc8bc1b65ad138b3b91e91b824264a65b4963c04cf130b9349"; + sha256 = "0jck1c9wy11wjss6aji64jw927mrncwd2nmnq65zq85r5hha3m8k"; libraryHaskellDepends = [ array base boomerang bytestring containers deepseq directory failure fgl filemanip filepath GenericPretty graphviz hashable @@ -115598,7 +123091,7 @@ self: { mkDerivation { pname = "llvm-base"; version = "3.2.0.2"; - sha256 = "96e454d8167e59862a2920a29c9c3b9030a595227451b30db82d5a58d0b2e6b8"; + sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/bos/llvm"; description = "FFI bindings to the LLVM compiler toolkit"; @@ -115614,7 +123107,7 @@ self: { mkDerivation { pname = "llvm-base-types"; version = "0.3.0"; - sha256 = "768dc670dfb3bc64ccd50f5a30fb0a55e20c0b7ba45a0c4cb7c08322f8615d90"; + sha256 = "142xc7w250y0nx60qnm4gc5hrqjm1bxk0nhgsp669g5kvxqcd3bn"; libraryHaskellDepends = [ base containers deepseq dwarf failure GenericPretty graphviz hashable pretty regex-tdfa text transformers unordered-containers @@ -115631,7 +123124,7 @@ self: { mkDerivation { pname = "llvm-base-util"; version = "3.0.1.0"; - sha256 = "5c889f94d67f5f226e69b1837985bcd12a815e0ae72880f9c4069e37f96e061f"; + sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w"; libraryHaskellDepends = [ base llvm-base ]; homepage = "https://github.com/bos/llvm"; description = "Utilities for bindings to the LLVM compiler toolkit"; @@ -115648,7 +123141,7 @@ self: { mkDerivation { pname = "llvm-data-interop"; version = "0.3.0"; - sha256 = "c1b7a9440ea22241d384817ead036da0200a17f83f6ab1acb9d62a0c56a76e22"; + sha256 = "08kflxb0qannp6nb2sizz0bhl850dl1sszl1hk9l28m21r2akdy1"; libraryHaskellDepends = [ array base bytestring containers data-default deepseq dwarf hashable hashtables llvm-base-types loch-th mtl text transformers @@ -115666,8 +123159,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.7.0.1"; - sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573"; + version = "0.7.2"; + sha256 = "19wzfz1jcxvrm2pzniap9kf3c9plj9c5x24wjcbzyslgx0jzip4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115685,7 +123178,7 @@ self: { mkDerivation { pname = "llvm-ffi"; version = "3.8.1"; - sha256 = "d636af82033d1fbfa5c05ed66f823afe9081db387f85eae862f97ca6db4e24c9"; + sha256 = "1j949vdscz7rcblfm1bz73dq347y7a16zmjyq2jvy7rx0f1aydnn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -115703,7 +123196,7 @@ self: { mkDerivation { pname = "llvm-ffi-tools"; version = "0.0"; - sha256 = "fd8042f38772b64f0a0b6df48c92e5ff46546a57252e5e9234b7b3fb9d518ea2"; + sha256 = "18lfa6fzpcxp6j95wbi5axm58ipzwn98rx3d1c54zdkjhzrl507x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115724,7 +123217,7 @@ self: { mkDerivation { pname = "llvm-general"; version = "3.5.1.2"; - sha256 = "2075b44cc1475a8623e7164add94d7b9f31ca9a157e099b23389b892886bd297"; + sha256 = "15yjdf495f496fr9kq2pl6lirwxrsyadsjhnwwiqcnj7q56b8x90"; libraryHaskellDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -115750,7 +123243,7 @@ self: { mkDerivation { pname = "llvm-general-pure"; version = "3.5.1.0"; - sha256 = "e5349189b1c203793dd4f0e2a582b633f09fa311340189b3ade004f4794b8097"; + sha256 = "15w09dwz8170mnrqj09l26irzw1kns1abqphshypj0y2n64r2d75"; libraryHaskellDepends = [ base containers mtl parsec setenv template-haskell transformers ]; @@ -115773,7 +123266,7 @@ self: { mkDerivation { pname = "llvm-general-quote"; version = "0.2.0.0"; - sha256 = "e5acc18c0f9bcce3fb955d5f6768bf4bab223c78d2a6e6588e46175fd5b5430a"; + sha256 = "02j3npamy5s6ircfd9njg0y25asbpxl6fpsxjpxy7k4v1y6c3b75"; libraryHaskellDepends = [ array base bytestring containers haskell-src-meta llvm-general-pure mainland-pretty mtl split srcloc syb symbol template-haskell @@ -115789,6 +123282,78 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "llvm-hs" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , containers, exceptions, llvm-config, llvm-hs-pure, mtl + , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, transformers, transformers-compat + , utf8-string + }: + mkDerivation { + pname = "llvm-hs"; + version = "4.2.0"; + sha256 = "12rclc9l85yqh1h0y7m6m65fpb81crzafmkcwq90vl7i5bf1bv1j"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers exceptions llvm-hs-pure + mtl template-haskell transformers transformers-compat utf8-string + ]; + libraryToolDepends = [ llvm-config ]; + testHaskellDepends = [ + base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck + tasty tasty-hunit tasty-quickcheck temporary transformers + transformers-compat + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "General purpose LLVM bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {llvm-config = null;}; + + "llvm-hs-pure" = callPackage + ({ mkDerivation, base, containers, mtl, parsec, tasty, tasty-hunit + , template-haskell, transformers, transformers-compat + }: + mkDerivation { + pname = "llvm-hs-pure"; + version = "4.0.0.0"; + sha256 = "1z9r0qfzj738g0l8f5lbn5lx122p4gyg4gg9njpxjnwmmi532lkl"; + libraryHaskellDepends = [ + base containers mtl parsec template-haskell transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers mtl tasty tasty-hunit transformers + transformers-compat + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "Pure Haskell LLVM functionality (no FFI)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "llvm-hs-pure_4_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, mtl + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "llvm-hs-pure"; + version = "4.1.0.0"; + sha256 = "1gfj977jxr78m3wixajzc0c50qqp5786dn3dgy1anq43hrjal2l7"; + libraryHaskellDepends = [ + attoparsec base bytestring containers mtl template-haskell + transformers transformers-compat + ]; + testHaskellDepends = [ + base containers mtl tasty tasty-hunit tasty-quickcheck transformers + transformers-compat + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "Pure Haskell LLVM functionality (no FFI)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "llvm-ht" = callPackage ({ mkDerivation, base, bytestring, directory, mtl, process , type-level @@ -115796,7 +123361,7 @@ self: { mkDerivation { pname = "llvm-ht"; version = "0.7.0.0"; - sha256 = "c6fa920dbb8aed7c4bae2a9f829b78ee38a2558ee7cbe0f67b4d4a29aee7c8fa"; + sha256 = "1yn8wyp2jjjdggvf1jz7iras4f7fg2dq57ramr5prvcapc6r5yn6"; libraryHaskellDepends = [ base bytestring directory mtl process type-level ]; @@ -115813,7 +123378,7 @@ self: { mkDerivation { pname = "llvm-pkg-config"; version = "0.0.1"; - sha256 = "3913c3214ee56bf5bdd6b0a721eed7fd49f335374f32f7f4ed7670ab549bddfa"; + sha256 = "1ynxkdaanw3nxpsgfcjg6wsz6jgxszp239xhssyzasz59qhw64rr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115824,12 +123389,12 @@ self: { }) {}; "llvm-pretty" = callPackage - ({ mkDerivation, base, containers, monadLib, pretty }: + ({ mkDerivation, base, containers, monadLib, parsec, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.6.0.0"; - sha256 = "f9b50885551a48624a0577c6dabaef1fc77245367d6d9afdb84d548ada328e66"; - libraryHaskellDepends = [ base containers monadLib pretty ]; + 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; }) {}; @@ -115841,8 +123406,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.3.0.1"; - sha256 = "def47c50959ae7b270987bcf53af87e07a290275bfd34f01e3d3c50b8edf1178"; + version = "0.4.0.0"; + sha256 = "0mj4k4a8xap5gsw7zrnlg6ms65nb1cfmllxq24h7gvd7s9qs9cp8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115866,8 +123431,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1.0.1"; - sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5"; + version = "3.1.0.2"; + sha256 = "165zz8mgygc5q8ck4s3jc26bi79pf6m42wr8g1xahr6vkjc1csjn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115889,7 +123454,7 @@ self: { mkDerivation { pname = "llvm-tools"; version = "0.2.0.1"; - sha256 = "0d6edef77bc384a8391f50fc5fc1094ab88af4a8f5f5b385134a69dc9e06d7db"; + sha256 = "1nyp0sgdqsaa2f2v7xgmm3s8mf2a170mzz2h3wwsi163ggvxwvhd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115911,7 +123476,7 @@ self: { mkDerivation { pname = "lmdb"; version = "0.2.5"; - sha256 = "80552856211cdce06b808685d621bdd9c33a5ac5540a4dafe120c6b20c901c7d"; + sha256 = "0z8wj06b5ii0w6pls2jlqmd3mhyrplhxd1c6h1my1p0w45b2hmc0"; libraryHaskellDepends = [ array base ]; librarySystemDepends = [ lmdb ]; homepage = "http://github.com/dmbarbour/haskell-lmdb"; @@ -115928,7 +123493,7 @@ self: { mkDerivation { pname = "lmdb-high-level"; version = "0.1"; - sha256 = "cf066a0db4893cd056642d58c7c288c74dcd87dacfaac93a6d342a2b0084a10d"; + sha256 = "03d1hh02naildlxckangva3wskf7i31cfn1dcibd0g49nh6nl1ng"; libraryHaskellDepends = [ base bytestring ghc-prim lmdb pipes primitive text transformers vector @@ -115949,7 +123514,7 @@ self: { mkDerivation { pname = "lmonad"; version = "0.1.0.0"; - sha256 = "610403335028e21a0eb7f31d5d9a1e9a6befcb53edb28c3a44fb38de14218240"; + sha256 = "0h4244adwf7v8hx8rcpdag5yysws3sd5s7gknw71mqi8a0rh6131"; libraryHaskellDepends = [ base containers exceptions monad-control transformers transformers-base @@ -115972,7 +123537,7 @@ self: { mkDerivation { pname = "lmonad-yesod"; version = "1.0.0.0"; - sha256 = "b5bdffc143763460d2587d5d7dffe354622c3622f3068f4f62f5214c13d2ccb9"; + sha256 = "1ffcs89lq8gmc97qy1pk48v2qqjlwgzpspbxb3960d3n8g0zzgdm"; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup containers esqueleto haskell-src-meta lifted-base lmonad mtl persistent shakespeare @@ -115989,7 +123554,7 @@ self: { mkDerivation { pname = "load-balancing"; version = "1.0.1.0"; - sha256 = "332a7c437b9115b33913becd78d855ff7dc0407f58cfe065e8cd14ce0f7eb99f"; + sha256 = "17xrgq7ww56dx1jy1ksqgx0c0zgzapc7ikdy2cwv65cigd1pqaik"; libraryHaskellDepends = [ base containers hslogger PSQueue stm ]; homepage = "https://github.com/SumAll/haskell-load-balancing"; description = "Client-side load balancing utilities"; @@ -116001,7 +123566,7 @@ self: { mkDerivation { pname = "load-env"; version = "0.1.1"; - sha256 = "8fe39c08a7f58f94732776b211a884834ada6d9f8cf560e6b7ec9a74e9edfd16"; + sha256 = "05pxxplp96pcnzk61xcckxnxljl3hjl13ckn4xrr93zmlw49rqwg"; libraryHaskellDepends = [ base directory parsec ]; testHaskellDepends = [ base directory hspec HUnit parsec ]; description = "Load environment variables from a file"; @@ -116013,18 +123578,43 @@ self: { mkDerivation { pname = "loadavg"; version = "0.1"; - sha256 = "66524cfd13744f37e25aa54b359fe0e486c35aa5578ccf654a00ceef71f7028f"; + sha256 = "13q2yxqyzkh099jwz32plmdc71p4w2gkajx5bbi3fkvl2gylqlk6"; libraryHaskellDepends = [ base ]; description = "Load average parsing from /proc/loadavg and bindings to getloadavg (3)"; license = stdenv.lib.licenses.bsd3; }) {}; + "loc" = callPackage + ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }: + mkDerivation { + pname = "loc"; + version = "0.1.2.3"; + sha256 = "064q3hyjnfpa2r2290604m9pcgh9l1g9fbap176d3n7xknn3lvcc"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hedgehog loc-test ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "Types representing line and column positions and ranges in text files"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "loc-test" = callPackage + ({ mkDerivation, base, containers, hedgehog, loc }: + mkDerivation { + pname = "loc-test"; + version = "0.1.2.1"; + sha256 = "0l75qvhxhppg2vw90fx5g6rg98zy83dx0hd2v9ad799fp4mk6qai"; + libraryHaskellDepends = [ base containers hedgehog loc ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "Test-related utilities related to the /loc/ package"; + license = stdenv.lib.licenses.asl20; + }) {}; + "local-address" = callPackage ({ mkDerivation, base, network }: mkDerivation { pname = "local-address"; version = "0.0.1"; - sha256 = "a9a32960b9c3d0df151d60d7bafbff1c1efd5d7c0e86cbba8d0e310934a486a0"; + sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9"; libraryHaskellDepends = [ base network ]; homepage = "http://bitbucket.org/khibino/haskell-local-address"; description = "Functions to get local interface address"; @@ -116038,7 +123628,7 @@ self: { mkDerivation { pname = "local-search"; version = "0.0.7"; - sha256 = "ae0bdb1a28e1218b5aa899b9cea786a0ea4dc59dadaff350217f392c2a193777"; + sha256 = "0xrp34m2qfbz458g7bxdkp2lvsm0hskwxfcrm1d8n8g150ddn2xf"; libraryHaskellDepends = [ base combinatorial-problems containers erf random ]; @@ -116053,7 +123643,7 @@ self: { mkDerivation { pname = "located"; version = "0.1.1.0"; - sha256 = "626212833281ec4a8bc6e0a86191647dd9c42905ccf586272689a62cee85b396"; + sha256 = "15mkhpp2r9l94qkqdxfc0llw9nbxcj8n3a70qs5lmv416a1i4qk2"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/elliottt/located"; description = "Source location helpers"; @@ -116065,7 +123655,7 @@ self: { mkDerivation { pname = "located-base"; version = "0.1.1.0"; - sha256 = "83a96081c87ec9820b6bad7200404f7e1fbed365fe8c57641d8645d95732d59f"; + sha256 = "17ym69bxjic63mj5g37ycp9vw7vy9x000wmddc5q5jbyr20n1ac3"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/gridaphobe/located-base"; @@ -116078,8 +123668,8 @@ self: { ({ mkDerivation, base, monad-logger, text }: mkDerivation { pname = "located-monad-logger"; - version = "0.1.0.0"; - sha256 = "bab5804fa903da5b817cfa98fec5878066f1bc9d058546ebe84801fec99f5f1d"; + version = "0.1.1.0"; + sha256 = "1xkckg3qgqrqmkli9d6cbzqf5aanqpbxchy650yflpjygwapn4xn"; libraryHaskellDepends = [ base monad-logger text ]; homepage = "https://github.com/MailOnline/located-monad-logger#readme"; description = "Location-aware logging without Template Haskell"; @@ -116094,7 +123684,7 @@ self: { mkDerivation { pname = "locators"; version = "0.2.4.2"; - sha256 = "e40d330653805c0e4de46be4d63970b6ebb8ee47e2a5fbb45309dc50565f4e9c"; + sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4"; libraryHaskellDepends = [ base bytestring cereal containers cryptohash ]; @@ -116111,7 +123701,7 @@ self: { mkDerivation { pname = "loch"; version = "0.2"; - sha256 = "a3d1acf07d52d3103eba88b4fb584b5d982ff95074819c3330cd8568ce269bb7"; + sha256 = "1dwv4v76i1fd60rrr0bla3wjz62x9dcgpd48p8z11lsjgpqarld3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -116126,7 +123716,7 @@ self: { mkDerivation { pname = "loch-th"; version = "0.2.1"; - sha256 = "77541dcb8fb0ae2c7984fc704e53635dbec83974a172611339941bfc9f96d9cd"; + sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p"; libraryHaskellDepends = [ base pretty template-haskell ]; homepage = "https://github.com/liskin/loch-th"; description = "Support for precise error locations in source files (Template Haskell version)"; @@ -116141,9 +123731,9 @@ self: { mkDerivation { pname = "lock-file"; version = "0.5.0.2"; - sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0"; - revision = "3"; - editedCabalFile = "565e73c14184f1760473a10e35d2a04f354dbec33abcf185d217754ad63709b6"; + sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7"; + revision = "4"; + editedCabalFile = "0fs4mrhzj90pnc64nvm6k5v095998rxqcq3875aypkgjn2fwfsrc"; libraryHaskellDepends = [ base data-default-class directory exceptions tagged-exception-core transformers @@ -116167,7 +123757,7 @@ self: { mkDerivation { pname = "locked-poll"; version = "0.1.0"; - sha256 = "6a369cb194ce975fe663b97eef47adcdc5d96e73abeea0f5087a00ee9201a164"; + sha256 = "0r51069fw03s13ss1vmbfdpdkifdmm3yyzmrcgk5z5yfjjqrqdka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base clock containers ]; @@ -116189,7 +123779,7 @@ self: { mkDerivation { pname = "lockfree-queue"; version = "0.2.3.1"; - sha256 = "2a576a54bae8eabde01ebe901c9fd26a11bebb30516841de4525b5b60c0f3a8c"; + sha256 = "131s1w6bdd958pg42s2i62xvw4basagir45y3vhbvsp8p9a6lmra"; libraryHaskellDepends = [ abstract-deque atomic-primops base bytestring ghc-prim ]; @@ -116211,7 +123801,9 @@ self: { mkDerivation { pname = "log"; version = "0.7"; - sha256 = "67daea67ce76d9838f2cb853f198e891d853d705405ff3806ce46fdf2376e51b"; + sha256 = "06z5fqixyvz4dj0g6ps00pbm7n4ix2cg2lxq5j7q7nbnrrkymnk7"; + revision = "1"; + editedCabalFile = "070i5xqgg6k09i8lsn0gbyh4j86wf6fd9x8fzvzyrhwbmz32s875"; libraryHaskellDepends = [ base log-base log-elasticsearch log-postgres ]; @@ -116225,6 +123817,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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.1"; + sha256 = "1gjh3i0j2q72hc1gnn4knc5qhb2zc7d4pi5a22jd0dqgpkmdaay3"; + libraryHaskellDepends = [ + base log-base log-elasticsearch log-postgres + ]; + testHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-base" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , exceptions, monad-control, monad-time, mtl, semigroups, stm, text @@ -116232,8 +123852,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7"; - sha256 = "ba961838e19cccb5d84a052ba75acbd7320119dda482a4fa230346743c8a8c07"; + 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 @@ -116245,22 +123865,22 @@ self: { }) {}; "log-domain" = callPackage - ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, distributive, doctest, filepath, generic-deriving + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, distributive, doctest, generic-deriving , hashable, safecopy, semigroupoids, semigroups, simple-reflect , vector }: mkDerivation { pname = "log-domain"; - version = "0.11"; - sha256 = "4750cd5b2b9b6317493c39c264f7a1fe68f50f8ef30ac1e1c6c42c35b78242cb"; + version = "0.11.1"; + sha256 = "0zbwnx6bs417g67m0hr9n4lk9iwpcm0ivmfhjgaz98hryxx3s8wc"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable safecopy semigroupoids semigroups vector ]; testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect + base doctest generic-deriving semigroups simple-reflect ]; homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; @@ -116274,7 +123894,7 @@ self: { mkDerivation { pname = "log-effect"; version = "0.4.0.1"; - sha256 = "950439deae3c461656557cab7e3aa76079ad335107d58ea6e13a5eaf17293d17"; + sha256 = "05rx54bsypisw6k8xm87a4rssyb0lwx7xavwamb1ciiwmvg3j14m"; libraryHaskellDepends = [ base bytestring extensible-effects fast-logger time ]; @@ -116293,9 +123913,9 @@ self: { mkDerivation { pname = "log-elasticsearch"; version = "0.7"; - sha256 = "bf2326aa0c54972452543973cec3f03f68c6d0c6f9aed285696425da24122bb7"; + sha256 = "1drb28jdl9b4d62x5bprqv8ccs1zy31wwwrrai9295sl1jm2c8xz"; revision = "1"; - editedCabalFile = "b2bd9f57908bc61b3869fdde26babb546db01aa2378e93734514a87448e5b135"; + editedCabalFile = "0ddiwm479a0l8mrr73ipl8db0valpfx2dppxd4w1pilbj1brzgdj"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client log-base semigroups text text-show time @@ -116307,6 +123927,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + 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 + text-show time transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-postgres" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base @@ -116315,8 +123956,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7"; - sha256 = "33744eff195af018d2cf9fa2ce6617ce3cf5242cf478fea776e4a9db7a74f963"; + 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 @@ -116337,7 +123978,7 @@ self: { mkDerivation { pname = "log-utils"; version = "0.2.2"; - sha256 = "7fe12350c66debb33f6bf348c34ee2d046931035cf93dac2c13d76294eed3688"; + sha256 = "121nxm72jxixq71dm4yg6l896inhw97c6j7kdczv7svdqr827qbz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116353,26 +123994,27 @@ self: { }) {}; "log-warper" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring - , containers, data-default, directory, dlist, errors, exceptions - , extra, filepath, formatting, hashable, hslogger, hspec, HUnit - , lens, monad-control, monad-loops, mtl, QuickCheck, safecopy, text - , text-format, time, transformers, transformers-base, universum - , unordered-containers, yaml + ({ mkDerivation, aeson, ansi-terminal, async, base, containers + , data-default, directory, dlist, errors, exceptions, extra + , filepath, formatting, hashable, hspec, HUnit, lens, mmorph + , monad-control, monad-loops, mtl, network, QuickCheck, safecopy + , text, text-format, time, transformers, transformers-base + , universum, unix, unordered-containers, yaml }: mkDerivation { pname = "log-warper"; - version = "0.5.1"; - sha256 = "8645928457c46ca217c2a9ebc75819176643552876c832ad3691a66e762798ea"; + version = "1.1.4"; + sha256 = "1q9n0b0dwdkpvmpk60s65sw8z25k9nbybwnrfv6k0ifdjs86x6lh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers directory dlist - errors exceptions extra filepath formatting hashable hslogger lens - monad-control monad-loops mtl safecopy text text-format time - transformers transformers-base universum unordered-containers yaml + aeson ansi-terminal base containers directory dlist errors + exceptions extra filepath formatting hashable lens mmorph + monad-control monad-loops mtl network safecopy text text-format + time transformers transformers-base universum unix + unordered-containers yaml ]; - executableHaskellDepends = [ base exceptions hslogger text ]; + executableHaskellDepends = [ base exceptions text universum yaml ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit lens QuickCheck universum unordered-containers @@ -116388,7 +124030,7 @@ self: { mkDerivation { pname = "log2json"; version = "0.1"; - sha256 = "ee97e5daa82cbd6f9003dc040079aff9ce3126b55782bce2c56de33d7f8a2d32"; + sha256 = "0cidi9zkvqvdqpibr0jpnlk33kprmxwh016w0f86zg9cm3dfb5zf"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ base containers json parsec ]; @@ -116405,7 +124047,7 @@ self: { mkDerivation { pname = "logentries"; version = "0.1.0.1"; - sha256 = "229f47a750e4a741bea48563ccf70cd59641f5f761beff66f168108dbdc15572"; + sha256 = "0wjmq6yqs438y5kgzgk1yzsl35nm1kvwqqw5ljz439z4a2klg7r2"; libraryHaskellDepends = [ base bytestring data-default fast-logger network stm uuid-types wai wai-extra @@ -116424,7 +124066,7 @@ self: { mkDerivation { pname = "logfloat"; version = "0.13.3.3"; - sha256 = "f774bd71d82ae053046ab602aa451ce4f65440d5c634dc8d950ae87f53527f82"; + sha256 = "10kza99pzs0ajn6xqd66sm059xp43i2sl0mnd8257q1av1qvsx7p"; libraryHaskellDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -116439,7 +124081,7 @@ self: { mkDerivation { pname = "logger"; version = "0.1.0.2"; - sha256 = "ed88d5a9dfb261a9928f446f98c21308bb4dd31f02d8abb4d1bbce671d2f6472"; + sha256 = "0wk45wfngkmvs6sapn023z9lvfq82g19hvs4iy9ajqdjvylxb27d"; libraryHaskellDepends = [ ansi-wl-pprint base containers lens mtl template-haskell time time-locale-compat transformers transformers-compat unagi-chan @@ -116457,7 +124099,7 @@ self: { mkDerivation { pname = "logger-thread"; version = "0.1.0.2"; - sha256 = "ac0a54001a69cff6f975209c4d9d399fb58ef59bb0ad6ac742c5ffedeac04a2a"; + sha256 = "0ajaq3mfvzy58b3nmbdhkgsqxdcz76flv710fpwzdkv9380582mc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116477,7 +124119,7 @@ self: { mkDerivation { pname = "logging"; version = "3.0.4"; - sha256 = "a04db0375aef48c941a001c754d87d65a0df5e059efd9fcd54efc059570a7b62"; + sha256 = "0qkv19bmkh7gak6rzzcy0mgdz835gpc59iq1l10wjj7gb8vv0kd0"; libraryHaskellDepends = [ base binary bytestring fast-logger lifted-base monad-control old-locale regex-compat text time time-locale-compat transformers @@ -116496,7 +124138,7 @@ self: { mkDerivation { pname = "logging-effect"; version = "1.1.3"; - sha256 = "0eaa34ec9174acc7cbc4c806b44f4b616430658bf215c086b3ee29877cbe7914"; + sha256 = "053rpry8fagfnf3c05gjidjk0r319d7v81n8qk5wgb3lj7n39ahf"; libraryHaskellDepends = [ async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text @@ -116519,7 +124161,7 @@ self: { mkDerivation { pname = "logging-effect"; version = "1.2.0"; - sha256 = "be6f0121d16e9947d4147c264123b8d622102eb43f0d16e815f117505d6d8544"; + sha256 = "0i45dmfm05zi2pl1c39znhp108nnp0il29kw2ka4g6bfs4hh2vxy"; libraryHaskellDepends = [ async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text @@ -116539,15 +124181,29 @@ self: { mkDerivation { pname = "logging-facade"; version = "0.1.1"; - sha256 = "60f9f29d54e9756825400f281101872ed87de55271e87571068838a7b3d98da2"; + sha256 = "18ldv6rsff480rqpbs3iabjpvn1fhw0i2a0g80jnhxg9ajfz5yb0"; revision = "1"; - editedCabalFile = "fc89005336a9b64c524183154716ebf8a26c27f8fa5730225f818f0128c2a2b2"; + editedCabalFile = "1cm2q8l033w1bwi30mzsz0knr8pqxcb4f5c38594rdm96r9h12gw"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base hspec ]; description = "Simple logging abstraction that allows multiple back-ends"; license = stdenv.lib.licenses.mit; }) {}; + "logging-facade_0_3_0" = callPackage + ({ mkDerivation, base, call-stack, hspec, transformers }: + mkDerivation { + pname = "logging-facade"; + version = "0.3.0"; + sha256 = "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf"; + libraryHaskellDepends = [ base call-stack transformers ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/sol/logging-facade#readme"; + description = "Simple logging abstraction that allows multiple back-ends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade-journald" = callPackage ({ mkDerivation, base, hspec, libsystemd-journal, logging-facade , text, unordered-containers @@ -116555,7 +124211,7 @@ self: { mkDerivation { pname = "logging-facade-journald"; version = "0.0.0"; - sha256 = "f4fc00ad2df10ef6ac6d2abd49b8fd719357eab394a8cea38dbda64d4e393794"; + sha256 = "151p7574v9mxiniwxa4lngm5g4viznw4kg9adnngc3pi5nnh1z7l"; libraryHaskellDepends = [ base libsystemd-journal logging-facade text unordered-containers ]; @@ -116568,6 +124224,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "logging-facade-syslog" = callPackage + ({ mkDerivation, base, hsyslog, logging-facade }: + mkDerivation { + pname = "logging-facade-syslog"; + version = "1"; + sha256 = "1acfkmr3cgprij9sfa0hfqyni6s8py22s3n0xa8qhy3syz1j72zb"; + libraryHaskellDepends = [ base hsyslog logging-facade ]; + homepage = "https://github.com/peti/logging-facade-syslog#readme"; + description = "A logging back-end to syslog(3) for the logging-facade library"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "logic-TPTP" = callPackage ({ mkDerivation, alex, ansi-wl-pprint, array, base, containers , happy, mtl, pointed, QuickCheck, syb, transformers @@ -116576,7 +124245,7 @@ self: { mkDerivation { pname = "logic-TPTP"; version = "0.4.4.0"; - sha256 = "5aac97226f53f2be61c1aeb58e9fdd4b3f971aa74af10904944384fa849cbd27"; + sha256 = "09xxkj2gm123jh20kwaalwd9fgsbvngqxddfq5hvxwjkdwi9gb2s"; libraryHaskellDepends = [ ansi-wl-pprint array base containers mtl pointed QuickCheck syb transformers transformers-compat @@ -116594,7 +124263,7 @@ self: { mkDerivation { pname = "logic-classes"; version = "1.7.1"; - sha256 = "4c403e8b8487d7d4843c76ad3982a2661eff4fc687bb7e8c507f9114008e6550"; + sha256 = "0l35iq0194bza267xfw7qr7zy7k6la13kbbn7j2d9mw7hj5kwh2c"; libraryHaskellDepends = [ applicative-extras atp-haskell base containers HUnit mtl parsec pretty PropLogic safe safecopy set-extra syb template-haskell @@ -116614,7 +124283,7 @@ self: { mkDerivation { pname = "logicst"; version = "0.1.0.0"; - sha256 = "acad1f86fe98447f1e60efdd920a1dcd46b9584590b26ece11958c21d2333d18"; + sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc"; libraryHaskellDepends = [ base logict transformers ]; homepage = "http://github.com/sonyandy/logicst"; description = "Backtracking mutable references in the ST and IO monads"; @@ -116626,7 +124295,7 @@ self: { mkDerivation { pname = "logict"; version = "0.6.0.2"; - sha256 = "1182b68e8d00279460c7fb9b8284bf129805c07754c678b2a8de5a6d768e161e"; + sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi"; libraryHaskellDepends = [ base mtl ]; homepage = "http://code.haskell.org/~dolio/"; description = "A backtracking logic-programming monad"; @@ -116638,7 +124307,7 @@ self: { mkDerivation { pname = "logict-state"; version = "0.1.0.2"; - sha256 = "7715a898f79742282a8cf2f047fc3f4c6d3095183d6830d68aaf36abc2c751ac"; + sha256 = "1b2iqz1andmgibb30s1x32ak0vac7zy4gw7jihm2hhlpyycah5bp"; libraryHaskellDepends = [ base logict mtl transformers ]; homepage = "https://github.com/atzedijkstra/logict-state"; description = "Library for logic programming based on haskell package logict"; @@ -116650,7 +124319,7 @@ self: { mkDerivation { pname = "logplex-parse"; version = "0.1.0.2"; - sha256 = "e802251aa40c73f9dea2ebe0b7bd92450b94a513343f165cccb2e86489403604"; + sha256 = "011n824n9s5jrif1cgrl2fjr82s5jayvgq7blbggjwqclhd2a0p8"; libraryHaskellDepends = [ base iso8601-time parsec text time ]; testHaskellDepends = [ base hspec time ]; homepage = "https://github.com/keithduncan/logplex-parse"; @@ -116663,10 +124332,11 @@ self: { ({ mkDerivation, base, hspec, hsyslog, logging-facade, time }: mkDerivation { pname = "logsink"; - version = "0.1.0"; - sha256 = "23f1bcac918698f5f7d6517135af658c217607f9d52f546503ff047048c7bffb"; + version = "0.2.0"; + sha256 = "1mvxwfdqqk9hkkffz5fx0zrh27z9x44v2wp2jrjjmidj2k9i1hrh"; libraryHaskellDepends = [ base hsyslog logging-facade time ]; - testHaskellDepends = [ base hspec logging-facade ]; + testHaskellDepends = [ base hspec hsyslog logging-facade time ]; + homepage = "https://github.com/sol/logsink#readme"; description = "A logging framework for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -116680,9 +124350,9 @@ self: { mkDerivation { pname = "lojban"; version = "0.3"; - sha256 = "a65b1d1dc98c073f228580f1db29bfab814c81c9c7579b6b801ead16c40ba35d"; + sha256 = "0pd31g21db8yh1mrnmy7r60lr0dbpwlxpwc0hli3y1wcr4fisnx6"; revision = "1"; - editedCabalFile = "9d30c9c8f1aa80aea24ca606d74ee1b3a9af0ecde15a0e65b1150d483d6b1cfc"; + editedCabalFile = "1z0wdcylh38mn5jhwnp1rl7azadkw57df1m69jiax05ay74cjc4x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116700,7 +124370,7 @@ self: { mkDerivation { pname = "lojbanParser"; version = "0.1.9.2"; - sha256 = "124dcd8bcdd28f83930cbdc22545a21e3b1d619440a9aaf4413369badb30b12b"; + sha256 = "0axi63dvls9k87samaa0jihisfqyl92jbhmx1j9q73yjrn5wsk8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -116715,7 +124385,7 @@ self: { mkDerivation { pname = "lojbanXiragan"; version = "0.3"; - sha256 = "57b73e6afcb423a1621d5b1f220ce9f0f2262ad442484bb472d56c3434acf2c0"; + sha256 = "1h7jmhs38v6mfas4nj22shm2dwphx46247sv3mia28xlzim3xdsp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -116730,7 +124400,7 @@ self: { mkDerivation { pname = "lojysamban"; version = "0.0.8.1"; - sha256 = "0dc2e4430073fbdd47f733955c045b652aae8a5ba715a4d6fd9afc79a60ba730"; + sha256 = "0c571fk7kz4szpba85d7bf5awak5bc25r59kyx3xvyvk011y9hhd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base lojbanParser yjtools ]; @@ -116751,9 +124421,9 @@ self: { mkDerivation { pname = "lol"; version = "0.6.0.0"; - sha256 = "973a5ecd6397fd01e34bb7a40e80a3b0b564ca00aeafb73dc66fb0ec988c950d"; + sha256 = "03cmijcfrc3gqqyvgbxf03569ddhlf00x95p9gih3zcpcg6mwflp"; revision = "1"; - editedCabalFile = "bc9524337ed4a7608bda8a983259e6e381621d8a0914531833a5d1a761ba7971"; + editedCabalFile = "0wbrp9hsgld56cc56509i8fn50g3wrck564ava5n19ylgqrj95dw"; libraryHaskellDepends = [ arithmoi base bytestring constraints containers crypto-api data-default deepseq directory monadcryptorandom MonadRandom mtl @@ -116776,7 +124446,7 @@ self: { mkDerivation { pname = "lol-apps"; version = "0.2.0.2"; - sha256 = "d082ac8f4112884878a5f8f0ce8d994b1c5dc8d62bba8f55a437b03f1f2e1c88"; + sha256 = "120w5qgkzc1pliaqzfibsv45s72bk66wxw7qlmw4i20j867sr0nh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116808,7 +124478,7 @@ self: { mkDerivation { pname = "lol-benches"; version = "0.0.0.5"; - sha256 = "6d708ff14c3dbe0ea7742d9498fe43ad087eb43652bd20cc92bd4f5fc0671858"; + sha256 = "0n0qcz05ykxxjb621gaj6ss7w25d8gz9i51dfjkhxgix9kqqyw3d"; libraryHaskellDepends = [ ansi-terminal base containers criterion crypto-api deepseq DRBG lol MonadRandom split statistics @@ -116825,7 +124495,7 @@ self: { mkDerivation { pname = "lol-calculus"; version = "1.20160822"; - sha256 = "06bda58d895274d2786d1b20fe5903d2788d5735903c6c0db4ab8f447ddf60af"; + sha256 = "1bv0vxyl93xbnh6nqg4h6mbqsy6j0dczw80vdmwd4x2ji66sbg86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116847,7 +124517,7 @@ self: { mkDerivation { pname = "lol-cpp"; version = "0.0.0.3"; - sha256 = "42fe0cc6f99aabd9ab47666fa41cb8407688d0e4e18a7e9cf67f1db43e1b9325"; + sha256 = "09ck3czb87bzysf7x2p1wk88hxj0p0fa8vv68ymxkawsz730rzj2"; libraryHaskellDepends = [ base constraints deepseq lol MonadRandom mtl numeric-prelude reflection vector @@ -116867,7 +124537,7 @@ self: { mkDerivation { pname = "lol-repa"; version = "0.0.0.2"; - sha256 = "9545c89813d53d928ba6da0ef24118f6a80c01525d05963b6e8b1399bd3e91a4"; + sha256 = "194i7syrj4wbdqxrc1axa80hra7n310z43nsls5r4gfm2fcchicm"; libraryHaskellDepends = [ base constraints data-default deepseq lol MonadRandom mtl numeric-prelude reflection repa singletons vector vector-th-unbox @@ -116886,9 +124556,9 @@ self: { mkDerivation { pname = "lol-tests"; version = "0.0.0.1"; - sha256 = "656cbe1a7bcea84cffd271a61d0f2b731e14705309636d872afff363628a37ed"; + sha256 = "1v9pi9i67wzz5a3nsqq9adq187kk5c7iv9kisbzlra6fgcdbwv35"; revision = "1"; - editedCabalFile = "39058c9844930c138aed3e9135879c07de330ae36259e5799c0cdf96fc9ca9d2"; + editedCabalFile = "1lm9kky9dpqckiwyanb2wc537ph7kj3kb49yxn51634k8jc8q19r"; libraryHaskellDepends = [ base lol MonadRandom QuickCheck test-framework test-framework-quickcheck2 @@ -116907,9 +124577,9 @@ self: { mkDerivation { pname = "lol-typing"; version = "1.20160822"; - sha256 = "23dc43a7cc9a742da3c335b4b68118b46e9d9afc868ac929f077cdbb35e1538b"; + sha256 = "12skw4svpkbpy0lwk2l6zjd9svml320vdd1mqfijsx4srjkl7p13"; revision = "1"; - editedCabalFile = "66fc867da364d50ad2808e9b6ec0e6e55ea415691e66e0d6094880ddf768f3ba"; + editedCabalFile = "1fpkd3vxv02817bf0rhyd4as8pp5wv06x6wfh390mmb4ldyqdz36"; setupHaskellDepends = [ base Cabal uuagc uuagc-cabal ]; libraryHaskellDepends = [ base containers ghc-prim lol-calculus monad-classes parsec text @@ -116931,7 +124601,7 @@ self: { mkDerivation { pname = "loli"; version = "2011.6.24"; - sha256 = "4a8e9160aa3fb6852bd5bf474926aa9ff1db7ee9f86675483b506d01fb6c43d4"; + sha256 = "1m23dkxh2vah7d47arpqx5zdpwczm8k4jixzslmqbdizm9h933ja"; libraryHaskellDepends = [ base bytestring containers data-default hack hack-contrib mps mtl template utf8-string @@ -116949,7 +124619,7 @@ self: { mkDerivation { pname = "lookup-tables"; version = "0.1.1.1"; - sha256 = "bb9ee2cea827e146d510804c6b26c6f1a62032215eba4da7eb5bb67f977c478e"; + sha256 = "13j7gjbpzdjvxfklvfjy44r219piqqk6nk4023aldq97m37f57mv"; libraryHaskellDepends = [ base primitive template-haskell ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "http://hub.darcs.net/jmcarthur/lookup-tables/issues"; @@ -116964,7 +124634,7 @@ self: { mkDerivation { pname = "loop"; version = "0.3.0"; - sha256 = "92962010bdab28cc0092dd3fe42819d6f215c717dd10d9349626d92a0d0b3ecf"; + sha256 = "1kry1c6jmn96jqsdj46x2z3ibwnn34lf8gyxj80cqa5bpl8215lj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec mtl ]; benchmarkHaskellDepends = [ @@ -116980,7 +124650,7 @@ self: { mkDerivation { pname = "loop-effin"; version = "0.1.1.0"; - sha256 = "a230f31bc8ae63af4b6d9264fb062a2f89ee75e58e632983433ea8895215a00b"; + sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52"; libraryHaskellDepends = [ base effin ]; homepage = "https://github.com/konn/loop-effin"; description = "control-monad-loop port for effin"; @@ -116993,7 +124663,7 @@ self: { mkDerivation { pname = "loop-while"; version = "1.0.0"; - sha256 = "6d916440ef5e7e0c00322c6c96e045f88eb5f2ffa510bcb238dcc7605f487cfb"; + sha256 = "1yvw91gn1iyw72rbq455zzrbb3pq8ph9cv1c6800qzjyxx0694bd"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformer supporting various styles of while loop"; license = stdenv.lib.licenses.bsd3; @@ -117007,9 +124677,9 @@ self: { mkDerivation { pname = "loops"; version = "0.2.0.2"; - sha256 = "47cfc98476c1a3267b27531825849978d3c0ccb5a2d6cd61132a7f719f10ddeb"; + sha256 = "1syx22gp2zra2dhwvmm2np6c1lvqk622a62k4xxjd8y1fs2ckks7"; revision = "1"; - editedCabalFile = "ef9ed99ec28140d39775a0b9c44333496d3ee754995219460d76cb137a9534ce"; + editedCabalFile = "1kiljmx17jvn1m31jllrakkkwva96d1w9fd0fnbx6h41qagdk7pg"; libraryHaskellDepends = [ base primitive transformers vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion transformers vector ]; @@ -117024,7 +124694,7 @@ self: { mkDerivation { pname = "loopy"; version = "0.0.1"; - sha256 = "c67b7ec86aa75af3a16951b064509103f7a621ffdc3becb93efbef11093dcd3f"; + sha256 = "0gyd7l4i3vzv7swyqfywzwhsdxq3j5869c2id6hz6nm7db47wyy6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117048,7 +124718,7 @@ self: { mkDerivation { pname = "lord"; version = "2.20150122"; - sha256 = "12a5f08f5d85a871e474592fc179a924dede3d26a8d6377f287f55100689fb4f"; + sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117083,7 +124753,7 @@ self: { mkDerivation { pname = "lorem"; version = "0.0.0.0"; - sha256 = "d1168732f55f9349d40792781471e831aa9b4a4065760f62cc22f83441faa7bb"; + sha256 = "1fx7z90k9y12rii0yxk58159paiix1qi8y4j0za4k4szylr8f5ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -117099,7 +124769,7 @@ self: { mkDerivation { pname = "loris"; version = "0.3.1"; - sha256 = "f8890ad9edc96e2ff6552c73368a4e9be1c70941d7a32114f103f8aadf6081a7"; + sha256 = "19w1c3gsmy03y4a238yp844wgqcv9s53cwrcapv2yvn9xpchm2gq"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ loris ]; libraryToolDepends = [ c2hs ]; @@ -117116,7 +124786,7 @@ self: { mkDerivation { pname = "loshadka"; version = "0.2"; - sha256 = "deb615d8d0f927032ae316072a18372fc33388f050f524cead03cefb1f5b5206"; + sha256 = "01jjbcgzpkh3mp729xahy2437hrg6wc2l1qnwcm069zrs3c1bdny"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117136,7 +124806,7 @@ self: { mkDerivation { pname = "lostcities"; version = "0.2"; - sha256 = "37e921a1c7ee1e2a976f40b829c9bd9b96df23409cbb0b9a5d8e493091c074ab"; + sha256 = "1avlq28k0jcfbnd0pfww80ixz5lvpp4jkf20dybjl7pfqyhj3s9p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117148,12 +124818,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "loup" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring + , conduit, lifted-async, lifted-base, optparse-generic, preamble + , shakers, time, turtle, unordered-containers, uuid, yaml + }: + mkDerivation { + pname = "loup"; + version = "0.0.13"; + sha256 = "03ibb8ddrd7k9mhb8axg3jrbrn68kwi94sz7wnxr21ixiz2cb122"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-swf base bytestring conduit lifted-async + 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 ({ mkDerivation, base, gl, linear, vector }: mkDerivation { pname = "lowgl"; version = "0.4.0.1"; - sha256 = "fceb0202bed4a3a3e0431ad32eac95fcc4aefef93b992a35797da0bfc8d39df7"; + sha256 = "1xwxsg4bz83xg4sjm69vz7zaxi7wjnn2xlqs8gha78ylpq105szw"; libraryHaskellDepends = [ base gl linear vector ]; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; @@ -117168,7 +124860,7 @@ self: { mkDerivation { pname = "lp-diagrams"; version = "2.1.0"; - sha256 = "289129d3581ea5276c3e9a829322bc1ce38ca62094390706a5fa2c6f176c37be"; + sha256 = "1gipdhbnyb7sll30ffcl42k8rqqwphi970ls7rn2g98yb39jk498"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -117187,7 +124879,7 @@ self: { mkDerivation { pname = "lp-diagrams-svg"; version = "1.1"; - sha256 = "6cc63a8bf914fbc67e42c54c0c4327e81b650d56d9aee5b189946473453463b2"; + sha256 = "1ck36i2p6r4li6qybbnraq6na6z84x1hqk6589zcdyqlz65kmikc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117204,7 +124896,7 @@ self: { mkDerivation { pname = "lrucache"; version = "1.2.0.0"; - sha256 = "5f17a9e026e198152d13830a0eae0df21be437c238a3f157f7c188fe27a37616"; + sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz"; libraryHaskellDepends = [ base containers contravariant ]; homepage = "http://github.com/chowells79/lrucache"; description = "a simple, pure LRU cache"; @@ -117217,10 +124909,8 @@ self: { }: mkDerivation { pname = "lrucaching"; - version = "0.3.1"; - sha256 = "2f287ea60d721f58474dc105dec953f98ce9a41dd1897647ef68a48605b132d6"; - revision = "1"; - editedCabalFile = "d6cfaad57c507189c9c63c24c96b551ce36f8bd035baceda4b9d187a98fef060"; + version = "0.3.2"; + sha256 = "1vg6ip77vlqixj2ghvwm036yb4qhkif175k8gfd27nmr4w5rv2ns"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -117239,7 +124929,7 @@ self: { mkDerivation { pname = "ls-usb"; version = "0.1.1"; - sha256 = "1323643388c09d5bff320219f2b7511e836d09df5f4af94e57bde5188f70aa23"; + sha256 = "08xaf27iirdxax7gjjjzvw4nv0qya6vz46826bzmp7f0i0rn88qk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117259,7 +124949,7 @@ self: { mkDerivation { pname = "lscabal"; version = "0.1.1"; - sha256 = "b23409ae7d13a3fda39b619935a9e973723e6440351e95d68616885e994c4192"; + sha256 = "14j19jcmx20nhvb9a7im81j3wwkkx6lkb6b1kfizv8qkgnp0jd5j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117278,7 +124968,7 @@ self: { mkDerivation { pname = "lss"; version = "0.1.0.0"; - sha256 = "59b264243cfe1e6fea2c69e7482f9eb0946e3284af5496f4ee6035a0bc0609e5"; + sha256 = "1r890sya0db0xvs9cm5ghhr6x55hkqplirv95km6y7py7hj69cjr"; libraryHaskellDepends = [ attoparsec base containers directory filepath language-css language-css-attoparsec text xmlhtml @@ -117298,7 +124988,7 @@ self: { mkDerivation { pname = "lsystem"; version = "1.2"; - sha256 = "afa344de784e26ee98e17eb8c857186da2ddc1ed8990c1d457e9de93350c64f2"; + sha256 = "1wk41hsr7pp9azac3449xp0xv8kd31bwif3yw6cfw9jfg3g498xg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117317,8 +125007,8 @@ self: { }: mkDerivation { pname = "ltext"; - version = "0.1.2.1"; - sha256 = "7b1af9f04f227226de237e98ace6b658768ab8b24ee86ee1252fbda41a447534"; + version = "0.1.2.2"; + sha256 = "12ql2p9zkib4m7hbfxzn8pxg0n9rgf35bhf1csrf48b6kzl9z28f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117349,7 +125039,7 @@ self: { mkDerivation { pname = "ltiv1p1"; version = "1.0.0.3"; - sha256 = "6393a2fc805e8d089782ce3e25adfbb21b46af0d96f7c7a3791ecf30f6097be7"; + sha256 = "1rvv17v31kqyg6iwgxwn1nplc6xjzfnjagnfhabhi3ayh3ya54v3"; libraryHaskellDepends = [ authenticate-oauth base blaze-builder bytestring containers data-default http-client http-types random text time transformers @@ -117368,7 +125058,7 @@ self: { mkDerivation { pname = "ltk"; version = "0.15.0.5"; - sha256 = "44101ce43336e9746e295c14beda5cae1d2d4a9c67ca7d5ed1d51a90b3d8d1a2"; + sha256 = "18niv2rr06nms5g7vjk7ki52s7dfbkdbw52w55p79s9n6gj1q424"; libraryHaskellDepends = [ base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text transformers @@ -117384,7 +125074,7 @@ self: { mkDerivation { pname = "ltl"; version = "0.0.0"; - sha256 = "6f709c22880fbc4c626906cdde29211a6b39bd92fdaa5f466653d5a69fed7240"; + sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g"; libraryHaskellDepends = [ base vcd ]; homepage = "http://tomahawkins.org"; description = "Using linear temporal logic (LTL) to verify embedded software and hardware"; @@ -117398,7 +125088,7 @@ self: { mkDerivation { pname = "lua-bc"; version = "0.1.1"; - sha256 = "6a4186dc3ad092df6b5cfd78a0b18175a1944e7044de6a7817f90b195090e02e"; + sha256 = "0bp0j181j2zr2xw6mpj4f17998bmh6qs0y7xbimxz4nh7bf8chba"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -117415,7 +125105,7 @@ self: { mkDerivation { pname = "lua-bytecode"; version = "0.1.0.0"; - sha256 = "f49b959109943221ace6025a8cf14270c093be401c31128e45cdcdde558f97b3"; + sha256 = "1cwpixaxxkfd8n714c8w82z97h3h8bqqqnh2wsn22cll168rb6zl"; libraryHaskellDepends = [ array base bytestring cereal containers hashable numeric-extras vector @@ -117431,7 +125121,7 @@ self: { mkDerivation { pname = "luachunk"; version = "0.1.0.0"; - sha256 = "938d7cc1bfd99fc582745783a400442dc053585d58ef5c9de523d5f15553480d"; + sha256 = "03a8adaz3m93wnfmrvsqbmc57h1d8h0a90spfj1cb7yrpz0pr3ck"; libraryHaskellDepends = [ attoparsec base binary bytestring custom-prelude ghc-prim pretty text @@ -117449,7 +125139,7 @@ self: { mkDerivation { pname = "luautils"; version = "0.1.4"; - sha256 = "0d88b97f2303b5ba706d4d7a138a3c88124764190294f8838db6f9f0b3fbda9c"; + sha256 = "176szfrz1ydnin1zi50235j4f4l87j516yjddmqbmd834dzvk20d"; libraryHaskellDepends = [ base binary bytestring containers hslua monad-loops text ]; @@ -117467,7 +125157,7 @@ self: { mkDerivation { pname = "lub"; version = "0.1.7"; - sha256 = "3014d2b53a0fdc137763ec22326859e8023a97522115645bc960a4081e3b55b7"; + sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h"; libraryHaskellDepends = [ base unamb ]; homepage = "http://haskell.org/haskellwiki/lub"; description = "information operators: least upper bound (lub) and greatest lower bound (glb)"; @@ -117475,30 +125165,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.7"; - sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_8_1" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers, unordered-containers @@ -117506,7 +125172,7 @@ self: { mkDerivation { pname = "lucid"; version = "2.9.8.1"; - sha256 = "eba0e020ce560c5b6146bd7786d8c531026c5c898590e46f7d94a8019740da08"; + sha256 = "026s82bh3a4lgmpy9445i5f6q0iiqpc8cxxx8rhmn32nrqhf187b"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -117520,7 +125186,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -117530,7 +125195,7 @@ self: { mkDerivation { pname = "lucid-foundation"; version = "0.0.2.1"; - sha256 = "0dff6009ea6ff63601701b6524cdad79d4bbace5328a84755a72d639d6ee8682"; + sha256 = "10l6xvb3kmkjb9sq92ijwnnbpm3rmp6j8r8vf00kdxkgx84n1zqd"; libraryHaskellDepends = [ base lucid text ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-instances @@ -117544,7 +125209,7 @@ self: { mkDerivation { pname = "lucid-svg"; version = "0.7.0.0"; - sha256 = "7544bbdbc55359d796221db98e9c28e18ca6c530e726a69ba7409dda547d1f6b"; + sha256 = "0sqzgmadm7a0lydsc9p7632sd37152f8xf8x4abdfnakqpdvni3m"; libraryHaskellDepends = [ base blaze-builder lucid text transformers ]; @@ -117561,7 +125226,7 @@ self: { mkDerivation { pname = "lucienne"; version = "0.0.2"; - sha256 = "32f3a9c51e51e7e6d0ca825c1e1bdeef8dec346959e69ccdc31733534e579bb5"; + sha256 = "1dcvax756cqpqg6rrrjrd4sfr3ggvqdiwp42rb8fdrsi3v2skwrj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117580,7 +125245,7 @@ self: { mkDerivation { pname = "luhn"; version = "0.2"; - sha256 = "dffa4fcf53e893a2186202953d4dc70006021ade091cda7c5671b43a91e8a747"; + sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz"; libraryHaskellDepends = [ base digits QuickCheck ]; description = "An implementation of Luhn's check digit algorithm"; license = stdenv.lib.licenses.bsd3; @@ -117593,7 +125258,7 @@ self: { mkDerivation { pname = "lui"; version = "0.0.6"; - sha256 = "db34b8ee689b2a94add487a784cf0b86a81240f2b2063fe8471f887a5f282420"; + sha256 = "081451gpm20z8zl3y1mjy9015a461g7q99w7sjnr8alvd3pbhd6v"; libraryHaskellDepends = [ base containers haskell98 haskgame MaybeT mtl SDL ]; @@ -117608,7 +125273,7 @@ self: { mkDerivation { pname = "luis-client"; version = "0.0.2"; - sha256 = "9b4e06adf6e636f6a5adef256d2b62bf7453a9e1ac8a7d438aebad2ef79f03c5"; + sha256 = "1i83kzvjxbgbi91pv2mcw6lm6x5zc8mns9ggmnjzcdp6ysnhcklv"; libraryHaskellDepends = [ aeson base http-client lens text vector wreq ]; @@ -117623,7 +125288,7 @@ self: { mkDerivation { pname = "luka"; version = "2012.8.29"; - sha256 = "3ae9b302080bfa7856aa6ef1c5d750d9a0432c0e0f5fd10d7f2b706a0152e701"; + sha256 = "00g7a80nlw1bgw6x2pqg1qn4786ra3bwbwbfm9b7iyhb101b7s9s"; libraryHaskellDepends = [ air base bytestring libffi ]; librarySystemDepends = [ objc ]; homepage = "https://github.com/nfjinjing/luka"; @@ -117639,7 +125304,7 @@ self: { mkDerivation { pname = "luminance"; version = "0.11.0.4"; - sha256 = "f34c1c4c00424a76710afc7090328f6624c3142b8154ba9847875ce18b37f9e4"; + sha256 = "1r7r6y5y2p478ycblm415cac6936iwr90w7w19qpcjj20161qk7k"; libraryHaskellDepends = [ base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void @@ -117647,6 +125312,7 @@ self: { homepage = "https://github.com/phaazon/luminance"; description = "Type-safe, type-level and stateless graphics framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "luminance-samples" = callPackage @@ -117656,7 +125322,7 @@ self: { mkDerivation { pname = "luminance-samples"; version = "0.11"; - sha256 = "78fbff7bd81b35cbfd8a66d3cb1e88fe3598266cfb3ab9364af6b77f8f2e78f9"; + sha256 = "1ybq5s7pzdzn98vbjfpvdhk9hdgyi0gcplv6ibywnd8vv1xzzyvq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117674,7 +125340,7 @@ self: { mkDerivation { pname = "lushtags"; version = "0.0.1"; - sha256 = "2c7143e5eacd177ca002494bbf6497c9d8d24f87acf17dd5f59f694b0c60450c"; + sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell-src-exts text vector ]; @@ -117689,7 +125355,7 @@ self: { mkDerivation { pname = "luthor"; version = "0.0.2"; - sha256 = "ca2f1f9689b17d1799c11a307f41a68ff023775cebb84b04b838936dd32dcde2"; + sha256 = "1qnd5p9nv4rqp024pf7bbivj7w4glr0pyc0sq6cifzdii6b1ybya"; libraryHaskellDepends = [ base mtl parsec transformers ]; testHaskellDepends = [ base mtl parsec ]; homepage = "https://github.com/Zankoku-Okuno/luthor"; @@ -117708,9 +125374,9 @@ self: { mkDerivation { pname = "lvish"; version = "1.1.4"; - sha256 = "844c627b369c6df9a0d9bb2af6c286ee716221f20d9866c9dcf154b3ba0cf1e8"; + sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44"; revision = "2"; - editedCabalFile = "bb376e7ac0598a623c8222824a2ace2649a395be610f81912eb7193450aa3e7e"; + editedCabalFile = "0ziym98386dp5s8q23v1psas6j96rqm4m0i2h8y652jrq1x6wdxv"; libraryHaskellDepends = [ async atomic-primops base bits-atomic containers deepseq ghc-prim lattices missing-foreign random transformers vector @@ -117733,7 +125399,9 @@ self: { mkDerivation { pname = "lvmlib"; version = "1.1"; - sha256 = "6f99e1ed437d45ecdbb019185d24bc920f7965f279f3b1cec268d51350c622d3"; + sha256 = "1lr2qr817mb8qb7b3wvry9jpj3wjphj5s60rn3dyqibx8gny36bg"; + revision = "1"; + editedCabalFile = "0bhgq85nsmyr14lmv1jihacsijsn48smfjymgc4myd6pvaa2f84k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117753,7 +125421,7 @@ self: { mkDerivation { pname = "lvmrun"; version = "1.0"; - sha256 = "ca2dce477ad4bc8f04ad6d40503a9834763c147bb686a2193e8bb8cdf24a8e71"; + sha256 = "0wcf9brcvf4b7qcs51mngca3qxilk0x50h3dml28zg6lg93wwbfa"; isLibrary = false; isExecutable = true; homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"; @@ -117766,7 +125434,7 @@ self: { mkDerivation { pname = "lxc"; version = "0.3.2"; - sha256 = "9ba3d9bff03cc213318124c279c216011f9b56ee8dd51f7a23edf2e5d8aabc5b"; + sha256 = "0nxwmbcfbwpd4dx1zmcdxrb9n7q12v17khi4h4qi7hiwy2zxk8wv"; libraryHaskellDepends = [ base bindings-lxc mtl transformers ]; homepage = "https://github.com/fizruk/lxc"; description = "High level Haskell bindings to LXC (Linux containers)"; @@ -117781,7 +125449,7 @@ self: { mkDerivation { pname = "lye"; version = "0.1.0.0"; - sha256 = "35f5366ca8342b7a72c5b7a848cbf4764037950e53cd2c6f284b374eedeeb4de"; + sha256 = "1pmlxvnlwdsb51pjrkak1sakfh3nyk5lia5pqmr7larlm1n3dx9m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117799,7 +125467,7 @@ self: { mkDerivation { pname = "lz4"; version = "0.2.3.1"; - sha256 = "98cc62bea1a359201f9e39a7db2457272f996ede25d97a2dbee3a07aa80693f1"; + sha256 = "1wck0sl7m873pqnpmn95vrp9jbr7awjdp9rrkqgj0nd3l6z65k4q"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; benchmarkHaskellDepends = [ @@ -117817,7 +125485,7 @@ self: { mkDerivation { pname = "lz4-conduit"; version = "0.2"; - sha256 = "7586c2a0c1a4355ea44c069eb19a5c23cdb9c94034fd182e31d638a43a1bf4a3"; + sha256 = "18zl3cxa8f6n64p1iz9l834vkk93bjdb37h69jj5wdd4q6hc51km"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117842,7 +125510,9 @@ self: { mkDerivation { pname = "lzma"; version = "0.0.0.3"; - sha256 = "af8321c3511bde3e2745093fa3bd74c642e386db7d2e7c43b3a54814f1338144"; + sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg"; + revision = "1"; + editedCabalFile = "0y89blvpswvji1ya7h67gcx322iqi93di3jmwx47l6mic3ki4r2d"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -117859,7 +125529,7 @@ self: { mkDerivation { pname = "lzma-clib"; version = "5.2.2"; - sha256 = "0aed9cb8ef3a2b0e71c429b00161ee3fb342cce2603ccb934f507fb236a09fd5"; + sha256 = "1mczl0vb4zsh9y9wng30wb645crzxrhh3c19qiqhwarsxyw9rv8a"; doHaddock = false; description = "liblzma C library and headers for use by LZMA bindings"; license = stdenv.lib.licenses.publicDomain; @@ -117874,7 +125544,7 @@ self: { mkDerivation { pname = "lzma-conduit"; version = "1.1.3.1"; - sha256 = "2c181aece2c81c9408271e805a00f2833c5ca79f2c7cb55e3a8b6cb0388d612d"; + sha256 = "0bb1ilwb0v4b79gbaz1ckykmqg43y805m00y4w498768wbn1l61c"; libraryHaskellDepends = [ base bindings-DSL bytestring conduit resourcet transformers ]; @@ -117897,7 +125567,7 @@ self: { mkDerivation { pname = "lzma-enumerator"; version = "0.1.3"; - sha256 = "61ca2349d45de89e38b8ffc849b7d31dacb8511c01285def10178461dc42ff5f"; + sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1"; libraryHaskellDepends = [ base bindings-DSL bytestring enumerator mtl ]; @@ -117920,9 +125590,9 @@ self: { mkDerivation { pname = "lzma-streams"; version = "0.1.0.0"; - sha256 = "b6c90e493f6c367f79c1cee6c3ed978c3515139bf2c7174ed083a1cf76071af1"; - revision = "1"; - editedCabalFile = "7f2c0b8a7b6134789e1e2117ba70d536a050f3cc5cc6a438ab69ffd28785046c"; + sha256 = "1w8s0xvcz8c3s171gizjkc9iadccjznw7rnfq5wpydkc7x4hxjdn"; + revision = "2"; + editedCabalFile = "068k1y57r8vsvm36c682jylv27nsdw646fsx1bkjxccgq7h6mbbb"; libraryHaskellDepends = [ base bytestring io-streams lzma ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -117941,7 +125611,7 @@ self: { mkDerivation { pname = "mDNSResponder-client"; version = "1.0.3"; - sha256 = "e222726559744e95809a307605c1a4af0b096adc36f4cdb6eb88f995189b264f"; + sha256 = "0kr6kcc9byc8xfvcvx1nvim0j2xglk0haxihka09akklb5jp48p2"; libraryHaskellDepends = [ base bytestring ctrie data-endian network network-msg transformers ]; @@ -117958,7 +125628,7 @@ self: { mkDerivation { pname = "maam"; version = "0.3.0.0"; - sha256 = "4e296086df29c682b848c7f618534e80b196e8544e197cd2b24ec4f7278999cf"; + sha256 = "1kwri4kzgi2fnb97q6afakl9dcc09r9iixn792w85ii9vy360aaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117974,7 +125644,7 @@ self: { mkDerivation { pname = "mac"; version = "0.1.3.0"; - sha256 = "cddb87cee4de0c1a54319de2a323deb8aecc0251e91d2c3a9ea16224bfbe127e"; + sha256 = "0zhjpszj8qm1kqx2q7g9a41crbmqvqis7qlx65a1l36ywk78gnyd"; libraryHaskellDepends = [ base network transformers ]; description = "Static Mandatory Access Control in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -117990,7 +125660,7 @@ self: { mkDerivation { pname = "macbeth-lib"; version = "0.0.12"; - sha256 = "06717de488f6f382c171528c52a7a28f01bde2d48411b3e309c46477a3055de6"; + sha256 = "1rjx0nipfr6417iv64c4skibs0cglakm532jf70q5wzni3j7sw86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118012,7 +125682,7 @@ self: { mkDerivation { pname = "maccatcher"; version = "2.1.5"; - sha256 = "cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c"; + sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary parsec process ]; @@ -118021,18 +125691,18 @@ self: { }) {}; "machinecell" = callPackage - ({ mkDerivation, arrows, base, free, hspec, mtl, profunctors - , QuickCheck, semigroups, transformers + ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck + , semigroups, transformers }: mkDerivation { pname = "machinecell"; - version = "3.3.1"; - sha256 = "5911832fa471797e5cbc5b4c98c1078f0bad799ba8cb33dbf0e19c6fae35619c"; + version = "3.3.2"; + sha256 = "0gjzn4i9iwclgpki599g52dvsipzc3iplpr8pz4d2s85nm54c9b6"; libraryHaskellDepends = [ - arrows base free mtl profunctors semigroups transformers + base free mtl profunctors semigroups transformers ]; testHaskellDepends = [ - arrows base hspec mtl profunctors QuickCheck semigroups + base hspec mtl profunctors QuickCheck semigroups ]; homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; @@ -118041,22 +125711,24 @@ self: { }) {}; "machines" = callPackage - ({ mkDerivation, adjunctions, base, comonad, conduit - , conduit-combinators, containers, criterion, directory - , distributive, doctest, filepath, free, mtl, pipes, pointed - , profunctors, semigroupoids, semigroups, transformers - , transformers-compat, void + ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad + , conduit, conduit-combinators, containers, criterion, distributive + , doctest, mtl, pipes, pointed, profunctors, semigroupoids + , semigroups, transformers, transformers-compat, void }: mkDerivation { pname = "machines"; - version = "0.6.1"; - sha256 = "a58b84d51a62d3944ac4706ba9163e5b34e27c4b241ab7caa4328b2ad189dc56"; + version = "0.6.2"; + sha256 = "0p346dr68qmaiyhfn697nb13fwl07f5b945bihfwk7r8pjsl6l0w"; + revision = "1"; + editedCabalFile = "1aj0admkxs91x3bax0rsz073m8rpfingrwggj3hi4f7zprmynjj1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - adjunctions base comonad containers distributive free mtl pointed + adjunctions base comonad containers distributive mtl pointed profunctors semigroupoids semigroups transformers transformers-compat void ]; - testHaskellDepends = [ base directory doctest filepath ]; + testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base conduit conduit-combinators criterion mtl pipes ]; @@ -118066,20 +125738,21 @@ self: { }) {}; "machines-amazonka" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-ec2, amazonka-s3 - , amazonka-sts, base, concurrent-machines, containers, exceptions - , focus, hashable, liblawless, lifted-async, list-t, monad-control - , mtl, resourcet, stm, stm-containers, time, transformers + ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core + , amazonka-ec2, amazonka-s3, amazonka-sts, base + , concurrent-machines, containers, exceptions, focus, free + , hashable, liblawless, lifted-async, list-t, monad-control, mtl + , resourcet, stm, stm-containers, time, transformers }: mkDerivation { pname = "machines-amazonka"; - version = "0.4.1"; - sha256 = "cce59823213d25be8bc6b570baaf2f2af5bcbbb5ccc79443afa6542586d5d6bd"; + version = "0.7.1"; + sha256 = "02gqv35ld86gncjryi756zv5991qq7x9f535azs010b8y6mngvgk"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-ec2 amazonka-s3 amazonka-sts base - concurrent-machines containers exceptions focus hashable liblawless - lifted-async list-t monad-control mtl resourcet stm stm-containers - time transformers + amazonka amazonka-autoscaling amazonka-core amazonka-ec2 + amazonka-s3 amazonka-sts base concurrent-machines containers + exceptions focus free hashable liblawless lifted-async list-t + monad-control mtl resourcet stm stm-containers time transformers ]; description = "Machine transducers for Amazonka calls"; license = stdenv.lib.licenses.gpl3; @@ -118091,21 +125764,32 @@ self: { mkDerivation { pname = "machines-binary"; version = "0.3.0.3"; - sha256 = "60ff456d658ea1a427f32ee5ae1c726e2e7703942bd33edf28b457d753c20652"; + sha256 = "0lh6q99xfmxl53gkxlrbjh1pfbkff8faxr9fycks98cfcmnlbzv0"; libraryHaskellDepends = [ base binary bytestring machines ]; homepage = "http://github.com/aloiscochard/machines-binary"; description = "Binary utilities for the machines library"; license = stdenv.lib.licenses.asl20; }) {}; + "machines-bytestring" = callPackage + ({ mkDerivation, base, bytestring, machines }: + mkDerivation { + pname = "machines-bytestring"; + version = "0.1.0.0"; + sha256 = "1rlc5pr70z899zjs2q5p7qy5pm9gjpnm9pww934cxmlwrp1sck9b"; + libraryHaskellDepends = [ base bytestring machines ]; + description = "ByteString support for machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "machines-directory" = callPackage ({ mkDerivation, base, directory, filepath, machines, machines-io , transformers }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.10"; - sha256 = "2ee750f86d1658635095c35e94799d06a921e641bf4daa55676fd06e8e9a98a4"; + version = "0.2.1.0"; + sha256 = "1d6yfh26g9gs406ywc42ascnxcfcz2isfa6j921xikzndzdhg744"; libraryHaskellDepends = [ base directory filepath machines machines-io transformers ]; @@ -118121,7 +125805,7 @@ self: { mkDerivation { pname = "machines-io"; version = "0.2.0.13"; - sha256 = "4d579d5e9e94fafcfca91322734263498999d2e2af45c40ff0d1db78f4a8f5d4"; + sha256 = "1m7mm3s7inyiy07w8idgwb99k2a9cd1768hkm7ygryllkrg9smsd"; libraryHaskellDepends = [ base bytestring chunked-data machines transformers ]; @@ -118136,7 +125820,7 @@ self: { mkDerivation { pname = "machines-process"; version = "0.2.0.8"; - sha256 = "7a159328a70756acc36940a3f3f5430187ecf7a4d4f01b2b92b119d3e14ffa2d"; + sha256 = "0bgs9zhx66dij8mipw6llkvyr1q18gsz78s0d71sqmh7lwl965bs"; libraryHaskellDepends = [ base chunked-data machines machines-io process ]; @@ -118151,7 +125835,7 @@ self: { mkDerivation { pname = "machines-zlib"; version = "0.1.0"; - sha256 = "cdec0ca35953512e09727e7880f044f3db89ec475c35787fa9ea6f74d0614d2a"; + sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d"; libraryHaskellDepends = [ base basic-prelude machines streaming-commons ]; @@ -118166,7 +125850,7 @@ self: { mkDerivation { pname = "macho"; version = "0.22"; - sha256 = "628319b7c0249af073d2e372050c22ac4b14ba7b84cf540490484134ae5a288e"; + sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://github.com/erikcharlebois/macho"; description = "Parser for Mach-O object format"; @@ -118181,8 +125865,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.0.3"; - sha256 = "aaa47cb30b2e727602de95d600446aba6094854bd772ac5be945b86cedbbc269"; + version = "0.0.4"; + sha256 = "1l14jw7awi6vrnlw4g5x4fa4a26j9b7k3mgvr651lxrxz5vc6qrg"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -118205,7 +125889,7 @@ self: { mkDerivation { pname = "maclight"; version = "0.1.0.0"; - sha256 = "63f73abc746d39aaeb8e0a27dc47a54435bb7a5bc089ae9d17782ba4be24c461"; + sha256 = "0qf44jza8avq2yfsx2f0bdxbnda4lm3xq9qaivmslfbdfjy3mxv3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filemanip filepath parsec strict ]; @@ -118229,7 +125913,7 @@ self: { mkDerivation { pname = "macosx-make-standalone"; version = "0.1.0.1"; - sha256 = "24e47204c92a63f42e586116032311ef22daccffc462a527a20b9543e4754512"; + sha256 = "04j5fpj4758bl8ksaqn4zz6dl8pg24ih65k1b0pg8qrar4275r14"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118243,24 +125927,27 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, gitrev, hspec - , hspec-megaparsec, lens, megaparsec, mtl, mwc-random - , optparse-generic, 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 = "1.0.0.1"; - sha256 = "edeea8b9d3cabfaf5392fbe7ad307754e20fe8ef90294b5a846c9a7f8edb5af8"; + version = "2.4.0.1"; + sha256 = "1qldc05017i1dy1mcl79r0ynxx66qqnsyp8f3y5lk4jdgrfz9mb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base gitrev lens megaparsec mtl mwc-random - optparse-generic 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 = [ base hspec hspec-megaparsec megaparsec mtl text ]; + benchmarkHaskellDepends = [ base criterion megaparsec text ]; homepage = "https://github.com/vmchale/madlang#readme"; description = "Randomized templating language DSL"; license = stdenv.lib.licenses.bsd3; @@ -118272,7 +125959,7 @@ self: { mkDerivation { pname = "mage"; version = "1.1.0"; - sha256 = "9f4b161468e3099c0d478e17b560f02b5ea8b45cbcdff2f6c1db2a8d88df763a"; + sha256 = "0fknvy48sanvq7vg5pxwbjsahpiby1hba5wf8w6rq2g3d0a1cjwz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl random ]; @@ -118288,19 +125975,51 @@ self: { mkDerivation { pname = "magic"; version = "1.1"; - sha256 = "b21c3b69f57b64199c1d7be0ac8ea1d02d698be59943058f6a2d642ea57ce082"; + sha256 = "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ file ]; description = "Interface to C file/magic library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) file;}; + "magicbane" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude + , conduit, conduit-combinators, data-default, data-has, either + , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data + , http-client, http-client-tls, http-conduit, http-date + , http-link-header, http-media, http-types, lifted-async + , mime-types, monad-control, monad-logger, monad-metrics, mtl + , network, network-uri, raw-strings-qq, refined, servant + , servant-server, split, string-conversions, text, transformers + , unordered-containers, wai, wai-cli, wai-middleware-metrics + }: + mkDerivation { + pname = "magicbane"; + version = "0.1.1"; + sha256 = "1ijd04xdhxa7mgb9zfacv1p62j467b8f2iz9gw91fxyrqmq2w0m4"; + revision = "3"; + editedCabalFile = "0qjdgz644277qhxph8nwfja3gaxg43pkz2bmqqc0p4r7mqw4qzbh"; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base classy-prelude conduit + conduit-combinators data-default data-has either ekg-core ekg-wai + envy errors fast-logger http-api-data http-client http-client-tls + http-conduit http-date http-link-header http-media http-types + lifted-async mime-types monad-control monad-logger monad-metrics + mtl network network-uri raw-strings-qq refined servant + servant-server split string-conversions text transformers + unordered-containers wai wai-cli wai-middleware-metrics + ]; + homepage = "https://github.com/myfreeweb/magicbane"; + description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "magico" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { pname = "magico"; version = "0.0.1.1"; - sha256 = "149e482d11268d45fb6da03cfa45a0947ea7cacc259c27959314a029c06c2633"; + sha256 = "0cr6dk02k80ljfajg715rk5afzlll12zlg50dpxlb39624nli7hl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118317,7 +126036,7 @@ self: { mkDerivation { pname = "magma"; version = "0.4.0.0"; - sha256 = "7fbef4ce5d50c30f6c386707e655c74626246f4bc8bb84a826a73182ae1a49a3"; + sha256 = "18s93ap84cd74sl89fy89dpj89j6qxayc1v771n0zhshbp7g9gkz"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; homepage = "https://github.com/cutsea110/magma"; description = "magma is an algebraic structure consisting a set together with an binary operation"; @@ -118333,7 +126052,7 @@ self: { mkDerivation { pname = "mahoro"; version = "0.1.2"; - sha256 = "ee5caf86f92607a1c182ff3e81a514f008f70e91edc6344ae38a974080aeb03a"; + sha256 = "0fmhms0415wawd539ipdj47gf27h2jjq2gpzhb0s21r6z63ayp7f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118354,7 +126073,7 @@ self: { mkDerivation { pname = "maid"; version = "2014.10.14"; - sha256 = "592788f2c3001df42ab83efd208af983f13cf5c7b4744f42ddfcdf6184415abf"; + sha256 = "1gss86263pzwvm14yx5lqzskrwc3z6521z9yp0mg8780qgr8h9sr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118376,7 +126095,7 @@ self: { mkDerivation { pname = "mailbox-count"; version = "0.0.2"; - sha256 = "6eef4b2300a8a5a53bb44ec8c192324025ebddcdc81c2ba145f812a941dba3fd"; + sha256 = "1zd3vd0sj4pq8nhjn768rpfyn9a06a9c3j2fnhxsb9d800ilpvvf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118394,17 +126113,18 @@ self: { "mailchimp" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, generics-sop - , http-client, http-client-tls, servant, servant-client, text - , transformers + , hspec, http-client, http-client-tls, servant, servant-client + , text, transformers }: mkDerivation { pname = "mailchimp"; - version = "0.2.0"; - sha256 = "03cbeca629b8f9cc4e9ebd86c98aa05c03726d7358b523d8fc81e309dfa4e4da"; + version = "0.3.0"; + sha256 = "0s5v75mcvhbki7kl60cpwlxfzcjbc65lxdasm7zwb6agywyx5080"; libraryHaskellDepends = [ aeson attoparsec base bytestring generics-sop http-client http-client-tls servant servant-client text transformers ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/jpvillaisaza/mailchimp-haskell"; description = "Bindings for the MailChimp API"; license = stdenv.lib.licenses.mit; @@ -118418,7 +126138,7 @@ self: { mkDerivation { pname = "mailchimp-subscribe"; version = "1.0"; - sha256 = "717d9b1774be7da796eda1e3f65fa23277541c4214107eb38a02f17fd7b1da30"; + sha256 = "0c6sn7bpzw82iarpw40l88f58xrjl9gzdqx1xnbafzdyfhbrnzbi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118439,7 +126159,7 @@ self: { mkDerivation { pname = "mailgun"; version = "0.1.0.4"; - sha256 = "f8335b16a26d16f0bb070db96634d111a7d99c289e1430b7f2f9cec51bc8ac07"; + sha256 = "01xcr0dwbkpryavk054y52fdk9qis4s6df8d0yxz05kdl8b5nczq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118459,20 +126179,22 @@ self: { mkDerivation { pname = "mainland-pretty"; version = "0.4.1.4"; - sha256 = "b6526b119dd84e006740c69ab794d0a43b855fea29bb2a3a8ed2568b995faf9c"; + sha256 = "175gbycqnmnjiqx2mfr9x9gqafx4s2abg6n681kh0knqkl8nnlmn"; libraryHaskellDepends = [ base containers srcloc text ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Pretty printing designed for printing source code"; license = stdenv.lib.licenses.bsd3; }) {}; - "mainland-pretty_0_5_0_0" = callPackage - ({ mkDerivation, base, containers, srcloc, text }: + "mainland-pretty_0_6_1" = callPackage + ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { pname = "mainland-pretty"; - version = "0.5.0.0"; - sha256 = "0666eb8e8005d42c00b49177eeb07518f578d2cb0f891aa7be6c44bd88428d43"; - libraryHaskellDepends = [ base containers srcloc text ]; + version = "0.6.1"; + sha256 = "1q25vn93jlxbrlprh5vv1mb4z0qjjl58snc7mv5a5lnjgj3j8ip3"; + libraryHaskellDepends = [ + base containers srcloc text transformers + ]; homepage = "https://github.com/mainland/mainland-pretty"; description = "Pretty printing designed for printing source code"; license = stdenv.lib.licenses.bsd3; @@ -118486,7 +126208,7 @@ self: { mkDerivation { pname = "majordomo"; version = "0.1.6"; - sha256 = "61850b284d22ebad0d2853f20618410995c7a5d9236df91a4b38532cb9cb4ae6"; + sha256 = "1rjarfwjqlrq9cdgjv93v6jwg58984c0dwjk506svsr29ll0p1b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118505,7 +126227,7 @@ self: { mkDerivation { pname = "majority"; version = "1.1"; - sha256 = "6afeabb09bd4be76bfefc34c7a461c34698c929e33e2ad301cf3c91411ef8290"; + sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka"; libraryHaskellDepends = [ haskell2010 ]; homepage = "https://github.com/niswegmann/majority"; description = "Boyer-Moore Majority Vote Algorithm"; @@ -118520,7 +126242,7 @@ self: { mkDerivation { pname = "make-hard-links"; version = "0.2"; - sha256 = "02e7fb80d6e7cc75523dcbbb565bd6f207e17c895239c58d3edc5a776c5ed62f"; + sha256 = "0bynbrn7fnnw7s6wafaji5yf21zjsrdmdfyb7m97bk77ss0gprq2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118531,6 +126253,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "make-monofoldable-foldable" = callPackage + ({ mkDerivation, base, mono-traversable }: + mkDerivation { + pname = "make-monofoldable-foldable"; + version = "0.1.0.0"; + sha256 = "1bls9gfdlwvaq90g2dllc4vb2rrp6zplx12g35byx6xvwj26lxra"; + libraryHaskellDepends = [ base mono-traversable ]; + description = "Make a MonoFoldable type into an ordinary Foldable type"; + license = stdenv.lib.licenses.mit; + }) {}; + "make-package" = callPackage ({ mkDerivation, async, base, bytestring, configurator, containers , directory, filepath, github, haskeline, lens, lens-datetime, mtl @@ -118539,7 +126272,7 @@ self: { mkDerivation { pname = "make-package"; version = "1.2.0"; - sha256 = "c3463faf5fb73353e529bbea1d31f95d358f5766727ee88cd4953dc0debb0294"; + sha256 = "1502pggc0gcmsj6fhzkjcrbqydaxz4qivsmv57jm6cxpbypkyin3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -118557,7 +126290,7 @@ self: { mkDerivation { pname = "makedo"; version = "0.1"; - sha256 = "56d0590c8fa65216a5eaf00d63a42d0dcc1fd64b03fdd20ba786005588728269"; + sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n"; libraryHaskellDepends = [ base directory filepath HSH process ]; homepage = "http://darcsden.com/kowey/makedo"; description = "Helper for writing redo scripts in Haskell"; @@ -118570,7 +126303,7 @@ self: { mkDerivation { pname = "makefile"; version = "0.1.1.0"; - sha256 = "3ccab1e08b9920e4390b9dca8504e4ba621b693e0fa25b4c3dd68042373a325e"; + sha256 = "0pij78vl506n7m65p8hg7rlinqmswh28bjlx1cwy884righb3jiw"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; homepage = "http://github.com/nmattia/mask"; @@ -118578,12 +126311,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "makefile_1_0_0_4" = callPackage + ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text + }: + mkDerivation { + pname = "makefile"; + version = "1.0.0.4"; + sha256 = "17g8syj2l2fr2f22flcngxsnpprl4hbfqpanql1k55a0z19sjr5k"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base doctest Glob QuickCheck text + ]; + homepage = "http://github.com/nmattia/mask"; + description = "Simple Makefile parser and generator"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "managed" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; version = "1.0.5"; - sha256 = "b9c99943dadaa730ea3d889a09c3ca0efa1b7728f2bb0854815d49f40d4772e0"; + sha256 = "1q3j8w6z8jaxh5a0ifzj51vipyhfrb1hk6l87pm319ysv91rkjdr"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; @@ -118597,7 +126347,7 @@ self: { mkDerivation { pname = "manatee"; version = "0.2.2"; - sha256 = "8385c95ee50e7c3816ac0b488c54e7ed5c6f3f00bd4a1b1734824491689d84ec"; + sha256 = "1v44kml92i426hbinjmx00znyp7dwxa8qj0bmhb3hz0fwmgck1c3"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -118620,7 +126370,7 @@ self: { mkDerivation { pname = "manatee-all"; version = "0.2.2"; - sha256 = "41645e09d0c4ccdd8c778be53d28659985c02e57da26e821c247e8b6b5107ad0"; + sha256 = "1l3s22svds27q8hyh9nsawpc11crcll3vrcbfy6dvk64s04mwr21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118644,7 +126394,7 @@ self: { mkDerivation { pname = "manatee-anything"; version = "0.0.8"; - sha256 = "c80257c4539cf408c9658a8d5e13c60e4302f2f8308de24ff4009ccdc411e0a9"; + sha256 = "1ag0272cv700yi7y539hz3r04hqfqq9mx3cacp4hix4wag25f0n8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118664,7 +126414,7 @@ self: { mkDerivation { pname = "manatee-browser"; version = "0.1.1"; - sha256 = "7020100998980bb2d7b77852d88f1e06e82313b259919fed877a39eb1d737405"; + sha256 = "01blfcfynfbshznrz4arn89j7s063s7xhlkqnzbv42wqk04i083h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118687,7 +126437,7 @@ self: { mkDerivation { pname = "manatee-core"; version = "0.1.1"; - sha256 = "bb94739dc5b6fc4b4df69cbabc53cf4941feffe7014402fd93250d3548634517"; + sha256 = "05s5cd43a395jgyh4i01wzzzwha9rx9vrflwyr6lpz5nqnfp755v"; libraryHaskellDepends = [ array base binary bytestring Cabal cairo containers dataenc dbus-client dbus-core derive directory filepath gconf ghc ghc-paths @@ -118709,7 +126459,7 @@ self: { mkDerivation { pname = "manatee-curl"; version = "0.1.1"; - sha256 = "764fb64d30214ce6104ef7a12fd819cd3e83fa4eb3abc5b2ab4833f3582ba26c"; + sha256 = "0v525dcg6cs8mfrcbaxk9vx86gnd37c2z8gp9q8fck11616vckvn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118730,7 +126480,7 @@ self: { mkDerivation { pname = "manatee-editor"; version = "0.1.1"; - sha256 = "3ed15799d618a3234eb72fa01996d9e09ba13491510c2839646e571898eca665"; + sha256 = "0rd6xjc1hmvfchwjh32ij4sa36z0v6b1k81gnx7278qqsscmgl9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118750,7 +126500,7 @@ self: { mkDerivation { pname = "manatee-filemanager"; version = "0.1.1"; - sha256 = "e10aa801873ea7451ffb204002c06ead459c2936371ca04646d1597d9987f91b"; + sha256 = "06zrhycpsnfi8r3a071p6qlrqidddv004h10zcglb9ryhw0sh2p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118770,7 +126520,7 @@ self: { mkDerivation { pname = "manatee-imageviewer"; version = "0.1.1"; - sha256 = "0fe8d4380c4254769affd2f1090fa0ce65941e660fbaa9fb3489efc97417c37a"; + sha256 = "0yn32xsckvw96kxskfhgcqg98rffl07hkwfjzyd7cm221hwd9s0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118792,7 +126542,7 @@ self: { mkDerivation { pname = "manatee-ircclient"; version = "0.1.1"; - sha256 = "fe2d45163f230d4a12064b432efd739f8ad8f6b83a915af4979eafc22bc92450"; + sha256 = "0l14r4mw5bwyjzs5m49sp3vdi2lzfgyjwhsb0q94l3937wb4abgy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118814,7 +126564,7 @@ self: { mkDerivation { pname = "manatee-mplayer"; version = "0.1.1"; - sha256 = "e4377af1eac3444ddf03f0f08f7c4e04b46631534584370ef6f2320df58ce9c9"; + sha256 = "1jg9ikshscpjyq73g125acqndd049ry8zw7h0gglsi63xbqpldz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118835,7 +126585,7 @@ self: { mkDerivation { pname = "manatee-pdfviewer"; version = "0.1.1"; - sha256 = "a690c5581550d8733b1381cd66504026b95e88e89fb3321562ebd633736e004c"; + sha256 = "0k00drrk7mpbc8ak5cwzx245xf968186dkc12cxp7n2h2mccb456"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118854,7 +126604,7 @@ self: { mkDerivation { pname = "manatee-processmanager"; version = "0.1.1"; - sha256 = "949694dfb6d05e5ffb2808f5f599f0041d40dc3334f92992d9025a656874b3ff"; + sha256 = "1zxkfil6anh2v692ky9l6gf40784y2czbx8853xmypnhnvgr95ll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118874,7 +126624,7 @@ self: { mkDerivation { pname = "manatee-reader"; version = "0.1.1"; - sha256 = "20cdfb51113450c3b499c8d1dd2b208720b8fd2d62807b038fb8bd81c393f31f"; + sha256 = "07zkjg1q3gdqiw1pp0325pyvh84740mxvlf8k6sc6l1l258zpk90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118894,7 +126644,7 @@ self: { mkDerivation { pname = "manatee-template"; version = "0.1.1"; - sha256 = "9e2dd71827e8637b601045d1e6ec9391069c30988f87c26e27d48dfbce1b8d51"; + sha256 = "0lcd3g7gp3fl4xpc51wgk0q9q1lijgnfdla521h7nqz84wcdfbcy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118913,7 +126663,7 @@ self: { mkDerivation { pname = "manatee-terminal"; version = "0.1.1"; - sha256 = "6df2018e14b766f128a299b2a122f0cbdf0d9562c4251fd7a84d82a6e0bb41aa"; + sha256 = "1aj1pghad0jdm3biy9f4caahvpyby0ia3clrl8lg2rmp2j703wkd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118933,7 +126683,7 @@ self: { mkDerivation { pname = "manatee-welcome"; version = "0.1.1"; - sha256 = "088c3b92097a47d04cdc489a8020291e675a59ad6213aa72c58fe702624892ef"; + sha256 = "1vwj91i05rwgqmral4v2mmcmlrqy54h816j8vi6d0ivs1693p308"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118950,7 +126700,7 @@ self: { mkDerivation { pname = "mancala"; version = "0.1"; - sha256 = "8658f85a7e2ebd11f1f5596d5ae572f042082264e9b9c2e97faa598893b959ef"; + sha256 = "1vsrp69qhndagzlw5fg9chi0hhphfbjmlvarypqi3g9fgrdghn46"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -118968,8 +126718,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.3.1"; - sha256 = "a559a166232461520f4fbb0637db9f922a82fdff819e9e35ee7b0941a7c0c315"; + version = "0.5.3.2"; + sha256 = "1jzlfi7b4djkwm0vx9ii55db0jf4v8av3idkgg8x3ix95pvps397"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -118990,7 +126740,7 @@ self: { mkDerivation { pname = "mandulia"; version = "0.7"; - sha256 = "1a8144f8175f08e6ed097839006e1c074013bf969529f7cf4b4c2032a2fa37f3"; + sha256 = "1wrpzai3482c9g7zfacmjszi6h073ip00fbq17nyc22z2zw4908s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119014,7 +126764,7 @@ self: { mkDerivation { pname = "mangopay"; version = "1.12"; - sha256 = "859ea675506f505666857b1d694d57c0e34cc58cfd3b9da2c5216e78aff47f73"; + sha256 = "0wvzyjpphvi1qni9sfzxik2lrqy0ax6nj7bvhmk5cl3ga1ssd7l5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119049,7 +126799,7 @@ self: { mkDerivation { pname = "manifold-random"; version = "0.4.1.0"; - sha256 = "a59a301f18bd852b7ac135a723631145e0b766b216046f5392d014ac83f02311"; + sha256 = "0493y21sq56hj99ny10nn9kbgq2525ij79rmq5x2p1dx30gk16m5"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -119069,7 +126819,7 @@ self: { mkDerivation { pname = "manifolds"; version = "0.4.1.0"; - sha256 = "a10fb25dbfedc0bd308d4bbdabae83721784fef8e0e91278124a1cefc166afee"; + sha256 = "1vmgcv0yy72a29w15sg0z3z885vjhfpapgabilqbvh7dpxfv43x1"; libraryHaskellDepends = [ base comonad constrained-categories containers deepseq free free-vector-spaces lens linear linearmap-category manifolds-core @@ -119087,7 +126837,7 @@ self: { mkDerivation { pname = "manifolds-core"; version = "0.4.1.0"; - sha256 = "8fd0dc49d4bc1246abd0e1043355154d1d747dad6ec5f03cdd00209a65252b10"; + sha256 = "041b4mjrl800vlyg1ibfmmyp87ad2mak6171s2mlc4mwsi4xrl4g"; libraryHaskellDepends = [ base tagged vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; @@ -119099,7 +126849,7 @@ self: { mkDerivation { pname = "map-exts"; version = "0.1.0.1"; - sha256 = "836b92414c8858a485cf7f0f0bd39d2043217a3db34be913a7a412ba5be76c7e"; + sha256 = "0zkcwxdvl4m4lw9yjjxk7mx22hr0kp9hn3vzry2s8n489i0r4sw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -119116,7 +126866,9 @@ self: { mkDerivation { pname = "map-syntax"; version = "0.2.0.2"; - sha256 = "b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a"; + sha256 = "12jdv9myffpkhhrwm5kzhbqzbxfb0rb4fvww33d0yq4s6sk9b3xi"; + revision = "1"; + editedCabalFile = "0k27w9bw4lri2nfm7s7v7gq49mr0him5g2dsc0wha5kzj4gmy87q"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -119133,7 +126885,7 @@ self: { mkDerivation { pname = "mappy"; version = "0.1.3.1"; - sha256 = "91ddbde2da1c972ec53a92f25d43e5db052b029a77f7b029b3389cae1b938645"; + sha256 = "0ic6jcdsx71qnclv1xvpk812n1fvwm1mvwlj7b2jx5qwvbibvpci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119156,7 +126908,7 @@ self: { mkDerivation { pname = "marionetta"; version = "0.1.0.3"; - sha256 = "2fcd858c555ac3320314bd564664a6f4257246dd15282c5eee22958b70a9454c"; + sha256 = "0k25m5q8p592xrg2qa0mvm3749gllrj4cmmx2h1k5hssan68bk9g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119177,7 +126929,7 @@ self: { mkDerivation { pname = "markdown"; version = "0.1.16"; - sha256 = "08b0b352e208316ddc99c6f161704c8ecaf248c2e51f506900e344c93757ed85"; + sha256 = "11gdawvwji7301lm07z5q94g5jlf9iq63wf6k7f6sc88w99b7c08"; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup conduit conduit-extra containers data-default text transformers xml-conduit xml-types @@ -119201,7 +126953,7 @@ self: { mkDerivation { pname = "markdown-kate"; version = "0.1.2.1"; - sha256 = "20122800d1d3e1d6d4d4ae22d6f471045c3c529041d83538f0f2f63c4cf0587e"; + sha256 = "0zjqy163rxpjy0w3bn21j193qp04f7sdc8mfskaddqfks402h4i0"; libraryHaskellDepends = [ attoparsec attoparsec-conduit base blaze-html conduit containers data-default highlighting-kate text transformers xss-sanitize @@ -119221,7 +126973,7 @@ self: { mkDerivation { pname = "markdown-pap"; version = "0.0.1.10"; - sha256 = "986165951135fb83c1e681ca673059c032a1a2ec61c7a7e146e9cd1e7dd20033"; + sha256 = "0cq0s9yixkg98vhsgiv1xjia2cn0b4q6gjl1wv0q7yrm26anaqcq"; libraryHaskellDepends = [ base monads-tf papillon ]; description = "markdown parser with papillon"; license = stdenv.lib.licenses.bsd3; @@ -119235,7 +126987,7 @@ self: { mkDerivation { pname = "markdown-unlit"; version = "0.4.0"; - sha256 = "7c650cae7326a687265274d9e73c74ab2f7e570d7928ce9f47add9439d5b42ce"; + sha256 = "1kj2bffl7ndd8ygwwa3r1mbpwbxbfhyfgnbla8k8g9i6ffp0qrbw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; @@ -119256,7 +127008,7 @@ self: { mkDerivation { pname = "markdown2svg"; version = "0.0.1.27"; - sha256 = "250d806e8d7884c6207b23435f377cf826b5c0f2d7c5694a03d9e94450b0aa6a"; + sha256 = "0sman1849sfr0d56kifpyb0ba9pqghvmyhr3gchcd13qimp80395"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119273,7 +127025,7 @@ self: { mkDerivation { pname = "marked-pretty"; version = "1.1.2.1"; - sha256 = "b4812c7ae1b5c9e563b061643c824043c8b74b915d675758f323d53c59c3ba05"; + sha256 = "01dsqdckrm93ydc5frsxj55vgj238213qr31n1iybjdmw5x2r0dl"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ku-fpg/marked-pretty"; @@ -119286,7 +127038,7 @@ self: { mkDerivation { pname = "markov"; version = "0.1"; - sha256 = "ae55c8aeb954699c32cb0a6ac9f102c728cb4e4a25cd2a17d4f7269a772644cd"; + sha256 = "1ka44rvrl9ppshbjmk95997cna670bqwjsharcr9qsalp6pchmdf"; libraryHaskellDepends = [ base ]; description = "Simple interpreter for Markov's normal algorithms"; license = stdenv.lib.licenses.bsd3; @@ -119297,7 +127049,7 @@ self: { mkDerivation { pname = "markov-chain"; version = "0.0.3.4"; - sha256 = "6e51b800101a28593be28ce7ef1b21b7cc7a177a821fb99ecd8a28c69b7b92cd"; + sha256 = "1kcjgfdwca4arngbj7w2g8bpmk5p44dyzrwcw8xmja0s200bhlbf"; libraryHaskellDepends = [ base containers random transformers ]; homepage = "http://code.haskell.org/~thielema/markov-chain/"; description = "Markov Chains for generating random sequences with a user definable behaviour"; @@ -119311,7 +127063,7 @@ self: { mkDerivation { pname = "markov-processes"; version = "0.0.2"; - sha256 = "68385ba141e12ea66a27e0b09ba9f26d8b675a5c79b4766b6e8316e09b4ba0dd"; + sha256 = "1pd09fdy05l3drmpdd3rbid6g2vdyalrpc704xmacbp186hmnf38"; libraryHaskellDepends = [ base bifunctors memoize MonadRandom random ]; @@ -119329,9 +127081,9 @@ self: { mkDerivation { pname = "markup"; version = "3.1.0"; - sha256 = "c7510643483861dafc9c9a8c41ceaa2f02f85870930cf4563899c49307780d3d"; + sha256 = "0g8dg03r7i4r71bg834kf1cgh0igmb74334skkydlq9q911hclf7"; revision = "1"; - editedCabalFile = "afb6565079dbae62dda5e69e61c9ef1d0617558ba6792c3e93f3788f8d05a3ab"; + editedCabalFile = "1ax30n6qyy7kjcz2qyd6idaif1hxxz4n37p6lpfn5bnvg585ddmg"; libraryHaskellDepends = [ base blaze-html blaze-markup clay comonad lucid mmorph monad-control monad-logger mtl path-extra resourcet text @@ -119350,7 +127102,7 @@ self: { mkDerivation { pname = "markup-preview"; version = "0.2.2.1"; - sha256 = "415bf432f1896b0e1084300b62845ad5e5a4dc33aa40b1a78cd2ff0613acee25"; + sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119371,7 +127123,7 @@ self: { mkDerivation { pname = "marmalade-upload"; version = "0.10"; - sha256 = "c912fa4305f1459e8b3d8faebb333bdce2f387be01b4b5dc3738936a3ba08318"; + sha256 = "0643l0xnm4rq6zfbbd01ps3z7qnw7crvpblg7n5rwigi0m1zl4n9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119404,7 +127156,7 @@ self: { mkDerivation { pname = "marquise"; version = "4.0.0"; - sha256 = "eb4854a0719e880b2d2a9e045d8553a2617034389bb7aaa3ff0d0282b4dd54f0"; + sha256 = "1w2lvns840hdzyismdwv70s70qd2af2ms14y58nhp24yf6h58j7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119433,7 +127185,7 @@ self: { mkDerivation { pname = "mars"; version = "0.2.1.0"; - sha256 = "dfc3504269555da1e5398e2dcb2c12308411abad427fb3372f5819efba36d5fd"; + sha256 = "1zfm6sxfy6aq5wvv6zs2mnmi311h28ncnbcf77js2pamd5151hyz"; libraryHaskellDepends = [ array base bytestring colour gloss MonadRandom mtl random ]; @@ -119456,7 +127208,9 @@ self: { mkDerivation { pname = "marvin"; version = "0.2.3"; - sha256 = "79f439662bd8acd8ab528f29fad7ec73517edcf198fc29dc693c35100110553d"; + sha256 = "0gam200i0d9wd7f2kz4qy7f7wlbkxkbzlacgaamxib6q5dk3kx3r"; + revision = "1"; + editedCabalFile = "1aszssi82ap0y6bkviv3vn6cdh3vb0pv1znvs2z5k52r4wwa8h55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119484,8 +127238,8 @@ self: { }: mkDerivation { pname = "marvin-interpolate"; - version = "1.1"; - sha256 = "4ab8a4739390bf13b1612f223a671b440d959e8f70c9b2913e35cf1cb9e75656"; + version = "1.1.2"; + sha256 = "1kzc83ly479cwm95qpfsixb747xi34ylm49wn8gpvqbh5yyc6h6n"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell text ]; @@ -119503,7 +127257,7 @@ self: { mkDerivation { pname = "marxup"; version = "3.1.0.0"; - sha256 = "21dded8147b7eed7ae4ae5a1ba10648467f77334e01351d1dff754fc59585f2f"; + sha256 = "0bszb1czqm7pvz8m24z06irzfrw4ch8bm8g59apdgvmp8y0yvp91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119527,7 +127281,7 @@ self: { mkDerivation { pname = "masakazu-bot"; version = "0.4.0.0"; - sha256 = "e7457d9edc9809c30199d3ea7873a31060831071037ea6020fd01f36fc162ddd"; + sha256 = "1p9d2vy3c7yh1w1aczh3f4886q0hldrpisnkk40w62cqvjg7sig7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119547,7 +127301,7 @@ self: { mkDerivation { pname = "mastermind"; version = "2010.7.25.1"; - sha256 = "be3a6cc65ec61c0cb2626b9eae3caa86e71ca0e93f43b143eb87099b8296bf2f"; + sha256 = "0bxzjs19n2c7xd1v2hrzx6h1rrw6m8yax7kbcar0q766bv36qfmy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random ]; @@ -119563,7 +127317,7 @@ self: { mkDerivation { pname = "matcher"; version = "0.1.1.3"; - sha256 = "9c9ce11a2d142ef9aa8de080e2d28acd3ccb786109539cf637d988cd69e50ab7"; + sha256 = "1dqawmlwv26r6zv9qlq9c5wcng6dib9f5070inmgjbhl5ldf374w"; libraryHaskellDepends = [ base base-prelude profunctors success text transformers ]; @@ -119577,7 +127331,7 @@ self: { mkDerivation { pname = "matchers"; version = "0.24.0.0"; - sha256 = "c478bb1bd5cebcd1d64c8bb80745222b64a5b6b2e99a450df1dfa201d962369c"; + sha256 = "171ncbch38nzy46lb6p9navaar1b492hgf4b9kbd3g6fsldvny64"; libraryHaskellDepends = [ base bytestring prednote text ]; librarySystemDepends = [ pcre ]; homepage = "http://www.github.com/massysett/matchers"; @@ -119594,7 +127348,7 @@ self: { mkDerivation { pname = "math-functions"; version = "0.2.1.0"; - sha256 = "f71b5598de453546396a3f5f7f6ce877fffcc996639b7569d8628cae97da65eb"; + sha256 = "1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp"; libraryHaskellDepends = [ base deepseq primitive vector vector-th-unbox ]; @@ -119619,7 +127373,7 @@ self: { mkDerivation { pname = "mathblog"; version = "0.6"; - sha256 = "bba53717751414c19467921f7c72a67eeb1898d75c1c0e019f2a2a491d706bd5"; + sha256 = "1mbbf0fljaiakw0hw72wsyc1isvylrr7q7wjcyac250lflbkg9dv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119640,7 +127394,7 @@ self: { mkDerivation { pname = "mathexpr"; version = "0.3.0.0"; - sha256 = "23c30ae0c962a7858d57bed320be6421baeb82fa795260e1eea0bc8fcc4871ad"; + sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3"; libraryHaskellDepends = [ base data-default-class ]; homepage = "https://github.com/mdibaiee/mathexpr"; description = "Parse and evaluate math expressions with variables and functions"; @@ -119655,7 +127409,7 @@ self: { mkDerivation { pname = "mathgenealogy"; version = "1.4.0"; - sha256 = "9491bb64d572248fab24ea1da7b88f2edc7251d00d98c9c3807bdede5b63b4f4"; + sha256 = "1x5lcddxxpkvh31wk60ds18p5p1fiywaf7ga4jmqy93jsmjbp4cl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119673,9 +127427,9 @@ self: { mkDerivation { pname = "mathista"; version = "0.0.1"; - sha256 = "89640f10b337e67d15ab2fc018f921ad7b158c4093b639be6defbbd745e90a2d"; + sha256 = "0b8ax52xgfzgdnz3kdlk8261ayxd47wiih1gmcapvripnc80yr49"; revision = "1"; - editedCabalFile = "57641a3bf376ea93c56ab3bb1cf06c41eb1e0fcbec3751d2a3507fe4974e818f"; + editedCabalFile = "13w19sby8zshlg952dzcrc7ixss1dkq1rfxkdb2r7sknycxilr2p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119697,7 +127451,7 @@ self: { mkDerivation { pname = "mathlink"; version = "2.0.1.1"; - sha256 = "136317152f6158676036a4bccd13382a3198dc4edd53aab7e61a906c285cf8a9"; + sha256 = "1agqbhl6r40swsvsllyx9vf9hc9a709wvg546rh6fn315waifqqk"; libraryHaskellDepends = [ array base containers haskell98 ix-shapable mtl ]; @@ -119713,7 +127467,7 @@ self: { mkDerivation { pname = "matlab"; version = "0.2.0.0"; - sha256 = "fd5022375f70d1d5d0bff5e7e4ea7981db04cd8725047968f11d7f1b29a36a22"; + sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x"; libraryHaskellDepends = [ array base Cabal filepath ]; librarySystemDepends = [ eng mat mx ]; description = "Matlab bindings and interface"; @@ -119722,20 +127476,47 @@ self: { }) {eng = null; mat = null; mx = null;}; "matplotlib" = callPackage - ({ mkDerivation, aeson, base, bytestring, process, tasty - , tasty-hunit, temporary + ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath + , process, random, raw-strings-qq, split, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit, temporary }: mkDerivation { pname = "matplotlib"; - version = "0.1.0.0"; - sha256 = "8001811170e201741eca52a0926c78810f451b104cc1ef055779b1b7351dee0d"; + version = "0.4.5"; + sha256 = "0f8bahj7i6nxdg5yyn1mn7vq9bw85bvikzvi21zzvijpicwyszz5"; libraryHaskellDepends = [ - aeson base bytestring process temporary + aeson base bytestring containers filepath process split temporary + ]; + testHaskellDepends = [ + ad base bytestring process random raw-strings-qq split tasty + tasty-expected-failure tasty-golden tasty-hunit temporary ]; - testHaskellDepends = [ base tasty tasty-hunit temporary ]; homepage = "https://github.com/abarbu/matplotlib-haskell"; description = "Bindings to Matplotlib; a Python plotting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "matplotlib_0_5_0" = callPackage + ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath + , process, random, raw-strings-qq, split, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit, temporary + }: + mkDerivation { + pname = "matplotlib"; + version = "0.5.0"; + sha256 = "0mfmrgh7axyv6ybkks3n5na2cg3jfhbfjbrv4p2dhwzyf9hc076z"; + libraryHaskellDepends = [ + aeson base bytestring containers filepath process split temporary + ]; + testHaskellDepends = [ + ad base bytestring process random raw-strings-qq split tasty + tasty-expected-failure tasty-golden tasty-hunit temporary + ]; + homepage = "https://github.com/abarbu/matplotlib-haskell"; + description = "Bindings to Matplotlib; a Python plotting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrices" = callPackage @@ -119745,7 +127526,7 @@ self: { mkDerivation { pname = "matrices"; version = "0.4.4"; - sha256 = "50f110321d71db257adfbe0f126542e936148ee473679edc1c2bf37c60d539ee"; + sha256 = "1virsmh7rwrb3kf9wrvkwj718dp989ji43xyvxx2bnvi3lr11wah"; libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector @@ -119762,7 +127543,7 @@ self: { mkDerivation { pname = "matrix"; version = "0.3.5.0"; - sha256 = "7a3d41c0f66212360057b29ae9f81779c8da9f71b040ad7676699af7e7ca35b5"; + sha256 = "1d9mrbkzg6k9frvash5hf6gxmj3r2zwfk6mjaw03c4k2yv042gbs"; libraryHaskellDepends = [ base deepseq loop primitive vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -119775,7 +127556,7 @@ self: { mkDerivation { pname = "matrix-market"; version = "1.2"; - sha256 = "487818040a2faf4ed3449defbacb02310f6147cf23c4e4ea388088cceb94f7c3"; + sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://stat.stanford.edu/~patperry/code/matrix-market"; description = "Read and write NIST Matrix Market files"; @@ -119788,8 +127569,8 @@ self: { }: mkDerivation { pname = "matrix-market-attoparsec"; - version = "0.1.0.5"; - sha256 = "cb200336ba478707e4c0aefc7d4cb4ba4d38ec7a1d637e105184c26ff401565a"; + version = "0.1.0.8"; + sha256 = "0xqa4q4wyjjh55lggsyjhsi0kb5rhk3afzk0qhnhdmnzmf0slhay"; libraryHaskellDepends = [ attoparsec base bytestring exceptions scientific ]; @@ -119806,7 +127587,7 @@ self: { mkDerivation { pname = "matrix-market-pure"; version = "0.2"; - sha256 = "c13e0f1b7f6915156f21f357219c5bc56bbf7ba6dfe1a058766ac16e79715216"; + sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1"; libraryHaskellDepends = [ array base containers ]; homepage = "http://bitbucket.org/jetxee/hs-matrix-market"; description = "Pure and composable reader and writer of the Matrix Market format"; @@ -119820,7 +127601,7 @@ self: { mkDerivation { pname = "matsuri"; version = "0.0.4"; - sha256 = "0452336c5417793a165301ef7cb6d50138550b1c877ae5b6b02b699cbcc7f296"; + sha256 = "15pjqyy9qs9bn2vfayl73h5maf01snv7rvq1acb3ly8pain36lh4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119833,6 +127614,85 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "matterhorn" = callPackage + ({ 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, unix + , unordered-containers, utf8-string, vector, vty, xdg-basedir + }: + mkDerivation { + pname = "matterhorn"; + version = "31000.0.0"; + sha256 = "0kkyalrqfaq851lnj8vbrffyg2yjbr5mhqrh8a2y4hkd8yx1ji36"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + 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 + connection containers directory filepath hashable Hclip + mattermost-api mattermost-api-qc microlens-platform mtl process + quickcheck-text stm strict string-conversions tasty tasty-hunit + tasty-quickcheck text text-zipper time transformers Unique + unordered-containers vector vty xdg-basedir + ]; + 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 + , 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 = "31000.0.0"; + sha256 = "1v5m57qsd155rr6nz3y1yzvs2imia4ld3xb2ccha0cnbki6hw6wb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + 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"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mattermost-api-qc" = callPackage + ({ mkDerivation, base, containers, mattermost-api, QuickCheck, text + , time + }: + mkDerivation { + pname = "mattermost-api-qc"; + version = "31000.0.0"; + sha256 = "1sjw31vg02ygxb61m2cvhl435zgsk6w5gnl4v34qd9ihbq4laa9r"; + libraryHaskellDepends = [ + base containers mattermost-api QuickCheck text time + ]; + homepage = "https://github.com/matterhorn-chat/mattermost-api-qc"; + description = "QuickCheck instances for the Mattermost client API library"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "maude" = callPackage ({ mkDerivation, base, directory, filepath, process, process-extras , temporary, text, xml @@ -119840,7 +127700,7 @@ self: { mkDerivation { pname = "maude"; version = "0.6.1"; - sha256 = "14c33ae02a559d906bbf4d02dd92f10746e744dee626017125e8fd5de4c54d61"; + sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql"; libraryHaskellDepends = [ base directory filepath process process-extras temporary text xml ]; @@ -119858,7 +127718,7 @@ self: { mkDerivation { pname = "maxent"; version = "0.7"; - sha256 = "48ccee8ff48d1ed38fea567829d28ea92a26a93d5938c3e9ed0cd7cc36edae6f"; + sha256 = "0vxfxlvcrmqcxplw6f2r7nljcam9iv92jy2nxa7x67ldyj7yxk28"; libraryHaskellDepends = [ ad base lagrangian nonlinear-optimization vector ]; @@ -119874,33 +127734,57 @@ self: { }) {}; "maxent-learner-hw" = callPackage - ({ mkDerivation, array, base, containers, csv, deepseq, file-embed - , mtl, optparse-applicative, parallel, random, text, vector + ({ mkDerivation, array, base, bytestring, containers, deepseq + , file-embed, mtl, optparse-applicative, parallel, random + , random-shuffle, readcsv, text, vector }: mkDerivation { pname = "maxent-learner-hw"; - version = "0.1.2"; - sha256 = "582b87a3f644043455906a2e48cfacc83a384d08bc5c97de7b2feb971efcb434"; + version = "0.2.1"; + sha256 = "008i3lhdf8d3za3hvs4j1pxxwihfg69j1f67bw3d6vn6yvryxk44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers csv deepseq mtl random text vector + array base containers deepseq mtl parallel random readcsv text + vector ]; executableHaskellDepends = [ - array base containers deepseq file-embed mtl optparse-applicative - parallel random text + array base bytestring containers deepseq file-embed mtl + optparse-applicative parallel random random-shuffle text ]; homepage = "https://github.com/george-steel/maxent-learner"; description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars"; license = "GPL"; }) {}; + "maxent-learner-hw-gui" = callPackage + ({ mkDerivation, array, async, base, bytestring, cairo, Chart + , Chart-cairo, containers, deepseq, file-embed, frpnow, frpnow-gtk3 + , glib, gtk3, maxent-learner-hw, mtl, parallel, random + , raw-strings-qq, text, transformers, tuple + }: + mkDerivation { + pname = "maxent-learner-hw-gui"; + version = "0.2.1"; + sha256 = "0j64dyaxpy37kibbm4m9j6wap9w2m510y3p62q29g40kbs1ib278"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array async base bytestring cairo Chart Chart-cairo containers + deepseq file-embed frpnow frpnow-gtk3 glib gtk3 maxent-learner-hw + mtl parallel random raw-strings-qq text transformers tuple + ]; + homepage = "https://github.com/george-steel/maxent-learner"; + description = "GUI for maxent-learner-hw"; + license = "GPL"; + }) {}; + "maximal-cliques" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { pname = "maximal-cliques"; version = "0.1.1"; - sha256 = "709d05c753c7d2d7466ade515da0255fc79241432d0118b3182dd3b2def475e9"; + sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh"; libraryHaskellDepends = [ base containers vector ]; description = "Enumerate all maximal cliques of a graph"; license = stdenv.lib.licenses.bsd3; @@ -119914,7 +127798,7 @@ self: { mkDerivation { pname = "maxsharing"; version = "1.1"; - sha256 = "1cd275f8fc8994ba00320a243a2acad13f457eb2f0e2a9e4797a8b0f54f0646f"; + sha256 = "0vv4y1a0z2vsg7jakqphn9z4agyir8m3l90a680bm549zkw7blhw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119933,7 +127817,7 @@ self: { mkDerivation { pname = "maybe-justify"; version = "0.1.0.0"; - sha256 = "6828b19d4b7439c5b6c9a0794a6b9cefc7dfaf23dac8cefa58e46ff0a31dec7d"; + sha256 = "0zgc3niz0vz4b3xcxj6s4fpxzizgkimllyd0r6vcafbl9ffv2a38"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Simple higher order function for Maybe"; @@ -119947,7 +127831,7 @@ self: { mkDerivation { pname = "maybench"; version = "0.2.4.1"; - sha256 = "79856579a42b719d5a116281b5075330dfb05b90e019331f7140a99ae4ae0ec7"; + sha256 = "1iqfmvj9maa0f4gk66g0j1dv1prhac3vb0b225d9sw9bliwnb1br"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base benchpress old-time process ]; @@ -119965,7 +127849,7 @@ self: { mkDerivation { pname = "mbox"; version = "0.3.3"; - sha256 = "080a3eafa24af47d5bf042871d7ec0322ddb129e50d6f131555925a3842f19e5"; + sha256 = "1r8r5y2a69aralqz3mjhkq9dnb9jq1z1v1s2y1dpvx2alapkw2h8"; libraryHaskellDepends = [ base safe text time time-locale-compat ]; description = "Read and write standard mailbox files"; license = stdenv.lib.licenses.bsd3; @@ -119978,7 +127862,7 @@ self: { mkDerivation { pname = "mbox-tools"; version = "0.2.0.4"; - sha256 = "7053c190f5bf46365530df916f780ddb8bd6f497868fc69ec07dbda94fa20dc8"; + sha256 = "1j0dl97skgbxq2gcd3w6jzsdd2yv1mw6z4fz61akcimzyn8c2lvh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119991,6 +127875,51 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mbox-utility" = callPackage + ({ mkDerivation, base, bytestring, hsemail, non-empty, old-time + , parsec, spreadsheet, utility-ht + }: + mkDerivation { + pname = "mbox-utility"; + version = "0.0.1"; + sha256 = "1y792np4i24jlyxfsm4dw3m1bvij5wxj77dkqj2hvclm7kw0kq75"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring hsemail non-empty old-time parsec spreadsheet + utility-ht + ]; + description = "List contents of an mbox file containing e-mails"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mcl" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, criterion + , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl + , primitive, QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "mcl"; + version = "1.0.1"; + sha256 = "0my9xc3pdnwn33f1kpph85mr5cy94hk173qih482m3b2n36indak"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base binary bytestring deepseq ghc-prim groups integer-gmp + primitive + ]; + librarySystemDepends = [ gmpxx mcl openssl ]; + testHaskellDepends = [ + base binary groups QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq groups + ]; + description = "Bindings to mcl, a generic and fast pairing-based cryptography library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;}; + "mcm" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , directory, filepath, hostname, MissingH, polyparse, process, text @@ -119999,9 +127928,9 @@ self: { mkDerivation { pname = "mcm"; version = "0.6.5.0"; - sha256 = "35dd7823314ff88d64fc533429a188f455c9dc3dc55abe12f37d791fbf22c5ed"; + sha256 = "1vf54aziyybxyc9bwnn57pfcjmgli2hjjd2kzij8vy2g64ipip9m"; revision = "1"; - editedCabalFile = "f80a81b16f1133ff0d7ba1468633a76ffb28dde2b1b2edf6f14718856886d0aa"; + editedCabalFile = "1anhhrl8a627y7vfvcmiwbfjiyvglwrqcim1gc6zycqidyqq22pq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -120018,7 +127947,7 @@ self: { mkDerivation { pname = "mcmaster-gloss-examples"; version = "2013"; - sha256 = "588cb21e84d186bc6b5bd0457660fafb33e030d5185bf8a7fd92d49385150e9d"; + sha256 = "178f2n2r7m4jznkzhnqqslqf0czvz9h7cifhbdmvr1nihhgb532q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gloss ]; @@ -120034,7 +127963,7 @@ self: { mkDerivation { pname = "mcmc-samplers"; version = "0.1.1.1"; - sha256 = "91e240bbc1c2bac3d556e6aba3cfd18eb5d3c10442f491b8836d976550340c5f"; + sha256 = "0pqc6i86b5vdhfw93x220k0x7dcfs77s7az6avaw7fn2q6xl1qli"; libraryHaskellDepends = [ base containers hakaru hmatrix mwc-random primitive statistics ]; @@ -120048,7 +127977,7 @@ self: { mkDerivation { pname = "mcmc-synthesis"; version = "0.1.2.2"; - sha256 = "781714d8cc3ba1362a98cfcdc3b21a10fb83904efa599a6d48434a8b5beae193"; + sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq"; libraryHaskellDepends = [ base MonadRandom ]; description = "MCMC applied to probabilistic program synthesis"; license = stdenv.lib.licenses.gpl3; @@ -120060,7 +127989,7 @@ self: { mkDerivation { pname = "mcmc-types"; version = "1.0.3"; - sha256 = "3c4b25030b05567694ddc313ca808a32133ad5433b4d89837e1ed00bbfcefc6e"; + sha256 = "0vpwrszhpl0ygs1qjk9v8gakl4rjia0cl4y3vna7cmh51c1jajrw"; libraryHaskellDepends = [ base containers mwc-probability transformers ]; @@ -120074,7 +128003,7 @@ self: { mkDerivation { pname = "mcpi"; version = "0.0.1.2"; - sha256 = "86ba6e6a066361809acda148e2f2fafd2c07ef73e5f344304a03db44a8234b95"; + sha256 = "15ab4fl49nq398q49wz5fgphfb7xzbrf4j51rnd80qb30rm6xfl6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network split transformers ]; @@ -120092,9 +128021,9 @@ self: { mkDerivation { pname = "mdapi"; version = "1"; - sha256 = "0f0c90b50b439519ce86d721023e06478358b94c5339f8e3dfdf930ad6b16721"; + sha256 = "08b7n7b0m4yzvzizhfak9jwmi0s70qz048fphv71k5a31fsr030g"; revision = "1"; - editedCabalFile = "23b50bbb40d56c56dd89e5d0d36b62c7c31e9c0046362a56dfcab3c81a753139"; + editedCabalFile = "0f9ifldcicyavxb2ldj602f1xhy7c9mx7l75i7fmcv6m82xhpd93"; libraryHaskellDepends = [ aeson base bytestring data-default lens lens-aeson text transformers wreq @@ -120111,7 +128040,7 @@ self: { mkDerivation { pname = "mdcat"; version = "0.1.0.4"; - sha256 = "3405cd2ffeb4a9d2de1df140a453d75a5c9d4b48e36fbe5c379bf7cc15abd64b"; + sha256 = "0jynmcawrxwv6xfbwvz3915rsp2ssx9s8h7i3pgd5adlzqpws19l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120131,7 +128060,7 @@ self: { mkDerivation { pname = "mdo"; version = "0.0.1"; - sha256 = "bb96f03358e70e1858bea568070cabfcab061fc70de03c643433994acea2248e"; + sha256 = "13i4lb74m69k6ij3rq0dqwghdazwmc60fs55prc1h3p7b0rz15mv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -120145,7 +128074,7 @@ self: { mkDerivation { pname = "mdp"; version = "0.1.1.0"; - sha256 = "6e0e52f652dd969d5bfda6edf6519e6a0c38fa40994626820dc10c8a52aa4143"; + sha256 = "0hs1m998l3611n12cilr83x3h33akr8zdvd6zmdrv5nxabv543kf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers vector ]; @@ -120164,7 +128093,7 @@ self: { mkDerivation { pname = "mealstrom"; version = "0.0.0.1"; - sha256 = "bde77bd197b39ff4673048ee17ec42043d96fbbea101e8650d9db9229757e83f"; + sha256 = "0gz8aybj5fcx1mjyh0d1pvxrcg848bn1gvj861kz97xkjz8pprxx"; libraryHaskellDepends = [ aeson async base bytestring containers hashable list-t postgresql-simple resource-pool stm stm-containers text time uuid @@ -120184,7 +128113,7 @@ self: { mkDerivation { pname = "means"; version = "0.1.0.0"; - sha256 = "434b91bdf1d01b722d7e038e1b91c7285bb8e61bc889949dbf95aefdb82afd8a"; + sha256 = "12px5awgvblmpyfr92f83gkbhnr8qy8ip3h3gqnp46yhy6yr2js3"; libraryHaskellDepends = [ base semigroups ]; description = "calculate varieties of mean/average using semigroup"; license = stdenv.lib.licenses.mit; @@ -120195,7 +128124,7 @@ self: { mkDerivation { pname = "mecab"; version = "0.4.0"; - sha256 = "e30f55b6a0d0ed13de5d4ecd9fedbbac918097ec0ae912c1ac2477eb8807c57c"; + sha256 = "0z650y4fnxr4mk0i5s8axjbq14dcpgnrzkafbpg17vfhl2v5a3z3"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ mecab ]; homepage = "http://github.com/tanakh/hsmecab"; @@ -120209,7 +128138,7 @@ self: { mkDerivation { pname = "mech"; version = "0.0.0.0"; - sha256 = "dad2e243e0122a9c0cde529c0a309775b9332b20301942d1b02ded6c32013665"; + sha256 = "0r9n04r6rv9dn38l469h40mk7fbmjwq0m72jvq69qahjw11y5lns"; libraryHaskellDepends = [ base machines ]; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; @@ -120222,7 +128151,7 @@ self: { mkDerivation { pname = "mecha"; version = "0.1.1"; - sha256 = "413413fd61b38820a38e538019893fc2f5c5a840a325676b57721e635cfc7978"; + sha256 = "0y3rzif667kjaxmnf9d382lcbxf27y4ik02kisij125kc7yi6d21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -120236,7 +128165,7 @@ self: { mkDerivation { pname = "mechs"; version = "0.0.0.0"; - sha256 = "dd73407f98ef5c1a795df33cb4537df60a62f36d34c7cf9a0dd0685aa5c6e413"; + sha256 = "04z4qsjmls6h1ndczirldprn42pngm9v8g7kbmwilp7gk1zl0wyx"; libraryHaskellDepends = [ base machines ]; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; @@ -120244,24 +128173,42 @@ 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 , data-default, deepseq, hspec, lens, lifted-async, monad-control - , mtl, network, parallel, primitive, process, QuickCheck, random - , resourcet, singletons, spool, stm, streaming-commons, tagged - , template-haskell, text, time, transformers, type-spec, vector + , monad-logger, mtl, network, parallel, primitive, process + , QuickCheck, random, resourcet, singletons, spool, stm + , streaming-commons, tagged, template-haskell, text, time + , transformers, type-spec, vector }: mkDerivation { pname = "mediabus"; - version = "0.2.0.2"; - sha256 = "3dd4d11c4253eebe2ff21368222661341b64e8176171fb4be77b9ee45402f7d1"; + version = "0.3.3.0"; + sha256 = "1v1qjbz438hk978xa4zm6s4ydcnxlvwc00rczn6kvzk1mi8vlgn2"; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async - monad-control mtl network parallel primitive process QuickCheck - random resourcet spool stm streaming-commons tagged text time - transformers vector + monad-control monad-logger mtl network parallel primitive process + QuickCheck random resourcet spool stm streaming-commons tagged text + time transformers vector ]; testHaskellDepends = [ array async base binary bytestring conduit conduit-combinators @@ -120275,38 +128222,99 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "mediabus-rtp" = 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, mediabus - , monad-control, mtl, network, parallel, primitive, process + , data-default, deepseq, hspec, lens, lifted-async, monad-control + , monad-logger, mtl, network, parallel, primitive, process , QuickCheck, random, resourcet, singletons, spool, stm , streaming-commons, tagged, template-haskell, text, time , transformers, type-spec, vector }: + mkDerivation { + pname = "mediabus"; + 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 + monad-control monad-logger mtl network parallel primitive process + QuickCheck random resourcet spool stm streaming-commons tagged text + time transformers vector + ]; + testHaskellDepends = [ + array async base binary bytestring conduit conduit-combinators + conduit-extra containers data-default deepseq hspec lens + monad-control mtl QuickCheck singletons spool stm tagged + template-haskell text time transformers type-spec vector + ]; + homepage = "https://github.com/sheyll/mediabus"; + description = "Multimedia streaming on top of Conduit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mediabus-fdk-aac" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , containers, criterion, deepseq, fdk-aac, ghc-prim, inline-c, lens + , mediabus, monad-logger, random, resourcet, spool, tagged, text + , time, transformers, vector + }: + mkDerivation { + pname = "mediabus-fdk-aac"; + version = "0.4.0.0"; + sha256 = "0lixkyqd8di6k133w4gpv9jb01j96mjdmqcz576gsn4mg11wsb69"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators containers deepseq + inline-c lens mediabus monad-logger random resourcet spool tagged + text time transformers vector + ]; + libraryPkgconfigDepends = [ fdk-aac ]; + testHaskellDepends = [ + base conduit deepseq ghc-prim lens mediabus monad-logger vector + ]; + benchmarkHaskellDepends = [ + base conduit criterion deepseq ghc-prim lens mediabus monad-logger + time vector + ]; + homepage = "https://github.com/lindenbaum/mediabus-fdk-aac"; + description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {fdk-aac = null;}; + + "mediabus-rtp" = callPackage + ({ mkDerivation, array, async, base, binary, bytestring, cereal + , conduit, conduit-combinators, conduit-extra, containers + , data-default, deepseq, hspec, lens, lifted-async, mediabus + , monad-control, monad-logger, mtl, network, parallel, primitive + , process, QuickCheck, random, resourcet, singletons, spool, stm + , streaming-commons, tagged, template-haskell, text, time + , transformers, type-spec, vector + }: mkDerivation { pname = "mediabus-rtp"; - version = "0.2.0.0"; - sha256 = "f802521f6f504e1ea56a2c694a216a8b92087f21aa4d493d3c6bf11d27063d27"; + version = "0.3.2.1"; + sha256 = "0kb24cw7x4vxjq109ld9l2jb7hqc8aydri8hb3zj0ihsfb82sx85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async - mediabus monad-control mtl network parallel primitive process - QuickCheck random resourcet spool stm streaming-commons tagged text - time transformers vector + mediabus monad-control monad-logger mtl network parallel primitive + process QuickCheck random resourcet spool stm streaming-commons + tagged text time transformers vector ]; executableHaskellDepends = [ async base conduit conduit-combinators conduit-extra data-default - lens lifted-async mediabus monad-control mtl parallel QuickCheck - random stm streaming-commons tagged time vector + lens lifted-async mediabus monad-control monad-logger mtl parallel + QuickCheck random stm streaming-commons tagged time vector ]; testHaskellDepends = [ array async base binary bytestring conduit conduit-combinators conduit-extra containers data-default deepseq hspec lens mediabus - monad-control mtl QuickCheck singletons spool stm tagged - template-haskell text time transformers type-spec vector + 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"; description = "Receive and Send RTP Packets"; @@ -120314,12 +128322,51 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "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 + , monad-control, monad-logger, mtl, network, parallel, primitive + , process, QuickCheck, random, resourcet, singletons, spool, stm + , streaming-commons, tagged, template-haskell, text, time + , transformers, type-spec, vector + }: + mkDerivation { + pname = "mediabus-rtp"; + version = "0.4.0.1"; + sha256 = "1yfy8aak1z9bbwy676qyfxa7hmk1n94f3dn1x070hvpbvgpgmijb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring cereal conduit conduit-combinators + conduit-extra containers data-default deepseq lens lifted-async + mediabus monad-control monad-logger mtl network parallel primitive + process QuickCheck random resourcet spool stm streaming-commons + tagged text time transformers vector + ]; + executableHaskellDepends = [ + async base conduit conduit-combinators conduit-extra data-default + lens lifted-async mediabus monad-control monad-logger mtl parallel + QuickCheck random stm streaming-commons tagged time vector + ]; + testHaskellDepends = [ + array async base binary bytestring conduit conduit-combinators + conduit-extra containers data-default deepseq hspec lens mediabus + monad-control monad-logger mtl QuickCheck singletons spool stm + tagged template-haskell text time transformers type-spec vector + ]; + homepage = "https://github.com/sheyll/mediabus-rtp"; + description = "Receive and Send RTP Packets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "median-stream" = callPackage ({ mkDerivation, base, heap, QuickCheck }: mkDerivation { pname = "median-stream"; version = "0.7.0.0"; - sha256 = "e92fc44be8189dafe9190aad225462780f26d0b1fe1823376342329db6c71f3d"; + sha256 = "0g8zqyv9scj2ccvj667yn782c3vqc9a25b8a37lsz78qx15w8bz9"; libraryHaskellDepends = [ base heap ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/caneroj1/median-stream#readme"; @@ -120334,7 +128381,7 @@ self: { mkDerivation { pname = "mediawiki"; version = "0.2.6"; - sha256 = "393c7ebd450eb93d5b3ec09236c9882d46fa130464a9a96b363ce37f6284d9f1"; + sha256 = "1wfrhii7zqrw6rmskab40h9zliidi34kd4n07rdkvf8f8nypwg1r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base HTTP mime network utf8-string xml ]; @@ -120356,7 +128403,7 @@ self: { mkDerivation { pname = "mediawiki2latex"; version = "7.9.0.1"; - sha256 = "7c64d1419342a1138107494746efd777e3a3be1db00667272c1320512044e060"; + sha256 = "0q708hh5280k5hknf1mh3nza7qvpszplcis90y0i78a2jd0x2r3w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -120379,7 +128426,7 @@ self: { mkDerivation { pname = "medium-sdk-haskell"; version = "0.1.0.0"; - sha256 = "4dbe2ba6d20729a3cd7bb3af8ff881dec791a01485e1a010881dea0f1fb9e00a"; + sha256 = "02p0p4ghzshxi08a1qc52jh93iyyh7w8zbxkgg6s6a87sak2pgjd"; libraryHaskellDepends = [ aeson base bytestring data-default-class either http-client servant-client servant-server text time @@ -120397,7 +128444,7 @@ self: { mkDerivation { pname = "meep"; version = "0.1.2.1"; - sha256 = "dfe5719de97dfc6682ff3be29ad9a5ce13bdf13d35021a48f332a7e799a1d41c"; + sha256 = "076ll6cyg9rjyd41l0im7pqvs4yflpcrmqivzy16dz3xx6fp3rfz"; libraryHaskellDepends = [ base bifunctors lens semigroupoids semigroups ]; @@ -120410,19 +128457,20 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, classy-prelude-conduit, conduit-extra - , directory, filepath, http-conduit, tar-conduit, typed-process - , yaml + ({ mkDerivation, base, bytestring, classy-prelude-conduit + , conduit-extra, directory, filepath, http-conduit, optparse-simple + , tar-conduit, temporary, typed-process, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.3.0"; - sha256 = "afbfc37f2ebbf8bbe880297f784e81a63886dc14aacb2ed921d6c63c66abbf81"; + version = "0.3.0.2"; + sha256 = "0zxillzaiq6ygiili8par8apm1pxh6lv9gk2f2a5nl8nv7n0sv7h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base classy-prelude-conduit conduit-extra directory filepath - http-conduit tar-conduit typed-process yaml + base bytestring classy-prelude-conduit conduit-extra directory + filepath http-conduit optparse-simple tar-conduit temporary + typed-process yaml ]; homepage = "https://github.com/snoyberg/mega-sdist"; description = "Handles uploading to Hackage from mega repos"; @@ -120438,7 +128486,9 @@ self: { mkDerivation { pname = "megaparsec"; version = "5.2.0"; - sha256 = "c250a7ae2365e96df8f1061d28c7d04e5a1695395ea87055f36e3f3a57e90408"; + sha256 = "0204x5bklgvfydap1a2y76aicnjfs33jh786y7w6vsb54fpafl62"; + revision = "1"; + editedCabalFile = "1ah5r6jjz187l5g1mnzajsyiac5wdc8ijqwkapl0wa35mj3ybakg"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions mtl QuickCheck scientific text transformers @@ -120453,12 +128503,36 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "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.1"; + sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8"; + libraryHaskellDepends = [ + base bytestring containers deepseq exceptions mtl QuickCheck + scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers exceptions hspec hspec-expectations mtl + QuickCheck scientific text transformers + ]; + benchmarkHaskellDepends = [ base criterion deepseq weigh ]; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "meldable-heap"; version = "2.0.3"; - sha256 = "63b66e2d102fc419fe355a099d82736da6556f2d891f5569681a0d4da9fce5dc"; + sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3"; libraryHaskellDepends = [ base ]; homepage = "http://code.google.com/p/priority-queues/"; description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues"; @@ -120471,14 +128545,14 @@ self: { }: mkDerivation { pname = "mellon-core"; - version = "0.7.0.3"; - sha256 = "02164fc2941eed7866e81b2d06b57b1ecb18151896e0bef795ad023b21773604"; + version = "0.7.1.1"; + sha256 = "1s3a5wkfi9pjxgsg92cx5sgf8kwlvc423414k679b2il97ff1cwf"; libraryHaskellDepends = [ async base mtl time transformers ]; testHaskellDepends = [ async base doctest hlint hspec mtl QuickCheck quickcheck-instances time transformers ]; - homepage = "https://github.com/dhess/mellon/"; + homepage = "https://github.com/quixoftic/mellon/"; description = "Control physical access devices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120488,33 +128562,37 @@ self: { ({ mkDerivation, base, hlint, hpio, mellon-core }: mkDerivation { pname = "mellon-gpio"; - version = "0.7.0.3"; - sha256 = "da0a2a616eb2834fe98fd4e456317d569b88de27b573d11f1e82b15294ea3222"; + version = "0.7.1.1"; + sha256 = "0mq5p462rm8h2nwkdqhwfndi3qqjcqb30hwlpa8ms3d4bjn8xdan"; libraryHaskellDepends = [ base hpio mellon-core ]; testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/dhess/mellon/"; + homepage = "https://github.com/quixoftic/mellon/"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mellon-web" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, hlint, hpio - , hspec, hspec-wai, http-client, http-client-tls, http-types, lucid - , mellon-core, mellon-gpio, mtl, network, optparse-applicative - , servant, servant-client, servant-docs, servant-lucid - , servant-server, text, time, transformers, wai, wai-extra, warp + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, doctest + , exceptions, hlint, hpio, hspec, hspec-wai, http-client + , http-client-tls, http-types, lens, lucid, mellon-core + , mellon-gpio, mtl, network, optparse-applicative, QuickCheck + , quickcheck-instances, servant, servant-client, servant-docs + , servant-lucid, servant-server, servant-swagger + , servant-swagger-ui, swagger2, text, time, transformers, wai + , wai-extra, warp }: mkDerivation { pname = "mellon-web"; - version = "0.7.0.3"; - sha256 = "77396dd6091f3c940bf1b15e1415698f432bb70d53557ea2988580fc54ae256b"; + version = "0.7.1.1"; + sha256 = "0x9pj12lfk2yk18rp81s6dvh70rybrzcwclnwxwsqvfza3p3kpzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring http-client http-types lucid mellon-core - servant servant-client servant-docs servant-lucid servant-server - text time transformers wai warp + aeson aeson-pretty base bytestring http-client http-types lens + lucid mellon-core servant servant-client servant-docs servant-lucid + servant-server servant-swagger servant-swagger-ui swagger2 text + time transformers wai warp ]; executableHaskellDepends = [ base bytestring exceptions hpio http-client http-client-tls @@ -120522,12 +128600,13 @@ self: { servant-client time transformers warp ]; testHaskellDepends = [ - aeson base bytestring hlint hspec hspec-wai http-client http-types - lucid mellon-core network servant servant-client servant-docs - servant-lucid servant-server text time transformers wai wai-extra - warp + aeson aeson-pretty base bytestring doctest hlint hspec hspec-wai + http-client http-types lens lucid mellon-core network QuickCheck + quickcheck-instances servant servant-client servant-docs + servant-lucid servant-server servant-swagger servant-swagger-ui + swagger2 text time transformers wai wai-extra warp ]; - homepage = "https://github.com/dhess/mellon/"; + homepage = "https://github.com/quixoftic/mellon/"; description = "A REST web service for Mellon controllers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120540,7 +128619,7 @@ self: { mkDerivation { pname = "melody"; version = "0.2"; - sha256 = "d73ce3379e43971e7f1883866ce1ad6252a5b464569dda07a524c1577b687ce9"; + sha256 = "1sbwd1xmgh94ll3xm7ancjsaalk2mphnr1l331zix5s3kqvy6g6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120563,7 +128642,7 @@ self: { mkDerivation { pname = "memcache"; version = "0.2.0.1"; - sha256 = "0f77d99f49158ed2e715d52dc25260fb9fffe094300900cf0234745b02f7d85c"; + sha256 = "0p6qyw15nx1l0b7h029hjkhgz7zvc19c4bfm2pkx53hm96gxjxqg"; libraryHaskellDepends = [ base binary blaze-builder bytestring data-default-class hashable network resource-pool time vector @@ -120585,7 +128664,7 @@ self: { mkDerivation { pname = "memcache-conduit"; version = "0.0.3"; - sha256 = "f28e89dcbf1329dec98d67ce055a3eef12bc8c4ef9afeaf3c8adf10db5f632f8"; + sha256 = "1y1jysshvwddr3rymbzr9s6bq4pg7rd0bkk7ip4xwa8kpzf8k3pj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120604,7 +128683,7 @@ self: { mkDerivation { pname = "memcache-haskell"; version = "0.0.10.1"; - sha256 = "4c1b7d9c5d12a4ae24ea73ace9489232831bb15b1d8e0d2bb53e926f53b16e48"; + sha256 = "0j3fn59nz4iynlmhv3hxbfqip0rjj94fkb3kx8jax90jbnf7s6sc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120623,7 +128702,7 @@ self: { mkDerivation { pname = "memcached"; version = "0.2.1"; - sha256 = "cd8bd88caf906b004307176cd468f415b536f52a4e663e3c6006fc0bedffdca8"; + sha256 = "1a6wzznhpz06c0y3wrjf5bskdd8myild8v0p0x1h0swhmy6di2yd"; libraryHaskellDepends = [ base bytestring network utf8-light ]; homepage = "http://github.com/olegkat/haskell-memcached"; description = "haskell bindings for memcached"; @@ -120639,9 +128718,9 @@ self: { mkDerivation { pname = "memcached-binary"; version = "0.2.0"; - sha256 = "4d895459998bfd2fb80337cfc2363a905dfd7dc62adfad0696841c570c58fb8c"; + sha256 = "137vb065f744jq3avpraqryzspch78vc5krp0fw2zzcbk5cm92ad"; revision = "3"; - editedCabalFile = "3314b765ef10f959862577e55809bc181d16dfd3ff9443b62499b5b393eea6b3"; + editedCabalFile = "1cx6xs9v7dcr4jv4757zsggic78qph4mirbp4n35ky8hxxjvf51k"; libraryHaskellDepends = [ base bytestring data-default-class network resource-pool storable-endian time unordered-containers @@ -120660,13 +128739,24 @@ self: { mkDerivation { pname = "memexml"; version = "0.0.3"; - sha256 = "e85e83e70d4c2ed6b56a047ea5df836b4ba37a13666d438088fdfbd048896ff4"; + sha256 = "1x3gi54d1yzxi2046vb62dxa6jvbhggsazh4dasxcbjc1pkq6pp8"; libraryHaskellDepends = [ base hxt ]; homepage = "https://github.com/eggzilla/memexml"; description = "Library for reading Meme XML output"; license = stdenv.lib.licenses.bsd3; }) {}; + "meminfo" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers }: + mkDerivation { + pname = "meminfo"; + version = "0.2.0.0"; + sha256 = "1mxk57qr4d1k6sz4qld09d61nc15hixggc5klfj5xr0n8rw1za3x"; + libraryHaskellDepends = [ attoparsec base bytestring containers ]; + description = "Library for reading `/proc/meminfo`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "memis" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, filemanip, filepath, http-types @@ -120678,7 +128768,7 @@ self: { mkDerivation { pname = "memis"; version = "0.1.1"; - sha256 = "c99e4caceadd34ccc8e7101a449f0744a1fc395cf3a547fa333564f632056602"; + sha256 = "00k60lrgcr1m6gx4g9gkbhwzr8a40ygl86hhwz4cqd6xxan4r7n9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -120699,7 +128789,7 @@ self: { mkDerivation { pname = "memo-ptr"; version = "0.1.0.0"; - sha256 = "29b84899c725d87518cb4cb2313d9a29c775a229116e8286ce0cb8ddc631c3ef"; + sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19"; libraryHaskellDepends = [ base containers ]; description = "Pointer equality memoization"; license = stdenv.lib.licenses.mit; @@ -120711,7 +128801,7 @@ self: { mkDerivation { pname = "memo-sqlite"; version = "0.1"; - sha256 = "c3ef7f29b5707af12a4cd5321d9cbf4b637b307c953cf7199ae9489e84fa32be"; + sha256 = "1gijza29wj79k8czfg4mghq7nqsbpyf1scnm9hmg2ykhnllpzvy3"; libraryHaskellDepends = [ base direct-sqlite ]; homepage = "https://gitorious.org/memo-sqlite"; description = "memoize functions using SQLite3 database"; @@ -120726,7 +128816,7 @@ self: { mkDerivation { pname = "memoization-utils"; version = "0.1.0.1"; - sha256 = "32a495df7ca1a24ed303393f821d33ce873683a4b398ee07e4c79dc88dc72ab6"; + sha256 = "1diaqy6wi7f7wh3yx65klj1kd1yf6cfq4grr0g9lx8m1gkgrb91j"; libraryHaskellDepends = [ base containers lrucache time time-units ]; @@ -120742,23 +128832,55 @@ self: { mkDerivation { pname = "memoize"; version = "0.8.1"; - sha256 = "74d86862257a6f85c5ef9a2938d8bd11f75d89727456541c4ea805a9daa462cd"; + sha256 = "1kb2lkdaj1d89qf58mklfa4mvxqippc3hacsxz2qavvs4mi6in3l"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "A memoization library"; license = stdenv.lib.licenses.bsd3; }) {}; + "memorable-bits" = callPackage + ({ mkDerivation, base, binary, bits, bytes, bytestring, criterion + , cryptonite, data-dword, doctest, hashable, HUnit, memory, mtl + , network-ip, optparse-applicative, random, split, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "memorable-bits"; + version = "0.1.0.0"; + sha256 = "0jxx1i0x4lh16027cqbg3qha2acpjw8bc37ifjfjr8y12wgmkhvs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bits bytes bytestring cryptonite data-dword hashable + memory mtl network-ip random split + ]; + executableHaskellDepends = [ + base bytestring cryptonite optparse-applicative + ]; + testHaskellDepends = [ + base doctest HUnit tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; + description = "Generate human memorable strings from binary data"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "memory" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim + , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "memory"; - version = "0.14.1"; - sha256 = "1cd87a34ca28ab5fbb9fbeb82f66cdbabf4e276e10caf7a64b798bf42edc0825"; - libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + version = "0.14.6"; + sha256 = "0q61zxdlgcw7wg244hb3c11qm5agrmnmln0h61sz2mj72xqc1pn7"; + libraryHaskellDepends = [ + base bytestring deepseq foundation ghc-prim + ]; + testHaskellDepends = [ + base foundation tasty tasty-hunit tasty-quickcheck + ]; homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; @@ -120769,7 +128891,7 @@ self: { mkDerivation { pname = "memorypool"; version = "0.1.0.0"; - sha256 = "70b6602bbb2fb3268ae07c99057fdd8b68ed35654b0ba1907e5d59ed5cd37a70"; + sha256 = "0w3ssdffsnaxgs8a22sbclsyss4bvmzhb6bww252dcrgpcmn1dkh"; libraryHaskellDepends = [ base containers transformers unsafe vector ]; @@ -120783,7 +128905,7 @@ self: { mkDerivation { pname = "memscript"; version = "0.1.0.0"; - sha256 = "b9003c8b8ac493ecae2ec104800b825e5ce50a8a76b7786069ae70ed9ed591f5"; + sha256 = "1xcisngfsw5fd5h7idvni85fap2yh85q01615spfr4y4ia5kq05r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskeline transformers ]; @@ -120792,6 +128914,31 @@ self: { license = "GPL"; }) {}; + "mercury-api" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory + , hashable, HUnit, optparse-applicative, text, unordered-containers + }: + mkDerivation { + pname = "mercury-api"; + version = "0.1.0.1"; + sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring clock hashable text + unordered-containers + ]; + executableHaskellDepends = [ + ansi-terminal base bytestring optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring directory HUnit optparse-applicative text + ]; + homepage = "https://github.com/ppelleti/hs-mercury-api"; + description = "Haskell binding to Mercury API for ThingMagic RFID readers"; + license = stdenv.lib.licenses.mit; + }) {}; + "merge-bash-history" = callPackage ({ mkDerivation, attoparsec, base, data-ordlist, errors , optparse-applicative, text @@ -120799,7 +128946,7 @@ self: { mkDerivation { pname = "merge-bash-history"; version = "0.1.0.0"; - sha256 = "2e93674d1dcf59798eb8217763ac9347222580c74ccfb041e5ce9da43516c86c"; + sha256 = "0v682qss97ffwm0v1kscqy02a8j7jfn66xr1p277jnfg3m6ng4rf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120818,7 +128965,7 @@ self: { mkDerivation { pname = "mersenne-random"; version = "1.0.0.1"; - sha256 = "bcee8af246b6967b0c4326f3eec57611818dacc729b7c6bd42e1d363f9f878a4"; + sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw"; libraryHaskellDepends = [ base old-time ]; homepage = "http://code.haskell.org/~dons/code/mersenne-random"; description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister"; @@ -120830,7 +128977,7 @@ self: { mkDerivation { pname = "mersenne-random-pure64"; version = "0.2.2.0"; - sha256 = "ef1400ddc1ddafb0b98d4331a58bdbe3b5209a81579e17f85f180731a96d75d1"; + sha256 = "1lbmdnlk21qqbzw1g7jph6d21dg3vf5saca3inwv1byxq7fh057g"; libraryHaskellDepends = [ base random time ]; homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; @@ -120845,9 +128992,9 @@ self: { mkDerivation { pname = "messagepack"; version = "0.5.4"; - sha256 = "939590c05d5b0831b3b4796f2e1a070e290982c92b2009f2aa1ef5f4b05b5d7c"; + sha256 = "0z2xbfqg9x8ymbr0j81br610ja8f0wd2wvvrnjrk222vbp0915ck"; revision = "1"; - editedCabalFile = "4bfea0a7200706d1826fab53e19df38e5df759672d50095143b4ef078e8d235c"; + editedCabalFile = "0p13in70gvxl8d8hjl1dcxczfpcfyffy2lxbdy1d21h742ks1zjb"; libraryHaskellDepends = [ base bytestring cereal containers deepseq ]; @@ -120867,9 +129014,9 @@ self: { mkDerivation { pname = "messagepack-rpc"; version = "0.5.1"; - sha256 = "aa7960644668284e6add36e5c305af2c6d3ebf0a9a2c3fcd62529554a049a0bc"; + sha256 = "1g5096h595ajcb6kyb4s1azkwv9cmw2w7r9nvmm4wa388rj60yda"; revision = "1"; - editedCabalFile = "5dc56de9964a8b6b8c032c2f096ef5c058cfff6ffe9879f860ba72dd95b2e616"; + editedCabalFile = "05p6naaxswmsc3w7k67ydzzwyn60ymp0jbrc0f66p2sajvlnviax"; libraryHaskellDepends = [ base bytestring cereal containers messagepack network-simple ]; @@ -120883,7 +129030,7 @@ self: { mkDerivation { pname = "messente"; version = "0.1.0.1"; - sha256 = "8549a33d224cb0b43dac520b0d063729cb6765540930f483719e0c3baf6e62fb"; + sha256 = "1yv2dspkn34yf61z8c09aijngjr96w30s2sjmhyv9c2c48ys6jc5"; libraryHaskellDepends = [ base bytestring HTTP http-conduit network ]; @@ -120898,7 +129045,7 @@ self: { mkDerivation { pname = "meta-misc"; version = "0.1.0.3"; - sha256 = "0c40967864839cf2c360533ede7d8f0bc4489bd5285594fb4f0e7c918f79ba5f"; + sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c"; libraryHaskellDepends = [ base loch-th template-haskell ]; homepage = "https://github.com/bairyn/meta-misc"; description = "Utility library providing miscellaneous meta-programming utilities"; @@ -120913,7 +129060,7 @@ self: { mkDerivation { pname = "meta-par"; version = "0.3"; - sha256 = "56d221c2e8ec37b43f5b63bca1393706b9b388d272371f67e482a9ce17a74b04"; + sha256 = "012blwbwxac2wikiydvjsa4b7f866wws3g33bczv8dzcx3123ljn"; libraryHaskellDepends = [ abstract-deque abstract-par base bytestring containers deepseq mtl mwc-random transformers vector @@ -120931,7 +129078,7 @@ self: { mkDerivation { pname = "meta-par-accelerate"; version = "0.3.5"; - sha256 = "985310b7673b38433e3e0606a0e05a0005f3d2f8083d46e83ec9382c055c863e"; + sha256 = "0gl6bh2jqf697vl4cg88z39g6180bbha01h67qz46f1vcyvi0lwq"; libraryHaskellDepends = [ abstract-deque abstract-par abstract-par-accelerate accelerate array base meta-par QuickCheck transformers vector @@ -120947,7 +129094,7 @@ self: { mkDerivation { pname = "metadata"; version = "0.4.3.0"; - sha256 = "bfb2da5ff25544a36364e2e1560034ad9bfed0bd76e317567e4a6d3def7bc020"; + sha256 = "0860ggpksvaagrb1gqvnpp8gx6xd6h05dqg2ciis6i2my9gxmcmz"; libraryHaskellDepends = [ base text time ]; homepage = "https://github.com/cutsea110/metadata"; description = "metadata library for semantic web"; @@ -120960,7 +129107,7 @@ self: { mkDerivation { pname = "metamorphic"; version = "0.1.2.3"; - sha256 = "e88092983adac6dbe36cdfea4c8db256dc7d9e83e02dd355230f51dda6e05f5d"; + sha256 = "0pazw2kdsl8g4dax6bg0hfg7vp2nna6lrsnzdkixpins7ac95078"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/technogeeky/metamorphic"; description = "metamorphisms: ana . cata or understanding folds and unfolds"; @@ -120972,7 +129119,7 @@ self: { mkDerivation { pname = "metaplug"; version = "0.1.1"; - sha256 = "96c8487a51065561292cb11e7707df0faa6132a8d43f19469c588ae8f14cd620"; + sha256 = "086n9kqyi2jqki31jgylm0r63ahgvw3pf7mi5hln2m86a5x4ij4n"; libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ]; description = "a tiny ghc api wrapper"; license = stdenv.lib.licenses.bsd3; @@ -120986,7 +129133,7 @@ self: { mkDerivation { pname = "metric"; version = "0.2.0"; - sha256 = "4d1492d729878fe568384269ddc5d6b548474384f04aa1e6f6d8978baccb4d9c"; + sha256 = "172drfn8p5yqyvka2jphhi1lfj5msv2xssa271lfb3w757br452d"; libraryHaskellDepends = [ base data-default edit-distance hmatrix vector ]; @@ -121007,7 +129154,7 @@ self: { mkDerivation { pname = "metrics"; version = "0.4.0.1"; - sha256 = "db18eddaa43b81c33c925bf467010e5b9088d55fe5d7b364466a3459543cc7e7"; + sha256 = "1ry77ia5jd3a8rjb7mz5bzaqi42v1q0ngx2vj8yc709vlkdfs66v"; libraryHaskellDepends = [ ansi-terminal base bytestring containers lens mwc-random primitive text time transformers transformers-base unix-compat @@ -121026,7 +129173,7 @@ self: { mkDerivation { pname = "metricsd-client"; version = "0.1"; - sha256 = "09171debb866a05de5e4a9a928af37547121010446ca534401060759373f00e1"; + sha256 = "1q807wvmj1q605257jj60h0j2wal6ypjiad9wkjmv836p3mis5q9"; libraryHaskellDepends = [ base network ]; description = "Client for the metrics aggregator Metricsd"; license = stdenv.lib.licenses.bsd3; @@ -121038,7 +129185,7 @@ self: { mkDerivation { pname = "metronome"; version = "0.1.1"; - sha256 = "ee48c7cf5825d4fbf5979ce261d55da8ac4754b88192194fb97e844708436ff0"; + sha256 = "1w3g8c44g13yp57ik4l1p1a4gb58bpan3qlwjzszpm15b37wfj7f"; libraryHaskellDepends = [ base data-lens data-lens-template hosc stm ]; @@ -121046,12 +129193,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mezzo" = callPackage + ({ mkDerivation, base, boxes, deepseq, ghc-prim + , ghc-typelits-natnormalise, HCodecs, hspec, HUnit, QuickCheck + , should-not-typecheck, template-haskell + }: + mkDerivation { + pname = "mezzo"; + version = "0.3.0.0"; + sha256 = "10i0n03wmrds8gg0p14nvqi00ziqh2lhynbq6gynizgqs5nfh481"; + libraryHaskellDepends = [ + base boxes ghc-prim ghc-typelits-natnormalise HCodecs + template-haskell + ]; + testHaskellDepends = [ + base deepseq hspec HUnit QuickCheck should-not-typecheck + ]; + homepage = "https://github.com/DimaSamoz/mezzo"; + description = "Typesafe music composition"; + license = stdenv.lib.licenses.mit; + }) {}; + "mezzolens" = callPackage ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { pname = "mezzolens"; version = "0.0.0"; - sha256 = "8252be7d73700b7401c87248e6eb5cb23873d0ce092f9b15583c4fd59b46df2b"; + sha256 = "0ayz8sdxakrwb0arnbq9rv876f5jbkmycj3jr00p82vhfdyvwll2"; libraryHaskellDepends = [ base containers mtl transformers ]; description = "Pure Profunctor Functional Lenses"; license = stdenv.lib.licenses.asl20; @@ -121065,7 +129233,7 @@ self: { mkDerivation { pname = "mfsolve"; version = "0.3.2.0"; - sha256 = "232167442f9c0f326b7514b362d4521b3937b716fd4155c65060d34430aa42f1"; + sha256 = "1wa2m8q49lv0a335ahgx2svkff8vaba65cqlfmmk43ww5x26f893"; libraryHaskellDepends = [ base hashable mtl mtl-compat unordered-containers ]; @@ -121079,7 +129247,7 @@ self: { mkDerivation { pname = "mgeneric"; version = "0.0.0.2"; - sha256 = "831bd77866d50d692518f09e15fc96c71b2aa3ec95ee4d7eda1650edb57ef5dd"; + sha256 = "1pgmgssysl0nv9z4vvlmxjijl6y7jvy1b7ph30jnj3fmcrwdf6w3"; libraryHaskellDepends = [ base containers lens mtl template-haskell ]; @@ -121096,7 +129264,7 @@ self: { mkDerivation { pname = "mi"; version = "0.0.1"; - sha256 = "4bc4f1c226067e380bf308dcc213ce41ef1cbc03e611dcc118bef703cecb710f"; + sha256 = "03virg707xxy330xq4g60fy1rvs1rq9w5p08yc5khzh64v1g3i2b"; libraryHaskellDepends = [ base haskell-src-meta parsec split template-haskell ]; @@ -121111,7 +129279,7 @@ self: { mkDerivation { pname = "microbench"; version = "0.1"; - sha256 = "6fee3c592c9afb72bd7b5574872119464055b717491c612ffee7f57c8e85d717"; + sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg"; libraryHaskellDepends = [ base time ]; homepage = "http://neugierig.org/software/darcs/browse/?r=microbench;a=summary"; description = "Microbenchmark Haskell code"; @@ -121124,14 +129292,14 @@ self: { , data-default, either, errors, hspec , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, streaming-commons, tagsoup, template-haskell, text, time - , transformers, unordered-containers, vector, wai-extra, warp - , xml-lens, xss-sanitize + , scotty, tagsoup, template-haskell, text, time, transformers + , unordered-containers, vector, wai-cli, wai-extra, xml-lens + , xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.6"; - sha256 = "9937ae3658bf1bfbb34f03cc8f0fcd1c236f72cd52f5845cfbd19f02a3ed33f8"; + version = "1.0.1.7"; + sha256 = "1waqcw63ygn6yjs7720l94kssfsrjdxfsp70kri498zsziia9w6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121142,8 +129310,8 @@ self: { ]; executableHaskellDepends = [ aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty streaming-commons - text wai-extra warp + data-default network network-uri options scotty text wai-cli + wai-extra ]; testHaskellDepends = [ aeson-qq base base-compat bytestring data-default hspec @@ -121163,7 +129331,7 @@ self: { mkDerivation { pname = "microformats2-types"; version = "0.4.1"; - sha256 = "eb6ceacf393b5887455bfae0c39493dddbf26f081d70ce81630bdb85ce135adc"; + sha256 = "1p2s2g78bnqbcf0www0x11pz5nyxjfac7q7sbd2qfn1v777ylv7b"; libraryHaskellDepends = [ aeson base data-default-class pandoc-types setters text time ]; @@ -121177,8 +129345,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.7.0"; - sha256 = "c149874a5cf038c1dde51b79b22733116817619e5ed11c7787aadb9d8ea31e26"; + version = "0.4.8.0"; + sha256 = "1xbspqq1sgw6p16rwmdlwprjpcj2p0ppd1nn5iz3ynbifrqi42xa"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; @@ -121192,8 +129360,8 @@ self: { }: mkDerivation { pname = "microlens-aeson"; - version = "2.2.0"; - sha256 = "c25b8fefcd321f348c5948a0f65d30ecad4070e3f1f7720bacb022b57c6386d4"; + version = "2.2.0.1"; + sha256 = "0hpi61410yq1qkfzm7dxqhpn2bw6596byfi8mkd66skkj67x1cfh"; libraryHaskellDepends = [ aeson attoparsec base bytestring microlens scientific text unordered-containers vector @@ -121213,7 +129381,7 @@ self: { mkDerivation { pname = "microlens-contra"; version = "0.1.0.1"; - sha256 = "4983f19d37168a7cb862f76a22e8a43156df89c3c58b8206e2c84b2262c7f595"; + sha256 = "15gmqxi24jy8w83852y5qf4xymiilkl24sppcaw7r2hn6yfz30s9"; libraryHaskellDepends = [ base contravariant microlens ]; homepage = "http://github.com/aelve/microlens"; description = "True folds and getters for microlens"; @@ -121225,7 +129393,7 @@ self: { mkDerivation { pname = "microlens-each"; version = "0.1.0.0"; - sha256 = "b27354ca9d7fb054db493c0aa39cd616607709e2e2156b98900a411ef3167301"; + sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj"; libraryHaskellDepends = [ base microlens ]; homepage = "http://github.com/aelve/microlens"; description = "'each' for microlens"; @@ -121239,8 +129407,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.7.0"; - sha256 = "ef1f68645d0f62e9f108852dd0637109625703175eb571c7f183aa3244bf0cdf"; + version = "0.4.8.0"; + sha256 = "0yk9b0c1zm1z2y9hcgmdjkdis0g2wimb758y8fxnxshxlqpym8fy"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -121255,8 +129423,8 @@ self: { }: mkDerivation { pname = "microlens-mtl"; - version = "0.1.10.0"; - sha256 = "b1dec4f000f324ae3e1915f683577bd53af218a68d07b0acf437def74e14b39d"; + version = "0.1.11.0"; + sha256 = "1885kc8sgcrv05q2sya4q562gph7hgp1hd66mgy7r1vnnz43zfjf"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -121271,8 +129439,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.7.1"; - sha256 = "e242c6f454305e5a310f7f3b4e8b3ee00158fe7160321e27a56b47ffaa2c4493"; + version = "0.3.9.0"; + sha256 = "0f9m6yd4pf839flw3w4g1irplrlmncj0kxfci7dnbkp52x66y1wk"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -121287,7 +129455,7 @@ self: { mkDerivation { pname = "microlens-th"; version = "0.4.1.1"; - sha256 = "5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b"; + sha256 = "0yvaabxs80fbmbg0yc1q7c147ks15bpn6fdq1zc0ay2pp06l06jv"; libraryHaskellDepends = [ base containers microlens template-haskell ]; @@ -121303,7 +129471,7 @@ self: { mkDerivation { pname = "micrologger"; version = "0.3.1.1"; - sha256 = "6c523c9c967dffa3024f0160c78aa56b8d1cadc37d6065912bad0b98a59e01e7"; + sha256 = "1rq1ksjrh2xd5f8naq3xqfnir3bbln5cfq019w1a7zvxjsf3qlkc"; libraryHaskellDepends = [ aeson base containers text text-format time transformers ]; @@ -121319,18 +129487,39 @@ self: { mkDerivation { pname = "microspec"; version = "0.1.0.0"; - sha256 = "e1e4156574d81786e1c8d04ba22e7283001ef3eada3104a99e9c31a45656d343"; + sha256 = "0hykarba8ccwkslh8cfsxbriw043f8pa4jyhr3hqc5yqfijibr71"; libraryHaskellDepends = [ base QuickCheck ]; description = "Tiny QuickCheck test library with minimal dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; + "microstache" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, hspec, parsec, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1"; + sha256 = "0r3ia4hamyrij4vdaa6vnfwhgv40xr4g9wcigi6yhm4ymkz5p1z8"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath parsec + text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec parsec text + ]; + homepage = "https://github.com/phadej/microstache"; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { pname = "microtimer"; version = "0.0.1.2"; - sha256 = "574d1063abb7ae8b1c17ac364537825eed3ac6feb94125aefe033bf48c958827"; + sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap"; libraryHaskellDepends = [ base time ]; homepage = "http://thoughtpolice.github.com/hs-microtimer"; description = "A tiny library for benchmarking IO actions"; @@ -121346,7 +129535,7 @@ self: { mkDerivation { pname = "mida"; version = "1.0.2"; - sha256 = "902ce590e9fb57138676eacc4bdcb4ed536f54df054f4c606a4c6c71b6f475f7"; + sha256 = "1xvmyjv72v2cd9h4qkq5vxa6ylzdnkf4pk7afs316mzvx68fab4h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121374,7 +129563,7 @@ self: { mkDerivation { pname = "midair"; version = "0.2.0.0"; - sha256 = "32262281f8785a3fa4ab6c60302566a8dcf59287f0da95e4d42bb8212f88b1b9"; + sha256 = "1fdii0pj3f1bskj9bnphhy9gbp58cqjk0q3cmfj3ynkqz20j49ij"; libraryHaskellDepends = [ base containers safe stm ]; description = "Hot-swappable FRP"; license = stdenv.lib.licenses.gpl3; @@ -121389,7 +129578,7 @@ self: { mkDerivation { pname = "midi"; version = "0.2.2.1"; - sha256 = "441931731ab75fd4dbbce459a3494941cb6f12a897d4bacdf33ab2f2501003cf"; + sha256 = "1kq3218g5cisyg6vmm4pm096zjs1954s6ng4pkdx8pxp39rk26a4"; libraryHaskellDepends = [ base binary bytestring event-list explicit-exception monoid-transformer non-negative QuickCheck random transformers @@ -121409,13 +129598,14 @@ self: { mkDerivation { pname = "midi-alsa"; version = "0.2.1"; - sha256 = "ecbe392b796041c42c9e63950ffbe0186c6603bde7fe1d28cd5614d15212ac8d"; + sha256 = "13dc299d252nrll1vzp7pl1ncv0qw3xhz5b3kqnc8hb0g4mkkgpc"; libraryHaskellDepends = [ alsa-seq base data-accessor midi utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -121425,8 +129615,8 @@ self: { }: mkDerivation { pname = "midi-music-box"; - version = "0.0.0.1"; - sha256 = "1e830c1f871cbf8f5b478c5923d52f76457b15eda2d64a4bf9e6c2016ed47de9"; + version = "0.0.0.4"; + sha256 = "0l8nv3bfbncjbh80dav7qps5aqd20g88sx00xhqr6j9m66znfg1p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121447,7 +129637,7 @@ self: { mkDerivation { pname = "midi-simple"; version = "0.1.0.0"; - sha256 = "f680eed206f3623e01817794b9f7dd9a7c8fb6aa935648a3a5cb24119621849a"; + sha256 = "16l446b1296blnilhmlkmav8yz4svpvvk53ph40kwqpk0v9fx07n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring ]; @@ -121467,9 +129657,9 @@ self: { mkDerivation { pname = "midi-util"; version = "0.2"; - sha256 = "f92ad57d4ba9b8120e66d55927938d968b97e305fd7a4296b94189a32461d7ee"; + sha256 = "1vnpc4ja72a1p6b44ypx0pirg2wnin9jfnfmcq715f599dyxaapr"; revision = "1"; - editedCabalFile = "99211f05401550a36fa4a94ff3c134f118f78d526d99da380957d40402d88cf7"; + editedCabalFile = "1xwcv0109m2p14wdm6bdaa6zf67i6k0z6kx9lips6l0m802iy8cr"; libraryHaskellDepends = [ base containers event-list midi non-negative ]; @@ -121485,7 +129675,7 @@ self: { mkDerivation { pname = "midi-utils"; version = "0.1.0.0"; - sha256 = "3fa2fb1f7d462ad26b8fe02bca69f7054fb41555d601798adc41872e3d8c9db6"; + sha256 = "1dlxihyjx1s1vj57j0fnalav8kq5yxlwlaz0ixmx4aj6glgzp8iz"; libraryHaskellDepends = [ base bytestring directory event-list midi parsec process ]; @@ -121502,7 +129692,7 @@ self: { mkDerivation { pname = "midimory"; version = "0.0.0.2"; - sha256 = "dfb750af588a19e8b64bf53919c9655b33b16c29fb08826bbd7a2f6fb4586e8d"; + sha256 = "13bfb2s6ybvspmmq427v55nb2csvcp4ijfgm9fvfh6cab2pm1dyz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121521,7 +129711,7 @@ self: { mkDerivation { pname = "midisurface"; version = "0.1.0.0"; - sha256 = "df05b1fd6e12af0ad1171eff19d457a6b2527f8ae03e3773b652ca90310c2f44"; + sha256 = "0i1g1hqr1jjjnrrkfgp0i9zm5cm6aza1kzqy2z8hmbqjdvyv21fz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121540,7 +129730,7 @@ self: { mkDerivation { pname = "mighttpd"; version = "0.4.3"; - sha256 = "ce83085798ceed0415f335acb2c9820727614baee33afca2f81af5520ee98676"; + sha256 = "0xl6x4755x8sz2igqfp3mr5n29q7hb4v5b1mycah9vffk1bhi0yf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121565,7 +129755,7 @@ self: { mkDerivation { pname = "mighttpd2"; version = "3.4.1"; - sha256 = "0f24c72662be4a0e3d75956fff53899216e29ac7eb29dae771c7e4eb77bdd8d5"; + sha256 = "1mfqpmvypr67f7kxlagbqydf45lji59zyvwmflyhwjmyc8kcf90g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121594,7 +129784,7 @@ self: { mkDerivation { pname = "mighty-metropolis"; version = "1.2.0"; - sha256 = "8d3c0b4b65024846291c4f547c45e5c04f587aefd0e8d041d54679bb519871c0"; + sha256 = "1h3ik18vnya6sm0x1s6hxxx5hky0wm2pqm2g3hllcj02cm5hng4d"; libraryHaskellDepends = [ base kan-extensions mcmc-types mwc-probability pipes primitive transformers @@ -121610,9 +129800,9 @@ self: { mkDerivation { pname = "mikmod"; version = "0.2.0.1"; - sha256 = "b7d2b0aa2288f5874aad326043676f667bc61e930d0a5e9c5a90243807e023ed"; + sha256 = "1v93w03kh94hbaf5w2hdjcgccyv6dxkl6q1jmm58gxc84amb1lmp"; revision = "1"; - editedCabalFile = "6b9bdb1899839287cfa2e355f5836d9d36a8f84a2adce83ec34aef2e6ad3d22a"; + editedCabalFile = "0anjsdm2xvsaqczfip1a9bwahdlxdn1zamg3lb7qg4l3k4cdp6vb"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; @@ -121627,7 +129817,7 @@ self: { mkDerivation { pname = "mikrokosmos"; version = "0.2.0"; - sha256 = "853b4e3c3f2299f550f18bb0692bc194a2720b57fbcb5bf2aba70713586375b2"; + sha256 = "1ckmcdc161x7mgr5pjzvaw5p58llq4mnkc4by58gb6927wy4wfw5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121645,7 +129835,7 @@ self: { mkDerivation { pname = "miku"; version = "2016.3.17"; - sha256 = "86487d52fa130e311c416e0822f0647ba9fd11868b0bcda2ab6e09d9ceb4cc9c"; + sha256 = "176cnk7dj2bfmfics2wbhq8zvabvckq2423f84f323hkz997sj46"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive containers filepath http-types mtl wai wai-extra @@ -121657,17 +129847,18 @@ self: { "milena" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, digest, lens - , lifted-base, mtl, murmur-hash, network, QuickCheck, random - , resource-pool, semigroups, tasty, tasty-hspec, tasty-quickcheck - , transformers + , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck + , random, resource-pool, semigroups, tasty, tasty-hspec + , tasty-quickcheck, transformers, zlib }: mkDerivation { pname = "milena"; - version = "0.5.0.2"; - sha256 = "8e770eba91b0caddd5fb16b96f191ca7f4554689fc88f41261687a1af74f5c4b"; + version = "0.5.1.0"; + sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly"; libraryHaskellDepends = [ - base bytestring cereal containers digest lens lifted-base mtl - murmur-hash network random resource-pool semigroups transformers + base bytestring cereal containers digest lens lifted-base + monad-control mtl murmur-hash network random resource-pool + semigroups transformers zlib ]; testHaskellDepends = [ base bytestring lens mtl network QuickCheck semigroups tasty @@ -121683,7 +129874,7 @@ self: { mkDerivation { pname = "mime"; version = "0.4.0.2"; - sha256 = "e7fa283e5caa6371d5b3978e152412a2dd2489eec43aee722caca9dc14ea3875"; + sha256 = "0x9qx8adradc5irfwfn4xs4j9pd228j1b3lpngap2qxabhz2iyp7"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/GaloisInc/mime"; description = "Working with MIME types"; @@ -121697,7 +129888,7 @@ self: { mkDerivation { pname = "mime-directory"; version = "0.5.2"; - sha256 = "a3f337e2bcd3cbb27f92cea6b9fa65cd6c79832367d3e3bcd45989b53930077a"; + sha256 = "0yh760wvb2arsjyf7lv74f1pjv6dcpxbk9nfj9zv5jykpki3gwx3"; libraryHaskellDepends = [ base base64-string bytestring containers old-locale regex-pcre time ]; @@ -121712,8 +129903,10 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.13"; - sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440"; + version = "0.4.13.1"; + sha256 = "05sri6sszmnyxsnrnk5j1wwqf0bawpfb179wjqfsp7bkj886g0cl"; + revision = "4"; + editedCabalFile = "129h3siph3pxiddvrr52dsla6jn0yqr55213zv0wamscjmzwwiy1"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -121733,7 +129926,7 @@ self: { mkDerivation { pname = "mime-mail-ses"; version = "0.3.2.3"; - sha256 = "03f977386c2cdf122097a0327509e4151eb10e320d8cec1791d259aa067f4d4c"; + sha256 = "0k2dgw3alnfjj4byr30d687b27hmwh4pacm0jwh15prcdhw7gy83"; libraryHaskellDepends = [ base base64-bytestring byteable bytestring conduit cryptohash http-client http-conduit http-types mime-mail old-locale text time @@ -121751,7 +129944,7 @@ self: { mkDerivation { pname = "mime-string"; version = "0.4"; - sha256 = "c1e4a17e7e0171ec7d0c75efcdc4dab69d47bff2b524a5da4721518a1f43026c"; + sha256 = "0v028cgqll918zdaa95myazlg7dnvb2cvvvm1iyyqw81grza3r61"; libraryHaskellDepends = [ base base64-string bytestring iconv mtl network old-time ]; @@ -121765,7 +129958,7 @@ self: { mkDerivation { pname = "mime-types"; version = "0.1.0.7"; - sha256 = "83164a24963a7ef37543349df095155b30116c208e602a159a5cd3722f66e9b9"; + sha256 = "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3"; libraryHaskellDepends = [ base bytestring containers text ]; homepage = "https://github.com/yesodweb/wai"; description = "Basic mime-type handling types and functions"; @@ -121780,7 +129973,7 @@ self: { mkDerivation { pname = "minecraft-data"; version = "0.1.0.0"; - sha256 = "993725a6baa1a1eb887f48de09f7d4bb64753ed37aaf11a4698cd3b1466414dc"; + sha256 = "1p0lci3b3lwcd6j13bvsscz7ar5vskvhkpj8gy4fp8d1pak2adwr"; libraryHaskellDepends = [ array base bytestring cereal containers lens mtl nbt pipes pipes-bytestring pipes-cereal pipes-parse pipes-zlib text text-show @@ -121797,7 +129990,7 @@ self: { mkDerivation { pname = "mines"; version = "0.1"; - sha256 = "1369e26dd2e931ead084071909611f18710477b44bd8b0f11294f9a93944499b"; + sha256 = "16s98hwskycl2bqv1n2bnivh8w8q3xhhj687hk8flcg9s9ny4s8k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory mtl random ]; @@ -121813,7 +130006,7 @@ self: { mkDerivation { pname = "minesweeper"; version = "0.9.2.1"; - sha256 = "423ff2a8f8ee0fe330e07cfd0732c463f01a7889e9afb509652d27cacd087cb1"; + sha256 = "1cbw136wl9rdcl4vbbz9i5w1mw33qhr0gzbww0qf63zfz2lg4gs2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121830,7 +130023,7 @@ self: { mkDerivation { pname = "miniball"; version = "0.1.0.2"; - sha256 = "e28438054d792fee36364320517f9adbaa62802dc23eb30f0411f7abddfacd99"; + sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172"; libraryHaskellDepends = [ base vector ]; homepage = "http://nonempty.org/software/haskell-miniball"; description = "Bindings to Miniball, a smallest enclosing ball library"; @@ -121844,7 +130037,7 @@ self: { mkDerivation { pname = "miniforth"; version = "0.1.0.1"; - sha256 = "0fcc6fce2d3a5cedb738bae294c9b43426a2d1ea700a6c2476f11b795e675ab8"; + sha256 = "1f2scxg7j6zifqj6q2khxb8s49ilnk4r9qms72vysp1s5p76zk0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121866,7 +130059,7 @@ self: { mkDerivation { pname = "minilens"; version = "1.0.0.2"; - sha256 = "a7614e251a81e5e77d4e3a6c649b3229beed30a5a3b8b6681f3d2d6dbe0770ef"; + sha256 = "1vvh0yz6sb9x3xlbdf53llqfvgi96adn8v1s9ryygrc138jlwqd7"; libraryHaskellDepends = [ array base bytestring containers mtl semigroups text transformers ]; @@ -121881,7 +130074,7 @@ self: { mkDerivation { pname = "minimal-configuration"; version = "0.1.3"; - sha256 = "7c574ce43ed0145dd6d30c98386b4d183c7b69320c22100c613a942b32b0c544"; + sha256 = "0i65n0r2p51sc46108hc69lpng0q9mmki60csgb5s56h7vj4qmvw"; libraryHaskellDepends = [ base containers directory filepath tconfig ]; @@ -121895,8 +130088,8 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.1.6.0"; - sha256 = "7faeea373e316aefc8bb8fcf7e3265263be94d8f985a7bb07ef67c7fe502ba9d"; + version = "0.1.6.1"; + sha256 = "0i5qigcj5qpzyg2br8xppd36b5q86y3n457g0hdpv9469d2pnrwl"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit text @@ -121911,7 +130104,7 @@ self: { mkDerivation { pname = "minimung"; version = "0.1"; - sha256 = "8ee2194658f1400c27c66806144d90b23f2a9348ec4d2a84744d8572da2a0245"; + sha256 = "0i825bd751adfj22lkgc929jlgxjj16i81k8qqkhqh7ib131kqlf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT haskell98 unix ]; @@ -121927,18 +130120,18 @@ self: { , http-client, http-conduit, http-types, lifted-async, lifted-base , memory, monad-control, protolude, QuickCheck, resourcet, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text - , time, transformers, transformers-base, xml-conduit + , text-format, time, transformers, transformers-base, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "0.1.0"; - sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908"; + version = "0.2.1"; + sha256 = "1h9ma1lgkirsmv8685m1l3m6k38zyx2kqk49s1x3gdbrsihpnjs8"; libraryHaskellDepends = [ async base bytestring case-insensitive conduit conduit-combinators conduit-extra containers cryptonite cryptonite-conduit data-default exceptions filepath http-client http-conduit http-types lifted-async lifted-base memory monad-control protolude resourcet - text time transformers transformers-base xml-conduit + text text-format time transformers transformers-base xml-conduit ]; testHaskellDepends = [ async base bytestring case-insensitive conduit conduit-combinators @@ -121946,9 +130139,10 @@ self: { directory exceptions filepath http-client http-conduit http-types lifted-async lifted-base memory monad-control protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck - temporary text time transformers transformers-base xml-conduit + temporary text text-format time transformers transformers-base + xml-conduit ]; - homepage = "https://github.com/donatello/minio-hs#readme"; + homepage = "https://github.com/minio/minio-hs#readme"; description = "A Minio client library, compatible with S3 like services"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -121959,7 +130153,7 @@ self: { mkDerivation { pname = "minions"; version = "0.2.0.0"; - sha256 = "74935247e64e2e93f3defb30ee26729a282333cdfdd5e0c58027d3a4ee01ece4"; + sha256 = "1r7c07pa9lr7h32y1mgxrlrj6a4sf8kfwc7vvvrr6bjfwr3m54vl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121978,7 +130172,7 @@ self: { mkDerivation { pname = "minioperational"; version = "0.4.9"; - sha256 = "b524899037135247e114849df6d318e9942e58e3ea38e92741b1ff77df986e4d"; + sha256 = "0kbfk3gpgzxi84kyjf7awdc2x579339zd7c42khlflhk6y88j95m"; libraryHaskellDepends = [ base containers elevator extensible mtl template-haskell transformers @@ -121995,7 +130189,7 @@ self: { mkDerivation { pname = "miniplex"; version = "0.3.4"; - sha256 = "e4317ac51ab9d31d44b7e692acb6c426c9fc3d2c6d5ee1c06208567e82793a97"; + sha256 = "15rsg617wmh8cb0f2pkd5hyzrj96qjvar4p6nx21vlxr3b2plcg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122014,7 +130208,7 @@ self: { mkDerivation { pname = "minirotate"; version = "0.1.2.2"; - sha256 = "1e91d0ae5035c89a4751d5ce063f0b3159bdce4f059ca568acda7090c3530f96"; + sha256 = "15hgag1r0w6smilab7059z7bsn9i1czhdknma53rmj1ma2pd148y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122032,7 +130226,7 @@ self: { mkDerivation { pname = "minisat"; version = "0.1.2"; - sha256 = "ad9528401dad68e9e778961e629e76b7ae373f813cada74da8c4f1c544553221"; + sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd"; libraryHaskellDepends = [ async base ]; description = "A Haskell bundle of the Minisat SAT solver"; license = stdenv.lib.licenses.bsd3; @@ -122043,7 +130237,7 @@ self: { mkDerivation { pname = "minisat-solver"; version = "0.1"; - sha256 = "c12098dee034afb98b31ce7ac346398b93a3537c11e30e7573d25160120fd37d"; + sha256 = "0zfk1w960lfjfdshxqqigi9s74wb753c6ynf665vkbrlw3g9h861"; libraryHaskellDepends = [ base containers transformers ]; benchmarkHaskellDepends = [ base containers easyrender ]; homepage = "http://www.mathstat.dal.ca/~selinger/minisat-solver/"; @@ -122058,7 +130252,7 @@ self: { mkDerivation { pname = "ministg"; version = "0.3"; - sha256 = "b50ad03e32f9aae25df718dffbc1bbea4ddaa57b1c70f6a4071eaf0b4a86ad15"; + sha256 = "05ddhr50pbqy0yjgcw0wgfjxlkgapg0zppqqyxfy5apr68zd02mm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122077,8 +130271,8 @@ self: { }: mkDerivation { pname = "miniutter"; - version = "0.4.4.2"; - sha256 = "3a08fc860e92aa22e83b07a0aa136530f60e675d24ef8e75009c676c2a4320db"; + version = "0.4.6.0"; + sha256 = "093ahw66byzgc9scvmlihl3sa2zph9mszpf9kdjd9ydi5gv6mrmx"; libraryHaskellDepends = [ base binary containers ghc-prim minimorph text ]; @@ -122096,7 +130290,7 @@ self: { mkDerivation { pname = "minlen"; version = "0.1.0.0"; - sha256 = "6790c5840f21fa85fbb7d416d37f32b740f1735fcda3772e96d7e7083c26d9e3"; + sha256 = "1qyr4qy0irypjqp7g8ydbxrz2h5p69zx65nlnzxqbyi11y2cb437"; libraryHaskellDepends = [ base mono-traversable semigroups transformers ]; @@ -122111,7 +130305,7 @@ self: { mkDerivation { pname = "minst-idx"; version = "0.1.2.2"; - sha256 = "3be63590a01f8504f372fe7565a318eef8d6de31e6e251bdac01965297793d1a"; + sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; homepage = "https://github.com/kryoxide/minst-idx/"; @@ -122124,8 +130318,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mintty"; - version = "0.1"; - sha256 = "956b346c89b12e683b957bf45eb0d09cae121fd247916de0386687f713ca0865"; + version = "0.1.1"; + sha256 = "10wz5q85h366g22jijai5g6hpxa22zy2hr33bzidxs4r36gk8zy8"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/mintty"; description = "A reliable way to detect the presence of a MinTTY console on Windows"; @@ -122137,7 +130331,7 @@ self: { mkDerivation { pname = "mios"; version = "1.4.0"; - sha256 = "3cc891fd9849f2853ce2f19325fac3eb7c6adb2b684aa4922c2ae66638ac3c2d"; + sha256 = "0b9wmhw6dria5j9a8jk85gdnlz7bqgx2b4ziw8y8bwj9k3yr3j1w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ghc-prim vector ]; @@ -122154,7 +130348,7 @@ self: { mkDerivation { pname = "mirror-tweet"; version = "0.1.0.0"; - sha256 = "eac658afd7980b4c1c94d50aea97c6792454dea8c7af2cf29b67cd5e0c03bf1d"; + sha256 = "07dz0c65xkb7kgr2rby7m3g5893rqsbyl2nmjhf4q2wqsypmiipa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122175,7 +130369,7 @@ self: { mkDerivation { pname = "misfortune"; version = "0.1.1.2"; - sha256 = "ae4b44215f811e7af6af756c813b9bd6e4161be555f30dd817324f8d1ffe2349"; + sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122188,12 +130382,30 @@ 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 { pname = "missing-foreign"; version = "0.1.1"; - sha256 = "9e1b36cdb8626d848386c1c4d54f3b9f80b3458398aa6a4d499266b5ecbcc885"; + sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy"; libraryHaskellDepends = [ base ]; description = "Convenience functions for FFI work"; license = stdenv.lib.licenses.bsd3; @@ -122204,7 +130416,7 @@ self: { mkDerivation { pname = "missing-py2"; version = "1.0.1"; - sha256 = "b266a628cfdb903da0e05fde8a40df0f1c6df170b261e248068956a640184a35"; + sha256 = "0daa310acml90r4f4qdjf3qns70gvx08mpjzw2h3v46vrwlacrmj"; libraryHaskellDepends = [ anydbm base MissingH ]; testHaskellDepends = [ anydbm base Cabal directory HUnit MissingH @@ -122220,7 +130432,7 @@ self: { mkDerivation { pname = "mix-arrows"; version = "1.2"; - sha256 = "61242240e78294039ec855d9adb3c8aab11cdb26ffe6835a490be5ba12a0e054"; + sha256 = "0m70l09bmr8b95d87rpz4vdircdar2rsvnamr2g07542wx024931"; libraryHaskellDepends = [ base ]; description = "Mixing effects of one arrow into another one"; license = stdenv.lib.licenses.bsd3; @@ -122232,7 +130444,7 @@ self: { mkDerivation { pname = "mixed-strategies"; version = "0.1.0.0"; - sha256 = "6ce6f0df567853bed9ba5b4b929be771084f5cf38b8acf1c4a722b21056e546f"; + sha256 = "0vsldq2j2avj98fcz2lbydf4y23iwydr4jsvpbcvwlvqavgz1rkc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers simple-tabular ]; @@ -122245,12 +130457,48 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mixed-types-num" = callPackage + ({ mkDerivation, base, convertible, hspec, hspec-smallcheck + , QuickCheck, smallcheck + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.1.0.1"; + sha256 = "13pp5c8ldccscf5q99zvzcjkn77f9gnqkn5rp6789cia72wyqhlw"; + libraryHaskellDepends = [ + base convertible hspec hspec-smallcheck QuickCheck smallcheck + ]; + testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; + homepage = "https://github.com/michalkonecny/mixed-types-num"; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mixed-types-num_0_2_0_1" = callPackage + ({ mkDerivation, base, convertible, hspec, hspec-smallcheck + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.2.0.1"; + sha256 = "05jy5rym4a2y80pg00csyrfpd3bdv98s1kdv3s18nqfrhsyz84wa"; + libraryHaskellDepends = [ + base convertible hspec hspec-smallcheck QuickCheck smallcheck + template-haskell + ]; + testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; + homepage = "https://github.com/michalkonecny/mixed-types-num"; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { pname = "mkbndl"; version = "0.2.1"; - sha256 = "2dab465aafde67886a713f9a7163f66a226f54b014e2dc65c1bb742d92abeee3"; + sha256 = "1qzfmf92sx5vq5jxrqhln1a6y8kayrip36izf5m8hryymxd4dard"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath haskell98 ]; @@ -122266,7 +130514,7 @@ self: { mkDerivation { pname = "mkcabal"; version = "1.0.0"; - sha256 = "cc67bbbad36aaa2a2c2cda6418077330c2a48d8dec18f7feee3d809848e5aab2"; + sha256 = "1cmawm49i01xxvzgf67cin6s9hihfc3ihr6s5hn2makasfxbnryc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122283,7 +130531,7 @@ self: { mkDerivation { pname = "ml-w"; version = "0.1.1"; - sha256 = "815ae613c0612c51570b0e7797490fdaa2ab0533320fed8c2f077ce5716ea011"; + sha256 = "04d0drqyaz075y6fs3rj6c2sp8ns1x4rfxqf1dbm2b31q09ycnl1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; @@ -122298,7 +130546,7 @@ self: { mkDerivation { pname = "mlist"; version = "0.0.2"; - sha256 = "338cbb8509a0f9d070f461229aef9c7297c3cf9f22a82d5fe4019deba1aabc1a"; + sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k"; libraryHaskellDepends = [ base haskell98 ]; homepage = "http://haskell.org/haskellwiki/mlist"; description = "Monadic List alternative to lazy I/O"; @@ -122306,12 +130554,36 @@ 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 { pname = "mmap"; version = "0.5.9"; - sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8"; + sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -122324,7 +130596,9 @@ self: { mkDerivation { pname = "mmorph"; version = "1.0.9"; - sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563"; + sha256 = "0qs5alhy719a14lrs7rnh2qsn1146czg68gvgylf4m5jh4w7vwp1"; + revision = "1"; + editedCabalFile = "1xxf78qi08qsis2q785s0ra29wjxnxw8pyns0dsqp4a6cybd3mjd"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -122332,12 +130606,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmorph_1_1_0" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.0"; + sha256 = "1pklvg28hjfsq5r66x4igjrxbdq0l74g6lirrvsh6ckmc1av9g61"; + revision = "1"; + editedCabalFile = "0ppf6icblgrmiaa09s2plg1m2818pp2l9rd7c821q0zq266v79wi"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mmtf" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-msgpack + , hspec, QuickCheck, text + }: + mkDerivation { + pname = "mmtf"; + version = "0.1.0.1"; + sha256 = "100hyv6qb8jkqaw2f2h2fz9m32xrh3ffll67y52a11pkxzilyh19"; + libraryHaskellDepends = [ + base binary bytestring containers data-msgpack text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + homepage = "https://github.com/zmactep/mmtf#readme"; + description = "Macromolecular Transmission Format implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmtl" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "mmtl"; version = "0.1"; - sha256 = "f4485b92193e90e10c0d8ca5d7448c078d4355e3724fed7913de142d0a4d612d"; + sha256 = "0bb19l52s56y2dwyskvjwdal7387ii2dg9cc1l6f341y3695nj7l"; libraryHaskellDepends = [ base ]; description = "Modular Monad transformer library"; license = stdenv.lib.licenses.bsd3; @@ -122349,7 +130657,7 @@ self: { mkDerivation { pname = "mmtl-base"; version = "15321.1"; - sha256 = "d806708dfbb000cbf520ace5cbf5f68114232030f40e2a981fbafdb46e570d8e"; + sha256 = "13hdaxpb9zds3yc2l3pl60h26541yvswprdc43swn05hzf6p01nq"; libraryHaskellDepends = [ base mmtl ]; description = "MonadBase type-class for mmtl"; license = stdenv.lib.licenses.bsd3; @@ -122361,10 +130669,8 @@ self: { }: mkDerivation { pname = "mnist-idx"; - version = "0.1.2.6"; - sha256 = "0ea524a09dbf48c372859b491439b8131f4f0875e8a6d980342d0d438d61a9ae"; - revision = "1"; - editedCabalFile = "4e91ab8e67b03b8d567f0b2d900b1364840d2a83c3bd5a8f312e4b0467a9bac6"; + version = "0.1.2.8"; + sha256 = "1zmjj71bv5yzdjm4hmlkiwcvv810mln090yp8znj2j21hiz1dzs2"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; homepage = "https://github.com/kryoxide/mnist-idx/"; @@ -122380,7 +130686,7 @@ self: { mkDerivation { pname = "moan"; version = "0.2.0.2"; - sha256 = "60c444b8a192197cfe0c071c45d3f76cdfcf66eb47cb4e3aa76b2245f6f86039"; + sha256 = "0fb0z3v4a8kblwx4xjs7xdkczpvcyz9la7071kz7q6cjl6w49i30"; libraryHaskellDepends = [ base binary bytestring containers dawg regex-tdfa regex-tdfa-text tagset-positional text zlib @@ -122397,8 +130703,8 @@ self: { }: mkDerivation { pname = "mockery"; - version = "0.3.4"; - sha256 = "30fe35f4f9cfd1b85a4ccc514a25ef066148364886e53538d50e5e760a582938"; + version = "0.3.5"; + sha256 = "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp"; libraryHaskellDepends = [ base base-compat bytestring directory filepath logging-facade temporary @@ -122416,7 +130722,7 @@ self: { mkDerivation { pname = "modbus-tcp"; version = "0.5"; - sha256 = "be27b38fc90ed81d5a4b3f15ee180519ac47fe9e905e77e3eed7db7371b3e856"; + sha256 = "0mp8ndqp7nypxvipfplhkvz4gb0r0lcfw59z9dd1vn0fr67v69xy"; libraryHaskellDepends = [ base bytestring cereal mtl transformers ]; @@ -122428,17 +130734,17 @@ self: { "model" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, ListLike - , pretty, tasty, tasty-hunit, tasty-quickcheck, transformers + , pretty, tasty, tasty-hunit, transformers }: mkDerivation { pname = "model"; - version = "0.2.1"; - sha256 = "0da6c98beffd1767fa5bbee92de5ff444402899a4855b193f83511309afeb96d"; + version = "0.3"; + sha256 = "1hifwd7caxmbvi6n87w6x8mb42x0q3wqzkjfwxsz6g416c1f56jl"; libraryHaskellDepends = [ base containers deepseq ListLike pretty transformers ]; testHaskellDepends = [ - base containers ghc-prim pretty tasty tasty-hunit tasty-quickcheck + base containers ghc-prim pretty tasty tasty-hunit ]; homepage = "http://github.com/tittoassini/model"; description = "Derive a model of a data type using Generics"; @@ -122452,7 +130758,7 @@ self: { mkDerivation { pname = "modelicaparser"; version = "0.1.0.0"; - sha256 = "d461b3926381d73b8c1e59653c751b50b501a1309dcaabfbf9e68c11717bda45"; + sha256 = "0ifsgdqi3376z7xspjlx62hh3dah3dskqrar3s63pmw1cf9b6qfl"; libraryHaskellDepends = [ base containers parsec ]; testHaskellDepends = [ ansi-terminal base containers filepath parsec QuickCheck @@ -122470,7 +130776,7 @@ self: { mkDerivation { pname = "modify-fasta"; version = "0.8.2.3"; - sha256 = "dcee07de4f97b10c557cc3a18aee35d75caf8ef65bdc104bcd6785bfabc7465e"; + sha256 = "0pj6qymvz1b7rm5i1p2vys7ayp6p6pp8m8f3giahrccp9zg0gvnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122494,7 +130800,7 @@ self: { mkDerivation { pname = "modsplit"; version = "0.2.1"; - sha256 = "b714c6c4f90586169a206bcee55afde5e189a813f531ad92f65c51868edca976"; + sha256 = "0xm9vj78clawys9ascgm2fl8kqg5zmdfbkkb42d1d1h5z72cc55p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122513,7 +130819,7 @@ self: { mkDerivation { pname = "modular-arithmetic"; version = "1.2.1.2"; - sha256 = "921f31f72589c07be9e64fcc68e90a41651817404ee796f56d0f299287b9a176"; + sha256 = "0xm1p63r4a8gdpsrdrsf80bihra11blnik2gwvlpph494pvk27wj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/TikhonJelvis/modular-arithmetic"; @@ -122530,7 +130836,7 @@ self: { mkDerivation { pname = "modular-prelude"; version = "0.3.0.0"; - sha256 = "6ee621088d17d175968878c0715237eac24534a892661b3e2ec559d753ed9542"; + sha256 = "0hlmxm9xfnf55qz1nrljm0s4bhpa6x973h3qi2b7bl8pil423rkf"; libraryHaskellDepends = [ base basic-prelude bytestring containers data-default hashable system-filepath text transformers unordered-containers vector @@ -122546,7 +130852,7 @@ self: { mkDerivation { pname = "modular-prelude-classy"; version = "0.1.0.0"; - sha256 = "dd76f45afabff8476079dbd0ce30ffac45c9897e123d1d4fa9daa8d45eb6f1c7"; + sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx"; libraryHaskellDepends = [ base classy-prelude modular-prelude ]; homepage = "https://github.com/DanBurton/modular-prelude#readme"; description = "Reifying ClassyPrelude a la ModularPrelude"; @@ -122564,7 +130870,7 @@ self: { mkDerivation { pname = "module-management"; version = "0.21"; - sha256 = "2518ed4e792fe743d14bc787347cda74bd4eb0aa070831e5453f5b1063a3e28e"; + sha256 = "13p2ldii0nrz8pjk2207maq4xgblv9y391y79g8l7rrgg57fs615"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122593,7 +130899,7 @@ self: { mkDerivation { pname = "modulespection"; version = "0.1.2.2"; - sha256 = "8e4abf685a1a4cab8244eb2c71378a99fd53c71696ee8a1cc14320b293162700"; + sha256 = "00172s9v4823q4f8mvln2v3m7zcri8vp2b7b8j1ank0sb9lbyjlf"; libraryHaskellDepends = [ base exceptions filepath ghc ghc-paths template-haskell temporary transformers @@ -122612,7 +130918,7 @@ self: { mkDerivation { pname = "modulo"; version = "1.9.1"; - sha256 = "ec98a1f9a9107fb5d480c018042b841399135938ad1598ea1fa4ffe35073bbb7"; + sha256 = "1dxvfd8f7zx43zm9h5dd71ci768khhmh8660h3abazqhm7ws367c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122631,7 +130937,7 @@ self: { mkDerivation { pname = "moe"; version = "2015.5.4"; - sha256 = "298fde0c83cea1ae7dbe78d05920e9435a99dc1450652f1163bcf0052cca3e7a"; + sha256 = "0yiyr8n0bw5wcc8jyrah2kf9jnj3x4h5kl3qprysx8ffhc6dx3r9"; libraryHaskellDepends = [ air base bytestring data-default dlist mtl text ]; @@ -122649,7 +130955,7 @@ self: { mkDerivation { pname = "moesocks"; version = "1.0.0.42"; - sha256 = "892870056d66fecae4db37a780a0dcc6c9cb6cae281c2883a20378efc83b019d"; + sha256 = "17817g4fyy03la1jh718mrncpjf6vjh819rpvgjcmzk6dl2p0a49"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122673,7 +130979,7 @@ self: { mkDerivation { pname = "mohws"; version = "0.2.1.5"; - sha256 = "49616643f76c144bf0e31e731fc08a2e382c482c59fc4a378b85441ac39a73f6"; + sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122698,7 +131004,7 @@ self: { mkDerivation { pname = "mole"; version = "0.0.5"; - sha256 = "0b0735bcd5afc88f192457a6b7dd3266d3341ec911d31a2fcd67acaf2b517893"; + sha256 = "14vqa4mszb37rlpimlqir4g39lv66bfvg9jp4hcqzj5gsny3a1qb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122722,14 +131028,14 @@ self: { }: mkDerivation { pname = "mollie-api-haskell"; - version = "0.1.0.2"; - sha256 = "2d4813f1e3eb4c4996f52012075f084d69bac4b3f52bc05bad8107718860e255"; + 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; @@ -122742,7 +131048,7 @@ self: { mkDerivation { pname = "monad-abort-fd"; version = "0.5"; - sha256 = "677915c0c44d2e0ed478ff0637a5c9c291762e61619a3133f8331bfc855ed8fb"; + sha256 = "1yyqbs2zq6rkz0rk36k1c4p7d4f2r6jkf1pzg3a0wbjdqk01ayb7"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-abort transformers-base @@ -122757,7 +131063,7 @@ self: { mkDerivation { pname = "monad-atom"; version = "0.4.1"; - sha256 = "783042863f498e9737be43911afe160b1ec2ca66a59a894a7da668f0b9b9b699"; + sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q"; libraryHaskellDepends = [ base containers ghc-prim mtl ]; homepage = "https://bitbucket.org/gchrupala/lingo"; description = "Monadically convert object to unique integers and back"; @@ -122770,19 +131076,31 @@ self: { mkDerivation { pname = "monad-atom-simple"; version = "0.0.2"; - sha256 = "528c99bb0708b0d54ca184008e19dcd146b1ea03972f6d6bbaa268295b6699cc"; + sha256 = "1k4rcrdjjs52p9mnsbwp0gmb2inivhcqw044l56dbc080yxrk32j"; libraryHaskellDepends = [ base containers ghc-prim mtl ]; description = "Monadically map objects to unique ints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-batcher" = callPackage + ({ mkDerivation, base, exceptions }: + mkDerivation { + pname = "monad-batcher"; + version = "0.0.0.0"; + sha256 = "0zjyy9apc5zr51nh31p3f6bzbnfbc40hkf9p52370ynj4513lz4r"; + libraryHaskellDepends = [ base exceptions ]; + homepage = "https://github.com/basvandijk/monad-batcher"; + description = "An applicative monad that batches commands for later more efficient execution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-bool" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "monad-bool"; version = "0.2.0"; - sha256 = "9010424e301c5773a75a517ee81514865f9500243d396db5b87ad1d1161776b8"; + sha256 = "1f3n2wbd3lbsp2snsf9x4h09apw62hayhzjibakp6mqw6174444h"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "This package has been removed"; @@ -122797,7 +131115,7 @@ self: { mkDerivation { pname = "monad-classes"; version = "0.3.2.0"; - sha256 = "99bb3597d72d792e1d18f9b26490b43979ea038cf66b5f03ade0a0d60f75dc64"; + sha256 = "0r6wfl7xd870ml1mysznih1yly9rnj869cpr30fjwy9dsybkbfwr"; libraryHaskellDepends = [ base ghc-prim mmorph monad-control peano reflection transformers transformers-base transformers-compat @@ -122812,12 +131130,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-classes-logging" = callPackage + ({ mkDerivation, base, ghc-prim, logging-effect, monad-classes + , tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "monad-classes-logging"; + version = "0.1.0.0"; + sha256 = "1cg3kw5mhn4r48jrzjgcsysj6b4ypblcpckp4h6krk3cl5lfkaxy"; + libraryHaskellDepends = [ + base ghc-prim logging-effect monad-classes transformers + ]; + testHaskellDepends = [ + base logging-effect monad-classes tasty tasty-hunit transformers + ]; + homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme"; + description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-codec" = callPackage ({ mkDerivation, base, binary, containers, data-lens, mtl }: mkDerivation { pname = "monad-codec"; version = "0.2.0"; - sha256 = "b41c1238fad41320644300d1271375a84a610499c119c89ef04b86842634354a"; + sha256 = "0jim6hk891jby2gch6f1k4262jm8fl9jgl808dj204ylz8w1475l"; libraryHaskellDepends = [ base binary containers data-lens mtl ]; homepage = "https://github.com/kawu/monad-codec"; description = "Monadic conversion between complex data structures and unique integers"; @@ -122831,7 +131169,7 @@ self: { mkDerivation { pname = "monad-connect"; version = "0.1"; - sha256 = "21af008856fea5e10584152f4a3ac1e01cd50fe899e553fb3d3efb4f656c65f1"; + sha256 = "1wb5dijlzyry7pxm7rcrx07xa770q4x4lbqmhh2y39gyas401br1"; libraryHaskellDepends = [ base bytestring connection exceptions transformers ]; @@ -122846,8 +131184,8 @@ self: { }: mkDerivation { pname = "monad-control"; - version = "1.0.1.0"; - sha256 = "d4b0209c6cb7006fac618e4d8e3743d908f8b21579d6ff72e9f6e758e24301f4"; + version = "1.0.2.1"; + sha256 = "1hjq0d1y18yyw3p4g78r7k88xy92pzxiqchqll7rqj8lnwnwnknc"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -122856,6 +131194,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-control-aligned" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control-aligned"; + version = "0.0.1"; + sha256 = "11s226d80dbzq7as6ik077hg82swfj2svlk662l32sc9y03m3dyx"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/athanclark/monad-control#readme"; + description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-coroutine" = callPackage ({ mkDerivation, base, monad-parallel, transformers , transformers-compat @@ -122863,7 +131217,7 @@ self: { mkDerivation { pname = "monad-coroutine"; version = "0.9.0.3"; - sha256 = "08aafe8499ef2311a238197b67ec74e5faa8c887a0e24592e38fde37ab64c9e4"; + sha256 = "1r69cjmkgplgwf94bqm0hz4aiyp5fkn6fyqr72i128zgk62gxah8"; libraryHaskellDepends = [ base monad-parallel transformers transformers-compat ]; @@ -122878,8 +131232,8 @@ self: { }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.0.0"; - sha256 = "2810e69b6f90dd55b63f476caa54cc4dbf4f1d1ac4b0dffea57c2398ba7cfc31"; + 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"; @@ -122894,7 +131248,7 @@ self: { mkDerivation { pname = "monad-exception"; version = "0.1"; - sha256 = "084efc952e9479fc7a3ffb48e58b35d3b61a5b6d52ee8140db9356137b4d01d6"; + sha256 = "1mh19mxi6mlkvd083vjjdmdimdnk6n5yaj7v7xxgqycl5sazqkh8"; libraryHaskellDepends = [ base monad-control mtl-evil-instances transformers transformers-base @@ -122911,7 +131265,7 @@ self: { mkDerivation { pname = "monad-extras"; version = "0.6.0"; - sha256 = "df33d7c51a97d16226b8160d9bc09686cb6f7b7bf5c54557381c6fe4a3c84f2c"; + sha256 = "0b2gr2iy8vqw71blbigmgdxnzjw6jv09n38np0k65lcp3b2xfcyz"; libraryHaskellDepends = [ base mmorph monad-control stm transformers transformers-base ]; @@ -122925,7 +131279,7 @@ self: { mkDerivation { pname = "monad-fork"; version = "0.1"; - sha256 = "8cdfc6c868b5599d12cc238a5def812bc084414d50ea485c747d304ff056bc97"; + sha256 = "15xwavq4yc3xfif4isjh9m0q9h1bh7pmv2i3rh99sndmd34cdpwc"; libraryHaskellDepends = [ base monad-control ]; description = "Type class for monads which support a fork operation"; license = stdenv.lib.licenses.publicDomain; @@ -122937,7 +131291,7 @@ self: { mkDerivation { pname = "monad-gen"; version = "0.3.0.1"; - sha256 = "be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"; + sha256 = "0rc4r6sg29sjgh9xsk7q80h0lixhyxs60bszj5dnn8yf7w18b15y"; libraryHaskellDepends = [ base mtl transformers ]; description = "A simple monad for generating fresh integers"; license = stdenv.lib.licenses.mit; @@ -122950,7 +131304,7 @@ self: { mkDerivation { pname = "monad-hash"; version = "0.1.0.2"; - sha256 = "aabf8c3c99e1e7283ce6cc42108336c00fd0c7dd9e27d6b1b615f3ef8f8b2d30"; + sha256 = "0c1dif7yzwqmnsqxc9wyvp3x03y06s1i0hncwqy2irz1k4y8rgxa"; libraryHaskellDepends = [ base cryptonite exceptions memory transformers ]; @@ -122969,9 +131323,9 @@ self: { mkDerivation { pname = "monad-http"; version = "0.1.0.0"; - sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192"; + sha256 = "14ki66l60la1mmm544vvzn930liaygj6zrql10nr192shf3v0cx3"; revision = "4"; - editedCabalFile = "14c2dd1a2de592a520efe1b743d98b6ecdaf71cd56fde036628f8c8f759fbf03"; + editedCabalFile = "00xzkxsqz34gc8vf1zanrmqszkbfigcl7dz1xwhab4p55lddvhhl"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -122987,7 +131341,7 @@ self: { mkDerivation { pname = "monad-interleave"; version = "0.1"; - sha256 = "e7ba24f3f9ca37c57f49d4c879fae544069b4468264dda49cf7ac702d5a11726"; + sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/patperry/monad-interleave"; description = "Monads with an unsaveInterleaveIO-like operation"; @@ -123002,7 +131356,7 @@ self: { mkDerivation { pname = "monad-journal"; version = "0.7.2"; - sha256 = "72b1a676bd994198544c4861a05b1d1b4f7ae55ea35a837cace539b8d6c69d08"; + sha256 = "024xqvbbhfg5miy86nm3bvjplkqv3mds0qa89ia9hhcrpmvadcbj"; libraryHaskellDepends = [ base either monad-control mtl transformers transformers-base ]; @@ -123018,7 +131372,7 @@ self: { mkDerivation { pname = "monad-levels"; version = "0.1.0.1"; - sha256 = "5651701e394dd9b00e3e05007cb9451fe6cf58b7890935d2f7081d46a00871ec"; + sha256 = "1v3i12h4c788yz93a2c9nxcczrhz8nwpq0057q7b1nad74g70lan"; libraryHaskellDepends = [ base constraints transformers transformers-compat ]; @@ -123035,7 +131389,7 @@ self: { mkDerivation { pname = "monad-lgbt"; version = "0.0.2"; - sha256 = "94ea581538e9167b1498f704a35c37f8481df63a6bdb2aa4028d2facb413abf8"; + sha256 = "1y5b2fsaqbwd0aj2mnvb7bv1sj7q6xfa617pk0a7n5p970amisll"; libraryHaskellDepends = [ base containers deepseq hspec logict mtl QuickCheck ]; @@ -123056,7 +131410,7 @@ self: { mkDerivation { pname = "monad-log"; version = "0.1.1.0"; - sha256 = "34000c62083e4b32c59a8a7a731608a573ce3fec97a4cf34d16cf77c2e7e8bc1"; + sha256 = "1hcbgqp7rxvcs4scz94pxhzwwwx510b76ylakb2k4jry11i0q01l"; libraryHaskellDepends = [ aeson base bytestring exceptions fast-logger lifted-base monad-control template-haskell text text-show transformers @@ -123075,8 +131429,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.20.2"; - sha256 = "1f004999b282b3895cc0904053befb48b863efc2899a89e93195b4544cc9c737"; + version = "0.3.24"; + sha256 = "1r786v5ndnkfdy9v6h26wsbphjc2ar3zcsxz3ij9sxk860cpkr85"; libraryHaskellDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm @@ -123094,7 +131448,7 @@ self: { mkDerivation { pname = "monad-logger-json"; version = "0.1.0.0"; - sha256 = "10871c4aef838c01c8fdd7586161367b4d66907a53cbd9737efb717a1041e9aa"; + sha256 = "1ap98487lwgvgrrxkjskga86ckbv6rhn2n6pzp403343xx51r1qh"; libraryHaskellDepends = [ aeson base monad-logger template-haskell text ]; @@ -123111,7 +131465,7 @@ self: { mkDerivation { pname = "monad-logger-prefix"; version = "0.1.6"; - sha256 = "fb7697098223b64ab42e7739eba16eacf80d8eb8a577a5a4dcca9bcec5e94d92"; + sha256 = "14jdx72wx6yavjjaaxx5p270vy5cdshynfbp5ss4mdi3h84rfxpv"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text transformers transformers-base @@ -123129,8 +131483,8 @@ self: { }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.3.0"; - sha256 = "b35098f5d3a7ea9bcdda886a60b19c404618f36410011d7beaef07ee353383e3"; + version = "0.1.4.0"; + sha256 = "1jwwpjn35mvl7z05xcykpxdyhaa6mgiighgcr8qzprrmw89kwb05"; libraryHaskellDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; @@ -123144,7 +131498,7 @@ self: { mkDerivation { pname = "monad-loops"; version = "0.4.3"; - sha256 = "7eaaaf6bc43661e9e86e310ff8c56fbea16eb6bf13c31a2e28103138ac164c18"; + sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "https://github.com/mokus0/monad-loops"; @@ -123157,7 +131511,7 @@ self: { mkDerivation { pname = "monad-loops-stm"; version = "0.4"; - sha256 = "5a9d5c9a70eb8a0957bc8ad98b1386ddeaa7682debee3d2a7fefe8906f17f278"; + sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/mokus0/monad-loops-stm"; description = "Monadic loops for STM"; @@ -123171,9 +131525,9 @@ self: { mkDerivation { pname = "monad-lrs"; version = "0.0.2.1"; - sha256 = "8f557940e9c17085e282936d687ab8232f93e932896a9547468e8e0cca872806"; + sha256 = "01i8hz50r3lf8r3rasl96blr6br3p1x6hvckhbi8aw61x507jmcg"; revision = "1"; - editedCabalFile = "dd714797826911e564a0e418307530fa99a8ba9ea91400517be2bb78b4e695c1"; + editedCabalFile = "1hcmwss7ifz2gd8h0559ksxai6gs61sk0674l1jfa4b9hablfwfx"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -123193,7 +131547,7 @@ self: { mkDerivation { pname = "monad-memo"; version = "0.4.1"; - sha256 = "4c00c4aff00c85bfcce0a9a7d96a2a7d08f1efe64b3326e67e47499d5168f11d"; + sha256 = "07gid18rsja7gvk2ccsbwvpz223x59mdk9x9w36bz18cy2pw802c"; libraryHaskellDepends = [ array base containers mtl primitive transformers vector ]; @@ -123215,7 +131569,7 @@ self: { mkDerivation { pname = "monad-mersenne-random"; version = "0.1"; - sha256 = "065373647071e2149019d8f845b516664de44fb8644a90ec77ff5ab2dfc26b0e"; + sha256 = "03kbqbgv4npzfzn90jk4p17y8kb62sslby6q36819qkif1j76lq6"; libraryHaskellDepends = [ base mersenne-random-pure64 ]; homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random"; description = "An efficient random generator monad, based on the Mersenne Twister"; @@ -123230,7 +131584,7 @@ self: { mkDerivation { pname = "monad-metrics"; version = "0.1.0.2"; - sha256 = "a64e5f3aebe020c0f38892874f74b2b94ad84b319cee2e7ec092c5b2bd842276"; + sha256 = "0xi2hjyv5icjq1z2xvlw655xhjmrn9s4z1wji3rw0870xcx5ykm6"; libraryHaskellDepends = [ base clock containers ekg-core microlens mtl text transformers ]; @@ -123240,12 +131594,31 @@ 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 { pname = "monad-open"; version = "0.1.0.0"; - sha256 = "7d0b1777eed3cb67c7ac7ad65b8ca7e80394a7820a13d845e6d6b9b5db2702a2"; + sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx"; libraryHaskellDepends = [ base exceptions mtl transformers ]; description = "Open recursion for when you need it"; license = stdenv.lib.licenses.mit; @@ -123257,7 +131630,7 @@ self: { mkDerivation { pname = "monad-ox"; version = "0.3.0"; - sha256 = "88f2eb3abbf982d73eb9ca66ce2fa96a20fa9df61be926bc49429980e096c5f4"; + sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8"; libraryHaskellDepends = [ base containers mtl text vector ]; homepage = "https://github.com/kawu/monad-ox"; description = "Monad for observation extraction"; @@ -123273,7 +131646,7 @@ self: { mkDerivation { pname = "monad-par"; version = "0.3.4.8"; - sha256 = "f84cdf51908a1c41c3f672be9520a8fdc028ea39d90a25ecfe5a3b223cfeb951"; + sha256 = "0ldrzqy24fsszvn2a2nr77m2ih7xm0h9bgkjyv1l274aj18xyk7q"; libraryHaskellDepends = [ abstract-deque abstract-par array base containers deepseq monad-par-extras mtl mwc-random parallel @@ -123296,7 +131669,7 @@ self: { mkDerivation { pname = "monad-par-extras"; version = "0.3.3"; - sha256 = "e21e33190bc248afa4ae467287ac37d24037ef3de6050c44fd85b52f4d5b842e"; + sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2"; libraryHaskellDepends = [ abstract-par base cereal deepseq mtl random transformers ]; @@ -123311,7 +131684,7 @@ self: { mkDerivation { pname = "monad-parallel"; version = "0.7.2.2"; - sha256 = "60bd1aed8ece1cc1e309d87e1722c6d489173dfe24eae95091ef5d9ce610efb3"; + sha256 = "1czg23k9qpggj58fksi4zqyig2flqqi1fznq17iw276fivnimgb0"; libraryHaskellDepends = [ base parallel transformers transformers-compat ]; @@ -123327,7 +131700,7 @@ self: { mkDerivation { pname = "monad-parallel-progressbar"; version = "0.1.0.1"; - sha256 = "04cd5a99fdb3dd46f5ee98de607a04e549905ea18cdce78be7d4e9eda91211df"; + sha256 = "1pqi2alyvsflwy5ygp4cl5g90jg50ix61plqxvsldpdkzncmmk84"; libraryHaskellDepends = [ base monad-parallel monadIO terminal-progress-bar ]; @@ -123342,7 +131715,7 @@ self: { mkDerivation { pname = "monad-param"; version = "0.0.4"; - sha256 = "0cce76237aeb979b20341b2b59fa825f037735d6593a1503c457513605483523"; + sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc"; libraryHaskellDepends = [ base mtl stm ]; homepage = "http://hackage.haskell.org/package/monad-param"; description = "Parameterized monads"; @@ -123355,8 +131728,8 @@ self: { }: mkDerivation { pname = "monad-peel"; - version = "0.2.1.1"; - sha256 = "f591f54910a117bba2fc963d5502de668ece69181b605cf9db353fbcfa9fe394"; + version = "0.2.1.2"; + sha256 = "1x1kr5pk8ksw8xcm19c50jx8m0crf3m3qp73k31dnl9r1w4ykm9d"; libraryHaskellDepends = [ base extensible-exceptions transformers ]; @@ -123369,25 +131742,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-peel_0_2_1_2" = callPackage - ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework - , test-framework-hunit, transformers + "monad-persist" = callPackage + ({ mkDerivation, base, exceptions, hspec, monad-control + , monad-logger, mtl, persistent, persistent-sqlite + , persistent-template, text, transformers-base }: mkDerivation { - pname = "monad-peel"; - version = "0.2.1.2"; - sha256 = "2dd5e9090f3951dbc298e35c3cea7099818aba0485a55059475c4f346fc933f4"; + pname = "monad-persist"; + version = "0.0.1.2"; + sha256 = "1k6vfn2a120jxsgscajz9k91ns8spcan555gdyrj4jyrg8fzkbcd"; libraryHaskellDepends = [ - base extensible-exceptions transformers + base exceptions monad-control monad-logger mtl persistent text + transformers-base ]; testHaskellDepends = [ - base extensible-exceptions HUnit test-framework - test-framework-hunit transformers + base hspec monad-control monad-logger persistent persistent-sqlite + persistent-template text ]; - homepage = "http://andersk.mit.edu/haskell/monad-peel/"; - description = "Lift control operations like exception catching through monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + description = "An mtl-style typeclass and transformer for persistent"; + license = stdenv.lib.licenses.isc; }) {}; "monad-primitive" = callPackage @@ -123395,7 +131768,7 @@ self: { mkDerivation { pname = "monad-primitive"; version = "0.1"; - sha256 = "3dc032536e87ca77d9e802d581f036ebbf2e29064fb98a0ede05fb068b7926ee"; + sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x"; libraryHaskellDepends = [ base primitive transformers ]; homepage = "http://bitbucket.org/Shimuuar/monad-primitive"; description = "Type class for monad transformers stack with pirimitive base monad"; @@ -123407,7 +131780,7 @@ self: { mkDerivation { pname = "monad-products"; version = "4.0.1"; - sha256 = "02bfe1db2ae1a5cff19f73736a219605b1f0649f6af44ca848d09160a7946cea"; + sha256 = "1skcjjkn14fh92l4rx3akxjg1c85jqhnlwvkkzqwz9g15bdy3gq2"; libraryHaskellDepends = [ base semigroupoids ]; homepage = "http://github.com/ekmett/monad-products"; description = "Monad products"; @@ -123419,7 +131792,7 @@ self: { mkDerivation { pname = "monad-ran"; version = "0.1.0"; - sha256 = "5d51cc345f244414f48803f4a34d425b50e380efc26090e1444e7c4896d0c913"; + sha256 = "04y9s2b4hz2f8khr0q62xy0f6l2v896s7x03i3s18i14bwscqlax"; libraryHaskellDepends = [ base ghc-prim mtl ]; description = "Fast monads and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -123431,7 +131804,7 @@ self: { mkDerivation { pname = "monad-resumption"; version = "0.1.2.0"; - sha256 = "79b678b13259b679438f3f7befb3ef5294dfee7bbda922326db852b9172bdf27"; + sha256 = "09yz5cbvjlmqdlr25adxggpdz52jxyryyyrzix1pkdjr6aqpidkr"; libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/igraves/resumption_monads"; description = "Resumption and reactive resumption monads for Haskell"; @@ -123440,36 +131813,23 @@ self: { }) {}; "monad-skeleton" = callPackage - ({ mkDerivation, base, containers, ghc-prim }: - mkDerivation { - pname = "monad-skeleton"; - version = "0.1.2.2"; - sha256 = "b1cc4f0b9e308374c76902942b8381e0af869b0915735d380f792bb11e362de3"; - libraryHaskellDepends = [ base containers ghc-prim ]; - homepage = "https://github.com/fumieval/monad-skeleton"; - description = "An undead monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-skeleton_0_1_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "monad-skeleton"; - version = "0.1.3"; - sha256 = "4de3aee29408f98fe0f3dc6161d98e13a5292a67b23cb80e7f1875eead7d8a40"; + version = "0.1.3.2"; + sha256 = "1cc1rd2p15klff0r0ialbd46n3ny547as9fghh3fy3ag2ahz0r15"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/fumieval/monad-skeleton"; description = "Monads of program skeleta"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-st" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "monad-st"; - version = "0.2.4"; - sha256 = "718d5ae878306e0527e3b6ce32d5ad59fd83432b90012a594059d3720fd0c7c8"; + version = "0.2.4.1"; + sha256 = "025zi9xzliwgyasq5hrfxwzg4ksj3kj0ys2kp62fi1n4ddbih64f"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/ekmett/monad-st"; description = "Provides a MonadST class"; @@ -123484,7 +131844,7 @@ self: { mkDerivation { pname = "monad-state"; version = "0.2.0.3"; - sha256 = "bbe3dee445b41b1ad0e66a0ca0a0ff01f5f40487007f3279412ba7610f6f01b6"; + sha256 = "1dh1dw7n39rb85wk4zq0hw2g9x81zyha033awv81l6xl8pjdxqxv"; libraryHaskellDepends = [ AbortT-transformers base fclabels monads-tf transformers ]; @@ -123499,7 +131859,7 @@ self: { mkDerivation { pname = "monad-statevar"; version = "0.1"; - sha256 = "dd857c551f02f2fb38238e987efd1a9797e4f46538b25094c46e0a9071125923"; + sha256 = "08sr29qr02kfqja51ciqcpsf95wp3bypx64f4cwgpwh23xapr1fx"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base stm ]; homepage = "http://github.com/joeyadams/hs-monad-statevar"; @@ -123515,7 +131875,7 @@ self: { mkDerivation { pname = "monad-ste"; version = "0.1.0.0"; - sha256 = "86677d1b349d2ec5ab8a499c440089de21d86df181acea233fbaba4cf3e9137b"; + sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6"; libraryHaskellDepends = [ base exceptions ghc-prim primitive ]; testHaskellDepends = [ base hspec HUnit ]; homepage = "http://github.com/cartazio/monad-ste"; @@ -123530,7 +131890,7 @@ self: { mkDerivation { pname = "monad-stlike-io"; version = "0.2.2"; - sha256 = "a529d285ecf039a9c88b22f84649445f231a92658e116270070aa21686e33fd2"; + sha256 = "1lizwf31d8ha0xq644cfcn91l8sz8i4ldy12ig4ajfghxj2x4ad5"; libraryHaskellDepends = [ base bytestring containers deepseq monads-tf ]; @@ -123545,7 +131905,7 @@ self: { mkDerivation { pname = "monad-stlike-stm"; version = "0.1.1"; - sha256 = "a6f0d4b4b3c628b4c23287553c4cffb19730d1060bbf1a63ed0837d013d6f900"; + sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56"; libraryHaskellDepends = [ base monad-stlike-io stm ]; homepage = "http://github.com/taruti/monad-stlike-stm"; description = "ST-like monad capturing variables to regions and supporting STM"; @@ -123558,7 +131918,7 @@ self: { mkDerivation { pname = "monad-stm"; version = "0.1.0.2"; - sha256 = "b7a71a1cc50a04a461768e03b9813e2c708876d67d6fdb864422bd9fe4826b25"; + sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp"; libraryHaskellDepends = [ base stm transformers ]; description = "MonadSTM class analogous to MonadIO"; license = stdenv.lib.licenses.bsd3; @@ -123569,7 +131929,7 @@ self: { mkDerivation { pname = "monad-supply"; version = "0.6"; - sha256 = "398e01431c3bf7f7202465e3a3d7ed26e0316b00e35ff429504e60c5ddc9e4bd"; + sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir"; libraryHaskellDepends = [ base mtl ]; description = "Stateful supply monad"; license = "unknown"; @@ -123580,7 +131940,7 @@ self: { mkDerivation { pname = "monad-task"; version = "0.1.0"; - sha256 = "287a355aa82cbbfe971984a2d3c1b1f28b0a9f773cb6eba6493c51a72be68307"; + sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://github.com/ninegua/monad-task"; description = "A monad transformer that turns event processing into co-routine programming"; @@ -123593,9 +131953,9 @@ self: { mkDerivation { pname = "monad-time"; version = "0.2"; - sha256 = "a9b901ca94b4c71d5f374a472506db92d26b13af523ceafe1e3302e8bae8b05d"; + sha256 = "0pdhx2xfh0ik3vzflg2jmw9nplljvc32aisa6xgivixljk503fd9"; revision = "1"; - editedCabalFile = "a3a67f4b7fd08b82054dcf1d0cda06afcafa60644ea837ac8135a1c2cbe1a9ec"; + editedCabalFile = "1v59w75w589mh6n3ga2fcihgmjmg0vd0q7fg9l2q52yhgx5pz9m3"; libraryHaskellDepends = [ base mtl time ]; testHaskellDepends = [ base mtl time ]; homepage = "https://github.com/scrive/monad-time"; @@ -123610,7 +131970,7 @@ self: { mkDerivation { pname = "monad-timing"; version = "0.1.0.1"; - sha256 = "d6f05adb7975fd0c4e2ceca4bbc77cfa65ddbf60d60f343203ff68a7f3f4bd09"; + sha256 = "02dxykrsfs7z0cr383ync2zxsrgsgk3vp97c5i70rzbmg7dmmw6n"; libraryHaskellDepends = [ base containers exceptions monad-control mtl time transformers transformers-base @@ -123626,7 +131986,7 @@ self: { mkDerivation { pname = "monad-tx"; version = "0.0.1"; - sha256 = "6936efc75c6bc8a4973fed15595c8f5741d606059164080581778dba2abb634b"; + sha256 = "0jv3pcmbm3bph42hhr4i0l3dchapixf5j5gd7ybs9j3bbk3yydk9"; libraryHaskellDepends = [ base ]; description = "A transactional state monad"; license = stdenv.lib.licenses.bsd3; @@ -123638,9 +131998,9 @@ self: { mkDerivation { pname = "monad-unify"; version = "0.2.2"; - sha256 = "97bfdadd6c3f427dc5d310c7af4eef6221b7e5269b9b5acea2846da2942494c5"; + sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp"; revision = "1"; - editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2"; + editedCabalFile = "1qkccw4xd4i112d6mkw8dgsnwfrnqcg1shk9s5cwyn55pwlmnn3x"; libraryHaskellDepends = [ base mtl unordered-containers ]; description = "Generic first-order unification"; license = stdenv.lib.licenses.mit; @@ -123654,7 +132014,7 @@ self: { mkDerivation { pname = "monad-unlift"; version = "0.2.0"; - sha256 = "4b5e638619e4821918b4ec67aeffb581ab9df23d168fbb72164137009a15ee0f"; + sha256 = "03zf2nd00ds12rrbp3qn7pr9vaw1npzswrzcnhc1k0p436366pjb"; libraryHaskellDepends = [ base constraints monad-control transformers transformers-base ]; @@ -123671,7 +132031,7 @@ self: { mkDerivation { pname = "monad-unlift-ref"; version = "0.2.0"; - sha256 = "a97acc3384dcde65109400d77fa0cd58617c77708204d7d825b6591a65444ce1"; + sha256 = "1qac8ijilndn4pcdf142f1vpqqaqrnh7zmq0jh86bpnwhhrwqym9"; libraryHaskellDepends = [ base constraints exceptions monad-control monad-unlift mtl mutable-containers resourcet stm transformers transformers-base @@ -123686,7 +132046,7 @@ self: { mkDerivation { pname = "monad-wrap"; version = "0.1"; - sha256 = "6e048bc3e6ae49c2b3a65282c1c6c322e080f4b05c7ca08ddb4de7c5c07bb1c2"; + sha256 = "1hmigg0cbrsdvf6s0z2wn3s81q12qg3c30jjlsrw4jdfwv1qn13f"; libraryHaskellDepends = [ base transformers ]; description = "Wrap functions such as catch around different monads"; license = stdenv.lib.licenses.bsd3; @@ -123697,7 +132057,7 @@ self: { mkDerivation { pname = "monadIO"; version = "0.10.1.4"; - sha256 = "342b67effad053d1216a07d20289e0104a6d0ada7ff66f979dc9407492442520"; + sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl"; libraryHaskellDepends = [ base mtl stm ]; description = "Overloading of concurrency variables"; license = stdenv.lib.licenses.bsd3; @@ -123708,7 +132068,7 @@ self: { mkDerivation { pname = "monadLib"; version = "3.7.3"; - sha256 = "1834a77560d9df7ab0bc43ce24c77ffc660fc84573730ea94cb6e4ab8dcca99e"; + sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q"; libraryHaskellDepends = [ base ]; homepage = "http://wiki.github.com/yav/monadlib"; description = "A collection of monad transformers"; @@ -123720,7 +132080,7 @@ self: { mkDerivation { pname = "monadLib-compose"; version = "0.2"; - sha256 = "c16ffae593e47f185b73369fe96c4728974fafd59eae59dfc52401bf58837e91"; + sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1"; libraryHaskellDepends = [ base monadLib ]; homepage = "http://github.com/aristidb/monadLib-compose"; description = "Arrow-like monad composition for monadLib"; @@ -123733,7 +132093,7 @@ self: { mkDerivation { pname = "monadacme"; version = "0.0.2"; - sha256 = "27799390bb992349fd821aa7388e47bd4e3bf5aa0203b77e725374f5c63455e1"; + sha256 = "1qam6k3gax2kf9zbf0q2mbsknkmx8y73i9qshbylj8wrpf896y97"; libraryHaskellDepends = [ base ]; description = "The Acme and AcmeT monads"; license = stdenv.lib.licenses.bsd3; @@ -123745,7 +132105,7 @@ self: { mkDerivation { pname = "monadbi"; version = "0.1"; - sha256 = "07bbb8bf47946c76fc69533a1a87194de720d384358b4e18dd902a4b8692b064"; + sha256 = "0r5hja34nalhvlc4x2rmhk9j1rsd363ilfjkd7y7cv4l8yzvifq7"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/ajnsit/monadbi"; description = "Extract underlying monads from monad transformers"; @@ -123759,7 +132119,7 @@ self: { mkDerivation { pname = "monadcryptorandom"; version = "0.7.1"; - sha256 = "85c37875743cd2357fba28d0bde3b06cd90f4f2d9770b8e0221e15258ac6b9e7"; + sha256 = "1rxrqs52a58y4bhbhw4p5m7hznbcn3ivvl18p9zkbliwfispihw5"; libraryHaskellDepends = [ base bytestring crypto-api exceptions mtl tagged transformers transformers-compat @@ -123774,7 +132134,7 @@ self: { mkDerivation { pname = "monadfibre"; version = "0.1.2.1"; - sha256 = "46b7914f21c85b5c8313a60bc29a110e30438dd2224c4afe1d204de0cb23486e"; + sha256 = "0vj84g5y0k903pz4lk12sa6l6c0f26dc42x62f1mqny8457r3ds6"; libraryHaskellDepends = [ base monadbi ]; homepage = "https://github.com/ajnsit/monadfibre"; description = "Monadic functions which provide Choice and Parallelism"; @@ -123788,7 +132148,7 @@ self: { mkDerivation { pname = "monadic-arrays"; version = "0.2.2"; - sha256 = "667714c6100272b48c4377cf2e2984b67a4445521a2a2e9c37539128c7e276a0"; + sha256 = "183nwb3ji4ak6yf2wahsa92l8ymnhhljxkvp8f6b8wh223318xv6"; libraryHaskellDepends = [ array base stm transformers transformers-compat ]; @@ -123802,7 +132162,7 @@ self: { mkDerivation { pname = "monadiccp"; version = "0.7.6"; - sha256 = "ac53f2d24ac25476f9514a8c1fdf3092aad7b9d3cf36bb7cc90531354abe7720"; + sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc"; libraryHaskellDepends = [ base containers mtl parsec pretty random ]; @@ -123819,7 +132179,7 @@ self: { mkDerivation { pname = "monadiccp-gecode"; version = "0.1.2"; - sha256 = "e0f1c060a0670f51c1219b9d7661b64169d03cfd2e04857086f38cc5e8fc9efa"; + sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0"; libraryHaskellDepends = [ base containers monadiccp mtl ]; librarySystemDepends = [ gecodeint gecodekernel gecodesearch gecodeset gecodesupport @@ -123836,7 +132196,7 @@ self: { mkDerivation { pname = "monadio-unwrappable"; version = "0.3"; - sha256 = "b0fb82eefcfe3261baccf50380b7ea536b8fd0d227ac1014658e26d937890ba2"; + sha256 = "18hbi4vxj9lfcla11b17sb88ysskxavq00zmrjx62cpyzkp85yxh"; libraryHaskellDepends = [ base monads-tf transformers ]; description = "Reversibly allow monad transformer stacks to run in IO"; license = stdenv.lib.licenses.bsd3; @@ -123847,7 +132207,7 @@ self: { mkDerivation { pname = "monadlist"; version = "0.0.2"; - sha256 = "06bbe82c9fc2a35048788367da74bb5f79c7e6be2ae38eca20f332f8cbc5fdfe"; + sha256 = "1zpxqp5zhcpk4358xqrapvkcfyazpdsdlrw3g14518y2kwnfifq6"; libraryHaskellDepends = [ base ]; description = "Monadic versions of list functions"; license = stdenv.lib.licenses.bsd3; @@ -123858,7 +132218,7 @@ self: { mkDerivation { pname = "monadloc"; version = "0.7.1"; - sha256 = "b25a0f6b3ebb051e58e2a58f2f5d588ff67622584cb575d40c46eaacbd1de7a8"; + sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj"; libraryHaskellDepends = [ base template-haskell transformers ]; homepage = "http://github.com/pepeiborra/monadloc"; description = "A class for monads which can keep a monadic call trace"; @@ -123872,7 +132232,7 @@ self: { mkDerivation { pname = "monadloc-pp"; version = "0.3.1"; - sha256 = "ec56d05f9ee3b66d3908e90f0d90800e0a242a5c5856d3b88db00ff3d92c0232"; + sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -123889,7 +132249,7 @@ self: { mkDerivation { pname = "monadoid"; version = "0.0.2"; - sha256 = "26c2e9fb0456dbec761c6d9723ad33cbb9fcd3a1318ff4197859d766e14ec877"; + sha256 = "0xy89vhndmsrg0cz93ril79zrffb6fnj75vd3ivfrnsn0kxykhi6"; libraryHaskellDepends = [ base monad-control mtl transformers-base ]; @@ -123902,7 +132262,7 @@ self: { mkDerivation { pname = "monadplus"; version = "1.4.2"; - sha256 = "366ed520db1eaf2ec56d8508fee2804cc24c7a6016de4b75b9addec681186595"; + sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; license = stdenv.lib.licenses.bsd3; @@ -123913,7 +132273,7 @@ self: { mkDerivation { pname = "monads-fd"; version = "0.2.0.0"; - sha256 = "8c74b3fdd916187655b9c9feec99b44592c2b2161ff3e6f7ad5d17b5c72d19c7"; + sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c"; libraryHaskellDepends = [ base mtl transformers ]; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; @@ -123925,7 +132285,7 @@ self: { mkDerivation { pname = "monads-tf"; version = "0.1.0.3"; - sha256 = "249dd2aa55c4dd6530f1e49f6b052ec91bc590ecfef2bd24c58837a3f8d4b0f1"; + sha256 = "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794"; libraryHaskellDepends = [ base transformers ]; description = "Monad classes, using type families"; license = stdenv.lib.licenses.bsd3; @@ -123936,7 +132296,7 @@ self: { mkDerivation { pname = "monadtransform"; version = "0.0.2"; - sha256 = "db87a9feaef9874e338f49e6180e0bdf1f8215904774c16775f21061e037a844"; + sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/tonymorris/monadtransform"; description = "A type-class for transforming monads (homomorphism) in a transformer"; @@ -123951,7 +132311,7 @@ self: { mkDerivation { pname = "monarch"; version = "0.10.0.0"; - sha256 = "3bea109f2e3d4d3481f3f6807ea5898707fcd6c81965adc91c35535a298487a8"; + sha256 = "1a47hhlmllrm3k4ssr8rr3bgq1w7i6jpx07nyf0k8k9x5sgi1siv"; libraryHaskellDepends = [ base binary bytestring containers lifted-base monad-control mtl network pool-conduit stm transformers transformers-base @@ -123972,7 +132332,7 @@ self: { mkDerivation { pname = "mondo"; version = "0.3.0.0"; - sha256 = "e66cdefd358c5376b488c2c1aba86d39e77ead5e9e5b739374c2e504e409073b"; + sha256 = "0fq717j09rf2fj9p6nwybsnpxrrrdnlaphf2i2s7clwc6pyxwv76"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring containers http-client http-client-tls mtl servant servant-client text time timerep @@ -123992,7 +132352,7 @@ self: { mkDerivation { pname = "monetdb-mapi"; version = "0.1.0.0"; - sha256 = "b9e2b238b7442757e849fa61016251c42fc52d8950cc56fd3f008bbe7f02e76c"; + sha256 = "0v7709zvx2q07zymdk2hi4nwaby4a5i02qgs97l5f9s4nwwb5qmr"; libraryHaskellDepends = [ base bindings-monetdb-mapi ]; description = "Mid-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; @@ -124004,7 +132364,7 @@ self: { mkDerivation { pname = "money"; version = "0.1.0"; - sha256 = "b3d078e6bf2201dfe7d524776fb7c3cee47b4f4d06d493c6f9bb9d3fb2407f9c"; + sha256 = "173z82r3z7dvz7397m069m7ppr6fqfvnyxr4spkxy092pzk7il5k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/jpvillaisaza/money"; @@ -124023,7 +132383,7 @@ self: { mkDerivation { pname = "mongoDB"; version = "2.1.1.1"; - sha256 = "e4bf850327da71db1b91441445b1d7585bd276a435cfdf60d622eacf14039c57"; + sha256 = "0mww0caczsi2srhdzkrmlivd4nsqsyqla524j4dxnwfs4w1qbgz4"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring containers cryptohash data-default-class hashtables @@ -124043,6 +132403,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mongoDB_2_3_0" = callPackage + ({ mkDerivation, array, base, base16-bytestring, base64-bytestring + , binary, bson, bytestring, conduit, conduit-extra, containers + , criterion, cryptohash, data-default-class, hashtables, hspec + , lifted-base, monad-control, mtl, network, nonce, old-locale + , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text + , time, tls, transformers, transformers-base + }: + mkDerivation { + pname = "mongoDB"; + version = "2.3.0"; + sha256 = "024w6183nnaq30r9jnfiy5pjv422mnnkawqdgzgzafngi7sad322"; + libraryHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring conduit conduit-extra containers cryptohash + data-default-class hashtables lifted-base monad-control mtl network + nonce parsec pureMD5 random random-shuffle resourcet tagged text + time tls transformers transformers-base + ]; + testHaskellDepends = [ base hspec mtl old-locale text time ]; + benchmarkHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring containers criterion cryptohash hashtables lifted-base + monad-control mtl network nonce parsec random random-shuffle text + transformers-base + ]; + homepage = "https://github.com/mongodb-haskell/mongodb"; + description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mongodb-queue" = callPackage ({ mkDerivation, base, data-default, hspec, lifted-base , monad-control, mongoDB, network, text, transformers @@ -124050,7 +132442,7 @@ self: { mkDerivation { pname = "mongodb-queue"; version = "0.4.0.1"; - sha256 = "5a884889ffbc3a5e2c7ac45719f64664685a1b6057450347542595e39a2f6cf8"; + sha256 = "1y3c5ydf7595ai3h6iapc0dmls348vv1jmy4g8n5wfmwzy4li22s"; libraryHaskellDepends = [ base data-default lifted-base monad-control mongoDB network text transformers @@ -124073,7 +132465,7 @@ self: { mkDerivation { pname = "mongrel2-handler"; version = "0.3.2"; - sha256 = "ae4992edaab6a1283b67cdf2ea7d0c9ae5f2ac1170107ae8c9a0ac0b968869af"; + sha256 = "1bv9i2b0pb50r7l7l43h26ng5rcs1iyymwndcwxji8dnmbnr4jdf"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring case-insensitive containers http-types text zeromq-haskell @@ -124088,7 +132480,7 @@ self: { mkDerivation { pname = "monitor"; version = "0.1.1"; - sha256 = "7a6d7d1ed57f560e6bd5c49988a0525b304f2af9d8a953288384f6e18bece91a"; + sha256 = "06p9xj5y3xl4hcl57afqz4m4yc2vaah8i6f4smmhwmkzslg7svbs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath hinotify process ]; @@ -124099,18 +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.1.3.0"; - sha256 = "a80fee91a2ed4462d2f1688b59cdb13cb0aa0728205ce22592b0b0ad3b72736a"; + 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 = [ @@ -124125,7 +132517,7 @@ self: { mkDerivation { pname = "mono-foldable"; version = "0.1.0.2"; - sha256 = "b5d3def13119b4d1deb456d271876848aef35e6c52b32ea4e79f19d06ee2cbe2"; + sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm"; libraryHaskellDepends = [ base bytestring text vector ]; homepage = "http://github.com/JohnLato/mono-foldable"; description = "Folds for monomorphic containers"; @@ -124134,30 +132526,6 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, foldl - , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split - , text, transformers, unordered-containers, vector - , vector-algorithms - }: - mkDerivation { - pname = "mono-traversable"; - version = "1.0.1.3"; - sha256 = "2861eca0d69c759b02cb7e9669b7a3f8a6b0ede2d96984cba295b69bc9c70a72"; - libraryHaskellDepends = [ - base bytestring containers hashable split text transformers - unordered-containers vector vector-algorithms - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mono-traversable_1_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, foldl , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split , text, transformers, unordered-containers, vector @@ -124166,7 +132534,7 @@ self: { mkDerivation { pname = "mono-traversable"; version = "1.0.2"; - sha256 = "aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633"; + sha256 = "0crn1gd9jnf1j9n3dx9brw6dc4vfsydy0n3qs7hg49mp10ghl4da"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -124179,7 +132547,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-traversable-instances" = callPackage @@ -124190,7 +132557,7 @@ self: { mkDerivation { pname = "mono-traversable-instances"; version = "0.1.0.0"; - sha256 = "b5ff2b8bcebe31ffcc652a8dd3adde6aa7cd7f27a1cf6d058d4c658b370c087e"; + sha256 = "0zh81hvqnracil2nvkx14xzwv9vavsnx739acp6gycdyrs5jpzxm"; libraryHaskellDepends = [ base comonad containers dlist dlist-instances mono-traversable semigroupoids semigroups transformers vector-instances @@ -124205,7 +132572,7 @@ self: { mkDerivation { pname = "mono-traversable-wrapper"; version = "0.1.0.1"; - sha256 = "4d441c3ca20933060c7c60dc83070ecb0059406c3c376680d76e2320390664cb"; + sha256 = "1jv40qwj08vfsy06cdrwdi05j06b1q3q7p30gh60ccq9l8y1qi2d"; libraryHaskellDepends = [ base mono-traversable ]; homepage = "https://github.com/oisdk/mono-traversable-wrapper"; description = "Wrapper providing Foldable instance for MonoFoldables"; @@ -124217,7 +132584,7 @@ self: { mkDerivation { pname = "monoid-absorbing"; version = "0.1.0.4"; - sha256 = "3b7f739fe8cd242d225c427f24b3bd27c8b2a9fccf78d61e58dd0da606a502eb"; + sha256 = "1sq2ll3ac3fxb0gdcy6gzjlv5j17pnrj8zs2bhi2s96dx2gp6zrv"; libraryHaskellDepends = [ base mtl ]; homepage = "http://github.com/maciejpirog/monoid-absorbing"; description = "A library for (left, right) zero monoids and backtracking with cut"; @@ -124230,7 +132597,9 @@ self: { mkDerivation { pname = "monoid-extras"; version = "0.4.2"; - sha256 = "13ff4e055c9656a3e599567cbc4a46ef8617c05534de46909a4239696e34281f"; + sha256 = "07r86ip6jfa2ka84dpilap01g1pg8r5bqz2nk7js6mlnbh2lxzqk"; + revision = "2"; + editedCabalFile = "04h78r48rg2ppi53869vb8y226g135fxgy9ryi1v08nqsiqi1vvw"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; @@ -124242,7 +132611,7 @@ self: { mkDerivation { pname = "monoid-owns"; version = "2010.5.29"; - sha256 = "d351a6aed74e11dd02b9b6b74e63249a6a1aa641a653dbf2b9d258e84b7205d8"; + sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk"; libraryHaskellDepends = [ base bytestring containers ]; homepage = "http://github.com/nfjinjing/monoid-owns"; description = "a practical monoid implementation"; @@ -124255,7 +132624,7 @@ self: { mkDerivation { pname = "monoid-record"; version = "0.1"; - sha256 = "250ac227627b07e111fa260dd07f2a41431bd5c01f4e1bb724fd59e0b60dba93"; + sha256 = "14xs1nvf0ngx4jvinkhzq3ainhs159zx0396z88y21vvc8kw42i5"; libraryHaskellDepends = [ base ]; description = "Support for modifying record fields of monoidal type"; license = stdenv.lib.licenses.bsd3; @@ -124266,7 +132635,7 @@ self: { mkDerivation { pname = "monoid-statistics"; version = "0.3.1"; - sha256 = "c363fb99785aff69b64955edb2c24916b53f1d7a7703c22840259f427a95cd3d"; + sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3"; libraryHaskellDepends = [ base ]; homepage = "https://bitbucket.org/Shimuuar/monoid-statistics"; description = "Monoids for calculation of statistics of sample"; @@ -124279,8 +132648,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.3.1"; - sha256 = "a170d07916b694601a7da2924656e5f8a5ad27afa0e548f4683b154e122783cd"; + version = "0.4.3.2"; + sha256 = "1n13a3nj1hzlbpanl6d1ak3j2vnjy8mb5p5gp7y5hfhrpiymhbgi"; libraryHaskellDepends = [ base bytestring containers primes text vector ]; @@ -124298,7 +132667,7 @@ self: { mkDerivation { pname = "monoid-transformer"; version = "0.0.3"; - sha256 = "94c8661eac0cdd85bbf9a2adc78c3030363ff94f482f5299ba8583b2f7bd06b8"; + sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l"; libraryHaskellDepends = [ base ]; description = "Monoid counterparts to some ubiquitous monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -124311,7 +132680,7 @@ self: { mkDerivation { pname = "monoidal-containers"; version = "0.3.0.1"; - sha256 = "fa2a46695ae71aa24338960f06cd8fc440f295e1854ef9f2c5ffdc3e8b5da49c"; + sha256 = "1754bn5kxp7zqprgjkl5w6az4h64iz6hc3wn711s46p7b9llcaps"; libraryHaskellDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; @@ -124325,7 +132694,7 @@ self: { mkDerivation { pname = "monoidplus"; version = "0.1.0.1"; - sha256 = "490b666011252870a3edcabbb012ad9ccd502cbd3e9f12e4c5f5a7a6c7e68fce"; + sha256 = "1klgwv3sd9zmqpj157rypln51kcwml9b1fyaxnip0a1525h6c2s9"; libraryHaskellDepends = [ base contravariant semigroups transformers ]; @@ -124341,7 +132710,7 @@ self: { mkDerivation { pname = "monoids"; version = "0.3.2"; - sha256 = "8a4d74604249c4bd38bd1c561d036ceeb71dd66a9eafc681a8ad2653002ec17a"; + sha256 = "0yn15q0569mdm20wdbwydbb1vdzfdh1ismhwplwbvi2989h78kca"; libraryHaskellDepends = [ array base bytestring containers fingertree parallel text ]; @@ -124356,7 +132725,7 @@ self: { mkDerivation { pname = "monomorphic"; version = "0.0.3.3"; - sha256 = "96b282a06bcb70097337128a33c4ee210b3d0285ef1044a08a18175dc98bee74"; + sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/konn/monomorphic"; description = "Library to convert polymorphic datatypes to/from its monomorphic represetation"; @@ -124372,7 +132741,7 @@ self: { mkDerivation { pname = "montage"; version = "0.1.1"; - sha256 = "87ea3f424a9f57233161963fd0faeba14e1c55018aaf1bb94cfac9ee9e52a2fb"; + sha256 = "1yx2aagfxjgs9jwipbwa05aiqkm1xgxd0gwnc4qj6mwz9913zsl7"; libraryHaskellDepends = [ aeson base bytestring containers ListLike old-locale pool-conduit protocol-buffers protocol-buffers-descriptor riak-bump safe @@ -124395,7 +132764,7 @@ self: { mkDerivation { pname = "montage-client"; version = "0.1.1"; - sha256 = "ee1ef7cd3650c6461e42f655a7fbeb433d8c1a36d7688ff05294fe1301576fa1"; + sha256 = "18bgaw0i7zllabq8ys6p6qd8qga3xgxsfmgn88g4dijh6v6zf7pf"; libraryHaskellDepends = [ aeson base bytestring containers ListLike mtl old-locale pool-conduit protocol-buffers protocol-buffers-descriptor riak-bump @@ -124416,7 +132785,7 @@ self: { mkDerivation { pname = "monte-carlo"; version = "0.6.1"; - sha256 = "1d38a457dc408e10f04be2d01bb0d3e82cad7d6c4625d8f5b659fd959ce768fe"; + sha256 = "1zk8wyf9bzarnvsxh9a6diyssb78sfq1pl729gq113j0vibs8f0x"; libraryHaskellDepends = [ base gsl-random primitive transformers vector ]; @@ -124439,7 +132808,7 @@ self: { mkDerivation { pname = "monzo"; version = "0.4.0.0"; - sha256 = "928b9fc1e68058798f8066e1fafb7f6010f8fd51d46f1783dd8bba96b752f7c6"; + sha256 = "1ippaavrdflbvn1ifvyla7yzh430gzxzmqb6h27pjn40wv0rz2wj"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring containers http-client http-client-tls mtl servant servant-client text time timerep @@ -124462,7 +132831,7 @@ self: { mkDerivation { pname = "moo"; version = "1.0"; - sha256 = "dcd879d80b31f71b40cde58a44b1f936a9ec41cf569af3276ada2a02cd4e5009"; + sha256 = "02ah9v6h4ansd8kz76jnrx0yra9nz6ql92p5rm01pxri1gc7kn6w"; libraryHaskellDepends = [ array base gray-code mersenne-random-pure64 monad-mersenne-random mtl random random-shuffle time @@ -124484,7 +132853,7 @@ self: { mkDerivation { pname = "moonshine"; version = "2.0.0.0"; - sha256 = "1a1bed5a06a3eb16393e94f40dfb32c34695033ee5695f709adf9669133c0bad"; + sha256 = "1b8b7h9nk5nzk9q5ysg57q1rain36bxhvx4l7qwidsx30rdfs6qs"; libraryHaskellDepends = [ aeson base bytestring canteven-config ekg ekg-core hslogger snap text time transformers yaml @@ -124500,7 +132869,7 @@ self: { mkDerivation { pname = "more-extensible-effects"; version = "0.1.0.4"; - sha256 = "01b798127f9d19235b911d468d0380571251b1662233a9e608be962805a884ea"; + sha256 = "1sl4m02ji5my13kajcr2csqm24jph01qsihxj5dj66cxgw99idq1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/qzchenwl/more-extensible-effects#readme"; description = "Initial project template from stack"; @@ -124515,7 +132884,7 @@ self: { mkDerivation { pname = "morfette"; version = "0.4.4"; - sha256 = "9ed165f672c26d24600e189e77898098bb40ca84f5da7e168232670f667b9c18"; + sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124535,7 +132904,7 @@ self: { mkDerivation { pname = "morfeusz"; version = "0.4.2"; - sha256 = "a06b0014b3f20d752cb63e67a6611a5ccc2ab6b31c78a3dc8a3df47bf42cf4d3"; + sha256 = "1lzl5ks7px1xibfa6y0wnfv2mk2w39hscrrynqn7a3gjnca00sx0"; libraryHaskellDepends = [ base bytestring containers directory mtl text ]; @@ -124553,7 +132922,7 @@ self: { mkDerivation { pname = "morph"; version = "0.1.1.1"; - sha256 = "3b325579797ef49dbc5c49ad0fa05b451806f7178121beb2ee548a988b9745dc"; + sha256 = "1p25jy5ri2jlxsrbw8c12zvhc625bfh0zba9bjy9vx3yg5wmaciv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124575,8 +132944,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.6.6"; - sha256 = "c933dfa0cec4ddb0c5f552ccb70f3ac0f443b70d6bebc5a858d69c5ba8a4ce25"; + version = "1.6.9"; + sha256 = "1a0s0hj09rhgixs09ay7fjk12d3wrlhm2w957md7pkan412vx200"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124605,7 +132974,7 @@ self: { mkDerivation { pname = "mosaico-lib"; version = "0.1.1.0"; - sha256 = "0be45e9af3ff7076c5ac2666b878ca794373116b83102344814e08a2021d99e1"; + sha256 = "1qcr3l1a422fh5226443dc8p6hvrr9wbhri6mk2pcw7zyfd5xr0b"; libraryHaskellDepends = [ base base-unicode-symbols colour diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm @@ -124622,7 +132991,7 @@ self: { mkDerivation { pname = "mosquitto-hs"; version = "0.1.0.0"; - sha256 = "964a6f05bbbcf3c4797ca35d82c99c21d257b8ce252397ffc87dbe8482bb0031"; + sha256 = "0c80pf189gkxr3zrf8r5rsw5gli1kk4q4pd3giww9wxwpc2nyjln"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anishray/mosquitto-hs#readme"; description = "Mosquitto client library bindings"; @@ -124634,7 +133003,7 @@ self: { mkDerivation { pname = "mount"; version = "0.2.1"; - sha256 = "e313277fe0ea2f6f85c566af17a0b11a32df1ecfee79a4d2a1b19ad9c1b7b465"; + sha256 = "0rdlnz0xk6mil79a8ygfrwgdychsn6h1gbv6qn2nybzaw1zjf4z3"; libraryHaskellDepends = [ base bytestring ]; description = "Mounts and umounts filesystems"; license = "GPL"; @@ -124646,12 +133015,25 @@ self: { mkDerivation { pname = "mountpoints"; version = "1.0.2"; - sha256 = "67fcdf64fdb8111f58939c64b168a9dfa519d7068e0f439887d739866f18d5c2"; + sha256 = "1hnm31pqcffphyc463wf0vbik9fzm5lb2r4wjdc1y4dqzmjdzz37"; libraryHaskellDepends = [ base ]; description = "list mount points"; license = "LGPL"; }) {}; + "moving-averages" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "moving-averages"; + version = "0.2.0.0"; + sha256 = "12vrwwm61pa3fp0adm1xmbivaw16hahb5b8lpn7358qrdgw1b29n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/joshuaclayton/moving-averages#readme"; + description = "This is a library for calculating moving averages on lists of numbers"; + license = stdenv.lib.licenses.mit; + }) {}; + "mp" = callPackage ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl @@ -124661,9 +133043,9 @@ self: { mkDerivation { pname = "mp"; version = "0.2.2"; - sha256 = "398ec4f8adec8a6791792234e2017e65b3d297642a16698cee7b3efaa6179fce"; + sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; revision = "1"; - editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1"; + editedCabalFile = "1cc85zdja69m16h32ii1jw1qkfz7jq3gp0m0m6pfaj146l8qcmwc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124682,7 +133064,7 @@ self: { mkDerivation { pname = "mp3decoder"; version = "0.0.1"; - sha256 = "bbe6709b3c95bda7af5b551217ec686264259a35c7bd3a3e2f2a5d5af3b2924f"; + sha256 = "0kwjnbrmlp9a5wz3mgf76nd2ar32d3n1f4jmbfpsggcm7jdp1rmv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124699,7 +133081,7 @@ self: { mkDerivation { pname = "mpdmate"; version = "0.1"; - sha256 = "c251ba70e4e585a7f1f42e033034204c9cf4740d72ed6cdba0fdd7fa387ae60a"; + sha256 = "02p6g8wgmmzxl3dnrvbj1msg972c40s300rfykqsg1g5wiqbllf2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124711,12 +133093,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mpg123-bindings" = callPackage + ({ mkDerivation, base, mpg123 }: + mkDerivation { + pname = "mpg123-bindings"; + version = "0.1.0.0"; + sha256 = "1lfjz80jv3r82pggj05ixngisaspqyx0g1i80px0issv9aqqqm8p"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ mpg123 ]; + homepage = "https://github.com/pakanek/mpg123-haskell-binding"; + description = "Mpg132 bindings"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) mpg123;}; + "mpppc" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, split, text }: mkDerivation { pname = "mpppc"; version = "0.1.3"; - sha256 = "b12b8ade452fe1d912848c93a49863778e4b7c5e7ca9cb57f6f8527da7a691fd"; + sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi"; libraryHaskellDepends = [ ansi-terminal base bytestring split text ]; @@ -124732,7 +133127,7 @@ self: { mkDerivation { pname = "mpretty"; version = "0.1.0.0"; - sha256 = "5660e929da60b0cf308f16356a8ee352a702490a87393331db6bb856e5898e60"; + sha256 = "0q4fi7jmdf3bvcqk6fc7194h59sjwf76ld8niwqczc30v8lyjq2n"; libraryHaskellDepends = [ ansi-terminal base containers data-lens-fd data-lens-template mtl orders text transformers @@ -124747,7 +133142,7 @@ self: { mkDerivation { pname = "mpris"; version = "0.1.0.0"; - sha256 = "3ee98b2f922e746982a46c8bd71058c1b9882c05db3eb21d21573d9b42158685"; + sha256 = "11c62m19ngap44fv4gnv0ln8iff1b08dg2vclj16jx1fj8pqps9y"; libraryHaskellDepends = [ base containers dbus mtl ]; homepage = "http://github.com/Fuco1/mpris"; description = "Interface for MPRIS"; @@ -124762,7 +133157,7 @@ self: { mkDerivation { pname = "mprover"; version = "0.0.0.0"; - sha256 = "5a4f2cd9f6ce95b8b296000ce0222cfb431cca540daebf00ebd7ca6217fcbbac"; + sha256 = "1b5vzhbn5jnpxc0bzbhdak51qhzv5hif0300jsrbi5ffyvcjqkss"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124781,7 +133176,7 @@ self: { mkDerivation { pname = "mps"; version = "2010.11.28"; - sha256 = "8f120efc1842337b80763fff6042c28789016922c1b664163ef2cbccdfa60ef6"; + sha256 = "1xhflvgwrjzj7qb69dn149lh32c7q9161zrzfs07ncs233y0w4lg"; libraryHaskellDepends = [ array base bytestring containers directory filepath monoid-owns old-locale old-time parallel parsec regexpr template-haskell time @@ -124800,7 +133195,7 @@ self: { mkDerivation { pname = "mpvguihs"; version = "0.1.1"; - sha256 = "ddfffe9e15cc3fc3c295520b6c63e62403fc59b48a432fd5ae700e88f400acda"; + sha256 = "1nmc03s8h3khmvajyhwaniczq0r4wrinq2sjjp1c6gyc2nggxzyx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124812,6 +133207,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mqtt" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , case-insensitive, clock, containers, criterion, deepseq + , exceptions, hslogger, network-uri, random, socket, tasty + , tasty-hunit, tasty-quickcheck, text, tls, uuid, websockets, x509 + , x509-validation + }: + mkDerivation { + pname = "mqtt"; + version = "0.1.1.0"; + sha256 = "0cp4m1mzy00rczlw5s1m6wx59fdzpdm0hw5jg26213vnpngbnvbv"; + libraryHaskellDepends = [ + async attoparsec base binary bytestring case-insensitive clock + containers hslogger socket text tls uuid websockets x509 + x509-validation + ]; + testHaskellDepends = [ + async attoparsec base binary bytestring containers deepseq + exceptions network-uri random tasty tasty-hunit tasty-quickcheck + text tls uuid + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion text + ]; + homepage = "https://github.com/lpeterse/haskell-mqtt"; + description = "An MQTT protocol implementation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mqtt-hs" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, monad-loops , mtl, network, singletons, stm, text, transformers @@ -124819,7 +133244,7 @@ self: { mkDerivation { pname = "mqtt-hs"; version = "1.0.1"; - sha256 = "ed804b7a0576daaa389df3cb197c159439efd2b8a4386f66df6368e66cb2caf0"; + sha256 = "1w6an9nfcs33vxk6yf54p39fyfcl2my1kjzkklwamnkn0mx4p07d"; libraryHaskellDepends = [ async attoparsec base bytestring monad-loops mtl network singletons stm text transformers @@ -124835,7 +133260,7 @@ self: { mkDerivation { pname = "mrifk"; version = "4.3"; - sha256 = "bd1699b75fbac5ef25477ca6a9f23869f46f0e3943247c6f24612671e995a95d"; + sha256 = "0pd9jplp29k14ippq9237476zx3973rak9kw8wjyzidsbyvrj5mx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl ]; @@ -124848,7 +133273,7 @@ self: { mkDerivation { pname = "mrm"; version = "0.1.0.0"; - sha256 = "3caa1ec68090913057379113836ea5b0458341d060d042d1f7040904509caee2"; + sha256 = "1qmfki808284yz8l5l30s10q6idhlmp864wi6xbk14chh331xaiw"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/scmu/mrm"; description = "Modular Refiable Matching, first-class matches"; @@ -124864,7 +133289,7 @@ self: { mkDerivation { pname = "ms"; version = "0.2.1"; - sha256 = "d766fd486c8e62d227b23425ff03366a04d7fc5eb827af10a9722dffdf6ce040"; + sha256 = "0h70dkgzybbjm48ay9xqbvydf13a6q1zy99ln8kx4qlfdi4gsrnp"; libraryHaskellDepends = [ base contravariant edit-distance lens profunctors semigroupoids semigroups vector @@ -124887,9 +133312,9 @@ self: { mkDerivation { pname = "msgpack"; version = "1.0.0"; - sha256 = "08f600b8428b27ee53f8f8cbd6c772603ecc80668c3e0801055083242cb6664e"; + sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8"; revision = "1"; - editedCabalFile = "178ba2e6953c2c5a86905227ad6a248e7ea079f4fe1e2e823834defd5486e539"; + editedCabalFile = "0fg5hragvpil7212w7pyyiws0zlf4imas9sjj235lb1wjpka52qp"; libraryHaskellDepends = [ base binary blaze-builder bytestring containers data-binary-ieee754 deepseq hashable mtl text unordered-containers vector @@ -124911,7 +133336,7 @@ self: { mkDerivation { pname = "msgpack-aeson"; version = "0.1.0.0"; - sha256 = "72605d87d66c25cfce95e361fe6eba526fb2ed23ccea727c28c948564a9cf6f9"; + sha256 = "1ygnki55cj6951y75snc4gnv4vsjp9pgwqg3jp7cy9bcss3msq3j"; libraryHaskellDepends = [ aeson base bytestring deepseq msgpack scientific text unordered-containers vector @@ -124931,7 +133356,7 @@ self: { mkDerivation { pname = "msgpack-idl"; version = "0.2.1"; - sha256 = "dfcd473e1efb39282a3c2fbb3c6477982e51a91ce11d947b92d36dc766c4487c"; + sha256 = "0z28qikcfvfkj9xr87g13jlm2blqfxj3rfrg7hm2hfgv3qz4gkfz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124954,7 +133379,7 @@ self: { mkDerivation { pname = "msgpack-rpc"; version = "1.0.0"; - sha256 = "76ca6b5fe702456d84c622fed0819abbdfa555225ce92f870ca23456e485a502"; + sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra exceptions monad-control msgpack mtl network random text @@ -124973,7 +133398,7 @@ self: { mkDerivation { pname = "msh"; version = "0.1.0.2"; - sha256 = "841959f17db990cf8894feb2ead08d758dcff502e1cd1b88f9bb2a9145e3a9f8"; + sha256 = "1y59wd2r2amvz641pkg10bswz3bmip8fmcpyjj4cz45rgpqmj6c4"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta lens mtl parsec template-haskell text @@ -124989,7 +133414,7 @@ self: { mkDerivation { pname = "msi-kb-backlit"; version = "0.1.0.1"; - sha256 = "8437ed623ae07c5350d24b5b8f96ac82fdade7afe9cd6a6085b39103475001d3"; + sha256 = "1lq1a13h74dkhmh6mkg9mzksvzc2mjb8ynsbs9856z7079ifsdw4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring hid split ]; @@ -125003,7 +133428,7 @@ self: { mkDerivation { pname = "mstate"; version = "0.2.7"; - sha256 = "4508e3e7cc2dec5a0e75ba7dd085c73fdd4f886ac6d1a74cf071816795bb2c17"; + sha256 = "05rcpfang0biy16aglf6da44zp9zqy2x0zdsfl75mv1drkky6225"; libraryHaskellDepends = [ base monad-peel mtl stm ]; description = "MState: A consistent State monad for concurrent applications"; license = stdenv.lib.licenses.bsd3; @@ -125016,7 +133441,7 @@ self: { mkDerivation { pname = "msu"; version = "0.0.2"; - sha256 = "acf4ddf7122571b0d5bec3e0c576d65f969230956cd82e400646b6e1cffc1f2f"; + sha256 = "0bqzzk7y3dj60r02xn3cjlq955jzsrvcbq63pvav0w952bvxvx5c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125037,7 +133462,7 @@ self: { mkDerivation { pname = "mtgoxapi"; version = "0.5.0.2"; - sha256 = "51fec86d45e44ae197d275e298b0a16567aed02948af0aaf288962077015d6c7"; + sha256 = "1iyn2mq0fql952phmbs8578awrv5l6q9iqkmsaby2jp48mnwizji"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring curl either errors hashable HTTP ixset network SHA text @@ -125059,7 +133484,7 @@ self: { mkDerivation { pname = "mtl"; version = "2.1.3.1"; - sha256 = "77af766957fb49361fe63446f272a698bddb13398669edc363022e5c2517f6f6"; + sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; @@ -125072,9 +133497,9 @@ self: { mkDerivation { pname = "mtl"; version = "2.2.1"; - sha256 = "cae59d79f3a16f8e9f3c9adc1010c7c6cdddc73e8a97ff4305f6439d855c8dc5"; + sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa"; revision = "1"; - editedCabalFile = "4b5a800fe9edf168fc7ae48c7a3fc2aab6b418ac15be2f1dad43c0f48a494a3b"; + editedCabalFile = "0fsa965g9h23mlfjzghmmhcb9dmaq8zpm374gby6iwgdx47q0njb"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; @@ -125086,7 +133511,7 @@ self: { mkDerivation { pname = "mtl-c"; version = "0.1.1"; - sha256 = "2dd7da3c2ed207aa2e4bb5b49aa09e537cfe8c2cae241d026bc52cd091f6ea8b"; + sha256 = "12zays8x0b65dc11s95f5j6gwz2kksh9md5m9cpal1yj5qydmmrd"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/fumieval/mtl-c"; description = "Very strict CPS'd transformers"; @@ -125098,9 +133523,9 @@ self: { mkDerivation { pname = "mtl-compat"; version = "0.2.1.3"; - sha256 = "6458ca53593a31ebce1d94ef8dd4f6a06d050dd7ed32335f6cc6b6e5d3456894"; + sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34"; revision = "3"; - editedCabalFile = "6c94536cf0a7415c1fb740d1a98a109928e77ac0bc1fc2f77b460c7c58d6ee45"; + editedCabalFile = "0igfsrc7q326ggvw47xwq1xffa4r225akla0nwgmqhd7y1n5753c"; libraryHaskellDepends = [ base mtl ]; doHaddock = false; homepage = "https://github.com/haskell-compat/mtl-compat"; @@ -125115,7 +133540,7 @@ self: { mkDerivation { pname = "mtl-evil-instances"; version = "0.1"; - sha256 = "a47ad8b59de5277e7d74235ae1dc49004cc722f67f5a43986ccacb5d1bb820fc"; + sha256 = "1z10p0dmvjyadjc46nkzyqicfk0097ff2ni3fiypw9z5knsxhym4"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; @@ -125129,7 +133554,7 @@ self: { mkDerivation { pname = "mtl-extras"; version = "0.1"; - sha256 = "ff9264943dfded23102c964cb327fea080a19191bc536d9a9a898dab9fa9fcec"; + sha256 = "1v7wm6gsp3c9kad6slxwj68s3050zqkv6k4n5h827vgx7na694pz"; libraryHaskellDepends = [ base mtl transformers ]; description = "Higher order versions of MTL classes"; license = stdenv.lib.licenses.bsd3; @@ -125140,7 +133565,7 @@ self: { mkDerivation { pname = "mtl-prelude"; version = "1.0.3"; - sha256 = "1d811002b816c7afabf06eae1895a20862837432294abbde2892e6f4185f20e3"; + sha256 = "1qr0bwcg9rlj53gbnji969s86qh8laaiibkfy2msziqnp011108x"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/nikita-volkov/mtl-prelude"; description = "Reexports of most definitions from \"mtl\" and \"transformers\""; @@ -125153,7 +133578,7 @@ self: { mkDerivation { pname = "mtl-prelude"; version = "2.0.3.1"; - sha256 = "c4a6dda093d63bd2161f55030c5825903dfa9b7d5e766c487fd848cb2aa01233"; + sha256 = "0cqjl0mcnj6qgx46qxjygndzlgch4mc0q0sm3wbd4fynjfhdv9n4"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/nikita-volkov/mtl-prelude"; description = "Reexports of most definitions from \"mtl\" and \"transformers\""; @@ -125165,7 +133590,7 @@ self: { mkDerivation { pname = "mtl-tf"; version = "0.1"; - sha256 = "4e086ab1d2647f1f1337b3104e7da6b86b2e008010b138b981ab24391bd7d561"; + sha256 = "0qfmswdkj95bh6wkic8hh002wsxqlrylw45k6w9iyzv4saqnl22f"; libraryHaskellDepends = [ base ]; description = "Monad transformer library using type families"; license = stdenv.lib.licenses.bsd3; @@ -125179,7 +133604,7 @@ self: { mkDerivation { pname = "mtl-unleashed"; version = "0.6.1"; - sha256 = "330d0193940de75b851d55d2b2e92e9a3b62fd3396e37a093610320545fa0a44"; + sha256 = "0i0az92hachh6q4pmqwn6gyn4fws5vlv5ljm3n2mprqdjj9h239k"; libraryHaskellDepends = [ base contravariant lens mtl profunctors tagged transformers transformers-compat @@ -125197,7 +133622,7 @@ self: { mkDerivation { pname = "mtlparse"; version = "0.1.4.0"; - sha256 = "ec79238fe6f19ee7b3d2ab4fe5490419ba0b10e4820dfde5c3eb8cf9eace85ba"; + sha256 = "1fl5rvmgk37bqgjzs3c2wh80pfhr0i4yakxbsaryg7piws7j6ygc"; libraryHaskellDepends = [ base mtl ]; homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/"; description = "parse library using mtl package"; @@ -125209,7 +133634,7 @@ self: { mkDerivation { pname = "mtlx"; version = "0.1.6"; - sha256 = "b69139f7d0cce8d6b57e99071864b3b7cf3feb81920f4e02ce67b96071b40c68"; + sha256 = "0s0cniqn1fb7rq14w3wjh7mkzkxpndj1h1wrgssxds6cs3vkk4dn"; libraryHaskellDepends = [ base mtl QuickCheck ]; description = "Monad transformer library with type indexes, providing 'free' copies"; license = stdenv.lib.licenses.bsd3; @@ -125221,7 +133646,7 @@ self: { mkDerivation { pname = "mtp"; version = "0.1.1.1"; - sha256 = "9c2f5d3d16cbb7c9d682ee5c2fb4b36a01fb3249d35d7c0727561516d03d9898"; + sha256 = "164q7p81c5an4w3pqpfk94rgn0banfs2yp7fhbbckdyb2qymsbww"; libraryHaskellDepends = [ base filepath unix ]; librarySystemDepends = [ mtp ]; description = "Bindings to libmtp"; @@ -125234,7 +133659,7 @@ self: { mkDerivation { pname = "mtree"; version = "0.1"; - sha256 = "9b3ecc824097f71cf0f4baf47183706aeb4c9ba91e70441c9c17ed926b9693d0"; + sha256 = "1l4kjrmr5v8pkhf48w0ym6dlrsvaf21p3x5sykq1rxwp821cqglv"; libraryHaskellDepends = [ base bifunctors ]; description = "Tree with Meta and Content parameters"; license = stdenv.lib.licenses.publicDomain; @@ -125245,7 +133670,7 @@ self: { mkDerivation { pname = "mucipher"; version = "0.6.0"; - sha256 = "1e3c0ec3f33cf662c57c06503422637af625d39cbb57f29f843c45bb48ccad2e"; + sha256 = "0bmdri4bni9whjgz4mxvkk9jbxkscci38l06gk2n5xiwyg1hwg0y"; libraryHaskellDepends = [ base ]; description = "A library to produce simple ciphers for use with lambdabot"; license = "GPL"; @@ -125258,9 +133683,9 @@ self: { mkDerivation { pname = "mud"; version = "0.1.0.0"; - sha256 = "4043d1226482acf5bd9fd6797b95f24494a3f1b8612bbe4a469dfa0819023f47"; + sha256 = "0irz08chiylx8r5bwav1p3qs7524yaapnyfnkyyzbb42chid2hs0"; revision = "1"; - editedCabalFile = "6d62d56fc07cd9b413ccbdddbcc517969acf89b1906b2254f0d0fb7c3b85203d"; + editedCabalFile = "0g90hlxpryyhy1a24swhn64wz6ln2z2vrpdxrh9v9nbwq1pxaqkd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125284,7 +133709,7 @@ self: { mkDerivation { pname = "mudbath"; version = "0.0.3"; - sha256 = "785893adc915cd925503f25eae2fca8c2132e41f465fa990ea52a904a87edaad"; + sha256 = "1bfsgsl09aajxa8ajps63zj348ccr8pswppj0dar5k8mr6nr6n3q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125304,7 +133729,7 @@ self: { mkDerivation { pname = "muesli"; version = "0.1.1.0"; - sha256 = "bc88e08c5534dc4f31ea18c2dd8ca8d3c66126be94db97e45ffbfdf486c7da33"; + sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w"; libraryHaskellDepends = [ base bytestring cereal containers directory filepath hashable mtl psqueues time @@ -125322,7 +133747,7 @@ self: { mkDerivation { pname = "mueval"; version = "0.9.3"; - sha256 = "f72a8bbaffecaeb55b67d78011e182073be8ba9f4a90824903e4c78cfe6e1ef7"; + sha256 = "1xqydvz8riz40d4q542akyxfhfq7hbhi306pcxdvbbpczyx8napp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125340,7 +133765,7 @@ self: { mkDerivation { pname = "mulang"; version = "0.1.0.0"; - sha256 = "5df2829d85ceb46086011c96ecaf396aa78d92dda293ba728d0ad8e3efcaaddf"; + sha256 = "1pxdrbpy7n0aimrbm4x2vn98v9va76pyr5hw06361d6fhnfq5wjx"; libraryHaskellDepends = [ aeson base bytestring haskell-src ]; testHaskellDepends = [ aeson base bytestring haskell-src hspec ]; description = "The Mu Language, a non-computable extended Lambda Calculus"; @@ -125353,7 +133778,7 @@ self: { mkDerivation { pname = "multext-east-msd"; version = "0.1.0.4"; - sha256 = "86b6b715d3ab239aa292ff37368976f91b72098bc442ed274d851f2fc48dc1c5"; + sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jsnajder/multex-east-msd"; description = "MULTEXT-East morphosyntactic descriptors"; @@ -125368,7 +133793,7 @@ self: { mkDerivation { pname = "multi-cabal"; version = "0.1.0.0"; - sha256 = "6ffcb526ae61ef9004684ff9b6f3eee59c3fdc8dc04b9db655b8e57a0984f763"; + sha256 = "0qzphh4pmrdqanv9sjy0ipf3z775xvrvdyagd0291vv1mqkbbz3g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base filepath mtl ]; @@ -125389,7 +133814,7 @@ self: { mkDerivation { pname = "multi-trie"; version = "0.1"; - sha256 = "ffcaa510f0f7e379d62c63669f1a35607e49a9811a5d6e50fd2229d9ec967b44"; + sha256 = "0i3vjvndja92zm86wp8sh6lljzk06ld9yrk35kb7kqzpy08abjpz"; libraryHaskellDepends = [ base composition containers ]; testHaskellDepends = [ base containers HTF ]; homepage = "https://github.com/vadimvinnik/multi-trie"; @@ -125405,7 +133830,7 @@ self: { mkDerivation { pname = "multiaddr"; version = "0.3.0"; - sha256 = "0ac61e1b1cf1fc03c371f03481952ef5851d7843c9a7a5a0b182f12fc72cca4c"; + sha256 = "0k6a5k3jzwc2n6hab9y98dw1v1gm5saq2d7hf71h7z7i3hdixiha"; libraryHaskellDepends = [ attoparsec base base58-bytestring bytestring cereal errors hashable text @@ -125425,7 +133850,7 @@ self: { mkDerivation { pname = "multiarg"; version = "0.30.0.10"; - sha256 = "c9fa623a8e06d62addc2b7ad5102ceac3a6f0db6a67afbc8e693d0d0aec417a1"; + sha256 = "188pqjpd1l4kwv4gnym6nq6nyfmcrq153bdpqbfjmmh6iqx65yn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -125444,7 +133869,7 @@ self: { mkDerivation { pname = "multifile"; version = "0.1.0.6"; - sha256 = "594d45265060a8347f9653e4bdacb9e8362cce7d2a06322369e13d4b1e829614"; + sha256 = "054nh8g4ngg1d4ik41iagp72qdp8p6nbvr2kjrzk9a30a0k4akar"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125465,7 +133890,7 @@ self: { mkDerivation { pname = "multifocal"; version = "0.0.1"; - sha256 = "d5312ef6ab560d110841f930252660cfad444d885cf65986121c2287ba738770"; + sha256 = "0w47ffx8f8hw2a35kxjwi16l9bfgc0k2ac7r844123anmgv2wcfm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125491,7 +133916,7 @@ self: { mkDerivation { pname = "multihash"; version = "0.1.2"; - sha256 = "dd2b0511c900d83794dec151008b0bec07be676dc0cbb073ce11d5b754c47538"; + sha256 = "0f3mqiabgm8irrrv1jy0dmkvw1zc1f5h0lf1vsa3gn00r48haayx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125513,7 +133938,7 @@ self: { mkDerivation { pname = "multimap"; version = "1.2.1"; - sha256 = "6332c529475177b9e08d762d5701804dc2edc0ff26dd98a2a1dcd7ed092e7434"; + sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3"; libraryHaskellDepends = [ base containers ]; homepage = "http://hub.darcs.net/scravy/multimap"; description = "A multimap"; @@ -125525,7 +133950,7 @@ self: { mkDerivation { pname = "multipart"; version = "0.1.2"; - sha256 = "e543fb307beb14fc366171d7767a6a18244bacf78db295d8d161c5c03d94043c"; + sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5"; libraryHaskellDepends = [ base bytestring parsec ]; homepage = "http://www.github.com/silkapp/multipart"; description = "HTTP multipart split out of the cgi package"; @@ -125539,7 +133964,7 @@ self: { mkDerivation { pname = "multipart-names"; version = "0.0.1"; - sha256 = "ac63f71fe90bfdb613f97000c01e69343fb0e6337604e8d1a879441c1e4d9c9d"; + sha256 = "17cw9lg1qi3rm38yh13n6gkb0grld4gc003hz49vdz8bx4gzfqxc"; libraryHaskellDepends = [ base case-insensitive lens parsec ]; testHaskellDepends = [ base HUnit lens test-framework test-framework-hunit @@ -125556,7 +133981,7 @@ self: { mkDerivation { pname = "multipass"; version = "0.1.0.2"; - sha256 = "d54585c28cb2cc8104581b09c5428691c3b8358631db99c44d0fe55213d7457f"; + sha256 = "0zs5sw9m5r8g9p29knrihqsvihwihr1ca28vb0283k5jik18aifm"; libraryHaskellDepends = [ base binary containers ghc-prim hashable keys math-functions newtype unordered-containers @@ -125572,7 +133997,7 @@ self: { mkDerivation { pname = "multipath"; version = "0.1.0.0"; - sha256 = "c33ea7b02ac8a409826b05900c103e2bdaffc0187808f93b0eafac180bac9c54"; + sha256 = "0m4wmh5iib5g1qxzj23q330gznib7q80r405df10k9685aqafgn3"; libraryHaskellDepends = [ base parsec utf8-string ]; homepage = "https://github.com/SupraSummus/haskell-multipath"; description = "Parser and builder for unix-path-like objects"; @@ -125584,7 +134009,7 @@ self: { mkDerivation { pname = "multiplate"; version = "0.0.3"; - sha256 = "2c0016847dcedc8ba0054211256a3ef6c7f142e605668c7b64beebdf0eaf4ebf"; + sha256 = "1gsfmw7dzsxycixqqrh5wr1g3izn7rm2a4a20nh8pp6fgn21c01c"; libraryHaskellDepends = [ base transformers ]; homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; @@ -125597,7 +134022,7 @@ self: { mkDerivation { pname = "multiplate-simplified"; version = "0.0.0.2"; - sha256 = "59ec1287196833863baa45be42b1a1864728935bc0ca6c1a5e8f9baaeda0f277"; + sha256 = "0xzjl3nsm6wgbqd6rjn0bf9jhiw6l6ql5gj5m8xqccv8363i5v2r"; libraryHaskellDepends = [ base multiplate transformers ]; description = "Shorter, more generic functions for Multiplate"; license = stdenv.lib.licenses.mit; @@ -125609,7 +134034,7 @@ self: { mkDerivation { pname = "multiplicity"; version = "0.1.0"; - sha256 = "cc2926997f59861dbba1d9a376d4a889309f84269108ae80d248d96bb1011bf8"; + sha256 = "1y0v06qnpna8sa0aw24i4s29yc49m3a7d8yrl6xiv1jrgycjcafc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125625,7 +134050,7 @@ self: { mkDerivation { pname = "multirec"; version = "0.7.7"; - sha256 = "f342653e874db55f673e6d6236a2c21cc815d5e999ce62affe54fc99a49362e7"; + sha256 = "1rv2jfj9kz2lzspn5klrx7aibj0wqai3cqkd7rkmzdadhwz6ahpk"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; @@ -125641,7 +134066,7 @@ self: { mkDerivation { pname = "multirec-alt-deriver"; version = "0.1.3"; - sha256 = "cc351b1fd24e7dc5d0e70beed4729a9354419007e247be1b41c707f9eacf3f43"; + sha256 = "0hrzrzmgj1y784dvwiz20y842m4kk9rd9vhbwz8cazafs8gindfc"; libraryHaskellDepends = [ base containers mtl multirec syb template-haskell th-expand-syns ]; @@ -125655,7 +134080,7 @@ self: { mkDerivation { pname = "multirec-binary"; version = "0.0.1"; - sha256 = "fa57bbf7fd5159713520772307af960e2c79d9c24e045ef23680f18ea5cb41b2"; + sha256 = "1cj1rfjqxwc06vr5w12fqbcpjb0fjsphf8vp40sp2naizpvvnmzs"; libraryHaskellDepends = [ base binary multirec ]; description = "Generic Data.Binary instances using MultiRec."; license = stdenv.lib.licenses.bsd3; @@ -125667,9 +134092,9 @@ self: { mkDerivation { pname = "multiset"; version = "0.3.3"; - sha256 = "c74e77d3dbbe81fe3b48629fc257fa084df89bfb575c82c42f5549af376de135"; + sha256 = "0dg1dlvsyjam5z284p2pzfdzhk88z9bw57v290xzx0dyvg9pfkn7"; revision = "2"; - editedCabalFile = "5c60cf960eb6ea4f9d82741534d95c34b241c681e8ca8647cd5e0495f30d8bdf"; + editedCabalFile = "1pwb1prra12yrm3qdjp8h7343cilbkck85blhaflzsmn1sbcyq2w"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest Glob ]; description = "The Data.MultiSet container type"; @@ -125681,7 +134106,7 @@ self: { mkDerivation { pname = "multiset-comb"; version = "0.2.4.1"; - sha256 = "8ae3432daf56c1752a0d63e25acbc8b6b4dce52600091139a9e29b16400030da"; + sha256 = "1nih0101d6z2m4wi22804vjxrd5nr35mmqk31lm7bhanmwnl7qwa"; libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = stdenv.lib.licenses.bsd3; @@ -125692,7 +134117,7 @@ self: { mkDerivation { pname = "multisetrewrite"; version = "0.6"; - sha256 = "5e95b7428d004e7a06f546e05d0659bb4873443c9e8f29f89f199cfb666c0fb2"; + sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay"; libraryHaskellDepends = [ base haskell98 stm ]; homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html"; description = "Multi-set rewrite rules with guards and a parallel execution scheme"; @@ -125707,9 +134132,9 @@ self: { mkDerivation { pname = "multistate"; version = "0.7.1.1"; - sha256 = "609650cbbfd102c775b44be3fd7bb4f6732127e64b21dd45ea1af057c5ffb8a6"; + sha256 = "19mqzz2mgw0sx92xs8abwqkj2wznnixzvqsbniswf0nipz5m15k0"; revision = "1"; - editedCabalFile = "a5bd571eb919e74f8ba5313ffca801dce8c1fe1dd2c6699eadab39b0e37ae13b"; + editedCabalFile = "0fz1gbiv0fdbmng6kinj3pzc3s6w06lgqgriln5lzrqrp4g5ggd5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125730,7 +134155,7 @@ self: { mkDerivation { pname = "multivariant"; version = "0.1.0.1"; - sha256 = "57278b97a88ecc9d8e2a4c58aee902393cf4a9dbaa500683568053ba60e06408"; + sha256 = "0234w1hbllw0as1hcl5avflz8g1r0blswn2c5a79vk4fm2bqn9sp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125762,7 +134187,7 @@ self: { mkDerivation { pname = "muon"; version = "0.1.0.8"; - sha256 = "3fcddac69c00da46cbf822252b82be92d7e80c06174ee0c2c82c73aee0ee2168"; + sha256 = "0s11xvhawwrcr31f0khp0q6fimwjps12n992z35ldnh0kk3dmk9z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125782,7 +134207,7 @@ self: { mkDerivation { pname = "murder"; version = "1.3.4"; - sha256 = "25eccca6076443accc1e313e69d6127d99033c344adb198d9876a2bc863c275f"; + sha256 = "0pr77j3br8knk26iknsa6hy076bx2bb6jgii3v6aqhv40ykcrv15"; libraryHaskellDepends = [ AspectAG base containers HList ListLike template-haskell TTTAS uu-parsinglib uulib @@ -125802,7 +134227,7 @@ self: { mkDerivation { pname = "murmur"; version = "0.0.0.2"; - sha256 = "3553df87f26aca79a10c008ca03fc29a35e5b707003af97ee1296f3e3bde8632"; + sha256 = "0cl6vqxkwvr9w5zgjfh00yvyadcsq8zs13001jhpkjkaya3xylrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125825,7 +134250,7 @@ self: { mkDerivation { pname = "murmur-hash"; version = "0.1.0.9"; - sha256 = "89b9db94ead4cc0784dbcfb47c51b5664c1718860db00cd8ada3ef6fdd4465ad"; + sha256 = "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/nominolo/murmur-hash"; description = "MurmurHash2 implementation for Haskell"; @@ -125840,7 +134265,7 @@ self: { mkDerivation { pname = "murmur3"; version = "1.0.3"; - sha256 = "102c81e0e6ae604f51bccced6d2d493f4de0b65e856cd0492a17f9f8e4d51f2a"; + sha256 = "0ahzspjgiy8p594x0v45bsvf0k9z94nnvvfcpi8lyq5fwvh82b0h"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base base16-bytestring bytestring HUnit QuickCheck test-framework @@ -125856,7 +134281,7 @@ self: { mkDerivation { pname = "murmurhash3"; version = "1.0"; - sha256 = "6235ee5432a5dfd12c7eab60992d0f663979c0b530d99542eff1fd8c83cbe6c3"; + sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2"; libraryHaskellDepends = [ haskell2010 ]; homepage = "https://github.com/niswegmann/murmurhash3"; description = "32-bit non-cryptographic hashing"; @@ -125864,12 +134289,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mushu" = callPackage + ({ mkDerivation, base, brick, bytestring, classy-prelude + , connection, containers, data-default, directory, filepath, fuzzy + , hscurses, htoml, libmpd, list-t, microlens, microlens-platform + , microlens-th, mtl, network, pretty, process, safe-exceptions + , template-haskell, text, text-zipper, time, transformers + , unordered-containers, vector, vty + }: + mkDerivation { + pname = "mushu"; + version = "0.1.1"; + sha256 = "1wimid5jqsdbgylxmqai5laga14na2ig0pr9y4fi1lw17yd782lv"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick bytestring classy-prelude connection containers + data-default directory filepath fuzzy hscurses htoml libmpd list-t + microlens microlens-platform microlens-th mtl network pretty + process safe-exceptions template-haskell text text-zipper time + transformers unordered-containers vector vty + ]; + testHaskellDepends = [ base classy-prelude ]; + homepage = "https://github.com/elaye/mushu#README.md"; + description = "Minimalist MPD client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "music-articulation" = callPackage ({ mkDerivation, average, base, semigroups }: mkDerivation { pname = "music-articulation"; version = "1.9.0"; - sha256 = "ef0a45c2eeeefd2c361d74c4f1d534d1fb011ccb0b40b3eabc70d859c484ab33"; + sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg"; libraryHaskellDepends = [ average base semigroups ]; description = "Abstract representation of musical articulation"; license = stdenv.lib.licenses.bsd3; @@ -125880,7 +134332,7 @@ self: { mkDerivation { pname = "music-diatonic"; version = "0.1.2"; - sha256 = "64183c5980878264d2f847d6eeceb91bb887ada3d30912b2b96e5bb061519064"; + sha256 = "0r4ha5hv0nvfp6r142fklfnqgf0vp77fxmj7z39690l7h1ckq634"; libraryHaskellDepends = [ base ]; description = "Implementation of basic western musical theory objects"; license = stdenv.lib.licenses.bsd3; @@ -125892,7 +134344,7 @@ self: { mkDerivation { pname = "music-dynamics"; version = "1.9.0"; - sha256 = "44236f34eb62454da5722efd82a17bb571c2b147f78b773f5be012df320e4189"; + sha256 = "12a11qrdy4p0bczpg2zp8yqw4wdmgfhq5z9ffajlsib2xcs6y8s4"; libraryHaskellDepends = [ average base music-dynamics-literal semigroups ]; @@ -125905,7 +134357,7 @@ self: { mkDerivation { pname = "music-dynamics-literal"; version = "1.9.0"; - sha256 = "a519d48536faf25cb60fd99864477abf868b98666e2f37ef86d349ac0aa178a5"; + sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5"; libraryHaskellDepends = [ base semigroups ]; description = "Overloaded dynamics literals"; license = stdenv.lib.licenses.bsd3; @@ -125918,7 +134370,7 @@ self: { mkDerivation { pname = "music-graphics"; version = "1.8.1"; - sha256 = "5539c2f05d7234d47134b6459314df3cc58b572cf4954c996ecda98b56c5c49c"; + sha256 = "1764qmb8pafddsclr5gl5ibqpi9wvwa96idn6iqx8d3jbpqc4fam"; libraryHaskellDepends = [ aeson base blaze-svg bytestring lens music-pitch music-preludes music-score process @@ -125937,7 +134389,7 @@ self: { mkDerivation { pname = "music-parts"; version = "1.9.0"; - sha256 = "a4c5c475cda42e642e9a0a447ca841763ebe0e0384bef2fa679e713691493fce"; + sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4"; libraryHaskellDepends = [ adjunctions aeson base bytestring cassava containers data-default lens monadplus music-dynamics music-pitch roman-numerals semigroups @@ -125956,7 +134408,7 @@ self: { mkDerivation { pname = "music-pitch"; version = "1.9.0"; - sha256 = "7f01e76e6549343811bf7ca9099c35e5bae99b4d7d373dd421015940a330abf0"; + sha256 = "1w5b62il0n8147a3sdvx9ndykfp56nf0kabwpw8khd29cmpff0bz"; libraryHaskellDepends = [ aeson base containers data-interval lens music-pitch-literal nats positive semigroups type-unary vector-space vector-space-points @@ -125971,7 +134423,9 @@ self: { mkDerivation { pname = "music-pitch-literal"; version = "1.9.0"; - sha256 = "14632d91807a61c0e5a17406bd4b9355aabb12fe5ff8977e3271e324d8e15b6f"; + sha256 = "0vsvw7c29qvi69z9gy2zzq9bpajmjd5vs1kll7jw0qbsh28jsqql"; + revision = "1"; + editedCabalFile = "0v86clbcjkgg7psx8jbxq4za66v8ln1vkr7ywrm0vz6vbgkg356f"; libraryHaskellDepends = [ base semigroups ]; description = "Overloaded pitch literals"; license = stdenv.lib.licenses.bsd3; @@ -125988,7 +134442,7 @@ self: { mkDerivation { pname = "music-preludes"; version = "1.9.0"; - sha256 = "38802472317600f8f2dcc06586eb2738766cda022b0d43812a8ae70f7e1e1cbb"; + sha256 = "1fqw3rz0zrwa5a0l639b0bd6qxiq4zmqcrf0vkrgh03n65r2901q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126016,7 +134470,7 @@ self: { mkDerivation { pname = "music-score"; version = "1.9.0"; - sha256 = "2028c8b61e9b088996e57b0ecdbadbcc8764a5e68e848e4193595a0262d49e81"; + sha256 = "10cysii04njrjd0qx14fwsjn91ycvfxcs3kvwnb8j24v3svcha10"; libraryHaskellDepends = [ adjunctions aeson average base base-orphans bifunctors colour comonad containers contravariant distributive HCodecs lens lilypond @@ -126038,7 +134492,7 @@ self: { mkDerivation { pname = "music-sibelius"; version = "1.9.0"; - sha256 = "7f96238c3978969c907443e3ff7f6d0877bd8cfb5e8b38c078ecbd803efa50f9"; + sha256 = "1yahz8z81ggcg303i2syzf6bsxq8dmzzzqs3fj89r5kq766275kz"; libraryHaskellDepends = [ aeson base bytestring lens monadplus music-articulation music-dynamics music-parts music-pitch music-pitch-literal @@ -126057,7 +134511,7 @@ self: { mkDerivation { pname = "music-suite"; version = "1.9.0"; - sha256 = "c65afdfb1b517d0185b316a86f2f613c0e9343d67d960fb9c0728ba698085adb"; + sha256 = "1nss12cad2vjq2whz5kxsr1r63iwc4pnza0nnf2h2zai3gxzsnn6"; libraryHaskellDepends = [ abcnotation lilypond music-articulation music-dynamics music-dynamics-literal music-parts music-pitch music-pitch-literal @@ -126076,7 +134530,7 @@ self: { mkDerivation { pname = "music-util"; version = "0.17"; - sha256 = "0eaf610377d3838ae5c2b5159b093704b28fcc60538e8c321d7f8a991baf665f"; + sha256 = "0pv6mwdrk2kz3lr8r3jkc368zch46w4rn5dmqbjqm0ykfw1n3bqf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126097,7 +134551,7 @@ self: { mkDerivation { pname = "musicbrainz-email"; version = "1.0.0.0"; - sha256 = "6267d60a681a739f30b2659f64fc459d9add268ac41423faf0cd6d425ba64a83"; + sha256 = "10salrdl4vfdy3x26564i8kdv6lx8py697v5n8q9ywqsd05dcrv2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126127,7 +134581,7 @@ self: { mkDerivation { pname = "musicxml"; version = "0.1.2"; - sha256 = "e8bee2b5cd8f261020cb807b9800157a46e1c9f25decd3f46cb71b57fd7fc86a"; + sha256 = "0sn8gzymf6xpdksd7v2xyb4y2iks2l09hyw0rch109lgrnsy5gp8"; libraryHaskellDepends = [ base containers directory HaXml old-time pretty ]; @@ -126145,7 +134599,7 @@ self: { mkDerivation { pname = "musicxml2"; version = "1.9.0"; - sha256 = "c8bb51501284ff80400706ea16dbf1823d9f04eac22cd72d660d383c5da45d1d"; + sha256 = "07axlifkqf0dcqnxfb62x829ygc2y7didsh60x081zw429853fy8"; libraryHaskellDepends = [ base data-default music-dynamics-literal music-pitch-literal nats reverse-apply semigroups type-unary xml @@ -126163,8 +134617,39 @@ self: { }: mkDerivation { pname = "mustache"; - version = "2.1.2"; - sha256 = "383305b302400070f0b4f6d95f28d5b6b9ffc5d6d660421bb18d122351880f80"; + version = "2.1.4"; + sha256 = "1nswy084v9vdl58v6zvvfj5j5hyd4qgr5n353pwsr8010yw4qmqw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + homepage = "https://github.com/JustusAdam/mustache"; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mustache_2_2_3" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.2.3"; + sha256 = "1gy21h97ckjy7lkncm7zyn7bfcpyj488cc7cqy65qapryr9sa5aj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126193,7 +134678,7 @@ self: { mkDerivation { pname = "mustache-haskell"; version = "0.1.0.5"; - sha256 = "62a7735900cfa7a2e3e3f7def84b1e69aa3f26c302c73e7922a9d2c59e2d7256"; + sha256 = "0mkj5ngcblm949wkxiq2qck3zak93r5zipppwgis59yg01cp79v2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126218,7 +134703,7 @@ self: { mkDerivation { pname = "mustache2hs"; version = "0.3"; - sha256 = "3a42f503e2112ff4b8f26df19bbeabc275fb851ffc093070716bc1e19bc125d4"; + sha256 = "1m15q6dy3hbbf5q302gw3y2znxf2mfz9pwbdyawg8bqiw81zahis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126238,7 +134723,7 @@ self: { mkDerivation { pname = "mutable-containers"; version = "0.3.3"; - sha256 = "7a7a39cbb16978dd1607a3977d7a1e5d8ecda7a528845d6983b5b97c49517ceb"; + sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks"; libraryHaskellDepends = [ base containers ghc-prim mono-traversable primitive vector ]; @@ -126258,7 +134743,7 @@ self: { mkDerivation { pname = "mutable-iter"; version = "0.6.1"; - sha256 = "4e9c92be749ec9aacdbb84ca039b7a906850d98b9cb9e9dcff172cb3fe74d821"; + sha256 = "08fqfkzb6b0pzzffkfcwigcm0s4hgadh7jl4pg6smjcyfjz9572f"; libraryHaskellDepends = [ base iteratee MonadCatchIO-transformers transformers vector ]; @@ -126275,7 +134760,7 @@ self: { mkDerivation { pname = "mute-unmute"; version = "0.2.0.0"; - sha256 = "4e25207bce5d21010eebcfdfe76b92525077a15a6b9d0f9fa56e9d2f2861a159"; + sha256 = "0nd1c4l2z7bflnghz7bbbahpfl2jj9mygpygxc7028axrrxj09af"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126288,14 +134773,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mvar-lock" = callPackage + ({ mkDerivation, base, safe-exceptions }: + mkDerivation { + pname = "mvar-lock"; + version = "0.1.0.0"; + sha256 = "1j38hjj7nqz9f8qs0a2kvgh9v80l7ip16fm9qjl675hj479z668p"; + libraryHaskellDepends = [ base safe-exceptions ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "A trivial lock based on MVar"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mvc" = callPackage ({ mkDerivation, async, base, contravariant, foldl, managed, mmorph , pipes, pipes-concurrency, transformers }: mkDerivation { pname = "mvc"; - version = "1.1.3"; - sha256 = "0e3ba355a35357d778b4167d90deb23f98291f370a092e8b78b7f57f0b97b633"; + version = "1.1.4"; + sha256 = "0nx66swbca3c481abzbpgxfhs93y6bsm897dbk56v0dfdqn0inw4"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -126310,7 +134807,7 @@ self: { mkDerivation { pname = "mvc-updates"; version = "1.2.0"; - sha256 = "c60603c0b97949219361c674097fe37b38bc68cf137b641b5abc329c0ee3ab88"; + sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6"; libraryHaskellDepends = [ async base foldl mvc ]; description = "Concurrent and combinable updates"; license = stdenv.lib.licenses.bsd3; @@ -126325,7 +134822,7 @@ self: { mkDerivation { pname = "mvclient"; version = "0.4"; - sha256 = "a37cf0ff183a2f43552d4b8148d5202e415efbe1df761d8b4143716e96fb9389"; + sha256 = "12ckzfb6wwa3865isxnzw7xmwh9f43ali0ab5mal6brs33zz0z53"; libraryHaskellDepends = [ base base-unicode-symbols binary bytestring containers control-event Crypto data-binary-ieee754 hexpat http-enumerator @@ -126341,7 +134838,7 @@ self: { mkDerivation { pname = "mwc-probability"; version = "1.3.0"; - sha256 = "0f9ba623fa2fea7770e3f1cacb1d8a0b14711e60039590d5181864e5a2fe1f6f"; + sha256 = "0vqzzsifar0q33ar1583c0g7250bi8fwpjpiwdq7gsigz8isd6qg"; libraryHaskellDepends = [ base mwc-random primitive transformers ]; homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; @@ -126349,18 +134846,31 @@ self: { }) {}; "mwc-random" = callPackage - ({ mkDerivation, base, primitive, time, vector }: + ({ mkDerivation, base, math-functions, primitive, time, vector }: mkDerivation { pname = "mwc-random"; - version = "0.13.5.0"; - sha256 = "28dd2d95d088438ab15e9dee45ddc500b6c4700a87539c70a48b1b7b4c8d1ca9"; - libraryHaskellDepends = [ base primitive time vector ]; + version = "0.13.6.0"; + sha256 = "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6"; + libraryHaskellDepends = [ + base math-functions primitive time vector + ]; doCheck = false; homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random-accelerate" = callPackage + ({ mkDerivation, accelerate, base, mwc-random }: + mkDerivation { + pname = "mwc-random-accelerate"; + version = "0.1.0.0"; + sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; + libraryHaskellDepends = [ accelerate base mwc-random ]; + description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mwc-random-monad" = callPackage ({ mkDerivation, base, monad-primitive, mwc-random, primitive , transformers, vector @@ -126368,7 +134878,7 @@ self: { mkDerivation { pname = "mwc-random-monad"; version = "0.7.3.1"; - sha256 = "d0f37917e646c9610dcbee4173c4ac50e054418f62623a42f19e3c0c39979440"; + sha256 = "0h4ljwwhqg4yy513lqk2ix0m9q2hmk276hgfrc6n3ja6wqbpkwyh"; libraryHaskellDepends = [ base monad-primitive mwc-random primitive transformers vector ]; @@ -126381,7 +134891,7 @@ self: { mkDerivation { pname = "mxnet"; version = "0.1.0.1"; - sha256 = "9407f88beb3f0f472b3aa61ca9a16b0ae41c6b3eff6b1bb868d4787ad27bb10e"; + sha256 = "03migg97ly6ld2w1nszz7rmirr0adfhsj75678mlf3rzxf5zh1wl"; libraryHaskellDepends = [ base c2hs-extra ]; librarySystemDepends = [ mxnet ]; libraryToolDepends = [ c2hs ]; @@ -126396,7 +134906,7 @@ self: { mkDerivation { pname = "mxnet-examples"; version = "0.1.0.0"; - sha256 = "147cb175fd9b409dd11292b3ce3ab98359a69a4fbd6c42fdcd4a75b0c7e8f7bf"; + sha256 = "1gzpx33v0xaarpyl4v5x9ydacnc3p4xcxcwj2b8rsh4vzmsv2z0l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mxnet ]; @@ -126411,7 +134921,7 @@ self: { mkDerivation { pname = "mxnet-nnvm"; version = "0.1.0.0"; - sha256 = "1e9e0b48a91789553befa80b8714365a63a9185809463a6127df715eb11f6561"; + sha256 = "0qb53yqmwwfz4xhklih9b0cajqss6qa8f2x8xwxmb28pm540p7hy"; libraryHaskellDepends = [ base c2hs-extra ]; librarySystemDepends = [ mxnet ]; libraryToolDepends = [ c2hs ]; @@ -126430,9 +134940,9 @@ self: { mkDerivation { pname = "myTestlll"; version = "1.0.0"; - sha256 = "c0c32a45c22ddc8f9ee324d6bfd1b848cf9a8a7f7eb284811c8b772058bfa3e5"; + sha256 = "1rd3pxc20xwb3j0q9ckygy59mks8p38vzmi4wfg8zp1dq92jmhy0"; revision = "4"; - editedCabalFile = "e554b67c3f8efd73e028328341e3b535dc4898b3d476524a40c236c4c2871e43"; + editedCabalFile = "0hqyhz1c8dn281554xnlnfc4ip1mnpil30rj53h77zcf7xybcm75"; libraryHaskellDepends = [ array arrows base bytestring CCA containers deepseq ghc-prim HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm @@ -126452,7 +134962,7 @@ self: { mkDerivation { pname = "mybitcoin-sci"; version = "0.3"; - sha256 = "d8cab7659453b7956006c1b3dbfb70df07818417d71fabea5c1ca538c227c8c7"; + sha256 = "1iy84z13i98wbkman7yp2y2821yzf3xxpcy10rh9bdskjijvgjnq"; libraryHaskellDepends = [ base cgi curl directory mtl process split ]; @@ -126468,7 +134978,7 @@ self: { mkDerivation { pname = "myo"; version = "0.2.0.0"; - sha256 = "a606c19c6bfc4ea1044f5b6447dd3f060372a89cbd5d2cfebe2492c93cfd4c74"; + sha256 = "0x2czlyck4i4pvz2qpdxkjl740q67zflfr2v9w2a2kpwdffc21m6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126492,7 +135002,7 @@ self: { mkDerivation { pname = "mysnapsession"; version = "0.4.1"; - sha256 = "35fdb09c0998d519938f7ec623a55261de0db98ebc51374bb4545f6813b6e120"; + sha256 = "0871nq9nhpslni5kfldwiswhvpk1aajj7ikyiy9ikmcq16fb1z9m"; libraryHaskellDepends = [ base bytestring cereal clientsession containers mtl random regex-posix snap snap-core time @@ -126509,7 +135019,7 @@ self: { mkDerivation { pname = "mysnapsession-example"; version = "0.4"; - sha256 = "9f26f6843159c75e4e4e8512c4433dbc086f4235c49dd4dd90c19d641db2bf53"; + sha256 = "0lxzn8fn97f1j3fx97f46m16y25w7m1w84l59r75xisr662gc9lz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126527,7 +135037,7 @@ self: { mkDerivation { pname = "mysql"; version = "0.1.4"; - sha256 = "9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e"; + sha256 = "13k6vdmkdbhjlgfsjw6r2smrxhkbiqkw9rdnfx554lc843dpb1lv"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -126544,9 +135054,9 @@ self: { mkDerivation { pname = "mysql-effect"; version = "0.2.0.3"; - sha256 = "a3f62cb2d32aa95bbd2349bf185ebaa42f76cd11cbea32216e987ec109d4d785"; + sha256 = "11fpsh4w2zlqdqhk5snb276pcbx4p9g1igs94fympa9asfr2rxm3"; revision = "1"; - editedCabalFile = "d4474591079b806b8e26d102824d46c7e4c239afb3479ea8d1e8cbd39f015718"; + editedCabalFile = "062p06gx7jz8s6l9wixkmwww5r678r6q40ni4s76p04v0y8laiyl"; libraryHaskellDepends = [ base bytestring extensible-effects mysql mysql-simple ]; @@ -126566,7 +135076,32 @@ self: { mkDerivation { pname = "mysql-haskell"; version = "0.8.0.0"; - sha256 = "5fe7c723b869a0cd160005f6080960c989b678e154c24f4c2419b775b73eece4"; + sha256 = "1r7c7svpbdqr4i64zhjlw5wbd2f9c04hixh500bcv839p0iwgrsz"; + libraryHaskellDepends = [ + base binary binary-ieee754 binary-parsers blaze-textual bytestring + bytestring-lexing cryptonite io-streams memory monad-loops network + scientific tcp-streams text time tls vector wire-streams word24 + ]; + testHaskellDepends = [ + base bytestring io-streams tasty tasty-hunit text time vector + ]; + homepage = "https://github.com/winterland1989/mysql-haskell"; + description = "pure haskell MySQL driver"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mysql-haskell_0_8_1_0" = callPackage + ({ mkDerivation, base, binary, binary-ieee754, binary-parsers + , blaze-textual, bytestring, bytestring-lexing, cryptonite + , io-streams, memory, monad-loops, network, scientific, tasty + , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams + , word24 + }: + mkDerivation { + pname = "mysql-haskell"; + version = "0.8.1.0"; + sha256 = "02nxfm3y7f24gqs4hac5pk2q32l0xvaspby6n56zcrdwmpfs3241"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -126588,7 +135123,7 @@ self: { mkDerivation { pname = "mysql-haskell-nem"; version = "0.1.0.0"; - sha256 = "7a0868b76edc96a7aff7860f96436b9040f6cb9319dd67f68bfd700948721f0d"; + sha256 = "038zf940jw7xigv6gp8rjg5zch4hdd1rc3w6yypsg5nwdsvnh23s"; libraryHaskellDepends = [ base bytestring io-streams mysql-haskell scientific text time ]; @@ -126605,7 +135140,7 @@ self: { mkDerivation { pname = "mysql-haskell-openssl"; version = "0.8.0.0"; - sha256 = "653df3a834ee18da50c2f740a9d241b0d0bc046b584c4fbc66e5a529ff27b616"; + sha256 = "05mn4zzjk9g5csy4yk2qdc2brl5h879ajh7pq98dl67f6jlg6gb5"; libraryHaskellDepends = [ base HsOpenSSL io-streams mysql-haskell network tcp-streams tcp-streams-openssl wire-streams @@ -126624,7 +135159,7 @@ self: { mkDerivation { pname = "mysql-simple"; version = "0.4.0.1"; - sha256 = "1b559d28555c88c6ab016b82d6cdd78357e9479d45bfd6cc1b3a88643c4cbf2d"; + sha256 = "0bdz9hy6921s3g6ddgs5km3yjmw3sz6xd0kb06mwd22wall9sm8v"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring mysql old-locale pcre-light text time @@ -126643,7 +135178,7 @@ self: { mkDerivation { pname = "mysql-simple-quasi"; version = "1.0.0.2"; - sha256 = "c85eee4597391ff1af6887ba5e508415caac827c2c7f7a261ea2e781acc4f8bd"; + sha256 = "1ggqqjn83rx23qk7lzrcgj1arjhmhi85xfl7d2pz27rrjx2ywpn8"; libraryHaskellDepends = [ base haskell-src-meta mysql-simple template-haskell ]; @@ -126659,7 +135194,7 @@ self: { mkDerivation { pname = "mysql-simple-typed"; version = "0.1.1.3"; - sha256 = "64afad06c25c253fa1a99be90d94f6f3c43a3e49ce74a4b90316dd9e933ed2bd"; + sha256 = "1gfj7s9rxp8n0fws8x6f94z3mi7kysa0vscvm6hky9awq83avbv4"; libraryHaskellDepends = [ base mysql mysql-simple template-haskell typedquery utf8-string ]; @@ -126676,7 +135211,7 @@ self: { mkDerivation { pname = "mystem"; version = "0.1.0.0"; - sha256 = "3d42ce765daee82a3a4d60270ce8ef85c95f71f0374a2562f91a6d5a2251645d"; + sha256 = "0pb4a4i5lv8sz5i2ajipy1qmzjc5xzl0q9v09lx2ms5fbmvcwhix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126691,21 +135226,21 @@ self: { "mywatch" = callPackage ({ mkDerivation, aeson, base, bytestring, ConfigFile - , data-default-class, docopt, fast-logger, http-types + , data-default-class, docopt, fast-logger, filepath, http-types , interpolatedstring-perl6, MissingH, mtl, mysql, mysql-simple , network, resource-pool, scotty, text, unix, unordered-containers , wai, wai-extra, wai-middleware-static, warp }: mkDerivation { pname = "mywatch"; - version = "0.2.1"; - sha256 = "f0cf3ba9a265b60e02feb118bfab66810f188bd34414a7d6a9be6318644d21fa"; + version = "0.3.0"; + sha256 = "1a7fqyn0pvnbxzn9fiaib4pj7hq5p2qgnbdwryg70lkgnjm4y0h4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring ConfigFile data-default-class docopt - fast-logger http-types interpolatedstring-perl6 MissingH mtl mysql - mysql-simple network resource-pool scotty text unix + fast-logger filepath http-types interpolatedstring-perl6 MissingH + mtl mysql mysql-simple network resource-pool scotty text unix unordered-containers wai wai-extra wai-middleware-static warp ]; description = "Web application to view and kill MySQL queries"; @@ -126718,7 +135253,7 @@ self: { mkDerivation { pname = "mzv"; version = "0.1.0.2"; - sha256 = "54a86a422f4949f9d63a0c7e68a011fb01ca1eb315e871af2d4f63ffe5419d10"; + sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/ifigueroap/mzv"; description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)"; @@ -126731,7 +135266,7 @@ self: { mkDerivation { pname = "n-m"; version = "0.0.1"; - sha256 = "f5aca5c66dcbeed7637a743215bf7019eaf9f2ab4c5af889700c9ce5105d3ea1"; + sha256 = "189ybl8fb70cf24zhnjcmgrgkshrf2ziacklg9ixgvnbdp3abb7m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -126741,6 +135276,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "n-tuple" = callPackage + ({ mkDerivation, base, singletons, vector }: + mkDerivation { + pname = "n-tuple"; + version = "0.0.1.1"; + sha256 = "1pwz4rs0bbanhlwcm7v06s4dkwr3h41w203kab1s7k201na7j9r1"; + libraryHaskellDepends = [ base singletons vector ]; + homepage = "https://github.com/athanclark/n-tuple#readme"; + description = "Homogeneous tuples of arbitrary length"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nagios-check" = callPackage ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl , QuickCheck, text @@ -126748,7 +135295,7 @@ self: { mkDerivation { pname = "nagios-check"; version = "0.3.2"; - sha256 = "1bc9b85cb10c396943d53c44e2701c5bc2a02ecdf3e8f46da238981f8b7860b7"; + sha256 = "1dv0g25iz61ql9nz9s7krlpa1hjv3iqf4i1wsm1njf8cn5fbij8v"; libraryHaskellDepends = [ base bifunctors exceptions mtl text ]; testHaskellDepends = [ base hspec QuickCheck text ]; homepage = "https://github.com/olorin/haskell-nagios-check"; @@ -126763,7 +135310,7 @@ self: { mkDerivation { pname = "nagios-perfdata"; version = "0.2.2"; - sha256 = "42b4be9382c3c6a02c662c33a7443ac30790c4ab7311610f5caabdbe5d213595"; + sha256 = "159m45fvxgdabh7n24bkmg2901y3792afcrccqna1in3ha9vxd22"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers mtl ]; @@ -126783,7 +135330,7 @@ self: { mkDerivation { pname = "nagios-plugin-ekg"; version = "0.1.1.0"; - sha256 = "30cffe4a1a2ced95299c0ef22b115f0f521a9e41c3032dbdaa7324dbe1d566e6"; + sha256 = "1rk6sphxn93kmayjs0y386g1llhgbw8jpwhfkhlrbv9c395gxkrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126800,6 +135347,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "namecoin-update" = callPackage + ({ mkDerivation, aeson, attoparsec, base, lens, text, wreq }: + mkDerivation { + pname = "namecoin-update"; + version = "0.2.1.0"; + sha256 = "1vz4n57xk8zbyqiwsm69mls31f36ng0bh9av5axi3rq7car2jlxz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson attoparsec base lens text wreq ]; + executableHaskellDepends = [ base text ]; + description = "Tool to keep namecoin names updated and well"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -126807,7 +135368,7 @@ self: { mkDerivation { pname = "named-formlet"; version = "0.2"; - sha256 = "c72349ff730a709c765081ce1d6e7a4984d012f5cb80137ab1b65b3680edf272"; + sha256 = "0wpjxn03cnxnn5x1706byl9d1129g9p1vkl1a1v9qw0afgzlj8y7"; libraryHaskellDepends = [ base blaze-html bytestring containers mtl text transformers ]; @@ -126820,7 +135381,7 @@ self: { mkDerivation { pname = "named-lock"; version = "0.1"; - sha256 = "9188040373f6d97d14df3b34f491419ab809b058f695cfaf99bea481851361b5"; + sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i"; libraryHaskellDepends = [ base containers ]; homepage = "http://github.com/nominolo/named-lock"; description = "A named lock that is created on demand"; @@ -126833,7 +135394,7 @@ self: { mkDerivation { pname = "named-records"; version = "0.5"; - sha256 = "99e7b831d8291f4b6c9cbdacc2924d818ec10249a94d009a937f186d6dad6c7a"; + sha256 = "0ykcmmnns63zjfd00kd9941c33l19n9c5b5xkin4n7r9v0qvirwr"; libraryHaskellDepends = [ base binary names template-haskell ]; description = "Flexible records with named fields"; license = stdenv.lib.licenses.mit; @@ -126846,7 +135407,7 @@ self: { mkDerivation { pname = "namelist"; version = "0.1.0"; - sha256 = "9a1c59077ee5e6af15dbdc238ef365a554f43880d2918f2dffd90dd842c3d169"; + sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s"; libraryHaskellDepends = [ base case-insensitive data-default-class parsec ]; @@ -126864,7 +135425,7 @@ self: { mkDerivation { pname = "names"; version = "0.3.1"; - sha256 = "afe4cf6115492d794893ea38b4f7ace2b4c4b665da6387e4567266f741ba526a"; + sha256 = "0sjjp90zfrkjavj8fqyscnvc9d72mkvv8f7ajd47jba92mhwzr5g"; libraryHaskellDepends = [ base template-haskell ]; description = "Type level names"; license = stdenv.lib.licenses.mit; @@ -126875,19 +135436,32 @@ self: { mkDerivation { pname = "names-th"; version = "0.2.0.2"; - sha256 = "88807d7d25d1f4e56b6576c4c3bda7dcbe0be6dd1210b7d6337616e21c59bf26"; + sha256 = "09mzb4ff45kn6gbbf40jvpk0pgnwlyyw7i3ncmmybx6i4mypv048"; libraryHaskellDepends = [ base containers template-haskell ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Manipulate name strings for TH"; 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 { pname = "namespace"; version = "0.1.3.0"; - sha256 = "bfb9ce8386eb72cb1e00b06632140629fc587128c0729dd85f29a022b5c82a06"; + sha256 = "01iar2sj5819bzc9swn051qmiz190qa34rmh00gcnwpbhs1wxfdz"; libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; homepage = "https://github.com/xu-hao/namespace"; @@ -126900,7 +135474,7 @@ self: { mkDerivation { pname = "nano-cryptr"; version = "0.1.1.3"; - sha256 = "c8b923b74f2f4e34e6d8d33041a3028af3399a0c414a2807c284214211fd1cdf"; + sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/chowells79/nano-cryptr"; description = "A threadsafe binding to glibc's crypt_r function"; @@ -126913,7 +135487,7 @@ self: { mkDerivation { pname = "nano-erl"; version = "0.1.0.1"; - sha256 = "370a60682b38ca77b793ee7326c54d5e74dd688f316f31fdd5cf999ad498ee12"; + sha256 = "04pfk3a9m6fgspyk2vriixldsx2y9p2jcwzfjfvpgjiq5dl602ip"; libraryHaskellDepends = [ base stm ]; description = "Small library for Erlang-style actor semantics"; license = stdenv.lib.licenses.mit; @@ -126924,7 +135498,7 @@ self: { mkDerivation { pname = "nano-hmac"; version = "0.2.0"; - sha256 = "d8ba32a4538dd5c84688160aa3bc8b2b923077e81e474daa0c54ed3a58503c67"; + sha256 = "0rrwa1c3mval1jm4siqyx1vk14ibifya62hni13cimcdafj35fnq"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; homepage = "http://www.jasani.org/search/label/nano-hmac"; @@ -126938,9 +135512,9 @@ self: { mkDerivation { pname = "nano-md5"; version = "0.1.2"; - sha256 = "73a93b3b0f1542f346080049b152288751f214eb38d3014f157b026e8e1faba1"; + sha256 = "18db3y76w0kv2m7h3lrqxcag4lc7519b2j80113g6hhm1wxkpabk"; revision = "1"; - editedCabalFile = "8ab99bab8912dff1faaeb2b7acc7a15b705b135c24f7262147be56331d707a24"; + editedCabalFile = "093sf0fk6mmy8whjdxr4bh9mnw2vl73srdxjmvxg3pqji6mrpfca"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; homepage = "http://code.haskell.org/~dons/code/nano-md5"; @@ -126956,7 +135530,7 @@ self: { mkDerivation { pname = "nanoAgda"; version = "1.0.0"; - sha256 = "55a7a87f992d2042062d5c971da4e52bec9ca8db580f11e4b1dd2421b5e6950c"; + sha256 = "034mwssj296xn7j123sqvfl9rv1bwnj1v5sw5l34481dk5zsi9sm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126972,7 +135546,7 @@ self: { mkDerivation { pname = "nanocurses"; version = "1.5.2"; - sha256 = "35bc629de613a20f7f885ea5222378f40bd28befe07e575d68a637b9f7706f12"; + sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m"; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ ncurses ]; homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html"; @@ -126986,7 +135560,7 @@ self: { mkDerivation { pname = "nanomsg"; version = "0.1.1"; - sha256 = "e3364e1c9c00931fc8d750d7804b16ce9c86fb18bd23db4c3e3fca2e87464b1a"; + sha256 = "06jb8s3jxjiz7r6dn8xx33xqd76f2r5q1mshsz41z4q0khf4wdp3"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ nanomsg ]; description = "nanomsg - scalability protocols library"; @@ -127002,7 +135576,7 @@ self: { mkDerivation { pname = "nanomsg-haskell"; version = "0.2.3"; - sha256 = "1d535d846c7fd4ca54d1235a25f0b887c301a1af0cf23a551b994a4bbc923f61"; + sha256 = "0q9zjay4njlr3dakmwhcmyhh3hw7p3q2ani3s5acmm3zdj25slqx"; libraryHaskellDepends = [ base binary bytestring ]; librarySystemDepends = [ nanomsg ]; testHaskellDepends = [ @@ -127023,7 +135597,7 @@ self: { mkDerivation { pname = "nanoparsec"; version = "0.1.1"; - sha256 = "75d8c57ffca0dbd65b2092ea79e54658f706f03f180ab2cf236242fde76ff001"; + sha256 = "00ghdzkzshk24g7v42hq7zq0dxsq8vjpkslj41dxdnx0zizwbn3m"; libraryHaskellDepends = [ base bytestring ListLike ]; description = "An implementation of attoparsec-like parser around list-like"; license = stdenv.lib.licenses.bsd3; @@ -127035,7 +135609,7 @@ self: { mkDerivation { pname = "nanospec"; version = "0.2.1"; - sha256 = "dbcbd9baa57fc9aa573cc2e291bb93c787dc0d7aac9793b2a10c125f69a0024b"; + sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec silently ]; description = "A lightweight implementation of a subset of Hspec's API"; @@ -127049,9 +135623,9 @@ self: { mkDerivation { pname = "nanovg"; version = "0.5.2.0"; - sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d"; + sha256 = "0p8g3235srd23vpy2yvw68sxdx4mb31m09yvm8im3rbhfwi1vqr2"; revision = "1"; - editedCabalFile = "ab822c8c3baab11820f06e9c34ba59c97789625020fabf476338cc17b2e74853"; + editedCabalFile = "0ls8wyr1gk1qcd3vzyi0a1i8jxy9b6x3973fy0h1icda7f62r0mb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; @@ -127072,7 +135646,7 @@ self: { mkDerivation { pname = "nanq"; version = "3.0.1"; - sha256 = "2d7680de6cb0d12d5960c3bf9eb1c9ed00092454f1ff9dac7dedd8aef365f2b5"; + sha256 = "1dgjcprsxn7dgnn9vzziahj0j07dr6qrxgy3c1cjvldhdkg80xid"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127085,12 +135659,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "naqsha" = callPackage + ({ mkDerivation, base, data-default, groups, hspec, HUnit + , QuickCheck, vector + }: + mkDerivation { + pname = "naqsha"; + version = "0.1.0.0"; + sha256 = "11n8vbpngwxj41vbvlp731anc5pzsbjc05czvpprvld8yxdx4vmf"; + libraryHaskellDepends = [ base data-default groups vector ]; + testHaskellDepends = [ base groups hspec HUnit QuickCheck ]; + homepage = "http://github.com/naqsha/naqsha.git"; + description = "A library for working with geospatial data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "narc" = callPackage ({ mkDerivation, base, HDBC, HUnit, mtl, QuickCheck, random }: mkDerivation { pname = "narc"; version = "0.1.3"; - sha256 = "4c3b30fd459cd12d90e55118596e166732bb0af8faa179c74bd0381ae4cfe1d9"; + sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc"; libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ]; homepage = "http://ezrakilty.net/projects/narc"; description = "Query SQL databases using Nested Relational Calculus embedded in Haskell"; @@ -127103,20 +135692,20 @@ self: { mkDerivation { pname = "nat"; version = "0.3"; - sha256 = "c5d58fc25be8a3bd1e996700a66057b2638dac3298715b7d45168b935b6083ec"; + sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5"; libraryHaskellDepends = [ base ]; description = "Lazy binary natural numbers"; license = stdenv.lib.licenses.bsd3; }) {}; "nat-sized-numbers" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, smallcheck }: + ({ mkDerivation, base, deepseq, doctest, hedgehog, QuickCheck }: mkDerivation { pname = "nat-sized-numbers"; - version = "0.1.0.0"; - sha256 = "64b862c8e64ccd3d71dc62723dc84817f9b1aeea45818d535cca60575de34144"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck smallcheck ]; + version = "0.3.0.0"; + sha256 = "1hkgg8hfsbvq46ndlwpz5apkc4yyarq2yvbghfkx8qgsyacfgrml"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base doctest hedgehog QuickCheck ]; homepage = "https://github.com/oisdk/nat-sized-numbers#readme"; description = "Variable-sized numbers from type-level nats"; license = stdenv.lib.licenses.mit; @@ -127130,7 +135719,7 @@ self: { mkDerivation { pname = "nationstates"; version = "0.5.0.0"; - sha256 = "020efcdc1b16ae77ce2488180c02e398db45745adc96da2e9b406f27d7f75692"; + sha256 = "14jnyzbjfvs0kcpdm5nwb9s4bnwqwc10q6484k77gbhn3gfgq3h2"; libraryHaskellDepends = [ base bytestring clock containers http-client http-client-tls http-types multiset tls transformers xml @@ -127147,7 +135736,7 @@ self: { mkDerivation { pname = "native"; version = "0.1.0.1"; - sha256 = "7f18590d63af1dbb134f1768b2173009283865f35bb47eaa04e98377ee66ecaf"; + sha256 = "1bzccvp7g0z90jm7xd2vydjkha0960bv4s0p9w9vn7dgcc6mj63z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127165,7 +135754,7 @@ self: { mkDerivation { pname = "nats"; version = "1.1.1"; - sha256 = "131d1b4857cd1c0699ef60aeb41af923ee3e0ecd26ed1324c067d993bc17d4cd"; + sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k"; doHaddock = false; homepage = "http://github.com/ekmett/nats/"; description = "Natural numbers"; @@ -127179,7 +135768,7 @@ self: { mkDerivation { pname = "nats-queue"; version = "0.1.2.2"; - sha256 = "f2b59d789feb12d0192a63227b5a114a353c21214276f3478474c561a0b9f5ed"; + sha256 = "1vgmp6h63iblhi3z6xj244hkqdaa25d7n8k358cx04pbkxw9vdgj"; libraryHaskellDepends = [ aeson async base bytestring containers dequeue network network-uri random text @@ -127200,7 +135789,7 @@ self: { mkDerivation { pname = "natural-number"; version = "1.0"; - sha256 = "bddc37b81d39d34ac0c4b99d220090fc52d3ba5c44796a3dbfa03012977c18d9"; + sha256 = "1n8qgjbi4c50pwynlya4bjxd6lpwj00257drqk04mlrr3nw3gp5x"; libraryHaskellDepends = [ base type-equality type-level-natural-number type-level-natural-number-induction @@ -127215,7 +135804,7 @@ self: { mkDerivation { pname = "natural-numbers"; version = "0.1.2.0"; - sha256 = "965fdd3763555123f3ed1a335edbf1b0a755a04b1bf7385711c4e74dada54932"; + sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn"; libraryHaskellDepends = [ base ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/natural-numbers"; description = "Natural numbers"; @@ -127227,7 +135816,7 @@ self: { mkDerivation { pname = "natural-sort"; version = "0.1.2"; - sha256 = "7b72b734680827ab07df38a004d4f523540055389d62fcd587edd2fcf19a6b50"; + sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv"; libraryHaskellDepends = [ base bytestring parsec text ]; homepage = "https://john-millikin.com/software/natural-sort/"; description = "User-friendly text collation"; @@ -127241,7 +135830,9 @@ self: { mkDerivation { pname = "natural-transformation"; version = "0.4"; - sha256 = "aac28e2c1147ed77c1ec0f0eb607a577fa26d0fd67474293ba860ec124efc8af"; + sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; + revision = "1"; + editedCabalFile = "1scwm1gs07znkj4ahfyxpwrksj4rdl1pa81xflcqhkqfgcndvgl3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -127256,7 +135847,7 @@ self: { mkDerivation { pname = "naturalcomp"; version = "0.0.3"; - sha256 = "5d105e8d34ad36015e9598d52b189bfc5339e67e5e6500211565f9d12625a9d0"; + sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x"; libraryHaskellDepends = [ base text utf8-string ]; homepage = "not yet available"; description = "Natural-order string comparison"; @@ -127268,7 +135859,7 @@ self: { mkDerivation { pname = "naturals"; version = "0.2.0.2"; - sha256 = "2654d9083a478706c82fcb524947e8882b1a252679b01f02818ab5315048c2ab"; + sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16"; libraryHaskellDepends = [ base ]; homepage = "frigidcode.com"; description = "Constructors and related functions for natural numbers"; @@ -127282,7 +135873,7 @@ self: { mkDerivation { pname = "naver-translate"; version = "0.1.0.2"; - sha256 = "ea4bd9f0eb8eef5f89d9715ab893238db39cdc186617ec8ec93b8c9fce817542"; + sha256 = "0hkmh779z31vr67fq5v633f9rcwd4f9vhnkiv64mzvwfxgqdjjza"; libraryHaskellDepends = [ aeson base iso639 lens lens-aeson network-uri random text wreq ]; @@ -127300,7 +135891,7 @@ self: { mkDerivation { pname = "nbt"; version = "0.6"; - sha256 = "4db207844f21a0073d6346613d61cf00b02a7da7c32ba501413c3b0624ed9651"; + sha256 = "0lcnxlj0cfrw840saay3lxyjmc00rxhksqa6ccyhg8119y20gcjd"; libraryHaskellDepends = [ array base bytestring cereal text ]; testHaskellDepends = [ array base bytestring cereal HUnit QuickCheck test-framework @@ -127318,7 +135909,7 @@ self: { mkDerivation { pname = "nc-indicators"; version = "0.3"; - sha256 = "75588f72d294101a4a8f879faf5e7aaa86d7de4a56dd66d2df69459d636bb670"; + sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127337,9 +135928,9 @@ self: { mkDerivation { pname = "ncurses"; version = "0.2.16"; - sha256 = "e50fb7b1f700d6fa60b4040623b7e0249ae6af2ef2729801fb2917e8b1f25e3f"; + sha256 = "0gsyyaqyh5r9zc0rhwpj5spyd6i4w2vj61h4nihgmmh0yyqvf3z5"; revision = "1"; - editedCabalFile = "8ad9fe6562a80d28166d76adbac1eb4d40c6511fe4e9272ed6e1166dc2f1cdf1"; + editedCabalFile = "1wfdy716s5p1sqp2gsg43x8wch2dxg0vmbbndlb2h3d8c9jzxnca"; libraryHaskellDepends = [ base containers text transformers ]; librarySystemDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; @@ -127353,7 +135944,7 @@ self: { mkDerivation { pname = "ndjson-conduit"; version = "0.1.0.5"; - sha256 = "c037b8f7c47b146f1384585541ae8a4f9218bc4456f428935f973ae07da49db1"; + sha256 = "1ccxliyy0flpby9jix2n8jy1i4jgiap42maqhh9ny53vqkvvhdy0"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit ]; @@ -127367,7 +135958,7 @@ self: { mkDerivation { pname = "neat"; version = "0.1.0"; - sha256 = "539add46d102a12c153fb4366bfa79e8e67fb94839d5fa532bed4f472d650552"; + sha256 = "0lh5clnlfkzd5d9zmm9r92wpzrp8g7x6ndml7wajr882s53dv6jk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath parsec ]; @@ -127385,7 +135976,7 @@ self: { mkDerivation { pname = "neat-interpolation"; version = "0.3.2.1"; - sha256 = "5530e43ca4de09b972d173e522f9dc96265f3afe0df695a25f0141be816fa014"; + sha256 = "0550dy0vwh81byi9bxhdzqx5y9lnvkwj5rbks5rbj2fylhyf8c2m"; libraryHaskellDepends = [ base base-prelude parsec template-haskell text ]; @@ -127402,7 +135993,7 @@ self: { mkDerivation { pname = "needle"; version = "0.1.0.1"; - sha256 = "e2f9f39947d5ed9eeced7bb3069f4d14859856c97f9d2d4168abed7a94acf0dc"; + sha256 = "1p7hmja7mvdbd10jv7bzr5b9i18l9nghdcvvxpn9xvfm8ycz7yg2"; libraryHaskellDepends = [ base containers haskell-src-meta mtl parsec parsec-extra template-haskell text vector @@ -127420,7 +136011,7 @@ self: { mkDerivation { pname = "neet"; version = "0.4.0.1"; - sha256 = "f27956192a15ec9dc4d869c980562ced7abe3b4fda584b9ed89ac9036684cf9c"; + sha256 = "176ghik07jcsv2g4nn6s9wxvwypd5ib81jb9v329vv0m58cmcygj"; libraryHaskellDepends = [ base cereal containers graphviz MonadRandom multimap parallel random transformers @@ -127438,7 +136029,7 @@ self: { mkDerivation { pname = "nehe-tuts"; version = "0.2.4"; - sha256 = "208bca9c3d65c2ad99438da6548abfcadd5824d987ec8ea9109490f910a2f403"; + sha256 = "00zll88gk44l22lqxv47v4j5ipfapy5599ld8fcsvhk57nfcm2r0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127457,7 +136048,7 @@ self: { mkDerivation { pname = "neil"; version = "0.10"; - sha256 = "7bf2215903836e058bdbbc0c884e773f081c03f79cfa99964e620969e03a139f"; + sha256 = "17qk7bh6j2b29sb9kylwyw1iq21zfx78h35wvf5havl30dcj3wkv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127474,7 +136065,7 @@ self: { mkDerivation { pname = "neither"; version = "0.3.1.1"; - sha256 = "ce07d3be22d9dc157d78b3455dd70df42995552f5d1d2ca5cbf786e5014154a4"; + sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf"; libraryHaskellDepends = [ base failure transformers ]; homepage = "http://github.com/snoyberg/neither"; description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; @@ -127489,7 +136080,7 @@ self: { mkDerivation { pname = "nemesis"; version = "2016.3.19"; - sha256 = "a72583758c5ca2fc769171155c8371bda4f654add0f6de1065790177ed138635"; + sha256 = "0dc62gnpf0brcl8dxxnhmmagd95xf61mq5bij5vgr8jwiisq69d7"; libraryHaskellDepends = [ base containers directory dlist Glob lens mtl process time ]; @@ -127505,7 +136096,7 @@ self: { mkDerivation { pname = "nemesis-titan"; version = "2014.5.19"; - sha256 = "ad76a2da37da0b483dcb8205c71ed95ffdb24f5321fccedd2c2e53513e3775a0"; + sha256 = "183m6wz52lrf5kfwxz11ad7v5zazv4gcf1c2rcylh2ys6zda4xmd"; libraryHaskellDepends = [ air air-th base bytestring directory filepath hspec HStringTemplate nemesis random uuid @@ -127525,7 +136116,7 @@ self: { mkDerivation { pname = "nerf"; version = "0.5.3"; - sha256 = "5311500253965eb5163a1505b9bb2882299f76f354b4b66425e8982ce69333a3"; + sha256 = "18rkjgk2r6784mjbdd2lydv9yac252xvj18m78bbaplnac1504ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127547,7 +136138,7 @@ self: { mkDerivation { pname = "nero"; version = "0.3.1"; - sha256 = "a0349a6ae3650a53b5b49127da4101447e9d75274a1c7b2fec21c1d81b9eb1da"; + sha256 = "1nmikqdxih91xhppn72a4xsrszj4050xl9winjsm62k5wdm9ld50"; libraryHaskellDepends = [ base bifunctors bytestring containers lens text ]; @@ -127567,7 +136158,7 @@ self: { mkDerivation { pname = "nero-wai"; version = "0.3"; - sha256 = "5ca1f5a3fd0d91c3ae6ea98b23a94de40bea8f9754e63c038ed8d150b4e2e2cb"; + sha256 = "1jz2was51lfqiq1krrjljy7yl2z49nlj72x9dspc748dznizb8aw"; libraryHaskellDepends = [ base bytestring http-types lens nero text wai wai-extra ]; @@ -127582,7 +136173,7 @@ self: { mkDerivation { pname = "nero-warp"; version = "0.3"; - sha256 = "1a9094c0c274f987cb9db1d4206e9f8e1df4415c0e80b58a23279f9e3404b9b5"; + sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s"; libraryHaskellDepends = [ base nero nero-wai warp ]; homepage = "https://github.com/plutonbrb/nero-warp"; description = "Run Nero server applications with Warp"; @@ -127591,22 +136182,23 @@ self: { }) {}; "nested-routes" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, composition-extra - , errors, exceptions, hashable, hashtables, HSet, hspec, hspec-wai - , http-types, mtl, poly-arity, pred-set, pred-trie, regex-compat - , semigroups, tasty, tasty-hspec, text, transformers, tries - , unordered-containers, wai-middleware-content-type - , wai-middleware-verbs, wai-transformers + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , composition-extra, errors, exceptions, hashable, hashtables, HSet + , hspec, hspec-wai, http-types, mtl, poly-arity, pred-set + , pred-trie, regex-compat, semigroups, tasty, tasty-hspec, text + , transformers, tries, unordered-containers + , wai-middleware-content-type, wai-middleware-verbs + , wai-transformers }: mkDerivation { pname = "nested-routes"; - version = "7.2.2"; - sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9"; + version = "8.0.0"; + sha256 = "0pw004nf1wngq415i0chydckf9aicss0g1n5z4rza933kxanaz5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable hashtables mtl poly-arity pred-set pred-trie regex-compat + attoparsec base bifunctors bytestring errors exceptions hashable + hashtables mtl poly-arity pred-set pred-trie regex-compat semigroups text transformers tries unordered-containers wai-middleware-content-type wai-middleware-verbs wai-transformers ]; @@ -127629,7 +136221,7 @@ self: { mkDerivation { pname = "nested-sequence"; version = "0.2"; - sha256 = "6cd980c6f15d6a664d8d8b1255a5472bf524e9bce956811b39ef61617a7b5e53"; + sha256 = "0lsygdx62qgg74dq2mp9pklj9x9b8yjma4lbim6ncsjxy7381nbc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -127644,7 +136236,7 @@ self: { mkDerivation { pname = "nested-sets"; version = "0.0.1.1"; - sha256 = "915cd4c664ec8d5d1575f2a7963ae529bd0667c8d1bbd3f715d0a76ea8be7728"; + sha256 = "0a3ppsl6x9yh2pvx7fyir1khdg99wlx9d9zjflamv3gcck3d8p4i"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "Nested set model implementation"; @@ -127658,7 +136250,7 @@ self: { mkDerivation { pname = "nestedmap"; version = "0.1.0.3"; - sha256 = "542ab8bfb173b79e7d409311cf8bab5a0c9fee16e6c318cfea25fb8f75493ac2"; + sha256 = "1his95sqzyr5xb7iihz62vp9y32smf5wy4ck81yrxdvkn6zvhajl"; libraryHaskellDepends = [ base base-unicode-symbols containers ]; testHaskellDepends = [ base base-unicode-symbols containers data-ordlist hspec QuickCheck @@ -127675,7 +136267,7 @@ self: { mkDerivation { pname = "net-concurrent"; version = "0.1.0"; - sha256 = "0624d4108f27c055b306788a252e8342b64d37f84c763f8407013e6cd1f0252b"; + sha256 = "0ar5y38nqgh10y23yxjcz0vlvdj2hcp2b2kq0srmbh17iw8d8906"; libraryHaskellDepends = [ base bytestring containers ghc-binary hslogger monad-loops network ]; @@ -127690,7 +136282,7 @@ self: { mkDerivation { pname = "netclock"; version = "0.6"; - sha256 = "e82677679268f2140d9c81e8a2e4adca4db85992265b28e8d72b6de83ef3536f"; + sha256 = "0vskyczfhv9bszl2hnr6j9cvhkfampja5s41kh6i9wk8j9kpf9p8"; libraryHaskellDepends = [ base bytestring hosc network ]; homepage = "http://netclock.slab.org/"; description = "Netclock protocol"; @@ -127707,7 +136299,7 @@ self: { mkDerivation { pname = "netcore"; version = "1.0.0"; - sha256 = "45a5c0da1906e49eb94af8a76228e9d6172de698d828f9aead957fbd5d85382e"; + sha256 = "0biqhmfvszwmmnpgja6qk3k2s5ynx4l659zq9awrxr0637dc19a5"; libraryHaskellDepends = [ ansi-wl-pprint base bimap binary binary-strict bytestring containers fgl HList hslogger mtl multiset network parsec process @@ -127740,7 +136332,7 @@ self: { mkDerivation { pname = "netease-fm"; version = "1.2.2"; - sha256 = "a9052877b00ae471603960e2043302ceb9dfc4ca0f64550966de0ab10053aab6"; + sha256 = "1dmaac0b22nycq4mar0grb2dzfff08rh9qk075h73r0an1vjh1d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127766,7 +136358,7 @@ self: { mkDerivation { pname = "netlines"; version = "1.0.0"; - sha256 = "f2c97065cc4d843ec5c28db464e67be176e0048d1ab4d8d0a70940981351cc00"; + sha256 = "006ca49rhh09lz8did0sil2f0xp1ggk69d4dqb2kx12drijp1jgj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127785,7 +136377,7 @@ self: { mkDerivation { pname = "netlink"; version = "1.1.0.0"; - sha256 = "48f59a7822b2e3dab8baed1d1cd3a3dca1e7744a82f9078c71ec1ce3f6ddf083"; + sha256 = "10zhvpvf677cf660gyc299sfg8fwlg9iq7gdpawdmqxj49w9mxa8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127802,7 +136394,7 @@ self: { mkDerivation { pname = "netlist"; version = "0.3.1"; - sha256 = "c7d4ee1f6f3d8a09daea45d72ee16aac784ac02719afeffa936a5cf0eee36e38"; + sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67"; libraryHaskellDepends = [ base binary containers syb ]; description = "Netlist AST"; license = stdenv.lib.licenses.bsd3; @@ -127813,7 +136405,7 @@ self: { mkDerivation { pname = "netlist-to-vhdl"; version = "0.3.2"; - sha256 = "c128e165707a35b046057a64d3a939b9c07b99761cdaccdd94581809e39cf780"; + sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61"; libraryHaskellDepends = [ base netlist pretty ]; description = "Convert a Netlist AST to VHDL"; license = stdenv.lib.licenses.bsd3; @@ -127827,9 +136419,9 @@ self: { mkDerivation { pname = "netpbm"; version = "1.0.2"; - sha256 = "846a04bca94be31c779888febc390c64cfba93e40f3a7a2f80ff6a6e44fcc2d7"; + sha256 = "1my2zi26wspzh0pplfhgwj9vmkv41hwvrzl8k1virqsbm6y08sl4"; revision = "1"; - editedCabalFile = "a0d0ed6bfda0c77c9842b627403392757df62d29aa0994124db6bfc2ca961cee"; + editedCabalFile = "1vhwjv5c5gxn9l9982da54nzczbmj8rl09xn8ac7rix0zmmyvl50"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring storable-record unordered-containers vector vector-th-unbox @@ -127848,9 +136440,9 @@ self: { mkDerivation { pname = "netrc"; version = "0.2.0.0"; - sha256 = "9a5e07efa44f4b715b110aa4f9687e2b75458fb7537a2f4f1a3582c9e2e82a86"; - revision = "2"; - editedCabalFile = "81e838434e1cae11b94edbcfb61fee89f847a32e5a745fe59de69e6af9207ac9"; + sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; + revision = "3"; + editedCabalFile = "1j0s7r9hzisi8zacs505rxh9pk05m5hrrcxn8jnh7w8yphyqbv4j"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -127867,7 +136459,7 @@ self: { mkDerivation { pname = "netspec"; version = "0.2.0.0"; - sha256 = "5831b4dca07bb02736b5e3a5d91969bb6aea87868f236550551f64e36e51ac62"; + sha256 = "0qmca5pf6r0zam86a8wghs3ylsmvd4cxk9g3nlv2gc3vl3fb8caq"; libraryHaskellDepends = [ aeson base binary bytestring mtl network template-haskell text transformers @@ -127883,7 +136475,7 @@ self: { mkDerivation { pname = "netstring-enumerator"; version = "0.1.1"; - sha256 = "75c232b70e53430128efcfb5d4401ef4c803bd8964f1912299201e5050432fd8"; + sha256 = "1n1g8d8507i0k4i93wb4i6yh7j7l3r0d9dfgxwl02hsk1svk5hkm"; libraryHaskellDepends = [ base bytestring enumerator transformers ]; @@ -127902,7 +136494,7 @@ self: { mkDerivation { pname = "nettle"; version = "0.2.0"; - sha256 = "220184713b802c53ee26783b891a3bbee6c6b2571f798bd6def2496a504e9bde"; + sha256 = "1plv9r86ljgjvvb8ny8zayrcdrmy7cd8jfvq4vp56b407dqq8092"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; @@ -127925,7 +136517,7 @@ self: { mkDerivation { pname = "nettle-frp"; version = "0.1.1"; - sha256 = "9951b429dba5ace3a12d2a99d9893dbc0307ad5a322099437f2145b6874a6b4a"; + sha256 = "0jkb9a3vci91gx1rj81jbanhf0xw7n4xk69a5nhy7b55vclv8lcr"; libraryHaskellDepends = [ base bimap binary bytestring containers mtl nettle-openflow network network-data random time @@ -127942,7 +136534,7 @@ self: { mkDerivation { pname = "nettle-netkit"; version = "0.2.0"; - sha256 = "977a661005238467bbaca27114ecfa4c0e2bfc46f43b4bf0df2b3b5c5b255194"; + sha256 = "152i4mdmqfrbvzq4nfzl8vy2n3jczbn18wd2mjxng1130l86cylp"; libraryHaskellDepends = [ base containers directory filepath mtl nettle-openflow unix ]; @@ -127958,7 +136550,7 @@ self: { mkDerivation { pname = "nettle-openflow"; version = "0.2.0"; - sha256 = "f3b562757db4db5386a7ddc28cfa480e473f513cbeb75667ddd168f4f56d89c9"; + sha256 = "1jc9dpsz8s6ivmkmddxy7i8kyiqf93x8rhnxly357nxlgmsn5dgk"; libraryHaskellDepends = [ array base bimap binary binary-strict bytestring containers HList mtl network parsec syb @@ -127975,7 +136567,7 @@ self: { mkDerivation { pname = "netwire"; version = "5.0.2"; - sha256 = "4d790f19642c62e555d167d53d88da56cc83daf093ff4ee37c83e21a2112cd83"; + sha256 = "10yd28himql3gkilxzwky3d87k2nva43vmb7s5ayaqicchchyyad"; libraryHaskellDepends = [ base containers deepseq parallel profunctors random semigroups time transformers @@ -127991,7 +136583,7 @@ self: { mkDerivation { pname = "netwire-input"; version = "0.0.6"; - sha256 = "4a04c52371358471eaef127ed37547ec35fe58bef2cd6b22ce8b1074fb0db88e"; + sha256 = "13mq1pxp844brqi6pkgjprcgwdgc8xsx6zhjxzm7311mf4iwa12a"; libraryHaskellDepends = [ base netwire ]; homepage = "https://www.github.com/Mokosha/netwire-input"; description = "Input handling abstractions for netwire"; @@ -128005,7 +136597,7 @@ self: { mkDerivation { pname = "netwire-input-glfw"; version = "0.0.6"; - sha256 = "dd095cf915005ca6d72fa75a1ea7d890e2cdde2b8f16f45a994e413e97d9dd06"; + sha256 = "01nxv6bkwhafk5dg85lg5ggcvqlhv2kiwnm75zbscp002pwmq2fx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128024,7 +136616,7 @@ self: { mkDerivation { pname = "netwire-input-javascript"; version = "0.0.2"; - sha256 = "fa967e5c07dc504e38fd85facaa996b32021b4e51d33bdc3a423b4424eb672bf"; + sha256 = "1gvjnr745d13lk1vscqxwns2285kjslwmyl5zlw4wl6w0xf7x5ps"; libraryHaskellDepends = [ base containers ghcjs-base netwire netwire-input transformers ]; @@ -128043,7 +136635,7 @@ self: { mkDerivation { pname = "netwire-vinylglfw-examples"; version = "1.0.0"; - sha256 = "c99688b25885c0148cf274182c51a9376e4aafb7c3dd99a22fe1b85d2f1dc09a"; + sha256 = "16n03lpmvf715yi9kpf3nypllvipm58jq63lya619h45b2r8i5n9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128056,14 +136648,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "network" = callPackage + "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 = "57045f5e2bedc095670182130a6d1134fcc65d097824ac5b03933876067d82e6"; + 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 + }: + mkDerivation { + pname = "network"; + version = "2.6.3.2"; + sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m"; + revision = "1"; + editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit test-framework test-framework-hunit @@ -128080,7 +136692,7 @@ self: { mkDerivation { pname = "network-address"; version = "0.2.0"; - sha256 = "614517e9712b1320ca86a1e77535e6cfb426850ca3e62e49f0eb776543e8e65f"; + sha256 = "0pz6x11naxzby14jxrm31j2jdd6gwqspbrx1hv5204rbf7lifib1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal ]; @@ -128101,7 +136713,7 @@ self: { mkDerivation { pname = "network-anonymous-i2p"; version = "0.10.0"; - sha256 = "cff5796c36c1ebbb969e5433538eb3f3979acef9825a7bfb683ed002023fff2c"; + sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg"; libraryHaskellDepends = [ attoparsec base bytestring exceptions mtl network network-attoparsec network-simple text transformers uuid @@ -128125,7 +136737,7 @@ self: { mkDerivation { pname = "network-anonymous-tor"; version = "0.11.0"; - sha256 = "41aee5b34aaaec6fa47a56cca61fafec22097bda25d13d5baef6b7924e127549"; + sha256 = "0jbm29795dznmrdkvl95v9xhj8pcmwgsdk2ngaj6zv5a9arybbj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128152,8 +136764,8 @@ self: { }: mkDerivation { pname = "network-api-support"; - version = "0.2.2"; - sha256 = "3efa63a9ce205d8d0af27fa440d633d1ec92ad8924dacce69612b1e73237e2ab"; + version = "0.3.0"; + sha256 = "0jjd84wwxjdvj1d17rwwmpdv03c18am09xafysw33d6777xh8dmk"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls @@ -128172,7 +136784,7 @@ self: { mkDerivation { pname = "network-attoparsec"; version = "0.12.2"; - sha256 = "9790a9bad286ab1474dadbece3e4b2e1dd068d4ede3847cb73bcd66386bf08f0"; + sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p"; libraryHaskellDepends = [ attoparsec base bytestring enclosed-exceptions exceptions lifted-base monad-control mtl network transformers @@ -128195,7 +136807,7 @@ self: { mkDerivation { pname = "network-bitcoin"; version = "1.8.1"; - sha256 = "30256fd9e3ff52bef53e5851f1726f7cb601615bc073d0b7bf9b48222027803f"; + sha256 = "0gw04wh24j4vpyvx0wy0bdhh3dkwdxrg2laq7vsvwlpzwgcny99h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128219,7 +136831,7 @@ self: { mkDerivation { pname = "network-builder"; version = "0.1.0"; - sha256 = "dcb3a677e5ad80aa58b9bc2de4164cd328fab5a5ab12cf52452500f4291b4a39"; + sha256 = "0faa3clz80158m9cy4mblnszla6k9hbf8bdwp5cam05dwmvsdcyw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring shelly text yaml ]; @@ -128239,7 +136851,7 @@ self: { mkDerivation { pname = "network-bytestring"; version = "0.1.3.4"; - sha256 = "263d405345b7cd0ef03a1629eb0f14ae6e3831f42d6daf813e4a639b6405a1a6"; + sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96"; libraryHaskellDepends = [ base bytestring network unix ]; homepage = "http://github.com/tibbe/network-bytestring"; description = "Fast, memory-efficient, low-level networking"; @@ -128252,7 +136864,7 @@ self: { mkDerivation { pname = "network-carbon"; version = "1.0.9"; - sha256 = "70860d724fce8a1ee8f2ef80ea0466544ef1deb4c2b9435f15ea234d914a3b35"; + sha256 = "0d9v9a8ls8za2mgl7ff2nkgg2kjlcq2fm07gybl1x2nf9xr0v1kh"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -128267,7 +136879,7 @@ self: { mkDerivation { pname = "network-conduit"; version = "1.1.0"; - sha256 = "57a43448e6b508a7b65b133fdc1a6630e2e47b2dd8c7c05eb5ee939711ed5519"; + sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p"; libraryHaskellDepends = [ base conduit ]; doHaddock = false; homepage = "http://github.com/snoyberg/conduit"; @@ -128283,7 +136895,7 @@ self: { mkDerivation { pname = "network-conduit-tls"; version = "1.2.2"; - sha256 = "12a2cddfacd19d0585e57ff143d625e255e1a4628a463a41332eabc3c02bb087"; + sha256 = "11xh5g0c7arf6d0klilacajf2mg24pb47wbzwn2hb7fimkgwv8hj"; libraryHaskellDepends = [ base bytestring conduit conduit-extra connection cprng-aes data-default monad-control network streaming-commons tls @@ -128304,7 +136916,7 @@ self: { mkDerivation { pname = "network-connection"; version = "0.1.1"; - sha256 = "01837867fbff278e735f605aed68eb6aeffd8674ad5981a3b6f3d5be0be66d6c"; + sha256 = "0v3dwq5vxmgknsiq2nddfj3gvvvaxdlfsnk0bxrqw9zzzdkpi0q1"; libraryHaskellDepends = [ base bytestring containers network network-bytestring stm ]; @@ -128319,7 +136931,7 @@ self: { mkDerivation { pname = "network-data"; version = "0.5.3"; - sha256 = "ffeb6030a4a0c4d0f2c296133b2f72c67bc550c1de8a1781a429a19c3fbd7c7d"; + sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz"; libraryHaskellDepends = [ base bytestring cereal pretty ]; description = "Library for network data structures and their serialization"; license = stdenv.lib.licenses.bsd3; @@ -128332,7 +136944,7 @@ self: { mkDerivation { pname = "network-dbus"; version = "0.0"; - sha256 = "891323d175bd6fcacc7a941445ceab45ee3b0770961c0f1274151efbdc039008"; + sha256 = "024h0gfgn7hmfh90y74nf03kpvj5mg74a54lgb6clvxxfp8j64w9"; libraryHaskellDepends = [ base binary bytestring containers mtl network parsec unix utf8-string @@ -128350,7 +136962,7 @@ self: { mkDerivation { pname = "network-dns"; version = "1.0.0.1"; - sha256 = "c87e0518318aebf91441f8ccd110493801f844556d7cab0affcdc4655f78e13d"; + sha256 = "0gg1g1gnbi6dzw5anz3dam2gh09q948d3k7q84agkswa64c0azn8"; libraryHaskellDepends = [ base binary bytestring cereal containers data-textual hashable network-ip parsers tagged text-latin1 text-printer @@ -128368,7 +136980,7 @@ self: { mkDerivation { pname = "network-enumerator"; version = "0.1.5"; - sha256 = "736beeeaf446c2263266b5ed192346ff2cfdd3a3b87839d59869a801787b1c86"; + sha256 = "11hwgdw03a39k3akjy5qlg9zsb7z8qiikvdmcqr2dhj6ykmfwsvk"; libraryHaskellDepends = [ base bytestring enumerator network transformers ]; @@ -128382,7 +136994,7 @@ self: { mkDerivation { pname = "network-fancy"; version = "0.2.4"; - sha256 = "4936ea7f980768a66656332f7211b1877af4b387ad5c81ab3dde76b3eb76df57"; + sha256 = "0myzfvmv6xny7nmq2p5dhyrz8yl7n48p4brkarkacs07k1zyldj9"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; @@ -128394,7 +137006,7 @@ self: { mkDerivation { pname = "network-hans"; version = "2.6.3.1"; - sha256 = "98d3ac89c8c85da8aed6c87818a5fd6fbb349c9e803c746b062383f423f061bf"; + sha256 = "1gv1y0iz90r30rmp8g40ksf39fvgznjihy68sspahpf8r24srlwq"; libraryHaskellDepends = [ base bytestring hans parsec ]; description = "HaNS to Network shims for easier HaNS integration"; license = stdenv.lib.licenses.bsd3; @@ -128406,7 +137018,7 @@ self: { mkDerivation { pname = "network-house"; version = "0.1.0.2"; - sha256 = "071fbc22fc516175e78235d9e29ccefd8eec7c3caa2e6de74dddf62cdbffab43"; + sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7"; libraryHaskellDepends = [ array base containers mtl ]; homepage = "https://github.com/nh2/network-house"; description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP"; @@ -128418,7 +137030,7 @@ self: { mkDerivation { pname = "network-info"; version = "0.2.0.8"; - sha256 = "ecdff121f3e154c480f363bc8660959a051790bfae5b5fe573810873cedbcd76"; + sha256 = "0xndvg776241fgjmynxfpy81f1csjmh8dg33yf0c8m71ychz3pzc"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; @@ -128430,7 +137042,7 @@ self: { mkDerivation { pname = "network-interfacerequest"; version = "0.0.1"; - sha256 = "cc9409a117f8e72d4dac16495610b79469078f00524e22eb795d25ced6ca4561"; + sha256 = "0qa5rbbcw9axg7mj4kjj027hfsclnw85cj8nmi6jvrzq2yhhk56c"; libraryHaskellDepends = [ base bytestring ioctl network ]; description = "Haskell bindings for the ifreq structure"; license = stdenv.lib.licenses.bsd3; @@ -128445,7 +137057,7 @@ self: { mkDerivation { pname = "network-ip"; version = "0.3"; - sha256 = "e2201085a7df57356ba6fe30f8a200dce71226b96166af08ed29dbce728f8f53"; + sha256 = "0lwgixrcxnr9xl4ayrk1p4k15ryw02ighc7ylrmkamyzly2i0872"; libraryHaskellDepends = [ base data-default-class data-dword data-endian data-serializer data-textual hashable parsers text-printer type-hint @@ -128466,7 +137078,7 @@ self: { mkDerivation { pname = "network-metrics"; version = "0.4"; - sha256 = "8c20831696fb7b89963a991dac5bfdb630aef723d51dc6fb15a4b64b90937937"; + sha256 = "0dvrjf84pdm42pxwc7fm4gvswc5nzmdsq7cr7ab8jyzvjqb8684c"; libraryHaskellDepends = [ base binary bytestring data-default network random time ]; @@ -128484,7 +137096,7 @@ self: { mkDerivation { pname = "network-minihttp"; version = "0.2"; - sha256 = "c505645aba2043f2efb51f34d61f3e73648cb70269c051156a4f75b0f4749280"; + sha256 = "104jfksb0xagd8am3h390avqqr3k7qgxcd0znppz4hr0p9d681f5"; libraryHaskellDepends = [ base binary binary-strict bytestring containers filepath HsOpenSSL mtl network network-bytestring network-connection network-dns @@ -128501,7 +137113,7 @@ self: { mkDerivation { pname = "network-msg"; version = "0.8"; - sha256 = "221d381b1eee214af99d9b5551751a93042d7447aabb7d636688791d7e68eaad"; + sha256 = "1bgad1z1syc8cripvfxa8xs2s14k39sm2mcvkpwll8gf3qdkh792"; libraryHaskellDepends = [ base binary bytestring network unix ]; description = "Recvmsg and sendmsg bindings"; license = "unknown"; @@ -128515,7 +137127,7 @@ self: { mkDerivation { pname = "network-msgpack-rpc"; version = "0.0.3"; - sha256 = "74bf9cd029126e26a0ebf0b02cbc12bc5410e85404ba36f3d8ba001523c3200b"; + sha256 = "02r0qciia05sv3rkdfh4akl10m5w2ay2rc7hxfh2cvhj5789rgvl"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-msgpack exceptions MissingH monad-control @@ -128533,7 +137145,7 @@ self: { mkDerivation { pname = "network-multicast"; version = "0.2.0"; - sha256 = "0f3b50abc3a401c20cc6a0ec51a49d2a48e5b467d9fbd63b7cf803165fe975f2"; + sha256 = "1wkmx5gic0zqghxxdyyrcysfaj1aknj53v50qq6c40d4qfmm0fqg"; libraryHaskellDepends = [ base network ]; description = "Simple multicast library"; license = stdenv.lib.licenses.publicDomain; @@ -128546,7 +137158,7 @@ self: { mkDerivation { pname = "network-netpacket"; version = "0.0.1"; - sha256 = "a6f46a9bebbcd45283c7e34a569ac376c189f598ed1342473544d2533c5e038b"; + sha256 = "12q3bqy57lj46m3l44zdk3sqkhbnqfd5cjp3qy1m5m5wxfdnmx56"; libraryHaskellDepends = [ base bytestring foreign-storable-asymmetric ioctl network network-interfacerequest @@ -128563,7 +137175,7 @@ self: { mkDerivation { pname = "network-pgi"; version = "0.0.1"; - sha256 = "dc0b3bc2c96de0706802a1a86c1714973fb426e817e4cb56142c521bf0981968"; + sha256 = "0s0rk3q1nlic2ibcpr0px0kb8gwp2hbnra5109l71q3dr713n2yw"; libraryHaskellDepends = [ attoparsec attoparsec-enumerator base bytestring enumerator tnet ]; @@ -128578,7 +137190,7 @@ self: { mkDerivation { pname = "network-protocol-xmpp"; version = "0.4.8"; - sha256 = "ea7729e00452da11ed489a71f482e0aa082b0fb872eedca2e3722a05fd421e1e"; + sha256 = "07hy8byhaakjwfidrvkjp07jn25aw21g8wcs93ni3njj0kh2jxza"; libraryHaskellDepends = [ base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network text transformers xml-types @@ -128597,7 +137209,7 @@ self: { mkDerivation { pname = "network-rpca"; version = "0.0.1"; - sha256 = "39b6ad26c57ae28fd2824e0de1365c9c6f85b6acaf6aabae313d0b5080251eb6"; + sha256 = "1dhy4n0502rx66pansmgmjv8avwwbhvf23afhb98zqksqlkavdir"; libraryHaskellDepends = [ array base binary binary-strict bytestring codec-libevent containers control-timeout network network-bytestring stm @@ -128612,7 +137224,7 @@ self: { mkDerivation { pname = "network-server"; version = "0.2.0"; - sha256 = "b39b550ef66e0df0270d4df863980869ce06c9ba28a94d1acbe39575007f3246"; + sha256 = "0iijgw07b5g3rcd4va98pb4hdkk912c67y2d1lkz03bfyq75b6xk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network unix ]; @@ -128627,7 +137239,7 @@ self: { mkDerivation { pname = "network-service"; version = "0.1.0.0"; - sha256 = "e41ea01bb2705fde2a862f487ee5e90deeb74ec2ec9282adcc48ba2322b840cb"; + sha256 = "1js0p0i27fj8rjnq54pcq97bgvhdx7jpwj1ghqmdwpvhn8ds07p4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128646,7 +137258,7 @@ self: { mkDerivation { pname = "network-simple"; version = "0.4.0.5"; - sha256 = "0947b409ebf68d0fa0d94c0a99c6b01165a1c5ab40507b489d195a84b4cd6aaa"; + sha256 = "1akarns88nhrkm47nl20mg2s2r8in339j2jcv6h0z3gnxc4v8iq9"; libraryHaskellDepends = [ base bytestring exceptions network transformers ]; @@ -128662,7 +137274,7 @@ self: { mkDerivation { pname = "network-simple-sockaddr"; version = "0.2"; - sha256 = "5d948ab7bd7a8c04dd3a508f1f3052fd8e6a849d80872c6d12efaefd6f93f230"; + sha256 = "0c7jjdpzvbpg29njr1w0kn26m3pxa8q1z3sh7bfh933spnvqm52x"; libraryHaskellDepends = [ base bytestring directory exceptions network transformers ]; @@ -128679,7 +137291,7 @@ self: { mkDerivation { pname = "network-simple-tls"; version = "0.2.1"; - sha256 = "1330d833ac5e39358da28d27c77af3cacdc967cb34e3a5a78b7d9d32f4ea7741"; + sha256 = "0hbpxbs357bxifksbqrlrdkwkkfaydxcf9wdla6kafaymhrxhc0k"; libraryHaskellDepends = [ base bytestring certificate cprng-aes exceptions network network-simple tls tls-extra transformers @@ -128695,7 +137307,7 @@ self: { mkDerivation { pname = "network-socket-options"; version = "0.2.0.1"; - sha256 = "7998c5f7e75baae47eb0159d4d681fa7fce89452d89ff5921068ebcfad100e03"; + sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r"; libraryHaskellDepends = [ base network ]; homepage = "https://github.com/joeyadams/haskell-network-socket-options"; description = "Type-safe, portable alternative to getSocketOption/setSocketOption"; @@ -128709,7 +137321,7 @@ self: { mkDerivation { pname = "network-stream"; version = "0.1.0"; - sha256 = "c116a6d964b092c98d4b9b0a348d06db52587b5f529b8d713c66cdec5115ecf8"; + sha256 = "1y7c2m8yrkb67iqqv6sjbxxmhlnv0s6k82lv9f6wk4mhckcsc5n1"; libraryHaskellDepends = [ base binary bytestring cereal enumerator network stm text transformers @@ -128728,7 +137340,7 @@ self: { mkDerivation { pname = "network-topic-models"; version = "0.2.0.1"; - sha256 = "4b0c9cb611c8686cf4f78ff46d2063a814c735da5737b167eff94785804bb5d0"; + sha256 = "1l5m9f08aizrxxkv2dspv8swf558cch6vx4gyzs6qs6826v9q32b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128749,9 +137361,9 @@ self: { mkDerivation { pname = "network-transport"; version = "0.4.4.0"; - sha256 = "8e11bc9bbc3b1dd6929dfaf1140dc605f6e72c28b97bd60a2c036ab6aae67ed8"; + sha256 = "1n3ywsmbcsh35h5dcyxr50nfgxh5qq6i9wgskn9dc79vpjdvq4cf"; revision = "1"; - editedCabalFile = "4f11f919f46725881274a02cab5d4c586fa85a7059cc1a4d6433153bbac501bf"; + editedCabalFile = "1gq1qnx3n59kci6imk2rf1dahvsq9ifsnb50fh98h9b7yhczj4ag"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -128767,7 +137379,7 @@ self: { mkDerivation { pname = "network-transport"; version = "0.5.1"; - sha256 = "29f6e730f7f29990a657dd3750d08eb500557e51a0dd9b60798bbce0f48c8b46"; + sha256 = "0ilbiksf1g4bg5h9ppd0a5z5a05miv850dyxayk916gjywqfgxi9"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -128786,9 +137398,9 @@ self: { mkDerivation { pname = "network-transport-amqp"; version = "0.1.0.0"; - sha256 = "b861dc085fc19a8b35a9cd64df844fcc9a9d3f8c97ff6d891f8254f40aedc584"; + sha256 = "1165xl5g8m423y4nvzwpihzrv6nc9y2dyr6dm4sqp6n1bw4dqqdq"; revision = "2"; - editedCabalFile = "724410b5035d55d170110908838d023a675306faf5fc056ed2a8d68beeb112d4"; + editedCabalFile = "1m0jn7p8pmm8s9p0bz7mz8356rrs0a6q620925qd2max0fsi0i3j"; libraryHaskellDepends = [ amqp async base bytestring cereal containers exceptions lens-family lens-family-th network-transport stm stm-chans string-conv text @@ -128808,9 +137420,9 @@ self: { mkDerivation { pname = "network-transport-composed"; version = "0.2.0.1"; - sha256 = "965f9e2ce1c2ea8e97b80caa8a226ec4a5ea745a0ca4fd640e72d7d37d41724f"; + sha256 = "0kvj85yx7mvj1rjgv90cb9sfm9f4dqi8mahcp2bqxsn2w4n9wpwn"; revision = "1"; - editedCabalFile = "fc0de146faca57d38e8dc93909679b7aa154bdf8e4e216346353ccd0234f96bb"; + editedCabalFile = "1fwn9wix1k2kccs1dqp4z2ym98bskdkhjff9in7d6myaz93f23gw"; libraryHaskellDepends = [ base bytestring network-transport ]; homepage = "http://haskell-distributed.github.com"; description = "Compose network transports"; @@ -128824,9 +137436,9 @@ self: { mkDerivation { pname = "network-transport-inmemory"; version = "0.5.2"; - sha256 = "8245d795330157d90ad9de599854d119c6d8938a45ab8c4ec89f3160b2e9ef4e"; + sha256 = "0kpgx6r60cczr178ras5ia9xiihrs5a9hnfyv45djmq16faxfic2"; revision = "1"; - editedCabalFile = "333544d0ef41ac0b5ccc570f131edefa350d2d522f581ff7351a027a65229ab2"; + editedCabalFile = "1cls49jpl0hs6pviyn1ga8nhsdgsvqg163sprif0pb21xz848d9k"; libraryHaskellDepends = [ base bytestring containers data-accessor network-transport stm ]; @@ -128845,7 +137457,7 @@ self: { mkDerivation { pname = "network-transport-tcp"; version = "0.5.1"; - sha256 = "c4c3d67d08f8213ebc99d369cfeb8813f9dd03def464d6097bed533bfbec7beb"; + sha256 = "1svvxkxknlzdgc4xcr7lvq1xvy8ki3mwysfkk6y3w8gq11yxdhy4"; libraryHaskellDepends = [ base bytestring containers data-accessor network network-transport ]; @@ -128864,7 +137476,7 @@ self: { mkDerivation { pname = "network-transport-tests"; version = "0.2.3.0"; - sha256 = "8277bd97eb7d719891aa6494673506d0d3c7e135c4098f49e17f06b281f53b6c"; + sha256 = "0v1vyn0v41kzw54qy2f46phwglyh0qsng534ma8rhwbxxfbvsxw2"; libraryHaskellDepends = [ ansi-terminal base bytestring containers mtl network-transport random @@ -128883,7 +137495,7 @@ self: { mkDerivation { pname = "network-transport-zeromq"; version = "0.2.1.1"; - sha256 = "93b56e1a2b337c24cc899874d23eed335ff640c5c1e143b69584c4d71f0cca35"; + sha256 = "0dfa1hgxgi44jnv47qf1qm0gcprkxlzd4x4qi7628z1k5cd6xdck"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128910,7 +137522,9 @@ self: { mkDerivation { pname = "network-uri"; version = "2.6.1.0"; - sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0"; + sha256 = "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2"; + revision = "1"; + editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32"; libraryHaskellDepends = [ base deepseq parsec ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -128926,9 +137540,9 @@ self: { mkDerivation { pname = "network-uri-flag"; version = "0.1"; - sha256 = "45a833cdb86ebfef2d7b8643ee83776fd88cb2ced8db9b2672e16727640bb662"; + sha256 = "0qmn1dj2frz1f8k9pnyqrsr8rn3gfy1ywhw6gcnyzgvfp36k7a25"; revision = "2"; - editedCabalFile = "b35cdf41ffe29683d1edd38e1226a343e60fa3ea6fc7307a78b7528b24c042ed"; + editedCabalFile = "1va2q0j8nlmpg1x31ivgxaihzrj3lck153nkxp8q75p2zx0xyp5k"; libraryHaskellDepends = [ network network-uri ]; doHaddock = false; description = "Pseudo-package encapsulating flag(network-uri) Cabal boilerplate"; @@ -128940,7 +137554,7 @@ self: { mkDerivation { pname = "network-uri-static"; version = "0.1.0.0"; - sha256 = "c93ac20fb39a326ddbef5a18e4c1205e107a8eb4b6c6df9f68df9c278e956899"; + sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/snakamura/network-uri-static"; @@ -128954,7 +137568,7 @@ self: { mkDerivation { pname = "network-wai-router"; version = "0.3.0.1"; - sha256 = "299e21e75cfe2c3c7914d05b5fe142209cbd50553369318cffc643b57660d8ba"; + sha256 = "1fnqc1vbahy6zy632s9kam8bv7108bhmynyh2iwkqb7ybkkj37i9"; libraryHaskellDepends = [ base wai ]; description = "A routing library for wai"; license = stdenv.lib.licenses.mit; @@ -128966,7 +137580,7 @@ self: { mkDerivation { pname = "network-websocket"; version = "0.3"; - sha256 = "75cd59bd534b39db084c73843c6d29c33e8d3557c440ba19ad24b4252acd7814"; + sha256 = "053qrlm2bd14mlcvlh64awsqsgn355nkr13k9h4dnfabafymkkbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell98 network webserver ]; @@ -128983,9 +137597,9 @@ self: { mkDerivation { pname = "networked-game"; version = "0.1.0.1"; - sha256 = "dfaa45c867596131bcd454390a95171f71bd38baf63300b9c75567fcd8495e8b"; + sha256 = "12sy97cgqrsmqywh0cznp8wbsw8z2yahlfalsjy32qarcz44banz"; revision = "2"; - editedCabalFile = "3cffaedec9a17f0faad461fc0e7ecfc342d36644071ed59f06ce9ce0044bce2e"; + editedCabalFile = "0bnf9c2f176f0sgxa7h78ikd6hn3rxz0xz31sjm0yzx1r7gaxzrw"; libraryHaskellDepends = [ base binary bytestring containers network time transformers ]; @@ -129005,7 +137619,7 @@ self: { mkDerivation { pname = "neural"; version = "0.3.0.0"; - sha256 = "f0053f430ee37291cb166376cb37108fb4c6e69d97bfd7703b06184251e97181"; + sha256 = "10bix58l46067dqdggwpkpkcdd4g20vwnxk32v5r2wp31r1ky1gh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129031,7 +137645,7 @@ self: { mkDerivation { pname = "neural-network-base"; version = "0.1.0.0"; - sha256 = "6dd5e69d4e1c74f4df8a541f58051c14338b7fe7e95d41ca1b7cca58f1f0afde"; + sha256 = "1pmgy3qmijkw3g542pg9wxzqncql3h2mh7slibgz8x0w9sfydmbd"; libraryHaskellDepends = [ base constraints ]; homepage = "https://github.com/pierric/neural-network"; description = "Yet Another High Performance and Extendable Neural Network in Haskell"; @@ -129045,7 +137659,7 @@ self: { mkDerivation { pname = "neural-network-blashs"; version = "0.1.0.0"; - sha256 = "a597ce92cbae408fbe1154da0d98b515108c4c6d8973900697b242323691d40a"; + sha256 = "02nlj4v34hmjjw390ww9dm68q40mnnc0vnjl26z8yh5frf9cx5x5"; libraryHaskellDepends = [ base blas-hs constraints ghc-prim mtl mwc-random neural-network-base vector @@ -129066,7 +137680,7 @@ self: { mkDerivation { pname = "neural-network-hmatrix"; version = "0.1.0.0"; - sha256 = "b4db8f621dcabd8aa6dbd4828b7a682fb2af0856c8669b3bd1f8db8214944861"; + sha256 = "0qa8jha85nzqs4xrnrn8aq4azcigd1x8p0nlvfk8mgfa3mi8znxl"; libraryHaskellDepends = [ base deepseq hmatrix hmatrix-gsl mtl mwc-random neural-network-base parallel vector @@ -129082,7 +137696,7 @@ self: { mkDerivation { pname = "newports"; version = "1.1"; - sha256 = "8c4b0eb1bf382fae7f63f75967e6846a0266ce3e4d639310b88ba29a51c65ddd"; + sha256 = "1paxqr8rm8lbp0896qsd7v76c0kahkk6fngpcdzswbrqpyqhwjwc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory old-time ]; @@ -129099,7 +137713,7 @@ self: { mkDerivation { pname = "newsynth"; version = "0.3.0.3"; - sha256 = "82ef8feb9baf760242630dec8f0856554d5c5913aa713cd5947fc57a424b70ed"; + sha256 = "1vbh9d17mibzjkakqwda2dcmqkamaq48zv0dcd104xmgkgmqzvw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129120,7 +137734,7 @@ self: { mkDerivation { pname = "newt"; version = "0.0.3.1"; - sha256 = "f2eed533acc85bbc590994f0adbc26757c59449b774b18f7b0ea228ff1beb02a"; + sha256 = "0amhpvqqy8pan3vihjvpkd25jz3m4syavw4l15cvqny8mhrxbvpj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129138,7 +137752,7 @@ self: { mkDerivation { pname = "newtype"; version = "0.2"; - sha256 = "b714033abd9a8b0903bcef0d36d0913de2a5003c852f43f97fa688717289e459"; + sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; @@ -129151,7 +137765,7 @@ self: { mkDerivation { pname = "newtype-deriving"; version = "0.1.4"; - sha256 = "14f62033ad7c59aa3121c336c2fac3fd1374accde3ad996d6c94c525f55697e2"; + sha256 = "1qlpavsjbicldinrkbg3rnn784zxqgxc4dn344qslnbwmlrj1xhl"; libraryHaskellDepends = [ base base-prelude monad-control template-haskell transformers transformers-base @@ -129167,7 +137781,7 @@ self: { mkDerivation { pname = "newtype-generics"; version = "0.5"; - sha256 = "dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c"; + sha256 = "173zdvwmx71i146yrp7pc1c6vdpi3bms73zqm29f4bk8kqnaqqyw"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; description = "A typeclass and set of functions for working with newtypes, with generics support"; @@ -129182,7 +137796,7 @@ self: { mkDerivation { pname = "newtype-th"; version = "0.3.3"; - sha256 = "13a10334d90704897b137e4d389ff0ee2a1ee194d1d1a85fefeb77593dbc8fea"; + sha256 = "1slgphymjxzbxxgsilfijkhiwapfy2gkhkby2dxqj107v4s0788k"; libraryHaskellDepends = [ base haskell-src-meta newtype syb template-haskell ]; @@ -129197,7 +137811,7 @@ self: { mkDerivation { pname = "newtyper"; version = "0.1"; - sha256 = "da91972558dde25762cf253617282865171004a0ada0c8c2e6eaf25183ff35e8"; + sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs"; libraryHaskellDepends = [ base Kleislify newtype ]; homepage = "https://github.com/techtangents/Newtyper"; description = "Extra functions for the Control.Newtype typeclass"; @@ -129209,7 +137823,7 @@ self: { mkDerivation { pname = "next-ref"; version = "0.1.0.2"; - sha256 = "a586f15c17d5d53dd647411d02660dcbfd293f38a75f030d6892a76a2c24789f"; + sha256 = "17vq4hn6m9wjd06h6px770zjkzfb1mk047a18zb3vmfm2xfg31m5"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base hspec ]; description = "A concurrency primitive for a slow consumer"; @@ -129222,7 +137836,7 @@ self: { mkDerivation { pname = "nextstep-plist"; version = "0.0.1"; - sha256 = "dc6b46a81a478dea50c53515bc95bb963b4d99977b0353a72066336898258d72"; + sha256 = "0wld4nc6hcv642km60vvjyclsfwnpfavq59mqm8fm3a73al4csyw"; libraryHaskellDepends = [ base parsec pretty QuickCheck ]; description = "NextStep style plist parser and printer"; license = stdenv.lib.licenses.bsd3; @@ -129233,7 +137847,7 @@ self: { mkDerivation { pname = "nf"; version = "1.0.1.0"; - sha256 = "aa8c542f3703d486a46eef3538157d8ca248a9722b20420e6a0e5971a7363cfb"; + sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a"; libraryHaskellDepends = [ base deepseq ]; homepage = "https://github.com/ezyang/nf"; description = "NF data type to statically enforce normal form"; @@ -129245,7 +137859,7 @@ self: { mkDerivation { pname = "nfc"; version = "0.0.1"; - sha256 = "524f46e2ccaacf26cd6058fbd7b1e9a27aa62a3338154d9209aa3b49d011d731"; + sha256 = "0cfp2784jfxa1694s59q6cmacym2x6qxgysqc36jdkxarki4cksj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -129262,7 +137876,7 @@ self: { mkDerivation { pname = "nfc"; version = "0.1.0"; - sha256 = "63b8f1d434c9e20c1df08ab532c4e098871b0788f9d1b8a5ed84bce1abb01167"; + sha256 = "0rqin2my3g44xnjvilgri03ip1wqw3235dcay0fhrqn96kag3f33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -129281,7 +137895,7 @@ self: { mkDerivation { pname = "ngrams-loader"; version = "0.1.0.1"; - sha256 = "edd65db08b02a354e61e9f80dabc39d59ebaaef1dc793637e9161e1ce6ad467c"; + sha256 = "0z26mpk1q7hnx4vkcyfwy6pbm7nm76ydm04z3vk598q2ifq5vmpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129295,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.2.5.1"; - sha256 = "d61e25c00736a33cd5f16555751047fb5e1d79cdc606622f4cba400c6f3df008"; + 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"; @@ -129309,15 +137925,17 @@ self: { }) {}; "niagra" = callPackage - ({ mkDerivation, base, ghc-prim, mtl, primitive, text, transformers + ({ mkDerivation, base, ghc-prim, HUnit, mtl, primitive, QuickCheck + , text, transformers }: mkDerivation { pname = "niagra"; - version = "0.2.3"; - sha256 = "19d15b13766496bfceea6b871329984441d42884d662fbf25902b30538745431"; + version = "0.2.5"; + sha256 = "0zmnwqqk03355s0mjlabsfyai10fhhjlynb502bzgzk2g94zkgr3"; libraryHaskellDepends = [ base ghc-prim mtl primitive text transformers ]; + testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/fhsjaagshs/niagra"; description = "High performance CSS EDSL"; license = stdenv.lib.licenses.mit; @@ -129332,7 +137950,7 @@ self: { mkDerivation { pname = "nibblestring"; version = "0.0.3"; - sha256 = "39af3eb5507fd51167cc024f7c580195181cf98b4f26e029a5b52600efd94c46"; + sha256 = "0ijcv7ph09mmllly09jgigwiq64m05c7qkq2riki3mbza2skxbrr"; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring ]; @@ -129345,12 +137963,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nice-html" = callPackage + ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup + , bytestring, criterion, data-default-class, deepseq, free, lucid + , pretty-show, recursion-schemes, template-haskell, text + , transformers, vector, weigh + }: + mkDerivation { + pname = "nice-html"; + version = "0.2.0"; + sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v"; + libraryHaskellDepends = [ + base bifunctors blaze-markup bytestring data-default-class deepseq + free recursion-schemes template-haskell text transformers vector + ]; + benchmarkHaskellDepends = [ + base blaze-html blaze-markup bytestring criterion lucid pretty-show + text weigh + ]; + homepage = "https://github.com/mikeplus64/nice-html#readme"; + description = "A fast and nice HTML templating library with distinct compilation/rendering phases"; + license = stdenv.lib.licenses.mit; + }) {}; + "nicify" = callPackage ({ mkDerivation, base, nicify-lib }: mkDerivation { pname = "nicify"; version = "1.2.1"; - sha256 = "933b3f01f066310e43d0e79075968af5654c3756292edc9dfdae4ad22a0af562"; + sha256 = "0qpm18md4jmfznfxqbi9aqvlqrgmiab7b477s11hwcb6y00kyfwk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base nicify-lib ]; @@ -129363,7 +138004,7 @@ self: { mkDerivation { pname = "nicify-lib"; version = "1.0.1"; - sha256 = "7d26f86d792dda166805e9dda17cfbc7a2101f3654fe798f4231385d8136e732"; + sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx"; libraryHaskellDepends = [ base parsec transformers ]; description = "Pretty print the standard output of default `Show` instances"; license = stdenv.lib.licenses.mit; @@ -129377,8 +138018,8 @@ self: { }: mkDerivation { pname = "nicovideo-translator"; - version = "0.2.0.0"; - sha256 = "039a1dd1e25450b96ee513091b382f2f9e00826fa2ae69811da9c9a2fe0d4bf0"; + version = "0.3.0.0"; + sha256 = "1qhsm39d20s38pxs0ckkcqfmdd57h6zg2z85mlj8prgjxzx1zq0z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129401,7 +138042,7 @@ self: { mkDerivation { pname = "nikepub"; version = "1.1.2"; - sha256 = "60971359f504b1b52f0d7939037483267c94a935d0ed2c8c4df15c33e0dcecf0"; + sha256 = "1w7cvkh36p7i9n62rvfh6nlr8z16hds06fbr1lpvbc84ymci75v0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129420,7 +138061,7 @@ self: { mkDerivation { pname = "nimber"; version = "0.1.3"; - sha256 = "1cc126f4135d6bc900a0c094d299191ef7bc62a12ea1180a48e03adb5a75a00c"; + sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w"; libraryHaskellDepends = [ arithmoi base ]; homepage = "http://andersk.mit.edu/haskell/nimber/"; description = "Finite nimber arithmetic"; @@ -129433,9 +138074,9 @@ self: { mkDerivation { pname = "nist-beacon"; version = "0.2.0.0"; - sha256 = "fe967f892da92b9aae0cfd10be38166b0e5f915760f734df15b1bada95d9722c"; + sha256 = "0b3jv6axmfmi2pgk9xv0ay8my3kb2qwbw47x1jp9lax95n4pz5py"; revision = "1"; - editedCabalFile = "38a4516610bdf1d86e1204cc66297d74cd53bf6f12434d34d3c28eb016de0f22"; + editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q"; libraryHaskellDepends = [ base bytestring http-conduit xml ]; homepage = "https://github.com/bstamour/haskell-nist-beacon"; description = "Haskell interface to the nist random beacon"; @@ -129447,7 +138088,7 @@ self: { mkDerivation { pname = "nitro"; version = "0.2.2.5"; - sha256 = "ab97b3fca710114f3a928803f811042b348a5a9518a8c81577e0183cc3fc589d"; + sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://haskell.gonitro.io"; description = "Haskell bindings for Nitro"; @@ -129455,6 +138096,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nix-derivation" = callPackage + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , QuickCheck, system-filepath, text, vector + }: + mkDerivation { + pname = "nix-derivation"; + version = "1.0.0"; + sha256 = "1qx37nk5fg7kqvy9pfvf1jhn9cyr8rkfgz4hm3xy8m92l0rprfw4"; + libraryHaskellDepends = [ + attoparsec base containers deepseq system-filepath text vector + ]; + testHaskellDepends = [ + attoparsec base QuickCheck system-filepath text vector + ]; + benchmarkHaskellDepends = [ attoparsec base criterion text ]; + description = "Parse and render *.drv files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nix-eval" = callPackage ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty , tasty-quickcheck @@ -129462,7 +138122,7 @@ self: { mkDerivation { pname = "nix-eval"; version = "0.3.3.0"; - sha256 = "4bf250e5a866b4cdfc9d9feaf6c186bfdd45ea04dcfa30dcb1131aa38d7910b1"; + sha256 = "1c8hg66s66hkn7f31ynw0km4bpdzhv0zdslzkpycvd36m3jm1wjb"; libraryHaskellDepends = [ base hindent process strict ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "http://chriswarbo.net/git/nix-eval"; @@ -129476,9 +138136,9 @@ self: { mkDerivation { pname = "nix-paths"; version = "1.0.0.1"; - sha256 = "742da2042caa20d63690e9c6de632eebd71b863001eb2c71645f8c72d3e9f315"; + sha256 = "05gkx79p532zciqjrsq16231pmzb5rixxip9j0vdc85a5h2a4bbl"; revision = "1"; - editedCabalFile = "348e510f34ab00cfbdf336a862136e0f3f505eff05ccc963e574c6f655e9869e"; + editedCabalFile = "17l6x5azdiklwmiwkk05zxg50gqgdq9n5a1nyfywy05b6h7m33il"; libraryHaskellDepends = [ base process ]; libraryToolDepends = [ nix ]; homepage = "https://github.com/peti/nix-paths"; @@ -129497,7 +138157,7 @@ self: { mkDerivation { pname = "nixfromnpm"; version = "0.10.1"; - sha256 = "bed09b87072dc2cc58eae01e463d2c8244e5d32aba21039daaa9e0e1af984afe"; + sha256 = "1zjak2py3q59mafh68ds5b9yai425hylc7p0x9ccrhid0y3rpl5y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129517,7 +138177,7 @@ self: { mkDerivation { pname = "nixos-types"; version = "1.5"; - sha256 = "cc0c894bd1560e533636bccc5a9d674dd7efc9389895e14972de1d72806668e0"; + sha256 = "1q38cs0747fyf94y35cq734yzmsdcyfmmk5w6qv563jns55qj36c"; doHaddock = false; homepage = "http://hackage.haskell.org/package/cabal2nix"; description = "this package is obsolete; see cabal2nix instead"; @@ -129531,7 +138191,7 @@ self: { mkDerivation { pname = "nkjp"; version = "0.4.0"; - sha256 = "d480e874f55702f1e40f193721bdeb743d48c6cbd4793493d86c44ec7c0738c5"; + sha256 = "1i9q0xyfqi3cv29k8yflrg34hgblxfyj2dqr1zjg20jpymsfi06l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129544,12 +138204,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nlopt-haskell" = callPackage + ({ mkDerivation, base, nlopt, vector }: + mkDerivation { + pname = "nlopt-haskell"; + version = "0.1.0.0"; + sha256 = "0skh0bsms2nsw3dwi4ibjs579bbpc8ya158nrhyn3yxgdx79qgnj"; + libraryHaskellDepends = [ base vector ]; + librarySystemDepends = [ nlopt ]; + testHaskellDepends = [ base vector ]; + homepage = "https://github.com/peddie/nlopt-haskell"; + description = "Low-level bindings to the NLOPT optimization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) nlopt;}; + "nlp-scores" = callPackage ({ mkDerivation, base, containers, strict }: mkDerivation { pname = "nlp-scores"; version = "0.7.0"; - sha256 = "3535b055ef6d0a3db8b2f95a547a925f207c3170d8724215852690e18933aa33"; + sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m"; libraryHaskellDepends = [ base containers strict ]; homepage = "https://bitbucket.org/gchrupala/lingo"; description = "Scoring functions commonly used for evaluation in NLP and IR"; @@ -129561,7 +138236,7 @@ self: { mkDerivation { pname = "nlp-scores-scripts"; version = "0.2.0.0"; - sha256 = "4cb4570e4c788477864a9e962795890677984c5861a476ce96f47faa51d7510a"; + sha256 = "02jisx8slzzljv77d931b169hxq6i6ajg5ly9a37g13q9h75gd2c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129578,7 +138253,7 @@ self: { mkDerivation { pname = "nm"; version = "1.0.1"; - sha256 = "c1713c63efbbab3f662a0d5e4b015ed76f1bb311fe20df7cde1433b16e111709"; + sha256 = "028p25pb2cqlvrydy87y26rinvypbq0lnphd59k3zaxvxxikqwf1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base vector ]; @@ -129596,7 +138271,7 @@ self: { mkDerivation { pname = "nme"; version = "0.2"; - sha256 = "952327e5fe121a50efc38932c2d27f40f62ec322ff68d7a4afa1dee014611f93"; + sha256 = "14qzc4af1pm1myjdfs7z4b1jxxj0gz9c4cl9qgpm06hjzvjjf8wm"; libraryHaskellDepends = [ base bytestring utf8-string ]; homepage = "https://github.com/singpolyma/NME-Haskell"; description = "Bindings to the Nyctergatis Markup Engine"; @@ -129611,7 +138286,7 @@ self: { mkDerivation { pname = "nntp"; version = "0.0.4"; - sha256 = "653c14333da036cdef6eede32dd8b6043e2953d07aea8ffde93d4f12d50fe9f9"; + sha256 = "1yg91zai4krxx7yqzskss19jjgh4nvc2vqzddvpwsdm07lri8g35"; libraryHaskellDepends = [ base bytestring monad-loops mtl network old-locale parsec time ]; @@ -129625,7 +138300,7 @@ self: { mkDerivation { pname = "no-buffering-workaround"; version = "0.1.0.0"; - sha256 = "8dfa0c40633c7cb59a44a6498652b81d7ef6de1661b61cc7b0e73aceede2daa7"; + sha256 = "19yswbnwwfp7n33irdk12vggczhxp198cjd68jdbaz1wcd00ryld"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/arotenberg/no-buffering-workaround#readme"; description = "Workaround for GHC bug #2189"; @@ -129637,7 +138312,7 @@ self: { mkDerivation { pname = "no-role-annots"; version = "1.1"; - sha256 = "47176ab485236f4b92950452a0d855e837bee7267f7d4cbf1ab101c24b8c69ce"; + sha256 = "1kk9ii5w40di3azlqzbz4vkvwdz8apca0lh4jn94nvr3hns6l5s7"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/goldfirere/no-role-annots"; @@ -129646,12 +138321,35 @@ 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 { pname = "nofib-analyse"; version = "8.1.0.20160428"; - sha256 = "2672847477c5a5cceb0495cea009f1b531ae84901e563d5d851d187729384ea1"; + sha256 = "18af70lpf60xhmfksmhyj22awcdmy44s1klm0kmwr9f5fxs88wi6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers regex-compat ]; @@ -129665,7 +138363,7 @@ self: { mkDerivation { pname = "nofib-analyze"; version = "7.10.1"; - sha256 = "d4412e1e564ff638c0cf4b5bf7e75e4585af579f58fbb6db8bc1ecae9f29c012"; + sha256 = "04n056gsxv61igdvdysqkxbsz1a5bvkzfnsbrz03ixjgaqg2whfl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers regex-compat ]; @@ -129683,7 +138381,7 @@ self: { mkDerivation { pname = "noise"; version = "0.0.1"; - sha256 = "1828a9abe89326e7f5dbdfe8bad571ac0cda14f00505dce0af4c058b1cc12a41"; + sha256 = "0h9aq4f8n1acmzhdq185y0adl35cf7avms6zvgsyf9lkx2msja0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129700,13 +138398,151 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nomyx-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, either + , hslogger, lens, mtl, network-uri, nomyx-core, nomyx-language + , QuickCheck, resourcet, safe, servant, servant-client + , servant-server, servant-swagger, split, stm, swagger2, text + , transformers, wai, wai-cors, wai-extra, warp, yaml + }: + mkDerivation { + pname = "nomyx-api"; + version = "0.1.0"; + sha256 = "1f53c82br9hpnaisxz562wi1124a8nm433g9jac4pk0fpyqn3mrf"; + libraryHaskellDepends = [ + aeson base bytestring containers either hslogger lens mtl + network-uri nomyx-core nomyx-language QuickCheck resourcet safe + servant servant-client servant-server servant-swagger split stm + swagger2 text transformers wai wai-cors wai-extra warp yaml + ]; + homepage = "http://www.nomyx.net"; + description = "REST API for Nomyx"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-core" = callPackage + ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup + , bytestring, Cabal, DebugTraceHelpers, deepseq, directory + , either-unwrap, exceptions, filepath, HaskellNet, HaskellNet-SSL + , hint, hint-server, hscolour, hslogger, imprevu, ixset, lens + , mime-mail, MissingH, mtl, network, nomyx-language, nomyx-library + , NoTrace, old-locale, random, safe, safecopy, shortcut, stm, tar + , template-haskell, temporary, text, time, unix, yaml + }: + mkDerivation { + pname = "nomyx-core"; + version = "1.0.0"; + sha256 = "0cdr4k2919a8bjmqm4agpiqp9jiijldwya28ql8bg345ypfh91d2"; + libraryHaskellDepends = [ + acid-state aeson base blaze-html blaze-markup bytestring + DebugTraceHelpers deepseq directory either-unwrap exceptions + filepath HaskellNet HaskellNet-SSL hint hint-server hscolour + hslogger imprevu ixset lens mime-mail MissingH mtl network + nomyx-language nomyx-library NoTrace old-locale random safe + safecopy shortcut stm tar template-haskell temporary text time unix + yaml + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "A Nomic game in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-language" = callPackage + ({ mkDerivation, base, Boolean, containers, DebugTraceHelpers, ghc + , imprevu, lens, monad-loops, mtl, old-locale, random, safe + , shortcut, text, time, time-recurrence + }: + mkDerivation { + pname = "nomyx-language"; + version = "1.0.0"; + sha256 = "1g9rg0h2nfyc4i1hvlmmnfchz3hhh0pax5x654yqkcdhqbsh04hk"; + libraryHaskellDepends = [ + base Boolean containers DebugTraceHelpers ghc imprevu lens + monad-loops mtl old-locale random safe shortcut text time + time-recurrence + ]; + homepage = "http://www.nomyx.net"; + description = "Language to express rules for Nomic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-library" = callPackage + ({ mkDerivation, base, containers, ghc, lens, mtl, nomyx-language + , old-locale, safe, shortcut, time, time-recurrence + }: + mkDerivation { + pname = "nomyx-library"; + version = "1.0.0"; + sha256 = "1sb47asxrqg510kgh9mxpkcmczwzcbzd90bm7nmbaas9cn1wxmql"; + libraryHaskellDepends = [ + base containers ghc lens mtl nomyx-language old-locale safe + shortcut time time-recurrence + ]; + homepage = "http://www.nomyx.net"; + description = "Library of rules for Nomyx"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-server" = callPackage + ({ mkDerivation, base, Cabal, directory, exceptions, filepath + , hslogger, imprevu, lens, mtl, network, nomyx-api, nomyx-core + , nomyx-language, nomyx-library, nomyx-web, safe, stm, time + }: + mkDerivation { + pname = "nomyx-server"; + version = "1.0.0"; + sha256 = "062jm5b752q90aw8v5r79ix836np1zrcvrskmpyy9a22i2i5a6k0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory exceptions filepath hslogger imprevu lens mtl + network nomyx-api nomyx-core nomyx-language nomyx-library nomyx-web + safe stm time + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "A Nomic game in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-web" = callPackage + ({ mkDerivation, acid-state, base, blaze-html, blaze-markup + , bytestring, filepath, happstack-authenticate, happstack-server + , hscolour, HTTP, http-types, imprevu, imprevu-happstack, jmacro + , lens, mtl, nomyx-auth, nomyx-core, nomyx-language, old-locale + , reform, reform-blaze, reform-happstack, safe, split, stm, text + , time, web-routes, web-routes-happstack, web-routes-th + }: + mkDerivation { + pname = "nomyx-web"; + version = "1.0.0"; + sha256 = "1nmckv3mv3zj14l7l3485lx8bw5g40psv8kn4ldg2grdsrf26z9q"; + libraryHaskellDepends = [ + acid-state base blaze-html blaze-markup bytestring filepath + happstack-authenticate happstack-server hscolour HTTP http-types + imprevu imprevu-happstack jmacro lens mtl nomyx-auth nomyx-core + nomyx-language old-locale reform reform-blaze reform-happstack safe + split stm text time web-routes web-routes-happstack web-routes-th + ]; + homepage = "http://www.nomyx.net"; + description = "Web gui for Nomyx"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {nomyx-auth = null;}; + "non-empty" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht }: mkDerivation { pname = "non-empty"; version = "0.3"; - sha256 = "77906c1d4c94738e8b34d9aa28c6a3981edb82df7ee82f2f43aeb57b20bd5be0"; + sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -129720,7 +138556,7 @@ self: { mkDerivation { pname = "non-empty-sequence"; version = "0.2.0.2"; - sha256 = "d9a3604c0c140197731895af56413edbf1cf6866f9c0636ece9d8314366dd1e1"; + sha256 = "1qfidlv190wxrrp67h7rcrlczwfv7r0mdbwm31rrf08l1i6618yr"; libraryHaskellDepends = [ base containers semigroups ]; homepage = "http://www.github.com/massysett/non-empty-sequence"; description = "Non-empty sequence"; @@ -129731,8 +138567,8 @@ self: { ({ mkDerivation, base, checkers, QuickCheck }: mkDerivation { pname = "non-empty-zipper"; - version = "0.1.0.5"; - sha256 = "196e30fd12ce74458a62b8b61ea7c1f6cec4d5999f465d2ccb11b394c3ed77b4"; + version = "0.1.0.8"; + sha256 = "0fyq9x0x04pv45v73mkc273ih5kd9ac40psr00zva58n352f9az9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; @@ -129744,7 +138580,7 @@ self: { mkDerivation { pname = "non-negative"; version = "0.1.1"; - sha256 = "e7060fe3a02b0f2fd0bbab2e358fade1f9eefd50d072f1569e32f4dc871c6f98"; + sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7"; libraryHaskellDepends = [ base QuickCheck utility-ht ]; testHaskellDepends = [ base QuickCheck utility-ht ]; homepage = "http://code.haskell.org/~thielema/non-negative/"; @@ -129753,18 +138589,15 @@ self: { }) {}; "nonce" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, cprng-aes - , crypto-random, text, transformers + ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text + , transformers }: mkDerivation { pname = "nonce"; - version = "1.0.2"; - sha256 = "1004184996ea797b43189a0e73eab0b939f129cafc776341ca82289edb329cd0"; - revision = "1"; - editedCabalFile = "b2a96acc58b405b7eea2022ff253da5deb16df2e60071bdca2956f0a939b5004"; + version = "1.0.4"; + sha256 = "1xkf107sbcm3pvm6r4xk4719sccaq2kzja6nf8bky9m7vpiilrji"; libraryHaskellDepends = [ - base base64-bytestring bytestring cprng-aes crypto-random text - transformers + base base64-bytestring bytestring entropy text transformers ]; homepage = "https://github.com/prowdsponsor/nonce"; description = "Generate cryptographic nonces"; @@ -129776,7 +138609,7 @@ self: { mkDerivation { pname = "nondeterminism"; version = "1.4"; - sha256 = "3037c93b0277037ab51ad8640f72a7975dcf48ba81570640be12d390d7b47dc5"; + sha256 = "1ibxnkbr1lqjpr00cmw1p94cypcplxr0yr6q3aspl0vp08xwjdrh"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A monad and monad transformer for nondeterministic computations"; @@ -129788,7 +138621,7 @@ self: { mkDerivation { pname = "nonempty-alternative"; version = "0.4.0"; - sha256 = "311e733747116727d2374081774ea341a85aaa54eb25f936b0802bacc26cb6fa"; + sha256 = "1ymndk1aqaw0n0vgj9gbajm5ma21ld77g0a06z92frqi8wvp67ii"; libraryHaskellDepends = [ base comonad semigroups ]; homepage = "http://github.com/guaraqe/nonempty-alternative#readme"; description = "NonEmpty for Alternative types"; @@ -129800,7 +138633,7 @@ self: { mkDerivation { pname = "nonfree"; version = "0.1.0.2"; - sha256 = "e0c3207fdc46af5d182ae135f32d8a0ccb7a7779ba8898d954bf6703ee42b0f2"; + sha256 = "1wmh8bp06rxzakcri25sg5vpmjqci8nz6dg158c5vbs6vizj1hz0"; libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -129812,7 +138645,7 @@ self: { mkDerivation { pname = "nonlinear-optimization"; version = "0.3.10"; - sha256 = "ee5cdb0c1a833ab3f9d96e26e97052dabc2d7ae5c2a1f2e6d76035edb73bb885"; + sha256 = "11dq7fvysdb0szkg58f2wmx2vg6sa9qfj9kfv7wv6fl3386dnp7f"; libraryHaskellDepends = [ base primitive vector ]; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; @@ -129825,7 +138658,7 @@ self: { mkDerivation { pname = "nonlinear-optimization-ad"; version = "0.2.2"; - sha256 = "b263aa4b690d8e62917c2090f0549f341858795514b35015a5b27344df03481d"; + sha256 = "07a80ggl8wxjllam1cqlamwmh61lkxag1410gj8n53hdd55slqxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129841,7 +138674,7 @@ self: { mkDerivation { pname = "noodle"; version = "0.0.19"; - sha256 = "a0dbcf7f20b0324140c3cdbdabf67016d28abb9ce6d08224ee58d5a9cbcf6523"; + sha256 = "08v5rz5skmaqxqj85l76kjxqmlhnf3vapgfdqd042cmh41zwznx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -129857,7 +138690,7 @@ self: { mkDerivation { pname = "normaldistribution"; version = "1.1.0.3"; - sha256 = "6d7ba381946f76f3bd848c90e5bcc6f6ae5c418f7ae294cfc2559541fa02f7e0"; + sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd"; libraryHaskellDepends = [ base random ]; homepage = "https://github.com/bjornbm/normaldistribution"; description = "Minimum fuss normally distributed random values"; @@ -129872,7 +138705,9 @@ self: { mkDerivation { pname = "normalization-insensitive"; version = "2.0.0.1"; - sha256 = "17f922efd2b1a6ebdefb619c12d1581585f3bc0c2deec811ba124f8ae38d109d"; + sha256 = "178hipiqlkqjp88wivid1jyg718mb38i5731zggfp9misbpj5y8p"; + revision = "1"; + editedCabalFile = "0hp6v44slmxa3i6cs68ffa5wlkd4bj695l1fh058mhi64bhvql8x"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -129887,6 +138722,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "normalize-imports" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "normalize-imports"; + version = "0.1.0"; + sha256 = "0r2jjkwmdmfis2lim08mi5qajkj9j21ps7n3l4cq9jfbfpsxdk9l"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/qoelet/normalize-imports#readme"; + description = "Sort and align Haskell import statements"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "not-gloss" = callPackage ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL , OpenGLRaw, spatial-math, time, vector, vector-binary-instances @@ -129894,7 +138744,7 @@ self: { mkDerivation { pname = "not-gloss"; version = "0.7.7.0"; - sha256 = "4740d1ee04015bca98092f72c11414326d1bd08473aead61f6678773fb8b835f"; + sha256 = "0pw3igxp71v7yrhsvbkkhk81nv9j2hac2wig16cclnq10kpd2h27"; libraryHaskellDepends = [ base binary bmp bytestring GLUT OpenGL OpenGLRaw spatial-math time vector vector-binary-instances @@ -129910,7 +138760,7 @@ self: { mkDerivation { pname = "not-gloss-examples"; version = "0.5.1.1"; - sha256 = "596165d84f1f5d28f6a4710c424e7c76a20e5151bb5a880fb415fa59f083fd21"; + sha256 = "08gxhgq5kyhmnh7qhnmva58hx8kngi74433ilkv2hp8z9zc6aqar"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129926,7 +138776,7 @@ self: { mkDerivation { pname = "not-in-base"; version = "0.1.1"; - sha256 = "452accdd5ed99901b26fb47c81673e8094fb8d0b8fe8b8c0bc1d23382890a1d6"; + sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/finnsson/not-in-base"; description = "Useful utility functions that only depend on base"; @@ -129938,7 +138788,7 @@ self: { mkDerivation { pname = "notcpp"; version = "0.2.0.3"; - sha256 = "8a2542bed0dedf3bdcf47af754dfca452fc2262e4da199184f1d98dfbe494a95"; + sha256 = "15aa96zdz60x9wc9k8ad5qkc4bs5rbgm9xvsykf3ppyys2z449ca"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Avoiding the C preprocessor via cunning use of Template Haskell"; @@ -129953,7 +138803,7 @@ self: { mkDerivation { pname = "notmuch-haskell"; version = "1.0.0.3"; - sha256 = "f273feba545d96197e9d92433e25a7178384c17e5d7d026c2d290d29d7d6cb7e"; + sha256 = "0znbsvbjj3995mn04zaxgv0q90qplwjkwhwjkmz1k5jxajxgwwzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers filepath time ]; @@ -129980,7 +138830,7 @@ self: { mkDerivation { pname = "notmuch-web"; version = "0.2.0"; - sha256 = "1a668866b0bb8fff3889be03dabefc25ca59ca7d19a0345fe6c95df8a11b53ca"; + sha256 = "1jjk3fhzhpf9wrgk980rgp55kji5zjzdl0xyi4wgz3xvn1k8hrhs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130010,8 +138860,8 @@ self: { }: mkDerivation { pname = "notzero"; - version = "0.0.10"; - sha256 = "17fdfc0152869243d6523f003316427be9c8e64fc4a6294e506d54e3ca22943c"; + version = "0.0.11"; + sha256 = "0sqqffk1znyh7ghbx9ayr2khzxh5g07jjlarx78c051rb2sgdy77"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; @@ -130029,7 +138879,7 @@ self: { mkDerivation { pname = "np-extras"; version = "0.3.1.1"; - sha256 = "8e2ee0de39eae5984e69010fdcaea68a0defb6d6a007e235053805d4ea9d273c"; + sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -130042,7 +138892,7 @@ self: { mkDerivation { pname = "np-linear"; version = "0.3.0.2"; - sha256 = "e17fe739b8709f79a2b2e552ab1c294cab04763031fb0e549826221dcda83503"; + sha256 = "00rmm36is8i6k1a0xyri61v09asc54fanlp5nai7k7vhp0wyfzz1"; libraryHaskellDepends = [ base binary containers numeric-prelude reflection tagged ]; @@ -130058,7 +138908,7 @@ self: { mkDerivation { pname = "nptools"; version = "0.6.0"; - sha256 = "6dc0537284ea57c187fed48e56c2f9a19b04efd971fb10bf5e2851341d5737fe"; + sha256 = "1zipawfk8l98bszi1yviv7ph96x1z715d3nlzs3w2mzahir57h3d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130076,7 +138926,7 @@ self: { mkDerivation { pname = "nsis"; version = "0.3.1"; - sha256 = "d747e231d8f22c810e76a1269af4bd778638da7deca3ad3480415fedb5f05c92"; + sha256 = "14jwy2sysps1h0sav8zcgpd3i1kppps9l9m1fq782b7jv0qy4iyp"; libraryHaskellDepends = [ base transformers uniplate ]; testHaskellDepends = [ base directory process transformers uniplate @@ -130091,7 +138941,7 @@ self: { mkDerivation { pname = "nth-prime"; version = "1.2"; - sha256 = "30c7bbd741db2bd43a767821241243574abb480b4a8d09bd88967b2751310147"; + sha256 = "0iq1658jfywni2yhk3aa1d4bnjjp8c9288bqfqxd8ayv87bvpirh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130111,7 +138961,7 @@ self: { mkDerivation { pname = "ntha"; version = "0.1.3"; - sha256 = "6abcccd975d4794526c1bd132a6405b1d9d7d865c6c84f791d15b2d7c400e73e"; + sha256 = "0gp7032dgchm3mwlzj66cpcdgndi0mj2l4xxq4k4ayflfpcwrg3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130130,7 +138980,7 @@ self: { mkDerivation { pname = "nthable"; version = "0.1"; - sha256 = "9e6a4e4cf0116a8aab09185bcdb62106206c6b41816cc1c6d6e3dac50fe621e2"; + sha256 = "1qi1wq7wbnp3sv3c2v4185mnq80646vcsnqq16mqlshiy164wsly"; libraryHaskellDepends = [ base type-level ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -130142,7 +138992,7 @@ self: { mkDerivation { pname = "ntp-control"; version = "0.1"; - sha256 = "9e308bc1ec004e4aea7f1799db4c73dda5d02259395de96af6c0b6b5172dda92"; + sha256 = "14ns5lbvbdn0yrmfjp9rb4id19fxfd6dp68pgzm4lkh0xk0qnc4y"; libraryHaskellDepends = [ base bytestring bytestring-lexing cereal network old-locale time ]; @@ -130162,7 +139012,7 @@ self: { mkDerivation { pname = "ntrip-client"; version = "0.1.6"; - sha256 = "c508b4e7a9859b7eb306b58383d177f4cb66aec7c356ffe9323e32e6a3e46dac"; + sha256 = "1b3dwjiycciy6blzymn3qyp6djzlfz8q70xm0srpx6w5m7kv8265"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130185,7 +139035,7 @@ self: { mkDerivation { pname = "null-canvas"; version = "0.2.7"; - sha256 = "9436573bb39d3ed4ed8ffe78337571444c3d38abc58e1b5a2dbbb645fbcbd3c4"; + sha256 = "1i6krgxlbdmv5md1p3n5mcw3sk24f5sk6y7yiznx8glxncxmfdll"; libraryHaskellDepends = [ aeson base containers filepath scotty split stm text transformers wai-extra warp @@ -130201,7 +139051,7 @@ self: { mkDerivation { pname = "nullary"; version = "0.1.0.0"; - sha256 = "0cd4f880627ea551167c981feff890c656f560d515296addab99d0c8b47f7ca7"; + sha256 = "19vwgyscil4rmgfnla8msmhgamn6j3wfy7wqghb539byca0gim0c"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/derekelkins/nullary"; description = "A package for working with nullary type classes"; @@ -130214,7 +139064,7 @@ self: { mkDerivation { pname = "nullpipe"; version = "0.1.0.0"; - sha256 = "289bbf459ed94ee015ec978bfaaeb4c5b94de066838719fc3f5652280411cf93"; + sha256 = "14yg2422hljn7zy1k1w3cvh4vff5njpgm2wpxhay0knrkr2vz6r8"; libraryHaskellDepends = [ base bytestring pipes ]; testHaskellDepends = [ base hspec pipes ]; homepage = "https://github.com/mwotton/nullpipe#readme"; @@ -130228,7 +139078,7 @@ self: { mkDerivation { pname = "number"; version = "0.1.1.0"; - sha256 = "72157b8ca57272b8881510b9d2051044d543151ee322ecb27cc08903446f4951"; + sha256 = "0la9dx2072f0gjrfq8p33qal7ma4202x5f8h2n4bhwkjln67n5bj"; libraryHaskellDepends = [ base ]; description = "A library for real numbers"; license = stdenv.lib.licenses.mit; @@ -130241,7 +139091,7 @@ self: { mkDerivation { pname = "number-length"; version = "0.1.0.1"; - sha256 = "6c024aad9a8a751a621b0804b58ea2dd3e67703db1b75c71776996f67268e9c5"; + sha256 = "1ig9d1rgd5k9fxqmrdxi7mq6fgnxla7ba1083di1lxcakanll0kc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -130259,9 +139109,9 @@ self: { mkDerivation { pname = "number-show"; version = "0.1.0.0"; - sha256 = "3e4ba74494fce27278ae6c07773d75be901be09c51028f47cbdc9087d9e29e06"; + sha256 = "01lywbcqg46wrd3qy0jikkh1p45yflypf1vcmrw75qpwji2afjry"; revision = "1"; - editedCabalFile = "8c75cd93ac276a74f86693467c56de7ecb7c04f9d93d26c369199d7a7baaf173"; + editedCabalFile = "0wzim9xpm78rd71jcgfrz427rjvyvrb7qilkcvw78si7mj9wsxcc"; libraryHaskellDepends = [ base microlens microlens-th ]; description = "Flexible and accurate (for a given precision) numerical->string conversion"; license = stdenv.lib.licenses.gpl3; @@ -130272,7 +139122,7 @@ self: { mkDerivation { pname = "numbering"; version = "0.2.1"; - sha256 = "9b667acb6c8838effd167ebefc0094eaf38d5dccc1091296ce47eff5459d0442"; + sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv"; libraryHaskellDepends = [ base containers vector ]; homepage = "https://github.com/DanielSchuessler/numbering"; description = "Combinators for creating bijections from some type to the natural numbers"; @@ -130286,7 +139136,7 @@ self: { mkDerivation { pname = "numbers"; version = "3000.2.0.1"; - sha256 = "736d0551e4a13510dfe43a777a220bd4b17a19a73e6cd17bf901b1854b5ce183"; + sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -130304,7 +139154,7 @@ self: { mkDerivation { pname = "numerals"; version = "0.4.1"; - sha256 = "d2a46b9535bd57ed386adad95e145da4c3e72f595328ebd61302e3887583e1d2"; + sha256 = "1lp1hdsqiqq22gbfna2kb4pyghx4bla5xnfsd8wfsmxx6nanp96j"; libraryHaskellDepends = [ base containers fingertree integer-gmp text ]; @@ -130327,7 +139177,7 @@ self: { mkDerivation { pname = "numerals-base"; version = "0.3"; - sha256 = "e85d7830e56c55d69c5c77e8d99755faae191876ee4bee7cd442e88d35ece962"; + sha256 = "0qp9xhsqvs22siyfwjzffqc1kbpsanbxks3pbjfdcmbcwlq7hpg8"; libraryHaskellDepends = [ base base-unicode-symbols containers containers-unicode-symbols fingertree @@ -130347,7 +139197,7 @@ self: { mkDerivation { pname = "numeric-extras"; version = "0.1"; - sha256 = "c700711021d96334be43a21fbd80a5f7146fdd6706ef8656f1d287ff000b61d6"; + sha256 = "1mk11c0gz1yjy5b8dvq6czfny57pln0bs7x28fz38qyr44872067"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/numeric-extras"; description = "Useful tools from the C standard library"; @@ -130359,7 +139209,7 @@ self: { mkDerivation { pname = "numeric-limits"; version = "0.1.0.0"; - sha256 = "8b956ce9ecf6465e19068885b77da623a3af23fcabf1253718edd2427c055153"; + sha256 = "0lsi0my45lpd30vjbwdbzhisz8r3lryvg1c80qcmwipnxklnr5cb"; libraryHaskellDepends = [ base ]; description = "Various floating point limit related constants"; license = stdenv.lib.licenses.bsd3; @@ -130372,9 +139222,9 @@ self: { mkDerivation { pname = "numeric-prelude"; version = "0.4.2"; - sha256 = "5327a9ffcc5997a062d2a9ea405130741114a0c6fe440a8e5b6d6c35fe56d8c4"; + sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk"; revision = "1"; - editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2"; + editedCabalFile = "1qpzdfy4xijb1vfiy0sxinchwg0wkfwfpjbyfvnpf4gz2j5i5gxc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130393,7 +139243,7 @@ self: { mkDerivation { pname = "numeric-qq"; version = "0.1.3"; - sha256 = "beaf86d233adad0d6dcf23769e4e0f3f43a1b551f19fb772fbcfedd885f19b85"; + sha256 = "11cvy62xivfgzdrbg7zia6ss2hrz1x79wxi3rxnhvbdd6g98dbxy"; libraryHaskellDepends = [ base loch-th placeholders template-haskell ]; @@ -130409,9 +139259,9 @@ self: { mkDerivation { pname = "numeric-quest"; version = "0.2.0.1"; - sha256 = "ea9d279f35a1a7a2c4545cf42460698d6d921fe6880efae57bb72060b3131b84"; + sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga"; revision = "1"; - editedCabalFile = "aae9d00f380bf447af5575311f566cd6960aafb7eec8c30abbab09a2fcff092e"; + editedCabalFile = "0bh9zzya42dbpc5c7j7fnyphm5nndib1ycbmanplgx0b707x1sda"; libraryHaskellDepends = [ array base ]; homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest"; description = "Math and quantum mechanics"; @@ -130423,9 +139273,9 @@ self: { mkDerivation { pname = "numeric-ranges"; version = "0.1.0.0"; - sha256 = "0085294502dc6673fc6ca5525fa014f56f73b2bfa92d841b9d61a8c119b53982"; + sha256 = "10irnlcw3a31kldq8bd9pyr76vzm2jh5ylm5dky76rnw092jk180"; revision = "1"; - editedCabalFile = "68b2a84c67b84bfe3cc3e7f4f2b0fafcd8e0741d4a3c57359f4437bb8824ea07"; + editedCabalFile = "01za4j4bnds4kwsmfg2a3msf1n7wzaqg5x77qcygwjxqcx6aick8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; homepage = "http://github.com/nicodelpiano/numeric-ranges"; @@ -130439,7 +139289,7 @@ self: { mkDerivation { pname = "numeric-tools"; version = "0.2.0.1"; - sha256 = "a3418fad0ed8cf32b8a1466cd1f0e46b0da21a737f3ab97c29eae20792d42d3b"; + sha256 = "0frdsj90gqpa55ybjfkzfcda43bbwkqd2v26l6w35kyq1snqyhd3"; libraryHaskellDepends = [ base ieee754 primitive vector ]; testHaskellDepends = [ base HUnit ]; homepage = "https://bitbucket.org/Shimuuar/numeric-tools"; @@ -130452,19 +139302,64 @@ self: { mkDerivation { pname = "numericpeano"; version = "0.2.0.0"; - sha256 = "3b0576c3dee798440dd878390027b2c3864d80c0b99ef5b3ea287ede26ca2ab9"; + sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ombocomp/numericpeano/"; description = "Peano numbers with attendant bells and whistles"; license = stdenv.lib.licenses.asl20; }) {}; + "numhask" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest, HUnit + , protolude, QuickCheck, singletons, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "numhask"; + version = "0.0.4"; + sha256 = "0iyjx8yrbsalycy4qf13jm3q1gn1kpmk0l2r0j38zv2gr199p7df"; + libraryHaskellDepends = [ + adjunctions base distributive protolude QuickCheck singletons + vector + ]; + testHaskellDepends = [ + base doctest HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask"; + description = "A numeric prelude"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "numhask-range" = callPackage + ({ mkDerivation, base, containers, foldl, formatting, HUnit, lens + , linear, numhask, protolude, QuickCheck, smallcheck, tasty + , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "numhask-range"; + version = "0.0.3"; + sha256 = "0na22wnyhs30h2h6nfkpgfzxpbcan597l1gg9mayi3g41148cxvj"; + libraryHaskellDepends = [ + base containers foldl formatting lens linear numhask protolude + QuickCheck + ]; + testHaskellDepends = [ + base HUnit numhask protolude QuickCheck smallcheck tasty + tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/tonyday567/numhask-range"; + description = "Numbers that are range representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nums" = callPackage ({ mkDerivation }: mkDerivation { pname = "nums"; version = "1.2.0"; - sha256 = "689b965e2cb0bd5ce066308559b0cbbd7319f288168f334552da8886873b742d"; + sha256 = "0bbl7f3qd26sa92k73qni3r1jwxxrfq5k19hcvh5rgdh5ig9d6v8"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -130475,7 +139370,7 @@ self: { mkDerivation { pname = "numtype"; version = "1.2"; - sha256 = "d537a8caefc04306384b5b14178b08ece87aeae25f5759be2cde2aff8de3aadd"; + sha256 = "1pdawf6zyany5jz5jmszwbm7ms7c125if52v9cw0chy0xz5ahdym"; libraryHaskellDepends = [ base ]; homepage = "http://dimensional.googlecode.com/"; description = "Type-level (low cardinality) integers"; @@ -130487,7 +139382,7 @@ self: { mkDerivation { pname = "numtype-dk"; version = "0.5.0.1"; - sha256 = "29dbb9bf7693989f94605804de31b1a4dacf53ab566ce0346445288eae95d017"; + sha256 = "05yhjnp8wa25chsf0v2nmd9wznm4n4qxw12qc2a9z64kfszvknr9"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/bjornbm/numtype-dk"; description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families"; @@ -130499,7 +139394,7 @@ self: { mkDerivation { pname = "numtype-tf"; version = "0.1.2"; - sha256 = "ddcbfcd3e83979c44364914a30a1a65b0a95cd96f88cae36f941604b66fa7601"; + sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx"; libraryHaskellDepends = [ base ]; homepage = "http://dimensional.googlecode.com/"; description = "Type-level (low cardinality) integers, implemented using type families"; @@ -130513,9 +139408,9 @@ self: { mkDerivation { pname = "nurbs"; version = "0.1.1.0"; - sha256 = "42459775e2b1c419343402da693465f3db61c5ab6e5666f44d810b568cf33054"; + sha256 = "0m1hyf65c2w19ps6cmkfmg2n3nzkcls6knh26hs1ki5iw9srfia2"; revision = "1"; - editedCabalFile = "17ee68339f33b5fa8ccc3ddf788ee5cb3ab3f40170b93175925a1b97534afdbc"; + editedCabalFile = "1g7x999rf6ssj9sk3fbh07sb6fnbwn77iprxrj6gmd9kkwrnivhp"; libraryHaskellDepends = [ base base-unicode-symbols lens linear mtl ]; @@ -130530,24 +139425,24 @@ self: { "nvim-hs" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal , cereal-conduit, conduit, conduit-extra, containers, data-default - , directory, dyre, exceptions, filepath, foreign-store, hslogger - , hspec, hspec-discover, HUnit, lifted-base, messagepack - , monad-control, mtl, network, optparse-applicative, parsec + , deepseq, directory, dyre, exceptions, filepath, foreign-store + , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec + , messagepack, monad-control, mtl, network, optparse-applicative , process, QuickCheck, resourcet, setenv, stm, streaming-commons , template-haskell, text, time, time-locale-compat, transformers , transformers-base, utf8-string }: mkDerivation { pname = "nvim-hs"; - version = "0.1.0"; - sha256 = "69d20c6ea113d9a88e68256f7c4017886e88005fca32a3c0c2cba3749ea09bd0"; + version = "0.2.2"; + sha256 = "1sp8z8nyxhqywcdyxiyw9yz0mnrbyvgnjg5wr2p5371z3dwbhz8n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base bytestring cereal cereal-conduit conduit - conduit-extra containers data-default directory dyre exceptions - filepath foreign-store hslogger lifted-base messagepack - monad-control mtl network optparse-applicative parsec process + conduit-extra containers data-default deepseq directory dyre + exceptions filepath foreign-store hslogger lifted-base megaparsec + messagepack monad-control mtl network optparse-applicative process resourcet setenv stm streaming-commons template-haskell text time time-locale-compat transformers transformers-base utf8-string ]; @@ -130556,7 +139451,7 @@ self: { ansi-wl-pprint base bytestring cereal cereal-conduit conduit conduit-extra containers data-default directory dyre exceptions filepath foreign-store hslogger hspec hspec-discover HUnit - lifted-base messagepack mtl network optparse-applicative parsec + lifted-base megaparsec messagepack mtl network optparse-applicative process QuickCheck resourcet setenv stm streaming-commons template-haskell text time time-locale-compat transformers transformers-base utf8-string @@ -130569,24 +139464,20 @@ self: { "nvim-hs-contrib" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default - , directory, exceptions, hspec, hspec-discover, messagepack, mtl - , nvim-hs, parsec, process, QuickCheck, resourcet, setenv, stm - , text, time, transformers, transformers-base, utf8-string + , directory, exceptions, filepath, hspec, hspec-discover + , messagepack, mtl, nvim-hs, QuickCheck, text, time, utf8-string + , yaml }: mkDerivation { pname = "nvim-hs-contrib"; - version = "0.1.0"; - sha256 = "f0de17887d394301ec1975ab768ad6a6131bd7e6580b11c8b9364980e3be6472"; + version = "0.2.0"; + sha256 = "05999ma4whng6brn37bw2wbw7yf2hq9yw8sr12kwykdygxvykrbf"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring data-default directory exceptions - messagepack mtl nvim-hs parsec process resourcet setenv stm text - time transformers transformers-base utf8-string + filepath messagepack mtl nvim-hs text time utf8-string yaml ]; testHaskellDepends = [ - ansi-wl-pprint base bytestring data-default exceptions hspec - hspec-discover messagepack mtl nvim-hs parsec process QuickCheck - resourcet setenv stm text time transformers transformers-base - utf8-string + base hspec hspec-discover nvim-hs QuickCheck ]; homepage = "https://github.com/neovimhaskell/nvim-hs"; description = "Haskell plugin backend for neovim"; @@ -130596,15 +139487,15 @@ self: { "nvim-hs-ghcid" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , ghcid, nvim-hs, nvim-hs-contrib, resourcet, yaml + , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers, yaml }: mkDerivation { pname = "nvim-hs-ghcid"; - version = "0.1.0"; - sha256 = "c0f900633873759e49a08be61d8c91c1507f95b2e108d39d1d517adf9adc7bde"; + version = "0.2.0"; + sha256 = "108fi3pnsc0yj5kmm0awqr7f3xqhyxg1yg29p2kw6bk8vvwjdlvf"; libraryHaskellDepends = [ base bytestring containers directory filepath ghcid nvim-hs - nvim-hs-contrib resourcet yaml + nvim-hs-contrib resourcet transformers yaml ]; homepage = "https://github.com/saep/nvim-hs-ghcid"; description = "Neovim plugin that runs ghcid to update the quickfix list"; @@ -130618,8 +139509,8 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.7.5.1"; - sha256 = "73914a6a1816432b0cc687a6200b52a030a705b51276f8266a984c3617f69109"; + version = "0.7.5.2"; + sha256 = "07qg4y0ypmhcin7k4j2scb4c94sn9wiy5l6nradjw59hk2b8q97i"; setupHaskellDepends = [ base Cabal directory filepath template-haskell ]; @@ -130636,7 +139527,7 @@ self: { mkDerivation { pname = "nyan"; version = "0.2"; - sha256 = "89184df9cb730b5b51b0655c1a76025ba6bd7601f79a2c1a41d5ac15cdf26c09"; + sha256 = "02bcyb6ibb6m84d2r6pp05vbv9jv09v1lp35n18mn2vkrgwls649"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring mtl ncurses text ]; @@ -130652,7 +139543,7 @@ self: { mkDerivation { pname = "nylas"; version = "0.1.1"; - sha256 = "a78d4e6d4841049f447b110df0ad22a0af764d845a19791b54a8f5d29e29d6b0"; + sha256 = "1c6n56gd5xd8ahdpj6ashi6pdbx04anz038igd29y12191nlx3d7"; libraryHaskellDepends = [ aeson base bytestring lens lens-aeson pipes pipes-aeson pipes-bytestring pipes-http pipes-parse text time wreq @@ -130670,7 +139561,7 @@ self: { mkDerivation { pname = "nymphaea"; version = "0.3"; - sha256 = "23b0eb1b54e661dd08ba18b70662bf1d856db259cebbb0c9c50cceb6ebf996da"; + sha256 = "1nlnz7mvdkhcqp4v1fyfb6r6v18xpxi0ddqqp84dsqg6ahdypc13"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130689,9 +139580,9 @@ self: { mkDerivation { pname = "oanda-rest-api"; version = "0.3.0.0"; - sha256 = "be57364a4da2e2b20d188c8a50efe15b4a07daf641e4294e3b9eba87b75f7603"; + sha256 = "00vnbyvqgfly7d72kr21yvd0fjjvw7pm12lc306v5qm29m53cmxy"; revision = "1"; - editedCabalFile = "44db3924a18face1edc0b9c6ee19c0ed2bc0d0441a123286bb099bfac663d1d5"; + editedCabalFile = "1mficg3gm6q9pf3344hs8k8c0azdq0cyximrq3ny3b4gl4j3kns4"; libraryHaskellDepends = [ aeson base bytestring containers Decimal http-conduit lens old-locale scientific text thyme vector @@ -130705,6 +139596,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oanda-rest-api_0_4_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens + , old-locale, resourcet, scientific, text, thyme, transformers + , vector + }: + mkDerivation { + pname = "oanda-rest-api"; + version = "0.4.1"; + sha256 = "1r20vn0hbx1xca5jaq9djfhgrxgdyhj1m4i9708wd972h2h7q2vr"; + libraryHaskellDepends = [ + aeson base bytestring conduit containers Decimal http-client + http-conduit lens old-locale resourcet scientific text thyme + transformers vector + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers Decimal hlint hspec + http-client http-conduit HUnit lens old-locale resourcet scientific + text thyme transformers vector + ]; + homepage = "https://github.com/jdreaver/oanda-rest-api#readme"; + description = "Client to the OANDA REST API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "oauth10a" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash, entropy, http-types, time, transformers @@ -130712,9 +139629,9 @@ self: { mkDerivation { pname = "oauth10a"; version = "0.1.0.0"; - sha256 = "a923cb04195ed275990623b821933bc52e00a7311ee485e803d272185c11aacc"; + sha256 = "1k5a25f1hwnj0gl8br0y66kh0bn57f9j3f130scpbljy342cn8x9"; revision = "1"; - editedCabalFile = "5ee8aca8d824721a86d2ecb7cc094baffa6591059e49e6f7da5682851c30b7a1"; + editedCabalFile = "18dp60f8b0jnvbvycjcy0n8nbymg9c4wrdzcsa31lwi4v2lars2y"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash entropy http-types time transformers @@ -130734,7 +139651,7 @@ self: { mkDerivation { pname = "oauthenticated"; version = "0.1.3.4"; - sha256 = "75ad10cec68d0a9c0fd536fd2d71ce42730aab315452569240f8468b4d8ed8d0"; + sha256 = "1l6qir6qnipq8295cljl66mhlws2rrqjvz9nsl7rq2ldqv711bbm"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive crypto-random cryptohash either exceptions @@ -130754,7 +139671,7 @@ self: { mkDerivation { pname = "obd"; version = "0.2.1.1"; - sha256 = "38478d38d59aa39603023f93733b00df17d105f91d94f94182e753721c65ec3d"; + sha256 = "0ggcclf74lz7h90zk50xz42x25yz00xp74rz081rd8wsslw8sirq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130779,7 +139696,7 @@ self: { mkDerivation { pname = "obdd"; version = "0.8.1"; - sha256 = "424ea2a11af22e0fe640b66af177b355024acabf99a1ee63d27b16e3355e8e11"; + sha256 = "04cfbqsy65kvs9iyx8crpz54l0jmndvz2smn83k0ybpj3ahs4kj2"; libraryHaskellDepends = [ array base containers ersatz mtl process-extras random text ]; @@ -130796,7 +139713,7 @@ self: { mkDerivation { pname = "oberon0"; version = "0.0.2"; - sha256 = "1b96e40cacb6a00856d55d7059fbefe5aa018a15bf9002189db2868cef7d1e71"; + sha256 = "0w8ygppqr1mjklc0545z2n503ap5xzxmjw2xsmb0i85nmh6f95hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130819,7 +139736,7 @@ self: { mkDerivation { pname = "obj"; version = "0.1.2"; - sha256 = "9f34957f6927cb20933ca6f38d78a158839ee73fcec247319c14a1289af73e71"; + sha256 = "0w9yyyd2i88lkhqlghnf7zkrx0sql5w8vwx67j9j1jr7d5zrad4z"; libraryHaskellDepends = [ array base binary bytestring checkers Codec-Image-DevIL containers directory filepath graphicsFormats haskell98 InfixApplicative @@ -130838,7 +139755,7 @@ self: { mkDerivation { pname = "objectid"; version = "0.1.0.2"; - sha256 = "fa6dd38c2e6f814095c3b2f18efa482ce69a81f7cf3454fd7b462139f38729b3"; + sha256 = "1cr9hzrkj8a6ggym8d6gyy0rmric93x8xwdjqfal10bg5s6d6vgs"; libraryHaskellDepends = [ base blaze-builder bytestring cereal cryptohash ]; @@ -130861,7 +139778,7 @@ self: { mkDerivation { pname = "objective"; version = "1.1.1"; - sha256 = "7ad18e779f0b5910cc5425a16bcd07dba9f6a785c83526e047e62587b8d86634"; + sha256 = "0d36v2w8f9g68zh2cdf8hnkzdafv0z6np895ak610n8bkxvqxlbs"; libraryHaskellDepends = [ base containers either exceptions free hashable monad-skeleton mtl profunctors template-haskell transformers transformers-compat @@ -130877,7 +139794,7 @@ self: { mkDerivation { pname = "observable-sharing"; version = "0.2.4"; - sha256 = "400efecddcfdd992717caccc3a7b00590e7635bf92305d7d93f81d47327811d3"; + sha256 = "1lqig0r4f7gqjdymsc4jpwspc3jr01xkmk5cgiqr5ngxvk6zw3j0"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/atzeus/observable-sharing"; description = "Simple observable sharing"; @@ -130891,8 +139808,8 @@ self: { }: mkDerivation { pname = "octane"; - version = "0.18.2"; - sha256 = "4fcd5e5f2b01eee2e382bdf701617129500cce1d4302fa265d52c15edcfa34a0"; + version = "0.18.3"; + sha256 = "05gljx1br9zk2i26rvz15dcl03x7n2xvrwmlz7917673068scm95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130908,6 +139825,30 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "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.20.0"; + sha256 = "1lgvx8nkfjh7x7hnpn689499gcx3hwq13s4kh4j74q1xfhmawwyv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -130919,7 +139860,7 @@ self: { mkDerivation { pname = "octohat"; version = "0.1.5.0"; - sha256 = "a064f32fdf4272e6b653ccc1bc13036c77b1bb902f1d9f6482ea76a02674639d"; + sha256 = "17b3fhka0xpah9j9y79gj2xv2xvc0c9vrhfcafvfcwj2vwpz6r50"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130947,7 +139888,7 @@ self: { mkDerivation { pname = "octopus"; version = "0.0.2.1"; - sha256 = "8a9de2db20925fc6895823970d22bea4f8e54e7b1e8d28d6f6f9174592713adc"; + sha256 = "1p1sf694a5zryvb2i38ygd7fby54pqi0v5r3b24wcpwj43dy57ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130969,7 +139910,7 @@ self: { mkDerivation { pname = "oculus"; version = "0.1.0.2"; - sha256 = "44d778d6f0285ff01d52b125061a32988a44ad08d69d694c7b66c802172f0110"; + sha256 = "04015wbh5j36gd66k7fn12nl92lq68d0c9dia8fz0pr8y3b7ims4"; libraryHaskellDepends = [ base either monads-tf transformers vect-floating ]; @@ -130988,7 +139929,7 @@ self: { mkDerivation { pname = "oden-go-packages"; version = "0.1.0.3"; - sha256 = "88d777451618822e9d754983da4a93705077a9136aba10187ca4e457e36e1989"; + sha256 = "128rdvimgr54ghc11fka2flpfl3hjd5dm0s9fnfjx0hq2r2pgmw8"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -131004,8 +139945,10 @@ self: { }: mkDerivation { pname = "oeis"; - version = "0.3.8"; - sha256 = "4be72f80596045a51e56f8d810b5a044689f117b38a614bd9645e97dd3e39c93"; + version = "0.3.9"; + sha256 = "13hv0qal024jq52k1rgy3hd9h9s8labkcngr0zk8jpcgi45jqsca"; + revision = "1"; + editedCabalFile = "0rb6l3qblay8aiwaznp35gj7vwmhm87y57wvf3babwrh91s88jaj"; libraryHaskellDepends = [ base HTTP network network-uri ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -131019,7 +139962,7 @@ self: { mkDerivation { pname = "off-simple"; version = "0.1"; - sha256 = "7247e8b9c2c81e159754665b06c52c1e572d2de2f5cf8f400a60232eeb124b0f"; + sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj"; libraryHaskellDepends = [ base parsec3 vector ]; homepage = "https://github.com/acfoltzer/off-simple"; description = "A parser for simplified-syntax OFF files"; @@ -131032,7 +139975,7 @@ self: { mkDerivation { pname = "ofx"; version = "0.4.2.0"; - sha256 = "0e22e2269f099603832f666814235051fadf92cbdec3dfacf7d1e8231ccd95f1"; + sha256 = "1wcmrlf27s6iyyndzhyyrf9dzyjia0ii8s365y1h75h9kwkf48hf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec pretty time ]; @@ -131049,7 +139992,7 @@ self: { mkDerivation { pname = "ogmarkup"; version = "3.0.0"; - sha256 = "2e39b395f01ee81963797120d6bd7ee8e34ba013f3942f1512caf81b1f759718"; + sha256 = "064pflgipy6a28ajz57k2fh4pqz8gsyxc83ig5iiks0yy2av6f9f"; libraryHaskellDepends = [ base megaparsec mtl ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec shakespeare text @@ -131067,7 +140010,7 @@ self: { mkDerivation { pname = "ohloh-hs"; version = "0.0.2"; - sha256 = "d24339be4df9ac8dd7945a26d6fa1af19f1ae8871f0fa4fa5559ce593d117359"; + sha256 = "0nbk24ymkkjrapxa83qzhzl1m7zi3bxdc9jsjkbqvb7r9nz3jhyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-lens hxt text-format-simple ]; @@ -131089,7 +140032,7 @@ self: { mkDerivation { pname = "oi"; version = "0.4.0.2"; - sha256 = "1595ed94430da135de164fd732d807e3ec14fab9086e2ddcd148baad4cefd7a3"; + sha256 = "18ypxx6avfj8s7f2svh8p7x19v730zc35msg2vg3b88d8fafv58m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131109,7 +140052,7 @@ self: { mkDerivation { pname = "oidc-client"; version = "0.3.0.0"; - sha256 = "fcc89cd54d2493bfabbb4e5d76dd77c0f6dc3005207566cc5cf89272979daf4c"; + sha256 = "0k5gknbp54pqbk66cx900lqdrxn0fzfpcpafpfmvz4r49parrj7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131130,7 +140073,7 @@ self: { mkDerivation { pname = "ois-input-manager"; version = "0.1.0.1"; - sha256 = "384e36f04810ca71a298e0e1a18d33a04f6dbe6a344e58f04d07143797ef64dc"; + sha256 = "1p34xybkf5079pq5hkildaz6skx06f6s3qg0k2i73jhh93q3ckiq"; libraryHaskellDepends = [ base hogre ]; librarySystemDepends = [ OIS ]; description = "wrapper for OIS input manager for use with hogre"; @@ -131143,9 +140086,9 @@ self: { mkDerivation { pname = "old-locale"; version = "1.0.0.7"; - sha256 = "dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50"; - revision = "1"; - editedCabalFile = "f87c7c0495bf863c82ca051e68b10b3133a286aed11f0291253385a5856a6ceb"; + sha256 = "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv"; + revision = "2"; + editedCabalFile = "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs"; libraryHaskellDepends = [ base ]; description = "locale library"; license = stdenv.lib.licenses.bsd3; @@ -131156,9 +140099,9 @@ self: { mkDerivation { pname = "old-time"; version = "1.1.0.3"; - sha256 = "1ccb158b0f7851715d36b757c523b026ca1541e2030d02239802ba39b4112bc1"; - revision = "1"; - editedCabalFile = "c1a016dd23d38e879b7972ce95f22b1498d39fc62a7b755ff5f344bfeeaf796e"; + sha256 = "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw"; + revision = "2"; + editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"; libraryHaskellDepends = [ base old-locale ]; description = "Time library"; license = stdenv.lib.licenses.bsd3; @@ -131169,7 +140112,7 @@ self: { mkDerivation { pname = "old-version"; version = "1.4.2"; - sha256 = "63e1741635b38b100c954133923c46de83c7c5e053ecfcc414e0b05c9d500feb"; + sha256 = "1sqga2fmrc702k2grv2kw32wg0yy8qy94cs1jl6112xk6lb79qb3"; libraryHaskellDepends = [ base ]; description = "Basic versioning library"; license = "unknown"; @@ -131184,9 +140127,9 @@ self: { mkDerivation { pname = "olwrapper"; version = "0.4.1"; - sha256 = "51d1ef071ca8fcace46060fd5372301310f6bddf4b9fe1c5845a67dd9555d332"; + sha256 = "0cnkanaxsrsshk2y37sbvyyzc40k61r57zb0c3jarz583h3yzlai"; revision = "2"; - editedCabalFile = "1166385cf5605d7d543f591234ac81feb1a307dee476c962d8603baebd66ba44"; + editedCabalFile = "0i5scsyswfv0v1icjxp4vq3s7cgyh6n384jr7xa7spb0ymf3hrhi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131209,7 +140152,7 @@ self: { mkDerivation { pname = "omaketex"; version = "0.1.1.0"; - sha256 = "c96ee573ab8f5c72a2c092f4974444a42af4d816027a3a9b74c3fe662f92024f"; + sha256 = "0kq2j8pndzn3fjdklyh22vcg8am48i29gx4jq2i74p4gmdryavn9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131221,22 +140164,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ombra" = callPackage - ({ mkDerivation, base, gl, hashable, hashtables, transformers - , unordered-containers, vect - }: - mkDerivation { - pname = "ombra"; - version = "0.2.2.0"; - sha256 = "006dde6ad3c4273078f7129a67380b1002b2fb6f2f92f253695e846a23181d60"; - libraryHaskellDepends = [ - base gl hashable hashtables transformers unordered-containers vect - ]; - homepage = "https://github.com/ziocroc/Ombra"; - description = "Render engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "omega" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , pretty, time @@ -131244,7 +140171,7 @@ self: { mkDerivation { pname = "omega"; version = "1.5.2"; - sha256 = "9e822da1175d8fd214c221e2a070171c76a1c63c7939ddd2b3e5a1f49f90216c"; + sha256 = "0v11j2gz98g5ng9dsfbr7k3a2xhw2xqa1qi1q8ad53sx2yhjv0ly"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131263,7 +140190,7 @@ self: { mkDerivation { pname = "omnicodec"; version = "0.7"; - sha256 = "a746a4f83528d09ce7360abb68ce91a144bd31f8a3ae4404106d4b67a3e6b3a3"; + sha256 = "18xkwsinfjvd20249bm3z0qvsi51j776ifqa6vkrrl186pwa8im7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131283,9 +140210,9 @@ self: { mkDerivation { pname = "omnifmt"; version = "0.2.1.1"; - sha256 = "1964789180234ea2ae72fa397beab99985392dac86f527ec7866463288341731"; + sha256 = "0c8p6j434ik6g3n2gxc6mhnkk1crp7m7nfgsfapa4ki3h28phr0r"; revision = "1"; - editedCabalFile = "51f61090b21ee761c23c15b3a1f371f306c9ac912c2b55fa565848e8dbba42fa"; + editedCabalFile = "1yj2pbdyhj2qavx5aarcj6ncj1pkf7rs3cqm7k163rqyna811xji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131311,7 +140238,7 @@ self: { mkDerivation { pname = "on-a-horse"; version = "0.3"; - sha256 = "6f5f635345ac2b528d31b4a9f640a3cae46da37911eebdaaafae80d756dbcba2"; + sha256 = "18nbvdbdg05fmymbvvhig6invr6ald0gdadl666m4axc8m9n6pvg"; libraryHaskellDepends = [ arrows base bytestring case-insensitive containers cookie http-types mtl random safe split text time transformers utf8-string @@ -131330,7 +140257,7 @@ self: { mkDerivation { pname = "on-demand-ssh-tunnel"; version = "0.1.0.6"; - sha256 = "7f3e0e003466bf95154f8497eec916f10b0af0f17518f19148ce26c30757b35e"; + sha256 = "0pmkaw3w69nf928z263my7q0l2zi2v4yx5w49warbgv66h00wgkz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131349,7 +140276,7 @@ self: { mkDerivation { pname = "onama"; version = "0.2.2.0"; - sha256 = "df85a43fa050f6d6afc6f56789fdf176da7b615019871b3a8f4f82c635f47626"; + sha256 = "09knyhswd0jgiwx1p1qra1hppnkny7yqjrzmqspxdxjhl0zs91fz"; libraryHaskellDepends = [ base containers parsec tagsoup ]; description = "HTML-parsing primitives for Parsec"; license = stdenv.lib.licenses.bsd3; @@ -131363,7 +140290,7 @@ self: { mkDerivation { pname = "once"; version = "0.2"; - sha256 = "753ec628a1fac1f308a4b0e75adee768f962815485e1832a8052ee9af61848a8"; + sha256 = "1a2833v9mvjjh0m87qc5aj0n5yb8wzg5mrxhlh4g7hgsl4lccgkm"; libraryHaskellDepends = [ base containers hashable template-haskell unordered-containers ]; @@ -131373,17 +140300,18 @@ self: { }) {}; "one-liner" = callPackage - ({ mkDerivation, base, bifunctors, contravariant, ghc-prim + ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit , profunctors, tagged, transformers }: mkDerivation { pname = "one-liner"; - version = "0.8"; - sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6"; + version = "0.9.1"; + sha256 = "18jys0qvywd7il4yzyf2yb22md7apzhxvnzr067d90srqdva7cpf"; 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; @@ -131397,7 +140325,7 @@ self: { mkDerivation { pname = "one-time-password"; version = "2.0.0"; - sha256 = "0a35ba546367070cbef67b80fc1e4eea3df5df3e683d3422873fa13a2b2bf9a2"; + sha256 = "18pr5cmkm89zhwi38gb87vgzagga9qggr03vysz0q1v7cdabld8a"; libraryHaskellDepends = [ base bytestring cereal cryptonite memory time ]; @@ -131414,7 +140342,7 @@ self: { mkDerivation { pname = "oneOfN"; version = "0.1.0.1"; - sha256 = "938651b2b834074f0655047336262851842cd9a834f496a85c08e0fdc565fe15"; + sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mokus0/oneOfN"; description = "Anonymous coproduct type"; @@ -131426,7 +140354,7 @@ self: { mkDerivation { pname = "oneormore"; version = "0.1.0.3"; - sha256 = "7798aed4847e21ba9c840fb05ad9538d7acf6ea941f1a1bce3189fb95412e4d3"; + sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/thinkpad20/oneormore"; description = "A never-empty list type"; @@ -131439,7 +140367,7 @@ self: { mkDerivation { pname = "only"; version = "0.0.6.0"; - sha256 = "410b03ed4f8f91feae734d645a1b9b6c6fbbe710119a855dbbb043ed80f7899d"; + sha256 = "17c9yy0fshxhpdfqb6hi23kvnvvckcdmlr2dffpgx4cg9znh62s1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec regex-compat ]; @@ -131447,12 +140375,24 @@ 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 { pname = "onu-course"; version = "1"; - sha256 = "609ad30d28bbda02a6c7334982abd69f14dd26403d8b10576739122057b11eb4"; + sha256 = "1d0yn5bj04ircxbi12rx80kds54zssmq4j9kqyk05nmv506x76k0"; libraryHaskellDepends = [ base smallcheck ]; description = "Code for the Haskell course taught at the Odessa National University in 2012"; license = stdenv.lib.licenses.mit; @@ -131464,7 +140404,7 @@ self: { mkDerivation { pname = "oo-prototypes"; version = "0.1.0.0"; - sha256 = "9eaee40e3221f817b957e472917977bdb06ac0e163a0c6ef87941de29a12f576"; + sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/yi-editor/oo-prototypes"; description = "Support for OO-like prototypes"; @@ -131481,9 +140421,9 @@ self: { mkDerivation { pname = "opaleye"; version = "0.5.3.0"; - sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73"; - revision = "1"; - editedCabalFile = "0188a5df6e42350cafb8771ed56b190451291bc04767a451c0aba76582bbed28"; + sha256 = "0wrxfqd1f6m8pb8bpx3n7s2gbw3r0dx2ryw2f5a0nnvwv5cagvbc"; + revision = "2"; + editedCabalFile = "1nzwk9mpgnwqmdna35mn0q4b50x1hch9q1pfdqdsz87b9308fb1q"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -131506,9 +140446,9 @@ self: { mkDerivation { pname = "opaleye-classy"; version = "0.3.1.1"; - sha256 = "2c3e216384bdb5e9e9eb84e67dd86b4daaf31568ccb5714b8aa84e2d3550ca9b"; + sha256 = "16yaa0sjskm8i95p3dfcd0az7ajddgc7vrl4xglykddxhiij2gic"; revision = "1"; - editedCabalFile = "79b08c58924ba2f19fa919f97895adb4dbb6b8e0b1644c91aaf5307e414fbc27"; + editedCabalFile = "09xw9x0pwc7mma8lqr5iw2wbdnxlmnapiy8rm6gz38jbj9c8rc3r"; libraryHaskellDepends = [ base bytestring lens mtl opaleye postgresql-simple product-profunctors transformers @@ -131529,7 +140469,7 @@ self: { mkDerivation { pname = "opaleye-sqlite"; version = "0.0.1.0"; - sha256 = "b8afd6df526f94bad4067e74f25e7c25e2909b1bc57270280405f7c905907164"; + sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq"; libraryHaskellDepends = [ base base16-bytestring bytestring case-insensitive contravariant direct-sqlite pretty product-profunctors profunctors semigroups @@ -131552,7 +140492,7 @@ self: { mkDerivation { pname = "opaleye-trans"; version = "0.3.5"; - sha256 = "9360dd3721ea49d3b738bff65ab518bcf4365d10282ffb3eea05242022ec48fd"; + sha256 = "1za8xhi20905x8zgnbr821fkdx5w32smmxmz72vx6jga44vxsq4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131572,7 +140512,7 @@ self: { mkDerivation { pname = "open-browser"; version = "0.2.1.0"; - sha256 = "0bed2e63800f738e78a4803ed22902accb50ac02068b96c17ce83a267244ca66"; + sha256 = "0rna8ir2cfp8gk0rd2q60an51jxc08lx4gl0liw8wwqgh1ijxv8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -131587,7 +140527,7 @@ self: { mkDerivation { pname = "open-haddock"; version = "0.1.0.0"; - sha256 = "310b4b7dfeef8a4b07e77c9f5b646fe292bd49ef343ddbff7e8ddd02281fefdc"; + sha256 = "1p7g3wl05pcdgvzxng9lxx4vv4p2dxj5p7vwww3lp2pgzryln2ri"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base basic-prelude text turtle ]; @@ -131605,7 +140545,7 @@ self: { mkDerivation { pname = "open-pandoc"; version = "1.5.1.1"; - sha256 = "f6339da2a922cebc39de5289dd52b69c5787c5cb6018051daad4e0f3430e2dcd"; + sha256 = "1k9d1r1z7q6lm8fha630rg2qfmwwnr9dv2ajvqwvrki2m6i9sczn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131624,7 +140564,7 @@ self: { mkDerivation { pname = "open-signals"; version = "0.1.0.3"; - sha256 = "a311f6ab03acaa6da81593fd1a8fb0f8796f51c6592475311892762dfa57d133"; + sha256 = "0cyiazx2sxlj30qpa92rqr8nyygqn27imzck2nl6vamc0fmzc4d3"; libraryHaskellDepends = [ base either mtl transformers ]; testHaskellDepends = [ base ]; description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks"; @@ -131636,7 +140576,7 @@ self: { mkDerivation { pname = "open-symbology"; version = "0.1"; - sha256 = "d5bfa2190950c71e1b21ba755d440da10c2cfe0d0103b2c185af0e124564e637"; + sha256 = "0dz6ci2i43mghp0v40q11pz2q3511m25sxds44dixish14cs5gym"; libraryHaskellDepends = [ attoparsec base conduit mtl text ]; homepage = "https://github.com/alphaHeavy/open-symbology"; license = stdenv.lib.licenses.bsd3; @@ -131649,7 +140589,7 @@ self: { mkDerivation { pname = "open-typerep"; version = "0.6.1"; - sha256 = "a3689cce6718c67d6fda7eb4c3fb0566da60dbc0a81e42ab1dfa8c04e7a50812"; + sha256 = "04h8lpkh937s3nml47m8q3dn1nk60pxw7d3yv9ppvihqcz79qs53"; libraryHaskellDepends = [ base constraints mtl syntactic tagged template-haskell ]; @@ -131666,7 +140606,7 @@ self: { mkDerivation { pname = "open-union"; version = "0.2.0.0"; - sha256 = "e9835d4e736afcedda90ff1e21ab6446266c1aa925b453ebf2292561dab48bbe"; + sha256 = "1glbnkd62999ybmm7d15m4d6q9j6cjmj27pzj3dfvz3afd75v0z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base type-fun ]; @@ -131684,7 +140624,7 @@ self: { mkDerivation { pname = "open-witness"; version = "0.4"; - sha256 = "5b5b934213b9a795bfed829613fbcb11faa20e12f403319c300921ed094acb20"; + sha256 = "086b984ys88962f320zl287a5yhirgxi75l2xnzrb9xr2d196nsv"; libraryHaskellDepends = [ base constraints hashable random template-haskell transformers witness @@ -131696,12 +140636,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opench-meteo" = callPackage + ({ mkDerivation, aeson, base, data-default, text, time }: + mkDerivation { + pname = "opench-meteo"; + version = "0.1.0.0"; + sha256 = "03lvbz0dvinclf5fi1msn9njfkvnskjvdc215mkmfkfilkqdbj0n"; + libraryHaskellDepends = [ aeson base data-default text time ]; + homepage = "https://github.com/hansroland/opench"; + description = "A Haskell implementation of the Swiss Meteo Net data API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "opencog-atomspace" = callPackage ({ mkDerivation, atomspace-cwrapper, base, transformers }: mkDerivation { pname = "opencog-atomspace"; - version = "0.1.0.7"; - sha256 = "24bcde8b587dc6864b0eb450aea3a246a51d3e540bc186e3ba6ac83158a37a1b"; + version = "0.1.0.8"; + sha256 = "1h5k849fw0w4wny05gby12n4i6yw4wh3vccnlmh2kp6lh7bdd98b"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ atomspace-cwrapper ]; homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; @@ -131710,12 +140662,76 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {atomspace-cwrapper = null;}; + "opencv" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bindings-DSL + , bytestring, Cabal, containers, criterion, data-default, deepseq + , directory, Glob, haskell-src-exts, inline-c, inline-c-cpp + , JuicyPixels, lens, linear, opencv3, primitive, QuickCheck, repa + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , transformers, vector + }: + mkDerivation { + pname = "opencv"; + version = "0.0.1.1"; + sha256 = "095vljv7y7am7dfn7hp9rncfcbcmmqvgzwgw6iwrp6s3z0qv10jn"; + revision = "1"; + editedCabalFile = "1gql71xhyd3ns0a7cigjgdpar7x0b0bwr9kvi17gfs91ggiw7684"; + configureFlags = [ + "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++" + ]; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base base64-bytestring bindings-DSL bytestring containers + data-default deepseq inline-c inline-c-cpp JuicyPixels linear + primitive repa template-haskell text transformers vector + ]; + libraryPkgconfigDepends = [ opencv3 ]; + testHaskellDepends = [ + base bytestring containers data-default directory Glob + haskell-src-exts JuicyPixels lens linear primitive QuickCheck repa + tasty tasty-hunit tasty-quickcheck template-haskell text + transformers vector + ]; + benchmarkHaskellDepends = [ base bytestring criterion repa ]; + hardeningDisable = [ "bindnow" ]; + homepage = "https://github.com/LumiGuide/haskell-opencv"; + description = "Haskell binding to OpenCV-3.x"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) opencv3;}; + + "opencv-extra" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, Cabal, containers + , data-default, directory, Glob, haskell-src-exts, inline-c + , inline-c-cpp, JuicyPixels, linear, opencv, primitive + , template-haskell, text, transformers, vector + }: + mkDerivation { + pname = "opencv-extra"; + 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 + linear opencv primitive template-haskell transformers vector + ]; + testHaskellDepends = [ + base bytestring containers data-default directory Glob + haskell-src-exts JuicyPixels linear opencv primitive + template-haskell text transformers vector + ]; + homepage = "https://github.com/LumiGuide/haskell-opencv"; + description = "Haskell binding to OpenCV-3.x extra modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "opencv-raw" = callPackage ({ mkDerivation, base, bindings-DSL, Cabal, opencv, vector }: mkDerivation { pname = "opencv-raw"; version = "0.1.0.0"; - sha256 = "96df8e0d3bd7df173a8d3e4b4b769cecb9f97de5683bbb3e6a137fd1f0941010"; + sha256 = "040hjkqd2zqkd8zbnfv8wmyzkfgckiv4njryilx1gpyp7c6qxpwn"; libraryHaskellDepends = [ base bindings-DSL Cabal vector ]; libraryPkgconfigDepends = [ opencv ]; homepage = "www.github.com/arjuncomar/opencv-raw.git"; @@ -131729,7 +140745,7 @@ self: { mkDerivation { pname = "opendatatable"; version = "0.0.0"; - sha256 = "6194b08a0236a6fcc767e300dde4ec93dfe98cc416bcefd2cfea002e691267af"; + sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531"; libraryHaskellDepends = [ base hxt template-haskell th-lift ]; homepage = "https://github.com/fabianbergmark/OpenDataTable"; description = "A library for working with Open Data Tables"; @@ -131744,7 +140760,7 @@ self: { mkDerivation { pname = "openexchangerates"; version = "0.1.0.0"; - sha256 = "14c9a1dd65790b6ab3c6d42aa2403e87eb64ed255f105ae4b0ba02c79a832132"; + sha256 = "0ci1hfdcf0msn3j5l42z4pnn9sw77r0a4anlqsrnl2vrcpfs3j8l"; libraryHaskellDepends = [ aeson base containers currency errors HTTP network text ]; @@ -131754,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 @@ -131761,7 +140795,7 @@ self: { mkDerivation { pname = "openflow"; version = "0.3.0"; - sha256 = "6269b0b64008600c53ed70c9e3ab408a2791cac3c71446b9d921d74834190f36"; + sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2"; libraryHaskellDepends = [ aeson base bimap binary bytestring containers deepseq-generics hashable network @@ -131777,7 +140811,7 @@ self: { mkDerivation { pname = "opengl-dlp-stereo"; version = "0.1.5.4"; - sha256 = "d50aaa46219ae649cc4df821cd53d3c962c77b42c09d4ee6328ecb99f482f4d9"; + sha256 = "1nglhbs9kjwf6bk4x7f089xwfqn9sd9ws8gq9p64krls453al2nm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default GLUT OpenGL vector ]; @@ -131794,7 +140828,7 @@ self: { mkDerivation { pname = "opengl-spacenavigator"; version = "0.1.5.5"; - sha256 = "4835cd07f5fa8931b2fd38580faf9cd6057550ae70104ad60ff5a42d6f97080e"; + sha256 = "03h8jxpjv97m1zb4l43hmr87a1fnkjphyn1qznr332gsyl3wsda8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary data-default GLUT OpenGL ]; @@ -131814,7 +140848,7 @@ self: { mkDerivation { pname = "opengles"; version = "0.8.3"; - sha256 = "c5cdffed66b7eb546a2546fc246dafd20fe4a5971f1ef8d1f5545de0d8e6e303"; + sha256 = "00z3wvcf0palyp8zh7hzjyjy83yjmxnj9z264mm59sxpcvnzzkf5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131833,17 +140867,18 @@ self: { }) {EGL = null; GLESv2 = null;}; "openid" = callPackage - ({ mkDerivation, base, bytestring, containers, HsOpenSSL, HTTP - , monadLib, network, time, xml + ({ mkDerivation, base, base-compat, bytestring, containers + , HsOpenSSL, HTTP, monadLib, network, network-uri, time, xml }: mkDerivation { pname = "openid"; - version = "0.2.0.2"; - sha256 = "5a33c21ca3e2b652bcea93bd32a96dbeabd336260d7617337331693a3e140d66"; + version = "0.2.1.0"; + sha256 = "1vwwwwcw03srgyr612gsnpv0gq8gvbykbwg6myrsn1k8c89f673d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers HsOpenSSL HTTP monadLib network time xml + base base-compat bytestring containers HsOpenSSL HTTP monadLib + network network-uri time xml ]; homepage = "http://github.com/elliottt/hsopenid"; description = "An implementation of the OpenID-2.0 spec."; @@ -131859,7 +140894,7 @@ self: { mkDerivation { pname = "openpgp"; version = "0.6.1"; - sha256 = "3a1915d308bf69819a6db23d6cec29bac05efe9a9dbe69197a0bdbfe2da04d0f"; + sha256 = "03sdl0nzxnqbg8cnkglxkbz5xh5s57n6qgdjdnd82sdz139ia69s"; libraryHaskellDepends = [ base binary bytestring bzlib utf8-string zlib ]; @@ -131881,7 +140916,7 @@ self: { mkDerivation { pname = "openpgp-Crypto"; version = "0.5"; - sha256 = "f980dff35b9adaed3022d883f975d16836d6a51ae4f97ca7d047a2339efb4d3f"; + sha256 = "0gsdzfg378j7s2kpryg43ajxcdk8s5szk0yq48qfvnlsbgrxz07r"; libraryHaskellDepends = [ base binary bytestring Crypto openpgp utf8-string ]; @@ -131903,7 +140938,7 @@ self: { mkDerivation { pname = "openpgp-asciiarmor"; version = "0.1"; - sha256 = "5cd45aad8fb9e0d07ed27da1801937b4d8598dac1c55bcfbfe11d9608f053bf7"; + sha256 = "1xrv0n7n1n8izvxvqm8wmj6mkn5l6wcq18bxs9zd1q5riynmmm2w"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring cereal ]; @@ -131926,7 +140961,7 @@ self: { mkDerivation { pname = "openpgp-crypto-api"; version = "0.6.3"; - sha256 = "554694dd432a4a57fc29d47a5d85a463b202a8506c70dec131c41ef76559f9a1"; + sha256 = "18grb5jzf7n4670xww3ca2l05ck3lj2msynl57y5fjia8gfr8ijm"; libraryHaskellDepends = [ base binary bytestring cereal crypto-api cryptocipher cryptohash openpgp tagged transformers @@ -131950,7 +140985,7 @@ self: { mkDerivation { pname = "opensoundcontrol-ht"; version = "0.3"; - sha256 = "ea4fef00ad8762f438d0441148c102fe71624e28433813a9002ac18955dc8b94"; + sha256 = "154bviaqkh9a02li6f2351764wgy0b0lh4a4s0wg8ql7ml0fykza"; libraryHaskellDepends = [ base binary bytestring hosc process random transformers utility-ht ]; @@ -131967,9 +141002,9 @@ self: { mkDerivation { pname = "opensource"; version = "0.1.0.0"; - sha256 = "3459b6ce70fb8fc8bdf9d9f6ed0476724cb8a11b673fc60422edac2376620127"; + sha256 = "09q1c9v27b7d482ccgv73fhvhk3jfq2fvxnrz6ywi3zvf37bcn9l"; revision = "1"; - editedCabalFile = "e666a8a79e0dc20112d7eafdbdc8a87f2486dfcdd3cac51f5e523bd34e4deb0b"; + editedCabalFile = "02zb9m7d6fsjbqgwbjnkrpgqc93zm34bvzgasw903hhdkskshrp6"; libraryHaskellDepends = [ aeson base http-client http-client-tls text transformers ]; @@ -131989,7 +141024,7 @@ self: { mkDerivation { pname = "openssh-github-keys"; version = "0.1.1.0"; - sha256 = "ca8cdaa6c8379e4840087b60d599676156cd9ae0d08b84dff3715c82f872fb28"; + sha256 = "0a7vfbw84p3iyggq92yhw2dcsmk1cycxaq3v1104i7ipr2kdm36a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base octohat text ]; @@ -132011,7 +141046,7 @@ self: { mkDerivation { pname = "openssl-createkey"; version = "0.1"; - sha256 = "e5c5d0ef9aee675b75eebaf8f985fdd17126fc5eff7faba1e78dfc1c27e5a9dc"; + sha256 = "1p59wlkirz4dwyhsnzzzbvy2cwfizn2zky5sxrsmnrzfkbpx1ig5"; libraryHaskellDepends = [ base directory HsOpenSSL time unix ]; description = "Create OpenSSL keypairs"; license = stdenv.lib.licenses.bsd3; @@ -132024,8 +141059,8 @@ self: { }: mkDerivation { pname = "openssl-streams"; - version = "1.2.1.0"; - sha256 = "a9965909dc67261f9328ac4bb364181a37ba53fceac2c5de3629f0dd796219cb"; + version = "1.2.1.1"; + sha256 = "1annfc0nmkj0hl62x4w39phai54qd8ibislwhbw66k0df3bc8kyz"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -132043,7 +141078,7 @@ self: { mkDerivation { pname = "opentheory"; version = "1.200"; - sha256 = "d0c50336be6c16fcb9ef8f7adad26572c25f28034bb90e900f97b0c1f5cdbd39"; + sha256 = "0fdxrpsw3c4p1y80xfab0cl5zhkjcp9dlylgxywzq5kcpqv07ifh"; libraryHaskellDepends = [ base opentheory-primitive QuickCheck ]; testHaskellDepends = [ base opentheory-primitive QuickCheck ]; homepage = "http://opentheory.gilith.com/?pkg=base"; @@ -132058,7 +141093,7 @@ self: { mkDerivation { pname = "opentheory-bits"; version = "1.69"; - sha256 = "c9ab3cbbd5b63db86c28d70ca1e61c4cef7af77a0032d5ebc694dbb6e71b897a"; + sha256 = "0yl93gkvdnwlqvmxach0gbvpmvsc3kka236p51nbhgdnsnxkray9"; libraryHaskellDepends = [ base opentheory opentheory-primitive opentheory-probability QuickCheck @@ -132075,7 +141110,7 @@ self: { mkDerivation { pname = "opentheory-byte"; version = "1.128"; - sha256 = "0c0c0df4532acbb335bf211b439327a119eeaa93130836e92ea11c07add3e376"; + sha256 = "0xp3sfnhf7515vlkc20kjfmfw6d14y9l66r1pwsv7jraags0s30c"; libraryHaskellDepends = [ base opentheory opentheory-bits opentheory-primitive opentheory-probability QuickCheck @@ -132092,7 +141127,7 @@ self: { mkDerivation { pname = "opentheory-char"; version = "1.41"; - sha256 = "31c9a4667bd0dcf358b0e0d5a9532d31d5277af5251e5588951e4df6d6780d7c"; + sha256 = "0z0dg3bgck8yjn45a7i5ymx2gm9i5m9skmg0n1cg7p6hgdka9j9i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132114,7 +141149,7 @@ self: { mkDerivation { pname = "opentheory-divides"; version = "1.66"; - sha256 = "dcbeeeb31870d5860eeb604b18cf616930566718459b9b707d7faa6a4c192e9b"; + sha256 = "16rf3566makzgmq9p6s531kmcc39c77ihjv0xc78dmbh32ryxgnw"; libraryHaskellDepends = [ base opentheory opentheory-primitive QuickCheck ]; @@ -132133,7 +141168,7 @@ self: { mkDerivation { pname = "opentheory-fibonacci"; version = "1.72"; - sha256 = "8af8af9bb12af856142f89839dcb45d9be705f38b80bdaaa5fdb8c252fcb82bb"; + sha256 = "1fw2rcpjb36vbymdl2xq71gp1gnr8p5rv0w95wa5dy1an6dszy4a"; libraryHaskellDepends = [ base opentheory opentheory-primitive opentheory-stream QuickCheck ]; @@ -132150,7 +141185,7 @@ self: { mkDerivation { pname = "opentheory-parser"; version = "1.160"; - sha256 = "3215209e7f01b7b548e46546591e51b84ff39c333ed45dc552623db2d933d3a3"; + sha256 = "18yk6gcv4gb2ab2mvm1y6ffg6kxqa4g5jik5wi4bbdq1gyg2059j"; libraryHaskellDepends = [ base opentheory opentheory-primitive QuickCheck ]; @@ -132169,7 +141204,7 @@ self: { mkDerivation { pname = "opentheory-prime"; version = "1.85"; - sha256 = "77721fc4cf5791bacb59c576e8a1525c2e1767d350cd95b39cd77f353968e54c"; + sha256 = "0k75d0wkazypkjrrbkahsdkifbjwaahyhxn5b75vm4aprz21ywkp"; libraryHaskellDepends = [ base opentheory opentheory-divides opentheory-primitive opentheory-stream QuickCheck @@ -132188,7 +141223,7 @@ self: { mkDerivation { pname = "opentheory-primitive"; version = "1.8"; - sha256 = "e8924d11e642820fc4ffbf0cc0a72577b0a5719845bd30ec522ff8d87c78ee8a"; + sha256 = "12pfg1ydiy1gabn31ga5k1qsbc3p4nkw035zzz20z0j2wq8lv4p8"; libraryHaskellDepends = [ base QuickCheck random ]; testHaskellDepends = [ base QuickCheck random ]; homepage = "http://www.gilith.com/research/opentheory/"; @@ -132202,7 +141237,7 @@ self: { mkDerivation { pname = "opentheory-probability"; version = "1.52"; - sha256 = "c23cf05b961bda0c50ebb4ea82e90172fbbe5f6c1528ef1ef858a690e419bd2e"; + sha256 = "0bmx37j919jqz0gfya0mdigvxyvj07lq5smlxd80rnhvjrdz0g62"; libraryHaskellDepends = [ base opentheory opentheory-primitive QuickCheck ]; @@ -132217,7 +141252,7 @@ self: { mkDerivation { pname = "opentheory-stream"; version = "1.49"; - sha256 = "fb77d60d61bba1fd868a284a2bf5e5eff4b69b2ec48cbb9a76046e0f20627483"; + sha256 = "10vlc8h0yvh4fsdbp3645sdvdx7gwpsjnji8ia3gv8dvc46xcxzv"; libraryHaskellDepends = [ base opentheory opentheory-primitive QuickCheck ]; @@ -132234,7 +141269,7 @@ self: { mkDerivation { pname = "opentheory-unicode"; version = "1.142"; - sha256 = "fad5850a6a853de5b686101f374f297d6a00089fc7d051154a2da3091a5f5451"; + sha256 = "0lalbwd0k8rd98am3l67kw400skx557kf7qhhsvfagc5d858bmgs"; libraryHaskellDepends = [ base opentheory opentheory-bits opentheory-byte opentheory-parser opentheory-primitive opentheory-probability QuickCheck @@ -132256,7 +141291,7 @@ self: { mkDerivation { pname = "opentype"; version = "0.1.1"; - sha256 = "c074b4b424201266f126ffe4360adbe00c9c855d65b4d48aeaf835033c504b0d"; + sha256 = "03aba0y06dgqxa5d9d35bn2rq370vc53dr7z4vqnc4i04jsb8x60"; libraryHaskellDepends = [ base binary bytestring containers ghc microlens microlens-th mtl pretty-hex time unordered-containers vector @@ -132266,6 +141301,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "openweathermap" = callPackage + ({ mkDerivation, aeson, base, directory, http-client + , optparse-applicative, servant, servant-client, xdg-basedir + }: + mkDerivation { + pname = "openweathermap"; + version = "0.0.0"; + sha256 = "1ndd54pwbgkk10ah6125hgs8gn6l2bzz2r0mkc2f30y90m8mr7ll"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base http-client servant servant-client + ]; + executableHaskellDepends = [ + base directory optparse-applicative xdg-basedir + ]; + description = "Access data at OpenWeatherMap"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "operate-do" = callPackage ({ mkDerivation, base, charset, doctest, filemanip , haskell-src-meta, hspec, QuickCheck, template-haskell @@ -132273,7 +141328,7 @@ self: { mkDerivation { pname = "operate-do"; version = "0.1.0"; - sha256 = "c1daa940cd97336eecba200f8201f591ed1395390feeb3c9376fea86b7901764"; + sha256 = "0r0pj2vqdskg6z4v7vhg76ai7vciyl0q43r0pbn6wcwprm0aknn1"; libraryHaskellDepends = [ base charset haskell-src-meta template-haskell ]; @@ -132288,7 +141343,7 @@ self: { mkDerivation { pname = "operational"; version = "0.2.3.5"; - sha256 = "91d479063ae7ed3d0a6ae911bdee550fbf31cf341910f9778046b484c55b4af4"; + sha256 = "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; @@ -132303,7 +141358,7 @@ self: { mkDerivation { pname = "operational-alacarte"; version = "0.3.1"; - sha256 = "d52a77eee6056ac730bf9b953018044aa5ed9b381e7cd4e7a6e59348c1969d58"; + sha256 = "0n4xjv0li4z5lvkx8z0y72dyv9aa0hc315cvpwqcfsh5wvp7fanm"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/operational-alacarte"; @@ -132317,7 +141372,7 @@ self: { mkDerivation { pname = "operational-class"; version = "0.3.0.0"; - sha256 = "8b28b9cb86a2dd520196f6a563538dc2c9e8730f0a0f5e5f3bca19559631e70b"; + sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b"; libraryHaskellDepends = [ base operational transformers ]; homepage = "https://github.com/srijs/haskell-operational-class"; description = "MonadProgram typeclass for the operational package"; @@ -132331,7 +141386,7 @@ self: { mkDerivation { pname = "operational-extra"; version = "0.4"; - sha256 = "1a19bddfa919f84ee64482a34ff2e001d8bd8e5fdf9f53693f1921994845ec7d"; + sha256 = "0zgc8m49j88r7xlm77yzby7bvn01w3r4z8w28kk4xy0rm7gvs68s"; libraryHaskellDepends = [ base bytestring operational text time transformers ]; @@ -132345,7 +141400,7 @@ self: { mkDerivation { pname = "opml"; version = "0.4"; - sha256 = "3d091a71f0b86f47d987e69c450c3de6313a6b2f0ab59af73d1a0bc72635d9ae"; + sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x"; libraryHaskellDepends = [ base directory xml ]; description = "Representing and handling OPML subscription information"; license = stdenv.lib.licenses.bsd3; @@ -132362,7 +141417,7 @@ self: { mkDerivation { pname = "opml-conduit"; version = "0.6.0.1"; - sha256 = "cb0f6e0964d854f7bbcb737867bc6d5e9ddcac6da05e6d743a1c4503abc78355"; + sha256 = "0mc3qymh6i8w79s6spm0dnndr7aydny6fy3krfxzfm6qch4nw3yb"; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers lens-simple mono-traversable monoid-subclasses safe-exceptions @@ -132379,7 +141434,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "opml-conduit_0_6_0_2" = callPackage + "opml-conduit_0_6_0_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, hlint, lens-simple , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck @@ -132389,8 +141444,8 @@ self: { }: mkDerivation { pname = "opml-conduit"; - version = "0.6.0.2"; - sha256 = "b1f66c0ba92fdf436889058e7fa62dca5a86398348432ab38c352af1804e4125"; + version = "0.6.0.3"; + sha256 = "1flzv6v1mds7w9v3ap3g7gfwlvq54z0j1w7g2b07d17x334lyhgb"; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers lens-simple mono-traversable monoid-subclasses safe-exceptions @@ -132415,7 +141470,7 @@ self: { mkDerivation { pname = "opn"; version = "0.1.2"; - sha256 = "90913a9e9721b613221b883eac57701051ddc79a8d23fd01802eb575d99ea374"; + sha256 = "0x53kvcpbd9fh00zs8wdkb3xsl8hf1bsqgl83ci17di1jyg3m4ch"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132435,7 +141490,7 @@ self: { mkDerivation { pname = "optimal-blocks"; version = "0.1.0"; - sha256 = "2b59a43b888c653c44c9430a0ff93e4d76b5fe1a574bbc6289c73b2f04d4c3a0"; + sha256 = "1863sh22yfy7i5ibqjsp3bzbaxjd7vwhy2j3r523qrcci0xs8n9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq vector ]; @@ -132461,7 +141516,7 @@ self: { mkDerivation { pname = "optimization"; version = "0.1.7"; - sha256 = "166af247883dab29171440bb97e3fd836fb66a5f4d0133fee0c96e6c120489f8"; + sha256 = "1y490h96qvn9w3z360adbxmbcvw3zpirgfs02hbjkarxi13z4shn"; libraryHaskellDepends = [ ad base distributive linear semigroupoids vector ]; @@ -132478,7 +141533,7 @@ self: { mkDerivation { pname = "optimusprime"; version = "0.0.1.20091117"; - sha256 = "aeaebbf0f3162ac3bb6039c10415744e6ca7c52c363e79c7c41e23b077728218"; + sha256 = "0642f9vv08qyqk3pjgin5k2sfv2ffhah9h9rc2xw6ahnygqbpbmf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132496,7 +141551,7 @@ self: { mkDerivation { pname = "option"; version = "0.1.0.1"; - sha256 = "52cddd415c4baeb2148fadcbca5cfd9105762df58e5b5660a5cd55cd385802d4"; + sha256 = "1m02b0wcsmfdlmh5cnwfylnpc1cizmfcmjxdiwab5bjbbi0xvkaj"; libraryHaskellDepends = [ base ]; description = "A strict version of Maybe"; license = stdenv.lib.licenses.mit; @@ -132507,7 +141562,7 @@ self: { mkDerivation { pname = "optional"; version = "0.0.1"; - sha256 = "0f498781f6ff1e899c333a8674fcedc4ce4867bd393ab5876bd695f702a236c4"; + sha256 = "1i1nl81gg5fndf3vafirpmklikn4xpy791is6ff8j7pzys0qfj8g"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck @@ -132522,7 +141577,7 @@ self: { mkDerivation { pname = "optional-args"; version = "1.0.1"; - sha256 = "940604d6ebc1fb1b5372cb21e0b3870cd9d920655e41841844131994d1f1fd99"; + sha256 = "16gxy78r868k8hc88hayclhdkn8chyry08fbf99ipyy1xgb081ll"; libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = stdenv.lib.licenses.bsd3; @@ -132535,7 +141590,7 @@ self: { mkDerivation { pname = "options"; version = "1.2.1.1"; - sha256 = "283eea9ae2c539830c6c65f5c03fb00626cfd1274da0526c285c146fc3065a62"; + sha256 = "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8"; libraryHaskellDepends = [ base containers monads-tf transformers ]; testHaskellDepends = [ base chell chell-quickcheck containers monads-tf transformers @@ -132550,7 +141605,7 @@ self: { mkDerivation { pname = "options-time"; version = "1.0.1"; - sha256 = "15aec00c77000d8cf1174127198e16ebf50386024f9b39040fc7675ba9e25567"; + sha256 = "0rsmwalmnry71w23k6sg0a307xgb2s71j9s12zqqq380fw6c1bhm"; libraryHaskellDepends = [ base options time ]; testHaskellDepends = [ base chell options time ]; homepage = "https://john-millikin.com/software/haskell-options/"; @@ -132564,8 +141619,8 @@ self: { }: mkDerivation { pname = "optparse-applicative"; - version = "0.13.1.0"; - sha256 = "f1fcf9d7e78ddf14083a07d8fe1aa65d75c5102e0d44df981585bce54c5c2a2b"; + version = "0.13.2.0"; + sha256 = "18kcjldpzay3k3309rvb9vqrp5b1gqp0hgymynqx7x2kgv7cz0sw"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -132575,12 +141630,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-applicative_0_14_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, process + , QuickCheck, transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.14.0.0"; + sha256 = "06iwp1qsq0gjhnhxwyhdhldwvhlgcik6lx5jxpbb40fispyk4nxm"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "optparse-applicative-simple" = callPackage + ({ mkDerivation, attoparsec, attoparsec-data, base-prelude + , optparse-applicative, rerebase, text + }: + mkDerivation { + pname = "optparse-applicative-simple"; + version = "1"; + sha256 = "0rcgzjp8h7ymvb10gms8a4ras6b2qfzi281l4i0gyjpgp9yka247"; + libraryHaskellDepends = [ + attoparsec base-prelude optparse-applicative text + ]; + testHaskellDepends = [ attoparsec-data rerebase ]; + homepage = "https://github.com/nikita-volkov/optparse-applicative-simple"; + description = "Simple command line interface arguments parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-declarative" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { pname = "optparse-declarative"; version = "0.3.0"; - sha256 = "48ae1a50b2d6b8b208d5fa86fe97b673144916f40cff1eae5b928c29cd037eab"; + sha256 = "1avy0g6jk34jbfp1xzqcyhb4j53knsbzx1pssl4b5f6nn981mbj8"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/tanakh/optparse-declarative"; description = "Declarative command line option parser"; @@ -132593,8 +141684,8 @@ self: { }: mkDerivation { pname = "optparse-generic"; - version = "1.1.4"; - sha256 = "dc69bc73d6e3de52bcc5c4ccd8ce741eebb8d10747bc7f819b38b0cdaf1e520c"; + version = "1.1.5"; + sha256 = "1xg6c7h6h8q64gwskh7l4h7qn7w4y0ixf88grgk23xdficgmsyms"; libraryHaskellDepends = [ base bytestring optparse-applicative semigroups system-filepath text time transformers void @@ -132603,12 +141694,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.2"; + sha256 = "110jil2n945x30d8wgdrgs7di310z9hdnzhw5c1zq2jfh3b54ygz"; + libraryHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "optparse-helper"; version = "0.2.1.1"; - sha256 = "0a0bbd3dd34f6b014bbb49bc14ed0bce597ab65711a856e173eb5f5a446d7510"; + sha256 = "043mdm25lpzbfghmda0iayv7lnff1gni9g29pd5h2ssgscyvs2qa"; libraryHaskellDepends = [ base optparse-applicative ]; homepage = "https://github.com/pharpend/optparse-helper"; description = "Helper functions for optparse-applicative"; @@ -132622,7 +141730,7 @@ self: { mkDerivation { pname = "optparse-simple"; version = "0.0.3"; - sha256 = "4547f0a6c1bd959b1d9c3c2a5fabee39ac9a19dffabbb2d75461a2d461df8c7e"; + sha256 = "0zlcvxhx98k1akbv5fzsvwcrmb1rxsmmyaiwkhfrp5dxq6kg0is5"; libraryHaskellDepends = [ base either gitrev optparse-applicative template-haskell transformers @@ -132636,7 +141744,7 @@ self: { mkDerivation { pname = "optparse-text"; version = "0.1.1.0"; - sha256 = "f6c081ecec880ae4124f25c1d91ba3a1a3caed9d2fde9e977bceab7d300884ef"; + sha256 = "1vw410q7vayfgfbrxpigkpnwm8x1lcdxkh959w9f82l8xkn83h7n"; libraryHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base hspec optparse-applicative text ]; homepage = "https://github.com/passy/optparse-text#readme"; @@ -132650,7 +141758,7 @@ self: { mkDerivation { pname = "orc"; version = "1.2.1.4"; - sha256 = "1d64fbd34d73865a8baa08232c635e3be56e741bdd1d4cc54446f12ab629847e"; + sha256 = "0zl456v2mwa68k2lq7fx3ds6xr9vbrijq8q8ma5mm1kk9p9znr0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq monadIO mtl process stm ]; @@ -132670,7 +141778,7 @@ self: { mkDerivation { pname = "orchestrate"; version = "0.2.0.3"; - sha256 = "ccc60ad893d0590a92495a3982a0a753cd2628dca9307ffe2e5077a4740eb0d7"; + sha256 = "1mxh1rsa8xsh5vz7yc59vhl2dkaklyh84fas9690lnfhjgc0minc"; libraryHaskellDepends = [ aeson base bytestring case-insensitive data-default either errors http-client http-types lens mtl text transformers @@ -132694,7 +141802,7 @@ self: { mkDerivation { pname = "orchid"; version = "0.0.8"; - sha256 = "7536f260eefee340cf37e4341581647c1b257ae7493362638c1787ad21746cb4"; + sha256 = "1d3cfhhsv1qpiiin4cs9wxx2a6vwcj0iad746z7l1qzyxrhg4dkm"; libraryHaskellDepends = [ base bytestring containers encoding extensible-exceptions fclabels filestore hscolour mtl nano-md5 parsec process QuickCheck salvia @@ -132712,7 +141820,7 @@ self: { mkDerivation { pname = "orchid-demo"; version = "0.0.6"; - sha256 = "3f09f88e04c3d760526babef1e11a585c095a214f72dec032644a0eea6aad2bd"; + sha256 = "1gfjmakfx8244q1yqbgp2ji9bh45ll8ixvxbdd961my30j7gh29z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132729,7 +141837,7 @@ self: { mkDerivation { pname = "ord-adhoc"; version = "0.0.0.1"; - sha256 = "c3889d5962b31c1e602f95177ba9e4657e95cc10621ae1631f2c06ceaf9b5c18"; + sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263"; libraryHaskellDepends = [ base void ]; homepage = "https://github.com/fumieval/ord-adhoc/"; description = "Creating Ord instances instantly"; @@ -132743,7 +141851,7 @@ self: { mkDerivation { pname = "order-maintenance"; version = "0.2.1.0"; - sha256 = "c959d8aa67f1cf47e15adfe650ba864f590deef451485e2048ebbe64a77a4b39"; + sha256 = "0fabgakn9gpb90h5wj2iykp0snaghsx51rnzbbhlgkzicymdhnf9"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck containers QuickCheck transformers @@ -132761,7 +141869,7 @@ self: { mkDerivation { pname = "order-statistic-tree"; version = "0.1.1.0"; - sha256 = "0069ae9ad6ed98ca367026e9c1d6be4c553e6ec451aff0f658532e0ed6a692bd"; + sha256 = "1gcjlvb0wbjkb3vg1bsiqip3wmacpvbc3s96f0vcm67dssdaws80"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ @@ -132779,7 +141887,7 @@ self: { mkDerivation { pname = "order-statistics"; version = "0.1.1"; - sha256 = "ea78e694a3bd5eb1f8946aa7e18c5afff9e8ef6593dd83c969f6d54c3058c9b5"; + sha256 = "1df9b0q4rmgnd74q7pckcppyiygzba6f39vajkwb2pmxlfafcy7a"; libraryHaskellDepends = [ base containers math-functions statistics vector vector-space ]; @@ -132794,7 +141902,7 @@ self: { mkDerivation { pname = "ordered"; version = "0.1"; - sha256 = "c9e07a14324f32cb01847cde6406882bf5aa28935fb7c69a96f8f0f6df2c0f68"; + sha256 = "0s0g5kgzdw7qjsdcddszjclamx9bi0369pkwhh0wncjg68a7mq69"; libraryHaskellDepends = [ base ]; description = "A definition of Posets"; license = "unknown"; @@ -132805,7 +141913,7 @@ self: { mkDerivation { pname = "ordered-containers"; version = "0.1.0"; - sha256 = "cb089747cfffd5affedcd08a7e7fed02e5dd90defb513e84440b76f307f35587"; + sha256 = "11smyc3z6xhb8j23wlgvvs8dvr82xmzpx2nhvkzazmgzrx3rf26b"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -132816,7 +141924,7 @@ self: { mkDerivation { pname = "orders"; version = "0.1.0.0"; - sha256 = "f9d34b503516bf1bb0119ff12be4e81d78d2bc3a66e2797ba070405d1e75c6e7"; + sha256 = "1ry6flg5sh3hl1xpkqk67ayd4y0xx3j2pwcz26q1pgqn6m84plzr"; libraryHaskellDepends = [ base containers ]; description = "basic orders"; license = stdenv.lib.licenses.bsd3; @@ -132830,7 +141938,7 @@ self: { mkDerivation { pname = "ordrea"; version = "0.3.0.0"; - sha256 = "2120282fa0967af9ade101de8a392b3be95b0acdaa9fc6f50620e2d89271f618"; + sha256 = "067nf69diqi00vswd7xarl55ps9v5cwqmph1w6nzjylnl0pjh811"; libraryHaskellDepends = [ base containers transformers vector ]; testHaskellDepends = [ base directory process split ]; description = "Push-pull implementation of discrete-time FRP"; @@ -132843,7 +141951,7 @@ self: { mkDerivation { pname = "org2anki"; version = "0.1.0"; - sha256 = "389acfbf0d308073dced89c63be5b8ae21d6343970b4700abb31fa6cb6f4053b"; + sha256 = "0fq5yjv6ryiipc571d3h74sdc8dfp3jkpil9xpf7701h1nzwz6iq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec regex-compat ]; @@ -132857,7 +141965,7 @@ self: { mkDerivation { pname = "organize-imports"; version = "0.4.0.0"; - sha256 = "546a670fc5c9f1f3f7cba3abf1e51f7e9c2263c0e44d8637d6fa8ff2cd597895"; + sha256 = "15bqb76z53zssqvqckg4q1ij573y3zjz3ax3rgvz7wf9ql7nfsjl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base text ]; @@ -132873,7 +141981,7 @@ self: { mkDerivation { pname = "orgmode"; version = "0.1.0.1"; - sha256 = "06826255c8d7de812ccca4a6bfd612786c5566780d6e5a50cd058f69a5bfeafe"; + sha256 = "1zpapyjnk3q5rm85lvhdg1k5av3q2bbbz9m4rhn83pnpr1an50h6"; libraryHaskellDepends = [ base containers HStringTemplate parsec regex-posix syb text ]; @@ -132894,7 +142002,7 @@ self: { mkDerivation { pname = "orgmode-parse"; version = "0.1.1.3"; - sha256 = "322779285609e1f99d7d046802db2b6a54c51adc803dfd55a81d6518f9cab627"; + sha256 = "09xnrbwihr8xm1azsgc0vhdcam3a5gdh4s04gnfzkq89aql7j9rj"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -132918,8 +142026,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.0.2"; - sha256 = "7187c2118b82f48f25306315160b3483e05a7638df53e5167fc519b8f8e4ff8d"; + version = "0.0.3"; + sha256 = "1cxqndv7ffrqb749czz5x7g59q7nmq4xbnyaaajf5q27wmqfiwi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132949,7 +142057,7 @@ self: { mkDerivation { pname = "origami"; version = "0.0.6"; - sha256 = "34586cfdcc5a93283b79363aa1c6dac0bd775cd64095645cf5c8d2c711e50d0e"; + sha256 = "03hdwl8wgln8ymf695a0srf7ggf0vb3a2fing4xji4ssrkynqn1l"; libraryHaskellDepends = [ base bifunctors containers lens mtl pretty template-haskell ]; @@ -132969,7 +142077,7 @@ self: { mkDerivation { pname = "os-release"; version = "0.2.2"; - sha256 = "a91357fec161695ca6868d27c150f2de05666a6a7708114b3e06ff100f4d2ca7"; + sha256 = "19rc9l7i1zq67r5i223pd9m6c1fyy98c29wdhsk5qsb1q7z5f4x9"; libraryHaskellDepends = [ base containers parsec transformers ]; testHaskellDepends = [ base containers hlint hspec parsec process regex-compat temporary @@ -132987,7 +142095,7 @@ self: { mkDerivation { pname = "osc"; version = "1.0.0.2"; - sha256 = "0307fd84cf38dacb32baadc47b4bcef682216c9a7218ab73c1f5286b0d8fed38"; + sha256 = "0f7diw6nna7mq5rsn63jk9n230pnrr5ppi5dp8rcpniqry2gs1q3"; libraryHaskellDepends = [ attoparsec base binary bytestring data-binary-ieee754 network ]; @@ -133002,7 +142110,7 @@ self: { mkDerivation { pname = "oscpacking"; version = "0.3.0.0"; - sha256 = "2c0e5df0dfee7beeb2e97ea24800c2b4f6bc9343debc817091ab1704bc50a290"; + sha256 = "1452a2y085xbj5q83g6y8f9vrxmlq804i8kyx6rfwyzfvzq5s3ic"; libraryHaskellDepends = [ base colour gloss random ]; description = "Implements an osculatory packing (kissing circles) algorithm and display"; license = stdenv.lib.licenses.gpl3; @@ -133015,7 +142123,7 @@ self: { mkDerivation { pname = "osdkeys"; version = "0.0"; - sha256 = "dec832706085c29e571c92fee286378a8a8eac232b467b72336b2ca64a16eca2"; + sha256 = "18pc2r5acb3b6dr7niib4fn8x2la6y3f5zlj3ibrxhl5c1q35j6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133034,7 +142142,7 @@ self: { mkDerivation { pname = "osm-conduit"; version = "0.1.0.0"; - sha256 = "df65ea545cfea5c2f274248670769a970709f2b7799b7384df4ce7211d7451f2"; + sha256 = "1wjifhfj3rscvy2776vrnzr0j1wpk9v711i4fkrc59gybiaflrfz"; libraryHaskellDepends = [ base conduit exceptions resourcet text transformers xml-conduit xml-types @@ -133058,7 +142166,7 @@ self: { mkDerivation { pname = "osm-download"; version = "0.4"; - sha256 = "63e995150da721181b5c96f255169da897097afd2bd6f952f98f791bc67ecf14"; + sha256 = "056ggv31nycgz59gkmibzmx0k5x8klb5bwlnbhdih8d71larbsb3"; libraryHaskellDepends = [ base bytestring conduit containers data-default directory gps http-conduit http-types monad-control monadIO mtl persistent @@ -133077,7 +142185,7 @@ self: { mkDerivation { pname = "oso2pdf"; version = "0.1.0"; - sha256 = "40e80c3360b33241219494ea3d948fac3d07265a4f98541df64bef6e3e977dee"; + sha256 = "1vkxjwz6xvsbyqfm962gb8k0fgdciya3vslljhhl2cmkc0rhrs20"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133095,7 +142203,7 @@ self: { mkDerivation { pname = "osx-ar"; version = "0.11"; - sha256 = "b6f5818893a629018a4f44350af2dc63738182ffc18b2b0cc0f1f9fd8eb254b4"; + sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn"; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for OS X static archive format"; license = stdenv.lib.licenses.bsd3; @@ -133109,7 +142217,7 @@ self: { mkDerivation { pname = "ot"; version = "0.2.1.0"; - sha256 = "56f1c888103c699b1025c1f23a7e3423a5b7cf93041af24d8fbd1eb9f08caa04"; + sha256 = "015aikqbj7mxix6z46h4jg7vg9936iz3mwn14l89ns9w224ciwan"; libraryHaskellDepends = [ aeson attoparsec base binary either ghc mtl QuickCheck text ]; @@ -133128,7 +142236,7 @@ self: { mkDerivation { pname = "ottparse-pretty"; version = "0.1.2.6"; - sha256 = "45abdb079fc904f507493c32a2defbb2460f4666b7e49cb39e512e1204fba2e0"; + sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133144,8 +142252,8 @@ self: { }: mkDerivation { pname = "overload"; - version = "0.1.0.3"; - sha256 = "d57d1c8af311c6a01bb83a4ecd5687ead614744ebed32b6d5ab46a0c7f4fa4d7"; + version = "0.1.0.4"; + sha256 = "16sry2c4wrly3y3k47gry53klxf4kvbym6fybb8f7z9hqffx18a9"; libraryHaskellDepends = [ base simple-effects template-haskell th-expand-syns ]; @@ -133161,9 +142269,9 @@ self: { mkDerivation { pname = "overloaded-records"; version = "0.4.2.0"; - sha256 = "86b1b43fac513cada6d1e48ca61fe7ae451884f2baa5915b569cf6b72ae83296"; + sha256 = "15ijx0mbgxlwardr39dsya21hidfwwgsd374s6kasg2imhzv9cc6"; revision = "1"; - editedCabalFile = "d9facb383b2a9eaff023753b26737b7c5fb0b35af0f0dd3aa1ccb9e9b02c7605"; + editedCabalFile = "01bn5jqfkffcl4xdvw7hbarv0pvwgdrjcfvm4gqaz7ia7cwcpynr"; libraryHaskellDepends = [ base data-default-class template-haskell ]; @@ -133181,7 +142289,7 @@ self: { mkDerivation { pname = "overture"; version = "0.0.5"; - sha256 = "fcdbff55a72636cfb27694ea6731cd6233fa57af937de08ee34afa80a78a6957"; + sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion ]; @@ -133197,7 +142305,7 @@ self: { mkDerivation { pname = "pack"; version = "0.4.0"; - sha256 = "497e70f72ff7ca62622d8e8185eb23d076d4a536c289d3132c799582660bfaa6"; + sha256 = "19ps1dk855br5h9x72f26sjx8xnh4gmqb0cf5mi65jpp5zvp0zj9"; libraryHaskellDepends = [ array base bytestring lens transformers vector ]; @@ -133212,7 +142320,7 @@ self: { mkDerivation { pname = "package-description-remote"; version = "0.2.0.0"; - sha256 = "4a936d2346265d4d960875b12272e9f15aedf6aa6aa5f177f7ce30c7e4f68744"; + sha256 = "0i47yvjcfc6fyxvz39bambvfsnpix5r25cbm12b4sp968qinv4sa"; libraryHaskellDepends = [ base bytestring Cabal lens lens-aeson wreq ]; @@ -133229,7 +142337,7 @@ self: { mkDerivation { pname = "package-o-tron"; version = "0.1.0.0"; - sha256 = "c8b521e87ce4056e538eb8274f2ea89625d39065414bafbce71eaeafbd9e9f64"; + sha256 = "0r4zksyszbhywyyayjs1cn8d69cnm0p4y9xqir9nw1g4gkl23df8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filemanip filepath groom process ]; @@ -133245,7 +142353,7 @@ self: { mkDerivation { pname = "package-vt"; version = "0.1.3.3"; - sha256 = "1552443b4e3e742ebc481c10d396691ec9de143cf1cb06a39c3335672c305b67"; + sha256 = "0rsv60n6fd9kkjihdjzi7hadxj8yd6bd640w92y2wx1y9qxl8lhm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133263,7 +142371,7 @@ self: { mkDerivation { pname = "packdeps"; version = "0.4.3"; - sha256 = "a8d4bd6ab9158d7fcd2ef4070b6a4c9196755f36bd9b5c8345bb7d76c6f1116b"; + sha256 = "0sqiy737czdv8n1mr6xx6rgpb5li9im0n1zl5v6pz38mp5mbvm58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133284,7 +142392,7 @@ self: { mkDerivation { pname = "packed-dawg"; version = "0.2.0.8"; - sha256 = "79046d9fac55aecfa2e181ed4ce00d8667e639bee9e3a821d2eca80a6239cafc"; + sha256 = "1z6a75i0ma7cs8hsiqz9pqwycrw61ph4rvc1w6iczbjmmjgns13r"; libraryHaskellDepends = [ base binary deepseq mtl unordered-containers vector vector-binary-instances @@ -133308,9 +142416,9 @@ self: { mkDerivation { pname = "packedstring"; version = "0.1.0.1"; - sha256 = "4862908be029df4f28e4c351252af6c375562a72349f7113acec5adafebfe8f4"; + sha256 = "1x78pzzdlnpcmh9p37rlf8m5cxf3yqm2alf3whl4zpr9w25r0qj8"; revision = "1"; - editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf"; + editedCabalFile = "1kqbbvvpb0zn19dp4lx598iwgpbswz1qvclrcy5v27vjivzk9hyb"; libraryHaskellDepends = [ array base ]; description = "(Deprecated) Packed Strings"; license = stdenv.lib.licenses.bsd3; @@ -133324,7 +142432,7 @@ self: { mkDerivation { pname = "packer"; version = "0.1.9"; - sha256 = "d2926f876da4ef8e4590bbc501caf83b0703018971ad5413e9d6647667d681e4"; + sha256 = "1r41srkpcr6nx49m9bbii40h61rvz3503idvj12qxvx4dn3nz4nj"; libraryHaskellDepends = [ base bytestring ghc-prim transformers ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck @@ -133341,7 +142449,7 @@ self: { mkDerivation { pname = "packman"; version = "0.3.0"; - sha256 = "98110c7c428f898f2f309202097c6ce00cf497701f6b6507abe2efe430562a1f"; + sha256 = "07raaqqf9vz2mc3nasqzf2bz8370diy0j0lj60pqz2cg89y0q4cq"; libraryHaskellDepends = [ array base binary bytestring ghc-prim primitive ]; @@ -133356,19 +142464,19 @@ self: { "packunused" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, haskell-src-exts - , optparse-applicative, split + , optparse-applicative, process, split }: mkDerivation { pname = "packunused"; - version = "0.1.1.4"; - sha256 = "c86ff007f3f1504c20f0fc86c8d277a1e424a16768debb19ffce767f30470baa"; + version = "0.1.2"; + sha256 = "0ijlpdmsjb4rh94rcamxdg69xrza0s5clv3ipf2h3rgnidbgznfk"; revision = "1"; - editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772"; + editedCabalFile = "1mzjb3bkxxfy19zwcpdh96n8c28vb1ml19zjpgvyirf0qi6rz6m7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal directory filepath haskell-src-exts optparse-applicative - split + process split ]; homepage = "https://github.com/hvr/packunused"; description = "Tool for detecting redundant Cabal package dependencies"; @@ -133381,7 +142489,7 @@ self: { mkDerivation { pname = "pacman-memcache"; version = "0.1.0.3"; - sha256 = "db71983fe985b8483fad9c8135799bf5f432e35100cc8c8197130ddd6c745412"; + sha256 = "04jlfinds38kjy0qrk00a7ik5x7mkdwkb0cwmlzlif45x4zrhwfv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base deepseq directory-tree ]; @@ -133398,7 +142506,7 @@ self: { mkDerivation { pname = "padKONTROL"; version = "0.1"; - sha256 = "cdb5f9ef3a18793495f40a1714496608d6e9a1eec18cc5c5c2ba0a5d890867eb"; + sha256 = "1sv7124ms2msqb2wb361xshykmh8cr4i85qayjak8y8q7bpzkdfd"; libraryHaskellDepends = [ base containers hmidi minioperational transformers ]; @@ -133415,7 +142523,7 @@ self: { mkDerivation { pname = "pagarme"; version = "0.1.0.0"; - sha256 = "40daa3218986b66706070973a660f0c5bcc958fb7fa67e54f6fab5453a4370fe"; + sha256 = "1zkh8cx4bdgsyra7x9kzzdcckg65y1hacwq90w36gdl6i4hs7nj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133436,7 +142544,7 @@ self: { mkDerivation { pname = "pager"; version = "0.1.1.0"; - sha256 = "3e1e4f2ca17be6dd68d2d480f29e7a770c0f7ca3109aa1980da677d96cd4eef3"; + sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133460,7 +142568,7 @@ self: { mkDerivation { pname = "pagerduty"; version = "0.0.8"; - sha256 = "2f8f9ef70a672dd9160beb1e87d9b88d8cbd6f137637f4aed98df756ea270463"; + sha256 = "0qq44zm5dxwdv6pg8dvn2dpvv34dp3cqf7pb1cbdjbb71bvrx3rg"; libraryHaskellDepends = [ aeson base bifunctors bytestring bytestring-conversion conduit data-default-class exceptions generics-sop http-client http-types @@ -133478,7 +142586,7 @@ self: { mkDerivation { pname = "pagination"; version = "0.1.1"; - sha256 = "bac47b84007afe78cdb2a26e2058961d4a67669f9d9b8b0a30f813cd83e6eb04"; + sha256 = "017bws1ws4zq6058p6wxkxk6fjhxjrc20vm2nb6pizks0227pi5s"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -133486,6 +142594,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pagination_0_2_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: + mkDerivation { + pname = "pagination"; + version = "0.2.0"; + sha256 = "04jzwg9r0f8rza9zkzqfynx76snfw54kppfk9z5bjgqw6pqpx2jh"; + libraryHaskellDepends = [ base deepseq exceptions ]; + testHaskellDepends = [ base exceptions hspec QuickCheck ]; + homepage = "https://github.com/mrkkrp/pagination"; + description = "Framework-agnostic pagination boilerplate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pagure-hook-receiver" = callPackage ({ mkDerivation, base, containers, scotty, shelly, text , transformers, unix @@ -133493,7 +142615,7 @@ self: { mkDerivation { pname = "pagure-hook-receiver"; version = "0.1.0.0"; - sha256 = "944d3a664f57700dc82ef64ee60a16683373639c18bbc0cc1e0491a6589fd662"; + sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl"; libraryHaskellDepends = [ base containers scotty shelly text transformers unix ]; @@ -133507,7 +142629,7 @@ self: { mkDerivation { pname = "paint"; version = "1.0.0"; - sha256 = "a4029057144e91384edfa6e6c56e90b2fe2f1e166201d73f9f8e02e265b6424f"; + sha256 = "0ks2nrjy40lfkwzxf0b22qg2zzmjj1pcbrm6vx73i4af2ibr00m4"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/lovasko/paint"; description = "Colorization of text for command-line output"; @@ -133519,7 +142641,7 @@ self: { mkDerivation { pname = "palette"; version = "0.1.0.4"; - sha256 = "e6b3b4a0077d651ac7cb90c113ce7d6bd228aab57c9fe26e475abe6fcaada7cc"; + sha256 = "1k57mp56zgjs8xpf57vwnnm2ilkbgp717hchrg3ilrbx0yhb9cz6"; libraryHaskellDepends = [ array base colour containers ]; homepage = "http://projects.haskell.org/diagrams"; description = "Utilities for choosing and creating color schemes"; @@ -133531,7 +142653,7 @@ self: { mkDerivation { pname = "palindromes"; version = "0.4"; - sha256 = "7692ce59705026ff0141c5767262031f4dbfc9aa1c4ee4eaad7cc77051db13cc"; + sha256 = "1k0kvd8p1ivwmpmf8khwmb4vyk8z0di74xn5840zy9jhf1cwx4kn"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ array base bytestring containers ]; @@ -133545,12 +142667,13 @@ self: { mkDerivation { pname = "pam"; version = "0.1"; - sha256 = "d29607fc47cb11aa301b94c41c8403fe04608a8236f7c344df0aa37045c0b3d2"; + sha256 = "1lmkq12p18qavx2c7xrnha56017y0f21ri4l3cqal4fb8zy0g5nj"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ pam ]; libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) pam;}; "panda" = callPackage @@ -133562,7 +142685,7 @@ self: { mkDerivation { pname = "panda"; version = "2009.4.1"; - sha256 = "67c3938d9b34714aaf7ab2a5172c024d174b4ef5a728828edcae507c838ac67a"; + sha256 = "0yn6ia1pql5fvj784a57ym74n5sd08n1g9djgapllw9lkf6r7hv7"; libraryHaskellDepends = [ base cgi containers data-default directory filepath gravatar haskell98 hcheat kibro MissingH mps network old-locale old-time @@ -133590,9 +142713,9 @@ self: { mkDerivation { pname = "pandoc"; version = "1.19.2.1"; - sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801"; - revision = "1"; - editedCabalFile = "0ba3a65619868f044f48fcad137a2d3564ef1f07daf022f3e147248c1eed3bfa"; + sha256 = "00bq5h70byfs1fnszkggwws33hp7dpr7lzs0lfdvp5dzfwyjys88"; + revision = "5"; + editedCabalFile = "0rp81lr8ys7bcnjx5hm9fn704zhph313whjc51ns8sbpzlpwvx1f"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -133635,7 +142758,9 @@ self: { mkDerivation { pname = "pandoc-citeproc"; version = "0.10.4.1"; - sha256 = "6e6b0a89a831f9bfaa33dc0f3dff1792ee1626a5e66e1bd34da9447cd3c7de51"; + sha256 = "0lfyqz9pqi599p9invp6llk1dvlj2zzks3yw6fmbzy9im24hlsvf"; + revision = "1"; + editedCabalFile = "00cvvdiwpl8cw840smdfxbdnmmjf4m86nck344a797iv9rmvdq0j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133658,13 +142783,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_10_5_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hs-bibutils, mtl + , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.10.5.1"; + sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath mtl pandoc pandoc-types + process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: mkDerivation { pname = "pandoc-citeproc-preamble"; version = "1.2.3"; - sha256 = "82c2d2c4af43dfa8e3eb71fceb20688e7f6a8f89956785207105b2e8bff8e5c6"; + sha256 = "1ip5z2zyich5f4h8arwmi67nlzwfd0hfpz3ixgisips3mz2d5hl2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133684,7 +142843,7 @@ self: { mkDerivation { pname = "pandoc-crossref"; version = "0.2.5.0"; - sha256 = "d4d93bbe448e2cf187a0b7bcc605d0445e28021e4e31bfef890b93bee2b28491"; + sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133708,8 +142867,8 @@ self: { ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.4"; - sha256 = "c1f14975239d5b26faba78f3db6c84573d4db99ab021560c184755259ca61b82"; + version = "1.0.5"; + sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; @@ -133720,12 +142879,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pandoc-filter-graphviz" = callPackage + ({ mkDerivation, base, base16-bytestring, byteable, bytestring + , containers, cryptonite, directory, filepath, pandoc, pandoc-types + , process, text + }: + mkDerivation { + pname = "pandoc-filter-graphviz"; + version = "0.1.0.0"; + sha256 = "0i4sczbbq5bhhi43dv1z2p06d5wvg8fs17njzdgkvv2l9hd6nxi4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base base16-bytestring byteable bytestring containers cryptonite + directory filepath pandoc pandoc-types process text + ]; + homepage = "https://github.com/jpierre03/pandoc-filter-graphviz"; + description = "A Pandoc filter to use graphviz"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pandoc-include" = callPackage ({ mkDerivation, base, directory, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-include"; version = "0.0.1"; - sha256 = "cdb6516356fbbd4b9ff619da0ec8f0216e01356309f75037349d56af0c9768c3"; + sha256 = "1hv8jw6aymlx6hvm1xq9ccsh2vi1y340xnhrysglpggvarim3dnd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133746,8 +142925,8 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "0.2.0"; - sha256 = "0241672e57d3bc0a5fa6ae953cf98d6d702b36076d58eaa64490b5089f377b72"; + version = "0.3.0"; + sha256 = "0x3cx817rs1gmc9c9syn7dqlp1xx1mxr5grh19c7462vw9hyp3ji"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133767,7 +142946,7 @@ self: { mkDerivation { pname = "pandoc-japanese-filters"; version = "0.1.0.1"; - sha256 = "dc97d57265b7b5f5a40fcdf3ec422e03cd04fd7c4dc5a71045642dfde0d41301"; + sha256 = "008kskhgsbb48l8agiadgkyh9k835r1frwyd1yjgbddpcmrdb5yw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133783,8 +142962,8 @@ self: { ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { pname = "pandoc-lens"; - version = "0.6"; - sha256 = "70ffd8f5a5086cd6e2f3f92fd3f304ac6cf5ebbef70361086984ce8a11faf3fc"; + version = "0.6.2"; + sha256 = "18v22salncjdghpg6gz78mpf9wp5qk622jia77qwlh9di36jdqg5"; libraryHaskellDepends = [ base containers lens pandoc-types ]; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; @@ -133799,7 +142978,7 @@ self: { mkDerivation { pname = "pandoc-placetable"; version = "0.4.2"; - sha256 = "5151cd72e3277229e87efd0e7cb150434baa1be76e117e5644f93bfba4f81579"; + sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133819,7 +142998,7 @@ self: { mkDerivation { pname = "pandoc-plantuml-diagrams"; version = "0.1.0.3"; - sha256 = "08ebe0e341283f0aaca31ba19358838bac0c9eb11048b6346d44a0b312b879d0"; + sha256 = "1l3rp09b7824dlsbcj0hn6g0rb4bhdc9788vlfn0lgr887iy1sq8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133841,7 +143020,7 @@ self: { mkDerivation { pname = "pandoc-stylefrommeta"; version = "0.1.0.1"; - sha256 = "8118b1f301b9a77ea855b217db98f3bc205bb04e673100a652460bea888af2d3"; + sha256 = "1lzjia4fl2s6aak00cb79sq5n85wyfcdn5xjanl7x9xr07rv2641"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133860,9 +143039,9 @@ self: { mkDerivation { pname = "pandoc-types"; version = "1.17.0.5"; - sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3"; - revision = "1"; - editedCabalFile = "f6238d666c941d4eb5c80c195a9df9cb4d6579281b648dbecd2aad84aaf0e949"; + sha256 = "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8"; + revision = "4"; + editedCabalFile = "1ljvzl41ikfwwdh253mwpqjr7c4vf1ib01sxvp66ahi7vpxshm7n"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb ]; @@ -133880,7 +143059,7 @@ self: { mkDerivation { pname = "pandoc-unlit"; version = "0.1.0"; - sha256 = "891e3bcda3d19c85afb4b9b45a590ad524ed50b5cd0a8cd3d5d2c0732176b449"; + sha256 = "0jdlfqhp7h6jsp9qq2ndnm8fs96m19cmmd5rnjpqb76ilg6kn7l9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base pandoc ]; @@ -133896,7 +143075,7 @@ self: { mkDerivation { pname = "pandoc-vimhl"; version = "0.1.1.0"; - sha256 = "ceab0f2df428c0e15bcbf3cf24cdead4cc0907252dbc0f705ce9edb2c6ef6775"; + sha256 = "0xb7xz3b5vg9biq0zg1d4l3hkk6lxb6j9kzkrddy3h18yhnhzayf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133908,6 +143087,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pang-a-lambda" = callPackage + ({ mkDerivation, base, bytestring, containers, IfElse, mtl, SDL + , SDL-gfx, SDL-ttf, transformers, Yampa + }: + mkDerivation { + pname = "pang-a-lambda"; + version = "0.2.0.0"; + sha256 = "0cnz4n2vywj4w9cnj7kh6jml6k29li9wnaifnwn69b6883043iwm"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers IfElse mtl SDL SDL-gfx SDL-ttf + transformers Yampa + ]; + description = "A super-pang clone"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pango" = callPackage ({ mkDerivation, array, base, Cabal, cairo, containers, directory , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process @@ -133916,7 +143114,7 @@ self: { mkDerivation { pname = "pango"; version = "0.13.3.1"; - sha256 = "306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb"; + sha256 = "1frzcgqa1f1i3bk0q229vy8y6gsi423s8hfqvnr56h7ys8blysih"; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ array base cairo containers directory glib mtl pretty process text @@ -133927,6 +143125,52 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) pango;}; + "panhandle" = callPackage + ({ mkDerivation, aeson, base, containers, derive + , lazysmallcheck2012, pandoc, pandoc-types, QuickCheck, syb, tagged + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "panhandle"; + version = "0.2.0.0"; + sha256 = "1xkpivyw3r83hrksbq4vyf1ahqp86ck7m2ijgynbb962ifvwqrg0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pandoc pandoc-types syb ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base containers derive lazysmallcheck2012 pandoc pandoc-types + QuickCheck syb tagged tasty tasty-quickcheck + ]; + homepage = "http://chriswarbo.net/projects/activecode"; + description = "Pandoc filter to unwrap nested blocks"; + license = stdenv.lib.licenses.publicDomain; + broken = true; + }) {lazysmallcheck2012 = null;}; + + "panpipe" = callPackage + ({ mkDerivation, base, pandoc, pandoc-types, process, QuickCheck + , tasty, tasty-quickcheck, temporary, unix + }: + mkDerivation { + pname = "panpipe"; + version = "0.2.0.0"; + sha256 = "0kdkw7y6hvdv3lz4fhq4x0f7y397753dw5mjp4gw03qnrz3nchxp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base pandoc pandoc-types process temporary unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base pandoc QuickCheck tasty tasty-quickcheck + ]; + homepage = "http://chriswarbo.net/essays/activecode"; + description = "Pandoc filter to execute code blocks"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pansite" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default , directory, doctest, filepath, Glob, hspec, http-types, MissingH @@ -133937,7 +143181,7 @@ self: { mkDerivation { pname = "pansite"; version = "0.1.0.0"; - sha256 = "656dbab42493e28e112650ba1095d2f0cde42a06c47a640714be969cd9a3a8c2"; + sha256 = "1hm8lgcrr5my2h3n8yn40qmf9kghsaai1fjh4q8qxqlk4jsblvb5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133968,7 +143212,7 @@ self: { mkDerivation { pname = "papa"; version = "0.2.1"; - sha256 = "1be9afdf1804971617cdca5a94347853a0a5dad33bfa8270394dbf9e00a75386"; + sha256 = "11jklw09xgsd75q85yivsgdab82kg0s98nnarlbid5q433gszs8v"; libraryHaskellDepends = [ base papa-base papa-base-export papa-base-implement papa-bifunctors papa-bifunctors-export papa-bifunctors-implement papa-export @@ -133993,7 +143237,7 @@ self: { mkDerivation { pname = "papa-base"; version = "0.2.0"; - sha256 = "8b11f0b11d2fc6517967794320e453e40927f2d7e197c9ea68a306c8a59473c3"; + sha256 = "1hvkjjjwh1m3d3mck5z1szr2f2g4agj20hvrcxwm3iig3nqz04cb"; libraryHaskellDepends = [ base papa-base-export papa-base-implement ]; @@ -134012,9 +143256,9 @@ self: { mkDerivation { pname = "papa-base-export"; version = "0.2.0"; - sha256 = "1fec80f4bc71eb761c1085816f1d86c485df34d42d0223a052378da15d45a94a"; + sha256 = "0jm98mfs339paah260idshsdz1f4hqfnz0c520f7dsvipks81v0z"; revision = "1"; - editedCabalFile = "16ab8a0d0b30fc32c0aea4f2229a02d9203a8ac4747370d000d0ac8293cb28f8"; + editedCabalFile = "1y18rf9q5b6h03870wvlqj53l86r0ad25wm4mv035z1h1c6qmaqn"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134031,9 +143275,9 @@ self: { mkDerivation { pname = "papa-base-implement"; version = "0.2.0"; - sha256 = "64a0e4ca45f479ad81397cd6f132c5cb40ad76629b7f18b92549a97432e1071d"; + sha256 = "0787w4r79aa94nwihzwvc9vash6bqlrg3mkw760ssygl8p5f9834"; revision = "1"; - editedCabalFile = "e0bce83e04d2258364585033821dea273ea72e873cd362107444bdec505d66e5"; + editedCabalFile = "1rb6bm8frga4fh865lrwhwpafgi7x8fq4cshb1j869fj0hzfig70"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134051,7 +143295,7 @@ self: { mkDerivation { pname = "papa-bifunctors"; version = "0.2.0"; - sha256 = "ea55cc34900fe9acde2e4dae35dfc4b68f8ee21cf58d9bdc0202bf4082c3983f"; + sha256 = "0gwqqf141gq20bf9p3gm3ki8x3xnqkgkbbjd5vgars8gj0scqmga"; libraryHaskellDepends = [ base papa-bifunctors-export papa-bifunctors-implement ]; @@ -134070,7 +143314,7 @@ self: { mkDerivation { pname = "papa-bifunctors-export"; version = "0.2.0"; - sha256 = "c3845130eb7ba2524573c0b266546d5efcb62c2fdaef3a06360cdf90b5e93760"; + sha256 = "0q1px6sr1pqc6q33mvys5wnbdz2ydma6dcn0fd2m58kvxcq53163"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134087,7 +143331,7 @@ self: { mkDerivation { pname = "papa-bifunctors-implement"; version = "0.2.0"; - sha256 = "2cba24228b508080945bc81699801690ba868e49cb623a94cf3529a6d36c1613"; + sha256 = "04qndk9sca9mrya3lqnb9678dflh2s09j5n8bfa8102hici29fic"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134105,7 +143349,7 @@ self: { mkDerivation { pname = "papa-export"; version = "0.2.1"; - sha256 = "31d1b3b4e0f12310739e31aa3b5d4adb12376a1acceb603ee161fd9efadb5d0a"; + sha256 = "02jxvgx9xzb1w4z61syc39m3f4nv99fkpaiikrri08ziw2sb7l9i"; libraryHaskellDepends = [ base papa-base-export papa-bifunctors-export papa-lens-export papa-semigroupoids-export @@ -134127,7 +143371,7 @@ self: { mkDerivation { pname = "papa-implement"; version = "0.2.2"; - sha256 = "7bd73663de95b0784d217374b37b8e2c301c1be0c0d52789f7e37af21376d3f8"; + sha256 = "1y6kfq9z4yp3yy4jgmf0w0diqc1cirxv6x3k456pic4mvrikdmvv"; libraryHaskellDepends = [ base lens papa-base-implement papa-bifunctors-implement papa-lens-implement papa-semigroupoids-implement semigroupoids @@ -134147,7 +143391,7 @@ self: { mkDerivation { pname = "papa-include"; version = "0.1.0"; - sha256 = "d39ff3c7bdfe065878f53f1722c9852db6bc1d8a0ea3c6152f759e1fa65a14ff"; + sha256 = "1zqlbak1z7km5wawd8qfi8fvrdidhp4j45rzymw5h1pypp3z77yk"; libraryHaskellDepends = [ base lens semigroupoids semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134165,7 +143409,7 @@ self: { mkDerivation { pname = "papa-lens"; version = "0.2.0"; - sha256 = "eb938277cc49d3a4fa6e95501f577bdc7d1ba1ca3c3444b1273c20e29aa22cd5"; + sha256 = "1m9cladf481w4yql8d1wrahinzfwgdbiyl4mdvxa9ls9rivq54zb"; libraryHaskellDepends = [ base papa-lens-export papa-lens-implement ]; @@ -134184,7 +143428,7 @@ self: { mkDerivation { pname = "papa-lens-export"; version = "0.2.0"; - sha256 = "a3ea619b9447497cf2578d979c7b95978df1803523396192c13fc5475cf30eb1"; + sha256 = "1c8fydf4gi9zq6962f936n0g33cpjmxrr5wdazr7qja7jjdn3sm3"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134201,7 +143445,7 @@ self: { mkDerivation { pname = "papa-lens-implement"; version = "0.2.1"; - sha256 = "a9b98e295fffd12b6aa21073bfa4c77ba8d237c8a926f9c63d25a982adae9c2f"; + sha256 = "0bwwmsnq5a957p3gj9m9r0vx5a3vqyjbywqhl9m2plgzbwlqxfd9"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134218,7 +143462,7 @@ self: { mkDerivation { pname = "papa-prelude"; version = "0.1.1"; - sha256 = "5af67b6e0a8e49b36dd1bfdf7a9daeec1459ab4a6688f04fb87c4fd54e8f5ef1"; + sha256 = "1wayix7dakvwp17z12369ammj57cmsfpmpxzs5nv6jcf19p7pxjs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134236,7 +143480,7 @@ self: { mkDerivation { pname = "papa-prelude-core"; version = "0.0.1"; - sha256 = "8b5275a64486a30dc3537b4ad2ed77c602fda1330955d772735b1a889bddad2d"; + sha256 = "0bddvndqh6jvfdrdfm896fhzs0n6fznx4jkvag1hv8w68jk7allb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134253,7 +143497,7 @@ self: { mkDerivation { pname = "papa-prelude-lens"; version = "0.0.1"; - sha256 = "21e8f6ce70fd497b28ba869e7dfef62c5f1813e5d2019d373f2b68ed8e537787"; + sha256 = "11vpaf7fss1b7wvrs0fjwl9ihprcyvz7v7l6p8l7njgxf37gds11"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134271,7 +143515,7 @@ self: { mkDerivation { pname = "papa-prelude-semigroupoids"; version = "0.0.2"; - sha256 = "55ba7c7574295412703f0ef69fe2b34d8ac2471359ab245a5992ee0262222fac"; + sha256 = "1b1g49i05vljb5d29asr2d3w52jdngi9zxhf7xq14m19fisprfjm"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134289,7 +143533,7 @@ self: { mkDerivation { pname = "papa-prelude-semigroups"; version = "0.0.2"; - sha256 = "bab4b5e56b9cc7e3b788ac279147f1a07d7c357b587cbd370e1cd64ad45d8a4a"; + sha256 = "0jlabpa4mmhw1qvvsz2qgcspqzd0y53r29xci2vy7iwwdgjvbd5s"; libraryHaskellDepends = [ base semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134307,7 +143551,7 @@ self: { mkDerivation { pname = "papa-semigroupoids"; version = "0.2.0"; - sha256 = "3e8749a7a4fa7117de60d3cbde328045f7a5e7a469754afa5dca40c0cc9d89be"; + sha256 = "1gl9kp6c0h6abpx4lxb9lkksbxs5h0rdxjykc3g1fwgsljklk1ry"; libraryHaskellDepends = [ base papa-semigroupoids-export papa-semigroupoids-implement ]; @@ -134326,7 +143570,7 @@ self: { mkDerivation { pname = "papa-semigroupoids-export"; version = "0.2.0"; - sha256 = "1be94a9a3f95c618b48c5597ba7c9e38426dc237ee1dd1aadbb3eed59ebf6519"; + sha256 = "06b5pygdbvmkvfmd27gf6z16shiqkrybm5smijs1iilm7yd4ms8v"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134343,7 +143587,7 @@ self: { mkDerivation { pname = "papa-semigroupoids-implement"; version = "0.2.1"; - sha256 = "3007b2b844c671e0b28dcb246b9a2ec6afa4a532948e4379e534cebb47df287f"; + sha256 = "0zr8vx3vpkilwmwl73ll6ajs9by65sd6n96binrf0wf68jwb41rh"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -134358,7 +143602,7 @@ self: { mkDerivation { pname = "paphragen"; version = "0.2.0.0"; - sha256 = "b892b2e8cbeafe41b8c7dcdfd39c46c5049c99f02ccd3ff6dfb09d623a58fc7e"; + sha256 = "0zpwb0x657dhvzv3zk9cy2crq1658sfd7pywqyw43zparglb54mq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers ]; @@ -134373,7 +143617,7 @@ self: { mkDerivation { pname = "papillon"; version = "0.1.0.3"; - sha256 = "827177b41054cb1e908cc237e36ef4ffd2bf44611879b327020c89ef8a673df9"; + sha256 = "1y9xcy5fz28c08kv6y8qc52bzlpzyipf6dy2ij81xjsl22s7fwc2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134393,7 +143637,7 @@ self: { mkDerivation { pname = "pappy"; version = "0.1.0.2"; - sha256 = "ad536b3821ff826cc82713f708875e469d581b8e353c37bcaf95e3d7d3aec491"; + sha256 = "14f4mv9xgqwmmyy3fg1miqdmi7a6bs3hixqk4z46r0pz44w6nlxd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -134412,7 +143656,7 @@ self: { mkDerivation { pname = "paprika"; version = "0.1.0.2"; - sha256 = "2caa082ff041669bd6cd9c3b53b5caf73aab9b330730c20e3bee7ea49be98856"; + sha256 = "0ml8x6ds8zpf7c7c4c076fdsnfpprasm6fwwrpb9nrj1y0phiaic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base huckleberry ]; @@ -134431,7 +143675,7 @@ self: { mkDerivation { pname = "para"; version = "1.1"; - sha256 = "7049ac1b81ca8da008605ed2af0385f042481a2522d4831c081a9112715daa50"; + sha256 = "0l5abmqi548s10f87m124ld4hhphhl1szljyc04a13fah4dsqjbh"; libraryHaskellDepends = [ base ]; description = "Text paragraph formatting"; license = stdenv.lib.licenses.bsd3; @@ -134445,7 +143689,7 @@ self: { mkDerivation { pname = "paragon"; version = "0.1.28"; - sha256 = "2cb18348079e05de1c012fced276edc4e65042151f30c503766ee0f8cf73e7c7"; + sha256 = "1iz7fg7ziq3ffq1wac0z2m151rn4xmvd5kig04fdw1cy0x487c9c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134470,7 +143714,7 @@ self: { mkDerivation { pname = "parallel"; version = "3.2.0.3"; - sha256 = "163a40ef3c6258c623abe690a9837c9de2bf7fe87d3fac7d0758229d7efb6dcd"; + sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn"; libraryHaskellDepends = [ array base containers deepseq ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -134481,8 +143725,8 @@ self: { ({ mkDerivation, array, base, containers, deepseq }: mkDerivation { pname = "parallel"; - version = "3.2.1.0"; - sha256 = "4de3cdbb71dfd13cbb70a1dc1d1d5cf34fbe9828e05eb02b3dc658fdc2148526"; + version = "3.2.1.1"; + sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj"; libraryHaskellDepends = [ array base containers deepseq ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -134493,9 +143737,9 @@ self: { mkDerivation { pname = "parallel-io"; version = "0.3.3"; - sha256 = "3a14c02b9b8b7c72577eb90a8dd72de75d99192def87d7aa79545ee4d6e80645"; + sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; revision = "1"; - editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee"; + editedCabalFile = "1vlb2x1ghih4l64031rmh7h643c3knh5r5mwilf7g8izb58ypvkm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134513,7 +143757,7 @@ self: { mkDerivation { pname = "parallel-tasks"; version = "4.0.1.0"; - sha256 = "7d547dfd92ee1a17d9589a79094f9deb6ea05391e483aefae00ccc1d2f09cf32"; + sha256 = "0cng14pivk0cw3xax0z4j59s0vpbkm7hjycsb3cif6pfjbypsm3x"; libraryHaskellDepends = [ base bytestring cereal deepseq here old-locale stm time transformers vector vector-algorithms @@ -134527,7 +143771,7 @@ self: { mkDerivation { pname = "parallel-tree-search"; version = "0.4.1"; - sha256 = "99d91a7926dfa580d02b66714753b95c38a95291e1f16dc24f1f3f83133153f4"; + sha256 = "1x2k649q6gqz9z16vwg1j59ajf2wp59lfwb65g8819fz4rwimncr"; libraryHaskellDepends = [ base parallel tree-monad ]; homepage = "http://github.com/sebfisch/parallel-tree-search"; description = "Parallel Tree Search"; @@ -134539,7 +143783,7 @@ self: { mkDerivation { pname = "parameterized-data"; version = "0.1.6"; - sha256 = "0024e19cfffeb33cd25c6055ac3127dbd58e96f3237640b6fa788cd29a824f3b"; + sha256 = "0fsghadd533qzav40xi3yfb8xmfv4wqsqmb0bk93rczyzyff2900"; libraryHaskellDepends = [ base template-haskell type-level ]; homepage = "http://code.haskell.org/parameterized-data"; description = "Parameterized data library implementing lightweight dependent types"; @@ -134555,7 +143799,7 @@ self: { mkDerivation { pname = "paranoia"; version = "0.1.0.0"; - sha256 = "57fba4430304c244476c898cf22206077c54f827e698ca7e18cf60a42fe7c2ec"; + sha256 = "1v62wwps8q6g31zcm6764zw58z070qig5349di3l9hh40d1s9ysp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134578,7 +143822,7 @@ self: { mkDerivation { pname = "parco"; version = "0.1"; - sha256 = "045362f7cdd5ee72cd4c0267046dbf551128c92725efe10ba4c432fccd872815"; + sha256 = "0598hz6zqcn4lh5y3vr54z4jh4ampxnh8rq29k6p5vnmrpvn4lq4"; libraryHaskellDepends = [ base mtl ]; description = "Generalised parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -134590,7 +143834,7 @@ self: { mkDerivation { pname = "parco-attoparsec"; version = "0.1"; - sha256 = "500eaadf7f21a9e17fab04ce12e961d59da5a683467f01ce1d74c4c0b67f822d"; + sha256 = "0bc2gyvc1i3l3p702zs6hfkab7fmc7li5kh4mdzy3a91gzgsl3jh"; libraryHaskellDepends = [ attoparsec base mtl parco ]; description = "Generalised parser combinators - Attoparsec interface"; license = stdenv.lib.licenses.bsd3; @@ -134602,7 +143846,7 @@ self: { mkDerivation { pname = "parco-parsec"; version = "0.1"; - sha256 = "c3f5471769e384ec340f3c208c6193b3925997efdc1c4936f064abe195d46d54"; + sha256 = "0m3dsjay3av4y0v4j76wxybmk4mkjdhqq81w1wsfr173d4blgxf3"; libraryHaskellDepends = [ base mtl parco parsec ]; description = "Generalised parser combinators - Parsec interface"; license = stdenv.lib.licenses.bsd3; @@ -134616,7 +143860,7 @@ self: { mkDerivation { pname = "parcom-lib"; version = "0.8.0.3"; - sha256 = "4b252259a97ef22d2882d11b9181f8e8f5390b415b9477594f19cfcb359e7d76"; + sha256 = "0xkxkqswpkqr9xcpg52v845kkxg8z20r26yih8l2vwkym5cj49ab"; libraryHaskellDepends = [ base bytestring containers mtl text transformers utf8-string word8 ]; @@ -134636,7 +143880,7 @@ self: { mkDerivation { pname = "parconc-examples"; version = "0.4.5"; - sha256 = "90df61563ec9268a93b6313f4bcb9b25e9c2c4c3c54eef8066a44b72f4185e9c"; + sha256 = "172y33s74jx4cs0fykn5qg2c5s95kg5lngrins9ql9n97rb63pwh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -134658,7 +143902,7 @@ self: { mkDerivation { pname = "pareto"; version = "0.2.0.0"; - sha256 = "c0126578a4cef2349a4df6f12900a6a27cedf04039a2f7b4fa0c863d58fe052c"; + sha256 = "0b05zrc3v1hczasgg8ir83qfsz52lq02kwgn9nd39wnfliw6a4n0"; libraryHaskellDepends = [ base ]; homepage = "http://bitbucket.org/hyllos/pareto-haskell"; description = "A library for cause-effect relationships"; @@ -134671,7 +143915,7 @@ self: { mkDerivation { pname = "parport"; version = "0.0.0"; - sha256 = "dd961b363ed5ce5de6ec456a42f6b9a65bcb02198052122b75c6a6138ec18eb4"; + sha256 = "1d4fq67179n6flmi4ll0341cnnx6p7v44sj5xkk5vknm7qv1p5nx"; libraryHaskellDepends = [ array base ]; description = "Simply interfacing the parallel port on linux"; license = "GPL"; @@ -134682,7 +143926,7 @@ self: { mkDerivation { pname = "parse-dimacs"; version = "1.3"; - sha256 = "f202179d3a4eb2e1ce48e4761c686ac085a8a62c9e9141519fc5c49e081cb02a"; + sha256 = "0amh3h49xi65kx8l34cy5jkai1f0d9l1qxp4937f3cjf7afif0pj"; libraryHaskellDepends = [ array base bytestring parsec ]; description = "DIMACS CNF parser library"; license = stdenv.lib.licenses.bsd3; @@ -134695,7 +143939,7 @@ self: { mkDerivation { pname = "parse-help"; version = "0.0"; - sha256 = "ce9f4fea07bf416b3b685b4aa17b0ab6b310363ce845bdcf9a0f186813d9c7ef"; + sha256 = "1vy7v49nh60gkb7vsig87hv11cxn19xs2jjvd0xnnhdz0zm4z7yf"; libraryHaskellDepends = [ attoparsec base containers data-default file-location template-haskell text th-lift @@ -134712,7 +143956,7 @@ self: { mkDerivation { pname = "parseargs"; version = "0.2.0.8"; - sha256 = "7b789204c15d0c478db3d133f349a6970b5509fc6af655faedc03c7426dcf7d6"; + sha256 = "1mppvhk78g60xpx5bxkazh4ma2wplr4z6cyinf6lf32xq4294y3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -134730,7 +143974,7 @@ self: { mkDerivation { pname = "parsec"; version = "3.1.11"; - sha256 = "6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e"; + sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -134745,7 +143989,7 @@ self: { mkDerivation { pname = "parsec-extra"; version = "0.2.0.0"; - sha256 = "4936ab0b529d041524917304c45a140901482ba1d672d8a96c169c36e7dfc702"; + sha256 = "00n7vzkkd70ndjlxhwnnl4mlh0892idc813kj4j1a14xa85sndj9"; libraryHaskellDepends = [ base monads-tf parsec ]; description = "Some miscellaneous basic string parsers"; license = stdenv.lib.licenses.bsd3; @@ -134759,7 +144003,7 @@ self: { mkDerivation { pname = "parsec-free"; version = "3.1.11.6"; - sha256 = "10e0af2e1c16447494649442bd5fea121e51d0637d4a92b4e215ad076f076c09"; + sha256 = "02bc0xphgb8mwas94jkxcg8527hjx9gvshllcja78i0n3hpazq0h"; libraryHaskellDepends = [ base bytestring containers free lens mtl parsec text transformers ]; @@ -134773,7 +144017,7 @@ self: { mkDerivation { pname = "parsec-numbers"; version = "0.1.0"; - sha256 = "77019a4817712f6bfc61c9d148b680579955eb40d286f7766f7b0a90c726febf"; + sha256 = "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp"; libraryHaskellDepends = [ base parsec ]; description = "Utilities for parsing numbers from strings"; license = stdenv.lib.licenses.bsd3; @@ -134786,7 +144030,7 @@ self: { mkDerivation { pname = "parsec-numeric"; version = "0.1.0.0"; - sha256 = "7bdd9ae4aa63695e3072c73d99b85ef1572ffe9f5a07621edaa9515393a6e52f"; + sha256 = "0bz5ls9m6ld9v8g641sskzz2ymzibsw9jgf7f8q5wsb3mbj9mpbv"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base bytestring parsec tasty tasty-hunit tasty-quickcheck tasty-th @@ -134804,7 +144048,7 @@ self: { mkDerivation { pname = "parsec-parsers"; version = "0.2"; - sha256 = "72e841d83ea5f21a6e8309b661d009c092623e8704f6a10db8fb00ec2363d5ce"; + sha256 = "1knmcciyq07vp06s3xh4hwz654n017863dh9hdp1mwm57vc43s3j"; libraryHaskellDepends = [ base parsec parsers ]; testHaskellDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/parsec-parsers/"; @@ -134818,7 +144062,7 @@ self: { mkDerivation { pname = "parsec-permutation"; version = "0.1.2.0"; - sha256 = "b187eebf9d24bf66a2d5dbf66cf83442eb68bf316519985a2c738e04f87ecd79"; + sha256 = "0yfdgvw093kk5id9h6b566zniss26kw6rxnvsni6dgr4knzyx1xi"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base parsec QuickCheck ]; description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm."; @@ -134830,7 +144074,7 @@ self: { mkDerivation { pname = "parsec-pratt"; version = "0.1.1"; - sha256 = "8c6030d4d53830e68bbc8cbf8897c5220b6558c8a373ce616c3139e2d3837916"; + sha256 = "05krhg9y4f9idihwwwx3r1c6a2r2qnbqigwcpj5ycc1qspa30q4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec ]; @@ -134845,7 +144089,7 @@ self: { mkDerivation { pname = "parsec-tagsoup"; version = "0.1"; - sha256 = "c196a02bb9ce47f511703a7dc4b97037b5db66f89d0eeb4a9c54d6e88abbfadf"; + sha256 = "1pzspf5fimjlki5fn3lxz1kdpd9pf2ww8z9sf08zaiyfp4ms15n1"; libraryHaskellDepends = [ base parsec tagsoup ]; description = "Parsec parsers for Tagsoup tag streams"; license = stdenv.lib.licenses.publicDomain; @@ -134856,7 +144100,7 @@ self: { mkDerivation { pname = "parsec-trace"; version = "0.0.0.2"; - sha256 = "fc55e1feb6ec0247c52c4bdc533924688c4d5dbd29bf5f5a714e9fec6f4aa820"; + sha256 = "085899pyr7sff5d5zgr9pmflv3384hwm7p2b5k2lf0pcnvzf2mgw"; libraryHaskellDepends = [ base containers mtl parsec ]; homepage = "http://github.com/sleepomeno/parsec-trace#readme"; description = "Add a hierarchical trace to Parsec parsers"; @@ -134868,7 +144112,7 @@ self: { mkDerivation { pname = "parsec-utils"; version = "0.1.0.0"; - sha256 = "714723263ab6c35216b0d1bad13f864d9bb7986c648833a05cacffa67fa2cd5d"; + sha256 = "0pfdl9zsdzxcbjh37234djcbg6sdhqzx3fnin0b55hxn78k26ivi"; libraryHaskellDepends = [ base parsec ]; description = "Utility functions and combinators for Text.Parsec"; license = stdenv.lib.licenses.bsd3; @@ -134879,7 +144123,7 @@ self: { mkDerivation { pname = "parsec1"; version = "1.0.0.6"; - sha256 = "6698a7c36a8a4c145c1f1cb4c01e4bd7a69606ac8cf3d4f9ad1533a4287c9573"; + sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636"; libraryHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Portable monadic parser combinators"; @@ -134891,7 +144135,7 @@ self: { mkDerivation { pname = "parsec2"; version = "1.0.1"; - sha256 = "9e0834db335562955515970bcc65938700d1cc0ab1159396d75a80b8ae29be1c"; + sha256 = "075y56pbi02ssyb965di1b6d2047jdjwq2wp2maraqjm6gdk824y"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/aslatter/parsec2"; description = "Monadic parser combinators"; @@ -134903,7 +144147,7 @@ self: { mkDerivation { pname = "parsec3"; version = "1.0.1.8"; - sha256 = "0e37050f755034f125a8e85eadbbdda93e3a28b6c0a8bbfaa626ea8a9d9be302"; + sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf"; libraryHaskellDepends = [ base bytestring mtl text ]; homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Monadic parser combinators"; @@ -134915,7 +144159,7 @@ self: { mkDerivation { pname = "parsec3-numbers"; version = "0.1.0"; - sha256 = "a532a1e77f43f10f283d94f51dafa54d907537d869cf501ab5c5d5bde1daee44"; + sha256 = "0i7fvbhvvmf5nld51kv9v0vpb42dlnpivxcl7ll0zwa3gzks2cm5"; libraryHaskellDepends = [ base parsec ]; description = "Utilities for parsing numbers from Char sequences"; license = stdenv.lib.licenses.bsd3; @@ -134926,7 +144170,7 @@ self: { mkDerivation { pname = "parsedate"; version = "3000.0.0"; - sha256 = "37c6a51cd63b5bb34bf85ac476cd6b0ddc57317e52fbf106acad658deaa65e3f"; + sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip"; libraryHaskellDepends = [ base old-locale old-time parsec ]; homepage = "http://www.cs.chalmers.se/~bringert/darcs/parsedate/doc/"; description = "Data and time parsing for CalendarTime"; @@ -134938,7 +144182,7 @@ self: { mkDerivation { pname = "parseerror-eq"; version = "0.1.0.1"; - sha256 = "035000bf10b842dabc917132e05dd797b20c2bbd3619d415c3027bfe40b1b0f0"; + sha256 = "1w5hn50gwyq2qcax869nplmhrclpsxfy0ckij6ydlhmq22zh0l03"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; homepage = "https://github.com/stackbuilders/parseerror-eq"; @@ -134952,7 +144196,7 @@ self: { mkDerivation { pname = "parsek"; version = "1.0.1.3"; - sha256 = "e7768c89be8ac97ddf35a7a1d6bd92e0f822f6f3f3739197147b8fff125f8ca0"; + sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7"; libraryHaskellDepends = [ base ]; description = "Parallel Parsing Processes"; license = stdenv.lib.licenses.gpl3; @@ -134963,19 +144207,31 @@ self: { mkDerivation { pname = "parsely"; version = "0.1"; - sha256 = "cb7bf9cfc03e2aac44e358fb2a678039bab480f8033533394101cfa0b1184f9b"; + sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb"; libraryHaskellDepends = [ base mtl parsec ]; homepage = "http://naesten.dyndns.org:8080/repos/parsely"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "parser-combinators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "0.1.0"; + sha256 = "18swiwkw5as3xqxqjw46rl07sgjsz5533ki9q3rngfciyzzdj1qv"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mrkkrp/parser-combinators"; + description = "Lightweight package providing commonly useful parser combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { pname = "parser-helper"; version = "0.1.0.0"; - sha256 = "ebde93c3f9cfb983c6bca8e37a4556f0a5b2265984f982132ddb2fdae1dd6d33"; + sha256 = "0cvdvphxlbyv5l9q5yc4b4kb59ghar2pmqx8pk387ffgz71r7ppb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -134991,9 +144247,9 @@ self: { mkDerivation { pname = "parser241"; version = "0.1.0.2"; - sha256 = "701863271570594b6ebadbcea7222ef7a6fd284119ba009bd38a33179f6d2280"; + sha256 = "1012dngifcwasfdh1fhr84lgv9pp5qiagknvp9p4nnbh2lkn663h"; revision = "1"; - editedCabalFile = "530e10fa50239e46be70ff47ab2e78214527ea5f76dc4de31c7e894ed13c7120"; + editedCabalFile = "083i7k8lx2by3kilvp3nbzm2fi91g0panizzf2z4d7i3a3x103jk"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers hspec mtl ]; homepage = "https://github.com/YLiLarry/parser241"; @@ -135010,7 +144266,7 @@ self: { mkDerivation { pname = "parsergen"; version = "0.2.0.7"; - sha256 = "d1d5b408ddecc622671f850163e6a3723a6fd7c932a534d1c7f6a05ed425dd07"; + sha256 = "01yx4pa5x87nqz8k999jr7bnyfkjlgk660c53xkj5ipcvl4b9mfi"; libraryHaskellDepends = [ base bytestring directory filepath parsec template-haskell ]; @@ -135025,18 +144281,19 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , charset, containers, directory, doctest, filepath, parsec - , QuickCheck, quickcheck-instances, scientific, text, transformers - , unordered-containers + ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal + , cabal-doctest, charset, containers, directory, doctest, filepath + , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text + , transformers, unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.4"; - sha256 = "2781a27d40f0019fc671b483ca47276c826621e1daa42f08846af8e40e94ca1e"; + version = "0.12.5"; + sha256 = "1azwy5wfjv75kjwcyrglq70dmc8f6a091bgyv0wsls4f5zv0qb3k"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - attoparsec base base-orphans charset containers parsec scientific - text transformers unordered-containers + attoparsec base base-orphans charset containers mtl parsec + scientific text transformers unordered-containers ]; testHaskellDepends = [ attoparsec base bytestring containers directory doctest filepath @@ -135055,7 +144312,7 @@ self: { mkDerivation { pname = "parsestar"; version = "1.5"; - sha256 = "5811e779d4495dfe89701588c6ee0c8d6c9c3e459515ed4837e62e11f7b12b5f"; + sha256 = "0prbn7vi2bp66x4fs5cm8lz9qv4d1kpcd20mf24zwpa9siwyf4aq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135076,7 +144333,7 @@ self: { mkDerivation { pname = "parsimony"; version = "1.3"; - sha256 = "8f229049dccb73c13518977b7a6859d4a30d6c2647d3de1d2ea82694e6f66a6d"; + sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg"; libraryHaskellDepends = [ base bytestring text ]; description = "Monadic parser combinators derived from Parsec"; license = stdenv.lib.licenses.bsd3; @@ -135090,7 +144347,7 @@ self: { mkDerivation { pname = "partage"; version = "0.1.0.1"; - sha256 = "f421fbb635ab5839a28155895237fd4e4ed5db7d6a4f73461c7a5a0893501f76"; + sha256 = "0xhza29hhnks3i376kvagpdxakjfzlvm52amh6i3jn5b6nvgn8gl"; libraryHaskellDepends = [ base containers data-lens-light data-partition dawg-ord mmorph mtl pipes PSQueue random transformers vector @@ -135107,9 +144364,9 @@ self: { mkDerivation { pname = "partial"; version = "0.1.0.0"; - sha256 = "286fb90d8f2516ae553eda63b40cc7e707a6154a4487c9b55b5c3d64be077079"; + sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8"; revision = "1"; - editedCabalFile = "f49cbb0cfb2f101a006bb54ada3982ae85b6413d019fd92927ce259b3666e172"; + editedCabalFile = "0wp1cqv9n9ff4wlxk7q17m0vd1dfh8wxljmmdc01l41gzc6bp77l"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/paf31/partial"; description = "A nullary type class for partial functions"; @@ -135122,7 +144379,7 @@ self: { mkDerivation { pname = "partial-handler"; version = "1.0.2"; - sha256 = "fae9f291f4146631eb3be173299bbc7755343a0e9b74e62ee1921e209a6aa4f1"; + sha256 = "1wd4dad207ljw4pfcx4v1qx38mbppjdjjwz17gmk2rhlyj8z5sgs"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; @@ -135133,8 +144390,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "partial-isomorphisms"; - version = "0.2.2"; - sha256 = "f6ee216db7be14d497c428562c83423a5d2579c86b70b822996bde28c196569c"; + version = "0.2.2.1"; + sha256 = "0r51ykq6i11gzypv93bnw8pzn4zdyrabiiqfpbhpvs0rj6k1ymac"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse"; description = "Partial isomorphisms"; @@ -135149,7 +144406,7 @@ self: { mkDerivation { pname = "partial-lens"; version = "0.0.1"; - sha256 = "48c96300942d503ea8b2c2d949a4965d76d60029c4c164452778a8405d32f768"; + sha256 = "0s7p69fl1a3q4x2n9hf4540dcxjxjsj4knf2nal3wl1djh067ja8"; libraryHaskellDepends = [ base comonad-transformers data-lens transformers ]; @@ -135164,8 +144421,8 @@ self: { }: mkDerivation { pname = "partial-order"; - version = "0.1.2"; - sha256 = "9a343b7206ddd717d9a1bb5562052fb503a33ebef8434d8f7f5e1eea04cef5d1"; + version = "0.1.2.1"; + sha256 = "15y3593fl5gabcf0qzyfql30v80sninv1f79dz4v2ll89dzwfzg3"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit @@ -135182,7 +144439,7 @@ self: { mkDerivation { pname = "partial-uri"; version = "0.2"; - sha256 = "630c946085926027b917a9b4d5660bb7a86cd440d68c29cdc4cddbbaa4aa7958"; + sha256 = "0n3rmajbmnydqk6jk36n83a6ra5p1dkdbd592ywjfq4jhmh98333"; libraryHaskellDepends = [ base network-uri ]; homepage = "https://github.com/singpolyma/partial-uri"; description = "Datatype for passing around unresolved URIs"; @@ -135196,7 +144453,7 @@ self: { mkDerivation { pname = "partly"; version = "1.0.0.2"; - sha256 = "fb9d644b442b07171edad28af5f08c9473c593504f381f3f6de4ecae3dc8ac68"; + sha256 = "0s5cr0ysxv74dlziyf2ga29wawwlikqgb2njv8g1f1rb8i5n97gv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring ]; @@ -135221,7 +144478,7 @@ self: { mkDerivation { pname = "passage"; version = "0.1"; - sha256 = "2f227b21ae53a6e735f9f61bcb2eaa7469309a0580040c3ebac8baa08ea81987"; + sha256 = "11qrm27a1fn8p8z0q1400nd30sblm8pcn6znz4syg9jkmqhpn8ig"; libraryHaskellDepends = [ array base containers directory filepath GraphSCC monadLib mwc-random pretty primitive process random @@ -135236,7 +144493,7 @@ self: { mkDerivation { pname = "passwords"; version = "0.1.0.6"; - sha256 = "919a4961db3daf7426532608202fcac4a9acac5321cf294a904b21a1dc2d6474"; + sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li"; libraryHaskellDepends = [ base containers MonadRandom random ]; description = "Password generation/validation library"; license = stdenv.lib.licenses.mit; @@ -135249,7 +144506,7 @@ self: { mkDerivation { pname = "pasta"; version = "0.1.0.2"; - sha256 = "53b5ebc2887e4f7e466a6a4824c2fb2fad03bd9a8a38bd0d37901df28edc8b79"; + sha256 = "0ycbvj7g47ch6w6vsf4akayh7b9gzg128j3ad937wkvyi31fpdak"; libraryHaskellDepends = [ base microlens microlens-th protolude semigroups text text-show ]; @@ -135265,7 +144522,7 @@ self: { mkDerivation { pname = "pastis"; version = "0.1.2"; - sha256 = "54f658e6309dfa8953612074e9f878fcaa4981e17aef0c6ffe58d5a2f57f4590"; + sha256 = "1425gzss5maqzrphrvvsw60lkapwg3wfjx10c59qkylx63k5ixjl"; libraryHaskellDepends = [ base HTTP network ]; description = "Interface to the past.is URL shortening service"; license = stdenv.lib.licenses.bsd3; @@ -135277,7 +144534,7 @@ self: { mkDerivation { pname = "pasty"; version = "0.1"; - sha256 = "5f083c5babf398673b97260fa75e4c282d24e328ea110e08bcf219852fc3f58a"; + sha256 = "12pmqcpqa6gjph40w4ga53ij8b989igaf3r6jwxng67kmddkq22z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring mtl ]; @@ -135289,20 +144546,21 @@ self: { "patat" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , bytestring, containers, directory, filepath, highlighting-kate - , mtl, optparse-applicative, pandoc, terminal-size, text, time - , unordered-containers, yaml + , bytestring, containers, directory, filepath, mtl, network + , network-uri, optparse-applicative, pandoc, skylighting + , terminal-size, text, time, unordered-containers, yaml }: mkDerivation { pname = "patat"; - version = "0.5.0.0"; - sha256 = "74fe32c9b9dec0b57895f92037027093f6928b482bd147534f87fcb4c24cec3c"; + version = "0.5.2.2"; + sha256 = "01g74kw9qszz4781srqsjvf4vxf0rvb4q8yy5nbx3zyp4lwggv3j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers - directory filepath highlighting-kate mtl optparse-applicative - pandoc terminal-size text time unordered-containers yaml + directory filepath mtl network network-uri optparse-applicative + pandoc skylighting terminal-size text time unordered-containers + yaml ]; homepage = "http://github.com/jaspervdj/patat"; description = "Terminal-based presentations using Pandoc"; @@ -135314,7 +144572,7 @@ self: { mkDerivation { pname = "patch-combinators"; version = "0.2.2"; - sha256 = "267a992811a978e898df1d33b45112365779381e76ccb4485f5562d74deeeb00"; + sha256 = "007bxr6xfqjmbx4b9k3n3qw7jmrn298v8cqxvycfhy5924l9jyi6"; libraryHaskellDepends = [ base ]; description = "A library for patching functions and data structures"; license = stdenv.lib.licenses.bsd3; @@ -135323,19 +144581,25 @@ self: { "patch-image" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda , accelerate-cufft, accelerate-fourier, accelerate-io - , accelerate-utility, base, Cabal, filepath, gnuplot, hmatrix - , JuicyPixels, utility-ht, vector + , accelerate-utility, array, base, bytestring, Cabal, carray + , cassava, containers, enumset, explicit-exception, fft, filepath + , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf + , non-empty, pqueue, storable-tuple, tfp, unordered-containers + , utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.1.0.2"; - sha256 = "5dfe265b69765a8a9e2ef550da10a6a65c56fde23ad2124046bafe2c2ec95e35"; + version = "0.3.1"; + sha256 = "1l7iv83r145wmfhr8mygc7ln78jv669n2klhm1n9p50dinv1gj17"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft - accelerate-fourier accelerate-io accelerate-utility base Cabal - filepath gnuplot hmatrix JuicyPixels utility-ht vector + accelerate-fourier accelerate-io accelerate-utility array base + bytestring Cabal carray cassava containers enumset + explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead + llvm-extra llvm-tf non-empty pqueue storable-tuple tfp + unordered-containers utility-ht vector ]; homepage = "http://hub.darcs.net/thielema/patch-image/"; description = "Compose a big image from overlapping parts"; @@ -135350,7 +144614,7 @@ self: { mkDerivation { pname = "patches-vector"; version = "0.1.5.4"; - sha256 = "f4c938988ad98883b98db10a32d4d544c39f98fc77b4e2c8da393718ef30da54"; + sha256 = "0m6s63pihdrrvb4f5d3pzjc9zhs4spa342miinwq726riac3ijgl"; libraryHaskellDepends = [ base edit-distance-vector microlens vector ]; @@ -135365,23 +144629,39 @@ self: { "path" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, hashable, hspec, HUnit, mtl, QuickCheck - , template-haskell + , filepath, hashable, hspec, mtl, template-haskell }: mkDerivation { pname = "path"; - version = "0.5.12"; - sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d"; - revision = "1"; - editedCabalFile = "540d42d3ea3169520a788d6771a3f907f01e5410bd87deea8bb57cb76b536ca0"; + version = "0.5.13"; + sha256 = "0lbx7swpav3fv2820mfy8p5lis4iivkasq67qf89hj9j2qz30s0r"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + ]; + testHaskellDepends = [ aeson base bytestring filepath hspec mtl ]; + description = "Support for well-typed paths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "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.1"; + sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell ]; testHaskellDepends = [ - aeson base bytestring filepath hspec HUnit mtl QuickCheck + aeson base bytestring filepath genvalidity genvalidity-property + hspec mtl QuickCheck validity ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-extra" = callPackage @@ -135389,7 +144669,7 @@ self: { mkDerivation { pname = "path-extra"; version = "0.0.3"; - sha256 = "55043bb37a3aaecd162d336c19483b3fb36397fa6cd48a182caf876502638b59"; + sha256 = "0ncbcc16b1xg5hc8mm3czabn7crz7d41jv1k5lbcvbisgarkn12m"; libraryHaskellDepends = [ base exceptions path ]; description = "Chris Done's path library, enriched with URL-related goodies"; license = stdenv.lib.licenses.bsd3; @@ -135402,7 +144682,9 @@ self: { mkDerivation { pname = "path-io"; version = "1.2.2"; - sha256 = "72255f9d014285c87dd4c537f445a5448b2b64e81c4ee4759464b4b0e401fe46"; + sha256 = "0ipy07jb1d34jisy8khwx1j2p2s4lm2z8dy5siywi1a206fmy9bj"; + revision = "1"; + editedCabalFile = "1r73clpws32ql3wnh6gp9dn4knzxgcgl6j7ihdkmq6ai21bznw6m"; libraryHaskellDepends = [ base containers directory exceptions filepath path temporary time transformers unix-compat @@ -135413,14 +144695,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.2"; + sha256 = "031y6dypf6wnwx7fnjyvn2sb5y1lxfibx0jnwc19h93harm3lfyp"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base exceptions hspec path transformers unix-compat + ]; + homepage = "https://github.com/mrkkrp/path-io"; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-pieces" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }: mkDerivation { pname = "path-pieces"; version = "0.2.1"; - sha256 = "080bd49f53e20597ca3e5962e0c279a3422345f5b088840a30a751cd76d4a36f"; + sha256 = "0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8"; revision = "1"; - editedCabalFile = "c713a8d04b3e6b89f1116c1d5fe434305031e17a9f0ad30a457a8402e1d5fc5c"; + editedCabalFile = "0p7wsphh513s8l5d62lzgbhk2l1h6kj5y7bc27qqjsry9g8ah4y7"; libraryHaskellDepends = [ base text time ]; testHaskellDepends = [ base hspec HUnit QuickCheck text ]; description = "Components of paths"; @@ -135433,7 +144736,7 @@ self: { mkDerivation { pname = "pathfinding"; version = "0.1.0.0"; - sha256 = "007971e690fdcee9844c576028fe291f666f880528da1ace4283d047fabc3bb4"; + sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/rvion/pathfinding"; description = "pathfinding in grid and graphs"; @@ -135445,7 +144748,7 @@ self: { mkDerivation { pname = "pathfindingcore"; version = "1.2.1"; - sha256 = "d24f4f8af78e7588daf7fad74b9675facc4b367fc25df5e94dbc93407480dfe0"; + sha256 = "1q6zh1s414xw9plzapf2gwv4pk7sfnb4pmzsyzd8hxcfyy54ykyj"; libraryHaskellDepends = [ array base split ]; testHaskellDepends = [ array base HUnit tasty tasty-hunit ]; homepage = "http://github.com/TheBizzle"; @@ -135454,6 +144757,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "paths" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, filepath + , time + }: + mkDerivation { + pname = "paths"; + version = "0.1"; + sha256 = "0cccvc2p04rmhbg61jaa592jd86dp08ipamk3ddvswr5ih3rhdgx"; + libraryHaskellDepends = [ + base bytestring deepseq directory filepath time + ]; + description = "Library for representing and manipulating type-safe file paths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pathtype" = callPackage ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck , random, tagged, time, transformers, utility-ht @@ -135461,7 +144779,7 @@ self: { mkDerivation { pname = "pathtype"; version = "0.8"; - sha256 = "14e3b9d03c222a061ffeb40ecc0940d980e25fddd70339d04ec86dbae6f27897"; + sha256 = "15vqybkblvf89v83j0ypvmgy506r804wq3mlzqghcai27k8bkqql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135479,7 +144797,7 @@ self: { mkDerivation { pname = "pathwalk"; version = "0.3.1.2"; - sha256 = "76e0d0646a3133a062dbae4e9d37d59e71d6328706bb178552a93800e4550e91"; + sha256 = "148fapj00f59aa2igfq6hwrdcwcyslvrskmfvdia0crid9jd1q3n"; libraryHaskellDepends = [ base directory filepath transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/Xe/pathwalk"; @@ -135492,7 +144810,7 @@ self: { mkDerivation { pname = "patience"; version = "0.1.1"; - sha256 = "35c7c334d344b3cbdc61cc88c559bedb300ace860a80e3990aeb268f1f10db63"; + sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = stdenv.lib.licenses.bsd3; @@ -135503,7 +144821,7 @@ self: { mkDerivation { pname = "patronscraper"; version = "0.0.0.1"; - sha256 = "71437a5231b53d4751c305d6da7908a3793319dcde799c9903e1b48dc77df529"; + sha256 = "0agmgp3qvd710fcrqyfyvhck6yd311wxmmh5qd8lfgdm6597lhvi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HandsomeSoup hxt ]; @@ -135517,7 +144835,7 @@ self: { mkDerivation { pname = "pattern-arrows"; version = "0.0.2"; - sha256 = "6fc2d972e72785d727d2b68e1f82ef94a2c93cedbc00e6a4cdc03498825c078f"; + sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg"; libraryHaskellDepends = [ base mtl ]; homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html"; description = "Arrows for Pretty Printing"; @@ -135531,7 +144849,7 @@ self: { mkDerivation { pname = "patterns"; version = "0.1.1"; - sha256 = "fba27077c859449c3af545cc441f80aaa0c675c3e05dadf97174e6f5c588da9c"; + sha256 = "176si32zbrklf7wsspg0qdswd85ah0gl9k25ylx9qi2rr1vp18pv"; libraryHaskellDepends = [ base bytestring conduit containers mtl time utf8-string zeromq-haskell @@ -135547,7 +144865,7 @@ self: { mkDerivation { pname = "paymill"; version = "0.0.0"; - sha256 = "40edc09ae13eac3457294fb21543fbce246b91639820ebad2a8e1b7360af83bf"; + sha256 = "1gw3mxh766wf5anyn84qcf8nn96fzd1ibcjg55bk9b1yw6dc1va0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "This is an unofficial client for the Paymill API"; @@ -135562,7 +144880,7 @@ self: { mkDerivation { pname = "paypal-adaptive-hoops"; version = "0.13.1.0"; - sha256 = "09997162d0533ec80a0cda3bcb84f48a59acdac367a61703fb32c98594d5965f"; + sha256 = "0pwnsna8bj9jzc1ig9k7qgdaqncayj2cnfys1h5chgjks1i73689"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135587,7 +144905,7 @@ self: { mkDerivation { pname = "paypal-api"; version = "0.2"; - sha256 = "304d94bd70eb5ddb7289d3ad2e97b4ef08a539bbde0fb4c0d2e8acb5bb37a946"; + sha256 = "0im96yxvbb78sb0b83yypcwsa27gnjbjxbfki5rdnpgbf2yr8k9h"; libraryHaskellDepends = [ base bytestring conduit containers failure http-conduit http-types mtl old-locale text time wai @@ -135605,7 +144923,7 @@ self: { mkDerivation { pname = "paypal-rest-client"; version = "0.1.0"; - sha256 = "a39bac4d5929b4fa26f41698d252edd2ae584d1191746dafa65a84cf15ef01d9"; + sha256 = "1n81xwawz12slspnsx4i256mibnjxm9d560nyhkgmd19b56sr6x3"; libraryHaskellDepends = [ aeson base bytestring containers country-codes Decimal http-client http-types lens safe text time wreq @@ -135621,7 +144939,7 @@ self: { mkDerivation { pname = "pb"; version = "0.1.0"; - sha256 = "aefd84fffef08e89b21086f90ecb26164c56c5092427501f686cf3e3632b8b0d"; + sha256 = "03cb5diy7wvcd0gm09r4172mck0n4v5hxyc622r8k3phzvzq9zdf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135632,12 +144950,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pb-next" = callPackage + ({ mkDerivation, base, data-default, either, optparse-applicative + , parsec, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "pb-next"; + version = "0.1.0.0"; + sha256 = "1am3dgxhapwc546cslm2v1ln9zknjhv2aa8njc1hry6ybh3ynqhc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base either parsec text transformers ]; + executableHaskellDepends = [ + base data-default either optparse-applicative text + ]; + testHaskellDepends = [ base parsec tasty tasty-hunit ]; + homepage = "https://github.com/githubuser/pb-next#readme"; + description = "Utility CLI for working with protobuf files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pbc4hs" = callPackage ({ mkDerivation, base, hslua, string-qq }: mkDerivation { pname = "pbc4hs"; version = "0.1.1.5"; - sha256 = "e98b3d9e9c0361eb43f1f7dfcdc2d85d72eb51572081aed6bcd9f4d4048ab399"; + sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9"; libraryHaskellDepends = [ base hslua string-qq ]; homepage = "https://github.com/DavidFeng/pbc4hs"; description = "pbc for HsLua"; @@ -135652,7 +144990,7 @@ self: { mkDerivation { pname = "pbkdf"; version = "1.1.1.1"; - sha256 = "ddc5755cc895b00af47cadf70f71c0a97675659754a137c403200e62d54476d9"; + sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx"; libraryHaskellDepends = [ base binary byteable bytedump bytestring cryptohash utf8-string ]; @@ -135669,7 +145007,7 @@ self: { mkDerivation { pname = "pcap"; version = "0.4.5.2"; - sha256 = "e7e92e6ff4bffa22102335a38dabb97fd0771fdf3b75d45cd7c1708c85e1cd5f"; + sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7"; libraryHaskellDepends = [ base bytestring network time ]; homepage = "https://github.com/bos/pcap"; description = "A system-independent interface for user-level packet capture"; @@ -135681,7 +145019,7 @@ self: { mkDerivation { pname = "pcap-conduit"; version = "0.1"; - sha256 = "7f1a026da82f3d29c89a92e78ed08795eb455992cb4b6911490a19831567461d"; + sha256 = "07a6cwaq668a948njjybj9clbswmhz88xrwjkb42jg9gm1nh46kz"; libraryHaskellDepends = [ base bytestring conduit pcap transformers ]; @@ -135696,7 +145034,7 @@ self: { mkDerivation { pname = "pcap-enumerator"; version = "0.5"; - sha256 = "ab614d7037df2fbd093f277353764310b17b9854bbfeb5325c9114bde4c8ea6c"; + sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb"; libraryHaskellDepends = [ base bytestring enumerator pcap transformers ]; @@ -135713,7 +145051,7 @@ self: { mkDerivation { pname = "pcd-loader"; version = "0.3.0.1"; - sha256 = "a72226ce1394d7badacf16a9c5809f072c05bb5dc094712459c2880e58d99edb"; + sha256 = "1nwyv5c0x262b4j73560bnxhab07ky0cba8nrzdbmmwl2g72c8m7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135736,7 +145074,7 @@ self: { mkDerivation { pname = "pcf"; version = "0.1.0.1"; - sha256 = "a5b0d367e72b43fdce2baa53093da60941c48bb07c08d5dfb1c469ea9d4ab7b6"; + sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55"; libraryHaskellDepends = [ base bound c-dsl containers monad-gen mtl prelude-extras transformers void @@ -135753,7 +145091,7 @@ self: { mkDerivation { pname = "pcg-random"; version = "0.1.3.4"; - sha256 = "41fec50875a39fb143643ca2498843840f359c81d499f10d42be5f70cf6d89ae"; + sha256 = "1bl9dp7p0pxy886z36flh6f3a3w48f44k8iwci1v37x3fl4cbzj1"; libraryHaskellDepends = [ base bytestring entropy primitive random ]; @@ -135763,6 +145101,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcgen" = callPackage + ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck + , random + }: + mkDerivation { + pname = "pcgen"; + version = "2.0.1"; + sha256 = "15116krysjvp3if7rdqcfjgqappfybjzwmgrkd5v5x8w62izhnla"; + libraryHaskellDepends = [ base random ]; + testHaskellDepends = [ base hspec QuickCheck random ]; + benchmarkHaskellDepends = [ base criterion deepseq random ]; + homepage = "https://github.com/Lokathor/pcgen-hs"; + description = "A fast, pseudorandom number generator"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pcre-heavy" = callPackage ({ mkDerivation, base, base-compat, bytestring, doctest, Glob , pcre-light, semigroups, string-conversions, template-haskell @@ -135770,7 +145124,7 @@ self: { mkDerivation { pname = "pcre-heavy"; version = "1.0.0.2"; - sha256 = "8a5cf697b7683127812450cef57d0d74ac5c1117ec80618d10509642f793cbd1"; + sha256 = "1lfbjgvl55jh226n307c2w8mrb3l1myzbkjh4j0jfcb8nybzcp4a"; libraryHaskellDepends = [ base base-compat bytestring pcre-light semigroups string-conversions template-haskell @@ -135786,7 +145140,7 @@ self: { mkDerivation { pname = "pcre-less"; version = "0.2.1"; - sha256 = "c9617e9bd07dc01885c5d320abc93a32c920ea0e02e7cea9495f894cfeb52df2"; + sha256 = "1widnpz4r2az96lwxrq21vm21j9j7b4sn86kqn2iih3xs2dpwqf9"; libraryHaskellDepends = [ array base regex-pcre ]; description = "Nicer interface to regex-pcre"; license = stdenv.lib.licenses.bsd3; @@ -135797,7 +145151,7 @@ self: { mkDerivation { pname = "pcre-light"; version = "0.4.0.4"; - sha256 = "02c97e39263d18fd26aa63d52c88c4bfbb5c3f66ab40564552e7f11d5d889e75"; + sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ pcre ]; homepage = "https://github.com/Daniel-Diaz/pcre-light"; @@ -135810,7 +145164,7 @@ self: { mkDerivation { pname = "pcre-light-extra"; version = "0.0.0"; - sha256 = "7daf891775c00f9105051c9246ff8d8ecaee0a163503a8b309ed6bfa9e1950ce"; + sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx"; libraryHaskellDepends = [ base bytestring pcre-light ]; homepage = "http://github.com/urso/pcre-light-extra"; description = "pcre-light extra functionality"; @@ -135825,7 +145179,7 @@ self: { mkDerivation { pname = "pcre-utils"; version = "0.1.8.1"; - sha256 = "6c2fc14e13b3e0b2b09f188ee32affa9fe60755cc87409255f5ec8cbd8971ed7"; + sha256 = "1mqyjzccpj2ybwjhjx68bisn1zm9zwmf73hqkyqb5q5k2d7c2bvc"; libraryHaskellDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -135843,8 +145197,8 @@ self: { }: mkDerivation { pname = "pdf-slave"; - version = "1.3.1.0"; - sha256 = "0417ecfaf51fee975f6387403d1b9eb2af71d625af28adef9cc53f3c9c640509"; + version = "1.3.2.0"; + sha256 = "1l7an71cnsgq7j6yfdvjqp1lj44f4kwb52c555ciccd6mz6f7866"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135862,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 = "63acbe9eb391f698d8428f40cffcf8f3a2f483cd460c8c45d50e297a11b92531"; + version = "1.2.1.0"; + sha256 = "17sl4dcisvzjbxa0b6qbi934nl7f5rqm840l66axw2bz43aq1m1f"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers text ]; @@ -135886,7 +145275,7 @@ self: { mkDerivation { pname = "pdf-toolbox-content"; version = "0.0.5.1"; - sha256 = "1c104e232e178603ff9dd8c6eaaf0ccbda918c70b40ed63f08fa1922a3c88488"; + sha256 = "1244r2ij46gs10zxc3mlf2693nnb1jpyminqkpzh71hp5qilw40w"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers io-streams pdf-toolbox-core text @@ -135903,7 +145292,7 @@ self: { mkDerivation { pname = "pdf-toolbox-core"; version = "0.0.4.1"; - sha256 = "cce3949ef5596b5d61032ce1547160dc5f52e3d5c556dcdb9aabf1582173a981"; + sha256 = "10d9fchmiwdbkbdxqmn5spim4pywc1qm9q9c0dhmsssryng99qyc"; libraryHaskellDepends = [ attoparsec base bytestring containers errors io-streams scientific transformers zlib-bindings @@ -135921,7 +145310,7 @@ self: { mkDerivation { pname = "pdf-toolbox-document"; version = "0.0.7.1"; - sha256 = "3f7d379baa85c1cf9998e3f84177ad24b5cc8632fb211af7a09603e59596f0e1"; + sha256 = "1qghjsaya0wnl3vil8gv6a3crd94mmvl3y73k2cwzhc5madkfz9z"; libraryHaskellDepends = [ base bytestring cipher-aes cipher-rc4 containers crypto-api cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text @@ -135940,7 +145329,7 @@ self: { mkDerivation { pname = "pdf-toolbox-viewer"; version = "0.0.5.0"; - sha256 = "b8e595dae83fb2b8e47e0fd18a5dda508f85c2352beed3c507e3fe6fad0669ef"; + sha256 = "1vv90snnzzp30z2x7vib6p18b3shv9fqml8ggvjbicizx3d9brdq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135960,7 +145349,7 @@ self: { mkDerivation { pname = "pdf2line"; version = "0.0.1"; - sha256 = "45ddbc65221843e866947c014ed32d1df23a1a7062b41a36dcc41549726b491d"; + sha256 = "07a9ddr4j5f4vhv1md32f0d3mwhx5p9lw0bwjikfhhqq49jvrpa5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135977,7 +145366,7 @@ self: { mkDerivation { pname = "pdfinfo"; version = "1.5.4"; - sha256 = "9a6a1f7d8ab0a5e8f7f8276da070ccddec140d6b2549b084042159b639230911"; + sha256 = "04894cwvcn910j2b0j95dc6i9v6xriqa0v97z3vyi9dhi9yiysls"; libraryHaskellDepends = [ base mtl old-locale process-extras text time time-locale-compat ]; @@ -135986,12 +145375,30 @@ 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 { pname = "pdfsplit"; version = "0.0.1"; - sha256 = "aa5f6fffa6e82c848e59a6aa9047160835611df506d6bd53db897235bc5b7601"; + sha256 = "00bnbfy3awl9vd9vvmh6ylfn2d882r3r1am6b6788b78lvznypxa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -136010,7 +145417,7 @@ self: { mkDerivation { pname = "pdynload"; version = "0.0.3"; - sha256 = "23f10b8bb9ef6213c8d950b92abe625794f7fa348d81b48ddee9ba82e6b78924"; + sha256 = "0949nzk85fp9vs6v90cd6kxgg52pcaz2mfahv7416qpgp65hpw93"; libraryHaskellDepends = [ base directory filepath ghc ghc-paths old-time process ]; @@ -136026,7 +145433,7 @@ self: { mkDerivation { pname = "peakachu"; version = "0.3.1"; - sha256 = "b7d768596049ba0caaea35bc7e0c8399119d463d1c629275e6f7e7656d54b4f2"; + sha256 = "1wmlainnbrzpwrsr4qhw7m39s4crhc67xg1mxam0rfj9c1cnimxp"; libraryHaskellDepends = [ base derive GLUT List template-haskell time TypeCompose ]; @@ -136040,9 +145447,9 @@ self: { mkDerivation { pname = "peano"; version = "0.1.0.1"; - sha256 = "31fdd23993a76155738224a7b230a1a6fcfde091b2fbc945df4cb54068eeec7b"; + sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; revision = "1"; - editedCabalFile = "544dd9ba3e8a67303b376ebcd5c000bdcd977c67475c058a2579be75ce8ec469"; + editedCabalFile = "0sf4iv77bgkr4n50ap27cxy9gkdx030dbg3f6wxk0rwa7sxdjkal"; libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; @@ -136054,7 +145461,7 @@ self: { mkDerivation { pname = "peano-inf"; version = "0.6.5"; - sha256 = "6b8cb7a289c57d1f3aa834e7bdb94d26d1819c154b3381230bc4333c19dd19f1"; + sha256 = "1w8rvlckqcy41ciq2csb2nf83l969nwvvrrlm0x1yzf5i6ibg33b"; libraryHaskellDepends = [ base containers lazysmallcheck ]; description = "Lazy Peano numbers including observable infinity value"; license = stdenv.lib.licenses.bsd3; @@ -136068,7 +145475,7 @@ self: { mkDerivation { pname = "pec"; version = "0.2.3"; - sha256 = "609aa09bd87ab0f8da5df7ed06c46f02976c91ca5b84669539cbd43792271184"; + sha256 = "110i4y93gm6b76and12vra8nr5q2dz20dvgpbpdgic3sv2ds16k0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136089,7 +145496,7 @@ self: { mkDerivation { pname = "pecoff"; version = "0.11"; - sha256 = "38fc0de406f1d44ccf570e39bf8fa69d159d3d2b0100b48c223381419d14626d"; + sha256 = "0vb22jfl309k4a6b80015cyrs5cxls7vyf8faz7lrm7i0vj0vz1q"; libraryHaskellDepends = [ base binary bytestring containers ]; description = "Parser for PE/COFF format"; license = stdenv.lib.licenses.bsd3; @@ -136102,7 +145509,7 @@ self: { mkDerivation { pname = "peg"; version = "0.2"; - sha256 = "8d7d6b939df8ee34cc343e2d90fcb9c373e79f010b0d41b3bfbc8561a7350556"; + sha256 = "0mh56nkn31dwpyrl238b06gyfwy3p7y90b9y6k639vpqkn9nnzcd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -136121,7 +145528,7 @@ self: { mkDerivation { pname = "peggy"; version = "0.3.2"; - sha256 = "de689373195748a273ba224adf5eae6dd91ffeee68e4c60ce6230596d521a8ce"; + sha256 = "1km847arc193wq6cdr38xvz1znbdmrgdyji2p9rs4j2p35rr6s6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136141,7 +145548,7 @@ self: { mkDerivation { pname = "pell"; version = "0.1.1.0"; - sha256 = "5e2002920c97bddbe3047dbc2eba3ddadd3823c4ca137c4a1d3314cb12dc4ad4"; + sha256 = "1m2avh9cn51k3m57q4yaqhikipfs7nx2xg3x0kixpgcp1j90482y"; libraryHaskellDepends = [ arithmoi base containers ]; testHaskellDepends = [ arithmoi base Cabal cabal-test-quickcheck containers primes @@ -136161,7 +145568,7 @@ self: { mkDerivation { pname = "pem"; version = "0.2.2"; - sha256 = "372808c76c6d860aedb4e30171cb4ee9f6154d9f68e3f2310f820bf174995a98"; + sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p"; libraryHaskellDepends = [ base base64-bytestring bytestring mtl ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -136177,7 +145584,7 @@ self: { mkDerivation { pname = "penn-treebank"; version = "0.1.0.1"; - sha256 = "1e831f8f1be59fface2ef986eabc223306855a3ed6146fe940073135ec5f8589"; + sha256 = "12c5bzn3ac8783lny56n7rd8a1ik4ayfm1pr5v7gm7z53f7iz0qy"; libraryHaskellDepends = [ base containers parsec ]; description = "Tools for manipulating the Penn TreeBank"; license = stdenv.lib.licenses.bsd3; @@ -136193,7 +145600,7 @@ self: { mkDerivation { pname = "penny"; version = "0.32.0.10"; - sha256 = "110bc1e475cebf0b02605a15238e11d93711a436ae9e6f176648b313218cfd2f"; + sha256 = "0bzxihhi7cs8cqbnz7mf6sj12dyr267265asc010pgyffpjc22qi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136220,7 +145627,7 @@ self: { mkDerivation { pname = "penny-bin"; version = "0.22.0.0"; - sha256 = "34e5ac3bdcb51548fc69dd072d41ecc5f3f8e02e7b1bce2fd3df0bcf2e47b455"; + sha256 = "0mdl8wpcy2yzscpww6vv5vhgiwy5xi0js1yxd7y4h5dmvhxsrr9l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -136242,7 +145649,7 @@ self: { mkDerivation { pname = "penny-lib"; version = "0.22.0.0"; - sha256 = "272c53dc6cecc0353d4a6a53a9d8e6e57babdf485b5f9e1995f3a8b87b38c63b"; + sha256 = "0fy671xvia7kjlcrwpsv93gsnyz5wvcajlva98ykbh7cdkf56b17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136256,12 +145663,31 @@ 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 { pname = "peparser"; version = "0.21"; - sha256 = "a4f8b002ed40c29a9fc3dbc97af410e8f4db822dc5ea49706c31dd7de183c8e3"; + sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54"; libraryHaskellDepends = [ base binary bytestring haskell98 ]; homepage = "https://github.com/igraves/peparser-haskell"; description = "A parser for PE object files"; @@ -136274,7 +145700,7 @@ self: { mkDerivation { pname = "perceptron"; version = "0.1.0.3"; - sha256 = "e854329cfb148c22c4117914f877cf70622aafd0dfa6adb7f122fd41b6ce3b70"; + sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78"; libraryHaskellDepends = [ base ]; description = "The perceptron learning algorithm"; license = stdenv.lib.licenses.bsd3; @@ -136291,7 +145717,7 @@ self: { mkDerivation { pname = "perdure"; version = "0.2.1"; - sha256 = "7f625e300da2edd6844e81b51b8890c4748b3806cef7913272b9e2a2f6447213"; + sha256 = "04vj8kva5qmrf8r93xyf0qw8nx64j241pdc19s2ddvd21lq5wqkz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136311,6 +145737,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "peregrin" = callPackage + ({ mkDerivation, base, bytestring, hspec, pg-harness-client + , postgresql-simple, resource-pool, text, transformers + }: + mkDerivation { + pname = "peregrin"; + version = "0.2.0"; + sha256 = "16399ncmps8nnx3vry1my17s3scqrwrgzgm63879h6353gqz2nk3"; + libraryHaskellDepends = [ base bytestring postgresql-simple text ]; + testHaskellDepends = [ + base hspec pg-harness-client postgresql-simple resource-pool text + transformers + ]; + description = "Database migration support for use in other libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "perfecthash" = callPackage ({ mkDerivation, array, base, bytestring, cmph, containers , criterion, deepseq, hspec, QuickCheck, random, time @@ -136319,7 +145763,7 @@ self: { mkDerivation { pname = "perfecthash"; version = "0.2.0"; - sha256 = "99274578782539261b153b1f76adce3346157fa41cb6844d6265a70f72e209e3"; + sha256 = "1qq9w9r0z9v5c96q9dhwliziaiikrsnpc7rv2ldjcf95g1w4a9wr"; libraryHaskellDepends = [ array base bytestring cmph containers time ]; @@ -136341,8 +145785,8 @@ self: { }: mkDerivation { pname = "period"; - version = "0.1.0.5"; - sha256 = "b66ede8f1609d026cf43b7083fe0f824cb45bea53712632958161884a68cd5f8"; + version = "0.1.0.6"; + sha256 = "0zk7ac5casyxgdx5895jap7sw0klys26b29kj4f4p1f75b1ga8lz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136361,7 +145805,7 @@ self: { mkDerivation { pname = "periodic"; version = "0.1.0.0"; - sha256 = "1973c062977b6babdfca47f172356657296142c711a834d1123c9414df1bab84"; + sha256 = "115b3ggi951w2b8k9a0iqx162aapcqsp5wa7rbgsnsvvjxic0wqr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cereal hedis text time ]; @@ -136380,7 +145824,7 @@ self: { mkDerivation { pname = "perm"; version = "0.4.0.0"; - sha256 = "3d9719cb8f33cc1cb5756c183b2ebc1bf052c60fc7f8a25ee65b8c3a78d5c651"; + sha256 = "0lf6smw3m32vwrga5y671z355w0vphp3n63cfnsirk1kiz5ik5rx"; libraryHaskellDepends = [ base catch-fd mtl transformers ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit @@ -136396,7 +145840,7 @@ self: { mkDerivation { pname = "permutation"; version = "0.5.0.5"; - sha256 = "51b5caa115625e6b9a3b2f2240f1142c0cc6c31c351027abbcaea569f419a700"; + sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai"; libraryHaskellDepends = [ base ghc-prim QuickCheck ]; homepage = "https://github.com/spacekitteh/permutation"; description = "A library for permutations and combinations"; @@ -136408,7 +145852,7 @@ self: { mkDerivation { pname = "permute"; version = "1.0"; - sha256 = "90253f58a9cbda5e8efd8f67c9f0dfb76c167c4ffe45652f68313823606ae10d"; + sha256 = "03g1d9h26f1id0pnaigy9xy1cv5pvzqcjrwgzn75xnnbm5c3y9ch"; libraryHaskellDepends = [ base mtl ]; description = "Generalised permutation parser combinator"; license = stdenv.lib.licenses.bsd3; @@ -136420,7 +145864,7 @@ self: { mkDerivation { pname = "persist2er"; version = "0.1.0.1"; - sha256 = "579c3575300064bad50b90b7635247b7f643c831d937cf39f79919c0eb94cf24"; + sha256 = "096gjkmw06crywwwydyr67447xmp8x967dwh1gavlr0061skb72p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -136438,7 +145882,7 @@ self: { mkDerivation { pname = "persistable-record"; version = "0.4.1.1"; - sha256 = "dd62fde2b2cde224f8bbc2fdb71abc586ed1c16519d2ddd1a5744412144c57d6"; + sha256 = "1mjp9ha14i3llp8xvlhrcp0x2vjqphdbgzf2pgw29qndnbigsqnx"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell th-data-compat transformers @@ -136449,6 +145893,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.2"; + sha256 = "125zx0c1jccbb62azx5z36gr27fa8rxr5ydnq5w1wyqi0w4kxg02"; + libraryHaskellDepends = [ + array base containers dlist names-th template-haskell + th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC , persistable-record, relational-query-HDBC, text-postgresql @@ -136456,7 +145919,7 @@ self: { mkDerivation { pname = "persistable-types-HDBC-pg"; version = "0.0.1.4"; - sha256 = "ceb2435916ddbab3062ce2bd3794d1ba901dd3004f3db58cf9520b6d2459565b"; + sha256 = "0nsnb4j6s2sjz66bagag039iv45ss6a3ggg25h3b7fnx2rcl7cnf"; libraryHaskellDepends = [ base bytestring convertible HDBC persistable-record relational-query-HDBC text-postgresql @@ -136466,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 @@ -136477,10 +145958,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.6"; - sha256 = "42423362de94599581d18be644ba77181e87417087b3953daec2e8512d408e3e"; - revision = "2"; - editedCabalFile = "34e03865c3d882d04c3a03e289007cd6a8669b941b5fdac27c2628a2d976b2b6"; + version = "2.6.1"; + sha256 = "0zjz827cljka8y54gljmkjg0pyxqgvag2hf5qzhclzbjgdp0z7n7"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -136502,7 +145981,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_6_1" = callPackage + "persistent_2_7_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, http-api-data, lifted-base @@ -136513,8 +145992,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.6.1"; - sha256 = "c79e0f6e7b727dcae0c7c541f1d47eb8fb0b9e9c55d2478a476a4aca8e405f7e"; + version = "2.7.0"; + sha256 = "1snywd1qaj572m0nqdadqm9i86n0mhz8gcwwnaf35kk2sd8lvg6f"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -136547,7 +146026,7 @@ self: { mkDerivation { pname = "persistent-audit"; version = "0.2.0.0"; - sha256 = "03cc87136f040fab6d2cca5afdcb990cf88b1ce56cc2df26f7e6d2f7bdbf1ff1"; + sha256 = "1w8zpyyzglp6ywkdzhkcwlf8py0ck75zsnna5insn3q4dw9qgk03"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136572,7 +146051,7 @@ self: { mkDerivation { pname = "persistent-cereal"; version = "0.1.0"; - sha256 = "ce645be2e87c2e8a51cc1022edeac91f4fa54dc235b91ddcd452d87937725325"; + sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f"; libraryHaskellDepends = [ base cereal persistent text ]; homepage = "http://hub.darcs.net/co-dan/persistent-cereal"; description = "Helper functions for writing Persistent instances"; @@ -136587,7 +146066,7 @@ self: { mkDerivation { pname = "persistent-database-url"; version = "1.1.0"; - sha256 = "a3e1c0bc2592593beb3bdae36a7b880bda5e38e3b288a71d88e2c99b8f4ec4d1"; + sha256 = "1lf49s7rpjg2i0fsg25jwcw5xnhbi1xnmqys7gmknncj4nyc1qd3"; libraryHaskellDepends = [ base bytestring fail persistent-postgresql string-conversions text uri-bytestring @@ -136605,7 +146084,7 @@ self: { mkDerivation { pname = "persistent-equivalence"; version = "0.3"; - sha256 = "1fa360e15d1c6e768d0d85928defdd4673ffb9b4dcb2c7d8a2746abe5600d692"; + sha256 = "14nn01bbwskllbccgcnwnjwzyws6vppqv4l51n6pcvhwbphn18qz"; libraryHaskellDepends = [ array base diffarray ]; description = "Persistent equivalence relations (aka union-find)"; license = stdenv.lib.licenses.bsd3; @@ -136619,7 +146098,7 @@ self: { mkDerivation { pname = "persistent-hssqlppp"; version = "0.1"; - sha256 = "422d31468a82d3ef718b4bacd3814419a9bdc0fbf57ffd5e95c24e8a8bba8edc"; + sha256 = "1p4fpa5qlkn2jmggszzmzg0bva8r8j0x7b2bidqyzlw2i9332ba2"; libraryHaskellDepends = [ base bytestring hssqlppp monad-control mtl persistent persistent-template template-haskell text th-lift @@ -136634,7 +146113,7 @@ self: { mkDerivation { pname = "persistent-instances-iproute"; version = "0.1.0.1"; - sha256 = "d6033ee04377f760a76d96f06a3389329b95cf0934097e815240803dd108b35a"; + sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn"; libraryHaskellDepends = [ base bytestring iproute persistent ]; description = "Persistent instances for types in iproute"; license = stdenv.lib.licenses.bsd3; @@ -136647,7 +146126,7 @@ self: { mkDerivation { pname = "persistent-iproute"; version = "0.2.3"; - sha256 = "f595a11ceaa1c19e11d6f4fc58ec2834eb100791ae82626912115f1d79edbfaa"; + sha256 = "1amzxmwispqi29ln50mfj43i1srl53n5iz7lsq8rxhd1x8fa35gm"; libraryHaskellDepends = [ aeson aeson-iproute base bytestring http-api-data iproute path-pieces persistent text @@ -136664,7 +146143,7 @@ self: { mkDerivation { pname = "persistent-map"; version = "0.3.5"; - sha256 = "78c3c958d530de04c536fbcbf4a35dd212a64d19d88122e5a6fdf93ebb91c02a"; + sha256 = "0an0j6xkxygxlvjj50fq356sc4njbniz9jzv6v2h9pihsmcckhvq"; libraryHaskellDepends = [ base binary containers directory EdisonAPI EdisonCore filepath LRU mtl stm-io-hooks @@ -136683,8 +146162,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.5.0.1"; - sha256 = "0fa7b288a063d0e3dd187a41992d14ac9af9eb57a494923074d3a4db3b04b91e"; + version = "2.6.0"; + sha256 = "1y94k4ymrwb1p881gzf6g3ppv41dsvc097cq4myfjcm22xaf4kp3"; libraryHaskellDepends = [ aeson attoparsec base bson bytestring cereal conduit containers http-api-data monad-control mongoDB network path-pieces persistent @@ -136703,10 +146182,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.6"; - sha256 = "a34c9f34feab49af156870a4c09df98d9cda54a3dd08944e3e0d326e86993be7"; - revision = "2"; - editedCabalFile = "58089479bffd093a76438ed244837a885f9b0a78fa814c92d3a6aad86ed3d206"; + version = "2.6.1"; + sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent @@ -136718,24 +146195,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "persistent-mysql_2_6_0_1" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resource-pool, resourcet, text, transformers + "persistent-mysql-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-control, monad-logger, mysql-haskell, network + , persistent, persistent-template, resource-pool, resourcet, text + , time, tls, transformers }: mkDerivation { - pname = "persistent-mysql"; - version = "2.6.0.1"; - sha256 = "6c7b1805517c084ed971bcb78f12e7ebc87339389660ac470473a2ed49894cbe"; + pname = "persistent-mysql-haskell"; + version = "0.3.0.0"; + sha256 = "19iy0whg8h59ahqrkdfilhs8rpbldk8ffa4sv3b9wvwl3ivb9cg4"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent - resource-pool resourcet text transformers + aeson base bytestring conduit containers io-streams monad-control + monad-logger mysql-haskell network persistent resource-pool + resourcet text time tls transformers + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers ]; homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using MySQL database server"; + description = "A pure haskell backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-odbc" = callPackage @@ -136747,7 +146229,7 @@ self: { mkDerivation { pname = "persistent-odbc"; version = "0.2.0.1"; - sha256 = "b751d48392f61d7b2f3b0cda149dedd04eb1a24912c2075c8640de7313956c67"; + sha256 = "0rvcjl9p7pj0hrf0ghhj96ib2knhxnfi9nhc7cppn7gnja1x8ldp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136765,7 +146247,7 @@ self: { mkDerivation { pname = "persistent-parser"; version = "0.1.0.2"; - sha256 = "124eb0c33845a823f5196f895201fceb8a99e52abc5f6197fc76b5981ff6bf77"; + sha256 = "0xxzyqgridbnzjbn2pxw5bjrk2pbzh0m52bg37sj7a25731v0khj"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; description = "Parse persistent model files"; @@ -136774,27 +146256,6 @@ self: { }) {}; "persistent-postgresql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resource-pool, resourcet - , text, time, transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.6"; - sha256 = "d640eecc5c8528c5ab42f08a01b74d409ca2b8e67259f477f3cd3686bc3aaae2"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-postgresql_2_6_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent , postgresql-libpq, postgresql-simple, resource-pool, resourcet @@ -136803,7 +146264,7 @@ self: { mkDerivation { pname = "persistent-postgresql"; version = "2.6.1"; - sha256 = "0cdfb492faa3a69ec69f06bb3c17ee6c36399f406e02a2ff16086f45bed6f870"; + sha256 = "0w7qssz4avq82vzs40kf82gkjdkcxqbkrfq6kz39x9m3za9b9pqc"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -136812,7 +146273,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -136823,7 +146283,7 @@ self: { mkDerivation { pname = "persistent-protobuf"; version = "0.1.5"; - sha256 = "3fe99d09d3953165e491eaa2d5981046a9bdc86fe9037e42657c99fdb4bacd10"; + sha256 = "046dpasgv6bwcm17w0z9dz4bvaa622cdb8paj7j6accmsc4rvs9z"; libraryHaskellDepends = [ base bytestring persistent protocol-buffers protocol-buffers-descriptor template-haskell text @@ -136838,8 +146298,8 @@ self: { ({ mkDerivation, base, time, yesod }: mkDerivation { pname = "persistent-ratelimit"; - version = "0.2.0.0"; - sha256 = "e3b14ed8c78999ebe797e84cac75bc66ed7bd264b9ccef92279193be31ed114e"; + version = "0.3.0.0"; + sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m"; libraryHaskellDepends = [ base time yesod ]; homepage = "https://github.com/jprider63/persistent-ratelimit"; description = "A library for rate limiting activities with a persistent backend"; @@ -136856,7 +146316,7 @@ self: { mkDerivation { pname = "persistent-redis"; version = "2.5.2"; - sha256 = "7ba65629f4e192379ccc8970ef31352ce2779fe17bb98b8b9e634edfead72b13"; + sha256 = "04rbszmdykk3ks5qpfbvw6gpgqic6lqyyw49rjf3g4p1yhlmd9kv"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring hedis http-api-data monad-control mtl path-pieces persistent scientific text time @@ -136877,7 +146337,7 @@ self: { mkDerivation { pname = "persistent-refs"; version = "0.4"; - sha256 = "46b310e034e23993e7da740d388e06e410483ada05cbcc8c0a4953ee19f8d0d3"; + sha256 = "1lyhz0cywls91a6crjq5v8x4h4740s73h3blvbkr6fg26kh11cs6"; libraryHaskellDepends = [ base containers mtl ref-fd transformers ]; @@ -136894,8 +146354,8 @@ self: { }: mkDerivation { pname = "persistent-relational-record"; - version = "0.1.0.0"; - sha256 = "b2b5858bcabf3c889e9c30dbb5d12dd45f48683036e565ceebfc245e2c5a8870"; + version = "0.1.1.0"; + sha256 = "145am29vwjvvs93z8kqj4dgh71h64ascmqnd70w9g9qszb2rjwrm"; libraryHaskellDepends = [ base conduit containers mtl persistable-record persistent relational-query resourcet template-haskell text @@ -136910,33 +146370,6 @@ self: { }) {}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, monad-control, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, temporary, text - , time, transformers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.6.0.1"; - sha256 = "84df1475478f8c4aa7790152c89ffca43a08a32cd933e4062cb219a023e4768c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers monad-control monad-logger - old-locale persistent resource-pool resourcet text time - transformers - ]; - testHaskellDepends = [ - base hspec persistent persistent-template temporary text time - transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-sqlite_2_6_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale , persistent, persistent-template, resource-pool, resourcet @@ -136945,7 +146378,7 @@ self: { mkDerivation { pname = "persistent-sqlite"; version = "2.6.2"; - sha256 = "6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf"; + sha256 = "1gw5p531187dqchi7384q3irh9n8p7prs172zpq9r1l1ziqw8dk1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136960,37 +146393,10 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-template" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.5.1.6"; - sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44"; - revision = "2"; - editedCabalFile = "18eae1801d9742facf54aada319dfde737a1cc758b39bb2f237a4d15c98b65c6"; - libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_5_2" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger , path-pieces, persistent, QuickCheck, tagged, template-haskell @@ -136999,7 +146405,9 @@ self: { mkDerivation { pname = "persistent-template"; version = "2.5.2"; - sha256 = "de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011"; + sha256 = "04a0ifjidy7lv5ip0dipjgsvr3h9kkw37z03s5kaxyaqh405nsfy"; + revision = "1"; + editedCabalFile = "0jhcanaz680knzc45g594fa68ihh7mkkrhlyaxnj6rjwbrcwjp9x"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -137011,7 +146419,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -137022,7 +146429,7 @@ self: { mkDerivation { pname = "persistent-vector"; version = "0.1.1"; - sha256 = "420a660c3a74612bda8c8ecee8d897e61f5aca957622c121998f8825af00bbd0"; + sha256 = "1l5v02pjb24gk4hw28knjp55l7z6jzcfiklfikd2nqbl7866c2j2"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -137043,7 +146450,7 @@ self: { mkDerivation { pname = "persistent-zookeeper"; version = "0.2.0"; - sha256 = "3fc55c8eb914d52f94cfcbcbbca76eaaed1d765015b753cc73fe7bd8334f4987"; + sha256 = "11s99wrxhyzyfg657dqma1v1vvdadskvrjybrya2zm8lp675ri9z"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring binary bytestring conduit containers hzk monad-control mtl path-pieces persistent @@ -137070,7 +146477,7 @@ self: { mkDerivation { pname = "persona"; version = "0.2.0.0"; - sha256 = "bc8a1674a5f5ce96eb0e2ad1fcac8836bad47f13135214025c2e63ca2d908d6b"; + sha256 = "0swdj0nwlqrfbh118lhk2dzx9fini2ngrl9a1vmrdkpmlms1d2mw"; libraryHaskellDepends = [ aeson base data-default-class jose lens network-uri text time unordered-containers @@ -137090,7 +146497,7 @@ self: { mkDerivation { pname = "persona-idp"; version = "0.1.0.2"; - sha256 = "d6ac0052bed0ef7b2c340aec078ac7785eb2484c88a8fa5f5ee9810a6af25420"; + sha256 = "082ly9m0m0g9brgzma489i4b4pkqqy50gv0a6hn7pvyhpr901b6n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137109,7 +146516,7 @@ self: { mkDerivation { pname = "pesca"; version = "4.0.1"; - sha256 = "f7696fdf108f0c9a57761cdcc1ce19434923c0dd7ccb205c6819aff5b5ac9c89"; + sha256 = "12cwmjszbbqrd1f21jvwvp026ja3377c3p0wfrbrl34g23gnysgp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -137129,7 +146536,7 @@ self: { mkDerivation { pname = "peyotls"; version = "0.1.6.10"; - sha256 = "9c738ac0cc1bdc8548679c8bafcc8e9cba21e8c9a805708431d98d6f03cc3874"; + sha256 = "0x1qrh1nz3fr662701d8r7l23flwiv6az2wwcx48bp0vrk08lwww"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytable bytestring cipher-aes crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random @@ -137154,7 +146561,7 @@ self: { mkDerivation { pname = "peyotls-codec"; version = "0.3.1.0"; - sha256 = "fae2e01a02d6643068f57b7daec26d760d437500551547c69cf43c3896a84198"; + sha256 = "1621m2b3hg7lkk34f5am01sl63bndp1awzbvyml30r6n08df1qps"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytable bytestring crypto-pubkey crypto-pubkey-types monads-tf word24 x509 x509-store @@ -137172,7 +146579,7 @@ self: { mkDerivation { pname = "pez"; version = "0.1.0"; - sha256 = "e46cf8c7ccc6e5b4ed668343ace3984e989e2da5ada20f69a1691f0443445570"; + sha256 = "0w2m8i1h87v9l5lhz8mdllnrx62fk3isqhw3cvnv9rf6rk3zhv74"; libraryHaskellDepends = [ base failure fclabels thrist ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -137190,7 +146597,7 @@ self: { mkDerivation { pname = "pg-harness"; version = "0.2.1"; - sha256 = "0ec3c6361ae4e96060557a4a6a6426c45ee4ef9dc09e4063f16c61791064a62b"; + sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring HTTP ]; @@ -137208,7 +146615,7 @@ self: { mkDerivation { pname = "pg-harness-client"; version = "0.4.0"; - sha256 = "ecf29ea6d36375a970ccdf6afa33ecac1571d53bd917f2c043f6c2689fced345"; + sha256 = "0ifkrsgnihpn8g0g45yr7gap25dcxhrzlsnzriqajxb3sfk9xwpc"; libraryHaskellDepends = [ base bytestring HTTP ]; homepage = "https://github.com/BardurArantsson/pg-harness"; description = "Client library for pg-harness-server"; @@ -137222,7 +146629,7 @@ self: { mkDerivation { pname = "pg-harness-server"; version = "0.4.0"; - sha256 = "c3a46ce4954e3a0bcbdf0cdc032fe1db1bb1b92902fb3811d41327a13f93de31"; + sha256 = "0cfyjczs29qksh8kiyq256wv26yvw4ph7p0cvz5hnfjfjpj6r963"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137236,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 = "4824fbff41eb4dce8944afca1c3fac8716d77c4425ca04c1d8546876b51c83b6"; + 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"; @@ -137253,6 +146666,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pg-transact" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hspec + , hspec-discover, monad-control, postgresql-simple, tmp-postgres + , transformers + }: + mkDerivation { + pname = "pg-transact"; + version = "0.1.0.1"; + sha256 = "0zf9mfhpknaa0vggv60gpkfr0ak51n1xbw5lfqx8l8p1kqv3d0jr"; + libraryHaskellDepends = [ + base bytestring exceptions monad-control postgresql-simple + transformers + ]; + testHaskellDepends = [ + base bytestring exceptions hspec hspec-discover postgresql-simple + tmp-postgres + ]; + 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 ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit , conduit-extra, configurator, containers, directory @@ -137262,8 +146698,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.7"; - sha256 = "e9e91142bff59bff5768af8c927c10133c68f1a8504115999b5623d6cd3bfe73"; + version = "10.9"; + sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137282,7 +146718,7 @@ self: { mkDerivation { pname = "pgm"; version = "0.1.4"; - sha256 = "bb36ff802ff49df4ad7d52e900773b1ccabf93956011a5d3fc2e778d036473e8"; + sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv"; libraryHaskellDepends = [ array base bytestring parsec ]; homepage = "https://github.com/astanin/haskell-pgm"; description = "Pure Haskell implementation of PGM image format"; @@ -137296,7 +146732,7 @@ self: { mkDerivation { pname = "pgp-wordlist"; version = "0.1.0.2"; - sha256 = "e28b6fe85222adf1247d5870ab47c68c3d25df3f9ceda104bfb64e1414a92466"; + sha256 = "0ri4m4a18kmnpw2a3vcw7zgjagccqr3snw2qgljg3b92abl6z2z2"; libraryHaskellDepends = [ base bytestring containers text vector ]; testHaskellDepends = [ base bytestring deepseq doctest HUnit tasty tasty-hunit @@ -137316,7 +146752,7 @@ self: { mkDerivation { pname = "pgsql-simple"; version = "0.1.2"; - sha256 = "a5ce00a41529789c07109b09a4fed48301f1d1631b111b49511e9173977969fc"; + sha256 = "1z39g6bp748ya54in48vcg8z20c3skza82cv203rqy192nj01km5"; libraryHaskellDepends = [ attoparsec base base16-bytestring binary blaze-builder blaze-textual bytestring containers MonadCatchIO-transformers mtl @@ -137338,9 +146774,9 @@ self: { mkDerivation { pname = "pgstream"; version = "0.1.0.3"; - sha256 = "8f694b3f0e537fe61ae4d9904d4200f0c4e0c4010583b6e25157a481e2d66a7d"; + sha256 = "0zbasvi8392pa7ibd0q5072f1i7h0114v46rwhdfczsk1qzlnscg"; revision = "1"; - editedCabalFile = "6b08ae7064272e58cb3d6cd8df606d3d376de019febcffd042f8bbded7300426"; + editedCabalFile = "09h463bxxfzq8b8gzg7y37h6sdrxdmhdzn3c7p5mhbi7ciqaw23b"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit conduit-extra deepseq mtl parallel postgresql-binary @@ -137358,7 +146794,7 @@ self: { mkDerivation { pname = "phantom-state"; version = "0.2.1.2"; - sha256 = "f978ef98e810e9a9e53f1479340ba7a28f80a64aba431322959cbf8c620c3811"; + sha256 = "049q1ii8rgwwjli16hxs9ak813x2lw5k8y8l7zjsks8hx2cfyy7r"; libraryHaskellDepends = [ base transformers ]; benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Phantom State Transformer. Like State Monad, but without values."; @@ -137371,7 +146807,7 @@ self: { mkDerivation { pname = "phasechange"; version = "0.1"; - sha256 = "56ddf396aba263db0090cade0893b6a94197627c98525474fe372f95acafa444"; + sha256 = "0i54myn9abrpzrs58llqgii9fhd9ns9hipnaj00dnqx2mfbg7pan"; libraryHaskellDepends = [ array base ghc-prim monad-st primitive vector ]; @@ -137382,12 +146818,12 @@ self: { }) {}; "phaser" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "phaser"; - version = "0.2.0.0"; - sha256 = "2026931bbcd25bd60809bada559f82126ce357c60f536da103a33ab3700fda88"; - libraryHaskellDepends = [ base bytestring text ]; + version = "1.0.0.1"; + sha256 = "1ig3hcalfg2qxb092krii6zv95kvq0kng4acvq7l3wz03x66wj29"; + libraryHaskellDepends = [ base bytestring containers text ]; homepage = "https://github.com/quickdudley/phaser"; description = "Incremental multiple pass parser library"; license = stdenv.lib.licenses.bsd3; @@ -137399,8 +146835,8 @@ self: { }: mkDerivation { pname = "phash"; - version = "0.0.5"; - sha256 = "7b199d520b4b08562532ab968853c701ecb868df35862ba6db5c8be299fdcdae"; + version = "0.0.6"; + sha256 = "1fr1n9m2w0ayaw8y7x4fvmid23hmzh7d1pn6xxfiigrzvfmf0xgm"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ pHash ]; testHaskellDepends = [ @@ -137419,7 +146855,7 @@ self: { mkDerivation { pname = "phizzle"; version = "0.1.0.2"; - sha256 = "45a1a4947b6e94dd0a32968a8584a12ed276a8355690cf5cb0314a14de0dc2cf"; + sha256 = "1ky21pg18jiin1fcz42n6nl7dlifl628b2ln685dv53fgfaa98a5"; libraryHaskellDepends = [ aeson base bytestring network network-uri regex-pcre text ]; @@ -137438,7 +146874,7 @@ self: { mkDerivation { pname = "phoityne"; version = "0.0.5.0"; - sha256 = "c3b53f08c00ded7a382b752ffdf9c6cae6472f69e51f527e4b4180f58f4f5568"; + sha256 = "0s2m9y7zb0219dz547z5d4plgrnaqvwzsbvm5cw7mv8dq043zdf3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137459,8 +146895,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.12.0"; - sha256 = "db6c64e67759c9133f12a70fa82df22c8f7d4ba4450b5317aa57f35a177976fb"; + version = "0.0.14.0"; + sha256 = "1csz0h91yka230vab626dc5qqay00ircgfs2x5z4gj3s67wh5fg5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137479,7 +146915,7 @@ self: { mkDerivation { pname = "phone-metadata"; version = "0.0.1.5"; - sha256 = "abf6d2df19a476a36caa65f629b2f9f73a75a5d8a23d629357c9e621dc44c97e"; + sha256 = "0zn98kf23rn9ay9n4gd2v2jpafppz6r2kxk5m9na6xm437gx5xmb"; libraryHaskellDepends = [ base containers hxt regex-pcre text ]; testHaskellDepends = [ base hspec ]; description = "Phonenumber Metadata - NOTE: this is now deprecated!"; @@ -137491,7 +146927,7 @@ self: { mkDerivation { pname = "phone-numbers"; version = "0.1.0"; - sha256 = "0eeccc920f5bb9473313da108d851c0d9d55dc2bcc9cb267d5dd3f78a9854e81"; + sha256 = "10afhnlphgyxsmkv576c5gf5b78d3j2qs46s2crlgfav1y9crv0f"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ phonenumber ]; testHaskellDepends = [ base bytestring ]; @@ -137509,7 +146945,7 @@ self: { mkDerivation { pname = "phone-push"; version = "0.1.3"; - sha256 = "116a6f763c94b8848f443f0fe6605db35d7e09c040b6173f652d6b3d646baa59"; + sha256 = "0ndaddj3ssrdclzigdj0q04pwpdkbmhfc3rz8j7q9f4l7iv6yshi"; libraryHaskellDepends = [ base base16-bytestring binary bytestring conduit convertible HsOpenSSL http-conduit network time transformers @@ -137525,7 +146961,7 @@ self: { mkDerivation { pname = "phonetic-code"; version = "0.1.1.1"; - sha256 = "9c99a1b367cb002e520a4def1fd1af8aae9f0bc6457b137400c99e713b965b5e"; + sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw"; libraryHaskellDepends = [ array base containers regex-compat ]; homepage = "http://wiki.cs.pdx.edu/bartforge/phonetic-code"; description = "Phonetic codes: Soundex and Phonix"; @@ -137539,7 +146975,7 @@ self: { mkDerivation { pname = "phooey"; version = "2.0.0.1"; - sha256 = "9247806312d6155e2734765931ebacad2e8a2306dc325903261a1d5ff1d14029"; + sha256 = "0aa0s7qmy78s4q1mjcnw0qiqlbmdmkmk2nbn6hkmw5fn29iq0iwj"; libraryHaskellDepends = [ array base mtl reactive TypeCompose wx wxcore ]; @@ -137556,7 +146992,7 @@ self: { mkDerivation { pname = "photoname"; version = "3.2"; - sha256 = "6a4ee3e631d005b6904444d025ec1ccd9aa4dd0e841f4068806567998e86fcf9"; + sha256 = "1ygwhs79jrv5h1l407w41vfs96nd3kn2bl248j8bc1fh67kf6kka"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137577,7 +147013,7 @@ self: { mkDerivation { pname = "phraskell"; version = "0.1.4"; - sha256 = "33cd40212e997fac0d780c1eed85cff909eb09c5d56648eb65f8b0b7aadd9fad"; + sha256 = "1bczvnmbgc7qcpmlhrnmql4yn2grry2ys7hcg06sqzwr5qhl1k9k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl SDL transformers ]; @@ -137596,7 +147032,7 @@ self: { mkDerivation { pname = "phybin"; version = "0.3"; - sha256 = "e915cd0e344eeb344334a2533605e6448e854b70f444e76662fc4d2b9d67dfec"; + sha256 = "1v6zcyfjnkgwc9kffi7lf15qb3j4wq2kclx26i1k9ssf6h7cs5g9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137629,7 +147065,7 @@ self: { mkDerivation { pname = "pi-calculus"; version = "0.0.5"; - sha256 = "585803a452b83148eb695def6d4ecd1edb5e6e3243e3573166ff63a1f5ccb3f0"; + sha256 = "1w5krkss2qzzcqqmgqs369p5xnqyrm76vvsxd7mlhcdqaaj06n2q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137650,7 +147086,7 @@ self: { mkDerivation { pname = "pi-forall"; version = "0.1.1"; - sha256 = "c3b736d069854ad0d3126fae42cb398dd6c23c4659ffbbd929dd5cc03e76a540"; + sha256 = "0h55fqzc0p6x57cvpzsr8qyc5mld775l5bkg2b9x0jl5d783ddy3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137668,17 +147104,17 @@ self: { }) {}; "pi-lcd" = callPackage - ({ mkDerivation, base, bytestring, clock, text, unix + ({ mkDerivation, base, bytestring, clock, deepseq, text, unix , unordered-containers }: mkDerivation { pname = "pi-lcd"; - version = "0.1.0.0"; - sha256 = "afd0dc56b2c3254420b7b3590bca606be9a7d6881cacfab04e5fb2dbe31303d9"; + version = "0.1.1.0"; + sha256 = "0120zkza698ww8ng6svp54qywkrvn35pylvcgplfldw4ajln00vn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring clock text unix unordered-containers + base bytestring clock deepseq text unix unordered-containers ]; executableHaskellDepends = [ base text ]; homepage = "https://github.com/ppelleti/pi-lcd"; @@ -137694,7 +147130,7 @@ self: { mkDerivation { pname = "pia-forward"; version = "0.1.0.2"; - sha256 = "6189410d115b163237006b15fda448256c313d03c8e94c9422f6bc05415fb3f2"; + sha256 = "1wmkbx0hbg7n4aa4rsf80cyk2v1592jgs5bb00vk45jv246l32b1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137717,7 +147153,7 @@ self: { mkDerivation { pname = "pianola"; version = "0.1.1"; - sha256 = "5821a3cfa64a7e9c984aa5a90bfad842097e88cb85c4e80b4d23f4a93d18c60b"; + sha256 = "02y630yskx139l5yii45rf47w2a2v3x0pad59ac9qzjalv7s68aq"; libraryHaskellDepends = [ attoparsec attoparsec-iteratee base bytestring comonad comonad-transformers containers either errors filepath free @@ -137736,7 +147172,7 @@ self: { mkDerivation { pname = "picedit"; version = "0.2.3.0"; - sha256 = "e8525d8ca1d4ab0995293948a05dda3eb57f2456603ba5467fef982d0296c12d"; + sha256 = "0bf1jq12v67ggx3aafv0aqj7zd9yv9fs0j1r56ahkayll665slp8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; @@ -137753,9 +147189,9 @@ self: { mkDerivation { pname = "picologic"; version = "0.3.0"; - sha256 = "130f67f8d018b4f988d434d37fa46d908d4d144ccbd005cfd2773a720ba25e4b"; + sha256 = "0jsyl85p4fkpsb7hbl6b9ha4v3chdnj7zlrlsj4gkd0qs3w6f3qk"; revision = "1"; - editedCabalFile = "e89ef8a03720c391eefc8a47c6f947a1b7f4a37762393f45923854e696fcb59b"; + editedCabalFile = "16xmzjbfcm1qj92kyfb2fyiz9dx18zwwciwazkp93hr06yhgi7p8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137781,7 +147217,7 @@ self: { mkDerivation { pname = "picoparsec"; version = "0.1.2.3"; - sha256 = "8ec7ed678efaf62de15b7c2f1d21f1ddf8b92f5fa233eed9534c12e8812e9150"; + sha256 = "0l4i5s0yh4jcagcywcx2bwpvky6xy4hisbvwbghjvxpsirkyviwf"; libraryHaskellDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -137806,7 +147242,7 @@ self: { mkDerivation { pname = "picosat"; version = "0.1.4"; - sha256 = "5a6d9fae04a77a95a8c92ec6dd76302010b726d8c934dc8d8bbabc82851e9039"; + sha256 = "0fch3s2q5g5sif6xqd69v0kbf41061vdviifr6l9aym70jp9yvas"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers random rdtsc transformers ]; homepage = "https://github.com/sdiehl/haskell-picosat"; @@ -137815,17 +147251,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pictikz" = callPackage + ({ mkDerivation, base, matrix, transformers, xml }: + mkDerivation { + pname = "pictikz"; + version = "1.1.0.0"; + sha256 = "0zah0k0n03mj3ilh8fb15i6bj93k48dsf8j2vyxfviahwl553src"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base matrix transformers xml ]; + description = "Converts a svg image to tikz code"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "pid1" = callPackage - ({ mkDerivation, base, process, unix }: + ({ mkDerivation, base, directory, process, unix }: mkDerivation { pname = "pid1"; - version = "0.1.0.1"; - sha256 = "163b6dc85426558ad1a897675bf7f560389addf172c8e5858f817342ee7345c8"; + version = "0.1.2.0"; + sha256 = "0xkz4vdh8cblpl8k2xmqs8vwv2c0vpxdbikcf2dnmzbg9fdvz5wy"; revision = "1"; - editedCabalFile = "f3213f1c04a1daa726ee2f6ceda69d843b80f4726759ef2fe2e23c4f34342746"; + 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"; @@ -137837,7 +147286,7 @@ self: { mkDerivation { pname = "pidfile"; version = "0.1.0.1"; - sha256 = "5af1a8984396635229057f9d0a6bc5cf7d7fa2fba55c8f0e9dfc2a4534e448df"; + sha256 = "1ps8whs4aapwkl78yp55zfi7yzfgqmmhm7bz0llm4qwn8fcaiwas"; libraryHaskellDepends = [ base unix ]; homepage = "https://github.com/jonpetterbergman/pidfile"; description = "Run an IO action protected by a pidfile"; @@ -137849,7 +147298,7 @@ self: { mkDerivation { pname = "piet"; version = "0.1"; - sha256 = "e9b33432edf176fbcb12b7ed07bb7b4fa5072e989cd25e234643321196ae6029"; + sha256 = "0ab0msb12cj38qimxllwk0p0g9aggfxhgvdp2b5znxpixlr39cz9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers Imlib mtl ]; @@ -137863,7 +147312,7 @@ self: { mkDerivation { pname = "piki"; version = "0.5.2"; - sha256 = "36ca3ea0a98896eb9208dcfc156fa0405b97b36f0740ef9ac8140201ad124c67"; + sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl parsec text ]; @@ -137883,7 +147332,7 @@ self: { mkDerivation { pname = "pinboard"; version = "0.9.12.4"; - sha256 = "a64c3dab19bedbe341406a0897a323d9f7830f384856f01a8d0a2cf5ae591e99"; + sha256 = "168yb6pgab0aildg0mj8707q7xyr4firf23a810y7nxy36mksk56"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random @@ -137906,8 +147355,8 @@ self: { }: mkDerivation { pname = "pinch"; - version = "0.3.0.2"; - sha256 = "f511ab7e13de146ed075eb52ee7954b1b4c2deaf5bb54e83375dc159e5803e4a"; + version = "0.3.2.0"; + sha256 = "0r0pxdhzlmfg8h13fi10bvy1wxvsk1ckzzlcxbpg6zrly9n0z4m1"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim hashable text unordered-containers vector @@ -137928,7 +147377,7 @@ self: { mkDerivation { pname = "pinchot"; version = "0.24.0.0"; - sha256 = "b9769cdecb718c834d6fb04b62c08482f98cbb2a48c8a810ce83db96eff997e5"; + sha256 = "1rcpz7prdnw3rq8aij285axqryc2hk064jxhdx6q733irgg9qxmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137945,7 +147394,7 @@ self: { mkDerivation { pname = "pipe-enumerator"; version = "0.3.0.2"; - sha256 = "6cfee3e8792fbd9f1a061d800df3a57452eeb2757be731a592c0de822600d340"; + sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc"; libraryHaskellDepends = [ base enumerator pipes transformers ]; homepage = "https://github.com/zadarnowski/pipe-enumerator"; description = "A bidirectional bridge between pipes and iteratees"; @@ -137957,7 +147406,7 @@ self: { mkDerivation { pname = "pipeclip"; version = "0.1.0.1"; - sha256 = "cfb5db0d91da9d776695189b29579e5b7b2b0262def877aa9524219ced83abc2"; + sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137968,41 +147417,17 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "pipes_4_2_0" = callPackage - ({ mkDerivation, base, criterion, mmorph, mtl, optparse-applicative - , QuickCheck, test-framework, test-framework-quickcheck2 - , transformers - }: - mkDerivation { - pname = "pipes"; - version = "4.2.0"; - sha256 = "1e407197e94c3c8642fd2c7b4f8e5a3e537844dff2780c396464a47ae0ec0124"; - revision = "1"; - editedCabalFile = "1ce0aac0a280be337215bcf2a8b73b081a948bfb93e24045a7e3a3c3e6adfad0"; - libraryHaskellDepends = [ base mmorph mtl transformers ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, test-framework - , test-framework-quickcheck2, transformers + , test-framework-quickcheck2, transformers, void }: mkDerivation { pname = "pipes"; - version = "4.3.2"; - sha256 = "7957bb290db7f1dfad0581f363ab97fcd58f7c0b916e1114464cb9a398b8334a"; + version = "4.3.4"; + sha256 = "08am4yxn0f2aizyh34g6nwm7l9i2bxd0s38dsfwqm6h0sdvfsffb"; libraryHaskellDepends = [ - base exceptions mmorph mtl transformers + base exceptions mmorph mtl transformers void ]; testHaskellDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -138021,10 +147446,8 @@ self: { }: mkDerivation { pname = "pipes-aeson"; - version = "0.4.1.7"; - sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd"; - revision = "1"; - editedCabalFile = "7ce776e074de974988cd06b5b26062b4f5f1647c07fc2ecdd2992c482c0d286d"; + version = "0.4.1.8"; + sha256 = "0xdybqszcs14sb02g7garfx8ivmp48fm5rsl4md8vypyjbs1211m"; libraryHaskellDepends = [ aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers @@ -138041,7 +147464,7 @@ self: { mkDerivation { pname = "pipes-async"; version = "0.1.2"; - sha256 = "ec0ee9cfb5b958acd40f5fd7ba2073853eccc7c2701a14fc011118f3ee95d83d"; + sha256 = "0gfqjppg660i07y186khqb3wqgl5fchbmmsz1zaaqn5rnp7yj3pc"; libraryHaskellDepends = [ base lifted-async lifted-base monad-control pipes pipes-safe stm transformers-base @@ -138062,10 +147485,8 @@ self: { }: mkDerivation { pname = "pipes-attoparsec"; - version = "0.5.1.4"; - sha256 = "fab0a84f9f81e6ae06eae85fd895f0cb8c698723cab7f33addaf5d14cd553507"; - revision = "1"; - editedCabalFile = "c90218d8e50e98ed17267f3f96a6e0382fd20c6143892470a6eeb6eda4f34edd"; + version = "0.5.1.5"; + sha256 = "1zfaj6jxmld95xi4yxyrj1wl31dqfw464ffyrm54rg4x513b97py"; libraryHaskellDepends = [ attoparsec base bytestring pipes pipes-parse text transformers ]; @@ -138085,7 +147506,7 @@ self: { mkDerivation { pname = "pipes-attoparsec-streaming"; version = "0.1.0.0"; - sha256 = "a7854c053559450c898008432a82bfba85c3325334ff1462630315282549992a"; + sha256 = "0alr94jjh583cdi19zrlacrc71dspy12lhq8h24hqiar6l2lr1d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138106,7 +147527,7 @@ self: { mkDerivation { pname = "pipes-bgzf"; version = "0.2.0.1"; - sha256 = "43ec9888b51def483a701e56443b62c00ec37aa2d9e0ee3b314fa084fce7c013"; + sha256 = "04y0wzy8982g64xyxq6rl9xc63n0c8xl8mhyf0x4ivqxnn49iv23"; libraryHaskellDepends = [ base bytestring mtl parallel pipes streaming-commons ]; @@ -138123,7 +147544,7 @@ self: { mkDerivation { pname = "pipes-binary"; version = "0.4.1"; - sha256 = "1b6e79748f2579285ba416c02c1461fee394309f79b94f9d5c874bbf6f79d637"; + sha256 = "0dyng5pvyjw7bjflzfbrkwq99qzyc4a2rh0nlidjhy95ixs7jvhv"; libraryHaskellDepends = [ base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse transformers @@ -138138,16 +147559,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-break" = callPackage + ({ mkDerivation, base, bytestring, mtl, pipes, pipes-group + , pipes-parse, QuickCheck, text + }: + mkDerivation { + pname = "pipes-break"; + version = "0.2.0.6"; + sha256 = "1clqy2cm8mqc8ybc8m1la2768n3q9jqdh818gw99ypj70w3rqnn7"; + libraryHaskellDepends = [ + base bytestring pipes pipes-group pipes-parse text + ]; + testHaskellDepends = [ base bytestring mtl pipes QuickCheck ]; + homepage = "https://github.com/mindreader/pipes-break"; + description = "Pipes to group by any delimiter (such as lines with carriage returns)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-bytestring" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse - , transformers + , stringsearch, transformers }: mkDerivation { pname = "pipes-bytestring"; - version = "2.1.4"; - sha256 = "6c3f72de28aa538887f6c442884e88a4a0219057998e3710b81439dcb4466deb"; + 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; @@ -138161,7 +147600,7 @@ self: { mkDerivation { pname = "pipes-bzip"; version = "0.2.0.4"; - sha256 = "77dab58950936e2a0f7327de5e2442aafe381e7ff4981c772377624cfdd0b08a"; + sha256 = "12mhs3ylqqkp4dvir67lgwg3izma88j5xpi7fc7jlvlka24vbnkp"; libraryHaskellDepends = [ base bindings-DSL bytestring data-default mtl pipes pipes-safe ]; @@ -138182,7 +147621,7 @@ self: { mkDerivation { pname = "pipes-cacophony"; version = "0.4.1"; - sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360"; + sha256 = "0q2k9kjl8fvqfkf20d5rr5ybh4p2vyaigi435v8ix5dfqj3m5wdw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cacophony memory pipes ]; @@ -138193,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 @@ -138200,7 +147655,7 @@ self: { mkDerivation { pname = "pipes-category"; version = "0.2.0.1"; - sha256 = "9da046ca3b30115bad0d3ab447250675543c159c9a6e865d2ae863c61ead6679"; + sha256 = "0yb6mlgccqz859fqcvlskhakqm3m0qjlgd1s1nnmn49h7g54d84x"; libraryHaskellDepends = [ base lens mtl pipes pipes-extras ]; testHaskellDepends = [ base hspec pipes transformers ]; homepage = "https://github.com/louispan/pipes-category#readme"; @@ -138213,7 +147668,7 @@ self: { mkDerivation { pname = "pipes-cellular"; version = "0.0.0.1"; - sha256 = "ac4145eab90f0ff1ec66502bee3d87e4620bca0fe49e2153ab6eccc4f6f70a48"; + sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc"; libraryHaskellDepends = [ base bytestring data-cell pipes ]; homepage = "https://github.com/zadarnowski/pipes-cellular"; description = "Pipes-based combinators for cellular data processing"; @@ -138226,7 +147681,7 @@ self: { mkDerivation { pname = "pipes-cellular-csv"; version = "1.0.0.0"; - sha256 = "896d53f45dd86e77adbd06f7fd6e7d3118c2125986ca05693225e89c53d5f1d3"; + sha256 = "1lzism9rrs1569lhbjl6b49c461igmpgvxq6pnnpfvnqbps56vc9"; libraryHaskellDepends = [ base bytestring data-cell pipes pipes-cellular ]; @@ -138242,7 +147697,7 @@ self: { mkDerivation { pname = "pipes-cereal"; version = "0.1.0"; - sha256 = "874d90435aac869871c169777ba937ac2579868c9076d9292d534b9f163a43b6"; + sha256 = "1dj378b9yjsk5llxjxlhij37j9dc6ylpnxv9q5qri1mcb91r0kc7"; libraryHaskellDepends = [ base bytestring cereal mtl pipes pipes-bytestring pipes-parse ]; @@ -138258,7 +147713,7 @@ self: { mkDerivation { pname = "pipes-cereal-plus"; version = "0.4.0"; - sha256 = "19c345ddd422da208e561fe35552caaa474f63a1ad400cc5671b52a0117538f4"; + sha256 = "1x1qfl8s0lhvcz2hqh5dl5ilyixar995bqqzas721ni2skflbhqr"; libraryHaskellDepends = [ base bytestring cereal-plus errors mtl pipes pipes-bytestring text ]; @@ -138275,7 +147730,7 @@ self: { mkDerivation { pname = "pipes-cliff"; version = "0.12.0.0"; - sha256 = "4fc4ce908899d20ed1ea8964cfe38bc547476d6901934cbb82e35e4ada5417c5"; + sha256 = "1i8pakd4lpp3haxlr4q1d5nlfiy5igiwyr49xb8hxllri28cxi2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138291,7 +147746,7 @@ self: { mkDerivation { pname = "pipes-concurrency"; version = "2.0.7"; - sha256 = "14a47f0096361b495330b4489c3534ee37f507550ffa2f57cb0e70362df47559"; + sha256 = "0nbmyhnkcw0frdbjzyhgal3zadzf6hsrqj5l619lj6rnjq07z90l"; libraryHaskellDepends = [ base contravariant pipes stm void ]; testHaskellDepends = [ async base pipes stm ]; description = "Concurrency for the pipes ecosystem"; @@ -138303,7 +147758,7 @@ self: { mkDerivation { pname = "pipes-conduit"; version = "0.0.1"; - sha256 = "08366060768aa35dfff4e8eb166d3794df72c14b15f4876d0755b8112ba4fedb"; + sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8"; libraryHaskellDepends = [ base conduit mtl pipes-core ]; homepage = "https://github.com/pcapriotti/pipes-extra"; description = "Conduit adapters"; @@ -138318,7 +147773,7 @@ self: { mkDerivation { pname = "pipes-core"; version = "0.1.0"; - sha256 = "d73f8ad3c10f7bd0c3d0c20791aa6167cc001b9fbd28f264a4c847b90af17fa9"; + sha256 = "1abzy45bjiy8lijg4a5xkwdh1k37c6m921y2s31x0yqgq79qlgyp"; libraryHaskellDepends = [ base categories lifted-base monad-control transformers void ]; @@ -138333,7 +147788,7 @@ self: { mkDerivation { pname = "pipes-courier"; version = "0.1.0.0"; - sha256 = "ee4992048b8d42de4c36aa223dee8eb74cd2cbca7ea17deb3acaac5f99a84bec"; + sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf"; libraryHaskellDepends = [ base courier pipes ]; homepage = "http://github.com/kvanberendonck/pipes-courier"; description = "Pipes utilities for interfacing with the courier message-passing framework"; @@ -138349,7 +147804,7 @@ self: { mkDerivation { pname = "pipes-csv"; version = "1.4.3"; - sha256 = "9485f5ddd56ec9bb10d26cdf2b5b67754726e36b167652b11cb0a42acbda68b3"; + sha256 = "1cv8vb5jm95h3jqm4xhndgijcivmcxdjppvcs88bpjbfspfzb1cl"; libraryHaskellDepends = [ base blaze-builder bytestring cassava pipes unordered-containers vector @@ -138368,7 +147823,7 @@ self: { mkDerivation { pname = "pipes-errors"; version = "0.3"; - sha256 = "e6586706e39cf93326a073c93e049a2abdfe7942d425e572601a813d346477ed"; + sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76"; libraryHaskellDepends = [ base errors pipes ]; homepage = "https://github.com/jdnavarro/pipes-errors"; description = "Integration between pipes and errors"; @@ -138385,7 +147840,7 @@ self: { mkDerivation { pname = "pipes-extra"; version = "0.2.0"; - sha256 = "d9ede8b4a837bdecf8fb4e87a1c0d31b5ded403d0e8d900a0e2ae9e493962b7b"; + sha256 = "0yrbjs9y9s9a1q59138f7m0fsp8vsg0a31sfzgwfrg9pm2sfivfr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138411,8 +147866,8 @@ self: { }: mkDerivation { pname = "pipes-extras"; - version = "1.0.8"; - sha256 = "4d0f7932212988b5e4c661238d66db316cd11bae15506a87d925ae058194d37b"; + version = "1.0.10"; + sha256 = "1an1ca8dbwnz7jsz0l9gyrzgibyhl46p855m3hzvy0jvhai0fz2j"; libraryHaskellDepends = [ base foldl pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -138428,7 +147883,7 @@ self: { mkDerivation { pname = "pipes-fastx"; version = "0.3.0.0"; - sha256 = "31264ba760bae1df3170a7d8da32f3e3fcb289545a33f369a94732e55e08ba75"; + sha256 = "0xds11gfacj7m5lz6cssaj4v5z73ycrdmn57f0qxzqdsc2kln9ii"; libraryHaskellDepends = [ attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring ]; @@ -138446,7 +147901,7 @@ self: { mkDerivation { pname = "pipes-files"; version = "0.1.2"; - sha256 = "7c76760998925020f912d0da9f67938bfdb96858b63771bd5c2696b0de1a4531"; + sha256 = "0ca53bgb15i6bjyp2dxnb1lbkzcbjdkrznnh2bwj0l4jk04pcxkw"; libraryHaskellDepends = [ attoparsec base bytestring directory exceptions filepath free hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths @@ -138473,7 +147928,7 @@ self: { mkDerivation { pname = "pipes-fluid"; version = "0.5.0.3"; - sha256 = "0d2ef03e16992ef96a4f5d15f1c6d566c7ea7d65eb87e9c64be081d8a60b2b39"; + sha256 = "0f9b1fkdi0g09g3fk1zbcmyymiv6sp3g25ax9xmgjblr2qzg0bhd"; libraryHaskellDepends = [ base constraints lens lifted-async monad-control pipes semigroups stm these transformers transformers-base @@ -138494,7 +147949,7 @@ self: { mkDerivation { pname = "pipes-group"; version = "1.0.6"; - sha256 = "07ad6f6ba7675b59aeb3be77171170da99a6f54e18b8d477d52f94b05e8ab766"; + sha256 = "0rmpi9gb151gsmvx9f0q9vssd6fsf08ifxxynfp5jnv7lxmnzb87"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -138510,7 +147965,7 @@ self: { mkDerivation { pname = "pipes-http"; version = "1.0.5"; - sha256 = "49a196466de1638f3806a49bf10fef9eb3c06456ababf09ffd025b6b64f23055"; + sha256 = "0m9hy9j6nnq2zngz1axbarjc1cwyxw7z36x40qw8yqz1dm39d8a9"; libraryHaskellDepends = [ base bytestring http-client http-client-tls pipes ]; @@ -138525,7 +147980,7 @@ self: { mkDerivation { pname = "pipes-illumina"; version = "0.1.0.0"; - sha256 = "76cba39a2276c7d6c0fb0b1036e87f5619edd6746760ea4848d1d6edf2cc46a7"; + sha256 = "19s6rkrfvmni914flq37fkbfs6angzl3c40bzg0ddivn4ada7jvn"; libraryHaskellDepends = [ base bytestring directory filepath pipes pipes-bgzf ]; @@ -138540,7 +147995,7 @@ self: { mkDerivation { pname = "pipes-interleave"; version = "1.1.1"; - sha256 = "2758429d9da110fcd8037d2db301813c5635c28e89c01e91c709663d090aef50"; + sha256 = "0l7g184ksrh9qy8ixh49iv13amiwh40v6bbx0gcgq451knfl4n17"; libraryHaskellDepends = [ base containers heaps pipes ]; homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; @@ -138553,9 +148008,9 @@ self: { mkDerivation { pname = "pipes-io"; version = "0.1"; - sha256 = "d9454a110860512ca6cf1d7c45f03c507d3bd05eaeba2ea798ed8167e416d499"; + sha256 = "16fl2vj6g0gdk2kjxfmfbv83nzah7kq4az0xryk2qlb0108llifr"; revision = "1"; - editedCabalFile = "7c94944e42ff4eb463759eac4238b9150c91c58ffc75240a826f89981b408702"; + editedCabalFile = "00l780dri2bgh8528xgwiz2r230mp4w45b4yfmiv8kpz8979953w"; libraryHaskellDepends = [ base pipes pipes-parse ]; testHaskellDepends = [ base hspec pipes ]; description = "Stateful IO streams based on pipes"; @@ -138572,7 +148027,7 @@ self: { mkDerivation { pname = "pipes-key-value-csv"; version = "0.4.0.2"; - sha256 = "3d2ecb1a9fc0a276aebdf626191def168df95de896d929f96bf9927658c4ef6c"; + sha256 = "0v7gqic7d4prdgwjkncnx1fzk38nxwfij9pnpnp7d8n0kwdcnbix"; libraryHaskellDepends = [ base bifunctors containers data-default-class lens mtl pipes pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text @@ -138594,8 +148049,8 @@ self: { }: mkDerivation { pname = "pipes-lines"; - version = "1.0.3.1"; - sha256 = "6781737f9686f4e53d48eabffe8079b3cc608a4603da98ebdb34d34bf24a1efc"; + version = "1.0.3.4"; + sha256 = "1bh8fpms2py4kf5c3nk05jnm08jyrad3077dr7a2dbc1l2d6xgs1"; libraryHaskellDepends = [ base bytestring pipes pipes-group text ]; testHaskellDepends = [ base bytestring lens mtl pipes pipes-group QuickCheck @@ -138611,8 +148066,8 @@ self: { }: mkDerivation { pname = "pipes-lzma"; - version = "0.1.1.0"; - sha256 = "8d5af5806d20ac9b8e0b416a0c36cb6b8039ac55c0cb2831252a8f6c75da01f2"; + version = "0.1.1.1"; + sha256 = "09ndjxrfh55269gjpm61h65bk0xcv46dah8i0svxcdq4myc8d9r4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring lzma pipes ]; @@ -138634,7 +148089,7 @@ self: { mkDerivation { pname = "pipes-misc"; version = "0.2.5.0"; - sha256 = "69cf964dcc21efcf74a30e2bf792405019fb0b0ab22130ca806f7907f1ed3669"; + sha256 = "0s9nxpqhfybgh35308dj185zn6ah829gfaqfldsczvr1ri6rdkv9"; libraryHaskellDepends = [ base clock Decimal lens mmorph mtl pipes pipes-category pipes-concurrency semigroups stm transformers @@ -138655,7 +148110,7 @@ self: { mkDerivation { pname = "pipes-misc"; version = "0.3.0.0"; - sha256 = "1d204e4b329c0d44eca63ccaeaae74e2ea4e95a2934d81de9de0e09906f061f9"; + sha256 = "1yb1y039kq70kpg82kcklaalxsp2fjpfmjiwlvn483cw695lw80x"; libraryHaskellDepends = [ base clock Decimal lens mmorph mtl pipes pipes-category pipes-concurrency semigroups stm transformers @@ -138674,7 +148129,7 @@ self: { mkDerivation { pname = "pipes-mongodb"; version = "0.1.0.0"; - sha256 = "0821194bdf7f377beeb20fc8f697ed5388a221b6e8e42c513eea67a91c198340"; + sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888"; libraryHaskellDepends = [ base monad-control mongoDB pipes ]; testHaskellDepends = [ base monad-control mongoDB pipes text ]; homepage = "http://github.com/jb55/pipes-mongodb"; @@ -138690,9 +148145,9 @@ self: { mkDerivation { pname = "pipes-network"; version = "0.6.4.1"; - sha256 = "a8624aec78e2d2a814956d6759a8d3e18811a82d245480f0404fe408f951a0af"; + sha256 = "1bx0a7whir2g83q80m145nl13271sfl5jrvdjlaailp2g3n4lqm8"; revision = "1"; - editedCabalFile = "304e9345c02354da6a7a559e335531bffcd3e6c333b36ccc3c5d4123f5f7f144"; + editedCabalFile = "0i7iyzsj6hax7k66rcrkqgkd7z5z65ak77jmg9mdlm13q12r6kih"; libraryHaskellDepends = [ base bytestring network network-simple pipes pipes-safe transformers @@ -138710,7 +148165,7 @@ self: { mkDerivation { pname = "pipes-network-tls"; version = "0.2.1"; - sha256 = "0cb66f74c14478dc62531677e6316fb086116127a9a8ab6a414dab3df4087c4c"; + sha256 = "0k3w13s3vasd85mapa594xhi31mhdwqycxqnadidqy24q5s6zdhc"; libraryHaskellDepends = [ base bytestring network network-simple network-simple-tls pipes pipes-network pipes-safe tls transformers @@ -138729,7 +148184,7 @@ self: { mkDerivation { pname = "pipes-p2p"; version = "0.4"; - sha256 = "cc7260b39163c3971575b57b11747637c7150995c7cf4abcaf2b2af06d4b48d3"; + sha256 = "1ls89dnz0aibmyy4mky7jl4ibirpfrs12yxmflarghv3j6rn0wnc"; libraryHaskellDepends = [ async base binary bytestring errors exceptions mtl network network-simple-sockaddr pipes pipes-concurrency pipes-network @@ -138747,7 +148202,7 @@ self: { mkDerivation { pname = "pipes-p2p-examples"; version = "0.3"; - sha256 = "95737ad1ecd18ed9dea25ed551668b31fd3bb4974e533c7e45b9665f0098cd21"; + sha256 = "08fdk005yrmr8mz3qlsfjys3pz9iidk53maylbgdk3nixk8plwwm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -138765,7 +148220,7 @@ self: { mkDerivation { pname = "pipes-parse"; version = "3.0.8"; - sha256 = "d28f831b2c8229cca567ee95570787d2dd3f5cfcff3b3c44ee308360a8c107a9"; + sha256 = "1a87q6l610rhxr23qfzzzif3zpfjhw3mg5gfcyjwqac25hdq73yj"; libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; @@ -138779,7 +148234,7 @@ self: { mkDerivation { pname = "pipes-postgresql-simple"; version = "0.1.3.0"; - sha256 = "53de5231df1c0591e9dbd3b989a4075e45fa2a493adce060b53b8e741dbae688"; + sha256 = "1276p8fp93ivnmhf1p1s94mgliay0yj8kffkvglr218wvwqm5pjk"; libraryHaskellDepends = [ async base bytestring exceptions mtl pipes pipes-concurrency pipes-safe postgresql-simple stm text transformers @@ -138796,7 +148251,7 @@ self: { mkDerivation { pname = "pipes-protolude"; version = "0.1.0.1"; - sha256 = "7f3d93fb093250f6d85c7e9262bd243c6966451ed867fe204af3fe0b56abea73"; + sha256 = "0wzamdb0pzpk98hgwryq3r2ncs9w4jyn54kybkcgcl1j17xr6gbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138817,7 +148272,7 @@ self: { mkDerivation { pname = "pipes-random"; version = "1.0.0.3"; - sha256 = "729c3359e4f76048b0a9c656e4739c369619b8abce546a741f8d55e2a7b31193"; + sha256 = "14qinfky4mcd3xs6lm6fmfw1k5inkiry8mn6m6q4hq7pwick773j"; libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; @@ -138828,7 +148283,7 @@ self: { mkDerivation { pname = "pipes-rt"; version = "0.5.0"; - sha256 = "d930d70ef13bf77f92f6575edc9e371335b1cfc4ab56b527e8ca3c8568e48ff2"; + sha256 = "1wlgwil8ag6ax0kvammbqk7v2d8k6ygdqpjpys97zxrvy47dfc6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mwc-random pipes time ]; @@ -138848,9 +148303,9 @@ self: { mkDerivation { pname = "pipes-s3"; version = "0.3.0.2"; - sha256 = "fd89bb1af54af172c2b4fb2c75782a1cbf8ff7778fbb40da1bc2d2e3ec2fa4e7"; + sha256 = "1rx45znf7ln23gd41fwgfzvqzgqw59w7ab7vnk175waayldbp2gx"; revision = "1"; - editedCabalFile = "3ea6a4e25482c09ecd13270fc8c6c85340f803990f6dc72e8e4d9a5982ab2b70"; + editedCabalFile = "0w1bmf15k6jdiqpcfv8gk41zhh2kr33ch3r72g6rxh42akia99iy"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -138872,7 +148327,7 @@ self: { mkDerivation { pname = "pipes-safe"; version = "2.2.5"; - sha256 = "0242cfe67853dc5bd94c979b06da25423d8bf96c3b095f4d33b745c78605a67c"; + sha256 = "0z560n3cfidp6d6my29vdkwqnga24pd0d6wp9kcmpp2kg3kcyhh2"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes transformers transformers-base @@ -138888,7 +148343,7 @@ self: { mkDerivation { pname = "pipes-shell"; version = "0.1.4"; - sha256 = "05d31328239853915e18020e952c487cb9edf8027d52ad81f284930339d3ada4"; + sha256 = "195dscwh74w4ya0sslkx0bwfvfbw90n9a3h231g92lwq4cl17lq5"; libraryHaskellDepends = [ async base bytestring pipes pipes-bytestring pipes-safe process stm stm-chans text @@ -138907,7 +148362,7 @@ self: { mkDerivation { pname = "pipes-sqlite-simple"; version = "0.2"; - sha256 = "9835f4f06e2f8c9e62d628533efef22234a9aa83298f369c3669d2a96726cf2f"; + sha256 = "0byg4rksklk96sf3d3r9hfmajd12ybz3wlr8sri9x31gdvqg8dcq"; libraryHaskellDepends = [ base pipes pipes-safe sqlite-simple text ]; @@ -138924,7 +148379,7 @@ self: { mkDerivation { pname = "pipes-text"; version = "0.0.2.5"; - sha256 = "4489ee02a8ebfd87049fc4dd1380b21e6f33984eb0101c836ab8e054759c0f2a"; + sha256 = "0ahgkism9q5qda1iq45h9sc36vqyna017pf4kw28gzgbm01fx2a4"; libraryHaskellDepends = [ base bytestring pipes pipes-bytestring pipes-group pipes-parse pipes-safe streaming-commons text transformers @@ -138943,7 +148398,7 @@ self: { mkDerivation { pname = "pipes-transduce"; version = "0.4"; - sha256 = "984d8cf42d3614e87e2bd2178bbe04237d83b9385b3b39df32e2f8bc0e972c4f"; + sha256 = "0krcjw7bry726bgkjfsv72wq6z930jz8n5yj5dzfh51n5ps8qkcq"; libraryHaskellDepends = [ base bifunctors bytestring conceit foldl free microlens pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse @@ -138963,7 +148418,7 @@ self: { mkDerivation { pname = "pipes-vector"; version = "0.6.2"; - sha256 = "960b6d75cbf53dffb1da6d1e570fd6eed6f5bc4a18418ab814d9be0eb55ed186"; + sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn"; libraryHaskellDepends = [ base monad-primitive pipes primitive transformers vector ]; @@ -138978,7 +148433,7 @@ self: { mkDerivation { pname = "pipes-wai"; version = "3.2.0"; - sha256 = "04a670df140c12b64f6f0d04b3c5571527f144ee429e7030bb62ec8785056d2a"; + sha256 = "0akd0n2qgv32pcq717j2xr2g29qmaz2v610ddx7vc4hc2kgp19h4"; libraryHaskellDepends = [ base blaze-builder bytestring http-types pipes transformers wai ]; @@ -138994,7 +148449,7 @@ self: { mkDerivation { pname = "pipes-websockets"; version = "0.1.0.0"; - sha256 = "b86dcf98d0536c7d6830b64a84d14a89aaa68659abd715b5891e98975de9bac2"; + sha256 = "1hmsx5frg60yi6sibmxbb63adal99b8q8jmn61l7sv2ks2ccyvdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139012,8 +148467,8 @@ self: { }: mkDerivation { pname = "pipes-zeromq4"; - version = "0.2.0.0"; - sha256 = "24f3ae9640eb6e2180edb8e0fc12bc420c7fa83aa32605900de1d961d93e92fe"; + version = "0.3.0.0"; + sha256 = "178k23kqhsvz4km3jp58mfh5qcawsxc4xs38w1cb4iana9bz6zjp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139033,7 +148488,7 @@ self: { mkDerivation { pname = "pipes-zlib"; version = "0.4.4.1"; - sha256 = "8fac1e12a651bfbbddf0395401d712bcceda156f5aad1a263b650200c682bde9"; + sha256 = "1sdxhb3000k57ck1mbasdwaxmkmw2bbh2m1ry3fvpgsilq91xb4g"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -139054,7 +148509,7 @@ self: { mkDerivation { pname = "pisigma"; version = "0.2.1"; - sha256 = "bf93645e6f28c9b4c8ff6f7b4d18aace862bd6a19f8a1cd1d8ec78f4a063e4d7"; + sha256 = "1mz4cfhg8y7cv38ir2lzl7b2p1nfm8c4syvgzz4b9j98dxg694xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139074,7 +148529,7 @@ self: { mkDerivation { pname = "pit"; version = "0.3.1"; - sha256 = "173d97df8161007ca7da65dd60765c3aaf211b90f0117c89ceb86c34fb851983"; + sha256 = "10qrhpxk8v5qrs4pq4ghj0dj3brsbiv61pb5vakpq031h7grfg8p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139097,7 +148552,7 @@ self: { mkDerivation { pname = "pitchtrack"; version = "0.1.0.1"; - sha256 = "17407f7ab1723fdbebbc7c727391d3177e6d5f568b4b129a17640525bac40200"; + sha256 = "0002qjx2a1b42yd14jwbargnszhpsf8p6wkwpkmxngvjn5x7yh0p"; libraryHaskellDepends = [ base bytestring dywapitchtrack pipes pipes-bytestring process transformers @@ -139118,7 +148573,7 @@ self: { mkDerivation { pname = "pivotal-tracker"; version = "0.1.0.1"; - sha256 = "e9686d2d3537cbe53e1196724d1c55334ce0de02fe4d3e6678fff1fdf3a7ff46"; + sha256 = "0ipzlzrzvwgzg1k3wkgy0bgf0k1kalf4swln24zfbjrp6lnnss79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139140,7 +148595,7 @@ self: { mkDerivation { pname = "pixelated-avatar-generator"; version = "0.1.3"; - sha256 = "4d7d87404121f5481faa7d6af087575a9541aaad96b196ec230d1883a563a078"; + sha256 = "0y50cfjq660d4gn9dccnmnm435asay3z0skxm8glix918508fzad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139153,6 +148608,7 @@ self: { homepage = "https://github.com/ExcaliburZero/pixelated-avatar-generator"; description = "A library and application for generating pixelated avatars"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkcs1" = callPackage @@ -139160,7 +148616,7 @@ self: { mkDerivation { pname = "pkcs1"; version = "1.0.2"; - sha256 = "c918a00c72fd244d80556b4eeec4047c9c4ba67c39e48891f96357938d7c2895"; + sha256 = "1598gj6r6mv3z68qir1rgjk4p73w0k2fwkkban04s97xf86a0669"; libraryHaskellDepends = [ base bytestring random ]; homepage = "http://sep07.mroot.net/"; description = "RSA encryption with PKCS1 padding"; @@ -139175,7 +148631,7 @@ self: { mkDerivation { pname = "pkcs10"; version = "0.2.0.0"; - sha256 = "896e923f67bac4c7f0e48c9afca60f9ef5178e00fca9f179e8fdae3c12476294"; + sha256 = "15328w93rbpxx1wz3agw0271gxcy1ykgr6lcwkqcgi5scwzr4vl9"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem x509 @@ -139194,7 +148650,7 @@ self: { mkDerivation { pname = "pkcs7"; version = "1.0.0.1"; - sha256 = "a22c63e56ca355df2075689753381f61cdfaf215e73755f55589b09a93bf9044"; + sha256 = "0i4hpy9rmc49apsmadz72prgmkb13ww575v8flhdymd3dkjn6b52"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ]; homepage = "https://github.com/kisom/pkcs7"; @@ -139207,7 +148663,7 @@ self: { mkDerivation { pname = "pkggraph"; version = "0.1"; - sha256 = "dfcd7fff0981df289e58bbaa82e4f4dc5cf30eebbe8aab3399e715f340a43505"; + sha256 = "019mli0g65g7k4rsp2myxc7g6p6wykj85amvb2g2ipw117zpzkfz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal split ]; @@ -139221,7 +148677,7 @@ self: { mkDerivation { pname = "pktree"; version = "0.2"; - sha256 = "0c98043079c2743133c1ab5a8231f829b7889de73de91611ae0af73cc3d34d9c"; + sha256 = "172dsg1krxqamq8ids9xwyfqidr9z0qq4nmbq4rk2x62g4q0960c"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/singpolyma/pktree-haskell"; description = "Implementation of the PKTree spatial index data structure"; @@ -139233,7 +148689,7 @@ self: { mkDerivation { pname = "placeholders"; version = "0.1"; - sha256 = "652a78553dcaf6e11b4cd8f0e60010b32da299fbe57721df4bf9157e852d0346"; + sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/ahammar/placeholders"; description = "Placeholders for use while developing Haskell code"; @@ -139245,7 +148701,7 @@ self: { mkDerivation { pname = "plailude"; version = "0.6.0"; - sha256 = "31083b4d1442000e0964d2b198942d61f9ce40726c593cf66901b171c19f188e"; + sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i"; libraryHaskellDepends = [ base bytestring mtl time unix ]; homepage = "https://secure.plaimi.net/works/plailude"; description = "plaimi's prelude"; @@ -139260,7 +148716,7 @@ self: { mkDerivation { pname = "plan-applicative"; version = "2.0.0.1"; - sha256 = "f350d72c315617d57f0747a108ab99f20daf6c960f80b7025687bf9fd5a9d758"; + sha256 = "0n6pm7arzgw7aq1bg00gjrnay3gjk6mhi8a70xzxa5sn64ndfl7k"; libraryHaskellDepends = [ base bifunctors comonad containers profunctors streaming transformers @@ -139279,8 +148735,10 @@ self: { }: mkDerivation { pname = "plan-b"; - version = "0.2.0"; - sha256 = "f1654b249a0ee36a5a6ed1a85d2ab4641405d9b28ebe57ded594b7c65180c769"; + version = "0.2.1"; + sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv"; + revision = "1"; + editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh"; libraryHaskellDepends = [ base exceptions path path-io transformers ]; @@ -139297,7 +148755,7 @@ self: { mkDerivation { pname = "planar-graph"; version = "1.0.0.0"; - sha256 = "37c6625eb40c5e7023417c74d2429a1a12f9b075780365a005a5fac99109eab0"; + sha256 = "1c7a168wkym50nh6a0vqfnqgj4hsk91d4x3w84ip0phcnig65iip"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers data-clist deepseq @@ -139312,7 +148770,7 @@ self: { mkDerivation { pname = "plat"; version = "0.1.0.1"; - sha256 = "0d27e0a1c845df818fd9f0e2443f198861d3fe5bc7858ae4c647e7ef85735e1b"; + sha256 = "06syff2yzrs7qvj8m1f7bgzd6qc834zl9qphv67q3ps5r2hy09qd"; libraryHaskellDepends = [ base bytestring containers mtl utf8-string ]; @@ -139328,7 +148786,7 @@ self: { mkDerivation { pname = "playlists"; version = "0.4.1.0"; - sha256 = "707fca5b28fae465b30300d4a52c6e89a1e39ae886f9737121604b7c2f7b8c3a"; + sha256 = "0flcgcppqjv045qp7yc6x2df78c9dqnabm000frnbr7s51dwlzvh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139353,7 +148811,7 @@ self: { mkDerivation { pname = "playlists-http"; version = "0.1.1.0"; - sha256 = "2f5eaeba301115124529aeb72c8608838911209ab9a5830f705214c32dbb26cb"; + sha256 = "1jr6pcnw652jf07q79drk8h132c31232rdxf552i458i62xawpig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139370,7 +148828,7 @@ self: { mkDerivation { pname = "plist"; version = "0.0.6"; - sha256 = "ebe594efb0327e451d6336a0f8993b9914906eca5147aef76dd1634bf70d5d77"; + sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb"; libraryHaskellDepends = [ base base64-bytestring bytestring hxt ]; description = "Generate and parse Mac OS X property list format"; license = stdenv.lib.licenses.bsd3; @@ -139384,9 +148842,9 @@ self: { mkDerivation { pname = "plist-buddy"; version = "0.1.0.0"; - sha256 = "481cb13bacb3a0e5a9eee75bd78b793b30b048140d3d7a19eabc9ef6b33cc774"; + sha256 = "0x677jrzd7mwx8cplg8d2i4b0c1vg65xfnz7xslyb85kmhxv2728"; revision = "2"; - editedCabalFile = "91011692ad8ca1dd4ef73d3960807be1e9f6f422f0befb850bd575603c1ceee0"; + editedCabalFile = "1q7f3hy60xfm1f2zpgph4bsgdsg1gf060f9xyx7dv8ccmn91c0ci"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring cryptohash directory mtl posix-pty process text time xml @@ -139408,9 +148866,9 @@ self: { mkDerivation { pname = "plivo"; version = "0.2.0.0"; - sha256 = "e0e6ae8a8b62eb7ab62ba55c9e7408f8a12fc00c568bf867bd0af6bf2c97069b"; + sha256 = "16q6jwnbzxhapmkzi2sn1k02z8gq11s9wp555fv7msv2if5axrp0"; revision = "1"; - editedCabalFile = "7ef78cd34067e8d72872b32bcad9d01537710c11efce159c990aeb4670e4efb3"; + editedCabalFile = "1czgwiq4dsqak6f1bkpg24672dqms3cwlaxkf8ldgs37839qrxvy"; libraryHaskellDepends = [ aeson base blaze-builder bytestring errors http-streams http-types io-streams network-uri old-locale time unexceptionalio @@ -139421,14 +148879,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "plocketed" = callPackage + ({ mkDerivation, base, optparse-applicative, socketed }: + mkDerivation { + pname = "plocketed"; + version = "0.1.0.1"; + sha256 = "0vmbs6fbvrf3pk66ag8lbvybdkbwvvzfp390hbw5vca9adbchqqg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base optparse-applicative socketed ]; + description = "plot data from stdin through socketed"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "plot" = callPackage ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango , transformers }: mkDerivation { pname = "plot"; - version = "0.2.3.6"; - sha256 = "ad606de1d746f26cea36f1818209adab83bb32bf46b562465930f64c975afdfd"; + version = "0.2.3.7"; + sha256 = "192pjxpdnfrzjb6n8swkcd5f5nv3vvj7kc110v002akcgkii31li"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; @@ -139442,7 +148914,7 @@ self: { mkDerivation { pname = "plot-gtk"; version = "0.2.0.4"; - sha256 = "9c0a445162ae66c2badd8b6b0a760f5ee4ac4861852764eb4a550787de2c07bb"; + sha256 = "1fq75kg8f1sm9bmn89w5c54arr2y1xv0lswbvnxc4rmfc98l82lw"; libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ]; homepage = "http://code.haskell.org/plot"; description = "GTK plots and interaction with GHCi"; @@ -139456,7 +148928,7 @@ self: { mkDerivation { pname = "plot-gtk-ui"; version = "0.3.0.2"; - sha256 = "e7e89440798058ef082dc268795a482b9462d21ff08336bb8517b6830c0518da"; + sha256 = "1nhq0l687dhphnxkd0zh3z96551b91d7js625l4fyn40g5099s77"; libraryHaskellDepends = [ base cairo colour fixed-vector gtk hmatrix plot text vector ]; @@ -139471,7 +148943,7 @@ self: { mkDerivation { pname = "plot-gtk3"; version = "0.1.0.2"; - sha256 = "79098174d2a1bf5f715bc6b68bf0086036603d77a6c55cc95babc201355dd1d9"; + sha256 = "1nfiblsh3hmbbg4mrid6fwyn0dk013q8pdn6bdqmzgx1s9s822br"; libraryHaskellDepends = [ base glib gtk3 hmatrix mtl plot process ]; @@ -139485,7 +148957,7 @@ self: { mkDerivation { pname = "plot-lab"; version = "0.0.1.9"; - sha256 = "9855b4d2c239b3d69c2b1c315066443bf1b4247a3f57fdf7faa5169970af45e1"; + sha256 = "1qa5mxq9j5m5zbvzsmrzg8jb9w9v8ik50c8w5ffddcrrqb9b8mcq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -139497,12 +148969,35 @@ 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 { pname = "plotfont"; version = "0.1.0.1"; - sha256 = "63f09f22e05a1d9119baaecfd5c9db9580b756430d050953fe348d6e28a80fcb"; + sha256 = "1jqgm0l6x39lzr9hj18d8dbbg04mvg4xbkxfp8cr27asw0i9zw33"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Plotter-like fonts i.e. a series of straight lines which make letter shapes."; @@ -139515,20 +149010,33 @@ self: { }: mkDerivation { pname = "plotlyhs"; - version = "0.1.0"; - sha256 = "445bc874f9edef177830e39968ac487bfd156702750c74f287ed6387a07b5f5b"; - isLibrary = true; - isExecutable = true; + version = "0.2"; + sha256 = "0n9jwp8j201mw29vagbz6f2jn8hbm46pfay5glsnf8p9nd309yw5"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring lucid microlens microlens-th text ]; - executableHaskellDepends = [ aeson base lucid microlens text ]; - homepage = "https://github.com/glutamate/plotlyhs"; + homepage = "https://github.com/filopodia/open/plotlyhs"; description = "Haskell bindings to Plotly.js"; 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 @@ -139540,9 +149048,9 @@ self: { mkDerivation { pname = "plots"; version = "0.1.0.2"; - sha256 = "e5c1a5f858f2bbfb531d5d0af6a070ff8fa2bd936b3a4c30b6ca65838c16b64d"; + sha256 = "0kdn2s686rfanqq4qfkbjfys53zzf2hgc2jx3m9zpfzjb3wabhg5"; revision = "1"; - editedCabalFile = "3d45b5b973339a50d0686153d77b0f1e438c1a890e75c2274830e878e9fd78d8"; + editedCabalFile = "1n3qzplpis1h90kw4x8fi4d8qhqy1xxxflv1d38516ikffwvai9x"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -139560,7 +149068,7 @@ self: { mkDerivation { pname = "plotserver-api"; version = "0.22"; - sha256 = "7d68e2686f8fb9f80a7da12cf57bce11cc9ac23f306263fa523234db121b799f"; + sha256 = "17vr3c9dnd1jabx66qih7z19mk0irrxzab51gl5gifcgdxlf4s3x"; libraryHaskellDepends = [ base curl split ]; description = "Plotserver API"; license = stdenv.lib.licenses.mit; @@ -139573,7 +149081,9 @@ self: { mkDerivation { pname = "plugins"; version = "1.5.6.0"; - sha256 = "18d17e53eb9068f7da3fe26b45af8d76a7e76645f7ec59f81552e3486c8a80d0"; + sha256 = "1l40i9n4iqsj2pw5kv7p8mkfg9vninplasz27zdgfs4hxd9pxl8q"; + revision = "1"; + editedCabalFile = "0l4sx1d9lgs6yr23dq4ccz1la9i94cz4nfvpdkpr5wni40mzl2m3"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random @@ -139591,7 +149101,7 @@ self: { mkDerivation { pname = "plugins-auto"; version = "0.0.4"; - sha256 = "c4435da42a036841b8b31b6408f881975033be9b309aca51312b9f56484b2abe"; + sha256 = "1gia9d45d7rb658wm6ihkfz36l4ph7w0hr0vnfw42s035aj5shy4"; libraryHaskellDepends = [ base containers filepath hinotify mtl plugins template-haskell ]; @@ -139608,7 +149118,7 @@ self: { mkDerivation { pname = "plugins-multistage"; version = "0.6.1"; - sha256 = "58b191e351aa5206cfd477cff698a4d8427982602c9d88629dfca59cae5c914f"; + sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq"; libraryHaskellDepends = [ base directory ghc process template-haskell th-desugar ]; @@ -139625,7 +149135,7 @@ self: { mkDerivation { pname = "plumbers"; version = "0.0.3"; - sha256 = "09575ecd8fd1754d91aefa8ed717e2921276f363be58407f509377288f403cbf"; + sha256 = "1grw827jhxwka1zl0n5ycgrpc4ljw8bxg3psms8lsxfiiz6mwmq9"; libraryHaskellDepends = [ base template-haskell ]; description = "Pointless plumbing combinators"; license = stdenv.lib.licenses.bsd3; @@ -139639,7 +149149,7 @@ self: { mkDerivation { pname = "ply-loader"; version = "0.5.0"; - sha256 = "70f93a7043531b095f2762fe819ae2ae26a1913c071f179f3e4e936d9223db6f"; + sha256 = "0vyv4f96v4sf7sgif7q77j8s29mfwad83zk24xghj6sk8dq3mybh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139659,7 +149169,7 @@ self: { mkDerivation { pname = "png-file"; version = "0.0.1.3"; - sha256 = "467be3c535e0d7fd1a26cd287c1b335d22c3aa68263578b642b28e190146b2c1"; + sha256 = "1hdj8q0ik3mj8av7hd96d2mc68jx6cdpqa6d4qdgvmz06p2y6ys6"; libraryHaskellDepends = [ array base binary-file bytestring monads-tf template-haskell zlib ]; @@ -139676,7 +149186,7 @@ self: { mkDerivation { pname = "pngload"; version = "0.1"; - sha256 = "fa1aafcf54f87a70e0f92803f77dbec28720ac651ce480f7d564b15ee2531fc9"; + sha256 = "1j8zagi5xcb4spvq1r0wcnn211y2pryzf0r8z7h70ypqak7sy6ps"; libraryHaskellDepends = [ array base bytestring haskell98 mtl parsec zlib ]; @@ -139690,7 +149200,7 @@ self: { mkDerivation { pname = "pngload-fixed"; version = "1.0"; - sha256 = "7d9ddcb918e536c758b62461951ec3e5b0f08305fb0ae55c2c5d223a8f75330a"; + sha256 = "02ikfn7kl8jx5iffa2pv0n1z1c75qcg9aq94nrccfdp532wxr7bx"; libraryHaskellDepends = [ array base bytestring mtl parsec zlib ]; description = "Pure Haskell loader for PNG images"; license = stdenv.lib.licenses.bsd3; @@ -139702,7 +149212,7 @@ self: { mkDerivation { pname = "pnm"; version = "0.1.0.0"; - sha256 = "dc0bb9b0eede26d88484bfde4460fc09f7be649379e807c6accc0c6636d6dc40"; + sha256 = "0h6wsqv6c36cmk30gs3rjdjbxxq9zih49pmzhj2dh9nyxsqbj2yw"; libraryHaskellDepends = [ base bytestring ]; description = "PNM image format header parsing and pretty printing"; license = stdenv.lib.licenses.bsd3; @@ -139715,7 +149225,7 @@ self: { mkDerivation { pname = "pocket"; version = "0.2.0"; - sha256 = "5f9c76f99aacd6a9daf2075daf989af8387c76e411f91b36073ebca2d204d6b9"; + sha256 = "1ffn0k9a5g1y0wv1py8iwiv7qf7qkacayp87ybdakmmckbwpd72z"; libraryHaskellDepends = [ aeson base http-client http-client-tls servant servant-client text transformers @@ -139737,7 +149247,7 @@ self: { mkDerivation { pname = "pocket-dns"; version = "0.1.1"; - sha256 = "5063e5cabd13684631933ad9eafeabd3c6a454a9897dde5bcdea496a8c7c669c"; + sha256 = "1736gj66ljgarmdxwzc9m5aa9inkmgzfmn9sjcqlcs0kpp5faqsh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139768,7 +149278,7 @@ self: { mkDerivation { pname = "point-octree"; version = "0.5.5.3"; - sha256 = "15fc7047520cd25a119029057f467a3956641b76978041afb7470ed638750552"; + sha256 = "0lh5flwdc3j7nypl304pfqdn8mirg937y199j08mmlhca93p1z0m"; libraryHaskellDepends = [ AC-Vector base QuickCheck ]; testHaskellDepends = [ AC-Vector base hspec markdown-unlit QuickCheck random @@ -139788,9 +149298,9 @@ self: { mkDerivation { pname = "pointed"; version = "5"; - sha256 = "8906b8af5125ab3376794a290c5484dbec5a35d0bd0a57e94392ec0e12535d17"; + sha256 = "05sxac90xv4j8glmf2mxs0smmv6vhia0qaaag5v37ar5a6pvh1l9"; revision = "1"; - editedCabalFile = "f7ffc79d82f02a4229dbe175571f522de14fc52f0973fcff39906132bac20f9c"; + editedCabalFile = "170gqax34qch77zzqwq95z2lzq9da8gmfxg1vcll4aphhafwgzzp"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -139806,7 +149316,7 @@ self: { mkDerivation { pname = "pointedalternative"; version = "0.1.0.0"; - sha256 = "0a3af9212ef30c9ce000f6089b2ef9cfdc68f78d138ddeba04f404fa2040838a"; + sha256 = "12l380hgl17l0jxdx38kipvnip6gz4p9n27n03h9q37k5qhzjfha"; libraryHaskellDepends = [ base mtl semigroups transformers ]; homepage = "http://ircbrowse.net/browse/haskell?q=manyLazy"; description = "Alternative done right"; @@ -139818,7 +149328,7 @@ self: { mkDerivation { pname = "pointedlist"; version = "0.6.1"; - sha256 = "743cb0f89cbb128f8aa24c4519b262b561bf2cd607f83e94f9241e8af1cfba9b"; + sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l"; libraryHaskellDepends = [ base binary ]; description = "A zipper-like comonad which works as a list, tracking a position"; license = stdenv.lib.licenses.bsd3; @@ -139830,8 +149340,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.2"; - sha256 = "5d398b4769b47918df05ef5693c182fb5d070f75414e65e7110b98f1328ba92b"; + version = "1.1.1.3"; + sha256 = "0mnyh32d4fzcq9g1vsj8r04pacxvf8xx62rkkaha37rhp966f4mj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139855,9 +149365,9 @@ self: { mkDerivation { pname = "pointful"; version = "1.0.9"; - sha256 = "6a1881236419751beb5b2e4e495bd9093ea2dec3f3cbd44e2a62aaabe53cacd6"; + sha256 = "1mmc7kjspak2597d9jzkqgga4gh9v5dljkifbgminx8rchiq263a"; revision = "1"; - editedCabalFile = "5a0ac6eb52c232cca59759b25a34eff0d89f614332b088baaa8b11e27fb19c8e"; + editedCabalFile = "13lwn5zy44cbmax8ic1j8dhrzn7hxws5mcjrjyjwqcn2abmwc2js"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139874,7 +149384,7 @@ self: { mkDerivation { pname = "pointless-fun"; version = "1.1.0.6"; - sha256 = "d05c59dac408a81766d676da2fb98025e75e0c3d0a07bdb458759d5c41e3b054"; + sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Some common point-free combinators"; @@ -139886,7 +149396,7 @@ self: { mkDerivation { pname = "pointless-haskell"; version = "0.0.9"; - sha256 = "dde39a8cd4964490e32dbfaa88be442d690ef5d7138ad61bb32a44df4cb30b38"; + sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx"; libraryHaskellDepends = [ base GHood process syb ]; homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Haskell"; description = "Pointless Haskell library"; @@ -139900,7 +149410,7 @@ self: { mkDerivation { pname = "pointless-lenses"; version = "0.0.9"; - sha256 = "0b680789e5c0b25ef07942d0514c7519897bbdf23f19ac2b7897669bfae209fc"; + sha256 = "1z09wbx9nrlpg0msq69zyaypp28rfm653l22g7q5xcn0wn4hfs0b"; libraryHaskellDepends = [ base containers derive pointless-haskell process QuickCheck ]; @@ -139917,7 +149427,7 @@ self: { mkDerivation { pname = "pointless-rewrite"; version = "0.0.3"; - sha256 = "16b8e1ea165c22f1a025c249fb5f4ec096b50f5e9492f48688fe978bf83b8335"; + sha256 = "0dc37gw8p5zyi23g94llbq7vb5n09rgznjf24nhg28jw2vmf3f0n"; libraryHaskellDepends = [ base containers mtl pointless-haskell pointless-lenses process ]; @@ -139933,7 +149443,7 @@ self: { mkDerivation { pname = "pokemon-go-protobuf-types"; version = "0.1.2"; - sha256 = "141b68926bb890137e258c7c689d2e010a9137a41675bec4257a4fd55a0bd22c"; + sha256 = "0b6j1dddakvs4p2bwx8nlhvr22h15sfnhz4c4mz1745qdf96h6ql"; libraryHaskellDepends = [ base bytestring containers data-default-class lens-family proto-lens text @@ -139949,7 +149459,7 @@ self: { mkDerivation { pname = "poker-eval"; version = "0.3.1"; - sha256 = "3bc3e82be000adea7a6d779b4d08fb0d9589e57cd12578d69031f06b65d2316c"; + sha256 = "0v1is9jnpw1ij3b7h9figkjqk58dzc44v6vpdmxfmb80w0myihrv"; libraryHaskellDepends = [ array base mtl random vector ]; librarySystemDepends = [ poker-eval ]; description = "Binding to libpoker-eval"; @@ -139964,7 +149474,7 @@ self: { mkDerivation { pname = "pokitdok"; version = "4.1.0.2"; - sha256 = "3cc85d3ef6cce75b57208c5a6a5689032a1a913af9b21d689c30c274ecb2f322"; + sha256 = "08pknbn79hihkil1vcpr7a8ilah3i5b6lnlc41bmprycyqz5vj1w"; libraryHaskellDepends = [ aeson base base64-string bytestring case-insensitive directory hex HTTP http-client http-conduit http-types strict text time @@ -139980,7 +149490,7 @@ self: { mkDerivation { pname = "polar"; version = "0.0.1"; - sha256 = "70ce94da46b0eee4c9f9d3966f39165c8707bc7299930e7e517d9fc2fab50ab8"; + sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh"; libraryHaskellDepends = [ base ]; homepage = "http://space.k-hornz.de/polar"; description = "Complex numbers in polar form"; @@ -139992,7 +149502,7 @@ self: { mkDerivation { pname = "polar-configfile"; version = "0.5.0.0"; - sha256 = "385a2c0e2aa39865f161cfd8cf0b77a6b5d7b126c08ceaf33dc08ce817ffa9fb"; + sha256 = "1yx9zwbyi3607prym3604sqxgdd6fw5wzn6gc7qnb6535872qniq"; libraryHaskellDepends = [ base containers mtl parsec ]; testHaskellDepends = [ base containers HUnit MissingH mtl parsec ]; description = "Fork of ConfigFile for Polar Game Engine"; @@ -140005,7 +149515,7 @@ self: { mkDerivation { pname = "polar-shader"; version = "0.3.0.0"; - sha256 = "426c5bb67fdb5be0e648678fa9d03800e714d5f89123b93d72fb8c7b7c01af24"; + sha256 = "095g05y7p37vf8yvj8wiz3ai9rq0738ak3v793kf0nyvgyv5nv22"; libraryHaskellDepends = [ base containers lens mtl ]; testHaskellDepends = [ base containers hspec ]; description = "High-level shader compiler framework"; @@ -140020,7 +149530,7 @@ self: { mkDerivation { pname = "polh-lexicon"; version = "0.2.2"; - sha256 = "74c7ab4fc5aba7c185816fea98e46df89f226f70902981f0d0c814d94767cc56"; + sha256 = "0mnccx3xj568s3q82achf1pj57zqdpj9iskgh62w39xbqm7spivl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140038,7 +149548,7 @@ self: { mkDerivation { pname = "polimorf"; version = "0.7.3"; - sha256 = "b97d5a48cb731584d463574b2b2603f4c73126c05cf70b47bb5c5a0e6890676f"; + sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr"; libraryHaskellDepends = [ base binary containers text text-binary ]; @@ -140053,19 +149563,19 @@ self: { mkDerivation { pname = "poll"; version = "0.0"; - sha256 = "77102fd6a79b75c98cdce10a40a746430a7a85d6cccebe70dff81b5072f68c6c"; + sha256 = "0v4cyrr506zqvxqbxkncss2pl2j38skl02p1vj6cjxcvlzb2y43p"; libraryHaskellDepends = [ base enumset utility-ht ]; description = "Bindings to poll.h"; license = stdenv.lib.licenses.bsd3; }) {}; "poly-arity" = callPackage - ({ mkDerivation, base, constraints, HList }: + ({ mkDerivation, base, constraints }: mkDerivation { pname = "poly-arity"; - version = "0.0.7"; - sha256 = "8a11a127ef8aa3d9cbf773623930c710a7c0e92ac602957c891ed6a385540b66"; - libraryHaskellDepends = [ base constraints HList ]; + version = "0.1.0"; + sha256 = "0afxrwq5is4l954kmlqm76g0zpy4jw6vvx2275q8xph4zr2ac46b"; + libraryHaskellDepends = [ base constraints ]; description = "Tools for working with functions of undetermined arity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140076,7 +149586,7 @@ self: { mkDerivation { pname = "poly-control"; version = "1.0.0"; - sha256 = "268f2355f258e4659d940356aaed8cf1559c1268c21bd4f53e705cdeafd39d10"; + sha256 = "044xsfpxwp3h7vsx86y2d099qmgiiknslmh3jjfnbr2qy9aj73r6"; libraryHaskellDepends = [ base lens ]; homepage = "https://github.com/wdanilo/poly-control"; description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives"; @@ -140089,18 +149599,32 @@ self: { mkDerivation { pname = "polyToMonoid"; version = "0.1"; - sha256 = "484abd269cfb9d3fcd8970b8d53fba49ce340b359569e90532c6b49bb3620a19"; + sha256 = "068acarrpd66682yjscm6l5k9kj9p8zxbf3hi76kz7gvkhkbsjj8"; libraryHaskellDepends = [ base ]; description = "Polyvariadic functions mapping to a given monoid"; license = stdenv.lib.licenses.bsd3; }) {}; + "polydata" = callPackage + ({ mkDerivation, base, constraint-manip, hspec, indextype }: + mkDerivation { + pname = "polydata"; + version = "0.1.0.0"; + sha256 = "1fxp5m54nqxvyg4qljhdrykm3i6fckjl053p37dnib4g3nrqa5qy"; + revision = "1"; + editedCabalFile = "104rx39v78nnpl8w350fxdkx6zzv1kwql7f21xz62256ybwza4ra"; + libraryHaskellDepends = [ base constraint-manip indextype ]; + testHaskellDepends = [ base constraint-manip hspec indextype ]; + description = "Wrap together data and its constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "polymap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "polymap"; version = "0.1.1.0"; - sha256 = "9cda6cf03591ac30fdd8bd6796f87016e45dfa10a720d091622e02036fe809b7"; + sha256 = "1dq9x1ph60ifca8x085723x5vr0nf3w9crxxv3yk1b4i6pq6rnlw"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Polygonal maps"; @@ -140115,7 +149639,7 @@ self: { mkDerivation { pname = "polynom"; version = "0.1.0.0"; - sha256 = "904326a098409341a6b710f2fe36b48918cc41b954b98034fb6b68e5eb92efb1"; + sha256 = "1cggjbmyas3bzcs81falp50wq649nhvgxwhhnyk434s0k2h2chwh"; libraryHaskellDepends = [ algebra base base-unicode-symbols containers ]; @@ -140129,16 +149653,21 @@ self: { }) {}; "polynomial" = callPackage - ({ mkDerivation, base, deepseq, pretty, vector, vector-space - , vector-th-unbox + ({ mkDerivation, base, deepseq, HUnit, pretty, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-space, vector-th-unbox }: mkDerivation { pname = "polynomial"; - version = "0.7.2"; - sha256 = "e19fff25579b5882da6d7ec0f3e344b88ee320ae8284fc1afefed04385ba3ff0"; + version = "0.7.3"; + sha256 = "0wl9wdaqrs6hs83xi27m879j7i2q04v14jqkrwns2qy3f2yhq2rr"; libraryHaskellDepends = [ base deepseq pretty vector vector-space vector-th-unbox ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector vector-space + ]; homepage = "https://github.com/mokus0/polynomial"; description = "Polynomials"; license = stdenv.lib.licenses.publicDomain; @@ -140150,7 +149679,7 @@ self: { mkDerivation { pname = "polynomials-bernstein"; version = "1.1.2"; - sha256 = "6950f2e791533a40e7e41ff98679f680f27c7b66258b57871027bf0e5adc7062"; + sha256 = "0qkhvid0xgr7223mg2r5crxprwl0yrwqdy8zwkkl0fjkj7kz4l39"; libraryHaskellDepends = [ base vector ]; description = "A solver for systems of polynomial equations in bernstein form"; license = "GPL"; @@ -140161,7 +149690,7 @@ self: { mkDerivation { pname = "polyparse"; version = "1.12"; - sha256 = "f54c63584ace968381de4a06bd7328b6adc3e1a74fd336e18449e0dd7650be15"; + sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m"; libraryHaskellDepends = [ base bytestring text ]; homepage = "http://code.haskell.org/~malcolm/polyparse/"; description = "A variety of alternative parser combinator libraries"; @@ -140176,7 +149705,7 @@ self: { mkDerivation { pname = "polyseq"; version = "0.1.2.1"; - sha256 = "e094f5f5fb5b945faa099de0fd63a4a5d075c77e2485adefff624e39a9f561d0"; + sha256 = "1l31ynlkjkk2zzpsv194gv3pbl55liizvq4x16m5z52vzgszb570"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140194,7 +149723,7 @@ self: { mkDerivation { pname = "polysoup"; version = "0.6.3"; - sha256 = "9af6228977d331fe2ad7e8d0d48fd5acffadf3070ea06b503ffb493b7a994f48"; + sha256 = "0j2gk5x3njgv7x86p80f0zrsvzxcsn7x9l78swmgwcfkfy4j5xls"; libraryHaskellDepends = [ base containers deepseq polyparse tagsoup ]; @@ -140209,7 +149738,7 @@ self: { mkDerivation { pname = "polytypeable"; version = "0.1.0.0"; - sha256 = "082ba98603b3473c23ed99d9086275e9b581c718e74b4d4729f1fa936a53626d"; + sha256 = "0vb2adm97ypi553lsjz7333q3dg9fmi0incrxlikqixk0f3ajaq8"; libraryHaskellDepends = [ base ]; description = "Typeable for polymorphic types"; license = stdenv.lib.licenses.bsd3; @@ -140221,13 +149750,27 @@ self: { mkDerivation { pname = "polytypeable-utils"; version = "0.1.0.0"; - sha256 = "41206586c2a95b64bc59085dad383c47656f4c7125a82de59f52578d5f5577c1"; + sha256 = "1hbpamgqsmsjkzjjva15f566yra77hwasp88b6y68nx9qa36a821"; libraryHaskellDepends = [ base haskell98 polytypeable ]; description = "Utilities for polytypeable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "polyvariadic" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + 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"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pomodoro" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath , heredoc, libnotify, network, process, time, unix, wx, wxcore @@ -140235,7 +149778,7 @@ self: { mkDerivation { pname = "pomodoro"; version = "0.1.0.1"; - sha256 = "d85a5b11571ba77b0a1220e8a20372717157967ec62dc6b88a1d40e02b610478"; + sha256 = "0y04c4my0h0xiawccbf6gsb5fwbif81s5s102857p9qvaw8mnnnq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -140255,7 +149798,7 @@ self: { mkDerivation { pname = "pomohoro"; version = "0.1.2.4"; - sha256 = "b63883fb9e820b7580a57bee84e3353a844964785e1da82406cb5643451e4a19"; + sha256 = "06aa3r2l6mnb0qjah7ayg1j4k11s6piq9vkvln07a2w2kvxq6f5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140276,7 +149819,7 @@ self: { mkDerivation { pname = "ponder"; version = "0.0.1"; - sha256 = "10448688a4368e74dc7b06825ac4b0fa68b144f67e6de278874990370cf804db"; + sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h"; libraryHaskellDepends = [ base mtl ]; homepage = "https://gihub.com/matt76k/ponder"; description = "PEG parser combinator"; @@ -140285,12 +149828,17 @@ self: { }) {}; "pong-server" = callPackage - ({ mkDerivation, base, data-default, hspec, network, QuickCheck }: + ({ mkDerivation, base, bytestring, classy-prelude, exceptions + , hspec, http-types, monad-control, network, QuickCheck + }: mkDerivation { pname = "pong-server"; - version = "0.0.2.1"; - sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a"; - libraryHaskellDepends = [ base data-default network ]; + version = "0.0.4.4"; + sha256 = "1qndq44mi8ab65b3pwnjbdh8s0iys2h24wy2k9499jbs92gd8zx4"; + libraryHaskellDepends = [ + base bytestring classy-prelude exceptions http-types monad-control + network + ]; testHaskellDepends = [ base hspec network QuickCheck ]; homepage = "http://github.com/RobertFischer/pong-server#readme"; description = "A simple embedded pingable server that runs in the background"; @@ -140305,7 +149853,7 @@ self: { mkDerivation { pname = "pontarius-mediaserver"; version = "0.0.2.0"; - sha256 = "caf6a65f9d607ffc928f43a361fb14bacab7fcf5dedec87ce9466cb5e2ca1e03"; + sha256 = "00qyrbibav26x5ycipnyypybgjms2kxn38s3iy9gqzv0kmgsdxna"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -140334,7 +149882,7 @@ self: { mkDerivation { pname = "pontarius-xmpp"; version = "0.5.4"; - sha256 = "cea2e6207811d718e8a9c3ef7abb71ec4aba6ee77e9f749d9902b62a4b48b13a"; + sha256 = "0fmi915jmdh2k6fp97vywxpbljpcf6xpmvy3m7l1imqig0hfd8nf"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -140366,7 +149914,7 @@ self: { mkDerivation { pname = "pontarius-xpmn"; version = "0.0.1.0"; - sha256 = "be8184cc9a48fedcf140f1f46be75b04b43211867b723428ee9876fd1c12a2d9"; + sha256 = "1nd228fgsxlqxql38wkvhq8k5d04bgknpx7i83qxrzj8kb6890dy"; libraryHaskellDepends = [ base containers pontarius-xmpp random text xml-types ]; @@ -140381,7 +149929,7 @@ self: { mkDerivation { pname = "pony"; version = "1.0"; - sha256 = "debbb4d8e0cbb4e928c8186bcebe0e3ff9ff5640e85dae8a492d4d3e81f20b29"; + sha256 = "0a8bya0kwk9d965awpg881bgzy9z1szcwsqqr0lfkd6bw3cb9fyy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -140395,9 +149943,9 @@ self: { mkDerivation { pname = "pool"; version = "0.1.2.1"; - sha256 = "2ca0a2a97c481716f0dc86162b16e37fbace71507c1d9fbec8f9ce313bb79cbb"; + sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; revision = "1"; - editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951"; + editedCabalFile = "0lf9m19hl5asyb85xc8h34kh0iqpfdpwzil4lm5lskvn4fbi77n7"; libraryHaskellDepends = [ base monad-control transformers ]; homepage = "http://www.yesodweb.com/book/persistent"; description = "Thread-safe resource pools. (deprecated)"; @@ -140412,9 +149960,9 @@ self: { mkDerivation { pname = "pool-conduit"; version = "0.1.2.3"; - sha256 = "db2df6c6c9fba57089a6da3e8ea83a1722fe6e0d26b5d4994fa84a00575dd2d7"; + sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv"; revision = "1"; - editedCabalFile = "b894f71054b3824a0a05753e8273efbc7c1dc48efa9c6d56625ba4411a74afa5"; + editedCabalFile = "19dgfhd4392vc9b6v77siv21sz5wxxrq4gkm0l54m0mkah8gg55q"; libraryHaskellDepends = [ base monad-control resource-pool resourcet transformers ]; @@ -140431,7 +149979,7 @@ self: { mkDerivation { pname = "pooled-io"; version = "0.0.2.1"; - sha256 = "7d405a8876d55a9c077a304dd378854bc9e6e20f643c357c82bd3f38297ff9d0"; + sha256 = "1l7rgwlkhgxxh9y3ag341zifdjabhmwd6k9hg83rqnnmfs45lh3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140448,7 +149996,7 @@ self: { mkDerivation { pname = "pop3-client"; version = "0.1.4"; - sha256 = "bb13211cbd8b9708c38d192aea60498aed3c77d31ae4d4f1a93297c75d77cc4d"; + sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv"; libraryHaskellDepends = [ base mtl network ]; homepage = "https://github.com/tmrudick/haskell-pop3-client/"; description = "POP3 Client Library"; @@ -140460,7 +150008,7 @@ self: { mkDerivation { pname = "popenhs"; version = "1.0.0"; - sha256 = "a42e60a9a7cc16e2f158e5bfdcc395f886af9ea3934f2b2d633f25facb43eb06"; + sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4"; libraryHaskellDepends = [ base directory haskell98 unix ]; homepage = "http://www.haskell.org/~petersen/haskell/popenhs/"; description = "popenhs is a popen-like library for Haskell"; @@ -140476,7 +150024,7 @@ self: { mkDerivation { pname = "poppler"; version = "0.14.1"; - sha256 = "5b577a0a14791eb952ed8ed704ad37bcc535703d4d52f6da0ca1556424465db6"; + sha256 = "1djx8qj68md11kdgcljd7mq3bidw6ynh9mwfxm9bj7kr2h57lmsv"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers glib gtk mtl @@ -140494,7 +150042,7 @@ self: { mkDerivation { pname = "populate-setup-exe-cache"; version = "1.0"; - sha256 = "7ef4a88087b944e04e083eb7da93a16c76b364e5f80ee3fbeb6c73fcdc10e71b"; + sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mietek/populate-setup-exe-cache/"; description = "Empty Cabal package"; @@ -140506,7 +150054,7 @@ self: { mkDerivation { pname = "portable-lines"; version = "0.1"; - sha256 = "5053f5bc42d4362062e0ec55dd111b0f6611be280c7f871876732853f4b824d1"; + sha256 = "1l94p3s56a3kfqc8fzqc52z12rhg3c8xsmgcw1i20dnl8aygalsh"; libraryHaskellDepends = [ base bytestring ]; description = "Alternative 'lines' implementation that understands CR-LF and CR"; license = stdenv.lib.licenses.bsd3; @@ -140517,18 +150065,39 @@ self: { mkDerivation { pname = "portable-template-haskell-lens"; version = "0.1.0.0"; - sha256 = "b81c8c159b168688e38e6965d921d342e393cc5867e6b724eab2d0eadb07af93"; + sha256 = "14xg0zdyml5jx8jbgrk7b3697qs2schxjrb9iviqi1hnkcaqq75q"; libraryHaskellDepends = [ base lens template-haskell ]; description = "Lenses for the AST of Template Haskell 2.11 and Template Haskell < 2.11"; license = stdenv.lib.licenses.mit; }) {}; + "portager" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hspec, lens + , mtl, optparse-applicative, QuickCheck, text, transformers + }: + mkDerivation { + pname = "portager"; + version = "0.1.1.0"; + sha256 = "0yxrld29mp48vv9i301qx0lrpsvbbpwpmsk4vqhg5wygk9qsbsbn"; + revision = "1"; + editedCabalFile = "1mak5a3y5ip0n6ygq33cbr132j72qy7acb00k5c2mprx2zp8aq4z"; + libraryHaskellDepends = [ + base containers directory filepath lens mtl optparse-applicative + text transformers + ]; + testHaskellDepends = [ base containers hspec mtl QuickCheck text ]; + homepage = "https://github.com/j1r1k/portager"; + description = "DSL for configuring Gentoo portage"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "portaudio" = callPackage ({ mkDerivation, base, containers, portaudio }: mkDerivation { pname = "portaudio"; version = "0.2.4"; - sha256 = "636a8435b09c1f02df1e0be78afef0cdd3519754a56992a49dd509438475b46f"; + sha256 = "0vxlfn2462fmknj94sd5ajbm3lydy3z8mrqb3vgh47wwn0sq8sk3"; libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ portaudio ]; homepage = "http://code.haskell.org/portaudio"; @@ -140543,7 +150112,7 @@ self: { mkDerivation { pname = "porte"; version = "0.0.4"; - sha256 = "4d3c0b25d2c0dcc36b98fb692100179dd776d142d677c51430106ff0d79a87b1"; + sha256 = "1cc7kbbz0vqh60acaxyn8b8pdmwx2w022sgvk1mw7p60s8jhng2d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140559,7 +150128,7 @@ self: { mkDerivation { pname = "porter"; version = "0.1"; - sha256 = "d35647399892ec686726b96f0974113c3d19f7e19919fa7779aac0f10f7e812b"; + sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk"; libraryHaskellDepends = [ haskell2010 ]; description = "Implementation of the Porter stemming algorithm"; license = stdenv.lib.licenses.bsd3; @@ -140571,7 +150140,7 @@ self: { mkDerivation { pname = "ports"; version = "0.4.3.2"; - sha256 = "359fe87c5561b1268bfa5580b7e11a67e0b79076221744b2d821b930c9cbbec7"; + sha256 = "1ixyrg4k1f91v2r485r2fs8bgq373bhvg02mza5jdcb1amyfi7rm"; libraryHaskellDepends = [ base haskell98 unix ]; homepage = "http://www.cse.unsw.edu.au/~chak/haskell/ports/"; description = "The Haskell Ports Library"; @@ -140584,7 +150153,7 @@ self: { mkDerivation { pname = "ports-tools"; version = "0.0.1"; - sha256 = "8629558bcbfec5e6efbb5a36b30e889decc8feea0be2485b2aeeb388115a472f"; + sha256 = "0bs7b88qiczf59dliqhbxbzciv4xi07b6djspgpydigyrf5maac6"; libraryHaskellDepends = [ base directory process ]; homepage = "http://github.com/ppenzin/hs-ports-tools/"; description = "Library to interact with port tools on FreeBSD"; @@ -140596,7 +150165,7 @@ self: { mkDerivation { pname = "positive"; version = "0.4.1"; - sha256 = "cf41c077a0a9f173ec06ec052618d03b380bf8a03b68f18eddfce98450a79b0c"; + sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg"; libraryHaskellDepends = [ base nats semigroups ]; description = "Positive integers"; license = stdenv.lib.licenses.bsd3; @@ -140609,7 +150178,7 @@ self: { mkDerivation { pname = "posix-acl"; version = "0.2.0.1"; - sha256 = "e3e56ee3a8cc9e84c255a17593289b86c685b167d98fee0281481509454671d2"; + sha256 = "1lki8r2hj5a8h41fx3yrcyqqbil6kcl96xd1ap1897ncm3inxrg3"; libraryHaskellDepends = [ base bytestring containers lifted-base monad-control transformers transformers-base unix @@ -140626,7 +150195,7 @@ self: { mkDerivation { pname = "posix-error-codes"; version = "0.1.0.0"; - sha256 = "61cbef7106066b04b7fb52b3b8a3f17a8913ee0951f2bb55376239ddb3b4c290"; + sha256 = "1462njrxsfb26xavpwji17p172bsy6ivicsjzfvh8sq60rqyzjv1"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/kerscher/posix-error-codes"; description = "POSIX error codes"; @@ -140638,7 +150207,7 @@ self: { mkDerivation { pname = "posix-escape"; version = "0.1"; - sha256 = "1c115a945e654221edc215dbace74bf80839a9a4181fb8817735766c32433d7b"; + sha256 = "0yrx8cr6qximfy0vh7qqljlkj27q9gksrnqmqbnj2hk5bsa5l48w"; libraryHaskellDepends = [ base ]; description = "Quote arguments to be passed through the Unix shell"; license = stdenv.lib.licenses.bsd3; @@ -140649,7 +150218,7 @@ self: { mkDerivation { pname = "posix-filelock"; version = "0.1"; - sha256 = "b3e251e6f59a5d90091e0d73b54290a3ece13780a6a620191fc18146f8cad980"; + sha256 = "106rrbw4d0f13wcj19m6h0vy3v53j11bawqd3q4r0pcsypk53qmk"; libraryHaskellDepends = [ base transformers unix ]; homepage = "https://github.com/singpolyma/posix-filelock-haskell"; description = "Nice wrapper around POSIX fcntl advisory locks"; @@ -140663,7 +150232,7 @@ self: { mkDerivation { pname = "posix-paths"; version = "0.2.1.1"; - sha256 = "dff5332ea4648bb2c4e25ce2f79d89282f653af60f03b09efe8110673709245f"; + sha256 = "0pr414vnf441zsgb00qgyqx6abr8i6fzgqjwwb2b52v4lhp37xfz"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix @@ -140679,13 +150248,17 @@ self: { ({ mkDerivation, base, bytestring, process, unix, util }: mkDerivation { pname = "posix-pty"; - version = "0.2.1"; - sha256 = "16e941681511ef1d59300314d4f6f85192b00787fc2605fbd18a300192c4edc1"; + version = "0.2.1.1"; + sha256 = "1fdvzmk7v7lasyhwinl9wqxq8c67balyyygyb1bzljj3hzn0rid2"; + revision = "1"; + editedCabalFile = "1dhxxwlv69bczi7mbhdd9f3s9nnjb4b3jf9mlgdjg7wxqh84zrgi"; libraryHaskellDepends = [ base bytestring process unix ]; librarySystemDepends = [ util ]; + testHaskellDepends = [ base bytestring process ]; homepage = "https://bitbucket.org/merijnv/posix-pty"; description = "Pseudo terminal interaction with subprocesses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {util = null;}; "posix-realtime" = callPackage @@ -140693,7 +150266,7 @@ self: { mkDerivation { pname = "posix-realtime"; version = "0.0.0.4"; - sha256 = "692cbab92e272e00b9402389c199be27add8c6f82b675c512085a36acc4ddf07"; + sha256 = "01yz9p66m8w5418mqrrbz33dib97pscw329382wh0bi75swvlb39"; libraryHaskellDepends = [ base bytestring unix ]; description = "POSIX Realtime functionality"; license = stdenv.lib.licenses.bsd3; @@ -140704,7 +150277,7 @@ self: { mkDerivation { pname = "posix-timer"; version = "0.3"; - sha256 = "eda33946cff1a22dc56583dc534e2c551dab4eed7ddf124b84ff19b22e4a927c"; + sha256 = "0z4j98pb46gzhi5i5pvxxm7an7am5i757p43cp2jv8pirx33k8zd"; libraryHaskellDepends = [ base transformers-base unix ]; homepage = "https://github.com/mvv/posix-timer"; description = "Bindings to POSIX clock and timer functions"; @@ -140716,9 +150289,9 @@ self: { mkDerivation { pname = "posix-waitpid"; version = "0.1"; - sha256 = "1336c1c5bfcc9250fb1f22cf46ef24730f29b2d2ae30dca0111aec37de1d7eec"; + sha256 = "1v3y3pg3gv0s26hdqc5fsar2j3vk4kpldkr23zxm14ncpz2w2dhk"; revision = "1"; - editedCabalFile = "b0c171edc197595d1edbbf49c22fb91a1d3ffac56316ba1023d9d7a175f15589"; + editedCabalFile = "12amy5ss3myr4c8bl5k3qpx3y78sp4pw4jdzvcg5sncpq7np3hdh"; libraryHaskellDepends = [ base unix ]; description = "Low-level wrapping of POSIX waitpid(2)"; license = stdenv.lib.licenses.mit; @@ -140730,7 +150303,7 @@ self: { mkDerivation { pname = "possible"; version = "0.1.0.5"; - sha256 = "fd6f97933c6c4feeb6f2a6aa2c8c0e0b66ee46cf8dab95b96a8ce7e2fcf83ec6"; + sha256 = "1iiyz3yf5rwcdawrbawdrx3fwrhb1s62ram6yavfwkvc7j9rfvzx"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/tolysz/possible"; description = "Three valued Data.Maybe"; @@ -140742,7 +150315,7 @@ self: { mkDerivation { pname = "post-mess-age"; version = "0.2.1.0"; - sha256 = "d0f69ab1cb130a9f8bb54cd1f3b0167184af885fedba89ff32fec8e54e95d64c"; + sha256 = "0k6njm7fbj7y6bzqkfpdby4az13i2sqg7lacnn5ry2hkrfqrmxnh"; libraryHaskellDepends = [ base ]; description = "Send messages to a handle concurrently without getting them mixed"; license = stdenv.lib.licenses.bsd3; @@ -140753,7 +150326,7 @@ self: { mkDerivation { pname = "postcodes"; version = "0.1.1"; - sha256 = "28ae447aa1bf88b8aaf93e5e05fc704a605a46d4a0cc202568d5cb10e82d0dfc"; + sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8"; libraryHaskellDepends = [ aeson base bytestring HTTP ]; homepage = "https://github.com/mattyhall/haskell-postcodes"; description = "A library that gets postcode information from the uk-postcodes.com"; @@ -140766,7 +150339,7 @@ self: { mkDerivation { pname = "postgres-tmp"; version = "0.1.0.1"; - sha256 = "6d032edb06f2c477b316d6bd023f7bb7845e90b54279beba4b5919bc31b677e4"; + sha256 = "1r3pnqqvq6ar9fxbwya2nn85x15pgczh5gfn2srpgi7j0vdjw0vd"; libraryHaskellDepends = [ base bytestring postgresql-simple text ]; homepage = "https://github.com/cocreature/postgres-tmp#readme"; description = "Create a temporary database that is deleted after performing some operation"; @@ -140784,7 +150357,7 @@ self: { mkDerivation { pname = "postgresql-binary"; version = "0.9.3"; - sha256 = "fdc10a4ccc5c6927f39d89450395c5316448b5f4d763c6386d1b056cc9685d04"; + sha256 = "012xd34nq18vdlwccqypyjslhr1iqnah6ic9kprjfsawri60mhgx"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring foldl loch-th placeholders scientific text time transformers uuid vector @@ -140801,6 +150374,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_1" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.1"; + sha256 = "1kb52676dz76z7blvzrfsbwaa1harnrmg0zhwlhg429d21n9y2m2"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -140808,7 +150413,7 @@ self: { mkDerivation { pname = "postgresql-config"; version = "0.1.0"; - sha256 = "6429a9c8f0a75d32dbc23c01441726d3cdb4fbc47a2b9ce28b7334cd85fcb3dc"; + sha256 = "1p5kzj2wsd3kigi9qavsqkxv9kfk4qbl809wqbdk4pd7y34ajab4"; libraryHaskellDepends = [ aeson base bytestring monad-control mtl postgresql-simple resource-pool time @@ -140826,7 +150431,7 @@ self: { mkDerivation { pname = "postgresql-connector"; version = "0.2.3"; - sha256 = "a313e76b55f8ca08db74e84f8c4676ec42fecd5480060d4644bffc9582081c99"; + sha256 = "168w1219bz5z8i30s1l0ak6zwhpcfr38qkz8fkdhijpqammyf4x3"; libraryHaskellDepends = [ base bytestring exceptions lens mtl postgresql-simple resource-pool resourcet time transformers-base @@ -140841,7 +150446,7 @@ self: { mkDerivation { pname = "postgresql-copy-escape"; version = "0.1"; - sha256 = "f5d2dc28c1cdad9716ccf8dd1753f94803a6d23cc472ce55117e8f8c64877718"; + sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/joeyadams/hs-postgresql-copy-escape"; description = "Format data to feed to a PostgreSQL COPY FROM statement"; @@ -140853,7 +150458,7 @@ self: { mkDerivation { pname = "postgresql-cube"; version = "0.1.0.0"; - sha256 = "83a5b20cfc5e966d32f647d6f2bd532c7bd344e5af95eb3b2e29cd6c7b468a4a"; + sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3"; libraryHaskellDepends = [ base bytestring postgresql-simple ]; description = "Cube support for postgresql-simple"; license = stdenv.lib.licenses.mit; @@ -140864,7 +150469,7 @@ self: { mkDerivation { pname = "postgresql-error-codes"; version = "1.0.1"; - sha256 = "e6d49d3d2737d1a5da8358900d69736a485390142f891136c026fc106fd82de4"; + sha256 = "1r1dv1pi1z16q0v1329g2j856j3afdlhv42qhgdabl9p4wyrvm76"; libraryHaskellDepends = [ bytestring ]; homepage = "https://github.com/nikita-volkov/postgresql-error-codes"; description = "PostgreSQL error codes"; @@ -140875,8 +150480,8 @@ self: { ({ mkDerivation, base, bytestring, postgresql }: mkDerivation { pname = "postgresql-libpq"; - version = "0.9.3.0"; - sha256 = "510df3e08753e011c108c4d4c6d048a4b67545419eb9eedc3ef23e7758fedb05"; + version = "0.9.3.1"; + sha256 = "0x0bjnwqhdlxba345yjkf978wfsy8g5xsjdbrckrnb2dvsfscqih"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ postgresql ]; homepage = "http://github.com/lpsmith/postgresql-libpq"; @@ -140884,6 +150489,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-named" = callPackage + ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl + , postgresql-libpq, postgresql-simple, utf8-string + }: + mkDerivation { + pname = "postgresql-named"; + version = "0.1.0"; + sha256 = "0b7a3i8mcp9xs2zga6qi1byy489cl33j3mcrkx3smrz926ahbz95"; + libraryHaskellDepends = [ + base bytestring extra generics-sop mtl postgresql-libpq + postgresql-simple utf8-string + ]; + testHaskellDepends = [ base generics-sop hspec postgresql-simple ]; + 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 ({ mkDerivation, aeson, base, blaze-builder, bytestring , bytestring-builder, directory, filepath, ghc-prim, mtl @@ -140893,7 +150517,7 @@ self: { mkDerivation { pname = "postgresql-orm"; version = "0.5.0"; - sha256 = "5e5892c081bd462671f6af8399c1300fae3c14c03af66b7d65370aa4c12faf4f"; + sha256 = "0kxg5z0s82ipcmynpxisq0a3rbhg630rk0xgyrqjcimxh7094n2y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140922,8 +150546,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.0.1"; - sha256 = "2e9ff10732967eabc091a0f7d45a3b9777a20ae23ab3fffb8827bae646fcc1a4"; + version = "3.2.0"; + sha256 = "02ga7i1b4nin05lnh0dwr52w7xhz723an0zlypjccka1i7l42pvz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta hreader @@ -140933,7 +150557,7 @@ self: { transformers-compat type-fun ]; testHaskellDepends = [ - attoparsec base derive inflections postgresql-simple QuickCheck + attoparsec base derive postgresql-simple QuickCheck quickcheck-assertions quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th text time ]; @@ -140949,8 +150573,8 @@ self: { }: mkDerivation { pname = "postgresql-schema"; - version = "0.1.10"; - sha256 = "29307e09916a7fd9aec965ed2f62663e26b5e66b5ab441d3ed52713d551ae27a"; + version = "0.1.11"; + sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140975,8 +150599,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.5.2.1"; - sha256 = "707a1683dfbd944ddee389e0b1c895038460925137ee21478eb03dd12d48277c"; + version = "0.5.3.0"; + sha256 = "0h8f4d09f25p0dlz2mxvgp5b5pr56hnhng3yhb69pmv0dmj7n38y"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable postgresql-libpq scientific @@ -140997,8 +150621,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-bind"; - version = "0.4.0"; - sha256 = "a313032f8a8a0c6b97094d396afcd81a04a2d017699a08b5e2cbc2b8309cf284"; + version = "0.4.1"; + sha256 = "1sgwi8h4divlwwy8r8yigv7mcr2w3795g11qn3vrv63kphj6y1wa"; libraryHaskellDepends = [ attoparsec base bytestring data-default exceptions heredoc postgresql-simple template-haskell text time @@ -141018,7 +150642,7 @@ self: { mkDerivation { pname = "postgresql-simple-migration"; version = "0.1.9.0"; - sha256 = "005d2f031ab8d889daaee5cffdb222dbe164267042829b88031166b66361726a"; + sha256 = "0skjc5ivcrhi0f49p0j2f0k69qfv4argvkz5mvd8kn5q381jyp80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141036,15 +150660,15 @@ self: { }) {}; "postgresql-simple-opts" = callPackage - ({ mkDerivation, base, bytestring, hspec, markdown-unlit + ({ mkDerivation, base, bytestring, data-default, either, hspec , optparse-applicative, optparse-generic, postgresql-simple }: mkDerivation { pname = "postgresql-simple-opts"; - version = "0.1.0.4"; - sha256 = "e404a87d6e51bf7ed9318cc86a14e09d4229545d70d5b991762a080b404260e5"; + version = "0.2.0.2"; + sha256 = "0jwhlafbpkg75rc2b4hv8pg1d2q200h70lwn0acilikf55r3vlj1"; libraryHaskellDepends = [ - base bytestring markdown-unlit optparse-applicative + base bytestring data-default either optparse-applicative optparse-generic postgresql-simple ]; testHaskellDepends = [ @@ -141056,12 +150680,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-simple-queue" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-ses, async, base + , bytestring, data-default, exceptions, hspec, hspec-discover + , hspec-expectations-lifted, hspec-pg-transact, lens, lifted-async + , lifted-base, monad-control, optparse-generic, pg-transact + , postgresql-simple, postgresql-simple-opts, random, resource-pool + , text, time, transformers, uuid + }: + mkDerivation { + pname = "postgresql-simple-queue"; + version = "0.1.0.1"; + sha256 = "1rwfv4ii4bdxq4ikvjrjrwbn9csr5q4qmmi7d5r0656a4qi9syh9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring data-default exceptions lifted-async + lifted-base monad-control optparse-generic pg-transact + postgresql-simple postgresql-simple-opts random resource-pool text + time transformers uuid + ]; + executableHaskellDepends = [ + aeson amazonka amazonka-ses base lens lifted-base text + ]; + testHaskellDepends = [ + aeson async base bytestring hspec hspec-discover + hspec-expectations-lifted hspec-pg-transact pg-transact + postgresql-simple + ]; + 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 ({ mkDerivation, base, generics-sop, postgresql-simple }: mkDerivation { pname = "postgresql-simple-sop"; version = "0.2"; - sha256 = "7ead6d5aa2be6b5b9b8c583f0f0b9646de17d2f261aec56e19dc92486ad3f416"; + sha256 = "05plsdm4i4nw35pcbbk1yb91gpj6jq5hygsqijdmnsxyl9d6vbby"; libraryHaskellDepends = [ base generics-sop postgresql-simple ]; homepage = "https://github.com/openbrainsrc/postgresql-simple-sop"; description = "Generic functions for postgresql-simple"; @@ -141075,8 +150733,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-typed"; - version = "0.1.0.1"; - sha256 = "4c30a001b15267cd8a8480bf03d8312b3038c4cd70936029ca9a7147ba06fe65"; + version = "0.1.0.2"; + sha256 = "12f06lzh2kw27ykwiwgbavj1wbkf4w0xjy6gk2nf4kzm65qvj8az"; libraryHaskellDepends = [ base postgresql-libpq postgresql-simple template-haskell transformers typedquery utf8-string @@ -141094,7 +150752,9 @@ self: { mkDerivation { pname = "postgresql-simple-url"; version = "0.2.0.0"; - sha256 = "f7d85afe7dd047c63aa56cc67e8d28e1d18f33baff8ee447adc5bec427b6ea4c"; + sha256 = "0k7anqkw9gn5mm3y93pzp8rqzlg1526pxikcllxcciyhgpz5mn7p"; + revision = "1"; + editedCabalFile = "1z9qk3kplc5y93h3xbb9gialhdmnblwrmf2943wkj70qg975hajb"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -141106,12 +150766,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-syntax" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase + , text + }: + mkDerivation { + pname = "postgresql-syntax"; + version = "0.1"; + sha256 = "1x658jg0507n3085g8m24qixlixjz9ngxn6c5wqislh9i1rl5d7k"; + libraryHaskellDepends = [ base base-prelude bytestring text ]; + librarySystemDepends = [ pg_query ]; + testHaskellDepends = [ rerebase ]; + homepage = "https://github.com/nikita-volkov/postgresql-syntax"; + description = "PostgreSQL SQL syntax utilities"; + license = stdenv.lib.licenses.mit; + }) {pg_query = null;}; + "postgresql-transactional" = callPackage ({ mkDerivation, base, monad-control, mtl, postgresql-simple }: mkDerivation { pname = "postgresql-transactional"; version = "1.1.1"; - sha256 = "f9302a1e134b31f2e9bd243c4fe36a25b3a9a9d6984288be1bc9c29882545ed3"; + sha256 = "1lsyaj19ihn93fz8hhlqsslskcr5dbilyg14pplz4cab2cg2lc7r"; libraryHaskellDepends = [ base monad-control mtl postgresql-simple ]; @@ -141127,8 +150803,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.5.0"; - sha256 = "c6b93a05eff7b5a315dfe26abdd6885dd9290dec3096c3cc795c16bc1395f2ff"; + version = "0.5.1"; + sha256 = "0bvrbbzqjvzsm0bqinvbcz897fzf1isg76mk3hniyf8l9a19a3wv"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -141139,7 +150815,25 @@ self: { QuickCheck time ]; homepage = "https://github.com/dylex/postgresql-typed"; - description = "A PostgreSQL library with compile-time SQL type inference and optional HDBC backend"; + description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "postgresql-typed-lifted" = callPackage + ({ mkDerivation, base, base-unicode-symbols, bytestring, exceptions + , lens, monad-control, postgresql-typed, transformers-base + }: + mkDerivation { + pname = "postgresql-typed-lifted"; + version = "0.5.1.1"; + sha256 = "0svslfvdxncvc3samyah54d648lf3mxzh5kw5286c45jr5h6p9pq"; + libraryHaskellDepends = [ + base base-unicode-symbols bytestring exceptions lens monad-control + postgresql-typed transformers-base + ]; + homepage = "https://gitlab.com/theunixman/postgresql-typed-lifted"; + description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -141147,34 +150841,36 @@ self: { "postgrest" = callPackage ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async , auto-update, base, base64-bytestring, bytestring - , case-insensitive, cassava, configurator, containers - , contravariant, either, hasql, hasql-pool, hasql-transaction - , heredoc, hjsonpointer, hjsonschema, hspec, hspec-wai - , hspec-wai-json, HTTP, http-types, insert-ordered-containers - , interpolatedstring-perl6, jwt, lens, lens-aeson, monad-control - , network-uri, optparse-applicative, parsec, process, protolude - , Ranged-sets, regex-tdfa, safe, scientific, swagger2, text, time - , transformers-base, unix, unordered-containers, vector, wai - , wai-cors, wai-extra, wai-middleware-static, warp + , case-insensitive, cassava, configurator-ng, containers + , contravariant, cookie, either, hasql, hasql-pool + , hasql-transaction, heredoc, hjsonpointer, hjsonschema, hspec + , hspec-wai, hspec-wai-json, HTTP, http-types + , insert-ordered-containers, interpolatedstring-perl6, jwt, lens + , lens-aeson, monad-control, network-uri, optparse-applicative + , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe + , scientific, swagger2, text, time, transformers-base, unix + , unordered-containers, vector, wai, wai-cors, wai-extra + , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.4.0.0"; - sha256 = "781c074cb47aa26d8d5de520113b23bad9be729057f87375f11a8abc2bb3489b"; + version = "0.4.2.0"; + sha256 = "0256mjq9xc0shanyb54p1bhbpb68mdadc71c5p7lpr0q4cn91c0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring case-insensitive cassava - configurator containers contravariant either hasql hasql-pool - hasql-transaction heredoc HTTP http-types insert-ordered-containers - interpolatedstring-perl6 jwt lens lens-aeson network-uri - optparse-applicative parsec protolude Ranged-sets regex-tdfa safe - scientific swagger2 text time unordered-containers vector wai - wai-cors wai-extra wai-middleware-static + configurator-ng containers contravariant cookie either hasql + hasql-pool hasql-transaction heredoc HTTP http-types + insert-ordered-containers interpolatedstring-perl6 jwt lens + lens-aeson network-uri optparse-applicative parsec protolude + Ranged-sets regex-tdfa safe scientific swagger2 text time + unordered-containers vector wai wai-cors wai-extra + wai-middleware-static ]; executableHaskellDepends = [ auto-update base base64-bytestring bytestring hasql hasql-pool - protolude text time unix warp + protolude retry text time unix warp ]; testHaskellDepends = [ aeson aeson-qq async auto-update base base64-bytestring bytestring @@ -141186,35 +150882,41 @@ self: { homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgrest-ws" = callPackage - ({ mkDerivation, aeson, base, bytestring, hasql, hasql-pool - , http-types, jwt, postgresql-libpq, postgrest, string-conversions - , text, time, transformers, unix, unordered-containers, wai - , wai-websockets, warp, websockets + ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base + , base64-bytestring, bytestring, configurator, containers, either + , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json + , http-types, jwt, lens, lens-aeson, optparse-applicative + , postgresql-libpq, protolude, retry, stm, stm-containers, text + , time, transformers, unix, unordered-containers, wai + , wai-app-static, wai-extra, wai-websockets, warp, websockets }: mkDerivation { pname = "postgrest-ws"; - version = "0.1.0.1"; - sha256 = "50ce5a13c8b7fe1719e61630ae019b9eb3ca4a923a036585c98635f0df1e3dfb"; + version = "0.3.2.0"; + sha256 = "04jj51fhssw4fa050qa8pk559m38kc8mharswidxph52vi6jv051"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring hasql-pool http-types postgresql-libpq - postgrest string-conversions text time unordered-containers wai - wai-websockets websockets + aeson base bytestring either hasql hasql-pool http-types jwt lens + lens-aeson postgresql-libpq protolude retry stm stm-containers text + time unordered-containers wai wai-websockets websockets ]; executableHaskellDepends = [ - base hasql hasql-pool jwt postgresql-libpq postgrest - string-conversions transformers unix warp + ansi-wl-pprint auto-update base base64-bytestring bytestring + configurator hasql hasql-pool heredoc http-types jwt + optparse-applicative postgresql-libpq protolude text time + transformers unix wai wai-app-static wai-extra warp + ]; + testHaskellDepends = [ + aeson base containers hasql hasql-pool hspec hspec-wai + hspec-wai-json http-types protolude stm wai-extra ]; - testHaskellDepends = [ base ]; homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postie" = callPackage @@ -141225,7 +150927,7 @@ self: { mkDerivation { pname = "postie"; version = "0.5.0.0"; - sha256 = "93e32bd30b22c7f6474958abc3f65bf467c1fea403aa130996dab396233f0fc7"; + sha256 = "1iqg7wirdcysjq4i7ah3lkzc2rzlbgvc7asq953zdir21g9jpqwk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141243,8 +150945,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.1.1"; - sha256 = "5c3d4c458d6b2683a2ec36380c216b05c297ba053cac4ede801531dba35f01ca"; + version = "0.2.0"; + sha256 = "14p4zff7phmavw4q0ygyd0b3sllgyn28q994zbgwmpvk9l1a6d80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141264,7 +150966,7 @@ self: { mkDerivation { pname = "postmark-streams"; version = "0.1.0.0"; - sha256 = "5bc30a4c0688b85a93c91c12b17df0e68449dc45d9da5ba7a75db5e9e3b4fc4e"; + sha256 = "0kpwnkiykdaxlykmpnnr8pf4k176y1yv24hwr69mmf480r60mhsv"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring binary bytestring http-streams io-streams text time @@ -141275,33 +150977,31 @@ self: { }) {}; "postmaster" = callPackage - ({ mkDerivation, adns, base, bytestring, containers, directory - , hopenssl, hsdns, hsemail, hsyslog, mtl, network, old-time - , openssl, parsec, unix + ({ mkDerivation, base, bytestring, containers, directory, hopenssl + , hsdns, hsemail, hsyslog, mtl, network, old-time, parsec, unix }: mkDerivation { pname = "postmaster"; - version = "0.3"; - sha256 = "719e1de0449e4185ab370abfe3e5f61e874e9fe9fd3742d97e24358b335df0fb"; + version = "0.3.2"; + sha256 = "1l1hq77qxi1f9nv7bxgkfvcm50p61svqvn9f59aq3b9zj2vikmf6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers directory hopenssl hsdns hsemail hsyslog mtl network old-time parsec unix ]; - executableSystemDepends = [ adns openssl ]; homepage = "http://github.com/peti/postmaster"; description = "Postmaster ESMTP Server"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) adns; inherit (pkgs) openssl;}; + }) {}; "potato-tool" = callPackage ({ mkDerivation, base, binary, bytestring, split }: mkDerivation { pname = "potato-tool"; version = "0.1.0.2"; - sha256 = "7d1d49dc205f471b724bd61f7c39ec34437b164955b780d51ffe7fc82cf225b5"; + sha256 = "1d95y8nchzzy3zaq1dsm94b7nhrlxhwpq7yn9dr1nisz43f4j7bx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring split ]; @@ -141318,7 +151018,7 @@ self: { mkDerivation { pname = "potrace"; version = "0.1.0.0"; - sha256 = "cfc20b5b20e7fda80a23561be517a195f1ee9288552c23dd1ad77bf9e5703dbb"; + sha256 = "1frxf3jzjyyp3bfj6b2mi29fxwcml4bya6sn4c5aizg741dhphng"; libraryHaskellDepends = [ base bindings-potrace bytestring containers data-default JuicyPixels vector @@ -141332,7 +151032,9 @@ self: { mkDerivation { pname = "potrace-diagrams"; version = "0.1.0.0"; - sha256 = "3b98805a7a6a5458750af09ae783e265cc8c19f0fe2ec3c0ff8ca0318b02477b"; + 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"; @@ -141345,7 +151047,7 @@ self: { mkDerivation { pname = "powermate"; version = "1.0"; - sha256 = "cf3f0a3e1754489569c3b2a6c8ea1b856919de782c72b86884e31a70fc585b98"; + sha256 = "162vb3y706p3hilbhwicg3g1jsc53gmci9mjqdlraj2l2wz0lgyg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory unix ]; @@ -141361,7 +151063,7 @@ self: { mkDerivation { pname = "powerpc"; version = "0.0.1"; - sha256 = "de623ca9fdfb4c4a039862c72740af10b4d2f799768b8555e313c044d1c6767c"; + sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny"; libraryHaskellDepends = [ base ]; homepage = "http://tomahawkins.org"; description = "Tools for PowerPC programs"; @@ -141370,30 +151072,51 @@ self: { }) {}; "powerqueue" = callPackage - ({ mkDerivation, async, base, contravariant, hspec, stm }: + ({ mkDerivation, async, base, contravariant, hspec, stm, timespan + }: mkDerivation { pname = "powerqueue"; - version = "0.1.0.0"; - sha256 = "91835dd0495cb47b5a589703e7904104e7001597f06039f87067192fcdb8254c"; - libraryHaskellDepends = [ async base contravariant ]; + version = "0.2.0.0"; + sha256 = "1xhlv9gpj03cy2fq5aszvglp3ix85hg5c7zgxz99ss2pkb9hvi6r"; + libraryHaskellDepends = [ async base contravariant timespan ]; testHaskellDepends = [ async base hspec stm ]; homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A flexible job queue with exchangeable backends"; license = stdenv.lib.licenses.bsd3; }) {}; + "powerqueue-distributed" = callPackage + ({ mkDerivation, async, base, bytestring, cereal, cereal-conduit + , conduit, conduit-extra, hspec, mtl, powerqueue, stm, text + , timespan + }: + mkDerivation { + pname = "powerqueue-distributed"; + version = "0.1.0.0"; + sha256 = "17vnhds3zaqf9rg7iymzc5xa98v6ql20x0hnkg8whkdf5jxwn87v"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit conduit-extra mtl + powerqueue text timespan + ]; + testHaskellDepends = [ async base hspec powerqueue stm timespan ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A distributed worker backend for powerqueu"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "powerqueue-levelmem" = callPackage ({ mkDerivation, async, base, bytestring, cereal, criterion, dlist , filepath, focus, hspec, leveldb, leveldb-haskell, list-t - , powerqueue, snappy, stm, stm-containers, temporary, unagi-chan + , powerqueue, snappy, stm, stm-containers, temporary, timespan + , unagi-chan }: mkDerivation { pname = "powerqueue-levelmem"; - version = "0.1.0.0"; - sha256 = "b23d92c0b70b06e4168f03cdfedf7d38f12c85bcf493fb8874e66bd5ddc7ee76"; + version = "0.1.1.0"; + sha256 = "1f3psry9vm6wli1h219qqrv2q64rnmcpn0jv8jn8k6hqabhaa7wl"; libraryHaskellDepends = [ async base bytestring cereal dlist filepath focus leveldb-haskell - list-t powerqueue stm stm-containers unagi-chan + list-t powerqueue stm stm-containers timespan unagi-chan ]; testHaskellDepends = [ async base cereal hspec powerqueue temporary @@ -141408,12 +151131,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; + "powerqueue-sqs" = callPackage + ({ mkDerivation, aws-simple, base, powerqueue, text, timespan }: + mkDerivation { + pname = "powerqueue-sqs"; + version = "0.1.0.0"; + sha256 = "1awlx6ijmsddps3cvd5f88qs505127a7zjwijrlkvj3rgsb2gffv"; + libraryHaskellDepends = [ + aws-simple base powerqueue text timespan + ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A Amazon SQS backend for powerqueue"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { pname = "ppm"; version = "2009.5.13"; - sha256 = "9e390ca9a9e6e740fa71d2b72fa2c9c3d521118b0ebb35f10fabbbe543ecfb5b"; + sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy"; libraryHaskellDepends = [ base mtl ]; homepage = "http://github.com/nfjinjing/ppm/tree/master"; description = "a tiny PPM image generator"; @@ -141428,7 +151165,7 @@ self: { mkDerivation { pname = "pptable"; version = "0.2.0.0"; - sha256 = "c78c74f345cee1afd1021df509421cb151d484c4891e9335427182339547fb2d"; + sha256 = "0bgv8yak70ki88sr67l9qj2d8ldi3i10kx8x0b8szqff8prp9367"; libraryHaskellDepends = [ base boxes containers generic-deriving pretty syb vector ]; @@ -141447,7 +151184,7 @@ self: { mkDerivation { pname = "pqc"; version = "0.8"; - sha256 = "844d3c456cdfae4316cae120520690a522508f4bb861ff232b5a26db29c4e1d8"; + sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4"; libraryHaskellDepends = [ base QuickCheck random stm ]; homepage = "http://hub.darcs.net/shelarcy/pqc"; description = "Parallel batch driver for QuickCheck"; @@ -141456,12 +151193,13 @@ self: { }) {}; "pqueue" = callPackage - ({ mkDerivation, base, deepseq }: + ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "pqueue"; - version = "1.3.2"; - sha256 = "58d6c91432d91c1e9908495f5bfeb231239a53b5c59bda724fe8d7bd3873adf1"; + version = "1.3.2.2"; + sha256 = "0daha45lb7k372nv3nd29lbl7qmz4yp7hwa4p2w0yp1j8mwvbd97"; libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141473,7 +151211,7 @@ self: { mkDerivation { pname = "pqueue-mtl"; version = "1.0.7"; - sha256 = "cfac9866233d902349a8c2880d89aba97b9efe8967f9bb987445e04567086f46"; + sha256 = "0ikg11klbq25fjcbpyb7i7z9wyx9mf4hv262m14j741x4dk9ib6g"; libraryHaskellDepends = [ base containers ghc-prim MaybeT mtl stateful-mtl uvector ]; @@ -141489,7 +151227,7 @@ self: { mkDerivation { pname = "practice-room"; version = "0.0.2"; - sha256 = "e2c2174198f6be20a02ea211e6de704d2e6ff062e31a1e3fa722470e66ce2a1c"; + sha256 = "071arrk0wir2lwziw6p3cbq6ybjdf3gfc4d25sh21gpnk10ighp2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141509,8 +151247,8 @@ self: { }: mkDerivation { pname = "praglude"; - version = "0.4.0.1"; - sha256 = "70996dbad7defd09b26ad792150205f878c6158a372cc2544ea1bfd7d2a74dec"; + version = "0.4.1.0"; + sha256 = "1c2wvv37calr8hm5p6m5f8m9plrcr5acc1ljsf7d3hq0dbqb5fvc"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers data-default deepseq directory filepath hashable lens mtl random @@ -141525,20 +151263,22 @@ self: { "preamble" = callPackage ({ mkDerivation, aeson, base, basic-prelude, exceptions - , fast-logger, lens, monad-control, monad-logger, mtl, resourcet - , safe, shakers, template-haskell, text, text-manipulate, time - , transformers-base, unordered-containers, uuid + , fast-logger, lens, monad-control, monad-logger, MonadRandom, mtl + , network, resourcet, safe, shakers, template-haskell, text + , text-manipulate, time, transformers-base, unordered-containers + , uuid }: mkDerivation { pname = "preamble"; - version = "0.0.23"; - sha256 = "9da28ef916d8c8dec8bb28071e2536a4a5076438028d2e7b1c4e4b020383b044"; + version = "0.0.47"; + sha256 = "1qjlw42xyynbwp72s2xx9kavvbqj13y603fpwf27hvab2ypyyg8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base basic-prelude exceptions fast-logger lens monad-control - monad-logger mtl resourcet safe template-haskell text - text-manipulate time transformers-base unordered-containers uuid + monad-logger MonadRandom mtl network resourcet safe + template-haskell text text-manipulate time transformers-base + unordered-containers uuid ]; executableHaskellDepends = [ base shakers ]; homepage = "https://github.com/swift-nav/preamble"; @@ -141554,7 +151294,7 @@ self: { mkDerivation { pname = "precis"; version = "0.5.0"; - sha256 = "6d194a8cbd29c493c1f10e9db24fdd1af44f5236027d44a9e028a27281a10c34"; + sha256 = "0d0cl60p58i8w2ll8z826r94zx0svm7v578fy70r7i19pn64l6bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141574,7 +151314,7 @@ self: { mkDerivation { pname = "precursor"; version = "0.1.0.0"; - sha256 = "34b17a44555d8c18ed0ebf6633e5d5da03d10c23acd3f085452d5cc5dfe65861"; + sha256 = "0qaqwvgwap1d8n2z1lxc4c6d20ysspjk6rmz1vnii32xam27mc9l"; libraryHaskellDepends = [ base bifunctors bytestring containers mtl text text-show ]; @@ -141589,7 +151329,7 @@ self: { mkDerivation { pname = "pred-set"; version = "0.0.1"; - sha256 = "cb22ec50f94cf76b6bc55fd66b91badfef657cbe1a6b6a59b691e48004c37726"; + sha256 = "09kpqc281r4inrcnlsqspry6bvyzpa8npmjzqmmnpxscz58fq8nb"; libraryHaskellDepends = [ base hashable hashtables HSet ]; description = "Simple cached predicates"; license = stdenv.lib.licenses.bsd3; @@ -141604,8 +151344,8 @@ self: { }: mkDerivation { pname = "pred-trie"; - version = "0.5.1"; - sha256 = "821e1cefa47a3090808af5c39d9997f6471e05aa4f98b46e05eccb9c4a99cdd1"; + version = "0.5.1.2"; + sha256 = "0d0ab89l8hg9q5dp84ibafrmqkwx6cyd46dmxv8dljj4g0jlyys3"; libraryHaskellDepends = [ base composition-extra containers hashable hashtables mtl poly-arity pred-set QuickCheck semigroups tries @@ -141631,7 +151371,7 @@ self: { mkDerivation { pname = "predicates"; version = "0.1"; - sha256 = "0ebe07b68b049970bd219df01498e4746bffb84e80e803b0ff6abd426b27c653"; + sha256 = "0ly64xml5gbazyq07s409swgysvlwjc19w4x46yp1684ifv0gghf"; libraryHaskellDepends = [ base ]; description = "A couple of convenience functions for forming predicates"; license = stdenv.lib.licenses.bsd3; @@ -141642,7 +151382,7 @@ self: { mkDerivation { pname = "predictive"; version = "0.1.0"; - sha256 = "20aeaca3fde85e13d9421d85377c1560725b968ac5f633a2540fe93ff2a23158"; + sha256 = "0n1ilbr3zs8gaji37xn5iab5nwk02my3g18x8bci6pp8znisrbi0"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/esoeylemez/predictive"; description = "Predict the future, backtrack on failure"; @@ -141657,7 +151397,7 @@ self: { mkDerivation { pname = "prednote"; version = "0.36.0.4"; - sha256 = "acb4f240e01afdbab0020ee09d3abd2f80cfdcfdbf8cd5abe49b3477a2ca2b8d"; + sha256 = "139brai7fd4vwjmxb35zzpfcz01gplx9vq0f0aqbmz8sw10g5d5c"; libraryHaskellDepends = [ base bytestring containers contravariant rainbow split text transformers @@ -141678,7 +151418,7 @@ self: { mkDerivation { pname = "prednote-test"; version = "0.26.0.4"; - sha256 = "52c663a1bee7fa294eb157a0a9770f7de12198923dcbdbd419ddf465e908bd2a"; + sha256 = "0amx13lnbx6x37adpjrxjac23qbx1xvsk82pn572kyp7pshn7ijj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141702,7 +151442,7 @@ self: { mkDerivation { pname = "prefix-units"; version = "0.2.0"; - sha256 = "050abdf827a5bd014a2628b195fbd59bb226020612c99e86a082ac1c8274e384"; + sha256 = "1173fj11rb42l239xj8j0q12dclvspxrbc984r503gd54zwbs2h5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal HUnit QuickCheck test-framework test-framework-hunit @@ -141721,7 +151461,7 @@ self: { mkDerivation { pname = "prefork"; version = "0.0.9"; - sha256 = "883b866c1c9b3adf2aa1b368db8ac1619666bd0506d3c3f5486e79c49eef2a7f"; + sha256 = "0zraxygc8ybf93sw7lq60nynd5k1q65dns5kl4mdyflv3in8cfw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141745,7 +151485,7 @@ self: { mkDerivation { pname = "pregame"; version = "1.0.3.0"; - sha256 = "447c76f91a0b79f55250168258f840d73062d77ec44c9727ccddcba9561a777f"; + sha256 = "0zvp39bakjyxrhkrfk64gvbn4c6p83w5i0hna19gay8b3bwpcz24"; libraryHaskellDepends = [ aeson array base bytestring containers data-default deepseq either ghc-prim integer-gmp lens mtl safe StateVar stm text @@ -141767,7 +151507,7 @@ self: { mkDerivation { pname = "preliminaries"; version = "0.1.6.0"; - sha256 = "fdb3e581040b08a2af9ddbbccb613dad0a3fdbc70367db7859dee130cc96636d"; + sha256 = "0vb3jv631qfyb5wdnrq3qzdky2md7mhwpg6vknps420b0j0ybczx"; libraryHaskellDepends = [ abstract-par base bifunctors classy-prelude-conduit data-default microlens-contra microlens-platform monad-par monad-parallel @@ -141785,7 +151525,7 @@ self: { mkDerivation { pname = "prelude-compat"; version = "0.0.0.1"; - sha256 = "7bdc875d5b7265a87f06866dc00da69edcd4ae36ea9687c8c6e643833ffb40d4"; + sha256 = "1m20zczq6hz6qv48g5pa6spd9p4ylq6w0vc60rzshrbjbdfqgp3v"; libraryHaskellDepends = [ base ]; description = "Provide Prelude and Data.List with fixed content across GHC versions"; license = stdenv.lib.licenses.bsd3; @@ -141796,7 +151536,7 @@ self: { mkDerivation { pname = "prelude-edsl"; version = "0.4"; - sha256 = "2ef0353e4386cb64d8911fa2315b24a3581082e9ec8046b148364686df1b4657"; + sha256 = "0ms63ggqciin92qld07cx6110n534idk38hzj7c69jw68cz3bw1f"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/prelude-edsl"; description = "An EDSL-motivated subset of the Prelude"; @@ -141808,7 +151548,7 @@ self: { mkDerivation { pname = "prelude-extras"; version = "0.4.0.3"; - sha256 = "09bb087f0870a353ec1e7e1a08017b9a766d430d956afb88ca000a6a876bf877"; + sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/prelude-extras"; description = "Higher order versions of Prelude classes"; @@ -141820,7 +151560,7 @@ self: { mkDerivation { pname = "prelude-generalize"; version = "0.4"; - sha256 = "54a2ea7783f18d89060faff8c2198717de60de4d7d5cb15ff927e97fec158540"; + sha256 = "0h452pn7zs97z5gv2p3x9pg61phphwcw5y5g1w38k3gihdvym8jl"; libraryHaskellDepends = [ base comonad logict transformers ]; description = "Another kind of alternate Prelude file"; license = stdenv.lib.licenses.publicDomain; @@ -141832,7 +151572,7 @@ self: { mkDerivation { pname = "prelude-plus"; version = "0.0.0.6"; - sha256 = "5b4ec409806660b7f06e51e9df2e06caf88219a78785202424fd050750012b8d"; + sha256 = "139b0580f1gx4hj211c7lwcq5y6a0qpdzsaidvqbfq36h04w8kjv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utf8-string ]; @@ -141846,7 +151586,7 @@ self: { mkDerivation { pname = "prelude-prime"; version = "0.1"; - sha256 = "2773edf62ec4ba5e3d6f70ad1a752fa5ed3638ec2ec0ff63d7c8e255540872ab"; + sha256 = "1avj11a5bqn8sxizzh1fxhw3dvd55xsimbbhdwymxfn45vvfswr7"; libraryHaskellDepends = [ base ]; description = "A slightly better (but conservative) Prelude"; license = stdenv.lib.licenses.mit; @@ -141857,7 +151597,7 @@ self: { mkDerivation { pname = "prelude-safeenum"; version = "0.1.1.2"; - sha256 = "d4f9f195d31198fa1a5e1edfb50684971cc5dc2695bf38c1e7e2dabdce329727"; + sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "A redefinition of the Prelude's Enum class in order to render it safe"; @@ -141869,7 +151609,7 @@ self: { mkDerivation { pname = "prelude2010"; version = "0.0"; - sha256 = "d480894d9ad18f21395a26bcba80d7bd0d02b51ad81dc0f123eb1435aa7d8f38"; + sha256 = "0f4ggnm3a57b4gqw07fq3ash43dxsy0bmg16b8wj33yik96qk06l"; libraryHaskellDepends = [ prelude-compat ]; description = "Provide Prelude with fixed content across GHC versions"; license = stdenv.lib.licenses.bsd3; @@ -141884,7 +151624,7 @@ self: { mkDerivation { pname = "preprocess-haskell"; version = "0.0.1.1"; - sha256 = "99201cdb7fca6a54f46f66881d8c2226e6caf941509d0e6f728470b954ccf4c9"; + sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r"; libraryHaskellDepends = [ base base-unicode-symbols basic-prelude bytestring Cabal containers cpphs deepseq directory file-embed foldl haskell-src-exts here @@ -141903,7 +151643,7 @@ self: { mkDerivation { pname = "preprocessor"; version = "0.1.0.0"; - sha256 = "f2ed19462f837514f5bca79019f20e50c251d1e876647aac9a37ffde350186ce"; + sha256 = "1kl604sxxzrpkan7lr3nx38m3hjh1vr1k457pksi8xc35x31kvgj"; libraryHaskellDepends = [ base Cabal directory extra filemanip filepath ghc ghc-paths microlens process template-haskell @@ -141922,7 +151662,7 @@ self: { mkDerivation { pname = "preprocessor-tools"; version = "1.0.1"; - sha256 = "c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59"; + sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9"; libraryHaskellDepends = [ base mtl parsec syb ]; homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/"; description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors"; @@ -141934,9 +151674,9 @@ self: { mkDerivation { pname = "presburger"; version = "1.3.1"; - sha256 = "86021abbd457b3bac9cb0f09ce741c4c03de433ca8834532d68d84f90cc3d097"; + sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; revision = "1"; - editedCabalFile = "7c88061e13bab0e63240c05dad36b9518ad50d7ad4ade0f8911efa7826eb4b5d"; + editedCabalFile = "0pabxck7iyhyj7wf1bflg86xb2jip4vaspf080rfdc5s2cg0d23w"; libraryHaskellDepends = [ base containers pretty ]; testHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/yav/presburger"; @@ -141948,8 +151688,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "present"; - version = "4.0.2"; - sha256 = "1eae62ac47ca11a2f13d8bebf7930b0f11e1197a5f0d8628bafce279e000600f"; + version = "4.1.0"; + sha256 = "0ys2ibfh518r9rg9bl2m5cmyfxmri47g8wg7q0n5fcbsh4sb7s5s"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/chrisdone/present"; description = "Make presentations for data types"; @@ -141962,7 +151702,7 @@ self: { mkDerivation { pname = "press"; version = "0.1.2"; - sha256 = "eefdd90cdc01ccc18b39f0d1cdc7058ae4becb291df68ebfff6aa1afd2014329"; + sha256 = "0aa3079az8bazyzqxxhx575vxr4a0p3wvlgh765w3k01vh6dkzgf"; libraryHaskellDepends = [ base containers json mtl parsec ]; homepage = "http://github.com/bickfordb/text-press"; description = "Text template library targeted at the web / HTML generation"; @@ -141979,7 +151719,7 @@ self: { mkDerivation { pname = "presto-hdbc"; version = "0.1.0.3"; - sha256 = "57c51ac8421cfd352dc5afcc430f81f747970d51405f17f8254a0e7c11b4a38c"; + sha256 = "1353nh8pq3ja4pw1fps0a46rfizph47l7k5gqlnkbz8w8b41miap"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring convertible either either-unwrap errors HDBC HTTP http-streams io-streams lens mtl network-uri safe @@ -141995,7 +151735,7 @@ self: { mkDerivation { pname = "prettify"; version = "1.0"; - sha256 = "e8e1b49ec028793e95c82057ea6a00a534c396d837f2cb5fb2a6cdc7c47f7ca1"; + sha256 = "18bwgz2cgkd6n9gwpwipv2bc6d5501mflmr0r2akwy98q2gb9qg8"; libraryHaskellDepends = [ base containers semigroups ]; description = "Haskell2010 structured text formatting"; license = stdenv.lib.licenses.bsd3; @@ -142006,7 +151746,7 @@ self: { mkDerivation { pname = "pretty"; version = "1.1.3.5"; - sha256 = "b0009d4d7915a7951ebf8519411319d65b110c2f68da7f176ec8fd98217a6f45"; + sha256 = "0ibgg8hrizf8dqbpznk85w612nyn349l26c5pwg9b9qmg56rs05h"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim QuickCheck ]; homepage = "http://github.com/haskell/pretty"; @@ -142020,7 +151760,7 @@ self: { mkDerivation { pname = "pretty-class"; version = "1.0.1.1"; - sha256 = "558d1b506ff58afb0a5fb9d85ea93a94687cc1aabcc5a112a6ee4375a7b8aee1"; + sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am"; libraryHaskellDepends = [ base pretty ]; homepage = "https://github.com/ddssff/pretty-class"; description = "Pretty printing class similar to Show"; @@ -142032,7 +151772,7 @@ self: { mkDerivation { pname = "pretty-compact"; version = "2.0"; - sha256 = "13b00817990086961672dc73818aa89bb9690a2ea0866399990f97b088e8de26"; + sha256 = "09nyx24b15qgk6cn71m05q56kfcvm2582wywf8b9d1h0k4bhic0k"; libraryHaskellDepends = [ base containers ]; description = "Pretty-printing library"; license = "GPL"; @@ -142043,7 +151783,7 @@ self: { mkDerivation { pname = "pretty-display"; version = "0.1.10"; - sha256 = "7dd446519a316ebd9b33f3d6fc61603d73ffba1f6dd3ed6ada79bd9c8a043406"; + sha256 = "01il0j59rgbrv9mfvlvd3yxgywrxc1hzrmpk6fdvsviik98ldm3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base pretty-show text ]; @@ -142059,7 +151799,7 @@ self: { mkDerivation { pname = "pretty-error"; version = "0.1.0.0"; - sha256 = "ada53c7d0e9ab16b24bc70a0b64a9f95d707d4aa267c3c659dab0fd31c680e36"; + sha256 = "0dhfd0fd63xbkmjkqz16mba0gmwmkx5bd83hphj6pccs1rykr9dd"; libraryHaskellDepends = [ base basic-prelude bytestring pretty-show ]; @@ -142074,7 +151814,7 @@ self: { mkDerivation { pname = "pretty-hex"; version = "1.0"; - sha256 = "ff9a5f2023d6a4454f06cc395726b4cac3f9d0ea03759b14ccf7d62df79e9c7a"; + sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz"; libraryHaskellDepends = [ base bytestring ]; description = "A library for hex dumps of ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -142085,7 +151825,7 @@ self: { mkDerivation { pname = "pretty-ncols"; version = "0.1"; - sha256 = "58b9f368a13fd226f29b56aaa715ac7945aebfaca9a21f96412fc92c1f476d2f"; + sha256 = "0bvd8wgjrj9g86b1z8m9mjzswibrmhasgajnkgr2dlizl5lg7faq"; libraryHaskellDepends = [ base pretty ]; description = "A implementation of multi-column layout w/ Text.PrettyPrint"; license = stdenv.lib.licenses.bsd3; @@ -142097,8 +151837,8 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.6.12"; - sha256 = "9629c98ac0f2eb215cd81cf61321c5181acd18df35d89817093e934f786774b9"; + version = "1.6.13"; + sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142118,7 +151858,7 @@ self: { mkDerivation { pname = "pretty-simple"; version = "2.0.0.0"; - sha256 = "e64bfc73a962bba3f773e8e271d63e3e25924e1a6febbea7d3935d37ae856fbe"; + sha256 = "1gkghnp3fpcksfkvxsvg3979499y7vb73qp8fgvs7fv2m5rzqjz6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142136,8 +151876,8 @@ self: { ({ mkDerivation, base, generics-sop, pretty-show }: mkDerivation { pname = "pretty-sop"; - version = "0.2.0.0"; - sha256 = "931e60782ff551f864b2548fcb39c2e05e502a4b2ef76108a6f66b672c88590f"; + version = "0.2.0.2"; + sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn"; libraryHaskellDepends = [ base generics-sop pretty-show ]; description = "A generic pretty-printer using generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -142148,7 +151888,7 @@ self: { mkDerivation { pname = "pretty-tree"; version = "0.1.0.0"; - sha256 = "dc8d57a0beb5e1c861a78d9fec3216ea9d1001d084281b63a5803125b129c831"; + sha256 = "0cf856qjacc0lmiina44s00i17ga2qrfr7wdlxhwiqdmpsh5g3fw"; libraryHaskellDepends = [ base boxes containers ]; description = "Pretty-print trees"; license = stdenv.lib.licenses.bsd3; @@ -142159,7 +151899,7 @@ self: { mkDerivation { pname = "pretty-types"; version = "0.2.3.1"; - sha256 = "e56c49d1099aaeafe0b982ef9e60cb7194fd987c4b659a8d7bcde380d3b8784f"; + sha256 = "0kvqp39q1qydgf6rlrabgjcgv53irdh9xvw2p7hazbls178ljv75"; libraryHaskellDepends = [ base mtl tagged ]; testHaskellDepends = [ base hspec tagged ]; homepage = "https://github.com/sheyll/pretty-types#readme"; @@ -142172,7 +151912,7 @@ self: { mkDerivation { pname = "prettyFunctionComposing"; version = "2.0.0"; - sha256 = "0d222ed7f53f836ae025a5f19e242f1224e065043c19f25ec51e27d516e47823"; + sha256 = "08vqwhbda9qyqmgg469w0ijy090j5wj9xwd54ph6m0rzypbjw8hd"; libraryHaskellDepends = [ base ]; description = "prettier function composition by (°)"; license = stdenv.lib.licenses.bsd3; @@ -142183,12 +151923,120 @@ self: { mkDerivation { pname = "prettyclass"; version = "1.0.0.0"; - sha256 = "e537446e7a346e5e0872ed8281db2bb0220c737f10757848c901da1399548986"; + sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5"; libraryHaskellDepends = [ base pretty ]; description = "Pretty printing class similar to Show"; license = stdenv.lib.licenses.bsd3; }) {}; + "prettyprinter" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, criterion + , doctest, mtl, pgp-wordlist, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.1"; + sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y"; + revision = "1"; + editedCabalFile = "0b3f3b55h49pini9fv01km1ydqwp6l687qmy193y8lcmrygnzbdy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base criterion mtl random text transformers + ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "A modern, easy to use, well-documented, extensible prettyprinter"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "prettyprinter-ansi-terminal" = callPackage + ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text + }: + mkDerivation { + pname = "prettyprinter-ansi-terminal"; + version = "1.1"; + sha256 = "0z2vi26qhrw5z36yy449x5yynv3wyx1c02z4m2lf7la7r9jwwfbj"; + libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "ANSI terminal backend for the »prettyprinter« package"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "prettyprinter-compat-annotated-wl-pprint" = callPackage + ({ mkDerivation, base, prettyprinter, text }: + mkDerivation { + pname = "prettyprinter-compat-annotated-wl-pprint"; + version = "1"; + sha256 = "0zpmpbpnyxqswfb7gdj0kwz7hw606fj1iwkpl1qv0xcxk6n9n99c"; + revision = "2"; + editedCabalFile = "175bchsbx8vws1gx83z9f0l30p95353l0gyds5b0k5b5sj4fzw13"; + libraryHaskellDepends = [ base prettyprinter text ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "Prettyprinter compatibility module for previous users of the annotated-wl-pprint package"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "prettyprinter-compat-ansi-wl-pprint" = callPackage + ({ mkDerivation, base, prettyprinter, prettyprinter-ansi-terminal + , text + }: + mkDerivation { + pname = "prettyprinter-compat-ansi-wl-pprint"; + version = "1.0.1"; + sha256 = "0gzpjddnxl4z8pvb0lyal13jbr94dk900k8g4qwcq9fs26vnnb81"; + libraryHaskellDepends = [ + base prettyprinter prettyprinter-ansi-terminal text + ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "prettyprinter-compat-wl-pprint" = callPackage + ({ mkDerivation, base, prettyprinter, text }: + mkDerivation { + pname = "prettyprinter-compat-wl-pprint"; + version = "1.0.0.1"; + sha256 = "17jj8m9s3cp1s1szpy67g7wni9ssid78jqksh3aym7p6ci81y8km"; + revision = "2"; + editedCabalFile = "0j495j9crv6qi7rq044x6bx8688zqybx5w02cbv54w208ii1pzcl"; + libraryHaskellDepends = [ base prettyprinter text ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "Prettyprinter compatibility module for previous users of the wl-pprint package"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "prettyprinter-vty" = callPackage + ({ mkDerivation, base, prettyprinter, vty }: + mkDerivation { + pname = "prettyprinter-vty"; + version = "0.1.0.0"; + sha256 = "12nj0v9p5bjbhwmkknc2ybdw52m5hngnf7c53qfi3crbrx4maxrd"; + 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.2"; + sha256 = "0h9n1v3xqvxf8pmycmj5qd4gw8zcxgy4l1fjxff9sfzhpsnvcmp9"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + homepage = "https://github.com/andrewthad/prim-array#readme"; + description = "Primitive byte array with type variable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prim-spoon" = callPackage ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck , spoon @@ -142196,7 +152044,7 @@ self: { mkDerivation { pname = "prim-spoon"; version = "0.1.0"; - sha256 = "3349b21d56c9c635c89b679d805e155cf658a26a675f553cbb261d61b776a27c"; + sha256 = "0z52fsvn2796pcy5apv7dai5ixjw2mg817b7kg43bin9aqfv4j9k"; libraryHaskellDepends = [ base ghc-prim spoon ]; testHaskellDepends = [ base HUnit QuickCheck spoon ]; benchmarkHaskellDepends = [ base criterion ghc-prim spoon ]; @@ -142210,7 +152058,7 @@ self: { mkDerivation { pname = "prim-uniq"; version = "0.1.0.1"; - sha256 = "fb059785133fe5ecaa57c6c840192f252c4c5a1a598160d5704ac2a83e895aff"; + sha256 = "1zssi4zaihjaf3an10ar39d4qb155wcl1j66aymfrr9z2f2rf1gv"; libraryHaskellDepends = [ base dependent-sum primitive ]; homepage = "https://github.com/mokus0/prim-uniq"; description = "Opaque unique identifiers in primitive state monads"; @@ -142222,7 +152070,7 @@ self: { mkDerivation { pname = "primes"; version = "0.2.1.0"; - sha256 = "74d66558fb638ea4d31eae2fe1a294cb5a9d64491314305d74a11d93f277c65b"; + sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/sebfisch/primes"; description = "Efficient, purely functional generation of prime numbers"; @@ -142234,9 +152082,9 @@ self: { mkDerivation { pname = "primitive"; version = "0.5.1.0"; - sha256 = "8817a5f307c4605709b37857c048caa22fcc7550d681d64a2eea756126721529"; + sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8"; revision = "1"; - editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec"; + editedCabalFile = "1v4q1mz08fzagp4xpbw5ifmymlrsw380yccdvhcgqfrl2lrgb2zf"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; @@ -142249,9 +152097,9 @@ self: { mkDerivation { pname = "primitive"; version = "0.6.1.0"; - sha256 = "93731fa72eaf74e8e83453f080828e18cec9fbc82bee91b49ba8b61c043d38c8"; + sha256 = "1j1q7l21rdm8kfs93vibr3xwkkhqis181w2k6klfhx5g5skiywwk"; revision = "1"; - editedCabalFile = "6ec7c2455c437aba71f856b797e7db440c83719509aa63a9a3d1b4652ca3683d"; + editedCabalFile = "0gb8lcn6bd6ilfln7ah9jmqq6324vgkrgdsnz1qvlyj3bi2w5ivf"; libraryHaskellDepends = [ base ghc-prim transformers ]; testHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; @@ -142264,9 +152112,9 @@ self: { mkDerivation { pname = "primitive"; version = "0.6.2.0"; - sha256 = "b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1"; + sha256 = "1q9a537av81c0lvcdzc8i5hqjx3209f5448d1smkyaz22c1dgs5q"; revision = "1"; - editedCabalFile = "a67c9da25c0d15971f8dc06c119cae4a0180a7216c0a3a3d6e52357d2f7ac134"; + editedCabalFile = "0d61g8ppsdajdqykl2kc46kq00aamsf12v60ilgrf58dbji9sz56"; libraryHaskellDepends = [ base ghc-prim transformers ]; testHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; @@ -142282,7 +152130,7 @@ self: { mkDerivation { pname = "primitive-simd"; version = "0.1.0.0"; - sha256 = "d131c7a6aedc55c113e71fbc22cd79e2105186fb5e359236de04abe46433b58d"; + sha256 = "13dm6djf9aq4vqv94dayzf352472g76j5g0zww9w2mfwmskcfcfi"; libraryHaskellDepends = [ base ghc-prim primitive vector ]; benchmarkHaskellDepends = [ base criterion deepseq random vector ]; description = "SIMD data types and functions"; @@ -142299,7 +152147,7 @@ self: { mkDerivation { pname = "primula-board"; version = "0.0.1"; - sha256 = "49c31b0404b74fa2b8dbe7ef18d806428fbb3917e96df513289bdf16411c0142"; + sha256 = "0hh13i0idpwv509zavg92wwvp3s20vc1ivz7vfwa4kxp0h21phs9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142320,7 +152168,7 @@ self: { mkDerivation { pname = "primula-bot"; version = "0.0.2"; - sha256 = "3d80fe707025faeb176cddd5274e4383dc3d16978014345aff01f5b839957d48"; + sha256 = "0j3xjlwvix81zxd38540jwb3vp438d72gmfxdhbypyi5f1qgx01x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142339,7 +152187,7 @@ self: { mkDerivation { pname = "pringletons"; version = "0.4"; - sha256 = "1f64cc8a021bcd9f535928e1ed2907df1f556359c28c1a3f4d61f3e1eb0e66fb"; + sha256 = "1yv61vmy3wv19lzim362b5ima7yz0wlyvq98b59rzk8v0a5cqr0z"; libraryHaskellDepends = [ aeson base hashable singletons template-haskell text unordered-containers vector vinyl @@ -142355,7 +152203,7 @@ self: { mkDerivation { pname = "print-debugger"; version = "1.1.9"; - sha256 = "e89a0e2d8bc5bf67ca3c079ad690b48602241afb0de557fa6abefc099c6e8481"; + sha256 = "10c4dsf0kz5ydbx5gr8dzcd280l6nj8dd6h77k56ggy5icnhx6p8"; libraryHaskellDepends = [ base split ]; homepage = "https://github.com/JohnReedLOL/HaskellPrintDebugger"; description = "Debug print formatting library"; @@ -142370,7 +152218,7 @@ self: { mkDerivation { pname = "printcess"; version = "0.1.0.3"; - sha256 = "5f6c220f9e0251785c8b250df3636c2d012d2a670677df46dad64ca4949eb52a"; + sha256 = "0ammksaa8k6nv93dyxq6cwm2s09ddiiz6395idf7hl82kq7j4v2z"; libraryHaskellDepends = [ base containers lens mtl transformers ]; testHaskellDepends = [ base containers hspec HUnit lens mtl QuickCheck transformers @@ -142387,7 +152235,7 @@ self: { mkDerivation { pname = "printf-mauke"; version = "0.7.0"; - sha256 = "c518dca90f5767a63d10fc98be31cf20f96cc86609550b4530d1bfbcbf149715"; + sha256 = "05cp2jzvrgyi612hnm89cv46ry90rwqvx67w20yscrsp1ylxq665"; libraryHaskellDepends = [ base bytestring containers data-default template-haskell ]; @@ -142400,7 +152248,7 @@ self: { mkDerivation { pname = "printf-safe"; version = "0.1.0.1"; - sha256 = "54c6aadd6b084064cd2dfdddd80eec7fc03ccf0cb91ec544c82641836eff6a9d"; + sha256 = "17bazxp86h96r12ca7mr1k7krh3zxh7dipgx5p6n8h08dgfsmijl"; libraryHaskellDepends = [ base ]; description = "Type safe interface for Text.Printf"; license = stdenv.lib.licenses.bsd3; @@ -142411,7 +152259,7 @@ self: { mkDerivation { pname = "printxosd"; version = "0.1"; - sha256 = "31c459dafe68ff0a4911fd22f757cf95ff2d0b8fc3f5b44572163524ee32d6d7"; + sha256 = "1myn6bp28d8nf92v9xf3iw5jvzwmrxbzf8px254hmzv8zvd5ki1i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base xosd ]; @@ -142425,7 +152273,7 @@ self: { mkDerivation { pname = "priority-queue"; version = "0.2.2"; - sha256 = "8e969f0126c24703d435c67d2afe9dbcbbd238f8e3dd191440550cea018d515b"; + sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf"; libraryHaskellDepends = [ base containers queue reord stateref ]; homepage = "http://code.haskell.org/~mokus/priority-queue"; description = "Simple implementation of a priority queue"; @@ -142439,7 +152287,7 @@ self: { mkDerivation { pname = "priority-sync"; version = "0.2.1.1"; - sha256 = "cfb44d10f756c3e4959d6924f5db05a8e3813c12181ad44416a7396ed41acfb9"; + sha256 = "1ffg3ba6wfd72r2d86hq28y83qx80pdza939knay9hsnyw84vd6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142451,35 +152299,36 @@ self: { }) {}; "privileged-concurrency" = callPackage - ({ mkDerivation, base, lifted-base, monad-control, stm - , transformers-base + ({ mkDerivation, base, contravariant, lifted-base, monad-control + , stm, transformers-base }: mkDerivation { pname = "privileged-concurrency"; - version = "0.5"; - sha256 = "5be035781722144dec6ab14f443ecccb6addcf4be2f871f4bb372e5a9790ebfe"; + version = "0.6.1"; + sha256 = "0dky434kdnb84a4wxlx3jcg1f7c7g4xh0llfiqv48wpk7lwkaic2"; libraryHaskellDepends = [ - base lifted-base monad-control stm transformers-base + base contravariant lifted-base monad-control stm transformers-base ]; description = "Provides privilege separated versions of the concurrency primitives"; license = stdenv.lib.licenses.bsd3; }) {}; "prizm" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text + ({ mkDerivation, base, convertible, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text }: mkDerivation { pname = "prizm"; - version = "0.3.1.2"; - sha256 = "6909454f9aa0a10aed4dfb3d4625df3a2271bed80c1a5f6922c32387228c1758"; - libraryHaskellDepends = [ base text ]; + version = "3.0.0"; + sha256 = "10sjs223i7yqhhdhd6lpaq4sz30faywiw0yp494dziybh63lrg4v"; + libraryHaskellDepends = [ base convertible text ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 + base convertible HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/ixmatus/prizm"; - description = "Compute with colors and differenct color spaces"; + description = "Convert colors to different color spaces, interpolate colors, and transform colors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142489,7 +152338,7 @@ self: { mkDerivation { pname = "probability"; version = "0.2.5.1"; - sha256 = "d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d"; + sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; @@ -142505,7 +152354,7 @@ self: { mkDerivation { pname = "probable"; version = "0.1.2"; - sha256 = "df4d08403d4776f90845b3f5fc21068dcaa7fa78bc9e89522ff2914fc7efd753"; + sha256 = "0lypxz3lz4gj5x98k7mwg3xagjld0qhzrxdk8l4gjxj77m00hkfz"; libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; @@ -142524,9 +152373,9 @@ self: { mkDerivation { pname = "proc"; version = "0.0.9"; - sha256 = "8a8e6685d3b917d9db2ccbd55028af49bf0a2a51f27a7dcf7901413230c96c5c"; + sha256 = "0p3cr4q34h81g77psypja4m0mgs9mwl51mfb5kdxj5xrsf2nd3la"; revision = "1"; - editedCabalFile = "bf249bc625b72139c2e981f4bf0500fc6c7a749c28824c63f62f68cee9fbe028"; + editedCabalFile = "0a70zglwws1gyrilr0i8kis7lv7w002vzx41x713j8dp4p39n95z"; libraryHaskellDepends = [ base containers directory filepath process regex-tdfa split strict xformat @@ -142541,7 +152390,7 @@ self: { mkDerivation { pname = "proc-net"; version = "1.0.0.2"; - sha256 = "ff2fef989700770d1405abbd7d89d106b6cdae1c731e8b54107022a98521fd13"; + sha256 = "04zx462sj8kh21a8n7kk3jpcvdh6s64pvgdb0la0sxq0jycfybzz"; libraryHaskellDepends = [ attoparsec base bytestring network unix ]; @@ -142556,7 +152405,7 @@ self: { mkDerivation { pname = "process"; version = "1.6.0.0"; - sha256 = "3534c9a7e48a0d4417c230f4c6abbc3991e7919ea5a68c7de22729f7fcd8da0b"; + sha256 = "02ysv3ygfa97w9yqr9m5ks8yg49rpjmwdx1hq8bl83cawjkwjd1m"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -142572,7 +152421,7 @@ self: { mkDerivation { pname = "process-conduit"; version = "1.2.0.1"; - sha256 = "886d9a901620da5d43a3d42dd13e02ef12503f7612a8c4b4117ecc2d2bf7cb42"; + sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8"; libraryHaskellDepends = [ base bytestring conduit control-monad-loop mtl process resourcet shakespeare shakespeare-text template-haskell text @@ -142591,8 +152440,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.7.1"; - sha256 = "d25f6228825960b90f86aba3e49bf27fe1cd2f893b44ccb748c3442aa6bcd30f"; + version = "0.7.2"; + sha256 = "0n79m1kj59w4s2a86m1hm98019452mhh06szn0jwsvb9xhqi0v77"; libraryHaskellDepends = [ base bytestring data-default deepseq generic-deriving ListLike mtl process text @@ -142610,7 +152459,7 @@ self: { mkDerivation { pname = "process-iterio"; version = "0.0.0"; - sha256 = "5f8ca1642316447957241f2117ea0d8a71ba5705eda276b875c593edc0916da2"; + sha256 = "18kdj70fv4y5fnw7d8pd0mbvlwca1pm1f88z4ibpji0n4dja332z"; libraryHaskellDepends = [ base bytestring cpphs iterIO process transformers ]; @@ -142628,7 +152477,7 @@ self: { mkDerivation { pname = "process-leksah"; version = "1.0.1.4"; - sha256 = "7bf15534c348f865997ea661b2967cecba3427a463242a72d442486de1f229a1"; + sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv"; libraryHaskellDepends = [ base directory filepath unix ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; @@ -142641,9 +152490,9 @@ self: { mkDerivation { pname = "process-listlike"; version = "1.0"; - sha256 = "f908c20a2a637fc1d431519c7db0eebd4661721474afbd385433f5eb2e485f79"; + sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r"; revision = "3"; - editedCabalFile = "75f8f07195965b0a2ca36725792b095896801d4e4133c7c67a72600bdbeb63b1"; + editedCabalFile = "1cb3xgdhnq3jgb3cfcs19qfq15jq14mpj9b7lcn0lnwnjmqz1y3m"; libraryHaskellDepends = [ base bytestring deepseq ListLike process text ]; @@ -142660,7 +152509,7 @@ self: { mkDerivation { pname = "process-progress"; version = "0.14"; - sha256 = "364eb3e2c4a491b8012c0a38d9c843a8e10faff9ecba1262820a74672a5abf4d"; + sha256 = "0kdzb8m6fx0ah9i15fpcz6phzqd88g4djf0a5h0vi4d4qkib6kin"; libraryHaskellDepends = [ base bytestring deepseq HUnit ListLike mtl process process-listlike text time unix utf8-string @@ -142678,7 +152527,7 @@ self: { mkDerivation { pname = "process-qq"; version = "0.2.0"; - sha256 = "4abc38000634e7f32b79d383a65158b0ea55d282e8a963b7acc9c999066b2591"; + sha256 = "1495dc39kjf9mjvn7ag8hb95bsmhb18sd0ykg4mz7rrl0q03ig2a"; libraryHaskellDepends = [ base bytestring enumerator mtl process shakespeare-text template-haskell text @@ -142701,7 +152550,7 @@ self: { mkDerivation { pname = "process-streaming"; version = "0.9.1.2"; - sha256 = "5f2e016ecbd5b811dcd17ecec7d680d3fd29ffb66e27f735fc662948fd42584e"; + sha256 = "0kjq8bylhab6zhszf9vfnvzjkzfkh3bcgkkys7f13f6mrdp02bjz"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -142728,7 +152577,7 @@ self: { mkDerivation { pname = "processing"; version = "1.2.0.2"; - sha256 = "5a8336b15801397de4057a713c83126153fd853e0a989daaea42debeb5463215"; + sha256 = "059j8ssvxpj2xam9v60a7s2zslv12a1kqwbs0pj7sf81b2qkd0ss"; libraryHaskellDepends = [ base blaze-html containers directory filepath mainland-pretty multiset QuickCheck quickcheck-instances template-haskell text @@ -142746,7 +152595,7 @@ self: { mkDerivation { pname = "processing-for-haskell"; version = "0.1.0.1"; - sha256 = "8303039ea8fe7830b95ca1859295a89468dc0c369c83e7991960e876fbcf1854"; + sha256 = "0m0qrzxpds3036cyg0ww6q6dqs4lm2ar51d1bjwk0y7ym2g060w3"; libraryHaskellDepends = [ base data-default GLUT hsnoise NumInstances OpenGL random time transformers utf8-string vector-space @@ -142763,7 +152612,7 @@ self: { mkDerivation { pname = "processor-creative-kit"; version = "0.1.0.1"; - sha256 = "0722225ebe81121f8fe3182e17c2de558935fb6d3a055117116bed0099ff50cb"; + sha256 = "1jshzych1vbb24bm219sdpxkb2amvv11fbhqwf7iy4l1prg248h7"; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq mtl ]; @@ -142777,7 +152626,7 @@ self: { mkDerivation { pname = "procrastinating-structure"; version = "1.0.1"; - sha256 = "830e033110a1f4d20f81188e7931d0810f69d44b81421667783df9eaaab8d588"; + sha256 = "126mp2mfmy9xg1kichl19ga6j3w1s0qpk3hqh47x5x5120qh63l3"; libraryHaskellDepends = [ base procrastinating-variable ]; description = "Pure structures that can be incrementally created in impure code"; license = "unknown"; @@ -142789,7 +152638,7 @@ self: { mkDerivation { pname = "procrastinating-variable"; version = "1.0.2"; - sha256 = "844d49ca18c3a357ab746761194763633e20406a4cf5cdbef3901c79a605fd8a"; + sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/gcross/procrastinating-variable"; description = "Haskell values that cannot be evaluated immediately"; @@ -142802,7 +152651,7 @@ self: { mkDerivation { pname = "procstat"; version = "0.1.0.1"; - sha256 = "b5641816f111ec9493666d52716bac1cd00780b235b8e78fded65931982ca7d5"; + sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m"; libraryHaskellDepends = [ attoparsec base bytestring ]; homepage = "http://closure.ath.cx/procstat"; description = "get information on processes in Linux"; @@ -142817,7 +152666,7 @@ self: { mkDerivation { pname = "proctest"; version = "0.1.3.0"; - sha256 = "b62dfdd378553d6111a8f226246d93e6ae803e56ea5dbd29e33ff5ac86183f0a"; + sha256 = "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring HUnit process text ]; @@ -142836,9 +152685,9 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.7.1.0"; - sha256 = "9800a0ebd9334b2503b692ac1a11bcf9bfbe0213d737a9aa9620c2761bb9d334"; + sha256 = "0d6kp4dpdhi0jsmajdyp2c1bxgzrph8imb4jnq1jajrkv7ms004q"; revision = "1"; - editedCabalFile = "56aad124ad4489c1e22a606800ebc4bd6e30ce1a3b66a0b42dc415a6e002bae5"; + editedCabalFile = "1rds0bhac5f45nsa0riv3b730vmxqkmh0s305bic32a4mljd3ajn"; libraryHaskellDepends = [ base contravariant profunctors tagged template-haskell ]; @@ -142855,7 +152704,7 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.8.0.3"; - sha256 = "4fa4b1c6ba4f84305ef11e001695a7027f37d4a88bf34996ed3724233ac40cc9"; + sha256 = "1j8cqhx2691pxnb4kwwbm3a3fzq2lyaic00yy5g3112gpb3b392g"; libraryHaskellDepends = [ base contravariant profunctors tagged template-haskell ]; @@ -142871,7 +152720,7 @@ self: { mkDerivation { pname = "prof2dot"; version = "0.4.1"; - sha256 = "cf3288aab7a6e9843d71fb627640baec3c8e0e2a9edaa59f8ce7d9ebacf6c1b1"; + sha256 = "1cf1ysnfpng7ijgsbnly5878wg7cp907cqpvf4yq9sd6nym8hcng"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142890,7 +152739,7 @@ self: { mkDerivation { pname = "prof2pretty"; version = "0.1.0.0"; - sha256 = "991828364a58ade8c77e3200b79b4d7e4800c2f91d38dfe5cb64bacfc0cb8e80"; + sha256 = "104frg0czfk4rgjxyf0xz7100j3y9ndvf01jgv3yibaq98v2h64r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142902,6 +152751,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "profiterole" = callPackage + ({ mkDerivation, base, containers, directory, extra, filepath + , ghc-prof, hashable, scientific, text + }: + mkDerivation { + pname = "profiterole"; + version = "0.1"; + sha256 = "1wfj8rmcablya94shhrnx2dbk3pfbhvdv6mk6946fyjfy32di266"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory extra filepath ghc-prof hashable + scientific text + ]; + homepage = "https://github.com/ndmitchell/profiterole#readme"; + description = "Restructure GHC profile reports"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "profiteur" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, filepath , ghc-prof, js-jquery, scientific, text, unordered-containers @@ -142909,8 +152777,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.2.1"; - sha256 = "6b2af36243f15aa5396e0056159d9ad38422cce9eebafa59e6d439b2a8932916"; + version = "0.4.3.0"; + sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142927,7 +152795,7 @@ self: { mkDerivation { pname = "profunctor-extras"; version = "4.0"; - sha256 = "8a3c51ef41d686e39f87875dd48e72e5aa83956125bdf9922edf531c292a4482"; + sha256 = "10j458liqlyz5s9gkg95c6aq7ap5fa7d8pc7hygy71nn87pm2g4a"; libraryHaskellDepends = [ base profunctors ]; doHaddock = false; homepage = "http://github.com/ekmett/profunctor-extras/"; @@ -142942,7 +152810,9 @@ self: { mkDerivation { pname = "profunctors"; version = "5.2"; - sha256 = "87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4"; + sha256 = "1905xv9y2sx1iya0zlrx7nxhlwap5vn144nxg7s8zsj58xff59w7"; + revision = "1"; + editedCabalFile = "1q0zva60kqb560fr0ii0gm227sg6q7ddbhriv64l6nfv509vw32k"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -142957,19 +152827,31 @@ self: { mkDerivation { pname = "progress"; version = "1.0"; - sha256 = "24f1a304d6857eed5de60655d78d0693f049c6f00099e12c7d375b31cd264c31"; + sha256 = "0cac4v6k2nrpglnf3680y334kw4k0s6xfm86wrfyszl5sq2a7w94"; libraryHaskellDepends = [ base time ]; description = "Simple progress tracking & projection library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "progress-meter" = callPackage + ({ mkDerivation, async, base, containers, stm }: + mkDerivation { + pname = "progress-meter"; + version = "0.1.0"; + sha256 = "0xbrs2ydi64vllwz55b100ggwdcixi2p8zxlbxg7hg7s6ki244xf"; + libraryHaskellDepends = [ async base containers stm ]; + homepage = "https://github.com/esoeylemez/progress-meter"; + description = "Live diagnostics for concurrent activity"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "progress-reporting" = callPackage ({ mkDerivation, base, deepseq, mtl, time }: mkDerivation { pname = "progress-reporting"; version = "1.0.0"; - sha256 = "8dddfbd5007871c47e53d01ad3366605679107504f23de568ccde0ed73a633f8"; + sha256 = "1y1klrryvq6diibdw8sga03r2rq5cqvd66nhadzc8wbq03azppcd"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; license = stdenv.lib.licenses.lgpl3; @@ -142980,7 +152862,7 @@ self: { mkDerivation { pname = "progressbar"; version = "0.0.1"; - sha256 = "da0e18e771284738de24858b87c96b135c591df5158b1a212b9edcc6fad5ce27"; + sha256 = "09yfspxcdp4y5chim2qmylfmjp0kdg4qg2w54kg3hir8f7kih3ns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base io-reactive ]; @@ -142996,7 +152878,7 @@ self: { mkDerivation { pname = "progression"; version = "0.5.0.2"; - sha256 = "ead69c1123064a4e9265ea5c1b501e180beeafec2fa8d41a8ac54b98ca0e4007"; + sha256 = "01s01v59hjy5i8dd9a1gxjpyw2qq3r81np7acn94wjh64c8rrmpa"; libraryHaskellDepends = [ base containers criterion directory filepath haskeline process txt-sushi @@ -143014,7 +152896,7 @@ self: { mkDerivation { pname = "progressive"; version = "0.1.0.1"; - sha256 = "705d1b59f80ceafa64aa21738f8f7802afc0b257da92c632819c8b9e027d4bdf"; + sha256 = "1psbgl19x2wwh4rcd4nsayrc1bq2g27qywr1m9jgmshcz1cinpbh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143032,7 +152914,7 @@ self: { mkDerivation { pname = "proj4-hs-bindings"; version = "0.1"; - sha256 = "506518c9a449b263ad14f1712f106efb611f0ef3f16b3b40a05c87bac2939333"; + sha256 = "0cwkjg1bm1swl103nsziyc71yqgvdq82ywgi2jnn7cj9lk4ihrah"; libraryHaskellDepends = [ base ghc-prim ]; librarySystemDepends = [ proj ]; description = "Haskell bindings for the Proj4 C dynamic library"; @@ -143040,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 @@ -143048,7 +152998,7 @@ self: { mkDerivation { pname = "project-template"; version = "0.2.0"; - sha256 = "aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310"; + sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit conduit-extra containers directory filepath mtl resourcet text transformers @@ -143067,9 +153017,9 @@ self: { mkDerivation { pname = "projection"; version = "0.1"; - sha256 = "8109a1ef47cec2f34dc3c8e04baa3ea121a73a0086f055757e1e71916ecb3f3d"; + sha256 = "0g9zrdp92w8ygrsmbw4600xaf8d17sm4pq68qd6z7hnf8zps22c1"; revision = "1"; - editedCabalFile = "805db4a9404200c6d8c00b7e96f95c9c71e3595b6601f75efed7237ad5bed30b"; + editedCabalFile = "02ykpvapl8ypzrggf0b6bdcy6wcwbkwrczhbq3ccc02282lv8pc0"; libraryHaskellDepends = [ base ]; description = "Projection function for arbitrarily nested binary product types"; license = stdenv.lib.licenses.bsd3; @@ -143080,7 +153030,7 @@ self: { mkDerivation { pname = "projectroot"; version = "0.2.0.1"; - sha256 = "53753086543ed199cf6f0d76852660f5d74c0874bfdee21c0f4e0d845b7e1ab8"; + sha256 = "1f0sgrdq83af1wff5pmzfh44rmzmc0k8axhddz7rkl9yaj330xak"; libraryHaskellDepends = [ base directory ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/yamadapc/haskell-projectroot"; @@ -143095,7 +153045,7 @@ self: { mkDerivation { pname = "prolog"; version = "0.2.0.1"; - sha256 = "e06a107cc13fad311883294b5fe6d8ed941e4f614b6350354b1c3b06f3687a1c"; + sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -143113,7 +153063,7 @@ self: { mkDerivation { pname = "prolog-graph"; version = "0.1.0.2"; - sha256 = "22a14159c4bb39052e3cb99b9378538dd22dc1b031abf10c121ce26035f87cf0"; + sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143130,7 +153080,7 @@ self: { mkDerivation { pname = "prolog-graph-lib"; version = "0.2.0.1"; - sha256 = "d99ec8b2f245ad6bf0b152024f119b08fdc1436ea30edfe63e5b57583124aa0b"; + sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr"; libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; homepage = "https://github.com/Erdwolf/prolog"; description = "Generating images of resolution trees for Prolog queries"; @@ -143147,7 +153097,7 @@ self: { mkDerivation { pname = "prologue"; version = "1.0.7"; - sha256 = "37e8c186881e2cce7702812f64cc6fd27273cb9d3f34f59ffaaf0a365235935b"; + sha256 = "0nwk6m93c2mgzagzad1zkp5p6wnjdz668bw109vwwb0yi23c3s1p"; libraryHaskellDepends = [ base bifunctors binary cond container convert data-default data-layer errors functor-utils impossible lens lens-utils mtl @@ -143167,7 +153117,7 @@ self: { mkDerivation { pname = "prometheus"; version = "0.4.1"; - sha256 = "3a32953351a2829e6bb0bf5fd30654ce703397e5e65ffb8665fa367eff7277bb"; + sha256 = "1fvpfbzpwdpscn3gnpz6wnbk6w6fah3d6pxzn1mrx0m2a4rracis"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-types text transformers wai warp @@ -143184,8 +153134,8 @@ self: { }: mkDerivation { pname = "prometheus-client"; - version = "0.1.0.1"; - sha256 = "bdc0b7a6df25037dbc10d16960922ce8f3582d7eb79c5d60360e61da3220772f"; + version = "0.1.1"; + sha256 = "0jsa68r8flkhn29yk2qi9b9a3s5yqxzd1ivwydgzrm5izq96x34z"; libraryHaskellDepends = [ atomic-primops base bytestring containers mtl stm time transformers utf8-string @@ -143202,12 +153152,38 @@ 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 { pname = "prometheus-metrics-ghc"; - version = "0.1.0.1"; - sha256 = "17842db364e459d59e5f298345828843622b4e095b37b8ad7c556a2722854795"; + version = "0.1.1"; + sha256 = "1wkyd28g4dklah0g4sf0bp64nb5zr2n3ld9bgp573cbfjlkcyc4w"; libraryHaskellDepends = [ base prometheus-client utf8-string ]; testHaskellDepends = [ base doctest prometheus-client ]; homepage = "https://github.com/fimad/prometheus-haskell"; @@ -143215,12 +153191,26 @@ 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 { pname = "promise"; version = "0.1.0.0"; - sha256 = "cf59d01629e18c5f961481b483849136e97783aaf11c4b8a615795c06bbefac3"; + sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg"; libraryHaskellDepends = [ async base ]; homepage = "http://github.com/jfischoff/promise"; description = "A monadic interface for async"; @@ -143233,7 +153223,7 @@ self: { mkDerivation { pname = "promises"; version = "0.3"; - sha256 = "bf7c901915c122e7ab270f4c90cf02e83a703bf78f246948dc2452dcd294f260"; + sha256 = "0q7jjk9dqli4vi46j94gywxp0fp80b7r0k0g4ymyf8n12lcr0z5z"; libraryHaskellDepends = [ base primitive ]; homepage = "http://github.com/ekmett/promises/"; description = "Lazy demand-driven promises"; @@ -143247,7 +153237,7 @@ self: { mkDerivation { pname = "prompt"; version = "0.1.1.2"; - sha256 = "67b5711ef4c650747645b6d9de16a8bb04e04d1c2e4d39e3a8d4099873a151f2"; + sha256 = "1wjil5rrh2flm3ikjk9f3i6y015vm0bdxndn8mv78l66yhg73db7"; libraryHaskellDepends = [ base base-compat mtl transformers transformers-compat ]; @@ -143263,7 +153253,7 @@ self: { mkDerivation { pname = "propane"; version = "0.1"; - sha256 = "44d28ef334678a4d5566f380153546a83718c8d12276118c1a501c35bbe6f4cf"; + sha256 = "1kzlwsxka72h3a612xi2s741hdx88qsib07kcralv2k76krqxlj4"; libraryHaskellDepends = [ base colour containers directory filepath repa repa-devil spawn ]; @@ -143274,25 +153264,25 @@ self: { "propellor" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl - , network, process, stm, text, time, transformers, unix + , directory, exceptions, filepath, hashable, hslogger, IfElse, mtl + , network, process, split, stm, text, time, transformers, unix , unix-compat }: mkDerivation { pname = "propellor"; - version = "3.4.1"; - sha256 = "b5d8f9773d4f58ab68fc036dacf7368b450e0535769bb1df28e80166cd3d2116"; + version = "4.4.0"; + sha256 = "1rh8k1g8wpp898qh3g2k19v7qd95lv7l8vnb52dns350pgyswssx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal async base bytestring containers directory exceptions - filepath hslogger IfElse MissingH mtl network process stm text time - transformers unix unix-compat + filepath hashable hslogger IfElse mtl network process split stm + text time transformers unix unix-compat ]; executableHaskellDepends = [ ansi-terminal async base bytestring containers directory exceptions - filepath hslogger IfElse MissingH mtl network process stm text time - transformers unix unix-compat + filepath hashable hslogger IfElse mtl network process split stm + text time transformers unix unix-compat ]; homepage = "https://propellor.branchable.com/"; description = "property-based host configuration management in haskell"; @@ -143304,7 +153294,7 @@ self: { mkDerivation { pname = "properties"; version = "0.0.2"; - sha256 = "91f356964f9411f36121d4dbfa23a2721a559f71727483bcb139e9fbfa2f4311"; + sha256 = "04a35zxgps9rn6y86x3jf6gma6kjl8izmnyl45hz64cl9yb5dwwi"; libraryHaskellDepends = [ base ]; description = "check quickCheck properties in real time"; license = stdenv.lib.licenses.bsd3; @@ -143320,7 +153310,7 @@ self: { mkDerivation { pname = "property-list"; version = "0.1.0.5"; - sha256 = "b3009043d57ecfa092049fb2b0241066928145a083df6abee2d3f9b3cc3e6973"; + sha256 = "0wv97v6b7yfkwaz6mpw3l12q34k620jb1clz0j9a1kvysm1r005k"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal containers free oneOfN recursion-schemes syb template-haskell text time time-locale-compat @@ -143337,7 +153327,7 @@ self: { mkDerivation { pname = "proplang"; version = "0.1"; - sha256 = "95f0c50263e67f327537aa64a4d7e92576e8d43350dcd1f16dec49d0360ea0ee"; + sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m"; libraryHaskellDepends = [ base glade glib gtk ]; homepage = "http://www-users.cs.york.ac.uk/~ndm/proplang/"; description = "A library for functional GUI development"; @@ -143350,7 +153340,7 @@ self: { mkDerivation { pname = "props"; version = "0.1.2"; - sha256 = "7d49cedca59b9fa00c13912a0e9e63502814044c0e74fa6262af9740215e7381"; + sha256 = "10bkbqhl15xgc9iglx0f9h218a2hcfg0wali2c6a17wvlpfcwjbx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "http://github.com/deviant-logic/props"; @@ -143366,7 +153356,7 @@ self: { mkDerivation { pname = "prosper"; version = "0.1.1"; - sha256 = "eb41df9ee8f6fab2b793215c6c590f34f625d54c95576cda70056913461cd000"; + sha256 = "006h3i316s85f3d6qmwm9kajbxil1xcnqp11jfvv5ypnx2gdyhgb"; libraryHaskellDepends = [ aeson base bytestring cereal containers HsOpenSSL http-streams io-streams mtl text transformers vector @@ -143378,20 +153368,20 @@ self: { }) {}; "proteaaudio" = callPackage - ({ mkDerivation, alsaLib, base, c2hs }: + ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }: mkDerivation { pname = "proteaaudio"; - version = "0.6.5"; - sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e"; + version = "0.7.0.1"; + sha256 = "1v56qmgwj5cd8xbk19qgjwwkc1nbya1vagai7kypf5aj8c07gjrq"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; - librarySystemDepends = [ alsaLib ]; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ libpulseaudio ]; libraryToolDepends = [ c2hs ]; description = "Simple audio library for Windows, Linux, OSX"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) libpulseaudio;}; "proto-lens" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers @@ -143400,8 +153390,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.1.0.5"; - sha256 = "d3096c4e089bc7a8e6221afde8afc0b02f8e67028e119f3be04906cf4fc67a6e"; + version = "0.2.1.0"; + sha256 = "1nibz7cqlwj0vp350km80df10330s2hqvhwr36liiqc92ghphvzg"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class lens-family parsec pretty text transformers void @@ -143418,8 +153408,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.0.1"; - sha256 = "df1ef1741af1d37d87063392ed0ce2e67bc2435a5754bdf35d0c65c8fb1e4d50"; + version = "0.1.0.3"; + sha256 = "029liw55v5k9f5bsfpsadd85sgrriwvrhfk242d2wfp3fypafd39"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -143430,21 +153420,22 @@ self: { }) {}; "proto-lens-combinators" = callPackage - ({ mkDerivation, base, data-default-class, HUnit, lens-family - , proto-lens, proto-lens-protoc, test-framework - , test-framework-hunit, transformers + ({ mkDerivation, base, Cabal, data-default-class, HUnit + , lens-family, lens-family-core, proto-lens, proto-lens-protoc + , test-framework, test-framework-hunit, transformers }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.4"; - sha256 = "3d153caff241c45097d2acac97176d2dc54af626b4895678f51069ce7ceb66fb"; + version = "0.1.0.7"; + sha256 = "0c00ipxpyqizzgd3fg0hfqs1bqypah90zysjb0c4pl5hhaqi9bak"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base data-default-class lens-family proto-lens proto-lens-protoc transformers ]; testHaskellDepends = [ - base HUnit lens-family proto-lens proto-lens-protoc test-framework - test-framework-hunit + base HUnit lens-family lens-family-core proto-lens + proto-lens-protoc test-framework test-framework-hunit ]; homepage = "https://github.com/google/proto-lens"; description = "Utilities functions to proto-lens"; @@ -143454,15 +153445,15 @@ self: { "proto-lens-descriptors" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class - , lens-family, proto-lens, text + , lens-family, lens-labels, proto-lens, text }: mkDerivation { pname = "proto-lens-descriptors"; - version = "0.1.0.5"; - sha256 = "89e2eef7c99dc8ca669ad63dd4020a5d05133f92ddb148b1965ced523a6ad18a"; + version = "0.2.1.0"; + sha256 = "1qaprwdxck8h06wha6hp94kia5m247bc73973rz870c7hk2pdh6s"; libraryHaskellDepends = [ base bytestring containers data-default-class lens-family - proto-lens text + lens-labels proto-lens text ]; description = "Protocol buffers for describing the definitions of messages"; license = stdenv.lib.licenses.bsd3; @@ -143472,8 +153463,8 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.0.1"; - sha256 = "1ab3ac9137c05f6041fa2ff8527da4e80875d94eff97c77cdc43e65cc0c5dc28"; + version = "0.1.0.3"; + sha256 = "16wk5paba9p7rz1z614d9byszygkqvxca78zwxyzjgvyjw1yssyl"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -143483,21 +153474,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-protobuf-types" = callPackage + ({ mkDerivation, base, Cabal, proto-lens-protoc }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.2.1.0"; + sha256 = "1x548hpl7yaqx9y2hdw5p8fc6lmxihlv2wam2x7c03zjkibb04y9"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ proto-lens-protoc ]; + 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 ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts - , lens-family, process, proto-lens, proto-lens-descriptors, text + , lens-family, lens-labels, process, proto-lens + , proto-lens-descriptors, text }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.1.0.5"; - sha256 = "0efb5b62e2cccb3edc29b93c75aabcccc652992a01e8f5eae7bf7eae2078192e"; + version = "0.2.1.0"; + sha256 = "0ywjn4px6sj82h53yzx466gsa42cgfg47w5vzvxfbdzqk4bskfdd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default-class directory - filepath haskell-src-exts lens-family process proto-lens - proto-lens-descriptors text + filepath haskell-src-exts lens-family lens-labels process + proto-lens proto-lens-descriptors text ]; executableHaskellDepends = [ base bytestring containers data-default-class filepath @@ -143516,7 +153522,7 @@ self: { mkDerivation { pname = "protobuf"; version = "0.2.1.1"; - sha256 = "cd659a085b670d204c0b4ddf0cb323e4f024c9d972cf183dc14154a44d5e722c"; + sha256 = "0b3jbr6s8m21q4yiikvjv74j9w744frhrpsd1d6203b7bc49lrfd"; libraryHaskellDepends = [ base base-orphans bytestring cereal data-binary-ieee754 deepseq mtl text unordered-containers @@ -143538,7 +153544,7 @@ self: { mkDerivation { pname = "protobuf-native"; version = "1.0.0.1"; - sha256 = "d9a099f92b0aaf89dbabe360165c49003d28cc001bba3ae9a45d8e4caaa46c4c"; + sha256 = "0k3cljm4r3jxlklkmfhv0362hg8095f1cq73mgdqkbqa5gwrk86r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143562,8 +153568,8 @@ self: { }: mkDerivation { pname = "protobuf-simple"; - version = "0.1.0.2"; - sha256 = "ef2b79ffd3f11796027cbc5bbcfcc68a6d1948f66acd079bb60c6d6ed00622f3"; + version = "0.1.0.4"; + sha256 = "1164f2v0wyqfvzbmfp8g2hi7jzx1pykzaix36mlh9rvd58s1h1m2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143587,8 +153593,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.0"; - sha256 = "1c4e8249a4913444cf5f0df7a1129ba8021b2eb09d99bce2af0d69791e5ffe69"; + version = "2.4.2"; + sha256 = "13z1sh8z5b3nlscqnzw137k3979d4war3yzhxclljqq2z88rm1bv"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -143602,8 +153608,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.0"; - sha256 = "f894bcc3301c2c6306d795b99205c59d92d6fa81244f0d8d4f2cbe46c7b23df4"; + version = "2.4.2"; + sha256 = "0r7n1pnkabzksik9zrqif490g135hcjgvc40zm5c0b3dpq64r4lb"; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -143619,7 +153625,7 @@ self: { mkDerivation { pname = "protocol-buffers-descriptor-fork"; version = "2.0.16"; - sha256 = "0b2fb09ae6eb60f5b92956fbeb7e8042f24c24f9d57942be9146587034f6c6f2"; + sha256 = "1wn6yqs70n26j6z44yfmz4j4rwj2h1zfpysn56wzaq7bwsdb0bqb"; libraryHaskellDepends = [ base bytestring containers protocol-buffers-fork ]; @@ -143636,7 +153642,7 @@ self: { mkDerivation { pname = "protocol-buffers-fork"; version = "2.0.16"; - sha256 = "3f669bf641ab6de2dc3ed2a642316ab92aa343959ec8ca03daad8fd706613318"; + sha256 = "061kc43dg3xdv81wmj4yjm1s6amrd8ql59nj7vff4vdb87v9nriz"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl syb utf8-string @@ -143654,7 +153660,7 @@ self: { mkDerivation { pname = "protolude"; version = "0.1.10"; - sha256 = "163296a518f0d7329dcdf040bf0eddb1fb804eee198405801fab8f192ce1c7a5"; + sha256 = "19f7w4n1k3xb3y00b10rxr781yxivl7byh7hrnfk5mzh32jrcchn"; libraryHaskellDepends = [ async base bytestring containers deepseq ghc-prim mtl safe stm text transformers @@ -143670,7 +153676,7 @@ self: { mkDerivation { pname = "protolude-lifted"; version = "0.1.1.0"; - sha256 = "82a83f5b6ba7f16be05dfaa5e490b6fe65b93fe3b6b3dbf8969f7bda9f2bf532"; + sha256 = "0cpm5fgxlywzjvwdpcxnwczvjrgyns8f99gsbph6pwd7dddkza42"; libraryHaskellDepends = [ async base lifted-async lifted-base protolude ]; @@ -143687,7 +153693,7 @@ self: { mkDerivation { pname = "proton-haskell"; version = "0.7"; - sha256 = "119e3687f72085659ffc7d324e3fa3bc458b2c5e0b7bc69e9d0fe17c3b82c4be"; + sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi"; libraryHaskellDepends = [ base containers directory filepath ]; testHaskellDepends = [ base containers directory filepath HUnit test-framework @@ -143704,7 +153710,7 @@ self: { mkDerivation { pname = "prototype"; version = "0.5.3"; - sha256 = "278e62454660796001cf2f4f3aa88820a1f8760996ba5fc7fb4f08e31bb4f1cf"; + sha256 = "1kzinhdy622gzg3mzfln15vgi890i2l3lkrgrw0n0yb08r2n53i7"; libraryHaskellDepends = [ base monads-tf ]; description = "prototype-based programming on Haskell"; license = stdenv.lib.licenses.bsd3; @@ -143718,7 +153724,7 @@ self: { mkDerivation { pname = "prove-everywhere-server"; version = "0.1.1"; - sha256 = "5d0e5627aa1ee65b32c0551991bb9ec55414ea57293dd69ac24bb424f3f1f388"; + sha256 = "127ky7rj9d2bqaddcg99azm18m65ksxr26amq0r5prhym8kmc3jx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143737,19 +153743,32 @@ self: { mkDerivation { pname = "proxied"; version = "0.2"; - sha256 = "76f3a157b2f5373d46aa4203369a17052ce472a21dc2b067f7810b117a1cee0b"; + sha256 = "02zf3ix122w1yxkv1hhxl9rf8b052yd3c0s2m933sdzmn9bs3wvn"; libraryHaskellDepends = [ base generic-deriving tagged ]; homepage = "https://github.com/RyanGlScott/proxied"; description = "Make functions consume Proxy instead of undefined"; license = stdenv.lib.licenses.bsd3; }) {}; + "proxied_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proxied"; + version = "0.3"; + sha256 = "09pbvf40qykrzmg4lrk5krhx30gzsldk1bz2i6bb6d18bx14skak"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/RyanGlScott/proxied"; + description = "Make functions consume Proxy instead of undefined"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proxy-kindness" = callPackage ({ mkDerivation, base, tagged }: mkDerivation { pname = "proxy-kindness"; version = "0.1"; - sha256 = "27a2dfe755ed9fe4ebf0599ee3243d5c9d34730d2289e6e8696f776aa191ff72"; + sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7"; libraryHaskellDepends = [ base tagged ]; homepage = "https://github.com/jberryman/proxy-kindness"; description = "A library for kind-polymorphic manipulation and inspection of Proxy values"; @@ -143767,7 +153786,7 @@ self: { mkDerivation { pname = "psc-ide"; version = "0.6.1"; - sha256 = "d2dc589b62f279e97cbe8ad87db2c907c3f1c2bb8e9f0e60978d547cee4a06b5"; + sha256 = "1d869bp7qm4djxh0x7wfpg1g3hq7r6r7vn4apryfjygjcadmip6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143797,9 +153816,9 @@ self: { mkDerivation { pname = "pseudo-boolean"; version = "0.1.5.0"; - sha256 = "11db4cd25d452d126cc4761daeff4068a42070919939aec490f7a23fb8136876"; + sha256 = "0xk82fw3z8ppj32awfcrj5q2193883zsw7bnqin14ba5bp94rnqi"; revision = "1"; - editedCabalFile = "06425fb261d25e35ad80b858435efbc7fed38eb17c54793e6d57c77bf15ae250"; + editedCabalFile = "0l72bbqppispdlz7jm3wn67d7zn7zdg46n5qh2nkapnjc6r5yhh6"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec @@ -143818,9 +153837,9 @@ self: { mkDerivation { pname = "pseudo-trie"; version = "0.0.4.3"; - sha256 = "6bc3d45069da2d418e00a1403a80be933a2cb1fe86e6d549f8c40568f29b1208"; + sha256 = "020jkgr6h1f4z14xbrl6zsqjqflkps03lh5102742bfsd58d9hvb"; revision = "1"; - editedCabalFile = "4566dd5a8847365d789eda525e2a8a61475cda0476102bda375affd3305387f5"; + editedCabalFile = "1xc7acqd7zss6zd2n43n0kd5qiv1i8m5wlnskrw5sdj7i1ddsrj5"; libraryHaskellDepends = [ base semigroups ]; description = "A tagged rose-tree with short circuited unique leaves"; license = stdenv.lib.licenses.bsd3; @@ -143831,7 +153850,7 @@ self: { mkDerivation { pname = "pseudomacros"; version = "0.0.2"; - sha256 = "8919dff4d679bf4c39db0d14f6c04b77ef5cca6b53f4ff043885ee633b3e4f84"; + sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9"; libraryHaskellDepends = [ base template-haskell time ]; description = "cpp-style built-in macros using Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -143842,7 +153861,7 @@ self: { mkDerivation { pname = "psi"; version = "0.1.1.0"; - sha256 = "4fbd37a54cbbf64a2ce827c8d055ff6b497df36057643abcaac499dd481fd07c"; + sha256 = "0z6h3x4dv6f4may3lr2pc3rpsjbbzxax1j17x0n4mxmv9jjkggag"; libraryHaskellDepends = [ base bytestring deepseq semigroups text ]; @@ -143855,7 +153874,7 @@ self: { mkDerivation { pname = "psql-helpers"; version = "0.1.0.0"; - sha256 = "f13ca642072477d3ab0246c514e3fc78e0c5cb419345240fbad994ed2a3219f4"; + sha256 = "1x0r68mfv56rp87j8ick875wbq3qzkii9ia60amx6xr40x1acg7i"; libraryHaskellDepends = [ base postgresql-simple ]; homepage = "http://github.com/agrafix/psql-helpers#readme"; description = "A small collection of helper functions to generate postgresql queries"; @@ -143870,8 +153889,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.2.3"; - sha256 = "6d757c30f6fdc8df7ed62601f2b2530e71192109ab94d06dec4176c9c3eea6b5"; + version = "0.2.3.0"; + sha256 = "19s36xkbpa8466y56bgcmrqxz7aq1fysliyvw79k2a76bpg9bv95"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -143890,7 +153909,7 @@ self: { mkDerivation { pname = "pstemmer"; version = "0.1.0.0"; - sha256 = "413930ab93d41b60b0b992b286f350f4c30b184abab990ef70da3d4714a69599"; + sha256 = "16cmlqa4fgfsf3pr1fds98c0phzla3rqdcljp6q606yljfmk0fa1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -143901,20 +153920,17 @@ self: { }) {}; "pub" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, ConfigFile, containers - , groom, hedis, hslogger, mtl, network, pipes, pipes-bytestring - , safe, system-filepath, text, time, transformers + ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes + , pipes-bytestring, text }: mkDerivation { pname = "pub"; - version = "2.0.2"; - sha256 = "88897bf7ff1e150c78727235b21e78c50b8a977055a1fc9f5174fe497089445f"; + version = "3.0.0"; + sha256 = "1svyfvpqarmfy634s61l1pg7wc9y35bn753zq3vs1rvbw9lmxpj5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cmdargs ConfigFile containers groom hedis hslogger - mtl network pipes pipes-bytestring safe system-filepath text time - transformers + base bytestring hedis optparse-generic pipes pipes-bytestring text ]; description = "Pipe stdin to a redis pub/sub channel"; license = stdenv.lib.licenses.bsd3; @@ -143928,7 +153944,7 @@ self: { mkDerivation { pname = "publicsuffix"; version = "0.20170109"; - sha256 = "1b8c8b6c4eb93604598f5f6b7b671cc72b2f0d50a4dfe174e97a72d9919c1844"; + sha256 = "0i0qkj8xjwksx5sf3px4a06jyay73ikpnsszixch8dmr9rn8p30v"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -143937,6 +153953,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20170508" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20170508"; + sha256 = "0nb9ykmzwhm0lrn22g26rv19vxb2b4aifm98x2zk7rs8w6ha4vv4"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -143944,7 +153977,7 @@ self: { mkDerivation { pname = "publicsuffixlist"; version = "0.1"; - sha256 = "b37fbe099748e2a3a5a3b6661911d72749c2ec24d88ee686ae125de91fac7955"; + sha256 = "0mbrmhgyjp8jms3fd3nq4knc4j97sw8ijrmnlfjs7qj8jw4vwzxk"; libraryHaskellDepends = [ base bytestring cereal containers data-default text utf8-string ]; @@ -143964,7 +153997,7 @@ self: { mkDerivation { pname = "publicsuffixlistcreate"; version = "0.0.2"; - sha256 = "23e6751badb4e35b3d621ca5b68818c15c8ca9d062c60d47d4f73bdba3cb8a6c"; + sha256 = "0v4arfixnfzpsi3hvik2s2lqqp61324bd98wc8ympqxlmldpbri3"; libraryHaskellDepends = [ base bytestring conduit containers data-default idna publicsuffixlist text @@ -143987,7 +154020,7 @@ self: { mkDerivation { pname = "pubnub"; version = "1.1.1"; - sha256 = "68c30c83902520791e50f4095711f99fd66611e6a218ce3cbe8f0cae5f718c32"; + sha256 = "0clcf5gsw34gpqycw652wq8ndmlzz48mf2gla0g7j815j21hrhv8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144017,7 +154050,7 @@ self: { mkDerivation { pname = "pubsub"; version = "0.11"; - sha256 = "a85ea9dbdb2eba32c247fbc65d2355184a8e962548939c92081814fc17f3aa27"; + sha256 = "09xaycbzq50q1299r4s84nb8wjhqalimvipv8z135fifvgdsjpm8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144039,7 +154072,7 @@ self: { mkDerivation { pname = "puffytools"; version = "0.0.0.1"; - sha256 = "31b1268aa769ff474c47f08235350f193ac336b73409490e3118667a8766185f"; + sha256 = "0pqqcs3plrhq6474j29lnwvc6fhr1wskb0ph8x64gzv9ly52dc9i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144067,7 +154100,7 @@ self: { mkDerivation { pname = "pugixml"; version = "0.3.3"; - sha256 = "2b8b6db68f0cb2987d1804537f7b81523af0a357ea3a08a940302120804ede9b"; + sha256 = "16yy9s02089h82lhhfpaayiz0fjjh5xpylq431yrichciyv6v2rb"; libraryHaskellDepends = [ base bytestring data-default-class template-haskell ]; @@ -144085,7 +154118,7 @@ self: { mkDerivation { pname = "pugs-DrIFT"; version = "2.2.3.20150815"; - sha256 = "10585b9889b5ab22736d7009b4565286f5e30edcc6c886f3ffd72fae96133e78"; + sha256 = "0y1y2fbawbypzzrqdj66vh7f7xc6a9bb82bhdmrj5axmi6c5nn0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144106,7 +154139,7 @@ self: { mkDerivation { pname = "pugs-HsSyck"; version = "0.41"; - sha256 = "e166bdd74b2b7a32b946adb196b04a7d9b0c8802d238f716a4f5fb811a740d81"; + sha256 = "108dfhd83yzmlhbgff6j0a40r6vx9aq9dcdd8swk4yib9gbvsrp1"; libraryHaskellDepends = [ base bytestring ]; description = "Fast, lightweight YAML loader and dumper"; license = "unknown"; @@ -144122,7 +154155,7 @@ self: { mkDerivation { pname = "pugs-compat"; version = "0.0.6.20150815"; - sha256 = "7eff41b243368d7e3e1b72ebb82b6f19033ad95358f19a5c0b354f081621dc40"; + sha256 = "0h6w44b0hkrm1df9mwaqagckl0qrdwmvisvj3cz7x39n8fr43zvy"; libraryHaskellDepends = [ array base bytestring containers directory hashtables mtl network process random regex-base regex-pcre-builtin stm stringtable-atom @@ -144137,7 +154170,7 @@ self: { mkDerivation { pname = "pugs-hsregex"; version = "1.0"; - sha256 = "718c000d32502a98d4026e695de0b60a09533fd19d5ea611179a3b75fec6a8df"; + sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i"; libraryHaskellDepends = [ array base haskell98 ]; homepage = "http://repetae.net/john/computer/haskell/hsregex/"; description = "Haskell PCRE binding"; @@ -144150,7 +154183,7 @@ self: { mkDerivation { pname = "pulse"; version = "0.1.0.0"; - sha256 = "cde4b4e00f4afdc36916ccb8319756e4743c31086fedcad4b9039e506122f85a"; + sha256 = "0npq49hm17h3p7acmvbg10qkqx74asbk3f6c2rlw7zaa1zhb9r6d"; libraryHaskellDepends = [ async base containers time ]; homepage = "https://github.com/agrafix/pulse#readme"; description = "Synchronize actions to a time pulse"; @@ -144162,7 +154195,7 @@ self: { mkDerivation { pname = "pulse-simple"; version = "0.1.14"; - sha256 = "84429d8b05f34be7f34cca59f361ededbc8c82e0c27f4acb8a155750ba6541ab"; + sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; @@ -144174,7 +154207,7 @@ self: { mkDerivation { pname = "pulseaudio"; version = "0.0.2.0"; - sha256 = "72cbacaf7c94bdaa27c9e0d299a00fe3f31e0cc0f9c2d6e7de9690b3154c078e"; + sha256 = "13h79hav744nvvkxdhprq061xwz31yh9klp0r4ksmgclgjpsrjvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers stm unix ]; @@ -144190,7 +154223,7 @@ self: { mkDerivation { pname = "punkt"; version = "0.1.1"; - sha256 = "2b41929f615677277d15cbcd74725fe2edb0dd196a81667dd0df94fad6bc1942"; + sha256 = "0hhrpkbgm56zs1ynd0ba37fv1vg2bxr79kfb2myjfxsnc6gr4h9b"; libraryHaskellDepends = [ array base mtl regex-tdfa regex-tdfa-text text unordered-containers ]; @@ -144210,7 +154243,7 @@ self: { mkDerivation { pname = "punycode"; version = "2.0"; - sha256 = "59072915dbd5f94d5cc2e6ac84061b329ab84a9f22fd18a591ad5fdba37b52a4"; + sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr"; libraryHaskellDepends = [ base bytestring cereal mtl text ]; testHaskellDepends = [ base bytestring cereal encoding HUnit mtl QuickCheck text @@ -144227,7 +154260,7 @@ self: { mkDerivation { pname = "puppetresources"; version = "0.4.2"; - sha256 = "2b8bc4fc8cb08f919b8ca77feb14131f581832a06983b8025a509ed9afe39a18"; + sha256 = "064swfpxk7jhb81bi0v9l0r1hn0z2cafnzx7ijdr33xhikyc92rb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144247,7 +154280,7 @@ self: { mkDerivation { pname = "pure-cdb"; version = "0.1.2"; - sha256 = "25228a3052ad7f6cfc003569668c94c5ecaa7665a5e205b54f221bf42ff3f840"; + sha256 = "0h7qycpz86r29yshbqm5cmvamv65jj66cs9m03y6qzxda8q8l8i5"; libraryHaskellDepends = [ base binary bytestring containers directory mtl vector ]; @@ -144265,7 +154298,7 @@ self: { mkDerivation { pname = "pure-fft"; version = "0.2.0"; - sha256 = "91243a564912cf9f36e2eec381d715537e9bd43817b88b063ba0affedc56f9ff"; + sha256 = "1zzravfgxbx07c38pf0p73a9nzjk2pbq3hzfw8v9zkqj95b3l94i"; libraryHaskellDepends = [ base ]; description = "Fast Fourier Transform"; license = stdenv.lib.licenses.bsd3; @@ -144276,7 +154309,7 @@ self: { mkDerivation { pname = "pure-io"; version = "0.2.1"; - sha256 = "a9ef0f324ce29fecdcdb11f2ce0088bcf282951727d983824e05f12e519bfb5f"; + sha256 = "0pzvkd8jxw859s187n972yaq5wmwi00cxwhivgffr7z29hr0zvx9"; libraryHaskellDepends = [ base containers mtl safe ]; description = "Pure IO monad"; license = stdenv.lib.licenses.bsd3; @@ -144287,7 +154320,7 @@ self: { mkDerivation { pname = "pure-priority-queue"; version = "0.14"; - sha256 = "772cb853676ec634ee733745d77250a570d5cc3a0fc734a97bf758d3e5b4bb88"; + sha256 = "125vnkjx6n7pgflk9iqg7b6daw55a1rdfi9pfgp39ikfcx9vhb3p"; libraryHaskellDepends = [ base containers ]; description = "A pure priority queue"; license = stdenv.lib.licenses.bsd3; @@ -144301,7 +154334,7 @@ self: { mkDerivation { pname = "pure-priority-queue-tests"; version = "0.12"; - sha256 = "6dc0c3c8486f7585194e3fa779d585b6fddca5da00776bc7edffde566f6ea29f"; + sha256 = "17x2drpmdppzxp3nnxq0vajxrzdnhpapk9rz9qcqaxbg934c7h3d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144321,7 +154354,7 @@ self: { mkDerivation { pname = "pure-zlib"; version = "0.6"; - sha256 = "ab7814fbef5bfa299d3c9e3f7c614a20d3a2600b85807ee7284e235ada78ebc5"; + sha256 = "1igbg3d5l8sf53kpx0451dha5lr099hpqgwy7jfjkyjvxzxi8y5b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144348,7 +154381,7 @@ self: { mkDerivation { pname = "pureMD5"; version = "2.1.3"; - sha256 = "bef3358a5e3a45b649860a5792f052e2f927c0492a7056cf64425116c8a7b17d"; + sha256 = "0zdilz41cla2ck7mcw1a9702gyg2abq94mqahr4vci9sbs53bwxy"; libraryHaskellDepends = [ base binary bytestring cereal crypto-api tagged ]; @@ -144361,25 +154394,24 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty - , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html - , bower-json, boxes, bytestring, cheapskate, clock, containers - , data-ordlist, deepseq, directory, dlist, edit-distance - , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec - , hspec-discover, http-client, http-types, HUnit - , language-javascript, lens, lifted-base, monad-control - , monad-logger, mtl, network, optparse-applicative, parallel - , parsec, pattern-arrows, pipes, pipes-http, process, protolude - , regex-tdfa, safe, scientific, semigroups, silently, sourcemap - , spdx, split, stm, syb, system-filepath, text, time, transformers - , transformers-base, transformers-compat, turtle + ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal + , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes + , bytestring, cheapskate, clock, containers, data-ordlist, deepseq + , directory, dlist, edit-distance, file-embed, filepath, fsnotify + , gitrev, Glob, haskeline, hspec, hspec-discover, http-client + , http-types, HUnit, language-javascript, lens, lifted-base + , monad-control, monad-logger, mtl, network, optparse-applicative + , parallel, parsec, pattern-arrows, pipes, pipes-http, process + , protolude, regex-tdfa, safe, scientific, semigroups, silently + , sourcemap, spdx, split, stm, stringsearch, syb, text, time + , transformers, transformers-base, transformers-compat , unordered-containers, utf8-string, vector, wai, wai-websockets , warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.10.7"; - sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d"; + version = "0.11.6"; + sha256 = "0cl4lyx9b1fk4sf94nj6zjj1n5s7wr56ygrxyi0ac7fbav8r42w0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144389,24 +154421,34 @@ self: { fsnotify Glob haskeline http-client http-types language-javascript lens lifted-base monad-control monad-logger mtl parallel parsec pattern-arrows pipes pipes-http process protolude regex-tdfa safe - scientific semigroups sourcemap spdx split stm syb text time - transformers transformers-base transformers-compat + scientific semigroups sourcemap spdx split stm stringsearch syb + text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat - boxes bytestring containers directory file-embed filepath foldl - Glob haskeline http-types monad-logger mtl network - optparse-applicative parsec process protolude sourcemap split stm - system-filepath text time transformers transformers-compat turtle - utf8-string wai wai-websockets warp websockets + aeson aeson-better-errors ansi-terminal ansi-wl-pprint base + base-compat blaze-html bower-json boxes bytestring cheapskate clock + containers data-ordlist deepseq directory dlist edit-distance + file-embed filepath fsnotify gitrev Glob haskeline http-client + http-types language-javascript lens lifted-base monad-control + monad-logger mtl network optparse-applicative parallel parsec + pattern-arrows pipes pipes-http process protolude regex-tdfa safe + scientific semigroups sourcemap spdx split stm stringsearch syb + text time transformers transformers-base transformers-compat + unordered-containers utf8-string vector wai wai-websockets warp + websockets ]; testHaskellDepends = [ - aeson aeson-better-errors base base-compat bower-json boxes - bytestring containers directory filepath Glob haskeline hspec - hspec-discover HUnit lens monad-logger mtl optparse-applicative - parsec process protolude silently stm text time transformers - transformers-compat utf8-string vector + aeson aeson-better-errors ansi-terminal base base-compat blaze-html + bower-json boxes bytestring cheapskate clock containers + data-ordlist deepseq directory dlist edit-distance filepath + fsnotify Glob haskeline hspec hspec-discover http-client http-types + HUnit language-javascript lens lifted-base monad-control + monad-logger mtl parallel parsec pattern-arrows pipes pipes-http + process protolude regex-tdfa safe scientific semigroups silently + sourcemap spdx split stm stringsearch syb text time transformers + transformers-base transformers-compat unordered-containers + utf8-string vector ]; doCheck = false; homepage = "http://www.purescript.org/"; @@ -144422,7 +154464,27 @@ self: { mkDerivation { pname = "purescript-bridge"; version = "0.10.1.0"; - sha256 = "1a5f92b77f01a214272aed6df3c0b47d28c8f7954c07b2d16f7cdd3f2c596223"; + sha256 = "08v2b4n3zpbwdz8v41scjpvwha3xnk0g6vgd58ki98h1gyvr4pqs"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "purescript-bridge_0_11_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.11.0.0"; + sha256 = "0y2qli86ac12xr54vxdfqa3wadxajn6s266y9vpd7lahsnhjwkvf"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -144442,7 +154504,7 @@ self: { mkDerivation { pname = "purescript-bundle-fast"; version = "0.1.0.1"; - sha256 = "dc51a7d37608062267b79c15516c631019dcfca3f27865bf1ff9deb22c592d69"; + sha256 = "0s9db4nb5ppr3yznay7jlgydq68hcdn525cwnxkj41h8fv9sflfw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144459,7 +154521,7 @@ self: { mkDerivation { pname = "pursuit-client"; version = "0.1.0"; - sha256 = "ac4d1ea126212eaeda65860a27293e7b9301507bd869280d836552e8bb427c35"; + sha256 = "0dbw8axyhlk5hc6jhsfqgd8034vv7qljf2l6cpdawbi14shiwkdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144482,7 +154544,7 @@ self: { mkDerivation { pname = "push-notify"; version = "0.1.0.1"; - sha256 = "5a3e29c0f88329a54a2951b6097342126f3b06170aeed3193029485f8a6649b1"; + sha256 = "1ca9cs55yj1960cx7vha2w33nvqj89rhkdji555aaac3z302jgjs"; libraryHaskellDepends = [ aeson async attoparsec-conduit base base16-bytestring bytestring cereal certificate conduit connection containers convertible @@ -144505,7 +154567,7 @@ self: { mkDerivation { pname = "push-notify-ccs"; version = "0.1.0.1"; - sha256 = "80afd1275933f8f30e1236e75849b7832636385248d0aa3d1d60693617fbf7b9"; + sha256 = "1fgpzcbkcsb03lysml28a8w3c9l3nx4mirrn287g7y1kb4kx3bw0"; libraryHaskellDepends = [ aeson async attoparsec base bytestring cprng-aes crypto-random data-default hslogger mtl network pontarius-xmpp push-notify retry @@ -144525,7 +154587,7 @@ self: { mkDerivation { pname = "push-notify-general"; version = "0.1.0.1"; - sha256 = "b0dddd9a7c72c2703ec583ac35369a4fd18a8c5568abe5bb1d5ad43ec619dc6f"; + sha256 = "0vyw3733xm2s3nxybav8an68mlagk8v3bb43qlz71hkjgjddvpdh"; libraryHaskellDepends = [ aeson base bytestring containers data-default hashable http-client http-conduit http-types push-notify push-notify-ccs text @@ -144537,14 +154599,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pushbullet" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, lens, text + , unordered-containers, wreq + }: + mkDerivation { + pname = "pushbullet"; + version = "0.0.0"; + sha256 = "0nvy594s9jp57png3k0yy0gwqgk5snidw6rbcminzml584qswwap"; + libraryHaskellDepends = [ + aeson base bytestring lens text unordered-containers wreq + ]; + testHaskellDepends = [ base hspec ]; + description = "Simple push support for pushbullet"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pushbullet-types" = callPackage ({ mkDerivation, aeson, base, http-api-data, microlens , microlens-th, scientific, text, time, unordered-containers }: mkDerivation { pname = "pushbullet-types"; - version = "0.1.0.0"; - sha256 = "0b9ecf81378eb74d27102c2253b4ecef75032b25f40242fcb99c7fbbe99df4b4"; + version = "0.2.0.0"; + sha256 = "1r57l48xzfraa85lrkx9i8dmlrjicavz0fxr8l6c28iisj6db8js"; libraryHaskellDepends = [ aeson base http-api-data microlens microlens-th scientific text time unordered-containers @@ -144560,7 +154638,7 @@ self: { mkDerivation { pname = "pusher-haskell"; version = "0.1.0.0"; - sha256 = "26cee78343604825ff8b2426ab55a7f05787409050ffd29a6f4dd539d411b27a"; + sha256 = "0ymj27a3kmaddydd5zshj108fmzhlxasn9i4igzjaj308f1ygki6"; libraryHaskellDepends = [ aeson base bytestring HTTP MissingH mtl SHA time ]; @@ -144579,7 +154657,7 @@ self: { mkDerivation { pname = "pusher-http-haskell"; version = "1.1.0.4"; - sha256 = "7d52cf0d179e2585c82f1f223e9c6cedbc4c8d1489348d55ec89bc10f7087251"; + sha256 = "0lbj13vi1g49xiaqsd492j6lrg7ddjf3w8hz5z48a9cy2w6wylkx"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash hashable http-client http-types text time transformers unordered-containers @@ -144594,15 +154672,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pusher-http-haskell_1_2_0_0" = callPackage + "pusher-http-haskell_1_2_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptohash, hashable, hspec, http-client, http-types, QuickCheck , text, time, transformers, unordered-containers }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.2.0.0"; - sha256 = "372de78c2efaf60512d22311ad38bd6e968e9e29de171517438c8b129a4b7371"; + version = "1.2.0.1"; + sha256 = "0cm2g49vpsfq92dik89vahkcjz8a17ihx973mhpg70cx3plpz8g8"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash hashable http-client http-types text time transformers unordered-containers @@ -144626,7 +154704,7 @@ self: { mkDerivation { pname = "pusher-ws"; version = "0.1.0.0"; - sha256 = "ba74ec6413d8ae7811afe748bd6dde6e9ceb12cb65a69884f02043cb76eeab3d"; + sha256 = "0gdbxrvcnhr0y229i9k5rc9fp73fvrnvsj77mw8pibnq2djfqx5s"; libraryHaskellDepends = [ aeson base bytestring containers deepseq hashable http-conduit lens lens-aeson network scientific stm text time transformers @@ -144649,7 +154727,7 @@ self: { mkDerivation { pname = "pushme"; version = "2.0.2"; - sha256 = "fc9b7ab521dee1ccc66912b08ab6d54715cc3fe9334ece6a6f6a54bd5c18ed89"; + sha256 = "12gd31fbsm3adxmcwkikx4zwq5a7snv8mc0jd73crqfy46spm6zw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144673,7 +154751,7 @@ self: { mkDerivation { pname = "pushover"; version = "0.1.0.1"; - sha256 = "8c3168b78d79384eeabfa83ba810314c1c81adcd70a491c76ad9af016646262a"; + sha256 = "0ai68rk03byrdb3r393hrnnq272c648ahfx8pzm4wf3rinvnhccc"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-client-tls mtl text time transformers uri-encode @@ -144693,7 +154771,7 @@ self: { mkDerivation { pname = "putlenses"; version = "0.1.3"; - sha256 = "d7b9ee24bdb23e40fddfaf2446d035920a108e1e12683dc7a9e3e5d09ceb7094"; + sha256 = "153hxffd1rg3m73kss0j3s7102lj6p84c95gvzyl0gmjpljfxffp"; libraryHaskellDepends = [ base containers ghc-prim lens mtl QuickCheck random safe split template-haskell transformers @@ -144713,7 +154791,7 @@ self: { mkDerivation { pname = "puzzle-draw"; version = "0.2.0.0"; - sha256 = "02dcb3892d34d719fc93ca02168b63fff8ff25a2cb0e926cf74de49b8f5b5113"; + sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144741,7 +154819,7 @@ self: { mkDerivation { pname = "puzzle-draw-cmdline"; version = "0.1.0.4"; - sha256 = "aeffe77abfc9a6563ee5ed81f93f00e0b7d21d6dae4dc3882b6a2564a27a604b"; + sha256 = "0jv0gai689ba5f4c6kdfdlfx5dz000zzk0gdwlz5d9n9pxxfgzxf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144760,7 +154838,7 @@ self: { mkDerivation { pname = "pvd"; version = "1.1.1"; - sha256 = "79c3140a36e87a44eee930e5ef0360be127543951f3b46579ccbd36607d414a2"; + sha256 = "18hlsh3ndlybkiblcfqzjm1pa4myc01yzr9hx7p48yp86q519hvr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144782,9 +154860,9 @@ self: { mkDerivation { pname = "pvss"; version = "0.1"; - sha256 = "fa140bcc44158ae54a486668820c6b7c4b767ea702c5e687b064dcd386c0fc99"; + sha256 = "16gwq23d7p34n23ydi82lxz7cjvwdc684s36915fb2hm8k60n57s"; revision = "1"; - editedCabalFile = "2d6b823ed5c0e8852c2d91c248b09cabf83409fb71bd473ab15c44b30427dd0e"; + editedCabalFile = "03nx4w2b6i2wn4x4ggbizc4k9y5bkjq4ihli5ln8bs60slz84srd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144807,7 +154885,7 @@ self: { mkDerivation { pname = "pwstore-cli"; version = "0.4"; - sha256 = "59a2d7d748858d20365c5c1cf95ff4c843ae47a29229499aa038bab848108bb3"; + sha256 = "1cwb214bifiql2d4jacjl93swhy8yigzj72wbhv213c593bxg8jr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144829,7 +154907,7 @@ self: { mkDerivation { pname = "pwstore-fast"; version = "2.4.4"; - sha256 = "7219af66b6f762d9dd5376b3b25393d4d6626e390e9d9c9f87f6e3f13ea7fbb2"; + sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj"; libraryHaskellDepends = [ base base64-bytestring binary byteable bytestring cryptohash random ]; @@ -144845,7 +154923,7 @@ self: { mkDerivation { pname = "pwstore-purehaskell"; version = "2.1.4"; - sha256 = "2cdd7039f1b6880d8f4f2eac44f4f4ce10c7c8286a6493f45a4c47c41fadf4bc"; + sha256 = "1g7lmlgw8iscbbs96r3a534cf46fyks49b1f9y7hv25ny4wp1p9c"; libraryHaskellDepends = [ base base64-bytestring byteable bytestring random SHA ]; @@ -144859,7 +154937,7 @@ self: { mkDerivation { pname = "pxsl-tools"; version = "1.0.1"; - sha256 = "dc311c012b0b6b482cdd26337f44cff8259269d3dd83f482ab4049965fa085e0"; + sha256 = "1q45l1grcja0mf1g90yxsdlr49gqrx27ycr6vln4hsqb5c0iqcfw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl parsec ]; @@ -144875,7 +154953,7 @@ self: { mkDerivation { pname = "pyffi"; version = "0.4.0.2"; - sha256 = "1095168ed4d95618613799aa7375a8752436b0eee568834ea8b469081aa0ff32"; + sha256 = "0cpzl0d0hsdlm1786s75xsq3c93mm1sp7alr6xhihmnrsj71d58h"; libraryHaskellDepends = [ aeson base bytestring containers pureMD5 template-haskell ]; @@ -144893,7 +154971,7 @@ self: { mkDerivation { pname = "pyfi"; version = "0.4.0.4"; - sha256 = "fcc5be24ad5a32e208a5f3d3908056f1ee93814d2234f6b7176eb61018b40577"; + sha256 = "0xq5nhc11dkf2yvzcd129n0r7vpias091lzkll4f4cjsmljbxigw"; libraryHaskellDepends = [ aeson base bytestring containers pureMD5 template-haskell ]; @@ -144912,7 +154990,7 @@ self: { mkDerivation { pname = "python-pickle"; version = "0.2.3"; - sha256 = "77df7f0892f543ee9969ea00493a979f74f99a4d7f7ff79350ce20aa7d366885"; + sha256 = "11b86rysl86fa29zfzvz9ndgjx4zjwx4j07ad6cywhzmj847zpvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144933,7 +155011,7 @@ self: { mkDerivation { pname = "qc-oi-testgenerator"; version = "1.2.0.3"; - sha256 = "6f6bcb3f94db90eee136ea483b223e0fe952663474d90f47dfd888af60512f8f"; + sha256 = "13rga5haz26qvx3hznbl6ik55s8g7qi3nj7a6vhyx46vjhzwnsvg"; libraryHaskellDepends = [ base fclabels QuickCheck template-haskell ]; @@ -144948,7 +155026,7 @@ self: { mkDerivation { pname = "qd"; version = "1.0.2.1"; - sha256 = "28a47bce34fb2d56d034be0a1fffc18f9dbf3e502a4ea12c8ed8b0c56e6e1b36"; + sha256 = "0dhvdrpcbc6qiqna2kiaa0zbz7cgq7ziy2my6k85cbgv6k77p918"; libraryHaskellDepends = [ base floatshow ]; librarySystemDepends = [ qd ]; description = "double-double and quad-double number type via libqd"; @@ -144961,7 +155039,7 @@ self: { mkDerivation { pname = "qd-vec"; version = "1.1"; - sha256 = "cc7a5105235245e19a78fec0965eaf1d9e29564f43c40d6f42934da9c19b4552"; + sha256 = "0lj5kg0sjkck89phvi239xb2k7hxmxg9dh7yg2df2iaj4c2m2ync"; libraryHaskellDepends = [ base qd Vec ]; description = "'Vec' instances for 'qd' types"; license = stdenv.lib.licenses.bsd3; @@ -144975,7 +155053,7 @@ self: { mkDerivation { pname = "qed"; version = "0.0"; - sha256 = "282422e8e277ef9dd3175f1b9a97f6843187a12928886c8783f0eeb5a1819ace"; + sha256 = "1klsh6hvbvphhf3nr21856hqfcc4ysbrl6sz2z9rvvvpwbl24918"; libraryHaskellDepends = [ base deepseq directory exceptions extra filepath haskell-src-exts transformers uniplate @@ -144992,7 +155070,7 @@ self: { mkDerivation { pname = "qhull-simple"; version = "0.1"; - sha256 = "5c0bb4d8285e664683e636326f82f57b053527f5f31c1644d5dea65f185e0a3c"; + sha256 = "0g0abqc5z9nysm21c77kylkka1bvyn16ycinws1lcrjy53cb82sw"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ qhull ]; homepage = "http://nonempty.org/software/haskell-qhull-simple"; @@ -145008,7 +155086,7 @@ self: { mkDerivation { pname = "qif"; version = "1.1.1"; - sha256 = "f7fea15fbf6c290e44d75bb60ca2187009febcda88da87c931abb136f5f4d22d"; + sha256 = "0bfjykskdcdb674qgnl8vaygw2bh32i0rdjvsx20wabcpxgs3zpp"; libraryHaskellDepends = [ attoparsec base microlens microlens-th text time ]; @@ -145022,19 +155100,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qm-interpolated-string" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-meta, hspec + , template-haskell, text + }: + mkDerivation { + pname = "qm-interpolated-string"; + version = "0.1.1.0"; + sha256 = "1fidkdn4smbv4ybc881168401gfq2l19qfb7w0bvki93jqqajhs1"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; + description = "Implementation of interpolated multiline strings"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "qr-imager" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory - , haskell-qrencode, hspec, jose-jwt, JuicyPixels, lens, libqrencode - , MissingH, optparse-applicative, process, vector + , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode + , microlens, MissingH, optparse-applicative, process, vector }: mkDerivation { pname = "qr-imager"; - version = "1.0.0.2"; - sha256 = "b9c758375936269cfc16bd28b82adcbab3e8ed79e48e88fc2e23a8e89ec0d504"; + version = "1.0.1.1"; + sha256 = "1jx81ha39khy115als4sai7xz8n49i44a8nxix0gvr48p8in8cv0"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory haskell-qrencode - jose-jwt JuicyPixels lens MissingH optparse-applicative process - vector + jose-jwt JuicyPixels microlens MissingH optparse-applicative + process vector ]; libraryPkgconfigDepends = [ libqrencode ]; testHaskellDepends = [ base hspec ]; @@ -145051,7 +155146,7 @@ self: { mkDerivation { pname = "qr-repa"; version = "0.1.0.0"; - sha256 = "5e84243d64121ddc9ed8554a5783680abb2a228846744bd64ce36e2c90776d37"; + sha256 = "0dvdfy82qvp39kb4nx26i0i2mfqad21mfjjmv2gdq78jchyj912y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145070,7 +155165,7 @@ self: { mkDerivation { pname = "qrcode"; version = "0.1.2"; - sha256 = "2da96151e20a732b696004ada7605a036a598e6d1c60aca67d4ce26c3eedd6f1"; + sha256 = "1wfnxlz6rqjcgnkaqq0wdn75jsh3b9hagb84c1ljnwqaw98n3a9d"; libraryHaskellDepends = [ array base containers mtl vector ]; description = "QR Code library in pure Haskell"; license = stdenv.lib.licenses.bsd3; @@ -145083,7 +155178,7 @@ self: { mkDerivation { pname = "qt"; version = "1.1.6.1"; - sha256 = "64d3d24dbdace1a10aaafb24f943b3d4ac8dd0e6eaf1750c4347995a9a153f82"; + sha256 = "10iz2nd5m6a78c67bwgawv88vb6lnd1zj97vm85a3qdcpm6x5lv4"; libraryHaskellDepends = [ base OpenGL ]; librarySystemDepends = [ qtc_core qtc_gui qtc_network qtc_opengl qtc_script qtc_tools @@ -145099,8 +155194,8 @@ self: { ({ mkDerivation, base, process, qtah-generator, qtbase }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.2.0"; - sha256 = "d6daf6813855a41d87884cfba1afd21f100aeb5581dbc0edd4148c3a7e77efda"; + version = "0.3.1"; + sha256 = "0yy6q10lsjhjnvirs2d8pdivs9d0kdilwsm4j7s59jz5xhwzbqzl"; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; homepage = "http://khumba.net/projects/qtah"; @@ -145110,17 +155205,17 @@ self: { }) {inherit (pkgs.qt5) qtbase;}; "qtah-examples" = callPackage - ({ mkDerivation, base, binary, bytestring, filepath, hoppy-runtime - , qtah-qt5 + ({ mkDerivation, base, binary, bytestring, containers, filepath + , hoppy-runtime, qtah-qt5 }: mkDerivation { pname = "qtah-examples"; - version = "0.2.1"; - sha256 = "a9713bf999eaf60b08f6c9770860bea35c3b4f823850c36b799485d8f7593c8f"; + version = "0.3.0"; + sha256 = "0scb00dilgbiqzp1jq0jknx76qb0fc9l9wsv214k9x741q7cv71b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base binary bytestring filepath hoppy-runtime qtah-qt5 + base binary bytestring containers filepath hoppy-runtime qtah-qt5 ]; homepage = "http://khumba.net/projects/qtah"; description = "Example programs for Qtah Qt bindings"; @@ -145134,8 +155229,8 @@ self: { }: mkDerivation { pname = "qtah-generator"; - version = "0.2.1"; - sha256 = "e478535736e46ab6e373dc32993ee139043b64bbe05197d8a8fbc674174b2fef"; + version = "0.3.0"; + sha256 = "0zyhpb70lcp9r8skq6lzw4xqpa3fndbq4vxk098diqivknl064ff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -145156,8 +155251,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.2.0"; - sha256 = "8647a34799bb129436c91a566b6d18ca728fd5943bdebbfc12d90871bc16c68a"; + version = "0.3.0"; + sha256 = "0rrg0ymkhvgdhwcabr4n4alrqkzyyzyggdclygmjp7l2lq4md1ad"; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -145176,7 +155271,7 @@ self: { mkDerivation { pname = "quack"; version = "0.0.0.3"; - sha256 = "2925bcce5bc0f5d1938c3c83852608b45c625278bb7f0109afc5bd4d4b9bdfa3"; + sha256 = "18yzkd5lvgf5mw4h2zxvg1964p5l10k8b0rwij9x3xf0bg7bq999"; libraryHaskellDepends = [ aeson attoparsec base http-types mtl text ]; @@ -145192,7 +155287,7 @@ self: { mkDerivation { pname = "quadratic-irrational"; version = "0.0.5"; - sha256 = "bfd9b93b693bcf30acd3bbfc093fda16fc8952779c8698b03b5d937e110e2afd"; + sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz"; libraryHaskellDepends = [ arithmoi base containers mtl transformers ]; @@ -145214,7 +155309,7 @@ self: { mkDerivation { pname = "quandl-api"; version = "0.2.1.0"; - sha256 = "0e6b4479d01fd6d5e1f69a512345c7672fc5bc40651f8d1283832a5fcfe3b206"; + sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring http-conduit http-types syb text time time-locale-compat unordered-containers @@ -145231,7 +155326,7 @@ self: { mkDerivation { pname = "quantfin"; version = "0.2.0.0"; - sha256 = "2a9ba531decec76ceb81f12ac8a58a1418678c47714ce728cd3c8cffecac3c69"; + sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145245,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 @@ -145252,7 +155359,7 @@ self: { mkDerivation { pname = "quantities"; version = "0.4.0"; - sha256 = "603ef0d1bb4102533ef4221cc5ac533050fb430a3413ec8c7a1bfe707fc7491c"; + sha256 = "0729qxzp1zhvga6fq4rl191znl1hafnca712yhz560j1pg8z0gk0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl parsec ]; @@ -145271,7 +155378,7 @@ self: { mkDerivation { pname = "quantum-arrow"; version = "0.0.5"; - sha256 = "9c3f37a790d9372357252dabee6313a9be8c3643a7f5010478407ccb2558e5a7"; + sha256 = "19z5b0jwnz20g0203xd78cv8rgm92diyxard4mbj6dyrj2kkfgww"; libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ]; homepage = "http://github.com/luqui/quantum-arrow"; description = "An embedding of quantum computation as a Haskell arrow"; @@ -145287,7 +155394,7 @@ self: { mkDerivation { pname = "quantum-random"; version = "0.6.4"; - sha256 = "7e1461974f2ea9bc5018b3a88f6fbf7ad39cb40a81f70f588597b8274d25139b"; + sha256 = "16qk4m6jgf4phmc0zxw11as9rlvspxpqza5k318bra9f9ybn253y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145309,7 +155416,7 @@ self: { mkDerivation { pname = "qudb"; version = "0.0.1"; - sha256 = "9801d7120676a593253fd9821dd90b9472cad58159348dc53ca86c5cc68cfb32"; + sha256 = "0cpvik35qv587k2qsd2rh7awlwll1gciv0nr7wjr79bn0q9df0cq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145330,7 +155437,7 @@ self: { mkDerivation { pname = "quenya-verb"; version = "0.0.1"; - sha256 = "5def72995937385178337e3307236e5fd71cb46709a61ce7a90064543d2e817f"; + sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145351,7 +155458,7 @@ self: { mkDerivation { pname = "querystring-pickle"; version = "0.2.0"; - sha256 = "2eb3f87b9bae027d8e557c28e539e971adb62558489e18191a570f1c8e397ea1"; + sha256 = "18by7671q3sp38cii7j8b0jvdbbix4wyaa3wan77s0mfkdxzicrf"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -145367,7 +155474,7 @@ self: { mkDerivation { pname = "questioner"; version = "0.1.1.0"; - sha256 = "83ab4047671f59832eaa377e3fb3fce547439550f57479dd09e0ad4975250617"; + sha256 = "05q64mslkbg017fpjx7ma2al6iz5zjrkyzipm8p86n8zcx3l1aw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145383,7 +155490,7 @@ self: { mkDerivation { pname = "queue"; version = "0.1.2"; - sha256 = "c799ec386f79c4b3ab0c81feabe5335f7808044c0a525340e3c26b21e7d6a23b"; + sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7"; libraryHaskellDepends = [ base stm ]; homepage = "http://code.haskell.org/~mokus/queue"; description = "Abstraction typeclasses for queue-like things"; @@ -145395,7 +155502,7 @@ self: { mkDerivation { pname = "queuelike"; version = "1.0.9"; - sha256 = "3f38e9218db0fb4549fa116d2e7606d7ad0c42f8242292ecfd2cf3522c4d7a5b"; + sha256 = "0nvs9ln55wrczpn948i4z110rbfp0rv2wv8iz94lbyxhilhyjf1z"; libraryHaskellDepends = [ array base containers mtl stateful-mtl ]; description = "A library of queuelike data structures, both functional and stateful"; license = stdenv.lib.licenses.bsd3; @@ -145407,7 +155514,7 @@ self: { mkDerivation { pname = "quick-generator"; version = "0.3"; - sha256 = "d63ce00477ad46d970ab422f239c955331e7f560d22b94eca8730130eaf68cad"; + sha256 = "1bccyvm300bkm3n98ayjc3syfcakjnf26bs2mdqdjimdfw2f0g6n"; libraryHaskellDepends = [ base QuickCheck ]; description = "Generator random test data for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -145420,7 +155527,7 @@ self: { mkDerivation { pname = "quick-schema"; version = "0.1.0.0"; - sha256 = "99d2e8e25a822063c997681180c4bcb602895785c9740a9756f92c9f5bdc8e6d"; + sha256 = "0vcfvidryb7rasbhlx69hmbqj0mnpk2804b8jz4n6842bbifillr"; libraryHaskellDepends = [ aeson base hashable scientific text unordered-containers vector ]; @@ -145441,7 +155548,7 @@ self: { mkDerivation { pname = "quickbench"; version = "1.0"; - sha256 = "8bfe252e50a683346e753db312e9542f8d43256947ab215fcfd24af03787b926"; + sha256 = "09mrhwvz0jnjrxgj3as7d4jl739gakli5crxfmp390x6a0p2bzlb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145463,7 +155570,7 @@ self: { mkDerivation { pname = "quickbooks"; version = "0.5.0.1"; - sha256 = "460895f6edbb16e4256a779a817f548fef8f49464c304eb036e3ed22c4b65f30"; + sha256 = "0c2znv225vg36sq4wc2c8r4qzvwgaizq36kpd8jy85mvxpv9a226"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring email-validate fast-logger http-client http-client-tls http-types interpolate old-locale text @@ -145481,7 +155588,7 @@ self: { mkDerivation { pname = "quickcheck-arbitrary-adt"; version = "0.2.0.0"; - sha256 = "d9998dbfa2785f29164c0bdc345b2ffaed630dd5bfb1bdbaa3b0e13e0724c0db"; + sha256 = "1ny04h3kxqdhlfxbvcdzsl6n7vgs5xdk9p0b9hb2jpvqlazqv6fr"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base hspec lens QuickCheck template-haskell transformers @@ -145496,7 +155603,7 @@ self: { mkDerivation { pname = "quickcheck-assertions"; version = "0.3.0"; - sha256 = "9b0328a788dcac0824a7d7496ab403eef04170551255c9e58fb6e2e319a9cacf"; + sha256 = "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv"; libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ]; testHaskellDepends = [ base hspec ieee754 QuickCheck ]; homepage = "https://github.com/s9gf4ult/quickcheck-assertions"; @@ -145508,8 +155615,8 @@ self: { ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { pname = "quickcheck-combinators"; - version = "0.0.1"; - sha256 = "bc334ff44f93e580e13cbe07c4ccf5924bf22df943934987f769ebec6800ec8d"; + version = "0.0.2"; + sha256 = "0r8vf4dgczga2c0lkz4z6a22naxw44yfdj1wvfqncv9x18r7pkbz"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; description = "Simple type-level combinators for augmenting QuickCheck instances"; license = stdenv.lib.licenses.bsd3; @@ -145524,9 +155631,9 @@ self: { mkDerivation { pname = "quickcheck-instances"; version = "0.3.12"; - sha256 = "ddd5b988da50eff7f56737bff516fba52309f7461297698f04f1e8aaee9f9bf3"; + sha256 = "1wwvkzpams7i0j7nk5qj8vvhj8x5zcbgbgrpczszgvshva4bkmfx"; revision = "2"; - editedCabalFile = "4321c16dfe0d3c08bba1425d1058261b4b8b553ea5c5c01bd982c9d9e23b39ec"; + editedCabalFile = "1v1r7gidkjc2v4dw1id57raqnjqv4rc10pa2l6xhhg0dzrnw28a3"; libraryHaskellDepends = [ array base bytestring containers hashable old-time QuickCheck scientific text time unordered-containers vector @@ -145536,18 +155643,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_16" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, tagged, text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.16"; + sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1"; + libraryHaskellDepends = [ + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific tagged text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + homepage = "https://github.com/phadej/qc-instances"; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { pname = "quickcheck-io"; version = "0.1.4"; - sha256 = "6b3750590871b03908530764cdaa69ce67d5b514f533c1a4a6f4755f8267389d"; + sha256 = "179qcy15yxgllsjc2czm2jsxaryfd6mcsr07ac43kc3i11cm0dvb"; libraryHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/hspec/quickcheck-io#readme"; description = "Use HUnit assertions as QuickCheck properties"; license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-io_0_2_0" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck }: + mkDerivation { + pname = "quickcheck-io"; + version = "0.2.0"; + sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv"; + libraryHaskellDepends = [ base HUnit QuickCheck ]; + homepage = "https://github.com/hspec/quickcheck-io#readme"; + description = "Use HUnit assertions as QuickCheck properties"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-poly" = callPackage ({ mkDerivation, base, haskell98, hint, MonadCatchIO-mtl , QuickCheck, regex-compat, regex-tdfa @@ -145555,7 +155700,7 @@ self: { mkDerivation { pname = "quickcheck-poly"; version = "0.2.0.1"; - sha256 = "ca167f3608b701642f8e5134080f15fb3200c622abc41b7b9ac14bb3b47cb146"; + sha256 = "0imigjsb6jy1k9xipi5b4b300cpv2l7hhd2iiqpn80dp10v7y5na"; libraryHaskellDepends = [ base haskell98 hint MonadCatchIO-mtl QuickCheck regex-compat regex-tdfa @@ -145570,7 +155715,7 @@ self: { mkDerivation { pname = "quickcheck-properties"; version = "0.1"; - sha256 = "3c89ed3fb03199853455806aac3852da8fe2973ae1c78320b901aacb030f2643"; + sha256 = "0hr61w1wpah1p4h87iz17aby53ysa8waqsl0als8b69in0zyv29w"; libraryHaskellDepends = [ base ]; description = "QuickCheck properties for standard type classes"; license = stdenv.lib.licenses.bsd3; @@ -145581,7 +155726,7 @@ self: { mkDerivation { pname = "quickcheck-property-comb"; version = "0.1.0.2"; - sha256 = "e5da89c66f52eb28a3fd708ab0feea95a4fbab20c1c6c6f9922d380eab121f73"; + sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5"; libraryHaskellDepends = [ base mtl QuickCheck ]; homepage = "http://www.github.com/jfeltz/quickcheck-property-comb"; description = "Combinators for Quickcheck Property construction and diagnostics"; @@ -145594,7 +155739,7 @@ self: { mkDerivation { pname = "quickcheck-property-monad"; version = "0.2.4"; - sha256 = "2ce59041850673d8125078e36b5d29e7daab17da54d0e97547d14027452ae76a"; + sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c"; libraryHaskellDepends = [ base either QuickCheck transformers ]; homepage = "http://github.com/bennofs/quickcheck-property-monad/"; description = "A monad for generating QuickCheck properties without Arbitrary instances"; @@ -145609,7 +155754,7 @@ self: { mkDerivation { pname = "quickcheck-regex"; version = "0.0.3"; - sha256 = "1645deee601e5581b5d9ddf0227be0ccac9f3c3c485ef63f20412e8507450002"; + sha256 = "00h08l3qabj140zzcpj87hy9zb6cw1xj5w6xv6sq2m8yc3pdwi8n"; libraryHaskellDepends = [ base containers QuickCheck regex-genex regex-tdfa ]; @@ -145626,7 +155771,7 @@ self: { mkDerivation { pname = "quickcheck-relaxng"; version = "0.0.2"; - sha256 = "89241fa3960a9b5741a7c2226e677b165d08c6527c3e01a202c124f5f76b36f3"; + sha256 = "1wrndgvza9610ai02gkwab30hp8ngdknw8n2lx0mg6qajsiiy949"; libraryHaskellDepends = [ base hxt hxt-relaxng QuickCheck quickcheck-regex ]; @@ -145641,7 +155786,7 @@ self: { mkDerivation { pname = "quickcheck-rematch"; version = "0.1.0.0"; - sha256 = "6a158749e4d13b167fd242d8d2fe116493e8857d063f9b78beda0c1a0849bc5e"; + sha256 = "0pmw9441l36sprw9ngq6gn2yi4v427zd5n22s9zicfyiwi4qf5ba"; libraryHaskellDepends = [ base QuickCheck rematch ]; testHaskellDepends = [ base hspec HUnit QuickCheck rematch ]; homepage = "http://github.com/tcrayford/rematch"; @@ -145657,7 +155802,7 @@ self: { mkDerivation { pname = "quickcheck-report"; version = "0.1.0.0"; - sha256 = "34c50e79d89b21b79b52d0392ad4d7dab451cef0dd720ab35a44f99781124b5c"; + sha256 = "0p2b2a0rgya4barhlwnxy3753d6ssza2lffhaadvf8cvv1whxi9l"; libraryHaskellDepends = [ base lens QuickCheck template-haskell th-printf ]; @@ -145671,7 +155816,7 @@ self: { mkDerivation { pname = "quickcheck-script"; version = "0.1.1.1"; - sha256 = "afe8080ee42265b33cce7b096b0719d510a95dd6b9f80aab858695e91926fb94"; + sha256 = "157v4qcyk5c6hnmhmy5rsrfsj46m343nn2bvrqyb6r92wh70is5g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory process QuickCheck ]; @@ -145684,8 +155829,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.1.0.1"; - sha256 = "a57b616bb19818b3d572b455243b6839461f1b9e3b6dd829035167f1f756d598"; + version = "0.1.0.2"; + sha256 = "0p1ky7sj42crn9sas9d2cs5cwz03wsk20p55x2wgmlj5rmpr5mla"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -145697,8 +155842,8 @@ self: { }: mkDerivation { pname = "quickcheck-special"; - version = "0.1.0.3"; - sha256 = "8dbe5c2cdefb35880433902402110c1d9927b96d2363df8382fb6ee7e8d3e2f7"; + version = "0.1.0.5"; + sha256 = "189gadjm06zm3jilr5dcqbmfgq8d6j91nsvnzwwp9kdn3j9m711p"; libraryHaskellDepends = [ base bytestring ieee754 QuickCheck scientific text ]; @@ -145708,21 +155853,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "quickcheck-special_0_1_0_4" = callPackage - ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific - , text + "quickcheck-state-machine" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, mtl, parallel-io + , QuickCheck, random, stm }: mkDerivation { - pname = "quickcheck-special"; - version = "0.1.0.4"; - sha256 = "9a3f3a24b6595aaa12b4c61644e329c82457f2d49ee913986b08378dacba67b7"; + pname = "quickcheck-state-machine"; + version = "0.1.0"; + sha256 = "1jczx6c1s5ir7r7r90kf5fhac4sydayr4lm6zsvjs4ykqnnparh6"; libraryHaskellDepends = [ - base bytestring ieee754 QuickCheck scientific text + ansi-wl-pprint base containers mtl parallel-io QuickCheck random + stm ]; - homepage = "https://github.com/minad/quickcheck-special#readme"; - description = "Edge cases and special values for QuickCheck Arbitrary instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + 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; }) {}; "quickcheck-string-random" = callPackage @@ -145732,7 +155878,7 @@ self: { mkDerivation { pname = "quickcheck-string-random"; version = "0.1.0.0"; - sha256 = "dec015a4dabc4f6b63926502b11c0882272b1282d341a9d39e69033974d9eb12"; + sha256 = "04pbv5s3j0v9kv9sjhfkh892n9w210fb20k5j9innkxwvaj1bh6y"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -145748,7 +155894,7 @@ self: { mkDerivation { pname = "quickcheck-text"; version = "0.1.2.1"; - sha256 = "4442fdb8ae6cd469c04957d34fee46039c9dc0ddce23ce6050babe6826d0ab09"; + sha256 = "02dbs0k6igmsa1hcw8yfvp09v7038vp4zlsp9706km3cmswgshj4"; libraryHaskellDepends = [ base binary bytestring QuickCheck text ]; testHaskellDepends = [ base bytestring QuickCheck text ]; homepage = "https://github.com/olorin/quickcheck-text"; @@ -145760,12 +155906,12 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-unicode"; - version = "1.0.0.1"; - sha256 = "24c29caddc515d477878ef97581a0cebf760055ca0f260ba1762257abaa116a9"; + version = "1.0.1.0"; + sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"; libraryHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/bos/quickcheck-unicode"; description = "Generator and shrink functions for testing Unicode-related software"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "quickcheck-webdriver" = callPackage @@ -145773,7 +155919,7 @@ self: { mkDerivation { pname = "quickcheck-webdriver"; version = "0.1.0.7"; - sha256 = "10447118796aefc05405e9e3b58676c888ce9f93a85d544c8f1538e22592538a"; + sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h"; libraryHaskellDepends = [ base QuickCheck transformers webdriver ]; description = "Utilities for using WebDriver with QuickCheck"; license = stdenv.lib.licenses.mit; @@ -145785,9 +155931,9 @@ self: { mkDerivation { pname = "quickcheck-with-counterexamples"; version = "1.0"; - sha256 = "0775755444042169f949474f8931bbf2a88b5cba475d190aacad9af0213fde5e"; + sha256 = "0pny7whz16mdmh51jpa7p9f8pa7jpcqqjks797wnj8848ia7ax87"; revision = "3"; - editedCabalFile = "e86f17bffaf0d7909be7b79aed021931e806738d44c76e883f27f5fe2e8fe773"; + editedCabalFile = "0wz7iwpgxx977y46xis4imrhds1i341fv6mpwydr1mzhzazifvz8"; libraryHaskellDepends = [ base QuickCheck template-haskell ]; homepage = "http://www.github.com/nick8325/quickcheck-with-counterexamples"; description = "Get counterexamples from QuickCheck as Haskell values"; @@ -145802,7 +155948,7 @@ self: { mkDerivation { pname = "quicklz"; version = "1.5.0.11"; - sha256 = "0d0b23370a848efa86da80f835d036f468cdb1b201809351116945729b5b699f"; + sha256 = "17v9bfdp4ib9258r7001naqwss7l6v83by40va3gm3l418vj62qd"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -145818,7 +155964,7 @@ self: { mkDerivation { pname = "quickpull"; version = "0.4.2.2"; - sha256 = "a49d5521ce35de82a76ae32dd083c2fbe21f31fc80e19e91917c1ea3f0d0c56f"; + sha256 = "0vy5s3qa67kwj68rxqc0zhqizqpvqa1x0bg3dakq5pimrqhmb7d4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath QuickCheck ]; @@ -145835,7 +155981,7 @@ self: { mkDerivation { pname = "quickset"; version = "0.1.0"; - sha256 = "befdb3d11178c4bd0eb14dc9247c642d653d38731b4072ab3da6fc14f9293c76"; + sha256 = "0xiw57wi9z567nmp4h0vfcw3sr9dciy29jadn47bvi3q278v7zdy"; libraryHaskellDepends = [ base vector vector-algorithms ]; description = "Very fast and memory-compact query-only set and map structures"; license = stdenv.lib.licenses.bsd3; @@ -145847,7 +155993,7 @@ self: { mkDerivation { pname = "quickson"; version = "0.3"; - sha256 = "8a0435bd78381c0abe931fbcd7eae135df56cbab784340da0c49d1429e3545a9"; + sha256 = "1aa56ng45la91kd40hvqmg5mdprmw7mdgg0zjfz0l71qg2yka14a"; libraryHaskellDepends = [ aeson attoparsec base bytestring text ]; homepage = "https://github.com/libscott/quickson"; description = "Quick JSON extractions with Aeson"; @@ -145861,7 +156007,7 @@ self: { mkDerivation { pname = "quickspec"; version = "0.9.6"; - sha256 = "417825d423849288fd14a70db68351f978d29210aad65c0ef519bb9d75ff3c5f"; + sha256 = "0prwzxsrvfqryl75rmma229d4y7ra61vc3d72kyqi4l44ga2ay21"; libraryHaskellDepends = [ array base containers ghc-prim QuickCheck random spoon transformers ]; @@ -145877,7 +156023,7 @@ self: { mkDerivation { pname = "quickterm"; version = "0.2.4.0"; - sha256 = "cba5a2de043dee23e88781eeee1afe43a11c78411ffb8fbf0b9cc08f21be6f52"; + sha256 = "0lkgpqhqzh4w1fzqzyqz85w1r8a3zqdfxvl1hzl27vix0kga59fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145895,7 +156041,7 @@ self: { mkDerivation { pname = "quicktest"; version = "0.1.3"; - sha256 = "2531b95fe8aa37776abe15b6b90342a07c041ac2e5eb35e797b997129a34705b"; + sha256 = "0nvh6jd155xrjzkkbsz5q8d08z50881vkdhmprm7fdxax1gvjc95"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145914,9 +156060,9 @@ self: { mkDerivation { pname = "quickwebapp"; version = "3.0.0.2"; - sha256 = "1b84a728f36fe68c92b269174e9c3655112408f78c2990d0c6568f9fb80f282d"; + sha256 = "0b981yw9z3snqv890accyw4284am6sf4w5v9na98rrkgyclag10v"; revision = "1"; - editedCabalFile = "9d34bc5555232a31a1c17ced7fbbae606278fdc19e54d6a058f331c2cabace65"; + editedCabalFile = "0rffpb5c4cgkb2hdcm4yq7yphqk0msxpzvbwq6hk2ai3amavqd4x"; libraryHaskellDepends = [ aeson base bytestring containers either lucid servant servant-lucid servant-server text warp @@ -145934,7 +156080,7 @@ self: { mkDerivation { pname = "quipper"; version = "0.8.2"; - sha256 = "c030e997cb6960b6125402c03e46d48e582b6eea28ffe9712c27a66366bd8f99"; + sha256 = "16cgpmk679i75iqykzr8x9p2nn4fsi33xh02ah9bcq39rfbyjc60"; libraryHaskellDepends = [ base containers directory easyrender mtl primes process random template-haskell unix @@ -145952,7 +156098,7 @@ self: { mkDerivation { pname = "quipper-core"; version = "0.8.0.1"; - sha256 = "17d0361ed260f16cce989175164d3b81ba0af1c5970bf91a4aebcca21ef0e163"; + sha256 = "0qz1y0ga5k7b98dgj2wpqpqhmfl17d6icxcik376rwb0s8g3dl0p"; libraryHaskellDepends = [ base containers mtl primes random template-haskell ]; @@ -145968,7 +156114,7 @@ self: { mkDerivation { pname = "quipper-rendering"; version = "0.8"; - sha256 = "c73ecbaad5d95e78f4b86fb39d764512ac2d025876bed86564fe3bb3a890107c"; + sha256 = "0z0hj2lb6fzycijxigknb012vb0j8mv9vcvgp3s7hpnrsnmcngn7"; libraryHaskellDepends = [ base containers directory easyrender mtl primes process quipper-core random template-haskell unix @@ -145984,7 +156130,7 @@ self: { mkDerivation { pname = "quiver"; version = "1.1.3"; - sha256 = "fdf0a4aabc5787e4e9f512485bea9771885dcab0482ef811e68189962d15e0bd"; + sha256 = "1gg02lnrd2c1wq8zhbj8n355v23ijzm5nj0jyply91sppjma9w7x"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/zadarnowski/quiver"; description = "Quiver finite stream processing library"; @@ -145998,7 +156144,7 @@ self: { mkDerivation { pname = "quiver-binary"; version = "0.1.1.1"; - sha256 = "d9a1b83fc011daa5ecc5f29615aa338f44df78d375d6a9d7d2548b8289115832"; + sha256 = "0cjq264q52slsbbskmkmsdwdyi4g6fm1b5pjqpnabnhiq0zvi8fr"; libraryHaskellDepends = [ base binary bytestring quiver quiver-bytestring ]; @@ -146013,7 +156159,7 @@ self: { mkDerivation { pname = "quiver-bytestring"; version = "1.0.0"; - sha256 = "bfb24db01b676e1f2ed374e58b4192037facf74b52d0205a55390a6bce3797c7"; + sha256 = "1iwp6z76n2iramd21l2j9gvsqzq3j90qprblscp1yvk73fq4vcmz"; libraryHaskellDepends = [ base bytestring quiver ]; homepage = "https://github.com/zadarnowski/quiver-bytestring"; description = "Quiver combinators for bytestring streaming"; @@ -146025,7 +156171,7 @@ self: { mkDerivation { pname = "quiver-cell"; version = "1.0.0"; - sha256 = "e806d29ffb46b80ddd21cca89de3c9d4606dbc30aad523fa9691ca05e12e0c51"; + sha256 = "0l8c5vhhbjlijvx27mda62y6sq6lr7irva6c47fhvf26zfgx41p8"; libraryHaskellDepends = [ base data-cell quiver ]; homepage = "https://github.com/zadarnowski/quiver-cell"; description = "Quiver combinators for cellular data processing"; @@ -146039,7 +156185,7 @@ self: { mkDerivation { pname = "quiver-csv"; version = "0.0.0.3"; - sha256 = "92699f62236b6106becd5baed0a5f717b65f1b13cfa885053f9983bda8098ba7"; + sha256 = "19wb16lbv0wr7w2qba6g2cdmzdhpyyjx1bjvrnz0cqbb4di9yscj"; libraryHaskellDepends = [ base bytestring data-cell quiver quiver-bytestring ]; @@ -146053,7 +156199,7 @@ self: { mkDerivation { pname = "quiver-enumerator"; version = "0.0.0.1"; - sha256 = "b71266c7a11adfee73a292e117547da18fa6d6a8900c64c8326b76fabd10084c"; + sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp"; libraryHaskellDepends = [ base enumerator quiver ]; homepage = "https://github.com/zadarnowski/quiver-enumerator"; description = "Bridge between Quiver and Iteratee paradigms"; @@ -146065,7 +156211,7 @@ self: { mkDerivation { pname = "quiver-groups"; version = "0.1.0.1"; - sha256 = "19a29e6c2011a5fb996d831c594ec6d6d133c3fdb4ad74763e1251d7f1f39255"; + sha256 = "0mcjygqxfl8j7rv79bdlzp1k7lfnqr75j743dnczp98i41n9x8hr"; libraryHaskellDepends = [ base dlist quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Group and chunk values within a Quiver"; @@ -146080,9 +156226,9 @@ self: { mkDerivation { pname = "quiver-http"; version = "0.0.0.2"; - sha256 = "e221dbbe65a0b4509e7efbd1e70383575175932e16b28d0cbeaa2165b7a5dfe0"; + sha256 = "1q6zlnvna8dapq68vchn5s9palaphc1yglgvgsg51d50cnzdn8g2"; revision = "2"; - editedCabalFile = "25c3ec8b9fe27ef80eb8b2c2918676437a7c79b4504e419c319593262c61b3e1"; + editedCabalFile = "1qdkc4n2d4wm66f42kjhniwpqyj3fs393hmjp07ghzp2ky5yrhr5"; libraryHaskellDepends = [ base bytestring http-client http-client-tls quiver ]; @@ -146099,7 +156245,7 @@ self: { mkDerivation { pname = "quiver-instances"; version = "0.2.0.1"; - sha256 = "4365f1cd79585fbecfd9e3f20be97c6cbe41b70dc543a513eed8e97bc53f2ca3"; + sha256 = "18rc7z2ppsfqxq9sahy51nvl3gkcgklhpwp3v77vwpsqg76z2ra3"; libraryHaskellDepends = [ base exceptions quiver resourcet transformers transformers-base ]; @@ -146113,7 +156259,7 @@ self: { mkDerivation { pname = "quiver-interleave"; version = "0.2.0.2"; - sha256 = "4648939ed31c08f22b8c0c9be84e826ba4ce964525ee9cdd25c76d618612beaf"; + sha256 = "1bxy2a362vf74pfrrvi58nbcx93bh97fi6qcihmz420wsfg96j26"; libraryHaskellDepends = [ base quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Interleave values from multiple Quivers"; @@ -146130,7 +156276,7 @@ self: { mkDerivation { pname = "quiver-sort"; version = "0.2.0.1"; - sha256 = "0d181443faa5b577b6f2483af3a51bb1572ea4f5d81000d78ceddd480c51a961"; + sha256 = "0qd9a464ipgdikbh046qynj2wmxi3fjz6fj8yav7gdd5z91i860d"; libraryHaskellDepends = [ base containers directory exceptions quiver quiver-binary quiver-bytestring quiver-groups quiver-instances quiver-interleave @@ -146154,7 +156300,7 @@ self: { mkDerivation { pname = "quoridor-hs"; version = "0.1.1.2"; - sha256 = "9b0acf3fc902d39ad473e0ecd70da99eb420cca3ad847b18ca4a607875160afa"; + sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146177,7 +156323,7 @@ self: { mkDerivation { pname = "qux"; version = "0.2.0.0"; - sha256 = "9f3a033e164b906384b4dd8312306a75ab2afefb3aa5533fc512ab38e33f341f"; + sha256 = "07rl7zikiaqjqlzm799szgz2mavmd8q150yxnj26742b2qz06flz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146198,7 +156344,7 @@ self: { mkDerivation { pname = "raaz"; version = "0.1.1"; - sha256 = "e18010a169135a33f1aa9526aa7cfdd528a9a3c4d57cde26a76a80e6e7bc67a7"; + sha256 = "19v7pkkyd03alwkdwz6mqjisja6mzmyal9lmmbqk6nhkd6hi1071"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq mtl vector ]; @@ -146221,7 +156367,7 @@ self: { mkDerivation { pname = "rabocsv2qif"; version = "2.0.0"; - sha256 = "c6a362bb9f3f48be7e577498f8fdb26175cabab62534860cc1eec8f4d145ebdc"; + sha256 = "1p7b8p8z9j7fq468cd15nsxclxb1nbyzi63laxzbwj1zkyxn58y6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146238,7 +156384,7 @@ self: { mkDerivation { pname = "rad"; version = "0.1.6.3"; - sha256 = "4d04262c569592c6189a3300cb9e1a6d25ea6665200dd71b6357d9ba07a3e2a5"; + sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d"; libraryHaskellDepends = [ array base containers data-reify ]; homepage = "http://comonad.com/reader/"; description = "Reverse Automatic Differentiation"; @@ -146253,7 +156399,7 @@ self: { mkDerivation { pname = "radian"; version = "0.0.6"; - sha256 = "f7dbf6d15669d9bda2f7c54969bcb8cf39a7dfd28e27355955f553bb1157cc5c"; + sha256 = "0p6caw8vnlzmamcka9wfsbgsfffgp2y6jjf5yyibvnb9av8zdnzp"; libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base directory doctest filepath lens QuickCheck template-haskell @@ -146264,15 +156410,16 @@ self: { }) {}; "radium" = callPackage - ({ mkDerivation, base, Cabal, containers, hspec, parsec, QuickCheck + ({ mkDerivation, base, Cabal, containers, hspec, lens, parsec + , QuickCheck }: mkDerivation { pname = "radium"; - version = "0.6"; - sha256 = "cc03e011817649426e527cb35f31b2daf7c2f8ab90c281d308dadddfd80f8500"; - libraryHaskellDepends = [ base containers parsec ]; + version = "0.8.0"; + sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5"; + libraryHaskellDepends = [ base containers lens parsec ]; testHaskellDepends = [ - base Cabal containers hspec parsec QuickCheck + base Cabal containers hspec lens parsec QuickCheck ]; homepage = "https://github.com/klangner/radium"; description = "Chemistry"; @@ -146286,7 +156433,7 @@ self: { mkDerivation { pname = "radium-formula-parser"; version = "0.2"; - sha256 = "6e91828c5353bb3c6eba1b1bd67cf87240290548001e2897552ec97604ab4fac"; + sha256 = "1b2gmc27dj9fanbjh7h0902jjh3jz1ydc6qvp9p3rfskaf6854bf"; libraryHaskellDepends = [ base containers parsec ]; testHaskellDepends = [ base Cabal containers hspec parsec QuickCheck @@ -146302,7 +156449,7 @@ self: { mkDerivation { pname = "radix"; version = "1.0.0.0"; - sha256 = "3a511d2cf646be113ef2a131aa2095b3a49088f807b7d42d374f1c1e9a037fc2"; + sha256 = "1hkz0fd1w72g6wnx9dq7z249195kjlhalcd1y8z13gj6yqn1sl9s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath ]; @@ -146319,7 +156466,7 @@ self: { mkDerivation { pname = "rados-haskell"; version = "3.1.0"; - sha256 = "533893bf14b7a5fcbd9caa94c089f920a6a1bd3fb029e3b42044eb56927bce75"; + sha256 = "0xffgf95dss442sf6adh7yys39i0z64w155akjyzr9dp2jzr6f2k"; libraryHaskellDepends = [ async base bytestring containers mtl uuid ]; @@ -146345,7 +156492,7 @@ self: { mkDerivation { pname = "raft"; version = "0.3.11.0"; - sha256 = "e8aff884bcc2cdc6d8200f834a9d9f8b2d38646895af4e03589c6ae6e07e8465"; + sha256 = "0rc4gvhfcslwb01lxbwmd1j3hbcbkyflm0qg43ccdkf2pj2gibz8"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring cereal containers data-default ghc-prim mtl parallel scientific split stm text time @@ -146364,7 +156511,7 @@ self: { mkDerivation { pname = "rail-compiler-editor"; version = "0.3.0.0"; - sha256 = "8b53a6c96d4f3a2ba1f7c70a0065ad9959c1bcef6ce33497f690b8a382505a4a"; + sha256 = "0jjsa21a7f4hysbk9qvcxyyc2ncrmmjh02n7yyhjnfjgdp4sclwb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146380,6 +156527,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rails-session" = callPackage + ({ mkDerivation, base, base-compat, base64-bytestring, bytestring + , cryptonite, filepath, http-types, pbkdf, ruby-marshal + , string-conv, tasty, tasty-hspec, transformers, vector + }: + mkDerivation { + pname = "rails-session"; + version = "0.1.1.0"; + sha256 = "1y4822g316wx04nsjc3pai1zmgy5c961jwqjc7c3c6glcvscd6qx"; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring cryptonite http-types + pbkdf ruby-marshal string-conv vector + ]; + testHaskellDepends = [ + base bytestring filepath ruby-marshal tasty tasty-hspec + transformers vector + ]; + homepage = "http://github.com/iconnect/rails-session#readme"; + description = "Decrypt Ruby on Rails sessions in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rainbow" = callPackage ({ mkDerivation, base, bytestring, lens-simple, process, QuickCheck , text @@ -146387,7 +156557,7 @@ self: { mkDerivation { pname = "rainbow"; version = "0.28.0.4"; - sha256 = "829296f88be520a9a6c6de715ffa2bb926cecc0135b23f602cc4377bac4e8831"; + sha256 = "0cc89sn7ndy45ih3zcim076cw9mr5gx5ywfyqskaj875igw9d4l2"; libraryHaskellDepends = [ base bytestring lens-simple process text ]; @@ -146406,7 +156576,7 @@ self: { mkDerivation { pname = "rainbow-tests"; version = "0.20.0.4"; - sha256 = "8fc20ff86fcb68d689768860ab73787612e637c6be18fe8e1392ccfb45155832"; + sha256 = "0cjq2m2zpk4j2f7gw65yqqvyc4kng1rsnq48fs4xcs6bdzw0zhlg"; libraryHaskellDepends = [ barecheck base QuickCheck rainbow terminfo text ]; @@ -146423,7 +156593,7 @@ self: { mkDerivation { pname = "rainbox"; version = "0.18.0.10"; - sha256 = "d692e95565b4ce4454536493ae4d6ba256eecf5e88e0495d156008ea76ba1b05"; + sha256 = "018vp9vfl2302mflkq48bv7ywmm2dd6sx4v4ada49kmlcmayk4nn"; libraryHaskellDepends = [ base bytestring containers lens-simple rainbow text ]; @@ -146441,7 +156611,7 @@ self: { mkDerivation { pname = "rake"; version = "0.0.1"; - sha256 = "f63aa533db66953d1fb3d7519807e9983c857106f1b88b7e300ea07c5e17c232"; + sha256 = "0cn22xg7r80f61z8pf7i0rqqag4qx43rhlfpncgkv5b6vcrsafpn"; libraryHaskellDepends = [ base containers text ]; homepage = "http://github.com/toschoo/Haskell-Libs"; description = "Rapid Automatic Keyword Extraction (RAKE)"; @@ -146458,9 +156628,9 @@ self: { mkDerivation { pname = "raketka"; version = "1.1.1"; - sha256 = "00de213d145e568d11272776d9c394339aee1b28358995cffb606056bf3c1572"; + sha256 = "0whm7jzmcq30zg7rb29m50dyx6ikjk1xjxi74w8qsmjy2hyj3ph0"; revision = "1"; - editedCabalFile = "5f63d0731a5172a670fd30076cd7081a63c0237dd940a2d7938a12c6c1fdbea9"; + editedCabalFile = "1adyzp0wc4lajgbs4h6rgliw0qqs13bnq1rhzmqacwji39rx0qsz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146487,7 +156657,7 @@ self: { mkDerivation { pname = "rakhana"; version = "0.2.0.2"; - sha256 = "d3704a2216ec32864f38d626a2cc27f1b79152d5582312e60fbe24822617f381"; + sha256 = "10gk2wk8495y1zk148sqsm993dzi4z6a49nn717qccpc2qi4lw6k"; libraryHaskellDepends = [ attoparsec base bytestring containers lens mtl pipes scientific transformers vector zlib @@ -146499,12 +156669,15 @@ self: { }) {}; "ralist" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, criterion, deepseq, hspec }: mkDerivation { pname = "ralist"; - version = "0.1.0.0"; - sha256 = "b1fc92a18b3890ae9899d6d29b3de298e5e49d0f9f6174e6f34c7e2e5a784c6c"; + version = "0.2.1.0"; + sha256 = "19fnjza5gk02vdl4yvg453h44x41y19c81ldd7h60h82mkhsvc43"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "http://github.com/cartazio/ralist"; description = "Random access list with a list compatible interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -146515,7 +156688,7 @@ self: { mkDerivation { pname = "rallod"; version = "0.0.1"; - sha256 = "094383eb36a0950a2fb7b996a61dd977460297fd3365306005150b70b098d691"; + sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9"; libraryHaskellDepends = [ base haskell98 ]; homepage = "http://github.com/moonmaster9000/rallod"; description = "'$' in reverse"; @@ -146530,7 +156703,7 @@ self: { mkDerivation { pname = "raml"; version = "0.1.0"; - sha256 = "29df228af2ff703aaf8beb049e0de9cdf11fee2b3f89c85574dc7d75e2cc8109"; + sha256 = "02c1rki7azfwfiawi29z5gp1zwfdx46rw17bifpklw7zya525pr9"; libraryHaskellDepends = [ aeson base bytestring text unordered-containers yaml ]; @@ -146546,7 +156719,7 @@ self: { mkDerivation { pname = "ramus"; version = "0.1.2"; - sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e"; + sha256 = "0kkr1d7mznkyi4xznmnhxvni9y25m6bp4nsn0hb417772v2dvpfw"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-io ]; benchmarkHaskellDepends = [ base criterion ]; @@ -146560,7 +156733,7 @@ self: { mkDerivation { pname = "rand-vars"; version = "0.1"; - sha256 = "7d78456a234b1e25f99c51469e63606f9ea3a6db1118feceedb7fe9d4adfb298"; + sha256 = "165jvx59vzmpxp7gw60ivfka77kgc1irwijikkwja7jb4dm4ay3x"; libraryHaskellDepends = [ array base IntervalMap mtl random ]; description = "Random variable library, with Functor, Applicative and Monad instances"; license = stdenv.lib.licenses.bsd3; @@ -146574,7 +156747,7 @@ self: { mkDerivation { pname = "randfile"; version = "0.1.0.0"; - sha256 = "df3faa36c16fe0727f33d3449403123edff861095f6d09630b8412e5dd14c785"; + sha256 = "11f72kfya4l41dihjvaz15hzipry281r8i6k6dzp5q3gq4valgyz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146591,9 +156764,9 @@ self: { mkDerivation { pname = "random"; version = "1.1"; - sha256 = "b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a"; + sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p"; revision = "1"; - editedCabalFile = "7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df"; + editedCabalFile = "1pv5d7bm2rgap7llp5vjsplrg048gvf0226y0v19gpvdsx7n4rvv"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base ]; description = "random number library"; @@ -146605,19 +156778,37 @@ self: { mkDerivation { pname = "random-access-list"; version = "0.2"; - sha256 = "19d18e04c76f37405daaf90dfb15242a2c2f46bcc96b782d80cc5034dcd0abfa"; + sha256 = "1ymbs3f38l6ch0nphsy9pi32yb1a4hazn3grm9fl0dvgqw28xl8r"; libraryHaskellDepends = [ array base containers ]; description = "Random-access lists in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "random-bytestring" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, entropy + , ghc-prim, mwc-random, primitive, random + }: + mkDerivation { + pname = "random-bytestring"; + version = "0.1.0"; + sha256 = "0v4fmns5qji5mb0grnghl2yv5l4rg29319f1d1d7kcz9qwz9qwrd"; + libraryHaskellDepends = [ base bytestring mwc-random ]; + benchmarkHaskellDepends = [ + async base bytestring criterion entropy ghc-prim mwc-random + primitive random + ]; + homepage = "https://www.github.com/larskuhtz/random-bytestring"; + description = "Efficient generation of random bytestrings"; + license = stdenv.lib.licenses.mit; + }) {}; + "random-derive" = callPackage ({ mkDerivation, base, random, template-haskell }: mkDerivation { pname = "random-derive"; version = "0.1.0.0"; - sha256 = "17495d57a9ceace879853d7fef5bb62af3f6c678b0dc9f00902f3e869eff3922"; + sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p"; libraryHaskellDepends = [ base random template-haskell ]; homepage = "https://github.com/frerich/random-derive"; description = "A Template Haskell helper for deriving Random instances"; @@ -146630,7 +156821,7 @@ self: { mkDerivation { pname = "random-eff"; version = "0.1.0.1"; - sha256 = "ce77a52b645306f38b2272a6d10e0dd9f55506fcf922d0820d7729f7c1b548d4"; + sha256 = "1m28np0zfabp1n1d08przh35bxfr1l7d39kj4a5z61jkchmsaxyf"; libraryHaskellDepends = [ base extensible-effects random ]; description = "A simple random generator library for extensible-effects"; license = stdenv.lib.licenses.bsd3; @@ -146642,7 +156833,7 @@ self: { mkDerivation { pname = "random-effin"; version = "0.1.1.0"; - sha256 = "105c2091eba9bbfa5041a9dc90a2e4a095391265fd34486bc2005cdd5c2b365c"; + sha256 = "0p1n5dfdsp00q9mlhd7xcl93k5d0wji91p59858gmfx9xf8j0p0h"; libraryHaskellDepends = [ base effin random ]; description = "A simple random generator library for effin"; license = stdenv.lib.licenses.bsd3; @@ -146655,7 +156846,7 @@ self: { mkDerivation { pname = "random-extras"; version = "0.19"; - sha256 = "c0beeda8d2734673ee45debaf8594b7b6e9c39b8e30243ae0573e24cc2d085ac"; + sha256 = "1b45s314rqkk0np460p3p0wrqvkv9dczifny8pp76ikksalfvgn0"; libraryHaskellDepends = [ array base containers random-fu random-source ]; @@ -146672,7 +156863,7 @@ self: { mkDerivation { pname = "random-fu"; version = "0.2.7.0"; - sha256 = "b6b3a4b3ede34991d26e0447f90b14fa66af61f376fa0aed2e0899fdc879b0c4"; + sha256 = "1i5hg74gv6885vnhmyknydhsyrps2h5zjiq4dv992jg3xnrs9cxn"; libraryHaskellDepends = [ base erf log-domain math-functions monad-loops mtl random-shuffle random-source rvar syb template-haskell transformers vector @@ -146687,7 +156878,7 @@ self: { mkDerivation { pname = "random-fu-multivariate"; version = "0.1.2.0"; - sha256 = "870c6556f66a16e891396b1b02865659a03915fbe6ccc3cf3b212915dad01a86"; + sha256 = "11hss3d1aa917g7w7k76zcakk82ras3046vb768yh5kayrb6a347"; libraryHaskellDepends = [ base hmatrix mtl random-fu ]; testHaskellDepends = [ base ]; homepage = "https://github.com/fpco/random-fu-multivariate"; @@ -146702,7 +156893,7 @@ self: { mkDerivation { pname = "random-hypergeometric"; version = "0.1.0.0"; - sha256 = "f051bc611d5aa1801c922f110d5c6d01210b71acc917fa138b65c9c8ad90e449"; + sha256 = "0jg4j2nwijb5ic9zl5y9miqhn881dmf0s49gj8f818as3mhvqlgh"; libraryHaskellDepends = [ base math-functions random-fu ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck math-functions mwc-random @@ -146719,7 +156910,7 @@ self: { mkDerivation { pname = "random-shuffle"; version = "0.0.4"; - sha256 = "52704411f040fd0bf2361dad162e35dc13caa6535b2e4908d3513c00a95d0615"; + sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j"; libraryHaskellDepends = [ base MonadRandom random ]; description = "Random shuffle implementation"; license = stdenv.lib.licenses.bsd3; @@ -146733,7 +156924,7 @@ self: { mkDerivation { pname = "random-source"; version = "0.3.0.6"; - sha256 = "f3dfec3aef0614ff856abbba018f3bc3446295157895ea09a015737d67205b73"; + sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random random stateref syb template-haskell th-extras @@ -146748,7 +156939,7 @@ self: { mkDerivation { pname = "random-stream"; version = "0.1.1"; - sha256 = "c6f48de53efd13c331afa13834d68b07e8c85e51d20e12f4cb5f5638fe0c2960"; + sha256 = "0q191kz3hmjzrgs143nja5gcis07igb38f51mwqw64zx7vjqvx66"; libraryHaskellDepends = [ base binary bytestring random ]; description = "An infinite stream of random data"; license = stdenv.lib.licenses.bsd3; @@ -146760,7 +156951,7 @@ self: { mkDerivation { pname = "random-strings"; version = "0.1.1.0"; - sha256 = "9b7342fdcb37250a45a14825754ed8ba3fd1a45468c78aaa4ef3671342e59452"; + sha256 = "0lllwm116rzk9sm8miv8ajjd2gxsv177a9a8l52hl99prgyl4wwv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random ]; @@ -146778,7 +156969,7 @@ self: { mkDerivation { pname = "random-tree"; version = "0.6.0.5"; - sha256 = "2b604e7ce184e2c877fac63dbac1df3060cdc023427b8eb5844106a826591cc2"; + sha256 = "1hhwb4kah1j1hjsqwys24g0csq1hvz0vlgf6z9vwiql4w5y4wq1b"; libraryHaskellDepends = [ base containers lens MonadRandom mtl random random-shuffle transformers tree-fun @@ -146794,7 +156985,7 @@ self: { mkDerivation { pname = "random-variates"; version = "0.1.5.1"; - sha256 = "f407c82ceb9dc24f795bc06f8f186e83986f23ae8d8db40fbf8976a33fa4aacc"; + sha256 = "1k5alhzs6xl9pw7v93cdmqinz643dqc8yvy0bdwlzhlxxcnch1zl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146816,7 +157007,7 @@ self: { mkDerivation { pname = "randomgen"; version = "0.1"; - sha256 = "d153deda99abce22bdd8ccf0f3ea0d48e02cb7322377a6a13a8201c894defe78"; + sha256 = "0y7yvsach0c27ahscxr36avjrq281pmg7w6cv2yj5kmbk7ddwlyi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146833,7 +157024,7 @@ self: { mkDerivation { pname = "randproc"; version = "0.4"; - sha256 = "a779a5ae0b31cc6029c0312834cc5affc5d0279903e4b6f2b0c16eeed2106039"; + sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7"; libraryHaskellDepends = [ base ]; homepage = "http://www.haskell.org/haskellwiki/Random_Processes"; description = "Data structures and support functions for working with random processes"; @@ -146845,7 +157036,7 @@ self: { mkDerivation { pname = "randsolid"; version = "0.3"; - sha256 = "93eb2520c6ac1d568ca1f42070e8f60fc73c2fdb600c606140429aa03136f26c"; + sha256 = "0v7j6qqs16j281hn0330vcpkriqgyvl7087ll665c7dcqqh2bswk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random X11 ]; @@ -146860,7 +157051,7 @@ self: { mkDerivation { pname = "range"; version = "0.1.2.0"; - sha256 = "4b997ffc63dfc93716938b086ceefffd9df14684c511e0fef4656e82d58b0b09"; + sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab"; libraryHaskellDepends = [ base free parsec ]; testHaskellDepends = [ base Cabal free QuickCheck random test-framework @@ -146878,7 +157069,9 @@ self: { mkDerivation { pname = "range-set-list"; version = "0.1.2.0"; - sha256 = "3b749cf447dcf1f81f263c9c43dd61ee533b4fb25e6e4ca3bdbe2321702bab67"; + sha256 = "0rxb5dq228xypnilqvjyn97knlzfc7fl771w4qgziwfw8zs9qx1v"; + revision = "1"; + editedCabalFile = "061xbyarcjr4bcb08a5xyzqiyvagn9729p6hk5kzayzlkscx16j2"; libraryHaskellDepends = [ base containers deepseq hashable semigroups ]; @@ -146898,7 +157091,7 @@ self: { mkDerivation { pname = "range-space"; version = "0.1.2.0"; - sha256 = "388d6cea0511019d7e0b43989722e94202d505772271a5f84ec66d99856b38c3"; + sha256 = "1hrqdf2rjvf69vwaaw92fw2xa0j2x4i9g6231dz9s08i0pm6r39q"; libraryHaskellDepends = [ base semigroups vector-space vector-space-points ]; @@ -146917,7 +157110,7 @@ self: { mkDerivation { pname = "rangemin"; version = "2.2.2"; - sha256 = "8c5ba8b910d12f5ccaef7f216cebd5f34b17ca9126bc4ac0939790b8e2a8c106"; + sha256 = "01n1m3ibi44pjg04mg16j751fjzkspmnq8bzxz55qbyi22wshnwc"; libraryHaskellDepends = [ base containers primitive vector ]; description = "Linear range-min algorithms"; license = stdenv.lib.licenses.bsd3; @@ -146929,12 +157122,24 @@ self: { mkDerivation { pname = "ranges"; version = "0.2.4"; - sha256 = "dbbba083fccdd7f27454db3f29d0f9f13e927cb1e985641e5dbdcdbfddaebbfa"; + sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv"; libraryHaskellDepends = [ base containers ]; description = "Ranges and various functions on them"; license = stdenv.lib.licenses.bsd3; }) {}; + "rank-product" = callPackage + ({ mkDerivation, base, random-fu }: + mkDerivation { + pname = "rank-product"; + version = "0.2.0.1"; + sha256 = "1dn03zlh7n8qk7dir2qdijyk207g9p4nbsc0zw4p3cvfpl4xzzvr"; + libraryHaskellDepends = [ base random-fu ]; + homepage = "http://github.com/GregorySchwartz/rank-product#readme"; + description = "Find the rank product of a data set"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "rank1dynamic" = callPackage ({ mkDerivation, base, binary, HUnit, test-framework , test-framework-hunit @@ -146942,7 +157147,7 @@ self: { mkDerivation { pname = "rank1dynamic"; version = "0.3.3.0"; - sha256 = "ca32dde8475cf3ec809043ee7393fda51efd6afb741ef02af19c996bb8238f0b"; + sha256 = "02wg4fw6p6cwy4mg07klzdmgs7m5zn9p7vj3j20frwsw8zldscna"; libraryHaskellDepends = [ base binary ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -146952,12 +157157,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rank2classes" = callPackage + ({ mkDerivation, base, doctest, template-haskell, transformers }: + mkDerivation { + pname = "rank2classes"; + version = "0.1"; + sha256 = "1izr3nrbrrcf4496m0p5fpvd9h6gzgirb6q76kvn4chd4p45j0iz"; + libraryHaskellDepends = [ base template-haskell transformers ]; + testHaskellDepends = [ base doctest ]; + 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 ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { pname = "rapid"; version = "0.1.3"; - sha256 = "163a894363584b712ab44598f17a8bcd90e0814327cf2cecf0ddc4dc6cf29758"; + sha256 = "0n4py9ndri6xy3n2rkr78f0y146didxg3625nhm72jsqcd1qjfhn"; libraryHaskellDepends = [ async base containers foreign-store stm ]; @@ -146967,15 +157186,15 @@ self: { }) {}; "rapid-term" = callPackage - ({ mkDerivation, ansi-terminal, base, clock, kan-extensions - , process, transformers, unix + ({ mkDerivation, base, clock, kan-extensions, process, transformers + , unix }: mkDerivation { pname = "rapid-term"; - version = "0.1.1"; - sha256 = "49cb96ef27649b3caf9fbac4a293f03ac884dd1ed0e96a3f0b6749ad1e8ed1a0"; + version = "0.1.2"; + sha256 = "0q65c8rjqvikpfghpmmsb69d9qmx5bha36qs4iwbsh6iq08xiw18"; libraryHaskellDepends = [ - ansi-terminal base clock kan-extensions process transformers unix + base clock kan-extensions process transformers unix ]; homepage = "https://github.com/esoeylemez/rapid-term"; description = "External terminal support for rapid"; @@ -146984,21 +157203,23 @@ self: { "rasa" = callPackage ({ mkDerivation, async, base, bifunctors, containers, data-default - , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse - , profunctors, QuickCheck, quickcheck-instances, text, text-lens - , transformers, yi-rope + , eve, free, hspec, lens, mtl, pipes, pipes-concurrency + , pipes-parse, profunctors, QuickCheck, quickcheck-instances, text + , text-lens, transformers, yi-rope }: mkDerivation { pname = "rasa"; - version = "0.1.10"; - sha256 = "970bd5b3dfac3a8050e2daea281d15b3b1dc499824cad392225d1e4d483527e8"; + version = "0.1.12"; + sha256 = "08azx2xx1lpgal60jr7imsx5gvh6c5l7sz0kr5zciiilzli73rss"; + revision = "1"; + editedCabalFile = "17wpscqy10vkp7zwq82lshivyp5qvnzp3c9x6ijhlb7q5vpyvrkr"; libraryHaskellDepends = [ - async base bifunctors containers data-default free hspec lens mtl - pipes pipes-concurrency pipes-parse profunctors text text-lens + async base bifunctors containers data-default eve free hspec lens + mtl pipes pipes-concurrency pipes-parse profunctors text text-lens transformers yi-rope ]; testHaskellDepends = [ - base hspec lens QuickCheck quickcheck-instances text yi-rope + base eve hspec lens QuickCheck quickcheck-instances text yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa#readme"; description = "A modular text editor"; @@ -147014,7 +157235,7 @@ self: { mkDerivation { pname = "rasa-example-config"; version = "0.1.4"; - sha256 = "160d148c51615b71900053186cefa5f12e5530aaae6328424d62bbaca6e7e6cd"; + sha256 = "1kg6wykarfv29m12hqxfm8q5abpilppnq62k02872nv1a661838n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147033,7 +157254,7 @@ self: { mkDerivation { pname = "rasa-ext-bufs"; version = "0.1.1"; - sha256 = "c7b935f44138f2fba37882504574986a8e88886d14d300f16ad6de1719e2c412"; + sha256 = "04n4w8cigpnndbqh1lqldn48i3kak1s4al42g2izpwiq87s3bff7"; libraryHaskellDepends = [ base containers data-default lens rasa text ]; @@ -147048,8 +157269,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cmd"; - version = "0.1.2"; - sha256 = "f328cc06d7fca6ac2bb301aaa18b057b0404319dc0072963f27a90750644b3e9"; + version = "0.1.3"; + sha256 = "1b13znv97s7bb4b88mk4zywbd3j2hg34pip23dk1pnnzd10agh4i"; libraryHaskellDepends = [ base containers data-default lens rasa text ]; @@ -147065,8 +157286,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cursors"; - version = "0.1.6"; - sha256 = "c1407b36255825f4708ccffb9b04cdb1cd93da417cc2c337033b10306626390e"; + version = "0.1.7"; + sha256 = "01gc9xsgi7skynrgsk7js8yiya6fbg58y8zqgw832mv1d1cw2a4w"; libraryHaskellDepends = [ base data-default lens mtl rasa text text-lens yi-rope ]; @@ -147082,8 +157303,8 @@ self: { }: mkDerivation { pname = "rasa-ext-files"; - version = "0.1.4"; - sha256 = "d824e1eec8ce6b92453e957c10859351c23306463b08bdcdfc5d635471147957"; + version = "0.1.5"; + sha256 = "0yj9r0jqac85h6vi9dli12w9yhksyaa5kwk68c5arbl56ak9ancp"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text yi-rope @@ -147098,8 +157319,8 @@ self: { ({ mkDerivation, base, lens, mtl, rasa }: mkDerivation { pname = "rasa-ext-logger"; - version = "0.1.3"; - sha256 = "8648adfd280b15ddfed693bb771745de6311bcfe3fb3066fa3ce89694a12eb5d"; + version = "0.1.4"; + sha256 = "1wv3bkfq92h7b91x88mzqcijbpb2kh7zkgg4ljxdx59qi4lb7hry"; libraryHaskellDepends = [ base lens mtl rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for logging state/actions"; @@ -147113,8 +157334,8 @@ self: { }: mkDerivation { pname = "rasa-ext-slate"; - version = "0.1.7"; - sha256 = "6773e509862723cc02776cd05db0dea70a179433a57ab635f37124964738d312"; + version = "0.1.8"; + sha256 = "111lk15gswwp2336hbqx8h4rj7nyb9n00946ljfa6pls0pbl25xz"; libraryHaskellDepends = [ base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes text vty yi-rope @@ -147130,7 +157351,7 @@ self: { mkDerivation { pname = "rasa-ext-status-bar"; version = "0.1.3"; - sha256 = "28d156d4b91650b68d9c20ebe3ce0132be9ce15c71e5ce4a1f6656daf1902e3f"; + sha256 = "0grfj3qxlmk63x5cxrbibkhrrgij077f7sr0kj6vcl0np7a5dl98"; libraryHaskellDepends = [ base data-default lens rasa yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for populating status-bar"; @@ -147143,7 +157364,7 @@ self: { mkDerivation { pname = "rasa-ext-style"; version = "0.1.4"; - sha256 = "04e883526042bb7cda017b5d3404b08223fea5fd841c9913095337ab378717a5"; + sha256 = "198phwvsndsk149rj744znjzw8w2n0238pbv07d7rfs2c1987s04"; libraryHaskellDepends = [ base data-default lens rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext managing rendering styles"; @@ -147157,8 +157378,8 @@ self: { }: mkDerivation { pname = "rasa-ext-views"; - version = "0.1.4"; - sha256 = "5542a37a779efe0e97ecbadbed2409414c99705a9298d0dfc5915f56682e11c0"; + version = "0.1.6"; + sha256 = "0920dmmgi87i98fwbkn7qwgnklviqh7fw87a1aqsc22z5cj4frgl"; libraryHaskellDepends = [ base bifunctors data-default lens mtl rasa recursion-schemes yi-rope @@ -147176,8 +157397,8 @@ self: { }: mkDerivation { pname = "rasa-ext-vim"; - version = "0.1.6"; - sha256 = "e97e6d096eee5f02ed022407276653ed33657f82ef708ad8095a3caf1fddb22a"; + version = "0.1.8"; + sha256 = "00ky39dxapmfdslnm21q1yab3hkd8fm18zqg9vfvd25dcmz493zy"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-views text text-lens yi-rope @@ -147197,7 +157418,7 @@ self: { mkDerivation { pname = "rascal"; version = "1.1.6"; - sha256 = "3a1b648aed56c9e1d98bdcb41df832cffc76a5d3ff6b37c20d4d963aef75ea60"; + sha256 = "0q7afppkm5jd1p13fszzsfjpdz6g6bw1vd6wigcy3janxn5686rs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147228,7 +157449,9 @@ self: { mkDerivation { pname = "rasterific-svg"; version = "0.3.2.1"; - sha256 = "717e87ea679f5fda726bfbbdbfafa40305bece2cce5ad137027e26eaeb57afdf"; + sha256 = "1pxgazmyl9ky08vx2nnf5k7bw183ljpvzggvddrdlpwzczm8fzki"; + revision = "1"; + editedCabalFile = "19w6f01qc1ahwfsqnqb6ajsgv4wqy5vfy54f6x15z1pivnyw37sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147249,7 +157472,7 @@ self: { mkDerivation { pname = "rate-limit"; version = "1.1.1"; - sha256 = "3f664149c578a095c55dca9d5e99a99fa06a392a4a10ef98c812c55d80742db4"; + sha256 = "1d1dfj05vi8jr2cfy42a58wnm84zm6cmx7fabp2rb83qqm4l2riz"; libraryHaskellDepends = [ base time-units ]; homepage = "http://github.com/acw/rate-limit"; description = "A basic library for rate-limiting IO actions"; @@ -147263,8 +157486,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "0.3.2"; - sha256 = "99b838c7d85208cd49fdf733d99ca29baafbb924f9db8a0d45ae88c15fc6ba73"; + version = "0.3.3"; + sha256 = "1qny1ayb6qac1f6zbm76w4bgvwqiznbq9a96dqnpkyj33dd0s8f3"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -147282,7 +157505,7 @@ self: { mkDerivation { pname = "ratel-wai"; version = "0.2.0"; - sha256 = "2714c211ee6252bad68a4f5828c5b196fe4e5fff9dfed778c9bf15918ac35911"; + sha256 = "04arqf5925dzr5wdgzlxzxglxzlnn72jhn2gibbbllk2xq8w4517"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -147296,7 +157519,7 @@ self: { mkDerivation { pname = "rating-systems"; version = "0.1"; - sha256 = "099c4472a4251af6ac01c77535d05ac85ef25512206fb0f46971a7023776b89e"; + sha256 = "17mqfqvh59vid7sb0vr029az4pn8bb83axf706ngc6i5lir49709"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mightybyte/rating-systems"; description = "Implementations of several rating systems: Elo, Glicko, etc"; @@ -147308,7 +157531,7 @@ self: { mkDerivation { pname = "ratio-int"; version = "0.1.2"; - sha256 = "efe86052c5979261d9aa6861c6297205ee0b60e1b36de191d20485e823c9781a"; + sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/RaphaelJ/ratio-int"; description = "Fast specialisation of Data.Ratio for Int."; @@ -147324,7 +157547,7 @@ self: { mkDerivation { pname = "rattletrap"; version = "2.1.5"; - sha256 = "ee0d7107df30d4be74908d4be2a92c0042a7b7ef92ec3886045bc17babd03bbe"; + sha256 = "1givs2mpphav0j33iv4jxyvsfhh05jly4jwdj1sbxm1hvw3p23gf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147341,6 +157564,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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.5.0"; + sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bimap binary binary-bits bytestring + containers data-binary-ieee754 template-haskell text vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring filepath hspec temporary ]; + homepage = "https://github.com/tfausak/rattletrap#readme"; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit , network, random, text, time, unordered-containers, uuid @@ -147348,7 +157594,7 @@ self: { mkDerivation { pname = "raven-haskell"; version = "0.1.0.1"; - sha256 = "ef1eeb5734d94b9ace31ce41e6afc79cb1a9a60d5944c6abfee54c4d064ac77b"; + sha256 = "0yy79834sk75zsmwci2r1nkakccwqypychff6779ljyr6ibyn7pg"; libraryHaskellDepends = [ aeson base bytestring http-conduit network random text time unordered-containers uuid @@ -147368,7 +157614,7 @@ self: { mkDerivation { pname = "raven-haskell-scotty"; version = "0.1.0.3"; - sha256 = "d338b67370dc71dd81ad8aa3bef366abcf7691a5b78ee750467e6662b572946e"; + sha256 = "0vllfasn4rky8r8fg3mpln8pdkxbcvrvx8wamn0xswfwf1rvcf6k"; libraryHaskellDepends = [ base bytestring case-insensitive mtl raven-haskell scotty text wai ]; @@ -147387,9 +157633,9 @@ self: { mkDerivation { pname = "raw-feldspar"; version = "0.2.1"; - sha256 = "7c188b8ffca38e8f63cfbff3555c8a8d29265262ada77c6e914c2e73859958fc"; + sha256 = "1z2qk62p6bjcj5p7r9xdc992cacdi9f5bwxzrxiqz3m3zj7qn63w"; revision = "1"; - editedCabalFile = "193a7ca804a40c8b27c2962e39b914933ef7e69c6d1fb1aee7bbf954121df6f8"; + editedCabalFile = "1y7n3l959ydvwypb27vdkkkgfglk2jwkjblnq8kqn3540jl7qfhr"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -147410,7 +157656,7 @@ self: { mkDerivation { pname = "raw-strings-qq"; version = "1.1"; - sha256 = "2e011ec26aeaa53ab43c30b7d9b5b0f661f24b4ebef8884c12c571353c0fbed3"; + sha256 = "1lxy1wy3awf52968iy5y9r5z4qgnn2sxkdrh7js3m9gadb11w09f"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/23Skidoo/raw-strings-qq"; @@ -147422,13 +157668,29 @@ self: { ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "rawfilepath"; - version = "0.1.0.0"; - sha256 = "1673897fbcb4a4a194bb66ff8514a21db6c1d9f6ba0d960dc20677c9902c2614"; + version = "0.1.1"; + sha256 = "0rlck0lv1002y0q5cjdlc4msr2nr36q8ml32r6ffbv5bfxhhlp7w"; + revision = "1"; + editedCabalFile = "14y624s1l381hqzy3v47xwbjwbkhzn6kqrrj1lj8sp9q0z8pdi9r"; libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/xtendo-org/rawfilepath#readme"; description = "Use RawFilePath instead of FilePath"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.asl20; + }) {}; + + "rawfilepath_0_2_4" = callPackage + ({ mkDerivation, base, bytestring, unix }: + mkDerivation { + pname = "rawfilepath"; + version = "0.2.4"; + sha256 = "1lsvpnv1dncxw6a8a9w1jnzxlv2ya69ly4p4qsl720pzyx4ipc6b"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/xtendo-org/rawfilepath#readme"; + description = "Use RawFilePath instead of FilePath"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rawr" = callPackage @@ -147438,7 +157700,7 @@ self: { mkDerivation { pname = "rawr"; version = "0.0.0.1"; - sha256 = "aea2f4d27182b6b7ef4427720c4146d550a399b1180b42eb892012facaaf819e"; + sha256 = "17l1mz5gl4i0i7ml42qqn6cs6l6m8r0hqwi78kpvgdl2f79g98mf"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base deepseq doctest ghc-datasize lens tasty tasty-hunit @@ -147455,7 +157717,7 @@ self: { mkDerivation { pname = "rawstring-qm"; version = "0.2.3.0"; - sha256 = "11a177bb7d685fb6a98390630196bd544e877b7460648e61a2905c21a71268fe"; + sha256 = "1zk82akj2p4hl9hqwr30fixqfkjlpnb02qwhhflvcpv8gnxpg88i"; libraryHaskellDepends = [ base bytestring template-haskell text ]; homepage = "https://github.com/tolysz/rawstring-qm"; description = "Simple raw string quotation and dictionary interpolation"; @@ -147469,7 +157731,7 @@ self: { mkDerivation { pname = "raz"; version = "0.1.0.0"; - sha256 = "ee0c0fcff08e7f2faf28218b61cd5cb0b04031d13c73b71f2f735694eb96c215"; + sha256 = "05f2jvmr8mkk5wgvfwrws4ql1c5hbk6n32r152pjyzwfy37hy37f"; libraryHaskellDepends = [ base deepseq MonadRandom ]; testHaskellDepends = [ base MonadRandom ]; benchmarkHaskellDepends = [ @@ -147488,9 +157750,9 @@ self: { mkDerivation { pname = "razom-text-util"; version = "0.1.2.0"; - sha256 = "ef1e986636f7f788e19979a026df4641e17a8d6b6b7398576d9ade2b8460d869"; + sha256 = "0sfqc222pplsdmbrhwvbdf6pmqa18vgjd83rk7hqixzp6rk9h7pg"; revision = "1"; - editedCabalFile = "96699ade66f11b3559e640f040ee602eaa8bfcdbe414c11a0025f679bd139651"; + editedCabalFile = "0lcn2fypkxi500dc2574vgy8paifc3p41w20wrcka6zicvg9lscn"; libraryHaskellDepends = [ base regex-applicative smaoin text text-position ]; @@ -147502,29 +157764,33 @@ self: { }) {}; "rbpcp-api" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring, cereal - , haskoin-core, servant, string-conversions, text + ({ mkDerivation, aeson, base, base16-bytestring + , bitcoin-payment-protocol, bytestring, cereal, haskoin-core + , http-api-data, servant, servant-client, string-conversions, text + , time }: mkDerivation { pname = "rbpcp-api"; - version = "0.1.0.0"; - sha256 = "16290f21dc85b53a4738753a7c827584bfd2455d1e0f0d11f78c2520448afd06"; + version = "0.2.0.0"; + sha256 = "0m8q9hm48fqh8qi38v5ahimvs2dvdnyv5yjapbya3aixjxki13wm"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cereal haskoin-core servant - string-conversions text + aeson base base16-bytestring bitcoin-payment-protocol bytestring + cereal haskoin-core http-api-data servant servant-client + string-conversions text time ]; homepage = "http://paychandoc.runeks.me/"; description = "RESTful Bitcoin Payment Channel Protocol Servant API description"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {bitcoin-payment-protocol = null;}; "rbr" = callPackage ({ mkDerivation, base, bio, bytestring, containers }: mkDerivation { pname = "rbr"; version = "0.8.6"; - sha256 = "8729cf9f06989cb89ffa6bc37a9ebf7ed7bfd31c48846a219752c631414aeb60"; + sha256 = "0q7b990k3ijjjwhnm1283k9vzmvypyg7mhvbzagvi74q0sgwyac7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bio bytestring containers ]; @@ -147541,7 +157807,7 @@ self: { mkDerivation { pname = "rclient"; version = "0.1.0.0"; - sha256 = "16fe2278c485b0637a5c788062b82eccfee4dceb8e40dddd0f8aa0b0a65dacc1"; + sha256 = "1hdcbnkb184a1zfxsh4fxgff9znc5sw6503qbix67c45qiw25zhn"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 network QuickCheck split ]; @@ -147550,21 +157816,26 @@ self: { }) {}; "rcu" = callPackage - ({ mkDerivation, atomic-primops, base, directory, doctest, filepath - , hlint, parallel, primitive, stm, transformers + ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest + , containers, criterion, deepseq, doctest, ghc-prim, hlint + , optparse-applicative, parallel, primitive, rdtsc, time + , transformers }: mkDerivation { pname = "rcu"; - version = "0.1"; - sha256 = "06d31a3da492590af81479119ba0f6c5d4ddbf15e8cd78af1cc80a56d34895ed"; + version = "0.2"; + sha256 = "0i88w7yg1q6fbkqfkvmnxxg9wg90sxv6c0shb8hvx0afz1mfhrz3"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - atomic-primops base parallel primitive transformers + atomic-primops base ghc-prim parallel primitive transformers ]; - executableHaskellDepends = [ base stm transformers ]; - testHaskellDepends = [ - base directory doctest filepath hlint parallel + executableHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base doctest hlint parallel ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim optparse-applicative + primitive rdtsc time transformers ]; homepage = "http://github.com/ekmett/rcu/"; description = "Read-Copy-Update for Haskell"; @@ -147579,7 +157850,7 @@ self: { mkDerivation { pname = "rdf"; version = "0.1.0.1"; - sha256 = "4f320db1d89ccff1d93d5694d00f9d51eeaea81e2f3ba6da32e0d7badd333ea6"; + sha256 = "19iy6gfvmmz06bdacfrg3slaxvjikl7x152n7pcz3kwwv2qhscjg"; libraryHaskellDepends = [ attoparsec base bytestring deepseq dlist fgl text transformers ]; @@ -147601,7 +157872,7 @@ self: { mkDerivation { pname = "rdf4h"; version = "3.0.1"; - sha256 = "a4ecf539e33f038a13f40e5b2b21ee1b364ed259b66f2d435439c0de287f8534"; + sha256 = "0d45gwldxh1rai1jsvxnb794wdhvxqhjnnqfyh9ql0rzwcwzbv54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147630,7 +157901,7 @@ self: { mkDerivation { pname = "rdioh"; version = "0.2.1"; - sha256 = "40361c10907d0bf5c99271ccb192ed9e6530873d7215d40f2692f9a520950dcc"; + sha256 = "1k0djlhabycj4q7x85bj7n3k0rcyxn9b3k3ijb4za2vxj081qdj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147651,7 +157922,7 @@ self: { mkDerivation { pname = "rdtsc"; version = "1.3.0.1"; - sha256 = "54c9a925f68d6c60b405e92f9d3bd9ebfc25cce0c72d2313a6c7e1b7cc2ed950"; + sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mgrabmueller/rdtsc"; description = "Binding for the rdtsc machine instruction"; @@ -147663,7 +157934,7 @@ self: { mkDerivation { pname = "rdtsc-enolan"; version = "0.1"; - sha256 = "b89cc31ba31827af3d47e2bf98328d5e569a9558b07504f923b8f447d43b7d6c"; + sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/rdtsc"; description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time"; @@ -147675,7 +157946,7 @@ self: { mkDerivation { pname = "re2"; version = "0.1"; - sha256 = "c5110554a41b2af45fbfde30f1d21e7cdc1aedf914c06d9629cbde96645fb522"; + sha256 = "08mmbxj9dpnb56b6vh0lz7nimp3w3v9g2c6ypxgz8ahvlia0a4f5"; libraryHaskellDepends = [ base bytestring vector ]; testHaskellDepends = [ base bytestring chell vector ]; homepage = "https://john-millikin.com/software/haskell-re2/"; @@ -147690,7 +157961,7 @@ self: { mkDerivation { pname = "react-flux"; version = "1.2.3"; - sha256 = "65c868e8b6522b1042d4d53aa9eb0e5cd4fe34a0e6bbae8f56279440bfbfb1c7"; + sha256 = "1ixipyzl1517as7sxfz6l0sgxm2w1vmsjfnmsi110asjnvl6ij35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147707,7 +157978,7 @@ self: { mkDerivation { pname = "react-flux-servant"; version = "0.1.1"; - sha256 = "04931915c2a2afa50effe3e40d4c61dc6e9e6c7c0f7eb834670b9de6054c389c"; + sha256 = "171q9h2yd78bcwsbhzhggin9wvnwc560vr73zw7abbx2q8aik4q4"; libraryHaskellDepends = [ aeson base react-flux servant text ]; homepage = "https://bitbucket.org/wuzzeb/react-flux-servant"; description = "Allow react-flux stores to send requests to a servant server"; @@ -147721,7 +157992,7 @@ self: { mkDerivation { pname = "react-haskell"; version = "2.0.1"; - sha256 = "12c92fe0aa26c4845584967320761cb74c97753e4b20ff40f191c6bc338b4b4e"; + sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j"; libraryHaskellDepends = [ aeson base deepseq lens-family monads-tf text transformers unordered-containers void @@ -147739,7 +158010,7 @@ self: { mkDerivation { pname = "react-tutorial-haskell-server"; version = "1.0.0"; - sha256 = "0d7c7addb46114ea0e3c19b6f85b630143036f2bcd7a6fdc911335d1789cd6ba"; + sha256 = "1fnnkiwd2d8kj7f6yynd5dph6hq1cddzidhr7h7fl531nkfplz0d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147755,7 +158026,7 @@ self: { mkDerivation { pname = "reaction-logic"; version = "2010.11.17"; - sha256 = "209f824b2298a7710815a1617b18b3c3c8377aa70913d36a6be1744d415e343c"; + sha256 = "0g1lbr0lsx71ddmd64q9lxx3gj63ncc7nqd12l4739wq495q57r0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl QuickCheck ]; @@ -147773,7 +158044,7 @@ self: { mkDerivation { pname = "reactive"; version = "0.11.5"; - sha256 = "321ca74b1182a4412611628a3818d343b04ee4b4eb047477931ebd40df7bb0ab"; + sha256 = "1axhgggl1g8yjdvp817bnkj4xc23scc3i2k224k43942255sf71j"; libraryHaskellDepends = [ base category-extras checkers old-time QuickCheck random Stream TypeCompose unamb vector-space @@ -147789,7 +158060,7 @@ self: { mkDerivation { pname = "reactive-bacon"; version = "0.4.1"; - sha256 = "75482d6fe3e550fda4d33baa43bbf517b0138f76c0a39fefa2eaf1197d002c32"; + sha256 = "0cic01yikwgalbprz8y0fs7i7c0pynxl7aivsfjgsl75wdpjsj3m"; libraryHaskellDepends = [ base old-time stm ]; testHaskellDepends = [ base containers HUnit old-time stm ]; homepage = "http://github.com/raimohanska/reactive-bacon"; @@ -147807,7 +158078,7 @@ self: { mkDerivation { pname = "reactive-balsa"; version = "0.3"; - sha256 = "40d188ec262613a445d7e2ac06fbbd281555c45985981efe7dae45a42b83fcc0"; + sha256 = "1h7whcms8idfgpz1x645b725a598ppxhdb72sx2s84r64vn8ila0"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi @@ -147828,7 +158099,7 @@ self: { mkDerivation { pname = "reactive-banana"; version = "1.1.0.1"; - sha256 = "ac0e96ff640d9d2453fd35336a278159263b5e8b40c5ce27a221bdcd46fe70c3"; + sha256 = "1hvhzr3cvg91l8kwxia0idg3n9jrh4knlcrmzm9j978dckzrc3mc"; libraryHaskellDepends = [ base containers hashable pqueue transformers unordered-containers vault @@ -147849,7 +158120,7 @@ self: { mkDerivation { pname = "reactive-banana-gi-gtk"; version = "0.2.0.0"; - sha256 = "8ae81b3609e83f24765f31c0c50ccca88da9cd70a2a8566bff4727673becf615"; + sha256 = "05gnxhxnf9s7zxmmda52f36sk3d8rh6cbh1ibxv28gz814v1ps4a"; libraryHaskellDepends = [ base gi-gtk haskell-gi-base reactive-banana text transformers ]; @@ -147866,7 +158137,7 @@ self: { mkDerivation { pname = "reactive-banana-sdl"; version = "0.2.0"; - sha256 = "d55015543991f1892283502dee95c91b4541c17631df439c098452d8cf46ef18"; + sha256 = "067g8v7xhll416f47prifv0l2i8vr6aywbahhci8kwci75a1al6m"; libraryHaskellDepends = [ base data-lens data-lens-template reactive-banana SDL SDL-image SDL-ttf @@ -147882,7 +158153,7 @@ self: { mkDerivation { pname = "reactive-banana-sdl2"; version = "0.1.1.0"; - sha256 = "87981c16e9ec48e898b62a121b7e60fa4ed1b977391770d21a2ad506b68e1e95"; + sha256 = "158yisv0dm9a3b9705rrfywx2kpsc1z1n4ianscfhj7cx4b1r647"; libraryHaskellDepends = [ base reactive-banana sdl2 ]; testHaskellDepends = [ base ]; homepage = "http://github.com/cies/reactive-banana-sdl2#readme"; @@ -147896,7 +158167,7 @@ self: { mkDerivation { pname = "reactive-banana-threepenny"; version = "0.7.1.3"; - sha256 = "2a51bbecf637916ac67cd8803fd08072927bb38024c10e857a5677960f5e60b9"; + sha256 = "1fb0bq7rcxsnga2hxh94h2rpp4kjh383z06qgk36m49pyvnbnl9a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; @@ -147911,7 +158182,7 @@ self: { mkDerivation { pname = "reactive-banana-wx"; version = "1.1.1.0"; - sha256 = "790e671d7eadfeacd7a21e4e415e7e79b1e885ef3b01aa1c6848ca8b0dabfefb"; + sha256 = "1yzymc6qpjj8d0fal09vxy2yicbrgrg42khylbbsrzmdgqfnf3kr"; configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; @@ -147931,7 +158202,7 @@ self: { mkDerivation { pname = "reactive-fieldtrip"; version = "0.0.9"; - sha256 = "af33ede9752f2b6437af1355c9cb65f698690a2301308964a4d8b305adec4b24"; + sha256 = "092bxjnhbcyqlij8jc014c56k67ncp5wjm8kmwvn8argfplyscxg"; libraryHaskellDepends = [ base FieldTrip InfixApplicative reactive reactive-glut unamb vector-space @@ -147949,7 +158220,7 @@ self: { mkDerivation { pname = "reactive-glut"; version = "0.1.10"; - sha256 = "d0e9b5f444a771a43783507dafa604141f52d3b3fa2919f2e91b6f9bdfdf9198"; + sha256 = "164ivzgrnvqvx7r1jagsng9m47ql0jkayzahhcvs8wd78ksbbsfh"; libraryHaskellDepends = [ base GLUT old-time OpenGL reactive vector-space ]; @@ -147964,7 +158235,7 @@ self: { mkDerivation { pname = "reactive-haskell"; version = "0.0.1"; - sha256 = "05319c754954b7e9e0943bc38be4148a1823414058e2c6e9a92d7456bd92bf84"; + sha256 = "115zjaymcx1dm7lwdqjq810j664a2kj8phrvjkhfkdsl95srqc85"; libraryHaskellDepends = [ base ]; description = "minimal fork of io-reactive"; license = stdenv.lib.licenses.bsd3; @@ -147975,7 +158246,7 @@ self: { mkDerivation { pname = "reactive-io"; version = "0.1"; - sha256 = "c3e47cf170f27b1201f67868f9cdb85644a66cb1a14f8f772f52acef5812ea68"; + sha256 = "0s7a29cfzb2j5xvqykx1n5naci2np36zjs3qyq0i4yzjf3qprr63"; libraryHaskellDepends = [ base transformers ]; description = "IO-oriented FRP library"; license = stdenv.lib.licenses.mit; @@ -147990,7 +158261,7 @@ self: { mkDerivation { pname = "reactive-jack"; version = "0.3"; - sha256 = "c94b9ceda912e859146267cb418afcea0428039bffb1f8ac0ede9f2027d2645c"; + sha256 = "0p34s8kj17yy1sngicgzkc1jh17azj543jv7c8a5ks0jm7nrqjy9"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random reactive-banana @@ -148010,7 +158281,7 @@ self: { mkDerivation { pname = "reactive-midyim"; version = "0.3"; - sha256 = "dd1e2d69035249ff92d633a25d3c1393810fa5477b8e18731354be37ff558f25"; + sha256 = "09cgapzkggjl2drii3kv8yjhz0ck2cy5v8ikss9gyjaj0dljs7nx"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana transformers utility-ht @@ -148026,7 +158297,7 @@ self: { mkDerivation { pname = "reactive-thread"; version = "0.3.2.1"; - sha256 = "a0e81fd87b883e24871ee47c25f4668d07ccb4679c9dedfea99d3071c7e2cdd7"; + sha256 = "1mydwb3p2c4xm7zfv7cwcyscq1wdcvs2az743s3j8gl8ggc1zs50"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base monad-parallel stm transformers ]; @@ -148047,7 +158318,7 @@ self: { mkDerivation { pname = "reactivity"; version = "0.3.2.4"; - sha256 = "f8acf988b288c1638bcf4e0bd6ae507758c90839e2e1612296bbdb3f06355700"; + sha256 = "002p6l33znxvjqi63qg2744cjn3pa2pdc2sfry5n7hc8na4gkb7q"; libraryHaskellDepends = [ array base bmp bytestring containers exceptions ghc-prim list-extras monad-loops monads-tf parallel random time transformers @@ -148065,7 +158336,7 @@ self: { mkDerivation { pname = "reactor"; version = "0.1.3"; - sha256 = "4e106392271aa2bcb9d4e8fb0c23db818ebb9699b2dc8186f12f3e86f0dca73c"; + sha256 = "0g57vkq8cgigy6383p5jk6bbp3l1vcihryz8sjwvr8hs4y96642f"; libraryHaskellDepends = [ array base bits-atomic comonad contravariant mtl semigroupoids transformers @@ -148081,7 +158352,7 @@ self: { mkDerivation { pname = "read-bounded"; version = "0.1.1.1"; - sha256 = "fd9103522661982b366f89280e88c7ac8316eb6b892fa11a8645051da6859050"; + sha256 = "0l4hhnk1s1a5hqda2bw9dgmid0xcqy40wa49dwv2p6314r9074gx"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/thomaseding/read-bounded"; description = "Class for reading bounded values"; @@ -148094,7 +158365,7 @@ self: { mkDerivation { pname = "read-editor"; version = "0.1.0.2"; - sha256 = "ed8aeca86823fbaf11a0a543fd106c9c3abe65216ea974ed56050cbebf777085"; + sha256 = "11bhfyzvw305avnp9abf45jvwflwdh8gshx5l08szyr3d2lfr2pd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory process ]; @@ -148108,7 +158379,7 @@ self: { mkDerivation { pname = "read-env-var"; version = "0.1.0.1"; - sha256 = "21962cca51ae11bacf7d92f1436cc76e76ff2d957fb81a0f7a8bcbcf1d0f2fe5"; + sha256 = "1r9g1wfwzjwbg87imf3zjlnzyxkfqxn47wcjgp7vl4dfa752r5i1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/read-env-var#readme"; @@ -148116,12 +158387,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "read-env-var_1_0_0_0" = callPackage + ({ mkDerivation, base, doctest, exceptions, Glob, transformers }: + mkDerivation { + pname = "read-env-var"; + version = "1.0.0.0"; + sha256 = "0p5pw1y6wcq03bdixircf6bb9qjq2aci6bvpmqwfi360dwbwiwq3"; + libraryHaskellDepends = [ base exceptions transformers ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/read-env-var#readme"; + description = "Functions for safely reading environment variables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "read-io" = callPackage ({ mkDerivation, base, containers, directory, filepath, hspec }: mkDerivation { pname = "read-io"; version = "0.0.0.1"; - sha256 = "5c3efb07e781f53b9053ba97927076801825cb49b2f012a9911f64cbc65937e6"; + sha256 = "1ripb73cnr0zj6li5w5j975ja640frq955xsaf83pxc1ww3zngjw"; libraryHaskellDepends = [ base containers directory filepath ]; testHaskellDepends = [ base containers directory filepath hspec ]; homepage = "https://github.com/zaidan/read-io#readme"; @@ -148135,7 +158420,7 @@ self: { mkDerivation { pname = "readable"; version = "0.3.1"; - sha256 = "703037ad2cca4d6d42ba23e2758d1911cd82e3e922c4078076c273231e4b43c9"; + sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h"; libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/mightybyte/readable"; description = "Reading from Text and ByteString"; @@ -148146,8 +158431,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "readcsv"; - version = "0.1"; - sha256 = "dc30c00dd05156749ff38d42eed15c73a493fc0b66b630eab256c4e359456c88"; + version = "0.1.1"; + sha256 = "1d6xw4m3bhgs5mcy6kg325isllj6mx6pdqd7gvlijykmiykkqiny"; + revision = "1"; + editedCabalFile = "1lcgpdjlv1kaasyhk327cvkw4ar06mr7ks8xrkvxf27njdiv035s"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/george-steel/readcsv"; description = "Lightweight CSV parser/emitter based on ReadP"; @@ -148159,7 +158446,7 @@ self: { mkDerivation { pname = "readline"; version = "1.0.3.0"; - sha256 = "c0b9e174910620db0edea8f9fd6fb6c1d7b066260d523e9a7208294c46a75feb"; + sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0"; libraryHaskellDepends = [ base process ]; librarySystemDepends = [ ncurses readline ]; description = "An interface to the GNU readline library"; @@ -148171,7 +158458,7 @@ self: { mkDerivation { pname = "readline-statevar"; version = "1.0.1.0"; - sha256 = "88c5eec58816b2bfd487fa6220a5daa266af51a1c52a4163cf6acee6f8d0ddbd"; + sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8"; libraryHaskellDepends = [ base readline StateVar ]; description = "Readline with variables (setX/getY) wrapped in state vars"; license = stdenv.lib.licenses.bsd3; @@ -148185,7 +158472,7 @@ self: { mkDerivation { pname = "readme-lhs"; version = "0.1.0.0"; - sha256 = "d2686c8149e1eec2e0a1db662e611508498dbb04151b3592656f127e8655c0de"; + sha256 = "1pn0an37w4kgcn93a6qm0jxqsj882mhjwrnvl7hc5vp1960nqs6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base foldl protolude text ]; @@ -148206,7 +158493,7 @@ self: { mkDerivation { pname = "readpyc"; version = "0.2.1"; - sha256 = "f7e6b0c7c1038ac4bacb99f795d8e0ca1760e9e614918e48ce9fb907073f8bc5"; + sha256 = "1icb7w3hgfczrr48x48lwvln05yaw3c9bxwrrfxc92h3q73v1rpp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bliplib parseargs ]; @@ -148223,9 +158510,9 @@ self: { mkDerivation { pname = "readshp"; version = "0.1.0.0"; - sha256 = "354f8e8e649110d0da687dcadefe7145f03a7a9b2c0a752023fa9c9a55f6bc36"; + sha256 = "0dmwyrarm77s4ch7a2ickdx3mw25f7zdxjkxd3dd044icj78wkrm"; revision = "1"; - editedCabalFile = "c8fa843aeed4743a1f664a42097730dd4d5c8f8f7de06f8af26bdf09814efd57"; + editedCabalFile = "0mzx9s0hkpvbya56zq3xiy7mqkfx61vhjhjacqgklx6lxqx89yn8"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 filepath monad-loops ]; @@ -148239,7 +158526,7 @@ self: { mkDerivation { pname = "really-simple-xml-parser"; version = "0.4.0.0"; - sha256 = "deebf19a654850fc893bfa58befe4e46596f0cc9e4699d54112ad56d7574b9e2"; + sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy"; libraryHaskellDepends = [ base parsec ]; homepage = "http://website-ckkashyap.rhcloud.com"; description = "A really simple XML parser"; @@ -148252,7 +158539,7 @@ self: { mkDerivation { pname = "reasonable-lens"; version = "0.2.1.1"; - sha256 = "5575f5ee0cff708aeb37ea79cc9fae555e62e55053656f252653e33e631a8245"; + sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam"; libraryHaskellDepends = [ base mtl split template-haskell ]; homepage = "https://github.com/tokiwoousaka/reasonable-lens"; description = "Lens implementation. It is more small but adequately."; @@ -148265,9 +158552,9 @@ self: { mkDerivation { pname = "reasonable-operational"; version = "0.1.0.1"; - sha256 = "097a4ee78679f0ff06e1137e293ab55f1af9d64ae7c3d44e687a3d7f7f4ea4a1"; + sha256 = "18d49rzpygbsd17d9hz79bbgj6jznlx2jzhkw43gzw3rhvklwyh9"; revision = "1"; - editedCabalFile = "963ed294ec0f951858022c25b9713b06e65d2a05098068a1183110e298b5c8cf"; + editedCabalFile = "1ky8nncf441i32hni0090lm5vrh67dqvj99c09c1i58gxjad4gln"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/tokiwoousaka/reasonable-operational"; description = "Just size Operational Monad implementation"; @@ -148284,7 +158571,7 @@ self: { mkDerivation { pname = "rebase"; version = "1.0.8"; - sha256 = "84d3a1f8e0663fa1f19f963b1a385ef12b0dcb41f8400b0fdda55e7cd7cfb8bd"; + sha256 = "1gdqrzbpqpm5vl7hnh7q875hsazibqw1lfwnkzqs2gv6w3wa3lw4"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -148301,7 +158588,7 @@ self: { mkDerivation { pname = "rebindable"; version = "0.1.2"; - sha256 = "e752ad9aa91d4c96d43865c1e3eefd93c767b8765b82c77be58e4142ca8ca17d"; + sha256 = "0zd1ik544hcfwmxwg0jvfsw6giwkzppf7hb573a9ck0xm6daslp7"; libraryHaskellDepends = [ base data-default-class indexed ]; homepage = "https://github.com/sleexyz/rebindable"; description = "A library to facilitate rebinding of Haskell syntax"; @@ -148313,7 +158600,7 @@ self: { mkDerivation { pname = "recaptcha"; version = "0.1.0.3"; - sha256 = "29a898bc7a063be88c05ac3ec0446a23117ed04c501dbd99c83684683fd638a3"; + sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19"; libraryHaskellDepends = [ base HTTP network network-uri xhtml ]; homepage = "http://github.com/jgm/recaptcha/tree/master"; description = "Functions for using the reCAPTCHA service in web applications"; @@ -148327,7 +158614,7 @@ self: { mkDerivation { pname = "record"; version = "0.4.2"; - sha256 = "beac089c7fdca32bf4f577b04ffbc4ddfbd12e85dd4c05d4906fba299f167276"; + sha256 = "0xkj2sgjkfkgj3a0ak6xhlpd3yyxqkxlzc3pyps2p8ywgyf0ib5y"; libraryHaskellDepends = [ base base-prelude basic-lens template-haskell transformers ]; @@ -148344,7 +158631,7 @@ self: { mkDerivation { pname = "record-aeson"; version = "0.1.1"; - sha256 = "ea4001311b55cc24b51863f3bc63b8ee638a73013b8c7372eac289817767c679"; + sha256 = "0yf6cxvq32f2x9r7731v05rqlqzfp1ivrwv332sj9k2m3cqh2h7a"; libraryHaskellDepends = [ aeson base base-prelude record template-haskell ]; @@ -148363,9 +158650,9 @@ self: { mkDerivation { pname = "record-gl"; version = "0.1.0.0"; - sha256 = "18b7f0861aaed310508e54bd3b286c8dd5819ffde4a517aba23c2bafbee5187c"; + sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq"; revision = "1"; - editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85"; + editedCabalFile = "11bx4xzzjiwjwwxfxs5wnh0jn9ylsbcxmdqvg9qwx41627wif83d"; libraryHaskellDepends = [ base base-prelude containers GLUtil linear OpenGL record tagged template-haskell vector @@ -148386,7 +158673,7 @@ self: { mkDerivation { pname = "record-preprocessor"; version = "0.1.1.1"; - sha256 = "b0cb4a1da915964c6f70300c1fbe9fcc5c2d559ebc82f1ad57ef09dee1cbe55e"; + sha256 = "0pp5rghxw2ggaynz30mwkrajsp6ckyz1y31hf1plr5hmm4flmjxh"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -148408,7 +158695,7 @@ self: { mkDerivation { pname = "record-syntax"; version = "0.1.1"; - sha256 = "a574878bb9fe14f65f1a5616cc27d9b317f0697df3140c8c27d51be1c55efe97"; + sha256 = "15zybv2y26ym4y60q57kgmlz05xkv4kwq5jn39gzc57yp65qfx55"; libraryHaskellDepends = [ base base-prelude conversion conversion-text haskell-src-exts parsec record template-haskell text transformers @@ -148430,9 +158717,9 @@ self: { mkDerivation { pname = "records"; version = "0.1.1.6"; - sha256 = "c9ccd6d264867b3ad1a3405136e7fdeddbb269fddeaa3abd3120ebc7f1c2f8db"; + sha256 = "1nzqqbqwgsr066ykmanyzmlv5nzdzpkkcla0lg8klyw6ck9ddk69"; revision = "1"; - editedCabalFile = "3bbff6cb24271374eb00769bbf9313dfe54e1e08b8e5104df9e2e4f7df88cd07"; + editedCabalFile = "01ydi3gzgr72z56i1rdq10g4xrfz2f9vz6vn03mp84r74k5zdgrv"; libraryHaskellDepends = [ base kinds type-functions ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records"; description = "A flexible record system"; @@ -148440,6 +158727,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "records-sop" = callPackage + ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec + , should-not-typecheck + }: + mkDerivation { + pname = "records-sop"; + version = "0.1.0.0"; + sha256 = "0ipxs13mlkhndbssa218fiajj2c26l5q5dl8n0p3h1qk6gjyfqa1"; + libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; + testHaskellDepends = [ + base deepseq generics-sop hspec should-not-typecheck + ]; + description = "Record subtyping and record utilities with generics-sop"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "records-th" = callPackage ({ mkDerivation, aeson, base, data-default, kinds, records , template-haskell, text, type-functions, unordered-containers @@ -148447,7 +158751,7 @@ self: { mkDerivation { pname = "records-th"; version = "0.1.1.0"; - sha256 = "8fb58a76c4756c701547a7b549d137775da77797521e00d563940558a728dbd4"; + sha256 = "1m6v52kmh1clcgah07jjjxvsfpbp6z8lkdd78wap0v3mqiv8mdcg"; libraryHaskellDepends = [ aeson base data-default kinds records template-haskell text type-functions unordered-containers @@ -148465,13 +158769,13 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.0.1"; - sha256 = "b7a97c72fd7edc2d85060626a1f7e3c56756868aec43510dfe41c1e1fa43ff03"; + 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; @@ -148485,7 +158789,7 @@ self: { mkDerivation { pname = "recursive-line-count"; version = "0.1"; - sha256 = "d63ba514395f4fb41d5c86617a574d82c929732523b2b680a7669ff58865ca47"; + sha256 = "0iyacn4gb7v6ly0bdci34mrjkjc29mbplqc6bhfv8ksz74aaafyn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -148501,7 +158805,7 @@ self: { mkDerivation { pname = "recursors"; version = "0.1.0.0"; - sha256 = "0b18df01b9cb06ba1ef5c25b74f46dda87ae254c66a1b29b06017a2217e443cc"; + sha256 = "1k23whbj4yh10sdv58b69hjsx1ysdps78ny2ylgbl1nbp40xy60b"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec QuickCheck template-haskell ]; homepage = "https://www.github.com/jwiegley/recursors"; @@ -148518,7 +158822,7 @@ self: { mkDerivation { pname = "redHandlers"; version = "0.1"; - sha256 = "8925c73868bfbef1d1bbf184b948b9ca34bc4b5e40f8aaa5d254828c55408bd2"; + sha256 = "1llb81aqr0jlsajsmy20br5vqd6ap54bk17ipg8z3gmzd0wcf9c9"; libraryHaskellDepends = [ array base bytestring cgi containers haskell98 MaybeT mtl network old-time parsec stm unix xhtml @@ -148537,7 +158841,7 @@ self: { mkDerivation { pname = "reddit"; version = "0.2.1.0"; - sha256 = "49e5ad14a04e0ab7bed9c4a02b3b03c42f20319a51df76c41d8386502fd7e420"; + sha256 = "0874swpm11l33p27dpsik8qj0by40cxjp864v6zbf2jfl0aavra9"; libraryHaskellDepends = [ aeson api-builder base bytestring data-default-class free http-client http-client-tls http-types network text time @@ -148560,7 +158864,7 @@ self: { mkDerivation { pname = "redis"; version = "0.14.1"; - sha256 = "2be1ba0dddbbdb55543a1a8272f38d6ac7d61a5a0f9bbaaacbfe258bc03c290b"; + sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b"; libraryHaskellDepends = [ base bytestring concurrent-extra containers exceptions mtl network old-time utf8-string @@ -148575,7 +158879,7 @@ self: { mkDerivation { pname = "redis-hs"; version = "0.1.2"; - sha256 = "8fa3608e62dec65419978fd5a6448d79d67be83f349e07ce4e4ccf3679f72ac7"; + sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg"; libraryHaskellDepends = [ base bytestring network utf8-string ]; homepage = "http://ohloh.net/p/redis-hs"; description = "A simple Redis library for Haskell"; @@ -148592,7 +158896,7 @@ self: { mkDerivation { pname = "redis-io"; version = "0.7.0"; - sha256 = "1f68cb184f29fd4dc27b7034ee6dd2c53a952fbda1084ba25afd83952518e619"; + sha256 = "06g630jrb0zxbai4n251plprafn5s9nywd3hgg14vz999wccns0z"; libraryHaskellDepends = [ attoparsec auto-update base bytestring containers exceptions iproute monad-control mtl network operational redis-resp @@ -148616,7 +158920,7 @@ self: { mkDerivation { pname = "redis-job-queue"; version = "0.1.0"; - sha256 = "5ee207f8ca3031e2b8662018ad7a4a9c820741c87e3d57336f4a2848ebabd2fe"; + sha256 = "1znjmgmlha2adwrmfgbyr10hg0lw99xas610cswf4c9hrbw0gqjy"; libraryHaskellDepends = [ aeson base bytestring hedis ]; description = "Simple priority job queue backed by Redis"; license = stdenv.lib.licenses.mit; @@ -148630,7 +158934,7 @@ self: { mkDerivation { pname = "redis-resp"; version = "0.4.0"; - sha256 = "8bc0d592843e05c37a3fda22255daca74f1c17c4e4a7951531accd45cd2a9232"; + sha256 = "0clj5b6lbkdc64arb9z4qhbiqkx7mifja8ns7xxc619yhj9dbh4b"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-conversion containers dlist double-conversion operational semigroups split transformers @@ -148645,7 +158949,7 @@ self: { mkDerivation { pname = "redis-simple"; version = "0.1.1"; - sha256 = "83e4f6c22f70b40f7f36912b00eb8950c69f26f87482794aff0d102f182dfa4f"; + sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43"; libraryHaskellDepends = [ base binary bytestring redis ]; homepage = "http://github.com/jaspervdj/redis-simple"; description = "Simple redis bindings for Haskell"; @@ -148659,7 +158963,7 @@ self: { mkDerivation { pname = "redo"; version = "0.2.0"; - sha256 = "8d782683ff20389aafb0f5c318bae0fdb2ffc4431ea2f695423d7214b30e25a1"; + sha256 = "18951sri8wix8aazd8hy8g2gzcpxw2x1ihzmn2prlf10zy1jcy4d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -148678,7 +158982,7 @@ self: { mkDerivation { pname = "reduce-equations"; version = "0.1.1.0"; - sha256 = "255b5757a180d042c96d55a4fc165796801b83217cebb4237a30685b68ab57ad"; + sha256 = "1bapmdl5ns1hg8iv9svw461ip04nawbgr92mdp4l5l40l5bmfnr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148705,9 +159009,9 @@ self: { mkDerivation { pname = "reducers"; version = "3.12.1"; - sha256 = "e43bb7678272691a358c049daecbac715c4b0fcece021c6b2ac7b2a1c16b6d5e"; + sha256 = "0pkddg0s3cn759miq0nfrq7lnp3imk5sx784ihsilsbjh9kvffz4"; revision = "1"; - editedCabalFile = "c6ab48d549368fdf26d133be187a1ca00831307271b1a710ec950d50b2d1c2be"; + editedCabalFile = "1gn2s6r503cmxh8agcbif8q322503ix1igiks4kdz3rn97aliay6"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids semigroups text transformers unordered-containers @@ -148725,7 +159029,7 @@ self: { mkDerivation { pname = "reedsolomon"; version = "0.0.4.3"; - sha256 = "b74acd24ee1524e684860a20a8bf44eea5524ff8fd22c6efd0baf20bb5a0a42b"; + sha256 = "0ax4l2shpwmss3pwc8pxz17m59gf8jzsh80ahs2fc90mxqjcsjmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148751,7 +159055,7 @@ self: { mkDerivation { pname = "reenact"; version = "0.9"; - sha256 = "bc0b4961a2898f27d415e88e3187bd1d1fb6ff2ea6937f3b2f1029590207bca7"; + sha256 = "19xw0w15ja8h5wxpz4x65vzvc7qxpn3k33p82pa2g3w9l9hlj2xw"; libraryHaskellDepends = [ base hamid HCodecs stm time vector-space ]; @@ -148764,7 +159068,7 @@ self: { mkDerivation { pname = "reexport-crypto-random"; version = "0.1.0.0"; - sha256 = "a99b72a930c6b866db6b2bfc87de78ec92b8436025915f8c64a08314e8f42a53"; + sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9"; libraryHaskellDepends = [ base crypto-api ]; license = stdenv.lib.licenses.gpl2; }) {}; @@ -148774,7 +159078,7 @@ self: { mkDerivation { pname = "ref"; version = "0.1.1.2"; - sha256 = "19c607d20eb96e758cbef709d5b387724bd7fde684bdadb051e491bf1ea53181"; + sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://bitbucket.org/carter/ref"; description = "Generic Mutable Ref Abstraction Layer"; @@ -148787,7 +159091,7 @@ self: { mkDerivation { pname = "ref-fd"; version = "0.4.0.1"; - sha256 = "e416f1afba149e3af9cbe1011381d0b89609c240d812127bd03b8a922a5f6037"; + sha256 = "0dv0bwm952ivs1xi44nq8310k5mqs20i60g1rgwkm7hlpapz25p4"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using functional dependencies"; license = stdenv.lib.licenses.bsd3; @@ -148798,7 +159102,7 @@ self: { mkDerivation { pname = "ref-mtl"; version = "0.3"; - sha256 = "0001829cd8e7e63e884a157528d2f92ccbf2135ad07306bec4e67a3c9c9a3272"; + sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080"; libraryHaskellDepends = [ base mtl stm transformers ]; homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "A type class for monads with references compatible with the mtl2 library"; @@ -148811,7 +159115,7 @@ self: { mkDerivation { pname = "ref-tf"; version = "0.4.0.1"; - sha256 = "fcb522c5dca437fbd0c0132c56664a71c48fe2c06b150fcfa77d3bad5ce4be0e"; + sha256 = "03mywifasfvxlz7hy5bbq3i8zi3i99k5cb0kq38gndx4vk2j5dgw"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; license = stdenv.lib.licenses.bsd3; @@ -148822,7 +159126,7 @@ self: { mkDerivation { pname = "refact"; version = "0.3.0.2"; - sha256 = "0ad029727797c8ca5d179c7abf1bfc135d86a7d72cf93785ee12ad243aeb1f6c"; + sha256 = "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a"; libraryHaskellDepends = [ base ]; description = "Specify refactorings to perform with apply-refact"; license = stdenv.lib.licenses.bsd3; @@ -148836,7 +159140,7 @@ self: { mkDerivation { pname = "refcount"; version = "0.1.2"; - sha256 = "26bc984219537a267d661d30bc904f70dd333b14318bc887bb041d4658be2fc0"; + sha256 = "1h1gprc4c784pf3wi2ri2hxk7pbh9y8bqc0xcryjcyjk3519ig16"; libraryHaskellDepends = [ base hashable QuickCheck unordered-containers ]; @@ -148856,7 +159160,7 @@ self: { mkDerivation { pname = "reference"; version = "0.1"; - sha256 = "013763f0f4735e47cc12bc321b6bfcf8aa9bb3e7578d3ace0b98970e795c0bbf"; + sha256 = "1gqbbiwhx5wq1g73m3apwyrrpapqzimincmw2b64fpkkykq66dq1"; libraryHaskellDepends = [ base stm ]; description = "A class for references in Haskell"; license = stdenv.lib.licenses.mit; @@ -148870,7 +159174,7 @@ self: { mkDerivation { pname = "references"; version = "0.3.2.1"; - sha256 = "184020e17d1f3e86bb9e350f9c4076a838f580c23d943801245ded92edd27624"; + sha256 = "093nsbnr5vax4h0ki51xqa0gaf58fr09q3rmksxqcghzgphj0h0q"; libraryHaskellDepends = [ array base containers directory either filepath instance-control mtl template-haskell text transformers uniplate @@ -148893,7 +159197,7 @@ self: { mkDerivation { pname = "refh"; version = "0.1.1"; - sha256 = "357dfc6c7a6b70bff1025dd17d09630590c53bc18d5521488422612719b11bba"; + sha256 = "1fhvn4cjfq92hi422mcdq4xwb405cc4pvlax0bqvyw3bg9ngqz9m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -148910,7 +159214,7 @@ self: { mkDerivation { pname = "refined"; version = "0.1.2.1"; - sha256 = "156e08b286b3c433d40ca39160b7f1ecec6072c138ca48f6d90d3d0cb808e777"; + sha256 = "0xz712w0qg8dv7v4ijiqq5r61v7cy6vn14d31ka37i5khsr0hvhm"; libraryHaskellDepends = [ base base-prelude template-haskell ]; homepage = "https://github.com/nikita-volkov/refined"; description = "Refinement types with static and runtime checking"; @@ -148922,7 +159226,7 @@ self: { mkDerivation { pname = "reflection"; version = "2.1.2"; - sha256 = "a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39"; + sha256 = "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; @@ -148935,7 +159239,7 @@ self: { mkDerivation { pname = "reflection-extras"; version = "0.1.1.0"; - sha256 = "93c8ec7ef16191947f516043ec3436e3d6397b1b18a81673635b6e96216ad8b2"; + sha256 = "1cnqd8hrcvjvcdrida0q3dxkkmp36qsfqhv0a5zr94b1y5zfrj4k"; libraryHaskellDepends = [ aeson base constraints lens reflection tagged ]; @@ -148950,7 +159254,7 @@ self: { mkDerivation { pname = "reflection-without-remorse"; version = "0.9.5"; - sha256 = "197450bb605c4b6134222468cba3bbb8e0fa0f41ab89378d0ac121060599e4c7"; + sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r"; libraryHaskellDepends = [ base type-aligned ]; homepage = "https://github.com/atzeus/reflection-without-remorse"; description = "Efficient free and operational monads"; @@ -148967,9 +159271,9 @@ self: { mkDerivation { pname = "reflex"; version = "0.4.0"; - sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c"; + sha256 = "173b8ysrghrw2fvdsqf6ybik9f24kw4ji1h8w4wj5kspbi12s36n"; revision = "2"; - editedCabalFile = "e88ff0200373c04d57ff4b3232ada2a6965f61a23d99a8ef6bcbf96603c9d992"; + editedCabalFile = "14nrr41ndyfbdgpsi69xl9hmz5m6lank4cjbzxblvh3k0chg13z8"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -148995,7 +159299,7 @@ self: { mkDerivation { pname = "reflex-animation"; version = "0.1.5"; - sha256 = "3ad0b2a381a4c356fd4d5a4ce7f60b875937e685f813d52c7ef1c8593776dd05"; + sha256 = "01fxfqvmkj7igqnda4zqhpk3fnc71gvffk2s9pymdhx4h6iv5l1s"; libraryHaskellDepends = [ base bifunctors containers profunctors reflex reflex-transformers semigroups vector-space @@ -149017,9 +159321,9 @@ self: { mkDerivation { pname = "reflex-dom"; version = "0.3"; - sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a"; + sha256 = "0fldnl2yamn24v0qnfr4hhy4q9nq6kxspiy39yk5kdfvxg8aqax5"; revision = "2"; - editedCabalFile = "b569e2b08dac72a37173f680be5eaeb9ad57900c08301bf7b958f1cf52ac6055"; + editedCabalFile = "0mb0mi9czwaqp7vinc081j85gbdrmrgbx07nfdqs6wmcinqf4sdm"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -149039,7 +159343,7 @@ self: { mkDerivation { pname = "reflex-dom-colonnade"; version = "0.4.6"; - sha256 = "b67ce02af09d3c2c30569cfac2758cc7439cbe1dab27323e6119ef5cc7267c17"; + sha256 = "05vw4v3mrvqrc4z349xb3nz9qhy7iisw5ylwaqq2qg4xy0mf0z5n"; libraryHaskellDepends = [ base colonnade containers contravariant reflex reflex-dom semigroups text vector @@ -149058,7 +159362,7 @@ self: { mkDerivation { pname = "reflex-dom-contrib"; version = "0.4.1"; - sha256 = "e0c075de9b5b5c145ad7cd70fc214d1d2f8e76a0e640fde2e6202a9172573ed5"; + sha256 = "1m9yaxr92ai0wvigsh76l1v8wbqx9lhzqw6dsxd18p2vkgg7bh70"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default ghcjs-dom http-types lens mtl random readable reflex reflex-dom safe @@ -149075,7 +159379,7 @@ self: { mkDerivation { pname = "reflex-dom-helpers"; version = "0.1.0.0"; - sha256 = "11ca03871d79471c6aca59f7a947a0d809ed9ec5765b0c2250c510d478e2fb3b"; + sha256 = "0fzvw9wd8465a0i0qnvnqngfs2fql13skxsrr9m1qivr3n3h7jhi"; libraryHaskellDepends = [ base reflex reflex-dom template-haskell ]; @@ -149093,7 +159397,7 @@ self: { mkDerivation { pname = "reflex-gloss"; version = "0.2"; - sha256 = "e8bcebe49b351de22a6cbf6caec64465b449bc4212074de1a867876151837ab6"; + sha256 = "1dkshd8n31v7m3hls1qj8ay4kd358k3awv5zdhmf479mkgjfpg78"; libraryHaskellDepends = [ base dependent-sum gloss mtl reflex transformers ]; @@ -149113,7 +159417,7 @@ self: { mkDerivation { pname = "reflex-gloss-scene"; version = "0.1.2"; - sha256 = "36cf3a42cbda33433c50a4dadbd580a22f9c88fc61f415777a63cf234da424d5"; + sha256 = "1m94li6j7kv3g9vibx31zj49qbx2h3axpnm4a0y46cysrd13mkrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149139,7 +159443,7 @@ self: { mkDerivation { pname = "reflex-jsx"; version = "0.1.0.0"; - sha256 = "a06801ba3100eb5966fb078c1e04f8c2662eb63661615aef8b54b1d31e98fde4"; + sha256 = "1r7xk0gd7caligpmlqb16sv2wrn2z021x307zdk5ksq066x02s50"; libraryHaskellDepends = [ base containers haskell-src-meta parsec reflex reflex-dom template-haskell text @@ -149157,7 +159461,7 @@ self: { mkDerivation { pname = "reflex-orphans"; version = "0.1.0.2"; - sha256 = "ab8d8fdfb0c97f2622adc1d40af05fd1818220e59b901ec491369d99c8a8a33f"; + sha256 = "0gx3m349k79nj721x44vwlh850fibzq0mm61mli2czy9n3gqz3db"; libraryHaskellDepends = [ base reflex these ]; testHaskellDepends = [ base deepseq dependent-map mtl ref-tf reflex tasty tasty-hunit @@ -149174,7 +159478,7 @@ self: { mkDerivation { pname = "reflex-transformers"; version = "0.2.1"; - sha256 = "df901365231fc8db36e70a579173be8d663c7eb6f3c7e351f5977322e8ccbd72"; + sha256 = "0wmxrkl24wwpym8y7izknrz3qrldprrr2mqawwvdpj0z4dji746z"; libraryHaskellDepends = [ base containers lens mtl reflex semigroups stateWriter transformers ]; @@ -149189,7 +159493,7 @@ self: { mkDerivation { pname = "reform"; version = "0.2.7.1"; - sha256 = "59be2189906788ee4ecf82559aea2e7159a7a0c716c129cccce97e9d89819230"; + sha256 = "0c4jh64rszp9rk62kh8nqyhafnbi5vm9lmc2rx7fx237j24j3gjr"; libraryHaskellDepends = [ base containers mtl text ]; homepage = "http://www.happstack.com/"; description = "reform is a type-safe HTML form generation and validation library"; @@ -149201,7 +159505,7 @@ self: { mkDerivation { pname = "reform-blaze"; version = "0.2.4.3"; - sha256 = "11bcf127356bf5840a0947ea1058cbf1e08096ab0fc872aa5c1ec7d88e40b2e4"; + sha256 = "1r5j827diiqybjm75j0gmfb81q7irdc11sj714589xbb6lkz3g0i"; libraryHaskellDepends = [ base blaze-html blaze-markup reform text ]; @@ -149215,7 +159519,7 @@ self: { mkDerivation { pname = "reform-hamlet"; version = "0.0.5.3"; - sha256 = "512729389fc3eec118a8079486eb2319e1e8eaecdeecafdd6b36205373ce3466"; + sha256 = "0rilrrrm681ndgfszv6yxkmfiq8r4gmqd507m0cc3vn3kww2j9si"; libraryHaskellDepends = [ base blaze-markup reform shakespeare text ]; @@ -149231,7 +159535,7 @@ self: { mkDerivation { pname = "reform-happstack"; version = "0.2.5.1"; - sha256 = "6fa06f0cc07251bf5ec38a553de468ede9b7495c4534ba9c3f96780c1adadaaa"; + sha256 = "1ansv8d0qy4n7yfbld25bi4vgsgdd3j3smcaqdgbylbjq066z83g"; libraryHaskellDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; @@ -149245,7 +159549,7 @@ self: { mkDerivation { pname = "reform-hsp"; version = "0.2.7.1"; - sha256 = "48edd2a1322bacfb2d8574222c194cfa4ffdce135f4dff851d9d5e6fe3008d20"; + sha256 = "084d03inyplx3n2zykaz2g7gskzs9hcjq8klhlnzpb1b6ahx5va8"; libraryHaskellDepends = [ base hsp hsx2hs reform text ]; homepage = "http://www.happstack.com/"; description = "Add support for using HSP with Reform"; @@ -149257,7 +159561,7 @@ self: { mkDerivation { pname = "refresht"; version = "0.1.1.0"; - sha256 = "07350b47c06d2a1466419b33fa6983dd289fa33713c046b57f2ec92303bc633f"; + sha256 = "0gv3ph1j7j9fgysldh0k6yirya6xhdlzlcwv85k18akdq13hnd87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; @@ -149272,7 +159576,7 @@ self: { mkDerivation { pname = "refty"; version = "0.2.0.0"; - sha256 = "d8dbabf5ae6f076d640a801aa19da10e3e4e5ae373b0e7bb96a512739b9ae2c9"; + sha256 = "1jg2kadp64m5jsxygc3kwdd4wghfl6fs26l019j6s1vgmvsspnyq"; libraryHaskellDepends = [ aeson base containers text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/oreshinya/refty"; @@ -149281,21 +159585,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "refurb" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, classy-prelude + , composite-base, composite-opaleye, dlist, fast-logger, hspec + , lens, monad-logger, old-locale, opaleye, optparse-applicative + , postgresql-simple, process, product-profunctors, template-haskell + , text, these, thyme, vector-space + }: + mkDerivation { + pname = "refurb"; + version = "0.2.2.0"; + sha256 = "0qnlkpi8hc6a1xf094zf675i4ap3gymxirdmbkdwjq8j54w3lkhl"; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring classy-prelude composite-base + composite-opaleye dlist fast-logger lens monad-logger old-locale + opaleye optparse-applicative postgresql-simple process + product-profunctors template-haskell text these thyme vector-space + ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring classy-prelude composite-base + composite-opaleye dlist fast-logger hspec lens monad-logger + old-locale opaleye optparse-applicative postgresql-simple process + product-profunctors template-haskell text these thyme vector-space + ]; + homepage = "https://github.com/ConferHealth/refurb#readme"; + description = "Tools for maintaining a database"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers - , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa + , hashable, regex-base, regex-pcre-builtin, regex-tdfa , regex-tdfa-text, template-haskell, text, time, time-locale-compat - , transformers, unordered-containers + , transformers, unordered-containers, utf8-string }: mkDerivation { pname = "regex"; - version = "0.5.0.0"; - sha256 = "422392384ce3986d1c5627b30c8dc9dfb05fe41044820739d11da51ff1a8c27f"; + version = "1.0.1.3"; + sha256 = "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb"; libraryHaskellDepends = [ - array base base-compat bytestring containers hashable heredoc - regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text - template-haskell text time time-locale-compat transformers - unordered-containers + array base base-compat bytestring containers hashable regex-base + regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text + time time-locale-compat transformers unordered-containers + utf8-string ]; homepage = "http://regex.uk"; description = "Toolkit for regex-base"; @@ -149310,7 +159643,7 @@ self: { mkDerivation { pname = "regex-applicative"; version = "0.3.3"; - sha256 = "6659a2cc1c8137d77ef57f75027723b075d473354d935233d98b1ae1b03c3be6"; + sha256 = "1riv7jqf26lbv4rm54sd6mrx8xdh4dvh4xbzymzdfdw13k6a4nb6"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers smallcheck tasty tasty-hunit tasty-smallcheck @@ -149326,7 +159659,9 @@ self: { mkDerivation { pname = "regex-applicative-text"; version = "0.1.0.1"; - sha256 = "b093051f80865d257da2ded8ad1b566927b01b3d2f86d41da2ffee4a26c4e2d9"; + 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"; @@ -149338,7 +159673,7 @@ self: { mkDerivation { pname = "regex-base"; version = "0.93.2"; - sha256 = "20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278"; + sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10"; libraryHaskellDepends = [ array base bytestring containers mtl ]; homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; @@ -149350,7 +159685,7 @@ self: { mkDerivation { pname = "regex-compat"; version = "0.95.1"; - sha256 = "d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b"; + sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m"; libraryHaskellDepends = [ array base regex-base regex-posix ]; homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; @@ -149362,7 +159697,7 @@ self: { mkDerivation { pname = "regex-compat-tdfa"; version = "0.95.1.4"; - sha256 = "4fa38ed24ae390eeffe6eef04bbe632d7ecd02b9123729e976e7420f927520dd"; + sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg"; libraryHaskellDepends = [ array base regex-base regex-tdfa ]; homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa"; description = "Unicode Support version of Text.Regex, using regex-tdfa"; @@ -149377,7 +159712,7 @@ self: { mkDerivation { pname = "regex-deriv"; version = "0.0.5"; - sha256 = "29e89878834b019ea156f98b97e06aba60bb4fcfff7e977f866a1d1e5c558040"; + sha256 = "0h40amf1w7bahrzrfzpzrx7vnq5sdbh9g2zrashrw0abhdw9is19"; libraryHaskellDepends = [ base bitset bytestring containers deepseq dequeue ghc-prim hashable hashtables mtl parallel parsec regex-base @@ -149393,7 +159728,7 @@ self: { mkDerivation { pname = "regex-dfa"; version = "0.91"; - sha256 = "b71d3f1d1f81f90515be040d57d249fb953ce285cc469c8482fe3c6e503304b9"; + sha256 = "1f846d86wg7yha29qinchpi3r5gv9795f384pqahbyc13wfky7dp"; libraryHaskellDepends = [ base mtl parsec regex-base ]; homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; @@ -149408,7 +159743,7 @@ self: { mkDerivation { pname = "regex-do"; version = "3.2"; - sha256 = "a7e8a864ee66c2a37fbf4574153dd42ee727283f8f5d0d142f7946172131977b"; + sha256 = "0ywp64hifikr5wa0spcg7wl2grrfshyiax25pxzs7hk6xrjais57"; libraryHaskellDepends = [ array base bytestring regex-base regex-pcre stringsearch tagged text @@ -149429,7 +159764,7 @@ self: { mkDerivation { pname = "regex-easy"; version = "0.1.0.0"; - sha256 = "c9517a9566054700857810ff44cb2780c5922c9af3681bf399aa2fd0fe80c280"; + sha256 = "1062h3zd0bxak7rins7kk8n95ic04z5l9zqhg22h0iq5csapllf9"; libraryHaskellDepends = [ array base bytestring regex-pcre string-conversions ]; @@ -149439,36 +159774,40 @@ self: { }) {}; "regex-examples" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring, containers - , directory, hashable, heredoc, http-conduit, regex, regex-base - , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly - , smallcheck, tasty, tasty-hunit, tasty-smallcheck - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers + ({ mkDerivation, array, base, base-compat, blaze-html, bytestring + , containers, data-default, directory, filepath, hashable, heredoc + , http-conduit, regex, regex-base, regex-pcre-builtin, regex-tdfa + , regex-tdfa-text, regex-with-pcre, shelly, smallcheck, tasty + , tasty-hunit, tasty-smallcheck, template-haskell, text, time + , time-locale-compat, transformers, unordered-containers + , utf8-string }: mkDerivation { pname = "regex-examples"; - version = "0.5.0.0"; - sha256 = "bfc94f67d1723fd833247512549aa2e0a9d18070aaf9409feaef87388a48a1bb"; + version = "1.0.1.3"; + sha256 = "0hmpq8w08n0vslnzqn6zsxp622dipg0ma42b4d47rjnv9ihl0jad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit + array base base-compat blaze-html bytestring containers + data-default directory filepath hashable heredoc http-conduit regex + regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text + regex-with-pcre shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers + transformers unordered-containers utf8-string ]; testHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit + array base base-compat blaze-html bytestring containers + data-default directory filepath hashable heredoc http-conduit regex + regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text + regex-with-pcre shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers + transformers unordered-containers utf8-string ]; homepage = "http://regex.uk"; description = "Tutorial, tests and example programs for regex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-genex" = callPackage @@ -149478,7 +159817,7 @@ self: { mkDerivation { pname = "regex-genex"; version = "0.7.0"; - sha256 = "70d4028bfdafaaffc95d82d38d54949e9c0b102578ecd73a8a00a2669c55e4cc"; + sha256 = "1k74anf6d8h0i8xdgv3q4l80p74yjia8vlw2bp4zzamgzn5h5m3h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149496,7 +159835,7 @@ self: { mkDerivation { pname = "regex-parsec"; version = "0.90"; - sha256 = "dd76019bdbc921d1e720600e5a47ef85f5154d8f0493eb50eb9df60a4266c57d"; + sha256 = "0zf5cr10mxlxxd8fp4q4ix6ibxc5xx3ml3k043kx28f9vfdh2xnx"; libraryHaskellDepends = [ base parsec regex-base ]; homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; @@ -149511,7 +159850,7 @@ self: { mkDerivation { pname = "regex-pcre"; version = "0.94.4"; - sha256 = "8eaa7d4ac6c0a4ba35aa59fc3f6b8f8e252bb25a47e136791446a74752e226c0"; + sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -149526,7 +159865,7 @@ self: { mkDerivation { pname = "regex-pcre-builtin"; version = "0.94.4.8.8.35"; - sha256 = "0bd1b695de953ba4b6e6e0de007021c346cb2a6c8e09356fbcd34f8a79d2ea78"; + sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -149535,6 +159874,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-pcre-text" = callPackage + ({ mkDerivation, array, base, bytestring, regex-base + , regex-pcre-builtin, regex-tdfa-text, text + }: + mkDerivation { + pname = "regex-pcre-text"; + version = "0.94.0.1"; + sha256 = "1gg9v3q05j2wdp93iragg7y5414ydz0zmkm0xyrcz98dn3bix68p"; + libraryHaskellDepends = [ + array base bytestring regex-base regex-pcre-builtin regex-tdfa-text + text + ]; + homepage = "https://github.com/cdornan/regex-pcre-text"; + description = "Text-based PCRE API for regex-base"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "regex-pderiv" = callPackage ({ mkDerivation, base, bitset, bytestring, containers, deepseq , ghc-prim, mtl, parallel, parsec, regex-base @@ -149542,7 +159898,7 @@ self: { mkDerivation { pname = "regex-pderiv"; version = "0.2.0"; - sha256 = "e42dc7036dcba32203aa301b082598d62bfb26c90ed24312a38cc693a4cf4bba"; + sha256 = "1fjbryj97ilclc947lhfr4kgnaynk0jhh6rhm81j58ybdl1wfbg4"; libraryHaskellDepends = [ base bitset bytestring containers deepseq ghc-prim mtl parallel parsec regex-base @@ -149558,7 +159914,7 @@ self: { mkDerivation { pname = "regex-posix"; version = "0.95.2"; - sha256 = "56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e"; + sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -149574,7 +159930,7 @@ self: { mkDerivation { pname = "regex-posix-unittest"; version = "1.1"; - sha256 = "7d9772ee791900692c000b6a11d6480d4b9b2529f9f9796776b73e5a6cd39d4d"; + sha256 = "0kcxsdn5lgmpfrkpkygr54jrnjqd93b12shb00n6j00rg7p755vx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149591,7 +159947,7 @@ self: { mkDerivation { pname = "regex-tdfa"; version = "1.2.2"; - sha256 = "cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39"; + sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -149607,7 +159963,7 @@ self: { mkDerivation { pname = "regex-tdfa-pipes"; version = "0.1.0.0"; - sha256 = "221369b630ea479034bf959e936a71646ec9d13db13035d817cc7c10eb1d3098"; + sha256 = "161h3pmi0z6c2zc3ac5i7p8wjvk4f5m977lmpws90iza62v6j4r2"; libraryHaskellDepends = [ array base lens monads-tf pipes regex-base regex-tdfa ]; @@ -149622,7 +159978,7 @@ self: { mkDerivation { pname = "regex-tdfa-quasiquoter"; version = "0.2.0.0"; - sha256 = "8ae16a6297b7357ef3d9f8d2e09d006e74f67b889ec7d86296eb0ac6fb2c8361"; + sha256 = "0qc35kxwc2pbjridiiwyi1xzcx3f02fy1lpqv7rpwddpjxi6mqca"; libraryHaskellDepends = [ base regex-tdfa template-haskell ]; homepage = "http://github.com/erisco/regex-tdfa-quasiquoter"; description = "Quasi-quoter for TDFA (extended POSIX) regular expressions"; @@ -149637,7 +159993,7 @@ self: { mkDerivation { pname = "regex-tdfa-rc"; version = "1.1.8.3"; - sha256 = "e35ee2a782c82c3eb313a478a8e04a464e55ca0369aa91827972ce37440c21ee"; + sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -149651,7 +160007,7 @@ self: { mkDerivation { pname = "regex-tdfa-text"; version = "1.0.0.3"; - sha256 = "38d77a0d225c306c52c6d4eed12d11d05a4bc4194d547cb9a7a9b6f5a8792001"; + sha256 = "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq"; libraryHaskellDepends = [ array base regex-base regex-tdfa text ]; description = "Text interface for regex-tdfa"; license = stdenv.lib.licenses.bsd3; @@ -149664,7 +160020,7 @@ self: { mkDerivation { pname = "regex-tdfa-unittest"; version = "1.1"; - sha256 = "ac454b981b19cbbf443918ccb9d44508056e5e3be28fc90adb1d1b4287622cad"; + sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149681,9 +160037,9 @@ self: { mkDerivation { pname = "regex-tdfa-utf8"; version = "1.0"; - sha256 = "93380c3d808ffcfdd2932cf4eb408d977da4162eddb58a3edc5bb7b40788ad44"; + sha256 = "0i5di03v9dsvvhz8mdfx5qba8zcpim0fpx1cjg9gvz4gh0yhqf4k"; revision = "1"; - editedCabalFile = "81e8b881e28f1943ad542e543795c1db7dcb3644311b029da4b1c110aba5997c"; + editedCabalFile = "0z4rlnmi1hdiljfh46ri8hvcnzfvq6akfm1fajnl66cgwa0vis41"; libraryHaskellDepends = [ array base bytestring regex-base regex-tdfa utf8-string ]; @@ -149697,7 +160053,7 @@ self: { mkDerivation { pname = "regex-tre"; version = "0.91"; - sha256 = "f2ac54c70fc4b8efcaa0972e6feaf585268a1c227e1900bfbd71bb809107fdac"; + sha256 = "1b7x0y8q1fvipnzh06by48f8l9l5ypm6yblpl35fzf641z3m9b7j"; libraryHaskellDepends = [ base regex-base ]; librarySystemDepends = [ tre ]; homepage = "http://sourceforge.net/projects/lazy-regex"; @@ -149711,7 +160067,7 @@ self: { mkDerivation { pname = "regex-type"; version = "0.1.0.0"; - sha256 = "fb19df907226e8b8c04110bb983c40028ebf9cecd33a46cf333e5de785a6fc0a"; + sha256 = "02pwls2yfp9y6g7lcfnkxjfbz3h280y9ifqh870bis16fa8dy6gv"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kcsongor/regex-type"; description = "Type-level regular expressions"; @@ -149719,12 +160075,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex-with-pcre" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, regex + , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa + , template-haskell, text, transformers, unordered-containers + }: + mkDerivation { + pname = "regex-with-pcre"; + version = "1.0.1.3"; + sha256 = "17pq70wiyq97rh6ba1zsl6rzifi8k5mykn6kwwxcvjqqs9n2nzh9"; + libraryHaskellDepends = [ + base base-compat bytestring containers regex regex-base + regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text + transformers unordered-containers + ]; + homepage = "http://regex.uk"; + description = "Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-xmlschema" = callPackage ({ mkDerivation, base, haskell98, parsec }: mkDerivation { pname = "regex-xmlschema"; version = "0.1.5"; - sha256 = "446be097c8d07d9e819d1fe39b1ccc2a3dd43705f66c516d9b00496dbeddb0b6"; + sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4"; libraryHaskellDepends = [ base haskell98 parsec ]; homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; description = "A regular expression library for W3C XML Schema regular expressions"; @@ -149740,7 +160116,7 @@ self: { mkDerivation { pname = "regexchar"; version = "0.9.0.14"; - sha256 = "7de1d64126bc9205b569c8cda5b06b0bbebc1bed6a47c4bf8a84c24fc8255242"; + sha256 = "0hjj4p44zhl4iazw8ivaxldvrghbdfqabkf8d6shb4mw4r0xdqbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149765,7 +160141,7 @@ self: { mkDerivation { pname = "regexdot"; version = "0.12.0.1"; - sha256 = "b96d630861eb7028b560a43e4b5e89f8ae9e65cd6c193a7762d5d3b95ea66064"; + sha256 = "0r30lrgbklymc9vkl6bcrmjrxbpqi5g4ngm4c2sjhw7bc4466vdr"; libraryHaskellDepends = [ base data-default deepseq parallel parsec toolshed ]; @@ -149782,7 +160158,7 @@ self: { mkDerivation { pname = "regexp-tries"; version = "0.2"; - sha256 = "34ec9008abf3261f83b286c36bff2820355997a9aca076b79e74e926046e579b"; + sha256 = "16spdq22dsblksvpd85cm6bmjd9053znphw6na1iy9pkmc491v1l"; libraryHaskellDepends = [ base containers derive-trie template-haskell weighted-regexp ]; @@ -149797,7 +160173,7 @@ self: { mkDerivation { pname = "regexpr"; version = "0.5.4"; - sha256 = "bf7813247f26877d9fba4ba4b66eb80bfddfc2086a5cd8d635b2da0ccde56604"; + sha256 = "0136wp6hrnmj6pbdhp3a131dzz8bp1pbd92bpagpv1r6gwj16y5z"; libraryHaskellDepends = [ base HUnit mtl mtlparse ]; homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/"; description = "regular expression like Perl/Ruby in Haskell"; @@ -149809,7 +160185,7 @@ self: { mkDerivation { pname = "regexpr-symbolic"; version = "0.5"; - sha256 = "b9693a9b9370f2cc9640cff6cfbb279b2c768bc8ccd4138ce758b15acbdafcb2"; + sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr"; libraryHaskellDepends = [ base ]; homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html"; description = "Regular expressions via symbolic manipulation"; @@ -149822,7 +160198,7 @@ self: { mkDerivation { pname = "regexqq"; version = "0.6"; - sha256 = "c301524b51049c1812c4cb2f04b3a7dbf816f64d513868c259c6ed844f247083"; + sha256 = "10vh4i7q9vf6b716hf2i9pv1dy6vlyrh8bybqh91i704a55m40f3"; libraryHaskellDepends = [ base bytestring pcre-light template-haskell ]; @@ -149838,7 +160214,7 @@ self: { mkDerivation { pname = "regional-pointers"; version = "0.7"; - sha256 = "6263cf47375da65cd9d5a0da1d94ed020d8728170698645360de201d8999e1ec"; + sha256 = "1v71k64is86yc19n96062wl8f382xna1vnm0spcmr9jx6x3wyqv2"; libraryHaskellDepends = [ base base-unicode-symbols regions transformers ]; @@ -149855,7 +160231,7 @@ self: { mkDerivation { pname = "regions"; version = "0.11"; - sha256 = "f728079430f63e8b1e830b1b4d3bce91c0ad177276aea7d4060df0f837899cd0"; + sha256 = "1l4wi4vziw0d0vaagbknf8bsvh4irqxls6qbhcg8ngpn62a0fa7p"; libraryHaskellDepends = [ base base-unicode-symbols monad-control transformers ]; @@ -149872,7 +160248,7 @@ self: { mkDerivation { pname = "regions-monadsfd"; version = "0.3.1.3"; - sha256 = "090e4f73b45b4a8ddedc62b5ae74e62c4933fee226d18ceffd4b2417f88bbe8f"; + sha256 = "13xyigw1f92bzppqrl96wbz36j9cwrsaxdb2vkg8sjjvnirly3h9"; libraryHaskellDepends = [ base-unicode-symbols monads-fd regions transformers ]; @@ -149888,7 +160264,7 @@ self: { mkDerivation { pname = "regions-monadstf"; version = "0.3.1.7"; - sha256 = "abbb51dccb93666250c18fa1f567711d194015814751c369c8689229eec88e64"; + sha256 = "0r4fr3p2k4k8r1lw6la7h4al068xf5kzb8cgq5864rlkrgf53fxb"; libraryHaskellDepends = [ base-unicode-symbols monads-tf regions transformers ]; @@ -149903,7 +160279,7 @@ self: { mkDerivation { pname = "regions-mtl"; version = "0.3.1.7"; - sha256 = "80b918c8770d470abd91b6ed5073ee28af248155ec1769737dbcce3005c91ae8"; + sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0"; libraryHaskellDepends = [ base-unicode-symbols mtl regions ]; homepage = "https://github.com/basvandijk/regions-mtl/"; description = "mtl instances for the RegionT monad transformer"; @@ -149916,7 +160292,7 @@ self: { mkDerivation { pname = "register-machine-typelevel"; version = "0.1.0.0"; - sha256 = "5232f3539da39675ac7bf0de7848748ee9503558cf7afe017449573db1be5b7f"; + sha256 = "0zsvpsqksms9fh0zwyngb0sm1scffi47ipphgfn7b5m3km9z6cjj"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kcsongor/register-machine-type"; description = "A computationally universal register machine implementation at the type-level"; @@ -149929,7 +160305,7 @@ self: { mkDerivation { pname = "regress"; version = "0.1.1"; - sha256 = "d2def3d9276b75dbf685780af1af5e373b1bd2df937eb0bcba15f8c21fb16401"; + sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj"; libraryHaskellDepends = [ ad base vector ]; homepage = "https://github.com/alpmestan/regress"; description = "Linear and logistic regression through automatic differentiation"; @@ -149942,9 +160318,9 @@ self: { mkDerivation { pname = "regular"; version = "0.3.4.4"; - sha256 = "85f22409b4a5413a7180286caada7375deca4d16010f4681fe343175841c5684"; + sha256 = "112n3j27ac9lzs0lc3q12r6wmpkmfgdalv18h1qklhd5nh4j9wl5"; revision = "1"; - editedCabalFile = "3ce38f1af2edc138b690a138e776637e5fd1ede9ee5151a31c4be77a73133943"; + editedCabalFile = "0hrr2drpmrsb3jim2lgfx7nx2pvycdvfff51j2v3ihgdy8d8zqrw"; libraryHaskellDepends = [ base template-haskell ]; description = "Generic programming library for regular datatypes"; license = stdenv.lib.licenses.bsd3; @@ -149956,7 +160332,7 @@ self: { mkDerivation { pname = "regular-extras"; version = "0.2.3"; - sha256 = "7d1352e17c067a996e8cd4fa39bfdb5b63eabb5c5686ee8cdb973306f45d3a74"; + sha256 = "0x1sbps0ccwpvf6fx1jnbjxylqsvvfzkkynliip9jyh6gkhm44vx"; libraryHaskellDepends = [ base binary deepseq QuickCheck regular ]; description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put"; license = stdenv.lib.licenses.bsd3; @@ -149970,7 +160346,7 @@ self: { mkDerivation { pname = "regular-web"; version = "0.1.1"; - sha256 = "5ffbbd0e989356f396de07dd87342bbe0b078fb051ab15bf3ef724423cd59438"; + sha256 = "0f4lsly4497p7szibasin27hf2xy5cs8gp87vsbg6mlkk07bvysz"; libraryHaskellDepends = [ applicative-extras base fclabels formlets json mtl regular xhtml ]; @@ -149985,7 +160361,7 @@ self: { mkDerivation { pname = "regular-xmlpickler"; version = "0.2"; - sha256 = "2e452aa77ea9bb38ca13637ca00c6789ed72d549398a3ab412f9da1675275de2"; + sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f"; libraryHaskellDepends = [ base hxt regular text ]; homepage = "http://github.com/silkapp/regular-xmlpickler"; description = "Generic generation of HXT XmlPickler instances using Regular"; @@ -149998,7 +160374,7 @@ self: { mkDerivation { pname = "reheat"; version = "0.1.5"; - sha256 = "bb2df10a2ae773b08e95bcc308b6144b279a668f306beae5c4e3a5d14436da54"; + sha256 = "0m6s6r2d39g3qkjylsrhixk9l9sb2jv0ihxwjn7b0wz7585g2bdv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory text vty vty-ui ]; @@ -150016,7 +160392,7 @@ self: { mkDerivation { pname = "rehoo"; version = "0.3.1"; - sha256 = "eec9480a3d23f0be2a5c30672d479bf7c2aac3260aeed52192de182470f8955f"; + sha256 = "0pwmz1q2866yj8hxbvha4v1smhppkd3jsrrhbhmbxw137l54ijgf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150034,7 +160410,7 @@ self: { mkDerivation { pname = "rei"; version = "0.4.0.3"; - sha256 = "195fc1c1a1cff8665d61d8fdd768a72949a4531a41c182e791f5e4824a5000c6"; + sha256 = "1ih0a1585r7mj7kq5ha1399s8j99lxldgzfqc5fndy6gl70w2pqr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150051,7 +160427,7 @@ self: { mkDerivation { pname = "reified-records"; version = "0.2.2"; - sha256 = "0a1cdceeeb41a4954f06a024bfccbc950c4ffaf153d38cf85670f8e85b2ce06d"; + sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://bitbucket.org/jozefg/reified-records"; description = "Reify records to Maps and back again"; @@ -150064,7 +160440,7 @@ self: { mkDerivation { pname = "reify"; version = "0.1.1"; - sha256 = "615e3c7bdea1e79268625cb60dafa89ed4103b5a26635a7ce084a178cef684ae"; + sha256 = "1bl4yv77i8c4w1y5lqr6b8xi1m4ym2phvdjwc9l95rx1vrxkqpk1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc ]; @@ -150082,7 +160458,7 @@ self: { mkDerivation { pname = "reinterpret-cast"; version = "0.1.0"; - sha256 = "5654622c904b42c62f2473c64624715dbd458ea00209ed9ab39396eabc1353e4"; + sha256 = "1r2k2fyfm5lknfdfs282l274bgaxf4j4dikk4hpwchjbj0n64m2n"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base data-binary-ieee754 hspec loop ]; benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ]; @@ -150097,7 +160473,7 @@ self: { mkDerivation { pname = "relacion"; version = "0.1"; - sha256 = "e6a4697650f8ea8053930c1cecbdfe5b8e41456e573075b243f86824538c03cb"; + sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976"; libraryHaskellDepends = [ array base containers ]; homepage = "not available"; description = "A relation data structure"; @@ -150111,8 +160487,8 @@ self: { }: mkDerivation { pname = "relapse"; - version = "0.1.0.1"; - sha256 = "4e6e2bb0c4c420f184c9cc928659e3bbbbce0215f2681e7641a9a6f2eb31e631"; + version = "1.0.0.0"; + sha256 = "06dam4albrjf3jppnvw77lldhwf2kkm65aw1dyyng3niwgsqmik5"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ aeson base base16-bytestring bytestring containers include-file @@ -150129,7 +160505,7 @@ self: { mkDerivation { pname = "relation"; version = "0.2.1"; - sha256 = "8cf483f92d7cbd3ade0e3bf3cbd6265bc4d17d10e1bdd6d2e3abdf3b36a2060e"; + sha256 = "03h6l8v3ppxbwg9ddgg121yx3i2v4vbcpwrv1vg3mgbw5pwq7x4c"; libraryHaskellDepends = [ array base containers groom ]; homepage = "https://www.github.com/d-day/relation/"; description = "A data structure representing Relations on Sets"; @@ -150145,7 +160521,7 @@ self: { mkDerivation { pname = "relational-postgresql8"; version = "0.2.0.0"; - sha256 = "3fff0abc19ae8e6edb2c51430fc77326f57835d329355ccb253f8001e6e237a2"; + sha256 = "18ipwbk0301z4p5mqd99scspix96fg3hyhsi5kdnx3mf36y0mzrz"; libraryHaskellDepends = [ base containers HDBC names-th persistable-record relational-query relational-query-HDBC template-haskell time transformers @@ -150163,8 +160539,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.8.3.5"; - sha256 = "473145c2bf23b03711a307b4dd6a22609606327e0c15f8f27f874ee783f7f1a6"; + version = "0.8.4.0"; + sha256 = "0bvh4g7k3k0fkgbk99l5prcvxbcsj3v518lg5gpzd6aifvzzyq3q"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text th-reify-compat time @@ -150178,6 +160554,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 + , transformers + }: + mkDerivation { + pname = "relational-query"; + 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 + time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, relational-query @@ -150186,8 +160586,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.0.2"; - sha256 = "af8a34fe854114401663b908612e2ad5404cb17e93550b3533b437e92f4f05ed"; + version = "0.6.0.3"; + sha256 = "1z7lpkns3bllm8sjwhv7105np1gq5bfrv52gwkpm39kbiakh0h6s"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record relational-query relational-schemas @@ -150198,14 +160598,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 + , transformers + }: + mkDerivation { + pname = "relational-query-HDBC"; + version = "0.6.2.1"; + sha256 = "1slx0zh9487q77spajwibnxpc5xwcdqg6i98gzxfd1k3jfh2ylw2"; + libraryHaskellDepends = [ + base containers convertible dlist HDBC HDBC-session names-th + persistable-record relational-query relational-schemas + template-haskell th-data-compat transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "HDBC instance of relational-query and typed query interface for HDBC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record" = callPackage ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query , relational-query-HDBC }: mkDerivation { pname = "relational-record"; - version = "0.1.6.1"; - sha256 = "c18bb200618b86a0baec590408ac941fb6a2a1d158ba74d6f9f4239a8d4bdada"; + version = "0.1.7.1"; + sha256 = "0b3srpwid2v8c43i6dzs91ir0wvnm5ic5kr11inhav4hvh90gyhq"; libraryHaskellDepends = [ base persistable-types-HDBC-pg relational-query relational-query-HDBC @@ -150215,6 +160636,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-record_0_1_8_0" = callPackage + ({ mkDerivation, base, persistable-record + , persistable-types-HDBC-pg, relational-query + , relational-query-HDBC + }: + mkDerivation { + pname = "relational-record"; + version = "0.1.8.0"; + sha256 = "0yzzlzvcl9d2krjvampargmmm5zvqq4i4fs3a16amb6kf8x5k60f"; + libraryHaskellDepends = [ + base persistable-record persistable-types-HDBC-pg relational-query + relational-query-HDBC + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Meta package of Relational Record"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 , persistable-record, relational-query, relational-query-HDBC @@ -150222,8 +160662,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.3.1.1"; - sha256 = "56d726b946e454390b4efbda9e7effe11343c88aeb6390f9516b51445e96a242"; + version = "0.3.2.1"; + sha256 = "1y0bxg2sgrq72wpa1llymhn3kbks7krnsh0qzqd1cqni01g6q8hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150233,6 +160673,7 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -150242,7 +160683,9 @@ self: { mkDerivation { pname = "relational-schemas"; version = "0.1.3.1"; - sha256 = "d13137773f21b73add30ef9659dc5abc0f5b51ab33c2061c9e9983e4d47151bd"; + sha256 = "1gaif7af90wrkqf0dhikmd8mn3xwbbf5k5pg63fkmdr17xvkfcfi"; + revision = "2"; + editedCabalFile = "0m53lnymdd6w6zrlv3nlf7fn0ki7z164mph0r80fyl5abb0bns8g"; libraryHaskellDepends = [ base bytestring containers persistable-record relational-query template-haskell time @@ -150252,13 +160695,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-schemas_0_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, relational-query + , template-haskell, time + }: + mkDerivation { + pname = "relational-schemas"; + version = "0.1.4.0"; + sha256 = "1z0v175gx6yxmfjl55dyhsmpmyvrgwzynjy9yhi348kvij7iyivq"; + libraryHaskellDepends = [ + base bytestring containers relational-query template-haskell time + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "RDBMSs' schema templates for relational-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relative-date" = callPackage ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time }: mkDerivation { pname = "relative-date"; version = "0.0.1"; - sha256 = "c63847c963d3ad7395963bb0d28452161ea2fd88f350c6c1b9bf54ea4e985914"; + sha256 = "052rk17flm5zp70wcl7ki3ys47hnaa2d5c1vjsap7bfkcg4lff66"; libraryHaskellDepends = [ base concatenative datetime mtl parsec time ]; @@ -150272,7 +160732,7 @@ self: { mkDerivation { pname = "relit"; version = "0.1.3"; - sha256 = "8fa58c7b159e65198598002c468fa0e106b61dd91cf4708bb9325ee781ca960d"; + sha256 = "03cnra0yfpijp65p1x0wv4fvc1p1l27lcb00k22ijrcy2mxqr9cg"; libraryHaskellDepends = [ base regex-base template-haskell ]; description = "Literal for regular expression"; license = stdenv.lib.licenses.bsd3; @@ -150289,9 +160749,9 @@ self: { mkDerivation { pname = "reload"; version = "0.0.0.1"; - sha256 = "4515ad09d61062a04aa34f610bbc4d6176c5468081ca30ea971a3fec36160f50"; + sha256 = "0l0g2qvfqgqsjzm31jl1h13caxk19ny0nqagld5a0qhhsq4ss5a5"; revision = "1"; - editedCabalFile = "45a0c196afbd549ce9e298bdae1c74475ff6f94848e91add5690d3db6ebaa281"; + editedCabalFile = "10d2p9pdplwhavfimsa893wzcps7fhfaxgcqwblrqm5xmybc3825"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150321,7 +160781,7 @@ self: { mkDerivation { pname = "remark"; version = "0.0.0.0"; - sha256 = "889e58c559ede3b9402cff8b32428f7968d408f2138daaff64d5e5bf6b684511"; + sha256 = "04a5d1mvzrfmckzsm38ky84d8s3rix1352zz5i0bkqzdb72mi7l8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GenericPretty ]; @@ -150342,7 +160802,7 @@ self: { mkDerivation { pname = "remarks"; version = "0.1.13"; - sha256 = "60d0765189daca9eb70e8c4c1598924ac9a72682d2962d56b781660de0d0ed74"; + sha256 = "0x7ds3h0srl1nxb2v5njh8kagjaajac1ak4c1svrxjnsi58pdl30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers GenericPretty pretty ]; @@ -150363,7 +160823,7 @@ self: { mkDerivation { pname = "rematch"; version = "0.2.0.0"; - sha256 = "f996de29c0e7a47484a16113129166f7df12567d3ca3ea24c5c97e98a8225c51"; + sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; description = "A simple api for matchers"; @@ -150375,7 +160835,7 @@ self: { mkDerivation { pname = "rematch-text"; version = "0.1.0.2"; - sha256 = "cd711fddabd475d43e9f1eb95367f35c3a08eef4c98c69b0e2c00c24c2711261"; + sha256 = "0q8jf7128360waq6k369ykp0hfjwydkm7f8ykwzd8xflmgfiywfd"; libraryHaskellDepends = [ base rematch text ]; testHaskellDepends = [ base hspec HUnit rematch text ]; description = "`rematch` matchers for Data.Text"; @@ -150390,7 +160850,7 @@ self: { mkDerivation { pname = "remote"; version = "0.1.1"; - sha256 = "c03d049494e69fe3ff1067dfeb2cb5ba3f1fd08ae4ef517024f706c12efc5c91"; + sha256 = "14awzhpc21pp4iq53vz4ib81ygxsnlnfppv723zy77z6jja08gf0"; libraryHaskellDepends = [ base binary bytestring containers directory filepath mtl network pureMD5 stm syb template-haskell time utf8-string @@ -150405,7 +160865,7 @@ self: { mkDerivation { pname = "remote-debugger"; version = "0.2.2"; - sha256 = "64a6b81314fa40fee38cb2db34263caa1655bd59186e2cf099709804d280ddb0"; + sha256 = "1c6xh390963hk7q2qvhqb6yma5ma7hk39nxjikizwh7s2h9vi9k4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150427,7 +160887,7 @@ self: { mkDerivation { pname = "remote-json"; version = "0.2"; - sha256 = "626c1a9dc5287f538d47eba6d727a2c0f4d99ec9d07e0d1679c307b028025a8a"; + sha256 = "12js08lb01y3g4b0sznhr6gdkx60l8kxg9pb8y6m6zr8qnfilv32"; libraryHaskellDepends = [ aeson base exceptions fail natural-transformation remote-monad text transformers unordered-containers vector @@ -150449,9 +160909,9 @@ self: { mkDerivation { pname = "remote-json-client"; version = "0.2"; - sha256 = "7d8fe9df424dae251b602073d618506f22a4f8e6bde5e0a39cdb6fdb7d065953"; + sha256 = "0lsr0ryxnvyvkjiy1rdxwvwa88kga0cdcwr0c0djbbjd8bgyk3vx"; revision = "1"; - editedCabalFile = "dcaba53dfe4c923ab531dbcd8ea45bb89bbe57a06f23b431477c505a7101085f"; + editedCabalFile = "0pq805qmll3w8wqv88vgl1bvx6xqbfj8xkfv66skm4jczqysbayw"; libraryHaskellDepends = [ aeson base lens natural-transformation remote-json wreq ]; @@ -150468,7 +160928,7 @@ self: { mkDerivation { pname = "remote-json-server"; version = "0.2.0.1"; - sha256 = "69d73e270668433a9526948bf24ca7cc3e2076d8e323310c830c1326232c2553"; + sha256 = "0lr55hijc4qchc6328z3v1v20gnclx6g52wl4saklhv80qkkxmv9"; libraryHaskellDepends = [ aeson base data-default-class natural-transformation remote-json scotty text transformers warp @@ -150486,9 +160946,9 @@ self: { mkDerivation { pname = "remote-monad"; version = "0.2"; - sha256 = "94c8fcb1c9c4088931cc960c39070778e571f195ad7ce45a12341e6f314a3f63"; + sha256 = "0qrz98qny7il29df8z5djpqp3rbq0w3kj34nrhqqj264r6qzrj4l"; revision = "1"; - editedCabalFile = "a2439b1ff68620c1004e36420104d96bb8942395190607f98372f2afec20b31f"; + editedCabalFile = "07xk43nazwkjhgwhf1hrjlir9f3bv4202hin9q0c2846yqgrnhx2"; libraryHaskellDepends = [ base natural-transformation transformers ]; @@ -150513,7 +160973,7 @@ self: { mkDerivation { pname = "remotion"; version = "0.2.0"; - sha256 = "ca9e7df0f06d9ea224a614b756f3ad3687abe9df059a187d1a519908402cfd54"; + sha256 = "0m7x5i00i6ai39yii6h5vzlsp1rnmprmddqllqja57kdy3q7v7na"; libraryHaskellDepends = [ async base bytestring concurrent-extra containers directory errors filelock hashable hashtables lifted-async loch-th monad-control mtl @@ -150540,7 +161000,7 @@ self: { mkDerivation { pname = "renderable"; version = "0.2.0.1"; - sha256 = "d1ea5a8d2da8913700c326c3e757c8c4c8a87f1353125bbc9ea372729e04b6c5"; + sha256 = "1idn0jg74wm3ksy5n4jk2dzsij64r1byghr6qc03g4d85n6mmsni"; libraryHaskellDepends = [ base containers hashable transformers ]; homepage = "https://github.com/schell/renderable"; description = "An API for managing renderable resources"; @@ -150552,7 +161012,7 @@ self: { mkDerivation { pname = "reord"; version = "0.0.0.2"; - sha256 = "fe64082e698e22c3a23a552d6f60d047672a614bcbb2f765f3c5140ca4b39d1e"; + sha256 = "07lxnfj0q565ydjzgcnb9dhjlrs7s1h6ybam7aic68lfd4p0hr7y"; libraryHaskellDepends = [ base ]; description = "Ad-hoc Ord instances"; license = stdenv.lib.licenses.publicDomain; @@ -150565,7 +161025,7 @@ self: { mkDerivation { pname = "reorderable"; version = "0.3.1"; - sha256 = "ce28e43d726090c64205849a37a627629bd7c479a52fd0bd6e72946255f601c5"; + sha256 = "1i81yran553jdsyx0bx5g72dg6v24yk3g6l40m1cd430f8yy8a6f"; libraryHaskellDepends = [ base constraints haskell-src-exts haskell-src-meta template-haskell ]; @@ -150581,7 +161041,9 @@ self: { mkDerivation { pname = "repa"; version = "3.4.1.2"; - sha256 = "57f80bbbf6df1c7bca0045a9de8694a25bebe0e5696f59276cc72f165b01dc57"; + sha256 = "0myw05dicby7dhkmjvv9wphfnnx2jj3dxaa50357n76zysxhpy2p"; + revision = "1"; + editedCabalFile = "0pagab03fw7xp1vvgrc87g6g6zdr60plqhjjxk3fwwm1gs0jj61k"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -150595,7 +161057,7 @@ self: { mkDerivation { pname = "repa-algorithms"; version = "3.4.1.1"; - sha256 = "c4d07910ba2da080e9c5c434047655d7c1330dbfa27dff11a38b2c6e54847e28"; + sha256 = "0a3yhia6wb4blc8zyzd2pw6k7hfpamv08d64qplq181dp887kl64"; libraryHaskellDepends = [ base repa vector ]; homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; @@ -150610,7 +161072,7 @@ self: { mkDerivation { pname = "repa-array"; version = "4.2.3.1"; - sha256 = "41ea24efa527b149448f6eee63765e8dff03672c074ba32817c4b3f65286738d"; + sha256 = "13bkhr9gdcy42wla6jq75ikh7zwdbrv67vkfix24kc97lppj9sj1"; libraryHaskellDepends = [ base bytestring double-conversion filelock mtl primitive repa-convert repa-eval repa-scalar repa-stream text vector @@ -150626,7 +161088,7 @@ self: { mkDerivation { pname = "repa-bytestring"; version = "3.0.0.1"; - sha256 = "eb017a9fa85900e6a6f254e5e7ef9e31585791458344ffb2554be19846ddf3e0"; + sha256 = "1q7kvm39iqabanrgyi438n8mfn1ikvpygralyakfc02rm2gpl0gb"; libraryHaskellDepends = [ base repa ]; doHaddock = false; homepage = "http://repa.ouroborus.net"; @@ -150642,7 +161104,7 @@ self: { mkDerivation { pname = "repa-convert"; version = "4.2.3.1"; - sha256 = "88c4a3fccc76303c5d09d200ea50763b493a64044825eb2dee739f4115f965a5"; + sha256 = "19b5z4al37vkxqnyn9a80ij3lj9vfr8fl06j15fkqc3nrkya7i48"; libraryHaskellDepends = [ base bytestring double-conversion primitive repa-scalar text vector ]; @@ -150657,7 +161119,7 @@ self: { mkDerivation { pname = "repa-devil"; version = "0.3.2.6"; - sha256 = "fec3ce06f7370378427c629587dc30ee0f37e8c777c94c8970cb514c1e57fd38"; + sha256 = "0f7xawg4qlfbf24lrjbpqzl3f3zf63f8g5b2gi17h0rpyw3cxhzy"; libraryHaskellDepends = [ base repa transformers ]; librarySystemDepends = [ libdevil ]; homepage = "https://github.com/RaphaelJ/repa-devil"; @@ -150671,7 +161133,7 @@ self: { mkDerivation { pname = "repa-eval"; version = "4.2.3.1"; - sha256 = "5625b91e666876122e09c8c4f4097110edc75b0f490c1657fc05cd908d51b48d"; + sha256 = "13dla66r1k85zibic3291xdwgv8hf44z9i6814p14xk8cqgbj9an"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://repa.ouroborus.net"; description = "Low-level parallel operators on bulk random-accessble arrays"; @@ -150685,7 +161147,7 @@ self: { mkDerivation { pname = "repa-examples"; version = "3.4.1.1"; - sha256 = "698002b9a46e60900abd76296ee0c9403243c4f50e66633e39e9e42080294f9a"; + sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150706,7 +161168,7 @@ self: { mkDerivation { pname = "repa-fftw"; version = "3.2.3.2"; - sha256 = "400c693b9771eac5a6757d0297302ab1db7ff4aa4163919bb30411a7bd840578"; + sha256 = "0y05hjysf484nfdr2qs1mbs7znxi58q9f0kxfnkcbskijwxnj320"; libraryHaskellDepends = [ base carray fft repa storable-complex ]; testHaskellDepends = [ base repa tasty tasty-hunit tasty-quickcheck @@ -150727,7 +161189,7 @@ self: { mkDerivation { pname = "repa-flow"; version = "4.2.3.1"; - sha256 = "ce0bf10db84881a1b4a6de5c155e5565eafcbd0ea6b1cf4c6bc1f8b9a9992151"; + sha256 = "0l91k6lvky61dd6czcd61syzrsk5amg1ap6ylssa30a8p06z22yf"; libraryHaskellDepends = [ base bytestring containers directory filepath hashtables primitive repa-array repa-convert repa-eval repa-scalar repa-stream text @@ -150746,7 +161208,7 @@ self: { mkDerivation { pname = "repa-io"; version = "3.4.1.1"; - sha256 = "b5dbca96a988fb8bd918288ea1cfcf215fe46062e45001b209603b63a39ba9da"; + sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -150760,7 +161222,7 @@ self: { mkDerivation { pname = "repa-linear-algebra"; version = "0.3.0.1"; - sha256 = "560e1b429ab07e712d28954c6443a6fd8d07d922ccd3041ac28fb996c2f499a2"; + sha256 = "18lryk19dfcgq8d09lyc4bchg3gxlr1n8k4m50np2zmhk911n3jn"; libraryHaskellDepends = [ base hmatrix repa vector ]; homepage = "https://github.com/marcinmrotek/repa-linear-algebra"; description = "HMatrix operations for Repa"; @@ -150775,7 +161237,7 @@ self: { mkDerivation { pname = "repa-plugin"; version = "1.0.0.1"; - sha256 = "c9237d4c3e0bb0b8aaed14e22b77b9baf751822053f12c96461f6b336926c468"; + sha256 = "0s644rlk6sqz8sb2rwak42153xxsp5vjpqhlxnmbic0b7r67s8y9"; libraryHaskellDepends = [ base containers ddc-base ddc-core ddc-core-flow ddc-core-simpl ghc mtl @@ -150792,7 +161254,7 @@ self: { mkDerivation { pname = "repa-scalar"; version = "4.2.3.1"; - sha256 = "cc2d668daac28e16e082cf72a5341653fc3aaf50c10a2f18555afb0d072a93f7"; + sha256 = "1xwk583hvyssalc2y2n1a2pkmz2k2qsaawnghbh1d3n2ma6ncbfc"; libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; @@ -150807,7 +161269,7 @@ self: { mkDerivation { pname = "repa-series"; version = "1.0.0.1"; - sha256 = "b35cda295c1aeea79a0472a4c64a24bc02f81c5bdca3c371a41b6c461af98dce"; + sha256 = "1kldz4d4cv0vliqw78ywbcfgh0mw4i5cd93j0jdagvhsbhlxlp5k"; libraryHaskellDepends = [ base ghc ghc-prim vector ]; description = "Series Expressionss API"; license = stdenv.lib.licenses.bsd3; @@ -150821,7 +161283,7 @@ self: { mkDerivation { pname = "repa-sndfile"; version = "3.2.3.3"; - sha256 = "68bee7a0b5fb4afefc77235987b2bff74b8e60c0d0b46aa3ba8a057d226cf95d"; + sha256 = "0pgrdhi7s1capainmd6hq1h8wjzppyr8fn93fzygwjpvnnhfggk8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hsndfile repa ]; @@ -150838,7 +161300,7 @@ self: { mkDerivation { pname = "repa-stream"; version = "4.2.3.1"; - sha256 = "894e9247bdaee2be3d98fd077b766c38fd58718109989faf6a815f54abb3ba75"; + sha256 = "0xdsnfmm8pw1daprz609h5qmiz9qdiv7n1zxk0yvxqmfpm3r4kl9"; libraryHaskellDepends = [ base mtl primitive repa-scalar vector ]; homepage = "http://repa.ouroborus.net"; description = "Stream functions not present in the vector library"; @@ -150853,7 +161315,7 @@ self: { mkDerivation { pname = "repa-v4l2"; version = "0.2.0.0"; - sha256 = "dff6246e586d21e3f3771694aac32d2eecf0efebbf8c33ab4e8b2de9eebd1ab5"; + sha256 = "1d8spppfjbcb9smk735zxgpz1v1f5p1sm50nfzry68bdb1p29xnz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150872,7 +161334,7 @@ self: { mkDerivation { pname = "repl"; version = "1.1"; - sha256 = "09daa598761e3ebef3ae952ef41ff0d8439917f7d561ee90f50fd994cd992f61"; + sha256 = "0q9gk76r9n8gyn8fwqfmywbrjhyqy0gz8blmmvrvwghyfscabnh9"; libraryHaskellDepends = [ base ghc ghc-paths haskell-src-exts parsec ]; @@ -150890,7 +161352,7 @@ self: { mkDerivation { pname = "repl-toolkit"; version = "1.1.0.0"; - sha256 = "f6cf40598841d6aefda7104ab331c114d67acb35292162a2cc591a7558b0edb7"; + sha256 = "1dzdn1c7a6jrrji648996p5pmmhlq4qv6jhhlzysxmj1i1cl1kzn"; libraryHaskellDepends = [ aeson base bytestring data-default directory exceptions filepath functor-monadic ListLike listsafe monad-loops mtl parsec @@ -150911,7 +161373,7 @@ self: { mkDerivation { pname = "replicant"; version = "0.1.0.0"; - sha256 = "6d694916312054b6525b0fc01c8fe449420fc3d8c8b327bacd77d2fcc0770644"; + sha256 = "0i06fz0grlkprnx2gcy8v31hyhj9wj7irh0gbd9bcm1064b4jsbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150934,7 +161396,7 @@ self: { mkDerivation { pname = "repline"; version = "0.1.6.0"; - sha256 = "61f800cecd9f2d1545164384c827dc4d1e49ce870be8c4547b41f3ebc0902a5b"; + sha256 = "0nraj30fpws1gdac9s0bhz74j7jdvhkwi1232r2iabczrp701y31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers haskeline mtl process ]; @@ -150953,7 +161415,7 @@ self: { mkDerivation { pname = "repo-based-blog"; version = "0.0.1"; - sha256 = "9a59baffe50f4989de6ecf55ad4ac2329bbf9976c8fda8c381ccdc797107aa29"; + sha256 = "0ada0xqpkp6ch71sizf8fscvz6rjq95asmfgdvg8jj8gwpzvlncs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150980,7 +161442,7 @@ self: { mkDerivation { pname = "repr"; version = "0.4.1.3"; - sha256 = "452aec30671cc2e66786f3f75d44370ebb0c915da6ae8122cb3231e903a23ff8"; + sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5"; libraryHaskellDepends = [ base base-unicode-symbols dstring random string-combinators ]; @@ -150995,7 +161457,7 @@ self: { mkDerivation { pname = "repr-tree-syb"; version = "0.1.1"; - sha256 = "12de6e621f8e3452eceb82194e4f19b95de306c38c1651bafe9d4bf88a59eefa"; + sha256 = "1ypfb65ghjwxzsx525lcqc3f6pdr357lw6c2xgn54d4f3xi6xphj"; libraryHaskellDepends = [ base containers syb text ]; homepage = "https://github.com/nikita-volkov/repr-tree-syb"; description = "Tree representation and pretty-printing of data structures based on SYB"; @@ -151010,7 +161472,7 @@ self: { mkDerivation { pname = "representable-functors"; version = "3.2.0.2"; - sha256 = "8206be657d1e44332d88d1f41cccad2561f1df21c6bc7bc9be7c760c5385d994"; + sha256 = "156rhm9hqxkwpv4ppg6647gz2q95mp61rx6ii0nk6i0ygmjvw1l2"; libraryHaskellDepends = [ array base comonad comonad-transformers comonads-fd containers contravariant distributive free keys mtl semigroupoids semigroups @@ -151027,7 +161489,7 @@ self: { mkDerivation { pname = "representable-profunctors"; version = "3.2"; - sha256 = "8c2794676df74874d1a9a77cfc41cdd3ef052858bcab78e8cb13801e3b499e2e"; + sha256 = "0bly94xix00krgl7iaxwb0l0bvykrm0zqz57m78p8j7pdmkr89wc"; libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "http://github.com/ekmett/representable-profunctors/"; @@ -151043,7 +161505,7 @@ self: { mkDerivation { pname = "representable-tries"; version = "3.0.2"; - sha256 = "55d0a8e42b475f7ee4449ea87849f95bfa62ae8495c0bbbc6f1627d709a8121f"; + sha256 = "07qjm04xf9qndyybph4mhjp65yjvz54pia4y8kj7wps75gjail2m"; libraryHaskellDepends = [ adjunctions base bifunctors comonad comonad-transformers containers distributive keys mtl representable-functors semigroupoids @@ -151055,6 +161517,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reproject" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "reproject"; + version = "0.2.0.0"; + sha256 = "1h1m5fdlhd2dxpk8bphcvbjybw40lw48b7j1bkk2grq3ljyvgmwl"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/agrafix/reproject#readme"; + description = "Define and combine \"materialized\" projections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "req" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, data-default-class @@ -151065,7 +161540,9 @@ self: { mkDerivation { pname = "req"; version = "0.2.0"; - sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc"; + sha256 = "1g7b431hq6cqmckq3hlnf56qn1a9zbpid19c7vw6vh0y5xi5ckp6"; + revision = "3"; + editedCabalFile = "1lqspa275mq04chvz6pvjkrlxkd9gscaxy2rcsj5wy0123x1azxp"; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring case-insensitive connection data-default-class http-api-data @@ -151082,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 @@ -151089,9 +161594,33 @@ self: { mkDerivation { pname = "req-conduit"; version = "0.1.0"; - sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447"; + sha256 = "0ix4bj3gqjnq0dqxqlvm0x8js48p288hprfjn2d8afavan98b6k8"; revision = "2"; - editedCabalFile = "dc6ccfa651214632bd0c4517f0c5e86d228cf93b792a6a44ef7330c85041a67b"; + editedCabalFile = "0yx6858chc3kxx26lakr7gwqq8kdx32z05s51jyk4ii1a6kcyv6w"; + 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; + }) {}; + + "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 ]; @@ -151115,7 +161644,7 @@ self: { mkDerivation { pname = "reqcatcher"; version = "0.1.0.0"; - sha256 = "75d70008df0589e4455b5932d09cfb098dd9aee0006dab8516d0483562d59151"; + sha256 = "0lcismi3aj6h2s2snv80w2pdk389zffd0cjrbd2y9285vw401mvm"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -151131,7 +161660,7 @@ self: { mkDerivation { pname = "request-monad"; version = "0.3.0.1"; - sha256 = "9a27d1628f96ba9d0fcdd0bff3cfc9ae0c7abcee7b59d2ce0ca1fda152d50cab"; + sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws"; libraryHaskellDepends = [ base free mtl transformers ]; homepage = "http://github.com/nahiluhmot/request-monad"; description = "A transformer for generic requests"; @@ -151144,7 +161673,7 @@ self: { mkDerivation { pname = "rerebase"; version = "1.0.3"; - sha256 = "63532e72cd0febdff280930658ad345e28f38c736a5391d5a313015e9942ffbe"; + sha256 = "1gpz8acmw08klgar2lvaff6g6a2y6jnmh1lkh3rdzsqgrmr2wlv3"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -151160,7 +161689,7 @@ self: { mkDerivation { pname = "reroute"; version = "0.4.1.0"; - sha256 = "34a83f0d0240610b3e6867f02859d77a8255783e2225389bf025865d5d4c2508"; + sha256 = "02159ifmv1i5y2dkh9927rw5b0kssxcjiw37d0z0nqa0086kza1l"; libraryHaskellDepends = [ base deepseq hashable http-api-data hvect mtl text unordered-containers @@ -151185,7 +161714,7 @@ self: { mkDerivation { pname = "reserve"; version = "0.1.1"; - sha256 = "42c2d26079369b4458e430b2db5a71773c98220c43a80212ce9ee63ef8b35794"; + sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151200,12 +161729,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "resin" = callPackage + ({ mkDerivation, base, ghc-prim, semigroupoids }: + mkDerivation { + pname = "resin"; + version = "0.1.0.2"; + sha256 = "1vhki81r2a4pbpl94zx45wr7hw950ibs6asim27pzh1nyakw9pbg"; + libraryHaskellDepends = [ base ghc-prim semigroupoids ]; + homepage = "http://github.com/cartazio/resin"; + description = "High performance variable binders"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "resistor-cube" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { pname = "resistor-cube"; version = "0.0.0.3"; - sha256 = "09f41cea22f4b0bbf2f32c80d8eab274a520d9fe611d1b83df4d14d46afb34ad"; + sha256 = "1b9lzdmd852dvy1in7b1zvcj19blnbmdi01cygrbpc7l4bm1rx09"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151225,7 +161766,7 @@ self: { mkDerivation { pname = "resolve"; version = "0.1.0.0"; - sha256 = "4c011446e1cd2865abbcb3d4979f6bbd65d5bd4f54d11819b5a5777cb4b6aa39"; + sha256 = "0fdanss7qxx5nlciilal9yyxardxdfgrgm5kpjmnaa6dw53180ac"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bv bytestring hashable hashmap hslogger iproute network parsec stm stm-containers transformers @@ -151242,7 +161783,7 @@ self: { mkDerivation { pname = "resolve-trivial-conflicts"; version = "0.3.2.4"; - sha256 = "62c38ac7859b1f2201e0e79dbfc5d3446b4fb2fd4164cef8c016093f79ae2221"; + sha256 = "0892mrwky28nq3wcwr21znr4yss4sg2vz7g7w00j47wvhp3qmhv2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151262,7 +161803,7 @@ self: { mkDerivation { pname = "resource-effect"; version = "0.1.1"; - sha256 = "cb76a7d08645f40870db5454ca9384a27362c60df64dd2a9bb67e67884a2b120"; + sha256 = "085ila27irk7pflx4kgn1p364wx2hj9wlm2lvdq0ix25hv8afxnb"; libraryHaskellDepends = [ base containers extensible-effects ]; testHaskellDepends = [ base containers extensible-effects HUnit mtl QuickCheck @@ -151279,7 +161820,7 @@ self: { mkDerivation { pname = "resource-embed"; version = "0.1.0.0"; - sha256 = "db090bf91535d9023872fce13eac7b54dbe3e506811569a6f8458b93f3f863c4"; + sha256 = "1i33z3rr72s5z2k6j5c10vjy7nslgfn3xqgwf8w05n9m2pwhn2fv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring directory ]; @@ -151296,7 +161837,7 @@ self: { mkDerivation { pname = "resource-pool"; version = "0.2.3.2"; - sha256 = "8627eea2bea8824af2723646e74e2af0c73f583dd0c496c9fd242cd9d242bc12"; + sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6"; libraryHaskellDepends = [ base hashable monad-control stm time transformers transformers-base vector @@ -151313,7 +161854,7 @@ self: { mkDerivation { pname = "resource-pool-catchio"; version = "0.2.1.0"; - sha256 = "5c5795e7a057aa1dc51c54fd24aafa7720e814616e3a36a3b8c306602d34393d"; + sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw"; libraryHaskellDepends = [ base hashable MonadCatchIO-transformers stm time transformers transformers-base vector @@ -151331,7 +161872,7 @@ self: { mkDerivation { pname = "resource-pool-monad"; version = "0.1.0.0"; - sha256 = "55b1c20a38a948defe55f39db23fc4e65f0ce452a69f2a566319ef3c896f647f"; + sha256 = "0zv4dy4krvqrcdb2m7x6abj0qpz6qhzv57gkapzdwj59705c5cam"; libraryHaskellDepends = [ base free kan-extensions monad-control resource-pool transformers ]; @@ -151347,7 +161888,7 @@ self: { mkDerivation { pname = "resource-simple"; version = "0.2"; - sha256 = "d132fda6954bc2c3e1ae474f4beeb4224cd0d01ebfe295aab42a39802d6cd254"; + sha256 = "0m6jdhnq0f9anjm9bqmz3v8d0k12nkp4nks7mvhw7hjbjnkgscni"; libraryHaskellDepends = [ base containers monad-control monad-fork mtl-evil-instances transformers transformers-base @@ -151365,7 +161906,7 @@ self: { mkDerivation { pname = "resourcet"; version = "1.1.9"; - sha256 = "5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5"; + sha256 = "1x9f2qz57agl3xljp1wi0ab51p13czrpf6qjp3506rl9dg99j6as"; libraryHaskellDepends = [ base containers exceptions lifted-base mmorph monad-control mtl transformers transformers-base transformers-compat @@ -151387,7 +161928,7 @@ self: { mkDerivation { pname = "respond"; version = "1.1.0"; - sha256 = "79d4f4181880486e0932f0d9de86edbdda877eadba3bd0aa7357e76ca6535d48"; + sha256 = "0j2xafk6rrspffmd0fxsmmz8gnmxxn3dxngh684nwj4030cg9m3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151416,7 +161957,7 @@ self: { mkDerivation { pname = "rest-client"; version = "0.5.1.1"; - sha256 = "5da423c9f2c87b9b9797ea331c5f248408e5f863d460dfd94b3408249729f663"; + sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -151438,9 +161979,9 @@ self: { mkDerivation { pname = "rest-core"; version = "0.39"; - sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404"; - revision = "4"; - editedCabalFile = "261e22e228e0d1f042f24a0a9e784a7ed3ea44342006cb79cb7e4021f0e46b9a"; + sha256 = "012l03am5hqhykn4apg5yhjaz4zv8mwqpq6x97crraf1gxad0q6p"; + revision = "7"; + editedCabalFile = "0fg93xwv8m86dp074kvihk3x2lywpmb4wsxrgd0g74vf00sb0y6n"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -151465,7 +162006,7 @@ self: { mkDerivation { pname = "rest-example"; version = "0.2.0.4"; - sha256 = "22cd99443ad2aa06616d5b47731c83c4650f2601eaedc0d799693752ca1e2832"; + sha256 = "0ci83v554dv9k7bw1vga04k0yrf4hcf76isvdmhhdanj7929kk92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151491,9 +162032,9 @@ self: { mkDerivation { pname = "rest-gen"; version = "0.20.0.0"; - sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "5"; - editedCabalFile = "f215b849b6a581cb87b835c7feeee8de835d6cd5039eb7c15272c4b9fdc9456a"; + sha256 = "0hnmd37c6n61gkqi3assspkmh15q93id7yaq30vp65zr6rhliac1"; + revision = "8"; + editedCabalFile = "1x18sva575kcg9gg4brf17zbvvkzs0qi2rgkab5ijr4pnmhpwc62"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -151515,9 +162056,9 @@ self: { mkDerivation { pname = "rest-happstack"; version = "0.3.1.1"; - sha256 = "794f06eb2c96b995397e21f4578bd7094a20334f43883e97af81dbe60b394ff6"; + sha256 = "1xjg745ydnw1mybkx2239wrj0jh9sy5mgx11gqwrbfcn5kmhckvr"; revision = "1"; - editedCabalFile = "a8e6fd0f4e8090876b1770ceb55397d9a33f1d7706d52a9781e577fd913f4eac"; + editedCabalFile = "1b2f7y8zsxz5h6bjmm86fwfkz8yrjx9vbkkh2xmqg4409q7zvrm8"; libraryHaskellDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -151533,9 +162074,9 @@ self: { mkDerivation { pname = "rest-snap"; version = "0.2.0.1"; - sha256 = "24ff57b82808aac05a04d8b1e4ac24e5a2a71655991d95415d8a713533c402d5"; + sha256 = "1m82qhrkawcabm0ra7cralbag8p54jnf9cfq0idc1ah852w5gzr4"; revision = "1"; - editedCabalFile = "fc05db1f47c6eb12429938204f60d3078751997afa8cdc20e82c50ee13a16978"; + editedCabalFile = "0y39l49ywl1cx0hdr37sgacm31q7sdh4y81qk5115sy68wgxn1gw"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive rest-core safe snap-core unordered-containers uri-encode utf8-string @@ -151551,9 +162092,9 @@ self: { mkDerivation { pname = "rest-stringmap"; version = "0.2.0.6"; - sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a"; - revision = "5"; - editedCabalFile = "40fd386dc256a7a2b53e188b69b202f6623a5baa93c04ac2fe5c5389adb250f1"; + sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6"; + revision = "6"; + editedCabalFile = "12ynmj96mhqdp060zydyj3jma6zwv7jphg0x2ljk5402prlxagr1"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -151570,9 +162111,9 @@ self: { mkDerivation { pname = "rest-types"; version = "1.14.1.1"; - sha256 = "b7e08e65bbae20bd891f0905c9c785184182172094673ab13e66499e4fe3969a"; - revision = "2"; - editedCabalFile = "6f8ff48a58cd55fc871ee536eccd895b0f29a18fd52429791bff578ff8497a20"; + sha256 = "16lnwd7rwjb67sqklrwl40bq4h8qhp3wj1893y4vs85fpdjqxq5p"; + revision = "3"; + editedCabalFile = "0psp44114ca8cmcg0gbn64j4q6vkiyagrvgc957j80mfcy93xz92"; libraryHaskellDepends = [ aeson base base-compat case-insensitive generic-aeson generic-xmlpickler hxt json-schema rest-stringmap text uuid @@ -151589,7 +162130,7 @@ self: { mkDerivation { pname = "rest-wai"; version = "0.2.0.1"; - sha256 = "38205eb7b85a4e052f11db099dd65e9d952b8533d1a35001f0b1958b443c0d02"; + sha256 = "00hd7i28p5diy00m18yi6f2jp5cxbvb9s2fv24phakjsp2vmw81q"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -151607,7 +162148,7 @@ self: { mkDerivation { pname = "restful-snap"; version = "0.2"; - sha256 = "ec9955ecc7551d6263be3974bef1695bdc03092ad08381e18e4109cad35cf899"; + sha256 = "16gqbk9wl2a1ivhq30yh584h7p2vd7qvwx1rprin47amqzn5b6gc"; libraryHaskellDepends = [ base blaze-builder bytestring containers data-default digestive-functors errors heist lens mtl old-locale readable snap @@ -151626,7 +162167,7 @@ self: { mkDerivation { pname = "restricted-workers"; version = "0.1.1"; - sha256 = "34bd9f45d29e692c0800133d7d2890d05547bbcb689155e101fc698b2ebeb153"; + sha256 = "0lxipqp8nsgw07hmb4b8rfxlfmfhj0l7sg8k0042qscys92rzg9l"; libraryHaskellDepends = [ async base bytestring cereal data-default directory either filepath monad-control mtl network selinux stm text transformers @@ -151643,7 +162184,7 @@ self: { mkDerivation { pname = "restyle"; version = "0.1.0"; - sha256 = "fd74359fbd4fdf9c4351e495b67ff8ef84fd735f72656b3ffe26c1e2c86bf343"; + sha256 = "0hzkdg4f5h96zqznnrbjbxrzv17gz1zvd5g4a51rrpsgpngkax7x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -151658,7 +162199,7 @@ self: { mkDerivation { pname = "result"; version = "0.2.6.0"; - sha256 = "f526d97cdab851f24e215e346f6d54d3a504a6ac5d9264f580c4f72d606178c5"; + sha256 = "1ibqc5h2vxy4h3sn94jxmjk099fkainnyd2y457g4ldqv9ydj9pm"; libraryHaskellDepends = [ base bifunctors keys mtl transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/srijs/haskell-result"; @@ -151671,7 +162212,7 @@ self: { mkDerivation { pname = "resumable-exceptions"; version = "0.0.0.20100920"; - sha256 = "fa8d9776668e5356055ec8327efff7197243c211960cd24fd1b32fd690939f1a"; + sha256 = "06lzjf8dcbxks57x434n27146whryzzpwcn8bq2mclwfcrv9g3gs"; libraryHaskellDepends = [ base mtl ]; description = "A monad transformer for resumable exceptions"; license = "unknown"; @@ -151686,8 +162227,8 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "2.2.0.8"; - sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f"; + version = "2.2.0.10"; + sha256 = "0lkq2cbc5hbbcbxb9kd0pmmy28k0rp66fwprmhb7jgkfqpggrcxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151702,31 +162243,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "rethinkdb_2_2_0_9" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, binary - , bytestring, containers, criterion, data-default, doctest, mtl - , network, scientific, text, time, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "rethinkdb"; - version = "2.2.0.9"; - sha256 = "8adb11ec9fd6cfd756571faf97f6727c35fa2adc6111ceab0f51ccde658bdd50"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ aeson async base criterion text ]; - homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 2.2"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , criterion, hashable, hspec, hspec-smallcheck, mtl, network @@ -151736,9 +162252,9 @@ self: { mkDerivation { pname = "rethinkdb-client-driver"; version = "0.0.23"; - sha256 = "cee5a3cb533bb49e6fd5416216a4d24641fa634524a938fc51342ab37ac20443"; + sha256 = "0hq4q9xb6aila7y3ia948mizlha6saj1cqj1smprxd1vag5s7rff"; revision = "1"; - editedCabalFile = "f4bb378321ec9f06093949cf541a82aa2e5650475a696dd1cbabdfd9dc17fbed"; + editedCabalFile = "1vgv2zfdkpxbrg8nssas8x85cbmah8d59ks9744hd7zc461kgfzl"; libraryHaskellDepends = [ aeson base binary bytestring containers hashable mtl network old-locale scientific stm template-haskell text time @@ -151764,7 +162280,7 @@ self: { mkDerivation { pname = "rethinkdb-model"; version = "0.1.0.2"; - sha256 = "58f07f3f54ab61a5c23647e0194cbfe7b4cb249316476758027bf025421a2995"; + sha256 = "15993912bw3v09c6fiqnjcjcpd77px61kq276v1aaqdbahzpzw2q"; libraryHaskellDepends = [ aeson base mtl rethinkdb text transformers unordered-containers ]; @@ -151783,7 +162299,7 @@ self: { mkDerivation { pname = "rethinkdb-wereHamster"; version = "1.8.0.5"; - sha256 = "781a086c60e61100f008ad21c0c93be7cb8b835135729505b539f91e63707d72"; + sha256 = "0wkxf1iixy9rnl2rawima61qpjz77g4w08dd13q004g6c1n0h6kq"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers data-default ghc-prim mtl network protocol-buffers protocol-buffers-descriptor text time @@ -151802,7 +162318,7 @@ self: { mkDerivation { pname = "retry"; version = "0.7.4.2"; - sha256 = "521b392570b37b17ac8aaea2586a0a16a578f56b9cd0bbf69813b35f7ed2b47c"; + sha256 = "0z5ls9z5zcqkk3vbpl4wdgspi98n19m5i8mfian1fyxkf0jkj6sj"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -151820,7 +162336,7 @@ self: { mkDerivation { pname = "retryer"; version = "0.1.0.1"; - sha256 = "f224462d9db633895f39f71e3d48ca398b40285acf86f3e5dedb794d7fa56be7"; + sha256 = "1rvblmzlsyfvvvjz71ngb8l412rrr943s7pp75gqjcxnklnlc97j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base optparse-applicative process ]; @@ -151835,9 +162351,9 @@ self: { mkDerivation { pname = "rev-state"; version = "0.1.2"; - sha256 = "ee070e39d7f7d673593e2f356ab317bc2fdd0d8a283f8316c0e5b5adbdf0f919"; + sha256 = "06gry2ysvdg5q0b86gr8i86xsbxw2yrnld9g7rcp7mppswwhw1zf"; revision = "2"; - editedCabalFile = "de8db922a675a68ac8ac03f80fabaed250fe332a20f7b3bd8272238088e3d135"; + editedCabalFile = "0dfiwf4808vjhayv7xr058rzwl6jmsmhzy03mk48m9kmlqibk3fy"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; homepage = "https://github.com/DanBurton/rev-state#readme"; @@ -151850,7 +162366,7 @@ self: { mkDerivation { pname = "revdectime"; version = "0.1.1"; - sha256 = "55ab818d99ce2dd2bac76511163771fc9453551cd84b7e96297e3746593b6e51"; + sha256 = "0lbf7dclcdvy56b7wjyq3iam757wf4vic4b5qyxd4bffk66q3asm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base old-time ]; @@ -151863,7 +162379,7 @@ self: { mkDerivation { pname = "reverse-apply"; version = "2.0.1"; - sha256 = "cb1e3382bfa3f0426c0e43420bf28fe26c3a2676e731be824ac2b792bb908147"; + sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb"; libraryHaskellDepends = [ base ]; description = "Standard version of the reverse apply operator"; license = stdenv.lib.licenses.bsd3; @@ -151874,7 +162390,7 @@ self: { mkDerivation { pname = "reverse-arguments"; version = "0.1.0.0"; - sha256 = "f1d7866c908a728d22d9f61daf97a0ee16dd0e49866e1c60f6e0e34c8af92d39"; + sha256 = "0f9dz654rqz0yrh1qvl6947ds5pfl2bsy7gnv4i8swlaj1n8dmzi"; libraryHaskellDepends = [ base ]; description = "Reverse the arguments of arbitrary functions"; license = stdenv.lib.licenses.bsd3; @@ -151887,7 +162403,7 @@ self: { mkDerivation { pname = "reverse-geocoding"; version = "0.3.0.0"; - sha256 = "d29cd172aaccd01856a7fcf05995e1418a36d813f724fa5fdec566e829bb78b0"; + sha256 = "1c3qpclyhrn5vrgzl97p2gc3d2j1w6amkw7wlxb1il6cm9rd376j"; libraryHaskellDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; @@ -151902,7 +162418,7 @@ self: { mkDerivation { pname = "reversi"; version = "0.1.1"; - sha256 = "dfd2bd2b4792941642a735e11b47361939904346f1095bdea18695721ba5adb5"; + sha256 = "1dddlldp55c6l7g5n2gi8r1r0f8r6r3ipq9mlx11d54j8wmvvlnz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base process ]; @@ -151916,7 +162432,7 @@ self: { mkDerivation { pname = "rewrite"; version = "0.10"; - sha256 = "4f72df3baeb7de125463333920a8b44e1d1f213a60dd482224db1246a3d48b81"; + sha256 = "10cbsjilc4nv4hi4ipb078hiy7afnjl20f9kcda15pmpmqxxywjg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151933,7 +162449,7 @@ self: { mkDerivation { pname = "rewriting"; version = "0.2.2"; - sha256 = "7a19e8ec948bd74f87f9326e5d248d5b1e7efef08dfa246a01a95a89b942cd3e"; + sha256 = "0gnd8awqjnm905m29yldy3z7w7jvilj5svijz63lzmwbjknfh6bs"; libraryHaskellDepends = [ base containers regular ]; description = "Generic rewriting library for regular datatypes"; license = stdenv.lib.licenses.bsd3; @@ -151947,7 +162463,7 @@ self: { mkDerivation { pname = "rex"; version = "0.5.2"; - sha256 = "6e1ef13a70339bd4111b9dbe14b3f6e356981d583b8312374bd9794c9fe09176"; + sha256 = "0xliw2glqyfr9cvi50rvb0frhmp3ysri9glx3c8x96rkf0xg27kf"; libraryHaskellDepends = [ base bytestring containers haskell-src-exts haskell-src-meta pcre-light template-haskell @@ -151964,7 +162480,7 @@ self: { mkDerivation { pname = "rezoom"; version = "0.0.4"; - sha256 = "eacb40bc6511b7c6e503d8a96b92e74ad09c2923f30071fa98b87fc88d625088"; + sha256 = "122hca6whzxqk3x7207k4clrrl2awy96pafq0gjwddqicny41jza"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151975,12 +162491,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rfc1413-server" = callPackage + ({ mkDerivation, base, network-simple, rfc1413-types }: + mkDerivation { + pname = "rfc1413-server"; + version = "0.0.0.0"; + sha256 = "065x5fgsqdi4d5sjd1gridwshag3afdbip1g8qi4jz41xdi2xm38"; + libraryHaskellDepends = [ base network-simple rfc1413-types ]; + homepage = "https://github.com/cotrone/rfc1413-server#readme"; + description = "rfc1413 server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rfc1413-types" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "rfc1413-types"; + version = "0.0.0.0"; + sha256 = "1lyf0wpjyzj43przl6k7mv1484aciizy03ch6ygbzkm0b0f70ha5"; + libraryHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/cotrone/rfc1413-types#readme"; + description = "An rfc1413 parser and response renderer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rfc3339" = callPackage ({ mkDerivation, base, timerep }: mkDerivation { pname = "rfc3339"; version = "1.0.5"; - sha256 = "60ab3db1cec904ec4909e0f4afbba900414140211f1fa76a6179465d195476dc"; + sha256 = "1p3nahcmsikrc5maf7qz45042h80m6xszx70154yq169rsqkvav0"; libraryHaskellDepends = [ base timerep ]; doHaddock = false; description = "Parse and display time according to RFC3339 (deprecated)"; @@ -151992,7 +162532,7 @@ self: { mkDerivation { pname = "rfc5051"; version = "0.1.0.3"; - sha256 = "e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b"; + sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; @@ -152007,7 +162547,7 @@ self: { mkDerivation { pname = "rhythm-game-tutorial"; version = "0.1.1"; - sha256 = "faf4c390813a7cd49cb87244a808537b6adf5fe35bee57c5970d9fd86fa8ad21"; + sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152020,29 +162560,31 @@ self: { }) {}; "riak" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder - , bytestring, containers, criterion, data-default-class, deepseq - , enclosed-exceptions, exceptions, hashable, HUnit - , mersenne-random-pure64, monad-control, mtl, network - , protocol-buffers, pureMD5, QuickCheck, random, resource-pool - , riak-protobuf, semigroups, stm, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, transformers-base - , unordered-containers, vector + ({ mkDerivation, aeson, async, attoparsec, base, binary + , blaze-builder, bytestring, containers, criterion + , data-default-class, deepseq, enclosed-exceptions, exceptions + , hashable, HUnit, mersenne-random-pure64, monad-control, mtl + , network, process, protocol-buffers, pureMD5, QuickCheck, random + , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time, transformers + , transformers-base, unordered-containers, vector, yaml }: mkDerivation { pname = "riak"; - version = "1.1.1.0"; - sha256 = "e6ec85c65c76c30a9cf0dce266e2dc62fa7047dcb0628410085a44c417f3769f"; + version = "1.1.2.0"; + sha256 = "1vin0klwg8ajbcirxr82bk5g4yg3d2v7d40dxbpkncksbzva6wjj"; libraryHaskellDepends = [ - aeson attoparsec base binary blaze-builder bytestring containers - data-default-class deepseq enclosed-exceptions exceptions hashable - mersenne-random-pure64 monad-control network protocol-buffers - pureMD5 random resource-pool riak-protobuf semigroups stm text time - transformers transformers-base unordered-containers vector + aeson async attoparsec base binary blaze-builder bytestring + containers data-default-class deepseq enclosed-exceptions + exceptions hashable mersenne-random-pure64 monad-control network + protocol-buffers pureMD5 random resource-pool riak-protobuf + semigroups stm text time transformers transformers-base + unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers data-default-class HUnit mtl QuickCheck - riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck text + aeson base bytestring containers data-default-class HUnit mtl + process QuickCheck riak-protobuf semigroups tasty tasty-hunit + tasty-quickcheck template-haskell text yaml ]; benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; homepage = "http://github.com/markhibberd/riak-haskell-client"; @@ -152058,7 +162600,7 @@ self: { mkDerivation { pname = "riak-protobuf"; version = "0.22.0.0"; - sha256 = "32b576289697bfcc1800806e5cc8b4be63df13fe95f9357f96b3f8b47b5a6919"; + sha256 = "06b9b9xv9y5kjrzkbycmzq9xyqxynk45qvl000ccrgwpjql7dd9j"; libraryHaskellDepends = [ array base parsec protocol-buffers protocol-buffers-descriptor ]; @@ -152072,12 +162614,60 @@ self: { mkDerivation { pname = "richreports"; version = "0.0.3.0"; - sha256 = "73161ff473ea9f844a1fd3a31a3e1ed08a74656d7df213ca3795c76f4d053356"; + sha256 = "0mik0m6nziwm6z517wkxdmjp92nh3qz1m8yk3x5897zafgs1y5kk"; libraryHaskellDepends = [ ascetic base MissingH ]; description = "Integrated pretty-printing and error/static analysis reporting"; license = stdenv.lib.licenses.mit; }) {}; + "ridley" = callPackage + ({ mkDerivation, async, base, bytestring, containers, ekg-core + , ekg-prometheus-adapter, http-client, inline-c, katip, microlens + , microlens-th, mtl, process, prometheus, raw-strings-qq, shelly + , string-conv, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, time, transformers, unix, vector + , wai-middleware-metrics + }: + mkDerivation { + pname = "ridley"; + version = "0.3.1.2"; + sha256 = "15hc1j0bkdb0wbivxl73rgrk4hl598d96yv0fhpsgls74alarniq"; + libraryHaskellDepends = [ + async base containers ekg-core ekg-prometheus-adapter inline-c + katip microlens microlens-th mtl process prometheus raw-strings-qq + shelly string-conv template-haskell text time transformers unix + vector wai-middleware-metrics + ]; + testHaskellDepends = [ + base bytestring containers ekg-core ekg-prometheus-adapter + http-client microlens prometheus string-conv tasty tasty-hunit + tasty-quickcheck text + ]; + 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 + ({ mkDerivation, base, ekg-prometheus-adapter, microlens, mtl + , prometheus, ridley, shelly, text, transformers + }: + mkDerivation { + pname = "ridley-extras"; + version = "0.1.0.1"; + sha256 = "01fl5mq9rp7nipxqi38k2bcdi8hiix02gf2sw8mr1xvvwdm925l2"; + libraryHaskellDepends = [ + base ekg-prometheus-adapter microlens mtl prometheus ridley shelly + text transformers + ]; + testHaskellDepends = [ base ]; + 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 ({ mkDerivation, base, bytestring, cereal, containers, data-default , directory, doctest, errors, filepath, http-client, HUnit, lens @@ -152088,7 +162678,7 @@ self: { mkDerivation { pname = "riemann"; version = "0.1.1.0"; - sha256 = "8905d4997974028b71cf57f15cd6c4939d871f90fbd5130b0c09705f3e6d10c0"; + sha256 = "1h0hdlz5yw091h5i7mgvj0gqg7ckqkb5rwaprxqqn0klg6cx81c9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152115,7 +162705,7 @@ self: { mkDerivation { pname = "riff"; version = "0.3.0.1"; - sha256 = "abc1726fbcae31061a31df4d4d569b3c4090d5bfaa22e9f5af863d1b9e5ee0a4"; + sha256 = "1970bsg1ngc6mzsyj8mapzar0h1wkdb4skfz64d0ccdfpipp5hdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152135,7 +162725,7 @@ self: { mkDerivation { pname = "ring-buffer"; version = "0.3"; - sha256 = "f7d142f4b3aedb3a18e8a63d1dcbc0be06b64fece4f73d43261cf82067b25b82"; + sha256 = "10jvn9kj1y0w4r1kvxz4xi7vc1myq35isgd6x0c3mnxfngs45lgp"; libraryHaskellDepends = [ base exceptions mtl primitive vector ]; testHaskellDepends = [ base QuickCheck vector ]; homepage = "http://github.com/bgamari/ring-buffer"; @@ -152150,7 +162740,7 @@ self: { mkDerivation { pname = "riot"; version = "1.20080618"; - sha256 = "ba02d7194335c77b0787bcf062c5c1146f219c031d6ae2d0c9834ad052e6edb5"; + sha256 = "1dgdwr9d0jl3r78f4shx0ff22vqlq72n5w5whw3ppirm8ccxf0ms"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152173,7 +162763,7 @@ self: { mkDerivation { pname = "ripple"; version = "0.3"; - sha256 = "fcfac54c6049790224960332e8bd34dd88376cbacc60c698a4e44136cc9d29f8"; + sha256 = "1y19kp63chg4ljcccq6cp9n3g26x6jyyhch3jqj04ya9c16cbypw"; libraryHaskellDepends = [ aeson attoparsec base base58address binary bytestring cereal crypto-api crypto-pubkey-types cryptohash-cryptoapi ecdsa errors @@ -152193,7 +162783,7 @@ self: { mkDerivation { pname = "ripple-federation"; version = "0.3"; - sha256 = "1ab8ea172c19f193cfa1b03884a88d766a3bf0eecfd2342d3c45f08ad1a6f554"; + sha256 = "0m7mlv8qmw257hnk9lngxvq3nskninl88f5hl77r7w8r5hbymf0s"; libraryHaskellDepends = [ aeson attoparsec base base58address blaze-builder bytestring errors http-streams http-types io-streams network-uri text unexceptionalio @@ -152210,7 +162800,7 @@ self: { mkDerivation { pname = "risc386"; version = "0.0.20130719"; - sha256 = "439c66188e994fb4a81d7f8a2d5b3cb376ee73942a7fc565187668bfc99b0e44"; + sha256 = "0i0fkg4vys3n31jwazrajirywxmk7idjv2kz3nlb8kwriqc6d723"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; @@ -152226,9 +162816,9 @@ self: { mkDerivation { pname = "riscv-isa"; version = "0.1.0.0"; - sha256 = "6a88e07161d0a3bd97cccf3e1d4a88063b09c22e843d6bd7a9af4389849f891a"; + sha256 = "06l9ky28jhxgm7bnngc45v10jfq6i151sgngrjbvv8yhc5qy123a"; revision = "1"; - editedCabalFile = "f998732d08cb67e2d7b6f80b6f9240caedc65e4297d1d90ca87758e78a247e73"; + editedCabalFile = "0wvy4j5ffn3pm06dklcp89gcdvfa8296y2zqnvby4ryb10np767r"; libraryHaskellDepends = [ base mtl QuickCheck ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/cocreature/riscv-isa#readme"; @@ -152243,7 +162833,7 @@ self: { mkDerivation { pname = "rison"; version = "1.1.0.0"; - sha256 = "39287bee4b038ce96b4a0365b68eb7472da2c8993c64aad67ecfa09302f1199b"; + sha256 = "16qry419786ggvbalr1wk74a4ba7ny7bcr8399myk3039gp7na1r"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text unordered-containers vector @@ -152262,7 +162852,7 @@ self: { mkDerivation { pname = "rivers"; version = "0.1.0"; - sha256 = "c4681bf08ce5cf90d82c332980fa0fa12a42eb64ad1834dd64d8f2ce2b01f974"; + sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64"; libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ]; homepage = "https://github.com/d-rive/rivers"; description = "Rivers are like Streams, but different"; @@ -152275,7 +162865,7 @@ self: { mkDerivation { pname = "rivet"; version = "0.1.0.0"; - sha256 = "8f0db3c306fb73fbe5666877645c7e870be2892145b05a59f28250df817d3cc2"; + sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base rivet-core rivet-simple-deploy ]; @@ -152290,7 +162880,7 @@ self: { mkDerivation { pname = "rivet-adaptor-postgresql"; version = "0.1.0.0"; - sha256 = "298d29197464faadb9fc72b69065c342c1d32b10d5c36f66df8a54f372a7fb3e"; + sha256 = "0gpvlxrg6m4avxk6zhym20mx7ha2qdjr1dkjzjwsvyk4fhcjk399"; libraryHaskellDepends = [ base postgresql-simple rivet-core text ]; homepage = "http://github.com/name/project"; description = "Rivet migration library postgresql backend"; @@ -152302,7 +162892,7 @@ self: { mkDerivation { pname = "rivet-autoimporter"; version = "0.1.0.0"; - sha256 = "77c23a683c515fae9570a316978791a359aba2da36424b5706102649b3a7f1ac"; + sha256 = "1b7ilyrlj9hh0rblnhinvaiannd3j63rf5m3f2aswpsi7il3mhkp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath ]; @@ -152316,7 +162906,7 @@ self: { mkDerivation { pname = "rivet-core"; version = "0.2.0.0"; - sha256 = "187957e5923406020cb7a46f21c1ef54a5bb0c3756a0cfc87d64eda94c5e401e"; + sha256 = "07j0br6akvb4gp4cz82n6w6bp9alxz0j2vx4nw6041iljbjmfy8q"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base ]; homepage = "http://github.com/dbp/rivet"; @@ -152329,7 +162919,7 @@ self: { mkDerivation { pname = "rivet-migration"; version = "0.1.0.1"; - sha256 = "6dd95a94855da826ff509814031dbe284aebb986e0002ea4c7b660a68bb6e6ed"; + sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd"; libraryHaskellDepends = [ base postgresql-simple text ]; homepage = "https://github.com/dbp/rivet"; description = "Postgresql migration support for project management tool"; @@ -152342,7 +162932,7 @@ self: { mkDerivation { pname = "rivet-simple-deploy"; version = "0.1.0.0"; - sha256 = "aedf553c435530265ec3409a9b15296a97c236434086bbdca187d95b51d50380"; + sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf"; libraryHaskellDepends = [ base configurator mtl rivet-core text ]; homepage = "https://github.com/dbp/rivet"; description = "Basic deployment support for project management tool"; @@ -152359,7 +162949,7 @@ self: { mkDerivation { pname = "rl-satton"; version = "0.1.2.4"; - sha256 = "24f73abc44bc75565de485e22f21397d35c93e7eb0b109b344c3c3f44f2b40f5"; + sha256 = "1xa05d7z9hy38jrhkcdhgqzcjdbx74hjzql5wifmcxdw8jy3mxr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152384,7 +162974,7 @@ self: { mkDerivation { pname = "rlglue"; version = "0.2.2.0"; - sha256 = "00c33f3df08f2a1d205fd61ee8d89c1746a81e60ceeee50476de432a3b90e218"; + sha256 = "0672j0xjlhyyfq2fbvnfc0gahihpkkcfh7nnbwh1salgy0ykzhq0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152405,7 +162995,7 @@ self: { mkDerivation { pname = "rlist"; version = "0.1.0"; - sha256 = "2a2a083a730cb1b8005c26fbb7e212f1402b2a93d96aecb0a9b686e9ded2689f"; + sha256 = "17v8sbgfk1mnm6qfqsnrjcm2nh7i2bibgyr6bh0bic8cfcx0haia"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/guaraqe/rlist#readme"; description = "Lists with cheap snocs"; @@ -152422,7 +163012,7 @@ self: { mkDerivation { pname = "rlwe-challenges"; version = "0.1.0.1"; - sha256 = "f6e944ae436badc1bb3da258e54ef097eb1bd1fc05a656b89fb973a389f9f9e3"; + sha256 = "1qzrz64s6wxrkyw5d9h5zk8ipswpy17fan527nxw3bbb8fp49sgn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152445,7 +163035,7 @@ self: { mkDerivation { pname = "rmonad"; version = "0.8.0.2"; - sha256 = "1441035fe7b22284fa900e37c7f21d406db7f0da750f8401263e38842cba55dd"; + sha256 = "1pamp8n88f1y4q0q83vmvbqbfva03prcfdqfj3x888mjwxgh6h8l"; libraryHaskellDepends = [ base containers suitable transformers ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit @@ -152464,7 +163054,7 @@ self: { mkDerivation { pname = "rncryptor"; version = "0.3.0.0"; - sha256 = "f7b14f165e0409f73d4ef257836199bcac7e4f7fca9ebfadf126f89a8c6de820"; + sha256 = "0878dn69my16y6nvz7nagx7pxb5wk5hq6mzj9qyzf284bqb4zcgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152489,7 +163079,7 @@ self: { mkDerivation { pname = "rng-utils"; version = "0.2.1"; - sha256 = "cac94b9ae624b1a4cbbfd47ff901570517f6416a9eee219065c0b5d5c036de87"; + sha256 = "11yy6v0dbdf0cn823vlyd90zc5q5aw0zjzylpz5s9c94wsd4pjfa"; libraryHaskellDepends = [ base bytestring mwc-random vector ]; description = "RNG within an MVar for convenient concurrent use"; license = stdenv.lib.licenses.bsd3; @@ -152503,7 +163093,7 @@ self: { mkDerivation { pname = "robin"; version = "0.1.0.0"; - sha256 = "35a8626b4875eca73a7128c71d43f5b4dbcfaea156cc90f0fac1077471abea91"; + sha256 = "14gamdqp81y1zbq91k2nl6pcznxlym1ivir8f4xagv3m91mn5a1m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152520,7 +163110,7 @@ self: { mkDerivation { pname = "robot"; version = "1.4"; - sha256 = "ac6ce6d71150ac5c0bbd12b3736d2aa8542b7e2642f0181b4fceb739f4244ced"; + sha256 = "1vac4ks3kdyf9wdiiw224rz2nm5859np7cqjpl5mrb2h27bycv5c"; libraryHaskellDepends = [ base containers exceptions transformers xhb ]; @@ -152537,7 +163127,7 @@ self: { mkDerivation { pname = "robots-txt"; version = "0.4.1.4"; - sha256 = "cc927bf848469fba0e594c5b9e46d822d410a29c978773924bb4b3268882b3a1"; + sha256 = "18dkha42dcxl9f9771wpkji11m12v139wnscb47bm7s693w7p4nc"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -152551,19 +163141,57 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "roc-cluster" = callPackage + ({ mkDerivation, base, hspec, HUnit, vector }: + mkDerivation { + pname = "roc-cluster"; + version = "0.1.0.0"; + sha256 = "0pwx4dz1bsqbvni9x12h4x7y7fi9kg2zw1n43a512m6lfykzsk8s"; + revision = "1"; + editedCabalFile = "0q1h70mx90dr3hcqgmp7gj9ypk235jyv71qgzzdr50is4r07j9hd"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec HUnit ]; + homepage = "https://github.com/hexresearch/roc-cluster#readme"; + description = "ROC online clustering algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "roc-cluster-demo" = callPackage + ({ mkDerivation, base, containers, gloss, optparse-applicative + , roc-cluster + }: + mkDerivation { + pname = "roc-cluster-demo"; + version = "0.1.0.0"; + sha256 = "1jg9idadx1vq0jvlwilxggyf2ak67sjbnq2c1znrlys1cvbxi7q2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers gloss optparse-applicative roc-cluster + ]; + homepage = "https://github.com/ncrashed/roc-cluster-demo#readme"; + description = "Gloss interactive demo for roc-cluster package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rocksdb-haskell" = callPackage - ({ mkDerivation, base, bytestring, data-default, filepath - , resourcet, rocksdb, transformers + ({ mkDerivation, base, binary, bytestring, data-default, filepath + , hspec, hspec-expectations, process, QuickCheck, resourcet + , rocksdb, temporary, transformers }: mkDerivation { pname = "rocksdb-haskell"; - version = "0.1.0"; - sha256 = "4dc561c5227a376f9907403a7fc99dd193baea233da8be453ea4b5df01ab28f2"; + version = "1.0.0"; + sha256 = "0raipwawmah4h9ryja65b881dcj4yadrhh4c4718fdr0n89wgnzd"; libraryHaskellDepends = [ - base bytestring data-default filepath resourcet transformers + base binary bytestring data-default filepath resourcet transformers ]; librarySystemDepends = [ rocksdb ]; - homepage = "http://github.com/agrafix/rocksdb-haskell"; + testHaskellDepends = [ + base bytestring data-default hspec hspec-expectations process + QuickCheck resourcet temporary transformers + ]; + homepage = "http://github.com/serokell/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; @@ -152576,7 +163204,7 @@ self: { mkDerivation { pname = "roguestar"; version = "0.6.0.1"; - sha256 = "662a3a0f231ae96ff5a8d47fd389931447366d5119cb9e1b296adf304294d776"; + sha256 = "0xnpji131pva54drxjqra5nkciqljf4x6zylm3snzs8s4c7klak6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152595,7 +163223,7 @@ self: { mkDerivation { pname = "roguestar-engine"; version = "0.6.0.1"; - sha256 = "7be21f7dea4a481d86376dd25e8ea0ea79419369a2d3c4c03436d7f61740c014"; + sha256 = "056080bzdmrn6k0c9lx2d69l2ygal275xlkd6y31sj2ax9yizqkv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152617,7 +163245,7 @@ self: { mkDerivation { pname = "roguestar-gl"; version = "0.6.0.1"; - sha256 = "fafbcc39e8526ca5103dd5fdab2a8cb3eb9c4de915f511574e7307af0ccb52d1"; + sha256 = "1lajrc6ay1vk9rbi3x8mx56rrsxkihmapzfm7l8aav2jx0wwryzs"; libraryHaskellDepends = [ arrows base bytestring containers filepath GLUT MonadRandom mtl OpenGL priority-sync random rsagl rsagl-frp rsagl-math stm @@ -152633,7 +163261,7 @@ self: { mkDerivation { pname = "roguestar-glut"; version = "0.6.0.1"; - sha256 = "d0af6e869ba0150541785e2e3521b0b8c403c44c2e75f91151c103b854456f8e"; + sha256 = "13kg8mabh0y1a48zjx9f9k207i5qn0hkabjyg10ha5d0kf36xbyh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT roguestar-gl rsagl ]; @@ -152650,7 +163278,7 @@ self: { mkDerivation { pname = "rollbar"; version = "0.3.1"; - sha256 = "613b71ffa7c5715a4b7c1df4c0655de958f89ac13612dfcdd82b30c0d0886943"; + sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1"; libraryHaskellDepends = [ aeson base basic-prelude http-conduit monad-control network text vector @@ -152668,7 +163296,7 @@ self: { mkDerivation { pname = "roller"; version = "0.1.7"; - sha256 = "eab7c05dd749e4953ef50ef12163ad36eba5aa131b7f9a340104de8afb40f193"; + sha256 = "14zi83xqmph404s9lzqv2fmabsrnmmij3w8fylz9br29sxfw1dza"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152688,7 +163316,7 @@ self: { mkDerivation { pname = "rolling-queue"; version = "0.1"; - sha256 = "833002bed0e6bc95814ab550326a9d981c3810b4f9611e115968d88b306d69d0"; + sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/joeyadams/haskell-rolling-queue"; description = "Bounded channel for STM that discards old entries when full"; @@ -152700,7 +163328,7 @@ self: { mkDerivation { pname = "roman-numerals"; version = "0.5.1.5"; - sha256 = "b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"; + sha256 = "10da5vls9l5i255bapms4b2r7dnwmxgsaa1cdll2lrmid5dikixr"; libraryHaskellDepends = [ base base-unicode-symbols bytestring text ]; @@ -152716,7 +163344,7 @@ self: { mkDerivation { pname = "romkan"; version = "0.1.0.0"; - sha256 = "88b59a2ba410d4c626917118e622f55ed6e7080629b919ca7ec6dfb9642a9f24"; + sha256 = "094z59jbkpy6gv51kf990q4fgmjyylifc63ij4kcdm0hlhmrmdc8"; libraryHaskellDepends = [ attoparsec base containers text ]; testHaskellDepends = [ attoparsec base containers HUnit test-framework @@ -152732,7 +163360,7 @@ self: { mkDerivation { pname = "roots"; version = "0.1.1.2"; - sha256 = "49027ac85d6b7349a3717243941e81d70db46747a51cb0e79cab8e1238f9fa77"; + sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9"; libraryHaskellDepends = [ base tagged ]; homepage = "/dev/null"; description = "Root-finding algorithms (1-dimensional)"; @@ -152744,7 +163372,7 @@ self: { mkDerivation { pname = "rope"; version = "0.6.4"; - sha256 = "0bee82a9f13264b1a2cb470b45c5354b49e146156922b066151eba5ac55ee7bc"; + sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb"; libraryHaskellDepends = [ base bytestring fingertree mtl utf8-string ]; @@ -152755,22 +163383,22 @@ self: { }) {}; "rosa" = callPackage - ({ mkDerivation, aeson, base, bytestring, lens - , optparse-applicative, process, text, unordered-containers, vector - , wreq + ({ mkDerivation, aeson, base, bytestring, directory, lens + , namecoin-update, optparse-applicative, text, unordered-containers + , vector, wreq }: mkDerivation { pname = "rosa"; - version = "0.3.1.0"; - sha256 = "b363a0669623bd0edc46bf755ecdb34dc59121c302735515fd56a808567e7e42"; + version = "0.4.0.0"; + sha256 = "0326ghscyg5rrw54610x8n6mkdr5pim3c7pspb01dg77gbzr0mrm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring lens optparse-applicative process text - unordered-containers vector wreq + aeson base bytestring directory lens namecoin-update + optparse-applicative text unordered-containers vector wreq ]; description = "Query the namecoin blockchain"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; }) {}; "rose-trees" = callPackage @@ -152781,7 +163409,7 @@ self: { mkDerivation { pname = "rose-trees"; version = "0.0.4.3"; - sha256 = "bdd180b27e959316af0825a0de7151ef7cb640fefaa1aecdcfdfab1b94d5e426"; + sha256 = "09p4sna1payzrz6sx8gszr0bcz7ga5qxx81512pid4wmgsr81ldx"; libraryHaskellDepends = [ base containers deepseq hashable mtl QuickCheck quickcheck-instances semigroupoids semigroups sets @@ -152808,13 +163436,13 @@ self: { }: mkDerivation { pname = "rose-trie"; - version = "1.0.0.2"; - sha256 = "94eb35048ea15968f66aed88e1598b4e742f129928a880ddbbd4e6a2b38ff99e"; + version = "1.0.0.5"; + sha256 = "0753nvppi86a2qij4cliv9pmy0mbdbnf5ckp4zgmwn1rlv4jhqwx"; libraryHaskellDepends = [ base containers deepseq minilens mtl transformers ]; homepage = "https://github.com/RaminHAL9001/rose-trie"; - description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures."; + description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -152824,7 +163452,7 @@ self: { mkDerivation { pname = "rosezipper"; version = "0.2"; - sha256 = "6cab4f1c192cc3b8b0a9eb11a32780d235020a539a0e91125eed5ec590bad7bc"; + sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc"; libraryHaskellDepends = [ base containers ]; description = "Generic zipper implementation for Data.Tree"; license = stdenv.lib.licenses.bsd3; @@ -152841,7 +163469,7 @@ self: { mkDerivation { pname = "roshask"; version = "0.2.1"; - sha256 = "75b8f0f9c185d6ac0c84c4418ff5f07c6ca80168708fe9d5f34f509672444a8b"; + sha256 = "12sa8ir9cl2gygayk3vhd00shv3wy3sqyhf4hh6arml5q7wz1f3m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152872,7 +163500,7 @@ self: { mkDerivation { pname = "rosmsg"; version = "0.5.2.0"; - sha256 = "94654afe0f61e20658239c1f0af129dbd356c7af6e9b914c2b90f084804826a4"; + sha256 = "191692089w4h5d6936vfmz3mdlyv57qhl7ww4dc0dqk11zz4lrcl"; libraryHaskellDepends = [ attoparsec base binary bytestring data-default-class lens-family-core pureMD5 template-haskell text @@ -152889,7 +163517,7 @@ self: { mkDerivation { pname = "rosmsg-bin"; version = "0.1.0.0"; - sha256 = "74552be16ec2c8b261b09e494fe08cc4b212c6514015b4e56b573c91f4a12524"; + sha256 = "0915l7s92g2pdgjv85a0a7315cn4ikh4yjcyn1hv5j62dvhjnmbl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152908,7 +163536,7 @@ self: { mkDerivation { pname = "rospkg"; version = "0.2.3.0"; - sha256 = "237ffd07b77f4a832e1e0a553de19ba372ca0adee80bfca099564152f39d8d8a"; + sha256 = "12ldkprm4hank6hgq2z8vq5clwm3kghksm8a3qp86jkznw3zszr3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152927,7 +163555,7 @@ self: { mkDerivation { pname = "rosso"; version = "1.0"; - sha256 = "3aee0c61728602ea62bf625b2d255735aba12256c68f2e7c9b1227bc2f9ee533"; + sha256 = "0cz5kqpvq9qjkdy2x3y6aqia3armawjjsnv2pxifl0l6f9hhrvis"; libraryHaskellDepends = [ base containers deepseq ]; description = "General purpose utility library"; license = stdenv.lib.licenses.bsd3; @@ -152939,7 +163567,7 @@ self: { mkDerivation { pname = "rot13"; version = "0.1.0.2"; - sha256 = "0d1a579df566f2a9debb9d049bbe7fe2dd9390e003dd5676b9ae8bc4dc072c35"; + sha256 = "0d9c0zfc92xfp5v5dp83w2897pg2gyz9n14xpggakwk6ynfmf6hd"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/kvanberendonck/codec-rot13"; @@ -152947,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 @@ -152954,7 +163596,7 @@ self: { mkDerivation { pname = "rotating-log"; version = "0.4.2"; - sha256 = "6ef0ae7ecb9e30387b4088edc173fbb90b8c8b7514f9f7b8b6d92f7d95f754ec"; + sha256 = "1v2lyyapsbyrnswggy8lfn5qq2xrzdrw3vc881xkhc4yrdzaxw3f"; libraryHaskellDepends = [ base bytestring directory filepath old-locale time time-locale-compat @@ -152974,7 +163616,7 @@ self: { mkDerivation { pname = "roundRobin"; version = "0.1.2.0"; - sha256 = "c7a1f44b113fb03e66415962ab240fdfb9d60c805a237084a13b29b65809ecdf"; + sha256 = "1pzc15cbca9vl62708ssh06ddffz1wjanqjr85k3xc1z255z98f7"; libraryHaskellDepends = [ base semigroups ]; testHaskellDepends = [ base QuickCheck semigroups tasty tasty-quickcheck @@ -152988,7 +163630,7 @@ self: { mkDerivation { pname = "rounding"; version = "0.3.0"; - sha256 = "de280304050edbce3efedad36ceb6dbbc94738a6ec4a0d33e30f29cb64545bb4"; + sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y"; libraryHaskellDepends = [ array base numeric-extras ]; homepage = "http://patch-tag.com/r/ekmett/rounding"; description = "Explicit floating point rounding mode wrappers"; @@ -153003,7 +163645,7 @@ self: { mkDerivation { pname = "roundtrip"; version = "0.2.0.5"; - sha256 = "caf5b343ba025da9d61190d6a9b55f1c1a02bdb5313ed9489ff969cb9c3f6581"; + sha256 = "10b57yfcnsgrkx4djgiinnyh46hwbysskmlh27bajp82p91v7xfa"; libraryHaskellDepends = [ base containers pretty safe template-haskell text xml-types ]; @@ -153020,7 +163662,7 @@ self: { mkDerivation { pname = "roundtrip-aeson"; version = "0.2.0.0"; - sha256 = "04c6b8e47c6946199d547f89eb81a272d26f6f3f07d07895221e54410f212655"; + sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4"; libraryHaskellDepends = [ aeson base bytestring containers lens lens-aeson roundtrip scientific text unordered-containers vector @@ -153039,7 +163681,7 @@ self: { mkDerivation { pname = "roundtrip-string"; version = "0.1.0.1"; - sha256 = "a721d7d219bb2aa842168e910f00934ff5f2183e6c36fa9a192e9f833c314dd1"; + sha256 = "1lad64y877rf36dgldkc7qcg5xagjc00z4cf2r1ahamv379df8d7"; libraryHaskellDepends = [ base mtl parsec roundtrip ]; description = "Bidirectional (de-)serialization"; license = stdenv.lib.licenses.bsd3; @@ -153055,7 +163697,7 @@ self: { mkDerivation { pname = "roundtrip-xml"; version = "0.3.0.5"; - sha256 = "35599e1f8ed46f1583dbcfd53caab4c3956dd7ad9c18d5705c41aaa8742286be"; + sha256 = "1gl649saiaj1biqda64wmpbnv5f3njm3rmfgvf1iavyliqgrwn9m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153073,7 +163715,7 @@ self: { mkDerivation { pname = "route-generator"; version = "0.6.1"; - sha256 = "86c1978d9e08de70989f91ef4a65e204bf48fab879c65b28a1b9dbf4eb58d92d"; + sha256 = "0bfrb3mz9nxrl4l5pikrp3x4igq4w9jlmvwikyc71ph8ks6rghc6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153092,7 +163734,7 @@ self: { mkDerivation { pname = "route-planning"; version = "0.0.3"; - sha256 = "47bec5286559d900ebad38364270bc0cb93b42c460a4e71c541677d4244c7f50"; + sha256 = "0l3z9hjd8xqnahffg930qi13pf8cpiq44diqmpmh1narcllcbgj7"; libraryHaskellDepends = [ base containers coordinate lens semigroupoids semigroups text xsd ]; @@ -153110,7 +163752,7 @@ self: { mkDerivation { pname = "rowrecord"; version = "0.1"; - sha256 = "14502b35a27edfd56187f7f97634e90681d523e3d99d61bd723803578e6f993d"; + sha256 = "0gcrdy75f0rqfayn37frwcixb086x4s7dygphxhxbpvyl8sjnl0l"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Build records from lists of strings, as from CSV files"; license = stdenv.lib.licenses.bsd3; @@ -153124,7 +163766,7 @@ self: { mkDerivation { pname = "rpc"; version = "0.0.1"; - sha256 = "49122d66324737a789876ef60a971fd414f4c3adf77904f85701bb69eb15892f"; + sha256 = "0bw92pmnkfq1azw08ygpmp1z856l3ybhmxkfhy4sfds769k2s4j9"; libraryHaskellDepends = [ base bytestring cereal containers derive network-fancy template-haskell th-lift @@ -153141,7 +163783,7 @@ self: { mkDerivation { pname = "rpc-framework"; version = "2.0.0.2"; - sha256 = "18c37ea5c90355a528d5c95f1eed7b49026401a534accaa9d4d628fd135f722b"; + sha256 = "0avjbw9zsa6nsjlwmb1lll0n80j9ggniwpy9sllaam83r6jpxhqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153161,7 +163803,7 @@ self: { mkDerivation { pname = "rpf"; version = "0.2.5"; - sha256 = "9340c77b356b1cf409ccae09214f9c339ea4ca79601cc9e0e7c16c3473918074"; + sha256 = "0x40j5rk8v61wzhcj730g75a97ikki7j22dfrh4z873b6mxwfh4k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153178,7 +163820,7 @@ self: { mkDerivation { pname = "rpm"; version = "0.0.1"; - sha256 = "9f2c95adfa873b55e56516ebb2a3c320914931d300b50ad1659d704669706af3"; + sha256 = "1wvaf1llcw4xcp8hmd80scqlk490qfiv5sqncpjmafw7zanrab4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath HaXml process ]; @@ -153196,7 +163838,7 @@ self: { mkDerivation { pname = "rsagl"; version = "0.6.0.1"; - sha256 = "a950f53b3ebcd659ac139111c65831775e9809d4b82d288d852ffcace7342e38"; + sha256 = "0f1f6kksrz1ghn6jhbdqsh4rhpkp65ccc4ci2fn5kmmw7qxzal59"; libraryHaskellDepends = [ array arrows base containers data-memocombinators deepseq mtl old-time OpenGL OpenGLRaw parallel parsec random rsagl-frp @@ -153215,7 +163857,7 @@ self: { mkDerivation { pname = "rsagl-frp"; version = "0.6.0.1"; - sha256 = "01d08b21e29bd3fa2714634e6caccf5d11df13227ad79908c13a7868a9263552"; + sha256 = "0lim4slnhy1sq449kmvs489xy4axryn6qkk32hkzmlwvw8hqpl01"; libraryHaskellDepends = [ array arrows base containers mtl old-time random rsagl-math stm ]; @@ -153232,7 +163874,7 @@ self: { mkDerivation { pname = "rsagl-math"; version = "0.6.0.1"; - sha256 = "d67e304e982d19e86dc99cffea4fbf29a55aaacbd2a0dc1e41a7cab0bea12112"; + sha256 = "04i1l6zb1jm784gdr86jrfm5m999px7ymzwwr5nyh69dk1730znn"; libraryHaskellDepends = [ array base containers deepseq OpenGL OpenGLRaw parallel parsec random Vec Vec-OpenGLRaw @@ -153248,7 +163890,7 @@ self: { mkDerivation { pname = "rspp"; version = "0.1.0.1"; - sha256 = "3e6771df48c5949c27d020d325295dbc322e0a1427db7f70bccf2552d73d5a8c"; + sha256 = "132s7pbm49fgpiq7znr72h52wcmwblljblr0s0krr56593gp2rry"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/AJChapman/rspp"; description = "A Rational Street Performer Protocol solver"; @@ -153263,7 +163905,7 @@ self: { mkDerivation { pname = "rss"; version = "3000.2.0.6"; - sha256 = "8de46fea948323030528367dfa2e5a81640d656a1c00d674377c809462fd990d"; + sha256 = "03crzmi9903w6xsdc00wd9jhsr41b8pglz9n502h68w3jkm6zr4d"; libraryHaskellDepends = [ base HaXml network network-uri old-locale time ]; @@ -153283,9 +163925,9 @@ self: { mkDerivation { pname = "rss-conduit"; version = "0.3.0.0"; - sha256 = "370a507c6df71af1bdce4c27381ebaa2c87664c5ae6e853e9f43c927e3345f5c"; + sha256 = "0p2z6kijgja3kwz8avmfqmj7dj52p8g3h9scrsyz26ppdmy502ip"; revision = "1"; - editedCabalFile = "3f56fc5d8b09d690e1d7bd4059cd31361cea9f1300b0ce909def41066376f7a5"; + editedCabalFile = "19gpfrihchggkn8cxc002fgyl71n676mjh5xszhr1mh9idfzqmiz"; libraryHaskellDepends = [ base conduit conduit-combinators containers lens-simple mono-traversable safe safe-exceptions text time timerep @@ -153301,29 +163943,29 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_3_0_1" = callPackage + "rss-conduit_0_3_1_1" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, containers, data-default, hlint, lens-simple - , mono-traversable, QuickCheck, quickcheck-instances, resourcet - , safe, safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text - , time, timerep, uri-bytestring, xml-conduit, xml-types + , containers, data-default, hlint, lens-simple, mono-traversable + , QuickCheck, quickcheck-instances, resourcet, safe + , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "rss-conduit"; - version = "0.3.0.1"; - sha256 = "d30265d4e68f7563580e6dd3a2b39c0017145d111c60def1d9667fdb6ca3aae6"; + version = "0.3.1.1"; + sha256 = "16pghxkk9pyskhp73sz43nw84w7qw62sdlwqpsrrfs2wr2ab71bd"; libraryHaskellDepends = [ base conduit conduit-combinators containers lens-simple mono-traversable safe safe-exceptions text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base bytestring conduit conduit-extra data-default hlint + base bytestring conduit conduit-combinators data-default hlint lens-simple mono-traversable QuickCheck quickcheck-instances resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; - description = "Streaming parser/renderer for the RSS 2.0 standard."; + description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -153338,7 +163980,7 @@ self: { mkDerivation { pname = "rss2irc"; version = "1.1"; - sha256 = "583826c4cb2204034d866f6bab85132b1484e70901b5244e8f76cfe020a60cde"; + sha256 = "1phclqhf1kvnix729d8117kq851b2f2snsvghr6h6112rg22cf2q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153362,8 +164004,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.1.9"; - sha256 = "f5187739a6c450ed71299c1bb2b077751c45df297d18be8af80e0c8941b6f850"; + version = "0.1.12"; + sha256 = "1pscz3a7n8a3337zh4xh44gf00hd86d4dnh059sj60gx6dac7zxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153389,7 +164031,7 @@ self: { mkDerivation { pname = "rtld"; version = "0.0.2"; - sha256 = "33baddec52dbbb148dce09e246a271e16e2dc37a85c3fbf99d84fa3d362dc5a3"; + sha256 = "18y55lv3vyl4kpwzphw5gb1jsvp1f6i4dqh9rs6i9fyvabndvfik"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kkardzis/rtld"; description = "dynamic linker tools for Haskell"; @@ -153401,15 +164043,37 @@ self: { mkDerivation { pname = "rtlsdr"; version = "0.1.0.5"; - sha256 = "2d19640003dd8dddb77591b97bba4cf32d52306d4a98a1c4a2733d1253d62321"; + sha256 = "0893sr9i4gbklb2a362adlq54bgk9jx7pfcifnvxv3fx0c06869d"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ rtl-sdr ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rtl-sdr;}; + "rtnetlink" = callPackage + ({ mkDerivation, base, bytestring, cereal, hspec, monad-loops, mtl + , pretty-hex, random, socket, transformers, unix + }: + mkDerivation { + pname = "rtnetlink"; + version = "0.1.0.4"; + sha256 = "0z07ckrjkycfsh7a4llz7sr0fp9p1890kn5nd3imgmrs1d5s0wir"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal monad-loops mtl pretty-hex random socket + transformers unix + ]; + testHaskellDepends = [ base hspec socket unix ]; + homepage = "https://gitlab.com/formaltech/rtnetlink-hs"; + description = "Manipulate network devices, addresses, and routes on Linux"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rtorrent-rpc" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual , bytestring, deepseq, haxr, mtl, network, split, utf8-string @@ -153417,7 +164081,7 @@ self: { mkDerivation { pname = "rtorrent-rpc"; version = "0.2.2.0"; - sha256 = "1a193b823e5400f23f983002b654f53588f24f9eac1166d6b354e90f32a9244c"; + sha256 = "0k14m4r0zsalngb6c4dckr7z521mymabc0ihk0zz402l7s13n68s"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring deepseq haxr mtl network split utf8-string @@ -153435,7 +164099,7 @@ self: { mkDerivation { pname = "rtorrent-state"; version = "0.1.0.1"; - sha256 = "20591e2d7de88868604657c4ebb3dd823c68d1d3e26f671b509e729c2ebd0752"; + sha256 = "0lh7plp9qwlya0dnfvz2sg8nhg42vnrypi2p8rh6i278glniwn90"; libraryHaskellDepends = [ base bencoding bytestring containers directory filepath lens utf8-string @@ -153457,7 +164121,7 @@ self: { mkDerivation { pname = "rts-loader"; version = "0.0.0.3"; - sha256 = "ffbf7fb47f2400c601937b3f68345af6ae661eb9f6c2b120daef9c72658aefe6"; + sha256 = "1rpgi9jp577gv8hb3hpnp4g6dbpnb8s6hgvvjc0wc014gys7zgzz"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -153476,9 +164140,9 @@ self: { mkDerivation { pname = "rubberband"; version = "0.1.0.2"; - sha256 = "d5b94ba1bc5422ab35556b56a2546047b08e895f592661a5363df37d94004496"; + sha256 = "15j402a7vwrx6sjn29jrby4qxc27c1aa4mkbalssn8jlpjhlpffm"; revision = "1"; - editedCabalFile = "871bac89de5e55a2a475ebe6c5f68323419ad2e41fca0f7d2a617fa32c3d656d"; + editedCabalFile = "0vb57lna6zv159yhzjhzwk99lh93hgvcbrpbfnja4mayvs4sq6w7"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ rubberband ]; libraryPkgconfigDepends = [ rubberband ]; @@ -153487,6 +164151,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -153495,8 +164160,8 @@ self: { }: mkDerivation { pname = "ruby-marshal"; - version = "0.1.1"; - sha256 = "d61ceb301b82e439b064eb4b1b84b1bb21c4ac9dc0239a0dc8d361cfe1b1800e"; + version = "0.1.2"; + sha256 = "13s017sqim92yz9r3x8zc4by1hksncikavsn12kf42vv58k95g1p"; libraryHaskellDepends = [ base bytestring cereal containers mtl string-conv vector ]; @@ -153516,7 +164181,7 @@ self: { mkDerivation { pname = "ruby-qq"; version = "0.1.0.0"; - sha256 = "812936b7da627a703e4cc4595ce037be839f5f45ef3eef454317ec1867184ab4"; + sha256 = "1d2a31kiiv0p8d2yygpg8mgrz0xy6zh5qnf49hz70yk2vavkcac1"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta pcre-light process template-haskell trifecta @@ -153532,7 +164197,7 @@ self: { mkDerivation { pname = "ruff"; version = "0.4.0.1"; - sha256 = "e557e74593e1ab0fc35447f4f8d5cddc2af7c151655cc2c5ae1672fcddcda3c5"; + sha256 = "1id3rpfzqwhnmv2w4p35a70zfanwrpazix27ak1hzaz1jd2yfmz5"; libraryHaskellDepends = [ array base mtl parsec safe strict Vec ]; homepage = "http://code.mathr.co.uk/ruff"; description = "relatively useful fractal functions"; @@ -153548,7 +164213,7 @@ self: { mkDerivation { pname = "ruin"; version = "0.1.0.1"; - sha256 = "d3b7ac795311de47acc72cad716b27fbe82b083dfd8528c508a0c455f155541d"; + sha256 = "07alapqmbi50132ji1gx7l42ps7v4xmp3b9cqyn4gphiadwsrdyk"; libraryHaskellDepends = [ base binary cereal deepseq ghc-prim parsec template-haskell unordered-containers @@ -153569,7 +164234,7 @@ self: { mkDerivation { pname = "ruler"; version = "0.4.0.2"; - sha256 = "65234a5562d97306b25a06455926ecb7f0a8606d04dbec921ee6ee37a0508ccd"; + sha256 = "1kcca2h3gvp63s9frnq4dmhaiw5pxhk5ji86bar0cwyrc9all8v5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153588,7 +164253,7 @@ self: { mkDerivation { pname = "ruler-core"; version = "1.0"; - sha256 = "ede5dd93b8e2b8768ef853aa20bb68efb38e412b8838fa6b653bc1e9da2d8519"; + sha256 = "06c55pdfkh9vcmmzlf485d0qxczgd2xj1ajkz277df72p29xvrgd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153605,7 +164270,7 @@ self: { mkDerivation { pname = "rungekutta"; version = "1.0.2"; - sha256 = "d711d8efe0ef31bdd6d7413b6d2ad1797e7eb2758ad9a59db806bcb93b68b91d"; + sha256 = "07drd0xvkg06p2fsbncafnr7wzkrs4m6sfs1szbbscggw3pxh4fp"; libraryHaskellDepends = [ base ]; description = "A collection of explicit Runge-Kutta methods of various orders"; license = stdenv.lib.licenses.bsd3; @@ -153619,7 +164284,7 @@ self: { mkDerivation { pname = "runghc"; version = "0.1.0.3"; - sha256 = "c09ab4627b7261ed0f27a0bc385c022221baf378972da3efa0c5351d5b47c0ee"; + sha256 = "1vn08xdisdf5l3ps6bcpg3rvl89209f3ig504w7ysqbjgdib96n0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153637,7 +164302,7 @@ self: { mkDerivation { pname = "runmany"; version = "0.1.2"; - sha256 = "378255e7a54189a204e53197e472076093b34e4c55dae5463e6df0577b15c7b0"; + sha256 = "1c672mxmgw3d7r3fbnjm9i7b74v00xrf95riwl2a52a1lpkmb0ip"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153653,7 +164318,7 @@ self: { mkDerivation { pname = "runmemo"; version = "1.0.0.1"; - sha256 = "ba5ef3177f8fe5f443808e44f62d03b23ac19bbef7f708e40532031a3505d689"; + sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms"; testHaskellDepends = [ base data-memocombinators time ]; homepage = "https://github.com/DanBurton/runmemo"; description = "A simple memoization helper library"; @@ -153665,7 +164330,7 @@ self: { mkDerivation { pname = "runtime-arbitrary"; version = "0.1.0.6"; - sha256 = "012e31cb21f0a057aa8a08c71834d0a5fff52c9742064fea956cd54d4e6069d1"; + sha256 = "1lb9c174vmbcjpm4y1j2jwngbzx5s0s1iiq8iam5g87h475k2bh1"; libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ]; homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html"; description = "Runtime generation of Arbitrary values"; @@ -153680,7 +164345,7 @@ self: { mkDerivation { pname = "rvar"; version = "0.2.0.3"; - sha256 = "d78aaf2ffdba182dda95d1692fec7abc5d77fa371120618a397b5675438c6bc0"; + sha256 = "1h3bii1pamkv7656280i6zx7fpdwgbn2ysfijpd2s65szlpsz2np"; libraryHaskellDepends = [ base MonadPrompt mtl random-source transformers ]; @@ -153694,7 +164359,7 @@ self: { mkDerivation { pname = "rwlock"; version = "0.0.0.3"; - sha256 = "6ad5e97c42698e92051b701cde5cd09005877c9b3e04ea19dc0762e595185d47"; + sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba"; libraryHaskellDepends = [ base monad-loops-stm stm syb ]; homepage = "https://github.com/mokus0/rwlock"; description = "Multiple-read / single-write locks"; @@ -153708,7 +164373,7 @@ self: { mkDerivation { pname = "rws"; version = "0.1.1.2"; - sha256 = "c6088d196eac3ccef2742d6f28ab7cf649664031acc9696a111dc1766d5d8dc6"; + sha256 = "1ildbmnpdh8x25m6kjdc6506cjgngjmjhvrdfkrcwg5cdqcqs266"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring parsec ]; @@ -153726,8 +164391,10 @@ self: { ({ mkDerivation, base, containers, parsec, QuickCheck, text }: mkDerivation { pname = "s-cargot"; - version = "0.1.1.1"; - sha256 = "5ac3d9e1a58763943249b3d7ac174ff3f17dec7a7508f984b8c1efc2a1c51c60"; + version = "0.1.2.0"; + sha256 = "068ysjnparlrwrppqxi91yxqpskz8nqzyypp3qnad04fyz3l36mm"; + revision = "2"; + editedCabalFile = "0ighpd2cnci0afxv9v873ccsd7gpkc1z1qdciqcqzzgy7n8504ik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec text ]; @@ -153738,6 +164405,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "s-expression" = callPackage + ({ mkDerivation, base, derive-monoid, lens, semigroups }: + mkDerivation { + pname = "s-expression"; + version = "0.0.0"; + sha256 = "03spihdqi0844pbcx99p4ygr621fjfnlph3c52zhhilij9w32p6c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base derive-monoid lens semigroups ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/sboosali/s-expression#readme"; + description = "simple general-purpose s-expressions"; + license = stdenv.lib.licenses.mit; + }) {}; + "s3-signer" = callPackage ({ mkDerivation, base, base64-bytestring, cryptohash, http-types , time, utf8-string @@ -153745,7 +164427,7 @@ self: { mkDerivation { pname = "s3-signer"; version = "0.3.0.0"; - sha256 = "89e957f81211a417c425214d3d7eafb0f15f695ffe0002f4198f2e34b43bc494"; + sha256 = "15647fs38blg37s0407ybxlmzwdhmxz3sk914p21g90i2bw5gsc9"; libraryHaskellDepends = [ base base64-bytestring cryptohash http-types time utf8-string ]; @@ -153758,8 +164440,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; - version = "0.3.14"; - sha256 = "db580cc748f6421e54a9a86a4cbf75c39cfc696880e31f972f99731737fdc88f"; + version = "0.3.15"; + sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/ndmitchell/safe#readme"; @@ -153771,8 +164453,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "safe-access"; - version = "0.3.1.0"; - sha256 = "936ddafc0664e4b62f11ebb6b2c3169f06c67e107a0d8f05e27896940eb4bf9f"; + version = "0.3.2.0"; + sha256 = "0v0bmxi3y9h7nriyna35crqxngda1cfliiqbrs6iy0frc2s5lv1l"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; @@ -153786,8 +164468,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.4.0"; - sha256 = "c52078c8457f8233a3796f84a3ae3f336f4668a013ba935e74c7218eeb9a41a6"; + version = "0.1.6.0"; + sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -153802,7 +164484,9 @@ self: { mkDerivation { pname = "safe-exceptions-checked"; version = "0.1.0"; - sha256 = "d807552b828de308d80805f65ee41f3e25571506b10e6b28b0b81de4aec0ca3f"; + sha256 = "0gyaq2pf87dqn0l6n3mi0qamf99y3zj5xxh513c0iqwdh8mma1yq"; + revision = "2"; + editedCabalFile = "18fwk5yr8zm4y215vbsl149jkn9pxyv3m8mgq3979pvs1c4kqivz"; libraryHaskellDepends = [ base deepseq safe-exceptions transformers ]; @@ -153817,7 +164501,7 @@ self: { mkDerivation { pname = "safe-failure"; version = "0.5.0.2"; - sha256 = "87ab46ddc3340c994855aa0305962983181aaac18f2abf81ffc935d7b2924e80"; + sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7"; libraryHaskellDepends = [ base failure ]; homepage = "http://www-users.cs.york.ac.uk/~ndm/safe/"; description = "Library for safe functions (deprecated)"; @@ -153829,7 +164513,7 @@ self: { mkDerivation { pname = "safe-failure-cme"; version = "0.1.0"; - sha256 = "f38d527ceb747208102feb998955622483280759ac7c275ce37ef7e40c7ee05a"; + sha256 = "0np0gq6f9xvywdf2fz5cb43ji0r4c9aqk6gb5w80hwklxdy553gk"; libraryHaskellDepends = [ base control-monad-exception safe-failure ]; @@ -153842,7 +164526,7 @@ self: { mkDerivation { pname = "safe-freeze"; version = "0.2.1"; - sha256 = "636cc1fb3825830f986689a0cca43520f3454cb7de54b2920542d10ca67ab88a"; + sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33"; libraryHaskellDepends = [ base indexed mtl vector ]; homepage = "https://github.com/reinerp/safe-freeze"; description = "Support for safely freezing multiple arrays in the ST monad"; @@ -153855,7 +164539,7 @@ self: { mkDerivation { pname = "safe-globals"; version = "0.1.1"; - sha256 = "6573ce84639aba76819eaf225acc1599dcfff5722374f9ca1ebc5d878487c32a"; + sha256 = "0an3hy28fpdw3v5gjx13fbszzp4r2p65l8mgks0pdflscf2cwwv5"; libraryHaskellDepends = [ base stm template-haskell ]; description = "Safe top-level mutable variables which scope like ordinary values"; license = stdenv.lib.licenses.bsd3; @@ -153868,7 +164552,7 @@ self: { mkDerivation { pname = "safe-lazy-io"; version = "0.1"; - sha256 = "8ca0637127bd69b0de43d3d95cc1aebc0aa55054321de97124e96b1250241cc3"; + sha256 = "1hqw4i814sz94iqyj79jai8aa2mwmv0mrnfk8ggb0sdx4xqn784c"; libraryHaskellDepends = [ base extensible-exceptions parallel strict-io ]; @@ -153884,7 +164568,7 @@ self: { mkDerivation { pname = "safe-length"; version = "0.1.0.0"; - sha256 = "241155e4a2b91731872729ed90641a6d34fcee82d5fc4d1ff7a5247e6ec18979"; + sha256 = "0yc9q5p7w955ywglvz6mhbpgqd3d39j91v994y3k25xrlbj5a494"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-core QuickCheck should-not-typecheck @@ -153903,7 +164587,7 @@ self: { mkDerivation { pname = "safe-money"; version = "0.2"; - sha256 = "c328e6c36589ad133c8172ce82e64103ad1efd475b311b65a1e7e708dd651636"; + sha256 = "0dhncpfhirz7l5jincav8zyixb8387k85kkjh4y17bc9cp1yca63"; libraryHaskellDepends = [ aeson base binary cereal constraints deepseq hashable store ]; @@ -153924,7 +164608,7 @@ self: { mkDerivation { pname = "safe-plugins"; version = "0.1"; - sha256 = "c574be8cbfb49ba965d31546e35339d2894010e315c5f52f4a8094172338bedb"; + sha256 = "1nxy70iig54098pzbi8mwc8412fj759y6ihmsdjsk6xlpy6bwx65"; libraryHaskellDepends = [ base directory filepath haskell-src-exts plugins Unixutils ]; @@ -153940,7 +164624,7 @@ self: { mkDerivation { pname = "safe-printf"; version = "0.1.0.0"; - sha256 = "e6a5b44ff6798abfa8b1626af847cfa61ff3a676b46331823692f6830d18dca6"; + sha256 = "19nw306q7xlj6s132qxlfskg67x6rx3zhsk2n6lbz2kryr7v99g6"; libraryHaskellDepends = [ base haskell-src-meta template-haskell th-lift ]; @@ -153961,8 +164645,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.9.2"; - sha256 = "ba666b242653d6b23fc9bc19dfa9d4367148aeb9235baf3738b91150ac9b6ed3"; + version = "0.9.3.2"; + sha256 = "0dvbwjrgy6vzhp4mqxpk0kbzv1im2bjp6qq9aq8ggcbdis6m1x85"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -153977,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 @@ -153985,8 +164686,8 @@ self: { }: mkDerivation { pname = "safecopy-store"; - version = "0.9.2"; - sha256 = "17e37e713a1dc86a50a16589ebc7e087e9896bdfe40918350b6f546a4992007b"; + version = "0.9.4"; + sha256 = "1i0hr3j0ibz87v72jl648df0xry53qzfdk64hizrypnqc66hldd4"; libraryHaskellDepends = [ array base bytestring containers old-time store store-core template-haskell text time vector @@ -154009,7 +164710,7 @@ self: { mkDerivation { pname = "safeint"; version = "0.6"; - sha256 = "d4d9851547c1e0951730e5d4cf9897c2666f27048ef80be0bb9dc94ac72f2794"; + sha256 = "15175z3lmjcxpgh0py4f0hknyrn2jycczm7560brbq618waqbnfl"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -154020,12 +164721,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "safeio" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , directory, filepath, HUnit, resourcet, test-framework + , test-framework-hunit, test-framework-th, unix + }: + mkDerivation { + pname = "safeio"; + version = "0.0.2.0"; + sha256 = "0ajz4hd3dycy10abngccqdbkj1356d2sggsnrlc34s370381hi9w"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + resourcet unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + HUnit resourcet test-framework test-framework-hunit + test-framework-th unix + ]; + description = "Write output to disk atomically"; + license = stdenv.lib.licenses.mit; + }) {}; + "safepath" = callPackage ({ mkDerivation, base, doctest, text, validity }: mkDerivation { pname = "safepath"; version = "0.1.0.0"; - sha256 = "72652946831f67add13a8d16a0597d49292495628b9929e756345d2f8206e8f2"; + sha256 = "1wp80s12yp9lavkjk6cbcaaj8aa9gmcs05ld7b8ssrqzhd32jrbj"; libraryHaskellDepends = [ base text validity ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/githubuser/safepath#readme"; @@ -154040,7 +164763,7 @@ self: { mkDerivation { pname = "safer-file-handles"; version = "0.11"; - sha256 = "69986b30dc3d4ff3d4f44dbfaa2ff2b705c948c32e3945b77c66c89fdb081ccb"; + sha256 = "1jqw13drzj36gjvlaf9fqd4cj1dpy8psmgsdykag6krxvhq6p639"; libraryHaskellDepends = [ base base-unicode-symbols explicit-iomodes pathtype regional-pointers regions transformers @@ -154058,7 +164781,7 @@ self: { mkDerivation { pname = "safer-file-handles-bytestring"; version = "0.3.0.1"; - sha256 = "6989e047b296d7bc09377e3df76fb1000d59f01edcfc6d4ae177255c619970b9"; + sha256 = "1fbhk5hmq9bpw556vz6w3vq5j380n5pzfgby6w4vrmwnn93y12b9"; libraryHaskellDepends = [ base bytestring explicit-iomodes-bytestring regions safer-file-handles transformers @@ -154076,7 +164799,7 @@ self: { mkDerivation { pname = "safer-file-handles-text"; version = "0.2.0.2"; - sha256 = "d52ab6109305393899dc2c3e89196685808c79e3f59175a09e59da965e9ca093"; + sha256 = "14x0kig9dnjrksh7b4gmwdwqr045cqcqjgicvjckhf85jc8bcanm"; libraryHaskellDepends = [ explicit-iomodes-text regions safer-file-handles text transformers ]; @@ -154091,7 +164814,7 @@ self: { mkDerivation { pname = "saferoute"; version = "0.2.0.0"; - sha256 = "d02c3b48cefb6cc5088d5dd06b0209617f00200c378c53077bf0a94b88afd303"; + sha256 = "00ykmy44paghgc3m731p1hh00zv11416pl2xil4cav7vrr43nb6h"; libraryHaskellDepends = [ base blaze-html containers text ]; description = "A simple type-safe routing library"; license = stdenv.lib.licenses.bsd3; @@ -154104,7 +164827,7 @@ self: { mkDerivation { pname = "sai-shape-syb"; version = "0.3.4"; - sha256 = "4385f485ffc78688b5dd6a41b239afa96b94f1e904e6e9bb85656f75dcc5e71d"; + sha256 = "07g7qpf7avv5hnxykrh4x7qr8sx9mwwv4hbavnsqi1n7zy2z91a3"; libraryHaskellDepends = [ base containers ghc ghc-syb-utils syb ]; testHaskellDepends = [ base containers ghc ghc-syb-utils HUnit syb @@ -154117,20 +164840,21 @@ self: { "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors - , QuickCheck, test-framework, test-framework-quickcheck2, vector + , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "saltine"; - version = "0.0.0.4"; - sha256 = "07a1ea393e9d85b921e82659e695961e0cf0ca5419196d9f91d483e5d1c4e4d8"; + version = "0.0.0.5"; + sha256 = "07cmij425h4gp327kivvxj3j4i1xwn5mqvjlkh98i88y06nc5w64"; libraryHaskellDepends = [ base bytestring profunctors ]; librarySystemDepends = [ libsodium ]; testHaskellDepends = [ base bytestring QuickCheck test-framework - test-framework-quickcheck2 vector + test-framework-quickcheck2 ]; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsodium;}; "saltine-quickcheck" = callPackage @@ -154140,7 +164864,7 @@ self: { mkDerivation { pname = "saltine-quickcheck"; version = "0.1.0.1"; - sha256 = "d2761d1c435b5205710619132d01adf5639c9843a3adb5303e667fafb3412210"; + sha256 = "041286rsyzv67qqbbbd38fc9qqzmml0js4qr0rqhaljv8cf1sxnj"; libraryHaskellDepends = [ base bytestring bytestring-arbitrary hex QuickCheck saltine ]; @@ -154163,7 +164887,7 @@ self: { mkDerivation { pname = "salvia"; version = "1.0.0"; - sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1"; + sha256 = "1qcnhj3ifjqrkaw1ixqkwmv2br9w5dlk1mrrwgl73c3wxgin7gni"; libraryHaskellDepends = [ base bytestring containers directory fclabels MaybeT-transformers monads-fd network old-locale process pureMD5 random safe @@ -154183,7 +164907,7 @@ self: { mkDerivation { pname = "salvia-demo"; version = "1.0.0"; - sha256 = "30b82129626bdf907158cc5d529f8364a8f1d1013a50a3df294f7c20e1e9db69"; + sha256 = "0sfvx7hj0z2g57gs6l1s078z3a34hfgm4pfcb1qr1pvbc8lj3f1h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154206,7 +164930,7 @@ self: { mkDerivation { pname = "salvia-extras"; version = "1.0.0"; - sha256 = "a12870b0c125fbbac0c45916f1576ec7f2db647051e9d9da11b52f65c954d1d9"; + sha256 = "1nfiak4nabxm27ddksaif1jdpwn7drbz25jrqk0bmyr5q6q70a51"; libraryHaskellDepends = [ base bytestring c10k clevercss fclabels filestore hscolour HStringTemplate monads-fd network old-locale pureMD5 salvia @@ -154225,7 +164949,7 @@ self: { mkDerivation { pname = "salvia-protocol"; version = "1.0.1"; - sha256 = "6b2312e52efaa81feec7461b1a3db77e1f2a8dfd829ae878b614c206a5e48928"; + sha256 = "0a49wjjhdhhlnrwfi6l2zn6jl7vynwyil6s6qzp1za7s5vji48vb"; libraryHaskellDepends = [ base bimap bytestring containers fclabels parsec safe split utf8-string @@ -154243,7 +164967,7 @@ self: { mkDerivation { pname = "salvia-sessions"; version = "1.0.0"; - sha256 = "10acd7f9c763629829ab4fad84c7f2220cabbdbcdd7114e87c263cae604fd431"; + sha256 = "0cfl9xhawg16gkl18wfxpjysn312yb3q9bagmclrhqk3qzwxgb0h"; libraryHaskellDepends = [ base containers fclabels MaybeT-transformers monads-fd pureMD5 random safe salvia salvia-protocol stm time utf8-string @@ -154260,7 +164984,7 @@ self: { mkDerivation { pname = "salvia-websocket"; version = "1.0.0"; - sha256 = "f4d927d44868d5eedc45ea50ff898630fbc81e333febf0517053f6f4cb2f5993"; + sha256 = "14sr5z5z9xjkf18z1srz6cgciyrhhs4zyl7a8pffxmb893a2gngl"; libraryHaskellDepends = [ base bytestring fclabels monads-fd salvia salvia-protocol stm utf8-string @@ -154275,7 +164999,7 @@ self: { mkDerivation { pname = "sample-frame"; version = "0.0.3"; - sha256 = "5baf301a4f7b2d52e6b9b9c06b10afd3938de0be6d09736d0188616cd9027247"; + sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base QuickCheck storable-record ]; @@ -154288,8 +165012,8 @@ self: { ({ mkDerivation, base, numeric-prelude, sample-frame }: mkDerivation { pname = "sample-frame-np"; - version = "0.0.4"; - sha256 = "cdec6e95f9b3739ca5031dfa914465d5e82b9b6bb09c95529728c92efb21e4d0"; + version = "0.0.4.1"; + sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi"; libraryHaskellDepends = [ base numeric-prelude sample-frame ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Orphan instances for types from sample-frame and numericprelude"; @@ -154303,7 +165027,7 @@ self: { mkDerivation { pname = "sampling"; version = "0.3.2"; - sha256 = "a66156e4600ffb15bde127a841251d49f2d0ff67a85e05961b91839b4769824e"; + sha256 = "0kl2d53rp0wi3fb0apm8czzx1wj93ljl3a17w6yibyqgc3j5cqd6"; libraryHaskellDepends = [ base containers foldl mwc-random primitive vector ]; @@ -154319,7 +165043,7 @@ self: { mkDerivation { pname = "samtools"; version = "0.2.4.3"; - sha256 = "da91b82c0ce87b1f1f2775f7b1dd05352ceb918e79a926fc32ede324a9582086"; + sha256 = "11i0b2lj9qzd6by2dabris8ynb1m0pfv3xvm4wgiyyz81hnbi4fs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring seqloc vector ]; @@ -154339,7 +165063,7 @@ self: { mkDerivation { pname = "samtools-conduit"; version = "0.1.1.0"; - sha256 = "bce2d5f74f3b06741c661bab51d4ab0bed629016d03a263047123ea4936ea968"; + sha256 = "0s59ds9s8ghj8wq2cfnh2s865v8bmga53aqvcqf781iv9zvxbqmw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154361,7 +165085,7 @@ self: { mkDerivation { pname = "samtools-enumerator"; version = "0.1.2.1"; - sha256 = "b5e4312ee21583d4768676bbcf320c137fc416a5c4d724fafea5b9b495a86272"; + sha256 = "0wk2m2av9fd5zvx29my4llbc8zqk1hrczfvnhrvd90qmw8p33r5m"; libraryHaskellDepends = [ base bytestring enumerator samtools transformers ]; @@ -154375,7 +165099,7 @@ self: { mkDerivation { pname = "samtools-iteratee"; version = "0.2.2.1"; - sha256 = "d4807605be6092c876ca779b2e74beb1ea4c8f8d0338fdcc28ba804a07b82c8d"; + sha256 = "139cp03lm05s536gsf03in7lrsmiprs2x6vpr9vci4k0pq2pd06l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154394,7 +165118,7 @@ self: { mkDerivation { pname = "sandi"; version = "0.4.0"; - sha256 = "40c895a4b26904e3a4b4488e93f37225bdb48e6787dffed627d16242f01aaeea"; + sha256 = "1smf3bq44qni4zbgxpw7cy7b9g95fbrr73j8njjf6139naj9bj20"; libraryHaskellDepends = [ base bytestring conduit exceptions stringsearch ]; @@ -154412,7 +165136,7 @@ self: { mkDerivation { pname = "sandlib"; version = "0.0.2"; - sha256 = "7d5e80bf57f477f3a9fff60a28b507e2e5a1ace3756169fbdec6dd4cd436901f"; + sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/regularlambda/sandlib"; description = "SAND data serialization and manipulation library"; @@ -154427,7 +165151,7 @@ self: { mkDerivation { pname = "sandman"; version = "0.2.0.1"; - sha256 = "407d283e1fc4a2a369615bac569683bf399ac14ddbce1331850bfe1d7837ce64"; + sha256 = "0r6f6xw1vzhbhlqi7knv9p0rlfdzhfb5db2vc5ls78n43wz2hza0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -154444,7 +165168,7 @@ self: { mkDerivation { pname = "sarasvati"; version = "0.3.0.0"; - sha256 = "68102bb2f1db289783a8e406b17aaa5e89854ab667fe7d60a21c365f852d0d75"; + sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438"; libraryHaskellDepends = [ base deepseq portaudio ]; homepage = "https://github.com/tokiwoousaka/Sarasvati"; description = "audio library"; @@ -154454,24 +165178,25 @@ self: { "sarsi" = callPackage ({ mkDerivation, async, attoparsec, base, binary, bytestring, Cabal - , containers, cryptonite, directory, filepath, fsnotify, machines - , machines-binary, machines-io, machines-process, msgpack, network - , process, stm, text, unordered-containers, vector + , containers, cryptonite, data-msgpack, directory, filepath + , fsnotify, machines, machines-binary, machines-io + , machines-process, network, process, stm, text + , unordered-containers, vector }: mkDerivation { pname = "sarsi"; - version = "0.0.3.0"; - sha256 = "5dce7ea1ce2288c62069f98f3757357b41a0385338edb4e741d9ef59f0243861"; + version = "0.0.4.0"; + sha256 = "0lv7mlhkf894q4750x53qr7fa7479hpczhgm1xw2xm5n49z35iy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base binary bytestring containers cryptonite - directory filepath fsnotify machines machines-binary machines-io - machines-process msgpack network process stm text vector + data-msgpack directory filepath fsnotify machines machines-binary + machines-io machines-process network process stm text vector ]; executableHaskellDepends = [ - base binary bytestring Cabal containers directory filepath fsnotify - machines machines-binary machines-io machines-process msgpack + base binary bytestring Cabal containers data-msgpack directory + filepath machines machines-binary machines-io machines-process network process text unordered-containers vector ]; homepage = "http://github.com/aloiscochard/sarsi"; @@ -154487,7 +165212,7 @@ self: { mkDerivation { pname = "sasl"; version = "0.0.0.1"; - sha256 = "f43b3e48169e1e579f4fb2e3ab84410321233ef798a63b6df847df82de9f4b29"; + sha256 = "0aabkzg85ps7z1nkp9lqywz26883862apqxj9ygmf7ly2r43wfzl"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptohash monads-tf papillon simple-pipe @@ -154503,7 +165228,7 @@ self: { mkDerivation { pname = "sat"; version = "1.1.1"; - sha256 = "d74427a71ce32a774297984fe4dd021da10180f708114b74cafefe6eb15642c5"; + sha256 = "1ia2asqnxzpyr9s4n488yy00388x0bfy8kwqjx17fap33jkjfi6p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -154520,7 +165245,7 @@ self: { mkDerivation { pname = "sat-micro-hs"; version = "0.1.1"; - sha256 = "842d181af744d36785481fd63e0f63c07ad77cbab2e7f10a0d17e6e4276309f0"; + sha256 = "1w09ccky9rhp1l5g3rxjp9ydfyn0cc7kxmhz922ngls4ywd1hbc4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -154539,7 +165264,7 @@ self: { mkDerivation { pname = "satchmo"; version = "2.9.9.3"; - sha256 = "8a4dc9b233326e6742f7fe1e7d7d8c9fbc705b0341fe68908a26b2378ce2224f"; + sha256 = "0kr2wa63gci6ia86izj10ddp1g4ziiyps7pyyx16fvij6frcjkca"; libraryHaskellDepends = [ array async base bytestring containers deepseq directory hashable lens memoize minisat mtl process transformers @@ -154557,7 +165282,7 @@ self: { mkDerivation { pname = "satchmo-backends"; version = "1.9.1"; - sha256 = "aeb9155253a5eec6dc13df22fa641ebc938c0795092e8921309338e061e5dfc3"; + sha256 = "1hyzwmhy0f4k60hqjbh9jl3qr4xw3rjgl8nz2gfcdvm5ad91bfdf"; libraryHaskellDepends = [ array base bytestring containers process satchmo timeit ]; @@ -154574,7 +165299,7 @@ self: { mkDerivation { pname = "satchmo-examples"; version = "1.8.1"; - sha256 = "8313c4be7ecd32efa77cfdca6be4b2ba43da8ef76ef1740365dff95170556ff7"; + sha256 = "1xvgamq53yfzcl1p9wbfyy7dlhxsnbj6pjpxgjkyycndgszc84w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -154593,7 +165318,7 @@ self: { mkDerivation { pname = "satchmo-funsat"; version = "1.4"; - sha256 = "64ec9531d40ed196831021904576697929d43f8f752a044c6bb031ce17eda05b"; + sha256 = "0nx0xlbwwcdhdd608akmiwzx8abrd5v4b411221rdl8fshqrbv34"; libraryHaskellDepends = [ array base containers funsat parse-dimacs satchmo ]; @@ -154608,7 +165333,7 @@ self: { mkDerivation { pname = "satchmo-minisat"; version = "1.3"; - sha256 = "a6b0c9cdd6466fa60d605da3a14c9c3c52e64b32f94e915c75587e414d908fb7"; + sha256 = "1dwgj16l2zjqfmf92kpr695ycliwki6a38sxc06scvs6sv6wkc56"; libraryHaskellDepends = [ base containers process satchmo ]; homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/"; description = "minisat driver as backend for satchmo"; @@ -154621,9 +165346,9 @@ self: { mkDerivation { pname = "satchmo-toysat"; version = "0.2.1.0"; - sha256 = "c1c0ee4e46975dfc874b43c3145110956bb1a920b123910e9afcb318dbfbd0bc"; + sha256 = "1g6hzgdiiczwk87928xi42lv2swm218i9hs39f3zqpcp8r7fxh61"; revision = "1"; - editedCabalFile = "c7d42104f5373844f95b97b8e4ed7482712f1ca054ca669a17ccfffaee8acab3"; + editedCabalFile = "1cyaibpgmzyc2yd6djjll0f2ywc2fkny9f4pbgwl8f1pyl223m67"; libraryHaskellDepends = [ array base containers satchmo toysolver ]; @@ -154640,7 +165365,7 @@ self: { mkDerivation { pname = "say"; version = "0.1.0.0"; - sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40"; + sha256 = "0h7w49v9manw7yml2bms11sf6znsfkmdr87c7d8ax8l1xnadnvzj"; libraryHaskellDepends = [ base bytestring text transformers ]; testHaskellDepends = [ base bytestring hspec temporary text ]; benchmarkHaskellDepends = [ @@ -154654,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.1.7"; - sha256 = "481f1bb36ecd467b2e60d2a97c6393384d78b96ece7afd644d96641ee51bb32e"; + version = "2.2.8"; + sha256 = "1rldqn584zmlxa42fqqnr2idw82rmma9cfad7jl5ih5mb3hyii5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154678,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; @@ -154696,7 +165417,7 @@ self: { mkDerivation { pname = "sbp2udp"; version = "0.0.1"; - sha256 = "9549dfa0600dad59907bb4129734dff99039aa9cb7a0e04f56af0352de914abc"; + sha256 = "1g2aj7g540xgar7y185pkjm3k47rvws9f4mlgf85kb8dc2hdyjcm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -154717,7 +165438,7 @@ self: { mkDerivation { pname = "sbv"; version = "5.14"; - sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e"; + sha256 = "0zlf683rgpn8dcm1wrwy01s2i35px0rlhprw713jl5kic2wp3p4j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154736,15 +165457,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sbv_5_15" = callPackage + "sbv_6_1" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb }: mkDerivation { pname = "sbv"; - version = "5.15"; - sha256 = "2364c29cb4cd20c8489e76689aa885072bf51faf2f60b208ec58be3d5ae5d719"; + version = "6.1"; + sha256 = "1a8wa2pgzd6z5bnndb6adzxcxyq1b6qlxwh8apjynqzbrhhjspn5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154772,7 +165493,7 @@ self: { mkDerivation { pname = "sbvPlugin"; version = "0.8"; - sha256 = "71ec51df5c185b8380d5275935170fa52f3002c192b65dddf93312a512e8ed9f"; + sha256 = "17zdx09aa4ikz7fmvdljq4130bx51wbkan97sn086nqqbkgm3v3i"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -154790,7 +165511,7 @@ self: { mkDerivation { pname = "sc3-rdu"; version = "0.15"; - sha256 = "60cc87b6977770f6de62a1a331a0252e356922792ed76a6f13ab8ca2074f2d7f"; + sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30"; libraryHaskellDepends = [ base hsc3 hsc3-db ]; homepage = "http://rd.slavepianos.org/t/sc3-rdu"; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; @@ -154805,7 +165526,7 @@ self: { mkDerivation { pname = "scalable-server"; version = "0.2.2"; - sha256 = "a6d77658a45b072a2c9e0d8c3fce4505730fc5243521699a91a1c56ffe66d618"; + sha256 = "066ncvz6zid1j6d6j89m4k2hywq58p73z30dkqn2l1svlic7dmx6"; libraryHaskellDepends = [ attoparsec attoparsec-enumerator base blaze-builder BoundedChan bytestring enumerator mtl network network-enumerator @@ -154821,7 +165542,7 @@ self: { mkDerivation { pname = "scaleimage"; version = "0.1"; - sha256 = "d60e385a335ddf93b352bd6540e5b7a4596130c2dfdbcb05492759913f88902a"; + sha256 = "0alhi0zr2n97942wpnyzq8q62nd4nzjl0rdxaarr7psx6dd3h3nn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath gd ]; @@ -154839,7 +165560,7 @@ self: { mkDerivation { pname = "scalp-webhooks"; version = "0.1.2.0"; - sha256 = "a4ea035465a3868fe3ffd70b8db58ee08110462e2fa735766083d815ee7061c8"; + sha256 = "1j31f3p1bn43c1v3b9rg5r3110g0issqs2ypzziqz1m3cma07sm4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154864,8 +165585,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.5.0"; - sha256 = "1635b45543cac398a5c0a54cb3bd6fffb7d11150ddbc55b3fbd92b7a6736632f"; + version = "0.5.1"; + sha256 = "03cbc0yahs8pzp1jz0mvfnd9sl80zd3ql18l9xswm8kh6m1ndpr0"; libraryHaskellDepends = [ base bytestring curl data-default scalpel-core tagsoup text ]; @@ -154881,8 +165602,8 @@ self: { }: mkDerivation { pname = "scalpel-core"; - version = "0.5.0"; - sha256 = "b24a0dbfa4ebfba9e20b08e2b2f9f39c27bd575e1652d1bab944ae2784e00dda"; + version = "0.5.1"; + sha256 = "1a99wazrgpvnjzsjk5az61f54hvppdxrrp2487nzndxpadlbh1cc"; libraryHaskellDepends = [ base bytestring containers data-default fail regex-base regex-tdfa tagsoup text vector @@ -154899,7 +165620,7 @@ self: { mkDerivation { pname = "scan"; version = "0.1.0.9"; - sha256 = "fbc9624885ce463cc7aa7748a9c68944e0d23145d1c79ed7bf8234f0ea47ac46"; + sha256 = "0imc8zmg0d42pzbrxiyi8lqx5q24i73ajj3pmb3kqinfhm465jgv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec ]; @@ -154913,7 +165634,7 @@ self: { mkDerivation { pname = "scan-vector-machine"; version = "0.2.7"; - sha256 = "6c6f7196f52037274f9a589368b0778501d8eee1762e1e6565f21620d85f5184"; + sha256 = "112ibzc205pjcmjiwbknw7pdh0c5fyq6i4sqk97jfdr0ynb72vvc"; libraryHaskellDepends = [ accelerate array base dph-base HUnit ]; testHaskellDepends = [ array base HUnit ]; description = "An implementation of the Scan Vector Machine instruction set in Haskell"; @@ -154928,7 +165649,7 @@ self: { mkDerivation { pname = "scanner"; version = "0.2"; - sha256 = "3a020d68a0372a5211c72e55eeb299738ea608d17184bc68f74d31ebe667a5e9"; + sha256 = "1sd5czkfncadyxlbr13is44ad3kkk6rfwm9fqw8m4aipl1l0s0is"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec ]; benchmarkHaskellDepends = [ @@ -154944,7 +165665,7 @@ self: { mkDerivation { pname = "scanner-attoparsec"; version = "0.1"; - sha256 = "b1affc0bd313d13e990e7048b8c681bacd3d71b0a56af7fbbe8bc3832b556cf4"; + sha256 = "1x3calmq7hwbpvxzfsm5n1qkvkdsh73bhj3h1sckxl8ksc5zrbxi"; libraryHaskellDepends = [ attoparsec base scanner ]; testHaskellDepends = [ attoparsec base bytestring hspec scanner ]; homepage = "https://github.com/Yuras/scanner-attoparsec"; @@ -154959,7 +165680,7 @@ self: { mkDerivation { pname = "scat"; version = "1.1.0.2"; - sha256 = "9686d2ceb1b086ff3ab536f90a842099ef1ee3d8f63b25d270168b3ed11e0236"; + sha256 = "0dh23v8kx2qnf392afznv3iixvwr4220my9nnlxgz1mhn77d51ln"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -154985,7 +165706,7 @@ self: { mkDerivation { pname = "scc"; version = "0.8.2.4"; - sha256 = "2ef866a202a72def6dd2abba16e30281815b3c3d72844cd63ed04018a5571ab8"; + sha256 = "1f0sayjihh6h7vb4r13j7ly5p0c10biidfmbs9nyybd70ai6dy1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155015,7 +165736,7 @@ self: { mkDerivation { pname = "scenegraph"; version = "0.1.0.2"; - sha256 = "dc83d430f13122f429d59993114feb58fa46ba169b8cde28b2e2bda70d3424d1"; + sha256 = "1l946h6sggg2n8ldx34v2sx4dyjqxd7i34wrsllz88iiy4qd90yw"; libraryHaskellDepends = [ array base containers fgl GLUT haskell98 hmatrix mtl old-time OpenGL process @@ -155033,7 +165754,7 @@ self: { mkDerivation { pname = "scgi"; version = "0.3.3"; - sha256 = "55b40f48739aefb7f25ac971a1b3f27aaf0a9d0c32afe62dd56877be0b2fb67e"; + sha256 = "0zmn5w5vwxv8slnydbrj1jfhmbvsyars2wf9bbrbgvwsfd40zd2m"; libraryHaskellDepends = [ base bytestring cgi extensible-exceptions network ]; @@ -155048,7 +165769,7 @@ self: { mkDerivation { pname = "schedevr"; version = "0.1.0.6"; - sha256 = "8bc9d4fbf7c5c0514323f4f0da88c961dba0c647b24763a60beab7ebfce3febd"; + sha256 = "1ggywgyfpdza1fk66ixj8z3a1nv1r64dmw7l4d1m3h65yzxx9jcb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155067,7 +165788,7 @@ self: { mkDerivation { pname = "schedule-planner"; version = "1.0.1.1"; - sha256 = "68f3e4be529847d3ec8297cc8eac08fc2272e82e9c6d0a67b88d47e6529582f4"; + sha256 = "1x42jm9fciwdp1khlvcw5vl748pw12n8xk4phbnd6iwqaazf9wv8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155083,7 +165804,7 @@ self: { mkDerivation { pname = "schedyield"; version = "1.0"; - sha256 = "f75d3f6f125236e88ab43f0f08806a0d6d73b078eb25e249dfc018d51dedf053"; + sha256 = "0lzhxlfxa660vx4y49gbg2q76v8dda00h3rznj5fhdjj29pkypgp"; libraryHaskellDepends = [ base ]; description = "Exposes standard POSIX function sched_yield"; license = stdenv.lib.licenses.bsd3; @@ -155095,7 +165816,7 @@ self: { mkDerivation { pname = "schema"; version = "0.0.1"; - sha256 = "27466a6eaa757f9f3d2556cff139f64c27e5eb9ff81627fa118467607b92a70c"; + sha256 = "0357j9xn0rw427x2f5pqkzmya9scyqwz3ksn4lyryzvmm9p6lii7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://toktok.github.io/"; @@ -155103,6 +165824,31 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "schematic" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core + , hspec-discover, hspec-smallcheck, HUnit, regex-compat, scientific + , singletons, smallcheck, smallcheck-series, tagged, text + , unordered-containers, validationt, vector, vinyl + }: + mkDerivation { + pname = "schematic"; + version = "0.1.4.0"; + sha256 = "11dc24f657wh5g5yx256qnwmajxs5f6pv2ydzdqig3a7al32kvfb"; + libraryHaskellDepends = [ + aeson base bytestring regex-compat scientific singletons smallcheck + smallcheck-series tagged text unordered-containers validationt + vector vinyl + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-core hspec-discover + hspec-smallcheck HUnit regex-compat singletons smallcheck + smallcheck-series tagged text unordered-containers validationt + vinyl + ]; + description = "JSON-biased spec and validation tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scholdoc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html , blaze-markup, bytestring, containers, criterion, data-default @@ -155118,9 +165864,9 @@ self: { mkDerivation { pname = "scholdoc"; version = "0.1.3"; - sha256 = "c4d68f7ab5c606479cd2d14f98c6e2e262c2681a3aa469db5b9599322dc94b37"; + sha256 = "0dsbr4nk56cmbgdnk91s39lc4qp2wb39hkyisaf4f1n6nmx8zmn4"; revision = "1"; - editedCabalFile = "bbe7070ca2ca48d86095c9a45120d2bfbf6a480b3894117d70e0f8e3ccabb435"; + editedCabalFile = "0ddlmg6f7y70f1yi351q1d46mgxzs8h53969jmhdhj6al860grxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155158,9 +165904,9 @@ self: { mkDerivation { pname = "scholdoc-citeproc"; version = "0.6"; - sha256 = "94c2695699811dfdc84a4fb4352bda5d5086134d92695cd0c2ec8f913267c873"; + sha256 = "0wy8cwr933zcqb85qscj9l9qcl2xv8mkbd2g9b4gs7c1k5b6khll"; revision = "1"; - editedCabalFile = "33a066de8000d8bdb0a8f04f71baca64e27f4a2bb2d2a330f6d5a7f81090b118"; + editedCabalFile = "065ij08gi9ymyqqa7lmj5d57zqk4rax72kzhm2qbvn00h3g6d81k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155190,7 +165936,7 @@ self: { mkDerivation { pname = "scholdoc-texmath"; version = "0.1.0.1"; - sha256 = "2939f906890eb13f488013f787f09ef1e35ee12b29cf06e729638fe15a29cb17"; + sha256 = "05yb55df33v357khdkr95ghmxqzikvq8gxqkh143zc8fi43gjf99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155213,7 +165959,7 @@ self: { mkDerivation { pname = "scholdoc-types"; version = "0.1.3.1"; - sha256 = "59ad496dc91ddca4e0eddf2be0c146e7ac8190a84df318bfecf570a3742c6308"; + sha256 = "02335isa6w7mxjziiwsdm2883b778v0y0ayzxpha9p0xr5nlkbar"; libraryHaskellDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; @@ -155228,7 +165974,7 @@ self: { mkDerivation { pname = "schonfinkeling"; version = "0.1.0.0"; - sha256 = "be732b44f963e0b8f82a989b360e4e5133c1da66fac79ff257c63c371d558bf3"; + sha256 = "1wwbalfkfg66azr9zizscvdc2csi9q73d6wq5bwbiq33z522nwxy"; libraryHaskellDepends = [ base ]; description = "Transformation of n-ary functions to unary functions"; license = stdenv.lib.licenses.bsd3; @@ -155239,7 +165985,7 @@ self: { mkDerivation { pname = "sci-ratio"; version = "0.2.1.0"; - sha256 = "3365e46c9e46fd18236c63ddd7bdafd3fcf447061eb8d47b9cea3b317955ade1"; + sha256 = "1qddamwk2fzakixx9f0y0r3z9z6kmyyxgpb3dhiiiza6krnf8r9k"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ base ]; homepage = "https://github.com/Rufflewind/sci-ratio"; @@ -155252,7 +165998,7 @@ self: { mkDerivation { pname = "science-constants"; version = "0.2.0.0"; - sha256 = "7e274af9d0ea1dbbd2baef8f4b43f2cf206affa3de5fb1849e3389a4686ae362"; + sha256 = "0qp3d9la929kks2b2pyylgznl86gy91lp3zgpb9bn7gas3wll9vy"; libraryHaskellDepends = [ base ]; description = "Mathematical/physical/chemical constants"; license = "unknown"; @@ -155264,7 +166010,7 @@ self: { mkDerivation { pname = "science-constants-dimensional"; version = "0.1.0.2"; - sha256 = "75620e947186910796f98e391c48128ca57b812606b821fecccd89d2104bdf8f"; + sha256 = "13yz9c8d52fdrkz23f064s0pp9cc2941qfcfz6b0g4c6f6a0wqkm"; libraryHaskellDepends = [ base dimensional numtype science-constants ]; @@ -155276,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.10"; - sha256 = "4d3b8ae5d741facfb0e84a2f1b6964a7ab3817269568c37de44f1be5cc0ff1a1"; + 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 @@ -155305,7 +166051,7 @@ self: { mkDerivation { pname = "scion"; version = "0.1.0.2"; - sha256 = "1154d5d1ae14e245b2e756eb32134c6a602d9f0d3741705302109aead12818c6"; + sha256 = "1ihq538ym6hh099p0h9p1ngjsq3a9h9k5ssnwyr4bqhlmv8xam0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155335,7 +166081,7 @@ self: { mkDerivation { pname = "scion-browser"; version = "0.5.0"; - sha256 = "cc627e43c779bb998b0f4dfc280b4aee1b2736685d02418dcab27f8dfccec4d9"; + sha256 = "1nf4rvy8szxjra6l20jxd0v2f6zf985jiz2d1y5rkfvrqx1pwqnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155364,7 +166110,7 @@ self: { mkDerivation { pname = "scons2dot"; version = "0.9"; - sha256 = "53c65fd515a54ced52cf47563e889fd3b589a1e4eb941f19b66d2abeef9e2ab1"; + sha256 = "1c9akvpvwakdnqciz57bwjhqkdfkky43wmj7rx9fsk552pamzijk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers process ]; @@ -155381,7 +166127,7 @@ self: { mkDerivation { pname = "scope"; version = "0.8.0.1"; - sha256 = "f1cfecff59ed9d7f1939042be34403ec8e03e105df4f4af3c3bc83a1d43546cf"; + sha256 = "1ks66paa30xwqgrllkyz0phh73pc0d2f6aq474cpz7gdb7zyrkzi"; libraryHaskellDepends = [ base bytestring containers iteratee MonadCatchIO-transformers mtl mwc-random time unix zoom-cache @@ -155398,7 +166144,7 @@ self: { mkDerivation { pname = "scope-cairo"; version = "0.8.0.1"; - sha256 = "e6120e9b710163817bc549a9330f65bbc899471c97c7913dcb191b3881f31736"; + sha256 = "0dhpyf0kh6qrrcyr3iwp3i3rkj5vcl7k7aa9qmxq2qq1f6dhw4p6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155422,7 +166168,7 @@ self: { mkDerivation { pname = "scottish"; version = "0.1.0.1"; - sha256 = "dd0a24cb4a9b2e4fed1cce3adfefbcbbac6eab07b1a80bf851fc53934b260705"; + sha256 = "01874r5r6lzwa7w0pa5i0ymnxb5vpkpxyfnf3knlyblv9b5j82nx"; libraryHaskellDepends = [ base data-default enclosed-exceptions http-types lens mtl persistent resource-pool scotty stm text transformers wai warp @@ -155443,9 +166189,9 @@ self: { mkDerivation { pname = "scotty"; version = "0.11.0"; - sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed"; - revision = "4"; - editedCabalFile = "0d6fc88c2396a69e0d0f23ccad17b7b47d548f67bc23e417aad2940fdd71c5a1"; + sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; + revision = "5"; + editedCabalFile = "10p4hqsprxzh3j5w64xvbwv6lyc03r1d98mahbwyqs4ayz3ysxmf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -155468,7 +166214,7 @@ self: { mkDerivation { pname = "scotty-binding-play"; version = "1.3"; - sha256 = "e9cafd0ff913a0afb542376ecb59cfa8b7bf8055f41330aa7596ac0db9a73e4d"; + sha256 = "0k9ylywhvb4nfnm304zlan0bzdx8rxcwnvip8assz80kz47zvjp9"; libraryHaskellDepends = [ base bytestring mtl scotty template-haskell text ]; @@ -155487,7 +166233,7 @@ self: { mkDerivation { pname = "scotty-blaze"; version = "0.1.3"; - sha256 = "a7c5c7c0fc5010633ad20460b6534921f4acafa714a9055435de5045ef3a832e"; + sha256 = "0bl37bplal6y6ma0ba8llypsrx11959vcq04s8x6642hzk0cgid7"; libraryHaskellDepends = [ base blaze-builder blaze-html mtl scotty wai ]; @@ -155503,9 +166249,9 @@ self: { mkDerivation { pname = "scotty-cookie"; version = "0.1.0.3"; - sha256 = "34f191cde735151d69f137c03f165ae179bb68a34ed676f05b8b2684c0e8db73"; + sha256 = "0wyvx30889lbbgq7dmjfldlbnyg1b8b3zh1py5lis59mwz6r3w9l"; revision = "1"; - editedCabalFile = "3ff1df13a5acba8ba170a5ac22b3ac6a2c227791292536ce1ebfc41038f58fc9"; + editedCabalFile = "1jcgylw11i5z3v73c999j5vj4b3amjrj5b55f2hqpfmcll9xzw9z"; libraryHaskellDepends = [ base blaze-builder bytestring containers cookie scotty text time transformers @@ -155523,7 +166269,7 @@ self: { mkDerivation { pname = "scotty-fay"; version = "0.1.1"; - sha256 = "02296cb92b81f08e89e6c3c4e99dc84ed5fa725ed64564461e4c3db305ef7a8e"; + sha256 = "13ksxw2v6gac3r368ifnbrrgmmafr2fyki63ws4qxw415fwnqa82"; libraryHaskellDepends = [ base bytestring data-default directory fay fay-jquery filepath http-types scotty text transformers wai @@ -155544,7 +166290,7 @@ self: { mkDerivation { pname = "scotty-format"; version = "0.1.1.0"; - sha256 = "cb6da220c05c95b8deb0fb8cc1505447d462456dbb36bfacee6467d8207f3599"; + sha256 = "169mgwhdhrv4xsnbydmvdm2n5m27ai8c337vn3gbi5awq0ha4vfb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base http-media http-types scotty text ]; @@ -155562,7 +166308,7 @@ self: { mkDerivation { pname = "scotty-hastache"; version = "0.2.1"; - sha256 = "b62135c5c1d08c9e491a9f38c5b287f7eeee623edaad5b5b8ce1d88023bad1fb"; + sha256 = "1yyip8iq1n71iidmpbfs7rifxvpphyrcaf4z394rx36hq72ka8dn"; libraryHaskellDepends = [ base containers filepath hastache http-types mtl scotty text wai warp @@ -155580,7 +166326,7 @@ self: { mkDerivation { pname = "scotty-params-parser"; version = "0.5.1.1"; - sha256 = "4cfb047b9d2567d714315fdfe11163bff69175209da78d8d99c32dbd75dac56c"; + sha256 = "0v65v9svsbf3k66qv9wx41sr3xmzcc8y3psz64adfrr5kmxh9ysc"; libraryHaskellDepends = [ base-prelude matcher scotty success text transformers unordered-containers @@ -155597,7 +166343,7 @@ self: { mkDerivation { pname = "scotty-resource"; version = "0.2.0.0"; - sha256 = "249d100a8a39da8168c342ee9397072e8b57ca2f9fb64099641aa0a600fd2008"; + sha256 = "0210zl0ad80scjcl1dlz5z55g2rf0ybr7vj2qdl83niri8511794"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; @@ -155615,7 +166361,7 @@ self: { mkDerivation { pname = "scotty-rest"; version = "0.1.0.0"; - sha256 = "4012c5bf50c1512e7053027fd0068df817b7710f294f24bb6563a4a0b73b1dfc"; + sha256 = "1z0x7fvs1933cnxj8kr91xqvf5zqil3d0zq2adq2wlf1a2zwa4j0"; libraryHaskellDepends = [ base base-prelude bytestring convertible data-default-class http-date http-media http-types mtl scotty string-conversions text @@ -155639,7 +166385,7 @@ self: { mkDerivation { pname = "scotty-session"; version = "0.0.5"; - sha256 = "0762a3d8230ad6e8598ed672c0fe6e46e3c16e9dbeffb9759ae2ba7cadfe7dcb"; + sha256 = "1jvxzsnprfp2k9svkzxykmpc3qs6dvzc0wnnircyimha4gca6qh7"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring crypto-api http-types scotty stm text time transformers unordered-containers @@ -155656,7 +166402,7 @@ self: { mkDerivation { pname = "scotty-tls"; version = "0.4.1"; - sha256 = "c897d73970cfe69a0b9763628e5157854df8aaaeb7c7afe2e38ea3a4ba7723a0"; + sha256 = "1813fyxa98wfwgiazixpmsmghkc5ax8qwqk3jw5rmrngf0wxg5y8"; libraryHaskellDepends = [ base scotty transformers wai warp warp-tls ]; @@ -155670,9 +166416,9 @@ self: { mkDerivation { pname = "scotty-view"; version = "1.0.0"; - sha256 = "d46e0f66f200595d666d5b996cc1aa7999ce059668bc720d641e60c03f4b3bda"; + sha256 = "1niv9czw0q0ych6p5g38jq2wx6brmb0nr6avdmk5sn80y9k0yvnl"; revision = "2"; - editedCabalFile = "d941c5b17efc35e5a244ee219198795d8b3df583685abe7b128731a417735a29"; + editedCabalFile = "0aasfcbs8cc729xvwnk8hgskv2sxg6c928gf8jifadgwgsqwahfr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base scotty text transformers ]; @@ -155688,7 +166434,7 @@ self: { mkDerivation { pname = "scp-streams"; version = "0.1.0"; - sha256 = "3e9beb8abea6f4921f976e4c613a44cd4bf6c06c432b0f1d3458b744193028f2"; + sha256 = "1wi860cl9dsq6hfhyas3dk0gcjyd8hx62k3fjwgr5x56ps5fp6ry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155711,7 +166457,7 @@ self: { mkDerivation { pname = "scrabble-bot"; version = "0.1.0.0"; - sha256 = "c3bab60c076653085733e2d4904b5b62a1aac1cba5d3d94093e050542ebfb20c"; + sha256 = "035jpwp58l70jd0dklx5rg0sm8b2bd5r1m726dbhhlv60w6bdfn3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155734,7 +166480,7 @@ self: { mkDerivation { pname = "scrape-changes"; version = "0.1.0.5"; - sha256 = "e1c2a54d597d12ced09af8e5247d4468e8a11cd6b90d9b1d398d2ebb9ebd06d1"; + sha256 = "1l86pngbnbld74frn3drsqfa3s388iyj9rgqkb8cw4kxb56sbhp1"; libraryHaskellDepends = [ async attoparsec base bytestring cron directory email-validate filepath hashable hslogger http-client lens mime-mail network-uri @@ -155756,7 +166502,7 @@ self: { mkDerivation { pname = "scrobble"; version = "0.2.1.1"; - sha256 = "4715c4fa900e4fed6f173ec9523470b552fab6c8e8bb5606acdd916857393498"; + sha256 = "161l75bni4fxmh35dfz8r2vgllmmf0s55j9y2xpyskqfj3xc85a7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155780,7 +166526,7 @@ self: { mkDerivation { pname = "scroll"; version = "1.20170122"; - sha256 = "89b5636f8ff2e540892a1b6fb96d3c1bb7b287c13f24c94c143e99afdca38b38"; + sha256 = "0f4blgfaz69y2i6cj91zq63v5dqv7invjvqv5a4l1rgjixpn7dc9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155801,7 +166547,7 @@ self: { mkDerivation { pname = "scrypt"; version = "0.5.0"; - sha256 = "3ec0a622393e2a4dbbce4c899602c848d924f8516688491b1162331b7093d9b2"; + sha256 = "1cnrjdq1ncv224dlk236a7w29na8r019d2acrsxlsaiy74iadh1y"; libraryHaskellDepends = [ base base64-bytestring bytestring entropy ]; @@ -155824,7 +166570,7 @@ self: { mkDerivation { pname = "scrz"; version = "0.0.0.1"; - sha256 = "8fc107aa9bd1fa8568c8526773b17d2bd1d32df70613dab0c3879830f3deb5c8"; + sha256 = "1j5mvvrk1647qfqdl4q6ywnx7l9bgnqp6rsjr1l8bynikfm0ghcg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155847,7 +166593,7 @@ self: { mkDerivation { pname = "scyther-proof"; version = "0.10.0.1"; - sha256 = "d22c17024b74395aa4fff7a04389d45330cd348bb27e234e5cd3602a72938d30"; + sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155868,7 +166614,7 @@ self: { mkDerivation { pname = "sde-solver"; version = "0.1.0.0"; - sha256 = "46d58e7974519e9eebf2e226e21c593a6c6be81c8eae5828d098c0e09813e16a"; + sha256 = "0sp12fcf1h4qs0l5iblf3kl6nv1sb4ff49p2ybmrx7jifiwqxma6"; libraryHaskellDepends = [ base cereal cereal-vector ghc-prim haskell-mpi mersenne-random-pure64 mtl mwc-random normaldistribution parallel @@ -155886,7 +166632,7 @@ self: { mkDerivation { pname = "sdf2p1-parser"; version = "0.1.1"; - sha256 = "1faa416d29abf4e299b3951d7182b9f29ded74aee2f96fd4ef64b5984914e4ab"; + sha256 = "1az42i4ridb4xza6zyg2mrsfv7gjp61727cmnfcy5x5b55nl3ahz"; libraryHaskellDepends = [ base bytestring parsec transformers ]; testHaskellDepends = [ base bytestring Cabal HUnit parsec test-framework @@ -155904,7 +166650,7 @@ self: { mkDerivation { pname = "sdl2"; version = "2.2.0"; - sha256 = "5a3a83fad8936539a4ff1a4a845f2a30b859d2d62e1cda7ab1f39cb59378c484"; + sha256 = "1164g29vb77kn5xdl71fsv95kf1h59gq8jhszyj3jrckv3x86fjs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155921,7 +166667,7 @@ self: { mkDerivation { pname = "sdl2-cairo"; version = "0.1.0.2"; - sha256 = "e536adc0c2439267d3496cb5d33899c83d2e6d8debf2d56c69abd3c947704a86"; + sha256 = "11jaf13wklxbd5ndbwpbimnjwgf8k4wd7dbc979ng4j3qb0asdp5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ]; @@ -155937,7 +166683,7 @@ self: { mkDerivation { pname = "sdl2-cairo-image"; version = "1.0.0.2"; - sha256 = "c5a8adee53ed011132f8bbefc554505a3758577afc653ddb8b6f0f8ef61c9b76"; + sha256 = "0xlv3kv8w3vgigdksrgwg9bmhdssa1acbvxvz0r120gdagpava65"; libraryHaskellDepends = [ base cairo convertible JuicyPixels linear sdl2 sdl2-cairo vector ]; @@ -155952,15 +166698,17 @@ self: { }: mkDerivation { pname = "sdl2-compositor"; - version = "1.2.0.5"; - sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255"; + version = "1.2.0.7"; + sha256 = "1yfbqxrfhy951qdcf43vx9gxd4jj3l2dq5bz04blchpq4qzm4876"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lens linear lrucache QuickCheck sdl2 StateVar stm text transformers ]; - testHaskellDepends = [ base Cabal hspec hspec-core QuickCheck ]; + testHaskellDepends = [ + base Cabal hspec hspec-core lrucache QuickCheck stm + ]; description = "image compositing with sdl2 - declarative style"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155974,7 +166722,7 @@ self: { mkDerivation { pname = "sdl2-gfx"; version = "0.2"; - sha256 = "8c1e10b7a675d782cd650820c75c4ef9225718ad6aaa3f8db02e869b7720c50d"; + sha256 = "03f541vrp1ifn26kzakamlc5f8pr9rfcf808cp6q5mvmlsvi07lc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155995,7 +166743,7 @@ self: { mkDerivation { pname = "sdl2-image"; version = "2.0.0"; - sha256 = "399742b2b7e64fe4e58c9d8a44ad29b2c355589233535238f8c9b371de6c26df"; + sha256 = "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156016,7 +166764,7 @@ self: { mkDerivation { pname = "sdl2-mixer"; version = "0.1"; - sha256 = "d924f31d9e1c87eed92d357ce20273dba44637861927188b8a44db2c0b2e2bc0"; + sha256 = "1h1b5q5jrns4ia5ih9qrhqvld96vfc1f4z1m5pcyx1qwkqfz696r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156028,6 +166776,7 @@ self: { executableHaskellDepends = [ base data-default-class sdl2 vector ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-ttf" = callPackage @@ -156036,7 +166785,9 @@ self: { mkDerivation { pname = "sdl2-ttf"; version = "1.0.0"; - sha256 = "349b155e0992e2e05695d380145bdb28a9a9bd6089ca03973dca6948883fe51f"; + sha256 = "07z57y44hsfa7nbh7jl9c2yska98vddi906kjmbf1qlj15g1b6rl"; + revision = "1"; + editedCabalFile = "0170h5gk6l20lb5c56sfd6xjgmaan0x8hgj3qlinqfh75qxx3kyp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base sdl2 transformers ]; @@ -156044,14 +166795,15 @@ self: { executableHaskellDepends = [ base linear sdl2 ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "sdnv"; - version = "0.1.0.0"; - sha256 = "ac66007c0940524fc311a304d08253cf4e9ee234e5c38c65f90d29b2134aa71d"; + version = "0.1.1"; + sha256 = "1hckjr6fprw2y7wb4zz035rnhqj6xs7djnlkhdyzmir9g5xa3cr6"; libraryHaskellDepends = [ base binary bytestring ]; description = "Self-delimiting numeric values encoding library"; license = stdenv.lib.licenses.bsd2; @@ -156069,7 +166821,7 @@ self: { mkDerivation { pname = "sdr"; version = "0.1.0.9"; - sha256 = "0d7725059fd930cdf4e4a7a8a63763077b8cdc7dae8e1fa4116ec3d0ae5a4b55"; + sha256 = "0mabbapd1hvf26j1z3mfgpf8qyq7ccvsda57wkscsc6rkw2jaxqd"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random @@ -156102,7 +166854,7 @@ self: { mkDerivation { pname = "seacat"; version = "1.0.0.3"; - sha256 = "f59e2cf92bafca1b09afbf2ddafc50f4f62f88f918e393f124bedf0d6e3dd447"; + sha256 = "0iyl7mp0vpxy4kqr7qqqz642zxpla3ydlbdzmw4ipjmg5gwjr7pm"; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring ConfigFile data-default directory filepath http-types mime-types MissingH monad-control mtl @@ -156120,8 +166872,8 @@ self: { ({ mkDerivation, base, bytestring, free, mtl, text }: mkDerivation { pname = "seakale"; - version = "0.2.0.0"; - sha256 = "cdbab7220b1935ef18dd78113fd87981371492d904a1e07d2911c94dcf2b2349"; + version = "0.2.1.0"; + sha256 = "0by7fykjqzj43cxv3z33pg7rq7dpn9f0a7nbaxz116qz12kk64a2"; libraryHaskellDepends = [ base bytestring free mtl text ]; description = "Pure SQL layer on top of other libraries"; license = stdenv.lib.licenses.bsd3; @@ -156133,8 +166885,8 @@ self: { }: mkDerivation { pname = "seakale-postgresql"; - version = "0.2.0.0"; - sha256 = "f7205329cf6388331f77da685cfc9e742130e6714d6a2103e57a5cd6cf49b9ac"; + version = "0.3.0.0"; + sha256 = "0z3ai022yq2ff6yfp3a3s5xbxlchs2v4x6m86f8dgf28731gyynq"; libraryHaskellDepends = [ base bytestring free mtl postgresql-libpq seakale time ]; @@ -156148,8 +166900,8 @@ self: { }: mkDerivation { pname = "seakale-tests"; - version = "0.1.0.1"; - sha256 = "ac54690de63000b5492d85b4009e5e6d3baab645726e06d4f099b990ce707508"; + version = "0.1.0.2"; + sha256 = "0a9cbmwy1i3ij0nzgzm340klds4f4b4f7aqb4q7h7sl6j096zg3h"; libraryHaskellDepends = [ base bytestring free mtl recursion-schemes seakale ]; @@ -156162,7 +166914,7 @@ self: { mkDerivation { pname = "seal-module"; version = "0.1.0.1"; - sha256 = "d8b511f8bc3306e804fc2359326dd8438bc79b11cd88f944e65ab98501125574"; + sha256 = "0x2m280qbfaswr2gk26d26dwg2s3v1nk4n93zh2fh1ikpkw13dfq"; libraryHaskellDepends = [ base template-haskell ]; description = "Template Haskell support for global configuration data"; license = stdenv.lib.licenses.bsd3; @@ -156175,7 +166927,7 @@ self: { mkDerivation { pname = "search"; version = "0.1.0.1"; - sha256 = "7ceeba242c9850b71e0be7b3fea1e65a066dfd5b54f3058e972eff31b8773771"; + sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw"; libraryHaskellDepends = [ base ghc-prim profunctors semigroupoids tagged transformers ]; @@ -156186,12 +166938,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "search-algorithms" = callPackage + ({ mkDerivation, base, containers, doctest, hspec }: + mkDerivation { + pname = "search-algorithms"; + version = "0.1.0"; + sha256 = "0sk3mgchhz885sbgyg4a7732jnlsqzv5c7mnx7pcpz5f8nhz14sc"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hspec ]; + homepage = "https://github.com/devonhollowood/search-algorithms#readme"; + description = "Common graph search algorithms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "search-algorithms_0_2_0" = callPackage + ({ mkDerivation, base, containers, doctest, hspec }: + mkDerivation { + pname = "search-algorithms"; + version = "0.2.0"; + sha256 = "1kw8352akwy9646nvr39a3q33hbg2a0dmnlywfcrxnawm9r930vk"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hspec ]; + homepage = "https://github.com/devonhollowood/search-algorithms#readme"; + description = "Common graph search algorithms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sec" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "sec"; version = "0.0.1"; - sha256 = "5be0f2b650c3238e045116b767687d812136dcf4c677d80d30f90c15aa05d4e7"; + sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/urso/sec"; description = "Semantic Editor Combinators"; @@ -156204,7 +166983,7 @@ self: { mkDerivation { pname = "secd"; version = "0.1.0.0"; - sha256 = "7b82d863d881d283301f73217de976db47bdf932c7ec6844a460db02ec40a09e"; + sha256 = "17m083n05nv0li26iv676bwvsiyvfvlps8bk3wq87ll1v1ixi0kv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec ]; @@ -156220,7 +166999,7 @@ self: { mkDerivation { pname = "secdh"; version = "0.2"; - sha256 = "3a7b55a1c50f8d03d54545a52338b7710eb66aa43d8dcbe1a80242d7ce132b63"; + sha256 = "0qrb2g7dfhh2m3hwp39xlimbc3kinww279a58pah738gqnhmayrs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -156236,7 +167015,7 @@ self: { mkDerivation { pname = "seclib"; version = "1.1.0.2"; - sha256 = "dc22bdb13cf11fa9594f324be5bccbdf5ab6f2699b2e0dec60460458476b6f49"; + sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw"; libraryHaskellDepends = [ base ]; description = "A simple library for static information-flow security in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -156253,7 +167032,7 @@ self: { mkDerivation { pname = "second-transfer"; version = "0.10.0.4"; - sha256 = "00c5774b711f76530be05bd757249e944e61bda8292d10ee3ec463b9423ef801"; + sha256 = "00gq7r1bjqy47vp10b99m2yn2kllkqj5gmsvw05m6xhzf55pgi80"; libraryHaskellDepends = [ attoparsec base base16-bytestring binary BoundedChan bytestring clock conduit containers deepseq exceptions hashable hashtables @@ -156273,23 +167052,24 @@ self: { }) {}; "secp256k1" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , cereal, cryptohash, entropy, HUnit, largeword, mtl, QuickCheck + ({ mkDerivation, base, base16-bytestring, binary, bytestring, Cabal + , cryptohash, entropy, HUnit, largeword, mtl, QuickCheck , string-conversions, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "secp256k1"; - version = "0.4.6"; - sha256 = "50568cc5ebf50125b222c208c0e0dc580dd9b69266c39ec9e458600f5bff40c1"; + version = "0.4.8"; + sha256 = "0jnvsfmjrac8l07l32xi1vlbbjpvzhmsb1fv5ajvjkw7yrd4byqk"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base base16-bytestring binary bytestring cereal entropy largeword - mtl QuickCheck string-conversions + base base16-bytestring binary bytestring entropy largeword mtl + QuickCheck string-conversions ]; testHaskellDepends = [ - base base16-bytestring bytestring cryptohash entropy HUnit mtl - QuickCheck string-conversions test-framework test-framework-hunit - test-framework-quickcheck2 + base base16-bytestring binary bytestring cryptohash entropy HUnit + mtl QuickCheck string-conversions test-framework + test-framework-hunit test-framework-quickcheck2 ]; homepage = "http://github.com/haskoin/secp256k1-haskell#readme"; description = "Bindings for secp256k1 library from Bitcoin Core"; @@ -156304,7 +167084,7 @@ self: { mkDerivation { pname = "secret-santa"; version = "0.1.0.0"; - sha256 = "a8522d582b759e9a8e6cda40936a585a6627d8452fc18419c0104228a60c2c63"; + sha256 = "0qrc1jk2hhhhq0cq9h9g8pc2frjsb1m96h6sdj79m7km5dc2slm8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156324,7 +167104,9 @@ self: { mkDerivation { pname = "secret-sharing"; version = "1.0.0.3"; - sha256 = "62af2ba181d30e6d6c6cfd01f83a5082b6bc378a745c90497cff42ebea2b6160"; + sha256 = "0q315gmfnhpzgi4r0p3li8vvrdl2a0xgh0gxdin6s3nkh6hjpbv2"; + revision = "1"; + editedCabalFile = "1q8r31bjvjm1j11pp9xqxwh53gi2skm6lqxcja5v8gzs7hl1kkb1"; libraryHaskellDepends = [ base binary bytestring dice-entropy-conduit finite-field polynomial vector @@ -156343,7 +167125,7 @@ self: { mkDerivation { pname = "secrm"; version = "0.0"; - sha256 = "e975a8e1d1dc6409b88cf8ea6567a7ffd0268f6b0f2848cc3922af407b458e41"; + sha256 = "0hcf8mxl1br27764ha0gdf7jdl7zlxknbspqijw0jr6ws7hshxg9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 ]; @@ -156359,7 +167141,7 @@ self: { mkDerivation { pname = "secure-sockets"; version = "1.2.9.2"; - sha256 = "9fca6c79055c3c3bcc0659ae5fafdf6e81e4ffbda379c8adaf0a7f674efc5146"; + sha256 = "0ijizi76fzqamynwhyd3ppzy90bfvypmzbjr0v63ng2w0mwnrjlz"; libraryHaskellDepends = [ base bytestring directory HsOpenSSL network process transformers ]; @@ -156374,7 +167156,7 @@ self: { mkDerivation { pname = "secureUDP"; version = "0.1.1.3"; - sha256 = "2c59bceee71903722ddecd4d4b31306ef21037048b1ded5a4c049d238334c129"; + sha256 = "0af16j1j77849idfs7cb0hvi1wkf60qlnkfdvqnp40qrwzpbqn9c"; libraryHaskellDepends = [ base bytestring containers network ]; description = "Setups secure (unsorted) UDP packet transfer"; license = stdenv.lib.licenses.mit; @@ -156385,7 +167167,7 @@ self: { mkDerivation { pname = "securemem"; version = "0.1.9"; - sha256 = "feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036"; + sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy"; libraryHaskellDepends = [ base byteable bytestring ghc-prim memory ]; @@ -156401,7 +167183,7 @@ self: { mkDerivation { pname = "sednaDBXML"; version = "0.1.2.5"; - sha256 = "7e7ed68edb4fe68ccccb05f6f71b9635a4f107540a1e76d4c9b32c0e3ea11e19"; + sha256 = "068yl4z0wb5kr7a7c7haah3z391mjqdzgxh5rg68rrjgvf7dczky"; libraryHaskellDepends = [ base bindings-DSL bytestring containers iteratee mtl text ]; @@ -156411,12 +167193,61 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {sedna = null;}; + "selda" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.1.9.0"; + sha256 = "0c69aaalxi4b42y6y9y12wcxxyjnb3arc196kj0c1q6xdwh9fpk4"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Type-safe, high-level EDSL for interacting with relational databases"; + license = stdenv.lib.licenses.mit; + }) {}; + + "selda-postgresql" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , selda, text + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.5.1"; + sha256 = "1462rcvyf79p80b17hkgkgb2jfzhkdq8vj0y001jy5wzl6gs7b8d"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + }) {}; + + "selda-sqlite" = callPackage + ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda + , text + }: + mkDerivation { + pname = "selda-sqlite"; + version = "0.1.5.1"; + sha256 = "1r81qidwqp5smi3h7awrbxhvlclm5dgvrmi56irghvh960h720j3"; + libraryHaskellDepends = [ + base direct-sqlite directory exceptions selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "SQLite backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + }) {}; + "select" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "select"; version = "0.4.0.1"; - sha256 = "405255e4ba757c6e9b618c5656d2d062ee16ec6511199dc2a2e1aa056a910ca0"; + sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0"; libraryHaskellDepends = [ base ]; homepage = "http://nonempty.org/software/haskell-select"; description = "Wrap the select(2) POSIX function"; @@ -156430,7 +167261,7 @@ self: { mkDerivation { pname = "selectors"; version = "0.0.3.0"; - sha256 = "f98a41cd370c2f8ff06f59d5f434b71c40921f2810862102c8c4a32243131ab2"; + sha256 = "1chs2d1j58y4r01231hh50gr4h0wnwsg9mardzq8ybqc6z6l32pr"; libraryHaskellDepends = [ array base containers template-haskell text xml-conduit ]; @@ -156446,7 +167277,7 @@ self: { mkDerivation { pname = "selenium"; version = "0.2.5"; - sha256 = "871e1847947a25672bbacdfcb5d27f48a06a0762ebe527363d24c91b126a236f"; + sha256 = "0vr3d891pj947lv2grgbc83nm828gz9bbz6dp8mnf9bsji3ih7l7"; libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ]; description = "Test web applications through a browser"; license = stdenv.lib.licenses.bsd3; @@ -156461,7 +167292,7 @@ self: { mkDerivation { pname = "selenium-server"; version = "0.1.0.0"; - sha256 = "0ea722e2fb4a67b48ae470437ee0665518f508bd51b80fc90965fca122fc788d"; + sha256 = "13bqzhia3z35174hzf2ipl4ga62mcvh7whvhwj5b8rsazgi259qf"; libraryHaskellDepends = [ base conduit directory filepath http-conduit http-conduit-downloader network process random regex-tdfa @@ -156479,7 +167310,7 @@ self: { mkDerivation { pname = "selfrestart"; version = "0.1.0"; - sha256 = "76e0b9c23c17773887e063784795e598ceb4da90701ea8ddd94e76948f200a80"; + sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n"; libraryHaskellDepends = [ base directory executable-path unix ]; homepage = "https://github.com/nh2/selfrestart"; description = "Restarts the current executable (on binary change)"; @@ -156491,7 +167322,7 @@ self: { mkDerivation { pname = "selinux"; version = "0.1.1"; - sha256 = "1c2397bf95f960a9d8f7863f7d201e62364ee8e41f462b8bfa6c7831a0e214e4"; + sha256 = "1r0lwah32y3cza5jnihzwkl4wdk23qh7sgw6yzcajq7rjnzrf8qw"; libraryHaskellDepends = [ base unix ]; librarySystemDepends = [ selinux ]; homepage = "https://github.com/luite/selinux"; @@ -156505,7 +167336,7 @@ self: { mkDerivation { pname = "semaphore-plus"; version = "0.1"; - sha256 = "79b6e5761389388f20ea9203e63725f0d57a0600a2acd848f7aa87a4e5bf898c"; + sha256 = "1349pzjs91xayx4dib520037mmgh4lvyc0wjx8h8yf492dvfbdkr"; libraryHaskellDepends = [ base ]; description = "Various concurrency abstractions built on top of semaphores"; license = stdenv.lib.licenses.bsd3; @@ -156519,7 +167350,7 @@ self: { mkDerivation { pname = "semdoc"; version = "0.1.3"; - sha256 = "2bf204ebae0f1592ed192cd2ca288052d536e9da14102ebbafd74105f3515c58"; + sha256 = "0n2wa7rhahfpmyxjw40lvblkdmajh0lcmlic37nr458gmvmh9wib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156540,7 +167371,7 @@ self: { mkDerivation { pname = "semi-iso"; version = "1.0.0.0"; - sha256 = "afd4df10cef4202cc7bfe0c933ba26e699c37e23f31954c0b48b343fa1790c26"; + sha256 = "09hcg6hkyd4bnk0586gk4dzc76g64sx37jg0pz3jq87lrq8dzm5g"; libraryHaskellDepends = [ base lens profunctors semigroupoids transformers tuple-morph ]; @@ -156554,7 +167385,7 @@ self: { mkDerivation { pname = "semibounded-lattices"; version = "0.1.0.1"; - sha256 = "6a5ee4b2e956ecf62492f4cdfb26000067f2d92d4d745ad47b9b60c800ac1d77"; + sha256 = "0xqxmh0chq4vgga5lx2d5pcz4rq000kgpkglj8jgdv2nx6rf8pka"; libraryHaskellDepends = [ base containers lattices ]; testHaskellDepends = [ base ]; homepage = "https://github.com/xu-hao/semibounded-lattices#readme"; @@ -156567,7 +167398,7 @@ self: { mkDerivation { pname = "semigroupoid-extras"; version = "5"; - sha256 = "102e33b55cc3b15a1b714825a3703f3fc2bb09d8038404af442d35c0ac0c3832"; + sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh"; libraryHaskellDepends = [ base profunctors semigroupoids ]; homepage = "http://github.com/ekmett/semigroupoid-extras"; description = "Semigroupoids that depend on PolyKinds"; @@ -156582,7 +167413,7 @@ self: { mkDerivation { pname = "semigroupoids"; version = "5.1"; - sha256 = "16ac8ce9b40b0407cdb1b1197a704ec58ec689d5a6de891165a577725361f835"; + sha256 = "0dgqc59p4xx5cl8qkpm6sn4wd3n59rq7l6din76hf10bnklqrb0n"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive semigroups tagged transformers transformers-compat @@ -156593,6 +167424,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_2" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, semigroups, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.2"; + sha256 = "1g4ifzwsdpbkq50xrpd03vbdb75s5nwwmvb8xy2jpp509j0ghmyr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive semigroups tagged transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -156601,7 +167453,7 @@ self: { mkDerivation { pname = "semigroupoids-syntax"; version = "0.0.1"; - sha256 = "f0938dba523273496e9e95f72c807c1ad6474b4d93f09e7013c8b2f5b8f76be4"; + sha256 = "1r3byywgbcn82dq9xw4k9m5lgmhsgj02rxwmkrp4jwrjaax8v4zh"; libraryHaskellDepends = [ base comonad containers contravariant distributive semigroupoids semigroups transformers @@ -156620,19 +167472,32 @@ self: { mkDerivation { pname = "semigroups"; version = "0.18.2"; - sha256 = "5dc9ff8622af25412fb071098063da288cd408a844e67c3371b78daa86d5d0e4"; + sha256 = "1r6hsn3am3dpf4rprrj4m04d9318v9iq02bin0pl29dg4a3gzjax"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/semigroups/"; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; }) {}; + "semigroups_0_18_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "semigroups"; + version = "0.18.3"; + sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/ekmett/semigroups/"; + description = "Anything that associates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroups-actions" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { pname = "semigroups-actions"; version = "0.1"; - sha256 = "0bc3b74e14ef6f214f1aebee98ddadde9cca08753969112219fc6bc8da16da6e"; + sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb"; libraryHaskellDepends = [ base containers semigroups ]; homepage = "http://github.com/ppetr/semigroups-actions/"; description = "Semigroups actions"; @@ -156645,7 +167510,7 @@ self: { mkDerivation { pname = "semiring"; version = "0.3"; - sha256 = "befab81cfef9ae6499f44fdd93a2bc892f118b335462bcf2010aba4254f1a6ac"; + sha256 = "1b56y5a45fha07rbqqjl6f5i2bw9pji97pagyjcn9bprzqfbiymy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Boolean containers monoids ]; @@ -156662,7 +167527,7 @@ self: { mkDerivation { pname = "semiring-num"; version = "1.1.0.1"; - sha256 = "49702af909207e5025b06ebb8f597e2334feeb7c040ffb774d8f6630ceac3678"; + sha256 = "0y1nmk730rlg9mvzn3q4gkmzwd13grcqzfvfn0jm0zi017wjlw29"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base containers doctest nat-sized-numbers QuickCheck smallcheck @@ -156678,7 +167543,7 @@ self: { mkDerivation { pname = "semiring-simple"; version = "1.0.0.1"; - sha256 = "c08d1b533f4559fc55119f563a6cf3d74ad7c6f5916c2efe00b50d2a5169fd28"; + sha256 = "0a7xd58jl3dm03z2wv4iyp3dfjnpydn3lmlz25azqna57x9ip3f0"; libraryHaskellDepends = [ base ]; description = "A module for dealing with semirings"; license = stdenv.lib.licenses.bsd3; @@ -156691,7 +167556,7 @@ self: { mkDerivation { pname = "semver"; version = "0.3.3.1"; - sha256 = "36d3369706836d60f3bc517f30c6860734481866363723904b8768823b6bc8b1"; + sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn"; libraryHaskellDepends = [ attoparsec base deepseq text ]; testHaskellDepends = [ base tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion text ]; @@ -156707,7 +167572,7 @@ self: { mkDerivation { pname = "semver-range"; version = "0.2.2"; - sha256 = "45b71ed50c94effdafa31f3b162e3de83eda9fb7b818910ac63dfab7e2a3b466"; + sha256 = "0rmllgibgyixqq59265qnygxlgp87lp1cfqzlfpzvvwl1kaixds5"; libraryHaskellDepends = [ base classy-prelude parsec text unordered-containers ]; @@ -156725,7 +167590,7 @@ self: { mkDerivation { pname = "sendfile"; version = "0.7.9"; - sha256 = "102fdf6db8c00f5a5981c6eed5acba1368a2d79b2970ce5b22ceb180aa0fdc42"; + sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh"; libraryHaskellDepends = [ base bytestring network ]; homepage = "http://hub.darcs.net/stepcut/sendfile"; description = "A portable sendfile library"; @@ -156739,7 +167604,7 @@ self: { mkDerivation { pname = "sendgrid-haskell"; version = "1.0"; - sha256 = "977ad1e70dfe9e0c94a300ff3f41851294c5743a57f97cae7654dd24095bba4c"; + sha256 = "0k5sbc4j9palfsp7ryap79scb50jhm0kzzq0lfa0r7py1pkx2ylp"; libraryHaskellDepends = [ aeson base bytestring containers exceptions http-conduit monad-control text transformers @@ -156758,7 +167623,7 @@ self: { mkDerivation { pname = "sensei"; version = "0.2.0"; - sha256 = "aa38cfab092cbb256ea8a4a64cd171fe241b7a7f964bd13bf1b6e402327cf4b0"; + sha256 = "1c7lghr05r5ny4xx2jwngxx1n97yf78lr9m4m1p2bfrc16mwyf5a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156785,7 +167650,7 @@ self: { mkDerivation { pname = "sensenet"; version = "0.1.0.0"; - sha256 = "e1c2bb14157f376bf5af833688619d05bd470b3dafede531efcbb7e69e0df0fb"; + sha256 = "1yzh1ngfddybxwqybvdg7l5lgg85kmhqhdl3mzsnndvz2labphp1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156797,12 +167662,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sensu-run" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, http-client + , http-types, lens, network, optparse-applicative, process + , temporary, text, time, unix, vector, wreq + }: + mkDerivation { + pname = "sensu-run"; + 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 unix vector wreq + ]; + homepage = "https://github.com/maoe/sensu-run#readme"; + description = "A tool to send command execution results to Sensu"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sentence-jp" = callPackage ({ mkDerivation, base, mecab, random-shuffle, text, transformers }: mkDerivation { pname = "sentence-jp"; version = "0.1.0.0"; - sha256 = "bd981e0416e4c013ef4cf8cf3edc6c6d442e27628ef39c32875220d19dd81fc9"; + sha256 = "1j8zv2fx282jhwr9rwwfc8kjwi3ddkf3xkzq9kpi7h742q21x65x"; libraryHaskellDepends = [ base mecab random-shuffle text transformers ]; @@ -156820,7 +167705,7 @@ self: { mkDerivation { pname = "sentry"; version = "0.1.0"; - sha256 = "1d6bdcb1a37f6bc11a96c46e35c1e659eb853c97d0e8e5c4223d8da36ba364cf"; + sha256 = "1kv4ldms739x4b2fbs6hjwy8bssrwv0kavn4jqdc2svzlfqxqsqx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156839,7 +167724,7 @@ self: { mkDerivation { pname = "senza"; version = "0.1"; - sha256 = "10242178d5b2a59de08c1b16fa7ffba8eb370b95795a47a5fabf119e346b875e"; + sha256 = "0pl7dcs9w4dzzajlfnkrjl5kgsx8zdzzl5hvikh9v9djsmw2290h"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -156853,7 +167738,7 @@ self: { mkDerivation { pname = "separated"; version = "0.1.2"; - sha256 = "955cd8d5a41804dd32918ffdd3175d16c9274a120f7beaa7eef871b8af590443"; + sha256 = "0hq4b6pvhwgqxskylyqg2952gj8nblbx7zcgj4rds10qlkaxhp4m"; libraryHaskellDepends = [ base bifunctors lens papa semigroupoids semigroups ]; @@ -156875,7 +167760,7 @@ self: { mkDerivation { pname = "seqaid"; version = "0.4.0.0"; - sha256 = "16a7b7e01ca70a2062c4f1cd18485f609561c35ed803ca95c414841f66ffbf4e"; + sha256 = "0kmzzxk1z10lqjawl0yqbv1n35b0bx41ikgiqii202m73khbg9qn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156897,7 +167782,7 @@ self: { mkDerivation { pname = "seqalign"; version = "0.2.0.4"; - sha256 = "4ea194658d865890157d3df882ed21b0c089cdff7f80ea613ae25c5f3d744305"; + sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af"; libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; @@ -156909,7 +167794,7 @@ self: { mkDerivation { pname = "seqid"; version = "0.1.0"; - sha256 = "c0d3be7fe6ce3395db637e4567345aeb0c54782cf1e76c40c2116e9527d2bb60"; + sha256 = "0q5vs8kravhiq906rrzi5iw5837bb8s6fibycgdracyfwrzvxly0"; libraryHaskellDepends = [ base transformers ]; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; @@ -156921,7 +167806,7 @@ self: { mkDerivation { pname = "seqid"; version = "0.5.1"; - sha256 = "cea36ce861a457efe5854b3ae9ffef9fc95ea32f14c34e577e5e3d84a5f86695"; + sha256 = "15b6z2jq8gaygrblxhql5yimxjczxzzyjfjbhpjyymx4c7l6r8yf"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/LukeHoersten/seqid"; description = "Sequence ID production and consumption"; @@ -156933,7 +167818,7 @@ self: { mkDerivation { pname = "seqid-streams"; version = "0.1.0"; - sha256 = "a299e90a0124e585ccf66feb25206b61c9af8712d95ffb1b266b504fcd61e08d"; + sha256 = "13g0c76lyl3b4qdznpyr2a3szjb1dch2bsvgyv68br94045fk6d2"; libraryHaskellDepends = [ base io-streams seqid ]; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; @@ -156944,8 +167829,8 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.5.0"; - sha256 = "3b553c7bf0ae0ce770e70ab970739fe815831d025c6cc32d7c351b710a9de2a6"; + version = "0.6.1"; + sha256 = "17chhnyfzjn6lkd9b1ilz9s0swayhwplawhwnmnjfbk8fgybc6fd"; libraryHaskellDepends = [ base io-streams seqid ]; homepage = "https://github.com/LukeHoersten/seqid-streams"; description = "Sequence ID IO-Streams"; @@ -156959,7 +167844,7 @@ self: { mkDerivation { pname = "seqloc"; version = "0.6.1.1"; - sha256 = "4435e76ba86417612b6bd6a173dc99444d5fe9184a9822b1edf13c808d4f55c3"; + sha256 = "1hsm9y6q0g7ixnqj562a33lmyka4k7f778fndcmn25v4m1myfda4"; libraryHaskellDepends = [ attoparsec base biocore bytestring hashable unordered-containers vector @@ -156983,7 +167868,7 @@ self: { mkDerivation { pname = "seqloc-datafiles"; version = "0.4.2"; - sha256 = "4ae6868b23900be02f7ea72555609ea7453b6a25c07c1b752f5d6dd1a38bb69c"; + sha256 = "175nifix2vax5xsinz604mm3nid7krh5a9d7gqpy02wh4f5qdrja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157013,7 +167898,7 @@ self: { mkDerivation { pname = "sequence"; version = "0.9.8"; - sha256 = "50cb62a24e07849f5dbba389ef76f57c656a36a58029e9ef0409aab928f0dd2b"; + sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh"; libraryHaskellDepends = [ base containers transformers ]; homepage = "https://github.com/atzeus/sequence"; description = "A type class for sequences and various sequence data structures"; @@ -157025,7 +167910,7 @@ self: { mkDerivation { pname = "sequent-core"; version = "0.5.0.1"; - sha256 = "cd0a56a9fad3b7b0f53fd2e913f16a7d3c9472d0925f2ec56ed0da6c41ce39e1"; + sha256 = "1q9rrr0nrnnhdv2jwpwjs1r98g3xdbqi7sfj7zsv1dykzalmc2nd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157042,7 +167927,7 @@ self: { mkDerivation { pname = "sequential-index"; version = "0.2.0.1"; - sha256 = "c60f94e2d49b9344d2dba3ff023918689fbfd77fd3907561ee7aa7d267b6a76d"; + sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/aristidb/sequential-index"; description = "Sequential numbers that allow arbitrarily inserting numbers - for containers"; @@ -157056,7 +167941,7 @@ self: { mkDerivation { pname = "sequor"; version = "0.7.5"; - sha256 = "49165162d900370db64027b1444de2f64c021ff87e4e1af82449ae39c0b591b5"; + sha256 = "1dcinp03kbj94kw1lkkyz0gh4k7nw96l9c9782v0sdq0v5i525j9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157080,7 +167965,7 @@ self: { mkDerivation { pname = "serf"; version = "0.1.1.0"; - sha256 = "d6c9c6ddf99a2119c6686732caf9f04ef8e9c4df5519a8bbd4ac7f5531d4c067"; + sha256 = "0ry0shqmazxcsjxsh6amvz2fky2fy3wwlck7d331j8csz7fwdjfn"; libraryHaskellDepends = [ attoparsec base conduit conduit-extra mtl operational process resourcet text @@ -157095,7 +167980,7 @@ self: { mkDerivation { pname = "serial"; version = "0.2.7"; - sha256 = "d86de1e1f465f308737aaf081a5e82d108987880f1147ccaad0a2e242282a2c0"; + sha256 = "1h52h8i28bhamp57q57ih1w9h26ih9g1l25gg9rhiwv5ykhy2vfq"; libraryHaskellDepends = [ base unix ]; description = "POSIX serial port wrapper"; license = "LGPL"; @@ -157108,7 +167993,7 @@ self: { mkDerivation { pname = "serial-test-generators"; version = "0.1.3"; - sha256 = "5af96e02de6f1b09a83c52fd49c7f3dc2993eb7ed8ed75b7a8d4ca2191df3133"; + sha256 = "0crivy8j3jnlm2vpbvfqgvmr6afwyg3lkzaj7jl0j6vgvq16xyas"; libraryHaskellDepends = [ aeson base binary bytestring cereal here ]; @@ -157127,9 +168012,9 @@ self: { mkDerivation { pname = "serialize-instances"; version = "0.1.0.0"; - sha256 = "9c3207fc4cad06fbe76c860820fc48f967494b73ce892efe997723c34b9308d5"; + sha256 = "1m88jd5w68vpk7z2x2fffd5ljrzr93y20246dkkzn1md9ky0fclw"; revision = "2"; - editedCabalFile = "f95554330e4ab10ef1c1a3f291f41ce19bfa4be3c056466a410fbc0f980977c9"; + editedCabalFile = "1jbp16c0zg0g85m4cmn0wd5zm6z13ks93wm3q7qhxcaa1qrm8mgr"; libraryHaskellDepends = [ base cereal hashable semigroups unordered-containers ]; @@ -157142,7 +168027,7 @@ self: { mkDerivation { pname = "serialport"; version = "0.4.7"; - sha256 = "077c210212ff92611b3d8a3578f3ea1f78586c094057ccc5d1dcc3170fcf4dfc"; + sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; homepage = "https://github.com/jputcu/serialport"; @@ -157163,8 +168048,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.4.0"; - sha256 = "ab37e7b6833fa3499501c82133dfd640875326c1b0ba96df3cf7b0380c2215cf"; + version = "0.1.5.3"; + sha256 = "05iwdmwq6fg4bq1nmmi19dax3rnjjxwbn6l5ff9fbs794qzmb704"; libraryHaskellDepends = [ acid-state aeson aeson-extra ansi-terminal base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -157193,7 +168078,7 @@ self: { mkDerivation { pname = "serpentine"; version = "0.2"; - sha256 = "7b0ba5ca3e3612c824dcdf108a63b641484d9b37f9c80b21a3463245e54dedf2"; + sha256 = "1wpd9pjlacj6lchhpj7r6ydlsj21nriql46zvhjch4in7v5aa2vv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157211,7 +168096,7 @@ self: { mkDerivation { pname = "serv"; version = "0.2.0.0"; - sha256 = "f2d67e80baba2120a7df88ca40d62705b60798214439a235947bce4c3ce783cf"; + sha256 = "1kw3wwy4rkkvjhss4fa446c0gdh54zb41jl8vykj08dspa07xmpj"; libraryHaskellDepends = [ base containers http-kinder singletons text ]; @@ -157231,7 +168116,7 @@ self: { mkDerivation { pname = "serv-wai"; version = "0.2.0.0"; - sha256 = "fc3eb3411239e2c88d79e8f2a709081dd6b5568c95233045c24213bb953cc7b2"; + sha256 = "1cn77javn4s2q92k08wmiibbbmhx104sgwp8g66wiqir290v6gpw"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-kinder http-media http-types mmorph mtl serv singletons tagged text time @@ -157257,9 +168142,9 @@ self: { mkDerivation { pname = "servant"; version = "0.9.1.1"; - sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa"; + sha256 = "1yp5qj255ym64zl5lkabiwqlijcq7pid1k4m2smxy1xbfvv74czv"; revision = "1"; - editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d"; + editedCabalFile = "0kfy554fwl2skdb6cagrpbypg7jv15rf6bspyivdqr34dvpr7gm9"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive http-api-data http-media http-types mmorph mtl network-uri @@ -157275,22 +168160,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_10" = callPackage + "servant_0_11" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , bytestring, Cabal, case-insensitive, directory, doctest - , filemanip, filepath, hspec, http-api-data, http-media, http-types - , mmorph, mtl, natural-transformation, network-uri, QuickCheck - , quickcheck-instances, string-conversions, text, url, vault + , bytestring, Cabal, cabal-doctest, case-insensitive, directory + , doctest, filemanip, filepath, hspec, http-api-data, http-media + , http-types, mmorph, mtl, natural-transformation, network-uri + , QuickCheck, quickcheck-instances, string-conversions, tagged + , text, url, vault }: mkDerivation { pname = "servant"; - version = "0.10"; - sha256 = "e1daa9ba2b759615341345a17a95833729ae3200af12dacec07507a95a4b331e"; - setupHaskellDepends = [ base Cabal directory filepath ]; + version = "0.11"; + sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5"; + revision = "1"; + editedCabalFile = "1az9id2dl7psc8lknf7y9cvzkivcjzw7g27yyp40flb6bfvmaqp3"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive http-api-data http-media http-types mmorph mtl - natural-transformation network-uri string-conversions text vault + natural-transformation network-uri string-conversions tagged text + vault ]; testHaskellDepends = [ aeson aeson-compat attoparsec base base-compat bytestring directory @@ -157309,10 +168198,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.2"; - sha256 = "34ed22ef256d7ff3af3fff56484261448928f140b1b4287965619fe6b10b3ebd"; - revision = "1"; - editedCabalFile = "896414688b7da96443399f111448da3cb7861618eab516590dce96e394c744ea"; + version = "0.3.0.3"; + sha256 = "0kb53kla03clkv0686awjm6nc57r5yw0zmfs02036iplq6cc1yb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157335,7 +168222,7 @@ self: { mkDerivation { pname = "servant-aeson-specs"; version = "0.5.2.0"; - sha256 = "2728ee897c7920423ab730cb32d64defc0784d7226ff95733c72aa142121f2dd"; + sha256 = "1pgj44hi9akj7irrbzr6f96pih7g9pb35jrhnwx4483rgj4ywa17"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -157357,8 +168244,8 @@ self: { ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: mkDerivation { pname = "servant-auth"; - version = "0.2.6.0"; - sha256 = "ca70089cb1560dc8b990437c3eb6ff4a8cea0aba387fc7cb7ef1bd0b9f17113d"; + version = "0.2.7.0"; + sha256 = "0j0hfal64qjdbif9a6vy7dv4zn0pmkspn0pwafhsyh5adgqkrhxa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; @@ -157374,8 +168261,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.2.6.0"; - sha256 = "928cd5a1e546e38f76f161332ea6591f885d62c052fd8a6cee5e4e22f35e5c36"; + version = "0.2.7.1"; + sha256 = "1y5ha76j81biyzzgl9r26i0hkx1j3yslidzyl5h8xz55y712m16d"; libraryHaskellDepends = [ base bytestring servant servant-auth servant-client text ]; @@ -157399,8 +168286,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4.3.3"; - sha256 = "40376b033b2bd4d78ad327d0b83c2d2dcce05406fb5fbb4fd49e306f30dfee10"; + version = "0.4.4"; + sha256 = "1jnlbljv6d484jzx9vympirmzvvqi2b1638b4155868vnz8sfjby"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157419,14 +168306,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 + , QuickCheck, servant, servant-server, tagged, time, transformers + , wai + }: + mkDerivation { + pname = "servant-auth-cookie"; + version = "0.5.0.5"; + sha256 = "1ml7f452ikfwzymvajrs0fmlww7pbq5prphsv65r12n4pzx9ynva"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-api-data http-types memory + mtl servant servant-server tagged time transformers wai + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite servant-server + ]; + description = "Authentication via encrypted cookies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-docs" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck , servant, servant-auth, servant-docs, text, yaml }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.6.0"; - sha256 = "333d3fabb345a2892aa803e5e5558356a66382032693d68e762fb95dd75cb4b2"; + version = "0.2.7.0"; + sha256 = "1ip46fbj39dnvvz9c2rgxparl2x9gafxdnvz39hyi9q82fz9ygx5"; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text ]; @@ -157452,7 +168369,7 @@ self: { mkDerivation { pname = "servant-auth-hmac"; version = "0.1.0.1"; - sha256 = "ca7ee1d75e290c5e120083e3ae765033da76dbc5e0be7e00f2c586a948bdfc9f"; + sha256 = "17zwpm4ak1n5y807xgp0qpdpdnika1vaxqw30095w319bvby2zna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157476,88 +168393,67 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-auth-server_0_2_1_0" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, bytestring-conversion, case-insensitive, cookie - , crypto-api, data-default-class, entropy, hspec, http-api-data - , http-client, http-types, jose, lens, lens-aeson, markdown-unlit - , monad-time, mtl, QuickCheck, servant-auth, servant-server, text - , time, transformers, unordered-containers, wai, warp, wreq - }: - mkDerivation { - pname = "servant-auth-server"; - version = "0.2.1.0"; - sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data jose lens monad-time mtl - servant-auth servant-server text time unordered-containers wai - ]; - executableHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data jose lens markdown-unlit - monad-time mtl servant-auth servant-server text time transformers - unordered-containers wai warp - ]; - testHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy hspec http-api-data http-client - http-types jose lens lens-aeson monad-time mtl QuickCheck - servant-auth servant-server text time unordered-containers wai warp - wreq - ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; - description = "servant-server/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-auth-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, bytestring-conversion, case-insensitive, cookie , crypto-api, data-default-class, entropy, hspec, http-api-data , http-client, http-types, jose, lens, lens-aeson, markdown-unlit - , monad-time, mtl, QuickCheck, servant-auth, servant-server, text - , time, transformers, unordered-containers, wai, warp, wreq + , monad-time, mtl, QuickCheck, servant-auth, servant-server, tagged + , text, time, transformers, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.6.0"; - sha256 = "d78ab2c470731d2e18f19c2b45b8cc398541cda56ba947cdb032081737c55ea8"; + version = "0.3.0.0"; + sha256 = "1rs51w929hlwsgrg5ajcv3cp09hnk37p1n5s2ydmja22m4ba93ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api data-default-class entropy http-api-data http-types jose lens - monad-time mtl servant-auth servant-server text time + monad-time mtl servant-auth servant-server tagged text time unordered-containers wai ]; executableHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api data-default-class entropy http-api-data http-types jose lens - markdown-unlit monad-time mtl servant-auth servant-server text time - transformers unordered-containers wai warp + markdown-unlit monad-time mtl servant-auth servant-server tagged + text time transformers unordered-containers wai warp ]; testHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api data-default-class entropy hspec http-api-data http-client http-types jose lens lens-aeson monad-time mtl QuickCheck - servant-auth servant-server text time unordered-containers wai warp - wreq + servant-auth servant-server tagged text time unordered-containers + wai warp wreq ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-swagger" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck + , servant, servant-auth, servant-swagger, swagger2, text, yaml + }: + mkDerivation { + pname = "servant-auth-swagger"; + version = "0.2.7.0"; + sha256 = "0rg8j50hp6wb5mwrsd495gp6qrl29h0r5k54b9zb6663isimbmr2"; + libraryHaskellDepends = [ + base lens servant servant-auth servant-swagger swagger2 text + ]; + testHaskellDepends = [ + base doctest Glob hspec lens QuickCheck servant servant-auth + servant-swagger swagger2 text yaml + ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "servant-swagger/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl , pwstore-fast, servant-auth-token-api, servant-server, text, time @@ -157565,8 +168461,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.4.1.1"; - sha256 = "06a2f6928bd558ad6d22542bf212ac0acdb60d68febe70eab917d37812bb3e84"; + 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 @@ -157586,8 +168482,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.4.1.0"; - sha256 = "517d4e084cd0884ec1931f2fbe19039c7af16e14b86bf36aeddde844bdbc3354"; + 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 @@ -157606,8 +168502,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.0.1"; - sha256 = "0850d95cc86d0893069887f2e30ed0cb22eef0bdf7f82a6d28e1c51f551e3d83"; + version = "0.4.2.2"; + sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -157618,21 +168514,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-leveldb" = callPackage + ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra + , containers, exceptions, lens, leveldb-haskell, monad-control, mtl + , resourcet, safe, safecopy-store, servant-auth-token + , servant-auth-token-api, servant-server, store, text, time + , transformers, transformers-base, uuid, vector + }: + mkDerivation { + pname = "servant-auth-token-leveldb"; + version = "0.4.2.1"; + sha256 = "0i7h05jsc0r644prgifbvj7xrjpr7qsmwhqcc93p33f1wznn9h5n"; + libraryHaskellDepends = [ + aeson-injector base bytestring concurrent-extra containers + exceptions lens leveldb-haskell monad-control mtl resourcet safe + safecopy-store servant-auth-token servant-auth-token-api + servant-server store text time transformers transformers-base uuid + vector + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Leveldb backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-token-persistent" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers - , ghc-prim, monad-control, mtl, persistent, persistent-postgresql - , persistent-template, servant-auth-token, servant-auth-token-api - , servant-server, text, time, transformers, transformers-base, uuid + , monad-control, mtl, persistent, persistent-template + , servant-auth-token, servant-auth-token-api, servant-server, text + , time, transformers, transformers-base, uuid }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.4.0.0"; - sha256 = "8b2a6cbc45e3f52ac5d12cd05c052373ca758599672b6086b3148e0dd5f9a075"; + version = "0.5.1.1"; + sha256 = "09np7cilm1ij7ra06zyx7wqcm8ynras0q6fsfkkklpr5w632ifh1"; libraryHaskellDepends = [ - aeson-injector base bytestring containers ghc-prim monad-control - mtl persistent persistent-postgresql persistent-template - servant-auth-token servant-auth-token-api servant-server text time - transformers transformers-base uuid + aeson-injector base bytestring containers monad-control mtl + persistent persistent-template servant-auth-token + servant-auth-token-api servant-server text time transformers + transformers-base uuid ]; homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Persistent backend for servant-auth-token server"; @@ -157640,14 +168560,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-rocksdb" = callPackage + ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra + , containers, exceptions, lens, monad-control, mtl, resourcet + , rocksdb, safe, safecopy-store, servant-auth-token + , servant-auth-token-api, servant-server, store, text, time + , transformers, transformers-base, uuid, vector + }: + mkDerivation { + pname = "servant-auth-token-rocksdb"; + version = "0.4.2.1"; + sha256 = "0zl5xr12pnz99798pz1rn6q2msir57df97h6xayj3167zmmdv2fy"; + libraryHaskellDepends = [ + aeson-injector base bytestring concurrent-extra containers + exceptions lens monad-control mtl resourcet rocksdb safe + safecopy-store servant-auth-token servant-auth-token-api + servant-server store text time transformers transformers-base uuid + vector + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "RocksDB backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {rocksdb = null;}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; version = "0.7.1"; - sha256 = "90ed1c7a22b83bee344ef3896203f3699b7633bf986ffa064752c3596c072646"; - revision = "4"; - editedCabalFile = "cae733c4dbe8faa35b4f8fdfc5984ef6c01c653c056c799f7fd225a54c9b9b9f"; + sha256 = "0ii60xn5khsj8w3glvwqpwrpd6v9yc1n52gk9qsfwfxq49x1rvch"; + revision = "5"; + editedCabalFile = "05zz0kvnmai230palf44f72gm1vadqyssk9hl4h0qq5263frbsli"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Blaze-html support for servant"; @@ -157659,15 +168603,57 @@ self: { mkDerivation { pname = "servant-cassava"; version = "0.8"; - sha256 = "5d9b85f7dc2fc42c7fe47bf92e4502e4ff5dde03724a6ee6ab20887524dce4fb"; + sha256 = "1yz4vhj7b210mgk6wjkj0gg5vzz4092jxybvwizjri1gvkvqb6sx"; revision = "2"; - editedCabalFile = "4b6443d2de0087bed78cd5a0238b7483c5ef75dc72ecac43a45d47522134857a"; + editedCabalFile = "0yl56hhm4isxli1srv3jvisyzic3fj5j786mikbvx1q0vv946r2b"; libraryHaskellDepends = [ base cassava http-media servant vector ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant CSV content-type for cassava"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-cassava_0_9" = callPackage + ({ mkDerivation, base, base-compat, bytestring, cassava, http-media + , servant, vector + }: + mkDerivation { + pname = "servant-cassava"; + version = "0.9"; + sha256 = "08g1yjrfx2q79r0ldjnxr05437bg889virfy52i3s66d5h69d9q3"; + libraryHaskellDepends = [ + base base-compat bytestring cassava http-media servant vector + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Servant CSV content-type for cassava"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-checked-exceptions" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob + , hspec-wai, http-media, profunctors, servant, servant-client + , servant-docs, servant-server, tagged, tasty, tasty-hspec + , tasty-hunit, text, wai + }: + mkDerivation { + pname = "servant-checked-exceptions"; + version = "0.4.0.0"; + sha256 = "10visfbj6zjf8b78hzq8c2xb9psdjzq6amqr5wkgbm6qanjab8kd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring deepseq http-media profunctors servant + servant-client servant-docs servant-server tagged text + ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec-wai servant servant-server tasty + tasty-hspec tasty-hunit wai + ]; + homepage = "https://github.com/cdepillabout/servant-checked-exceptions"; + description = "Checked exceptions for Servant APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, deepseq, exceptions, hspec @@ -157679,9 +168665,9 @@ self: { mkDerivation { pname = "servant-client"; version = "0.9.1.1"; - sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724"; + sha256 = "0967k5xnphiq6p7s9a8qxgvzzj77nsbipinyzxvb1jlf3am5y23f"; revision = "1"; - editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5"; + editedCabalFile = "1ic2m9pm1id250dszlh4dy5pxf5kza7ps8vnc3wfpmhxn78p5b6k"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring exceptions http-api-data http-client http-client-tls http-media @@ -157698,7 +168684,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_10" = callPackage + "servant-client_0_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, deepseq, exceptions, generics-sop , hspec, http-api-data, http-client, http-client-tls, http-media @@ -157709,8 +168695,10 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.10"; - sha256 = "55e411ac7e38a5c1b77d8d3c2320369be36a7b7181e27bb5ac4fba308ef93eaa"; + 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 @@ -157739,7 +168727,7 @@ self: { mkDerivation { pname = "servant-csharp"; version = "0.0.8.1"; - sha256 = "a715c53a3684f1e7f33d96f6b3fad006edfce6c029eb810d33647ffc180c097d"; + sha256 = "0z891hcgqzv46c6q3sr9q3kgrv86s3xb7xln7prygwc46qxca5d7"; libraryHaskellDepends = [ aeson base bytestring directory filepath heredocs http-types lens mtl servant servant-foreign servant-swagger swagger2 text time @@ -157756,7 +168744,7 @@ self: { mkDerivation { pname = "servant-db"; version = "0.2.0.1"; - sha256 = "99c618f6be7a7bc58217cc209b395cbcdd1a9cd573f484ee96b1835dd96dda8a"; + sha256 = "12nsdpcmv0xijvp89x3ksnf1mpdwbhwrn86c2y1cayvspvv1iilr"; libraryHaskellDepends = [ base servant ]; description = "Servant types for defining API with relational DBs"; license = stdenv.lib.licenses.bsd3; @@ -157770,8 +168758,8 @@ self: { }: mkDerivation { pname = "servant-db-postgresql"; - version = "0.2.1.0"; - sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071"; + version = "0.2.2.0"; + sha256 = "101fl8bpa6xw79h9b17q3g5fcbl0p9chcqyvqwzai0a95x2qlwgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157783,6 +168771,7 @@ self: { optparse-applicative postgresql-query QuickCheck quickcheck-instances servant-db text time transformers-base ]; + homepage = "https://github.com/NCrashed/servant-db-postgresql"; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157797,7 +168786,7 @@ self: { mkDerivation { pname = "servant-docs"; version = "0.9.1.1"; - sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79"; + sha256 = "0ydwd3jqbhss0i0l67ib082pscsq7qn88qhy49an74mabk90ahkw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157817,7 +168806,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "servant-docs_0_10" = callPackage + "servant-docs_0_10_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, hspec , http-media, http-types, lens, servant, string-conversions, text @@ -157825,8 +168814,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.10"; - sha256 = "0a471acc5a292ed48be2c7f1a22e15c5685c1a1049f99834a56619d7c836603b"; + version = "0.10.0.1"; + sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157854,7 +168843,7 @@ self: { mkDerivation { pname = "servant-ede"; version = "0.6"; - sha256 = "a091b69bf4c5762ab90d9d8a31ed88eb88baa23c4586356e11717f334a24ce28"; + sha256 = "0a6f4i536zvi25p3b1j57jibm27bi3nk32lx1nwjlxn5yjdvd4d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157878,7 +168867,7 @@ self: { mkDerivation { pname = "servant-ekg"; version = "0.2.0.0"; - sha256 = "02b54e60e87e5a6c9879fdd1f9a7924b1d16c667b81464d8f3b9ec1c7d693ab3"; + sha256 = "1crsd5yirv5rygc6855qcz31c7abjakzklgxg6c6qnkyx1h4xd82"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157902,7 +168891,7 @@ self: { mkDerivation { pname = "servant-elm"; version = "0.4.0.1"; - sha256 = "69b3a5dcbb680fc1e923d76afa8255987d4613e0d4387eb493de071c9842ffc5"; + sha256 = "1igz8ac1q1yyjfs7wf6lw09lczcqan1glsnp4glw23v8pgfabcv9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157925,7 +168914,7 @@ self: { mkDerivation { pname = "servant-examples"; version = "0.4.4.7"; - sha256 = "1631cec84ab494f057df309b4bdd32a04066e1305d64bddfac24ceb2128e5516"; + sha256 = "05jmiq9b5ki4mkgvsr2x63hnch506bflp6rhvxbz155l9b4cwc8n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -157945,19 +168934,19 @@ self: { mkDerivation { pname = "servant-foreign"; version = "0.9.1.1"; - sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca"; + sha256 = "1jn9lwyvv7iv2yg0qj9702f41271835d3j39k80g6gkvr53az6ys"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_10" = callPackage + "servant-foreign_0_10_1" = callPackage ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.10"; - sha256 = "14a589afcc36aac7023a552c07862fe72d35d04571a704d51fc7db17ae0c2f25"; + version = "0.10.1"; + sha256 = "1j69mv1i6q5z790asbj0n24h62biz3dlnm2zrxnmwn4k4aygbwl8"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec servant ]; description = "Helpers for generating clients for servant APIs in any programming language"; @@ -157965,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 @@ -157973,7 +168974,7 @@ self: { mkDerivation { pname = "servant-github"; version = "0.1.0.4"; - sha256 = "d6d34e7c3568c57cdb24ab4dc3fd5ad837288fb927aef833096ff708af2734d0"; + sha256 = "1l1l4yphixvg14rzibi7p67jhdyqbbyw6kdb4kdprib86my4xlyn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157996,7 +168997,7 @@ self: { mkDerivation { pname = "servant-github-webhook"; version = "0.3.0.2"; - sha256 = "06dceb189088b80e2b428572c6a7334dbf1557f7c208190ccd944273626079b9"; + sha256 = "1fbrc1i76hllrl61j262yxbibgsd6fkwcwl588mhxf48j0cfpp06"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Crypto github http-types servant servant-server string-conversions text transformers wai @@ -158020,9 +169021,9 @@ self: { mkDerivation { pname = "servant-haxl-client"; version = "0.2.0.0"; - sha256 = "673f535649f796b984d051e4353e11943f2149ddeee6c8187a03a8b8eb10a16c"; + sha256 = "0v5123mvia03g8ccirpfvm4j2gwl24z3br2is22bk5pp95b56gv7"; revision = "2"; - editedCabalFile = "adc963ee3fad0dd9992036ca4dc196be410c265a7a3b3d500bdebedd4a6a1002"; + editedCabalFile = "00hhd95dvgny1d83sfvsb8k0qhdyjv0lvjin42cxj3dd7zp67jdd"; libraryHaskellDepends = [ aeson async attoparsec base bytestring either exceptions hashable haxl http-client http-client-tls http-media http-types network-uri @@ -158046,7 +169047,7 @@ self: { mkDerivation { pname = "servant-jquery"; version = "0.4.4.7"; - sha256 = "f3e7ba3e47ab318fc448f0539b4e58e8d82a5e9b32e3a6a6b5dea849dd7d11b1"; + sha256 = "1c8igpflka6ynnkadqrjkdg2mn78b179nlzh9328ycdb8wzbmrzk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; @@ -158060,29 +169061,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.9.2"; - sha256 = "ad4676667cdd72f5bafac5c2d6de710b9c0082131b72dd117026fecb0d544369"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - QuickCheck servant text - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_9_3" = callPackage ({ mkDerivation, base, base-compat, charset, hspec , hspec-expectations, language-ecmascript, lens, QuickCheck , servant, servant-foreign, text @@ -158090,7 +169068,9 @@ self: { mkDerivation { pname = "servant-js"; version = "0.9.3"; - sha256 = "086905a2c5d8903910b415b71f007c28cb6de9bccc4ab273e7ed944ceeca2cc2"; + sha256 = "1hicrbp4r57dwxrv4jncpklnvjr8gh01zdqmnh83k46qqni0as88"; + revision = "2"; + editedCabalFile = "0m4dsa285rmwrc3ilzvm9anzcnbnmvfkl6vz09hsmkr413ajr5gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158103,7 +169083,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -158111,9 +169090,9 @@ self: { mkDerivation { pname = "servant-lucid"; version = "0.7.1"; - sha256 = "ec26ba7d159b09be10beacf6242f6ae1bd111e9c738bfbf3cf2f560f48e0fe40"; - revision = "4"; - editedCabalFile = "ea04cd0d0f11bbe4ea55608a7a38013d9da6373f25b2cad1e03dfb2c5c83fe18"; + sha256 = "0h7yw140ymigrzrzp2vkkhg13gg1d8pj9xmcpq8bw2cv2myvl9pc"; + revision = "5"; + editedCabalFile = "0hqwbh0mcl3mdv0aj9xvnzpqdv8am07i48cjpx96yihkg86r5phm"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant support for lucid"; @@ -158129,7 +169108,7 @@ self: { mkDerivation { pname = "servant-matrix-param"; version = "0.3.3"; - sha256 = "679e8f5a6e77c1022ae4b23555fbbca2b34d1fd249ab459c670db5c98eb988b3"; + sha256 = "1cw8p67ckd8dcyf4bas9s8glvcx2pkxmaddjwhm05hbpdrd8z7k7"; libraryHaskellDepends = [ base servant ]; testHaskellDepends = [ aeson base bytestring containers doctest hspec http-client @@ -158149,9 +169128,9 @@ self: { mkDerivation { pname = "servant-mock"; version = "0.8.1.1"; - sha256 = "d7371a5899460bc6e86b003afbbf92f4609bd94299f0bbc89d14cd9212d7197d"; + sha256 = "0z8rsw995k8lkp4bpw4r8bcrnq7ljazznfh0dglcc2s6k5c1ldyp"; revision = "1"; - editedCabalFile = "2041a7472f709520506daed1a5bec13dd527851becddd34ae7c7dbf59725db4d"; + editedCabalFile = "0kfv4nbzbny7wx5d7pgc3f2jgm9xq6zabldfdm8215bh5x3sfh90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158171,15 +169150,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-mock_0_8_1_2" = callPackage + "servant-mock_0_8_2" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server , transformers, wai, warp }: mkDerivation { pname = "servant-mock"; - version = "0.8.1.2"; - sha256 = "2a65e62112551633d7d9b1372129b043b0cc35e13960b8222f122d206931d117"; + version = "0.8.2"; + sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w"; + revision = "1"; + editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158206,8 +169187,8 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.10"; - sha256 = "285298e7411297f4e023cceba14fd8f5c03c694f47533adfaf01538682698199"; + version = "0.10.0.1"; + sha256 = "1wba440qlcjw6h6k8qiycsfq26snfkmy0p45d51li704s4m3idcv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158231,9 +169212,9 @@ self: { mkDerivation { pname = "servant-named"; version = "0.1.0.0"; - sha256 = "6bdcc503ca1603d7a2ad787fd57dc5e25a06bbf05530f89718ca1be832660436"; + sha256 = "0dh4cqrfh6ya32bzhc2my2xhcnp2qmyxazvqmnidf0qnr81wbp3b"; revision = "2"; - editedCabalFile = "5a05b717a5676672ec5ce3815b1a702165b6828bd421605920a5a8b02ad3211b"; + editedCabalFile = "06r1scmb1a5541cn08flif1bcr91f0d5p0g3bkn74rk7llbvf1as"; libraryHaskellDepends = [ base servant ]; testHaskellDepends = [ base hspec hspec-wai http-types servant servant-server @@ -158243,6 +169224,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-options" = callPackage + ({ mkDerivation, base, bytestring, http-types, servant-foreign + , servant-server, text, wai + }: + mkDerivation { + pname = "servant-options"; + version = "0.1.0.0"; + sha256 = "1cwzyk435g761pl6wr5gpjr177cdrsrcyp1czl6whrv2xih2xzjw"; + libraryHaskellDepends = [ + base bytestring http-types servant-foreign servant-server text wai + ]; + homepage = "https://github.com/sordina/servant-options"; + description = "Provide responses to OPTIONS requests for Servant applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -158250,7 +169247,7 @@ self: { mkDerivation { pname = "servant-pandoc"; version = "0.4.1.2"; - sha256 = "e98cc2e8483b97698e526798143a570d6398b19830cab4a72ff68a2f8f2c6237"; + sha256 = "0dv25j7jz2pn5ykv9jihk2qrhqqdawx19637aa76k5rv93lc5379"; libraryHaskellDepends = [ base bytestring http-media lens pandoc-types servant-docs text unordered-containers @@ -158265,9 +169262,9 @@ self: { mkDerivation { pname = "servant-pool"; version = "0.1"; - sha256 = "c938fcd6d2e6a6d5b45932fd7d01622c2f09b7f947a63f2d25ad5d0756a7c445"; + sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69"; revision = "1"; - editedCabalFile = "f84940c58e21db3616aa0f6846ae89395aa2589de5ad8cdb91bc7e21acec8c97"; + editedCabalFile = "15wcxjn22zmwj7dqrbg5kmca4niri6p4cs0gm8b3dnr1iv2l0jgq"; libraryHaskellDepends = [ base resource-pool servant time ]; homepage = "http://github.com/zalora/servant-pool"; description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; @@ -158282,7 +169279,7 @@ self: { mkDerivation { pname = "servant-postgresql"; version = "0.1"; - sha256 = "12e6ce41a43e13f41f763eba8ad730597d63f97198e88af407f816aacd0e7eeb"; + sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj"; libraryHaskellDepends = [ base bytestring postgresql-simple servant servant-pool servant-response @@ -158302,7 +169299,7 @@ self: { mkDerivation { pname = "servant-purescript"; version = "0.6.0.0"; - sha256 = "e66cd9e49f41ae26c41b37a87d27f6a7848a9f9b3dd41b162bbc7d1d6808285c"; + sha256 = "0p1811l1szdw5cb1pm1xkfgqm157yqkpva1p3g22dbj1kzjdjv76"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -158318,7 +169315,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-purescript_0_7_0_0" = callPackage + "servant-purescript_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -158326,8 +169323,8 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.7.0.0"; - sha256 = "672cf63144b54f3f3de3662794a06270d806d5a7575d52156f3b487eb637d6f8"; + version = "0.8.0.0"; + sha256 = "0h2a215i5lqalc4hp0g7iav3nxypdm5i2yfix0i96038sqjzg0wp"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -158351,8 +169348,8 @@ self: { }: mkDerivation { pname = "servant-pushbullet-client"; - version = "0.1.0.0"; - sha256 = "185b20038906ae4e74dc08eb6723502444c9a9aa272f0051aed8325c31be6a1f"; + version = "0.2.0.0"; + sha256 = "1701mcr99hg4zlsh95ri4nrx1iws1ns2f9gi55dzbyay429czlfg"; libraryHaskellDepends = [ aeson base http-api-data http-client http-client-tls microlens microlens-th pushbullet-types scientific servant servant-client @@ -158362,6 +169359,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-py" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, charset + , hspec, hspec-expectations, lens, QuickCheck, servant + , servant-foreign, text + }: + mkDerivation { + pname = "servant-py"; + version = "0.1.0.4"; + sha256 = "0cc4cwny1y0iwchasxl8ncg2ladndpxcdh7ydfr2z91y97m15yx6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring charset lens servant servant-foreign text + ]; + testHaskellDepends = [ + aeson base base-compat bytestring hspec hspec-expectations lens + QuickCheck servant servant-foreign text + ]; + homepage = "https://github.com/pellagic-puffbomb/servant-py#readme"; + description = "Automatically derive python functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-quickcheck" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , case-insensitive, clock, data-default-class, hspec, hspec-core @@ -158372,8 +169393,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.2.2"; - sha256 = "72878553ed9d7f134bd10e11ca7eaf69ba3d341e591aa3af4c73c43c7af866c5"; + version = "0.0.2.4"; + sha256 = "1jf7r9wa9b2afj573knafpgp49xf6mslq0qifw7cdww5j57993b2"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -158395,9 +169416,9 @@ self: { mkDerivation { pname = "servant-response"; version = "0.1"; - sha256 = "1e32b385757555a03c29fa6a8e02d5ae1ce8c436997db8ed923bb851ad89ff6d"; + sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy"; revision = "1"; - editedCabalFile = "5ee181fcc10725b2f8a2188716dfcc36d134c7aef11458cc4e85902f67611dd2"; + editedCabalFile = "1lhxc5kjz4459v65h57imv3k9l9nrkgid1qqlbwb4987q7y83qay"; libraryHaskellDepends = [ aeson base http-types text ]; homepage = "http://github.com/zalora/servant"; description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types"; @@ -158412,7 +169433,7 @@ self: { mkDerivation { pname = "servant-router"; version = "0.9.0"; - sha256 = "5db685c2a05b222dc862c564877a8b5a802bf12cdd91f8b452825aef3de5653c"; + sha256 = "0g35wlyyynl2aasgi4fx5kqjp02sidx8fr65cb42s8jvl318bdjx"; libraryHaskellDepends = [ base bytestring http-api-data http-types network-uri servant text ]; @@ -158425,6 +169446,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-ruby" = callPackage + ({ mkDerivation, base, casing, doctest, lens, servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.2.1.0"; + sha256 = "1qc9m8v2zj6zihkq1wx52fwq666q0cgg4fmnrfw431sa3a8rmf4h"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/joneshf/servant-ruby#readme"; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -158432,9 +169467,9 @@ self: { mkDerivation { pname = "servant-scotty"; version = "0.1.1"; - sha256 = "031d68f2d688e4f97b65366ce5ef5c6fc124998e01498b7ffc315ca1d4617e34"; + sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783"; revision = "1"; - editedCabalFile = "5355af06c17f104c8276672de58b2cbcb3c0e7e200d0f596622740326c0a32fa"; + editedCabalFile = "1yij19n34h17cabgbl00wbkw1cxw5j5yabb7fs14q43zq43aymak"; libraryHaskellDepends = [ aeson base http-types scotty servant servant-response text transformers @@ -158457,9 +169492,9 @@ self: { mkDerivation { pname = "servant-server"; version = "0.9.1.1"; - sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1"; + sha256 = "1ldxj6653818gsk9az8mfwvphhnh3z6wgr8igf57l7yfgraq61hy"; revision = "1"; - editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771"; + editedCabalFile = "0wcpfg1v36jp5flf82dr5z27avff4gml9ag1znkgahxbsix17m8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158481,28 +169516,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_10" = callPackage + "servant-server_0_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, Cabal, containers, directory - , doctest, exceptions, filemanip, filepath, hspec, hspec-wai - , http-api-data, http-types, monad-control, mtl, network + , base64-bytestring, bytestring, Cabal, cabal-doctest, containers + , directory, doctest, exceptions, filemanip, filepath, hspec + , hspec-wai, http-api-data, http-types, monad-control, mtl, network , network-uri, parsec, QuickCheck, resourcet, safe, servant , should-not-typecheck, split, string-conversions, system-filepath - , temporary, text, transformers, transformers-base + , tagged, temporary, text, transformers, transformers-base , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.10"; - sha256 = "99d14d23ea67832401b4bca7e5cb75b8c557e6dc7a8f38870c3b9d701179073d"; + version = "0.11"; + sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib"; + revision = "1"; + editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers exceptions filepath http-api-data http-types monad-control mtl network network-uri resourcet safe servant split - string-conversions system-filepath text transformers + string-conversions system-filepath tagged text transformers transformers-base transformers-compat wai wai-app-static warp word8 ]; executableHaskellDepends = [ aeson base servant text wai warp ]; @@ -158528,7 +169565,7 @@ self: { mkDerivation { pname = "servant-smsc-ru"; version = "0.1.0.0"; - sha256 = "f6a7bc5824cc76a3aa1650f0d729d0dd5d4657f6d68898c4d6ea260a31f8e5ed"; + sha256 = "1vg5z0qhl9pasv29i26nyrblcpfxs0lxgw2h2sma6xnc4icbr9zn"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl scientific servant servant-client text transformers @@ -158555,8 +169592,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.7.0.5"; - sha256 = "4a92e5a97f025541914cbd48266a7498af2ba25e467c13c4abfab4b8d36144f1"; + version = "0.7.3"; + sha256 = "0ahk3slcl25c4ykxix8j8nqf1mxqc4gnrzx6hpll3ab9m02g1qzf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158582,6 +169619,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-static-th" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , directory, doctest, filepath, Glob, hspec-wai, http-media + , semigroups, servant, servant-blaze, servant-server, tasty + , tasty-hspec, tasty-hunit, template-haskell, text, wai + }: + mkDerivation { + pname = "servant-static-th"; + version = "0.1.0.3"; + sha256 = "150y6pj4n85cmv3p3h5pkkyvgv85dv0kf4zmh6iddav340gg26wx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bytestring containers directory filepath http-media + semigroups servant servant-blaze servant-server template-haskell + text + ]; + testHaskellDepends = [ + base blaze-html bytestring directory doctest filepath Glob + hspec-wai servant servant-blaze servant-server tasty tasty-hspec + tasty-hunit wai + ]; + homepage = "https://github.com/cdepillabout/servant-static-th"; + description = "Embed a directory of static files in your Servant server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-subscriber" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath @@ -158593,7 +169657,7 @@ self: { mkDerivation { pname = "servant-subscriber"; version = "0.5.0.3"; - sha256 = "0530f47c565c12624524c028dcc4f12517bd05d31ef1fed1b6a4aa084507842a"; + sha256 = "0al40x2hiam4nv8zxw8ysc2vs5r5y72dqa604i2n44jwaryg8c05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158610,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 @@ -158620,8 +169684,8 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.6.0.0"; - sha256 = "1875445b8dde41e86dd962bd71848255a6ea25e54c21cd9cf046638c16ff405d"; + version = "0.6.0.1"; + sha256 = "0fbqmh0lzcb0ixw09ldjddz21xcfy7knfwhh3hfzlgy08xmqb89x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158647,9 +169711,9 @@ self: { mkDerivation { pname = "servant-swagger"; version = "1.1.2"; - sha256 = "1aa55cdf092189fed02e5d5bddf052eafafd23df54e0671ec32adc5ac4c8c47e"; + sha256 = "0zn4r325mp1aqcg6gq2lvwizvypaabqdsnsx5v8gx29117gmr98s"; revision = "2"; - editedCabalFile = "1b4ce7e527556edbd2f07fe420fe82a482d7d2b6ce264606c2e34f0e0270c081"; + editedCabalFile = "10f0f010wkz3q834c9nfnv9dg0m4hbz21r3zy39dnvjm4zjyfk0v"; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers lens QuickCheck servant swagger2 text unordered-containers @@ -158661,10 +169725,9 @@ self: { homepage = "https://github.com/haskell-servant/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-swagger_1_1_2_1" = 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 @@ -158672,13 +169735,9 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.2.1"; - sha256 = "302ab03af773ddb3b0a4949b62ca79b81c206a3838864c9ed35cb4e40360f961"; - revision = "1"; - editedCabalFile = "c0e7cf887989105cb5d7dea343a8f0586999680bd6272516a745e1cc01a017de"; - setupHaskellDepends = [ - base Cabal cabal-doctest directory filepath - ]; + version = "1.1.3.1"; + sha256 = "0n5vvrxg1lllkm385g0jd2j5bsr21bcibwn5szdpn6r5yh2mvn78"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers lens QuickCheck servant swagger2 text unordered-containers @@ -158702,8 +169761,10 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.2.2.2.8"; - sha256 = "7dcfbc55eb6aab3ebb739e7a056107cbe0d0720c3e2e6f820afe52e7e84084fb"; + 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 @@ -158717,7 +169778,6 @@ self: { homepage = "https://github.com/phadej/servant-swagger-ui#readme"; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-yaml" = callPackage @@ -158727,9 +169787,9 @@ self: { mkDerivation { pname = "servant-yaml"; version = "0.1.0.0"; - sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "13"; - editedCabalFile = "dba651f8c89c721a27427895340c9cf6e118ad0f752ca3cd275295a601e58573"; + sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; + revision = "16"; + editedCabalFile = "1szf52wk171jzm1vrs6lby7b7wijmfid3ar6wb960v9kq7g9k3iy"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -158742,6 +169802,91 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-zeppelin" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "servant-zeppelin"; + version = "0.1.0.3"; + sha256 = "1pga7l2akxqhkfq6gqaiiz6svvhzb83dbc5bw487kkrs3vriyyc3"; + libraryHaskellDepends = [ base singletons ]; + homepage = "https://github.com/martyall/servant-zeppelin#readme"; + description = "Types and definitions of servant-zeppelin combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-zeppelin-client" = callPackage + ({ mkDerivation, aeson, base, data-default-class, hspec + , http-client, mtl, QuickCheck, servant, servant-client + , servant-server, servant-zeppelin, servant-zeppelin-server + , singletons, string-conversions, text, wai-extra, warp + }: + mkDerivation { + pname = "servant-zeppelin-client"; + version = "0.1.0.3"; + sha256 = "0rycpbwnxnjcf5j0ipy2sf66l4nj1fml16hyd6ga4wd6hcf5277q"; + libraryHaskellDepends = [ + aeson base servant servant-client servant-zeppelin singletons text + ]; + testHaskellDepends = [ + aeson base data-default-class hspec http-client mtl QuickCheck + servant servant-client servant-server servant-zeppelin + servant-zeppelin-server singletons string-conversions wai-extra + warp + ]; + 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 + ({ mkDerivation, aeson, base, hspec, http-client, http-types, lens + , lens-aeson, mtl, QuickCheck, servant, servant-server + , servant-zeppelin, singletons, string-conversions, text, wai, warp + , wreq + }: + mkDerivation { + pname = "servant-zeppelin-server"; + version = "0.1.0.3"; + sha256 = "1fq9cac0mxpgj6cbgchd28djai0p1sdxgnbzpi6mn5l3hpfqyxnm"; + libraryHaskellDepends = [ + aeson base http-types servant servant-server servant-zeppelin + singletons text wai + ]; + testHaskellDepends = [ + aeson base hspec http-client http-types lens lens-aeson mtl + QuickCheck servant servant-server servant-zeppelin + string-conversions warp wreq + ]; + 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 + ({ mkDerivation, aeson, base, containers, hspec + , insert-ordered-containers, lens, servant, servant-swagger + , servant-zeppelin, singletons, swagger2, text + }: + mkDerivation { + pname = "servant-zeppelin-swagger"; + version = "0.1.0.3"; + sha256 = "0minwzmavsbksn0qh25lcbmdy496zi5lq6jrg4n203pdvnlhsyah"; + libraryHaskellDepends = [ + aeson base insert-ordered-containers lens servant servant-swagger + servant-zeppelin singletons swagger2 text + ]; + testHaskellDepends = [ + aeson base containers hspec insert-ordered-containers lens servant + servant-swagger servant-zeppelin swagger2 + ]; + 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 ({ mkDerivation, aeson, base, bytestring, http-types, mtl, text , void, wai, warp @@ -158749,7 +169894,7 @@ self: { mkDerivation { pname = "server-generic"; version = "1.0.0"; - sha256 = "c8e5dec28ecd9cd91bbd7a52621b482ab58f903381e4dd29ef8eb88f8557ced9"; + sha256 = "1nffay2qzf4fxwlxvr416f88zd9a90dn4lkspldxk76div1dxrf8"; libraryHaskellDepends = [ aeson base bytestring http-types mtl text void wai warp ]; @@ -158767,7 +169912,7 @@ self: { mkDerivation { pname = "serversession"; version = "1.0.1"; - sha256 = "3ffbefd87017e8d46fbbe380f59e24672aa9c06b999da5f9ae0b052094d94822"; + sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring data-default hashable nonce path-pieces text time transformers unordered-containers @@ -158789,7 +169934,7 @@ self: { mkDerivation { pname = "serversession-backend-acid-state"; version = "1.0.3"; - sha256 = "005317d6b31500738979d5affc858c5d2642dc86122b360c28a0737aac2a7ce6"; + sha256 = "1rkw5an7lwx05063caqjhvf449jxij2zrbymg64p600mngb1flq0"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -158812,8 +169957,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "1.0.3"; - sha256 = "689eb02ada5f1ad8ce0e0c43ae0931953533fab1f65d10d3a7c35dd01688c5ae"; + version = "1.0.4"; + sha256 = "074pxfv1yj6ffxp4bg0ia20w7ikdja3g3k1l93nnjcni13zddwn7"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -158839,7 +169984,7 @@ self: { mkDerivation { pname = "serversession-backend-redis"; version = "1.0.2"; - sha256 = "d7746682f83e796bb1de3d14dd26d20c3c0723d7683af93e58d8a0a57b9bf917"; + sha256 = "05zrkdxsb86qb0zgjfk8swihfg0cs8kds51xvsqnny9yz216cx6p"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -158862,7 +170007,7 @@ self: { mkDerivation { pname = "serversession-frontend-snap"; version = "1.0.1"; - sha256 = "bb2476bb04907b0f2df1be9ef8c7a6c2aa984b8a06fe4bd6342ed990c2868d2c"; + sha256 = "0b4dhv191n9f6kb4pzh6i95rian2lv3zi7myy4nhyywh0jxpc95v"; libraryHaskellDepends = [ base bytestring nonce path-pieces serversession snap snap-core text time transformers unordered-containers @@ -158881,7 +170026,7 @@ self: { mkDerivation { pname = "serversession-frontend-wai"; version = "1.0"; - sha256 = "0b48130e3d3915dc46ec2392984e7862d066f6ddd454127a98b0c21c2574b167"; + sha256 = "0rxifhjirhmhk1x14m6lvpv6dl32g179i4i3xi3dq59r7l716j0b"; libraryHaskellDepends = [ base bytestring cookie data-default path-pieces serversession text time transformers unordered-containers vault wai wai-session @@ -158899,7 +170044,7 @@ self: { mkDerivation { pname = "serversession-frontend-yesod"; version = "1.0"; - sha256 = "063946df7bf693e26973f81dd72b3586115dfac6b358421e4a7ada48e47c6753"; + sha256 = "0lv7gkj4inks98g44n5kqvx5s4c66lmxf7gqfdly54znggglcf86"; libraryHaskellDepends = [ base bytestring containers cookie data-default path-pieces serversession text time transformers unordered-containers wai @@ -158910,6 +170055,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "services" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , http-types, monad-logger, tasty, tasty-hunit, text, wai + }: + mkDerivation { + pname = "services"; + version = "0.2.0"; + sha256 = "0sqk8c86rz0sva26zdh3am6sacwlg0jlkbizf82nrdznd6mih0h1"; + libraryHaskellDepends = [ + aeson base binary bytestring containers http-types monad-logger + text wai + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/seanhess/services#readme"; + description = "Tools for building services"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "serviette" = callPackage + ({ mkDerivation, aeson, base, bytestring, generic-deriving, text + , text-show + }: + mkDerivation { + pname = "serviette"; + version = "0.1.0.6"; + sha256 = "00bh2c73g11bglw5z96g9d1bqkcd783byd3jrf5amgay28xk2l5d"; + libraryHaskellDepends = [ + aeson base bytestring generic-deriving text text-show + ]; + homepage = "https://github.com/v0d1ch/serviette#readme"; + description = "JSON to Sql"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servius" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring , http-types, markdown, shakespeare, text, wai, wai-app-static @@ -158917,7 +170097,7 @@ self: { mkDerivation { pname = "servius"; version = "1.2.0.2"; - sha256 = "c11682eb485f028aaf2dc6abdbda38cc5a68fd57521cc3ffb5b56b765e9b5d2b"; + sha256 = "0asxkdg7csxmnpzw672jazynhnnc73ddpay65npql0jz93mq45n1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158936,7 +170116,7 @@ self: { mkDerivation { pname = "ses-html"; version = "0.3.0.1"; - sha256 = "07ce0cc9777d9fac050cb2546de72c56625a47769a046e49b9d11f74c9c8bccf"; + sha256 = "1kxwr34p87yip54nw14sfr3mlqjn5kknsm5j1h2sr7vxfz4hrkh7"; libraryHaskellDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash HsOpenSSL http-streams tagsoup time @@ -158953,7 +170133,7 @@ self: { mkDerivation { pname = "ses-html-snaplet"; version = "0.1.0.0"; - sha256 = "231df3f3b903f63be94f6e4a02a9eb5f8dd28e49fd2c9ff6f7b29df9821839d3"; + sha256 = "1lrr321gk7djyzv9yb7x967d53azxflh4jkf9zlkpxh3p7rz6793"; libraryHaskellDepends = [ base blaze-html bytestring configurator ses-html snap text transformers @@ -158969,7 +170149,7 @@ self: { mkDerivation { pname = "sessions"; version = "2008.7.18"; - sha256 = "5adca740a72355a5e38a168fba9cf607f91e5e6b6a5bb44401d00d39d572327e"; + sha256 = "0zijfbakj3fh052b8nvaddg1xy87ysfbm3qnibisam93lx0agp2s"; libraryHaskellDepends = [ base binary bytestring containers mtl network ]; @@ -158985,7 +170165,7 @@ self: { mkDerivation { pname = "set-cover"; version = "0.0.8"; - sha256 = "186d3a1b6e824e3bd1d479347d8310dba9f1cba98e90bc03d885c42558ea95d1"; + sha256 = "1lcmx9c2bi45v01vr44fm75z3afv221psd3rsk8knkl2dqdklv8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159001,7 +170181,7 @@ self: { mkDerivation { pname = "set-extra"; version = "1.4"; - sha256 = "29dbee21b011f259abbe6f3ee7cf65fd58c8b79ff5568bc6b09e613f45bc9733"; + sha256 = "0cwppi2kyqcyn338nmpmkyvwhn7xcp7yfgkgpsmmkwhin0hyxnr9"; libraryHaskellDepends = [ base containers mtl syb ]; homepage = "https://github.com/ddssff/set-extra"; description = "Functions that could be added to Data.Set."; @@ -159013,7 +170193,7 @@ self: { mkDerivation { pname = "set-monad"; version = "0.2.0.0"; - sha256 = "eb2b4312c4a71024ea1c85683065c1052b0065b7d96df68cd1c4390c1ab2afdb"; + sha256 = "1nxgn8d0qff4s66gcvfrnxjh0aq5q5jk0s453km28457qh946azb"; libraryHaskellDepends = [ base containers deepseq ]; description = "Set monad"; license = stdenv.lib.licenses.bsd3; @@ -159026,7 +170206,7 @@ self: { mkDerivation { pname = "set-with"; version = "0.0.1"; - sha256 = "04026d13255315973acacda95c65950378670f1b3cbe0effc02b4a381f216c56"; + sha256 = "0mkc44gkhjibq3zhxgiw3c7nfy03jmjmrafdr8x9f5ak4l9ns0h4"; libraryHaskellDepends = [ base containers invariant ]; testHaskellDepends = [ base QuickCheck quickcheck-instances tasty tasty-hunit @@ -159044,7 +170224,7 @@ self: { mkDerivation { pname = "setdown"; version = "0.1.0.3"; - sha256 = "c41ded101e6bd0bb17106674f49c0a4a06e8a042dcce443cd772e959c6bd98e4"; + sha256 = "1r4qpp35ksbjswy49knw8ahfh1ja1afg8x3620bvpl3b3q8fs7f4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159063,9 +170243,9 @@ self: { mkDerivation { pname = "setenv"; version = "0.1.1.3"; - sha256 = "e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32"; + sha256 = "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73"; revision = "1"; - editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b"; + editedCabalFile = "0ny4g3kjys0hqg41mnwrsymy1bwhl8l169kis4y4fa58sb06m4f5"; libraryHaskellDepends = [ base unix ]; description = "A cross-platform library for setting environment variables"; license = stdenv.lib.licenses.mit; @@ -159076,7 +170256,7 @@ self: { mkDerivation { pname = "setgame"; version = "1.1"; - sha256 = "34b0c18e84023bc1785a18386663be136ac3d02f901cf8106942d4d3c89a22c3"; + sha256 = "1hr2kb4d7m22d48gh74h5z8c6shkprincf0qb9wc2fq2hj7c3c1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random vty ]; @@ -159090,20 +170270,38 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "setlocale"; - version = "1.0.0.4"; - sha256 = "32396aedcb8fdd6c56821dcde25c2cbd76462b13a6dc229bec29cb78df1fa7e9"; + version = "1.0.0.5"; + sha256 = "1w4zgpjjy56bpgjjcxh2fj3v4pqwmfhfwwvs5nhys12h8y8q8hsp"; libraryHaskellDepends = [ base ]; homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale"; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; }) {}; + "setoid" = callPackage + ({ mkDerivation, base, containers, mtl, smallcheck, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "setoid"; + version = "0.1.0.0"; + sha256 = "0g2b191hxvp8hrxlghwb9csnz0y08a56bvh4nkxz084bzyj4fl0n"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers mtl smallcheck tasty tasty-discover tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + description = "A Haskell implementation of setoid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setops" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "setops"; version = "0.1.2"; - sha256 = "6f5fa7821041e6274153d258a087d1d9e839d05e180531ca74f9a6872e224ad6"; + sha256 = "1mja48p8g9prfk53218qbv83ks6rs63s0n6jad0jgrj1221afpvg"; libraryHaskellDepends = [ base containers ]; description = "Uniform names (and Unicode operators) for set operations on data structures"; license = stdenv.lib.licenses.publicDomain; @@ -159119,7 +170317,7 @@ self: { mkDerivation { pname = "sets"; version = "0.0.5.2"; - sha256 = "be20d5b7b4a5770b7089879f3ef7226c485f4d5bb17e87f979f3bb6475e48713"; + sha256 = "04w7wisn9fzkg7wqfzmibd6myj3c4bvkx7w7i5q0nxx5njvxa85y"; libraryHaskellDepends = [ base commutative composition containers contravariant hashable keys mtl QuickCheck semigroupoids semigroups transformers @@ -159144,9 +170342,9 @@ self: { mkDerivation { pname = "setters"; version = "0.1"; - sha256 = "5f2820de0e25847ace980132c04913c7ec61333e2b20cce49e2062765caa8967"; + sha256 = "0rw9m9f7cqi0kvjcq81b7qrn3v672d4w0ch1k377m1151vg20a2z"; revision = "1"; - editedCabalFile = "c4ff7321208bb4f71ea367d5a1811d7c13aadda0d05a1d9ddb25fff5e31c9365"; + editedCabalFile = "0rck3kizbzr5vffisnnhl3fsl4vw3n0s3mb7lcgggd4b40hp7zy4"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Small (TH) library to declare setters for typical `record' data type fields"; license = stdenv.lib.licenses.bsd3; @@ -159158,7 +170356,7 @@ self: { mkDerivation { pname = "settings"; version = "0.3.0.0"; - sha256 = "48e36d5337bcfe077acd4db4d1a2c03b15f0423cf02731a87c4cc494b2c8cbc2"; + sha256 = "1hnbr2r99i2cgjl329zh7i1g059vq2id3d2drmx0gzmw6x9nvqs8"; libraryHaskellDepends = [ base text unordered-containers ]; homepage = "http://rel4tion.org/projects/settings/"; description = "Runtime-editable program settings"; @@ -159173,7 +170371,7 @@ self: { mkDerivation { pname = "sexp"; version = "0.7"; - sha256 = "568cc9f7256e9235906322600976be22d6803baef4ff42bad7a9eaf5ad9974a5"; + sha256 = "19blk6nzbsm9syx45zzlmqxq1mi2prv0jq12cf83b4kf4pvwk32n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159199,7 +170397,7 @@ self: { mkDerivation { pname = "sexp-grammar"; version = "1.2.3"; - sha256 = "6914a7ae01b736f1b32e2847d91a2accbe2be195cbb5c69d56668ef08872f580"; + sha256 = "107mfa4g13k6asfwddfbjphjpgnc58ddjir85srz2dmp06paf539"; libraryHaskellDepends = [ array base bytestring containers mtl profunctors scientific semigroups split tagged template-haskell text transformers @@ -159224,9 +170422,9 @@ self: { mkDerivation { pname = "sexp-show"; version = "0.1.1.0"; - sha256 = "c53f5242eb1146d0005b4754c927159705044692286018c78aa6892f7cf0e1c6"; + sha256 = "1ip1y1y2z2d6ib3ihq18j93081cp2lkwjm27bc0d0ihixd154gy5"; revision = "1"; - editedCabalFile = "314f05a4542c657517d485faa31ec23324458782cf0112acda948fb7092a154c"; + editedCabalFile = "0k0m584vg3wlvan140fgha3la91kq8ga7yl5shbpar9cajj0akri"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base pretty-show ]; @@ -159239,7 +170437,7 @@ self: { mkDerivation { pname = "sexpr"; version = "0.2.1"; - sha256 = "7724dc079ba390c8302079483ddf5f12bb425c2461133f94be71fe62402edab9"; + sha256 = "1ffs5r065zkipsa3y4v14if45fqjbzgksj3r40qci453kc3xq93p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159251,18 +170449,21 @@ self: { }) {}; "sext" = callPackage - ({ mkDerivation, base, bytestring, template-haskell, text, vector + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text, vector }: mkDerivation { pname = "sext"; - version = "0.1.2"; - sha256 = "c046a0613bc8275f9e0c4c0052c2a9e9e7468fa20a1fd7f64a6d6ce5f02f46a1"; + version = "0.1.3"; + sha256 = "0z6a4ghv5knfcwv28bax4gny5za0k0y076d15bnk01qg293w273b"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; - testHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell + ]; homepage = "https://github.com/dzhus/sext#readme"; - description = "Lists, Texts, ByteStrings, and Vectors with type-encoded length"; + description = "Lists, Texts, ByteStrings and Vectors with type-encoded length"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -159272,7 +170473,7 @@ self: { mkDerivation { pname = "sfml-audio"; version = "0.7.1.1816"; - sha256 = "6a85a127e21de533ba64be40b73535fb826d045f3d4e3007b941d3d5c507ff14"; + sha256 = "057z0z2xbls1p43k0kixbw26v0pv6lsvfh5ycjx37r8xw8ks31ba"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libsndfile openal ]; homepage = "http://patch-tag.com/r/shahn/sfml-audio"; @@ -159285,7 +170486,7 @@ self: { mkDerivation { pname = "sfmt"; version = "0.1.1"; - sha256 = "e6862db41ac95e52e9110d666683f5c931b6175c86fc500aaf74cf39c8d49fcb"; + sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6"; libraryHaskellDepends = [ base bytestring entropy primitive ]; homepage = "https://github.com/philopon/sfmt-hs"; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; @@ -159300,7 +170501,7 @@ self: { mkDerivation { pname = "sfnt2woff"; version = "0.1.0.0"; - sha256 = "2b016d713c089de54fbdcfa9e4f6817afada937b9ae2de0fc9ea507c72ea7924"; + sha256 = "093rx9r7ql7ar47xxqlsgf9xmyksh7vf9afgpm7yb7887iqns09b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -159323,7 +170524,7 @@ self: { mkDerivation { pname = "sgd"; version = "0.3.7"; - sha256 = "04e032eff0677cfa8b69a39ee502d48c9a1941324b66c754cf5e8bb96a409cfc"; + sha256 = "1z4w81mbk2syrxacfrjb690ik6lcsh1fb7m3d65zlz37y3pk5q04"; libraryHaskellDepends = [ base binary bytestring containers deepseq filepath lazy-io logfloat monad-par mtl primitive random temporary vector @@ -159341,7 +170542,7 @@ self: { mkDerivation { pname = "sgf"; version = "0.1.3.1"; - sha256 = "8cc7b71d1f58df2d50e184846cc17247a242eff6262440111691cfb916bc8eaf"; + sha256 = "1bwfphbbkkwi2q8l0916yvpl58j7fb0nr144w582vpsq3wfvgiwc"; libraryHaskellDepends = [ base containers encoding extensible-exceptions mtl parsec split time transformers @@ -159357,7 +170558,7 @@ self: { mkDerivation { pname = "sgrep"; version = "0.0"; - sha256 = "f1f966cee314c875b0c8313bfa98aee281a2c52b7152de2365b4485ec691292a"; + sha256 = "0ai9j735wj5lclixwlki5g2s50g2mscglfrir2q7bj0lwg76dygi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bio regex-compat ]; @@ -159372,7 +170573,7 @@ self: { mkDerivation { pname = "sha-streams"; version = "0.2.1"; - sha256 = "920bb61aed58612510d27c6bbe8ca21444717c13f7b2e658f3c545f32cf09370"; + sha256 = "0w4ky0ng6if5ydcfdcpp2dy72i0lla6bwsvws882aqaqxldbc2wj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring io-streams SHA ]; @@ -159383,6 +170584,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shade" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "shade"; + version = "0.1.1.1"; + sha256 = "0yri1xy40lx04sg4nm6z4wg9ayqqq5nga6yk9hv4rpf5aw3n264r"; + revision = "1"; + editedCabalFile = "164nw1gg6yl3fb4pqbgxxphafw2120a8kryhqx0i09l8c1n49557"; + libraryHaskellDepends = [ base mtl transformers ]; + homepage = "https://github.com/fredefox/shade#readme"; + description = "A control structure used to combine heterogenous types with delayed effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shadower" = callPackage ({ mkDerivation, base, doctest, filemanip, fsnotify, MissingH, mtl , process, safe, system-filepath, text @@ -159390,7 +170605,7 @@ self: { mkDerivation { pname = "shadower"; version = "0.1.0.6"; - sha256 = "d1ba84b536cbb6e147a10c28b6b47350f7338bbc98d02295956614dbabed1fd4"; + sha256 = "1m0zxnmxn536jnaj5l4qpj5k7xshffsbca0cl53y3dnb6ssq9fni"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159416,7 +170631,7 @@ self: { mkDerivation { pname = "shadowsocks"; version = "1.20151028"; - sha256 = "b75248cba2eee03c168a8188eb6cd92015912b167f99953c58d6d3f91f85837c"; + sha256 = "0z43hlgzklynb0y9b6bz2qmr2590v5nfp241i8b3rq7flb5lhlmp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159441,7 +170656,7 @@ self: { mkDerivation { pname = "shady-gen"; version = "0.5.1"; - sha256 = "c8ba385e3d8362862961b0883d08f2c1aa0e009149b56e62b18f3d6ba00253ef"; + sha256 = "1vsk0ah6ngcgn5i6xda9j400xan1y843v25hc4lqcql37mg3ifn8"; libraryHaskellDepends = [ applicative-numbers base Boolean containers data-treify MemoTrie mtl ty TypeCompose vector-space wl-pprint @@ -159460,7 +170675,7 @@ self: { mkDerivation { pname = "shady-graphics"; version = "0.5.0"; - sha256 = "64363978a67b76886f7f053cd07ef25c97e3c4ae1e41ec6524da3b79ebf3f4f3"; + sha256 = "1wzlygmpjfys4ijyqh8ymv2f75swy9zd0g05gxpqhxkvlrw3jdk4"; libraryHaskellDepends = [ applicative-numbers base Boolean containers data-treify MemoTrie mtl shady-gen ty TypeCompose vector-space wl-pprint @@ -159480,7 +170695,7 @@ self: { mkDerivation { pname = "shake"; version = "0.15.11"; - sha256 = "05520d833ce9563977aa57d777a644b2a2322366a9f54c1004d83967e826b1bb"; + sha256 = "1fxi4vl6fffq0h84rxd9cqik58mj8jk7gmspm9vkjmp97j1hslh5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159508,7 +170723,7 @@ self: { mkDerivation { pname = "shake-cabal-build"; version = "0.1.0"; - sha256 = "14d951d872735dde4abf2a25579032d971182d00aa8989d9aa4e0b474ce082e2"; + sha256 = "1ql2w164f2sfmbcqk2da00nihwfr6a85f99apx5dwpbkfbc53n8l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159527,7 +170742,7 @@ self: { mkDerivation { pname = "shake-extras"; version = "0.1.1"; - sha256 = "9fae9507f8dbafcec5a4913210ceb612ad3324d941924e4f8f10226c1a6c1f63"; + sha256 = "0qqzdhd6q8hhix7lx4j1v4j37b8jnv710clilk2wxbyvz03rbblz"; libraryHaskellDepends = [ base bytestring cmdargs directory filepath shake ]; @@ -159543,8 +170758,8 @@ self: { }: mkDerivation { pname = "shake-language-c"; - version = "0.10.0"; - sha256 = "1b0f031c37db7ac320f80e09ab79dca2bdb85ba922a48c10f0954efd6d407888"; + version = "0.10.1"; + sha256 = "0802chyihjbj5k2z0rdmzqbip7slfyabr56mdixq1m54yxs48ina"; libraryHaskellDepends = [ base data-default-class fclabels process shake split unordered-containers @@ -159561,7 +170776,7 @@ self: { mkDerivation { pname = "shake-minify"; version = "0.1.4"; - sha256 = "398e175fc24de04c43a40a850417f3a435f17b9fafd366f480897623e5ef009f"; + sha256 = "17q0xzjj6xl9h3s6dlxgkxxz2dd4ycbh918ali1lrq2dq9gig3ir"; libraryHaskellDepends = [ base bytestring css-text hjsmin shake text ]; @@ -159576,7 +170791,7 @@ self: { mkDerivation { pname = "shake-pack"; version = "0.2.0"; - sha256 = "5fad6c240305f85bfa1c2001d9d52cb23ecdce006f98e590efe335dba2b9698f"; + sha256 = "13v9p6idndg3xy8fb63g037csgmj5kaxj0903kx5py050cj6rbaz"; libraryHaskellDepends = [ base bytestring bzlib shake tar ]; homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Rule"; @@ -159584,13 +170799,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-path" = callPackage + ({ mkDerivation, base, path, path-io, shake }: + mkDerivation { + pname = "shake-path"; + version = "0.0.0.0"; + sha256 = "0cqsfvm9hsyyglifc1s7c76yi15wj13hh735lfjkg9ljiqv90qpb"; + libraryHaskellDepends = [ base path path-io shake ]; + homepage = "http://cs-syd.eu"; + description = "path alternatives to shake functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "shake-persist" = callPackage ({ mkDerivation, base, binary, directory, shake, template-haskell }: mkDerivation { pname = "shake-persist"; version = "0.1.0.0"; - sha256 = "2404cd39d67a8bbd36afb3e658375faae1d6f54941a2de06abf85155ef87986a"; + sha256 = "0slqhzpmalgqmc3dx8j197sxdqdabwvmirmkmwvbv2vssqwws114"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159612,7 +170839,7 @@ self: { mkDerivation { pname = "shaker"; version = "0.5.1"; - sha256 = "0e725accd3f3b9ece747436b35d62ea6d3148fb5b027a6cb33af967cf73d8bd4"; + sha256 = "1m4b7pvpr5mg6g5sc9xhnn7i9lx65vb3ass38zkyrfgksg65lwhf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159637,8 +170864,8 @@ self: { ({ mkDerivation, base, basic-prelude, directory, shake }: mkDerivation { pname = "shakers"; - version = "0.0.16"; - sha256 = "d6f7d889b2030acbc12a233d1666828559c5c6d35ec688b9fc62ebed86eafeef"; + version = "0.0.27"; + sha256 = "0mlh6vzq7gdpyxm05y36fwjx0vjhbkk23qn2ajvc28l6d6d3p5ym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base basic-prelude directory shake ]; @@ -159657,8 +170884,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.12.1"; - sha256 = "057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac"; + version = "2.0.13"; + sha256 = "03jqmkvsf5ygg3szqr65xpd7c3yjivkbaxvkz683pwx7hqqpyzm6"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -159682,7 +170909,7 @@ self: { mkDerivation { pname = "shakespeare-babel"; version = "0.2.0.0"; - sha256 = "cf3f66f382407464059f7091d3a3c83c61ab32e0fcee9c6dd70d38623bce6bdf"; + sha256 = "1pvbrqxn4f0dsxnrrvpww0ranq9wr2ix74bhkw2n8x20hbrncgyg"; libraryHaskellDepends = [ base classy-prelude data-default directory process shakespeare template-haskell @@ -159697,7 +170924,7 @@ self: { mkDerivation { pname = "shakespeare-css"; version = "1.1.0"; - sha256 = "9f7b42cf07d14c5cec63be0fcef58601b2aa0a3f32dcd4dc4d52019d5d9fa0a1"; + sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; @@ -159710,7 +170937,7 @@ self: { mkDerivation { pname = "shakespeare-i18n"; version = "1.1.0"; - sha256 = "4518987cf113b8c8a52f8043dcb60f70f2cad12d778dd181ed6da276727a102a"; + sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; @@ -159723,7 +170950,7 @@ self: { mkDerivation { pname = "shakespeare-js"; version = "1.3.0"; - sha256 = "e4ca4b7603781fcfc53b77db1a980f004ffdd69f176fc35fd696b8bf5f663042"; + sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; @@ -159738,13 +170965,14 @@ self: { mkDerivation { pname = "shakespeare-sass"; version = "0.1.0.3"; - sha256 = "149227f017a72ee1f07420db8156b1ebfcf9a45197da272a83c714c2bf9a3299"; + sha256 = "169jkazw4567hcm2gnlpa6jgkz7bn5b83nr0fkqf2bm72zq2g4hl"; libraryHaskellDepends = [ base hsass shakespeare template-haskell yesod yesod-core ]; homepage = "https://github.com/brcha/shakespeare-sass"; description = "SASS support for Shakespeare and Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare-text" = callPackage @@ -159752,7 +170980,7 @@ self: { mkDerivation { pname = "shakespeare-text"; version = "1.1.0"; - sha256 = "2c1b041116648d5b0a13e524e94024f5bd17e2649d2e9e3418c66295568f3da2"; + sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; @@ -159765,7 +170993,7 @@ self: { mkDerivation { pname = "shana"; version = "2009.12.1"; - sha256 = "1eec7b29bae850e4b9eb97acf1e1e82515e2c26f7f29a7476b1764109735e139"; + sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y"; libraryHaskellDepends = [ base directory regex-posix ]; homepage = "http://github.com/nfjinjing/hack/tree/master"; description = "treat haskell functions as unix pipes"; @@ -159779,7 +171007,7 @@ self: { mkDerivation { pname = "shapefile"; version = "0.0.0.1"; - sha256 = "861b8690801627c30a7fc29d9265cde40cd4a69cdf9776c752c71cf96200cc48"; + sha256 = "0j6c01igj767ab3pd5yzkjkd8374rmjr57f2gw5c69qnh288c6w6"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 dbf filepath rwlock ]; @@ -159795,7 +171023,7 @@ self: { mkDerivation { pname = "shapely-data"; version = "0.1"; - sha256 = "c8c60ff6a754d58cb3bf40daaf9e880bfa5ba2e687fcfb2c19481a4f6accc1fa"; + sha256 = "1yn1rim4y6j834ngpz47wsi5pyhbi2gaznj0pyrqrmallzv0zin8"; libraryHaskellDepends = [ base proxy-kindness tagged template-haskell ]; @@ -159813,7 +171041,7 @@ self: { mkDerivation { pname = "sharc-timbre"; version = "0.2"; - sha256 = "4a5f16ee586d056ff9be7d148ec044f2c004ca67e5d7941a23ea5259929e9fb3"; + sha256 = "1cwzks95jlpa4cd99mz5cz509h7j8k08w53xpvwny1bdb3p1cpsa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/sharc"; description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra."; @@ -159828,7 +171056,7 @@ self: { mkDerivation { pname = "shared-buffer"; version = "0.2.2"; - sha256 = "6c0e66cbee85380dad6dcf69466670047ed947f75cca7cc824ad5cebf1522a0c"; + sha256 = "031aabqynp5d4k47rjjwyx3xjzh4f1k4csfgdnnhsf45xv5nc3kc"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -159845,7 +171073,7 @@ self: { mkDerivation { pname = "shared-fields"; version = "0.2.0.0"; - sha256 = "a7044f887276d9d630f613313c961af265027c6aa1ba8acf8ec402db0837f680"; + sha256 = "107n6w4dn0n4iv7qmfm1d9y04rgj3ab3qc8kyqqddnbnfa44y157"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base Cabal hspec lens text ]; homepage = "http://github.com/intolerable/shared-fields"; @@ -159859,7 +171087,7 @@ self: { mkDerivation { pname = "shared-memory"; version = "0.1.0.0"; - sha256 = "047d623f92bd4674105cbd05da0fa77b939f92c6eada1b4c6f276d8103920496"; + sha256 = "15h4j81q2v97dx61pnpaqs99z4vvlw7xl1dxbh878imxj8zn4z84"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base bytestring unix ]; homepage = "https://github.com/nh2/shared-memory"; @@ -159872,7 +171100,7 @@ self: { mkDerivation { pname = "sharedio"; version = "0.1.0"; - sha256 = "fb9f7973b81b952538f336749026daf337d54d4522dd6b5b8e970a6bc5aa1522"; + sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nh2/haskell-sharedio"; description = "Bundles shared calls to IO functions to perform them only once"; @@ -159884,9 +171112,9 @@ self: { mkDerivation { pname = "she"; version = "0.6"; - sha256 = "6cff306f22d7d8d99a1e61dfc0f9fb09ad3f8e21129eabb6ea68014998607274"; + sha256 = "0x3jc2c4j0b8xavap7hj4673zb89zgww1pv13sddkn6p49pk1zvc"; revision = "1"; - editedCabalFile = "a81a091b54a4da7f992291e8985919456775776078d3bf1e5e5a81eca66b7a38"; + editedCabalFile = "0f3sdfkfr0asbqgbzlvqc1vpars535cris4i4acpznm4ahdhj6m8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath mtl ]; @@ -159906,7 +171134,7 @@ self: { mkDerivation { pname = "shelduck"; version = "0.2.0.0"; - sha256 = "3e63b7e155ae45eb3bd7756e7afbcbfa34c5e4481ef50a6687ab82947192ffc1"; + sha256 = "1hgzj9qr90mbhxk0mx8y93jcad7srgxplvkmswxynidfaphvfqry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159937,7 +171165,7 @@ self: { mkDerivation { pname = "shell-conduit"; version = "4.5.2"; - sha256 = "427bc36d11b0b67f6cdfabc85a2dea95e65aed1dc16223af68832f4cff4b6c12"; + sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra control-monad-loop directory filepath monad-control monads-tf process resourcet @@ -159949,7 +171177,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "shell-conduit_4_6_0" = callPackage + "shell-conduit_4_6_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , control-monad-loop, directory, filepath, hspec , hspec-expectations, monad-control, monads-tf, process, resourcet @@ -159958,8 +171186,8 @@ self: { }: mkDerivation { pname = "shell-conduit"; - version = "4.6.0"; - sha256 = "9ce6230efb78589b5b28dd82396d73afbc832bbb8213f51c28ab6c946a9a12a1"; + version = "4.6.1"; + sha256 = "0hmdfrq2i1smgn6sjnxxzz4hyx9x8i1dwjpycia2xrssn3w63lc6"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra control-monad-loop directory filepath monad-control monads-tf process resourcet @@ -159980,7 +171208,7 @@ self: { mkDerivation { pname = "shell-escape"; version = "0.2.0"; - sha256 = "e23c9ba94a27e45430cb39e6bb236557e789d24129257c3def377f441b2cba4a"; + sha256 = "0jms5hdl8zrpxwypq9998798krspclivprirrcq59r179alrng72"; libraryHaskellDepends = [ base binary bytestring containers vector ]; @@ -159994,7 +171222,7 @@ self: { mkDerivation { pname = "shell-monad"; version = "0.6.4"; - sha256 = "23c4d4bd1cdff86c7a7f5496e86ba3b436cd3124d07b99e74a7f5dd2c586b1f2"; + sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -160005,7 +171233,7 @@ self: { mkDerivation { pname = "shell-pipe"; version = "0.1"; - sha256 = "deef9196866f3d81d490479e625a4bb497bda55d9f70f4ebf51e69286acfca77"; + sha256 = "0xyarxm2hs8yypmz8w4zbnjvv5xl9dd657j7j3a82gbghsb93vyy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -160023,7 +171251,7 @@ self: { mkDerivation { pname = "shellish"; version = "0.1.4"; - sha256 = "56b97529b71d2a0932925f3808d3d0446f288eddebbdfa8d9f9e5770448bbcd1"; + sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan"; libraryHaskellDepends = [ base bytestring directory filepath mtl process strict time unix-compat @@ -160040,8 +171268,8 @@ self: { }: mkDerivation { pname = "shellmate"; - version = "0.3.4.1"; - sha256 = "a66fb8d53eac5736dd7d69c7835af60ca2afff389c65e0972ab199b0983a6430"; + version = "0.3.4.2"; + sha256 = "123dv5mjj7nah9mm5yfgwv6ga5lwh4d9xi01zskm3z0ia4fdxs85"; libraryHaskellDepends = [ base bytestring directory filepath process temporary transformers unix @@ -160059,7 +171287,9 @@ self: { mkDerivation { pname = "shellmate-extras"; version = "0.3.4.1"; - sha256 = "f3dd62394e99af6cf92cb50c8ce1f3cd819448eda3009e8c11bb312e26f9b82e"; + sha256 = "0bmqz4k2wcdv2669w053xm4990fdyghqq35m5kwnrbwr9qwn5pgk"; + revision = "1"; + editedCabalFile = "11x8alavql8375misc8zry4sz73bz3hxqydmbk9hsymgvkdm51y6"; libraryHaskellDepends = [ base bytestring feed http-conduit http-types mime-types shellmate tagsoup text utf8-string xml @@ -160078,9 +171308,9 @@ self: { mkDerivation { pname = "shelltestrunner"; version = "1.3.5"; - sha256 = "4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829"; + sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2"; revision = "2"; - editedCabalFile = "647017bad45490fe4d5f549d21583d80c8ce69f3e4e8e4476c55707126b2e2b4"; + editedCabalFile = "1d72n8k72w2mdi3y9s74ydlwxj407mc237albx6zx42lsjx1fw34"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160104,7 +171334,7 @@ self: { mkDerivation { pname = "shelly"; version = "1.6.8.3"; - sha256 = "78ae736c22455b40176b47003be4ea9ea2d02b440f921a1a022e8536833a8487"; + sha256 = "11w47a1kd19f08d1m4hg8hmx18lyxbj3n027dcbl0ns549n77bkq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160131,7 +171361,7 @@ self: { mkDerivation { pname = "shelly-extra"; version = "0.3.0.2"; - sha256 = "19d39c38a90fb19d9f79a648d72f73d0a5ec2bd3788abf7dac3d77da19ae5446"; + sha256 = "0ijlmqcxlxrxmiyvz2kqscmyr9fhfcpxfj56g6grvc8gm4w9rlqr"; libraryHaskellDepends = [ async base mtl SafeSemaphore shelly ]; testHaskellDepends = [ async base hspec HUnit mtl SafeSemaphore shelly text @@ -160147,8 +171377,8 @@ self: { }: mkDerivation { pname = "shentong"; - version = "0.3.1"; - sha256 = "b751f79e565899e36b71c6b31a51adb46fd61899b3cdadbb05631d03514bb523"; + version = "0.3.2"; + sha256 = "0519wcb9pgyv3rwgw0qvvjr9s18wr1j4rhyxbv4vn4czv880ds43"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160159,24 +171389,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shift" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring + , composition, data-default, lens, optparse-applicative + , system-fileio, system-filepath, text, turtle + }: + mkDerivation { + pname = "shift"; + version = "0.1.0.0"; + sha256 = "10mbb64cxv4iin6ic9bgl5l431g3mc91jcpns71k85w8imbfiypd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring composition data-default lens + optparse-applicative system-fileio system-filepath text turtle + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/teleport#readme"; + description = "A tool to quickly switch between directories"; + license = stdenv.lib.licenses.mit; + }) {}; + "shikensu" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow , Glob, tasty, tasty-hunit, text, unordered-containers }: mkDerivation { pname = "shikensu"; - version = "0.2.1"; - sha256 = "3984671ee884f828df248aa5d9033ece376ecb30cb0f689a4a4aa10a93d697f8"; + 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; }) {}; @@ -160187,10 +171438,8 @@ self: { }: mkDerivation { pname = "shine"; - version = "0.1.0.0"; - sha256 = "b20ef3b3c40df6f53bf4eefeaf8d53482f3729562626744095c101641ae469a0"; - revision = "1"; - editedCabalFile = "650580b5783e188ebeda9d052966052dba2fad5a971cbe078e5046b120ed1f1a"; + version = "0.2.0.2"; + sha256 = "0r0rl65rkcdg8c8lzli87nfad8bk4xypiqvb2qs68fhhzwx1zfg2"; libraryHaskellDepends = [ base ghcjs-dom ghcjs-prim keycode mtl time transformers ]; @@ -160206,9 +171455,9 @@ self: { mkDerivation { pname = "shine-varying"; version = "0.1.0.0"; - sha256 = "80301d12099fa02193881457cf80603b00d8c0fe59ef3a8e75f1f81491fbb68e"; - revision = "1"; - editedCabalFile = "fb542604b1af45c5cc7af83446a69b309d6b00f6c6070b0bde09843d4d1e718c"; + sha256 = "13mnzf8i9y7ifn73mvsrzv0dh01vc20cymqli29j384z1491sc40"; + 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"; @@ -160224,7 +171473,7 @@ self: { mkDerivation { pname = "shivers-cfg"; version = "0.1.1"; - sha256 = "ecf4dfb70e6a98f9a5304329d8f4893f88e7c51904f6a599961b9f4b9f7664c1"; + sha256 = "1hb4fsglp7qvjscsbxh4372yg21zi7sdhaa362jzk63a1svxzx7c"; libraryHaskellDepends = [ base containers directory HPDF language-dot mtl pretty process ]; @@ -160237,7 +171486,7 @@ self: { mkDerivation { pname = "shoap"; version = "0.2"; - sha256 = "3b153cd9b93959cb3f90bc98755898653bd27f4e52a475b5d818df36dd428b7b"; + sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v"; libraryHaskellDepends = [ base curl ]; homepage = "http://richardfergie.com/shoap"; description = "A very basic SOAP package"; @@ -160245,24 +171494,58 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shopify" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, bytestring, containers + , control-monad-exception, http-conduit, http-types, lifted-base + , mtl, resourcet, safe, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "shopify"; + version = "0"; + sha256 = "17ws133ysx133jpacsivracys4rn9mj5ppfa1sr5gjbk6xzsi65h"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring bytestring + containers control-monad-exception http-conduit http-types + lifted-base mtl resourcet safe text time unordered-containers + vector + ]; + homepage = "https://oss.xkcd.com/"; + description = "A haskell API binding for shopify.com"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shortcircuit" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "shortcircuit"; version = "0.1"; - sha256 = "dfd08116f853c3f0f28864606f11bf21d3b5da4104e97628d172864b9fc9ec09"; + sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aristidb/shortcircuit"; description = "Short-circuit values and expressions"; license = stdenv.lib.licenses.bsd3; }) {}; + "shortcut" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shortcut"; + version = "0.1"; + sha256 = "1w9gz6wjs22jc71sxbkq5snz1jbzd372qnavhnnpj587518dfa8a"; + revision = "1"; + editedCabalFile = "14yp03pynaw3wwj6fnnr6ns7f74h2x7m75wvg3dkxc0dv6snl9l7"; + libraryHaskellDepends = [ base ]; + homepage = "http://www.nomyx.net"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shortcut-links" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "shortcut-links"; version = "0.4.2.0"; - sha256 = "1e6b75c5e94fddf9e2e665821ac70f5083e5d40d1fd55813e94943ce02335027"; + sha256 = "09sh6c1cwhs9x49mim8z1pafb0sh1z3im0k5wvigkpagx72pasqy"; libraryHaskellDepends = [ base text ]; homepage = "http://github.com/aelve/shortcut-links"; description = "Link shortcuts for use in text markup"; @@ -160274,7 +171557,7 @@ self: { mkDerivation { pname = "shorten-strings"; version = "0.1.0.1"; - sha256 = "83771a79080efe72a813cd7839266b95badcf03c9ea4fd6907f6873e055b38eb"; + sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3"; libraryHaskellDepends = [ base text ]; homepage = "https://github.com/Tarrasch/shorten-strings"; description = "Shorten a variety of string-like types adding ellipsis"; @@ -160287,7 +171570,7 @@ self: { mkDerivation { pname = "should-not-typecheck"; version = "2.1.0"; - sha256 = "f538ac70ce07679bc2e6c1651db82a86866664ab995665fdc78e6cb12bd8d591"; + sha256 = "14fmv0mv2v4fqzynamlrmdj6d1l65aw1srf1wv19nrq7rrqaqf7m"; libraryHaskellDepends = [ base deepseq HUnit ]; testHaskellDepends = [ base deepseq hspec hspec-expectations HUnit @@ -160302,19 +171585,19 @@ self: { mkDerivation { pname = "show"; version = "0.6"; - sha256 = "4f57a947a538d021406f649049dde27d4d8d0b44aac3ba38fa64806c9d737b95"; + sha256 = "15bvfffnr034z8wbmhxa8h5qskbxwbflk434dx023l1qlm3sjmsg"; libraryHaskellDepends = [ base syb ]; description = "'Show' instances for Lambdabot"; license = "GPL"; }) {}; "show-please" = callPackage - ({ mkDerivation, base, mtl, parsec, template-haskell }: + ({ mkDerivation, base, mtl, parsec, template-haskell, time }: mkDerivation { pname = "show-please"; - version = "0.3"; - sha256 = "1abd203bf8f0ac863f38f1be813594e0ab30ad5b79aa31730926586c40db642e"; - libraryHaskellDepends = [ base mtl parsec template-haskell ]; + version = "0.4.2"; + sha256 = "16frhvbq395p3n54r5iv0xfjlj679gjm4sgsdbawanp9h1yhiwnl"; + libraryHaskellDepends = [ base mtl parsec template-haskell time ]; homepage = "https://github.com/ddssff/show-please"; description = "A wrapper type V with improved Show instances"; license = stdenv.lib.licenses.bsd3; @@ -160324,8 +171607,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: mkDerivation { pname = "show-prettyprint"; - version = "0.1.2"; - sha256 = "5b9e93c48e91f1c91d3b2fcf214ea085f08292ee36916c324709532a7446e7a6"; + version = "0.1.2.1"; + sha256 = "1zwvaa91r4scfxxlbqzfi335bqb3jrgbkkq38dysny52fg6mn565"; libraryHaskellDepends = [ ansi-wl-pprint base trifecta ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/quchen/show-prettyprint#readme"; @@ -160333,12 +171616,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.2"; + sha256 = "14yjffqjkadmb0aw3zf2n1v525vn293rinhmbwby71ch76nij42w"; + revision = "1"; + editedCabalFile = "1hkfq59kpx3p4rgka49l3hvim80xlqf5h3q8f1xb4arysrq3pvi4"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/quchen/show-prettyprint#readme"; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "show-type"; version = "0.1.1"; - sha256 = "dbfb5b2771a51116a494a62e4e39096809e1330beca97d3e7fe7b120378af7ea"; + sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/Kinokkory/show-type"; description = "convert types into string values in haskell"; @@ -160350,7 +171653,7 @@ self: { mkDerivation { pname = "showdown"; version = "0.5.3"; - sha256 = "30db60268dcf6068572d32357bc051696b1c4392691c1651d3b6fec2295af2be"; + sha256 = "1gpjb8lw5zmnsd8ic739j91iqsv9a707nd9j5mbnhq6gilk61nrh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base glade gtk random ]; @@ -160366,7 +171669,7 @@ self: { mkDerivation { pname = "shpider"; version = "0.2.1.1"; - sha256 = "8d4f42c2263354d5cb144f52b97ebc6e2f0200a00f57ed961cd70955e90fe4a4"; + sha256 = "19741zlma2fp3jbfsmqgl0004bvfpizbjljg2k5xam1k4v144kwd"; libraryHaskellDepends = [ base bytestring containers curl mtl regex-posix tagsoup tagsoup-parsec time url web-encodings @@ -160382,7 +171685,7 @@ self: { mkDerivation { pname = "shplit"; version = "0.3"; - sha256 = "b9636aaea1b87d01115bdbd67fdadde4c310004ebf1bccab442b0e82503fb472"; + sha256 = "0wml7x8843ib8jmwq6xz9q011hz4vpd7zmnvbc8h2zdql6p6lqxr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl ]; @@ -160398,7 +171701,7 @@ self: { mkDerivation { pname = "shqq"; version = "0.1"; - sha256 = "954197351bfd112485c080b3e01846df099fed793978406ba73a00802db5ad22"; + sha256 = "08mdnlnq001slxml0y1rg7nry2fz8qcf1cw0q22j84gx3csrfhcm"; libraryHaskellDepends = [ base parsec posix-escape process template-haskell unix ]; @@ -160414,7 +171717,7 @@ self: { mkDerivation { pname = "shuffle"; version = "0.1.3.3"; - sha256 = "2de785a94947c3e34d17643ca96a6a65421a53b28290ff87571d0d34ee50fb59"; + sha256 = "0ngva3p3838xay3zz442n99ilhk5d9majg342x6y7hs796lqbrrd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160432,7 +171735,7 @@ self: { mkDerivation { pname = "shunya-library"; version = "0.1.0.4"; - sha256 = "a497607995efa72ded74f07eb4305afc1bfe9c9df0c70f9334fa062d6f6db1c6"; + sha256 = "1imidmpjs1ps6j9hzizhknfgw6zwb8qb8zphfknjv9zgjmwn15x4"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/githubuser/shunya-library#readme"; description = "Initial project template from stack"; @@ -160444,13 +171747,26 @@ self: { mkDerivation { pname = "shunyalib"; version = "0.1.0.1"; - sha256 = "ea423c1b87c14dea651bbb6fbbaa6b6c186c7c8014e8308e176071091deb06fa"; + sha256 = "1yh6xcfhjwb02y731s0lh1y6q63cdfmbnvxv3djylkf1hwdkqhpa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/penguinshunya/shunyalib"; description = "Initial project template from stack"; 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 @@ -160459,8 +171775,8 @@ self: { }: mkDerivation { pname = "sibe"; - version = "0.2.0.4"; - sha256 = "104038b009602b8cd3a9a9211d2c67cf585c7c5e3d69a2a16df0348fa5958ddc"; + version = "0.2.0.5"; + sha256 = "0sj4k0z3w18hwzfb32dnscidksj05awspvqdhx49j7ckbc155aic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160483,7 +171799,7 @@ self: { mkDerivation { pname = "sieve"; version = "0.1.0.1"; - sha256 = "15156000b39d8f8ef7cd330e64306be70f2aecf9abee9c7e2f14a338e0e7f2a7"; + sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m"; libraryHaskellDepends = [ base ]; homepage = "http://www.the-singleton.com"; description = "Sieve is an implementation of the Sieve abstract data type"; @@ -160497,7 +171813,7 @@ self: { mkDerivation { pname = "sifflet"; version = "2.3.0"; - sha256 = "0415b97daa7be921421716fbda8e5ab8138f707b636b0a45db5580df842d0ed4"; + sha256 = "1m0f5n2dz02mvd2hlsv3gdq8y4xqba7dmyqn2x123sbvm9yvj584"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160521,7 +171837,7 @@ self: { mkDerivation { pname = "sifflet-lib"; version = "2.2.1"; - sha256 = "c41690960ae9b101257f3438c87115e25b7e6f42636af11615994c4d37c0caea"; + sha256 = "1snaq0vlsk4r2lbg2sk389ppwnz22mqwhf1lgwjh3cg91ab905n4"; libraryHaskellDepends = [ base cairo containers directory fgl filepath glib gtk hxt mtl parsec process unix @@ -160540,7 +171856,7 @@ self: { mkDerivation { pname = "sigma-ij"; version = "0.2.0.2"; - sha256 = "6ca35a8cbb816509c0110cf53c5ce3d34167cafa25a80d7064694d01970a9a19"; + sha256 = "06cs1abh2kb9ciq0va15zb56fhfkwdf3rx8c2700jrc1pf65m8vc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160564,7 +171880,7 @@ self: { mkDerivation { pname = "sign"; version = "0.4.3"; - sha256 = "77855b6953a17cdba1459efc5241b7174cd628629583245ced96684dfd1f7544"; + sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -160581,7 +171897,7 @@ self: { mkDerivation { pname = "signal"; version = "0.1.0.3"; - sha256 = "1df5108befee3eaefb5a826eb83df60f192ff3f3e264d998a7e491d60f388ac7"; + sha256 = "1iwa707xd4g4lycdjr72ygrjy68gyqyvhvl2bbxswgpfxy5i1x8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base unix ]; @@ -160598,7 +171914,7 @@ self: { mkDerivation { pname = "signals"; version = "0.2.0.2"; - sha256 = "2dc14b0a4f9c20efb16d00be1f6cc6e1aa0a586f56c67d3506f14cf12b8ee4aa"; + sha256 = "1ap4iqmz2k7i0qspvijndxc0map1qrn1zgh0dnqyy84w9w54ph9d"; libraryHaskellDepends = [ base containers hashable imperative-edsl-vhdl language-vhdl mtl observable-sharing operational-alacarte @@ -160613,7 +171929,7 @@ self: { mkDerivation { pname = "signed-multiset"; version = "0.4"; - sha256 = "871c2890e4817a2fab924e5e40f7279a53a969040e470d4d4faeab92c033b15f"; + sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747"; libraryHaskellDepends = [ base containers ]; description = "Multisets with negative membership"; license = stdenv.lib.licenses.bsd3; @@ -160625,7 +171941,7 @@ self: { mkDerivation { pname = "silently"; version = "1.2.5"; - sha256 = "cef625635053a46032ca53b43d311921875a437910b6568ded17027fdca83839"; + sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf"; libraryHaskellDepends = [ base deepseq directory ]; testHaskellDepends = [ base deepseq directory nanospec temporary ]; homepage = "https://github.com/hspec/silently"; @@ -160638,7 +171954,7 @@ self: { mkDerivation { pname = "simd"; version = "0.1.0.1"; - sha256 = "1559eddddc48827fd7f7432c5ee0960218779198713c67ed8181cc334b38b766"; + sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m"; libraryHaskellDepends = [ base ghc-prim primitive vector ]; homepage = "http://github.com/mikeizbicki/simd"; description = "simple interface to GHC's SIMD instructions"; @@ -160653,7 +171969,7 @@ self: { mkDerivation { pname = "simgi"; version = "0.3"; - sha256 = "6a05ee3727c9166a4236104992c3962a257d31c25ed52286251e699fd2490dfb"; + sha256 = "1yqd9799ys8y4n325mayq8qps99ajv1r4j8h6r16l5n94wvyw1ba"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160674,8 +171990,8 @@ self: { }: mkDerivation { pname = "simple"; - version = "0.11.1"; - sha256 = "74c3cfb9a92cbaebb47e8abbc7d918947a05340fd0d4fab1661ff8e777f5e815"; + version = "0.11.2"; + sha256 = "05069qjgzm4j22p0q6i75qpsvzpw52b7bh2x2b6jcxnlvqp6flzg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160705,7 +172021,7 @@ self: { mkDerivation { pname = "simple-actors"; version = "0.4.0"; - sha256 = "45f01ff746bf4d6a99e794ec9042f62e2953ba438c40a56cecbe14f74cf6b28f"; + sha256 = "13xjyr6gf55yxinaah4c8fx56a9fyr191v4lwycnlkdz8vvizw25"; libraryHaskellDepends = [ base chan-split contravariant mtl transformers ]; @@ -160719,7 +172035,7 @@ self: { mkDerivation { pname = "simple-atom"; version = "0.2"; - sha256 = "27a86db825f2612e758626ea689fb7de65215f83c32abf77a777803cbc5213cf"; + sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17"; libraryHaskellDepends = [ base containers deepseq ]; homepage = "http://github.com/nominolo/simple-atom"; description = "Atom (or symbol) datatype for fast comparision and sorting"; @@ -160732,7 +172048,7 @@ self: { mkDerivation { pname = "simple-bluetooth"; version = "0.1.0.0"; - sha256 = "c44903818723dc28cfc22b77be471b43740d5858760032563383b22d3cde34e3"; + sha256 = "1qrlvqy2vcl36db3403nb1c0sx233d3vwxrbqb7jip13hy0h6jf4"; libraryHaskellDepends = [ base bytestring network ]; librarySystemDepends = [ bluetooth ]; description = "Simple Bluetooth API for Windows and Linux (bluez)"; @@ -160749,7 +172065,7 @@ self: { mkDerivation { pname = "simple-c-value"; version = "0.0.0.1"; - sha256 = "faa1bc552624fab7eed87c250ebee3691a4b026de4874035ea9014c668f4c04f"; + sha256 = "0ky0yilcc54hx8sl11z4dl14n6k9wfz0w9bwv3pbgyi44ravr8gs"; libraryHaskellDepends = [ base DebugTraceHelpers dlist ghc-prim tuple ]; @@ -160776,7 +172092,7 @@ self: { mkDerivation { pname = "simple-conduit"; version = "0.6.0"; - sha256 = "184446555a051992f1a7111af95e84c6cf4a89bdd97c68d354cf9100cb2414fe"; + sha256 = "1zhl4k5h14fgak9nhz6rpn4lmky6higgj6hilzqr4685b9alci0q"; libraryHaskellDepends = [ base bifunctors bytestring chunked-data containers either exceptions filepath free lifted-async lifted-base mmorph @@ -160804,7 +172120,7 @@ self: { mkDerivation { pname = "simple-config"; version = "1.2.2.1"; - sha256 = "b3b402f162294712e98df54f70d876d490e402d7f78d8daaf435338f2ffdacd9"; + sha256 = "1ndczlpqycrmyjm8v3gpsw1f946lfvc70kzmipli4ir9cbqh5d5k"; libraryHaskellDepends = [ base bytestring data-default network-uri parsec template-haskell transformers @@ -160823,7 +172139,7 @@ self: { mkDerivation { pname = "simple-css"; version = "0.0.4"; - sha256 = "2daa84af038988c43214d5913d500b425568379708d2a26fe127ca97aef342a5"; + sha256 = "19a2yfp9gji7w5ps5lh8jwvnhma21d83v4fm2hrc92490fpq9aid"; libraryHaskellDepends = [ base blaze-html hashable language-css unordered-containers ]; @@ -160839,7 +172155,7 @@ self: { mkDerivation { pname = "simple-download"; version = "0.0.2"; - sha256 = "57aafeb55eb54811b6bba0f41f01af2a95e6bb8d1288bab5d2fd7749b9f90fce"; + sha256 = "1khgz6wljxzxsasvm20jinxyd59amw0izx50pfv12j5mbsszxajp"; libraryHaskellDepends = [ base conduit-combinators http-client http-conduit mtl transformers ]; @@ -160855,8 +172171,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.7.0.1"; - sha256 = "be3d3ca1fbfc2aee432190f0e737b73478116493beb176216dcad0b1a8c0bc4d"; + version = "0.9.0.1"; + sha256 = "1n5jr909g410zfy0vk4pvl5phy981hhxsx61hcm6p99f0vdybcwx"; libraryHaskellDepends = [ array base exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -160874,7 +172190,7 @@ self: { mkDerivation { pname = "simple-eval"; version = "0.1.0.1"; - sha256 = "d451a131fd79265a7c828e583cc73a4805ef9070b639a900f72aacc3dc7dada0"; + sha256 = "185dgpfc7b1ayw0ajfdnf28fy1a87b3kqn4fh9y5l9krzlqs2lfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec text transformers ]; @@ -160890,7 +172206,7 @@ self: { mkDerivation { pname = "simple-firewire"; version = "0.1.3.4"; - sha256 = "6a0262e44884355ec4ff12ab9e9f9e61d251770c8328d9df7eae4ebcc71fd091"; + sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka"; libraryHaskellDepends = [ base bindings-dc1394 CV ]; homepage = "https://github.com/aleator/simple-firewire"; description = "Simplified interface for firewire cameras"; @@ -160905,7 +172221,7 @@ self: { mkDerivation { pname = "simple-form"; version = "0.5.0"; - sha256 = "a368dd06d7f0a9b49ebe40efb776a744d2854319e7a1c09d18aeef91cab9f806"; + sha256 = "01pqp7593vxf32fw18g7351qblj4lxvbgvs0psgb9aghsw3dss53"; libraryHaskellDepends = [ base blaze-html digestive-functors email-validate network-uri old-locale text time transformers @@ -160921,7 +172237,7 @@ self: { mkDerivation { pname = "simple-genetic-algorithm"; version = "0.2.0.0"; - sha256 = "112762752cf5b12e0fe8f2baea2db1575fe27eabf5b70a43fb01ed3deb42fe91"; + sha256 = "14gy8bmkvv81zd1hmdzmmdzf4pspn4nymfpjx07jxcgm5isn49qi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parallel random ]; @@ -160939,7 +172255,7 @@ self: { mkDerivation { pname = "simple-genetic-algorithm-mr"; version = "0.4.0.0"; - sha256 = "fe291cea3efeb0661f2fc725b6bebf171a82fa047613589082adde562c1176a4"; + sha256 = "193n24n5dpmdha85h4vn0kx846hppyzbc9f75wgndc7y7vm1qagy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160958,7 +172274,7 @@ self: { mkDerivation { pname = "simple-get-opt"; version = "0.1.0.0"; - sha256 = "855a59d47d3e1170fe7c887ccd9d08fc8af2b791bbcecc4b34dbdad1e5342ac2"; + sha256 = "1hia6kjx3nnv6i5wrkmvj6vz52pw12fwsz48gkz7049ygpa5jnl5"; libraryHaskellDepends = [ base ]; description = "A simple library for processing command-line options"; license = stdenv.lib.licenses.bsd3; @@ -160971,7 +172287,7 @@ self: { mkDerivation { pname = "simple-index"; version = "0.1.0.1"; - sha256 = "feb5e62c9aaed9a347a39216db0d8e18b614aee96f172eed5b2d87bd14c4b670"; + sha256 = "0w5nqhabv1rdbgnjw5vgx6p19dhqiq6xn5ljld3s7ndfk8nfddgy"; libraryHaskellDepends = [ base containers hashable safecopy unordered-containers ]; @@ -160988,7 +172304,9 @@ self: { mkDerivation { pname = "simple-log"; version = "0.5.1"; - sha256 = "d1b7cd207877886538332e10b80ae39815e418474c5431b80bc9aa10df2edbf6"; + sha256 = "1xnv5vgi1an91fw32m2c8wcf85cqwc5bh41f6cw6b23pg0hcvdyi"; + revision = "1"; + editedCabalFile = "0xqzi65hhmazyqpvw2c7rzs49xdm4rah84kcz7w3c25zac9hbxl2"; libraryHaskellDepends = [ async base containers deepseq directory exceptions filepath mtl SafeSemaphore text time transformers @@ -160998,19 +172316,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "simple-log_0_6_0" = callPackage - ({ mkDerivation, async, base, containers, data-default, deepseq - , directory, exceptions, filepath, hformat, mtl, SafeSemaphore + "simple-log_0_9_2" = callPackage + ({ mkDerivation, async, base, base-unicode-symbols, containers + , data-default, deepseq, directory, exceptions, filepath, hformat + , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore , text, time, transformers }: mkDerivation { pname = "simple-log"; - version = "0.6.0"; - sha256 = "e22ba314bcfc3be5594db3d2a7ad505dcbf7b89d91e6f71f9921d80b76fadc5d"; + version = "0.9.2"; + sha256 = "13a1rqbig0q0nkkwk33vq7vp6w4dvm8famf5dpydw3vlizwh4db9"; libraryHaskellDepends = [ - async base containers data-default deepseq directory exceptions - filepath hformat mtl SafeSemaphore text time transformers + async base base-unicode-symbols containers data-default deepseq + directory exceptions filepath hformat microlens microlens-platform + mmorph mtl SafeSemaphore text time transformers ]; + testHaskellDepends = [ base hspec microlens-platform text ]; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -161022,7 +172343,7 @@ self: { mkDerivation { pname = "simple-log-syslog"; version = "0.2.0"; - sha256 = "6430e132a9159897a58bf15796049508c2762229af472621af4e95ffba962998"; + sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34"; libraryHaskellDepends = [ base hsyslog simple-log text ]; homepage = "http://github.com/mvoidex/simple-log-syslog"; description = "Syslog backend for simple-log"; @@ -161035,7 +172356,7 @@ self: { mkDerivation { pname = "simple-logger"; version = "0.0.3"; - sha256 = "5fb002bcf2eaf6aac949acea31d0ee65a08fc4d34f6baf222db4db05c8165ec1"; + sha256 = "1hay2v40bnxl5liayssgsg28z835xv833smc974smxpayay05c2z"; libraryHaskellDepends = [ base fast-logger mtl text ]; homepage = "https://github.com/agrafix/simple-logger#readme"; description = "A very simple but efficient logging framework"; @@ -161043,12 +172364,35 @@ 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 { pname = "simple-money"; version = "0.2.0.1"; - sha256 = "8ebb01c9704377dcc0a945218ff9038fcda3ecf36ecd7f26265e407ba6c5112e"; + sha256 = "0bhiqnk7nh2y4qk7zkbfygna7kcg0gwqy8a5m70dqxs3f34h3fwf"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/nbrk/simple-money"; description = "Simple library to handle and interexchange money"; @@ -161061,7 +172405,7 @@ self: { mkDerivation { pname = "simple-neural-networks"; version = "0.2.0.1"; - sha256 = "7e9fe8d8fefa25f6e71c3436178647ddf379fde00f0dede35df9e214b4db791d"; + sha256 = "07brvfs19qprbpiys38gw3ypkwyx8y31fdil3kkzc9gszvcfi7vy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161084,7 +172428,7 @@ self: { mkDerivation { pname = "simple-nix"; version = "0.1.0.4"; - sha256 = "0ec00ae2b76da265d9cadf599545c90b3e99a52f2af52bc334aefd7467cfcacf"; + sha256 = "1kyarxkp9zdf6k1jpx9a5yjrjghbr52ranfzrbcnb8kdnzi0mh0f"; libraryHaskellDepends = [ base classy-prelude error-list MissingH mtl parsec system-filepath text text-render unordered-containers @@ -161104,7 +172448,7 @@ self: { mkDerivation { pname = "simple-observer"; version = "0.0.1"; - sha256 = "99080b3da7bed2d64654a1e98592081bc9af52de91f7b96a96976625bfe15fda"; + sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/gimbo/observer.hs"; description = "The Observer pattern"; @@ -161118,7 +172462,7 @@ self: { mkDerivation { pname = "simple-pascal"; version = "0.1"; - sha256 = "73b631583fe71c2da265f35b9c92726bcb118e3b94842d697f223ffd942835db"; + sha256 = "1nrm52agsgr2gxljv14l7f713jvbfa99qnzkcni2s7777xc33dkk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161136,7 +172480,7 @@ self: { mkDerivation { pname = "simple-pipe"; version = "0.0.0.29"; - sha256 = "d01bdd5971a18ba739d2dad2b68fcbe71d03c4fd0db3d18be9010251023a8c46"; + sha256 = "0ilc781520h1x65x3cqdzp2067g7rf7vdlnss8wsg2x1f5cxs6yh"; libraryHaskellDepends = [ base bytestring lifted-base monad-control monads-tf stm transformers-base @@ -161154,7 +172498,7 @@ self: { mkDerivation { pname = "simple-postgresql-orm"; version = "0.9.0.1"; - sha256 = "3f0fe86dac2b70662340c5b36d42b11083a57e0beb16df62931d32c73d313b48"; + sha256 = "0j1v64ywfchxjdidy5pb1dzab0qhn516vcy580incw1bminyh3rz"; libraryHaskellDepends = [ base bytestring directory filepath postgresql-orm postgresql-simple resource-pool simple transformers @@ -161170,7 +172514,7 @@ self: { mkDerivation { pname = "simple-reflect"; version = "0.3.2"; - sha256 = "38224eb3d0d5eafc7101ad48fa92001c3e753a015d53bb12753a3836b871ecb6"; + sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq"; libraryHaskellDepends = [ base ]; homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions"; description = "Simple reflection of expressions containing variables"; @@ -161182,7 +172526,7 @@ self: { mkDerivation { pname = "simple-rope"; version = "0.1"; - sha256 = "f4e67aa1a80392fc5208e1866cec8126570465dec06a8b6ab17b478bec83efa0"; + sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl"; libraryHaskellDepends = [ base bytestring QuickCheck ]; homepage = "http://github.com/jkff/haskell-rope"; description = "Memory-efficient strings with concatenation and splitting"; @@ -161196,9 +172540,9 @@ self: { mkDerivation { pname = "simple-sendfile"; version = "0.2.25"; - sha256 = "0ae68821cd828b29772654b5613d514a421b1b1440d82a4b610339e67a92294d"; + sha256 = "0k99j9xfcf83c55jmn202hdinhjaa4yn3dal4rvjk2w2rlhqirha"; revision = "1"; - editedCabalFile = "ac78b431148355d859f1b432ce367faf04ba14c244b30818fd0ffc28ec86afab"; + editedCabalFile = "1axghvn2iz0gzlc0ics4q8abl15ggwvcwcmly5cxhmc32hqv8y5c"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -161215,7 +172559,7 @@ self: { mkDerivation { pname = "simple-server"; version = "0.0.3"; - sha256 = "99713528713f4a5cb85cda6100c5b9d6fdd83c29117081b0764cfa193d9bb862"; + sha256 = "0qmqkcyikyjcfsq82w0i54ydizfnp72h0qfsbjw5qjizf4l3awcr"; libraryHaskellDepends = [ base bytestring concurrent-extra containers hashtables network time unbounded-delays @@ -161232,7 +172576,7 @@ self: { mkDerivation { pname = "simple-session"; version = "0.10.1.1"; - sha256 = "8a9c9cb7a80080b6440a80549919d3cee3409af6c516b3d10d1392708b48e7c1"; + sha256 = "1hg7925p14hk1p8v65n5ysd41qyfsccrjm40192bd000m2vrr74a"; libraryHaskellDepends = [ base base64-bytestring blaze-builder byteable bytestring containers cookie cryptohash http-types simple transformers wai wai-extra @@ -161247,7 +172591,7 @@ self: { mkDerivation { pname = "simple-sessions"; version = "0.1.3"; - sha256 = "c5cf055d0f41d68332363f676720c742b110d2d622b466af14f7a51ac3534b21"; + sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5"; libraryHaskellDepends = [ base indexed synchronous-channels ]; homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/"; description = "A simple implementation of session types"; @@ -161259,7 +172603,7 @@ self: { mkDerivation { pname = "simple-smt"; version = "0.6.0"; - sha256 = "0cb4d409cb0cf99a9f26c405dc7626c1206d5bffec925ce202f42327b769b695"; + sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -161270,7 +172614,7 @@ self: { mkDerivation { pname = "simple-smt"; version = "0.7.0"; - sha256 = "87191687e3e0e63375a99520866de5eaa318b4f41f15adbcdffc3786e58687a5"; + sha256 = "19c7hvjqcdzwvyyas58zyjs1i8zawmnqc84mm5sk7rp0wf3ic6c7"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -161284,7 +172628,7 @@ self: { mkDerivation { pname = "simple-sql-parser"; version = "0.4.2"; - sha256 = "ba720de50c82b47a90a1774e7b50365483801cfcb19e664cd184e04003ec7b04"; + sha256 = "013vxh1l1q44s566d7mizhf810sl6r87nkkpl687md421kjhswms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; @@ -161304,7 +172648,7 @@ self: { mkDerivation { pname = "simple-stacked-vm"; version = "0.1.1"; - sha256 = "ed0aafb33a8620b8c5c76c6fc9a7de9e62a522a52fd459e2a4349a6f9c6a30bf"; + sha256 = "1grhdaf6z6illki5km1glliaaqlyvskwjvvcqz2vh8467arsy2pd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161319,7 +172663,7 @@ self: { mkDerivation { pname = "simple-tabular"; version = "0.1.0.0"; - sha256 = "faa78536335a8b7579bb68a4f7d79e6ed3b7c4a0674566ae028fc36c3c6af95c"; + sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/BartMassey/simple-tabular"; description = "Simple tabular-text formatter"; @@ -161334,7 +172678,7 @@ self: { mkDerivation { pname = "simple-tar"; version = "0.5.1"; - sha256 = "d53ea4544827bfb99f8f79ddfca3888b642f8cb67d43616b7cbdcb0ca1da0e5f"; + sha256 = "0pqfvahhrjxxgimn2hvxns62yr4bi2izrpbriygvkgr791aa8gnm"; libraryHaskellDepends = [ base bytestring cereal containers filepath time ]; @@ -161349,7 +172693,7 @@ self: { mkDerivation { pname = "simple-templates"; version = "0.8.0.1"; - sha256 = "28e10f916320bb5097d9ed323a1726d88d17a51b0ac0290a91806d97840bca8e"; + sha256 = "13na1f29fvc0j452kh0a3fjig3fq4qbklcpdv6bm1fr0cf8hzq98"; libraryHaskellDepends = [ aeson attoparsec base scientific text unordered-containers vector ]; @@ -161361,6 +172705,23 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "simple-text-format" = callPackage + ({ mkDerivation, attoparsec, base, hspec, microlens-platform, text + , unordered-containers + }: + mkDerivation { + pname = "simple-text-format"; + version = "0.1"; + sha256 = "1k8pdc0hr09zkqnc9rzzkr0w89y9kqnj1mv60y0z5hfblwpk5xk6"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + base hspec microlens-platform text unordered-containers + ]; + homepage = "https://github.com/JustusAdam/simple-text-format#readme"; + description = "Simple text based format strings with named identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-vec3" = callPackage ({ mkDerivation, base, criterion, QuickCheck, tasty , tasty-quickcheck, tasty-th, vector, vector-th-unbox @@ -161368,7 +172729,7 @@ self: { mkDerivation { pname = "simple-vec3"; version = "0.2"; - sha256 = "65a8987ee8ebff519c2702a8df038f77a28dda711feb1a6e556eb8c19be0f680"; + sha256 = "107nw2dw3f3famp1msqzf7d8v8kpiw1xza024yf53zzbx1z9ia35"; libraryHaskellDepends = [ base QuickCheck vector vector-th-unbox ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector @@ -161388,7 +172749,7 @@ self: { mkDerivation { pname = "simple-zipper"; version = "0.1.0.0"; - sha256 = "5effbfc34606e59f411e4f49e1574d841722d89f5e0023e37ec49f602e4e25aa"; + sha256 = "1ai59qp617y4gvij602ykzc245w49mby2jag3r0rzr868v1vzzsy"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base hspec lens ]; homepage = "https://github.com/DanielWaterworth/simple-zipper"; @@ -161401,7 +172762,7 @@ self: { mkDerivation { pname = "simpleargs"; version = "0.2.1"; - sha256 = "d750a8afc1bec827da07650453e90fcfdd34d3317681a64db6fca431d69532bf"; + sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p"; libraryHaskellDepends = [ base ]; homepage = "http://malde.org/~ketil/simpleargs"; description = "Provides a more flexible getArgs function with better error reporting"; @@ -161415,7 +172776,7 @@ self: { mkDerivation { pname = "simpleirc"; version = "0.3.1"; - sha256 = "8573184d344d1e0217d693a30e00a70b424e9c5b126a80178568f8f58ac290d7"; + sha256 = "1mwhqa5gby38hlbq0shjbff4whhblw00x8wksqbh47jd6i6ihww5"; libraryHaskellDepends = [ base bytestring connection containers network old-locale time ]; @@ -161431,7 +172792,7 @@ self: { mkDerivation { pname = "simpleirc-lens"; version = "0.2.0.0"; - sha256 = "7c09809b424c5cbee69d38d516d88eb21dcfb11ae31a06c2673a284f87a5bfb2"; + sha256 = "1cmzln3lya1scz10c6p33aqwy7djivc1dm9qkpkbwp2c8adq02bw"; libraryHaskellDepends = [ base bytestring simpleirc ]; homepage = "https://github.com/relrod/simpleirc-lens"; description = "Lenses for simpleirc types"; @@ -161446,7 +172807,7 @@ self: { mkDerivation { pname = "simplenote"; version = "1.0"; - sha256 = "7b004409af4f10c31879c54c30d0b09dccab6f1718ef8386c43aff0dd7b6ef4d"; + sha256 = "0kggnvbhvzrsqj387vqq2xpspk4xn3830k65g4cc642gmw4l803v"; libraryHaskellDepends = [ base bytestring curl dataenc download-curl HTTP json time utf8-string @@ -161463,7 +172824,7 @@ self: { mkDerivation { pname = "simpleprelude"; version = "1.0.1.3"; - sha256 = "12922614ab11b6946418202b23529b3525c3577fd3ff061347d095426a829062"; + sha256 = "0qlhh9m455fh8w9hdzykgxbw699mkd926ar031j99dhimca2d4hj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -161480,9 +172841,9 @@ self: { mkDerivation { pname = "simplesmtpclient"; version = "0.2"; - sha256 = "48b65ada82fa8ac73216437f2ffb17606b8b31ca3a6264a11f705b2184400f7d"; + sha256 = "0z8g82222nvh3yhn8qisr8qqnsv02zxjyzs32qrcg2pshbd5mdj8"; revision = "1"; - editedCabalFile = "e6021c7bbf5e50c15433dca491f4618483229203c810a7b71e7c42094e13ad25"; + editedCabalFile = "09dd2d70jhkw3svsf4680f9250w4c7s9396w6dac2l2ypxxiq0p6"; libraryHaskellDepends = [ array base directory network old-time ]; description = "Very simple SMTP Client"; license = stdenv.lib.licenses.bsd3; @@ -161493,7 +172854,7 @@ self: { mkDerivation { pname = "simplessh"; version = "0.2.0.5"; - sha256 = "78ad83c1af758c0171e9fa6299bd5b3eff669a92320a2bde4aa632a8d16419b8"; + sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ ssh2 ]; homepage = "http://hub.darcs.net/thoferon/simplessh"; @@ -161509,7 +172870,7 @@ self: { mkDerivation { pname = "simplest-sqlite"; version = "0.0.0.14"; - sha256 = "5534a0e32ca607ca8004b6f8a666812eeb6cf9750e8bffd206a15c3a8f067d18"; + sha256 = "063x0s7klp510v9gz2qffpwnrsrfh5kady5n0j0cl1x65kis0d2m"; libraryHaskellDepends = [ base bytestring exception-hierarchy template-haskell text ]; @@ -161527,7 +172888,7 @@ self: { mkDerivation { pname = "simplex"; version = "0.3.8"; - sha256 = "0291a7838c825ae9994f2956afb703d3085a1ef25985236891b1f936c8d31e7d"; + sha256 = "0z8ysg43dydij5l271ary8g5l26k0fvsymi99ycyjnl2ij1sg482"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161545,9 +172906,9 @@ self: { mkDerivation { pname = "simplex-basic"; version = "0.0.0.1"; - sha256 = "f8a30128d4e16714f75fee3b16fd3d4b24832a30f17ff29936a1c5a066b60ba0"; + sha256 = "180bnrka1id16scz4zzi60m8692b7pyicfzfbzvi8rz1shl038zq"; revision = "1"; - editedCabalFile = "5f5008bcffb4338739343d6ab9e7f47e0d1c35ec5d606dbdbb9f02943de2b7a1"; + editedCabalFile = "18dpw8yr80lzpfynsq2xxhsiq3byykkvjsix6hwqfcxlzyy0hl2z"; libraryHaskellDepends = [ base bifunctors linear-grammar mtl QuickCheck transformers ]; @@ -161564,7 +172925,7 @@ self: { mkDerivation { pname = "simseq"; version = "0.0"; - sha256 = "d58c4d03d4c9862562b270269a4d96650d27b66c0bfe5e5e060db05ea29ec044"; + sha256 = "0i60ksi5xc0d0rg5xzhbdjv2f3b5jr6rl9khn9i2b1n9sh1lv36m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bio bytestring random ]; @@ -161579,7 +172940,7 @@ self: { mkDerivation { pname = "simtreelo"; version = "0.1.1.1"; - sha256 = "0c990c2e520069d07030f63fc861c1a8c2e287bf2fc2ae4ebf24504d89cd1b64"; + sha256 = "0r0vrn4lsl14px7axhigpy3y5hm8q5hwhgzn61qd0s80a8p0r68c"; libraryHaskellDepends = [ base containers ]; description = "Loader for data organized in a tree"; license = stdenv.lib.licenses.gpl3; @@ -161593,7 +172954,7 @@ self: { mkDerivation { pname = "sindre"; version = "0.4"; - sha256 = "a2caab6c96a0e1f2b305c561820c19f394d9fc9123af7b43e1d95c01a6cee65c"; + sha256 = "0p76rsk02p6rw51ppbr3j7ydk57k34684qf50nrz5qd0jrnapjm2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161619,19 +172980,31 @@ self: { mkDerivation { pname = "singleton-bool"; version = "0.1.2.0"; - sha256 = "33bbd0460a5363260f56b29b130babfc16921ba87cb4576569ecc0a0664d449d"; + sha256 = "17a49mka1h7cd5jmgd3wm0dr45pwmc5i76xjaq7jcqsk193d1frk"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/phadej/singleton-bool#readme"; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-dict" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "singleton-dict"; + version = "0.1.0.0"; + sha256 = "125mb6j4gf3qcgmvjf6zibnzl7sw8jcmrh60nig16ahk55cjczic"; + libraryHaskellDepends = [ base singletons ]; + homepage = "https://github.com/amiddelk/singleton-dict#readme"; + description = "Typelevel balanced search trees via a singletonized Data.Map"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; version = "0.4.0.2"; - sha256 = "5cc7c7d158900bb7fda8e52865e88e0d8c88cf05458ae51f138aca998f6f32db"; + sha256 = "1nrjdy7rkjla2cgyb2j50p7qi30divl6aa75m3yvf2whb38wgisw"; libraryHaskellDepends = [ base singletons ]; homepage = "https://github.com/AndrasKovacs/singleton-nats"; description = "Unary natural numbers relying on the singletons infrastructure"; @@ -161645,7 +173018,7 @@ self: { mkDerivation { pname = "singletons"; version = "2.2"; - sha256 = "33bd06e08b4f8eab23a01074b06056507a6e3525e228b4e7ae3b2ed4c3d58caf"; + sha256 = "1bwcsp1x8bivmvkv8a724lsnwyjharhb0x0hl0isp3jgigh0dg9k"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-desugar ]; @@ -161657,12 +173030,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singletons_2_3" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl + , process, syb, tasty, tasty-golden, template-haskell, text + , th-desugar + }: + mkDerivation { + pname = "singletons"; + version = "2.3"; + sha256 = "022747kp55yf2hzsqk03wcbmvqn47nbvhiqjam06c9hkcj3gixf5"; + libraryHaskellDepends = [ + base containers mtl syb template-haskell text th-desugar + ]; + testHaskellDepends = [ + base Cabal directory filepath process tasty tasty-golden + ]; + homepage = "http://www.github.com/goldfirere/singletons"; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; + 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 { pname = "sink"; version = "0.1.0.1"; - sha256 = "f7e736ffe4b73cb6b4d818ea0fe17a636afef60ecad80764e0b40a080a49de12"; + sha256 = "04ny9450h2mlw1j0gn6a1vvgwsk3gbhhzshqv2sbcg5pwkzkdrzp"; libraryHaskellDepends = [ base ]; description = "An alternative to lazy I/O that doesn't conflate execution with evaluation"; license = stdenv.lib.licenses.mit; @@ -161676,9 +173082,9 @@ self: { mkDerivation { pname = "siphash"; version = "1.0.3"; - sha256 = "cf81ce41c6ca40c4fec9add5dcebc161cb2d31f522f9ad727df23d30ac6a05f3"; + sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg"; revision = "1"; - editedCabalFile = "d629325f124617deeb6f1b172c8cbb30556090b32f3533cf8ea93ecb3df04de0"; + editedCabalFile = "1q2dy0ywngm9iv7k6d9gnf860m9hpf62q5qvdzmxw5s629gk4afn"; libraryHaskellDepends = [ base bytestring cpu ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -161692,21 +173098,21 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade , contravariant, either, HUnit, pipes, profunctors, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, vector + , streaming, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, transformers, vector }: mkDerivation { pname = "siphon"; - version = "0.6"; - sha256 = "5776b99c6ef4262278ab7f76ecc9c83ee5ab7c137c3cdb9ee9c5badac24e2511"; + version = "0.7"; + sha256 = "1k03gzgi9d27yzcvmxzibpgc5l6k7g41048x1qxd3l67qpxxbsl9"; libraryHaskellDepends = [ - attoparsec base bytestring colonnade contravariant pipes text + attoparsec base bytestring colonnade streaming text transformers vector ]; testHaskellDepends = [ base bytestring colonnade contravariant either HUnit pipes - profunctors QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text + profunctors QuickCheck streaming test-framework + test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Encode and decode CSV files"; @@ -161721,7 +173127,7 @@ self: { mkDerivation { pname = "sirkel"; version = "0.1"; - sha256 = "56fd4bb8fd54d4bcad49ba984e6f718bbbeb9f3e37c6fccb5709b3bf1b841742"; + sha256 = "0hhphhdvzcq9az5zriip7sgypfwbf5plx65s96nvrm2lznw4pzan"; libraryHaskellDepends = [ base binary bytestring containers hashtables haskell98 random remote SHA transformers @@ -161736,13 +173142,35 @@ self: { mkDerivation { pname = "sitemap"; version = "0.1.2"; - sha256 = "6d05b3460b11642ddc4a901d9d5ddadc63af47777bfa60f8c3faab6938104b5a"; + sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd"; libraryHaskellDepends = [ base lens taggy taggy-lens text ]; homepage = "http://github.com/alpmestan/sitemap"; description = "Sitemap parser"; license = stdenv.lib.licenses.bsd3; }) {}; + "sitepipe" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , exceptions, filepath, Glob, lens, lens-aeson, megaparsec + , MissingH, mtl, mustache, optparse-applicative, pandoc, parsec + , shelly, text, unordered-containers, yaml + }: + mkDerivation { + pname = "sitepipe"; + version = "0.1.1"; + sha256 = "1kymvi3pf67chjsvqxv29i4fbac2yyrjx5llc2r7qjfw3hblf5sj"; + libraryHaskellDepends = [ + aeson base bytestring containers directory exceptions filepath Glob + lens lens-aeson megaparsec MissingH mtl mustache + optparse-applicative pandoc parsec shelly text unordered-containers + yaml + ]; + homepage = "https://github.com/ChrisPenner/sitepipe#readme"; + description = "A simple to understand static site generator"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sixfiguregroup" = callPackage ({ mkDerivation, base, digit, directory, doctest, filepath, lens , parsec, parsers, QuickCheck, template-haskell @@ -161750,7 +173178,7 @@ self: { mkDerivation { pname = "sixfiguregroup"; version = "0.0.1"; - sha256 = "d98c0de2dfa1d15adc1db96284359aea3954f1cd735eafda9bf9b9ce687c14d0"; + sha256 = "1l0lgilcxfgrkgdaypkkrpqm8fgak8sq8qmr3pf5mld1vzi0v36r"; libraryHaskellDepends = [ base digit lens parsers ]; testHaskellDepends = [ base directory doctest filepath parsec QuickCheck template-haskell @@ -161768,7 +173196,7 @@ self: { mkDerivation { pname = "size-based"; version = "0.1.0.0"; - sha256 = "fd59ed893c897b6c44861997d94095897f16eed9243be10a3f05649b860ee9c0"; + sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -161784,7 +173212,7 @@ self: { mkDerivation { pname = "sized"; version = "0.2.1.0"; - sha256 = "e5e936dab874a7766a8b3b50f15fc742cc57b956aef738ba98ef221b25d3731a"; + sha256 = "06kkscjin8pgk2x3ixxfaswmgk22qxgz2l1vidm7d9vlp3d3dsg5"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning hashable lens ListLike mono-traversable monomorphic singletons type-natural @@ -161801,9 +173229,9 @@ self: { mkDerivation { pname = "sized-types"; version = "0.5.1"; - sha256 = "c76772fc89028f5407906bc699e7dd98e02328d0fe98c151706100e49f4899db"; + sha256 = "1nwr92gy8031f18w367ys0l27q4qvpkrkikbj03m93q2i7y74ry7"; revision = "3"; - editedCabalFile = "ecf77e6598e7fbe7a12fc5bbb3cce000f14ffe87bee8386c95912e49f9a31e54"; + editedCabalFile = "0m0ylgwljblijmn3is5yhzz4zw80w36b7fy55yhygyz7k1jpxxzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161821,7 +173249,7 @@ self: { mkDerivation { pname = "sized-vector"; version = "1.4.3.1"; - sha256 = "433dfc02259b362c5c081044ac5ab579228451e3f95b5d941e16970d25c6962a"; + sha256 = "0alnqqjhv5qn3sa5snzrwd8q88krnmdaqi0h11f2qdlv4l1gqga3"; libraryHaskellDepends = [ base constraints deepseq equational-reasoning hashable monomorphic singletons template-haskell type-natural @@ -161840,7 +173268,7 @@ self: { mkDerivation { pname = "sizes"; version = "2.3.2"; - sha256 = "afe1f8a9b1e75e7004796ccdcd343eba2b1d1cb600f6aab70c7ac2396807da76"; + sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161859,9 +173287,9 @@ self: { mkDerivation { pname = "sjsp"; version = "0.1.0"; - sha256 = "74117748b466651b379696565687215dd8f89f5a45105b9c967146507f86e674"; + sha256 = "0x76hrzm0ikijsf5n425bagzin2x463mcmlnjqvinrb6ni47f4bl"; revision = "1"; - editedCabalFile = "309e00100db2c1bae2d292c485f2dc1a68e1c72a848a2142c3f0637c494dd727"; + editedCabalFile = "09yp9m4pqqzhqd1232l45b3y2s0svkr8bi4jsbibmhdj1l8017ih"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161881,7 +173309,7 @@ self: { mkDerivation { pname = "skein"; version = "1.0.9.4"; - sha256 = "f882ca0cc5ed336ef898fb3c89579e392900259296b2320edf968b9fc16cb8c9"; + sha256 = "1jdqdk0rz2wnvw735clnj8jh0a9rkrbqjg7vk3w6wczdql6cm0pq"; libraryHaskellDepends = [ base bytestring cereal crypto-api tagged ]; @@ -161900,7 +173328,7 @@ self: { mkDerivation { pname = "skeleton"; version = "0.1.0.0"; - sha256 = "8be93118b4cb2c2a67a7573bd550b6797dcfeeaee45155efcabe1e4e28e16c81"; + sha256 = "10bcw4l4w7myrbpmalg4mvpcyzbrnr8dafsplxkjlb6bnhc33scb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161919,7 +173347,7 @@ self: { mkDerivation { pname = "skeletons"; version = "0.4.0"; - sha256 = "3dd5045d09131434a794b9452980b4a54da4312d2e1116ac455bbc9bdf6fbcc6"; + sha256 = "1imwdzgrpg2v8nn1c49f5lqs8kd5nj02jidrjjkk850k15fh9m9x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161939,7 +173367,7 @@ self: { mkDerivation { pname = "skell"; version = "0.1.0.0"; - sha256 = "9792ec6f54a177f74aeaffb4090f80ee947a4da0b10cdca07e65535d38c3d452"; + sha256 = "0lnlqcw5slv5gshdq35il16pm57fh07hkd7zx95gfxx1aipyr4lp"; libraryHaskellDepends = [ base blaze-html bytestring containers http-types text wai ]; @@ -161956,7 +173384,7 @@ self: { mkDerivation { pname = "skemmtun"; version = "0.1.0.0"; - sha256 = "9602063e569741878f18dc1820a7281a3387ff6fdfdc394e32511f2abaab6c11"; + sha256 = "04bcmfx2l7si6973kp6zdzzqfcqs52kj066w327qfhcpaqz0c0ln"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161974,7 +173402,7 @@ self: { mkDerivation { pname = "skulk"; version = "0.1.3.0"; - sha256 = "59653d32e998891cd94fa3aab3a56b6866b9cbc8a0f01f7a1c4f8a9890c4d8a9"; + sha256 = "1afqqj89i2jg3ix1zw50r35vjrk8dfjv7am39zcir2cqx4r3srar"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "http://github.com/geekyfox/skulk"; @@ -161989,8 +173417,8 @@ self: { }: mkDerivation { pname = "skylark-client"; - version = "0.1.5"; - sha256 = "e50e874a1f16ce71721d92118740853c53ee8822d43e173e670b47297dbb3ff7"; + version = "0.1.7"; + sha256 = "18mxisr9p9x027w2vi7w8aqrcxia0jdcdr5y934f848k4wv1h2h7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162016,7 +173444,7 @@ self: { mkDerivation { pname = "skylighting"; version = "0.1.1.5"; - sha256 = "0a4b666b2ccfeed35386bd364d663e919adc1815547e6360e83487253e33b13c"; + sha256 = "0g5i6cz2b1rlx1h66zjl2lcdr6li7rk4sdmxhr9x7vng5imncjqa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162036,7 +173464,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "skylighting_0_3_1" = 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 @@ -162045,8 +173473,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.3.1"; - sha256 = "d93ee3b15d74ab66fd729c4b56741c052fe331b4cfc78bad2a433827417d4f74"; + version = "0.3.3.1"; + sha256 = "0msx7hwnfcqmq0rkn27lr3y6iybghfnm9p5bybzkmqfhlh8gkqgk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162075,7 +173503,7 @@ self: { mkDerivation { pname = "skype4hs"; version = "0.0.0.0"; - sha256 = "97beee10c2a51ab6fb4ad380e56e18887a4a600e20965de8d8b5f7eafc302d57"; + sha256 = "0mrd63yfmxxmv3l5v5i01rh4lyl831pfb06k9bxvc6m5q88fxglp"; libraryHaskellDepends = [ attoparsec base bytestring lifted-base monad-control mtl stm text time transformers-base word8 X11 @@ -162094,7 +173522,7 @@ self: { mkDerivation { pname = "skypelogexport"; version = "0.2"; - sha256 = "1c32717ba2064ebb64eda6141dfc2c402f7bf8e350923ae5ff472bc35daa6966"; + sha256 = "0rk9m9fw6as7zzjkm4jhwgw7nbs05ky1s556xmjbnkh6l9xp2chw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162114,7 +173542,7 @@ self: { mkDerivation { pname = "slack"; version = "0.1.0.0"; - sha256 = "c7281f14699bcab05f75b4dbdf8c3be7a52b3a4e066dcb506aad6fc5d123116b"; + sha256 = "0sqi4g8wavxdd98cnv869qx2p9g77f6dznxlfmgv1jlvd4a1ya67"; libraryHaskellDepends = [ aeson base containers either http-conduit mtl old-locale text time transformers @@ -162133,7 +173561,7 @@ self: { mkDerivation { pname = "slack-api"; version = "0.12"; - sha256 = "9b5cde3cbeb67a020614e0b9e10c316dd6dc378b03144944b99846ee75c2bc36"; + sha256 = "0dmwq9sywilqp524j503icvxrmkd646f3fg02h304ymnpqydwp4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162155,7 +173583,7 @@ self: { mkDerivation { pname = "slack-notify-haskell"; version = "0.2.3"; - sha256 = "87cd11fbd8f1c88140c1b09c50bec6bd112f215df66286fe6d189d05c82ee06b"; + sha256 = "0sz05v40b78qdpz8cqpnblhjy4dxqsz5175hq5083j7iv3xi3kc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162176,7 +173604,7 @@ self: { mkDerivation { pname = "slack-web"; version = "0.1.0"; - sha256 = "82186c8bfe6857856034c9d53b0259e61b0575519d1cb22cb024f8464fb5f380"; + sha256 = "107knm7ldy14n0nb474xa5sha6z6b413pmf96ih8amv8zs5nq642"; libraryHaskellDepends = [ aeson base generics-sop http-api-data http-client http-client-tls servant servant-client text transformers @@ -162195,7 +173623,7 @@ self: { mkDerivation { pname = "slave-thread"; version = "1.0.2"; - sha256 = "e47120598dd65ebee33253911a31518021323a5ccfa52588e13c44fd5f5b4b13"; + sha256 = "04sbbdgzsi1ww642b9fgbhx348c0a4qim4ak6bivwpnnimcj0wg4"; libraryHaskellDepends = [ base base-prelude list-t mmorph partial-handler stm-containers transformers @@ -162213,7 +173641,7 @@ self: { mkDerivation { pname = "sleep"; version = "0.1.0.1"; - sha256 = "af74975f289f74330a890d897db4708db4d31122321325c97ead929daf0d7eec"; + sha256 = "1v3y1nprv4mdgv4ja4rj488x7d4df2s7v28di4536x4z51grfx5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base time ]; @@ -162229,7 +173657,7 @@ self: { mkDerivation { pname = "slice-cpp-gen"; version = "0.3.0.0"; - sha256 = "de0fc18e97165a212d14fc644d421e5f3c1d1a0f274652fc6a6720a421927257"; + sha256 = "0mvjj8hs8837dby54ii71wd1sg2z3r14sr7w2hnj2nhnjy7c23yy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162248,7 +173676,7 @@ self: { mkDerivation { pname = "slidemews"; version = "0.3"; - sha256 = "c0fdddbeb642f1af0db8142891625837f41fb5ca0d11c9afc63a398edba6cb74"; + sha256 = "0x6blvdqwf9sqspwj48drasizx1pb1i92a0lp06szwa2nszdvzf0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162266,7 +173694,7 @@ self: { mkDerivation { pname = "slim"; version = "0.0.1"; - sha256 = "5e35db110191e5872b74256420ef6fd103e295e624ea23b872492bb256747fb8"; + sha256 = "1f3zfibb4as9faw27si4wsay40yidzpj0r15fhmqgrci048xnday"; libraryHaskellDepends = [ base containers mtl pretty transformers ]; @@ -162283,8 +173711,8 @@ self: { }: mkDerivation { pname = "sloane"; - version = "5.0.0"; - sha256 = "0ddd40bf98e6035d66ab0bd89b94b403dc746c6175fe4029c0a8cf7d0ba3276d"; + version = "5.0.1"; + sha256 = "14ffww6vfyv32nr1i17x8c8nc3y583yhza2dy6g6cfphcjw0zwf2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162305,7 +173733,7 @@ self: { mkDerivation { pname = "slope-field"; version = "0.1.0.1"; - sha256 = "51c49a88ceb3fd3ec77670e32950a18fe1e185a79820228bb231b4f0d13a29af"; + sha256 = "1br97b8z1d1ina5j484qly2y3qcgl582kqvhfv3kxzdkrs49mi2i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default-class mathexpr ]; @@ -162324,7 +173752,7 @@ self: { mkDerivation { pname = "slot-lambda"; version = "0.1.0.3"; - sha256 = "31197ad4636b6f7bbb70ecc990ebb6610a978f0c524ffe6d892b2ba8fcb1f1da"; + sha256 = "1npin7yaharbi5nzwksj1j7rf2k1nvmr1jgcf2xpnvvbcga7l69i"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta syb template-haskell vector @@ -162340,7 +173768,7 @@ self: { mkDerivation { pname = "sloth"; version = "0.0.2"; - sha256 = "095fad381ced5fdbcdab934c1b35598e7518225826f739873878d0856be07174"; + sha256 = "0x3iw1mqbl3q723kkxr6b0i1hxcfb4sink4kmg6xnpzd3hwaspq9"; libraryHaskellDepends = [ base mtl process ]; description = "Testing for minimal strictness"; license = stdenv.lib.licenses.bsd3; @@ -162354,7 +173782,9 @@ self: { mkDerivation { pname = "slug"; version = "0.1.6"; - sha256 = "c4d589b30d7d4788ed5dbf1a24652a5f880751a0250707bf8ac82a3714734692"; + sha256 = "14j6fca3fan8iazhf1r5l18hg22z59jj86mzbpnqhivx1nrqkmf4"; + revision = "1"; + editedCabalFile = "1q5adw6i43d588kbhci086blj1cvldbxcils2k99p4hs8qlzymbj"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -162372,7 +173802,7 @@ self: { mkDerivation { pname = "smallarray"; version = "0.2.2.4"; - sha256 = "3fe81a5c7d280618033899e48dc59982cf8513aa7568d24cc7b0e7879eeecf99"; + sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z"; libraryHaskellDepends = [ base bytestring deepseq hashable ]; homepage = "http://community.haskell.org/~aslatter/code/bytearray"; description = "low-level unboxed arrays, with minimal features"; @@ -162387,7 +173817,7 @@ self: { mkDerivation { pname = "smallcaps"; version = "0.6.0.4"; - sha256 = "c5224d8f48f86b6d8e788194cbe1e4f13015ba3eb90794ea5d99ff78ddff85d3"; + sha256 = "1lw5zzfpizwrbpm981xr7sx1ac7iwkhwp541g276sszq927ls8n5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162407,9 +173837,9 @@ self: { mkDerivation { pname = "smallcheck"; version = "1.1.1"; - sha256 = "4d17607c1a620491e7e495a17575b73952932c761e7f9bdfa87e0102fb52f9f9"; + sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd"; revision = "1"; - editedCabalFile = "b19c841b12cc34f6379c2b72bc4c250da9b0346c46690dae419caaa0310478fa"; + editedCabalFile = "1ykq0hqs1alw86p0ssa6dhsb1a8d4m6bqwibkhvzcd6c28dq975i"; libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; @@ -162421,7 +173851,7 @@ self: { mkDerivation { pname = "smallcheck-laws"; version = "0.3"; - sha256 = "87d8ee55131915b5549a0053b605729222e3d6c79be94f8bb35aa263f50ad6cb"; + sha256 = "1jyn1bsn78jsnf5lzscvqzbf68ljf82vclq0k9aba58r2dayxn47"; libraryHaskellDepends = [ base smallcheck smallcheck-series ]; homepage = "http://github.com/jdnavarro/smallcheck-laws"; description = "SmallCheck properties for common laws"; @@ -162436,7 +173866,7 @@ self: { mkDerivation { pname = "smallcheck-lens"; version = "0.3"; - sha256 = "0123159b7534f0315f376e24b1811c7290a417354a783134d33fa07d447818ef"; + sha256 = "1vqqg127v81zscs32y2a6lbs943j3j0v293f6xgk3w1lfndia8q1"; libraryHaskellDepends = [ base lens smallcheck smallcheck-series transformers ]; @@ -162453,7 +173883,7 @@ self: { mkDerivation { pname = "smallcheck-series"; version = "0.6"; - sha256 = "c11563b920463c09a6f30f287b23671ed3e4abb4c041406106d3e16b5b473852"; + sha256 = "0liq8xdnpqfk0rhl0hf0njmy9lqycwipna0gyfk0jg2642wn65f1"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; @@ -162468,7 +173898,7 @@ self: { mkDerivation { pname = "smallpt-hs"; version = "0.1"; - sha256 = "a95cdea0d1bd6e1d727c214f6c44f354e0ca5ac2607b42e9a8f3a6219f168fbc"; + sha256 = "1g4g2sgj39pkm3ll4yv0q9dcmq2lyd26qkr1gir1svmxs6hdwp59"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base vector ]; @@ -162485,7 +173915,7 @@ self: { mkDerivation { pname = "smallstring"; version = "0.3.3"; - sha256 = "a51cef929034bfa6a4f8870bba71d9682b9d7248fb4243673465a66ea75d6ff2"; + sha256 = "1wkgbnknx9k56ikl6hpv91r9sav8v5qvl2w7z2jadgrlj29fy755"; libraryHaskellDepends = [ base bytestring deepseq hashable smallarray text utf8-string ]; @@ -162501,9 +173931,9 @@ self: { mkDerivation { pname = "smaoin"; version = "0.3.0.0"; - sha256 = "378bff0ab90d63ddc20a3cbe42a0b441d97f8f54c291958e09603dee6fbb2848"; + sha256 = "0j18pdpywgb01679b4f2aj7pzna1njh45giw1b1dsqqdp45gz2rp"; revision = "1"; - editedCabalFile = "1644cbb1dc0081d93276a72cc5c5471bed4647d833e6fd67282cfb62c7f81936"; + editedCabalFile = "0dhrz33n5yrc51kzvrikv13ldv8v8z2wab57fqrdk080vjqwni0n"; libraryHaskellDepends = [ base bytestring random text uuid ]; testHaskellDepends = [ base bytestring QuickCheck ]; homepage = "http://rel4tion.org/projects/smaoin-hs/"; @@ -162516,7 +173946,7 @@ self: { mkDerivation { pname = "smartGroup"; version = "0.3.0"; - sha256 = "d75e168013d50ee1e950cac3592b5cf82d52a00b50f72ea85ea4d07ed02e8b83"; + sha256 = "10wb5v87xl54bsl2xxsh1fh54bgqbhmmkhyaa3ly23nm2f01cpnp"; libraryHaskellDepends = [ base bytestring containers template-haskell ]; @@ -162533,7 +173963,7 @@ self: { mkDerivation { pname = "smartcheck"; version = "0.2.2"; - sha256 = "3a0aacd5fa0ae6a1748fc3ca19e53a675d46b14b4ddc482c572b63934f1185f1"; + sha256 = "1wc5257r6qrbawn4ip2d9fqlcpb77bjikjn3ixsa3rhazbasq2is"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162553,7 +173983,7 @@ self: { mkDerivation { pname = "smartconstructor"; version = "0.2.0.0"; - sha256 = "9b6e462fa7a53608df161ac051e88829447cff44e7463c55ea9d340e6fd40281"; + sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/frerich/smartconstructor"; description = "A package exposing a helper function for generating smart constructors"; @@ -162566,7 +173996,7 @@ self: { mkDerivation { pname = "smartword"; version = "0.0.0.5"; - sha256 = "832ec110258149946e512c516c27178ca21dbe72b9559f8515e9335e9f24bc37"; + sha256 = "0dxw4jgmwcz92n2rymdrfaz1v8lc2wknql9ca5p98jc14l8c2bl3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162583,7 +174013,7 @@ self: { mkDerivation { pname = "sme"; version = "0.1"; - sha256 = "45a8ea56dda7f3427bad8d0886e7c4cd50a35cf7695f1357b9877d3eb59773b4"; + sha256 = "1d3kjyskwzc7p5bi6pv9yxfa6l6dqkkqc24dmmxl5wx7vmbfma25"; libraryHaskellDepends = [ base ]; description = "A library for Secure Multi-Execution in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -162597,7 +174027,7 @@ self: { mkDerivation { pname = "smerdyakov"; version = "0.0.0.0"; - sha256 = "32b6b8bfeebc8915784f9ee0c3df3299fd1b09bf0c70985d0407740c28eea709"; + sha256 = "02d7xql0qx070ifrhw0cpw4ipzcr6bgw7q4y9xw1b2dwxszvidij"; libraryHaskellDepends = [ base exceptions free mtl process text transformers ]; @@ -162610,12 +174040,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "smiles" = callPackage + ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }: + mkDerivation { + pname = "smiles"; + version = "0.1.1.0"; + sha256 = "054s7c6xbakbv0kc64iyv1gsqnddgv8kc07hplk8ksbzg8q5x8jz"; + libraryHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; + homepage = "https://github.com/zmactep/smiles#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smoothie" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.4.2.6"; - sha256 = "9225877499dd0b4504d91e26403b23f6d8517c097073abf07982fc5041836174"; + version = "0.4.2.7"; + sha256 = "1cnyckmwqj0caw2vcbmvzha8hs1207pq11mlmwpk2w6qccs1qml4"; libraryHaskellDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; @@ -162629,7 +174071,7 @@ self: { mkDerivation { pname = "smsaero"; version = "0.7.1"; - sha256 = "cfec597fbd1ea285ce0f035e7f90bda241eca0536a1d22320f5a16ff6909c990"; + sha256 = "146915lzy5js1wr247baafhfqhd2pn87yph31z78b8hypmzmkv6g"; libraryHaskellDepends = [ aeson base containers http-api-data http-client servant servant-client servant-docs text time @@ -162645,7 +174087,7 @@ self: { mkDerivation { pname = "smt-lib"; version = "0.0.2"; - sha256 = "7e4ec60e6504f23cd275e676863e24177ea72e74b588fb73bf19aaa52e2815de"; + sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky"; libraryHaskellDepends = [ array base directory polyparse ]; homepage = "http://tomahawkins.org"; description = "Parsing and printing SMT-LIB"; @@ -162658,7 +174100,7 @@ self: { mkDerivation { pname = "smtLib"; version = "1.0.8"; - sha256 = "37016f9322742c88c89d692e62d01c419b03242bbc6d84da4dab772408ad21a9"; + sha256 = "1a91ml428xxb9pd88vdw5cj076s13k864bk9kp48hb3l4a9ny09p"; libraryHaskellDepends = [ base pretty ]; description = "A library for working with the SMTLIB format"; license = stdenv.lib.licenses.bsd3; @@ -162671,7 +174113,7 @@ self: { mkDerivation { pname = "smtlib2"; version = "1.0"; - sha256 = "3ca10e4ecc493a9b824301887fe2ff8de4594126bd04fa6fb5490110b615edf1"; + sha256 = "1wgd2nv100a9nmpzl15x4r0mkr4dzzi7z2018f19nfj9ri70x89w"; libraryHaskellDepends = [ base constraints containers dependent-map dependent-sum mtl template-haskell @@ -162687,7 +174129,7 @@ self: { mkDerivation { pname = "smtlib2-debug"; version = "1.0"; - sha256 = "110e136813fbb257f2858e56ef58854fce04fcd2b972e701863e293aca87d761"; + sha256 = "0qfphz53la9yhq0yfwmrsby09kjghmcfymlfhpr5gcpv2dl163hi"; libraryHaskellDepends = [ ansi-terminal atto-lisp base containers dependent-map dependent-sum mtl smtlib2 smtlib2-pipe text @@ -162706,7 +174148,7 @@ self: { mkDerivation { pname = "smtlib2-pipe"; version = "1.0"; - sha256 = "6623f4a565cb09c797022716041dc8647d21b06a42f0fd05b988254551723c6d"; + sha256 = "0v9wf98la9c8p42zvw22daq22zb4r0fh85i70abwf2fbcnjz88v6"; libraryHaskellDepends = [ atto-lisp attoparsec base blaze-builder bytestring containers dependent-sum mtl process smtlib2 text transformers @@ -162726,7 +174168,7 @@ self: { mkDerivation { pname = "smtlib2-quickcheck"; version = "1.0"; - sha256 = "267f701b359e81d0a053e7c04a294d98ecc8d795dfe540c812b0832df278ac4c"; + sha256 = "0k5cg3r2v0xh2b441rfzjpbwiv4q9lllmh77afhd10cy6ldp0zr6"; libraryHaskellDepends = [ base containers dependent-map dependent-sum mtl QuickCheck smtlib2 ]; @@ -162739,7 +174181,7 @@ self: { mkDerivation { pname = "smtlib2-timing"; version = "1.0"; - sha256 = "253ace562bd79b48a51d7b5272d70b27abf0e7ae1a3468b9e477901bdd430289"; + sha256 = "12828gfip43pwjwnhd0smvkz1ar71gbp4lkv3njli6yp5dbcwfi5"; libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ]; description = "Get timing informations for SMT queries"; license = stdenv.lib.licenses.gpl3; @@ -162752,7 +174194,7 @@ self: { mkDerivation { pname = "smtp-mail"; version = "0.1.4.6"; - sha256 = "86dacbef87a2519222a1165b49401a437887a249f5bfd63a99702198dad214bc"; + sha256 = "1g0lsbd9h8bhk4xddgzm96i8fy233904jnqnl4i94ld2hzpwpnl6"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring cryptohash filepath mime-mail network text @@ -162771,7 +174213,7 @@ self: { mkDerivation { pname = "smtp-mail-ng"; version = "0.1.0.2"; - sha256 = "70bd0d1ff9705a8dc76640673698867f4958bb778f1ebcc10ae70aa1ef58724b"; + sha256 = "0jvjb3ps22p71b0vq7lgfyxmhjbzhsc3crs0cv3qsnkhz4ghvgbh"; libraryHaskellDepends = [ attoparsec base base16-bytestring base64-bytestring bytestring crypto-random cryptohash filepath haskeline mime-mail mtl network @@ -162789,7 +174231,7 @@ self: { mkDerivation { pname = "smtp2mta"; version = "0.2"; - sha256 = "022488ceec1d5f993d5169b26802f8187c68bc68c544c58f460f7603f3fe667c"; + sha256 = "0z36zvrh6xhg8s7wai65d2y6hz0qz016ick9a4yrjpqxxk78h902"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 network process ]; @@ -162807,7 +174249,7 @@ self: { mkDerivation { pname = "smtps-gmail"; version = "1.3.2"; - sha256 = "0f6cf84bb2bbe6066e95b3084b2d6a381751d9140c0d5c58e00aa1e6491e881c"; + sha256 = "07483r4yd88aw1c5q38c2kcm25rqd8nln25kjmp0drmvn95zhv0g"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring conduit conduit-extra data-default filepath mime-mail network resourcet stringsearch text @@ -162823,7 +174265,7 @@ self: { mkDerivation { pname = "snake"; version = "0.1.0.0"; - sha256 = "3055892ada05f0d937a205af5b2bb136f28b98c2db8de13a185b0867662146f8"; + sha256 = "1y2645k6f22v30xf33fvqac8pwinn4mmpbq5l8vxkw05v8m8jm9h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random split terminal-size ]; @@ -162838,7 +174280,7 @@ self: { mkDerivation { pname = "snake-game"; version = "1.2"; - sha256 = "6d65ed96f5ff22c7683a3f85f3dcf2c23831d18ce1d813db5328b14681a8c3c7"; + sha256 = "1iy3m20ldc98agdi7n71ik8k2f62ybfg719z79lcf8pzynbfsrbd"; libraryHaskellDepends = [ base GLUT OpenGL random ]; description = "Snake Game Using OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -162858,9 +174300,9 @@ self: { mkDerivation { pname = "snap"; version = "1.0.0.1"; - sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8"; - revision = "3"; - editedCabalFile = "97c68769fdd4f5693b365da446e17a0181e2fcc2e41dbc56f37804a3204646ef"; + sha256 = "1f1d69900rdvsi323cc23pfgacmvgclbdaw57lfi54s7830icgr9"; + revision = "4"; + editedCabalFile = "1bcfw4g6wqkssp0l7n6115d513y70b8zb7cdz5hrlaxyq5pah6hk"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -162890,12 +174332,12 @@ self: { }: mkDerivation { pname = "snap-accept"; - version = "0.2.0"; - sha256 = "4e65ad212f3bfc867399fcf35dff4444fe47b014d01b4cd01cffc9163045c928"; + 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; @@ -162906,7 +174348,7 @@ self: { mkDerivation { pname = "snap-app"; version = "0.7.0"; - sha256 = "118aad91dca7d174ef5c90ee58a4abcc19a90f02f1c64372a45736d5f7ff71ec"; + sha256 = "1v3izzvxadjplir47ipi087sj6fcmfj5ivlhbkpp9ld7vj8sv2hi"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -162920,7 +174362,7 @@ self: { mkDerivation { pname = "snap-auth-cli"; version = "0.1.0.1"; - sha256 = "14c283de9645f8ed6c40eea444985ac46ff494279500d059f627b4affeb1ed6a"; + sha256 = "0spdn7zazd17yrcx004m4yag8vy4bac4997f81nfvy25jvg87hhl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162937,8 +174379,8 @@ self: { ({ mkDerivation, base, blaze-html, snap-core }: mkDerivation { pname = "snap-blaze"; - version = "0.2.1.4"; - sha256 = "381a8cf8f211be77b9d52c2aa6b880e7059384fe0124c69d704040b0c016302b"; + version = "0.2.1.5"; + sha256 = "0hc8k0cviq7ayjymsfr435bnfw35pa4f80i7x4ypn2539fykavmk"; libraryHaskellDepends = [ base blaze-html snap-core ]; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; @@ -162950,7 +174392,7 @@ self: { mkDerivation { pname = "snap-blaze-clay"; version = "0.1.0.0"; - sha256 = "3eba034f63ecd902395b2e359e3565d95511b282a5428fa4b4bf9fd1644ef117"; + sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy"; libraryHaskellDepends = [ base blaze-html clay snap-core ]; homepage = "http://github.com/deckool/snap-blaze-clay"; description = "blaze-html-clay integration for Snap"; @@ -162963,7 +174405,7 @@ self: { mkDerivation { pname = "snap-configuration-utilities"; version = "0.1.0.0"; - sha256 = "5f2878df034aaf6269a3674df41cfea47c7402ad1531c7952ba8fc753630951d"; + sha256 = "07cm60v7bz585fawfc8mml178z54zqfg8kb7ldln5bsa0ggpha2z"; libraryHaskellDepends = [ base configurator text unordered-containers ]; @@ -162976,31 +174418,31 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath , hashable, HUnit, io-streams, lifted-base, monad-control, mtl - , old-locale, parallel, QuickCheck, random, readable, regex-posix - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, transformers-base, unix-compat - , unordered-containers, vector, zlib + , network, network-uri, old-locale, parallel, QuickCheck, random + , readable, regex-posix, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector + , zlib }: mkDerivation { pname = "snap-core"; - version = "1.0.1.0"; - sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c"; - revision = "1"; - editedCabalFile = "ef248be20bc9d535defbc2f091db3f48dd02e5b233a8305f8ad3c83f2f4548c8"; + version = "1.0.2.1"; + sha256 = "07d1rk6jr5yk74v3g53ncal5f44hyi1486xlxg7lj3v4qifkv46y"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive - containers directory filepath HUnit io-streams lifted-base - monad-control mtl old-locale random readable regex-posix text time - transformers transformers-base unix-compat unordered-containers - vector + containers directory filepath hashable HUnit io-streams lifted-base + monad-control mtl network network-uri old-locale random readable + regex-posix text time transformers transformers-base unix-compat + unordered-containers vector ]; testHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers deepseq directory filepath hashable HUnit io-streams - lifted-base monad-control mtl old-locale parallel QuickCheck random - readable regex-posix test-framework test-framework-hunit - test-framework-quickcheck2 text time transformers transformers-base - unix-compat unordered-containers vector zlib + lifted-base monad-control mtl network network-uri old-locale + parallel QuickCheck random readable regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unix-compat unordered-containers + vector zlib ]; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; @@ -163014,7 +174456,7 @@ self: { mkDerivation { pname = "snap-cors"; version = "1.2.11"; - sha256 = "81bd318b871c08a25bdcb05b286b43e99865b2ea21a4eb48b6e9839362acaf34"; + sha256 = "0d5gmii970z9nr4fp911xar6b6798dmjhnxhvids420why5k3gc1"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive hashable network network-uri snap text unordered-containers @@ -163032,7 +174474,7 @@ self: { mkDerivation { pname = "snap-elm"; version = "0.1.1.2"; - sha256 = "791afab882397d3e51db8596fb6caec225fc4529648db0e7fe853fec8b36e7d2"; + sha256 = "1lp76s5yqgw5zvkv13b4552zq9f2mrngp5l5vd8kwz9rhawgl6kr"; libraryHaskellDepends = [ base bytestring directory Elm filepath process snap-core text transformers @@ -163048,7 +174490,7 @@ self: { mkDerivation { pname = "snap-error-collector"; version = "1.1.3"; - sha256 = "33873a9f9bc51a32d940ea43801090e40d5dbceabcbbd696834ef7c0f90d7ab5"; + sha256 = "1dbs1pww1xsfhfbddfxwxay5s3g4j0880hza83ck46n5kfgkm1rk"; libraryHaskellDepends = [ async base containers lifted-base monad-loops snap stm time transformers @@ -163071,7 +174513,7 @@ self: { mkDerivation { pname = "snap-extras"; version = "0.12.0.0"; - sha256 = "76ec979fa905a305392a545f24c6a33217e83aeedd0a8eec311623722b26e494"; + sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163097,7 +174539,7 @@ self: { mkDerivation { pname = "snap-language"; version = "0.1.0.2"; - sha256 = "9812f257776f36f2a160c211d64f7320473279acdab411c44bf45a411b4ca936"; + sha256 = "0dm99hdl2npl9g213d6smiwk4ir0fd7xc4f2c2hz4dkgfxbz44lq"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; @@ -163113,7 +174555,7 @@ self: { mkDerivation { pname = "snap-loader-dynamic"; version = "1.0.0.0"; - sha256 = "8f1770de14e3039eb78f5455e69bdf40c9b1aa5b5d831810abd4f1eb67abfb8b"; + sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg"; libraryHaskellDepends = [ base directory directory-tree hint mtl snap-core template-haskell time unix @@ -163129,7 +174571,7 @@ self: { mkDerivation { pname = "snap-loader-static"; version = "1.0.0.0"; - sha256 = "5af51d870fc96823eb063aff1bd0db5b70fac140a2226d97473c804090752912"; + sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://snapframework.com/"; description = "Snap static loader"; @@ -163145,9 +174587,9 @@ self: { mkDerivation { pname = "snap-predicates"; version = "0.3.1"; - sha256 = "c5a3e0eabaacaa198c2e2973b27d26ae448a39357f846190a2f77174c5d2330b"; + sha256 = "02rksb2p8wgpla86313z6lwqli5f4ryv4wr95s61kamcpbmf18y5"; revision = "1"; - editedCabalFile = "6fbedca064ea734b7fb4c14324a4b128a54a5bd4e3e18416b9d87087392a46ad"; + editedCabalFile = "1ba658wqfw6qp4b89qg3sidlm998n6j28hy1nizlnwzacjhdrgkg"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive containers monads-tf snap-core text transformers @@ -163170,7 +174612,7 @@ self: { mkDerivation { pname = "snap-routes"; version = "0.0.1"; - sha256 = "5ec5bff04474aef1d89318f9bc01fe8ef166f0a09c6c35b7b5003aca312afbcb"; + sha256 = "1jzv58qwlfh0nnvkav4wl3q6dwcfzq0vry8qjgcg3bkl8kqbziay"; libraryHaskellDepends = [ base blaze-builder bytestring containers filepath http-types mime-types path-pieces random snap template-haskell text @@ -163192,10 +174634,10 @@ self: { }: mkDerivation { pname = "snap-server"; - version = "1.0.1.1"; - sha256 = "878d83a815b9cc8f3d282ef6fafc441528b5f7819147f17f0c1b1f9904146c70"; + version = "1.0.2.2"; + sha256 = "0zw3z9s61kkfmlvrg3sfqvd0c3mzg9zjwp01hm1br3z8cawmzpi7"; revision = "1"; - editedCabalFile = "5b9b8071df32b8590c28df9cf4eb4afd77ee4554ff536b7e5a1d617f5e32f9a7"; + editedCabalFile = "1r35srci0bglwz8bbl6kwgb33g0lpqdwv8lsy7hfc1l3kj4a7p2f"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -163232,7 +174674,9 @@ self: { mkDerivation { pname = "snap-templates"; version = "1.0.0.0"; - sha256 = "f6289348179d07721f6edc1dbe19bcfe989de0dd2945962c455e2ce113d2561b"; + sha256 = "06sns89y2b2y8ln9ci99vph9v67yphcvw7fwdqgp41wx2x496a7n"; + revision = "1"; + editedCabalFile = "0y86zbaw4ain6ia15b7fpr48sxxz37x230qvrf28dicxcxm8jmva"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163253,7 +174697,7 @@ self: { mkDerivation { pname = "snap-testing"; version = "0.6.0.0"; - sha256 = "136f1a8e3d541aaa591230c307e911faca486e208ee405e3673743a81c6deccf"; + sha256 = "1kzcdlfahhrpczihbr4f41p4ijps27lhghrh29csl6jl7n71lvqk"; libraryHaskellDepends = [ async base bytestring containers digestive-functors HandsomeSoup hxt io-streams mtl process QuickCheck snap snap-core text @@ -163277,7 +174721,7 @@ self: { mkDerivation { pname = "snap-utils"; version = "0.1.2"; - sha256 = "210d35b7f76915e793573fc7a4c1519e2962f9033314c5aad3463b19a44b20cf"; + sha256 = "1kr09fj1jfs6sfmca51k0gwn4acya70s9irzay9yf5b9yyvka391"; libraryHaskellDepends = [ base bytestring heist http-types MonadCatchIO-transformers mtl snap snap-core text xmlhtml @@ -163295,7 +174739,7 @@ self: { mkDerivation { pname = "snap-web-routes"; version = "0.5.1.0"; - sha256 = "a2d2257193d69613fe504a81596b21d6453a5e41fee959c904de2565c7bc8de0"; + sha256 = "1q4dpk3na9fy0k4mksgy85g3lifn45mmk0aaa3z175nnjdqjblm2"; libraryHaskellDepends = [ base bytestring heist mtl snap snap-core text web-routes xmlhtml ]; @@ -163310,7 +174754,7 @@ self: { mkDerivation { pname = "snaplet-acid-state"; version = "0.2.7"; - sha256 = "fd99ea6005b6355e5ec5937665b7982cf4f5e21266f3bf0fac1b5d705965586e"; + sha256 = "0vjqcmcp0p8vmh7vzwv62bigbx1ck2vnaxlkqmg5wddn0mhfm6gx"; libraryHaskellDepends = [ acid-state base mtl snap text transformers ]; @@ -163331,7 +174775,7 @@ self: { mkDerivation { pname = "snaplet-actionlog"; version = "0.2.0.1"; - sha256 = "7b279a0b0591ac0efd6c4aa5032509bb7b84a948beacd4602a10d3edd20aea9c"; + sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv"; libraryHaskellDepends = [ base blaze-builder bytestring digestive-functors digestive-functors-heist digestive-functors-snap errors heist @@ -163352,7 +174796,7 @@ self: { mkDerivation { pname = "snaplet-amqp"; version = "1.1.0.0"; - sha256 = "21cdfa3bff6cbf189db1ac011a340d8038e81bf2675d2a0099dabba82e121c07"; + sha256 = "01qw28paifysk402lpb7y8dyhf401ls1l0dcn6fiigvczwxzmk91"; libraryHaskellDepends = [ amqp base bytestring configurator lens monad-control mtl network resource-pool snap transformers @@ -163372,7 +174816,7 @@ self: { mkDerivation { pname = "snaplet-auth-acid"; version = "0.1.0"; - sha256 = "95eb134e5ef69c03f42778e1c6acd075e975d741db767712dd716e21b3f01744"; + sha256 = "0i0py2rj2vkivl97fxnv87bpbsbms2ncdqbq4zs0777nbr717swm"; libraryHaskellDepends = [ acid-state aeson attoparsec base cereal clientsession directory errors filepath hashable lens MonadCatchIO-transformers mtl @@ -163391,7 +174835,7 @@ self: { mkDerivation { pname = "snaplet-coffee"; version = "0.1.0.2"; - sha256 = "ce5efb29b77639f89f0ce6540421db13835f2d72797848a9d2a48454d1b4bdcf"; + sha256 = "1kxxnk8m9154sallhy3rf8nmz0qkvchh8m761jgzhfbnnwlznpnf"; libraryHaskellDepends = [ base bytestring configurator directory filepath haskell-coffee mtl snap snap-core @@ -163409,7 +174853,7 @@ self: { mkDerivation { pname = "snaplet-css-min"; version = "0.1.2"; - sha256 = "3282cbeeec88fcceb9beecb5bb96f5f6698e6d5f738645eea2eeb6013af0e6ae"; + sha256 = "1bp6y0x03dpflbp4b1kkbxnqwsgnynbbpdgcpswwxz48xkpcp0ij"; libraryHaskellDepends = [ base bytestring css-text directory filepath lens snap text utf8-string @@ -163427,7 +174871,7 @@ self: { mkDerivation { pname = "snaplet-environments"; version = "0.1.1"; - sha256 = "70f807e7279325e7cf3263d9ddeafd104300ec41afc20179ad6c9c9f82cf62ce"; + sha256 = "1kk2ry19z73cmmwh3hmg87n00hqhzpmdvnb36b7yf9ck4zkhgy3h"; libraryHaskellDepends = [ base bson configurator mtl regex-tdfa snap snap-core text unordered-containers @@ -163444,9 +174888,9 @@ self: { mkDerivation { pname = "snaplet-fay"; version = "0.3.3.14"; - sha256 = "97a9a3ec90e03be064df0a6e3dcf5834de063fb43a24d1014eb3d0ba8bac4207"; + sha256 = "01s2mj5vml5k9q0x291snhzhdpilb37ksvhavxjf0fz0j3na7acp"; revision = "1"; - editedCabalFile = "58f323693af14f209668396e60d99aaf46c3adc1415f8e2df951a54494be8619"; + editedCabalFile = "06c6psa499aiz4nqwps1q6nw6imgkbcn0vird2b20kzi79lj7wsq"; libraryHaskellDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -163464,7 +174908,7 @@ self: { mkDerivation { pname = "snaplet-ghcjs"; version = "0.1.0.0"; - sha256 = "9661f47bf1ce7ef88b61aabddd81be04616a723afc2de4c8e66471f1fa95c229"; + sha256 = "0af2jpxg2wb4wv4f8bgw79r6lq84ps0xvgdac65zhznfy5xz8qcn"; libraryHaskellDepends = [ base directory filepath lens mtl process snap snap-core string-conversions transformers @@ -163481,7 +174925,7 @@ self: { mkDerivation { pname = "snaplet-hasql"; version = "1.0.2"; - sha256 = "9bcd6129294b22e0669e0483142e1b24536935a6df82f00f935c83b74d02fd21"; + sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv"; libraryHaskellDepends = [ aeson base bytestring clientsession configurator hasql hasql-backend lens mtl snap text time @@ -163499,7 +174943,7 @@ self: { mkDerivation { pname = "snaplet-haxl"; version = "0.0.0.2"; - sha256 = "94131edef6f07fd1ed79619b592c33facece953cbc1400cc8c207f98b1301f77"; + sha256 = "0xqz62qrhzr0ik60055w7jawxkps6cn5k6v1g7nx2zzhyvg1w4wl"; libraryHaskellDepends = [ base haxl MonadCatchIO-transformers snap transformers ]; @@ -163518,7 +174962,7 @@ self: { mkDerivation { pname = "snaplet-hdbc"; version = "0.9.1"; - sha256 = "d523856747f83b0da0dbdd8bfcb615efc65ed611609d3883b7ce32c16854279f"; + sha256 = "17r7ailc2cnfny1ki7b027b5xipg2nvgr2yxvfh0sfzq8xkqa8ym"; libraryHaskellDepends = [ base bytestring clientsession containers convertible data-lens data-lens-template HDBC MonadCatchIO-transformers mtl @@ -163538,7 +174982,7 @@ self: { mkDerivation { pname = "snaplet-hslogger"; version = "1.0.0.2"; - sha256 = "1dac250b49129bb7aaf136cb118e3410adb997aac1fca7015a10873b7ebc9b95"; + sha256 = "15cvpiz3p1qhb80sgz61mabvkb8h6j713jrny6mbg6qj945jbb0x"; libraryHaskellDepends = [ base configurator hslogger mtl snap transformers ]; @@ -163556,7 +175000,7 @@ self: { mkDerivation { pname = "snaplet-i18n"; version = "0.2.0"; - sha256 = "811a12a9db93c5df0ab2d33a160eb49595cd25afd53b1ca553498d407bec55c3"; + sha256 = "1hsmxixl13a9afjiqfymmwjwv5cmnh71cfnkn85dzickvfli46l1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163581,7 +175025,7 @@ self: { mkDerivation { pname = "snaplet-influxdb"; version = "1.0.1.1"; - sha256 = "f2c870ea7536bedd8a9bd11e8a05fa483879a8d3b3c7158a58807eca320068b7"; + sha256 = "1dv800rclzl0b251bixksfl7jf28z82ql7nikf5dvginfpm71j7j"; libraryHaskellDepends = [ base bytestring configurator http-client influxdb lens monad-control mtl network snap text transformers @@ -163599,7 +175043,7 @@ self: { mkDerivation { pname = "snaplet-lss"; version = "0.1.0.0"; - sha256 = "fd0100244a68f83f272a1a8c4a4cfae631bdb305715d12d52e1daa5e4c4e943e"; + sha256 = "0gll9r65xahx5vai4pbi0nrvscg6z964m30s58kkzy3898j000gx"; libraryHaskellDepends = [ base directory filepath heist lss snap text xmlhtml ]; @@ -163616,7 +175060,7 @@ self: { mkDerivation { pname = "snaplet-mandrill"; version = "0.1.0.3"; - sha256 = "c2a4cdf7e4099395943e06d6cdb7b888260ec8be08f4b80bef6693d01606cb7b"; + sha256 = "0yyb0qbd14v6xw5vix08pv40w9l8p2vwvmh67sa9b4q9wkvwv962"; libraryHaskellDepends = [ base configurator mandrill mtl network snap transformers ]; @@ -163635,7 +175079,7 @@ self: { mkDerivation { pname = "snaplet-mongoDB"; version = "0.2"; - sha256 = "5c5d95e169758160f3e2f06b32041373ce47841ea5bb46be26f0a1b5e112f542"; + sha256 = "0hpm2bhvb8gh4sz4dfx53s24gkkk2c234szhwbrn10bmd7hrapaw"; libraryHaskellDepends = [ base bson bytestring compact-string-fix containers haskell-src-exts MonadCatchIO-transformers mongoDB mtl parsec regular safe snap @@ -163652,7 +175096,7 @@ self: { mkDerivation { pname = "snaplet-mongodb-minimalistic"; version = "0.0.6.12"; - sha256 = "56e5f66271843a59593b79da86c4be0f194d9b1a2dc0cf4721ed938b81b51034"; + sha256 = "0d0hnn0qp4zd453wzh1d3adls68gpv28dnkr7dcmjfl4f5igdran"; libraryHaskellDepends = [ base lens mongoDB mtl snap text transformers ]; @@ -163671,7 +175115,7 @@ self: { mkDerivation { pname = "snaplet-mysql-simple"; version = "0.2.2.0"; - sha256 = "431144707d54737953c83fbe71b78ad06be73454e25f56163c108ecc20935058"; + sha256 = "0n2hjchcr3hh7hb5cpz2ahsffsyhiavp3gizr19pjwslgmq484a3"; libraryHaskellDepends = [ base bytestring clientsession configurator containers errors lens MonadCatchIO-transformers mtl mysql mysql-simple @@ -163693,7 +175137,7 @@ self: { mkDerivation { pname = "snaplet-oauth"; version = "0.0.6"; - sha256 = "d48ffb556f6af5824473e53d4467e2e71f4c34813ff5c46ffa9fda90fed5fe9c"; + sha256 = "177yspz91nlzz9pw9x9zh4s4q7z7w9kl8gg5fd285xbadxazp3yl"; libraryHaskellDepends = [ aeson base bytestring bytestring-show data-lens data-lens-template failure hashable heist hoauth2 http-conduit http-types @@ -163720,7 +175164,7 @@ self: { mkDerivation { pname = "snaplet-persistent"; version = "0.5"; - sha256 = "b3f41b11dc1ce4978fc29c8b7ccfea55cee7a645d092dc179706a7a7ab9d7dfd"; + sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k"; libraryHaskellDepends = [ base bytestring clientsession configurator errors heist lens monad-logger MonadCatchIO-transformers mtl persistent @@ -163741,10 +175185,8 @@ self: { }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "1.0.1.0"; - sha256 = "c747f9a0145c22f36441bab504a45ab20fc68ad46a8383c5f4db6686cd0dee7d"; - revision = "1"; - editedCabalFile = "94e77c56c9493373c7d57f50b6dc62e178cf37d294aa046bd66f71f6102b3372"; + version = "1.0.2.0"; + sha256 = "1agykln1mr08bh5yp8xf5nhjirbvwc9kgl4k3rkl700hfjhdpbb7"; libraryHaskellDepends = [ base bytestring clientsession configurator lens lifted-base monad-control mtl postgresql-simple resource-pool snap text @@ -163763,7 +175205,7 @@ self: { mkDerivation { pname = "snaplet-postmark"; version = "0.2.0"; - sha256 = "dd72745b378afed63455ea68295baf7d295427e0941f935efa063ead118a0600"; + sha256 = "0006i88ssgh6z9g967wlw0km8abxmxdjjs7aalsddzla6xdp8wnx"; libraryHaskellDepends = [ base configurator mtl postmark snap text transformers ]; @@ -163780,7 +175222,7 @@ self: { mkDerivation { pname = "snaplet-purescript"; version = "0.5.2.0"; - sha256 = "e1d00a9f0747f1a59c392e35f863b3b66b997a4140754393b2e89ec152e1a6a5"; + sha256 = "19d6w59c37p8na9l6xa085x9jsxnndizhd9f76fabwa70yghml71"; libraryHaskellDepends = [ base configurator mtl raw-strings-qq shelly snap snap-core string-conv text transformers @@ -163798,7 +175240,7 @@ self: { mkDerivation { pname = "snaplet-recaptcha"; version = "1.0.3"; - sha256 = "46eccbd23fbadac5682327b26c6ac0faa8fbb80c4de39c99fff29f0cce76c509"; + sha256 = "02f5fv70r7zjzycrrqsd1jwgpa7sq1m6rci74dlcbnms7z9cpv26"; libraryHaskellDepends = [ aeson base blaze-builder bytestring configurator heist http-conduit lens MonadCatchIO-transformers mtl snap text transformers @@ -163816,7 +175258,7 @@ self: { mkDerivation { pname = "snaplet-redis"; version = "0.1.4.2"; - sha256 = "104242331c6069d9edd806e41e432941cb88c06276cd03ad0eac7cf986642566"; + sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh"; libraryHaskellDepends = [ base configurator hedis lens mtl network snap text transformers ]; @@ -163835,7 +175277,7 @@ self: { mkDerivation { pname = "snaplet-redson"; version = "0.1.0.0"; - sha256 = "ad7cd4fdc52ac53a5e8a440428a5491fa15a79f60ff5a22f3bc2b6661db26a5f"; + sha256 = "0pvan8fnddn27cps5x8gyrwmm88z96jjh124i9g3mi9aqpyx8z5d"; libraryHaskellDepends = [ aeson base bytestring configurator containers data-lens data-lens-template easy-file hedis mtl snap snap-core snaplet-redis @@ -163855,7 +175297,7 @@ self: { mkDerivation { pname = "snaplet-rest"; version = "0.1.0"; - sha256 = "c10302318f4637a812e4b84b66005031661506cffcfc9c8dec15581d7ff12cf0"; + sha256 = "1w1cy5zisn0mxj6rrz7wrw31ariia006cjxqwh9ahds6iwqh40y1"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive http-media lens mtl snap snap-accept snap-core text utf8-string xmlhtml @@ -163874,7 +175316,7 @@ self: { mkDerivation { pname = "snaplet-riak"; version = "0.2.1.0"; - sha256 = "3c40c97eb65134f44d1418d37a43948fb8dd0b1e34252b5010578352b409c639"; + sha256 = "0ff616s550sp2182n99l3q5xvf4gji1pmlqq2i6z8d2inrzcjh1w"; libraryHaskellDepends = [ aeson base containers data-lens data-lens-template mtl riak riak-protobuf snap snap-core time transformers @@ -163892,7 +175334,7 @@ self: { mkDerivation { pname = "snaplet-sass"; version = "0.1.2.0"; - sha256 = "3fe5b95f5223c18e273169a87bbb9ed5b56ceebe7a321a6de7bf5352a2b63faa"; + sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z"; libraryHaskellDepends = [ base bytestring configurator directory filepath mtl process snap snap-core transformers @@ -163910,7 +175352,7 @@ self: { mkDerivation { pname = "snaplet-scoped-session"; version = "0.1.1"; - sha256 = "06c7b93f64d9c287e5412288398237a19e124265c2efc4f452cf7904159a7f2f"; + sha256 = "0bvzk8ah8yfgabsc9vy2cm1157m16y13k21287jqghnrchzvkiq6"; libraryHaskellDepends = [ async base classy-prelude configurator data-default lens mtl snap time unordered-containers @@ -163928,7 +175370,7 @@ self: { mkDerivation { pname = "snaplet-sedna"; version = "0.0.1.0"; - sha256 = "4b61482b4fba8370eb77a68be8641aa7defb52a5a84626c0b4c3596575f5a0e5"; + sha256 = "1rd0ymsnanf3nk02cim8lm9gppm739jfi2x6fzmp10xs9wmlhqab"; libraryHaskellDepends = [ base bytestring containers monad-control mtl resource-pool sednaDBXML snap @@ -163945,7 +175387,7 @@ self: { mkDerivation { pname = "snaplet-ses-html"; version = "0.1.1.0"; - sha256 = "669ee6f6f25aab1b468c98c9bbc6b9977c290ae093c063bc8c815fdb38f4b7e8"; + sha256 = "1s5pyhwdnpw1ijy67h4kw052jz4pp73bpjcqii31passybvfd7k6"; libraryHaskellDepends = [ adjunctions base blaze-html bytestring configurator lens ses-html snap text transformers @@ -163966,9 +175408,9 @@ self: { mkDerivation { pname = "snaplet-sqlite-simple"; version = "1.0.0.2"; - sha256 = "2d12f405b1a796d587a43646aa136c4a0e9e5761212cbdb84014e226bed360d7"; + sha256 = "1mv0sfz2dqhl82wbsb11c5brw3jadh9sliinlj3xb5m7n42z84id"; revision = "1"; - editedCabalFile = "9c49f31dc5e4b6b10942502f2d57755fc028ff2924f2c94a32030e172d19493e"; + editedCabalFile = "0gj934nif3h3695ckwi457zjih2zfmbjsbsh884v3dp4qlfz6jcw"; libraryHaskellDepends = [ aeson base bytestring clientsession configurator direct-sqlite lens lifted-base monad-control mtl snap sqlite-simple text transformers @@ -163995,7 +175437,7 @@ self: { mkDerivation { pname = "snaplet-sqlite-simple-jwt-auth"; version = "0.2.0.0"; - sha256 = "fc58870fc0cee74f9d4138c909937350faa7d1924a1da8e0f76b4a5ccdf31203"; + sha256 = "00qjyg6mqjkbyzhah7aajb8sgyjhff9hkj9q86flzryfq07qfn7w"; libraryHaskellDepends = [ aeson attoparsec base bcrypt bytestring clientsession containers directory either errors jwt lens mtl snap snap-core @@ -164015,7 +175457,7 @@ self: { mkDerivation { pname = "snaplet-stripe"; version = "0.3.0"; - sha256 = "9727969f8ad26d02f5e215e2d8173ecc791a9e7e847397d153531b5edddf0549"; + sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp"; libraryHaskellDepends = [ base bytestring configurator heist lens-family-core mtl snap stripe text text-format transformers xmlhtml @@ -164033,7 +175475,7 @@ self: { mkDerivation { pname = "snaplet-tasks"; version = "0.1.2"; - sha256 = "80ed3c41618e53856642b5a2f01939ecbcf136dbddc8402e5c128156a5947072"; + sha256 = "0wkhjjjmd08jbhp41j6xvcvg3g7c74cz18mm89k8alwfc50krvc0"; libraryHaskellDepends = [ base bytestring containers curl data-hash haskell98 MissingH mtl network snap snap-core @@ -164051,7 +175493,7 @@ self: { mkDerivation { pname = "snaplet-typed-sessions"; version = "0.5"; - sha256 = "fc2d999f413682703efe62aa3a2f26d132ea9173d2dc80c48eecf1a5bbdd863d"; + sha256 = "0gc6vnxsbwgciv281p6jff8ylcni4qpkmak2zqz710in86grjbgw"; libraryHaskellDepends = [ base bytestring cereal clientsession containers hashtables mtl PSQueue random regex-posix snap snap-core time @@ -164071,7 +175513,7 @@ self: { mkDerivation { pname = "snaplet-wordpress"; version = "0.1.1.2"; - sha256 = "4bddd4774025dbca93e7500769440d7b3deee973fb82860468de6dd032f7b3ee"; + sha256 = "1vmkywrd0vfyd028d0pvfglywgbv1m26j1shwy9wmnr581vx9pab"; libraryHaskellDepends = [ aeson async attoparsec base blaze-builder bytestring configurator containers data-default either hedis heist hspec hspec-snap lens @@ -164096,7 +175538,7 @@ self: { mkDerivation { pname = "snappy"; version = "0.2.0.2"; - sha256 = "0565df326a87c6ea67f8fb638e01acb0562cabd16a67fc6f9ea9cd191de8cd91"; + sha256 = "14fdx0fikkd9krpzqrvas6mjqmmhmh0qwqzvz1kymil7d8rdyr85"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ snappy ]; testHaskellDepends = [ @@ -164113,7 +175555,7 @@ self: { mkDerivation { pname = "snappy-conduit"; version = "0.1.0.0"; - sha256 = "d15d858942f09f91723750f6e927f6dc56373d2ff1d0427c47019deddbd8234d"; + sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi"; libraryHaskellDepends = [ base bytestring conduit snappy ]; homepage = "http://github.com/tatac1/snappy-conduit/"; description = "Conduit bindings for Snappy (see snappy package)"; @@ -164126,7 +175568,7 @@ self: { mkDerivation { pname = "snappy-framing"; version = "0.1.1"; - sha256 = "f01b99cfa2e8d2c677e45e1852e0ae0a00034b8318e69d84b1857936c8c24be5"; + sha256 = "1rabqb43cyc5n629vrhqhd5h600amvh5462ywivwdlp8lb7rj6zh"; libraryHaskellDepends = [ array base binary bytestring snappy ]; homepage = "https://github.com/kim/snappy-framing"; description = "Snappy Framing Format in Haskell"; @@ -164139,7 +175581,7 @@ self: { mkDerivation { pname = "snappy-iteratee"; version = "0.1"; - sha256 = "b35a1ca7f4412df2253b111a555618e02bd9aa3890f05fad924bcc78f8d65c9e"; + sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk"; libraryHaskellDepends = [ base bytestring iteratee snappy ]; homepage = "http://github.com/iand675/snappy-iteratee"; description = "An enumeratee that uses Google's snappy compression library"; @@ -164155,7 +175597,7 @@ self: { mkDerivation { pname = "sndfile-enumerators"; version = "0.10.0.0"; - sha256 = "99ec2018b40df39ca3b07dbd874506b4d950ce22a50da88521be23542d5cd4da"; + sha256 = "1nnlbhnm88xy462sh3d54b751ndl0r2qggbxn2irrwqdnhc21v4r"; libraryHaskellDepends = [ base binary bytestring containers filepath iteratee listlike-instances MonadCatchIO-transformers transformers vector @@ -164174,7 +175616,7 @@ self: { mkDerivation { pname = "sneakyterm"; version = "0.1"; - sha256 = "6dec2306f63d72f7e7931ba16827ff467de4b36d98089ecef8ba5df5346f5687"; + sha256 = "11sndwsgapdsz379w24qdnry8za6zwkni88vjgkzfwixyq327v3d"; libraryHaskellDepends = [ base classy-prelude containers lens linear mtl ncurses transformers ]; @@ -164189,7 +175631,7 @@ self: { mkDerivation { pname = "sneathlane-haste"; version = "2"; - sha256 = "9614de5868379336bbc0eb5e0d013a8c7a2178373abb5ecd153d74988f57dc7b"; + sha256 = "0yyway7rhx1x2p6mxfrs6xw22ylc780hsppbq2xkd4rpd1cdw54n"; libraryHaskellDepends = [ base haste-compiler ]; homepage = "http://sneathlane.com"; description = "A compositional web UI library, which draws to a Canvas element"; @@ -164197,12 +175639,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snipcheck" = callPackage + ({ mkDerivation, base, containers, pandoc, process }: + mkDerivation { + pname = "snipcheck"; + version = "0.1.0.2"; + sha256 = "15n6dwkkbr7yh1xvl0xj1kba5s3qy4s8zq01px552fm1qqa8wdzk"; + libraryHaskellDepends = [ base containers pandoc process ]; + homepage = "https://github.com/nmattia/snipcheck#readme"; + description = "Markdown tester"; + license = stdenv.lib.licenses.mit; + }) {}; + "snippet-extractor" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { pname = "snippet-extractor"; version = "0.2.0"; - sha256 = "f50f76b2ec7b04324be47ba481364ea4bb461fde6c1502d586599658ae51de47"; + sha256 = "0iyya6p5i5jrhvah45bcvqgldfx49qv8393vwi5k413vxjr7c3zm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec ]; @@ -164217,7 +175671,7 @@ self: { mkDerivation { pname = "snm"; version = "0.0.4"; - sha256 = "5142bfd400b03fdb575cf3a9342feb01edcc2ec31927c18d39cadc8ccb904cd8"; + sha256 = "1n2cj35qrp6a766w29qrqcpcrv81xcpk9agkbibxngxh03abyhji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164242,7 +175696,7 @@ self: { mkDerivation { pname = "snmp"; version = "0.2.1.1"; - sha256 = "0737d6fc4299a00d248d263ebdde7b3451f32da3f9a6f5afac0a125eb57384a4"; + sha256 = "1944ffsmw4hamjpzb9prlcnz6l9lgggbsgi6ilj0v84r8bydcdq7"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types async base binary bytestring cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl @@ -164260,7 +175714,7 @@ self: { mkDerivation { pname = "snorkels"; version = "0.2.0.0"; - sha256 = "3b9d7f7c50279153dbb6b9f066d88a32178dc52e30ad95293cfbf965a7a6c251"; + sha256 = "0lf2lsknbygv7hlrbb9h5v2qs5rjibc6dw5rnvdm7497a1y7z79v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164281,7 +175735,7 @@ self: { mkDerivation { pname = "snow-white"; version = "2009.12.1"; - sha256 = "51eb8994f2f5bbf82a34da8c6e59a4756093447ce0b56beb8615c8db50fef000"; + sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi"; libraryHaskellDepends = [ base binary bytestring mps ]; homepage = "http://github.com/nfjinjing/snow-white"; description = "encode any binary instance to white space"; @@ -164298,7 +175752,7 @@ self: { mkDerivation { pname = "snowball"; version = "1.0.0.1"; - sha256 = "7d5d05f693cc50210a5f2ba7b5e67d8f665f706525ae50acc1583a4742fd7d3b"; + sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx"; libraryHaskellDepends = [ base bytestring text text-icu ]; testHaskellDepends = [ base HUnit QuickCheck quickcheck-instances test-framework-hunit @@ -164317,9 +175771,9 @@ self: { mkDerivation { pname = "snowflake"; version = "0.1.1.1"; - sha256 = "f156ca321ae17033fe1cbe7e676fea403136198e1c3a132924a080cd3145cddd"; + sha256 = "1pfd8lqwv0504hli6fhwiqckcca0x9pnfzmy3kz36w7138rclmpi"; revision = "1"; - editedCabalFile = "0a7ec7d48cb1dd005020970205b7fce596a3ead1d02d05e0ee3e221bb51dbbf8"; + editedCabalFile = "1y5v3nsin8iyxvh0abfhs7ma75p5zjvha0lp41801pdiikacfzha"; libraryHaskellDepends = [ base time ]; description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers."; license = stdenv.lib.licenses.asl20; @@ -164330,7 +175784,7 @@ self: { mkDerivation { pname = "snowflake-core"; version = "0.1.0.1"; - sha256 = "442427fa86bee84c422c3c14e02e0f33f1d04504172dfd2620c50b3aa2ef8954"; + sha256 = "0m49xyi3l2y540kgsb8p0i2x1w9k1wpf051w5i14rs5yhvx2f924"; libraryHaskellDepends = [ base time-exts ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/jiakai0419/snowflake#readme"; @@ -164346,7 +175800,7 @@ self: { mkDerivation { pname = "snowflake-server"; version = "0.1.0.0"; - sha256 = "af3baefdf4c9c51c7c0eb1441b24af8d9185ef41fae3890f961effbdca789c1c"; + sha256 = "074wg35bvzqyjq7qkqzs87pqb4cdmwj1ni5i1ry1rif9ykyswfxg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164365,7 +175819,7 @@ self: { mkDerivation { pname = "snowglobe"; version = "3.0.0.3"; - sha256 = "4151e29ae819d03dc956de2bb6d945d0f8d1ec436a0c76159f08a2d30a1ec2e3"; + sha256 = "1qy23q5d78h8kwapc33a8gnd3y6h8pcvcayyav4kvl0rx2df4la1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164384,8 +175838,8 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.3.3"; - sha256 = "2d1759c83bc75cacc470ffc64af218f971d55875a61c2de10be1276bd9845979"; + version = "0.2.3.5"; + sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs"; libraryHaskellDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -164407,7 +175861,7 @@ self: { mkDerivation { pname = "soap-openssl"; version = "0.1.0.2"; - sha256 = "2008547f4fd22063479ce1cd1c483db926f5f08a2ff6fb0c60fb2f0f7d42830f"; + sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; libraryHaskellDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text @@ -164426,7 +175880,7 @@ self: { mkDerivation { pname = "soap-tls"; version = "0.1.1.2"; - sha256 = "e43abafb0ed390b9f5f99cc957973367d40e91c8d3ae7e22b3250a08ebe7df76"; + sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4"; libraryHaskellDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation @@ -164443,7 +175897,7 @@ self: { mkDerivation { pname = "sock2stream"; version = "0.3"; - sha256 = "f078bb494035208ecc91c1cee904e0cf12d796cc30d67afea658924ed497d9ee"; + sha256 = "1vnrjza4x4jqlvz7mmihrjbdf4ngw02fkkn1j768w81m814vny7h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164460,7 +175914,7 @@ self: { mkDerivation { pname = "sockaddr"; version = "0.0.0"; - sha256 = "422f7e27c550878c9b0b05146cd935d775bf1fbf8f8b163c0923ed1b6f99e4c0"; + sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2"; libraryHaskellDepends = [ base byteorder bytestring network ]; description = "Printing SockAddr"; license = stdenv.lib.licenses.bsd3; @@ -164473,7 +175927,7 @@ self: { mkDerivation { pname = "socket"; version = "0.7.0.0"; - sha256 = "84dad156fe2d792194e86c4496db648e5fe0bbb55db2070b93058d6aa5f08962"; + sha256 = "0ql9y2jnm385jc5hgcjxnnxy0pwfckdrci3cx2a22y9dzrbd3nl4"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -164490,7 +175944,7 @@ self: { mkDerivation { pname = "socket"; version = "0.8.0.1"; - sha256 = "745f6d1ef2299e321ad646918b9b733c82b4ded51b3b6aab6755c85182ab09a2"; + sha256 = "18h9mf153j2mcymnlfqvspgb90iwffdqp4a6sqd357i9y8g6spvl"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -164506,7 +175960,7 @@ self: { mkDerivation { pname = "socket-activation"; version = "0.1.0.2"; - sha256 = "b99e7b4f296cd462aac84e5bb61fb02953e2080d1351e9e10a63d35dc34eb43b"; + sha256 = "0fxl9v1mvlv31bhyjl8k1l4f4lr9n0gvcnsfr2m65m3c557pp7mr"; libraryHaskellDepends = [ base network transformers unix ]; homepage = "https://github.com/ddfisher/haskell-socket-activation"; description = "systemd socket activation library"; @@ -164520,7 +175974,7 @@ self: { mkDerivation { pname = "socket-io"; version = "1.3.7"; - sha256 = "bbd92d2a6711e950e6bb2da8342a3e103c66638cad2207820c5cb6d8090fef0a"; + sha256 = "02pg1w4xidjw1j10f8mdiiincg0h7qm39a1dpgk51s8icwm2vndv"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -164535,7 +175989,7 @@ self: { mkDerivation { pname = "socket-sctp"; version = "0.3.0.0"; - sha256 = "3320909a90d21f51743a114dd3f69604c7490ce1e86242f280cae8bc7c45092c"; + sha256 = "0b098mybrs6ah3r44qp8w464kiq4jvvd6k8i79s527yjj2d9081k"; libraryHaskellDepends = [ base bytestring socket ]; librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; @@ -164552,7 +176006,7 @@ self: { mkDerivation { pname = "socket-unix"; version = "0.2.0.0"; - sha256 = "4d7591116dcbf70f9aea4a4f80fe9261abc19b03184b46a6463e09d020f435ac"; + sha256 = "1b1myhhd029y8sk4cjqq0fdw3av1jbz80ksaxad0zxybdl8r2xad"; libraryHaskellDepends = [ base bytestring socket ]; testHaskellDepends = [ async base bytestring socket tasty tasty-hunit unix @@ -164563,6 +176017,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "socketed" = callPackage + ({ mkDerivation, async, base, bytestring, conduit-combinators + , conduit-extra, http-types, MissingH, optparse-applicative, stm + , stm-chans, stm-conduit, template-haskell, text, wai + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "socketed"; + version = "0.1.0.0"; + sha256 = "0kwpir4dl70c8iipqirwdgrncicysqr3mknx8hvkwlpcfvy0shbi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring conduit-combinators conduit-extra http-types + MissingH optparse-applicative stm stm-chans stm-conduit + template-haskell text wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ + async base bytestring conduit-combinators conduit-extra http-types + MissingH optparse-applicative stm stm-chans stm-conduit + template-haskell text wai wai-websockets warp websockets + ]; + description = "simpe tool to serve piped data over http and websocket"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "socketio" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , blaze-builder, bytestring, conduit, conduit-extra, http-types @@ -164574,7 +176055,7 @@ self: { mkDerivation { pname = "socketio"; version = "0.1.3"; - sha256 = "38f387e0e52ead50f0d87ae6ca6e9d753a76ad9d7f957f9afd434a777a9c3ca7"; + sha256 = "19rwkix7fjj3znd7z5bzknnpcfkmkmpcmrksv3q51b9fwph8gwrq"; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base blaze-builder bytestring conduit conduit-extra http-types lifted-base monad-control mtl @@ -164601,7 +176082,7 @@ self: { mkDerivation { pname = "socketson"; version = "0.1.0.0"; - sha256 = "7cff6662c11878b3e7a1f6cf7706534aee954a6504fa37da399d7c01ed76293c"; + sha256 = "0g19fvnh2z4x77d3gyh4cm59bvjaac37gkznl7kv6y0qq5i6dzvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164624,9 +176105,9 @@ self: { mkDerivation { pname = "socks"; version = "0.5.5"; - sha256 = "2647ea93e21ad1dfd77e942c022c8707e468d25e1ff672a88be82508034fc868"; + sha256 = "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6"; revision = "1"; - editedCabalFile = "7cd766c60366c9b1e6100af4f710fd38bc851ac28387b60471c6a3b63bc0e85b"; + editedCabalFile = "0nz8q0xvd8y6f42bd1w3q8d8bg1qzl8ggx0a23kb3jb60g36dmvw"; libraryHaskellDepends = [ base bytestring cereal network ]; homepage = "http://github.com/vincenthz/hs-socks"; description = "Socks proxy (version 5) implementation"; @@ -164638,7 +176119,7 @@ self: { mkDerivation { pname = "sodium"; version = "0.11.0.3"; - sha256 = "ea61f6725d01cf581a086738e9c18bbf567a428545d582824280aa48150b1a03"; + sha256 = "00qs1calial08a185ma5hm17lmmzig0yjf3710d5ikq1bmrgcqga"; libraryHaskellDepends = [ base containers mtl ]; description = "Sodium Reactive Programming (FRP) System"; license = stdenv.lib.licenses.bsd3; @@ -164650,7 +176131,7 @@ self: { mkDerivation { pname = "soegtk"; version = "0.12.1"; - sha256 = "594591337ba8244c7387afb6f68fd063551a20edadd9f7792c0816d6394cc405"; + sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar"; libraryHaskellDepends = [ base cairo gtk old-time stm ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "GUI functions as used in the book \"The Haskell School of Expression\""; @@ -164667,7 +176148,7 @@ self: { mkDerivation { pname = "solga"; version = "0.1.0.2"; - sha256 = "fdb4825ebac855d411c6841e015fe7dd1ac0a56a3bcc78aef7a91a1d8444b06a"; + sha256 = "0smh8j21s6m9yyp7ik1vdajw06nxwxgh27l4qq8x8mf8p9g85d7x"; libraryHaskellDepends = [ aeson base bytestring containers http-types resourcet safe-exceptions text wai wai-extra @@ -164690,7 +176171,7 @@ self: { mkDerivation { pname = "solga-swagger"; version = "0.1.0.2"; - sha256 = "dcb77313090c82ce9f35843ecec2ce59741fffa5f7a337d77b5d545a8e2136d4"; + sha256 = "1m1n4675lm2xggbkg8zplpziyx2rrv1cwgl46ngwx0hc149p7dyw"; libraryHaskellDepends = [ base bytestring dlist http-types insert-ordered-containers lens mtl solga swagger2 text unordered-containers @@ -164702,21 +176183,24 @@ self: { }) {}; "solr" = callPackage - ({ mkDerivation, base, base-prelude, bytestring + ({ mkDerivation, attoparsec-data, base, base-prelude, bytestring , bytestring-tree-builder, case-insensitive, contravariant - , http-client, http-response-decoder, json-encoder - , json-incremental-decoder, matcher, profunctors, semigroups, text + , http-client, http-client-tls, http-response-decoder, json-encoder + , json-incremental-decoder, managed, matcher + , optparse-applicative-simple, profunctors, semigroups, text , transformers, uri-encode }: mkDerivation { pname = "solr"; - version = "0.3.3"; - sha256 = "5703365d767023c7dd9fe5584968655f0115a5ad6b65bf28762dfeb959ed325c"; + version = "0.4.3"; + sha256 = "00hq4gykcimwxa9zy3bmr4k4pxm13ryvfyq95yh4q28gy41wglk0"; libraryHaskellDepends = [ - base base-prelude bytestring bytestring-tree-builder - case-insensitive contravariant http-client http-response-decoder - json-encoder json-incremental-decoder matcher profunctors - semigroups text transformers uri-encode + attoparsec-data base base-prelude bytestring + bytestring-tree-builder case-insensitive contravariant http-client + http-client-tls http-response-decoder json-encoder + json-incremental-decoder managed matcher + optparse-applicative-simple profunctors semigroups text + transformers uri-encode ]; homepage = "https://github.com/sannsyn/solr"; description = "A minimal Solr client library"; @@ -164731,7 +176215,7 @@ self: { mkDerivation { pname = "sonic-visualiser"; version = "0.1.1"; - sha256 = "37aaf0cfe4a363cf3f74e0b0c486f08b98b0a956b1c5e4218c47e0afcfd4303e"; + sha256 = "0gihsk7szq27ihhy9idiaslv164by23c9c70fhzwyqx3wk7z1aip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164753,7 +176237,7 @@ self: { mkDerivation { pname = "sophia"; version = "0.1.2"; - sha256 = "8fc702cd72beb2bf831ae180afaa9e3d9f73f820756cb707f80c35aa80775ba3"; + sha256 = "18svfy0ald8cz03vfv3m43w777rxksmaz0713a1vzcmyfb6h5iwg"; libraryHaskellDepends = [ base bindings-sophia bytestring ]; testHaskellDepends = [ base bindings-sophia bytestring directory tasty tasty-hunit @@ -164765,6 +176249,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sort" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "sort"; + version = "1.0.0.0"; + sha256 = "03bpyn0mimfyilfjs26b9c8sclbzsbardjhy6d822jybg548kqyf"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/cdornan/sort"; + description = "A Haskell sorting toolkit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sort-by-pinyin" = callPackage ({ mkDerivation, air, air-extra, air-th, base, bytestring , containers, text @@ -164772,7 +176268,7 @@ self: { mkDerivation { pname = "sort-by-pinyin"; version = "2014.5.19"; - sha256 = "cd891157fc08f557e27efdb8da5a623f4b8a78a80abd1c37f2e23d057fe94ecf"; + sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd"; libraryHaskellDepends = [ air air-extra air-th base bytestring containers text ]; @@ -164787,7 +176283,7 @@ self: { mkDerivation { pname = "sorted"; version = "0.0.1"; - sha256 = "0340a293e80b8babb39a7041a24ef7328d76510c5056ed6d5b9a68c23eecec67"; + sha256 = "0rzcxhzc4s4sbdnysmjh1i8pd39jyx7a4hbhkarsp2qbx29s4h03"; libraryHaskellDepends = [ base ]; description = "Efficient, type-safe sorted sequences"; license = stdenv.lib.licenses.mit; @@ -164799,7 +176295,7 @@ self: { mkDerivation { pname = "sorted-list"; version = "0.2.0.0"; - sha256 = "cc52c787b056f4d3a9ecc59f06701695602558a4233042ff8f613cdd4985d138"; + sha256 = "0f6ihm4xsg31izzl4c13lic2aq4m2rq0d7y5xjlx7x2nn23wflnc"; libraryHaskellDepends = [ base deepseq ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; @@ -164812,7 +176308,7 @@ self: { mkDerivation { pname = "sorting"; version = "1.0.0.1"; - sha256 = "b60861d8dca5c884544cd255f33c62b65cc1aece9e2a687352329f7b705d5bc4"; + sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/joneshf/sorting"; description = "Utils for sorting"; @@ -164825,7 +176321,7 @@ self: { mkDerivation { pname = "sorty"; version = "0.1.1"; - sha256 = "58b915f393b117336ec17145b079fb811d0b8224e41a5cf6a4192446db8d7911"; + sha256 = "04bripdlc90rlkv5q6p44j10n7c1zdwv0ibiq5p365xijgribfaq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring ]; @@ -164835,20 +176331,20 @@ self: { }) {}; "sound-collage" = callPackage - ({ mkDerivation, array, base, carray, directory, fft, filepath - , numeric-prelude, optparse-applicative, sample-frame, soxlib - , storablevector, storablevector-carray, synthesizer-core - , temporary, transformers, utility-ht + ({ mkDerivation, array, base, Cabal, carray, containers, fft + , filepath, numeric-prelude, optparse-applicative, pathtype + , sample-frame, soxlib, storablevector, storablevector-carray + , synthesizer-core, temporary, transformers, utility-ht }: mkDerivation { pname = "sound-collage"; - version = "0.1"; - sha256 = "b584afca2dc682dfa7e5350b8eb3877b7cf6cedfb5f7ed9a7af006910b86fc87"; + version = "0.2.0.1"; + sha256 = "0ywsy3q8f6y6k0vg4g21v6cm3n7662ngbzvfx502makdkf47i75a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base carray directory fft filepath numeric-prelude - optparse-applicative sample-frame soxlib storablevector + array base Cabal carray containers fft filepath numeric-prelude + optparse-applicative pathtype sample-frame soxlib storablevector storablevector-carray synthesizer-core temporary transformers utility-ht ]; @@ -164862,7 +176358,7 @@ self: { mkDerivation { pname = "sounddelay"; version = "0.1.0.2"; - sha256 = "b22715fd2698e70fe5610aae0f15d7a999982ff2445bca2030885fb83e380ad7"; + sha256 = "1mqa70zbhpw860hclns4y8pri6d9swahzbhac7jhzrwq4vyia9xj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers parseargs WAVE ]; @@ -164880,7 +176376,7 @@ self: { mkDerivation { pname = "source-code-server"; version = "2010.9.1"; - sha256 = "8899edf8eb3661421b0ec391c64d581bcc2e69856f283761ab672076235764a4"; + sha256 = "1934awipc837mdhkfa3ghmljxk0vb16wd4f31qdl4q9nxgwfv6c8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164902,9 +176398,9 @@ self: { mkDerivation { pname = "sourcemap"; version = "0.1.6"; - sha256 = "b9a04cccb4fe7eea8b37a2eaf2bc776eae5640038ab76fb948c5a3ea09a9ce7a"; + sha256 = "0ynfm44ym8y592wnzdwa0d05dbkffyyg5sm26y5ylzpynk64r85r"; revision = "1"; - editedCabalFile = "5d35341a581af4ba98187f832cac8b25e463bd1ce451aa1dbad161931521f8b8"; + editedCabalFile = "1f7q44ar6qfip8fsllg43jyn7r15ifn2r0vz32cbmx0sb0d38dax"; libraryHaskellDepends = [ aeson attoparsec base bytestring process text unordered-containers utf8-string @@ -164925,7 +176421,7 @@ self: { mkDerivation { pname = "sousit"; version = "0.4"; - sha256 = "99ff3b9ee866c42de7f6a1c955afd7cc6d3fe33a443757ae58daf13f28a1cf6d"; + sha256 = "0vfgl4l3zwfsb2p5fds47bikyvfcsypmbjd1yvkjvi36x2g3pzwr"; libraryHaskellDepends = [ base bytestring cereal mtl resourcet stm transformers ]; @@ -164946,7 +176442,7 @@ self: { mkDerivation { pname = "sox"; version = "0.2.2.6"; - sha256 = "d4f486e14d67bc7f714d14ac7a1605166962a8af1405bc978a4eb59385f9fb12"; + sha256 = "04pvz62r7dafiabvq18lmyl64s8n0lb7mb0l9mqpzg379phqdx6l"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame transformers unix utility-ht @@ -164964,7 +176460,7 @@ self: { mkDerivation { pname = "soxlib"; version = "0.0.3"; - sha256 = "18b555beb0eaafce25550feea23575ec68477728654bd2fbaad67d448f5dcd8b"; + sha256 = "12ydbn7l8zfnmbxx4jv551vlfs7cflss5vhgaljwxbzan2z5bd8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164984,7 +176480,7 @@ self: { mkDerivation { pname = "soyuz"; version = "0.0.0"; - sha256 = "777846536e15728f8b717c04b5fa779ea4482c8f92bfc028ba726816f36c0af1"; + sha256 = "1w8adkrics3jp8lc1gwjiwn4i94yfzxba13wf65qywhmdr9lcy3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164997,12 +176493,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "space" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, cryptonite, directory, http-date, http-types, lucid + , memory, network, stm, template-haskell, text, unix, wai, warp + }: + mkDerivation { + pname = "space"; + version = "0.1.0"; + sha256 = "0462f3sljgzj9l3gd8m8irnv1bsiixh0vzz7skwdfrm92dazbcrb"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring cryptonite + directory http-date http-types lucid memory network stm + template-haskell text unix wai warp + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/xtendo-org/space#readme"; + description = "Experimental library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "spacefill" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "spacefill"; version = "0.1"; - sha256 = "53e338b52610985990a12c6a03788ff4c5b477915d04f012895978a1eff3a155"; + sha256 = "0md1ygps2y2ri49g012xj5vv9iglixw06sicl685k60h4sskiqsk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/knz/spacefill"; @@ -165015,7 +176531,7 @@ self: { mkDerivation { pname = "spacepart"; version = "0.1.0.0"; - sha256 = "579aaef6f85be8355094c8353295a5e11443664d1c9308c395a4f42812641c85"; + sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp"; libraryHaskellDepends = [ base vector-space ]; homepage = "http://code.haskell.org/data-spacepart"; description = "Space partition data structures. Currently only a QuadTree."; @@ -165030,7 +176546,7 @@ self: { mkDerivation { pname = "spaceprobe"; version = "0.3.0"; - sha256 = "be3a487fd30ae0474d51c4e875cb00e2ddda6727b154ccc408f937570bb67727"; + sha256 = "09vpnq5mfdzr132cqm5i4xkxmpg2035pbs64a56lgq0asdzlhfmy"; libraryHaskellDepends = [ base clock containers erf mtl ]; testHaskellDepends = [ base clock containers erf mtl QuickCheck test-framework @@ -165043,6 +176559,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "spake2" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, memory + , optparse-applicative, protolude, QuickCheck, tasty, tasty-hspec + }: + mkDerivation { + pname = "spake2"; + version = "0.2.0"; + sha256 = "16yqr9kvhf71iajn6mld8y4svq0l5yz5ljpjmajnfw6lw8fbjrim"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cryptonite memory protolude + ]; + executableHaskellDepends = [ + base cryptonite memory optparse-applicative protolude + ]; + testHaskellDepends = [ + base cryptonite protolude QuickCheck tasty tasty-hspec + ]; + homepage = "https://github.com/jml/haskell-spake2#readme"; + description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm"; + license = stdenv.lib.licenses.asl20; + }) {}; + "spanout" = callPackage ({ mkDerivation, base, containers, gloss, lens, linear, MonadRandom , mtl, netwire @@ -165050,7 +176590,7 @@ self: { mkDerivation { pname = "spanout"; version = "0.1"; - sha256 = "64e150c2de26608ef218dfd088cbb7a9d4881ae46c9615f626367b6748bd2162"; + sha256 = "0qi1pm46fyrn4vv1b5kcwhd8im59nz5qil6z33r8wq16vv151qb4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165070,7 +176610,7 @@ self: { mkDerivation { pname = "sparkle"; version = "0.4.0.2"; - sha256 = "778c4858a51480f685b7f48c3ffea76535dd690119414de1a5d03535c3e3cfaf"; + sha256 = "1bygwg1kadfhlphlsh8r05lxsdb5lzz3z37lny2zd00llmc4i33p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165094,7 +176634,7 @@ self: { mkDerivation { pname = "sparkle"; version = "0.5.0.1"; - sha256 = "6b3458a12a880567c1ab2a8b51d3e0a2186e8d2621ce8c3dcf72f8dca183d133"; + sha256 = "0cyihfhxry3jrwyqrki14s6nw652w39m32ramg0nf1c85ahmhd3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165121,7 +176661,7 @@ self: { mkDerivation { pname = "sparse"; version = "0.9.2"; - sha256 = "ed0eeae3389c456d66f825d467cd7ef112cf15603ceb493d202d8fadecad7232"; + sha256 = "0ckjmpnav3rd40ylksrwc0awy4pigv6ngm15z1k6sicw73iyl3pd"; libraryHaskellDepends = [ base contravariant deepseq hybrid-vectors lens primitive transformers vector vector-algorithms @@ -165146,7 +176686,7 @@ self: { mkDerivation { pname = "sparse-lin-alg"; version = "0.4.3"; - sha256 = "89d57792b0744a8948af65940f080a3d3c179f0a24860d473429985547c0a588"; + sha256 = "1255q13mb6196i3hv1i41agifg1x1840z535mx48jjkln297gmc9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -165165,7 +176705,7 @@ self: { mkDerivation { pname = "sparse-linear-algebra"; version = "0.2.9.7"; - sha256 = "f807cccc34abde9b33235b18739ca69f4b94500b932350a04c0107bb56d8536b"; + sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq"; libraryHaskellDepends = [ base containers exceptions mtl transformers vector vector-algorithms vector-space @@ -165184,7 +176724,7 @@ self: { mkDerivation { pname = "sparsebit"; version = "0.5"; - sha256 = "07d4ffb50ab6b596c21c4b82afddd6c917bdb0ac790bcd63010bf990abd58fa8"; + sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07"; libraryHaskellDepends = [ base haskell98 ]; homepage = "http://kyagrd.dyndns.org/wiki/SparseBitmapsForPatternMatchCoverage"; description = "Sparse bitmaps for pattern match coverage"; @@ -165197,7 +176737,7 @@ self: { mkDerivation { pname = "sparsecheck"; version = "0.1.0.3"; - sha256 = "2545d53de0c1c870b5a19bbb550ba77683a292b3032fa7702e23c2ac8edf09a6"; + sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95"; libraryHaskellDepends = [ base containers ]; homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/"; description = "A Logic Programming Library for Test-Data Generation"; @@ -165212,7 +176752,7 @@ self: { mkDerivation { pname = "sparser"; version = "0.6.1"; - sha256 = "225f2754d44cef5bc6e3102782d53025efa677d235ff5606b47cef8a359516d6"; + sha256 = "1mhnjlsqmvvwnh35dzrms9vsdvr563aq49qhwg35pvscsia2fpr2"; libraryHaskellDepends = [ base containers data-default monadplus nats pointed semigroups ]; @@ -165225,7 +176765,7 @@ self: { mkDerivation { pname = "spata"; version = "2010.10.10"; - sha256 = "fecf89404a35b9dc1acdd9b317bf078560feda569e28f6f596262d41056a20b3"; + sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy"; libraryHaskellDepends = [ base dlist mps mtl ]; homepage = "http://github.com/nfjinjing/spata"; description = "brainless form validation"; @@ -165241,7 +176781,7 @@ self: { mkDerivation { pname = "spatial-math"; version = "0.4.0.0"; - sha256 = "e54b9ecf64ca50aea8b7d4e152bbb462672ac74518d844617bfccbf5c584c5e3"; + sha256 = "1qy5hk2zbjzwgdhl9n0q8p3jlrv2njxm5qflnylawl6ack7rwjz5"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -165257,7 +176797,7 @@ self: { mkDerivation { pname = "spawn"; version = "0.3"; - sha256 = "48c663b10c2406c8199edb84009cf2c45395d3105bfec6a57011673038a07376"; + sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8"; libraryHaskellDepends = [ base ]; description = "Tiny library for concurrent computations"; license = stdenv.lib.licenses.bsd3; @@ -165267,10 +176807,8 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; - version = "0.2.1.0"; - sha256 = "a7f0d6098e201f5d7b14c13387fe699b9830c95c0192bbd8ceda446a30c980f2"; - revision = "1"; - editedCabalFile = "adba306bc3280e794c4f69da6fb87346d53bd5c72bd9940069d68d1fc194ce61"; + version = "0.2.2.0"; + sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; homepage = "https://github.com/phadej/spdx"; @@ -165283,7 +176821,7 @@ self: { mkDerivation { pname = "spe"; version = "0.6.3"; - sha256 = "d921bf63ad5e6a8e59adcd5e19d6e0c25afe5f43d212c926cfe397ef93439809"; + sha256 = "02cq8f9yz5z3rwkcj4nj8dgzwnn2w3b1jpndmmcqwsjymmivy8fr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "http://github.com/akc/spe"; @@ -165296,7 +176834,7 @@ self: { mkDerivation { pname = "special-functors"; version = "1.0.0.1"; - sha256 = "2def687fadb58e12f15696e0c3e2b0206063884e9e41fd214db663028253c830"; + sha256 = "0c68af104qxn9lhzshcy9s466q10n3ic7q4navqi53mmmmznivrd"; libraryHaskellDepends = [ base mtl ]; description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)"; license = stdenv.lib.licenses.bsd3; @@ -165311,7 +176849,7 @@ self: { mkDerivation { pname = "special-keys"; version = "0.1.0.3"; - sha256 = "fe3eaf971544206f7beee91f61b27754ad0fb24a007b5891d73cd504fdcfc664"; + sha256 = "0r66rzyh9m9wsy8mhyq09ar0zbalfyr627z9xrxny8242nbsygpy"; libraryHaskellDepends = [ aeson base blaze-markup bytestring cereal deepseq hashable mwc-random path-pieces primitive safecopy text uuid @@ -165330,7 +176868,7 @@ self: { mkDerivation { pname = "specialize-th"; version = "0.0.0.8"; - sha256 = "ccca66f88869abbff3716bc690e50301ab90fc2118b89fc6691129f911d02bad"; + sha256 = "1b9bs08zja8id739zf0q47y91aq10gjr1ikbf7rvzav9i3w6djnc"; libraryHaskellDepends = [ base composition derive MissingH mtl newtype newtype-th template-haskell th-expand-syns tuple type-sub-th uniplate @@ -165355,7 +176893,7 @@ self: { mkDerivation { pname = "species"; version = "0.4"; - sha256 = "b632c9b03fa580e5206b3cd9ca9124a6b953acde83e7564e30c6a20260a6c912"; + sha256 = "04n9lrh058n66175drw3vsn57fd64j8wmn9wdchfb0557yqcjcmn"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -165364,12 +176902,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "speculate" = callPackage + ({ mkDerivation, base, cmdargs, containers, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.2.4"; + sha256 = "050ygn51z6bziv36j4y47j9rxq5wdcyrn1b2fppsv718d51bpbvw"; + libraryHaskellDepends = [ base cmdargs containers leancheck ]; + testHaskellDepends = [ base cmdargs containers leancheck ]; + benchmarkHaskellDepends = [ base cmdargs containers leancheck ]; + homepage = "https://github.com/rudymatela/speculate#readme"; + description = "discovery of properties about Haskell functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { pname = "speculation"; version = "1.5.0.3"; - sha256 = "73bf641a87e0d28a2ba233922db936e0776c3dc24ed421f6f963f015e2eb4d3f"; + sha256 = "0gsdxgi1bw33z7v23m2fq8ynqxz06swjv4ikl8mqmlp0hwd69gvk"; libraryHaskellDepends = [ base ghc-prim stm transformers ]; homepage = "http://github.com/ekmett/speculation"; description = "A framework for safe, programmable, speculative parallelism"; @@ -165381,7 +176933,7 @@ self: { mkDerivation { pname = "speculation-transformers"; version = "0.1.2"; - sha256 = "aa3842dba644461dcd91fb5d43d43d21a544fd71eedab5e0a43ed4848b8fa000"; + sha256 = "0050iy5q9m1ylkhbbnpff7yl99917pa46pgvj76isij4lvdl4f5a"; libraryHaskellDepends = [ speculation ]; doHaddock = false; homepage = "http://github.com/ekmett/speculation/"; @@ -165396,7 +176948,7 @@ self: { mkDerivation { pname = "speedy-slice"; version = "0.3.0"; - sha256 = "efbf8a10b681b940078f70fb9aca43fec8ba436c82f3faf719bbe495ba152899"; + sha256 = "16982nx9br5v37vzmww2di1vmj7y8g59myvhiw3l1fc1nq88mgzg"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -165414,7 +176966,7 @@ self: { mkDerivation { pname = "spelling-suggest"; version = "0.5.2.1"; - sha256 = "56d4a5b8c9a65ab954bda4358342137f5e96c0ba87b71b087af20eb917150b58"; + sha256 = "0n0b2lbvj3pjg841pdw7pb09cpkz2d186dd4pmabjnm6r6wabm2n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165436,7 +176988,7 @@ self: { mkDerivation { pname = "sphero"; version = "0.1.0.0"; - sha256 = "886c2dcca92c94d7a86610f8ebc68b6c97aa7c3ce911a23793e8f771ef37b1ac"; + sha256 = "1b5i6zpp3xz8jcvs44g97iyam5vcig3fpy0hcsldg51cm762sv48"; libraryHaskellDepends = [ base bytestring cereal containers mtl simple-bluetooth ]; @@ -165452,7 +177004,7 @@ self: { mkDerivation { pname = "sphinx"; version = "0.6.0.2"; - sha256 = "76a977c6ce6e71c220bd5fed7acd0be500c2a1b5c8d081a29564a8e37ba7a6df"; + sha256 = "1px6lxxy7a34jni83l68nnhw40751g6pmvazplhc4wbfrv37gabn"; libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 network text text-icu xml @@ -165467,7 +177019,7 @@ self: { mkDerivation { pname = "sphinx-cli"; version = "0.1"; - sha256 = "837fb9b75f60ebc10f0aabf26d1a12f9af5b2d8d448acdbd9c5a18625a75d821"; + sha256 = "08fqfmd6462skjywv2j4ilnmpbzr28d6vwmb187w3sv0byvvjzw3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base sphinx ]; @@ -165476,6 +177028,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sphinxesc" = callPackage + ({ mkDerivation, base, MissingH, optparse-applicative, parsec + , split + }: + mkDerivation { + pname = "sphinxesc"; + version = "0.1.0.1"; + sha256 = "0z7ajywi6hikir87dbyvsjq8c5p8smnvg41r7r7v3xvkfd454sgj"; + revision = "1"; + editedCabalFile = "0ji2y91fgyxa5h02fk6m03g9xsv7midl0sdzjw79g89m1f8pncc5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base MissingH parsec split ]; + executableHaskellDepends = [ base optparse-applicative ]; + homepage = "https://github.com/mackeyrms/sphinxesc#readme"; + description = "Transform queries for sphinx input"; + license = stdenv.lib.licenses.mit; + }) {}; + "spice" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, elerea , GLFW, JuicyPixels, JuicyPixels-repa, OpenGL @@ -165483,7 +177054,7 @@ self: { mkDerivation { pname = "spice"; version = "0.5.0.0"; - sha256 = "cf4877337916fe9530a0d1f08338dc91fb418cd9bedd3e07b668d0f46e4c40f7"; + sha256 = "1xs09ipg9l38nq3kxpdyv6643ywivhw87w6il0q9bzhng4rpfj6g"; libraryHaskellDepends = [ base bytestring containers data-default elerea GLFW JuicyPixels JuicyPixels-repa OpenGL @@ -165502,7 +177073,7 @@ self: { mkDerivation { pname = "spike"; version = "0.3"; - sha256 = "b661498cd4405e9dc6b4c2b98772cf8cf0171404647defd2d1d7b4551d40b987"; + sha256 = "11xr80fmbd6ps79fyzb40ha1gw4crxr8gff2nk39spj0sj64jqdn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165521,7 +177092,7 @@ self: { mkDerivation { pname = "spine"; version = "0.1"; - sha256 = "fb2de277774e9eabb14b7f66fcd84221c8c53d1af8b07ed027b92e46f5dc62ea"; + sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/spl/spine"; description = "Simple implementation of the generic spine view"; @@ -165533,7 +177104,7 @@ self: { mkDerivation { pname = "spir-v"; version = "0.0.1.0"; - sha256 = "59d7b176ddafbb73aff8dd4b1a8f9557f748728e4f5262a9575108ff6e62d6ca"; + sha256 = "1jnnc9pgy22iayln4ljgirr4ixspjn7iljyxz2pp7fxgvmvb3msr"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/expipiplus1/spir-v"; description = "Some utilities for reading and writing SPIR-V files"; @@ -165541,12 +177112,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "spiros" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , deepseq, directory, hashable, mtl, process, safe, semigroups + , split, stm, text, time, transformers, unordered-containers + , vector, vinyl, wl-pprint-text + }: + mkDerivation { + pname = "spiros"; + version = "0.0.0"; + sha256 = "06j9wcc6zcnbpf11356b64ikq1irdmp60h0bihf1bsgg0lh7mcff"; + libraryHaskellDepends = [ + base bytestring containers data-default-class deepseq directory + hashable mtl process safe semigroups split stm text time + transformers unordered-containers vector vinyl wl-pprint-text + ]; + homepage = "http://github.com/sboosali/spiros#readme"; + description = "my custom prelude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "splay" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "splay"; version = "0.0.6"; - sha256 = "94295e6e39f7e452595a30d62eec03aafb062df4c7df40d7874b8a4785b105d7"; + sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl"; libraryHaskellDepends = [ base ]; description = "Generic splay-based sequence representation"; license = stdenv.lib.licenses.bsd3; @@ -165559,7 +177150,7 @@ self: { mkDerivation { pname = "splaytree"; version = "0.1.5"; - sha256 = "a7b24638b830190af210aed7e6f4abea5cdba20ef745d829d566d670dfc4344a"; + sha256 = "0jilqkgp1mk6sllxhigp1sidnp7amgsfdmxf23r0l69hp0w4dcm7"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -165576,7 +177167,7 @@ self: { mkDerivation { pname = "splice"; version = "0.6.1.1"; - sha256 = "81fabe6652571f0dbf6b8904bd782daaeccc9d89d40f77b15dff46b7499d4e53"; + sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1"; libraryHaskellDepends = [ base network ]; homepage = "http://corsis.github.com/splice/"; description = "Cross-platform Socket to Socket Data Splicing"; @@ -165591,7 +177182,7 @@ self: { mkDerivation { pname = "spline3"; version = "0.0.2"; - sha256 = "f84abe1934a22e3a20af5c97423184454986734d723c601bf1978760e17a4a84"; + sha256 = "112agbhn11wpy4dn0g3j9mrqcja5hhql55swmwh3lbm26hcvwjpq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165616,7 +177207,7 @@ self: { mkDerivation { pname = "splines"; version = "0.5.0.1"; - sha256 = "abd004a49a1454660d9a0ea83eabde3a109c7340e35a9576103ccffd23aa05af"; + sha256 = "1bq5m8izvkrw21v9anp381rrq41svsmkxa0fk86ncm0lkaj09l5b"; libraryHaskellDepends = [ base containers polynomial vector vector-space ]; @@ -165635,7 +177226,7 @@ self: { mkDerivation { pname = "split"; version = "0.1.4.3"; - sha256 = "7e69989206e26bb28f46cc8cf1edff5e439aa6be4adbc5b09118d6fdc1aa3bc5"; + sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; @@ -165647,8 +177238,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "split"; - version = "0.2.3.1"; - sha256 = "7615b60adee20c19ddafd9d74456e8fe8e4274e2c676a5e858511b664205c688"; + version = "0.2.3.2"; + sha256 = "0fmnkvq1ky4dgyh1z2mvdal5pw103irvkf4p9d5x8wyl1nnylhs9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; @@ -165660,7 +177251,7 @@ self: { mkDerivation { pname = "split-channel"; version = "0.2.0.1"; - sha256 = "53ed4e9f68972b1d6db98b040b10e512a194d45c7734802adcaef9e2827c5a70"; + sha256 = "0w2sgj1f5ydfvhm80d3pbka9988jwl80n14bp5nisawpd2glxvak"; libraryHaskellDepends = [ base ]; description = "Control.Concurrent.Chan split into sending and receiving halves."; license = stdenv.lib.licenses.mit; @@ -165672,8 +177263,8 @@ self: { }: mkDerivation { pname = "split-record"; - version = "0.1.1.2"; - sha256 = "8d87da014bbf612290335c4f2df31e77c30882ac3a2b8daae4158eab3483877e"; + version = "0.1.1.3"; + sha256 = "0ydsdf2pk8gzcqriqm6pv7him55qz62ycfqxjm8qhpy1k8i3ipqj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165691,18 +177282,37 @@ self: { mkDerivation { pname = "split-tchan"; version = "0.1.0.0"; - sha256 = "57f47168cec99172dff7b391ab9c05faedaa981f386464eb22996e51ed5e8c63"; + sha256 = "0qwcbvnm2vlr4bmn8r1q3ycamvgs0nfap4dkyzgp54f9rrl73x2p"; libraryHaskellDepends = [ base stm ]; description = "STM's TChan split into sending and receiving halves"; 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 { pname = "splitter"; version = "0.1.0.0"; - sha256 = "066bb3812e860c40d41076496404767db0adc5fff0dada7292429da540ad2bda"; + sha256 = "1nibmm0ab7a2j9rdmnphzz2svc3xfq268jbn23a403465s0v6sq6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165722,7 +177332,7 @@ self: { mkDerivation { pname = "splot"; version = "0.3.14"; - sha256 = "77b8b2bbe99a21ac0c5b2f7b7cc5cf079302501ebebc4b77fa557ab071e178ed"; + sha256 = "1vbqw5qv0yjmz9vlpg5y3r8054q7rz2pqyrgbc6aq8csx6xv5f3p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165739,7 +177349,7 @@ self: { mkDerivation { pname = "spool"; version = "0.1"; - sha256 = "868c72b98aaf9f041f424d949d8cef05c9b859984e4e35d57026fad9d9f873eb"; + sha256 = "1svkz3cxkyi6f3akakjfk1cvij85xy69v52d88gh97xgiawp5346"; libraryHaskellDepends = [ base bytestring vector ]; description = "Convert between ByteString and Vector.Storable without copying"; license = stdenv.lib.licenses.bsd3; @@ -165750,9 +177360,9 @@ self: { mkDerivation { pname = "spoon"; version = "0.3.1"; - sha256 = "b9b350b6730e34c246bbf7e228a86b3d4925b52c95542f7676d719ef2a9881d4"; + sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr"; revision = "1"; - editedCabalFile = "e46c5e919cc9d0c7b0f671cddb631ef0979622a1e2250c59c7e491a799944527"; + editedCabalFile = "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74"; libraryHaskellDepends = [ base deepseq ]; description = "Catch errors thrown from pure computations"; license = stdenv.lib.licenses.bsd3; @@ -165765,7 +177375,7 @@ self: { mkDerivation { pname = "spoonutil"; version = "0.0.1"; - sha256 = "0d5a31fbd426605962762f75ab6ff83f7ea1cbba474b6f7e0b230106aacb6a76"; + sha256 = "0xkarfm0c0931dz6yjs7pb5s2zizz1psnx9gfri5jq16skxk2nhd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165784,7 +177394,7 @@ self: { mkDerivation { pname = "spoty"; version = "0.1.0.2"; - sha256 = "a332d923b9fda4ae7a629c49d76ac5984e5041d0bf5794a812d2d31e3db2355c"; + sha256 = "0p1mn8yixlyj2al98mxzs10m0klqqmmdfjcwc9xax97xp4ixjcm3"; libraryHaskellDepends = [ aeson base bytestring lens lens-aeson pipes text unordered-containers wreq @@ -165800,8 +177410,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.4"; - sha256 = "7e4a26ac4e565cb6fbc5845f010e0930b0ce2beff05dca998f312cd3d40249c2"; + version = "0.1.3.5"; + sha256 = "1h5a2ifr10ihaqvl819d0g3vnn2wzp27wqlfbk21v8wv07wrwckk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165828,7 +177438,7 @@ self: { mkDerivation { pname = "sprinkles"; version = "0.3.5.0"; - sha256 = "b6e75244028d2de256583a581fb0f12d5bec1d6447cb1d539ca37caa7b2658f7"; + sha256 = "1xsq4rxslz53ki9ivjs7chfyqnrdy6q1yn1sb1bf4bcd09255rxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165861,7 +177471,7 @@ self: { mkDerivation { pname = "spritz"; version = "0.1.0.0"; - sha256 = "d311a5b8d1a9a23d02623142b5d5451290ac3689038412d7325ab0f30115dbeb"; + sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk"; libraryHaskellDepends = [ base lens mtl vector ]; homepage = "https://github.com/relrod/spritz"; description = "An implementation of the Spritz RC4-like stream cipher in Haskell"; @@ -165879,7 +177489,7 @@ self: { mkDerivation { pname = "sproxy"; version = "0.9.9"; - sha256 = "161ba53469bb2b9c331ff678125ec5917a28de8cdd30084628219f89fbb1fb08"; + sha256 = "027vn7xqk7r15130hc6xikg2hyliqmg14y7n3wrrqaxvd4saa6qn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165902,7 +177512,7 @@ self: { mkDerivation { pname = "sproxy-web"; version = "0.4.1"; - sha256 = "17c63be51b4277f31c01eeeddd67fcda6dac3e8bc7e060de8a8f5ceccbdc734b"; + sha256 = "0jvkvk5yqp4gibg61q67iczaqvfszikxvvgf04fg6xs23gjkpihp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165928,8 +177538,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.94.1"; - sha256 = "be00dbeb5a81ecd38034ea549772eb3f3c94c8185a26c2f7de86c17084586e21"; + version = "1.95.0"; + sha256 = "16m0sqmp85p8zkpdh1pnzhja7j774cpfppwc5d6rq5palikwd88c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165952,7 +177562,7 @@ self: { mkDerivation { pname = "spsa"; version = "0.2.0.0"; - sha256 = "30770c3f729ee6c9dd249ff52e62c9d95ba5a7681ac97329900cbdbae742404a"; + sha256 = "0jj08bkvmg8cj0lp7j8sd2ksanyrr5i2xxcz4kfwkrlyf8zhqxrh"; libraryHaskellDepends = [ base hmatrix mtl random ]; testHaskellDepends = [ base hmatrix HUnit QuickCheck random test-framework @@ -165974,7 +177584,7 @@ self: { mkDerivation { pname = "spy"; version = "0.14"; - sha256 = "c257084e554d50bc1bf76029e292ae61af6a73f922320f7cf2bac306ac0565f5"; + sha256 = "1xb50nn0dhxsy9y0yci2z5rnmbv1ms9f4ab0ywdvql2dam70hmy2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165998,7 +177608,7 @@ self: { mkDerivation { pname = "sql-simple"; version = "0.3.1"; - sha256 = "905fe82fb568cbcaf826c3795ab43713c6e0911c5917f51f5598187565440fee"; + sha256 = "1vhg8ijpa64qalgza5sr3j8y1ihk6ys5lyf34vwcmjv8nlpyhpwh"; libraryHaskellDepends = [ base containers exceptions monad-control text transformers transformers-base @@ -166016,7 +177626,7 @@ self: { mkDerivation { pname = "sql-simple-mysql"; version = "0.3.0"; - sha256 = "f734eb8d80131fe079b3759e3a83dd02f7e7eb2b5fa1fe2a89b1cb3be87f3dc5"; + sha256 = "1i9xgzl3pjxii4mgx8az5gmygxq2vn1km7kmndwy07qkh26ynd7p"; libraryHaskellDepends = [ base data-default-class mysql mysql-simple sql-simple text ]; @@ -166033,7 +177643,7 @@ self: { mkDerivation { pname = "sql-simple-pool"; version = "0.3.0"; - sha256 = "09fec87c0b65cdba8b34912b0054612317ccf3e68bed6799687a07e07153f992"; + sha256 = "14pradqy01vsd2cngvcbwvrwq5r3c5a00awi6j5vmkb51dycizh9"; libraryHaskellDepends = [ base data-default-class monad-control resource-pool sql-simple text time @@ -166051,7 +177661,7 @@ self: { mkDerivation { pname = "sql-simple-postgresql"; version = "0.3.0"; - sha256 = "417ff354c81d3dea337590eaf65e654714fe52cdda8a0b38f69db3f993406236"; + sha256 = "0dk2829zkcwxyqw0p2nsrm9gw527cmggdslhflrylg8xr1ag6zs1"; libraryHaskellDepends = [ base data-default-class postgresql-simple sql-simple text ]; @@ -166066,7 +177676,7 @@ self: { mkDerivation { pname = "sql-simple-sqlite"; version = "0.3.0"; - sha256 = "c18dc8f87af50e07ee088108e67a66726214c47ab1a19c70e268254cd609511e"; + sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1"; libraryHaskellDepends = [ base sql-simple sqlite-simple ]; homepage = "https://github.com/philopon/sql-simple"; description = "sqlite backend for sql-simple"; @@ -166078,15 +177688,49 @@ self: { ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; - version = "0.1.4.1"; - sha256 = "f53ea8f9621281ad85607a55a56cebb8bdb485f02000aa2ab3c4f867b2ff3dae"; + version = "0.1.5.0"; + sha256 = "164a4bls6sqp8dmwn63dqa4dxyd7nd7fr7n2996bhrq7h4dk0ydv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck quickcheck-simple ]; homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Simple idea SQL keywords data constructor into OverloadedString"; + description = "SQL keywords data constructors into OverloadedString"; 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 + }: + mkDerivation { + pname = "sqlcipher"; + version = "1.0.1.2"; + sha256 = "0dcr98yv7sgrhk2wnfidf7gfsi1g6i7d4df3a9b0kcxl01gda548"; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ + base bytestring directory pretty time utf8-string + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base filepath hspec temporary ]; + homepage = "http://github.com/figome/haskell-sqlcipher"; + description = "Haskell binding to sqlcipher"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "sqlite" = callPackage ({ mkDerivation, base, bytestring, directory, pretty, sqlite, time , utf8-string @@ -166094,7 +177738,7 @@ self: { mkDerivation { pname = "sqlite"; version = "0.5.5"; - sha256 = "d3bfd3754622ab17fe2b4315402d12fdfd3b5445de741716b75655aebd9b4bc4"; + sha256 = "1i2bkfyswmannwb1fx6y8ma3pzgx28nl05a35gz1gar28rsx7gyk"; libraryHaskellDepends = [ base bytestring directory pretty time utf8-string ]; @@ -166107,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 = "59b124c667b9c80cb59bcaf5ed9319b248daec81a70754063571a61b1771f9e8"; + 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 @@ -166131,7 +177775,7 @@ self: { mkDerivation { pname = "sqlite-simple-errors"; version = "0.6.0.0"; - sha256 = "e697ba5ff6b4df227d782cb2d2327ce5df4282acdb17e8087ae76adbfabfd980"; + sha256 = "106rpzxdnsp7g84fh5yvmj145pz5ghrd5cicg1yj5pxlyrgvm5z6"; libraryHaskellDepends = [ base parsec sqlite-simple text ]; testHaskellDepends = [ base mtl sqlite-simple text ]; homepage = "https://github.com/caneroj1/sqlite-simple-errors"; @@ -166146,7 +177790,7 @@ self: { mkDerivation { pname = "sqlite-simple-typed"; version = "0.1.0.0"; - sha256 = "1940910be59f1d0906f7c98f3c93cad305f5387f262a6bef02eaa1cd898cd401"; + sha256 = "00flij4wv8ga0bpnnai6gwwga1fkra9kr3y9yw30j7czwl5r2h0r"; libraryHaskellDepends = [ base haskell-src-meta sqlite sqlite-simple template-haskell typedquery utf8-string @@ -166162,7 +177806,7 @@ self: { mkDerivation { pname = "sqlvalue-list"; version = "0.2"; - sha256 = "6017204be425f6e967736cba5198b55dfe4fc6e9d41154ed3d85e652c61d3ee5"; + sha256 = "1r9y3p355rl57pnm84flx734zzjxnnc53fkcfdkykxi5wi5j05v0"; libraryHaskellDepends = [ base convertible HDBC template-haskell ]; description = "Class and instances for conversion to list of SqlValue"; license = stdenv.lib.licenses.bsd3; @@ -166177,7 +177821,7 @@ self: { mkDerivation { pname = "sqsd-local"; version = "0.2.0"; - sha256 = "909037383cb8948b4a1451414db65046a8cb967e17580282948ba4fae94aba76"; + sha256 = "0xms9blzm94bjj104n0pgsbcpa26a2v4shai2i58p55q7hw3g44h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166199,7 +177843,7 @@ self: { mkDerivation { pname = "squeeze"; version = "1.0.4.12"; - sha256 = "9bf9f143c022d366144e1b4dd6f00b5c627aef88ffecbab7f5c453311f87049c"; + sha256 = "1704hwgk2ly4ynvvmv7zi3pplqjw1gqdck8v9qa6dlr2q11z3ycv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166224,7 +177868,7 @@ self: { mkDerivation { pname = "sr-extra"; version = "1.46.3.2"; - sha256 = "177c438280cf9131fd16a2d60bac55ae285f6db05a2651a3bed52a80aec16523"; + sha256 = "08v5q6p80anmpsim29jsn1nmya5fann0pmm22vyk34fgh2146z0p"; libraryHaskellDepends = [ base bytestring bzlib containers directory filepath HUnit mtl network-uri old-locale old-time pretty process pureMD5 QuickCheck @@ -166242,7 +177886,7 @@ self: { mkDerivation { pname = "srcinst"; version = "0.8.10"; - sha256 = "493e80a2ef1093db66a771bf666b6653474c8c46d80d793aeb57dd1b09d4cd17"; + sha256 = "05ydsh4ippapxcx7j3fq8s64qiskcrmndgvilxkdp4qhxyi80gj9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166258,10 +177902,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.5.1.0"; - sha256 = "e61df6ce79c8ac42a7a9a15ab3553ef5448174c0bfaee7192ff4c3d6a5695aff"; + version = "0.5.1.1"; + sha256 = "05qsyrpzbbawpnfmq8v1rr36kvnycarlr3v91hmbj33vk73acj1i"; libraryHaskellDepends = [ base ]; - homepage = "http://www.cs.drexel.edu/~mainland/"; + homepage = "https://github.com/mainland/srcloc"; description = "Data types for managing source code locations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -166271,13 +177915,31 @@ self: { mkDerivation { pname = "srec"; version = "0.1.0"; - sha256 = "33c001b30ea1b15e3fcb3fc7e9da1d607ed58124c46976e3f31ab76d3f591a09"; + sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://tomahawkins.org"; description = "Parsing and processing s-records"; license = stdenv.lib.licenses.bsd3; }) {}; + "sscan" = callPackage + ({ mkDerivation, async, base, brick, directory, filepath, microlens + , microlens-th, process, temporary, text, time, vty + }: + mkDerivation { + pname = "sscan"; + version = "0.1"; + sha256 = "1yrv6nfkd2sb3hn1jxl5vbfp81bxg96mm5wi0icd5cjfil4dvyj7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base brick directory filepath microlens microlens-th process + temporary text time vty + ]; + description = "text UI for scanning with SANE"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "sscgi" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive , containers, Glob, MonadCatchIO-mtl, mtl, transformers @@ -166286,7 +177948,7 @@ self: { mkDerivation { pname = "sscgi"; version = "0.3.1"; - sha256 = "0925d1a384fae39255bd927f2ffa787e84d270fbd747e703f32ae41af06fcf3b"; + sha256 = "0fygdzq1mr1ayc1yfiypzdqd513yg3x2yzwjpmar5qzshjix2989"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive containers Glob MonadCatchIO-mtl mtl transformers utf8-string @@ -166302,7 +177964,7 @@ self: { mkDerivation { pname = "sscript"; version = "0.1.0.2"; - sha256 = "c07c16c227b9dba9fb56262efcaa4e185fbf0dc5757e969b763c4a5000caf1da"; + sha256 = "1npir8050jiwfsdrczkmql6vypqq9smgqbi6avxsknxr4z11cz60"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/khalilfazal/sscript#readme"; @@ -166322,7 +177984,7 @@ self: { mkDerivation { pname = "ssh"; version = "0.3.2"; - sha256 = "01e7138edb65300fb4285508fb5b31012e9b62ef08984bc5a1c90a80b62626bf"; + sha256 = "1gr64sv802n9l72lp608xxi9nbh165dzn22m52s0yc35vf717rq1"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-string binary bytestring cereal containers crypto-api crypto-pubkey-types @@ -166348,7 +178010,7 @@ self: { mkDerivation { pname = "ssh-known-hosts"; version = "0.2.0.0"; - sha256 = "0a93cbeae395701ff1cd609c29aaa2b59d507304b91612a28193156faac210fe"; + sha256 = "1zhhqam6y5ckh6i145mr0irm17dmlam2k730rpqiyw4mwgmcp4qa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base iproute text ]; @@ -166368,7 +178030,7 @@ self: { mkDerivation { pname = "sshd-lint"; version = "0.1.0.1"; - sha256 = "ecc4f6f380994230a5302b0a3267f15929f77c6571914e5848fa01cb50ff6460"; + sha256 = "0q34zx8cn0gs91c4x4bicmygfaary5kk42ib62jk0hlrh3rzdi7c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166389,7 +178051,7 @@ self: { mkDerivation { pname = "sshtun"; version = "1.0.0"; - sha256 = "581acb9dfc796a04abd2dca27ed4b3eb0d4aaa01d076e97ff3f70e02b6de241d"; + sha256 = "0794vsv043ppydzyjxnh06m4l3gbnga7x8nwsamh8skrzjfwn6jq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166410,7 +178072,7 @@ self: { mkDerivation { pname = "sssp"; version = "1.1.1"; - sha256 = "ec5414f303c6df3d218407ddf09d4a74e7b0473f26d1c163c0a3c946b30523db"; + sha256 = "1nr30nrldjd3q1iw3l967x3v1rvl9afz1p87hhhkvpy60gri8m7c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166438,7 +178100,7 @@ self: { mkDerivation { pname = "sstable"; version = "1.0"; - sha256 = "f531caddc2045f16a4cb8570af49aeeb6dbb1e55a37c8e2fb3da86598e943eea"; + sha256 = "1siyjj75k1nsncpqwz53algbnvgbmr4syw45rfj1cpq4qbfwlcgm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166455,7 +178117,7 @@ self: { mkDerivation { pname = "ssv"; version = "0.3"; - sha256 = "05670e936dda1a18afa474b009f9a3a89ebf5ce74b83458c7d19a0d1423001fc"; + sha256 = "1z01611d380rgn64b0sbwxfbz7m8lgwhkc3lljpih6nsdn9hwrq5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -166472,7 +178134,7 @@ self: { mkDerivation { pname = "stable-heap"; version = "0.1.0.0"; - sha256 = "410f316118037f3fed6dcd58c667b5ad278f4e5bac6053c6366d8b59a9209d93"; + sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion fingertree heaps mwc-random pqueue vector @@ -166488,7 +178150,7 @@ self: { mkDerivation { pname = "stable-maps"; version = "0.0.5"; - sha256 = "7ce82ad8e32fadbcbd5f5c42df67e27e7f951da0d58e149b48c615b9a66f51ea"; + sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w"; libraryHaskellDepends = [ base containers ghc-prim ]; homepage = "http://github.com/ekmett/stable-maps"; description = "Heterogeneous maps keyed by StableNames"; @@ -166501,7 +178163,7 @@ self: { mkDerivation { pname = "stable-marriage"; version = "0.1.2.0"; - sha256 = "bf6e85899194446dc86b40cbfe9363dd5798a204d45f6911f98ab6ffda4fa9f6"; + sha256 = "1xm99zdgzdlaz48njpyl0ji9hmyxcf9zxjs0dg46si4lj64qavmz"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://github.com/cutsea110/stable-marriage"; description = "algorithms around stable marriage"; @@ -166514,7 +178176,9 @@ self: { mkDerivation { pname = "stable-memo"; version = "0.3.1"; - sha256 = "fd8ddc1d5a6200b8cfb192195d0f078545d85088bd6f04aa3f76b310063a65e7"; + sha256 = "1rv578311cvn7ym08vxxi18dhic50w7ms6cjn77vh032b8fxr3gx"; + revision = "1"; + editedCabalFile = "1wlz6cpbvf8mi4c78dwwbdxsk2wax3y7q27hy78h83gl0cbnfiij"; libraryHaskellDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; @@ -166529,7 +178193,7 @@ self: { mkDerivation { pname = "stable-tree"; version = "0.7.0"; - sha256 = "9750da7897d81696ec445ff7fdadcdb8d9778fa6faa3f6d270daf1a6074a8b55"; + sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166555,10 +178219,10 @@ self: { }: mkDerivation { pname = "stache"; - version = "0.2.0"; - sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831"; + version = "0.2.2"; + sha256 = "0vmqfs956cziwb3q2v4nzn4b9d87062z9pixwfr7iiwd0ypmmiv6"; revision = "2"; - editedCabalFile = "4899a9a2a56b3e2524b0166f8875f7f823419c64ec1f2a74f2ff7b6010472d01"; + editedCabalFile = "1bwdg0y98bw8p1857isjcg3f51d0nv52zbfc0s6f9syq70ahbhz9"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -166576,95 +178240,67 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_0_2_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.2.1"; - sha256 = "f25c0a913cca7ae0056d8030e5351da809bdff53afef80d863c1ecaa0dbbd00f"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base-compat, base16-bytestring - , base64-bytestring, binary, binary-tagged, blaze-builder, byteable - , bytestring, Cabal, clock, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, deepseq, directory, either - , errors, exceptions, extra, fast-logger, file-embed, filelock - , filepath, fsnotify, generic-deriving, gitrev, hashable, hastache + , attoparsec, base, base-compat, base64-bytestring, binary + , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit + , conduit-extra, containers, cryptonite, cryptonite-conduit + , deepseq, directory, either, errors, exceptions, extra + , fast-logger, file-embed, filelock, filepath, fsnotify + , generic-deriving, gitrev, hackage-security, hashable, hastache , hit, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-async, lifted-base, microlens - , monad-control, monad-logger, monad-unlift, mono-traversable, mtl - , neat-interpolation, open-browser, optparse-applicative - , optparse-simple, path, path-io, persistent, persistent-sqlite - , persistent-template, pid1, pretty, process, project-template - , QuickCheck, regex-applicative-text, resourcet, retry, safe - , safe-exceptions, semigroups, smallcheck, split, stm, store - , streaming-commons, tar, template-haskell, temporary, text - , text-binary, text-metrics, th-reify-many, time, tls, transformers - , transformers-base, unicode-transforms, unix, unix-compat - , unordered-containers, vector, vector-binary-instances, yaml - , zip-archive, zlib + , http-conduit, http-types, lifted-async, lifted-base, memory + , microlens, microlens-mtl, monad-control, monad-logger + , monad-unlift, mono-traversable, mtl, neat-interpolation + , network-uri, open-browser, optparse-applicative, optparse-simple + , path, path-io, persistent, persistent-sqlite, persistent-template + , pid1, pretty, process, project-template, QuickCheck + , regex-applicative-text, resourcet, retry, safe, safe-exceptions + , semigroups, smallcheck, split, stm, store, streaming-commons, tar + , template-haskell, temporary, text, text-binary, text-metrics + , th-reify-many, time, tls, transformers, transformers-base + , unicode-transforms, unix, unix-compat, unordered-containers + , vector, vector-binary-instances, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.3.2"; - sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7"; - revision = "2"; - editedCabalFile = "c15bab02b5aa26847ce94aab4bca3ac7bbd38e7e3c56039364f70bb107cb7968"; + version = "1.4.0"; + sha256 = "1dp8377a0wy8j7v9j3qb2lbic7y3p49glq8z7vd85rm0381ny3gi"; + revision = "4"; + editedCabalFile = "0hs3rlgbm088fjgi28h5fay3zl1s00ljnqhgd0xafcqk2asmqq0k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base-compat base16-bytestring base64-bytestring binary - binary-tagged blaze-builder byteable bytestring Cabal clock conduit - conduit-extra containers cryptohash cryptohash-conduit deepseq - directory either errors exceptions extra fast-logger file-embed - filelock filepath fsnotify generic-deriving hashable hastache hit - hpack hpc http-client http-client-tls http-conduit http-types - lifted-async lifted-base microlens monad-control monad-logger - monad-unlift mtl open-browser optparse-applicative path path-io - persistent persistent-sqlite persistent-template pid1 pretty - process project-template regex-applicative-text resourcet retry - safe safe-exceptions semigroups split stm store streaming-commons - tar template-haskell temporary text text-binary text-metrics time - tls transformers transformers-base unicode-transforms unix - unix-compat unordered-containers vector vector-binary-instances - yaml zip-archive zlib + base-compat base64-bytestring binary binary-tagged blaze-builder + bytestring Cabal clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory either errors exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hit hpack hpc http-client + http-client-tls http-conduit http-types lifted-async lifted-base + memory microlens microlens-mtl monad-control monad-logger + monad-unlift mtl network-uri open-browser optparse-applicative path + path-io persistent persistent-sqlite persistent-template pid1 + pretty process project-template regex-applicative-text resourcet + retry safe safe-exceptions semigroups split stm store + streaming-commons tar template-haskell temporary text text-binary + text-metrics time tls transformers transformers-base + unicode-transforms unix unix-compat unordered-containers vector + vector-binary-instances yaml zip-archive zlib ]; executableHaskellDepends = [ - base bytestring Cabal containers directory either filelock filepath - gitrev hpack http-client lifted-base microlens monad-control - monad-logger mtl optparse-applicative optparse-simple path path-io - text transformers + base bytestring Cabal conduit containers directory either filelock + filepath gitrev hpack http-client lifted-base microlens + monad-control monad-logger mtl optparse-applicative optparse-simple + path path-io split text transformers ]; testHaskellDepends = [ attoparsec base bytestring Cabal conduit conduit-extra containers - cryptohash directory exceptions filepath hspec http-client-tls - http-conduit monad-logger mono-traversable neat-interpolation path - path-io QuickCheck resourcet retry smallcheck store - template-haskell temporary text th-reify-many transformers vector - yaml + cryptonite directory exceptions filepath hashable hspec + http-client-tls http-conduit monad-logger mono-traversable + neat-interpolation optparse-applicative path path-io QuickCheck + resourcet retry smallcheck store template-haskell temporary text + th-reify-many transformers unordered-containers vector yaml ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -166679,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 @@ -166688,7 +178348,7 @@ self: { mkDerivation { pname = "stack-hpc-coveralls"; version = "0.0.4.0"; - sha256 = "cebb6ea6d578ab8cca99348e4982628d717db455a28143562fadb7d89fe5f2f7"; + sha256 = "1xzjwngxidxd5xb470d2ans7swcdca14k3ilk758ravqsnk6xfyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166714,7 +178374,7 @@ self: { mkDerivation { pname = "stack-prism"; version = "0.1.6"; - sha256 = "493ac24313cdcaf64e86cd5e8081fcb2ffda5048278057ca9d803c7939949ddb"; + sha256 = "1nwxjhwpjg40kp55g017918dmzxjzj0q0pndhr7gdjnd2d1w4fj9"; libraryHaskellDepends = [ base profunctors tagged template-haskell transformers ]; @@ -166727,18 +178387,18 @@ self: { "stack-run" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, Cabal - , conduit, conduit-extra, directory, filepath, MissingH - , projectroot, stm, terminal-size, time, vty + , conduit, conduit-extra, directory, filepath, MissingH, stm + , terminal-size, time, vty }: mkDerivation { pname = "stack-run"; - version = "0.1.1.3"; - sha256 = "5e70f11916ca2fe00e86b78ba0aa0762b8fe98b34881247035d25273f41ecaf7"; + version = "0.1.1.4"; + sha256 = "16xc0sdwa2mz9rcixam1lnkhyyw7n82bm9m857lxg7wl35jvnrkk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal async base bytestring Cabal conduit conduit-extra - directory filepath MissingH projectroot stm terminal-size time vty + directory filepath MissingH stm terminal-size time vty ]; homepage = "https://github.com/yamadapc/stack-run"; description = "An equivalent to cabal run for stack"; @@ -166753,7 +178413,7 @@ self: { mkDerivation { pname = "stack-run-auto"; version = "0.1.1.4"; - sha256 = "5eb96ea94ec54a56ae26e09cc7988bb006edd4109eca9c57ed51bcc1d605f543"; + sha256 = "0hzm0pbc3g2ixmbrrjly23afs1mhifccg7704sp5cjn59slnxfay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166778,13 +178438,34 @@ self: { mkDerivation { pname = "stack-type"; version = "0.1.0.0"; - sha256 = "f310965736f096cdf099e0a61c5fad39b066692d72643da989b64e61ae196c8e"; + sha256 = "13kc36p62kmni6lksr3j5mlndc1rmmgir9p0k7qcv5ph6rbrc47k"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/aiya000/hs-stack-type"; description = "The basic stack type"; 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 @@ -166793,7 +178474,7 @@ self: { mkDerivation { pname = "stackage"; version = "0.7.3.2"; - sha256 = "ea6b8fc4ec0bff431f44e75238dff599ac0a082c80ac14f049dfbbd5fdf0f95a"; + sha256 = "0npry3yxbfyz97q19b405h40mb4rypgkhlp78hgl7zqbxk28ysza"; libraryHaskellDepends = [ base stackage-build-plan stackage-cabal stackage-cli stackage-install stackage-sandbox stackage-setup stackage-update @@ -166814,7 +178495,7 @@ self: { mkDerivation { pname = "stackage-build-plan"; version = "0.1.1.0"; - sha256 = "cf73f80eab84dc34dead04a5750e7f76eb030b4666b88641796b65bb2b9b98ea"; + sha256 = "1slqkcmvnrbbg50qdf368q5h7svngw77b984mpg39p44mc7ghwyg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166839,7 +178520,7 @@ self: { mkDerivation { pname = "stackage-cabal"; version = "0.1.1"; - sha256 = "f2f32812ac46c29fd3ad8e1112a1190930c3cade5d081548c6351452f88f271d"; + sha256 = "0797izw5451mqr41a22xvv5c6c0936hi44cfmp9rzhj6mh92iwzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -166861,7 +178542,7 @@ self: { mkDerivation { pname = "stackage-cli"; version = "0.1.0.2"; - sha256 = "16213bd51f37c4c60f1a8ca91720cf7d0199001ae0aa50acc69facf37ec05a81"; + sha256 = "10asq1zg7b4zqsn51ap03809j0bxrwh1gacc387wdi1p3zakn88n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166892,7 +178573,7 @@ self: { mkDerivation { pname = "stackage-curator"; version = "0.14.5"; - sha256 = "11021c2eaf80f7090375c1947e75d441bf4e6131253fc6a7953b6e6ab6948c85"; + sha256 = "11ccjjv6lvivjnkwcgr565hlxgs1sispx561fl1hkxw0mwp1q0hi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166929,7 +178610,7 @@ self: { mkDerivation { pname = "stackage-install"; version = "0.1.2"; - sha256 = "d46a0dfb3b82a154509fc396d966df642302341bfd758204d72d23e590874843"; + sha256 = "0hs8hy8fa8rdsw284xgx3cs048v4vxkdk5n3kx8598c27gxhssnl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166952,7 +178633,7 @@ self: { mkDerivation { pname = "stackage-metadata"; version = "0.3.0.0"; - sha256 = "5d6b66f326fc1cc7cf833145eb6c4f905725370c8031a5df019101e5ed331a22"; + sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166969,6 +178650,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stackage-query" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , optparse-applicative, process, stackage-types, text, yaml + }: + mkDerivation { + pname = "stackage-query"; + version = "0.1.1"; + sha256 = "0prwl42pn3k4yy2439bjsq2m5429xybxwivx1x5ws4k4chvl81fp"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal containers directory filepath optparse-applicative + process stackage-types text yaml + ]; + homepage = "https://github.com/juhp/stackage-query"; + description = "Stackage package query"; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage-sandbox" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit-combinators , conduit-extra, directory, filepath, optparse-applicative, process @@ -166977,7 +178677,7 @@ self: { mkDerivation { pname = "stackage-sandbox"; version = "0.1.6"; - sha256 = "ade45f67b92175869594e64e68f3076feba3b50e863b8b588cff69310def1bdb"; + sha256 = "1nqvxw6k2sgziic8nfw61sss7svg0zrnhkp6jjaqcx91p5kmzr5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -166999,7 +178699,7 @@ self: { mkDerivation { pname = "stackage-setup"; version = "0.0.2"; - sha256 = "3bae41b72eb7992affedea2937ffb6c66e8f01d2c42ef5a4fc826c21d0d20184"; + sha256 = "1101sb822v42zjjgabn4s80qyvn6nvzkfagaxpzjm6dp5svl3biv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -167023,7 +178723,7 @@ self: { mkDerivation { pname = "stackage-types"; version = "1.2.0"; - sha256 = "c00255049aa5aac04bb67372cea26feadc4f38442cedbe7035d611baa2edf4cb"; + sha256 = "1jzlxnibl4fn6mqbxv9c8hw4zp7adyicwwkknr5w1am5k825a0n0"; libraryHaskellDepends = [ aeson base Cabal containers exceptions hashable safe semigroups text time unordered-containers vector @@ -167038,7 +178738,7 @@ self: { mkDerivation { pname = "stackage-update"; version = "0.1.2"; - sha256 = "72c3b1e60528afe9fd816b8b1dfcdab9a940aa32816f4593b06359a6b70383d3"; + sha256 = "1lw30fvscnb3n29lavw16am41adrvby1v2vbh7yykbr80pkb3hvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath process ]; @@ -167056,7 +178756,7 @@ self: { mkDerivation { pname = "stackage-upload"; version = "0.1.0.6"; - sha256 = "6f9f11e3ccacdb4590ac108420107c329c891663d270edb0a46f0f4b3613949e"; + sha256 = "17ll2cv4n3vgljqfsw6jccb8k71jgh82110hmj84bnxcrkii37vg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167076,7 +178776,7 @@ self: { mkDerivation { pname = "staf"; version = "1.0.0"; - sha256 = "7e7eaa611d5558984253eb1e291443cbca91c4c1593349b406fccd5418dc6230"; + sha256 = "0c32vhc59kgw0ss4jcsrq7293jnb8ca2j7pbad19hn2m3mhslzky"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/lovasko/staf"; description = "Numerical statistics for Foldable containers"; @@ -167088,7 +178788,7 @@ self: { mkDerivation { pname = "standalone-derive-topdown"; version = "0.0.0.1"; - sha256 = "657bcd87ed4ffdf49461529faf3c292a8a480fce8c88c5af1eaa23b1c7e9d765"; + sha256 = "0rfpx73v28xa3spwb24crq7li2ia54yaz7sjc6ag9zagxn3wsyv5"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/HaskellZhangSong/TopdownDerive"; description = "This package will derive class instance along the data type declaration tree"; @@ -167103,7 +178803,7 @@ self: { mkDerivation { pname = "standalone-haddock"; version = "1.1.4.5"; - sha256 = "2d5da0efb640a6791dfbfb71a1e54752fe03f2d42fbf5c75b232df2bffec4eeb"; + sha256 = "1ssfxkzjpprjn9smrgrgskr07zjj8zjs2wgvzcfpk9j0nvps0p9d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -167120,7 +178820,7 @@ self: { mkDerivation { pname = "star-to-star"; version = "1.0"; - sha256 = "3267cfd2c2b607853a14e8eefc65022ffa1ba796ad9b9c889a901ade7258b3db"; + sha256 = "1nxkb1rdw6lhka49r6xdjskipyig09jzrvp82hx8a1xnqb9cyrrj"; libraryHaskellDepends = [ base ]; description = "the * -> * types, operators, and covariant instances"; license = "unknown"; @@ -167131,7 +178831,7 @@ self: { mkDerivation { pname = "star-to-star-contra"; version = "1.0"; - sha256 = "a3744150900961b6998e7039fbcf2fd9e28ddd967cbf87cdbe647e194a95b7ce"; + sha256 = "1kmpjm51jzk4pv6qggvwjvfqvqnr5z7znfbhiscvcq89j1842x53"; libraryHaskellDepends = [ base star-to-star ]; description = "contravariant instances for * -> * types and operators"; license = "unknown"; @@ -167142,7 +178842,7 @@ self: { mkDerivation { pname = "starling"; version = "0.3.0"; - sha256 = "771d90e0a2426f24373f83c727b18a4fb33280b31c3f2bc1dac69725660a0e44"; + sha256 = "0i0f19k2b5y6vb0jngqwnf035csgiaqjgiw37wvj8vs2lbh907bp"; libraryHaskellDepends = [ base binary bytestring failure transformers ]; @@ -167159,7 +178859,7 @@ self: { mkDerivation { pname = "starrover2"; version = "0.1.1"; - sha256 = "6a526d662f4d639ba6e217d8ba368f999307e5c5f62380db3e080ae3a1efb365"; + sha256 = "0rdkxyhy62h87vdq08znqpjhg4wriwvbmn0pwak9nqsd5xk6slka"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -167179,7 +178879,7 @@ self: { mkDerivation { pname = "stash"; version = "0.1"; - sha256 = "95cbf410a73d5cc185f7a2db4d299eacae88c54c0e710894514af0a752d00306"; + sha256 = "01h3s19agw2aa6a0hw8f9k2qibmckqllvnx2yy2w2p1xlw8g9jwm"; libraryHaskellDepends = [ aeson attoparsec base bytestring directory hashable text vector ]; @@ -167193,7 +178893,7 @@ self: { mkDerivation { pname = "state"; version = "0.1"; - sha256 = "a643bd52380c8a68b561c168bf24031a97443104ebd5a9f78b8eb399015cb048"; + sha256 = "0j5hbh0rkcwfigvskmgb0hql95qs0cjbys61c6sni2hc719bshx6"; libraryHaskellDepends = [ arrows base mtl ]; description = "Data.State"; license = "LGPL"; @@ -167207,7 +178907,7 @@ self: { mkDerivation { pname = "state-bag"; version = "0.1.0.0"; - sha256 = "acbaa99b8dfd4712427effca595a16cdfa6613d59488f0e2c295bc2638402544"; + sha256 = "0i1580w2dg4mqbig124lsl9ndynd2rd5kjpzgr114izxindskfmc"; libraryHaskellDepends = [ base ghc-prim primitive transformers vector ]; @@ -167222,8 +178922,8 @@ self: { ({ mkDerivation, base, checkers, mtl, QuickCheck }: mkDerivation { pname = "state-plus"; - version = "0.1.2"; - sha256 = "c6ed155137d40262bf8aa38155bd93ecdc4bdbcb4ac83f5b980eeb8545ee377d"; + version = "0.1.3"; + sha256 = "1g5h9hmflp86vl40s0a6bq0mnbkrzdcijp03gc3ywsnjn552d459"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base checkers mtl QuickCheck ]; description = "MonadPlus for StateT"; @@ -167236,7 +178936,7 @@ self: { mkDerivation { pname = "state-record"; version = "0.0.1"; - sha256 = "eff4889b9f1567d42f42d8d1f88b95f798040bf76f94d089296e8a4d5ba038f9"; + sha256 = "1y9ql1dlv2kf564x153gyw5h967pjn5zilfq88px8rqmkydqix7g"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/ktvoelker/state-record"; description = "Better records for State monad states"; @@ -167251,7 +178951,7 @@ self: { mkDerivation { pname = "stateWriter"; version = "0.2.8"; - sha256 = "dbed209ec350b751b2c56388ab751149874f6b76c0d7a6725de1583682ccc6e2"; + sha256 = "1qn6rj13cn71bmradmy0frmlz1s925ssp233qnr53dshqfg21vfv"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; benchmarkHaskellDepends = [ @@ -167267,7 +178967,7 @@ self: { mkDerivation { pname = "statechart"; version = "0.1.0"; - sha256 = "46b422f4f41d425ba92d938de39bfdab9ed6672672950a9911c1f63c60da5b88"; + sha256 = "122vv9h3rxn126chm5bj4rkxd7mbzndy73ck5nlmnhhxyks25d26"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base polyparse ]; @@ -167281,7 +178981,7 @@ self: { mkDerivation { pname = "stateful-mtl"; version = "1.0.7"; - sha256 = "b0d48df014150a1554d76f9732cb3dfdd132a8cfeb4888f0b39b2dec702ec4a4"; + sha256 = "19645rqfqbcvngq8hj7bryl35lgx7p5k55vgsxa1a2hm2kq8vm5h"; libraryHaskellDepends = [ base MaybeT mtl ]; description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom"; license = stdenv.lib.licenses.bsd3; @@ -167293,7 +178993,7 @@ self: { mkDerivation { pname = "stateref"; version = "0.3"; - sha256 = "7dd390aab346ca877cde1217d5b62145cdfa6f9390e3b7a53c9296229ee1b741"; + sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx"; libraryHaskellDepends = [ base mtl stm ]; homepage = "http://code.haskell.org/~mokus/stateref/"; description = "Abstraction for things that work like IORef"; @@ -167305,7 +179005,7 @@ self: { mkDerivation { pname = "statestack"; version = "0.2.0.5"; - sha256 = "f4eadcf9b08c14cb084436f81e16edf78d6eeda77a3f93e38ba5d7e263ea5f66"; + sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -167318,7 +179018,7 @@ self: { mkDerivation { pname = "statethread"; version = "0.1.1"; - sha256 = "bfd22eeafac4fb37ae978cd5a3a7587d3e96ba90727d29c4ff23928979b49415"; + sha256 = "05clniwqk4i3zz22jzbjj2x9cgkxb2ks7mccjyp3gyy4zbm2xlmz"; libraryHaskellDepends = [ applicative base transformers ]; description = "The ST monad and STRefs"; license = stdenv.lib.licenses.bsd3; @@ -167332,7 +179032,7 @@ self: { mkDerivation { pname = "statgrab"; version = "0.1.3"; - sha256 = "45eef564af76f12f5ba65cb58460ce05877540f08d86bc7232dbf41b5ef793e5"; + sha256 = "1rckyxg1px6v69rbr1ldy107b1q5rrh89dawlrdjzwbnmxjgbvj5"; libraryHaskellDepends = [ async base bytestring time transformers ]; @@ -167348,7 +179048,7 @@ self: { mkDerivation { pname = "static-canvas"; version = "0.2.0.3"; - sha256 = "370824df08cedef2aacbbc8b855fd5cd3c80cfcc07ae2931e0f25397a61dd749"; + sha256 = "0jfp3nk9flzjw0qjkbh7rk7q0g6dsmgqb2xwrfmg5pnf13gj821p"; libraryHaskellDepends = [ base double-conversion free mtl text ]; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; @@ -167360,7 +179060,7 @@ self: { mkDerivation { pname = "static-hash"; version = "0.0.1"; - sha256 = "147dfc2b5f3510fb8fff7ee9bcb6dcf4568bb961abf221e23f02243434e96f5a"; + sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l"; libraryHaskellDepends = [ array base containers hashable primes ]; description = "Immutable hash"; license = stdenv.lib.licenses.bsd3; @@ -167374,7 +179074,7 @@ self: { mkDerivation { pname = "static-resources"; version = "0.1.7"; - sha256 = "a9a2ac8b6759e149a0509e941f6e44dedb4c85dd86e81a2a00380a1aec9dc971"; + sha256 = "0wf9kpn1l2iq00m1ms46vn2lrnyy8ip1z54ya2h4kqarcy5sr8m9"; libraryHaskellDepends = [ base directory filepath hslogger MissingH mtl old-time process syb time @@ -167392,7 +179092,7 @@ self: { mkDerivation { pname = "staticanalysis"; version = "0.0.0.3"; - sha256 = "8e5369282cbd6bd7c2fe6f2c5e1c8a62a91d9a7da1f77e51893a3a06a247de2c"; + sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf"; libraryHaskellDepends = [ base MissingH ]; description = "Reusable static analysis interfaces and modules"; license = stdenv.lib.licenses.gpl3; @@ -167407,7 +179107,7 @@ self: { mkDerivation { pname = "statistics"; version = "0.13.3.0"; - sha256 = "6e7fe0f10086725c696fdd855caf4b6fb58ca5100bd0c9995f575f5b071381ed"; + sha256 = "1vc12c3mnpspbycwkl0b22jqrdbg9fpmr1fxdxlmqwl603qy0zvf"; libraryHaskellDepends = [ aeson base binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms vector-binary-instances @@ -167422,6 +179122,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "statistics_0_14_0_2" = callPackage + ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf + , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms + , vector-binary-instances, vector-th-unbox + }: + mkDerivation { + pname = "statistics"; + version = "0.14.0.2"; + sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l"; + libraryHaskellDepends = [ + aeson base base-orphans binary deepseq erf math-functions monad-par + mwc-random primitive vector vector-algorithms + vector-binary-instances vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary erf HUnit ieee754 math-functions mwc-random + primitive QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector vector-algorithms + ]; + homepage = "https://github.com/bos/statistics"; + description = "A library of statistical types, data, and functions"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statistics-dirichlet" = callPackage ({ mkDerivation, base, deepseq, hmatrix-special , nonlinear-optimization, vector @@ -167429,7 +179156,7 @@ self: { mkDerivation { pname = "statistics-dirichlet"; version = "0.6.3"; - sha256 = "7c5126d68df100a2491a025753dbe39861066333675102c111f9ef577687a7eb"; + sha256 = "1sx7hxv5gvzr270h4lb76dihcqcqwgdm6mq2394s407iipb2clbw"; libraryHaskellDepends = [ base deepseq hmatrix-special nonlinear-optimization vector ]; @@ -167443,7 +179170,7 @@ self: { mkDerivation { pname = "statistics-fusion"; version = "1.0.1"; - sha256 = "8ee6e5175cf491d46dda817a577d51d26032c2f3c92e717c727e6525c1df879f"; + sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf"; libraryHaskellDepends = [ base vector ]; homepage = "http://code.haskell.org/~dons/code/statistics-fusion"; description = "An implementation of high performance, minimal statistics functions"; @@ -167458,7 +179185,7 @@ self: { mkDerivation { pname = "statistics-hypergeometric-genvar"; version = "0.1.0.0"; - sha256 = "f56caf4fd23a70f0660372763a8e56ab7e6e862bd8134cb21f27723ad51e4816"; + sha256 = "05j83vaklwi73yr4q4yq5f36wzmbas73lxkj0dkg0w1ss97syv7m"; libraryHaskellDepends = [ base math-functions mwc-random primitive statistics ]; @@ -167475,7 +179202,7 @@ self: { mkDerivation { pname = "statistics-linreg"; version = "0.3"; - sha256 = "6273c2166b8072814ede516c7c9f1e13a158b5013938fdf83a3ea2355aee8909"; + sha256 = "02c9xrd3b8iy7bwgsf1r06smi88k3sgpqv2ivr782wl0dcbc4wv2"; libraryHaskellDepends = [ base MonadRandom random random-shuffle safe statistics vector ]; @@ -167489,7 +179216,7 @@ self: { mkDerivation { pname = "stats"; version = "0.1.1"; - sha256 = "ee043d22e98203fd09fc1a8a2028ba99c292f4723f8d9355ac1d6a4cb3252f22"; + sha256 = "08ig4nrlqshxmiar739zfbs95hlrp8l212hszh4zs0w2x4i3s17f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base statistics text vector ]; @@ -167506,7 +179233,7 @@ self: { mkDerivation { pname = "statsd"; version = "0.1.0.1"; - sha256 = "410127c4718c8c114eb2de8821ff9241dc3a311fa4d7e5e8d07fe73074c56c8d"; + sha256 = "13bcqms31rvzs3lfbmx43wqkmp21jbzj326yn971334cf722f0a1"; libraryHaskellDepends = [ base bytestring monad-control mtl network random ]; @@ -167524,7 +179251,7 @@ self: { mkDerivation { pname = "statsd-client"; version = "0.3.0.0"; - sha256 = "540cfad1006bad0f38e2ebb4550c7508f3dd7c21fd4711f87371fbe03d35df06"; + sha256 = "01nz6lyy1yvifgw12izx45ydvwq8fl65bd7bw8w0zbbb038zl32l"; libraryHaskellDepends = [ base byteable bytestring crypto-api cryptohash digest-pure DRBG network network-uri old-time random time-units @@ -167541,7 +179268,7 @@ self: { mkDerivation { pname = "statsd-datadog"; version = "0.2.0.0"; - sha256 = "f32b8f0ee56087c0baf3cc838c03a9b80ef0e3da464339a5eead97e9be7f33b1"; + sha256 = "1c9kgyzfk5xdxsjkjhs6vbiz03mqm41qr0ycyfxc11v0wl78yazk"; libraryHaskellDepends = [ base bytestring monad-control network text transformers-base ]; @@ -167555,32 +179282,34 @@ self: { mkDerivation { pname = "statvfs"; version = "0.2"; - sha256 = "e1555e07894d222834c1e3da12532dbc4d9a9e75e4dce3ffa1bab8fd5a73e99b"; + sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1"; libraryHaskellDepends = [ base ]; description = "Get unix filesystem statistics with statfs, statvfs"; license = stdenv.lib.licenses.bsd3; }) {}; "staversion" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, http-client, http-client-tls, http-types - , megaparsec, optparse-applicative, QuickCheck, text, transformers + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal + , containers, directory, filepath, hspec, http-client + , http-client-tls, http-types, megaparsec, optparse-applicative + , pretty, QuickCheck, semigroups, text, transformers , transformers-compat, unordered-containers, yaml }: mkDerivation { pname = "staversion"; - version = "0.1.3.2"; - sha256 = "d3281fe9b7aa3795251c7e45d6364bfb051ffa3bee44d691f40c0c928fe886e0"; + version = "0.2.1.0"; + sha256 = "120w7kpgv2nsp7c36w1w6aglfh8sx72b3gmhrg5g790596f81797"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers directory filepath http-client - http-client-tls http-types megaparsec optparse-applicative text - transformers transformers-compat unordered-containers yaml + aeson ansi-wl-pprint base bytestring Cabal containers directory + filepath http-client http-client-tls http-types megaparsec + optparse-applicative pretty semigroups text transformers + transformers-compat unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring filepath hspec QuickCheck text + base bytestring Cabal filepath hspec QuickCheck semigroups text ]; homepage = "https://github.com/debug-ito/staversion"; description = "What version is the package X in stackage lts-Y.ZZ?"; @@ -167593,7 +179322,7 @@ self: { mkDerivation { pname = "stb-image"; version = "0.2.1"; - sha256 = "a238d55f13171cf6bfba932ed77a89e38be90c13eb7a7bb71bc173537089a6d7"; + sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52"; libraryHaskellDepends = [ base bitmap bytestring ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "A wrapper around Sean Barrett's JPEG/PNG decoder"; @@ -167605,9 +179334,9 @@ self: { mkDerivation { pname = "stb-image-redux"; version = "0.2.1.0"; - sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d"; + sha256 = "07gbj7qqgm3dwx6bign8qma3a0187p5nil7z612976bdpz9abr60"; revision = "2"; - editedCabalFile = "e2e25f22d0fedbe7c49b0c0db29511c4bbc03bcc4dd95ec18c840d6f060f9ac6"; + editedCabalFile = "1ils1w36y3c4ik0mxnadrhxw1fy426av438ckg2fgnzys0i5zqp2"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; homepage = "https://github.com/sasinestro/stb-image-redux#readme"; @@ -167620,7 +179349,7 @@ self: { mkDerivation { pname = "stb-truetype"; version = "0.1.2"; - sha256 = "9534fa559bba01a49a8e9c129373c61ff7a86ed10e6a75d62fdc95aee0896bc1"; + sha256 = "1hbbi7hax5fw5zb7ashfs5paixqzqrrr64lwisda80dskdazld4m"; libraryHaskellDepends = [ array base bytestring containers ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "A wrapper around Sean Barrett's TrueType rasterizer library"; @@ -167633,7 +179362,7 @@ self: { mkDerivation { pname = "stdata"; version = "0.0.4"; - sha256 = "6ef959485f64beda76e1a7f110292a8935271917c3d5ff2f0b6c136aa7c85146"; + sha256 = "0ijir2knl4vc1cpzzmf32wcjfdc958li1wd7w5vdmgk4bx45kybf"; libraryHaskellDepends = [ base parsec syb template-haskell ]; description = "Structure Data Library"; license = stdenv.lib.licenses.bsd3; @@ -167648,7 +179377,7 @@ self: { mkDerivation { pname = "stdf"; version = "0.2.0.0"; - sha256 = "cd7f63b1f3451108455e5e1e019ae1ad8c2ce9c8f6fba95c9f30eb8d51709cae"; + sha256 = "1blwf18qvsrhkxfakyznr3ljr35dw6d027jybr2hh4a5yfqn6zyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167669,7 +179398,7 @@ self: { mkDerivation { pname = "steambrowser"; version = "0.1.0.0"; - sha256 = "e41555978df1ad59b540e318b5090447cd837f4f8e0b41aaa6e646010055311c"; + sha256 = "071ial002ip6lsm422wf9xzq7ka70h4va67382smkbgiinbma5g4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec transformers ]; @@ -167687,7 +179416,7 @@ self: { mkDerivation { pname = "steeloverseer"; version = "2.0.1.0"; - sha256 = "ddc06191f2273a0c0c684d54d5f2ece54748b91ec97b11c99c9b38efe7915a5a"; + sha256 = "0njsj7kyyf4vkk4i2yy93swlhiz5xkrdam2dd060qfi7ya8n3h6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167709,12 +179438,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stego-uuid" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, memory, random, uuid + }: + mkDerivation { + pname = "stego-uuid"; + version = "1.0.0.0"; + sha256 = "1czdfnfama0phsbgv1a55815gnnkrqm5wggw9n10g4lfl866qbyv"; + libraryHaskellDepends = [ base bytestring cryptonite memory uuid ]; + testHaskellDepends = [ base random uuid ]; + homepage = "https://github.com/dimitri-xyz/stego-uuid#readme"; + description = "Generator and verifier for steganographic numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stemmer" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "stemmer"; version = "0.5.2"; - sha256 = "757449eda1d1a8c64139a8e4ea12e616382961e0b7ed8f2dbaf1a970d35ce6dd"; + sha256 = "1pg6bk9p1agip8nqzvdpw1hjjf0nwq9fmr58750wda6il7nljx3m"; libraryHaskellDepends = [ base ]; homepage = "http://www.github.com/bgamari/stemmer"; description = "Haskell bindings to the Snowball stemming library"; @@ -167726,7 +179469,7 @@ self: { mkDerivation { pname = "step-function"; version = "0.1.1.1"; - sha256 = "9ef61ac680115f602520b23b53ec2d0232860c8baf1e2f7735259cc001287e05"; + sha256 = "01by500w17156mvjy7mgic68cch25pn56fxj40jn0pqih331mxly"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck QuickCheck @@ -167742,7 +179485,7 @@ self: { mkDerivation { pname = "stepwise"; version = "1.0.2"; - sha256 = "0ebf2a47cf252a3cecee273177dccd2f0e38cdde03d52dc8ec1392c5c7433315"; + sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; license = "LGPL"; @@ -167759,7 +179502,7 @@ self: { mkDerivation { pname = "stgi"; version = "1.0.1"; - sha256 = "2fc1cdb0a0144757dbec6090a2fc9dd7b97096802465673bef6b9ee59e87e92a"; + sha256 = "0ap9hygfb7kbxwxnfr94h2b71ffpkpya5430xkdmfiqll2qcvh9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167783,7 +179526,7 @@ self: { mkDerivation { pname = "stickyKeysHotKey"; version = "0.1.0.2"; - sha256 = "4a24a2e53b818937b3b75ea97df65bd4448444fe7d4dc6e6fa3c13a7878a8147"; + sha256 = "0iw1ia3sf4rwzbkcckbxzr288i6lbgv7vaaynyrkg2c17gjs492a"; libraryHaskellDepends = [ base ]; description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE"; license = stdenv.lib.licenses.bsd3; @@ -167796,7 +179539,7 @@ self: { mkDerivation { pname = "stitch"; version = "0.4.0.0"; - sha256 = "72c114222abde4dbee6f087def13105bde3036a039ac6ded9e0f44462691ad77"; + sha256 = "0xxdj4k4ci0gkvnnvb1rl0v31pjv209yyz88dzpdpr5x58i19hbj"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base Cabal hspec text ]; benchmarkHaskellDepends = [ base criterion ]; @@ -167809,7 +179552,9 @@ self: { mkDerivation { pname = "stm"; version = "2.4.4.1"; - sha256 = "8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384"; + sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg"; + revision = "1"; + editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; @@ -167820,7 +179565,7 @@ self: { mkDerivation { pname = "stm-channelize"; version = "0.1.1"; - sha256 = "15a6cf4432cf631f8c484bd02b1f633b3522a8ccb2cfaacf5a5a938257fc44aa"; + sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm"; libraryHaskellDepends = [ base stm ]; description = "Transactional I/O for duplex streams"; license = stdenv.lib.licenses.bsd3; @@ -167831,7 +179576,7 @@ self: { mkDerivation { pname = "stm-chans"; version = "3.0.0.4"; - sha256 = "2344fc5bfa33d565bad7b009fc0e2c5a7a595060ba149c661f44419fc0d54738"; + sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13"; libraryHaskellDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -167843,7 +179588,7 @@ self: { mkDerivation { pname = "stm-chunked-queues"; version = "0.1.0.0"; - sha256 = "d2865d12ebfda3efb9a99bec98daa111e9153e8179eaae85f28bc32a7254c408"; + sha256 = "0264air2mhwbya2sxskrh4z1bs8il7d9iv4vm6wyz8zxxc95v1nj"; libraryHaskellDepends = [ async base stm ]; testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ]; homepage = "http://github.com/kholdstare/stm-chunked-queues/"; @@ -167863,7 +179608,7 @@ self: { mkDerivation { pname = "stm-conduit"; version = "3.0.0"; - sha256 = "cf6f663c069fb8991831ed792e5d22b8786966740797306c9391e610651da809"; + sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg"; libraryHaskellDepends = [ async base cereal cereal-conduit conduit conduit-combinators conduit-extra directory ghc-prim lifted-async lifted-base @@ -167888,7 +179633,7 @@ self: { mkDerivation { pname = "stm-containers"; version = "0.2.15"; - sha256 = "452483bcbe131475c216a463b67c3c43011a3e26493e0365379ce2ba6bd6b2e0"; + sha256 = "1q5jsrmvmqlw6xjh6gj94qz1l0a37iybcqx42v17a50kpsy86925"; libraryHaskellDepends = [ base base-prelude focus hashable list-t primitive transformers ]; @@ -167912,7 +179657,7 @@ self: { mkDerivation { pname = "stm-delay"; version = "0.1.1.1"; - sha256 = "b132581aac47e6cba6a1691a485e1700fbb047c02b7e1e43ae9bbd8476108a32"; + sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base stm ]; homepage = "https://github.com/joeyadams/haskell-stm-delay"; @@ -167924,8 +179669,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-extras"; - version = "0.1.0.1"; - sha256 = "ffa81349733b1631c1bad5ce3e5d4bcd35eb76dee10e4790fa050d40cb98e9cd"; + version = "0.1.0.2"; + sha256 = "08c6c53gkfwirgf3lq2ncwbjnhb195zbi7b76m4lwh3f6acckg3y"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/louispan/stm-extras#readme"; description = "Extra STM functions"; @@ -167940,7 +179685,7 @@ self: { mkDerivation { pname = "stm-firehose"; version = "0.3.0.2"; - sha256 = "6519b3fa7eba570e0cbd39ebb1b99eedf27212d3a1d3f63be5758e74858ed7f8"; + sha256 = "1y6pis2p93kmwlxzdlx1sc975wpdkswv3srrpl60wmxsgvxb66b5"; libraryHaskellDepends = [ base blaze-builder conduit http-types resourcet stm stm-chans stm-conduit transformers wai wai-conduit warp @@ -167957,7 +179702,9 @@ self: { mkDerivation { pname = "stm-io-hooks"; version = "1.1.0"; - sha256 = "35014012b671a6964ec0d5f5de2ab13a61d8ee01cb0bbd685a3cc17385fae235"; + sha256 = "0dg2za2p7h9wb9lbs2yb07pdhq9sn4mdxxfmq179d9kinq94009m"; + revision = "1"; + editedCabalFile = "1acsyc0fq03smarbjgxv2g2l0cnvi26k2lhw1vdvqnrgzmjlsjmp"; libraryHaskellDepends = [ array base containers mtl stm ]; description = "STM with IO hooks"; license = stdenv.lib.licenses.bsd3; @@ -167967,10 +179714,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "stm-lifted"; - version = "0.1.0.0"; - sha256 = "20816d76aa853a7bf0c5052cf511acd4aba004ecba8251ee807e83197def7ef4"; - revision = "1"; - editedCabalFile = "d313721a31d8e7ccc725c3a1542f4ac3f8c84fbcad10094cd1067c133edc6c54"; + version = "0.1.1.0"; + sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c"; libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; @@ -167982,7 +179727,7 @@ self: { mkDerivation { pname = "stm-linkedlist"; version = "0.1.0.0"; - sha256 = "7926673f9ec7938210a6d30e511190845e7e040a2cab555d291183ded0f8c5f4"; + sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr"; libraryHaskellDepends = [ base stm ]; description = "Mutable, doubly linked lists for STM"; license = stdenv.lib.licenses.bsd3; @@ -167993,7 +179738,7 @@ self: { mkDerivation { pname = "stm-orelse-io"; version = "0.1"; - sha256 = "a496773a80375a3757e53bf6d1f54a9eb0fe21a668966c5c0dc470fa0beb6087"; + sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4"; libraryHaskellDepends = [ base stm ]; homepage = "http://nonempty.org/software/stm-orelse-io"; description = "Choose between the return value of an STM operation and an IO action"; @@ -168005,7 +179750,7 @@ self: { mkDerivation { pname = "stm-promise"; version = "0.0.3.1"; - sha256 = "8cbb0b34d0f8c6aa71a22f9cd7ea083b44153e7845882c3fd3abf187905c991f"; + sha256 = "07wrbj88gwdbsczjr225g0z1ai1v13mdg71gl9qsmipqs0s0pfwc"; libraryHaskellDepends = [ base mtl process stm unix ]; testHaskellDepends = [ base QuickCheck stm ]; homepage = "http://www.github.com/danr/stm-promise"; @@ -168018,7 +179763,7 @@ self: { mkDerivation { pname = "stm-queue-extras"; version = "0.2.0.0.1"; - sha256 = "00047cb4167a56c6bd809572a33d818714bc74c3bad46cd686fa86f01a8a66fd"; + sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100"; libraryHaskellDepends = [ base stm stm-chans ]; description = "Extra queue utilities for STM"; license = stdenv.lib.licenses.asl20; @@ -168029,7 +179774,7 @@ self: { mkDerivation { pname = "stm-sbchan"; version = "0.1"; - sha256 = "1a78c0e7e66e59795bc57a0f9a86e427f297a4bca3b6b5c55888a0ec97dbe43b"; + sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s"; libraryHaskellDepends = [ base stm stm-tlist ]; homepage = "https://github.com/joeyadams/haskell-stm-sbchan"; description = "Bounded channel for STM where item sizes can vary"; @@ -168040,8 +179785,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-split"; - version = "0.0.1"; - sha256 = "001c3ceeb61498b11791225c4985cf6a9fa7e218a9b0631d54b57cc4837421b9"; + version = "0.0.2"; + sha256 = "01rqf5b75p3np5ym0am98mibmsw6vrqryad5nwjj9h5ci4wa81iw"; libraryHaskellDepends = [ base stm ]; description = "TMVars, TVars and TChans with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -168052,7 +179797,7 @@ self: { mkDerivation { pname = "stm-stats"; version = "0.2.0.0"; - sha256 = "0a4f39b1e9fffe50d6dfaa9c0b04977e510fae8b6bd3d7abb7076e8aa8f01345"; + sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa"; libraryHaskellDepends = [ base containers stm template-haskell time ]; @@ -168067,7 +179812,7 @@ self: { mkDerivation { pname = "stm-supply"; version = "0.2.0.0"; - sha256 = "f839ada6e5ac9549731086ed13fcf4c9f03a6ff93d64c0a857148820864f388c"; + sha256 = "131q9y32120laylc0r1xz5pkmw69yky17vc621rlk5dcwnkasfgq"; libraryHaskellDepends = [ base concurrent-supply ]; testHaskellDepends = [ async base QuickCheck random Unique ]; homepage = "https://github.com/caneroj1/stm-supply#readme"; @@ -168080,7 +179825,7 @@ self: { mkDerivation { pname = "stm-tlist"; version = "0.1.1"; - sha256 = "c66bb64a814c50f977e0fe3101c4ffbd05cb32c8b21070d91ca9a65ae145596b"; + sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/joeyadams/haskell-stm-tlist"; description = "Mutable, singly-linked list in STM"; @@ -168092,7 +179837,7 @@ self: { mkDerivation { pname = "stmcontrol"; version = "0.1"; - sha256 = "4428e55dcbe7378f839abb782298af877fa05aa175618099c74de1bfedbb8254"; + sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24"; libraryHaskellDepends = [ base haskell98 mtl stm ]; homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html"; description = "Control communication among retrying transactions"; @@ -168106,7 +179851,7 @@ self: { mkDerivation { pname = "stochastic"; version = "0.1.1.1"; - sha256 = "04b9827a9da85ba7a1da799ff9a2ca75448f8ea8e03c1dd1151f9359eb785a63"; + sha256 = "0qssg3mmk4qz2p8isg70m278yi3mraigk7vrvahsfnx8kmx85f84"; libraryHaskellDepends = [ base containers mtl random ]; testHaskellDepends = [ base Chart Chart-cairo containers mtl random @@ -168124,7 +179869,7 @@ self: { mkDerivation { pname = "stomp-conduit"; version = "0.1.0"; - sha256 = "eaaad7f0e859655e9004d3c4ac1dda323ae5e671f4d43d3b652669e7a62bf9e3"; + sha256 = "1qzr5fkffs96clxkvm7lf7kfafijv8fsri6k0j85wrarx3qdgapa"; libraryHaskellDepends = [ base conduit mime mtl resourcet stomp-queue stompl ]; @@ -168140,7 +179885,7 @@ self: { mkDerivation { pname = "stomp-patterns"; version = "0.1.0"; - sha256 = "7c3d0c16656be7ac011be7d1317b0aba774ed614f81fcfe32cf248ba0e4cb365"; + sha256 = "0rdk9h7blj7j5kiwy7zq2kb4wxxs19xk3lg73c0srrvbclb0qgbw"; libraryHaskellDepends = [ base bytestring containers mime mtl split stomp-queue stompl time ]; @@ -168157,7 +179902,7 @@ self: { mkDerivation { pname = "stomp-queue"; version = "0.3.1"; - sha256 = "47dd7f332f2544aaee66fa37ff889cd666c98a8401cec1deeede01b0730b20bb"; + sha256 = "1fr01drv00fyxvgc3kh1hj5cjrnnkj4gydzscvpali155wrpzpa7"; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra mime mtl network-conduit-tls split stompl time utf8-string @@ -168174,7 +179919,7 @@ self: { mkDerivation { pname = "stompl"; version = "0.5.0"; - sha256 = "b0538c190c3fa1f63d81aa2518561c2ae6dd1407f86b56794a2024e9b59a5158"; + sha256 = "0n2ikasyj91099wmcszq0wadvria3ib1h9dah4yzd89z1hcqqlxh"; libraryHaskellDepends = [ attoparsec base bytestring mime split text utf8-string word8 ]; @@ -168188,7 +179933,7 @@ self: { mkDerivation { pname = "stopwatch"; version = "0.1.0.4"; - sha256 = "b9f4c22f93359491c9fd20a0bd1ff9abd7e077aadfce1a213293e7e124b1b5c2"; + sha256 = "1hmmn4jf3rwk68himknzm9vy1mxbz4gvv810zp4r351mjcpw5x5r"; libraryHaskellDepends = [ base clock transformers ]; testHaskellDepends = [ base clock hspec ]; homepage = "https://github.com/debug-ito/stopwatch"; @@ -168201,7 +179946,7 @@ self: { mkDerivation { pname = "storable"; version = "0.1"; - sha256 = "4f8689dc6e715138d6b392a43c2483606545de86fe3f2ec1bb6e6a375c4d4880"; + sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg"; libraryHaskellDepends = [ base mtl ]; homepage = "http://anna.fi.muni.cz/~xjanous3/gitweb/?p=storable.git;a=summary"; description = "Storable type class for variable-sized data"; @@ -168213,7 +179958,7 @@ self: { mkDerivation { pname = "storable-complex"; version = "0.2.2"; - sha256 = "ab076f15c47a2a324a2119c8feee0a78e1d2af488d0d24b7113b4bb7eee47c06"; + sha256 = "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/cartazio/storable-complex"; description = "Storable instance for Complex"; @@ -168225,7 +179970,9 @@ self: { mkDerivation { pname = "storable-endian"; version = "0.2.6"; - sha256 = "3743ac8f084ed3187b83f17b4fac280e77c5df01f7910f42b6a1bf09d5a65489"; + sha256 = "12allvahkgx1nr10z4gp07gwaxqf52n4yyzihdxiilsf127sqhrp"; + revision = "1"; + editedCabalFile = "12f8sscsvsarlwz3p6kk9vbvqsbyhs8lhafgn9h7c0z6pz1amrya"; libraryHaskellDepends = [ base byteorder ]; description = "Storable instances with endianness"; license = stdenv.lib.licenses.bsd3; @@ -168236,7 +179983,7 @@ self: { mkDerivation { pname = "storable-record"; version = "0.0.3.1"; - sha256 = "74e5ceee49e0b7625d13759597d21e714843406b8b80e9168a0bb1199ffdadba"; + sha256 = "1fmdzngikc8bi8bfk04bdd046j3i3v99g5bm2dfn5dz097pcxrbl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base transformers utility-ht ]; @@ -168250,7 +179997,7 @@ self: { mkDerivation { pname = "storable-static-array"; version = "0.6.1.0"; - sha256 = "b5eb6edeccae1609099e915e00adeadc3c50eab02b998db844033726b6816d2a"; + sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm"; libraryHaskellDepends = [ array base tagged vector ]; description = "Statically-sized array wrappers with Storable instances for FFI marshaling"; license = stdenv.lib.licenses.bsd3; @@ -168262,7 +180009,7 @@ self: { mkDerivation { pname = "storable-tuple"; version = "0.0.3.2"; - sha256 = "35d3f35bbffc9acc1f81e5718cfac59d6d86ac229c740f6dde22f2374b5e8982"; + sha256 = "10l9br5kgwi2vrnhyx4w4an8cvcxqpx8qwg5h4gwr6pwpxdz7lrm"; libraryHaskellDepends = [ base base-orphans storable-record utility-ht ]; @@ -168278,8 +180025,8 @@ self: { }: mkDerivation { pname = "storablevector"; - version = "0.2.11"; - sha256 = "b2edb8234ae9de08baa4dc7b292314a2a9edaee5c090cedd7f3db405ab27c65e"; + version = "0.2.12"; + sha256 = "19p8yz7amvf9sd3kgx2hhh6nifkbjxj43s6i1279qq1v46x9wznb"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck syb transformers unsafe utility-ht @@ -168298,7 +180045,7 @@ self: { mkDerivation { pname = "storablevector-carray"; version = "0.0"; - sha256 = "711070aa6c4288fc89cbafc0dd44f9ce0e51ab16d9a5f1a217b237aa5a730fb3"; + sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i"; libraryHaskellDepends = [ base carray storablevector utility-ht ]; homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Conversion between storablevector and carray"; @@ -168310,7 +180057,7 @@ self: { mkDerivation { pname = "storablevector-streamfusion"; version = "0.0"; - sha256 = "d52cd96003f494733840cba6e0f83fd2a5900ceaa5e180b38a48b800f254f6e1"; + sha256 = "1qgnakr01f28iarq1qd5x86919fj7zwf19nb80w7757l0dhdjb6m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168322,6 +180069,59 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "store_0_3_1" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bytestring, cereal, cereal-vector, conduit + , containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, streaming-commons, syb, template-haskell + , text, th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.3.1"; + sha256 = "146srr30sb1p1zbc2sz0m3zlrjakcm0gh5b32vjzcd3kmzmha47c"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bytestring conduit + containers contravariant cryptohash deepseq directory filepath free + ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base + monad-control mono-traversable network primitive resourcet safe + semigroups smallcheck store-core streaming-commons syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bytestring cereal + cereal-vector conduit containers contravariant criterion cryptohash + deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core streaming-commons syb template-haskell text + th-lift th-lift-instances th-orphans th-reify-many th-utilities + time transformers unordered-containers vector + vector-binary-instances void weigh + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bytestring conduit + containers contravariant criterion cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core streaming-commons + syb template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + homepage = "https://github.com/fpco/store#readme"; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bytestring, cereal, cereal-vector, conduit @@ -168336,8 +180136,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.4.0"; - sha256 = "bdbbc77a10941ee721c4c3fb456ec236ada3be51a890415c00a57cd4f06973cc"; + version = "0.4.3.1"; + sha256 = "0h8b91dpp4r1bhdq3k4zcnaby1ka9x6gy8ypbhv47b2mwpnwp09p"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bytestring conduit containers contravariant cryptohash deepseq directory filepath free @@ -168375,55 +180175,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "store_0_4_1" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bytestring, cereal, cereal-vector, conduit - , containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, semigroups - , smallcheck, store-core, streaming-commons, syb, template-haskell - , text, th-lift, th-lift-instances, th-orphans, th-reify-many - , th-utilities, time, transformers, unordered-containers, vector - , vector-binary-instances, void, weigh + "store-core_0_3" = callPackage + ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text + , transformers }: mkDerivation { - pname = "store"; - version = "0.4.1"; - sha256 = "aee7f803b9338569b089d01c3ab3ec1384d9ae55d1ebb6c867faefb34656bdb2"; + pname = "store-core"; + version = "0.3"; + sha256 = "11vha2c3vlv640s8anfmvvsvg81ldzx7swlqvf8hlcaacc5j74w7"; libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring conduit - containers contravariant cryptohash deepseq directory filepath free - ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base - monad-control mono-traversable network primitive resourcet safe - semigroups smallcheck store-core streaming-commons syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring cereal - cereal-vector conduit containers contravariant criterion cryptohash - deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core streaming-commons syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector - vector-binary-instances void weigh - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bytestring conduit - containers contravariant criterion cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable network primitive - resourcet safe semigroups smallcheck store-core streaming-commons - syb template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void + base bytestring fail ghc-prim primitive text transformers ]; homepage = "https://github.com/fpco/store#readme"; - description = "Fast binary serialization"; + description = "Fast and lightweight binary serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -168434,8 +180198,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.4"; - sha256 = "aa8df93b9c5aba42b800b17a6cfd6bbdeef9369dc71ef684108d424a88ecf4f5"; + version = "0.4.1"; + sha256 = "1d34n2n9vjngxndkbxcqm07sg4cnaq6rlx013rhyjr3aybwqalhl"; libraryHaskellDepends = [ base bytestring fail ghc-prim primitive text transformers ]; @@ -168451,7 +180215,7 @@ self: { mkDerivation { pname = "str"; version = "0.1.0.0"; - sha256 = "599be5e795ea11e4f9833a92e498e347db73575e5bd6ab1e226fa020e57f6b24"; + sha256 = "093bgzjj183g48gapmjvbrbp7ns7wfcf94ishgwy84gajpkyb6sr"; libraryHaskellDepends = [ base base16-bytestring bytestring Crypto hashable MissingH text utf8-string @@ -168469,8 +180233,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.4.0"; - sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d"; + version = "0.4.4"; + sha256 = "1gaxlxy1mcdlc6q7va8l6qry52svd2cangdlpvgj32ag95vvpdpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168486,31 +180250,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_4_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.4.1"; - sha256 = "7a8a7c8bbe4c154c1a8def4a0bb7384ff9f60198ce7a8583063c7cd0c84bc790"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hashable lens template-haskell - text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hashable hlint lens - tasty tasty-hspec template-haskell text unordered-containers - ]; - homepage = "https://github.com/frontrowed/stratosphere#readme"; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -168519,7 +180258,7 @@ self: { mkDerivation { pname = "stratum-tool"; version = "0.0.4"; - sha256 = "1795849092ba839864eac66127218a536e550b9f84e305aface85d5dbafda80a"; + sha256 = "02m8znx5spg8mjphbqw4kw5mavjki8hjfqf6x9j9i0xsja88958p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -168540,7 +180279,7 @@ self: { mkDerivation { pname = "stratux"; version = "0.0.8"; - sha256 = "10a7e684510e08d1a768d9da94b83dfd96e020b46c1d7282707f6f54f4d2932b"; + sha256 = "0awksbs58vvzf21747bcnhhf15px7nw99nnrd2kx220fa62fd9qh"; libraryHaskellDepends = [ base stratux-http stratux-types stratux-websockets text ]; @@ -168561,7 +180300,7 @@ self: { mkDerivation { pname = "stratux-http"; version = "0.0.8"; - sha256 = "c79760a0813bedbc88499364d14de83e30cf52779ce81e7c6f75f895d1653c5d"; + sha256 = "0p9wcp8rby3mdxy1xs4wfx9cyc1yx16x2r4k964brv9vh6h615y7"; libraryHaskellDepends = [ aeson base either HTTP network-uri stratux-types utf8-string ]; @@ -168582,7 +180321,7 @@ self: { mkDerivation { pname = "stratux-types"; version = "0.0.8"; - sha256 = "05833a5e9991812bdfd0db7323b561056905682238f6cbebad18fe4bf818c6c9"; + sha256 = "1jf633w4pzhqmpmwpxiq49l0as85c6sj6wyvs3gjp0cik5g3m0q5"; libraryHaskellDepends = [ aeson base bytestring lens scientific text time ]; @@ -168603,7 +180342,7 @@ self: { mkDerivation { pname = "stratux-websockets"; version = "0.0.8"; - sha256 = "483ef8110d251659780a6143b0f15d9c92897c0d55eb363f127a30e9a1d900e7"; + sha256 = "1rq0v6hyjc3s28zkdssm1my8k4lwbpqv0hv119w5j5i51l8zhgj8"; libraryHaskellDepends = [ aeson base either network stratux-types text transformers websockets @@ -168624,7 +180363,7 @@ self: { mkDerivation { pname = "stream"; version = "0.1.0.0"; - sha256 = "5e9e0531132edd68758d65fbd150f55b7ea858ef90c184386aa8625e552af1fa"; + sha256 = "1ypi59amwqm8d8w89hchxxcahzjvym8d3yv5imsnip9f2cqhb7jy"; libraryHaskellDepends = [ base bytestring exceptions mtl streaming-commons transformers ]; @@ -168643,7 +180382,9 @@ self: { mkDerivation { pname = "stream-fusion"; version = "0.1.2.5"; - sha256 = "8679e2feb1ac87aec95afc9254fd37aff67e0e18aa22c72768a9f12607f8ce00"; + sha256 = "006fz03jdwd9d0kwf8ma3077xxmg6zym94pwbb4sx1xcn7zf4yc6"; + revision = "1"; + editedCabalFile = "1jyb8mc99ag72y4bqxw997klrikhnxqrbacmx2ag5kmwsd1v1p12"; libraryHaskellDepends = [ base ]; homepage = "http://hackage.haskell.org/trac/ghc/ticket/915"; description = "Faster Haskell lists using stream fusion"; @@ -168656,7 +180397,7 @@ self: { mkDerivation { pname = "stream-monad"; version = "0.4.0.2"; - sha256 = "86cd5770f903184b47113c42978cc409a483a5bdd2619c9e11f5a2339491210c"; + sha256 = "0311j6a378pm26g9qqfjpnjq7909qj69fhiw253ln603z5q5gkc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base logict ]; @@ -168674,7 +180415,7 @@ self: { mkDerivation { pname = "streamed"; version = "0.2"; - sha256 = "aa9fcdb15566d18f2ac9033c242b330f629e5d6210fe741230d922c1fb061437"; + sha256 = "0dql0vxw28nr60979zhhc9frwqhg6cmj8g03r4m8zlb6anqwv7xa"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list midi midi-alsa non-negative @@ -168694,7 +180435,7 @@ self: { mkDerivation { pname = "streaming"; version = "0.1.4.5"; - sha256 = "d6a920e2c08cea30480fc5823ef83bcd312f2e052ae3b54a2ed16ba0a5da6843"; + sha256 = "0hv8vajs0syi5r5bbqra0lp2ycfd7gw3x0n51x431slcq3i21afn"; libraryHaskellDepends = [ base containers exceptions ghc-prim mmorph monad-control mtl resourcet time transformers transformers-base @@ -168704,6 +180445,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-binary" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, streaming + , streaming-bytestring + }: + mkDerivation { + pname = "streaming-binary"; + version = "0.3.0.1"; + sha256 = "0n39as3mjwp6v1j4qrxm616h3zs0plnal2z46kwcqh5fbcszsayd"; + libraryHaskellDepends = [ + base binary bytestring streaming streaming-bytestring + ]; + testHaskellDepends = [ + base binary bytestring hspec streaming streaming-bytestring + ]; + homepage = "https://github.com/mboes/streaming-binary#readme"; + description = "Streaming interface to binary"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-bytestring" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, smallcheck, streaming, tasty, tasty-smallcheck @@ -168712,7 +180472,7 @@ self: { mkDerivation { pname = "streaming-bytestring"; version = "0.1.4.6"; - sha256 = "89d597dd78ebcf292347441ccca226fb6b67e125205db74f7aadab5592ce6a02"; + sha256 = "00kars95baxdg97vfp904phnfszv4sicq7248wijkkzbg3frgmc9"; libraryHaskellDepends = [ base bytestring deepseq exceptions mmorph mtl resourcet streaming transformers transformers-base @@ -168726,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 @@ -168734,7 +180515,7 @@ self: { mkDerivation { pname = "streaming-commons"; version = "0.1.17"; - sha256 = "e50a38cb8b626ef2f031c195e22171ffce00e20cbe63e8c768887564a7f47da9"; + sha256 = "1abxyjkn8xc8d33yhqxy1ki01kpzf4hy55f167qg4vk2ig5kh2p5"; libraryHaskellDepends = [ array async base blaze-builder bytestring directory network process random stm text transformers unix zlib @@ -168751,6 +180532,68 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-commons_0_1_18" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , criterion, deepseq, directory, hspec, network, process + , QuickCheck, random, stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.18"; + sha256 = "1jw3y3clh2l0kmsrkhhn6n1b8i8gnwz5cwbczj1kq00sj3xjxbr7"; + libraryHaskellDepends = [ + array async base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; + 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 + }: + mkDerivation { + pname = "streaming-conduit"; + version = "0.1.2.0"; + sha256 = "1vzw0lfj8l4ic1fcw0iqiwygg4zrfxw9xdjbl7qpkfsjsbjqyg2q"; + libraryHaskellDepends = [ + base bytestring conduit streaming streaming-bytestring transformers + ]; + testHaskellDepends = [ base conduit hspec streaming ]; + description = "Bidirectional support between the streaming and conduit libraries"; + license = stdenv.lib.licenses.mit; + }) {}; + "streaming-eversion" = callPackage ({ mkDerivation, base, doctest, foldl, microlens, pipes , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit @@ -168758,8 +180601,10 @@ self: { }: mkDerivation { pname = "streaming-eversion"; - version = "0.3.1.0"; - sha256 = "39bb9f601dfe578abd11933d4707f1a031669384375f2167b3da34740f1add01"; + version = "0.3.1.1"; + sha256 = "13fsl7mckinymkvysmzcnc4vpyapdiwb2k57yhq15x5y6b6scxs2"; + revision = "1"; + editedCabalFile = "0abjya3b9fgnk9njyrf4hpar0ldji43m1d3mdh2ax5v54k81ishs"; libraryHaskellDepends = [ base foldl pipes streaming transformers ]; @@ -168779,7 +180624,7 @@ self: { mkDerivation { pname = "streaming-histogram"; version = "0.1.0.0"; - sha256 = "07f7c40aca77806a875ec3ceae0a9ad29a3609f9f988669e354b515a3a2ca0ea"; + sha256 = "1sm05hx5llab6ng6d27rz44kd6njk85axkn3bs3nm03pr85c9xq7"; libraryHaskellDepends = [ base containers criterion ]; testHaskellDepends = [ base containers tasty tasty-hunit tasty-quickcheck @@ -168796,7 +180641,7 @@ self: { mkDerivation { pname = "streaming-png"; version = "0.1.0.0"; - sha256 = "ecb3509c29481d7deb3b65c976cc08fb9a859cff9f52ad48c16402d9439420ca"; + sha256 = "1ji0ji1xj0k4q54asllzzyf8b6pv1367djb57gmps7a856f51czc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168817,7 +180662,7 @@ self: { mkDerivation { pname = "streaming-postgresql-simple"; version = "0.2.0.0"; - sha256 = "2e00588e1cf3c971972bfd009ba8976177e78b381ea8436a78d3e7127d6b5195"; + sha256 = "15aiddyi5rykg1m47a0y725yfxv1jyl9n07x5fbp3jgk3j75h01f"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -168835,7 +180680,7 @@ self: { mkDerivation { pname = "streaming-utils"; version = "0.1.4.7"; - sha256 = "d75d3baaf5afa5a020a8a48830779835112047c4da1b708cfb3901ac6c068d48"; + sha256 = "0j4d0rnaq09rzf6706ysqi3j049mk1vk1254m0ha19dgynm3npfp"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl network network-simple pipes resourcet streaming @@ -168854,7 +180699,7 @@ self: { mkDerivation { pname = "streaming-wai"; version = "0.1.1"; - sha256 = "35b4182386cc1d23731b3eac78dda79a1b7878c0b6bd78fd99907c776dbfaf30"; + sha256 = "0c5gpxnpfz4hk7ypigdnq1w7h6wslzfpib1y3drj67fchqiiid1m"; libraryHaskellDepends = [ base bytestring bytestring-builder http-types streaming wai ]; @@ -168864,12 +180709,27 @@ 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 { pname = "streamproc"; version = "1.6.2"; - sha256 = "e76effaaff83e6a066df949415db109b405bda0aaeb95f0710906c65892584f2"; + sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/peti/streamproc"; description = "Stream Processer Arrow"; @@ -168884,7 +180744,7 @@ self: { mkDerivation { pname = "streams"; version = "3.3"; - sha256 = "2933f80d6a83fed326af5588b0cce93985b07233359c311bd69c5bac19954e40"; + sha256 = "0h2fjlcsqnwwsqdk371m6drb119rx76b122mmwkd7zl3d86zhcr9"; libraryHaskellDepends = [ adjunctions base comonad distributive semigroupoids semigroups ]; @@ -168894,18 +180754,21 @@ self: { }) {}; "strelka" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, base64-bytestring - , bifunctors, bytestring, hashable, http-media, mtl, semigroups - , strelka-core, text, transformers, unordered-containers + ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude + , base64-bytestring, bifunctors, bytestring + , bytestring-tree-builder, hashable, http-media, mtl, scientific + , semigroups, strelka-core, text, text-builder, time, transformers + , unordered-containers, url-decoders }: mkDerivation { pname = "strelka"; - version = "1"; - sha256 = "a29e67ccb1929d3f1455ae80472098219ec3dc58b9b5bc9534cb61869ee831d5"; + version = "2.0.1"; + sha256 = "12bmfbsrgplyd42scppp74d5zck0a7vakc5jjz07lpvw0qahvxr4"; libraryHaskellDepends = [ - attoparsec base base-prelude base64-bytestring bifunctors - bytestring hashable http-media mtl semigroups strelka-core text - transformers unordered-containers + attoparsec attoparsec-data base base-prelude base64-bytestring + bifunctors bytestring bytestring-tree-builder hashable http-media + mtl scientific semigroups strelka-core text text-builder time + transformers unordered-containers url-decoders ]; homepage = "https://github.com/nikita-volkov/strelka"; description = "A simple, flexible and composable web-router"; @@ -168919,8 +180782,8 @@ self: { }: mkDerivation { pname = "strelka-core"; - version = "0.1"; - sha256 = "9cccd19850c9b6afd0a544041476988520b035ec519061d7b92f1f781be69221"; + version = "0.3"; + sha256 = "0g0cnd3j3xk84kihc7bbn2shy983yz5h2v15y2xhfx2anjl4qycl"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring hashable mtl semigroups text transformers unordered-containers @@ -168936,8 +180799,8 @@ self: { }: mkDerivation { pname = "strelka-wai"; - version = "1"; - sha256 = "b30e1e4732acb5c5db772609655a23e8311a627b788dcbcf99dce8cbb3f16137"; + version = "1.0.1"; + sha256 = "0zbz8aa5gvh4y5brypzkp8bn1gkkz4pcdmd3ga62xpym8hhf83cc"; libraryHaskellDepends = [ base base-prelude bytestring case-insensitive http-types strelka-core text unordered-containers wai warp @@ -168952,13 +180815,27 @@ self: { mkDerivation { pname = "strict"; version = "0.3.2"; - sha256 = "2cd35a67938db635a87617d9576d5df0158b581e8e5694f07487c0f4b1549221"; + sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc"; libraryHaskellDepends = [ array base ]; homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html"; description = "Strict data types and String IO"; license = stdenv.lib.licenses.bsd3; }) {}; + "strict-base" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "strict-base"; + version = "0.4.0.0"; + sha256 = "0nj57jc1jrqkmbiqqmsvx5mc9jmx2y0a650vkmi54msf3xnpgqwq"; + revision = "1"; + editedCabalFile = "17zgiwiahgjvdamfcffx2dj88qlks4sgrmsqancz5vayp4yf9x1g"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/minad/strict-base"; + description = "Strict versions of base data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-base-types" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim , hashable, lens, QuickCheck, strict @@ -168966,7 +180843,7 @@ self: { mkDerivation { pname = "strict-base-types"; version = "0.5.0"; - sha256 = "febcadf3d7f97f9c8c161a98e2537ba83a8adc4e4f6015e65430d7367104a1cb"; + sha256 = "1jx10iqkdmrhakk1aq2g9vf8lfm8gd9y560s2s69qzzrszrsvg7y"; libraryHaskellDepends = [ aeson base bifunctors binary deepseq ghc-prim hashable lens QuickCheck strict @@ -168981,9 +180858,9 @@ self: { mkDerivation { pname = "strict-concurrency"; version = "0.2.4.1"; - sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89"; + sha256 = "128sbh5fnv02v2xdjlk7cb525bfckqyj7fyz5399nfycs0nj2f89"; revision = "2"; - editedCabalFile = "70e871fd6fd7dffa2dc373fda3a062e9b9efde6cbab873b250ff5731ca1a7850"; + editedCabalFile = "0l3q3b532mzza2r77f5sdkgfzfg9caha7zbkqcnzmpypdzyp3s3h"; libraryHaskellDepends = [ base deepseq ]; homepage = "http://code.haskell.org/~dons/code/strict-concurrency"; description = "Strict concurrency abstractions"; @@ -168996,7 +180873,7 @@ self: { mkDerivation { pname = "strict-data"; version = "0.1.1.0"; - sha256 = "d97632137b191064bd377dd0474cf99cf3782065aae6839ea8112c701d8bc3af"; + sha256 = "1by3icfp0b0im2g87rmaclh7iwwwz564gl3x6yyn840rgc9k4xnr"; libraryHaskellDepends = [ aeson base deepseq ]; homepage = "https://github.com/agrafix/strict-data#readme"; description = "Verious useful strict data structures"; @@ -169008,7 +180885,7 @@ self: { mkDerivation { pname = "strict-ghc-plugin"; version = "0.1.1"; - sha256 = "2b4b040927eda4d8016278551aa7ee3415ce5a747d243c78b98d5f9bd2fda143"; + sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb"; libraryHaskellDepends = [ base ghc syb ]; homepage = "http://thoughtpolice.github.com/strict-ghc-plugin"; description = "Compiler plugin for making Haskell strict"; @@ -169020,9 +180897,9 @@ self: { mkDerivation { pname = "strict-identity"; version = "0.1.0.0"; - sha256 = "218e8746098c246a5cf497e96eac6b4305495de18dc5f281598d79b54e8decbb"; + sha256 = "1fzcim7baycdb60z5icdw5flj1a3dfn6xscpyif6l94c1538g3i1"; revision = "1"; - editedCabalFile = "dfbae3f135c13e0809e251df1c3f654eaa80c74d8cce3be4ca5c29f777fb6a53"; + editedCabalFile = "0lvazdvzfaawrbj3pklc9p3q1ajfclzirpsiw84hhgn16pqy7fnz"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/cartazio/strict-identity"; description = "Strict Identity Monad, handy for writing fast code!"; @@ -169034,8 +180911,8 @@ self: { ({ mkDerivation, base, deepseq, extensible-exceptions }: mkDerivation { pname = "strict-io"; - version = "0.2.1"; - sha256 = "ad265e5707c8badaea8b2a89457917d38ae3cf7c19ac46bac704a81ee5777700"; + version = "0.2.2"; + sha256 = "1jcm1p1slbdxmbnmvqihvgf2czfaj4yks4hyqiv9ng95w9cfpagr"; libraryHaskellDepends = [ base deepseq extensible-exceptions ]; description = "A library wrapping standard IO modules to provide strict IO"; license = stdenv.lib.licenses.bsd3; @@ -169047,7 +180924,7 @@ self: { mkDerivation { pname = "strict-writer"; version = "0.4.0.0"; - sha256 = "bae1b58384f96a61eb491dc432d5fe6551fe2d5cfb0f0c3c736a819a12844caa"; + sha256 = "1ajchh99m0bafcy0q3zvbhnzwlb5zvak5i0x97mn2sprhj1vbqds"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/oisdk/strict-writer"; @@ -169060,7 +180937,7 @@ self: { mkDerivation { pname = "strictify"; version = "0.1"; - sha256 = "50d55fdc35308ab47b86cb660e6e61391305c8ad81b41ccb81fff5209e8b487c"; + sha256 = "0z28ifg21xgzh75ird41mp40a4rrc5p0wrnbhrxv92ih6pf5zmah"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169075,7 +180952,7 @@ self: { mkDerivation { pname = "strictly"; version = "1.0.0.0"; - sha256 = "6c742c9071b79f3fa669f0c514b0b95701d9f31c1ccbc9569d64e9995efe6aa8"; + sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c"; libraryHaskellDepends = [ base deepseq ]; homepage = "https://github.com/DanBurton/strictly#readme"; description = "Combinators for strictifying functions"; @@ -169088,7 +180965,7 @@ self: { mkDerivation { pname = "string"; version = "0.4.0"; - sha256 = "dffcd3ede54ee2d4d023e353ba4dacb0bd606a680717c9ef6a42219918ba24d1"; + sha256 = "1l94p8c9j8a2dbpwj5q7d1m61gdhmi6vllz34g8d9qjfwpnx7z6z"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -169099,7 +180976,7 @@ self: { mkDerivation { pname = "string-class"; version = "0.1.6.5"; - sha256 = "821dc13ee0521e0bee335e689c88596efb193130835a6edc45f94dcc9f72237a"; + sha256 = "0yi3fagwqkgr8pf6wnl360qikyvfb649qs2y6gp0n7jjw0zc27c2"; libraryHaskellDepends = [ base bytestring tagged text ]; homepage = "https://github.com/bairyn/string-class"; description = "String class library"; @@ -169111,7 +180988,7 @@ self: { mkDerivation { pname = "string-combinators"; version = "0.6.0.5"; - sha256 = "94914abfbd7d17051edab4bc9927c191fd05a652d9ef3cf259b5d0e0ca177e1e"; + sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/basvandijk/string-combinators"; description = "Polymorphic functions to build and combine stringlike values"; @@ -169123,7 +181000,7 @@ self: { mkDerivation { pname = "string-conv"; version = "0.1.2"; - sha256 = "f259a03e6f296af19a71c07ab9a98a38661dfe40679f360f8e371334ea226039"; + sha256 = "0fb04bm384rpiq7kd7v783z1sriqialvjyn0f6dg2si9dwza0ngj"; libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/Soostone/string-conv"; description = "Standardized conversion between string types"; @@ -169137,7 +181014,7 @@ self: { mkDerivation { pname = "string-conversions"; version = "0.4.0.1"; - sha256 = "46bcce6d9ce62c558b7658a75d9c6a62f7259d6b0473d011d8078234ad6a1994"; + sha256 = "150rdank90h7v08x0wq4dffjbxv2daf5v9sqfs5mab76kinwxg26"; libraryHaskellDepends = [ base bytestring text utf8-string ]; testHaskellDepends = [ base bytestring deepseq hspec QuickCheck quickcheck-instances text @@ -169155,7 +181032,7 @@ self: { mkDerivation { pname = "string-convert"; version = "4.0.0.1"; - sha256 = "9675b98f7e798fbfe89c18cb6ac8f44237c6a92c0f0b2344a26fad4c3e53d1c8"; + sha256 = "1j6iacz4rbbgl92262qg5jlwcds2yk46mjqqkklbz3vrgs7vjxcn"; libraryHaskellDepends = [ base bytestring text utf8-string ]; testHaskellDepends = [ base bytestring tasty tasty-hunit text utf8-string @@ -169170,7 +181047,7 @@ self: { mkDerivation { pname = "string-qq"; version = "0.0.2"; - sha256 = "9757cad387856a313729caffe0639215a10be7d72b09c44bcab9e55ee2a8c218"; + sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; libraryHaskellDepends = [ base template-haskell ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = stdenv.lib.licenses.publicDomain; @@ -169181,7 +181058,7 @@ self: { mkDerivation { pname = "string-quote"; version = "0.0.1"; - sha256 = "6484e4fe361c0b5cb1ef1999529a5886d3aaf75dff78fa00a01bdec6e968d3dd"; + sha256 = "1pfkd3lwdphvl00gly7zbpvsmlw6b2d5568rxyqmq2qw6vzf9134"; libraryHaskellDepends = [ base template-haskell ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = stdenv.lib.licenses.bsd3; @@ -169195,7 +181072,7 @@ self: { mkDerivation { pname = "string-random"; version = "0.1.0.0"; - sha256 = "501904563b2dc7466568822e6b95e152d2e6e61818717b3963fd78b0888d1424"; + sha256 = "090lin4b0y7xccwpnw8q33kfdljjw6annbl2d1jldird7db086ah"; libraryHaskellDepends = [ attoparsec base containers random text transformers ]; @@ -169215,7 +181092,7 @@ self: { mkDerivation { pname = "string-similarity"; version = "0.1.0.0"; - sha256 = "bb2e18741f084bef90531050a5b14712aca4e78d05de12d3ec6b803a5e9e034c"; + sha256 = "0k03krg3m03bxk9i5ph5ipks9b0j8yqsal0haf8fyjq83xs1hbmv"; libraryHaskellDepends = [ base suffixtree ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -169231,7 +181108,7 @@ self: { mkDerivation { pname = "string-typelits"; version = "0.1.0.0"; - sha256 = "ff35b6eb25b8e7a18f3fd495c8c911acf3e866876cb521c44bae31ef2934abbb"; + sha256 = "1fxb6hlyycdf9g223dbchxkfiwxc274wi5fl7y7s3rxq4pmvcdgz"; libraryHaskellDepends = [ base template-haskell type-combinators type-combinators-quote ]; @@ -169246,7 +181123,7 @@ self: { mkDerivation { pname = "stringable"; version = "0.1.3"; - sha256 = "e7af961e1eb52c89330aeb5434d7cfdebd3b712dd39812f68dcbd685e3da5a82"; + sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7"; libraryHaskellDepends = [ base bytestring system-filepath text ]; description = "A Stringable type class, in the spirit of Foldable and Traversable"; license = stdenv.lib.licenses.mit; @@ -169257,7 +181134,7 @@ self: { mkDerivation { pname = "stringbuilder"; version = "0.5.0"; - sha256 = "8966882622fc06fd4e588da626a558b54daa313f2328c188d9305b0c6f2fe9aa"; + sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A writer monad for multi-line string literals"; @@ -169271,7 +181148,7 @@ self: { mkDerivation { pname = "stringlike"; version = "0.0.0"; - sha256 = "1eaa2307a330df6065c7ebcdb0ea48bfb9d360173f84b5bef2968ef38aaa3073"; + sha256 = "0wrhma5g73lnyazbb11z2xhd7fdz93mb1kgbqxjn1prhlc3j7ahy"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring QuickCheck quickcheck-instances test-framework @@ -169290,7 +181167,7 @@ self: { mkDerivation { pname = "stringprep"; version = "1.0.0"; - sha256 = "60015e858428f1af2f6e2e3e725a2738d8bcedd8258c043b09a5dddbfe664441"; + sha256 = "0ha4cvzdppd514xh9315v3nvrn1q4xd74gifdqpszw98hj2mw0b0"; libraryHaskellDepends = [ base containers text text-icu ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th text @@ -169305,7 +181182,7 @@ self: { mkDerivation { pname = "strings"; version = "1.1"; - sha256 = "9b3c3be8b04125cc2a6f26451616608649a15134bc251fcf847e045df8d8e9f7"; + sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v"; libraryHaskellDepends = [ base bytestring text ]; homepage = "http://hub.darcs.net/scravy/strings"; description = "Functions for working with strings, including Text, ByteString, etc"; @@ -169317,7 +181194,7 @@ self: { mkDerivation { pname = "stringsearch"; version = "0.3.6.6"; - sha256 = "295f1971920bc52263d8275d7054ad223a7e1aefe75533f9887735c9644ffe4a"; + sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9"; libraryHaskellDepends = [ array base bytestring containers ]; homepage = "https://bitbucket.org/dafis/stringsearch"; description = "Fast searching, splitting and replacing of ByteStrings"; @@ -169329,7 +181206,7 @@ self: { mkDerivation { pname = "stringtable-atom"; version = "0.0.7"; - sha256 = "5a72537ab158bda2a290fcce85e4bac48a23330bfaf80422673853b744e0e6f2"; + sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs"; libraryHaskellDepends = [ base binary bytestring containers syb ]; homepage = "http://github.com/audreyt/stringtable-atom/"; description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets"; @@ -169341,7 +181218,7 @@ self: { mkDerivation { pname = "strio"; version = "0.0.0.0"; - sha256 = "14cbd9da8f3c97020aa6a414e059b41d57dbcb586153c8a328c835eec8ee32bd"; + sha256 = "1g9jxv4fwdf852iwhlv1b35xnmqxnicy0554lq5055rwizddkjql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -169359,7 +181236,7 @@ self: { mkDerivation { pname = "stripe"; version = "0.8.3"; - sha256 = "10abe90f5d3dd6897fb83fe6a552ed8acb69c36ba848e1342144c84d4d081fd3"; + sha256 = "1lqz116lvj2444sf2j58dg1nkjwaxm9abrizp1zqkmixbl7ykaqh"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types mtl text time unordered-containers utf8-string @@ -169377,7 +181254,7 @@ self: { mkDerivation { pname = "stripe-core"; version = "2.2.1"; - sha256 = "1c95d6a8479e1f87b5800252427f2f2b2ddc2a3b39e7f45b3bd097705b336c6d"; + sha256 = "0vbc6ddp15yh7ddz9rrr7cmdqb9b5xzl4lh2h2sqf7wy8yldd58w"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -169392,7 +181269,7 @@ self: { mkDerivation { pname = "stripe-haskell"; version = "2.2.1"; - sha256 = "aae0995a0c678fbe5c2f9f150f6a6183c0948500ca51a4a54b1257b88faed0bf"; + sha256 = "1gyhms7vhmqj9fjs8lfa022r9h43c5m0y5cz5xfbx3v71id9kq5a"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -169407,7 +181284,7 @@ self: { mkDerivation { pname = "stripe-http-streams"; version = "2.2.1"; - sha256 = "5de7f0f2167ee004a0cb67de2a99fb753022a142e5c12c8477e9c928b4976662"; + sha256 = "0qk6jys2ijg9fy22rhg58ahj4c3mzfcjmpk7rfh09q3y2vrg1rsx"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -169429,7 +181306,7 @@ self: { mkDerivation { pname = "stripe-tests"; version = "2.2.1"; - sha256 = "e170b605119c5da30efceefe446e6c3b31ed2c7b8c7edf6e643464a57a7ce3e9"; + sha256 = "1sg3gixaar1lcipdyzlcgcnfsc9vdip49zpfzh7a6pcw242vcw71"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -169444,9 +181321,9 @@ self: { mkDerivation { pname = "strips"; version = "0.1.0.0"; - sha256 = "6235efbdbf6505b9579266f047020240f642d1f3ee20e8b07480a638e0f71dce"; + sha256 = "1khxyzh3i9l0fjqfh87fyg8l5xj00814gw36j9bvj1b5pyyyydb2"; revision = "1"; - editedCabalFile = "7bd62d7118703833b341b9e596a402ab58e339fe925cfc8b2650b2491fe57ae1"; + editedCabalFile = "1qbswlglkcjh4s5zqp4jzqwy6n5b0aj9drdr86rk6f3h31qjvmkv"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers hspec mtl ]; homepage = "https://github.com/y-kamiya/strips-haskell#readme"; @@ -169461,8 +181338,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "3.0.2"; - sha256 = "94f1dcef7ded8a27365d448e2db70baa5fafc91fa047dbb35164f82fd84f0b0f"; + version = "3.0.3"; + sha256 = "0g98wsc1afjjlw0sjhnsjd4xv8akid1xr4gc16jcdy9wfv32rb4m"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -169478,21 +181355,25 @@ self: { mkDerivation { pname = "strptime"; version = "1.0.10"; - sha256 = "cd2508a07eec0197bd7cc67b7e5e2e7cf06a69ad4c4fe5a47722639788f382b8"; + sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd"; libraryHaskellDepends = [ base bytestring text time ]; description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)"; license = stdenv.lib.licenses.bsd3; }) {}; "structs" = callPackage - ({ mkDerivation, base, deepseq, directory, doctest, filepath - , ghc-prim, hlint, parallel, primitive + ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory + , doctest, filepath, ghc-prim, hlint, parallel, primitive + , template-haskell }: mkDerivation { pname = "structs"; - version = "0"; - sha256 = "4ba635175f9db39b13d7ba7ecb2158c1c4228f33d0831e9dd48e5e247cda3970"; - libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + version = "0.1"; + sha256 = "0haghcp365rfmh53hpkv4xydc2yfyai45r053q60lspd7gj202hz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell + ]; testHaskellDepends = [ base directory doctest filepath hlint parallel ]; @@ -169510,7 +181391,7 @@ self: { mkDerivation { pname = "structural-induction"; version = "0.3"; - sha256 = "5d7176d0536d407a0a96aa0602099c17f79a6bd7d637e1a712bf4a78c768d3f3"; + sha256 = "1wykd33phjmz2aky2dynsxmrmxqpkh4h41majq57lh3dag87cwax"; libraryHaskellDepends = [ base containers genifunctors mtl pretty safe ]; @@ -169529,7 +181410,7 @@ self: { mkDerivation { pname = "structural-traversal"; version = "0.1.1.1"; - sha256 = "8f650164a83eaabd1c23ec31f23c3b1d07825e31e2ad7a411eab8f432ee261e9"; + sha256 = "1sb1w8p473xb3r0pmbg265g841qx7cyg4cgc4cfbvaiym1j02rcg"; libraryHaskellDepends = [ base mtl template-haskell ]; testHaskellDepends = [ base HUnit mtl ]; homepage = "http://github.com/nboldi/structural-traversal#readme"; @@ -169545,7 +181426,7 @@ self: { mkDerivation { pname = "structured-haskell-mode"; version = "1.1.0"; - sha256 = "c5517a56ebf64134b4b0f0d866357ab498a81d90469985fbeacc458c5ada38b4"; + sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169565,7 +181446,7 @@ self: { mkDerivation { pname = "structured-mongoDB"; version = "0.3"; - sha256 = "bdc9d9e0afc1cb2abaa9ad522562984e0095b3126a10372483721468e2279a38"; + sha256 = "0f4s4zi6h53jhcj3f43a2arra02fk1i2almdm6x2mjy1mzhdkjdx"; libraryHaskellDepends = [ array base bson bytestring compact-string-fix containers monad-control mongoDB mtl old-time template-haskell transformers @@ -169587,7 +181468,7 @@ self: { mkDerivation { pname = "structures"; version = "0.2"; - sha256 = "48c72fd0c7cf9ddd957b471ac4140aac1068ca4aca9e88e1af56bb74978e1500"; + sha256 = "000misbp9fsnmzhqi7na9b56h45c18ac86j7gfaxv7fgqz82zis8"; libraryHaskellDepends = [ base containers contravariant deepseq free ghc ghc-prim hashable hybrid-vectors lens monad-st parallel primitive semigroups @@ -169615,7 +181496,7 @@ self: { mkDerivation { pname = "stt"; version = "0.2.1"; - sha256 = "dbb5d53d9486c9375c52cbe9a3d3d53f52d9ed882cecc31b5564be9dddb5b176"; + sha256 = "0xminpfrvgk4aldw7v1ci3nxjlizsp9s7sfba9f3gjc6jhyxbdfv"; libraryHaskellDepends = [ base mtl primitive ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck transformers @@ -169633,7 +181514,7 @@ self: { mkDerivation { pname = "stunclient"; version = "0.1.0.1"; - sha256 = "9d62319af1c8161b898562f51d20b6c586a66b18597627aedea399ce595c3a45"; + sha256 = "0i9sbicwx6d3vsp2fxjr31msd1n5nqh1vxb2hn4in5n8y6d32qlx"; libraryHaskellDepends = [ base bytestring cereal crypto-api cryptohash cryptohash-cryptoapi digest network random stringprep text transformers unbounded-delays @@ -169655,7 +181536,7 @@ self: { mkDerivation { pname = "stunts"; version = "0.1.2"; - sha256 = "1cd1e7f4625c2b4a51418b593279c1084b02c9aa5992d2f9c408fd4c615bb91c"; + sha256 = "075rbdhlrz88qkwx54jrmb4h4jq8q5wk4ncb858llaswcbsfgl8w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169668,6 +181549,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stutter" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-combinators, conduit-extra, mtl, optparse-applicative + , resourcet, snipcheck, tasty, tasty-ant-xml, tasty-hunit, text + }: + mkDerivation { + pname = "stutter"; + version = "0.1.0.1"; + sha256 = "1s3bwwylbf7mcjzpnl8681aaw92q8kcyp074gns5cazsi0slfzl4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-combinators + conduit-extra mtl resourcet text + ]; + executableHaskellDepends = [ + attoparsec base conduit conduit-combinators optparse-applicative + text + ]; + testHaskellDepends = [ + attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit + ]; + homepage = "https://github.com/nmattia/stutter#readme"; + description = "(Stutter Text|String)-Utterer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative @@ -169676,7 +181585,7 @@ self: { mkDerivation { pname = "stylish-haskell"; version = "0.7.1.0"; - sha256 = "570a643ae6798995a43b0b357005e71c1529ed43ebafa2748fc97a236e0c01bc"; + sha256 = "1g011ip26yn9ixsa5bzb8gnjj58www2p0d8b7fj9b2brwqx682jp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169697,12 +181606,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylish-haskell_0_8_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative + , strict, syb, test-framework, test-framework-hunit, yaml + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.8.1.0"; + sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts mtl syb yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts mtl optparse-applicative strict syb yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts HUnit mtl syb test-framework test-framework-hunit + yaml + ]; + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "stylized"; version = "0.1.3"; - sha256 = "e41cce6f673123ca3b785d638d5e5563277ebdbc84642997d596ee812966ea25"; + sha256 = "09gacqlq3vlnsnbjjr44pjypw9v3amg8sqsxg0xwl8ricxpww774"; libraryHaskellDepends = [ ansi-terminal base ]; homepage = "http://patch-tag.com/r/lucid/Stylized"; description = "Ways to output stylized text on ANSI consoles"; @@ -169716,8 +181655,8 @@ self: { }: mkDerivation { pname = "styx"; - version = "1.2"; - sha256 = "6b8d91a85a65e64758f3eb13c863253318b5477fc12644bb796533b8b0ed3131"; + version = "1.3"; + sha256 = "0bqpqixdwdh2j28mdg52a0yvzrjs8gwmyapknqb2mlhf1w3f21cp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169736,7 +181675,7 @@ self: { mkDerivation { pname = "sub-state"; version = "0.0.0.1"; - sha256 = "970080595b22141e63563f4718515554bf3a59a0c7cfabe694285597468b6dde"; + sha256 = "1pkdid39fm98jkkapky7l1ckmgslam8ihirzariiw512bdcq004p"; libraryHaskellDepends = [ base mtl sets ]; testHaskellDepends = [ base QuickCheck quickcheck-instances tasty tasty-hunit @@ -169758,7 +181697,7 @@ self: { mkDerivation { pname = "subhask"; version = "0.1.1.0"; - sha256 = "c3e5a727ed988acb4c2a1083136be2faead19bef252345b12695d5050cddc791"; + sha256 = "14f7vl60bmcm4sqla8r5xydx3spsw9mi70qh596cp2lqxlksgrf3"; libraryHaskellDepends = [ approximate array base bloomfilter bytes bytestring cassava containers deepseq erf gamma ghc-prim hmatrix hyperloglog lens @@ -169782,7 +181721,7 @@ self: { mkDerivation { pname = "subleq-toolchain"; version = "0.1.8.5"; - sha256 = "6a993ee41a0a4b55ee0f9bde633c092d656ee053c7e12fc97b82f42b2e1babc6"; + sha256 = "1imb3cp2px42gg4jzqf7agh6wr9d14y67plv1zp5ajqa3bj3x6ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers lens mtl parsec pretty ]; @@ -169802,7 +181741,7 @@ self: { mkDerivation { pname = "subnet"; version = "0.0.1.2"; - sha256 = "db262492bac9b1eeb81b8143f9f771ce77c9e2ebb7c83afa47bb43da1fd533a5"; + sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv"; libraryHaskellDepends = [ base split ]; homepage = "https://github.com/gcganley/subnet"; description = "subnetting calculator"; @@ -169814,7 +181753,7 @@ self: { mkDerivation { pname = "subtitleParser"; version = "0.5"; - sha256 = "78ec8a1af243b7465ed97c2be288c865ef81bbbf03732ab67de79c6dd73779ce"; + sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q"; libraryHaskellDepends = [ attoparsec base containers text ]; homepage = "https://patch-tag.com/r/rubenAst/subtitleParser/home"; description = "A parser for .srt and .sub files"; @@ -169826,7 +181765,7 @@ self: { mkDerivation { pname = "subtitles"; version = "0.0.1"; - sha256 = "94bd7635f99e70cd7aa5b0d344495c9609798497b60b0d72acb792683ee76c5f"; + sha256 = "0pvcwwz6i4mpmir0s2xnjy27j2cnbi4l9lxhlmxcsw4yz4spdgcl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base split ]; @@ -169839,7 +181778,7 @@ self: { mkDerivation { pname = "subwordgraph"; version = "1.0.2"; - sha256 = "3bfd38ba46b3e0c0158ebbc97d89d908f52de70ba470b1b567c583ba19bbdc36"; + sha256 = "0dnwpccvm0y5cysv2w541gkjvx88v64pvjdviqaw1q5k8sx3iz9v"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/danielnowakowski/Subword-Graph"; @@ -169854,7 +181793,7 @@ self: { mkDerivation { pname = "success"; version = "0.2.6"; - sha256 = "e995e77e8ae13bc4d543ea771f6a4d17853dea1ae46ef294131fc8c582f2dab6"; + sha256 = "1dnsya1cbj0z2fag4vp43bm3v18p9mm1yxza8gaw8fz1i9zfg5g9"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; @@ -169868,7 +181807,7 @@ self: { mkDerivation { pname = "successors"; version = "0.1"; - sha256 = "636ec946d4622860363ff2480dcbf5148adb1d70bd044a716a068756354f6b56"; + sha256 = "0mkb9wsmd1q6d9qll15xf0fxp2hlyp5hsj7j7wv60a32si3cjvk3"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nomeata/haskell-successors"; description = "An applicative functor to manage successors"; @@ -169882,7 +181821,7 @@ self: { mkDerivation { pname = "suffix-array"; version = "0.3.0.0"; - sha256 = "4109af4d3ae346c3984acf704ac3c3fb463cdca0a37ee35e7b698ef236e64794"; + sha256 = "1527wqvg53k9gdgf6zm3l3f3qipvqg1llw6g9acc6ip3796sy2a1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -169901,7 +181840,7 @@ self: { mkDerivation { pname = "suffixarray"; version = "0.0.3.1"; - sha256 = "174232b78466bb358a78f589a1946d54ee6c4438d4f7e16ac20d245fbef34271"; + sha256 = "0wa2yfz5y90dq9mf3xyl7126rvjldnaa32gmg253bfv6hjvk4hhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base vector ]; @@ -169917,7 +181856,7 @@ self: { mkDerivation { pname = "suffixtree"; version = "0.2.2.1"; - sha256 = "063b68cb37099294c57a933a212889ccce13c33e1be6f9d89789aa232e14b3b5"; + sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6"; libraryHaskellDepends = [ base bytestring containers ]; homepage = "https://github.com/bos/suffixtree"; description = "Efficient, lazy suffix tree implementation"; @@ -169929,7 +181868,7 @@ self: { mkDerivation { pname = "sugarhaskell"; version = "0.1"; - sha256 = "b85e6ef0bcaa51e85d5360de717f9fc45ae9c87cc2f36ad381b10556ea649fc2"; + sha256 = "1hlzckm5c1dih79nmwy2gk4fjnn4kxzp3pk0adfyhldapkq6wpmq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -169943,13 +181882,26 @@ self: { mkDerivation { pname = "suitable"; version = "0.1.1"; - sha256 = "91bddb96f2e4996970c5b4e593f6904040af446a8f08e1e5131f64b7df3f7cdf"; + sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci"; libraryHaskellDepends = [ base containers ]; description = "Abstract over the constraints on the parameters to type constructors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sum-type-boilerplate" = callPackage + ({ mkDerivation, base, hlint, hspec, HUnit, template-haskell }: + mkDerivation { + pname = "sum-type-boilerplate"; + version = "0.1.0"; + sha256 = "1nibnrnj35sdi6jywjlg5f41138a22q2vg7hn0vqczynzswjb5y8"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hlint hspec HUnit template-haskell ]; + homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme"; + description = "Library for reducing the boilerplate involved with sum types"; + license = stdenv.lib.licenses.mit; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -169957,7 +181909,7 @@ self: { mkDerivation { pname = "sump"; version = "0.1.0.2"; - sha256 = "aab5fe4a465a328586fe5b25f6a808b90071e976f0570b35a30a537565cc43bc"; + sha256 = "1g23rijpalqalcshnmzhfvlp205r12lgc9avzs38acjs8r5gxdda"; libraryHaskellDepends = [ base bytestring data-default lens serialport transformers vector ]; @@ -169972,7 +181924,7 @@ self: { mkDerivation { pname = "sundown"; version = "0.6"; - sha256 = "cb9b7e98138311375148ffe0fa4c4b04eb7a9f8ec2ae13a674d465e5d71db027"; + sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb"; libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/bitonic/sundown"; description = "Bindings to the sundown markdown library"; @@ -169986,7 +181938,7 @@ self: { mkDerivation { pname = "sunlight"; version = "0.6.0.0"; - sha256 = "bd94d7b2031e4c33218352f22184560142d3653736c46ee0b3e54b40767720e1"; + sha256 = "1q90fxv40jz5ngh6xi1n6xjx6hh1as223wjjhchk6k0y0frdg55x"; libraryHaskellDepends = [ base bytestring Cabal directory old-locale process random time tuple @@ -170005,7 +181957,7 @@ self: { mkDerivation { pname = "sunroof-compiler"; version = "0.2"; - sha256 = "9f2162ac9a73cc395d8d0ddf0444dd7c44a540a4695830ddba76135d0a5703e4"; + sha256 = "1r03aw55s4vnpbfk0n39li0aai3wvm209pqdimfkkk3kkan648cz"; libraryHaskellDepends = [ base Boolean containers data-default data-reify mtl operational semigroups tagged template-haskell transformers vector-space @@ -170024,7 +181976,7 @@ self: { mkDerivation { pname = "sunroof-examples"; version = "0.2.2"; - sha256 = "b3c839c832e29395fcb3761583b865f80fa244b140ce893b5b5305fc46549d2d"; + sha256 = "0bcxai3gq1akbcxqkkj0n52a43zqcnw865bnngy9b4z26b43kj5k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170048,7 +182000,7 @@ self: { mkDerivation { pname = "sunroof-server"; version = "0.2.1"; - sha256 = "a52132061d153266cef31ab128110516a724a0738a6ef6cd33ea7143d0f24c85"; + sha256 = "11acyb846wga6g6zcvlaffh299qn0l8jic8syg76cchm3l3348d5"; libraryHaskellDepends = [ aeson base containers data-default filepath kansas-comet scientific scotty semigroups stm sunroof-compiler tagged text time @@ -170070,7 +182022,7 @@ self: { mkDerivation { pname = "super-user-spark"; version = "0.3.2.0"; - sha256 = "dbef4d44404a06ca283b8b8e4886373a4dd18d042679dd54998d59256aae118d"; + sha256 = "138imrm2ancdk5adsy960j6x2k9s6y34i3lb7clcl1ja8124vvyv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170089,6 +182041,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "superbubbles" = callPackage + ({ mkDerivation, base, containers, hspec, mtl }: + mkDerivation { + pname = "superbubbles"; + version = "0.1.0"; + sha256 = "1lm1jjzjk5f8knm3dh0mrjanizv3lzpwnkvpn3h60ni2ja1ffim0"; + revision = "3"; + editedCabalFile = "1140dgrvc5i0dv7iqj4ykyrf3bk8dr450ihqbgglk2zmgzcb2zaz"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers hspec ]; + homepage = "https://github.com/bartavelle/superbubbles#readme"; + description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "superbuffer" = callPackage ({ mkDerivation, async, base, buffer-builder, bytestring, criterion , HTF, QuickCheck @@ -170096,7 +182063,7 @@ self: { mkDerivation { pname = "superbuffer"; version = "0.2.0.1"; - sha256 = "ced2a0ed729661412d28da1248d39a5b47bb4513847deae59219a0fc12b51166"; + sha256 = "0rhinl9gr80rjbjylzc42d2vnisvkb9lh4ns50nl2qcnfbns1lnf"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring HTF QuickCheck ]; benchmarkHaskellDepends = [ @@ -170107,6 +182074,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "superbuffer_0_3_1_1" = callPackage + ({ mkDerivation, async, base, buffer-builder, bytestring, criterion + , HTF, QuickCheck + }: + mkDerivation { + pname = "superbuffer"; + version = "0.3.1.1"; + sha256 = "0y3c2v2ca5lzz6265bcn9g04j6aihm7kw8w91ywfl7bkg1agp9fp"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ async base bytestring HTF QuickCheck ]; + benchmarkHaskellDepends = [ + async base buffer-builder bytestring criterion + ]; + homepage = "https://github.com/agrafix/superbuffer#readme"; + description = "Efficiently build a bytestring from smaller chunks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -170114,7 +182100,7 @@ self: { mkDerivation { pname = "supercollider-ht"; version = "0.3"; - sha256 = "3cceb4e622bf1d6d7887cbefcd8d68e277c0d638de522276d4aa09db1cc316ed"; + sha256 = "1v8nqcfdn2dasiv24lny73bc0xz2d26wvvybhxw6s7dz4bkb9kiw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170135,7 +182121,7 @@ self: { mkDerivation { pname = "supercollider-midi"; version = "0.2.1"; - sha256 = "13080add4d6df431da9856a4516a01799389aeb91e4ee256a390cb95483370d4"; + sha256 = "1m3h6d49bjwhldbf4khyp6p8k4vr05m5392nk3d33x3d9pfhl20k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170150,12 +182136,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "superconstraints" = callPackage + ({ mkDerivation, base, constraints, containers, haskell-src-meta + , mtl, tagged, template-haskell, type-eq + }: + mkDerivation { + pname = "superconstraints"; + version = "0.0.2"; + sha256 = "0wdh3vjqls9mdvii7qxcv993305ahznffiv0qkfkwg0lxsshwdxy"; + libraryHaskellDepends = [ + base constraints containers haskell-src-meta mtl tagged + template-haskell type-eq + ]; + homepage = "http://github.com/ryantrinkle/superconstraints"; + description = "Access an instance's constraints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "superdoc" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "superdoc"; version = "0.1.2.4"; - sha256 = "24108e7aeefaf7a931594953da53f861cecda3d7a8a3cc27aeaafa361ef06250"; + sha256 = "0l32y0g3dymamqkwr8x8syiwvkk1z19xlls9b4qskxzsxrx8w414"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170175,7 +182178,7 @@ self: { mkDerivation { pname = "supermonad"; version = "0.1"; - sha256 = "ed9647eae9e5b3431bf320db78c6878b6f21487ba659faf18a1f4597a91a8e62"; + sha256 = "0qlf3alrfi8zibqzlnd6gd422vwbhz37inr0ycdl7cz5x7m4g5pd"; libraryHaskellDepends = [ base containers fgl ghc mtl transformers ]; @@ -170191,7 +182194,7 @@ self: { mkDerivation { pname = "supero"; version = "3.0"; - sha256 = "8ec38385db1d5cfd8e6aa716a3a80a5a013257dd1fd3a5a20c9f78a8f8b9d14a"; + sha256 = "0jnip7wahy4z1jiablqzvmbk40as1ala65m7da7gsp0xvf2q7hwf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170204,12 +182207,32 @@ 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 { pname = "supervisor"; version = "0.1.1.0"; - sha256 = "7da3d9453e1c5f4cf4560f07408249d462a8877f52a39f273443bc9850c5afbd"; + sha256 = "1gdgqm89ig236hkrz8sjgy3shqnl961401qgavs4qpqw7r2xk8vx"; libraryHaskellDepends = [ base containers exceptions monadloc mtl ]; @@ -170227,7 +182250,7 @@ self: { mkDerivation { pname = "supplemented"; version = "0.5.1"; - sha256 = "bdffa23ee0b55e38dc72b7b3e7bb566b1dd9c0131d605fa616461cc3a8302f97"; + sha256 = "15rg62lc67262sk5yq0x2g0dj7bbasxygcxpfbf3hpmmw0za5zxx"; libraryHaskellDepends = [ base base-prelude transformers ]; testHaskellDepends = [ QuickCheck quickcheck-instances rebase tasty tasty-hunit @@ -170244,7 +182267,7 @@ self: { mkDerivation { pname = "suspend"; version = "0.2.0.0"; - sha256 = "2f4f5b64837e94859b75dd49b28cf77bc75d70d5ab4f9adacb46ada5da98f072"; + sha256 = "0wphk3dabba6rgd9lkxbsmq5vivvyy6b4jfxfndqb53yhdj5nkrg"; libraryHaskellDepends = [ base lifted-base transformers-base ]; description = "Simple package that allows for long thread suspensions"; license = stdenv.lib.licenses.bsd3; @@ -170257,7 +182280,7 @@ self: { mkDerivation { pname = "svg-builder"; version = "0.1.0.2"; - sha256 = "81490cf0c843d6d7795ba32ac6cb05acf4a92431fe7702aa634ec52d60bfee54"; + sha256 = "0m7fpxh2viafcfm04xzy64jakx5c0p5wcam3bdwxgmj3r3q0qjc1"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -170273,8 +182296,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.6"; - sha256 = "7b055b1f66fe8aeacb91bb01315275b3669ddb84b057bd28fdbed17d1e1c5732"; + version = "0.6.1"; + sha256 = "0lap0il6bfdlv3yv71xh8sczg9jmfkbx25vbw5sjcgkxamaqrxcv"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -170290,7 +182313,7 @@ self: { mkDerivation { pname = "svg2q"; version = "0.3.2"; - sha256 = "12ca1397fdcfdb6b9394513ec41b0b4a27ae61bb4b180dba7e745c4e6780702e"; + sha256 = "0bkhh1klwp3lgsx0s62bpdhsw9sa1cdw8gjijj9npnygznbi7jhj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170309,7 +182332,7 @@ self: { mkDerivation { pname = "svgcairo"; version = "0.13.1.1"; - sha256 = "cda662acf9084ef1d16da987bde2fa01c9efc87101e7179da0f566ab05c3a54f"; + sha256 = "0kx5qc2snrpml2figrq1f74fzj81zbibv1x9dp8z2kh8z6n659nd"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; @@ -170323,7 +182346,7 @@ self: { mkDerivation { pname = "svgutils"; version = "0.1"; - sha256 = "41bbc786e0b56de02d7fedb4dcb74a65c518f71a251c9fe1654d25c0028b358c"; + sha256 = "131mic1c09adcphry7153bviiib59avxrd7dgwny0vdmw23cgfs1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base xml ]; @@ -170339,7 +182362,7 @@ self: { mkDerivation { pname = "svm"; version = "1.0.0.1"; - sha256 = "5fcfb822c620da4da5d9bf7c863c14acbf595f41ddc3e031ae1048743f0dd9a5"; + sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz"; libraryHaskellDepends = [ array base ]; homepage = "http://github.com/andrewdougherty/svm"; description = "A support vector machine written in Haskell"; @@ -170351,7 +182374,7 @@ self: { mkDerivation { pname = "svm-light-utils"; version = "0.1.4"; - sha256 = "e784b3623e34d7a919d9c7d48c85e3c3fb6143a054873628efc096dd682a9f07"; + sha256 = "01wz59ldv5n0xwl3d1sll11n3yy3wf2qrm67v4cskmrl7rib7177"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; homepage = "http://github.com/bgamari/svm-light-utils"; description = "Parsers and formatters for the SVMlight input file format"; @@ -170365,7 +182388,7 @@ self: { mkDerivation { pname = "svm-simple"; version = "0.2.7.1"; - sha256 = "6da78972596a68d34fd67a51299f8a7f1159a2e6873647ee6026ab003cad491f"; + sha256 = "07s9mly01ar6c3p4fdl7wsi5j4bziagjjlbssr7x6s3ab5r8k9vd"; libraryHaskellDepends = [ base binary bindings-svm bytestring containers deepseq directory monad-par mwc-random vector @@ -170383,7 +182406,7 @@ self: { mkDerivation { pname = "svndump"; version = "0.4.5"; - sha256 = "974f585c26837e00f16c5d842002a23d956e41342ff0115c53baaa98937dca54"; + sha256 = "0m6agn9riamsadf13w1g6i0nx59xl812112xdkqh0zl34rf5hkwp"; libraryHaskellDepends = [ attoparsec base bytestring containers filepath old-locale text time ]; @@ -170403,7 +182426,7 @@ self: { mkDerivation { pname = "swagger"; version = "0.3.0"; - sha256 = "c7144fb22a0d223eb2463a896200936eab665dc01f39affc103d2ee6a38f54d0"; + sha256 = "1l2liyiycbix23yayf8zq1fndavfjc06529s8sr3w8hd5ar4y567"; libraryHaskellDepends = [ aeson base bytestring text time transformers ]; @@ -170415,20 +182438,22 @@ 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, 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.3"; - sha256 = "4d14f30ab538fc48d6b621f3082da6cf225d812f534a641babae0afebcc644ef"; + 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 - template-haskell text time transformers unordered-containers - uuid-types vector + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector ]; testHaskellDepends = [ aeson aeson-qq base base-compat bytestring containers doctest Glob @@ -170448,7 +182473,7 @@ self: { mkDerivation { pname = "swapper"; version = "0.1"; - sha256 = "d48008fa9c473dffcb6b18438216f4af019dc911ac87cf425096ef7b36332f29"; + sha256 = "0a9g6cv7pvwna11cz1xc274rs0dgyhb84hqqdg5zyga7kkx0i06l"; libraryHaskellDepends = [ base binary bytestring deepseq happstack-data happstack-state parallel @@ -170468,7 +182493,7 @@ self: { mkDerivation { pname = "swearjure"; version = "1.0.0"; - sha256 = "380abd5c62873cd1affe39ffa03d480c940e1b8fd6ec3d8fce664fbed4c07d3c"; + sha256 = "0g3xq3abwkv6rs7kvv6niwdhx50c90ys1zrrzspx2g47c9fbs2iq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170486,7 +182511,7 @@ self: { mkDerivation { pname = "swf"; version = "1.0.1"; - sha256 = "3487d73b39d2db481daf36a91443ac94762abac8a19effee27fca4350349a5cb"; + sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl"; libraryHaskellDepends = [ base mtl pretty ]; homepage = "http://www.n-heptane.com/nhlab"; description = "A library for creating Shockwave Flash (SWF) files"; @@ -170501,7 +182526,7 @@ self: { mkDerivation { pname = "swift-lda"; version = "0.7.0.0"; - sha256 = "3851b9693448750bdaf8307bf2dff9649989a67f1c1a1294d94bc989f6915b32"; + sha256 = "0cjvj7v8kjabv6a146hwgyk8k6b4z7gz4yrhz3d0nxa86ilvjl9q"; libraryHaskellDepends = [ array base containers ghc-prim mwc-random primitive vector ]; @@ -170518,8 +182543,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.1.7"; - sha256 = "f816c8e7e6b264043ac7d6d8572e74aedbf3c455907fc6ab6d077d2f47893b80"; + version = "0.9.1.8"; + sha256 = "1jilcrb1r94kvlwwrj59y72qmvnvnwi1cbk5i5xafw5h4y5qx3s9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170546,7 +182571,7 @@ self: { mkDerivation { pname = "sws"; version = "0.3.1.2"; - sha256 = "e86be4df4f505f7f6eab69957ae3843455fbce9e13dd211ee65cff034449240c"; + sha256 = "031495207zswwqg23p8kkv7gnm9lhkipm5b9mdp7ypsh9zgy8sz8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170565,7 +182590,7 @@ self: { mkDerivation { pname = "sxml"; version = "0.1.0.0"; - sha256 = "ab37bccc87b50d14060ae65d63d0f0ee9eca73962d414f7ae1002a286dd7bd8b"; + sha256 = "12xxsxnjhah0w5x4yh9djrrwm7pfy3866pg6183183dmhz6bqdxb"; libraryHaskellDepends = [ base containers polyparse text xml-types ]; @@ -170579,7 +182604,9 @@ self: { mkDerivation { pname = "syb"; version = "0.6"; - sha256 = "a38d1f7e6a40e2c990fec85215c45063a508bf73df98a4483ec78c5025b66cdc"; + sha256 = "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3"; + revision = "1"; + editedCabalFile = "158ngdnlq9n1mil7cq2bzy4zkgx73zzms9q56wp6ll93m5mc4nlx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers HUnit mtl ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; @@ -170592,7 +182619,7 @@ self: { mkDerivation { pname = "syb"; version = "0.7"; - sha256 = "b8757dce5ab4045c49a0ae90407d575b87ee5523a7dd5dfa5c9d54fcceff42b5"; + sha256 = "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers HUnit mtl ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; @@ -170606,9 +182633,9 @@ self: { mkDerivation { pname = "syb-extras"; version = "0.3"; - sha256 = "a90b1ccb9909a42568ac5cf002a757eb40854d281b8acbb62df6b8e0e61926d0"; + sha256 = "1l1637kf1f7n5nvcp2hv516qah7baykh5w2wmil2b909k75iq2x9"; revision = "2"; - editedCabalFile = "a3be638f7ecf54a9b42e0f51cffaad6a95210a7390344e22847b1863d55913a8"; + editedCabalFile = "1a0kb7an663vhhi4wd4hfc5235bampxcyl8g5ssajm6ggs7n7gm3"; libraryHaskellDepends = [ base eq prelude-extras ]; homepage = "http://github.com/ekmett/syb-extras/"; description = "Higher order versions of the Scrap Your Boilerplate classes"; @@ -170623,7 +182650,7 @@ self: { mkDerivation { pname = "syb-with-class"; version = "0.6.1.7"; - sha256 = "5c521870d8c533dabb0483015592897e1bc2356dacd19ad7f279e41b69e66abb"; + sha256 = "1fvawrlipr3rybbrmldcdlsw46vyi695a0c30jxxlcy5v1q1hljw"; libraryHaskellDepends = [ array base bytestring containers template-haskell ]; @@ -170636,13 +182663,34 @@ self: { mkDerivation { pname = "syb-with-class-instances-text"; version = "0.0.1"; - sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e"; + sha256 = "0vnpqk89nxs0anx62mzasl9wrcscw18vwc284y067ryb086aj2hf"; libraryHaskellDepends = [ base syb-with-class text ]; description = "Scrap Your Boilerplate With Class Text instance"; license = stdenv.lib.licenses.bsd3; 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 @@ -170652,7 +182700,7 @@ self: { mkDerivation { pname = "sylvia"; version = "0.2.2"; - sha256 = "533c4c671432792d7d229fd9b9b51cceffc89e93d4ce79bfbd7308f3a6935bfa"; + sha256 = "1yjvjfkg623kpnzpkknljfgcizyf3jsvkncz49yjsy9j2iklqg2k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170675,7 +182723,7 @@ self: { mkDerivation { pname = "sym"; version = "0.12.1"; - sha256 = "3cdfd1a1234b02195bb60d4b8fde98ec0aca1c923e17c65cf60b0150f6100062"; + sha256 = "0qh023v5008byrfcc5ryj8fcl2pck3g8yjqdnrdij0jb4fhx3prw"; libraryHaskellDepends = [ base containers hashable vector ]; testHaskellDepends = [ base hashable QuickCheck ]; homepage = "https://github.com/akc/sym"; @@ -170688,8 +182736,8 @@ self: { ({ mkDerivation, base, diagrams-cairo, diagrams-lib, sym }: mkDerivation { pname = "sym-plot"; - version = "0.2.0"; - sha256 = "e292042fe408db1ca1ca3775c5df05a1dec709120b4047d42d7afb3698890605"; + version = "0.3.0"; + sha256 = "1ppq86fv5knfdcfn3pfiyg7v9k1aq47xp0b6yn8bwkfhcxxmbbhp"; libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ]; homepage = "http://github.com/akc/sym-plot"; description = "Plot permutations; an addition to the sym package"; @@ -170697,14 +182745,78 @@ 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 { pname = "symbol"; version = "0.2.4"; - sha256 = "d074a7741f6ce0f2a604e4467c1c46e1acc2b707db107b3458395e646a9b8831"; + sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h"; revision = "1"; - editedCabalFile = "452caa71d01d9f17eb4f3e9c5ae94c9210ae67af1ff5f4b6e308290980394b05"; + editedCabalFile = "01ab7600ja88wfvg9x8zmxksw44j9klmm71y9zmig7qxs1qslb25"; libraryHaskellDepends = [ base containers deepseq ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "A 'Symbol' type for fast symbol comparison"; @@ -170718,7 +182830,7 @@ self: { mkDerivation { pname = "symengine"; version = "0.1.2.0"; - sha256 = "0a59f76a924686ae84b1873c8783eb80f6e4092c90f3c971340053c1e6ca82f4"; + sha256 = "1x42rbkc2lq06iqwkwwh5h4y9xl0xf1qfg47n62ax1j6j9mgfn8a"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; testSystemDepends = [ gmp gmpxx symengine ]; @@ -170732,7 +182844,7 @@ self: { mkDerivation { pname = "symengine-hs"; version = "0.1.1.0"; - sha256 = "f4aa385e16a13007aaa369dfa771c8e3880ed00139a02fbc1d20d346a0d20156"; + sha256 = "0mh1sah4dlr03ny2z81r0780x273r1qsgpv9lfm0fc512rg3iapl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -170751,7 +182863,7 @@ self: { mkDerivation { pname = "symon"; version = "0.1"; - sha256 = "aa3698b65c9e043cdb0004ffa9971660575c7d531137a7b952fdce4a053e3b06"; + sha256 = "01iv7q2lmkpxaawsfdqiadymqmv02sbskzq403dkq14ybjv9hdma"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170767,7 +182879,7 @@ self: { mkDerivation { pname = "sync"; version = "0.1"; - sha256 = "932a9ffc30663f48f9a1fc068c4de6c61b0c7f337e8a7e789151d61f776c8281"; + sha256 = "10c2divizmjij5w7x2ky6dzhq6y6wr6qq1pwl7wlhgv663y9yalk"; libraryHaskellDepends = [ base stm ]; description = "A fast implementation of synchronous channels with a CML-like API"; license = stdenv.lib.licenses.bsd3; @@ -170783,7 +182895,7 @@ self: { mkDerivation { pname = "sync-mht"; version = "0.3.8.5"; - sha256 = "146c2e789845bbc58c4baf9f4c6e4e9b0908b5518311b321543dd481f90efdaa"; + sha256 = "1apx1vwq3m1xahhv64c3a6shh2cv9rp4r7xg9f6cbfs5k1w2wv0l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170818,7 +182930,7 @@ self: { mkDerivation { pname = "synchronous-channels"; version = "0.2"; - sha256 = "6b3716eec9955a6da08354be583e5cdb921347ede69e3d4a890dd7010796f777"; + sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb"; libraryHaskellDepends = [ base ]; description = "Synchronous communication channels"; license = stdenv.lib.licenses.bsd3; @@ -170835,7 +182947,7 @@ self: { mkDerivation { pname = "syncthing-hs"; version = "0.3.0.0"; - sha256 = "19092366152c052b29e1de7acdd6b6494dbbca7efdebac996431d6e172635655"; + sha256 = "0mancdrf3miicjcsrszxgv5bnka9nvbcsynyw4ljn19c2mk2628r"; libraryHaskellDepends = [ aeson base bytestring connection containers either exceptions http-client http-client-tls lens regex-posix text time @@ -170860,7 +182972,7 @@ self: { mkDerivation { pname = "synt"; version = "0.1.2"; - sha256 = "bb6c62669e1b2c83854989809375fb99761bf06262428e341195ed80168da989"; + sha256 = "12d9ilb81vcm24s8whk2cbq1nxlrzdsr7049962q6b0vkrk64v5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170887,7 +182999,7 @@ self: { mkDerivation { pname = "syntactic"; version = "3.6.3"; - sha256 = "93b6c366dcd4a0a09005ffc27ff3d62a9ee070308b6300c415fe8301c8f4f3f0"; + sha256 = "1w7kyk4030zy2p200qwb61qf17iasvrpzhpz0n8a186lvikc7dlk"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -170908,7 +183020,7 @@ self: { mkDerivation { pname = "syntactical"; version = "0.1"; - sha256 = "fc8d770e1afc1090841ac5e27f36412fd2d6e4b8eb2188848295d456b3aa16eb"; + sha256 = "1sqnmarmdm4mha28h8gbp3jddlig84v7zqn53a29047w3877g3gw"; libraryHaskellDepends = [ base ]; description = "Distfix expression parsing library"; license = stdenv.lib.licenses.bsd3; @@ -170921,9 +183033,9 @@ self: { mkDerivation { pname = "syntax"; version = "1.0.0.0"; - sha256 = "fd548debb4f442bc23f24389c0d2d89f72fbe5fed061a62c94eed21fdcfa0bb6"; + sha256 = "1dhbzbf1zlpfjhnacqfhzvjznwlzv39c12a3y8ivqhplnkmqsm7x"; revision = "2"; - editedCabalFile = "3959bcb0cea2f2e1d1bf643306962551f6888b0db888beb632477c7929e6966d"; + editedCabalFile = "0vcnwqlpjz276avbx25q1n5qixji4nb0ccv4pz8y3wm2rsqbqn9r"; libraryHaskellDepends = [ base lens mono-traversable scientific semi-iso text vector ]; @@ -170939,7 +183051,7 @@ self: { mkDerivation { pname = "syntax-attoparsec"; version = "1.0.0.0"; - sha256 = "111239aded792af5e2a29e11e028645e862cda4f3985ef135cc7247dd89ff1f9"; + sha256 = "1ygikzc7s967bh9yz19r9zd2r1jychlf04cylbigaakrxnnkj4hi"; libraryHaskellDepends = [ attoparsec base bytestring scientific semi-iso syntax text vector ]; @@ -170955,7 +183067,7 @@ self: { mkDerivation { pname = "syntax-example"; version = "1.0.0.0"; - sha256 = "59d213b6b2d2e1642ddbc3e87915145c8b720f4706937a234b213f46ed55eeeb"; + sha256 = "1szfapnlcgr19cipm4q68w7p52sw2hapks63vcnn9qfjnav17ljr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170974,7 +183086,7 @@ self: { mkDerivation { pname = "syntax-example-json"; version = "1.0.0.0"; - sha256 = "35f206946d69149e36b55d931fff0bf48e9d42bda1113a9fc8b2cc7c9217fbad"; + sha256 = "1bgv2y97rk5jr2gkl4d1pm19v3pl1gziz4sxnlv9w539dna0dwim"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170992,7 +183104,7 @@ self: { mkDerivation { pname = "syntax-pretty"; version = "0.2.0.0"; - sha256 = "aefe3304aed29b756de90d43c4771eff7f156b4e1f16c063b37251945203dbb7"; + sha256 = "1dyv0d998lbjndiw05hz9rmiazzz3rvw8hqdx5npb6yjmq237zmf"; libraryHaskellDepends = [ base pretty scientific semi-iso syntax text ]; @@ -171008,7 +183120,7 @@ self: { mkDerivation { pname = "syntax-printer"; version = "1.0.0.0"; - sha256 = "1f2f6dbe63402927a63054fe5cbd6950f883c85916112ad195353f9c649f2f14"; + sha256 = "051gkxj9qgrmjp8jl48nb7487y2hd6ymrzjl62k2faa0cfz6sbqz"; libraryHaskellDepends = [ base bifunctors bytestring scientific semi-iso semigroupoids syntax text vector @@ -171025,7 +183137,7 @@ self: { mkDerivation { pname = "syntax-trees"; version = "0.1.2"; - sha256 = "4ba73b48fc3c37fb25f1e6377346816c18ee72534701da10371bb54171548fa6"; + sha256 = "19lgaiql3d8v6w8dl0a7adrfw63ch5376dz6y4jzndrwzi43p9sb"; libraryHaskellDepends = [ base haskell-src-exts hint mtl template-haskell uniplate ]; @@ -171041,7 +183153,7 @@ self: { mkDerivation { pname = "syntax-trees-fork-bairyn"; version = "0.1.2.5"; - sha256 = "e6e1ed2c006d70f57fce70ff03bda431a9c5ba8c866803b3eff016fa494593d8"; + sha256 = "1n4k8m4zl5phxyrh6s46ijxcba9iljyh7zvhrrzzaw3d00nfvqg6"; libraryHaskellDepends = [ base haskell-src-exts hint mtl template-haskell uniplate ]; @@ -171059,7 +183171,7 @@ self: { mkDerivation { pname = "synthesizer"; version = "0.2.0.1"; - sha256 = "6dfc0790c370fe8743052ee4ead7eb341d8ac44b126cc7911241a01e0c38b9d8"; + sha256 = "1n5r7061x8212a8wfv0j9g28l79lxgbymr1f0m1qgzkhqf80gz3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171082,7 +183194,7 @@ self: { mkDerivation { pname = "synthesizer-alsa"; version = "0.5.0.5"; - sha256 = "aa9ac69ac0f0e1728b635cd06a1753d67a877ecfb24e6d51cbab15660f13ce26"; + sha256 = "09nf2c7nc5dbrd8nskmjrxz8fynnacbnml2wcf5p5qghq2dcd6ma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171107,8 +183219,8 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.0.2"; - sha256 = "1ad216fe5cd2f22223349d584bd32be44bb12f76fcfa13e5198fc2e3108ee54f"; + version = "0.8.1"; + sha256 = "1lhsg33xw1xb3smhr67gxdl6ap1azshyxqvy0p288p9i70hxqa79"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -171138,7 +183250,7 @@ self: { mkDerivation { pname = "synthesizer-dimensional"; version = "0.8.0.2"; - sha256 = "d687c5907132d106952e033618ab7256885aa03bc462840c68131fbd4ec1a19d"; + sha256 = "17d1q57bs7qkd0688qn47fh5m22nfamihdh35sahdl9jf68cb1yn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171159,7 +183271,7 @@ self: { mkDerivation { pname = "synthesizer-filter"; version = "0.4.1"; - sha256 = "da0896ae06052c4cbf9964816425ba82962e8f589f9a30ec4e66164941597ebd"; + sha256 = "1gbyb50lj5k69vn316lzb27jx5l2p8jn90b4k6zlqb050sp9c26s"; libraryHaskellDepends = [ base containers numeric-prelude numeric-quest synthesizer-core transformers utility-ht @@ -171177,7 +183289,7 @@ self: { mkDerivation { pname = "synthesizer-inference"; version = "0.2"; - sha256 = "2ba794a3c1331a8f5c6e7927c6a4f06ea389d1692d1bac4cdf14e63d4e6b501e"; + sha256 = "07jhdd73vrhlvx6aq6rdd78qk8vfy2jcc9vrdrf8y6ikq6ir99rb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171200,7 +183312,7 @@ self: { mkDerivation { pname = "synthesizer-llvm"; version = "0.8.1.2"; - sha256 = "29fe7aacb673c44726a7aefa627759e4545cee369c09f1197784b1b8a2aa74e6"; + sha256 = "1rklmaibicc4fwcz22cw6vp5qm74b5vn5ymflwk4gi3knsn7mzi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171229,7 +183341,7 @@ self: { mkDerivation { pname = "synthesizer-midi"; version = "0.6.0.4"; - sha256 = "607da1d5dd809228f89a73fc7caa26f5f7b7c41da0c8fa928848610835c47ff5"; + sha256 = "1xbzqhshhqa8i29gmj503p2bgxzm4sm7rz3kkbw2i4l0vpas2zb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171253,7 +183365,7 @@ self: { mkDerivation { pname = "sys-auth-smbclient"; version = "2.0.0.0"; - sha256 = "675571e74e9250d6331691b26fd5a7ecb375abaa29a70b36a8a859dd91d64102"; + sha256 = "00j1ss8xsnd8m0v0p9r9mampbczclzanzcli2qrxcl4j9vkp2mb7"; libraryHaskellDepends = [ base process text ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/kkazuo/sys-auth-smbclient"; @@ -171268,8 +183380,8 @@ self: { }: mkDerivation { pname = "sys-process"; - version = "0.1.6"; - sha256 = "7838161f0acc22acdfcce3282e68be586c8833ec7c96e424471d07c3e6aac611"; + version = "0.2.0"; + sha256 = "1djl5d9865w55zxlbmfp3xkzjk3744hz32iz06q8jjw9ifpj3209"; libraryHaskellDepends = [ base bifunctors directory filepath lens mtl notzero process semigroupoids semigroups transformers @@ -171283,12 +183395,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sysinfo" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations }: + mkDerivation { + pname = "sysinfo"; + version = "0.1.1"; + sha256 = "0afa9nv1sf1c4w2d9ysm0ass4a48na1mb3x9ri3nb5c6s7r41ns6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-expectations ]; + homepage = "https://github.com/psibi/sysinfo#readme"; + description = "Haskell Interface for getting overall system statistics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "system-argv0" = callPackage ({ mkDerivation, base, bytestring, system-filepath, text }: mkDerivation { pname = "system-argv0"; version = "0.1.1"; - sha256 = "6d51da9d2157be14a83f8dca3e9d4196d420e667cd685effb8d7b39185cf4ec6"; + sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd"; libraryHaskellDepends = [ base bytestring system-filepath text ]; homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "Get argv[0] as a FilePath"; @@ -171302,7 +183427,7 @@ self: { mkDerivation { pname = "system-canonicalpath"; version = "0.3.2.0"; - sha256 = "5ec27fcfe64750e9bd5bbd8e2b211c2a282fcfd8c2bd99c77dadd3d78f2c350c"; + sha256 = "031m5j7xglxdgp3rkgf2v37jya1a3hhjp3mxbfyyjl27wv7pzhjy"; libraryHaskellDepends = [ base basic-prelude directory system-filepath text ]; @@ -171320,7 +183445,7 @@ self: { mkDerivation { pname = "system-command"; version = "0.0.10"; - sha256 = "628558ab2af64fc3db4d4d86057e9ea10aaf2f50875d4204c1fbf652bbc98e86"; + sha256 = "11lfr6xm5xpvq4244pc7a0psy2m1krz0b1jd9pdw6kzn5ammi1b2"; libraryHaskellDepends = [ base directory filepath process transformers ]; @@ -171339,7 +183464,7 @@ self: { mkDerivation { pname = "system-fileio"; version = "0.3.16.3"; - sha256 = "3175707cb322c65760fa2eb2ab17327f251c8294ad688efc6258e82328830491"; + sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i"; libraryHaskellDepends = [ base bytestring system-filepath text time unix ]; @@ -171359,7 +183484,7 @@ self: { mkDerivation { pname = "system-filepath"; version = "0.4.13.4"; - sha256 = "345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb"; + sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text @@ -171374,7 +183499,7 @@ self: { mkDerivation { pname = "system-gpio"; version = "0.0.2"; - sha256 = "24feb0b7cebd4fb7c0b943d69f4de3682084542e96f40073a24eef6ed244e1c4"; + sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4"; libraryHaskellDepends = [ array base ghc-prim ]; homepage = "https://github.com/luzhuomi/system-gpio/"; description = "GPIO wrapper libary for Raspberry Pi"; @@ -171382,16 +183507,17 @@ self: { }) {}; "system-info" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, process, regex }: mkDerivation { pname = "system-info"; - version = "0.1.0.5"; - sha256 = "aa1e2fec0ceb10b8916422d2e4421e6a6167a283344c7fd2c0fba5fec86f2c45"; - libraryHaskellDepends = [ base ]; + version = "0.1.0.7"; + sha256 = "0nj490pjlzvsjnxpfkg63x7makhh0y6difqm9iysrqf37qnir5zx"; + libraryHaskellDepends = [ base process regex ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; description = "Get information about CPUs, memory, etc"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-inotify" = callPackage @@ -171399,7 +183525,7 @@ self: { mkDerivation { pname = "system-inotify"; version = "0.1"; - sha256 = "8f92bd8a30ba57a2a7fe125046eaab34712217ac21d95d9635f7b8bdd926bc59"; + sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://darcs.imperialviolet.org/system-inotify"; description = "Binding to Linux's inotify interface"; @@ -171413,7 +183539,7 @@ self: { mkDerivation { pname = "system-lifted"; version = "0.2.0.1"; - sha256 = "dc45bc3f2948cc5acc48198bf61dde27ee83844f36dd69c031ad1d8348f047b0"; + sha256 = "1c27y14867dd6706kp9n9y287vi7vqfzd2qr9365mk2854zvqifw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171430,15 +183556,30 @@ 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, base, hspec, megaparsec, process, time }: + ({ mkDerivation, attoparsec, base, hspec, process, text, time }: mkDerivation { pname = "system-locale"; - version = "0.1.0.0"; - sha256 = "0df7815525b55d875e8c0393f22c3595655a90a0701b5208799f97e653686fab"; - revision = "1"; - editedCabalFile = "3681691c486cb637328329037f5ccb6bc266310cc4db7bb04072a7084328cfa4"; - libraryHaskellDepends = [ base megaparsec process time ]; + version = "0.2.0.0"; + sha256 = "1mvzcnqybdv30xrpfp87l61kcdss2wgqsbgpdl2gl9nz62hyd5z5"; + libraryHaskellDepends = [ attoparsec base process text time ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/cocreature/system-locale"; description = "Get system locales"; @@ -171451,7 +183592,7 @@ self: { mkDerivation { pname = "system-posix-redirect"; version = "1.1.0.1"; - sha256 = "53535011e64c1792052987bc1e8799222286c30c349dd36d3fc08c8612fa6ef2"; + sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk"; libraryHaskellDepends = [ base bytestring unix ]; description = "A toy module to temporarily redirect a program's stdout"; license = stdenv.lib.licenses.bsd3; @@ -171466,7 +183607,7 @@ self: { mkDerivation { pname = "system-random-effect"; version = "0.4.1.3"; - sha256 = "ab36b9b3f622b37a2ce0c9698e125417264040538f5e1201cc6b9c7095f4dfbd"; + sha256 = "1gfzyjap173brh0i4plgad0409hpah98wsf9w0n7mcr2ysrvjdmb"; libraryHaskellDepends = [ base bytestring crypto-api extensible-effects mersenne-random-pure64 primitive statistics vector @@ -171492,7 +183633,7 @@ self: { mkDerivation { pname = "system-test"; version = "0.1.2"; - sha256 = "02b14ebb4d0291f658f52ea3117ef47b6025859cadd7593eff1b5d37833b0641"; + sha256 = "0h867f1kfp8vzwz5kmxdkj2jaq3vyiz138rfymcgd4829nxlxc82"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171510,7 +183651,7 @@ self: { mkDerivation { pname = "system-time-monotonic"; version = "0.2"; - sha256 = "7b30d8786bd825434313a9888c1cfaf1902fb50df881d92a57cb896e20ccaf38"; + sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v"; libraryHaskellDepends = [ base time ]; homepage = "https://github.com/joeyadams/haskell-system-time-monotonic"; description = "Simple library for using the system's monotonic clock"; @@ -171525,7 +183666,7 @@ self: { mkDerivation { pname = "system-util"; version = "0.2"; - sha256 = "137feedb2af1e105afbc7380aa4464af7210da0e7adff70ba1b6c66149d54f6a"; + sha256 = "0sjgsm4n3imnl45zgpvs1vd10wmgci2am03kpjphbqgi5bdywzqk"; libraryHaskellDepends = [ base directory either filepath semigroups system-lifted template-haskell transformers unix @@ -171547,7 +183688,7 @@ self: { mkDerivation { pname = "system-uuid"; version = "2.1.1"; - sha256 = "8b911863eab0109f0030282af3b94fa233988de78ef2050bd30ebbfeb02a8089"; + sha256 = "12c05aqgxfqfsc5hbwlfwy6rhcx29ywz6ai86009y45hx9iii4cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171566,7 +183707,7 @@ self: { mkDerivation { pname = "systemd"; version = "1.1.2"; - sha256 = "59461920b66b4b63b055b08af464a6fd9ff529f64527dfb573f9396dadd39287"; + sha256 = "11wjsfnnsfgrffsxy9s5yqlzb7zxlrjg92mhanq66jvbnqh1jijr"; libraryHaskellDepends = [ base bytestring network transformers unix ]; @@ -171583,7 +183724,7 @@ self: { mkDerivation { pname = "systemstats"; version = "0.1.0.0"; - sha256 = "3f1ec1995f4570dad3cc22dd062655b3a672bbddf6577f21172fe2eb46c48f14"; + sha256 = "054gqi3fpqig2whpymznvnxp59mkalk0dp92rk9xlw25bycw27iz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171601,7 +183742,7 @@ self: { mkDerivation { pname = "syz"; version = "0.2.0.0"; - sha256 = "3e85801a83fa2a7e57093a7d0aa52f21cba07a0bd6d1ba82d2ddfb335249a3d4"; + sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y"; libraryHaskellDepends = [ base syb ]; homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/"; description = "Scrap Your Zippers"; @@ -171616,7 +183757,7 @@ self: { mkDerivation { pname = "t-regex"; version = "0.1.0.0"; - sha256 = "b4db068482f7ca6a5085864aea83f716205c9b6d3c0331306b9bd1c744da3a3c"; + sha256 = "0g1sv92cglcvdcq320rwdndmq80nyy1yljl6hm86mjppha20dnxl"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta lens mtl QuickCheck recursion-schemes template-haskell transformers @@ -171631,7 +183772,7 @@ self: { mkDerivation { pname = "t3-client"; version = "0.2.0.0"; - sha256 = "534df19484e22696110cf90cb370d566a19b729dfd96e11ee9c7f3cf3c9bd1de"; + sha256 = "1pnikcyczwy7x4gf35pxkmr9p8b6smqb637r1h8rc9p2hjag2kak"; libraryHaskellDepends = [ base t3-game t3-server ]; homepage = "http://github.com/jxv/t3#readme"; description = "tic-tac-toe Rexports for client"; @@ -171646,7 +183787,7 @@ self: { mkDerivation { pname = "t3-game"; version = "2.0.0"; - sha256 = "ca57dbb1004d6ca6e00cb1847d91e5ee7c9e8271a4ac271945369444eded68b0"; + sha256 = "1c38xpnl951n8lcjgb54f619wz7fwn8pv15i1khacv2d02qxnmya"; libraryHaskellDepends = [ aeson base bytestring containers mtl safe text vector ]; @@ -171665,7 +183806,7 @@ self: { mkDerivation { pname = "t3-server"; version = "0.2.0"; - sha256 = "9c1301904e58f18dee1af954ce19215b08231ad894779f88d368b226af5f7788"; + sha256 = "123pbypjdck8sf49yxwlv0d2622v44cwwm7r3bp8vwaq9s8024ww"; libraryHaskellDepends = [ aeson async base bytestring case-insensitive containers dejafu either hashable hashmap MonadRandom mtl random safe stm t3-game @@ -171683,7 +183824,7 @@ self: { mkDerivation { pname = "ta"; version = "0.1"; - sha256 = "bd43f3ff250afa8beb49fc018ee24025450dea38f7fde2ad7d80e5de1e192dc5"; + sha256 = "1i9d34gdxrc0gnny5zgp73m0si9583i8w0gw97mqpyha4pzz6hxx"; libraryHaskellDepends = [ base containers ghc-prim mtl Takusen template-haskell time ]; @@ -171698,7 +183839,7 @@ self: { mkDerivation { pname = "tabl"; version = "1.0.3"; - sha256 = "4ed4b152c4c2ec8eebc8ec1e4dae6d7dd99b1b15148ea5b43be32ed9c333b0df"; + sha256 = "1pxh6g1xjbp37fsab3hl2ldrpnbxdnp4s7pcr3mqxv62qi9b3m2f"; libraryHaskellDepends = [ base safe text ]; homepage = "https://github.com/lovasko/tabl"; description = "Table layout"; @@ -171710,7 +183851,7 @@ self: { mkDerivation { pname = "table"; version = "0.1.0.0"; - sha256 = "fc944368d2d19568355348f93eb0b957a6bfac689e33d92792257e5a774411ab"; + sha256 = "1aqi8ivmlzi5j8kxjcwyd2nbz9jpp6q3xya8acsni5fis9l4757w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171728,8 +183869,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.7.0.0"; - sha256 = "6f84aff983689619e1733858c3e4c0c89befc6777ea3c50c73642dc9428e6908"; + version = "0.8.0.0"; + sha256 = "0lr2jddm4qsfhl77sx837vva1rpnaf9a45a8wfc57xqrspapjhlz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171753,7 +183894,7 @@ self: { mkDerivation { pname = "table-tennis"; version = "0.1.0.3"; - sha256 = "339411608776228a77ac13218342d6bdc0fc804a89cc2eab26f55dbd9623afec"; + sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k"; libraryHaskellDepends = [ base ]; description = "A table tennis game tracking engine"; license = stdenv.lib.licenses.mit; @@ -171767,7 +183908,7 @@ self: { mkDerivation { pname = "tableaux"; version = "0.2"; - sha256 = "0b5d292c51d18f819b15f4406532e589276faa5ad54e83c47212774e65c38135"; + sha256 = "0dc1qdjlwxqjfb286knmbam6y9w9wlr6ah7l2ndq33yia4n2jp8b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171786,7 +183927,7 @@ self: { mkDerivation { pname = "tables"; version = "0.4.1.1"; - sha256 = "97184b4fb10c09e552325f4f5b9945ada56a206b5223f9417cd402bb400c65af"; + sha256 = "1bv51i0bn0nlgi0zj8sjdch6m9dd8ncmnksz699fa28cn57ln64p"; libraryHaskellDepends = [ base binary cereal comonad containers deepseq hashable lens profunctors safecopy template-haskell transformers @@ -171811,7 +183952,7 @@ self: { mkDerivation { pname = "tablestorage"; version = "0.2.1.0"; - sha256 = "287b11625780364ff5c0b8425b01672d6cbfd7575c8b73f88c3cc5823066480e"; + sha256 = "03j8cqq85i9wikw772swazbvyv1dcw0mnhmqq3slydl0axi12yr8"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit crypto-api cryptohash HTTP http-conduit http-types mtl network old-locale resourcet SHA @@ -171830,7 +183971,7 @@ self: { mkDerivation { pname = "tablize"; version = "1.0.0"; - sha256 = "8af235a39b9047f220e18c2987ee54c08f45e255fcfc13f8bac9ff2a744ba797"; + sha256 = "15x79ds2mzy9pbw17z7wapi4b3y0akp8faccw4hg4iwhkfikbwla"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171849,7 +183990,7 @@ self: { mkDerivation { pname = "tabloid"; version = "0.47"; - sha256 = "0352d6c575e2bd8ddb1d03e79d00d50e3542f389f730b70d4c4c3cf34af08ae1"; + sha256 = "1qcay15g6g2c9h6vfc7pi7rl4d8fsl09vrq33pdqvgg2fp2xclh3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171866,7 +184007,7 @@ self: { mkDerivation { pname = "tabular"; version = "0.2.2.7"; - sha256 = "13f8da12108dafcf3194eb6bf25febf0081c7e4734f66d2d4aeee899f3c14ffb"; + sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k"; libraryHaskellDepends = [ base csv html mtl ]; homepage = "http://hub.darcs.net/kowey/tabular"; description = "Two-dimensional data tables with rendering functions"; @@ -171884,7 +184025,7 @@ self: { mkDerivation { pname = "taffybar"; version = "0.4.6"; - sha256 = "620918469d79d33067808114bdf8d4d6f5a5ae6d77ff672a37ea04ecc5e0caf5"; + sha256 = "1xfaw32yq17a6wm6gzvpdnpabxfnskwbs541h1kk1lvrkm31h2b2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171909,7 +184050,7 @@ self: { mkDerivation { pname = "tag-bits"; version = "0.1.1.2"; - sha256 = "c5c456b2917183bc0f32f329c152c2332198aadcf3825fca1afa24d8c60b3633"; + sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://github.com/ekmett/tag-bits"; description = "Provides access to the dynamic pointer tagging bits used by GHC"; @@ -171924,7 +184065,7 @@ self: { mkDerivation { pname = "tag-stream"; version = "0.2.1"; - sha256 = "b6ce1b1cf1ea2bd44426df51e0816feec22d872a1ba52021787ff8c1c3f51398"; + sha256 = "160kyp1w3y3zg0hj198v5a3jvhpfdy0y0lfz4r2d8azay4f1pkmn"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring enumerator ]; @@ -171935,17 +184076,18 @@ self: { "tagchup" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor - , explicit-exception, old-time, transformers, utility-ht, xml-basic + , explicit-exception, non-empty, old-time, transformers, utility-ht + , xml-basic }: mkDerivation { pname = "tagchup"; - version = "0.4.0.5"; - sha256 = "c0c12eeec562a7769deb165c7edae8a8dbc0087d5788655b72864df122a0fa35"; + version = "0.4.1"; + sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-accessor explicit-exception - transformers utility-ht xml-basic + non-empty transformers utility-ht xml-basic ]; testHaskellDepends = [ base xml-basic ]; benchmarkHaskellDepends = [ @@ -171964,9 +184106,9 @@ self: { mkDerivation { pname = "tagged"; version = "0.8.5"; - sha256 = "e47c51c955ed77b0fa36897f652df990aa0a8c4eb278efaddcd604be00fc8d99"; + sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74"; revision = "1"; - editedCabalFile = "a8d7b211a0831f5acf65a36003aebab7673ffb6a874a49715e05e7b76a6cb896"; + editedCabalFile = "15mqdimbgrq5brqljjl7dbxkyrxppap06q53cp7ml7w3l08v5mx8"; libraryHaskellDepends = [ base deepseq template-haskell transformers transformers-compat ]; @@ -171980,7 +184122,7 @@ self: { mkDerivation { pname = "tagged-binary"; version = "0.2.0.0"; - sha256 = "35e30f2f9183a9890557be7a28e4f88b19c68b0cfd688e906d8491f72b247745"; + sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm"; libraryHaskellDepends = [ base binary bytestring pureMD5 ]; description = "Provides tools for serializing data tagged with type information"; license = stdenv.lib.licenses.mit; @@ -171991,7 +184133,7 @@ self: { mkDerivation { pname = "tagged-exception-core"; version = "2.2.0.0"; - sha256 = "b8e9ecabbf75c1733d0056a68349020d6104db6007cb466fa79e570464bd40c2"; + sha256 = "1hj0pmj08mwylxpldjq7c3dh8q8d094q79jn00yp7hbmpymyrsdq"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers ]; @@ -172004,8 +184146,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "tagged-identity"; - version = "0.1.1"; - sha256 = "dcf0676dca1422165d48795ab1e4a512a6fd678aef685c85c00b5fcaba001aa8"; + version = "0.1.2"; + sha256 = "0402snxl1cpi7yq03aqkp036hjcrrqiy0if3c3bz6ljls7yxfvci"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/mrkkrp/tagged-identity"; description = "Trivial monad transformer that allows identical monad stacks have different types"; @@ -172021,7 +184163,7 @@ self: { mkDerivation { pname = "tagged-list"; version = "1.1"; - sha256 = "ba0cdf1b64f033ee24ba0b8a0f01e1ae88bf41c052338e7cfa4530685ac2b3bd"; + sha256 = "1gdkq9d6hc25z9y8wcsjq10vz25fw40hz2hbp8jfwczhchdxy35s"; libraryHaskellDepends = [ AbortT-transformers base binary natural-number type-equality type-level-natural-number type-level-natural-number-induction @@ -172037,7 +184179,7 @@ self: { mkDerivation { pname = "tagged-th"; version = "0.1"; - sha256 = "c9e830a0382ffb591ebc0ef068cdc48de7e2ab35ce7ab4f3c0a2cffc8bd51ee3"; + sha256 = "1qqysn5zrkx2q3rv8ynf6nmy5rwdqk6niw0fphg5kyrg72h31s69"; libraryHaskellDepends = [ base tagged template-haskell type-spine ]; @@ -172051,7 +184193,7 @@ self: { mkDerivation { pname = "tagged-timers"; version = "0.1.0.0"; - sha256 = "0156e746aee65704b630dc32617db4d756fb8abd680633e495a4fa38674dda77"; + sha256 = "0xys9mkkiym4jpj361k8pn5gnmnpniyn2cnw62v08mz6mr3ffmh1"; libraryHaskellDepends = [ base time transformers unordered-containers ]; @@ -172068,9 +184210,9 @@ self: { mkDerivation { pname = "tagged-transformer"; version = "0.8"; - sha256 = "c7fef845dfdec30c520d8c2e827c61850a8922ca086cadf17803aec77e765f8e"; + sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7"; revision = "1"; - editedCabalFile = "8fe26562f4cde452d9db30a1bb466be684a82ee3fb43ed7632ecb732b0d8011a"; + editedCabalFile = "06h1v2q35dzc69vfshzvwcpai176dd3bp89hvgcm5r6dyii6bqlg"; libraryHaskellDepends = [ base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged @@ -172085,7 +184227,7 @@ self: { mkDerivation { pname = "tagging"; version = "0.1"; - sha256 = "23f9cfbecd3dd24b93b3acbfb3479a2daace70543245418946432526ee625404"; + sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93"; libraryHaskellDepends = [ base bytestring pcre-light ]; homepage = "git://github.com/jre2/HaskellTagging.git"; description = "Library for tagging data"; @@ -172100,9 +184242,9 @@ self: { mkDerivation { pname = "taggy"; version = "0.2.0"; - sha256 = "c36b0bebb1e384afe9a11760183bc15a665fb2b352a5035d545321351c630207"; + sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3"; revision = "1"; - editedCabalFile = "0343ad030ba4e9fd651b383e92c213c6c4a6560ec33f561cfcfa9c5493deb50b"; + editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172129,7 +184271,7 @@ self: { mkDerivation { pname = "taggy-lens"; version = "0.1.2"; - sha256 = "2bce7b9a008819f4a6ef5224136e0573bb0f2170b80d6bfe079efc0c7062a216"; + sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib"; libraryHaskellDepends = [ base lens taggy text unordered-containers ]; @@ -172146,7 +184288,7 @@ self: { mkDerivation { pname = "taglib"; version = "0.1.1"; - sha256 = "d77d93790ebf3718ba18b742c754498a8e562481006c2113064ba99e91771e9b"; + sha256 = "16qyfy8rxaab0q9j2v00h4j5d3la95acfhmp32x1hdxz1rwr6zfp"; libraryHaskellDepends = [ base bytestring utf8-string ]; librarySystemDepends = [ taglib ]; libraryPkgconfigDepends = [ taglib ]; @@ -172161,7 +184303,7 @@ self: { mkDerivation { pname = "taglib-api"; version = "0.1.1.3"; - sha256 = "b242f6f3d1b97fe6012d46b9041a61b456aab0525194edde5c2f4a8f44e40baa"; + sha256 = "1ahbwi28yjigbkgfv52iaaqalmmlc4d09fa65l0yczxrs7rzchmj"; libraryHaskellDepends = [ base bytestring containers mtl text transformers ]; @@ -172178,7 +184320,7 @@ self: { mkDerivation { pname = "tagset-positional"; version = "0.3.0"; - sha256 = "aef99f8efbe755694474513f19ec346a261c0f071278a8ff12414dc829e73574"; + sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf"; libraryHaskellDepends = [ base binary containers parsec text text-binary ]; @@ -172193,7 +184335,7 @@ self: { mkDerivation { pname = "tagshare"; version = "0.0"; - sha256 = "d2314bae2e6820700f2a61db9c9f7976e1b53547a49cdd3352bdf29ac3856ce0"; + sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj"; libraryHaskellDepends = [ base containers mtl ]; description = "TagShare - explicit sharing with tags"; license = stdenv.lib.licenses.bsd3; @@ -172204,7 +184346,7 @@ self: { mkDerivation { pname = "tagsoup"; version = "0.14.1"; - sha256 = "028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb"; + sha256 = "1ssaqvwjjaqv30z44jm6z3xjpbvjxb57217rk67r3q34m1hfd2q2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text ]; @@ -172221,7 +184363,7 @@ self: { mkDerivation { pname = "tagsoup-ht"; version = "0.3"; - sha256 = "75222a751f384bce22ef6c6794d76acf518a94df8b3d497ab71463af2a0dabfb"; + sha256 = "1yxb1lmayqqlnxx4jgcbvya8llfgdbbr8rvcxwicwjrq3xsjl8km"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172245,7 +184387,7 @@ self: { mkDerivation { pname = "tagsoup-megaparsec"; version = "0.2.0.0"; - sha256 = "c4fc2300deb6bfd2f4b2aff925206794a7698b829b1ce46402db05be061550a3"; + sha256 = "18sh2l3bw1fv09jf874vha5nk9wlcwh2bydgnbsd5gxnvq027z64"; libraryHaskellDepends = [ base containers megaparsec tagsoup ]; testHaskellDepends = [ base hspec megaparsec raw-strings-qq tagsoup @@ -172260,7 +184402,7 @@ self: { mkDerivation { pname = "tagsoup-parsec"; version = "0.0.8"; - sha256 = "f34fdbcd2fb7e13d61436f978a0deb345837c9567dffd5312f385ba4299ec240"; + sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk"; libraryHaskellDepends = [ base parsec tagsoup ]; homepage = "http://www.killersmurf.com"; description = "Tokenizes Tag, so [ Tag ] can be used as parser input"; @@ -172273,7 +184415,7 @@ self: { mkDerivation { pname = "tagsoup-selection"; version = "0.1.0.1"; - sha256 = "2d7159e2d8010b877983dbc3b106fabb19451eb00f65ed7a9bf9a3b7ca231c73"; + sha256 = "0wqw4g5bg8zrkdxfsr8gn0g4a6dvz83b3hyvhdwqf2q1v3i5jw9d"; libraryHaskellDepends = [ base containers parsec tagsoup ]; description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors"; license = stdenv.lib.licenses.bsd3; @@ -172288,7 +184430,7 @@ self: { mkDerivation { pname = "tagstream-conduit"; version = "0.5.5.3"; - sha256 = "b296e8f0ba18ae951b5bb3fc2d9d964954666df61ea9363d667f251af17134ab"; + sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring case-insensitive conduit conduit-extra data-default resourcet text transformers xml-conduit @@ -172301,6 +184443,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tai" = callPackage + ({ mkDerivation, base, clock, lens, mtl, parsers, time, trifecta + , wreq + }: + mkDerivation { + pname = "tai"; + version = "0"; + sha256 = "1kp7m9mhawi2fbdsir4kg9z6hbmlw4kmp3kjvlk4qkhvckgl3pxw"; + libraryHaskellDepends = [ + base clock lens mtl parsers time trifecta wreq + ]; + homepage = "https://oss.xkcd.com/"; + description = "Support library to enable TAI usage on systems with time kept in UTC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tai64" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, binary , bytestring, doctest, QuickCheck, text, time, vector @@ -172308,7 +184466,7 @@ self: { mkDerivation { pname = "tai64"; version = "0.2.0"; - sha256 = "5c0ff9a2c9515f31e31d6f46b6b63eaf411985b3e5dfee7cf66847a2a8c3685e"; + sha256 = "0pk8qfla4iv8yryfxpz5nf2ijhdg7svbcikg3pik2psir6igj3sw"; libraryHaskellDepends = [ attoparsec base base16-bytestring binary bytestring QuickCheck text time vector @@ -172320,21 +184478,22 @@ self: { }) {}; "tailfile-hinotify" = callPackage - ({ mkDerivation, async, base, bytestring, conceit, directory, foldl - , hinotify, pipes, process-streaming, streaming, streaming-eversion - , tasty, tasty-hunit + ({ mkDerivation, async, base, bytestring, conceit, directory + , filepath, foldl, hinotify, pipes, process-streaming, streaming + , streaming-eversion, tasty, tasty-hunit }: mkDerivation { pname = "tailfile-hinotify"; - version = "1.0.0.2"; - sha256 = "e63dab76d95842cef9b3b47c48cb0c2ee1fe0e5bb7bd73ff349a9c49a03aa43f"; + version = "1.0.0.3"; + sha256 = "0czw1ahm4zcxhyhzg6by3rfbirkhv9jlcw9yzp7q1zrxb3schbyz"; libraryHaskellDepends = [ async base bytestring foldl hinotify pipes streaming streaming-eversion ]; testHaskellDepends = [ - async base bytestring conceit directory foldl hinotify pipes - process-streaming streaming streaming-eversion tasty tasty-hunit + async base bytestring conceit directory filepath foldl hinotify + pipes process-streaming streaming streaming-eversion tasty + tasty-hunit ]; description = "Tail files in Unix, using hinotify"; license = stdenv.lib.licenses.mit; @@ -172348,7 +184507,7 @@ self: { mkDerivation { pname = "tak"; version = "0.1.0.0"; - sha256 = "39253006641e6057105c42097701df1173f01302757b2d8f4980612c97397dd9"; + sha256 = "1nbx76bjqqc0967jsyvm089z0wqivw0pf2a2bh85fq0ych33099r"; libraryHaskellDepends = [ base bytestring hashable hslogger matrix network parsec random-shuffle safe @@ -172368,7 +184527,7 @@ self: { mkDerivation { pname = "tak-ai"; version = "0.1.0.1"; - sha256 = "66fcc335e1cb639dc1c5a66f71e5a272d5e5c841d88056cce55cf22ccd8364c7"; + sha256 = "1iv4hg6jrwjwwp65d06q874fbmbjlbjp2vx6qp0rsqybw4sw7z36"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random-shuffle tak ]; @@ -172385,7 +184544,7 @@ self: { mkDerivation { pname = "takahashi"; version = "0.2.2.0"; - sha256 = "fa4dc21ff737de94e2254152217737f7b6545fe8792f6272d8ac4b1fea41993a"; + sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs"; libraryHaskellDepends = [ base lens monad-skeleton mtl ]; description = "create slide for presentation"; license = stdenv.lib.licenses.mit; @@ -172396,7 +184555,7 @@ self: { mkDerivation { pname = "takusen-oracle"; version = "0.9.4.1"; - sha256 = "492159551e80b58cff2318546f3649dd1c2b08eb4ff4f94d855d713df4ec868b"; + sha256 = "12w6xks3swaxhm6zkx2gxc42n76x94v6ym0q4gzqrdc03ramj8a9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl old-time time ]; @@ -172414,7 +184573,7 @@ self: { mkDerivation { pname = "tal"; version = "0.1.0.0"; - sha256 = "365c63031df56be1f876d7ac7ccb9205008dbbefe62df0660b24494737dd5f11"; + sha256 = "04azvlvlfj941dkg0bg6xyxqs005jb5prb6pfvwf2szm3l1n6p1n"; libraryHaskellDepends = [ base containers mtl pretty transformers unbound ]; @@ -172436,7 +184595,7 @@ self: { mkDerivation { pname = "tamarin-prover"; version = "0.8.6.3"; - sha256 = "62e4133bee08a3991cfc2aad22b4f55d2a85010c356f0b25904d6bcee91e4df4"; + sha256 = "1x2d3vlwwssdj0jhnvrm1h0qaajxyns25b9azhf9k8q8xqxi7r32"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172461,7 +184620,7 @@ self: { mkDerivation { pname = "tamarin-prover-term"; version = "0.8.5.1"; - sha256 = "45a9da283c76e9a778cabe4cdc380df89f140442687e294a2fbc3b7e3224989f"; + sha256 = "17wq4hr7wfxw5x52jzk8882197zq1lwdqk5yr9wagsbn7hldmaa5"; libraryHaskellDepends = [ attoparsec base binary bytestring containers deepseq derive directory dlist HUnit mtl parsec process safe split syb @@ -172483,7 +184642,7 @@ self: { mkDerivation { pname = "tamarin-prover-theory"; version = "0.8.6.0"; - sha256 = "838a82c2a0727db7ae41be2df835093c95211efd61f97369443b3cf7730d81f5"; + sha256 = "1xc11mrzfg1v8ilp7yb1zlg2359w14szhbdy86pbfzbjl31852l3"; libraryHaskellDepends = [ array base binary bytestring cmdargs containers deepseq derive directory dlist fclabels filepath HUnit mtl parallel parsec process @@ -172504,7 +184663,7 @@ self: { mkDerivation { pname = "tamarin-prover-utils"; version = "0.8.5.1"; - sha256 = "6c4811b8477929a4684a79566ff38888e61039f2549bf9cd0348a3e50ab0f086"; + sha256 = "11phn05fb8s80g6zk6sly8wi1rl8i3rnymkr99la8abr8yw12j3c"; libraryHaskellDepends = [ base base64-bytestring binary blaze-builder bytestring containers deepseq dlist fclabels mtl parsec pretty SHA syb time transformers @@ -172520,7 +184679,7 @@ self: { mkDerivation { pname = "tamper"; version = "0.4.2.2"; - sha256 = "b4b124ab59761e3ff62bc9bf3461c94b1dee4f84b58fe3c75387b415a639fd4b"; + sha256 = "0jzx76k1bd47ag3y73xmhi7yw7abr5hk9gy95gv3y7knb6mj9cdl"; libraryHaskellDepends = [ base containers mtl safe text ]; homepage = "https://bitbucket.org/tdammers/tamper/"; description = "Blaze-style HTML templates as a Monad Transformer"; @@ -172532,7 +184691,7 @@ self: { mkDerivation { pname = "tar"; version = "0.4.1.0"; - sha256 = "7521310c34bb3b457e529a5f2037ac84f62420d6283f9ce8d22e685bd82d0715"; + sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm"; libraryHaskellDepends = [ base bytestring directory filepath old-time ]; @@ -172549,7 +184708,7 @@ self: { mkDerivation { pname = "tar"; version = "0.5.0.3"; - sha256 = "d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3"; + sha256 = "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -172569,8 +184728,8 @@ self: { ({ mkDerivation, base, bytestring, conduit-combinators }: mkDerivation { pname = "tar-conduit"; - version = "0.1.0"; - sha256 = "64cd8ea8d072b3a43e539e3c8d1f9e0936430ad9f9ff3a54d1e237c077878e2f"; + version = "0.1.1"; + sha256 = "189dy1j32c44mjr3waljcvch1hqlijnax7myp4jih7y12hji6i9r"; libraryHaskellDepends = [ base bytestring conduit-combinators ]; homepage = "https://github.com/snoyberg/tar-conduit#readme"; description = "Parse tar files using conduit for streaming"; @@ -172582,9 +184741,9 @@ self: { mkDerivation { pname = "tardis"; version = "0.4.1.0"; - sha256 = "e672abadd75055c2372d722c98058f7f3403fcca18258565d1cdd8e0dc25a5d9"; + sha256 = "1nd54pff1n6ds5jqa98qrby06d3ziw2rhb3j5lvw4mahsynsnwp6"; revision = "1"; - editedCabalFile = "7b45b8fba6db18e5fcfb22dab3de1809b88e8fda6a202a32da308507d2dde6f2"; + editedCabalFile = "1wp6vp90g19hv8r2l83ava7qxf0933gb7ni2zgyfa66vlvxvhibv"; libraryHaskellDepends = [ base mmorph mtl ]; homepage = "https://github.com/DanBurton/tardis"; description = "Bidirectional state monad transformer"; @@ -172603,7 +184762,7 @@ self: { mkDerivation { pname = "target"; version = "0.2.0.1"; - sha256 = "a6366a2eddf278e368ec6b49c7aa483433fad6d473d5bc1751c0049ccd1a98cb"; + sha256 = "1jwq3b6rq160a4bvrmbkskbglcrl92mcfjbbxilf6y7jvlp6ldm6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172638,7 +184797,7 @@ self: { mkDerivation { pname = "task"; version = "0.0.1"; - sha256 = "16ff87b18a1baa8dad135969779c370bf6cf039a102f320233b41f2634248e7c"; + sha256 = "0z4f4hs2c7xl6c134bqhk81wzxhb6yf7fsar2fnqvahviaqqgzqn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172661,7 +184820,7 @@ self: { mkDerivation { pname = "task-distribution"; version = "0.1.0.3"; - sha256 = "1d655f59987f61b4c2fd72b220187d106cda96b2b4c18a47a6d6386261afe3cf"; + sha256 = "1kz3mxhn4f6nlr3qmhdlnabdlv0hglc21ckjzp1b8qbzk1cmyr8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172695,7 +184854,7 @@ self: { mkDerivation { pname = "taskpool"; version = "0.1.0"; - sha256 = "76b0a3b39223c0ad4bd9452cf16294aa18401c201b19a9fca8473a2d10f2270b"; + sha256 = "02r7y882sfj7m3yaj68v40f4065ajiig2b25v55svh13jars7c3n"; libraryHaskellDepends = [ async base containers fgl stm transformers ]; @@ -172713,13 +184872,13 @@ self: { }: mkDerivation { pname = "tasty"; - version = "0.11.2"; - sha256 = "d26fbc4e5112af9ec3ca0a4a45d0f5edc5ae6675ffd72f922acb768062db675e"; + 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; }) {}; @@ -172731,8 +184890,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.0.4"; - sha256 = "4d91c509e0e80919d96c16eaa3ee11089b7ee7c87fbe59a947d26bf0c5aef188"; + version = "1.0.5"; + sha256 = "0djlj91bnhqq83hbm57ljwixf5zhqk94kb1kgmdh5i74rh7l8bb4"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -172742,15 +184901,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-ant-xml_1_0_5" = callPackage + "tasty-ant-xml_1_1_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.0.5"; - sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436"; + version = "1.1.0"; + sha256 = "1xnh4yyzi4m21182n1hr5lak6gkgnpp4m6ixjk19gn4fnzwarz8d"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -172768,7 +184927,7 @@ self: { mkDerivation { pname = "tasty-auto"; version = "0.1.0.2"; - sha256 = "d76076b780cce1a83b50b4602928d3756a5df72f4294e50b5f1499c5f6381a1c"; + sha256 = "070s73vcb68lbw5yb5225zvmsskmscl2jq5la0xsiqfch2vpcq6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -172790,7 +184949,7 @@ self: { mkDerivation { pname = "tasty-auto"; version = "0.2.0.0"; - sha256 = "b24e6f45aca98bc83316261d21ac5d9094aede0c5c7179c16ef2f69dfa3cf65a"; + sha256 = "0npn7kx9vxpjdv0pjwaw1kgax54hbnn227962qrwi2x9mi2nykmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -172810,19 +184969,19 @@ self: { mkDerivation { pname = "tasty-dejafu"; version = "0.3.0.2"; - sha256 = "1f1d2ebbad76c763e036871ec481f40c532334f7692dc187a94b77519dbe2f5d"; + sha256 = "0p9gpsfm2xsbm63w2bb9yws26lqcyj0w87l76vh67ivnmnxjw78z"; libraryHaskellDepends = [ base dejafu tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_0_4_0_0" = callPackage + "tasty-dejafu_0_6_0_0" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.4.0.0"; - sha256 = "b2e4f21f9ccc2777d36090f71f560fbff0c3fde3bf43d966339b3fc2bf19577e"; + version = "0.6.0.0"; + sha256 = "0qcfypb69052rdrfvssy3py2im86i71rmlv7w954y9rmbby1kl4n"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -172837,7 +184996,7 @@ self: { mkDerivation { pname = "tasty-discover"; version = "1.1.0"; - sha256 = "023568259c04b596fdd6c8030667b08d2a17f50cbc2cd514595ddd635ca8a3c5"; + sha256 = "1id3m1f67paxb4adab5w1ksifaldn1khc0y8svyrdd84khjnhd82"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172852,12 +185011,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tasty-discover_3_0_2" = callPackage + ({ mkDerivation, base, containers, directory, filepath, tasty + , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-discover"; + version = "3.0.2"; + sha256 = "1bd37d5gppi3lmc244bixv8jpzfx4m14cbqklnwmjhhqviic79h2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers directory filepath ]; + executableHaskellDepends = [ base containers directory filepath ]; + testHaskellDepends = [ + base containers directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/lwm/tasty-discover#readme"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { pname = "tasty-expected-failure"; version = "0.11.0.4"; - sha256 = "41ed5a34e250ee5dc78daf93aa02a25d751b2c6423302faf49f28986822ba564"; + sha256 = "0r555f18d2gj96pjyc13chn1nxaxl81am4xgip3mvvjhw8s5mva1"; + revision = "1"; + editedCabalFile = "07sz28vm5rllp9yj1ibhz015s6c4gcq1vzxlphhqam1ah096jc42"; libraryHaskellDepends = [ base tagged tasty ]; homepage = "http://github.com/nomeata/tasty-expected-failure"; description = "Mark tasty tests as failure expected"; @@ -172871,7 +185054,7 @@ self: { mkDerivation { pname = "tasty-fail-fast"; version = "0.0.2"; - sha256 = "28e463b3e85e356f1a0676a4accd7ecc002814dc0487323613f0c6aacc153ac6"; + sha256 = "1iis2p6amiph2cv351q4vha2h06cgv6sr93n0qd6ydayx2rn7r18"; libraryHaskellDepends = [ base containers stm tagged tasty ]; testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit tasty-tap @@ -172890,7 +185073,7 @@ self: { mkDerivation { pname = "tasty-golden"; version = "2.3.1.1"; - sha256 = "9e87fa5b29f840731c12722049563655cedb6522b5e5792c5eb596eb352c8e5d"; + sha256 = "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy"; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary @@ -172911,7 +185094,7 @@ self: { mkDerivation { pname = "tasty-groundhog-converters"; version = "0.1.0"; - sha256 = "86c5ca80f529b1b9e39a10e11dee3e2d42ddfda765637ecbc8465ebf4e6dab23"; + sha256 = "08xbdm7bypj6r35pwqv5lzyxshid7vp1vq8hkbivkc99yn0cmic6"; libraryHaskellDepends = [ aeson base bimap bytestring containers groundhog groundhog-converters groundhog-sqlite groundhog-th tasty @@ -172928,8 +185111,8 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.3.1"; - sha256 = "8ac658b530202d84e34891a6274df1e8e08495a2e5d9d75a8e53a88d2ad85444"; + version = "1.1.3.2"; + sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck random tagged tasty tasty-quickcheck tasty-smallcheck @@ -172946,7 +185129,7 @@ self: { mkDerivation { pname = "tasty-html"; version = "0.4.1.1"; - sha256 = "0eea1c9fcf1ef3aeb94b811086e11d87ce59f90bb91afa8765152b943c591f1a"; + sha256 = "06hzb4y98aqmcn3zl6mr1gwmkkl73phqc4419fwsxwqyrygirshf"; libraryHaskellDepends = [ base blaze-html bytestring containers filepath generic-deriving mtl stm tagged tasty text transformers @@ -172961,7 +185144,7 @@ self: { mkDerivation { pname = "tasty-hunit"; version = "0.9.2"; - sha256 = "ae1efc2a750dfc09f9276d3a57e6a8f8b30f1a6932e81c53fcd67132b8ea1623"; + sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf"; libraryHaskellDepends = [ base tasty ]; homepage = "http://documentup.com/feuerbach/tasty"; description = "HUnit support for the Tasty test framework"; @@ -172973,7 +185156,7 @@ self: { mkDerivation { pname = "tasty-hunit-adapter"; version = "1.1"; - sha256 = "6ffb169f629e7c3a275561c227f2f3293ded413495c7621cf438b0676ce53e1b"; + sha256 = "06rywmn6gc1qyhf65iwm6i0ysg99ygr2ghk1alkklz4ycagidyvg"; libraryHaskellDepends = [ base HUnit tasty tasty-hunit ]; homepage = "https://github.com/jstolarek/tasty-hunit-adapter"; description = "Use existing HUnit tests with tasty"; @@ -172991,7 +185174,7 @@ self: { mkDerivation { pname = "tasty-integrate"; version = "0.0.1"; - sha256 = "fddcf442462c6ee6ed800247265f2eaad1a5b68a345b69c3633ddbd2d5d14b7e"; + sha256 = "0zjbs7ax5nrxcg1njnrliavablda5rgjciq2h3nycvic8r1g9p7x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173018,7 +185201,9 @@ self: { mkDerivation { pname = "tasty-jenkins-xml"; version = "0.2.0.0"; - sha256 = "b5f88fb4478d7d3dc1e74237fabea54d0098dc5a726752279f41c5ce0eaaade4"; + sha256 = "1r5dm87cxia1kwkm4rvjbbf9h02dlnzglds2wz0kszcd8ys8zy5m"; + revision = "1"; + editedCabalFile = "018wf2xa1x57z6vlrhs98ap1l6i7wgipxjj2ri7lz91rmppjx1c5"; libraryHaskellDepends = [ base tasty tasty-ant-xml ]; testHaskellDepends = [ base bytestring directory hlint hspec io-capture mockery tasty @@ -173037,7 +185222,7 @@ self: { mkDerivation { pname = "tasty-kat"; version = "0.0.3"; - sha256 = "a72501f0f77db372648566bbba1dd1d6d0d0c975b42238875d663313e9a5db93"; + sha256 = "14yvlpli6cv6bn3kh8mlfp4x1l6ns4fvmfv6hmj75cvxyzq029d7"; libraryHaskellDepends = [ base bytestring tasty ]; testHaskellDepends = [ base bytestring mtl tasty tasty-hunit tasty-quickcheck @@ -173054,7 +185239,7 @@ self: { mkDerivation { pname = "tasty-laws"; version = "0.3.1"; - sha256 = "dfe1308dc6e4a41ede3b56cef504dd0e1d210d2ea7cc3e2d296cf72928823226"; + sha256 = "09ijh8l2kxvc54nkxk575q6j278fvl2gbkjn7gg1x974qs6k1qfz"; libraryHaskellDepends = [ base smallcheck smallcheck-laws smallcheck-series tasty tasty-smallcheck @@ -173073,7 +185258,7 @@ self: { mkDerivation { pname = "tasty-lens"; version = "0.3.1"; - sha256 = "06d947e738ef28ba74983fd611f76611483a384d4c637b126419ac61068ce90a"; + sha256 = "02p9ih363b0rch97nqsc9lw3lj0icvvi3mizk1sbla7g73klgn86"; libraryHaskellDepends = [ base lens smallcheck smallcheck-lens tasty tasty-smallcheck ]; @@ -173090,7 +185275,7 @@ self: { mkDerivation { pname = "tasty-program"; version = "1.0.5"; - sha256 = "4cb255ad5f037029cc6ae244fffdfb0ed7c65a4b0575d98ec61c067d6f5829c4"; + sha256 = "1i19b1pps1hwqs7djx859ddcdmqfzgyzyi72db62jw03bynmbcjc"; libraryHaskellDepends = [ base deepseq directory filepath process tasty ]; @@ -173106,7 +185291,7 @@ self: { mkDerivation { pname = "tasty-quickcheck"; version = "0.8.4"; - sha256 = "365f4cb6db70cce36ebdc133a2f6388cab71df2ca11f223f0458565956ec3297"; + sha256 = "15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn"; libraryHaskellDepends = [ base QuickCheck tagged tasty ]; testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; homepage = "http://documentup.com/feuerbach/tasty"; @@ -173114,6 +185299,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_9_1" = callPackage + ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged + , tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + 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"; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-rerun" = callPackage ({ mkDerivation, base, containers, mtl, optparse-applicative , reducers, split, stm, tagged, tasty, transformers @@ -173121,7 +185322,7 @@ self: { mkDerivation { pname = "tasty-rerun"; version = "1.1.6"; - sha256 = "ed33270c8a1f1576985e9907087921fd4f8fba19253fe3bfefec2d05f9799d79"; + sha256 = "0ycxg7whabgcxyzy6gr536x8ykzx45whh1wrbsc7c58zi862fczd"; libraryHaskellDepends = [ base containers mtl optparse-applicative reducers split stm tagged tasty transformers @@ -173139,8 +185340,8 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.1.9"; - sha256 = "7067a64be061c42102eca6c09215bcaebe27c8bb9c554c38521c105dcc69b630"; + version = "3.1.10"; + sha256 = "1yvfkl1dkp2bmcaa0bjamw13ky007rhn4wci3cia97glpy9nv24f"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -173160,7 +185361,7 @@ self: { mkDerivation { pname = "tasty-smallcheck"; version = "0.8.1"; - sha256 = "314ba7acdb7793730e7677f553a72dd6a4a8f9a45ff3e931cd7d384affb3c6d8"; + sha256 = "1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri"; libraryHaskellDepends = [ async base smallcheck tagged tasty ]; homepage = "http://documentup.com/feuerbach/tasty"; description = "SmallCheck support for the Tasty test framework"; @@ -173174,7 +185375,7 @@ self: { mkDerivation { pname = "tasty-stats"; version = "0.2.0.2"; - sha256 = "f6871db08e37ce62802d85040c59742f5611bc2450a2c1ceab6a6e80d58dc6a5"; + sha256 = "19f6ipaq0vkamg7c38jh4jy12migfichq1455n065kipisq1v1zn"; libraryHaskellDepends = [ base containers directory process stm tagged tasty time ]; @@ -173190,7 +185391,7 @@ self: { mkDerivation { pname = "tasty-tap"; version = "0.0.4"; - sha256 = "c85ee6356f7bcdf3756add5baca06d942656400c3e9765e5087229b53d2eff75"; + sha256 = "0xgz5qyvaabj13jnb5ry1i05c9lldnhaqnyxd9sz7kbvdwsycpn8"; libraryHaskellDepends = [ base containers stm tasty ]; testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit @@ -173202,12 +185403,17 @@ self: { }) {}; "tasty-th" = callPackage - ({ mkDerivation, base, tasty, template-haskell }: + ({ mkDerivation, base, haskell-src-exts, tasty, tasty-hunit + , template-haskell + }: mkDerivation { pname = "tasty-th"; - version = "0.1.4"; - sha256 = "18a14d693e709046eba3bb1a4e9febfce09d04059342728f06178788a24ece35"; - libraryHaskellDepends = [ base tasty template-haskell ]; + version = "0.1.7"; + sha256 = "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"; + libraryHaskellDepends = [ + base haskell-src-exts tasty template-haskell + ]; + testHaskellDepends = [ base tasty-hunit ]; homepage = "http://github.com/bennofs/tasty-th"; description = "Automatic tasty test case discovery using TH"; license = stdenv.lib.licenses.bsd3; @@ -173218,7 +185424,7 @@ self: { mkDerivation { pname = "tateti-tateti"; version = "0.1.0.1"; - sha256 = "3cd5977a58eb22c2a17f524f918a01b101f0c42981167a7cb59b58e295bf0e58"; + sha256 = "0n0fpyay4n4vnmy7l5l1572g00di06592ksjgyhw48pbb1x9gm9w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173234,7 +185440,7 @@ self: { mkDerivation { pname = "tau"; version = "6.2831"; - sha256 = "5f6b8431a4c84f24147e41ed088c34245a091ab067c2aa845817d7b8871f7c83"; + sha256 = "10vw3y3vimqpb22amhk7n0d0jni46j60iva1gqa28ky8lhqq8ssz"; libraryHaskellDepends = [ base ]; description = "Tau, the ratio between any circle's circumference and radius"; license = stdenv.lib.licenses.bsd3; @@ -173248,7 +185454,7 @@ self: { mkDerivation { pname = "tbox"; version = "0.1.0"; - sha256 = "7e876bde1781d42bb008038a64ce7daa8bf4e3297dcbfff11d2efb1c5b254c63"; + sha256 = "0qsc4mdiryrf3pqzzjvx57iz92xagp7692h312q2pm412zg6p1vy"; libraryHaskellDepends = [ array base binary cautious-file containers directory filepath IfElse monad-loops mtl random safe-failure stm-io-hooks @@ -173266,7 +185472,7 @@ self: { mkDerivation { pname = "tcache-AWS"; version = "0.0.1"; - sha256 = "9bdbaa9be02c9f8cb1e57b646b5add9cc4a5298621a175a1ecf784c0b64411a2"; + sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv"; libraryHaskellDepends = [ aws base bytestring conduit http-conduit network TCache text ]; @@ -173281,7 +185487,7 @@ self: { mkDerivation { pname = "tccli"; version = "0.0.1"; - sha256 = "a74a1e18c05833561b61f20da0e6b76f0c036461f1da5c0b109459bf5bb24e52"; + sha256 = "0ljfn9dvyncl205mrnpic5j0633gnzka03gjc4dmccsqq0c1wjm7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173298,7 +185504,7 @@ self: { mkDerivation { pname = "tce-conf"; version = "1.3"; - sha256 = "b051843bb941ed137242edfcfb28b1c15083951272fe292e82c140c9e1ad26a2"; + sha256 = "18i6mphwjh61h8p2kzkj2aaq6l61n4lgpz7d89r17va1p4xq8ldh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -173314,7 +185520,7 @@ self: { mkDerivation { pname = "tconfig"; version = "0.5.2"; - sha256 = "79edeb5afa3fa30d1d9dea3517d54ec466debc39eb6854296f79b5d6f2a29615"; + sha256 = "05cnlbrdddbrdwlm8s7b76ydwrn49vaifdgaklfhv8rzz9dfpvbr"; libraryHaskellDepends = [ base containers ]; description = "Simple text configuration file parser library"; license = stdenv.lib.licenses.bsd3; @@ -173325,7 +185531,7 @@ self: { mkDerivation { pname = "tcp"; version = "0.0.2"; - sha256 = "9b4a45c0ee848a72b9bc56cee3d4c53e38254f7363e405a0512936d1a67513f3"; + sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv"; libraryHaskellDepends = [ base containers old-time ]; homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/"; description = "A purely functional TCP implementation"; @@ -173342,7 +185548,7 @@ self: { mkDerivation { pname = "tcp-streams"; version = "0.6.0.0"; - sha256 = "cfd94893d4b4c177e600186ae8e369bd728c26ed7e626653b29ace274c4e0fbc"; + sha256 = "1g0g9r62gklsn99ncqkyxlk8qwmxd7iyhshq03k7ghdlsj9linfg"; libraryHaskellDepends = [ base bytestring data-default-class io-streams network pem tls x509 x509-store x509-system @@ -173365,7 +185571,7 @@ self: { mkDerivation { pname = "tcp-streams"; version = "1.0.0.0"; - sha256 = "eb47251fa998f141bf5969e50980e5573da4531461d733e707695d504cca00b8"; + sha256 = "1f00r9650pb90zkk7mv12i9s8gapwn00krb9b6zl3wcqm4gjaizb"; libraryHaskellDepends = [ base bytestring data-default-class io-streams network pem tls x509 x509-store x509-system @@ -173389,7 +185595,7 @@ self: { mkDerivation { pname = "tcp-streams-openssl"; version = "0.6.0.0"; - sha256 = "4c4c18ed031fe372507ef2361a79ffbfea9c2cda134eecf017aa48ac00bf8d94"; + sha256 = "154dpw0aqj5a2zqfqkhkv8n9rsmzzxwildpjgr875qqz0gnihk2c"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network tcp-streams @@ -173413,7 +185619,7 @@ self: { mkDerivation { pname = "tcp-streams-openssl"; version = "1.0.0.0"; - sha256 = "779dde5cac1fd61a8ee04ded3075bcad61e4851c7e685104196ac44fedf22f47"; + sha256 = "0irgybnlzi3a34252s3y3j2y8qddpisk1vadw271mmhzmifdx7bp"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network tcp-streams @@ -173438,7 +185644,7 @@ self: { mkDerivation { pname = "tdd-util"; version = "0.3.0.1"; - sha256 = "9e2285177390f8599db8d9ae43b5ce443979640189ed2bda532035216fdf2ab5"; + sha256 = "1d9avxpj2d90agd2pvc905j7jfa4rssl7bnrp2fmky4hfcbqa8ly"; libraryHaskellDepends = [ base bytestring HUnit lens MonadCatchIO-transformers parallel-io process QuickCheck random system-posix-redirect tagged @@ -173457,35 +185663,53 @@ self: { }) {}; "tdigest" = callPackage - ({ mkDerivation, base, base-compat, binary, bytes, Cabal - , cabal-doctest, Chart, Chart-diagrams, deepseq, directory, doctest - , filepath, machines, mwc-random, optparse-applicative, parallel - , reducers, semigroups, statistics, tasty, tasty-quickcheck, time - , vector, vector-algorithms + ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest + , deepseq, doctest, reducers, semigroupoids, semigroups, tasty + , tasty-quickcheck, vector, vector-algorithms }: mkDerivation { pname = "tdigest"; - version = "0"; - sha256 = "bfadc69c58f576831b60da5c141f66eb8e0e0ed7d7b9353e04a39cb44fde37ff"; + version = "0.1"; + sha256 = "0jy57m7acda4sk0hkkcxbkb274bc6i39hmq8l79wwmk5pspb6dh0"; + revision = "1"; + editedCabalFile = "0xp8csvp7vqgzz677qgw1vlkhqhvnvjhyf75m4dizgzh3mw8jmqp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base base-compat binary deepseq reducers semigroups vector - vector-algorithms + base base-compat binary deepseq reducers semigroupoids semigroups + vector vector-algorithms ]; testHaskellDepends = [ - base base-compat binary bytes deepseq directory doctest filepath - semigroups tasty tasty-quickcheck vector vector-algorithms - ]; - benchmarkHaskellDepends = [ - base base-compat binary Chart Chart-diagrams deepseq machines - mwc-random optparse-applicative parallel semigroups statistics time - vector vector-algorithms + base base-compat binary deepseq doctest semigroups tasty + tasty-quickcheck vector vector-algorithms ]; homepage = "https://github.com/futurice/haskell-tdigest#readme"; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; }) {}; + "tdigest-Chart" = callPackage + ({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour + , lens, mwc-random, semigroupoids, semigroups, statistics, tdigest + , vector + }: + mkDerivation { + pname = "tdigest-Chart"; + version = "0"; + sha256 = "19vhyk2wgvxnaad32vj9fm0vw8rl5n1lp540dp4yn9dsbilhda3l"; + revision = "2"; + editedCabalFile = "139qimahwi9q2vm2z6m42ghk59drgii71lrgcj2dbai5x5fnfcgb"; + libraryHaskellDepends = [ + base base-compat Chart colour lens semigroupoids semigroups tdigest + ]; + testHaskellDepends = [ + base base-compat Chart Chart-diagrams lens mwc-random statistics + tdigest vector + ]; + homepage = "https://github.com/futurice/haskell-tdigest#readme"; + description = "Chart generation from tdigest"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tdoc" = callPackage ({ mkDerivation, base, bytestring, template-haskell, transformers , xhtml @@ -173493,7 +185717,7 @@ self: { mkDerivation { pname = "tdoc"; version = "0.4.6"; - sha256 = "886ca4a6df39d265cb51f44192f6abeed53a8dfa193d490fe5025a3afe90543f"; + sha256 = "0gslj3z3lnh2wl7ljg8rza6kmmgfmgv94hgla75nblirvyka8v48"; libraryHaskellDepends = [ base bytestring template-haskell transformers xhtml ]; @@ -173508,19 +185732,41 @@ self: { mkDerivation { pname = "teams"; version = "0.0.2.3"; - sha256 = "ed25b9034a9f13245c6518413cc15d6004fb1a6272bea18e2a254f001b3e5812"; + sha256 = "04jq7qdh0kr55a7a3gkjc8dgn130bp0kqh8qcmf284wz981vj9gd"; libraryHaskellDepends = [ base containers fgl graphviz ]; description = "Graphical modeling tools for sequential teams"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "teardown" = callPackage + ({ 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.1"; + sha256 = "0jxhr73dq4gvbzrwhbqsrwg1v8qa2mj1nfygb44kj60diwa4cwj2"; + libraryHaskellDepends = [ + ansi-wl-pprint base deepseq protolude text time + ]; + testHaskellDepends = [ + base doctest Glob protolude QuickCheck tasty tasty-hspec + tasty-hunit tasty-rerun tasty-smallcheck text time + ]; + benchmarkHaskellDepends = [ base criterion protolude text time ]; + homepage = "https://github.com/roman/Haskell-teardown#readme"; + description = "Build composable, idempotent & transparent application cleanup sub-routines"; + license = stdenv.lib.licenses.mit; + }) {}; + "teeth" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "teeth"; version = "0.2.0.2"; - sha256 = "0c59db4fc490591772fd5b1c216c341fd10393b5751e5c4d0128fa9d2f716a6e"; + sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/expipiplus1/teeth"; description = "Dental data types"; @@ -173535,7 +185781,7 @@ self: { mkDerivation { pname = "telegram"; version = "0.1.0.0"; - sha256 = "96c0fdd4c92f51fd45fd43fe1de090822752daac00caecd3d29195ee0c3026b2"; + sha256 = "1ci6606fx5cisb9yrjh0mkd549w2j3h1vzj3zm2zsl9gr7agvh4n"; libraryHaskellDepends = [ aeson base bytestring data-default http-conduit url utf8-string ]; @@ -173553,8 +185799,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.6.0.2"; - sha256 = "e5a29e558d5a5930be9c7d79cb16c66499fe12d9c5ffe663f830be683d3527f7"; + version = "0.6.3.0"; + sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -173578,7 +185824,7 @@ self: { mkDerivation { pname = "telegram-bot"; version = "0.5.4.0"; - sha256 = "a163600c8b5bca5b545f7701d14165961ce499263e3a27dac8acdca3fe29b072"; + sha256 = "0wmh57za7p5cr3d2ffiy4scy874ncm0x20bpbxa5pjjvic660qx1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173600,7 +185846,7 @@ self: { mkDerivation { pname = "teleport"; version = "0.0.0.10"; - sha256 = "cb39562f0e1fd428f072e2f2e2440f6ac6c2ff8077e767d2fced0e402f575f66"; + sha256 = "0rjzawpl03pdzk96grvph3zw5ika1x2f5wp2fbq2im0z1qpmcffb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -173615,6 +185861,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "teleshell" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hashable, network + , pipes, primitive, QuickCheck, split, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "teleshell"; + version = "0.1.0.0"; + sha256 = "1fmhjjg2k81hc6lsbdnha0a8ma62xcaxkpmfdiygplnmf3gcl02g"; + libraryHaskellDepends = [ + attoparsec base bytestring hashable network pipes primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring pipes QuickCheck split tasty tasty-hunit + tasty-quickcheck vector + ]; + 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 ({ mkDerivation, base, bifunctors, bytestring, containers , http-conduit, mtl, network, regex-pcre, split, tagsoup, text @@ -173623,7 +185893,7 @@ self: { mkDerivation { pname = "tellbot"; version = "0.6.1"; - sha256 = "4b7e83cc0a9f6cc175d8a4aedb91c3c052809c27f203f46ea1ea9d27e9a099e6"; + sha256 = "1rlrl3ljg7gal5pg80zj4yf80ln0qf8xpbm4v1sw2v4z1b686zjb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173636,12 +185906,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tempered" = callPackage + ({ mkDerivation, base, containers, directory, filepath, mtl + , optparse-applicative, parsec, process, yaml + }: + mkDerivation { + pname = "tempered"; + version = "0.2.0"; + sha256 = "1r7xx43s6wglj2x8xlwghpfddw31d01pfnjm0h6aldx2wb4c4qj2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath mtl parsec process yaml + ]; + executableHaskellDepends = [ + base containers directory mtl optparse-applicative + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/ChrisPenner/tempered#readme"; + description = "A dead-simple shell interpolation templating utility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "template" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { pname = "template"; version = "0.2.0.10"; - sha256 = "8fd5a321b1c62f8ca5ed68c098e676917a5dac4d65809fceaed4b52c22b4ac82"; + sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg"; libraryHaskellDepends = [ base mtl text ]; description = "Simple string substitution"; license = stdenv.lib.licenses.bsd3; @@ -173652,7 +185944,7 @@ self: { mkDerivation { pname = "template-default"; version = "0.1.2"; - sha256 = "8446e58f6a926037b952ebd5e5e9e53e1629f8f35904f017d53e71caadf3aebb"; + sha256 = "1fxfyfnwlw9yslbz012rygw2j5iywplybmgbaawkfq4jda7yail4"; libraryHaskellDepends = [ base data-default template-haskell ]; homepage = "https://github.com/haskell-pkg-janitors/template-default"; description = "declaring Default instances just got even easier"; @@ -173665,7 +185957,7 @@ self: { mkDerivation { pname = "template-haskell"; version = "2.11.1.0"; - sha256 = "5fb340b665fad764238a67b6dd04870a8c4b15e891a8d2d2cd37c5915a7b369c"; + sha256 = "171ngdd93i9prp9d5a4ix0alp30ahw2dvdk7i8in9mzscnv41csz"; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -173677,7 +185969,7 @@ self: { mkDerivation { pname = "template-haskell-compat-v0208"; version = "0.1.1"; - sha256 = "e3d2ede7a0da70c6c477a56c61c92e5b43e684ac7fb05d421ea840643e73fdb5"; + sha256 = "1dgxfcz68h583r15vc3zmj2fchsv5v4n2v55fz2ccw6sl3kyvlp3"; libraryHaskellDepends = [ base base-prelude template-haskell ]; homepage = "https://github.com/nikita-volkov/template-haskell-compat-v0208"; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; @@ -173689,7 +185981,7 @@ self: { mkDerivation { pname = "template-haskell-util"; version = "0.1.1.0"; - sha256 = "8e9ca0323c52791fb5275d56e64cdefbeae3e364e124446044b4b477cd9a4f0c"; + sha256 = "032gkb6pgd5l8ih48971ckiy7spvvr6fcmjx4ysiyyaj7hra174f"; libraryHaskellDepends = [ base GenericPretty ghc-prim template-haskell ]; @@ -173707,7 +185999,7 @@ self: { mkDerivation { pname = "template-hsml"; version = "0.2.0.3"; - sha256 = "2fa8ee2b181b38077bcfd6c8893820d48881526f423174c9b0df18d9610edcd2"; + sha256 = "1lnw1rhxj66zn34p8ca2dx98326l40w8kj6nrxxhff0v30myxa1g"; libraryHaskellDepends = [ base blaze-markup haskell-src-exts haskell-src-meta parsec template-haskell @@ -173725,7 +186017,7 @@ self: { mkDerivation { pname = "template-yj"; version = "0.0.0.2"; - sha256 = "423e6a30ae66539a9f8935fd8c708eb8513f9f1ec30ffd67ff37daca9a2948ee"; + sha256 = "1vj856dcmnipzxkzs3y33sgkyldqirq8rz9mi6grllv6mqq6lgj2"; libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/YoshikuniJujo/template/wiki"; description = "Process template file"; @@ -173738,7 +186030,7 @@ self: { mkDerivation { pname = "templateify"; version = "0.1.0.1"; - sha256 = "0dc8b3a5bf54dbcba6740f9338c49c8c211b13cee16ef7cd1803edb2f4220321"; + sha256 = "08834bsb5v83336zfvp1rq9in8cckk23i4qgfjkcpnslpyjv7j0d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl tagsoup uniplate ]; @@ -173756,7 +186048,7 @@ self: { mkDerivation { pname = "templatepg"; version = "0.2.8"; - sha256 = "bddd04dca12d48e9151b495b63a981540b2b6b6e7ba4857419abd2d3777410ac"; + sha256 = "1b0hfivx7lmb35s8b93vdrmjn2slh6ln6ns93cayjj1dl7f09pdx"; libraryHaskellDepends = [ base binary bytestring haskell-src-meta mtl network parsec regex-compat regex-posix template-haskell time utf8-string @@ -173774,7 +186066,7 @@ self: { mkDerivation { pname = "templater"; version = "0.0.3.0"; - sha256 = "e4c78dccf9bfae0a56c5594c22f6e20eb38fc0b3583e13884aadc812d25a0048"; + sha256 = "0j00bb915j5d9a416gjqng08zcqfwbv24k2rqmb0mbmzz768viz4"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base hspec hspec-attoparsec HUnit QuickCheck text @@ -173792,7 +186084,7 @@ self: { mkDerivation { pname = "tempo"; version = "0.1.0.0"; - sha256 = "38cf611fda7a074375b8cf4c25ed95ac3fb88e51a4d823f3f419d3b90999963d"; + sha256 = "0gcnk44vklqrykrj7n54a67bhgxcjpnjak6gp1sl61vsv8gn3krq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173814,7 +186106,7 @@ self: { mkDerivation { pname = "tempodb"; version = "0.2.2.5"; - sha256 = "d49536e242b8ab53cbd3bbdd3773341403b1e02cbdcbbef349a4a9302814e003"; + sha256 = "00z02hl31ad497rvxjxx5khb20ql6irkgpdvsg5m7axq8bi3d5fl"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers HsOpenSSL HTTP http-streams io-streams mtl old-locale text time @@ -173833,7 +186125,7 @@ self: { mkDerivation { pname = "temporal-csound"; version = "0.4.3.1"; - sha256 = "29c05b3019073882540ad420d0b05a49acf4f60ec6b585d40c386f3db48bedb0"; + sha256 = "1c7difs3svrq1ka8bdf61vvg9b29baqd086l19a84f0734q5ph19"; libraryHaskellDepends = [ base csound-catalog csound-expression temporal-media temporal-music-notation temporal-music-notation-western @@ -173849,7 +186141,7 @@ self: { mkDerivation { pname = "temporal-media"; version = "0.6.1"; - sha256 = "6c198d83654fd7fc341357393c6c6464c41f34b4b1a13b84aeb7b923488cb6ae"; + sha256 = "1bmnii427fdpms23p8dinhs1zi34cin3qfap2csgrmsgcn1qs6bc"; libraryHaskellDepends = [ base Boolean ]; homepage = "https://github.com/anton-k/temporal-media"; description = "data types for temporal media"; @@ -173861,7 +186153,7 @@ self: { mkDerivation { pname = "temporal-music-notation"; version = "0.4.1"; - sha256 = "3b2ee2c5410ed623bb9f1ddfc2aaf74e908dc51984660dfef1be53f0dd32bd26"; + sha256 = "09mx6bfz0lxyy7z0srl4372qv42fyymc5pqxkyxj7mhf872y4biv"; libraryHaskellDepends = [ base data-default temporal-media vector ]; @@ -173877,7 +186169,7 @@ self: { mkDerivation { pname = "temporal-music-notation-demo"; version = "0.4.0"; - sha256 = "1f881bdc277b1ac67c7e6ae117d1a33d191641bbd372526fa5b527af52f3a9c9"; + sha256 = "1jd9yd9ay9xmlmpm4wnkpd0ic69xlg8igqbagrycc6kv4zf1p20z"; libraryHaskellDepends = [ base binary data-default HCodecs temporal-music-notation ]; @@ -173891,7 +186183,7 @@ self: { mkDerivation { pname = "temporal-music-notation-western"; version = "0.4.0"; - sha256 = "6cdebe9fc323e5718e712328328763474b172f0d10add3a2b7328e5c28d95704"; + sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc"; libraryHaskellDepends = [ base temporal-music-notation ]; homepage = "https://github.com/anton-k/temporal-music-notation-western"; description = "western music notation"; @@ -173899,18 +186191,21 @@ self: { }) {}; "temporary" = callPackage - ({ mkDerivation, base, directory, exceptions, filepath - , transformers, unix + ({ mkDerivation, base, base-compat, directory, exceptions, filepath + , tasty, tasty-hunit, transformers, unix }: mkDerivation { pname = "temporary"; - version = "1.2.0.4"; - sha256 = "51e713804246404df8a728919a2e7d1994f8cfda42cfa7a74ea65d8b7d206762"; + version = "1.2.1"; + sha256 = "1y54fx183sfmpd3xj94c74z9v42y1d7ski3jqrfrd7pnbh38ikwy"; 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"; + testHaskellDepends = [ + base base-compat directory filepath tasty tasty-hunit unix + ]; + homepage = "https://github.com/feuerbach/temporary"; + description = "Portable temporary file and directory support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -173921,7 +186216,7 @@ self: { mkDerivation { pname = "temporary-rc"; version = "1.2.0.3"; - sha256 = "1a4f8dd65f7db92316a68ef64c3518873799115babce92ef9869103d318011db"; + sha256 = "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs"; libraryHaskellDepends = [ base directory exceptions filepath transformers unix ]; @@ -173937,7 +186232,7 @@ self: { mkDerivation { pname = "temporary-resourcet"; version = "0.1.0.0"; - sha256 = "30a01ce6ee41fb134ebf69fc21e38ce115ad6670a4f27b3828a2e9727744b4db"; + sha256 = "1nxl8ivp5sd250w7pwm4f1kas5g1ikij3z39px717ys1xvk1r81h"; libraryHaskellDepends = [ base directory exceptions filepath resourcet transformers unix ]; @@ -173957,7 +186252,7 @@ self: { mkDerivation { pname = "tempus"; version = "0.1.0"; - sha256 = "566fa9571b3717a46a79233cd8c818de0e50bab48bc4e7e4543f79ba13586543"; + sha256 = "0hv5b09vly9zakjfgi4bnjx503ny334dhg13g5ma85rp3dbsjvsn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173975,7 +186270,7 @@ self: { mkDerivation { pname = "tempus-fugit"; version = "0.1.0.1"; - sha256 = "d93b841938c4ae7e199a3135bbe1619bbf0e68919aee7fff72db903473644303"; + sha256 = "00s3cirk946vfbzpzvlsj5l0xgwvc7hvnd9ik8cpxbn470cq8fyr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -173991,7 +186286,7 @@ self: { mkDerivation { pname = "tensor"; version = "0.3.0.1"; - sha256 = "ce06190f4ae042cd87bfb420342fa98fd18472ec218907d427e48ebebb08a60e"; + sha256 = "03m612xvx3p44za0g291xir89lcgm4pk885lpy3wshp0987ij1nf"; libraryHaskellDepends = [ base ghc-prim random vector ]; testHaskellDepends = [ base QuickCheck random ]; homepage = "http://noaxiom.org/tensor"; @@ -174000,6 +186295,200 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tensorflow" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, c2hs + , containers, data-default, exceptions, fgl, HUnit, lens-family + , mainland-pretty, mtl, proto-lens, proto-lens-protoc, semigroups + , split, temporary, tensorflow, tensorflow-proto, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "tensorflow"; + version = "0.1.0.2"; + sha256 = "0l1dx5xl82hh0kjhdvshxc40gpbsjd8vrn9f5rxy9gd0rsc8vc0k"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers data-default exceptions + fgl lens-family mainland-pretty mtl proto-lens proto-lens-protoc + semigroups split temporary tensorflow-proto text transformers + vector + ]; + librarySystemDepends = [ tensorflow ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit lens-family proto-lens + tensorflow-proto test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow bindings"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {tensorflow = null;}; + + "tensorflow-core-ops" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , lens-family, mainland-pretty, proto-lens, tensorflow + , tensorflow-opgen, text + }: + mkDerivation { + pname = "tensorflow-core-ops"; + version = "0.1.0.0"; + sha256 = "1m8qlklm863pyncklyfiwnjpmij9fbkbq70za6g8bl0py26arcrg"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath mainland-pretty proto-lens + tensorflow tensorflow-opgen text + ]; + libraryHaskellDepends = [ + base bytestring lens-family proto-lens tensorflow text + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Haskell wrappers for Core Tensorflow Ops"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tensorflow-logging" = callPackage + ({ mkDerivation, base, bytestring, conduit, data-default, directory + , exceptions, filepath, hostname, HUnit, lens-family, proto-lens + , resourcet, stm, stm-chans, stm-conduit, temporary, tensorflow + , tensorflow-core-ops, tensorflow-ops, tensorflow-proto + , tensorflow-records-conduit, test-framework, test-framework-hunit + , text, time, transformers + }: + mkDerivation { + pname = "tensorflow-logging"; + version = "0.1.0.0"; + sha256 = "0s9djxcwg13vx7yp60h4vrkmq11mfh0zqpzjabchhj2p7i09m2xp"; + libraryHaskellDepends = [ + base bytestring conduit data-default directory exceptions filepath + hostname lens-family proto-lens resourcet stm stm-chans stm-conduit + tensorflow tensorflow-core-ops tensorflow-ops tensorflow-proto + tensorflow-records-conduit text time transformers + ]; + testHaskellDepends = [ + base bytestring conduit data-default directory filepath HUnit + lens-family proto-lens resourcet temporary tensorflow-proto + tensorflow-records-conduit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorBoard related functionality"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tensorflow-opgen" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , lens-family, mainland-pretty, optparse-applicative, proto-lens + , semigroups, tensorflow-proto, text + }: + mkDerivation { + pname = "tensorflow-opgen"; + version = "0.1.0.0"; + sha256 = "16m4nyl08clahhmkgm1r0cqq07j2mcl9rmxa14gxz372z077zbj7"; + libraryHaskellDepends = [ + base bytestring containers filepath lens-family mainland-pretty + optparse-applicative proto-lens semigroups tensorflow-proto text + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Code generation for TensorFlow operations"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tensorflow-ops" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, deepseq, fgl, HUnit, lens-family, mtl, proto-lens + , QuickCheck, random, temporary, tensorflow, tensorflow-core-ops + , tensorflow-proto, tensorflow-test, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "tensorflow-ops"; + version = "0.1.0.0"; + sha256 = "06m9zgb7rxqhiqfs7gds1g45kl1jxbf32d54wgg2ad8aqz2096gl"; + libraryHaskellDepends = [ + base bytestring containers data-default fgl lens-family mtl + proto-lens tensorflow tensorflow-core-ops tensorflow-proto text + ]; + testHaskellDepends = [ + base bytestring data-default HUnit lens-family proto-lens + QuickCheck random temporary tensorflow tensorflow-core-ops + tensorflow-proto tensorflow-test test-framework + test-framework-hunit test-framework-quickcheck2 transformers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq tensorflow transformers vector + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Friendly layer around TensorFlow bindings"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tensorflow-proto" = callPackage + ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc }: + mkDerivation { + pname = "tensorflow-proto"; + version = "0.1.0.0"; + sha256 = "06k87dvpsf8pnbb1qq5gjxpjc2sra95y1bwmsnpmlg1qn0ppi5mn"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow protocol buffers"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tensorflow-records" = callPackage + ({ mkDerivation, base, bytestring, cereal, snappy-framing + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "tensorflow-records"; + version = "0.1.0.0"; + sha256 = "09whj5yag83qii5k9licv1zchpkn6x56a7mkvha0rxf64bvx6d7j"; + libraryHaskellDepends = [ base bytestring cereal snappy-framing ]; + testHaskellDepends = [ + base bytestring cereal test-framework test-framework-quickcheck2 + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Encoder and decoder for the TensorFlow \"TFRecords\" format"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tensorflow-records-conduit" = callPackage + ({ mkDerivation, base, bytestring, cereal-conduit, conduit + , conduit-extra, exceptions, resourcet, tensorflow-records + }: + mkDerivation { + pname = "tensorflow-records-conduit"; + version = "0.1.0.0"; + sha256 = "1jld4yb5x94m0sb7lgsm42b77i9k2q1mkv58dx1whl34vl0lh0vc"; + libraryHaskellDepends = [ + base bytestring cereal-conduit conduit conduit-extra exceptions + resourcet tensorflow-records + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Conduit wrappers for TensorFlow.Records."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tensorflow-test" = callPackage + ({ mkDerivation, base, HUnit, vector }: + mkDerivation { + pname = "tensorflow-test"; + version = "0.1.0.0"; + sha256 = "1z2anh5ikjpsb1sjfn290bcf5rcxsmzb0gwdk9czdnlmx3fig0ip"; + libraryHaskellDepends = [ base HUnit vector ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Some common functions for test suites"; + license = stdenv.lib.licenses.asl20; + }) {}; + "term-rewriting" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit , mtl, multiset, parsec, QuickCheck, union-find-array @@ -174007,7 +186496,7 @@ self: { mkDerivation { pname = "term-rewriting"; version = "0.2.1.1"; - sha256 = "81ea2a0712af3b6f8f802c29f2fbc2dfb8e48db81dd4da48c42aa5382987e64e"; + sha256 = "0kp6hwlki99aqi4dmm0xp26y9f6zqbxz4a9ch27nyfxg283jmsl1"; libraryHaskellDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -174024,7 +186513,7 @@ self: { mkDerivation { pname = "termbox-bindings"; version = "0.1.0.5"; - sha256 = "bb01fe054081a9affe0f5694ea4cf50f51825f2ad5b8e5a6cfca9a7ee7146743"; + sha256 = "0hv72kkpx6narykfbf6m59gq4l8gym6fm52n1zzazac1802zw0dv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -174036,14 +186525,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "termcolor" = callPackage + ({ mkDerivation, base, cli }: + mkDerivation { + pname = "termcolor"; + version = "0.2.0.0"; + sha256 = "140sy8q1ra9xjx1f769h8p6p7nym67pf87f5bnq7r1ixffd3k7dh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base cli ]; + homepage = "https://github.com/mdibaiee/termcolor#readme"; + description = "Composable terminal colors"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "terminal-progress-bar" = callPackage ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework , test-framework-hunit }: mkDerivation { pname = "terminal-progress-bar"; - version = "0.1.1"; - sha256 = "2053a7ac9113378a6ae8852447b4e7ba430c014776443046788e84183dc9f380"; + version = "0.1.1.1"; + sha256 = "1y9mpmnbc12bbybaqq7cqwhvbbdbx31zxkb63mymiaz1bnhi58fp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base stm stm-chans ]; @@ -174061,7 +186565,7 @@ self: { mkDerivation { pname = "terminal-size"; version = "0.3.2.1"; - sha256 = "b5c23e964756bc13914649a67d63233f59ad0a813abe7cadeb2fc9d586dc9658"; + sha256 = "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm"; libraryHaskellDepends = [ base ]; description = "Get terminal window height and width"; license = stdenv.lib.licenses.bsd3; @@ -174072,7 +186576,7 @@ self: { mkDerivation { pname = "termination-combinators"; version = "0.1"; - sha256 = "9027db33e370a409037f35c8fb4fd260429398f34cb78d2457daf6f977d162cc"; + sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh"; libraryHaskellDepends = [ base containers contravariant ]; homepage = "http://www.github.com/batterseapower/termination-combinators"; description = "Termination combinators for forcing non-terminating algorithms to terminate"; @@ -174080,12 +186584,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "terminfo_0_4_0_2" = callPackage + "terminfo_0_4_1_0" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.0.2"; - sha256 = "fea88b28443f5efd316c7699685b3925c0a7613992305f11af03746139d8f856"; + version = "0.4.1.0"; + sha256 = "0pgzx7byi4p2fwk6hcqnbs59bv4igzmhfkr5wrkkfsh4msqxflrz"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; homepage = "https://github.com/judah/terminfo"; @@ -174101,7 +186605,7 @@ self: { mkDerivation { pname = "terminfo-hs"; version = "0.2.1"; - sha256 = "632fa74d6ae9fc0026022c6dd91577c8a05f95e973347b33b4d49cd9059a48ff"; + sha256 = "1zs8k82xk76lnhrpnd3kx6amz868fwaxjv9c08k01z79d96sfbv3"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors filepath ]; @@ -174117,7 +186621,7 @@ self: { mkDerivation { pname = "termplot"; version = "0.1.0.0"; - sha256 = "c84937853067147cfbd1dec0df3e488b63c6d9594c5e2a75e38ee786241a7364"; + sha256 = "0r3k38j8drwfwdsjlpjcb7cwcqwb90zdzh6ys7xpq537622kfjf8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -174137,7 +186641,7 @@ self: { mkDerivation { pname = "terntup"; version = "0.0.1"; - sha256 = "ffbb4c7dd4ccf56628360671a31745125a52f8131254fc98f2041e32bbe93ff7"; + sha256 = "1xrzx6xk47h4yacgqm0j2gw54nhj8lbs6w866ql6dxfcsiylrfzz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -174153,7 +186657,7 @@ self: { mkDerivation { pname = "terrahs"; version = "0.9"; - sha256 = "0b52ac55ec87635def6462e0b0b23377141636f27cc3f829a3a11fbb2dfa913d"; + sha256 = "0gciz8nvn7x1lclzihvwy8v1c53p6frb1q32ckpmsqw7xiasqlhb"; libraryHaskellDepends = [ base haskell98 old-time ]; librarySystemDepends = [ terralib4c translib ]; homepage = "http://lucc.ess.inpe.br/doku.php?id=terrahs"; @@ -174168,7 +186672,7 @@ self: { mkDerivation { pname = "tersmu"; version = "0.2.1"; - sha256 = "96c068108cf92f6a4b9e24b64e3af8005b107e446ebd108d29fe5a68c7127881"; + sha256 = "10bq2b3nhnpy566i1gbf8iz10nq0z0x4xdi4kr5nlbzrih86ih4n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -174181,21 +186685,20 @@ self: { }) {}; "test-fixture" = callPackage - ({ mkDerivation, base, data-default, haskell-src-exts + ({ mkDerivation, base, data-default-class, haskell-src-exts , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell - , th-orphans, th-to-exp, transformers + , th-orphans, transformers }: mkDerivation { pname = "test-fixture"; - version = "0.5.0.0"; - sha256 = "084877f777878d2cabfb661e957dd8f5517000650c120308f8e2dbe7eda6772d"; + version = "0.5.0.1"; + sha256 = "0gnvz4paxr2wamdp01fnflhifbmsgxpmhg6l3a8nqmi32wgrwy6m"; libraryHaskellDepends = [ - base data-default haskell-src-exts haskell-src-meta mtl + base data-default-class haskell-src-exts haskell-src-meta mtl template-haskell th-orphans ]; testHaskellDepends = [ - base hspec hspec-discover mtl template-haskell th-to-exp - transformers + base hspec hspec-discover mtl template-haskell transformers ]; homepage = "http://github.com/cjdev/test-fixture#readme"; description = "Test monadic side-effects"; @@ -174209,9 +186712,9 @@ self: { mkDerivation { pname = "test-framework"; version = "0.8.1.1"; - sha256 = "7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273"; - revision = "1"; - editedCabalFile = "a6d9dbedbb574271e85c6e5ef9a9f935d87501a9b99b473bf306e3dcd36bdd9e"; + sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq"; + revision = "2"; + editedCabalFile = "1mp1h0fzwxa3xxnbw33lp8hj0rb8vwkd712r5ak8ny5nmawh2c9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174230,7 +186733,7 @@ self: { mkDerivation { pname = "test-framework-doctest"; version = "0.2.1.2"; - sha256 = "185863eb3aea78ba85b8a3919d570aada59bad83f6fdc262563f10b6349b6006"; + sha256 = "01k0kcsbc41zaric5zgnhfnrp9dd19brv4d3p22vly7a7bmn6n0q"; libraryHaskellDepends = [ base doctest test-framework test-framework-hunit ]; @@ -174247,7 +186750,7 @@ self: { mkDerivation { pname = "test-framework-golden"; version = "1.1.3.3"; - sha256 = "66700e5abe67ab8ab2418074f2fbca496cae2b4a62e870837c3c1efb43cacfe9"; + sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36"; libraryHaskellDepends = [ base bytestring filepath mtl process temporary test-framework ]; @@ -174262,9 +186765,9 @@ self: { mkDerivation { pname = "test-framework-hunit"; version = "0.3.0.2"; - sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8"; - revision = "2"; - editedCabalFile = "f3b7d4b2bf246b88de781a03806e5c90a499c64b2b0c040be50dd980764fcc62"; + sha256 = "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm"; + revision = "3"; + editedCabalFile = "0i9mlalv7cl1iq43ld5myrnpszq5rxmd79hk495dcb08rglhgl3z"; libraryHaskellDepends = [ base extensible-exceptions HUnit test-framework ]; @@ -174278,7 +186781,7 @@ self: { mkDerivation { pname = "test-framework-program"; version = "1.1"; - sha256 = "7f6833a66bdafa9f237b90ec16d4c07df651213e73afc6c3c97e74b77aefe682"; + sha256 = "10p6xxxbfx3yr71wdbvk7qhm3xkxq3a1dv4hgcirzynsdfk36s3z"; libraryHaskellDepends = [ base directory process test-framework ]; description = "Test framework support for running simple test programs"; license = stdenv.lib.licenses.bsd3; @@ -174291,7 +186794,7 @@ self: { mkDerivation { pname = "test-framework-quickcheck"; version = "0.3.0"; - sha256 = "bba68b3276c63c65b40b19860b55fdf76786f86aeb31b6f500dac23afa801a3d"; + sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv"; libraryHaskellDepends = [ base deepseq extensible-exceptions QuickCheck random test-framework ]; @@ -174307,15 +186810,13 @@ self: { }: mkDerivation { pname = "test-framework-quickcheck2"; - version = "0.3.0.3"; - sha256 = "cc96c6f30c29b16a3f7ec5c108f320a6c0f0d3ef71afff8a1cb98caf33ffe18a"; - revision = "2"; - editedCabalFile = "989f988d0c4356d7fc1d87c062904d02eba0637c5adba428b349aeb709d81bc0"; + version = "0.3.0.4"; + sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; - homepage = "https://batterseapower.github.io/test-framework/"; - description = "QuickCheck2 support for the test-framework package"; + homepage = "http://haskell.github.io/test-framework/"; + description = "QuickCheck-2 support for the test-framework package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -174326,8 +186827,8 @@ self: { }: mkDerivation { pname = "test-framework-sandbox"; - version = "0.1.0"; - sha256 = "fbd88b4e3e76f82a28bd8533ce7823cf403129c5acdb76631305b6840205d22d"; + version = "0.1.1"; + sha256 = "0q84ijm712zn1l20hih53j4axmhzaib1gxn11w0h7pnhybc04klx"; libraryHaskellDepends = [ ansi-terminal base lifted-base mtl temporary test-framework test-sandbox transformers @@ -174349,7 +186850,7 @@ self: { mkDerivation { pname = "test-framework-skip"; version = "1.0"; - sha256 = "c98e4bf8ca6245d6500263b5f8ec7d5c87462d1ec2011ff150862065a4197aab"; + sha256 = "1avs36j6a846a3qiy0f23qnld1swgpngidb3098dcib2rbw4p3n9"; libraryHaskellDepends = [ base test-framework ]; testHaskellDepends = [ base HUnit QuickCheck smallcheck test-framework @@ -174366,7 +186867,7 @@ self: { mkDerivation { pname = "test-framework-smallcheck"; version = "0.2"; - sha256 = "6081c4f35967b0d0cb92ac09a915fa9e2da01c401266b20ce18793fbc2bceff6"; + sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0"; libraryHaskellDepends = [ base smallcheck test-framework transformers ]; @@ -174380,7 +186881,7 @@ self: { mkDerivation { pname = "test-framework-testing-feat"; version = "0.1.0.1"; - sha256 = "24a561741fd9bc1673709f268e2ba54be2d4e011a1629c3978301286f53dc05d"; + sha256 = "0pf07psqc4ihg0wrqqm127hd9qjbllmqw9lzf1ridg6r3xs63994"; libraryHaskellDepends = [ base test-framework testing-feat ]; testHaskellDepends = [ base test-framework testing-feat ]; homepage = "http://github.com/jfischoff/test-framework-testing-feat"; @@ -174395,7 +186896,7 @@ self: { mkDerivation { pname = "test-framework-th"; version = "0.2.4"; - sha256 = "8b780d9e3edd8d91e24f72d9fa1f80420e52959428ad7c22d0694901a43f9c8a"; + sha256 = "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b"; libraryHaskellDepends = [ base haskell-src-exts language-haskell-extract regex-posix template-haskell test-framework @@ -174412,7 +186913,7 @@ self: { mkDerivation { pname = "test-framework-th-prime"; version = "0.0.9"; - sha256 = "77e4e33e4207dc6ba9a3c0bb1eda9d6ac6803e1bf20fd7a4aee5c8fe958399bd"; + sha256 = "1gcrhfazxj75msjdf3zj3cz81ikakpd1xfy0lflnpp0788zf7r3p"; libraryHaskellDepends = [ base cpphs haskell-src-exts template-haskell test-framework ]; @@ -174428,7 +186929,7 @@ self: { mkDerivation { pname = "test-invariant"; version = "0.4.5.0"; - sha256 = "306fbfcd1b7fea5a88b757ac90550ae6083f64e9dae7da5a3a26c87acf9c6332"; + sha256 = "0ck3kk7pmj1679ddmrysx5j3y27619ar1b2pny45mskz3g6vyvrh"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion QuickCheck ]; @@ -174442,7 +186943,7 @@ self: { mkDerivation { pname = "test-pkg"; version = "0.3.0.0"; - sha256 = "c88ac7972b8612c8630183cc511d80e93998518819064a5ab62b773ddaf2cc3a"; + sha256 = "0fncybd3sxrbnrd4l1hri18rhfg9h0fm3k4305iwh4l65fbwg2n8"; libraryHaskellDepends = [ base ]; description = "Just tests Hackage"; license = stdenv.lib.licenses.bsd3; @@ -174459,8 +186960,8 @@ self: { }: mkDerivation { pname = "test-sandbox"; - version = "0.1.5"; - sha256 = "5a02005aed04af0ed9d2781df0921ff0934e01c0ae6ac50cc1980bf7e9c276b2"; + 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 @@ -174488,7 +186989,7 @@ self: { mkDerivation { pname = "test-sandbox-compose"; version = "0.1.3"; - sha256 = "fd28485891def040e73e82c065c6bb5f26bbf6ac372422397098d7ffc62a10fb"; + sha256 = "1yqh5b3gzmwqf0wj491pmkvbn9jzpg36bh427vkl1w6yj5c4ha7x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174515,7 +187016,7 @@ self: { mkDerivation { pname = "test-sandbox-hunit"; version = "0.1.2"; - sha256 = "f3fea0e68663dab3c65a065990220373ba0688a898eec262f9041b62e573166d"; + sha256 = "0v8nfgjn46q4z5ic5vlqm240dfkk0ci90n86bb3b7nk3hvka1zpk"; libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ]; homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "HUnit convenience functions for use with test-sandbox"; @@ -174530,7 +187031,7 @@ self: { mkDerivation { pname = "test-sandbox-quickcheck"; version = "0.1.0"; - sha256 = "d1c7a7d787c1f7dd62a7527048e4e574e1d4cc72ce2200f7145852c6b1c1323e"; + sha256 = "0gijq6qwcljq2kvh08nffb6d9qblwpj4hw2jlxidvxy1hzbsgiyi"; libraryHaskellDepends = [ base mtl QuickCheck random test-sandbox transformers ]; @@ -174545,7 +187046,7 @@ self: { mkDerivation { pname = "test-shouldbe"; version = "0.2.1.1"; - sha256 = "a43bd874f17192f622abc9f948531b77358689630d35da2fb755542f29744f71"; + sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base hspec hspec-discover silently ]; description = "Catchy combinators for HUnit"; @@ -174560,7 +187061,7 @@ self: { mkDerivation { pname = "test-simple"; version = "0.1.9"; - sha256 = "eaee79bf997272fe0c97a0cfb80347c760ca5de8ffb0d639ddbf00ba6f6ef51d"; + sha256 = "07gmdrpvl05zvlwxdc7zx1fwlq678w1vikx0jw6gwwkjk6zpkvpa"; libraryHaskellDepends = [ base mtl QuickCheck state-plus template-haskell ]; @@ -174577,7 +187078,7 @@ self: { mkDerivation { pname = "testPkg"; version = "0.0"; - sha256 = "a03548f323235ea3c4ebf78c44a1e03fce506cccd8872614f219770ca0fff752"; + sha256 = "0lppzyh0qxqry8a2d1yqrin51kizw2hl937pxg2a6pi34grlhdd0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -174587,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 = "66592406ff6e1a03d3ae994560e0bf04e500398fd0a9c9be6bca34a3b86f3e83"; + 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; @@ -174609,7 +187114,7 @@ self: { mkDerivation { pname = "testing-feat"; version = "0.4.0.3"; - sha256 = "34ca9c7849c4054b951cb359dc55ec1d24f5c2f7cf31d6211959778ad35407ce"; + sha256 = "1kh7ak9qlxsr34hxccfgyz1ga90xxiaxqndk3jaln1f495w9rjil"; libraryHaskellDepends = [ base mtl QuickCheck tagshare template-haskell ]; @@ -174622,7 +187127,7 @@ self: { mkDerivation { pname = "testing-type-modifiers"; version = "0.1.0.1"; - sha256 = "050bdade2c6f0122b1a04a3833ab7eea2399ffda8258bca6d93ba6614bb202f2"; + sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5"; libraryHaskellDepends = [ base ]; description = "Data type modifiers for property based testing"; license = stdenv.lib.licenses.publicDomain; @@ -174635,9 +187140,9 @@ self: { mkDerivation { pname = "testloop"; version = "0.1.1.0"; - sha256 = "ffac18cca070139638a85d7b83a5d0237726b49e9f8ceba104c683665973cfaf"; + sha256 = "1bygfdcnd0y60jhyp34zkss2cxr3s2jq6ysxm0w9c4vhl361ib7z"; revision = "2"; - editedCabalFile = "cbf63f33f18f023e56798ab7f354db64fff71eba3209deb411f5ae3cfb252a9e"; + editedCabalFile = "17ia4pxkrbpm26sdw29jp8gggzv4vdag7dwag5b3w0lgy4rkzxnb"; libraryHaskellDepends = [ base Cabal directory filepath fsnotify hint mtl system-filepath time unix @@ -174654,9 +187159,9 @@ self: { mkDerivation { pname = "testpack"; version = "2.1.3.0"; - sha256 = "97d82562edfb3fb4a7caf015ce62065efef86b27d9d5eed6bb6fc8d3886905e7"; + sha256 = "1rq5d64d7j3gpgbfxmfr4xmzizjy0ricw5ghrakv8gzvxmi2bn4p"; revision = "1"; - editedCabalFile = "c763bcd695cf8a5c02fb4ac9e73c08f66287d3649e81b9c2882af44700efaf39"; + editedCabalFile = "0fdgxw04gx1ai31bk0cyck9qfqpn10yfgjaazc15r2ngjpbbqqy7"; libraryHaskellDepends = [ base containers HUnit mtl QuickCheck random ]; @@ -174671,7 +187176,7 @@ self: { mkDerivation { pname = "testpattern"; version = "0.1"; - sha256 = "74c01d2240c59a3eea01a9065fad3b9bdf29ae0957e06666f3b27c434ae11328"; + sha256 = "0a0kw5546z5jydk6dq2p16p2kpwv7fnmy1m907m3x6n580i1vh3l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath gtk ]; @@ -174687,7 +187192,7 @@ self: { mkDerivation { pname = "testrunner"; version = "0.9.1"; - sha256 = "5c4530d8e9622d7c848767ea94994f52f137ea07fbaf4d645fd4d662f97807a1"; + sha256 = "1887g3wn5mnlbxj4vbzv0zm3gwaj9ycr9sk7hy27qbb2x7c30iaw"; libraryHaskellDepends = [ base HUnit QuickCheck random regex-compat stm ]; @@ -174701,7 +187206,7 @@ self: { mkDerivation { pname = "tetris"; version = "0.27178"; - sha256 = "fcc91d4a6d39cec252a47528761b47f5a0cefabeaf53b42a9243a9995de09483"; + sha256 = "10wlw1frkaa3j8mb8lxgpvxcx87m8wdpca3mli9c5kirdm51vjgw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT random ]; @@ -174715,7 +187220,7 @@ self: { mkDerivation { pname = "tex2txt"; version = "0.1.0.0"; - sha256 = "1c5cb060e879309cf67198d51b877851c7becbdc9a6ecf195bb01f4ae19d81e0"; + sha256 = "1q41kphll7xhbccwyvlsvk5vxisig23ipmcqf7v9qc3rx1hb0p0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers deepseq parsec ]; @@ -174733,8 +187238,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.9.1"; - sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e"; + version = "0.9.4.1"; + sha256 = "014xka6vz8qc043icrhf5m47g8jwlr608qzymrikjh4nr2r048ih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174757,7 +187262,7 @@ self: { mkDerivation { pname = "texrunner"; version = "0.0.1.1"; - sha256 = "6283145a3f2e0cf4bac62e89bc0e707bc00c2ee1d51e4ba96d36245ae5215d63"; + sha256 = "0qsx47jml91ndnlln7nmw4p0rh3vf07br29fqsxg831f7xd190v2"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl process temporary @@ -174779,7 +187284,7 @@ self: { mkDerivation { pname = "text"; version = "1.2.2.1"; - sha256 = "1addb1bdf36293c996653c9a0a320b5491714495862d997a23fb1ecd41ff395b"; + sha256 = "0nrrzx0ws7pv4dx9jbc6jm2734al1cr0m6iwcnbck4v2yfyv3p8s"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -174794,12 +187299,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text_1_2_2_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , directory, ghc-prim, HUnit, integer-gmp, QuickCheck + , quickcheck-unicode, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "text"; + version = "1.2.2.2"; + sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii"; + libraryHaskellDepends = [ + array base binary bytestring deepseq ghc-prim integer-gmp + ]; + testHaskellDepends = [ + array base binary bytestring deepseq directory ghc-prim HUnit + integer-gmp QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + doCheck = false; + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-all" = callPackage ({ mkDerivation, base, text, text-format, text-show }: mkDerivation { pname = "text-all"; - version = "0.3.0.2"; - sha256 = "1874b6d56a4e31e3754be6d7dadcb3f64dbc86fe473063631a4794f27fa13f85"; + version = "0.3.1.0"; + sha256 = "11326d2il1qv7l1cnyy6n93ik37aah4j1ajwyqyjdz9h3jvbziyy"; libraryHaskellDepends = [ base text text-format text-show ]; homepage = "http://github.com/aelve/text-all"; description = "Everything Data.Text related in one package"; @@ -174807,6 +187337,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-all_0_4_1_1" = callPackage + ({ mkDerivation, base, bytestring, text, text-format, utf8-string + }: + mkDerivation { + pname = "text-all"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-and-plots" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, markdown , text, unordered-containers @@ -174814,7 +187360,7 @@ self: { mkDerivation { pname = "text-and-plots"; version = "0.2.1.0"; - sha256 = "e8a72fa6a54230ff2e390512e949a3f800ac29735795133dfd0eaf6b72935c3a"; + sha256 = "0fjwjdr6pbqfzlyi75apfclsq07qld4yj4h574pgyc22lnk2z9z8"; libraryHaskellDepends = [ base blaze-html bytestring containers markdown text unordered-containers @@ -174830,7 +187376,7 @@ self: { mkDerivation { pname = "text-binary"; version = "0.2.1.1"; - sha256 = "b697b2bd09080643d4686705c779122129638904870df5c1d41c8fc72f08f4a1"; + sha256 = "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn"; libraryHaskellDepends = [ base binary text ]; homepage = "https://github.com/kawu/text-binary"; description = "Binary instances for text types"; @@ -174844,8 +187390,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.4"; - sha256 = "0931b5988b5f86fbfe9055bb4d21fa1fceaaa8b1619aa951b53921ba2b8ce0b7"; + version = "0.4.1"; + sha256 = "089kzb24530j9v95vqlw0z5l4mwmys9y9gsxisjwywxdp7j6zcb3"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -174867,7 +187413,7 @@ self: { mkDerivation { pname = "text-conversions"; version = "0.3.0"; - sha256 = "1756be2f6b515fea9e00b383c00d1ee851f8b25ddbc2901dd6be27d9b6292c21"; + sha256 = "089c56vdj9xysqfr1hnvbnrghlg83q6w10xk02gflpsidcpvwmhp"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring errors text ]; @@ -174884,7 +187430,7 @@ self: { mkDerivation { pname = "text-format"; version = "0.3.1.1"; - sha256 = "6de112764446a65370204f35a5fc4b1831106049f90918545d5dcd2ddd7fee0b"; + sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd"; libraryHaskellDepends = [ array base double-conversion ghc-prim integer-gmp old-locale text time transformers @@ -174894,12 +187440,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-format-heavy" = callPackage + ({ mkDerivation, base, containers, data-default, parsec, text, time + }: + mkDerivation { + pname = "text-format-heavy"; + version = "0.1.1.0"; + sha256 = "082j0dzmy5d8lpjxhg9k7qhnjykg851a0yllszf43kx09hk0kmb1"; + libraryHaskellDepends = [ + base containers data-default parsec text time + ]; + description = "Full-weight string formatting library, analog of Python's string.format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-format-simple" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { pname = "text-format-simple"; version = "1.1.0"; - sha256 = "13e2af87e67ddd359702213c60445d1a6f973f6ef8ca73e96732c739c01e1a47"; + sha256 = "0iqs3v03kirjczlp7jpqdqzrfvqsbm260g110abkbpbxws3szqhk"; libraryHaskellDepends = [ base MissingH ]; description = "Simple text formatting library"; license = stdenv.lib.licenses.bsd3; @@ -174914,7 +187474,7 @@ self: { mkDerivation { pname = "text-generic-pretty"; version = "1.2.1"; - sha256 = "cff331fdea2f695cf9a2583f4bd7393935b4a6ffa2bd47eb7dd983c6184752c7"; + sha256 = "1isj8wccd0yrgpmlggd2zykb8d9r77blngsqlbwmqs9gxbyk3wyg"; libraryHaskellDepends = [ base containers ghc-prim groom ixset-typed protolude QuickCheck string-conversions text time unordered-containers wl-pprint-text @@ -174937,7 +187497,7 @@ self: { mkDerivation { pname = "text-icu"; version = "0.7.0.1"; - sha256 = "e2764c2749033706eed5b9fb3cda11177ad15cdf11912028f551eca39a2c7f78"; + sha256 = "0y3z5jda7v2iyll2148ivxfd2yhp27d3ryxrspp0cdq394klqxp2"; libraryHaskellDepends = [ base bytestring deepseq text ]; librarySystemDepends = [ icu ]; testHaskellDepends = [ @@ -174958,8 +187518,8 @@ self: { }: mkDerivation { pname = "text-icu-normalized"; - version = "0.3.0"; - sha256 = "2a82c5bad47e6b75551a70535aeb574214834b0b4fb190f1f10af750a3245ef0"; + version = "0.4.1"; + sha256 = "0nwma8yvfkmy0zzl3kb9xwmpp3z74aj33mdp7kr036baqvxini04"; libraryHaskellDepends = [ base base-unicode-symbols bytestring lens text text-icu ]; @@ -174981,7 +187541,7 @@ self: { mkDerivation { pname = "text-icu-translit"; version = "0.1.0.7"; - sha256 = "028026a5a73e3bf5373de8895f66409e2841b0353468b7a99d4162af9a9fd5e1"; + sha256 = "1qfmkydayqj1knlvfs1l6nq42a4y81k5z2g87lvzafrylyjjd002"; libraryHaskellDepends = [ base text ]; librarySystemDepends = [ icu ]; testHaskellDepends = [ @@ -174999,7 +187559,7 @@ self: { mkDerivation { pname = "text-json-qq"; version = "0.4.1"; - sha256 = "0f368864ff18f048d2c5ea80632cb936c4a7e54c2ec47aa434f495ef472af58c"; + sha256 = "137m593yz5gl6jj7mi1f9kjsgi1np4n6707aqp94iw0qzxj8hdhg"; libraryHaskellDepends = [ base haskell-src-meta json json-qq parsec template-haskell ]; @@ -175016,7 +187576,7 @@ self: { mkDerivation { pname = "text-latin1"; version = "0.3"; - sha256 = "892bbccaed95502faf33dfda612358f24fcaaee521ffa926b34b5236394e40b3"; + sha256 = "1cs09qwkcljbnckakzr1wnpclkzjb0in3nnz6fpjyl4mxp5bqaw9"; libraryHaskellDepends = [ base bytestring case-insensitive data-checked hashable text ]; @@ -175033,7 +187593,7 @@ self: { mkDerivation { pname = "text-ldap"; version = "0.1.1.8"; - sha256 = "f2466df70426db84435a52bb0fa82065186e49f873aba334dfd06c92ed29c039"; + sha256 = "0ff057nr4v6hvwsa7avkz14nw63542l0zfsjb91q9nr60kvnsipj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175054,7 +187614,7 @@ self: { mkDerivation { pname = "text-lens"; version = "0.1.1"; - sha256 = "d12962a6f4bea85e4661d57d7240ca4a3cce83c623999caa2296632fde1870d8"; + sha256 = "1n3h33g2yqwn4am9r693qs1wwg2ar9074zfmc535xa5yyjk64afi"; libraryHaskellDepends = [ base extra lens text ]; testHaskellDepends = [ base hspec lens ]; homepage = "https://github.com/ChrisPenner/rasa"; @@ -175070,7 +187630,7 @@ self: { mkDerivation { pname = "text-lips"; version = "0.1"; - sha256 = "167934941cd6e74f26ad396c06fa233cc676370134ef8d70faf136d1105d9933"; + sha256 = "0cwrbl8d2dpiz9q8vvrl04vpdiiw4gx0cv1rmlk4zryn3ja38y8n"; libraryHaskellDepends = [ base containers parsers text text-loc transformers ]; @@ -175085,7 +187645,7 @@ self: { mkDerivation { pname = "text-loc"; version = "0.1"; - sha256 = "fcddbf42d5ac6b2029ba6e115c8d033e5f6e4a2c652440b316d42b6a654a3b19"; + sha256 = "069v99jnlayl2srl09355i56wpry0f6mq4bfp8lj0sxcsm1bzpgw"; libraryHaskellDepends = [ base hashable ]; homepage = "https://github.com/mvv/text-loc"; description = "Line-column locations within a text"; @@ -175097,7 +187657,7 @@ self: { mkDerivation { pname = "text-locale-encoding"; version = "0.1.0.2"; - sha256 = "cfa52bca5eb69f8a08b78a5bc585c79f41b8faf6f9858998aa35735c880e44d3"; + sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg"; libraryHaskellDepends = [ base bytestring bytestring-handle text ]; homepage = "https://github.com/exbb2/text-locale-encoding"; description = "Encode and decode Text to/from ByteString using TextEncoding"; @@ -175109,7 +187669,7 @@ self: { mkDerivation { pname = "text-manipulate"; version = "0.2.0.1"; - sha256 = "e0e9c71d9b1cfb7d3bca3d0a500d939b3efc6684515c0d7bd685503aa4f49d2f"; + sha256 = "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion text ]; @@ -175125,7 +187685,7 @@ self: { mkDerivation { pname = "text-markup"; version = "0.1"; - sha256 = "b083c0e94f93b3be5d2a1a2cbd5f854b6b8bfd8f0b34c23257cdabcd8281c0da"; + sha256 = "1nn0h61cvaydawrc4d0bizyqnssbhmgvsb0s59fvxcwk9zlw10xh"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base QuickCheck quickcheck-text tasty tasty-quickcheck text @@ -175142,7 +187702,9 @@ self: { mkDerivation { pname = "text-metrics"; version = "0.2.0"; - sha256 = "082304ce14ac6182cbb93f51207d90b91d104e5d1fc1b17bbe1c9280ebffe43a"; + sha256 = "0fp4zzmq14hwprxv3h8zbm7107drj1yj0l9zp75q4qdc2k7088q8"; + revision = "1"; + editedCabalFile = "1j3xzb7l2qd2340p4hzfpp26y5414h61nkvhpwpg4brmd041h7fh"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; @@ -175151,6 +187713,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-metrics_0_3_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hspec + , QuickCheck, text, vector, weigh + }: + mkDerivation { + pname = "text-metrics"; + version = "0.3.0"; + sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; + libraryHaskellDepends = [ base containers text vector ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + homepage = "https://github.com/mrkkrp/text-metrics"; + description = "Calculate various string metrics efficiently"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-normal" = callPackage ({ mkDerivation, base, deepseq, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -175158,7 +187737,7 @@ self: { mkDerivation { pname = "text-normal"; version = "0.2.1.0"; - sha256 = "3b06f6436e828994d6d1d8ef363adf73462f3a10551c4fbb6c4e605088dd9d81"; + sha256 = "10cxvn450q2fdjxly72m20x2yikkvwx3dvyqs7b992c2dr1zc1iv"; libraryHaskellDepends = [ base deepseq text text-icu ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-instances @@ -175174,9 +187753,9 @@ self: { mkDerivation { pname = "text-position"; version = "0.1.0.0"; - sha256 = "e8055a2d125d84eb861b3e3c9de5339552284957dcbef96053f56f7ef92cb131"; + sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8"; revision = "2"; - editedCabalFile = "47ad75275f3f8f705336ebac8adc9af40682a530668e2e56655a243aa516c8e3"; + editedCabalFile = "1qy82sjkl92scmb2x3k662jq41plkbf8mb7b6r9p13rzbwkpbba7"; libraryHaskellDepends = [ base regex-applicative ]; testHaskellDepends = [ base QuickCheck regex-applicative ]; homepage = "http://rel4tion.org/projects/text-position/"; @@ -175192,7 +187771,7 @@ self: { mkDerivation { pname = "text-postgresql"; version = "0.0.2.2"; - sha256 = "91344e495a83ee7ca372977166523a28bf201a964cac1cc2d8260a448462200d"; + sha256 = "0390ca2482i6v311rb2cjqd21gr87996cwcpfaiprvl3b94lwd4i"; libraryHaskellDepends = [ base dlist transformers transformers-compat ]; @@ -175202,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 @@ -175209,7 +187806,7 @@ self: { mkDerivation { pname = "text-printer"; version = "0.5"; - sha256 = "8f0c01a6a15b4314c2d47ab5f0772d176ec38f1c1fe190b9fa7db5149a6c4a0b"; + sha256 = "02sadjd19dbxzawr1q8z3j7w6vhp5mvz1dbssk118hsvl6k0234g"; libraryHaskellDepends = [ base bytestring pretty semigroups text text-latin1 ]; @@ -175228,7 +187825,7 @@ self: { mkDerivation { pname = "text-regex-replace"; version = "0.1.1.1"; - sha256 = "2f27c43d4e59cfb1be632fe3445e0164cc7e10f3b39f1ed21a1e36d6f0981258"; + sha256 = "0n0jk3qdcdhy3b91x7xkyc87xk3405g49qrgcfzb3ksr9qyw89rg"; libraryHaskellDepends = [ attoparsec base text text-icu ]; testHaskellDepends = [ base hspec QuickCheck smallcheck text text-icu @@ -175244,7 +187841,7 @@ self: { mkDerivation { pname = "text-region"; version = "0.1.0.1"; - sha256 = "5217ff7af33898ca615e5444ba4293f214d6a5cbc8c4eb34ba53845151f61bf1"; + sha256 = "1w8vyr8m312kp8sfpi68rfjxc57jjd1bli2lbrhwm61qydxgy5sj"; libraryHaskellDepends = [ aeson base base-unicode-symbols bytestring containers groups lens mtl text @@ -175257,14 +187854,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text-region_0_2_0_0" = callPackage + "text-region_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , groups, hspec, lens, text }: mkDerivation { pname = "text-region"; - version = "0.2.0.0"; - sha256 = "a8d29fdbd9c185f53daf6b4d02f15336f32e2be4e3e1019549844a4e2023bef0"; + version = "0.3.0.0"; + sha256 = "0xy9lpdn26dla4ad7hcpv51swih4n2iw3n27dq68sdp01rz43sfa"; libraryHaskellDepends = [ aeson base base-unicode-symbols bytestring groups lens text ]; @@ -175280,7 +187877,7 @@ self: { mkDerivation { pname = "text-register-machine"; version = "0.4.0"; - sha256 = "f02e71da264754dc095b6bbc39811b33d0a137e1529e9ccc7472171b1d8c113c"; + sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph"; libraryHaskellDepends = [ base containers mtl vector ]; homepage = "https://github.com/acfoltzer/text-register-machine"; description = "A Haskell implementation of the 1# Text Register Machine"; @@ -175293,7 +187890,7 @@ self: { mkDerivation { pname = "text-render"; version = "0.1.0.2"; - sha256 = "978bc340cba883bfad3300eff67a7fa6689ead23d873ba0d4dd031725bb3cf9d"; + sha256 = "17fgnddp4cfh9l6vlwyq4fnrws56gxxgdvq06fnvz0x8rd0c72wp"; libraryHaskellDepends = [ base classy-prelude mtl parsec text ]; homepage = "http://github.com/thinkpad20/text-render"; description = "A type class for rendering objects as text, pretty-printing, etc"; @@ -175301,6 +187898,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-short" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "text-short"; + version = "0.1"; + sha256 = "0zlkvzh99dyrvvk4i9pbhwkj2kf8akc8j1g3z06saprl7kjz6sn0"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable text + ]; + testHaskellDepends = [ + base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck + text + ]; + description = "Memory-efficient representation of Unicode text strings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant @@ -175312,7 +187929,9 @@ self: { mkDerivation { pname = "text-show"; version = "3.4.1.1"; - sha256 = "f0ba04cb7389decad861b668764f7d7e58a6371269f2ac5809f842d2844f9921"; + sha256 = "08cr9y2d4hpq15carwk928vscn3ygm7pcs5nc7ccmpl9fg5h9fph"; + revision = "2"; + editedCabalFile = "1282q12n11pzih3f86aj1jx60c471s1qz9ih6w7ridgymfdw2iyk"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -175338,6 +187957,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-show_3_6_2" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors + , bytestring, bytestring-builder, containers, contravariant + , criterion, deepseq, deriving-compat, generic-deriving + , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck + , quickcheck-instances, semigroups, tagged, template-haskell, text + , th-abstraction, th-lift, transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.6.2"; + sha256 = "1wqzdpa7wxnqaa62mmw9fqklg12i9gyiaahj6xqy2h3rdw7r5qz2"; + libraryHaskellDepends = [ + array base base-compat bifunctors bytestring bytestring-builder + containers contravariant generic-deriving ghc-boot-th ghc-prim + integer-gmp nats semigroups tagged template-haskell text + th-abstraction th-lift transformers transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat base-orphans bifunctors bytestring + bytestring-builder containers contravariant deriving-compat + generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats + QuickCheck quickcheck-instances semigroups tagged template-haskell + text th-lift transformers transformers-compat void + ]; + benchmarkHaskellDepends = [ + array base base-compat bifunctors bytestring bytestring-builder + containers contravariant criterion deepseq generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-lift transformers transformers-compat void + ]; + homepage = "https://github.com/RyanGlScott/text-show"; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -175350,7 +188006,9 @@ self: { mkDerivation { pname = "text-show-instances"; version = "3.5"; - sha256 = "0c7dbf6e6742460be0d08777ab3759434c12c5b65f273be35afbe0c945690342"; + sha256 = "0hh3d52wkq7vbbikn9sznv2i4k23b4vsnxw7s3h0nij2cxpbyz8c"; + revision = "1"; + editedCabalFile = "1jbqpmphh4zrbdbqrazqls099gd73zmri1maf1qssvm4drz0ffgn"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random @@ -175372,15 +188030,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-show-instances_3_6_2" = callPackage + ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty + , process, QuickCheck, quickcheck-instances, random, semigroups + , tagged, template-haskell, terminfo, text, text-show, th-orphans + , time, transformers, transformers-compat, unix + , unordered-containers, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.6.2"; + sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5"; + libraryHaskellDepends = [ + base base-compat bifunctors binary bytestring containers directory + ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process + random semigroups tagged template-haskell terminfo text text-show + time transformers transformers-compat unix unordered-containers + vector xhtml + ]; + testHaskellDepends = [ + base base-compat bifunctors binary bytestring containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec + old-locale old-time pretty process QuickCheck quickcheck-instances + random semigroups tagged template-haskell terminfo text text-show + th-orphans time transformers transformers-compat unix + unordered-containers vector xhtml + ]; + homepage = "https://github.com/RyanGlScott/text-show-instances"; + description = "Additional instances for text-show"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: mkDerivation { pname = "text-stream-decode"; version = "0.1.0.5"; - sha256 = "fede45dc702b29ca3e25591df7f43244aa1a6ef99bb8bbc2e33aa35934b354e8"; + sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy"; revision = "1"; - editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd"; + editedCabalFile = "1zg9f7dpamgzabvvgsbw0i8931f4pa2q74g2dj5bvk5307s8zsnl"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring deepseq hspec text ]; benchmarkHaskellDepends = [ base bytestring criterion text ]; @@ -175396,7 +188088,7 @@ self: { mkDerivation { pname = "text-time"; version = "0.2.0"; - sha256 = "cf62c803c3532b5ea7c1dec673f86df935d588f9a41e1e6f33b9715d0f2cf392"; + sha256 = "14pk5h7mswdr6dpiw7m4z64dadgrdpw77inyq6kmwaskqc1whqng"; libraryHaskellDepends = [ attoparsec base formatting text time ]; testHaskellDepends = [ attoparsec base Cabal formatting hspec QuickCheck text time @@ -175413,7 +188105,7 @@ self: { mkDerivation { pname = "text-utf7"; version = "0.1.0.0"; - sha256 = "9b4634419f0d072a0457f402662dc568c447ef2b0f54102e619b57b45ee28b4d"; + sha256 = "0kcbw9gb8mwvc4p10m0g5gplgi38qlnnc0plaw22l1qdkx0k8ilv"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring quickcheck-instances tasty tasty-hunit @@ -175429,7 +188121,7 @@ self: { mkDerivation { pname = "text-utils"; version = "0.1.0.0"; - sha256 = "63b6e0bc28907593a5a98c5e27be3ab22b44cdb66c4095461fe4dd683f262662"; + sha256 = "0qi64qznipg43x39ah3cnv6l8axj7az2fplcm6jr6xch52yf1dk3"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HTF text ]; homepage = "https://github.com/agrafix/text-utils#readme"; @@ -175444,7 +188136,7 @@ self: { mkDerivation { pname = "text-xml-generic"; version = "0.1.1"; - sha256 = "300c3a55cae3e97438d8799daf79870a75d56dd746070d713832484fd2c66ff0"; + sha256 = "1w3gqv94yj1j71qhs1s6sxnxax8ahxwsz7brv0w79sg3r9akl31h"; libraryHaskellDepends = [ base bytestring containers haskell98 mtl not-in-base split syb template-haskell xml @@ -175460,7 +188152,7 @@ self: { mkDerivation { pname = "text-xml-qq"; version = "0.1"; - sha256 = "a56515d6c2ea2e94ef3f0ee4cdf6f387d0b5367d3879f25c982b213b888d210c"; + sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5"; libraryHaskellDepends = [ base parsec template-haskell xml ]; homepage = "http://www.github.com/finnsson/text-xml-qq"; description = "Quasiquoter for xml. XML DSL in Haskell."; @@ -175473,7 +188165,7 @@ self: { mkDerivation { pname = "text-zipper"; version = "0.10"; - sha256 = "c59a649757b4e7026c204bdebc08bcfe234f2dbcd252467a6cd8d71c0f38176e"; + sha256 = "0vhp707irmyqdix4clnjphnly8zyph4brpjb41n05rxlaybn96n5"; libraryHaskellDepends = [ base deepseq text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; @@ -175486,7 +188178,7 @@ self: { mkDerivation { pname = "text-zipper-monad"; version = "0.2.0.0"; - sha256 = "8629d0897046167fa96c9a9ba7292a827845e943e19e45a9b77373474b389b35"; + sha256 = "0dcv715lfwvknyllb7p18gllay4258lsg6wsdjlpy5j6f24x0ac6"; libraryHaskellDepends = [ base mtl text-zipper ]; testHaskellDepends = [ base hspec text-zipper ]; homepage = "https://github.com/kseo/text-zipper-monad#readme"; @@ -175502,7 +188194,7 @@ self: { mkDerivation { pname = "text1"; version = "0.0.4"; - sha256 = "17b1175bae397eb48ddeb750820d44d2ac819f79efc5f4d023a1bb00c9737bec"; + sha256 = "1v3vfg4h1fx14g8g9iggg6gq3b6j8h6q4l5pvs6v8zirmrdigc8p"; libraryHaskellDepends = [ base binary lens semigroups text ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -175517,7 +188209,7 @@ self: { mkDerivation { pname = "textPlot"; version = "1.0"; - sha256 = "6d73fe98a29e33507200f27bbd0fb49c7dfcd7a6c8942a543e1988693764b012"; + sha256 = "04mhchvnk20r7ra2m568lvbzqzcwnh7vsyzj01r50cwylacgwwvd"; libraryHaskellDepends = [ array base ]; description = "Plot functions in text"; license = stdenv.lib.licenses.bsd3; @@ -175530,7 +188222,7 @@ self: { mkDerivation { pname = "textlocal"; version = "0.1.0.5"; - sha256 = "8954ff6270c9920fc390be6b9f398975ea06dd6808a411cbf8fa5fb4a9cf3087"; + sha256 = "11rhrylv8pzsz35i3908d3fhdskmi4wrysxyj31hz4n9f1igym49"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-conduit text unix-time @@ -175545,7 +188237,7 @@ self: { mkDerivation { pname = "textmatetags"; version = "0.0.1.2"; - sha256 = "f381d68b96ecd63ed9bd92c49b6676e7071c1ffdd12ffc480d22be683ed287e0"; + sha256 = "1q47s8z6igi21m4gqbyizlgiq1z7frk9pi4jppckxmpcjs5xd0gk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 process ]; @@ -175562,7 +188254,7 @@ self: { mkDerivation { pname = "textocat-api"; version = "0.1.0.0"; - sha256 = "a9cfba0cdc4e60dbef46ecee44f4c1756e57158fe4dceb5cdf0df711f4f09232"; + sha256 = "0cljy3s13xqdvxffpp74iwamfvkmq7s49vpc8vpxnq2fvh6bmkx9"; libraryHaskellDepends = [ aeson base bytestring conduit http-conduit http-types resourcet text transformers @@ -175582,7 +188274,7 @@ self: { mkDerivation { pname = "texts"; version = "0.4.0"; - sha256 = "3069c41bc635b2152987caaa65b490b590f24a7b7b516c28d510666c5aa62397"; + sha256 = "15r3lrd6qrhhsll6qlbvgd5g545mj2s6banahwlibcimqqdw8s9h"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -175593,7 +188285,7 @@ self: { mkDerivation { pname = "textual"; version = "0.2.0.0"; - sha256 = "de00ec44e43d3ed188c13c186d0326cde86fac9b8d0f42e9f937a1038f6c4c39"; + sha256 = "0facdj7h789pz7ll43wdkfn6zs6d4q1ns61wq64d2gixwi2fq06y"; libraryHaskellDepends = [ base bytestring text utf8-string ]; homepage = "https://sealgram.com/git/haskell/text-like/"; description = "Textual type class for data that represent text"; @@ -175606,7 +188298,7 @@ self: { mkDerivation { pname = "tf-random"; version = "0.5"; - sha256 = "2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510"; + sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f"; libraryHaskellDepends = [ base primitive random time ]; description = "High-quality splittable pseudorandom number generator"; license = stdenv.lib.licenses.bsd3; @@ -175617,7 +188309,7 @@ self: { mkDerivation { pname = "tfp"; version = "1.0.0.2"; - sha256 = "9a817090cb91f78424affc3bfb6a7ea65b520087b779c9fd501fc9779e654cda"; + sha256 = "1njccng7gj8za3ywjydphw054nx6grmgnfzwmwj89xwirf8710cs"; libraryHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ base QuickCheck ]; homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic"; @@ -175630,7 +188322,7 @@ self: { mkDerivation { pname = "tfp-th"; version = "0.8"; - sha256 = "f5cfed02c2a63ace2a517dd5d0333622d81e6895ad851307bdcea31937672d8d"; + sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm"; libraryHaskellDepends = [ base template-haskell tfp ]; homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic"; description = "Template-Haskell code for tfp"; @@ -175645,7 +188337,7 @@ self: { mkDerivation { pname = "tftp"; version = "0.2"; - sha256 = "96eb4db7b255f161bf3708e703f3cbf7fd70f453ecda018b31f1835f3eb42535"; + sha256 = "0d95nhz5z0zi665h3npcags71zgprgrh7rq86yzn3wamnavlvswn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175669,13 +188361,28 @@ self: { mkDerivation { pname = "tga"; version = "0.2"; - sha256 = "0ecae6ee98298b52e07cc1971a2d3663b9d970c9760ace07c0ecf872ca2fec52"; + sha256 = "0lpc5z575y7cq03ww2knr5qdkfb36qnim5y1gkh552r9k3pfdjhf"; libraryHaskellDepends = [ base bytestring ]; description = "Reading and writing of tga image files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "th-abstraction" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.3.0"; + sha256 = "00yy303rrnx26z9aam33j8m1v0dq5wxk71901fbl50jm9mdg4jwm"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + homepage = "https://github.com/glguy/th-abstraction"; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -175684,7 +188391,7 @@ self: { mkDerivation { pname = "th-alpha"; version = "0.2.1.0"; - sha256 = "02b1c1f8508c30b92d90bd3852a4f9a4b53738976e3e56f8382fc20206afa5ec"; + sha256 = "1v55mw305hig73w5cgkfjww3gdd4z6j54f5xj0nvjc4ca3wc3c82"; libraryHaskellDepends = [ base containers mmorph mtl template-haskell th-desugar transformers ]; @@ -175701,7 +188408,7 @@ self: { mkDerivation { pname = "th-build"; version = "0.4.0.0"; - sha256 = "e6a7fd93ad038826f781ab3e55b137a97eae4d718045df6da913e23af9632638"; + sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/DanielSchuessler/th-build"; description = "More convenient construction of TH ASTs"; @@ -175714,7 +188421,7 @@ self: { mkDerivation { pname = "th-cas"; version = "0.1.0"; - sha256 = "6caab40db7a8aba41760c1b4ef884f52de0905ff8865dd7f6ab7ca5446b9653f"; + sha256 = "0gv5p5359jmpd9zxsrc8zw2hkpjj9y4fzd61c0bs9ax8nw6v9akc"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github/junjihashimoto/th-cas"; @@ -175731,7 +188438,7 @@ self: { mkDerivation { pname = "th-context"; version = "0.24"; - sha256 = "a04e7033443836628ee2bccfe4d4aefd0a65576f3e8c30fdcbc4abd916373949"; + sha256 = "0j9r6wbdkay4rgyk131ydxbna2pxmvaf9kxwwa764diq8hrp0km0"; libraryHaskellDepends = [ atp-haskell base containers data-default haskell-src-exts lens mtl mtl-unleashed pretty syb template-haskell th-desugar th-orphans @@ -175751,8 +188458,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.0.2.2"; - sha256 = "a1b58dfb959d982d0935494c3effe75a5c3804d0a15357b7cab12ce9be62ce38"; + version = "0.0.2.4"; + sha256 = "0zs36p32khrvdi5m6zhf93jyrcv184bhyxp49w8cj0fms51w2vcs"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; @@ -175765,9 +188472,9 @@ self: { mkDerivation { pname = "th-desugar"; version = "1.6"; - sha256 = "c8f8ece2bde9b12070ea50bc089fbc672f144659225d837478fbc793777f634f"; - revision = "1"; - editedCabalFile = "ba5a42169a8e996cf9d82fdb1a6a2faa1fab3f71f1c58e77f51cd655007d312d"; + sha256 = "0kv3gxvr7izvg1s86p92b5318bv7pjghig2hx9q21cg9ppifry68"; + revision = "2"; + editedCabalFile = "0rimjzkqky6sq4yba7vqra7hj29903f9xsn2g8rc23abrm35vds3"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-expand-syns th-lift th-orphans @@ -175781,12 +188488,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-desugar_1_7" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb + , template-haskell, th-expand-syns, th-lift, th-orphans + }: + mkDerivation { + pname = "th-desugar"; + version = "1.7"; + sha256 = "1iqlqadax1ahgv9h1vdyddf55v2h4ghqrxfyqirrvk97iyk1rcsj"; + libraryHaskellDepends = [ + base containers mtl syb template-haskell th-expand-syns th-lift + th-orphans + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-expand-syns + th-lift th-orphans + ]; + homepage = "https://github.com/goldfirere/th-desugar"; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-expand-syns" = callPackage ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.2.0"; - sha256 = "66fed79828e9a13375f0f801f5ecc3763186667228ad91e19919219ff1654db9"; + version = "0.4.3.0"; + sha256 = "17b73q0d5r8xixhvdp0hv4ap96l7s3f2y0j5cknp81b1hyinivlz"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/DanielSchuessler/th-expand-syns"; @@ -175799,7 +188528,7 @@ self: { mkDerivation { pname = "th-extras"; version = "0.0.0.4"; - sha256 = "8feff450aaf28ec4f08c45a5656c62879861a8e7f45591cb367d5351ddc3fbed"; + sha256 = "1vgvqgfm2lvx6v5r2mglwyl63647c9n6b9a5ikqc93pjm98g9vwg"; libraryHaskellDepends = [ base syb template-haskell ]; homepage = "https://github.com/mokus0/th-extras"; description = "A grab bag of functions for use with Template Haskell"; @@ -175811,7 +188540,7 @@ self: { mkDerivation { pname = "th-fold"; version = "0.0.0.1"; - sha256 = "5fb88f2e441ac24f86db3024de624a9f75e9cd8eb01d8282feafc44e0e57c182"; + sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://code.haskell.org/~mokus/th-fold"; description = "TH fold generator"; @@ -175824,7 +188553,7 @@ self: { mkDerivation { pname = "th-inline-io-action"; version = "0.1.0.1"; - sha256 = "78dae84932b62a5dd487cbcc803d519bab4ba1bec867271a234898e2fd73bd27"; + sha256 = "09xxfgyy56284cd2fry8pshlpawva4yq1k6bhza5samn694yinkq"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/tolysz/inline-io-action"; description = "Simple inline IO action into compiled code using TH"; @@ -175838,7 +188567,7 @@ self: { mkDerivation { pname = "th-instance-reification"; version = "0.1.4"; - sha256 = "71da68020f4275002741f9d064dffd93a70e67c64ea31d5351a8b08b3b3ed832"; + sha256 = "0cnq7qxqpc58a59iv8sfqrkhx9wkzpgn9l7r84kh0xa21w16inki"; libraryHaskellDepends = [ base containers list-extras loch-th placeholders template-haskell th-expand-syns @@ -175862,7 +188591,7 @@ self: { mkDerivation { pname = "th-instances"; version = "0.1.0.14"; - sha256 = "1b78f6f5444a92e875ffeb293d9aaf6b1155590d721e6dffce5efe2005abeac7"; + sha256 = "1izamc2j1zjyrvzns7kj1mcma4bbmyd3sagbzxsyi4ja8kszcy0v"; libraryHaskellDepends = [ base checkers derive mtl QuickCheck template-haskell th-kinds th-lift @@ -175882,7 +188611,7 @@ self: { mkDerivation { pname = "th-kinds"; version = "0.1.1"; - sha256 = "ab388f37f83e533d01bfd0d5cd256b231f218043819c3c214ed1b7e72d071635"; + sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b"; libraryHaskellDepends = [ base containers mtl template-haskell ]; description = "Automated kind inference in Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -175896,7 +188625,7 @@ self: { mkDerivation { pname = "th-kinds-fork"; version = "0.2"; - sha256 = "fce4c9c8f8ca4c00acd2674319901fd2a21f2742644cdbb919cfb23a87122131"; + sha256 = "0c912a3kmcng36wxnk3488kiz8nj3y81jhv7san00k6az34ckr7w"; libraryHaskellDepends = [ base containers mtl template-haskell th-orphans ]; @@ -175909,8 +188638,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "th-lift"; - version = "0.7.6"; - sha256 = "326a2c9dac32506d5b7e5d9f3234c0e7a33a612256e4745bfb8de5a32803ecd1"; + version = "0.7.7"; + sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ghc-prim template-haskell ]; homepage = "http://github.com/mboes/th-lift"; @@ -175925,7 +188654,7 @@ self: { mkDerivation { pname = "th-lift-instances"; version = "0.1.11"; - sha256 = "1da46afabdc73c86f279a0557d5a8f9af1296f9f6043264ba354b1c9cc65a6b8"; + sha256 = "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift vector ]; @@ -175944,7 +188673,7 @@ self: { mkDerivation { pname = "th-orphans"; version = "0.13.3"; - sha256 = "7380d5b66d0c754e383e7b16e982b5d9ddf5f45f5a33118a20023ec8af78c46d"; + sha256 = "0vf4g2pwhgh242512cssbzsgbpfrnn1fj5kv7qw4wx8cdnvdb03k"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -175960,7 +188689,7 @@ self: { mkDerivation { pname = "th-printf"; version = "0.3.1"; - sha256 = "ea3cccf9abc8633aa5d347aef20822f0869e1e6f3929951f481befad2ecd2f21"; + sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell text transformers ]; @@ -175976,8 +188705,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; - version = "0.0.1.1"; - sha256 = "721ca5a1e2c31c8381e53a30a551057309c077c68904667b16a94a357c1ac513"; + 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"; @@ -175990,8 +188719,8 @@ self: { }: mkDerivation { pname = "th-reify-many"; - version = "0.1.6"; - sha256 = "aea5d277af954ec41d8c129b9e0761a0e628b6e216d0243fb2600339bbfce6ac"; + version = "0.1.7"; + sha256 = "1sa4gxkkv30h6g12cqss3qffmphcamfqmvnn69ix2w0wlsya81m8"; libraryHaskellDepends = [ base containers mtl safe template-haskell th-expand-syns ]; @@ -176006,7 +188735,7 @@ self: { mkDerivation { pname = "th-sccs"; version = "0.0.0.20110723"; - sha256 = "86feb152939b648d5b53e83cc5934035ec45f5bafe1458f11422892d1bc7326f"; + sha256 = "0vrjqwdjv2922kqmh57ypbslbv1m829wag78addqsr4vjd9b3zl6"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Binding group analysis in Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -176018,7 +188747,7 @@ self: { mkDerivation { pname = "th-to-exp"; version = "0.0.1.0"; - sha256 = "30283dcba984a48a048f77a5405be78df338050ad97da9df21fcfe49e519bf56"; + sha256 = "0mmz37jlkzpw47gsjzfr182kiwwdwxdl19bpiw28m944m75ksa1h"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; @@ -176031,7 +188760,7 @@ self: { mkDerivation { pname = "th-traced"; version = "0.0.1.0"; - sha256 = "e267a20fa11bd42a4c4018cc428051089225514f11e38ad1821842f03abbb0c2"; + sha256 = "1hmhpcxg0hhqhb8qmqqi9x8jb4h8a6045k0q8162mm0vl47s4rz2"; libraryHaskellDepends = [ base containers mtl template-haskell ]; homepage = "https://github.com/konn/th-traced"; description = "Tracing Q monad computation"; @@ -176040,25 +188769,19 @@ self: { }) {}; "th-typegraph" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring, containers - , data-default, deepseq, ghc-prim, haskell-src-exts, hspec - , hspec-core, lens, mtl, mtl-unleashed, pretty, set-extra, syb - , template-haskell, text, th-context, th-desugar, th-lift-instances - , th-orphans, th-reify-many + ({ mkDerivation, aeson, base, cereal, containers, fgl, lens, mtl + , parsec, pretty, safecopy, split, syb, template-haskell, text + , th-desugar, th-lift, th-lift-instances, th-orphans, time, userid + , web-routes }: mkDerivation { pname = "th-typegraph"; - version = "0.35.1"; - sha256 = "30995f3cf18b3752b353a4e178bc196647238c70d165134b975990f4f0c487df"; + version = "1.0"; + sha256 = "0p6cczd087lk8mxmax149d3zwmpskyj5ms0gdfdxff927q9g1aj6"; libraryHaskellDepends = [ - base base-compat containers data-default haskell-src-exts lens mtl - mtl-unleashed pretty set-extra syb template-haskell th-context - th-desugar th-lift-instances th-orphans - ]; - testHaskellDepends = [ - array base bytestring containers data-default deepseq ghc-prim - hspec hspec-core lens mtl mtl-unleashed syb template-haskell text - th-desugar th-orphans th-reify-many + aeson base cereal containers fgl lens mtl parsec pretty safecopy + split syb template-haskell text th-desugar th-lift + th-lift-instances th-orphans time userid web-routes ]; homepage = "https://github.com/seereason/th-typegraph"; description = "Graph of the subtype relation"; @@ -176073,7 +188796,7 @@ self: { mkDerivation { pname = "th-utilities"; version = "0.2.0.1"; - sha256 = "65c64cee69c0d9bf8d0d5d4590aaea7dcf4177f97818526cbb3fac20901671d6"; + sha256 = "1mki2s821b1zpdn5463qz5vl3kvxxam90iax1n6vznf0d7p4rik5"; libraryHaskellDepends = [ base bytestring containers directory filepath primitive syb template-haskell text th-orphans @@ -176094,8 +188817,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.1.2.0"; - sha256 = "c4dc8038b004f192854c5e8341c8cc4637f6c9d340a76e77f9e36ee412a7eb88"; + version = "1.1.3.0"; + sha256 = "0bw3y1vlh36dnsc8npx3nf00n86qbz61xfkjvlp1knidda3q0d1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176123,9 +188846,9 @@ self: { mkDerivation { pname = "themplate"; version = "1.2"; - sha256 = "2352212b0d13744e926a70eb93a6ab273f01e8919102ce9a1c4989469c71cf46"; + sha256 = "0ingf6f4d2a93jdcw0lij7l02gr7mfk97svhda94wx0k1lmj2li3"; revision = "1"; - editedCabalFile = "9562873914a204ed7daf91844f70592385a93b6c348798dc8772b439436ca109"; + editedCabalFile = "02d1di1kkd3jhzf9i1rldhxsk193b5q4z14imxyys1522hwqfqlm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176147,7 +188870,7 @@ self: { mkDerivation { pname = "thentos-cookie-session"; version = "0.9.1"; - sha256 = "e4f72fc67472d3ae5eb44faf8167b2ee1a20dd7b2a6fe13d93fee1530fb7f0b7"; + sha256 = "1dzhnw7m7qgyjcyy2vraggfj06pfn9kq3bsgnigaxlvjfk32zxz4"; libraryHaskellDepends = [ aeson base bytestring cookie cryptonite digestive-functors lens memory mtl resourcet sandi servant servant-server @@ -176169,7 +188892,7 @@ self: { mkDerivation { pname = "theoremquest"; version = "0.0.0"; - sha256 = "c160e75e395e54b0fa6442c4639f4bbd6d74fb113a62013dcde0f025ef95e017"; + sha256 = "05z0jppjbw70rlyh2qis27xp8vdx9fgn7i22ckxb0m2y75gffq61"; libraryHaskellDepends = [ base HTTP json utf8-string ]; description = "A common library for TheoremQuest, a theorem proving game"; license = stdenv.lib.licenses.bsd3; @@ -176181,7 +188904,7 @@ self: { mkDerivation { pname = "theoremquest-client"; version = "0.0.0"; - sha256 = "6af80811d79eaba39f7894e51e97ba3b8068bd8582916f7ff2ec09a5cb5fae4d"; + sha256 = "0kdfbz5sa2gcy9znz4c2hnyni01vpabixrclg2gs7awysw8hiy3a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HTTP network theoremquest ]; @@ -176200,9 +188923,9 @@ self: { mkDerivation { pname = "these"; version = "0.7.3"; - sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b"; - revision = "2"; - editedCabalFile = "12ec949fc6530adb5b534e773a786d467f59e8087480d5b50a298894aec96e2b"; + sha256 = "16rx5929skbpn7f5v4hnnyps01y3bm51cr4z5b5zzjn23q8rqcql"; + revision = "4"; + editedCabalFile = "1hkhibphw12xshs24nnx20pkb0mdn5df67kjldj7phkvg88jmcyw"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -176218,12 +188941,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "these_0_7_4" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, containers + , data-default-class, deepseq, hashable, keys, mtl, profunctors + , QuickCheck, quickcheck-instances, semigroupoids, tasty + , tasty-quickcheck, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "these"; + version = "0.7.4"; + sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; + revision = "1"; + editedCabalFile = "15vrym6g4vh4fbji8zxy1kxajnickmg6bq83m4hcy5bfv7rf9y39"; + libraryHaskellDepends = [ + aeson base bifunctors binary containers data-default-class deepseq + hashable keys mtl profunctors QuickCheck semigroupoids transformers + transformers-compat unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + aeson base bifunctors binary containers hashable QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thespian" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "thespian"; version = "0.999"; - sha256 = "d6b2856d7c8bce362a06f48d7400d583f03434fb5a063ddef92077e398c46c7c"; + sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://bitbucket.org/alinabi/thespian"; description = "Lightweight Erlang-style actors for Haskell"; @@ -176235,7 +188987,7 @@ self: { mkDerivation { pname = "theta-functions"; version = "1.0.1"; - sha256 = "0e7d531700c7c08b80d63f27e1ff0cd01126f1d21f3779f036aa2859ce0a3355"; + sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/hijarian/theta-functions"; description = "Theta-functions implemented as trigonometric series"; @@ -176247,7 +188999,7 @@ self: { mkDerivation { pname = "thih"; version = "1.0"; - sha256 = "15684654a6d533b957729ec1699e12e8ee33cd08b480650be6b2bb41d5f92847"; + sha256 = "0ir8z7al3fxjwq5nb05l136k7vp82ag6khcyf9bvjcymlra4cs0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base pretty ]; @@ -176264,7 +189016,7 @@ self: { mkDerivation { pname = "thimk"; version = "0.3.1"; - sha256 = "20fe22aec4a5c27c6a4d6e0b54fe49e16dc101d95ab943eeeb9486ba6c365fde"; + sha256 = "1pjz6rnbm1llxgp47fasv40w2vg197z582vf9mm7rhm5qjp25zi0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176283,9 +189035,9 @@ self: { mkDerivation { pname = "thorn"; version = "0.2"; - sha256 = "304092862e88464550e3f600fd48ef802c1b382554c369ce733132229f763dcf"; + sha256 = "1krxfsgj4ciifg76khsl4lw1nb40xx4gs07nwd84ail85s394h1h"; revision = "1"; - editedCabalFile = "d19e959e95f55075f6f4f0013cbc980e2c351c871e3d9d5bbe2febafb7711b9a"; + editedCabalFile = "16hvf6vszsrgprdrsg8yhwf3ab0fk2y3q0ghykv7al7mjng9b7ni"; libraryHaskellDepends = [ base bifunctors containers contravariant mtl profunctors random template-haskell @@ -176301,7 +189053,7 @@ self: { mkDerivation { pname = "thread-local-storage"; version = "0.1.1"; - sha256 = "11a0dfa77abf3d39e33529975aade945b0a6720143b3b134fd9460b0889845ca"; + sha256 = "1jj5k24b0q4lzlsb3cs305radc25x6nmm5r96pikjgdzgakxz80i"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ atomic-primops base ]; benchmarkHaskellDepends = [ atomic-primops base criterion ]; @@ -176310,12 +189062,27 @@ 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 { pname = "threadPool"; version = "0.3.1"; - sha256 = "915fc3b528fa75cce8419a7364c56e26e6aa44b25601ee8bde7335aad344f9a3"; + sha256 = "18zr8k9sldbkvs5yw0ann92amri6dv2n8wws87lcqxgs52sw6pwi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -176329,7 +189096,7 @@ self: { mkDerivation { pname = "threadmanager"; version = "0.1.7"; - sha256 = "2e81795ca3b066138e4f1b703df2b7a306e423bf61b7d1124379d1a82834429f"; + sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f"; libraryHaskellDepends = [ base containers ]; description = "(deprecated in favor of 'threads') Simple thread management"; license = stdenv.lib.licenses.bsd3; @@ -176342,7 +189109,7 @@ self: { mkDerivation { pname = "threads"; version = "0.5.1.4"; - sha256 = "d3b805b743cc7c0bce2a9b142f45bb1ad07e7bd6c2bd97a5fc442c007276febd"; + sha256 = "1ggyfrr00b24zjjrggf2srxpxl0spd2jy54v5b70nz6c8fvhbf6k"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit @@ -176357,7 +189124,7 @@ self: { mkDerivation { pname = "threads-extras"; version = "0.1.0.2"; - sha256 = "4defab98b8a767b9580413d530e6823e53f6169671e53b6f8b6bfea89fde2575"; + sha256 = "0x95vsgsizkbidpkprbijqbgclryhbk31m8k0icbjrx7p2capvsd"; libraryHaskellDepends = [ base stm threads ]; testHaskellDepends = [ base ]; description = "Extends the threads package with a bounded thread group"; @@ -176370,7 +189137,7 @@ self: { mkDerivation { pname = "threads-pool"; version = "0.1"; - sha256 = "7f7621a065b0cd825968e036bc8292931c0975aa16df8899001939a5ba533ef4"; + sha256 = "1x1yafxaaf8r02cqipqnm9shj74kja1bqdp0d1cq5kdhcnh22xkz"; libraryHaskellDepends = [ base containers mtl stm ]; description = "A library to operate with pool of haskell's IO threads"; license = stdenv.lib.licenses.bsd3; @@ -176384,7 +189151,7 @@ self: { mkDerivation { pname = "threads-supervisor"; version = "1.1.0.0"; - sha256 = "2297578d072548bcc59bbc81268dcc18fbe6216c8634831991db41f87836ce6e"; + sha256 = "0vnf6rwghhfvj4cq6d46dhhydyqqrj6jd0dwkg2vqj150y6mg5r2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176405,8 +189172,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.7"; - sha256 = "cc5653831252d55b3ba7506ea648e770b2c4489cdf4d78828f07dc24ea7ffdb6"; + version = "0.2.8"; + sha256 = "067jwdh0xbv02mh9narwnw36wvz0d1v5wwhysmzbfc263l0iazn2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176425,7 +189192,7 @@ self: { mkDerivation { pname = "threefish"; version = "0.2.6"; - sha256 = "21b9eae06fb2355dcb4a04cb93fdf1557202aa59c5e99ce0fc959fe545ed9bec"; + sha256 = "1v4vxm2yb7wmzkh9rsf5b6m04wjmy7yr7jq49b5msddjdzhfmf91"; libraryHaskellDepends = [ array base bytestring cereal crypto-api data-default entropy random tagged @@ -176435,6 +189202,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-editors" = callPackage + ({ mkDerivation, base, casing, containers, data-default + , generics-sop, profunctors, threepenny-gui + }: + mkDerivation { + pname = "threepenny-editors"; + version = "0.3.0"; + sha256 = "090nhbb4yzjjmbbh1n48mi5i2kkky7s4kjwvmvbgf1694yjbb5ss"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base casing containers data-default generics-sop profunctors + threepenny-gui + ]; + homepage = "https://github.com/pepeiborra/threepenny-editors"; + description = "Composable algebraic editors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "threepenny-gui" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, filepath, hashable, network-uri, safe @@ -176443,8 +189229,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.7.0.1"; - sha256 = "b5802dbb6c43304d613373f464d6fd16a4f219a5d289be003a28c2c46cae44c8"; + version = "0.7.0.2"; + sha256 = "0yc4n9b3my7mfq4w28yk4pjh14wqg116gqgx3w8wr26j0yn3y8j0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176459,12 +189245,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "threepenny-gui_0_8_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, exceptions, filepath, hashable + , network-uri, safe, snap-core, snap-server, stm, template-haskell + , text, transformers, unordered-containers, vault, vector + , websockets, websockets-snap + }: + mkDerivation { + pname = "threepenny-gui"; + version = "0.8.0.0"; + sha256 = "1zlkmk0jf4njfc2zk61lvxmr0cy5pzlnrv7r5admy00ha04spnx1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deepseq + exceptions filepath hashable network-uri safe snap-core snap-server + stm template-haskell text transformers unordered-containers vault + vector websockets websockets-snap + ]; + homepage = "http://wiki.haskell.org/Threepenny-gui"; + description = "GUI framework that uses the web browser as a display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui-contextmenu" = callPackage ({ mkDerivation, base, threepenny-gui }: mkDerivation { pname = "threepenny-gui-contextmenu"; version = "0.1.0.0"; - sha256 = "090fa5588d278aba7c46ba98ff6055512e2f04ac8dd1ee4faaebc79905d44252"; + sha256 = "0lj2sh2rkizbm97yxlcdmh22ybjiamhgz65s8rybm2i7imcaa3q9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base threepenny-gui ]; @@ -176480,7 +189291,23 @@ self: { mkDerivation { pname = "threepenny-gui-flexbox"; version = "0.3.0.2"; - sha256 = "cd38f3ca7672d3f418ec1c9c93e00563178177e407f0013ee3b2eb7f8c00ed2d"; + sha256 = "0bgd0267zsxjwcz03w07wivq25v30ph9770wxhcg9lvjfv5g6f6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base clay text threepenny-gui ]; + executableHaskellDepends = [ base threepenny-gui ]; + homepage = "https://github.com/barischj/threepenny-gui-flexbox"; + description = "Flexbox layouts for Threepenny-gui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "threepenny-gui-flexbox_0_4_2" = callPackage + ({ mkDerivation, base, clay, text, threepenny-gui }: + mkDerivation { + pname = "threepenny-gui-flexbox"; + version = "0.4.2"; + sha256 = "1xghm7f49gvl1mk7h4bdvck7yn0jx53qq2wvzkkqwi78q0w2b1l6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base clay text threepenny-gui ]; @@ -176500,7 +189327,7 @@ self: { mkDerivation { pname = "thrift"; version = "0.10.0"; - sha256 = "6706e64419eee8579b9e9330d8c210211c87c86e02c19a3ca856db47cc8c7d07"; + sha256 = "01vxik64gnsnm0y9mh82dv48f711231dhc4kksdmgs7f352fc1k7"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring containers ghc-prim hashable HTTP network network-uri QuickCheck split text @@ -176520,7 +189347,7 @@ self: { mkDerivation { pname = "thrist"; version = "0.3.0.2"; - sha256 = "175b2b306825d3a4c536e8a5aace903eb71466928064870ef2a09d796bd1c407"; + sha256 = "01y4s5mpk7d0y878fr40j9k19dryj37am9g86v2s9lr5d0q2nnqp"; libraryHaskellDepends = [ base ]; homepage = "http://heisenbug.blogspot.com/search/label/thrist"; description = "Type-threaded list"; @@ -176532,7 +189359,7 @@ self: { mkDerivation { pname = "throttle"; version = "3.0.0"; - sha256 = "8ce272ffbcd4a5b1414b331436c60810b9cf2fc30d802703670b2942c4c1b5fb"; + sha256 = "1yxmq7244a8bcw1jg00dqcpwzf8h1333c51k9d0v39flpkzp5qlc"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -176543,7 +189370,7 @@ self: { mkDerivation { pname = "throttled-io-loop"; version = "0.1.0.2"; - sha256 = "d5284e5d7e49905a2b9a63963816ee85086197d0f27af0bfa2d6e1cd1d71350c"; + sha256 = "031mf4fwvqfnlazz0ypjs2bn2245xqb3i5k3k8mmm429grflwa6m"; libraryHaskellDepends = [ base natural-numbers time ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/AxialExchange/haskell-throttled-io-loop#readme"; @@ -176557,21 +189384,39 @@ self: { mkDerivation { pname = "through-text"; version = "0.1.0.0"; - sha256 = "933225da128906e61865ccd1da73463781b890d742cbb38f52524d94ac19b4cd"; + sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; revision = "1"; - editedCabalFile = "f0c09f65756b493eee2c55f4ef5ef1f71f1afe9b0d19448c34bf1db6e942a865"; + editedCabalFile = "0rd88blvc7dz6j64868dkgz1l7zpy5gfzx2m5kp3wjbbfmjrzh7h"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; homepage = "https://www.github.com/bergmark/through-text"; description = "Convert textual types through Text without needing O(n^2) instances"; license = stdenv.lib.licenses.bsd3; }) {}; + "throwable-exceptions" = callPackage + ({ mkDerivation, base, doctest, either, safe-exceptions, silently + , tasty, tasty-discover, tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "throwable-exceptions"; + version = "0.1.0.8"; + sha256 = "0d8dxrd922rxnn417yn2ij71v6vb9c5i37qvcmdixfh773p9sm8r"; + libraryHaskellDepends = [ base safe-exceptions template-haskell ]; + testHaskellDepends = [ + 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"; + license = stdenv.lib.licenses.mit; + }) {}; + "thumbnail" = callPackage ({ mkDerivation, base, bytestring, gd }: mkDerivation { pname = "thumbnail"; version = "0.8.0"; - sha256 = "6d22a6491362c6831712d1f3c4dc91c50255f8968782a5cdbef3664af8bf47d7"; + sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd"; libraryHaskellDepends = [ base bytestring gd ]; homepage = "https://github.com/cutsea110/thumbnail"; description = "generate thumbnail image"; @@ -176586,7 +189431,7 @@ self: { mkDerivation { pname = "thumbnail-plus"; version = "1.0.5"; - sha256 = "81907f62a172f044dbc5c17feb18adee3512eb39c0fd54fb3af42b6d9ff3400c"; + sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441"; libraryHaskellDepends = [ base bytestring conduit conduit-extra data-default directory either gd imagesize-conduit resourcet temporary transformers @@ -176610,7 +189455,7 @@ self: { mkDerivation { pname = "thyme"; version = "0.3.5.5"; - sha256 = "84c6701fb7b40841d22582202382c362fd9e0d6e5f1c959b7e0f2f91a85c796c"; + sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers deepseq mtl old-locale profunctors QuickCheck random text time vector vector-space @@ -176637,13 +189482,13 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { pname = "tianbar"; version = "1.2.5"; - sha256 = "c18c29594d5ca7762246a531b7da920d98f04e4432a9f46d788a0ecaf80e83c6"; + sha256 = "1il31vwcl3lag1nz9a9j8i7g160djbdbfcd58qi7d9sw9mcjk361"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176655,7 +189500,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkit2gtk ]; + executablePkgconfigDepends = [ gtk3 webkitgtk ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -176667,7 +189512,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;}; + }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec @@ -176675,8 +189520,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.1"; - sha256 = "fa38e4f2062e801c5f8bccb2afea945cfcf40bd24671d9080bf538e0533bbb2a"; + version = "0.1.1.2"; + sha256 = "10n0vbhkyvq5mcf98mbh06pzzp3f2k1w9mk576h3ciyh8rirvl4d"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -176694,7 +189539,7 @@ self: { mkDerivation { pname = "tic-tac-toe"; version = "0.1"; - sha256 = "0148047de472a013841c02a90c328e771957a19a6b9b5f706f3f20f1bbd0b42d"; + sha256 = "0bdls2xz281zdxq5z6vbkahmf6bpiqr0ra823j21783jwiyh8j01"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base glade gtk haskell98 ]; @@ -176712,7 +189557,7 @@ self: { mkDerivation { pname = "tickle"; version = "0.0.6"; - sha256 = "a5701be4825537d2426f1d84366847b50876087319bdf8df96028b8f874ebba7"; + sha256 = "19xv9s3qz2q2jvgzig8rfc47c25m8xl3d10xdx1d4dsmhbj1nw55"; libraryHaskellDepends = [ base bifunctors bytestring filepath lens mtl semigroupoids semigroups transformers validation @@ -176731,7 +189576,7 @@ self: { mkDerivation { pname = "tictactoe3d"; version = "0.1.0.3"; - sha256 = "e162cfdc30aac18f0ddb98ee3d3de72c584523937a88250742d75e0a9762ee76"; + sha256 = "0xpfcabhlpnp883jb23sjcilan1cwwykvvlqvc6qzhda63fcyqp1"; libraryHaskellDepends = [ base tuples-homogenous-h98 vector ]; homepage = "https://github.com/ryo0ka/tictactoe3d"; description = "3D Tic-Tac-Toe game"; @@ -176747,7 +189592,7 @@ self: { mkDerivation { pname = "tidal"; version = "0.8.2"; - sha256 = "f79854db40b83ec24055d27e49c37678c8d2fe2054143c66b410754648443a8b"; + sha256 = "12rs8i44cx8hnik3q52l43zd5j3qfv1ljznjam0c4gmq83dm967p"; libraryHaskellDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -176758,14 +189603,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_0_9_4" = callPackage + ({ mkDerivation, base, colour, containers, hashable, hosc + , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit + , text, time, websockets + }: + mkDerivation { + pname = "tidal"; + version = "0.9.4"; + sha256 = "1i290r4invm7haw1pcq2v60iz7wr73c6qfxkghx6kfgawyl0v3pn"; + libraryHaskellDepends = [ + base colour containers hashable hosc mersenne-random-pure64 mtl + parsec safe text time websockets + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://tidalcycles.org/"; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers }: mkDerivation { pname = "tidal-midi"; - version = "0.8.2"; - sha256 = "3638e4d7f853d1a73929624ec34b2364469339b0c821567cf8b46c78971c8339"; + version = "0.9.4"; + sha256 = "09np70rmkm75g246bm5wl2f52618ri3kd66hqhwawq586mmjj1hv"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -176780,7 +189645,7 @@ self: { mkDerivation { pname = "tidal-serial"; version = "0.8"; - sha256 = "8d1737f82e01ee80c3cf833f018f159a4e70afab7043fcdbd0fed3c04efe63db"; + sha256 = "1nv3zr7c1lzys3dzqhvhmfpp0kls2n7h2gw3rz1q1vh15vw3f5wd"; libraryHaskellDepends = [ base bytestring containers serialport tidal ]; @@ -176794,12 +189659,13 @@ self: { ({ mkDerivation, base, cairo, colour, tidal }: mkDerivation { pname = "tidal-vis"; - version = "0.1.8"; - sha256 = "3cb3fab058e0a2891d33d02adac326ada6558892c0f58467625c44b99f262ac9"; + version = "0.9.3"; + sha256 = "1sj17czyzpfrq0a8kalr170dw1zcphix0dnhdf6ggryskb1wswdp"; libraryHaskellDepends = [ base cairo colour tidal ]; homepage = "http://yaxu.org/tidal/"; description = "Visual rendering for Tidal patterns"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tie-knot" = callPackage @@ -176807,7 +189673,7 @@ self: { mkDerivation { pname = "tie-knot"; version = "0.2"; - sha256 = "e47108f0062c9cc0460c7134934c6070931df3d46ab9323e42d47b6660c97ac6"; + sha256 = "1iksr5h6cyyl88z35fbaskriv4vhc1696d3i1i3c171c0vq0hwg4"; libraryHaskellDepends = [ base containers mtl recursion-schemes ]; homepage = "https://github.com/ppetr/tie-knot"; description = "\"Ties the knot\" on a given set of structures that reference each other by keys"; @@ -176820,7 +189686,7 @@ self: { mkDerivation { pname = "tiempo"; version = "0.0.1.1"; - sha256 = "a8b04eef8e1eca0a496410eb82289345c2060be8726b09f5f4b0242d9ffe4a8e"; + sha256 = "13jazsgjs95hykshjsvjx05hdhj5jcl85sqhci4hmjhyivplxc58"; libraryHaskellDepends = [ base deepseq time ]; homepage = "http://github.com/HaskVan/tiempo"; description = "Specify time intervals in different units (secs, mins, hours, etc.)"; @@ -176834,7 +189700,7 @@ self: { mkDerivation { pname = "tiger"; version = "1.1.1"; - sha256 = "019332f021a738bc18109e02286f0d74b2d9534d6e445fe8394f93cfd48f95d2"; + sha256 = "1llmizacz4sg77l5yi3f9m9xkckl1mpjh0ly20cbqf5747q354q1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176851,7 +189717,7 @@ self: { mkDerivation { pname = "tight-apply"; version = "0.1.0.0"; - sha256 = "8419d1dcaab2a942603584e04bf36369d4d7e4f6560f53ea7a968942a1e62f19"; + sha256 = "069gwshl52cngbm563snyvjdgm39cgrlpq446mh45adjmbfd26c4"; libraryHaskellDepends = [ base ]; description = "Tightly binding infix function application"; license = stdenv.lib.licenses.publicDomain; @@ -176864,7 +189730,7 @@ self: { mkDerivation { pname = "tightrope"; version = "0.2.0.0"; - sha256 = "c0d8c4a6fee99342c4ccbd3c679c09a2454ab7fa391c3c3d78101b13a8767fef"; + sha256 = "1vvzfsl166qhg0ykq71rzavllid216f6fg5xrk2454z9zskc9n60"; libraryHaskellDepends = [ aeson base bytestring containers http-types lens mtl text wai wai-extra wreq @@ -176881,7 +189747,7 @@ self: { mkDerivation { pname = "tighttp"; version = "0.0.0.10"; - sha256 = "bf75164be06ef3de8c3b8bd8b915864b940ac8511ff0860fd5868553ed390160"; + sha256 = "0q0177nm71c6sl7qdw0za740m52bhqavkn4b7f6dxwvfw15icxdz"; libraryHaskellDepends = [ base bytestring handle-like monads-tf old-locale papillon simple-pipe time @@ -176897,7 +189763,7 @@ self: { mkDerivation { pname = "tilings"; version = "0.1"; - sha256 = "dacb3b51d7b670ce96aa2fa94487607ac89be0913d97d31a6063b9f5095b490d"; + sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys"; libraryHaskellDepends = [ base ]; homepage = "https://gitorious.org/tilings"; description = "substitution tilings"; @@ -176911,7 +189777,7 @@ self: { mkDerivation { pname = "timberc"; version = "1.0.3"; - sha256 = "32a4f09fc6d520e1f02274592c9d25a4c35c8aa7b317434988b1bcf44e615e74"; + sha256 = "0x2yc57g9g5ii14l65xkly55rhx44nfjqnbl4bqf286mqsgz191j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176924,17 +189790,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, unix + "time_1_8_0_2" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.8"; - sha256 = "38631adfbcd176a3f62fe3b14d9e03a44cc95e1971e4eeb7d46e1018e9e59aff"; + version = "1.8.0.2"; + sha256 = "158hy4klkdwm1vvqnfibziqac6h6ms42x0gha24w3a5cbjb2sr20"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base deepseq QuickCheck tasty tasty-hunit tasty-quickcheck unix + base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck + unix ]; homepage = "https://github.com/haskell/time"; description = "A time library"; @@ -176949,7 +189816,7 @@ self: { mkDerivation { pname = "time-cache"; version = "0.1"; - sha256 = "4c28fcd9bbe16e9e21ed235e1c5bb29bc4493901422773c06bdae61227d30e30"; + sha256 = "0c0fscki5rnsdg0769s204wlki4vn9diqpi3xlhrwvp1pgczqa2c"; libraryHaskellDepends = [ auto-update base text time time-units transformers ]; @@ -176963,7 +189830,7 @@ self: { mkDerivation { pname = "time-compat"; version = "0.1.0.3"; - sha256 = "590711214510c0d2d09780c7fe3b21748bc4802e9053f78ccd6658e951fe0f7f"; + sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr"; libraryHaskellDepends = [ base old-time time ]; homepage = "http://hub.darcs.net/dag/time-compat"; description = "Compatibility with old-time for the time package"; @@ -176975,7 +189842,7 @@ self: { mkDerivation { pname = "time-extras"; version = "1.1.4"; - sha256 = "74dc327986d7ef6d65bc4ee4c855995dd8e05ae92f3a34fd0b835021526d2acd"; + sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l"; libraryHaskellDepends = [ base time ]; homepage = "http://semantic.org/TimeLib/"; description = "Data instances for the time package"; @@ -176991,7 +189858,7 @@ self: { mkDerivation { pname = "time-exts"; version = "3.0.3"; - sha256 = "1aca7fd7f52fc8dcd29c4b7cfbd4f24360a84b77e91e68b9d72318f98725786c"; + sha256 = "0v3q4n3zj613sywnh7p9fx5shq23ybagnz2bkk9drj1gypbpzjhs"; libraryHaskellDepends = [ attoparsec base bindings-DSL deepseq lens-simple mtl old-locale random text time tz @@ -177014,7 +189881,7 @@ self: { mkDerivation { pname = "time-http"; version = "0.5"; - sha256 = "4dd2ceee6967d3ea2fb5b885fc140d18d626fd446395bc3b7b0c5d1222577149"; + sha256 = "0jbiawi14p8cgcxvr5b38kyjdmhq1lagr1dqnlpymlv7d7pcxljd"; libraryHaskellDepends = [ ascii attempt attoparsec base base-unicode-symbols blaze-builder blaze-textual bytestring convertible-text data-default failure @@ -177036,7 +189903,7 @@ self: { mkDerivation { pname = "time-interval"; version = "0.1.1"; - sha256 = "3473e1c2a35fecee898ed4d7afcc5353e5a663a4a627550ca6f7b624c152fe24"; + sha256 = "097yab0j9dpplq65a9x6liisdrakag6azmylis4yxv2zlg1f2wrl"; libraryHaskellDepends = [ base time-units ]; homepage = "http://hub.darcs.net/fr33domlover/time-interval"; description = "Use a time unit class, but hold a concrete time type"; @@ -177048,7 +189915,7 @@ self: { mkDerivation { pname = "time-io-access"; version = "0.1.0.0"; - sha256 = "2be786989fcb0ad6d5d768aa0a7a5234543f24d8c762e1391dd9b1fb0da70558"; + sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb"; libraryHaskellDepends = [ base base-io-access time ]; description = "IO Access for time"; license = stdenv.lib.licenses.gpl2; @@ -177060,7 +189927,7 @@ self: { mkDerivation { pname = "time-lens"; version = "0.4.0.1"; - sha256 = "9f53888424e7f68be8966ac25c8e36dae03cf576f120c76248588d6495c32624"; + sha256 = "0916qfan93aq91icf87ifvskrq6s6s75rhkajvl8pxp74j28hlwz"; libraryHaskellDepends = [ base data-lens-light time ]; description = "Lens-based interface to Data.Time data structures"; license = stdenv.lib.licenses.bsd3; @@ -177071,7 +189938,7 @@ self: { mkDerivation { pname = "time-locale-compat"; version = "0.1.1.3"; - sha256 = "9144bf68b47791a2ac73f45aeadbc5910be2da9ad174909e1a10a70b4576aced"; + sha256 = "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i"; libraryHaskellDepends = [ base old-locale time ]; homepage = "https://github.com/khibino/haskell-time-locale-compat"; description = "Compatibility of TimeLocale between old-locale and time-1.5"; @@ -177085,7 +189952,7 @@ self: { mkDerivation { pname = "time-out"; version = "0.2"; - sha256 = "2e3a1dcfe8eb6d283de6441894bd4ca2e3b56982f1fe0407b1216f5b2c109fda"; + sha256 = "1nlz20n5nvr1n43h9zpih9lvbqx29jyr8624wqyjhvgbx37isfif"; libraryHaskellDepends = [ base data-default-class exceptions time-interval time-units transformers @@ -177103,7 +189970,9 @@ self: { mkDerivation { pname = "time-parsers"; version = "0.1.2.0"; - sha256 = "4e50d40f13f8e6c5175be22b91586f909607ecb631f8209ff45bce2031bb3c24"; + sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f"; + revision = "1"; + editedCabalFile = "1fvk31ab241v4ib7lg718q6qwrc3w7axq9kinccbdnn7b7d259gj"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -177119,7 +189988,7 @@ self: { mkDerivation { pname = "time-patterns"; version = "0.1.4.2"; - sha256 = "542b04487ef986e921888b3f6df73f154ed501c00cd7c12e0b623693e90505f6"; + sha256 = "1xh50plr6dk21cpc3mqcq00xakhm7zvnsgwbi0hyk1prgr408asl"; libraryHaskellDepends = [ base intervals time ]; homepage = "https://github.com/j-mueller/time-patterns"; description = "Patterns for recurring events"; @@ -177133,8 +190002,8 @@ self: { }: mkDerivation { pname = "time-qq"; - version = "0.0.0.2"; - sha256 = "e7abb7307b01793c7283f8669985d8029501fd756890275b998e60597bd1ef7e"; + version = "0.0.1.0"; + sha256 = "11sch73355fpwqgvg8cq0br0108mj9ph085vycnyq1jndrd0wvxd"; libraryHaskellDepends = [ base template-haskell time time-locale-compat ]; @@ -177152,7 +190021,7 @@ self: { mkDerivation { pname = "time-recurrence"; version = "0.9.3"; - sha256 = "316db4760478346fa0d0081e00be9b73b873ec2b644e3ea6ea28f4175ffd530d"; + sha256 = "03akzmgigx18xak3wkk45gn77f3kkfz007h8s2h6yd3q0ivb8v9i"; libraryHaskellDepends = [ base data-ordlist mtl time ]; testHaskellDepends = [ base data-ordlist HUnit mtl old-locale test-framework @@ -177169,7 +190038,7 @@ self: { mkDerivation { pname = "time-series"; version = "0.1.0.0"; - sha256 = "250195f9d422c92145ad4eeae5c61cc13648b962f8cf32f2bb4a925888cbddc8"; + sha256 = "1j6xrf45i4japgr35kzqcawlhdn13k3fbsjfmm2j3j92skwra095"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers mtl ]; @@ -177184,7 +190053,7 @@ self: { mkDerivation { pname = "time-series-lib"; version = "0.1.0"; - sha256 = "91ae1189fb4579c217381514ca62bd028799a27f5ad7ae81c4acc3d0b7504fe0"; + sha256 = "1q2ga2vx1hxcqj0sxmssgyi9k1q2pmicl50m70bw4ya5zf4i3bli"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal hspec QuickCheck ]; doHaddock = false; @@ -177198,7 +190067,7 @@ self: { mkDerivation { pname = "time-units"; version = "1.0.0"; - sha256 = "e181997dd05321f09b21c5e0bf38524ccab51ecc588a6017253cc96db289e099"; + sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/acw/time-units"; description = "A basic library for defining units of time as types"; @@ -177210,7 +190079,7 @@ self: { mkDerivation { pname = "time-w3c"; version = "0.1.0.1"; - sha256 = "6fb9bd6dcaf5d95093d7d24b6d37edfae71c22dab8158b650b7ba2b019dc168a"; + sha256 = "12hnvhcv18kv1djqn5dqv8i1rrzsxlvnsjyjsy9m1ngmr9nvvfbg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base convertible parsec time ]; @@ -177234,8 +190103,8 @@ self: { }: mkDerivation { pname = "time-warp"; - version = "1.1.1.1"; - sha256 = "df2721daeee24eac57f2ba1f1eff4b0f87260340537cd5e3cbe8d6c27b1094fd"; + version = "1.1.1.2"; + sha256 = "0ncw28rxhlrrr5708ymws9kb4ca4m8ljrpxma0nvxxfigg7mqrim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177248,12 +190117,6 @@ self: { streaming-commons template-haskell text text-format time time-units transformers transformers-base unordered-containers ]; - executableHaskellDepends = [ - async base binary binary-conduit conduit data-default data-msgpack - exceptions formatting hspec lens log-warper MonadRandom mtl - QuickCheck random serokell-util stm text text-format time-units - transformers - ]; testHaskellDepends = [ async base data-default data-msgpack exceptions hspec lens log-warper mtl QuickCheck random serokell-util stm text text-format @@ -177270,7 +190133,7 @@ self: { mkDerivation { pname = "timecalc"; version = "0.1.1"; - sha256 = "3aedb0fbad5691985057d94fccf9eab14d340495c55ddbaa93d526fb9b77df16"; + sha256 = "05nzfydzn9nmjfmdnpf5jl238kdixbwwqkyrax89i4anmpxv1v9s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskeline uu-parsinglib ]; @@ -177284,7 +190147,7 @@ self: { mkDerivation { pname = "timeconsole"; version = "0.1.0.3"; - sha256 = "472e1640c0ee395e3a5d3fed81ddb54ede94123ee38d8330fdb6387768c20ac0"; + sha256 = "1h0aq9l7ff5nzlq873g37q999pjfnpfq3v9zblx5wfgfq101cbj7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process time ]; @@ -177299,7 +190162,7 @@ self: { mkDerivation { pname = "timeit"; version = "1.0.0.0"; - sha256 = "bd48d90bf96802580d0fa4e9c99150ef3c32cdf97bf345bf40e83633cc5d7236"; + sha256 = "0dkjbp636dp882zlbwvvz76k4g7ga28wksd41w6mh0k8z45xjj5x"; libraryHaskellDepends = [ base ]; description = "Time a computation"; license = stdenv.lib.licenses.bsd3; @@ -177310,7 +190173,7 @@ self: { mkDerivation { pname = "timelens"; version = "0.2.0.2"; - sha256 = "f4e6fa016ec37f79c96a62cff174929f04152831c308ab1f9a797f5b5674a764"; + sha256 = "0r57fib5nzvrk8gsn26364l1a14zj9sg3kv2db4pjzy3dq0zmrpl"; libraryHaskellDepends = [ base lens time ]; homepage = "http://www.github.com/massysett/timelens"; description = "Lenses for the time package"; @@ -177322,7 +190185,7 @@ self: { mkDerivation { pname = "timeless"; version = "1.0.1.2"; - sha256 = "f028c0d7deb751629c80c720d8b378b8fed3af68c4da28afbfbd1fa55d5acc70"; + sha256 = "0w6cb9fsa7xxpypjinn4d2px7zmqg2rxh867h2f64ldpvvbw0a7h"; libraryHaskellDepends = [ ansi-terminal base linear time transformers ]; @@ -177336,7 +190199,7 @@ self: { mkDerivation { pname = "timeless-tutorials"; version = "1.0.0.0"; - sha256 = "1b4631bde7afe9fcd49b22b7baf82927328981b49491f4d28ad39be3ec471e17"; + sha256 = "05qy8znf76ykib9g94clnj0qjci757wbmdr2kgagrsdgwyyk2ihv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base timeless ]; @@ -177351,7 +190214,7 @@ self: { mkDerivation { pname = "timelike"; version = "0.2.2"; - sha256 = "ad40043b33e01aa73b1914bda7a912649dfa449171779f55761cdc4be053b73f"; + sha256 = "0gxpagh4pp0wfraryxvij52gm7b42alsgg8l34xsf6p06cxh8h5d"; libraryHaskellDepends = [ base transformers ]; homepage = "http://hub.darcs.net/esz/timelike"; description = "Type classes for types representing time"; @@ -177363,7 +190226,7 @@ self: { mkDerivation { pname = "timelike-clock"; version = "0.1.0"; - sha256 = "dee2b3f214f36c6fb3f6d4d0a73954485404b7535965cb59ab1715fb17b9dcae"; + sha256 = "1bnwp4bzn58pmdcwnrarafvh8m28ahwsgl6lysrnyv7k2krb7qny"; libraryHaskellDepends = [ base clock timelike transformers ]; homepage = "http://hub.darcs.net/esz/timelike-clock"; description = "Timelike interface for the clock library"; @@ -177375,7 +190238,7 @@ self: { mkDerivation { pname = "timelike-time"; version = "0.1.1"; - sha256 = "be4b536f613ec6d463854fc0fa5bf058acb35e1d243d5d2a7bef2ff6de28481d"; + sha256 = "07a853ggcbzggcm5sg943mgb7b2qy1dzmh2ghmix9iiyc5pm6jxy"; libraryHaskellDepends = [ base time timelike transformers ]; homepage = "http://hub.darcs.net/esz/timelike-time"; description = "Timelike interface for the time library"; @@ -177390,7 +190253,7 @@ self: { mkDerivation { pname = "timemap"; version = "0.0.4"; - sha256 = "6e7c85c727fd9152db635c33ddb72cab5dca9ae240d41fcb653883f1bcd1d9e3"; + sha256 = "1qyrs6yg30rqcp5izm20wadclpdb5jvxscswcgdm54gx4z3qaz3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177417,7 +190280,7 @@ self: { mkDerivation { pname = "timeout"; version = "0.1.1"; - sha256 = "56bec547e5fcb6a6bd6eb2621e0e432e1ef3e8fef3529b11d41eb5c1ea9cadc9"; + sha256 = "1jddkkmc3d8ysh8rnlpkzvlg67if8c71wqmjdsysddpwwm3wbgjn"; libraryHaskellDepends = [ base exceptions mtl time ]; testHaskellDepends = [ base exceptions mtl QuickCheck tasty tasty-quickcheck time @@ -177435,7 +190298,7 @@ self: { mkDerivation { pname = "timeout-control"; version = "0.2"; - sha256 = "741854f07709ee30c9e31db04745fefc8a42d00023a494e65d17ae40b41679e6"; + sha256 = "1rkr2ss41bhpbpk99913038452pwzr2lgc0xwg4k1vh9fzq5863l"; libraryHaskellDepends = [ base ghc-prim lifted-base monad-control mtl transformers-base ]; @@ -177449,7 +190312,7 @@ self: { mkDerivation { pname = "timeout-with-results"; version = "0.2"; - sha256 = "a0d932c6b488d21cbb492376cf42fde01deb18390cf35a6f4f9741c55560b5f8"; + sha256 = "1y5mc1awahcp9xpmmwqc74cfn7g0zm1cyxi396xirll8nk335nd0"; libraryHaskellDepends = [ base deepseq mtl parallel ]; homepage = "https://github.com/ppetr/timeout-with-results"; description = "Runs a time-limited computation alowing it to return intermediate results"; @@ -177463,7 +190326,7 @@ self: { mkDerivation { pname = "timeparsers"; version = "0.3.2"; - sha256 = "0706cc3c91bb35fab2aa422ddab234531da9c8bed2515b5f2eb62ae150b92cb6"; + sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7"; libraryHaskellDepends = [ attoparsec base bytestring containers convertible mtl time ]; @@ -177480,7 +190343,7 @@ self: { mkDerivation { pname = "timeplot"; version = "1.0.32"; - sha256 = "3b560a5cf4d81daf5e4cf58d566893baf7daa9244b51c60cce71ac23bc6a5c46"; + sha256 = "0ijwday27b3irq6cclab4jlxmxxsjdl5d3gm9igay7fqyif0lmiv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177499,7 +190362,7 @@ self: { mkDerivation { pname = "timeprint"; version = "0.1.0.3"; - sha256 = "6f11850c81aff89f10516ada477c7d40bb73007606f5e7b544e220181709cbaa"; + sha256 = "1anb14bih8728jsygx86fq077fs0gmy4gnkaa489zy5gh468a4bg"; libraryHaskellDepends = [ base datetime ]; description = "Prints timestamps after each line evaluated"; license = stdenv.lib.licenses.bsd3; @@ -177513,7 +190376,7 @@ self: { mkDerivation { pname = "timerep"; version = "2.0.0.2"; - sha256 = "1d4e417f3ca08921941c16791680e13b66fb1844d94759068846ede78c965339"; + sha256 = "0fakjs6fgva6i035jiyr8hcgnrivw601cy8n3ja232d07izl2khx"; libraryHaskellDepends = [ attoparsec base monoid-subclasses text time ]; @@ -177532,7 +190395,7 @@ self: { mkDerivation { pname = "timers"; version = "0.2.0.3"; - sha256 = "4552851a116a6f430754b711e06039e23903ac7b9424da58a3b138d864209c60"; + sha256 = "0q4w41jdhf5ildcdl94lgfn06fg275hf04dpah3l6vva24d8alj5"; libraryHaskellDepends = [ base lifted-base monad-control suspend transformers-base ]; @@ -177545,7 +190408,7 @@ self: { mkDerivation { pname = "timers-updatable"; version = "0.2.0.2"; - sha256 = "bc927e9716dad072d93529d1974afc8e38d9c9b3ff6d8813f90fbab57b2a5cd9"; + sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw"; libraryHaskellDepends = [ base stm ]; homepage = "http://github.com/paolino/timers-updatable"; description = "timers which are updatable in the remaining time"; @@ -177559,7 +190422,7 @@ self: { mkDerivation { pname = "timeseries"; version = "0.4.1"; - sha256 = "4e7a17717484225b904c5511152087b6ff9cb1d155fde7277b4bcc9b58c5151e"; + sha256 = "07hmqmc9pk2bgckygzams6qrrzxnhwh1a4am9j85n8l4fiqifyjf"; libraryHaskellDepends = [ base bytestring cassava statistics text text-time time vector ]; @@ -177578,7 +190441,7 @@ self: { mkDerivation { pname = "timespan"; version = "0.3.0.0"; - sha256 = "46a51e1e0d776d65d0094bf8158c938255491fbaa4d4f39b0a1477806312851f"; + sha256 = "07w529iq0xql1adz7m54p8gljmc2jf61by2b1786avbp1lg1x9a6"; libraryHaskellDepends = [ base time ]; homepage = "https://github.com/agrafix/timespan#readme"; description = "Useful timespan datatype and functions"; @@ -177592,7 +190455,7 @@ self: { mkDerivation { pname = "timestamp-subprocess-lines"; version = "0.1.0.4"; - sha256 = "2542b9977d1bf472ca8c929a6d390b223fdfff5cab940ca6bf1b632b31996bd1"; + sha256 = "1lbbk4qjnqqvpyk0r55bbkzxygr21cwnv6ljik575x0vgnbvjhi5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177609,7 +190472,7 @@ self: { mkDerivation { pname = "timestamper"; version = "1.0.3"; - sha256 = "da639240cce6ab43d372c1fb5894e610a340944b7bc7984ba7c0cf43c098ffe2"; + sha256 = "1qpzk3047ky0lx5riivv9fa418qhwsa5iyy1fb9l7az6ri094qys"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base old-locale time ]; @@ -177624,10 +190487,8 @@ self: { }: mkDerivation { pname = "timezone-olson"; - version = "0.1.7"; - sha256 = "232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa"; - revision = "2"; - editedCabalFile = "2b056e050fea1cd6133901097f1c5338323f343b31f19bf042ded410ec8d44eb"; + version = "0.1.8"; + sha256 = "0irpvmqpiw4j2wq4rn3jrndgn2jg10yvrnxvsrb1l6g5b80h2sxr"; libraryHaskellDepends = [ base binary bytestring extensible-exceptions time timezone-series ]; @@ -177642,8 +190503,8 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.2"; - sha256 = "5c8050daceec73b642a1ec85827d6914b2e0bfe32813b5c715a9200d0143ad76"; + version = "0.1.0.3"; + sha256 = "0jagq78mp09x8zhy3ygdd0pw2ms12c72qi9r7gqaird09rggs44w"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; @@ -177657,13 +190518,26 @@ self: { mkDerivation { pname = "timezone-series"; version = "0.1.6.1"; - sha256 = "65ea9a8c3b1143a0f1d154943ac8311b53bb2ec7b5e52b09bd035343025c2cc3"; + sha256 = "1hrcbh146lq3pl4jprdmqwpbnlqv6743m52ls7qs0hqi7f69msk5"; libraryHaskellDepends = [ base time ]; homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; license = stdenv.lib.licenses.bsd3; }) {}; + "timezone-series_0_1_8" = callPackage + ({ mkDerivation, base, deepseq, time }: + mkDerivation { + pname = "timezone-series"; + version = "0.1.8"; + sha256 = "1xndlg0n46qjdh5yjzkkg285x3k76073aaizx1ibdzbq9q7dj6c1"; + libraryHaskellDepends = [ base deepseq time ]; + homepage = "http://projects.haskell.org/time-ng/"; + description = "Enhanced timezone handling for Data.Time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timezone-unix" = callPackage ({ mkDerivation, base, directory, filepath, leapseconds, tasty , tasty-golden, tasty-hunit, time, timezone-olson, timezone-series @@ -177672,7 +190546,7 @@ self: { mkDerivation { pname = "timezone-unix"; version = "1.0"; - sha256 = "d23f524eb3738a0ee21a168bb56e8dfe85e602edc80268027358deddae63c0ba"; + sha256 = "1fn0cfpdvpjqfc16h0n8xl1fd1gyimpbb2qn3bi0x2kknd754gyj"; libraryHaskellDepends = [ base directory filepath leapseconds time timezone-olson timezone-series unix @@ -177690,12 +190564,24 @@ self: { mkDerivation { pname = "timing-convenience"; version = "0.1"; - sha256 = "72200ea2c942bfb4ac4c5ae53222353ac3af0c40058f4a9179c99df5ff33171d"; + sha256 = "078p6gzzb7f9g68lm3q5806azhrs6li35ras9jnb9gs2r6i0w83j"; libraryHaskellDepends = [ base time ]; description = "Convenient functions for getting times"; license = stdenv.lib.licenses.bsd3; }) {}; + "tiny-scheduler" = callPackage + ({ mkDerivation, async, base, time }: + mkDerivation { + pname = "tiny-scheduler"; + version = "0.1.4.3"; + sha256 = "04bcz2ifkrw0f6razvzpycvzdbarv1ain800l4rapqyqzykgzxjw"; + libraryHaskellDepends = [ async base time ]; + homepage = "https://github.com/functor-soup/tiny-scheduler#readme"; + description = "tiny no-brainer job scheduler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tinyMesh" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hex, serialport , unix @@ -177703,7 +190589,7 @@ self: { mkDerivation { pname = "tinyMesh"; version = "0.1.0.0"; - sha256 = "a3527673647b3396363d013e8ea79aad20f06f8c1e626bc8ab205678a6e557a6"; + sha256 = "19jpwnk7hmi0mg46nqhyiipz085dkakqwgh17lv9ccvvcirpclm3"; libraryHaskellDepends = [ attoparsec base bytestring hex serialport unix ]; @@ -177720,7 +190606,7 @@ self: { mkDerivation { pname = "tinyXml"; version = "0.1.0.2"; - sha256 = "a80c87a31010902e209d8738584bf1261ceda26f45dec5f42b239c599dcf9336"; + sha256 = "0dlkryfmk7135gscbpj5dyifs716y55mhf47klh2x40h22iqf358"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177744,7 +190630,7 @@ self: { mkDerivation { pname = "tinylog"; version = "0.14.0"; - sha256 = "322f56178011707436a8e5234a879c5254a468f789ad8db635c98adf752a73ea"; + sha256 = "1skk59sxz2n96nv8vbc9yxla8m2jkj3ll8z5m0v78w0ih0bmcbrj"; libraryHaskellDepends = [ base bytestring containers double-conversion fast-logger text transformers unix-time @@ -177760,7 +190646,7 @@ self: { mkDerivation { pname = "tinytemplate"; version = "0.1.2.0"; - sha256 = "30c73964f575bd139ccb214b1123caa99bc330d1904c4d3a5e31e33c31d17d0a"; + sha256 = "02kxs4qkrqribqx4sk4hs4qc76x9r8ii2jr1rff17gbmymj3kirh"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base QuickCheck text ]; homepage = "http://github.com/dicomgrid/tinytemplate"; @@ -177777,7 +190663,7 @@ self: { mkDerivation { pname = "tip-haskell-frontend"; version = "0.2"; - sha256 = "9e39b0c1a59e1a71f2a054811289fd8c2025ec990bc4a876c614d77be7a3a040"; + sha256 = "0h50lgkppmqlqrvaii0bk7n2a84czn4i50all3r726lylp0v0fcy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177802,7 +190688,7 @@ self: { mkDerivation { pname = "tip-lib"; version = "0.2.2"; - sha256 = "66698d1000e582542f3ef838960edc66ae3874eb6b21f169ed8497fd2c2cc12b"; + sha256 = "0ay15hngv5w4xmlz28bbxds3ibk6vh79cf7q7qpm90p50088ssb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177826,7 +190712,7 @@ self: { mkDerivation { pname = "tiphys"; version = "0.1.1.0"; - sha256 = "6e120092e002d76903e47ce70871ba6aa7b8f194a2ea1319344693178acb9cdf"; + sha256 = "1pwwrf51g4s66hci7sm2jkqvi9vap9qhirvwwh1nkmq2w29004kf"; libraryHaskellDepends = [ aeson attoparsec base errors text unordered-containers vector ]; @@ -177836,6 +190722,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "titan" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "titan"; + version = "0.1.0.0"; + sha256 = "1bq8j1ch9fqpfgbchmi284afm1bbhjc47pw4lbnadxfwfcldm1gs"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + homepage = "http://keera.co.uk"; + description = "Testing Infrastructure for Temporal AbstractioNs"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "titlecase" = callPackage ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit , tasty-quickcheck, text @@ -177843,7 +190744,9 @@ self: { mkDerivation { pname = "titlecase"; version = "0.1.0.3"; - sha256 = "67bbc3f21d7e020afa4547aaacabf8927d53fd5e6dae41f3a0b92ab018172222"; + sha256 = "08i22wcb0amrl3rl3bkdbvym6zcjz2msraj78px0l0ky3prc7fv7"; + revision = "1"; + editedCabalFile = "0p7f68d4v1rp9lf2zaa2bx195ylrsxrds5ybl8mhdr49p0y642qf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-markup semigroups text ]; @@ -177858,6 +190761,24 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "titlecase_1_0_1" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }: + mkDerivation { + pname = "titlecase"; + version = "1.0.1"; + sha256 = "1k29br4ck9hpjq0w8md7i5kbh47svx74i2abv6ql2awxa0liqwz7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/peti/titlecase#readme"; + description = "Convert English Words to Title Case"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "tkhs" = callPackage ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework , test-framework-hunit, utf8-string, vty @@ -177865,7 +190786,7 @@ self: { mkDerivation { pname = "tkhs"; version = "0.3.0"; - sha256 = "f7392627a6c715e59936c16c92e04dc955275baf988fce7e5ab53015966c7aeb"; + sha256 = "1svsdjb1ac5mb9zcx3wqmxdjfmf99ph94v616scya5f7lqkjcfgp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177889,7 +190810,7 @@ self: { mkDerivation { pname = "tkyprof"; version = "0.2.2.2"; - sha256 = "ea40c354d37843757b76152cbde1d9612000593fae4a515ad2d2cbf5940adef7"; + sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -177909,8 +190830,8 @@ self: { ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.3.0.0"; - sha256 = "feb269cd135796d7a378a01150ca89fdea380e4e7fa67b031b299fcd16acac5e"; + version = "0.3.0.1"; + sha256 = "0rfzcwaj9fyhrc8vswjjnqdj4bi7jln2lq38pcvnkl5zwx7kqhxa"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; @@ -177918,6 +190839,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tldr" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory + , filepath, optparse-applicative, semigroups, shell-conduit, text + }: + mkDerivation { + pname = "tldr"; + version = "0.2.2"; + sha256 = "0ybg8d3zf4762525w0xmxrszb15vpiry8f0m9355pbxxvppq7dbl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark text + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative semigroups + shell-conduit + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/psibi/tldr-hs#readme"; + description = "Haskell tldr client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, criterion, cryptonite, data-default-class, hourglass @@ -177926,8 +190871,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.3.9"; - sha256 = "81355e16528796d3097719e74f7f1f8cae50daed06926d1995731bab8e02267b"; + 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 @@ -177954,7 +190899,7 @@ self: { mkDerivation { pname = "tls-debug"; version = "0.4.4"; - sha256 = "e5e7e416de38f21de5ba4ca17a904d843d6f3f66f6b6309b6ab9770f897c551d"; + sha256 = "07amgj4hyxxrdadk1dpncqznygc49n87m8acpbjivwiqvqbf9rz5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177974,7 +190919,7 @@ self: { mkDerivation { pname = "tls-extra"; version = "0.6.6"; - sha256 = "dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c"; + sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177987,12 +190932,83 @@ 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 + }: + mkDerivation { + pname = "tmapchan"; + version = "0.0.3"; + sha256 = "1q0ia2p8c5ac91n5l3wk6rfmvj93lb9027p9rfq77lydwv1b8vg8"; + libraryHaskellDepends = [ + base containers hashable stm unordered-containers + ]; + homepage = "https://github.com/athanclark/tmapchan#readme"; + description = "An insert-ordered multimap (indexed FIFO) which consumes values as you lookup"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "tmapmvar" = callPackage + ({ mkDerivation, async, base, containers, hashable, QuickCheck + , quickcheck-instances, stm, tasty, tasty-quickcheck + , unordered-containers + }: + mkDerivation { + pname = "tmapmvar"; + version = "0.0.3"; + sha256 = "1w5afnh7v04cjwb6qmgmmzgqhqj58rrxl6m31myk2rgd8i9j1fvf"; + libraryHaskellDepends = [ + base containers hashable stm unordered-containers + ]; + testHaskellDepends = [ + async base containers QuickCheck quickcheck-instances stm tasty + tasty-quickcheck + ]; + homepage = "https://github.com/athanclark/tmapmvar#readme"; + description = "A single-entity stateful Map in STM, similar to tmapchan"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "tmp-postgres" = callPackage + ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover + , network, postgresql-simple, process, temporary, unix + }: + mkDerivation { + pname = "tmp-postgres"; + version = "0.1.0.7"; + sha256 = "0cx0b0743fv2p651sf6s95aqhpq8rk20mxdk06dw8v8bgdyvncq2"; + libraryHaskellDepends = [ + base directory network process temporary unix + ]; + testHaskellDepends = [ + base bytestring directory hspec hspec-discover postgresql-simple + process temporary + ]; + 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 ({ mkDerivation, base, bytestring, directory, template, text }: mkDerivation { pname = "tmpl"; version = "0.0.0.1"; - sha256 = "6f6769f470570ea3fc8c2b7fa8c30fcfe148d084a9890596100755158a233880"; + sha256 = "101q4f51am8722b0b2d9hk84iqfg1z1shzrbikya63jpf3s6jrvg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178011,7 +191027,7 @@ self: { mkDerivation { pname = "tn"; version = "4.1.0.0"; - sha256 = "50f7f11a98410900517e89a511477c7a3aebcc57e80a4f97a1c1c33e5bc405e1"; + sha256 = "1q85qidkxhy1l6bly2p8az6fnfksgi3i39c9gr8h02a1k0dg3xsh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178032,7 +191048,7 @@ self: { mkDerivation { pname = "tnet"; version = "0.0.1"; - sha256 = "89eb275e56f3f385a7fd2492fe2bec12264a5c405b6d167514072fef2452b3c3"; + sha256 = "1hxka8jfybq72isicvav81f4l9hjxhmzx4i4znkqbwzkarg2gsw9"; libraryHaskellDepends = [ attoparsec base bytestring utf8-string ]; description = "Library for encoding/decoding TNET strings for PGI"; license = "unknown"; @@ -178044,7 +191060,7 @@ self: { mkDerivation { pname = "to-haskell"; version = "0.3.0"; - sha256 = "1393c215a3188fc28de6ba8f8c3797f7e77a86c209aff0ae58eabe94413d8e3e"; + sha256 = "0glf7m0r9gpab2pg1bq9qa37mrzpjwvqr3xsws6w53qqlcaw54qk"; libraryHaskellDepends = [ base containers haskell-src-exts transformers ]; @@ -178059,7 +191075,7 @@ self: { mkDerivation { pname = "to-string-class"; version = "0.1.2"; - sha256 = "aeebad6f4d2f4a0d8b6168d71ced245fb836ffc3ddd855ea69b001b618905050"; + sha256 = "0l2hj0cbc0dhd7m5bn6xqgzkdf2z4knirmv8c65hsjig9mpsvsxf"; libraryHaskellDepends = [ base ]; description = "Converting string-like types to Strings"; license = stdenv.lib.licenses.bsd3; @@ -178071,7 +191087,7 @@ self: { mkDerivation { pname = "to-string-instances"; version = "0.2"; - sha256 = "89f68da09117a2c88428ada452650b1bcf9c45dc542f8d6480ef3f05f5c0aac0"; + sha256 = "1h5aq3shagzgh1j8sbslvi2rrkqv1djm595d522ci8hpj6h8vxl9"; libraryHaskellDepends = [ bytestring pretty text to-string-class ]; description = "Instances for the ToString class"; license = stdenv.lib.licenses.bsd3; @@ -178079,17 +191095,17 @@ self: { }) {}; "toboggan" = callPackage - ({ mkDerivation, base, clit, directory, madlang, optparse-generic - , text + ({ mkDerivation, base, directory, madlang, optparse-generic, text + , tweet-hs }: mkDerivation { pname = "toboggan"; - version = "0.1.0.0"; - sha256 = "72281351961f1d55149379c273b72e4e4d7a5134c432351044a17317152f3a67"; + version = "0.1.0.1"; + sha256 = "19h8qhgvhhrsp2p0lpw4gwznx4alyqqm482pga85g83f6xa9xjiy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base clit directory madlang optparse-generic text + base directory madlang optparse-generic text tweet-hs ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/toboggan#readme"; @@ -178098,6 +191114,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "todo" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "todo"; + version = "0.2.0.1"; + sha256 = "0paxykbni3gwxgs25lkjsb8jfk4bc5gwnrfp16v189smqj1slc3g"; + libraryHaskellDepends = [ base ]; + description = "A todo bottom"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "todos" = callPackage ({ mkDerivation, ansi-terminal, base, base-unicode-symbols , containers, data-hash, dates, directory, dyre, filepath, Glob @@ -178106,7 +191133,7 @@ self: { mkDerivation { pname = "todos"; version = "0.5.3.2"; - sha256 = "291cbabd72022696ba71cebf2e1fe6cc7d693f46c4ebae1caa32363bd3ebf6f1"; + sha256 = "1wgnxg9kndijm8faxsy48qznjzfcwqgjxgyff6x9c9h2fayvl719"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178132,7 +191159,7 @@ self: { mkDerivation { pname = "tofromxml"; version = "0.1.0.2"; - sha256 = "100ff3946757095dcfd6f55b15366b061fe0fc899b1d7300fe6dc9e84cee0d73"; + sha256 = "0wqdxr6fijbdzq0767cvi7yf07q6dcv1anzmsv7ms2apcyag63qh"; libraryHaskellDepends = [ array base bytestring containers hexpat hexpat-pickle ]; @@ -178151,7 +191178,7 @@ self: { mkDerivation { pname = "toilet"; version = "0.0.1"; - sha256 = "7d983fa1c8c55b7544e36a825ddbca3e8aa02d657fc13f8438289ac533814626"; + sha256 = "09j6h4rwb6i87223zhbzclns12iyrbdmv0kawd27any5r2hkz63x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178168,9 +191195,9 @@ self: { mkDerivation { pname = "token-bucket"; version = "0.1.0.1"; - sha256 = "312609c0037271b1091f23c2edf467e9449edca5bbed0cfb45c2c93c1bee6ad0"; - revision = "1"; - editedCabalFile = "41232cfabd4ba8e217d2b78f0f897d5a245756cf525c9a84c5ba2c695b533576"; + sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; + revision = "2"; + editedCabalFile = "03kkavw01mlgaxgc0ifvldn8pkq2dfncrwqrf0r33ldggfzm6qm3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; homepage = "https://github.com/hvr/token-bucket"; @@ -178183,7 +191210,7 @@ self: { mkDerivation { pname = "tokenify"; version = "0.1.2.0"; - sha256 = "90655271f5cc70dfdc571815407fbc64973318a5f02f0f0f8f70b590aa0fcebb"; + sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch"; libraryHaskellDepends = [ base containers text ]; homepage = "https://github.com/AKST/tokenify"; description = "A regex lexer"; @@ -178198,7 +191225,7 @@ self: { mkDerivation { pname = "tokenize"; version = "0.3.0"; - sha256 = "0e88490f06efb45c17138ebbc9bec206b87b98361c2c949ca16546e3f9ab91b5"; + sha256 = "1dcimgwy6ik5l6f98b0w6sc7pf06qazckfwf2cbmrd7g0q7lk20f"; libraryHaskellDepends = [ base split text ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq filepath split text @@ -178214,7 +191241,7 @@ self: { mkDerivation { pname = "toktok"; version = "0.5"; - sha256 = "1ba56b91114ac27b155a7072a9cc7e1e4fcb4b666d0e2e4407bc936b1f329a78"; + sha256 = "0y4s68gnp4xw0x22w3kdcr5wnkqygv6ajwkhb8apphja268np98v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers haskell98 ]; @@ -178228,7 +191255,7 @@ self: { mkDerivation { pname = "tokyocabinet-haskell"; version = "0.0.5"; - sha256 = "af6575357b7c26c721b17025db23815119de414cffeafb1e60961985701adaec"; + sha256 = "1v6s39q8a6cnc0ggpspz9i0xw6aih4ixn9bhn4hwf9kwgcspardg"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; homepage = "http://tom-lpsd.github.com/tokyocabinet-haskell/"; @@ -178243,12 +191270,13 @@ self: { mkDerivation { pname = "tokyotyrant-haskell"; version = "1.0.1"; - sha256 = "f086ef51dc07d0798d1329fc4fd51521f4e2fc905843c4f8522dc3f9e0b0e8f7"; + sha256 = "1xz8n3hgkhrdabwc8hsqj3yf5x112palzz192f6pkl07vi8yz1ph"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet tokyotyrant ]; homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -178256,7 +191284,7 @@ self: { mkDerivation { pname = "tomato-rubato-openal"; version = "0.1.0.4"; - sha256 = "a1f762ee2229ecba58debf2cce2ef4498f101ff1a0177d70c332bc293b60ce75"; + sha256 = "0xffc0xjkg1jqdq7s5x0y4gi13s9yhpcwb5zvrcbmv194bp65xx1"; libraryHaskellDepends = [ base OpenAL stm vector ]; homepage = "http://www.haskell.org/haskellwiki/tomato-rubato"; description = "Easy to use library for audio programming"; @@ -178270,9 +191298,9 @@ self: { mkDerivation { pname = "toml"; version = "0.1.3"; - sha256 = "c29946c58656443d0dbf18aad0582707311c691ab624a63c8f9614a4950c7e71"; + sha256 = "0wby1jas854niwyac95n39liqc874xcd1ahqpw6ksi2nhv2ld6f2"; revision = "1"; - editedCabalFile = "4eac5e516c0e461ceef73150d7a248bce199fc02183074a622c0dab17513ca20"; + editedCabalFile = "086a2dsv3nn04ak78c0q0by9kqdw92idfl1iyzp1qihfdi8mxb2f"; libraryHaskellDepends = [ attoparsec base bytestring containers old-locale time ]; @@ -178280,6 +191308,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "toml-parser" = callPackage + ({ mkDerivation, alex, array, base, happy, text, time }: + mkDerivation { + pname = "toml-parser"; + version = "0.1.0.0"; + sha256 = "0p1nl3009qlcqn4jjggbm1v719a6bswklkyjb3plm0cz3bsyr0fs"; + libraryHaskellDepends = [ array base text time ]; + libraryToolDepends = [ alex happy ]; + homepage = "https://github.com/glguy/toml-parser"; + description = "Parser for the TOML configuration language"; + license = stdenv.lib.licenses.isc; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, filepath, HUnit, QuickCheck, random @@ -178287,7 +191328,7 @@ self: { mkDerivation { pname = "toolshed"; version = "0.17.0.2"; - sha256 = "23d5c90cc0677239deec4b21c4aa8cd3d2477ba310abd39bed646cda10799e81"; + sha256 = "10cyg48dlv34xndx7aqhldxlglnkijmc88abxkg3jwk7q06ckm93"; libraryHaskellDepends = [ array base containers data-default deepseq directory filepath QuickCheck random @@ -178299,6 +191340,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "top" = callPackage + ({ mkDerivation, acid-state, async, base, bytestring, containers + , data-default-class, deepseq, directory, doctest, extra, filemanip + , filepath, flat, hslogger, ListLike, mtl, pipes, pretty, safecopy + , stm, tasty, tasty-hunit, template-haskell, text, time + , transformers, websockets, zm + }: + mkDerivation { + pname = "top"; + version = "0.2"; + sha256 = "0xspyjz9cwfcwb0ihir8y5ddygsvdm3mxy2gdq3cfvzx8axainzh"; + libraryHaskellDepends = [ + acid-state async base bytestring containers data-default-class + deepseq extra filepath flat hslogger ListLike mtl pipes pretty + safecopy stm template-haskell text time transformers websockets zm + ]; + testHaskellDepends = [ + base directory doctest filemanip tasty tasty-hunit zm + ]; + homepage = "http://github.com/tittoassini/top"; + description = "Top (typed oriented protocol) API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "topkata" = callPackage ({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL , OpenGL, parseargs, random @@ -178306,7 +191372,7 @@ self: { mkDerivation { pname = "topkata"; version = "0.2.4"; - sha256 = "b13b54ed389d87a26d48f247a65b7f181ac732a74324d098244c9821221a6919"; + sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178323,7 +191389,7 @@ self: { mkDerivation { pname = "torch"; version = "0.1"; - sha256 = "ec3f0b1c1dad776ae2c55e17fe4ab693405fc0cabb9d617fa2dd6dd1fa0e51ad"; + sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc"; libraryHaskellDepends = [ base mtl parallel QuickCheck ]; homepage = "http://patch-tag.com/repo/torch/home"; description = "Simple unit test library (or framework)"; @@ -178337,8 +191403,8 @@ self: { }: mkDerivation { pname = "torrent"; - version = "10000.0.1"; - sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725"; + version = "10000.1.1"; + sha256 = "0m7s0q7f8c7glxzqhf2j86ch5xhk6jnzwwsa4mkywag22119c290"; libraryHaskellDepends = [ base bencode binary bytestring containers filepath syb ]; @@ -178351,7 +191417,7 @@ self: { mkDerivation { pname = "tostring"; version = "0.2.1.1"; - sha256 = "efa700d44aec57c82be60c0eabd610f62f2df0d9b06cf41b5fc35a2b77502531"; + sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg"; libraryHaskellDepends = [ base case-insensitive text utf8-string ]; description = "The ToString class"; license = stdenv.lib.licenses.bsd3; @@ -178362,7 +191428,7 @@ self: { mkDerivation { pname = "total"; version = "1.0.5"; - sha256 = "922078be30b4ef27b37c9c7ecafa19e892ac8e19e5c99056ba0456d4c492694f"; + sha256 = "0kv9jb2d8mh4p9b91jg5367ar4p837xclzlwgjrjgvxl62z7h84j"; libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -178374,7 +191440,7 @@ self: { mkDerivation { pname = "total-alternative"; version = "0.1.0.1"; - sha256 = "9895072694989266b3fa7aa062d7edca6e054c563c9ba07d8c26675bbd3435cf"; + sha256 = "1krm6jymnrr6iiys16rwar60avnaxpbn583szarnd4lqjhk0g5cq"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/guaraqe/total-alternative#readme"; description = "Alternative interface for total versions of partial function on the Prelude"; @@ -178386,7 +191452,7 @@ self: { mkDerivation { pname = "total-map"; version = "0.0.6"; - sha256 = "32ff8bf84ce379fa4a3d9f2630471ff0ab4924bcd5e65bad9b539da50e65af85"; + sha256 = "11dgcl7ab7akkfnmprnmphj4kazh3x3k09lz7m5glyg39kw8pzrj"; libraryHaskellDepends = [ base containers ]; homepage = "http://github.com/conal/total-map/"; description = "Finitely represented /total/ maps"; @@ -178400,7 +191466,7 @@ self: { mkDerivation { pname = "total-maps"; version = "1.0.0.3"; - sha256 = "6b2d338e1253854550216147ea6a274c0b8a5ab3cc49eb0a1d5c95c5cc69e931"; + sha256 = "0cg9d76cb5aw3l5fnjfcndd8l2sc4xmfliv14584b1ak2a736bbb"; libraryHaskellDepends = [ adjunctions base base-compat bytes containers distributive keys linear reflection semigroups vector @@ -178414,7 +191480,7 @@ self: { mkDerivation { pname = "touched"; version = "0.2.0.1"; - sha256 = "f1f565427a69e3f91303ae5ca5c8c4d813efb4148ab6454c635c5a8fe9133352"; + sha256 = "0lik2glqynjwcd64bdla2jsfy4yqqk4aap5f0c9zkqv9g916bxgi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory process time ]; @@ -178431,7 +191497,7 @@ self: { mkDerivation { pname = "tower"; version = "0.1.0"; - sha256 = "0a9daecc7b1ab68b5dfdf108df6d324f27b3798b4eb43e275d957cd4313cd90b"; + sha256 = "02yr7hqx8z4mblkkxd2fidwv69sg69nxy27izmfqpdhsgg6ax78a"; libraryHaskellDepends = [ base protolude QuickCheck vector ]; testHaskellDepends = [ base HUnit protolude QuickCheck smallcheck tasty tasty-hunit @@ -178450,7 +191516,7 @@ self: { mkDerivation { pname = "toxcore"; version = "0.0.2"; - sha256 = "859eff7c76714fb802b1868a9d5165122217f3c3284c0cb0e7f7fb39921d7a72"; + sha256 = "0wks3n93kyzpwyq0qk18qgrif8hjcm8rv2l6n41bhkvifrygz7l5"; libraryHaskellDepends = [ base bytestring bytestring-arbitrary data-default-class QuickCheck saltine @@ -178480,9 +191546,9 @@ self: { mkDerivation { pname = "toysolver"; version = "0.4.0"; - sha256 = "e9633a7854e6b67d947da02128098f7a29100e9a185be1a5d267e1d4fbf8e3bf"; + sha256 = "1gz3z3xx9qb7sajy2nqqk8710absiw4jh8d0gna7vdp6aiw3lqz9"; revision = "1"; - editedCabalFile = "7d55fc9a8b47c61fab64b636ea94028f01d971e0e2b8b075aa73a04b9ed8a52e"; + editedCabalFile = "0bm5v2g4p83km9sv1f72w1qxj0cg0aafldmncjmizij7ifdgqmbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178526,7 +191592,7 @@ self: { mkDerivation { pname = "tpar"; version = "0.1.0.0"; - sha256 = "9f6b47bafecd5fa8f042e1c6682a2b7d80d66d7d274cbdf2900390955869a154"; + sha256 = "0m51d5c9b403j3rbsk17gmnxd03x5cm6iip18bqahpydzsx4fswz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178562,7 +191628,7 @@ self: { mkDerivation { pname = "tpb"; version = "0.1.1.1"; - sha256 = "816c0381011987955c8aa1b379f90077334547edf5675e1540d7562acafe5c70"; + sha256 = "0w2wzv52lmnp80amwrzmxm3lacvp03wpkcx1i9f9b1qr060h6v41"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178573,6 +191639,7 @@ self: { ]; description = "Applications for interacting with the Pushbullet API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tpdb" = callPackage @@ -178582,7 +191649,7 @@ self: { mkDerivation { pname = "tpdb"; version = "1.3.3"; - sha256 = "faa53ced8a5756fef610618b96d4dad7518f66a56108ad0300a3866259237af6"; + sha256 = "1xks4dcn51m3001ss231lmk8ylfpvba9d2v123vgwmjpibnkr9gs"; libraryHaskellDepends = [ base bytestring containers filepath hashable HaXml hxt mtl parsec text time wl-pprint-text @@ -178600,7 +191667,7 @@ self: { mkDerivation { pname = "trace"; version = "0.2.0.0"; - sha256 = "81fcd5593b6e1a5e4b23bf695e704576e6cb53547cefa9797021b2274c6b7f92"; + sha256 = "14kzdd62gci1f1wskvvwai9wprkn8mq5wsdz4d5mw6kf7dcxbz41"; libraryHaskellDepends = [ base containers deepseq monad-control mtl transformers transformers-base @@ -178615,7 +191682,7 @@ self: { mkDerivation { pname = "trace-call"; version = "0.1"; - sha256 = "5c993e37bf00d321afd93f3485a399edadb74751907b868cb26832d2d20e3fba"; + sha256 = "1fiz1v9d4ck8na68cywha53vgbgdk6iqad1zv6pj3lq0pwvkx6aw"; libraryHaskellDepends = [ base containers mtl ]; description = "functions for logging the arguments and results of function calls"; license = stdenv.lib.licenses.bsd3; @@ -178627,7 +191694,7 @@ self: { mkDerivation { pname = "trace-function-call"; version = "0.1"; - sha256 = "be8fe1743d07d6d64d53dade44a14544793949da2167b6fd6c35a7d213d6b630"; + sha256 = "0c5nsq9x59rmdkyvcrr1v94kjya48nhl9pnsad6xdmh77msf33xy"; libraryHaskellDepends = [ base ]; description = "Easy lightweight tracing of function arguments and results for ad hoc debugging"; license = stdenv.lib.licenses.bsd3; @@ -178639,7 +191706,7 @@ self: { mkDerivation { pname = "traced"; version = "3000"; - sha256 = "2942100c3c48b8b8171cb941a5a98219e5c0ba46dad74630dd122ebff452d1de"; + sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9"; libraryHaskellDepends = [ base containers mtl pretty ]; description = "Simple evaluation trace"; license = stdenv.lib.licenses.bsd3; @@ -178651,7 +191718,7 @@ self: { mkDerivation { pname = "tracer"; version = "0.1"; - sha256 = "5516cd56d87063601525d9abefe7c4f1b826e902e0ecbe6dfe49f8fc85a6f6e5"; + sha256 = "1rgnls2zry29zrnvxv700bljdf7iqkkyzayr4lan0qvhv1bcs5jm"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/knz/hs-tracer"; @@ -178666,9 +191733,9 @@ self: { mkDerivation { pname = "tracetree"; version = "0.1.0.1"; - sha256 = "12d0eb7923a905fff4b92c7f4f187a4715ba95883ac1df5e0a7efb59427f5115"; + sha256 = "05aigx15kyvy19gdzh9si2avl5a7g8c4yzrcp7sgy1d94dwypl0j"; revision = "1"; - editedCabalFile = "9e20b69ed0c5280699565c000bcd8f8b70ae6bc2275e37669af70bbca5d4f77a"; + editedCabalFile = "0yppsjjvq2zpk9k3fpi7q9msww4biz6hn02waschca65s2gbc84y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178684,7 +191751,7 @@ self: { mkDerivation { pname = "tracker"; version = "0.1"; - sha256 = "42ffbe3f790327c516613e3f4b64bc3e028f98f85b78f39cdb138ef7e7e46cca"; + sha256 = "1jkcwkkzg3hkvffg6y2vz2c8y0iypij4ngryc4bca9q3g4zvxzs2"; libraryHaskellDepends = [ base containers glib ]; description = "Client library for Tracker metadata database, indexer and search tool"; license = "LGPL"; @@ -178696,7 +191763,7 @@ self: { mkDerivation { pname = "tracy"; version = "0.1.4.0"; - sha256 = "e778ebf70161ac37878629bf8857021969a71bea1b04140a0c306d0b9d0f430f"; + sha256 = "03s31yfhnv9h1h51810vx8dsfs8r09bqigr9hs3kgb3107vyny77"; libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; @@ -178711,7 +191778,7 @@ self: { mkDerivation { pname = "traildb"; version = "0.1.1.0"; - sha256 = "15378affdaaa360d3f7c2f9e39866b9f73d60b3092ca9ab4ef4f82a33a373b3b"; + sha256 = "0frv6wxa70jgxys9mjlj605xcwwzdf33k7igghzhsdmavbzqldqm"; libraryHaskellDepends = [ base bytestring containers directory exceptions lens primitive text time transformers unix vector @@ -178733,7 +191800,7 @@ self: { mkDerivation { pname = "trajectory"; version = "0.1.0.0"; - sha256 = "f06831a87b172c0a95c329bb61ee695e9de60b917d75e75917cf973b40a2fbd8"; + sha256 = "1n7vl903p5yg2xcyfxbxj45yd7ayd7p63fr9qfahlb0pgfl32s7h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178754,9 +191821,9 @@ self: { mkDerivation { pname = "transactional-events"; version = "0.1.0.0"; - sha256 = "b47e21951c88ec3243c6f977b2d59e2688c536e3f182e3d7e80700bb88636349"; + sha256 = "0jb3cf4bn007x3by70piwcvcb216kvav4xzrqr1k5v483jaj2zml"; revision = "1"; - editedCabalFile = "9ae1e516b5cb6219828469b330ff7017a5b943d2791f64f8bffc34ea7f964d83"; + editedCabalFile = "10sdjrzyld7wpzw687vrs91vk98pf3zk1cv9hj11jqnbnlbfbqcs"; libraryHaskellDepends = [ base ListZipper MonadPrompt stm ]; description = "Transactional events, based on Concurrent ML semantics"; license = stdenv.lib.licenses.bsd3; @@ -178770,7 +191837,7 @@ self: { mkDerivation { pname = "transf"; version = "0.13.1"; - sha256 = "34f2d3352d73eb3684dc64a55a887c4754c9f73c20ec5c2b1bc59aa48ece36dd"; + sha256 = "1p9nrs7a96n53cmmrv107kvwjm27gj45m9b4vj23dsvk5lsx7wil"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178789,7 +191856,7 @@ self: { mkDerivation { pname = "transformations"; version = "0.2.0.0"; - sha256 = "55d1035545a623d77823d68408d9c1ba22561497abfae7f0733d068051d3bf5a"; + sha256 = "0nmzsd8q01ixfgqfgymbjwa5c8msq7chi16n4dwdf8x68mah7lam"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178808,9 +191875,9 @@ self: { mkDerivation { pname = "transformers"; version = "0.4.3.0"; - sha256 = "b3d0a797e815ca50d411e20c02f781efe7751308007d880af7f0b5c4365c3a9d"; + sha256 = "179sbhvc9dghyw58hz80109pbrzgh7vh437227a51jhmx2bsgl5k"; revision = "1"; - editedCabalFile = "60dafcffe8c4fe6f3760426fc35a325c8e6419877596518c76f46657280207a9"; + editedCabalFile = "1a8708l5frplfs6535kmhwcn93jw69dc6vs2c0vnzzn4x3zzrnk0"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -178822,7 +191889,7 @@ self: { mkDerivation { pname = "transformers"; version = "0.5.4.0"; - sha256 = "f87f3f338aa2d85af55aadad643ca1ce32052a017b7d1273b0226c84bdb8889a"; + sha256 = "16l8p2yq8v12n1ri4zbv04m0acnfl4y69bddbbsmmn52i8rkyzzq"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -178836,7 +191903,7 @@ self: { mkDerivation { pname = "transformers-abort"; version = "0.6.0.1"; - sha256 = "4acca1807cc99bf4f366e25e7ab66069b7d19f5f4bedca675c75805bf3b7a461"; + sha256 = "0qd4nzrmp03mbikwmvabbygx3dv9c2v7lpp2cvrz96y9gj0a3k2a"; libraryHaskellDepends = [ base monad-control pointed semigroupoids transformers transformers-base @@ -178851,9 +191918,9 @@ self: { mkDerivation { pname = "transformers-base"; version = "0.4.4"; - sha256 = "6aa3494fc70659342fbbb163035d5827ecfd8079e3c929e2372adf771fd52387"; + sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va"; revision = "1"; - editedCabalFile = "fb1a305f29cbf6ac182af7e67efaae9fcb9664d8d9606bb8a7f3414ad4c8d7a4"; + editedCabalFile = "196pr3a4lhgklyw6nq6rv1j9djwzmvx7xrpp58carxnb55gk06pv"; libraryHaskellDepends = [ base stm transformers transformers-compat ]; @@ -178862,12 +191929,24 @@ 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 { pname = "transformers-compat"; version = "0.5.1.4"; - sha256 = "d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f"; + sha256 = "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq"; libraryHaskellDepends = [ base ghc-prim transformers ]; homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; @@ -178879,7 +191958,7 @@ self: { mkDerivation { pname = "transformers-compose"; version = "0.1"; - sha256 = "cddca7ec49334b951418dac5014aa0c4bf2ad38a841906d330d1681974a1704f"; + sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/aristidb/transformers-compose"; description = "Arrow-like / category-like composition for transformers"; @@ -178887,6 +191966,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transformers-continue" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "transformers-continue"; + version = "0.0.1"; + sha256 = "0h0qbhk7b4wm3h06m26ga3i6rqw60fjs469iq6p3j6pdvq58bb5x"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/nhibberd/transformers-continue"; + description = "Control flow data type and monad transformer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-convert" = callPackage ({ mkDerivation, base, data-easy, directory, either, errors , haskell-src-exts, hlint, hspec, HUnit, QuickCheck, text @@ -178895,7 +191986,7 @@ self: { mkDerivation { pname = "transformers-convert"; version = "0.2.0.0"; - sha256 = "679c9f0ce00853e836d4acc9698341c92982fe4ceb2d1dd6a6b2bcf5bc4ca95b"; + sha256 = "0nx99jygbg5jlvb1sbgb9kz84af9861nkjdcshvfhlq8w069z737"; libraryHaskellDepends = [ base data-easy either transformers ]; testHaskellDepends = [ base data-easy directory either errors haskell-src-exts hlint hspec @@ -178914,7 +192005,7 @@ self: { mkDerivation { pname = "transformers-eff"; version = "0.2.0.0"; - sha256 = "16be6a4fcb355a9295b62853106c947ae690221eee140f779faee905d77e48d9"; + sha256 = "1na8gvbhbsdfkxvhy57f3qi91rksjin10lr8nsar4nimrd7nmghn"; libraryHaskellDepends = [ base free list-transformer mmorph transformers ]; @@ -178933,9 +192024,9 @@ self: { mkDerivation { pname = "transformers-free"; version = "1.0.1"; - sha256 = "e08b197351a03537b57f561d133e7266f4baf916638c88397a166f174f9e7f39"; + sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0"; revision = "1"; - editedCabalFile = "f17896283725026a294f9f071226f73b66bd4609a408399393ccc62b9efc71fe"; + editedCabalFile = "1zkizjg2pincjf9kj254153bsrivywk141wz9wlnl0i56wl9cy7i"; libraryHaskellDepends = [ base transformers ]; description = "Free monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -178946,18 +192037,34 @@ self: { mkDerivation { pname = "transformers-lift"; version = "0.1.0.1"; - sha256 = "c29d11f58fb9b2c1011c162f8f9f98cb0f2d12ca1317f40f4c88d9881840aa74"; + sha256 = "0x5a80c8inc89h7z85qkr892s3ybk2gqybqn3h0w3cmrizsi37f2"; + revision = "1"; + editedCabalFile = "0jk65y544gm09hi3wl0d599aay5a6d484wi3l9nwv2yml97x9inw"; libraryHaskellDepends = [ base transformers ]; description = "Ad-hoc type classes for lifting"; license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-lift_0_2_0_1" = callPackage + ({ mkDerivation, base, transformers, writer-cps-transformers }: + mkDerivation { + pname = "transformers-lift"; + version = "0.2.0.1"; + sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b"; + libraryHaskellDepends = [ + base transformers writer-cps-transformers + ]; + description = "Ad-hoc type classes for lifting"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-runnable" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "transformers-runnable"; version = "0.1.0.0"; - sha256 = "3ac45eb89a407fca2d9872309f4f065934c9b8751abe5c6aaf3518135ddb3b54"; + sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/JanBessai/transformers-runnable"; description = "A unified interface for the run operation of monad transformers"; @@ -178970,7 +192077,7 @@ self: { mkDerivation { pname = "transformers-supply"; version = "0.1.0"; - sha256 = "b8c60e6ad35c53a77c4e72b255562b0aebb6a1f26c33ed51ab528fd8d9b0c925"; + sha256 = "09f9n3cxi3sjmd8yscvcyahvdsqa5db5bckj9ryaflswsdm0ximq"; libraryHaskellDepends = [ base mtl transformers ]; description = "Supply applicative, monad, applicative transformer and monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -178983,7 +192090,7 @@ self: { mkDerivation { pname = "transient"; version = "0.4.4.1"; - sha256 = "f1ad34b6c3d4044d294abf4b37f35efb764b710851eab6e58e1b9abb8a68d0ed"; + sha256 = "1vfhd25bp6hvivjvdsji11qlnxpvbvrkfjxz98lls16lqfv39bgi"; libraryHaskellDepends = [ base containers directory mtl random stm time transformers ]; @@ -178992,20 +192099,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "transient_0_5_1" = callPackage + "transient_0_5_8" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , random, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.5.1"; - sha256 = "a6b90bed245013a7ffe61f8d6e5b0f5798dd64999c914c1f956b0d3a1c3a8d25"; + version = "0.5.8"; + sha256 = "04n43yddamgk7han7kmhz57v2vrp3cazqkgy4xnkdfgr10z8pppx"; libraryHaskellDepends = [ base bytestring containers directory mtl random stm time transformers ]; + testHaskellDepends = [ + base bytestring containers directory mtl random stm time + transformers + ]; homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Making composable programs with multithreading, events and distributed computing"; + description = "composing programs with multithreading, events and distributed computing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -179019,7 +192130,7 @@ self: { mkDerivation { pname = "transient-universe"; version = "0.3.5.1"; - sha256 = "7613bf9a99b111423649793f687b7a2b81241b89840a8046a316793ecc7df985"; + sha256 = "11grgp63wy8nld3802l4i4dj909bg9xnhgvr94v444dik6dby4vn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179040,7 +192151,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transient-universe_0_4_1" = callPackage + "transient-universe_0_4_6" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network , network-info, network-uri, process, random, stm, TCache, text @@ -179048,8 +192159,8 @@ self: { }: mkDerivation { pname = "transient-universe"; - version = "0.4.1"; - sha256 = "2000815b5df5dfa3e02856e0ba3e1f408efaf4fc6365c6949c0f9cca4ad8d6fb"; + version = "0.4.6"; + sha256 = "0as7930b9mwy86rcly957q9yslqd2rflakmxnl1njnqm2cr2dx7m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179058,7 +192169,11 @@ self: { random stm TCache text time transformers transient vector websockets ]; - executableHaskellDepends = [ base transformers transient ]; + executableHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP mtl network network-info network-uri process random + stm TCache text time transformers transient vector websockets + ]; testHaskellDepends = [ base bytestring case-insensitive containers directory filepath hashable HTTP mtl network network-info network-uri process random @@ -179078,7 +192193,7 @@ self: { mkDerivation { pname = "transient-universe-tls"; version = "0.1.0.0"; - sha256 = "9f4b345602de7a3652fdcebb787c66017697ef6e0f16a47e59cda3c42cbd8467"; + sha256 = "0rw4plnc98ydb5za85hgdvprfxh1cry7ifyfzm93cyny09b38jwz"; libraryHaskellDepends = [ base bytestring certificate cprng-aes data-default network tls transient transient-universe x509-store @@ -179086,6 +192201,7 @@ self: { homepage = "http://github.com/transient-haskell/transient-universe-tls"; description = "transient with secure communications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "translatable-intset" = callPackage @@ -179093,7 +192209,7 @@ self: { mkDerivation { pname = "translatable-intset"; version = "0.1"; - sha256 = "7556dd009fa229c94ad47dfc7ef86b1e5e5bf76feee8db9b704419820b0d685f"; + sha256 = "0pv81l5q46a4f2dxps7fdzvmnphydgw7xz3xsi5cjad2kw0dsmkm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base fingertree ]; @@ -179107,7 +192223,7 @@ self: { mkDerivation { pname = "translate"; version = "2010.1.24"; - sha256 = "ee5780019a3af853ce9a3c0ba0ea9ea0e896c5e965ccfda247cb26763ae0986d"; + sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf"; libraryHaskellDepends = [ base curl json network utf8-string ]; homepage = "http://github.com/nfjinjing/translate"; description = "Haskell binding to Google's AJAX Language API for Translation and Detection"; @@ -179115,17 +192231,113 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "trasa" = callPackage + ({ mkDerivation, base, binary, bytestring, doctest, hashable + , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck + , text, unordered-containers, vinyl + }: + mkDerivation { + pname = "trasa"; + version = "0.2"; + sha256 = "1570f4612nfslcxr0mjwf4zzgfninb0mv1d0n6livcks8jd4w4ph"; + libraryHaskellDepends = [ + base binary bytestring hashable http-media http-types text + unordered-containers vinyl + ]; + testHaskellDepends = [ + base bytestring doctest tasty tasty-hunit tasty-quickcheck text + vinyl + ]; + homepage = "https://github.com/haskell-trasa/trasa#readme"; + description = "Type Safe Web Routing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trasa-client" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-media, http-types, ip, text, trasa, unordered-containers + }: + mkDerivation { + pname = "trasa-client"; + version = "0.2"; + sha256 = "0cgsjaclcqy4nprp7ndr4di1km0fp70zfgv1r4v172mk2q0n06nx"; + libraryHaskellDepends = [ + base binary bytestring http-client http-media http-types text trasa + ]; + testHaskellDepends = [ + aeson base http-client http-types ip text trasa + unordered-containers + ]; + description = "Type safe http requests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "trasa-reflex" = callPackage + ({ mkDerivation, base, bytestring, containers, ghcjs-dom + , http-media, http-types, jsaddle, reflex, reflex-dom, text, trasa + }: + mkDerivation { + pname = "trasa-reflex"; + version = "0.2"; + sha256 = "11dwymm1cvxbfhfmsfipzxbigrgi6wybz3qylq8v0022c929cd1n"; + libraryHaskellDepends = [ + base bytestring containers ghcjs-dom http-media http-types jsaddle + reflex reflex-dom text trasa + ]; + description = "Reactive Type Safe Routing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "trasa-server" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , doctest, http-client, http-media, http-types, mtl, tasty + , tasty-hunit, tasty-quickcheck, text, trasa, vinyl, wai, warp + }: + mkDerivation { + pname = "trasa-server"; + version = "0.2"; + sha256 = "1jiqlsmiz82xh0mxj72bm0daqjvn5h5wb44i50q4pbsijaqgvsyy"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-media http-types + mtl text trasa wai + ]; + testHaskellDepends = [ + base bytestring doctest http-client tasty tasty-hunit + tasty-quickcheck text trasa vinyl warp + ]; + homepage = "https://github.com/haskell-trasa/trasa#readme"; + description = "Type safe web server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "traverse-with-class" = callPackage ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { pname = "traverse-with-class"; version = "0.2.0.4"; - sha256 = "9d54e9ceac37f1253af616204139d9630ac3b3b5d618bbe03b74db4d7e208772"; + sha256 = "0wl741z4vnvl7ghbn66nnnrw62k3v4wl280nyqx2bw9pmk7fjm4x"; libraryHaskellDepends = [ base template-haskell transformers ]; description = "Generic applicative traversals"; license = stdenv.lib.licenses.mit; }) {}; + "traverse-with-class_1_0_0_0" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "traverse-with-class"; + version = "1.0.0.0"; + sha256 = "1fqz35kaffq79qs7kgdx2bml2a99x6k87hlczsfjcs1bcpqj18k5"; + libraryHaskellDepends = [ base template-haskell transformers ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Generic applicative traversals"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "travis" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit , transformers @@ -179133,7 +192345,7 @@ self: { mkDerivation { pname = "travis"; version = "0.1.0.1"; - sha256 = "eed3dc277851940c32df93f6d3f1343f7a0f0d35998fdcc73f0ffdc8da5ecdd6"; + sha256 = "1mndbvdciz8g7z3xr3wr6l6hyyiz6kqx7xlkvwr0r52ig0kxrlzf"; libraryHaskellDepends = [ aeson base bytestring http-conduit transformers ]; @@ -179150,7 +192362,7 @@ self: { mkDerivation { pname = "travis-meta-yaml"; version = "0.1.0.0"; - sha256 = "d5d9e8fe5c2e49fdd0beac1535d5d7567a6ab3e29d13bcc0c610e1865de09b94"; + sha256 = "154vw1fqdq8hqv0bq4wxwarnlyjnszaka5dcpv8gsj9fbkzfinfm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179173,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 @@ -179180,7 +192407,7 @@ self: { mkDerivation { pname = "trawl"; version = "0.1.0.0"; - sha256 = "699d373ca97b04aedee973d466a8afbe81faa2e2e20e3e87d8261fe4f685a42e"; + sha256 = "0bm4hpvf87r6v23kw3p2waigm0dymyl6dm3kx7gaw13vm4y3g7b9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -179198,7 +192425,7 @@ self: { mkDerivation { pname = "traypoweroff"; version = "1.0.0"; - sha256 = "95b035d1ac8dbb5bf69153c901b46253cbc2a6f253b16fde7a12953ea40cfd3c"; + sha256 = "0g7x1jj3x58jgbg6zcakyakc5jskcas03jakj7v5pfwdmk8kbc4m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gtk process ]; @@ -179213,7 +192440,7 @@ self: { mkDerivation { pname = "tree-fun"; version = "0.8.1.0"; - sha256 = "2ae925f198e9700dedbf809c2b77086fef32f58b4a4adb6c398dca49f4d56f1f"; + sha256 = "07vgsps4kjld75ndnjjaigsk5vvg11vjp740pznhsw79k3qjbs9a"; libraryHaskellDepends = [ base containers mtl ]; description = "Library for functions pertaining to tree exploration and manipulation"; license = stdenv.lib.licenses.gpl3; @@ -179224,7 +192451,7 @@ self: { mkDerivation { pname = "tree-monad"; version = "0.3"; - sha256 = "95ea6fbd0af4d360b7a66aa1fc89e04afc240ae51fd654dbf1a02190eec341ff"; + sha256 = "1zs1qgp908d0y7dm9mhzwl529z2aw24zr8balsvn1lzl1aynzslm"; libraryHaskellDepends = [ base ]; homepage = "http://sebfisch.github.com/tree-monad"; description = "Non-Determinism Monad for Tree Search"; @@ -179236,9 +192463,9 @@ self: { mkDerivation { pname = "tree-view"; version = "0.5"; - sha256 = "2d0046df6a78bfc57c7d11736d3baf6e1e427e8eb944f408b80a9195b062dcab"; + sha256 = "1aywcaq9b48ap04g8i5rirz447kfmwxnswqigmycbgvqdbglc01d"; revision = "1"; - editedCabalFile = "85fbc67b53c1ef47f020a69051e6a29b27481698fe802cd2ed8ab0108aa69a38"; + editedCabalFile = "0f4sls511c4axp92r07yk0b4h9wvlbk5345643q4gvy1adxwdyw5"; libraryHaskellDepends = [ base containers mtl ]; description = "Render trees as foldable HTML and Unicode art"; license = stdenv.lib.licenses.bsd3; @@ -179251,7 +192478,7 @@ self: { mkDerivation { pname = "treemap"; version = "2.0.0.20161218"; - sha256 = "709fb2c5f6da414f7c4e6ec66682dea7a63b595ab08e29ff5475273c60d4b0a3"; + sha256 = "18xhsih3q9vmakzjk3mhb9ckp9m7vs16dikf9ry4yhfsyv2v57vh"; libraryHaskellDepends = [ base containers deepseq semigroups strict transformers ]; @@ -179271,7 +192498,7 @@ self: { mkDerivation { pname = "treemap-html"; version = "0.1"; - sha256 = "058d1a3093dffedd393d6244d5f05736b4af280222d60b19271f89f2c7e3124b"; + sha256 = "0jqjwg3z528z4wchpmi208lazd1nazqdai327lwxvznzjcq1m385"; libraryHaskellDepends = [ base Cabal containers filepath ghc html parsec regex-posix ]; @@ -179288,7 +192515,7 @@ self: { mkDerivation { pname = "treemap-html-tools"; version = "0.2"; - sha256 = "6e19cf868c27e2eebe7fb695009470443edaa00cf9b196e2edf4a21036aaf128"; + sha256 = "0a7im8v118plxpi9dcgr1jhdlgj4f2a015dngyzfxqi7ij3cy6bf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179307,7 +192534,7 @@ self: { mkDerivation { pname = "treersec"; version = "1"; - sha256 = "220e4863d0ca51e1d5372e7bb1c97528ff0262d8083413183fb56068fe2cc32a"; + sha256 = "0an35kz6hq5m7wc16d08v1i05zr8fp4v2yrf6zay2lfas1ilh3i2"; libraryHaskellDepends = [ base haste-compiler sneathlane-haste ]; homepage = "http://sneathlane.com/treersec"; description = "Structure Editing Combinators"; @@ -179320,7 +192547,7 @@ self: { mkDerivation { pname = "treeviz"; version = "2.0.3"; - sha256 = "dab7dd9935cde4259dab1604b732292a0076e1e8a277476abf822ea2819f26a9"; + sha256 = "1a96ky0s4bl2pxm4fxx2x3hpc01a54rbf10nmffjbr6d6ncxvdys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; @@ -179336,7 +192563,7 @@ self: { mkDerivation { pname = "tremulous-query"; version = "1.0.7"; - sha256 = "7d9d3c6fa0c8987d456dd190f016d8d5c154c4c50b31853170e2d9740174c66d"; + sha256 = "0vf6fh0p9ng2f0qqac8bqp259hfmv0bg146idm2pv668l1pkr7bx"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq mtl network ]; @@ -179350,7 +192577,7 @@ self: { mkDerivation { pname = "trhsx"; version = "0.2.2"; - sha256 = "631601c5345599e08535221df4415c7676e3e307bfa6a13d32e3c46d9c145d86"; + sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3"; description = "Deprecated"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -179363,7 +192590,7 @@ self: { mkDerivation { pname = "triangulation"; version = "0.3"; - sha256 = "ae3d076ad06c73170ab534fec7720e8bc383ae5880ff66fe707d5c6349f1a953"; + sha256 = "0lx9y54n6p3xf3z6dzw0b2p87hwb1rrcgzilnl51fwvcs1m0fgdf"; libraryHaskellDepends = [ array base collada-types haskell98 tuple vector vector-algorithms ]; @@ -179381,24 +192608,19 @@ self: { }: mkDerivation { pname = "tries"; - version = "0.0.4"; - sha256 = "6be9638a03b35effe69c9bbfc33b00fe92156211945b83dee871e70cf266f94a"; + version = "0.0.4.2"; + sha256 = "152rs6g3p6nc4xw3fnh0psmlqmchq038y0p18nandgggsnl2ck0n"; libraryHaskellDepends = [ base bytestring bytestring-trie composition composition-extra containers deepseq hashable keys QuickCheck quickcheck-instances rose-trees semigroups sets unordered-containers ]; testHaskellDepends = [ - base bytestring bytestring-trie composition composition-extra - containers deepseq hashable keys mtl QuickCheck - quickcheck-instances rose-trees semigroups sets tasty - tasty-quickcheck unordered-containers + base containers mtl QuickCheck quickcheck-instances tasty + tasty-quickcheck ]; benchmarkHaskellDepends = [ - base bytestring bytestring-trie composition composition-extra - containers criterion deepseq hashable keys mtl QuickCheck - quickcheck-instances rose-trees semigroups sets - unordered-containers + base containers criterion mtl rose-trees unordered-containers ]; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -179416,7 +192638,7 @@ self: { mkDerivation { pname = "trifecta"; version = "1.6.2.1"; - sha256 = "bab3724de8ed4f5283deb99013debf2e223e9e2c3c975e7d9b9bd44a9b30fbe5"; + sha256 = "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq @@ -179431,12 +192653,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "trifecta_1_7" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base + , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal + , cabal-doctest, charset, comonad, containers, deepseq, doctest + , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors + , QuickCheck, reducers, semigroups, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "1.7"; + sha256 = "0hsm6k0af5hrx768kq4nww56x7hmvp993659asck6r00i9gyk0pq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html + blaze-markup bytestring charset comonad containers deepseq + fingertree ghc-prim hashable lens mtl parsers profunctors reducers + semigroups transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ base doctest parsers QuickCheck ]; + homepage = "http://github.com/ekmett/trifecta/"; + description = "A modern parser combinator library with convenient diagnostics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trimpolya" = callPackage ({ mkDerivation, base, bio, bytestring, simpleargs }: mkDerivation { pname = "trimpolya"; version = "0"; - sha256 = "314504ac9c9c4681e8cb5b4c0dde13e7a7824a358c08810cc9f45f700b4ea5f8"; + sha256 = "1y559q5p0pzlr468224c6m5859z72gg0sk2vrgl82ilwkjn08i9i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bio bytestring simpleargs ]; @@ -179452,7 +192700,7 @@ self: { mkDerivation { pname = "tripLL"; version = "0.1.0.0"; - sha256 = "228b6112c915aa6fd70605bca9c76f0468a13afe6956e3755d48efc0efaec3ab"; + sha256 = "1ay3mvpw1vs8bmsy6mk9zqxa2s04dz3skg050vbnzahmr49632r2"; libraryHaskellDepends = [ base bytestring cereal filepath leveldb-haskell ]; @@ -179462,12 +192710,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "triplesec" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, doctest, memory, mtl + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "triplesec"; + version = "0.1.2.0"; + sha256 = "0qvhsn5l35mmm71j5g0kv955hfjyzywvwgnjfjl8illgf2g79f46"; + libraryHaskellDepends = [ + base cryptonite memory mtl transformers + ]; + testHaskellDepends = [ + base bytestring doctest memory QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/SamProtas/hs-triplesec"; + description = "TripleSec is a simple, triple-paranoid, symmetric encryption library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trivia" = callPackage ({ mkDerivation, base, comonad, distributive }: mkDerivation { pname = "trivia"; version = "0.0"; - sha256 = "e8c4f180becea2005c61c0f97ac1e460755dbd31c0e055ab148998c9b1fcb50f"; + sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78"; libraryHaskellDepends = [ base comonad distributive ]; homepage = "https://github.com/fumieval/trivia"; description = "The trivial monad and comonad"; @@ -179479,7 +192748,7 @@ self: { mkDerivation { pname = "trivial-constraint"; version = "0.4.0.0"; - sha256 = "17fc46892beaa08c5badd544e71f690784f683efcfc50f482f5f8bc19fdc86c1"; + sha256 = "1hc6vjgw32sz5x40zifgxy1zd107d4gyfi6mmmdqr87a5f4ldz0p"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/leftaroundabout/trivial-constraint"; description = "Constraints that any type, resp. no type fulfills"; @@ -179491,7 +192760,7 @@ self: { mkDerivation { pname = "tropical"; version = "0.0.0.2"; - sha256 = "6282fbe2f86bb261a2f4189154125865b12754f6028181e6229ae3f59d94c9c6"; + sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2"; libraryHaskellDepends = [ base semiring-simple ]; description = "A library for tropical mathematics"; license = stdenv.lib.licenses.bsd3; @@ -179503,7 +192772,7 @@ self: { mkDerivation { pname = "true-name"; version = "0.1.0.2"; - sha256 = "067627890569fe5a241b6bd7e0de44b2f2fa22a2e9e2e29eaed6aadc2e6e1cb0"; + sha256 = "1c0wdqpdrannmsgf5qp9l8igmwmj8kgf1mvb3cj5mzk90n4jfxh6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base containers template-haskell time ]; homepage = "https://github.com/liyang/true-name"; @@ -179516,7 +192785,7 @@ self: { mkDerivation { pname = "truelevel"; version = "0.1.3.1"; - sha256 = "324ae37a43574ccce1ff7ddca01bdcdccd7ccf54124113d66c907369f58eac60"; + sha256 = "0q5civsnjwwhdkb16h8jak7prkfwvhds1p3xzzhwqk2p8dxf6jij"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers parseargs WAVE ]; @@ -179533,7 +192802,7 @@ self: { mkDerivation { pname = "trurl"; version = "0.4.1.0"; - sha256 = "9399cf354e434c631bcd4275951480c19b3217daa7d18ecebfbc6c3a4bd61e26"; + sha256 = "09hysr5klv5wpz78xld7v8bk56y1h0a9axa2rldn6k239qswz6ck"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179553,7 +192822,7 @@ self: { mkDerivation { pname = "truthful"; version = "0.1.0.2"; - sha256 = "e47eee33d83123c7c7d2498befc1911081465143cb25329c3bdd7de38f0d1f5d"; + sha256 = "0p8z1n7y6zfx7ff349fb8d8ld08hj70yz2s9sb3wf8riv0rywzp4"; libraryHaskellDepends = [ base ]; description = "Typeclass for truthfulness of values"; license = stdenv.lib.licenses.publicDomain; @@ -179564,9 +192833,9 @@ self: { mkDerivation { pname = "tsession"; version = "0.1"; - sha256 = "331b5a38f9ec5ad66c3c8f6c47f7b0c5c4cbaa36f8a22e9931501cd1fc0e41e6"; + sha256 = "1rj11vyd272h66cjx8pq6smcpi65n3vlfv4g7indcnpcz4w5l6rk"; revision = "2"; - editedCabalFile = "afd89984a633388a2db5ad107968c92693527eb6f746318c4752993633705e57"; + editedCabalFile = "0msyf0rkd6aj8y632ippnrz554r6r5l7j45dnlnqlf1kls29kn5g"; libraryHaskellDepends = [ base containers mtl time transformers ]; description = "A Transaction Framework for Web Applications"; license = stdenv.lib.licenses.bsd3; @@ -179578,7 +192847,7 @@ self: { mkDerivation { pname = "tsession-happstack"; version = "0.1"; - sha256 = "dfbb1cc4e741084f3836ec1b90e380e2daf9913f60346b5e49fd6f9a711466eb"; + sha256 = "1sv62iqrlvzx95g6nd307y8zknp2h3ir06zc6qw4y221wz21rfyz"; libraryHaskellDepends = [ base happstack-server transformers tsession ]; @@ -179592,7 +192861,9 @@ self: { mkDerivation { pname = "tskiplist"; version = "1.0.0"; - sha256 = "aa20f823c787122858513b38207bc74e9eb032435ac7e6624569f1411d825e2d"; + sha256 = "0bayh8fl3wb98mifdiss8crb17jfqxxj0f1va5c2h4l7qwizh85a"; + revision = "1"; + editedCabalFile = "162s24i0n1pcgp8m4lqhs9vm3m78by88axdvn358zxjpfrpln817"; libraryHaskellDepends = [ array base containers random stm ]; homepage = "https://github.com/thaldyron/tskiplist"; description = "A Skip List Implementation in Software Transactional Memory (STM)"; @@ -179607,9 +192878,9 @@ self: { mkDerivation { pname = "tslib"; version = "0.1.4"; - sha256 = "f1d52846d2f7b4897fb8447699d9f0e7f73c8671ea0079f4e89a171479d2c626"; + sha256 = "09n6s9wi85wsx3s7j07af633rxz7y3crjxj4p1zqkd7ps932imgi"; revision = "4"; - editedCabalFile = "5a53d0da4871b896d49eadfc408d258e2b9b1bbfa04bba1ce128ca587608547e"; + editedCabalFile = "0zjl11v5iji8w4fbljx0pwdrnawf4n6l1z5dkva9df3i93dd0lss"; libraryHaskellDepends = [ base containers hybrid-vectors lens statistics time vector ]; @@ -179622,23 +192893,46 @@ self: { }) {}; "tslogger" = callPackage - ({ mkDerivation, async, base, containers, random }: + ({ mkDerivation, async, base, bytestring, containers, random, text + }: mkDerivation { pname = "tslogger"; - version = "0.1.0.0"; - sha256 = "b41d3612219cc49b7e61531587ca33e582ec11f76e24254154f44fd515a5cbf7"; - libraryHaskellDepends = [ async base containers random ]; - description = "Thread-safe logging"; + version = "0.2.1.0"; + sha256 = "1b4yzjxxickhv9lc9bg6x6z79q09c4rb1dpvg80iw1xkill5pwgq"; + libraryHaskellDepends = [ + async base bytestring containers random text + ]; + description = "Thread-safe logging, with additional interleaving fuzz-testing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tsne" = callPackage + ({ mkDerivation, base, data-default, deepseq, hspec + , normaldistribution, pipes, time + }: + mkDerivation { + pname = "tsne"; + version = "1.3.0"; + sha256 = "0scqldyczqm2bhc13l41mcsn3hl3j2pb2nl8ay223gz0y3v3ln18"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default deepseq normaldistribution pipes + ]; + executableHaskellDepends = [ base data-default pipes time ]; + testHaskellDepends = [ base data-default hspec ]; + homepage = "https://bitbucket.org/robagar/haskell-tsne"; + description = "t-SNE"; + license = "LGPL"; + }) {}; + "tsp-viz" = callPackage ({ mkDerivation, base, gloss, stm, vector }: mkDerivation { pname = "tsp-viz"; version = "0.1.0.0"; - sha256 = "53aefc7be6a180a062e141e06e3c91db78e7b00d2cc8a20aaa5509dd76bd3673"; + sha256 = "0wrnpmvds2amm85a5j1c1nqffy6vj4y6xq21w5ia1051wrxzrbjk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gloss stm vector ]; @@ -179655,7 +192949,7 @@ self: { mkDerivation { pname = "tsparse"; version = "0.4.0.0"; - sha256 = "511b4bca012747f7fc97a78f620ea3d9dca4e1a6d7a0b2fb17d8f010f7a5bb68"; + sha256 = "0s5vlpvi1w6q2zxv586plvhs9p6rlc7653x7jzygfir70754n6si"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179672,7 +192966,7 @@ self: { mkDerivation { pname = "tst"; version = "0.1.1"; - sha256 = "1d6e11d80383d2bf28c01ea75391b68dc6991b90a9613404cafc0a502fa121ef"; + sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/bitonic/language-spelling"; description = "BK-tree implementation"; @@ -179683,15 +192977,12 @@ self: { ({ mkDerivation, base, HUnit, split }: mkDerivation { pname = "tsv2csv"; - version = "0.1.0.1"; - sha256 = "c0c505350d73c53068f5c186d58de7bcabea839ce3b3d84c2c604a633f4c77fc"; - revision = "2"; - editedCabalFile = "f93f38f878487b20ee86e91a3923f285acd63a2a360fab8097224ec7e8da37b0"; + version = "0.1.0.2"; + sha256 = "15rkvmisnk521ym9r48f1lp8w1wg1cyljj1165zd99ckmj5jy21c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base HUnit split ]; executableHaskellDepends = [ base ]; - homepage = "https://github.com/MackeyRMS/tsv2csv"; description = "Convert tsv to csv"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -179703,7 +192994,7 @@ self: { mkDerivation { pname = "tsvsql"; version = "0.2.1.0"; - sha256 = "5c8a29e01fcf8e3d2cc0a9cb4e2e0635791d2f2aa8c248f7eadc5c093ebfd8e3"; + sha256 = "1qyqpwz0jp6wxbvlihm858pisy9m0qp4xjx9q0n3v3ng3zh2k2jw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -179723,7 +193014,7 @@ self: { mkDerivation { pname = "ttask"; version = "0.0.1.0"; - sha256 = "ff154926e93531ee69d23d9f611cad82be1fe02bc52e64c057d92a363e16707c"; + sha256 = "0z3h2qz3canraz068bn55gh1zgl2mlf637rxs9lywc9mx4k4j5gz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179749,7 +193040,7 @@ self: { mkDerivation { pname = "ttrie"; version = "0.1.2.1"; - sha256 = "50444fe989559a0b16120df72765321ffd9de2fd97c943104513d894f21f4a68"; + sha256 = "0s2a3zr99n0k8l847jcpzpi9vz8z69jjgxqd28b0p6jmi7llyi2h"; libraryHaskellDepends = [ atomic-primops base hashable primitive stm ]; @@ -179776,8 +193067,8 @@ self: { }: mkDerivation { pname = "tttool"; - version = "1.7.0.1"; - sha256 = "b41fc9b2899a625a0a364dd8fc4ef8f7c070ec7cbcbf5ef2acfc256cfb434fe6"; + version = "1.7.0.3"; + sha256 = "0r8ha8wgzlf2ymyxylj16hfshf8w5dl13cwmdkl6ih2niwkzk9ch"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -179798,7 +193089,7 @@ self: { mkDerivation { pname = "tubes"; version = "2.1.1.0"; - sha256 = "967f728c0cd2b01c9544b7e523d727dbc2e12ba1b11eeffe2afc22e8f5913ba8"; + sha256 = "1a1vj7syh8pw5bzfy7mil4my3hnv4zbj7rdp8jairc6j1j674zwn"; libraryHaskellDepends = [ base comonad contravariant free mtl profunctors semigroups transformers @@ -179813,7 +193104,7 @@ self: { mkDerivation { pname = "tuntap"; version = "0.0.2"; - sha256 = "8154773e5f58768307cb2554a5b9f3af70ad1916f6769768c869b5261917cf60"; + sha256 = "0q6g2wcjddb9r1l9fxpn2qcssw5gyfwsam15rc3q6xjqbwz7fm41"; libraryHaskellDepends = [ base bytestring unix ]; description = "Interface to TUN/TAP drivers"; license = stdenv.lib.licenses.bsd3; @@ -179825,9 +193116,9 @@ self: { mkDerivation { pname = "tuntap-simple"; version = "0.1.0.0"; - sha256 = "cecb67220c3818d989c8939df10f89e9cf4987e4a7e67b7b6202ccf997c3af8c"; + sha256 = "135gqfbzkk02c9xpprm7wj3lkkz9i47z37ckr24xj61q1hi6gjyf"; revision = "2"; - editedCabalFile = "28866402f6b3961fe4808afe7d02e3cd3b5d73d99ec02aec67f2bd205dd94a96"; + editedCabalFile = "15jav5fj1ggjczn2mh4yv5rmsfydwc17vzlah3j1z5mkyq1691i8"; libraryHaskellDepends = [ base ioctl ]; homepage = "https://github.com/riaqn/tuntap-simple#readme"; description = "A simple tun/tap library"; @@ -179839,7 +193130,7 @@ self: { mkDerivation { pname = "tup-functor"; version = "0.3.0.0"; - sha256 = "3d26284d1f13df507d02d9c73198fa1741f552a03ae6c5ec6d86d4f4ca4346ce"; + sha256 = "1kj68g5g9m46dpncbrisl19gah8pzac33iyr09ym1pqk3x6jh9ix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cpphs ]; @@ -179855,7 +193146,7 @@ self: { mkDerivation { pname = "tuple"; version = "0.3.0.2"; - sha256 = "2fcb068ffafbe64170e02094a363f83d1725f44f8af963d9dad943a592e89624"; + sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg"; libraryHaskellDepends = [ base OneTuple ]; description = "Various functions on tuples"; license = stdenv.lib.licenses.bsd3; @@ -179866,7 +193157,7 @@ self: { mkDerivation { pname = "tuple-gen"; version = "2.0"; - sha256 = "a76d663380cc6b4b9d12307f42cce8ed30f25406bb29be203407668e70d7fc2d"; + sha256 = "0bgwsxq8wrh76hhbwadv0rag4c7dx3644zrh2aflnsych0rncvd7"; libraryHaskellDepends = [ base combinat ]; description = "Enum instances for tuples where the digits increase with the same speed"; license = stdenv.lib.licenses.bsd3; @@ -179878,7 +193169,7 @@ self: { mkDerivation { pname = "tuple-generic"; version = "0.6.0.0"; - sha256 = "b5bda11535fb03d224f79a7d6b8372ca356e3f35e8ec7c7b4bb4793d79fb9e0c"; + sha256 = "034yzdwksydl9dxprv786lznwdfafa1nnzcsywjd40zv6las3gdm"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/tuple-generic"; description = "Generic operations on tuples"; @@ -179890,7 +193181,7 @@ self: { mkDerivation { pname = "tuple-hlist"; version = "0.2.0.1"; - sha256 = "886472d2043cc29e7eba49277ccabc731e7f46763f3ec77a77a4f9208a15729b"; + sha256 = "16vj2n521yd4fxxcfgizfr37y7kkpk57q9s9p9z9xhiw0k974r48"; libraryHaskellDepends = [ base HList OneTuple ]; homepage = "http://github.com/dudebout/tuple-hlist"; description = "Functions to convert between tuples and HLists"; @@ -179903,7 +193194,7 @@ self: { mkDerivation { pname = "tuple-lenses"; version = "0.1.0.2"; - sha256 = "fc3002223e70b7714b40c384fc42532acf1f0108b24e7b53e620908414d501e3"; + sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w"; libraryHaskellDepends = [ base lens template-haskell ]; homepage = "http://github.com/jfischoff/tuple-lenses"; description = "Stock FieldN combos and generators"; @@ -179916,9 +193207,9 @@ self: { mkDerivation { pname = "tuple-morph"; version = "0.1.0.0"; - sha256 = "244de7dfb5296875d954e96e6b7b3c3d07ef3e13b5ed0b60f952fcf303b426fe"; + sha256 = "1zi6nh1z7z2jz5h0pvdm2czfy1rx7ixnnvp9akcpas19npgyfk94"; revision = "4"; - editedCabalFile = "835c4661ff3b962ec5fa6f1899c6cb0d241362f06636478935fd5475c684eada"; + editedCabalFile = "1npahk37am7x6n4lfdk6y1i1690drg39j63gzb2jx5ivzxhlcp43"; libraryHaskellDepends = [ base HList template-haskell ]; description = "Morph between tuples, or convert them from and to HLists"; license = stdenv.lib.licenses.mit; @@ -179930,7 +193221,7 @@ self: { mkDerivation { pname = "tuple-th"; version = "0.2.5"; - sha256 = "56ea37dcede07b5cf5385108540ae626db163f9df0387583d3c7afdaf72634d7"; + sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Generate (non-recursive) utility functions for tuples of statically known size"; license = stdenv.lib.licenses.bsd3; @@ -179941,7 +193232,7 @@ self: { mkDerivation { pname = "tupleinstances"; version = "0.0.1"; - sha256 = "237a1c4efce728055817cf2aef8a064f7b85324cd998f3eebf54ebeec263954d"; + sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/diegoeche/tupleinstances"; description = "Functor, Applicative and Monad for n-ary tuples"; @@ -179954,7 +193245,7 @@ self: { mkDerivation { pname = "tuples-homogenous-h98"; version = "0.1.1.0"; - sha256 = "025afc8f0fe9c92fb43cebedfa6a764f744d3dc3a3d52935d0a01bc80d111f3a"; + sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/ppetr/tuples-homogenous-h98"; description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances"; @@ -179966,7 +193257,7 @@ self: { mkDerivation { pname = "turing"; version = "0.1.1"; - sha256 = "f3c60dd8bfead96b5e0836116d25fa14869ef62eb8feecc0b53c9c5f02cb60ae"; + sha256 = "1bk0rc15z71wnp0frzmq5vv9x1hlz8jns49n11g6pngapzc0vipk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hspec QuickCheck ]; homepage = "http://github.com/sebastianpoeplau/turing#readme"; @@ -179979,7 +193270,7 @@ self: { mkDerivation { pname = "turing-machines"; version = "0.1.0.1"; - sha256 = "65c4a837e590e86350e0aa3c7c8cd9c85037a07e28449bd02adacfb64937d0aa"; + sha256 = "1anh6x4vdkys5b89ni18gsh3fl68v667qg5aw1867s4hwlvsii35"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jariazavalverde/hackage-turing-machines"; description = "A simple simulator for Turing machines"; @@ -179992,7 +193283,7 @@ self: { mkDerivation { pname = "turing-music"; version = "0.1.1"; - sha256 = "c3cfcf66e1fbf3a75488d1ce35bead220f70921eed0dc6b3a846f728f77b6e98"; + sha256 = "163fggvjixs6m2rwc3gd3s9703r2mnz3bknii1aagwzvw5kczky3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ALUT base ]; @@ -180005,7 +193296,7 @@ self: { mkDerivation { pname = "turingMachine"; version = "0.1.3.0"; - sha256 = "26b255719f25bdf73a0ce45e043b68bd57a4ebd8f582311aa6e0c8e6ec7efafc"; + sha256 = "1z7sgvnfdj70lqd330pmv3ms8mxxd0xh8pp41hxggg95kxqmbci6"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/sanjorgek/turingMachine"; description = "An implementation of Turing Machine and Automaton"; @@ -180018,7 +193309,7 @@ self: { mkDerivation { pname = "turkish-deasciifier"; version = "0.1.0.0"; - sha256 = "23418d85dadd046b7dc04999b38853e2473feb2167252b8fd927766e671b6636"; + sha256 = "0dk63dknwxi7v67jn9b747mkyiz2af4b76a9q1ynn16xva2qsh93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers vector ]; @@ -180034,7 +193325,7 @@ self: { mkDerivation { pname = "turni"; version = "2011.1.15"; - sha256 = "d4f2d684299f116425d0f005898323f5dfc73d9c6c81159b6436745037eca204"; + sha256 = "0152xhvm0x1ncjdib0bckhywgpzm4f1qj1ghs0jn84cz562ddwnl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers MonadRandom random ]; @@ -180046,21 +193337,21 @@ self: { "turtle" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , criterion, directory, doctest, foldl, hostname, managed - , optional-args, optparse-applicative, process, stm, system-fileio - , system-filepath, temporary, text, time, transformers, unix - , unix-compat + , optional-args, optparse-applicative, process, semigroups, stm + , system-fileio, system-filepath, temporary, text, time + , transformers, unix, unix-compat }: mkDerivation { pname = "turtle"; - version = "1.3.1"; - sha256 = "233d05f8d73d171278be765872d623e56f1d795234a94d33a57f1bcca98edd5e"; + version = "1.3.6"; + sha256 = "0fr8p6rnk2lrsgbfh60jlqcjr0nxrh3ywxsj5d4psck0kgyhvg1m"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock directory foldl hostname - managed optional-args optparse-applicative process stm + managed optional-args optparse-applicative process semigroups stm system-fileio system-filepath temporary text time transformers unix unix-compat ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; @@ -180072,7 +193363,7 @@ self: { mkDerivation { pname = "turtle-options"; version = "0.1.0.4"; - sha256 = "c2c76b0bc0bc93397827c12b6f049e682afe702f9f662a1b0818e8e221d51ace"; + sha256 = "1khsslhy5s0q10djlrlz5xqgwak8kq26yay14xw3k4xwq05npiy2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base optional-args parsec text turtle ]; @@ -180088,7 +193379,7 @@ self: { mkDerivation { pname = "tw"; version = "0.1.0.0"; - sha256 = "032194b50fe6b6e53c591df2e58c416244f21a59e5d699724e7ec9f4ce2a2511"; + sha256 = "04955b7g9jby9rr9kmp5b4dg4i32866fbwhxb4yfbdp61ysr8883"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring ]; @@ -180102,7 +193393,7 @@ self: { mkDerivation { pname = "tweak"; version = "0.1.0.1"; - sha256 = "3cbe6fd74e2ef0bf5eb5fad2ba81a0880db3f005c170631f2f4527a61e49bed0"; + sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw"; libraryHaskellDepends = [ base containers lens stm transformers ]; homepage = "http://github.com/jfischoff/tweak"; description = "A library for incremental computing"; @@ -180117,7 +193408,7 @@ self: { mkDerivation { pname = "twee"; version = "0.1"; - sha256 = "e80cd75b0fb2972e114bfb1a03e13970122647f6f1a7cb8314d6e27d2dd77e2d"; + sha256 = "0bbyswnpvqnn2j1wp9ziyr3jc4kh77hh66pv9c8jx5xj1xdxf378"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180133,12 +193424,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tweet-hs" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base + , bytestring, composition, containers, criterion, data-default + , 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 = "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 htoml http-client + http-client-tls http-types lens megaparsec optparse-applicative + split text unordered-containers + ]; + executableHaskellDepends = [ base ]; + 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; + }) {}; + "twentefp" = callPackage ({ mkDerivation, base, gloss, parsec, time }: mkDerivation { pname = "twentefp"; version = "0.4.2"; - sha256 = "b447850b13c77fcc761b25138b926839eb008e590390873874d43c130f48aece"; + sha256 = "1kmf907i6g6lfhw8g403b6701srrd298n4r53dvcqzy72c5qaixl"; libraryHaskellDepends = [ base gloss parsec time ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; @@ -180151,9 +193472,9 @@ self: { mkDerivation { pname = "twentefp-eventloop-graphics"; version = "0.1.0.4"; - sha256 = "9592b9a1101d6779723b032f8108718a3322eee792a85bbeaef3b04410e8db20"; + sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm"; revision = "1"; - editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817"; + editedCabalFile = "05zq3iv3307mhjwfdxjjnhq2kljbrzacwnga8icizl9qx7spx21a"; libraryHaskellDepends = [ base network text twentefp-number twentefp-websockets ]; @@ -180167,7 +193488,7 @@ self: { mkDerivation { pname = "twentefp-eventloop-trees"; version = "0.1.2.4"; - sha256 = "a4806fa7f4fd3639d527b92ab6b2cb436f60778b888053d1b63fdfe3b912520d"; + sha256 = "03aj2awy7prznv8m7048idvn0vs3rfrbcamr4zakjdpxyjknz054"; libraryHaskellDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; @@ -180179,7 +193500,7 @@ self: { mkDerivation { pname = "twentefp-graphs"; version = "0.1.0.4"; - sha256 = "396e7c12d4f194f00c58b46e30474f51b98daaf457a809e54d317db218f2173c"; + sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir"; libraryHaskellDepends = [ base twentefp-eventloop-graphics ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; @@ -180191,7 +193512,7 @@ self: { mkDerivation { pname = "twentefp-number"; version = "0.1.0.2"; - sha256 = "ae1b183a28e89bd43f63ee424d57d8214546046386b7c89f47a97b4da05100ce"; + sha256 = "1kh0a6h4syx98ygwidw6cc24ci91v1blshpfcczx96z850x1h6xf"; libraryHaskellDepends = [ base parsec ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; @@ -180203,7 +193524,7 @@ self: { mkDerivation { pname = "twentefp-rosetree"; version = "0.1.0.1"; - sha256 = "a7ad92cb98e41e7d68f24976a2487ef7cc088deb2ecde6a6f8f4a9c87885c4b7"; + sha256 = "1dy4hmwciaglz2kfdk9fxf6hik7pgr4a4xj9y9l7s7p4k35r5bd7"; libraryHaskellDepends = [ base twentefp-eventloop-graphics twentefp-number ]; @@ -180217,7 +193538,7 @@ self: { mkDerivation { pname = "twentefp-trees"; version = "0.1.0.2"; - sha256 = "0facb114d7805e24a3719c050ccaa8067227d38a378d493d23f54bbcba49b256"; + sha256 = "0mmj96xbqjzm4cylk39pib9jfwh6m350q1cwf6ij8pl0swab3b0g"; libraryHaskellDepends = [ base twentefp-eventloop-graphics ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; license = stdenv.lib.licenses.bsd3; @@ -180232,7 +193553,7 @@ self: { mkDerivation { pname = "twentefp-websockets"; version = "0.1.0.1"; - sha256 = "0422dfeb9df01fc01cf9582ad56f5ceeb6e144dfd1e37f6c006f6f4fe13d4220"; + sha256 = "08227phlyvvg01n7zqyivx2f3dpfbipxaajqz4fc07zhkpmxy8h4"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive concurrent-extra containers entropy io-streams mtl @@ -180253,9 +193574,9 @@ self: { mkDerivation { pname = "twentyseven"; version = "0.0.0"; - sha256 = "471690467742286cc9e4eb744b06d2a298a9c770fdb8ac0c816774d4c0b70133"; + sha256 = "0cq1nz0d8x37h46arf7xf33sk652s834nx7bwk4nqa22fx3905j7"; revision = "1"; - editedCabalFile = "32b1d53bc3a5a56998f35452cbcdc9d00db7e4848e50ebd8fec2607d2243f147"; + editedCabalFile = "0izi8ci7sq62zvcfnl4fhkjbf3fhr76wnljlyfc6k9d5qcxxbc9j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180282,7 +193603,7 @@ self: { mkDerivation { pname = "twfy-api-client"; version = "0.1.0.0"; - sha256 = "c11fa34e03dbfba6fc208c6816c8f461daf78eeb835e67cd8a91a327d426e265"; + sha256 = "0rg24va2g8wiib6nfpl3xf7ggnk1yk41cs4c43yadyyv0d7a67y1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180311,7 +193632,7 @@ self: { mkDerivation { pname = "twhs"; version = "0.1.0.3"; - sha256 = "810a07dfc3dd28428f33e37290ddee0c2f84b62141c03088da246f6ac45e0634"; + sha256 = "0d06bv26lvr4va431h2146v88bqcxvfr0wp36f7l4a6xqgghf2l1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180341,7 +193662,7 @@ self: { mkDerivation { pname = "twidge"; version = "1.1.2"; - sha256 = "612117e78856c32e9db419fa2f6d185b1cf4433907a7d1b4f238a8f1092f5698"; + sha256 = "162n5w4z3a1qyasd39q7751z872v31njzyhrnjfjxhsni3kif8b1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180360,7 +193681,7 @@ self: { mkDerivation { pname = "twilight-stm"; version = "1.2"; - sha256 = "b9b16274960b8c78d4b687f8f194102f553b7abdadba67a20cd04baddcace9c2"; + sha256 = "1hp9mkfasjyh1ji6gfmdpmx3nm9g22ag3y47nva7i30bjrs65cdr"; libraryHaskellDepends = [ base containers haskell98 mtl ]; homepage = "http://proglang.informatik.uni-freiburg.de/projects/twilight/"; description = "STM library with safe irrevocable I/O and inconsistency repair"; @@ -180376,10 +193697,8 @@ self: { }: mkDerivation { pname = "twilio"; - version = "0.1.3.1"; - sha256 = "93bba9aa0d6073ec217c55e7331ff8dd8243b508b56ebc170ede0510a9034b6f"; - revision = "1"; - editedCabalFile = "6c4074be99bc331901bef13287b4db00cbeb7cb448e8c75cb1eefc0a6567af81"; + 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 @@ -180404,7 +193723,7 @@ self: { mkDerivation { pname = "twill"; version = "0.1.0.3"; - sha256 = "a6f3a59ffa6db8840168f4de1f4aedca2c34b1ec57a3c7a138df95769dec6c72"; + sha256 = "0wkcxjfpd5fz72hwg8spxjqk8b6axm51zppld00q9f3dzagsbwx6"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cryptohash data-default datetime errors old-locale @@ -180423,7 +193742,7 @@ self: { mkDerivation { pname = "twiml"; version = "0.2.0.0"; - sha256 = "25e2f9f25cc8b228b2bcb97d069f23fd534a93fd32b465597bb9dd2c00db6a8b"; + sha256 = "12vavc02rpdrgdcnbd1jzn9lllzx4fghczdrpjr2icn8bkrgkqi5"; libraryHaskellDepends = [ base data-default deepseq lens network-uri parsec template-haskell text void xml @@ -180445,7 +193764,7 @@ self: { mkDerivation { pname = "twine"; version = "0.1.2"; - sha256 = "6171fe5eb172b8d2ba64006efbad98ed53b9bdc2191cd075b331f0d00dd48d60"; + sha256 = "0q4dsh6x1w1indsx070rqayvjlzdk2nznvh0cjxd5f3jn5ggwwb1"; libraryHaskellDepends = [ base bytestring containers convertible filepath mtl parsec ]; @@ -180462,7 +193781,7 @@ self: { mkDerivation { pname = "twisty"; version = "0.1.0"; - sha256 = "d24b2d9b707b20d1647802cbc584e267c7615ef3c2e83280e4a93e538739880b"; + sha256 = "02w8763m6gm9wj035s62ydg63iv7wa2cbjq2g1jd283vf2djsjyj"; libraryHaskellDepends = [ array base containers data-memocombinators MonadRandom parallel ]; @@ -180478,7 +193797,7 @@ self: { mkDerivation { pname = "twitch"; version = "0.1.7.1"; - sha256 = "8158d76bcd1226fbda9a7ebaf95d01b74f542499c8dd0673c8d081ae00370cda"; + sha256 = "1nhc6w0ax0fhr1rhdpf8k4j58kxp05fzkfkykbdgn9hjrmmxfn41"; libraryHaskellDepends = [ base data-default directory filepath fsnotify Glob optparse-applicative time transformers @@ -180499,7 +193818,7 @@ self: { mkDerivation { pname = "twitter"; version = "0.1.1"; - sha256 = "fda52d989532777817134f168096eb919b683c87d8185ce513f067eb78e2058b"; + sha256 = "12q5w9wfnrzh2gjmq66qhwy6i6wixfb805jg2cbphxrjjnc2v9gx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180520,8 +193839,8 @@ self: { }: mkDerivation { pname = "twitter-conduit"; - version = "0.2.1"; - sha256 = "56271d64566f5c43f7557e384e2e8e655f19f782078c28e99919efc32cfff3ff"; + version = "0.2.2.1"; + sha256 = "06nbbh9lx816klc1hcd7rvqaxhshscc4bbq10mnhqrfzq69al695"; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit conduit-extra containers data-default exceptions http-client @@ -180550,7 +193869,7 @@ self: { mkDerivation { pname = "twitter-enumerator"; version = "0.0.3"; - sha256 = "041b5533caf549013f9d0379f3ed30497866303a0c4175fac1969e0ef03c1eb1"; + sha256 = "1c8y7kq0x7lnq7x7ah8c78q6cy2963nz6y83klzh2jgmr8rma6q4"; libraryHaskellDepends = [ aeson attoparsec attoparsec-enumerator authenticate base bytestring containers enumerator http-enumerator http-types text tls-extra @@ -180570,9 +193889,9 @@ self: { mkDerivation { pname = "twitter-feed"; version = "0.2.0.11"; - sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889"; - revision = "1"; - editedCabalFile = "3d0a5d8976c482b401003571812052a97cd0d77fb3d6f0619615c30c93a0b79e"; + sha256 = "12f8ak2f9nxqx4bhgfa45nll2yaf9i5dffxlir7w3x48zgfv964b"; + revision = "3"; + editedCabalFile = "0hzrh34ar9a5sfxq7zbh0hr38ndvd3x5pjp59j7b6vdalpk3r1af"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring http-conduit ]; @@ -180593,7 +193912,7 @@ self: { mkDerivation { pname = "twitter-types"; version = "0.7.2.2"; - sha256 = "768ee869fc5dc95cf4073ec27862060e6dc6ad7234511d0c6b59cc49841c6d58"; + sha256 = "0n3d3j24kk2rdc61sl9lfanwcv8f0ri7ihiy0zs5rjaxzilyi3kn"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; @@ -180616,7 +193935,7 @@ self: { mkDerivation { pname = "twitter-types-lens"; version = "0.7.2"; - sha256 = "4ffeabee70234e0969a0581489473380ebf93de504f7b24f9bc024571acfb212"; + sha256 = "04mjrwd5f960kd7v5xq4wlyzksw06d3qj52ql1lhjki3f3papzjg"; libraryHaskellDepends = [ base lens template-haskell text time twitter-types ]; @@ -180633,7 +193952,7 @@ self: { mkDerivation { pname = "tx"; version = "0.1.0.0"; - sha256 = "5e5395c664b32989f9fcb5ede51e9e05d24f982569363c78df233d11f39dd7a1"; + sha256 = "18fpkpri2g93vxw3qdk94nc4zlh5kqgfbvdmzkwqjadkck39alsy"; libraryHaskellDepends = [ base bytestring cereal safecopy stm transformers ]; @@ -180650,7 +193969,7 @@ self: { mkDerivation { pname = "txt-sushi"; version = "0.6.0"; - sha256 = "46074c0cb01bcbbd9b13164128f72b1fc9d027f5332362cda76ae6c830c2e50c"; + sha256 = "0375q8qcirkalz6n48rkylkx1j8z5gvjhh8n2fdvvjqvn064q1s6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180666,7 +193985,7 @@ self: { mkDerivation { pname = "txt2rtf"; version = "1.0.1"; - sha256 = "44a7b049f1f3f3f928986cf7ccae50cd22e012a5c240e4924dd1b5caee0dc06e"; + sha256 = "0vn01ppcmdfi9n9f8h62ll9f08nda2pcrxvck0lgkwzky54v19s4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -180680,7 +193999,7 @@ self: { mkDerivation { pname = "txtblk"; version = "0.2.0.1"; - sha256 = "6b095e72de6a004432a81c85098d82f438edd021e6aacc3f7171ae16966f1723"; + sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb"; libraryHaskellDepends = [ base ]; description = "Deprecated in favor of eros"; license = stdenv.lib.licenses.bsd3; @@ -180692,7 +194011,7 @@ self: { mkDerivation { pname = "ty"; version = "0.1.7"; - sha256 = "b546372bccf07824e58d71cf0cb3aeae62a1e588ce1f59049fb36e8053a6c95a"; + sha256 = "0nn9lr9q0vmkkw25j7yfi3js2qmfmsrhrkviipjj8y7hrhmkfimm"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/conal/ty"; description = "Typed type representations and equality proofs"; @@ -180706,7 +194025,7 @@ self: { mkDerivation { pname = "typalyze"; version = "0.1.1"; - sha256 = "b52020ca6f8029e5d6e691c435475ca3c9d63a242632ab85e68be5a0eff981f1"; + sha256 = "1wc1z7ps1rcbws2snci64hxddjd3bi3kbi4iwvbfaac0dz52085m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180723,7 +194042,7 @@ self: { mkDerivation { pname = "type-aligned"; version = "0.9.6"; - sha256 = "1b877271cbfc365563f2dc779dc2ee4820be144e1708318882a3cd11786ade55"; + sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/atzeus/type-aligned"; description = "Various type-aligned sequence data structures"; @@ -180735,7 +194054,7 @@ self: { mkDerivation { pname = "type-assertions"; version = "0.1.0.0"; - sha256 = "aac74571c99fa0170970716385570cf0e0bbb18fc93f1d7ad372824fe7a679bb"; + sha256 = "1fvrlvklz0kjsdx1sgy9iyqvpq7h1ibqaqvif04ig84zr5qlbixa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec test-fixture ]; homepage = "https://github.com/lexi-lambda/type-assertions#readme"; @@ -180749,7 +194068,7 @@ self: { mkDerivation { pname = "type-booleans"; version = "0.1"; - sha256 = "d0f9133f1883f6aea6dd561d4249566dc50b8423b15d6b73e46d52b697b36b86"; + sha256 = "11kbnfbvclkdwirnnpdi4f20pibdar4l47anvnkaxxl330zi7yfh"; libraryHaskellDepends = [ base ]; description = "Type-level booleans via type-families"; license = stdenv.lib.licenses.bsd3; @@ -180762,7 +194081,7 @@ self: { mkDerivation { pname = "type-cache"; version = "1.0"; - sha256 = "ce75db1e0a87af31a6e2589ca74d7c5987c1541c70579e186c377045e6e070df"; + sha256 = "1pvhw3k4aw1pdhc9wmvh3iac31srgi6sg72qwak33bw718gdnxff"; libraryHaskellDepends = [ base containers lens lens-utils template-haskell ]; @@ -180779,7 +194098,7 @@ self: { mkDerivation { pname = "type-cereal"; version = "0.3"; - sha256 = "9b6d3d445108797d726f15c066ffaf006e056d686bc1e712e3bf60e10e0b3af0"; + sha256 = "1w1s1c7f2q5zwc9fghbbd1nhavh0mzzndh0mdxr7sy88a523svcv"; libraryHaskellDepends = [ base bytestring cereal data-hash template-haskell type-digits type-spine @@ -180794,7 +194113,7 @@ self: { mkDerivation { pname = "type-combinators"; version = "0.2.4.3"; - sha256 = "1f0ccb6929f53b676e6582141c9423458468eec98be62acc8dc3bab0d52337f6"; + sha256 = "1xip4gav1fn3ip62mrlbr7p6i1254fa1q542cmp6ffzm55lwn30z"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/kylcarte/type-combinators"; description = "A collection of data types for type-level programming"; @@ -180808,7 +194127,7 @@ self: { mkDerivation { pname = "type-combinators-quote"; version = "0.1.0.1"; - sha256 = "808b305a08443e27e46bbf2c7604eb312d1a44df6bd140f917b485e6eb35f6a7"; + sha256 = "19zn6pmyd1dl2zwl1lbbvx21lb9ixc27cb5zdgj2fgj411d312w0"; libraryHaskellDepends = [ base haskell-src-meta template-haskell type-combinators ]; @@ -180823,7 +194142,7 @@ self: { mkDerivation { pname = "type-digits"; version = "0.3"; - sha256 = "a844a8c5d4dd491550b282462bf5b52f792af2dc1d7c675f02d85fcff8f0b866"; + sha256 = "0rmqy3wcypyq09gnfz0xvkr2ly9gnpsjnil2n981ajfxsk2shi58"; libraryHaskellDepends = [ base template-haskell type-spine ]; description = "Arbitrary-base type-level digits"; license = stdenv.lib.licenses.bsd3; @@ -180835,9 +194154,9 @@ self: { mkDerivation { pname = "type-eq"; version = "0.5"; - sha256 = "9fcf4c4f1734b113625f0fd38a239a9637366e176736a4183f22f60e2ccdfa00"; + sha256 = "007srln0xxi27wca8dk72xp3cdwnk8iqmlqgbxi17c9l2x7lrkwz"; revision = "1"; - editedCabalFile = "dc67cb2ef9a634c85eb00d3f498471f4483ac5857de78537aee8af3b8e3315bd"; + editedCabalFile = "1g8m6f73pbz8mqvqbrvxhp2klj7lf624jgqdn1gchd56z4pcnryw"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; homepage = "http://github.com/glaebhoerl/type-eq"; @@ -180850,7 +194169,7 @@ self: { mkDerivation { pname = "type-equality"; version = "0.1.2"; - sha256 = "9977801ac1b082b57497fb7aed1a335a7d08487deb7f6967d9546dbfe7c54c19"; + sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/hesselink/type-equality/"; description = "Type equality, coercion/cast and other operations"; @@ -180862,7 +194181,7 @@ self: { mkDerivation { pname = "type-equality-check"; version = "0.0.0.4"; - sha256 = "91a1e5e0e34737c956ee7a84492dbf91f49d7c4fa5e8037e3167483f6f170fe4"; + sha256 = "1r0g2xpkyj3765z07s559xy9vx4ipwnlk13sxrbcjds7wghfb8ci"; libraryHaskellDepends = [ base type-level ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check"; description = "Type equality check"; @@ -180874,7 +194193,7 @@ self: { mkDerivation { pname = "type-fun"; version = "0.1.1"; - sha256 = "df5ec7428a101235df46c0b819a9ab3562d1d27991cc3b04303643952c555da1"; + sha256 = "18axaln9ahrn6023pk4ig79d2qimmflikf608vgka4hhi91cfpnz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/s9gf4ult/type-fun"; @@ -180887,7 +194206,7 @@ self: { mkDerivation { pname = "type-functions"; version = "0.2.0.4"; - sha256 = "c8534aa61f06628d572a39fce794cb6526a2ffa5b7fb27301c86759e7e6961c5"; + sha256 = "1ib1d5z9wxc63hq2gyxplpzs49k5rfafgz1r59bqsqh63yk4lly8"; libraryHaskellDepends = [ base kinds ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-functions"; description = "Emulation of type-level functions"; @@ -180899,19 +194218,42 @@ self: { mkDerivation { pname = "type-hint"; version = "0.1"; - sha256 = "1161cdbf4b4b43c2953ee60438e948737604193e1bfe2c880ff178538faa99b9"; + sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mvv/type-hint"; description = "Guide type inference with proxy values"; license = stdenv.lib.licenses.bsd3; }) {}; + "type-indexed-queues" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, doctest + , ghc-typelits-natnormalise, pqueue, QuickCheck, random, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "type-indexed-queues"; + version = "0.2.0.0"; + sha256 = "1mb5xh7nin8qw3di8bvyf06542l5xxx9gg8h1jhip1glacs2rhg0"; + libraryHaskellDepends = [ + base containers deepseq ghc-typelits-natnormalise + ]; + testHaskellDepends = [ + base containers doctest QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base containers criterion pqueue random + ]; + homepage = "https://github.com/oisdk/type-indexed-queues"; + description = "Queues with verified and unverified versions"; + license = stdenv.lib.licenses.mit; + }) {}; + "type-int" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "type-int"; version = "0.5.0.2"; - sha256 = "5c18c3ee2232d07873917864a1a658a7270b42b1517d708a1223c6b92be153d1"; + sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/type-int"; description = "Type Level 2s- and 16s- Complement Integers"; @@ -180924,7 +194266,7 @@ self: { mkDerivation { pname = "type-iso"; version = "0.1.0.0"; - sha256 = "5d4eed78d7f91358101e9a58091b7a1019b7a38235e7306f974201a9b3431a0f"; + sha256 = "03qs8frsj0a2jxpk1rrmhaivf68hg8dhjn4s3q85h4zrsxwfskjx"; libraryHaskellDepends = [ base data-default nats numericpeano text ]; @@ -180938,7 +194280,7 @@ self: { mkDerivation { pname = "type-level"; version = "0.3.0"; - sha256 = "9976bcbbca38b208a6aa45e1046f82dc369175809d0b16850f65a026d66c890f"; + sha256 = "03w9dkb2d8351y2ic2wxh1sr2dnwh9ph9qa5mak0iciqraxvqxlr"; libraryHaskellDepends = [ base syb template-haskell ]; homepage = "http://code.haskell.org/type-level"; description = "Type-level programming library"; @@ -180950,7 +194292,7 @@ self: { mkDerivation { pname = "type-level-bst"; version = "0.1"; - sha256 = "13164f8ec945b7c1166463aac5d1c067c4602585053269e48cad11e49bb9a130"; + sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/Kinokkory/type-level-bst"; description = "type-level binary search trees in haskell"; @@ -180958,12 +194300,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "type-level-integers" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "type-level-integers"; + version = "0.0.1"; + sha256 = "1fn7zhpmixbp2nd4lryvfzy19g8kj03kh1r264fvnrdbnfjf72qi"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/mtesseract/type-level-integers"; + description = "Provides integers lifted to the type level"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-level-kv-list" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "type-level-kv-list"; version = "1.1.0"; - sha256 = "4ff032e59108edc7dd27309ac0ee8987cc41ffba695d9699700bd37c6e7f7d73"; + sha256 = "0wvxgxp7rlqbf2crcpb9pbzl3k47i7pc16ih4zfwgv88j7jk5w2g"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/type-level-kv-list#readme"; @@ -180976,7 +194331,7 @@ self: { mkDerivation { pname = "type-level-natural-number"; version = "2.0"; - sha256 = "d36754ece101d23e2666a3fb7d8dbf88b05153fc6bfccf7a9fc1fca07da9ef9f"; + sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk"; libraryHaskellDepends = [ base ]; description = "Simple type level natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -180987,7 +194342,7 @@ self: { mkDerivation { pname = "type-level-natural-number-induction"; version = "1.0.0.1"; - sha256 = "596c2589e33bffb8f9bd652103b1530629d87f01db33e2fed4dce295cbd796d7"; + sha256 = "1mwnsz5rbqnwskzf4cyv05zxha86afqh68b5ppwvizrvwf4jav2r"; libraryHaskellDepends = [ base transformers type-level-natural-number ]; @@ -181001,7 +194356,7 @@ self: { mkDerivation { pname = "type-level-natural-number-operations"; version = "1.0"; - sha256 = "7ce40401be031506c6d1b0fa9c48f8ba61af48ec6061ccc1e6152ef80b2e146f"; + sha256 = "0vql5q5zhbhmwv0wqqb0xi4ayqdsz149rymhs730c583pq0h9r3w"; libraryHaskellDepends = [ base type-level-natural-number ]; description = "Basic operations on type-level natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -181013,7 +194368,7 @@ self: { mkDerivation { pname = "type-level-numbers"; version = "0.1.1.1"; - sha256 = "5b56ef5f6e0b6476b9aba46055c3919e67823cbc1b87ed8e6ed70113b1f2318a"; + sha256 = "12iiyaqi60fpds7fv1qvphy84rwyj71maq54mfwpcr0bdrgyymjv"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Type level numbers implemented using type families"; @@ -181025,7 +194380,7 @@ self: { mkDerivation { pname = "type-level-sets"; version = "0.8.0.0"; - sha256 = "223dfa51d3a740c570f54a880793bea30edc332c7c33365782f703bf944bb74f"; + sha256 = "0kxp9faby0zph9bkccvw5hrxq3m3ps9hg22aymqcah57sd8zlg92"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = stdenv.lib.licenses.bsd3; @@ -181036,7 +194391,7 @@ self: { mkDerivation { pname = "type-level-tf"; version = "0.2.1"; - sha256 = "55bc212e4ff404e9d51bf234bae9ecfa3bd13704e7d2c8ddcdc76d9f8248061f"; + sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m"; libraryHaskellDepends = [ base syb template-haskell ]; homepage = "https://github.com/coreyoconnor/type-level-tf"; description = "Type-level programming library (type families)"; @@ -181048,12 +194403,31 @@ self: { mkDerivation { pname = "type-list"; version = "0.5.0.0"; - sha256 = "ffba5f4b467e06e3c8dffc00614d78604e0bdcfe3921fb258cd5a8d6772c690c"; + sha256 = "03395ivxda6mihjzn89rzvf0nkk0g16n207wvz4f61ky8r5mzfpz"; libraryHaskellDepends = [ base singletons ]; description = "Operations on type-level lists and tuples"; license = stdenv.lib.licenses.bsd3; }) {}; + "type-map" = callPackage + ({ mkDerivation, base, containers, ghc-prim, HUnit, test-framework + , test-framework-hunit, vector + }: + mkDerivation { + pname = "type-map"; + version = "0.1.0.0"; + sha256 = "1hssaqpic5l53l9pxvj75j87ywdnx985j6jgrqr8m9vx5hr1xrl4"; + revision = "1"; + editedCabalFile = "0821rnwnk0h9n62pnnfy68iyf1jjnb3dr72gs0667yj09r1x7cw2"; + libraryHaskellDepends = [ base containers ghc-prim vector ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/Lysxia/type-map"; + description = "Type-indexed maps"; + license = stdenv.lib.licenses.mit; + }) {}; + "type-natural" = callPackage ({ mkDerivation, base, constraints, equational-reasoning , ghc-typelits-natnormalise, ghc-typelits-presburger, monomorphic @@ -181062,9 +194436,9 @@ self: { mkDerivation { pname = "type-natural"; version = "0.7.1.3"; - sha256 = "56d3962fb5c7a9e858f75603e1dc8d73c8a8adea65a0097bdf5ef033b0529ee2"; + sha256 = "1qlyaaq37w2yvxxhk835xansij3kipff20snyxcfiaf7nlprdlsn"; revision = "1"; - editedCabalFile = "97d8c20d880fd2296ff023ced046b16a9291fa32922c45532027dda1e228db23"; + editedCabalFile = "08yv53ia3p97419lab4j6bx934kan53d1ki3y1pjklhgi06w5n4p"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger monomorphic singletons template-haskell @@ -181080,7 +194454,7 @@ self: { mkDerivation { pname = "type-operators"; version = "0.1.0.4"; - sha256 = "dbbcedf368c23c46abac04f157cb4f2c812099a4f75d606b24f1ac1116d40b74"; + sha256 = "0x0bshb13b7i4imn0pgpljcj109c9z5mgw84mjmlcg62d3ryvg6v"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/Shou/type-operators#readme"; description = "Various type-level operators"; @@ -181092,7 +194466,7 @@ self: { mkDerivation { pname = "type-ord"; version = "0.3"; - sha256 = "e5d569e1564dcf457a76840e4e8c59a988cae82a0c0659850bbdd30960b7ce9a"; + sha256 = "16nfnxh0klxx1f2mj1hc5blcm259b664w3l4frx4bksdavhnkmg5"; libraryHaskellDepends = [ base template-haskell type-digits type-spine ]; @@ -181108,7 +194482,7 @@ self: { mkDerivation { pname = "type-ord-spine-cereal"; version = "0.2"; - sha256 = "2bef8c500aed7afabcf4de19a4deba45a55d5349bfab1b4295401d4ae2878cbf"; + sha256 = "1gwchzi4l7a0jm11paxz959mv9a5pbga86fyyjyglypd1988rvrb"; libraryHaskellDepends = [ base template-haskell type-cereal type-ord type-spine ]; @@ -181122,7 +194496,7 @@ self: { mkDerivation { pname = "type-prelude"; version = "0.1"; - sha256 = "30d24fa550e380ea4a76367d261362532c0cee703a5356497a612b204328eff9"; + sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://code.atnnn.com/projects/type-prelude"; description = "Partial port of prelude to the type level. Requires GHC 7.6.1."; @@ -181137,7 +194511,7 @@ self: { mkDerivation { pname = "type-settheory"; version = "0.1.3.1"; - sha256 = "51b70030fd760a3cd74067225c460ce394046ac669ac2a2ead02c736804b97ac"; + sha256 = "1b4p9f03diq2mlp2mb39qrm095731i35q8k783bkq2knzlq01dsi"; libraryHaskellDepends = [ base containers syb template-haskell transformers type-equality ]; @@ -181151,7 +194525,7 @@ self: { mkDerivation { pname = "type-spec"; version = "0.3.0.1"; - sha256 = "aecd1a319efc13eb42b73b489cf374f94bf126f19fdc28b2f5cd6f73dda3a241"; + sha256 = "0hd2lgfp6vydynr2ip4zy4kg2jzrfkrrqj1vnx1fn4zwkqqimkdf"; libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base ]; homepage = "https://github.com/sheyll/type-spec#readme"; @@ -181164,7 +194538,7 @@ self: { mkDerivation { pname = "type-spine"; version = "0.2.20120924"; - sha256 = "110e405bec539dc7aec41acfc2b02426e2838d81409b33406ba3f6f06b8fc96f"; + sha256 = "0vy9ixmz1xm3dd0376s0h66q7qi64jqc5kqsqjpcg7akxidl03hi"; libraryHaskellDepends = [ base template-haskell ]; description = "A spine-view on types"; license = stdenv.lib.licenses.bsd3; @@ -181181,7 +194555,7 @@ self: { mkDerivation { pname = "type-structure"; version = "0.1.1"; - sha256 = "dbf1f4cc6dfa0923010f9c778dfdd032a01ca6666d48b9bc3827104629304378"; + sha256 = "0y2360llc41772ybjj3dcsk1r81js3yqsxww1w0j62gsdp6g9wfv"; libraryHaskellDepends = [ array base bytestring containers hashable loch-th mtl placeholders template-haskell text th-instance-reification time transformers @@ -181208,7 +194582,7 @@ self: { mkDerivation { pname = "type-sub-th"; version = "0.1.0.6"; - sha256 = "27915d32cdf552cb540a4b9838ec441fc3775ed5a5a6fa27693a53bc57655e85"; + sha256 = "11aycmbvqlrsd4kzm9m5smg7ghqz8kn3i62b19acnlpmrlr5v497"; libraryHaskellDepends = [ base DebugTraceHelpers HUnit QuickCheck template-haskell test-framework test-framework-hunit test-framework-quickcheck2 @@ -181232,7 +194606,9 @@ self: { mkDerivation { pname = "type-unary"; version = "0.3.0"; - sha256 = "14083b3bdcefd7a25dd459178818602e18a1c3fa22a1017c8f58f7ee0e5f04e9"; + sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l"; + revision = "1"; + editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11"; libraryHaskellDepends = [ applicative-numbers base constraints newtype ty vector-space ]; @@ -181246,7 +194622,7 @@ self: { mkDerivation { pname = "typeable-th"; version = "0.1.5"; - sha256 = "dbcc81c6512ab975703c62d186238c7447299e575085f22766eb9faefdcc49df"; + sha256 = "1ps9rkysx7zbcqkz51ahayg2jivlihiqdlb27iq7bf9aa7383k6v"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base ]; homepage = "http://github.com/bennofs/typeable-th"; @@ -181255,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 @@ -181263,7 +194655,7 @@ self: { mkDerivation { pname = "typed-process"; version = "0.1.0.0"; - sha256 = "de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8"; + sha256 = "1y0h19fh6pf3x8rr2ai59rxpsgwippcas087wb63rbmkrk36p1ny"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra exceptions process stm transformers @@ -181285,7 +194677,7 @@ self: { mkDerivation { pname = "typed-spreadsheet"; version = "1.1.0"; - sha256 = "7838b454cbf87600d0af6c86ad10b164f9313448e11f21b8b8fb85d07f9ec800"; + sha256 = "0068krzx11gvp2w227z190s33yb4n48av1kcmz800xpqrdab8f3q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181300,6 +194692,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-streams" = callPackage + ({ mkDerivation, array, base, bytestring, criterion, generic-enum + , ghc-typelits-knownnat, make-monofoldable-foldable + , mono-traversable, vector + }: + mkDerivation { + pname = "typed-streams"; + version = "0.1.0.1"; + sha256 = "0k833ash161g6bf0bqxlhwyp7aw3s99fds7fp95y6w6y31p24vh4"; + libraryHaskellDepends = [ + array base bytestring generic-enum ghc-typelits-knownnat + make-monofoldable-foldable mono-traversable vector + ]; + testHaskellDepends = [ + array base bytestring criterion generic-enum ghc-typelits-knownnat + make-monofoldable-foldable mono-traversable vector + ]; + description = "A stream based replacement for lists"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-wire" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, HTF, http-types, mtl, optparse-applicative @@ -181308,7 +194722,7 @@ self: { mkDerivation { pname = "typed-wire"; version = "0.3.1.1"; - sha256 = "c69f28ac21b363aac2e58df3b619c3a96d0816eacb446bfcdf217ffae186b971"; + sha256 = "0wdrhvhzlzr1vzy6ni6bx8b0hvd9qccvdwwdwp1alqxk46n2i7y6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181333,7 +194747,7 @@ self: { mkDerivation { pname = "typed-wire-utils"; version = "0.1.0.0"; - sha256 = "26edf29617e27d569f4e44d88b0aadc7d028476ae5eb9dbabbb7c605a71ab230"; + sha256 = "0c5j3akhbimppfx9vsz5d93jil67ml58pn249sgmczg22ybg5v96"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring text time ]; @@ -181350,7 +194764,7 @@ self: { mkDerivation { pname = "typedquery"; version = "0.1.0.3"; - sha256 = "73e928ba315cb3e286b395487c9ee74acd57c86441543be3a614cd1edaff2035"; + sha256 = "0d90zzd1xk8llviknm21ck45gkaawyg7qj4mnf3f5csw66x2isbk"; libraryHaskellDepends = [ aeson base bytestring haskell-src-meta parsec template-haskell text transformers @@ -181366,7 +194780,7 @@ self: { mkDerivation { pname = "typehash"; version = "1.4.0.4"; - sha256 = "fb52604f8c0a48015c800c67dd5d9e8f8d027985d65f27c37121e695b3024187"; + sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv"; libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ]; description = "Create a unique hash value for a type"; license = stdenv.lib.licenses.bsd3; @@ -181378,7 +194792,7 @@ self: { mkDerivation { pname = "typelevel"; version = "1.0.4"; - sha256 = "1cc8131a6e2cf9c84968980d73a543c7dc73fd6d878973a9f0a5ddaedf471dc2"; + sha256 = "1hhx8zgsxpd5y2lp72c7dpyp7p678fjp63cqd14wiy9cdqd17j0w"; libraryHaskellDepends = [ base pretty pretty-show ]; homepage = "https://github.com/wdanilo/typelevel"; description = "Useful type level operations (type families and related operators)"; @@ -181393,7 +194807,7 @@ self: { mkDerivation { pname = "typelevel-tensor"; version = "0.2.1"; - sha256 = "ed01e0eec64d48bbf529cefd11d6cdccf06fbbe518ce4e122fc4d93f60378e9c"; + sha256 = "174f6xh3znf45w94xkhqwnxnzw6crpb13zff57svnj2dqvpf00gd"; libraryHaskellDepends = [ base numeric-prelude QuickCheck ]; testHaskellDepends = [ array base HUnit numeric-prelude QuickCheck test-framework @@ -181412,7 +194826,7 @@ self: { mkDerivation { pname = "typelits-witnesses"; version = "0.2.3.0"; - sha256 = "a56e92f9c1be1a3063ae3ba3c55c9715ad298b8c5ff8fcf293cf6eabc6ff210c"; + sha256 = "0311zz3anvngjgrgry2zij5jkb8mjxfcb8rvmrik06myq7wr4vm5"; libraryHaskellDepends = [ base base-compat constraints reflection transformers ]; @@ -181426,7 +194840,7 @@ self: { mkDerivation { pname = "typeof"; version = "0.1.2"; - sha256 = "56240ce1ea585e7337e2f876a67887323f8e908a8675acac222c93db8a9cdfd6"; + sha256 = "1mnzkj5dp4rc4anaqxc6ia88wgrjhxwacxpqw8vp6pjqxbhhq92n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -181441,7 +194855,7 @@ self: { mkDerivation { pname = "typeparams"; version = "0.0.6"; - sha256 = "6b8316e951cc940afeea65dac838c5d933e65f04f5c6f8c5c5f50cb550c590ae"; + sha256 = "1blhqm8ba37mqp2ziipm0igyccyrqlwcink5xbz0m56ca7lid0vb"; libraryHaskellDepends = [ base constraints deepseq ghc-prim primitive reflection tagged template-haskell vector @@ -181457,9 +194871,9 @@ self: { mkDerivation { pname = "types-compat"; version = "0.1.1"; - sha256 = "7ec14729ed21bdcb827e584735d06f00df3a27a606f3d36c051ad4f4756b83ba"; + sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby"; revision = "2"; - editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041"; + editedCabalFile = "0h8hlx3zb7s8dfh275ich99j4aa4gdj2f8yvzwpmzgylcvn1gfwg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/philopon/types-compat"; description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; @@ -181472,7 +194886,7 @@ self: { mkDerivation { pname = "typesafe-endian"; version = "0.1.0.1"; - sha256 = "d2b1e7fadef6623a7481a9897e1e4cbedd86004f14a5b458de7c1f67f3bee4cd"; + sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/Ericson2314/typesafe-endian"; description = "Enforce endianness with types"; @@ -181480,20 +194894,22 @@ self: { }) {}; "typesafe-precure" = callPackage - ({ mkDerivation, base, dlist, hspec, monad-skeleton - , template-haskell + ({ mkDerivation, autoexporter, base, dlist, hspec, monad-skeleton + , template-haskell, th-data-compat }: mkDerivation { pname = "typesafe-precure"; - version = "0.2.0.0"; - sha256 = "f024a0c5a135b2ffbaf4ae97d9614d6f0d09652327061ba134f1c4b38e4b130e"; + version = "0.3.1.1"; + sha256 = "1pf5ha4r015yc359c5f7jy2qwx1j9i9w62xjlfhm9amx81cw42if"; libraryHaskellDepends = [ - base dlist monad-skeleton template-haskell + autoexporter base dlist monad-skeleton template-haskell + th-data-compat ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/igrep/typesafe-precure#readme"; description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typescript-docs" = callPackage @@ -181504,7 +194920,7 @@ self: { mkDerivation { pname = "typescript-docs"; version = "0.0.3"; - sha256 = "73e0a98cb8386b868e7fe488b9401fc25f4a15a9c5829a58daf48b62bcb95d89"; + sha256 = "12axp6y652zlv9c9m0n5m4allpy23x0bk274gy78csrqp26akq3k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181522,7 +194938,7 @@ self: { mkDerivation { pname = "typical"; version = "0.0.1"; - sha256 = "98c0f7dd56285e4dde732aa0d49ea12dd1233adceae101b2a58bc1752faf8637"; + sha256 = "0dw6mwppbhcblnr03qgavhx27l9dl6gd981afgg4spi8avfzgh4q"; libraryHaskellDepends = [ base ]; description = "Type level numbers, vectors, list. This lib needs to be extended."; license = "GPL"; @@ -181535,7 +194951,7 @@ self: { mkDerivation { pname = "typography-geometry"; version = "1.0.0.1"; - sha256 = "edaeafb60126be19f0e4fdda54be89b92317dd03b59e9d8b6f119064c1642ad7"; + sha256 = "1mrack0n940idy5rv7mm0gfif8xri6z59npxwkq1kgi606vazbpd"; libraryHaskellDepends = [ base containers parallel polynomials-bernstein vector ]; @@ -181543,6 +194959,27 @@ self: { license = "GPL"; }) {}; + "tyro" = callPackage + ({ mkDerivation, aeson, base, bytestring, HUnit, protolude + , reflection, singletons, test-framework, test-framework-hunit + , text, vector + }: + mkDerivation { + pname = "tyro"; + version = "0.3.0.0"; + sha256 = "0gx50kx5pvh8fi88wjh1hvmawnj1k1jl7z78h9q9spvg0l7nz4q5"; + libraryHaskellDepends = [ + aeson base bytestring protolude reflection singletons text vector + ]; + testHaskellDepends = [ + 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"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell @@ -181553,7 +194990,7 @@ self: { mkDerivation { pname = "tz"; version = "0.1.2.1"; - sha256 = "d187f59e0c1bb452a70cf734de09e0beefb86a6bcbb48f36fc5b32f11727c492"; + sha256 = "14n44wbz2cjvzhv8zd6bddmbivxyw04xwd7p1jkm5d0v1jggb1yi"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -181579,7 +195016,7 @@ self: { mkDerivation { pname = "tzdata"; version = "0.1.20161123.0"; - sha256 = "cb99701d6b3ef7a286a9b15dd4fa3ed023917afeaebf4e90be7d9934464dccb6"; + sha256 = "1dnc9m3396bxps84xgxfzrx928yh7vxd8pdim63a5xrydcfp16fb"; libraryHaskellDepends = [ base bytestring containers deepseq vector ]; @@ -181600,7 +195037,7 @@ self: { mkDerivation { pname = "u2f"; version = "0.1.0.1"; - sha256 = "b5843d158a5356d4a75a09a30952cd886e16b52227d2080fe5959c4a7aeb57be"; + sha256 = "1gjpxdx4m74mwl7hili74asicvl8rm90k8q9bakx8mjki8akv15m"; libraryHaskellDepends = [ aeson asn1-encoding asn1-types base base64-bytestring binary bytestring cryptohash cryptonite text @@ -181619,7 +195056,7 @@ self: { mkDerivation { pname = "uAgda"; version = "1.2.0.4"; - sha256 = "a82a8130e9fa4c7473daa40c7e8be7fd92cf4ebfc373d4d82f2d6eeaae814105"; + sha256 = "01a1h6pflvid5zcd8wy3px7cz4pxwy5pw354v9rp8k7sx4q82am8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181638,8 +195075,8 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.3"; - sha256 = "bdb23301552c6e429765ea503d1ec598eec3cdfd15732b34745b08e7bcce7a10"; + version = "0.7.4"; + sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i"; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml ]; @@ -181663,7 +195100,7 @@ self: { mkDerivation { pname = "uacpid"; version = "1.2"; - sha256 = "246c99935f905aa0de1b0106d6876356fa331d44e6628af9df7d9774551780d6"; + sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181680,7 +195117,7 @@ self: { mkDerivation { pname = "uber"; version = "0.1.1.0"; - sha256 = "756ab823573ef431b0b538ded572ffa3861880bf517d467a21fd0b4a3adb95a7"; + sha256 = "19wmvcx4l2zx45x4czaipy01i1m3zxrdbpiqnnq33x1yawivhskm"; libraryHaskellDepends = [ aeson base text webapi ]; testHaskellDepends = [ base hspec text ]; homepage = "https://github.com/byteally/webapi-uber.git"; @@ -181694,7 +195131,7 @@ self: { mkDerivation { pname = "uberlast"; version = "0.0"; - sha256 = "89557749b63d79d283c51ed1a1c8860eed419d0a1d6c4ebf8a9269030e22e98a"; + sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9"; libraryHaskellDepends = [ base lens tagged template-haskell ]; homepage = "https:/github.com/fumieval/uberlast"; description = "Generate overloaded lenses from plain data declaration"; @@ -181707,7 +195144,7 @@ self: { mkDerivation { pname = "uconv"; version = "0.0.3"; - sha256 = "7b9973c5dcf5cab35255b00fe46312e6d8793a3fb76194d5809e4e9208c7e16c"; + sha256 = "0v71qw494klyh3ar8qdp7wx7kn7629iy83xham9b7jpmvk2p76bv"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ icu ]; description = "String encoding conversion with ICU"; @@ -181722,7 +195159,7 @@ self: { mkDerivation { pname = "udbus"; version = "0.2.1"; - sha256 = "d325b0c1f2a7b1eabde17d85734175f622c6597e9dfc40704894da94a09ef328"; + sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181740,7 +195177,7 @@ self: { mkDerivation { pname = "udbus-model"; version = "0.2.1"; - sha256 = "517ea7b540848f782f3dd6890a5cf41747eca445952649827c2addd3c11f3f76"; + sha256 = "0xiz3z0x7p9agj14j9lm8njfqiqpyif0m2fn7lppi3w482ssfzji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring udbus xml ]; @@ -181755,7 +195192,7 @@ self: { mkDerivation { pname = "udcode"; version = "0.2.0.0"; - sha256 = "66a8d62dd9f10959954f71928c4af5d912974e5b8e9f38510f73c71652b555d9"; + sha256 = "1namnm91divk1x8ki7wfbd79f4nrym58r4ki9yamj2giv4nxda36"; libraryHaskellDepends = [ base containers mtl ]; description = "Does a set of code words form a uniquely decodable code?"; license = stdenv.lib.licenses.bsd3; @@ -181766,7 +195203,7 @@ self: { mkDerivation { pname = "udev"; version = "0.1.0.0"; - sha256 = "a2bb00c7c75ff9beb1951dfec706c628f5354a6a9d58abcb5e9d6950dc29b1a8"; + sha256 = "1a5i57f50scxbv5snn4xd953bx98qq3cgzhxjnqvxyazqz3h1fx2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring posix-paths unix ]; @@ -181774,6 +195211,7 @@ self: { homepage = "https://github.com/pxqr/udev"; description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libudev;}; "udp-conduit" = callPackage @@ -181783,7 +195221,7 @@ self: { mkDerivation { pname = "udp-conduit"; version = "0.1.0.4"; - sha256 = "52d3d29e9d2243014aea9af04e7243b512c1679ec04e54c1dc74d55e94a0178e"; + sha256 = "13hpl2a5xmblvk0m8kn0krkw24mm8dr4xw4sx9502hr2kngd5lsj"; libraryHaskellDepends = [ base chunked-data conduit-combinators mono-traversable network ]; @@ -181798,7 +195236,7 @@ self: { mkDerivation { pname = "uglymemo"; version = "0.1.0.1"; - sha256 = "fe89ef49c0cb15867c58815b050b33f17d394d4c48a9b7240a39780a5a79b847"; + sha256 = "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy"; libraryHaskellDepends = [ base containers ]; description = "A simple (but internally ugly) memoization function"; license = stdenv.lib.licenses.publicDomain; @@ -181813,7 +195251,7 @@ self: { mkDerivation { pname = "uhc-light"; version = "1.1.9.5"; - sha256 = "eabaf3cdac62afb5c8d37f8ceb0997fd85647493d2d4cc1b0d00d954d586681d"; + sha256 = "07b8hvam9n801ldwrm6jjds691gxjw4yp33zsg4bbbv2mk6z7fpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181840,7 +195278,7 @@ self: { mkDerivation { pname = "uhc-util"; version = "0.1.6.7"; - sha256 = "d44b27175e9ce45a15c19c2f589772f4b66ca297a28b34b0ac462a7f6e4f4a75"; + sha256 = "0xaa9xp7yaj6mjq392x2jyi6rdplfabmhbwwq4ammr4wbqbjfjyl"; libraryHaskellDepends = [ array base binary bytestring containers directory fclabels fgl hashable logict-state mtl pqueue process time time-compat @@ -181856,7 +195294,7 @@ self: { mkDerivation { pname = "uhexdump"; version = "0.3"; - sha256 = "d1cb163acce2df791ccf4cdecca56bc87f220f3f274c129c0c24321f46a98c18"; + sha256 = "064cm531yci41jf14k177w7j4zy8dfjwrpjcrwf7kpz2rhx1djyi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring split ]; @@ -181872,9 +195310,9 @@ self: { mkDerivation { pname = "uhttpc"; version = "0.1.1.0"; - sha256 = "cbfa7b8d008c766be1055dca52f467cfded9e5577405b96a8bd622fc5146cece"; - revision = "1"; - editedCabalFile = "ff2f7c17cf679f095238229bd36f5438c5f2a6ed2279eee34daf1a3ceef9ba48"; + sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb"; + revision = "2"; + editedCabalFile = "02fzrhc3599am6nm9prm6q4anmwlgzjc2wx3hqf027z9i65zfhdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181895,7 +195333,7 @@ self: { mkDerivation { pname = "ui-command"; version = "0.5.4"; - sha256 = "872781d8b75e1286266adff20c3316f5e8a6f232ac2d530aa8e11b5cae0009e3"; + sha256 = "1qq902p5q6z1m0556bdc6brads7m2qrhrwnzd8k8c4jynzc829w7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default mtl old-locale time ]; @@ -181911,7 +195349,7 @@ self: { mkDerivation { pname = "uid"; version = "0.1.0.1"; - sha256 = "2b95025f91f15940506f9fafc2369f30a983541d96ba9593af2f71ab563b6687"; + sha256 = "11v67dbanw9gmy9rbfln3ma87a9hkwvc5bwzdx840ngij5gh559b"; libraryHaskellDepends = [ aeson base bytestring cereal dataenc text uuid ]; @@ -181921,6 +195359,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ulid" = callPackage + ({ mkDerivation, base, binary, bytestring, crockford, crypto-api + , deepseq, format-numbers, hashable, hspec, random, text, time + }: + mkDerivation { + pname = "ulid"; + version = "0.2.0.0"; + sha256 = "1fw50j6ajrrfc1nzgf814rzj1x06dls220ngpxpdvs278spc1hns"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring crockford crypto-api deepseq hashable random + time + ]; + executableHaskellDepends = [ base crypto-api ]; + testHaskellDepends = [ + base binary bytestring hashable hspec random + ]; + benchmarkHaskellDepends = [ + base deepseq format-numbers text time + ]; + homepage = "https://github.com/steven777400/ulid"; + description = "Implementation of ULID, lexicographically sortable unique identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "una" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , io-storage, process @@ -181928,7 +195392,7 @@ self: { mkDerivation { pname = "una"; version = "2.1.0"; - sha256 = "703b3ebf00b0a04da3f0f9bb96e4c092ac1e364fc15e161b3bdcbe061a67fe3e"; + sha256 = "0gpycwd0dgnw7cdicpn19wv1xb4jq3j9dfzry2ilv85h02zkwfvh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181946,7 +195410,7 @@ self: { mkDerivation { pname = "unagi-bloomfilter"; version = "0.1.1.0"; - sha256 = "4cdbd8c483c0c2285737e5f12f6a9c512c6697683b4be5e2e5cb286199db5a0f"; + sha256 = "03ssvfcn2a6bwpifajrvd2bncb2ikim2zwg56xbjihn0hg2dinsc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181964,7 +195428,7 @@ self: { mkDerivation { pname = "unagi-chan"; version = "0.4.0.0"; - sha256 = "deb22e738733a9e014916cb98409cef3f11ac444b1e27a530ccb07268db6a112"; + sha256 = "04m1ns6jc1yb1i9pmqmi8k21mwgkrq4q9fbcj4af1a9khxrjxcny"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -181978,8 +195442,8 @@ self: { ({ mkDerivation, base, io-streams, unagi-chan }: mkDerivation { pname = "unagi-streams"; - version = "0.2.0"; - sha256 = "2a9fe32a18f9ab2211e03916956b34f341fa417e879dfd18a01f7eb907133c56"; + version = "0.2.2"; + sha256 = "1v38007ldhwapwxqx5znl0ygl1fi2bhr4vg707ifw1f0wxxw154a"; libraryHaskellDepends = [ base io-streams unagi-chan ]; homepage = "https://github.com/LukeHoersten/unagi-streams"; description = "Unagi Chan IO-Streams"; @@ -181991,7 +195455,7 @@ self: { mkDerivation { pname = "unamb"; version = "0.2.5"; - sha256 = "3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89"; + sha256 = "12cbqlc7qf2sf2m4zmisx06bcc104bwivnzq2df0jqdf09bg0n9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -182005,7 +195469,7 @@ self: { mkDerivation { pname = "unamb-custom"; version = "0.13"; - sha256 = "934bbcb36d12d2d2ea5d490711681a659b5b55d97e0acad9cb0bbd9e2227c964"; + sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://github.com/luqui/unamb-custom"; description = "Functional concurrency with unamb using a custom scheduler"; @@ -182020,7 +195484,7 @@ self: { mkDerivation { pname = "unbound"; version = "0.5.1"; - sha256 = "22647d5f6e052a206aa1de71bfae6e2ea0fa9e7b54abc2542329dede9c694e32"; + sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12"; libraryHaskellDepends = [ base binary containers mtl RepLib transformers ]; @@ -182042,7 +195506,7 @@ self: { mkDerivation { pname = "unbound-generics"; version = "0.3.1"; - sha256 = "1f85672c8edfc8cbea638bcbf1e29d04934d79470177cb59e6dba0f9bb7a6440"; + sha256 = "0h34gaxzk86vwrcwnxq18xwlv4q4kpig3jwbcgmcpj6ziqn6g18z"; libraryHaskellDepends = [ base containers contravariant deepseq mtl profunctors template-haskell transformers transformers-compat @@ -182062,8 +195526,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "unbounded-delays"; - version = "0.1.0.9"; - sha256 = "4010ca5c4ca800039db259fc7a5180f10fc98f00580c7223ac7ad401ca4190b8"; + version = "0.1.1.0"; + sha256 = "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/basvandijk/unbounded-delays"; description = "Unbounded thread delays and timeouts"; @@ -182075,7 +195539,7 @@ self: { mkDerivation { pname = "unbounded-delays-units"; version = "0.4"; - sha256 = "2498539b0cd384a33f0287622fe9544de67e374ca98eac0e5abb045d9b88440a"; + sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614"; libraryHaskellDepends = [ base unbounded-delays units units-defs ]; homepage = "https://github.com/jcristovao/unbouded-delays-units"; description = "Thread delays and timeouts using proper time units"; @@ -182088,7 +195552,7 @@ self: { mkDerivation { pname = "unboxed-containers"; version = "0.0.2.4"; - sha256 = "438416d21a11e03a7b17f3e3e3a0e870596274d281b489f4258e5a29f1565079"; + sha256 = "0yahavqjjnlf4ps8kd41s9s64nbhx2hf7qzk2xxkmq0i3b91d123"; libraryHaskellDepends = [ base containers ]; homepage = "http://github.com/ekmett/unboxed-containers"; description = "Self-optimizing unboxed sets using view patterns and data families"; @@ -182096,6 +195560,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unboxed-ref" = callPackage + ({ mkDerivation, async, base, ghc-prim, HUnit, primitive }: + mkDerivation { + pname = "unboxed-ref"; + 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; + }) {}; + "unbreak" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, cereal, cmdargs, cryptonite, memory, process, text @@ -182104,7 +195581,7 @@ self: { mkDerivation { pname = "unbreak"; version = "0.3.1"; - sha256 = "463b65c79e7d4edac74d23bf10d61956ee6f30ebe1c373624d1583dfcb841286"; + sha256 = "11hjhk5xz0qm9mi77hz1xcq6zvjn37b11gr39p3xlkkxkv3nafs6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182125,7 +195602,7 @@ self: { mkDerivation { pname = "uncertain"; version = "0.3.1.0"; - sha256 = "6f67855ed4799e0c3465dfaef062b637efc61fbea40ebc44ced163028a996ff2"; + sha256 = "1wkgk6504qyirr2bq3m4pqgwdvrpnrig1bnzcls0r7krsig8arvg"; libraryHaskellDepends = [ ad base base-compat containers free mwc-random primitive transformers @@ -182140,7 +195617,7 @@ self: { mkDerivation { pname = "unexceptionalio"; version = "0.3.0"; - sha256 = "927e2be6bb9ced73c1c17d79c981cadef4039d9ee45d2d3d6b4c133ff93ff0b8"; + sha256 = "1f7h7zwky4scdcyjspg4ksfh7x6yra0wjybxq70p7vcwpgk2nzlj"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/singpolyma/unexceptionalio"; description = "IO without any non-error, synchronous exceptions"; @@ -182153,10 +195630,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.9.2"; - sha256 = "9592ec5b6d021fe5c93bc2a047e4f9dddb4bc688bae546fb357e8cd4071b0e04"; - revision = "1"; - editedCabalFile = "21e9b1499fe1d0232359616b81cb8cb4b7e4efdbca5550d5643118edb45be94d"; + version = "0.9.4"; + sha256 = "0qqjr060d79g5lnsdzx9ff6ava78441h8wvkn38hs7y3rvzw9vzd"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -182171,8 +195646,8 @@ self: { }: mkDerivation { pname = "unfoldable-restricted"; - version = "0.0.2"; - sha256 = "c6954fbfc46b00d3f98ed2e02a4009fe018ae6032c404fec3022cdc0ae622f2b"; + version = "0.0.3"; + sha256 = "0vl3qw6sjprsxadbf70md2njm9jvwwmz6qrqi3rifdj535vjh68b"; libraryHaskellDepends = [ base constraints containers hashable transformers unfoldable unit-constraint unordered-containers @@ -182186,7 +195661,7 @@ self: { mkDerivation { pname = "ungadtagger"; version = "1.0.0"; - sha256 = "8bd8daf1b635d4b8e90f1cb4a36e7e09eea2586efce7470abc73ebbbd305c3c2"; + sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/andriyp/ungadtagger"; description = "Abstract GADTs from typelevel tags"; @@ -182198,7 +195673,7 @@ self: { mkDerivation { pname = "uni-events"; version = "2.2.2.0"; - sha256 = "1f5f97e9bab1ac047acb3742121784dcf77dbaec328ad97627d7755322a455b5"; + sha256 = "1damlhi56xfp4xvdk2ijxjx7vxywhhbi4hiprdx09b5ipblrfpqz"; libraryHaskellDepends = [ base containers uni-util ]; homepage = "http://www.informatik.uni-bremen.de/uniform/wb/"; description = "Event handling for the uniform workbench"; @@ -182212,7 +195687,7 @@ self: { mkDerivation { pname = "uni-graphs"; version = "2.2.1.0"; - sha256 = "e5af248a27a16cc2bbad6f276396c149bef2ac1c99de4663c38721f9ea0395ef"; + sha256 = "1vwm0gmgj8c7qdildplr3jng5gj9q6b669vgmnxw4v514y529bz5"; libraryHaskellDepends = [ base containers mtl uni-events uni-htk uni-reactor uni-util ]; @@ -182228,7 +195703,7 @@ self: { mkDerivation { pname = "uni-htk"; version = "2.2.1.3"; - sha256 = "c93fb0b1e291eddafa61f1632e67a467d0337e26039be5a6a745d0f80e0b5044"; + sha256 = "0i2h1c7gil25lykfb6q34rz37l37likjwqzic7xdmvciwaqv0gy9"; libraryHaskellDepends = [ base containers directory uni-events uni-posixutil uni-reactor uni-util @@ -182245,7 +195720,7 @@ self: { mkDerivation { pname = "uni-posixutil"; version = "2.2.1.1"; - sha256 = "ad5461d40d982d68a0cdbdffea3a2cdf2c0f740f6adfeb8bedf9f4404db40372"; + sha256 = "0wh3ni6l1x7rxn5yppva1xs0yb6z5hxfmzxxrnh6hbcq1pa62m5d"; libraryHaskellDepends = [ base directory process uni-events uni-util unix ]; @@ -182260,7 +195735,7 @@ self: { mkDerivation { pname = "uni-reactor"; version = "2.2.1.0"; - sha256 = "027ada030601f706bbcff6ead6f0e897a71c627e194fb48a5cab0391f88ff690"; + sha256 = "147nizw920xbbj5b8kqrgri1r9wpx3qddspnryxhdxq10q1xlyh2"; libraryHaskellDepends = [ base containers directory uni-events uni-util ]; @@ -182276,7 +195751,7 @@ self: { mkDerivation { pname = "uni-uDrawGraph"; version = "2.2.1.3"; - sha256 = "12a4d5347e1b48057b57bf70155294d078a95a6af9b89ef53154259d4c5a74bd"; + sha256 = "1gblb969s9al67srxf7rd9dajy6hji91aw5zaxxhaj0vgqsdb90j"; libraryHaskellDepends = [ base containers uni-events uni-graphs uni-posixutil uni-reactor uni-util @@ -182293,7 +195768,7 @@ self: { mkDerivation { pname = "uni-util"; version = "2.3.0.1"; - sha256 = "d0a6b1f761b013a73cca76baeb7a2e3c67bd86ff08e1786df72862d0b4ec356a"; + sha256 = "0simxjsd0qi8yxnpiq88zy3bsrrw5rxfpfknr8yaf4xhc7vv39nh"; libraryHaskellDepends = [ array base bytestring containers directory ghc-prim mtl network old-time parsec @@ -182308,7 +195783,7 @@ self: { mkDerivation { pname = "unicode"; version = "0.0"; - sha256 = "d41708f5800a83a2b7f44d10f74371625fbc50dd4a9520dd6fc53762904cc83b"; + sha256 = "0fy89j864dy5dzfj15aavm8bqpv2f51zf42dyjvs50qah3shh5yl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -182323,7 +195798,7 @@ self: { mkDerivation { pname = "unicode-names"; version = "3.2.0.0"; - sha256 = "ec15a50eb8b7083148781edb883988ff05d2f5ed1c013e2e0a816f5857430894"; + sha256 = "15088dbmhvw118p3w08wxpsx41gzi0wqinqyg143225pp07aa5gc"; libraryHaskellDepends = [ array base containers unicode-properties ]; @@ -182336,7 +195811,7 @@ self: { mkDerivation { pname = "unicode-normalization"; version = "0.1"; - sha256 = "8bbb7bcdc08c047b42c4f3179a724bb44b6a0115516dc034f1267661d461aeea"; + sha256 = "1smfc7a62xi6y4sc0vai2l0nljxl9dr9l5zkqi17n14cq36ppfwb"; libraryHaskellDepends = [ base bytestring compact-string ]; librarySystemDepends = [ icu ]; homepage = "http://sloompie.reinier.de/unicode-normalization/"; @@ -182350,7 +195825,7 @@ self: { mkDerivation { pname = "unicode-prelude"; version = "0.1.1"; - sha256 = "5cbbd504beb162ce36e1d78736d623b64967c41b6e90fafe64dc8049619cea17"; + sha256 = "05zakihlk06wckzgm43f3g26fjdn4gb3d1ypw4vcwqmipq2dbfsw"; libraryHaskellDepends = [ base ]; description = "Unicode notation for some definitions in Prelude"; license = stdenv.lib.licenses.bsd3; @@ -182361,7 +195836,7 @@ self: { mkDerivation { pname = "unicode-properties"; version = "3.2.0.0"; - sha256 = "018fd587e115d86fd1f1427b579558d39bf1b4b8d02e771cef7ae598bec8f91b"; + sha256 = "06zrr2z9irbsxwf7fbnhp2sg36ykb2amfys2y78nzn0mw63xb3q1"; libraryHaskellDepends = [ array base containers ]; description = "Unicode 3.2.0 character properties"; license = stdenv.lib.licenses.bsd3; @@ -182374,7 +195849,7 @@ self: { mkDerivation { pname = "unicode-show"; version = "0.1.0.2"; - sha256 = "7ee394879b345ee397aef87ca058628cd79d59cbfc1cec81aeda7fea65f53943"; + sha256 = "0hrrymjylzysms0yq77wrdcrvmwcc9ca0z7qmsby6pilkf3r9qvy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -182391,7 +195866,7 @@ self: { mkDerivation { pname = "unicode-symbols"; version = "0.1.1.2"; - sha256 = "dbafed928b75d53d7aab794012ee1fdfff6454fdda468a4ab051f4e032e62a78"; + sha256 = "0y1awqrf1x2in158linszma69zyz3zp14h3rmdx3vmbmif9fvbyv"; libraryHaskellDepends = [ base containers ]; description = "Unicode alternatives for common functions and operators"; license = stdenv.lib.licenses.bsd3; @@ -182406,7 +195881,7 @@ self: { mkDerivation { pname = "unicode-transforms"; version = "0.2.1"; - sha256 = "1d8baa0de3c58685aa1e476961f7f3765395ba257d79258c66e86b06a87f3abc"; + sha256 = "1g1sgyl0csz8cs62aybx4nx9alvnygvn2sa73sm8b1n5wc6sm2qx"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text @@ -182420,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 = "2dc25ead8d19598f6833a490ef1b1f29b9c1f987c8224fd99be6820535aa5245"; + version = "0.3.1"; + sha256 = "03n9s1pqgq9gl3q6xydwjlsvwq4al6khwd8lr137941263zxx0di"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text @@ -182444,16 +195919,22 @@ self: { }) {}; "unicoder" = callPackage - ({ mkDerivation, attoparsec, base, directory, text }: + ({ mkDerivation, attoparsec, base, data-default, directory + , filepath, text, twitch + }: mkDerivation { pname = "unicoder"; - version = "0.4.1"; - sha256 = "83f14e70e2e4cf849fe7c79473087356e93d2b052f5449543446915570cf429d"; + version = "0.5.0"; + sha256 = "1974birppkd49jwq31x8bcbmgnximh233salnyq47ikgxfp6x4c6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ attoparsec base text ]; - executableHaskellDepends = [ attoparsec base directory text ]; - testHaskellDepends = [ attoparsec base text ]; + libraryHaskellDepends = [ + attoparsec base directory filepath text + ]; + executableHaskellDepends = [ + base data-default directory filepath text twitch + ]; + testHaskellDepends = [ base text ]; homepage = "https://github.com/Zankoku-Okuno/unicoder"; description = "Make writing in unicode easy"; license = stdenv.lib.licenses.bsd3; @@ -182465,7 +195946,7 @@ self: { mkDerivation { pname = "unidecode"; version = "0.1.0.4"; - sha256 = "3fcb3da74a14a2718be8144068feaec0a426bdf7296e91935fce48d8ee0e12e9"; + sha256 = "1s8j1vpdhj6fby9r2vi9yyyjd960mvz6hh0lx25p38hl9akkvjrz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/mwotton/unidecode#readme"; @@ -182478,7 +195959,7 @@ self: { mkDerivation { pname = "unification-fd"; version = "0.10.0.1"; - sha256 = "5bf46760e6db104c57f915322b32744f7604323281f5c7dd20185f905fb51996"; + sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v"; libraryHaskellDepends = [ base containers logict mtl ]; homepage = "http://code.haskell.org/~wren/"; description = "Simple generic unification algorithms"; @@ -182493,7 +195974,7 @@ self: { mkDerivation { pname = "uniform-io"; version = "1.2.0.0"; - sha256 = "de961d40fd2478c6718f116e981430608fd3b56bfd1940b313cf2cfa6d126f97"; + sha256 = "15vg29nzlb6g2frl06gxdfsx73v060a9hvhiixqwcy14zm01v5ny"; libraryHaskellDepends = [ attoparsec base bytestring data-default-class interruptible iproute monad-control network transformers transformers-base word8 @@ -182511,7 +195992,7 @@ self: { mkDerivation { pname = "uniform-pair"; version = "0.1.13"; - sha256 = "d31ea7498d3d317dbb22796fc4b26a06d16be5a398c2216ae9820b901503bf9d"; + sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk"; libraryHaskellDepends = [ base deepseq prelude-extras ]; homepage = "https://github.com/conal/uniform-pair/"; description = "Uniform pairs with class instances"; @@ -182525,7 +196006,9 @@ self: { mkDerivation { pname = "union"; version = "0.1.1.1"; - sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4"; + sha256 = "1x24raarjj62z3afmf443kkcdslskz554sky8rcfkkb1j11mg7l1"; + revision = "1"; + editedCabalFile = "03ac6fnvqhlzngyaz5qd14gb5niybw73iimr4mafyqq3swi27q49"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -182537,9 +196020,9 @@ self: { mkDerivation { pname = "union-find"; version = "0.2"; - sha256 = "e6c2682bb8c06e8c43e360f45658d0eea17209cce84953e2a7d2f0240591f0ec"; + sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6"; revision = "1"; - editedCabalFile = "22e97cd9aeb8c96bf7cd8d359d4eda635dc0e0a6cd91b9a07e5a203b00949c8d"; + editedCabalFile = "13cwjh03n82sgshbk4fdlvhc0pb3v979sdcdrpvnpjdqmvcprs92"; libraryHaskellDepends = [ base containers transformers ]; homepage = "http://github.com/nominolo/union-find"; description = "Efficient union and equivalence testing of sets"; @@ -182551,7 +196034,7 @@ self: { mkDerivation { pname = "union-find-array"; version = "0.1.0.2"; - sha256 = "b3993034e95f39e2e6ebfaa05b64333e33f5c851197f64856e281230c50eabdf"; + sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk"; libraryHaskellDepends = [ array base mtl ]; homepage = "https://github.com/haskell-rewriting/union-find-array"; description = "union find data structure"; @@ -182563,7 +196046,7 @@ self: { mkDerivation { pname = "union-map"; version = "0.1"; - sha256 = "b4ac6708abfd6091f6b7f7ed21ac1f6b14f607fd0877901695d707f036783860"; + sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l"; libraryHaskellDepends = [ base containers extensible ]; homepage = "http://github.com/minpou/union-map"; description = "Heterogeneous map by open unions"; @@ -182578,7 +196061,7 @@ self: { mkDerivation { pname = "uniplate"; version = "1.6.12"; - sha256 = "fcc60bc6b3f6e925f611646db90e6db9f05286a9363405f844df1dc15572a8b7"; + sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw"; libraryHaskellDepends = [ base containers hashable syb unordered-containers ]; @@ -182592,7 +196075,7 @@ self: { mkDerivation { pname = "uniq-deep"; version = "1.1.0.0"; - sha256 = "f8953f91cbf90c5073ca90d4e9235dbe0a399ff811709d051b037a8a7db0d38e"; + sha256 = "13nkn1yqlyh33c2rsw0iz2gkj2mybliykm4hr9rm037rrf8kz5gq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers ]; @@ -182606,9 +196089,9 @@ self: { mkDerivation { pname = "unique"; version = "0"; - sha256 = "e3fb171b7b1787683863934df0fc082fb47c0da6972bb1839c2ee8ceb64a0a90"; + sha256 = "140a9avcxs1fkj1v2awplq6prd1g13yg0kckccw6i1qpgcdigyz3"; revision = "1"; - editedCabalFile = "68933757e4bd3e7f53f226bd344f8ee980e86fe74eed20fa19edb5867c51035f"; + editedCabalFile = "0pq3a5y8ddgd37x21vafwxpyi079ir7k9g96y99pygmxwibkg4v8"; libraryHaskellDepends = [ base ghc-prim hashable ]; homepage = "http://github.com/ekmett/unique/"; description = "Fully concurrent unique identifiers"; @@ -182622,7 +196105,7 @@ self: { mkDerivation { pname = "unique-logic"; version = "0.3"; - sha256 = "81d0f6e6e0d34895c90902241b4f4ad98b3acb713f65248aefa68d53d5c6535e"; + sha256 = "0pjkqvam73d6xy528r9zf75km2yr997in902174raj6kw3kgdl41"; libraryHaskellDepends = [ base transformers utility-ht ]; testHaskellDepends = [ base non-empty QuickCheck transformers utility-ht @@ -182640,7 +196123,7 @@ self: { mkDerivation { pname = "unique-logic-tf"; version = "0.4.1.2"; - sha256 = "d00604f3ba2970a714fb656fc79a6481f833356af32ffd2bbb30cf025db9acbd"; + sha256 = "1gdcp5fh5krhpcmzsbzkd8sk7y41cjdcfvv5zcaafw19pbrh81nh"; libraryHaskellDepends = [ base containers explicit-exception transformers utility-ht ]; @@ -182658,7 +196141,7 @@ self: { mkDerivation { pname = "uniqueid"; version = "0.1.1"; - sha256 = "e69df591c1ab9901af24bf0e63032765eb2b1ba4ca4fb720a234e9f292e03268"; + sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/sebfisch/uniqueid/wikis"; description = "Splittable Unique Identifier Supply"; @@ -182671,7 +196154,7 @@ self: { mkDerivation { pname = "unit"; version = "0.1.0.0"; - sha256 = "0747cc0c3a8e6bb64343b79c079702757d81f63ae2bc7dd76727b8bcee8edc74"; + sha256 = "0x6wivpbrf17czbpvg727bv82zbm0abhg75p8d1vcswf786cqiq7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "http://github.com/cxfreeio/unit#readme"; @@ -182684,7 +196167,7 @@ self: { mkDerivation { pname = "unit-constraint"; version = "0.0.0"; - sha256 = "446de8480016c9db75676445477b5ce1ff5c6d486d6708c55b06de7cbd845e59"; + sha256 = "0nayhjyprph6bg2hhrvd91nmrzz1bixlfib4cxsxpj8n014fhva4"; libraryHaskellDepends = [ base constraints ]; description = "Extremely simple typeclass"; license = stdenv.lib.licenses.bsd3; @@ -182698,7 +196181,7 @@ self: { mkDerivation { pname = "units"; version = "2.4"; - sha256 = "5060ef295a832b620bb60b057b57c18de4d0b187634bee691dbd64df2d6aa641"; + sha256 = "0hd6d8nxyr5x3mlywjv3hyqx1r4dq5bpn18bnq5n4aw3b8lyyq2h"; libraryHaskellDepends = [ base containers deepseq lens linear mtl multimap singletons syb template-haskell th-desugar units-parser vector-space @@ -182720,7 +196203,7 @@ self: { mkDerivation { pname = "units-attoparsec"; version = "1.0"; - sha256 = "3ff62ea9ae3860f799ce39188620da7be6c8ffb8793fcea15bf79dfef4574a87"; + sha256 = "11saazsgx7gpbfhwwgvrp3zwirkvv8h8c61rrsczfq1qmsljxxiz"; libraryHaskellDepends = [ attoparsec base template-haskell text units units-defs ]; @@ -182735,7 +196218,7 @@ self: { mkDerivation { pname = "units-defs"; version = "2.0.1.1"; - sha256 = "82a72caa7c277d4513de4a769805097820b0f5299a4b93615d91d431217b295d"; + sha256 = "0p99gchk3m4ibmhr6jws57sv083q142rhxjavq9laz97gjm2r9w2"; libraryHaskellDepends = [ base template-haskell units ]; homepage = "http://github.com/goldfirere/units-defs"; description = "Definitions for use with the units package"; @@ -182749,7 +196232,7 @@ self: { mkDerivation { pname = "units-parser"; version = "0.1.0.0"; - sha256 = "d8558536a4f82795cb880f3910fec536005b7199662810662f61c27b95d24141"; + sha256 = "0ha1saapphk15xk10a36k5qmn01nqpz10f8gi35ra9zqlhv8amfq"; libraryHaskellDepends = [ base containers mtl multimap parsec ]; testHaskellDepends = [ base containers mtl multimap parsec syb tasty tasty-hunit @@ -182764,7 +196247,7 @@ self: { mkDerivation { pname = "unittyped"; version = "0.1"; - sha256 = "b4b5d74a863ac2f4d1430305aa4b2277b9d3bbec9492aa8b75cca26b793e62a9"; + sha256 = "1ab27rwnp8ncfn5sm4llxjxx7fbp495sl1838g8z9hishr5dgddl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://bitbucket.org/xnyhps/haskell-unittyped/"; @@ -182778,7 +196261,7 @@ self: { mkDerivation { pname = "unitym"; version = "0.1.0.2"; - sha256 = "5a22f2e26ba053af73d9c92d37fa41bae147f59ac49a4c412fb725e5c5d93b9b"; + sha256 = "16rvv72ya9dp5x0lr6n4kbslgqds87x3fbf9v5rsylx0dgig48js"; libraryHaskellDepends = [ base text transformers ]; homepage = "https://github.com/bhurt/unitym#readme"; description = "A monad type class shared between web services"; @@ -182792,7 +196275,7 @@ self: { mkDerivation { pname = "unitym-servant"; version = "0.1.0.0"; - sha256 = "3394f5c1568116c3ad3283cece89e2c2ece74b93c3a644e4b2ba481ceeb0acf0"; + sha256 = "1w5cn3p1qj5snbj499n3jd5ygv62wa4wxkl36anw65l1av0zb51k"; libraryHaskellDepends = [ base mtl servant-server text transformers unitym ]; @@ -182806,7 +196289,7 @@ self: { mkDerivation { pname = "unitym-yesod"; version = "0.1.0.2"; - sha256 = "dc0fef13cc5142c8bf9df62916f3284ab34dcc1dcca56efc9f05fbc1398ee0e1"; + sha256 = "1qg0iqww3yq5kzy6x9fc3p64vcsa53ricagnknzwhhjirh9yy3yw"; libraryHaskellDepends = [ base unitym yesod ]; homepage = "https://github.com/bhurt/unitym#readme"; description = "Implementation of the unity monad for the Yesod framework"; @@ -182818,7 +196301,7 @@ self: { mkDerivation { pname = "universal-binary"; version = "0.11"; - sha256 = "9c15c2e048aaac5d0fd83c2665b40e317ed7c78a7d5e1dbdc3f2c67bb4c1d9be"; + sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw"; libraryHaskellDepends = [ base binary bytestring ]; description = "Parser for OS X Universal Binary format"; license = stdenv.lib.licenses.bsd3; @@ -182832,7 +196315,7 @@ self: { mkDerivation { pname = "universe"; version = "1.0"; - sha256 = "1f80e4788d348d53e39a32c8514940418a71c49c5423eb70b94e1786d94ff9a7"; + sha256 = "19zr9zcqc5sfp5qfn8slkk2732j1814m3j1jkbim739limwf900z"; libraryHaskellDepends = [ universe-instances-base universe-instances-extended universe-instances-trans universe-reverse-instances @@ -182847,7 +196330,7 @@ self: { mkDerivation { pname = "universe-base"; version = "1.0.2.1"; - sha256 = "07c48350afacdc0b5569f72e3d6a27a8ff3c208b7a6f22d00e149a201798bb51"; + sha256 = "0ldvk0bj16hl1v824vvsich3rzx84xm3sbppd5ahpp5cmx887i07"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/dmwit/universe"; description = "A class for finite and recursively enumerable types and some helper functions for enumerating them"; @@ -182859,7 +196342,7 @@ self: { mkDerivation { pname = "universe-instances-base"; version = "1.0"; - sha256 = "a21150ee3bb71283522a573bf092c8d96b2e28a95336a95505aa4c2a067dd212"; + sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2"; libraryHaskellDepends = [ base containers universe-base ]; homepage = "https://github.com/dmwit/universe"; description = "Universe instances for types from the base package"; @@ -182873,9 +196356,9 @@ self: { mkDerivation { pname = "universe-instances-extended"; version = "1.0.0.1"; - sha256 = "665b272701b16a6bb8d40a5396aa1dcb038f002452ebdc29d353e3be2070c997"; + sha256 = "15y9f0hbxqsksclxrssj4h08y0yb3nm9clqasjw6nsmi04kjfnv6"; revision = "1"; - editedCabalFile = "19250a2533aa23a84169d72218dc3f5a055253a866901bb78853fb2b271951db"; + editedCabalFile = "1nsi34kjpyski2vip436m19m41as7zf1h8npd50sh8xa6cjhl98r"; libraryHaskellDepends = [ adjunctions base comonad universe-instances-base void ]; @@ -182891,9 +196374,9 @@ self: { mkDerivation { pname = "universe-instances-trans"; version = "1.0.0.1"; - sha256 = "0d047cf1eb4af9f2052f44f487e7d2d44c86f51b54a3cc1fc5243ad816e8310e"; + sha256 = "03iix0bdhfi4qlgwr8sl3gsqck6lsbkqgx245w2z5yaaxgqpq10d"; revision = "1"; - editedCabalFile = "c96cbeb4bf0240bbe09476ca360e9d35cb07cb0af4324bfbfa5cce55df7a9c35"; + editedCabalFile = "0dcwgbgmbkjwzbxlncpl1b5hgjrmkl73djknjkhbnh02pysbwv69"; libraryHaskellDepends = [ base mtl transformers universe-base universe-instances-base ]; @@ -182907,7 +196390,7 @@ self: { mkDerivation { pname = "universe-reverse-instances"; version = "1.0"; - sha256 = "e9d41cbf26eabd77587fddf69493d7ad23028303d1c1d1d2ee1de1bf3d3e8d49"; + sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79"; libraryHaskellDepends = [ base containers universe-instances-base ]; @@ -182925,7 +196408,7 @@ self: { mkDerivation { pname = "universe-th"; version = "0.0.0.6"; - sha256 = "9da7e7efae4a4a44867ce70fd6eb49cfc841064507a98f9a31225d4af6637390"; + sha256 = "143kcgv4lp9266d8za878l343j6g97mxc3z7gj348jjamvpyg9wx"; libraryHaskellDepends = [ base composition mtl template-haskell tuple uniplate ]; @@ -182941,19 +196424,19 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl - , safe, stm, text, text-format, transformers, unordered-containers - , utf8-string, vector + ({ mkDerivation, base, bytestring, containers, deepseq, exceptions + , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe, stm + , text, text-format, transformers, type-operators + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "0.2.1"; - sha256 = "e5f8c58824cbf559fb3632ff5a00190870e254262a0f4db9dfde7bc2bc423d21"; + version = "0.5"; + sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4"; libraryHaskellDepends = [ - async base bytestring containers deepseq exceptions ghc-prim - hashable microlens microlens-mtl mtl safe stm text text-format - transformers unordered-containers utf8-string vector + base bytestring containers deepseq exceptions ghc-prim hashable + microlens microlens-mtl mtl safe stm text text-format transformers + type-operators unordered-containers utf8-string vector ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; @@ -182965,9 +196448,9 @@ self: { mkDerivation { pname = "unix"; version = "2.7.2.1"; - sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c"; + sha256 = "1709ip8k1vahy00zi7v7qccw6rr22qrf3vk54h97jxrnjiakc1gw"; revision = "1"; - editedCabalFile = "3db1b6e8de36a36fc4f979e1045e82554f16c736961fa0392e42b7b3f4decfd4"; + editedCabalFile = "1m6gvvsb7ds25qws07wn6v3icksmh9g09qbrz726z8rnvvlbdc9x"; libraryHaskellDepends = [ base bytestring time ]; homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; @@ -182980,7 +196463,7 @@ self: { mkDerivation { pname = "unix-bytestring"; version = "0.3.7.3"; - sha256 = "a3ec273da411988b7d9eb7317f6d84ce47f4b7fd39bdc721acd5229e7cff808c"; + sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "Unix/Posix-specific functions for ByteStrings"; @@ -182992,9 +196475,9 @@ self: { mkDerivation { pname = "unix-compat"; version = "0.4.3.1"; - sha256 = "72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27"; + sha256 = "09vykw89x981fywy0w1pci2v8zy3ajyjwh9z2n610vjacmd1v03j"; revision = "1"; - editedCabalFile = "6c1914a5322b96837ac47296bf0ce287ce9c89cc131f844483f5d9784e36910a"; + editedCabalFile = "02li6r77ingmhd2887qkrj4rrkl7w86bz5kjqix875ib6aji86bc"; libraryHaskellDepends = [ base unix ]; homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; @@ -183006,7 +196489,7 @@ self: { mkDerivation { pname = "unix-fcntl"; version = "0.0.0"; - sha256 = "69c1852fa11e98c99e0f61052bd642e66f2e491ffba1e0ee6d7cd5d049f832a3"; + sha256 = "18rjz14x1mbwdppf18gv3x4jwvz68bb2n1b11ygck60yl4pqbhb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base foreign-var ]; @@ -183021,7 +196504,7 @@ self: { mkDerivation { pname = "unix-handle"; version = "0.0.0"; - sha256 = "9126ef725dc5d9a923834922c1bf2ad6e7044a2d67c6161e1595163d53abda1f"; + sha256 = "07ysmd9ks5lm2lg1dik75m509ryn5azw28j9hcisknf5bmrfy9li"; libraryHaskellDepends = [ base unix ]; description = "POSIX operations on Handles"; license = stdenv.lib.licenses.bsd3; @@ -183032,7 +196515,7 @@ self: { mkDerivation { pname = "unix-io-extra"; version = "0.1"; - sha256 = "2fd2e78408217b78d32711582029c13e0ece89eccf827dc8ed4dd4ab8247c2e3"; + sha256 = "1qy28y1apm2dxp47v0ngxj4ww3iyq4lj0n0i4z9phyr1122fglig"; libraryHaskellDepends = [ base ]; description = "Support for writev, pwrite and pread"; license = stdenv.lib.licenses.bsd3; @@ -183045,7 +196528,7 @@ self: { mkDerivation { pname = "unix-memory"; version = "0.1.2"; - sha256 = "f766b55f5a356ab4a7289d456972555b2f6a4af0cc46968f0d308c96c63f1ae5"; + sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix @@ -183062,9 +196545,9 @@ self: { mkDerivation { pname = "unix-process-conduit"; version = "0.2.2.3"; - sha256 = "9e6d6b48a410bf5e788cc725bb00066ab500d6eef6ba64fbf3ef41bd1b97af51"; + sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy"; revision = "1"; - editedCabalFile = "bd35a20a4b51cd11bfcacd873bf6077f44684fdba8a4f6e08aea068f0849ee75"; + editedCabalFile = "0xgf9448y1paibhgd958vd7nhi3z0zv3p1ydrazi3kai9c5a4ddx"; libraryHaskellDepends = [ base bytestring conduit directory filepath process stm time transformers unix @@ -183083,7 +196566,7 @@ self: { mkDerivation { pname = "unix-pty-light"; version = "0.1"; - sha256 = "9227e0771e030cf5b871d0aa91fe9f7e8c324907cb5037cd330846c84c6341d8"; + sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj"; libraryHaskellDepends = [ base unix ]; homepage = "http://code.haskell.org/~scook0/unix-pty-light"; description = "POSIX pseudo-terminal support"; @@ -183097,7 +196580,7 @@ self: { mkDerivation { pname = "unix-time"; version = "0.3.7"; - sha256 = "1131301131dd3e73353a346daa04578ec067073e7674d447051ac1a87262b4e1"; + sha256 = "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring doctest hspec old-locale old-time QuickCheck time @@ -183113,10 +196596,8 @@ self: { }: mkDerivation { pname = "unjson"; - version = "0.14.0.1"; - sha256 = "d173f0c4ad8c80d4e1035a57c6bf3e4a8620ffb71c0c1f6ddcb474ac440a3e13"; - revision = "4"; - editedCabalFile = "129fd242ec0082f7c3dfa73cdadb13d7b7556a61395b62d0d2e0acbb4e3768ec"; + version = "0.14.1.3"; + sha256 = "18aclqjyqj7428yyal9hj32r290ipd77lnaf176sn8fk42gk5qj3"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific text time unordered-containers vector @@ -183126,6 +196607,7 @@ self: { invariant pretty primitive scientific text time unordered-containers vector ]; + homepage = "https://github.com/scrive/unjson"; description = "Bidirectional JSON parsing and generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183136,7 +196618,7 @@ self: { mkDerivation { pname = "unlambda"; version = "0.1.4.2"; - sha256 = "523f0ea20464fc6fc055526c3fe6f9de03826ae89fb96a8fa68bd56cddfcfeaa"; + sha256 = "1apyzkfnrmcbls7nmfczx1m840yyz7k3yv2jap06zz340ji0wgsj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base mtl ]; @@ -183145,12 +196627,41 @@ 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 { pname = "unlit"; version = "0.4.0.0"; - sha256 = "489ecde4843f1911ebdaac3099241d703bb1161f3d386e2b5143f2fd6c355515"; + sha256 = "05am6mngvwj3a4mnwf1x3wbb2fvh3lj9jc5cvbmi269zhkjcv7j8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory text ]; @@ -183167,7 +196678,7 @@ self: { mkDerivation { pname = "unm-hip"; version = "0.3.1.6"; - sha256 = "c5e79f3d4238a2aa59827b40ab785bb22a3d70ace67e866e9ae2c984ccde119c"; + sha256 = "170ivv689jg2k9p8czp6miq3samjbdwanh3vh9csm8iq88yrzry5"; libraryHaskellDepends = [ array base bytestring containers process vector ]; @@ -183175,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 @@ -183183,8 +196707,8 @@ self: { }: mkDerivation { pname = "unordered-containers"; - version = "0.2.7.2"; - sha256 = "7f5c4344fcab01f6046378c64522f0dfd69e417f6c1a8858a24bdabaadb3e56e"; + version = "0.2.8.0"; + sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -183206,7 +196730,7 @@ self: { mkDerivation { pname = "unordered-containers-rematch"; version = "0.1.0.0"; - sha256 = "2846f6a032b604b4ddf9335194a3b900f4b030b0ba2921157dbdd4d021478d8e"; + sha256 = "13ld8whx1m5xglaj2adsn0qb1x00p6ir8l9kz7fv815n6ahgcii8"; libraryHaskellDepends = [ base hashable rematch unordered-containers ]; @@ -183226,7 +196750,7 @@ self: { mkDerivation { pname = "unordered-graphs"; version = "0.1.0.1"; - sha256 = "0b4e1024bef803a8a853273175d1735ab8155cc5f4f954a7883701b85a3a7aff"; + sha256 = "1zvs79dbh09pi2km9yglqmf1bf2sfg8pac97aflah0zqpqj10khb"; libraryHaskellDepends = [ base deepseq dlist hashable unordered-containers ]; @@ -183241,7 +196765,7 @@ self: { mkDerivation { pname = "unpack-funcs"; version = "0.3.1"; - sha256 = "039ff3165ee7db95b7894761d38833f8dbf19812d1bcfc4acbc01415deea4841"; + sha256 = "0ha8xbg1a560rd5grg6i2acg3nzq6f4d6qa7i6vrbnz7bqbg77q3"; libraryHaskellDepends = [ base bytestring primitive template-haskell transformers vector ]; @@ -183255,7 +196779,7 @@ self: { mkDerivation { pname = "unroll-ghc-plugin"; version = "0.1.1"; - sha256 = "f7a04a48840e2111628f32af3939d12ac8c0bd22602999a07deb62ecce390558"; + sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p"; libraryHaskellDepends = [ base ghc ]; homepage = "http://thoughtpolice.github.com/unroll-ghc-plugin"; description = "Compiler plugin for loop unrolling"; @@ -183268,7 +196792,7 @@ self: { mkDerivation { pname = "unsafe"; version = "0.0"; - sha256 = "df0a74ccf7b43956c1b5decd5580e235317d1f96a1bbd75e117fc21143ee8641"; + sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz"; libraryHaskellDepends = [ base ]; homepage = "http://code.haskell.org/~thielema/unsafe/"; description = "Unified interface to unsafe functions"; @@ -183280,7 +196804,7 @@ self: { mkDerivation { pname = "unsafe-promises"; version = "0.0.1.3"; - sha256 = "e04c6362be8a5f1417208cecc6b7343bae48770bc67c150200d46005f0602880"; + sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70"; libraryHaskellDepends = [ base threads ]; homepage = "https://github.com/kallisti-dev/unsafe-promises"; description = "Create pure futures using lazy IO"; @@ -183292,7 +196816,7 @@ self: { mkDerivation { pname = "unsafely"; version = "0.2.0.0"; - sha256 = "19341a7d3d2e4d4ae3a4a232c566edb071c895a17e5f1d1ad092b1d3fe026583"; + sha256 = "10v50bzd7ccjs0d1spvyl6awhwdhxmkcacm2lkillk9f7myild0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -183307,7 +196831,7 @@ self: { mkDerivation { pname = "unsafeperformst"; version = "0.9.2"; - sha256 = "6c3fff1fdc9efad11d486ea6ad0c382c3e9da7895b2ecfd20595eb4a7f454650"; + sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/atzeus/unsafeperformst"; description = "Like unsafeperformIO, but for the ST monad"; @@ -183321,7 +196845,7 @@ self: { mkDerivation { pname = "unscramble"; version = "1.0"; - sha256 = "2e67d6d2be0f5422891448c099324fcd72a1f18067200c6ed2a6453f784b8efe"; + sha256 = "1zlf9dw3yid6s9p0q837h3qs2wnd9wr9kh282j4j4m0gpv9dcrrf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183339,8 +196863,8 @@ self: { }: mkDerivation { pname = "unsequential"; - version = "0.5.2"; - sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a"; + version = "0.5.2.1"; + sha256 = "00j3gvs7nf959wpsfk21fgn8waah90scb8r3gqwvams7zskng1vm"; libraryHaskellDepends = [ base base-prelude dlist transformers ]; testHaskellDepends = [ attoparsec interspersed QuickCheck quickcheck-instances rebase @@ -183357,7 +196881,7 @@ self: { mkDerivation { pname = "unusable-pkg"; version = "0.1"; - sha256 = "f56e8a158ec8502fe278aad68bda4a4ff16337c0065a7b4587cb6e6294fe4d80"; + sha256 = "102dzsa64vnbhx2pnnh6q0vn7wag9bd8pmmag3i2yl68iqaqlvpm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -183374,8 +196898,8 @@ self: { }: mkDerivation { pname = "unused"; - version = "0.7.0.0"; - sha256 = "4eee152fd54f52f1c1ff7b12ff8fa78b0d2c84def118f7be2fa51a0c3d70c68b"; + version = "0.8.0.0"; + sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183402,7 +196926,7 @@ self: { mkDerivation { pname = "uom-plugin"; version = "0.2.0.1"; - sha256 = "3efad2e00217c5011394a9c2c166d9acc870189486dca0c8058cf397d8ea2e81"; + sha256 = "109fxbc9gwwc0p4a1p46jhc71j5cv5kc3hm9jh9h3i8p0bhd5yiy"; libraryHaskellDepends = [ base containers deepseq ghc ghc-tcplugins-extra template-haskell units-parser @@ -183420,7 +196944,7 @@ self: { mkDerivation { pname = "up"; version = "1.0.0.4"; - sha256 = "3412742f52d9ba598341fa74f89bc6e78acac81fe8409069af15912015fe340f"; + sha256 = "03rlzqaj148mmxlr0h783z4cm2p7qsdzhx7s861mkfnra8pp84il"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183437,7 +196961,7 @@ self: { mkDerivation { pname = "up-grade"; version = "0.0.2"; - sha256 = "cb893b55b492d6cbd7b447c320e4a2eaf618a4fcd37352b97dffc22784e955da"; + sha256 = "1njmx622ghpzgnwm4wykzjj1ixpalbj21hs7nkbwpmljniakp2fb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ports-tools process ]; @@ -183454,7 +196978,7 @@ self: { mkDerivation { pname = "update-nix-fetchgit"; version = "0.1.0.0"; - sha256 = "a2782a528180831e4245997d47a561c008887672c7dc299ac73135b9890a14b2"; + sha256 = "1chl1a4vjd9iqyd2kp67f9v8h260c6jlfzcr8m11x0w0h592ly52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183475,7 +196999,7 @@ self: { mkDerivation { pname = "update-repos"; version = "0.0.1"; - sha256 = "5bdba9fecbeb9aee916fdb38a6c8586d9a389544700c50515e243ad51a7ab47b"; + sha256 = "0yxlg8ddafi4br8m033h8jaki6kdb34acf6vdy8yx6pbrgzaknsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183498,7 +197022,7 @@ self: { mkDerivation { pname = "uploadcare"; version = "0.1"; - sha256 = "7f95a569176336d1fc71064f7a0f39f6fea79dc4922a18b7a2be43d9d0ada7d2"; + sha256 = "1lm7mp8djhxylavihaljqjfsgzpn747plkq6f7yd2dk32xlsb5bz"; libraryHaskellDepends = [ aeson attoparsec base bytestring cryptohash hex http-conduit http-types old-locale time @@ -183513,7 +197037,7 @@ self: { mkDerivation { pname = "upskirt"; version = "0.0.4"; - sha256 = "8ce80fe600d98aec47210ccd38a1df0c3a2cd7ce607fee52ac5de0d80b194814"; + sha256 = "0528345xiq2xmi9fwzv0rvbjqfhcvyhkik8c453yr2nr03k0zs4c"; libraryHaskellDepends = [ base bytestring ]; description = "Binding to upskirt"; license = stdenv.lib.licenses.publicDomain; @@ -183530,7 +197054,7 @@ self: { mkDerivation { pname = "ureader"; version = "0.2.0.0"; - sha256 = "68f1a84963e2aae0fa58cab89e873552b585db43a9036db06f6dcf5a2bd2ef87"; + sha256 = "11zgs8mmmkvddyq6s0x98gdqbdaj6n3rxf6ab3xf1ap2cd4siwb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183553,7 +197077,7 @@ self: { mkDerivation { pname = "urembed"; version = "0.5.0.1"; - sha256 = "33ea48c7d89f130a988a521e61af0826af8f82c275951dcfecbdf33f751fd93a"; + sha256 = "0fnr3xskzwxxxk7iv5bmqa18zbr612pn27jjiac0l4wzv33lisik"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183571,7 +197095,7 @@ self: { mkDerivation { pname = "uri"; version = "0.1.6.4"; - sha256 = "a90cd3d3ca1d33740dc732f14773266a7707901a872747a6e543129cab4ee409"; + sha256 = "02g49smrq4j3wnk4f9w73a80fxva4rrlgw9jqw6p8cqxrb9x6359"; libraryHaskellDepends = [ base parsec safe utf8-string ]; homepage = "http://gitorious.org/uri"; description = "Library for working with URIs"; @@ -183579,24 +197103,25 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, criterion, deepseq, deepseq-generics, generics-sop - , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, th-lift-instances + ({ mkDerivation, attoparsec, base, base-compat, blaze-builder + , bytestring, containers, criterion, deepseq, deepseq-generics + , generics-sop, HUnit, network-uri, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, th-lift-instances + , transformers }: mkDerivation { pname = "uri-bytestring"; - version = "0.2.3.0"; - sha256 = "50178faac44a67095602412846682040b8b72ae8af5289e73dabe2cc49a639dd"; + version = "0.2.3.3"; + sha256 = "050bimfsc912dh5sb2kjvvdd80ggjhakqq1dbn46cnp98zr8p0rx"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers template-haskell th-lift-instances ]; testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers generics-sop - HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck + attoparsec base base-compat blaze-builder bytestring containers + generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck transformers ]; benchmarkHaskellDepends = [ base blaze-builder bytestring criterion deepseq deepseq-generics @@ -183607,34 +197132,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "uri-bytestring_0_2_3_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, criterion, deepseq, deepseq-generics, generics-sop - , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, th-lift-instances - }: + "uri-bytestring-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { - pname = "uri-bytestring"; - version = "0.2.3.1"; - sha256 = "1d2814b8ca76c8b72fcf995d4d863c492b22bc80c62d990dad2d969cbef1b16d"; + pname = "uri-bytestring-aeson"; + version = "0.1.0.1"; + sha256 = "1zi5jl2ksjmvflfzff0hqy7a66ma6xifl2nycb1f6qd0fsrc6hpg"; libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - template-haskell th-lift-instances + aeson base bytestring text uri-bytestring ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers generics-sop - HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq deepseq-generics - network-uri - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; + homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; + description = "Aeson instances for URI Bytestring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -183645,7 +197154,7 @@ self: { mkDerivation { pname = "uri-conduit"; version = "1.1.1.2"; - sha256 = "e66d77fc8d410afbebbeadb16a44c2440c47d15fd59aeb9c5ca0071b0311b82e"; + sha256 = "0bmq241in1x0bjffp6nmbz8lf324q926mcddpvmzn2j1ipy7fvg6"; libraryHaskellDepends = [ base bytestring conduit containers deepseq failure monad-control network system-fileio system-filepath text transformers @@ -183662,7 +197171,7 @@ self: { mkDerivation { pname = "uri-encode"; version = "1.5.0.5"; - sha256 = "e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186"; + sha256 = "11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183679,7 +197188,7 @@ self: { mkDerivation { pname = "uri-enumerator"; version = "0.1.0.1"; - sha256 = "85c3fae2f6dca8217853ee8ebed08b0da0b557c5f027bab670737a147afd9e98"; + sha256 = "164yzmx18ykkf2vbl9zhqmbvb80dig8bx3pfadw23a6wyvigmhw5"; libraryHaskellDepends = [ base bytestring containers enumerator failure network text transformers @@ -183698,7 +197207,7 @@ self: { mkDerivation { pname = "uri-enumerator-file"; version = "0.1.1.1"; - sha256 = "a6d52d62452d609a459d7e7eea209de402aabc42944939f1c0dcf23a03d8cc97"; + sha256 = "15ycv01kmwnwq3qkjjcl8ayal0p4klhflzkykm2rlq1d8mi2vmd6"; libraryHaskellDepends = [ base bytestring containers enumerator lifted-base monad-control network system-fileio system-filepath text transformers @@ -183715,7 +197224,7 @@ self: { mkDerivation { pname = "uri-template"; version = "0.2"; - sha256 = "f4d23fc3f026409071653c52b7e90df7788d6626129c33b96f9cab25abc732f8"; + sha256 = "1y1jqymjbawwdywk770j4rk8sy7p1plvfliwcmqr0h16y31kzlpl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers utf8-string ]; @@ -183732,7 +197241,7 @@ self: { mkDerivation { pname = "uri-templater"; version = "0.2.1.0"; - sha256 = "b18621a1c4deed63e892395d4a2b0d20c7dbc81ecc8d977a18d99f23cc03943c"; + sha256 = "0g4l0g6277yr31x9g3fc3v4dpir01lmllp9rjbl67vfyqjhj31mi"; libraryHaskellDepends = [ ansi-wl-pprint base charset containers dlist HTTP mtl parsers template-haskell text trifecta unordered-containers vector @@ -183751,21 +197260,44 @@ self: { mkDerivation { pname = "url"; version = "2.1.3"; - sha256 = "5af27e3f8c0a27e52d0dcb98ef06a0fdd01efe8bb21242c29432e1bc380a4f61"; + sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs"; libraryHaskellDepends = [ base utf8-string ]; homepage = "http://www.haskell.org/haskellwiki/Url"; description = "A library for working with URLs"; license = stdenv.lib.licenses.bsd3; }) {}; + "url-decoders" = callPackage + ({ mkDerivation, base, base-prelude, binary-parser, bytestring + , criterion, http-types, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "url-decoders"; + version = "0.2"; + sha256 = "0ci70pq2m05dsni67kzwh30x8s5grdr3vkqplnkp6a0m16gq1v7j"; + libraryHaskellDepends = [ + base base-prelude binary-parser bytestring text + unordered-containers + ]; + testHaskellDepends = [ + http-types QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion http-types rerebase ]; + homepage = "https://github.com/nikita-volkov/url-decoders"; + description = "Decoders for URL-encoding (aka Percent-encoding)"; + license = stdenv.lib.licenses.mit; + }) {}; + "url-generic" = callPackage ({ mkDerivation, base, mtl, syb }: mkDerivation { pname = "url-generic"; version = "0.1"; - sha256 = "b5f00a65dcc190b8685a0e203cc98f0433593e895dd664cfeaf31806adf0cc79"; + sha256 = "0yfcy2nhc67kxb7n9mjxi4z5jcq4iz4kq80fb9lbi461vijhmw5m"; revision = "1"; - editedCabalFile = "d9926e2ce6433a73b2ba940d476f7046890752c8a1145b42a78561e8d3ff6fb9"; + editedCabalFile = "1fbgzz9yhqc5lx15n551r190g2a6f1plf3clpar76fj3wqn6x4nr"; libraryHaskellDepends = [ base mtl syb ]; description = "Parse/format generic key/value URLs from record data types"; license = stdenv.lib.licenses.bsd3; @@ -183779,7 +197311,7 @@ self: { mkDerivation { pname = "urlcheck"; version = "0.1.1"; - sha256 = "31a3e5930c16e438cda6997e180c5bfcbccc168880542777bf8981d5eea5add5"; + sha256 = "1mddlppdb0c9pxvjfm40i0bcrg7wbc61hzlrlv6kir0n1j9yb8ri"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183796,7 +197328,7 @@ self: { mkDerivation { pname = "urldecode"; version = "1.0.0.2"; - sha256 = "7e60488c514cd12f3b6057eb024f574a2f3c262d8db14f5eb60ca3a303b9d18d"; + sha256 = "13fip41s78qcnrg4zccd5lk3qbsaax7h5sspc0xjzlaca664hq3y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base network ]; @@ -183811,7 +197343,7 @@ self: { mkDerivation { pname = "urldisp-happstack"; version = "0.1"; - sha256 = "48292f305203c2e589f53c27db412bdc61564c331838cb3c9756577b0b2fe2cd"; + sha256 = "1kg25w5pnmsnjwycnf0q6d65cqfw5d0xn9rwyn4ybhh3a8q2yaa8"; libraryHaskellDepends = [ base bytestring happstack-server mtl ]; description = "Simple, declarative, expressive URL routing -- on happstack"; license = stdenv.lib.licenses.bsd3; @@ -183823,7 +197355,7 @@ self: { mkDerivation { pname = "urlencoded"; version = "0.4.1"; - sha256 = "91431808fc26a7a9d2d18100c93c8b0a815de519e33547e8f60da9ed66976799"; + sha256 = "16b7jxkfva8dyvl4fdg337jmv08aicycj041s79ak9r6zh41hhwi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl network network-uri split ]; @@ -183840,7 +197372,7 @@ self: { mkDerivation { pname = "urlpath"; version = "5.0.0.1"; - sha256 = "03ee80654c36609bb82df91278ec081c3bb415b46f9bb54b9d76fc2fbd587ce3"; + sha256 = "1qvwb2yjzz3nkm5vb6vgnhav8fqw13n7h4pr5nw9nq1n9ijq1vh3"; libraryHaskellDepends = [ base exceptions mmorph monad-control monad-logger mtl path-extra resourcet transformers transformers-base @@ -183854,7 +197386,7 @@ self: { mkDerivation { pname = "urn"; version = "0.1.0.0"; - sha256 = "079adeb93b604e50f80f58344010510fd112721d5dae714ef2d47d5b08c1aff3"; + sha256 = "1wxgq445nzfly9773bjx3mr15l8ga4840d2q1zw50kk07fwxx6h7"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/pxqr/urn"; @@ -183863,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 @@ -183870,7 +197419,7 @@ self: { mkDerivation { pname = "urxml"; version = "0.2.0.0"; - sha256 = "89be4d77b9af70959f8778649378df005712a8eea3e65136c539ae8b61132b90"; + sha256 = "141b2dhqpbirqlv53rm3xsl14mq0vxw96r3qhygraw5gp5vlvgl9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183888,8 +197437,8 @@ self: { }: mkDerivation { pname = "usb"; - version = "1.3.0.4"; - sha256 = "ae7138bf09c72eb3144056c65aacc11c844cae49864735937e0426ddb9ccfdc7"; + version = "1.3.0.5"; + sha256 = "0r3v6w0nqcwz2vcaz0pdkfb8fs4ry2nlg9pfy77avv7mjwlvp7r1"; libraryHaskellDepends = [ base bindings-libusb bytestring containers ghc-prim text vector ]; @@ -183905,7 +197454,7 @@ self: { mkDerivation { pname = "usb-enumerator"; version = "0.3"; - sha256 = "da591186a1061b96e16829de7dfa18adb97f61e8b5859746410a33a8af18a1bd"; + sha256 = "1gd132pshcqa8539g1dmx1hpzfdd33x7vpi9d3hrc6q6l6312nfs"; libraryHaskellDepends = [ base base-unicode-symbols bindings-libusb iteratee monad-control transformers usb @@ -183920,9 +197469,9 @@ self: { mkDerivation { pname = "usb-hid"; version = "0.1.0.0"; - sha256 = "f0a5a13db5bfa121b4989ecf8232295d478ca231d17ea663622881997f70a457"; + sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh"; revision = "1"; - editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc"; + editedCabalFile = "1p780v435frqi04gc8db1jj1ra9c98jpdwmy4p274azp0gi51q9z"; libraryHaskellDepends = [ attoparsec base bytestring usb ]; homepage = "https://github.com/mapinguari/usb-hid"; description = "Parser and request Library for USB HIDs"; @@ -183937,7 +197486,7 @@ self: { mkDerivation { pname = "usb-id-database"; version = "0.4.0.9"; - sha256 = "4187f776f53c50423e1064753c0bf5446db871a6a4113ec8d970d24a5ffe26ca"; + sha256 = "1ji6zrglmlkhv743w4d4lrqvhva4yl5kqxb420z44l1wymvgg1s1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183956,7 +197505,7 @@ self: { mkDerivation { pname = "usb-iteratee"; version = "0.5"; - sha256 = "e11c0986019f12f8d962c6784607c1697140dce3d5dc32c232a411c1dd157b12"; + sha256 = "04kv2pfw24d46b135p6mwgf40wb9q43lcy66cbczh4lz0630j771"; libraryHaskellDepends = [ base base-unicode-symbols bindings-libusb iteratee monad-control usb vector @@ -183974,7 +197523,7 @@ self: { mkDerivation { pname = "usb-safe"; version = "0.14"; - sha256 = "d5fd06794cc283899818e4c0a7b198a68591154011744d6b238009478e3f1db6"; + sha256 = "1dhx7y74f2c04dmlsx0i80ar31d6k2qsgh7432c8k0y29iwhdzfm"; libraryHaskellDepends = [ base base-unicode-symbols bindings-libusb bytestring iteratee regions text transformers usb @@ -183992,7 +197541,7 @@ self: { mkDerivation { pname = "userid"; version = "0.1.2.8"; - sha256 = "b0b2718880dacfefbd7ded80e4fcd1d016a51e5ec638200b6cd5552f4f102124"; + sha256 = "0911217jymfmdh5j0f66bqgaa5nhs7yf907dgnyyzkysh2473cmh"; libraryHaskellDepends = [ aeson base boomerang safecopy web-routes web-routes-th ]; @@ -184006,7 +197555,9 @@ self: { mkDerivation { pname = "users"; version = "0.5.0.0"; - sha256 = "6761ac937b0d4c13c5158239a0c51199c394facb72cc734ada90a391f01e53d4"; + sha256 = "1m2k3vq938whv9577k3jrgx99hwr272s0fc22p2i6k0dgf9sqqb7"; + revision = "1"; + editedCabalFile = "1x26g7k6kmq2vng9y5qkz82z06rs322s2y8bs9y6r4vayvg07q9v"; libraryHaskellDepends = [ aeson base bcrypt path-pieces text time ]; @@ -184022,7 +197573,7 @@ self: { mkDerivation { pname = "users-mysql-haskell"; version = "0.5.2.0"; - sha256 = "a7f7a2d91860e2dc4594639776aaff06c981f01aaa356553c397d50a0f367930"; + sha256 = "0c3r6q7hmmcpqd9nadda3bq83j86zym7d5v3ji2xrqk033cs5xx7"; libraryHaskellDepends = [ base io-streams mysql-haskell text time transformers users uuid ]; @@ -184043,7 +197594,7 @@ self: { mkDerivation { pname = "users-persistent"; version = "0.5.0.2"; - sha256 = "f860936c9eaca82353979c70344576964319d241e3c74caf0a55cd3c9918944c"; + sha256 = "0k4l32ckrkam1aplriz38791jhwnfr2k8w4wjx9j7a5ckrn96q7q"; libraryHaskellDepends = [ base bytestring esqueleto mtl persistent persistent-template text time transformers users uuid @@ -184064,7 +197615,7 @@ self: { mkDerivation { pname = "users-postgresql-simple"; version = "0.5.0.2"; - sha256 = "051b5d2c9c6cdeaacb6271a50ee4084cc1473de8d873825dc6d98023e96ec100"; + sha256 = "0061dvlj706rqrfq4wyqx0ylghac13j0x9bicb5smpkckhn5s6q5"; libraryHaskellDepends = [ base bytestring mtl postgresql-simple text time users uuid ]; @@ -184079,7 +197630,7 @@ self: { mkDerivation { pname = "users-test"; version = "0.5.0.1"; - sha256 = "f68549fa0cc002b16dc55f23a73b1a423aa2e64ab584c4041252a3bb6a5cac3e"; + sha256 = "0gmcbimbp8sj282c915m9bka4fj238xsf8szqmnv20n01kx4k1gn"; libraryHaskellDepends = [ base hspec text users ]; homepage = "https://github.com/agrafix/users"; description = "Library to test backends for the users library"; @@ -184094,7 +197645,7 @@ self: { mkDerivation { pname = "utc"; version = "0.2.0.1"; - sha256 = "b0ecedcb32c552a4a5bcbc0d634b6b2dd1cc40a269edc4790d7082bda56cde6e"; + sha256 = "0vnydjjvv0kh1mww9vb9l90crl9ddd5n63dwpjjs8ln56b5yvv5h"; libraryHaskellDepends = [ attoparsec base bytestring clock exceptions text ]; @@ -184113,7 +197664,7 @@ self: { mkDerivation { pname = "utf8-env"; version = "0.1"; - sha256 = "f78bd3c06d545c5fa9b8ad8b86e7dc9d33f7c2d5601caf5aa82f8a6085a64253"; + sha256 = "0ls2ls2n12igm1day730sp1gfcwxvkkqd2xdp2lmyp2ldp0d72zp"; libraryHaskellDepends = [ base mtl utf8-string ]; description = "UTF-8 aware substitutes for functions in System.Environment"; license = stdenv.lib.licenses.bsd3; @@ -184124,7 +197675,7 @@ self: { mkDerivation { pname = "utf8-light"; version = "0.4.2"; - sha256 = "184c428ce7896d702da46f6f107e6873ff100dbc1af40b49b5ce87317e619e67"; + sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q"; libraryHaskellDepends = [ base bytestring ghc-prim ]; description = "Unicode"; license = stdenv.lib.licenses.bsd3; @@ -184135,7 +197686,7 @@ self: { mkDerivation { pname = "utf8-prelude"; version = "0.1.6"; - sha256 = "66170599fe057fb42b2577b6fe25d3ecf7c5f14455d3ac81015f00d58695d394"; + sha256 = "156kjn3da02z060srlsm8kqwbxzcscjzxdkp4lmv8zq5zscha5v6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utf8-string ]; @@ -184149,9 +197700,9 @@ self: { mkDerivation { pname = "utf8-string"; version = "1.0.1.1"; - sha256 = "fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140"; - revision = "1"; - editedCabalFile = "a351111265dd7d3a76113c938d4d3b0b2ba5b17e071f77e5a29fc86e91ee8396"; + sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv"; + revision = "2"; + editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; @@ -184162,8 +197713,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "utility-ht"; - version = "0.0.12"; - sha256 = "a4445f436354599c1f3e923dfb3e4463b6f65e7c1dabea1e2d34d11c4a5b05ef"; + version = "0.0.14"; + sha256 = "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; @@ -184175,7 +197726,7 @@ self: { mkDerivation { pname = "uu-cco"; version = "0.1.0.5"; - sha256 = "cd64659a673dbea93892d8e418ababdbe41e1b9abb1a6a662a091896a99e0c01"; + sha256 = "008ckslrc60959k6l6mvk8dixr6vmfmiir6qj8wakgixcyd6ar6d"; libraryHaskellDepends = [ ansi-terminal base ]; homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: core functionality"; @@ -184187,7 +197738,7 @@ self: { mkDerivation { pname = "uu-cco-examples"; version = "0.1.0.1"; - sha256 = "448012cc33c7c819f253f972002c4e55b25756c2d4884163a0500083176b11c5"; + sha256 = "1i8idcbq602hl1il326lq9b5gcjm9qn00wpragr1kj676g615024"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ]; @@ -184201,7 +197752,7 @@ self: { mkDerivation { pname = "uu-cco-hut-parsing"; version = "0.1.0.1"; - sha256 = "fd826e15a54388e323a2f3714d7aaf2c6b4df7449dddd7fe5f1ff8cd9c80ad19"; + sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px"; libraryHaskellDepends = [ base uu-cco uulib ]; homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: Feedback wrapper around parser in uulib"; @@ -184213,7 +197764,7 @@ self: { mkDerivation { pname = "uu-cco-uu-parsinglib"; version = "0.1.0.1"; - sha256 = "e1fc313c2c3cc24cbe4f85bee132c7daf5686f1d2c4450617ebd79b030b550eb"; + sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71"; libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ]; homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib"; @@ -184225,7 +197776,7 @@ self: { mkDerivation { pname = "uu-interleaved"; version = "0.2.0.0"; - sha256 = "3195ec570e94beb3b42d882940d9518bddb66ab6a27895d21a046769d055dae7"; + sha256 = "1rysap86jrq43b99ay52nrmbdpcba7cl0ac85nsb7gll1rbyr59i"; libraryHaskellDepends = [ base ]; homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Providing an interleaving combinator for use with applicative/alternative style implementations"; @@ -184239,7 +197790,7 @@ self: { mkDerivation { pname = "uu-options"; version = "0.2.0.0"; - sha256 = "46c6907807a5d8213047b7c3d43eadf086336d5154a61c7b6353e94ecdecf185"; + sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6"; libraryHaskellDepends = [ base lenses mtl template-haskell transformers uu-interleaved uu-parsinglib @@ -184255,7 +197806,7 @@ self: { mkDerivation { pname = "uu-parsinglib"; version = "2.9.1.1"; - sha256 = "d25f5ae36641136143c72b1d29f24d093cb07327d14a7518af90801e5d67bb6c"; + sha256 = "0v5vcxfix04hmwc7ajni4xrv0g099pr2j79bqx1n24s1cvimlpyj"; libraryHaskellDepends = [ base ListLike time uu-interleaved ]; homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators"; @@ -184267,7 +197818,7 @@ self: { mkDerivation { pname = "uu-tc"; version = "2015.1.1"; - sha256 = "8f82237e6fd473dd6702e22fb48b3f14ca6c9fe0fe2d4e1b0e1f6756e3d1a70f"; + sha256 = "03x7s7imcrqz1qdlwbgyw2gnrjhl7y5v8bz209kxswyldxz270lg"; libraryHaskellDepends = [ base ]; description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University"; license = stdenv.lib.licenses.bsd3; @@ -184280,7 +197831,7 @@ self: { mkDerivation { pname = "uuagc"; version = "0.9.52.1"; - sha256 = "98092b13cb32e4493e877c3752deed471db762f04e7d979be4e6e89065502185"; + sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184300,7 +197851,7 @@ self: { mkDerivation { pname = "uuagc-bootstrap"; version = "0.9.40.2"; - sha256 = "b83bcb9466026f1edaa396fd28efadff373066bb50a471a546fef42ffe454b7f"; + sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184323,7 +197874,7 @@ self: { mkDerivation { pname = "uuagc-cabal"; version = "1.0.6.0"; - sha256 = "dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b"; + sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w"; libraryHaskellDepends = [ base Cabal containers directory filepath mtl process uulib ]; @@ -184337,7 +197888,7 @@ self: { mkDerivation { pname = "uuagc-diagrams"; version = "0.1.1.0"; - sha256 = "bf5a6797c6127e71ec35900b3edc96f50957c2c376e4dbaa1a51f727d7244e9b"; + sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz"; libraryHaskellDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; @@ -184349,7 +197900,7 @@ self: { mkDerivation { pname = "uuagd"; version = "0.1.0.2"; - sha256 = "8aeaddb8286d15ce54b4e495829e49946629b785d8bd5b722d5d6488d6b79fbd"; + sha256 = "1gcznzb8hr2x5mr5pgfqhnvjjrll96g855g4niacw5bd52wdvsla"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-html ]; @@ -184368,7 +197919,9 @@ self: { mkDerivation { pname = "uuid"; version = "1.3.13"; - sha256 = "dfac808a7026217d018b408eab18facc6a85c6183be308d4ac7877e80599b027"; + sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z"; + revision = "1"; + editedCabalFile = "0yp01hzsw07d9ismqqkkzwqllfnyyhzhjmwhbhgmkb6v7y7iqrbm"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -184390,9 +197943,9 @@ self: { mkDerivation { pname = "uuid-aeson"; version = "0.1.0.0"; - sha256 = "cf8bdb82959d249ced20dff22935bd2ea79b1869267a95ebcacc7f0452eda259"; + sha256 = "0nd2xm908zycrbmrayi6d4c9p9rfplsjkwnz43nrq94xjn1dp2yg"; revision = "1"; - editedCabalFile = "5fe65c563ef474292cf59cda8e36416dd75a60a05fc1fb8be43a0bd2eba1d814"; + editedCabalFile = "056ql7mx42rswj5zphazl1h5mmvd84v8xnlwyln2jx7l7rb5rrjz"; libraryHaskellDepends = [ aeson base text uuid ]; description = "Aeson types for UUID instances"; license = stdenv.lib.licenses.bsd3; @@ -184403,7 +197956,7 @@ self: { mkDerivation { pname = "uuid-le"; version = "0.2014.1"; - sha256 = "e45cfed1a7cf0f42074700896ec6e5362ca0721822b7d1898565895cfb3ad5bd"; + sha256 = "1gfm7bxmr2b5hn4x3dr231ra0b1nwp36x2808w3l43yglz8zwp74"; libraryHaskellDepends = [ base bytestring uuid ]; description = "Universally Unique Identifiers with little-endian-ish encoding tools"; license = stdenv.lib.licenses.mit; @@ -184416,7 +197969,7 @@ self: { mkDerivation { pname = "uuid-orphans"; version = "1.4.1"; - sha256 = "3261ff63bc6d4dd8365272b16e02801b48a14c5ac46cd46428ef169b4d7c1da6"; + sha256 = "19hxgi6rn5pg51jd8v64b96a2j0vh016xcbja8vdhkbdpiizyq9j"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -184429,7 +197982,7 @@ self: { mkDerivation { pname = "uuid-quasi"; version = "0.1.0.1"; - sha256 = "f28a1c03cf1641f2be9b26f20ca5b6606117bc1f14c3d7955558d92fe4b23226"; + sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj"; libraryHaskellDepends = [ base template-haskell uuid ]; homepage = "http://github.com/lpeterse/uuid-quasi"; description = "Supplemental package for 'uuid' allowing quasiquotation"; @@ -184444,9 +197997,9 @@ self: { mkDerivation { pname = "uuid-types"; version = "1.0.3"; - sha256 = "9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd"; + sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj"; revision = "1"; - editedCabalFile = "01887ed945e74c3c361b00700bd9aeead37d1124d39c0d4f190f89fb0e909c47"; + editedCabalFile = "0iwwj07gp28g357hv76k4h8pvlzamvchnw003cv3qk778pcpx201"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random text ]; @@ -184466,7 +198019,7 @@ self: { mkDerivation { pname = "uulib"; version = "0.9.22"; - sha256 = "cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad"; + sha256 = "1b9in4xbyi518iix5ln765z99q8prdw6p6lx5dz3ckl36dfs3l6d"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/UU-ComputerScience/uulib"; description = "Haskell Utrecht Tools Library"; @@ -184478,9 +198031,9 @@ self: { mkDerivation { pname = "uvector"; version = "0.1.1.1"; - sha256 = "08c42d9a31df299c2aa8e0e21e2c1077fc3bf9e755449b3243225b20b06e4bdf"; + sha256 = "1psbdsq20nr28cr9ni2mwzwkpz3p20n1xqp0m0m9qafz66d2vi08"; revision = "1"; - editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508"; + editedCabalFile = "023may02r17xg5wqh0lplcjdfiwaprbqn9p6jgmqs935qf9zz2g2"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "http://code.haskell.org/~dons/code/uvector"; description = "Fast unboxed arrays with a flexible interface"; @@ -184493,7 +198046,7 @@ self: { mkDerivation { pname = "uvector-algorithms"; version = "0.2"; - sha256 = "01411922955d572c2fb44cd3c465769507bf7dff424c01e0c0f99dac728ef44b"; + sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81"; libraryHaskellDepends = [ base uvector ]; homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for uvector unboxed arrays"; @@ -184506,7 +198059,7 @@ self: { mkDerivation { pname = "uxadt"; version = "0.0.16.0"; - sha256 = "833496d8e31b16939c187ff3c68b12546dc91d72597126d0104a96c7c92cb762"; + sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43"; libraryHaskellDepends = [ base json MissingH mtl ]; description = "Cross-language extensible representation for algebraic data type instances"; license = stdenv.lib.licenses.gpl3; @@ -184517,7 +198070,7 @@ self: { mkDerivation { pname = "uzbl-with-source"; version = "0.1.0.0"; - sha256 = "8a262a20f5a376572d3ec152890384a4babbec729ab7d7e64b03a987270ad660"; + sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la"; libraryHaskellDepends = [ base process ]; homepage = "http://github.com/Fuuzetsu/uzbl-with-source"; description = "Utility function for reading a source of loaded uzbl pages"; @@ -184531,7 +198084,7 @@ self: { mkDerivation { pname = "v4l2"; version = "0.1.0.3"; - sha256 = "f7e99865dca5420f64a96a953e683e3b5ff3095069db77c1f733b04825bd0dc2"; + sha256 = "1hhdpljlic1kyz0pgnv9a04z6prv7rl3x5bam5j0yhm5vijrisgp"; libraryHaskellDepends = [ base bindings-DSL bindings-libv4l2 bindings-linux-videodev2 bindings-posix containers ioctl @@ -184547,7 +198100,7 @@ self: { mkDerivation { pname = "v4l2-examples"; version = "0.1.0.2"; - sha256 = "858688aadb1a80b415dde721704120c406739ec3f0201793d53bccbd1723d6ce"; + sha256 = "1knn4cbvvk1vsn9if87hqfg761n4410p08g7vlav900svfm8i1l5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT v4l2 ]; @@ -184562,7 +198115,7 @@ self: { mkDerivation { pname = "vacuum"; version = "2.2.0.0"; - sha256 = "c15be102d2e4dbf8d289f7811b281e5126cb4e001d41435d33d07da84597fc94"; + sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1"; libraryHaskellDepends = [ array base containers ghc-prim ]; homepage = "http://thoughtpolice.github.com/vacuum"; description = "Graph representation of the GHC heap"; @@ -184577,7 +198130,7 @@ self: { mkDerivation { pname = "vacuum-cairo"; version = "0.5"; - sha256 = "8c538f56a2313bc08911ce81e86d532786d0b972f1a4d5c7632f220183ede34a"; + sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc"; libraryHaskellDepends = [ base cairo deepseq directory gtk pretty process strict-concurrency svgcairo vacuum @@ -184593,7 +198146,7 @@ self: { mkDerivation { pname = "vacuum-graphviz"; version = "2.1.0.1"; - sha256 = "552c33f48aa2046caf4853ef84b16c14a33e33286d8d695df4cf2830ac516b24"; + sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m"; libraryHaskellDepends = [ base filepath graphviz vacuum ]; description = "A library for transforming vacuum graphs into GraphViz output"; license = stdenv.lib.licenses.lgpl3; @@ -184607,7 +198160,7 @@ self: { mkDerivation { pname = "vacuum-opengl"; version = "0.0.3"; - sha256 = "f2fc00d6572c3d768a38daa6d377c242071593b8f60545e23e2b15b7ae1abcb7"; + sha256 = "1dxw3apbf59b7vi4a1gnp29ia1s2q9vx79ns7257cg9cazb01z7j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network pretty vacuum ]; @@ -184626,7 +198179,7 @@ self: { mkDerivation { pname = "vacuum-ubigraph"; version = "0.2.0.2"; - sha256 = "3f188444086aac662a5e833b490f10a64d4c0939c7379e5b1be688dc0479ea7e"; + sha256 = "0zpag42dr2763ddrwdy7744lqkd6207ljfw3bqm6db3a1128861z"; libraryHaskellDepends = [ base containers hubigraph vacuum ]; description = "Visualize Haskell data structures using vacuum and Ubigraph"; license = stdenv.lib.licenses.bsd3; @@ -184640,7 +198193,7 @@ self: { mkDerivation { pname = "vado"; version = "0.0.8"; - sha256 = "bb085062b807c08adc3bed2c0e736d4f888bd15a85e1d3d2babf4e6e25acc256"; + sha256 = "0mn2mhjnwkmzpb9d7qc5bb8qp22gdmrhwb7d7gf8mh07p1i5025v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184662,7 +198215,7 @@ self: { mkDerivation { pname = "valid-names"; version = "0.1.0.1"; - sha256 = "e850ddb908aa6d712acf2cbf695985eae069a2c1f7897782b775cf75cd9af791"; + sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78"; libraryHaskellDepends = [ base containers MonadRandom ]; homepage = "https://i.joelt.io/symbols.html"; description = "Valid operator/module characters"; @@ -184675,7 +198228,7 @@ self: { mkDerivation { pname = "validate"; version = "2.0.0"; - sha256 = "97d0b101d796a43e853be666faaf78bf7fca36d18cd64cf31de7754f9716a0a5"; + sha256 = "19d02sblyxg73prlrmlcs4vclzxzg2pzlrp67f2kx94nsw0v3l4p"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -184688,7 +198241,7 @@ self: { mkDerivation { pname = "validate-input"; version = "0.4.0.0"; - sha256 = "20fae24b17429df923b835968720b76c581dc2c5037a2df9374b98a3fa41a1f9"; + sha256 = "1yd187xa762b6zwjsyh3qp11sn3cnwh8g5imp0izk7a22x5y5yi0"; libraryHaskellDepends = [ base bytestring either mtl pcre-heavy semigroups string-conversions text @@ -184704,7 +198257,7 @@ self: { mkDerivation { pname = "validated-literals"; version = "0.2.0"; - sha256 = "020b42ae331ee77c24402210c2715088b3b6084234b20a17eeacba27b66fa471"; + sha256 = "0wd4dyv2gfmcxqbhmcil884bdcw8a1qw441280j7rrqy6fp442q2"; libraryHaskellDepends = [ base bytestring template-haskell ]; homepage = "https://github.com/merijn/validated-literals"; description = "Compile-time checking for partial smart-constructors"; @@ -184712,6 +198265,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "validated-types" = callPackage + ({ mkDerivation, base, refined, text }: + mkDerivation { + pname = "validated-types"; + version = "0.1.1"; + sha256 = "05rxb1i46icjzsjmik97jzxn3vkg3mpvwhprifz1ilsc0s46dv9q"; + libraryHaskellDepends = [ base refined text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/seanhess/validated-types#readme"; + description = "Type-level constraints on strings and other input"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "validation" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath , lens, mtl, QuickCheck, semigroupoids, semigroups @@ -184720,7 +198286,7 @@ self: { mkDerivation { pname = "validation"; version = "0.5.4"; - sha256 = "8b785f5d9e35285b2fbc35039799410bf3a9c7179735c232e573485cb98f74a3"; + sha256 = "18vliywmqj3kwlrc4dcp2z3skwqb86crf0rmphpmna1mkrfmyy4b"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; @@ -184740,7 +198306,7 @@ self: { mkDerivation { pname = "validations"; version = "0.1.0.2"; - sha256 = "93b72915af9088955403a11e7c01b9dc58d156657932bfc4a5f1520baef7715b"; + sha256 = "0nviyyp0nlpilp2byckrcmbd2n6wp40pq7m10da9b24hmwajkdwk"; libraryHaskellDepends = [ base containers digestive-functors mtl text transformers ]; @@ -184755,12 +198321,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "validationt" = callPackage + ({ mkDerivation, aeson, base, containers, exceptions, lens + , monad-control, mtl, QuickCheck, text, transformers + , transformers-base, transformers-lift, vector + }: + mkDerivation { + pname = "validationt"; + version = "0.2.0.0"; + sha256 = "0gsi7mk958fvdydir55y6zqab5vfm3k3j54vxqr5dr51zznmqriy"; + libraryHaskellDepends = [ + aeson base containers exceptions lens monad-control mtl QuickCheck + text transformers transformers-base transformers-lift vector + ]; + homepage = "typeable.io"; + description = "Straightforward validation monad. Convenient solution for validating web forms and APIs."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "validity" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.3.2.0"; - sha256 = "e6ac32bfc76284be81817098be5192d91aac84ff9985b26ecd41a0cded54729e"; + version = "0.3.3.0"; + sha256 = "1cayhhycmfj9ri2k8j4ndbqxv67w9ibf9v44w8lfkwp2zm8my5zz"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -184771,8 +198355,8 @@ self: { ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.1.0.0"; - sha256 = "1322e47ffd6e192b9b322799c8fd8218e3de07274b5263cbd503f280f1a5d9a3"; + version = "0.1.0.1"; + sha256 = "1kz998gjia77xqkgp5xisn0gp7wrp9c1s8wvhnmmajn5i4nxakmw"; libraryHaskellDepends = [ base bytestring validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for bytestring"; @@ -184783,8 +198367,8 @@ self: { ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.1.0.2"; - sha256 = "22f2084de274b01e0d0dc42fc609b651b979e899123b84a8702a2fca61468cdd"; + version = "0.1.0.3"; + sha256 = "13s595d67mdv0238v0zr2ar2r379fdxsibyc05vxnz54km108wdd"; libraryHaskellDepends = [ base containers validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for containers"; @@ -184795,8 +198379,8 @@ self: { ({ mkDerivation, base, filepath, path, validity }: mkDerivation { pname = "validity-path"; - version = "0.1.0.0"; - sha256 = "cb93616b60ba80dc051474f8dd0a67c605d4388a316561b29bf0d56117fb32e0"; + version = "0.1.0.1"; + sha256 = "0mqfcy28fwawnz85k29h47xr660q8q6h48lp5likx5dxw42p5l0z"; libraryHaskellDepends = [ base filepath path validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for Path"; @@ -184807,8 +198391,8 @@ self: { ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; - version = "0.1.2.0"; - sha256 = "f08e3a0f3ebdfe57419dfc6eef7e119d2a6ce7b8d0948297384c73ad8de0913f"; + version = "0.1.2.1"; + sha256 = "06wxqf283fy9i89pk0gg7b8bf89q0lvac8qys0wc9lygr4hqbmar"; libraryHaskellDepends = [ base bytestring text validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; @@ -184819,8 +198403,10 @@ self: { ({ mkDerivation, base, time, validity }: mkDerivation { pname = "validity-time"; - version = "0.0.0.0"; - sha256 = "4c061a1c238c846e2e6e9838355c9a340ffc6080fb9185b18fb3c8667178af3d"; + version = "0.0.0.1"; + sha256 = "0sdvqplgp57f04d54njyabp20fmrpa23jkx1mx3k0cj1aywpap8p"; + revision = "1"; + editedCabalFile = "1w7sjxsrjf3mfnssnvfvn2qbhg9j520cfxcn2m9gawrb4h20rwm9"; libraryHaskellDepends = [ base time validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for time"; @@ -184832,7 +198418,7 @@ self: { mkDerivation { pname = "value-supply"; version = "0.6"; - sha256 = "6555ab70c48b28f1ca383b5198daab5ef18f87039ea7dc5c6dab3d6dc8cca639"; + sha256 = "0fd6rk46sgdbdmfdr9wy0f3qzwaymgd9hl9v735g2a4bqiqanmb5"; libraryHaskellDepends = [ base ]; description = "A library for generating values without having to thread state"; license = stdenv.lib.licenses.bsd3; @@ -184845,7 +198431,7 @@ self: { mkDerivation { pname = "vampire"; version = "0.1.3.0"; - sha256 = "3858dda568d5967ad2f53ef8140350d4b42171b8c3fd3c2e93af39ef75abc199"; + sha256 = "16f1mdsyyfdgjcp3rzf3p1qj3d6la01i9y1yyp97m5nmd2jxsn1q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184868,7 +198454,7 @@ self: { mkDerivation { pname = "var"; version = "0.2.0.0"; - sha256 = "51ec39cb631e3a73bfbd6d6027fd6379a74658a3c853242509feef8abc3783ed"; + sha256 = "1vc36yy8mvzy14jj8ly8ldc4d9vrcgyjfq3dpnzp6fhycg5kkv2i"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -184887,7 +198473,7 @@ self: { mkDerivation { pname = "varan"; version = "0.5.1"; - sha256 = "e28ccaf370237435e165a770d5cf4de7a09dcfc58d6fd409b38c53c025e977c3"; + sha256 = "1hvpx4jw0lwcnc4x8vwdqp7rv8779p7xaw57cphkax13f3rwm372"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -184905,7 +198491,7 @@ self: { mkDerivation { pname = "variable-precision"; version = "0.4"; - sha256 = "c4940b4ce1f70abb3da927d32ca9acde779c91559eb4747718d619f096ada6e1"; + sha256 = "1qd6mnbg06fn31vp9d4yan8rqxyymjljrlr7m4yvn2ppw560p564"; libraryHaskellDepends = [ base complex-generic floatshow integer-gmp type-level-natural-number @@ -184921,7 +198507,7 @@ self: { mkDerivation { pname = "variables"; version = "0.1.1"; - sha256 = "3787a5c18d56a0b2f06a93bee1be5f38ba49b3252bf653b9b81087507bed593d"; + sha256 = "0garxmxm11qhp2wm7xib4nrlkfiqbyzf3glkdbqb582nip0sb1rp"; libraryHaskellDepends = [ base mtl stm ]; testHaskellDepends = [ base hspec mtl QuickCheck stm ]; homepage = "https://github.com/prophile/variables"; @@ -184930,6 +198516,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "variation" = callPackage + ({ mkDerivation, base, cereal, containers, deepseq, semigroupoids + }: + mkDerivation { + pname = "variation"; + version = "0.1.1.0"; + sha256 = "05wkjr3sd4r3bid4n18qiblc8jvpzzdkh74f7qh3q1lfx8yv2133"; + libraryHaskellDepends = [ + base cereal containers deepseq semigroupoids + ]; + description = "nominal value with possible variations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "varying" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, time , transformers @@ -184937,7 +198537,7 @@ self: { mkDerivation { pname = "varying"; version = "0.7.0.3"; - sha256 = "6cd417fad6b30d8f9bd5a01dd21d059ecbc26cd1faf27bb7973eea43b5640309"; + sha256 = "0283cjsl7siyjyvppwpss5nc5jwy0lfx47d0sndqy3dksvx1gm3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base transformers ]; @@ -184954,8 +198554,8 @@ self: { }: mkDerivation { pname = "vault"; - version = "0.3.0.6"; - sha256 = "0b433de60fa3d20e93dce6013293e18089fb3233c34211ffa3f860408866ef48"; + version = "0.3.0.7"; + sha256 = "1w36ldr5iv0yiqbvibm7b1c66hf1ps5rbassz348zmi113d8k4cy"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -184971,7 +198571,7 @@ self: { mkDerivation { pname = "vault-tool"; version = "0.0.0.1"; - sha256 = "6be3b3e15e2e7dcd968f5ff3d6b72ba418ff60b70f1eb2669f10f8827537f8e8"; + sha256 = "1s7q6xsq5y0hkxkb47hgnxhgy6545fvxdwsziybcsz9fbvhv7qvb"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types text unordered-containers @@ -184988,7 +198588,7 @@ self: { mkDerivation { pname = "vault-tool-server"; version = "0.0.0.1"; - sha256 = "cde6fc62398c4656f4a17e4f3db875acd927069b1b32a7a2c8316c819495f50d"; + sha256 = "03gmjna82v1ir2iafchvkc32gndcfnw3skvyl7s5cilc75igrrnd"; libraryHaskellDepends = [ aeson async base bytestring filepath http-client process temporary text vault-tool @@ -185011,7 +198611,7 @@ self: { mkDerivation { pname = "vaultaire-common"; version = "2.9.1"; - sha256 = "594376c0efb6fa7f8110953ab90512c82afacf035a751412595e99d95980149d"; + sha256 = "178lh1cxk6ayb4918xas0g7zlan8282vjflm220pzymnxz07chsr"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring cereal containers hashable hslogger locators old-locale packer QuickCheck siphash @@ -185033,7 +198633,7 @@ self: { mkDerivation { pname = "vcache"; version = "0.2.6"; - sha256 = "0d05456f0c721a2342edc6eec79ebbe6b9ef1723ff5fa3002c557dd80c086f23"; + sha256 = "08vg106dhzam5h0a6pzz4cbyzfg6pfgcgvn6xm1266kj1ipla18d"; libraryHaskellDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -185050,7 +198650,7 @@ self: { mkDerivation { pname = "vcache-trie"; version = "0.2.4"; - sha256 = "051ea7db60c1e414f4dd7f8a6451d88b926484a7a0858579631df0844b89aeee"; + sha256 = "1vmfi55q9w0xcdwqb1d0ly2694lbv18n92kzvps19r61c3dsf7h5"; libraryHaskellDepends = [ array base bytestring bytestring-builder vcache ]; @@ -185064,7 +198664,7 @@ self: { mkDerivation { pname = "vcard"; version = "0.1.4"; - sha256 = "d7841a2a57250e0b8b110999e3e08bb6d09852826e18a7c4c175fac35dbb41f1"; + sha256 = "1wa1pdfw7ykmq72af63fh999il5nighf7689265hn3i5awm1m16p"; libraryHaskellDepends = [ base bytestring containers mime-directory ]; @@ -185078,7 +198678,7 @@ self: { mkDerivation { pname = "vcatt"; version = "0.1"; - sha256 = "112d3f025c34de3c56c4da8b8ab12699821171d7c5ef2d38b2b8f4e1af693e98"; + sha256 = "161yd6py3x5qn8w2vvy5sxqi30lr4sqqm2ysqib3rpilbh13yb8i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra shelly system-filepath ]; @@ -185094,7 +198694,7 @@ self: { mkDerivation { pname = "vcd"; version = "0.2.2"; - sha256 = "f5c35f0d290a69eea9178977a5c7f5a2d91d9cea9c95e96407f6c34729ac1a74"; + sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm"; libraryHaskellDepends = [ base polyparse ]; homepage = "http://tomahawkins.org"; description = "Reading and writing VCD files"; @@ -185106,7 +198706,7 @@ self: { mkDerivation { pname = "vcs-revision"; version = "0.0.2"; - sha256 = "8f95b7b3c72db43e79bdc82ee0cc8db439ecfc038a9edfab8df3584088e3e1d2"; + sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg"; libraryHaskellDepends = [ base process ]; description = "Facilities for accessing the version control revision of the current directory"; license = stdenv.lib.licenses.bsd3; @@ -185117,7 +198717,7 @@ self: { mkDerivation { pname = "vcs-web-hook-parse"; version = "0.2.0.0"; - sha256 = "db8293f8edabf50787d0290c15fe1971abdc9104c8e2e561757671993f23950a"; + sha256 = "02lm4czrjwbnfmhybqn80j8xravi37z1a319s23hgxdbxpw970nv"; libraryHaskellDepends = [ aeson base bytestring text ]; homepage = "http://rel4tion.org/projects/vcs-web-hook-parse/"; description = "Parse development platform web hook messages"; @@ -185131,7 +198731,7 @@ self: { mkDerivation { pname = "vcsgui"; version = "0.2.1.2"; - sha256 = "e58fc0156b8badcb5ee74c81e2c75a1f3e4a047d3154f356ba833e1cb58dc5e1"; + sha256 = "1qf5insiqgl3p9bg6m1igl24lghzbb3y50acwxgcpbcbdcaw13z5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185155,7 +198755,7 @@ self: { mkDerivation { pname = "vcswrapper"; version = "0.1.5"; - sha256 = "56584523ecd4c40a58345e0fcfc66a8aba4cfcdf49c8b1269d767f3b82b1f17b"; + sha256 = "0yzin613nzvnklkb3j29vzy4rfladb3cy3sy6ic0mi6lxhilan2n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185176,7 +198776,7 @@ self: { mkDerivation { pname = "vect"; version = "0.4.7"; - sha256 = "8d38e4f2face37aaf241639af422fd1a3be569d3aad4f227f3d6759611948980"; + sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d"; libraryHaskellDepends = [ base random ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "A low-dimensional linear algebra library, tailored to computer graphics"; @@ -185188,7 +198788,7 @@ self: { mkDerivation { pname = "vect-floating"; version = "0.1.0.4"; - sha256 = "8f6050d788e03dd53fbdd2cc472f1aba90e6443effa4f23b98275e8ca396bacf"; + sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g"; libraryHaskellDepends = [ base random ]; homepage = "http://github.com/cpdurham/vect-floating"; description = "A low-dimensional linear algebra library, operating on the Floating typeclass"; @@ -185201,9 +198801,9 @@ self: { mkDerivation { pname = "vect-floating-accelerate"; version = "0.1.0.4"; - sha256 = "9de872bcce865c2455988a807bbb29b09f09463786b1c3f29124dc79f713b682"; + sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x"; revision = "1"; - editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216"; + editedCabalFile = "05k20xd7rcf3hypbbw53bv8yl65sgpdawdfmskypk3mbl1w5fymg"; libraryHaskellDepends = [ accelerate base vect-floating ]; homepage = "http://github.com/cpdurham/vect-floating-accelerate"; description = "Accelerate instances for vect-floating types"; @@ -185216,7 +198816,7 @@ self: { mkDerivation { pname = "vect-opengl"; version = "0.4.6.1"; - sha256 = "2fb6809c27528cc2e131820229c3ea3138a90bc3f1b41b8e66b2d1b78c44e9e2"; + sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig"; libraryHaskellDepends = [ base OpenGL vect ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for the `vect' low-dimensional linear algebra library"; @@ -185229,7 +198829,7 @@ self: { mkDerivation { pname = "vector"; version = "0.10.9.3"; - sha256 = "bdcd541262bc538fa43c9b3ea2dd8c1c2cd5ac7bb9efa909a8d558753678b422"; + sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; @@ -185245,9 +198845,9 @@ self: { mkDerivation { pname = "vector"; version = "0.11.0.0"; - sha256 = "0a5320ed44c3f2b04b7f61e0f63f4fcd5b337524e601e01d5813ace3f5a432e4"; + sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa"; revision = "2"; - editedCabalFile = "2bfafd758ab4d80fa7a16b0a650aff60fb1be109728bed6ede144baf1f744ace"; + editedCabalFile = "1kjafhgsyjqlvrpfv2vj17hipyv0zw56a2kbl6khzn5li9szvyib"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base QuickCheck random template-haskell test-framework @@ -185258,15 +198858,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector_0_12_0_0" = callPackage + "vector_0_12_0_1" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive , QuickCheck, random, template-haskell, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "vector"; - version = "0.12.0.0"; - sha256 = "27bf375d0efbff61acaeb75a2047afcbdac930191069a59da4a474b9bf80ec95"; + version = "0.12.0.1"; + sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i"; + revision = "1"; + editedCabalFile = "1xjv8876kx9vh86w718vdaaai40pwnsiw8368c5h88ch8iqq10qb"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base HUnit QuickCheck random template-haskell test-framework @@ -185285,9 +198887,9 @@ self: { mkDerivation { pname = "vector-algorithms"; version = "0.7.0.1"; - sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070"; + sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd"; revision = "1"; - editedCabalFile = "82d67db49c85c1e136b6e6e44f99c908b405628a17b0d220c95aed34845426a5"; + editedCabalFile = "1996aj239vasr4hd5c0pi9i0bd08r6clzr76nqvf3hc5kjs7vml2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring primitive vector ]; @@ -185304,7 +198906,7 @@ self: { mkDerivation { pname = "vector-binary"; version = "0.1.1"; - sha256 = "ffabf5a6bf52cffa978da5d29490f158408853b65035ae3605ca713fe08ab2e1"; + sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz"; libraryHaskellDepends = [ base binary vector ]; homepage = "https://github.com/kawu/vector-binary"; description = "Binary instances for vector types (deprecated)"; @@ -185317,8 +198919,8 @@ self: { }: mkDerivation { pname = "vector-binary-instances"; - version = "0.2.3.4"; - sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00"; + version = "0.2.3.5"; + sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -185334,7 +198936,7 @@ self: { mkDerivation { pname = "vector-buffer"; version = "0.4.1"; - sha256 = "9b5a9b57488267a765d9e7a8f2aa387ee0d3153989c169952da1e1229a60fd9b"; + sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv"; libraryHaskellDepends = [ base deepseq vector ]; description = "A buffer compatible with Data.Vector.*"; license = stdenv.lib.licenses.bsd3; @@ -185346,8 +198948,8 @@ self: { }: mkDerivation { pname = "vector-builder"; - version = "0.3"; - sha256 = "6041b4a9b05c8d39c67cb4bedcf1192a33babda444f2ec64b24598874db45ec0"; + version = "0.3.1"; + sha256 = "1l6sfgd2s107zkp1qd1w6jdjcbznp31769qf99pxar087f697wvp"; libraryHaskellDepends = [ base base-prelude semigroups vector ]; testHaskellDepends = [ quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck @@ -185362,7 +198964,7 @@ self: { mkDerivation { pname = "vector-bytes-instances"; version = "0.1"; - sha256 = "eab90f20312299512d2c919a30a16568813be651f5de768e1e225c8634d2baae"; + sha256 = "1bmss8s8cp123s77dppma7k3p0b8cnhk16li5hnm369264h0zfga"; libraryHaskellDepends = [ base bytes vector ]; testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ]; homepage = "https://github.com/k0001/vector-bytes-instances"; @@ -185377,7 +198979,7 @@ self: { mkDerivation { pname = "vector-bytestring"; version = "0.0.0.1"; - sha256 = "641eef86c91a0c742d74c1ea0f29ca69d9105379296ad622cb5f991142d53376"; + sha256 = "0xiksm1136azrcidcsi9g59i1nb9r8lhzsn1fhnp830sr63fy7k4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185398,7 +199000,7 @@ self: { mkDerivation { pname = "vector-clock"; version = "0.2.2"; - sha256 = "499894210f44613f8f8233eddf6a3e13b630738eb4c3dd942692e5607811b759"; + sha256 = "0ndp25w61rcj4sadvhxlirrk1dhk7rmdzv9kha7kyqa41whr9629"; libraryHaskellDepends = [ base binary ghc-prim hashable ]; testHaskellDepends = [ array base binary ghc-prim HUnit QuickCheck test-framework @@ -185418,7 +199020,7 @@ self: { mkDerivation { pname = "vector-conduit"; version = "0.5.0.0"; - sha256 = "e119a64b708bd9a96faf2aeee55dab7a004ca30ac16c1d81eb8fe18f5dafb882"; + sha256 = "10mqmxfqzqcgxf0isv611ailq03smdfybviamxpskncbf15sc6g1"; libraryHaskellDepends = [ base conduit primitive vector ]; testHaskellDepends = [ base conduit HUnit primitive QuickCheck test-framework @@ -185433,8 +199035,8 @@ self: { ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; - version = "0.1.3.7"; - sha256 = "e3c21826d6bfb45c82a6c5a972b060f33b4feab3c9e6f389251208daaa7f8176"; + version = "0.1.3.8"; + sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ fftw ]; homepage = "http://hackage.haskell.org/package/vector-fftw"; @@ -185448,7 +199050,7 @@ self: { mkDerivation { pname = "vector-functorlazy"; version = "0.0.1"; - sha256 = "03300f28129c9491790be6be4be4bc9dbd0563f2eb9604e62ac7f05edc60517b"; + sha256 = "0ysic3f5xw675bk095pby9ihbgcxpkj4pgp61dwr354w28l0yc03"; libraryHaskellDepends = [ base ghc-prim primitive vector vector-th-unbox ]; @@ -185463,7 +199065,7 @@ self: { mkDerivation { pname = "vector-heterogenous"; version = "0.2.0"; - sha256 = "54aa1594444de8adb9d9309ccc13fd1a2f6d256ebbfa06e5e297209285c46093"; + sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl"; libraryHaskellDepends = [ base vector ]; homepage = "http://github.com/mikeizbicki/vector-heterogenous/"; description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints"; @@ -185478,7 +199080,7 @@ self: { mkDerivation { pname = "vector-instances"; version = "3.4"; - sha256 = "1b0246ef0cf8372d61d5c7840d857f49299af2304b5107510377255ed4dd5381"; + sha256 = "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv"; libraryHaskellDepends = [ base comonad hashable keys pointed semigroupoids semigroups vector ]; @@ -185492,7 +199094,7 @@ self: { mkDerivation { pname = "vector-instances-collections"; version = "0.1.0.1"; - sha256 = "1a44b8349b49e330febb050fea158131c7f13491d5813f466dd566de7814b38f"; + sha256 = "13xk2iwdwrnmdm33z0fmj4sg3irih4ayl3q5pgz31qs9kcsbhi0s"; libraryHaskellDepends = [ base collections-api template-haskell vector ]; @@ -185503,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 = "b93e701bdd2a6d21df1f808b002a7f0824cb5ba78b8990bcb51d067998fc0c0e"; + 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; @@ -185519,9 +199124,9 @@ self: { mkDerivation { pname = "vector-random"; version = "0.2"; - sha256 = "6bb735a7bf2c81ac75029499bc160d22f4a2a721ab6bf23ae26cd5a217c1e4b8"; + sha256 = "1f74q4bs5mbcw8xg4sxb46ks5x121lbbr6cl09ssr09cpykkbdvb"; revision = "2"; - editedCabalFile = "de331a5826345df371a52a3b130f1f608611f564dee5e82a4cb561482e4d447b"; + editedCabalFile = "0ys49lp4hqdm9hmfirfycksi31k03w7i6fralmqz6p9l4rc1lcyy"; libraryHaskellDepends = [ base mersenne-random-pure64 vector ]; homepage = "http://code.haskell.org/~dons/code/vector-random"; description = "Generate vectors filled with high quality pseudorandom numbers"; @@ -185534,7 +199139,7 @@ self: { mkDerivation { pname = "vector-read-instances"; version = "0.0.2.0"; - sha256 = "66af9d1e4752840e0f7a1b1c2bab73615151fa02e1ee737c774d9b0071b160cc"; + sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6"; libraryHaskellDepends = [ base vector ]; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "(deprecated) Read instances for 'Data.Vector'"; @@ -185547,7 +199152,7 @@ self: { mkDerivation { pname = "vector-sized"; version = "0.5.1.0"; - sha256 = "2116bd082413e6b3ceb2290ac7d3aa2affcbfc76c7bebe22fbbf58e562369ae5"; + sha256 = "1rcs6rifan5zzcibxgn7fvycpzramb9wf2i9nb7b7rhk4h4bs5i1"; libraryHaskellDepends = [ base deepseq finite-typelits vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -185559,7 +199164,7 @@ self: { mkDerivation { pname = "vector-space"; version = "0.10.4"; - sha256 = "b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2"; + sha256 = "18pxpvf6rx0qbx5whshxq61pgj1njs5d0vpmjbjxkcbmqsgwq4mp"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -185570,7 +199175,7 @@ self: { mkDerivation { pname = "vector-space-map"; version = "0.2.0"; - sha256 = "ceec244a880e7abba75dd9c3324f6a6421a085ff270b30480455a30883c95424"; + sha256 = "092lr61hi8sm0i4302r7zy2s08b4d97k5hyrbnkvnyhfi1529v6f"; libraryHaskellDepends = [ base containers vector-space ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/conklech/vector-space-map"; @@ -185585,7 +199190,7 @@ self: { mkDerivation { pname = "vector-space-opengl"; version = "0.2"; - sha256 = "5c45df48192075c34f2cc3318cc9282f9e3a8aefccad934d827445599bfa2c9f"; + sha256 = "17rczadmjiblh96r7bfcxy53m7ig534qqcf35i7w6x90354dyiaw"; libraryHaskellDepends = [ base OpenGL vector-space ]; testHaskellDepends = [ base ieee754 OpenGL QuickCheck test-framework @@ -185601,7 +199206,7 @@ self: { mkDerivation { pname = "vector-space-points"; version = "0.2.1.2"; - sha256 = "feead3c4e82d25b0ef3a64af93e01ac377083adb7f755c2360417838d6f1114b"; + sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -185614,7 +199219,7 @@ self: { mkDerivation { pname = "vector-split"; version = "1.0.0.2"; - sha256 = "b4aeeea50fec52e594b2d3c05aca3a112b2095d1e5238ced065cecf2d89bbd16"; + sha256 = "05mxkgcg5v2w0vnqq8z5s6aj0aqi7b55mh6knaafalpc1yjyxbml"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck split tasty tasty-quickcheck vector @@ -185629,7 +199234,7 @@ self: { mkDerivation { pname = "vector-static"; version = "0.3.0.1"; - sha256 = "216d3db923ae25dbd09e5d69bd7c3acc8ebedc437ab712a27f59486266fe57a7"; + sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91"; libraryHaskellDepends = [ base primitive vector ]; homepage = "http://github.com/geezusfreeek/vector-static"; description = "Statically checked sizes on Data.Vector"; @@ -185642,7 +199247,7 @@ self: { mkDerivation { pname = "vector-strategies"; version = "0.4"; - sha256 = "86493bccc5ded0e694c0ac4aa374e6d64c4e218f4878aaee2609a3c3d88f6a13"; + sha256 = "04vaizcc78q94vpaly28iwhlwk6nwrsa6jmcq2afdl6yqp63njc6"; libraryHaskellDepends = [ base deepseq parallel vector ]; description = "A parallel evaluation strategy for boxed vectors"; license = stdenv.lib.licenses.bsd3; @@ -185653,7 +199258,7 @@ self: { mkDerivation { pname = "vector-th-unbox"; version = "0.2.1.6"; - sha256 = "be87d4a6f1005ee2d0de6adf521e05c9e83c441568a8a8b60c79efe24ae90235"; + sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -185667,18 +199272,19 @@ self: { }: mkDerivation { pname = "vectortiles"; - version = "1.2.0.2"; - sha256 = "9540f0b55c63ae9185a7e2e264a4f10a5fbd0e682e3ecad33e52245d5e32a886"; + version = "1.2.0.5"; + sha256 = "0pbilwfrz2lv10x9fgy1ndxnz1as0v41r9g36yc5g41dhyhnp82l"; libraryHaskellDepends = [ base bytestring cereal containers deepseq protobuf text transformers vector ]; testHaskellDepends = [ - base bytestring cereal hex protobuf tasty tasty-hunit text vector + base bytestring cereal containers hex protobuf tasty tasty-hunit + text vector ]; benchmarkHaskellDepends = [ base bytestring cereal containers criterion microlens - microlens-platform protobuf text + microlens-platform protobuf text vector ]; homepage = "https://github.com/fosskers/vectortiles"; description = "GIS Vector Tiles, as defined by Mapbox"; @@ -185690,7 +199296,7 @@ self: { mkDerivation { pname = "verbalexpressions"; version = "1.0.0.0"; - sha256 = "9ef23bffc3c29b988f7c15ee14158cf4c9599b14d2075acf2577878597385171"; + sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly"; libraryHaskellDepends = [ base regex-pcre ]; homepage = "https://github.com/VerbalExpressions/HaskellVerbalExpressions"; description = "Regular expressions made easy"; @@ -185703,7 +199309,7 @@ self: { mkDerivation { pname = "verbosity"; version = "0.2.3.0"; - sha256 = "8b4ce5ab48aab17b6752dec4efba259964b7084ce10330198ae3ff7ea090f264"; + sha256 = "0r7jj2h7xzz3i8ck00z19h4bfr4r4nxfzi6ya9kppcda92myak4b"; libraryHaskellDepends = [ base binary data-default-class deepseq ]; homepage = "https://github.com/trskop/verbosity"; description = "Simple enum that encodes application verbosity"; @@ -185717,7 +199323,7 @@ self: { mkDerivation { pname = "verdict"; version = "0.0.0.0"; - sha256 = "01f2f6ef514f4d4ad47ca819500d304b0b3717969fc33859e3f4972b91cc35d2"; + sha256 = "1limrj8jp5zlwdckihwzjqbkf2sb606m06d8gka4lkaga7pzdwh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl text transformers ]; @@ -185735,7 +199341,7 @@ self: { mkDerivation { pname = "verdict-json"; version = "0.0.0.0"; - sha256 = "7b64ab1ec3ae42db778f8adc52219a472af76ea0dd4d91d9376ad57dc9abaf4a"; + sha256 = "0jmgmg4pvmba6zcr2kfxl1pgfaj7k8hm5p4aixvxnhmfqcganr3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185749,12 +199355,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "verify" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, containers, either + , hspec, jwt, QuickCheck, text, text-conversions, time + }: + mkDerivation { + pname = "verify"; + version = "0.0.0"; + sha256 = "1qi76frmgcwa384nwlip27pi64vlnddrjq5bz3xr9dsl2435axzf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring containers either jwt text + text-conversions time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hspec jwt QuickCheck text text-conversions time + ]; + description = "A new Haskeleton package"; + license = stdenv.lib.licenses.isc; + }) {}; + "verilog" = callPackage ({ mkDerivation, alex, array, base, happy }: mkDerivation { pname = "verilog"; version = "0.0.11"; - sha256 = "863487a4cdd6e7d208498b2b0def869617453c0e52cfd3b16f1639e4d8371452"; + sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46"; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ alex happy ]; homepage = "http://github.com/tomahawkins/verilog"; @@ -185764,19 +199392,32 @@ self: { }) {}; "versions" = callPackage - ({ mkDerivation, base, either, megaparsec, microlens, semigroups + ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "versions"; + version = "3.0.2.1"; + sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp"; + libraryHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base microlens tasty tasty-hunit text ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "versions_3_1_1" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens , tasty, tasty-hunit, text }: mkDerivation { pname = "versions"; - version = "3.0.0"; - sha256 = "468eb7d61a7320ce592a6542c2f3c2fa2a74784a8fbf5b6a9e30edada4defc38"; - libraryHaskellDepends = [ base megaparsec semigroups text ]; - testHaskellDepends = [ - base either microlens tasty tasty-hunit text - ]; + version = "3.1.1"; + sha256 = "1pnmbvlchjskavp6h04xdxwxg61aplqpxnawnbzflyf1mvpz0dm4"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ base microlens tasty tasty-hunit text ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vgrep" = callPackage @@ -185789,9 +199430,9 @@ self: { mkDerivation { pname = "vgrep"; version = "0.2.0.0"; - sha256 = "2b53c200e872d253c1195e93ed8362111461d621759a15562f9fd06d333c2d33"; + sha256 = "0crd7hrnvl4z5xb1b6km47b6250ica1yv4sy370m7lkjx00c4lrb"; revision = "1"; - editedCabalFile = "939169b5cb33e4f625431bffe87d0285f12b458005dbe10f17fbddd66c819262"; + editedCabalFile = "0qljh5nddpgv2w7y3nq5h12jpwc509yyizqv8cjzdr1krfsnk4ck"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185821,7 +199462,7 @@ self: { mkDerivation { pname = "vhd"; version = "0.2.2"; - sha256 = "7c678f076395f44d853f87a4538635bc83d7a10319933dec9e06b40ce409ea7c"; + sha256 = "0z7a17j0rd06kvn3v4qr0fhxg0xw6n3579477y2lvx4mcc3qyrvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185842,7 +199483,7 @@ self: { mkDerivation { pname = "vhdl"; version = "0.1.2.1"; - sha256 = "4b9402db91832b18e30cd1b9b809b662bca63c765144c388643058952ab228ae"; + sha256 = "1bi8n8m9an1hcj4c6i2ifqyadg32nq4viffi1kiihaw3j7dh552b"; libraryHaskellDepends = [ base mtl pretty regex-posix ]; description = "VHDL AST and pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -185855,7 +199496,7 @@ self: { mkDerivation { pname = "viewprof"; version = "0.0.0.1"; - sha256 = "2e899ac1bab582314e18bb89f95c2623c11bb15dae5c2cce48652251f8bcf7be"; + sha256 = "1gpppkw528k59372qp5fbnqiph934rfgk2dv317330mmpb0rm29f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185866,14 +199507,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_2" = 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.2"; - sha256 = "52962f9eca6970001b703fdb4948d375d3bf5521e803ac98ad7a60eb1d25bffb"; + version = "0.0.0.5"; + sha256 = "1i1rrr920dappcvj7gjs60bjcrznb4ny4aslvxxidv93lz9kv617"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185891,7 +199532,7 @@ self: { mkDerivation { pname = "views"; version = "1.0"; - sha256 = "90805dfd7cd14becc4156746dc0f491eb67812cb881b9b40df72c44951b9fc4f"; + sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h"; libraryHaskellDepends = [ base mtl ]; description = "Views allow you to run a State monad on part of a state"; license = stdenv.lib.licenses.bsd3; @@ -185913,7 +199554,7 @@ self: { mkDerivation { pname = "vigilance"; version = "0.1.0.1"; - sha256 = "853c9b62d6211ce7eba179f97ad6e2f9e718acab107cee1a93ace6c704c3bce2"; + sha256 = "1qmwqc2cgrmcjcdfwz0hmfn1irzrwbb7mybrl7myf711sri9ng45"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185949,8 +199590,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.2.0"; - sha256 = "ce63a34e2c7fd31b2ad2a9f1e9b8c3d2c10c70e1ba5ccf2b06e8dc99770b065d"; + version = "0.2.3.0"; + sha256 = "0023jrn5my1wgyspf4nq4m3xr7i4w277p4328j6l8hq7fda04ig4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185975,7 +199616,7 @@ self: { mkDerivation { pname = "vimus"; version = "0.2.1"; - sha256 = "e2a1b359607b0f4408f641dc5e992ba9a5cc31d6719aa7f5bee6dc6775269248"; + sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186002,7 +199643,7 @@ self: { mkDerivation { pname = "vintage-basic"; version = "1.0.1"; - sha256 = "45cc99a45a2a7e07384d8e3e559d196b9d5d3f6d361e48af15e07c6d5e9db642"; + sha256 = "0hmnkmg6sz702nplh7indlzmv7bb36fmaglf9lw0fziabaj9kk25"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186022,7 +199663,7 @@ self: { mkDerivation { pname = "vinyl"; version = "0.5.3"; - sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6"; + sha256 = "19h8fssvykx18dzhjfrz87xwarqa2cmy9akd49jcacplvr1nmy00"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base doctest lens singletons ]; benchmarkHaskellDepends = [ @@ -186040,7 +199681,7 @@ self: { mkDerivation { pname = "vinyl-gl"; version = "0.3.0.1"; - sha256 = "aa7ce361d5b8abbaac651e43e0d1250563af970d75f85b4f74657efbd1bf51a0"; + sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a"; libraryHaskellDepends = [ base containers GLUtil linear OpenGL tagged transformers vector vinyl @@ -186060,7 +199701,7 @@ self: { mkDerivation { pname = "vinyl-json"; version = "0.1.0.0"; - sha256 = "acc46e4e3eb4257d29d3a8d7e8c957fd16beb000dd28780983c7e04b15a7321f"; + sha256 = "07rjlwalpq67hc4pha6x02qbw5pxaz4yimx8sclps9dl7r76xi5c"; libraryHaskellDepends = [ aeson base bytestring template-haskell text vinyl ]; @@ -186076,7 +199717,7 @@ self: { mkDerivation { pname = "vinyl-operational"; version = "0.1.1"; - sha256 = "ba556484509f789d6c8d49655d8f0a77d12a16179ffe59335d0b037c02c185a5"; + sha256 = "19c5q417q0qbblrmkzlz2wb2mlbp1a7msra9imn9sy4za2268mds"; libraryHaskellDepends = [ base operational operational-extra vinyl-plus ]; @@ -186093,9 +199734,9 @@ self: { mkDerivation { pname = "vinyl-plus"; version = "0.1.1"; - sha256 = "f8a195c81456db7694f0e44966e2907d90a9417d231a3aece78e9e9a35905697"; + sha256 = "15snj0srm7lfwzn3l6i3gm0sk43xj3i6cjg4y2a7dnsn2k49b8gq"; revision = "1"; - editedCabalFile = "008aeff291dd0e3ef96f715783d1d609590103068de788a927d53068353e6ef6"; + editedCabalFile = "1xkf7qsnhc6m4ylqirwd0q1h2n89sv8q6mvidzwkw3nxj7rfz2h0"; libraryHaskellDepends = [ base contravariant ghc-prim profunctors transformers unordered-containers vinyl @@ -186112,7 +199753,7 @@ self: { mkDerivation { pname = "vinyl-utils"; version = "0.3.0.0"; - sha256 = "e6d7668cd91d5ef14b54396561c10930654dae9398cedefc1fb6faab00c4143f"; + sha256 = "0gqlqh0apymn3zydxklqjfp4sr9h170n2r9rai5z2phxv666dmz6"; libraryHaskellDepends = [ base contravariant transformers vinyl ]; homepage = "https://github.com/marcinmrotek/vinyl-utils"; description = "Utilities for vinyl"; @@ -186126,7 +199767,7 @@ self: { mkDerivation { pname = "vinyl-vectors"; version = "0.2.0"; - sha256 = "6f9b6b8772937c967ad2b51e062cab27cb94fdbfb6d5e35eaae7c396e42362d7"; + sha256 = "1mv24gj9dhz7m9gf7mdnpzyr9jr7mcn0c7mms9x9cz4kfa3np6vg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186146,7 +199787,7 @@ self: { mkDerivation { pname = "virthualenv"; version = "0.2.2"; - sha256 = "82f507e8f43e8c34aa5fbd48851ec307aba211756c43bc5b38ca4cb2e16ee623"; + sha256 = "08z6dvhv4k6a71dvqhvcfl8s5aq7qcg8aj5xbym3931yykl0gxc2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186164,7 +199805,7 @@ self: { mkDerivation { pname = "visibility"; version = "0.1.0.2"; - sha256 = "a4c32de7a4e069f97b3b6248c5cd81013a2ae6a6aa1d5b6bef8130f1245f2a28"; + sha256 = "0a1abwjg2c41xxmmn7dalvk2lfh1h76waj327dxzjsg0lkkjvhx4"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/LukaHorvat/visibility"; description = "Simple computation of visibility polygons"; @@ -186179,7 +199820,7 @@ self: { mkDerivation { pname = "vision"; version = "0.0.5.0"; - sha256 = "42750ca0729d32eb2c054206d934c77a4384f0788fb876d068d3920729fb6588"; + sha256 = "1235zclhg4nkd387df4gg3q88hvsqwsdj1j20lnfnclxfah0qxa2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186201,7 +199842,7 @@ self: { mkDerivation { pname = "visual-graphrewrite"; version = "0.4.0.1"; - sha256 = "9793f50268811ea403c8959423105e40dcc900b80dd39062846ea1b652bfd757"; + sha256 = "0myppx9bd8bfhii91lqdp00ckp20bq82754mr01s87l1d01gb4wp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186227,7 +199868,7 @@ self: { mkDerivation { pname = "visual-prof"; version = "0.5"; - sha256 = "6978910fdc51a0898c4f7ebae111ce7a22f9dddebab71fc58e2d2a6fb0ee9b03"; + sha256 = "00wvxsq6yaidiv2izdxsvvfzj8ksrq8y3fky9y68k82ivh7r2y39"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186248,7 +199889,7 @@ self: { mkDerivation { pname = "vivid"; version = "0.2.0.5"; - sha256 = "fd56271270f68f4c60f4e7ac03a5a540288fb0b80739b094e2a8f5e737dab373"; + sha256 = "0wxkv8vygxd8waab0f87p2q8ya20lnjh7b77yih4r3znf092fmpx"; libraryHaskellDepends = [ base binary bytestring containers filepath hashable MonadRandom mtl network process random random-shuffle split stm time transformers @@ -186267,7 +199908,7 @@ self: { mkDerivation { pname = "vk-aws-route53"; version = "0.1.2"; - sha256 = "9dacbfc16ac79f93c16f133dae6e153c310c2f7b08d504fcebfbac9590dc7469"; + sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x"; libraryHaskellDepends = [ aws base bytestring containers http-conduit http-types old-locale resourcet text time xml-conduit xml-hamlet @@ -186282,7 +199923,7 @@ self: { mkDerivation { pname = "vk-posix-pty"; version = "0.2.1"; - sha256 = "27650d5b07f6c6cbc6fede3bf48866d921c78ed1abec7ba1a76469c6a33540ce"; + sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring process unix ]; @@ -186297,9 +199938,9 @@ self: { mkDerivation { pname = "vocabulary-kadma"; version = "0.1.0.0"; - sha256 = "eb5644a76fe5c04ea8b95299518afb8215fb064e3e387e774686c591e80cfde3"; + sha256 = "1qzx1kl93ic68rvpwf1y9q3gn5c2zf5536ajp6l4xh75dykl8mpb"; revision = "1"; - editedCabalFile = "40477768ad6d879ecac71eec138bb3c1ecbf6f1c7a3a1512f5e9b13207fae05c"; + editedCabalFile = "0p70z83k5cg9yl91afks3ipvzv61nf5i7v0yqz59x1vdmml7fis0"; libraryHaskellDepends = [ base smaoin ]; homepage = "http://rel4tion.org/projects/vocabularies-hs/"; description = "Smaoin vocabulary definitions of the base framework"; @@ -186307,14 +199948,12 @@ self: { }) {}; "void" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, hashable, semigroups }: + ({ mkDerivation, base }: mkDerivation { pname = "void"; - version = "0.7.1"; - sha256 = "c9f0fd93680c029abb9654b5464be260652829961b18b7046f96a0df95e825f4"; - libraryHaskellDepends = [ - base deepseq ghc-prim hashable semigroups - ]; + version = "0.7.2"; + sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk"; + libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/void"; description = "A Haskell 98 logically uninhabited data type"; license = stdenv.lib.licenses.bsd3; @@ -186326,7 +199965,7 @@ self: { mkDerivation { pname = "vorbiscomment"; version = "0.0.2"; - sha256 = "9dc7f458e1bcf3cb78014c000fbd306e1c6e3c7e7d73e313bf996555018c6e8a"; + sha256 = "12kfih0marcrpw9y6wvxgqy6w73f62yhy02c05wcpwxww5cg9iwx"; libraryHaskellDepends = [ base binary-strict bytestring mtl utf8-string ]; @@ -186339,7 +199978,7 @@ self: { mkDerivation { pname = "vowpal-utils"; version = "0.1.2"; - sha256 = "0fad96ceff3126968dc69755093aba416856b3cef49533f5841f6722f5b2e627"; + sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/cartazio/Vowpal-Utils"; description = "Vowpal Wabbit utilities"; @@ -186352,7 +199991,7 @@ self: { mkDerivation { pname = "voyeur"; version = "0.1.0.1"; - sha256 = "cef156c54919dd74980e92e8b392a16560ea94f478efdc2de26a404a0ddcfd84"; + sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff"; libraryHaskellDepends = [ base bytestring process utf8-string ]; homepage = "https://github.com/sethfowler/hslibvoyeur"; description = "Haskell bindings for libvoyeur"; @@ -186365,7 +200004,7 @@ self: { mkDerivation { pname = "vrpn"; version = "0.2.1.4"; - sha256 = "642562ad8634d1f1875060b0685719b5282f309196bd74079a10b7b4e0e73186"; + sha256 = "11iiwzhb9dqhk83p9gcnj4q2ya5m35bnic30a23z3l9lhsnn49b4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -186385,7 +200024,7 @@ self: { mkDerivation { pname = "vte"; version = "0.13.1.1"; - sha256 = "c38699a626af47be2c15ddcc7c9070fe5b9999fee73e3b479d1bafb96cdd5231"; + sha256 = "0cajvmnbkbqvkm3kngp7zscrjnzyf287rk6x2lnbwixg4sk9k1n3"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ vte ]; @@ -186402,7 +200041,7 @@ self: { mkDerivation { pname = "vtegtk3"; version = "0.13.1.1"; - sha256 = "5a61fe264daddeafe4ef47e6a09a00d323abe16bc8bef23441ac818284623067"; + sha256 = "0rrhca2850dc84sg5gn8dghsn8yk02da1rj7xzjazpmd9lkgwqas"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk3 pango ]; libraryPkgconfigDepends = [ vte ]; @@ -186423,8 +200062,10 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.15"; - sha256 = "03bf0fa5132c271248e0f721ad9fb3f5003dc93cff99776fcc7cb7920a85d7f7"; + version = "5.15.1"; + sha256 = "0ba8qnb59ixg9czfj71ckh82p7kkwgnhwh6c69bkjhy0f7g36hr4"; + revision = "1"; + editedCabalFile = "0bcvqvhmsj8fbxs19nwy80acjdp1dsphgfzj2xkj8kkxaw08s2g8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186455,7 +200096,7 @@ self: { mkDerivation { pname = "vty-examples"; version = "5.5.0"; - sha256 = "0cc9e351599fcbb0e8f0ee1e60cc31eeb002b8c03bfeb6d3e3d4ec4ed14f5a35"; + sha256 = "0das9z8lxv6lwg9vdzivq2w05c7f676607pfy3lb1jwzb58y7j8c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186474,7 +200115,7 @@ self: { mkDerivation { pname = "vty-menu"; version = "0.0.4"; - sha256 = "853a7acf66a6eb0fba1c35b5da1053fed7046b8cf0091556a5c35f9dd29a9c48"; + sha256 = "0j4wkb99spy3lmb1a2ghiimh9mzyac8dmd9m3jx0zsx6cv7plfl5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base vty ]; @@ -186491,7 +200132,7 @@ self: { mkDerivation { pname = "vty-ui"; version = "1.9"; - sha256 = "023b6229e7a2491957383e2a680ddfcfcde693b4769aa718d7d3524d84107ad7"; + sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186510,7 +200151,7 @@ self: { mkDerivation { pname = "vty-ui-extras"; version = "0.1"; - sha256 = "a7db07f3221854597754415f308533e5f9d408b7a71faa8fa431e630e15ec0b0"; + sha256 = "1c60bvhk1riilj7sl7x7nw4d9yg56f2k0ps1aivmjm0q4brhgnx7"; libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ]; description = "Extra vty-ui functionality not included in the core library"; license = stdenv.lib.licenses.bsd3; @@ -186522,7 +200163,7 @@ self: { mkDerivation { pname = "vulkan"; version = "1.7.0.0"; - sha256 = "17c8437061adee81f6c4b34a1ead85a44f98c0c443bc2696025f1849c086e965"; + sha256 = "0rg9hv04j62z0ab2dg23qk09hkx4hnniwjmkqkv83vmdc5q47j0p"; libraryHaskellDepends = [ base vector-sized ]; librarySystemDepends = [ vulkan ]; homepage = "http://github.com/expipiplus1/vulkan#readme"; @@ -186539,7 +200180,7 @@ self: { mkDerivation { pname = "wacom-daemon"; version = "0.1.0.0"; - sha256 = "08bd693ea56a93ec81308ebeff1e190f52752cf877c47c18cc9485bf8db98f7c"; + sha256 = "0z4gp66vz1clrhc7ri3pz0n7alhg34ggzglf620yr4vallz6kg88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186563,7 +200204,7 @@ self: { mkDerivation { pname = "waddle"; version = "0.1.0.6"; - sha256 = "48782ba072e71678cb7d01043f8c10981ea7e7e5a123f0d8fb7a482f75c4ca15"; + sha256 = "05faqisjyj3szgcg08x1wpksf7lq2263y101gp5ph5p7fah2ny28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186588,9 +200229,9 @@ self: { mkDerivation { pname = "wahsp"; version = "0.2"; - sha256 = "e634e0743dbbf93f2dffc68b68a8cc86a7ee3b62a044932f192c5f491e81fe74"; + sha256 = "0x7yh4g4jprc34pr6i50c8xyx9w6rjl6i2y6zwnkzydv7msf0d76"; revision = "1"; - editedCabalFile = "145ecbcceca09e635f744466b1d439a6144cd83e3d0c74a2478e4470bbffbacd"; + editedCabalFile = "1kdszyxp0i4f8yi7831x7vc4q55677ab2rj4fign77m0xk6cnphl"; libraryHaskellDepends = [ aeson base data-default-class kansas-comet natural-transformation remote-monad scotty semigroups stm text wai-middleware-static @@ -186609,7 +200250,7 @@ self: { mkDerivation { pname = "wai"; version = "3.2.1.1"; - sha256 = "5d80a68f5d8806682d8267b7dacc383d094e3ef7ecd705f20e42c91cad564e21"; + sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x"; libraryHaskellDepends = [ base blaze-builder bytestring bytestring-builder http-types network text transformers vault @@ -186627,7 +200268,7 @@ self: { mkDerivation { pname = "wai-accept-language"; version = "0.1.0.1"; - sha256 = "d0d3f3e9c45edfa0c6f05e7d58091806825a1e02261d70cb448dc146480a4a31"; + sha256 = "0caa1944dhcd8k5p079608g5m0h6304mhzayy33a1psyqklz7lyh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186653,7 +200294,7 @@ self: { mkDerivation { pname = "wai-app-file-cgi"; version = "3.1.3"; - sha256 = "6fce1db57f84faef811e8e08f48fc6bef6daa136a61dc8abc03b83908955af3b"; + sha256 = "0fxgan4r10rvq2mwh7d66shxmxmyqs7z824f3s0yzyl4gysivkkg"; libraryHaskellDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers @@ -186683,7 +200324,7 @@ self: { mkDerivation { pname = "wai-app-static"; version = "3.1.6.1"; - sha256 = "b318acf31e2e809411f119744a016ba0a78f52554ac7321a3a1410a218886668"; + sha256 = "0s36i0ca440l78d35isaam98z9x0dc0llx0ry48r901f3vrsq65k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186713,8 +200354,8 @@ self: { }: mkDerivation { pname = "wai-cli"; - version = "0.1.0"; - sha256 = "220d8b3eb52e7b045844be37682f09823a9730115f33ea718717896f74673007"; + version = "0.1.1"; + sha256 = "0qi84p1x5b0hvsdgd03fn80j3ai0s0svcl340z9fvz6lrgcfnhq6"; libraryHaskellDepends = [ ansi-terminal base http-types monads-tf network options socket-activation stm streaming-commons unix wai wai-extra warp @@ -186732,7 +200373,7 @@ self: { mkDerivation { pname = "wai-conduit"; version = "3.0.0.3"; - sha256 = "e49720a7c7b58e78a56991e42fa550a722936af274dc27755a735781258f7aff"; + sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4"; libraryHaskellDepends = [ base blaze-builder bytestring conduit http-types transformers wai ]; @@ -186750,7 +200391,7 @@ self: { mkDerivation { pname = "wai-cors"; version = "0.2.5"; - sha256 = "25089b8a043e0eb042ef63070ddd7ecc4d961c74526c9c00b292eda4b92d766e"; + sha256 = "0vkn5nws9vcjn809qv2jfhf9ckfcgvfhs1v3xx1b03iy0j59n215"; libraryHaskellDepends = [ attoparsec base base-unicode-symbols bytestring case-insensitive http-types mtl transformers wai @@ -186777,7 +200418,7 @@ self: { mkDerivation { pname = "wai-devel"; version = "0.0.0.4"; - sha256 = "c36b6e1fe41f122a7b6fbcf1dbf7bfd6e829e1f3efe23d124bdf81f55ce0c27e"; + sha256 = "0zn2w1fgb0fz9c93vqpgyghjks6npzvxpwdwdxxjl4hzwhgnwsy3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186803,7 +200444,7 @@ self: { mkDerivation { pname = "wai-digestive-functors"; version = "0.3"; - sha256 = "8dded7f0d5ec1b1437c37b92f509b907f9e72738081c26067eec87fa06a98912"; + sha256 = "04l9m43gm1zcgq32c70870kygy87p44zb4kvqcvi86zcspqdgpld"; libraryHaskellDepends = [ base digestive-functors http-types resourcet text transformers wai wai-extra wai-util @@ -186819,7 +200460,7 @@ self: { mkDerivation { pname = "wai-dispatch"; version = "0.1"; - sha256 = "ea6777536f39811f9f89db12d99fc713b9e161de753e714417eb597b97cccae3"; + sha256 = "1qyarjbpnngb2x272gkmvrhy3f8kqygxj4nvi6giz09rdx9pfrza"; libraryHaskellDepends = [ base text wai yesod-routes ]; homepage = "https://github.com/singpolyma/wai-dispatch"; description = "Nice wrapper around yesod-routes for use with WAI"; @@ -186832,7 +200473,7 @@ self: { mkDerivation { pname = "wai-eventsource"; version = "3.0.0"; - sha256 = "785005f23bf9bf4e1dfaae0705472c0e3ea4c3843ff6a8625db8d1e327a6bfc0"; + sha256 = "1h5zlqky7ldqbmiaixizhk1s8ghf5i3ha1xfz8flxgzr7gr0al3q"; libraryHaskellDepends = [ wai ]; doHaddock = false; homepage = "http://www.yesodweb.com/book/web-application-interface"; @@ -186851,8 +200492,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.19.1"; - sha256 = "f7e7ca4432fd868bb549f16ff2671534cab4e0bcfff194b9de55aa561b21a7f6"; + 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 @@ -186876,7 +200517,7 @@ self: { mkDerivation { pname = "wai-frontend-monadcgi"; version = "3.0.0.3"; - sha256 = "b140ad372252e638dfa7a8d8d48ae84121b1b67dc6454801302a15bd8cf42729"; + sha256 = "0a97yj6bs59a600lhif6gnvb28a1x25d9n58lzgkirjj48vssh5i"; libraryHaskellDepends = [ base bytestring case-insensitive cgi containers http-types transformers wai @@ -186890,7 +200531,7 @@ self: { mkDerivation { pname = "wai-graceful"; version = "0.1.0.1"; - sha256 = "58c96367884118ac36aaa6482588f91d4524c921d92647a494fca53755f60628"; + sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq"; libraryHaskellDepends = [ base http-types mtl resourcet unix wai ]; homepage = "https://bitbucket.org/dpwiz/wai-graceful"; description = "Graceful shutdown for WAI applications"; @@ -186906,7 +200547,7 @@ self: { mkDerivation { pname = "wai-handler-devel"; version = "2.0.0.2"; - sha256 = "fe2f849ab810ddc24e1b502f9a431c1ffb4b151fde447328b5f18f3cc3e0c38d"; + sha256 = "13f3w31kr3zinll76i6y3walpyqz3i1rlbsh3d7c5p8hp2d88bzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186925,7 +200566,7 @@ self: { mkDerivation { pname = "wai-handler-fastcgi"; version = "3.0.0.2"; - sha256 = "b555badd0fcae6519eb6f52dc0579d6a6ec4964aadf8b725bab8501cf7f473df"; + sha256 = "1pvkykviql5qp8jvgy5d9abc8vkakmbw0bgmnsg53rna1zfvlmdm"; libraryHaskellDepends = [ base bytestring wai wai-extra ]; librarySystemDepends = [ fcgi ]; homepage = "http://www.yesodweb.com/book/web-application-interface"; @@ -186940,7 +200581,7 @@ self: { mkDerivation { pname = "wai-handler-launch"; version = "3.0.2.2"; - sha256 = "9c94c4da533ebcbbd28cf3dfbeb44a5e953dbf73b53cab0179f16931fa102908"; + sha256 = "021923x32sgig40sng5mffzkv5ay9asbxpzkik9bpg1yagdc954w"; libraryHaskellDepends = [ async base blaze-builder bytestring http-types process streaming-commons transformers wai warp @@ -186954,7 +200595,7 @@ self: { mkDerivation { pname = "wai-handler-scgi"; version = "2.0.0.2"; - sha256 = "4ced87a85c165be2436974a1d881079df09bf459e45bddabd57205621a3aed40"; + sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac"; libraryHaskellDepends = [ base bytestring wai wai-extra ]; homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Wai handler to SCGI (deprecated)"; @@ -186969,7 +200610,7 @@ self: { mkDerivation { pname = "wai-handler-snap"; version = "0.1.1"; - sha256 = "340c398b33d2d503b70d45becaaa1ba17e4992d6f90109d77b0dc2500f4c732a"; + sha256 = "0akk9h7m1hhdggbhj0grss94jzm13fmcmgj51nvh7mfj6f5kj31l"; libraryHaskellDepends = [ base bytestring containers enumerator snap-core snap-server transformers wai @@ -186985,7 +200626,7 @@ self: { mkDerivation { pname = "wai-handler-webkit"; version = "3.0.0.3"; - sha256 = "08609d9bd78fafc130fc231b532a64b8292fb1700ab2ba3ee3cc96d45e4f5983"; + sha256 = "10sr9xgd95ncwczbmchaf2qjyadqchm566r3zhqc3bwgsydrsq08"; libraryHaskellDepends = [ base wai warp ]; libraryPkgconfigDepends = [ QtWebKit ]; homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit"; @@ -187001,7 +200642,7 @@ self: { mkDerivation { pname = "wai-hastache"; version = "0.1"; - sha256 = "087f1a64c15e078984c0574f767202afc7d06d09c8f50e383cb95436864576ce"; + sha256 = "1kkn8n33cm5r7hw0xxf815nx1ixg09r7ckspq228j1syq5j1lzq8"; libraryHaskellDepends = [ base bytestring hastache http-types transformers wai ]; @@ -187019,7 +200660,7 @@ self: { mkDerivation { pname = "wai-hmac-auth"; version = "1.0.0"; - sha256 = "24077731c9401de12aeff8bd0562164a1e8d042149297782f149f80f13e45fc2"; + sha256 = "1hjzwh9hzy29y617faa94428s7ja2ri0bggqxwmf27a0r4qpf1r4"; libraryHaskellDepends = [ base base64-bytestring bifunctors byteable bytestring containers cryptohash http-types monad-loops mtl transformers wai @@ -187042,7 +200683,7 @@ self: { mkDerivation { pname = "wai-http2-extra"; version = "0.1.0"; - sha256 = "8d9e64d785024be7c1a3b316f9cb49cb471791a0d5b75216d45a89bc0d1915bf"; + sha256 = "1gqm346vr2asshb55dyml28ifiyb975zj5mklg0yfjq2hpbn97ld"; libraryHaskellDepends = [ auto-update base bytestring containers http-types wai warp word8 ]; @@ -187059,7 +200700,7 @@ self: { mkDerivation { pname = "wai-lens"; version = "0.1"; - sha256 = "9d6c41743155f878e40de50202c221f996ec17159058ea4358eb49c3e53d6d17"; + sha256 = "05vd7pjw6jgbb11yln4h2lbyr5pr471040p51pj7iy2m65s42v4x"; libraryHaskellDepends = [ base bytestring http-types lens network text vault wai ]; @@ -187076,7 +200717,7 @@ self: { mkDerivation { pname = "wai-lite"; version = "0.2.0.0"; - sha256 = "e47fc90d24e39f479ded9df6381dc4d2380f68bdafb9b77de9048c1a8ab21dbe"; + sha256 = "1ghxna51m304x5yvgfdgpml0yf6jqhfkixlxxnflg7z34h6wjzz4"; libraryHaskellDepends = [ base bytestring conduit http-types text transformers wai wai-extra ]; @@ -187093,7 +200734,7 @@ self: { mkDerivation { pname = "wai-logger"; version = "2.3.0"; - sha256 = "90cd993c657e72a0480a988220b288aeb2561efa53d2c8f819197b6de3060bf0"; + sha256 = "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch"; libraryHaskellDepends = [ base blaze-builder byteorder bytestring case-insensitive fast-logger http-types network unix unix-time wai @@ -187110,7 +200751,7 @@ self: { mkDerivation { pname = "wai-logger-prefork"; version = "0.3.0"; - sha256 = "c4e370feb55967fa8770179eeab9eec266491b748ae9d506ea40b62f32a6da31"; + sha256 = "0cfslqr2zdj0x83dbscafhdljrn2xswym7hpf23zlrsrnpz71qy4"; libraryHaskellDepends = [ base bytestring date-cache fast-logger http-types unix wai wai-logger @@ -187129,7 +200770,7 @@ self: { mkDerivation { pname = "wai-make-assets"; version = "0.2"; - sha256 = "7e871b15d889dc8f7d185eab424eff0362bf120e6b7a5e4e43eb2e411e7ad640"; + sha256 = "0h6ng8g42bpb8d75wykb1q9byqh3zx745asy31yqzp49v0aip1vy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187157,13 +200798,13 @@ self: { , clientsession, cookie, exceptions, hoauth2, http-client , http-client-tls, http-conduit, http-reverse-proxy, http-types , optparse-simple, regex-posix, safe-exceptions, shakespeare, text - , unix-compat, unordered-containers, vault, wai, wai-app-static - , wai-extra, warp, yaml + , unix-compat, unordered-containers, uri-bytestring, vault, wai + , wai-app-static, wai-extra, warp, yaml }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.1.1.0"; - sha256 = "f951faa7f3b143b36268b3c3b0250779d229490b0a4bad8722cda3ea0a60a1a1"; + version = "0.1.2.1"; + sha256 = "0x3x3vc2l7glvfv6xcmqq0bw4mm8w2l577zx6qhx4399b03j56a1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187171,7 +200812,8 @@ self: { bytestring case-insensitive cereal clientsession cookie exceptions hoauth2 http-client http-client-tls http-conduit http-reverse-proxy http-types regex-posix safe-exceptions shakespeare text unix-compat - unordered-containers vault wai wai-app-static wai-extra yaml + unordered-containers uri-bytestring vault wai wai-app-static + wai-extra yaml ]; executableHaskellDepends = [ base bytestring cereal clientsession optparse-simple warp @@ -187189,7 +200831,7 @@ self: { mkDerivation { pname = "wai-middleware-cache"; version = "0.3.6"; - sha256 = "bc41c478be6afc164c5427206020680b9f894717d5740e3ddb8a735bb5c419cf"; + sha256 = "1kqrqjsmnwwavcyhwx6m2x3qk7qbd0h60817ai61dz3aprwc8hdw"; libraryHaskellDepends = [ base binary blaze-builder-conduit bytestring conduit crypto-conduit http-types pureMD5 wai @@ -187212,7 +200854,7 @@ self: { mkDerivation { pname = "wai-middleware-cache-redis"; version = "0.4.3"; - sha256 = "89d300e7d6a6e0b570d217039ee50aa266d5cbb01828feb197662b1d990ca8ed"; + sha256 = "1vd81jcisav6jyqzwa0qn35xarm21bjrw0qps9qbbq56svkh1lw9"; libraryHaskellDepends = [ base binary blaze-builder-conduit bytestring case-insensitive conduit hedis hedis-pile http-types transformers wai @@ -187230,7 +200872,7 @@ self: { mkDerivation { pname = "wai-middleware-caching"; version = "0.1.0.2"; - sha256 = "15b5fb9c92599d5ecb6a70ba40bad024488f9eca7139abe23b961ba21602d78d"; + sha256 = "13fp08ba46wn7gianfbirag8yj14s2x41fkhdb5mx7arjafgpd8m"; libraryHaskellDepends = [ base blaze-builder bytestring http-types wai ]; @@ -187247,7 +200889,7 @@ self: { mkDerivation { pname = "wai-middleware-caching-lru"; version = "0.1.0.0"; - sha256 = "377dc842f5ad77b98e8a817e092c891ccfd0da978fb9f69a380f001a95da28d3"; + sha256 = "1lr8vaail00g72dgdfcgjzdd1kqwi4n0jzl1ia7bjxxdym1chz9p"; libraryHaskellDepends = [ base blaze-builder bytestring http-types lrucache text wai wai-middleware-caching @@ -187265,7 +200907,7 @@ self: { mkDerivation { pname = "wai-middleware-caching-redis"; version = "0.2.0.0"; - sha256 = "6ff53783db20d8f0ff00514ea2679f7022ca59eb20ffad22628ac17c13bf7c4c"; + sha256 = "0k3wpw9prhcac8iavzr0xdcwl8khkxks4kji03zz1n10vf1kgxbg"; libraryHaskellDepends = [ base blaze-builder bytestring hedis http-types text wai wai-middleware-caching @@ -187281,7 +200923,7 @@ self: { mkDerivation { pname = "wai-middleware-catch"; version = "0.3.6"; - sha256 = "d014ccbad8341d47a6cc274c33c9ce3b61bb264cbeee5817eebcc13f9ad205ee"; + sha256 = "1vh5sad3zhdwxqbmivmy9hkbnq9vrv4k6k17rjk4f79lv2xcq56h"; libraryHaskellDepends = [ base bytestring http-types lifted-base wai ]; @@ -187300,7 +200942,7 @@ self: { mkDerivation { pname = "wai-middleware-consul"; version = "0.1.0.2"; - sha256 = "d89d5a5bf0b08cf4fcd300d9e16c351a146119c34a9f31949498a874699c0763"; + sha256 = "0qq7kilp9a4qjja337saqccn250s6mnf3n80sgyg935hy1dmm7fq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187326,7 +200968,7 @@ self: { mkDerivation { pname = "wai-middleware-content-type"; version = "0.5.0.1"; - sha256 = "2dcdccb959f0fbb42a06e56818a466017e30edb88fd8eb57abaa9c437f08bd86"; + sha256 = "11mx11zl775amdbypn4gp3nk0zh1csj1hs750qmb9yzhb6wwrk9d"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions hashable http-media http-types lucid mmorph monad-control @@ -187356,7 +200998,9 @@ self: { mkDerivation { pname = "wai-middleware-crowd"; version = "0.1.4.2"; - sha256 = "1136b61a6ce7729093664b63a4ab70de73e356d34b0c7a8114b639b18626b058"; + sha256 = "0n5h4s3b2fdn2j0pl32bsdbf6wyyf2ms8qsbcs9r0wp7dhdbcdhi"; + revision = "1"; + editedCabalFile = "0qvh92p9s80kmzg5w7rga54kfqbwcrkkv5p03pd92px04j2h5lbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187382,7 +201026,7 @@ self: { mkDerivation { pname = "wai-middleware-etag"; version = "0.1.1.1"; - sha256 = "6279ff3c0ec0bdc8a37388dbea30a790f82d1e536b40a21fc3856e0a8e237be4"; + sha256 = "1r3v4f70lvl5qcgs4h3bacg2vy4hlwqfmnw8ffiwigf01qygyyb2"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptohash filepath http-date http-types unix-compat unordered-containers wai @@ -187400,7 +201044,7 @@ self: { mkDerivation { pname = "wai-middleware-gunzip"; version = "0.0.2"; - sha256 = "bd9d542ee4b1255c01161266da2bcf7056111ae77f792a23ac2263e209bf7b65"; + sha256 = "0rbvpw4y4qr2mhijlybzwwd12mkhrwmxlrhj2q0mq9diwhp597dx"; libraryHaskellDepends = [ base bytestring http-types streaming-commons wai ]; @@ -187414,7 +201058,7 @@ self: { mkDerivation { pname = "wai-middleware-headers"; version = "0.1"; - sha256 = "30df18e1184b23f5571cb10a83c1fe8a13f0d6a53738e68f17a437224b195781"; + sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh"; libraryHaskellDepends = [ base bytestring http-types wai ]; homepage = "http://github.com/seanhess/wai-middleware-headers"; description = "cors and addHeaders for WAI"; @@ -187431,7 +201075,7 @@ self: { mkDerivation { pname = "wai-middleware-hmac"; version = "0.1.0.0"; - sha256 = "1a7fc07c9d43168c980cc14c3ec5123733355ba9e32bad0da48e9a14a10dad07"; + sha256 = "01xd1nhi96lflh6ssaz3m5dkacrp2b2kwk611jc8q5j3kmyc0zqs"; libraryHaskellDepends = [ base base64-bytestring byteable bytestring case-insensitive cryptohash http-types transformers wai word8 @@ -187453,7 +201097,7 @@ self: { mkDerivation { pname = "wai-middleware-hmac-client"; version = "0.1.0.2"; - sha256 = "ba419c0e9a6d00e7ab03150219012128908bc3018b43d7d4cb46cbb01babaeca"; + sha256 = "1jmfmcdv1js6rgadfhwb071qp418440ij0hm0fmyf03dk879qhds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187466,6 +201110,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-json-errors" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, http-types, text + , wai + }: + mkDerivation { + pname = "wai-middleware-json-errors"; + version = "0.1.1"; + sha256 = "0704hyfzc8jqvdny9wz3j0b204vq7b07c1wwcin9ir9d6hha7aih"; + libraryHaskellDepends = [ + aeson base binary bytestring http-types text wai + ]; + testHaskellDepends = [ + aeson base binary bytestring http-types text wai + ]; + homepage = "https://github.com/orbital/wai-middleware-json-errors#readme"; + description = "Converts errors from plaintext to json"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-metrics" = callPackage ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text @@ -187473,8 +201136,8 @@ self: { }: mkDerivation { pname = "wai-middleware-metrics"; - version = "0.2.3"; - sha256 = "c9123ca10c2d0d223ce0c39faa7097de2e61ec2b9a24cff042d7248850ea2e2a"; + version = "0.2.4"; + sha256 = "0x7c53lqbf55p3ba6naj9xwjz07k4gf0ql3bjlb6vfph92kqadp7"; libraryHaskellDepends = [ base ekg-core http-types text time wai ]; testHaskellDepends = [ base bytestring ekg-core http-types QuickCheck scotty tasty @@ -187496,7 +201159,7 @@ self: { mkDerivation { pname = "wai-middleware-preprocessor"; version = "0.2.0.0"; - sha256 = "41ae57db57d9b9a1dd13b0b585129b4623842434a236268456b71c5536003fd9"; + sha256 = "1n9z00v5a75pas22cdm26hj888s6kc98bddh2gfs3ffrazdmgbj1"; libraryHaskellDepends = [ base directory mtl split text wai wai-middleware-static ]; @@ -187515,8 +201178,8 @@ self: { }: mkDerivation { pname = "wai-middleware-prometheus"; - version = "0.1.0.1"; - sha256 = "6da4cb9dd96912332050dd2abf6f489ef94aa856c409bd6205f706257bbe3037"; + version = "0.1.1"; + sha256 = "0dd730nmbnbly4kdxwri3bwzl9dzdxgmz4lgmm86m70mvncgp4mj"; libraryHaskellDepends = [ base bytestring data-default http-types prometheus-client text time wai @@ -187527,6 +201190,55 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "wai-middleware-rollbar" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, hostname, http-client, http-conduit, http-types, lens + , lens-aeson, network, QuickCheck, text, time, unordered-containers + , uuid, wai + }: + mkDerivation { + pname = "wai-middleware-rollbar"; + version = "0.3.0"; + sha256 = "001j9hjgny8f8hxxfr71r4b84dc696x5dsr8a08yqmfkjqmn6zy9"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive hostname http-client + http-conduit http-types network text time unordered-containers uuid + wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers lens lens-aeson + QuickCheck text + ]; + homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; + description = "Middleware that communicates to Rollbar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "wai-middleware-rollbar_0_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, hostname, hspec, hspec-golden-aeson, http-client + , http-conduit, http-types, lens, lens-aeson, network, QuickCheck + , text, time, unordered-containers, uuid, wai + }: + mkDerivation { + pname = "wai-middleware-rollbar"; + version = "0.4.0"; + sha256 = "14dr25jn7xdx68ykrplcbnk1qvwbaxqpa63a6m56sfpwa4qj03ja"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive hostname http-client + http-conduit http-types network text time unordered-containers uuid + wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers hspec + hspec-golden-aeson lens lens-aeson QuickCheck text + ]; + homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; + description = "Middleware that communicates to Rollbar"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-route" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit , test-framework, test-framework-hunit, text, wai, wai-test @@ -187535,7 +201247,7 @@ self: { mkDerivation { pname = "wai-middleware-route"; version = "0.7.3"; - sha256 = "a7570a70f8b80e20ef2eb89293317379f955e72f2a8435b99b54e25c5857f17d"; + sha256 = "0zgiaxc5rqjlkfwkb11a5zkmbybrfcqr74mq5vpj03mqz1q0lmx7"; libraryHaskellDepends = [ base bytestring http-types text wai yesod-routes ]; @@ -187558,9 +201270,9 @@ self: { mkDerivation { pname = "wai-middleware-static"; version = "0.8.1"; - sha256 = "e0b5f13f410f81897759acf43198a08101d2af4c9d506164367c7d1a96d55375"; - revision = "1"; - editedCabalFile = "2884eb9d594bdc91a8ab7dd045e4252472c45361907c470f594a7f2a573d7752"; + sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; + revision = "2"; + editedCabalFile = "1yd82xgdmxzjh8vf3bln7ccbr6qiwn6inp9w32lqsgc354ivgrn9"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -187581,7 +201293,7 @@ self: { mkDerivation { pname = "wai-middleware-static-caching"; version = "0.6.0.1"; - sha256 = "13fadccc87d248dbcc1dc781ba9d82c9fe0237ebaf18acdff20ebc905dc84476"; + sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash directory expiring-cache-map filepath http-types mtl old-locale text time @@ -187593,6 +201305,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-static-embedded" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, http-types, memory + , mime-types, text, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-static-embedded"; + version = "0.1.0.0"; + sha256 = "1b8n514yp7kqvz2z0qfp9hf6vai6117p62h8hprw5kkla456lb6y"; + revision = "1"; + editedCabalFile = "1qrkfhdw5qanqggvc05vlp56704qskrhw9qyzv8m5576lliphsq3"; + libraryHaskellDepends = [ + base bytestring cryptonite http-types memory mime-types text wai + wai-extra + ]; + homepage = "https://github.com/adamse/wai-middleware-static-embedded#readme"; + description = "Serve embedded static files as a Wai middleware"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-throttle" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, hspec , http-types, HUnit, network, stm, token-bucket, transformers, wai @@ -187601,7 +201332,7 @@ self: { mkDerivation { pname = "wai-middleware-throttle"; version = "0.2.1.0"; - sha256 = "862ac07bb8c8e21b4f56a6398444e2e6bdf9512a198ae394fa9d023f7cfcf87c"; + sha256 = "0z7qziy3y0lxzaaf72hr598zkgg6w9288fd6ar7ipqn8p1xw0al6"; libraryHaskellDepends = [ base containers hashable http-types network stm token-bucket transformers wai @@ -187622,7 +201353,7 @@ self: { mkDerivation { pname = "wai-middleware-verbs"; version = "0.3.2"; - sha256 = "691fa97fda7204d84e1fa8f953334ca51cb1055577a5ec1d56cc5f07491aaa66"; + sha256 = "0rma394hfpycaqfyr9bpal2v27559hrm7yd83x7dh13jv9zsj7v9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187642,7 +201373,7 @@ self: { mkDerivation { pname = "wai-predicates"; version = "0.9.0"; - sha256 = "1802d3aa8cec1ce0049cc115166504a83e6866e279d0345e1a72986f1d4e1b50"; + sha256 = "0l0v9qfnz63j39g39l3rw9k6hgm80ijic5f1kh2f077cijmd60hq"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-conversion case-insensitive cookie http-types singletons transformers vault vector wai @@ -187663,7 +201394,7 @@ self: { mkDerivation { pname = "wai-request-spec"; version = "0.10.2.4"; - sha256 = "1ee1ed12ef41a7023e24629c46835ed9602643328e0cc3de0c9b934d31eed610"; + sha256 = "046nxqqlv4wv1kgc634f691jcq6rbs1ld7324hz059s1xw9fvq8y"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-types text wai ]; @@ -187680,7 +201411,7 @@ self: { mkDerivation { pname = "wai-responsible"; version = "0.0.0.0"; - sha256 = "6a03b90b6e00d64bb46391a19c5e6f99cb36a3902258b70aa16f8410c223c661"; + sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va"; libraryHaskellDepends = [ base bytestring http-types wai ]; homepage = "https://github.com/pharpend/wai-responsible"; description = "Response interface for WAI"; @@ -187695,7 +201426,7 @@ self: { mkDerivation { pname = "wai-route"; version = "0.3.1.1"; - sha256 = "43fe7d52f5a3c388f67a309b1642353d59dc3cb33b30ca550ce4649da59c2c0f"; + sha256 = "03rckjjrsr741iawlc1vncydqn9x6m11d6rhgbv8ihx3ym97vzj3"; libraryHaskellDepends = [ base bytestring http-types unordered-containers wai ]; @@ -187712,7 +201443,7 @@ self: { mkDerivation { pname = "wai-router"; version = "1.0.0.1"; - sha256 = "e7a2f20d2aaa496206a09a508e9e8923a545181802922f026b3bfa4dccac47a0"; + sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7"; libraryHaskellDepends = [ base text wai ]; homepage = "http://github.com/mdmarek/wai-router"; description = "Provides basic routing on URL paths for WAI"; @@ -187730,7 +201461,7 @@ self: { mkDerivation { pname = "wai-routes"; version = "0.9.10"; - sha256 = "e872338221f64c5c1ac3e4421b2b31e3b32116b1eac0fba3f6adc73d3e255672"; + sha256 = "0wjn4lz3vixdysizph7an4b23cz364minhp4qcd5qk7n46136wp8"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -187746,6 +201477,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-routes_0_10_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, data-default-class + , filepath, hspec, hspec-wai, hspec-wai-json, http-types + , mime-types, monad-loops, mtl, path-pieces, random + , template-haskell, text, vault, wai, wai-extra + }: + mkDerivation { + pname = "wai-routes"; + version = "0.10.0"; + sha256 = "1yqd79gm0xl7p8ag2pii4kcn3vb90qkli54dq4jb619bia9lsfsy"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive containers + cookie data-default-class filepath http-types mime-types + monad-loops mtl path-pieces random template-haskell text vault wai + wai-extra + ]; + testHaskellDepends = [ + aeson base hspec hspec-wai hspec-wai-json text wai + ]; + homepage = "https://ajnsit.github.io/wai-routes/"; + description = "Typesafe URLs for Wai applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-routing" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie @@ -187755,7 +201512,7 @@ self: { mkDerivation { pname = "wai-routing"; version = "0.13.0"; - sha256 = "f4841b028e20f49e3617d13247c04f457c850421321a92e7ab4e372ee85cde8f"; + sha256 = "13yybkl2wdsfmgkr46ij4428az259z04fcni2wv9xx10iq11p17l"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-conversion case-insensitive cookie http-types transformers wai wai-predicates wai-route @@ -187780,7 +201537,7 @@ self: { mkDerivation { pname = "wai-session"; version = "0.3.2"; - sha256 = "83739ca93cf1db1e5b54dec7e2590dabfcc77a97ac1388f2f2f18840917c8326"; + sha256 = "09l3gj8l127iybr8h4xcjxxcgz5b1mcy5iyyaidixnzi7jlrqww3"; libraryHaskellDepends = [ base blaze-builder bytestring containers cookie http-types StateVar time transformers vault wai @@ -187797,7 +201554,7 @@ self: { mkDerivation { pname = "wai-session-alt"; version = "0.0.0"; - sha256 = "89408d5ef5371e8e855ad02cdb056fb375bd1dd024bdd34d961b75fc1ce6c337"; + sha256 = "0dy3wqfgqx8vjr6x7g94s0fvsxdkdw2xnb6hba2qw7ipymg8sh49"; libraryHaskellDepends = [ base blaze-builder bytestring cookie http-types time vault wai-transformers @@ -187813,7 +201570,7 @@ self: { mkDerivation { pname = "wai-session-clientsession"; version = "0.1"; - sha256 = "8ebfd1f303aaf9290f069fe4b1d1fe6e6c9e7ef18e915951070fa13dab869f4d"; + sha256 = "0kczhsmkv88g0x8mk4cfy5z9wv3fzv8v3r4z0q7jkyda0grx3gwf"; libraryHaskellDepends = [ base bytestring cereal clientsession errors transformers wai-session @@ -187831,7 +201588,7 @@ self: { mkDerivation { pname = "wai-session-mysql"; version = "0.2.1.0"; - sha256 = "4b47855ba7f6ed86c0a1a15f4bfc8f5e7b427ef41fcc49ac8fa469b3c1369f07"; + sha256 = "01wz6v0v6sd4iyn4kk0zyiz44ysyizy4npx1l708dvgnlxdqaisb"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy mysql-simple resource-pool text time transformers wai wai-session @@ -187853,7 +201610,7 @@ self: { mkDerivation { pname = "wai-session-postgresql"; version = "0.2.1.0"; - sha256 = "34f6a08e8a26ab1a58ad2e1f707ede69541f5788b7b0454a83dc26ad3afbbe9a"; + sha256 = "16myzcxas9nwhd54bc5pi1biym39vrz707rfmmc1mar6ia7a1xil"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai @@ -187875,7 +201632,7 @@ self: { mkDerivation { pname = "wai-session-tokyocabinet"; version = "0.1"; - sha256 = "b9dec38fdc636ec5e0bcde5a1a59cb3d0e5f7654f8337765566a22e6d7e8a431"; + sha256 = "0cd4x3byc8kaarjpfczqaiv5y3ixrdcilnnypkhcavk3vj7w7pmr"; libraryHaskellDepends = [ base bytestring cereal errors tokyocabinet-haskell transformers wai-session @@ -187886,6 +201643,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-slack-middleware" = callPackage + ({ mkDerivation, aeson, base, http-client, http-types, wai }: + mkDerivation { + pname = "wai-slack-middleware"; + version = "0.2.0"; + sha256 = "0l2pd61vxnfjdjzkvmwqfgf07a3nir3mnbr8qw2nzqa767s84i6i"; + libraryHaskellDepends = [ aeson base http-client http-types wai ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/psibi/wai-slack-middleware#readme"; + description = "A Slack middleware for WAI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-static-cache" = callPackage ({ mkDerivation, base, bytestring, cityhash, conduit , conduit-combinators, containers, http-types, resourcet @@ -187895,7 +201665,7 @@ self: { mkDerivation { pname = "wai-static-cache"; version = "0.1.0.1"; - sha256 = "d4e0a7e8b58733fe2add7e6104ef1eb18c99e63c652a17ccd238f4fe6382936e"; + sha256 = "0vlkh9izxx1qsb61fak57kk9k35i3vph8qbyvlmgwcw7nplagq6l"; libraryHaskellDepends = [ base bytestring cityhash conduit conduit-combinators containers http-types resourcet system-filepath text transformers vector @@ -187913,7 +201683,7 @@ self: { mkDerivation { pname = "wai-static-pages"; version = "0.3"; - sha256 = "307d092f5ea5eecc9b59844cf49dd7ea789c76f5f9b7400af659b2fd06125575"; + sha256 = "0xam283gvcjryq541dzrymv9qy7asyfz8k44b6dwrvm5bqphjz9h"; libraryHaskellDepends = [ base blaze-builder bytestring conduit directory http-types text wai wai-extra @@ -187928,7 +201698,7 @@ self: { mkDerivation { pname = "wai-test"; version = "3.0.0"; - sha256 = "ddf541f7c7a97e045057c52d109feb8c835f36d0a7b2a6a0bd60c5686500da77"; + sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx"; libraryHaskellDepends = [ wai ]; doHaddock = false; homepage = "http://www.yesodweb.com/book/web-application-interface"; @@ -187943,7 +201713,7 @@ self: { mkDerivation { pname = "wai-thrift"; version = "0.0.1.3"; - sha256 = "0da2c042a2aa424a2c4e11f13c9728f8919ec2dd56c469cc346d6df723f879bf"; + sha256 = "1gvrz0izfvbd6k66ki2nvp19x4gq52bkrw8i9qn4lhmal91c18hd"; libraryHaskellDepends = [ base blaze-builder bytestring http-types thrift wai ]; @@ -187960,7 +201730,7 @@ self: { mkDerivation { pname = "wai-throttler"; version = "0.1.0.5"; - sha256 = "e6259bbeba435d4d141bceda533aa41ff5dda2d74ff29a5bd7f3131c981a05ca"; + sha256 = "1jh53ac1q4zksxdrmwjgsyidvx8zlhx57nnf3ca4spa3paz9n9g6"; libraryHaskellDepends = [ base bytestring containers http-types time wai ]; @@ -187976,7 +201746,7 @@ self: { mkDerivation { pname = "wai-transformers"; version = "0.0.7"; - sha256 = "1a1801a2048eb84808a09e44cb899d6cc689948619eeeea005e312ea5a2fe32c"; + sha256 = "0b735xdfl4p30nhfxvhrhsa8kikckn4wni4yl044if4f0ji0260s"; libraryHaskellDepends = [ base exceptions transformers wai wai-websockets websockets ]; @@ -187992,7 +201762,7 @@ self: { mkDerivation { pname = "wai-util"; version = "0.8"; - sha256 = "55621ef43cd729287947b6e2ee3c5d172b6b050b09511a46afd8ec7e34cc3383"; + sha256 = "10rkrhs7xv6qmx31ll891c2nnaqpblyfxqmn8xwjhafp7ks1wqjm"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit http-accept http-types network-uri text transformers wai wai-extra @@ -188010,7 +201780,7 @@ self: { mkDerivation { pname = "wai-websockets"; version = "3.0.1.1"; - sha256 = "6abeafea574d9e8f4d41de091afec4594489877aa8717f97e91af5543fd38a31"; + sha256 = "0ccasczm9x8sx6bpywd8ga3qji2rqkz1l2fy856qz7jdazmazgka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188032,7 +201802,7 @@ self: { mkDerivation { pname = "wait-handle"; version = "0.1.1"; - sha256 = "f5581043a4aeece04aef36e1b9c9b76f3f8126a3f1185450a498926afa070824"; + sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m"; libraryHaskellDepends = [ base ]; homepage = "https://www.github.com/fmap/waithandle"; description = "Wait handles are MVars which can only be written to once, and from which values can never be removed"; @@ -188044,7 +201814,7 @@ self: { mkDerivation { pname = "waitfree"; version = "0.1.5"; - sha256 = "38a3481433b05a1e19d23f6c84913eb7e7c1de1909eec391729ddd7f22c51426"; + sha256 = "09hlqli7zpcxfa8w7vh937gc3rxp7s8q8v1zs8ciwnmh6ca4i8rq"; libraryHaskellDepends = [ base containers ]; description = "A wrapping library for waitfree computation"; license = stdenv.lib.licenses.mit; @@ -188058,9 +201828,9 @@ self: { mkDerivation { pname = "waitra"; version = "0.0.4.0"; - sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12"; + sha256 = "04kcn70ydls484gzpblhd0snw4byzxzz8b2h7r673qkpnfgcc42n"; revision = "2"; - editedCabalFile = "7b2f9d4fe0358eb303c3993233b05c1505f4021ebee41fccfad0b6badbf8bd8f"; + editedCabalFile = "13xxz3dvmdnhzb61zr5y3q1g818mbjq36clrqc1v73imw17rsbvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188075,6 +201845,60 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "waldo" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , blaze-builder, browscap, bytestring, case-insensitive, conduit + , conduit-extra, deepseq, directory, filepath, Geodetic, Glob + , hs-GeoIP, http-types, imagesize-conduit, lrucache, mtl, network + , network-uri, regex-tdfa, resourcet, safe, SHA, text + , unordered-containers, wai, wai-app-static, wai-extra, warp + , zlib-conduit + }: + mkDerivation { + pname = "waldo"; + version = "0"; + sha256 = "0r0lqy3vqs3ypxf0v6xwyarj5rxjf9f19x6b48rhj32z8x9d0isq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base blaze-builder browscap + bytestring case-insensitive conduit conduit-extra deepseq directory + filepath Geodetic Glob hs-GeoIP http-types imagesize-conduit + lrucache mtl network network-uri regex-tdfa resourcet safe SHA text + unordered-containers wai warp zlib-conduit + ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra deepseq http-types mtl + resourcet safe unordered-containers wai wai-app-static wai-extra + warp zlib-conduit + ]; + description = "A generator of comics based on some ascertainable data about the requester"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wallpaper" = callPackage + ({ mkDerivation, base, bytestring, filepath, JuicyPixels, text + , yaml + }: + mkDerivation { + pname = "wallpaper"; + version = "0.1.0.1"; + sha256 = "0dpy3vnf8vn0z64r6kla2qm1czlzz3xvpmm4rz95yjynsrc5n7mz"; + revision = "1"; + editedCabalFile = "00a67dn1ald61zwm9bg6p2vr9ahr6diprx9vmwcjns28g4158qag"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring filepath JuicyPixels text yaml + ]; + executableHaskellDepends = [ base JuicyPixels yaml ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/jeffreyrosenbluth/wallpaper#readme"; + description = "A library and executable for creating wallpaper, frieze, and rosette patterns"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "warc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions , filepath, free, lens, mmorph, optparse-applicative, pipes @@ -188084,9 +201908,9 @@ self: { mkDerivation { pname = "warc"; version = "0.3.1"; - sha256 = "2b8752553865feee48aa41d9940bc752e8d22dd866d1ba3e901fb3f7f9dd9510"; + sha256 = "044mvpwzgcqzj0zbmlb6v0nx5s2jqw5r9na1m94fxzk571am51rb"; revision = "1"; - editedCabalFile = "194f11d8f498f829f3f9dfd4ac145d1afbf6fdde1394fa4564377bcc47acbc76"; + editedCabalFile = "0xmwmi3wqyrpci2zm50kvvyzdyqsblaarm6zz7rjky4qykc12kqr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188115,8 +201939,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.11.1"; - sha256 = "853f672c48893936902a0c6b3e4711f58c0fd02f36e8badb46a0c8b58067e5fe"; + version = "3.2.13"; + sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj"; libraryHaskellDepends = [ array async auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers ghc-prim hashable @@ -188145,7 +201969,7 @@ self: { mkDerivation { pname = "warp-dynamic"; version = "0.1.0"; - sha256 = "cf4c6a2e90e826e61d22fe6c1c80200a16505cc5ce9d8756357946b095f0b5ce"; + sha256 = "1kmmy2av0ikr6mb8g7ffqmf505ha4201qv7y48fyc9p8j0p6lk6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188165,9 +201989,9 @@ self: { mkDerivation { pname = "warp-static"; version = "2.0.1.1"; - sha256 = "750a2e5cb4adeece260455053c6c2637faf8182f1f7feca5f1cfe25232433fa0"; + sha256 = "181z8cr55qngy6jyqzqz5wcgiyip4rn3q1am0hkcxvmdnif2w2km"; revision = "1"; - editedCabalFile = "9084e8207d2178dd585366f7a8310638814409b969752b88878d77807d3f478a"; + editedCabalFile = "12j77xyq0xwdhy42nxb9p44l909q0qqsixv6adcdsy11glhfi14h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -188182,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 = "f5c4c871fee62021a7b3b22d1f2af3543843a0c54632da6f7be9ef58e65fa292"; + 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"; @@ -188205,7 +202029,7 @@ self: { mkDerivation { pname = "warp-tls-uid"; version = "0.1.0.4"; - sha256 = "beacad56f701aa913e0912a7a319a8b95d8e5100dddbf1f8655d7ce4a64c5b85"; + sha256 = "11av9jkf8z2xcpwg3nyx018qwpdrm0cs79qj14z93ah1yxbavb5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188221,8 +202045,10 @@ self: { ({ mkDerivation, base, mtl, time }: mkDerivation { pname = "watchdog"; - version = "0.2.2.1"; - sha256 = "db48e9118b17b7cf07352a1e3dd96a0002d473c59f2b2f9734746563311b6919"; + version = "0.3"; + sha256 = "0v8jbrnqg48x5ksdacsd0xazpxqv64ggzihg6k2y6pljqznrhn1i"; + revision = "1"; + editedCabalFile = "1hmjlva0pbvbbl3vcngqlqrisx32qzlc9pl96zh2rb6m25riisdg"; libraryHaskellDepends = [ base mtl time ]; description = "Simple control structure to re-try an action with exponential backoff"; license = stdenv.lib.licenses.bsd3; @@ -188236,7 +202062,7 @@ self: { mkDerivation { pname = "watcher"; version = "0.0.3.0"; - sha256 = "fa717e6d7185967a8b89ffda3b9bc1510cc72d9ace5e457be11bc3777f11c0b0"; + sha256 = "1c6025zpghqvw5xlapnfk8nwf32iq6dkpnpzi65pm5l5f5npwwgs"; libraryHaskellDepends = [ base basic-prelude containers hinotify system-fileio system-filepath @@ -188255,7 +202081,7 @@ self: { mkDerivation { pname = "watchit"; version = "0.1.0.0"; - sha256 = "e688a66bc4660e36141519d0b61181f402211415c7d50e01caac5241b34d8b8c"; + sha256 = "134b9nrl2lmcr80hxmf72la220plh48vdl0r2la3c3k6qimsd276"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188280,7 +202106,7 @@ self: { mkDerivation { pname = "wavconvert"; version = "0.1.1"; - sha256 = "7db6861ce1383fc16f389a18c93576706b9f1bbca045689825f9894f56ea1809"; + sha256 = "028qx9b4z2gr4nc6hid0phdrysvhfqswj64s71pw2grqw4f8ddkx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath process ]; @@ -188294,8 +202120,8 @@ self: { }: mkDerivation { pname = "wave"; - version = "0.1.4"; - sha256 = "686687782dca7c522190bca70171682b24af8c89e4f3aa63da455c331daeb6bc"; + version = "0.1.5"; + sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5"; libraryHaskellDepends = [ base bytestring cereal containers data-default-class transformers ]; @@ -188315,8 +202141,8 @@ self: { }: mkDerivation { pname = "wavefront"; - version = "0.7.0.3"; - sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65"; + version = "0.7.1"; + sha256 = "0vrg8kn85fkdqrlzjyqb165k098nvi7k4fy3ya601ffv6x18lnd7"; libraryHaskellDepends = [ attoparsec base dlist filepath mtl text transformers vector ]; @@ -188332,9 +202158,9 @@ self: { mkDerivation { pname = "wavefront-obj"; version = "0.1.0.1"; - sha256 = "f73744ebc9dd035686f089c368434bf6940bd0c9928258aa00b7258677c0e258"; + sha256 = "0n72q1vqc9dp02m5i0ljr780p57n9d1nihw9y235c0yxr7ml8dzp"; revision = "1"; - editedCabalFile = "cc24c326de34450af4b05b7955448c43eac411d657cf52c37014031ce2ba6388"; + editedCabalFile = "1233pbi1q0qlf31m5kspsq8w9sj3ii25ayavn3s0li9lvqkc696c"; libraryHaskellDepends = [ attoparsec base containers linear text transformers ]; @@ -188351,7 +202177,7 @@ self: { mkDerivation { pname = "wavesurfer"; version = "0.0.6"; - sha256 = "c57e151f5201372cbcb0e5bc7e445351a40d499d3607a9095931bfc677d530b9"; + sha256 = "1f9hsmvwdgrib44sj1rnkm4hv92iad27xg75n2y2qdq1a8giazn5"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing bytestring-show delimited-text @@ -188369,7 +202195,7 @@ self: { mkDerivation { pname = "wavy"; version = "0.1.0.0"; - sha256 = "3849bf156ba6b2cb7f8665b66a398a175b3579534c7bc1e0f5357e7a5ad57f67"; + sha256 = "0rvzsmd7lzimyphc2yscadwkanqpi8wnmdk5hrzwpcm6dcavyj9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188389,7 +202215,7 @@ self: { mkDerivation { pname = "wcwidth"; version = "0.0.2"; - sha256 = "ffc68736a3bbde3e8157710f29f4a99c0ca593c41194579c54a92c62f6c12ed8"; + sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -188400,17 +202226,18 @@ self: { "weather-api" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, HTTP, network - , utf8-string, vector + , network-uri, utf8-string, vector }: mkDerivation { pname = "weather-api"; - version = "0.4.3"; - sha256 = "d25b090839089eba2daf2e21f4e7775e9e953f83f2e37793853b6ef1cb1d9072"; + version = "0.4.3.3"; + sha256 = "01kbp2m95d8ckwyiimzxk6jjsyfbkv90ddjynflgx7s9i6xxxb17"; libraryHaskellDepends = [ - aeson attoparsec base bytestring HTTP network utf8-string vector + aeson attoparsec base bytestring HTTP network network-uri + utf8-string vector ]; - homepage = "https://github.com/cvb/hs-weather-api.git"; - description = "Weather api implemented in haskell"; + homepage = "https://github.com/cvb/hs-weather-api#readme"; + description = "Weather API implemented in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -188420,7 +202247,7 @@ self: { mkDerivation { pname = "web-browser-in-haskell"; version = "1.0"; - sha256 = "b3f81b3ef716383684f3a09b5eb5e622b2363d0ef7c821e2a9e0538d7823c7f8"; + sha256 = "1y674dw8slz0m7i23j7p1qykdci2wssmx6x0yf23cf0nywz1py5k"; libraryHaskellDepends = [ base gtk webkit ]; description = "Web Browser In Haskell"; license = "GPL"; @@ -188432,7 +202259,7 @@ self: { mkDerivation { pname = "web-css"; version = "0.1.0"; - sha256 = "620afb1d90ea2fbe3850b13f7e28ff31f4d2ab9622abdbad7faa0367daf65bc1"; + sha256 = "1havyvd6f0xagynxpar2jsmx5x1izwl7wgxia0wbwbzaj0fzn2k2"; libraryHaskellDepends = [ base text ]; description = "Simple functions for CSS"; license = stdenv.lib.licenses.bsd3; @@ -188446,7 +202273,7 @@ self: { mkDerivation { pname = "web-encodings"; version = "0.3.0.9"; - sha256 = "a30b0e0c596a1e9953fb1d5a5aa2ebe1710561d662294088d0cea657f5dae951"; + sha256 = "0lg9vbsmg9nfs2440ab2srhhawg1xfi5lnhxzd9rj7kab460w2x3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188465,7 +202292,7 @@ self: { mkDerivation { pname = "web-fpco"; version = "0.1.1.0"; - sha256 = "f618e3e8647cf96e8860e81aa43824a0c7fa7bc78ceba46169dc4bafc3ab3fc6"; + sha256 = "1iizmg1syjywd5hs9swcqxxzmix04hwa86p8c246xybwcklf667n"; libraryHaskellDepends = [ base happstack-server safe snap snap-core snap-server ]; @@ -188484,7 +202311,7 @@ self: { mkDerivation { pname = "web-inv-route"; version = "0.1.1"; - sha256 = "ee4f71874d82c1868fff17a2276363454594f898f5db8c8c210479e5a5383b9a"; + sha256 = "16iv72jyay844668rnzmk3w98ia5cdijg8hpzy7qdhc29n3p2kzf"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -188504,7 +202331,7 @@ self: { mkDerivation { pname = "web-mongrel2"; version = "0.0.3"; - sha256 = "fc05e68bbb55ace70b62fc622ca14ef3a6afe72b954992f38a4fccfae7c057c8"; + sha256 = "1j2pq3kzmk2gibrr4jcm5gksz9pk9shjqqpwc85ygb2mpf5yc1gw"; libraryHaskellDepends = [ base bytestring data-default file-embed haskell98 HStringTemplate json mtl old-time parsec system-uuid template-haskell text @@ -188516,6 +202343,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "web-output" = callPackage + ({ mkDerivation, base, directory, filepath, open-browser, temporary + , text + }: + mkDerivation { + pname = "web-output"; + version = "0.4.0.0"; + sha256 = "011lgmz5rnq6j286vih1kf1acr6r8hyw09pmdavjq8x9al1za2vh"; + libraryHaskellDepends = [ + base directory filepath open-browser temporary text + ]; + testHaskellDepends = [ + base directory filepath open-browser temporary text + ]; + homepage = "https://github.com/danse/web-output"; + description = "Library to present content to an user via their browser"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-page" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring, clay , containers, jmacro, lens, mtl, Stream, text, vector @@ -188524,7 +202371,7 @@ self: { mkDerivation { pname = "web-page"; version = "0.2.0"; - sha256 = "143301e4a9ff9f01507ef2b4548aebce01811090b176d52adc3dc87bcce5f8c3"; + sha256 = "1hzqwp67pj1xvhmdaxmij08820ffxf559d7jgr8037zzm7j02cql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188542,7 +202389,7 @@ self: { mkDerivation { pname = "web-plugins"; version = "0.2.9"; - sha256 = "e63bfd7f666b40c7ff962a070c64dc5bef4a5c490af745fa7ee8f964284a7a50"; + sha256 = "0l3s98l69yg8gvx4bxqa95f4mvsvvij0q1rajvzwfh3bcrzzsfz6"; libraryHaskellDepends = [ base containers mtl stm text ]; homepage = "https://github.com/clckwrks/web-plugins"; description = "dynamic plugin system for web applications"; @@ -188551,20 +202398,24 @@ self: { "web-push" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , cryptonite, exceptions, http-client, http-types, jose, memory - , random, text, time, transformers, unordered-containers + , cryptonite, exceptions, hspec, http-client, http-types, jose + , memory, mtl, random, text, time, transformers + , unordered-containers }: mkDerivation { pname = "web-push"; - version = "0.1.0.0"; - sha256 = "5772499993225207a60755f08e9e8774c17e6b06c7f933ba83789549d8beb871"; + version = "0.1.2.0"; + sha256 = "1c9l6fl8fpz4jd9p1m8w42hknnklak8j4gjakcm4qdbw86c4w3kk"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring cryptonite - exceptions http-client http-types jose memory random text time + exceptions http-client http-types jose memory mtl random text time transformers unordered-containers ]; + testHaskellDepends = [ + base base64-bytestring binary bytestring hspec + ]; homepage = "https://github.com/sarthakbagaria/web-push#readme"; - description = "Helper functions to send messages using Web Push protocol"; + description = "Send messages using Web Push protocol"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -188576,8 +202427,10 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.11"; - sha256 = "45624d4d8a912809603d72a36bf738a027ebec71ce0104928f144abb16de8cd8"; + 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 @@ -188593,7 +202446,7 @@ self: { mkDerivation { pname = "web-routes-boomerang"; version = "0.28.4.2"; - sha256 = "7ea892cd6e8c25e4adabf999d2332248a7b458662479a28a812bafd8dd2b7827"; + sha256 = "09vq5gfxibrbh65a4y94crcb99s848rx56grmfny89ccdv6r5a3y"; libraryHaskellDepends = [ base boomerang mtl parsec text web-routes ]; @@ -188608,7 +202461,7 @@ self: { mkDerivation { pname = "web-routes-happstack"; version = "0.23.10"; - sha256 = "a7bbf337cea91b3dbf41d1785a4edef238a1e7d78e64dd153b90e36df35afbed"; + sha256 = "1vgvbbrnvqwh7caxsr4fszks2f7jvr75ly6i86zks6x9rqvz7fx7"; libraryHaskellDepends = [ base bytestring happstack-server text web-routes ]; @@ -188621,7 +202474,7 @@ self: { mkDerivation { pname = "web-routes-hsp"; version = "0.24.6.1"; - sha256 = "ca7cf5bf026c52fee5b6af3ca173c7341cd991dcd38508d07589cc7ea8102cab"; + sha256 = "1arc22l7xk49fp80i1fkvj8xj71lqxrs2g5gnvjzwlkc0azzaz6a"; libraryHaskellDepends = [ base hsp text web-routes ]; description = "Adds XMLGenerator instance for RouteT monad"; license = stdenv.lib.licenses.bsd3; @@ -188632,7 +202485,7 @@ self: { mkDerivation { pname = "web-routes-mtl"; version = "0.20.1"; - sha256 = "a5e79050923ac9dc1859c8601d863725d99893e7e8c6558f9b575c92046465cc"; + sha256 = "1k35ch294p2pkf7mbip8wy9rin956y31sq68b4cdrj9sj9891rx5"; libraryHaskellDepends = [ base web-routes ]; description = "Extends web-routes with mtl-based MonadIO / MonadTrans RouteT instances"; license = stdenv.lib.licenses.bsd3; @@ -188643,7 +202496,7 @@ self: { mkDerivation { pname = "web-routes-quasi"; version = "0.7.1.1"; - sha256 = "aeb63d0670b2229a246530cb05666957bfa15387d2617104856d1e0b62f50be7"; + sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base path-pieces template-haskell text ]; @@ -188658,7 +202511,7 @@ self: { mkDerivation { pname = "web-routes-regular"; version = "0.19.0.1"; - sha256 = "5e2aa9d867c0baa3f288b7f84c53053994a12a4bf1484de6455423aada5fda3b"; + sha256 = "0fysbzdal8sl8pk4sj7i9cma351r0m9lry5pi3ra7fn0czcajajy"; libraryHaskellDepends = [ base parsec regular text web-routes ]; description = "portable, type-safe URL routing"; license = stdenv.lib.licenses.bsd3; @@ -188672,7 +202525,7 @@ self: { mkDerivation { pname = "web-routes-th"; version = "0.22.6.1"; - sha256 = "249b47bbe00922a69533254dd07fa105e2e90d63676f273215fc9100cdaa21d2"; + sha256 = "1li1mb6h14gw2lr2fvv7cc6ykqh5l5zx0k956fasc8h9w2xlg6r4"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -188687,7 +202540,7 @@ self: { mkDerivation { pname = "web-routes-transformers"; version = "0.19.1"; - sha256 = "2b36864a2d0a1bb9b7df15c5704602a5360dede24b2a2ad263267e8a79daa15e"; + sha256 = "0pm1v9wqlzi6cg92lajbwbnhsdm509371i8mvyvvj6qa5m58cdib"; libraryHaskellDepends = [ base transformers web-routes ]; description = "Extends web-routes with some transformers instances for RouteT"; license = stdenv.lib.licenses.bsd3; @@ -188701,7 +202554,7 @@ self: { mkDerivation { pname = "web-routes-wai"; version = "0.24.3"; - sha256 = "0737b8f1b0324b2c5aa5f90ee14263a391fc62e2d61ca3d5be4f944d67a30f1c"; + sha256 = "070gldklv52gpvas676nw9igr4d3cd1f23prlmd2qjrjn3qvhdq7"; libraryHaskellDepends = [ base bytestring http-types text wai web-routes ]; @@ -188716,9 +202569,9 @@ self: { mkDerivation { pname = "web-routing"; version = "0.6.2"; - sha256 = "ee20a428110d631f4a0c3607e3e83aaca70cd42a5fc44ba643290d7cedabf1f4"; + sha256 = "1x7imgnpq3998fk4pi2z5ba0r9xc7blf61rn1i51yqqd24la887f"; revision = "2"; - editedCabalFile = "3db4d187241069c6244c47a0f14a579800ccb6277409ae69caeb00a5f890b0cd"; + editedCabalFile = "1kdhj3waa07br9lsw2bl4yvcq04qax5g38279hjccs8h4j3x3d1x"; libraryHaskellDepends = [ base bytestring primitive text types-compat unordered-containers ]; @@ -188738,7 +202591,7 @@ self: { mkDerivation { pname = "web3"; version = "0.5.4.0"; - sha256 = "a33d6944539d6f7f811c8e0fffed8a8a291d6a0e147f29199cd9eadaada69e01"; + sha256 = "00cylsnxmsnrkhcjjzql1rm1sacaibnzy3wf3j0pyvwxad26jgd3"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptonite http-client http-client-tls memory template-haskell text @@ -188760,7 +202613,7 @@ self: { mkDerivation { pname = "webapi"; version = "0.3"; - sha256 = "da79c7547b1b0325b3d965d19bc0009fe91433b6fffdbf3a40aa33d2c8aedd4b"; + sha256 = "0jyxmv4d4cxa80xbzzgznqri9scz0309plb5v6rja0qvgdacfyfs"; libraryHaskellDepends = [ aeson base binary blaze-builder bytestring bytestring-lexing bytestring-trie case-insensitive containers cookie directory @@ -188779,22 +202632,24 @@ self: { }) {}; "webapp" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, blaze-builder - , bytestring, case-insensitive, http-types, mtl, network - , optparse-applicative, regex-posix, stm, streaming-commons, text - , transformers, unix, wai, warp, warp-tls, zlib + ({ mkDerivation, array, base, blaze-builder, bytestring + , case-insensitive, hspec, http-types, network + , optparse-applicative, regex-base, regex-pcre-builtin, stm, text + , transformers, unix, vault, wai, warp, warp-tls }: mkDerivation { pname = "webapp"; - version = "0.3.6"; - sha256 = "cc15c419454db7a1e61bbeb8827d971234b43a120a8d372d3d015991fa04c8ec"; + version = "0.6.1"; + sha256 = "0hi25bcsj03jyrx9isj2q12smpqymqn57yv6fhhpyxvy9kgf039r"; libraryHaskellDepends = [ - aeson base base16-bytestring blaze-builder bytestring - case-insensitive http-types mtl network optparse-applicative - regex-posix stm streaming-commons text transformers unix wai warp - warp-tls zlib + array base blaze-builder bytestring case-insensitive http-types + network optparse-applicative regex-base regex-pcre-builtin stm text + transformers unix vault wai warp warp-tls ]; - homepage = "https://github.com/fhsjaagshs/webapp"; + testHaskellDepends = [ + base hspec http-types network text transformers wai + ]; + homepage = "https://github.com/natesymer/webapp"; description = "Haskell web app framework based on WAI & Warp"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -188805,7 +202660,7 @@ self: { mkDerivation { pname = "webcloud"; version = "0.1.0.1"; - sha256 = "ff3c55543a2edccf11531b2405c98e916db0e13db067670cee566daa20df429f"; + sha256 = "17s2vwhalvanxq66frxh7phv0vciiv4ha90vac8wzp1f79a5ag7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188827,9 +202682,9 @@ self: { mkDerivation { pname = "webcrank"; version = "0.2.2"; - sha256 = "52472628ae993982dfb1d315cef0e786397a9fafc544ea84a7951a51c4bdfbe5"; + sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj"; revision = "1"; - editedCabalFile = "487831902c68484790108f97e32098dad9711eb15e0729b9ab1ba009e8fd5747"; + editedCabalFile = "0ispzpl0k80vmfwjj1syn4g73nfsk0hf75wg2284fj385j832y28"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -188853,7 +202708,7 @@ self: { mkDerivation { pname = "webcrank-dispatch"; version = "0.2"; - sha256 = "13328e0f7570a29b9938b8effecc6eeadd3d14555cbefc6e3707c98d7695b7ae"; + sha256 = "1bmpjmv8vj876xpgrgjwala3vpgadv6gxvxq72crp8khfl7qwchk"; libraryHaskellDepends = [ base hvect mtl path-pieces reroute text unordered-containers ]; @@ -188871,7 +202726,7 @@ self: { mkDerivation { pname = "webcrank-wai"; version = "0.2.1"; - sha256 = "db075f154e1409b5e33210b8ebae54f41fe40ef6f9a236484cfdfeed2f14ab8d"; + sha256 = "13db2hpyvzpx9i43d8pryq7f87zlajpfpf0h6biva28l9qamy1yv"; libraryHaskellDepends = [ base bytestring exceptions lens mtl unix-compat unordered-containers wai wai-lens webcrank webcrank-dispatch @@ -188892,8 +202747,8 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.8.4"; - sha256 = "347f2935e7b9498d1a0391f929b347e295fa8b19a3ea0ac7b81802fda4164f23"; + version = "0.8.5"; + sha256 = "1gn168cjwlpv2f4jchj48a9pvk8zqdxsf9qpx0lsj4bl2j5pl5m8"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring data-default-class directory directory-tree exceptions filepath @@ -188915,7 +202770,7 @@ self: { mkDerivation { pname = "webdriver-angular"; version = "0.1.11"; - sha256 = "5ebb650cdd9d0815ec897b4972cb0ab7f93d223e8f810e9bf30d6e1fd2ff49f6"; + sha256 = "1xj9zz91yvhdyfdhx0cg7qi3vydp1b5p4jbvi7n1a24xvl66bfsy"; libraryHaskellDepends = [ aeson base language-javascript template-haskell text transformers unordered-containers webdriver @@ -188941,9 +202796,9 @@ self: { mkDerivation { pname = "webdriver-snoy"; version = "0.6.0.4"; - sha256 = "736568c4b0afbf9c67fa8356a67a855664735acb24c81cccb64fbf32318c8209"; + sha256 = "02c2ihqk5gsgnv61rj14rdd76r2nhmxacml3z9krrgxgn326hrbk"; revision = "1"; - editedCabalFile = "7cc952e84c8ff09b8d032df7d8089bd4d5167b32834bda67c79c62a34b12d52a"; + editedCabalFile = "0anm295s6qlwqxkxljw369xidmflkc4dixrd0f6rpw4g9kl55jbw"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring cond data-default directory directory-tree exceptions filepath @@ -188966,7 +202821,7 @@ self: { mkDerivation { pname = "webfinger-client"; version = "0.2.0.0"; - sha256 = "1311f198704ba1dc9439a20427e1d909ceab86dbd196d31ded52835291b85a2a"; + sha256 = "0ajsp28m50sjxlfx75nivf3apkh9v7hjf15276adr8abf2cg248k"; libraryHaskellDepends = [ aeson base bytestring data-default-class hashable http-client http-client-tls http-types link-relations text unordered-containers @@ -188985,7 +202840,7 @@ self: { mkDerivation { pname = "webidl"; version = "0.1.1"; - sha256 = "fe3f734dffeafe82abceffca2417968ae454382fa23df7690be48513fcf18416"; + sha256 = "05l4y7y171g41dlzfgd25ww59r4ajqbj9jpzrsmq5zpazx6p6gzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189006,8 +202861,8 @@ self: { }: mkDerivation { pname = "webify"; - version = "0.1.7.0"; - sha256 = "14ebc023e92690ea8a6e56d74987666ddc993bebd3d5f22cb6759583ba99da99"; + version = "0.1.8.0"; + sha256 = "031gim7g15ssjj3pzc5nk7r8dsfj35pf3kzjzaxfijklwzj0zj9q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189027,7 +202882,7 @@ self: { mkDerivation { pname = "webkit"; version = "0.14.2.1"; - sha256 = "b80ef2a7d9def4245ec85f6065f62fc19fafe7ca3379a5def86e98eeaea1f550"; + sha256 = "0l7ml6pfx63fz3gaay9krbksz7y15zv6aq2zr1g29x6yv6kz43mq"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk mtl pango text transformers @@ -189044,7 +202899,7 @@ self: { mkDerivation { pname = "webkit-javascriptcore"; version = "0.14.2.1"; - sha256 = "ab36d0b283d6126826352fcfdc94a14073c05ad63818b4e3f2806707dc3e3f06"; + sha256 = "01iz7vf0frw0ybiv861qsrdc0ws0l6adrkrg6lk6h4nnhfrd0dmb"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; @@ -189054,58 +202909,60 @@ self: { }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit2gtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.2.1"; - sha256 = "b24b110013f96c770a2c1683d3b35d73da31f9777dbe6e09ac704aff3ae442f8"; + sha256 = "1y22whxgyjkhmh4nxgkxfzwk3nkkbnrx70qn5h57fv7r2c012jxj"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkit2gtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk = null;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib - , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit + , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers + , webkitgtk24x-gtk3 }: mkDerivation { pname = "webkitgtk3"; version = "0.14.2.1"; - sha256 = "6a71c475efbbfdac1c6d2fec12fb3c986dc13e09e1abdbde3dcf7a20421ab4f6"; + sha256 = "1xml39120yng7pgdpaz114zc2vcq7kxi5v1gdlfarzdvxxsw8wba"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkit ]; + 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; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 + }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; - sha256 = "922080150c96c9276ea3ddd9ef19d867f5e179017b56e8fec02e2606d4cc924d"; + sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, lucid, text }: mkDerivation { pname = "webpage"; - version = "0.0.4"; - sha256 = "17fba395357bf4d1462d1a50e2a06d1004d0df02cab524dc26e982a90f70c648"; + version = "0.0.5"; + sha256 = "1b8s7nnzyadla3wl6p58dwhinscajp5p0ajkrfz5hzqxjgzr4gi1"; libraryHaskellDepends = [ base blaze-html data-default lucid text ]; @@ -189118,7 +202975,7 @@ self: { mkDerivation { pname = "webrtc-vad"; version = "0.1.0.3"; - sha256 = "89cc6691d314c8c2ae7801bf56e1cca0252617536af4ac94acb92ad6d560d453"; + sha256 = "0lylc3axcamrmjaarx3aacbjc9d0rkhmdgq1g2pc5j0lsf8ndk49"; libraryHaskellDepends = [ base primitive vector ]; description = "Easy voice activity detection"; license = stdenv.lib.licenses.mit; @@ -189132,7 +202989,7 @@ self: { mkDerivation { pname = "webserver"; version = "0.7.1.1"; - sha256 = "e32436fa0e9d096fdfffef9829cf2f99b075fc393b360ebc8972f80e76e04b56"; + sha256 = "0mjbw1v0xy3ji6y0wdiv77y7bc4r5z7jk67gzzgny2cx1vx3c973"; libraryHaskellDepends = [ base bytestring c10k containers directory filepath network old-locale parsec process stm time unix zlib @@ -189147,7 +203004,7 @@ self: { mkDerivation { pname = "websnap"; version = "0.1.0.1"; - sha256 = "045dca9ddfabb8cda46f2fef6747de7f438c70cc0c2a7e3c1e1eb14b45deca15"; + sha256 = "05favr2lpc8y3qy7wahcriq8qhvzvr3ngvrgdyjcvf5bvyfwlp84"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath gtk webkit ]; @@ -189157,35 +203014,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "websockets_0_9_8_2" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers, entropy - , HUnit, network, QuickCheck, random, SHA, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.9.8.2"; - sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA test-framework test-framework-hunit test-framework-quickcheck2 - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "websockets" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy @@ -189195,7 +203023,7 @@ self: { mkDerivation { pname = "websockets"; version = "0.10.0.0"; - sha256 = "3ee56fa6683912928a7d336d591c43e4948886037b5aa72cbab2f33fb43fa2eb"; + sha256 = "1sx27ys3zwxjp8nafnkv0f38i5748cf5jv9kgn5944ird2k6zr9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189214,21 +203042,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets-rpc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , mtl, QuickCheck, quickcheck-instances, stm, tasty - , tasty-quickcheck, text, unordered-containers, wai-transformers - , websockets + "websockets_0_11_2_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, containers + , criterion, entropy, HUnit, network, QuickCheck, random, SHA + , streaming-commons, test-framework, test-framework-hunit + , test-framework-quickcheck2, text }: mkDerivation { - pname = "websockets-rpc"; - version = "0.0.0"; - sha256 = "e8a97330230f178fede76701fd2335fe18f48a124bd020c4be8120fa75ddf5bb"; + pname = "websockets"; + version = "0.11.2.0"; + sha256 = "0bncy78zjyhb961lhiklg2d1zh6vh03xq1zjj9js8904p75kvbaq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers exceptions mtl QuickCheck stm text - unordered-containers wai-transformers websockets + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy network random SHA + streaming-commons text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy HUnit network QuickCheck random + SHA streaming-commons test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers criterion entropy network random SHA + text + ]; + doCheck = false; + homepage = "http://jaspervdj.be/websockets"; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "websockets-rpc" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , wai-transformers, websockets + }: + mkDerivation { + pname = "websockets-rpc"; + version = "0.0.2"; + sha256 = "04narwk3nxrbxjw7vlypg4bgb4z8pnymdqsc0c93hybfir00n43q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers exceptions mtl QuickCheck + stm text transformers unordered-containers wai-transformers + websockets ]; testHaskellDepends = [ aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck @@ -189237,14 +203102,61 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets-rpc_0_6_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , exceptions, hashable, monad-control, mtl, QuickCheck + , quickcheck-instances, stm, tasty, tasty-quickcheck, text + , transformers, unordered-containers, uuid, wai-transformers + , websockets, websockets-simple + }: + mkDerivation { + pname = "websockets-rpc"; + version = "0.6.0"; + sha256 = "1kii5d0xfs8cj8j19g1hfx7h0fk0g7hx441xhs8wavsh75nmpkgg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers exceptions hashable + monad-control mtl QuickCheck stm text transformers + unordered-containers uuid wai-transformers websockets + websockets-simple + ]; + testHaskellDepends = [ + aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck + ]; + description = "Simple streaming RPC mechanism using WebSockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "websockets-simple" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, every, exceptions + , hspec, monad-control, stm, tasty, tasty-hspec, transformers + , wai-transformers, websockets + }: + mkDerivation { + pname = "websockets-simple"; + version = "0.0.6.3"; + sha256 = "057gm855nqx4rbmhsai4fw4l7p42a40d27567pgnb81chj638w9g"; + libraryHaskellDepends = [ + aeson async base bytestring every exceptions monad-control stm + transformers wai-transformers websockets + ]; + testHaskellDepends = [ base hspec stm tasty tasty-hspec ]; + homepage = "https://github.com/athanclark/websockets-simple#readme"; + description = "Simpler interface to the websockets api"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-snap" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, io-streams , mtl, snap-core, snap-server, websockets }: mkDerivation { pname = "websockets-snap"; - version = "0.10.2.0"; - sha256 = "294173c3dbc327ce3873ff310dcd14590d6a1ec05d54ea8d1a0cda0498dbe4a2"; + version = "0.10.2.2"; + sha256 = "1n3qfrbkqnn4c9bdkq0wdpgs98drmqqxqv9vz18fsz3s26vvphxw"; libraryHaskellDepends = [ base bytestring bytestring-builder io-streams mtl snap-core snap-server websockets @@ -189263,7 +203175,7 @@ self: { mkDerivation { pname = "webwire"; version = "0.1.0"; - sha256 = "2293cc4893bd0166d5177e2c1db83ef26ffdcc0b01d9b584f4fe98e7d8a15c54"; + sha256 = "0m2wl7cfg67yyj2bbn811g6gsvzj7sw1sb3y2zanc0dxjd4cr4r2"; libraryHaskellDepends = [ base base64-bytestring blaze-builder blaze-html bytestring case-insensitive containers cookie cprng-aes hamlet http-types @@ -189280,7 +203192,7 @@ self: { mkDerivation { pname = "wedding-announcement"; version = "1.1"; - sha256 = "896c5fe7611d70900667bc1879fd1e042687df04a7069d2538011958dc648b67"; + sha256 = "0rwbckf5h68170jrs1m70kgqf9h43vypj65wcw390w0xc7kmyv49"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -189296,7 +203208,7 @@ self: { mkDerivation { pname = "wedged"; version = "1"; - sha256 = "e41d22c85c6be4dd310056a9c53cc2b7cb73d2c9309898fba7aca9d2f31f18de"; + sha256 = "1phq3zrx5adclzxri61hr7977jxpq8ycbaan00qxvr3bbk4247g4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189308,16 +203220,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "weeder" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, extra, filepath + , hashable, process, text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "weeder"; + version = "0.1.6"; + sha256 = "1ss78jqiygypr8j4n2nj9b5dhxly6gmnf5qlil4cj8kb0pzr1q7b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs extra filepath hashable process text + unordered-containers vector yaml + ]; + homepage = "https://github.com/ndmitchell/weeder#readme"; + description = "Detect dead code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, deepseq, mtl, process, split - , template-haskell + , template-haskell, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.3"; - sha256 = "396853c0e8347c7c13ec013259dc2a2c91663aa3f3e7f8bc9fa588f41d0af86a"; + version = "0.0.4"; + sha256 = "1qzc3h3a8z4wmv2mgmaq6k971xiiyp58qr36i7j1nh5187ihqdib"; libraryHaskellDepends = [ - base deepseq mtl process split template-haskell + base deepseq mtl process split template-haskell temporary ]; testHaskellDepends = [ base deepseq ]; homepage = "https://github.com/fpco/weigh#readme"; @@ -189330,7 +203261,7 @@ self: { mkDerivation { pname = "weighted"; version = "0.3.0.1"; - sha256 = "1a5d93717a03e573fcc3a691206954b5b4d59e46b42b580e1d92e7048ae13ff6"; + sha256 = "1xizw6509rwj3l75haxl8sgdbd5mailj14d6qgy77r83g9qr6p8s"; libraryHaskellDepends = [ base mtl semiring-num transformers ]; homepage = "https://github.com/oisdk/weighted"; description = "Writer monad which uses semiring constraint"; @@ -189343,7 +203274,7 @@ self: { mkDerivation { pname = "weighted-regexp"; version = "0.3.1.2"; - sha256 = "f963773841854c56d36f329dae51ec08b9028832eee53b62a9ba7df5ef2de664"; + sha256 = "0r765ppzazdsm5i3prgf6a405f88xi8sx79jdz9mck4584w7fqzr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -189359,7 +203290,7 @@ self: { mkDerivation { pname = "weighted-search"; version = "0.1.0.1"; - sha256 = "fb233e130fd50b46e81060e940fe7623b1f24b6947b8d312755cc0f1405842ed"; + sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/luqui/weighted-search"; description = "A weighted nondeterministic search monad"; @@ -189374,9 +203305,9 @@ self: { mkDerivation { pname = "welshy"; version = "0.1.0.0"; - sha256 = "713e804638810eb5e0cd16bb6b47fbef218ac5e902772a024b70d71c8bb6ef22"; + sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki"; revision = "1"; - editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c"; + editedCabalFile = "0b62zr532s4v7v9rdpksahzdwmkhyaljnm0xgj6znbklgfk76sgz"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit http-types lifted-base resourcet text transformers unordered-containers wai warp @@ -189394,7 +203325,7 @@ self: { mkDerivation { pname = "wembley"; version = "0.1.0.0"; - sha256 = "608b999e650552af2f922611511d612da491c28d56900cf8a4a7e3458c49d510"; + sha256 = "046m9664bqx7lkw0r42nip19391dc4fm2496j8psylh5cng9k2v0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189414,7 +203345,7 @@ self: { mkDerivation { pname = "werewolf"; version = "1.5.1.1"; - sha256 = "708166a9826dd212542beb06fe557adb47b1fcd1c222f313f3a6b3ba70434b68"; + sha256 = "0s2b8dqbmcx6yc9z68n2s7yb2iyvg9azw1pb5da15lkdhalnd0bh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189439,7 +203370,7 @@ self: { mkDerivation { pname = "werewolf-slack"; version = "1.0.2.0"; - sha256 = "94d0194666dfe540bb38cef0204547e62c80b54686a49b1d5f48d1b1d431a495"; + sha256 = "15d467ab3la8bwfrp9468ssq0b768x2j1w6f72xl1rfzcr31kl4l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189457,7 +203388,7 @@ self: { mkDerivation { pname = "wheb-mongo"; version = "0.0.3.0"; - sha256 = "9e3597f9b6559ec1955889acddc6ff482cf04d65da6229ce38f072d925d0b3f7"; + sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy"; libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ]; homepage = "https://github.com/hansonkd/Wheb-Framework"; description = "MongoDB plugin for Wheb"; @@ -189470,7 +203401,7 @@ self: { mkDerivation { pname = "wheb-redis"; version = "0.0.1.0"; - sha256 = "b0108514d32798c3469cd9af9d03538a4010ca4eed0e666aca72e140ae84ac08"; + sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h"; libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ]; homepage = "https://github.com/hansonkd/Wheb-Framework"; description = "Redis connection for Wheb"; @@ -189483,7 +203414,7 @@ self: { mkDerivation { pname = "wheb-strapped"; version = "0.1.0.0"; - sha256 = "b739be48d7105d368a8d8ec9c1d5049c4dab9c93d6eea0ce9c668c22c6bdd3f3"; + sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp"; libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ]; homepage = "https://github.com/hansonkd/Wheb-Framework"; description = "Strapped templates for Wheb"; @@ -189496,7 +203427,7 @@ self: { mkDerivation { pname = "while-lang-parser"; version = "0.1.0.0"; - sha256 = "94f6d8f0fd474166c60523cc70334b651dd95e54a733883858944cd568169836"; + sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll"; libraryHaskellDepends = [ base indents parsec ]; homepage = "https://github.com/davnils/while-lang-parser"; description = "Parser for the While language"; @@ -189511,7 +203442,7 @@ self: { mkDerivation { pname = "whim"; version = "0.1.1"; - sha256 = "4646008833f00514bb046a971ef7ef412617c4917b46b4a68be8571cb7d5ea39"; + sha256 = "0fgasnviqmz8ifkb8ikvj721f9j1xzvix5va0jxi81gh6f400ij6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189528,7 +203459,7 @@ self: { mkDerivation { pname = "whiskers"; version = "0.1.0.3"; - sha256 = "bb1081d4a4b39ddcf1e1e2618b655c0dfae818af0c3b4517bda2896f30d87e4d"; + sha256 = "0kbyv0q6z2d2plblafqcmwcfiyhdbijqnqg2w7qxr7dklka8245v"; libraryHaskellDepends = [ base parsec template-haskell ]; description = "Mustache templates with Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -189540,7 +203471,7 @@ self: { mkDerivation { pname = "whitespace"; version = "0.4"; - sha256 = "e9133161bf712cd584334a4e9d75b1eb7dd64e48f956a73fc6e833a6bc5a09f9"; + sha256 = "1y89bayaccz8qqzsfmpr917dczgbn5srskja6f2dab3ipxhk24z9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ haskell98 random ]; @@ -189555,9 +203486,9 @@ self: { mkDerivation { pname = "whois"; version = "1.2.2"; - sha256 = "6047b0dd4c14a2f1b9b094dd6b8d43e1f9d1c03decc6ed653c9dc50fc2692ea5"; + sha256 = "199fd710zicx7ijyvipc7p0d3yg18f6nppcln2wz38hl9kfv0iv0"; revision = "1"; - editedCabalFile = "c11f42da958683ffb7a2e958dcefe2ef1a3e732732010f44facfbb0fffd7571e"; + editedCabalFile = "07jpszzhzfygz920y09j4xrkw6pgwbpxqn79lavzz0w6jpd447y1"; libraryHaskellDepends = [ base network network-uri split ]; homepage = "http://github.com/relrod/whois-hs"; description = "WHOIS client library"; @@ -189572,7 +203503,7 @@ self: { mkDerivation { pname = "why3"; version = "0.8"; - sha256 = "8e2d6d29c6fd6f0ecd72a28c3075843533db6a086c67a2a9a520f0dcc916fbf5"; + sha256 = "1xgv2v4xrw10lnls4rvc11mdncrmhisk1352fb6hwvzxqqlnsbcf"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath monadLib pretty pretty-show profunctors text @@ -189589,8 +203520,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.0.2"; - sha256 = "c5fa2df76b8391b34f5671c6280bedecd56ee6600db260bd4942bc91cacb41fb"; + version = "0.1.0.3"; + sha256 = "0ygq4h0ihwjxmndd30j2y9sdghnysh78izszg8fdhdl7ncnmpv70"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ]; homepage = "https://github.com/erikd/wide-word"; @@ -189606,7 +203537,7 @@ self: { mkDerivation { pname = "wigner-symbols"; version = "1.0.0"; - sha256 = "0d2ae52728e6ef32519a6b648033185617291e76c4996c7107b9a3caf73db28e"; + sha256 = "13mj7pvwm8xr0xqnr6f4fqg2j5sn30rq0r3bk98k5vz650kyaahd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring cryptonite ]; benchmarkHaskellDepends = [ @@ -189624,7 +203555,7 @@ self: { mkDerivation { pname = "wikicfp-scraper"; version = "0.1.0.8"; - sha256 = "645077540aadceb4de7b095462baa99967dd279203d7ed66a052562ac83b94a3"; + sha256 = "18wl7g42lmjjl1kfvmq3j8kxsrwrm6x64m09gggb9kmd19a7fl34"; libraryHaskellDepends = [ attoparsec base bytestring scalpel-core text time ]; @@ -189642,7 +203573,7 @@ self: { mkDerivation { pname = "wikipedia4epub"; version = "0.0.12"; - sha256 = "6da5c14db47d113f6b75324e3cc77b9641d032af7c443b55a4133e3b33af3521"; + sha256 = "089mmwrknghkliakni3wmwrd0hcngg3kqkijfmmky4bxni6w39bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189662,7 +203593,7 @@ self: { mkDerivation { pname = "wild-bind"; version = "0.1.0.3"; - sha256 = "f2f5764b9b33aee30d87646a849e6db063fde2b92c8bce0e08ebb94b6b9f737f"; + sha256 = "0zvkkxmlpfgb107cx2rcp7igsqxhdng88sk4hw6y7bikkd5pdxgj"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base hspec microlens QuickCheck stm transformers @@ -189679,7 +203610,7 @@ self: { mkDerivation { pname = "wild-bind-indicator"; version = "0.1.0.1"; - sha256 = "d57e697f44510a08f7d7608b181e06b6dea099b4f9ccd46058134105f8677053"; + sha256 = "0lvhczw0ah8kb1hd9k7rnjcs1pmn0qg1i2v0szvhh2ji8iznjznm"; libraryHaskellDepends = [ base containers gtk text transformers wild-bind ]; @@ -189695,7 +203626,7 @@ self: { mkDerivation { pname = "wild-bind-task-x11"; version = "0.1.0.1"; - sha256 = "d49347eadf4db6fe28b5de45db962e489014ebc3a9dc19353994976290527ac3"; + sha256 = "1hvsaa8655wl74sikp59qgmi94285sbdnifynllgxdjdvzm4g4yl"; libraryHaskellDepends = [ base text transformers wild-bind wild-bind-indicator wild-bind-x11 ]; @@ -189712,7 +203643,7 @@ self: { mkDerivation { pname = "wild-bind-x11"; version = "0.1.0.6"; - sha256 = "1e144b2833acee00da55cab3b28b57bc5347186f761cb1d7375532cfca38e4b4"; + sha256 = "1d74735cycjm6zbv273ndwc4flxway5v5cyaapd01vmc6cl4n50y"; libraryHaskellDepends = [ base containers fold-debounce stm text transformers wild-bind X11 ]; @@ -189727,7 +203658,7 @@ self: { mkDerivation { pname = "win-hp-path"; version = "0.1.2"; - sha256 = "d85934e27cf62cb8aefc5bbeb20708062632bee52e5cff79c5dc1d4c18ca308c"; + sha256 = "131hr8c4q7fwqmwzyp1fwnz349h6103v5gjvzjpbhb7ngki38nfq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base split ]; @@ -189744,7 +203675,7 @@ self: { mkDerivation { pname = "windowslive"; version = "0.3"; - sha256 = "7fc9617306ccbe99a8f910ca442bfeabd8e78b8668db773defefa5b41b1fb395"; + sha256 = "15dk3wdv99ggxwypgnv8hs5ygn5bzqml9jhhz6l9kgnc0rrn3jbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189761,7 +203692,7 @@ self: { mkDerivation { pname = "winerror"; version = "1.0.1"; - sha256 = "0d527e4024967909171d3aea30d43abb0fd84306f77aa26625466c0f3de95575"; + sha256 = "0xamx4yhyv264mka4ypp0r1xh3xv7ba31sis3lbhjycn4i07wlhd"; doHaddock = false; description = "Error handling for foreign calls to the Windows API"; license = stdenv.lib.licenses.bsd3; @@ -189775,7 +203706,7 @@ self: { mkDerivation { pname = "winio"; version = "0.1"; - sha256 = "954bcbb0dd5ca68e272d80bf5ce07b2c8fde5d0b7717f55d268b9dc59ce92338"; + sha256 = "0f13x6fcb7cb4rfza5vp1dfxx3rcggh5rgw05lkqx9jwvnqcnjwm"; libraryHaskellDepends = [ base bytestring extensible-exceptions network winerror ]; @@ -189794,9 +203725,9 @@ self: { mkDerivation { pname = "wire-streams"; version = "0.1.1.0"; - sha256 = "96dffb70c08c89589881c96f199d271b55e4a5b3cc5be0f3e24e101858e2fb27"; + sha256 = "09zvw9c1h42fwbry0nycnfjy8m8v4yfijvy9h6c5i2ccq1qgppwn"; revision = "1"; - editedCabalFile = "08816c7fa53b20f52e5c465252c106d9de8e6d9580ec0b6d9f000a34c7bcefc8"; + editedCabalFile = "1j7gpk3k82h0kxnhpv40jmnqxpnr0v0m4lj6bhpga81vlmznr088"; libraryHaskellDepends = [ base binary binary-parsers bytestring io-streams ]; @@ -189814,16 +203745,17 @@ self: { }) {}; "wires" = callPackage - ({ mkDerivation, base, deepseq, profunctors, semigroupoids, these + ({ mkDerivation, base, deepseq, mtl, profunctors, semigroupoids + , these }: mkDerivation { pname = "wires"; - version = "0.1.0"; - sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65"; + version = "0.2.0"; + sha256 = "1c4ic3v3rrqanr6n3yhm8vy5i8sn5lwraks09kav60f4cc42s1nx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq profunctors semigroupoids these + base deepseq mtl profunctors semigroupoids these ]; homepage = "https://github.com/esoeylemez/wires"; description = "Functional reactive programming library"; @@ -189837,7 +203769,7 @@ self: { mkDerivation { pname = "wiring"; version = "0.5.0"; - sha256 = "c442bf4d5beff553c289e459ef31d823569207ffa7afc61ef6cda64793fa01a8"; + sha256 = "1a01za9lg9ndyqgcdbx7zw3r4mi3v0qyyng4i7157xggbd6vyhn4"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base hspec mtl QuickCheck template-haskell transformers @@ -189852,8 +203784,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "wiringPi"; - version = "1.0"; - sha256 = "78449f9f48bab82bf8e268e0b858171e7539d7b9a61dd92c75a9ea7c1a7523d0"; + version = "1.0.1"; + sha256 = "1i4sidhhwmvn15996cv4415nylcra204pa51zd133pnckcqxbb5k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -189869,7 +203801,7 @@ self: { mkDerivation { pname = "with-location"; version = "0.1.0"; - sha256 = "2c91d70cb28d39d6d5fbb37800c7d984aed4254cdcbf03ffa0787404bddefde7"; + sha256 = "1rzxvsyh8x3ql3zh7gyw9hjx9bl4v73h0y5kzgaxcfcdn86dg49c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/sol/with-location#readme"; @@ -189884,7 +203816,7 @@ self: { mkDerivation { pname = "withdependencies"; version = "0.2.4"; - sha256 = "a13eddc8fce5061204abf7289bed49bceb5b86a7981ba6a1b3fe510727fe267f"; + sha256 = "0zr6zqkhflgynfhsc6wqly35psxw97nrna7pmc2141p5zk4dsgm1"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; @@ -189900,14 +203832,14 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.3.3"; - sha256 = "6fdfd607e71b442d17b48ab7e00fe3d8dda2c39cf041134d01d49da83421cf6c"; + version = "0.1.3.4"; + sha256 = "0rqdbxl5381bfvy75bdgr8q40g1ypqgfj29ca5lzsykw5d7i4nzl"; libraryHaskellDepends = [ base base-orphans containers hashable transformers unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; - description = "Generalization of filter and catMaybes"; + description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -189916,7 +203848,7 @@ self: { mkDerivation { pname = "witness"; version = "0.4"; - sha256 = "93c6c83681a3ab94f53e49c07d0d1474e21169f779c917a896c9d6ed1bf01ea0"; + sha256 = "180yy0dyvmn9jsl1gjbryxli3qkl2h6pvh297vsr9ax3h4vciilk"; libraryHaskellDepends = [ base constraints semigroupoids transformers ]; @@ -189930,7 +203862,7 @@ self: { mkDerivation { pname = "witty"; version = "0.0.4"; - sha256 = "03e1dd7bd54f7a762044ce5b9cd49cf5efbddc8e229f159f21515a2424390ccd"; + sha256 = "1k8c74j28nji46gib7r2ivfbvvzmkka9qnyf8hh7cyjgsmxxvq83"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring network unix ]; @@ -189946,9 +203878,9 @@ self: { mkDerivation { pname = "wizards"; version = "1.0.2"; - sha256 = "4ba12c726d60688b8173db3891aa1dce7f57c6364c40ba2f1c2c8d16404bd30b"; + sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab"; revision = "1"; - editedCabalFile = "b3c3ae6f428cc28ab148d2ae62532a5ba3965f11c1f5d99b48b59b5d9af57c97"; + editedCabalFile = "15vwynd5v6xm92dxkxf125grd8sv599n5bnj92qqmhlc89psxhxk"; libraryHaskellDepends = [ base containers control-monad-free haskeline mtl transformers ]; @@ -189963,7 +203895,7 @@ self: { mkDerivation { pname = "wkt"; version = "0.3.1"; - sha256 = "22ed4f892e845b4f660d40bd1b5edca7fcb5e1e05007154d72c093311d975ddd"; + sha256 = "1paxjwfk34y0f96ia1shw3hvbz57vig1pga01mk4ynw45s4lzv92"; libraryHaskellDepends = [ base lens linear trifecta ]; testHaskellDepends = [ base filepath lens linear tasty tasty-golden trifecta @@ -189979,7 +203911,7 @@ self: { mkDerivation { pname = "wl-pprint"; version = "1.2"; - sha256 = "198003fa7edd3a2d625ec54402cdc5645434b60ad5983e93525f58fec9dcdf98"; + sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; license = stdenv.lib.licenses.bsd3; @@ -189992,7 +203924,7 @@ self: { mkDerivation { pname = "wl-pprint-annotated"; version = "0.0.1.4"; - sha256 = "0919c897b894771dd86877c41d6832bc11e4d3800efbebbcf59c10ce7ba848b0"; + sha256 = "1c28m1xww44wynyfpyqfh39y84dw69l1vi3pd3c1sxwlp2bwh689"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq HUnit test-framework test-framework-hunit @@ -190003,6 +203935,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wl-pprint-annotated_0_1_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "wl-pprint-annotated"; + version = "0.1.0.0"; + sha256 = "0c2996x5gdrif1l0lfwlqnka7xp5diac74rckv0jasv2i0333kmp"; + libraryHaskellDepends = [ base containers deepseq text ]; + testHaskellDepends = [ + base containers deepseq tasty tasty-hunit text + ]; + homepage = "https://github.com/minad/wl-pprint-annotated#readme"; + description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wl-pprint-ansiterm" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl , nats, semigroups, text, transformers, wl-pprint-extras @@ -190010,7 +203960,7 @@ self: { mkDerivation { pname = "wl-pprint-ansiterm"; version = "0.2.0.0"; - sha256 = "ffce8de40e3bf7375bfe8cde58e25309988423ee4cb78be5760840858a3b440b"; + sha256 = "02s47f58ah08fvjqpdscxqiq9609agi5iplczrdkgxrv1vj8vkpz"; libraryHaskellDepends = [ ansi-terminal base bytestring containers mtl nats semigroups text transformers wl-pprint-extras @@ -190028,7 +203978,9 @@ self: { mkDerivation { pname = "wl-pprint-console"; version = "0.1.0.1"; - sha256 = "a7c7f6aa14f78bf6a8aae1a629433872f8bfb377b1392f08047520cdcb3b70fc"; + sha256 = "1z3h7g5ws83m0h42yfdifyrvzy3j711jk9p1malgd2zp2jmgdix7"; + revision = "1"; + editedCabalFile = "1mlbjjk5mhv3jxzqvfspm07di09pns0xfalhx68k2r39z4lj1fa5"; libraryHaskellDepends = [ base bytestring colorful-monoids text wl-pprint-annotated ]; @@ -190045,7 +203997,7 @@ self: { mkDerivation { pname = "wl-pprint-extras"; version = "3.5.0.5"; - sha256 = "a9c21a85a729191fc422938a1f785d61be52f3a2923d8d79dade9b21e8e98d8f"; + sha256 = "13wdx7l236yyv9wqsgcjlbrm5gk1bmw1z2lk4b21y699ly2imhm9"; libraryHaskellDepends = [ base containers nats semigroupoids semigroups text utf8-string ]; @@ -190064,7 +204016,7 @@ self: { mkDerivation { pname = "wl-pprint-terminfo"; version = "3.7.1.4"; - sha256 = "3cdaba571fc3f8c51e39d14773b23f0f8237bb2d33dbaf9230a98d4b2f388d20"; + sha256 = "084d70plp3d9629aznrk5nxkg0hg7yr76iyi74gcby633xbvmniw"; libraryHaskellDepends = [ base bytestring containers nats semigroups terminfo text transformers wl-pprint-extras @@ -190079,7 +204031,7 @@ self: { mkDerivation { pname = "wl-pprint-text"; version = "1.1.1.0"; - sha256 = "2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd"; + sha256 = "1k8ar8g03x3j95xisdqwzw2mjln7mpp3r2klvyhi5n853hhchq19"; libraryHaskellDepends = [ base base-compat text ]; description = "A Wadler/Leijen Pretty Printer for Text values"; license = stdenv.lib.licenses.bsd3; @@ -190092,7 +204044,7 @@ self: { mkDerivation { pname = "wlc-hs"; version = "0.1.0.0"; - sha256 = "696faa722f83aa50329db3573eaa0442a9232e82d0ada7b870dafe66101ca57c"; + sha256 = "0z553h86dznsf2wagbfhh8p27aa20jm3wmxkklr51al35xralvv9"; libraryHaskellDepends = [ base containers data-default lens pretty process transformers xkbcommon @@ -190116,7 +204068,7 @@ self: { mkDerivation { pname = "wobsurv"; version = "0.1.0"; - sha256 = "02d28e70f64614d1e901a699d73e1e87bbdb32475a9af4f91a460147723f52f0"; + sha256 = "1w2j7xr4f0a63bwz96js8wrdpfw73qzdg6d607lx2526yrq8xlh2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190146,7 +204098,7 @@ self: { mkDerivation { pname = "woffex"; version = "0.1"; - sha256 = "bbf68066fff431fad5a5db99d056d3f95f46f3ebe1d2d90aa1c48d4870d1032d"; + sha256 = "0b83s5q4i3f4l45dklp1xgrlcpzrsdbd16fvlpazlcglzxk81xmv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -190162,7 +204114,7 @@ self: { mkDerivation { pname = "wol"; version = "0.2"; - sha256 = "5c6c6b4d393a205a3a5e3a658fba4bff9cee0f8f9ab73dcccee4ac9dc4d30f38"; + sha256 = "0f0gsg29vb74rv63vdwsiw7yx77z9fx8yr9sbqx5l81s756nnv2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring network split ]; @@ -190173,24 +204125,21 @@ self: { }) {}; "wolf" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-swf, base, bytestring, conduit, conduit-combinators - , conduit-extra, directory, exceptions, filemanip, filepath - , lifted-async, monad-control, optparse-applicative - , optparse-generic, preamble, process, resourcet, shakers, text - , time, uuid, yaml + ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring + , conduit, directory, exceptions, filemanip, filepath, http-types + , lifted-async, lifted-base, optparse-generic, preamble, process + , shakers, time, uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.3.8"; - sha256 = "af9021f6b883cd9f90d984e6e66535f17738d0064fa96bd0f39938eeb863dd4b"; + version = "0.3.23"; + sha256 = "0vj6195qqgx1ypv4h6jha3ayi73gcqxwwvcd7km12j4al68x6nvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-swf base - bytestring conduit conduit-combinators conduit-extra directory - exceptions filemanip filepath lifted-async monad-control - optparse-applicative preamble process resourcet text time uuid yaml + aeson amazonka amazonka-swf base bytestring conduit directory + exceptions filemanip filepath http-types lifted-async lifted-base + preamble process time uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/wolf"; @@ -190204,7 +204153,7 @@ self: { mkDerivation { pname = "woot"; version = "0.0.0.6"; - sha256 = "4e7b4c12fe18a9e6d649dcd0ab4ea1910a340e3a4ebb1f341484beb359ce82b7"; + sha256 = "1dw2rrcv7gl42hs1zfsf787382lil57apl6w97bfda8qzq94qysf"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec vector ]; homepage = "https://github.com/TGOlson/woot-haskell"; @@ -190217,9 +204166,9 @@ self: { mkDerivation { pname = "word-trie"; version = "0.3.0"; - sha256 = "a3f3c2c088c64219ae35f7383a5dc1a368217183ba603e98785c110ac3f29282"; + sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3"; revision = "1"; - editedCabalFile = "85582eefb0020e6e35a0e2588e1dd647fb20bb7f70108f29493f994af5b74a05"; + editedCabalFile = "01aanzslm69z94lqy43hgyxj1ys7sqfqwn72l0snw3h2n3pjwn45"; libraryHaskellDepends = [ base binary containers ]; testHaskellDepends = [ base binary containers hspec QuickCheck ]; homepage = "https://github.com/yi-editor/word-trie"; @@ -190232,13 +204181,26 @@ self: { mkDerivation { pname = "word-vector"; version = "0.1.0.0"; - sha256 = "b5c9d2f8d6b2f48bed56e87ef0ab676fa236d6961d467e7892cd407c72ee6bba"; + sha256 = "1fkbxrr7qh6dj9w7wihxjvb3d8kgcymz0zp8avnqpx5jsvwd5jdm"; libraryHaskellDepends = [ base bytestring ghc-prim vector ]; homepage = "https://github.com/andrewthad/bytestring-coerce"; description = "Initial project template from stack"; 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 @@ -190246,7 +204208,7 @@ self: { mkDerivation { pname = "word24"; version = "2.0.1"; - sha256 = "c34ba17cc88df314151ef27dea192102ed73d5f0678f1359a5fe59799dc3a086"; + sha256 = "11m0qffpjngylmci73v7y3ap7v8244cylzgj3qai9wwdr1ya2jy3"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck test-framework test-framework-quickcheck2 @@ -190263,7 +204225,7 @@ self: { mkDerivation { pname = "word8"; version = "0.1.2"; - sha256 = "3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd"; + sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion ]; @@ -190271,12 +204233,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wordchoice" = callPackage + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams + , containers, criterion, Glob, lens, optparse-applicative, pandoc + , system-filepath, text + }: + mkDerivation { + pname = "wordchoice"; + version = "0.1.1.0"; + sha256 = "1san5jgb2nc0shjk38jxgnqdj0mq248gqsn9zc1ldhai1qqy490h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Chart Chart-diagrams containers Glob lens + optparse-applicative pandoc system-filepath text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/githubuser/wordchoice#readme"; + description = "Get word counts and distributions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wordcloud" = callPackage ({ mkDerivation }: mkDerivation { pname = "wordcloud"; version = "0.1"; - sha256 = "a5b1c3fb58046e74de6ab36e466938432383c10417301ff764bdcc4060d9acc9"; + sha256 = "1jdcv5h41k5xckviyc0p0k0q68s371llcvmkdbg78vh4b3xw7cd5"; doHaddock = false; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -190287,7 +204272,7 @@ self: { mkDerivation { pname = "wordexp"; version = "0.2.0.0"; - sha256 = "718af118344b711314a7ca69ae19ce508bb76185d9776342548740efd7dfd7c1"; + sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki"; libraryHaskellDepends = [ array base semigroups ]; libraryToolDepends = [ c2hs ]; description = "wordexp(3) wrappers"; @@ -190301,7 +204286,7 @@ self: { mkDerivation { pname = "wordpass"; version = "1.0.0.7"; - sha256 = "2283d16807261457c54022ca028e3c3a7fec1df6b66b9074ddbf0f14e721d9d8"; + sha256 = "1n6r47ki83xzvms90sxnyqfyqzrs7j705ji2832mf5160xld30r2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190322,7 +204307,7 @@ self: { mkDerivation { pname = "words"; version = "0.1.2"; - sha256 = "2024553a9a31c1f0e87b3f2f0249b6ed384cbe1bdcb0a0a79b0d4f9722565259"; + sha256 = "0najaqi9fkqdkfks1c6w3fz4qf7dnr4h4brzgglg1h9ik8x5a910"; libraryHaskellDepends = [ base directory text ]; description = "Cross-platform access to a list of words"; license = stdenv.lib.licenses.bsd3; @@ -190333,7 +204318,7 @@ self: { mkDerivation { pname = "wordsearch"; version = "1.0.1"; - sha256 = "a2931d01f6197c7c3164001dec4ec0281a9b057f3728ad12a333f6327854014b"; + sha256 = "0jq1aiw35xiklc9asa1pgw2rn6i8q17fq780chqpqz0ryq0iv4x2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers fclabels ]; @@ -190350,7 +204335,7 @@ self: { mkDerivation { pname = "wordsetdiff"; version = "0.0.3.1"; - sha256 = "1c00a83911d9ec1da4712f2fc35fc1211a1ff87d8c6d7f99d4ad3ba46fd0eb4f"; + sha256 = "0kzbs1ps8fxdsjcpyvccgpw1y6i1q5gw6brgf6j1vv6r24wsh00w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -190367,7 +204352,7 @@ self: { mkDerivation { pname = "workdays"; version = "0.1.1"; - sha256 = "871cf67b17ca57f91ce73295311e4ffa5f6c8301908cbd182d6b7c50d48289e7"; + sha256 = "1rw9hba50z3b5lcbv34h061nqpzs9wg3359jwwfgjmya2xxzc747"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers doctest hspec ]; homepage = "https://github.com/stackbuilders/workdays"; @@ -190376,6 +204361,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "workflow-extra" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, doctest + , Earley, exceptions, free, hspec, http-types, QuickCheck + , transformers, workflow-types + }: + mkDerivation { + pname = "workflow-extra"; + version = "0.0.1"; + sha256 = "0vxia6xy9zjwphj50n1lb61l89sdskz9hsmk4nhy83if75rhbb6m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Earley exceptions free http-types transformers + workflow-types + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "http://github.com/sboosali/workflow-extra#readme"; + description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "workflow-osx" = callPackage ({ mkDerivation, base, bv, bytestring, exceptions, filepath, free , http-types, mtl, transformers @@ -190383,7 +204391,7 @@ self: { mkDerivation { pname = "workflow-osx"; version = "0.0.1"; - sha256 = "1bb9b7e9df0d99893301f452f35f6f181009617a481d9f25cb14d5bc592bbdd2"; + sha256 = "1lmx5dcvrm8lrcjry7a8g9hhj40qdxgz6lpl04rqk68dvzlvgf8v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190397,19 +204405,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "workflow-types" = callPackage - ({ mkDerivation, base, comonad, containers, deepseq, Earley - , exceptions, free, hashable, semigroups, split, transformers + "workflow-pure" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, exceptions + , free, hspec, mtl, QuickCheck, semigroups, transformers + , workflow-types }: mkDerivation { - pname = "workflow-types"; - version = "0.0.0"; - sha256 = "54991eaf641bdf43e0d3e99bee650fa6ae2690adeb34d0f6378b5a0d93aaafa7"; + pname = "workflow-pure"; + version = "0.0.1"; + sha256 = "1m7jh89k51iyz3kgj676dhgky9sbm2id5r1kv4bis96x3qiljrwz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base comonad containers deepseq Earley exceptions free hashable - semigroups split transformers + base deepseq exceptions free mtl semigroups transformers + workflow-types + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "http://github.com/sboosali/workflow-pure#readme"; + description = "manipulate `workflow-types:Workflow`'s"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "workflow-types" = callPackage + ({ mkDerivation, base, containers, exceptions, free, spiros, split + , text, transformers + }: + mkDerivation { + pname = "workflow-types"; + version = "0.0.1"; + sha256 = "084cbqxyw1smf3idckpg07091xcbpbnhvacjyzg0drpn8gwmh3n2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers exceptions free spiros split text transformers ]; executableHaskellDepends = [ base ]; homepage = "http://github.com/sboosali/workflow-types#readme"; @@ -190422,7 +204453,7 @@ self: { mkDerivation { pname = "workflow-windows"; version = "0.0.0"; - sha256 = "4c922f26ea5580022b8ecd184ce473eabead4a035cc95ea9394f9fc04efdff92"; + sha256 = "14pzzm7c17sg76lmxjaw0d5avgpafgj4q66diqmh502mx8k2z4jc"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ base ]; @@ -190438,7 +204469,7 @@ self: { mkDerivation { pname = "wp-archivebot"; version = "0.1"; - sha256 = "bfcc1acc120088b92715e02c1e7194980cc0410334453fc00fc8caf281395811"; + sha256 = "04aq760z5jn81z03yi9l0d0w034qjiqiwb702lkvk2002b61mk5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -190454,7 +204485,7 @@ self: { mkDerivation { pname = "wrap"; version = "0.0.0"; - sha256 = "f8bbc4b417b2291532784d0c7940c0f1a24d054e6012963f7d727ad13977f50e"; + sha256 = "03pmfwwx2ykjglzrc4k09q2lv8piq107j32dg0r1aadj2ysc9fzq"; libraryHaskellDepends = [ base ]; description = "Wrap a function's return value with another function"; license = stdenv.lib.licenses.bsd3; @@ -190465,7 +204496,7 @@ self: { mkDerivation { pname = "wraparound"; version = "0.0.2"; - sha256 = "8e85980e6ce9ae7553d63e4fb4945a1b25ee88d1ba0df855d223f4ea56f93598"; + sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf"; libraryHaskellDepends = [ base ]; homepage = "http://frigidcode.com"; description = "Convenient handling of points on a seamless 2-dimensional plane"; @@ -190480,7 +204511,7 @@ self: { mkDerivation { pname = "wraxml"; version = "0.4.4.1"; - sha256 = "828d9250db9472c321c55d08f9daa2c4c9995e95d2fd964ef0c1d16b32c75613"; + sha256 = "04snqwr6plf1y179dzfjjmg9kjf4lbdgj22xqlhw6wllvd8953c2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190510,7 +204541,7 @@ self: { mkDerivation { pname = "wrecker"; version = "0.1.3.3"; - sha256 = "be69fcac9665d15256247f674649a3f3b302e4c87184dd82500265722270e4ad"; + sha256 = "1bg4f0i74r82a21dv13ir3j05czkld4lcrvz4ib55lb5jsngqsdy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190553,8 +204584,8 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.0.0"; - sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5"; + version = "0.5.0.1"; + sha256 = "138n138rczs5xb7pr25b5a2ajhhxph7vfrh02x71w2alh2xr4akc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190592,7 +204623,7 @@ self: { mkDerivation { pname = "wreq-sb"; version = "0.4.0.0"; - sha256 = "dfc9c0a13696bbe2521a9d440bd9c8a57b8dccef270bdffb011bf320a7971b54"; + sha256 = "0m0vjykj1wqv07xxy2r7xz68syx5r3chni4x399f5fwn6shw1jfz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190620,8 +204651,8 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: mkDerivation { pname = "wreq-stringless"; - version = "0.5.0.0"; - sha256 = "e58cb6e6c44b33df3507c1e5fc3f7cea2961a8244c3c6840a085327ce731b921"; + version = "0.5.0.1"; + sha256 = "0nwn7y593hxf971h0pr7l7l76wl6nmb622yasirzczx8qxvmr5ya"; libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; homepage = "https://github.com/j-keck/wreq-stringless#readme"; description = "Simple wrapper to use wreq without Strings"; @@ -190635,7 +204666,7 @@ self: { mkDerivation { pname = "wright"; version = "0.1.0.2"; - sha256 = "f193da24c964d1dff94f9a6b21f80828c4581d2170ab6b0d90f952edb70800a0"; + sha256 = "180012vyslprj06npavh44fmii1813w22sws9zwxzlb4r4jdm4zi"; libraryHaskellDepends = [ base bed-and-breakfast containers ]; testHaskellDepends = [ assertions base bed-and-breakfast containers filepath lens @@ -190645,6 +204676,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "write-buffer-core" = callPackage + ({ mkDerivation, base, bytestring, clock, dlist, exceptions + , lifted-async, lifted-base, monad-control, mtl, stm, stm-chans + }: + mkDerivation { + pname = "write-buffer-core"; + version = "0.1.0.0"; + sha256 = "066w2xpmf988r27i987ia47nska33hs60h3xwk69dm7vg42ylh3m"; + libraryHaskellDepends = [ + base bytestring clock dlist exceptions lifted-async lifted-base + monad-control mtl stm stm-chans + ]; + homepage = "https://github.com/parsonsmatt/write-buffer#readme"; + description = "Buffer your writes, transparently"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "write-buffer-stm" = callPackage + ({ mkDerivation, base, stm, stm-chans, write-buffer-core }: + mkDerivation { + pname = "write-buffer-stm"; + version = "0.1.0.0"; + sha256 = "0q03pnkw3343jmcs2f2mrx84g3wj3plcagnjdviphzsg7rrf3a4l"; + libraryHaskellDepends = [ base stm stm-chans write-buffer-core ]; + homepage = "https://github.com/parsonsmatt/write-buffer#readme"; + description = "A write buffer for STM channels and queues"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "writer-cps-full" = callPackage ({ mkDerivation, base, writer-cps-lens, writer-cps-morph , writer-cps-mtl, writer-cps-transformers @@ -190652,7 +204712,7 @@ self: { mkDerivation { pname = "writer-cps-full"; version = "0.1.0.0"; - sha256 = "ba51df5149470be6d70fd179f2af4cae30824a3a63528f1549a97f57610a5e95"; + sha256 = "15ay19hmfzx994aqylk379584c5f9jpz4yfi1zbyc2s7958xylds"; libraryHaskellDepends = [ base writer-cps-lens writer-cps-morph writer-cps-mtl writer-cps-transformers @@ -190668,8 +204728,8 @@ self: { }: mkDerivation { pname = "writer-cps-lens"; - version = "0.1.0.0"; - sha256 = "23daa611fc16cddc8b8df3436818870c34ec87795b960b3cea2a3e3c408e3448"; + version = "0.1.0.1"; + sha256 = "1vq6sfq7c58py9p3lgq2b4l9rl46n555vlmxfp6b7p469xpqnsrd"; libraryHaskellDepends = [ base lens profunctors transformers writer-cps-mtl writer-cps-transformers @@ -190686,7 +204746,7 @@ self: { mkDerivation { pname = "writer-cps-monads-tf"; version = "0.1.0.1"; - sha256 = "d844c0a995898968ae9ed7f53d3ac8eabd6f9623b70c22214f956ea3692b9583"; + sha256 = "10wm5dls6vlm9whj435p4fb6zggar0x3vxfpksp6i2c9jnlw0i6q"; libraryHaskellDepends = [ base monads-tf transformers writer-cps-transformers ]; @@ -190700,8 +204760,10 @@ self: { ({ mkDerivation, base, mmorph, writer-cps-transformers }: mkDerivation { pname = "writer-cps-morph"; - version = "0.1.0.1"; - sha256 = "bd685fa9dec074ef7d0f545f95eaf20bd0b600d2fb067f3dcfdc3a3b0e678cee"; + 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"; @@ -190713,8 +204775,8 @@ self: { }: mkDerivation { pname = "writer-cps-mtl"; - version = "0.1.1.2"; - sha256 = "55d14bfe21dad79b4254c188b5b3f30144d741a821bfb024e38c798dbf7c5f61"; + version = "0.1.1.4"; + sha256 = "0w2843z499d4nvx8jkq398rzp0zwqp4aydwqidpdrh2xdavv78v2"; libraryHaskellDepends = [ base mtl transformers writer-cps-transformers ]; @@ -190727,14 +204789,50 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; - version = "0.1.1.2"; - sha256 = "3c82d9a2157da42229b9f7eaa476d26ce9ce2f3910efe8afc603e07fa4da348a"; + version = "0.1.1.3"; + sha256 = "1bjarnjz4v07wnkaqn46mrhxvy2f9anq6aw6lq3cf4xlzlr2i8la"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/minad/writer-cps-transformers#readme"; description = "WriteT and RWST monad transformers"; license = stdenv.lib.licenses.bsd3; }) {}; + "wryte" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "wryte"; + version = "0.2.0.0"; + sha256 = "1hb7dh4sayy11whx25012pwc914g6v2dl8gldc2ipkzaa6wpycsh"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/tdammers/wryte#readme"; + description = "Pretty output for source generators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ws-chans" = callPackage + ({ mkDerivation, async, base, http-types, HUnit, network + , QuickCheck, quickcheck-instances, test-framework + , test-framework-quickcheck2, text, unagi-chan, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "ws-chans"; + version = "0.1.0.0"; + sha256 = "0r1n3i6r8zkm5li2gx2dhix94q8vyr7jvjqjqrr4yl0icx5k9dbh"; + libraryHaskellDepends = [ + async base network unagi-chan websockets + ]; + testHaskellDepends = [ + base http-types HUnit QuickCheck quickcheck-instances + test-framework test-framework-quickcheck2 text unagi-chan wai + wai-websockets warp websockets + ]; + homepage = "https://github.com/shmish111/ws-chans"; + description = "Unagi chan based websocket client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wsdl" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types @@ -190742,7 +204840,7 @@ self: { mkDerivation { pname = "wsdl"; version = "0.1.0.1"; - sha256 = "2e4d565f9d45f420f07b34b6309a15a7f5cac96c657e4afdfa035cf46c135c06"; + sha256 = "01jw2dng8p03zbyllzk5dk4wmxd72nd31dilggq21x25kmgmck9f"; libraryHaskellDepends = [ base bytestring conduit exceptions mtl network-uri resourcet text xml-conduit xml-types @@ -190761,7 +204859,7 @@ self: { mkDerivation { pname = "wsedit"; version = "0.1.0.0"; - sha256 = "310bd1514a5375503e924d21fca8f54f3667f71659473fb298cf5e2158da6580"; + sha256 = "1035v9c22pngk2r3yisr2vvnfdjgynlgq8adj8z50xak998x22ri"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -190777,7 +204875,7 @@ self: { mkDerivation { pname = "wtk"; version = "0.2.1"; - sha256 = "e960379878738369c628b7b0b0cb1aa1fdca36231d0145773b7b195cf4041e20"; + sha256 = "080y0ks5q6bv7dvla08x4cvcmzd13b5v1c5p5336k0vkg2c3fq79"; libraryHaskellDepends = [ base old-locale time transformers ]; description = "Wojcik Tool Kit"; license = stdenv.lib.licenses.bsd3; @@ -190791,7 +204889,7 @@ self: { mkDerivation { pname = "wtk-gtk"; version = "0.2"; - sha256 = "bee0601aa4534a3709da00680b354a481f413219ffca7fccde329c3fd0dd2e59"; + sha256 = "0n9fvp83z71jvv67zjpz34r427s898shns00v84kfjjklhd61q5y"; libraryHaskellDepends = [ base containers gtk lenses mtl old-locale parsec time wtk ]; @@ -190807,7 +204905,7 @@ self: { mkDerivation { pname = "wumpus-basic"; version = "0.24.0"; - sha256 = "cf568cbdd30be89635ea5cf9c515e7ee0ae5d11dc28a51f7374ca6a1e4a650d5"; + sha256 = "1mahlvja39jc6zvm32n23p8ya2pfwwawbyawx8srds0bsfyqqmng"; libraryHaskellDepends = [ base containers directory filepath vector-space wumpus-core ]; @@ -190822,9 +204920,9 @@ self: { mkDerivation { pname = "wumpus-core"; version = "0.52.1"; - sha256 = "a8d92ed717140823acee79c5b6bfc2a6928619ce3c8f82cf1f59ecb47a480983"; + sha256 = "10q991xb9v2r3z7q53rwrqcqd4m6qazvdibrxsn2620l2zbjxnd8"; revision = "1"; - editedCabalFile = "309c49da6f6eb268ebcbe9ed3faac18c3e25c884b0b16b7c8e29dfd8a0705fcb"; + editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h"; libraryHaskellDepends = [ base containers time vector-space ]; homepage = "http://code.google.com/p/copperbox/"; description = "Pure Haskell PostScript and SVG generation"; @@ -190839,7 +204937,7 @@ self: { mkDerivation { pname = "wumpus-drawing"; version = "0.9.0"; - sha256 = "bc2f2acc1fc73f574994a573d7bef29b744be8156be0800c8a5f1834471332f9"; + sha256 = "1y9j2d3k862zi8681q3b2pl4nx4vyazdfwx5ji4mfgy73z62lbxw"; libraryHaskellDepends = [ base containers vector-space wumpus-basic wumpus-core ]; @@ -190856,7 +204954,7 @@ self: { mkDerivation { pname = "wumpus-microprint"; version = "0.14.0"; - sha256 = "9fa5acb4a96f82893b03ba47a75252bcc4d54107542df8bd4c0a1f6d3f443ce7"; + sha256 = "1rrw8hzns7qa9jyzhbal0x0xbi5wa99afixs0cxqk0kgm6sar9cz"; libraryHaskellDepends = [ base vector-space wumpus-basic wumpus-core wumpus-drawing ]; @@ -190873,7 +204971,7 @@ self: { mkDerivation { pname = "wumpus-tree"; version = "0.20.0"; - sha256 = "4aa239fbc92bf1acd9296221b622b4053c8a53c9e7cc08bb08ab7b45629ecdf6"; + sha256 = "1xndkri4ayxb12xhik77r59qlg05nhibc8b257csrw9br7xkk8ja"; libraryHaskellDepends = [ base containers vector-space wumpus-basic wumpus-core wumpus-drawing @@ -190889,8 +204987,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.3"; - sha256 = "691f03173df3b9af98760f27597318e3d028bef2d65ed58ea9e1fabf11bec8b0"; + version = "1.1.4"; + sha256 = "0nzxbnab5gskgp9aixnpszhr9lw6yni64qqx4w5hab3mj6gindkm"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -190903,8 +205001,8 @@ self: { ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { pname = "wx"; - version = "0.92.2.0"; - sha256 = "a1d02b17cd336f0c435381c9f2ce74aad2059c56a00c678954089b74065a97fb"; + version = "0.92.3.0"; + sha256 = "04ccw9g8a08ipp4r1282jzgmx0lvxsbwgiasxq7ivij133mspjxx"; libraryHaskellDepends = [ base stm time wxcore ]; homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell"; @@ -190917,7 +205015,7 @@ self: { mkDerivation { pname = "wxAsteroids"; version = "1.1.0.1"; - sha256 = "45143005f69843633246948d5070e346324718d7387faf58af8df57828ee319b"; + sha256 = "16rixql7ixcdmxcayzrqswc4fcj6wdq513cl8qr66hwqyq2k0525"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory random wx wxcore ]; @@ -190932,7 +205030,7 @@ self: { mkDerivation { pname = "wxFruit"; version = "0.1.2.1"; - sha256 = "e99e16e48efc76e65981f1a9a94cb99a6621fbec3f3ac9c22f46f16c3f5ac026"; + sha256 = "09n0b8znrwa65z1cjfizxkxj2rlsp56akagih5cycxpwivj1d7p9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base old-time wx wxcore Yampa ]; @@ -190948,7 +205046,7 @@ self: { mkDerivation { pname = "wxSimpleCanvas"; version = "0.0.0.0"; - sha256 = "a2200569c49f7b6dcefe39ddc374d5325cb1fd9c001772edb340a8ba9b6c2061"; + sha256 = "0q90djdvma20ngnp45q0kkyv2p1jsmsc7p9rzv76sywzqilha852"; libraryHaskellDepends = [ base cubicbezier wx wxcore ]; description = "Simple zoomable canvas for wxHaskell"; license = stdenv.lib.licenses.bsd3; @@ -190956,16 +205054,21 @@ self: { }) {}; "wxc" = callPackage - ({ mkDerivation, base, libX11, mesa, split, wxdirect, wxGTK }: + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , libX11, mesa, process, split, wxdirect, wxGTK + }: mkDerivation { pname = "wxc"; - version = "0.92.2.0"; - sha256 = "e0da20807bafb22d51a0922211da11eb428b2a6661cb53bc98f6e17be9775191"; + version = "0.92.3.0"; + sha256 = "0i7z4avy57qzrykz3kddfn313zddp3lnyl9a0krx5f2k3b2pz8i8"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath process split + ]; libraryHaskellDepends = [ base split wxdirect ]; librarySystemDepends = [ libX11 mesa ]; libraryPkgconfigDepends = [ wxGTK ]; doHaddock = false; - postInstall = "cp -v dist/build/libwxc.so.0.92.2.0 $out/lib/libwxc.so"; + postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $out/lib/libwxc.so"; postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs"; homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell C++ wrapper"; @@ -190975,13 +205078,15 @@ self: { inherit (pkgs) wxGTK;}; "wxcore" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, parsec, stm, time, wxc, wxdirect, wxGTK + ({ mkDerivation, array, base, bytestring, Cabal, containers + , directory, filepath, parsec, process, stm, time, wxc, wxdirect + , wxGTK }: mkDerivation { pname = "wxcore"; - version = "0.92.2.0"; - sha256 = "76128916c5d5df9cea9fc1e1b3b56d800d87874a431e98fca4427cb41cfe283e"; + version = "0.92.3.0"; + sha256 = "1r4mf5aik7sabb0kwr31sx85j9bk22y0g7606wlaxxs4zkly2lz0"; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base bytestring containers directory filepath parsec stm time wxc wxdirect @@ -190999,8 +205104,8 @@ self: { }: mkDerivation { pname = "wxdirect"; - version = "0.92.2.0"; - sha256 = "2303834061c544f7e32ffd7aaf91e644ee89e178487689f109f06625f0eefd3b"; + version = "0.92.3.0"; + sha256 = "0yin3vc15payrq1nz2g4d34c5dc7lk8b8rfgp0gzpp278dh0zih3"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -191017,7 +205122,7 @@ self: { mkDerivation { pname = "wxhnotepad"; version = "1.2.0"; - sha256 = "d77f955dcc41653daf2acd9d943e2dc68a14c8f2299f01848789cd7a963f0981"; + sha256 = "10897yb7mkc9hy2037r9yb4192n65lz997fd5apksra1rifrazyp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base wx wxcore ]; @@ -191032,7 +205137,7 @@ self: { mkDerivation { pname = "wxturtle"; version = "0.0.1"; - sha256 = "c74ea55899a2b0efb73fe63493007fb9b06107c3fbbd392c505128e95a8aab69"; + sha256 = "0sdbi9dfja2ia0n3kggvqc3n3c5rgw096d767yvyzc52k5caakn7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191051,7 +205156,7 @@ self: { mkDerivation { pname = "wybor"; version = "0.1.0"; - sha256 = "c63dbb0bcc019c35f1ce7abfad5486a257137c097e30b77048a89cb3ae84ce33"; + sha256 = "0cyfhjpb775891qbfc3y15y16mx2hraavgvsrvqkb701rh5vngf6"; libraryHaskellDepends = [ ansi-terminal base conduit containers lens resourcet semigroups terminal-size text transformers unix @@ -191072,7 +205177,7 @@ self: { mkDerivation { pname = "wyvern"; version = "0.1"; - sha256 = "d842d0c9b3d62817d666a56fa607ec0f704c2262824b9dcc5976ab1c5829fb90"; + sha256 = "147v55c1ravnb769sjw2c8i4qw0gxh3scvx5cvb1fa6nng4x0hnq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -191092,7 +205197,7 @@ self: { mkDerivation { pname = "x-dsp"; version = "0.2.3.1"; - sha256 = "129207d635affd3f1d83d8d2279f0636c99b1613df8f853071fabc4a93ff838a"; + sha256 = "12l3zy9lmg7sf4q8b3yz2cb9pj9n0sgjglnqhcfkzzdg6pb0g4hj"; libraryHaskellDepends = [ array base bytestring containers monads-tf text transformers type-level @@ -191108,9 +205213,9 @@ self: { mkDerivation { pname = "x11-xim"; version = "0.0.9.0"; - sha256 = "3ccb05847f7eacd607db095e4f655984607f46313d6b70130d09fd096442c76a"; + sha256 = "0sn789j0kz891l9p0srx6537yq44b5jlyph9vc3xdb3ygy20bjrw"; revision = "1"; - editedCabalFile = "4404aa037f4df2ef8cd16834c8149d596f09b30379f0b85a3b8db9ddd30fa6b0"; + editedCabalFile = "1c561z9xvfcd7ddbiw3r0frhjvsrklachd38s66fzwjdgw1sl124"; libraryHaskellDepends = [ base utf8-string X11 ]; homepage = "https://github.com/YoshikuniJujo/x11-xim_haskell/wiki/"; description = "A binding to the xim of X11 graphics library"; @@ -191122,7 +205227,7 @@ self: { mkDerivation { pname = "x11-xinput"; version = "0.1.0.0"; - sha256 = "3b095ec124840ada7e1458f27525515de5fc2c026a9810d4fc0f7b299d373296"; + sha256 = "15ij6yfjjyqgzka1163a08ngrraxa4jpbwjq2izdl2l44k0mw29v"; libraryHaskellDepends = [ base containers mtl X11 ]; librarySystemDepends = [ libXi ]; libraryToolDepends = [ c2hs ]; @@ -191140,7 +205245,7 @@ self: { mkDerivation { pname = "x509"; version = "1.6.5"; - sha256 = "b53894214e23ab2795f2a9f4c885e37b35a223bbc03763b0017ce06dc8394783"; + sha256 = "10s77746vq3w06q66dy0pcis4dbvwf2wix59yaajgar39qhr8f5m"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -191161,7 +205266,7 @@ self: { mkDerivation { pname = "x509-store"; version = "1.6.2"; - sha256 = "49fd261c7e55a45fd357931a6d9f81e22f242e6047304d3e2662e43db94d807b"; + sha256 = "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring containers cryptonite directory filepath mtl pem x509 @@ -191178,7 +205283,7 @@ self: { mkDerivation { pname = "x509-system"; version = "1.6.4"; - sha256 = "d98ef028855ad73a872ed86026f205aba383378bf1e63462c5d3e4733b60ff4c"; + sha256 = "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr"; libraryHaskellDepends = [ base bytestring containers directory filepath mtl pem process x509 x509-store @@ -191196,7 +205301,7 @@ self: { mkDerivation { pname = "x509-util"; version = "1.6.1"; - sha256 = "d534388d8c633b7dfb0f06a7b498f91f4dfd225b4cd1dd535f45b6e085c9078d"; + sha256 = "1387r62y1dj5bx9xvlacbcigsk8zz6cb99q61zxpsfv3ij6khd6m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -191216,7 +205321,7 @@ self: { mkDerivation { pname = "x509-validation"; version = "1.6.5"; - sha256 = "d1f73197677b6d19795fc80e4a1fa93e810d567ee4e3edc74e841b3eb20e1ca4"; + sha256 = "190w1sr3w6w49v3yvqz4grb0v09ym4gll3n8bxwijvbvcybk3xyi"; libraryHaskellDepends = [ asn1-encoding asn1-types base byteable bytestring containers cryptonite data-default-class hourglass memory mtl pem x509 @@ -191233,8 +205338,8 @@ self: { }: mkDerivation { pname = "x86-64bit"; - version = "0.4.4"; - sha256 = "4deca451bb872b0ea29851e51c04d88af735dff454e9df38d3dc998c531bc9e2"; + version = "0.4.5"; + sha256 = "1dgl53xra7m8rfczfjvibn8gcmacpg3fagz0yysk1b7sjvlim7cp"; libraryHaskellDepends = [ base deepseq monads-tf QuickCheck tardis vector ]; @@ -191254,7 +205359,7 @@ self: { mkDerivation { pname = "xattr"; version = "0.6.2"; - sha256 = "380db69f9b4e56f3173f421f98ae23a1ffb65749f9fdb0bbdb7d6e0c6cef6b0b"; + sha256 = "02vbxxn0qvkxvfxv1zgr95bvdzx14fp9h7s27wbz6mjfkfgvc39q"; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ attr ]; testHaskellDepends = [ @@ -191263,6 +205368,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -191270,7 +205376,7 @@ self: { mkDerivation { pname = "xbattbar"; version = "0.2"; - sha256 = "c05246b1becb48d71c30856974ba0ec0efce08e5f75122e51180855ef89883c1"; + sha256 = "1hc3k3w5x1c027jj4lgpwl4cxvy01sx78sc560fdfj6bpsqlcln0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base old-time select X11 ]; @@ -191284,7 +205390,7 @@ self: { mkDerivation { pname = "xcb-types"; version = "0.8.0"; - sha256 = "6db5df1acf5c52cf18df0084ff325e665d37eba3eb8ca40ffc2b9a52b220d50b"; + sha256 = "02ym42r556ibzh7s937blgmkfpb6bqrgz100vwccyljwrwddzdbd"; libraryHaskellDepends = [ base containers mtl pretty xml ]; homepage = "http://community.haskell.org/~aslatter/code/xcb-types"; description = "Parses XML files used by the XCB project"; @@ -191300,7 +205406,7 @@ self: { mkDerivation { pname = "xcffib"; version = "0.5.1"; - sha256 = "1d3d7b7a84067bf140b709fcb427b6e60cb22c6bf1456193a242d651de88b78d"; + sha256 = "13dpi3g53mj2la9n2igidcnb4376nqkv9z09nx0g2yq6hix7ng8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191327,7 +205433,7 @@ self: { mkDerivation { pname = "xchat-plugin"; version = "0.0.3"; - sha256 = "467643d5d6688c0408b39d700860f41954609b5f98c3a14f25a05847a2915766"; + sha256 = "0rjpj6i4fn504m7s3hwqbydn0m0ryih0hw4xnc409338sval6xj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath process unix ]; @@ -191346,7 +205452,7 @@ self: { mkDerivation { pname = "xcp"; version = "0.1.0.1"; - sha256 = "fad7bae8995dfe539508ce21c85e300df8970805f00706b2c2d9c66ff256a9c3"; + sha256 = "1hx9avr6zinrqar0c1zh0l49gy0d61gch8ff12am7zjxk7lbmmzs"; libraryHaskellDepends = [ base bytestring containers mtl network transformers ]; @@ -191364,8 +205470,10 @@ self: { }: mkDerivation { pname = "xdcc"; - version = "1.1.3"; - sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e"; + version = "1.1.4"; + sha256 = "0r344vgkiwc7lkb7x78swnz0rimbgdcb0ki29dilqvdv0k4z9i59"; + revision = "3"; + editedCabalFile = "11swld2awjp5l1386c1c1lpkrw53g9l77agvz1y43kh00c2a6yaa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -191385,7 +205493,7 @@ self: { mkDerivation { pname = "xdg-basedir"; version = "0.2.2"; - sha256 = "e461c3a5c6007c55ceaea03be3be0ef3a92aa0ea1aea936da0c43671bbfaf42b"; + sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4"; libraryHaskellDepends = [ base directory filepath ]; homepage = "http://github.com/willdonnelly/xdg-basedir"; description = "A basic implementation of the XDG Base Directory specification"; @@ -191398,7 +205506,7 @@ self: { mkDerivation { pname = "xdg-userdirs"; version = "0.1.0.2"; - sha256 = "88aabbcb80dee5b669ad533af20000d561e6fe59ab1014ccc2482055d0a8046e"; + sha256 = "0vh4m385a828qb61845bb7zfcqfm000g4fjkmmlvdrfyh35vpal8"; libraryHaskellDepends = [ base containers directory filepath xdg-basedir ]; @@ -191414,7 +205522,7 @@ self: { mkDerivation { pname = "xdot"; version = "0.3.0.1"; - sha256 = "b09a56644ebfd3dba6e4c3a68a7dcb09d00ed20ea71583a7d5168615e356ae3d"; + sha256 = "0gdfaviib1hnsnkq65d71v90xl09rdyqm9n3wjkdplxz9rj5d6mh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191435,7 +205543,7 @@ self: { mkDerivation { pname = "xeno"; version = "0.1"; - sha256 = "e61e9ca39c0d5dfcdb8bc785a4807d1b8469866a239562b757d9b3c6718de2d5"; + sha256 = "1mg2imqwdcyrayvn5593da36k10vgn0a91f7igdzqp8dkjirq7p6"; libraryHaskellDepends = [ array base bytestring deepseq mtl mutable-containers vector ]; @@ -191448,12 +205556,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xeno_0_2" = callPackage + ({ mkDerivation, array, base, bytestring, criterion, deepseq + , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector + , weigh, xml + }: + mkDerivation { + pname = "xeno"; + version = "0.2"; + sha256 = "09nd0z1ysgjj6wb6xzjkn1fbrbk88l0kdqj7vfqyr6q890c3cmmg"; + libraryHaskellDepends = [ + array base bytestring deepseq mtl mutable-containers vector + ]; + testHaskellDepends = [ base bytestring hexml hspec ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml + ]; + homepage = "https://github.com/ocramz/xeno"; + description = "A fast event-based XML parser in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xenstore" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, network }: mkDerivation { pname = "xenstore"; version = "0.1.1"; - sha256 = "c2b538c9ce6716f4a1b4c0cb63ed5c6e5ee3e69e80dbb7826ee7f5392f45e874"; + sha256 = "0x788lpkkxg7ds1bgnw0kvkf6pkfbknn7jy0njhz85k7rv4kidf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal mtl network ]; @@ -191468,9 +205598,9 @@ self: { mkDerivation { pname = "xfconf"; version = "4.8.0.0"; - sha256 = "9febbf8349f27fa184c56959a01db2f78176bd534f103f6b1be0bb01b7fac360"; + sha256 = "0q63zavh3fz03dmky42gafypd0gpn8fs0nb9qn2a2zzj961vzswz"; revision = "1"; - editedCabalFile = "ce4bb3ab326d8e4c0a4fc2576045b589305b12f7ca28b79a69fcc367c429d33c"; + editedCabalFile = "0g6k5726ghzwd6dbfa6ayw95nc49nm2n0my29w54r3kd6amv6jyf"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal containers directory filepath ]; @@ -191490,7 +205620,7 @@ self: { mkDerivation { pname = "xformat"; version = "0.1.2.1"; - sha256 = "fdfc9b582ac87175b99bad44200fd6a24fe78f19df8496cb5ef76ee738a85ce0"; + sha256 = "1q2wm0wffvppbv5rd16z367yfkx2sq7j0i5dkfwpawf859c9pz7x"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "http://github.com/spl/xformat"; @@ -191505,7 +205635,7 @@ self: { mkDerivation { pname = "xhaskell-library"; version = "0.0.6"; - sha256 = "ca0b4af665d2c244111f30b90b6cdfb7285dce237092792af0fc4753b8a2d68e"; + sha256 = "13nnlaw56izwy0m7k4kh4g75sa5pvxn0pf9h3w8l9hnjcpv4l2ya"; libraryHaskellDepends = [ base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -191522,7 +205652,7 @@ self: { mkDerivation { pname = "xhb"; version = "0.6.2015.8.1"; - sha256 = "6b8a2cf071e408eef4a8947d768e8224989d3b9b744f5bdb3446bbb04d7a06e7"; + sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb"; libraryHaskellDepends = [ base binary byteorder bytestring containers network parsec stm Xauth @@ -191540,7 +205670,7 @@ self: { mkDerivation { pname = "xhb-atom-cache"; version = "0.1.0.2"; - sha256 = "e9f56068b5c63830de6342eebba212892e32eebaf670f2d904ec96588e737e84"; + sha256 = "113yff75i5pc0kcz4w7npbp34bl92aibpvj2cgg30f66nml61xg9"; libraryHaskellDepends = [ base hashable mtl transformers unordered-containers xhb ]; @@ -191557,7 +205687,7 @@ self: { mkDerivation { pname = "xhb-ewmh"; version = "0.1.3.1"; - sha256 = "94184fad85f3d749128dea63af998217c0942193bd0544c0dc1a959214bf0e0b"; + sha256 = "02qfpwa9558svk0481dxjchr9h0phacsyqzail94kmzkhnnly64l"; libraryHaskellDepends = [ base binary bytestring dlist hashable mtl transformers xhb xhb-atom-cache @@ -191568,12 +205698,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xhtml_3000_2_1" = callPackage + "xhtml_3000_2_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "xhtml"; - version = "3000.2.1"; - sha256 = "33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8"; + version = "3000.2.2"; + sha256 = "0z34m5jfvjyzqjr81kk6mp2dyf0iay5zl8xlzwl3k5zdfl5hsz74"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; @@ -191587,7 +205717,7 @@ self: { mkDerivation { pname = "xhtml-combinators"; version = "0.3"; - sha256 = "130a5fedcc548cc98e15275397afe4519f7b2a0c1cde237131c9d349066d7519"; + sha256 = "06bmdl34kly965qj7phw1hm7p7siwjprflr72n7ck32lrknmy2hk"; libraryHaskellDepends = [ base containers random text transformers xml ]; @@ -191601,7 +205731,7 @@ self: { mkDerivation { pname = "xilinx-lava"; version = "5.0.1.9"; - sha256 = "6768564e61562ec9b68186d6a544def902f213a1a71a334674ebb1351021e48d"; + sha256 = "13g44483bcgbfi3366m7l49z40prvr2abml6h6vcjbjnc575cs37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191617,7 +205747,7 @@ self: { mkDerivation { pname = "xine"; version = "0.0.0.4"; - sha256 = "66749399cebd326b7bdabb7dccda3bb6e477d6e644e819cdcb8b38b90d2271d7"; + sha256 = "1mvi486vjf4brg6iks24wvb7gr5n7gdcqzdvv9xnncmxrscr6x36"; libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ xine ]; libraryPkgconfigDepends = [ libxine ]; @@ -191636,7 +205766,7 @@ self: { mkDerivation { pname = "xing-api"; version = "0.1.3"; - sha256 = "b3e21b098ef46e9d496efa4257172fa5a872149e708f694cd0ea60ef192d23fc"; + sha256 = "1z135lcyyq7as166k3vhkqa75a555wbmfhpsdr4rsvpliq4ipqmk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191660,7 +205790,7 @@ self: { mkDerivation { pname = "xinput-conduit"; version = "0.0.0"; - sha256 = "c4ce1f945ae6329758ed719acc1b2f5368949f3fb7014446d8791a86a752ec16"; + sha256 = "05pcaakqc6krv13480dp7ygr8s2k5wdwr6kixmc9fcp6baa1zkn4"; libraryHaskellDepends = [ base bytestring conduit conduit-extra transformers ]; @@ -191677,7 +205807,7 @@ self: { mkDerivation { pname = "xkbcommon"; version = "0.0.3"; - sha256 = "00b4160ed6078386e4a4d6b6fed33c71bde8e3ef5a64d9f040432b550cbb3afe"; + sha256 = "1zispc65aas383qdjr2sxziyigbi7k9zxdnnlkj8d0q7sq71dd00"; setupHaskellDepends = [ base Cabal cpphs directory filepath process template-haskell text ]; @@ -191700,7 +205830,7 @@ self: { mkDerivation { pname = "xkcd"; version = "0.1.1"; - sha256 = "49a8a7d2ef2c174abbcf159e7563d0942102d349777428bbbda2d43ef3e9fc97"; + sha256 = "15zwx7rkxm52pnxjhx3p979h48cls1ipb7hmryxll5rcxz9aga29"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -191719,7 +205849,7 @@ self: { mkDerivation { pname = "xls"; version = "0.1.0"; - sha256 = "c582a2ecd64986c3d254ddad20ad2411e45061d073caaaffdb6214f6336e43f0"; + sha256 = "1w23dqrzc532vgzsmjkks1hm1r0i4jnj1bfxak9c71j9svna50n5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191743,7 +205873,7 @@ self: { mkDerivation { pname = "xlsior"; version = "0.1.0.1"; - sha256 = "f34d6bf6c5d35f9be46c9a1ea974befdb4f193a966c35052603b6bc1661b6b36"; + sha256 = "0dkb3dkc2srvc1951hv6m69z3d7xprsaj7lsdkj9npykqpv6nkgk"; libraryHaskellDepends = [ attoparsec base blaze-markup bytestring conduit conduit-extra data-default exceptions mtl resourcet scientific text time @@ -191769,7 +205899,7 @@ self: { mkDerivation { pname = "xlsx"; version = "0.4.3"; - sha256 = "1862f1a68be3d4d8619c60d858355aa9c1ad535b79845c359686ab5f1e0699a0"; + sha256 = "184r0qg5zaw6jqsmr13rbd9svhd9b8smin30kihxim73ifkg2qhq"; libraryHaskellDepends = [ base base64-bytestring binary-search bytestring conduit containers data-default errors extra filepath lens mtl mtl-compat network-uri @@ -191786,6 +205916,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xlsx_0_6_0" = callPackage + ({ mkDerivation, base, base64-bytestring, binary-search, bytestring + , conduit, containers, data-default, Diff, errors, extra, filepath + , groom, lens, mtl, mtl-compat, network-uri, old-locale + , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xml-conduit + , zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.6.0"; + sha256 = "1a6xvk8b0lsqr3m712879vr3z84snkzcfb9ykikf2azz69kn7y4k"; + libraryHaskellDepends = [ + base base64-bytestring binary-search bytestring conduit containers + data-default errors extra filepath lens mtl mtl-compat network-uri + old-locale safe text time transformers vector xml-conduit + zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + homepage = "https://github.com/qrilka/xlsx"; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -191793,7 +205952,7 @@ self: { mkDerivation { pname = "xlsx-tabular"; version = "0.2.2"; - sha256 = "d4d95c3f6ead3af2185f22d7bd1ab0f0fb972864553f1edde6eb2fbb4ef75556"; + sha256 = "0mjmyx7bnbzbwvfiwgsmchl9gyzhn0dbvmr2bwcg4fmddqzmrnfl"; libraryHaskellDepends = [ aeson base bytestring containers data-default lens text xlsx ]; @@ -191810,7 +205969,7 @@ self: { mkDerivation { pname = "xlsx-templater"; version = "0.0.1"; - sha256 = "99cb5f86c7c1ce967e10e09463977fe4c8dbcb51c6c6c7bf422e030a77eaa502"; + sha256 = "00m5x9vhl0rf8azwgin6a75xpj74gybn757021z9dkn1qy35zjwr"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ @@ -191828,7 +205987,7 @@ self: { mkDerivation { pname = "xml"; version = "1.3.14"; - sha256 = "32d1a1a9f21a59176d84697f96ae3a13a0198420e3e4f1c48abbab7d2425013d"; + sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j"; libraryHaskellDepends = [ base bytestring text ]; homepage = "http://code.galois.com"; description = "A simple XML library"; @@ -191841,12 +206000,11 @@ self: { }: mkDerivation { pname = "xml-basic"; - version = "0.1.1.3"; - sha256 = "cc7c122cba27c099f7ddc82bf692ab744ebbd3c0f6dc544a8278dfb4d0e37754"; + version = "0.1.2"; + sha256 = "1s8415gj65zm6mbbrmkav92zkwi0q8mf892ajc2qz9hfmhxab27q"; libraryHaskellDepends = [ base containers data-accessor explicit-exception utility-ht ]; - homepage = "http://www.haskell.org/haskellwiki/XML-Basic"; description = "Basics for XML/HTML representation and processing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -191858,7 +206016,7 @@ self: { mkDerivation { pname = "xml-catalog"; version = "1.1.0.2"; - sha256 = "cc799b696536e41c407c1d4d50b788a774ae40a0ec8e3033ce7a8a8df630f14b"; + sha256 = "0jzi63v8v2ksrqrk13pcl10awx57i2vm0k8xgi01rr1ncmlrnyfc"; libraryHaskellDepends = [ base bytestring conduit containers text transformers uri-conduit xml-conduit @@ -191878,7 +206036,7 @@ self: { mkDerivation { pname = "xml-conduit"; version = "1.4.0.4"; - sha256 = "11058279d3f75a71b5731d26fc490f86fc1b7cc461053cd54aedde8f152d52fc"; + sha256 = "1z2j5laqzppd9bakq1b1qiy1pz461x4zq9hxffsp2nppsdwq418i"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -191893,6 +206051,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit_1_5_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , data-default, deepseq, hspec, HUnit, monad-control, resourcet + , text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.5.1"; + sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + conduit conduit-extra containers data-default deepseq monad-control + resourcet text transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers hspec HUnit + resourcet text transformers xml-types + ]; + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -191900,7 +206083,7 @@ self: { mkDerivation { pname = "xml-conduit-decode"; version = "1.0.0.0"; - sha256 = "1a914d60ea5cc05a2164467cf49b1ad5543e849182d734c3cab19662fbe5eb7b"; + sha256 = "0yzbwpxn55mirb1k9mw2j623wm6m3adz8z26chhmmh2wx9h4v48s"; libraryHaskellDepends = [ base bifunctors lens semigroups text time xml-conduit ]; @@ -191921,8 +206104,8 @@ self: { }: mkDerivation { pname = "xml-conduit-parse"; - version = "0.3.1.0"; - sha256 = "62a8aacdd03e216cc1f89882205b933016c0aebe2ed3e113a966c5956ec572d5"; + version = "0.3.1.1"; + sha256 = "1i20smw7cs2bjh7z1606grac779a60fcwpc8qrqavagbmkhx0ba8"; libraryHaskellDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types @@ -191943,7 +206126,7 @@ self: { mkDerivation { pname = "xml-conduit-writer"; version = "0.1.1.1"; - sha256 = "4b547cdc629a583f0231bed45d568f12eb0244fdaeb904c11eeb0d9365c771c5"; + sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b"; libraryHaskellDepends = [ base containers dlist mtl text xml-conduit xml-types ]; @@ -191962,7 +206145,7 @@ self: { mkDerivation { pname = "xml-enumerator"; version = "0.4.4.1"; - sha256 = "f287ee652ef84b9de2ce3362b0f72cb66c3c9fadd03f8a1638c908d38f36966f"; + sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; libraryHaskellDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring containers data-default @@ -191985,7 +206168,7 @@ self: { mkDerivation { pname = "xml-enumerator-combinators"; version = "0.1"; - sha256 = "63c9e2548ef8c83116fff84160b48494974b1cf34852fe2e6377cab53ef754d8"; + sha256 = "1n2lywzbbjkpccpgwlj8ycf4p5wlhjs60hgqzwb33j7qiraf5jb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192001,7 +206184,7 @@ self: { mkDerivation { pname = "xml-extractors"; version = "0.4.0.2"; - sha256 = "aa2705b0ac32a4a88b50f377fa3d8dc7f506c8503d97136bf92bcb3863a07f47"; + sha256 = "0ivzl1ikijrbz5mi75rxa340dxf7ilyzlxzka25si91jmjq0a9xa"; libraryHaskellDepends = [ base mtl transformers xml ]; homepage = "https://github.com/holmisen/xml-extractors"; description = "Extension to the xml package to extract data from parsed xml"; @@ -192015,9 +206198,9 @@ self: { mkDerivation { pname = "xml-hamlet"; version = "0.4.1"; - sha256 = "7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb"; + sha256 = "1fy29sxby4z6dby518x4za9bpgnh7aqwpwn365lb384rjpsr1wvx"; revision = "1"; - editedCabalFile = "5c9d521224d4f08f59a3dbbde041c4f0267da46528cfc6b24da052387ebd4033"; + editedCabalFile = "0cs0pmz3hlm09nrcdkr8cnj7s9phqi0y1gfvldcqzw6l4h9557aw"; libraryHaskellDepends = [ base containers parsec shakespeare template-haskell text xml-conduit @@ -192036,7 +206219,7 @@ self: { mkDerivation { pname = "xml-helpers"; version = "1.0.0"; - sha256 = "9b02c5bfd831e4e275745a3ca521a528a64ab0cf84022e17344873548f043367"; + sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv"; libraryHaskellDepends = [ base xml ]; homepage = "http://github.com/acw/xml-helpers"; description = "Some useful helper functions for the xml library"; @@ -192049,10 +206232,8 @@ self: { }: mkDerivation { pname = "xml-html-conduit-lens"; - version = "0.3.2.2"; - sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac"; - revision = "1"; - editedCabalFile = "4673f03cf274523d25c1b07e4fddd6b1729e42a372ef7e1967705b808eda52a8"; + version = "0.3.2.3"; + sha256 = "1r2slz8wqgn0wdbs5cn7fnr7shz9di8bkn3m11jf70ij1gxi1cib"; libraryHaskellDepends = [ base bytestring containers html-conduit lens text xml-conduit ]; @@ -192074,7 +206255,7 @@ self: { mkDerivation { pname = "xml-html-qq"; version = "0.1.0.1"; - sha256 = "1a2ebb1f4ca58a4f442c470db6d3271e6b1069d41860f8683b5da9082329235a"; + sha256 = "0ni354ihiaax7dlghq0qsili0sqy4z9vc3a75i24z2m59hgvnbhs"; libraryHaskellDepends = [ base blaze-markup conduit data-default from-sum heterocephalus html-conduit resourcet template-haskell text th-lift @@ -192095,7 +206276,7 @@ self: { mkDerivation { pname = "xml-indexed-cursor"; version = "0.1.1.0"; - sha256 = "46d622fc738e8cc1513f598207ee5e6cda790c79e0697fe02d2da6ad02a6da74"; + sha256 = "0x6slq1av9id5ph7ysg0g467knkcbvp0g0jr7x8w334ffgy25mj6"; libraryHaskellDepends = [ base bytestring containers data-default text xml-conduit ]; @@ -192115,7 +206296,7 @@ self: { mkDerivation { pname = "xml-isogen"; version = "0.1.0"; - sha256 = "ae66671939e101c38154f04f603b00ed31451477a55d183ae299316315005eae"; + sha256 = "1bjy00an6ccrw8x1hpd5fwa4acgd00xn0kzhaj0w60g174cnfrmf"; libraryHaskellDepends = [ base dom-parser lens mtl QuickCheck semigroups template-haskell text xml-conduit-writer @@ -192132,9 +206313,9 @@ self: { mkDerivation { pname = "xml-lens"; version = "0.1.6.3"; - sha256 = "4dd7f1a91fbb12ae52d5a14badd9f38c0f0d7556f08ee77d79a67cc546dcb1e8"; + sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd"; revision = "1"; - editedCabalFile = "1a0768a259fb0aeaaecc092c6a9777c4d498d2695b0385a0e620e47f362773b9"; + editedCabalFile = "1fbk4wv7zr10wsh8a0svd799im64fybnlb09rjpfl2pvb6i6h1qs"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -192149,7 +206330,7 @@ self: { mkDerivation { pname = "xml-monad"; version = "0.5"; - sha256 = "999069c96672de8a419a3263383876a2f62824eb70088ff8ae50ff0efcbd5d9d"; + sha256 = "17axppy0xzshmvw8y23hxcj2ixm2fqw3hqrjk90qmpkjcv4nk44r"; libraryHaskellDepends = [ base mtl transformers transformers-compose xml ]; @@ -192164,7 +206345,7 @@ self: { mkDerivation { pname = "xml-parsec"; version = "1.0.3"; - sha256 = "c2b68bd7217d18d4189aac685a04f03c4d7ded7efe0422e804452fc33d8e95fd"; + sha256 = "1zcmiqyw6bs50kl2417ygvnpsk9wy025ls5ck8cd863x47bqpdn2"; libraryHaskellDepends = [ base HaXml parsec ]; homepage = "http://sep07.mroot.net/"; description = "Parsing XML with Parsec"; @@ -192179,7 +206360,7 @@ self: { mkDerivation { pname = "xml-picklers"; version = "0.3.6"; - sha256 = "d1b802cd9543a228c6699928e6695539c28f6cbd8e7859a65ca874543ef1d1a4"; + sha256 = "196iy4z58x58bjk5jy4fpmn8zhiramlyca4rd732i8j3jp6h5f6i"; libraryHaskellDepends = [ base containers text xml-types ]; testHaskellDepends = [ base Cabal QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -192194,7 +206375,7 @@ self: { mkDerivation { pname = "xml-pipe"; version = "0.0.0.11"; - sha256 = "c4d3da66e838a6d135972a1566aedc069719246fb1441b287b8a9d6c9c95ae48"; + sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4"; libraryHaskellDepends = [ base bytestring papillon simple-pipe ]; homepage = "https://github.com/YoshikuniJujo/xml-pipe/wiki"; description = "XML parser which uses simple-pipe"; @@ -192207,7 +206388,7 @@ self: { mkDerivation { pname = "xml-prettify"; version = "0.1.0.1"; - sha256 = "c081faf3ba09248b11a8abd5acdc00230d08b410e9563211a48d020863af72a9"; + sha256 = "1abjmxihh0ldlh8k4mp922s0h39303farmdbm08qn909pbrzm0f0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -192227,7 +206408,7 @@ self: { mkDerivation { pname = "xml-push"; version = "0.0.0.18"; - sha256 = "7ed812b6d4721d6a7ad5aee2fadecd2f4477dcc19e7362e7d52ea35ccfaf18c5"; + sha256 = "1i8qmz7mr8rfspkn4wwyq7f7fi1grpggmqmfsmx6l7bjsjv15n3y"; libraryHaskellDepends = [ base bytestring crypto-random handle-like monad-control monads-tf peyotls random sasl simple-pipe stm tighttp transformers-base uuid @@ -192244,7 +206425,7 @@ self: { mkDerivation { pname = "xml-query"; version = "0.9.1"; - sha256 = "985b84f838f91c9e8b8e8027e747e32a4d5c8d97fed58c42b7e832f4f7fd9a9b"; + sha256 = "16wszpvz8cp8nx18rmgyjy6mqk9awd3yf9w0is5rw77r73w88nwq"; libraryHaskellDepends = [ base-prelude free text ]; homepage = "https://github.com/sannsyn/xml-query"; description = "A parser-agnostic declarative API for querying XML-documents"; @@ -192258,7 +206439,7 @@ self: { mkDerivation { pname = "xml-query-xml-conduit"; version = "0.3.1"; - sha256 = "78a66a96b043c6ed71e3e01ec474dc868b2b433b826149044f088d8210b0f39e"; + sha256 = "17pkn08853889w24jqc27d1jp2w6visc87p0wdqyvij3n2b6m9kq"; libraryHaskellDepends = [ base-prelude text xml-conduit xml-query xml-query-xml-types xml-types @@ -192278,7 +206459,7 @@ self: { mkDerivation { pname = "xml-query-xml-types"; version = "0.4.1"; - sha256 = "090632a66a898114c237776afe84dd02b3f1a1cb2950ea7c0413f95421ba3963"; + sha256 = "0qrrp8hm9y8k0iyfll19rfhz3cq2vn2gwskp6z1190c9dak341h9"; libraryHaskellDepends = [ base-prelude free html-entities success text transformers xml-query xml-types @@ -192302,7 +206483,7 @@ self: { mkDerivation { pname = "xml-to-json"; version = "2.0.1"; - sha256 = "ad1a2501828052a1798178c309638a9b8e4fe66ad24dae9c76de939c156d2e2f"; + sha256 = "0brfdlarr4yyfsfawkfjdbk4z3lvi9ihkhvqh5ws2ll0h80ja6md"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192322,7 +206503,7 @@ self: { mkDerivation { pname = "xml-to-json-fast"; version = "2.0.0"; - sha256 = "dd852fe1aa54db3c6d87a2e74b5345b0f14effdd49bad5b73d79571e1b47563f"; + sha256 = "0gsn8wdiwmvr7nvxbfj9vpzlxwdh8m9lprx2hxnkrnslmbhjz1fx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base tagsoup text ]; @@ -192340,7 +206521,7 @@ self: { mkDerivation { pname = "xml-tydom-conduit"; version = "0.1.0.0"; - sha256 = "e591994b28dc0aa6464167d1e28ae47fdb2350285064356ff4c528cd4b9b6a5d"; + sha256 = "0pbakd5wsa65yipkar2h51827nvzwj5f5lb7853ac2nw515rk4g5"; libraryHaskellDepends = [ base containers template-haskell text time xml-conduit xml-tydom-core @@ -192360,7 +206541,7 @@ self: { mkDerivation { pname = "xml-tydom-core"; version = "0.1.0.0"; - sha256 = "7424a0f322d93acc08282e85ca0ec168d9868c53902c7cf467b957cc1ce35b27"; + sha256 = "09svwcfcqmxrczs7qb4haf68dnb8q47cm19f504cqfnr4brs093l"; libraryHaskellDepends = [ base containers mtl QuickCheck text ]; homepage = "https://github.com/lancelet/xml-tydom"; description = "Typed XML encoding (core library)"; @@ -192372,7 +206553,7 @@ self: { mkDerivation { pname = "xml-types"; version = "0.3.6"; - sha256 = "9937d440072552c03c6d8ad79f61e61467dc28dcd5adeaad81038b9b94eef8c9"; + sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr"; libraryHaskellDepends = [ base deepseq text ]; homepage = "https://john-millikin.com/software/haskell-xml/"; description = "Basic types for representing XML"; @@ -192384,7 +206565,7 @@ self: { mkDerivation { pname = "xml2html"; version = "0.2.0"; - sha256 = "6a6a2124f395520fe47819efe27ca5ef9215c15a335e89fa266d3a469edcc4cd"; + sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska"; libraryHaskellDepends = [ base xml-conduit ]; homepage = "http://github.com/snoyberg/xml"; description = "blaze-html instances for xml-conduit types (deprecated)"; @@ -192400,7 +206581,7 @@ self: { mkDerivation { pname = "xml2json"; version = "0.2.0.0"; - sha256 = "bd2a685211cd9b11afcc8e6ab63be1ad6877f8c287b593a4c7e5788cd318a397"; + sha256 = "15x3339qqy75qyj97dc7qbw7fs5dw4xvcslfrjpi36yd2596hamx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192429,7 +206610,7 @@ self: { mkDerivation { pname = "xml2x"; version = "0.4.2"; - sha256 = "2a2e5db41c68c082bec59fb94abc7fb542ef087bb46b7b6b22eb33fc7f0fe232"; + sha256 = "0cp21xzzqczb49mpnsxlgc4fyhmmgyy4mfczqnz85h383js5sbia"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -192448,7 +206629,7 @@ self: { mkDerivation { pname = "xmlgen"; version = "0.6.2.1"; - sha256 = "9027a17e7ae648997a0e8279d7c01aa6615adda8b93f753b907a01dd797abae6"; + sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text ]; @@ -192463,25 +206644,20 @@ self: { "xmlhtml" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, directory, HUnit, parsec, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, unordered-containers + , bytestring, containers, directory, HUnit, parsec, test-framework + , test-framework-hunit, text, unordered-containers }: mkDerivation { pname = "xmlhtml"; - version = "0.2.3.5"; - sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d"; - revision = "3"; - editedCabalFile = "4b5e2c334e6fdcab94095ca5fa805a2353690d3a616733cec0febf2ba2991880"; + version = "0.2.4"; + sha256 = "172kwkgpghmda42dj5ppfbdj2m5kh692rlim2hy2x00hzrs06440"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring containers parsec text unordered-containers ]; testHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - directory HUnit parsec QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text - unordered-containers + base blaze-builder blaze-html blaze-markup bytestring directory + HUnit test-framework test-framework-hunit text ]; homepage = "https://github.com/snapframework/xmlhtml"; description = "XML parser and renderer with HTML 5 quirks mode"; @@ -192496,7 +206672,7 @@ self: { mkDerivation { pname = "xmltv"; version = "0.0.1"; - sha256 = "69d312f4d8ad7fcea031f8aea217e03d20ed31e877c0f0e3d7d2a9ad91502096"; + sha256 = "15i0a28svafjsziz1h3px0qys81xw0bs5bpq66hcwzxdv3s15lv9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base old-locale time xml ]; @@ -192518,7 +206694,7 @@ self: { mkDerivation { pname = "xmms2-client"; version = "0.0.7.0"; - sha256 = "bf156fae117127d684bc0f4a1fcb2213eab3b4da76933ce75bdae518a0ea1a2a"; + sha256 = "0ahsxah1irfsbgkkr4vnvasb7shk4b5iyjhgpj2dc9vi26p6y5dz"; libraryHaskellDepends = [ base containers haskell98 mtl utf8-string ]; @@ -192533,7 +206709,7 @@ self: { mkDerivation { pname = "xmms2-client-glib"; version = "0.0.7.0"; - sha256 = "0392b25e67c1626a3507a5579346543bcf2001ecadae29ff44b4d76c13472ce7"; + sha256 = "1rrc8w9nrmxl8kzjkbmdxh0j1krvai396mx50wsnlqn1cxgb54h3"; libraryHaskellDepends = [ base haskell98 xmms2-client ]; libraryToolDepends = [ c2hs ]; description = "An XMMS2 client library — GLib integration"; @@ -192550,8 +206726,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.24.3"; - sha256 = "d330079dd60e22004a4cfa271eb9e00a1bb36b8dafcbbf1b1a5980d401dcf510"; + version = "0.24.5"; + sha256 = "0sdzfj2wa4wpig1i2i5n9qpwm90jp88qifsmaa7j37yhhs6snfir"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; @@ -192567,6 +206743,7 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; @@ -192578,7 +206755,7 @@ self: { mkDerivation { pname = "xmonad"; version = "0.13"; - sha256 = "f9f81b63569f18c777a939741024ec3ae34e4ec84015e5cc50f6622034a303ca"; + sha256 = "1jh3lcs20qpna36fa5a0r174xqrsxhj10x1rm5vwf64zariipy7r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192606,7 +206783,7 @@ self: { mkDerivation { pname = "xmonad-bluetilebranch"; version = "0.9.1.4"; - sha256 = "f6214d8e5482acf00fb247ae9e8cf9369b2fb01af2aea468db7fcec4b229b6fa"; + sha256 = "1ymn56rc9kkzvdla9bpj3aq2z6rnz669xbj7n87z1b42aj74s8gn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192627,7 +206804,7 @@ self: { mkDerivation { pname = "xmonad-contrib"; version = "0.13"; - sha256 = "a760827fe5b1f99d783f52ccbb72b272d02d53daa26757363cde3ceba014476e"; + sha256 = "0vj72jhfng6y7hv5frx2v99jvl3jn9rbpk2j7xw9vydiwmzq4q57"; libraryHaskellDepends = [ base bytestring containers directory extensible-exceptions filepath mtl old-locale old-time process random unix utf8-string X11 X11-xft @@ -192646,7 +206823,7 @@ self: { mkDerivation { pname = "xmonad-contrib-bluetilebranch"; version = "0.9.1.4"; - sha256 = "871a5df360b3bada92352802ad8f9d460eed8dc1850f545550c77189ae474efb"; + sha256 = "1ysf8yp8jwf7a1am83w5q66ys3j6kn7ss0i86n9dmfmkc3rms6l7"; libraryHaskellDepends = [ base containers directory extensible-exceptions mtl old-locale old-time process random unix utf8-string X11 X11-xft @@ -192663,7 +206840,7 @@ self: { mkDerivation { pname = "xmonad-contrib-gpl"; version = "0.12.1"; - sha256 = "c98a6993fe030b2726840a5760009ba5062e666baa759eb814a5f4843fc749f7"; + sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9"; libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ]; homepage = "http://xmonad.org/"; description = "Third party extensions for xmonad"; @@ -192678,7 +206855,7 @@ self: { mkDerivation { pname = "xmonad-entryhelper"; version = "0.1.0.0"; - sha256 = "30ed74463c59f462c65f36551486c09793c8f2f1761d0f3ac68b30ae8f6f92f7"; + sha256 = "1xwjdy7swc4bqqx0y7bny7rci4wpq2318m9nbz365x2r7i379v9h"; libraryHaskellDepends = [ base directory extensible-exceptions filepath mtl process unix X11 xmonad xmonad-contrib @@ -192695,7 +206872,7 @@ self: { mkDerivation { pname = "xmonad-eval"; version = "0.1"; - sha256 = "f3bd9ff6a0b00c059223dd85440becd4b64551bb24c6fadbc0444e503e59144c"; + sha256 = "0k0lb4z50kj4q3dzmii4pd8lbdnlxh5l91fx4f90a35hl3v9zggk"; libraryHaskellDepends = [ base containers directory hint mtl old-locale old-time process random unix X11 xmonad xmonad-contrib @@ -192707,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 = "a5fc71ccf92a4cfa81f8eb690a6df98e6d0d707288c31e70351747b7f388e891"; + 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; }) {}; @@ -192733,7 +206910,7 @@ self: { mkDerivation { pname = "xmonad-screenshot"; version = "0.1.2"; - sha256 = "21f325c9633e56de0bc0fd420d38292d3ded2b95b6fa1029759cdac060abebd4"; + sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1"; libraryHaskellDepends = [ base gtk xmonad ]; homepage = "https://github.com/supki/xmonad-screenshot"; description = "Workspaces screenshooting utility for XMonad"; @@ -192745,7 +206922,7 @@ self: { mkDerivation { pname = "xmonad-utils"; version = "0.1.3.3"; - sha256 = "45a5db08e2e8fce4a11f929107c29d5073b897cbe83af0ea24ee2e691b72e2f8"; + sha256 = "1y72f8dnjbpf4kmg0fp8rfbvhwshkp10g4cj3yhy9z78w84dp9a5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ghc random unix X11 ]; @@ -192760,17 +206937,16 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.0.6"; - sha256 = "7abfe1bdaf7a9bbecdfa89b36b7144fe590d5b6344cc4838fb287e8f5ded52c4"; + version = "0.1.1.2"; + sha256 = "065kcsr7s114sw8g8hdl2i5w0543r9f9ypirvh3bn38x2lv4f9ng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers process transformers X11 xmonad xmonad-contrib ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec xmonad ]; - homepage = "https://github.com/vmchale/xmonad-vanessa#readme"; - description = "Custom xmonad, which uses stack and sets various defaults"; + homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa"; + description = "Custom xmonad, which builds with stack or cabal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -192780,7 +206956,7 @@ self: { mkDerivation { pname = "xmonad-wallpaper"; version = "0.0.1.3"; - sha256 = "de2f46159baa7203eae9a5e1539b45039b2c87afe7169db0c58a757d1dbb816f"; + sha256 = "0vw1pcfpsxcaqnq9s5p7my3jr6q38ndm7qd5x7m06wmakcalcbyy"; libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = stdenv.lib.licenses.lgpl3; @@ -192794,7 +206970,7 @@ self: { mkDerivation { pname = "xmonad-windownames"; version = "0.1.0.1"; - sha256 = "3519dd0ede27ecba3a0694f81e39d2e41fab1144170cb98a3b6e086e270aa885"; + sha256 = "11d818knw23f7f5bj30p8h8sn7z4s8wixy4l0qxbmv17vq7ds69m"; libraryHaskellDepends = [ base containers utf8-string xmonad xmonad-contrib ]; @@ -192811,7 +206987,7 @@ self: { mkDerivation { pname = "xmpipe"; version = "0.0.0.4"; - sha256 = "3c0a17c3621c6a1f7a783484c821c05207cc3152bbf99f4f02838f845d0de125"; + sha256 = "09g11mfq93w3097rzydva8qwq1sjq0hwi11lg1x1yshwcb1if2iw"; libraryHaskellDepends = [ base base64-bytestring bytestring handle-like monads-tf sasl simple-pipe uuid xml-pipe @@ -192827,7 +207003,7 @@ self: { mkDerivation { pname = "xorshift"; version = "2.0.1"; - sha256 = "2e975d3e0b35acce5297363d41440ae2f856261dbce851e1880ce5f8b465f3dd"; + sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf"; libraryHaskellDepends = [ base random time ]; description = "Haskell implementation of the xorshift random generator"; license = "LGPL"; @@ -192838,7 +207014,7 @@ self: { mkDerivation { pname = "xosd"; version = "0.2.1"; - sha256 = "3bc30d33a42f3bed7299258ba8a2babf7cc61fba9ee7fe7397206e640c3112c8"; + sha256 = "1j0j64668vi0jxrzxrwyp8gwcz5zpaiai2r5k5rfsfrglhrhvhrv"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ xosd ]; homepage = "http://code.haskell.org/~dons/code/xosd"; @@ -192853,7 +207029,7 @@ self: { mkDerivation { pname = "xournal-builder"; version = "0.1.1.1"; - sha256 = "2195cacba3622c037e5a13ad3d3c391b42d81a257cc11fffd2f521913d74f46c"; + sha256 = "0v7lfhyr28gmsbzizhbw4lddhhhv74y3vb8kb9z06b32lg5wm591"; libraryHaskellDepends = [ base blaze-builder bytestring double-conversion strict xournal-types @@ -192871,7 +207047,7 @@ self: { mkDerivation { pname = "xournal-convert"; version = "0.1.1"; - sha256 = "b1426d06bf046bf07384e0e93e8e6c768855409268f8ce8c9212e1354b9fdeef"; + sha256 = "1vyykx5kbq8jja6cxy38j905b23ndj73xsg0hirz0sq4pw36shmi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192894,7 +207070,7 @@ self: { mkDerivation { pname = "xournal-parser"; version = "0.5.1"; - sha256 = "e8f43a9d6086d76242a6002db0633e0f30ca1fff866f02866d5e4b8da97b611d"; + sha256 = "07b1gflqsjsydn304vw6zwgwlc0g7riv0b80lr165mw6c2fkmx78"; libraryHaskellDepends = [ attoparsec attoparsec-conduit base bytestring conduit conduit-extra containers exceptions lens mtl strict text transformers xml-conduit @@ -192912,7 +207088,7 @@ self: { mkDerivation { pname = "xournal-render"; version = "0.6.0"; - sha256 = "c3a9a8d181df6b0f7a9078d61a84c4bfa368a3ce03b11b7a3b0bfed8bf94513b"; + sha256 = "0fsijjzxizhb7dx1pc83rsini8xzqj21mmkqj1x0ysyzh78siaf3"; libraryHaskellDepends = [ base bytestring cairo containers fclabels mtl poppler strict TypeCompose xournal-types @@ -192929,9 +207105,9 @@ self: { mkDerivation { pname = "xournal-types"; version = "0.5.1.0"; - sha256 = "b0e8d4194af0397bdd76352e1174b61947343dfcced21bef062598fb058e69cb"; + sha256 = "1jv9iq2zp6150vpiplnfzhyk8iqrnrs12bimfvfpnfgh98cx9s5h"; revision = "1"; - editedCabalFile = "d6fdc2ac2b741597d72cc1a5ef1fad122858a96212df461e3a97540eeceb78fb"; + editedCabalFile = "1yvqxgn0wm4p78g4dpqjcalmha0jmlgyz9f15kbrf5bl5fnc5zfn"; libraryHaskellDepends = [ base bytestring cereal containers lens strict TypeCompose ]; @@ -192945,7 +207121,7 @@ self: { mkDerivation { pname = "xpathdsv"; version = "0.1.1.0"; - sha256 = "99967d6d64cee8188578c51e513b4e2f0ae42df8b8118f837f2182d1b83b5862"; + sha256 = "0qjq7fwd30i1gy1qy4dqz0ny82ig9qxm27n5g22iis6fcinpv5lr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -192964,7 +207140,7 @@ self: { mkDerivation { pname = "xsact"; version = "1.7.3"; - sha256 = "107cafa5bfb37f2c82594b802181393b1a9ad8832c82b75432d70d3933dc1aa0"; + sha256 = "180svhrkj3fp69abg0ichgc9l6iv760j302bb612qzxkpyjsyz0h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -192983,7 +207159,7 @@ self: { mkDerivation { pname = "xsd"; version = "0.5.0.1"; - sha256 = "600229acbc0c556ae87e745ad0585a4449ea2f7d728a7b2538b1d4795b14b1a8"; + sha256 = "1a5i2idpkm5i70jpp2kjglpylja4b9cd0nklgvl6lm8cpjn2j0k0"; libraryHaskellDepends = [ attoparsec base lens text time ]; testHaskellDepends = [ base directory doctest filepath QuickCheck quickcheck-instances @@ -192998,7 +207174,7 @@ self: { mkDerivation { pname = "xsha1"; version = "0.0.0"; - sha256 = "b1e68894cb682655c2cd6dec547d7d01bf48eea5a3aa9621bb73eb8c58659276"; + sha256 = "0xljcmc8rsvkpchrdam3lpp4igq1gmym9v3drp15a9k8rfa8irmi"; libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ]; description = "cryptanalysis of Blizzard's broken SHA-1 implementation"; license = stdenv.lib.licenses.mit; @@ -193009,7 +207185,7 @@ self: { mkDerivation { pname = "xslt"; version = "0.1"; - sha256 = "881862ae1c77bf5a1a7f7132d1fbcc19633331c6b061bac4dc46ca0c268c0344"; + sha256 = "0i03ihk0rjj6vk2blqdhqqqk6qqrrkxx2ckigwd5mgvp3jp64648"; libraryHaskellDepends = [ base libxml ]; librarySystemDepends = [ xslt ]; description = "Binding to libxslt"; @@ -193024,7 +207200,7 @@ self: { mkDerivation { pname = "xss-sanitize"; version = "0.3.5.7"; - sha256 = "955856413e70375c794766d04ac9ab7f0d3337dbb04a412c9b7ff5c415acac00"; + sha256 = "005cmhaw9xbzkcn42jmhvcvk63bzmg4lml368xwmqdvh7r0mcn4m"; libraryHaskellDepends = [ attoparsec base containers css-text network-uri tagsoup text utf8-string @@ -193043,7 +207219,7 @@ self: { mkDerivation { pname = "xtc"; version = "1.0.1"; - sha256 = "54396ce106a2986b7468c6ef5624cd1e135405f36d1c3c73340296ce161eda49"; + sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal"; libraryHaskellDepends = [ base wx wxcore ]; homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; @@ -193056,7 +207232,7 @@ self: { mkDerivation { pname = "xtest"; version = "0.2"; - sha256 = "67f60aab2bc7cfc944335c7b308c7dcf15b49e3d2074f071dbfa36af4fef1d85"; + sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7"; libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; @@ -193069,10 +207245,8 @@ self: { }: mkDerivation { pname = "xturtle"; - version = "0.1.25"; - sha256 = "adbee9e0c52ceab301a63f129af1962e4ff766e603d77e8b9e53fcf5b7bb2e98"; - revision = "1"; - editedCabalFile = "30df4bd906dac728e4ef75b339d6802b59abe1f1f49e346e6cdc54929f147c1c"; + version = "0.2.0.0"; + sha256 = "08nf4hz47ayypm3f14y7f6wdxskw1ipxvgc3dx24xckx6wvha623"; libraryHaskellDepends = [ base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools ]; @@ -193088,7 +207262,7 @@ self: { mkDerivation { pname = "xxhash"; version = "0.0.2"; - sha256 = "4f5cc71564d71b7ab1e9f70ce9b8d32a3d73cb0b1e08ff96bc54298b21eb2f27"; + sha256 = "09rgxchqnaalpjbgy20y1g5p6g9asfwfj37px6qpl6ypchawfp2g"; libraryHaskellDepends = [ base bytestring crypto-api tagged ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ @@ -193106,7 +207280,7 @@ self: { mkDerivation { pname = "y0l0bot"; version = "0.1.1"; - sha256 = "69cfcd47589ef502b7e1a383a402ab6258224694f166751c15399e7e0bb55b3e"; + sha256 = "0gjvnl5px7ir2lf7arpiji324n32mc1a90x3w6vh5xcyb13wvkv9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193122,8 +207296,8 @@ self: { ({ mkDerivation, base, word8 }: mkDerivation { pname = "yabi"; - version = "0.1.1.0"; - sha256 = "6b09c5334e1ed2f3294861813ad3f875a3e1bd77c0cbb953fffbd51a6ab05b15"; + version = "0.2.0.0"; + sha256 = "1iihmhq87z5k9wzv8j8ydyy100m0401yqm576z27fk01i1a6fq3x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base word8 ]; @@ -193139,7 +207313,7 @@ self: { mkDerivation { pname = "yabi-muno"; version = "0.1.0.1"; - sha256 = "4f823cecb1beda83d95148f3b13535fcb07c3b6e6d5583e32052cdcb156e3699"; + sha256 = "169ndqawpkaj43iq6mbddqxprc7w6lsv3ws8a7cq7nmyn7n3r0jg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193161,7 +207335,7 @@ self: { mkDerivation { pname = "yackage"; version = "0.8.1"; - sha256 = "1d48064cbfd2c51f4fd33a6289c9efe1c8d49f063d850a9dd7ae3a226136cae5"; + sha256 = "1rfa6rhj4fmfsyfhm19x0sgx9j71xz4qjqissd7izifjpx60cj0x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193182,8 +207356,8 @@ self: { }: mkDerivation { pname = "yahoo-finance-api"; - version = "0.2.0.1"; - sha256 = "329eea56d8a285877164e82110a3376a6b604fff2198d387def727d06979e496"; + version = "0.2.0.2"; + sha256 = "0frwwpcf7xwbh28sx6k7v9yw9kswx0wrbqgmsr6kcyzbxl2i54pj"; libraryHaskellDepends = [ aeson base either http-api-data http-client mtl servant servant-client text time transformers vector @@ -193205,7 +207379,7 @@ self: { mkDerivation { pname = "yahoo-finance-conduit"; version = "0.1.0.0"; - sha256 = "b1056bf70e914ae674b58f93f2dca0780d45ca7065e36ca711fa5182a8087acf"; + sha256 = "1kvs12l84lgs26knrqv5f354a3bql3fg54wgnmsfcjli1vvnn1di"; libraryHaskellDepends = [ attoparsec base cassava conduit lens mtl text vector wreq ]; @@ -193219,7 +207393,7 @@ self: { mkDerivation { pname = "yahoo-web-search"; version = "0.2"; - sha256 = "93399fbcf15f5b621ad1d172278c7997a37a113384eb98604cffc349fa549818"; + sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck"; libraryHaskellDepends = [ base HTTP network xml ]; homepage = "http://www.people.fas.harvard.edu/~stewart5/code/yahoo-web-search"; description = "Yahoo Web Search Services"; @@ -193232,7 +207406,7 @@ self: { mkDerivation { pname = "yajl"; version = "0.3.2"; - sha256 = "7376f1557d4d18ad0181e917d551205320256609893e2a43f55f08a66834281c"; + sha256 = "07186ilac22zym1jlgl915k2a82k418xa5z9h40ss62dgmaz2xkk"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ yajl ]; libraryToolDepends = [ c2hs ]; @@ -193249,7 +207423,7 @@ self: { mkDerivation { pname = "yajl-enumerator"; version = "0.4.1"; - sha256 = "b2f1b2fc02d78d6922aed1db06da91e9e0c7b10067edfacf7ca35e8c0a0de837"; + sha256 = "0dz81l58qpm3gk7zmvb702qwgq79j7d0dnyimqi6k3fp0byb5wdj"; libraryHaskellDepends = [ base bytestring enumerator json-types text transformers yajl ]; @@ -193264,7 +207438,7 @@ self: { mkDerivation { pname = "yall"; version = "0.2.1"; - sha256 = "5ad43611cb77c095fca4bb11bb3b6713e6e648c3bc9a1906e5f72730283c3d8c"; + sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s"; libraryHaskellDepends = [ base categories transformers ]; homepage = "http://brandon.si/code/yall/"; description = "Lenses with a southern twang"; @@ -193276,7 +207450,7 @@ self: { mkDerivation { pname = "yamemo"; version = "0.6.0"; - sha256 = "f6f97c9c6ea3eb915cd742d4545c1dec636396608f889a2f2d91c856a24b108b"; + sha256 = "12qh9fi5dj4i5lprm24gc2b66qzc3mf59m22sxf93sx3dsf7rygn"; libraryHaskellDepends = [ base containers mtl ]; description = "Simple memoisation function"; license = stdenv.lib.licenses.bsd3; @@ -193291,8 +207465,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.22"; - sha256 = "76429aedad04cadacbdc20fdb7f4a763b8e5bf9f733d6c97f166edb24bd9b5a3"; + version = "0.8.23.3"; + sha256 = "0hvmxl8krh8m3804d1nrvgmbirvw11a8iy80ciq4rg0csmz5r1fc"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -193320,8 +207494,8 @@ self: { }: mkDerivation { pname = "yaml-combinators"; - version = "1.0"; - sha256 = "9997df825976d8e02ce501248dc2ab82bc4ba30510fe3511b199e4d99bd9bd17"; + version = "1.0.1"; + sha256 = "03y7z08ly3l5plh2c06i1p83c12s15fwshkl4nakqf1a6vb7bl48"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml @@ -193341,7 +207515,7 @@ self: { mkDerivation { pname = "yaml-config"; version = "0.4.0"; - sha256 = "7357560b3e36d663058478f2e13d371a0a057a84017ef80752316282484bf80e"; + sha256 = "03pq9d484qiia83zhzh1hix0a2hs6wyy3wkqhh2n7min7q5mcmvk"; libraryHaskellDepends = [ base deepseq text unordered-containers yaml ]; @@ -193358,7 +207532,7 @@ self: { mkDerivation { pname = "yaml-light"; version = "0.1.4"; - sha256 = "1352949bf8aea4950ed2d48ace4efc7b9301bf8c58858b882d47d0902e9efd16"; + sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk"; libraryHaskellDepends = [ base bytestring containers HsSyck ]; description = "A light-weight wrapper with utility functions around HsSyck"; license = stdenv.lib.licenses.bsd3; @@ -193371,7 +207545,7 @@ self: { mkDerivation { pname = "yaml-light-lens"; version = "0.3.3.3"; - sha256 = "788a79a1afd97d9c41010b6240261995da9e80f5674b4e335beec47d225211cf"; + sha256 = "1kqia8i7vi7fbcrlwjv7yn09xnlm34k40qhb050rqzfrmyhpk2kq"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -193388,7 +207562,7 @@ self: { mkDerivation { pname = "yaml-rpc"; version = "1.0.3"; - sha256 = "2fe5258d9a1e4d0f9d440dfad9e68f17d30e22fbd6792bdef2bb8f77a0473906"; + sha256 = "01ir8yh7g3xvybg2nyfnzci0xlqpizkdkyhd8jfhyk8yka6jbr9g"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-types lens template-haskell text th-lift transformers unordered-containers @@ -193407,7 +207581,7 @@ self: { mkDerivation { pname = "yaml-rpc-scotty"; version = "1.0.2"; - sha256 = "630d972380f9a306d4131a302e251d5e1ad5af61d0203eea21d9a1d370fc7bcd"; + sha256 = "1kbvziqd78fr47m3w86hc6pxa6jy3ljjwc0s2ga0d8zrh0irf3b3"; libraryHaskellDepends = [ aeson base containers http-types mmorph scotty text transformers yaml yaml-rpc @@ -193425,7 +207599,7 @@ self: { mkDerivation { pname = "yaml-rpc-snap"; version = "1.0.3"; - sha256 = "c94697a1801df4d75e9de1b0ac9265f9041be1350e4a11bd216b8347b26b9a9d"; + sha256 = "17csdfr4g0vb46yi2jhf6phin17rcn9arc71kmgdgx0xh2hrfin9"; libraryHaskellDepends = [ aeson base bytestring containers http-types snap text transformers yaml yaml-rpc @@ -193437,21 +207611,28 @@ self: { }) {}; "yaml-union" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative - , unordered-containers, yaml + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , hspec, optparse-applicative, QuickCheck, quickcheck-instances + , scientific, text, unix, unordered-containers, vector, yaml }: mkDerivation { pname = "yaml-union"; - version = "0.0.1"; - sha256 = "b3af25a1e50aa778e5628bce31a4abd5a6c1749a191d9f38549f2e949f8ebd85"; + version = "0.0.2"; + sha256 = "1lmlrf3x4icx0ikl02k00hv1wibvy0n3lmxdgjrh0vbq89sbx55a"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base unordered-containers yaml ]; - executableHaskellDepends = [ - base bytestring optparse-applicative yaml + libraryHaskellDepends = [ + aeson base bytestring directory filepath text unix + unordered-containers vector yaml ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/michelk/yaml-overrides.hs"; + executableHaskellDepends = [ + base bytestring directory optparse-applicative yaml + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances scientific text + unordered-containers vector yaml + ]; + homepage = "https://github.com/michelk/yaml-union.hs"; description = "Read multiple yaml-files and override fields recursively"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -193464,7 +207645,7 @@ self: { mkDerivation { pname = "yaml2owl"; version = "0.0.1"; - sha256 = "c5e0eadb8c771d67bd617b714f9e124abfdb8ea23f4b0a8b1c50f6d50d66e7fb"; + sha256 = "1yz7cq6xbxjh3j5hljrzla7dpgsa2ag4ywbvc6ynf7bpikdymq65"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193483,7 +207664,7 @@ self: { mkDerivation { pname = "yamlkeysdiff"; version = "0.5.1"; - sha256 = "c7ab8af8ba9064ca1213140b13f53a1a579abd29e5aa8e24b897b3de7cc4458f"; + sha256 = "13s5qiydxcwpp0j8xap556yrlmqs7bsi62ql2c9clr4hpbw8may7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193500,9 +207681,9 @@ self: { mkDerivation { pname = "yampa-canvas"; version = "0.2.2"; - sha256 = "167c8dc3992d98d879eb281b27a0dbf6fde21ca69992e384df4b5babcdda3e3c"; + sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; revision = "1"; - editedCabalFile = "98e99a555170a8b7281116b4e9c829c011b2401f21589f55ae80333ff2d6f34a"; + editedCabalFile = "0jpksvr3ycw0mraryn113x0b44f0574fkd0n24lbga3ha5armscq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -193517,7 +207698,7 @@ self: { mkDerivation { pname = "yampa-glfw"; version = "0.1.0.0"; - sha256 = "59d6668fe1455cbdcb1310bc0671e50b924eef2470ce68fc5a29311312fa768c"; + sha256 = "133nz8916c99bby6ikkh4kplx4hbwmqhdg0h2g5vsp25w67ndmjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLFW-b newtype OpenGL Yampa ]; @@ -193537,7 +207718,7 @@ self: { mkDerivation { pname = "yampa-glut"; version = "0.1.1.1"; - sha256 = "f7c2b8aec210261341310f0c63f2eed3f80952077ad907ebff4427902ce4c304"; + sha256 = "0163whn909s4zzmhgnbs0x90ky6kxvr6630g650i69hhqapbihpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193553,7 +207734,7 @@ self: { mkDerivation { pname = "yampa2048"; version = "0.1.0.0"; - sha256 = "bfe221077d1f7558a7bec1b8174762325055ac48492138c4742432ddbfcdf40e"; + sha256 = "03plrnzxsci4fk23h8a992n5al1jc93igf61pskmhx8zgl3j3qmz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gloss random Yampa ]; @@ -193571,7 +207752,7 @@ self: { mkDerivation { pname = "yandex-translate"; version = "0.1.0.0"; - sha256 = "8d0e4d39f84faaf71000746a436673c459fe454b6bd595857acf1f7e38e1c79f"; + sha256 = "17y7w4w7w7ygga2rbmbb9d2zwnf4fdk46skl008ggajgz0wls3ld"; libraryHaskellDepends = [ aeson base bytestring data-default-class exceptions lens lens-aeson text transformers unordered-containers wreq @@ -193585,9 +207766,9 @@ self: { mkDerivation { pname = "yaop"; version = "0.1.2.1"; - sha256 = "b9dd761ef5840f592ccb58d4bfaa3dd327c874453d45e9f0d37325b4ba73c67c"; + sha256 = "0z66ffxb89bksgqfji9x8msch9yk7nmbzm2qrcn5j3w4ylg7dpdr"; revision = "1"; - editedCabalFile = "5333f04af0a27a0197004dc2e686dbbf29e5e2dc248277eb2afcb7587092a55c"; + editedCabalFile = "0p55j9q5idzw5bmpg0i4vkifaadzvf3fdhjd02bh2ym2y15g0csk"; libraryHaskellDepends = [ base mtl template-haskell ]; homepage = "https://github.com/esmolanka/yaop"; description = "Yet another option parser"; @@ -193600,13 +207781,35 @@ self: { mkDerivation { pname = "yap"; version = "0.2"; - sha256 = "d18417aca635b9806f437c9476a80fa7633463185b06ff6e28ce3e2813299892"; + sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i"; libraryHaskellDepends = [ base ]; description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yarn-lock" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, megaparsec + , protolude, tasty, tasty-hunit, tasty-th, text + }: + mkDerivation { + pname = "yarn-lock"; + version = "0.2.0"; + sha256 = "0jily4hrxbj487450amx6nayxpcm0giwrv0zn3mld906lqr2f990"; + revision = "1"; + editedCabalFile = "1ji64dab6wf59l9yi1czm81xgnx86qgvcawnxwa83wp1fa3flics"; + libraryHaskellDepends = [ + base containers megaparsec protolude text + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers megaparsec protolude tasty + tasty-hunit tasty-th text + ]; + homepage = "https://github.com/Profpatsch/yarn-lock#readme"; + description = "Represent and parse yarn.lock files"; + license = stdenv.lib.licenses.mit; + }) {}; + "yarr" = callPackage ({ mkDerivation, base, deepseq, fixed-vector, ghc-prim , missing-foreign, primitive, template-haskell @@ -193614,7 +207817,7 @@ self: { mkDerivation { pname = "yarr"; version = "1.4.0.2"; - sha256 = "caf979caeb9058ca4c51d15df3ca1554d2ea28daef37b17cbd549e7b0eef24ef"; + sha256 = "1vr4xw77p7jlpmyb2dzgv8lfmljl2p5g6pfia56cln4hxg57kyfa"; libraryHaskellDepends = [ base deepseq fixed-vector ghc-prim missing-foreign primitive template-haskell @@ -193629,7 +207832,7 @@ self: { mkDerivation { pname = "yarr-image-io"; version = "1.3.2.1"; - sha256 = "3da00b3cef4d86c9d8cf9ac768da3fc062cec7e2a1f8ad30f9b02c2e0cffb5f2"; + sha256 = "1wmmzw62wb5hz4qavy51wb3wwqn07zd6iiwsrzcck1jdxwy0p81x"; libraryHaskellDepends = [ base yarr ]; librarySystemDepends = [ libdevil ]; description = "Image IO for Yarr library"; @@ -193644,7 +207847,7 @@ self: { mkDerivation { pname = "yate"; version = "0.1.0.1"; - sha256 = "8fa4cfd9777a0768d804e7413c3c9f84d12142accdc7b071d70af214b7d33206"; + sha256 = "01ijsfvi9whasxqv1iydmi123lc4kwy3qhg70kc6h1vsfzcwz94g"; libraryHaskellDepends = [ aeson attoparsec base mtl scientific template-haskell text unordered-containers vector @@ -193664,7 +207867,7 @@ self: { mkDerivation { pname = "yavie"; version = "0.0.1"; - sha256 = "e53f3479210122d1b2fd374d418cf97a828bd9f64a104906cde8af8d26684f40"; + sha256 = "0h2gd0k8vbz8rl34j42ayvcqp0ksz6642k9pznrd28h145wk8gz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193681,7 +207884,7 @@ self: { mkDerivation { pname = "ycextra"; version = "0.1"; - sha256 = "a5126ff166497b2e55440de37cf6e8a7a58ddbdcbf633c3117054c76b2784029"; + sha256 = "0aa0g2r7ck052wqkqqxzvkdqv9d7x3v7rqqd8iajwys9cvqny4m5"; libraryHaskellDepends = [ base containers csv mtl uniplate yhccore ]; @@ -193698,7 +207901,7 @@ self: { mkDerivation { pname = "yeganesh"; version = "2.5"; - sha256 = "6e2f91560e002727877b6a51f012d142a9db2a22ee764f819406d8f2c22efcad"; + sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -193718,7 +207921,7 @@ self: { mkDerivation { pname = "yeller"; version = "0.1.0.4"; - sha256 = "72a882c20c42eba7f90a729ef5a727999fe4593935db528d193ba4d295643365"; + sha256 = "0r9kcjax591v366m5nrm75cy97wr4ykzb7kj1bwsgss21k185a3j"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types network stm text unordered-containers @@ -193744,7 +207947,7 @@ self: { mkDerivation { pname = "yes-precure5-command"; version = "5.5.3"; - sha256 = "27f2f2dcd81923a18450cda21a31585d0d3887afde504190667cb7dbf0a0af7e"; + sha256 = "0zmgl3qdpdvwcs842l6ymy3kh3axb0qim8nda22a28qrv3fg5wi7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193766,8 +207969,8 @@ self: { }: mkDerivation { pname = "yeshql"; - version = "2.2.0.0"; - sha256 = "3a17da3d051c19d44cd65bdccd3f47ca78c9df6b9190ca732dba16ad086c9e2d"; + version = "3.0.0.1"; + sha256 = "1qlx0wpcf6dms7q8rkdj41az01d7yywi2j8khi36k4r298l2g4v5"; libraryHaskellDepends = [ base containers convertible filepath HDBC parsec syb-with-class template-haskell @@ -193781,30 +207984,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , conduit, conduit-extra, data-default-class, directory - , fast-logger, monad-control, monad-logger, resourcet, semigroups - , shakespeare, streaming-commons, template-haskell, text - , transformers, unix, unordered-containers, wai, wai-extra - , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.4.4"; - sha256 = "5f2caade2435754ff35060c3ae58390ad87650b975e83a65f8013e80ea7bea2c"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring conduit conduit-extra - data-default-class directory fast-logger monad-control monad-logger - resourcet semigroups shakespeare streaming-commons template-haskell - text transformers unix unordered-containers wai wai-extra - wai-logger warp yaml yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod_1_4_5" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , conduit, conduit-extra, data-default-class, directory , fast-logger, monad-control, monad-logger, resourcet, semigroups @@ -193815,7 +207994,7 @@ self: { mkDerivation { pname = "yesod"; version = "1.4.5"; - sha256 = "267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9"; + sha256 = "1sg66nq8yaas2m5nqsdrxricvcizd1ik02zqk60sxh3wna08fz16"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring conduit conduit-extra data-default-class directory fast-logger monad-control monad-logger @@ -193826,7 +208005,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-angular" = callPackage @@ -193836,7 +208014,7 @@ self: { mkDerivation { pname = "yesod-angular"; version = "0.1.0.2"; - sha256 = "27f5f4b53db1474d2d019d84047e73c5ee0da07c55379f76709df0f5fa2a9b1e"; + sha256 = "07lv5bxgbw4xf1v9ydsmgjh0vvn5fdz0914x04nlsixi7nsz9x97"; libraryHaskellDepends = [ aeson base containers shakespeare template-haskell text transformers yesod @@ -193853,7 +208031,9 @@ self: { mkDerivation { pname = "yesod-angular-ui"; version = "0.1.1.0"; - sha256 = "13d53d0537abf466649fb535f436081be546b97f4986eb1e6452aeb808473923"; + sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k"; + revision = "1"; + editedCabalFile = "1nak49v5ggsmpgawa8q8li88vf1nw6kn0f9fii7d6xbnfxpx6w6x"; libraryHaskellDepends = [ base blaze-html containers directory hjsmin mtl resourcet shakespeare template-haskell text transformers yesod yesod-core @@ -193864,26 +208044,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-articles" = callPackage + ({ mkDerivation, base, blaze-html, dates, directory, filepath + , hspec, regex-compat, shakespeare, template-haskell, text + , th-lift-instances, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-articles"; + version = "0.1.0.0"; + sha256 = "1jm5m1gq9b2r4q2hf0mi0j0z8rs0klg02pksm5czz25lghdd0b0b"; + libraryHaskellDepends = [ + base blaze-html dates directory filepath regex-compat shakespeare + template-haskell text th-lift-instances yesod yesod-core + ]; + testHaskellDepends = [ + base blaze-html dates directory filepath hspec regex-compat + shakespeare template-haskell text th-lift-instances yesod + yesod-core yesod-test + ]; + homepage = "https://github.com/matthew-eads/yesod-articles"; + description = "Automatically generate article previews for a yesod site"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, memory + , mime-mail, network-uri, nonce, persistent, persistent-template + , random, resourcet, safe, shakespeare, template-haskell, text + , time, transformers, unordered-containers, wai, yesod-core + , yesod-form, yesod-persistent }: mkDerivation { pname = "yesod-auth"; - version = "1.4.16"; - sha256 = "a2c76409522ac276b92d31e13ffa94ae51194ffdb902a41f979d25181a5182d2"; + version = "1.4.17.2"; + sha256 = "10wrl6g5q06mf751rwc8wclb5i5wajp30vhr7ggpvfylmqzjg933"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-conduit http-types lifted-base memory mime-mail network-uri nonce persistent persistent-template random resourcet safe shakespeare template-haskell text time transformers unordered-containers wai yesod-core yesod-form yesod-persistent @@ -193893,36 +208097,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-auth_1_4_17" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.17"; - sha256 = "444a9b4b913e5f7addb1b9c5aa778f32d2b9e040d9b1c4d8a232fae908392891"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -193932,7 +208106,7 @@ self: { mkDerivation { pname = "yesod-auth-account"; version = "1.4.3"; - sha256 = "e9f077d58d64023b80d6ff502933e8dfc6832c95afbdabce3124dddc918664af"; + sha256 = "1bv4hs8xrp94677apgdgjln87inzx0rjjl7zss03n0k4ipapgw79"; libraryHaskellDepends = [ base blaze-html bytestring mtl nonce persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -193956,7 +208130,7 @@ self: { mkDerivation { pname = "yesod-auth-account-fork"; version = "2.0.3"; - sha256 = "875b3636d727c4adda822794ac2467bd62088420726341f1259f394086bed950"; + sha256 = "0l6rps340fcz4pql2qvj4220hqmxcwjar517hbdavi17swv3cnw7"; libraryHaskellDepends = [ aeson base blaze-html bytestring email-validate http-types mtl nonce persistent pwstore-fast random tagged text yesod-auth @@ -193979,7 +208153,7 @@ self: { mkDerivation { pname = "yesod-auth-basic"; version = "0.1.0.2"; - sha256 = "aaaf330bc05b86ddd53cf092d48df1279e4bea47f67cbc6a8b67f1308ef39b2c"; + sha256 = "0b4vyf731wb7idmbqz7n8zm4p7i7y66x94ph7kaxv1jvq05k7bxa"; libraryHaskellDepends = [ base base64-bytestring bytestring exceptions text wai word8 yesod ]; @@ -193996,7 +208170,7 @@ self: { mkDerivation { pname = "yesod-auth-bcrypt"; version = "0.2.0"; - sha256 = "e577b2d58f969e3b55d4029017b161e1afe5b2c4577ea64112d9ba9fc0fceb1a"; + sha256 = "06pbzk09zfnr290sczjpqjrfbbz1c6qig402siakp7lnizav4xz5"; libraryHaskellDepends = [ base bcrypt bytestring text yesod-auth yesod-core yesod-form yesod-persistent @@ -194017,7 +208191,7 @@ self: { mkDerivation { pname = "yesod-auth-deskcom"; version = "1.4.0"; - sha256 = "dc80b8f0ef1ff6d76b68c51ee8319452fb77e2aad83c39776d1904e6329f979e"; + sha256 = "17lpkwrfc10rdmvkjg6qmbi7gysjjhqyh7n5d1mxgxhzxzqbi06w"; libraryHaskellDepends = [ aeson base base64-bytestring byteable bytestring cipher-aes cprng-aes crypto-api crypto-random cryptohash data-default @@ -194037,14 +208211,14 @@ self: { }: mkDerivation { pname = "yesod-auth-fb"; - version = "1.7"; - sha256 = "02c041d0f58c630a2b2f4b3e810722fe71aca60c729770fd47324a9dd4dce4ce"; + version = "1.8.1"; + sha256 = "0y7vl91ih3w2wdv62hpa180l2536778s64w9vqygh7cd9rmikdzg"; libraryHaskellDepends = [ aeson base bytestring conduit fb http-conduit lifted-base shakespeare text time transformers wai yesod-auth yesod-core yesod-fb ]; - homepage = "https://github.com/prowdsponsor/yesod-auth-fb"; + homepage = "https://github.com/psibi/yesod-auth-fb"; description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -194059,8 +208233,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.6.0.1"; - sha256 = "8fe73fb7e4301e02e69cac312227078fd01927c8a006224f7e3fd8a93aa9cb75"; + version = "1.6.1"; + sha256 = "1y2ssd11a4fgxcqa8djvkivv7x6h0s4frm3a9nvsqi76lkg0ai39"; libraryHaskellDepends = [ aeson base bytestring persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -194077,6 +208251,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-auth-hmac-keccak" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl + , persistent, random, shakespeare, text, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-static + }: + mkDerivation { + pname = "yesod-auth-hmac-keccak"; + version = "0.0.0.2"; + sha256 = "005v6wr9xw6lm4w7nm9pbbyp5j458dcyshk8yh3vlpf7sj29cya6"; + libraryHaskellDepends = [ + aeson base bytestring cryptonite mtl persistent random shakespeare + text yesod-auth yesod-core yesod-form yesod-persistent yesod-static + ]; + description = "An account authentication plugin for yesod with encrypted token transfer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-kerberos" = callPackage ({ mkDerivation, authenticate-kerberos, base, bytestring , shakespeare, text, transformers, yesod-auth, yesod-core @@ -194085,7 +208277,7 @@ self: { mkDerivation { pname = "yesod-auth-kerberos"; version = "1.4.3"; - sha256 = "b1a84a84615aa018e51fb3b0b618fad2ffe569442dbc7ed2e4f36f9b3fdfbb49"; + sha256 = "0jdvvwzrnvzkwk97xg1d8ilybzyjz8cbdc5k3zjii82sc624ma5i"; libraryHaskellDepends = [ authenticate-kerberos base bytestring shakespeare text transformers yesod-auth yesod-core yesod-form @@ -194103,7 +208295,7 @@ self: { mkDerivation { pname = "yesod-auth-ldap"; version = "0.0.3"; - sha256 = "d3bbbf5c5a57c3846868253fa812c8241c35168e5a6c322f8123da7dc5dc42df"; + sha256 = "1ps2vk2pvni3h4pk4v2siqb3a714r09ahgr5d1l89hspb9fbzfyk"; libraryHaskellDepends = [ authenticate-ldap base bytestring hamlet LDAP text transformers yesod-auth yesod-core yesod-form @@ -194121,7 +208313,7 @@ self: { mkDerivation { pname = "yesod-auth-ldap-mediocre"; version = "0.1.1"; - sha256 = "ecf280a3e185d9864a9924681856fa92e5fe441d02e0f29164c3bc4d9eef430b"; + sha256 = "02s3xyg4vg63cj8z5q023m2gxrcjz9b1hs14k558dnc5w6iq1wpc"; libraryHaskellDepends = [ aeson base LDAP text yesod-auth yesod-core yesod-form ]; @@ -194137,7 +208329,7 @@ self: { mkDerivation { pname = "yesod-auth-ldap-native"; version = "0.2.0.0"; - sha256 = "5d989fddf0a3099c82236a6275e4bbd44ef99d7b9a426f1e36c7d6e7187f7dfc"; + sha256 = "1z3xgwcfgmn76qg6yhlsgffzjknlpgj7aqka4f19q2d3y3frz62x"; libraryHaskellDepends = [ base either ldap-client semigroups text transformers yesod-auth yesod-core yesod-form @@ -194155,7 +208347,7 @@ self: { mkDerivation { pname = "yesod-auth-nopassword"; version = "0.1.1.1"; - sha256 = "0e1daf32cb9e57b85e89412e089a49308d5364ad98f3def64494e195fd0cf7b2"; + sha256 = "1cpp1kyrbqcl8kvdxwwqmmj5739h96d0hbj1i5gbhmwyrcray78f"; libraryHaskellDepends = [ base blaze-markup http-types pwstore-fast text uuid yesod-auth yesod-core yesod-form @@ -194172,7 +208364,7 @@ self: { mkDerivation { pname = "yesod-auth-oauth"; version = "1.4.2"; - sha256 = "c115b0cd142423642e83775d81feee450e7bea2785ea882cd197bf3926ca7927"; + sha256 = "09vrr8k3kgwps4n8isl54zm7n3j5xvz82pbphcp688r42k6v05f1"; libraryHaskellDepends = [ authenticate-oauth base bytestring lifted-base text transformers yesod-auth yesod-core yesod-form @@ -194192,7 +208384,7 @@ self: { mkDerivation { pname = "yesod-auth-oauth2"; version = "0.2.2"; - sha256 = "6276f3bef0c992084ce55cdefb64dbb63b9a27b3ccfed515318f043ea7b85c33"; + sha256 = "0cswp2kkw14g64axbzncnckrlfxnvdjgppjwwm60i4n9y2zg6xk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194214,7 +208406,7 @@ self: { mkDerivation { pname = "yesod-auth-pam"; version = "1.0.0.0"; - sha256 = "1ece5d21824aef12e3f292074c0dc31908a6068ef46469964e7bcb468f799709"; + sha256 = "02cpg67ldjvv9sb6jr7liq3ac20rqc6lq1wjybii5vsah8hmvkhy"; libraryHaskellDepends = [ base hamlet pam text yesod-auth yesod-core yesod-form ]; @@ -194230,7 +208422,7 @@ self: { mkDerivation { pname = "yesod-auth-smbclient"; version = "2.0.0.0"; - sha256 = "4a3d2cbd1c5d9bb9e816067446af75610c16972ce5c320f0e875676496ab0b81"; + sha256 = "108bmfb68rvmx3q21hz55jbic331fnplcx062vlbk6sx3jyjqgaa"; libraryHaskellDepends = [ base hamlet sys-auth-smbclient text yesod-auth yesod-core yesod-form @@ -194249,7 +208441,7 @@ self: { mkDerivation { pname = "yesod-auth-zendesk"; version = "1.2.1"; - sha256 = "cbe2f448c102d04409dd74a400881dae145a9b640abc437a6ad533f956f34e4a"; + sha256 = "0jjfydbgjcymd9x47g0acjdml55f3n40193lvl4l9l02q54g9qnb"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptohash data-default http-conduit http-types template-haskell text time transformers wai @@ -194275,8 +208467,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.5.1"; - sha256 = "034114dade5a23ec39ffeb9f78a04b7bd9fc0b8942b1a11118475e4c594863cd"; + version = "1.5.2.3"; + sha256 = "1xi3s79j14sa7wav8i1vpp14ry2jgkrbvich13yccd3qkmbw7azf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -194295,41 +208487,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-bin_1_5_2" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, deepseq, directory, file-embed - , filepath, fsnotify, http-client, http-client-tls - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, safe-exceptions, say, shakespeare, split, stm - , streaming-commons, tar, template-haskell, text, time - , transformers, transformers-compat, typed-process, unix-compat - , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.5.2"; - sha256 = "b37087eb7e167c2250dd23452e8f4858190db11570e540df44809c197219439a"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class deepseq - directory file-embed filepath fsnotify http-client http-client-tls - http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - safe-exceptions say shakespeare split stm streaming-commons tar - template-haskell text time transformers transformers-compat - typed-process unix-compat unordered-containers wai wai-extra warp - warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -194337,7 +208494,7 @@ self: { mkDerivation { pname = "yesod-bootstrap"; version = "0.4"; - sha256 = "8c5dbaa3aff6b2ab67fa98654daf4a885e03e4f8a380b461f5f3333871a92a91"; + sha256 = "149am5qkhczkymhv9053z3j06pl89aplsrcqz9kspcpnmyivlpcc"; libraryHaskellDepends = [ base blaze-html blaze-markup bootstrap-types shakespeare text transformers yesod-core yesod-elements @@ -194354,7 +208511,7 @@ self: { mkDerivation { pname = "yesod-colonnade"; version = "1.1.0"; - sha256 = "163fbe1c8618c01d17900ba205e7df8bd9e0a7abc5475ae6436417afafbf0a34"; + sha256 = "0d0apypsy5v48gk5liy5mfky1ncbvzkhb8hbj0bivh0qhqfbwgqn"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text yesod-core ]; @@ -194372,7 +208529,7 @@ self: { mkDerivation { pname = "yesod-comments"; version = "0.9.2"; - sha256 = "f12026d85b1832ae04d81e5e18413fcf35cd2cb71e480cc73d5573fe39435cc7"; + sha256 = "1isw8cwzwwsm7p3hqj0ynwncsdfg7x0ihphyv02awchqbgc2c87i"; libraryHaskellDepends = [ base bytestring directory friendly-time gravatar old-locale persistent template-haskell text time wai yesod yesod-auth @@ -194393,7 +208550,7 @@ self: { mkDerivation { pname = "yesod-content-pdf"; version = "0.2.0.3"; - sha256 = "8c5874e54246a70f6fed205cf29b7a6068176f3af80a991a05b0adc532803230"; + sha256 = "0c1jh0rcbbdh0ld9j2pq79pifs30gadz4p10xmphz9s68bjp8n4c"; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring conduit data-default directory network-uri process temporary transformers yesod-core @@ -194414,7 +208571,7 @@ self: { mkDerivation { pname = "yesod-continuations"; version = "0.1"; - sha256 = "368649e1f7af2c87ff405b8d5167b6db92ab2b6496d84b1a5fee2a87c206ecdf"; + sha256 = "1pzc0v18fapfbwd4pn4nchmsp4nvnrkm33av83zqfb5gyzhlk1in"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194442,8 +208599,10 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.31"; - sha256 = "9a2e4c39c9ce66c2881d5da6c9a621c07492c950d935231aa7e12ed3a008d7af"; + version = "1.4.35"; + sha256 = "1wawpd2pwqn535zrs5wz43jvi0bca0q2kinml6waw5d4s7m0npby"; + revision = "1"; + editedCabalFile = "1cgizphqsjd6qmz7xa1flcg064rg5543shybqx6l2npyr21h67yk"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -194470,50 +208629,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-core_1_4_32" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , criterion, data-default, deepseq, deepseq-generics, directory - , exceptions, fast-logger, hspec, hspec-expectations, http-types - , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.32"; - sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -194522,7 +208637,7 @@ self: { mkDerivation { pname = "yesod-crud"; version = "0.1.7"; - sha256 = "151038f8183c0c65a540ec6823e9dd1ab32c6b6f56db07ef05366396023e0139"; + sha256 = "0f817q19cqrn0pphgnsndxmjrcqsvplj6s7c82jna31w33w3h40m"; libraryHaskellDepends = [ base classy-prelude containers MissingH monad-control persistent random safe stm uuid yesod-core yesod-form yesod-persistent @@ -194541,7 +208656,7 @@ self: { mkDerivation { pname = "yesod-crud-persist"; version = "0.3"; - sha256 = "6bdc078780b7fd8194706a6a0e344f03caf1b9c02edb1f3e624e14c5af89aac9"; + sha256 = "1jdai6pwa52fc8z1znrfq2wz3jh39ws0wskaf2a83zdph23hgp3b"; libraryHaskellDepends = [ base either esqueleto microlens microlens-th persistent text time transformers wai yesod-core yesod-form yesod-markdown @@ -194561,7 +208676,7 @@ self: { mkDerivation { pname = "yesod-csp"; version = "0.2.1.0"; - sha256 = "068357f7a3f6f6e6593730a556d84a5c1643e37b492d5486f4387dd111494e95"; + sha256 = "15af948x2z9qyj358ba9ggil65jw9bc5d99h6xcydxpnlgvmg0q6"; libraryHaskellDepends = [ attoparsec base mono-traversable network-uri semigroups syb template-haskell text uniplate yesod yesod-core @@ -194586,7 +208701,7 @@ self: { mkDerivation { pname = "yesod-datatables"; version = "0.1.1"; - sha256 = "e6af50d3a85032ccb37d3f6ac3c8149391495beab48d10c9bdc98081fc74c67a"; + sha256 = "0yn6fky83069pp4i13dlx9dlk4ck2k4c6sizgnrwqcjhm39m1bz6"; libraryHaskellDepends = [ aeson attoparsec base bytestring data-default persistent text yesod yesod-auth yesod-core yesod-default yesod-form yesod-static @@ -194608,7 +208723,7 @@ self: { mkDerivation { pname = "yesod-default"; version = "1.2.0"; - sha256 = "f39ae1953a95c1919a9dd214d93bf81078b1dcbbac737dc9bb7339dbad9dda96"; + sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk"; libraryHaskellDepends = [ base yesod-core ]; homepage = "http://www.yesodweb.com/"; description = "Default config and main functions for your yesod application (deprecated)"; @@ -194624,7 +208739,7 @@ self: { mkDerivation { pname = "yesod-dsl"; version = "0.2.1"; - sha256 = "4033df3f27a99cfc279cb32b146909e13725adc81e2a0c584de95f8f70d5a2a8"; + sha256 = "1a52smq8ypz99mc0qahyr2njadz115li8axkkhkzr7594wzxycs0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194646,37 +208761,20 @@ self: { mkDerivation { pname = "yesod-elements"; version = "1.0"; - sha256 = "d4a0cf90675bb146acf2e7fa6e743501f20b8efc7b9beac53e6081e9c1851134"; + sha256 = "0d0ihp0yk0b07v2ym6vvzj70pwh16ms6xyp7yan4dcavcy8cz86l"; libraryHaskellDepends = [ base blaze-html yesod-core ]; description = "Non template haskell markup building function in the spirit of lucid"; license = stdenv.lib.licenses.mit; }) {}; "yesod-eventsource" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, transformers, wai - , wai-eventsource, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-eventsource"; - version = "1.4.0.1"; - sha256 = "a5ec061ca8c426c4a8179bace45edd8100de96c947b8294445aae890dd175d48"; - libraryHaskellDepends = [ - base blaze-builder conduit transformers wai wai-eventsource - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Server-sent events support for Yesod apps"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-eventsource_1_4_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, transformers, wai , wai-eventsource, wai-extra, yesod-core }: mkDerivation { pname = "yesod-eventsource"; version = "1.4.1"; - sha256 = "4019782d074ed5c23719e8e96f604b63990d9fd49255e14b7f5b769e7f3d3e13"; + sha256 = "04ry7mzrwxjvgx5y2mcjsjghv6b39dh6zsg834vw5maf0wnph6a0"; libraryHaskellDepends = [ base blaze-builder conduit transformers wai wai-eventsource wai-extra yesod-core @@ -194684,7 +208782,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Server-sent events support for Yesod apps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-examples" = callPackage @@ -194695,7 +208792,7 @@ self: { mkDerivation { pname = "yesod-examples"; version = "0.9.0.1"; - sha256 = "e45a157f9d1e322ef3e802e45c8a5447755484aecb895083ab3b32a47dea79c6"; + sha256 = "1ikrx9ys8civmf1m12fbms258xa7aj55rr02x3rjwchykmzianp4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -194710,6 +208807,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) sqlite;}; + "yesod-fast-devel" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, directory + , filepath, fsnotify, Glob, optparse-applicative, process, pureMD5 + , stm, system-filepath, temporary, text + }: + mkDerivation { + pname = "yesod-fast-devel"; + version = "0.1.2.0"; + sha256 = "1z56y5l6mgwi7ghcn1ycxhgpzximg0fbs652jlaxdy03rzxizv29"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base bytestring directory filepath fsnotify Glob + optparse-applicative process pureMD5 stm system-filepath temporary + text + ]; + homepage = "https://github.com/haskellbr/yesod-fast-devel#readme"; + description = "Fast live-reloading for yesod applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-fay" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory , fay, fay-dom, filepath, monad-loops, process, pureMD5 @@ -194719,7 +208837,7 @@ self: { mkDerivation { pname = "yesod-fay"; version = "0.8.0"; - sha256 = "ee2113c9fe5c04a8d4a855fad7584ba1a4a0311a2755f8705ff6354e7808dd46"; + sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf"; libraryHaskellDepends = [ aeson base bytestring data-default directory fay fay-dom filepath monad-loops process pureMD5 shakespeare template-haskell text @@ -194736,13 +208854,13 @@ self: { }: mkDerivation { pname = "yesod-fb"; - version = "0.3.4"; - sha256 = "b7e631a440037b7b077d1bcc5d859006cf5e7420923d93dfe26a07e1d3ad9e25"; + version = "0.4.0"; + sha256 = "043k4rzvzyjibyq94vjsk2mvs4l2bwfn41h1jrhfsppw42zh3pcm"; libraryHaskellDepends = [ aeson base bytestring conduit crypto-api fb http-conduit text wai yesod-core ]; - homepage = "https://github.com/prowdsponsor/yesod-fb"; + homepage = "https://github.com/psibi/yesod-fb"; description = "Useful glue functions between the fb library and Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -194757,8 +208875,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.10"; - sha256 = "ddeb72988e1dffb1c3766c35941520aa6ff6a8b09d6bdeb453d9c75d11ad8e43"; + version = "1.4.12"; + sha256 = "0lcakfc0x17ng5kk1ahmd9m8nlbzll8mxw7fzxw2y48vak0kh5kk"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -194772,29 +208890,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-form_1_4_11" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: + "yesod-form-bootstrap4" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: mkDerivation { - pname = "yesod-form"; - version = "1.4.11"; - sha256 = "45edd3ea97a09968426ab20ea4595389b61f5fc2c9e328cecbdeed4a78dcd8d6"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - homepage = "http://www.yesodweb.com/"; - description = "Form handling support for Yesod Web Framework"; + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-json" = callPackage @@ -194804,7 +208909,7 @@ self: { mkDerivation { pname = "yesod-form-json"; version = "0.0.1"; - sha256 = "bfaf63bbf0c955465c037084494ea43d4468b0d8f380ab023df583abc91d25c3"; + sha256 = "1hr53p4sp0zm7l1ap07kv2q6hi1xli74k13h0df4cmf9y2xn7bxz"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers yesod-core yesod-form @@ -194819,8 +208924,8 @@ self: { }: mkDerivation { pname = "yesod-form-richtext"; - version = "0.1.0.0"; - sha256 = "b404fed16d56aac153e2f7a6c512f1b02653edb77bfea7e5331eac08ac6c11d1"; + version = "0.1.0.1"; + sha256 = "0bmngw13lgacni8xn5jwpnf77qf0nmg3cqhb0mshp7cccky7cg7y"; libraryHaskellDepends = [ base blaze-builder blaze-html shakespeare text xss-sanitize yesod-core yesod-form @@ -194837,7 +208942,7 @@ self: { mkDerivation { pname = "yesod-gitrepo"; version = "0.2.1.0"; - sha256 = "6e6e0f37771f888c687bbc2dff24228ea0461829de8c1b714da10dbe9f6987ec"; + sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf"; libraryHaskellDepends = [ base directory enclosed-exceptions http-types lifted-base process temporary text wai yesod-core @@ -194853,7 +208958,7 @@ self: { mkDerivation { pname = "yesod-gitrev"; version = "0.1.0.0"; - sha256 = "30e63c0ea5aec72eed0cd1d9e4dccf242e749c9740e5d67887cac02728628f49"; + sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih"; libraryHaskellDepends = [ aeson base gitrev template-haskell yesod-core ]; @@ -194868,7 +208973,7 @@ self: { mkDerivation { pname = "yesod-goodies"; version = "0.0.5"; - sha256 = "bf4976fd6ba3399e1f6e24cbd5a7897f092e420d74cd0416f300bc5696e7ad73"; + sha256 = "0wxdwyb5dg00ycb09kbl1m12w2bzi6kxbjr4dqgrwfd3dgypcjdz"; libraryHaskellDepends = [ base blaze-html bytestring directory HTTP old-locale pandoc pureMD5 text time yesod yesod-form @@ -194886,9 +208991,9 @@ self: { mkDerivation { pname = "yesod-ip"; version = "0.5.0"; - sha256 = "b6945480c694b48c03daceb6c286636f65ed9c442b7b94774814c1078418a029"; + sha256 = "0ad03220gh8l91vr8yrb8jffsrbgcf3c5dnfv81qrd4lqs05955n"; revision = "1"; - editedCabalFile = "257cdc5ff06969dc0298e4b92be3907fce4e9ad20eefd132e2f634bab47d0a83"; + editedCabalFile = "10qagnsbld7nw8rd3vqfsad4xkkzj3ijpfg4k01dqsb9y1gxqz15"; libraryHaskellDepends = [ base http-api-data ip path-pieces persistent text yesod-core yesod-form @@ -194906,8 +209011,8 @@ self: { }: mkDerivation { pname = "yesod-job-queue"; - version = "0.3.0.1"; - sha256 = "a58805e218e5b0e6c623a5447f06484004d72a357f4b2e30d476da56618b734f"; + version = "0.3.0.4"; + sha256 = "0vyd6mkajshr6f1xg5587ixzrgnwdmc8mf0slbz7rfcmwm4yx3wz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194927,7 +209032,7 @@ self: { mkDerivation { pname = "yesod-json"; version = "1.2.0"; - sha256 = "fce9323acfea7056bf303e190abd5742343c06f376762f020b38164dc32c0334"; + sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw"; libraryHaskellDepends = [ base yesod-core ]; homepage = "http://www.yesodweb.com/"; description = "Generate content for Yesod using the aeson package. (deprecated)"; @@ -194939,7 +209044,7 @@ self: { mkDerivation { pname = "yesod-links"; version = "0.3.0"; - sha256 = "3e982d5e4ae6fd337339c1548e1d32a885d51881a3ba50c4b917a5cd1f252b44"; + sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y"; libraryHaskellDepends = [ base text yesod-core ]; homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links"; description = "A typeclass which simplifies creating link widgets throughout your site"; @@ -194952,7 +209057,7 @@ self: { mkDerivation { pname = "yesod-lucid"; version = "0.1"; - sha256 = "37f6409c59a466fe9c138a1281a587015b8ac8d991cb56fd1054def152bcb5fa"; + sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip"; libraryHaskellDepends = [ base lucid monads-tf text yesod-core ]; description = "Lucid support for Yesod"; license = stdenv.lib.licenses.bsd3; @@ -194966,7 +209071,7 @@ self: { mkDerivation { pname = "yesod-mangopay"; version = "1.12"; - sha256 = "a53c0d1e8e1654a4c251b1830264f581a1ed668fffb303c05993e10e20932754"; + sha256 = "0m17jch0xqckb7007czzixkfv8c1ymj050xia71a8m0niqg0sg55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194987,7 +209092,7 @@ self: { mkDerivation { pname = "yesod-markdown"; version = "0.11.4"; - sha256 = "ea2e4c5506543922711ed169c90afe510ddf857276fdd5850e7481a2c181a916"; + sha256 = "05m9h70s50bl1s2xbzbnfa2xy3aizq5cjsfi3rqj4fal0ralqbpa"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form @@ -195005,7 +209110,7 @@ self: { mkDerivation { pname = "yesod-media-simple"; version = "0.2.0.0"; - sha256 = "d3489fd4cd6f1e1614301939eea8a61222c22f77fe13a6d5460f62fd590cdfe9"; + sha256 = "1sfz1iczsqhg8vasc4zyfwpw48hjlslfwf8r60a1c7kgrpa9yj6k"; libraryHaskellDepends = [ base bytestring diagrams-cairo diagrams-core diagrams-lib directory JuicyPixels vector yesod @@ -195023,7 +209128,7 @@ self: { mkDerivation { pname = "yesod-newsfeed"; version = "1.6"; - sha256 = "4e6dbc06002fe7fd13701941c036c51cf9407c35b28473ed509424bfc0b67516"; + sha256 = "05kmnv0by94la3np715j6my41y8wqlvc0h8rf09zvrrg003bqvaf"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring containers shakespeare text time xml-conduit yesod-core @@ -195038,7 +209143,7 @@ self: { mkDerivation { pname = "yesod-paginate"; version = "0.1"; - sha256 = "fe1ec1a93d938b6dd530f4bd4b689e45fe626497f49feb106c9c9cf3f23d1521"; + sha256 = "088m7prg774wdh8fp7zljxj65zj5krl4pggl63anv2wk7nlw27py"; libraryHaskellDepends = [ base template-haskell yesod ]; description = "Pagination for Yesod sites"; license = stdenv.lib.licenses.bsd3; @@ -195053,7 +209158,7 @@ self: { mkDerivation { pname = "yesod-pagination"; version = "2.0.0"; - sha256 = "a19e14e81a714e3f69554b77121e04e1a568b3524c287e1a1186de7f3c5a8234"; + sha256 = "0d42b8y7zpl624d7wa2caarni9g10hg14xsbamlkykki3bl197m1"; libraryHaskellDepends = [ base esqueleto yesod ]; testHaskellDepends = [ base hspec monad-logger persistent persistent-sqlite resource-pool @@ -195072,7 +209177,7 @@ self: { mkDerivation { pname = "yesod-paginator"; version = "0.11.0"; - sha256 = "60afa9b2a11f8c61a5ca090d3e0b0effe35162f67038e9c833a6e100b28aeb96"; + sha256 = "15pbiar01qd66g4fjf3hyri53qzz1q5kw389rajn330zl6rakbv0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195092,7 +209197,7 @@ self: { mkDerivation { pname = "yesod-paypal-rest"; version = "0.1.0"; - sha256 = "b09605850782f9d1f6688f29a8e40597168e74e26ce239e638c1e840e17dcdf7"; + sha256 = "1xydgphl1s6173k3kqkcw9s8w5lp0pjahacgd3vd3yc20y2hb5mh"; libraryHaskellDepends = [ base paypal-rest-client time yesod-core ]; @@ -195102,28 +209207,6 @@ self: { }) {}; "yesod-persistent" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.4.1.1"; - sha256 = "dffd2604fc37a6b518c06391c44059df96895e3b484d4de8fbff9ff0869e7551"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_4_2" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -195131,7 +209214,9 @@ self: { mkDerivation { pname = "yesod-persistent"; version = "1.4.2"; - sha256 = "d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056"; + sha256 = "0mhh7gka86spc51qcsi3y9nwdx9cn2fnm421dqm7yyp21518jf6r"; + revision = "1"; + editedCabalFile = "1aa1c3qbq223v3mslgj62jix10qff38zif8f6c8y3h7m0hix2fsf"; libraryHaskellDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -195143,7 +209228,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -195181,7 +209265,7 @@ self: { mkDerivation { pname = "yesod-platform"; version = "1.2.13.3"; - sha256 = "9babd4374a49315d3ad5bdedb9a0011fddab63e17373085fa0ed548557aae1c8"; + sha256 = "1j71m9bqam7dl1ghhwvkw5ispp8z06hbkvdxslx5sca998vx9awv"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint asn1-encoding asn1-parse asn1-types attoparsec-conduit authenticate auto-update base base16-bytestring @@ -195224,7 +209308,7 @@ self: { mkDerivation { pname = "yesod-pnotify"; version = "1.1.3.2"; - sha256 = "9e18578306181a9731810b956b0d2ab51d56773cfd47228d5ad71bacecf85419"; + sha256 = "06alz3naq6ypba6j4izx7ivmc7dm586np58bh4qrf6hq0s1mf64y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195244,7 +209328,7 @@ self: { mkDerivation { pname = "yesod-pure"; version = "0.1.0.2"; - sha256 = "efb7a83712493ec4b1002eb9bf850e7597470d3fd0f820d8f082755b26dc7d6c"; + sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg"; libraryHaskellDepends = [ base fast-logger text yesod yesod-core ]; homepage = "https://github.com/snoyberg/yesod-pure"; description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)"; @@ -195261,7 +209345,7 @@ self: { mkDerivation { pname = "yesod-purescript"; version = "0.0.5"; - sha256 = "be5216df86b8086c6eb649daec725298fca14724b4b0271084c57fc70c92312b"; + sha256 = "0arij86cfzy5hh82gc5l4i3s3z4qa9rfrnj9nrp6q25qhvgiclmy"; libraryHaskellDepends = [ aeson base bytestring containers data-default formatting fsnotify mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio @@ -195281,7 +209365,7 @@ self: { mkDerivation { pname = "yesod-raml"; version = "0.2.0"; - sha256 = "435ee3add5ed413b655b21619c9830b10148ac465f812aa66023e1ef4256d96c"; + sha256 = "0v6rar1fzq93c2k2m0az8sn4h0di62c9qq91bdjknhgdsnny6pj3"; libraryHaskellDepends = [ aeson base bytestring containers data-default network-uri regex-posix template-haskell text th-lift unordered-containers @@ -195305,7 +209389,7 @@ self: { mkDerivation { pname = "yesod-raml-bin"; version = "0.1.2"; - sha256 = "ccfe7a183fb3be12ba73028f3bb4f022285d05ffa916ea10ee67976177f04278"; + sha256 = "0y22y1vn35v7xq8fl5m9zw2msa12y2s3p3q2ffx15gmk7wc7mznc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -195326,7 +209410,7 @@ self: { mkDerivation { pname = "yesod-raml-docs"; version = "0.1.1"; - sha256 = "9b256e1de318bbaa781fda8cc0d76eeaa3ab676a780e63f946d5b96a6a10bc51"; + sha256 = "0ldw21m6mffm8vwn63kqd9ksp8zadvbw136s3xwamfqqwcfnw9cv"; libraryHaskellDepends = [ base bytestring containers shakespeare template-haskell text yaml yesod-markdown yesod-raml @@ -195344,7 +209428,7 @@ self: { mkDerivation { pname = "yesod-raml-mock"; version = "0.1.1"; - sha256 = "9e69f82bea91a60fe81d7de039b8a697723a53c726d1f5cf49f053a39b0e2dd3"; + sha256 = "1lrd1sds6lzh977zbl96qx9klwlplsw3kq3x3pl0z9lix8mzhscy"; libraryHaskellDepends = [ base bytestring containers template-haskell text yaml yesod-core yesod-raml @@ -195367,7 +209451,7 @@ self: { mkDerivation { pname = "yesod-recaptcha"; version = "1.4"; - sha256 = "e1909a88282942014b1d8fbf6d5f5a3c06d900da0f3c14cd405b56eed8bf6bb7"; + sha256 = "1dvbpzcfwmjv836i8g0gv80dj1iwb9gnvgwg3m5h2hi95249m471"; libraryHaskellDepends = [ base bytestring data-default http-conduit http-types lifted-base network network-info resourcet text wai yesod-auth yesod-core @@ -195379,6 +209463,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-recaptcha2" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, http-conduit + , yesod-auth + }: + mkDerivation { + pname = "yesod-recaptcha2"; + version = "0.1.0.0"; + sha256 = "0cmhw0wlbs8r4wpcyywgsizl86l3y0hrngl711sr2yl51vxhgh2f"; + libraryHaskellDepends = [ + base classy-prelude-yesod http-conduit yesod-auth + ]; + homepage = "https://github.com/ncaq/yesod-recaptcha2#readme"; + description = "yesod recaptcha2"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-routes" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, HUnit , path-pieces, template-haskell, text, vector @@ -195386,9 +209486,9 @@ self: { mkDerivation { pname = "yesod-routes"; version = "1.2.0.7"; - sha256 = "d25cd11aef62bb11ea630f758b86f20019dfa1355d36b71bc0b657b8b4b72202"; + sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j"; revision = "1"; - editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e"; + editedCabalFile = "0kiksxf2aqhk2lcj37qg4k3dqfavw5arz6l4ajpa70jw3zcjyqhd"; libraryHaskellDepends = [ base containers path-pieces template-haskell text vector ]; @@ -195409,7 +209509,7 @@ self: { mkDerivation { pname = "yesod-routes-flow"; version = "2.0"; - sha256 = "f855b3b6886660d3a0cd3d65e359f7e1447fa3fede167d3add1449cc26612e2f"; + sha256 = "0brfc4kcqj8lvlx7s5nyzsipyi71yxcy6r9xrnhd6q36i2vb6mgq"; libraryHaskellDepends = [ attoparsec base classy-prelude containers system-fileio system-filepath text yesod-core @@ -195427,7 +209527,7 @@ self: { mkDerivation { pname = "yesod-routes-typescript"; version = "0.3.0.0"; - sha256 = "c9da75e894a57e2e7ee3c2fa99faf5a852d87612402a77cfbb1ff277f576c0be"; + sha256 = "1gn0fvspgwhzpg7pfaj029vdhlm8ypx9kyn2wdz2wzm5jkl7bnn9"; libraryHaskellDepends = [ attoparsec base classy-prelude system-fileio text yesod-core yesod-routes @@ -195445,7 +209545,7 @@ self: { mkDerivation { pname = "yesod-rst"; version = "0.2.3"; - sha256 = "e15c0904792cad06002debf32b86754851b0e99592f766501bf3360b0fee68b7"; + sha256 = "1dv8xq7hndpk3d86dxwjjplv0la8fn32pwzb5l00db9cg420jp71"; libraryHaskellDepends = [ base blaze-html directory hamlet pandoc persistent text xss-sanitize yesod-core yesod-form @@ -195463,7 +209563,7 @@ self: { mkDerivation { pname = "yesod-s3"; version = "0.1.1"; - sha256 = "7b7d386d1e3e3799a24bbdf8e2a4e906a8ad98b6d00b04d4c9b945251426826e"; + sha256 = "0vl24qa2aidrr7a082yhnscava06x6jf5y5x9fi9jdry3rnkhzbv"; libraryHaskellDepends = [ base bytestring conduit conduit-extra gd hS3 mtl network resourcet text yesod-core @@ -195481,7 +209581,7 @@ self: { mkDerivation { pname = "yesod-sass"; version = "0.1.2.0"; - sha256 = "24e9c36e0faf344785eac6cbedb2ecf154bc0f788bca6442cfeb57cd0e00b357"; + sha256 = "0mxk007csmzbrx169jlbg07vqm7ixjrfvjy6xa2lfd5g1xpc7s94"; libraryHaskellDepends = [ base data-default hsass shakespeare template-haskell text yesod-core @@ -195499,7 +209599,7 @@ self: { mkDerivation { pname = "yesod-session-redis"; version = "0.1.0"; - sha256 = "3b2f4106c422b40040fbe9ff7904f310d98399f168456b88ecc6b0287b60341a"; + sha256 = "06ilc1xjic66xj46nib8y6cq7n8hyc27kzz9zd001d12qh342brv"; libraryHaskellDepends = [ base binary bytestring containers cookie hedis mtl network pool-conduit random text time wai yesod-core @@ -195517,7 +209617,7 @@ self: { mkDerivation { pname = "yesod-sitemap"; version = "1.4.0.1"; - sha256 = "008449fd90899f1988f32a1341f5be87a73cb6b0e100494525f659e9473e2666"; + sha256 = "0ri67r3yjngn4m2lj071n2v3r9w7pvsl24rayf41k7w9j3ylk100"; libraryHaskellDepends = [ base conduit containers data-default text time xml-conduit xml-types yesod-core @@ -195539,8 +209639,8 @@ self: { }: mkDerivation { pname = "yesod-static"; - version = "1.5.1.1"; - sha256 = "cdb50763c4cbd2b8fcdb2b9f2f2526648e82454c62d49bfd6d165af80a192a92"; + version = "1.5.3"; + sha256 = "0raxbnr1xpxgirh2fhs3m277yzbklf6k3dijrrx4kh2bnaiax1ml"; libraryHaskellDepends = [ async attoparsec base base64-bytestring blaze-builder byteable bytestring conduit conduit-extra containers cryptohash @@ -195562,42 +209662,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-static_1_5_2" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, exceptions, file-embed, filepath - , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time - , process, resourcet, template-haskell, text, transformers - , unix-compat, unordered-containers, wai, wai-app-static, wai-extra - , yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.5.2"; - sha256 = "b949c5f6087d9e32c7ff2f41ed647b1df605bbe1ce2cbcfe59cc46dc4a72099e"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory exceptions - file-embed filepath hashable hjsmin http-types mime-types old-time - process resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default - directory exceptions file-embed filepath hjsmin hspec http-types - HUnit mime-types old-time process resourcet template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - wai-extra yesod-core yesod-test - ]; - homepage = "http://www.yesodweb.com/"; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-static-angular" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-markup , bytestring, data-default, directory, filepath, hamlet, hspec @@ -195607,7 +209671,7 @@ self: { mkDerivation { pname = "yesod-static-angular"; version = "0.1.8"; - sha256 = "97b3ef260a7e6c70b811cbf3b2b3532a003c5028bd6a0df52fc14bd45ce03beb"; + sha256 = "1srvw1fd8jy15zshssmx5183q01aafrv5wyb26w70v3y18kfzcwp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195631,7 +209695,7 @@ self: { mkDerivation { pname = "yesod-table"; version = "2.0.3"; - sha256 = "363a70fe6def770776e1e0e777651c66e4849e4d95e853956a2f2ae1be80189b"; + sha256 = "16qqh2zf2aigdaam7s4m9ng89r363ijpgrz0w5v0fxzgdpz70fin"; libraryHaskellDepends = [ base bytestring containers contravariant semigroups text yesod-core ]; @@ -195645,7 +209709,7 @@ self: { mkDerivation { pname = "yesod-tableview"; version = "0.2.1"; - sha256 = "de97f138aa341860b791b48819ac20b1d14c5b17d6218d41ec4885c1d220c7e1"; + sha256 = "1qf7439c31a8xi0qs8fn2xdlrldi42n1k25lj6vn061lm8wg35yy"; libraryHaskellDepends = [ base hamlet persistent yesod ]; description = "Table view for Yesod applications"; license = stdenv.lib.licenses.bsd3; @@ -195662,8 +209726,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5.4.1"; - sha256 = "36c08c34d5fef656bb3469194b77b0802c60db4120af0f6dfd2b08f4a9d9659d"; + version = "1.5.7"; + sha256 = "04q1hp09wbr4y77v0296c9z9hp5rgaz5pvahw6p1hk3vfypjlss2"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -195679,34 +209743,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-test_1_5_5" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, containers, cookie - , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base - , monad-control, network, persistent, pretty-show, text, time - , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.5"; - sha256 = "44425bf59542649ff0b1ba4c976d8c35060c17c082e8b9f75a81ff89e16f0a39"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive containers cookie hspec-core html-conduit - http-types HUnit monad-control network persistent pretty-show text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -195715,7 +209751,7 @@ self: { mkDerivation { pname = "yesod-test-json"; version = "0.2.0.0"; - sha256 = "708131165b3bcecdeccc9c389868ea22b3f2833be6035c5df5ef7a5790beccfc"; + sha256 = "1z6cps85fypgymfmq0z67f1z5cr2x9l9hf4wrkncvkivbcb330bh"; libraryHaskellDepends = [ aeson base bytestring conduit hspec http-types HUnit text transformers wai wai-test yesod-default @@ -195733,7 +209769,7 @@ self: { mkDerivation { pname = "yesod-text-markdown"; version = "0.1.8"; - sha256 = "0169dbd252696f30bb4d7f49f2f116e7e42aadf2e322b85982746f62ade488cc"; + sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81"; libraryHaskellDepends = [ aeson base markdown persistent shakespeare text yesod-core yesod-form yesod-persistent @@ -195750,7 +209786,7 @@ self: { mkDerivation { pname = "yesod-tls"; version = "1.4.1"; - sha256 = "c8c8b4da7d8d4b312dec12a1601077dca2a474378811c916e437143f2364707f"; + sha256 = "0zvhchiky51pwhbcj4c86xsa98nwfw86188jxhnk2jwdgpdb9j68"; libraryHaskellDepends = [ base fast-logger monad-logger template-haskell unix wai wai-extra warp warp-tls yesod @@ -195770,7 +209806,7 @@ self: { mkDerivation { pname = "yesod-transloadit"; version = "0.7.1.0"; - sha256 = "f04e7b1e46c2a62685d48fad9d7616e6774daa0df07d7d54a1d7cfb5d428ade2"; + sha256 = "1qmd53abbkypl5a7szgh1nm4sxz62rv9vbcgsj2jd9n28qg7nkph"; libraryHaskellDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson mime network-uri old-locale shakespeare text time transformers @@ -195791,7 +209827,7 @@ self: { mkDerivation { pname = "yesod-vend"; version = "0.3.0.0"; - sha256 = "49065a74380fca7d0c790e47a3f5b3a14bf72d8f2ac829eaf55098691e816a98"; + sha256 = "163ah4g6k62hypm2kj1aiwnzfjx1ngss6iqfg467vjhg71s5l1j9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195808,24 +209844,6 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, async, base, conduit, enclosed-exceptions - , monad-control, transformers, wai, wai-websockets, websockets - , yesod-core - }: - mkDerivation { - pname = "yesod-websockets"; - version = "0.2.5"; - sha256 = "c5f609aea82035a8bd43998f29bb2fc8547f72260dafdc9fdc44a7706975c944"; - libraryHaskellDepends = [ - async base conduit enclosed-exceptions monad-control transformers - wai wai-websockets websockets yesod-core - ]; - homepage = "https://github.com/yesodweb/yesod"; - description = "WebSockets support for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-websockets_0_2_6" = callPackage ({ mkDerivation, async, base, conduit, enclosed-exceptions , monad-control, transformers, wai, wai-websockets, websockets , yesod-core @@ -195833,7 +209851,7 @@ self: { mkDerivation { pname = "yesod-websockets"; version = "0.2.6"; - sha256 = "98111901a0f33f4c43459a20310dbf20a3fda142c5d42c30cfe9c53eeabeee29"; + sha256 = "0agfpvm3xig9rwq2rm658ahzv8r0pw6k284s8m1lqgzkl00ij4cq"; libraryHaskellDepends = [ async base conduit enclosed-exceptions monad-control transformers wai wai-websockets websockets yesod-core @@ -195841,7 +209859,6 @@ self: { homepage = "https://github.com/yesodweb/yesod"; description = "WebSockets support for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-websockets-extra" = callPackage @@ -195851,7 +209868,7 @@ self: { mkDerivation { pname = "yesod-websockets-extra"; version = "0.1.0.0"; - sha256 = "afccdbe17eb2924f7d0e37a48d4a2d2dc971c11a23c1421d86f24686f8a14f10"; + sha256 = "042gl7w8cipjhqfl5h933b0p3j9d5m58v91p1rylz4mjgvhxpk5g"; libraryHaskellDepends = [ base enclosed-exceptions transformers websockets yesod-websockets ]; @@ -195866,7 +209883,7 @@ self: { mkDerivation { pname = "yesod-worker"; version = "0.1.0.0"; - sha256 = "f8076954537f74a098644422a3193d184308559cd35bc980f2ab7663b5f8cada"; + sha256 = "1nnaz2sn6xmbya0cjnykkiahhhqq7lcs68j4cjca0x3zada6j1zq"; libraryHaskellDepends = [ base blaze-markup bytestring containers hedis keenser thyme yesod ]; @@ -195888,7 +209905,7 @@ self: { mkDerivation { pname = "yet-another-logger"; version = "0.3.0"; - sha256 = "3183c7c38fac53e93a0b352709c57374463efdc5352968019dbbe763aba2a848"; + sha256 = "0j58lamn7rxvkl0nha9mqpykwiklfg2hj9rm1cxfjlxciz1wg0ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195915,7 +209932,7 @@ self: { mkDerivation { pname = "yhccore"; version = "0.9.1"; - sha256 = "23715d06a973b5967ac9681d0d2f8e65d0bbda0ff8c9e587381702db2ffdf2a1"; + sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93"; libraryHaskellDepends = [ base containers mtl pretty uniplate ]; homepage = "http://www.haskell.org/haskellwiki/Yhc"; description = "Yhc's Internal Core language"; @@ -195931,8 +209948,8 @@ self: { }: mkDerivation { pname = "yi"; - version = "0.13.5"; - sha256 = "902341a7927ee1d255d44286e46dc46b6c4282026c52c1c571d3999cf3a7259f"; + version = "0.14.0"; + sha256 = "0hdwcsv8yy1dfb2grj1haix1by8lp63mvi4vws733q2q9p9yrali"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; @@ -195955,7 +209972,7 @@ self: { mkDerivation { pname = "yi-contrib"; version = "0.10.1"; - sha256 = "33241e693d944410061d244a8c5b48a77414e42b4912389cade2f13ea1d27014"; + sha256 = "053hsahkxwg2mnf3h4j95gj18x5791dqqji43l310i4l7mliw91k"; libraryHaskellDepends = [ base containers directory filepath lens mtl old-locale oo-prototypes split text time transformers-base yi yi-language @@ -195969,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 = "b84b49f40b7cf9801a3d7fcf0bf11f4e828ecfc7cd20800d8b2f46fd596e8829"; + version = "0.13.7"; + sha256 = "0i2n8jx15fic32kakppj9lz935dcm0090b736f8w711x6aib6nmg"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state dyre exceptions filepath hashable @@ -195993,22 +210011,93 @@ 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"; license = stdenv.lib.licenses.gpl2; }) {}; + "yi-core_0_14_0" = callPackage + ({ mkDerivation, array, attoparsec, base, binary, bytestring + , containers, criterion, data-default, deepseq, directory, dlist + , dynamic-state, dyre, filepath, hashable, ListLike + , microlens-platform, mtl, old-locale, oo-prototypes, parsec + , pointedlist, process, process-extras, quickcheck-text, semigroups + , split, tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time + , transformers-base, unix, unix-compat, unordered-containers + , xdg-basedir, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-core"; + version = "0.14.0"; + sha256 = "176frh7q1bd4sa1fx2dgip70a4vyla09qw5n2v58qwhpfq14zwi0"; + libraryHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state dyre filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras semigroups split text text-icu time + transformers-base unix unix-compat unordered-containers xdg-basedir + yi-language yi-rope + ]; + testHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state filepath hashable ListLike + microlens-platform mtl old-locale oo-prototypes parsec pointedlist + process process-extras quickcheck-text split tasty tasty-hunit + tasty-quickcheck text text-icu time transformers-base unix + unix-compat unordered-containers xdg-basedir yi-language yi-rope + ]; + benchmarkHaskellDepends = [ + array attoparsec base binary bytestring containers criterion + data-default deepseq directory dlist dynamic-state filepath + hashable ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras split text text-icu time + transformers-base unix unix-compat unordered-containers xdg-basedir + yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor core library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-dynamic-configuration" = callPackage + ({ mkDerivation, base, dyre, microlens-platform, mtl, text + , transformers-base, yi-core, yi-rope + }: + mkDerivation { + pname = "yi-dynamic-configuration"; + version = "0.14.0"; + sha256 = "06gad5vi55hjbb5ifvkprnbbpd68n2y0sbjm0z0x0zaqg2srjmls"; + libraryHaskellDepends = [ + base dyre microlens-platform mtl text transformers-base yi-core + yi-rope + ]; + 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 ({ mkDerivation, base, containers, split, yi-language }: mkDerivation { pname = "yi-emacs-colours"; version = "0.1.0.1"; - sha256 = "1ba373a9bf2311b35f9664df6b6e6bd6c545352a0c4cf9e26eeb980c74d26dcd"; + sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv"; libraryHaskellDepends = [ base containers split yi-language ]; homepage = "https://github.com/Fuuzetsu/yi-emacs-colours"; description = "Simple mapping from colour names used in emacs to Color"; @@ -196022,8 +210111,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.13.5"; - sha256 = "f2cf5d62e161d7edd1c664874daa5acdc2ec70d7e9b6cc7f688d2d02963272b0"; + version = "0.14.0"; + sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5"; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl oo-prototypes pango pointedlist text transformers-base yi-core @@ -196037,21 +210126,40 @@ 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 = "5be74cdfd2e0ca9d0a8af5895013f8fee86e55e2a6484f66253f761090a137b3"; + 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"; license = stdenv.lib.licenses.gpl2; }) {}; + "yi-frontend-vty_0_14_0" = callPackage + ({ mkDerivation, base, containers, data-default, dlist + , microlens-platform, pointedlist, stm, text, vty, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-frontend-vty"; + version = "0.14.0"; + sha256 = "0055npls7dhlx68fwnhfb7kk4nzpy8vvmlpplm3m36rlvk85gyma"; + libraryHaskellDepends = [ + base containers data-default dlist microlens-platform pointedlist + stm text vty yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vty frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-fuzzy-open" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core @@ -196059,8 +210167,8 @@ self: { }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.13.5"; - sha256 = "a71c3fd14598bb153cb64d45cfa60c40c4e97e9ed74e422c6fac566330ed9e2d"; + 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 @@ -196070,12 +210178,31 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-fuzzy-open_0_14_0" = callPackage + ({ mkDerivation, base, binary, containers, data-default, directory + , filepath, mtl, text, transformers-base, vector, yi-core + , yi-language, yi-rope + }: + mkDerivation { + pname = "yi-fuzzy-open"; + version = "0.14.0"; + sha256 = "0plpxc4p3wa2ak32j0s8y0z6ha5x8wgnzpgzj71bs7rkaf5bf8dd"; + libraryHaskellDepends = [ + base binary containers data-default directory filepath mtl text + transformers-base vector yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Fuzzy open plugin for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-gtk" = callPackage ({ mkDerivation }: mkDerivation { pname = "yi-gtk"; version = "0.3"; - sha256 = "df9a6f64b41999e8f46f6e096b67d3d3eb88d2b2b379548ce744bc817bfeedd1"; + sha256 = "1lgdzrxq3g24wy658ydknb98isyksdknn2bfdzsfi68rnij6z6nz"; doHaddock = false; homepage = "http://haskell.org/haskellwiki/Yi"; description = "The Haskell-Scriptable Editor, helper package"; @@ -196088,8 +210215,8 @@ self: { }: mkDerivation { pname = "yi-ireader"; - version = "0.13.5"; - sha256 = "0ffe75cb958387aa4512cd07a40a25df4a68d2109b2d5530208ee291e03d7b48"; + version = "0.13.7"; + sha256 = "1f4nj22nkk33s3w8gwa38cab50232laifkc4kd89ybaj4w9yawfj"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -196099,14 +210226,49 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-ireader_0_14_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-ireader"; + version = "0.14.0"; + sha256 = "0lqxa4m4agha9fd9lwf8xf2cxpj8mh2q93rkjchlksrjav3khz6q"; + libraryHaskellDepends = [ + base binary bytestring containers data-default microlens-platform + text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor incremental reader"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-keymap-cua" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.13.5"; - sha256 = "d49e00c8097e23d6626b58e6cfa875f76a3a215524d29bb11fef09f91f4d57c5"; + version = "0.13.7"; + sha256 = "0fm2kgafmzbn8fvksl0mx0c5r0aqvdmnh6pnp5ql5xr73k4n4pmf"; + libraryHaskellDepends = [ + base microlens-platform text yi-core yi-keymap-emacs yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Cua keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-keymap-cua_0_14_0" = callPackage + ({ mkDerivation, base, microlens-platform, text, yi-core + , yi-keymap-emacs, yi-rope + }: + mkDerivation { + pname = "yi-keymap-cua"; + version = "0.14.0"; + sha256 = "0l7r8vyigmcmp9biskf13qnn8in16s6pliwrc12lxa5ikym7r59r"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -196123,8 +210285,28 @@ self: { }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.13.5"; - sha256 = "8019d069cc6f81a5c13b5429fd60db008ec224cc3df55c6384a0067edeeb0416"; + 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 + yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Emacs keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-keymap-emacs_0_14_0" = callPackage + ({ mkDerivation, base, containers, filepath, Hclip + , microlens-platform, mtl, oo-prototypes, semigroups, text + , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope + }: + mkDerivation { + pname = "yi-keymap-emacs"; + version = "0.14.0"; + sha256 = "0mlizcb2aj10kfmcavdzbdli0sxq0id02ihnpr23ix4dk3wgznqn"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes semigroups text transformers-base yi-core yi-language yi-misc-modes @@ -196145,8 +210327,37 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.13.5"; - sha256 = "c37a48f0915f4a1584ae684e227102bed334f64ceec851547b2789e645c74907"; + version = "0.13.7"; + sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j"; + libraryHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist safe + semigroups text transformers-base unordered-containers yi-core + yi-language yi-rope + ]; + testHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck + safe semigroups tasty tasty-hunit tasty-quickcheck text + transformers-base unordered-containers yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vim keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-keymap-vim_0_14_0" = callPackage + ({ mkDerivation, attoparsec, base, binary, containers, data-default + , directory, filepath, Hclip, microlens-platform, mtl + , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers-base + , unordered-containers, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-keymap-vim"; + version = "0.14.0"; + sha256 = "1hy36q69a0yhkg5v0n2f2gkmbf85a9y6k5b38gdg18kdnil974q4"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe @@ -196174,8 +210385,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.13.5"; - sha256 = "d599c10c37cc829dba86c9e35da6d58a6e84c99aaab18a5a8418d4baab22fcfd"; + version = "0.13.7"; + sha256 = "1cfa44fv2kvsk695ny9rvi3ih55d3gzak5873zmb35bdc64v2k66"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -196193,6 +210404,35 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-language_0_14_0" = callPackage + ({ mkDerivation, alex, array, base, binary, containers + , data-default, hashable, microlens-platform, oo-prototypes + , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "yi-language"; + version = "0.14.0"; + sha256 = "1dpiqh46b2z627ry0smq4a0ynna1m166qf0yqhlh80v67myyg9jr"; + libraryHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + template-haskell transformers-base unordered-containers + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform pointedlist regex-base regex-tdfa tasty + tasty-hspec tasty-quickcheck template-haskell transformers-base + unordered-containers + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Collection of language-related Yi libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-misc-modes" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, semigroups, text, yi-core, yi-language @@ -196200,8 +210440,28 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.13.5"; - sha256 = "5889c2011813f37d58311a52714c5d8f165e6a0640b7af4752190d9d3db921a9"; + version = "0.13.7"; + sha256 = "0gyy7rg0wgblsilx83hrdb0fgc54skhljxw2csq41qdb5z756nqg"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform + semigroups text yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor miscellaneous modes"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-misc-modes_0_14_0" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, semigroups, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-misc-modes"; + version = "0.14.0"; + sha256 = "0khyy4iacp8fah1lrp6ffvn2vy5xxrgizd4mzdlb6shc7sliaifz"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform semigroups text yi-core yi-language yi-rope @@ -196222,8 +210482,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.13.5"; - sha256 = "4323b34b6ae45391072300d9ba8350df8237fc5984fa4ad962bcfd20f2046f99"; + version = "0.13.7"; + sha256 = "00p9hmvdd3llm0xnm0xrz8n9a74jh8lmazsm9ng4c3l0a5f3kxqq"; libraryHaskellDepends = [ array base binary data-default microlens-platform text yi-core yi-language yi-rope @@ -196241,6 +210501,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-mode-haskell_0_14_0" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, filepath + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-mode-haskell"; + version = "0.14.0"; + sha256 = "0yqwshj1hms1q2r78fi0hsqyrazy5cyv0znxcjpmx2f6mnifjxd9"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform text + yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor haskell mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-mode-javascript" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language @@ -196248,8 +210527,28 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.13.5"; - sha256 = "156db2b03fb06ce12bb6e17a0b07c7acdac42a29734b714860777e234c86381c"; + version = "0.13.7"; + sha256 = "0fifk329g66r2k5a0j4jw8lcwlxc9v4r66sggrizgcqmcfxj895a"; + libraryHaskellDepends = [ + array base binary data-default dlist filepath microlens-platform + mtl text yi-core yi-language yi-rope + ]; + libraryToolDepends = [ alex ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor javascript mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-mode-javascript_0_14_0" = callPackage + ({ mkDerivation, alex, array, base, binary, data-default, dlist + , filepath, microlens-platform, mtl, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-mode-javascript"; + version = "0.14.0"; + sha256 = "00ap00h9lz0b2r75m0dn741aasi18455srwq6mcpbbq6j4v3jzfz"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -196266,7 +210565,7 @@ self: { mkDerivation { pname = "yi-monokai"; version = "0.1.1.2"; - sha256 = "1498c5e391b1a12989f8e68531abf4dd58e41b130cf0650909bf49e4a377f0d9"; + sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l"; libraryHaskellDepends = [ base yi ]; homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; @@ -196282,7 +210581,7 @@ self: { mkDerivation { pname = "yi-rope"; version = "0.8"; - sha256 = "eacf45e10fe3ee541db2d44e2c5092a530087a84a608eff0f0348bf60f32144e"; + sha256 = "0khl687zd2rly3qfy256hix0hc55j982qknln8fm9vp31zhlbkza"; libraryHaskellDepends = [ base binary bytestring charsetdetect-ae data-default deepseq fingertree text text-icu @@ -196295,33 +210594,78 @@ 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 = "f3b67c88c01a6c190013870ae7dd371ccc77f619c73247effb9c3e2d36a6ab13"; + 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"; license = stdenv.lib.licenses.gpl2; }) {}; + "yi-snippet_0_14_0" = callPackage + ({ 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.14.0"; + sha256 = "152g3bsy50viydnhhx4b7vyyaq4frw43cbb9r3pm56wmnk4ixn7k"; + libraryHaskellDepends = [ + base binary containers data-default free microlens-platform mtl + text vector yi-core yi-rope + ]; + testHaskellDepends = [ + base containers tasty-hunit tasty-th yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Snippet support for yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-solarized" = callPackage ({ mkDerivation, base, yi }: mkDerivation { pname = "yi-solarized"; version = "0.1.1"; - sha256 = "cca668fc697f2fa70b4ece2d234c78d621f0a34ef2174a17001be6b753952e9e"; + sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc"; libraryHaskellDepends = [ base yi ]; homepage = "https://github.com/NorfairKing/yi-solarized"; description = "Solarized colour theme for the Yi text editor"; @@ -196334,7 +210678,7 @@ self: { mkDerivation { pname = "yi-spolsky"; version = "0.1"; - sha256 = "d8ecaf71704c295944ae6648685a6b00d3787911b1763b0213629840bad05e94"; + sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q"; libraryHaskellDepends = [ base yi ]; homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; @@ -196347,7 +210691,7 @@ self: { mkDerivation { pname = "yi-vty"; version = "0.3"; - sha256 = "89a59deaa080460e6103d48393a3dc1a1155f2b63b7a729dd14125dc59475706"; + sha256 = "01jp8xcxq9a1s6fp4yivnvr5a48svjir70yl0dhhwil0l3m9v9c9"; doHaddock = false; homepage = "http://haskell.org/haskellwiki/Yi"; description = "The Haskell-Scriptable Editor, helper package"; @@ -196359,7 +210703,7 @@ self: { mkDerivation { pname = "yices"; version = "0.0.0.12"; - sha256 = "3fa62e7d44fe212070874aaacdc677cb660440265c9c1ec260605ed5123a78cc"; + sha256 = "1k3q789dapk0c311x72w4r008rnbfz3cvajahxq208gy8iyjx9iz"; libraryHaskellDepends = [ base parsec process ]; description = "Haskell programming interface to Yices SMT solver"; license = stdenv.lib.licenses.bsd3; @@ -196371,7 +210715,7 @@ self: { mkDerivation { pname = "yices-easy"; version = "0.1"; - sha256 = "e0ec40beff46076b71a89914a3c69816f8f3463887d5a3f4abf85ae4741cd48e"; + sha256 = "13nl3isf8npqmgsa7mc7713g7y0nk33a654rm1qnn1s6zyz41v70"; libraryHaskellDepends = [ base bindings-yices containers transformers ]; @@ -196388,7 +210732,7 @@ self: { mkDerivation { pname = "yices-painless"; version = "0.1.2"; - sha256 = "705c91fc3c814680109a923adf1be50c436b8085465fefc0c2e0a606f7ef10e0"; + sha256 = "1q0hxzvhd9p0qb0fyps6hn06nhqcwldxyfljk8880il17ky92p3h"; libraryHaskellDepends = [ base containers pretty strict-concurrency vector ]; @@ -196406,7 +210750,7 @@ self: { mkDerivation { pname = "yjftp"; version = "0.3.6.5"; - sha256 = "d548eb7232947803143ff06800a412e2808716de3f51d24614c78d9eebf93c86"; + sha256 = "11iwz7mrx3f72i3d4l9zvqb8g0722aj00s7h7wa06y4l69rfnj6m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196424,7 +210768,7 @@ self: { mkDerivation { pname = "yjftp-libs"; version = "0.0.2"; - sha256 = "44c0e175e422b616287f851c76d5cabeb069a0ecd301c3de79940ca0424c9ce6"; + sha256 = "1rlw9i1a034lg7gc60fkxjh6kc5yrbapc745gwl1ddi2wisy3h24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory ftphs mtl process unix ]; @@ -196438,8 +210782,8 @@ self: { ({ mkDerivation, base, HaXml }: mkDerivation { pname = "yjsvg"; - version = "0.2.0.0"; - sha256 = "4841c8f1120ba253c616ff48cffd63d2ca7ba87127bc428b5fa5fc7d6dbe6f17"; + version = "0.2.0.1"; + sha256 = "0zif4sqrd7kv1546vcp1q78bb8k94mkiqxh7glix6gvv7gabfdzp"; libraryHaskellDepends = [ base HaXml ]; description = "make SVG string from Haskell data"; license = stdenv.lib.licenses.bsd3; @@ -196451,7 +210795,7 @@ self: { mkDerivation { pname = "yjtools"; version = "0.9.18"; - sha256 = "9b121c6fcece8241d87aec737458d49c0b76313e9e5e1e70f72b5f71cfc0eb8f"; + sha256 = "13zbq37p2prbyxq1wply7qqpc2wwsic78wzcgbc430nfrrpiq4lv"; libraryHaskellDepends = [ base ]; homepage = "http://homepage3.nifty.com/salamander/second/projects/yjtools/index.xhtml"; description = "some tools for Monad, List, Tuple and so on"; @@ -196465,7 +210809,7 @@ self: { mkDerivation { pname = "yocto"; version = "1.0.1"; - sha256 = "2ae1b12de08bab5911f69220a3e34dfe49c65fdda5f221f8c4c642ae54f62245"; + sha256 = "0i92yraawhn6qkw23wm5vmgwcjgy9pis684jyq8mkawbw0nv3q9a"; libraryHaskellDepends = [ base containers parsec ]; testHaskellDepends = [ base containers parsec QuickCheck quickcheck-instances @@ -196480,7 +210824,7 @@ self: { mkDerivation { pname = "yoctoparsec"; version = "0.1.0.0"; - sha256 = "d70739d3429dede8800290939dbd08d0e23cacb5717402ba93f931fa80e1335d"; + sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp"; libraryHaskellDepends = [ base free mtl ]; homepage = "https://github.com/mniip/yoctoparsec"; description = "A truly tiny monadic parsing library"; @@ -196488,6 +210832,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yoga" = callPackage + ({ mkDerivation, base, bindings-DSL, ieee754 }: + mkDerivation { + pname = "yoga"; + version = "0.0.0.1"; + sha256 = "0allfj4ld6h77m5l9m1f9whrlhs18fvmcwa5jq25bv5prk9928bv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bindings-DSL ieee754 ]; + description = "Bindings to Facebook's Yoga layout library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yoko" = callPackage ({ mkDerivation, base, bifunctors, containers, invariant, kinds , mtl, records, semigroups, template-haskell, th-sccs, type-cereal @@ -196497,7 +210854,7 @@ self: { mkDerivation { pname = "yoko"; version = "2.0"; - sha256 = "e69b423a169d66af78eebd35c929bdc71f324309d78d028ef457d6d54d673b1e"; + sha256 = "07ivcx6xbmjpyj7053fp151k47y7pllwjddxxrwayrlx2qx456z6"; libraryHaskellDepends = [ base bifunctors containers invariant kinds mtl records semigroups template-haskell th-sccs type-cereal type-digits type-equality @@ -196513,7 +210870,7 @@ self: { mkDerivation { pname = "york-lava"; version = "0.2"; - sha256 = "0b1fe9f05c493bdba3319745abb9496d6af6e9bdabcc584ca29fa0b91dedf3e6"; + sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb"; libraryHaskellDepends = [ base containers haskell98 ]; homepage = "http://www.cs.york.ac.uk/fp/reduceron/"; description = "A library for digital circuit description"; @@ -196526,7 +210883,7 @@ self: { mkDerivation { pname = "youtube"; version = "0.2.1"; - sha256 = "7de760b734e35aec2eedc421a785b04cf0c519021246c756cf560cf06f0765d1"; + sha256 = "1lb50xpz032nrxbcfihj08cwbw2cn22sf8f4xlpfqnp36jvn1rvx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring process utility-ht ]; @@ -196544,7 +210901,7 @@ self: { mkDerivation { pname = "yql"; version = "0.0.0"; - sha256 = "e65d91f868a2abe3f903a6c69625e91c159683c474761b11a96236db143a93e3"; + sha256 = "1qwk78adndk2m48inxklqj1rc58wx4jrdim60gwy7ax2d3w92pg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196571,7 +210928,7 @@ self: { mkDerivation { pname = "yst"; version = "0.5.1.1"; - sha256 = "08e775b23abda46a504e0c3787bdb89e47a0e9aee0984582298f2f73a6c163ac"; + sha256 = "1b33q6k76bwg5614b670mvls0iwyp2yqfdqc9r86m95x7ar7brq8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -196590,7 +210947,7 @@ self: { mkDerivation { pname = "yuiGrid"; version = "0.1"; - sha256 = "f873ff02496984d5a6bdcc028b78261240c2b93d05e766c00988029a7206b400"; + sha256 = "005l0rr9l0l81706drq57nww4h0j4rw8n0ncpnkdb139941gywzq"; libraryHaskellDepends = [ base ]; description = "Grids defined by layout hints and implemented on top of Yahoo grids"; license = "unknown"; @@ -196604,7 +210961,7 @@ self: { mkDerivation { pname = "yuuko"; version = "2010.11.28"; - sha256 = "e48caecf03ad2afec5d95e7a50e2aed0ef40241edfd5c0b226a33e6a5e05ee06"; + sha256 = "01pf0mg6lgm34src1mfz3qj41vyhmvi50yjyv72zwamd0g7sx374"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196634,7 +210991,7 @@ self: { mkDerivation { pname = "yxdb-utils"; version = "0.1.0.1"; - sha256 = "e8a9963ac48c55a4ed28e4f4bd2884eef340c67b84677fb2d2a7e3db1c514b15"; + sha256 = "05aba4fdpqx7sar7yrw4gg341wzfhhlbvx7453ns8mccqhx9dag8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196666,7 +211023,7 @@ self: { mkDerivation { pname = "z3"; version = "4.1.0"; - sha256 = "096f9f4b92f5c9591d3098022b0b4047d1d6c4b970dc7d3ead6129d67fe4f5ee"; + sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl ]; @@ -196682,7 +211039,7 @@ self: { mkDerivation { pname = "z3-encoding"; version = "0.3.0.0"; - sha256 = "b7e791c8e8f154a1e3f181391bed17114f8c8edceb3ae646ff419b6f65805d7b"; + sha256 = "0ysxh1jnz6s1zx3fcfpbvj78qkqi2zninfc1y7is2m7ix3493rxp"; libraryHaskellDepends = [ base containers mtl z3 ]; testHaskellDepends = [ base containers hspec z3 ]; description = "High-level assertion encoding to Z3 solver"; @@ -196694,7 +211051,7 @@ self: { mkDerivation { pname = "zabt"; version = "0.4.0.0"; - sha256 = "397da26f87e37d53729a1dc8dfeacbfc146b097a8a50238369c09a13109ffa2b"; + sha256 = "0azskw8176n0d61j6l4ag84nn57wrgmdzj0xk9r56zg3hxps4z9r"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hspec ]; homepage = "https://github.com/tel/hs-zabt#readme"; @@ -196708,7 +211065,7 @@ self: { mkDerivation { pname = "zalgo"; version = "0.2.0.0"; - sha256 = "5f63a88038ee13dd594907b3591ea2747a563f2a591294b7285a9db83539bf5b"; + sha256 = "0nxz74svi7as52vr84jr58zmcykll8g5kcq795cxs4zf720ahqsz"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/mniip/zalgo"; description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists"; @@ -196722,7 +211079,7 @@ self: { mkDerivation { pname = "zampolit"; version = "0.3"; - sha256 = "c3b7da5e2ca328c89cebafe0179550db4e471659ac774468eb980662174a17ae"; + sha256 = "1bhp98bn41lqxdl48xxcb4b4fknva2aigq5gxffcha535igdmdy3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -196740,7 +211097,7 @@ self: { mkDerivation { pname = "zasni-gerna"; version = "0.0.7"; - sha256 = "5c4f6baddaa6d0c8274e633202301360ddba3bef7bcb6b680f0264081a9b82fe"; + sha256 = "1zl2kcd0hr021xl6pjvvxwxvmpb02cq04ck39qkwil56vannnksw"; libraryHaskellDepends = [ base papillon ]; homepage = "https://skami.iocikun.jp/haskell/packages/zasni-gerna"; description = "lojban parser (zasni gerna)"; @@ -196753,7 +211110,7 @@ self: { mkDerivation { pname = "zcache"; version = "0.0.0"; - sha256 = "6bab54d3a935c6623433f34bfb5490291abf50fea7dce30891e045541c774082"; + sha256 = "10j0fwf58ig0j44f7p57zr8by6i9j1agnjzk6cs65iimm79m9avb"; libraryHaskellDepends = [ array base containers mersenne-random-pure64 ]; @@ -196767,7 +211124,7 @@ self: { mkDerivation { pname = "zenc"; version = "0.1.1"; - sha256 = "62d14fd204a292a780ff0b3ca9f73e6686188c6269cd6bf5433b4d12fe3e105c"; + sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2"; libraryHaskellDepends = [ base ]; description = "GHC style name Z-encoding and Z-decoding"; license = stdenv.lib.licenses.bsd3; @@ -196783,7 +211140,7 @@ self: { mkDerivation { pname = "zendesk-api"; version = "0.1.0.0"; - sha256 = "acd6761b86a1ff71e17afee47358e21c2335eb2220c2d89c05caf05c6200c8f4"; + sha256 = "1x6801i5rw6a0nfdihi04bmka8qww9c77r7ygbhp3zx1hqdpdmmc"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit connection data-default failure http-client http-client-tls http-conduit @@ -196803,7 +211160,7 @@ self: { mkDerivation { pname = "zeno"; version = "0.2.0.1"; - sha256 = "dba8a5cc985efd9c54151345a9a1d5532fafb76f935b64ef3f3b269be2835c0e"; + sha256 = "03jwhgi9n9iv7zpn8nwkdyvsybsksnhsji8k2ma9rzayk36aba6v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -196820,7 +211177,7 @@ self: { mkDerivation { pname = "zero"; version = "0.1.4"; - sha256 = "38cdc62d9673b8b40999de69da2ec60dab7a65fb1c22133ecd54e0a2ec61d5d5"; + sha256 = "1mfmc7na5q2lrlz168hwzdjpmaqdqqpdlsfyk44v9f3kjqnwdk9q"; libraryHaskellDepends = [ base semigroups ]; homepage = "https://github.com/phaazon/zero"; description = "Semigroups with absorption"; @@ -196833,8 +211190,8 @@ self: { }: mkDerivation { pname = "zerobin"; - version = "1.5.1"; - sha256 = "e0f3487d1c51344c76d4d24420c1ff74512a1e3add7425acca185657bf9c8e9a"; + version = "1.5.2"; + sha256 = "0lwrwaydayklbcs6msdzfc187fr1mqbf64yq0lcw5v04a3papyw0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196855,7 +211212,7 @@ self: { mkDerivation { pname = "zeromq-haskell"; version = "0.8.4"; - sha256 = "63dff94c8b132c220bc1d03e91f16bcce4488f1f250c0059a9bc6404e2d77253"; + sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3"; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ zeromq ]; testHaskellDepends = [ @@ -196875,7 +211232,7 @@ self: { mkDerivation { pname = "zeromq3-conduit"; version = "0.1.0.0"; - sha256 = "e7381f7c3a2f447f16f934f2ff96cc1781a715cb3eeb4a561574cdf663a1ddd8"; + sha256 = "1n6xl5izdkbl2mb4msryrcasg08prjbgzwilz4b7yi1g79y1yf77"; libraryHaskellDepends = [ base bytestring conduit lifted-base monad-control mtl resourcet transformers zeromq3-haskell @@ -196894,7 +211251,7 @@ self: { mkDerivation { pname = "zeromq3-haskell"; version = "0.5.2"; - sha256 = "23889f12625079658c29055be1730aef4ce87d621548b56dd7f888e93916c9cf"; + sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213"; libraryHaskellDepends = [ async base bytestring containers MonadCatchIO-transformers semigroups transformers @@ -196910,6 +211267,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zeromq;}; + "zeromq4-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, lifted-base + , monad-control, mtl, resourcet, semigroups, transformers + , transformers-base, zeromq4-haskell + }: + mkDerivation { + pname = "zeromq4-conduit"; + version = "0.1.0.0"; + sha256 = "1qyk0ha21afa7hi1hpl6qk3bhcrs0a0kg0160hfrf6aw7l24dgi2"; + libraryHaskellDepends = [ + base bytestring conduit lifted-base monad-control mtl resourcet + semigroups transformers transformers-base zeromq4-haskell + ]; + testHaskellDepends = [ base ]; + 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 ({ mkDerivation, async, base, bytestring, containers, exceptions , monad-control, QuickCheck, semigroups, tasty, tasty-hunit @@ -196917,8 +211294,8 @@ self: { }: mkDerivation { pname = "zeromq4-haskell"; - version = "0.6.5"; - sha256 = "6e99b6cf882269544ce3d613a51b00a259f0aee9fdb13d25d8cb19f96799e7c2"; + version = "0.6.7"; + sha256 = "1kjgmy8pbq9b00s8ak469afwgvhvnyyk7430x20amw01jcjbicll"; libraryHaskellDepends = [ async base bytestring containers exceptions monad-control semigroups transformers transformers-base @@ -196940,7 +211317,7 @@ self: { mkDerivation { pname = "zeroth"; version = "2009.6.23.3"; - sha256 = "80112fe3f96fdfef075042552ca67fd1682bd9f4d450393e6187120569d73482"; + sha256 = "10ilsxlha4l7c4z3jl6lykcjns6igyk2qma2a03yzpvgz7ijy4c0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196956,6 +211333,130 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zifter" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , filepath, genvalidity, genvalidity-hspec, genvalidity-path, hspec + , optparse-applicative, path, path-io, process, QuickCheck, safe + , stm, validity, validity-path + }: + mkDerivation { + pname = "zifter"; + version = "0.0.1.2"; + sha256 = "0yrcyzcjszcqj54n8k3jp6glz4nsn5vr61a0wmdaz5sxdjsrsnqy"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions filepath + optparse-applicative path path-io process safe stm validity + validity-path + ]; + testHaskellDepends = [ + ansi-terminal base directory genvalidity genvalidity-hspec + genvalidity-path hspec path path-io QuickCheck stm + ]; + homepage = "http://cs-syd.eu"; + description = "zifter"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-cabal" = callPackage + ({ mkDerivation, base, directory, filepath, path, path-io, process + , safe, zifter + }: + mkDerivation { + pname = "zifter-cabal"; + version = "0.0.0.2"; + sha256 = "009vhy3x5hb24n1ylr31hvgfk2bic1r9yy8nk78ym1yhjb4vrrj5"; + libraryHaskellDepends = [ + base directory filepath path path-io process safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-cabal"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-git" = callPackage + ({ mkDerivation, base, path, process, zifter }: + mkDerivation { + pname = "zifter-git"; + version = "0.0.0.0"; + sha256 = "0mq5aa7nljbdgimvs948kzn16m74771jyswbk0fq6jqyrb80li4j"; + libraryHaskellDepends = [ base path process zifter ]; + homepage = "http://cs-syd.eu"; + description = "zifter-git"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-google-java-format" = callPackage + ({ mkDerivation, base, filepath, path, path-io, process, safe + , zifter + }: + mkDerivation { + pname = "zifter-google-java-format"; + version = "0.0.0.0"; + sha256 = "0kl3mgg4hbzl9ifd8x30nnczrygs5ziqhmz47l5nzx40ja177546"; + libraryHaskellDepends = [ + base filepath path path-io process safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-google-java-format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-hindent" = callPackage + ({ mkDerivation, base, directory, filepath, path, path-io, process + , safe, zifter + }: + mkDerivation { + pname = "zifter-hindent"; + version = "0.0.0.1"; + sha256 = "10qwlvw1zq5q530xlh69ag9ap4jl5gv5xj7sc4bwjglbbcw39iag"; + libraryHaskellDepends = [ + base directory filepath path path-io process safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-hindent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-hlint" = callPackage + ({ mkDerivation, base, filepath, hlint, path, path-io, safe, zifter + }: + mkDerivation { + pname = "zifter-hlint"; + version = "0.0.0.0"; + sha256 = "0bvp6l5k42ls996h3qc7wy4qgcx0phd8hf0l99kcqan2gpx8qn6p"; + revision = "1"; + editedCabalFile = "08wmzid4g3av9w86ysybvg2mwkfx63b19v2i71hvik48bl5v6mlv"; + libraryHaskellDepends = [ + base filepath hlint path path-io safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-hlint"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-stack" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, path, path-io + , process, safe, zifter + }: + mkDerivation { + pname = "zifter-stack"; + version = "0.0.0.4"; + sha256 = "0vgklhbq846xh020n4mp4j96zbpc2asnsn1zk716pfnkgvk9syqn"; + libraryHaskellDepends = [ + base Cabal directory filepath path path-io process safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-stack"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zigbee-znet25" = callPackage ({ mkDerivation, base, bytestring, cereal, MissingH, mtl , QuickCheck, random, transformers @@ -196963,7 +211464,7 @@ self: { mkDerivation { pname = "zigbee-znet25"; version = "0.1.1.0"; - sha256 = "c5e17c0386f6afd6eb278e2084ea383ac6aeb34ce835a108e9a23df88f13654f"; + sha256 = "0kv52f7zhgd2x44a2dg89jrsxiis73m8884f4zmxdbznhq1prqf5"; libraryHaskellDepends = [ base bytestring cereal MissingH mtl transformers ]; @@ -196980,7 +211481,7 @@ self: { mkDerivation { pname = "zim-parser"; version = "0.2.1.0"; - sha256 = "b27f6a395c54e0dac6926a5ea18b582aa21c5d91e31b53f8749f063947a15789"; + sha256 = "12apl53kj1lzfkw566z3j5fir8iab25s2pkajb3dmq2lbhwnlzxj"; libraryHaskellDepends = [ array base base-compat binary binary-conduit bytestring conduit conduit-extra lzma @@ -197003,8 +211504,10 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.8"; - sha256 = "3b6addaaf314df1587baf8b5e0423cbfa9fc256a09a20c70e1a746a8067370d1"; + version = "0.1.11"; + sha256 = "0adflrr7h6aqq4nz0751chs65zfj0ljz1mjwyym3s080sbrwncjn"; + revision = "1"; + editedCabalFile = "0f97aidxiw149m64bv6qnb6ba2xlmllv3cwalihvccc0vh5kn0as"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path @@ -197020,45 +211523,17 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "zip_0_1_9" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, exceptions - , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck - , resourcet, text, time, transformers - }: - mkDerivation { - pname = "zip"; - version = "0.1.9"; - sha256 = "82dd97404ff2dde034b6786838ee51a5102da31c20835d61fef3bdfe69279860"; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest exceptions filepath mtl path - path-io plan-b resourcet text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions filepath hspec path - path-io QuickCheck text time transformers - ]; - homepage = "https://github.com/mrkkrp/zip"; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + ({ 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.0.5"; - sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7"; - revision = "1"; - editedCabalFile = "f9284c6bdf1e6c9f85091c602faae19dfad856ac6628531d999a611994f3da86"; + version = "0.3.1.1"; + sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath mtl old-time pretty text time unix zlib @@ -197083,9 +211558,9 @@ self: { mkDerivation { pname = "zip-conduit"; version = "0.2.2.2"; - sha256 = "1b1c83eeae0755fa03744d0ef0c1643259caa0d125862172fe1c335ec332eb6a"; + sha256 = "0spb6b1mwcqwzrr231i5s6hcln9jck0z03jdfh1zlm87mvp8670v"; revision = "1"; - editedCabalFile = "bded40e095b3842e349207e728410c3759fb2707ec15b8f9d475f1eff3cefcba"; + editedCabalFile = "1fpwrvryzwbmskwvh5gc0wkznn9p1i0jirq7j8s2x15kjph41vdx"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra digest directory filepath mtl old-time resourcet time transformers utf8-string @@ -197104,12 +211579,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zip-stream" = callPackage + ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit + , conduit-extra, digest, directory, exceptions, filepath, mtl + , primitive, resourcet, time, transformers, transformers-base, zlib + }: + mkDerivation { + pname = "zip-stream"; + version = "0.1.0.1"; + sha256 = "17ndw8a6br9bgkr5s2jn54kq69bg4hwi55dfh899dbyzyl0yzxaq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra digest + exceptions mtl primitive resourcet time transformers-base zlib + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra directory filepath resourcet + time transformers + ]; + description = "ZIP archive streaming using conduits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zipedit" = callPackage ({ mkDerivation, base, directory, mtl, process }: mkDerivation { pname = "zipedit"; version = "0.2.3"; - sha256 = "998db1dd9fe403b7b6d5b1dc35094810c12e722ca097ef978aba52cfdf80ba9e"; + sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr"; libraryHaskellDepends = [ base directory mtl process ]; homepage = "http://code.haskell.org/~byorgey/code/zipedit"; description = "Create simple list editor interfaces"; @@ -197124,7 +211622,7 @@ self: { mkDerivation { pname = "zipkin"; version = "0.1.0.0"; - sha256 = "16c92701223c1df16f23638ea51e35ddb5720e715bf4a43ac835884b723f1be6"; + sha256 = "1rhv7xr4p21mr0xa9x2vf4775dfx6lgab3k34dpz279w480jgj8n"; libraryHaskellDepends = [ base bytestring mersenne-random-pure64 mtl safe ]; @@ -197139,7 +211637,7 @@ self: { mkDerivation { pname = "zipper"; version = "0.4.2"; - sha256 = "84780973df7730a21c67bf5dc566b5fda0ce4f0e94f9af0b7d89175c954800e5"; + sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44"; libraryHaskellDepends = [ base multirec ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic zipper for families of recursive datatypes"; @@ -197148,15 +211646,16 @@ self: { }) {}; "zippers" = callPackage - ({ mkDerivation, base, criterion, directory, doctest, filepath + ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest , lens, profunctors, semigroupoids }: mkDerivation { pname = "zippers"; - version = "0.2.2"; - sha256 = "d9c499cec6f60e0556b9874d2bf3b801b0a022b226a396200d11b91d3a1aede7"; + version = "0.2.3"; + sha256 = "0pgb33nr1cc6krvzl4wks9mhy5ikbgji8546fhmydqxw4ywlr9qv"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens profunctors semigroupoids ]; - testHaskellDepends = [ base directory doctest filepath ]; + testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion lens ]; homepage = "http://github.com/ekmett/zippers/"; description = "Traversal based zippers"; @@ -197168,19 +211667,62 @@ self: { mkDerivation { pname = "zippo"; version = "0.3"; - sha256 = "a273353e1511fe5f80a170dc295fad4cf68524649caf14a758ce675f5a8e0dc6"; + sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2"; libraryHaskellDepends = [ base mtl yall ]; homepage = "http://brandon.si/code/zippo/"; description = "A simple lens-based, generic, heterogenous, type-checked zipper library"; license = stdenv.lib.licenses.bsd3; }) {}; + "ziptastic-client" = callPackage + ({ mkDerivation, base, base-compat, hspec, http-client + , http-client-tls, http-types, iso3166-country-codes, servant + , servant-client, text, ziptastic-core + }: + mkDerivation { + pname = "ziptastic-client"; + version = "0.3.0.3"; + sha256 = "0phw247dbm68bbb9k9z4jiva0gz9yhirggcnsrvm697kzya9s25g"; + libraryHaskellDepends = [ + base base-compat http-client iso3166-country-codes servant + servant-client text ziptastic-core + ]; + testHaskellDepends = [ + base base-compat hspec http-client http-client-tls http-types + iso3166-country-codes servant-client + ]; + homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; + description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ziptastic-core" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec + , http-api-data, iso3166-country-codes, servant, text, tz + }: + mkDerivation { + pname = "ziptastic-core"; + version = "0.2.0.3"; + sha256 = "1c2ahblhqk4dq3105w3qd0j7isn3r0m7vvm5drd5g1ian37ywqwf"; + libraryHaskellDepends = [ + aeson base base-compat bytestring http-api-data + iso3166-country-codes servant text tz + ]; + testHaskellDepends = [ + aeson base base-compat here hspec iso3166-country-codes text tz + ]; + homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; + description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zlib_0_5_4_2" = callPackage ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "zlib"; version = "0.5.4.2"; - sha256 = "75d617d8a77d85ba5a0d69e42c2cd5371b56140b5fb028be3e75bff1cfd41096"; + sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; description = "Compression and decompression in the gzip and zlib formats"; @@ -197195,7 +211737,7 @@ self: { mkDerivation { pname = "zlib"; version = "0.6.1.2"; - sha256 = "e4eb4e636caf07a16a9730ce469a00b65d5748f259f43edd904dd457b198a2bb"; + sha256 = "1fx2k2qmgm2dj3fkxx2ry945fpdn02d4dkihjxma21xgdiilxsz4"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ @@ -197210,9 +211752,9 @@ self: { mkDerivation { pname = "zlib-bindings"; version = "0.1.1.5"; - sha256 = "c83bb438f9b6c5fe860982731eb8ac7eff993e8b56cbc15ef5b471f229f79109"; + sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8"; revision = "2"; - editedCabalFile = "0c6f9f81832af2473281fd58631aff8c6bbad24191e00d2a5a6ae2479249043b"; + editedCabalFile = "0fq49694gqkab8m0vq4i879blswczwd66n7xh4r4gwiahf0ryvqc"; libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; homepage = "http://github.com/snapframework/zlib-bindings"; @@ -197225,7 +211767,7 @@ self: { mkDerivation { pname = "zlib-conduit"; version = "1.1.0"; - sha256 = "6aa47ff9c2bdf5b34e3fc21bb1026fe2fdc9cad21878040972e7ad8514ab42ac"; + sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a"; libraryHaskellDepends = [ base conduit ]; doHaddock = false; homepage = "http://github.com/snoyberg/conduit"; @@ -197240,7 +211782,7 @@ self: { mkDerivation { pname = "zlib-enum"; version = "0.2.3.1"; - sha256 = "e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9"; + sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197257,19 +211799,42 @@ self: { mkDerivation { pname = "zlib-lens"; version = "0.1.2.1"; - sha256 = "e5a563453899e0896cfa3aed22a2fbfc67012990ace6d14631f31b704ff766eb"; + sha256 = "1sv6yx7p06zk653d3rmcj0lh2rzwzfi25v9sz9n8kq4r712n79g5"; libraryHaskellDepends = [ base bytestring profunctors zlib ]; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; license = stdenv.lib.licenses.bsd3; }) {}; + "zm" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, deepseq + , flat, ListLike, memory, model, mtl, pretty, tasty, tasty-hunit + , tasty-quickcheck, text, timeit, transformers + }: + mkDerivation { + pname = "zm"; + version = "0.2.4"; + sha256 = "0ssds87mccbfm83lchr7kgcbjhdkz6l2v0ab2v5zd89q5vwz1knl"; + libraryHaskellDepends = [ + base bytestring containers cryptonite deepseq flat ListLike memory + model mtl pretty text transformers + ]; + testHaskellDepends = [ + base bytestring containers flat ListLike model pretty tasty + tasty-hunit tasty-quickcheck text timeit + ]; + homepage = "http://github.com/tittoassini/zm"; + description = "Language independent, reproducible, absolute types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zmcat" = callPackage ({ mkDerivation, base, bytestring, zeromq3-haskell }: mkDerivation { pname = "zmcat"; version = "0.3"; - sha256 = "37b2584351d92b5db563915b19824bff8bd55704e6c027eea2ab489e9075e551"; + sha256 = "0lg5fn89wj5blbp2gh760ibxb2zz9f11jnwicfsmsayra51micip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring zeromq3-haskell ]; @@ -197285,7 +211850,7 @@ self: { mkDerivation { pname = "zmidi-core"; version = "0.8.1"; - sha256 = "5bfb08b41d20ea1d0520dac48fefe07fc4f174bcfa9de6d7eb613234e962cbd8"; + sha256 = "1n6bcblk8ck1xgbyd7gspisg3i3zw3pqzi6s402ivsi03ns0iysv"; libraryHaskellDepends = [ base binary bytestring containers ]; homepage = "https://github.com/stephentetley/zmidi-core"; description = "Read and write MIDI files"; @@ -197300,7 +211865,7 @@ self: { mkDerivation { pname = "zmidi-score"; version = "0.3.0.0"; - sha256 = "3baeb121c81cdceea4ff7244ea3d62afa0d16c1572b72e954ee6d975db32107e"; + sha256 = "0zhh6bdpbng69sajxdvj2mnd385gc8yyli3jzyjfxp0wr0hv3biv"; libraryHaskellDepends = [ aeson base binary containers data-ordlist deepseq deepseq-generics directory filepath mtl parallel-io text zmidi-core @@ -197318,7 +211883,7 @@ self: { mkDerivation { pname = "zmqat"; version = "0.2.0.0"; - sha256 = "3b6faab9d0b07085b0f9597d8cfea8a6df69d1826bd02d453a7847eda8e320cc"; + sha256 = "1k10wflfsivq792jvl3bhb8nkpx6m3z8qzarz6q8aw5hs2wslvrv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -197334,7 +211899,7 @@ self: { mkDerivation { pname = "zoneinfo"; version = "0.5"; - sha256 = "1e693e02e977fbc727b0485bfadd3751982f6730b79d79ac8c41a5a3189247d8"; + sha256 = "1n27j8ca79a1ijn7k7dp61kjz62i6zfzlns8n0kwgyvpx413ws8y"; libraryHaskellDepends = [ base time ]; description = "ZoneInfo library"; license = stdenv.lib.licenses.bsd3; @@ -197348,7 +211913,7 @@ self: { mkDerivation { pname = "zoom"; version = "0.1.0.1"; - sha256 = "d4ee9458e5d90723e512129af31778a47eedac1652d1c159a14135c3c81c597f"; + sha256 = "0zsr3k4c6da1l5cw3laj2snfszm4g0bz76hj2bjj61yrwmc99vnl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc hamlet template-haskell text ]; @@ -197371,7 +211936,7 @@ self: { mkDerivation { pname = "zoom-cache"; version = "1.2.1.6"; - sha256 = "aecc91f3c9eef63b454f8009fafcd42d11fd453f5d11924d4e60d45addedc11c"; + sha256 = "0761xpfmmm309r6r44ax7x2zs49dskygl2c09x2kpxpfr7rr3k5f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197400,7 +211965,7 @@ self: { mkDerivation { pname = "zoom-cache-pcm"; version = "0.3.0.1"; - sha256 = "d8ef64a3828ab0bd2e63a23b561f70eddd41781105e248878d951f4c1637c764"; + sha256 = "0r676wb4q7wmin3liqh525w43pgdf0gmcfx2ccpbvc4ahain9vyq"; libraryHaskellDepends = [ base blaze-builder bytestring containers iteratee ListLike mtl type-level zoom-cache @@ -197418,7 +211983,7 @@ self: { mkDerivation { pname = "zoom-cache-sndfile"; version = "1.1.0.1"; - sha256 = "1f72a67a5b7a6f57b0c7b9db08b312d9aac7b421e9ea61a57aa42f9c8de7421c"; + sha256 = "0722wy6rqbx4gajn3sp946scganr2arhinxrqyq5fvvsbdxacwhz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -197435,7 +212000,7 @@ self: { mkDerivation { pname = "zoom-refs"; version = "0.0.0.1"; - sha256 = "743c0ed5e93bedf4207838274df02f2d3406c871ce51c00572b43d709978b32b"; + sha256 = "0axkg2cp0gdlf82w0lfff740cd1d5zq4s9rqg0hg9v9vx7ahwg3l"; libraryHaskellDepends = [ base lens stm ]; description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references"; license = stdenv.lib.licenses.bsd3; @@ -197447,9 +212012,9 @@ self: { mkDerivation { pname = "zot"; version = "0.0.3"; - sha256 = "c8a9091b939e3f74aca6be3007a0066c8a1de69da4b62e22891bed543f8a2b32"; + sha256 = "0cibi8zm9v8vi4i2xdm4kpk1v2kc0sh0fc5ylsn78gwyjcdhkaf8"; revision = "1"; - editedCabalFile = "b543a28082a9568e793d33c7ba5364fa3bdadb09323ce3c293f2f2ed8c5efa11"; + editedCabalFile = "04gsbs6fvwpjjg1f6g1j17dxlfzsci9vmirk7mwqwmm9ha0a4hxm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base monads-tf ]; @@ -197457,12 +212022,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zre" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, binary-strict + , bytestring, containers, lifted-async, monad-control, mtl, network + , network-info, network-multicast, optparse-applicative, process + , random, sockaddr, stm, time, transformers-base, uuid + , zeromq4-haskell + }: + mkDerivation { + pname = "zre"; + version = "0.1.0.0"; + sha256 = "11lnz7pxmqz39xjqjh1kkgywv0jg81yzi2hrp2ibaw2nslf65xzl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base binary binary-strict bytestring containers + monad-control mtl network network-info network-multicast + optparse-applicative process random sockaddr stm time + transformers-base uuid zeromq4-haskell + ]; + executableHaskellDepends = [ + async base bytestring lifted-async monad-control mtl stm time + ]; + testHaskellDepends = [ base ]; + description = "ZRE protocol implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zsh-battery" = callPackage ({ mkDerivation, base, directory, filepath, mtl }: mkDerivation { pname = "zsh-battery"; version = "0.2"; - sha256 = "b9abcac09fdddea5e7b2508a49ca14d9a667722908130cbc7872cdcd9a08a811"; + sha256 = "04d812dcvkbjg2y0q4q855r6g9nr2k54k2jhnbksbpnxkz0cmaxr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath mtl ]; @@ -197479,7 +212071,7 @@ self: { mkDerivation { pname = "zstd"; version = "0.1.0.0"; - sha256 = "0875840799d987cf8f8dd5e0a7686978084b3088c07123e66f6f88561f474bff"; + sha256 = "1zsb8wgmd23gdzk26wf0i0q4n23qd5lagq6min7wz1yrk43q8x88"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -197501,9 +212093,9 @@ self: { mkDerivation { pname = "ztail"; version = "1.2"; - sha256 = "13b314c992597118de1bfe0b866ef061237910f77bd35fb258e42d21182a3a4f"; + sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk"; revision = "1"; - editedCabalFile = "73528314fa829b0d5b28ce78cb365a1f91c506ac43fa28f2a61d0fed3dace142"; + editedCabalFile = "0hp1mhyys3qxlvr2iyj3mh3cb48zb8vcny6f51dhv6w2z8a86lkk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -197519,7 +212111,7 @@ self: { mkDerivation { pname = "zxcvbn-c"; version = "1.0.1"; - sha256 = "3352ee167fb8a161a72d2e2cc09ff6a0ca4fa2b8bc7575a06471a315dd81028d"; + sha256 = "1382h7fib8vicjh7axdwp2i4zjm0ysgw0b1f5nkn38dqgwbfwlik"; libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 2093ec2b218b..30d82d3efc93 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -1,6 +1,7 @@ { pkgs }: rec { + makePackageSet = pkgs.callPackage ./make-package-set.nix {}; overrideCabal = drv: f: (drv.override (args: args // { mkDerivation = drv: (args.mkDerivation drv).override f; @@ -38,6 +39,9 @@ rec { addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x]; addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; }); + addSetupDepend = drv: x: addSetupDepends drv [x]; + addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; }); + enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}"; disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}"; @@ -76,13 +80,19 @@ rec { fixupPhase = ":"; }); + linkWithGold = drv : appendConfigureFlag drv + "--ghc-option=-optl-fuse-ld=gold --ld-option=-fuse-ld=gold --with-ld=ld.gold"; + # link executables statically against haskell libs to reduce closure size justStaticExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - }); + } // (if pkgs.stdenv.isDarwin then { + configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; + } else {}) + ); buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' @@ -98,4 +108,7 @@ rec { triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); + overrideSrc = drv: { src, version ? drv.version }: + overrideCabal drv (_: { inherit src version; editedCabalFile = null; }); + } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix new file mode 100644 index 000000000000..6ed8d0864cac --- /dev/null +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -0,0 +1,163 @@ +# This expression takes a file like `hackage-packages.nix` and constructs +# a full package set out of that. + +# required dependencies: +{ pkgs, stdenv, all-cabal-hashes }: + +# arguments: +# * ghc package to use +# * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second +# * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality +{ ghc, package-set, extensible-self }: + +# return value: a function from self to the package set +self: let + + inherit (stdenv.lib) fix' extends makeOverridable; + inherit (import ./lib.nix { inherit pkgs; }) overrideCabal; + + mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { + inherit stdenv; + inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; + nodejs = pkgs.nodejs-slim; + jailbreak-cabal = if (self.ghc.cross or null) != null + then self.ghc.bootPkgs.jailbreak-cabal + else self.jailbreak-cabal; + inherit (self) ghc; + hscolour = overrideCabal self.hscolour (drv: { + isLibrary = false; + doHaddock = false; + hyperlinkSource = false; # Avoid depending on hscolour for this build. + postFixup = "rm -rf $out/lib $out/share $out/nix-support"; + }); + cpphs = overrideCabal (self.cpphs.overrideScope (self: super: { + mkDerivation = drv: super.mkDerivation (drv // { + enableSharedExecutables = false; + enableSharedLibraries = false; + doHaddock = false; + useCpphs = false; + }); + })) (drv: { + isLibrary = false; + postFixup = "rm -rf $out/lib $out/share $out/nix-support"; + }); + }; + + mkDerivation = makeOverridable mkDerivationImpl; + + # manualArgs are the arguments that were explictly passed to `callPackage`, like: + # + # callPackage foo { bar = null; }; + # + # here `bar` is a manual argument. + callPackageWithScope = scope: fn: manualArgs: + let + # this code is copied from callPackage in lib/customisation.nix + # + # we cannot use `callPackage` here because we want to call `makeOverridable` + # on `drvScope` (we cannot add `overrideScope` after calling `callPackage` because then it is + # lost on `.override`) but determine the auto-args based on `drv` (the problem here + # is that nix has no way to "passthrough" args while preserving the reflection + # info that callPackage uses to determine the arguments). + drv = if builtins.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (builtins.functionArgs drv) scope; + + # this wraps the `drv` function to add a `overrideScope` function to the result. + drvScope = allArgs: drv allArgs // { + overrideScope = f: + let newScope = mkScope (fix' (extends f scope.__unfix__)); + # note that we have to be careful here: `allArgs` includes the auto-arguments that + # weren't manually specified. If we would just pass `allArgs` to the recursive call here, + # then we wouldn't look up any packages in the scope in the next interation, because it + # appears as if all arguments were already manually passed, so the scope change would do + # nothing. + in callPackageWithScope newScope drv manualArgs; + }; + in stdenv.lib.makeOverridable drvScope (auto // manualArgs); + + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; + defaultScope = mkScope self; + callPackage = drv: args: callPackageWithScope defaultScope drv args; + + withPackages = packages: callPackage ./with-packages-wrapper.nix { + inherit (self) llvmPackages; + haskellPackages = self; + inherit packages; + }; + + haskellSrc2nix = { name, src, sha256 ? null }: + let + sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; + in pkgs.stdenv.mkDerivation { + name = "cabal2nix-${name}"; + buildInputs = [ pkgs.haskellPackages.cabal2nix ]; + preferLocalBuild = true; + phases = ["installPhase"]; + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; + installPhase = '' + export HOME="$TMP" + mkdir -p "$out" + cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix" + ''; + }; + + hackage2nix = name: version: self.haskellSrc2nix { + name = "${name}-${version}"; + sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")''; + src = "${all-cabal-hashes}/${name}/${version}/${name}.cabal"; + }; + +in package-set { inherit pkgs stdenv callPackage; } self // { + + inherit mkDerivation callPackage haskellSrc2nix hackage2nix; + + callHackage = name: version: self.callPackage (self.hackage2nix name version); + + # Creates a Haskell package from a source package by calling cabal2nix on the source. + callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; }); + + # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet + # Given a set whose values are either paths or version strings, produces + # a package override set (i.e. (self: super: { etc. })) that sets + # the packages named in the input set to the corresponding versions + packageSourceOverrides = + overrides: self: super: pkgs.lib.mapAttrs (name: src: + let isPath = x: builtins.substring 0 1 (toString x) == "/"; + generateExprs = if isPath src + then self.callCabal2nix + else self.callHackage; + in generateExprs name src {}) overrides; + + # : { root : Path + # , source-overrides : Defaulted (Either Path VersionNumber) + # , overrides : Defaulted (HaskellPackageOverrideSet) + # } -> NixShellAwareDerivation + # Given a path to a haskell package directory whose cabal file is + # named the same as the directory name, an optional set of + # source overrides as appropriate for the 'packageSourceOverrides' + # function, and an optional set of arbitrary overrides, + # return a derivation appropriate for nix-build or nix-shell + # to build that package. + developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }: + let name = builtins.baseNameOf root; + drv = + (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {}; + in if pkgs.lib.inNixShell then drv.env else drv; + + ghcWithPackages = selectFrom: withPackages (selectFrom self); + + ghcWithHoogle = selectFrom: + let + packages = selectFrom self; + hoogle = callPackage ./hoogle.nix { + inherit packages; + }; + in withPackages (packages ++ [ hoogle ]); + + ghc = ghc // { + withPackages = self.ghcWithPackages; + withHoogle = self.ghcWithHoogle; + }; + + } diff --git a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch deleted file mode 100644 index dc7ece8f3e8d..000000000000 --- a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8fd84b4d6ba257ac93a61bce3378777840e8bf80 Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Sat, 5 Nov 2016 14:27:04 +0300 -Subject: [PATCH] getSessionAddress: take first bus address from - semicolon-separated variable - ---- - lib/DBus/Address.hs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/DBus/Address.hs b/lib/DBus/Address.hs -index 72ac99d..596b18c 100644 ---- a/lib/DBus/Address.hs -+++ b/lib/DBus/Address.hs -@@ -18,6 +18,7 @@ module DBus.Address where - import qualified Control.Exception - import Data.Char (digitToInt, ord, chr) - import Data.List (intercalate) -+import Data.Maybe (listToMaybe) - import qualified Data.Map - import Data.Map (Map) - import qualified System.Environment -@@ -152,7 +153,7 @@ getSystemAddress = do - getSessionAddress :: IO (Maybe Address) - getSessionAddress = do - env <- getenv "DBUS_SESSION_BUS_ADDRESS" -- return (env >>= parseAddress) -+ return $ maybe Nothing listToMaybe (env >>= parseAddresses) - - -- | Returns the address in the environment variable - -- @DBUS_STARTER_ADDRESS@, which must be set. --- -2.10.1 - diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index e04cbe08c2c7..147a021ff534 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -8,7 +8,7 @@ assert ghcLibdir != null -> (ghc.isGhcjs or false); # This wrapper works only with GHC 6.12 or later. -assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; +assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs || ghc.isHaLVM; # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -33,13 +33,14 @@ assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; let isGhcjs = ghc.isGhcjs or false; - ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version; + isHaLVM = ghc.isHaLVM or false; + ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; ghcCommand = "${crossPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; - libDir = "$out/lib/${ghcCommand}-${ghc.version}"; + libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); @@ -95,7 +96,28 @@ symlinkJoin { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" fi done - + '' + (lib.optionalString stdenv.isDarwin '' + # Work around a linker limit in Mac OS X Sierra (see generic-builder.nix): + local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; + local dynamicLinksDir="$out/lib/links" + mkdir -p $dynamicLinksDir + # Clean up the old links that may have been (transitively) included by + # symlinkJoin: + rm -f $dynamicLinksDir/* + for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do + ln -s $d/*.dylib $dynamicLinksDir + done + for f in $packageConfDir/*.conf; do + # Initially, $f is a symlink to a read-only file in one of the inputs + # (as a result of this symlinkJoin derivation). + # Replace it with a copy whose dynamic-library-dirs points to + # $dynamicLinksDir + cp $f $f-tmp + rm $f + sed "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f-tmp > $f + rm $f-tmp + done + '') + '' ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} ${# ghcjs will read the ghc_libdir file when resolving plugins. lib.optionalString (isGhcjs && ghcLibdir != null) '' diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix new file mode 100644 index 000000000000..cf923d409172 --- /dev/null +++ b/pkgs/development/interpreters/clips/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "6.30"; + name = "clips-${version}"; + src = fetchurl { + url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z"; + sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy"; + }; + buildPhase = '' + make -C core -f ../makefiles/makefile.gcc + ''; + installPhase = '' + install -D -t $out/bin core/clips + ''; + meta = with stdenv.lib; { + description = "A Tool for Building Expert Systems"; + homepage = "http://www.clipsrules.net/"; + longDescription = '' + Developed at NASA's Johnson Space Center from 1985 to 1996, + CLIPS is a rule-based programming language useful for creating + expert systems and other programs where a heuristic solution is + easier to implement and maintain than an algorithmic solution. + ''; + license = licenses.publicDomain; + maintainers = [maintainers.league]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index b4930e7d57d6..597f75c46456 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -5,8 +5,7 @@ # - full: contains base plus modules in withModules { stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto -, libffi -, libffcall +, libffi, libffcall, automake , coreutils # build options , threadSupport ? (stdenv.isi686 || stdenv.isx86_64) @@ -24,19 +23,20 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xproto != null && libXext != null && xextproto != null); stdenv.mkDerivation rec { - v = "2.50pre20161201"; + v = "2.50pre20170130"; name = "clisp-${v}"; src = fetchhg { url = "http://hg.code.sf.net/p/clisp/clisp"; - rev = "536a48"; - sha256 = "097igsfpn8xipnjapyf5hx6smzh04v4ncskxl747xxn6pgpq813z"; + rev = "130e74c8ea17"; + sha256 = "1aqaxskvghc4ipbs3m4syvzn6bzj165zqvjpw0xa696i07vkk19j"; }; inherit libsigsegv gettext coreutils; ffcallAvailable = stdenv.isLinux && (libffcall != null); + nativeBuildInputs = [ automake ]; # sometimes fails otherwise buildInputs = [libsigsegv] ++ stdenv.lib.optional (gettext != null) gettext ++ stdenv.lib.optional (ncurses != null) ncurses diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 3dfb800afe10..57ced325aad0 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { name = "clooj-${version}"; jar = fetchurl { - url = "http://download1492.mediafire.com/dptomdxrjaag/prkf64humftrmz3/clooj-0.4.4-standalone.jar"; + # mirrored as original mediafire.com source does not work without user interaction + url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix new file mode 100644 index 000000000000..43d48e2cf7cd --- /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 000000000000..9ddd9062acd9 --- /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 000000000000..23c4db804d3f --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.5.0"; + sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix deleted file mode 100644 index 31a58bcde11d..000000000000 --- 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.2"; - - src = fetchFromGitHub { - owner = "elixir-lang"; - repo = "elixir"; - rev = "v${version}"; - sha256 = "0jqww3l5jgqvlqpp6lh8i55v23a5imw4giarr05gsl7imv2qqshz"; - }; - - 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 000000000000..ff63406aea36 --- /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/R14.nix b/pkgs/development/interpreters/erlang/R14.nix deleted file mode 100644 index 0a93726fc0af..000000000000 --- a/pkgs/development/interpreters/erlang/R14.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, makeWrapper, gnused, gawk }: - -let version = "14B04"; in - -stdenv.mkDerivation { - name = "erlang-" + version; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; - }; - - buildInputs = [ perl gnum4 ncurses openssl makeWrapper ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - configureFlags = "--with-ssl=${openssl.dev}"; - - hardeningDisable = [ "format" ]; - - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index ed30fe1522bf..123d813fc77a 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -1,17 +1,6 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, gnused, gawk, makeWrapper -, odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false -, Carbon ? null, Cocoa ? null }: +{ mkDerivation, fetchurl }: -assert wxSupport -> mesa != null && wxGTK != null && xorg != null; -assert odbcSupport -> unixODBC != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"; +mkDerivation rec { version = "16B03-1"; src = fetchurl { @@ -19,30 +8,23 @@ stdenv.mkDerivation rec { sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; - debugInfo = enableDebugInfo; - - buildInputs = - [ perl gnum4 ncurses openssl makeWrapper - ] ++ optionals wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport unixODBC - ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + prePatch = '' + sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure + ''; preConfigure = '' export HOME=$PWD/../ sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - + # Do not install docs, instead use prebuilt versions. + installTargets = "install"; postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; }; in '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call tar xf "${manpages}" -C "$out/lib/erlang" for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do prefix="''${i%/*}" @@ -50,29 +32,4 @@ stdenv.mkDerivation rec { ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" done ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = [ maintainers.the-kenny ]; - }; } diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index 5745ea5d98b3..89c97f5a0eb7 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -1,67 +1,38 @@ -{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang -, gnused, gawk, makeWrapper -, odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false -, Carbon ? null, Cocoa ? null }: +{ pkgs, mkDerivation }: -assert wxSupport -> mesa != null && wxGTK != null && xorg != null; -assert odbcSupport -> unixODBC != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; +mkDerivation rec { + baseName = "erlang"; version = "16B02"; - src = fetchFromGitHub { + src = pkgs.fetchFromGitHub { owner = "basho"; repo = "otp"; rev = "OTP_R16B02_basho8"; sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; }; - debugInfo = enableDebugInfo; - - buildInputs = - [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc - ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ] - ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; - preConfigure = '' export HOME=$PWD/../ export LANG=C export ERL_TOP=$(pwd) sed -e s@/bin/pwd@pwd@g -i otp_build - sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc + sed -e s@"/usr/bin/env escript"@$(pwd)/bootstrap/bin/escript@g -i lib/diameter/bin/diameterc + + ./otp_build autoconf ''; - configureFlags= [ - "--with-ssl=${openssl.dev}" - "--enable-smp-support" - "--enable-threads" - "--enable-kernel-poll" - "--disable-hipe" - "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" - "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" - "${optionalString stdenv.isLinux "--enable-m64-build"}" - ]; - - buildPhase = '' - ./otp_build autoconf - ./otp_build setup -a --prefix=$out $configureFlags - ''; + enableHipe = false; + # Do not install docs, instead use prebuilt versions. + installTargets = "install"; postInstall = let - manpages = fetchurl { + manpages = pkgs.fetchurl { url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; }; in '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + sed -e s@$(pwd)/bootstrap/bin/escript@$out/bin/escript@g -i $out/lib/erlang/lib/diameter-1.4.3/bin/diameterc + tar xf "${manpages}" -C "$out/lib/erlang" for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do prefix="''${i%/*}" @@ -70,14 +41,6 @@ stdenv.mkDerivation rec { done ''; - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" - ''; - - setupHook = ./setup-hook.sh; - meta = { homepage = "https://github.com/basho/otp/"; description = "Programming language used for massively scalable soft real-time systems, Basho fork"; @@ -89,12 +52,12 @@ stdenv.mkDerivation rec { telephony and instant messaging. Erlang's runtime system has built-in support for concurrency, distribution and fault tolerance. - This version of Erlang is Basho's version, forked from Ericsson's + This version of Erlang is Basho's version, forked from Ericsson's repository. ''; platforms = ["x86_64-linux" "x86_64-darwin"]; - license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ mdaiter ]; + license = pkgs.stdenv.lib.licenses.asl20; + maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 57323a587f81..02d7513331eb 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,26 +1,6 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, gnused, gawk, makeWrapper -, Carbon, Cocoa -, odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null -, javacSupport ? false, openjdk ? null -, enableHipe ? true -, enableDebugInfo ? false -, enableDirtySchedulers ? false -}: +{ mkDerivation, fetchurl }: -assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else mesa != null && wxGTK != null && xorg != null); - -assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" - + "${optionalString javacSupport "-javac"}"; +mkDerivation rec { version = "17.5"; src = fetchurl { @@ -28,38 +8,23 @@ stdenv.mkDerivation rec { sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w"; }; - buildInputs = - [ perl gnum4 ncurses openssl makeWrapper - ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport unixODBC - ++ optional javacSupport openjdk - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - - debugInfo = enableDebugInfo; + prePatch = '' + sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure + ''; preConfigure = '' export HOME=$PWD/../ sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= [ - "--with-ssl=${openssl.dev}" - ] ++ optional enableHipe "--enable-hipe" - ++ optional enableDirtySchedulers "--enable-dirty-schedulers" - ++ optional wxSupport "--enable-wx" - ++ optional odbcSupport "--with-odbc=${unixODBC}" - ++ optional javacSupport "--with-javac" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; - + # Do not install docs, instead use prebuilt versions. + installTargets = "install"; postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5"; }; in '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call tar xf "${manpages}" -C "$out/lib/erlang" for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do prefix="''${i%/*}" @@ -67,29 +32,4 @@ stdenv.mkDerivation rec { ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" done ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = [ maintainers.the-kenny maintainers.sjmackenzie ]; - }; } diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index f9b6edc3fa4b..0d20ae662a50 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,108 +1,22 @@ -{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl -, gnused, gawk, autoconf, libxslt, libxml2, makeWrapper -, Carbon, Cocoa -, odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null -, javacSupport ? false, openjdk ? null -, enableHipe ? true -, enableDebugInfo ? false -, enableDirtySchedulers ? false -}: - -assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else mesa != null && wxGTK != null && xorg != null); - -assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" - + "${optionalString javacSupport "-javac"}"; - version = "18.3.4.4"; - - # Minor OTP releases are not always released as tarbals at - # http://erlang.org/download/ So we have to download from - # github. And for the same reason we can't use a prebuilt manpages - # tarball and need to build manpages ourselves. - src = fetchFromGitHub { - owner = "erlang"; - repo = "otp"; - rev = "OTP-${version}"; - sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; - }; - - buildInputs = - [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper - ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport unixODBC - ++ optional javacSupport openjdk - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - - debugInfo = enableDebugInfo; +{ mkDerivation, fetchurl }: +let rmAndPwdPatch = fetchurl { url = "https://github.com/erlang/otp/commit/98b8650d22e94a5ff839170833f691294f6276d0.patch"; sha256 = "0cd5pkqrigiqz6cyma5irqwzn0bi17k371k9vlg8ir31h3zmqfip"; }; envAndCpPatch = fetchurl { - url = "https://github.com/binarin/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch"; + url = "https://github.com/erlang/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch"; sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f"; }; +in mkDerivation rec { + version = "18.3.4.4"; + sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; + patches = [ rmAndPwdPatch envAndCpPatch ]; - - preConfigure = '' - ./otp_build autoconf - ''; - - configureFlags= [ - "--with-ssl=${openssl.dev}" - ] ++ optional enableHipe "--enable-hipe" - ++ optional enableDirtySchedulers "--enable-dirty-schedulers" - ++ optional wxSupport "--enable-wx" - ++ optional odbcSupport "--with-odbc=${unixODBC}" - ++ optional javacSupport "--with-javac" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; - - # install-docs will generate and install manpages and html docs - # (PDFs are generated only when fop is available). - installTargets = "install install-docs"; - - postInstall = '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - downloadPage = "http://www.erlang.org/download.html"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny sjmackenzie couchemar ]; - license = licenses.asl20; - }; } diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index fc9db7d9bfb6..680111dbd77a 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,98 +1,10 @@ -{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl -, gnused, gawk, autoconf, libxslt, libxml2, makeWrapper -, Carbon, Cocoa -, odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null -, javacSupport ? false, openjdk ? null -, enableHipe ? true -, enableDebugInfo ? false -, enableDirtySchedulers ? false -}: +{ mkDerivation, fetchurl }: -assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else mesa != null && wxGTK != null && xorg != null); - -assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" - + "${optionalString javacSupport "-javac"}"; - version = "19.2.3"; - - # Minor OTP releases are not always released as tarbals at - # http://erlang.org/download/ So we have to download from - # github. And for the same reason we can't use a prebuilt manpages - # tarball and need to build manpages ourselves. - src = fetchFromGitHub { - owner = "erlang"; - repo = "otp"; - rev = "OTP-${version}"; - sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c"; - }; - - buildInputs = - [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper - ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport unixODBC - ++ optional javacSupport openjdk - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - - debugInfo = enableDebugInfo; +mkDerivation rec { + version = "19.3"; + sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; prePatch = '' - substituteInPlace configure.in \ - --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' ''; - - preConfigure = '' - ./otp_build autoconf - ''; - - configureFlags= [ - "--with-ssl=${openssl.dev}" - ] ++ optional enableHipe "--enable-hipe" - ++ optional enableDirtySchedulers "--enable-dirty-schedulers" - ++ optional wxSupport "--enable-wx" - ++ optional odbcSupport "--with-odbc=${unixODBC}" - ++ optional javacSupport "--with-javac" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; - - # install-docs will generate and install manpages and html docs - # (PDFs are generated only when fop is available). - installTargets = "install install-docs"; - - postInstall = '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - downloadPage = "http://www.erlang.org/download.html"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny sjmackenzie couchemar ]; - license = licenses.asl20; - }; } diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix new file mode 100644 index 000000000000..8866d9848e7a --- /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/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix new file mode 100644 index 000000000000..3434603f3028 --- /dev/null +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -0,0 +1,144 @@ +{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused +, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook +, openjdk ? null # javacSupport +, unixODBC ? null # odbcSupport +, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +}: + +{ baseName ? "erlang" +, version +, sha256 ? null +, rev ? "OTP-${version}" +, src ? fetchFromGitHub { inherit rev sha256; owner = "erlang"; repo = "otp"; } +, enableHipe ? true +, enableDebugInfo ? false +, enableThreads ? true +, enableSmpSupport ? true +, enableKernelPoll ? true +, javacSupport ? false, javacPackages ? [ openjdk ] +, odbcSupport ? false, odbcPackages ? [ unixODBC ] +, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ] +, preUnpack ? "", postUnpack ? "" +, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" +, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" +, buildPhase ? "", preBuild ? "", postBuild ? "" +, installPhase ? "", preInstall ? "", postInstall ? "" +, installTargets ? "install install-docs" +, checkPhase ? "", preCheck ? "", postCheck ? "" +, fixupPhase ? "", preFixup ? "", postFixup ? "" +, meta ? null +}: + +assert wxSupport -> (if stdenv.isDarwin + then wxmac != null + else mesa != null && wxGTK != null && xorg != null); + +assert odbcSupport -> unixODBC != null; +assert javacSupport -> openjdk != null; + +let + inherit (stdenv.lib) optional optionals optionalAttrs optionalString; + wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; + +in stdenv.mkDerivation ({ + name = "${baseName}-${version}" + + optionalString javacSupport "-javac" + + optionalString odbcSupport "-odbc"; + + inherit src version; + + buildInputs = + [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc + ] + ++ optionals wxSupport wxPackages2 + ++ optionals odbcSupport odbcPackages + ++ optionals javacSupport javacPackages + ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]); + + debugInfo = enableDebugInfo; + + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + + ${prePatch} + ''; + + postPatch = '' + ${postPatch} + + patchShebangs make + ''; + + preConfigure = '' + ./otp_build autoconf + ''; + + configureFlags = [ "--with-ssl=${openssl.dev}" ] + ++ optional enableThreads "--enable-threads" + ++ optional enableSmpSupport "--enable-smp-support" + ++ optional enableKernelPoll "--enable-kernel-poll" + ++ optional enableHipe "--enable-hipe" + ++ optional javacSupport "--with-javac" + ++ optional odbcSupport "--with-odbc=${unixODBC}" + ++ optional wxSupport "--enable-wx" + ++ optional stdenv.isDarwin "--enable-darwin-64bit"; + + # install-docs will generate and install manpages and html docs + # (PDFs are generated only when fop is available). + + postInstall = '' + ${postInstall} + + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + ''; + + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" + ''; + + setupHook = ./setup-hook.sh; + + meta = with stdenv.lib; { + homepage = "http://www.erlang.org/"; + downloadPage = "http://www.erlang.org/download.html"; + description = "Programming language used for massively scalable soft real-time systems"; + + longDescription = '' + Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. + Some of its uses are in telecoms, banking, e-commerce, computer + telephony and instant messaging. Erlang's runtime system has + built-in support for concurrency, distribution and fault + tolerance. + ''; + + platforms = platforms.unix; + maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; + license = licenses.asl20; + }; +} +// optionalAttrs (preUnpack != "") { inherit preUnpack; } +// optionalAttrs (postUnpack != "") { inherit postUnpack; } +// optionalAttrs (patches != []) { inherit patches; } +// optionalAttrs (patchPhase != "") { inherit patchPhase; } +// optionalAttrs (configureFlags != []) { inherit configureFlags; } +// optionalAttrs (configurePhase != "") { inherit configurePhase; } +// optionalAttrs (preConfigure != "") { inherit preConfigure; } +// optionalAttrs (postConfigure != "") { inherit postConfigure; } +// optionalAttrs (buildPhase != "") { inherit buildPhase; } +// optionalAttrs (preBuild != "") { inherit preBuild; } +// optionalAttrs (postBuild != "") { inherit postBuild; } +// optionalAttrs (checkPhase != "") { inherit checkPhase; } +// optionalAttrs (preCheck != "") { inherit preCheck; } +// optionalAttrs (postCheck != "") { inherit postCheck; } +// optionalAttrs (installPhase != "") { inherit installPhase; } +// optionalAttrs (installTargets != "") { inherit installTargets; } +// optionalAttrs (preInstall != "") { inherit preInstall; } +// optionalAttrs (fixupPhase != "") { inherit fixupPhase; } +// optionalAttrs (preFixup != "") { inherit preFixup; } +// optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (meta != null) { inherit meta; } +) diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index bfb975f152a7..4d38545a44f0 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,36 +1,32 @@ { stdenv, fetchurl, readline, gettext, ncurses }: +with stdenv.lib; stdenv.mkDerivation rec { name = "gnu-apl-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnu/apl/apl-${version}.tar.gz"; - sha256 = "057zwzvvgcrrwsl52a27w86hgy31jqq6avqq629xj7yq90qah3ay"; + sha256 = "07xq8ddlmz8psvsmwr23gar108ri0lwmw0n6kpxcv8ypas1f5xlg"; }; buildInputs = [ readline gettext ncurses ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ - "--disable-dependency-tracking" - "--disable-silent-rules" - ]; - postInstall = '' cp -r support-files/ $out/share/doc/ find $out/share/doc/support-files -name 'Makefile*' -delete ''; - meta = with stdenv.lib; { + meta = { description = "Free interpreter for the APL programming language"; homepage = http://www.gnu.org/software/apl/; license = licenses.gpl3Plus; maintainers = [ maintainers.kovirobi ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with platforms; linux ++ darwin; inherit version; longDescription = '' diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index b4a9282e1851..1928d51d3e58 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.8"; + version = "2.4.10"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1zcdkarz9mbx9k5sl69nbphjjcy0xd15zjicjnhp2wq32zm6b2k6"; + sha256 = "1a8pqcrm014h4x54gqqyxp7r1vkwhphqwrfa7gnqr6nzdqxzyk8w"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix new file mode 100644 index 000000000000..5746300fca09 --- /dev/null +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -0,0 +1,122 @@ +{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null +, hostPlatform +}: + +# Do either a coverage analysis build or a standard build. +(if coverageAnalysis != null + then coverageAnalysis + else stdenv.mkDerivation) + +(rec { + name = "guile-2.0.13"; + + src = fetchurl { + url = "mirror://gnu/guile/${name}.tar.xz"; + sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; + }; + + outputs = [ "out" "dev" "info" ]; + setOutputFlags = false; # $dev gets into the library otherwise + + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + buildInputs = [ readline libtool libunistring libffi ]; + propagatedBuildInputs = [ gmp boehmgc ] + + # XXX: These ones aren't normally needed here, but since + # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add + # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, + # see below. + ++ [ libtool libunistring ]; + + # A native Guile 2.0 is needed to cross-build Guile. + selfNativeBuildInput = true; + + enableParallelBuilding = true; + + patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch + (fetchpatch { + # Fixes stability issues with 00-repl-server.test + url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; + sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; + }) + ] ++ + (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); + + # Explicitly link against libgcc_s, to work around the infamous + # "libgcc_s.so.1 must be installed for pthread_cancel to work". + + # don't have "libgcc_s.so.1" on darwin + LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + + configureFlags = [ "--with-libreadline-prefix" ] + ++ stdenv.lib.optionals stdenv.isSunOS [ + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + "--with-libgmp-prefix=${gmp.dev}" + + # Same for these (?). + "--with-libreadline-prefix=${readline.dev}" + "--with-libunistring-prefix=${libunistring}" + + # See below. + "--without-threads" + ]; + + postInstall = '' + wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" + + # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for + # why `--with-libunistring-prefix' and similar options coming from + # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. + sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; + s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; + s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; + s|includedir=$out|includedir=$dev|g + " + ''; + + # make check doesn't work on darwin + # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. + doCheck = false; + + setupHook = ./setup-hook-2.0.sh; + + crossAttrs.preConfigure = + 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 + # passed. So it needs some help (XXX). + "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; + + + meta = { + description = "Embeddable Scheme implementation"; + homepage = http://www.gnu.org/software/guile/; + license = stdenv.lib.licenses.lgpl3Plus; + maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; + platforms = stdenv.lib.platforms.all; + + longDescription = '' + GNU Guile is an implementation of the Scheme programming language, with + support for many SRFIs, packaged for use in a wide variety of + environments. In addition to implementing the R5RS Scheme standard + and a large subset of R6RS, Guile includes a module system, full access + to POSIX system calls, networking support, multiple threads, dynamic + linking, a foreign function call interface, and powerful string + processing. + ''; + }; +}) + +// + +(stdenv.lib.optionalAttrs (!stdenv.isLinux) { + # Work around . + SHELL = "/bin/sh"; + CONFIG_SHELL = "/bin/sh"; +}) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 6b4e6c2a7288..19217476b140 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 @@ -7,11 +9,12 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.13"; + name = "guile-${version}"; + version = "2.2.0"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; + sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1"; }; outputs = [ "out" "dev" "info" ]; @@ -30,16 +33,10 @@ # A native Guile 2.0 is needed to cross-build Guile. selfNativeBuildInput = true; - # Guile 2.0.11 repeatable fails with 8-core parallel building because - # libguile/vm-i-system.i is not created in time - enableParallelBuilding = false; + enableParallelBuilding = true; - patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch - (fetchpatch { - # Fixes stability issues with 00-repl-server.test - url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; - sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; - }) + patches = [ + ./eai_system.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); @@ -49,7 +46,7 @@ # don't have "libgcc_s.so.1" on darwin LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - configureFlags = [ "--with-libreadline-prefix" ] + configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ] ++ stdenv.lib.optionals stdenv.isSunOS [ # Make sure the right is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See @@ -58,7 +55,6 @@ "--with-libgmp-prefix=${gmp.dev}" # Same for these (?). - "--with-libreadline-prefix=${readline.dev}" "--with-libunistring-prefix=${libunistring}" # See below. @@ -71,7 +67,7 @@ # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. - sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + sed -i "$out/lib/pkgconfig/guile-2.2.pc" \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; @@ -83,10 +79,10 @@ # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. doCheck = false; - setupHook = ./setup-hook-2.0.sh; + 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 @@ -98,7 +94,7 @@ description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; + maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ]; platforms = stdenv.lib.platforms.all; longDescription = '' @@ -113,10 +109,3 @@ }; }) -// - -(stdenv.lib.optionalAttrs (!stdenv.isLinux) { - # Work around . - SHELL = "/bin/sh"; - CONFIG_SHELL = "/bin/sh"; -}) diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh new file mode 100644 index 000000000000..86c1e0d3e4a9 --- /dev/null +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -0,0 +1,13 @@ +addGuileLibPath () { + if test -d "$1/share/guile/site/2.2" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2" + elif test -d "$1/share/guile/site" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site" + fi +} + +envHooks+=(addGuileLibPath) diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index e1ce01b59068..3cafd956277a 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,15 +2,14 @@ pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.11.1"; + version = "0.12.1"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "1msqv747iz12r73mz4qvsmlwkddwjvrahlrk7ysrcz07h7dsscxs"; + sha256 = "1fjip998k336r26i1gpri18syvfjg7z46wng1n58dmc238wm53sx"; }; - buildInputs = [ pythonPackages.appdirs ]; - propagatedBuildInputs = [ pythonPackages.clint pythonPackages.astor pythonPackages.rply ]; + propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ]; meta = { description = "A LISP dialect embedded in Python"; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index e17dd3638731..0ea1bf19231f 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 </c libpth => ' '," \ - -i "$out"/lib/perl5/*/*/Config.pm - # TODO: removing those paths would be cleaner than overwriting with nonsense. - substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \ - --replace "${libcInc}" /no-such-path \ - --replace "${ - if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path" - }" /no-such-path \ - --replace "$man" /no-such-path - ''; # */ + # Remove dependencies on glibc and gcc + sed "/ *libpth =>/c libpth => ' '," \ + -i "$out"/lib/perl5/*/*/Config.pm + # TODO: removing those paths would be cleaner than overwriting with nonsense. + substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \ + --replace "${libcInc}" /no-such-path \ + --replace "${ + if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path" + }" /no-such-path \ + --replace "$man" /no-such-path + ''; # */ meta = { homepage = https://www.perl.org/; @@ -121,17 +122,16 @@ let in rec { - perl = perl522; - - perl520 = common { - version = "5.20.3"; - sha256 = "0jlvpd5l5nk7lzfd4akdg1sw6vinbkj6izclyyr0lrbidfky691m"; - - }; + perl = perl524; perl522 = common { - version = "5.22.2"; - sha256 = "1hl3v85ggm027v9h2ycas4z5i3401s2k2l3qpnw8q5mahmiikbc1"; + version = "5.22.3"; + sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v"; + }; + + perl524 = common { + version = "5.24.1"; + sha256 = "1bqqb5ghfj4486nqr77kgsd8aff6a289jy7n2cdkznwvn34qbhg6"; }; } diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch new file mode 100644 index 000000000000..9d4cd75486e6 --- /dev/null +++ b/pkgs/development/interpreters/perl/sw_vers.patch @@ -0,0 +1,13 @@ +diff --git a/hints/darwin.sh b/hints/darwin.sh +index afadf53..80b7533 100644 +--- a/hints/darwin.sh ++++ b/hints/darwin.sh +@@ -329,7 +329,7 @@ EOM + # sw_vers output what we want + # "ProductVersion: 10.10.5" "10.10" + # "ProductVersion: 10.11" "10.11" +- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'` ++ prodvers="10.10" + case "$prodvers" in + 10.*) + add_macosx_version_min ccflags $prodvers diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 116d4adf204d..675616a5f21e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -23,11 +23,6 @@ let buildInputs = [ flex bison pkgconfig ] ++ lib.optional stdenv.isLinux systemd; - configureFlags = [ - "EXTENSION_DIR=$(out)/lib/php/extensions" - ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}" - ++ lib.optional stdenv.isLinux "--with-fpm-systemd"; - flags = { # much left to do here... @@ -267,26 +262,41 @@ let hardeningDisable = [ "bindnow" ]; - configurePhase = '' + preConfigure = '' # Don't record the configure flags since this causes unnecessary - # runtime dependencies - except for php-embed, as uwsgi needs them. - ${lib.optionalString (!(config.php.embed or false)) '' + # runtime dependencies for i in main/build-defs.h.in scripts/php-config.in; do substituteInPlace $i \ --replace '@CONFIGURE_COMMAND@' '(omitted)' \ --replace '@CONFIGURE_OPTIONS@' "" \ --replace '@PHP_LDFLAGS@' "" done - ''} - [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc/php.d --with-config-file-path=$out/etc --prefix=$out $configureFlags + #[[ -z "$libxml2" ]] || addToSearchPath PATH $libxml2/bin + + export EXTENSION_DIR=$out/lib/php/extensions + + configureFlags+=(--with-config-file-path=$out/etc \ + --includedir=$dev/include) ''; + configureFlags = [ + "--with-config-file-scan-dir=/etc/php.d" + ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}" + ++ lib.optional stdenv.isLinux "--with-fpm-systemd"; + postInstall = '' cp php.ini-production $out/etc/php.ini ''; + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; + src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; inherit sha256; @@ -298,6 +308,7 @@ let license = licenses.php301; maintainers = with maintainers; [ globin ]; platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; }; patches = if !php7 then [ ./fix-paths.patch ] else [ ./fix-paths-php7.patch ]; @@ -306,21 +317,25 @@ let substituteInPlace configure --replace "-lstdc++" "-lc++" ''; + stripDebugList = "bin sbin lib modules"; + + outputs = [ "out" "dev" ]; + }); in { php56 = generic { - version = "5.6.30"; - sha256 = "01krq8r9xglq59x376zlg261yikckq179jmhnlcg3gqxza9w41d1"; + version = "5.6.31"; + sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg"; }; php70 = generic { - version = "7.0.16"; - sha256 = "1awp6l5bs7qkvak9hgn1qbwkn6303mprslmgcfjyq3ywfmszbic3"; + version = "7.0.21"; + sha256 = "07r3qqyyvf16k4xk5b2070fwilggmph5937drjm8cvyyjb1k789b"; }; php71 = generic { - version = "7.1.2"; - sha256 = "013hlvzjmp7ilckqf3851xwmj37xzq6afsqm67i4whv64d723wp0"; + version = "7.1.7"; + sha256 = "1y0z5n0kyd15wzmn1lprjgaysbg0z428q9cjbx4dqf3zk296g6q7"; }; } diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 04aca84f902f..2a5d9d2f5744 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "16.6"; + version = "16.12"; src = fetchurl { url = "http://www.software-lab.de/${name}.tgz"; - sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3"; + sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; patchPhase = optionalString stdenv.isArm '' diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 7cb2a356f951..f4f52ec4ed33 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -79,7 +79,7 @@ let description = "A clojure-like lisp, built with the pypy vm toolkit"; homepage = "https://github.com/pixie-lang/pixie"; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux" "i686-linux"]; }; }; in build (builtins.getAttr variant variants) diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index c471a3cdc0fb..133329f4f203 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { baseName="pure"; project="pure-lang"; - version="0.64"; + version="0.66"; name="${baseName}-${version}"; extension="tar.gz"; src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="01vvix302gh5vsmnjf2g0rrif3hl1yik4izsx1wrvv1a6hlm5mgg"; + sha256="42df6832476e8bee3a7ca179671284c1edd7bc82b71062fa0de62fd2117ee676"; }; buildInputs = [ bison flex makeWrapper ]; diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/pkgs/development/interpreters/python/catch_conflicts/README.md new file mode 100644 index 000000000000..d144b80e3385 --- /dev/null +++ b/pkgs/development/interpreters/python/catch_conflicts/README.md @@ -0,0 +1,13 @@ + + +catch_conflicts.py +================== + +The file catch_conflicts.py is in a subdirectory because, if it isn't, the +/nix/store/ directory is added to sys.path causing a delay when building. + +Pointers: + +- https://docs.python.org/3/library/sys.html#sys.path + +- https://github.com/NixOS/nixpkgs/pull/23600 diff --git a/pkgs/development/interpreters/python/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py similarity index 100% rename from pkgs/development/interpreters/python/catch_conflicts.py rename to pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 8426902414a7..34058c558af0 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, hostPlatform, fetchurl , bzip2 , gdbm , fetchpatch @@ -15,6 +15,7 @@ , expat , libffi , CF, configd, coreutils +, python-setup-hook # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -68,7 +69,7 @@ let ./glibc-2.25-enosys.patch - ] ++ optionals stdenv.isCygwin [ + ] ++ optionals hostPlatform.isCygwin [ ./2.5.2-ctypes-util-find_library.patch ./2.5.2-tkinter-x11.patch ./2.6.2-ssl-threads.patch @@ -109,7 +110,7 @@ let "--enable-shared" "--with-threads" "--enable-unicode=ucs4" - ] ++ optionals stdenv.isCygwin [ + ] ++ optionals hostPlatform.isCygwin [ "--with-system-ffi" "--with-system-expat" "ac_cv_func_bind_textdomain_codeset=yes" @@ -117,14 +118,14 @@ let "--disable-toolbox-glue" ]; - postConfigure = if stdenv.isCygwin then '' + postConfigure = if hostPlatform.isCygwin then '' sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' '' else null; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib ] - ++ optionals stdenv.isCygwin [ expat libffi ] + ++ optionals hostPlatform.isCygwin [ expat libffi ] ++ [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ++ optionals stdenv.isDarwin [ CF configd ]; @@ -150,7 +151,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; DETERMINISTIC_BUILD = 1; - setupHook = ./setup-hook.sh; + setupHook = python-setup-hook sitePackages; postPatch = optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" @@ -189,6 +190,8 @@ in stdenv.mkDerivation { find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - + '' + optionalString hostPlatform.isCygwin '' + cp libpython2.7.dll.a $out/lib ''; passthru = let diff --git a/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh deleted file mode 100644 index 4770eea886f6..000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.7/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python2.7/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index 3ab0de96704c..9ff8ec51efe5 100644 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -11,6 +11,7 @@ , callPackage , self , CF, configd +, python-setup-hook # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -50,7 +51,17 @@ in stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - postPatch = optionalString (x11Support && (tix != null)) '' + # Determinism: The interpreter is patched to write null timestamps when compiling python files. + # This way python doesn't try to update them when we freeze timestamps in nix store. + DETERMINISTIC_BUILD=1; + # Determinism: We fix the hashes of str, bytes and datetime objects. + PYTHONHASHSEED=0; + + postPatch = '' + # Determinism + substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" +# # We do not patch `Lib/importlib/_bootstrap_external.py` because it does not exist. + '' + optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -67,7 +78,7 @@ in stdenv.mkDerivation { ) ''; - setupHook = ./setup-hook.sh; + setupHook = python-setup-hook sitePackages; postInstall = '' # needed for some packages, especially packages that backport functionality @@ -80,12 +91,17 @@ in stdenv.mkDerivation { fi done touch $out/lib/python${majorVersion}/test/__init__.py + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + # Determinism: Windows installers were not deterministic. + # We're also not interested in building Windows installers. + find "$out" -name 'wininst*.exe' | xargs -r rm -f + # Use Python3 as default python ln -s "$out/bin/idle3" "$out/bin/idle" ln -s "$out/bin/pip3" "$out/bin/pip" @@ -93,18 +109,20 @@ in stdenv.mkDerivation { ln -s "$out/bin/python3" "$out/bin/python" ln -s "$out/bin/python3-config" "$out/bin/python-config" ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" - ''; - postFixup = '' # Get rid of retained dependencies on -dev packages, and remove # some $TMPDIR references to improve binary reproducibility. + # Note that the .pyc file of _sysconfigdata.py should be regenerated! for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" done - # FIXME: should regenerate this. - rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython* - + # Determinism: rebuild all bytecode + # We exclude lib2to3 because that's Python 2 code which fails + # We rebuild three times, once for each optimization level + find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - ''; passthru = let diff --git a/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh deleted file mode 100644 index 82a8c0abd32f..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.3/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python3.3/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 58e4f21bb4a1..4d20a21a4d13 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -13,6 +13,7 @@ , callPackage , self , CF, configd +, python-setup-hook # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -100,7 +101,7 @@ in stdenv.mkDerivation { ''} ''; - setupHook = ./setup-hook.sh; + setupHook = python-setup-hook sitePackages; postInstall = '' # needed for some packages, especially packages that backport functionality @@ -132,6 +133,13 @@ in stdenv.mkDerivation { ln -s "$out/bin/python3-config" "$out/bin/python-config" ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" + # Get rid of retained dependencies on -dev packages, and remove + # some $TMPDIR references to improve binary reproducibility. + # Note that the .pyc file of _sysconfigdata.py should be regenerated! + for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do + sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" + done + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level @@ -140,18 +148,6 @@ in stdenv.mkDerivation { find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - ''; - postFixup = '' - # Get rid of retained dependencies on -dev packages, and remove - # some $TMPDIR references to improve binary reproducibility. - for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do - sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" - done - - # FIXME: should regenerate this. - rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython* - - ''; - passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { diff --git a/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh deleted file mode 100644 index fddcc0b73fe8..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.4/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python3.4/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 082f6ff67897..a4aec241a1aa 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -13,6 +13,7 @@ , callPackage , self , CF, configd +, python-setup-hook # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -102,7 +103,7 @@ in stdenv.mkDerivation { ''} ''; - setupHook = ./setup-hook.sh; + setupHook = python-setup-hook sitePackages; postInstall = '' # needed for some packages, especially packages that backport functionality @@ -134,6 +135,13 @@ in stdenv.mkDerivation { ln -s "$out/bin/python3-config" "$out/bin/python-config" ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" + # Get rid of retained dependencies on -dev packages, and remove + # some $TMPDIR references to improve binary reproducibility. + # Note that the .pyc file of _sysconfigdata.py should be regenerated! + for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do + sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" + done + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level @@ -142,17 +150,6 @@ in stdenv.mkDerivation { find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - ''; - postFixup = '' - # Get rid of retained dependencies on -dev packages, and remove - # some $TMPDIR references to improve binary reproducibility. - for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do - sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" - done - - # FIXME: should regenerate this. - rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython* - ''; - passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { diff --git a/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh deleted file mode 100644 index 2836ad7e8f56..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.5/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python3.5/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 2acca2b8a3cf..d2d922ce4955 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -14,6 +14,7 @@ , callPackage , self , CF, configd +, python-setup-hook # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -26,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "0"; + minorVersion = "1"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -47,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "08inlbb2vb8lahw6wfq654lqk6l1x7ncpggp6a92vqw5yq2gkidh"; + sha256 = "0ha03sbakxblzyvlramx5fj0ranzmzx4pa2png6nn8gczkfi0650"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -63,14 +64,6 @@ in stdenv.mkDerivation { substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; - patches = [ - (fetchpatch { - name = "glibc-2.25-failed-to-get-random-numbers.patch"; - url = https://github.com/python/cpython/commit/ff558f5aba4.patch; - sha256 = "1k12gpn69np94cm942vaf40sv7gsxqf20rv1m3parzgi1gs4hqa3"; - }) - ]; - postPatch = '' # Determinism substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" @@ -102,7 +95,7 @@ in stdenv.mkDerivation { ''} ''; - setupHook = ./setup-hook.sh; + setupHook = python-setup-hook sitePackages; postInstall = '' # needed for some packages, especially packages that backport functionality @@ -134,6 +127,13 @@ in stdenv.mkDerivation { ln -s "$out/bin/python3-config" "$out/bin/python-config" ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" + # Get rid of retained dependencies on -dev packages, and remove + # some $TMPDIR references to improve binary reproducibility. + # Note that the .pyc file of _sysconfigdata.py should be regenerated! + for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do + sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" + done + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level diff --git a/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh deleted file mode 100644 index 26a0d57bc87c..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.6/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python3.6/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index f30bd175daac..bc586e0b3cee 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -37,6 +37,9 @@ # generated binaries. , makeWrapperArgs ? [] +# Skip wrapping of python programs altogether +, dontWrapPythonPrograms ? false + , meta ? {} , passthru ? {} @@ -51,19 +54,12 @@ if disabled then throw "${name} not supported for interpreter ${python.executable}" else -python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { +python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"] // { name = namePrefix + name; inherit pythonPath; - - # Determinism: The interpreter is patched to write null timestamps when compiling python files. - # This way python doesn't try to update them when we freeze timestamps in nix store. - DETERMINISTIC_BUILD=1; - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED = 0; - buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) @@ -76,12 +72,13 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { doCheck = false; doInstallCheck = doCheck; - postFixup = '' + postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms '' + lib.optionalString catchConflicts '' - # check if we have two packages with the same name in closure and fail - # this shouldn't happen, something went wrong with dependencies specs - ${python.interpreter} ${./catch_conflicts.py} + # Check if we have two packages with the same name in the closure and fail. + # If this happens, something went wrong with the dependencies specs. + # Intentionally kept in a subdirectory, see catch_conflicts/README.md. + ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py '' + attrs.postFixup or ''''; passthru = { @@ -98,5 +95,3 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { isBuildPythonPackage = python.meta.platforms; }; }) - - diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 456a078874cd..7552c6cd2853 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , makeWrapper, callPackage, self, gdbm, db +, python-setup-hook # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -14,6 +15,7 @@ let pythonVersion = "2.7"; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "pypy${majorVersion}"; + sitePackages = "site-packages"; in stdenv.mkDerivation rec { name = "pypy-${version}"; @@ -67,7 +69,7 @@ in stdenv.mkDerivation rec { ${python.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing ''; - setupHook = ./setup-hook.sh; + setupHook = python-setup-hook sitePackages; postBuild = '' cd ./lib_pypy @@ -125,12 +127,11 @@ in stdenv.mkDerivation rec { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit zlibSupport libPrefix; + inherit zlibSupport libPrefix sitePackages; executable = "pypy"; isPypy = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; interpreter = "${self}/bin/${executable}"; - sitePackages = "site-packages"; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; }; diff --git a/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh b/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh deleted file mode 100644 index e9081d1eaa53..000000000000 --- a/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix new file mode 100644 index 000000000000..b66bd1cc5f69 --- /dev/null +++ b/pkgs/development/interpreters/python/setup-hook.nix @@ -0,0 +1,13 @@ +{ runCommand }: + +sitePackages: + +let + hook = ./setup-hook.sh; +in runCommand "python-setup-hook.sh" { + inherit sitePackages; +} '' + cp ${hook} hook.sh + substituteAllInPlace hook.sh + mv hook.sh $out +'' diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh new file mode 100644 index 000000000000..dda9bed39f85 --- /dev/null +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -0,0 +1,21 @@ +addPythonPath() { + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/@sitePackages@ +} + +toPythonPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/@sitePackages@" + result="${result}${result:+:}$p" + done + echo $result +} + +envHooks+=(addPythonPath) + +# Determinism: The interpreter is patched to write null timestamps when compiling python files. +# This way python doesn't try to update them when we freeze timestamps in nix store. +export DETERMINISTIC_BUILD=1; +# Determinism: We fix the hashes of str, bytes and datetime objects. +export PYTHONHASHSEED=0; diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 55998bc5b41e..1c74e612b559 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -1,7 +1,7 @@ # Wrapper around wrapPythonProgramsIn, below. The $pythonPath # variable is passed in from the buildPythonPackage function. wrapPythonPrograms() { - wrapPythonProgramsIn $out "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" } # Builds environment variables like PYTHONPATH and PATH walking through closure @@ -47,34 +47,36 @@ wrapPythonProgramsIn() { buildPythonPath "$pythonPath" # Find all regular files in the output directory that are executable. - find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do - # Rewrite "#! .../env python" to "#! /nix/store/.../python". - # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which - # Python to use besides one with this hook anyway. - if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then - sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^" - fi - - # catch /python and /.python-wrapped - if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then - # dont wrap EGG-INFO scripts since they are called from python - if echo "$f" | grep -qv EGG-INFO/scripts; then - echo "wrapping \`$f'..." - patchPythonScript "$f" - # wrapProgram creates the executable shell script described - # above. The script will set PYTHONPATH and PATH variables.! - # (see pkgs/build-support/setup-hooks/make-wrapper.sh) - local -a wrap_args=("$f" - --prefix PATH ':' "$program_PATH") - - # Add any additional arguments provided by makeWrapperArgs - # argument to buildPythonPackage. - local -a user_args="($makeWrapperArgs)" - local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") - wrapProgram "${wrapProgramArgs[@]}" + if [ -d "$dir" ]; then + find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do + # Rewrite "#! .../env python" to "#! /nix/store/.../python". + # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which + # Python to use besides one with this hook anyway. + if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^" fi - fi - done + + # catch /python and /.python-wrapped + if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then + # dont wrap EGG-INFO scripts since they are called from python + if echo "$f" | grep -qv EGG-INFO/scripts; then + echo "wrapping \`$f'..." + patchPythonScript "$f" + # wrapProgram creates the executable shell script described + # above. The script will set PYTHONPATH and PATH variables.! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local -a wrap_args=("$f" + --prefix PATH ':' "$program_PATH") + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildPythonPackage. + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + wrapProgram "${wrapProgramArgs[@]}" + fi + fi + done + fi } # Adds the lib and bin directories to the PYTHONPATH and PATH variables, diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 72217a860b4d..245ff7b006fb 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.8"; + version = "6.9"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1l9z1a0r5zydr50cklx9xjw3l0pwnf64i10xq7112fl1r89q3qgv"; + sha256 = "1cd218ee2ba1dc683de858a866c6666eb72a11adee8d1df6cdd59c5c5a47b714"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 57051bb951fc..0d0cbbab2b52 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,33 +1,37 @@ -{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL +{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2 , libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib +, glib }: with pythonPackages; stdenv.mkDerivation { - name = "renpy-6.17.6"; + name = "renpy-6.99.12.4"; meta = { description = "Ren'Py Visual Novel Engine"; homepage = "http://renpy.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; + # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to + # build with the most recent pygame version, and fails to run with 1.9.1. + broken = true; }; src = fetchurl { - url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2"; - sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic"; + url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2"; + sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35"; }; buildInputs = [ python cython pkgconfig wrapPython - SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame + SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib ]; - pythonPath = [ pygame ]; + pythonPath = [ pygame_sdl2 ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ - SDL SDL.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib + SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib ]); buildPhase = '' @@ -39,12 +43,11 @@ stdenv.mkDerivation { cp -r renpy renpy.py $out/share/renpy python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module - wrapPythonPrograms makeWrapper ${python}/bin/python $out/bin/renpy \ - --set PYTHONPATH $program_PYTHONPATH \ + --set PYTHONPATH $PYTHONPATH \ --set RENPY_BASE $out/share/renpy \ --add-flags "-O $out/share/renpy/renpy.py" ''; - NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}"; + NIX_CFLAGS_COMPILE = "-I${pygame_sdl2}/include/${python.libPrefix}"; } diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 98be02da3b26..f3d4ae4bb00e 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -59,7 +59,7 @@ let srcs = [ rubySrc rubygemsSrc ]; sourceRoot = if useRailsExpress then - "ruby-${tag}-src" + rubySrc.name else unpackdir rubySrc; @@ -181,10 +181,10 @@ let in { ruby_2_0_0 = generic { - version = rubyVersion "2" "0" "0" "p647"; + version = rubyVersion "2" "0" "0" "p648"; sha256 = { - src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8"; - git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3"; + src = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446"; + git = "0ncjfq4hfqj9kcr8pbll6kypwnmcgs8w7l4466qqfyv7jj3yjd76"; }; }; @@ -196,27 +196,27 @@ in { }; }; - ruby_2_2_5 = generic { - version = rubyVersion "2" "2" "5" ""; + ruby_2_2_7 = generic { + version = rubyVersion "2" "2" "7" ""; sha256 = { - src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h"; - git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2"; + src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p"; + git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1"; }; }; - ruby_2_3_3 = generic { - version = rubyVersion "2" "3" "3" ""; + ruby_2_3_4 = generic { + version = rubyVersion "2" "3" "4" ""; sha256 = { - src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514"; - git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; + src = "1hy0zr4vwkqcjbykh2hp0d6ifkrhgskaxlzy6878sc9kr4bqzqcq"; + git = "0jjhgdjv3aayxb0flxjiny7xfzh3ggrqcpvgjv2ydm25padfbqmp"; }; }; - ruby_2_4_0 = generic { - version = rubyVersion "2" "4" "0" ""; + ruby_2_4_1 = generic { + version = rubyVersion "2" "4" "1" ""; sha256 = { - src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm"; - git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3"; + src = "0l0201fqwzwygnrgxay469gbb2w865bnqckq00x3prdmbh6y2c53"; + git = "1gjn31ymypzzcwkrjx62hqw59fywz1x3cyvmi1f2yb9bwb3659ss"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index f1b82210aec2..f6ecb7c8e285 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,24 +24,19 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.5" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.2.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.1" = ops useRailsExpress [ + "2.3.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.3" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.4.0" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.4.1" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; } diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix index 7ea52185d77b..7658c303a1e9 100644 --- a/pkgs/development/interpreters/ruby/rubygems-src.nix +++ b/pkgs/development/interpreters/ruby/rubygems-src.nix @@ -1,6 +1,6 @@ { fetchurl -, version ? "2.6.8" -, sha256 ? "1v6n6s8cq5l0xyf1fbm1w4752b9vdk3p130ar59ig72p9vqvkbl1" +, version ? "2.6.10" +, sha256 ? "364c0eee8e0c9e8ab4879c5035832e5a27f0c97292d2264af5ae0020585280f0" }: fetchurl { url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz"; diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 51db26b78236..c60d6e3728d0 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -1,8 +1,8 @@ { fetchFromGitHub }: fetchFromGitHub { - owner = "manveru"; + owner = "skaes"; repo = "rvm-patchsets"; - rev = "46e04f230ce91a786f5e583389443efec0ecd594"; - sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693"; + rev = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94"; + sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny"; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index f32cb9db02a8..f8c98c727f49 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig , libjack2, libsndfile, fftw, curl, gcc -, libXt, qt55, readline +, libXt, qtbase, qttools, qtwebkit, readline , useSCEL ? false, emacs }: @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { -DSC_EL=${if useSCEL then "ON" else "OFF"} ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; buildInputs = [ - gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ] + gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ] ++ optional useSCEL emacs; meta = { diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index d83b43ffd75a..b3c3e1732e0d 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { echo "\ tmpm2file://$out/m2*\ $out/m2/" >> $out/m2/settings.xml - ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml + ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${boolToString skipTests} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml cp ./target/*.jar $out/m2/${m2Path} cp -v ./target/*.jar $out/target/ ''; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 079c0a5cf6f7..ea72bfb434b8 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "CoinMP-${version}"; - version = "1.7.6"; + version = "1.8.3"; src = fetchurl { url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz"; - sha256 = "0gqi2vqkg35gazzzv8asnhihchnbjcd6bzjfzqhmj7wy1dw9iiw6"; + sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix new file mode 100644 index 000000000000..bfee99619840 --- /dev/null +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation { + name = "NSPlist-713decf"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "NSPlist"; + rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a"; + sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "Parses .plist files"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix new file mode 100644 index 000000000000..f7703b731b99 --- /dev/null +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: + +stdenv.mkDerivation { + name = "PlistCpp-11615d"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "PlistCpp"; + rev = "11615deab3369356a182dabbf5bae30574967264"; + sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; + }; + + buildInputs = [ cmake boost NSPlist pugixml ]; + + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "CPP bindings for Plist"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 8330dada4d35..e71ad14b11fd 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap , openglSupport ? false, mesa_noglu, mesa_glu , alsaSupport ? true, alsaLib -, x11Support ? true, libXext, libICE, libXrandr +, x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa +, hostPlatform, buildPlatform }: # OSS is no longer supported, for it's much crappier than ALSA and # PulseAudio. -assert (stdenv.isLinux && !(stdenv ? cross)) -> 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/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 0919970543c5..9fef76c799b9 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, smpeg, flac, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { name = "SDL2_mixer-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; }; - propagatedBuildInputs = [ SDL2 libogg libvorbis ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg flac ]; configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; platforms = platforms.linux; homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index d3d57947464b..fe64569abbe2 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; homepage = http://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix deleted file mode 100644 index 002b26078f53..000000000000 --- a/pkgs/development/libraries/accelio/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libibverbs, librdmacm, libevent - -# Linux only deps -, numactl, kernel ? null -}: - -stdenv.mkDerivation rec { - name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}"; - version = "1.5"; - - src = fetchFromGitHub { - owner = "accelio"; - repo = "accelio"; - rev = "v1.5"; - sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7"; - }; - - hardeningDisable = [ "format" "pic" ]; - - patches = [ ./fix-printfs.patch ]; - - postPatch = '' - # Don't build broken examples - sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac - - # Allow the installation of xio kernel headers - sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in - - # Don't install ldconfig entries - sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am - sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am - ''; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libevent ]; - propagatedBuildInputs = [ libibverbs librdmacm ] - ++ stdenv.lib.optional stdenv.isLinux numactl; - - configureFlags = [ - "--enable-rdma" - "--disable-raio-build" - ] ++ stdenv.lib.optionals (kernel != null) [ - "--enable-kernel-module" - "--with-kernel=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-kernel-build=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - INSTALL_MOD_PATH = "\${out}"; - - meta = with stdenv.lib; { - homepage = http://www.accelio.org/; - description = "High-performance messaging and RPC library"; - longDescription = '' - A high-performance asynchronous reliable messaging and RPC library - optimized for hardware acceleration. - ''; - license = licenses.bsd3; - platforms = with platforms; linux ++ freebsd; - maintainers = with maintainers; [ wkennington ]; - # kernel 4.2 is the most recent supported kernel - broken = kernel != null && - (builtins.compareVersions kernel.version "4.2" == 1 || - (kernel.features.grsecurity or false)); - }; -} diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch deleted file mode 100644 index 23b2f40e42fe..000000000000 --- a/pkgs/development/libraries/accelio/fix-printfs.patch +++ /dev/null @@ -1,615 +0,0 @@ -diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c ---- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:36:25.610337514 -0400 -+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:59:13.258697472 -0400 -@@ -246,7 +246,7 @@ static void *worker_thread(void *data) - } else { - vmsg_sglist_set_nents(&msg->out, 0); - } -- msg->user_context = (void *)get_cycles(); -+ msg->user_context = (void *)(intptr_t)get_cycles(); - /* send first message */ - if (xio_send_request(tdata->conn, msg) == -1) { - if (xio_errno() != EAGAIN) -@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio - { - struct thread_data *tdata = (struct thread_data *)cb_user_context; - -- cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context); -+ cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context); - - if (tdata->do_stat) { - if (rtt > tdata->stat.max_rtt) -@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio - msg->in.header.iov_len = 0; - vmsg_sglist_set_nents(&msg->in, 0); - -- msg->user_context = (void *)get_cycles(); -+ msg->user_context = (void *)(intptr_t)get_cycles(); - if (xio_send_request(tdata->conn, msg) == -1) { - if (xio_errno() != EAGAIN) - printf("**** [%p] Error - xio_send_request " \ -@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete - sess_data.min_lat_us, - sess_data.max_lat_us); - if (fd) -- fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n", -+ fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n", - data_len, - threads_iter, - sess_data.tps, -diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h ---- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:36:25.610337514 -0400 -+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:57:30.856215123 -0400 -@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb; - /* The format of the results */ - #define RESULT_FMT " #bytes #threads #TPS BW average[MBps] Latency average[usecs] Latency low[usecs] Latency peak[usecs]\n" - /* Result print format */ --#define REPORT_FMT " %-7lu %-2d %-9.2lu %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" -+#define REPORT_FMT " %-7" PRIu64 " %-2d %-9.2" PRIu64 " %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" - - - struct perf_parameters { -diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c ---- accelio/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:42:19.983984370 -0400 -@@ -224,7 +224,7 @@ static void process_response(struct sess - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message header : [%lu] - %s\n", -+ printf("message header : [%" PRIu64 "] - %s\n", - (rsp->request->sn + 1), str); - str[len] = tmp; - } -@@ -236,7 +236,7 @@ static void process_response(struct sess - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message data: [%lu][%d][%zd] - %s\n", -+ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", - (rsp->request->sn + 1), i, sglist[i].iov_len, str); - str[len] = tmp; - } -diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c ---- accelio/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:43:07.353204184 -0400 -@@ -203,7 +203,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message header : [%lu] - %s\n", -+ printf("message header : [%" PRIu64 "] - %s\n", - (req->sn + 1), str); - str[len] = tmp; - } -@@ -215,7 +215,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message data: [%lu][%d][%zd] - %s\n", -+ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", - (req->sn + 1), i, sglist[i].iov_len, str); - str[len] = tmp; - } -@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi - struct server_data *sdata = (struct server_data *)cb_user_context; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - } else { - xio_release_response(msg); -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - } - -diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c ---- accelio/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:36:25.612337524 -0400 -+++ accelio.new/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:43:32.748322028 -0400 -@@ -87,7 +87,7 @@ static void process_response(struct sess - { - if (++session_data->cnt == PRINT_COUNTER) { - ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; -- printf("message: [%lu] - %s\n", -+ printf("message: [%" PRIu64 "] - %s\n", - (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); - session_data->cnt = 0; - } -diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c ---- accelio/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:36:25.612337524 -0400 -+++ accelio.new/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:43:50.556404665 -0400 -@@ -82,7 +82,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message header : [%lu] - %s\n", -+ printf("message header : [%" PRIu64 "] - %s\n", - (req->sn + 1), str); - str[len] = tmp; - } -@@ -94,7 +94,7 @@ static void process_request(struct serve - len = 64; - tmp = str[len]; - str[len] = '\0'; -- printf("message data: [%lu][%d][%d] - %s\n", -+ printf("message data: [%" PRIu64 "][%d][%d] - %s\n", - (req->sn + 1), i, len, str); - str[len] = tmp; - } -diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c ---- accelio/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:41:13.493675827 -0400 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include "libxio.h" - -@@ -133,7 +134,7 @@ static void process_response(struct thre - { - if (++tdata->cnt == PRINT_COUNTER) { - ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; -- printf("thread [%d] - tid:%p - message: [%lu] - %s\n", -+ printf("thread [%d] - tid:%p - message: [%" PRIu64 "] - %s\n", - tdata->affinity, - (void *)pthread_self(), - (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); -diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c ---- accelio/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:36:25.611337519 -0400 -+++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:41:31.730760455 -0400 -@@ -104,7 +104,7 @@ static void process_request(struct threa - struct xio_msg *req) - { - if (++tdata->cnt == PRINT_COUNTER) { -- printf("thread [%d] tid:%p - message: [%lu] - %s\n", -+ printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n", - tdata->affinity, - (void *)pthread_self(), - (req->sn + 1), (char *)req->in.header.iov_base); -diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c ---- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 19:36:25.603337482 -0400 -+++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 20:00:15.169989095 -0400 -@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi - struct thread_data *tdata = conn_entry->tdata; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- DEBUG("**** [%p] message %lu failed. reason: %s\n", -+ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, req->sn, xio_strerror(error)); - } else { - xio_release_response(req); -- DEBUG("**** [%p] message %lu failed. reason: %s\n", -+ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, req->request->sn, xio_strerror(error)); - } - obj_pool_put(tdata->req_pool, req); -diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c ---- accelio/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:36:25.603337482 -0400 -+++ accelio.new/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:40:06.398364476 -0400 -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - - #define cpusmask_test_bit(nr, addr) (*(addr) & (1ULL << (nr))) - #define cpusmask_set_bit(nr, addr) (*(addr) |= (1ULL << (nr))) -@@ -244,7 +245,7 @@ int main(int argc, char *argv[]) - } - intf_cpusmask_str(cpusmask, cpusnum, cpus_str); - -- printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n", -+ printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n", - ifa->ifa_name, host, flags, numa_node, cpusmask, - "cpus", cpusnum, cpus_str); - } -diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c ---- accelio/src/tools/usr/xio_mem_usage.c 2015-09-03 19:36:25.603337482 -0400 -+++ accelio.new/src/tools/usr/xio_mem_usage.c 2015-09-03 19:38:57.596044838 -0400 -@@ -73,7 +73,7 @@ - while (i++ < 48) { \ - printf("."); \ - } \ -- printf(" %6lu\n", sizeof(type)); \ -+ printf(" %zu\n", sizeof(type)); \ - } - - int main(int argc, char **argv) -diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c ---- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:36:25.610337514 -0400 -+++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:56:25.521908028 -0400 -@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio - * this flag must be on */ - rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP; - -- rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr; -+ rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr; - rdma_test_buf.length = rdma_reg_mem.length; - rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp); - -diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c ---- accelio/tests/usr/hello_test/xio_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test/xio_client.c 2015-09-03 19:45:43.055926711 -0400 -@@ -181,13 +181,13 @@ static void process_response(struct test - - double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); - double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB); -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, txbw, rxbw, - test_params->stat.txlen, test_params->stat.rxlen); - get_time(timeb, 40); - -- printf("**** [%s] - message [%zd] %s - %s\n", -+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", - timeb, (rsp->request->sn + 1), - (char *)rsp->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s - - switch (event_data->event) { - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: -- printf("nsent:%lu, nrecv:%lu, " \ -- "delta:%lu\n", -+ printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \ -+ "delta:%" PRIu64 "\n", - test_params->nsent, test_params->nrecv, - test_params->nsent-test_params->nrecv); - -@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi - struct test_params *test_params = (struct test_params *)cb_user_context; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - } else { - xio_release_response(msg); -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - } - -diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c ---- accelio/tests/usr/hello_test/xio_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test/xio_server.c 2015-09-03 19:46:35.777171360 -0400 -@@ -112,7 +112,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s - break; - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: - if (event_data->reason != XIO_E_SESSION_REJECTED) { -- printf("last sent:%lu, last comp:%lu, " \ -- "delta:%lu\n", -+ printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \ -+ "delta:%" PRIu64 "\n", - test_params->nsent, test_params->ncomp, - test_params->nsent-test_params->ncomp); - test_params->connection = NULL; -@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi - { - struct test_params *test_params = (struct test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - - msg_pool_put(test_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c ---- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:49:10.164887785 -0400 -@@ -114,7 +114,7 @@ static void process_request(struct xio_m - if (++cnt == print_counter) { - struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); - -- printf("**** request [%lu] %s - %s\n", -+ printf("**** request [%" PRIu64 "] %s - %s\n", - (req->sn+1), - (char *)req->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -171,11 +171,11 @@ static void process_response(struct xio_ - double txbw = (1.0*pps*txlen/ONE_MB); - double rxbw = (1.0*pps*rxlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, txbw, rxbw, txlen, rxlen); - get_time(timeb, 40); -- printf("**** [%s] - response [%lu] %s - %s\n", -+ printf("**** [%s] - response [%" PRIu64 "] %s - %s\n", - timeb, (rsp->request->sn + 1), - (char *)rsp->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi - { - switch (msg->type) { - case XIO_MSG_TYPE_REQ: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - msg_pool_put(pool, msg); - switch (error) { -@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi - }; - break; - case XIO_MSG_TYPE_RSP: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - /* message is no longer needed */ - switch (error) { -diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c ---- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:49:52.860085909 -0400 -@@ -143,11 +143,11 @@ static void process_response(struct xio_ - double txbw = (1.0*pps*txlen/ONE_MB); - double rxbw = (1.0*pps*rxlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, txbw, rxbw, txlen, rxlen); - get_time(timeb, 40); -- printf("**** [%s] - response complete [%lu] %s - %s\n", -+ printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n", - timeb, (rsp->request->sn + 1), - (char *)rsp->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -171,7 +171,7 @@ static void process_request(struct xio_m - if (++cnt == print_counter) { - struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); - -- printf("**** request complete [%lu] %s - %s [%zd]\n", -+ printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n", - (req->sn+1), - (char *)req->in.header.iov_base, - (char *)sglist[0].iov_base, -@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi - { - switch (msg->type) { - case XIO_MSG_TYPE_REQ: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - msg_pool_put(pool, msg); - switch (error) { -@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi - }; - break; - case XIO_MSG_TYPE_RSP: -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - /* message is no longer needed */ - switch (error) { -diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c ---- accelio/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:50:51.111356220 -0400 -@@ -139,7 +139,7 @@ static void process_response(struct xio_ - double rxbw = (1.0*pps*rxlen/ONE_MB); - double lat = (1000000.0/pps); - -- printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", - pps, lat, txbw, rxbw, txlen, rxlen); - get_time(timeb, 40); -@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi - struct xio_msg *msg, - void *cb_user_context) - { -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(pool, msg); -diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c ---- accelio/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:51:16.803475442 -0400 -@@ -103,7 +103,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi - struct xio_msg *msg, - void *cb_user_context) - { -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(pool, msg); -diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c ---- accelio/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:47:39.218465755 -0400 -@@ -179,12 +179,12 @@ static void process_response(struct thre - double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB); - double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \ - "RX: %zd B\n", - pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen); - get_time(timeb, 40); -- printf("[%s] thread [%d] - tid:%p - message [%lu] " \ -+ printf("[%s] thread [%d] - tid:%p - message [%" PRIu64 "] " \ - "%s - %s\n", - timeb, - tdata->affinity, -@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi - struct thread_data *tdata = (struct thread_data *)cb_user_context; - - if (direction == XIO_MSG_DIRECTION_OUT) { -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - } else { - xio_release_response(msg); -- printf("**** [%p] message %lu failed. reason: %s\n", -+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - } - -diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c ---- accelio/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:36:25.608337505 -0400 -+++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:48:02.876575538 -0400 -@@ -171,7 +171,7 @@ static void process_request(struct threa - if (++tdata->stat.cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("thread [%d] - message [%lu] %s - %s\n", -+ printf("thread [%d] - message [%" PRIu64 "] %s - %s\n", - tdata->affinity, - (msg->sn+1), - (char *)msg->in.header.iov_base, -@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi - { - struct thread_data *tdata = (struct thread_data *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - - msg_pool_put(tdata->pool, msg); -diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c ---- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:54:18.142316932 -0400 -@@ -150,11 +150,11 @@ static void process_rx_message(struct ow - - double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "RX: %.2f MB/s, RX: %zd B\n", - pps, rxbw, ow_params->rx_stat.xlen); - get_time(timeb, 40); -- printf("**** [%s] - message [%lu] %s - %s\n", -+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", - timeb, (msg->sn + 1), - (char *)msg->in.header.iov_base, - (char *)(inents > 0 ? isglist[0].iov_base : NULL)); -@@ -202,11 +202,11 @@ static void process_tx_message(struct ow - - double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s,length: TX: %zd B\n", - pps, txbw, ow_params->tx_stat.xlen); - get_time(timeb, 40); -- printf("**** [%s] - message [%lu] %s - %s\n", -+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", - timeb, (msg->sn + 1), - (char *)msg->out.header.iov_base, - (char *)(onents > 0 ? osglist[0].iov_base : NULL)); -@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi - struct ow_test_params *ow_params = - (struct ow_test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(ow_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c ---- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:54:32.797384938 -0400 -@@ -112,7 +112,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi - struct ow_test_params *ow_params = - (struct ow_test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(ow_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c ---- accelio/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:52:24.905791466 -0400 -@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++) - - double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); - -- printf("transactions per second: %lu, bandwidth: " \ -+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ - "TX %.2f MB/s, length: TX: %zd B\n", - pps, txbw, - test_params->stat.txlen); -@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s - test_params->closed = 1; - break; - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: -- printf("nsent:%lu, ncomp:%lu, " \ -- "delta:%lu\n", -+ printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \ -+ "delta:%" PRIu64 "\n", - test_params->nsent, test_params->ncomp, - test_params->nsent-test_params->ncomp); - -@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi - { - struct test_params *test_params = (struct test_params *)cb_user_context; - -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->sn, xio_strerror(error)); - - msg_pool_put(test_params->pool, msg); -diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c ---- accelio/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:36:25.609337510 -0400 -+++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:52:57.947944796 -0400 -@@ -110,7 +110,7 @@ static void process_request(struct xio_m - if (++cnt == PRINT_COUNTER) { - struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); - -- printf("**** message [%lu] %s - %s\n", -+ printf("**** message [%" PRIu64 "] %s - %s\n", - (msg->sn+1), - (char *)msg->in.header.iov_base, - (char *)sglist[0].iov_base); -@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s - xio_disconnect(event_data->conn); - break; - case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: -- printf("last recv:%lu\n", -+ printf("last recv:%" PRIu64 "\n", - test_params->nrecv); - - xio_connection_destroy(event_data->conn); -@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi - struct xio_msg *msg, - void *cb_user_context) - { -- printf("**** [%p] message [%lu] failed. reason: %s\n", -+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", - session, msg->request->sn, xio_strerror(error)); - - return 0; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 4f74c5fca355..883d0d65aa53 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmakeHook }: +{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }: stdenv.mkDerivation rec { name = "accounts-qt-${version}"; @@ -12,12 +12,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libaccounts-glib qtbase ]; - nativeBuildInputs = [ doxygen pkgconfig qmakeHook ]; + nativeBuildInputs = [ doxygen pkgconfig qmake ]; preConfigure = '' qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake" ''; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = with stdenv.lib; { description = "Qt library for accessing the online accounts database"; homepage = "http://code.google.com/p/accounts-sso/"; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 1a49913727d8..d1b3b9b98271 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,15 +3,16 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.43"; + version = "0.6.45"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd"; + sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv"; }; - buildInputs = [ pkgconfig glib intltool libtool makeWrapper - gobjectIntrospection polkit systemd ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ glib intltool libtool gobjectIntrospection polkit systemd ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--localstatedir=/var" ]; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 10ba217175c3..42988e334b07 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl -}: +{ stdenv, fetchurl, pkgconfig, libtool, perl }: stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.3.3"; + version = "6.4.3"; + src = fetchurl { - url=http://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2; - sha256 = "124qk205v8rx8p7rfigsargrpxjx3mh4nr99nlyk9csdc9gy8qpk"; + url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; + sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; }; enableParallelBuilding = true; - buildInputs = [ pkgconfig libtool perl ]; + nativeBuildInputs = [ pkgconfig libtool ]; + buildInputs = [ perl ]; patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ --replace /usr/bin/perl "${perl}/bin/perl"''; @@ -25,12 +26,11 @@ stdenv.mkDerivation rec { > include/makeinclude/platform_macros.GNU ''; -meta = { + meta = with stdenv.lib; { description = "ADAPTIVE Communication Environment"; homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html; - license = stdenv.lib.licenses.doc; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = licenses.doc; + platforms = platforms.linux; + maintainers = [ maintainers.nico202 ]; }; } - diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 302d63aa7596..d2b605c4f19c 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,24 +1,32 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext, intltool +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, intltool , xmlto, docbook_xsl, docbook_xml_dtd_45 , glib, xapian, libxml2, libyaml, gobjectIntrospection +, pcre, itstool }: -stdenv.mkDerivation { - name = "appstream-0.9.5"; +stdenv.mkDerivation rec { + name = "appstream-${version}"; + version = "0.10.6"; - src = fetchurl { - url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz"; - sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr"; + src = fetchFromGitHub { + owner = "ximion"; + repo = "appstream"; + rev = "APPSTREAM_0_10_6"; + sha256 = "1fg7zxx2qhkyj7fmcpwbf80b72d16kyi8dadi111kf00sgzfbiyy"; }; nativeBuildInputs = [ cmake pkgconfig gettext intltool xmlto docbook_xsl docbook_xml_dtd_45 - gobjectIntrospection + gobjectIntrospection itstool ]; - buildInputs = [ glib xapian libxml2 libyaml ]; + buildInputs = [ pcre glib xapian libxml2 libyaml ]; + cmakeFlags = '' + -DSTEMMING=off + ''; + meta = with stdenv.lib; { description = "Software metadata handling library"; homepage = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/"; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1829b3306ebc..3251693f5742 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 329cd77ad267..9abf48289ae0 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/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 277886d717ac..4433a3df45d4 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; hydraPlatforms = []; license = licenses.gpl2Plus; - maintainers = with maintainers; [ goibhniu urkud ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix new file mode 100755 index 000000000000..8adbef8f5764 --- /dev/null +++ b/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix @@ -0,0 +1,65 @@ +{stdenv, fetchurl, arm-frc-linux-gnueabi-linux-api-headers}: + +let + _target = "arm-frc-linux-gnueabi"; + _basever = "2.21-r0.83"; + srcs = [ + (fetchurl { + url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6_${_basever}_cortexa9-vfpv3.ipk"; + sha256 = "117058215440e258027bb9ff18db63c078d55288787dbedfcd5730c06c7a1ae9"; + }) + (fetchurl { + url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-dev_${_basever}_cortexa9-vfpv3.ipk"; + sha256 = "e28b05d498c1160949f51539270035e12c5bb9d75d68df1f5f111a8fc087f3a6"; + }) + (fetchurl { + url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libcidn1_${_basever}_cortexa9-vfpv3.ipk"; + sha256 = "0f7372590abf69da54a9b7db8f944cf6c48d9ac8a091218ee60f84fdd9de2398"; + }) + (fetchurl { + url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${_basever}_cortexa9-vfpv3.ipk"; + sha256 = "5a839498507a0b63165cb7a78234d7eb2ee2bb6a046bff586090f2e70e0e2bfb"; + }) + (fetchurl { + url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${_basever}_cortexa9-vfpv3.ipk"; + sha256 = "d765d43c8ec95a4c64fa38eddf8cee848fd090d9cc5b9fcda6d2c9b03d2635c5"; + }) + ]; +in +stdenv.mkDerivation rec { + version = "2.21"; + name = "${_target}-eglibc-${version}"; + + sourceRoot = "."; + inherit srcs; + + phases = [ "unpackPhase" "installPhase" ]; + + unpackCmd = '' + ar x $curSrc + tar xf data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/${_target} + rm -rf lib/eglibc + find . \( -name .install -o -name ..install.cmd \) -delete + cp -r lib $out/${_target} + cp -r usr $out/${_target} + + cp -r ${arm-frc-linux-gnueabi-linux-api-headers}/* $out + ''; + + meta = { + description = "FRC standard C lib"; + longDescription = '' + eglibc library for the NI RoboRio to be used in compiling frc user + programs. + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.colescott ]; + platforms = stdenv.lib.platforms.linux; + + priority = 2; + }; +} diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix new file mode 100755 index 000000000000..29e349e0a820 --- /dev/null +++ b/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl}: + +let + _target = "arm-frc-linux-gnueabi"; + _basever = "3.19-r0.36"; + src = fetchurl { + url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/linux-libc-headers-dev_${_basever}_cortexa9-vfpv3.ipk"; + sha256 = "10066ddb9a19bf764a9a67919a7976478041e98c44c19308f076c78ecb07408c"; + }; +in +stdenv.mkDerivation rec { + version = "3.19"; + name = "${_target}-linux-api-headers-${version}"; + + sourceRoot = "."; + inherit src; + + phases = [ "unpackPhase" "installPhase" ]; + + unpackCmd = '' + ar x $curSrc + tar xf data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/${_target} + find . \( -name .install -o -name ..install.cmd \) -delete + cp -r usr/ $out/${_target} + ''; + + meta = { + description = "FRC linux api headers"; + longDescription = '' + All linux api headers required to compile the arm-frc-linux-gnuaebi-gcc + cross compiler and all user programs. + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.colescott ]; + platforms = stdenv.lib.platforms.linux; + + priority = 1; + }; +} diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 7f173b211565..514c73f5e0fc 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,24 +1,30 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.700.0"; + version = "7.800.1"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr"; + sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs"; }; - buildInputs = [ cmake openblasCompat superlu hdf5 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openblasCompat superlu hdf5 ]; - cmakeFlags = [ "-DDETECT_HDF5=ON" ]; + cmakeFlags = let + libSuff = if stdenv.isDarwin then "dylib" else "so"; + in [ + "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas.${libSuff}" + "-DDETECT_HDF5=ON" + ]; patches = [ ./use-unix-config-on-OS-X.patch ]; - + meta = with stdenv.lib; { description = "C++ linear algebra library"; homepage = http://arma.sourceforge.net; - license = licenses.mpl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; }; diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 76ef5ff1d98e..dae8657388f7 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 000000000000..eb96070f4fd7 --- /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/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 5af340bef07a..e69bbe0d2f2b 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -23,12 +23,27 @@ stdenv.mkDerivation rec { ); ''; - # Note: Users should define the `ASPELL_CONF' environment variable to - # `data-dir $HOME/.nix-profile/lib/aspell/' so that they can access - # dictionaries installed in their profile. - # - # We can't use `$out/etc/aspell.conf' for that purpose since Aspell - # doesn't expand environment variables such as `$HOME'. + postInstall = '' + local prog="$out/bin/aspell" + local hidden="$out/bin/.aspell-wrapped" + mv "$prog" "$hidden" + cat > "$prog" < mesa_noglu != null; -with { inherit (stdenv.lib) optional optionals; }; +let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "cairo-1.14.8"; + name = "cairo-1.14.10"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e"; - }; - - infinality = fetchFromGitHub { - owner = "bohoomil"; - repo = "fontconfig-ultimate"; - rev = "730f5e77580677e86522c1f2119aa78803741759"; - sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7"; + sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"; }; patches = [ @@ -35,10 +28,6 @@ stdenv.mkDerivation rec { }) ]; - prePatch = '' - patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" - ''; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 839d48e488f0..fd2271844ac2 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capnproto-${version}"; - version = "0.5.3"; + version = "0.6.0"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd"; + sha256 = "0gpp1cxsb9nfd7qkjjykzknx03y0z0n4bq5q0fmxci7w38ci22g5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 021512a40e70..1c55aa7f8347 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,18 +1,17 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch-${version}"; - version = "1.7.0"; + version = "1.9.6"; src = fetchFromGitHub { owner = "philsquared"; repo = "Catch"; - rev = "v." + version; - sha256 = "0harki6irc4mqipjc24zyy0jimidr5ng3ss29bnpzbbwhrnkyrgm"; + rev = "v${version}"; + sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DUSE_CPP14=ON" ]; doCheck = true; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 614d57002cd2..a97ca5cc6980 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, ncurses }: -let - version = "5.0-20160131"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "cdk-${version}"; - inherit version; + version ="5.0-20161210"; buildInputs = [ ncurses @@ -13,13 +10,13 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz"; - sha256 = "08ic2f5rmi8niaxwxwr6l6lhpan7690x52vpldnbjcf20rc0fbf3"; + sha256 = "1bazwcwz4qhxyc8jaahdd2nlm30f5dhy0f6cnix5rjjhi35mhxcy"; }; - meta = { + meta = with stdenv.lib; { description = "Curses development kit"; - license = stdenv.lib.licenses.bsdOriginal ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsdOriginal ; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 7cd848e602aa..673fb77f01aa 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -10,18 +10,17 @@ # google-gflags is required to run tests assert runTests -> google-gflags != null; -let - version = "1.10.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ceres-solver-${version}"; + version = "1.12.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; + sha256 = "15f8mwhcy9f5qggcc9dqwl5y687ykvmlidr686aqdq0ia7azwnvl"; }; - buildInputs = [ cmake glog ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; inherit eigen; @@ -38,8 +37,7 @@ stdenv.mkDerivation { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; homepage = "http://ceres-solver.org"; - maintainers = with stdenv.lib.maintainers; [ giogadi ]; - inherit version; - platforms = with stdenv.lib.platforms; unix; + maintainers = with maintainers; [ giogadi ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index a3d1a46e818c..d49bd7eac1bc 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,24 +1,21 @@ { fetchurl, stdenv }: -stdenv.mkDerivation { - name = "cfitsio-3.21"; + stdenv.mkDerivation { + name = "cfitsio-3.41"; src = fetchurl { - url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz; - sha256 = "1ffr3p5dy2b1vj9j4li5zf22naavi9wcxsvqy236fc0ykfyip96i"; + url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz"; + sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5"; }; # Shared-only build buildFlags = "shared"; - patchPhase = - '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in + patchPhase = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = { + meta = with stdenv.lib; { homepage = http://heasarc.gsfc.nasa.gov/fitsio/; - description = "Library for reading and writing FITS data files"; - longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data @@ -28,9 +25,8 @@ stdenv.mkDerivation { advanced features for manipulating and filtering the information in FITS files. ''; - # Permissive BSD-style license. license = "permissive"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 52990097a230..2c50d8138057 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -5,15 +5,16 @@ stdenv.mkDerivation rec { name = "chipmunk-${version}"; majorVersion = "7"; - version = "${majorVersion}.0.0"; + version = "${majorVersion}.0.1"; src = fetchurl { url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql"; + sha256 = "0q4jwv1icz8spcjkp0v3bnygi6hq2zmnsgcxkwm8i2bxfxjb8m7y"; }; + nativeBuildInputs = [ cmake ]; buildInputs = - [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index e572db68e838..fbefee48d5b2 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "chmlib-0.40"; - + src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jedrea.com/chmlib; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl2; description = "A library for dealing with Microsoft ITSS/CHM format files"; - platforms = stdenv.lib.platforms.unix; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 7c3c776e81b0..09c5eeb611ba 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "chromaprint-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; - sha256 = "10dm9cfqb77g12pyjnqaw80860kzdcvskni02ll7afpywq8s15cg"; + sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh deleted file mode 100644 index 6473395493c3..000000000000 --- a/pkgs/development/libraries/cimg/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ - -source $stdenv/setup - -unpackPhase -cd $sourceRoot - -install -dm 755 $out/include/cimg $doc/share/doc/cimg/html $doc/share/cimg/examples $doc/share/cimg/plugins - -install -m 644 CImg.h $out/include/cimg -cp -dr --no-preserve=ownership examples/* $doc/share/cimg/examples/ -cp -dr --no-preserve=ownership plugins/* $doc/share/cimg/plugins/ diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 722852f12700..c294647b35de 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchurl -, unzip }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "1.7.0"; + version = "1.7.9"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj"; + sha256 = "07g81jn25y2wksg9ycf9a7f5bfpcdl3xbrkp1xy3czl043a00y7s"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; - builder = ./builder.sh; + installPhase = '' + install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples + + install -m 644 CImg.h $out/include/ + cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ + cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ + cp README.txt $doc/share/doc/cimg/ + ''; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 1fa45992aeee..b26327dd7754 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.3"; name = "cl-${version}"; - src = fetchurl { - url = "https://github.com/tonyrog/cl/archive/${name}.tar.gz"; - sha256 = "03jv280h9gqqqkm0mmkjr53srd2mzhvyy1biss77wpjrzq2z12c8"; + src = fetchFromGitHub { + owner = "tonyrog"; + repo = "cl"; + rev = "cl-${version}"; + sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03"; }; buildInputs = [ erlang rebar opencl-headers ocl-icd ]; - #propagatedBuildInputs = [ SDL mesa ]; - + buildPhase = '' - sed 's/git/"${version}"/' -i src/cl.app.src rebar compile ''; @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { cp -ruv c_src doc ebin include priv src $DIR ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/tonyrog/cl; description = "OpenCL binding for Erlang"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index c6523921fb56..9d7c9c4f30f8 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "C/C++ library for numbers, a part of GiNaC"; homepage = http://www.ginac.de/CLN/; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = with stdenv.lib.platforms; allBut cygwin; }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index ef2ac6f93853..39296f86d8e1 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Clutter-GTK"; homepage = http://www.clutter-project.org/; license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; + maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index fc80b0ec2b29..a0479d9d73c3 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection +gobjectIntrospection, gtk3 }: let @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"; }; + buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; + maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 303a6ccaeb88..5fdd1edfd972 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.23.0"; + version = "0.27.1"; name = "cmark-${version}"; - src = fetchurl { - url = "https://github.com/jgm/cmark/archive/${version}.tar.gz"; - sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596"; + src = fetchFromGitHub { + owner = "jgm"; + repo = "cmark"; + rev = version; + sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; + doCheck = true; + checkPhase = '' + export LD_LIBRARY_PATH=$(readlink -f ./src) + CTEST_OUTPUT_ON_FAILURE=1 make test + ''; - meta = { + meta = with stdenv.lib; { description = "CommonMark parsing and rendering library and program in C"; homepage = https://github.com/jgm/cmark; - maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.michelk ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 3fad256e5728..29ce216cadf1 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,22 +2,23 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.5"; + version = "0.6.0"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "0mh3z8ibiwidc6qvrv8bx9slgcycxwy06kfngfzfza6nihrymzl9"; + sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; }; + + #Deleting this line causes "Unknown option --disable-static" + configurePhase = "./configure --prefix=$out"; enableParallelBuilding = true; - configurePhase = "./configure --prefix=$out"; - - meta = { + meta = with stdenv.lib; { description = "A library of safe, high-performance concurrent data structures"; - homepage = "http://concurrencykit.org"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = http://concurrencykit.org; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 90c27083d770..6014c9f4eafe 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { - sha256 = "1abalk0sjfg4yfz148hdknsbnl2xwjb8li7lqc64d07ifxhcqr87"; + sha256 = "0fc5468458mz572nbp45x5sblp6dsb4d1b6jqv77zf3mx5xyziz7"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix new file mode 100644 index 000000000000..74619cbaaaed --- /dev/null +++ b/pkgs/development/libraries/cre2/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, + libtool, pkgconfig, re2, texinfo }: + +stdenv.mkDerivation rec { + name = "cre2-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "marcomaggi"; + repo = "cre2"; + rev = version; + sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj"; + }; + + nativeBuildInputs = [ + autoreconfHook + libtool + pkgconfig + ]; + buildInputs = [ re2 texinfo ]; + + NIX_LDFLAGS="-lre2 -lpthread"; + + configureFlags = [ + "--enable-maintainer-mode" + ]; + + meta = with stdenv.lib; { + homepage = http://marcomaggi.github.io/docs/cre2.html; + description = "C Wrapper for RE2"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 905121286c81..bb1d4458f50c 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A high performance templating engine"; homepage = http://ctpp.havoc.ru; - maintiainers = with stdenv.lib.maintainers; [ robbinch ]; + maintainers = with stdenv.lib.maintainers; [ robbinch ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 546259cd70cf..9baa9aba480d 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, cmake, curl }: -stdenv.mkDerivation { - name = "curlcpp-20160901"; +stdenv.mkDerivation rec { + name = "curlcpp-${version}"; + version = "1.0"; src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; - rev = "98286da1d6c9f6158344a8e272eae5030cbf6c0e"; - sha256 = "00nm2b8ik1yvaz5dp1b61jid841jv6zf8k5ma2nxbf1di1apqh0d"; + rev = "${version}"; + sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q"; }; buildInputs = [ cmake curl ]; @@ -15,9 +16,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://josephp91.github.io/curlcpp/"; description = "Object oriented C++ wrapper for CURL"; - platforms = platforms.unix ; + platforms = platforms.unix; license = licenses.mit; - maintainers = [ maintainers.juliendehos ]; + maintainers = with maintainers; [ juliendehos rszibele ]; }; } diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 05eb575547d2..3d6d1c22605b 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,9 +1,9 @@ -{ 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 { name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}"; - version = "2.5.10"; + version = "2.1.26"; src = fetchurl { url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz"; @@ -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 000000000000..f897e3744af1 --- /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/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index df983ff3471c..4d27552d7351 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://dbus.freedesktop.org; license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 6f7a845b809f..f569f53861dc 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.16"; - sha256 = "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57"; + version = "1.10.18"; + sha256 = "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl index bc73369af944..9544aa13db56 100644 --- a/pkgs/development/libraries/dbus/make-session-conf.xsl +++ b/pkgs/development/libraries/dbus/make-session-conf.xsl @@ -18,7 +18,8 @@ - + + /share/dbus-1/services diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix deleted file mode 100644 index 43c8d18eb886..000000000000 --- a/pkgs/development/libraries/despotify/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - stdenv, fetchsvn, openssl, zlib, libvorbis, libpulseaudio, gstreamer, libao, - libtool, ncurses, glibc -}: - -stdenv.mkDerivation rec { - - name = "despotify-svn521"; - - src = fetchsvn { - url = "http://svn.code.sf.net/p/despotify/code"; - rev = "521"; - sha256 = "1vc453bv5ngkvaqkq7z5bj6x28m4kik59153jikcfah3k4qmxw21"; - }; - - buildInputs = [ - openssl zlib libvorbis libpulseaudio gstreamer libao libtool ncurses glibc - ]; - - configurePhase = "cd src"; - - installPhase = "make LDCONFIG=true INSTALL_PREFIX=$out install"; - - meta = { - description = "Open source Spotify client and library"; - longDescription = '' - despotify is a open source implementation of the Spotify API. This - package provides both a library and a few already quite useful, - proof-of-concept clients. - ''; - homepage = "http://despotify.se"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 8a24445dcca7..fe4e7907c9fe 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,45 +1,25 @@ -{ stdenv, fetchurl, cmake, xlibsWrapper }: +{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }: stdenv.mkDerivation rec { - version = "18.10"; + version = "19.4"; name = "dlib-${version}"; - src = fetchurl { - url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2"; - sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7"; + src = fetchFromGitHub { + owner = "davisking"; + repo = "dlib"; + rev ="v${version}"; + sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4"; }; - # The supplied CMakeLists.txt does not have any install targets. - sources_var = "\$\{sources\}"; - headers_var = "\$\{hearders\}"; - preConfigure = '' - cat << EOF > CMakeLists.txt - cmake_minimum_required(VERSION 2.6 FATAL_ERROR) - project(dlib) - - include_directories(./) - - file(GLOB sources ./dlib/all/*.cpp) - file(GLOB headers ./dlib/*.h) - - SET(LIBRARY_OUTPUT_PATH ".") - add_library(dlib "SHARED" dlib/all/source.cpp ${sources_var} ${headers_var}) - - install(TARGETS dlib DESTINATION lib) - install(DIRECTORY dlib/ DESTINATION include/dlib FILES_MATCHING PATTERN "*.h") - EOF - ''; - enableParallelBuilding = true; - buildInputs = [ cmake xlibsWrapper ]; - propagatedBuildInputs = [ xlibsWrapper ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; homepage = http://www.dlib.net; - license = stdenv.lib.licenses.boost; + license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix new file mode 100644 index 000000000000..83466b693f59 --- /dev/null +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, python }: + +stdenv.mkDerivation rec { + version = "0.6.2"; + name = "docopt.cpp-${version}"; + + src = fetchFromGitHub { + owner = "docopt"; + repo = "docopt.cpp"; + rev = "v${version}"; + sha256 = "1rgkc8nsc2zz2lkyai0y68vrd6i6kbq63hm3vdza7ab6ghq0n1dd"; + }; + + nativeBuildInputs = [ cmake python ]; + + cmakeFlags = ["-DWITH_TESTS=ON"]; + + doCheck = true; + + checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests"; + + meta = with stdenv.lib; { + description = "C++11 port of docopt"; + homepage = https://github.com/docopt/docopt.cpp; + license = with licenses; [ mit boost ]; + platforms = platforms.all; + maintainers = with maintainers; [ knedlsepp ]; + }; +} + diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 809037bb5edf..7ec72afc2bff 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "drumstick-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; - sha256 = "0l47gy9yywrc860db5g3wdqg8yc8qdb2lqq6wvw1dfim5j0vbail"; + sha256 = "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df"; }; outputs = [ "out" "dev" "man" ]; @@ -28,8 +28,14 @@ stdenv.mkDerivation rec { done ''; + #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket + postInstall = '' + rm $out/bin/drumstick-vpiano + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - alsaLib cmake doxygen fluidsynth pkgconfig qt5.qtbase qt5.qtsvg + alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg ]; meta = with stdenv.lib; { @@ -37,6 +43,6 @@ stdenv.mkDerivation rec { description = "MIDI libraries for Qt5/C++"; homepage = http://drumstick.sourceforge.net/; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix new file mode 100644 index 000000000000..2ba97af133ed --- /dev/null +++ b/pkgs/development/libraries/eccodes/default.nix @@ -0,0 +1,52 @@ +{ fetchurl, stdenv +, cmake, netcdf, openjpeg, libpng, gfortran +, enablePython ? false, pythonPackages +, enablePosixThreads ? false +, enableOpenMPThreads ? false}: +with stdenv.lib; +stdenv.mkDerivation rec { + name = "eccodes-${version}"; + version = "2.2.0"; + + src = fetchurl { + url = https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-2.2.0-Source.tar.gz; + sha256 = "1hzl0akjfxphqivnaj2kg131w8ki80ba3872h0a45f4pchci4h8s"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ netcdf + openjpeg + libpng + gfortran + ]; + propagatedBuildInputs = optionals enablePython [ + pythonPackages.python + pythonPackages.numpy + ]; + + cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}" + "-DENABLE_PNG=ON" + "-DENABLE_ECCODES_THREADS=${if enablePosixThreads then "ON" else "OFF"}" + "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + # Only do tests that don't require downloading 120MB of testdata + checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) '' + substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" + '' + '' + ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV + ''; + + meta = { + homepage = "https://software.ecmwf.int/wiki/display/ECC/"; + license = licenses.asl20; + maintainers = with maintainers; [ knedlsepp ]; + platforms = platforms.unix; + description = "ECMWF library for reading and writing GRIB, BUFR and GTS abbreviated header"; + }; +} diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 04e7b5e38cbe..8841855a24ed 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; - maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + maintainers = with stdenv.lib.maintainers; [ sander raskin ]; branch = "2"; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index b4cb1029001e..582b4fed9df9 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + maintainers = with stdenv.lib.maintainers; [ sander raskin ]; inherit version; }; } diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index c38759e0c757..5869276a7977 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; postInstall = '' - sed -e '/Cflags:/s@''${prefix}@@' -i "$out"/share/pkgconfig/eigen3.pc + sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc ''; meta = with stdenv.lib; { @@ -23,7 +23,7 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + maintainers = with stdenv.lib.maintainers; [ sander raskin ]; inherit version; }; } diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix deleted file mode 100644 index ff40a110a33e..000000000000 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libp11, pkgconfig, openssl}: - -stdenv.mkDerivation rec { - name = "engine_pkcs11-0.1.8"; - - src = fetchurl { - urls = [ - "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz" - "http://www.openadk.org/distfiles/${name}.tar.gz" - ]; - sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy"; - }; - - buildInputs = [ libp11 pkgconfig openssl ]; - - meta = { - homepage = http://www.opensc-project.org/engine_pkcs11/; - license = stdenv.lib.licenses.bsdOriginal; - description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; - }; -} diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index e7a3bd495132..ed6728482aa3 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, expat, zlib, boost }: +{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.2.2"; + name = "exempi-2.4.2"; src = fetchurl { url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; - sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf"; + sha256 = "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av"; }; configureFlags = [ "--with-boost=${boost.dev}" ]; - buildInputs = [ expat zlib boost ]; + buildInputs = [ expat zlib boost ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; meta = with stdenv.lib; { homepage = http://libopenraw.freedesktop.org/wiki/Exempi/; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a11be14df109..a1a07b43197f 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/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 9cf49b3c2c09..a5dba0c94f12 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,18 +1,20 @@ {stdenv, fetchurl, libosip, openssl, pkgconfig }: stdenv.mkDerivation rec { - version = "4.0.0"; - src = fetchurl { + name = "libexosip2-${version}"; + version = "4.1.0"; + + src = fetchurl { url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; - sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj"; + sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; }; - name = "libexosip2-${version}"; - + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libosip openssl pkgconfig ]; - meta = { - license = stdenv.lib.licenses.gpl2Plus; + meta = with stdenv.lib; { + license = licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; - platforms = stdenv.lib.platforms.linux; + platforms =platforms.linux; }; } diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 1001afff0d48..205faa845fee 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.0"; + name = "expat-2.2.2"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr"; + sha256 = "0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = "patchShebangs ./run.sh"; + meta = with stdenv.lib; { homepage = http://www.libexpat.org/; description = "A stream-oriented XML parser library written in C"; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index d14de1938b98..3f309f06630b 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "farbfeld-${version}"; - version = "2"; + version = "3"; src = fetchgit { url = "http://git.suckless.org/farbfeld"; rev = "refs/tags/${version}"; - sha256 = "1rj6pqn50v6r7l3j7m872fgynxsh22zx863jg0jzmb4x6wx2m2qv"; + sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl"; }; buildInputs = [ libpng libjpeg ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Suckless image format with conversion tools"; - license = licenses.mit; + license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 260a424038f2..034738813395 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/Farstream; description = "Audio/Video Communications Framework formely known as farsight"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index ac785d65c4ee..c4332df5a3db 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchgit, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake, boost }: stdenv.mkDerivation rec { - name = "fcppt-1.3.0"; + name = "fcppt-${version}"; + version = "2.5.0"; - src = fetchgit { - url = https://github.com/freundlich/fcppt.git; - rev = "7787733afc7a6278c0de8c0435b3d312e0c0c851"; - sha256 = "1vy6nhk6nymbp4yihvw75qn67q9fgmfc518f8dn3h2pq2gfjqrpy"; + src = fetchFromGitHub { + owner = "freundlich"; + repo = "fcppt"; + rev = version; + sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi"; }; - buildInputs = [ cmake boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Freundlich's C++ toolkit"; longDescription = '' Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on @@ -25,8 +28,8 @@ stdenv.mkDerivation rec { C++11). ''; homepage = http://fcppt.org; - license = stdenv.lib.licenses.boost; - maintainers = with stdenv.lib.maintainers; [ pmiddend ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.boost; + maintainers = with maintainers; [ pmiddend ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 47fcd76240b2..6246026e9ea7 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) */ @@ -14,10 +15,10 @@ , swscaleAlphaBuild ? true # Alpha channel support in swscale , hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation , safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders -, memalignHackBuild ? false # Emulate memalign , multithreadBuild ? true # Multithreading via pthreads/win32 threads , networkBuild ? true # Network support , pixelutilsBuild ? true # Pixel utils in libavutil +, enableLto ? false # build with link-time optimization /* * Program options */ @@ -110,7 +111,7 @@ #, libquvi ? null # Quvi input support , samba ? null # Samba protocol #, schroedinger ? null # Dirac de/encoder -, SDL ? null +, SDL2 ? null #, shine ? null # Fixed-point MP3 encoder , soxr ? null # Resampling via soxr , speex ? null # Speex de/encoder @@ -120,7 +121,6 @@ #, vo-aacenc ? null # AAC encoder #, vo-amrwbenc ? null # AMR-WB encoder , wavpack ? null # Wavpack encoder -, x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy) , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder , xavs ? null # AVS encoder @@ -199,7 +199,7 @@ assert ffplayProgram -> avcodecLibrary && avformatLibrary && swscaleLibrary && swresampleLibrary - && SDL != null; + && SDL2 != null; assert ffprobeProgram -> avcodecLibrary && avformatLibrary; assert ffserverProgram -> avformatLibrary; /* @@ -227,16 +227,15 @@ assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; assert openglExtlib -> mesa != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; -assert x11grabExtlib -> libX11 != null && libXv != null; assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.2.4"; + version = "3.3.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0ymg1mkg1n0770gmjfqp79p5ijxq04smfrsrrxc8pjc0y0agyf3f"; + sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r"; }; patchPhase = ''patchShebangs . @@ -260,11 +259,11 @@ stdenv.mkDerivation rec { (if stdenv.cc.isClang then "--cc=clang" else null) (enableFeature smallBuild "small") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") + (enableFeature enableLto "lto") (enableFeature grayBuild "gray") (enableFeature swscaleAlphaBuild "swscale-alpha") (enableFeature hardcodedTablesBuild "hardcoded-tables") (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") - (enableFeature memalignHackBuild "memalign-hack") (if multithreadBuild then ( if isCygwin then "--disable-pthreads --enable-w32threads" @@ -368,7 +367,7 @@ stdenv.mkDerivation rec { #(enableFeature (schroedinger != null) "libschroedinger") #(enableFeature (shine != null) "libshine") (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") - (enableFeature (SDL != null) "sdl") # Only configurable since 2.5, auto detected before then + (enableFeature (SDL2 != null) "sdl2") (enableFeature (soxr != null) "libsoxr") (enableFeature (speex != null) "libspeex") #(enableFeature (twolame != null) "libtwolame") @@ -377,7 +376,6 @@ stdenv.mkDerivation rec { #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") #(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") (enableFeature (wavpack != null) "libwavpack") - (enableFeature (x11grabExtlib && gplLicensing) "x11grab") (enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x265 != null && gplLicensing) "libx265") (enableFeature (xavs != null && gplLicensing) "libxavs") @@ -400,10 +398,9 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump - samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib + libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump + samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa - ++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] @@ -432,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/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix deleted file mode 100644 index 8e79d1ad0e11..000000000000 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, callPackage -# Darwin frameworks -, Cocoa, CoreMedia -, ... -}@args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.7"; - branch = "3.1"; - sha256 = "0ldf484r3waslv0sjx3vcwlkfgh28bd1wqcj26snfhav7zkf10kl"; - darwinFrameworks = [ Cocoa CoreMedia ]; - patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; -}) diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix deleted file mode 100644 index 17ed6fb0e4ba..000000000000 --- a/pkgs/development/libraries/ffmpeg/3.2.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, callPackage -# Darwin frameworks -, Cocoa, CoreMedia -, ... -}@args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.4"; - branch = "3.2"; - sha256 = "194n8hwmz2rpgh2rz8bc3mnxjyj3jh090mqp7k76msg9la9kbyn0"; - darwinFrameworks = [ Cocoa CoreMedia ]; - patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; -}) diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix new file mode 100644 index 000000000000..342137553135 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage +# Darwin frameworks +, Cocoa, CoreMedia +, ... +}@args: + +callPackage ./generic.nix (args // rec { + version = "${branch}"; + branch = "3.3.2"; + sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91"; + darwinFrameworks = [ Cocoa CoreMedia ]; +}) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 0ac82f98a24b..a34b378552a0 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,11 +2,12 @@ , 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 , multithreadBuild ? true # Multithreading via pthreads/win32 threads -, sdlSupport ? !stdenv.isArm, SDL ? null +, sdlSupport ? !stdenv.isArm, SDL ? null, SDL2 ? null , vdpauSupport ? !stdenv.isArm, libvdpau ? null # Developer options , debugDeveloper ? false @@ -55,6 +56,8 @@ let # Disable dependency that needs fixes before it will work on Darwin or Arm disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg; + + vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); in assert openglSupport -> mesa != null; @@ -121,14 +124,14 @@ stdenv.mkDerivation rec { "--enable-libmp3lame" (ifMinVer "1.2" "--enable-iconv") "--enable-libtheora" - (ifMinVer "0.6" (enableFeature (isLinux || isFreeBSD) "vaapi")) + (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) "--enable-vdpau" "--enable-libvorbis" (disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx") (ifMinVer "2.4" "--enable-lzma") (ifMinVer "2.2" (enableFeature openglSupport "opengl")) (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse") - (ifMinVer "2.5" (if sdlSupport then "--enable-sdl" else "")) # Only configurable since 2.5, auto detected before then + (ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else if sdlSupport then "--enable-sdl" else null)) # autodetected before 2.5, SDL1 support removed in 3.2 for SDL2 (ifMinVer "1.2" "--enable-libsoxr") "--enable-libx264" "--enable-libxvid" @@ -155,7 +158,7 @@ stdenv.mkDerivation rec { ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau - ++ optional sdlSupport SDL; + ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL); enableParallelBuilding = true; @@ -167,38 +170,20 @@ 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}" ]; }; installFlags = [ "install-man" ]; passthru = { - vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false; - inherit vdpauSupport; + inherit vaapiSupport vdpauSupport; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ffmpeg/sdk_detection.patch b/pkgs/development/libraries/ffmpeg/sdk_detection.patch deleted file mode 100644 index f0b8789c66b5..000000000000 --- a/pkgs/development/libraries/ffmpeg/sdk_detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c ---- a/libavcodec/audiotoolboxdec.c -+++ b/libavcodec/audiotoolboxdec.c -@@ -32,7 +32,7 @@ - #include "libavutil/opt.h" - #include "libavutil/log.h" - --#ifndef __MAC_10_11 -+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 - #define kAudioFormatEnhancedAC3 'ec-3' - #endif - diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index df1c532f6330..c6167252866a 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,16 +1,19 @@ -{ pkgs, fetchurl, stdenv, ffmpeg, cmake, libpng, pkgconfig +{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig }: stdenv.mkDerivation rec { name = "ffmpegthumbnailer-${version}"; - version = "2.0.10"; + version = "2.2.0"; - src = fetchurl { - url = "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0q7ws7ysw2rwr6ja8rhdjcc7x1hrlga7n514wi4lhw1yma32q0m3"; + src = fetchFromGitHub { + owner = "dirkvdb"; + repo = "ffmpegthumbnailer"; + rev = version; + sha256 = "0kl8aa547icy9b05njps02a8sw4yn4f8fzs228kig247sn09s4cp"; }; - buildInputs = [ ffmpeg cmake libpng pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ ffmpeg libpng ]; meta = with stdenv.lib; { homepage = https://github.com/dirkvdb/ffmpegthumbnailer; diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 3fc3f37d2aad..5aa62a638fe8 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }: +{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-2.21"; + name = "ffms-${version}"; + version = "2.22"; - src = fetchurl { - url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.21; - name = "${name}.tar.gz"; - sha256 = "00h2a5yhvr1qzbrzwbjv1ybxrx25lchgral6yxv36aaf4pi3rhn2"; + src = fetchFromGitHub { + owner = "FFMS"; + repo = "ffms2"; + rev = version; + sha256 = "1ywcx1f3q533qfrbck5qhik3l617qhm062l8zixv02gnla7w6rkm"; }; NIX_CFLAGS_COMPILE = "-fPIC"; - buildInputs = [ zlib ffmpeg pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ffmpeg ]; - meta = { - homepage = http://code.google.com/p/ffmpegsource/; + meta = with stdenv.lib; { + homepage = http://github.com/FFMS/ffms2/; description = "Libav/ffmpeg based source library for easy frame accurate access"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.mit; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 989d9518a0eb..3faba45714a0 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "filter-audio-20150624"; + name = "filter-audio-${version}"; + version = "0.0.1"; - src = fetchgit { - url = "https://github.com/irungentoo/filter_audio.git"; - rev = "612c5a102550c614e4c8f859e753ea64c0b7250c"; - sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na"; + src = fetchFromGitHub { + owner = "irungentoo"; + repo ="filter_audio"; + rev = "v${version}"; + sha256 = "1dv4pram317c1w97cjsv9f6r8cdxhgri7ib0v364z08pk7r2avfn"; }; doCheck = false; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 6f906d52502e..a1e4bb8274e0 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -6,21 +6,15 @@ let inherit (composableDerivation) edf; in -let version = "1.3.3"; in +let version = "1.3.4"; in composableDerivation.composableDerivation {} { name = "fltk-${version}"; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq"; + sha256 = "13y57pnayrkfzm8azdfvysm8b77ysac8zhhdsh8kxmb0x3203ay8"; }; - # http://www.fltk.org/str.php?L3156 - postPatch = '' - substituteInPlace FL/x.H \ - --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' - ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 2705339adbfb..7eaba8f75ec4 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"; @@ -8,14 +10,6 @@ stdenv.mkDerivation rec { sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; }; - infinality_patch = - let subvers = "1"; - in fetchurl { - url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2; - sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; - } - ; - outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; @@ -29,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 @@ -44,10 +38,6 @@ stdenv.mkDerivation rec { # Don't try to write to /var/cache/fontconfig at install time. installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; - postInstall = '' - cd "$out/etc/fonts" && tar xvf ${infinality_patch} - ''; - passthru = { # Empty for backward compatibility, there was no versioning before 2.11 configVersion = ""; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 14983b744df9..f176aa0878c8 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/fox/clang.patch b/pkgs/development/libraries/fox/clang.patch new file mode 100644 index 000000000000..0ca2ebf0d8da --- /dev/null +++ b/pkgs/development/libraries/fox/clang.patch @@ -0,0 +1,13 @@ +diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp +index 1ecdb45..9058a30 100644 +--- a/src/FXReactor.cpp ++++ b/src/FXReactor.cpp +@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){ + } + + // Normal case +- if(0<=hand){ ++ if(0==hand){ + + // Any handles active? + if(0num_flex_vectors++; + if ( idx > 0 && idx < 7 ) ++ { ++ /* in malformed fonts it is possible to have other */ ++ /* opcodes in the middle of a flex (which don't */ ++ /* increase `num_flex_vectors'); we thus have to */ ++ /* check whether we can add a point */ ++ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) ) ++ goto Syntax_Error; ++ + t1_builder_add_point( builder, + x, + y, + (FT_Byte)( idx == 3 || idx == 6 ) ); ++ } + } + break; + + diff --git a/pkgs/development/libraries/freetype/cve-2017-8287.patch b/pkgs/development/libraries/freetype/cve-2017-8287.patch new file mode 100644 index 000000000000..7ccf4f3278b7 --- /dev/null +++ b/pkgs/development/libraries/freetype/cve-2017-8287.patch @@ -0,0 +1,22 @@ +http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3774fc08b + +diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c +index d18e821..0baf836 100644 +--- a/src/psaux/psobjs.c ++++ b/src/psaux/psobjs.c +@@ -1718,6 +1718,14 @@ + first = outline->n_contours <= 1 + ? 0 : outline->contours[outline->n_contours - 2] + 1; + ++ /* in malformed fonts it can happen that a contour was started */ ++ /* but no points were added */ ++ if ( outline->n_contours && first == outline->n_points ) ++ { ++ outline->n_contours--; ++ return; ++ } ++ + /* We must not include the last point in the path if it */ + /* is located on the first point. */ + if ( outline->n_points > 1 ) + diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index adf48df2494e..8f16f85cabf7 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,81 +1,20 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, which, zlib, bzip2, libpng, gnumake -, glib /* passthru only */ +{ stdenv, lib, fetchurl, copyPathsToStore +, hostPlatform +, pkgconfig, which +, zlib, bzip2, libpng, gnumake, glib - # FreeType supports sub-pixel rendering. This is patented by - # Microsoft, so it is disabled by default. This option allows it to - # be enabled. See http://www.freetype.org/patents.html. -, useEncumberedCode ? true -, useInfinality ? true +, # 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 }: -assert useInfinality -> useEncumberedCode; - let - version = "2.6.5"; + inherit (stdenv.lib) optional optionals optionalString; + version = "2.7.1"; name = "freetype-" + version; - infinality = fetchFromGitHub { - owner = "archfan"; - repo = "infinality_bundle"; - rev = "5c0949a477bf43d2ac4e57b4fc39bcc3331002ee"; - sha256 = "17389aqm6rlxl4b5mv1fx4b22x2v2n60hfhixfxqxpd8ialsdi6l"; - }; - -in -with { inherit (stdenv.lib) optional optionals optionalString; }; -stdenv.mkDerivation rec { - name = "freetype-${version}"; - - src = fetchurl { - url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2"; - }; - - patches = [ - # Patch for validation of OpenType and GX/AAT tables. - (fetchurl { - name = "freetype-2.2.1-enable-valid.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990"; - sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l"; - }) - ] ++ optionals (!useInfinality && useEncumberedCode) [ - # Patch to enable subpixel rendering. - # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html. - (fetchurl { - name = "freetype-2.3.0-enable-spr.patch"; - url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990; - sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd"; - }) - ]; - - prePatch = optionalString useInfinality '' - patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)" - ''; - - outputs = [ "out" "dev" ]; - - propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype - # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which ] - # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - ++ optional (!stdenv.isLinux) gnumake; - - configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; - - # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isArm "-std=gnu99"; - - enableParallelBuilding = true; - - doCheck = true; - - postInstall = glib.flattenInclude; - - crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.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. - configureFlags = "--disable-static CC_BUILD=gcc"; - }; +in stdenv.mkDerivation { + inherit name; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -88,7 +27,50 @@ stdenv.mkDerivation rec { ''; homepage = https://www.freetype.org/; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) - #ToDo: encumbered = useEncumberedCode; platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; + + src = fetchurl { + url = "mirror://savannah/freetype/${name}.tar.bz2"; + sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs"; + }; + + propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype + # dependence on harfbuzz is looser than the reverse dependence + nativeBuildInputs = [ pkgconfig which ] + # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. + ++ optional (!stdenv.isLinux) gnumake; + + patches = + [ + ./pcf-introduce-driver.patch + ./pcf-config-long-family-names.patch + ./disable-pcf-long-family-names.patch + ./enable-table-validation.patch + # remove the two CVE patches after updating to >= 2.8 + ./cve-2017-8105.patch + ./cve-2017-8287.patch + ] ++ + optional useEncumberedCode ./enable-subpixel-rendering.patch; + + outputs = [ "out" "dev" ]; + + configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; + + # The asm for armel is written with the 'asm' keyword. + CFLAGS = optionalString stdenv.isArm "-std=gnu99"; + + enableParallelBuilding = true; + + doCheck = true; + + postInstall = glib.flattenInclude; + + 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. + configureFlags = "--disable-static CC_BUILD=gcc"; }; } diff --git a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch new file mode 100644 index 000000000000..e3dfe4aabd60 --- /dev/null +++ b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch @@ -0,0 +1,15 @@ +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index 5676074..37a0d00 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -856,7 +856,7 @@ FT_BEGIN_HEADER + /* If this option is activated, it can be controlled with the */ + /* `no-long-family-names' property of the pcf driver module. */ + /* */ +-#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ + + + /*************************************************************************/ +-- +cgit v1.0-41-gc330 \ No newline at end of file diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch new file mode 100644 index 000000000000..4f908343e8c1 --- /dev/null +++ b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch @@ -0,0 +1,13 @@ +Index: freetype-2.7.1/include/freetype/config/ftoption.h +=================================================================== +--- freetype-2.7.1.orig/include/freetype/config/ftoption.h ++++ freetype-2.7.1/include/freetype/config/ftoption.h +@@ -122,7 +122,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/development/libraries/freetype/enable-table-validation.patch new file mode 100644 index 000000000000..37419f14f40f --- /dev/null +++ b/pkgs/development/libraries/freetype/enable-table-validation.patch @@ -0,0 +1,22 @@ +Index: freetype-2.7.1/modules.cfg +=================================================================== +--- freetype-2.7.1.orig/modules.cfg ++++ freetype-2.7.1/modules.cfg +@@ -120,7 +120,7 @@ AUX_MODULES += cache + # TrueType GX/AAT table validation. Needs ftgxval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 + # OpenType table validation. Needs ftotval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch new file mode 100644 index 000000000000..95ed83c60f8f --- /dev/null +++ b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch @@ -0,0 +1,553 @@ +diff --git a/devel/ftoption.h b/devel/ftoption.h +index 3b63931..b8b0a8d 100644 +--- a/devel/ftoption.h ++++ b/devel/ftoption.h +@@ -82,8 +82,8 @@ FT_BEGIN_HEADER + /* to control the various font drivers and modules. The controllable */ + /* properties are listed in the section `Controlling FreeType Modules' */ + /* in the reference's table of contents; currently there are properties */ +- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ +- /* TrueType (file `ftttdrv.h'). */ ++ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ ++ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ + /* */ + /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ + /* multiple lines for better readability). */ +@@ -835,6 +835,33 @@ FT_BEGIN_HEADER + /*************************************************************************/ + /*************************************************************************/ + /**** ****/ ++ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ ++ /**** ****/ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ ++ ++ /*************************************************************************/ ++ /* */ ++ /* There are many PCF fonts just called `Fixed' which look completely */ ++ /* different, and which have nothing to do with each other. When */ ++ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ ++ /* random, the style changes often if one changes the size and one */ ++ /* cannot select some fonts at all. This option makes the PCF module */ ++ /* prepend the foundry name (plus a space) to the family name. */ ++ /* */ ++ /* We also check whether we have `wide' characters; all put together, we */ ++ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ ++ /* */ ++ /* If this option is activated, it can be controlled with the */ ++ /* `no-long-family-names' property of the pcf driver module. */ ++ /* */ ++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ /**** ****/ + /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ + /**** ****/ + /*************************************************************************/ +diff --git a/docs/CHANGES b/docs/CHANGES +index cb3b327..3823395 100644 +--- a/docs/CHANGES ++++ b/docs/CHANGES +@@ -1,4 +1,20 @@ + ++CHANGES BETWEEN 2.7.1 and 2.7.2 ++ ++ I. IMPORTANT CHANGES ++ ++ - The PCF change to show more `colourful' family names (introduced ++ in version 2.7.1) was too radical; it can now be configured with ++ PCF_CONFIG_OPTION_LONG_FAMILY_NAMES at compile time. If ++ activated, it can be switched off at run time with the new pcf ++ property `no-long-family-names'. If the `FREETYPE_PROPERTIES' ++ environment variable is available, you can say ++ ++ FREETYPE_PROPERTIES=pcf:no-long-family-names=1 ++ ++ ++====================================================================== ++ + CHANGES BETWEEN 2.7 and 2.7.1 + + I. IMPORTANT CHANGES +diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h +index 950d36c..d491af5 100644 +--- a/include/freetype/config/ftheader.h ++++ b/include/freetype/config/ftheader.h +@@ -357,6 +357,19 @@ + /************************************************************************* + * + * @macro: ++ * FT_PCF_DRIVER_H ++ * ++ * @description: ++ * A macro used in #include statements to name the file containing ++ * structures and macros related to the PCF driver module. ++ * ++ */ ++#define FT_PCF_DRIVER_H ++ ++ ++ /************************************************************************* ++ * ++ * @macro: + * FT_TYPE1_TABLES_H + * + * @description: +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index f5bc540..5676074 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -82,8 +82,8 @@ FT_BEGIN_HEADER + /* to control the various font drivers and modules. The controllable */ + /* properties are listed in the section `Controlling FreeType Modules' */ + /* in the reference's table of contents; currently there are properties */ +- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ +- /* TrueType (file `ftttdrv.h'). */ ++ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ ++ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ + /* */ + /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ + /* multiple lines for better readability). */ +@@ -835,6 +835,33 @@ FT_BEGIN_HEADER + /*************************************************************************/ + /*************************************************************************/ + /**** ****/ ++ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ ++ /**** ****/ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ ++ ++ /*************************************************************************/ ++ /* */ ++ /* There are many PCF fonts just called `Fixed' which look completely */ ++ /* different, and which have nothing to do with each other. When */ ++ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ ++ /* random, the style changes often if one changes the size and one */ ++ /* cannot select some fonts at all. This option makes the PCF module */ ++ /* prepend the foundry name (plus a space) to the family name. */ ++ /* */ ++ /* We also check whether we have `wide' characters; all put together, we */ ++ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ ++ /* */ ++ /* If this option is activated, it can be controlled with the */ ++ /* `no-long-family-names' property of the pcf driver module. */ ++ /* */ ++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ /**** ****/ + /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ + /**** ****/ + /*************************************************************************/ +diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h +index ab43895..a0a121b 100644 +--- a/include/freetype/ftchapters.h ++++ b/include/freetype/ftchapters.h +@@ -77,6 +77,7 @@ + /* auto_hinter */ + /* cff_driver */ + /* tt_driver */ ++/* pcf_driver */ + /* */ + /***************************************************************************/ + +diff --git a/include/freetype/ftpcfdrv.h b/include/freetype/ftpcfdrv.h +new file mode 100644 +index 0000000..6622c93 +--- /dev/null ++++ b/include/freetype/ftpcfdrv.h +@@ -0,0 +1,105 @@ ++/***************************************************************************/ ++/* */ ++/* ftpcfdrv.h */ ++/* */ ++/* FreeType API for controlling the PCF driver (specification only). */ ++/* */ ++/* Copyright 2017 by */ ++/* David Turner, Robert Wilhelm, and Werner Lemberg. */ ++/* */ ++/* This file is part of the FreeType project, and may only be used, */ ++/* modified, and distributed under the terms of the FreeType project */ ++/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ ++/* this file you indicate that you have read the license and */ ++/* understand and accept it fully. */ ++/* */ ++/***************************************************************************/ ++ ++ ++#ifndef FTPCFDRV_H_ ++#define FTPCFDRV_H_ ++ ++#include ++#include FT_FREETYPE_H ++ ++#ifdef FREETYPE_H ++#error "freetype.h of FreeType 1 has been loaded!" ++#error "Please fix the directory search order for header files" ++#error "so that freetype.h of FreeType 2 is found first." ++#endif ++ ++ ++FT_BEGIN_HEADER ++ ++ ++ /************************************************************************** ++ * ++ * @section: ++ * pcf_driver ++ * ++ * @title: ++ * The PCF driver ++ * ++ * @abstract: ++ * Controlling the PCF driver module. ++ * ++ * @description: ++ * While FreeType's PCF driver doesn't expose API functions by itself, ++ * it is possible to control its behaviour with @FT_Property_Set and ++ * @FT_Property_Get. Right now, there is a single property ++ * `no-long-family-names' available if FreeType is compiled with ++ * PCF_CONFIG_OPTION_LONG_FAMILY_NAMES. ++ * ++ * The PCF driver's module name is `pcf'. ++ * ++ */ ++ ++ ++ /************************************************************************** ++ * ++ * @property: ++ * no-long-family-names ++ * ++ * @description: ++ * If PCF_CONFIG_OPTION_LONG_FAMILY_NAMES is active while compiling ++ * FreeType, the PCF driver constructs long family names. ++ * ++ * There are many PCF fonts just called `Fixed' which look completely ++ * different, and which have nothing to do with each other. When ++ * selecting `Fixed' in KDE or Gnome one gets results that appear rather ++ * random, the style changes often if one changes the size and one ++ * cannot select some fonts at all. The improve this situation, the PCF ++ * module prepends the foundry name (plus a space) to the family name. ++ * It also checks whether there are `wide' characters; all put together, ++ * family names like `Sony Fixed' or `Misc Fixed Wide' are constructed. ++ * ++ * If `no-long-family-names' is set, this feature gets switched off. ++ * ++ * { ++ * FT_Library library; ++ * FT_Bool no_long_family_names = TRUE; ++ * ++ * ++ * FT_Init_FreeType( &library ); ++ * ++ * FT_Property_Set( library, "pcf", ++ * "no-long-family-names", ++ * &no_long_family_names ); ++ * } ++ * ++ * @note: ++ * This property can be used with @FT_Property_Get also. ++ * ++ * This property can be set via the `FREETYPE_PROPERTIES' environment ++ * variable (using values 1 and 0 for `on' and `off', respectively). ++ * ++ */ ++ ++ ++FT_END_HEADER ++ ++ ++#endif /* FTPCFDRV_H_ */ ++ ++ ++/* END */ +diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h +index 830cabe..f0390cb 100644 +--- a/src/pcf/pcf.h ++++ b/src/pcf/pcf.h +@@ -167,6 +167,8 @@ FT_BEGIN_HEADER + { + FT_DriverRec root; + ++ FT_Bool no_long_family_names; ++ + } PCF_DriverRec, *PCF_Driver; + + +diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c +index 8f4a90d..bc65423 100644 +--- a/src/pcf/pcfdrivr.c ++++ b/src/pcf/pcfdrivr.c +@@ -49,6 +49,8 @@ THE SOFTWARE. + + #include FT_SERVICE_BDF_H + #include FT_SERVICE_FONT_FORMAT_H ++#include FT_SERVICE_PROPERTIES_H ++#include FT_PCF_DRIVER_H + + + /*************************************************************************/ +@@ -667,6 +669,110 @@ THE SOFTWARE. + }; + + ++ /* ++ * PROPERTY SERVICE ++ * ++ */ ++ static FT_Error ++ pcf_property_set( FT_Module module, /* PCF_Driver */ ++ const char* property_name, ++ const void* value, ++ FT_Bool value_is_string ) ++ { ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ FT_Error error = FT_Err_Ok; ++ PCF_Driver driver = (PCF_Driver)module; ++ ++#ifndef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES ++ FT_UNUSED( value_is_string ); ++#endif ++ ++ ++ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) ++ { ++#ifdef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES ++ if ( value_is_string ) ++ { ++ const char* s = (const char*)value; ++ long lfn = ft_strtol( s, NULL, 10 ); ++ ++ ++ if ( lfn == 0 ) ++ driver->no_long_family_names = 0; ++ else if ( lfn == 1 ) ++ driver->no_long_family_names = 1; ++ else ++ return FT_THROW( Invalid_Argument ); ++ } ++ else ++#endif ++ { ++ FT_Bool* no_long_family_names = (FT_Bool*)value; ++ ++ ++ driver->no_long_family_names = *no_long_family_names; ++ } ++ ++ return error; ++ } ++ ++#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_UNUSED( module ); ++ FT_UNUSED( value ); ++ FT_UNUSED( value_is_string ); ++ ++#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_TRACE0(( "pcf_property_set: missing property `%s'\n", ++ property_name )); ++ return FT_THROW( Missing_Property ); ++ } ++ ++ ++ static FT_Error ++ pcf_property_get( FT_Module module, /* PCF_Driver */ ++ const char* property_name, ++ const void* value ) ++ { ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ FT_Error error = FT_Err_Ok; ++ PCF_Driver driver = (PCF_Driver)module; ++ ++ ++ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) ++ { ++ FT_Bool no_long_family_names = driver->no_long_family_names; ++ FT_Bool* val = (FT_Bool*)value; ++ ++ ++ *val = no_long_family_names; ++ ++ return error; ++ } ++ ++#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_UNUSED( module ); ++ FT_UNUSED( value ); ++ ++#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_TRACE0(( "pcf_property_get: missing property `%s'\n", ++ property_name )); ++ return FT_THROW( Missing_Property ); ++ } ++ ++ ++ FT_DEFINE_SERVICE_PROPERTIESREC( ++ pcf_service_properties, ++ ++ (FT_Properties_SetFunc)pcf_property_set, /* set_property */ ++ (FT_Properties_GetFunc)pcf_property_get ) /* get_property */ ++ ++ + /* + * + * SERVICE LIST +@@ -677,6 +783,7 @@ THE SOFTWARE. + { + { FT_SERVICE_ID_BDF, &pcf_service_bdf }, + { FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_PCF }, ++ { FT_SERVICE_ID_PROPERTIES, &pcf_service_properties }, + { NULL, NULL } + }; + +@@ -694,7 +801,14 @@ THE SOFTWARE. + FT_CALLBACK_DEF( FT_Error ) + pcf_driver_init( FT_Module module ) /* PCF_Driver */ + { ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ PCF_Driver driver = (PCF_Driver)module; ++ ++ ++ driver->no_long_family_names = 0; ++#else + FT_UNUSED( module ); ++#endif + + return FT_Err_Ok; + } +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index 38ba110..3eacf2b 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -1393,57 +1393,75 @@ THE SOFTWARE. + prop = pcf_find_property( face, "FAMILY_NAME" ); + if ( prop && prop->isString ) + { +- /* Prepend the foundry name plus a space to the family name. */ +- /* There are many fonts just called `Fixed' which look completely */ +- /* different, and which have nothing to do with each other. When */ +- /* selecting `Fixed' in KDE or Gnome one gets results that appear */ +- /* rather random, the style changes often if one changes the size */ +- /* and one cannot select some fonts at all. */ +- /* */ +- /* We also check whether we have `wide' characters; all put */ +- /* together, we get family names like `Sony Fixed' or `Misc Fixed */ +- /* Wide'. */ +- PCF_Property foundry_prop, point_size_prop, average_width_prop; +- +- int l = ft_strlen( prop->value.atom ) + 1; +- int wide = 0; +- +- +- foundry_prop = pcf_find_property( face, "FOUNDRY" ); +- point_size_prop = pcf_find_property( face, "POINT_SIZE" ); +- average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); +- +- if ( point_size_prop && average_width_prop ) ++ ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ PCF_Driver driver = (PCF_Driver)FT_FACE_DRIVER( face ); ++ ++ ++ if ( !driver->no_long_family_names ) + { +- if ( average_width_prop->value.l >= point_size_prop->value.l ) ++ /* Prepend the foundry name plus a space to the family name. */ ++ /* There are many fonts just called `Fixed' which look */ ++ /* completely different, and which have nothing to do with each */ ++ /* other. When selecting `Fixed' in KDE or Gnome one gets */ ++ /* results that appear rather random, the style changes often if */ ++ /* one changes the size and one cannot select some fonts at all. */ ++ /* */ ++ /* We also check whether we have `wide' characters; all put */ ++ /* together, we get family names like `Sony Fixed' or `Misc */ ++ /* Fixed Wide'. */ ++ ++ PCF_Property foundry_prop, point_size_prop, average_width_prop; ++ ++ int l = ft_strlen( prop->value.atom ) + 1; ++ int wide = 0; ++ ++ ++ foundry_prop = pcf_find_property( face, "FOUNDRY" ); ++ point_size_prop = pcf_find_property( face, "POINT_SIZE" ); ++ average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); ++ ++ if ( point_size_prop && average_width_prop ) + { +- /* This font is at least square shaped or even wider */ +- wide = 1; +- l += ft_strlen( " Wide" ); ++ if ( average_width_prop->value.l >= point_size_prop->value.l ) ++ { ++ /* This font is at least square shaped or even wider */ ++ wide = 1; ++ l += ft_strlen( " Wide" ); ++ } + } +- } + +- if ( foundry_prop && foundry_prop->isString ) +- { +- l += ft_strlen( foundry_prop->value.atom ) + 1; ++ if ( foundry_prop && foundry_prop->isString ) ++ { ++ l += ft_strlen( foundry_prop->value.atom ) + 1; + +- if ( FT_NEW_ARRAY( root->family_name, l ) ) +- goto Exit; ++ if ( FT_NEW_ARRAY( root->family_name, l ) ) ++ goto Exit; ++ ++ ft_strcpy( root->family_name, foundry_prop->value.atom ); ++ ft_strcat( root->family_name, " " ); ++ ft_strcat( root->family_name, prop->value.atom ); ++ } ++ else ++ { ++ if ( FT_NEW_ARRAY( root->family_name, l ) ) ++ goto Exit; + +- ft_strcpy( root->family_name, foundry_prop->value.atom ); +- ft_strcat( root->family_name, " " ); +- ft_strcat( root->family_name, prop->value.atom ); ++ ft_strcpy( root->family_name, prop->value.atom ); ++ } ++ ++ if ( wide ) ++ ft_strcat( root->family_name, " Wide" ); + } + else ++ ++#endif /* PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ + { +- if ( FT_NEW_ARRAY( root->family_name, l ) ) ++ if ( FT_STRDUP( root->family_name, prop->value.atom ) ) + goto Exit; +- +- ft_strcpy( root->family_name, prop->value.atom ); + } +- +- if ( wide ) +- ft_strcat( root->family_name, " Wide" ); + } + else + root->family_name = NULL; +-- +cgit v1.0-41-gc330 + diff --git a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch new file mode 100644 index 000000000000..c1685c5116cc --- /dev/null +++ b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch @@ -0,0 +1,68 @@ +diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h +index c726e5e..830cabe 100644 +--- a/src/pcf/pcf.h ++++ b/src/pcf/pcf.h +@@ -163,6 +163,13 @@ FT_BEGIN_HEADER + } PCF_FaceRec, *PCF_Face; + + ++ typedef struct PCF_DriverRec_ ++ { ++ FT_DriverRec root; ++ ++ } PCF_DriverRec, *PCF_Driver; ++ ++ + /* macros for pcf font format */ + + #define LSBFirst 0 +diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c +index 10d5c20..8f4a90d 100644 +--- a/src/pcf/pcfdrivr.c ++++ b/src/pcf/pcfdrivr.c +@@ -691,22 +691,38 @@ THE SOFTWARE. + } + + ++ FT_CALLBACK_DEF( FT_Error ) ++ pcf_driver_init( FT_Module module ) /* PCF_Driver */ ++ { ++ FT_UNUSED( module ); ++ ++ return FT_Err_Ok; ++ } ++ ++ ++ FT_CALLBACK_DEF( void ) ++ pcf_driver_done( FT_Module module ) /* PCF_Driver */ ++ { ++ FT_UNUSED( module ); ++ } ++ ++ + FT_CALLBACK_TABLE_DEF + const FT_Driver_ClassRec pcf_driver_class = + { + { + FT_MODULE_FONT_DRIVER | + FT_MODULE_DRIVER_NO_OUTLINES, +- sizeof ( FT_DriverRec ), + ++ sizeof ( PCF_DriverRec ), + "pcf", + 0x10000L, + 0x20000L, + +- NULL, /* module-specific interface */ ++ NULL, /* module-specific interface */ + +- NULL, /* FT_Module_Constructor module_init */ +- NULL, /* FT_Module_Destructor module_done */ ++ pcf_driver_init, /* FT_Module_Constructor module_init */ ++ pcf_driver_done, /* FT_Module_Destructor module_done */ + pcf_driver_requester /* FT_Module_Requester get_interface */ + }, + +-- +cgit v1.0-41-gc330 + diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 161d836bf311..d0850128ebcc 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 173e6411182d..07f370b42100 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,40 +1,52 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng -, netcdf, hdf5 , curl -, netcdfSupport ? true - }: +, libpng, sqlite, libspatialite, poppler, hdf4 +, libiconv +, netcdfSupport ? true, netcdf, hdf5 , curl +}: + +with stdenv.lib; composableDerivation.composableDerivation {} (fixed: rec { - version = "2.1.1"; + version = "2.1.3"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "55fc6ffbe76e9d2e7e6cf637010e5d4bba6a966d065f40194ff798544198236b"; + sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf"; }; - buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] + buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite + libspatialite poppler hdf4 ] ++ (with pythonPackages; [ python numpy wrapPython ]) - ++ (stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]); + ++ 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}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-png=${libpng.dev}" # optional + "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional - "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql.lib.dev}/bin/mysql_config" "--with-geotiff=${libgeotiff}" + "--with-sqlite3=${sqlite.dev}" + "--with-spatialite=${libspatialite}" "--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 71b65131015a..86d9bd649881 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,18 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.12"; + name = "gdbm-1.13"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr"; + sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx"; }; 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/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index af4bfc0709e1..f40ebf00590a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.36"; - ver_min = "5"; + ver_min = "6"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc"; + sha256 = "455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index ee7b12de5027..5d683de404d9 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { name = "gecode-${version}"; - version = "4.4.0"; + version = "5.0.0"; src = fetchurl { url = "http://www.gecode.org/download/${name}.tar.gz"; - sha256 = "0akqjzy6pd229mn0lhpdbyc4wbazhprkd5ijqs99z68bj3b9h0s3"; + sha256 = "0yz7m4msp7g2jzsn216q74d9n7rv6qh8abcv0jdc1n7y2nhjzzzl"; }; + enableParallelBuilding = true; buildInputs = [ perl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index e8f4001c1b59..5a7bff7459e3 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "geis-${version}"; - version = "2.2.16"; + version = "2.2.17"; src = fetchurl { url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz"; - sha256 = "40a694092c79f325a2fbf8a9f301177bc91c364f4e637c2aa8963ad2a5aabbcf"; + sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; NIX_CFLAGS_COMPILE = "-Wno-error=pedantic"; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 0c22cc9ff9fd..8cc06f9269eb 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,7 +1,9 @@ -{ fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip +{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip , dbus, dbus_glib, modemmanager, avahi }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "geoclue-2.4.3"; @@ -10,23 +12,31 @@ stdenv.mkDerivation rec { sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; }; - buildInputs = + buildInputs = libintlOrEmpty ++ [ intltool pkgconfig glib json_glib libsoup geoip - dbus dbus_glib modemmanager avahi - ]; + dbus dbus_glib avahi + ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; preConfigure = '' substituteInPlace configure --replace "-Werror" "" ''; - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ] ++ + optionals stdenv.isDarwin [ + "--disable-silent-rules" + "--disable-3g-source" + "--disable-cdma-source" + "--disable-modem-gps-source" + "--disable-nmea-source" ]; + + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; propagatedBuildInputs = [ dbus dbus_glib glib ]; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; maintainers = with maintainers; [ raskin garbas ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 5dbf22df552d..22e7d216e6cd 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 7d555ba4d062..d70588841045 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/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 51e366ba29cd..cf27249064fc 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.24.6"; + version = "0.25.1"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "070jrv690bd5dq991lc32qfnai9ywvrjzsfgi3rcw6kw4l2ynxjr"; + sha256 = "100bah8picqjzyhpw4wd7z5vyidcb8aggin50bhbpn607h8n8bml"; }; # TODO: `cargo` (rust's package manager) surfaced a serious bug in diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 9d5ded5be15e..159bf47e130a 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 02c87cf709a7..814e4496b77d 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/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index feb769229c02..ec3c2f5569dd 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor +, darwin, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -18,15 +19,15 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper libXinerama libXcursor - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "http://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9eb71fc708f0..84c044682779 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: @@ -42,8 +42,8 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.50"; - ver_min = "3"; + ver_maj = "2.52"; + ver_min = "1"; in stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999"; + sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { description = "C library of programming buildings blocks"; homepage = http://www.gtk.org/; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 raskin urkud ]; + maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; longDescription = '' 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 000000000000..68e2798181fb --- /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 000000000000..88b1925fa126 --- /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 000000000000..76be2a3308f6 --- /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 7128f5606193..1b53acf12b17 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -1,23 +1,34 @@ /* Build configuration used to build glibc, Info files, and locale information. */ -cross: +{ stdenv, lib, fetchurl +, gd ? null, libpng ? null +, buildPlatform, hostPlatform +, buildPackages +}: -{ name, fetchurl, lib, stdenv, installLocales ? false -, gccCross ? null, linuxHeaders ? null -, profilingLibraries ? false, meta -, withGd ? false, gd ? null, libpng ? null -, preConfigure ? "", ... }@args: +{ name +, withLinuxHeaders ? false +, profilingLibraries ? false +, installLocales ? false +, withGd ? false +, meta +, ... +} @ args: let + inherit (buildPackages) linuxHeaders; version = "2.25"; sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0"; + cross = if buildPlatform != hostPlatform then hostPlatform else null; in -assert cross != null -> gccCross != null; +assert withLinuxHeaders -> linuxHeaders != null; +assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ - inherit linuxHeaders installLocales; + inherit installLocales; + linuxHeaders = if withLinuxHeaders then linuxHeaders else null; # The host/target system. crossConfig = if cross != null then cross.config else null; @@ -48,7 +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.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 @@ -83,13 +104,13 @@ stdenv.mkDerivation ({ "--enable-obsolete-rpc" "--sysconfdir=/etc" "--enable-stackguard-randomization" - (if linuxHeaders != null + (if withLinuxHeaders then "--with-headers=${linuxHeaders}/include" else "--without-headers") (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ lib.optionals (cross == null && linuxHeaders != null) [ + ] ++ lib.optionals (cross == null && withLinuxHeaders) [ "--enable-kernel=2.6.32" ] ++ lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") @@ -112,26 +133,16 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; - buildInputs = lib.optionals (cross != null) [ gccCross ] - ++ lib.optionals withGd [ gd libpng ]; + nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc; + buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux # bootstrap. BASH_SHELL = "/bin/sh"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.system == "i686-linux") "-U__i686" - + " -Wno-error=strict-prototypes"; } -# Remove the `gccCross' attribute so that the *native* glibc store path -# doesn't depend on whether `gccCross' is null or not. -// (removeAttrs args [ "lib" "gccCross" "fetchurl" "withGd" "gd" "libpng" ]) // +// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // { name = name + "-${version}" + @@ -160,7 +171,22 @@ stdenv.mkDerivation ({ ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"'' } - ${preConfigure} + + '' + lib.optionalString (cross != null) '' + sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" + + cat > config.cache << "EOF" + libc_cv_forced_unwind=yes + libc_cv_c_cleanup=yes + libc_cv_gnu89_inline=yes + # Only due to a problem in gcc configure scripts: + libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} + EOF + + export BUILD_CC=gcc + export CC="$crossConfig-gcc" + export AR="$crossConfig-ar" + export RANLIB="$crossConfig-ranlib" ''; preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; @@ -183,4 +209,17 @@ stdenv.mkDerivation ({ maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; } // meta; +} + +// lib.optionalAttrs (cross != null) { + preInstall = null; # clobber the native hook + + dontStrip = true; + + separateDebugInfo = false; # this is currently broken for crossDrv + + # To avoid a dependency on the build system 'bash'. + preFixup = '' + rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} + ''; }) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 4f9eb2d0714f..976dbcde47ff 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -1,21 +1,16 @@ -{ lib, stdenv, fetchurl, linuxHeaders +{ stdenv, callPackage +, withLinuxHeaders ? true , installLocales ? true , profilingLibraries ? false -, gccCross ? null -, withGd ? false, gd ? null, libpng ? null +, withGd ? false }: assert stdenv.cc.isGNU; -let - build = import ./common.nix; - cross = if gccCross != null then gccCross.target else null; -in - build cross ({ - name = "glibc" + lib.optionalString withGd "-gd"; +callPackage ./common.nix { inherit stdenv; } { + name = "glibc" + stdenv.lib.optionalString withGd "-gd"; - inherit lib stdenv fetchurl linuxHeaders installLocales - profilingLibraries gccCross withGd gd libpng; + inherit withLinuxHeaders profilingLibraries installLocales withGd; NIX_NO_SELF_RPATH = true; @@ -104,36 +99,3 @@ in meta.description = "The GNU C Library"; } - - // - - (if cross != null - then { - preConfigure = '' - sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" - - cat > config.cache << "EOF" - libc_cv_forced_unwind=yes - libc_cv_c_cleanup=yes - libc_cv_gnu89_inline=yes - # Only due to a problem in gcc configure scripts: - libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} - EOF - export BUILD_CC=gcc - export CC="$crossConfig-gcc" - export AR="$crossConfig-ar" - export RANLIB="$crossConfig-ranlib" - - dontStrip=1 - ''; - - preInstall = null; # clobber the native hook - - separateDebugInfo = false; # this is currently broken for crossDrv - - # To avoid a dependency on the build system 'bash'. - preFixup = '' - rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} - ''; - } - else {})) diff --git a/pkgs/development/libraries/glibc/fix-i686-memchr.patch b/pkgs/development/libraries/glibc/fix-i686-memchr.patch new file mode 100644 index 000000000000..32564de9f3ae --- /dev/null +++ b/pkgs/development/libraries/glibc/fix-i686-memchr.patch @@ -0,0 +1,23 @@ +Fix i686 memchr overflow calculation (BZ#21182) + +https://sourceware.org/git/?p=glibc.git;a=commit;h=3abeeec5f46ff03 +diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S +index 910679c..e41f324 100644 +--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S ++++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S +@@ -117,7 +117,6 @@ L(crosscache): + + # ifndef USE_AS_RAWMEMCHR + jnz L(match_case2_prolog1) +- lea -16(%edx), %edx + /* Calculate the last acceptable address and check for possible + addition overflow by using satured math: + edx = ecx + edx +@@ -125,6 +124,7 @@ L(crosscache): + add %ecx, %edx + sbb %eax, %eax + or %eax, %edx ++ sub $16, %edx + jbe L(return_null) + lea 16(%edi), %edi + # else 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 000000000000..1d60dcd7988b --- /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 000000000000..ba4ec7c60cb6 --- /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/glibc/info.nix b/pkgs/development/libraries/glibc/info.nix index 84ec43e11a85..5cb004cc870d 100644 --- a/pkgs/development/libraries/glibc/info.nix +++ b/pkgs/development/libraries/glibc/info.nix @@ -1,13 +1,8 @@ -{ lib, stdenv, fetchurl, texinfo, perl }: +{ callPackage, texinfo, perl }: -let build = import ./common.nix; in - -/* null cross builder */ -build null { +callPackage ./common.nix {} { name = "glibc-info"; - inherit fetchurl stdenv lib; - outputs = [ "out" ]; configureFlags = [ "--enable-add-ons" ]; diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 994390cf8290..bf077a0c12c3 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -6,14 +6,13 @@ http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc */ -{ lib, stdenv, fetchurl, writeText, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: +{ stdenv, callPackage, writeText +, allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] +}: -let build = import ./common.nix; in - -build null { +callPackage ./common.nix { inherit stdenv; } { name = "glibc-locales"; - inherit fetchurl stdenv lib; installLocales = true; builder = ./locales-builder.sh; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 12460f4f2d29..9ce47ec2f1a2 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -8,27 +8,29 @@ assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; +with stdenv.lib; + let - version = "1.0.14"; + version = "1.0.20"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "0h9r4382qv0vqc91x1qz1nivxw1r2l874s1kl0bskzm9dyk742sj"; + sha256 = "1a6yhs42wcdm8az3983m3lx4d9296bw0amz5v3b4012g1xn0hhq2"; }; buildInputs = [ ] - ++ stdenv.lib.optional zlibSupport zlib - ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optional idnSupport libidn; + ++ optional zlibSupport zlib + ++ optional sslSupport openssl + ++ optional idnSupport libidn; meta = { description = "A portable high-level Jabber/XMPP library for C++"; - homepage = "http://camaya.net/gloox"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = with stdenv.lib.platforms; unix; + homepage = http://camaya.net/gloox; + license = licenses.gpl3; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 03f8ff3bc76d..a4b0090296f9 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/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 47345e2a22c7..7f8a2276ef25 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "gmm-4.3"; +stdenv.mkDerivation rec { + name = "gmm-${version}"; + version = "5.1"; src = fetchurl { - url = http://download.gna.org/getfem/stable/gmm-4.3.tar.gz; - sha256 = "0wpp3k73wd3rblsrwxl6djq6m11fx3q5wgw0pl41m9liswsw6din"; + url ="http://download.gna.org/getfem/stable/${name}.tar.gz"; + sha256 = "0di68vdn34kznf96rnwrpb3bbm3ahaczwxd306s9dx41kcqbzrlh"; }; - meta = { + meta = with stdenv.lib; { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = http://home.gna.org/getfem/gmm_intro.html; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b5cd936ce4f2..14104b30d12d 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: -with { inherit (stdenv.lib) optional optionalString; }; +let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { name = "gmp-5.1.3"; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 4d12ed8a8b18..92dd602fc4d8 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }: +{ stdenv, fetchurl, m4, cxx ? true +, buildPackages +, buildPlatform, hostPlatform +, withStatic ? false }: -with { inherit (stdenv.lib) optional optionalString; }; +let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { - name = "gmp-6.1.1"; + name = "gmp-6.1.2"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; - sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458"; + sha256 = "1clg7pbpk6qwxj5b2mw0pghzawp2qlm3jf9gdd8i6fl6yh2bnxaj"; }; #outputs TODO: split $cxx due to libstdc++ dependency @@ -16,7 +19,8 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; - nativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ m4 ] + ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc; configureFlags = # Build a "fat binary", with routines for several sub-architectures @@ -39,7 +43,7 @@ let self = stdenv.mkDerivation rec { configureFlagsArray+=("--build=$(./configfsf.guess)") ''; - doCheck = true; + doCheck = buildPlatform == hostPlatform; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gnutls/3.5.10.nix b/pkgs/development/libraries/gnutls/3.5.10.nix new file mode 100644 index 000000000000..a1eab1a84c11 --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.5.10.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, libunistring, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.5.10"; + + src = fetchurl { + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; + sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g"; + }; +}) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index 8bb1a2d97f76..62ff25475694 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,10 +1,18 @@ -{ callPackage, fetchurl, libunistring, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.9"; + version = "3.5.14"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2"; + sha256 = "1nhv0mf3apz65ljh335l8xds7wpn08ywljkrvws08apljbn2v8aa"; }; + + # Skip two tests introduced in 3.5.11. Probable reasons of failure: + # - pkgconfig: building against the result won't work before installing + # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox + postPatch = '' + sed '2iexit 77' -i tests/pkgconfig.sh + sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c + ''; }) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index cf298baf48a3..48aa3fb96737 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,6 +1,6 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv -, tpmSupport ? false, trousers, nettools, libunistring +, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv +, tpmSupport ? false, trousers, which, nettools, libunistring # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -38,14 +38,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ] - ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers - ++ [ unbound ] ++ lib.optional guileBindings guile ++ buildInputs; - nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs + ++ lib.optionals doCheck [ which nettools ]; propagatedBuildInputs = [ nettle ]; diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch index 49e059befdb9..75d9281dfb0e 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch @@ -57,15 +57,16 @@ diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 838d343..ca7fc0d 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py -@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries): +@@ -53,10 +53,27 @@ def _resolve_libtool(options, binary, libraries): # Match absolute paths on OS X to conform to how libraries are usually # referenced on OS X systems. def _ldd_library_pattern(library_name): + nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/')) pattern = "(? gnupg1 != null; -assert !useGnupg1 -> gnupg != null; +let inherit (stdenv) lib system; in -let - gpgStorePath = if useGnupg1 then gnupg1 else gnupg; - gpgProgram = if useGnupg1 then "gpg" else "gpg2"; -in stdenv.mkDerivation rec { - name = "gpgme-1.8.0"; + name = "gpgme-1.9.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r"; + sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"; }; + patches = [ + (fetchpatch { + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6"; + sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx"; + name = "qgpgme-format-security.patch"; + }) + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool - propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; + propagatedBuildInputs = + [ libgpgerror glib libassuan pth ] + ++ lib.optional (qtbase != null) qtbase; nativeBuildInputs = [ pkgconfig gnupg ]; configureFlags = [ - "--enable-fixed-path=${gpgStorePath}/bin" + "--enable-fixed-path=${gnupg}/bin" ]; + # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html NIX_CFLAGS_COMPILE = - with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; - - AM_CXXFLAGS = - with stdenv; lib.optional (isDarwin) "-D_POSIX_C_SOURCE=200809L"; + lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; meta = with stdenv.lib; { - homepage = "http://www.gnupg.org/related_software/gpgme"; + homepage = "https://gnupg.org/software/gpgme/index.html"; description = "Library for making GnuPG easier to use"; - license = licenses.gpl2; + longDescription = '' + GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG + easier for applications. It provides a High-Level Crypto API for + encryption, decryption, signing, signature verification and key + management. + ''; + license = with licenses; [ lgpl21Plus gpl3Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = with maintainers; [ fuuzetsu primeos ]; }; } diff --git a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch new file mode 100644 index 000000000000..4abc2757cf6f --- /dev/null +++ b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch @@ -0,0 +1,12 @@ +diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in +index 928d19f..cbe9713 100644 (file) +--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in ++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in +@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) + + set_target_properties(Gpgmepp PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" +- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" ++ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" + IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" + ) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 4d011ddd4638..ee453963376f 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { - majorVersion = "0.3"; - minorVersion = "0"; + majorVersion = "0.4"; + minorVersion = "0.1"; name = "granite-${majorVersion}.${minorVersion}"; src = fetchurl { - url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz"; - sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; + url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; + sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; }; cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - buildInputs = [perl cmake vala_0_23 pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix index b4aa9414163a..fb6af9c895d3 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index bb2461a98a15..3944d2ecab69 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index ca2fb7282627..80e05b8d7434 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec{ pythonPackages.python ]; + propagatedBuildInputs = stdenv.lib.optionals enablePython [ + pythonPackages.numpy + ]; + cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}" "-DENABLE_PNG=ON" "-DENABLE_FORTRAN=ON" diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index d130a328dbaf..afd6391d719b 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 89abd93180d9..07efe42b99db 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/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 1a8cb233b77a..55e20065732c 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, pkgconfig, libsoup, glib }: -stdenv.mkDerivation { - name = "gssdp-0.14.11"; +stdenv.mkDerivation rec { + name = "gssdp-${version}"; + version = "1.0.1"; src = fetchurl { - url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz; - sha256 = "0njkqr2y7c6linnw4wkc4y2vq5dfkpryqcinbzn0pzhr46psxxbv"; + url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz"; + sha256 = "1qfj4gir1qf6v86z70ryzmjb75ns30q6zi5p89vhd3621gs6f7b0"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libsoup ]; propagatedBuildInputs = [ glib ]; - meta = { + meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl2; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 1125bb7bb8ab..69378d95a301 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,14 +1,17 @@ { 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 , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools -, mesa, libintlOrEmpty +, mesa, libintlOrEmpty, libgme +, openssl, x265, libxml2 }: assert faacSupport -> faac != null; +assert gtkSupport -> gtk3 != null; let inherit (stdenv.lib) optional optionalString; @@ -40,15 +43,17 @@ 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 libwebp xvidcore gnutls mesa - mjpegtools + mjpegtools libgme openssl x265 libxml2 ] ++ 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 4d9582d13812..c18d8332b0c0 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 @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { code, LGPL or LGPL-compatible for the supporting library). ''; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; src = fetchurl { @@ -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/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index d298fbd7fc33..74b1417e0694 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost, glib, qt4, cmake +{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake , automoc4, flex, bison, pkgconfig }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gstreamer gst-plugins-base glib qt4 ]; - propagatedBuildInputs = [ boost ]; + propagatedBuildInputs = [ boost155 ]; nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index c67a3c708b32..441ca2e5571c 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; src = fetchurl { diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 306e2db29ce9..f6e718d82e9a 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ setupHook perl pkgconfig gettext ]; - patches = [ ./2.0-immodules.cache.patch ]; + patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ]; propagatedBuildInputs = with xorg; [ glib cairo pango gdk_pixbuf atk ] diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index d21fef3e6746..917371678e9d 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "8"; + ver_min = "15"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1"; + sha256 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb"; }; outputs = [ "out" "dev" ]; @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk-update-icon-cache "$out" + # Launcher + moveToOutput bin/gtk-launch "$out" ''; meta = with stdenv.lib; { @@ -85,7 +87,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - maintainers = with maintainers; [ urkud raskin vcunat lethalman ]; + maintainers = with maintainers; [ raskin vcunat lethalman ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch b/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch new file mode 100644 index 000000000000..edd69b078076 --- /dev/null +++ b/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch @@ -0,0 +1,40 @@ +Subject: [PATCHv2] gtk: Patch GTK+ to look for themes in profiles. +To: guix-devel@gnu.org +Date: Sun, 13 Mar 2016 15:17:37 +1100 +Url: https://lists.gnu.org/archive/html/guix-devel/2016-03/msg00492.html + +diff -Naur gtk+-2.24.28.new/gtk/gtkrc.c gtk+-2.24.28/gtk/gtkrc.c +--- gtk+-2.24.28.new/gtk/gtkrc.c 2016-03-13 10:31:14.413644362 +1100 ++++ gtk+-2.24.28/gtk/gtkrc.c 2016-03-13 12:51:34.723398423 +1100 +@@ -808,6 +808,8 @@ + gchar *path = NULL; + const gchar *home_dir; + gchar *subpath; ++ const gchar * const *xdg_data_dirs; ++ gint i; + + if (type) + subpath = g_strconcat ("gtk-2.0-", type, +@@ -830,6 +832,22 @@ + } + + if (!path) ++ { ++ xdg_data_dirs = g_get_system_data_dirs (); ++ for (i = 0; xdg_data_dirs[i]; i++) ++ { ++ path = g_build_filename (xdg_data_dirs[i], "themes", name, subpath, NULL); ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ break; ++ else ++ { ++ g_free (path); ++ path = NULL; ++ } ++ } ++ } ++ ++ if (!path) + { + gchar *theme_dir = gtk_rc_get_theme_dir (); + path = g_build_filename (theme_dir, name, subpath, NULL); diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 30ac8f2fe280..f9ce0aa4b81e 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gtk-mac-integration-2.0.8"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ]; - buildInputs = [ glib gtk ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ]; + buildInputs = [ glib ]; + propagatedBuildInputs = [ gtk ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix new file mode 100644 index 000000000000..85550b5d5289 --- /dev/null +++ b/pkgs/development/libraries/gtkd/default.nix @@ -0,0 +1,98 @@ +{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg +, pango, pkgconfig, substituteAll, which }: + +stdenv.mkDerivation rec { + name = "gtkd-${version}"; + version = "3.6.5"; + + src = fetchzip { + url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; + sha256 = "1ypxxqklad5wwyvc39wnphnqp5y4q5zbf9j5mxb3bg9vnls48vx1"; + stripRoot = false; + }; + + nativeBuildInputs = [ dmd pkgconfig which ]; + propagatedBuildInputs = [ + atk cairo gdk_pixbuf glib gstreamer gst_plugins_base gtk3 gtksourceview + libgda libpeas librsvg pango vte + ]; + + prePatch = '' + substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d + substituteInPlace src/cairo/gtkc/cairo-compiletime.d \ + --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ + --replace libcairo.dylib ${cairo}/lib/libcairo.dylib + substituteInPlace src/cairo/gtkc/cairo-runtime.d \ + --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ + --replace libcairo.dylib ${cairo}/lib/libcairo.dylib + substituteInPlace generated/gtkd/gtkc/gdkpixbuf.d \ + --replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ + --replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib + substituteInPlace generated/gtkd/gtkc/atk.d \ + --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \ + --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib + substituteInPlace generated/gtkd/gtkc/pango.d \ + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ + --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ + --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib + substituteInPlace generated/gtkd/gtkc/gobject.d \ + --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \ + --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib + substituteInPlace generated/gtkd/gtkc/rsvg.d \ + --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ + --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib + substituteInPlace generated/gtkd/gtkc/cairo.d \ + --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ + --replace libcairo.dylib ${cairo}/lib/libcairo.dylib + substituteInPlace generated/gtkd/gtkc/gdk.d \ + --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ + --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib + substituteInPlace generated/peas/peasc/peas.d \ + --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ + --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ + --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ + --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib + substituteInPlace generated/vte/vtec/vte.d \ + --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ + --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib + substituteInPlace generated/gstreamer/gstreamerc/gstinterfaces.d \ + --replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \ + --replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib + substituteInPlace generated/sourceview/gsvc/gsv.d \ + --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ + --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib + substituteInPlace generated/gtkd/gtkc/glib.d \ + --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \ + --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \ + --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \ + --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \ + --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \ + --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib + substituteInPlace generated/gtkd/gtkc/gio.d \ + --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \ + --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib + substituteInPlace generated/gstreamer/gstreamerc/gstreamer.d \ + --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ + --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib + substituteInPlace generated/gtkd/gtkc/gtk.d \ + --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ + --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \ + --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \ + --replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib + ''; + + installFlags = "prefix=$(out)"; + + inherit atk cairo gdk_pixbuf librsvg pango; + inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte; + inherit (gst_all_1) gstreamer; + gst_plugins_base = gst_all_1.gst-plugins-base; + + meta = with stdenv.lib; { + description = "D binding and OO wrapper for GTK+"; + homepage = "https://gtkd.org"; + licence = licenses.lgpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/gtkd/paths.d b/pkgs/development/libraries/gtkd/paths.d new file mode 100644 index 000000000000..0f857136499f --- /dev/null +++ b/pkgs/development/libraries/gtkd/paths.d @@ -0,0 +1,142 @@ +/* + * gtkD 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 3 + * of the License, or (at your option) any later version, with + * some exceptions, please read the COPYING file. + * + * gtkD is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with gtkD; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA + * + * paths.d -- list of libraries that will be dynamically linked with gtkD + * + * Added: John Reimer -- 2004-12-20 + * Updated: 2005-02-21 changed names; added version(linux) + * Updated: 2005-05-05 updated Linux support + * Updated: 2008-02-16 Tango support + */ + +module gtkd.paths; + +/* + * Define the Libraries that gtkD will be using. + * This is a growable list, as long as the programmer + * also adds to the importLibs list. + */ + +enum LIBRARY +{ + ATK, + CAIRO, + GDK, + GDKPIXBUF, + GLIB, + GMODULE, + GOBJECT, + GIO, + GTHREAD, + GTK, + PANGO, + PANGOCAIRO, + GLGDK, + GLGTK, + GDA, + GSV, + GSV1, + GSTREAMER, + GSTINTERFACES, + VTE, + PEAS, + RSVG, +} + +version (Windows) +{ + const string[LIBRARY.max+1] importLibs = + [ + LIBRARY.ATK: "libatk-1.0-0.dll", + LIBRARY.CAIRO: "libcairo-2.dll", + LIBRARY.GDK: "libgdk-3-0.dll", + LIBRARY.GDKPIXBUF: "libgdk_pixbuf-2.0-0.dll", + LIBRARY.GLIB: "libglib-2.0-0.dll", + LIBRARY.GMODULE: "libgmodule-2.0-0.dll", + LIBRARY.GOBJECT: "libgobject-2.0-0.dll", + LIBRARY.GIO: "libgio-2.0-0.dll", + LIBRARY.GTHREAD: "libgthread-2.0-0.dll", + LIBRARY.GTK: "libgtk-3-0.dll", + LIBRARY.PANGO: "libpango-1.0-0.dll", + LIBRARY.PANGOCAIRO: "libpangocairo-1.0-0.dll", + LIBRARY.GLGDK: "libgdkglext-3.0-0.dll", + LIBRARY.GLGTK: "libgtkglext-3.0-0.dll", + LIBRARY.GDA: "libgda-4.0-4.dll", + LIBRARY.GSV: "libgtksourceview-3.0-0.dll", + LIBRARY.GSV1: "libgtksourceview-3.0-1.dll", + LIBRARY.GSTREAMER: "libgstreamer-1.0.dll", + LIBRARY.GSTINTERFACES: "libgstvideo-1.0.dll", + LIBRARY.VTE: "libvte-2.91.dll", + LIBRARY.PEAS: "libpeas-1.0.dll", + LIBRARY.RSVG: "librsvg-2-2.dll", + ]; +} +else version(darwin) +{ + const string[LIBRARY.max+1] importLibs = + [ + LIBRARY.ATK: "@atk@/lib/libatk-1.0.dylib", + LIBRARY.CAIRO: "@cairo@/lib/libcairo.dylib", + LIBRARY.GDK: "@gtk3@/lib/libgdk-3.0.dylib", + LIBRARY.GDKPIXBUF: "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.dylib", + LIBRARY.GLIB: "@glib@/lib/libglib-2.0.dylib", + LIBRARY.GMODULE: "@glib@/lib/libgmodule-2.0.dylib", + LIBRARY.GOBJECT: "@glib@/lib/libgobject-2.0.dylib", + LIBRARY.GIO: "@glib@/lib/libgio-2.0.dylib", + LIBRARY.GTHREAD: "@glib@/lib/libgthread-2.0.dylib", + LIBRARY.GTK: "@gtk3@/lib/libgtk-3.0.dylib", + LIBRARY.PANGO: "@pango@/lib/libpango-1.0.dylib", + LIBRARY.PANGOCAIRO: "@pango@/lib/libpangocairo-1.0.dylib", + LIBRARY.GLGDK: "libgdkglext-3.0.dylib", + LIBRARY.GLGTK: "libgtkglext-3.0.dylib", + LIBRARY.GDA: "@libgda@/lib/libgda-2.dylib", + LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", + LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", + LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.dylib", + LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib", + LIBRARY.VTE: "@vte@/lib/libvte-2.91.dylib", + LIBRARY.PEAS: "@libpeas@/lib/libpeas-1.0.dylib", + LIBRARY.RSVG: "@librsvg@/lib/librsvg-2.dylib", + ]; +} +else +{ + const string[LIBRARY.max+1] importLibs = + [ + LIBRARY.ATK: "@atk@/lib/libatk-1.0.so.0", + LIBRARY.CAIRO: "@cairo@/lib/libcairo.so.2", + LIBRARY.GDK: "@gtk3@/lib/libgdk-3.so.0", + LIBRARY.GDKPIXBUF: "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0", + LIBRARY.GLIB: "@glib@/lib/libglib-2.0.so.0", + LIBRARY.GMODULE: "@glib@/lib/libgmodule-2.0.so.0", + LIBRARY.GOBJECT: "@glib@/lib/libgobject-2.0.so.0", + LIBRARY.GIO: "@glib@/lib/libgio-2.0.so.0", + LIBRARY.GTHREAD: "@glib@/lib/libgthread-2.0.so.0", + LIBRARY.GTK: "@gtk3@/lib/libgtk-3.so.0", + LIBRARY.PANGO: "@pango@/lib/libpango-1.0.so.0", + LIBRARY.PANGOCAIRO: "@pango@/lib/libpangocairo-1.0.so.0", + LIBRARY.GLGDK: "libgdkglext-3.0.so.0", + LIBRARY.GLGTK: "libgtkglext-3.0.so.0", + LIBRARY.GDA: "@libgda@/lib/libgda-4.0.so.4", + LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.so.0", + LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.so.1", + LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.so.0", + LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0", + LIBRARY.VTE: "@vte@/lib/libvte-2.91.so.0", + LIBRARY.PEAS: "@libpeas@/lib/libpeas-1.0.so.0", + LIBRARY.RSVG: "@librsvg@/lib/librsvg-2.so.2", + ]; +} diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 1b28477f1e0c..c6cc51b1e1f8 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz"; - sha256 = "1zrz5pz4ryvcssk898liynmy2wyxgj95ak7mp2jv7x62yzihq6h1"; + url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz"; + sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54"; }; - buildInputs = [ aspell pkgconfig gtk3 enchant intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ aspell gtk3 enchant ]; propagatedBuildInputs = [ enchant ]; - meta = { + meta = with stdenv.lib; { homepage = "http://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix new file mode 100644 index 000000000000..d235c6cb0869 --- /dev/null +++ b/pkgs/development/libraries/half/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + version = "1.12.0"; + name = "half-${version}"; + + src = fetchzip { + url = "mirror://sourceforge/half/${version}/half-${version}.zip"; + sha256 = "0096xiw8nj86vxnn3lfcl94vk9qbi5i8lnydri9ws358ly6002vc"; + stripRoot = false; + }; + + buildCommand = '' + mkdir -p $out/include $out/share/doc + cp $src/include/half.hpp $out/include/ + cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/ + ''; + + meta = with stdenv.lib; { + description = "C++ library for half precision floating point arithmetics"; + platforms = platforms.all; + license = licenses.mit; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index e8cd4f13ecef..191d3365d6c2 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.4.4"; + version = "1.4.6"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "0mfj37qr8fw9mzsvk4296fq8vzq909mwlkl2xrjfrfvc8z5gilim"; + sha256 = "21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 39d5b2c792a2..5a1af01c3b1d 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { homepage = http://herqq.org; description = "A software library for building UPnP devices and control points"; inherit (qt4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 07534ed63d71..80085759a76a 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb +, darwin }: stdenv.mkDerivation rec { name = "hidapi-0.8.0-rc1"; @@ -10,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; }; - buildInputs = [ autoreconfHook pkgconfig udev libusb ]; + buildInputs = [ autoreconfHook pkgconfig ] + ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ]; + + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); meta = with stdenv.lib; { homepage = https://github.com/signal11/hidapi; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 76836b69d2a8..eced02fd33e3 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "hivex-${version}"; - version = "1.3.11"; + version = "1.3.14"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "0y3nqykwy58divxkv7gmsb067dasyfz3apbp437hl57rgrndyfn6"; + sha256 = "0aqv28prjcmc66znw0wgaxjijg5mjm44bgn1iil8a4dlbsgv4p7b"; }; patches = [ ./hivex-syms.patch ]; diff --git a/pkgs/development/libraries/hivex/hivex-syms.patch b/pkgs/development/libraries/hivex/hivex-syms.patch index 2280ade59a62..bacd34e8515d 100644 --- a/pkgs/development/libraries/hivex/hivex-syms.patch +++ b/pkgs/development/libraries/hivex/hivex-syms.patch @@ -1,6 +1,6 @@ -diff -rupN hivex-1.3.11/lib/Makefile.am hivex-1.3.11-new/lib/Makefile.am ---- hivex-1.3.11/lib/Makefile.am 2013-09-10 13:04:12.000000000 +0200 -+++ hivex-1.3.11-new/lib/Makefile.am 2014-11-06 01:31:05.956106861 +0100 +diff -rupN hivex-1.3.14/lib/Makefile.am hivex-1.3.14-new/lib/Makefile.am +--- hivex-1.3.14/lib/Makefile.am 2013-09-10 13:04:12.000000000 +0200 ++++ hivex-1.3.14-new/lib/Makefile.am 2014-11-06 01:31:05.956106861 +0100 @@ -40,8 +40,7 @@ libhivex_la_SOURCES = \ libhivex_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix new file mode 100644 index 000000000000..452a159bb28c --- /dev/null +++ b/pkgs/development/libraries/hpx/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "hpx-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "STEllAR-GROUP"; + repo = "hpx"; + rev = "${version}"; + sha256 = "0k79gw4c0v4i7ps1hw6x4m7svxbfml5xm6ly7p00dvg7z9521zsk"; + }; + + buildInputs = [ boost hwloc gperftools ]; + nativeBuildInputs = [ cmake pkgconfig python ]; + + enableParallelBuilding = true; + + meta = { + description = "C++ standard library for concurrency and parallelism"; + homepage = "https://github.com/STEllAR-GROUP/hpx"; + license = stdenv.lib.licenses.boost; + platforms = [ "x86_64-linux" ]; # stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bobakker ]; + }; +} diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index eebd105a00db..424ffd184994 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Hebrew spell checker"; homepage = http://hspell.ivrix.org.il/; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; # Note that I don't speak hebrew, so I can only fix compile problems }; } diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 6557d8f80410..1537f9cc480b 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "htmlcxx-${version}"; - version = "0.85"; + version = "0.86"; src = fetchurl { url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; - sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb"; + sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; patches = [ ./ptrdiff.patch ]; - meta = { + meta = with stdenv.lib; { homepage = http://htmlcxx.sourceforge.net/; - description = "htmlcxx is a simple non-validating css1 and html parser for C++"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + description = "A simple non-validating css1 and html parser for C++"; + license = licenses.lgpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index c33434d202f5..952050f0e8f7 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, ncurses, readline }: +{ stdenv, fetchurl, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - name = "hunspell-1.3.3"; + version = "1.6.1"; + name = "hunspell-${version}"; src = fetchurl { - url = "mirror://sourceforge/hunspell/${name}.tar.gz"; - sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7"; + url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"; + sha256 = "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h"; }; outputs = [ "bin" "dev" "out" "man" ]; buildInputs = [ ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; + + autoreconfFlags = "-vfi"; + configureFlags = [ "--with-ui" "--with-readline" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index e5cb99aa44a1..120b4176c196 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,49 @@ 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 = + { shortName, srcs, shortDescription, longDescription, dictFileName }: + stdenv.mkDerivation rec { + name = "hunspell-dict-${shortName}-xuxen-${version}"; + version = "5-2015.11.10"; + + inherit srcs; + + phases = ["unpackPhase" "installPhase"]; + sourceRoot = "."; + # Copy files stripping until first dash (path and hash) + unpackCmd = "cp $curSrc \${curSrc##*-}"; + installPhase = '' + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 ${dictFileName}.dic "$out/share/hunspell/" + install -m644 ${dictFileName}.aff "$out/share/hunspell/" + # myspell dicts symlinks + install -dm755 "$out/share/myspell/dicts" + ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/" + ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" + ''; + + meta = with stdenv.lib; { + homepage = http://xuxen.eus/; + description = shortDescription; + longDescription = longDescription; + license = licenses.gpl2; + maintainers = with maintainers; [ zalakain ]; + platforms = platforms.all; + }; }; in { @@ -136,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 { @@ -182,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"; @@ -191,4 +395,36 @@ in { sha256 = "0m9frz75fx456bczknay5i446gdcp1smm48lc0qfwzhz0j3zcdrd"; }; }; + + /* BASQUE */ + + eu-es = mkDictFromXuxen { + shortName = "eu-es"; + dictFileName = "eu_ES"; + shortDescription = "Basque (Xuxen 5)"; + longDescription = '' + Itxura berritzeaz gain, testuak zuzentzen laguntzeko zenbait hobekuntza + egin dira Xuxen.eus-en. Lexikoari dagokionez, 18645 sarrera berri erantsi + ditugu, eta proposamenak egiteko sistema ere aldatu dugu. Esate baterako, + gaizki idatzitako hitz baten inguruko proposamenak eskuratzeko, euskaraz + idaztean egiten ditugun akats arruntenak hartu dira kontuan. Sistemak + ematen dituen proposamenak ordenatzeko, berriz, aipatutako irizpidea + erabiltzeaz gain, Internetetik automatikoki eskuratutako euskarazko corpus + bateko datuen arabera ordenatu daitezke emaitzak. Erabiltzaileak horrela + ordenatu nahi baditu proposamenak, hautatu egin behar du aukera hori + testu-kutxaren azpian dituen aukeren artean. Interesgarria da proposamenak + ordenatzeko irizpide hori, hala sistemak formarik erabilienak proposatuko + baitizkigu gutxiago erabiltzen direnen aurretik. + ''; + srcs = [ + (fetchurl { + url = "http://xuxen.eus/static/hunspell/eu_ES.aff"; + sha256 = "12w2j6phzas2rdzc7f20jnk93sm59m2zzfdgxv6p8nvcvbrkmc02"; + }) + (fetchurl { + url = "http://xuxen.eus/static/hunspell/eu_ES.dic"; + sha256 = "0lw193jr7ldvln5x5z9p21rz1by46h0say9whfcw2kxs9vprd5b3"; + }) + ]; + }; } diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 5d07cfe3a2bb..e1acacc328cc 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 , pciutils, numactl }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "hwloc-1.11.2"; + name = "hwloc-1.11.6"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha1 = "3d68de060808f04349538be4e63cde501cd53b0a"; + sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -16,17 +18,17 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) - ++ (stdenv.lib.optionals stdenv.isLinux [ numactl ])); + ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (optionals stdenv.isLinux [ numactl ])); propagatedBuildInputs = # Since `libpci' appears in `hwloc.pc', it must be propagated. - stdenv.lib.optional stdenv.isLinux pciutils; + optional stdenv.isLinux pciutils; enableParallelBuilding = true; postInstall = - stdenv.lib.optionalString (stdenv.isLinux && numactl != null) + optionalString (stdenv.isLinux && numactl != null) '' if [ -d "${numactl}/lib64" ] then numalibdir="${numactl}/lib64" @@ -43,9 +45,8 @@ stdenv.mkDerivation rec { # fail on some build machines. doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; - longDescription = '' hwloc provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of @@ -64,9 +65,7 @@ stdenv.mkDerivation rec { # http://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = http://www.open-mpi.org/projects/hwloc/; - maintainers = [ ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch deleted file mode 100644 index 72d3f67d3bcc..000000000000 --- a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Feb 2014 21:06:42 +0000 -Subject: [PATCH] Disable LDFLAGSICUDT for Linux - -Upstream-Status: Inappropriate [ OE Configuration ] - -Signed-off-by: Khem Raj ---- - source/config/mh-linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/config/mh-linux b/source/config/mh-linux -index 366f0cc..2689aab 100644 ---- a/source/config/mh-linux -+++ b/source/config/mh-linux -@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN - LD_RPATH_PRE = -Wl,-rpath, - - ## These are the library specific LDFLAGS --LDFLAGSICUDT=-nodefaultlibs -nostdlib -+# LDFLAGSICUDT=-nodefaultlibs -nostdlib - - ## Compiler switch to embed a library name - # The initial tab in the next line is to prevent icu-config from reading it. --- -1.7.10.4 - diff --git a/pkgs/development/libraries/icu/57.nix b/pkgs/development/libraries/icu/57.nix deleted file mode 100644 index fbd5f512aee7..000000000000 --- a/pkgs/development/libraries/icu/57.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: - -let - pname = "icu4c"; - version = "57.1"; -in -stdenv.mkDerivation ({ - name = pname + "-" + version; - - src = fetchurl { - url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" - + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - # FIXME: This fixes dylib references in the dylibs themselves, but - # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - postUnpack = '' - sourceRoot=''${sourceRoot}/source - echo Source root reset to ''${sourceRoot} - ''; - - # This pre/postPatch shenanigans is to handle that the patches expect - # to be outside of `source`. - prePatch = '' - pushd .. - ''; - postPatch = '' - popd - ''; - - patches = [ - ]; - - preConfigure = '' - sed -i -e "s|/bin/sh|${stdenv.shell}|" configure - ''; - - configureFlags = "--disable-debug" + - stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; - - # remove dependency on bootstrap-tools in early stdenv build - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc - ''; - - postFixup = ''moveToOutput lib/icu "$dev" ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Unicode and globalization support library"; - homepage = http://site.icu-project.org/; - maintainers = with maintainers; [ raskin urkud ]; - platforms = platforms.all; - }; -} // (if stdenv.isArm then { - patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ]; -} else {})) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 1508f05db8b6..173c9bb58ad9 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -3,8 +3,16 @@ let pname = "icu4c"; version = "58.2"; + + # this patch should no longer be needed in 58.3 + # https://bugs.gentoo.org/show_bug.cgi?id=599142#c14 + keywordFix = fetchurl { + url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; + name = "icu-changeset-39484.diff"; + sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; + }; in -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = pname + "-" + version; src = fetchurl { @@ -25,20 +33,15 @@ stdenv.mkDerivation ({ echo Source root reset to ''${sourceRoot} ''; - # This pre/postPatch shenanigans is to handle that the patches expect - # to be outside of `source`. - prePatch = '' - pushd .. - ''; - postPatch = '' - popd - ''; + patchFlags = "-p4"; - patches = [ - ]; + patches = [ keywordFix ]; preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + '' + stdenv.lib.optionalString stdenv.isArm '' + # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch + sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; configureFlags = "--disable-debug" + @@ -56,9 +59,7 @@ stdenv.mkDerivation ({ meta = with stdenv.lib; { description = "Unicode and globalization support library"; homepage = http://site.icu-project.org/; - maintainers = with maintainers; [ raskin urkud ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; -} // (if stdenv.isArm then { - patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ]; -} else {})) +} diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index a6ad33d842c9..8c66dcec1613 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "imlib2-1.4.9"; + name = "imlib2-1.4.10"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; - sha256 = "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x"; + sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z"; }; buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ] @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { easily, without sacrificing speed. ''; + homepage = http://docs.enlightenment.org/api/imlib2/html; license = licenses.free; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 71bb871a45d7..bc3e1a20abba 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - make sharedlib NDEBUG=1 + make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm" ''; preInstall = '' diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 9477aca59733..7d07408236e6 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,24 +1,24 @@ -{stdenv, fetchurl, gettext, python, xz}: +{stdenv, fetchurl, gettext, python3, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.56"; + name = "iso-codes-3.74"; + src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m"; + sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11"; }; patchPhase = '' for i in `find . -name \*.py` do - sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i done ''; - buildInputs = [ gettext ]; - nativeBuildInputs = [ xz ]; + buildInputs = [ gettext python3 ]; - meta = { + meta = with stdenv.lib; { homepage = http://pkg-isocodes.alioth.debian.org/; description = "Various ISO codes packaged as XML files"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index ae1f9996b78a..3865aa226f9a 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,29 +1,39 @@ -{stdenv, fetchurl, cmake, libX11, libuuid, xz}: +{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.10.0"; + name = "itk-4.11.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.10.0.tar.xz; - sha256 = "0pxijhqsnwcp9jv1d8p11hsj90k8ajpwxhrnn8kk8c56k7y1207a"; + url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz; + sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6"; }; + # Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be + # necessary once we get past ITK 4.11. + patches = [ (fetchpatch { + url = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch"; + sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s"; + }) ]; + cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" + "-DModule_ITKIOMINC=ON" + "-DModule_ITKVtkGlue=ON" + "-DModule_ITKReview=ON" ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid ]; + buildInputs = [ libX11 libuuid vtk ]; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 36b2c469eaf4..63dd931a139f 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-2.0.10"; + name = "jasper-${version}"; + version = "2.0.13"; - src = fetchurl { - # You can find this code on Github at https://github.com/mdadams/jasper - # however note at https://www.ece.uvic.ca/~frodo/jasper/#download - # not all tagged releases are for distribution. - url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "1s022mfxyw8jw60fgyj60lbm9h6bc4nk2751b0in8qsjwcl59n2l"; + src = fetchFromGitHub { + repo = "jasper"; + owner = "mdadams"; + rev = "version-${version}"; + sha256 = "1kd2xiszg9bxfavs3fadi4gi27m876d9zjjy0ns6mmbcjk109c0a"; }; # newer reconf to recognize a multiout flag @@ -25,9 +25,10 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 84638bc01ea6..8c8c181409d4 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jemalloc-${version}"; - version = "4.3.1"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp"; + sha256 = "9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780"; }; # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # option should remove the prefix and give us a working jemalloc. configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; + doCheck = true; + + meta = with stdenv.lib; { homepage = http://jemalloc.net; description = "General purpose malloc(3) implementation"; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index da12b732d00a..b8c72d9669e0 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "json-c-0.12"; + name = "json-c-0.12.1"; src = fetchurl { url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz"; - sha256 = "0dgvjjyb9xva63l6sy70sdch2w4ryvacdmfd3fg2f2v13lqx5mkg"; + sha256 = "148jkvpnxmg1fwwigp0nq9qbd5vzpnmgiw3y34w7k6fymalpsqas"; }; - patches = [ ./unused-variable.patch ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why diff --git a/pkgs/development/libraries/json-c/unused-variable.patch b/pkgs/development/libraries/json-c/unused-variable.patch deleted file mode 100644 index 1726234c526d..000000000000 --- a/pkgs/development/libraries/json-c/unused-variable.patch +++ /dev/null @@ -1,18 +0,0 @@ -See https://groups.google.com/forum/#!topic/json-c/TYodemkG338 -diff --git a/json_tokener.c b/json_tokener.c -index 19de8ef..32bc8af 100644 ---- a/json_tokener.c -+++ b/json_tokener.c -@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok, - - case json_tokener_state_inf: /* aka starts with 'i' */ - { -- int size; - int size_inf; - int is_negative = 0; - - printbuf_memappend_fast(tok->pb, &c, 1); -- size = json_min(tok->st_pos+1, json_null_str_len); - size_inf = json_min(tok->st_pos+1, json_inf_str_len); - char *infbuf = tok->pb->buf; - if (*infbuf == '-') diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 6c120c20d3ac..3c725223979e 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase }: +{ mkDerivation, lib, extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; @@ -8,4 +8,5 @@ kdeFramework { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index dc7b6af193bc..d5da9f5af176 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,14 +1,17 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig -, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, qtbase, solid +{ + mkDerivation, lib, + extra-cmake-modules, + kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, + kidletime, kio, lmdb, qtbase, qtdeclarative, solid, }: -kdeFramework { +mkDerivation { name = "baloo"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio - kidletime lmdb qtbase solid + buildInputs = [ + kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative + solid ]; + propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 261d9471a771..ec4deae6cb40 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,18 +1,19 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , qtbase, qtdeclarative }: -kdeFramework { +mkDerivation { name = "bluez-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtdeclarative ]; + buildInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtbase ]; preConfigure = '' substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" + --replace /lib/udev/rules.d "$bin/lib/udev/rules.d" ''; } diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 9a18ade96a80..c8382ed3408b 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,10 +1,13 @@ -{ kdeFramework, lib, extra-cmake-modules, qtsvg }: +{ mkDerivation, lib, extra-cmake-modules, gtk3, qtsvg }: -kdeFramework { +mkDerivation { name = "breeze-icons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - outputs = [ "out" ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules gtk3 ]; buildInputs = [ qtsvg ]; - propagatedUserEnvPkgs = [ qtsvg.out ]; + 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/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix deleted file mode 100644 index 5b6f2cc4b26d..000000000000 --- a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kdeDerivation, lib, fetchurl }: - -let - mirror = "mirror://kde"; - srcs = import ../srcs.nix { inherit fetchurl mirror; }; -in - -args: - -let - inherit (args) name; - inherit (srcs."${name}") src version; -in kdeDerivation (args // { - name = "${name}-${version}"; - inherit src; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); -}) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 2906dc788865..d92e7d19c650 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -24,89 +24,168 @@ existing packages here and modify it as necessary. */ -{ libsForQt5, kdeDerivation, lib, fetchurl }: +{ libsForQt5, lib, fetchurl }: let + + srcs = import ./srcs.nix { + inherit fetchurl; + mirror = "mirror://kde"; + }; + + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + packages = self: with self; + # SUPPORT let + + propagate = out: + let setupHook = { writeScript }: + writeScript "setup-hook" '' + if [ "$hookName" != postHook ]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@" + + 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 + ''; + in callPackage setupHook {}; + + propagateBin = propagate "bin"; + callPackage = self.newScope { - kdeFramework = import ./build-support/framework.nix { - inherit kdeDerivation lib fetchurl; - }; + + inherit propagate propagateBin; + + mkDerivation = args: + let + + inherit (args) name; + inherit (srcs."${name}") src version; + + outputs = args.outputs or [ "out" "dev" "bin" ]; + hasBin = lib.elem "bin" outputs; + hasDev = lib.elem "dev" outputs; + + defaultSetupHook = if hasBin && hasDev then propagateBin else null; + setupHook = args.setupHook or defaultSetupHook; + + meta = { + homepage = "http://www.kde.org"; + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.linux; + } // (args.meta or {}); + + in mkDerivation (args // { + name = "${name}-${version}"; + inherit meta outputs setupHook src; + }); + }; + in { + extra-cmake-modules = callPackage ./extra-cmake-modules {}; + + # TIER 1 attica = callPackage ./attica.nix {}; - baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; breeze-icons = callPackage ./breeze-icons.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration.nix {}; - kactivities = callPackage ./kactivities.nix {}; - kactivities-stats = callPackage ./kactivities-stats.nix {}; kapidox = callPackage ./kapidox.nix {}; karchive = callPackage ./karchive.nix {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; kcodecs = callPackage ./kcodecs.nix {}; - kcompletion = callPackage ./kcompletion.nix {}; kconfig = callPackage ./kconfig.nix {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; kcoreaddons = callPackage ./kcoreaddons.nix {}; - kcrash = callPackage ./kcrash.nix {}; kdbusaddons = callPackage ./kdbusaddons.nix {}; - kdeclarative = callPackage ./kdeclarative.nix {}; - kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support {}; - kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdesu = callPackage ./kdesu.nix {}; kdnssd = callPackage ./kdnssd.nix {}; - kdoctools = callPackage ./kdoctools {}; - kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata {}; - kglobalaccel = callPackage ./kglobalaccel.nix {}; kguiaddons = callPackage ./kguiaddons.nix {}; - khtml = callPackage ./khtml.nix {}; ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes {}; kidletime = callPackage ./kidletime.nix {}; - kimageformats = callPackage ./kimageformats.nix {}; - kinit = callPackage ./kinit {}; - kio = callPackage ./kio {}; kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; - kjobwidgets = callPackage ./kjobwidgets.nix {}; - kjs = callPackage ./kjs.nix {}; - kjsembed = callPackage ./kjsembed.nix {}; - kmediaplayer = callPackage ./kmediaplayer.nix {}; - knewstuff = callPackage ./knewstuff.nix {}; - knotifications = callPackage ./knotifications.nix {}; - knotifyconfig = callPackage ./knotifyconfig.nix {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts.nix {}; - kpeople = callPackage ./kpeople.nix {}; kplotting = callPackage ./kplotting.nix {}; - kpty = callPackage ./kpty.nix {}; - kross = callPackage ./kross.nix {}; - krunner = callPackage ./krunner.nix {}; - kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor.nix {}; - ktextwidgets = callPackage ./ktextwidgets.nix {}; - kunitconversion = callPackage ./kunitconversion.nix {}; - kwallet = callPackage ./kwallet.nix {}; kwayland = callPackage ./kwayland.nix {}; kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; - kwindowsystem = callPackage ./kwindowsystem.nix {}; - kxmlgui = callPackage ./kxmlgui.nix {}; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; + kwindowsystem = callPackage ./kwindowsystem {}; modemmanager-qt = callPackage ./modemmanager-qt.nix {}; networkmanager-qt = callPackage ./networkmanager-qt.nix {}; oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; - plasma-framework = callPackage ./plasma-framework.nix {}; + prison = callPackage ./prison.nix {}; solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; + + # TIER 2 + kactivities = callPackage ./kactivities.nix {}; + kactivities-stats = callPackage ./kactivities-stats.nix {}; + kauth = callPackage ./kauth {}; + kcompletion = callPackage ./kcompletion.nix {}; + kcrash = callPackage ./kcrash.nix {}; + kdoctools = callPackage ./kdoctools {}; + kfilemetadata = callPackage ./kfilemetadata {}; + kimageformats = callPackage ./kimageformats.nix {}; + kjobwidgets = callPackage ./kjobwidgets.nix {}; + knotifications = callPackage ./knotifications.nix {}; + kpackage = callPackage ./kpackage {}; + kpty = callPackage ./kpty.nix {}; + kunitconversion = callPackage ./kunitconversion.nix {}; + + # TIER 3 + baloo = callPackage ./baloo.nix {}; + kbookmarks = callPackage ./kbookmarks.nix {}; + kcmutils = callPackage ./kcmutils {}; + kconfigwidgets = callPackage ./kconfigwidgets {}; + kdeclarative = callPackage ./kdeclarative.nix {}; + kded = callPackage ./kded.nix {}; + kdesignerplugin = callPackage ./kdesignerplugin.nix {}; + kdesu = callPackage ./kdesu.nix {}; + kemoticons = callPackage ./kemoticons.nix {}; + kglobalaccel = callPackage ./kglobalaccel.nix {}; + kiconthemes = callPackage ./kiconthemes {}; + kinit = callPackage ./kinit {}; + kio = callPackage ./kio {}; + knewstuff = callPackage ./knewstuff.nix {}; + knotifyconfig = callPackage ./knotifyconfig.nix {}; + kparts = callPackage ./kparts.nix {}; + kpeople = callPackage ./kpeople.nix {}; + krunner = callPackage ./krunner.nix {}; + kservice = callPackage ./kservice {}; + ktexteditor = callPackage ./ktexteditor.nix {}; + ktextwidgets = callPackage ./ktextwidgets.nix {}; + kwallet = callPackage ./kwallet.nix {}; + kxmlgui = callPackage ./kxmlgui.nix {}; + kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; + plasma-framework = callPackage ./plasma-framework.nix {}; + + # TIER 4 + frameworkintegration = callPackage ./frameworkintegration.nix {}; + + # PORTING AIDS + kdelibs4support = callPackage ./kdelibs4support {}; + khtml = callPackage ./khtml.nix {}; + kjs = callPackage ./kjs.nix {}; + kjsembed = callPackage ./kjsembed.nix {}; + kmediaplayer = callPackage ./kmediaplayer.nix {}; + kross = callPackage ./kross.nix {}; + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index b2e3a371e965..dfdb6a11803d 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig }: +{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }: -kdeFramework { +mkDerivation { name = "extra-cmake-modules"; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); @@ -12,7 +12,7 @@ kdeFramework { setupHook = ./setup-hook.sh; meta = with lib; { - platforms = lib.platforms.linux; + platforms = platforms.linux ++ platforms.darwin; homepage = "http://www.kde.org"; license = licenses.bsd2; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 9ee9ef90a44b..c1b1e21852cf 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -1,22 +1,17 @@ -_ecmSetXdgDirs() { +_ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" } +envHooks+=(_ecmEnvHook) -envHooks+=(_ecmSetXdgDirs) - -_ecmConfig() { +_ecmPreConfigureHook() { # Because we need to use absolute paths here, we must set *all* the paths. cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec" + cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec" cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" - cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/lib/qt5/plugins" - cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/lib/qt5/plugins" - cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputBin}/lib/qt5/imports" - cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/lib/qt5/qml" cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" @@ -29,7 +24,7 @@ _ecmConfig() { cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" - cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale" + cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" @@ -46,6 +41,14 @@ _ecmConfig() { cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" -} -preConfigureHooks+=(_ecmConfig) + if [ -n "$qtPluginPrefix" ]; then + cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" + cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" + fi + + if [ -n "$qtQmlPrefix" ]; then + cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" + fi +} +preConfigureHooks+=(_ecmPreConfigureHook) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 263f811ebc62..480b11622c05 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.31/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index 325758bf91db..58b064806e52 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,16 +1,17 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras }: -kdeFramework { +mkDerivation { name = "frameworkintegration"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes - knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras + buildInputs = [ + kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage + kwidgetsaddons libXcursor qtx11extras ]; + propagatedBuildInputs = [ kconfigwidgets kiconthemes ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 25188b009b62..b558306248ae 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,8 +1,14 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kactivities, kconfig }: +{ + mkDerivation, lib, + extra-cmake-modules, + boost, kactivities, kconfig, qtbase, +}: -kdeFramework { +mkDerivation { name = "kactivities-stats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ boost kactivities kconfig ]; + buildInputs = [ boost kactivities kconfig ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index 167c3f15bbda..eabac6aadd7e 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -1,14 +1,15 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig -, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative +{ + mkDerivation, lib, + extra-cmake-modules, + boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative, }: -kdeFramework { +mkDerivation { name = "kactivities"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel - ki18n kio kservice kwindowsystem kxmlgui qtdeclarative + buildInputs = [ + boost kconfig kcoreaddons kio kwindowsystem qtdeclarative ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index 749cf9b29709..ca5e773a45b9 100644 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,7 +1,10 @@ -{ kdeFramework, lib, extra-cmake-modules, python }: +{ mkDerivation, lib, extra-cmake-modules, python }: -kdeFramework { +mkDerivation { name = "kapidox"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules python ]; + postFixup = '' + moveToOutput bin $bin + ''; } diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 71561b1109c8..1f90db2bc028 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,11 +1,17 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase }: +{ + mkDerivation, lib, + extra-cmake-modules, + bzip2, lzma, qtbase, zlib, +}: -kdeFramework { +mkDerivation { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; + buildInputs = [ bzip2 lzma zlib ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 7561575ae84e..c94c8b91ecd2 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,9 +1,17 @@ -{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }: +{ + mkDerivation, lib, copyPathsToStore, propagate, + extra-cmake-modules, kcoreaddons, polkit-qt, qttools +}: -kdeFramework { +mkDerivation { name = "kauth"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - propagatedBuildInputs = [ kcoreaddons polkit-qt ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ polkit-qt qttools ]; + propagatedBuildInputs = [ kcoreaddons ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + # library stores reference to plugin path, + # separating $out from $bin would create a reference cycle + outputs = [ "out" "dev" ]; + setupHook = propagate "out"; } diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 36ea74058429..dc2339632e45 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -1,13 +1,17 @@ { - kdeFramework, lib, extra-cmake-modules, - kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui + mkDerivation, lib, + extra-cmake-modules, qttools, + kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons, + kxmlgui, qtbase, }: -kdeFramework { +mkDerivation { name = "kbookmarks"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui ]; + propagatedBuildInputs = [ kwidgetsaddons qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index fdf55174548e..0c661dcdd48e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,15 +1,18 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets -, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews -, kpackage, kservice, kxmlgui +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, + kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, + kpackage, kservice, kxmlgui, qtdeclarative, }: -kdeFramework { +mkDerivation { name = "kcmutils"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews - kpackage kservice kxmlgui + buildInputs = [ + kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui + qtdeclarative ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + propagatedBuildInputs = [ kconfigwidgets kservice ]; + patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); } diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch new file mode 100644 index 000000000000..0411755f45a6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch @@ -0,0 +1,13 @@ +Index: kcmutils-5.33.0/src/kcmoduleloader.cpp +=================================================================== +--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp ++++ kcmutils-5.33.0/src/kcmoduleloader.cpp +@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con + KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); + KPluginFactory* factory = loader.factory(); + if (!factory) { +- qWarning() << "Error loading plugin:" << loader.errorString(); ++ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); + } else { + KQuickAddons::ConfigModule *cm = factory->create(); + if (!cm) { diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch new file mode 100644 index 000000000000..e82ce7d592c8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch @@ -0,0 +1,13 @@ +Index: kcmutils-5.33.0/src/kcmoduleloader.cpp +=================================================================== +--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp ++++ kcmutils-5.33.0/src/kcmoduleloader.cpp +@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con + if (module) { + return module; + } else { +- KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); ++ KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library())); + KPluginFactory* factory = loader.factory(); + if (!factory) { + qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch similarity index 54% rename from pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch index 0d861fa95012..5e1007b7fc0b 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch @@ -1,17 +1,8 @@ -From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:43:53 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/kpluginselector.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index 9c3431d..d6b1ee2 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName, +Index: kcmutils-5.33.0/src/kpluginselector.cpp +=================================================================== +--- kcmutils-5.33.0.orig/src/kpluginselector.cpp ++++ kcmutils-5.33.0/src/kpluginselector.cpp +@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q QStringList desktopFileNames; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString &dir, dirs) { @@ -20,6 +11,3 @@ index 9c3431d..d6b1ee2 100644 while (it.hasNext()) { desktopFileNames.append(it.next()); } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series new file mode 100644 index 000000000000..6fbc4ca65635 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series @@ -0,0 +1,3 @@ +kcmutils-follow-symlinks.patch +kcmutils-debug-module-loader.patch +kcmutils-fix-plugin-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index fa1679519cc1..90c9a963a60e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,11 +1,13 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qttools ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index f143524889ad..fdfe28db6c04 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,9 +1,14 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }: +{ + mkDerivation, lib, + extra-cmake-modules, + kconfig, kwidgetsaddons, qtbase, qttools +}: -kdeFramework { +mkDerivation { name = "kcompletion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ kconfig kwidgetsaddons ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kwidgetsaddons qttools ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index f6d38cd23363..78b554017ee8 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,11 +1,12 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qttools ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index c44473bb915e..3943e5d6d494 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -1,17 +1,20 @@ { - kdeFramework, lib, extra-cmake-modules, - kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons + mkDerivation, lib, extra-cmake-modules, + kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qtbase, }: -kdeFramework { +mkDerivation { name = "kconfigwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons - ]; + buildInputs = [ kguiaddons ki18n qtbase ]; + propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + outputs = [ "out" "dev" ]; + preConfigure = '' + outputBin=dev + ''; postInstall = '' - moveToOutput "bin/preparetips5" "$dev" + moveToOutput share/man $dev ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 4d35c0bbdea1..34073d64f89f 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,12 +1,16 @@ -{ kdeFramework, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }: +{ + mkDerivation, lib, fetchurl, writeScript, + extra-cmake-modules, + qtbase, qttools, shared_mime_info +}: -kdeFramework { +mkDerivation { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qttools shared_mime_info ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index bd008c732af7..d45d73d33e41 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -1,8 +1,14 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }: +{ + mkDerivation, lib, + extra-cmake-modules, + kcoreaddons, kwindowsystem, qtbase, qtx11extras, +}: -kdeFramework { +mkDerivation { name = "kcrash"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; + buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index 2bbbf65f898e..d0c744da8864 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,11 +1,16 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }: +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qttools, qtx11extras +}: -kdeFramework { +mkDerivation { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - propagatedBuildInputs = [ qtx11extras ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qttools qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 05eaffb9fbf6..7aabeb021545 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,15 +1,16 @@ { - kdeFramework, lib, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative }: -kdeFramework { +mkDerivation { name = "kdeclarative"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage - kwidgetsaddons kwindowsystem qtdeclarative + buildInputs = [ + epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons + kwindowsystem ]; + propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 2da1bac8f39c..65377789582e 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,13 +1,16 @@ { - kdeFramework, lib, extra-cmake-modules, - kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice + mkDerivation, lib, propagate, + extra-cmake-modules, kdoctools, + kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase, }: -kdeFramework { +mkDerivation { name = "kded"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kconfig kcoreaddons kcrash kdbusaddons kinit kservice + buildInputs = [ + kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase ]; + outputs = [ "out" "dev" ]; + setupHook = propagate "out"; } diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 1174972917e4..6937a4056b28 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,30 +1,32 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, docbook_xml_dtd_45, kauth -, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels -, kinit, knotifications, kparts, kservice, ktextwidgets -, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui -, networkmanager, qtsvg, qtx11extras, xlibs +{ + mkDerivation, lib, copyPathsToStore, + docbook_xml_dtd_45, extra-cmake-modules, kdoctools, + kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, + kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, + ki18n, kiconthemes, kio, kitemmodels, kinit, knotifications, kparts, kservice, + ktextwidgets, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui, + networkmanager, qtbase, qtsvg, qttools, qtx11extras, xlibs }: -# TODO: debug docbook detection - -kdeFramework { +mkDerivation { name = "kdelibs4support"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + propagatedNativeBuildInputs = [ kdoctools ]; + buildInputs = [ + kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons + kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM + ]; propagatedBuildInputs = [ - kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash - kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n - kio kiconthemes kitemmodels kinit knotifications kparts kservice - ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui - networkmanager qtsvg qtx11extras xlibs.libSM + kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin + kemoticons kguiaddons kiconthemes kitemmodels kinit knotifications kparts + ktextwidgets kunitconversion kwindowsystem qtbase ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 8e17a1a60c8d..91b596cc4d38 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -1,26 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdoctools -, kiconthemes -, kio -, kitemviews -, kplotting -, ktextwidgets -, kwidgetsaddons -, kxmlgui -, sonnet +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio, + kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet, }: -kdeFramework { +mkDerivation { name = "kdesignerplugin"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio - kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet + buildInputs = [ + kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews + kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix index fcccea9161f1..df60511b5115 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix @@ -1,10 +1,14 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty -, kservice +{ + mkDerivation, lib, + extra-cmake-modules, + kcoreaddons, ki18n, kpty, kservice, qtbase, }: -kdeFramework { +mkDerivation { name = "kdesu"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ]; + buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ]; + propagatedBuildInputs = [ kpty ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 18a435139f6f..9382db43e2d5 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -1,15 +1,17 @@ -{ kdeFramework, lib -, extra-cmake-modules, qttools -, avahi, qtbase +{ + mkDerivation, lib, + extra-cmake-modules, + avahi, qtbase, qttools, }: -kdeFramework { +mkDerivation { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - propagatedBuildInputs = [ avahi ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ avahi qttools ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 99fc4c7d023c..55d719e8d8c0 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,16 +1,28 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, perl, perlPackages +{ + mkDerivation, lib, + extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, + karchive, ki18n, qtbase, + perl, perlPackages }: -kdeFramework { +mkDerivation { name = "kdoctools"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ karchive ki18n ]; propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + buildInputs = [ karchive ki18n ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; + patches = [ ./kdoctools-no-find-docbook-xml.patch ]; + preConfigure = '' + outputBin=dev + ''; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" ]; - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; + postFixup = '' + moveToOutput "share/doc" "$dev" + moveToOutput "share/man" "$dev" + ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index 1e31277172d7..b7f4f036db5e 100644 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix @@ -1,14 +1,13 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kservice +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kcoreaddons, kservice, qtbase, }: -kdeFramework { +mkDerivation { name = "kemoticons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ]; + buildInputs = [ karchive kcoreaddons ]; + propagatedBuildInputs = [ kservice qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index bc7349e7453f..7f325c88049e 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,13 +1,16 @@ -{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules -, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, + attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib }: -kdeFramework { +mkDerivation { name = "kfilemetadata"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib + buildInputs = [ + attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib ]; + propagatedBuildInputs = [ qtbase ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 1c1336dd4d0f..05fde45f17d2 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,14 +1,20 @@ { - kdeFramework, lib, extra-cmake-modules, + mkDerivation, lib, + extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, - qtx11extras + qtbase, qttools, qtx11extras, }: -kdeFramework { +mkDerivation { name = "kglobalaccel"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras + buildInputs = [ + kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools + qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + postPatch = '' + sed -i src/runtime/org.kde.kglobalaccel.service.in \ + -e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|" + ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index f93aa0967f67..5cc7e3607828 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,15 +1,17 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, qtbase, qtx11extras, }: -kdeFramework { +mkDerivation { name = "kguiaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtx11extras ]; + buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 99f6fe31e0d7..3724d078afff 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -1,16 +1,19 @@ -{ kdeFramework, lib, extra-cmake-modules, giflib, karchive -, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs -, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons -, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet +{ + mkDerivation, lib, + extra-cmake-modules, perl, + giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs, + knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, + kxmlgui, phonon, qtx11extras, sonnet }: -kdeFramework { +mkDerivation { name = "khtml"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules perl ]; - propagatedBuildInputs = [ - giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs - knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem - kxmlgui phonon qtx11extras sonnet + buildInputs = [ + giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications + kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon + qtx11extras sonnet ]; + propagatedBuildInputs = [ kjs ]; } diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 68f29c8314f3..805cb201bd74 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, gettext, python, qtbase, qtdeclarative, qtscript, }: -kdeFramework { +mkDerivation { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; @@ -12,5 +12,5 @@ kdeFramework { }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python ]; - propagatedBuildInputs = [ qtdeclarative qtscript ]; + buildInputs = [ qtdeclarative qtscript ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 6102bb0d4b56..4b8e0059377d 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,12 +1,17 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules -, karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, + breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, + qtbase, qtsvg, }: -kdeFramework { +mkDerivation { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ]; + buildInputs = [ + breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews + ]; + propagatedBuildInputs = [ qtbase qtsvg ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index bfec344ca112..69d83eb0ff5f 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -1,15 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase -, qtx11extras +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qtx11extras }: -kdeFramework { +mkDerivation { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtbase qtx11extras ]; + buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 2a8e825893bf..26a8637bafc2 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,14 +1,16 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, - ilmbase, karchive, qtbase + ilmbase, karchive, openexr, qtbase }: -kdeFramework { +let inherit (lib) getDev; in + +mkDerivation { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ilmbase qtbase ]; - propagatedBuildInputs = [ karchive ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + buildInputs = [ karchive openexr qtbase ]; + outputs = [ "out" ]; # plugins only + NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR"; } diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index b965f761e922..1036ea277452 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,15 +1,36 @@ { - kdeFramework, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, writeScript, extra-cmake-modules, kdoctools, - kconfig, kcrash, ki18n, kio, kservice, kwindowsystem + kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework }: -kdeFramework { +let inherit (lib) getLib; in + +mkDerivation { name = "kinit"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_KF5_KIOCORE="${getLib kio}/lib/libKF5KIOCore.so.5"'' + ''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"'' + ''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"'' + ]; + postFixup = '' + moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin" + ''; + setupHook = writeScript "setup-hook.sh" '' + kinitFixupOutputHook() { + if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then + mkdir -p ''${!outputBin}/lib + find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \; + rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib + fi + } + + fixupOutputHooks+=(kinitFixupOutputHook) + ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch new file mode 100644 index 000000000000..75e632d41292 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch @@ -0,0 +1,49 @@ +Index: kinit-5.32.0/src/kdeinit/kinit.cpp +=================================================================== +--- kinit-5.32.0.orig/src/kdeinit/kinit.cpp ++++ kinit-5.32.0/src/kdeinit/kinit.cpp +@@ -96,11 +96,9 @@ static const char *extra_libs[] = { + "libKF5Parts.5.dylib", + "libKF5Plasma.5.dylib" + #else +- "libKF5KIOCore.so.5", +- "libKF5Parts.so.5", +-//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see. +- "libKF5Plasma.so.5" +-//#endif ++ NIXPKGS_KF5_KIOCORE, ++ NIXPKGS_KF5_PARTS, ++ NIXPKGS_KF5_PLASMA + #endif + }; + #endif +@@ -1533,20 +1531,6 @@ static int initXconnection() + } + #endif + +-#ifndef Q_OS_OSX +-// Find a shared lib in the lib dir, e.g. libkio.so. +-// Completely unrelated to plugins. +-static QString findSharedLib(const QString &lib) +-{ +- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; +- if (QFile::exists(path)) { +- return path; +- } +- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? +- return QString(); +-} +-#endif +- + extern "C" { + + static void secondary_child_handler(int) +@@ -1692,7 +1676,7 @@ int main(int argc, char **argv) + if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { + const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]); + for (int i = 0; i < extrasCount; i++) { +- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i])); ++ const QString extra = QString::fromLatin1(extra_libs[i]); + if (!extra.isEmpty()) { + QLibrary l(extra); + l.setLoadHints(QLibrary::ExportExternalSymbolsHint); diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch index a5c76fca2481..b949723fb543 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch @@ -1,8 +1,8 @@ -Index: kinit-5.24.0/src/kdeinit/kinit.cpp +Index: kinit-5.32.0/src/kdeinit/kinit.cpp =================================================================== ---- kinit-5.24.0.orig/src/kdeinit/kinit.cpp -+++ kinit-5.24.0/src/kdeinit/kinit.cpp -@@ -672,19 +672,16 @@ static pid_t launch(int argc, const char +--- kinit-5.32.0.orig/src/kdeinit/kinit.cpp ++++ kinit-5.32.0/src/kdeinit/kinit.cpp +@@ -623,19 +623,15 @@ static pid_t launch(int argc, const char if (!libpath.isEmpty()) { if (libpath_relative) { @@ -23,10 +23,9 @@ Index: kinit-5.24.0/src/kdeinit/kinit.cpp + QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); + // Reverse the profile list. + std::reverse(profiles.begin(), profiles.end()); -+ const QString libdir = QString::fromLatin1("/lib/"); -+ Q_FOREACH (const QByteArray &profile, profiles) { ++ for (const QByteArray &profile: profiles) { + if (!profile.isEmpty()) { -+ l.setFileName(QFile::decodeName(profile) + libdir + libpath); ++ l.setFileName(QFile::decodeName(profile) + QStringLiteral("/lib/") + libpath); + if (l.load()) break; + } } diff --git a/pkgs/development/libraries/kde-frameworks/kinit/series b/pkgs/development/libraries/kde-frameworks/kinit/series index 576b8a935bf1..9195a4e8e6b0 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/series +++ b/pkgs/development/libraries/kde-frameworks/kinit/series @@ -1,2 +1,3 @@ kinit-libpath.patch start_kdeinit-path.patch +kdeinit-extra_libs.patch diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 1d37c794674b..e4e4c90bfe14 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,28 +1,23 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, acl, karchive -, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews -, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui -, qtscript, qtx11extras, solid, fetchpatch +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, kdoctools, + karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, + kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, + kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, + qtbase, qtscript, qtx11extras, solid, }: -kdeFramework { +mkDerivation { name = "kio"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice - ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript - qtx11extras + buildInputs = [ + karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications + ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras ]; - patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)) - ++ [ - (fetchpatch { - name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch"; - url = "https://cgit.kde.org/kio.git/patch/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4"; - sha256 = "1s6rcp8rrlhc6rgy3b303y0qq0s8371n12r5lk9zbkw14wjvbix0"; - }) - ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice + kxmlgui qtbase solid + ]; + patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); } diff --git a/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch new file mode 100644 index 000000000000..d26af49e5eb2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch @@ -0,0 +1,13 @@ +Index: kio-5.33.0/src/kiod/kiod_main.cpp +=================================================================== +--- kio-5.33.0.orig/src/kiod/kiod_main.cpp ++++ kio-5.33.0/src/kiod/kiod_main.cpp +@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam + module = factory->create(); + } + if (!module) { +- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString(); ++ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString(); + return; + } + module->setModuleName(name); // makes it register to DBus diff --git a/pkgs/development/libraries/kde-frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series index 77ca15450047..5330c40a3306 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/series +++ b/pkgs/development/libraries/kde-frameworks/kio/series @@ -1 +1,2 @@ samba-search-path.patch +kio-debug-module-loader.patch diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index e2f0633da8c5..faeb5b16c34d 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -1,13 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules, qtbase +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase }: -kdeFramework { +mkDerivation { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index df420f8f4b99..c4c0e804e2d3 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,13 +1,17 @@ -{ kdeFramework, lib -, extra-cmake-modules, qtbase, qttools +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qttools ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index ddc66d2eb20a..810e2bf8c84e 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -1,13 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwidgetsaddons -, qttools, qtx11extras +{ + mkDerivation, lib, + extra-cmake-modules, qttools, + kcoreaddons, kwidgetsaddons, qtx11extras }: -kdeFramework { +mkDerivation { name = "kjobwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; - propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; + buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index abdc15ce8df6..311f07241d65 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,10 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + pcre, qtbase, }: -kdeFramework { +mkDerivation { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ pcre qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index 95bc02422f1b..e8cd5070ae53 100644 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix @@ -1,10 +1,13 @@ -{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, qtsvg +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, qttools, + ki18n, kjs, qtsvg, }: -kdeFramework { +mkDerivation { name = "kjsembed"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ ki18n kjs qtsvg ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; + buildInputs = [ ki18n qtsvg ]; + propagatedBuildInputs = [ kjs ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 93a6b450f762..a4714c9e4ad7 100644 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix @@ -1,12 +1,12 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , kparts , kxmlgui }: -kdeFramework { +mkDerivation { name = "kmediaplayer"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kparts kxmlgui ]; + buildInputs = [ kparts kxmlgui ]; } diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix index 002418c65ad0..70f3cbb3c37e 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix @@ -1,14 +1,18 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, karchive -, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio -, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui +{ + mkDerivation, lib, + extra-cmake-modules, + attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, + kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, + qtdeclarative, }: -kdeFramework { +mkDerivation { name = "knewstuff"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio - kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui + buildInputs = [ + karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews + ktextwidgets kwidgetsaddons qtbase qtdeclarative ]; + propagatedBuildInputs = [ attica kservice kxmlgui ]; } diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index c1c079578725..964e1b441154 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , kcodecs, kconfig, kcoreaddons, kwindowsystem , libdbusmenu @@ -6,11 +6,11 @@ , qttools, qtx11extras }: -kdeFramework { +mkDerivation { name = "knotifications"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; - propagatedBuildInputs = [ + buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 0e357aecb999..6739f96183c1 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix @@ -1,10 +1,14 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, ki18n, kio, phonon +{ + mkDerivation, lib, + extra-cmake-modules, + kcompletion, kconfig, ki18n, kio, phonon, qtbase, }: -kdeFramework { +mkDerivation { name = "knotifyconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ]; + buildInputs = [ kcompletion kconfig ki18n kio phonon ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 2953aea9a557..c0b4b6312861 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,13 +1,13 @@ { - kdeFramework, fetchurl, lib, copyPathsToStore, + mkDerivation, fetchurl, lib, copyPathsToStore, extra-cmake-modules, kdoctools, - karchive, kconfig, kcoreaddons, ki18n + karchive, kconfig, kcoreaddons, ki18n, qtbase, }: -kdeFramework { +mkDerivation { name = "kpackage"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; + buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index ad6ea2dbc305..f657569277a1 100644 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks/kparts.nix @@ -1,14 +1,17 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice -, ktextwidgets, kwidgetsaddons, kxmlgui +{ + mkDerivation, lib, + extra-cmake-modules, + kconfig, kcoreaddons, ki18n, kiconthemes, kio, kjobwidgets, knotifications, + kservice, ktextwidgets, kwidgetsaddons, kxmlgui }: -kdeFramework { +mkDerivation { name = "kparts"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications - kservice ktextwidgets kwidgetsaddons kxmlgui + buildInputs = [ + kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice + kwidgetsaddons ]; + propagatedBuildInputs = [ kio ktextwidgets kxmlgui ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 6acb5e2eed51..04181fd3e13a 100644 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix @@ -1,12 +1,16 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n -, kitemviews, kservice, kwidgetsaddons, qtdeclarative +{ + mkDerivation, lib, + extra-cmake-modules, + kcoreaddons, ki18n, kitemviews, kservice, kwidgetsaddons, qtbase, + qtdeclarative, }: -kdeFramework { +mkDerivation { name = "kpeople"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ + buildInputs = [ kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index e132a45976f5..5ff37fb1db12 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -1,13 +1,14 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index 8bdaacb85f82..150c5b3d2b26 100644 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks/kpty.nix @@ -1,8 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }: -kdeFramework { +mkDerivation { name = "kpty"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcoreaddons ki18n ]; + buildInputs = [ kcoreaddons ki18n qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index 0e66d95b5cce..f45fb5ecd1d0 100644 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ b/pkgs/development/libraries/kde-frameworks/kross.nix @@ -1,14 +1,14 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +{ mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons -, kxmlgui, qtscript +, kxmlgui, qtbase, qtscript, qtxmlpatterns, }: -kdeFramework { +mkDerivation { name = "kross"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcompletion kcoreaddons kxmlgui ]; propagatedBuildInputs = [ - kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui - qtscript + ki18n kiconthemes kio kparts kwidgetsaddons qtbase qtscript qtxmlpatterns ]; } diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index ec9ab7abe9f9..9782320a4873 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,14 +1,17 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, ki18n, kio, kservice, plasma-framework, solid -, threadweaver +{ + mkDerivation, lib, + extra-cmake-modules, + kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, + qtdeclarative, solid, threadweaver }: -kdeFramework { +mkDerivation { name = "krunner"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kconfig kcoreaddons ki18n kio kservice plasma-framework solid + buildInputs = [ + kconfig kcoreaddons ki18n kio kservice qtdeclarative solid threadweaver ]; + propagatedBuildInputs = [ plasma-framework qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 2751a7f5d6e0..3ac4f4dc2688 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,14 +1,19 @@ { - kdeFramework, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, bison, extra-cmake-modules, flex, - kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem + kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, + qtbase, shared_mime_info, }: -kdeFramework { +mkDerivation { name = "kservice"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ]; - nativeBuildInputs = [ kdoctools ]; - propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedNativeBuildInputs = [ bison flex ]; + buildInputs = [ + kcrash kdbusaddons ki18n kwindowsystem qtbase + ]; + propagatedBuildInputs = [ kconfig kcoreaddons ]; + propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5 patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index fbd73c65eff6..ae4d3a71d535 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,17 +1,17 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, perl -, karchive, kconfig, kguiaddons, kiconthemes, kparts -, libgit2 -, qtscript, qtxmlpatterns -, ki18n, kio, sonnet, syntax-highlighting +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, perl, + karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, + qtscript, qtxmlpatterns, sonnet, syntax-highlighting }: -kdeFramework { +mkDerivation { name = "ktexteditor"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules perl ]; - propagatedBuildInputs = [ - karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript + buildInputs = [ + karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript qtxmlpatterns sonnet syntax-highlighting ]; + propagatedBuildInputs = [ kparts ]; } diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 25954c603971..8b082f7f3655 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -1,14 +1,16 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem -, sonnet +{ + mkDerivation, lib, + extra-cmake-modules, + kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kservice, + kwindowsystem, qtbase, sonnet, }: -kdeFramework { +mkDerivation { name = "ktextwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem - sonnet + buildInputs = [ + kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem ]; + propagatedBuildInputs = [ ki18n qtbase sonnet ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index c04ded722aa4..d6c079fd83b8 100644 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix @@ -1,8 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, ki18n, qtbase, }: -kdeFramework { +mkDerivation { name = "kunitconversion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n ]; + buildInputs = [ ki18n qtbase ]; + outputs = [ "out" "dev" ]; } 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 000000000000..00f3d8baedf9 --- /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 f02c6138df77..ece915071ad0 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,14 +1,19 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets -, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes -, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n, + kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem, + libgcrypt, qgpgme, qtbase, }: -kdeFramework { +mkDerivation { name = "kwallet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes - knotifications kservice kwidgetsaddons kwindowsystem libgcrypt + knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme ]; + propagatedBuildInputs = [ qtbase ]; + patches = [ ./kwallet-dbus.patch ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index d34687def3e9..096100980d61 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,16 +1,17 @@ { - kdeFramework, lib, + mkDerivation, lib, propagateBin, extra-cmake-modules, qtbase, wayland }: -kdeFramework { +mkDerivation { name = "kwayland"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ wayland ]; + buildInputs = [ wayland ]; + propagatedBuildInputs = [ qtbase ]; + setupHook = propagateBin; # XDG_CONFIG_DIRS } diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index ce16e280faa7..e607f90de8db 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -1,13 +1,17 @@ -{ kdeFramework, lib -, extra-cmake-modules, qtbase, qttools +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qttools ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix deleted file mode 100644 index 4bfd813ff932..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - kdeFramework, lib, - extra-cmake-modules, - qtbase, qttools, qtx11extras -}: - -kdeFramework { - name = "kwindowsystem"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.6.0" < 0; - }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - propagatedBuildInputs = [ qtx11extras ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix new file mode 100644 index 000000000000..fa9078eeb205 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, + qtbase, qttools, qtx11extras +}: + +mkDerivation { + name = "kwindowsystem"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qttools qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" + ''; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch new file mode 100644 index 000000000000..ae0da37922e9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch @@ -0,0 +1,22 @@ +Index: kwindowsystem-5.32.0/src/pluginwrapper.cpp +=================================================================== +--- kwindowsystem-5.32.0.orig/src/pluginwrapper.cpp ++++ kwindowsystem-5.32.0/src/pluginwrapper.cpp +@@ -37,14 +37,9 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp + static QStringList pluginCandidates() + { + QStringList ret; +- foreach (const QString &path, QCoreApplication::libraryPaths()) { +- QDir pluginDir(path + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms")); +- if (!pluginDir.exists()) { +- continue; +- } +- foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) { +- ret << pluginDir.absoluteFilePath(entry); +- } ++ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms")); ++ foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) { ++ ret << pluginDir.absoluteFilePath(entry); + } + return ret; + } diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/series b/pkgs/development/libraries/kde-frameworks/kwindowsystem/series new file mode 100644 index 000000000000..2cd02056ff81 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/series @@ -0,0 +1 @@ +platform-plugins-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index ea800bf58ae0..b9aede81f9a9 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -1,14 +1,17 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, kconfig -, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews -, ktextwidgets, kwindowsystem, sonnet +{ + mkDerivation, lib, + extra-cmake-modules, + attica, kconfig, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews, + ktextwidgets, kwindowsystem, qtbase, sonnet, }: -kdeFramework { +mkDerivation { name = "kxmlgui"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews - ktextwidgets kwindowsystem sonnet + buildInputs = [ + attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem + sonnet ]; + propagatedBuildInputs = [ kconfig kconfigwidgets qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index f20f4a223945..acffde6a7cf1 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix @@ -1,8 +1,10 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: +{ mkDerivation, lib, extra-cmake-modules, ki18n, kio }: -kdeFramework { +mkDerivation { name = "kxmlrpcclient"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n kio ]; + buildInputs = [ ki18n ]; + propagatedBuildInputs = [ kio ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index ea2e112ff678..cdf09a48b4fa 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -1,15 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, modemmanager, qtbase +{ + mkDerivation, lib, + extra-cmake-modules, + modemmanager, qtbase }: -kdeFramework { +mkDerivation { name = "modemmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ modemmanager ]; + propagatedBuildInputs = [ modemmanager qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 80085bb2072d..3ed56bbf718d 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -1,15 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase, networkmanager +{ + mkDerivation, lib, + extra-cmake-modules, + networkmanager, qtbase, }: -kdeFramework { +mkDerivation { name = "networkmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ networkmanager ]; + propagatedBuildInputs = [ networkmanager qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 1d45b51274c5..2d795bfc50cc 100644 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix @@ -1,15 +1,15 @@ -{ kdeFramework +{ mkDerivation , lib , extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "oxygen-icons5"; meta = { license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.ttuegel ]; }; - outputs = [ "out" ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; + outputs = [ "out" ]; # only runtime outputs } diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 2fd667af0dc1..d3a81b50bf17 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,17 +1,20 @@ -{ kdeFramework, lib, fetchurl, extra-cmake-modules, kactivities, karchive -, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio -, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui -, qtscript, qtx11extras +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, + kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, + knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui, + qtbase, qtdeclarative, qtscript, qtx11extras, }: -kdeFramework { +mkDerivation { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications - kpackage kservice kwayland kwindowsystem kxmlgui qtscript qtx11extras + kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras ]; + propagatedBuildInputs = [ kpackage kservice qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix new file mode 100644 index 000000000000..2d86f3fbf051 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/prison.nix @@ -0,0 +1,14 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + libdmtx, qrencode, qtbase, +}: + +mkDerivation { + name = "prison"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ libdmtx qrencode ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index d32acf598ebc..24705d6c114a 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,15 +1,17 @@ { - kdeFramework, lib, + mkDerivation, lib, bison, extra-cmake-modules, flex, - qtbase, qtdeclarative, qttools + media-player-info, qtbase, qtdeclarative, qttools }: -kdeFramework { +mkDerivation { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ bison extra-cmake-modules flex qttools ]; - propagatedBuildInputs = [ qtdeclarative ]; + nativeBuildInputs = [ bison extra-cmake-modules flex ]; + buildInputs = [ qtdeclarative qttools ]; + propagatedBuildInputs = [ qtbase ]; + propagatedUserEnvPkgs = [ media-player-info ]; } diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index ae3e72e2a46a..90e2169c1667 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,14 +1,15 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , hunspell, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ hunspell qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ hunspell qttools ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index f879005da1d0..88a943c4fcda 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,595 +3,595 @@ { attica = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz"; - sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56"; - name = "attica-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/attica-5.34.0.tar.xz"; + sha256 = "0l8gmsmpwzg6nzwwlnsdl6r6qkhnhirpmrkag9xpd2sbmy734x53"; + name = "attica-5.34.0.tar.xz"; }; }; baloo = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz"; - sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz"; - name = "baloo-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/baloo-5.34.0.tar.xz"; + sha256 = "0z53lnniq9xdk09d73z0p1xs1qmaf71m4znm4hmq956yg4yqa1ya"; + name = "baloo-5.34.0.tar.xz"; }; }; bluez-qt = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz"; - sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl"; - name = "bluez-qt-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz"; + sha256 = "040gs2a1fx996gqdx2pwxh00szb1vb85055z946nqvqfn01921df"; + name = "bluez-qt-5.34.0.tar.xz"; }; }; breeze-icons = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz"; - sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845"; - name = "breeze-icons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz"; + sha256 = "1znzlggb6yrkw5rr2n75g7cfv9x5p9d55hss09c4i79lxrh1bk4a"; + name = "breeze-icons-5.34.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz"; - sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4"; - name = "extra-cmake-modules-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/extra-cmake-modules-5.34.0.tar.xz"; + sha256 = "1r3dyvrv77xrpjlzpa6yazwkknirvx1ccvdyj9x0mlk4vfi05nh5"; + name = "extra-cmake-modules-5.34.0.tar.xz"; }; }; frameworkintegration = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz"; - sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj"; - name = "frameworkintegration-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/frameworkintegration-5.34.0.tar.xz"; + sha256 = "0hq1r2znjzy0wzm3nsclqmih1aia5300bsf87a2l4919q0ildb20"; + name = "frameworkintegration-5.34.0.tar.xz"; }; }; kactivities = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz"; - sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz"; - name = "kactivities-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kactivities-5.34.0.tar.xz"; + sha256 = "0dg6bkdxf4sicij4szmi55npn6chp0sfmw27qi1s582ymqzjgf5m"; + name = "kactivities-5.34.0.tar.xz"; }; }; kactivities-stats = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz"; - sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy"; - name = "kactivities-stats-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kactivities-stats-5.34.0.tar.xz"; + sha256 = "1dfaq4hsd9wm1ka45dkxbl9wwr7s5ixbnnghqwxhl7a60imc680r"; + name = "kactivities-stats-5.34.0.tar.xz"; }; }; kapidox = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz"; - sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za"; - name = "kapidox-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kapidox-5.34.0.tar.xz"; + sha256 = "190d5z6i71jrvfna6vnlim2p9rgc33s1fxl0zarn276683i1rwvg"; + name = "kapidox-5.34.0.tar.xz"; }; }; karchive = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz"; - sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay"; - name = "karchive-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/karchive-5.34.0.tar.xz"; + sha256 = "0g8jskdar2znviwh9bs3kia093wgfnhl04x4jcg2rvh78ylkpvxw"; + name = "karchive-5.34.0.tar.xz"; }; }; kauth = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz"; - sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8"; - name = "kauth-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kauth-5.34.0.tar.xz"; + sha256 = "06cw1bsp7inh5wglajm8aahy17p35ixgnijb7d74gjqzbj4cv93d"; + name = "kauth-5.34.0.tar.xz"; }; }; kbookmarks = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz"; - sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp"; - name = "kbookmarks-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kbookmarks-5.34.0.tar.xz"; + sha256 = "0ggn4rz8ch82ph64q6yik9fb1mp6kmsd7n33p769zl1lw7fldn0v"; + name = "kbookmarks-5.34.0.tar.xz"; }; }; kcmutils = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz"; - sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9"; - name = "kcmutils-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kcmutils-5.34.0.tar.xz"; + sha256 = "1b52lwn7qjqrn06va7j1jswlzs6bx0drs90myf3607k52ffbf4hy"; + name = "kcmutils-5.34.0.tar.xz"; }; }; kcodecs = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz"; - sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13"; - name = "kcodecs-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kcodecs-5.34.0.tar.xz"; + sha256 = "0k51s4qlf0kq6i8f3wrsz5lrkzjqb1j26hrmlmg57vn91r58iash"; + name = "kcodecs-5.34.0.tar.xz"; }; }; kcompletion = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz"; - sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g"; - name = "kcompletion-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kcompletion-5.34.0.tar.xz"; + sha256 = "18hvdk5b1nkh6b3vx0jajri57rl266b0qjsiwirh5wmjc81xbpcw"; + name = "kcompletion-5.34.0.tar.xz"; }; }; kconfig = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz"; - sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi"; - name = "kconfig-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kconfig-5.34.0.tar.xz"; + sha256 = "0blbx6b3fk6p8cv2iywk2avn9w1411bb0g5wwv456a9ggi01988x"; + name = "kconfig-5.34.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz"; - sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs"; - name = "kconfigwidgets-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kconfigwidgets-5.34.0.tar.xz"; + sha256 = "0h4kappsffrp2qgg8wza1ybgah2dlcgpz591llfvaz31ldsml9hk"; + name = "kconfigwidgets-5.34.0.tar.xz"; }; }; kcoreaddons = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz"; - sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m"; - name = "kcoreaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz"; + sha256 = "1ybr4bv8rhp4cxpf8mfsc4dk0klzrfh1z8g2cw6zasmksxmmwi90"; + name = "kcoreaddons-5.34.0.tar.xz"; }; }; kcrash = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz"; - sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j"; - name = "kcrash-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kcrash-5.34.0.tar.xz"; + sha256 = "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3"; + name = "kcrash-5.34.0.tar.xz"; }; }; kdbusaddons = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz"; - sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk"; - name = "kdbusaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kdbusaddons-5.34.0.tar.xz"; + sha256 = "1skblxfnjhbyiwavsfhksc2ybc2sikw3xr0js6mlfbpmvqzghn6h"; + name = "kdbusaddons-5.34.0.tar.xz"; }; }; kdeclarative = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz"; - sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1"; - name = "kdeclarative-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kdeclarative-5.34.0.tar.xz"; + sha256 = "1mfj32p631zvwz9ldk8536ifb4n825zxbhx69bfllhw2vn1am7z2"; + name = "kdeclarative-5.34.0.tar.xz"; }; }; kded = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz"; - sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51"; - name = "kded-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kded-5.34.0.tar.xz"; + sha256 = "0qy4w7bcg60gyf6y6c11kqcshnld55a8w4fzglpwgqfbliyi5yzq"; + name = "kded-5.34.0.tar.xz"; }; }; kdelibs4support = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz"; - sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl"; - name = "kdelibs4support-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/portingAids/kdelibs4support-5.34.0.tar.xz"; + sha256 = "0q9jjsjcvc43va4yvfay2xi40vb95lnqhgzavpqcndzjihixwmi0"; + name = "kdelibs4support-5.34.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz"; - sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x"; - name = "kdesignerplugin-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kdesignerplugin-5.34.0.tar.xz"; + sha256 = "1jnarg7wrhdjfq73q4wplazxsz927mpf0l6m0i4akq4dlp1b7aah"; + name = "kdesignerplugin-5.34.0.tar.xz"; }; }; kdesu = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz"; - sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax"; - name = "kdesu-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kdesu-5.34.0.tar.xz"; + sha256 = "04mx0d6kf8slgkkgbna3cyv4c491jvlwcwqxc7zikz0i03l341id"; + name = "kdesu-5.34.0.tar.xz"; }; }; kdewebkit = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz"; - sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0"; - name = "kdewebkit-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kdewebkit-5.34.0.tar.xz"; + sha256 = "155rn5bib4jq1ml35l4hll9cv30bp83wva4kgrhfc4y8cp46p9wk"; + name = "kdewebkit-5.34.0.tar.xz"; }; }; kdnssd = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz"; - sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk"; - name = "kdnssd-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kdnssd-5.34.0.tar.xz"; + sha256 = "082mdim9wykdap4fmjfayk443rbarsk1p8cn3mspx2nw047yja80"; + name = "kdnssd-5.34.0.tar.xz"; }; }; kdoctools = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz"; - sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk"; - name = "kdoctools-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kdoctools-5.34.0.tar.xz"; + sha256 = "145jjhsd0whmcj91zbjz2b1jyj4wasw60hbwyd4xvqds8cp0l02h"; + name = "kdoctools-5.34.0.tar.xz"; }; }; kemoticons = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz"; - sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk"; - name = "kemoticons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kemoticons-5.34.0.tar.xz"; + sha256 = "02h12qy0w6mcgkczi3md1znnvp7r47l8h416nd080ljpsydalgx8"; + name = "kemoticons-5.34.0.tar.xz"; }; }; kfilemetadata = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz"; - sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd"; - name = "kfilemetadata-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kfilemetadata-5.34.0.tar.xz"; + sha256 = "1rvlg6by8daiq5ff3qlxcw9k2iq4qicsj0c8a00xfy3w4h9ip9h5"; + name = "kfilemetadata-5.34.0.tar.xz"; }; }; kglobalaccel = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz"; - sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc"; - name = "kglobalaccel-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kglobalaccel-5.34.0.tar.xz"; + sha256 = "1i32dq70qxjbfvlw0wqxvqvl6ysydmpg3zbiflff4z1qrmvmpw6a"; + name = "kglobalaccel-5.34.0.tar.xz"; }; }; kguiaddons = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz"; - sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3"; - name = "kguiaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kguiaddons-5.34.0.tar.xz"; + sha256 = "1nmlwvy2jdmh0m6bmahvk68vl2rs9s28c10dkncpi6gvhsdkigqx"; + name = "kguiaddons-5.34.0.tar.xz"; }; }; khtml = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz"; - sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h"; - name = "khtml-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/portingAids/khtml-5.34.0.tar.xz"; + sha256 = "0j490jfnz8pbfl1i11wj514nw0skpnxr2fvi9pqpfql9lfhsanxv"; + name = "khtml-5.34.0.tar.xz"; }; }; ki18n = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz"; - sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g"; - name = "ki18n-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/ki18n-5.34.0.tar.xz"; + sha256 = "0glvmmy01mp6hnix79aichgwjq842kgf5q5zynkg6mch85y4ary7"; + name = "ki18n-5.34.0.tar.xz"; }; }; kiconthemes = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz"; - sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5"; - name = "kiconthemes-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kiconthemes-5.34.0.tar.xz"; + sha256 = "0hbl82r6qc8dh9v9n9xjkx966czkq5yjxx2rx7sbilj2p9v3saii"; + name = "kiconthemes-5.34.0.tar.xz"; }; }; kidletime = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz"; - sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25"; - name = "kidletime-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kidletime-5.34.0.tar.xz"; + sha256 = "0z8x6iz52y2m8llsp2q4qayxswkzay7ksimzy47crfag442bw24g"; + name = "kidletime-5.34.0.tar.xz"; }; }; kimageformats = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz"; - sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12"; - name = "kimageformats-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kimageformats-5.34.0.tar.xz"; + sha256 = "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw"; + name = "kimageformats-5.34.0.tar.xz"; }; }; kinit = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz"; - sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l"; - name = "kinit-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kinit-5.34.0.tar.xz"; + sha256 = "08429kjihpaip73wszr3rsii8sdlwgm3kxx7g0hpjhkj9d2jq3m1"; + name = "kinit-5.34.0.tar.xz"; }; }; kio = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz"; - sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9"; - name = "kio-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kio-5.34.0.tar.xz"; + sha256 = "1i23ld5b9gafh2x3lv79jbggbd92xyhk7rg3n765w3bsfpg2ijva"; + name = "kio-5.34.0.tar.xz"; }; }; kitemmodels = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz"; - sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5"; - name = "kitemmodels-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kitemmodels-5.34.0.tar.xz"; + sha256 = "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5"; + name = "kitemmodels-5.34.0.tar.xz"; }; }; kitemviews = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz"; - sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv"; - name = "kitemviews-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kitemviews-5.34.0.tar.xz"; + sha256 = "054accbis471zj1gbfxbc99062r2hvpb04i6w3r8fa4ml8s6brqk"; + name = "kitemviews-5.34.0.tar.xz"; }; }; kjobwidgets = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz"; - sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa"; - name = "kjobwidgets-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kjobwidgets-5.34.0.tar.xz"; + sha256 = "0lrx761vf947mb2q1l2jgi0wgwj8cz2nn1xg0j38bh99sgddmzpf"; + name = "kjobwidgets-5.34.0.tar.xz"; }; }; kjs = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz"; - sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1"; - name = "kjs-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/portingAids/kjs-5.34.0.tar.xz"; + sha256 = "18b7k1hi73iqn06c1ryy9lcmvscr9d08q7n1wwkrn0l2xmy05xsq"; + name = "kjs-5.34.0.tar.xz"; }; }; kjsembed = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz"; - sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14"; - name = "kjsembed-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/portingAids/kjsembed-5.34.0.tar.xz"; + sha256 = "17w8i370pqks1fj3pcziz7j014chnc6yi7md7w2p4xprw54pbmbk"; + name = "kjsembed-5.34.0.tar.xz"; }; }; kmediaplayer = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz"; - sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4"; - name = "kmediaplayer-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/portingAids/kmediaplayer-5.34.0.tar.xz"; + sha256 = "1mq87qf86sdvwhas4w7rspd221qp4x9kds4nd0lpldiay4483k86"; + name = "kmediaplayer-5.34.0.tar.xz"; }; }; knewstuff = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz"; - sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl"; - name = "knewstuff-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/knewstuff-5.34.0.tar.xz"; + sha256 = "19d53ylwr92dzl9agk4j765zvb897rcm55z7pr6841aj58jk9b82"; + name = "knewstuff-5.34.0.tar.xz"; }; }; knotifications = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz"; - sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly"; - name = "knotifications-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/knotifications-5.34.0.tar.xz"; + sha256 = "12z5hza0n5zr6mv3gkwhzb8zkrmk6dvgq8hrzwm8rzkgphjr6pi9"; + name = "knotifications-5.34.0.tar.xz"; }; }; knotifyconfig = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz"; - sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi"; - name = "knotifyconfig-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/knotifyconfig-5.34.0.tar.xz"; + sha256 = "0lwl22vq770jyp45j32s0ss8yiqdwbink6cdhkbapg3pzbiwklyk"; + name = "knotifyconfig-5.34.0.tar.xz"; }; }; kpackage = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz"; - sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr"; - name = "kpackage-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kpackage-5.34.0.tar.xz"; + sha256 = "0wdymhcrjggxb7andz36cfk9f240vvbq5yahlxyhfp9z69lriw5q"; + name = "kpackage-5.34.0.tar.xz"; }; }; kparts = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz"; - sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa"; - name = "kparts-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kparts-5.34.0.tar.xz"; + sha256 = "1a5n0f7ljdc2bm6vggzwbvpblyxjqn9m9pam70iab964pqqalgp7"; + name = "kparts-5.34.0.tar.xz"; }; }; kpeople = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz"; - sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy"; - name = "kpeople-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kpeople-5.34.0.tar.xz"; + sha256 = "0krm74dl80s48nhiygga4dvkvqqimxdx4nczbk4qvj7j1g9p2rsh"; + name = "kpeople-5.34.0.tar.xz"; }; }; kplotting = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz"; - sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm"; - name = "kplotting-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kplotting-5.34.0.tar.xz"; + sha256 = "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh"; + name = "kplotting-5.34.0.tar.xz"; }; }; kpty = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz"; - sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196"; - name = "kpty-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kpty-5.34.0.tar.xz"; + sha256 = "00k5hhz7nf3nf47xb003ni1chi03imyrfajap6ay4zp90l8fr950"; + name = "kpty-5.34.0.tar.xz"; }; }; kross = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz"; - sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp"; - name = "kross-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/portingAids/kross-5.34.0.tar.xz"; + sha256 = "092qz8vyiialv9fvk4wvn8mrfhz5i5hnbq0xnz6nvi1pk3db6bxq"; + name = "kross-5.34.0.tar.xz"; }; }; krunner = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz"; - sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw"; - name = "krunner-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/krunner-5.34.0.tar.xz"; + sha256 = "0n527p708k719zgmvvbmp20xmg72f85cll05q05p4h317g7wz6i5"; + name = "krunner-5.34.0.tar.xz"; }; }; kservice = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz"; - sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg"; - name = "kservice-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kservice-5.34.0.tar.xz"; + sha256 = "0sikwn49s2iq1nj518q55m2p0hvdvwm98cpf0dkjb1z1v6fgjc37"; + name = "kservice-5.34.0.tar.xz"; }; }; ktexteditor = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz"; - sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln"; - name = "ktexteditor-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/ktexteditor-5.34.0.tar.xz"; + sha256 = "182a0swfgdqr0faq3ksk6hlfvdi1afd0hpys5vayjjf263m19xxw"; + name = "ktexteditor-5.34.0.tar.xz"; }; }; ktextwidgets = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz"; - sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy"; - name = "ktextwidgets-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/ktextwidgets-5.34.0.tar.xz"; + sha256 = "1hri34b373bww5gv14qli2nm77k05pk170nbb2vv2zvzv93g25gw"; + name = "ktextwidgets-5.34.0.tar.xz"; }; }; kunitconversion = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz"; - sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx"; - name = "kunitconversion-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz"; + sha256 = "0v4x0flbfavrzfiqh71mdkqgp1fzk4f52msvq6w60i2s3sz7hcsm"; + name = "kunitconversion-5.34.0.tar.xz"; }; }; kwallet = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz"; - sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n"; - name = "kwallet-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kwallet-5.34.0.tar.xz"; + sha256 = "08z3ddsam5n5qn2svscp4hgksf6qd1h8lqw1v382p01nnmhxadz5"; + name = "kwallet-5.34.0.tar.xz"; }; }; kwayland = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz"; - sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b"; - name = "kwayland-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kwayland-5.34.0.tar.xz"; + sha256 = "1zxb9ram47vbiik8h0czyvacrdiijhnslkpcm61l4r1rb0ybb0ib"; + name = "kwayland-5.34.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz"; - sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815"; - name = "kwidgetsaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kwidgetsaddons-5.34.0.tar.xz"; + sha256 = "0hw87iig75mfgl5p3ph6zkwap31h357bm7rlyv5d9nnp10bq0hfg"; + name = "kwidgetsaddons-5.34.0.tar.xz"; }; }; kwindowsystem = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz"; - sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna"; - name = "kwindowsystem-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kwindowsystem-5.34.0.tar.xz"; + sha256 = "1sp2x7afhw19vmhdp2qyrmljz8h0875xjk95n8c5gzypk7sr0l83"; + name = "kwindowsystem-5.34.0.tar.xz"; }; }; kxmlgui = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz"; - sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr"; - name = "kxmlgui-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kxmlgui-5.34.0.tar.xz"; + sha256 = "1v8m6qzjqg3ic14a5ki37bf13kifzcbhly68zcxgs5b92hr953iy"; + name = "kxmlgui-5.34.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz"; - sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb"; - name = "kxmlrpcclient-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/kxmlrpcclient-5.34.0.tar.xz"; + sha256 = "0kp3ab50m5jl2jgw883ip67s6gs0l3saprzrqa9r3hydn2c4s3md"; + name = "kxmlrpcclient-5.34.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz"; - sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r"; - name = "modemmanager-qt-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/modemmanager-qt-5.34.0.tar.xz"; + sha256 = "1cf5nsc8h7djvr19fm5dphzplh1wm3asvn0a7r71spg0i7lzi89h"; + name = "modemmanager-qt-5.34.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz"; - sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4"; - name = "networkmanager-qt-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/networkmanager-qt-5.34.0.tar.xz"; + sha256 = "05s0irvkg0g57acriablyha2wb9c7w3xhq223vdddjqpcdx0pnkl"; + name = "networkmanager-qt-5.34.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz"; - sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi"; - name = "oxygen-icons5-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/oxygen-icons5-5.34.0.tar.xz"; + sha256 = "0cmxxssir5zbp5nlxq81h2xfd6wrxbbkydyw93dby7r56isl7ga5"; + name = "oxygen-icons5-5.34.0.tar.xz"; }; }; plasma-framework = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz"; - sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2"; - name = "plasma-framework-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/plasma-framework-5.34.0.tar.xz"; + sha256 = "0waicqskfwc8xpmrym165hwlfv6nzbwc783sac5vrhbyk4bwk8x9"; + name = "plasma-framework-5.34.0.tar.xz"; }; }; prison = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz"; - sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s"; - name = "prison-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/prison-5.34.0.tar.xz"; + sha256 = "00wj4yyfhhcq9b54civ5hy1grz70mmi676x50y12crcbbgkxm1lx"; + name = "prison-5.34.0.tar.xz"; }; }; solid = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz"; - sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m"; - name = "solid-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/solid-5.34.0.tar.xz"; + sha256 = "02kz21p3p1s1rg7gf34fr6ynhji6x97yvsfdpvbfxbhijabbh4ib"; + name = "solid-5.34.0.tar.xz"; }; }; sonnet = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz"; - sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3"; - name = "sonnet-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/sonnet-5.34.0.tar.xz"; + sha256 = "06gxrh8rb75ydkqxk5dhlmwndnczp264jx588ryfwlf3vlnk99vs"; + name = "sonnet-5.34.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz"; - sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a"; - name = "syntax-highlighting-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/syntax-highlighting-5.34.0.tar.xz"; + sha256 = "0ryfwblvzj9rd5jj7l8scmbb49ygzk77ng05hrznsipczin2cjw8"; + name = "syntax-highlighting-5.34.0.tar.xz"; }; }; threadweaver = { - version = "5.31.0"; + version = "5.34.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz"; - sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f"; - name = "threadweaver-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.34/threadweaver-5.34.0.tar.xz"; + sha256 = "1gylpl283qf1jcfyib4q5xwnpdq13hnd2cp2i7xjazdw2jp40zhr"; + name = "threadweaver-5.34.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index f199321e6746..82c8f323a0d2 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -1,13 +1,14 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules, perl, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; - nativeBuildInputs = [ extra-cmake-modules perl qttools ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ qttools ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index 4df3ff510cb9..8861d2853bab 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -1,13 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules, qtbase +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase }: -kdeFramework { +mkDerivation { name = "threadweaver"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix index 66e67e6b8538..1127f3e197df 100644 --- a/pkgs/development/libraries/kirigami/default.nix +++ b/pkgs/development/libraries/kirigami/default.nix @@ -1,23 +1,47 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols }: +{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig +, plasma-framework, qtbase, qttranslations +, qtquickcontrols ? null +, qtquickcontrols2 ? null }: -stdenv.mkDerivation rec { +let pname = "kirigami"; - version = "1.1.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6"; + generic = { name, version, sha256, qtqc, broken }: + stdenv.mkDerivation rec { + inherit name version; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${name}.tar.xz"; + inherit sha256; + }; + + buildInputs = [ plasma-framework qtbase qtqc qttranslations ]; + + nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; + + meta = with stdenv.lib; { + license = licenses.lgpl2; + homepage = http://www.kde.org; + maintainers = with maintainers; [ ttuegel peterhoeg ]; + platforms = platforms.unix; + inherit broken; + }; }; - buildInputs = [ qtbase qtquickcontrols plasma-framework ]; +in { + kirigami_1 = generic rec { + name = "${pname}-${version}"; + version = "1.1.0"; + sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6"; + qtqc = qtquickcontrols; + broken = false; + }; - nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - - meta = with stdenv.lib; { - license = licenses.lgpl2; - homepage = http://www.kde.org; - maintainers = with maintainers; [ ttuegel peterhoeg ]; - platforms = platforms.unix; + kirigami_2 = generic rec { + name = "${pname}2-${version}"; + version = "2.1.0"; + sha256 = "0d79h10jzv9z7xzap4k9vbw6p9as8vdkz3x6xlzx407i9sbzyi77"; + qtqc = qtquickcontrols2; + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; } diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix deleted file mode 100644 index 0b332d40329d..000000000000 --- a/pkgs/development/libraries/kirigami/v2.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }: - -stdenv.mkDerivation rec { - pname = "kirigami"; - version = "1.90.0"; - name = "${pname}2-${version}"; - - src = fetchurl { - url = "mirror://kde/unstable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "a5ca094a60d1cc48116cbed07bbe68be016773d2488a91e278859c90f59e64a8"; - }; - - buildInputs = [ qtbase qtquickcontrols2 plasma-framework ]; - - nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - - meta = with stdenv.lib; { - license = licenses.lgpl2; - homepage = http://www.kde.org; - maintainers = with maintainers; [ ttuegel peterhoeg ]; - platforms = platforms.unix; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; - }; -} diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix new file mode 100644 index 000000000000..8532a8880ce8 --- /dev/null +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig +, qtbase, kdeFrameworks +, eject, libatasmart, parted }: + +let + pname = "kpmcore"; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "3.0.3"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "17lqrp39w31fm7haigwq23cp92zwk3czjzqa2fhn3wafx3vafwd2"; + }; + + buildInputs = [ + qtbase + eject # this is to get libblkid + libatasmart + parted # we only need the library + + kdeFrameworks.kio + ]; + nativeBuildInputs = [ extra-cmake-modules ]; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + maintainers = with lib.maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c35cc5883146..91eb7aecea90 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs doc/doxyparse.pl ''; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index ea092a336375..d45a616606d9 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, boost, cmake, curl }: +{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "0.10.1"; + version = "0.11.2"; src = fetchFromGitHub { - sha256 = "0kjk3xq7v6bqq35ymj9vr9xz5kpcka51ms6489pm48adyaf53hs7"; + sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8"; rev = version; repo = "leatherman"; owner = "puppetlabs"; }; - buildInputs = [ boost cmake curl ]; + buildInputs = [ boost cmake curl ruby ]; meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/leatherman/; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 776a7646bd70..bd740b757584 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index eacab92d36b6..b9b6c3c7c24f 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,14 +1,38 @@ -{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig +, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib +}: -stdenv.mkDerivation { - name = "leptonica-1.72"; +stdenv.mkDerivation rec { + name = "leptonica-${version}"; + version = "1.74.1"; src = fetchurl { - url = http://www.leptonica.org/source/leptonica-1.72.tar.gz; - sha256 = "0mhzvqs0im04y1cpcc1yma70hgdac1frf33h73m9z3356bfymmbr"; + url = "http://www.leptonica.org/source/${name}.tar.gz"; + sha256 = "0qpcidvv6igybrrhj0m6j47g642c8sk1qn4dpj82mgd38xx52skl"; }; - buildInputs = [ libpng libtiff libjpeg zlib ]; + patches = stdenv.lib.singleton (fetchpatch { + # configure: Support pkg-config + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "4476d162cc191a0fefb2ce434153e12bbf188664.patch"; + sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s"; + }); + + postPatch = '' + # Remove the AC_SUBST() macros on *_LIBS, because the *_LIBS variables will + # be automatically set by PKG_CHECK_MODULES() since autotools 0.24 and + # using the ones that are set here in Leptonica's configure.ac do not + # include -L linker flags. + sed -i -e '/PKG_CHECK_MODULES/,/^ *\])/s/AC_SUBST([^)]*)//' configure.ac + + # The giflib package doesn't ship a pkg-config file, so we need to inject + # the linker search path. + substituteInPlace configure.ac --replace -lgif \ + ${stdenv.lib.escapeShellArg "'-L${giflib}/lib -lgif'"} + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; meta = { description = "Image processing and analysis library"; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index f7261e117389..d3cb1283331b 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ] ++ - lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++ + lib.optional usePulseAudio libpulseaudio ++ + lib.optional stdenv.isLinux alsaLib ++ lib.optional stdenv.isLinux libcap ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index ff256fb73c84..0c1c51d6f47a 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -27,12 +27,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; + propagatedBuildInputs = + if gtkVersion == "2" + then [ gtk2 libdbusmenu-gtk2 ] + else [ gtk3 libdbusmenu-gtk3 ]; + buildInputs = [ glib dbus_glib python pygobject2 pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" - then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] - else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); + then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] + else [ libindicator-gtk3 ]); postPatch = '' substituteInPlace configure.ac \ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 89e2762e3ccb..883273f188c8 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,20 +10,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; - version = "3.2.2"; + version = "3.3.1"; src = fetchurl { url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739"; + sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9"; }; - patches = [ - (fetchurl { - url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch"; - sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6"; - }) - ]; - outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix new file mode 100644 index 000000000000..79cbf09317cf --- /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/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 3528edcba123..058839f70f8a 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -19,11 +19,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; - version = "0.13.4"; + version = "0.13.7"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq"; + sha256 = "17byv926w1mxn56n896sxvdq4m0yv1l7qbm688h6zr3nzgsyarbh"; }; configureFlags = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/libass/libass; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel urkud ]; + maintainers = with maintainers; [ codyopel ]; repositories.git = git://github.com/libass/libass.git; }; } diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 174c633bf0d4..eedc0993d736 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,32 +1,25 @@ { stdenv, fetchurl, autoconf, automake, libtool }: -let - s = # Generated upstream information - rec { - baseName="libatomic_ops"; - version="7.4.4"; - name="${baseName}-${version}"; - hash="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz"; - url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.4.tar.gz"; - sha256="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz"; - }; - - buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; -in stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; +stdenv.mkDerivation rec { + name = "libatomic_ops-${version}"; + version = "7.6.0"; src = fetchurl { - inherit (s) url sha256; + 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"; }; - preConfigure = if stdenv.isCygwin then '' - sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am - ./autogen.sh - '' else null; + nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + + preConfigure = stdenv.lib.optionalString stdenv.isCygwin '' + sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am + ./autogen.sh + ''; meta = { - inherit (s) version; description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 6d81a284040c..28d435fbb9ca 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -13,11 +13,12 @@ , 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; -with { inherit (stdenv.lib) optional optionals hasPrefix; }; +let inherit (stdenv.lib) optional optionals hasPrefix; in /* ToDo: - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools @@ -27,7 +28,7 @@ with { inherit (stdenv.lib) optional optionals hasPrefix; }; let result = { libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.8" "d0e93f6b229ae46c49d13ec183b13cfee70a51f0"; + libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e"; }; @@ -41,7 +42,7 @@ let patches = [] ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch - ++ optional (vpxSupport && hasPrefix "11." version) ./vpxenc-11.6-libvpx-1.5.patch; + ; preConfigure = "patchShebangs doc/texi2pod.pl"; @@ -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/libav/vpxenc-11.6-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch deleted file mode 100644 index f3c52582b44e..000000000000 --- a/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libavcodec/libvpxenc.c 2016-05-01 17:53:17.974517377 +0200 -+++ b/libavcodec/libvpxenc.c 2016-05-01 17:54:30.564923297 +0200 -@@ -70,19 +70,11 @@ - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix new file mode 100644 index 000000000000..83bd81456c07 --- /dev/null +++ b/pkgs/development/libraries/libbap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, + which }: + +stdenv.mkDerivation rec { + name = "libbap-${version}"; + version = "master-2017-02-08"; + + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap-bindings"; + rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; + sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; + }; + + nativeBuildInputs = [ autoreconfHook which ]; + buildInputs = [ ocaml bap findlib ctypes ]; + + preInstall = '' + mkdir -p $out/lib + mkdir -p $out/include + ''; + + meta = { + homepage = http://github.com/binaryanalysisplatform/bap-bindings; + description = "A C library for interacting with BAP"; + maintainers = [ stdenv.lib.maintainers.maurer ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix new file mode 100644 index 000000000000..34ab70e0adcd --- /dev/null +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, clang }: + +stdenv.mkDerivation { + name = "blocksruntime"; + + src = fetchFromGitHub { + owner = "mackyle"; + repo = "blocksruntime"; + rev = "b5c5274daf1e0e46ecc9ad8f6f69889bce0a0a5d"; + sha256 = "0ic4lagagkylcvwgf10mg0s1i57h4i25ds2fzvms22xj4zwzk1sd"; + }; + + buildInputs = [ clang ]; + + configurePhase = '' + export CC=clang + export CXX=clang++ + ''; + + buildPhase = "./buildlib"; + + checkPhase = "./checktests"; + + doCheck = false; # hasdescriptor.c test fails, hrm. + + installPhase = ''prefix="/" DESTDIR=$out ./installlib''; +} diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index c5bf7fd7f982..8b67d52b875e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,13 +19,15 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "0.9.2"; + version = "1.0.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; + sha256 = "1k3lag4lxi2jjd3zh4wcb5l3hadzm54j5kagh92yzfy76p9svqzp"; }; + patches = optional withJava ./BDJ-JARFILE-path.patch; + nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withJava [ ant ] ; @@ -36,12 +38,15 @@ stdenv.mkDerivation rec { ++ optional withFonts freetype ; - propagatedBuildInputs = stdenv.lib.optional withAACS libaacs; + propagatedBuildInputs = optional withAACS libaacs; + + NIX_LDFLAGS = [ + (optionalString withAACS "-L${libaacs}/lib -laacs") + (optionalString withBDplus "-L${libbdplus}/lib -lbdplus") + ]; preConfigure = '' ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} - ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''} - ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''} ''; configureFlags = with stdenv.lib; @@ -50,14 +55,11 @@ stdenv.mkDerivation rec { ++ optional (! withFonts) "--without-freetype" ; - # Fix search path for BDJ jarfile - patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; - meta = with stdenv.lib; { - homepage = "http://www.videolan.org/developers/libbluray.html"; + homepage = http://www.videolan.org/developers/libbluray.html; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; - maintainers = [ maintainers.abbradar ]; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch new file mode 100644 index 000000000000..77062cf4ec80 --- /dev/null +++ b/pkgs/development/libraries/libbsd/darwin.patch @@ -0,0 +1,675 @@ +diff --git a/configure.ac b/configure.ac +index 5a432d4..a69ae0b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,7 +55,7 @@ AS_CASE([$host_os], + ) + + # Checks for header files. +-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h]) ++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_UID_T +@@ -143,6 +143,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ + pstat_getproc sysconf]) + AM_CONDITIONAL(HAVE_GETENTROPY, [test "x$ac_cv_func_getentropy" = "xtrue"]) + ++HostOS=`echo "$host" | sed 's/.*-//'` ++os_is_macosx=false ++nonLinuxOS=false ++AC_SUBST(HostOS) ++case ${HostOS} in ++ darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*) ++ os_is_macosx=true ++ nonLinuxOS=true ++ echo HostOS="$HostOS" ++ ;; ++ *) ++ echo host="$host" ++ echo HostOS="$HostOS" ++ os_is_macosx=false ++ nonLinuxOS=false ++ ;; ++esac ++AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue]) ++AM_COND_IF([IS_DARWIN], ++ [AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])]) ++ ++AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue]) ++AM_COND_IF([NON_LINUX], ++ [AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])]) ++ + AC_CONFIG_FILES([ + Makefile + include/Makefile +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index ebb6160..ce882bf 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -39,7 +39,9 @@ + #ifndef _LIBUTIL_H_ + #define _LIBUTIL_H_ + ++#ifdef HAVE_FEATURES_H + #include ++#endif + #include + #include + #include +diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h +index 7697425..ef34c4f 100644 +--- a/include/bsd/stdio.h ++++ b/include/bsd/stdio.h +@@ -44,12 +44,16 @@ + __BEGIN_DECLS + const char *fmtcheck(const char *, const char *); + ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) + /* XXX: The function requires cooperation from the system libc to store the + * line buffer in the FILE struct itself. */ + char *fgetln(FILE *fp, size_t *lenp) + __attribute__((deprecated("This functions cannot be safely ported, " + "use getline(3) instead, as it is supported " + "by GNU and POSIX.1-2008."))); ++#else ++char *fgetln(FILE *fp, size_t *lenp); ++#endif + + /* + * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations, +diff --git a/include/bsd/string.h b/include/bsd/string.h +index ee2f953..a3ab077 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -37,11 +37,14 @@ + #include + + __BEGIN_DECLS +-size_t strlcpy(char *dst, const char *src, size_t siz); +-size_t strlcat(char *dst, const char *src, size_t siz); + char *strnstr(const char *str, const char *find, size_t str_len); ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++size_t bsd_strlcpy(char *dst, const char *src, size_t siz); ++size_t bsd_strlcat(char *dst, const char *src, size_t siz); ++void bsd_strmode(mode_t mode, char *str); ++#else + void strmode(mode_t mode, char *str); +- ++#endif + void explicit_bzero(void *buf, size_t len); + __END_DECLS + +diff --git a/src/Makefile.am b/src/Makefile.am +index ad83dbf..0f2a7ee 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \ + libbsd.map + libbsd_la_LIBADD = \ + $(CLOCK_GETTIME_LIBS) ++ ++if IS_DARWIN ++libbsd_la_LDFLAGS = \ ++ -Wl \ ++ -version-number $(LIBBSD_ABI) ++else + libbsd_la_LDFLAGS = \ + -Wl,--version-script=$(srcdir)/libbsd.map \ + -version-number $(LIBBSD_ABI) ++endif ++ + libbsd_la_SOURCES = \ + arc4random.c \ +- arc4random.h \ +- arc4random_unix.h \ +- arc4random_openbsd.h \ + arc4random_uniform.c \ + bsd_getopt.c \ +- chacha_private.h \ + closefrom.c \ + dehumanize_number.c \ + err.c \ +@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \ + $(nil) + endif + ++noinst_HEADERS = \ ++ arc4random.h \ ++ arc4random_bsd.h \ ++ arc4random_linux.h \ ++ arc4random_unix.h \ ++ arc4random_osx.h \ ++ arc4random_openbsd.h \ ++ chacha_private.h ++ + libbsd_ctor_a_SOURCES = \ + setproctitle_ctor.c \ + $(nil) +diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h +new file mode 100644 +index 0000000..ece2f85 +--- /dev/null ++++ b/src/arc4random_bsd.h +@@ -0,0 +1,86 @@ ++/* $OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996, David Mazieres ++ * Copyright (c) 2008, Damien Miller ++ * Copyright (c) 2013, Markus Friedl ++ * Copyright (c) 2014, Theo de Raadt ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* ++ * Stub functions for portability. ++ */ ++ ++#include ++ ++#include ++#include ++ ++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; ++#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) ++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) ++ ++/* ++ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if ++ * a program does not link to -lthr. Callbacks registered with pthread_atfork() ++ * appear to fail silently. So, it is not always possible to detect a PID ++ * wraparound. ++ */ ++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) ++ ++static inline void ++_getentropy_fail(void) ++{ ++ raise(SIGKILL); ++} ++ ++static volatile sig_atomic_t _rs_forked; ++ ++static inline void ++_rs_forkhandler(void) ++{ ++ _rs_forked = 1; ++} ++ ++static inline void ++_rs_forkdetect(void) ++{ ++ static pid_t _rs_pid = 0; ++ pid_t pid = getpid(); ++ ++ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { ++ _rs_pid = pid; ++ _rs_forked = 0; ++ if (rs) ++ memset(rs, 0, sizeof(*rs)); ++ } ++} ++ ++static inline int ++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) ++{ ++ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) ++ return (-1); ++ ++ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { ++ munmap(*rsp, sizeof(**rsp)); ++ return (-1); ++ } ++ ++ _ARC4_ATFORK(_rs_forkhandler); ++ return (0); ++} +diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h +new file mode 100644 +index 0000000..d61a8db +--- /dev/null ++++ b/src/arc4random_linux.h +@@ -0,0 +1,86 @@ ++/* $OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996, David Mazieres ++ * Copyright (c) 2008, Damien Miller ++ * Copyright (c) 2013, Markus Friedl ++ * Copyright (c) 2014, Theo de Raadt ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* ++ * Stub functions for portability. ++ */ ++ ++#include ++ ++#include ++#include ++ ++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; ++#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) ++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) ++ ++#ifdef __GLIBC__ ++extern void *__dso_handle; ++extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *); ++#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle) ++#else ++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) ++#endif ++ ++static inline void ++_getentropy_fail(void) ++{ ++ raise(SIGKILL); ++} ++ ++static volatile sig_atomic_t _rs_forked; ++ ++static inline void ++_rs_forkhandler(void) ++{ ++ _rs_forked = 1; ++} ++ ++static inline void ++_rs_forkdetect(void) ++{ ++ static pid_t _rs_pid = 0; ++ pid_t pid = getpid(); ++ ++ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { ++ _rs_pid = pid; ++ _rs_forked = 0; ++ if (rs) ++ memset(rs, 0, sizeof(*rs)); ++ } ++} ++ ++static inline int ++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) ++{ ++ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) ++ return (-1); ++ ++ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { ++ munmap(*rsp, sizeof(**rsp)); ++ return (-1); ++ } ++ ++ _ARC4_ATFORK(_rs_forkhandler); ++ return (0); ++} +diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h +new file mode 100644 +index 0000000..14771a6 +--- /dev/null ++++ b/src/arc4random_osx.h +@@ -0,0 +1,82 @@ ++/* $OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996, David Mazieres ++ * Copyright (c) 2008, Damien Miller ++ * Copyright (c) 2013, Markus Friedl ++ * Copyright (c) 2014, Theo de Raadt ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* ++ * Stub functions for portability. ++ */ ++ ++#include ++ ++#include ++#include ++#include ++ ++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; ++#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) ++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) ++ ++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) ++ ++static inline void ++_getentropy_fail(void) ++{ ++ raise(SIGKILL); ++} ++ ++static volatile sig_atomic_t _rs_forked; ++ ++static inline void ++_rs_forkhandler(void) ++{ ++ _rs_forked = 1; ++} ++ ++static inline void ++_rs_forkdetect(void) ++{ ++ static pid_t _rs_pid = 0; ++ pid_t pid = getpid(); ++ ++ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { ++ _rs_pid = pid; ++ _rs_forked = 0; ++ if (rs) ++ memset(rs, 0, sizeof(*rs)); ++ } ++} ++ ++static inline int ++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) ++{ ++ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) ++ return (-1); ++ ++ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, ++ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { ++ munmap(*rsp, sizeof(**rsp)); ++ *rsp = NULL; ++ return (-1); ++ } ++ ++ _ARC4_ATFORK(_rs_forkhandler); ++ return (0); ++} +diff --git a/src/fgetln.c b/src/fgetln.c +index 4d1726e..9c73788 100644 +--- a/src/fgetln.c ++++ b/src/fgetln.c +@@ -30,7 +30,9 @@ + #include + #include + ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) + #include "local-link.h" ++#endif + + #ifdef HAVE_GETLINE + struct filebuf { +@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len) + return fb->buf; + } + } ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) + libbsd_link_warning(fgetln, + "This functions cannot be safely ported, use getline(3) " + "instead, as it is supported by GNU and POSIX.1-2008.") ++#endif + #else + #error "Function fgetln() needs to be ported." + #endif +diff --git a/src/fpurge.c b/src/fpurge.c +index 462535a..e7eb46f 100644 +--- a/src/fpurge.c ++++ b/src/fpurge.c +@@ -26,9 +26,11 @@ + + #include + #include ++#if HAVE___FPURGE + #include ++#endif + +-#ifdef HAVE___FPURGE ++#ifdef HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */ + int + fpurge(FILE *fp) + { +@@ -42,5 +44,55 @@ fpurge(FILE *fp) + return 0; + } + #else +-#error "Function fpurge() needs to be ported." ++#define fp_ fp ++//#error "Function fpurge() needs to be ported." ++//#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ ++int ++fpurge(FILE *fp) ++{ ++ if (fp == NULL || fileno(fp) < 0) { ++ errno = EBADF; ++ return EOF; ++ } ++ ++ /* Call the system's fpurge function. */ ++# undef fpurge ++# if !HAVE_DECL_FPURGE ++ extern int fpurge (FILE *); ++# endif ++ int result = fpurge (fp); ++# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ ++ if (result == 0) ++ /* Correct the invariants that fpurge broke. ++ on BSD systems says: ++ "The following always hold: if _flags & __SRD, _w is 0." ++ If this invariant is not fulfilled and the stream is read-write but ++ currently reading, subsequent putc or fputc calls will write directly ++ into the buffer, although they shouldn't be allowed to. */ ++ if ((fp_->_flags & __SRD) != 0) ++ fp_->_w = 0; ++#endif ++ return result; ++} ++//#endif ++#endif ++ ++#ifdef TEST ++int ++main() ++{ ++ static FILE fp_bad; ++ FILE *fp; ++ ++ if (fpurge(&fp_bad) == 0) ++ return 1; ++ ++ fp = fopen("/dev/zero", "r"); ++ if (fpurge(fp) < 0) ++ return 1; ++ ++ fclose(fp); ++ ++ return 0; ++} + #endif +diff --git a/src/funopen.c b/src/funopen.c +index 7d6ae31..9963162 100644 +--- a/src/funopen.c ++++ b/src/funopen.c +@@ -137,6 +137,7 @@ funopen(const void *cookie, + + return fopencookie(cookiewrap, mode, funcswrap); + } ++#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX) + #else + #error "Function funopen() needs to be ported." + #endif +diff --git a/src/getentropy.c b/src/getentropy.c +index 3f11a1e..8a23a07 100644 +--- a/src/getentropy.c ++++ b/src/getentropy.c +@@ -28,9 +28,7 @@ + #include "getentropy_linux.c" + #elif defined(__GNU__) + #include "getentropy_hurd.c" +-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +-#include "getentropy_bsd.c" +-#elif defined(__NetBSD__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + #include "getentropy_bsd.c" + #elif defined(__sun) + #include "getentropy_solaris.c" +diff --git a/src/hash/sha512.h b/src/hash/sha512.h +index 4f368a1..ab22fc1 100644 +--- a/src/hash/sha512.h ++++ b/src/hash/sha512.h +@@ -29,7 +29,11 @@ + #ifndef _SHA512_H_ + #define _SHA512_H_ + ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#include ++#else + #include ++#endif + + #define SHA512_DIGEST_LENGTH 64 + +diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c +index c2a93be..f69013d 100644 +--- a/src/hash/sha512c.c ++++ b/src/hash/sha512c.c +@@ -27,7 +27,11 @@ + #include + __FBSDID("$FreeBSD$"); + ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#include ++#else + #include ++#endif + #include + + #include +diff --git a/src/nlist.c b/src/nlist.c +index 0cffe55..f785b61 100644 +--- a/src/nlist.c ++++ b/src/nlist.c +@@ -27,6 +27,7 @@ + * SUCH DAMAGE. + */ + ++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) + #if defined(LIBC_SCCS) && !defined(lint) + static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; + #endif /* LIBC_SCCS and not lint */ +@@ -409,3 +410,4 @@ elf_sym_to_nlist(struct nlist *nl, Elf_Sym *s, Elf_Shdr *shdr, int shnum) + nl->n_type |= N_EXT; + } + #endif /* _NLIST_DO_ELF */ ++#endif +diff --git a/src/setproctitle.c b/src/setproctitle.c +index c18c61c..b1b1591 100644 +--- a/src/setproctitle.c ++++ b/src/setproctitle.c +@@ -32,6 +32,11 @@ + #include + #include + ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#define __asm__(x) ++extern char **environ; ++#endif ++ + static struct { + /* Original value. */ + const char *arg0; +@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); + * for code linking against that version, and change the default to use the + * new version, so that new code depends on the implemented version. */ + #ifdef HAVE_TYPEOF ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++// ++// HACK: even weak aliasing breaks in clang so just comment this out for now ++// ++// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl"))); ++#else + extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl"))); ++#endif + #else + void setproctitle_stub(const char *fmt, ...) + __attribute__((alias("setproctitle_impl"))); +diff --git a/src/strlcat.c b/src/strlcat.c +index 21c8afb..e036132 100644 +--- a/src/strlcat.c ++++ b/src/strlcat.c +@@ -27,7 +27,11 @@ + * If retval >= siz, truncation occurred. + */ + size_t ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++bsd_strlcat(char *dst, const char *src, size_t siz) ++#else + strlcat(char *dst, const char *src, size_t siz) ++#endif + { + char *d = dst; + const char *s = src; +diff --git a/src/strlcpy.c b/src/strlcpy.c +index 1719d35..c63591d 100644 +--- a/src/strlcpy.c ++++ b/src/strlcpy.c +@@ -25,7 +25,11 @@ + * Returns strlen(src); if retval >= siz, truncation occurred. + */ + size_t ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++bsd_strlcpy(char *dst, const char *src, size_t siz) ++#else + strlcpy(char *dst, const char *src, size_t siz) ++#endif + { + char *d = dst; + const char *s = src; +diff --git a/src/strmode.c b/src/strmode.c +index 8d825ae..c1b5f8d 100644 +--- a/src/strmode.c ++++ b/src/strmode.c +@@ -37,7 +37,11 @@ static char sccsid[] = "@(#)strmode.c 8.3 (Berkeley) 8/15/94"; + #include + + void ++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++bsd_strmode(mode_t mode, char *p) ++#else + strmode(mode_t mode, char *p) ++#endif + { + /* print type */ + switch (mode & S_IFMT) { diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 44a1fd5b3e2b..792a29eb1fb2 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { name = "libbsd-${version}"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk"; + sha256 = "0a2vq0xdhs3yyj91b0612f19fakg7a9xlqy2f993128kyhjd0ivn"; }; + # darwin changes configure.ac which means we need to regenerate + # the configure scripts + nativeBuildInputs = [ autoreconfHook ]; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + meta = with stdenv.lib; { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6d64df88d3f1..02e4529b759e 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -1,18 +1,18 @@ -{ autoconf, automake114x, fetchzip, libtool, perl, stdenv, which }: - -let - version = "1.1.10"; -in +{ fetchFromGitHub, perl, stdenv, cmake }: stdenv.mkDerivation rec { name = "libbson-${version}"; + version = "1.6.1"; - src = fetchzip { - url = "https://github.com/mongodb/libbson/releases/download/${version}/libbson-${version}.tar.gz"; - sha256 = "0zzca7zqvxf89fq7ji9626q8nnqyyh0dnmbk4xijzr9sq485xz0s"; + src = fetchFromGitHub { + owner = "mongodb"; + repo = "libbson"; + rev = version; + sha256 = "1ilxbv4yjgf0vfzaa8lzn40hv5x1737ny2g2q1wmm8bl39m0viiw"; }; - buildInputs = [ autoconf automake114x libtool perl which ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { description = "A C Library for parsing, editing, and creating BSON documents"; diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index b12b642668b9..410c83953aa9 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "libchardet-1.0.4"; - - src = fetchurl { - url = "http://yupmin.net/wp-content/uploads/2014/03/libchardet-1.0.4.tar.bz2"; - sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl"; + name = "libchardet-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "Joungkyun"; + repo = "libchardet"; + rev = version; + sha256 = "0c1k5hf3ssh3cm72w2zpy5k73vhy1gyq5s9rqdawqqa4al8syyvn"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 8e911a9b015f..2dc9c6577a40 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmakeHook, which +{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmake, which }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ qmakeHook which ]; + nativeBuildInputs = [ qmake which ]; enableParallelBuilding = true; @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { doCheck = true; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = with stdenv.lib; { description = "A cross-platform IRC framework written with Qt"; homepage = https://communi.github.io; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index df18ae06ed66..7c569b2e92d1 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index 15e0fbc6f796..a89bdec2c8af 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { quick to integrate with your code. ''; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 2784cd90a5c6..24ec3d74d36f 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: -stdenv.mkDerivation { - name = "libcouchbase-2.5.2"; - src = fetchurl { - url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz"; - sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24"; +stdenv.mkDerivation rec { + name = "libcouchbase-${version}"; + version = "2.7.2"; + + src = fetchFromGitHub { + owner = "couchbase"; + repo ="libcouchbase"; + rev = version; + sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libevent openssl]; + buildInputs = [ libevent openssl ]; - meta = { + doCheck = true; + checkPhase = "ctest"; + + meta = with stdenv.lib; { description = "C client library for Couchbase"; homepage = "https://github.com/couchbase/libcouchbase"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = licenses.asl20; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 2e76c510bdda..e20b1c95a199 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.15.1"; + version = "3.18.3"; name = "libdap-${version}"; - buildInputs = [ bison libuuid curl libxml2 flex ]; + nativeBuildInputs = [ bison flex ]; + buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { url = "http://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "6ee13cc69ae0b5e7552ddfd17013ebb385859bba66f42a2cfba3b3be7aa4ef0f"; + sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c"; }; - meta = { + meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; homepage = http://www.opendap.org/download/libdap; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index d49f4cc6a722..34ba39d799ed 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch new file mode 100644 index 000000000000..5356a1111129 --- /dev/null +++ b/pkgs/development/libraries/libdc1394/darwin-fixes.patch @@ -0,0 +1,24 @@ +diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c +--- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400 ++++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400 +@@ -775,7 +775,7 @@ + { + uint8_t *outR, *outG, *outB; + register int i, j; +- uint tmp; ++ uint32_t tmp; + int st=sx*sy; + int p; + int sx2=sx<<1; +diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c +--- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500 ++++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400 +@@ -614,7 +614,7 @@ + dc1394video_frame_t * frame_tmp = capture->frames + next; + char ch; + +- if(craw->frames==NULL || craw->capture_is_set==0) { ++ if(craw->capture.frames==NULL || craw->capture_is_set==0) { + *frame=NULL; + return DC1394_CAPTURE_IS_NOT_SET; + } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index c96a2b7f051a..036adcef74cb 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, libraw1394, libusb1 -, CoreServices -}: +{ stdenv, fetchurl, libraw1394, +libusb1, CoreServices }: stdenv.mkDerivation rec { - name = "libdc1394-2.2.3"; + name = "libdc1394-${version}"; + version = "2.2.5"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; + sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m"; }; buildInputs = [ libusb1 ] ++ stdenv.lib.optional stdenv.isLinux libraw1394 ++ stdenv.lib.optional stdenv.isDarwin CoreServices; - meta = { + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; + + meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 68bd72f3e0f5..20e74cdc1517 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; platforms = platforms.mesaPlatforms; - maintainers = [ maintainers.phreedom maintainers.urkud ]; + maintainers = [ maintainers.phreedom ]; }; } diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index d0122d0283c5..287494b6b1fd 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchurl, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkgconfig, darwin }: stdenv.mkDerivation rec { - name = "libdiscid-0.6.1"; + name = "libdiscid-${version}"; + version = "0.6.2"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; - sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc"; + sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; + meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 26cf2c023ebd..390bb4ea9e45 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "An open source software for reading and writing Data Matrix barcodes"; homepage = http://libdmtx.org; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3dfbdd7040f2..a8cf28648079 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: +{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.75"; + name = "libdrm-2.4.81"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f"; + sha256 = "8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpthreadstubs libpciaccess ]; + buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; # libdrm as of 2.4.70 does not actually do anything with udev. patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ "--disable-valgrind" ] + configureFlags = [ ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 72b582a90ad6..be7e20f00eb5 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A library for reading DVDs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 2a2dfbb0be53..5ee92b463857 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = { description = "Library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 5027afa397ac..5cf74164f0fb 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 000000000000..e282d9005dbb --- /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 37e0c9b3431e..d77337c912b2 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/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 3ff40141b164..a91acb230525 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.4.6"; + name = "libevdev-1.5.6"; src = fetchurl { - url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv"; + url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; + sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 6f1981d0ece7..a6fb4ec515a8 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.2"; + name = "libextractor-1.4"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96"; + sha256 = "0v7ns5jhsyp1wzvbaydfgxnva5zd63gkzm9djhckmam9liq824l4"; }; preConfigure = diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix new file mode 100644 index 000000000000..4c637485086a --- /dev/null +++ b/pkgs/development/libraries/libfann/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "libfann-${version}"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "libfann"; + repo = "fann"; + rev = version; + sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y"; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ "out" "dev" ]; + + meta = { + homepage = "http://leenissen.dk/fann/wp/"; + description = "Fast Artificial Neural Network Library"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index b203f6346476..ca149bd3db35 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/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4df326e278cc..b0f1046aa594 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21"; + sha256 = "1qrvddjqz5jv6920gcfqsrsjksi2845hn96g0z3vpcsm6nifhqn1"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index a0b03c4c0057..f56dc60771d6 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,28 +1,23 @@ -{ stdenv, fetchurl, fetchgit, autoreconfHook, libtool }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { name="libfixposix-${version}"; - version="git-${src.rev}"; + version="0.4.1"; - src = fetchgit { - url = "https://github.com/sionescu/libfixposix"; - rev = "30b75609d858588ea00b427015940351896867e9"; - sha256 = "17spjz9vbgqllzlkws2abvqi0a71smhi4vgq3913aw0kq206mfxz"; + src = fetchFromGitHub { + owner = "sionescu"; + repo = "libfixposix"; + rev = "v${version}"; + sha256 = "19wjb43mn16f4lin5a2dfi3ym2hy7kqibs0z631d205b16vxas15"; }; - buildInputs = [ autoreconfHook libtool ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = with stdenv.lib; { - description = "A set of workarounds for places in POSIX that get implemented differently"; - maintainers = with maintainers; - [ - raskin - ]; + homepage = https://github.com/sionescu/libfixposix; + description = "Thin wrapper over POSIX syscalls and some replacement functionality"; + license = licenses.boost; + maintainers = with maintainers; [ orivej raskin ]; platforms = platforms.linux; }; - passthru = { - updateInfo = { - downloadPage = "http://gitorious.org/libfixposix/libfixposix"; - }; - }; } diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 2b30dacb58fa..ad400a0aef61 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index cd0a2a3c473e..180aab09188e 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -9,11 +9,11 @@ assert pythonSupport -> python != null && swig != null; assert docSupport -> doxygen != null; stdenv.mkDerivation rec { - name = "libftdi1-1.2"; - + name = "libftdi1-1.3"; + src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; - sha256 = "1ml8hiahnqm4z0xzyjv8kyrkzvhw6l431c3jndg026cjh9f7ksm6"; + sha256 = "1x41mbzh4qy7mrv2n86r2cr176rx03iacn0a99c3dkzv9g4rb34s"; }; buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ] diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 36f4a04c9df6..f0d05c0b263f 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libusb ]; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = { description = "A library to talk to FTDI chips using libusb"; homepage = http://www.intra2net.com/en/developer/libftdi/; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index fc2c859a5f87..ac54858b1de3 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.6"; + version = "1.7.8"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1g05prhgqw4ryd0w433q8nhds0h93kf47hfjagi2r7dghkpaysk2"; + sha256 = "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index afa064881a66..c183a2c98ef8 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgpg-error-${version}"; - version = "1.26"; + version = "1.27"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0sgfia0syq78k1c9h10rkhc1nfv5v097icrprlx2x4qn074wnjsc"; + sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index e35da9e80872..60400712e30e 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec { description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index a22b99be8da9..f2f062785b69 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 , python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: -with { inherit (stdenv.lib) optionals; }; +let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { name = "libgsf-1.14.41"; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] ++ libintlOrEmpty; + outputs = [ "out" "dev" ]; + doCheck = true; preCheck = "patchShebangs ./tests/"; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index ee4f9401bbb7..de72072e48be 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection }: +{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }: stdenv.mkDerivation rec { name = "libgtop-${version}"; major = "2.34"; @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; + buildInputs = libintlOrEmpty; nativeBuildInputs = [ pkgconfig perl intltool gobjectIntrospection ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = { - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index e751c6ee6c04..5b29c23fa6e5 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchurl, pkgconfig, udev, glib }: - -let version = "230"; in +{ stdenv, fetchurl, pkgconfig, udev, glib }: stdenv.mkDerivation rec { name = "libgudev-${version}"; + version = "231"; src = fetchurl { url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz"; - sha256 = "a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18"; + sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv"; }; buildInputs = [ pkgconfig udev glib ]; - meta = { + # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. + configureFlags = [ "--disable-umockdev" ]; + + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/libgudev; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl2Plus; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; + license = licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 8901fef21fd0..73424902cd09 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,37 +1,54 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }: +, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor +, getopt, perlPackages, ocamlPackages }: stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.29.5"; + version = "1.36.3"; appliance = fetchurl { - url = "http://libguestfs.org/download/binaries/appliance/appliance-1.26.0.tar.xz"; - sha256 = "1kzvgmy845kclvr93y6rdpss2q0p8yfqg14r0i1pi5r4zc68yvj4"; + url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz"; + sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125"; }; src = fetchurl { - url = "http://libguestfs.org/download/1.29-development/libguestfs-${version}.tar.gz"; - sha256 = "1il0p3irwcyfdm83935hj4bvxsx0kdfn8dvqmg2lbzap17jvzj8h"; + url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz"; + sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; }; buildInputs = [ makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong - SysVirt numactl xen - ]; + SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild + ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]); + prePatch = '' + # build-time scripts + substituteInPlace run.in --replace '#!/bin/bash' '#!/bin/sh' + substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!/bin/sh' + + # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml" + substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + substituteInPlace ocaml/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + substituteInPlace v2v/test-harness/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + substituteInPlace v2v/test-harness/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + + # some scripts hardcore /usr/bin/env which is not available in the build env + patchShebangs . + ''; configureFlags = "--disable-appliance --disable-daemon"; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; + installFlags = "REALLY_INSTALL=yes"; + enableParallelBuilding = true; postInstall = '' for bin in $out/bin/*; do wrapProgram "$bin" \ - --prefix "PATH" : "$out/bin:${hivex}/bin" \ + --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \ --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl" done ''; diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch index 44cdc4e69b2e..09c4b1393ce7 100644 --- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch +++ b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch @@ -1,7 +1,7 @@ -diff -rupN libguestfs-1.29.5/src/Makefile.am libguestfs-1.29.5-new/src/Makefile.am ---- libguestfs-1.29.5/src/Makefile.am 2014-11-05 16:43:08.000000000 +0100 -+++ libguestfs-1.29.5-new/src/Makefile.am 2014-11-05 20:07:45.760730596 +0100 -@@ -167,8 +167,7 @@ libguestfs_la_LIBADD = \ +diff --git a/lib/Makefile.am b/lib/Makefile.am +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -168,8 +168,7 @@ libguestfs_la_LIBADD = \ # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0'. # Include the version script to limit which symbols are exported. libguestfs_la_LDFLAGS = \ diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix new file mode 100644 index 000000000000..08563ed53dd5 --- /dev/null +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "libhdhomerun-1efbcb"; + + src = fetchgit { + url = "git://github.com/Silicondust/libhdhomerun.git"; + rev = "1efbcb2b87b17a82f2b3d873d1c9cc1c6a3a9b77"; + sha256 = "11iyrfs98xb50n9iqnwfphmmnn5w3mq2l9cjjpf8qp29cvs33cgy"; + }; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "gcc" "cc" + substituteInPlace Makefile --replace "-arch i386" "" + ''; + + installPhase = let + libSuff = if stdenv.isDarwin then "dylib" else "so"; + in '' + mkdir -p $out/{bin,lib,include/hdhomerun} + install -Dm444 libhdhomerun.${libSuff} $out/lib + install -Dm555 hdhomerun_config $out/bin + cp *.h $out/include/hdhomerun + ''; + + meta = with stdenv.lib; { + description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; + homepage = "https://github.com/Silicondust/libhdhomerun"; + repositories.git = "https://github.com/Silicondust/libhdhomerun.git"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.titanous ]; + }; +} diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index cf38f117bb8c..239536140ec0 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: stdenv.mkDerivation rec { - major = "0.2"; - minor = "3"; + major = "0.4"; + minor = "5"; version = "${major}.${minor}"; name = "libhttpseverywhere-${version}"; src = fetchurl { url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; - sha256 = "0ndk6yyfcd7iwwkv4rkivhd08k0x8v03gnp9dk1ms4bxb1l2i8l1"; + sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2"; }; nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; @@ -18,13 +18,12 @@ stdenv.mkDerivation rec { configurePhase = '' mkdir build cd build - meson.py --prefix "$out" .. + meson --prefix "$out" .. ''; buildPhase = '' ninja - ninja devhelp - ''; + ''; installPhase = "ninja install"; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index fad5c5d73f42..6a8af9ccac6d 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libibumad }: stdenv.mkDerivation rec { - name = "libibmad-1.3.12"; + name = "libibmad-1.3.13"; src = fetchurl { url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; - sha256 = "0ywkz0rskci414r6h6jd4iz4qjbj37ga2k91z1mlj9xrnl9bbgzi"; + sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p"; }; buildInputs = [ libibumad ]; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 5f1f6afcec12..899465124100 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,33 +1,26 @@ -{ 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-1.14"; + name = "libiconv-${version}"; + version = "1.15"; src = fetchurl { url = "mirror://gnu/libiconv/${name}.tar.gz"; - sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"; + 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 005e3379d165..000000000000 --- 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 0e4ddd931bb0..000000000000 --- 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/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index ea26f480cd12..61926dad24d1 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -3,11 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libidn2-0.16"; + name = "libidn2-${version}"; + version = "2.0.2"; src = fetchurl { - url = "https://alpha.gnu.org/gnu/libidn/${name}.tar.gz"; - sha256 = "13v8kh4d5nfkymai88zlw3h7k4x9khrpdpv97waf4ah8ykzrxb9g"; + url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; + sha256 = "1azfhz8zj1c27a5k2cspnkzkyfhcsqx2yc2sygh720dbn8l2imlc"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/development/libraries/libidn2/fix-error-darwin.patch index db3edd6e4a08..e2202abd947c 100644 --- a/pkgs/development/libraries/libidn2/fix-error-darwin.patch +++ b/pkgs/development/libraries/libidn2/fix-error-darwin.patch @@ -10,17 +10,6 @@ index 6abbc72..804f0f2 100644 #include "gettext.h" #define _(String) dgettext (PACKAGE, String) #include "progname.h" -@@ -161,9 +160,7 @@ process_input (char *readbuf, int flags) - free (output); - } - else -- error (EXIT_FAILURE, 0, "%s: %s", -- args_info.register_given ? "register" : "lookup", -- idn2_strerror (rc)); -+ perror (idn2_strerror (rc)); - } - - int @@ -222,7 +219,7 @@ main (int argc, char *argv[]) } diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index d13a9050dc9d..b55e0104f706 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -3,7 +3,8 @@ , documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }: +, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss +, libintlOrEmpty }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -17,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; }; - buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] + buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss libintlOrEmpty ] ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi @@ -34,12 +35,14 @@ in stdenv.mkDerivation rec { ${edf avahiSupport "avahi"} ''; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index f0257ed8a44b..1cc275b30480 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -17,11 +17,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.5.1"; + version = "1.7.3"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "d4f63933b0967bd691735af5e3919e2d29c2121d4e05867cc4e10ff3ae8e2dd8"; + sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 14e41961e0a6..fef5e7278b81 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://www.ulduzsoft.com/libircclient/; license = licenses.lgpl3; maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 39806d7d22c3..72b4469058c0 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libite-${version}"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "0cx566rcjq2m24yq7m88ci642x34lxy97kjb12cbi1c174k738hm"; + sha256 = "040idgbjqr239rkd68rqzwhylryiaa0z3qkwj2l2mlscv0aq8v0j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index a59a1702e173..cd8484170bdb 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/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index aee95b1f1af0..7a3eb9caa661 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { in an Ogg container. It can carry Unicode text, images, and animate them.''; homepage = http://code.google.com/p/libkate; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index d95ada04a34b..326d9c4f9d78 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, qtbase, qmakeHook }: +{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }: stdenv.mkDerivation rec { name = "libkeyfinder-${version}"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { owner = "ibsh"; }; - buildInputs = [ fftw qtbase qmakeHook ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ fftw qtbase ]; postPatch = '' substituteInPlace LibKeyFinder.pro \ diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index ad578ac272b1..aa76505c3a07 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }: +{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake +, darwin }: let version = "1.0.9"; in @@ -15,12 +16,13 @@ stdenv.mkDerivation rec { prefixKey = "--prefix "; propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; nativeBuildInputs = [ pkgconfig which cmake ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = { homepage = http://github.com/lastfm/liblastfm; repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; + maintainers = with stdenv.lib.maintainers; [ phreedom ]; }; } diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index cb62ff3628b8..7b7e96012ea7 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/liblo; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index e7e4cd6c75d9..46ea9fe6ee59 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -2,23 +2,22 @@ stdenv.mkDerivation rec { _name = "liblockfile"; - version = "1.09"; + version = "1.14"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; - sha256 = "0zqvbxls1632wqfhv4v3q2djzlz9391h0wdgsvhnaqrr0nx9x5qn"; + sha256 = "0q6hn78fnzr6lhisg85a948rmpsd9rx67skzx3vh9hnbx2ix8h5b"; }; preConfigure = '' - sed -i -e 's/install -g [^ ]* /install /' Makefile.in + sed -i -e 's/ -g [^ ]* / /' Makefile.in ''; preInstall = '' mkdir -p $out/{bin,lib,include,man} $out/man/man{1,3} ''; - meta = { description = "Shared library with NFS-safe locking functions"; homepage = http://packages.debian.org/unstable/libs/liblockfile1; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 3af1227c69b4..e505871eb02e 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://liblqr.wikidot.com; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 3b3dee138a54..81fa9011e30b 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.5"; + name = "libmatroska-1.4.7"; src = fetchurl { url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "1g2p2phmhkp86ldd2zqx6q0s33r7d38rsfnr4wmmdr81d6j3y0kr"; + sha256 = "1yi5cnv13nhl27xyqayd5l3sf0j3swfj3apzibv71yg9pariwi26"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index f57a49ab8123..cc6f5205d92a 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.91"; + version = "0.7.97"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1h39cwd85rgidr0hbwab9dwbjv25xhvjv8y2nv35p3fwrs48p098"; + sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index c38d5c825700..23e6a37f918c 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.52"; + name = "libmicrohttpd-0.9.55"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "1smgxw6jv81yybg86bzr4c2sn7a31apf8q4zz0kpch9xfrp7yyal"; + sha256 = "1y6h1slav5l6k8zyb01dpw65dscdgxxgfa3a0z9qnn7jr66sn70c"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index f6dc4b862921..8071d386db0f 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -4,10 +4,10 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { - name = "libmikmod-3.3.10"; + name = "libmikmod-3.3.11"; src = fetchurl { url = "mirror://sourceforge/mikmod/${name}.tar.gz"; - sha256 = "0j7g4jpa2zgzw7x6s3rldypa7zlwjvn97rwx0sylx1iihhlzbcq0"; + sha256 = "1smb291jr4qm2cdk3gfpmh0pr23rx3jw3fw0j1zr3b4ih7727fni"; }; buildInputs = [ texinfo ] diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 441b4ea7f9a2..d1dd7860de4e 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libmms.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 103595bc035d..ff627499855c 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; license = licenses.zlib; - maintainers = with maintainers; [ marcweber urkud ]; + maintainers = with maintainers; [ marcweber ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 02e86cc688b8..33ccccea2e95 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = http://netfilter.org/projects/libmnl/index.html; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 0d3c9c0997c1..1bad236e0447 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 72943c098ba1..c6870f77f1f3 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 , ... }: @@ -8,7 +9,12 @@ stdenv.mkDerivation rec { inherit src patches; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; + + crossAttrs = { + } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { + cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows"; + }; meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index e1902263ac20..8892b016fe88 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.11"; + name = "libmtp-1.1.13"; src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m"; + sha256 = "0h3dv9py5mmvxhfxmkr8ky4s80hgq3d66cmrfnnnlcdwpwpy0kj9"; }; outputs = [ "bin" "dev" "out" ]; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { systems. We implement MTP Basic, the stuff proposed for standardization. ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix index 4cad0c0f9f64..f12b854e7783 100644 --- a/pkgs/development/libraries/libmusicbrainz/2.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/2.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 5ec8f80f7e02..4765e90c6df7 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 99c253cdb358..596399c4fa8f 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index cdde02c361fa..fe38755f10c5 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { homepage = http://natspec.sourceforge.net/ ; description = "A library intended to smooth national specificities in using of programs"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { NIX_LDFLAGS = "-liconv"; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix new file mode 100644 index 000000000000..e3c8447549d1 --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: + +stdenv.mkDerivation rec { + name = "libnetfilter_log-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "http://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; + sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; + }; + + buildInputs = [ libmnl ]; + propagatedBuildInputs = [ libnfnetlink ]; + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Userspace library providing interface to packets that have been logged by the kernel packet filter"; + longDescription = '' + libnetfilter_log is a userspace library providing interface to packets + that have been logged by the kernel packet filter. It is is part of a + system that deprecates the old syslog/dmesg based packet logging. This + library has been previously known as libnfnetlink_log. + ''; + homepage = http://netfilter.org/projects/libnetfilter_log/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej nckx ]; + }; +} diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index a9d07701dd90..09be1b41353a 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1 }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { - name = "libnice-0.1.13"; + name = "libnice-0.1.14"; src = fetchurl { url = "http://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1q8rhklbz1zla67r4mw0f7v3m5b32maj0prnr0kshcz97fgjs4b1"; + sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; propagatedBuildInputs = [ glib gupnp_igd ]; meta = { diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index c26a64ec8041..41a9cf518e4c 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -1,27 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool -, glib, gdk_pixbuf, gobjectIntrospection, autoreconfHook }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook +, glib, gdk_pixbuf, gobjectIntrospection }: stdenv.mkDerivation rec { ver_maj = "0.7"; - ver_min = "6"; + ver_min = "7"; name = "libnotify-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz"; - sha256 = "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf"; + sha256 = "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w"; }; - # see Gentoo ebuild - we don't need to depend on gtk+(2/3) - preAutoreconf = '' - sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die - sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die - ''; + # disable tests as we don't need to depend on gtk+(2/3) + configureFlags = [ "--disable-tests" ]; - buildInputs = [ pkgconfig automake autoconf autoreconfHook - libtool glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; meta = { - homepage = http://galago-project.org/; # very obsolete but found no better + homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 396e8e92acfd..7927dba89838 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://libofx.sourceforge.net/; license = "LGPL"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 0689be2c6216..83bb80cc3203 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { interleaving data container developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio format but now used for many free codecs including Dirac, FLAC, Speex and Theora.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 559caf8928b8..66c7e7e882e8 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -2,23 +2,16 @@ , fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.3"; + 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 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq"; + url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; + sha256 = "0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg"; }; - patches = [ - (fetchpatch { # CVE-2017-0381 - url = "https://github.com/xiph/opus/commit/79e8f527b0344b0897a65be35e77f7885bd99409.patch"; - sha256 = "0clm4ixqkaj0a6i5rhaqfv3nnxyk33b2b8xlm7vyfd0y8kbh996q"; - }) - ]; - outputs = [ "out" "dev" ]; configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 91195229d87a..26e754317df0 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,21 +1,25 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "libp11-0.2.7"; + name = "libp11-${version}"; + version = "0.4.4"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = name; - sha256 = "0llw69kcb6nvz7zzkb9nyfyhc2s972q68sqciabqxwxljr09c411"; + sha256 = "1jnpnwipmw3skw112qff36w046nyz5amiil228rn5divpkvx4axa"; }; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; buildInputs = [ openssl ]; - meta = { - homepage = http://www.opensc-project.org/libp11/; - license = "LGPL"; + meta = with stdenv.lib; { + homepage = https://github.com/OpenSC/libp11; + license = licenses.lgpl21Plus; description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index c08ff2651944..34b09d45044d 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.5.0"; + version = "4.8.0"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha1 = "857eb066724e2a5b723d6802d217c8eddff79082"; + sha256 = "0s6gcvrhj2h928cqc8399189annif7yl74k6wda446r0fdx7i4wi"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index b98fdbdb470d..f1c421b4bf76 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -3,13 +3,12 @@ let inherit (python2Packages) python cython; in stdenv.mkDerivation rec { - name = "libplist-1.12"; + name = "libplist-${version}"; + version = "2.0.0"; - nativeBuildInputs = [ pkgconfig swig2 python cython ]; + nativeBuildInputs = [ pkgconfig swig2 python cython ]; - #patches = [ ./swig.patch ]; - - propagatedBuildInputs = [ libxml2 glib ]; + propagatedBuildInputs = [ glib ]; passthru.swig = swig2; @@ -21,19 +20,12 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; - sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf"; + sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis"; }; meta = { homepage = http://github.com/JonathanBeck/libplist; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; - knownVulnerabilities = [ - "CVE-2017-5209: base64decode function in base64.c allows attackers to obtain sensitive information from process memory or cause a denial of service" - "CVE-2017-5545: attackers to obtain sensitive information from process memory or cause a denial of service" - "CVE-2017-5834: A heap-buffer overflow in parse_dict_node" - "CVE-2017-5835: A memory allocation error leading to DoS" - "CVE-2017-5836: A type inconsistency in bplist.c" - ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libplist/swig.patch b/pkgs/development/libraries/libplist/swig.patch deleted file mode 100644 index 9686a7cbf515..000000000000 --- a/pkgs/development/libraries/libplist/swig.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit ca6096bc29873d5a3c03d782b134253ac2e61beb -Author: Yury G. Kudryashov -Date: Fri Sep 24 17:16:40 2010 +0400 - - Install python bindings to libplist prefix, not to system directory. - - This allows one to install libplist to $HOME/prefix and adjust - PYTHONPATH. - -diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt -index 379cb95..fcacde0 100644 ---- a/swig/CMakeLists.txt -+++ b/swig/CMakeLists.txt -@@ -9,16 +9,18 @@ SWIG_ADD_MODULE( plist python plist.i ) - SWIG_LINK_LIBRARIES( plist plist plist++ ${PYTHON_LIBRARIES} ) - - EXEC_PROGRAM("${PYTHON_EXECUTABLE}" -- ARGS "-c 'try:\n import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)\nexcept: pass\n'" -- OUTPUT_VARIABLE DISTUTILS_PYTHON_ILIBRARY_PATH -+ ARGS "-c 'import sys; print sys.version[:3];'" -+ OUTPUT_VARIABLE PYTHON_SHORT_VERSION - ) - -+SET(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_SHORT_VERSION}/site-packages CACHE PATH "The directory where python modules will be installed to.") -+ - INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/_plist${CMAKE_SHARED_MODULE_SUFFIX} -- DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ ) -+ DESTINATION ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/plist/ ) - INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/plist.py -- DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ ) -+ DESTINATION ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/plist/ ) - INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py -- DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ ) -+ DESTINATION ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/plist/ ) - INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/plist.i - DESTINATION include/plist/swig COMPONENT dev) - diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index b3f7f96e9362..457f99ef13bd 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 545c58f976e9..c2f50af84ca8 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, zlib, apngSupport ? true }: +{ stdenv, fetchurl, zlib, apngSupport ? true +, buildPlatform, hostPlatform +}: assert zlib != null; let - version = "1.6.28"; + version = "1.6.29"; patchVersion = "1.6.26"; # patchVersion = version; - sha256 = "0ylgyx93hnk38haqrh8prd3ax5ngzwvjqw5cxw7p9nxmwsfyrlyq"; + sha256 = "0fgjqp7x6jynacmqh6dj72cn6nnf6yxjfqqqfsxrx0pyx22bcia2"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1"; @@ -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/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 97929d29b377..cf3ad5f1ebba 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, spidermonkey_1_8_5 }: +, dbus, networkmanager, webkitgtk216x, pcre, python2 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ]; + buildInputs = [ dbus networkmanager webkitgtk216x pcre ]; + + cmakeFlags = [ + "-DWITH_WEBKIT3=ON" + "-DWITH_MOZJS=OFF" + "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}" + ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 0a7eb618b184..9eb3d345ecb7 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.68"; + name = "libpst-0.6.70"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "06mcaga36i65n1ifr5pw6ghcb1cjfqwrmm1xmaw1sckqf2iqx2by"; + sha256 = "1m378vxh1sf9ry8k11x773xpy5f6cab5gkzqglz0jp9hc431r60r"; }; buildInputs = [ autoreconfHook boost python2 libgsf pkgconfig bzip2 diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index 3e4fe99df4ca..a5a428010b2b 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl, cracklib, python }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }: stdenv.mkDerivation rec { name = "libpwquality-${version}"; - version = "1.3.0"; + version = "1.4.0"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2"; - sha256 = "0aidriag6h0syfm33nzdfdsqgrnsgihwjv3a5lgkqch3w68fmlkl"; + src = fetchFromGitHub { + owner = "libpwquality"; + repo = "libpwquality"; + rev = name; + sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd"; }; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ cracklib python ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with lib; { + description = "Password quality checking and random password generation library"; + homepage = "https://github.com/libpwquality/libpwquality"; + license = licenses.bsd3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 734760c8830b..abc0eb4a2287 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced calculator library"; homepage = http://qalculate.github.io; - maintainers = with maintainers; [ urkud gebner ]; + maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index d0b46722ff35..2e316a30a018 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, python }: +{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.16.0"; + name = "libqmi-1.18.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "0amshs06qc8zy8jz3r2yksqhhbamll7f893ll4zlvgr3zm3vpdks"; + sha256 = "1v4cz3nsmh7nn3smhlhwzrb7yh6l1f270bwf40qacxayjdajr950"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ pkgconfig glib python ]; + buildInputs = [ pkgconfig glib python libgudev libmbim ]; + + configureFlags = ["--enable-mbim-qmux" ]; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/libqmi/; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix new file mode 100644 index 000000000000..a79e6d903842 --- /dev/null +++ b/pkgs/development/libraries/libqtav/default.nix @@ -0,0 +1,57 @@ +{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules +, qtbase, qtmultimedia, qtquick1, qttools +, mesa, libX11 +, libass, openal, ffmpeg, libuchardet +, alsaLib, libpulseaudio, libva +}: + +with lib; + +mkDerivation rec { + name = "libqtav-${version}"; + + # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the + # the reason behind taking an unstable git rev. + version = "unstable-2017-03-30"; + + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ + qtbase qtmultimedia qtquick1 + mesa libX11 + libass openal ffmpeg libuchardet + alsaLib libpulseaudio libva + ]; + + src = fetchFromGitHub { + sha256 = "1xw0ynm9w501651rna3ppf8p336ag1p60i9dxhghzm543l7as93v"; + rev = "4b4ae3b470b2fcbbcf1b541c2537fb270ee0bcfa"; + repo = "QtAV"; + owner = "wang-bin"; + fetchSubmodules = true; + }; + + patchPhase = '' + sed -i -e 's#CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT#TRUE#g' ./CMakeLists.txt + sed -i -e 's#DESTINATION ''${QT_INSTALL_LIBS}/cmake#DESTINATION ''${QTAV_INSTALL_LIBS}/cmake#g' ./CMakeLists.txt + ''; + + # Make sure libqtav finds its libGL dependancy at both link and run time + # by adding mesa to rpath. Not sure why it wasn't done automatically like + # the other libraries as `mesa` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${mesa}/lib"]; + + preFixup = '' + mkdir -p "$out/bin" + cp -a "./bin/"* "$out/bin" + ''; + + meta = { + description = "A multimedia playback framework based on Qt + FFmpeg."; + #license = licenses.lgpl21; # For the libraries / headers only. + license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. + homepage = http://www.qtav.org/; + maintainers = [ maintainers.jraygauthier ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 10979abdeabc..0047f30aad27 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/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index f84cfa044c6a..1271089060b7 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; + maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 6a5e4578cac7..8a0ca6f000d4 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; + maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix deleted file mode 100644 index c5642635b0f0..000000000000 --- 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 0a3e0d97f84f..000000000000 --- a/pkgs/development/libraries/libressl/2.5.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.5.1"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp"; - }; - - 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/default.nix b/pkgs/development/libraries/libressl/default.nix new file mode 100644 index 000000000000..4ce1b664725a --- /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/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ebd0f79cd47b..447712fc7db8 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -6,11 +6,11 @@ # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.40.16"; + name = "librsvg-2.40.17"; src = fetchurl { url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; - sha256 = "0bpz6gsq8xi1pb5k9ax6vinph460v14znch3y5yz167s0dmwz2yl"; + sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 2e3df7cf9e05..3409948f59eb 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/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index faeeb34d65dd..6dff8ebc8a1f 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -30,10 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; - # you can choose one of the following licenses: - # GPL or a commercial-use license (available at - # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf) - licenses = with licenses; [ gpl3.shortName unfree ]; + license = licenses.bsd2; maintainers = with maintainers; [ lovek323 wkennington ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix new file mode 100644 index 000000000000..882b3258b7de --- /dev/null +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libscrypt-${version}"; + version = "1.21"; + + src = fetchFromGitHub { + owner = "technion"; + repo = "libscrypt"; + rev = "v${version}"; + sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng"; + }; + + buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; + + installFlags = [ "PREFIX=$(out)" ]; + installTargets = if stdenv.isDarwin then "install-osx" else "install"; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Shared library that implements scrypt() functionality"; + homepage = "https://lolware.net/2014/04/29/libscrypt.html"; + license = licenses.bsd2; + maintainers = with maintainers; [ davidak ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a086ae890bd0..3b365c0e9712 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, getopt }: - -let version = "2.3.1"; in +{ stdenv, fetchurl, getopt, makeWrapper }: stdenv.mkDerivation rec { name = "libseccomp-${version}"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0asnlkzqms520r0dra08dzcz5hh6hs7lkajfw9wij3vrd0hxsnzz"; + sha256 = "3ddc8c037956c0a5ac19664ece4194743f59e1ccd4adde848f4f0dae7f77bca1"; }; - buildInputs = [ getopt ]; + buildInputs = [ getopt makeWrapper ]; patchPhase = '' patchShebangs . ''; + # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. + preFixup = "rm -rfv src"; + meta = with stdenv.lib; { description = "High level library for the Linux Kernel seccomp filter"; - homepage = "http://sourceforge.net/projects/libseccomp"; - license = licenses.lgpl2; + homepage = "https://github.com/seccomp/libseccomp"; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice wkennington ]; }; diff --git a/pkgs/development/libraries/libsigsegv/aarch64.patch b/pkgs/development/libraries/libsigsegv/aarch64.patch deleted file mode 100644 index 7bb48a230cee..000000000000 --- a/pkgs/development/libraries/libsigsegv/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure b/configure -index 6c4e868..0298e19 100755 ---- a/configure -+++ b/configure -@@ -14501,6 +14501,7 @@ else - - case "$host_cpu" in - a29k | \ -+ aarch64* | \ - alpha* | \ - arc | \ - arm* | strongarm* | xscale* | \ diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 3353fbf9e8d9..961b3b2d883b 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,21 +1,16 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { - name = "libsigsegv-2.10"; + name = "libsigsegv-2.11"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"; + sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; }; - # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch - # but applied directly to configure since we can't use autoreconf while bootstrapping. - patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64" - then [ ./aarch64.patch ] - else null; # TODO: change to lib.optional on next mass rebuild - - # https://github.com/NixOS/nixpkgs/issues/6028 - doCheck = false; + doCheck = hostPlatform == buildPlatform; meta = { homepage = http://www.gnu.org/software/libsigsegv/; diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix new file mode 100644 index 000000000000..21b788efb898 --- /dev/null +++ b/pkgs/development/libraries/libsmi/default.nix @@ -0,0 +1,18 @@ +{ stdenv , fetchurl }: + +stdenv.mkDerivation rec { + name = "libsmi-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz"; + sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; + }; + + meta = with stdenv.lib; { + description = "A Library to Access SMI MIB Information"; + homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; + license = licenses.free; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 30b378d77a46..bd5d0fd733c7 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libsndfile-1.0.27"; + name = "libsndfile-1.0.28"; src = fetchurl { url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz"; - sha256 = "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3"; + sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz"; }; buildInputs = [ pkgconfig flac libogg libvorbis ] diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index e0ad21008046..b508b2fea0eb 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.11"; + name = "libsodium-1.0.12"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "0rf7z6bgpnf8lyz8sph4h43fbb28pmj4dgybf0hsxxj97kdljid1"; + sha256 = "159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q"; }; outputs = [ "out" "dev" ]; + separateDebugInfo = stdenv.isLinux; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 788a5db13cda..18d18941b887 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; }; - buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ]; + buildInputs = [ cmake alsaLib libjack2 libpulseaudio ]; meta = with stdenv.lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index a04c5631ecbc..647e6f16fdf8 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/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix new file mode 100644 index 000000000000..dcec6b058fc3 --- /dev/null +++ b/pkgs/development/libraries/libspiro/default.nix @@ -0,0 +1,18 @@ +{stdenv, pkgconfig, fetchurl}: + +stdenv.mkDerivation rec { + name = "libspiro-${version}"; + version = "0.5.20150702"; + src = fetchurl { + url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz"; + sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; + }; + + nativeBuildInputs = [pkgconfig]; + + meta = with stdenv.lib; { + description = "A library that simplifies the drawing of beautiful curves"; + homepage = "https://github.com/fontforge/libspiro"; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 025a2ee37ff5..408436ca6184 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.7.4"; + name = "libssh-0.7.5"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/210/${name}.tar.xz"; - sha256 = "03bcp9ksqp0s1pmwfmzhcknvkxay5k0mjzzxp3rjlifbng1vxq9r"; + url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz"; + sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l"; }; postPatch = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SSH client library"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ sander urkud ]; + maintainers = with maintainers; [ sander ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 0e53d27c8892..4d754dc80866 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" @@ -31,6 +33,6 @@ stdenv.mkDerivation rec { description = "A client-side C library implementing the SSH2 protocol"; homepage = http://www.libssh2.org; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 3b74406d7bf1..dbd203b97cfc 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"; }; + patches = [ + (fetchurl { + name = "CVE-2017-6891.patch"; + url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=5520704d075802df25ce4ffccc010ba1641bd484"; + sha256 = "000r6wb87zkx8yhzkf1c3h7p5akwhjw51cv8f1yjnplrqqrr7h2k"; + }) + ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c67057031490..595ec9d01ccf 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,21 +1,20 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: let - version = "4.0.7"; + version = "4.0.8"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz"; + sha256 = "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"; }; prePatch =let - # https://lwn.net/Vulnerabilities/711777/ debian = fetchurl { - url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-5.debian.tar.xz; - sha256 = "1ribxdn89wx3nllcyh7ql3dx6wpr1h7z3waglz1w7dklxm43q67l"; + url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz; + sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng"; }; in '' tar xf '${debian}' diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 58e92f110185..deab30430359 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/libtiger/; - authors = [ "Vincent Penquerc'h" ]; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 3a00408c7ca3..0d0563eb5ddf 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libtoxcore-${version}"; - version = "0.1.6"; + version = "0.1.8"; src = fetchFromGitHub { owner = "TokTok"; repo = "c-toxcore"; rev = "v${version}"; - sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6"; + sha256 = "08vdq3j60wn62lj2z9f3f47hibns93rvaqx5xc5bm3nglk70q7kk"; }; cmakeFlags = [ 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 247b2dab44f8..000000000000 --- 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 419a14551ba4..8565bc75ff9f 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 09cefa028539..000000000000 --- 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 000000000000..63202937084c --- /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/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 947a10c0e470..5a76a93b8e3d 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://www.libusb.info; description = "User-space USB library"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix index 8481f857b2ce..d54c82ae7f21 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/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 941ab6710c2e..fdf5191bf720 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,19 +2,19 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.11.0"; + version = "1.12.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "02sm7f3l0shpfz25b77q2jjvlypc1mmz4zpzfgfmiplhgxxaa6la"; + sha256 = "0m025i0sfm4iv3aiic88x4y4bbhhdb204pmd9r383fsl458fck2p"; }; postPatch = let toDisable = [ - "getnameinfo_basic" # probably network-dependent + "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" ] diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 0018e38a9f95..8cebaeee2afd 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl , nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl -, xen +, xen, libapparmor }: let @@ -15,9 +15,11 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobjectIntrospection libcap_ng numactl xen + python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Library for working with virtual machines"; longDescription = '' diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 5fcdd153c99c..805a4c0b63db 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,36 +1,38 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper -, libxml2, gnutls, devicemapper, perl, python2 +, libxml2, gnutls, devicemapper, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng +, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen, zfs +, curl, libiconv, gmp, xen, zfs, parted }: + +with stdenv.lib; + # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.0.0"; + version = "3.5.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0php6wxjcilpir0miwg06yd2ha25zi9fv2apvvgv5c8k1svjd7cx"; + sha256 = "05mm4xdw6g960rwvc9189nhxpm1vrilnmpl4h4m1lha11pivlqr9"; }; patches = [ ./build-on-bsd.patch ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ - libxml2 gnutls perl python2 readline - gettext libtasn1 libgcrypt yajl + libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap - ] ++ stdenv.lib.optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux systemd libcap_ng - libnl numad numactl xen zfs - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isLinux [ + libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs + libapparmor libcap_ng numactl xen attr parted + ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; - preConfigure = stdenv.lib.optionalString stdenv.isLinux '' + preConfigure = optionalString stdenv.isLinux '' PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH substituteInPlace configure \ --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' @@ -48,13 +50,18 @@ stdenv.mkDerivation rec { "--with-test" "--with-esx" "--with-remote" - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ + "--with-attr" + "--with-apparmor" + "--with-secdriver-apparmor" "--with-numad" "--with-macvtap" "--with-virtualport" - "--with-init-script=redhat" + "--with-init-script=systemd+redhat" + "--with-storage-disk" + ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; @@ -66,17 +73,21 @@ stdenv.mkDerivation rec { postInstall = '' sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace "$out/bin" "${gettext}/bin" - '' + stdenv.lib.optionalString stdenv.isLinux '' + --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 \ - --prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]} + --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]} ''; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - meta = with stdenv.lib; { + meta = { homepage = http://libvirt.org/; repositories.git = git://libvirt.org/libvirt.git; description = '' diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 7efff3412a39..4b50fe090e38 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 1dafd4a124dc..824449a347af 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 6da1b00ee81f..673cd7abe7dd 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/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 0cb405d48375..57dfe34132f5 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libwpg.sourceforge.net; description = "C++ library to parse WPG"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index a1471766516a..ee32d9418dd9 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i 's|/usr/|/|g' Makefile ''; - makeFlags = "shared"; + makeFlags = [ "shared" ]; installPhase = '' make install DESTDIR=$out/ LIBDIR=lib @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; homepage = https://github.com/wfeldt/libx86emu; maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 173e1814aeab..486d52a2e27b 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.6.1"; + name = "libxkbcommon-0.7.1"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "0q47xa1szlxwgvwmhv4b7xwawnykz1hnc431d84nj8dlh2q8f22v"; + sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b"; }; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A library to handle keyboard descriptions"; homepage = http://xkbcommon.org; license = licenses.mit; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ garbas ttuegel ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index d44a8c973fdc..10dd4ee5dbe4 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" ]; @@ -70,7 +72,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; - license = "bsd"; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; }; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 7798c806982b..118b8af5a6f9 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 ]; @@ -48,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; - license = "bsd"; + license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.eelco ]; }; diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix new file mode 100644 index 000000000000..8af7d5d8797c --- /dev/null +++ b/pkgs/development/libraries/libytnef/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook }: + +with lib; + +stdenv.mkDerivation rec { + name = "libytnef-${version}"; + version = "1.9.2"; + + src = fetchFromGitHub { + owner = "Yeraze"; + repo = "ytnef"; + rev = "v${version}"; + sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + inherit (src.meta) homepage; + description = "Yeraze's TNEF Stream Reader - for winmail.dat files"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 5bb3f79f790e..ab473bbe85c1 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.34"; + version = "0.4.35"; name = "libzen-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "02krmhl6dplidz6h251ajpzzdhzzm0hp0lwwv9rgn55xjgh4yxw3"; + sha256 = "12a1icgcffgv503ii2k1453kxg5hfly09mf4zjcc80aq8a6rf8by"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index d1f2e633a0c5..9958a65d408b 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libzip-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r"; + sha256 = "17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix new file mode 100644 index 000000000000..b3333d58242e --- /dev/null +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "linenoise-ng-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "arangodb"; + repo = "linenoise-ng"; + rev = "v${version}"; + sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + homepage = "https://github.com/arangodb/linenoise-ng"; + description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; + maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix new file mode 100644 index 000000000000..391606d59e68 --- /dev/null +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "liquid-dsp-${version}"; + version = "20170307"; + + src = fetchFromGitHub { + owner = "jgaeddert"; + repo = "liquid-dsp"; + rev = "8c1978fa4f5662b8849fe712be716958f29cec0e"; + sha256 = "0zpxvdsrw0vzzp3iaag3wh4z8ygl7fkswgjppp2fz2zhhqh93k2w"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + homepage = http://liquidsdr.org/; + description = "Digital signal processing library for software-defined radios"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + }; + +} diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index ec3e9997690e..30703fc7e3ed 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -3,13 +3,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.19"; + version = "0.9.21"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "04qx803jdmhkcam748fn0az3cyzvj91lw28kcvwfyq0al7pmjkfs"; + sha256 = "026a6himvg3y4ssnccdbgr3c2pq3w2d47nayn05v512875z4f2w3"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index b5a6ecac9cf2..96cbbb770b4c 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { name = "log4cpp-1.1.1"; - + src = fetchurl { url = "mirror://sourceforge/log4cpp/${name}.tar.gz"; sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm"; }; - meta = { - homepage = http://log4cpp.sourceforge.net/; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://log4cpp.sourceforge.net/"; description = "A logging framework for C++ patterned after Apache log4j"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix new file mode 100644 index 000000000000..7b672aebe445 --- /dev/null +++ b/pkgs/development/libraries/log4shib/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchgit, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "log4shib-${version}"; + version = "1.0.9"; + + src = fetchgit { + url = "https://git.shibboleth.net/git/cpp-log4shib.git"; + rev = "a1afe19b7b49c32fcb03e6d72809501b8965cf85"; + sha256 = "06rrc5l6qxlc8abzim2jcxwz2c577qrjqx15cbfqq1zfqagj9hix"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A forked version of log4cpp that has been created for the Shibboleth project"; + maintainers = [ maintainers.jammerful ]; + }; +} diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 9f9b6aa44829..b4ec850b491a 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/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 23168de43ed5..8739c9d25d59 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "lzo-2.09"; + name = "lzo-2.10"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j"; + sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; configureFlags = [ "--enable-shared" ]; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 4259e52510bc..03a940801e98 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ + --replace " icule iculx" "" \ --replace "tidy/tidy.h" "tidy.h" \ --replace "/usr/include/tidy" "${libtidy}/include" \ --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 661e1270e7f6..96dbc094b55c 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python2, scons, sqlite, zlib + +# supply a postgresql package to enable the PostGIS input plugin +, postgresql ? null }: stdenv.mkDerivation rec { name = "mapnik-${version}"; - version = "3.0.12"; + version = "3.0.13"; src = fetchzip { # this one contains all git submodules and is cheaper than fetchgit url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "02w360fxk0pfkk0zbwc134jq7rkkib58scs5k67j8np6fx6gag6i"; + sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065"; }; # a distinct dev output makes python-mapnik fail @@ -21,6 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff libwebp libxml2 proj python2 sqlite zlib + + # optional inputs + postgresql ]; configurePhase = '' diff --git a/pkgs/development/libraries/martyr/builder.sh b/pkgs/development/libraries/martyr/builder.sh deleted file mode 100644 index 3ee7fc012d97..000000000000 --- a/pkgs/development/libraries/martyr/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -unpackPhase -cd $name -$apacheAnt/bin/ant -cp -R ./* $out diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 7fbd44b3fa4a..3b6102715391 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,11 +1,24 @@ -{stdenv, fetchurl, apacheAnt}: +{stdenv, fetchurl, ant, jdk}: -stdenv.mkDerivation { - name = "martyr-0.3.9"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "martyr-${version}"; + version = "0.3.9"; src = fetchurl { - url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz"; + url = "mirror://sourceforge/martyr/${name}.tar.gz"; sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; - inherit stdenv apacheAnt; + + buildInputs = [ ant jdk ]; + + buildPhase = "ant"; + + installPhase = '' + mkdir -p "$out/share/java" + cp -v *.jar "$out/share/java" + ''; + + meta = { + description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; + homepage = http://martyr.sourceforge.net/; + }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index b33950d35e04..83ddcbf52e14 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/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix index 41c0e0a9d167..e89fabb9fb33 100644 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-1.3.18"; + name = "mbedtls-1.3.19"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "188fjm0zzggxrjxnqc7zv7zz8pvys6yp1jx3xdyq8970h9qj2ad2"; + sha256 = "03mhlh8s2378ph23m1173i7wkhrs5i6d03mk5wa7a1d3qn24jrar"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index ebab4850be46..c5eab3f74b50 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.4.0"; + name = "mbedtls-2.4.2"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "0gwyxsz7av8fyzrz4zxhcy9jmszlvg9zskz3srar75lg0bhg1vw0"; + sha256 = "17r9qs585gqghcf5yavb1cnvsigl0f8r0k8rklr5a855hrajs7yh"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index 9b2fd805c319..b3c7daf990c8 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; description = "Library to read freedesktop.org menu files"; maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f5e716d212c7..e1bd4255636a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,10 +2,12 @@ , pkgconfig, intltool, autoreconfHook, substituteAll , file, expat, libdrm, xorg, wayland, openssl , llvmPackages, libffi, libomxil-bellagio, libva -, libelf, libvdpau, python2 +, libelf, libvdpau, valgrind-light , grsecEnabled ? false , enableRadv ? false -, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt +# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. +# It's overridden for mesa_drivers. +, enableTextureFloats ? false , galliumDrivers ? null , driDrivers ? null , vulkanDrivers ? null @@ -30,9 +32,11 @@ else let defaultGalliumDrivers = - if (stdenv.isArm || stdenv.isAarch64) - then ["nouveau" "freedreno" "vc4" "etnaviv"] - else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"]; + if stdenv.isArm + then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] + else if stdenv.isAarch64 + then ["nouveau" "vc4" ] + else ["i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = if (stdenv.isArm || stdenv.isAarch64) then ["nouveau"] @@ -63,7 +67,7 @@ let in let - version = "17.0.0"; + version = "17.1.4"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -73,11 +77,12 @@ stdenv.mkDerivation { src = fetchurl { urls = [ + "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "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 = "10c4cvm6hhdch0idh2kn7qv1dq6zlw97sc3pz7bssn81f1ckvnrr"; + sha256 = "06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad"; }; prePatch = "patchShebangs ."; @@ -98,7 +103,7 @@ stdenv.mkDerivation { "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri" - "--with-egl-platforms=x11,wayland,drm" + "--with-platforms=x11,wayland,drm" ] ++ (optional (galliumDrivers != []) ("--with-gallium-drivers=" + @@ -121,7 +126,7 @@ stdenv.mkDerivation { "--enable-glx" "--enable-glx-tls" "--enable-gallium-osmesa" # used by wine - "--enable-gallium-llvm" + "--enable-llvm" "--enable-egl" "--enable-xa" # used in vmware driver "--enable-gbm" @@ -147,7 +152,7 @@ stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland libvdpau libelf libXvMC libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ - (python2.withPackages (ps: [ ps.Mako ])) + valgrind-light ]; @@ -182,7 +187,7 @@ stdenv.mkDerivation { # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" - '' + optionalString (builtins.elem "intel" vulkanDrivers) '' + '' + optionalString (vulkanDrivers != []) '' # move share/vulkan/icd.d/ mv $out/share/ $drivers/ # Update search path used by Vulkan (it's pointing to $out but diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch index 68c0f1da26b6..af2ec9fdb096 100644 --- a/pkgs/development/libraries/mesa/symlink-drivers.patch +++ b/pkgs/development/libraries/mesa/symlink-drivers.patch @@ -11,11 +11,12 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0. install-data-hook: for i in $(TARGET_DRIVERS); do \ - ln -f $(DESTDIR)$(dridir)/gallium_dri.so \ -+ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \ ++ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \ $(DESTDIR)$(dridir)/$${i}_dri.so; \ done; \ -- $(RM) $(DESTDIR)$(dridir)/gallium_dri.* -+ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la +- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*; \ ++ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la \ + $(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true uninstall-hook: for i in $(TARGET_DRIVERS); do \ @@ -60,8 +61,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12. ln -sf $${l} \ $${dest_dir}/$${k}; \ done; \ -- $(RM) $${dest_dir}/libvdpau_gallium.* -+ $(RM) $${dest_dir}/libvdpau_gallium.la +- $(RM) $${dest_dir}/libvdpau_gallium.*; \ ++ $(RM) $${dest_dir}/libvdpau_gallium.la \ + $(RM) -d $${dest_dir} &>/dev/null || true uninstall-hook: for i in $(TARGET_DRIVERS); do \ @@ -73,7 +75,7 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0 k=libXvMC$${i}.$(LIB_EXT); \ l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ - ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ -+ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ ++ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ $${dest_dir}/$${l}; \ ln -sf $${l} \ $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ @@ -81,8 +83,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0 ln -sf $${l} \ $${dest_dir}/$${k}; \ done; \ -- $(RM) $${dest_dir}/libXvMCgallium.* -+ $(RM) $${dest_dir}/libXvMCgallium.la +- $(RM) $${dest_dir}/libXvMCgallium.*; \ ++ $(RM) $${dest_dir}/libXvMCgallium.la \ + $(RM) -d $${dest_dir} &>/dev/null || true uninstall-hook: for i in $(TARGET_DRIVERS); do \ diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2e51492f142e..15a62f264148 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.2.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "17jwz1lf9ilaxvgvhg7z86dhcsk95m4wlszy4gn7wab2ns5zhdm7"; + sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; }; buildInputs = [ @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + + # Remove an unnecessary reference to movit.dev. + s=${movit.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 5b255bd2d2b0..1d56d58c68d3 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { ladspa-sdk ]; + outputs = [ "out" "dev" ]; + # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ @@ -31,6 +33,16 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + + # Remove an unnecessary reference to movit.dev. + s=${movit.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" + + # Remove an unnecessary reference to movit.dev. + s=${qtbase.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltqt.so -e "s|$s|$t|g" ''; passthru = { diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 48abf2b61513..741ca96348d0 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/mp4v2; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 8dbe150e2cb3..4f9a9fb9bd0e 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/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index 1e868b79ce66..c7d65f156b8b 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { name = "msilbc-2.0.3"; - + src = fetchurl { url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz"; sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d"; }; -# patchPhase = "sed -i /MS_FILTER_SET_FMTP/d ilbc.c"; + propagatedBuildInputs = [ ilbc mediastreamer ]; + nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ilbc mediastreamer]; - - buildInputs = [pkgconfig]; - configureFlags = "ILBC_LIBS=ilbc ILBC_CFLAGS=-I${ilbc}/include"; + configureFlags = [ + "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" + "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" + ]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 4ffaee9be5ab..827a556a4688 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -5,6 +5,9 @@ , unicode ? true , gpm + +, buildPlatform, hostPlatform +, buildPackages }: let version = if abiVersion == "5" then "5.9" else "6.0"; @@ -35,7 +38,11 @@ stdenv.mkDerivation rec { # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + ] ++ lib.optionals (buildPlatform != hostPlatform) [ + buildPackages.ncurses buildPackages.stdenv.cc + ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; preConfigure = '' @@ -54,12 +61,8 @@ 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 ''; - selfNativeBuildInput = true; - enableParallelBuilding = true; doCheck = false; @@ -117,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/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 23bc7f883d43..9f46305c1b54 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; homepage = https://01.org/linux-nfc; maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 8a4b793cad79..9002d06693e5 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/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index aee0b3d7116c..3033c4301afe 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig # Optional Dependencies -, openssl ? null, libev ? null, zlib ? null, libcares ? null +, openssl ? null, libev ? null, zlib ? null, c-ares ? null , enableHpack ? false, jansson ? null , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null @@ -13,22 +13,22 @@ assert enableAsioLib -> boost != null; assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; -with { inherit (stdenv.lib) optional; }; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.19.0"; + version = "1.20.0"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a"; + sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b"; }; outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libev zlib libcares ] + buildInputs = [ openssl libev zlib c-ares ] ++ optional enableHpack jansson ++ optional enableAsioLib boost ++ optional enableGetAssets libxml2 @@ -36,8 +36,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ] + ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + + #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + + meta = with stdenv.lib; { - homepage = http://nghttp2.org/; + homepage = https://nghttp2.org/; description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 8a5d54952606..2dcc7e9a53dd 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchgit, nix }: - +{ stdenv, fetchFromGitHub, nix, boehmgc }: +let version = "2.0.7"; in stdenv.mkDerivation { - name = "nix-plugins-1.0.0"; + name = "nix-plugins-${version}"; - src = fetchgit { - url = git://github.com/shlevy/nix-plugins.git; - rev = "refs/tags/1.0.0"; - sha256 = "1w7l4mdwgf5w1g48mbng4lcg2nihixvp835mg2j7gghnya309fxl"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-plugins"; + rev = version; + sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs"; }; - buildInputs = [ nix ]; - - buildFlags = [ "NIX_INCLUDE=${nix}/include" ]; + buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -20,6 +19,5 @@ stdenv.mkDerivation { homepage = https://github.com/shlevy/nix-plugins; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; - broken = true; }; } diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index a5a808c1f615..9fb614cd071a 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/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 71a15b7e4777..c2aea07d102c 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , CoreServices ? null }: -let version = "4.13.1"; in +let version = "4.15"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab"; + sha256 = "101dksqm1z0hzd7ap82ccbxjr48s6q3xhshdl81qkj6hqdmy1p97"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 294371dde7ad..80975c8ef5dc 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,14 +9,16 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.28.3"; + version = "3.31"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_28_3_RTM/src/${name}.tar.gz"; - sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x"; + url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz"; + sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9"; }; - buildInputs = [ nspr perl zlib sqlite ]; + buildInputs = [ perl zlib sqlite ]; + + propagatedBuildInputs = [ nspr ]; prePatch = '' xz -d < ${nssPEM} | patch -p1 diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 564bf9f62e3d..3483d4bed778 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = https://launchpad.net/ntrack; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index c79c3cbe4d62..5090aa874ec4 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS = "-D__STDC_CONSTANT_MACROS=1"; + NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1"; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index c17c224415db..87e5e44b7dae 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3"; }; - buildInputs = [ cmake ] + nativeBuildInputs = [ cmake ]; + + buildInputs = [] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index b124e592f367..61024a33113e 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index af0456c0162b..85b4d5627201 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -4,7 +4,7 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableWebP ? true, libwebp -, enableEXR ? true, openexr, ilmbase +, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? true, jasper , enableIpp ? false @@ -15,7 +15,9 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? false, eigen +, enableOpenblas ? false, openblas , enableCuda ? false, cudatoolkit, gcc5 +, AVFoundation, Cocoa, QTKit }: let @@ -35,6 +37,13 @@ let sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj"; }; + # This fixes the build on OS X. + # See: https://github.com/opencv/opencv_contrib/pull/926 + contribOSXFix = fetchpatch { + url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch"; + sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm"; + }; + vggFiles = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; @@ -60,6 +69,9 @@ stdenv.mkDerivation rec { (lib.optionalString enableContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" + # This fixes the build on OS X. + patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}" + for name in vgg_generated_48.i \ vgg_generated_64.i \ vgg_generated_80.i \ @@ -77,6 +89,12 @@ stdenv.mkDerivation rec { ln -s "${bootdescFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name" done ''); + + # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS) + postPatch = '' + sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt + ''; + preConfigure = (let version = "20151201"; md5 = "808b791a6eac9ed78d32a7666804320e"; @@ -113,9 +131,10 @@ 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 ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -124,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) @@ -134,7 +153,8 @@ stdenv.mkDerivation rec { (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ] - ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off"; + ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off" + ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; enableParallelBuilding = true; @@ -146,7 +166,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric mdaiter]; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 7ea32745ba08..d7824dbed340 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -5,11 +5,12 @@ , enableJPEG ? true, libjpeg , enablePNG ? true, libpng , enableTIFF ? true, libtiff -, enableEXR ? true, openexr, ilmbase +, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? true, jasper , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all , enableEigen ? false, eigen +, darwin }: let @@ -34,6 +35,11 @@ stdenv.mkDerivation rec { ./no-build-info.patch ]; + # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS) + postPatch = '' + sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt + ''; + outputs = [ "out" "dev" ]; buildInputs = @@ -48,6 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ]) ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -76,11 +83,11 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = { + meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric flosse]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.bsd3; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix new file mode 100644 index 000000000000..75d2b090e711 --- /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 05c03dcd8424..7155d0f48a80 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 c7ab69e5169d..2d08f37c8c23 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 d496c7cc2d76..000000000000 --- 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 000000000000..fa147a9d9cca --- /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/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix new file mode 100644 index 000000000000..c2c102ccf9bd --- /dev/null +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, autoreconfHook, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: + +stdenv.mkDerivation rec { + name = "opensaml-cpp-${version}"; + version = "2.6.0"; + + src = fetchgit { + url = "https://git.shibboleth.net/git/cpp-opensaml.git"; + rev = "61193de29e4c9f1ccff7ed7e1f42c2748c62be77"; + sha256 = "1jlxa1f2qn0kd15fzjqp80apxn42v47wg3mx1vk424m31rhi00xr"; + }; + + buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://shibboleth.net/products/opensaml-cpp.html"; + description = "A low-level library written in C++ that provides support for producing and consuming SAML messages"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = [ maintainers.jammerful ]; + }; +} diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index ec85542c9207..8d0839041890 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.2.3"; + version = "3.4.0"; src = fetchurl { url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; - sha256 = "0gic1hy7fhs27ipbsa5862q120a9y4bx176nfaw2brcjp522zvb9"; + sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; }; nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 80a77e72275f..864e2dc70857 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 63112abf3a39..000000000000 --- 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 2591a43f1d47..c0296f42406d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,15 +1,17 @@ { 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 ? [], configureFlags ? [], makeDepend ? false }: stdenv.mkDerivation rec { + common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { name = "openssl-${version}"; src = fetchurl { @@ -19,14 +21,15 @@ let patches = (args.patches or []) - ++ optional (versionOlder version "1.1.0") ./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"))) + ++ [ ./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 (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; @@ -45,10 +48,7 @@ let ] ++ stdenv.lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" - ++ args.configureFlags or []; - - postConfigure = if makeDepend then "make depend" else null; + ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"; makeFlags = [ "MANDIR=$(man)/share/man" ]; @@ -90,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"; }; @@ -110,21 +106,13 @@ let in { openssl_1_0_2 = common { - version = "1.0.2k"; - sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; + version = "1.0.2l"; + sha256 = "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf"; }; openssl_1_1_0 = common { - version = "1.1.0e"; - sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp"; - }; - - openssl_1_0_2-steam = common { - version = "1.0.2k"; - sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; - configureFlags = [ "no-engine" ]; - makeDepend = true; - patches = [ ./openssl-fix-cpuid_setup.patch ]; + version = "1.1.0f"; + sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; }; } diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch new file mode 100644 index 000000000000..b615f1482b7c --- /dev/null +++ b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c +--- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 ++++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 +@@ -97,7 +97,9 @@ + switch (cmd) { + case X509_L_FILE_LOAD: + if (argl == X509_FILETYPE_DEFAULT) { +- file = (char *)getenv(X509_get_default_cert_file_env()); ++ file = (char *)getenv("NIX_SSL_CERT_FILE"); ++ if (!file) ++ file = (char *)getenv(X509_get_default_cert_file_env()); + if (file) + ok = (X509_load_cert_crl_file(ctx, file, + X509_FILETYPE_PEM) != 0); diff --git a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch deleted file mode 100644 index 4a2384ca3da0..000000000000 --- a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c -index 1925428..d2e42d2 100644 ---- a/crypto/cryptlib.c -+++ b/crypto/cryptlib.c -@@ -676,10 +676,15 @@ typedef unsigned __int64 IA32CAP; - # else - typedef unsigned long long IA32CAP; - # endif -+ -+/* Compat function for STEAM */ -+extern IA32CAP OPENSSL_ia32_cpuid_new(unsigned int*); -+IA32CAP OPENSSL_ia32_cpuid(void) { return OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); } -+ - void OPENSSL_cpuid_setup(void) - { - static int trigger = 0; -- IA32CAP OPENSSL_ia32_cpuid(unsigned int *); -+ IA32CAP OPENSSL_ia32_cpuid_new(unsigned int *); - IA32CAP vec; - char *env; - -@@ -697,9 +702,9 @@ void OPENSSL_cpuid_setup(void) - vec = strtoul(env + off, NULL, 0); - # endif - if (off) -- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~vec; -+ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P) & ~vec; - else if (env[0] == ':') -- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); -+ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); - - OPENSSL_ia32cap_P[2] = 0; - if ((env = strchr(env, ':'))) { -@@ -713,7 +718,7 @@ void OPENSSL_cpuid_setup(void) - OPENSSL_ia32cap_P[2] = vecx; - } - } else -- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); -+ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); - - /* - * |(1<<10) sets a reserved bit to signal that variable -diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h -index fba180a..b927c79 100644 ---- a/crypto/cryptlib.h -+++ b/crypto/cryptlib.h -@@ -99,6 +99,9 @@ extern "C" { - # define HEX_SIZE(type) (sizeof(type)*2) - - void OPENSSL_cpuid_setup(void); -+#pragma GCC visibility push(hidden) -+unsigned long long OPENSSL_ia32_cpuid(void); -+#pragma GCC visibility pop - extern unsigned int OPENSSL_ia32cap_P[]; - void OPENSSL_showfatal(const char *fmta, ...); - void *OPENSSL_stderr(void); -diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl -index d208d02..d4c0b24 100644 ---- a/crypto/x86_64cpuid.pl -+++ b/crypto/x86_64cpuid.pl -@@ -52,10 +52,10 @@ OPENSSL_rdtsc: - ret - .size OPENSSL_rdtsc,.-OPENSSL_rdtsc - --.globl OPENSSL_ia32_cpuid --.type OPENSSL_ia32_cpuid,\@function,1 -+.globl OPENSSL_ia32_cpuid_new -+.type OPENSSL_ia32_cpuid_new,\@function,1 - .align 16 --OPENSSL_ia32_cpuid: -+OPENSSL_ia32_cpuid_new: - mov %rbx,%r8 # save %rbx - - xor %eax,%eax -@@ -181,7 +181,7 @@ OPENSSL_ia32_cpuid: - mov %r8,%rbx # restore %rbx - or %r9,%rax - ret --.size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid -+.size OPENSSL_ia32_cpuid_new,.-OPENSSL_ia32_cpuid_new - - .globl OPENSSL_cleanse - .type OPENSSL_cleanse,\@abi-omnipotent -diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl -index e95f627..0781010 100644 ---- a/crypto/x86cpuid.pl -+++ b/crypto/x86cpuid.pl -@@ -8,7 +8,7 @@ require "x86asm.pl"; - - for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } - --&function_begin("OPENSSL_ia32_cpuid"); -+&function_begin("OPENSSL_ia32_cpuid_new"); - &xor ("edx","edx"); - &pushf (); - &pop ("eax"); -@@ -153,7 +153,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } - &mov ("eax","esi"); - &mov ("edx","ebp"); - &set_label("nocpuid"); --&function_end("OPENSSL_ia32_cpuid"); -+&function_end("OPENSSL_ia32_cpuid_new"); - - &external_label("OPENSSL_ia32cap_P"); - diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch new file mode 100644 index 000000000000..3d9ee7e6a822 --- /dev/null +++ b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h +--- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100 ++++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100 +@@ -81,8 +81,8 @@ + + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # else + # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index c29a5da9f21a..d0085752623d 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,29 +1,39 @@ -{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }: +{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio +, odbcSupport ? false, unixODBC +}: -let requireSource = version: part: hash: (requireFile rec { - name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; - message = '' - This Nix expression requires that ${name} already - be part of the store. Download the file - manually at +assert odbcSupport -> unixODBC != null; - http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html +let optional = stdenv.lib.optional; + optionalString = stdenv.lib.optionalString; + requireSource = version: part: hash: (requireFile rec { + name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; + message = '' + This Nix expression requires that ${name} already + be part of the store. Download the file + manually at - and add it to the Nix store with the following command: + http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html - nix-prefetch-url file://${name} ${hash} --type sha256 -''; - url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; - sha256 = hash; -}); in stdenv.mkDerivation rec { + and add it to the Nix store using either: + nix-store --add-fixed sha256 ${name} + or + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; + sha256 = hash; + }); +in stdenv.mkDerivation rec { version = "12.1.0.2.0-1"; name = "oracle-instantclient-${version}"; srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed"); srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296"); srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam"); + srcOdbc = optionalString odbcSupport (requireSource version "odbc" "d3aa1a4957a2f15ced05921dab551ba823aa7925d8fcb58d5b3a7f624e4df063"); - buildInputs = [ glibc patchelf rpmextract ]; + buildInputs = [ glibc patchelf rpmextract ] ++ + optional odbcSupport unixODBC; buildCommand = '' mkdir -p "${name}" @@ -31,6 +41,9 @@ let requireSource = version: part: hash: (requireFile rec { ${rpmextract}/bin/rpmextract "${srcBase}" ${rpmextract}/bin/rpmextract "${srcDevel}" ${rpmextract}/bin/rpmextract "${srcSqlplus}" + ${optionalString odbcSupport '' + ${rpmextract}/bin/rpmextract "${srcOdbc}" + ''} mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"} mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/" @@ -46,6 +59,13 @@ let requireSource = version: part: hash: (requireFile rec { $lib done + for lib in $out/lib/libsqora*; do + test -f $lib || continue + chmod +x $lib + patchelf --force-rpath --set-rpath "$out/lib:${unixODBC}/lib" \ + $lib + done + for exe in $out/bin/sqlplus; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index fc63c1942c23..0888fba4ecac 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://p11-glue.freedesktop.org/; platforms = platforms.all; - maintainers = with maintainers; [ urkud wkennington ]; + maintainers = with maintainers; [ wkennington ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 22cf7be84d03..9b396261fcca 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -6,14 +6,14 @@ with stdenv.lib; let ver_maj = "1.40"; - ver_min = "3"; + ver_min = "6"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3"; + sha256 = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = http://www.pango.org/; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin urkud ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/pcre/CVE-2017-7186.patch b/pkgs/development/libraries/pcre/CVE-2017-7186.patch new file mode 100644 index 000000000000..e9e1997e47c9 --- /dev/null +++ b/pkgs/development/libraries/pcre/CVE-2017-7186.patch @@ -0,0 +1,52 @@ +--- a/pcre_internal.h 2016/05/21 13:34:44 1649 ++++ b/pcre_internal.h 2017/02/24 17:30:30 1688 +@@ -2772,6 +2772,9 @@ + extern const pcre_uint16 PRIV(ucd_stage2)[]; + extern const pcre_uint32 PRIV(ucp_gentype)[]; + extern const pcre_uint32 PRIV(ucp_gbtable)[]; ++#ifdef COMPILE_PCRE32 ++extern const ucd_record PRIV(dummy_ucd_record)[]; ++#endif + #ifdef SUPPORT_JIT + extern const int PRIV(ucp_typerange)[]; + #endif +@@ -2780,9 +2783,15 @@ + /* UCD access macros */ + + #define UCD_BLOCK_SIZE 128 +-#define GET_UCD(ch) (PRIV(ucd_records) + \ ++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ + PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ + UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) ++ ++#ifdef COMPILE_PCRE32 ++#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) ++#else ++#define GET_UCD(ch) REAL_GET_UCD(ch) ++#endif + + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype + #define UCD_SCRIPT(ch) GET_UCD(ch)->script +--- a/pcre_ucd.c 2014/06/19 07:51:39 1490 ++++ b/pcre_ucd.c 2017/02/24 17:30:30 1688 +@@ -38,6 +38,20 @@ + const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; + #else + ++/* If the 32-bit library is run in non-32-bit mode, character values ++greater than 0x10ffff may be encountered. For these we set up a ++special record. */ ++ ++#ifdef COMPILE_PCRE32 ++const ucd_record PRIV(dummy_ucd_record)[] = {{ ++ ucp_Common, /* script */ ++ ucp_Cn, /* type unassigned */ ++ ucp_gbOther, /* grapheme break property */ ++ 0, /* case set */ ++ 0, /* other case */ ++ }}; ++#endif ++ + /* When recompiling tables with a new Unicode version, please check the + types in this structure definition from pcre_internal.h (the actual + field names will be different): diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index d3499f3e15c1..93e32529592e 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; @@ -7,7 +9,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.39"; + version = "8.40"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -17,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "12wyajlqx2v7dsh39ra9v9m5hibjkrl129q90bp32c28haghjn5q"; + sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0"; }; outputs = [ "bin" "dev" "out" "doc" "man" ]; @@ -29,7 +31,11 @@ in stdenv.mkDerivation rec { ] ++ optional (variant != null) "--enable-${variant}"; - doCheck = with stdenv; !(isCygwin || isFreeBSD); + patches = [ ./CVE-2017-7186.patch ]; + + 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 @@ -40,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/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index d226a51d0f8e..8df18530472a 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "pcre2-${version}"; - version = "10.22"; + version = "10.23"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j"; + sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz"; }; configureFlags = [ @@ -14,6 +14,23 @@ stdenv.mkDerivation rec { "--enable-jit" ]; + patches = [ + (fetchpatch { + name = "CVE-2017-7186-part1.patch"; + url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date"; + sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr"; + stripLen = 2; + addPrefixes = true; + }) + (fetchpatch { + name = "CVE-2017-7186-part2.patch"; + url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date"; + sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn"; + stripLen = 2; + addPrefixes = true; + }) + ]; + outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; postFixup = '' diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index defeb8db490f..696cd6a36e5e 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -6,7 +6,7 @@ with lib; let - v = "4.9.0"; + v = "4.9.1"; in assert withQt5 -> qtbase != null; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; - sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v"; + sha256 = "177647r2jqfm32hqcz2nqfqv6v48hn5ab2vc31svba2wz23fkgk7"; }; buildInputs = diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix new file mode 100644 index 000000000000..dad138c8433a --- /dev/null +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }: + +stdenv.mkDerivation rec { + version = "2006"; + name = "cernlib-${version}"; + + src = fetchurl { + url = "http://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; + sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky"; + }; + + buildInputs = with xorg; [ gfortran motif libX11 libXft libXt ]; + nativeBuildInputs = [ gnumake imake makedepend ]; + sourceRoot = "."; + + patches = [ ./patch ]; + + postPatch = '' + substituteInPlace 2006/src/config/site.def \ + --replace "# define MakeCmd gmake" "# define MakeCmd make" + ''; + + configurePhase = '' + export CERN=`pwd` + export CERN_LEVEL=${version} + export CERN_ROOT=$CERN/$CERN_LEVEL + export CVSCOSRC=`pwd`/$CERN_LEVEL/src + export PATH=$PATH:$CERN_ROOT/bin + ''; + + buildPhase = '' + cd $CERN_ROOT + mkdir -p build bin lib + + cd $CERN_ROOT/build + $CVSCOSRC/config/imake_boot + make bin/kuipc + make scripts/Makefile + pushd scripts + make install.bin + popd + make + ''; + + installPhase = '' + mkdir "$out" + cp -r "$CERN_ROOT/bin" "$out" + cp -r "$CERN_ROOT/lib" "$out" + mkdir "$out/$CERN_LEVEL" + ln -s "$out/bin" "$out/$CERN_LEVEL/bin" + ln -s "$out/lib" "$out/$CERN_LEVEL/lib" + ''; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://cernlib.web.cern.ch; + description = "Legacy collection of libraries and modules for data analysis in high energy physics"; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/development/libraries/physics/cernlib/patch b/pkgs/development/libraries/physics/cernlib/patch new file mode 100644 index 000000000000..2d75b6bf0f88 --- /dev/null +++ b/pkgs/development/libraries/physics/cernlib/patch @@ -0,0 +1,186 @@ +diff --git a/2006/src/config/Imake.tmpl b/2006/src/config/Imake.tmpl +index 054fb04..a3b3828 100644 +--- a/2006/src/config/Imake.tmpl ++++ b/2006/src/config/Imake.tmpl +@@ -455,7 +455,7 @@ XCOMM the platform-specific parameters - edit site.def to change + #define NoRConst NO /* YES if const for structs of funcs is bad */ + #endif + #ifndef InstPgmFlags +-#define InstPgmFlags -s ++#define InstPgmFlags + #endif + #ifndef InstBinFlags + #define InstBinFlags -m 0755 +diff --git a/2006/src/config/biglib.rules b/2006/src/config/biglib.rules +index c90e58a..9173bdc 100644 +--- a/2006/src/config/biglib.rules ++++ b/2006/src/config/biglib.rules +@@ -368,7 +368,7 @@ define build-object-list @@\ + @ (set -e;\ @@\ + case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + subdirs=Quote(dirs);\ @@\ +- list=`/bin/pwd`/$@;\ @@\ ++ list=`pwd`/$@;\ @@\ + for dir in $$subdirs; do \ @@\ + (set -e;cd $$dir;SedCmd -e "\=^[^/]=s=^.=$$dir/&=" $@ >> $$list);\@@\ + done) || (rm $@; exit 1) @@\ +diff --git a/2006/src/config/imake_boot b/2006/src/config/imake_boot +index b52d0d3..69cf1b3 100755 +--- a/2006/src/config/imake_boot ++++ b/2006/src/config/imake_boot +@@ -10,8 +10,8 @@ if [ "$CVSCOSRC" = "" ] ; then + fi + if [ -f Imakefile ] ; then + imake -DUseInstalled -I$CVSCOSRC/config \ +- -DTOPDIR=`/bin/pwd` -DCURDIR= -fImakefile ++ -DTOPDIR=`pwd` -DCURDIR= -fImakefile + else + imake -DUseInstalled -I$CVSCOSRC/config \ +- -DTOPDIR=`/bin/pwd` -DCURDIR= -f$CVSCOSRC/Imakefile ++ -DTOPDIR=`pwd` -DCURDIR= -f$CVSCOSRC/Imakefile + fi +diff --git a/2006/src/config/linux-lp64.cf b/2006/src/config/linux-lp64.cf +index e071b2f..3cc5c3b 100644 +--- a/2006/src/config/linux-lp64.cf ++++ b/2006/src/config/linux-lp64.cf +@@ -173,7 +173,7 @@ + #define FortranCmd g77 + #define XargsCmd xargs + #define FortranSaveFlags /* */ /* Everything static !? */ +-#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex ++#define DefaultFCOptions -fno-automatic -fno-second-underscore + #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_QMLXIA64 + + # endif +diff --git a/2006/src/config/linux.cf b/2006/src/config/linux.cf +index cc0bee5..a8dd954 100644 +--- a/2006/src/config/linux.cf ++++ b/2006/src/config/linux.cf +@@ -258,7 +258,7 @@ endif @@\ + #define FortranCmd g77 + #define XargsCmd xargs + #define FortranSaveFlags /* */ /* Everything static !? */ +-#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex ++#define DefaultFCOptions -fno-automatic -fno-second-underscore + #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC + + # endif +diff --git a/2006/src/packlib/kuip/code_kuip/kkern.c b/2006/src/packlib/kuip/code_kuip/kkern.c +index 3a5579f..5f3c352 100644 +--- a/2006/src/packlib/kuip/code_kuip/kkern.c ++++ b/2006/src/packlib/kuip/code_kuip/kkern.c +@@ -543,24 +543,6 @@ char *str0dup( const char *str ) + + + /* +- * like strdup() but string is n characters long and not terminated +- */ +-char *strndup( const char *str, +- size_t len ) +-{ +- size_t bytes = len + 1; +- char *p; +- +- if( bytes < ALLOC_MIN_BYTES ) +- bytes = ALLOC_MIN_BYTES; +- +- p = strncpy( malloc( bytes ), str, len ); +- p[len] = '\0'; +- return p; +-} +- +- +-/* + * strdup() of character representation of integer n + */ + char *stridup( int n ) +diff --git a/2006/src/packlib/kuip/code_kuip/kmenu.c b/2006/src/packlib/kuip/code_kuip/kmenu.c +index f135b07..23007a8 100644 +--- a/2006/src/packlib/kuip/code_kuip/kmenu.c ++++ b/2006/src/packlib/kuip/code_kuip/kmenu.c +@@ -1404,7 +1404,7 @@ void interactive_find( char *expr, int keym ) + printf ("See also:\n "); + for (i = 0; i < nval; i++) { + if (i == ncmd) continue; +- printf (flis_name[i]); ++ printf ("%s", flis_name[i]); + if (i < nval-1) + printf (", "); + else +diff --git a/2006/src/packlib/kuip/kuip/kstring.h b/2006/src/packlib/kuip/kuip/kstring.h +index 7811f15..12a1344 100644 +--- a/2006/src/packlib/kuip/kuip/kstring.h ++++ b/2006/src/packlib/kuip/kuip/kstring.h +@@ -21,7 +21,6 @@ extern "C" { + */ + + #ifndef WIN32 +-extern void* memmove( void* dst, const void* src, size_t n ); + #endif + + /* GF. make conform to kkern.c#if !defined(__convexc__)*/ +@@ -46,7 +45,6 @@ extern char* str4dup( const char* str1, const char* str2, const char* str3, + const char* str4 ); + extern char* str5dup( const char* str1, const char* str2, const char* str3, + const char* str4, const char* str5 ); +-extern char* strndup( const char* buf, size_t n ); + extern char* stridup( int i ); + + extern char* mstrcat( char* ptr, const char* str ); +diff --git a/2006/src/pawlib/paw/cpaw/bugrep.c b/2006/src/pawlib/paw/cpaw/bugrep.c +index d503a45..d26e30f 100644 +--- a/2006/src/pawlib/paw/cpaw/bugrep.c ++++ b/2006/src/pawlib/paw/cpaw/bugrep.c +@@ -432,51 +432,7 @@ br_add_config( char * tmp_file ) + + static int + br_mail_file( char *addr, char *subj, char *file ) +-#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_MACOSX)) +-{ +- FILE *mfp, *fp; +- char line[1024], my_addr[L_cuserid]; +- time_t clock; +- struct tm *ts; +- +- fp = fopen( file, "r" ); +- if ( fp == NULL ) { +- printf( "BUGREPORT: cannot (re)open temporary file\n" ); +- return MAIL_ERROR; +- } +- +- cuserid( my_addr ); +- +- sprintf( line, "/usr/lib/sendmail -t" ); +- mfp = popen( line, "w" ); +- +- if ( mfp == NULL ) { +- printf( "BUGREPORT: cannot run sendmail\n" ); +- return MAIL_ERROR; +- } +- +- +- clock = time( (time_t *) 0 ); +- ts = localtime( &clock ); +- strftime( line, sizeof( line ), +- "%a, %d %h %y %H:%M:%S", ts ); +- fprintf ( mfp, "To: %s\n", addr ); +- fprintf ( mfp, "Bcc: %s\n", my_addr ); +- fprintf ( mfp, "Date: %s\n", line ); +- fprintf ( mfp, "Subject: %s\n", subj ); +- fprintf ( mfp, "\n" ); +- +- while( fgets( line, sizeof( line ), fp ) != NULL ) { +- fputs( line, mfp ); +- } +- fclose( fp ); +- +- pclose( mfp ); +- +- return MAIL_OK; +-} +-#endif +-#if defined(CERNLIB_MACOSX) ++#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT)) + { + FILE *mfp, *fp; + char line[1024], *my_addr; diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/development/libraries/physics/cernlib/setup-hook.sh new file mode 100644 index 000000000000..d83759327760 --- /dev/null +++ b/pkgs/development/libraries/physics/cernlib/setup-hook.sh @@ -0,0 +1,3 @@ +export CERN_LEVEL=@version@ +export CERN=@out@ +export CERN_ROOT=$CERN/$CERN_LEVEL diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 307bf1b27db3..e568e1597972 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}" @@ -20,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - descritption = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; + description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; license = stdenv.lib.licenses.gpl3; homepage = http://fastnlo.hepforge.org; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 737565d298e0..407be5c5e4a4 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 90a6d17f09aa..1a203172d2c8 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 822c3e382724..000000000000 --- 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 b0ced3b24e0c..a8518d340b76 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/.* 0' 'optionalHeight != NULL' + + substituteInPlace ./tools/linguist/linguist/messagemodel.cpp \ + --replace 'm->comment()) >= 0' 'm->comment()) != NULL' ''; patches = @@ -61,20 +69,21 @@ stdenv.mkDerivation rec { ./libressl.patch (substituteAll { src = ./dlopen-absolute-paths.diff; - cups = if cups != null then cups.out else null; + cups = if cups != null then stdenv.lib.getLib cups else null; icu = icu.out; libXfixes = libXfixes.out; glibc = stdenv.cc.libc.out; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; }) - ] ++ stdenv.lib.optional gtkStyle (substituteAll { + ] ++ stdenv.lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter - gconf = GConf.out; gtk = gtk2.out; + } // stdenv.lib.optionalAttrs gnomeStyle { + gconf = GConf.out; libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; - }) + })) ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; gtk = gtk2.out; @@ -174,9 +183,7 @@ stdenv.mkDerivation rec { rm -rf $out/tests ''; - crossAttrs = let - isMingw = stdenv.cross.libc == "msvcrt"; - in { + crossAttrs = { # I've not tried any case other than i686-pc-mingw32. # -nomake tools: it fails linking some asian language symbols # -no-svg: it fails to build on mingw64 @@ -186,14 +193,14 @@ stdenv.mkDerivation rec { -no-svg -make qmake -make libs -nomake tools -nomake demos -nomake examples -nomake docs - '' + optionalString isMingw " -xplatform win32-g++-4.6"; + '' + optionalString hostPlatform.isMinGW " -xplatform win32-g++-4.6"; patches = []; preConfigure = '' - sed -i -e 's/ g++/ ${stdenv.cross.config}-g++/' \ - -e 's/ gcc/ ${stdenv.cross.config}-gcc/' \ - -e 's/ ar/ ${stdenv.cross.config}-ar/' \ - -e 's/ strip/ ${stdenv.cross.config}-strip/' \ - -e 's/ windres/ ${stdenv.cross.config}-windres/' \ + sed -i -e 's/ g++/ ${stdenv.cc.prefix}g++/' \ + -e 's/ gcc/ ${stdenv.cc.prefix}gcc/' \ + -e 's/ ar/ ${stdenv.cc.prefix}ar/' \ + -e 's/ strip/ ${stdenv.cc.prefix}strip/' \ + -e 's/ windres/ ${stdenv.cc.prefix}windres/' \ mkspecs/win32-g++/qmake.conf ''; @@ -201,9 +208,9 @@ stdenv.mkDerivation rec { postInstall = '' cp bin/qmake* $out/bin ''; - dontSetConfigureCross = true; + configurePlatforms = []; dontStrip = true; - } // optionalAttrs isMingw { + } // optionalAttrs hostPlatform.isMinGW { propagatedBuildInputs = [ ]; }; @@ -211,7 +218,7 @@ stdenv.mkDerivation rec { homepage = http://qt-project.org/; description = "A cross-platform application framework for C++"; license = licenses.lgpl21Plus; # or gpl3 - maintainers = with maintainers; [ lovek323 phreedom sander urkud ]; + maintainers = with maintainers; [ lovek323 phreedom sander ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix deleted file mode 100644 index b7e8fb33387e..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -/* - -# Minor Updates - -1. Edit ./fetchsrcs.sh to point to the updated URL. -2. Run ./fetchsrcs.sh. -3. Build and enjoy. - -# Major Updates - -1. Make a copy of this directory. (We like to keep the old version around - for a short time after major updates.) -2. Delete the tmp/ subdirectory of the copy. -3. Follow the minor update instructions above. -4. Package any new Qt modules, if necessary. - -*/ - -{ - newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, - libgnomeui, GConf, gnome_vfs, - gstreamer, gst-plugins-base, - - # options - developerBuild ? false, - decryptSslTraffic ? false, -}: - -with stdenv.lib; - -let - - mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit mirror; inherit fetchurl; }; - - qtSubmodule = args: - let - inherit (args) name; - inherit (srcs."${args.name}") version src; - inherit (stdenv) mkDerivation; - in mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.qmakeHook ]; - - NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; - - outputs = args.outputs or [ "out" "dev" ]; - setOutputFlags = args.setOutputFlags or false; - - setupHook = ../qtsubmodule-setup-hook.sh; - - enableParallelBuilding = args.enableParallelBuilding or true; - - meta = self.qtbase.meta // (args.meta or {}); - }); - - addPackages = self: with self; - let - callPackage = self.newScope { inherit qtSubmodule srcs; }; - in { - - qtbase = callPackage ./qtbase { - inherit bison cups harfbuzz mesa; - # GNOME dependencies are not used unless gtkStyle == true - inherit libgnomeui GConf gnome_vfs; - inherit developerBuild decryptSslTraffic; - }; - - /* qt3d = not packaged */ - /* qtactiveqt = not packaged */ - /* qtandroidextras = not packaged */ - /* qtcanvas3d = not packaged */ - qtconnectivity = callPackage ./qtconnectivity.nix {}; - qtdeclarative = callPackage ./qtdeclarative {}; - qtdoc = callPackage ./qtdoc.nix {}; - qtenginio = callPackage ./qtenginio.nix {}; - qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; - qtimageformats = callPackage ./qtimageformats.nix {}; - qtlocation = callPackage ./qtlocation.nix {}; - /* qtmacextras = not packaged */ - qtmultimedia = callPackage ./qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtquick1 = callPackage ./qtquick1 {}; - qtquickcontrols = callPackage ./qtquickcontrols.nix {}; - qtquickcontrols2 = null; - qtscript = callPackage ./qtscript {}; - qtsensors = callPackage ./qtsensors.nix {}; - qtserialport = callPackage ./qtserialport {}; - qtsvg = callPackage ./qtsvg.nix {}; - qttools = callPackage ./qttools {}; - qttranslations = callPackage ./qttranslations.nix {}; - /* qtwayland = not packaged */ - /* qtwebchannel = not packaged */ - /* qtwebengine = not packaged */ - qtwebkit = callPackage ./qtwebkit {}; - qtwebkit-examples = callPackage ./qtwebkit-examples.nix {}; - qtwebsockets = callPackage ./qtwebsockets.nix {}; - /* qtwinextras = not packaged */ - qtx11extras = callPackage ./qtx11extras.nix {}; - qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-${qtbase.version}" [ - qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats - qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport - qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras - qtxmlpatterns - ]; - - makeQtWrapper = - makeSetupHook - { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; - - qmakeHook = - makeSetupHook - { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; - - }; - - self = makeScope newScope addPackages; - -in self diff --git a/pkgs/development/libraries/qt-5/5.5/fetch.sh b/pkgs/development/libraries/qt-5/5.5/fetch.sh deleted file mode 100755 index 512d985f346a..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/fetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/ \ - http://download.qt.io/community_releases/5.5/5.5.1/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch deleted file mode 100644 index 63c4ab7256a6..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch +++ /dev/null @@ -1,321 +0,0 @@ -Index: qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) - endif() - !!ENDIF - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") -@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ endif() - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF -@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" - ) - --!!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE -- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF -- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) -- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") -- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} -- ) -- endif() --!!ENDIF - endmacro() - !!ENDIF - - if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - - !!IF !no_module_headers --!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" -- ) --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") -+ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF -+ - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" -+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" - !!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" - !!ENDIF - AND EXISTS - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_DEBUG_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - !!ENDIF // CMAKE_RELEASE_TYPE - - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" - !!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" - !!ENDIF - AND EXISTS - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_RELEASE_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/src/qtbase/dbus/Qt5DBusConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch deleted file mode 100644 index 08d12087f080..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio - // the QTCOMPOSE environment variable - if (qEnvironmentVariableIsSet("QTCOMPOSE")) - m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); -- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); -+ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch deleted file mode 100644 index 2cb3f7dfa700..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -48,7 +48,7 @@ - ****************************************************************************/ - - //#define QSSLSOCKET_DEBUG --//#define QT_DECRYPT_SSL_TRAFFIC -+#define QT_DECRYPT_SSL_TRAFFIC - - #include "qssl_p.h" - #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix deleted file mode 100644 index a8598f654dda..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ /dev/null @@ -1,287 +0,0 @@ -{ stdenv, lib, fetchpatch, copyPathsToStore -, srcs - -, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi -, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon -, fontconfig, freetype, harfbuzz -, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 -, zlib, libjpeg, libpng, libtiff, sqlite, icu - -, coreutils, bison, flex, gdb, gperf, lndir -, patchelf, perl, pkgconfig, python2 - -# optional dependencies -, cups ? null -, mysql ? null, postgresql ? null - -# options -, mesaSupported, mesa -, buildExamples ? false -, buildTests ? false -, developerBuild ? false -, libgnomeui, GConf, gnome_vfs, gtk2 -, decryptSslTraffic ? false -}: - -let - inherit (srcs.qt5) version; - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - - # Search path for Gtk plugin - gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ]; - - dontInvalidateBacking = fetchpatch { - url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; - name = "qtbug-48321-dont-invalidate-backing-store.patch"; - sha256 = "1wynm2hhbhpvzvsz4vpzzkl0ss5skac6934bva8brcpi5xq68h1q"; - }; -in - -stdenv.mkDerivation { - - name = "qtbase-${version}"; - inherit version; - - srcs = with srcs; [ qt5.src qtbase.src ]; - - sourceRoot = "qt-everywhere-opensource-src-${version}"; - - outputs = [ "out" "dev" "gtk" ]; - - postUnpack = '' - mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase - ''; - - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; - - postPatch = - '' - cd qtbase - patch -p1 <${dontInvalidateBacking} - cd .. - - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace qtbase/configure --replace /bin/pwd pwd - substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf - - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" - sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" - - substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - - substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - - substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ - --replace "@openssl@" "${openssl.out}" - - substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus.lib}" - - substituteInPlace \ - qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace "@libX11@" "${libX11.out}" - '' - + lib.optionalString mesaSupported '' - substituteInPlace \ - qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ - --replace "@mesa_lib@" "${mesa.out}" - substituteInPlace qtbase/mkspecs/common/linux.conf \ - --replace "@mesa_lib@" "${mesa.out}" \ - --replace "@mesa_inc@" "${mesa.dev}" - ''; - - - setOutputFlags = false; - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" - export MAKEFLAGS=-j$NIX_BUILD_CORES - - configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" - ''; - - prefixKey = "-prefix "; - - # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa - # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = '' - -verbose - -confirm-license - -opensource - - -release - -shared - -c++11 - ${lib.optionalString developerBuild "-developer-build"} - -largefile - -accessibility - -rpath - -optimized-qmake - -strip - -no-reduce-relocations - -system-proxies - -pkg-config - - -gui - -widgets - -opengl desktop - -qml-debug - -nis - -iconv - -icu - -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - -gtkstyle - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms - - ${lib.optionalString (!system-x86_64) "-no-sse2"} - -no-sse3 - -no-ssse3 - -no-sse4.1 - -no-sse4.2 - -no-avx - -no-avx2 - -no-mips_dsp - -no-mips_dspr2 - - -system-zlib - -system-libpng - -system-libjpeg - -system-harfbuzz - -system-xcb - -system-xkbcommon - -system-pcre - -openssl-linked - -dbus-linked - - -system-sqlite - -${if mysql != null then "plugin" else "no"}-sql-mysql - -${if postgresql != null then "plugin" else "no"}-sql-psql - - -make libs - -make tools - -${lib.optionalString (buildExamples == false) "no"}make examples - -${lib.optionalString (buildTests == false) "no"}make tests - ''; - - # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag - # if dependency paths contain the string "pq", which can occur in the hash. - # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; - - propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib - - # Image formats - libjpeg libpng libtiff - - # Text rendering - fontconfig freetype harfbuzz icu - - # X11 libs - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon - ] - ++ lib.optional mesaSupported mesa; - - buildInputs = - [ bison flex gperf ] - ++ lib.optional developerBuild gdb - ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql - # FIXME: move to the main list on rebuild. - ++ [gnome_vfs.out libgnomeui.out gtk2 GConf]; - - nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ]; - - # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; - - postInstall = '' - find "$out" -name "*.cmake" | while read file; do - substituteInPlace "$file" \ - --subst-var-by NIX_OUT "$out" \ - --subst-var-by NIX_DEV "$dev" - done - ''; - - preFixup = '' - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - - # Move the QGtkStyle plugin to the gtk output - mkdir -p "$gtk/lib/qt5/plugins/platformthemes" - mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes" - rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake" - - # Set RPATH for QGtkStyle plugin - qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so" - qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")" - qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}" - patchelf "$qgtk2" \ - --add-needed libgtk-x11-2.0.so \ - --add-needed libgnomeui-2.so \ - --add-needed libgnomevfs-2.so \ - --add-needed libgconf-2.so \ - --set-rpath "$qgtk2_RPATH" - ''; - - postFixup = - '' - # Don't retain build-time dependencies like gdb. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri - - # Move libtool archives and qmake projects - if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then - pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ - while read -r file; do - mkdir -p "''${!outputDev}/$(dirname "$file")" - mv "''${!outputLib}/$file" "''${!outputDev}/$file" - done - popd - fi - ''; - - inherit lndir; - setupHook = ../../qtbase-setup-hook.sh; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = http://www.qt.io; - description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch deleted file mode 100644 index 401cfd5c295e..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp -@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus() - #ifdef Q_OS_WIN - QLatin1String("dbus-1"), - #endif -- QLatin1String("libdbus-1") -+ QLatin1String("@dbus_libs@/lib/libdbus-1") - }; - - lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch deleted file mode 100644 index 59f510ac54da..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -+ // Check system library paths first - QLibrary lib(QLatin1String("GL")); -+ if (!lib.load()) { -+ // Fallback to Mesa driver -+ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL")); -+ } - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch deleted file mode 100644 index e66ce1676d30..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c - #ifdef XCB_USE_XLIB - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch deleted file mode 100644 index 1cc6fac583b7..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -640,8 +640,8 @@ static QPair loadO - #endif - #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so - // first attempt: the canonical name is libssl.so. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); - if (libcrypto->load() && libssl->load()) { - // libssl.so. and libcrypto.so. found - return pair; -@@ -658,8 +658,8 @@ static QPair loadO - // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third - // attempt, _after_ /Contents/Frameworks has been searched. - // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); - if (libcrypto->load() && libssl->load()) { - // libssl.so.0 and libcrypto.so.0 found - return pair; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch deleted file mode 100644 index 20e56bf3149e..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp -@@ -79,7 +79,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/resolv")); - if (!lib.load()) - return; - } -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -95,7 +95,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return; - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch deleted file mode 100644 index e483ad14e05e..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Sat, 10 Oct 2015 01:15:01 +0200 -Subject: [PATCH] Fix compilation with libressl - -By additionally checking for defined(SSL_CTRL_SET_CURVES), which -is defined in openssl, but not in libressl. ---- - src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp -index b88ab54..cfc4f6d 100644 ---- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp -@@ -338,7 +338,7 @@ init_context: - - const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); - if (!qcurves.isEmpty()) { --#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - // Set the curves to be used - if (q_SSLeay() >= 0x10002000L) { - // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -352,7 +352,7 @@ init_context: - return sslContext; - } - } else --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - { - // specific curves requested, but not possible to set -> error - sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); --- -2.6.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch deleted file mode 100644 index 56ee0a411d4d..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf -+++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf -@@ -12,8 +12,8 @@ QMAKE_INCDIR = - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index b4561db6e77d..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp -@@ -2498,6 +2498,16 @@ QStringList QCoreApplication::libraryPat - } - } - } -+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes -+ -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ app_libpaths->append(QFile::decodeName(profile) + plugindir); -+ } -+ } - } - return *(coreappdata()->app_libpaths); - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series deleted file mode 100644 index 1dfd8ac2683c..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/series +++ /dev/null @@ -1,10 +0,0 @@ -dlopen-resolv.patch -tzdir.patch -dlopen-libXcursor.patch -dlopen-openssl.patch -dlopen-dbus.patch -xdg-config-dirs.patch -nix-profiles-library-paths.patch -compose-search-path.patch -libressl.patch -cmake-paths.patch \ No newline at end of file diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch deleted file mode 100644 index 92adeda82735..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -62,7 +62,10 @@ typedef QHash Q - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ QString path = qgetenv("TZDIR"); -+ path += "/zone.tab"; -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first -+ QString zoneinfoDir = qgetenv("TZDIR"); -+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); -+ tzif.setFileName(zoneinfoDir); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch deleted file mode 100644 index 24dc3bde148d..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp -@@ -1131,6 +1131,24 @@ QConfFileSettingsPrivate::QConfFileSetti - if (!application.isEmpty()) - confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); - confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); -+ -+#if !defined(Q_OS_WIN) -+ // Add directories specified in $XDG_CONFIG_DIRS -+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); -+ if (!pathEnv.isEmpty()) { -+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); -+ if (!pathEntries.isEmpty()) { -+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. -+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { -+ const QString& path = pathEntries.at(k); -+ if (!application.isEmpty()) -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); -+ } -+ } -+ } -+#endif -+ - #else - QString confName = getPath(format, QSettings::UserScope) + org; - if (!application.isEmpty()) -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings_p.h -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h -@@ -240,7 +240,7 @@ public: - F_Organization = 0x1, - F_User = 0x0, - F_System = 0x2, -- NumConfFiles = 4 -+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis - #else - SandboxConfFile = 0, - NumConfFiles = 1 diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix deleted file mode 100644 index 9b6a6c46176c..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: - -qtSubmodule { - name = "qtdeclarative"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; - nativeBuildInputs = [ python2 ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch deleted file mode 100644 index 06b244b974ff..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -=================================================================== ---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp -+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString qmldir = QString::fromLatin1("/lib/qt5/qml"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ addImportPath(QFile::decodeName(profile) + qmldir); -+ } -+ } -+ - // env import paths - QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); - if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series deleted file mode 100644 index 7dbe197c56e0..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series +++ /dev/null @@ -1 +0,0 @@ -nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix b/pkgs/development/libraries/qt-5/5.5/qtdoc.nix deleted file mode 100644 index 578ea6ba0b22..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtdoc"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix deleted file mode 100644 index b860a73ef890..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtenginio"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix deleted file mode 100644 index 1e134057c4b4..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtmultimedia }: - -qtSubmodule { - name = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix deleted file mode 100644 index 7c1cc5da07e3..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative, pkgconfig -, alsaLib, gstreamer, gst-plugins-base, libpulseaudio -}: - -qtSubmodule { - name = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ - pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio - ]; - qmakeFlags = [ "GST_VERSION=1.0" ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix deleted file mode 100644 index 64937b3dcd37..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, qtscript, qtsvg, qtwebkit, qtxmlpatterns }: - -qtSubmodule { - name = "qtquick1"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch deleted file mode 100644 index c01061d3378b..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp -=================================================================== ---- qtquick1-opensource-src-5.5.1.orig/src/declarative/qml/qdeclarativeimport.cpp -+++ qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp -@@ -725,6 +725,15 @@ QDeclarativeImportDatabase::QDeclarative - - addImportPath(installImportsPath); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString importdir = QString::fromLatin1("/lib/qt5/imports"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ addImportPath(QFile::decodeName(profile) + importdir); -+ } -+ } -+ - // env import paths - QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); - if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/series b/pkgs/development/libraries/qt-5/5.5/qtquick1/series deleted file mode 100644 index 7dbe197c56e0..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/series +++ /dev/null @@ -1 +0,0 @@ -nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix deleted file mode 100644 index 61e64dc47e4d..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch deleted file mode 100644 index 3a813dc80074..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:16:02 -0500 -Subject: [PATCH] dlopen serialport udev - ---- - src/serialport/qtudev_p.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index 6f2cabd..81b9849 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - if (!udevLibrary->load()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix deleted file mode 100644 index 2bffd0a2bd61..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qtSubmodule, qtbase, substituteAll, systemd }: - -qtSubmodule { - name = "qtserialport"; - qtInputs = [ qtbase ]; - patches = [ - (substituteAll { - src = ./0001-dlopen-serialport-udev.patch; - libudev = systemd.lib; - }) - ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix deleted file mode 100644 index b9ccac7cf933..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtsvg"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch deleted file mode 100644 index fe5bcadbe9a8..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in -=================================================================== ---- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in -+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in -@@ -2,11 +2,10 @@ - if (NOT TARGET Qt5::qcollectiongenerator) - add_executable(Qt5::qcollectiongenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qcollectiongenerator PROPERTIES -Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in -=================================================================== ---- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -44,11 +44,10 @@ endmacro() - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +58,10 @@ endif() - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +72,10 @@ endif() - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lconvert PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix b/pkgs/development/libraries/qt-5/5.5/qttools/default.nix deleted file mode 100644 index d72d7b6c64cb..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, qtbase }: - -qtSubmodule { - name = "qttools"; - qtInputs = [ qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postFixup = '' - moveToOutput "bin/qdbus" "$out" - moveToOutput "bin/qtpaths" "$out" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix deleted file mode 100644 index 64f85c42d198..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qttools, qtwebkit }: - -qtSubmodule { - name = "qtwebkit-examples"; - qtInputs = [ qttools qtwebkit ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch deleted file mode 100644 index 0eeacce1bc05..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:18:54 -0500 -Subject: [PATCH 1/3] dlopen webkit nsplugin - ---- - Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- - Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- - Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index a923d49..2731d05 100644 ---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2f..363bde5 100644 ---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff6..62a2197 100644 ---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,7 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch deleted file mode 100644 index bb5d1f74364c..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:16 -0500 -Subject: [PATCH 2/3] dlopen webkit gtk - ---- - Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de6521..0b25748 100644 ---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch deleted file mode 100644 index 1c360cd81aa2..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:29 -0500 -Subject: [PATCH 3/3] dlopen webkit udev - ---- - Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp -index 60ff317..da8ac69 100644 ---- a/Source/WebCore/platform/qt/GamepadsQt.cpp -+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp -@@ -111,12 +111,12 @@ private: - bool load() - { - m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - m_loaded = m_libUdev.load(); - if (resolveMethods()) - return true; - -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - m_loaded = m_libUdev.load(); - return resolveMethods(); - } --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix deleted file mode 100644 index 35568c1eb2f3..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt -, sqlite, systemd, glib, gst_all_1 -, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby -, substituteAll -, flashplayerFix ? false -}: - -with stdenv.lib; - -qtSubmodule { - name = "qtwebkit"; - qtInputs = [ qtdeclarative qtlocation qtsensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; - nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python2 ruby - ]; - patches = - let dlopen-webkit-nsplugin = substituteAll { - src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; - }; - dlopen-webkit-gtk = substituteAll { - src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk2.out; - }; - dlopen-webkit-udev = substituteAll { - src = ./0003-dlopen-webkit-udev.patch; - libudev = systemd.lib; - }; - in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] - ++ [ dlopen-webkit-udev ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/srcs.nix b/pkgs/development/libraries/qt-5/5.5/srcs.nix deleted file mode 100644 index 20aa28a55dae..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/srcs.nix +++ /dev/null @@ -1,261 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz"; - sha256 = "1xqvifsy5x2vj7p51c2z1ly7k2yq7l3byhshnkd2bn6b5dp91073"; - name = "qt3d-opensource-src-5.5.1.tar.xz"; - }; - }; - qt5 = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt5-opensource-src-5.5.1.tar.xz"; - sha256 = "0g83vzsj6hdjmagccy6gxgc1l8q0q6663r9xj58ix4lj7hsphf26"; - name = "qt5-opensource-src-5.5.1.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtactiveqt-opensource-src-5.5.1.tar.xz"; - sha256 = "09dz5jj7gxa9ds2gw6xw8lacmv27ydhi64370q1ncc7khd0p6g3m"; - name = "qtactiveqt-opensource-src-5.5.1.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtandroidextras-opensource-src-5.5.1.tar.xz"; - sha256 = "1cam9zd0kxgyplnaijy91rl8p30j2jbp2ikq9rnigcsglfnx5hd4"; - name = "qtandroidextras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtbase = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz"; - sha256 = "05p91m1d9b3gdfm5pgmxw63rk0fdxqz87s77hn9bdip4syjfi96z"; - name = "qtbase-opensource-src-5.5.1.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtcanvas3d-opensource-src-5.5.1.tar.xz"; - sha256 = "105hl3mvsdif416l4dvpxl7r1iw42if8hhrnji8hf4fp6081g6vm"; - name = "qtcanvas3d-opensource-src-5.5.1.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz"; - sha256 = "08sh4hzib5l26l6mc6iil4nvl807cn9rn5w46vxw0bsqz3gfcdrn"; - name = "qtconnectivity-opensource-src-5.5.1.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz"; - sha256 = "14b7naaa0rk4q6cxf0w62gvamxk812kr65k82zxkdzrzp3plxlaz"; - name = "qtdeclarative-opensource-src-5.5.1.tar.xz"; - }; - }; - qtdoc = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdoc-opensource-src-5.5.1.tar.xz"; - sha256 = "11hgw1i1qm2yqzfyg0jsvjda9092hjas35l0bmxn6pvnl5asy3cz"; - name = "qtdoc-opensource-src-5.5.1.tar.xz"; - }; - }; - qtenginio = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtenginio-opensource-src-5.5.1.tar.xz"; - sha256 = "1qpg9pcniqp5xxi2qrc6indqdyn850djk0njiniandbabfykd6d7"; - name = "qtenginio-opensource-src-5.5.1.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; - sha256 = "0irdq4lfbv740mbvd40x62k3zzj0aj8h95gsxg79wa54nf6hzjlv"; - name = "qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; - }; - }; - qtimageformats = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz"; - sha256 = "19alny9bm2lzzlxicbvw56ra4qcxdrnm9054zs4z1y82qq0fwzy9"; - name = "qtimageformats-opensource-src-5.5.1.tar.xz"; - }; - }; - qtlocation = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz"; - sha256 = "05k31nm1p444fixplspgh1d5j4f3xz6z674jpr8497v4hz5lis8z"; - name = "qtlocation-opensource-src-5.5.1.tar.xz"; - }; - }; - qtmacextras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmacextras-opensource-src-5.5.1.tar.xz"; - sha256 = "0n4hxi9xhnyvp5cxklr9ygg4ficvahak2w73kr9ihqckrkym0lq2"; - name = "qtmacextras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz"; - sha256 = "0zwmgmiix56c567qw5xnijd1y43mbjg4jw1n624c31qmyjcwmivw"; - name = "qtmultimedia-opensource-src-5.5.1.tar.xz"; - }; - }; - qtquick1 = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz"; - sha256 = "0b0znnwy2fv5rn368nw7ph2fypz16fchb09id63hm7wbkbjsf4n8"; - name = "qtquick1-opensource-src-5.5.1.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz"; - sha256 = "1w7w87c8i6v3p78psmjb30fh9sx7745m5jyjkdi6q1jnss4q6yhv"; - name = "qtquickcontrols-opensource-src-5.5.1.tar.xz"; - }; - }; - qtscript = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz"; - sha256 = "1z98x3758mk24wf0nxxw4lphbxw1xxzl1q27cjqbq8lgk7fxsind"; - name = "qtscript-opensource-src-5.5.1.tar.xz"; - }; - }; - qtsensors = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz"; - sha256 = "1spfr2pn8zz5vz3qz9lzs0wfshmim6hdgf2fpmwpcpcsfb04y9jx"; - name = "qtsensors-opensource-src-5.5.1.tar.xz"; - }; - }; - qtserialport = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz"; - sha256 = "0ylgjscmql3lspzv0cr5n4g1v354frz0yfalvswvkc9x0bxxnd50"; - name = "qtserialport-opensource-src-5.5.1.tar.xz"; - }; - }; - qtsvg = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz"; - sha256 = "1iwibbh835cpxbfh7rnrpvl9k20valr6h256np59rzdy92z8ixgp"; - name = "qtsvg-opensource-src-5.5.1.tar.xz"; - }; - }; - qttools = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz"; - sha256 = "1zbvr039sv0jzd41ngarxif6954bl50pha8814b5hw3i977gcqa3"; - name = "qttools-opensource-src-5.5.1.tar.xz"; - }; - }; - qttranslations = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz"; - sha256 = "1im4qzpyp1wqrrrlwc4r56b46w5y4bxg2m0y7wkcmihb1xqh1y21"; - name = "qttranslations-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwayland = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz"; - sha256 = "19nxifpg9q785ahzaii2fd2911cg5m0dpk5v041sylm997f4p063"; - name = "qtwayland-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz"; - sha256 = "1l0m5xjxg5va9dwvgf52r52inl4dl3954d16rfiwnkndazp9ahkz"; - name = "qtwebchannel-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebengine = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebengine-opensource-src-5.5.1.tar.xz"; - sha256 = "141bgr3x7n2vjbsydgll44aq0pcf99gn2l1l1jpim685sf6k4kbw"; - name = "qtwebengine-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebkit-examples = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz"; - sha256 = "1ij65v3nzh5f6rdq43w6vmljjgfw1vky8dd6s4kr093d5ns3b289"; - name = "qtwebkit-examples-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebkit = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz"; - sha256 = "0sbdglcf57lmgbcybimvvbpqikn3blb1pxvd71sdhsiypnfkyn3p"; - name = "qtwebkit-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz"; - sha256 = "1srdn668z62j95q1wwhg6xk2dic407r4wl5yi1qk743vhr586kng"; - name = "qtwebsockets-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwinextras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz"; - sha256 = "07w5ipiwvvapasjswk0g4ndcp0lq65pz2n6l348zwfb0gand406b"; - name = "qtwinextras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtx11extras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz"; - sha256 = "0rgbxgp5l212c4vg8z685zv008j9s03mx8p576ny2qibjwfs11v3"; - name = "qtx11extras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz"; - sha256 = "1v78s0jygg83yzyldwms8zb72cwp718cc5ialc2ki3lqa81fndxm"; - name = "qtxmlpatterns-opensource-src-5.5.1.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 37b6eb7f3d3c..b250ae8b9527 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -18,8 +18,9 @@ existing packages here and modify it as necessary. 1. Update the URL in `./fetch.sh`. 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/` from the top of the Nixpkgs tree. -3. Use `nox-review wip` to check that everything builds. -4. Commit the changes and open a pull request. +3. Update `qtCompatVersion` below if the minor version number changes. +4. Check that the new packages build correctly. +5. Commit the changes and open a pull request. */ @@ -32,21 +33,42 @@ existing packages here and modify it as necessary. # options developerBuild ? false, decryptSslTraffic ? false, + debug ? null, }: with stdenv.lib; let + qtCompatVersion = "5.6"; + mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; + mkDerivation = args: + stdenv.mkDerivation (args // { + + qmakeFlags = + (args.qmakeFlags or []) + ++ optional (debug != null) + (if debug then "CONFIG+=debug" else "CONFIG+=release"); + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ optional (debug != null) + (if debug then "-DCMAKE_BUILD_TYPE=Debug" + else "-DCMAKE_BUILD_TYPE=Release"); + + enableParallelBuilding = args.enableParallelBuilding or true; + + }); + qtSubmodule = args: let inherit (args) name; version = args.version or srcs."${name}".version; src = args.src or srcs."${name}".src; - inherit (stdenv) mkDerivation; in mkDerivation (args // { name = "${name}-${version}"; inherit src; @@ -54,7 +76,7 @@ let propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); nativeBuildInputs = (args.nativeBuildInputs or []) - ++ [ perl self.qmakeHook ]; + ++ [ perl self.qmake ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; @@ -63,16 +85,22 @@ let setupHook = ../qtsubmodule-setup-hook.sh; - enableParallelBuilding = args.enableParallelBuilding or true; - - meta = self.qtbase.meta // (args.meta or {}); + meta = { + homepage = http://www.qt.io; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ qknight ttuegel periklis ]; + platforms = platforms.unix; + } // (args.meta or {}); }); addPackages = self: with self; let - callPackage = self.newScope { inherit qtSubmodule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; }; in { + inherit mkDerivation; + qtbase = callPackage ./qtbase { inherit bison cups harfbuzz mesa; inherit developerBuild decryptSslTraffic; @@ -114,20 +142,15 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" [ qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland + qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns ]; - makeQtWrapper = - makeSetupHook - { deps = [ makeWrapper ]; } - (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); - - qmakeHook = - makeSetupHook - { deps = [ self.qtbase.dev ]; } - (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); + qmake = makeSetupHook { + deps = [ self.qtbase.dev ]; + substitutions = { inherit (stdenv) isDarwin; }; + } ../qmake-hook.sh; }; self = makeScope newScope addPackages; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 341ebe1198b7..4e7c7ea54568 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, copyPathsToStore -, srcs +, srcs, qtCompatVersion , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon @@ -32,6 +32,7 @@ stdenv.mkDerivation { name = "qtbase-${srcs.qtbase.version}"; inherit (srcs.qtbase) src version; + inherit qtCompatVersion; outputs = [ "out" "dev" ]; @@ -39,7 +40,7 @@ stdenv.mkDerivation { copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; postPatch = '' @@ -80,7 +81,7 @@ stdenv.mkDerivation { sed -i \ -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ - -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \ -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ @@ -94,16 +95,22 @@ stdenv.mkDerivation { # Note on the above: \x27 is a way if including a single-quote # character in the sed string arguments. + qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins"; + qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml"; + qtDocPrefix = "share/doc/qt-${qtCompatVersion}"; + setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" + -plugindir $out/$qtPluginPrefix \ + -qmldir $out/$qtQmlPrefix \ + -docdir $out/$qtDocPrefix" + + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\"" ''; prefixKey = "-prefix "; @@ -208,7 +215,7 @@ stdenv.mkDerivation { xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa - DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk + DiskArbitration darwin.cf-private libiconv ]); buildInputs = @@ -230,8 +237,9 @@ stdenv.mkDerivation { postInstall = '' find "$out" -name "*.cmake" | while read file; do substituteInPlace "$file" \ - --subst-var-by NIX_OUT "$out" \ - --subst-var-by NIX_DEV "$dev" + --subst-var-by NIX_OUT "''${!outputLib}" \ + --subst-var-by NIX_DEV "''${!outputDev}" \ + --subst-var-by NIX_BIN "''${!outputBin}" done ''; @@ -267,7 +275,20 @@ stdenv.mkDerivation { done popd fi - '' + lib.optionalString stdenv.isDarwin '' + '' + + # fixup .pc file (where to find 'moc' etc.) + + lib.optionalString (!stdenv.isDarwin) '' + sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ + -e "/^host_bins=/ c host_bins=$dev/bin" + '' + + # Don't move .prl files on darwin because they end up in + # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent + # use of lndir in the qtbase setup-hook. On Linux, the .prl files + # are in lib, and so do not cause a subsequent recreation of deep + # framework directory trees. + + lib.optionalString stdenv.isDarwin '' fixDarwinDylibNames_rpath() { local flags=() @@ -294,7 +315,7 @@ stdenv.mkDerivation { homepage = http://www.qt.io; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + maintainers = with maintainers; [ qknight ttuegel ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch index a0b546aaa3af..e9d3c2734d1e 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch @@ -1,8 +1,8 @@ -Index: qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp +Index: qtbase-opensource-src-5.6.2/src/network/kernel/qdnslookup_unix.cpp =================================================================== ---- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qdnslookup_unix.cpp -+++ qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp -@@ -78,7 +78,7 @@ static bool resolveLibraryInternal() +--- qtbase-opensource-src-5.6.2.orig/src/network/kernel/qdnslookup_unix.cpp ++++ qtbase-opensource-src-5.6.2/src/network/kernel/qdnslookup_unix.cpp +@@ -83,7 +83,7 @@ static bool resolveLibraryInternal() if (!lib.load()) #endif { @@ -11,10 +11,10 @@ Index: qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp if (!lib.load()) return false; } -Index: qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp +Index: qtbase-opensource-src-5.6.2/src/network/kernel/qhostinfo_unix.cpp =================================================================== ---- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qhostinfo_unix.cpp -+++ qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp +--- qtbase-opensource-src-5.6.2.orig/src/network/kernel/qhostinfo_unix.cpp ++++ qtbase-opensource-src-5.6.2/src/network/kernel/qhostinfo_unix.cpp @@ -94,7 +94,7 @@ static bool resolveLibraryInternal() if (!lib.load()) #endif diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch new file mode 100644 index 000000000000..fecbce59050d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch @@ -0,0 +1,20 @@ +Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qtbase-opensource-src-5.6.2.orig/src/corelib/kernel/qcoreapplication.cpp ++++ qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp +@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPat + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index d454a74109ae..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/src/corelib/kernel/qcoreapplication.cpp -+++ qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp -@@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ app_libpaths->append(QFile::decodeName(profile) + plugindir); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); -+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); - for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch new file mode 100644 index 000000000000..32d9dcad622d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch @@ -0,0 +1,43 @@ +Index: qtbase-opensource-src-5.6.2/src/gui/kernel/qplatformintegrationfactory.cpp +=================================================================== +--- qtbase-opensource-src-5.6.2.orig/src/gui/kernel/qplatformintegrationfactory.cpp ++++ qtbase-opensource-src-5.6.2/src/gui/kernel/qplatformintegrationfactory.cpp +@@ -67,9 +67,10 @@ QPlatformIntegration *QPlatformIntegrati + // Try loading the plugin from platformPluginPath first: + if (!platformPluginPath.isEmpty()) { + QCoreApplication::addLibraryPath(platformPluginPath); +- if (QPlatformIntegration *ret = loadIntegration(directLoader(), platform, paramList, argc, argv)) +- return ret; + } ++ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ if (QPlatformIntegration *ret = loadIntegration(directLoader(), platform, paramList, argc, argv)) ++ return ret; + if (QPlatformIntegration *ret = loadIntegration(loader(), platform, paramList, argc, argv)) + return ret; + #else +@@ -95,15 +96,16 @@ QStringList QPlatformIntegrationFactory: + QStringList list; + if (!platformPluginPath.isEmpty()) { + QCoreApplication::addLibraryPath(platformPluginPath); +- list = directLoader()->keyMap().values(); +- if (!list.isEmpty()) { +- const QString postFix = QStringLiteral(" (from ") +- + QDir::toNativeSeparators(platformPluginPath) +- + QLatin1Char(')'); +- const QStringList::iterator end = list.end(); +- for (QStringList::iterator it = list.begin(); it != end; ++it) +- (*it).append(postFix); +- } ++ } ++ QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH)); ++ list = directLoader()->keyMap().values(); ++ if (!list.isEmpty()) { ++ const QString postFix = QStringLiteral(" (from ") ++ + QDir::toNativeSeparators(platformPluginPath) ++ + QLatin1Char(')'); ++ const QStringList::iterator end = list.end(); ++ for (QStringList::iterator it = list.begin(); it != end; ++it) ++ (*it).append(postFix); + } + list.append(loader()->keyMap().values()); + return list; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series index 2196d8383752..bacb3a4ed899 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series @@ -4,6 +4,6 @@ dlopen-libXcursor.patch dlopen-openssl.patch dlopen-dbus.patch xdg-config-dirs.patch -nix-profiles-library-paths.patch +library-paths.patch compose-search-path.patch libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch index 16e88d7c4f0d..f197211ded7b 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch @@ -1,8 +1,8 @@ -Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp +Index: qtbase-opensource-src-5.6.2/src/corelib/tools/qtimezoneprivate_tz.cpp =================================================================== ---- qtbase-opensource-src-5.6.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -62,7 +62,10 @@ typedef QHash Q +--- qtbase-opensource-src-5.6.2.orig/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.6.2/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -64,7 +64,10 @@ typedef QHash Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -14,7 +14,7 @@ Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt +@@ -636,12 +639,18 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix index 9b6a6c46176c..57b8e53b215c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix @@ -5,4 +5,8 @@ qtSubmodule { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python2 ]; + + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch new file mode 100644 index 000000000000..a942d837c305 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch @@ -0,0 +1,20 @@ +Index: qtdeclarative-opensource-src-5.6.2/src/qml/qml/qqmlimport.cpp +=================================================================== +--- qtdeclarative-opensource-src-5.6.2.orig/src/qml/qml/qqmlimport.cpp ++++ qtdeclarative-opensource-src-5.6.2/src/qml/qml/qqmlimport.cpp +@@ -1568,6 +1568,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); ++ } ++ } ++ + // env import paths + if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { + const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch deleted file mode 100644 index 06b244b974ff..000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -=================================================================== ---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp -+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString qmldir = QString::fromLatin1("/lib/qt5/qml"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ addImportPath(QFile::decodeName(profile) + qmldir); -+ } -+ } -+ - // env import paths - QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); - if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series index 7dbe197c56e0..38abb916a508 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series +++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series @@ -1 +1 @@ -nix-profiles-import-paths.patch +import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch index 3a813dc80074..9893fdff9a5c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch @@ -11,15 +11,15 @@ diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h index 6f2cabd..81b9849 100644 --- a/src/serialport/qtudev_p.h +++ b/src/serialport/qtudev_p.h -@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN +@@ -105,10 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN inline bool resolveSymbols(QLibrary *udevLibrary) { if (!udevLibrary->isLoaded()) { - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); if (!udevLibrary->load()) { - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); if (!udevLibrary->load()) { qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); return false; diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix index 2bffd0a2bd61..925e8a808f25 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix @@ -1,12 +1,12 @@ -{ qtSubmodule, qtbase, substituteAll, systemd }: +{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }: + +let inherit (lib) getLib optional; in qtSubmodule { name = "qtserialport"; qtInputs = [ qtbase ]; - patches = [ - (substituteAll { - src = ./0001-dlopen-serialport-udev.patch; - libudev = systemd.lib; - }) - ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + NIX_CFLAGS_COMPILE = + optional stdenv.isLinux + ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; } diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch new file mode 100644 index 000000000000..65bb64710ebd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch @@ -0,0 +1,22 @@ +Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h +=================================================================== +--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h ++++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h +@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++#endif + if (!udevLibrary->load()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++#endif + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/series b/pkgs/development/libraries/qt-5/5.6/qtserialport/series new file mode 100644 index 000000000000..83f4abf094e9 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/series @@ -0,0 +1 @@ +qtserialport-dlopen-udev.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 13b8296dc0e3..7ffc42fe7f68 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -2,7 +2,8 @@ , xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus -, zlib, libjpeg, libpng, libtiff +, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus +, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent , alsaLib , libcap , pciutils @@ -11,7 +12,7 @@ , coreutils , pkgconfig, python2 -, stdenv # lib.optional, needsPax +, lib, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -41,26 +42,38 @@ qtSubmodule { sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" + -plugindir $out/$qtPluginPrefix \ + -qmldir $out/$qtQmlPrefix \ + -docdir $out/$qtDocPrefix" ''; propagatedBuildInputs = [ - dbus zlib alsaLib - # Image formats - libjpeg libpng libtiff + libjpeg libpng libtiff libwebp + + # Video formats + srtp libvpx + + # Audio formats + libopus # Text rendering - fontconfig freetype harfbuzz icu + harfbuzz icu + ] + ++ lib.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 - - libcap - pciutils ]; patches = [ ./chromium-clang-update-py.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch index 1c360cd81aa2..19de7d99c85e 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch @@ -11,18 +11,18 @@ diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform index 60ff317..da8ac69 100644 --- a/Source/WebCore/platform/qt/GamepadsQt.cpp +++ b/Source/WebCore/platform/qt/GamepadsQt.cpp -@@ -111,12 +111,12 @@ private: +@@ -111,13 +111,12 @@ private: bool load() { m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); - m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); ++ m_libUdev.setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); m_loaded = m_libUdev.load(); if (resolveMethods()) return true; - m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); ++ m_libUdev.setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); m_loaded = m_libUdev.load(); return resolveMethods(); } diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix index 915a6bcae8a8..664281aac311 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix @@ -1,35 +1,40 @@ -{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors +{ qtSubmodule, stdenv, copyPathsToStore, lib +, qtdeclarative, qtlocation, qtsensors , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby +, darwin , substituteAll , flashplayerFix ? false }: -with stdenv.lib; +let inherit (lib) optional optionals getLib; in qtSubmodule { name = "qtwebkit"; qtInputs = [ qtdeclarative qtlocation qtsensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] + ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]); nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby ]; - patches = - let dlopen-webkit-nsplugin = substituteAll { - src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; - }; - dlopen-webkit-gtk = substituteAll { - src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk2.out; - }; - dlopen-webkit-udev = substituteAll { - src = ./0003-dlopen-webkit-udev.patch; - libudev = systemd.lib; - }; - in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] - ++ [ dlopen-webkit-udev ]; - meta.maintainers = with stdenv.lib.maintainers; [ abbradar ]; + + __impureHostDeps = optionals (stdenv.isDarwin) [ + "/usr/lib/libicucore.dylib" + ]; + + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + NIX_CFLAGS_COMPILE = + optionals flashplayerFix + [ + ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' + ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"'' + ] + ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; + + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; + + meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; } diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch new file mode 100644 index 000000000000..e34eda592af7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch @@ -0,0 +1,64 @@ +Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp +=================================================================== +--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* modu + } + } + ++#ifdef NIXPKGS_LIBGTK2 ++ QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0); ++#else + QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++#endif + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp +=================================================================== +--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -697,7 +697,11 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); ++#ifdef NIXPKGS_LIBGDK2 ++ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); ++#else + QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++#endif + if (!library.load()) + return 0; + +Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +=================================================================== +--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -64,7 +64,11 @@ static Display* getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + ++#ifdef NIXPKGS_LIBGDK2 ++ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); ++#else + QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++#endif + if (!library.load()) + return 0; + +Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +=================================================================== +--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType typ + + static bool initializeGtk() + { ++#ifdef NIXPKGS_LIBGTK2 ++ QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0); ++#else + QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); ++#endif + if (!gtkLibrary.load()) + return false; + typedef void* (*gtk_init_ptr)(void*, void*); diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch new file mode 100644 index 000000000000..63c653da94ef --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch @@ -0,0 +1,13 @@ +Index: qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri +=================================================================== +--- qtwebkit-opensource-src-5.8.0.orig/Source/WTF/WTF.pri ++++ qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri +@@ -12,7 +12,7 @@ mac { + # Mac OS does ship libicu but not the associated header files. + # Therefore WebKit provides adequate header files. + INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH +- LIBS += -licucore ++ LIBS += /usr/lib/libicucore.dylib + } else:!use?(wchar_unicode): { + win32 { + CONFIG(static, static|shared) { diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series new file mode 100644 index 000000000000..140e2a3dd4e2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series @@ -0,0 +1,3 @@ +qtwebkit-dlopen-gtk.patch +qtwebkit-dlopen-udev.patch +qtwebkit-icucore-darwin.patch diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh deleted file mode 100644 index 6a6a34d520d6..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/fetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/ \ - http://download.qt.io/community_releases/5.7/5.7.1/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch deleted file mode 100644 index 495db07cfbb5..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp -+++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp -@@ -48,7 +48,7 @@ - ****************************************************************************/ - - //#define QSSLSOCKET_DEBUG --//#define QT_DECRYPT_SSL_TRAFFIC -+#define QT_DECRYPT_SSL_TRAFFIC - - #include "qssl_p.h" - #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix deleted file mode 100644 index 934203950b09..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ /dev/null @@ -1,246 +0,0 @@ -{ - stdenv, lib, copyPathsToStore, - src, version, - - coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, - - dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, - libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, - libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev, - xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs, - zlib, - - # optional dependencies - cups ? null, mysql ? null, postgresql ? null, - - # options - mesaSupported, mesa, - buildExamples ? false, - buildTests ? false, - developerBuild ? false, - decryptSslTraffic ? false -}: - -let - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; -in - -stdenv.mkDerivation { - - name = "qtbase-${version}"; - inherit src version; - - outputs = [ "out" "dev" ]; - - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; - - postPatch = - '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf - - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake" - sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" - - substituteInPlace src/network/kernel/qdnslookup_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - - substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - - substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ - --replace "@openssl@" "${openssl.out}" - - substituteInPlace src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus.lib}" - - substituteInPlace \ - src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace "@libX11@" "${libX11.out}" - '' - + lib.optionalString mesaSupported '' - substituteInPlace \ - src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ - --replace "@mesa_lib@" "${mesa.out}" - substituteInPlace mkspecs/common/linux.conf \ - --replace "@mesa_lib@" "${mesa.out}" \ - --replace "@mesa_inc@" "${mesa.dev or mesa}" - ''; - - - setOutputFlags = false; - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" - export MAKEFLAGS=-j$NIX_BUILD_CORES - - configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" - ''; - - prefixKey = "-prefix "; - - # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa - # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = '' - -verbose - -confirm-license - -opensource - - -release - -shared - ${lib.optionalString developerBuild "-developer-build"} - -largefile - -accessibility - -rpath - -optimized-qmake - -strip - -no-reduce-relocations - -system-proxies - -pkg-config - - -gui - -widgets - -opengl desktop - -qml-debug - -iconv - -icu - -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms - - ${lib.optionalString (!system-x86_64) "-no-sse2"} - -no-sse3 - -no-ssse3 - -no-sse4.1 - -no-sse4.2 - -no-avx - -no-avx2 - -no-mips_dsp - -no-mips_dspr2 - - -system-zlib - -system-libpng - -system-libjpeg - -system-harfbuzz - -system-xcb - -system-xkbcommon - -system-pcre - -openssl-linked - -dbus-linked - -libinput - -gtk - - -system-sqlite - -${if mysql != null then "plugin" else "no"}-sql-mysql - -${if postgresql != null then "plugin" else "no"}-sql-psql - - -make libs - -make tools - -${lib.optionalString (buildExamples == false) "no"}make examples - -${lib.optionalString (buildTests == false) "no"}make tests - -v - ''; - - # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag - # if dependency paths contain the string "pq", which can occur in the hash. - # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; - - propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib - - # Image formats - libjpeg libpng libtiff - - # Text rendering - fontconfig freetype harfbuzz icu - - # X11 libs - libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil - xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm - ] - ++ lib.optional mesaSupported mesa; - - buildInputs = - [ gtk3 libinput ] - ++ lib.optional developerBuild gdb - ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql; - - nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python2 ]; - - # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; - - postInstall = '' - find "$out" -name "*.cmake" | while read file; do - substituteInPlace "$file" \ - --subst-var-by NIX_OUT "$out" \ - --subst-var-by NIX_DEV "$dev" - done - ''; - - preFixup = '' - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - ''; - - postFixup = - '' - # Don't retain build-time dependencies like gdb. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri - - # Move libtool archives and qmake projects - if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then - pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ - while read -r file; do - mkdir -p "''${!outputDev}/$(dirname "$file")" - mv "''${!outputLib}/$file" "''${!outputDev}/$file" - done - popd - fi - ''; - - inherit lndir; - setupHook = ../../qtbase-setup-hook.sh; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = http://www.qt.io; - description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch deleted file mode 100644 index 10b0b6701ddc..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/dbus/qdbus_symbols.cpp -+++ qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp -@@ -97,7 +97,7 @@ bool qdbus_loadLibDBus() - #ifdef Q_OS_WIN - QLatin1String("dbus-1"), - #endif -- QLatin1String("libdbus-1") -+ QLatin1String("@dbus_libs@/lib/libdbus-1") - }; - - lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch deleted file mode 100644 index 9891bfeac5bf..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -658,8 +658,8 @@ static QPair loadO - #endif - #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so - // first attempt: the canonical name is libssl.so. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); - if (libcrypto->load() && libssl->load()) { - // libssl.so. and libcrypto.so. found - return pair; -@@ -676,8 +676,8 @@ static QPair loadO - // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third - // attempt, _after_ /Contents/Frameworks has been searched. - // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); - if (libcrypto->load() && libssl->load()) { - // libssl.so.0 and libcrypto.so.0 found - return pair; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch deleted file mode 100644 index 98a3610f5fbd..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qdnslookup_unix.cpp -+++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp -@@ -85,7 +85,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/resolv")); - if (!lib.load()) - return false; - } -Index: qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qhostinfo_unix.cpp -+++ qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp -@@ -100,7 +100,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return false; - } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch deleted file mode 100644 index fda3d3e36533..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf -+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf -@@ -12,8 +12,8 @@ QMAKE_INCDIR = - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index ebaf3651a6d0..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/kernel/qcoreapplication.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp -@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); -+ for (const QByteArray &profile: profiles) { -+ if (!profile.isEmpty()) { -+ app_libpaths->append(QFile::decodeName(profile) + plugindir); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); -+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); - for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch deleted file mode 100644 index 1f2f316c5b26..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp -@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti - confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); - confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); - -+#if !defined(Q_OS_WIN) -+ // Add directories specified in $XDG_CONFIG_DIRS -+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); -+ if (!pathEnv.isEmpty()) { -+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); -+ if (!pathEntries.isEmpty()) { -+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. -+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { -+ const QString& path = pathEntries.at(k); -+ if (!application.isEmpty()) -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); -+ } -+ } -+ } -+#endif -+ - for (i = 0; i < NumConfFiles; ++i) { - if (confFiles[i]) { - spec = i; -Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings_p.h -+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h -@@ -246,7 +246,7 @@ public: - F_Organization = 0x1, - F_User = 0x0, - F_System = 0x2, -- NumConfFiles = 4 -+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis - }; - - QSettings::Format format; diff --git a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix deleted file mode 100644 index 95cd6fea79b4..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix deleted file mode 100644 index 9b6a6c46176c..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: - -qtSubmodule { - name = "qtdeclarative"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; - nativeBuildInputs = [ python2 ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch deleted file mode 100644 index 06b244b974ff..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -=================================================================== ---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp -+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString qmldir = QString::fromLatin1("/lib/qt5/qml"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ addImportPath(QFile::decodeName(profile) + qmldir); -+ } -+ } -+ - // env import paths - QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); - if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series deleted file mode 100644 index 7dbe197c56e0..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series +++ /dev/null @@ -1 +0,0 @@ -nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix deleted file mode 100644 index 3273f12eb830..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtgraphicaleffects"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix deleted file mode 100644 index 03d0fffbe80e..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtimageformats"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix b/pkgs/development/libraries/qt-5/5.7/qtlocation.nix deleted file mode 100644 index 1e134057c4b4..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtmultimedia }: - -qtSubmodule { - name = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix deleted file mode 100644 index 7c1cc5da07e3..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative, pkgconfig -, alsaLib, gstreamer, gst-plugins-base, libpulseaudio -}: - -qtSubmodule { - name = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ - pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio - ]; - qmakeFlags = [ "GST_VERSION=1.0" ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix deleted file mode 100644 index 93a864621b82..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtquickcontrols"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch deleted file mode 100644 index 887e107b6c1b..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch +++ /dev/null @@ -1,25 +0,0 @@ -From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:13:34 -0500 -Subject: [PATCH] glib-2.32 - ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix deleted file mode 100644 index 127766e2ebd6..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ qtSubmodule, qtbase, qttools }: - -qtSubmodule { - name = "qtscript"; - qtInputs = [ qtbase qttools ]; - patches = [ ./0001-glib-2.32.patch ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix b/pkgs/development/libraries/qt-5/5.7/qtsensors.nix deleted file mode 100644 index 61e64dc47e4d..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch deleted file mode 100644 index 3a813dc80074..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:16:02 -0500 -Subject: [PATCH] dlopen serialport udev - ---- - src/serialport/qtudev_p.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index 6f2cabd..81b9849 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - if (!udevLibrary->load()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix deleted file mode 100644 index 2bffd0a2bd61..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qtSubmodule, qtbase, substituteAll, systemd }: - -qtSubmodule { - name = "qtserialport"; - qtInputs = [ qtbase ]; - patches = [ - (substituteAll { - src = ./0001-dlopen-serialport-udev.patch; - libudev = systemd.lib; - }) - ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix b/pkgs/development/libraries/qt-5/5.7/qtsvg.nix deleted file mode 100644 index b9ccac7cf933..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtsvg"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix b/pkgs/development/libraries/qt-5/5.7/qttools/default.nix deleted file mode 100644 index d72d7b6c64cb..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, qtbase }: - -qtSubmodule { - name = "qttools"; - qtInputs = [ qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postFixup = '' - moveToOutput "bin/qdbus" "$out" - moveToOutput "bin/qtpaths" "$out" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/series b/pkgs/development/libraries/qt-5/5.7/qttools/series deleted file mode 100644 index 6cc1d3b87bca..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qttools/series +++ /dev/null @@ -1 +0,0 @@ -cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix b/pkgs/development/libraries/qt-5/5.7/qttranslations.nix deleted file mode 100644 index 50fc8cf6826a..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qttools }: - -qtSubmodule { - name = "qttranslations"; - qtInputs = [ qttools ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix deleted file mode 100644 index a42dda1b36cb..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel - -, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst -, fontconfig, freetype, harfbuzz, icu, dbus -, zlib, libjpeg, libpng, libtiff -, alsaLib -, libcap -, pciutils - -, bison, flex, git, which, gperf -, coreutils -, pkgconfig, python2 - -, stdenv # lib.optional, needsPax -}: - -qtSubmodule { - name = "qtwebengine"; - qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; - buildInputs = [ bison flex git which gperf ]; - nativeBuildInputs = [ pkgconfig python2 coreutils ]; - doCheck = true; - - enableParallelBuilding = true; - - preConfigure = '' - export MAKEFLAGS=-j$NIX_BUILD_CORES - substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - - # fix default SSL bundle location - sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c - - # Fix library paths - 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 - - configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" - ''; - propagatedBuildInputs = [ - dbus zlib alsaLib - - # Image formats - libjpeg libpng libtiff - - # Text rendering - fontconfig freetype harfbuzz icu - - # X11 libs - xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst - xlibs.libXcomposite - - libcap - pciutils - ]; - patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; - postInstall = '' - cat > $out/libexec/qt.conf < -Date: Sun, 23 Aug 2015 09:18:54 -0500 -Subject: [PATCH 1/3] dlopen webkit nsplugin - ---- - Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- - Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- - Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index a923d49..2731d05 100644 ---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2f..363bde5 100644 ---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff6..62a2197 100644 ---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,7 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch deleted file mode 100644 index bb5d1f74364c..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:16 -0500 -Subject: [PATCH 2/3] dlopen webkit gtk - ---- - Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de6521..0b25748 100644 ---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch deleted file mode 100644 index 1c360cd81aa2..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:29 -0500 -Subject: [PATCH 3/3] dlopen webkit udev - ---- - Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp -index 60ff317..da8ac69 100644 ---- a/Source/WebCore/platform/qt/GamepadsQt.cpp -+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp -@@ -111,12 +111,12 @@ private: - bool load() - { - m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - m_loaded = m_libUdev.load(); - if (resolveMethods()) - return true; - -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - m_loaded = m_libUdev.load(); - return resolveMethods(); - } --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix deleted file mode 100644 index 915a6bcae8a8..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt -, sqlite, systemd, glib, gst_all_1 -, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby -, substituteAll -, flashplayerFix ? false -}: - -with stdenv.lib; - -qtSubmodule { - name = "qtwebkit"; - qtInputs = [ qtdeclarative qtlocation qtsensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; - nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python2 ruby - ]; - patches = - let dlopen-webkit-nsplugin = substituteAll { - src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; - }; - dlopen-webkit-gtk = substituteAll { - src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk2.out; - }; - dlopen-webkit-udev = substituteAll { - src = ./0003-dlopen-webkit-udev.patch; - libudev = systemd.lib; - }; - in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] - ++ [ dlopen-webkit-udev ]; - meta.maintainers = with stdenv.lib.maintainers; [ abbradar ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix deleted file mode 100644 index fbdfbbcf0dbe..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix deleted file mode 100644 index a765161e2d7e..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtx11extras"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix deleted file mode 100644 index 9a8ddbba2bd2..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtxmlpatterns"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix deleted file mode 100644 index 3fc4fab4ea54..000000000000 --- a/pkgs/development/libraries/qt-5/5.7/srcs.nix +++ /dev/null @@ -1,317 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz"; - sha256 = "1sh7yz8nb9iqz3bp6bfc2kmji70zq39d9c0sfxnhif3p2x1wyx0x"; - name = "qt3d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtactiveqt-opensource-src-5.7.1.tar.xz"; - sha256 = "1md14jdgwsdczpfvc0qkk5agxqk7a9qs91k41zj15ykkw86r428c"; - name = "qtactiveqt-opensource-src-5.7.1.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtandroidextras-opensource-src-5.7.1.tar.xz"; - sha256 = "1wq9m7a3dh9k8z006cw6m96awc53yf5vnq3wdqf5yfclfz696lhg"; - name = "qtandroidextras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtbase = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz"; - sha256 = "0zjmcrmnnmaz1lr9wc5i6y565hsvl8ycn790ivqaz62dv54zbkgd"; - name = "qtbase-opensource-src-5.7.1.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcanvas3d-opensource-src-5.7.1.tar.xz"; - sha256 = "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8"; - name = "qtcanvas3d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtcharts = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz"; - sha256 = "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5"; - name = "qtcharts-opensource-src-5.7.1.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz"; - sha256 = "0rmr7bd4skby7bax9hpj2sid2bq3098nkw7xm02mdp04hc3bks5k"; - name = "qtconnectivity-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz"; - sha256 = "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv"; - name = "qtdatavis3d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz"; - sha256 = "0mjxfwnplpx60jc6y94krg00isddl9bfwc7dayl981njb4qds4zx"; - name = "qtdeclarative-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdeclarative-render2d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; - sha256 = "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"; - name = "qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdoc = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdoc-opensource-src-5.7.1.tar.xz"; - sha256 = "1nyrgfw3d8ja2cqb12vyq5mwryw89976f3xkpdhy49mvsws03ysm"; - name = "qtdoc-opensource-src-5.7.1.tar.xz"; - }; - }; - qtgamepad = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgamepad-opensource-src-5.7.1.tar.xz"; - sha256 = "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv"; - name = "qtgamepad-opensource-src-5.7.1.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; - sha256 = "1j2drnx7zp3w6cgvy7bn00fyk5v7vw1j1hidaqcg78lzb6zgls1c"; - name = "qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; - }; - }; - qtimageformats = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz"; - sha256 = "1x3p1xmw7spxa4bwriyrwsfrq31jabsdjsi5fras9y39naia55sg"; - name = "qtimageformats-opensource-src-5.7.1.tar.xz"; - }; - }; - qtlocation = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz"; - sha256 = "17zkzffzwbg6aqhsggs23cmwzq4y45m938842lsc423hfm7fdsgr"; - name = "qtlocation-opensource-src-5.7.1.tar.xz"; - }; - }; - qtmacextras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmacextras-opensource-src-5.7.1.tar.xz"; - sha256 = "0rr6nl1j6bq47lcq87zsqyma3cdqysamnngwbaccxvpznpcx7jhx"; - name = "qtmacextras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz"; - sha256 = "1vvxmgmvjnz9w1h2ph1j2fy77ij141ycx5fric60lq02pxzifax5"; - name = "qtmultimedia-opensource-src-5.7.1.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtpurchasing-opensource-src-5.7.1.tar.xz"; - sha256 = "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n"; - name = "qtpurchasing-opensource-src-5.7.1.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz"; - sha256 = "17cyfyqzjbm9dhq9pjscz36y84y16rmxwk6h826gjfprddrimsvg"; - name = "qtquickcontrols-opensource-src-5.7.1.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz"; - sha256 = "1v77ydy4k15lksp3bi2kgha2h7m79g4n7c2qhbr09xnvpb8ars7j"; - name = "qtquickcontrols2-opensource-src-5.7.1.tar.xz"; - }; - }; - qtscript = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz"; - sha256 = "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav"; - name = "qtscript-opensource-src-5.7.1.tar.xz"; - }; - }; - qtscxml = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz"; - sha256 = "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx"; - name = "qtscxml-opensource-src-5.7.1.tar.xz"; - }; - }; - qtsensors = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz"; - sha256 = "041v1x8pwfzpyk6y0sy5zgm915pi15xdhiy18fd5wqayvcp99cyc"; - name = "qtsensors-opensource-src-5.7.1.tar.xz"; - }; - }; - qtserialbus = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialbus-opensource-src-5.7.1.tar.xz"; - sha256 = "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj"; - name = "qtserialbus-opensource-src-5.7.1.tar.xz"; - }; - }; - qtserialport = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz"; - sha256 = "09jsryc0z49cz9783kq48rkn42f10c6krzivp812ddwjsfdy3mbn"; - name = "qtserialport-opensource-src-5.7.1.tar.xz"; - }; - }; - qtsvg = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz"; - sha256 = "0irr9h566hl9nx8p919rz276zbfvvd6vqdb6i9g6b3piikdigw5h"; - name = "qtsvg-opensource-src-5.7.1.tar.xz"; - }; - }; - qttools = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz"; - sha256 = "1b6zqa5690b8lqms7rrhb8rcq0xg5hp117v3m08qngbcd0i706b4"; - name = "qttools-opensource-src-5.7.1.tar.xz"; - }; - }; - qttranslations = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz"; - sha256 = "1rsq0bp6p8yf41h1nxrbclxr4xq8v025cbi0lq7yh917ac4xpv0n"; - name = "qttranslations-opensource-src-5.7.1.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; - sha256 = "1p9acm75am5lybmn8j2339vck808dmayk4xwbr67jpfigs9qp2xj"; - name = "qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwayland = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz"; - sha256 = "1iq1c89y4ggq0dxjlf62jyhh8a9l3x7y914x84w5pby8h3hwagzj"; - name = "qtwayland-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz"; - sha256 = "16rij92dxy4k5231l3dpmhy7cnz0cjkn50cpzaf014zrdz3kmav3"; - name = "qtwebchannel-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebengine = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz"; - sha256 = "0ayc3j17nampy7pg464nbi09wr2d3pfbpqql789m0av37lz8h091"; - name = "qtwebengine-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebkit = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz"; - sha256 = "00szgcra6pf2myfjrdbsr1gmrxycpbjqlzkplna5yr1rjg4gfv54"; - name = "qtwebkit-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebkit-examples = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-examples-opensource-src-5.7.1.tar.xz"; - sha256 = "09c2ni3nf7vdsw1y9yhpbal9zs8jgvi1wndnva6mgdbcnm8h23fm"; - name = "qtwebkit-examples-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz"; - sha256 = "1laj0slwibs0bg69kgrdhc9k1s6yisq3pcsr0r9rhbkzisv7aajw"; - name = "qtwebsockets-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebview = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz"; - sha256 = "17qmyayy67ji4d3i3cq0wb8s7hqjrw224zr2blzjc1827rlzkg5k"; - name = "qtwebview-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwinextras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwinextras-opensource-src-5.7.1.tar.xz"; - sha256 = "1k7kiq0k7qwsn06p6sg13lr8hnnz7lvvsx18gas46dggkyj66514"; - name = "qtwinextras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtx11extras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz"; - sha256 = "09z49jm70f5i0gcdz9a16z00pg96x8pz7vri5wpirh3fqqn0qnjz"; - name = "qtx11extras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz"; - sha256 = "1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8"; - name = "qtxmlpatterns-opensource-src-5.7.1.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix similarity index 66% rename from pkgs/development/libraries/qt-5/5.7/default.nix rename to pkgs/development/libraries/qt-5/5.9/default.nix index 85b38c6fc6ce..7aba54fb883b 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -9,8 +9,9 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `maintainers/scripts/generate-qt.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Check that the new packages build correctly. -4. Commit the changes and open a pull request. +3. Update `qtCompatVersion` below if the minor version number changes. +4. Check that the new packages build correctly. +5. Commit the changes and open a pull request. */ @@ -18,26 +19,47 @@ top-level attribute to `top-level/all-packages.nix`. newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, mesa, perl, - gstreamer, gst-plugins-base, + gstreamer, gst-plugins-base, gtk3, dconf, # options developerBuild ? false, decryptSslTraffic ? false, + debug ? null, }: with stdenv.lib; let + qtCompatVersion = "5.9"; + mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; + mkDerivation = args: + stdenv.mkDerivation (args // { + + qmakeFlags = + (args.qmakeFlags or []) + ++ optional (debug != null) + (if debug then "CONFIG+=debug" else "CONFIG+=release"); + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ optional (debug != null) + (if debug then "-DCMAKE_BUILD_TYPE=Debug" + else "-DCMAKE_BUILD_TYPE=Release"); + + enableParallelBuilding = args.enableParallelBuilding or true; + + }); + qtSubmodule = args: let inherit (args) name; version = args.version or srcs."${name}".version; src = args.src or srcs."${name}".src; - inherit (stdenv) mkDerivation; in mkDerivation (args // { name = "${name}-${version}"; inherit src; @@ -45,7 +67,7 @@ let propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); nativeBuildInputs = (args.nativeBuildInputs or []) - ++ [ perl self.qmakeHook ]; + ++ [ perl self.qmake ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; @@ -54,19 +76,26 @@ let setupHook = ../qtsubmodule-setup-hook.sh; - enableParallelBuilding = args.enableParallelBuilding or true; - - meta = self.qtbase.meta // (args.meta or {}); + meta = { + homepage = http://www.qt.io; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ qknight ttuegel periklis ]; + platforms = platforms.unix; + } // (args.meta or {}); }); addPackages = self: with self; let - callPackage = self.newScope { inherit qtSubmodule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; }; in { + inherit mkDerivation; + qtbase = callPackage ./qtbase { inherit (srcs.qtbase) src version; inherit bison cups harfbuzz mesa; + inherit dconf gtk3; inherit developerBuild decryptSslTraffic; }; @@ -76,6 +105,7 @@ let qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; qtimageformats = callPackage ./qtimageformats.nix {}; qtlocation = callPackage ./qtlocation.nix {}; + qtmacextras = callPackage ./qtmacextras.nix {}; qtmultimedia = callPackage ./qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; @@ -97,23 +127,18 @@ let qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; env = callPackage ../qt-env.nix {}; - full = env "qt-${qtbase.version}" [ + full = env "qt-${qtbase.version}" ([ qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwayland + qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets qtx11extras qtxmlpatterns - ]; - - makeQtWrapper = - makeSetupHook - { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; - - qmakeHook = - makeSetupHook - { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; + ] ++ optional (!stdenv.isDarwin) qtwayland + ++ optional (stdenv.isDarwin) qtmacextras); + qmake = makeSetupHook { + deps = [ self.qtbase.dev ]; + substitutions = { inherit (stdenv) isDarwin; }; + } ../qmake-hook.sh; }; self = makeScope newScope addPackages; diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh new file mode 100644 index 000000000000..60acf2cea9d2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -0,0 +1,3 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/ \ + http://download.qt.io/community_releases/5.9/5.9.0-final/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/cmake-paths.patch similarity index 78% rename from pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/cmake-paths.patch index 0d5c2d510929..9616f5812cfd 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/cmake-paths.patch @@ -1,7 +1,7 @@ -Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +Index: qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) endif() !!ENDIF @@ -45,7 +45,7 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm !!ELSE set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ENDIF -@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta +@@ -74,19 +53,6 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" ) @@ -65,23 +65,26 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm endmacro() !!ENDIF - if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - +@@ -95,24 +61,24 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME !!IF !no_module_headers --!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS + !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) + set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" -- ) --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS ++ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" ++ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" + ) + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE ++ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" ++ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ELSE !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") + set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") @@ -94,27 +97,17 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF -+ - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) +@@ -281,7 +247,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME !!IF isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD ++ if (EXISTS \"@NIX_OUT@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +@@ -289,13 +255,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" @@ -129,31 +122,17 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_DEBUG_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - !!ENDIF // CMAKE_RELEASE_TYPE - - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) +@@ -318,7 +284,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME !!IF isEmpty(CMAKE_RELEASE_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD ++ if (EXISTS \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +@@ -326,13 +292,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" @@ -168,12 +147,7 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_RELEASE_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME +@@ -354,11 +320,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -186,10 +160,10 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in +Index: qtbase-opensource-src-5.9.0/src/gui/Qt5GuiConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-opensource-src-5.9.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.9.0/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -215,10 +189,10 @@ Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in +Index: qtbase-opensource-src-5.9.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-opensource-src-5.9.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.9.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) add_executable(Qt5::uic IMPORTED) @@ -228,10 +202,10 @@ Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in +Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) add_executable(Qt5::qmake IMPORTED) @@ -277,10 +251,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) @@ -289,10 +263,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForIn !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) @@ -301,10 +275,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmak !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in +Index: qtbase-opensource-src-5.9.0/src/dbus/Qt5DBusConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-opensource-src-5.9.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.9.0/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -323,10 +297,27 @@ Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") !!ENDIF -Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf +Index: qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf -+++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf +--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -2,10 +2,10 @@ + add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +Index: qtbase-opensource-src-5.9.0/mkspecs/features/create_cmake.prf +=================================================================== +--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/create_cmake.prf ++++ qtbase-opensource-src-5.9.0/mkspecs/features/create_cmake.prf @@ -136,28 +136,28 @@ contains(CONFIG, plugin) { win32 { @@ -338,7 +329,7 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf } else:mingw { - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a -+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}.a + CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a } else { # MSVC static - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib @@ -366,20 +357,3 @@ Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in -Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -2,10 +2,10 @@ - add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/compose-search-path.patch similarity index 66% rename from pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/compose-search-path.patch index a0e344a7bc68..720e7d81fa22 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/compose-search-path.patch @@ -1,16 +1,18 @@ -Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +Index: qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio - // the QTCOMPOSE environment variable +--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocatio + m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); - m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); -+ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale")); m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); ++ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); } + + QString TableGenerator::findComposeFile() diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix new file mode 100644 index 000000000000..a4451a486ce1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -0,0 +1,360 @@ +{ + stdenv, lib, copyPathsToStore, + src, version, qtCompatVersion, + + coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, + ruby, + # darwin support + darwin, libiconv, libcxx, + + dbus, dconf, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, + libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, + libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre2, sqlite, udev, + xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs, + zlib, + + # optional dependencies + cups ? null, mysql ? null, postgresql ? null, + + # options + mesaSupported ? (!stdenv.isDarwin), + mesa, + buildExamples ? false, + buildTests ? false, + developerBuild ? false, + decryptSslTraffic ? false +}: + +let + system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; +in + +stdenv.mkDerivation { + + name = "qtbase-${version}"; + inherit qtCompatVersion src version; + + propagatedBuildInputs = + [ + libxml2 libxslt openssl pcre2 sqlite zlib + + # Text rendering + harfbuzz icu + + # Image formats + libjpeg libpng libtiff + ] + + ++ lib.optional mesaSupported mesa + + ++ lib.optionals (!stdenv.isDarwin) [ + dbus glib udev + + # Text rendering + fontconfig freetype + + # X11 libs + libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil + xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm + ] + + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AGL AppKit ApplicationServices Carbon Cocoa + CoreAudio CoreBluetooth CoreLocation CoreServices + DiskArbitration Foundation OpenGL + darwin.cf-private darwin.libobjc libiconv + ]); + + buildInputs = [ ] + ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ] + ++ lib.optional developerBuild gdb + ++ lib.optional (cups != null) cups + ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (postgresql != null) postgresql; + + nativeBuildInputs = + [ bison flex gperf lndir perl pkgconfig python2 ] + ++ lib.optional (!stdenv.isDarwin) patchelf; + + outputs = [ "out" "dev" "bin" ]; + + patches = + copyPathsToStore (lib.readPathsFromFile ./. ./series); + + postPatch = + '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + + sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in + sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake + sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in + sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in + '' + + + lib.optionalString mesaSupported '' + sed -i mkspecs/common/linux.conf \ + -e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \ + -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|" + '' + + + lib.optionalString stdenv.isDarwin '' + sed -i \ + -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ + -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \ + -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ + -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ + -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ + -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ + ./configure + sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf + sed -i '26,$d' ./mkspecs/features/mac/default_post.prf + sed -i '1,$d' ./mkspecs/features/mac/sdk.prf + sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf + ''; + # Note on the above: \x27 is a way if including a single-quote + # character in the sed string arguments. + + qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins"; + qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml"; + qtDocPrefix = "share/doc/qt-${qtCompatVersion}"; + + setOutputFlags = false; + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + + configureFlags+="\ + -plugindir $out/$qtPluginPrefix \ + -qmldir $out/$qtQmlPrefix \ + -docdir $out/$qtDocPrefix" + + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" + ''; + + + NIX_CFLAGS_COMPILE = + [ + "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields + ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' + ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' + ] + + ++ lib.optional mesaSupported + ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"'' + + ++ lib.optionals (!stdenv.isDarwin) + [ + ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' + ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' + ] + + ++ lib.optionals stdenv.isDarwin + [ + "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090" + "-D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))" + # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is + # 10.9 which necessitates the above macro definition that mentions + # 10.10 + ] + + ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"; + + prefixKey = "-prefix "; + + # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag + # if dependency paths contain the string "pq", which can occur in the hash. + # To prevent these failures, we need to override PostgreSQL detection. + PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = + [ + "-verbose" + "-confirm-license" + "-opensource" + + "-release" + "-shared" + "-accessibility" + "-optimized-qmake" + "-strip" + "-system-proxies" + "-pkg-config" + ] + ++ lib.optionals developerBuild [ + "-developer-build" + "-no-warnings-are-errors" + ] + ++ [ + "-gui" + "-widgets" + "-opengl desktop" + "-qml-debug" + "-icu" + "-pch" + ] + + ++ [ + ''${lib.optionalString (!system-x86_64) "-no"}-sse2'' + "-no-sse3" + "-no-ssse3" + "-no-sse4.1" + "-no-sse4.2" + "-no-avx" + "-no-avx2" + "-no-mips_dsp" + "-no-mips_dspr2" + ] + + ++ [ + "-system-zlib" + "-system-libjpeg" + "-system-harfbuzz" + "-system-pcre" + "-openssl-linked" + "-system-sqlite" + ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' + ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' + + "-make libs" + "-make tools" + ''-${lib.optionalString (buildExamples == false) "no"}make examples'' + ''-${lib.optionalString (buildTests == false) "no"}make tests'' + "-v" + ] + + ++ lib.optionals (!stdenv.isDarwin) [ + "-rpath" + + "-system-xcb" + "-xcb" + "-qpa xcb" + + "-system-xkbcommon" + "-libinput" + "-xkbcommon-evdev" + + "-no-eglfs" + "-no-gbm" + "-no-kms" + "-no-linuxfb" + + ''-${lib.optionalString (cups == null) "no-"}cups'' + "-dbus-linked" + "-glib" + "-gtk" + "-inotify" + "-system-libjpeg" + "-system-libpng" + ] + + ++ lib.optionals stdenv.isDarwin [ + "-platform macx-clang" + "-no-use-gold-linker" + "-no-fontconfig" + "-qt-freetype" + "-qt-libpng" + ]; + + enableParallelBuilding = true; + + postInstall = + # Hardcode some CMake module paths. + '' + find "$out" -name "*.cmake" | while read file; do + substituteInPlace "$file" \ + --subst-var-by NIX_OUT "''${!outputLib}" \ + --subst-var-by NIX_DEV "''${!outputDev}" \ + --subst-var-by NIX_BIN "''${!outputBin}" + done + ''; + + preFixup = + # Move selected outputs. + '' + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + + moveToOutput "$qtPluginPrefix" "$bin" + ''; + + postFixup = + # Don't retain build-time dependencies like gdb. + '' + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri + '' + + # Move libtool archives into $dev + + '' + if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then + pushd "''${!outputLib}" + find lib -name '*.a' -o -name '*.la' | while read -r file; do + mkdir -p "''${!outputDev}/$(dirname "$file")" + mv "''${!outputLib}/$file" "''${!outputDev}/$file" + done + popd + fi + '' + + # Move qmake project files into $dev. + # Don't move .prl files on darwin because they end up in + # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent + # use of lndir in the qtbase setup-hook. On Linux, the .prl files + # are in lib, and so do not cause a subsequent recreation of deep + # framework directory trees. + + lib.optionalString (!stdenv.isDarwin) '' + if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then + pushd "''${!outputLib}" + find lib -name '*.prl' | while read -r file; do + mkdir -p "''${!outputDev}/$(dirname "$file")" + mv "''${!outputLib}/$file" "''${!outputDev}/$file" + done + popd + fi + '' + + # fixup .pc file (where to find 'moc' etc.) + + lib.optionalString (!stdenv.isDarwin) '' + sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ + -e "/^host_bins=/ c host_bins=$dev/bin" + '' + + + lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames_rpath() { + local flags=() + + for fn in "$@"; do + flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn") + done + + for fn in "$@"; do + echo "$fn: fixing dylib" + install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn" + done + } + fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL" + ''; + + inherit lndir; + setupHook = if stdenv.isDarwin + then ../../qtbase-setup-hook-darwin.sh + else ../../qtbase-setup-hook.sh; + + meta = with lib; { + homepage = http://www.qt.io; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ qknight ttuegel periklis ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gl.patch similarity index 60% rename from pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gl.patch index ea3073ced50a..9385c7f6678c 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gl.patch @@ -1,17 +1,19 @@ -Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp =================================================================== ---- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const - { +--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAdd + #if QT_CONFIG(library) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); + // Check system library paths first QLibrary lib(QLatin1String("GL")); ++#ifdef NIXPKGS_MESA_GL + if (!lib.load()) { + // Fallback to Mesa driver -+ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL")); ++ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL)); + } ++#endif // NIXPKGS_MESA_GL glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + #endif } - } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gtkstyle.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gtkstyle.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-libXcursor.patch similarity index 52% rename from pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-libXcursor.patch index 02b7efb73d22..31339abc7856 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-libXcursor.patch @@ -1,17 +1,17 @@ -Index: qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp +Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/qxcbcursor.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -309,10 +309,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c - #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY) +--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c + #if defined(XCB_USE_XLIB) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { - QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); ++ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); bool xcursorFound = xcursorLib.load(); if (!xcursorFound) { // try without the version number - xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); ++ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); xcursorFound = xcursorLib.load(); } if (xcursorFound) { diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-resolv.patch new file mode 100644 index 000000000000..598456a49ffb --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-resolv.patch @@ -0,0 +1,26 @@ +Index: qtbase-opensource-src-5.9.0/src/network/kernel/qdnslookup_unix.cpp +=================================================================== +--- qtbase-opensource-src-5.9.0.orig/src/network/kernel/qdnslookup_unix.cpp ++++ qtbase-opensource-src-5.9.0/src/network/kernel/qdnslookup_unix.cpp +@@ -92,7 +92,7 @@ static bool resolveLibraryInternal() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); + if (!lib.load()) + return false; + } +Index: qtbase-opensource-src-5.9.0/src/network/kernel/qhostinfo_unix.cpp +=================================================================== +--- qtbase-opensource-src-5.9.0.orig/src/network/kernel/qhostinfo_unix.cpp ++++ qtbase-opensource-src-5.9.0/src/network/kernel/qhostinfo_unix.cpp +@@ -102,7 +102,7 @@ static bool resolveLibraryInternal() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); + if (!lib.load()) + return false; + } diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/library-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/library-paths.patch new file mode 100644 index 000000000000..4c24d73ed364 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/library-paths.patch @@ -0,0 +1,20 @@ +Index: qtbase-opensource-src-5.9.0/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qtbase-opensource-src-5.9.0.orig/src/corelib/kernel/qcoreapplication.cpp ++++ qtbase-opensource-src-5.9.0/src/corelib/kernel/qcoreapplication.cpp +@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPat + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch similarity index 84% rename from pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch index 4390db977a71..e9c60e7ab076 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch @@ -9,11 +9,11 @@ is defined in openssl, but not in libressl. src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp +Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslcontext_openssl.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslcontext_openssl.cpp -+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp -@@ -347,7 +347,7 @@ init_context: +--- qtbase-opensource-src-5.8.0.orig/src/network/ssl/qsslcontext_openssl.cpp ++++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslcontext_openssl.cpp +@@ -351,7 +351,7 @@ init_context: const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); if (!qcurves.isEmpty()) { @@ -22,7 +22,7 @@ Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp // Set the curves to be used if (q_SSLeay() >= 0x10002000L) { // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -360,7 +360,7 @@ init_context: +@@ -364,7 +364,7 @@ init_context: sslContext->errorCode = QSslError::UnspecifiedError; } } else diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch new file mode 100644 index 000000000000..8e5e2c71828a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch @@ -0,0 +1,36 @@ +Index: qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp +=================================================================== +--- qtbase-opensource-src-5.8.0.orig/src/plugins/platformthemes/gtk3/main.cpp ++++ qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + QT_BEGIN_NAMESPACE + +@@ -54,8 +55,22 @@ public: + QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) + { + Q_UNUSED(params); +- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) ++ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { ++ ++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS ++ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); ++ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); ++ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); ++#endif ++ ++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES ++ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); ++ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); ++ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); ++#endif ++ + return new QGtk3Theme; ++ } + + return 0; + } diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch new file mode 100644 index 000000000000..ad40dfab2f7b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch @@ -0,0 +1,14 @@ +Index: qtbase-opensource-src-5.8.0/src/network/socket/qnativesocketengine_unix.cpp +=================================================================== +--- qtbase-opensource-src-5.8.0.orig/src/network/socket/qnativesocketengine_unix.cpp ++++ qtbase-opensource-src-5.8.0/src/network/socket/qnativesocketengine_unix.cpp +@@ -979,7 +979,8 @@ qint64 QNativeSocketEnginePrivate::nativ + if (cmsgptr->cmsg_len == CMSG_LEN(sizeof(int)) + && ((cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT) + || (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL))) { +- header->hopLimit = *reinterpret_cast(CMSG_DATA(cmsgptr)); ++ int *ttl = reinterpret_cast(CMSG_DATA(cmsgptr)); ++ header->hopLimit = *ttl; + } + + #ifndef QT_NO_SCTP diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.9/qtbase/series similarity index 55% rename from pkgs/development/libraries/qt-5/5.7/qtbase/series rename to pkgs/development/libraries/qt-5/5.9/qtbase/series index 44e2d9040807..4f354e87c847 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/series @@ -1,10 +1,9 @@ dlopen-resolv.patch tzdir.patch dlopen-libXcursor.patch -dlopen-openssl.patch -dlopen-dbus.patch -xdg-config-dirs.patch -nix-profiles-library-paths.patch -compose-search-path.patch +library-paths.patch libressl.patch +dlopen-gl.patch +compose-search-path.patch cmake-paths.patch +qgtk-env.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch similarity index 67% rename from pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch index f4056dd9cc97..d57f24c3ed0a 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch @@ -1,29 +1,28 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp +Index: qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -68,7 +68,10 @@ typedef QHash Q +--- 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() { - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ QString path = qgetenv("TZDIR"); -+ path += "/zone.tab"; ++ // Try TZDIR first, in case we're running on NixOS. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on NixOS. + if (!QFile::exists(path)) + path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -566,12 +569,18 @@ void QTzTimeZonePrivate::init(const QByt +@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { - // Open named tz, try modern path first, if fails try legacy path - tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first -+ QString zoneinfoDir = qgetenv("TZDIR"); -+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); -+ tzif.setFileName(zoneinfoDir); ++ // Try TZDIR first, in case we're running on NixOS ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); if (!tzif.open(QIODevice::ReadOnly)) { - tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix similarity index 55% rename from pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix rename to pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix index 95cd6fea79b4..1c10535c7853 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix @@ -3,4 +3,8 @@ qtSubmodule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtQmlPrefix" "$bin" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix new file mode 100644 index 000000000000..cc6653348859 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix @@ -0,0 +1,20 @@ +{ stdenv, qtSubmodule, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: + +with stdenv.lib; + +qtSubmodule { + name = "qtdeclarative"; + patches = copyPathsToStore (readPathsFromFile ./. ./series); + qtInputs = [ qtbase qtsvg qtxmlpatterns ]; + nativeBuildInputs = [ python2 ]; + outputs = [ "out" "dev" "bin" ]; + + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" + ''; + + postInstall = '' + moveToOutput "$qtPluginPrefix" "$bin" + moveToOutput "$qtQmlPrefix" "$bin" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch new file mode 100644 index 000000000000..d50ee823a78b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch @@ -0,0 +1,20 @@ +Index: qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp +=================================================================== +--- qtdeclarative-opensource-src-5.8.0.orig/src/qml/qml/qqmlimport.cpp ++++ qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp +@@ -1630,6 +1630,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); ++ } ++ } ++ + // env import paths + if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { + const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); diff --git a/pkgs/development/libraries/qt-5/5.9/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/series new file mode 100644 index 000000000000..38abb916a508 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/series @@ -0,0 +1 @@ +import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix b/pkgs/development/libraries/qt-5/5.9/qtdoc.nix similarity index 81% rename from pkgs/development/libraries/qt-5/5.7/qtdoc.nix rename to pkgs/development/libraries/qt-5/5.9/qtdoc.nix index 578ea6ba0b22..7f979ee94c0f 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtdoc.nix @@ -3,4 +3,5 @@ qtSubmodule { name = "qtdoc"; qtInputs = [ qtdeclarative ]; + outputs = [ "out" ]; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix rename to pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix diff --git a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.9/qtimageformats.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/qtimageformats.nix rename to pkgs/development/libraries/qt-5/5.9/qtimageformats.nix diff --git a/pkgs/development/libraries/qt-5/5.9/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix new file mode 100644 index 000000000000..6270bc577cf0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix @@ -0,0 +1,13 @@ +{ qtSubmodule, qtbase, qtmultimedia }: + +qtSubmodule { + name = "qtlocation"; + qtInputs = [ qtbase qtmultimedia ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + 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.9/qtmacextras.nix b/pkgs/development/libraries/qt-5/5.9/qtmacextras.nix new file mode 100644 index 000000000000..582294cc7f76 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtmacextras.nix @@ -0,0 +1,10 @@ +{ qtSubmodule, qtbase, lib }: + +qtSubmodule { + name = "qtmacextras"; + qtInputs = [ qtbase ]; + meta = with lib; { + maintainers = with maintainers; [ periklis ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix new file mode 100644 index 000000000000..e133256e9004 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix @@ -0,0 +1,20 @@ +{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig +, alsaLib, gstreamer, gst-plugins-base, libpulseaudio +, darwin +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtmultimedia"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ pkgconfig gstreamer gst-plugins-base libpulseaudio] + ++ optional (stdenv.isLinux) alsaLib; + outputs = [ "out" "dev" "bin" ]; + qmakeFlags = [ "GST_VERSION=1.0" ]; + NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc"; + postInstall = '' + moveToOutput "$qtPluginPrefix" "$bin" + moveToOutput "$qtQmlPrefix" "$bin" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix similarity index 52% rename from pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix index 19750f2fd99d..1a52d1802cee 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix @@ -3,4 +3,8 @@ qtSubmodule { name = "qtquickcontrols2"; qtInputs = [ qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtQmlPrefix" "$bin" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/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.5/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.5/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.5/qtscript/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtscript/default.nix diff --git a/pkgs/development/libraries/qt-5/5.9/qtsensors.nix b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix new file mode 100644 index 000000000000..75829d3f0aaf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix @@ -0,0 +1,13 @@ +{ stdenv, qtSubmodule, qtbase, qtdeclarative }: + +with stdenv.lib; + +qtSubmodule { + name = "qtsensors"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtPluginPrefix" "$bin" + moveToOutput "$qtQmlPrefix" "$bin" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix new file mode 100644 index 000000000000..925e8a808f25 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix @@ -0,0 +1,12 @@ +{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }: + +let inherit (lib) getLib optional; in + +qtSubmodule { + name = "qtserialport"; + qtInputs = [ qtbase ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + NIX_CFLAGS_COMPILE = + optional stdenv.isLinux + ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch new file mode 100644 index 000000000000..65bb64710ebd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch @@ -0,0 +1,22 @@ +Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h +=================================================================== +--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h ++++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h +@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++#endif + if (!udevLibrary->load()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++#endif + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; diff --git a/pkgs/development/libraries/qt-5/5.9/qtserialport/series b/pkgs/development/libraries/qt-5/5.9/qtserialport/series new file mode 100644 index 000000000000..83f4abf094e9 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtserialport/series @@ -0,0 +1 @@ +qtserialport-dlopen-udev.patch diff --git a/pkgs/development/libraries/qt-5/5.9/qtsvg.nix b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix new file mode 100644 index 000000000000..0e21cf89340a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix @@ -0,0 +1,10 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtsvg"; + qtInputs = [ qtbase ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtPluginPrefix" "$bin" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch similarity index 79% rename from pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch index e3db17e978c2..dfcba9045a75 100644 --- a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch +++ b/pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch @@ -1,6 +1,7 @@ -diff -Naur qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in ---- qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2016-11-03 09:31:16.000000000 +0100 -+++ qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2017-02-28 16:37:20.130457615 +0100 +Index: qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake.in +=================================================================== +--- qttools-opensource-src-5.8.0.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in ++++ qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake.in @@ -2,11 +2,10 @@ if (NOT TARGET Qt5::qcollectiongenerator) add_executable(Qt5::qcollectiongenerator IMPORTED) @@ -17,7 +18,7 @@ diff -Naur qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExt _qt5_Help_check_file_exists(${imported_location}) set_target_properties(Qt5::qcollectiongenerator PROPERTIES -@@ -17,11 +16,10 @@ +@@ -17,11 +16,10 @@ endif() if (NOT TARGET Qt5::qhelpgenerator) add_executable(Qt5::qhelpgenerator IMPORTED) @@ -33,10 +34,11 @@ diff -Naur qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExt _qt5_Help_check_file_exists(${imported_location}) set_target_properties(Qt5::qhelpgenerator PROPERTIES -diff -Naur qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in ---- qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in 2016-11-03 09:31:16.000000000 +0100 -+++ qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in 2017-02-28 16:35:40.470100681 +0100 -@@ -44,11 +44,10 @@ +Index: qttools-opensource-src-5.8.0/src/linguist/Qt5LinguistToolsConfig.cmake.in +=================================================================== +--- qttools-opensource-src-5.8.0.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in ++++ qttools-opensource-src-5.8.0/src/linguist/Qt5LinguistToolsConfig.cmake.in +@@ -44,11 +44,10 @@ endmacro() if (NOT TARGET Qt5::lrelease) add_executable(Qt5::lrelease IMPORTED) @@ -52,7 +54,7 @@ diff -Naur qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig _qt5_LinguistTools_check_file_exists(${imported_location}) set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +58,10 @@ +@@ -59,11 +58,10 @@ endif() if (NOT TARGET Qt5::lupdate) add_executable(Qt5::lupdate IMPORTED) @@ -68,7 +70,7 @@ diff -Naur qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig _qt5_LinguistTools_check_file_exists(${imported_location}) set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +72,10 @@ +@@ -74,11 +72,10 @@ endif() if (NOT TARGET Qt5::lconvert) add_executable(Qt5::lconvert IMPORTED) diff --git a/pkgs/development/libraries/qt-5/5.9/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix new file mode 100644 index 000000000000..8c231271607c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix @@ -0,0 +1,15 @@ +{ stdenv, qtSubmodule, copyPathsToStore, qtbase }: + +with stdenv.lib; + +qtSubmodule { + name = "qttools"; + qtInputs = [ qtbase ]; + outputs = [ "out" "dev" "bin" ]; + patches = copyPathsToStore (readPathsFromFile ./. ./series); + # qmake moves all binaries to $dev in preFixup + postFixup = '' + moveToOutput "bin/qdbus" "$bin" + moveToOutput "bin/qtpaths" "$bin" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/series b/pkgs/development/libraries/qt-5/5.9/qttools/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/qttools/series rename to pkgs/development/libraries/qt-5/5.9/qttools/series diff --git a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix b/pkgs/development/libraries/qt-5/5.9/qttranslations.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.5/qttranslations.nix rename to pkgs/development/libraries/qt-5/5.9/qttranslations.nix diff --git a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix similarity index 59% rename from pkgs/development/libraries/qt-5/5.7/qtwayland.nix rename to pkgs/development/libraries/qt-5/5.9/qtwayland.nix index 6d887f7c650b..3e5deea7ec16 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix @@ -5,4 +5,9 @@ qtSubmodule { qtInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; nativeBuildInputs = [ pkgconfig ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtPluginPrefix" "$bin" + moveToOutput "$qtQmlPrefix" "$bin" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix similarity index 55% rename from pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix rename to pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix index fd7a3c52026e..50a539dbe729 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix @@ -3,5 +3,9 @@ qtSubmodule { name = "qtwebchannel"; qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; + postInstall = '' + moveToOutput "$qtQmlPrefix" "$bin" + ''; } 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 000000000000..1684e6aac707 --- /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 <"$out/bin/qt.conf" <"$NIX_QT5_TMP/bin/qt.conf" <> "$NIX_QT5_TMP/nix-support/qt-inputs" @@ -135,10 +136,14 @@ qt5LinkModuleDir() { qt5LinkDarwinModuleLibDir() { for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do + if [ ! -L "$fw" ]; then ln -s "$fw" "$NIX_QT5_TMP"/lib + fi done for file in $(find "$1"/lib -maxdepth 1 -type f); do + if [ ! -L "$file" ]; then ln -s "$file" "$NIX_QT5_TMP"/lib + fi done for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir") @@ -178,4 +183,3 @@ _qtFixCMakePaths() { if [ -n "$NIX_QT_SUBMODULE" ]; then postInstallHooks+=(_qtFixCMakePaths) fi - diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh index 47d196cec26b..e7752af43975 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh @@ -1,71 +1,55 @@ -addToSearchPathOnceWithCustomDelimiter() { - local delim="$1" - local search="$2" - local target="$3" - local dirs - local exported - IFS="$delim" read -a dirs <<< "${!search}" - local canonical - if canonical=$(readlink -e "$target"); then - for dir in ${dirs[@]}; do - if [ "z$dir" == "z$canonical" ]; then exported=1; fi - done - if [ -z $exported ]; then - eval "export ${search}=\"${!search}${!search:+$delim}$canonical\"" +qtPluginPrefix=@qtPluginPrefix@ +qtQmlPrefix=@qtQmlPrefix@ +qtDocPrefix=@qtDocPrefix@ + +NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" +NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" + +providesQtRuntime() { + [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] +} + +# Propagate any runtime dependency of the building package. +# Each dependency is propagated to the user environment and as a build +# input so that it will be re-propagated to the user environment by any +# package depending on the building package. (This is necessary in case +# the building package does not provide runtime dependencies itself and so +# would not be propagated to the user environment.) +_qtCrossEnvHook() { + if providesQtRuntime "$1"; then + propagatedBuildInputs+=" $1" + propagatedUserEnvPkgs+=" $1" + fi +} +if [ -z "$NIX_QT5_TMP" ]; then + crossEnvHooks+=(_qtCrossEnvHook) +fi + +_qtEnvHook() { + if providesQtRuntime "$1"; then + propagatedNativeBuildInputs+=" $1" + if [ -z "$crossConfig" ]; then + propagatedUserEnvPkgs+=" $1" fi fi } +if [ -z "$NIX_QT5_TMP" ]; then + envHooks+=(_qtEnvHook) +fi -addToSearchPathOnce() { - addToSearchPathOnceWithCustomDelimiter ':' "$@" -} - -propagateOnce() { - addToSearchPathOnceWithCustomDelimiter ' ' "$@" -} - -_qtPropagate() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedBuildInputs "$1" - break - fi - done - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" -} - -crossEnvHooks+=(_qtPropagate) - -_qtPropagateNative() { - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do - if [ -d "$1/$dir" ]; then - propagateOnce propagatedNativeBuildInputs "$1" - break - fi - done - if [ -z "$crossConfig" ]; then - addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" - fi -} - -envHooks+=(_qtPropagateNative) - -_qtMultioutDevs() { - # This is necessary whether the package is a Qt module or not +_qtPreFixupHook() { moveToOutput "mkspecs" "${!outputDev}" } +if [ -z "$NIX_QT5_TMP" ]; then + preFixupHooks+=(_qtPreFixupHook) +fi -preFixupHooks+=(_qtMultioutDevs) - -_qtSetCMakePrefix() { - export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" -} - -_qtRmTmp() { +_qtPostInstallHook() { + # Clean up temporary installation files created by this setup hook. + # For building Qt modules, this is necessary to prevent including + # dependencies in the output. For all other packages, this is necessary + # to induce patchelf to remove the temporary paths from the RPATH of + # dynamically-linked objects. if [ -z "$NIX_QT_SUBMODULE" ]; then rm -fr "$NIX_QT5_TMP" else @@ -83,11 +67,52 @@ _qtRmTmp() { rm "$NIX_QT5_TMP/nix-support/qt-inputs" fi + + # Patch CMake modules + if [ -n "$NIX_QT_SUBMODULE" ]; then + find "${!outputLib}" -name "*.cmake" | while read file; do + substituteInPlace "$file" \ + --subst-var-by NIX_OUT "${!outputLib}" \ + --subst-var-by NIX_DEV "${!outputDev}" \ + --subst-var-by NIX_BIN "${!outputBin}" + done + fi +} +if [ -z "$NIX_QT5_TMP" ]; then + preConfigureHooks+=(_qtPreConfigureHook) +fi + +_qtLinkModuleDir() { + if [ -d "$1/$2" ]; then + @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2" + find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + fi } -_qtSetQmakePath() { +_qtPreConfigureHook() { + # Find the temporary qmake executable first. + # This must run after all the environment hooks! export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH" + + # Link all runtime module dependencies into the temporary directory. + IFS=: read -a modules <<< $NIX_QT5_MODULES + for module in ${modules[@]}; do + _qtLinkModuleDir "$module" "lib" + done + + # Link all the build-time module dependencies into the temporary directory. + IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV + for module in ${modules[@]}; do + _qtLinkModuleDir "$module" "bin" + _qtLinkModuleDir "$module" "include" + _qtLinkModuleDir "$module" "lib" + _qtLinkModuleDir "$module" "mkspecs" + _qtLinkModuleDir "$module" "share" + done } +if [ -z "$NIX_QT5_TMP" ]; then + postInstallHooks+=(_qtPostInstallHook) +fi if [ -z "$NIX_QT5_TMP" ]; then if [ -z "$NIX_QT_SUBMODULE" ]; then @@ -95,7 +120,6 @@ if [ -z "$NIX_QT5_TMP" ]; then else NIX_QT5_TMP=$out fi - postInstallHooks+=(_qtRmTmp) mkdir -p "$NIX_QT5_TMP/nix-support" for subdir in bin include lib mkspecs share; do @@ -103,64 +127,18 @@ if [ -z "$NIX_QT5_TMP" ]; then echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs" done - postHooks+=(_qtSetCMakePrefix) - cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin" echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs" cat >"$NIX_QT5_TMP/bin/qt.conf" <> "$NIX_QT5_TMP/nix-support/qt-inputs" export QMAKE="$NIX_QT5_TMP/bin/qmake" - - # Set PATH to find qmake first in a preConfigure hook - # It must run after all the envHooks! - preConfigureHooks+=(_qtSetQmakePath) fi -qt5LinkModuleDir() { - if [ -d "$1/$2" ]; then - @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2" - find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs" - fi -} - -NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" -NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" - -_qtLinkAllModules() { - IFS=: read -a modules <<< $NIX_QT5_MODULES - for module in ${modules[@]}; do - qt5LinkModuleDir "$module" "lib" - done - - IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV - for module in ${modules[@]}; do - qt5LinkModuleDir "$module" "bin" - qt5LinkModuleDir "$module" "include" - qt5LinkModuleDir "$module" "lib" - qt5LinkModuleDir "$module" "mkspecs" - qt5LinkModuleDir "$module" "share" - done -} - -preConfigureHooks+=(_qtLinkAllModules) - -_qtFixCMakePaths() { - find "${!outputLib}" -name "*.cmake" | while read file; do - substituteInPlace "$file" \ - --subst-var-by NIX_OUT "${!outputLib}" \ - --subst-var-by NIX_DEV "${!outputDev}" - done -} - -if [ -n "$NIX_QT_SUBMODULE" ]; then - postInstallHooks+=(_qtFixCMakePaths) -fi diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix new file mode 100644 index 000000000000..a03ddb9b78a1 --- /dev/null +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }: + +stdenv.mkDerivation rec { + name = "qtinstaller"; + + propagatedBuildInputs = [ qtdeclarative qttools ]; + nativeBuildInputs = [ qmake ]; + + version = "2.0.3"; + src = fetchurl { + url = "http://download.qt.io/official_releases/qt-installer-framework/${version}/qt-installer-framework-opensource-${version}-src.tar.gz"; + sha256 = "003gwjg02isw8qjyka377g1ahlisfyi44l6xfa4hvvdgqqq0hy2f"; + name = "qt-installer-framework-opensource-src-${version}.tar.gz"; + }; + + outputs = [ "out" "dev" "doc" ]; + + setOutputFlags = false; + enableParallelBuilding = true; + NIX_QT_SUBMODULE = true; + + installPhase = '' + mkdir -p $out/{bin,lib,share/qt-installer-framework} + cp -a bin/{archivegen,binarycreator,devtool,installerbase,repogen} $out/bin + cp -a lib/{libinstaller.so*,lib7z.a} $out/lib + cp -a examples $out/share/qt-installer-framework/ + ''; + + postFixup = '' + moveToOutput "bin/archivegen" "$out" + moveToOutput "bin/binarycreator" "$out" + moveToOutput "bin/devtool" "$out" + moveToOutput "bin/installerbase" "$out" + moveToOutput "bin/repogen" "$out" + moveToOutput "share" "$doc" + moveToOutput "lib/libinstaller.so" "$out" + moveToOutput "lib/libinstaller.so.1" "$out" + moveToOutput "lib/libinstaller.so.1.0" "$out" + moveToOutput "lib/libinstaller.so.1.0.0" "$out" + ''; + + meta = { + description = ''Qt installer framework''; + inherit (qtbase.meta) platforms license homepage; + }; +} diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 3221fec4b4bc..103b495f8e2c 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { description = "QtScript bindings generator"; homepage = http://code.google.com/p/qtscriptgenerator/; inherit (qt4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index addc13a8c968..1be83731f202 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, qmakeHook, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }: stdenv.mkDerivation rec { - name = "qtstyleplugins-2016-12-01"; + name = "qtstyleplugins-2017-03-11"; src = fetchFromGitHub { owner = "qt"; repo = "qtstyleplugins"; - rev = "7aa47640c202cc4a9c16aa7df98191236743c8ba"; - sha256 = "0pysgn5yhbh85rv7syvf2w9g1gj1z1nwspjri39dc95vj108lin5"; + rev = "335dbece103e2cbf6c7cf819ab6672c2956b17b3"; + sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy"; }; - buildInputs = [ qmakeHook pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ gtk2 ]; installPhase = '' make INSTALL_ROOT=$NIX_QT5_TMP install diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index fbb2ffdd83b8..201eb4e7ec9b 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmakeHook, qtwebkit, hunspell }: +{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: stdenv.mkDerivation { name = "qtwebkit-plugins-2015-05-09"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m"; }; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtwebkit hunspell ]; postPatch = '' - sed -i "s,-lhunspell,-lhunspell-1.3," src/spellcheck/spellcheck.pri - sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/lib/qt5/plugins," src/src.pro + sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri + sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 7fbbf27c8eba..4379f5cf667b 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qtbase, qmakeHook }: +{ fetchurl, stdenv, zip, zlib, qtbase, qmake }: stdenv.mkDerivation rec { name = "quazip-0.7.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "cd quazip"; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; meta = { description = "Provides access to ZIP archives from Qt programs"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index cd940b818e92..314ab0f9e611 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook }: +{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { name = "qwt-6.1.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; - nativeBuildInputs = [ qmakeHook ]; + nativeBuildInputs = [ qmake ]; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index 7774ab7df9ec..0315ae72709e 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; branch = "6"; }; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 32fff70ebfba..cc7c7a31e1df 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchFromGitHub, zlib, perl }: +{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }: stdenv.mkDerivation rec { - name = "rdkafka-2015-11-03"; + name = "rdkafka-${version}"; + version = "0.9.5"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; - rev = "3e1babf4f26a7d12bbd272c1cdf4aa6a44000d4a"; - sha256 = "1vmbbkgdwxr25wz60hi6rhqb843ipz34r9baygv87fwh3lwwkqwl"; + rev = "v${version}"; + sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn"; }; - buildInputs = [ zlib perl ]; + buildInputs = [ zlib perl pkgconfig python ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ]; + postPatch = '' patchShebangs . ''; @@ -22,7 +25,7 @@ stdenv.mkDerivation rec { description = "librdkafka - Apache Kafka C/C++ client library"; homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ boothead wkennington ]; }; } diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index 65ab4ed24cec..2c800e23b27f 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, stdenv, ncurses +, buildPlatform, hostPlatform +}: stdenv.mkDerivation (rec { name = "readline-6.2"; @@ -57,6 +59,6 @@ stdenv.mkDerivation (rec { // # Don't run the native `strip' when cross-compiling. -(if (stdenv ? cross) +(if hostPlatform != buildPlatform then { dontStrip = true; } else { })) diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 80cc7e923b83..822ce7b0055d 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, stdenv, ncurses +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "readline-6.3p08"; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { import ./readline-6.3-patches.nix patch); # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv ? cross; + dontStrip = hostPlatform != buildPlatform; bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 9d1c1c57f8c1..7cc76e087685 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, stdenv, ncurses +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "readline-${version}"; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { */ # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv ? cross; + dontStrip = hostPlatform != buildPlatform; bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 25aeb3a6da1b..a791c8994856 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -6,6 +6,8 @@ # Malloc implementation , jemalloc ? null, gperftools ? null + +, enableLite ? false }: let @@ -35,6 +37,9 @@ stdenv.mkDerivation rec { CMAKE_CXX_FLAGS = "-std=gnu++11"; JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; + ${if enableLite then "LIBNAME" else null} = "librocksdb_lite"; + ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; + buildFlags = [ "DEBUG_LEVEL=0" "shared_lib" diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix new file mode 100644 index 000000000000..50f4d74d15cb --- /dev/null +++ b/pkgs/development/libraries/safefile/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "safefile"; + version = "1.0.5"; + + src = fetchurl { + url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz"; + sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; + }; + + buildInputs = []; + + passthru = { + updateScript = '' + cd ${toString ./.} + ${toString } default.nix + ''; + }; + + meta = { + inherit version; + description = "File open routines to safely open a file when in the presence of an attack"; + license = stdenv.lib.licenses.asl20 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://research.cs.wisc.edu/mist/safefile/"; + updateWalker = true; + }; +} diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix new file mode 100644 index 000000000000..06550372ba8a --- /dev/null +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, itk, python }: + +stdenv.mkDerivation rec { + _name = "elastix"; + _version = "4.8"; + name = "${_name}-${_version}"; + + src = fetchFromGitHub { + owner = "SuperElastix"; + repo = "elastix"; + rev = "ef057ff89233822b26b04b31c3c043af57d5deff"; + sha256 = "0gm3a8dgqww50h6zld9ighjk92wlpybpimjwfz4s5h82vdjsvxrm"; + }; + + nativeBuildInputs = [ cmake python ]; + buildInputs = [ itk ]; + + cmakeFlags = [ "-DUSE_KNNGraphAlphaMutualInformationMetric=OFF" ]; + + checkPhase = "ctest"; + + meta = with stdenv.lib; { + homepage = http://elastix.isi.uu.nl/; + description = "Image registration toolkit based on ITK"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 29fb338c8389..a74905b5ba1d 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib, bzip2, lzma, curl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "${major}.0"; pname = "htslib"; - version = "1.3.2"; + major = "1.4"; src = fetchurl { - url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0iq3blw23s55vkr1z88p9y2dqrb2dybzhl6hz2nlk53ncihrxcdr"; + url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2"; + sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w"; }; - buildInputs = [ zlib ]; + buildInputs = [ zlib bzip2 lzma curl ]; + + configureFlags = "--enable-libcurl"; # optional but strongly recommended + + installFlags = "prefix=$(out)"; meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data"; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index ce35743e8bc6..6f729e8a0b2a 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -46,6 +46,13 @@ stdenv.mkDerivation rec { ln -s libblas.so.${version} "$out/lib/libblas.so" ''; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + for fn in $(find $out/lib -name "*.so*"); do + if [ -L "$fn" ]; then continue; fi + install_name_tool -id "$fn" "$fn" + done + ''; + meta = { description = "Basic Linear Algebra Subprograms"; license = stdenv.lib.licenses.publicDomain; diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix index 6d3faa2fb7ff..ae568bc6db17 100644 --- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix +++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix @@ -5,6 +5,7 @@ , blas , boost , python +, ocl-icd , cudatoolkit , nvidia_x11 , gtest @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { gfortran blas python + ocl-icd cudatoolkit nvidia_x11 gtest diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index fbe11db165f2..6f3f78e55018 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation { ''PREFIX="''$(out)"'' "NUM_THREADS=64" "INTERFACE64=${if blas64 then "1" else "0"}" + "NO_STATIC=1" ] ++ mapAttrsToList (var: val: var + "=" + val) config; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 070e2b1be1f9..7e71eafef697 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { "LAPACK=" ]; - NIX_CFLAGS = "-fPIC"; - meta = with stdenv.lib; { homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; description = "A suite of sparse matrix algorithms"; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 99f54cebddd1..f38de0884244 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gfortran, openblas }: +{ stdenv, fetchurl, gfortran, openblas +, enableCuda ? false, cudatoolkit +}: let version = "4.4.4"; @@ -28,6 +30,21 @@ stdenv.mkDerivation { + stdenv.lib.optionalString stdenv.isDarwin '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' + '' + + stdenv.lib.optionalString enableCuda '' + sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ + -e 's|^[[:space:]]*\(CUDA_ROOT =\)|CUDA_ROOT = ${cudatoolkit}|' \ + -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \ + -e 's|^[[:space:]]*\(GPU_CONFIG =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \ + -e 's|^[[:space:]]*\(CUDA_PATH =\)|CUDA_PATH = $(CUDA_ROOT)|' \ + -e 's|^[[:space:]]*\(CUDART_LIB =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \ + -e 's|^[[:space:]]*\(CUBLAS_LIB =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \ + -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \ + -e 's|^[[:space:]]*\(NV20 =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \ + -e 's|^[[:space:]]*\(NV30 =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \ + -e 's|^[[:space:]]*\(NV35 =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \ + -e 's|^[[:space:]]*\(NVCC =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \ + -e 's|^[[:space:]]*\(NVCCFLAGS =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|' ''; makeFlags = [ @@ -38,7 +55,7 @@ stdenv.mkDerivation { "LAPACK=" ]; - NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library @@ -47,7 +64,7 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - ''${CC} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse.${SHLIB_EXT} "$out"/lib/lib$i.${SHLIB_EXT} diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index d68503298fc0..0023427f1bab 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "serd-${version}"; - version = "0.24.0"; + version = "0.26.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "0v3a9xss5ailrnb3flfjyl6l9pmp51dc02p0lr6phvwsipg8mywc"; + sha256 = "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73"; }; buildInputs = [ pcre pkgconfig python ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix new file mode 100644 index 000000000000..529dee9376a9 --- /dev/null +++ b/pkgs/development/libraries/shapelib/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, proj }: + +stdenv.mkDerivation rec { + name = "shapelib-1.4.0"; + + src = fetchurl { + url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; + sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; + }; + + buildInputs = [ proj ]; + + meta = with stdenv.lib; { + description = "C Library for reading, writing and updating ESRI Shapefiles"; + homepage = http://shapelib.maptools.org/; + license = licenses.gpl2; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix new file mode 100644 index 000000000000..f15c72498b25 --- /dev/null +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }: + +stdenv.mkDerivation rec { + name = "shibboleth-sp-${version}"; + version = "2.6.0"; + + src = fetchgit { + url = "https://git.shibboleth.net/git/cpp-sp.git"; + rev = "9ebba5c3a16d03769f436e383e4c4cdaa33f5509"; + sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; + }; + + buildInputs = [ boost fcgi openssl opensaml-cpp log4shib pkgconfig xercesc xml-security-c xml-tooling-c ]; + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ + "--without-apxs" + "--with-xmltooling=${xml-tooling-c}" + "--with-saml=${opensaml-cpp}" + "--with-fastcgi" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://shibboleth.net/products/service-provider.html"; + description = "Enables SSO and Federation web applications written with any programming language or framework"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = [ maintainers.jammerful ]; + }; +} diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 93142c269c2d..b87662a6e342 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.9.0"; + version = "2.4.0.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "1x52mgf39yiijsj63x0ibp6d3nj0d4z9k9lisa4rzsxs7846za4a"; + sha256 = "1sdzm2vd9mxlwxbmjajb6n1n13dpsavdap2nbbnyx4wnzixxx9k7"; }; dontDisableStatic = true; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { # Explicitly setting target ensures code can be compiled against a skalibs # binary built on a different version of darwin. # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/skalibs/; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index c4db48248f33..553ddb7d3b79 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }: stdenv.mkDerivation rec { - name = "slang-2.3.0"; + name = "slang-2.3.1a"; src = fetchurl { - url = "http://www.jedsoft.org/releases/slang/${name}.tar.gz"; - sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy"; + url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2"; + sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 7736eab511e9..4739c7363979 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://soprano.sourceforge.net/; description = "An object-oriented C++/Qt4 framework for RDF data"; license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + maintainers = with stdenv.lib.maintainers; [ sander ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 199c0d007344..602359965f12 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - hompage = http://www.speex.org/; + homepage = http://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 9ec7d651ccb2..a96e808a97e4 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { - hompage = http://www.speex.org/; + homepage = http://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 325d665aaf65..240de378afc7 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.32"; + name = "spice-gtk-0.33"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c"; + sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx"; }; buildInputs = [ diff --git a/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch b/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch deleted file mode 100644 index 8098f568e21a..000000000000 --- a/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 75e8685740199537bfefcbd9996ec3ff9f6342e6 Mon Sep 17 00:00:00 2001 -From: Graham Christensen -Date: Wed, 8 Feb 2017 21:58:43 -0500 -Subject: [PATCH] Adapting the following patch, from - http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d - -> From: Frediano Ziglio -> Date: Tue, 29 Nov 2016 16:46:56 +0000 -> Subject: [spice-server 3/3] main-channel: Prevent overflow reading messages -> from client -> -> Caller is supposed the function return a buffer able to store -> size bytes. -> -> Signed-off-by: Frediano Ziglio -> Acked-by: Christophe Fergeau -> --- -> server/main-channel.c | 3 +++ -> 1 file changed, 3 insertions(+) -> -> diff --git a/server/main-channel.c b/server/main-channel.c -> index 24dd448..1124506 100644 -> --- a/server/main-channel.c -> +++ b/server/main-channel.c -> @@ -258,6 +258,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, -> -> if (type == SPICE_MSGC_MAIN_AGENT_DATA) { -> return reds_get_agent_data_buffer(red_channel_get_server(channel), mcc, size); -> + } else if (size > sizeof(main_chan->recv_buf)) { -> + /* message too large, caller will log a message and close the connection */ -> + return NULL; -> } else { -> return main_chan->recv_buf; -> } -> -- -> 2.9.3 -> --- - server/main_channel.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/server/main_channel.c b/server/main_channel.c -index 0ecc9df..1fc3915 100644 ---- a/server/main_channel.c -+++ b/server/main_channel.c -@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, - - if (type == SPICE_MSGC_MAIN_AGENT_DATA) { - return reds_get_agent_data_buffer(mcc, size); -+ } else if (size > sizeof(main_chan->recv_buf)) { -+ /* message too large, caller will log a message and close the connection */ -+ return NULL; - } else { - return main_chan->recv_buf; - } --- -2.10.0 diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 61952c3b3238..808bfd4f811d 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -6,14 +6,15 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.12.8"; + name = "spice-0.13.3"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr"; + sha256 = "17mqgwamdhj8sx8vhahrjl5937x693kjnw6cp6v0akjrwz011xrh"; }; patches = [ + # the following three patches fix CVE-2016-9577 and CVE-2016-9578 (fetchpatch { name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch"; url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; @@ -24,9 +25,11 @@ stdenv.mkDerivation rec { url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5"; }) - # Originally from http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d - # but main-channel.c was renamed to main_channel.c - ./0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch + (fetchpatch { + name = "0003-main-channel-Prevent-overflow-reading-messages-from.patch"; + url = "https://cgit.freedesktop.org/spice/spice/patch/?id=1d3e26c0ee75712fa4bbbcfa09d8d5866b66c8af"; + sha256 = "030mm551aipck99rqiz39vsvk071pn8715zynr5j6chwzgpflwm3"; + }) ]; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index a80317162302..21d89c49e7c7 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,14 +3,15 @@ assert interactive -> 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/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index d450cd21aecd..e5fffc076f7b 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.17.0"; + name = "sqlite3_analyzer-3.19.2"; src = fetchurl { - url = "https://www.sqlite.org/2017/sqlite-src-3170000.zip"; - sha256 = "1hs8nzk2pjr4fhhrwcyqwpa24gd4ndp6f0japykg5wfadgp4nxc6"; + url = "https://www.sqlite.org/2017/sqlite-src-3190200.zip"; + sha256 = "1hdbs41mdyyy641gix87pllsd29p8dim7gj4qvmiyfra2q5kg749"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index ba213dc98e76..27194aabd1bb 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { "--disable-debug" ] ++ optional (openssl != null) "--enable-openssl"; + buildFlags = [ "shared_library" ]; + postInstall = '' rm -rf $out/bin ''; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index faba57d155fb..1961160cbc95 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://strigi.sourceforge.net; description = "A very fast and efficient crawler to index data on your harddrive"; license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + maintainers = with stdenv.lib.maintainers; [ sander ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 41087044e49d..71b8a764eed1 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "A library for reading and editing the meta-data of several popular audio formats"; inherit (cmake.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 0937b2fe8cfe..602aab852ccc 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "A library for reading and editing the meta-data of several popular audio formats"; inherit (cmake.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix deleted file mode 100644 index d8bea7f14e3e..000000000000 --- a/pkgs/development/libraries/tclgpg/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }: - -stdenv.mkDerivation rec { - name = "tclgpg-${version}"; - version = "1.0pre"; - - src = fetchsvn { - url = "http://tclgpg.googlecode.com/svn/trunk"; - rev = 74; - sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5"; - }; - - configureFlags = "--with-tcl=" + tcl + "/lib " - + "--with-tclinclude=" + tcl + "/include "; - - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in - autoreconf -vfi - ''; - - prePatch = '' - sed -i -e 's|\[auto_execok gpg\]|"${gnupg}/bin/gpg2"|' tclgpg.tcl - ''; - - passthru = { - libPrefix = "gpg1.0"; - }; - - buildInputs = [ autoconf automake tcl tcllib ]; - - meta = { - homepage = http://code.google.com/p/tclgpg/; - description = "A Tcl interface to GNU Privacy Guard"; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 64afde3c53bd..315566851fb5 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -10,11 +10,11 @@ assert xor (openssl != null) (gnutls != null); assert !(xor (openssl != null) (zlib != null)); stdenv.mkDerivation rec { - name = "ucommon-6.3.1"; + name = "ucommon-7.0.0"; src = fetchurl { url = "mirror://gnu/commoncpp/${name}.tar.gz"; - sha256 = "1marbwbqnllhm9nh22lvyfjy802pgy1wx7j7kkpkasbm9r0sb6mm"; + sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 09909f6546a4..8fa974a95e24 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.23"; + name = "udunits-2.2.24"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "0ya93jrv8qzfkdj77grl4dpyb0ap4jccmqx3rkkgaggnklhjfwkr"; + sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0"; }; nativeBuildInputs = [ bison flex file ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix new file mode 100644 index 000000000000..fdf882ce817e --- /dev/null +++ b/pkgs/development/libraries/umockdev/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook +, pkgconfig, glib, systemd, libgudev, vala }: + +stdenv.mkDerivation rec { + name = "umockdev"; + version = "0.8.13"; + + src = fetchFromGitHub { + owner = "martinpitt"; + repo = "umockdev"; + rev = version; + sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k"; + }; + + buildInputs = [ glib systemd libgudev vala ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + ### docs/gtk-doc.make not found + prePatch = '' + sed -i 's|include $(top_srcdir)/docs/gtk-doc.make||g' docs/reference/Makefile.am + sed -i 's|+=|=|g' docs/reference/Makefile.am + ''; + + meta = with stdenv.lib; { + description = "Mock hardware devices for creating unit tests"; + license = licenses.lgpl2; + maintainers = [ maintainers.ndowens ]; + }; +} diff --git a/pkgs/development/libraries/urt/default.nix b/pkgs/development/libraries/urt/default.nix deleted file mode 100644 index 090ca28d7c45..000000000000 --- a/pkgs/development/libraries/urt/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{stdenv, fetchurl, ncompress}: - -stdenv.mkDerivation rec { - name = "urt-${version}"; - version = "3.1b"; - - src = fetchurl { - url = ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z; - sha256 = "0hbb3avgvkfb2cksqn6cmmgcr0278nb2qd1srayqx0876pq6g2vd"; - }; - - buildInputs = [ ncompress ]; - - unpackPhase = '' - mkdir urt - tar xvf "$src" -C urt - ''; - patchFlags = "-p0 -d urt"; - patches = [ ./urt-3.1b-build-fixes.patch ./urt-3.1b-compile-updates.patch - ./urt-3.1b-make.patch ./urt-3.1b-rle-fixes.patch ./urt-3.1b-tempfile.patch ]; - postPatch = '' - cd urt - - rm bin/README - rm man/man1/template.1 - - # stupid OS X declares a stack_t type already - sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c - - sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr - - cp "${./gentoo-config}" config/gentoo - ''; - configurePhase = '' - ./Configure config/gentoo - ''; - postInstall = '' - mkdir -p $out/bin - cp bin/* $out/bin - - mkdir -p $out/lib - cp lib/librle.a $out/lib - - mkdir -p $out/include - cp include/rle*.h $out/include - - mkdir -p $out/share/man/man1 - cp man/man1/*.1 $out/share/man/man1 - - mkdir -p $out/share/man/man3 - cp man/man3/*.3 $out/share/man/man3 - - mkdir -p $out/share/man/man5 - cp man/man5/*.5 $out/share/man/man5 - ''; - - meta = { - homepage = http://www.cs.utah.edu/gdc/projects/urt/; - description = "A library for dealing with raster images"; - }; -} \ No newline at end of file diff --git a/pkgs/development/libraries/urt/gentoo-config b/pkgs/development/libraries/urt/gentoo-config deleted file mode 100644 index a2d9ec3faf2f..000000000000 --- a/pkgs/development/libraries/urt/gentoo-config +++ /dev/null @@ -1,52 +0,0 @@ -#define ABEKASA60 -#define ABEKASA62 -#define ALIAS -##define CGM -#define CUBICOMP -##define DVIRLE -#define GRAYFILES -#define MACPAINT -##define PBMPLUS -##define SUNRASTER -#define TARGA -#define VICAR -#define WASATCH -#define WAVEFRONT - -#define GCC - -#define CONST_DECL -#define NO_MAKE_MAKEFILE -#define USE_TIME_H -#define SYS_V_SETPGRP -#define USE_PROTOTYPES -#define USE_RANDOM -#define USE_STDARG -#define USE_STDLIB_H -#define USE_UNISTD_H -#define USE_STRING_H -#define VOID_STAR -#define USE_XLIBINT_H -#define X_SHARED_MEMORY - -#defpath DEST bin -#defpath RI include -#defpath RL lib - -ROFF = nroff -ROFFOPT = -man -ROFFPIPE = | lpr - -INCTIFF = -LIBTIFF = -ltiff -INCX11 = -LIBX11 = -lX11 - -# Most people have migrated X11 to /usr/lib, but just in case ... -check_x11=$(shell \ - echo 'int main(){}' > test.c ; \ - if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \ - echo "-L/usr/X11R6/lib" ; \ - fi ; \ - rm -f .urt-x11-test test.c) -LIBX11 += $(call check_x11) diff --git a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch deleted file mode 100644 index fc2bacddb30c..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch +++ /dev/null @@ -1,151 +0,0 @@ -some hosts are more anal about ar usage than others -http://bugs.gentoo.org/107428 - -respect user LDFLAGS -http://bugs.gentoo.org/126872 - ---- lib/makefile.src -+++ lib/makefile.src -@@ -181,8 +181,7 @@ - # Rebuild the library from all the .o files. - buildlib: $(OBJS) - -rm -f $(LIBNAME) -- ar rc $(LIBNAME) -- ar q $(LIBNAME) $(OBJS) -+ ar rc $(LIBNAME) $(OBJS) - #ifndef NO_RANLIB - ranlib $(LIBNAME) - #endif ---- tools/clock/makefile.src -+++ tools/clock/makefile.src -@@ -6,7 +6,7 @@ install: rleClock - mv rleClock ../rleClock.out - - rleClock:rleClock.o font.o -- ${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock -+ ${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm - - font.c:font.src makeFont - chmod +x makeFont ---- tools/makefile.src -+++ tools/makefile.src -@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h - pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h - $(CC) $(CFLAGS) pyrlib.c -c - pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h -- $(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new - mv pyrmask.new pyrmask.out - - fant.out: fant.o mallocNd.o -- $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new - mv fant.new fant.out - - # rlebox and crop use some common code. - rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h - - crop.out: crop.c rle_box.o -- ${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new -+ ${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new - mv crop.new crop.out - rlebox.out: rlebox.c rle_box.o -- ${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new -+ ${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new - mv rlebox.new rlebox.out - - # rleClock has it's own directory, must be built special -@@ -100,7 +100,7 @@ clean: clean-pgm - .SUFFIXES: - .SUFFIXES: .out .c .o - .c.out: -- $(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new -+ $(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new - mv $*.new $@ - - .c.o: ---- cnv/makefile.src -+++ cnv/makefile.src -@@ -76,13 +76,13 @@ PBMDIR = - # ppmtorle - ppm format to RLE - # rletoppm - RLE to ppm format - pgmtorle.out: pgmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - ppmtorle.out: ppmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - rletoppm.out: rletoppm.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - #endif - -@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c - # iristorle/rletoiris - Convert between RLE and SGI image format. - # - iristorle.out: iristorle.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - rletoiris.out: rletoiris.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - #endif - -@@ -108,10 +108,10 @@ TIFFDIR = - # tifftorle - Convert TIFF images to RLE - # rletotiff - Convert RLE images to TIFF - rletotiff.out: rletotiff.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - tifftorle.out: tifftorle.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - #endif - -@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c - # Will build with the default rule. - # rletorla - RLE to Wavefront RLA - rletorla.out: rletorla.c -- $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new - mv $*.new $@ - #endif WAVEFRONT - -@@ -144,7 +144,7 @@ pristine: pristine-pgm - .SUFFIXES: - .SUFFIXES: .out .c - .c.out: -- $(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new - mv $*.new $@ - - # Dependency lines. Make sure to #ifdef them. ---- cnv/rletoabA62/makefile.src -+++ cnv/rletoabA62/makefile.src -@@ -15,7 +15,7 @@ all : $(PGMS) - # Executables. The .out will be stripped off in the install action. - - rletoabA62.out : rletoabA62.o rle.o -- $(CC) $(CFLAGS) -o rletoabA62.new \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \ - rletoabA62.o rle.o $(LIBS) - mv rletoabA62.new rletoabA62.out - ---- cnv/rletogif/makefile.src -+++ cnv/rletogif/makefile.src -@@ -15,7 +15,7 @@ all: $(PGMS) - # The executable. The ".out" will be stripped off in the install action. - - rletogif.out: ${OBJ} -- ${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new -+ ${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new - mv rletogif.new rletogif.out - - # Incremental install, copies executable to DEST dir. diff --git a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch b/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch deleted file mode 100644 index 105f7c41f6a7..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- get/getx11/XGetHClrs.c -+++ get/getx11/XGetHClrs.c -@@ -1,5 +1,4 @@ - #ifndef XLIBINT_H_NOT_AVAILABLE --#include - - /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ - /* Copyright Massachusetts Institute of Technology 1986 */ ---- tools/mallocNd.c -+++ tools/mallocNd.c -@@ -67,7 +67,7 @@ - - /* Imports */ - #include --extern char *malloc(); -+#include - - /* Forward declarations */ - char *BuildIndirectionTable(); ---- tools/into.c -+++ tools/into.c -@@ -40,8 +40,8 @@ - static char buf[MAXPATHLEN+1]; - short forceflg; /* overwrite an unwritable file? */ - --extern int errno; --extern char *sys_errlist[]; -+#include -+#include - - void - main(argc, argv) -@@ -103,7 +103,7 @@ - if (ferror(outf)) - { - fprintf(stderr, "into: %s, \"%s\" not modified\n", -- sys_errlist[errno], argv[1]); -+ strerror(errno), argv[1]); - unlink(buf); - exit(1); - } ---- cnv/tex/dvirle2.c -+++ cnv/tex/dvirle2.c -@@ -55,7 +55,6 @@ - void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks(); - - char *ProgName; --extern int errno; - extern char *optarg; - extern int optind; - ---- cnv/wasatchrle.c -+++ cnv/wasatchrle.c -@@ -32,7 +32,6 @@ - #include - #include "rle.h" - --extern int errno; - - /* "short" in our world is 16 bits. Beware of swyte-bopping. */ - ---- get/getx11/x11_stuff.c -+++ get/getx11/x11_stuff.c -@@ -155,7 +155,6 @@ - IPC_CREAT|0777 ); - if ( img->shm_img.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) -@@ -361,7 +360,6 @@ Boolean reallocate; - XDestroyImage( image ); - if ( img->shm_pix.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) ---- get/qcr/qcr.h -+++ get/qcr/qcr.h -@@ -6,8 +6,6 @@ - #define GREEN 1 - #define BLUE 2 - --extern int errno; -- - /* Command defs for QCR-Z Film Recorder */ - - /* These are for 8 bit Look Up Tables */ ---- get/gettaac.c -+++ get/gettaac.c -@@ -24,6 +24,7 @@ - * Send bug fixes and improvements to: ksp@maxwell.nde.swri.edu - */ - -+#include - #include - #include - #include -@@ -459,7 +460,6 @@ char *template; - char nonUnique; - char twiddleUserCompletion; - -- extern int errno; - struct direct *nameEntry; - DIR *dirChan; - struct passwd *pwdEntry; ---- tools/clock/rleClock.c -+++ tools/clock/rleClock.c -@@ -598,7 +598,7 @@ - { TRUE, "-tf", STRING, "Text area format string", (char *)&FormatString }, - { FALSE, "-Xm", BOOL, "Output the alpha channel on RGB", (char *)&DebugAlpha }, - { FALSE, "-D", BOOL, "Turn on debugging", (char *)&Debug }, -- NULL -+ { FALSE, NULL } - }; - - void ---- tools/to8.c -+++ tools/to8.c -@@ -175,7 +175,7 @@ - * Give it a background color of black, since the real background - * will be dithered anyway. - */ -- if ( in_hdr.background != NULL ) -+ if ( in_hdr.background != 0 ) - { - out_hdr.bg_color = (int *)malloc( sizeof( int ) ); - RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 ); ---- cnv/rletoabA62/rletoabA62.c -+++ cnv/rletoabA62/rletoabA62.c -@@ -157,7 +157,7 @@ - exit(1); - } - if (optind < argc) { -- if ((file = open(argv[optind], 0)) == NULL) { -+ if ((file = open(argv[optind], 0)) == -1) { - perror(argv[optind]); - exit(1); - } diff --git a/pkgs/development/libraries/urt/urt-3.1b-make.patch b/pkgs/development/libraries/urt/urt-3.1b-make.patch deleted file mode 100644 index 310675dd395d..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-make.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: makefile.src -=================================================================== ---- makefile.src -+++ makefile.src -@@ -17,7 +17,7 @@ all: default - # clean deletes all but source, pristine (below) deletes installed stuff, too - default clean: doit - @for d in $(DIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - # install puts library, binaries and documentation into global location -@@ -29,7 +29,7 @@ MAKE_TARGET = - - install $(MAKE_TARGET) pristine depend:: doit - @for d in $(ALLDIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - -Index: tools/makefile.src -=================================================================== ---- tools/makefile.src -+++ tools/makefile.src -@@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o - # rleClock has it's own directory, must be built special - - rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c -- (cd clock ; make) -+ (cd clock ; $(MAKE)) - - # Incremental install, copies everything ("$?") since last install to DEST dir. - install: $(PGMS) install-pgm -Index: makefile.tlr -=================================================================== ---- makefile.tlr -+++ makefile.tlr -@@ -7,7 +7,7 @@ subdirs: - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'set -e ; for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Make ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) ) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ - done' ; \ - else \ - true ; \ -@@ -46,7 +46,7 @@ install-subdirs: subdirs - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Install ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) install) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ - done' ; \ - else \ - true ; \ -@@ -105,7 +105,7 @@ pristine-pgm: clean-pgm - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Make ${HERE}$$dir pristine ; \ -- make $(MFLAGS) pristine); \ -+ $(MAKE) $(MFLAGS) pristine); \ - else \ - true; \ - fi; \ -@@ -124,7 +124,7 @@ clean-pgm: - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Clean ${HERE}$$dir ; \ -- make $(MFLAGS) clean); \ -+ $(MAKE) $(MFLAGS) clean); \ - else \ - true; \ - fi; \ diff --git a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch deleted file mode 100644 index 3720806960fe..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch +++ /dev/null @@ -1,203 +0,0 @@ -Fixes taken from netpbm - ---- lib/rle_global.c -+++ lib/rle_global.c -@@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = { - 8, /* cmaplen (log2 of length of color map) */ - NULL, /* pointer to color map */ - NULL, /* pointer to comment strings */ -- stdout, /* output file */ -+ NULL, /* output file -- must be set dynamically */ - { 7 }, /* RGB channels only */ - 0L, /* Can't free name and file fields. */ - "Urt", /* Default "program name". */ ---- lib/rle_hdr.c -+++ lib/rle_hdr.c -@@ -269,6 +273,9 @@ - { - rle_hdr *ret_hdr; - -+ rle_dflt_hdr.rle_file = stdout; -+ /* The rest of rle_dflt_hdr is set by the loader's data initialization */ -+ - if ( the_hdr == &rle_dflt_hdr ) - return the_hdr; - ---- lib/dither.c -+++ lib/dither.c -@@ -38,10 +38,10 @@ void make_square(); - #endif - - static int magic4x4[4][4] = { -- 0, 14, 3, 13, -- 11, 5, 8, 6, -- 12, 2, 15, 1, -- 7, 9, 4, 10 -+{ 0, 14, 3, 13}, -+{ 11, 5, 8, 6}, -+{ 12, 2, 15, 1}, -+{ 7, 9, 4, 10} - }; - - /* basic dithering macro */ ---- lib/rle_open_f.c -+++ lib/rle_open_f.c -@@ -9,7 +9,11 @@ - */ - - #include "rle_config.h" -+#define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */ -+ - #include -+#include -+#include - - #ifndef NO_OPEN_PIPES - /* Need to have a SIGCLD signal catcher. */ -@@ -260,7 +260,6 @@ - int pipefd[2]; - int i; - char *argv[4]; -- extern int errno; - - /* Check args. */ - if ( *mode != 'r' && *mode != 'w' ) ---- lib/rle_getcom.c -+++ lib/rle_getcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } ---- lib/scanargs.c -+++ lib/scanargs.c -@@ -128,10 +130,10 @@ - va_list argl; - { - -- register check; /* check counter to be sure all argvs -+ int check; /* check counter to be sure all argvs - are processed */ - register CONST_DECL char *cp; -- register cnt; -+ int cnt; - int optarg = 0; /* where optional args start */ - int nopt = 0; - char tmpflg, /* temp flag */ -@@ -375,11 +377,12 @@ - if ( optarg > 0 ) /* end optional args? */ - { - /* Eat the arg, too, if necessary */ -- if ( list_cnt == 0 ) -+ if ( list_cnt == 0 ) { - if ( typchr == 's' ) - (void)va_arg( argl, char * ); - else - (void)va_arg( argl, ptr ); -+ } - break; - } - else -@@ -567,7 +570,7 @@ - * Do conversion for n and N types - */ - tmpflg = typchr; -- if (typchr == 'n' || typchr == 'N' ) -+ if (typchr == 'n' || typchr == 'N' ) { - if (*argp != '0') - tmpflg = 'd'; - else if (*(argp+1) == 'x' || -@@ -578,6 +581,7 @@ - } - else - tmpflg = 'o'; -+ } - if (typchr == 'N') - tmpflg = toupper( tmpflg ); - ---- lib/inv_cmap.c -+++ lib/inv_cmap.c -@@ -42,7 +42,7 @@ - static long cbinc, cginc, crinc; - static unsigned long *gdp, *rdp, *cdp; - static unsigned char *grgbp, *rrgbp, *crgbp; --static gstride, rstride; -+static long gstride, rstride; - static long x, xsqr, colormax; - static int cindex; - #ifdef INSTRUMENT_IT ---- lib/rle_getrow.c -+++ lib/rle_getrow.c -@@ -351,7 +351,7 @@ - bzero( (char *)scanline[-1] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1 ); - for ( nc = 0; nc < the_hdr->ncolors; nc++ ) -- if ( RLE_BIT( *the_hdr, nc ) ) -+ if ( RLE_BIT( *the_hdr, nc ) ) { - /* Unless bg color given explicitly, use 0. */ - if ( the_hdr->background != 2 || the_hdr->bg_color[nc] == 0 ) - bzero( (char *)scanline[nc] + the_hdr->xmin, -@@ -360,6 +360,7 @@ - bfill( (char *)scanline[nc] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1, - the_hdr->bg_color[nc] ); -+ } - } - - /* If skipping, then just return */ -@@ -367,7 +368,7 @@ - { - the_hdr->priv.get.vert_skip--; - the_hdr->priv.get.scan_y++; -- if ( the_hdr->priv.get.vert_skip > 0 ) -+ if ( the_hdr->priv.get.vert_skip > 0 ) { - if ( the_hdr->priv.get.scan_y >= the_hdr->ymax ) - { - int y = the_hdr->priv.get.scan_y; -@@ -377,6 +378,7 @@ - } - else - return the_hdr->priv.get.scan_y; -+ } - } - - /* If EOF has been encountered, return also */ -@@ -457,11 +459,12 @@ - else - nc = DATUM(inst); - nc++; -- if ( debug_f ) -+ if ( debug_f ) { - if ( RLE_BIT( *the_hdr, channel ) ) - fprintf( stderr, "Pixel data %d (to %d):", nc, scan_x+nc ); - else - fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x+nc); -+ } - if ( RLE_BIT( *the_hdr, channel ) ) - { - /* Don't fill past end of scanline! */ ---- lib/rle_putcom.c -+++ lib/rle_putcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } diff --git a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch b/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch deleted file mode 100644 index 12acce151b5d..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/rlecat.c -+++ tools/rlecat.c -@@ -110,8 +110,14 @@ - nflag = 0; /* Not really repeating! */ - else - { -- mktemp( temp ); /* Make a temporary file name */ -- tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" ); -+ /* we dont have to use rle_open_f() because all it does in -+ * this case is run fopen() ... we're creating a file so all -+ * the checks for opening an existing file aren't needed */ -+ int fd = mkstemp(temp); -+ if (fd == -1 || (tmpfile = fdopen(fd, "w+")) == NULL) { -+ perror("Unable to open tempfile"); -+ exit(-1); -+ } - } - } - diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 76912f19ab5f..f4ec02422242 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb ]; propagatedBuildInputs = [ libusb ]; + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { description = "USB traffic redirection protocol"; homepage = http://spice-space.org/page/UsbRedir; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 6cef26d3aada..4a40806c4eb1 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 511129de1e8d..9c252004656c 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 91a8763d43f9..73f5febb6685 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/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2c6e818b4e12..00fb037168ea 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu -, patchelf, coreutils +, patchelf, coreutils, cctools , doCheck ? false , static ? false }: @@ -126,7 +126,13 @@ stdenv.mkDerivation rec { # Patch based off of: # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches - patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; + patches = lib.optional (!doCheck) ./libv8-5.4.232.patch + ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + + prePatch = '' + chmod +w tools/gyp/pylib/gyp + chmod +w tools/gyp/pylib/gyp/xcode_emulation.py + ''; postPatch = '' sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 @@ -152,12 +158,13 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu patchelf ]; + buildInputs = [ readline python icu patchelf ] + ++ stdenv.lib.optionals stdenv.isDarwin [ cctools ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; buildFlags = [ - "LINK=g++" + "LINK=c++" "-C out" "builddir=$(CURDIR)/Release" "BUILDTYPE=Release" @@ -174,7 +181,7 @@ stdenv.mkDerivation rec { install -vD out/Release/mksnapshot "$out/bin/mksnapshot" ${if static then "" else if stdenv.isDarwin then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib '' else '' @@ -190,7 +197,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Google's open source JavaScript engine"; maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/v8/no-xcode.patch b/pkgs/development/libraries/v8/no-xcode.patch new file mode 100644 index 000000000000..5562ffaf64e1 --- /dev/null +++ b/pkgs/development/libraries/v8/no-xcode.patch @@ -0,0 +1,64 @@ +--- a/tools/gyp/pylib/gyp/xcode_emulation.py ++++ a/tools/gyp/pylib/gyp/xcode_emulation.py +@@ -473,10 +473,16 @@ + + def _XcodeSdkPath(self, sdk_root): + if sdk_root not in XcodeSettings._sdk_path_cache: +- sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path') +- XcodeSettings._sdk_path_cache[sdk_root] = sdk_path +- if sdk_root: +- XcodeSettings._sdk_root_cache[sdk_path] = sdk_root ++ try: ++ sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path') ++ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path ++ if sdk_root: ++ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root ++ except: ++ # if this fails it's because xcodebuild failed, which means ++ # the user is probably on a CLT-only system, where there ++ # is no valid SDK root ++ XcodeSettings._sdk_path_cache[sdk_root] = None + return XcodeSettings._sdk_path_cache[sdk_root] + + def _AppendPlatformVersionMinFlags(self, lst): +@@ -606,10 +612,11 @@ + framework_root = sdk_root + else: + framework_root = '' +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) + + self.configname = None + return cflags +@@ -861,10 +868,11 @@ + sdk_root = self._SdkPath() + if not sdk_root: + sdk_root = '' +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) + + platform_root = self._XcodePlatformPath(configname) + if sdk_root and platform_root and self._IsXCTest(): +@@ -1358,7 +1366,7 @@ + if version: + version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] + else: +- raise GypError("No Xcode or CLT version detected!") ++ version = "7.0.0" + # The CLT has no build information, so we return an empty string. + version_list = [version, ''] + version = version_list[0] diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 9e85ad7413d0..6225fb18e280 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchsvn, eigen }: +{ stdenv, fetchFromGitHub, eigen }: stdenv.mkDerivation rec { - name = "vcg-2016-02-14"; + name = "vcg-${version}"; + version = "1.0.1"; - src = fetchsvn { - url = "svn://svn.code.sf.net/p/vcg/code/trunk/vcglib"; - rev = 5688; - sha256 = "0hkvz2d8prrjdcc7h0xhfd9hq86lmqg17ml045x4bkiciimx0w5s"; + src = fetchFromGitHub { + owner = "cnr-isti-vclab"; + repo = "vcglib"; + rev = "v${version}"; + sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; }; propagatedBuildInputs = [ eigen ]; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 083f4a9140a1..5b0bdb4ee741 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; + maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index a1b9ee03f23a..f62279786c66 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, mesa_noglu }: + libXext, wayland, mesa_noglu, makeWrapper }: let - version = "1.0.39.1"; + version = "1.0.42.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; - sha256 = "0y9zzrnjjjza2kkf5jfsdqhn98md6rsq0hb7jg62z2dipzky7zdp"; + sha256 = "0na1ax2cgv6w29213mby56mndfsj3iizj3n5pbpy4s4p7ij9kdgn"; }; in @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; inherit version src; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; @@ -26,8 +27,6 @@ stdenv.mkDerivation rec { "-DFALLBACK_DATA_DIRS=${mesa_noglu.driverLink}/share:/usr/local/share:/usr/share" ]; - patches = [ ./use-xdg-paths.patch ./fallback-paths.patch ]; - outputs = [ "out" "dev" "demos" ]; preConfigure = '' @@ -52,12 +51,16 @@ stdenv.mkDerivation rec { mkdir -p $demos/bin cp demos/*.spv demos/*.ppm $demos/bin find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \; - ''; + for p in cube cubepp; do + wrapProgram $demos/bin/$p --run "cd $demos/bin" + done + ''; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; homepage = "http://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; + maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/libraries/vulkan-loader/fallback-paths.patch b/pkgs/development/libraries/vulkan-loader/fallback-paths.patch deleted file mode 100644 index d8d9fdd3f5f1..000000000000 --- a/pkgs/development/libraries/vulkan-loader/fallback-paths.patch +++ /dev/null @@ -1,52 +0,0 @@ -commit a59b141559a8c1813da438b97e5f79eeb6cc7642 -Author: Benjamin Saunders -Date: Sun Feb 19 11:14:24 2017 -0800 - - loader: Configurable fallback search paths - - This makes it easier for non-FHS distributions to behave well when the loader - is used by a SUID process or in an otherwise unusual environment. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a43d264..d28b3f5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - find_package(PythonInterp 3 REQUIRED) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING -+ "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.") -+ set(FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" CACHE STRING -+ "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.") -+ - include(FindPkgConfig) - option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) - option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) -@@ -285,7 +290,10 @@ run_vk_xml_generate(dispatch_table_generator.py vk_dispatch_table_helper.h) - if(NOT WIN32) - include(GNUInstallDirs) - -+ add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}") -+ add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") - add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") -+ - # Make sure /etc is searched by the loader - if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) - add_definitions(-DEXTRASYSCONFDIR="/etc") -diff --git a/loader/loader.c b/loader/loader.c -index 81c37c4..83378eb 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -2644,9 +2644,9 @@ static VkResult loader_get_manifest_files(const struct loader_instance *inst, co - const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); - const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); - if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0') -- xdgconfdirs = "/etc/xdg"; -+ xdgconfdirs = FALLBACK_CONFIG_DIRS; - if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0') -- xdgdatadirs = "/usr/local/share:/usr/share"; -+ xdgdatadirs = FALLBACK_DATA_DIRS; - const size_t rel_size = strlen(relative_location); - // Leave space for trailing separators - loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2; diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch deleted file mode 100644 index eb7869cd73c0..000000000000 --- a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch +++ /dev/null @@ -1,322 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27ab6e5..e59256e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -256,17 +256,10 @@ if(NOT WIN32) - include(GNUInstallDirs) - - add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") -- add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}") -- - # Make sure /etc is searched by the loader -- if (NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) -+ if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) - add_definitions(-DEXTRASYSCONFDIR="/etc") - endif() -- -- # Make sure /usr/share is searched by the loader -- if (NOT (CMAKE_INSTALL_FULL_DATADIR STREQUAL "/usr/share")) -- add_definitions(-DEXTRADATADIR="/usr/share") -- endif() - endif() - - if(UNIX) -diff --git a/loader/loader.c b/loader/loader.c -index 24758f4..af7cc85 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -2909,7 +2909,7 @@ static VkResult - loader_get_manifest_files(const struct loader_instance *inst, - const char *env_override, const char *source_override, - bool is_layer, bool warn_if_not_present, -- const char *location, const char *home_location, -+ const char *location, const char *relative_location, - struct loader_manifest_files *out_files) { - const char * override = NULL; - char *override_getenv = NULL; -@@ -2941,9 +2941,9 @@ loader_get_manifest_files(const struct loader_instance *inst, - } - - #if !defined(_WIN32) -- if (location == NULL && home_location == NULL) { -+ if (location == NULL && relative_location == NULL) { - #else -- home_location = NULL; -+ relative_location = NULL; - if (location == NULL) { - #endif - loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, -@@ -2962,16 +2962,89 @@ loader_get_manifest_files(const struct loader_instance *inst, - // Make a copy of the input we are using so it is not modified - // Also handle getting the location(s) from registry on Windows - if (override == NULL) { -- loc = loader_stack_alloc(strlen(location) + 1); -+ size_t loc_size = strlen(location) + 1; -+#if !defined(_WIN32) -+ const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); -+ const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); -+ if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0') -+ xdgconfdirs = "/etc/xdg"; -+ if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0') -+ xdgdatadirs = "/usr/local/share:/usr/share"; -+ const size_t rel_size = strlen(relative_location); -+ // Leave space for trailing separators -+ loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2; -+ for (const char *x = xdgconfdirs; *x; ++x) -+ if (*x == PATH_SEPARATOR) loc_size += rel_size; -+ for (const char *x = xdgdatadirs; *x; ++x) -+ if (*x == PATH_SEPARATOR) loc_size += rel_size; -+ loc_size += strlen(SYSCONFDIR) + rel_size + 1; -+#ifdef EXTRASYSCONFDIR -+ loc_size += strlen(EXTRASYSCONFDIR) + rel_size + 1; -+#endif -+#endif -+ loc = loader_stack_alloc(loc_size); - if (loc == NULL) { - loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, - "loader_get_manifest_files: Failed to allocate " - "%d bytes for manifest file location.", -- strlen(location)); -+ loc_size); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto out; - } -- strcpy(loc, location); -+ char *loc_write = loc; -+#if !defined(_WIN32) -+ const char *loc_read; -+ -+ loc_read = &xdgconfdirs[0]; -+ for (const char *x = loc_read;; ++x) { -+ if (*x == PATH_SEPARATOR || *x == '\0') { -+ const size_t s = x - loc_read; -+ memcpy(loc_write, loc_read, s); -+ loc_write += s; -+ memcpy(loc_write, relative_location, rel_size); -+ loc_write += rel_size; -+ *loc_write++ = PATH_SEPARATOR; -+ if (*x == 0) -+ break; -+ loc_read = ++x; -+ } -+ } -+ -+ memcpy(loc_write, SYSCONFDIR, strlen(SYSCONFDIR)); -+ loc_write += strlen(SYSCONFDIR); -+ memcpy(loc_write, relative_location, rel_size); -+ loc_write += rel_size; -+ *loc_write++ = PATH_SEPARATOR; -+ -+#ifdef EXTRASYSCONFDIR -+ memcpy(loc_write, EXTRASYSCONFDIR, strlen(EXTRASYSCONFDIR)); -+ loc_write += strlen(EXTRASYSCONFDIR); -+ memcpy(loc_write, relative_location, rel_size); -+ loc_write += rel_size; -+ *loc_write++ = PATH_SEPARATOR; -+#endif -+ -+ loc_read = &xdgdatadirs[0]; -+ for (const char *x = loc_read;; ++x) { -+ if (*x == PATH_SEPARATOR || *x == '\0') { -+ const size_t s = x - loc_read; -+ memcpy(loc_write, loc_read, s); -+ loc_write += s; -+ memcpy(loc_write, relative_location, rel_size); -+ loc_write += rel_size; -+ *loc_write++ = PATH_SEPARATOR; -+ if (*x == 0) -+ break; -+ loc_read = ++x; -+ } -+ } -+ --loc_write; -+ *loc_write = '\0'; -+#else -+ memcpy(loc_write, location, loc_size); -+ loc[loc_size-1] = '\0'; -+#endif -+ - #if defined(_WIN32) - VkResult reg_result = loaderGetRegistryFiles(inst, loc, ®); - if (VK_SUCCESS != reg_result || NULL == reg) { -@@ -3122,14 +3195,14 @@ loader_get_manifest_files(const struct loader_instance *inst, - } - file = next_file; - #if !defined(_WIN32) -- if (home_location != NULL && -+ if (relative_location != NULL && - (next_file == NULL || *next_file == '\0') && override == NULL) { - char *xdgdatahome = secure_getenv("XDG_DATA_HOME"); - size_t len; - if (xdgdatahome != NULL) { - - char *home_loc = loader_stack_alloc(strlen(xdgdatahome) + 2 + -- strlen(home_location)); -+ strlen(relative_location)); - if (home_loc == NULL) { - loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, - "loader_get_manifest_files: Failed to allocate " -@@ -3139,15 +3212,15 @@ loader_get_manifest_files(const struct loader_instance *inst, - } - strcpy(home_loc, xdgdatahome); - // Add directory separator if needed -- if (home_location[0] != DIRECTORY_SYMBOL) { -+ if (relative_location[0] != DIRECTORY_SYMBOL) { - len = strlen(home_loc); - home_loc[len] = DIRECTORY_SYMBOL; - home_loc[len + 1] = '\0'; - } -- strcat(home_loc, home_location); -+ strcat(home_loc, relative_location); - file = home_loc; - next_file = loader_get_next_path(file); -- home_location = NULL; -+ relative_location = NULL; - - loader_log( - inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, -@@ -3160,7 +3233,7 @@ loader_get_manifest_files(const struct loader_instance *inst, - char *home = secure_getenv("HOME"); - if (home != NULL) { - char *home_loc = loader_stack_alloc(strlen(home) + 16 + -- strlen(home_location)); -+ strlen(relative_location)); - if (home_loc == NULL) { - loader_log( - inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, -@@ -3178,15 +3251,15 @@ loader_get_manifest_files(const struct loader_instance *inst, - } - strcat(home_loc, ".local/share"); - -- if (home_location[0] != DIRECTORY_SYMBOL) { -+ if (relative_location[0] != DIRECTORY_SYMBOL) { - len = strlen(home_loc); - home_loc[len] = DIRECTORY_SYMBOL; - home_loc[len + 1] = '\0'; - } -- strcat(home_loc, home_location); -+ strcat(home_loc, relative_location); - file = home_loc; - next_file = loader_get_next_path(file); -- home_location = NULL; -+ relative_location = NULL; - - loader_log( - inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, -@@ -3263,7 +3336,7 @@ VkResult loader_icd_scan(const struct loader_instance *inst, - // Get a list of manifest files for ICDs - res = loader_get_manifest_files(inst, "VK_ICD_FILENAMES", NULL, false, true, - DEFAULT_VK_DRIVERS_INFO, -- HOME_VK_DRIVERS_INFO, &manifest_files); -+ RELATIVE_VK_DRIVERS_INFO, &manifest_files); - if (VK_SUCCESS != res || manifest_files.count == 0) { - goto out; - } -@@ -3490,7 +3563,7 @@ void loader_layer_scan(const struct loader_instance *inst, - if (VK_SUCCESS != - loader_get_manifest_files(inst, LAYERS_PATH_ENV, LAYERS_SOURCE_PATH, - true, true, DEFAULT_VK_ELAYERS_INFO, -- HOME_VK_ELAYERS_INFO, &manifest_files[0])) { -+ RELATIVE_VK_ELAYERS_INFO, &manifest_files[0])) { - goto out; - } - -@@ -3499,7 +3572,7 @@ void loader_layer_scan(const struct loader_instance *inst, - // overridden by LAYERS_PATH_ENV - if (VK_SUCCESS != loader_get_manifest_files(inst, NULL, NULL, true, false, - DEFAULT_VK_ILAYERS_INFO, -- HOME_VK_ILAYERS_INFO, -+ RELATIVE_VK_ILAYERS_INFO, - &manifest_files[1])) { - goto out; - } -@@ -3569,7 +3642,7 @@ void loader_implicit_layer_scan(const struct loader_instance *inst, - // overridden by LAYERS_PATH_ENV - VkResult res = loader_get_manifest_files( - inst, NULL, NULL, true, false, DEFAULT_VK_ILAYERS_INFO, -- HOME_VK_ILAYERS_INFO, &manifest_files); -+ RELATIVE_VK_ILAYERS_INFO, &manifest_files); - if (VK_SUCCESS != res || manifest_files.count == 0) { - return; - } -diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h -index dc4ac10..50a7966 100644 ---- a/loader/vk_loader_platform.h -+++ b/loader/vk_loader_platform.h -@@ -57,47 +57,9 @@ - #define VULKAN_ILAYERCONF_DIR "implicit_layer.d" - #define VULKAN_LAYER_DIR "layer" - --#if defined(EXTRASYSCONFDIR) --#define EXTRA_DRIVERS_SYSCONFDIR_INFO ":" \ -- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR --#define EXTRA_ELAYERS_SYSCONFDIR_INFO ":" \ -- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR --#define EXTRA_ILAYERS_SYSCONFDIR_INFO ":" \ -- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR --#else --#define EXTRA_DRIVERS_SYSCONFDIR_INFO --#define EXTRA_ELAYERS_SYSCONFDIR_INFO --#define EXTRA_ILAYERS_SYSCONFDIR_INFO --#endif -- --#if defined(EXTRADATADIR) --#define EXTRA_DRIVERS_DATADIR_INFO ":" \ -- EXTRADATADIR VULKAN_DIR VULKAN_ICDCONF_DIR --#define EXTRA_ELAYERS_DATADIR_INFO ":" \ -- EXTRADATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR --#define EXTRA_ILAYERS_DATADIR_INFO ":" \ -- EXTRADATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR --#else --#define EXTRA_DRIVERS_DATADIR_INFO --#define EXTRA_ELAYERS_DATADIR_INFO --#define EXTRA_ILAYERS_DATADIR_INFO --#endif -- --#define DEFAULT_VK_DRIVERS_INFO \ -- SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ -- DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR \ -- EXTRA_DRIVERS_SYSCONFDIR_INFO \ -- EXTRA_DRIVERS_DATADIR_INFO --#define DEFAULT_VK_ELAYERS_INFO \ -- SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ -- DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR \ -- EXTRA_ELAYERS_SYSCONFDIR_INFO \ -- EXTRA_ELAYERS_DATADIR_INFO --#define DEFAULT_VK_ILAYERS_INFO \ -- SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ -- DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR \ -- EXTRA_ILAYERS_SYSCONFDIR_INFO \ -- EXTRA_ILAYERS_DATADIR_INFO -+#define DEFAULT_VK_DRIVERS_INFO "" -+#define DEFAULT_VK_ELAYERS_INFO "" -+#define DEFAULT_VK_ILAYERS_INFO "" - - #define DEFAULT_VK_DRIVERS_PATH "" - #if !defined(DEFAULT_VK_LAYERS_PATH) -@@ -109,9 +71,9 @@ - #endif - #define LAYERS_PATH_ENV "VK_LAYER_PATH" - --#define HOME_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR --#define HOME_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR --#define HOME_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR -+#define RELATIVE_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR -+#define RELATIVE_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR -+#define RELATIVE_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR - - // C99: - #define PRINTF_SIZE_T_SPECIFIER "%zu" -@@ -251,9 +213,9 @@ loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) { - #define LAYERS_SOURCE_PATH NULL - #endif - #define LAYERS_PATH_ENV "VK_LAYER_PATH" --#define HOME_VK_DRIVERS_INFO "" --#define HOME_VK_ELAYERS_INFO "" --#define HOME_VK_ILAYERS_INFO "" -+#define RELATIVE_VK_DRIVERS_INFO "" -+#define RELATIVE_VK_ELAYERS_INFO "" -+#define RELATIVE_VK_ILAYERS_INFO "" - #define PRINTF_SIZE_T_SPECIFIER "%Iu" - - // File IO diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 6bbc77056710..64c5293fac7d 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.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix deleted file mode 100644 index 99a41ec0c185..000000000000 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls -, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit -, libidn -, enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base -}: - -assert enableGeoLocation -> geoclue2 != null; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.14.5"; - - meta = { - description = "Web content rendering engine, GTK+ port"; - homepage = "http://webkitgtk.org/"; - license = licenses.bsd2; - platforms = platforms.linux; - hydraPlatforms = []; - maintainers = with maintainers; [ ]; - }; - - preConfigure = "patchShebangs Tools"; - - src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w"; - }; - - # see if we can clean this up.... - - patches = [ ./finding-harfbuzz-icu.patch ]; - - cmakeFlags = [ - "-DPORT=GTK" - "-DUSE_LIBHYPHEN=0" - "-DENABLE_GLES2=ON" - ]; - - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; - - nativeBuildInputs = [ - cmake perl python2 ruby bison gperf sqlite - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = [ - gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - gst-plugins-base libxkbcommon epoxy at_spi2_core - ] ++ optional enableGeoLocation geoclue2 - ++ (with xlibs; [ libXdmcp libXt libXtst ]); - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix new file mode 100644 index 000000000000..b50d94b90a5e --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls +, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit +, libidn, libedit, readline, mesa, libintlOrEmpty +, enableGeoLocation ? true, geoclue2, sqlite +, gst-plugins-base +}: + +assert enableGeoLocation -> geoclue2 != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.16.4"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = "http://webkitgtk.org/"; + license = licenses.bsd2; + platforms = with platforms; linux ++ darwin; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + postConfigure = optionalString stdenv.isDarwin '' + substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "" + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libbmalloc.a" "" + sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \ + Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \ + Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \ + Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a" + ''; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr"; + }; + + # see if we can clean this up.... + + patches = [ ./finding-harfbuzz-icu.patch ] + ++ optionals stdenv.isDarwin [ + ./PR-152650-2.patch + ./PR-153138.patch + ./PR-157554.patch + ./PR-157574.patch + ]; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + ] + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_INTROSPECTION=ON" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" + ]; + + # XXX: WebKit2 missing include path for gst-plugins-base. + # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" + + (optionalString stdenv.isDarwin " -lintl"); + + nativeBuildInputs = [ + cmake perl python2 ruby bison gperf sqlite + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = libintlOrEmpty ++ [ + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit + gst-plugins-base libxkbcommon epoxy at_spi2_core + ] ++ optional enableGeoLocation geoclue2 + ++ (with xlibs; [ libXdmcp libXt libXtst ]) + ++ optionals stdenv.isDarwin [ libedit readline mesa ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 33f8fa64a0f3..603df0407eaa 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { "--disable-x11-target" "--enable-quartz-target" "--disable-web-audio" + "CFLAGS=-DJSC_OBJC_API_ENABLED=0" + "CXXFLAGS=-DJSC_OBJC_API_ENABLED=0" ] ++ optionals (!enableCredentialStorage) [ "--disable-credential-storage" ]; diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch new file mode 100644 index 000000000000..f87b8ee73e23 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch @@ -0,0 +1,62 @@ +From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia +Date: Tue, 8 Mar 2016 17:26:23 -0800 +Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac + +https://bugs.webkit.org/show_bug.cgi?id=152650 + +Signed-off-by: Jeremy Huddleston Sequoia +--- + ChangeLog | 10 ++++++++++ + Source/PlatformGTK.cmake | 2 +- + Source/cmake/OptionsGTK.cmake | 5 ----- + 3 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake +index af4d2e3..0b11b56 100644 +--- a/Source/PlatformGTK.cmake ++++ b/Source/PlatformGTK.cmake +@@ -34,7 +34,7 @@ endmacro() + add_gtkdoc_generator("docs-build.stamp" "") + if (ENABLE_GTKDOC) + add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") +-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE) ++elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING) + add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") + + # Add a default build step which check that documentation does not have any warnings +diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake +index 6b01f1a..b443d10 100644 +--- a/Source/cmake/OptionsGTK.cmake ++++ b/Source/cmake/OptionsGTK.cmake +@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING) + set(ENABLE_INTROSPECTION OFF) + endif () + +-# Override the cached variable, gtk-doc does not really work when building on Mac. +-if (APPLE) +- set(ENABLE_GTKDOC OFF) +-endif () +- + set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) + set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) + set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk) +diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py +index 4c8237b..a628ae0 100644 +--- a/Tools/gtk/gtkdoc.py ++++ b/Tools/gtk/gtkdoc.py +@@ -322,6 +322,11 @@ class GTKDoc(object): + env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) + else: + env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path ++ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH') ++ if current_ld_library_path: ++ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path) ++ else: ++ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path + + if ldflags: + env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', '')) +-- +2.7.2 + diff --git a/pkgs/development/libraries/webkitgtk/PR-153138.patch b/pkgs/development/libraries/webkitgtk/PR-153138.patch new file mode 100644 index 000000000000..833921f68061 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-153138.patch @@ -0,0 +1,26 @@ +From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia +Date: Fri, 15 Jan 2016 11:53:07 -0800 +Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138 + +Signed-off-by: Jeremy Huddleston Sequoia +--- + Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp +index 1e4b4f5..9b27aed 100644 +--- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp ++++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp +@@ -26,6 +26,8 @@ + #include "config.h" + #include "StructureStubInfo.h" + ++#include "JSCellInlines.h" ++ + #include "JSObject.h" + #include "PolymorphicAccess.h" + #include "Repatch.h" +-- +2.7.0 + diff --git a/pkgs/development/libraries/webkitgtk/PR-157554.patch b/pkgs/development/libraries/webkitgtk/PR-157554.patch new file mode 100644 index 000000000000..615e805c92ce --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-157554.patch @@ -0,0 +1,33 @@ +https://bugs.webkit.org/show_bug.cgi?id=157554 + +--- a/Source/WTF/wtf/OSRandomSource.cpp ++++ b/Source/WTF/wtf/OSRandomSource.cpp +@@ -29,7 +29,7 @@ + #include + #include + +-#if !OS(DARWIN) && OS(UNIX) ++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) + #include + #include + #include +@@ -46,7 +46,7 @@ + + namespace WTF { + +-#if !OS(DARWIN) && OS(UNIX) ++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) + NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom() + { + CRASH(); +@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom() + + void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length) + { +-#if OS(DARWIN) +- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length)); ++#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 ++ return arc4random_buf(buffer, length); + #elif OS(UNIX) + int fd = open("/dev/urandom", O_RDONLY, 0); + if (fd < 0) diff --git a/pkgs/development/libraries/webkitgtk/PR-157574.patch b/pkgs/development/libraries/webkitgtk/PR-157574.patch new file mode 100644 index 000000000000..d9b0795afa5b --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-157574.patch @@ -0,0 +1,62 @@ +diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h +index ab53183..1310dec 100644 +--- a/Source/JavaScriptCore/API/WebKitAvailability.h ++++ b/Source/JavaScriptCore/API/WebKitAvailability.h +@@ -27,57 +27,12 @@ + #define __WebKitAvailability__ + + #if defined(__APPLE__) +- +-#include + #include +- +-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 +-/* To support availability macros that mention newer OS X versions when building on older OS X versions, +- we provide our own definitions of the underlying macros that the availability macros expand to. We're +- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with +- an application rather than as part of the system. +-*/ +- +-#ifndef __NSi_10_10 // Building from trunk rather than SDK. +-#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available. +-#endif +- +-#ifndef __NSi_10_11 // Building from trunk rather than SDK. +-#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available. +-#endif +- +-#ifndef __NSi_10_12 // Building from trunk rather than SDK. +-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available. +-#endif +- +-#ifndef __AVAILABILITY_INTERNAL__MAC_10_9 +-#define __AVAILABILITY_INTERNAL__MAC_10_9 +-#endif +- +-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10 +-#define __AVAILABILITY_INTERNAL__MAC_10_10 + #endif + +-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER +-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER +-#endif +- +-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER +-#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER +-#endif +- +-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */ +- +-#if defined(BUILDING_GTK__) + #undef CF_AVAILABLE + #define CF_AVAILABLE(_mac, _ios) + #undef CF_ENUM_AVAILABLE + #define CF_ENUM_AVAILABLE(_mac, _ios) +-#endif +- +-#else +-#define CF_AVAILABLE(_mac, _ios) +-#define CF_ENUM_AVAILABLE(_mac, _ios) +-#endif + + #endif /* __WebKitAvailability__ */ diff --git a/pkgs/development/libraries/webkitgtk/adding-libintl.patch b/pkgs/development/libraries/webkitgtk/adding-libintl.patch deleted file mode 100644 index b6e8b073c9d4..000000000000 --- a/pkgs/development/libraries/webkitgtk/adding-libintl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- webkitgtk-2.10.4-orig/Source/WebKit2/CMakeLists.txt 2015-11-11 02:42:51.000000000 -0500 -+++ webkitgtk-2.10.4/Source/WebKit2/CMakeLists.txt 2016-01-31 18:27:49.000000000 -0500 -@@ -738,6 +738,7 @@ - set(WebKit2_LIBRARIES - JavaScriptCore - WebCore -+ intl - ) - - set(PluginProcess_LIBRARIES diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 347686014d1d..e4b95fc1cb9f 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -7,9 +7,10 @@ with stdenv.lib; let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index cd13fa8dbb4a..832600fed874 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 1d19b4417404..0f1f87b9bd64 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/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix deleted file mode 100644 index f40595d4eacb..000000000000 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm -, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true -, withWebKit ? false, webkitgtk2 ? null -, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null -}: - - -assert withMesa -> mesa != null; -assert withWebKit -> webkitgtk2 != null; - -with stdenv.lib; - -let - version = "3.0.2"; -in -stdenv.mkDerivation { - name = "wxwidgets-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"; - }; - - buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer - gst-plugins-base GConf ] - ++ optional withMesa mesa - ++ optional withWebKit webkitgtk2 - ++ 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"; - }) ]; - - configureFlags = - [ "--enable-gtk2" "--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" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] - ++ optionals withWebKit - ["--enable-webview" "--enable-webview-webkit"]; - - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' - substituteInPlace configure --replace \ - 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ - 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' - substituteInPlace configure --replace \ - "-framework System" \ - -lSystem - ''; - - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat24 compat26 unicode; - gtk = gtk2; - }; - - enableParallelBuilding = true; - - meta = { - platforms = with stdenv.lib.platforms; darwin ++ linux; - }; -} diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 88cf92b34ef0..a06003997845 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, wxGTK, sqlite }: +{ stdenv, fetchFromGitHub, wxGTK, sqlite +, darwin }: stdenv.mkDerivation rec { name = "wxsqlite3-${version}"; @@ -11,7 +12,12 @@ stdenv.mkDerivation rec { sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g"; }; - buildInputs = [ wxGTK sqlite ]; + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + cp build28/Info.plist.in build28/wxmac.icns build/ + ''; + + buildInputs = [ wxGTK sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; meta = with stdenv.lib; { homepage = http://utelle.github.io/wxsqlite3/ ; diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix similarity index 62% rename from pkgs/development/libraries/wxGTK-2.8/default.nix rename to pkgs/development/libraries/wxwidgets/2.8/default.nix index cbfdf876dbaf..15db4386e012 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; with stdenv.lib; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] - ++ optional withMesa mesa; + ++ optional withMesa mesa_glu; nativeBuildInputs = [ pkgconfig ]; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa.out}/lib "; + + optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; @@ -62,8 +63,12 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - + meta = { - platforms = stdenv.lib.platforms.all; + platforms = platforms.linux; + license = licenses.wxWindows; + homepage = "https://www.wxwidgets.org/"; + description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix similarity index 63% rename from pkgs/development/libraries/wxGTK-2.9/default.nix rename to pkgs/development/libraries/wxwidgets/2.9/default.nix index e19f0bc3a765..af9dde75cf42 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; with stdenv.lib; @@ -22,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa + ++ optional withMesa mesa_glu ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +40,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; + SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' @@ -66,6 +67,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - platforms = with stdenv.lib.platforms; darwin ++ linux; + platforms = with platforms; darwin ++ linux; + license = licenses.wxWindows; + homepage = "https://www.wxwidgets.org/"; + description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix new file mode 100644 index 000000000000..f7fcf8a2206c --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -0,0 +1,92 @@ +{ 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 +, 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 -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; + +with stdenv.lib; + +let + version = "3.0.3.1"; +in +stdenv.mkDerivation { + name = "wxwidgets-${version}"; + + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; + }; + + buildInputs = + [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + gst-plugins-base GConf ] + ++ optional withMesa mesa_glu + ++ 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 = + # "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 = + [ "--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" + ++ optional withMesa "--with-opengl" + ++ optionals stdenv.isDarwin + # allow building on 64-bit + [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] + ++ optionals withWebKit + ["--enable-webview" "--enable-webview-webkit"]; + + SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + + preConfigure = " + substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace /usr /no-such-path + " + optionalString stdenv.isDarwin '' + substituteInPlace configure --replace \ + 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ + 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" \ + -lSystem + ''; + + postInstall = " + (cd $out/include && ln -s wx-*/* .) + "; + + passthru = { + inherit compat24 compat26 unicode; + gtk = if withGtk2 then gtk2 else gtk3; + }; + + enableParallelBuilding = true; + + meta = { + platforms = with platforms; darwin ++ linux; + license = licenses.wxWindows; + homepage = "https://www.wxwidgets.org/"; + description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; + }; +} diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix similarity index 79% rename from pkgs/development/libraries/wxmac/default.nix rename to pkgs/development/libraries/wxwidgets/3.0/mac.nix index f4e714248338..fc747268cab8 100644 --- a/pkgs/development/libraries/wxmac/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -100,6 +100,10 @@ stdenv.mkDerivation rec { meta = { platforms = platforms.darwin; + license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; + homepage = "https://www.wxwidgets.org/"; + description = "a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base"; + longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; } diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 8284fd7707fe..28575f4c5d5e 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchurl, xercesc }: +{ stdenv, fetchurl, xercesc, getopt }: -stdenv.mkDerivation rec { +let + platform = if stdenv.isLinux then "linux" else + if stdenv.isDarwin then "macosx" else + throw "Unsupported platform"; +in stdenv.mkDerivation rec { name = "xalan-c-${version}"; version = "1.11"; @@ -9,20 +13,21 @@ stdenv.mkDerivation rec { sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg"; }; + # TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below configurePhase = '' export XALANCROOT=`pwd`/c cd `pwd`/c mkdir -p $out/usr - ./runConfigure -p linux -c gcc -x g++ -P$out/usr + ./runConfigure -p ${platform} -c cc -x c++ -P$out/usr ''; - buildInputs = [ xercesc ]; + buildInputs = [ xercesc getopt ]; meta = { homepage = http://xalan.apache.org/; description = "A XSLT processor for transforming XML documents"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index e461ce858cfd..764200c89f55 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, libuuid, zlib }: +{ stdenv, fetchurl, autoreconfHook +, libuuid, zlib }: let generic = version: sha256: stdenv.mkDerivation rec { name = "xapian-${version}"; + passthru = { inherit version; }; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; @@ -12,17 +14,27 @@ let outputs = [ "out" "doc" ]; buildInputs = [ libuuid zlib ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + doCheck = true; + + # the configure script thinks that Darwin has ___exp10 + # but it’s not available on my systems (or hydra apparently) + postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace config.h \ + --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" + ''; + + meta = with stdenv.lib; { description = "Search engine library"; homepage = http://xapian.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ chaoflow ]; + platforms = platforms.unix; }; }; in { - # used by xapian-ruby + # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h"; + xapian_1_4_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6"; } diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 7c64c2e90d4e..2923bfc1fc68 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "xapian-omega-${version}"; - version = (builtins.parseDrvName xapian.name).version; + inherit (xapian) version; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "07s341m1csk4v7mc44mqrzc1nxpnmdkji9k1cirbx6q0nlshdz0h"; + sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l"; }; - buildInputs = [ pkgconfig xapian perl pcre zlib libmagic ]; + buildInputs = [ xapian perl pcre zlib libmagic ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 95ba2a05ad9b..45d7d6f8301c 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://linux.techass.com/projects/xdb/; description = "C++ class library formerly known as XDB"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index af1a3b4e095e..81ac75489baf 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -2,7 +2,8 @@ , git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { - name = "xcb-util-cursor-0.1.1-3-gf03cc27"; + name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; + version = "2017-04-05"; src = fetchgit { url = http://anongit.freedesktop.org/git/xcb/util-cursor.git; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 1932acbd7ede..37936caf2b9f 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://santuario.apache.org/; description = "C++ Implementation of W3C security standards for XML"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; } diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix new file mode 100644 index 000000000000..f2d7711c9f00 --- /dev/null +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, autoreconfHook, boost, curl, openssl, log4shib, xercesc, xml-security-c }: + +stdenv.mkDerivation rec { + name = "xml-tooling-c-${version}"; + version = "1.6.0"; + + src = fetchgit { + url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; + rev = "db08101c3854518a59096be95ed6564838381744"; + sha256 = "0rhzvxm4z3pm28kpk34hayhm12bjjms2kygv1z68vnz8ijzgcinq"; + }; + + buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = [ maintainers.jammerful ]; + }; +} diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 7fb14de7951b..961220bb7831 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ description = "Scaling, colorspace conversion and dithering library"; homepage = https://github.com/sekrit-twc/zimg; license = licenses.wtfpl; - platforms = platforms.linux; # check upstream issue #52 + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 5d96299380ed..ef9f2569c45e 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 000000000000..3de4978c3066 --- /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 000000000000..2a2fc9cb4f39 --- /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/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix new file mode 100644 index 000000000000..2afdf05546fe --- /dev/null +++ b/pkgs/development/lisp-modules/asdf/2.26.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, texinfo, texLive, perl}: +let + s = # Generated upstream information + rec { + baseName="asdf"; + version="2.26"; + name="${baseName}-${version}"; + url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz"; + sha256="1qzp444rgnqf1cz9v48nh0yvz7wjq9fjdpimifsfcjswaqi2xrdn"; + }; + buildInputs = [ + texinfo texLive perl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + buildPhase = '' + make asdf.lisp + mkdir build + ln -s ../asdf.lisp build + ''; + installPhase = '' + mkdir -p "$out"/lib/common-lisp/asdf/ + mkdir -p "$out"/share/doc/asdf/ + cp -r ./* "$out"/lib/common-lisp/asdf/ + cp -r doc/* "$out"/share/doc/asdf/ + ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} + ''; + meta = { + inherit (s) version; + description = ''Standard software-system definition library for Common Lisp''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix new file mode 100644 index 000000000000..0e5c6a400872 --- /dev/null +++ b/pkgs/development/lisp-modules/asdf/3.1.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, texinfo, texLive, perl}: +let + s = # Generated upstream information + rec { + baseName="asdf"; + version="3.1.7"; + name="${baseName}-${version}"; + url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz"; + sha256="1g8wp3vi7gwrs22gnjy9lvrxqag3m8apxnryfs8n5bv6rln8bzzq"; + }; + buildInputs = [ + texinfo texLive perl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + buildPhase = '' + make build/asdf.lisp + make -C doc asdf.info asdf.html + ''; + installPhase = '' + mkdir -p "$out"/lib/common-lisp/asdf/ + mkdir -p "$out"/share/doc/asdf/ + cp -r ./* "$out"/lib/common-lisp/asdf/ + cp -r doc/* "$out"/share/doc/asdf/ + ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} + ''; + meta = { + inherit (s) version; + description = ''Standard software-system definition library for Common Lisp''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 7e05dfa585a2..ef07a65f96bc 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { mkdir -p "$out"/share/doc/asdf/ cp -r ./* "$out"/lib/common-lisp/asdf/ cp -r doc/* "$out"/share/doc/asdf/ + ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; meta = { inherit (s) version; diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 5bf375a4eff5..41d40064294f 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -1,6 +1,6 @@ -#! /bin/sh +#!@stdenv_shell@ # Part of NixPkgs package collection -# This script can be used at your option under the same license as NixPkgs or +# This script can be used at your option under the same license as NixPkgs or # under MIT/X11 license eval "$NIX_LISP_PREHOOK" @@ -15,38 +15,78 @@ export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_ test -n "$NIX_LISP_LD_LIBRARY_PATH" && export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" +declare -a NIX_LISP_FINAL_PARAMETERS; + case "$NIX_LISP" in sbcl) NIX_LISP_LOAD_FILE="--load" NIX_LISP_EXEC_CODE="--eval" NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='--non-interactive' NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FASL_TYPE="fasl" ;; ecl) NIX_LISP_LOAD_FILE="-load" NIX_LISP_EXEC_CODE="-eval" NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='--nodebug' NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FASL_TYPE="fas" ;; clisp) NIX_LISP_LOAD_FILE="-c -l" NIX_LISP_EXEC_CODE="-x" NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='-on-error exit' NIX_LISP_FINAL_PARAMETERS="-repl" + NIX_LISP_FASL_TYPE="fas" + ;; + lx86cl64) + NIX_LISP_LOAD_FILE="-l" + NIX_LISP_EXEC_CODE="-e" + NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='-b' + NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FASL_TYPE="lx64fsl" + ;; + lx86cl) + NIX_LISP_LOAD_FILE="-l" + NIX_LISP_EXEC_CODE="-e" + NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='-b' + NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FASL_TYPE="lx32fsl" + ;; + abcl) + NIX_LISP_LOAD_FILE="--load" + NIX_LISP_EXEC_CODE="--eval" + NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='' + NIX_LISP_FINAL_PARAMETERS= + NIX_LISP_FASL_TYPE="abcl" ;; esac NIX_LISP_ASDF_REGISTRY_CODE=" (progn - (setf asdf:*default-source-registries* '(asdf/source-registry:environment-source-registry)) + #+asdf3 (setf asdf:*default-source-registries* + '(asdf/source-registry:environment-source-registry)) (asdf:initialize-source-registry) ) " -NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}" +NIX_LISP_ASDF="${NIX_LISP_ASDF:-@out@}" + +nix_lisp_run_single_form(){ + NIX_LISP_FINAL_PARAMETERS=("$NIX_LISP_EXEC_CODE" "$1" + "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG) +} + +eval "$NIX_LISP_PRELAUNCH_HOOK" [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ - $NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \ + $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \ $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ - $NIX_LISP_FINAL_PARAMETERS \ + ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \ "$@" diff --git a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh index 43349cc7f8a2..9f5a2b806891 100755 --- a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh +++ b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh @@ -1,3 +1,3 @@ #! /bin/sh -source "@out@"/bin/cl-wrapper.sh "${NIX_LISP_COMMAND:-$(ls "@lisp@/bin"/* | head -n 1)}" "$@" +source "@out@"/bin/cl-wrapper.sh "${NIX_LISP_COMMAND:-$(@ls@ "@lisp@/bin"/* | @head@ -n 1)}" "$@" diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 172af31f834e..2088439c61d5 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, asdf, lisp ? null}: +{stdenv, fetchurl, asdf, which, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; @@ -6,19 +6,43 @@ stdenv.mkDerivation { installPhase='' mkdir -p "$out"/bin + export head="$(which head)" + export ls="$(which ls)" substituteAll ${./common-lisp.sh} "$out"/bin/common-lisp.sh substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh" substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh" chmod a+x "$out"/bin/* + + substituteAll "${./setup-hook.sh}" "setup-hook-parsed" + source setup-hook-parsed + setLisp "${lisp}" + echo "$NIX_LISP" + + mkdir -p "$out/lib/common-lisp/" + cp -r "${asdf}/lib/common-lisp"/* "$out/lib/common-lisp/" + chmod u+rw -R "$out/lib/common-lisp/" + + NIX_LISP_PRELAUNCH_HOOK=' + NIX_LISP_FASL_TYPE=lisp + nix_lisp_run_single_form "(progn + (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\") + (asdf:load-system :uiop :force :all) + (asdf:load-system :asdf :force :all) + (ignore-errors (asdf:load-system :uiop/version :force :all)) + )"' \ + "$out/bin/common-lisp.sh" ''; + buildInputs = [which]; + inherit asdf lisp; + stdenv_shell = stdenv.shell; setupHook = ./setup-hook.sh; phases="installPhase fixupPhase"; - preferLocalBuild = true; + ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}"; passthru = { inherit lisp; diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index b48f916ac7a0..7ac8c70d59f8 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -1,12 +1,10 @@ -NIX_LISP_ASDF="@asdf@" +NIX_LISP_ASDF="@out@" -CL_SOURCE_REGISTRY="@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/" +CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@out@/lib/common-lisp/asdf/" addASDFPaths () { - for j in "$1"/lib/common-lisp/*; do - if [ -d "$j" ]; then - CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$j/" - fi + for j in "$1"/lib/common-lisp-settings/*-path-config.sh; do + source "$j" done } diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 8623032ed375..83bbdf3b8f98 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,18 +1,36 @@ -args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, - buildInputs ? [], meta ? {}, overrides?(x: {}), propagatedBuildInputs ? []}: -let +args @ {stdenv, clwrapper, baseName, packageName ? baseName, testSystems ? [packageName] + , version ? "latest" + , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {}) + , propagatedBuildInputs ? []}: +let deployConfigScript = '' + outhash="$out" + outhash="''${outhash##*/}" + outhash="''${outhash%%-*}" config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh + path_config_script="$out"/lib/common-lisp-settings/${args.baseName}-path-config.sh + store_translation="$(dirname "$out"):$(dirname "$out")" mkdir -p "$(dirname "$config_script")" touch "$config_script" + touch "$path_config_script" chmod a+x "$config_script" + chmod a+x "$path_config_script" + echo "if test -z \"\''${_''${outhash}_NIX_LISP_CONFIG}\"; then export _''${outhash}_NIX_LISP_CONFIG=1; " >> "$config_script" + echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ \$NIX_CFLAGS_COMPILE}\"" >> "$config_script" + echo "export NIX_LDFLAGS='$NIX_LDFLAGS'\"\''${NIX_LDFLAGS:+ \$NIX_LDFLAGS}\"" >> "$config_script" echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script" echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script" - echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script" + echo "export PATH=\"\''${PATH:+\$PATH:}$PATH\"" >> "$config_script" + echo "echo \"\$ASDF_OUTPUT_TRANSLATIONS\" | grep -E '(^|:)$store_translation(:|\$)' >/dev/null || export ASDF_OUTPUT_TRANSLATIONS=\"\''${ASDF_OUTPUT_TRANSLATIONS:+\$ASDF_OUTPUT_TRANSLATIONS:}\"'$store_translation'" >> "$config_script" + echo "source '$path_config_script'" >> "$config_script" + echo "fi" >> "$config_script" + echo "if test -z \"\''${_''${outhash}_NIX_LISP_PATH_CONFIG}\"; then export _''${outhash}_NIX_LISP_PATH_CONFIG=1; " >> "$path_config_script" + echo "for i in \"''${CL_SOURCE_REGISTRY//:/\" \"}\" \"$out/lib/common-lisp/${args.baseName}/\" ; do echo \"\$CL_SOURCE_REGISTRY\" | grep -E \"(^|:)\$i(:|\\\$)\" >/dev/null || export CL_SOURCE_REGISTRY=\"\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}\$i\"; done;" >> "$path_config_script" test -n "$LD_LIBRARY_PATH" && - echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$config_script" + echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script" test -n "$NIX_LISP_LD_LIBRARY_PATH" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$path_config_script" + echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' launch_script="$out"/bin/${args.baseName}-lisp-launcher.sh @@ -22,7 +40,7 @@ let echo "#! /bin/sh" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" - echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" + echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; basePackage = { name = "lisp-${baseName}-${version}"; @@ -40,12 +58,27 @@ basePackage = { ${deployConfigScript} ${deployLaunchScript} + ${stdenv.lib.concatMapStrings (testSystem: '' + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn + (asdf:compile-system :${testSystem}) + (asdf:load-system :${testSystem}) + (asdf:operate (quote asdf::compile-bundle-op) :${testSystem}) + (ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${testSystem})) + )"' \ + "$out/bin/${args.baseName}-lisp-launcher.sh" + '') testSystems} + eval "$postInstall" ''; - propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp] + propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf] ++ (args.propagatedBuildInputs or []); buildInputs = buildInputs; dontStrip=true; + + ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}"; + meta = { inherit description version; } // meta; diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index 8693a304899a..d2d846b78f2b 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -34,7 +34,7 @@ url="${ql_src##* }" [ "$ql_src_type" = "kmr-git" ] && { ql_src_type=git - url="http://git.b9.com/$url.git" + url="http://git.kpe.io/$url.git" export NIX_PREFETCH_GIT_DEEP_CLONE=1 } diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 537e754d57aa..275a6d405c89 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -6,567 +6,24 @@ let lispPackages = rec { buildLispPackage = callPackage ./define-package.nix; - cl-ppcre = buildLispPackage rec { - baseName = "cl-ppcre"; - version = "2.0.4"; - description = "Regular expression library for Common Lisp"; - deps = []; - src = pkgs.fetchurl { - url = "https://github.com/edicl/cl-ppcre/archive/v${version}.tar.gz"; - sha256 = "16nkfg6j7nn8qkzxn462kqpdlbajpz2p55pdl12sia6yqkj3lh97"; - }; - }; - - clx = buildLispPackage rec { - baseName = "clx"; - version = "git-20170201"; - description = "An implementation of the X Window System protocol in Lisp"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/sharplispers/clx''; - sha256 = "08jw4d2sx49kq1xw44s3fvyq94wm1if4v1jbf1137fvlkzw1pf5m"; - rev = ''c6d2446a10abd9eade2c52342b9662c9dd8579dc''; - name = "clx-git-checkout-${version}"; - }; - }; - - iterate = buildLispPackage rec { - baseName = "iterate"; - version = "darcs-2014-11-01"; - description = "Iteration package for Common Lisp"; - deps = []; - src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { - url = "https://common-lisp.net/project/iterate/darcs/iterate"; - sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; - context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); - overrides = x: { - configurePhase="buildPhase(){ true; }"; - }; - }; - - alexandria = buildLispPackage rec { - baseName = "alexandria"; - version = "git-20131029"; - description = "A collection of portable public domain utilities"; - deps = []; - src = pkgs.fetchgit { - url = "https://gitlab.common-lisp.net/alexandria/alexandria.git"; - sha256 = "1gx642w00cnnkbkcsnzmg1w147r6yvc0ayns7ha4k0qcvfnb1zvs"; - rev = ''2b1eb4067fb34bc501e527de75d09166a8ba9ceb''; - }; - }; - esrap-peg = buildLispPackage rec { baseName = "esrap-peg"; - version = "git-20131029"; + version = "git-20170320"; description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions"; - deps = [alexandria cl-unification esrap iterate]; + deps = with (pkgs.quicklispPackagesFor clwrapper); [alexandria cl-ppcre-template cl-unification esrap iterate]; src = pkgs.fetchgit { url = "https://github.com/fb08af68/esrap-peg.git"; - sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1"; - rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8''; - }; - }; - - cl-unification = buildLispPackage rec { - baseName = "cl-unification"; - version = "git-2015-07-01"; - description = ""; - deps = []; - src = pkgs.fetchgit { - url = "https://gitlab.common-lisp.net/cl-unification/cl-unification.git"; - sha256 = "0b7yik1ma7ciwscald624325dl6265fbq52iwy6jh46nvv085dqk"; - rev = ''283c94d38d11c806a1fc9db022f0b54dced93bab''; - }; - }; - - esrap = buildLispPackage rec { - baseName = "esrap"; - version = "git-20131029"; - description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp"; - deps = [alexandria]; - src = pkgs.fetchgit { - url = "https://github.com/scymtym/esrap.git"; - sha256 = "175jsv309yir0yi03aa2995xg84zjgk34kgnbql5l4vy4as5x665"; - rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26''; - }; - }; - - clx-truetype = buildLispPackage rec { - baseName = "clx-truetype"; - version = "git-20141112"; - description = "A pure Common Lisp solution for antialiased TrueType font rendering using CLX and the XRender extension"; - deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/filonenko-mikhail/clx-truetype''; - sha256 = "14wx9s1fd56l25ms2ns1w9a5rxgqr00vgw6jdarfkqk7mfrxxzs1"; - rev = ''6f72905c6886a656e5a1c8167097f12375c6da7d''; - }; - overrides = x:{ - configurePhase = "rm Makefile"; - }; - }; - - cl-fad = buildLispPackage rec { - baseName = "cl-fad"; - version = "v0.7.2"; - description = "Portable pathname library"; - deps = [alexandria bordeaux-threads]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/cl-fad''; - sha256 = "87917ab4af4f713ad41faa72c7eaed2872f8dac47f49c0668ba8782590fdbca4"; - rev = ''refs/tags/v0.7.2''; - }; - }; - - bordeaux-threads = buildLispPackage rec { - baseName = "bordeaux-threads"; - version = "0.8.3"; - description = "Bordeaux Threads makes writing portable multi-threaded apps simple"; - deps = [alexandria]; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/bordeaux-threads/releases/bordeaux-threads-0.8.3.tar.gz''; - sha256 = "0c3n7qsx4jc3lg8s0n9kxfvhhyl0s7123f3038nsb96rf0bvb5hy"; - }; - }; - - zpb-ttf = buildLispPackage rec { - baseName = "zpb-ttf"; - version = "release-1.0.3"; - description = "Access TrueType font metrics and outlines from Common Lisp"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/xach/zpb-ttf''; - sha256 = "3092a3ba9f27b091224d11c0ccfb09c9a4632ebfd6c3986df3147f19e53606f2"; - rev = ''refs/tags/release-1.0.3''; - }; - }; - - cl-store = buildLispPackage rec { - baseName = "cl-store"; - version = "git-20141112"; - description = "Serialization package"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/skypher/cl-store''; - sha256 = "7096ad38d5c77d58f7aa0ef8df1884411173c140408cb7967922b315ab505472"; - rev = ''2d2455c024fe64ee24cbf914c82254fa5bd09cab''; - }; - }; - - cl-vectors = buildLispPackage rec { - baseName = "cl-vectors"; - version = "git-20141112"; - description = "cl-paths: vectorial paths manipulation"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fjolliton/cl-vectors''; - sha256 = "2d1428911cd2699513a0b886661e9b54d1edf78558277ac83723a22c7fc9dea7"; - rev = ''7b3e5d6a8abe3de307c1dc0c4347f4efa4f25f29''; - }; - }; - - trivial-features = buildLispPackage rec { - baseName = "trivial-features"; - version = "git-20141112"; - description = "Ensures consistent *FEATURES* across multiple CLs"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/trivial-features/trivial-features''; - sha256 = "2006aebe0c2bfed1c39a2195639e221fdc52a443b6c8522e535cbef2370a07fc"; - rev = ''2b7cdc3b8073eb33655850b51223770b535da6d9''; - }; - }; - - clsql = buildLispPackage rec { - baseName = "clsql"; - version = "git-20150514"; - description = "Common Lisp SQL Interface library"; - deps = [uffi]; - buildInputs = [pkgs.mysql.client pkgs.zlib]; - # Source type: git - src = pkgs.fetchgit { - url = - #''http://git.kpe.io/clsql.git'' - "http://repo.or.cz/r/clsql.git" - ; - sha256 = "073rh2zxwkcd417qfcflv14j273d1j174slsbzidxvy4zgq5r3n6"; - rev = ''a646f558b54191eda1d64f2926eee7b4fa763f89''; - }; - overrides = x:{ - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql" - ''; - }; - }; - - uffi = buildLispPackage rec { - baseName = "uffi"; - version = "git-20141112"; - description = "Universal Foreign Function Library for Common Lisp"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://git.kpe.io/uffi.git''; - sha256 = "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry"; - rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b''; - }; - }; - - query-fs = buildLispPackage rec { - baseName = "query-fs"; - version = "git-20150523"; - description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; - deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fb08af68/query-fs''; - sha256 = "19h6hscza7p93bc7jvb6ya7ghg96dr1c1v4imlxpjqfdhhdpxsq6"; - rev = ''0f28e3f31a4cd3636a8edb346230482e68af86c2''; - }; - overrides = x: { - linkedSystems = []; - postInstall = '' - export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs" - export HOME=$PWD - build-with-lisp.sh sbcl \ - ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \ - "$out/bin/query-fs" \ - "(query-fs:run-fs-with-cmdline-args)" - ''; - }; - }; - - cl-fuse = buildLispPackage rec { - baseName = "cl-fuse"; - version = "git-20141113"; - description = "CFFI bindings to FUSE (Filesystem in user space)"; - deps = [bordeaux-threads cffi cl-utilities iterate trivial-backtrace trivial-utf-8]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fb08af68/cl-fuse''; - sha256 = "1l4ydxbwzlj6gkb1c9vc96rfbj951snaidpx10pxz4wdnzg3kq99"; - rev = ''6feffaa34a21cfc7890b25357284858f924e8cb3''; - }; - propagatedBuildInputs = [pkgs.fuse]; - overrides = x : { - configurePhase = '' - export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD" - export makeFlags="$makeFlags LISP=common-lisp.sh" - ''; - }; - }; - - cffi = buildLispPackage rec { - baseName = "cffi"; - version = "0.14.0"; - description = "The Common Foreign Function Interface"; - deps = [alexandria babel trivial-features]; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/cffi/releases/cffi_${version}.tar.gz''; - sha256 = "155igjh096vrp7n71c0xcg9qbcpj6547qjvzi9shxbpi6piw6fkw"; - }; - }; - - babel = buildLispPackage rec { - baseName = "babel"; - version = "git-20141113"; - description = "A charset conversion library"; - deps = [alexandria trivial-features]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/cl-babel/babel''; - sha256 = "abe7150f25ceb7eded520d95f1665a46f4233cf13b577fd02c3f6be54c32facc"; - rev = ''74b35ea79b769c4f9aefad933923778ffa7915ab''; - }; - }; - - cl-utilities = buildLispPackage rec { - baseName = "cl-utilities"; - version = "1.2.4"; - description = "A collection of Common Lisp utility functions"; - deps = []; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/cl-utilities/cl-utilities-${version}.tar.gz''; - sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; - }; - }; - - trivial-utf-8 = buildLispPackage rec { - baseName = "trivial-utf-8"; - version = "2011-09-08"; - description = "A UTF-8 encoding library"; - deps = []; - # Source type: darcs - src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { - url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; - sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); - }; - - cl-fuse-meta-fs = buildLispPackage rec { - baseName = "cl-fuse-meta-fs"; - version = "git-20150523"; - description = "CFFI bindings to FUSE (Filesystem in user space)"; - deps = [bordeaux-threads cl-fuse iterate pcall]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fb08af68/cl-fuse-meta-fs''; - sha256 = "0cpxwsc0ma1ypl54n3n37wbgdxhz5j67h28q6rhghjn96dgy4ac9"; - rev = ''6ab92ebbb8e6f1f69d179214032915e3744d8c03''; - }; - }; - - pcall = buildLispPackage rec { - baseName = "pcall"; - version = "0.3"; - description = "Common Lisp library intended to simplify 'result-oriented' parallelism"; - deps = [bordeaux-threads]; - # Source type: http - src = pkgs.fetchgit { - url = ''https://github.com/marijnh/pcall''; - sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; - rev = "4e1ef32c33c2ca18fd8ab9afb4fa793c179a3578"; - }; - }; - - command-line-arguments = buildLispPackage rec { - baseName = "command-line-arguments"; - version = "git-20151120"; - description = "Small library to deal with command-line arguments"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://common-lisp.net/project/qitab/git/command-line-arguments.git''; - sha256 = "0qx33j0bq8dshiyyv8rjwd0zvhqhqx5gby6xrghfy8ylcwf11r5j"; - rev = ''003bdbc05e2816e43293530f58efb529e9e89a20''; - }; - }; - - trivial-backtrace = buildLispPackage rec { - baseName = "trivial-backtrace"; - version = "git-2014-11-01"; - description = "trivial-backtrace"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git''; - sha256 = "0bclk05lqijpp72yfzrz0wmw142z0mwnpfl4gqv6gl4fpz1qr56s"; - rev = ''48a6b081e00b0d85f1e001c7258393ed34d06bc9''; - }; - }; - - drakma = buildLispPackage rec { - baseName = "drakma"; - version = "v1.3.10"; - description = "Full-featured http/https client based on usocket"; - deps = [chipz chunga cl-ssl cl-base64 cl-ppcre flexi-streams puri usocket]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/drakma''; - sha256 = "0ecc37c9d5cc91a3b86746c4f20c0b1609969db01041df04ff6a9df1d021b30a"; - rev = ''refs/tags/v1.3.10''; - }; - }; - - chipz = buildLispPackage rec { - baseName = "chipz"; - version = "git-20141113"; - description = "A library for decompressing deflate, zlib, and gzip data"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/froydnj/chipz''; - sha256 = "0963nyg8173q0svqhk0ggbvfr4i57jk3swkf0r87jh3yi2l983sl"; - rev = ''3402c94df1d0af7742df08d3ffa23fd5c04c9bf2''; - }; - }; - - chunga = buildLispPackage rec { - baseName = "chunga"; - version = "v1.1.5"; - description = "Portable chunked streams"; - deps = [trivial-gray-streams]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/chunga''; - sha256 = "5d045882be34b158185c491da85cfd4671f456435c9ff8fa311a864f633b0446"; - rev = ''refs/tags/v1.1.5''; - }; - }; - - trivial-gray-streams = buildLispPackage rec { - baseName = "trivial-gray-streams"; - version = "git-20141113"; - description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/trivial-gray-streams/trivial-gray-streams''; - sha256 = "8d5c041f95eb31aa313adc433edf91bb14656400cae1e0ec98ad7ed085bb7954"; - rev = ''0483ade330508b4b2edeabdb47d16ec9437ee1cb''; - }; - }; - - cl-ssl = buildLispPackage rec { - baseName = "cl+ssl"; - version = "git-20141113"; - description = "Common Lisp interface to OpenSSL"; - deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/cl-plus-ssl/cl-plus-ssl''; - sha256 = "6b99fc49ac38e49ee69a47ce5791606b8b811c01e5563bfd3164d393db6c4040"; - rev = ''f8695c5df48ebc3557f76a8a08dd96429bdf8df2''; - }; - propagatedBuildInputs = [pkgs.openssl]; - }; - - flexi-streams = buildLispPackage rec { - baseName = "flexi-streams"; - version = "v1.0.13"; - description = "Flexible bivalent streams for Common Lisp"; - deps = [trivial-gray-streams]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/flexi-streams''; - sha256 = "46d6b056cffc9ea201dedde847b071db744dfbadf0a21a261717272fe3d85cab"; - rev = ''refs/tags/v1.0.13''; - }; - }; - - trivial-garbage = buildLispPackage rec { - baseName = "trivial-garbage"; - version = "git-20141113"; - description = "Portable finalizers, weak hash-tables and weak pointers"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/trivial-garbage/trivial-garbage''; - sha256 = "0r029lfl5srmhanmmh7bb692pdwb32cnbq2navx6cm3iqda9q87i"; - rev = ''2721d36d71748d9736a82fe5afe333c52bae3084''; - }; - }; - - cl-base64 = buildLispPackage rec { - baseName = "cl-base64"; - version = "git-20141113"; - description = "Base64 encoding and decoding with URI support"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://git.kpe.io/cl-base64.git''; - sha256 = "0cq3dxac3l0z2xp3c3gkgj893hvaz4vvxdz0nsc8c9q28q3nwf4p"; - rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13''; - }; - }; - - puri = buildLispPackage rec { - baseName = "puri"; - version = "git-20141113"; - description = "Portable Universal Resource Indentifier Library"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://git.kpe.io/puri.git''; - sha256 = "1l7d8i9615kyi7n69l07a6ri0d1k13cya0kbg3fmfqanwn5kzv2i"; - rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f''; - }; - }; - - usocket = buildLispPackage rec { - baseName = "usocket"; - version = "0.6.1"; - description = "Universal socket library for Common Lisp"; - deps = []; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/usocket/releases/usocket-${version}.tar.gz''; - sha256 = "1lnhjli85w20iy5nn6j6gsyxx42mvj8l0dfhwcjpl6dl2lz80r7a"; - }; - }; - - cl-html-parse = buildLispPackage rec { - baseName = "cl-html-parse"; - version = "git-20141113"; - description = "HTML Parser"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/gwkkwg/cl-html-parse''; - sha256 = "0s8jjn3s55m59nihc8qiw2s71gn09sxsaii343rzfwdrkdwk9vzh"; - rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579''; - }; - }; - - nibbles = buildLispPackage rec { - baseName = "nibbles"; - version = "git-20141116"; - description = "A library for accessing octet-addressed blocks of data"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/froydnj/nibbles''; - sha256 = "0p0swss7xjx74sr95wqak5hfhfw13bwkzncy4l4hbfy130gncv8b"; - rev = ''ace095d85e48b18bf9cf9e21249ba7fb57e3efe2''; - }; - }; - - ironclad = buildLispPackage rec { - baseName = "ironclad"; - version = "0.33.0"; - description = "A cryptographic toolkit written in pure Common Lisp"; - deps = [nibbles]; - # Source type: http - src = pkgs.fetchurl { - url = ''http://method-combination.net/lisp/files/ironclad_0.33.0.tar.gz''; - sha256 = "1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7"; - }; - }; - - cl-smtp = buildLispPackage rec { - baseName = "cl-smtp"; - version = "git-2015-07-01"; - description = "SMTP client library"; - deps = [cl-ssl cl-base64 flexi-streams trivial-gray-streams usocket]; - # Source type: git - src = pkgs.fetchgit { - url = "https://gitlab.common-lisp.net/cl-smtp/cl-smtp.git"; - sha256 = "0kvb34jzb3hgvzqlwwwmnyaqj0ghlgmi1x2zll5qw5089gbhfv10"; - rev = ''2bf946c1d561c0085dba6d6337e3e53d9711a5d2''; - }; - }; - - md5 = buildLispPackage rec { - baseName = "md5"; - version = "git-20150415"; - description = "The MD5 Message-Digest Algorithm RFC 1321"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/pmai/md5''; - sha256 = "18k6k04cqx9zx0q8x3hk5icvjhihra1za7k2jx82xb19jfnjli1y"; - rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6''; + sha256 = "15yiial7cy2nbgszqxd26qqcc6n3pw5qlrppzx0mfr3xbd9pvzby"; + rev = ''5a559b0030ecbf5e14cb070b0dc240535faa3402''; }; }; clx-xkeyboard = buildLispPackage rec { baseName = "clx-xkeyboard"; + testSystems = ["xkeyboard"]; version = "git-20150523"; description = "CLX support for X Keyboard extensions"; - deps = [clx]; + deps = with (pkgs.quicklispPackagesFor clwrapper); [clx]; # Source type: git src = pkgs.fetchgit { url = ''https://github.com/filonenko-mikhail/clx-xkeyboard''; @@ -578,6 +35,9 @@ let lispPackages = rec { quicklisp = buildLispPackage rec { baseName = "quicklisp"; version = "2016-01-21"; + + testSystems = []; + description = "The Common Lisp package manager"; deps = []; src = pkgs.fetchgit { @@ -601,6 +61,5 @@ let lispPackages = rec { ''; }; }; - }; in lispPackages diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix new file mode 100644 index 000000000000..cdcfde8eb332 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix @@ -0,0 +1,13 @@ +{quicklisp-to-nix-packages}: +with quicklisp-to-nix-packages; +rec { + cffi-grovel = cffi; + + cxml-test = null; + cxml-dom = null; + cxml-klacks = null; + cxml-xml = null; + + cl-async-util = cl-async-base; + cl-async = cl-async-base; +} diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix new file mode 100644 index 000000000000..4bc7545d9667 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''_3bmd''; + version = ''20161204-git''; + + description = ''markdown processor in CL using esrap parser.''; + + deps = [ args."split-sequence" args."esrap" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz''; + sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx''; + }; + + packageName = "3bmd"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd[.]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 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 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 000000000000..1f605fcc7959 --- /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 new file mode 100644 index 000000000000..7f60d2dde204 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''alexandria''; + version = ''20170516-git''; + + description = ''Alexandria is a collection of portable public domain utilities.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz''; + sha256 = ''0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82''; + }; + + packageName = "alexandria"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/alexandria[.]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 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 new file mode 100644 index 000000000000..cc1eb1962026 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''anaphora''; + version = ''20170227-git''; + + description = ''The Anaphoric Macro Package from Hell''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz''; + sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9''; + }; + + packageName = "anaphora"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/anaphora[.]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 anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256 1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9 URL + http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz MD5 6121d9bbc92df29d823b60ae0d0c556d NAME anaphora TESTNAME NIL FILENAME + anaphora DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..800307395350 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''array-utils''; + version = ''20170516-git''; + + description = ''A few utilities for working with arrays.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz''; + sha256 = ''0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q''; + }; + + packageName = "array-utils"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/array-utils[.]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 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 000000000000..f694e4746ac8 --- /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 new file mode 100644 index 000000000000..adc5571a3373 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''babel-streams''; + version = ''babel-20170516-git''; + + description = ''Some useful streams based on Babel's encoding code''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz''; + sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk''; + }; + + packageName = "babel-streams"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel-streams[.]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 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 new file mode 100644 index 000000000000..c9b988388621 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''babel''; + version = ''20170516-git''; + + description = ''Babel, a charset conversion library.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz''; + sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk''; + }; + + packageName = "babel"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel[.]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 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 new file mode 100644 index 000000000000..edeadade715f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''blackbird''; + version = ''20160531-git''; + + description = ''A promise implementation for Common Lisp.''; + + deps = [ args."vom" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz''; + sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9''; + }; + + packageName = "blackbird"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/blackbird[.]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 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 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 new file mode 100644 index 000000000000..002b2ad0e376 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''bordeaux-threads''; + version = ''v0.8.5''; + + description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/bordeaux-threads[.]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 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 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 new file mode 100644 index 000000000000..5b5d13bcec1d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -0,0 +1,40 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''caveman''; + version = ''20161031-git''; + + description = ''Web Application Framework for Common Lisp''; + + deps = [ args."myway" args."local-time" args."do-urlencode" args."clack-v1-compat" args."cl-syntax-annot" args."cl-syntax" args."cl-project" args."cl-ppcre" args."cl-emb" args."anaphora" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz''; + sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi''; + }; + + packageName = "caveman"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/caveman[.]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 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 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 new file mode 100644 index 000000000000..dba9bfcbc762 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cffi-grovel''; + version = ''cffi_0.18.0''; + + description = ''The CFFI Groveller''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; + sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; + }; + + packageName = "cffi-grovel"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-grovel[.]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 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 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 new file mode 100644 index 000000000000..9f92871b7121 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cffi''; + version = ''cffi_0.18.0''; + + description = ''The Common Foreign Function Interface''; + + deps = [ args."uiop" args."trivial-features" args."babel" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; + sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; + }; + + packageName = "cffi"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi[.]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 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 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 new file mode 100644 index 000000000000..e2a9da13b459 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''chipz''; + version = ''20160318-git''; + + description = ''A library for decompressing deflate, zlib, and gzip data''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz''; + sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826''; + }; + + packageName = "chipz"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chipz[.]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 chipz DESCRIPTION A library for decompressing deflate, zlib, and gzip data SHA256 1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826 URL + http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz MD5 625cb9c551f3692799e2029d4a0dd7e9 NAME chipz TESTNAME NIL FILENAME chipz DEPS + NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix new file mode 100644 index 000000000000..d6361d4392d1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''chunga''; + version = ''1.1.6''; + + description = ''''; + + deps = [ args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz''; + sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg''; + }; + + packageName = "chunga"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chunga[.]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 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 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 new file mode 100644 index 000000000000..39cf82831a97 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''circular-streams''; + version = ''20161204-git''; + + description = ''Circularly readable streams for Common Lisp''; + + deps = [ args."trivial-gray-streams" args."fast-io" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; + sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128''; + }; + + packageName = "circular-streams"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/circular-streams[.]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 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 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 new file mode 100644 index 000000000000..bfe44d109d5a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl+ssl''; + version = ''cl+ssl-20170403-git''; + + description = ''Common Lisp interface to OpenSSL.''; + + deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."flexi-streams" args."cffi" args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz''; + sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s''; + }; + + packageName = "cl+ssl"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl+ssl[.]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+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 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 new file mode 100644 index 000000000000..5057ddbd9d1c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-aa''; + version = ''cl-vectors-20170516-git''; + + description = ''cl-aa: polygon rasterizer''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; + sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; + }; + + packageName = "cl-aa"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-aa[.]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-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 new file mode 100644 index 000000000000..591df96c84e4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-annot''; + version = ''20150608-git''; + + description = ''Python-like Annotation Syntax for Common Lisp''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz''; + sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3''; + }; + + packageName = "cl-annot"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-annot[.]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-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 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 new file mode 100644 index 000000000000..51b5b5cf5431 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-anonfun''; + version = ''20111203-git''; + + description = ''Anonymous function helpers for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz''; + sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m''; + }; + + packageName = "cl-anonfun"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-anonfun[.]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-anonfun DESCRIPTION Anonymous function helpers for Common Lisp SHA256 16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m URL + http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz MD5 915bda1a7653d42090f8d20a1ad85d0b NAME cl-anonfun TESTNAME NIL + FILENAME cl-anonfun DEPS NIL DEPENDENCIES NIL VERSION 20111203-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..0dce1f789449 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ansi-text''; + version = ''20150804-git''; + + description = ''ANSI control string characters, focused on color''; + + deps = [ args."cl-colors" args."alexandria" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ansi-text[.]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-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 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 new file mode 100644 index 000000000000..210e914aeee8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-base''; + version = ''cl-async-20160825-git''; + + testSystems = ["cl-async"]; + + description = ''Base system for cl-async.''; + + deps = [ args."cl-libuv" args."cffi" args."bordeaux-threads" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-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 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 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 new file mode 100644 index 000000000000..21dd26e4a838 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-repl''; + version = ''cl-async-20160825-git''; + + description = ''REPL integration for CL-ASYNC.''; + + deps = [ args."bordeaux-threads" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-repl[.]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-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 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 new file mode 100644 index 000000000000..438a85700e77 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-ssl''; + version = ''cl-async-20160825-git''; + + description = ''SSL Wrapper around cl-async socket implementation.''; + + deps = [ args."vom" args."cffi" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-ssl[.]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-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 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 new file mode 100644 index 000000000000..8bc2b61128f4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-util''; + version = ''cl-async-20160825-git''; + + description = ''Internal utilities for cl-async.''; + + deps = [ args."vom" args."fast-io" args."cl-ppcre" args."cl-libuv" args."cl-async-base" args."cffi" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-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 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 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 new file mode 100644 index 000000000000..2e8a5ce83de0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -0,0 +1,40 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async''; + version = ''20160825-git''; + + description = ''Asynchronous operations for Common Lisp.''; + + deps = [ args."uiop" args."trivial-gray-streams" args."trivial-features" args."static-vectors" args."cl-ppcre" args."cl-libuv" args."cl-async-util" args."cl-async-base" args."cffi" args."babel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; + sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + }; + + packageName = "cl-async"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async[.]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-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 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 new file mode 100644 index 000000000000..86cc31f56420 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-base64''; + version = ''20150923-git''; + + description = ''Base64 encoding and decoding with URI support.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz''; + sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp''; + }; + + packageName = "cl-base64"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-base64[.]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-base64 DESCRIPTION Base64 encoding and decoding with URI support. SHA256 0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp URL + http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz MD5 560d0601eaa86901611f1484257b9a57 NAME cl-base64 TESTNAME NIL FILENAME + cl-base64 DEPS NIL DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..5abdac589dda --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-colors''; + version = ''20151218-git''; + + description = ''Simple color library for Common Lisp''; + + deps = [ args."alexandria" args."let-plus" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz''; + sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4''; + }; + + packageName = "cl-colors"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-colors[.]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-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 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 000000000000..89627b22fbc2 --- /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 new file mode 100644 index 000000000000..5aa6ad1c9c08 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cookie''; + version = ''20150804-git''; + + description = ''HTTP cookie manager''; + + deps = [ args."quri" args."proc-parse" args."local-time" args."cl-ppcre" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz''; + sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8''; + }; + + packageName = "cl-cookie"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cookie[.]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-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 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 000000000000..3436e5a75a61 --- /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 new file mode 100644 index 000000000000..489147c881be --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-dbi''; + version = ''20170124-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + packageName = "cl-dbi"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-dbi[.]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-dbi DESCRIPTION NIL SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL + http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME cl-dbi TESTNAME NIL FILENAME cl-dbi + DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */ 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 new file mode 100644 index 000000000000..067e09ab0e16 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-emb''; + version = ''20170227-git''; + + description = ''A templating system for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz''; + sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80''; + }; + + packageName = "cl-emb"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-emb[.]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-emb DESCRIPTION A templating system for Common Lisp SHA256 03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL + http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb TESTNAME NIL FILENAME cl-emb + DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..43651428bd07 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-fad''; + version = ''0.7.4''; + + description = ''Portable pathname library''; + + deps = [ args."alexandria" args."bordeaux-threads" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fad[.]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-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 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 new file mode 100644 index 000000000000..681b9205e9b3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-fuse-meta-fs''; + version = ''20150608-git''; + + description = ''CFFI bindings to FUSE (Filesystem in user space)''; + + deps = [ args."bordeaux-threads" args."cl-fuse" args."iterate" args."pcall" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse-meta-fs[.]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-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 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 new file mode 100644 index 000000000000..8681110c22e0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-fuse''; + version = ''20160318-git''; + + description = ''CFFI bindings to FUSE (Filesystem in user space)''; + + deps = [ args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-utf-8" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz''; + sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6''; + }; + + packageName = "cl-fuse"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse[.]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-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 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 000000000000..5dae43b6e59c --- /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 new file mode 100644 index 000000000000..20afe70c7960 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-json''; + version = ''20141217-git''; + + description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz''; + sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g''; + }; + + packageName = "cl-json"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-json[.]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-json DESCRIPTION JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format. SHA256 + 00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g URL http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz MD5 + 9d873fa462b93c76d90642d8e3fb4881 NAME cl-json TESTNAME NIL FILENAME cl-json DEPS NIL DEPENDENCIES NIL VERSION 20141217-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..74d40aa8e793 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-l10n-cldr''; + version = ''20120909-darcs''; + + description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n-cldr[.]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-l10n-cldr DESCRIPTION The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way. SHA256 + 03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv URL http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz MD5 + 466e776f2f6b931d9863e1fc4d0b514e NAME cl-l10n-cldr TESTNAME NIL FILENAME cl-l10n-cldr DEPS NIL DEPENDENCIES NIL VERSION 20120909-darcs SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..eabcda82eabd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-l10n''; + version = ''20161204-darcs''; + + description = ''Portable CL Locale Support''; + + deps = [ args."alexandria" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."cxml" args."flexi-streams" args."iterate" args."local-time" args."metabang-bind" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; + sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl''; + }; + + packageName = "cl-l10n"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n[.]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-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 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 new file mode 100644 index 000000000000..c08467fdd20d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-libuv''; + version = ''20160825-git''; + + description = ''Low-level libuv bindings for Common Lisp.''; + + deps = [ args."alexandria" args."cffi" args."cffi-grovel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz''; + sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r''; + }; + + packageName = "cl-libuv"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-libuv[.]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-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 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 000000000000..cc0a45b6e387 --- /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 000000000000..791b1e558271 --- /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 new file mode 100644 index 000000000000..a8f218d37565 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-markup''; + version = ''20131003-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz''; + sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r''; + }; + + packageName = "cl-markup"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markup[.]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-markup DESCRIPTION NIL SHA256 1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL + http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz MD5 3ec36b8e15435933f614959032987848 NAME cl-markup TESTNAME NIL FILENAME + cl-markup DEPS NIL DEPENDENCIES NIL VERSION 20131003-git SIBLINGS (cl-markup-test)) */ 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 new file mode 100644 index 000000000000..90983764cdac --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-mysql''; + version = ''20160628-git''; + + description = ''Common Lisp MySQL library bindings''; + + deps = [ args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz''; + sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319''; + }; + + packageName = "cl-mysql"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-mysql[.]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-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 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 new file mode 100644 index 000000000000..964c94c95d5b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-paths-ttf''; + version = ''cl-vectors-20170516-git''; + + description = ''cl-paths-ttf: vectorial paths manipulation''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-paths-ttf[.]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-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 new file mode 100644 index 000000000000..7766454c1939 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-postgres''; + version = ''postmodern-20170403-git''; + + description = ''Low-level client library for PostgreSQL''; + + deps = [ args."md5" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; + sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + }; + + packageName = "cl-postgres"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-postgres[.]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-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 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 new file mode 100644 index 000000000000..cf46246063f3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -0,0 +1,44 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ppcre-template''; + version = ''cl-unification-20170516-git''; + + description = ''A system used to conditionally load the CL-PPCRE 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.''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-template[.]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-ppcre-template DESCRIPTION A system used to conditionally load the CL-PPCRE 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 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 new file mode 100644 index 000000000000..b79a00f672f4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ppcre-unicode''; + version = ''cl-ppcre-2.0.11''; + + description = ''Perl-compatible regular expression library (Unicode)''; + + deps = [ args."cl-unicode" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-unicode[.]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-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 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 new file mode 100644 index 000000000000..b7c60a16696c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ppcre''; + version = ''2.0.11''; + + description = ''Perl-compatible regular expression library''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre[.]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-ppcre DESCRIPTION Perl-compatible regular expression library SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL + http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre TESTNAME NIL FILENAME cl-ppcre + DEPS NIL DEPENDENCIES NIL VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode)) */ 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 new file mode 100644 index 000000000000..74c1213cc6dd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-project''; + version = ''20160531-git''; + + description = ''Generate a skeleton for modern project''; + + deps = [ args."uiop" args."prove" args."local-time" args."cl-ppcre" args."cl-emb" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz''; + sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81''; + }; + + packageName = "cl-project"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-project[.]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-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 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 new file mode 100644 index 000000000000..03d863f21221 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-reexport''; + version = ''20150709-git''; + + description = ''Reexport external symbols in other packages.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz''; + sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi''; + }; + + packageName = "cl-reexport"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-reexport[.]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-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 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 new file mode 100644 index 000000000000..1d525c7a675f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-smtp''; + version = ''20160825-git''; + + description = ''Common Lisp smtp client.''; + + deps = [ args."cl+ssl" args."cl-base64" args."flexi-streams" args."trivial-gray-streams" args."usocket" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz''; + sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh''; + }; + + packageName = "cl-smtp"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-smtp[.]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-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 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 new file mode 100644 index 000000000000..9a49e468ce1e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-store''; + version = ''20160531-git''; + + description = ''Serialization package''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz''; + sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz''; + }; + + packageName = "cl-store"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-store[.]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-store DESCRIPTION Serialization package SHA256 0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz URL + http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz MD5 8b3f33956b05d8e900346663f6abca3c NAME cl-store TESTNAME NIL FILENAME + cl-store DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..e82cb4d501f9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax-annot''; + version = ''cl-syntax-20150407-git''; + + description = ''CL-Syntax Reader Syntax for cl-annot''; + + deps = [ args."cl-annot" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-annot[.]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-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 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 new file mode 100644 index 000000000000..6680fc51cbc2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax-anonfun''; + version = ''cl-syntax-20150407-git''; + + description = ''CL-Syntax Reader Syntax for cl-anonfun''; + + deps = [ args."cl-anonfun" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-anonfun[.]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-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 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 new file mode 100644 index 000000000000..2150b64cb6fc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax-markup''; + version = ''cl-syntax-20150407-git''; + + description = ''CL-Syntax Reader Syntax for CL-Markup''; + + deps = [ args."cl-markup" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-markup[.]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-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 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 new file mode 100644 index 000000000000..264d74e2db4f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax''; + version = ''20150407-git''; + + description = ''Reader Syntax Coventions for Common Lisp and SLIME''; + + deps = [ args."trivial-types" args."named-readtables" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; + sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + }; + + packageName = "cl-syntax"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax[.]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-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 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 new file mode 100644 index 000000000000..2e7f97cf66ac --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-test-more''; + version = ''prove-20170403-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; + sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + }; + + packageName = "cl-test-more"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-test-more[.]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-test-more DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL + http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more TESTNAME NIL FILENAME + cl-test-more DEPS NIL DEPENDENCIES NIL VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove)) */ 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 new file mode 100644 index 000000000000..8b0d35253f49 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-unicode''; + version = ''0.1.5''; + + description = ''Portable Unicode Library''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode[.]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-unicode DESCRIPTION Portable Unicode Library SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL + http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode TESTNAME NIL FILENAME + cl-unicode DEPS NIL DEPENDENCIES NIL VERSION 0.1.5 SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..7c5e16973efc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -0,0 +1,40 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-unification''; + version = ''20170516-git''; + + description = ''The CL-UNIFICATION system. + +The system contains the definitions for the 'unification' machinery.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz''; + sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0''; + }; + + packageName = "cl-unification"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unification[.]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-unification DESCRIPTION The CL-UNIFICATION system. + +The system contains the definitions for the 'unification' machinery. + 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 new file mode 100644 index 000000000000..da23cbc94994 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-utilities''; + version = ''1.2.4''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-utilities[.]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-utilities DESCRIPTION NIL SHA256 1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL + http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities TESTNAME NIL + FILENAME cl-utilities DEPS NIL DEPENDENCIES NIL VERSION 1.2.4 SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..fef996a845ba --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-vectors''; + version = ''20170516-git''; + + description = ''cl-paths: vectorial paths manipulation''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; + sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; + }; + + packageName = "cl-vectors"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-vectors[.]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-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 new file mode 100644 index 000000000000..e5888844c821 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-who''; + version = ''1.1.4''; + + description = ''(X)HTML generation macros''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-who[.]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-who DESCRIPTION (X)HTML generation macros SHA256 0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL + http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5 a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who TESTNAME NIL FILENAME cl-who DEPS NIL + DEPENDENCIES NIL VERSION 1.1.4 SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..e00c430581f2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clack-v1-compat''; + version = ''clack-20170516-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz''; + sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw''; + }; + + packageName = "clack-v1-compat"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-v1-compat[.]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 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 + t-clack-middleware-auth-basic t-clack-middleware-csrf)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix new file mode 100644 index 000000000000..43c75bdd6e80 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clack''; + version = ''20170516-git''; + + description = ''Web application environment for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz''; + sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw''; + }; + + packageName = "clack"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack[.]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 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 + t-clack-middleware-auth-basic t-clack-middleware-csrf)) */ 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 new file mode 100644 index 000000000000..d73de2e941ca --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''closer-mop''; + 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-05-16/closer-mop-20170516-git.tgz''; + sha256 = ''072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w''; + }; + + packageName = "closer-mop"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closer-mop[.]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 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 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 new file mode 100644 index 000000000000..8dca87dc1820 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''closure-common''; + version = ''20101107-git''; + + description = ''''; + + deps = [ args."babel" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz''; + sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4''; + }; + + packageName = "closure-common"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closure-common[.]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 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 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 new file mode 100644 index 000000000000..76eae519de91 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clsql''; + version = ''20160208-git''; + + description = ''Common Lisp SQL Interface library''; + + deps = [ args."uffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; + sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + }; + + packageName = "clsql"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clsql[.]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 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 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 new file mode 100644 index 000000000000..81e50db852b1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clss''; + version = ''20170516-git''; + + description = ''A DOM tree searching engine based on CSS selectors.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz''; + sha256 = ''1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f''; + }; + + packageName = "clss"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clss[.]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 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 new file mode 100644 index 000000000000..dfd8669b59f7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clx-truetype''; + version = ''20160825-git''; + + description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.''; + + deps = [ args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; + sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67''; + }; + + packageName = "clx-truetype"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx-truetype[.]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 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 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 new file mode 100644 index 000000000000..b47a7cbd7d4a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clx''; + 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-05-16/clx-20170516-git.tgz''; + sha256 = ''00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs''; + }; + + packageName = "clx"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx[.]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 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 new file mode 100644 index 000000000000..276b13e1bd09 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''command-line-arguments''; + version = ''20151218-git''; + + description = ''small library to deal with command-line arguments''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/command-line-arguments[.]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 command-line-arguments DESCRIPTION small library to deal with command-line arguments SHA256 07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL + http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME + command-line-arguments TESTNAME NIL FILENAME command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..695164566ba3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-lite''; + version = ''20120407-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz''; + sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg''; + }; + + packageName = "css-lite"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/css-lite[.]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 css-lite DESCRIPTION NIL SHA256 1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL + http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite TESTNAME NIL FILENAME + css-lite DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..924b61cae6e1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-dom''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."cxml-xml" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + packageName = "cxml-dom"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-dom[.]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 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 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 new file mode 100644 index 000000000000..f8418ccf27f2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-klacks''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."cxml-xml" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + packageName = "cxml-klacks"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-klacks[.]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 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 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 new file mode 100644 index 000000000000..e8856352dcd5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-test''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."cxml-xml" args."cxml-klacks" args."cxml-dom" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + packageName = "cxml-test"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-test[.]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 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 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 new file mode 100644 index 000000000000..5d8ef1587724 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-xml''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."trivial-gray-streams" args."puri" args."closure-common" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + packageName = "cxml-xml"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-xml[.]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 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 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 new file mode 100644 index 000000000000..baab538ca38b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml''; + version = ''20110619-git''; + + description = ''''; + + deps = [ args."cxml-dom" args."cxml-klacks" args."cxml-test" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + packageName = "cxml"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml[.]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 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 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 000000000000..06ffeb9ad69a --- /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 new file mode 100644 index 000000000000..93d0e3d599b8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbd-mysql''; + version = ''cl-dbi-20170124-git''; + + description = ''Database driver for MySQL.''; + + deps = [ args."cl-syntax-annot" args."cl-syntax" args."cl-mysql" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + packageName = "dbd-mysql"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-mysql[.]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 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 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 new file mode 100644 index 000000000000..3c963b5141ed --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbd-postgres''; + version = ''cl-dbi-20170124-git''; + + description = ''Database driver for PostgreSQL.''; + + deps = [ args."trivial-garbage" args."cl-syntax-annot" args."cl-syntax" args."cl-postgres" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + packageName = "dbd-postgres"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-postgres[.]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 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 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 new file mode 100644 index 000000000000..e19565fc2771 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbd-sqlite3''; + version = ''cl-dbi-20170124-git''; + + description = ''Database driver for SQLite3.''; + + deps = [ args."uiop" args."sqlite" args."cl-syntax-annot" args."cl-syntax" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + packageName = "dbd-sqlite3"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-sqlite3[.]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 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 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 new file mode 100644 index 000000000000..54f1cf78e40a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dexador''; + version = ''20170516-git''; + + description = ''Yet another HTTP client for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz''; + sha256 = ''129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6''; + }; + + packageName = "dexador"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dexador[.]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 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 new file mode 100644 index 000000000000..993a49bc9f95 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''do-urlencode''; + version = ''20130720-git''; + + description = ''Percent Encoding (aka URL Encoding) library''; + + deps = [ args."babel" args."babel-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz''; + sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa''; + }; + + packageName = "do-urlencode"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/do-urlencode[.]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 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 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 new file mode 100644 index 000000000000..d9bacd96af89 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''documentation-utils''; + version = ''20170516-git''; + + description = ''A few simple tools to help you with documenting your library.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz''; + sha256 = ''0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1''; + }; + + packageName = "documentation-utils"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/documentation-utils[.]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 documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 + 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 new file mode 100644 index 000000000000..16bbac4d03a1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''drakma''; + version = ''2.0.2''; + + description = ''Full-featured http/https client based on usocket''; + + deps = [ args."usocket" args."puri" args."flexi-streams" args."cl-ppcre" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz''; + sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z''; + }; + + packageName = "drakma"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/drakma[.]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 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 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 000000000000..283dfe813ac7 --- /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 new file mode 100644 index 000000000000..49c0ff6c8ce4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''esrap''; + version = ''20170516-git''; + + description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz''; + sha256 = ''06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8''; + }; + + packageName = "esrap"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/esrap[.]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 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 new file mode 100644 index 000000000000..698189fc9113 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''external-program''; + version = ''20160825-git''; + + description = ''''; + + deps = [ args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz''; + sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13''; + }; + + packageName = "external-program"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/external-program[.]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 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 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 new file mode 100644 index 000000000000..7b100d891b92 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fast-http''; + version = ''20170227-git''; + + description = ''A fast HTTP protocol parser in Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz''; + sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx''; + }; + + packageName = "fast-http"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-http[.]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 fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx URL + http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz MD5 5c5e2073702e7504a30c739e25c47c69 NAME fast-http TESTNAME NIL FILENAME + fast-http DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (fast-http-test)) */ 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 new file mode 100644 index 000000000000..0e8194931091 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fast-io''; + version = ''20170516-git''; + + description = ''Alternative I/O mechanism to a stream or vector''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz''; + sha256 = ''1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1''; + }; + + packageName = "fast-io"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-io[.]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 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 new file mode 100644 index 000000000000..1bb2b6b9c188 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''flexi-streams''; + version = ''1.0.15''; + + description = ''Flexible bivalent streams for Common Lisp''; + + deps = [ args."trivial-gray-streams" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/flexi-streams[.]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 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 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 new file mode 100644 index 000000000000..754d2f8c8691 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''form-fiddle''; + version = ''20170516-git''; + + description = ''A collection of utilities to destructure lambda forms.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz''; + sha256 = ''00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh''; + }; + + packageName = "form-fiddle"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/form-fiddle[.]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 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 000000000000..72403e8598a9 --- /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 new file mode 100644 index 000000000000..e6510c59c30d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''http-body''; + version = ''20161204-git''; + + description = ''HTTP POST data parser for Common Lisp''; + + deps = [ args."trivial-gray-streams" args."quri" args."jonathan" args."flexi-streams" args."fast-http" args."cl-utilities" args."cl-ppcre" args."babel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; + sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi''; + }; + + packageName = "http-body"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/http-body[.]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 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 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 new file mode 100644 index 000000000000..f36b4e931ec7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hu.dwim.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.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 new file mode 100644 index 000000000000..2aedd0f6704c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hu.dwim.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.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 000000000000..b358ff0562d9 --- /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 000000000000..5e5e56be2e58 --- /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 new file mode 100644 index 000000000000..e0a2d194f9ec --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -0,0 +1,45 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hunchentoot''; + version = ''1.2.35''; + + description = ''Hunchentoot is a HTTP server based on USOCKET and + BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a + simple framework for user-defined handlers and can be extended + through subclassing.''; + + deps = [ args."bordeaux-threads" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz''; + sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74''; + }; + + packageName = "hunchentoot"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hunchentoot[.]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 hunchentoot DESCRIPTION Hunchentoot is a HTTP server based on USOCKET and + BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a + simple framework for user-defined handlers and can be extended + 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 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 new file mode 100644 index 000000000000..d849cf15272a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''idna''; + version = ''20120107-git''; + + description = ''IDNA (international domain names) string encoding and decoding routines''; + + deps = [ args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz''; + sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c''; + }; + + packageName = "idna"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/idna[.]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 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 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 000000000000..fb106aa54c5d --- /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 new file mode 100644 index 000000000000..404c7a5dee9f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iolib''; + version = ''v0.8.2''; + + description = ''I/O library.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz''; + sha256 = ''1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr''; + }; + + packageName = "iolib"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib[.]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 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 new file mode 100644 index 000000000000..944781947fa9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''ironclad''; + version = ''v0.34''; + + description = ''A cryptographic toolkit written in pure Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz''; + sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0''; + }; + + packageName = "ironclad"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ironclad[.]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 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 new file mode 100644 index 000000000000..5e02dceb84c5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iterate''; + version = ''20160825-darcs''; + + description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz''; + sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm''; + }; + + packageName = "iterate"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iterate[.]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 iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm URL + http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz MD5 e73ff4898ce4831ff2a28817f32de86e NAME iterate TESTNAME NIL FILENAME + iterate DEPS NIL DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL) */ 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 000000000000..3d2da3fa6bc1 --- /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 new file mode 100644 index 000000000000..841c210a5aed --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''jonathan''; + version = ''20170516-git''; + + description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz''; + sha256 = ''00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q''; + }; + + packageName = "jonathan"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/jonathan[.]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 jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256 + 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.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix new file mode 100644 index 000000000000..2e8c2fe291fb --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -0,0 +1,40 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lack''; + version = ''20161204-git''; + + description = ''A minimal Clack''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; + sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; + }; + + packageName = "lack"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack[.]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 DESCRIPTION A minimal Clack SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL + http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack TESTNAME NIL FILENAME lack DEPS NIL + DEPENDENCIES NIL VERSION 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-util 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/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix new file mode 100644 index 000000000000..4082abbe656d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''let-plus''; + version = ''20170124-git''; + + description = ''Destructuring extension of LET*.''; + + deps = [ args."alexandria" args."anaphora" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz''; + sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8''; + }; + + packageName = "let-plus"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/let-plus[.]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 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 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 new file mode 100644 index 000000000000..f35ba345d1b1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lev''; + version = ''20150505-git''; + + description = ''libev bindings for Common Lisp''; + + deps = [ args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz''; + sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl''; + }; + + packageName = "lev"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lev[.]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 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 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 000000000000..720afedb815b --- /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 new file mode 100644 index 000000000000..0740ec0779fd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''local-time''; + version = ''20170516-git''; + + description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz''; + sha256 = ''0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p''; + }; + + packageName = "local-time"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/local-time[.]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 local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256 + 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 000000000000..a8d9d94c6647 --- /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 new file mode 100644 index 000000000000..51c8af197fc3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lquery''; + version = ''20170516-git''; + + description = ''A library to allow jQuery-like HTML/DOM manipulation.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz''; + sha256 = ''11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7''; + }; + + packageName = "lquery"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lquery[.]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 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 new file mode 100644 index 000000000000..b5c242530fe4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''map-set''; + version = ''20160628-hg''; + + description = ''Set-like data structure.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz''; + sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v''; + }; + + packageName = "map-set"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/map-set[.]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 map-set DESCRIPTION Set-like data structure. SHA256 15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL + http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set TESTNAME NIL FILENAME + map-set DEPS NIL DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix new file mode 100644 index 000000000000..5729c898fdc6 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''marshal''; + version = ''cl-20170124-git''; + + description = ''marshal: Simple (de)serialization of Lisp datastructures.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz''; + sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d''; + }; + + packageName = "marshal"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/marshal[.]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 marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d URL + http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz MD5 ebde1b0f1c1abeb409380884cc665351 NAME marshal TESTNAME NIL FILENAME + marshal DEPS NIL DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix new file mode 100644 index 000000000000..1384799d242b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''md5''; + version = ''20170516-git''; + + description = ''The MD5 Message-Digest Algorithm RFC 1321''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz''; + sha256 = ''1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv''; + }; + + packageName = "md5"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/md5[.]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 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 new file mode 100644 index 000000000000..0bfbbbe14b2f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''metabang-bind''; + version = ''20170124-git''; + + description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz''; + sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc''; + }; + + packageName = "metabang-bind"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metabang-bind[.]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 metabang-bind DESCRIPTION + Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. SHA256 + 1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc URL http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz MD5 + 20c6a434308598ad7fa224d99f3bcbf6 NAME metabang-bind TESTNAME NIL FILENAME metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS + (metabang-bind-test)) */ 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 000000000000..1e35369a9d02 --- /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 000000000000..3586d5cc21b7 --- /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 new file mode 100644 index 000000000000..6580c322b04c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''myway''; + version = ''20150302-git''; + + description = ''Sinatra-compatible routing library.''; + + deps = [ args."quri" args."map-set" args."cl-utilities" args."cl-ppcre" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz''; + sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh''; + }; + + packageName = "myway"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/myway[.]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 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 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 new file mode 100644 index 000000000000..53834f82431d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''named-readtables''; + version = ''20170124-git''; + + description = ''Library that creates a namespace for named readtable + akin to the namespace of packages.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz''; + sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45''; + }; + + packageName = "named-readtables"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/named-readtables[.]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 named-readtables DESCRIPTION Library that creates a namespace for named readtable + akin to the namespace of packages. + SHA256 1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45 URL + http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz MD5 1237a07f90e29939e48b595eaad2bd82 NAME named-readtables + TESTNAME NIL FILENAME named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix new file mode 100644 index 000000000000..622fd506b153 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''nibbles''; + version = ''20170403-git''; + + description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz''; + sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4''; + }; + + packageName = "nibbles"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/nibbles[.]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 nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders SHA256 + 0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4 URL http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz MD5 + 5683a0a5510860a036b2a272036cda87 NAME nibbles TESTNAME NIL FILENAME nibbles DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix new file mode 100644 index 000000000000..74cb02155eb7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''optima''; + version = ''20150709-git''; + + description = ''Optimized Pattern Matching Library''; + + deps = [ args."closer-mop" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz''; + sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc''; + }; + + packageName = "optima"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/optima[.]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 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 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 new file mode 100644 index 000000000000..b7398d3973d5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''parenscript''; + version = ''Parenscript-2.6''; + + description = ''Lisp to JavaScript transpiler''; + + deps = [ args."named-readtables" args."cl-ppcre" args."anaphora" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz''; + sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li''; + }; + + packageName = "parenscript"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parenscript[.]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 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 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 000000000000..726209f96178 --- /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 new file mode 100644 index 000000000000..f12f7b68d009 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''pcall''; + version = ''0.3''; + + description = ''''; + + deps = [ args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; + sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + }; + + packageName = "pcall"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pcall[.]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 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 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 000000000000..d5ef8606f495 --- /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 new file mode 100644 index 000000000000..d89e25f88190 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''plump''; + 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-05-16/plump-20170516-git.tgz''; + sha256 = ''0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8''; + }; + + packageName = "plump"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/plump[.]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 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 000000000000..18dc40ff51ad --- /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 new file mode 100644 index 000000000000..142d24f5e48f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''proc-parse''; + version = ''20160318-git''; + + description = ''Procedural vector parser''; + + deps = [ args."babel" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz''; + sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl''; + }; + + packageName = "proc-parse"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/proc-parse[.]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 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 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 new file mode 100644 index 000000000000..ae823959fdcb --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''prove''; + version = ''20170403-git''; + + description = ''''; + + deps = [ args."uiop" args."cl-ppcre" args."cl-colors" args."cl-ansi-text" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; + sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + }; + + packageName = "prove"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/prove[.]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 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 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 new file mode 100644 index 000000000000..9a7e24cebdc9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''puri''; + version = ''20150923-git''; + + description = ''Portable Universal Resource Indentifier Library''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz''; + sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa''; + }; + + packageName = "puri"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/puri[.]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 puri DESCRIPTION Portable Universal Resource Indentifier Library SHA256 099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa URL + http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz MD5 3bd4e30aa6b6baf6f26753b5fc357e0f NAME puri TESTNAME NIL FILENAME puri DEPS NIL + DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */ 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 000000000000..868aae61f6bd --- /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 000000000000..b9871752e58d --- /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 new file mode 100644 index 000000000000..1cfd62686c4c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''query-fs''; + version = ''20160531-git''; + + description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; + + deps = [ args."bordeaux-threads" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."command-line-arguments" args."iterate" args."trivial-backtrace" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz''; + sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a''; + }; + + packageName = "query-fs"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/query-fs[.]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 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 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 new file mode 100644 index 000000000000..26fab0612e94 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''quri''; + version = ''20161204-git''; + + description = ''Yet another URI library for Common Lisp''; + + deps = [ args."split-sequence" args."cl-utilities" args."babel" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz''; + sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv''; + }; + + packageName = "quri"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/quri[.]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 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 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 new file mode 100644 index 000000000000..e74c2c51b79e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''rfc2388''; + version = ''20130720-git''; + + description = ''Implementation of RFC 2388''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz''; + sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6''; + }; + + packageName = "rfc2388"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/rfc2388[.]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 rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256 1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL + http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 TESTNAME NIL FILENAME + rfc2388 DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix new file mode 100644 index 000000000000..9654a86b74bf --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''salza2''; + version = ''2.0.9''; + + description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP + data formats''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz''; + sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va''; + }; + + packageName = "salza2"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/salza2[.]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 salza2 DESCRIPTION Create compressed data in the ZLIB, DEFLATE, or GZIP + data formats + SHA256 1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va URL http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz MD5 + e62383de435081c0f1f888ec363bb32c NAME salza2 TESTNAME NIL FILENAME salza2 DEPS NIL DEPENDENCIES NIL VERSION 2.0.9 SIBLINGS NIL) */ 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 000000000000..00e2b3dbd0f9 --- /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 new file mode 100644 index 000000000000..9a04f3c64dba --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''smart-buffer''; + version = ''20160628-git''; + + description = ''Smart octets buffer''; + + deps = [ args."xsubseq" args."uiop" args."flexi-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz''; + sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s''; + }; + + packageName = "smart-buffer"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/smart-buffer[.]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 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 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 new file mode 100644 index 000000000000..03331578764c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''split-sequence''; + version = ''1.2''; + + description = ''Splits a sequence into a list of subsequences + delimited by objects satisfying a test.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz''; + sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l''; + }; + + packageName = "split-sequence"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/split-sequence[.]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 split-sequence DESCRIPTION Splits a sequence into a list of subsequences + delimited by objects satisfying a test. + SHA256 12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l URL http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz MD5 + 194e24d60f0fba70a059633960052e21 NAME split-sequence TESTNAME NIL FILENAME split-sequence DEPS NIL DEPENDENCIES NIL VERSION 1.2 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix new file mode 100644 index 000000000000..73144329206c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''sqlite''; + version = ''cl-20130615-git''; + + description = ''''; + + deps = [ args."cffi" args."iterate" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz''; + sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh''; + }; + + packageName = "sqlite"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/sqlite[.]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 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 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 new file mode 100644 index 000000000000..e06fe790f76c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''static-vectors''; + version = ''v1.8.2''; + + description = ''Create vectors allocated in static memory.''; + + deps = [ args."alexandria" args."cffi" args."cffi-grovel" ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/static-vectors[.]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 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 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 new file mode 100644 index 000000000000..6aa42000e73e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''stumpwm''; + version = ''20170516-git''; + + description = ''A tiling, keyboard driven window manager''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz''; + sha256 = ''0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659''; + }; + + packageName = "stumpwm"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/stumpwm[.]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 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 new file mode 100644 index 000000000000..45d7a7800d50 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''swap-bytes''; + version = ''v1.1''; + + description = ''Optimized byte-swapping primitives.''; + + deps = [ args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz''; + sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky''; + }; + + packageName = "swap-bytes"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/swap-bytes[.]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 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 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 new file mode 100644 index 000000000000..0ed2e2887601 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-backtrace''; + version = ''20160531-git''; + + description = ''trivial-backtrace''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz''; + sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx''; + }; + + packageName = "trivial-backtrace"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-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 trivial-backtrace DESCRIPTION trivial-backtrace SHA256 1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL + http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz MD5 a3b41b4ae24e3fde303a2623201aac4d NAME + trivial-backtrace TESTNAME NIL FILENAME trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS (trivial-backtrace-test)) */ 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 new file mode 100644 index 000000000000..ea531d722d44 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-features''; + version = ''20161204-git''; + + description = ''Ensures consistent *FEATURES* across multiple CLs.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz''; + sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2''; + }; + + packageName = "trivial-features"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-features[.]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 trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL + http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features + TESTNAME NIL FILENAME trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS (trivial-features-tests)) */ 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 new file mode 100644 index 000000000000..43bcd571304a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-garbage''; + version = ''20150113-git''; + + description = ''Portable finalizers, weak hash-tables and weak pointers.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz''; + sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08''; + }; + + packageName = "trivial-garbage"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-garbage[.]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 trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL + http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage + TESTNAME NIL FILENAME trivial-garbage DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..220119170228 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-gray-streams''; + version = ''20140826-git''; + + description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-gray-streams[.]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 trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). SHA256 + 1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92 URL + http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz MD5 1ca280830c8c438ca2ccfadb3763ae83 NAME + trivial-gray-streams TESTNAME NIL FILENAME trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20140826-git SIBLINGS (trivial-gray-streams-test)) */ 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 new file mode 100644 index 000000000000..05631ab2b930 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-indent''; + 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/2017-05-16/trivial-indent-20170516-git.tgz''; + sha256 = ''0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma''; + }; + + packageName = "trivial-indent"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-indent[.]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 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 new file mode 100644 index 000000000000..f4a84b5ceef0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-mimes''; + version = ''20170516-git''; + + description = ''Tiny library to detect mime types in files.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz''; + sha256 = ''1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2''; + }; + + packageName = "trivial-mimes"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-mimes[.]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 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 new file mode 100644 index 000000000000..8aed5e9681cd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-types''; + version = ''20120407-git''; + + description = ''Trivial type definitions''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz''; + sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx''; + }; + + packageName = "trivial-types"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-types[.]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 trivial-types DESCRIPTION Trivial type definitions SHA256 0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx URL + http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz MD5 b14dbe0564dcea33d8f4e852a612d7db NAME trivial-types TESTNAME + NIL FILENAME trivial-types DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */ 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 new file mode 100644 index 000000000000..efbdca21465c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-utf-8''; + version = ''20111001-darcs''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-utf-8[.]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 trivial-utf-8 DESCRIPTION NIL SHA256 1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL + http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 + TESTNAME NIL FILENAME trivial-utf-8 DEPS NIL DEPENDENCIES NIL VERSION 20111001-darcs SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix new file mode 100644 index 000000000000..78085ff17629 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''uffi''; + version = ''20150923-git''; + + description = ''Universal Foreign Function Library for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz''; + sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy''; + }; + + packageName = "uffi"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uffi[.]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 uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy URL + http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz MD5 84babed7d1633cf01610e81f027024da NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL + DEPENDENCIES NIL VERSION 20150923-git SIBLINGS (uffi-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix new file mode 100644 index 000000000000..579ad469cda9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''uiop''; + version = ''3.2.1''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz''; + sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v''; + }; + + packageName = "uiop"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uiop[.]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 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 new file mode 100644 index 000000000000..c071b2f3bbde --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''usocket''; + version = ''0.7.0.1''; + + description = ''Universal socket library for Common Lisp''; + + deps = [ args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz''; + sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2''; + }; + + packageName = "usocket"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/usocket[.]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 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 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 000000000000..1f415f7142ac --- /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 new file mode 100644 index 000000000000..7be98029ca21 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''vom''; + version = ''20160825-git''; + + description = ''A tiny logging utility.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz''; + sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93''; + }; + + packageName = "vom"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/vom[.]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 vom DESCRIPTION A tiny logging utility. SHA256 0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93 URL + http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz MD5 ad16bdc0221b08de371be6ce25ce3d47 NAME vom TESTNAME NIL FILENAME vom DEPS NIL + DEPENDENCIES NIL VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix new file mode 100644 index 000000000000..086a374d6e7b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''woo''; + version = ''20170227-git''; + + description = ''An asynchronous HTTP server written in Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz''; + sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1''; + }; + + packageName = "woo"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/woo[.]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 woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1 URL + http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz MD5 cc37270ad408e093bd28c025466d8f64 NAME woo TESTNAME NIL FILENAME woo DEPS NIL + DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (clack-handler-woo woo-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix new file mode 100644 index 000000000000..46262fb78f43 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''wookie''; + version = ''20170227-git''; + + description = ''An evented webserver for Common Lisp.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz''; + sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0''; + }; + + packageName = "wookie"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/wookie[.]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 wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL + http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie TESTNAME NIL FILENAME wookie + DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix new file mode 100644 index 000000000000..4d1d902cf5c0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xmls''; + version = ''1.7''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz''; + sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b''; + }; + + packageName = "xmls"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xmls[.]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 xmls DESCRIPTION NIL SHA256 1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b URL http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz + MD5 697c9f49a60651b759e24ea0c1eb1cfe NAME xmls TESTNAME NIL FILENAME xmls DEPS NIL DEPENDENCIES NIL VERSION 1.7 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix new file mode 100644 index 000000000000..c1c699bd3629 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xsubseq''; + version = ''20150113-git''; + + description = ''Efficient way to manage "subseq"s in Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz''; + sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q''; + }; + + packageName = "xsubseq"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xsubseq[.]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 xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp SHA256 0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q URL + http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz MD5 56f7a4ac1f05f10e7226e0e5b7b0bfa7 NAME xsubseq TESTNAME NIL FILENAME + xsubseq DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix new file mode 100644 index 000000000000..d581891c7cc8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''yason''; + version = ''v0.7.6''; + + description = ''JSON parser/encoder''; + + deps = [ args."alexandria" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz''; + sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk''; + }; + + packageName = "yason"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/yason[.]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 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 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 new file mode 100644 index 000000000000..0a1a9ee2f818 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''zpb-ttf''; + version = ''1.0.3''; + + description = ''Access TrueType font metrics and outlines from Common Lisp''; + + deps = [ ]; + + src = fetchurl { + 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 = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/zpb-ttf[.]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 zpb-ttf DESCRIPTION Access TrueType font metrics and outlines from Common Lisp SHA256 1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6 URL + http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz MD5 1e896d8b0b01babab882e43fe4c3c2d4 NAME zpb-ttf TESTNAME NIL FILENAME zpb-ttf DEPS + NIL DEPENDENCIES NIL VERSION 1.0.3 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp new file mode 100644 index 000000000000..a710d25ab5cd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp @@ -0,0 +1,7 @@ +(setf + (gethash "cxml-xml" testnames) "cxml" + (gethash "cxml-dom" testnames) "cxml" + (gethash "cxml-test" testnames) "cxml" + (gethash "cxml-klacks" testnames) "cxml" + (gethash "cl-async-base" testnames) "cl-async" + ) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix new file mode 100644 index 000000000000..a760e0cb6842 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -0,0 +1,193 @@ +{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}: +let + addDeps = newdeps: x: {deps = x.deps ++ newdeps;}; + addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; + skipBuildPhase = x: { + overrides = y: ((x.overrides y) // { buildPhase = "true"; }); + }; + qlnp = quicklisp-to-nix-packages; + multiOverride = l: x: if l == [] then {} else + ((builtins.head l) x) // (multiOverride (builtins.tail l) x); +in +{ + stumpwm = x:{ + overrides = y: (x.overrides y) // { + preConfigure = '' + export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; + ''; + }; + propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [ + alexandria cl-ppcre clx + ]); + }; + iterate = skipBuildPhase; + cl-fuse = x: { + propagatedBuildInputs = [pkgs.fuse]; + overrides = y : (x.overrides y) // { + configurePhase = '' + export SAVED_CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY" + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD" + export makeFlags="$makeFlags LISP=common-lisp.sh" + ''; + preInstall = '' + export CL_SOURCE_REGISTRY="$SAVED_CL_SOURCE_REGISTRY" + ''; + }; + }; + hunchentoot = addNativeLibs [pkgs.openssl]; + 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]); + clack-v1-compat = addDeps (with qlnp;[ + lack bordeaux-threads prove usocket dexador http-body trivial-backtrace + marshal local-time cl-base64 cl-ppcre quri trivial-mimes trivial-types + flexi-streams circular-streams ironclad cl-syntax-annot alexandria + split-sequence + ]); + lack = addDeps (with qlnp; [ironclad]); + cxml = multiOverride [ skipBuildPhase (addDeps (with qlnp; [ + closure-common puri trivial-gray-streams + ]))]; + wookie = multiOverride [(addDeps (with qlnp; [ + alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre + cl-fad fast-io vom do-urlencode cl-async-ssl + ])) + (addNativeLibs (with pkgs; [libuv openssl]))]; + woo = addDeps (with qlnp; [ + cffi lev clack swap-bytes static-vectors fast-http proc-parse quri fast-io + trivial-utf-8 vom + ]); + lev = addNativeLibs [pkgs.libev]; + dexador = addDeps (with qlnp; [ + usocket fast-http quri fast-io chunga cl-ppcre cl-cookie trivial-mimes + chipz cl-base64 cl-reexport qlnp."cl+ssl" alexandria bordeaux-threads + ]); + fast-http = addDeps (with qlnp; [ + alexandria cl-utilities proc-parse xsubseq smart-buffer + ]); + cl-emb = addDeps (with qlnp; [cl-ppcre]); + "cl+ssl" = addNativeLibs [pkgs.openssl]; + cl-colors = skipBuildPhase; + cl-libuv = addNativeLibs [pkgs.libuv]; + cl-async = addDeps (with qlnp; [cl-async-base]); + cl-async-ssl = multiOverride [(addDeps (with qlnp; [cl-async-base])) + (addNativeLibs [pkgs.openssl])]; + cl-async-repl = addDeps (with qlnp; [cl-async]); + cl-async-base = addDeps (with qlnp; [ + cffi fast-io vom cl-libuv cl-ppcre trivial-features static-vectors + trivial-gray-streams babel + ]); + cl-async-util = addDeps (with qlnp; [ cl-async-base ]); + css-lite = addDeps (with qlnp; [parenscript]); + clsql = x: { + propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; + overrides = y: (x.overrides y) // { + preConfigure = ((x.overrides y).preConfigure or "") + '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql" + ''; + }; + }; + clx-truetype = skipBuildPhase; + query-fs = x: { + overrides = y: (x.overrides y) // { + linkedSystems = []; + postInstall = ((x.overrides y).postInstall or "") + '' + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs" + export HOME=$PWD + build-with-lisp.sh sbcl \ + ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \ + "$out/bin/query-fs" \ + "(query-fs:run-fs-with-cmdline-args)" + ''; + }; + }; + 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 + ]); + dbd-sqlite3 = addDeps (with qlnp; [cl-dbi]); + dbd-postgres = addDeps (with qlnp; [cl-dbi]); + dbd-mysql = addDeps (with qlnp; [cl-dbi]); + cl-mysql = addNativeLibs [pkgs.mysql]; + cl-ppcre-template = x: { + overrides = y: (x.overrides y) // { + postPatch = '' + 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 trivial-gray-streams]); + babel = addDeps (with qlnp; [trivial-features alexandria]); + plump = addDeps (with qlnp; [array-utils trivial-indent]); + sqlite = addNativeLibs [pkgs.sqlite]; + uiop = x: { + testSystems = (x.testSystems or ["uiop"]) ++ [ + "uiop/version" + ]; + overrides = y: (x.overrides y) // { + postInstall = ((x.overrides y).postInstall or "") + '' + cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop" + ''; + }; + }; + 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 new file mode 100644 index 000000000000..74946f07f076 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -0,0 +1,103 @@ +3bmd +alexandria +array-utils +babel +blackbird +bordeaux-threads +caveman +cffi +chipz +circular-streams +clack +clack-v1-compat +cl-async +cl-async-base +cl-async-repl +cl-async-ssl +cl-base64 +cl-colors +cl-cookie +cl-dbi +cl-emb +cl-fuse +cl-fuse-meta-fs +cl-json +cl-l10n +cl-libuv +cl-mysql +closer-mop +cl-ppcre +cl-ppcre-template +cl-ppcre-unicode +cl-reexport +cl-smtp +clsql +clss +cl+ssl +cl-syntax-annot +cl-syntax-anonfun +cl-syntax-markup +cl-test-more +cl-unicode +cl-unification +cl-utilities +cl-vectors +cl-who +clx +clx-truetype +command-line-arguments +css-lite +cxml +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 +lack +lev +local-time +lquery +marshal +nibbles +optima +parenscript +pcall +pgloader +plump +proc-parse +prove +query-fs +quri +salza2 +smart-buffer +split-sequence +static-vectors +stumpwm +swap-bytes +trivial-backtrace +trivial-indent +trivial-mimes +trivial-types +trivial-utf-8 +usocket +woo +wookie +xmls +xsubseq +yason diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix new file mode 100644 index 000000000000..c87b827112c2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -0,0 +1,1604 @@ +{stdenv, fetchurl, pkgs, clwrapper}: +let quicklisp-to-nix-packages = rec { + inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + + callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; + buildLispPackage = callPackage ./define-package.nix; + qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; + + "asdf-system-connections" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."asdf-system-connections" or (x: {})) + (import ./quicklisp-to-nix-output/asdf-system-connections.nix { + inherit fetchurl; + })); + + + "closure-common" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-common" or (x: {})) + (import ./quicklisp-to-nix-output/closure-common.nix { + inherit fetchurl; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "list-of" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."list-of" or (x: {})) + (import ./quicklisp-to-nix-output/list-of.nix { + inherit fetchurl; + })); + + + "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"; + })); + + + "cxml-xml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-xml" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-xml.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "puri" = quicklisp-to-nix-packages."puri"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + })); + + + "babel-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."babel-streams" or (x: {})) + (import ./quicklisp-to-nix-output/babel-streams.nix { + inherit fetchurl; + })); + + + "map-set" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."map-set" or (x: {})) + (import ./quicklisp-to-nix-output/map-set.nix { + inherit fetchurl; + })); + + + "cl-ansi-text" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ansi-text" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ansi-text.nix { + inherit fetchurl; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/named-readtables.nix { + inherit fetchurl; + })); + + + "rfc2388" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."rfc2388" or (x: {})) + (import ./quicklisp-to-nix-output/rfc2388.nix { + inherit fetchurl; + })); + + + "md5" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."md5" or (x: {})) + (import ./quicklisp-to-nix-output/md5.nix { + inherit fetchurl; + })); + + + "jonathan" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."jonathan" or (x: {})) + (import ./quicklisp-to-nix-output/jonathan.nix { + inherit fetchurl; + })); + + + "chunga" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."chunga" or (x: {})) + (import ./quicklisp-to-nix-output/chunga.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/sqlite.nix { + inherit fetchurl; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + + "cl-postgres" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-postgres" or (x: {})) + (import ./quicklisp-to-nix-output/cl-postgres.nix { + inherit fetchurl; + "md5" = quicklisp-to-nix-packages."md5"; + })); + + + "cxml-test" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-test" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-test.nix { + inherit fetchurl; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + })); + + + "cxml-klacks" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-klacks" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-klacks.nix { + inherit fetchurl; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + })); + + + "cxml-dom" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-dom" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-dom.nix { + inherit fetchurl; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + })); + + + "zpb-ttf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."zpb-ttf" or (x: {})) + (import ./quicklisp-to-nix-output/zpb-ttf.nix { + inherit fetchurl; + })); + + + "cl-store" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-store" or (x: {})) + (import ./quicklisp-to-nix-output/cl-store.nix { + inherit fetchurl; + })); + + + "cl-paths-ttf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-paths-ttf" or (x: {})) + (import ./quicklisp-to-nix-output/cl-paths-ttf.nix { + inherit fetchurl; + })); + + + "cl-aa" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-aa" or (x: {})) + (import ./quicklisp-to-nix-output/cl-aa.nix { + inherit fetchurl; + })); + + + "cl-markup" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-markup" or (x: {})) + (import ./quicklisp-to-nix-output/cl-markup.nix { + inherit fetchurl; + })); + + + "cl-anonfun" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-anonfun" or (x: {})) + (import ./quicklisp-to-nix-output/cl-anonfun.nix { + inherit fetchurl; + })); + + + "cl-annot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-annot.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "trivial-garbage" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-garbage" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-garbage.nix { + inherit fetchurl; + })); + + + "uffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."uffi" or (x: {})) + (import ./quicklisp-to-nix-output/uffi.nix { + inherit fetchurl; + })); + + + "metabang-bind" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."metabang-bind" or (x: {})) + (import ./quicklisp-to-nix-output/metabang-bind.nix { + inherit fetchurl; + })); + + + "cl-l10n-cldr" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-l10n-cldr" or (x: {})) + (import ./quicklisp-to-nix-output/cl-l10n-cldr.nix { + inherit fetchurl; + })); + + + "cl-fad" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fad" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fad.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "cffi-grovel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cffi-grovel" or (x: {})) + (import ./quicklisp-to-nix-output/cffi-grovel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "let-plus" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."let-plus" or (x: {})) + (import ./quicklisp-to-nix-output/let-plus.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + + "cl-async-util" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-util" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-util.nix { + inherit fetchurl; + "vom" = quicklisp-to-nix-packages."vom"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; + "cl-async-base" = quicklisp-to-nix-packages."cl-async-base"; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "trivial-gray-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-gray-streams" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { + inherit fetchurl; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/uiop.nix { + inherit fetchurl; + })); + + + "anaphora" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."anaphora" or (x: {})) + (import ./quicklisp-to-nix-output/anaphora.nix { + inherit fetchurl; + })); + + + "cl-project" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-project" or (x: {})) + (import ./quicklisp-to-nix-output/cl-project.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "prove" = quicklisp-to-nix-packages."prove"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-emb" = quicklisp-to-nix-packages."cl-emb"; + })); + + + "cl-syntax" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax.nix { + inherit fetchurl; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + + "do-urlencode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."do-urlencode" or (x: {})) + (import ./quicklisp-to-nix-output/do-urlencode.nix { + inherit fetchurl; + "babel" = quicklisp-to-nix-packages."babel"; + "babel-streams" = quicklisp-to-nix-packages."babel-streams"; + })); + + + "myway" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."myway" or (x: {})) + (import ./quicklisp-to-nix-output/myway.nix { + inherit fetchurl; + "quri" = quicklisp-to-nix-packages."quri"; + "map-set" = quicklisp-to-nix-packages."map-set"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "vom" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."vom" or (x: {})) + (import ./quicklisp-to-nix-output/vom.nix { + inherit fetchurl; + })); + + + "yason" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."yason" or (x: {})) + (import ./quicklisp-to-nix-output/yason.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "xsubseq" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xsubseq" or (x: {})) + (import ./quicklisp-to-nix-output/xsubseq.nix { + inherit fetchurl; + })); + + + "xmls" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xmls" or (x: {})) + (import ./quicklisp-to-nix-output/xmls.nix { + inherit fetchurl; + })); + + + "wookie" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."wookie" or (x: {})) + (import ./quicklisp-to-nix-output/wookie.nix { + inherit fetchurl; + })); + + + "woo" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."woo" or (x: {})) + (import ./quicklisp-to-nix-output/woo.nix { + inherit fetchurl; + })); + + + "usocket" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."usocket" or (x: {})) + (import ./quicklisp-to-nix-output/usocket.nix { + inherit fetchurl; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + + "trivial-utf-8" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-utf-8" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-utf-8.nix { + inherit fetchurl; + })); + + + "trivial-types" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-types" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-types.nix { + inherit fetchurl; + })); + + + "trivial-mimes" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-mimes" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-mimes.nix { + inherit fetchurl; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/trivial-backtrace.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"; + })); + + + "stumpwm" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."stumpwm" or (x: {})) + (import ./quicklisp-to-nix-output/stumpwm.nix { + inherit fetchurl; + })); + + + "static-vectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."static-vectors" or (x: {})) + (import ./quicklisp-to-nix-output/static-vectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + })); + + + "split-sequence" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."split-sequence" or (x: {})) + (import ./quicklisp-to-nix-output/split-sequence.nix { + inherit fetchurl; + })); + + + "smart-buffer" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."smart-buffer" or (x: {})) + (import ./quicklisp-to-nix-output/smart-buffer.nix { + inherit fetchurl; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + })); + + + "salza2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."salza2" or (x: {})) + (import ./quicklisp-to-nix-output/salza2.nix { + inherit fetchurl; + })); + + + "quri" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."quri" or (x: {})) + (import ./quicklisp-to-nix-output/quri.nix { + inherit fetchurl; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "query-fs" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."query-fs" or (x: {})) + (import ./quicklisp-to-nix-output/query-fs.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-fuse" = quicklisp-to-nix-packages."cl-fuse"; + "cl-fuse-meta-fs" = quicklisp-to-nix-packages."cl-fuse-meta-fs"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + })); + + + "prove" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."prove" or (x: {})) + (import ./quicklisp-to-nix-output/prove.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "proc-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."proc-parse" or (x: {})) + (import ./quicklisp-to-nix-output/proc-parse.nix { + inherit fetchurl; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "plump" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."plump" or (x: {})) + (import ./quicklisp-to-nix-output/plump.nix { + inherit fetchurl; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/pcall.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "parenscript" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parenscript" or (x: {})) + (import ./quicklisp-to-nix-output/parenscript.nix { + inherit fetchurl; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + + "optima" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."optima" or (x: {})) + (import ./quicklisp-to-nix-output/optima.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/marshal.nix { + inherit fetchurl; + })); + + + "lquery" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lquery" or (x: {})) + (import ./quicklisp-to-nix-output/lquery.nix { + inherit fetchurl; + })); + + + "local-time" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."local-time" or (x: {})) + (import ./quicklisp-to-nix-output/local-time.nix { + inherit fetchurl; + })); + + + "lev" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lev" or (x: {})) + (import ./quicklisp-to-nix-output/lev.nix { + inherit fetchurl; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "lack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack" or (x: {})) + (import ./quicklisp-to-nix-output/lack.nix { + inherit fetchurl; + })); + + + "iterate" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iterate" or (x: {})) + (import ./quicklisp-to-nix-output/iterate.nix { + inherit fetchurl; + })); + + + "ironclad" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."ironclad" or (x: {})) + (import ./quicklisp-to-nix-output/ironclad.nix { + inherit fetchurl; + })); + + + "iolib" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib" or (x: {})) + (import ./quicklisp-to-nix-output/iolib.nix { + inherit fetchurl; + })); + + + "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"; + })); + + + "hunchentoot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."hunchentoot" or (x: {})) + (import ./quicklisp-to-nix-output/hunchentoot.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "md5" = quicklisp-to-nix-packages."md5"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "hu_dot_dwim_dot_def" = buildLispPackage + ((f: x: (x // (f x))) + (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; + })); + + + "http-body" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."http-body" or (x: {})) + (import ./quicklisp-to-nix-output/http-body.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "quri" = quicklisp-to-nix-packages."quri"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/flexi-streams.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "fast-io" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fast-io" or (x: {})) + (import ./quicklisp-to-nix-output/fast-io.nix { + inherit fetchurl; + })); + + + "fast-http" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fast-http" or (x: {})) + (import ./quicklisp-to-nix-output/fast-http.nix { + inherit fetchurl; + })); + + + "external-program" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."external-program" or (x: {})) + (import ./quicklisp-to-nix-output/external-program.nix { + inherit fetchurl; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + + "esrap" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."esrap" or (x: {})) + (import ./quicklisp-to-nix-output/esrap.nix { + inherit fetchurl; + })); + + + "drakma" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."drakma" or (x: {})) + (import ./quicklisp-to-nix-output/drakma.nix { + inherit fetchurl; + "usocket" = quicklisp-to-nix-packages."usocket"; + "puri" = quicklisp-to-nix-packages."puri"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "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"; + })); + + + "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; + })); + + + "dbd-sqlite3" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbd-sqlite3" or (x: {})) + (import ./quicklisp-to-nix-output/dbd-sqlite3.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "sqlite" = quicklisp-to-nix-packages."sqlite"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + })); + + + "dbd-postgres" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbd-postgres" or (x: {})) + (import ./quicklisp-to-nix-output/dbd-postgres.nix { + inherit fetchurl; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + })); + + + "dbd-mysql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbd-mysql" or (x: {})) + (import ./quicklisp-to-nix-output/dbd-mysql.nix { + inherit fetchurl; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-mysql" = quicklisp-to-nix-packages."cl-mysql"; + })); + + + "cxml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml" or (x: {})) + (import ./quicklisp-to-nix-output/cxml.nix { + inherit fetchurl; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + })); + + + "css-lite" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-lite" or (x: {})) + (import ./quicklisp-to-nix-output/css-lite.nix { + inherit fetchurl; + })); + + + "command-line-arguments" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."command-line-arguments" or (x: {})) + (import ./quicklisp-to-nix-output/command-line-arguments.nix { + inherit fetchurl; + })); + + + "clx-truetype" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clx-truetype" or (x: {})) + (import ./quicklisp-to-nix-output/clx-truetype.nix { + inherit fetchurl; + "cl-aa" = quicklisp-to-nix-packages."cl-aa"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf"; + "cl-store" = quicklisp-to-nix-packages."cl-store"; + "cl-vectors" = quicklisp-to-nix-packages."cl-vectors"; + "clx" = quicklisp-to-nix-packages."clx"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + + "clx" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clx" or (x: {})) + (import ./quicklisp-to-nix-output/clx.nix { + inherit fetchurl; + })); + + + "cl-who" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-who" or (x: {})) + (import ./quicklisp-to-nix-output/cl-who.nix { + inherit fetchurl; + })); + + + "cl-vectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-vectors" or (x: {})) + (import ./quicklisp-to-nix-output/cl-vectors.nix { + inherit fetchurl; + })); + + + "cl-utilities" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-utilities" or (x: {})) + (import ./quicklisp-to-nix-output/cl-utilities.nix { + inherit fetchurl; + })); + + + "cl-unification" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-unification" or (x: {})) + (import ./quicklisp-to-nix-output/cl-unification.nix { + inherit fetchurl; + })); + + + "cl-unicode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-unicode" or (x: {})) + (import ./quicklisp-to-nix-output/cl-unicode.nix { + inherit fetchurl; + })); + + + "cl-test-more" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-test-more" or (x: {})) + (import ./quicklisp-to-nix-output/cl-test-more.nix { + inherit fetchurl; + })); + + + "cl-syntax-markup" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-markup" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-markup.nix { + inherit fetchurl; + "cl-markup" = quicklisp-to-nix-packages."cl-markup"; + })); + + + "cl-syntax-anonfun" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-anonfun" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-anonfun.nix { + inherit fetchurl; + "cl-anonfun" = quicklisp-to-nix-packages."cl-anonfun"; + })); + + + "cl-syntax-annot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-annot.nix { + inherit fetchurl; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + })); + + + "cl+ssl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl+ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl+ssl.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "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: {})) + (import ./quicklisp-to-nix-output/clsql.nix { + inherit fetchurl; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "cl-smtp" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-smtp" or (x: {})) + (import ./quicklisp-to-nix-output/cl-smtp.nix { + inherit fetchurl; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "cl-reexport" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-reexport" or (x: {})) + (import ./quicklisp-to-nix-output/cl-reexport.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "cl-ppcre-unicode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ppcre-unicode" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ppcre-unicode.nix { + inherit fetchurl; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + })); + + + "cl-ppcre-template" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ppcre-template" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ppcre-template.nix { + inherit fetchurl; + })); + + + "cl-ppcre" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ppcre" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ppcre.nix { + inherit fetchurl; + })); + + + "closer-mop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closer-mop" or (x: {})) + (import ./quicklisp-to-nix-output/closer-mop.nix { + inherit fetchurl; + })); + + + "cl-mysql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-mysql" or (x: {})) + (import ./quicklisp-to-nix-output/cl-mysql.nix { + inherit fetchurl; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "cl-libuv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-libuv" or (x: {})) + (import ./quicklisp-to-nix-output/cl-libuv.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + })); + + + "cl-l10n" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-l10n" or (x: {})) + (import ./quicklisp-to-nix-output/cl-l10n.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-l10n-cldr" = quicklisp-to-nix-packages."cl-l10n-cldr"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + })); + + + "cl-json" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-json" or (x: {})) + (import ./quicklisp-to-nix-output/cl-json.nix { + inherit fetchurl; + })); + + + "cl-fuse-meta-fs" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fuse-meta-fs" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fuse-meta-fs.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-fuse" = quicklisp-to-nix-packages."cl-fuse"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "pcall" = quicklisp-to-nix-packages."pcall"; + })); + + + "cl-fuse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fuse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fuse.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; + })); + + + "cl-emb" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-emb" or (x: {})) + (import ./quicklisp-to-nix-output/cl-emb.nix { + inherit fetchurl; + })); + + + "cl-dbi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-dbi" or (x: {})) + (import ./quicklisp-to-nix-output/cl-dbi.nix { + inherit fetchurl; + })); + + + "cl-cookie" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cookie" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cookie.nix { + inherit fetchurl; + "quri" = quicklisp-to-nix-packages."quri"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "cl-colors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-colors" or (x: {})) + (import ./quicklisp-to-nix-output/cl-colors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + })); + + + "cl-base64" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-base64" or (x: {})) + (import ./quicklisp-to-nix-output/cl-base64.nix { + inherit fetchurl; + })); + + + "cl-async-ssl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-ssl.nix { + inherit fetchurl; + "vom" = quicklisp-to-nix-packages."vom"; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "cl-async-repl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-repl" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-repl.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "cl-async-base" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-base" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-base.nix { + inherit fetchurl; + "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "cl-async" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; + "cl-async-util" = quicklisp-to-nix-packages."cl-async-util"; + "cl-async-base" = quicklisp-to-nix-packages."cl-async-base"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "clack-v1-compat" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-v1-compat" or (x: {})) + (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + inherit fetchurl; + })); + + + "clack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack" or (x: {})) + (import ./quicklisp-to-nix-output/clack.nix { + inherit fetchurl; + })); + + + "circular-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."circular-streams" or (x: {})) + (import ./quicklisp-to-nix-output/circular-streams.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + })); + + + "chipz" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."chipz" or (x: {})) + (import ./quicklisp-to-nix-output/chipz.nix { + inherit fetchurl; + })); + + + "cffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cffi" or (x: {})) + (import ./quicklisp-to-nix-output/cffi.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "caveman" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."caveman" or (x: {})) + (import ./quicklisp-to-nix-output/caveman.nix { + inherit fetchurl; + "myway" = quicklisp-to-nix-packages."myway"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; + "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-project" = quicklisp-to-nix-packages."cl-project"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-emb" = quicklisp-to-nix-packages."cl-emb"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + + "bordeaux-threads" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."bordeaux-threads" or (x: {})) + (import ./quicklisp-to-nix-output/bordeaux-threads.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "blackbird" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."blackbird" or (x: {})) + (import ./quicklisp-to-nix-output/blackbird.nix { + inherit fetchurl; + "vom" = quicklisp-to-nix-packages."vom"; + })); + + + "babel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."babel" or (x: {})) + (import ./quicklisp-to-nix-output/babel.nix { + inherit fetchurl; + })); + + + "array-utils" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."array-utils" or (x: {})) + (import ./quicklisp-to-nix-output/array-utils.nix { + inherit fetchurl; + })); + + + "alexandria" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."alexandria" or (x: {})) + (import ./quicklisp-to-nix-output/alexandria.nix { + inherit fetchurl; + })); + + + "_3bmd" = buildLispPackage + ((f: x: (x // (f x))) + (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"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + +} // qlAliases {inherit quicklisp-to-nix-packages;}; +qlAliases = import ./quicklisp-to-nix-aliases.nix; +in + quicklisp-to-nix-packages diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb new file mode 100644 index 000000000000..3a0c5cb5fc2c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb @@ -0,0 +1,7 @@ + "<% @var filename %>" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."<% @var filename %>" or (x: {})) + (import ./quicklisp-to-nix-output/<% @var filename %>.nix { + inherit fetchurl;<% @loop deps %> + "<% @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 new file mode 100644 index 000000000000..baedbd1553a5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''<% @var filename %>''; + version = ''<% @var version %>'';<% @if testname %> + + testSystems = ["<% @var testname %>"];<% @endif %> + + description = ''<% @var description %>''; + + deps = [ <% @loop deps %>args."<% @var filename %>" <% @endloop %>]; + + src = fetchurl { + url = ''<% @var url %>''; + sha256 = ''<% @var sha256 %>''; + }; + + packageName = "<% @var name %>"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/<% @var name %>[.]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 + ''; + }; +} +/* <%= cl-emb-intern::topenv %> */ 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 new file mode 100644 index 000000000000..141fb0f34ebb --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -0,0 +1,163 @@ +; QuickLisp-to-Nix export +; Requires QuickLisp to be loaded +; Installs the QuickLisp version of all the packages processed (in the +; QuickLisp instance it uses) + +(ql:quickload :cl-emb) +(ql:quickload :external-program) +(ql:quickload :cl-ppcre) +(ql:quickload :alexandria) +(ql:quickload :md5) + +(defvar testnames (make-hash-table :test 'equal)) + +(defun nix-prefetch-url (url) + (let* + ((stdout nil) + (stderr nil)) + (setf + stdout + (with-output-to-string (so) + (setf + stderr + (with-output-to-string (se) + (external-program:run + "nix-prefetch-url" + (list url) + :search t :output so :error se))))) + (let* + ((path-line (first (last (cl-ppcre:split (format nil "~%") stderr)))) + (path (cl-ppcre:regex-replace-all "path is .(.*)." path-line "\\1"))) + (list + :sha256 (first (cl-ppcre:split (format nil "~%") stdout)) + :path path + :md5 (string-downcase + (format nil "~{~16,2,'0r~}" + (map 'list 'identity (md5:md5sum-file path)))))))) + +(defun escape-filename (s) + (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 + (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)) + (url (ql-dist:archive-url ql-release)) + (local-archive (ql-dist:local-archive-file ql-release)) + (local-url (format nil "file://~a" (pathname local-archive))) + (archive-data + (progn + (ql-dist:ensure-local-archive-file ql-release) + (nix-prefetch-url local-url))) + (ideal-md5 (ql-dist:archive-md5 ql-release)) + (file-md5 (getf archive-data :md5)) + (raw-dependencies (ql-dist:required-systems ql-system)) + (name (string-downcase (format nil "~a" system))) + (ql-sibling-names + (remove name (mapcar 'ql-dist:name ql-sibling-systems) + :test 'equal)) + (dependencies + (set-difference + (remove-duplicates + (remove-if-not 'ql-dist:find-system raw-dependencies) + :test 'equal) + ql-sibling-names + :test 'equal)) + (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 + (format nil "~a-" name) release-name ""))) + (assert (equal ideal-md5 file-md5)) + (list + :system system + :description description + :sha256 (getf archive-data :sha256) + :url url + :md5 file-md5 + :name name + :testname (gethash name testnames) + :filename (escape-filename name) + :deps deps + :dependencies dependencies + :version version + :siblings ql-sibling-names))) + +(defmacro this-file () + (or *compile-file-truename* + *load-truename*)) + +(defun nix-expression (system) + (cl-emb:execute-emb + (merge-pathnames #p"nix-package.emb" (this-file)) + :env (system-data system))) +(defun nix-invocation (system) + (cl-emb:execute-emb + (merge-pathnames #p"invocation.emb" (this-file)) + :env (system-data system))) + +(defun systems-closure (systems) + (let* + ((seen (make-hash-table :test 'equal))) + (loop + with queue := systems + with res := nil + while queue + for next := (pop queue) + for old := (gethash next seen) + for data := (unless old (system-data next)) + for deps := (getf data :dependencies) + for siblings := (getf data :siblings) + unless old do + (progn + (push next res) + (setf queue (append queue deps))) + do (setf (gethash next seen) t) + finally (return res)))) + +(defun ql-to-nix (target-directory) + (load (format nil "~a/quicklisp-to-nix-overrides.lisp" target-directory)) + (let* + ((systems + (cl-ppcre:split + (format nil "~%") + (alexandria:read-file-into-string + (format nil "~a/quicklisp-to-nix-systems.txt" target-directory)))) + (closure (systems-closure systems)) + (invocations + (loop for s in closure + collect (list :code (nix-invocation s))))) + (loop + for s in closure + do (alexandria:write-string-into-file + (nix-expression s) + (format nil "~a/quicklisp-to-nix-output/~a.nix" + target-directory (escape-filename s)) + :if-exists :supersede)) + (alexandria:write-string-into-file + (cl-emb:execute-emb + (merge-pathnames + #p"top-package.emb" + (this-file)) + :env (list :invocations invocations)) + (format nil "~a/quicklisp-to-nix.nix" target-directory) + :if-exists :supersede))) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb new file mode 100644 index 000000000000..95b60df0d017 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb @@ -0,0 +1,14 @@ +{stdenv, fetchurl, pkgs, clwrapper}: +let quicklisp-to-nix-packages = rec { + inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + + callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; + buildLispPackage = callPackage ./define-package.nix; + qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; +<% @loop invocations %> +<% @var code %> +<% @endloop %> +} // qlAliases {inherit quicklisp-to-nix-packages;}; +qlAliases = import ./quicklisp-to-nix-aliases.nix; +in + quicklisp-to-nix-packages diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix index 237c4e4027f1..1035757fb80e 100644 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix +++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation { description = "AVR development environment including binutils, avr-gcc and avr-libc"; # I've tried compiling the packages separately.. too much hassle. This just works. Fine. license = ["GPL" "LGPL"]; # see single packages .. - homepage = []; # dito platforms = platforms.linux; }; } diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix new file mode 100644 index 000000000000..38ecfcdf9a90 --- /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/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 538b7622df71..d9b478266487 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -1118,6 +1118,39 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& + + + 1 + + + + 154871 + 550e83eea9513ab11c44919ac6da54b36084a9f3 + google_apis-25_r1.zip + + + + google + Google Inc. + google_apis + Google APIs + 23 + Android + Google APIs + + + com.google.android.maps + API for Google Maps + + + com.android.future.usb.accessory + API for USB Accessories + + + com.google.android.media.effects + Collection of video effects + + + 1 @@ -1262,18 +1295,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + - 40 + 47 0 0 - - 305545706 - 782e7233f18c890463e8602571d304e680ce354c - android_m2repository_r40.zip + + 355529608 + a0d22beacc106a6977321f2b07d692ce4979e96a + android_m2repository_r47.zip @@ -1284,40 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& m2repository - - + - 23 - 2 - 1 + 53 - - 10850402 - 41121bbc412c2fce0be170d589d20cfa3e78e857 - support_r23.2.1.zip - - - - android - Android - - Android Support Library - support - compatibility - - - - - 40 - - - - - 152633821 - 0f599f7f35fba49b9277ef9e1394c5c82d8bd369 - google_m2repository_gms_v8_rc42_wear_2a3.zip + + 194148491 + 9008082eb1e6ff5a78d32a1fed6915f266fc5013 + google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip @@ -1392,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& google_play_services_froyo - + - 38 + 41 - - 12351978 - 7a50dec81ba9c9b51d7778c19ca05002498209e8 - google_play_services_v8_rc41.zip + + 13165315 + 55be81c50041f6a8f62947418f74f683369c971f + google_play_services_v11_rc16.zip @@ -1601,4 +1610,27 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& Android Auto Desktop Head Unit emulator auto + + + + 1 + 0 + 0 + + + + + 450468876 + 50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53 + aiasdk-1.0.0.zip + + + + google + Google Inc. + Android Instant Apps Development SDK + https://developer.android.com/topic/instant-apps/index.html + Instant Apps Development SDK + instantapps + diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 7ddd203d4bf0..06be6515ee53 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -268,6 +268,18 @@ in }; }; + google_apis_25 = buildGoogleApis { + name = "google_apis-25"; + src = fetchurl { + url = https://dl.google.com/android/repository/google_apis-25_r1.zip; + sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { @@ -280,11 +292,12 @@ in }; }; + google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v8_rc41.zip; - sha1 = "7a50dec81ba9c9b51d7778c19ca05002498209e8"; + url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip; + sha1 = "55be81c50041f6a8f62947418f74f683369c971f"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 52a2ab8f36a0..7587fb3e0c48 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -7,7 +7,7 @@ }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: -with { inherit (stdenv.lib) makeLibraryPath; }; +let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation rec { name = "android-sdk-${version}"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 7ecb82ce4060..a233333986ae 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -181,6 +181,20 @@ rec { useGooglePlayServices = true; }; + androidsdk_7_1_1 = androidsdk { + platformVersions = [ "25" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_7_1_1_extras = androidsdk { + platformVersions = [ "25" ]; + abiVersions = [ "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh index cd9f29a4c247..2edbe6bf4898 100755 --- a/pkgs/development/mobile/androidenv/fetch.sh +++ b/pkgs/development/mobile/androidenv/fetch.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure -p androidsdk curl libxslt # this shows a list of available xmls android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl index d195511cdb3b..54a165d21e4d 100644 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -45,7 +45,7 @@ in }; meta = { description = ""; - url = ; + homepage = ; }; }; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 4f3f45f4cc93..1caa6cebb14f 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -24,7 +24,7 @@ in }; meta = { description = "Android SDK Platform 2"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -36,7 +36,7 @@ in }; meta = { description = "Android SDK Platform 3"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -48,7 +48,7 @@ in }; meta = { description = "Android SDK Platform 4"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -60,7 +60,7 @@ in }; meta = { description = "Android SDK Platform 5"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -72,7 +72,7 @@ in }; meta = { description = "Android SDK Platform 6"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -84,7 +84,7 @@ in }; meta = { description = "Android SDK Platform 7"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -96,7 +96,7 @@ in }; meta = { description = "Android SDK Platform 8"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -108,7 +108,7 @@ in }; meta = { description = "Android SDK Platform 9"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -120,7 +120,7 @@ in }; meta = { description = "Android SDK Platform 10"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -132,7 +132,7 @@ in }; meta = { description = "Android SDK Platform 11"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -144,7 +144,7 @@ in }; meta = { description = "Android SDK Platform 12"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -156,7 +156,7 @@ in }; meta = { description = "Android SDK Platform 13"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -168,7 +168,7 @@ in }; meta = { description = "Android SDK Platform 14"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -180,7 +180,7 @@ in }; meta = { description = "Android SDK Platform 15"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -192,7 +192,7 @@ in }; meta = { description = "Android SDK Platform 16"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -204,7 +204,7 @@ in }; meta = { description = "Android SDK Platform 17"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -216,7 +216,7 @@ in }; meta = { description = "Android SDK Platform 18"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -228,7 +228,7 @@ in }; meta = { description = "Android SDK Platform 19"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -240,7 +240,7 @@ in }; meta = { description = "Android SDK Platform 20"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -252,7 +252,7 @@ in }; meta = { description = "Android SDK Platform 21"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -264,7 +264,7 @@ in }; meta = { description = "Android SDK Platform 22"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -276,7 +276,7 @@ in }; meta = { description = "Android SDK Platform 23"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -288,19 +288,31 @@ in }; meta = { description = "Android SDK Platform 24"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; platform_25 = buildPlatform { name = "android-platform-7.1.1"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r02.zip; - sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f"; + url = https://dl.google.com/android/repository/platform-25_r03.zip; + sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; }; meta = { description = "Android SDK Platform 25"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; + }; + }; + + platform_26 = buildPlatform { + name = "android-platform-8.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-26_r01.zip; + sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + }; + meta = { + description = "Android SDK Platform 26"; + homepage = http://developer.android.com/sdk/; }; }; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index d8619b7c0f5d..a4903cd0d402 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -24,7 +24,7 @@ in }; meta = { description = "Android SDK Platform 2"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -36,7 +36,7 @@ in }; meta = { description = "Android SDK Platform 3"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -48,7 +48,7 @@ in }; meta = { description = "Android SDK Platform 4"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -60,7 +60,7 @@ in }; meta = { description = "Android SDK Platform 5"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -72,7 +72,7 @@ in }; meta = { description = "Android SDK Platform 6"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -84,7 +84,7 @@ in }; meta = { description = "Android SDK Platform 7"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -96,7 +96,7 @@ in }; meta = { description = "Android SDK Platform 8"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -108,7 +108,7 @@ in }; meta = { description = "Android SDK Platform 9"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -120,7 +120,7 @@ in }; meta = { description = "Android SDK Platform 10"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -132,7 +132,7 @@ in }; meta = { description = "Android SDK Platform 11"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -144,7 +144,7 @@ in }; meta = { description = "Android SDK Platform 12"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -156,7 +156,7 @@ in }; meta = { description = "Android SDK Platform 13"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -168,7 +168,7 @@ in }; meta = { description = "Android SDK Platform 14"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -180,7 +180,7 @@ in }; meta = { description = "Android SDK Platform 15"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -192,7 +192,7 @@ in }; meta = { description = "Android SDK Platform 16"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -204,7 +204,7 @@ in }; meta = { description = "Android SDK Platform 17"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -216,7 +216,7 @@ in }; meta = { description = "Android SDK Platform 18"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -228,7 +228,7 @@ in }; meta = { description = "Android SDK Platform 19"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -240,7 +240,7 @@ in }; meta = { description = "Android SDK Platform 20"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -252,7 +252,7 @@ in }; meta = { description = "Android SDK Platform 21"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -264,7 +264,7 @@ in }; meta = { description = "Android SDK Platform 22"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -276,7 +276,7 @@ in }; meta = { description = "Android SDK Platform 23"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; @@ -288,19 +288,31 @@ in }; meta = { description = "Android SDK Platform 24"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; }; }; platform_25 = buildPlatform { name = "android-platform-7.1.1"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r02.zip; - sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f"; + url = https://dl.google.com/android/repository/platform-25_r03.zip; + sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; }; meta = { description = "Android SDK Platform 25"; - url = http://developer.android.com/sdk/; + homepage = http://developer.android.com/sdk/; + }; + }; + + platform_26 = buildPlatform { + name = "android-platform-8.0.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/platform-26_r01.zip; + sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a"; + }; + meta = { + description = "Android SDK Platform 26"; + homepage = http://developer.android.com/sdk/; }; }; diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index e115f6747902..9f46af93a880 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the "License Agreement&q June 2014. - + NDK - 13 + 15 - - 665967997 - 71fe653a7bf5db08c3af154735b6ccbc12f0add5 - android-ndk-r13b-darwin-x86_64.zip + + 959176682 + 9dd0ff18d177ec75797b021a3ebd294362e8a41e + android-ndk-r15-darwin-x86_64.zip macosx 64 - - 687311866 - 0600157c4ddf50ec15b8a037cfc474143f718fd0 - android-ndk-r13b-linux-x86_64.zip + + 973898016 + 32b3115357ed798a8a48d7d589ffcb901693c745 + android-ndk-r15-linux-x86_64.zip linux 64 - - 620461544 - 4eb1288b1d4134a9d6474eb247f0448808d52408 - android-ndk-r13b-windows-x86.zip + + 783705009 + bf869b624f6d4778065d5d4703815b0c689069e1 + android-ndk-r15-windows-x86.zip windows 32 - - 681320123 - 649d306559435c244cec5881b880318bb3dee53a - android-ndk-r13b-windows-x86_64.zip + + 848657615 + 45d310443ceb5ff19a0dde139ee9b3404908c178 + android-ndk-r15-windows-x86_64.zip windows 64 @@ -336,17 +336,41 @@ June 2014. - + + 8.0.0 + 26 + Android SDK Platform 26 + 1 + + + + 63467872 + 33a4f9788bfd7123e712906b2d7e5d54a729e14a + platform-26_r01.zip + + + + + 22 + + http://developer.android.com/sdk/ + + 15 + 1 + + + + 7.1.1 25 Android SDK Platform 25 - 2 + 3 - - 85434042 - 6057e54a04f1d141f36a2c8d20f2962b41a3183f - platform-25_r02.zip + + 85424763 + 00c2c5765e8988504be10a1eb66ed71fcdbd7fe8 + platform-25_r03.zip @@ -976,6 +1000,20 @@ June 2014. 4 + + + 25 + 1 + + + + 30822685 + bbc72efd1a9bad87cc507e308f0d29aad438c52c + sources-25_r01.zip + + + + 24 @@ -1131,6 +1169,168 @@ June 2014. + + + + 26 + 0 + 0 + + + + + 53854197 + 1cbe72929876f8a872ab1f1b1040a9f720261f59 + build-tools_r26-linux.zip + linux + + + + 53010814 + d01a1aeca03747245f1f5936b3cb01759c66d086 + build-tools_r26-macosx.zip + macosx + + + + 54681641 + 896ebd31117c09db220f7a3116cc0e5121c78b9d + build-tools_r26-windows.zip + windows + + + + + + + + 26 + 0 + 0 + 2 + + + + + 53847560 + 629bbd8d2e415bf64871fb0b4c0540fd6d0347a0 + build-tools_r26-rc2-linux.zip + linux + + + + 53003874 + cb1eb738a1f7003025af267a9b8cc2d259533c70 + build-tools_r26-rc2-macosx.zip + macosx + + + + 54678375 + ddaba77db0557a98f6330fbd579ad0bd12cbb152 + build-tools_r26-rc2-windows.zip + windows + + + + + + + + 26 + 0 + 0 + 1 + + + + + 53648603 + 8cd6388dc96db2d7a49d06159cf990d3bbc78d04 + build-tools_r26-rc1-linux.zip + linux + + + + 52821129 + 5c5a1de7d5f4f000d36ae349229fe0be846d6137 + build-tools_r26-rc1-macosx.zip + macosx + + + + 54379108 + 43c2ddad3b67a5c33712ae14331a60673e69be91 + build-tools_r26-rc1-windows.zip + windows + + + + + + + + 25 + 0 + 3 + + + + + 50757258 + db95f3a0ae376534d4d69f4cdb6fad20649f3509 + build-tools_r25.0.3-linux.zip + linux + + + + 50545085 + 160d2fefb5ce68e443427fc30a793a703b63e26e + build-tools_r25.0.3-macosx.zip + macosx + + + + 51337442 + 1edcb109ae5133aebfed573cf0bc84e0c353c28d + build-tools_r25.0.3-windows.zip + windows + + + + + + + + 25 + 0 + 2 + + + + + 49880329 + ff953c0177e317618fda40516f3e9d95fd43c7ae + build-tools_r25.0.2-linux.zip + linux + + + + 49667185 + 12a5204bb3b6e39437535469fde7ddf42da46b16 + build-tools_r25.0.2-macosx.zip + macosx + + + + 50458908 + 2fee3c0704d6ecc480570450d8b8069b2c4a2dd4 + build-tools_r25.0.2-windows.zip + windows + + + + @@ -2043,64 +2243,64 @@ June 2014. - + - 25 + 26 0 - 1 + 0 - - 3916151 - 8e461a2c76717824d1d8e91af68216c9f230a373 - platform-tools_r25.0.1-linux.zip - linux - - - - 3732924 - 96abc8638bf9f65435bc0ab641cc4a3ff753eed5 - platform-tools_r25.0.1-macosx.zip + + 7771750 + e75b6137dc444f777eb02f44a6d9819b3aabff82 + platform-tools_r26.0.0-darwin.zip macosx - - 3573485 - 75249224c12528329a151dfbc591509168ef6efd - platform-tools_r25.0.1-windows.zip + + 7859155 + 00de8a6631405b617c10f68cd11ff2e1cd528e23 + platform-tools_r26.0.0-linux.zip + linux + + + + 7511554 + a4128ebc3d1b6372d981810920e3fa01637f891a + platform-tools_r26.0.0-windows.zip windows - + 25 2 - 3 + 5 - - 277861433 - aafe7f28ac51549784efc2f3bdfc620be8a08213 - tools_r25.2.3-linux.zip + + 277894900 + 72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1 + tools_r25.2.5-linux.zip linux - - 200496727 - 0e88c0bdb8f8ee85cce248580173e033a1bbc9cb - tools_r25.2.3-macosx.zip + + 200529982 + d2168d963ac5b616e3d3ddaf21511d084baf3659 + tools_r25.2.5-macosx.zip macosx - - 306745639 - b965decb234ed793eb9574bad8791c50ca574173 - tools_r25.2.3-windows.zip + + 306785944 + a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca + tools_r25.2.5-windows.zip windows diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix index 5bb7409c2c4e..e4fe3cf0ff5d 100644 --- a/pkgs/development/mobile/androidenv/sources.nix +++ b/pkgs/development/mobile/androidenv/sources.nix @@ -137,4 +137,15 @@ in }; }; + source_25 = buildSource { + name = "android-source-25"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-25_r01.zip; + sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; + }; + meta = { + description = "Source code for Android API 25"; + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 807d4976296c..8ea0cfb5b802 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -830,24 +830,6 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS x86 default - - - 25 - Google APIs Intel x86 Atom System Image - 3 - - - - 703131759 - 7dd19cfee4e43a1f60e0f5f058404d92d9544b33 - x86-25_r03.zip - - - - x86 - google_apis - Google APIs - 21 @@ -916,22 +898,4 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS x86_64 default - - - 25 - Google APIs Intel x86 Atom_64 System Image - 3 - - - - 912938750 - 4593ee04811df21c339f3374fc5917843db06f8d - x86_64-25_r03.zip - - - - x86_64 - google_apis - Google APIs - diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 138d1475c2fe..c1ed650f2324 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -2,7 +2,7 @@ Node.js packages =============== To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: - 1. Install node2nix: `nix-env -f '' -iA node2nix`. + 1. Install node2nix: `nix-env -f '' -iA nodePackages.node2nix`. 2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update, or remove package entries. 3. Run the script: `cd pkgs/development/node-packages && sh generate.sh`. diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index b78bbda5d5e7..8c4a5390f554 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 1c21b47b92c9..ea30c5b04c4d 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-5_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 613293e850be..9fa7929df686 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -1,6 +1,6 @@ -#!/bin/sh -e +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix rm -f node-env.nix -node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix -# node2nix doesn't explicitely support node v6 so far -node2nix -5 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix +node2nix -i node-packages-v4.json -o node-packages-v4.nix -c composition-v4.nix +node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index bd1de3e9f93e..356e78f027bf 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -57,60 +57,6 @@ let # Recursively composes the dependencies of a package composePackage = { name, packageName, src, dependencies ? [], ... }@args: - let - fixImpureDependencies = writeTextFile { - name = "fixDependencies.js"; - text = '' - var fs = require('fs'); - var url = require('url'); - - /* - * Replaces an impure version specification by * - */ - function replaceImpureVersionSpec(versionSpec) { - var parsedUrl = url.parse(versionSpec); - - if(versionSpec == "latest" || versionSpec == "unstable" || - versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/') - return '*'; - else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || - parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:") - return '*'; - else - return versionSpec; - } - - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Replace dependencies */ - if(packageObj.dependencies !== undefined) { - for(var dependency in packageObj.dependencies) { - var versionSpec = packageObj.dependencies[dependency]; - packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec); - } - } - - /* Replace development dependencies */ - if(packageObj.devDependencies !== undefined) { - for(var dependency in packageObj.devDependencies) { - var versionSpec = packageObj.devDependencies[dependency]; - packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec); - } - } - - /* Replace optional dependencies */ - if(packageObj.optionalDependencies !== undefined) { - for(var dependency in packageObj.optionalDependencies) { - var versionSpec = packageObj.optionalDependencies[dependency]; - packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec); - } - } - - /* Write the fixed JSON file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj)); - ''; - }; - in '' DIR=$(pwd) cd $TMPDIR @@ -150,17 +96,97 @@ let # Unset the stripped name to not confuse the next unpack step unset strippedName - # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store. - # The following JavaScript replaces these by * to prevent that - cd "$DIR/${packageName}" - node ${fixImpureDependencies} - # Include the dependencies of the package + cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + # Extract the Node.js source code which is used to compile packages with # native bindings nodeSources = runCommand "node-sources" {} '' @@ -183,7 +209,9 @@ let buildPhase = args.buildPhase or "true"; compositionScript = composePackage args; - passAsFile = [ "compositionScript" ]; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = args.installPhase or '' # Create and enter a root node_modules/ folder @@ -192,6 +220,10 @@ let # Compose the package and all its dependencies source $compositionScriptPath + + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath # Patch the shebangs of the bundled modules to prevent them from # calling executables outside the Nix store as much as possible @@ -254,12 +286,18 @@ let buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; includeScript = includeDependencies { inherit dependencies; }; - passAsFile = [ "includeScript" ]; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; buildCommand = '' mkdir -p $out/lib cd $out/lib source $includeScriptPath + + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath # Create fake package.json to make the npm commands work properly cat > package.json < \"Yarn\"

"; - homepage = "https://github.com/yarnpkg/yarn#readme"; - license = "BSD-2-Clause"; - }; - production = true; - }; - yo = nodeEnv.buildNodePackage { - name = "yo"; - packageName = "yo"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz"; - sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928"; - }; - dependencies = [ - sources."async-1.5.2" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (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" - ]; - }) - sources."cli-list-0.1.8" - (sources."configstore-1.4.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."object-assign-4.1.1" - sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - sources."uuid-2.0.3" - (sources."write-file-atomic-1.3.1" // { - dependencies = [ - sources."imurmurhash-0.1.4" - sources."slide-1.1.6" - ]; - }) - (sources."xdg-basedir-2.0.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - (sources."cross-spawn-3.0.1" // { - dependencies = [ - (sources."lru-cache-4.0.2" // { - dependencies = [ - sources."pseudomap-1.0.2" - sources."yallist-2.0.0" - ]; - }) - (sources."which-1.2.12" // { - dependencies = [ - sources."isexe-1.1.2" - ]; - }) - ]; - }) - (sources."figures-1.7.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - sources."object-assign-4.1.1" - ]; - }) - (sources."fullname-2.1.0" // { - dependencies = [ - (sources."npmconf-2.1.2" // { - dependencies = [ - (sources."config-chain-1.1.11" // { - dependencies = [ - sources."proto-list-1.2.4" - ]; - }) - sources."inherits-2.0.3" - sources."ini-1.3.4" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."nopt-3.0.6" // { - dependencies = [ - sources."abbrev-1.1.0" - ]; - }) - (sources."once-1.3.3" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - ]; - }) - sources."semver-4.3.6" - sources."uid-number-0.0.5" - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."got-5.7.1" // { - dependencies = [ - (sources."create-error-class-3.0.2" // { - dependencies = [ - sources."capture-stack-trace-1.0.0" - ]; - }) - sources."duplexer2-0.1.4" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" - sources."lowercase-keys-1.0.0" - sources."node-status-codes-1.0.0" - sources."object-assign-4.1.1" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.0" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.3" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."inherits-2.0.3" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" - (sources."url-parse-lax-1.0.0" // { - dependencies = [ - sources."prepend-http-1.0.4" - ]; - }) - ]; - }) - (sources."humanize-string-1.0.1" // { - dependencies = [ - sources."decamelize-1.2.0" - ]; - }) - (sources."inquirer-0.11.4" // { - dependencies = [ - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - (sources."cli-cursor-1.0.2" // { - dependencies = [ - (sources."restore-cursor-1.0.1" // { - dependencies = [ - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - ]; - }) - ]; - }) - sources."cli-width-1.1.1" - (sources."readline2-1.0.1" // { - 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."mute-stream-0.0.5" - ]; - }) - (sources."run-async-0.1.0" // { - dependencies = [ - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - sources."rx-lite-3.1.2" - (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" - sources."through-2.3.8" - ]; - }) - (sources."insight-0.7.0" // { - dependencies = [ - (sources."inquirer-0.10.1" // { - dependencies = [ - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - (sources."cli-cursor-1.0.2" // { - dependencies = [ - (sources."restore-cursor-1.0.1" // { - dependencies = [ - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - ]; - }) - ]; - }) - sources."cli-width-1.1.1" - (sources."readline2-1.0.1" // { - 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."mute-stream-0.0.5" - ]; - }) - (sources."run-async-0.1.0" // { - dependencies = [ - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - ]; - }) - sources."rx-lite-3.1.2" - sources."strip-ansi-3.0.1" - sources."through-2.3.8" - ]; - }) - (sources."lodash.debounce-3.1.1" // { - dependencies = [ - sources."lodash._getnative-3.9.1" - ]; - }) - sources."object-assign-4.1.1" - (sources."os-name-1.0.3" // { - dependencies = [ - (sources."osx-release-1.1.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - (sources."win-release-1.1.1" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) - ]; - }) - (sources."request-2.79.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.16.0" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.2" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.6" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.14" // { - dependencies = [ - sources."mime-db-1.26.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."qs-6.3.1" - sources."stringstream-0.0.5" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" - ]; - }) - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - ]; - }) - sources."lodash-3.10.1" - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.2" - ]; - }) - sources."map-obj-1.0.1" - sources."minimist-1.2.0" - (sources."normalize-package-data-2.3.5" // { - dependencies = [ - sources."hosted-git-info-2.2.0" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.3.0" - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - sources."object-assign-4.1.1" - (sources."redent-1.0.0" // { - dependencies = [ - sources."indent-string-2.1.0" - (sources."strip-indent-1.0.1" // { - dependencies = [ - sources."get-stdin-4.0.1" - ]; - }) - ]; - }) - sources."trim-newlines-1.0.0" - ]; - }) - (sources."npm-keyword-4.2.0" // { - dependencies = [ - sources."object-assign-4.1.1" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."registry-url-3.1.0" // { - dependencies = [ - (sources."rc-1.1.7" // { - dependencies = [ - sources."deep-extend-0.4.1" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."opn-3.0.3" // { - dependencies = [ - sources."object-assign-4.1.1" - ]; - }) - (sources."package-json-2.4.0" // { - dependencies = [ - (sources."registry-auth-token-3.1.0" // { - dependencies = [ - (sources."rc-1.1.7" // { - dependencies = [ - sources."deep-extend-0.4.1" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - ]; - }) - (sources."registry-url-3.1.0" // { - dependencies = [ - (sources."rc-1.1.7" // { - dependencies = [ - sources."deep-extend-0.4.1" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - ]; - }) - sources."semver-5.3.0" - ]; - }) - (sources."parse-help-0.1.1" // { - dependencies = [ - (sources."execall-1.0.0" // { - dependencies = [ - (sources."clone-regexp-1.0.0" // { - dependencies = [ - sources."is-regexp-1.0.0" - sources."is-supported-regexp-flag-1.0.0" - ]; - }) - ]; - }) - ]; - }) - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.0" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."normalize-package-data-2.3.5" // { - dependencies = [ - sources."hosted-git-info-2.2.0" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.3.0" - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."root-check-1.0.0" // { - dependencies = [ - (sources."downgrade-root-1.2.2" // { - dependencies = [ - sources."default-uid-1.0.0" - sources."is-root-1.0.0" - ]; - }) - (sources."sudo-block-1.2.0" // { - dependencies = [ - sources."is-docker-1.1.0" - sources."is-root-1.0.0" - ]; - }) - ]; - }) - (sources."sort-on-1.3.0" // { - dependencies = [ - sources."arrify-1.0.1" - (sources."dot-prop-2.4.0" // { - dependencies = [ - sources."is-obj-1.0.1" - ]; - }) - ]; - }) - (sources."string-length-1.0.1" // { - dependencies = [ - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - ]; - }) - (sources."tabtab-1.3.2" // { - dependencies = [ - (sources."debug-2.6.1" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."inquirer-1.2.3" // { - dependencies = [ - sources."ansi-escapes-1.4.0" - (sources."cli-cursor-1.0.2" // { - dependencies = [ - (sources."restore-cursor-1.0.1" // { - dependencies = [ - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - ]; - }) - ]; - }) - sources."cli-width-2.1.0" - (sources."external-editor-1.1.1" // { - dependencies = [ - sources."extend-3.0.0" - (sources."spawn-sync-1.0.15" // { - dependencies = [ - (sources."concat-stream-1.6.0" // { - dependencies = [ - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - (sources."readable-stream-2.2.3" // { - dependencies = [ - sources."buffer-shims-1.0.0" - 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."os-shim-0.1.3" - ]; - }) - (sources."tmp-0.0.29" // { - dependencies = [ - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - sources."lodash-4.17.4" - sources."mute-stream-0.0.6" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."run-async-2.3.0" // { - dependencies = [ - sources."is-promise-2.1.0" - ]; - }) - sources."rx-4.1.0" - (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."through-2.3.8" - ]; - }) - sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."npmlog-2.0.4" // { - dependencies = [ - sources."ansi-0.3.1" - (sources."are-we-there-yet-1.1.2" // { - dependencies = [ - sources."delegates-1.0.0" - (sources."readable-stream-2.2.3" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."inherits-2.0.3" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - (sources."gauge-1.2.7" // { - dependencies = [ - sources."has-unicode-2.0.1" - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" - ]; - }) - ]; - }) - sources."object-assign-4.1.1" - ]; - }) - sources."titleize-1.0.0" - (sources."update-notifier-0.6.3" // { - dependencies = [ - (sources."boxen-0.3.1" // { - dependencies = [ - sources."filled-array-1.1.0" - sources."object-assign-4.1.1" - (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."widest-line-1.0.0" - ]; - }) - (sources."configstore-2.1.0" // { - dependencies = [ - (sources."dot-prop-3.0.0" // { - dependencies = [ - sources."is-obj-1.0.1" - ]; - }) - sources."graceful-fs-4.1.11" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."object-assign-4.1.1" - sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - sources."uuid-2.0.3" - (sources."write-file-atomic-1.3.1" // { - dependencies = [ - sources."imurmurhash-0.1.4" - sources."slide-1.1.6" - ]; - }) - (sources."xdg-basedir-2.0.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - sources."is-npm-1.0.0" - sources."latest-version-2.0.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) - ]; - }) - (sources."user-home-2.0.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - (sources."yeoman-character-1.1.0" // { - dependencies = [ - (sources."supports-color-3.2.3" // { - dependencies = [ - sources."has-flag-1.0.0" - ]; - }) - ]; - }) - (sources."yeoman-doctor-2.1.0" // { - dependencies = [ - (sources."bin-version-check-2.1.0" // { - dependencies = [ - (sources."bin-version-1.0.4" // { - dependencies = [ - (sources."find-versions-1.2.1" // { - dependencies = [ - sources."array-uniq-1.0.3" - sources."get-stdin-4.0.1" - sources."semver-regex-1.0.0" - ]; - }) - ]; - }) - sources."minimist-1.2.0" - sources."semver-4.3.6" - (sources."semver-truncate-1.1.2" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) - ]; - }) - (sources."each-async-1.1.1" // { - dependencies = [ - sources."onetime-1.1.0" - sources."set-immediate-shim-1.0.1" - ]; - }) - sources."log-symbols-1.0.2" - sources."object-values-1.0.0" - sources."semver-5.3.0" - (sources."twig-0.8.9" // { - dependencies = [ - (sources."walk-2.3.9" // { - dependencies = [ - sources."foreachasync-3.0.0" - ]; - }) - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."yeoman-environment-1.6.6" // { - dependencies = [ - (sources."debug-2.6.1" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - sources."diff-2.2.3" - sources."escape-string-regexp-1.0.5" - (sources."globby-4.1.0" // { - dependencies = [ - (sources."array-union-1.0.2" // { - dependencies = [ - sources."array-uniq-1.0.3" - ]; - }) - sources."arrify-1.0.1" - (sources."glob-6.0.4" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - sources."object-assign-4.1.1" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - sources."grouped-queue-0.3.3" - (sources."inquirer-1.2.3" // { - dependencies = [ - sources."ansi-escapes-1.4.0" - (sources."cli-cursor-1.0.2" // { - dependencies = [ - (sources."restore-cursor-1.0.1" // { - dependencies = [ - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - ]; - }) - ]; - }) - sources."cli-width-2.1.0" - (sources."external-editor-1.1.1" // { - dependencies = [ - sources."extend-3.0.0" - (sources."spawn-sync-1.0.15" // { - dependencies = [ - (sources."concat-stream-1.6.0" // { - dependencies = [ - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - (sources."readable-stream-2.2.3" // { - dependencies = [ - sources."buffer-shims-1.0.0" - 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."os-shim-0.1.3" - ]; - }) - (sources."tmp-0.0.29" // { - dependencies = [ - sources."os-tmpdir-1.0.2" - ]; - }) - ]; - }) - sources."mute-stream-0.0.6" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."run-async-2.3.0" // { - dependencies = [ - sources."is-promise-2.1.0" - ]; - }) - sources."rx-4.1.0" - (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."through-2.3.8" - ]; - }) - sources."lodash-4.17.4" - sources."log-symbols-1.0.2" - (sources."mem-fs-1.1.3" // { - dependencies = [ - (sources."through2-2.0.3" // { - dependencies = [ - (sources."readable-stream-2.2.3" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."inherits-2.0.3" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - sources."xtend-4.0.1" - ]; - }) - (sources."vinyl-1.2.0" // { - dependencies = [ - sources."clone-1.0.2" - sources."clone-stats-0.0.1" - sources."replace-ext-0.0.1" - ]; - }) - (sources."vinyl-file-2.0.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - (sources."strip-bom-stream-2.0.0" // { - dependencies = [ - (sources."first-chunk-stream-2.0.0" // { - dependencies = [ - (sources."readable-stream-2.2.3" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."inherits-2.0.3" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - ]; - }) - sources."text-table-0.2.0" - (sources."untildify-2.1.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - (sources."yosay-1.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."cli-boxes-1.0.0" - sources."pad-component-0.0.1" - (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" - (sources."taketalk-1.0.0" // { - dependencies = [ - sources."get-stdin-4.0.1" - sources."minimist-1.2.0" - ]; - }) - sources."wrap-ansi-2.1.0" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI tool for running Yeoman generators"; - homepage = http://yeoman.io/; - license = "BSD-2-Clause"; - }; - production = true; - }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages-v6.json similarity index 90% rename from pkgs/development/node-packages/node-packages.json rename to pkgs/development/node-packages/node-packages-v6.json index 80e6383a6f47..627f6bf4b880 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -13,10 +13,13 @@ , "elasticdump" , "emoj" , "eslint" +, "eslint_d" , "emojione" +, "fast-cli" , "fetch-bower" , "forever" , "git-run" +, "git-standup" , "grunt-cli" , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , "gulp" @@ -24,10 +27,13 @@ , "htmlhint" , "ios-deploy" , "istanbul" +, "javascript-typescript-langserver" , "jayschema" , "jshint" , "json" +, "js-beautify" , "jsontool" +, "json-server" , "js-yaml" , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } @@ -49,6 +55,7 @@ , "peerflix" , "peerflix-server" , "phantomjs" +, "prettier" , "react-tools" , "s3http" , "semver" @@ -58,7 +65,6 @@ , "stylus" , "svgo" , "tern" -, "titanium" , "typescript" , "uglify-js" , "ungit" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index dba0e9d82c20..e241864f0820 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -76,13 +76,13 @@ let sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; }; }; - "resolve-1.3.2" = { + "resolve-1.3.3" = { name = "resolve"; packageName = "resolve"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"; - sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"; + sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5"; }; }; "global-paths-0.1.2" = { @@ -310,13 +310,13 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "kind-of-3.1.0" = { + "kind-of-3.2.2" = { name = "kind-of"; packageName = "kind-of"; - version = "3.1.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; - sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; }; }; "longest-1.0.1" = { @@ -337,13 +337,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "is-buffer-1.1.4" = { + "is-buffer-1.1.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; "path-parse-1.0.5" = { @@ -418,13 +418,13 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "which-1.2.12" = { + "which-1.2.14" = { name = "which"; packageName = "which"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; - sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; }; }; "parse-passwd-1.0.0" = { @@ -436,13 +436,13 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; - "isexe-1.1.2" = { + "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; - sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; "amdefine-1.0.1" = { @@ -517,13 +517,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-1.0.2" = { + "azure-arm-cdn-1.0.3" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz"; - sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz"; + sha1 = "39db281679dcdd33cb6ce032383b192430476412"; }; }; "azure-arm-commerce-0.2.0" = { @@ -535,31 +535,31 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.20.0" = { + "azure-arm-compute-3.0.0-preview" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.20.0"; + version = "3.0.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz"; - sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-3.0.0-preview.tgz"; + sha1 = "f5f07792afcdff29ce0b7e16705342b6986f571b"; }; }; - "azure-arm-datalake-analytics-1.0.1-preview" = { + "azure-arm-datalake-analytics-1.0.2-preview" = { name = "azure-arm-datalake-analytics"; packageName = "azure-arm-datalake-analytics"; - version = "1.0.1-preview"; + version = "1.0.2-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz"; - sha1 = "75461904000427e12ce11d634d74c052c86de994"; + url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.2-preview.tgz"; + sha1 = "b34f868e98a972ec80e4408d209dc06c000dfb63"; }; }; - "azure-arm-datalake-store-1.0.1-preview" = { + "azure-arm-datalake-store-1.0.2-preview" = { name = "azure-arm-datalake-store"; packageName = "azure-arm-datalake-store"; - version = "1.0.1-preview"; + version = "1.0.2-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz"; - sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5"; + url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.2-preview.tgz"; + sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763"; }; }; "azure-arm-hdinsight-0.2.2" = { @@ -589,13 +589,13 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; - "azure-arm-iothub-0.1.4" = { + "azure-arm-iothub-1.0.1-preview" = { name = "azure-arm-iothub"; packageName = "azure-arm-iothub"; - version = "0.1.4"; + version = "1.0.1-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz"; - sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d"; + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-1.0.1-preview.tgz"; + sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; }; }; "azure-arm-servermanagement-0.1.2" = { @@ -607,13 +607,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.18.0" = { + "azure-arm-network-2.0.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.18.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz"; - sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-2.0.0.tgz"; + sha1 = "95e3d2658a68ecb0a2f90f611966f9852877f625"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -625,13 +625,13 @@ let sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "azure-arm-trafficmanager-0.10.5" = { + "azure-arm-trafficmanager-1.1.0-preview" = { name = "azure-arm-trafficmanager"; packageName = "azure-arm-trafficmanager"; - version = "0.10.5"; + version = "1.1.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz"; - sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz"; + sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; }; }; "azure-arm-dns-0.11.1" = { @@ -670,13 +670,13 @@ let sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; }; }; - "azure-graph-1.1.1" = { + "azure-graph-2.1.0-preview" = { name = "azure-graph"; packageName = "azure-graph"; - version = "1.1.1"; + version = "2.1.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz"; - sha1 = "5277e750d223aec0fd2559e49149777fe1371708"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz"; + sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -697,13 +697,13 @@ let sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; }; }; - "azure-asm-compute-0.17.0" = { + "azure-asm-compute-0.18.0" = { name = "azure-asm-compute"; packageName = "azure-asm-compute"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz"; - sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90"; + url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz"; + sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685"; }; }; "azure-asm-hdinsight-0.10.2" = { @@ -814,13 +814,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-2.0.0" = { + "azure-storage-2.1.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz"; - sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; + sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; }; }; "azure-arm-batch-0.3.0" = { @@ -886,13 +886,22 @@ let sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; }; }; - "easy-table-0.0.1" = { + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; + src = fetchurl { + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + }; + }; + "easy-table-1.1.0" = { name = "easy-table"; packageName = "easy-table"; - version = "0.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz"; - sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb"; + url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz"; + sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73"; }; }; "event-stream-3.1.5" = { @@ -967,31 +976,49 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "kuduscript-1.0.13" = { + "jwt-decode-2.2.0" = { + name = "jwt-decode"; + packageName = "jwt-decode"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz"; + sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; + }; + }; + "kuduscript-1.0.15" = { name = "kuduscript"; packageName = "kuduscript"; - version = "1.0.13"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz"; - sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e"; + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz"; + sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; }; }; - "ms-rest-1.15.5" = { + "moment-2.18.1" = { + name = "moment"; + packageName = "moment"; + version = "2.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; + }; + }; + "ms-rest-2.2.1" = { name = "ms-rest"; packageName = "ms-rest"; - version = "1.15.5"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz"; - sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.1.tgz"; + sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377"; }; }; - "ms-rest-azure-1.15.5" = { + "ms-rest-azure-2.2.1" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.5"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz"; - sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.1.tgz"; + sha1 = "ca9a9fb492b1fe1a41ca8e472edc1dd0922323e6"; }; }; "node-forge-0.6.23" = { @@ -1129,13 +1156,13 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "uuid-3.0.1" = { + "uuid-3.1.0" = { name = "uuid"; packageName = "uuid"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; + sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"; }; }; "validator-5.2.0" = { @@ -1183,15 +1210,6 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "date-utils-1.2.21" = { - name = "date-utils"; - packageName = "date-utils"; - version = "1.2.21"; - src = fetchurl { - url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; - sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; - }; - }; "jws-3.1.4" = { name = "jws"; packageName = "jws"; @@ -1246,13 +1264,13 @@ let sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; }; }; - "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"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1327,6 +1345,33 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; + "ms-rest-1.15.7" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "1.15.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; + sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; + }; + }; + "ms-rest-azure-1.15.7" = { + name = "ms-rest-azure"; + packageName = "ms-rest-azure"; + version = "1.15.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; + sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; + }; + }; + "async-0.2.7" = { + name = "async"; + packageName = "async"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + }; + }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -1399,13 +1444,13 @@ let sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; }; }; - "hash-base-3.0.3" = { + "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.3.tgz"; - sha1 = "87ec48734bfe354275535150b14821566b083807"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; "inherits-2.0.3" = { @@ -1462,13 +1507,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "stack-trace-0.0.9" = { + "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; - version = "0.0.9"; + version = "0.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; "keypress-0.1.0" = { @@ -1480,13 +1525,40 @@ let sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }; }; - "from-0.1.3" = { + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "clone-1.0.2" = { + name = "clone"; + packageName = "clone"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"; + sha1 = "260b7a99ebb1edfe247538175f783243cb19d149"; + }; + }; + "from-0.1.7" = { name = "from"; packageName = "from"; - version = "0.1.3"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; }; }; "map-stream-0.1.0" = { @@ -1543,13 +1615,49 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "async-0.2.7" = { - name = "async"; - packageName = "async"; - version = "0.2.7"; + "@types/node-7.0.37" = { + name = "@types/node"; + packageName = "@types/node"; + version = "7.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; - sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + 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" = { @@ -1660,13 +1768,13 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "glob-7.1.1" = { + "glob-7.1.2" = { name = "glob"; packageName = "glob"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; - sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha1 = "c19c9df9a028702d678612384a6552404c636d15"; }; }; "fs.realpath-1.0.0" = { @@ -1687,13 +1795,13 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "minimatch-3.0.3" = { + "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; }; }; "once-1.4.0" = { @@ -1723,22 +1831,22 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "brace-expansion-1.1.6" = { + "brace-expansion-1.1.8" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; }; }; - "balanced-match-0.4.2" = { + "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; - version = "0.4.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; "concat-map-0.0.1" = { @@ -1840,13 +1948,13 @@ let sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; }; }; - "extend-3.0.0" = { + "extend-3.0.1" = { name = "extend"; packageName = "extend"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; + sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; }; }; "forever-agent-0.6.1" = { @@ -1912,13 +2020,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.14" = { + "mime-types-2.1.15" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; + sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; }; }; "oauth-sign-0.8.2" = { @@ -1930,13 +2038,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.2.2" = { + "qs-6.2.3" = { name = "qs"; packageName = "qs"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz"; - sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; + sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; }; }; "stringstream-0.0.5" = { @@ -1975,13 +2083,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.1.5" = { + "async-2.5.0" = { name = "async"; packageName = "async"; - version = "2.1.5"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; + sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d"; }; }; "lodash-4.17.4" = { @@ -2002,13 +2110,13 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "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" = { @@ -2083,15 +2191,6 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "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"; @@ -2191,22 +2290,31 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.1" = { + "jsprim-1.4.0" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.10.2" = { + "sshpk-1.13.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.2"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; - sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; + sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; "extsprintf-1.0.2" = { @@ -2245,15 +2353,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -2263,13 +2362,13 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "getpass-0.1.6" = { + "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; - sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; "jsbn-0.1.1" = { @@ -2290,15 +2389,6 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; "ecc-jsbn-0.1.1" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -2317,13 +2407,13 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.26.0" = { + "mime-db-1.27.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; + sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; }; }; "punycode-1.4.1" = { @@ -2416,22 +2506,22 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.3" = { + "readable-stream-2.3.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.3"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz"; - sha1 = "9cf49463985df016c8ae8813097a9293a9b33729"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; + sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c"; }; }; - "buffer-shims-1.0.0" = { - name = "buffer-shims"; - packageName = "buffer-shims"; - version = "1.0.0"; + "string_decoder-1.0.3" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab"; }; }; "http-basic-2.5.1" = { @@ -2443,22 +2533,22 @@ let sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; }; }; - "promise-7.1.1" = { + "promise-7.3.1" = { name = "promise"; packageName = "promise"; - version = "7.1.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"; - sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; + 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" = { @@ -2605,13 +2695,13 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; - "deep-extend-0.4.1" = { + "deep-extend-0.4.2" = { name = "deep-extend"; packageName = "deep-extend"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"; - sha1 = "efe4113d08085f4e6f9687759810f807469e2253"; + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; + sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; "ext-name-3.0.0" = { @@ -2650,13 +2740,13 @@ let sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; }; }; - "ext-list-2.2.0" = { + "ext-list-2.2.2" = { name = "ext-list"; packageName = "ext-list"; - version = "2.2.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.0.tgz"; - sha1 = "a3e6fdeab978bca7a320c7e786f537083fc30055"; + url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz"; + sha1 = "0b98e64ed82f5acf0f2931babf69212ef52ddd37"; }; }; "meow-3.7.0" = { @@ -2677,130 +2767,13 @@ let sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; - "got-2.9.2" = { - name = "got"; - packageName = "got"; - version = "2.9.2"; + "mime-db-1.29.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-2.9.2.tgz"; - sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee"; - }; - }; - "duplexify-3.5.0" = { - name = "duplexify"; - packageName = "duplexify"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"; - sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604"; - }; - }; - "infinity-agent-2.0.3" = { - name = "infinity-agent"; - packageName = "infinity-agent"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; - sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; - }; - }; - "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"; - }; - }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; - }; - }; - "nested-error-stacks-1.0.2" = { - name = "nested-error-stacks"; - packageName = "nested-error-stacks"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; - sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; - }; - }; - "object-assign-2.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"; - sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa"; - }; - }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; - }; - }; - "read-all-stream-2.2.0" = { - name = "read-all-stream"; - packageName = "read-all-stream"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-2.2.0.tgz"; - sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0"; - }; - }; - "statuses-1.3.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; - sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; - }; - }; - "timed-out-2.0.0" = { - name = "timed-out"; - packageName = "timed-out"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; - sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; - }; - }; - "end-of-stream-1.0.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; - sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; - }; - }; - "stream-shift-1.0.0" = { - name = "stream-shift"; - packageName = "stream-shift"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; - }; - }; - "once-1.3.3" = { - name = "once"; - packageName = "once"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; + sha1 = "48d26d235589651704ac5916ca06001914266878"; }; }; "camelcase-keys-2.1.0" = { @@ -2839,13 +2812,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "normalize-package-data-2.3.5" = { + "normalize-package-data-2.4.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.5"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; - sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "12f95a307d58352075a04907b84ac8be98ac012f"; }; }; "object-assign-4.1.1" = { @@ -2920,13 +2893,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.2.0" = { + "hosted-git-info-2.5.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.2.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; + sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c"; }; }; "is-builtin-module-1.0.0" = { @@ -3064,13 +3037,13 @@ let sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; }; }; - "error-ex-1.3.0" = { + "error-ex-1.3.1" = { name = "error-ex"; packageName = "error-ex"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; - sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; + sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; }; }; "is-arrayish-0.2.1" = { @@ -3190,31 +3163,31 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "q-1.4.1" = { + "q-1.5.0" = { name = "q"; packageName = "q"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; - sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + url = "https://registry.npmjs.org/q/-/q-1.5.0.tgz"; + sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"; }; }; - "debug-2.6.1" = { + "debug-2.6.8" = { name = "debug"; packageName = "debug"; - version = "2.6.1"; + version = "2.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; - sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; + sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; }; }; - "ms-0.7.2" = { + "ms-2.0.0" = { name = "ms"; packageName = "ms"; - version = "0.7.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; "os-tmpdir-1.0.2" = { @@ -3280,13 +3253,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.5" = { + "buffer-5.0.6" = { name = "buffer"; packageName = "buffer"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; - sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"; + sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588"; }; }; "cached-path-relative-1.0.1" = { @@ -3325,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" = { @@ -3397,13 +3370,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "https-browserify-0.0.1" = { + "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; - version = "0.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; "insert-module-globals-7.0.1" = { @@ -3460,13 +3433,13 @@ let sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; }; }; - "process-0.11.9" = { + "process-0.11.10" = { name = "process"; packageName = "process"; - version = "0.11.9"; + version = "0.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.9.tgz"; - sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1"; + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; "querystring-es3-0.2.1" = { @@ -3514,13 +3487,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.6.3" = { + "stream-http-2.7.2" = { name = "stream-http"; packageName = "stream-http"; - version = "2.6.3"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; - sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz"; + sha1 = "40a050ec8dc3b53b33d9909415c02c0bf1abfbad"; }; }; "subarg-1.0.0" = { @@ -3532,13 +3505,13 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "syntax-error-1.1.6" = { + "syntax-error-1.3.0" = { name = "syntax-error"; packageName = "syntax-error"; - version = "1.1.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz"; - sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; + sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; }; }; "through2-2.0.3" = { @@ -3595,13 +3568,13 @@ let sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; - "jsonparse-1.3.0" = { + "jsonparse-1.3.1" = { name = "jsonparse"; packageName = "jsonparse"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz"; - sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8"; + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; "through-2.3.8" = { @@ -3676,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" = { @@ -3712,13 +3685,13 @@ let sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "browserify-sign-4.0.0" = { + "browserify-sign-4.0.4" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.0.0"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz"; - sha1 = "10773910c3c206d5420a46aad8694f820b85968f"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; "create-ecdh-4.0.0" = { @@ -3730,22 +3703,22 @@ let sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; }; }; - "create-hash-1.1.2" = { + "create-hash-1.1.3" = { name = "create-hash"; packageName = "create-hash"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz"; - sha1 = "51210062d7bb7479f6c65bb41a92208b1d61abad"; + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; + sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; }; }; - "create-hmac-1.1.4" = { + "create-hmac-1.1.6" = { name = "create-hmac"; packageName = "create-hmac"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"; - sha1 = "d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"; + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; + sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; }; }; "diffie-hellman-5.0.2" = { @@ -3757,13 +3730,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.9" = { + "pbkdf2-3.0.12" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.9"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz"; - sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz"; + sha1 = "be36785c5067ea48d806ff923288c5f750b6b8a2"; }; }; "public-encrypt-4.0.0" = { @@ -3775,13 +3748,13 @@ let sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; }; }; - "randombytes-2.0.3" = { + "randombytes-2.0.5" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"; - sha1 = "674c99760901c3c4112771a31e521dc349cc09ec"; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz"; + sha1 = "dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"; }; }; "browserify-aes-1.0.6" = { @@ -3820,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" = { @@ -3847,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" = { @@ -3874,13 +3847,13 @@ let sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "parse-asn1-5.0.0" = { + "parse-asn1-5.1.0" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz"; - sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; }; }; "brorand-1.1.0" = { @@ -3892,22 +3865,22 @@ 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.0" = { + "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; - sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -3928,13 +3901,13 @@ let sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; }; }; - "ripemd160-1.0.1" = { + "ripemd160-2.0.1" = { name = "ripemd160"; packageName = "ripemd160"; - version = "1.0.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"; - sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; + sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; }; }; "sha.js-2.4.8" = { @@ -3946,6 +3919,15 @@ let sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; }; }; + "hash-base-2.0.2" = { + name = "hash-base"; + packageName = "hash-base"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; + sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; + }; + }; "miller-rabin-4.0.0" = { name = "miller-rabin"; packageName = "miller-rabin"; @@ -3973,22 +3955,22 @@ let sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; }; }; - "astw-2.0.0" = { + "astw-2.2.0" = { name = "astw"; packageName = "astw"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz"; - sha1 = "08121ac8288d35611c0ceec663f6cd545604897d"; + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; }; }; - "acorn-1.2.2" = { + "acorn-4.0.13" = { name = "acorn"; packageName = "acorn"; - version = "1.2.2"; + version = "4.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; - sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; "stream-splicer-2.0.0" = { @@ -4000,13 +3982,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.3.2" = { + "detective-4.5.0" = { name = "detective"; packageName = "detective"; - version = "4.3.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz"; - sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c"; + url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; + sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; }; }; "stream-combiner2-1.1.1" = { @@ -4018,15 +4000,6 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "acorn-3.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; - }; - }; "path-platform-0.11.15" = { name = "path-platform"; packageName = "path-platform"; @@ -4099,15 +4072,6 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; - }; - }; "punycode-1.3.2" = { name = "punycode"; packageName = "punycode"; @@ -4234,13 +4198,13 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "mime-1.3.4" = { + "mime-1.3.6" = { name = "mime"; packageName = "mime"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + url = "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz"; + sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; "peerflix-0.34.0" = { @@ -4612,13 +4576,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "parse-torrent-5.8.1" = { + "parse-torrent-5.8.3" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.1"; + version = "5.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.1.tgz"; - sha1 = "29452b9eae4a1b497f12e580c1cf6fa9682e5c68"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; + sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; }; }; "pump-0.3.5" = { @@ -4666,13 +4630,13 @@ let sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d"; }; }; - "plist-2.0.1" = { + "plist-2.1.0" = { name = "plist"; packageName = "plist"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; - sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; + url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; + sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; }; }; "dns-js-0.2.1" = { @@ -4702,13 +4666,13 @@ let sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; }; - "base64-js-1.1.2" = { + "base64-js-1.2.0" = { name = "base64-js"; packageName = "base64-js"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; "xmlbuilder-8.2.2" = { @@ -4810,31 +4774,31 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.5" = { + "magnet-uri-5.1.7" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.5"; + version = "5.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; - sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.7.tgz"; + sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff"; }; }; - "parse-torrent-file-4.0.1" = { + "parse-torrent-file-4.0.3" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz"; - sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz"; + sha1 = "3e2ab0a464a803cc35d1357a1029d1cbd11dae37"; }; }; - "simple-get-2.4.0" = { + "simple-get-2.6.0" = { name = "simple-get"; packageName = "simple-get"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz"; - sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.6.0.tgz"; + sha1 = "bb01144db49b3d4c107615dcf48d3ee404b16e06"; }; }; "thirty-two-1.0.2" = { @@ -4855,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" = { @@ -4873,13 +4837,13 @@ let sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; }; }; - "rusha-0.8.5" = { + "rusha-0.8.6" = { name = "rusha"; packageName = "rusha"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz"; - sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.6.tgz"; + sha1 = "b264ddaa4d49a1d67300061858ba9358c4adca14"; }; }; "simple-concat-1.0.0" = { @@ -4909,6 +4873,24 @@ let sha1 = "de1905c636af874a8fba862d9aabddd1f920461c"; }; }; + "end-of-stream-1.0.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; + sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; + }; + }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "deep-extend-0.2.11" = { name = "deep-extend"; packageName = "deep-extend"; @@ -4963,13 +4945,13 @@ let sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; }; }; - "fs-chunk-store-1.6.4" = { + "fs-chunk-store-1.6.5" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz"; - sha1 = "5aa0025d58533118552e815f5986f39f93b06e69"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; + sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; }; }; "hat-0.0.3" = { @@ -5035,22 +5017,22 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-piece-1.1.0" = { + "torrent-piece-1.1.1" = { name = "torrent-piece"; packageName = "torrent-piece"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz"; - sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz"; + sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "random-access-file-1.5.0" = { + "random-access-file-1.8.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.5.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; - sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; + sha1 = "b1a54a0f924fbd4d45731a5771aea36be2166532"; }; }; "run-parallel-1.1.6" = { @@ -5071,13 +5053,22 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; - "ip-1.1.4" = { + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; + "ip-1.1.5" = { name = "ip"; packageName = "ip"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz"; - sha1 = "de8247ffef940451832550fba284945e6e039bfb"; + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; "magnet-uri-4.2.3" = { @@ -5269,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" = { @@ -5314,13 +5305,13 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.4.3" = { + "simple-peer-6.4.4" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.4.3"; + version = "6.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz"; - sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz"; + sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; "simple-websocket-4.3.1" = { @@ -5341,22 +5332,22 @@ let sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; }; }; - "ws-1.1.2" = { + "ws-1.1.4" = { name = "ws"; packageName = "ws"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; - sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; + url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz"; + sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; }; }; - "ipaddr.js-1.2.0" = { + "ipaddr.js-1.4.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz"; - sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; "get-browser-rtc-1.0.2" = { @@ -5368,13 +5359,22 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.1.0" = { + "ws-2.3.1" = { name = "ws"; packageName = "ws"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz"; - sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92"; + url = "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz"; + 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" = { @@ -5530,6 +5530,15 @@ let sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; }; }; + "node-uuid-1.4.8" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; + }; + }; "cookie-jar-0.2.0" = { name = "cookie-jar"; packageName = "cookie-jar"; @@ -5683,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" = { @@ -5701,31 +5710,49 @@ let sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; }; }; - "cordova-common-2.0.0" = { + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + }; + }; + "cordova-common-2.0.3" = { name = "cordova-common"; packageName = "cordova-common"; - version = "2.0.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.0.tgz"; - sha1 = "125097eb4b50b7353cec226ed21649192293ae97"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.3.tgz"; + sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38"; }; }; - "cordova-lib-6.5.0" = { + "cordova-lib-7.0.1" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "6.5.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.5.0.tgz"; - sha1 = "f7630a04c29d6cdee980190b1d93fb1536ac453f"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.0.1.tgz"; + sha1 = "31cbb90daeb66a67a7d3091636ce729a22a4f7ff"; }; }; - "insight-0.8.4" = { + "editor-1.0.0" = { + name = "editor"; + packageName = "editor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + }; + }; + "insight-0.8.2" = { name = "insight"; packageName = "insight"; - version = "0.8.4"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; - sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; + url = "https://registry.npmjs.org/insight/-/insight-0.8.2.tgz"; + sha1 = "18c2acf1b6055491278fc7529f1f21d32e1f0eda"; }; }; "nopt-3.0.1" = { @@ -5746,15 +5773,6 @@ let sha1 = "11872aeedee89268110b10a718448ffb10112a14"; }; }; - "underscore-1.7.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; - }; - }; "update-notifier-0.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -5764,6 +5782,78 @@ let sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; }; }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; + "osenv-0.1.4" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; + sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + }; + }; + "uuid-2.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + }; + }; + "write-file-atomic-1.3.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; + sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + }; + }; + "xdg-basedir-2.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; + sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -5791,13 +5881,13 @@ let sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; }; }; - "elementtree-0.1.7" = { + "elementtree-0.1.6" = { name = "elementtree"; packageName = "elementtree"; - version = "0.1.7"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; - sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; + sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; "glob-5.0.15" = { @@ -5809,15 +5899,6 @@ let sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; }; }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; "plist-1.2.0" = { name = "plist"; packageName = "plist"; @@ -5854,22 +5935,22 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.17" = { + "big-integer-1.6.23" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.17"; + version = "1.6.23"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; - sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.23.tgz"; + sha1 = "e85d508220c74e3f43a4ce72eed51f3da4db94d1"; }; }; - "sax-1.1.4" = { + "sax-0.3.5" = { name = "sax"; packageName = "sax"; - version = "1.1.4"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; - sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; "base64-js-0.0.8" = { @@ -5890,31 +5971,31 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; - "aliasify-1.9.0" = { + "aliasify-2.1.0" = { name = "aliasify"; packageName = "aliasify"; - version = "1.9.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/aliasify/-/aliasify-1.9.0.tgz"; - sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030"; + url = "https://registry.npmjs.org/aliasify/-/aliasify-2.1.0.tgz"; + sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42"; }; }; - "cordova-create-1.0.2" = { + "cordova-create-1.1.1" = { name = "cordova-create"; packageName = "cordova-create"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.2.tgz"; - sha1 = "cb9bba9817c62a645bacb6e00da8cc50936a0fa5"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.1.tgz"; + sha1 = "55282493ab396d9303f72febbaf2f978fa764cd2"; }; }; - "cordova-fetch-1.0.2" = { + "cordova-fetch-1.1.0" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.2.tgz"; - sha1 = "b8f4903f39fe613888062552a96995413af16d35"; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.1.0.tgz"; + sha1 = "1549f9ff4e6345f3c6fb6bd6523e8b19311a7b54"; }; }; "cordova-js-4.2.1" = { @@ -5944,76 +6025,76 @@ let sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }; }; - "elementtree-0.1.6" = { - name = "elementtree"; - packageName = "elementtree"; - version = "0.1.6"; + "glob-7.1.1" = { + name = "glob"; + packageName = "glob"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; - sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; }; }; - "init-package-json-1.9.4" = { + "init-package-json-1.10.1" = { name = "init-package-json"; packageName = "init-package-json"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.4.tgz"; - sha1 = "b4053d0b40f0cf842a41966937cb3dc0f534e856"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; + sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; }; }; - "nopt-3.0.6" = { + "nopt-4.0.1" = { name = "nopt"; packageName = "nopt"; - version = "3.0.6"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "npm-2.15.11" = { + "npm-2.15.12" = { name = "npm"; packageName = "npm"; - version = "2.15.11"; + version = "2.15.12"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; - sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz"; + sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "opener-1.4.1" = { + "opener-1.4.2" = { name = "opener"; packageName = "opener"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"; - sha1 = "897590acd1aed3311b703b58bccb4d43f56f2895"; + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; }; }; - "properties-parser-0.2.3" = { + "plist-2.0.1" = { + name = "plist"; + packageName = "plist"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; + sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; + }; + }; + "properties-parser-0.3.1" = { name = "properties-parser"; packageName = "properties-parser"; - version = "0.2.3"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"; - sha1 = "f7591255f707abbff227c7b56b637dbb0373a10f"; + url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz"; + sha1 = "1316e9539ffbfd93845e369b211022abd478771a"; }; }; - "request-2.47.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.47.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.47.0.tgz"; - sha1 = "09e9fd1a4fed6593a805ef8202b20f0c5ecb485f"; - }; - }; - "semver-4.3.6" = { - name = "semver"; - packageName = "semver"; - version = "4.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; - sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; "shelljs-0.3.0" = { @@ -6025,22 +6106,13 @@ let sha1 = "3596e6307a781544f591f37da618360f31db57b1"; }; }; - "tar-1.0.2" = { + "tar-2.2.1" = { name = "tar"; packageName = "tar"; - version = "1.0.2"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz"; - sha1 = "8b0f6740f9946259de26a3ed9c9a22890dff023f"; - }; - }; - "unorm-1.3.3" = { - name = "unorm"; - packageName = "unorm"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"; - sha1 = "16a8772671ebd6f7cde6f8c5e49bb60ac47dba93"; + url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; + sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; "valid-identifier-0.0.1" = { @@ -6052,31 +6124,40 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.9.1" = { + "xcode-0.9.3" = { name = "xcode"; packageName = "xcode"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; - sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz"; + sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"; }; }; - "browserify-transform-tools-1.5.3" = { + "browserify-transform-tools-1.7.0" = { name = "browserify-transform-tools"; packageName = "browserify-transform-tools"; - version = "1.5.3"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.5.3.tgz"; - sha1 = "509c9c652fb6b07bf0d21efceebb1d826f80754b"; + url = "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.7.0.tgz"; + sha1 = "83e277221f63259bed2e7eb2a283a970a501f4c4"; }; }; - "falafel-1.2.0" = { + "falafel-2.1.0" = { name = "falafel"; packageName = "falafel"; - version = "1.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz"; - sha1 = "c18d24ef5091174a497f318cd24b026a25cddab4"; + url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; + sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; + }; + }; + "acorn-5.1.1" = { + name = "acorn"; + packageName = "acorn"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz"; + sha1 = "53fe161111f912ab999ee887a90a0bc52822fd75"; }; }; "foreach-2.0.5" = { @@ -6097,22 +6178,22 @@ let sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; }; }; - "cordova-app-hello-world-3.11.0" = { + "cordova-app-hello-world-3.12.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; - sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz"; + sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; - "dependency-ls-1.0.0" = { + "dependency-ls-1.1.1" = { name = "dependency-ls"; packageName = "dependency-ls"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.0.0.tgz"; - sha1 = "311dc9fa9a840bee4c6ca33954556e5cf09cb5c9"; + url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; + sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; }; }; "is-url-1.2.2" = { @@ -6124,22 +6205,31 @@ let sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; }; }; - "shelljs-0.7.6" = { + "shelljs-0.7.8" = { name = "shelljs"; packageName = "shelljs"; - version = "0.7.6"; + version = "0.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz"; - sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; + sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "interpret-1.0.1" = { + "q-1.4.1" = { + name = "q"; + packageName = "q"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; + sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + }; + }; + "interpret-1.0.3" = { name = "interpret"; packageName = "interpret"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz"; - sha1 = "d579fb7f693b858004947af39fa0db49f795602c"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz"; + sha1 = "cbc35c62eeee73f19ab7b10a801511401afc0f90"; }; }; "rechoir-0.6.2" = { @@ -6169,22 +6259,31 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "compression-1.6.2" = { - name = "compression"; - packageName = "compression"; - version = "1.6.2"; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz"; - sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; }; }; - "express-4.14.1" = { + "compression-1.7.0" = { + name = "compression"; + packageName = "compression"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz"; + sha1 = "030c9f198f1643a057d776a738e922da4373012d"; + }; + }; + "express-4.15.3" = { name = "express"; packageName = "express"; - version = "4.14.1"; + version = "4.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; - sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; + url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; + sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; }; }; "accepts-1.3.3" = { @@ -6196,31 +6295,22 @@ 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.9" = { + "compressible-2.0.10" = { name = "compressible"; packageName = "compressible"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; - sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; - }; - }; - "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"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; + sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; }; }; "on-headers-1.0.1" = { @@ -6232,13 +6322,13 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; - "vary-1.1.0" = { + "vary-1.1.1" = { name = "vary"; packageName = "vary"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; - sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; + sha1 = "67535ebb694c1d52257457984665323f587e8d37"; }; }; "negotiator-0.6.1" = { @@ -6250,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"; @@ -6304,6 +6385,15 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; + "debug-2.6.7" = { + name = "debug"; + packageName = "debug"; + version = "2.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; + sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; + }; + }; "depd-1.1.0" = { name = "depd"; packageName = "depd"; @@ -6331,31 +6421,31 @@ let sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; - "etag-1.7.0" = { + "etag-1.8.0" = { name = "etag"; packageName = "etag"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; - sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; + sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; }; }; - "finalhandler-0.5.1" = { + "finalhandler-1.0.3" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz"; + sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89"; }; }; - "fresh-0.3.0" = { + "fresh-0.5.0" = { name = "fresh"; packageName = "fresh"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; - sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; + sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; }; }; "merge-descriptors-1.0.1" = { @@ -6403,49 +6493,67 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.3" = { + "proxy-addr-1.1.4" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz"; - sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz"; + sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3"; }; }; - "qs-6.2.0" = { + "qs-6.4.0" = { name = "qs"; packageName = "qs"; - version = "6.2.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"; - sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "send-0.14.2" = { + "send-0.15.3" = { name = "send"; packageName = "send"; - version = "0.14.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; - sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; + url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; + sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; }; }; - "serve-static-1.11.2" = { + "serve-static-1.12.3" = { name = "serve-static"; packageName = "serve-static"; - version = "1.11.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; - sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; + sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; }; }; - "type-is-1.6.14" = { + "setprototypeof-1.0.3" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + }; + }; + "statuses-1.3.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + }; + "type-is-1.6.15" = { name = "type-is"; packageName = "type-is"; - version = "1.6.14"; + version = "1.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; - sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; + sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; }; }; "utils-merge-1.0.0" = { @@ -6484,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"; @@ -6493,22 +6610,22 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.5.1" = { + "http-errors-1.6.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; - sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; + sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; }; }; - "setprototypeof-1.0.2" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.2"; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; - sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; }; }; "media-typer-0.3.0" = { @@ -6529,22 +6646,13 @@ let sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; }; }; - "sax-0.3.5" = { - name = "sax"; - packageName = "sax"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; - }; - }; - "npm-package-arg-4.2.0" = { + "npm-package-arg-5.1.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "4.2.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.0.tgz"; - sha1 = "809bc61cabf54bd5ff94f6165c89ba8ee88c115c"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; + sha1 = "fb18d17bb61e60900d6312619919bd753755ab37"; }; }; "promzard-0.3.0" = { @@ -6556,22 +6664,22 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "read-package-json-2.0.4" = { + "read-package-json-2.0.10" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.4"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.4.tgz"; - sha1 = "61ed1b2256ea438d8008895090be84b8e799c853"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.10.tgz"; + sha1 = "dc0229f6dde6b4b705b39e25b2d970ebe95685ae"; }; }; - "validate-npm-package-name-2.2.2" = { + "validate-npm-package-name-3.0.0" = { name = "validate-npm-package-name"; packageName = "validate-npm-package-name"; - version = "2.2.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"; - sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085"; + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -6592,13 +6700,13 @@ let sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; }; }; - "builtins-0.0.7" = { + "builtins-1.0.3" = { name = "builtins"; packageName = "builtins"; - version = "0.0.7"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"; - sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"; + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; "abbrev-1.1.0" = { @@ -6727,40 +6835,31 @@ let sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; }; }; - "editor-1.0.0" = { - name = "editor"; - packageName = "editor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; - sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; - }; - }; - "fs-vacuum-1.2.9" = { + "fs-vacuum-1.2.10" = { name = "fs-vacuum"; packageName = "fs-vacuum"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.9.tgz"; - sha1 = "4f90193ab8ea02890995bcd4e804659a5d366b2d"; + url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; + sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; }; }; - "fs-write-stream-atomic-1.0.8" = { + "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz"; - sha1 = "e49aaddf288f87d46ff9e882f216a13abc40778b"; - }; - }; - "fstream-1.0.10" = { - name = "fstream"; - packageName = "fstream"; version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz"; - sha1 = "604e8a92fe26ffd9f6fae30399d4984e1ab22822"; + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; }; }; "fstream-npm-1.1.1" = { @@ -6808,6 +6907,15 @@ let sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; }; }; + "init-package-json-1.9.6" = { + name = "init-package-json"; + packageName = "init-package-json"; + version = "1.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz"; + sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61"; + }; + }; "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; @@ -6826,13 +6934,22 @@ let sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; - "node-gyp-3.4.0" = { + "node-gyp-3.6.2" = { name = "node-gyp"; packageName = "node-gyp"; - version = "3.4.0"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; - sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; + sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; "normalize-git-url-3.0.2" = { @@ -6844,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"; @@ -6961,15 +7087,6 @@ let sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae"; }; }; - "slide-1.1.6" = { - name = "slide"; - packageName = "slide"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - }; "sorted-object-2.0.1" = { name = "sorted-object"; packageName = "sorted-object"; @@ -6979,15 +7096,6 @@ let sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; }; }; - "tar-2.2.1" = { - name = "tar"; - packageName = "tar"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; - sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; - }; - }; "text-table-0.2.0" = { name = "text-table"; packageName = "text-table"; @@ -7015,6 +7123,15 @@ let sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; }; }; + "validate-npm-package-name-2.2.2" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"; + sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085"; + }; + }; "write-file-atomic-1.1.4" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -7024,42 +7141,6 @@ let sha1 = "b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b"; }; }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; - }; - }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - }; - "clone-1.0.2" = { - name = "clone"; - packageName = "clone"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"; - sha1 = "260b7a99ebb1edfe247538175f783243cb19d149"; - }; - }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -7096,112 +7177,31 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "yallist-2.0.0" = { + "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; - sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; - }; - }; - "path-array-1.0.1" = { - name = "path-array"; - packageName = "path-array"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"; - sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271"; - }; - }; - "array-index-1.0.0" = { - name = "array-index"; - packageName = "array-index"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"; - sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9"; - }; - }; - "es6-symbol-3.1.0" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz"; - sha1 = "94481c655e7a7cad82eba832d97d5433496d7ffa"; - }; - }; - "d-0.1.1" = { - name = "d"; - packageName = "d"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-0.1.1.tgz"; - sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309"; - }; - }; - "es5-ext-0.10.12" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.12"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz"; - sha1 = "aa84641d4db76b62abba5e45fd805ecbab140047"; - }; - }; - "es6-iterator-2.0.0" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz"; - sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; - }; - }; - "request-2.79.0" = { - name = "request"; - packageName = "request"; - version = "2.79.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; - }; - }; - "form-data-2.1.2" = { - name = "form-data"; - packageName = "form-data"; version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "qs-6.3.1" = { - name = "qs"; - packageName = "qs"; - version = "6.3.1"; + "npm-package-arg-4.2.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz"; - sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; + sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; }; }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "are-we-there-yet-1.1.2" = { + "are-we-there-yet-1.1.4" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"; - sha1 = "80e470e95a084794fe1899262c5667c6e88de1b3"; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; + sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; }; }; "gauge-1.2.7" = { @@ -7285,202 +7285,112 @@ let sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; }; }; - "bl-0.9.5" = { - name = "bl"; - packageName = "bl"; - version = "0.9.5"; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; - "caseless-0.6.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.6.0"; + "builtins-0.0.7" = { + name = "builtins"; + packageName = "builtins"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"; + sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"; }; }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; }; }; - "form-data-0.1.4" = { + "string.prototype.codepointat-0.2.0" = { + name = "string.prototype.codepointat"; + packageName = "string.prototype.codepointat"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; + sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; + }; + }; + "form-data-2.1.4" = { name = "form-data"; packageName = "form-data"; - version = "0.1.4"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; - "qs-2.3.3" = { + "qs-6.3.2" = { name = "qs"; packageName = "qs"; - version = "2.3.3"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; + sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; }; }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.4.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - }; - "pegjs-0.9.0" = { + "pegjs-0.10.0" = { name = "pegjs"; packageName = "pegjs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz"; - sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369"; + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "simple-plist-0.1.4" = { + "simple-plist-0.2.1" = { name = "simple-plist"; packageName = "simple-plist"; - version = "0.1.4"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz"; - sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d"; + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; }; }; - "bplist-parser-0.0.6" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.0.6"; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; - sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; }; }; - "bplist-creator-0.0.4" = { + "bplist-creator-0.0.7" = { name = "bplist-creator"; packageName = "bplist-creator"; - version = "0.0.4"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz"; - sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; }; }; - "stream-buffers-0.2.6" = { + "stream-buffers-2.2.0" = { name = "stream-buffers"; packageName = "stream-buffers"; - version = "0.2.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz"; - sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc"; + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; + sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; "async-1.5.2" = { @@ -7528,24 +7438,6 @@ let sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; }; }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; - }; - }; - "xdg-basedir-2.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; - sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; - }; - }; "ansi-escapes-1.4.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -7744,6 +7636,24 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; + "duplexify-3.5.0" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"; + sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604"; + }; + }; + "infinity-agent-2.0.3" = { + name = "infinity-agent"; + packageName = "infinity-agent"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; + sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; + }; + }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -7753,6 +7663,24 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; + "lowercase-keys-1.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + }; + }; + "nested-error-stacks-1.0.2" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; + sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; + }; + }; "object-assign-3.0.0" = { name = "object-assign"; packageName = "object-assign"; @@ -7762,6 +7690,15 @@ let sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; }; }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; "read-all-stream-3.1.0" = { name = "read-all-stream"; packageName = "read-all-stream"; @@ -7771,13 +7708,31 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.1.7" = { + "timed-out-2.0.0" = { + name = "timed-out"; + packageName = "timed-out"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; + sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; + }; + }; + "stream-shift-1.0.0" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; + sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + }; + }; + "rc-1.2.1" = { name = "rc"; packageName = "rc"; - version = "1.1.7"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz"; - sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; + sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; }; }; "strip-json-comments-2.0.1" = { @@ -7789,13 +7744,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "clone-2.1.0" = { + "clone-2.1.1" = { name = "clone"; packageName = "clone"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz"; - sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6"; + url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz"; + sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; }; }; "parserlib-1.1.1" = { @@ -8060,6 +8015,15 @@ let sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; }; }; + "qs-2.3.3" = { + name = "qs"; + packageName = "qs"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + }; + }; "range-parser-1.0.3" = { name = "range-parser"; packageName = "range-parser"; @@ -8204,13 +8168,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.1" = { + "nan-2.6.2" = { name = "nan"; packageName = "nan"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; "jsonparse-0.0.6" = { @@ -8222,13 +8186,13 @@ let sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; }; }; - "debug-1.0.4" = { + "debug-1.0.5" = { name = "debug"; packageName = "debug"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; + sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; }; }; "lodash-2.4.2" = { @@ -8267,15 +8231,6 @@ let sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; }; - "ms-0.6.2" = { - name = "ms"; - packageName = "ms"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - }; "better-curry-1.6.0" = { name = "better-curry"; packageName = "better-curry"; @@ -8351,13 +8306,13 @@ let sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; }; }; - "verror-1.9.0" = { + "verror-1.10.0" = { name = "verror"; packageName = "verror"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; - sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; "extsprintf-1.3.0" = { @@ -8369,6 +8324,15 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; "qs-1.2.0" = { name = "qs"; packageName = "qs"; @@ -8459,13 +8423,13 @@ let sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; - "cors-2.8.1" = { + "cors-2.8.4" = { name = "cors"; packageName = "cors"; - version = "2.8.1"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; - sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; + sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; }; }; "docker-parse-image-3.0.1" = { @@ -8477,13 +8441,13 @@ let sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "end-of-stream-1.1.0" = { + "end-of-stream-1.4.0" = { name = "end-of-stream"; packageName = "end-of-stream"; - version = "1.1.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; - sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; + sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; }; }; "from2-1.3.0" = { @@ -8639,13 +8603,13 @@ let sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; }; }; - "tar-stream-1.5.2" = { + "tar-stream-1.5.4" = { name = "tar-stream"; packageName = "tar-stream"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz"; - sha1 = "fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf"; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz"; + sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016"; }; }; "through2-0.6.5" = { @@ -8720,13 +8684,13 @@ let sha1 = "9500635e257945d6feede185f5d7a24773455b17"; }; }; - "pull-stream-3.5.0" = { + "pull-stream-3.6.0" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; - sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.0.tgz"; + sha1 = "59d033a6815d4e3097d47c3d2b1893a9e58a2351"; }; }; "typewiselite-1.0.0" = { @@ -8846,13 +8810,13 @@ let sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; - "pull-pushable-2.0.1" = { + "pull-pushable-2.1.1" = { name = "pull-pushable"; packageName = "pull-pushable"; - version = "2.0.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.0.1.tgz"; - sha1 = "02bdca51a39cf585f483fbecde2fc9378076f212"; + url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.1.tgz"; + sha1 = "86666abbe3f5402f1f7ead03eefd69b785eca5b8"; }; }; "pull-window-2.1.4" = { @@ -8945,22 +8909,139 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "bl-1.2.0" = { + "bl-1.2.1" = { name = "bl"; packageName = "bl"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz"; - sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; + sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "awscred-1.2.0" = { - name = "awscred"; - packageName = "awscred"; - version = "1.2.0"; + "aws-sdk-2.85.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz"; - sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.85.0.tgz"; + sha1 = "e3860761c9a2f8a9017461ab7f3bd075f69dfa8f"; + }; + }; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; + "crypto-browserify-1.0.9" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; + sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"; + }; + }; + "jmespath-0.15.0" = { + name = "jmespath"; + packageName = "jmespath"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; + sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; + }; + }; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + }; + "url-0.10.3" = { + name = "url"; + packageName = "url"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; + sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + }; + }; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + }; + }; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; "clipboardy-0.1.2" = { @@ -8972,6 +9053,15 @@ let sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc"; }; }; + "conf-1.1.2" = { + name = "conf"; + packageName = "conf"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-1.1.2.tgz"; + sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50"; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -9008,6 +9098,15 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; + "skin-tone-1.0.0" = { + name = "skin-tone"; + packageName = "skin-tone"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/skin-tone/-/skin-tone-1.0.0.tgz"; + sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; + }; + }; "execa-0.5.1" = { name = "execa"; packageName = "execa"; @@ -9062,6 +9161,15 @@ let sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; }; }; + "lru-cache-4.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; + sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -9071,6 +9179,87 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; + "dot-prop-4.1.1" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz"; + sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"; + }; + }; + "env-paths-1.0.0" = { + name = "env-paths"; + packageName = "env-paths"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz"; + sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; + }; + }; + "make-dir-1.0.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz"; + sha1 = "97a011751e91dd87cfadef58832ebb04936de978"; + }; + }; + "pkg-up-2.0.0" = { + name = "pkg-up"; + packageName = "pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "create-error-class-3.0.2" = { name = "create-error-class"; packageName = "create-error-class"; @@ -9143,6 +9332,24 @@ let sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; }; }; + "unicode-emoji-modifier-base-1.0.0" = { + name = "unicode-emoji-modifier-base"; + packageName = "unicode-emoji-modifier-base"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz"; + 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"; @@ -9152,31 +9359,40 @@ let sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; }; }; - "doctrine-1.5.0" = { + "doctrine-2.0.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.5.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz"; + sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63"; }; }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; + "eslint-scope-3.7.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; - "espree-3.4.0" = { + "espree-3.4.3" = { name = "espree"; packageName = "espree"; - version = "3.4.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz"; - sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; + url = "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz"; + sha1 = "2910b5ccd49ce893c2ffffaab4fd8b3a31b82374"; + }; + }; + "esquery-1.0.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz"; + sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; }; }; "estraverse-4.2.0" = { @@ -9206,31 +9422,31 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.16.0" = { + "globals-9.18.0" = { name = "globals"; packageName = "globals"; - version = "9.16.0"; + version = "9.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz"; - sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80"; + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; }; }; - "ignore-3.2.4" = { + "ignore-3.3.3" = { name = "ignore"; packageName = "ignore"; - version = "3.2.4"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz"; - sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz"; + sha1 = "432352e57accd87ab3110e82d3fea0e47812156d"; }; }; - "inquirer-0.12.0" = { + "inquirer-3.2.0" = { name = "inquirer"; packageName = "inquirer"; - version = "0.12.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.0.tgz"; + sha1 = "45b44c2160c729d7578c54060b3eed94487bb42b"; }; }; "is-resolvable-1.0.0" = { @@ -9242,22 +9458,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.1" = { + "js-yaml-3.9.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.1"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; - sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; - }; - }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz"; + sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"; }; }; "levn-0.3.0" = { @@ -9287,13 +9494,22 @@ let sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; - "pluralize-1.2.1" = { + "pluralize-4.0.0" = { name = "pluralize"; packageName = "pluralize"; - version = "1.2.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + url = "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz"; + sha1 = "59b708c1c0190a2f692f1c7618c446b052fd1762"; + }; + }; + "progress-2.0.0" = { + name = "progress"; + packageName = "progress"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz"; + sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; }; }; "require-uncached-1.0.3" = { @@ -9305,94 +9521,49 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "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" = { + "table-4.0.1" = { name = "table"; packageName = "table"; - version = "3.8.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; - sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + url = "https://registry.npmjs.org/table/-/table-4.0.1.tgz"; + sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"; }; }; - "js-tokens-3.0.1" = { + "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/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; + sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; + }; + }; + "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/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.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"; - sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; }; - "es6-map-0.1.4" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz"; - sha1 = "a34b147be224773a4d7da8072794cefa3632b897"; - }; - }; - "es6-weak-map-2.0.1" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz"; - sha1 = "0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81"; - }; - }; - "esrecurse-4.1.0" = { + "esrecurse-4.2.0" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz"; - sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220"; - }; - }; - "es6-set-0.1.4" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz"; - sha1 = "9516b6761c2964b92ff479456233a247dc707ce8"; - }; - }; - "event-emitter-0.3.4" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz"; - sha1 = "8d63ddfb4cfe1fae3b32ca265c4c720222080bb5"; - }; - }; - "estraverse-4.1.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; - sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; - }; - }; - "acorn-4.0.4" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"; - sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a"; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; + sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; }; }; "acorn-jsx-3.0.1" = { @@ -9404,6 +9575,15 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; "flat-cache-1.2.2" = { name = "flat-cache"; packageName = "flat-cache"; @@ -9503,6 +9683,33 @@ let sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; }; + "ansi-escapes-2.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"; + 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"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; "cli-width-2.1.0" = { name = "cli-width"; packageName = "cli-width"; @@ -9512,13 +9719,184 @@ let sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a"; }; }; - "string-width-1.0.2" = { + "external-editor-2.0.4" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz"; + sha1 = "1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; + "rx-lite-4.0.8" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; + sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + }; + }; + "rx-lite-aggregates-4.0.8" = { + name = "rx-lite-aggregates"; + packageName = "rx-lite-aggregates"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; + sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + }; + }; + "string-width-2.1.0" = { name = "string-width"; packageName = "string-width"; - version = "1.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + 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/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "iconv-lite-0.4.18" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; + sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; + }; + }; + "jschardet-1.4.2" = { + name = "jschardet"; + packageName = "jschardet"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz"; + sha1 = "2aa107f142af4121d145659d44f50830961e699a"; + }; + }; + "tmp-0.0.31" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "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"; + }; + }; + "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" = { @@ -9539,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" = { @@ -9620,15 +9998,6 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.11.3" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz"; - sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22"; - }; - }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -9647,31 +10016,211 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "string-width-2.0.0" = { - name = "string-width"; - packageName = "string-width"; - version = "2.0.0"; + "eslint-4.2.0" = { + name = "eslint"; + packageName = "eslint"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; - sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz"; + sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; + "supports-color-3.2.3" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; + sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.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-1.0.0.tgz"; + 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" = { @@ -9818,13 +10367,13 @@ let sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; }; }; - "chokidar-1.6.1" = { + "chokidar-1.7.0" = { name = "chokidar"; packageName = "chokidar"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz"; - sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; "ps-tree-0.0.3" = { @@ -9890,13 +10439,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.1.1" = { + "fsevents-1.1.2" = { name = "fsevents"; packageName = "fsevents"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz"; - sha1 = "f19fd28f43eeaf761680e519a203c4d0b3d31aff"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz"; + sha1 = "3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"; }; }; "micromatch-2.3.11" = { @@ -9944,13 +10493,13 @@ let sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; }; }; - "filename-regex-2.0.0" = { + "filename-regex-2.0.1" = { name = "filename-regex"; packageName = "filename-regex"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"; - sha1 = "996e3e80479b98b9897f15a8a58b3d084e926775"; + url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; "is-extglob-1.0.0" = { @@ -9962,13 +10511,13 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "normalize-path-2.0.1" = { + "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; - version = "2.0.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"; - sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a"; + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; "object.omit-2.0.1" = { @@ -9998,13 +10547,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.1" = { + "arr-flatten-1.1.0" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"; - sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; }; }; "expand-range-1.8.2" = { @@ -10061,13 +10610,31 @@ let sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; - "randomatic-1.1.6" = { + "randomatic-1.1.7" = { name = "randomatic"; packageName = "randomatic"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"; - sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c"; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; }; }; "is-posix-bracket-0.1.1" = { @@ -10079,6 +10646,15 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; + "remove-trailing-separator-1.0.2" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"; + sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511"; + }; + }; "for-own-0.1.5" = { name = "for-own"; packageName = "for-own"; @@ -10097,13 +10673,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-1.0.1" = { + "for-in-1.0.2" = { name = "for-in"; packageName = "for-in"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz"; - sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa"; + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; }; }; "glob-base-0.3.0" = { @@ -10115,13 +10691,13 @@ let sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; }; }; - "is-dotfile-1.0.2" = { + "is-dotfile-1.0.3" = { name = "is-dotfile"; packageName = "is-dotfile"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"; - sha1 = "2c132383f39199f8edc268ca01b9b007d205cc4d"; + url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; }; }; "is-equal-shallow-0.1.3" = { @@ -10160,31 +10736,31 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "node-pre-gyp-0.6.33" = { + "node-pre-gyp-0.6.36" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.33"; + version = "0.6.36"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; - sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; + sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; }; }; - "npmlog-4.0.2" = { + "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; - version = "4.0.2"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz"; - sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; }; }; - "tar-pack-3.3.0" = { + "tar-pack-3.4.0" = { name = "tar-pack"; packageName = "tar-pack"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz"; - sha1 = "30931816418f55afc4d21775afdd6720cee45dae"; + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz"; + sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984"; }; }; "console-control-strings-1.1.0" = { @@ -10196,13 +10772,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.7.3" = { + "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz"; - sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; "set-blocking-2.0.0" = { @@ -10214,22 +10790,31 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "aproba-1.1.1" = { + "aproba-1.1.2" = { name = "aproba"; packageName = "aproba"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz"; - sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz"; + sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1"; }; }; - "wide-align-1.1.0" = { + "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"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz"; - sha1 = "40edde802a71fea1f070da3e62dcda2e7add96ad"; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; + sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710"; }; }; "event-stream-0.5.3" = { @@ -10313,6 +10898,15 @@ let sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; }; }; + "lodash.groupby-4.6.0" = { + name = "lodash.groupby"; + packageName = "lodash.groupby"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz"; + sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; + }; + }; "minilog-2.0.8" = { name = "minilog"; packageName = "minilog"; @@ -10322,6 +10916,15 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; + "simple-git-1.73.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "1.73.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.73.0.tgz"; + sha1 = "87683a729b1bee016a3182f95a2ab72317bb0230"; + }; + }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { name = "tabtab"; packageName = "tabtab"; @@ -10359,13 +10962,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.4" = { + "coffee-script-1.12.6" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; + sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; }; }; "jade-1.11.0" = { @@ -10404,13 +11007,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.25" = { + "clean-css-3.4.28" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.25"; + version = "3.4.28"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz"; - sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; + sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; "commander-2.6.0" = { @@ -10449,13 +11052,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.7.5" = { + "uglify-js-2.8.29" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "2.8.29"; 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-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; "void-elements-2.0.1" = { @@ -10494,13 +11097,22 @@ let sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "acorn-2.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; + sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; }; }; "promise-6.1.0" = { @@ -10584,6 +11196,15 @@ let sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }; }; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -10656,6 +11277,15 @@ let sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; + "semver-4.3.6" = { + name = "semver"; + packageName = "semver"; + version = "4.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; + sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + }; + }; "tildify-1.2.0" = { name = "tildify"; packageName = "tildify"; @@ -10665,13 +11295,13 @@ let sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; }; }; - "v8flags-2.0.11" = { + "v8flags-2.1.1" = { name = "v8flags"; packageName = "v8flags"; - version = "2.0.11"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.11.tgz"; - sha1 = "bca8f30f0d6d60612cc2c00641e6962d42ae6881"; + url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; + sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; }; }; "vinyl-fs-0.3.14" = { @@ -10800,13 +11430,13 @@ let sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; }; }; - "time-stamp-1.0.1" = { + "time-stamp-1.1.0" = { name = "time-stamp"; packageName = "time-stamp"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz"; - sha1 = "9f4bd23559c9365966f3302dbba2b07c6b99b151"; + url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; + sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; }; }; "glogg-1.0.0" = { @@ -10953,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" = { @@ -11034,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" = { @@ -11070,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"; @@ -11358,13 +12033,13 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-2.0.2" = { + "eventemitter3-2.0.3" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz"; - sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; + sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; }; "csslint-0.10.0" = { @@ -11529,22 +12204,13 @@ let sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; }; }; - "handlebars-4.0.6" = { + "handlebars-4.0.10" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.6"; + version = "4.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.6.tgz"; - sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7"; - }; - }; - "supports-color-3.2.3" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; - sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz"; + sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"; }; }; "estraverse-1.9.3" = { @@ -11565,13 +12231,229 @@ let sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; }; }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "1.0.0"; + "@reactivex/rxjs-5.4.2" = { + name = "@reactivex/rxjs"; + packageName = "@reactivex/rxjs"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.2.tgz"; + sha1 = "ab530dbbdab71071369828ef11c8d7ae558d5116"; + }; + }; + "chai-4.1.0" = { + name = "chai"; + packageName = "chai"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chai/-/chai-4.1.0.tgz"; + sha1 = "331a0391b55c3af8740ae9c3b7458bc1c3805e6d"; + }; + }; + "chai-as-promised-7.1.1" = { + name = "chai-as-promised"; + packageName = "chai-as-promised"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz"; + sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0"; + }; + }; + "fast-json-patch-2.0.3" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.3.tgz"; + sha1 = "d17ab0b94d742ec200bef297a378b57368a47f09"; + }; + }; + "iterare-0.0.8" = { + name = "iterare"; + packageName = "iterare"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/iterare/-/iterare-0.0.8.tgz"; + sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; + }; + }; + "mz-2.6.0" = { + name = "mz"; + packageName = "mz"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz"; + sha1 = "c8b8521d958df0a4f2768025db69c719ee4ef1ce"; + }; + }; + "object-hash-1.1.8" = { + name = "object-hash"; + packageName = "object-hash"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.1.8.tgz"; + sha1 = "28a659cf987d96a4dabe7860289f3b5326c4a03c"; + }; + }; + "opentracing-0.14.1" = { + name = "opentracing"; + packageName = "opentracing"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.1.tgz"; + sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; + }; + }; + "semaphore-async-await-1.5.1" = { + name = "semaphore-async-await"; + packageName = "semaphore-async-await"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; + sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa"; + }; + }; + "string-similarity-1.2.0" = { + name = "string-similarity"; + packageName = "string-similarity"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.0.tgz"; + sha1 = "d75153cb383846318b7a39a8d9292bb4db4e9c30"; + }; + }; + "typescript-2.3.4" = { + name = "typescript"; + packageName = "typescript"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz"; + sha1 = "3d38321828231e434f287514959c37a82b629f42"; + }; + }; + "vscode-jsonrpc-3.3.1" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"; + sha1 = "b7857be58b97af664a8cdd071c91891d6c7d6a67"; + }; + }; + "vscode-languageserver-3.3.0" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz"; + sha1 = "f547d4f0e5702f88ff3695bae5905f9604c8cc62"; + }; + }; + "vscode-languageserver-types-3.3.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz"; + sha1 = "8964dc7c2247536fbefd2d6836bf3febac80dd00"; + }; + }; + "symbol-observable-1.0.4" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"; + sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"; + }; + }; + "assertion-error-1.0.2" = { + name = "assertion-error"; + packageName = "assertion-error"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz"; + sha1 = "13ca515d86206da0bac66e834dd397d87581094c"; + }; + }; + "check-error-1.0.2" = { + name = "check-error"; + packageName = "check-error"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"; + sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; + }; + }; + "deep-eql-2.0.2" = { + name = "deep-eql"; + packageName = "deep-eql"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-eql/-/deep-eql-2.0.2.tgz"; + sha1 = "b1bac06e56f0a76777686d50c9feb75c2ed7679a"; + }; + }; + "get-func-name-2.0.0" = { + name = "get-func-name"; + packageName = "get-func-name"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"; + sha1 = "ead774abee72e20409433a066366023dd6887a41"; + }; + }; + "pathval-1.1.0" = { + name = "pathval"; + packageName = "pathval"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; + sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + }; + }; + "type-detect-4.0.3" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz"; + sha1 = "0e3f2670b44099b0b46c284d136a7ef49c74c2ea"; + }; + }; + "type-detect-3.0.0" = { + name = "type-detect"; + packageName = "type-detect"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-3.0.0.tgz"; + sha1 = "46d0cc8553abb7b13a352b0d6dea2fd58f2d9b55"; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "thenify-3.3.0" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz"; + sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; }; }; "when-3.4.6" = { @@ -11592,22 +12474,427 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "bluebird-3.4.7" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.4.7"; + "editorconfig-0.13.2" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz"; - sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.2.tgz"; + sha1 = "8e57926d9ee69ab6cb999f027c2171467acceb35"; }; }; - "body-parser-1.16.1" = { + "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"; - version = "1.16.1"; + version = "1.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz"; - sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; + sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; + }; + }; + "connect-pause-0.1.1" = { + name = "connect-pause"; + packageName = "connect-pause"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz"; + sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; + }; + }; + "errorhandler-1.5.0" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz"; + 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"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.13.0.tgz"; + sha1 = "1b2086c24f004f07411bdb09b775072114bcddc6"; + }; + }; + "lowdb-0.15.5" = { + name = "lowdb"; + packageName = "lowdb"; + version = "0.15.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lowdb/-/lowdb-0.15.5.tgz"; + sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96"; + }; + }; + "method-override-2.3.9" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz"; + sha1 = "bd151f2ce34cf01a76ca400ab95c012b102d8f71"; + }; + }; + "morgan-1.8.2" = { + name = "morgan"; + packageName = "morgan"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz"; + 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"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz"; + sha1 = "84213d0a12356069daa84060c559242633161368"; + }; + }; + "server-destroy-1.0.1" = { + name = "server-destroy"; + packageName = "server-destroy"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; + sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; + }; + }; + "shortid-2.2.8" = { + name = "shortid"; + packageName = "shortid"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/shortid/-/shortid-2.2.8.tgz"; + sha1 = "033b117d6a2e975804f6f0969dbe7d3d0b355131"; + }; + }; + "update-notifier-1.0.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz"; + sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; + }; + }; + "yargs-6.6.0" = { + name = "yargs"; + packageName = "yargs"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + }; + }; + "bytes-2.4.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; + sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; + }; + }; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + }; + }; + "raw-body-2.2.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; + 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"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; + sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; + }; + }; + "boxen-0.6.0" = { + name = "boxen"; + packageName = "boxen"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz"; + sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"; + }; + }; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + }; + }; + "lazy-req-1.1.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"; + sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac"; + }; + }; + "ansi-align-1.1.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz"; + sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba"; + }; + }; + "cli-boxes-1.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + }; + }; + "registry-auth-token-3.3.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; + sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; + }; + }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; + "unzip-response-1.0.2" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; + sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "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-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "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"; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; "combine-lists-1.0.1" = { @@ -11619,13 +12906,13 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.6.0" = { + "connect-3.6.2" = { name = "connect"; packageName = "connect"; - version = "3.6.0"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz"; - sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz"; + sha1 = "694e8d20681bfe490282c8ab886be98f09f42fe7"; }; }; "core-js-2.4.1" = { @@ -11709,67 +12996,13 @@ let sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; - }; - }; - "useragent-2.1.12" = { + "useragent-2.2.1" = { name = "useragent"; packageName = "useragent"; - version = "2.1.12"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz"; - sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2"; - }; - }; - "bytes-2.4.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; - sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; - }; - }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; - "qs-6.2.1" = { - name = "qs"; - packageName = "qs"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; - }; - }; - "raw-body-2.2.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; - sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; - }; - }; - "finalhandler-1.0.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz"; - sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; + sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; "custom-event-1.0.1" = { @@ -11916,6 +13149,15 @@ let sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; "base64id-1.0.0" = { name = "base64id"; packageName = "base64id"; @@ -11934,6 +13176,15 @@ let sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; }; }; + "ws-1.1.2" = { + name = "ws"; + packageName = "ws"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; + sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; + }; + }; "after-0.8.2" = { name = "after"; packageName = "after"; @@ -12114,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"; @@ -12123,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"; @@ -12204,6 +13473,24 @@ let sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; }; }; + "etag-1.7.0" = { + name = "etag"; + packageName = "etag"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; + sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + }; + }; + "fresh-0.3.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; + sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + }; + }; "merge-descriptors-1.0.0" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -12321,15 +13608,6 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.7" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; - sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; - }; - }; "morgan-1.6.1" = { name = "morgan"; packageName = "morgan"; @@ -12438,22 +13716,13 @@ let sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; }; }; - "csrf-3.0.4" = { + "csrf-3.0.6" = { name = "csrf"; packageName = "csrf"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; - sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; - }; - }; - "base64-url-1.3.3" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; - sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; + sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; }; }; "rndm-1.2.0" = { @@ -12474,13 +13743,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.3" = { + "uid-safe-2.1.4" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; - sha1 = "077e264a00b3187936b270bb7376a26473631071"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; + sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; }; }; "random-bytes-1.0.0" = { @@ -12798,13 +14067,13 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "convert-source-map-1.4.0" = { + "convert-source-map-1.5.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz"; - sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; + sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; }; }; "express-2.5.11" = { @@ -12933,22 +14202,31 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; - version = "1.4.0"; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "glob-7.0.5" = { - name = "glob"; - packageName = "glob"; - version = "7.0.5"; + "debug-2.6.0" = { + name = "debug"; + packageName = "debug"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; - sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; + sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + }; + }; + "diff-3.2.0" = { + name = "diff"; + packageName = "diff"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; }; }; "growl-1.9.2" = { @@ -13158,13 +14436,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "serve-favicon-2.4.0" = { + "serve-favicon-2.4.3" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.0"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz"; - sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz"; + sha1 = "5986b17b0502642b641c21f818b1acce32025d23"; }; }; "strong-data-uri-1.0.4" = { @@ -13176,22 +14454,22 @@ let sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; }; }; - "v8-debug-0.7.7" = { + "v8-debug-1.0.1" = { name = "v8-debug"; packageName = "v8-debug"; - version = "0.7.7"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.7.tgz"; - sha1 = "c0a14e7d2957209da2508f63a251ce3ffeeb4935"; + url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz"; + sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe"; }; }; - "v8-profiler-5.6.5" = { + "v8-profiler-5.7.0" = { name = "v8-profiler"; packageName = "v8-profiler"; - version = "5.6.5"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz"; - sha1 = "8b22e6ff3b76a1c75b1d53fd18d58e3f0a46f5be"; + url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz"; + sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; }; }; "yargs-3.32.0" = { @@ -13275,24 +14553,6 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; - "etag-1.8.0" = { - name = "etag"; - packageName = "etag"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; - sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; - }; - }; - "fresh-0.4.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.4.0.tgz"; - sha1 = "475626a934a8d3480b2101a1d6ecef7dafd7c553"; - }; - }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -13302,24 +14562,6 @@ let sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; }; }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - }; - "os-locale-1.4.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; - }; - }; "window-size-0.1.4" = { name = "window-size"; packageName = "window-size"; @@ -13329,42 +14571,6 @@ let sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; }; }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -13464,31 +14670,13 @@ let sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "write-file-atomic-1.3.1" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz"; - sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a"; - }; - }; - "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" = { @@ -13509,6 +14697,15 @@ let sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; + "cors-2.8.3" = { + name = "cors"; + packageName = "cors"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; + sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; + }; + }; "cron-1.2.1" = { name = "cron"; packageName = "cron"; @@ -13518,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" = { @@ -13554,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"; @@ -13563,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" = { @@ -13599,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" = { @@ -13635,13 +14832,22 @@ let sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; - "when-3.7.7" = { + "uglify-js-3.0.20" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.0.20"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; + sha1 = "cb35b2bcfe478051b6f3282be8db4e4add49a1e5"; + }; + }; + "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" = { @@ -13653,40 +14859,40 @@ let sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; }; }; - "node-red-node-feedparser-0.1.7" = { + "node-red-node-feedparser-0.1.8" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz"; - sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.8.tgz"; + sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; }; }; - "node-red-node-email-0.1.21" = { + "node-red-node-email-0.1.23" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.21"; + version = "0.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz"; - sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.23.tgz"; + sha1 = "ff910b8abb34ac926c1228e082d7667f92bb3737"; }; }; - "node-red-node-twitter-0.1.9" = { + "node-red-node-twitter-0.1.11" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.9"; + version = "0.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz"; - sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.11.tgz"; + sha1 = "52c074f42a32140132baea108d42cbcd0ef397d2"; }; }; - "node-red-node-rbe-0.1.6" = { + "node-red-node-rbe-0.1.11" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.6"; + version = "0.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; - sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.11.tgz"; + sha1 = "a670c1542a6eaf5e06db45490c2a7edf8a9f70b6"; }; }; "bcrypt-1.0.2" = { @@ -13788,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"; @@ -13842,40 +15057,22 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.11" = { + "domhandler-2.4.1" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz"; + sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; + }; + }; + "moment-timezone-0.5.13" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz"; - sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; - }; - }; - "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"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz"; + sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; "retry-0.6.1" = { @@ -13923,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"; @@ -13932,22 +15138,22 @@ let sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; }; }; - "help-me-1.0.1" = { + "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz"; - sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "mqtt-packet-5.2.1" = { + "mqtt-packet-5.4.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.2.1"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz"; - sha1 = "876e35ed616a8e348ac0283b4922039872458b58"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; + sha1 = "387104c06aa68fbb9f8159d0c722dd5c3e45df22"; }; }; "reinterval-1.1.0" = { @@ -13959,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" = { @@ -13986,6 +15192,87 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "ordered-read-streams-1.0.1" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; + sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; + }; + }; + "to-absolute-glob-2.0.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz"; + 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"; @@ -14166,13 +15453,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "mimelib-0.3.0" = { + "mimelib-0.3.1" = { name = "mimelib"; packageName = "mimelib"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz"; - sha1 = "4b16d4b435403daf692bc227890c7165ff3de894"; + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.1.tgz"; + sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; "encoding-0.1.12" = { @@ -14247,6 +15534,24 @@ let sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; }; }; + "rc-1.1.7" = { + name = "rc"; + packageName = "rc"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz"; + sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"; + }; + }; + "tar-pack-3.3.0" = { + name = "tar-pack"; + packageName = "tar-pack"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz"; + sha1 = "30931816418f55afc4d21775afdd6720cee45dae"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14715,13 +16020,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-4.0.1" = { + "mailcomposer-4.0.2" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; - sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; + sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; }; }; "simplesmtp-0.3.35" = { @@ -14823,6 +16128,15 @@ let sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; }; }; + "underscore-1.7.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + }; "underscore.string-2.4.0" = { name = "underscore.string"; packageName = "underscore.string"; @@ -14832,13 +16146,40 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "fstream-npm-1.2.0" = { + "cacache-9.2.9" = { + name = "cacache"; + packageName = "cacache"; + version = "9.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; + sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd"; + }; + }; + "call-limit-1.1.0" = { + name = "call-limit"; + packageName = "call-limit"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz"; + sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; + }; + }; + "detect-indent-5.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + }; + "fstream-npm-1.2.1" = { name = "fstream-npm"; packageName = "fstream-npm"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; - sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz"; + sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b"; }; }; "lazy-property-1.0.0" = { @@ -14850,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"; @@ -14904,22 +16254,13 @@ let sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; - }; - }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; "npm-install-checks-3.0.0" = { @@ -14931,13 +16272,22 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.4.5" = { + "npm-registry-client-8.4.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.4.5"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz"; - sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; + sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c"; + }; + }; + "npm-user-validate-1.0.0" = { + name = "npm-user-validate"; + packageName = "npm-user-validate"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; + sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; }; }; "opener-1.4.3" = { @@ -14949,6 +16299,24 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; + "pacote-2.7.38" = { + name = "pacote"; + packageName = "pacote"; + version = "2.7.38"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz"; + sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1"; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -14958,13 +16326,13 @@ let sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; }; }; - "read-package-tree-5.1.5" = { + "read-package-tree-5.1.6" = { name = "read-package-tree"; packageName = "read-package-tree"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz"; - sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; + url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz"; + sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a"; }; }; "sorted-union-stream-2.1.3" = { @@ -14976,6 +16344,15 @@ let sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; + "ssri-4.1.6" = { + name = "ssri"; + packageName = "ssri"; + version = "4.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; + sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"; + }; + }; "unique-filename-1.1.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -14985,6 +16362,33 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; + "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"; + }; + }; + "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"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; + sha1 = "1769f4b551eedce419f0505deae2e26763542d37"; + }; + }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -15012,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"; @@ -15066,6 +16569,195 @@ let sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; }; }; + "copy-concurrently-1.0.3" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz"; + sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250"; + }; + }; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + }; + "make-fetch-happen-2.4.13" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "2.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz"; + sha1 = "3139ba2f4230a8384e7ba394534816c872ecbf4b"; + }; + }; + "npm-pick-manifest-1.0.4" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8"; + }; + }; + "promise-retry-1.1.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; + sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; + }; + }; + "protoduck-4.0.0" = { + name = "protoduck"; + packageName = "protoduck"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; + sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; + }; + }; + "tar-fs-1.15.3" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "1.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz"; + sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20"; + }; + }; + "agentkeepalive-3.3.0" = { + name = "agentkeepalive"; + packageName = "agentkeepalive"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; + sha1 = "6d5de5829afd3be2712201a39275fd11c651857c"; + }; + }; + "http-cache-semantics-3.7.3" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.7.3.tgz"; + sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72"; + }; + }; + "http-proxy-agent-2.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; + sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; + }; + }; + "https-proxy-agent-2.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz"; + sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944"; + }; + }; + "node-fetch-npm-2.0.1" = { + name = "node-fetch-npm"; + packageName = "node-fetch-npm"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.1.tgz"; + sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465"; + }; + }; + "socks-proxy-agent-3.0.0" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz"; + sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245"; + }; + }; + "humanize-ms-1.2.1" = { + name = "humanize-ms"; + packageName = "humanize-ms"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; + }; + }; + "agent-base-4.1.0" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz"; + sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55"; + }; + }; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; + src = fetchurl { + 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" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + }; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + }; + "err-code-1.1.2" = { + name = "err-code"; + packageName = "err-code"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; + sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; + }; + }; + "genfun-4.0.1" = { + name = "genfun"; + packageName = "genfun"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz"; + sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"; + }; + }; "stream-iterate-1.2.0" = { name = "stream-iterate"; packageName = "stream-iterate"; @@ -15084,6 +16776,132 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; + "boxen-1.2.0" = { + name = "boxen"; + packageName = "boxen"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz"; + sha1 = "03478d84be7fe02189b80904d81d6a80384368f1"; + }; + }; + "configstore-3.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz"; + 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"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + }; + "xdg-basedir-3.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + }; + "ansi-align-2.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + }; + "term-size-1.2.0" = { + name = "term-size"; + packageName = "term-size"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "unique-string-1.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + }; + "crypto-random-string-1.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + }; + "package-json-4.0.1" = { + name = "package-json"; + packageName = "package-json"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + }; + }; "argparse-0.1.15" = { name = "argparse"; packageName = "argparse"; @@ -15318,13 +17136,13 @@ let sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; }; }; - "require-dir-0.3.1" = { + "require-dir-0.3.2" = { name = "require-dir"; packageName = "require-dir"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.1.tgz"; - sha1 = "b5a8e28bae0343bb0d0cc38ab1f531e1931b264a"; + url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.2.tgz"; + sha1 = "c1d5c75e9fbffde9f2e6b33e383db4f594b5a6a9"; }; }; "semver-utils-1.1.1" = { @@ -15336,22 +17154,22 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "spawn-please-0.2.0" = { - name = "spawn-please"; - packageName = "spawn-please"; - version = "0.2.0"; + "snyk-1.36.2" = { + name = "snyk"; + packageName = "snyk"; + version = "1.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz"; - sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.36.2.tgz"; + sha1 = "88be72a8da75a02e920f2be7f5830402b5e0eb41"; }; }; - "update-notifier-1.0.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "1.0.3"; + "spawn-please-0.3.0" = { + name = "spawn-please"; + packageName = "spawn-please"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz"; - sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; + sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; "aproba-1.0.4" = { @@ -15363,6 +17181,24 @@ let sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; }; }; + "node-gyp-3.4.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; + sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + }; + }; + "npmlog-4.0.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz"; + sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f"; + }; + }; "request-2.75.0" = { name = "request"; packageName = "request"; @@ -15381,6 +17217,60 @@ let sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; }; }; + "path-array-1.0.1" = { + name = "path-array"; + packageName = "path-array"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"; + sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271"; + }; + }; + "array-index-1.0.0" = { + name = "array-index"; + packageName = "array-index"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"; + 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"; @@ -15390,148 +17280,328 @@ let sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; }; }; - "boxen-0.6.0" = { - name = "boxen"; - packageName = "boxen"; - version = "0.6.0"; + "hasbin-1.2.3" = { + name = "hasbin"; + packageName = "hasbin"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz"; - sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"; + url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; + sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; }; }; - "configstore-2.1.0" = { - name = "configstore"; - packageName = "configstore"; - version = "2.1.0"; + "inquirer-1.0.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; - sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; + sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; }; }; - "latest-version-2.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; - }; - }; - "lazy-req-1.1.0" = { - name = "lazy-req"; - packageName = "lazy-req"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"; - sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac"; - }; - }; - "ansi-align-1.1.0" = { - name = "ansi-align"; - packageName = "ansi-align"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz"; - sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba"; - }; - }; - "cli-boxes-1.0.0" = { - name = "cli-boxes"; - packageName = "cli-boxes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; - }; - }; - "filled-array-1.1.0" = { - name = "filled-array"; - packageName = "filled-array"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; - }; - }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; - }; - }; - "dot-prop-3.0.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; - }; - }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; + "snyk-config-1.0.1" = { + name = "snyk-config"; + packageName = "snyk-config"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; + sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "package-json-2.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; - }; - }; - "got-5.7.1" = { - name = "got"; - packageName = "got"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; - }; - }; - "registry-auth-token-3.1.0" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; - sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; - }; - }; - "node-status-codes-1.0.0" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; - }; - }; - "timed-out-3.1.3" = { - name = "timed-out"; - packageName = "timed-out"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; - }; - }; - "unzip-response-1.0.2" = { - name = "unzip-response"; - packageName = "unzip-response"; + "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/unzip-response/-/unzip-response-1.0.2.tgz"; - sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + 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"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; + 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"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz"; + sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; + }; + }; + "snyk-python-plugin-1.2.2" = { + name = "snyk-python-plugin"; + packageName = "snyk-python-plugin"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.2.tgz"; + sha1 = "296948cba5ac80d2ce178a5cb7ecfcff88fdf263"; + }; + }; + "snyk-recursive-readdir-2.0.0" = { + name = "snyk-recursive-readdir"; + packageName = "snyk-recursive-readdir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz"; + sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3"; + }; + }; + "snyk-resolve-1.0.0" = { + name = "snyk-resolve"; + packageName = "snyk-resolve"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; + sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; + }; + }; + "snyk-resolve-deps-1.7.0" = { + name = "snyk-resolve-deps"; + packageName = "snyk-resolve-deps"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; + 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"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz"; + sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; + }; + }; + "snyk-try-require-1.2.0" = { + name = "snyk-try-require"; + packageName = "snyk-try-require"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; + sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; + }; + }; + "tempfile-1.1.1" = { + name = "tempfile"; + packageName = "tempfile"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; + sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; + }; + }; + "then-fs-2.0.0" = { + name = "then-fs"; + packageName = "then-fs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz"; + sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2"; + }; + }; + "mute-stream-0.0.6" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + }; + "rx-4.1.0" = { + name = "rx"; + packageName = "rx"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + }; + "nconf-0.7.2" = { + name = "nconf"; + packageName = "nconf"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; + sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; + }; + }; + "yargs-3.15.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz"; + 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"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"; + sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"; + }; + }; + "clite-0.3.0" = { + name = "clite"; + packageName = "clite"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; + sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; + }; + }; + "lodash.defaultsdeep-4.6.0" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; + sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; + }; + }; + "lodash.mergewith-4.6.0" = { + name = "lodash.mergewith"; + packageName = "lodash.mergewith"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz"; + sha1 = "150cf0a16791f5903b8891eab154609274bdea55"; + }; + }; + "update-notifier-0.6.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; + sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + }; + }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; "babybird-0.0.1" = { @@ -15562,6 +17632,15 @@ let sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; "domino-1.0.28" = { name = "domino"; packageName = "domino"; @@ -15580,13 +17659,13 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "gelf-stream-0.2.4" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "0.2.4"; + "finalhandler-0.5.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; - sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; "mediawiki-title-0.5.6" = { @@ -15627,13 +17706,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.2.4" = { + "service-runner-2.3.0" = { name = "service-runner"; packageName = "service-runner"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz"; - sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.3.0.tgz"; + sha1 = "09039dfdcc40cdbd0259dd3f982916675838cb59"; }; }; "simplediff-0.1.1" = { @@ -15645,13 +17724,13 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; - "yargs-4.8.1" = { + "yargs-5.0.0" = { name = "yargs"; packageName = "yargs"; - version = "4.8.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; - sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; }; }; "is-arguments-1.0.2" = { @@ -15663,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"; @@ -15708,22 +17760,13 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "gelfling-0.2.0" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; - sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; - }; - }; - "bunyan-1.8.5" = { + "bunyan-1.8.10" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.5"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; - sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; + sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -15744,13 +17787,13 @@ let sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; }; }; - "hot-shots-4.3.1" = { + "hot-shots-4.5.0" = { name = "hot-shots"; packageName = "hot-shots"; - version = "4.3.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz"; - sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.5.0.tgz"; + sha1 = "d0b7c2ad367cbb2f8c062b26151c0949ad9271f9"; }; }; "limitation-0.2.0" = { @@ -15762,13 +17805,13 @@ let sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; }; }; - "yargs-6.6.0" = { + "yargs-7.1.0" = { name = "yargs"; packageName = "yargs"; - version = "6.6.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; }; }; "dnscache-1.0.1" = { @@ -15780,13 +17823,13 @@ let sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; }; }; - "dtrace-provider-0.8.0" = { + "dtrace-provider-0.8.3" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.0"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; - sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz"; + sha1 = "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf"; }; }; "mv-2.1.1" = { @@ -15798,13 +17841,13 @@ let sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; }; }; - "safe-json-stringify-1.0.3" = { + "safe-json-stringify-1.0.4" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; - sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; + sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; }; }; "ncp-2.0.0" = { @@ -15889,6 +17932,15 @@ let sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; }; }; + "ms-0.7.3" = { + name = "ms"; + packageName = "ms"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"; + sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; + }; + }; "msgpack5-3.4.1" = { name = "msgpack5"; packageName = "msgpack5"; @@ -15907,58 +17959,13 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "which-module-1.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; - sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; - }; - }; - "yargs-parser-4.2.1" = { + "yargs-parser-5.0.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "4.2.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; }; "lodash.clone-4.3.2" = { @@ -15979,31 +17986,13 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; - "yargs-parser-2.4.1" = { + "yargs-parser-3.2.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "2.4.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; }; }; "airplayer-2.0.0" = { @@ -16042,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"; @@ -16069,15 +18067,6 @@ let sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; }; }; - "server-destroy-1.0.1" = { - name = "server-destroy"; - packageName = "server-destroy"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; - sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; - }; - }; "bplist-creator-0.0.6" = { name = "bplist-creator"; packageName = "bplist-creator"; @@ -16087,22 +18076,13 @@ let sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; }; }; - "reverse-http-1.2.0" = { + "reverse-http-1.3.0" = { name = "reverse-http"; packageName = "reverse-http"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.2.0.tgz"; - sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728"; - }; - }; - "stream-buffers-2.2.0" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; - sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; + url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz"; + sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239"; }; }; "consume-http-header-1.0.0" = { @@ -16186,13 +18166,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.1.0" = { + "multicast-dns-6.1.1" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; - sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz"; + sha1 = "6e7de86a570872ab17058adea7160bbeca814dde"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -16222,33 +18202,6 @@ let sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; - "mute-stream-0.0.6" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; - sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; - }; - }; - "run-async-2.3.0" = { - name = "run-async"; - packageName = "run-async"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; - }; - }; - "rx-4.1.0" = { - name = "rx"; - packageName = "rx"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; - }; - }; "spawn-sync-1.0.15" = { name = "spawn-sync"; packageName = "spawn-sync"; @@ -16276,544 +18229,67 @@ let sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; }; }; - "connect-multiparty-1.2.5" = { + "connect-multiparty-2.0.0" = { name = "connect-multiparty"; packageName = "connect-multiparty"; - version = "1.2.5"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz"; - sha1 = "2fabecfdc1a8a774ba19484dce660c818a8555e7"; + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz"; + sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab"; }; }; - "express-3.5.3" = { - name = "express"; - packageName = "express"; - version = "3.5.3"; + "socket.io-1.7.4" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.5.3.tgz"; - sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz"; + sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"; }; }; - "torrent-stream-0.18.1" = { - name = "torrent-stream"; - packageName = "torrent-stream"; - version = "0.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-0.18.1.tgz"; - sha1 = "e2e8ca44d81f16fbe5646e0ebb05f5418fea9bf6"; - }; - }; - "fluent-ffmpeg-2.1.0" = { + "fluent-ffmpeg-2.1.2" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; - version = "2.1.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.0.tgz"; - sha1 = "e6ab85e75ba8e49119a3900cd9df10d39831d392"; + url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.2.tgz"; + sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "on-finished-2.1.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz"; - sha1 = "f82ca1c9e3a4f3286b1b9938610e5b8636bd3cb2"; - }; - }; - "qs-2.2.5" = { - name = "qs"; - packageName = "qs"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.2.5.tgz"; - sha1 = "1088abaf9dcc0ae5ae45b709e6c6b5888b23923c"; - }; - }; - "connect-2.14.5" = { - name = "connect"; - packageName = "connect"; - version = "2.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.14.5.tgz"; - sha1 = "73217513152c152ebe049c499fa09211b8c476f4"; - }; - }; - "commander-1.3.2" = { - name = "commander"; - packageName = "commander"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; - sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; - }; - }; - "range-parser-1.0.0" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz"; - sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0"; - }; - }; - "mkdirp-0.4.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz"; - sha1 = "291ac2a2d43a19c478662577b5be846fe83b5923"; - }; - }; - "buffer-crc32-0.2.1" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; - sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; - }; - }; - "fresh-0.2.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; - sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; - }; - }; - "methods-0.1.0" = { - name = "methods"; - packageName = "methods"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; - sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; - }; - }; - "send-0.3.0" = { - name = "send"; - packageName = "send"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.3.0.tgz"; - sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7"; - }; - }; - "cookie-signature-1.0.3" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz"; - sha1 = "91cd997cc51fb641595738c69cda020328f50ff9"; - }; - }; - "debug-0.8.1" = { - name = "debug"; - packageName = "debug"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; - sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; - }; - }; - "cookie-parser-1.0.1" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz"; - sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0"; - }; - }; - "compression-1.0.0" = { - name = "compression"; - packageName = "compression"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.0.0.tgz"; - sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020"; - }; - }; - "connect-timeout-1.0.0" = { - name = "connect-timeout"; - packageName = "connect-timeout"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz"; - sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb"; - }; - }; - "csurf-1.1.0" = { - name = "csurf"; - packageName = "csurf"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz"; - sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2"; - }; - }; - "errorhandler-1.0.0" = { - name = "errorhandler"; - packageName = "errorhandler"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz"; - sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a"; - }; - }; - "express-session-1.0.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz"; - sha1 = "004478c742561774411ceb79733155a56b6d49eb"; - }; - }; - "method-override-1.0.0" = { - name = "method-override"; - packageName = "method-override"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz"; - sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61"; - }; - }; - "morgan-1.0.0" = { - name = "morgan"; - packageName = "morgan"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz"; - sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d"; - }; - }; - "qs-0.6.6" = { - name = "qs"; - packageName = "qs"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }; - }; - "raw-body-1.1.4" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz"; - sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d"; - }; - }; - "response-time-1.0.0" = { - name = "response-time"; - packageName = "response-time"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz"; - sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9"; - }; - }; - "setimmediate-1.0.1" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; - sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7"; - }; - }; - "serve-index-1.0.1" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz"; - sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6"; - }; - }; - "serve-static-1.1.0" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz"; - sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643"; - }; - }; - "static-favicon-1.0.2" = { - name = "static-favicon"; - packageName = "static-favicon"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz"; - sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f"; - }; - }; - "vhost-1.0.0" = { - name = "vhost"; - packageName = "vhost"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz"; - sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0"; - }; - }; - "bytes-0.3.0" = { - name = "bytes"; - packageName = "bytes"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz"; - sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935"; - }; - }; - "multiparty-2.2.0" = { + "multiparty-4.1.3" = { name = "multiparty"; packageName = "multiparty"; - version = "2.2.0"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; - sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; + url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; + sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "cookie-0.1.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.0"; + "engine.io-1.8.4" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; - sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.4.tgz"; + sha1 = "77bce12b80e5d60429337fec3b0daf691ebc9003"; }; }; - "bytes-0.2.1" = { - name = "bytes"; - packageName = "bytes"; - version = "0.2.1"; + "socket.io-client-1.7.4" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; - sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz"; + sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; }; }; - "negotiator-0.3.0" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.3.0"; + "engine.io-client-1.8.4" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; - sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; - }; - }; - "compressible-1.0.0" = { - name = "compressible"; - packageName = "compressible"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz"; - sha1 = "f83e49c1cb61421753545125a8011d68b492427d"; - }; - }; - "scmp-0.0.3" = { - name = "scmp"; - packageName = "scmp"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz"; - sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073"; - }; - }; - "batch-0.5.0" = { - name = "batch"; - packageName = "batch"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.5.0.tgz"; - sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3"; - }; - }; - "negotiator-0.4.2" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz"; - sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37"; - }; - }; - "parseurl-1.0.1" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz"; - sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4"; - }; - }; - "debug-0.8.0" = { - name = "debug"; - packageName = "debug"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; - sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; - }; - }; - "bittorrent-dht-3.2.6" = { - name = "bittorrent-dht"; - packageName = "bittorrent-dht"; - version = "3.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-3.2.6.tgz"; - sha1 = "8d6f64f002525951536ca403ddd040c03009b7d5"; - }; - }; - "bittorrent-tracker-2.12.1" = { - name = "bittorrent-tracker"; - packageName = "bittorrent-tracker"; - version = "2.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz"; - sha1 = "562f0e43c6340d003b08c5dad3d4bff0eb3fd64d"; - }; - }; - "ip-0.3.3" = { - name = "ip"; - packageName = "ip"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz"; - sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4"; - }; - }; - "peer-wire-swarm-0.9.2" = { - name = "peer-wire-swarm"; - packageName = "peer-wire-swarm"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz"; - sha1 = "092848005607d8ca94e69f9bc9ebe52956ec3048"; - }; - }; - "random-access-file-0.3.2" = { - name = "random-access-file"; - packageName = "random-access-file"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-0.3.2.tgz"; - sha1 = "cbca246e131db7b68a1c6bb6328dd4d0997100a0"; - }; - }; - "is-ip-1.0.0" = { - name = "is-ip"; - packageName = "is-ip"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz"; - sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074"; - }; - }; - "k-bucket-0.5.0" = { - name = "k-bucket"; - packageName = "k-bucket"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.5.0.tgz"; - sha1 = "31d462d86cdb2e8d245528acfe5e71382f552e1d"; - }; - }; - "simple-get-1.4.3" = { - name = "simple-get"; - packageName = "simple-get"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; - sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; - }; - }; - "ip-regex-1.0.3" = { - name = "ip-regex"; - packageName = "ip-regex"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"; - sha1 = "dc589076f659f419c222039a33316f1c7387effd"; - }; - }; - "bencode-0.6.0" = { - name = "bencode"; - packageName = "bencode"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz"; - sha1 = "04d6190e1d7467c56a969e1a94d1668076eac050"; - }; - }; - "bn.js-1.3.0" = { - name = "bn.js"; - packageName = "bn.js"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"; - sha1 = "0db4cbf96f8f23b742f5bcb9d1aa7a9994a05e83"; - }; - }; - "extend.js-0.0.2" = { - name = "extend.js"; - packageName = "extend.js"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz"; - sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15"; - }; - }; - "portfinder-0.3.0" = { - name = "portfinder"; - packageName = "portfinder"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz"; - sha1 = "f9f2c96894440c5b5113b84e0ad1013042b7c2a0"; - }; - }; - "mkdirp-0.0.7" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz"; - sha1 = "d89b4f0e4c3e5e5ca54235931675e094fe1a5072"; - }; - }; - "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"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.4.tgz"; + sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2"; }; }; "request-2.67.0" = { @@ -16825,60 +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"; - }; - }; - "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"; - }; - }; "bl-1.0.3" = { name = "bl"; packageName = "bl"; @@ -16906,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"; @@ -16942,22 +18355,22 @@ let sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.22" = { + "recast-0.11.23" = { name = "recast"; packageName = "recast"; - version = "0.11.22"; + version = "0.11.23"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz"; - sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; + sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "ast-types-0.9.5" = { + "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz"; - sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz"; + sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; }; }; "base62-0.1.1" = { @@ -17104,6 +18517,33 @@ let sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; }; }; + "commander-1.3.2" = { + name = "commander"; + packageName = "commander"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + }; + }; + "cookie-0.1.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; + sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; + }; + }; + "buffer-crc32-0.2.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + }; + }; "fresh-0.2.0" = { name = "fresh"; packageName = "fresh"; @@ -17113,6 +18553,15 @@ let sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; }; }; + "methods-0.1.0" = { + name = "methods"; + packageName = "methods"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + }; + }; "send-0.1.4" = { name = "send"; packageName = "send"; @@ -17131,6 +18580,15 @@ let sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }; }; + "bytes-0.2.1" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; + sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; + }; + }; "raw-body-0.0.3" = { name = "raw-body"; packageName = "raw-body"; @@ -17140,6 +18598,24 @@ let sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; }; }; + "negotiator-0.3.0" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; + sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; + }; + }; + "multiparty-2.2.0" = { + name = "multiparty"; + packageName = "multiparty"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; + sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; + }; + }; "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = { name = "oauth"; packageName = "oauth"; @@ -17240,13 +18716,13 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "express-5.0.0-alpha.3" = { + "express-5.0.0-alpha.5" = { name = "express"; packageName = "express"; - version = "5.0.0-alpha.3"; + version = "5.0.0-alpha.5"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz"; - sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz"; + sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6"; }; }; "express-json5-0.1.0" = { @@ -17312,22 +18788,13 @@ let sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; }; }; - "http-errors-1.6.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; - sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; - }; - }; - "fs-ext-0.5.0" = { + "fs-ext-0.6.0" = { name = "fs-ext"; packageName = "fs-ext"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.5.0.tgz"; - sha1 = "9c1f9a20b8e7e012e0a914b5e19132724f44f69e"; + url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz"; + sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66"; }; }; "crypt3-0.2.0" = { @@ -17339,13 +18806,40 @@ let sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "router-1.1.5" = { + "debug-2.6.1" = { + name = "debug"; + packageName = "debug"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + }; + }; + "router-1.3.1" = { name = "router"; packageName = "router"; - version = "1.1.5"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz"; - sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387"; + url = "https://registry.npmjs.org/router/-/router-1.3.1.tgz"; + sha1 = "e59ef64fafc22194a196986834d887058d76af47"; + }; + }; + "send-0.15.1" = { + name = "send"; + packageName = "send"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz"; + sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f"; + }; + }; + "serve-static-1.12.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz"; + sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039"; }; }; "raw-body-1.3.4" = { @@ -17438,13 +18932,31 @@ let sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; }; }; - "setprototypeof-1.0.3" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.3"; + "domutils-1.6.2" = { + name = "domutils"; + packageName = "domutils"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + url = "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz"; + sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; + }; + }; + "async-2.1.5" = { + name = "async"; + packageName = "async"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }; }; "lru-cache-2.2.0" = { @@ -17663,6 +19175,15 @@ let sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b"; }; }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; "verror-1.6.0" = { name = "verror"; packageName = "verror"; @@ -17744,6 +19265,15 @@ let sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37"; }; }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; "jsprim-0.3.0" = { name = "jsprim"; packageName = "jsprim"; @@ -17798,13 +19328,22 @@ let sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; }; }; - "coa-1.0.1" = { + "coa-1.0.4" = { name = "coa"; packageName = "coa"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.1.tgz"; - sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; + 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" = { @@ -17816,31 +19355,22 @@ let sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; }; }; - "csso-2.3.1" = { + "csso-2.3.2" = { name = "csso"; packageName = "csso"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz"; - sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9"; + url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz"; + sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; }; }; - "clap-1.1.2" = { + "clap-1.2.0" = { name = "clap"; packageName = "clap"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz"; - sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; - }; - }; - "acorn-4.0.11" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; - sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; + url = "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz"; + sha1 = "59c90fe3e137104746ff19469a27a634ff68c857"; }; }; "enhanced-resolve-2.3.0" = { @@ -17879,184 +19409,22 @@ let sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; - "async-2.1.2" = { + "async-2.4.1" = { name = "async"; packageName = "async"; - version = "2.1.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; - sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; + url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz"; + sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; }; }; - "fields-0.1.24" = { - name = "fields"; - packageName = "fields"; - version = "0.1.24"; - src = fetchurl { - url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz"; - sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3"; - }; - }; - "humanize-0.0.9" = { - name = "humanize"; - packageName = "humanize"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; - sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; - }; - }; - "longjohn-0.2.11" = { - name = "longjohn"; - packageName = "longjohn"; - version = "0.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; - sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; - }; - }; - "moment-2.16.0" = { - name = "moment"; - packageName = "moment"; - version = "2.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; - sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; - }; - }; - "node-appc-0.2.39" = { - name = "node-appc"; - packageName = "node-appc"; - version = "0.2.39"; - src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz"; - sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; - }; - }; - "request-2.78.0" = { - name = "request"; - packageName = "request"; - version = "2.78.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; - sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; - }; - }; - "sprintf-0.1.5" = { - name = "sprintf"; - packageName = "sprintf"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; - sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; - }; - }; - "winston-1.1.2" = { - name = "winston"; - packageName = "winston"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; - sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; - }; - }; - "wrench-1.5.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; - sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; - }; - }; - "source-map-support-0.3.2" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz"; - sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1"; - }; - }; - "source-map-0.1.32" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.32"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; - }; - }; - "adm-zip-0.4.7" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; - }; - }; - "diff-2.2.1" = { - name = "diff"; - packageName = "diff"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"; - sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec"; - }; - }; - "request-2.69.0" = { - name = "request"; - packageName = "request"; - version = "2.69.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; - }; - }; - "semver-5.1.0" = { - name = "semver"; - packageName = "semver"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; - sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; - }; - }; - "wrench-1.5.8" = { - name = "wrench"; - packageName = "wrench"; - version = "1.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; - sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; - }; - }; - "xmldom-0.1.22" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.22"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; - sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; - }; - }; - "qs-6.0.3" = { - name = "qs"; - packageName = "qs"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz"; - sha1 = "95f870b23e70268fba18704e80667515905af06c"; - }; - }; - "blueimp-md5-2.6.0" = { + "blueimp-md5-2.7.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz"; - sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.7.0.tgz"; + sha1 = "7f518e0dd70467fefe28ecba398916092f2a02a9"; }; }; "color-1.0.3" = { @@ -18077,22 +19445,22 @@ let sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; }; }; - "diff2html-2.0.12" = { + "diff2html-2.3.0" = { name = "diff2html"; packageName = "diff2html"; - version = "2.0.12"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz"; - sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz"; + sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; }; }; - "express-session-1.14.2" = { + "express-session-1.15.3" = { name = "express-session"; packageName = "express-session"; - version = "1.14.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; - sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.3.tgz"; + sha1 = "db545f0435a7b1b228ae02da8197f65141735c67"; }; }; "forever-monitor-1.1.0" = { @@ -18122,6 +19490,24 @@ let sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }; }; + "ignore-3.2.7" = { + name = "ignore"; + packageName = "ignore"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"; + sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"; + }; + }; + "just-detect-adblock-1.0.0" = { + name = "just-detect-adblock"; + packageName = "just-detect-adblock"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz"; + sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; + }; + }; "keen.io-0.1.3" = { name = "keen.io"; packageName = "keen.io"; @@ -18131,13 +19517,13 @@ let sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }; }; - "knockout-3.4.1" = { + "knockout-3.4.2" = { name = "knockout"; packageName = "knockout"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz"; - sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz"; + sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937"; }; }; "node-cache-4.1.1" = { @@ -18149,13 +19535,22 @@ let sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; }; }; - "npm-4.1.2" = { + "npm-4.6.1" = { name = "npm"; packageName = "npm"; - version = "4.1.2"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; - sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; + url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz"; + 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" = { @@ -18176,13 +19571,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.2" = { + "raven-1.2.1" = { name = "raven"; packageName = "raven"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz"; - sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718"; + url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; + sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; }; }; "signals-1.0.0" = { @@ -18194,13 +19589,22 @@ let sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }; }; - "snapsvg-0.4.0" = { + "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz"; - sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; + 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" = { @@ -18212,31 +19616,13 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "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.0" = { + "color-string-1.5.2" = { name = "color-string"; packageName = "color-string"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz"; - sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce"; - }; - }; - "color-name-1.1.1" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz"; - sha1 = "4b1415304cf50028ea81643643bd82ea05803689"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz"; + sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; "simple-swizzle-0.2.2" = { @@ -18257,13 +19643,13 @@ let sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; }; }; - "diff-3.2.0" = { + "diff-3.3.0" = { name = "diff"; packageName = "diff"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + url = "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz"; + sha1 = "056695150d7aa93237ca7e378ac3b1682b7963b9"; }; }; "hogan.js-3.0.2" = { @@ -18275,22 +19661,22 @@ let sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "whatwg-fetch-2.0.2" = { + "whatwg-fetch-2.0.3" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz"; - sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; + sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; }; }; - "crc-3.4.1" = { + "crc-3.4.4" = { name = "crc"; packageName = "crc"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; - sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; "broadway-0.2.10" = { @@ -18419,13 +19805,49 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "mississippi-1.2.0" = { - name = "mississippi"; - packageName = "mississippi"; - version = "1.2.0"; + "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/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + 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"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz"; + 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" = { @@ -18446,13 +19868,49 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; - "eve-0.4.2" = { + "stack-trace-0.0.9" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + }; + "eve-0.5.4" = { name = "eve"; packageName = "eve"; - version = "0.4.2"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz"; - sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; + url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz"; + sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; + }; + }; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + }; + }; + "form-data-2.2.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz"; + sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b"; + }; + }; + "adm-zip-0.4.7" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; + sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; "kew-0.1.7" = { @@ -18491,22 +19949,40 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "acorn-dynamic-import-2.0.1" = { + "acorn-dynamic-import-2.0.2" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz"; - sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"; + 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" = { @@ -18518,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"; @@ -18527,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" = { @@ -18554,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"; @@ -18563,13 +20057,49 @@ let sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87"; }; }; - "webpack-sources-0.1.4" = { + "webpack-sources-1.0.1" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "0.1.4"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz"; - sha1 = "ccc2c817e08e5fa393239412690bb481821393cd"; + 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" = { @@ -18590,15 +20120,6 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "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"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -18626,13 +20147,13 @@ let sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "source-list-map-0.1.8" = { + "source-list-map-2.0.0" = { name = "source-list-map"; packageName = "source-list-map"; - version = "0.1.8"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz"; - sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; + sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085"; }; }; "babel-runtime-6.23.0" = { @@ -18653,31 +20174,13 @@ let sha1 = "01aa9c401edd92750514470b8266390c66c67318"; }; }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; + "gunzip-maybe-1.4.1" = { + name = "gunzip-maybe"; + packageName = "gunzip-maybe"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; - }; - }; - "diff-2.2.3" = { - name = "diff"; - packageName = "diff"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; - sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; - }; - }; - "inquirer-3.0.5" = { - name = "inquirer"; - packageName = "inquirer"; - version = "3.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz"; - sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65"; + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; + sha1 = "39c72ed89d1b49ba708e18776500488902a52027"; }; }; "invariant-2.2.2" = { @@ -18707,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" = { @@ -18725,85 +20228,67 @@ let sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; }; }; - "proper-lockfile-2.0.0" = { + "proper-lockfile-2.0.1" = { name = "proper-lockfile"; packageName = "proper-lockfile"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.0.tgz"; - sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55"; - }; - }; - "request-capture-har-1.1.4" = { - name = "request-capture-har"; - packageName = "request-capture-har"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz"; - sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013"; - }; - }; - "roadrunner-1.1.0" = { - name = "roadrunner"; - packageName = "roadrunner"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz"; - sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; - }; - }; - "regenerator-runtime-0.10.3" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz"; - sha1 = "8c4367a904b51ea62a908ac310bf99ff90a82a3e"; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; - }; - }; - "external-editor-2.0.1" = { - name = "external-editor"; - packageName = "external-editor"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.1.tgz"; - sha1 = "4c597c6c88fa6410e41dbbaa7b1be2336aa31095"; + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"; + sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; }; }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; + "request-capture-har-1.2.2" = { + name = "request-capture-har"; + packageName = "request-capture-har"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz"; + sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d"; }; }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; + "v8-compile-cache-1.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz"; + sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; }; }; - "onetime-2.0.0" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.0"; + "regenerator-runtime-0.10.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz"; - sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6"; + 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"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz"; + sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14"; + }; + }; + "is-gzip-1.0.0" = { + name = "is-gzip"; + packageName = "is-gzip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; + sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; + }; + }; + "peek-stream-1.1.2" = { + name = "peek-stream"; + packageName = "peek-stream"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz"; + sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; }; }; "loose-envify-1.3.1" = { @@ -18824,40 +20309,31 @@ let sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; }; }; - "string.prototype.codepointat-0.2.0" = { - name = "string.prototype.codepointat"; - packageName = "string.prototype.codepointat"; - version = "0.2.0"; + "lodash.toarray-4.4.0" = { + name = "lodash.toarray"; + packageName = "lodash.toarray"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; - sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; + url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; + sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; - "cli-list-0.1.8" = { + "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; - version = "0.1.8"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz"; - sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a"; + url = "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz"; + sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cross-spawn-3.0.1" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz"; - sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; - }; - }; - "fullname-2.1.0" = { + "fullname-3.3.0" = { name = "fullname"; packageName = "fullname"; - version = "2.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz"; - sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350"; + url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz"; + sha1 = "a08747d6921229610b8178b7614fce10cb185f5a"; }; }; "humanize-string-1.0.1" = { @@ -18869,22 +20345,13 @@ let sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; }; }; - "inquirer-0.11.4" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz"; - sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d"; - }; - }; - "insight-0.7.0" = { + "insight-0.8.4" = { name = "insight"; packageName = "insight"; - version = "0.7.0"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz"; - sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6"; + url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; + sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; }; }; "npm-keyword-4.2.0" = { @@ -18896,13 +20363,13 @@ let sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0"; }; }; - "opn-3.0.3" = { + "opn-4.0.2" = { name = "opn"; packageName = "opn"; - version = "3.0.3"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz"; - sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; + url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; + sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; "parse-help-0.1.1" = { @@ -18923,13 +20390,13 @@ let sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; }; }; - "sort-on-1.3.0" = { + "sort-on-2.0.0" = { name = "sort-on"; packageName = "sort-on"; - version = "1.3.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz"; - sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840"; + url = "https://registry.npmjs.org/sort-on/-/sort-on-2.0.0.tgz"; + sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc"; }; }; "tabtab-1.3.2" = { @@ -18950,15 +20417,6 @@ let sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; }; }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; - }; - }; "yeoman-character-1.1.0" = { name = "yeoman-character"; packageName = "yeoman-character"; @@ -18977,31 +20435,139 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-1.6.6" = { + "yeoman-environment-2.0.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "1.6.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz"; - sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.0.tgz"; + sha1 = "dafa2fc512c168cb8313453e5318e64731265915"; }; }; - "yosay-1.2.1" = { + "yosay-2.0.0" = { name = "yosay"; packageName = "yosay"; - version = "1.2.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz"; - sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b"; + url = "https://registry.npmjs.org/yosay/-/yosay-2.0.0.tgz"; + sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe"; }; }; - "npmconf-2.1.2" = { - name = "npmconf"; - packageName = "npmconf"; - version = "2.1.2"; + "execa-0.6.3" = { + name = "execa"; + packageName = "execa"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; - sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; + url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; + sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; + }; + }; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + }; + }; + "p-any-1.1.0" = { + name = "p-any"; + packageName = "p-any"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; + sha1 = "1d03835c7eed1e34b8e539c47b7b60d0d015d4e1"; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "passwd-user-2.1.0" = { + name = "passwd-user"; + packageName = "passwd-user"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz"; + sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; + }; + }; + "p-some-2.0.0" = { + name = "p-some"; + packageName = "p-some"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz"; + sha1 = "60b408e21f5da11a417fad13740bf20f9024ab3b"; + }; + }; + "aggregate-error-1.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; + sha1 = "888344dad0220a72e3af50906117f48771925fac"; + }; + }; + "clean-stack-1.3.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; + sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + }; + }; + "indent-string-3.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.1.0.tgz"; + 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" = { @@ -19085,24 +20651,6 @@ let sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; }; }; - "dot-prop-2.4.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz"; - sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c"; - }; - }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; - }; - }; "bin-version-check-2.1.0" = { name = "bin-version-check"; packageName = "bin-version-check"; @@ -19121,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"; @@ -19184,13 +20723,13 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "globby-4.1.0" = { + "globby-6.1.0" = { name = "globby"; packageName = "globby"; - version = "4.1.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz"; - sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; "grouped-queue-0.3.3" = { @@ -19202,6 +20741,15 @@ let sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; }; }; + "is-scoped-1.0.0" = { + name = "is-scoped"; + packageName = "is-scoped"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz"; + sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; + }; + }; "mem-fs-1.1.3" = { name = "mem-fs"; packageName = "mem-fs"; @@ -19211,6 +20759,24 @@ let sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; }; }; + "untildify-3.0.2" = { + name = "untildify"; + packageName = "untildify"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; + sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; + }; + }; + "scoped-regex-1.0.0" = { + name = "scoped-regex"; + packageName = "scoped-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz"; + sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; + }; + }; "vinyl-file-2.0.0" = { name = "vinyl-file"; packageName = "vinyl-file"; @@ -19262,10 +20828,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.8"; + version = "1.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz"; - sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.13.tgz"; + sha1 = "5ab8089cee9a9bf4ba46298d87c7039a4f2a7410"; }; dependencies = [ sources."colors-0.6.0-1" @@ -19280,7 +20846,7 @@ in sources."source-map-0.5.6" ]; }) - sources."resolve-1.3.2" + sources."resolve-1.3.3" sources."global-paths-0.1.2" sources."source-map-0.1.9" sources."xml2tss-0.0.5" @@ -19305,10 +20871,10 @@ in sources."wordwrap-0.0.2" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.1.0" + sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."path-parse-1.0.5" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { @@ -19324,9 +20890,9 @@ in }) sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.12" + sources."which-1.2.14" sources."parse-passwd-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."amdefine-1.0.1" sources."xml2js-0.2.8" sources."sax-0.5.8" @@ -19343,10 +20909,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.10"; + version = "0.10.15"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz"; - sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.15.tgz"; + sha1 = "15386d528bcd2521147934e3f183b53897a18c2c"; }; dependencies = [ sources."adal-node-0.1.21" @@ -19358,27 +20924,93 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.2" - sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.20.0" - sources."azure-arm-datalake-analytics-1.0.1-preview" - sources."azure-arm-datalake-store-1.0.1-preview" + (sources."azure-arm-cdn-1.0.3" // { + dependencies = [ + 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-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" - sources."azure-arm-iothub-0.1.4" - sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.18.0" - sources."azure-arm-powerbiembedded-0.1.0" - sources."azure-arm-trafficmanager-0.10.5" - 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-1.1.1" + sources."azure-arm-iothub-1.0.1-preview" + (sources."azure-arm-servermanagement-0.1.2" // { + dependencies = [ + sources."ms-rest-azure-1.15.7" + sources."ms-rest-1.15.7" + sources."async-0.2.7" + ]; + }) + sources."azure-arm-network-2.0.0" + (sources."azure-arm-powerbiembedded-0.1.0" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + sources."azure-arm-trafficmanager-1.1.0-preview" + (sources."azure-arm-dns-0.11.1" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-website-0.11.4" // { + dependencies = [ + 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-asm-compute-0.17.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" sources."azure-asm-mgmt-0.10.1" @@ -19388,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" @@ -19399,21 +21043,40 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-2.0.0" // { + (sources."azure-storage-2.1.0" // { dependencies = [ sources."readable-stream-2.0.6" sources."validator-3.22.2" 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" sources."commander-1.0.4" - sources."easy-table-0.0.1" + sources."date-utils-1.2.21" + sources."easy-table-1.1.0" sources."event-stream-3.1.5" sources."eyes-0.1.8" sources."github-0.1.6" @@ -19422,15 +21085,16 @@ in sources."jsonlint-1.6.2" sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" - (sources."kuduscript-1.0.13" // { + sources."jwt-decode-2.2.0" + (sources."kuduscript-1.0.15" // { dependencies = [ sources."commander-1.1.1" sources."streamline-0.4.11" ]; }) - sources."moment-2.17.1" - sources."ms-rest-1.15.5" - (sources."ms-rest-azure-1.15.5" // { + sources."moment-2.18.1" + sources."ms-rest-2.2.1" + (sources."ms-rest-azure-2.2.1" // { dependencies = [ sources."async-0.2.7" ]; @@ -19457,7 +21121,7 @@ in }) (sources."request-2.74.0" // { dependencies = [ - sources."extend-3.0.0" + sources."extend-3.0.1" ]; }) (sources."ssh-key-to-pem-0.11.0" // { @@ -19472,7 +21136,7 @@ in sources."tunnel-0.0.2" sources."underscore-1.4.4" sources."user-home-2.0.0" - sources."uuid-3.0.1" + sources."uuid-3.1.0" sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -19485,14 +21149,13 @@ in sources."xml2js-0.1.14" sources."xmlbuilder-0.4.3" sources."read-1.0.7" - sources."date-utils-1.2.21" sources."jws-3.1.4" sources."node-uuid-1.4.7" sources."xmldom-0.1.27" sources."xpath.js-1.0.7" sources."base64url-2.0.0" sources."jwa-1.1.5" - sources."safe-buffer-5.0.1" + 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" @@ -19504,16 +21167,19 @@ in sources."json-edm-parser-0.1.2" sources."md5.js-1.3.4" sources."jsonparse-1.2.0" - sources."hash-base-3.0.3" + sources."hash-base-3.0.4" sources."inherits-2.0.3" 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."stack-trace-0.0.9" + sources."stack-trace-0.0.10" sources."keypress-0.1.0" - sources."from-0.1.3" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" sources."split-0.2.10" @@ -19528,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" @@ -19543,15 +21215,15 @@ in sources."ncp-0.4.2" sources."rimraf-2.6.1" sources."minimist-0.0.8" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."cycle-1.0.3" sources."isstream-0.1.2" @@ -19567,13 +21239,13 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.5" + 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" ]; @@ -19582,9 +21254,9 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.2.2" + sources."qs-6.2.3" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -19596,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" @@ -19608,8 +21279,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -19623,17 +21298,16 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" @@ -19642,16 +21316,16 @@ in sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.3" + 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."buffer-shims-1.0.0" sources."http-basic-2.5.1" - sources."promise-7.1.1" - 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" ]; @@ -19708,47 +21382,22 @@ in }) sources."glob-6.0.4" sources."sprintf-js-1.0.3" - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."ext-name-3.0.0" sources."graceful-fs-3.0.11" sources."intersect-1.0.1" sources."ends-with-0.2.0" - sources."ext-list-2.2.0" - (sources."meow-3.7.0" // { - dependencies = [ - sources."object-assign-4.1.1" - ]; - }) + sources."ext-list-2.2.2" + sources."meow-3.7.0" sources."sort-keys-length-1.0.1" - sources."got-2.9.2" - sources."duplexify-3.5.0" - sources."infinity-agent-2.0.3" - sources."is-stream-1.1.0" - sources."lowercase-keys-1.0.0" - sources."nested-error-stacks-1.0.2" - sources."object-assign-2.1.1" - sources."prepend-http-1.0.4" - sources."read-all-stream-2.2.0" - sources."statuses-1.3.1" - sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" - sources."inherits-2.0.3" - sources."readable-stream-2.2.3" - sources."stream-shift-1.0.0" - sources."once-1.3.3" - sources."wrappy-1.0.2" - sources."buffer-shims-1.0.0" - 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."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.5" + 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" @@ -19756,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.2.0" + 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" @@ -19781,7 +21430,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.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" @@ -19806,23 +21455,26 @@ in sources."path-is-absolute-1.0.1" (sources."rimraf-2.6.1" // { dependencies = [ - sources."glob-7.1.1" + sources."glob-7.1.2" ]; }) sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."q-1.4.1" - sources."debug-2.6.1" + sources."q-1.5.0" + sources."debug-2.6.8" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."ms-0.7.2" + sources."ms-2.0.0" sources."os-tmpdir-1.0.2" ]; buildInputs = globalBuildInputs; @@ -19836,10 +21488,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.1.0"; + version = "14.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; - sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; + sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -19851,25 +21503,26 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-5.0.5" + sources."buffer-5.0.6" sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) 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" sources."duplexer2-0.1.4" sources."events-1.1.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."has-1.0.1" sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" sources."inherits-2.0.3" sources."insert-module-globals-7.0.1" (sources."labeled-stream-splicer-2.0.0" // { @@ -19881,23 +21534,19 @@ in sources."os-browserify-0.1.2" sources."parents-1.0.1" sources."path-browserify-0.0.0" - sources."process-0.11.9" + sources."process-0.11.10" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.2.3" - sources."resolve-1.3.2" + 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.6.3" - sources."string_decoder-0.10.31" + sources."stream-http-2.7.2" + sources."string_decoder-1.0.3" sources."subarg-1.0.0" - (sources."syntax-error-1.1.6" // { - dependencies = [ - sources."acorn-2.7.0" - ]; - }) + sources."syntax-error-1.3.0" sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" @@ -19913,7 +21562,7 @@ in }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" - sources."jsonparse-1.3.0" + sources."jsonparse-1.3.1" sources."through-2.3.8" sources."combine-source-map-0.7.2" sources."umd-3.0.1" @@ -19922,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" @@ -19931,56 +21580,53 @@ in sources."util-deprecate-1.0.2" sources."date-now-0.1.4" sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.0" + sources."browserify-sign-4.0.4" sources."create-ecdh-4.0.0" - sources."create-hash-1.1.2" - sources."create-hmac-1.1.4" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.9" + sources."pbkdf2-3.0.12" sources."public-encrypt-4.0.0" - sources."randombytes-2.0.3" + 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."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.0.0" + sources."parse-asn1-5.1.0" sources."brorand-1.1.0" - sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + 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-1.0.1" + sources."ripemd160-2.0.1" sources."sha.js-2.4.8" + sources."hash-base-2.0.2" sources."miller-rabin-4.0.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."function-bind-1.1.0" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."lexical-scope-1.2.0" - sources."astw-2.0.0" - sources."acorn-1.2.2" + sources."astw-2.2.0" + sources."acorn-4.0.13" sources."stream-splicer-2.0.0" - (sources."detective-4.3.2" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) + sources."detective-4.5.0" sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" - sources."buffer-shims-1.0.0" sources."path-parse-1.0.5" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" @@ -20016,12 +21662,12 @@ in sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" - sources."debug-2.6.1" + sources."debug-2.6.8" sources."diveSync-0.3.0" sources."got-1.2.2" sources."internal-ip-1.2.0" sources."keypress-0.2.1" - sources."mime-1.3.4" + sources."mime-1.3.6" sources."minimist-1.2.0" sources."peerflix-0.34.0" (sources."playerui-1.2.0" // { @@ -20085,7 +21731,7 @@ in sources."thunky-0.1.0" sources."wrap-fn-0.1.5" sources."co-3.1.0" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."append-0.1.1" sources."object-assign-1.0.0" (sources."meow-3.7.0" // { @@ -20097,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.5" + 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" @@ -20105,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.2.0" + 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" @@ -20124,7 +21770,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.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" @@ -20143,7 +21789,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.1" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."get-stdin-5.0.1" ]; @@ -20175,10 +21821,10 @@ in sources."semver-5.1.1" ]; }) - sources."plist-2.0.1" + sources."plist-2.1.0" sources."dns-js-0.2.1" sources."qap-3.1.3" - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."xmlbuilder-8.2.2" sources."xmldom-0.1.27" sources."cli-width-1.1.1" @@ -20194,14 +21840,15 @@ in sources."mute-stream-0.0.4" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.1" - sources."simple-get-2.4.0" + sources."magnet-uri-5.1.7" + sources."parse-torrent-file-4.0.3" + sources."simple-get-2.6.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.5" + sources."rusha-0.8.6" sources."once-1.4.0" sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" @@ -20216,7 +21863,7 @@ in sources."ini-1.1.0" sources."bitfield-0.1.0" sources."bncode-0.5.3" - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -20230,18 +21877,19 @@ in sources."peer-wire-swarm-0.12.1" sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.0" - (sources."random-access-file-1.5.0" // { + sources."torrent-piece-1.1.1" + (sources."random-access-file-1.8.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) - sources."randombytes-2.0.3" + sources."randombytes-2.0.5" sources."run-parallel-1.1.6" + sources."buffer-alloc-unsafe-1.0.0" sources."inherits-2.0.3" - sources."ip-1.1.4" + sources."ip-1.1.5" sources."flatten-0.0.1" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -20256,13 +21904,13 @@ in sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."cyclist-0.1.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -20284,33 +21932,35 @@ 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.3" // { + (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.3" - sources."ws-2.1.0" + 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."string2compact-1.2.2" - (sources."ws-1.1.2" // { + (sources."ws-1.1.4" // { dependencies = [ sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.4.0" sources."get-browser-rtc-1.0.2" - sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."ultron-1.1.0" @@ -20329,7 +21979,7 @@ in ]; }) sources."hawk-0.10.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."cookie-jar-0.2.0" sources."aws-sign-0.2.0" sources."oauth-sign-0.2.0" @@ -20349,15 +21999,15 @@ in sources."voc-0.5.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + 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; @@ -20371,10 +22021,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz"; + sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf"; }; buildInputs = globalBuildInputs; meta = { @@ -20387,84 +22037,99 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "6.5.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-6.5.0.tgz"; - sha1 = "e6ec81b17dd50c17c40b4b87330f7ced38fb0b47"; + url = "https://registry.npmjs.org/cordova/-/cordova-7.0.1.tgz"; + sha1 = "69fd054300ce5105b092f67a1b286e80c4e88b9d"; }; dependencies = [ - (sources."cordova-common-2.0.0" // { + sources."configstore-2.1.0" + (sources."cordova-common-2.0.3" // { dependencies = [ - sources."q-1.4.1" - sources."underscore-1.8.3" + sources."q-1.5.0" ]; }) - (sources."cordova-lib-6.5.0" // { + (sources."cordova-lib-7.0.1" // { dependencies = [ - sources."elementtree-0.1.6" - sources."nopt-3.0.6" - sources."semver-4.3.6" + sources."glob-7.1.1" + sources."nopt-4.0.1" + sources."plist-2.0.1" sources."shelljs-0.3.0" - sources."unorm-1.3.3" - sources."sax-0.3.5" + sources."base64-js-1.1.2" + sources."xmlbuilder-8.2.2" ]; }) - (sources."insight-0.8.4" // { + sources."editor-1.0.0" + (sources."insight-0.8.2" // { dependencies = [ sources."async-1.5.2" - sources."request-2.79.0" - sources."qs-6.3.1" + sources."configstore-1.4.0" ]; }) sources."nopt-3.0.1" sources."q-1.0.1" - sources."underscore-1.7.0" - sources."update-notifier-0.5.0" + (sources."update-notifier-0.5.0" // { + dependencies = [ + sources."configstore-1.4.0" + ]; + }) + sources."dot-prop-3.0.0" + sources."graceful-fs-4.1.11" + sources."mkdirp-0.5.1" + sources."object-assign-4.1.1" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.4" + sources."uuid-2.0.3" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."is-obj-1.0.1" + sources."minimist-0.0.8" + sources."os-homedir-1.0.2" + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" sources."ansi-0.3.1" sources."bplist-parser-0.1.1" sources."cordova-registry-mapper-1.1.15" - sources."elementtree-0.1.7" + sources."elementtree-0.1.6" sources."glob-5.0.15" - sources."minimatch-3.0.3" - sources."osenv-0.1.4" + sources."minimatch-3.0.4" sources."plist-1.2.0" sources."semver-5.3.0" sources."shelljs-0.5.3" + sources."underscore-1.8.3" sources."unorm-1.4.1" - sources."big-integer-1.6.17" - sources."sax-1.1.4" + sources."big-integer-1.6.23" + sources."sax-0.3.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" sources."util-deprecate-1.0.2" sources."lodash-3.10.1" - sources."aliasify-1.9.0" - (sources."cordova-create-1.0.2" // { + sources."aliasify-2.1.0" + (sources."cordova-create-1.1.1" // { dependencies = [ sources."shelljs-0.3.0" ]; }) - (sources."cordova-fetch-1.0.2" // { + (sources."cordova-fetch-1.1.0" // { dependencies = [ - sources."q-1.4.1" - sources."shelljs-0.7.6" - sources."glob-7.1.1" + sources."q-1.5.0" + sources."shelljs-0.7.8" + sources."glob-7.1.2" ]; }) sources."cordova-js-4.2.1" (sources."cordova-serve-1.0.1" // { dependencies = [ - sources."q-1.4.1" + sources."q-1.5.0" ]; }) (sources."dep-graph-1.1.0" // { @@ -20472,78 +22137,73 @@ in sources."underscore-1.2.1" ]; }) - (sources."init-package-json-1.9.4" // { + (sources."init-package-json-1.10.1" // { dependencies = [ - sources."glob-6.0.4" + sources."glob-7.1.2" ]; }) - (sources."npm-2.15.11" // { + (sources."npm-2.15.12" // { dependencies = [ sources."abbrev-1.0.9" sources."glob-7.0.6" sources."hosted-git-info-2.1.5" + (sources."init-package-json-1.9.6" // { + dependencies = [ + sources."glob-7.1.2" + sources."validate-npm-package-name-3.0.0" + ]; + }) 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" sources."semver-5.1.1" - sources."tar-2.2.1" + sources."validate-npm-package-name-2.2.2" + sources."write-file-atomic-1.1.4" sources."isarray-1.0.0" - sources."form-data-1.0.1" + sources."qs-6.2.3" + sources."builtins-0.0.7" ]; }) - sources."opener-1.4.1" - sources."properties-parser-0.2.3" - (sources."request-2.47.0" // { + sources."opener-1.4.2" + sources."properties-parser-0.3.1" + (sources."request-2.79.0" // { dependencies = [ - sources."bl-0.9.5" - sources."caseless-0.6.0" - sources."forever-agent-0.5.2" - sources."form-data-0.1.4" - sources."mime-types-1.0.2" - sources."qs-2.3.3" - sources."http-signature-0.10.1" - sources."oauth-sign-0.4.0" - sources."hawk-1.1.1" - sources."aws-sign2-0.5.0" - sources."combined-stream-0.0.7" - sources."readable-stream-1.0.34" - sources."mime-1.2.11" - sources."async-0.9.2" - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - sources."delayed-stream-0.0.5" + sources."form-data-2.1.4" + sources."qs-6.3.2" + sources."uuid-3.1.0" ]; }) - sources."tar-1.0.2" + sources."tar-2.2.1" sources."valid-identifier-0.0.1" - sources."xcode-0.9.1" - sources."browserify-transform-tools-1.5.3" - sources."falafel-1.2.0" + (sources."xcode-0.9.3" // { + dependencies = [ + sources."uuid-3.0.1" + ]; + }) + sources."browserify-transform-tools-1.7.0" + sources."falafel-2.1.0" sources."through-2.3.8" - sources."acorn-1.2.2" + sources."acorn-5.1.1" sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" - sources."cordova-app-hello-world-3.11.0" - (sources."dependency-ls-1.0.0" // { + sources."cordova-app-hello-world-3.12.0" + (sources."dependency-ls-1.1.1" // { dependencies = [ sources."q-1.4.1" ]; }) sources."is-url-1.2.2" - sources."interpret-1.0.1" + sources."interpret-1.0.3" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" - sources."resolve-1.3.2" + sources."resolve-1.3.3" sources."path-parse-1.0.5" (sources."browserify-13.3.0" // { dependencies = [ - sources."glob-7.1.1" + sources."glob-7.1.2" ]; }) sources."JSONStream-1.3.1" @@ -20557,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" ]; }) @@ -20570,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" @@ -20585,24 +22245,29 @@ in sources."os-browserify-0.1.2" sources."parents-1.0.1" sources."path-browserify-0.0.0" - sources."process-0.11.9" + sources."process-0.11.10" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.2" sources."string_decoder-0.10.31" - sources."subarg-1.0.0" - (sources."syntax-error-1.1.6" // { + (sources."subarg-1.0.0" // { dependencies = [ - sources."acorn-2.7.0" + sources."minimist-1.2.0" + ]; + }) + (sources."syntax-error-1.3.0" // { + dependencies = [ + sources."acorn-4.0.13" ]; }) sources."through2-2.0.3" @@ -20620,7 +22285,7 @@ in }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" - sources."jsonparse-1.3.0" + sources."jsonparse-1.3.1" sources."combine-source-map-0.7.2" sources."umd-3.0.1" sources."convert-source-map-1.1.3" @@ -20634,46 +22299,51 @@ in sources."process-nextick-args-1.0.7" sources."date-now-0.1.4" sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.0" + sources."browserify-sign-4.0.4" sources."create-ecdh-4.0.0" - sources."create-hash-1.1.2" - sources."create-hmac-1.1.4" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.9" + sources."pbkdf2-3.0.12" sources."public-encrypt-4.0.0" - sources."randombytes-2.0.3" + 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."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.0.0" + sources."parse-asn1-5.1.0" sources."brorand-1.1.0" - sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + 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-1.0.1" + sources."ripemd160-2.0.1" sources."sha.js-2.4.8" + sources."hash-base-2.0.2" sources."miller-rabin-4.0.0" sources."function-bind-1.1.0" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."lexical-scope-1.2.0" - sources."astw-2.0.0" - sources."stream-splicer-2.0.0" - (sources."detective-4.3.2" // { + (sources."astw-2.2.0" // { dependencies = [ - sources."acorn-3.3.0" + sources."acorn-4.0.13" + ]; + }) + sources."stream-splicer-2.0.0" + (sources."detective-4.5.0" // { + dependencies = [ + sources."acorn-4.0.13" ]; }) sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" - sources."buffer-shims-1.0.0" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."array-filter-0.0.1" @@ -20681,12 +22351,15 @@ in sources."array-map-0.0.0" sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" - sources."minimist-1.2.0" sources."querystring-0.2.0" sources."indexof-0.0.1" sources."chalk-1.1.3" - sources."compression-1.6.2" - sources."express-4.14.1" + sources."compression-1.7.0" + (sources."express-4.15.3" // { + dependencies = [ + sources."debug-2.6.7" + ]; + }) sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -20694,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."compressible-2.0.9" - sources."debug-2.2.0" + sources."bytes-2.5.0" + sources."compressible-2.0.10" + sources."debug-2.6.8" sources."on-headers-1.0.1" - sources."vary-1.1.0" - sources."mime-types-2.1.14" + sources."vary-1.1.1" + sources."mime-types-2.1.15" sources."negotiator-0.6.1" - sources."mime-db-1.26.0" - sources."ms-0.7.1" + sources."mime-db-1.27.0" + sources."ms-2.0.0" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.2" @@ -20711,57 +22384,60 @@ in sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.1" - sources."fresh-0.3.0" + sources."etag-1.8.0" + (sources."finalhandler-1.0.3" // { + dependencies = [ + sources."debug-2.6.7" + ]; + }) + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" - sources."qs-6.2.0" + sources."proxy-addr-1.1.4" + sources."qs-6.4.0" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.3" // { dependencies = [ - sources."ms-0.7.2" + sources."debug-2.6.7" ]; }) - sources."serve-static-1.11.2" - sources."type-is-1.6.14" - sources."utils-merge-1.0.0" + sources."serve-static-1.12.3" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" + sources."type-is-1.6.15" + sources."utils-merge-1.0.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."mime-1.3.4" - sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" - sources."npm-package-arg-4.2.0" + sources."npm-package-arg-5.1.2" sources."promzard-0.3.0" sources."read-1.0.7" - (sources."read-package-json-2.0.4" // { + (sources."read-package-json-2.0.10" // { dependencies = [ - sources."glob-6.0.4" + sources."glob-7.1.2" ]; }) sources."validate-npm-package-license-3.0.1" - sources."validate-npm-package-name-2.2.2" - sources."hosted-git-info-2.2.0" + sources."validate-npm-package-name-3.0.0" + 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.5" - sources."graceful-fs-4.1.11" + 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" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."builtins-0.0.7" + sources."builtins-1.0.3" sources."abbrev-1.1.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -20775,25 +22451,18 @@ in sources."columnify-1.5.4" sources."config-chain-1.1.11" sources."dezalgo-1.0.3" - sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fstream-1.0.11" sources."fstream-npm-1.1.1" sources."github-url-from-git-1.4.0" sources."github-url-from-username-repo-1.0.2" sources."ini-1.3.4" sources."lockfile-1.0.3" sources."lru-cache-4.0.2" - (sources."mkdirp-0.5.1" // { + (sources."node-gyp-3.6.2" // { dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."node-gyp-3.4.0" // { - dependencies = [ - sources."glob-7.1.1" - sources."tar-2.2.1" + sources."glob-7.1.2" ]; }) sources."normalize-git-url-3.0.2" @@ -20801,69 +22470,83 @@ in sources."npm-install-checks-1.0.7" (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."request-2.79.0" - sources."qs-6.3.1" + sources."npm-package-arg-4.2.1" ]; }) sources."npm-user-validate-0.1.5" sources."npmlog-2.0.4" sources."path-is-inside-1.0.2" sources."read-installed-4.0.3" - sources."realize-package-specifier-3.0.3" + (sources."realize-package-specifier-3.0.3" // { + dependencies = [ + sources."npm-package-arg-4.2.1" + ]; + }) sources."retry-0.10.1" (sources."rimraf-2.5.4" // { dependencies = [ - sources."glob-7.1.1" + sources."glob-7.1.2" ]; }) sources."sha-2.0.1" - sources."slide-1.1.6" sources."sorted-object-2.0.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" - sources."which-1.2.12" - sources."write-file-atomic-1.1.4" - sources."imurmurhash-0.1.4" + sources."which-1.2.14" sources."wcwidth-1.0.1" 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" - sources."yallist-2.0.0" - sources."path-array-1.0.1" - sources."array-index-1.0.0" - sources."es6-symbol-3.1.0" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" + sources."yallist-2.1.2" + sources."are-we-there-yet-1.1.4" + sources."gauge-1.2.7" + sources."delegates-1.0.0" + sources."has-unicode-2.0.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."debuglog-1.0.1" + sources."readdir-scoped-modules-1.0.2" + sources."util-extend-1.0.3" + sources."buffer-shims-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) sources."caseless-0.11.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-1.0.1" 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."node-uuid-1.4.8" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."commander-2.9.0" + (sources."async-2.5.0" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) + 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" @@ -20874,8 +22557,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20889,58 +22576,31 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."are-we-there-yet-1.1.2" - sources."gauge-1.2.7" - sources."delegates-1.0.0" - sources."has-unicode-2.0.1" - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" - sources."debuglog-1.0.1" - sources."readdir-scoped-modules-1.0.2" - sources."util-extend-1.0.3" - (sources."bl-1.1.2" // { + sources."isexe-2.0.0" + sources."string.prototype.codepointat-0.2.0" + sources."asynckit-0.4.0" + sources."pegjs-0.10.0" + (sources."simple-plist-0.2.1" // { dependencies = [ - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" - ]; - }) - sources."node-uuid-1.4.7" - (sources."async-2.1.5" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) - sources."isexe-1.1.2" - sources."ctype-0.5.3" - sources."pegjs-0.9.0" - (sources."simple-plist-0.1.4" // { - dependencies = [ - sources."bplist-parser-0.0.6" - ]; - }) - sources."bplist-creator-0.0.4" - sources."stream-buffers-0.2.6" - (sources."configstore-1.4.0" // { - dependencies = [ - sources."uuid-2.0.3" + sources."plist-2.0.1" + sources."base64-js-1.1.2" + sources."xmlbuilder-8.2.2" ]; }) + sources."bplist-creator-0.0.7" + sources."stream-buffers-2.2.0" sources."inquirer-0.10.1" sources."lodash.debounce-3.1.1" - sources."object-assign-4.1.1" sources."os-name-1.0.3" - sources."xdg-basedir-2.0.0" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" sources."cli-width-1.1.1" @@ -20959,7 +22619,11 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."lodash._getnative-3.9.1" - sources."osx-release-1.1.0" + (sources."osx-release-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."win-release-1.1.1" sources."is-npm-1.0.0" sources."latest-version-1.0.1" @@ -20988,8 +22652,12 @@ in ]; }) sources."stream-shift-1.0.0" - sources."rc-1.1.7" - sources."deep-extend-0.4.1" + (sources."rc-1.2.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" sources."is-finite-1.0.2" ]; @@ -21009,7 +22677,7 @@ in sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; dependencies = [ - sources."clone-2.1.0" + sources."clone-2.1.1" sources."parserlib-1.1.1" ]; buildInputs = globalBuildInputs; @@ -21036,9 +22704,9 @@ in sources."hiredis-0.4.1" (sources."json-rpc2-0.8.1" // { dependencies = [ - sources."debug-1.0.4" + sources."debug-1.0.5" sources."lodash-2.4.2" - sources."ms-0.6.2" + sources."ms-2.0.0" ]; }) sources."lodash-3.1.0" @@ -21065,7 +22733,7 @@ in }) sources."through-2.3.8" sources."duplexer-0.1.1" - sources."from-0.1.3" + sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" sources."split-0.3.3" @@ -21099,9 +22767,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."negotiator-0.5.3" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -21110,7 +22778,7 @@ in sources."destroy-1.0.3" sources."mime-1.2.11" sources."bindings-1.2.1" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."jsonparse-0.0.6" sources."es5class-2.3.1" sources."faye-websocket-0.11.1" @@ -21125,7 +22793,7 @@ in }) sources."binaryheap-0.0.3" sources."buffercursor-0.0.12" - sources."verror-1.9.0" + sources."verror-1.10.0" sources."assert-plus-1.0.0" sources."core-util-is-1.0.2" sources."extsprintf-1.3.0" @@ -21138,7 +22806,7 @@ in sources."cycle-1.0.3" sources."eyes-0.1.8" sources."pkginfo-0.3.1" - sources."stack-trace-0.0.9" + sources."stack-trace-0.0.10" sources."formidable-1.0.14" sources."component-emitter-1.1.2" sources."cookiejar-2.0.1" @@ -21172,9 +22840,9 @@ in sources."JSONStream-0.8.4" sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" - sources."cors-2.8.1" + sources."cors-2.8.4" sources."docker-parse-image-3.0.1" - sources."end-of-stream-1.1.0" + sources."end-of-stream-1.4.0" sources."from2-1.3.0" sources."fs-blob-store-5.2.1" sources."level-0.18.0" @@ -21213,8 +22881,9 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."pump-1.0.2" @@ -21224,11 +22893,12 @@ in sources."sorted-union-stream-1.0.2" sources."split2-0.2.1" sources."stream-collector-1.0.1" - (sources."tar-stream-1.5.2" // { + (sources."tar-stream-1.5.4" // { dependencies = [ - sources."bl-1.2.0" - sources."readable-stream-2.2.3" + sources."bl-1.2.1" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) (sources."through2-0.6.5" // { @@ -21240,8 +22910,9 @@ in sources."xtend-4.0.1" sources."jsonparse-0.0.5" sources."through-2.3.8" - sources."vary-1.1.0" - sources."once-1.3.3" + sources."object-assign-4.1.1" + sources."vary-1.1.1" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."inherits-2.0.3" sources."readable-stream-1.1.14" @@ -21251,20 +22922,22 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" + sources."once-1.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."lru-cache-2.7.3" sources."stream-shift-1.0.0" - sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" sources."util-deprecate-1.0.2" sources."level-packager-0.18.0" sources."bytewise-1.1.0" sources."ltgt-2.1.3" sources."pull-level-2.0.3" - sources."pull-stream-3.5.0" + sources."pull-stream-3.6.0" sources."typewiselite-1.0.0" sources."bytewise-core-1.2.3" sources."typewise-1.0.3" @@ -21286,7 +22959,7 @@ in sources."level-post-1.0.5" sources."pull-cat-1.1.11" sources."pull-live-1.0.1" - sources."pull-pushable-2.0.1" + sources."pull-pushable-2.1.1" sources."pull-window-2.1.4" (sources."stream-to-pull-stream-1.7.2" // { dependencies = [ @@ -21312,69 +22985,80 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.1.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.1.0.tgz"; - sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz"; + sha1 = "84218b1184cec4859e63ae2ef44b5a7d877e4fe4"; }; dependencies = [ sources."JSONStream-1.3.1" - sources."async-2.1.5" + sources."async-2.5.0" sources."aws4-1.6.0" - sources."awscred-1.2.0" + sources."aws-sdk-2.85.0" sources."ini-1.3.4" sources."optimist-0.6.1" - sources."request-2.79.0" - sources."jsonparse-1.3.0" + sources."request-2.81.0" + sources."jsonparse-1.3.1" sources."through-2.3.8" sources."lodash-4.17.4" + 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" + sources."url-0.10.3" + sources."uuid-3.0.1" + sources."xml2js-0.4.17" + sources."xmlbuilder-4.2.1" + 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" sources."aws-sign2-0.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + (sources."tough-cookie-2.3.2" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - 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."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21388,18 +23072,16 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" - sources."punycode-1.4.1" + sources."mime-db-1.27.0" ]; buildInputs = globalBuildInputs; meta = { @@ -21412,14 +23094,15 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz"; - sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd"; + url = "https://registry.npmjs.org/emoj/-/emoj-1.1.0.tgz"; + sha1 = "5a43ae17f6bf672cd8e40891357f84b086c52509"; }; dependencies = [ sources."chalk-1.1.3" sources."clipboardy-0.1.2" + sources."conf-1.1.2" (sources."got-6.7.1" // { dependencies = [ sources."get-stream-3.0.0" @@ -21430,6 +23113,7 @@ in sources."log-update-1.0.2" sources."mem-1.1.0" sources."meow-3.7.0" + sources."skin-tone-1.0.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."strip-ansi-3.0.1" @@ -21443,21 +23127,32 @@ in sources."p-finally-1.0.0" sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" - sources."lru-cache-4.0.2" - sources."which-1.2.12" + sources."lru-cache-4.1.1" + sources."which-1.2.14" sources."pseudomap-1.0.2" - sources."yallist-2.0.0" - sources."isexe-1.1.2" + sources."yallist-2.1.2" + sources."isexe-2.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."dot-prop-4.1.1" + sources."env-paths-1.0.0" + sources."make-dir-1.0.0" + sources."pkg-up-2.0.0" + sources."is-obj-1.0.1" + sources."pify-2.3.0" + sources."find-up-2.1.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."create-error-class-3.0.2" sources."duplexer3-0.1.4" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" - sources."safe-buffer-5.0.1" + 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" @@ -21474,14 +23169,19 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."minimist-1.2.0" - sources."normalize-package-data-2.3.5" - sources."read-pkg-up-1.0.1" + sources."normalize-package-data-2.4.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + ]; + }) sources."redent-1.0.0" sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.2.0" + 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" @@ -21489,16 +23189,13 @@ in 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."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.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" @@ -21507,6 +23204,7 @@ in sources."is-finite-1.0.2" sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" + sources."unicode-emoji-modifier-base-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -21519,52 +23217,61 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.16.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz"; - sha1 = "9bc31fc7341692cf772e80607508f67d711c5609"; + 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" - sources."debug-2.6.1" - sources."doctrine-1.5.0" - sources."escope-3.6.0" - sources."espree-3.4.0" + sources."debug-2.6.8" + sources."doctrine-2.0.0" + sources."eslint-scope-3.7.1" + 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."glob-7.1.1" - sources."globals-9.16.0" - sources."ignore-3.2.4" + sources."glob-7.1.2" + 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.1" + 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" 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.6" - 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."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -21573,29 +23280,17 @@ in sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + 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-0.10.31" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."ms-0.7.2" - sources."es6-map-0.1.4" - sources."es6-weak-map-2.0.1" - (sources."esrecurse-4.1.0" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" - sources."es6-set-0.1.4" - sources."es6-symbol-3.1.0" - sources."event-emitter-0.3.4" + sources."ms-2.0.0" + sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-4.0.4" + sources."acorn-5.1.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -21619,41 +23314,48 @@ in sources."pinkie-2.0.4" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" - 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."deep-is-0.1.3" sources."wordwrap-1.0.0" @@ -21661,15 +23363,8 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."interpret-1.0.1" - sources."rechoir-0.6.2" - sources."resolve-1.3.2" - sources."path-parse-1.0.5" - sources."ajv-4.11.3" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" - sources."co-4.6.0" - sources."os-homedir-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -21679,21 +23374,385 @@ in }; production = true; }; + eslint_d = nodeEnv.buildNodePackage { + name = "eslint_d"; + packageName = "eslint_d"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.0.0.tgz"; + sha1 = "88bbceec5d5eead280b63b6351881bc05bfe3987"; + }; + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) + sources."eslint-4.2.0" + sources."optionator-0.8.2" + sources."resolve-1.3.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."eslint-scope-3.7.1" + 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."glob-7.1.2" + sources."globals-9.18.0" + sources."ignore-3.3.3" + sources."imurmurhash-0.1.4" + (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.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-4.0.0" + sources."progress-2.0.0" + sources."require-uncached-1.0.3" + sources."strip-json-comments-2.0.1" + (sources."table-4.0.1" // { + dependencies = [ + sources."ajv-4.11.8" + ]; + }) + sources."text-table-0.2.0" + 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.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.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."ms-2.0.0" + sources."esrecurse-4.2.0" + sources."object-assign-4.1.1" + sources."acorn-5.1.1" + (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."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.1.0" + 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."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-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."ajv-keywords-1.5.1" + sources."slice-ansi-0.0.4" + sources."deep-is-0.1.3" + sources."wordwrap-1.0.0" + sources."fast-levenshtein-2.0.6" + sources."path-parse-1.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Makes eslint the fastest linter on the planet"; + homepage = https://github.com/mantoni/eslint_d.js; + license = "MIT"; + }; + production = true; + }; emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "2.2.7"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz"; - sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.1.tgz"; + sha1 = "f5680fbee2cb2a56e99042b14d935e3eb861b300"; }; buildInputs = globalBuildInputs; meta = { - description = "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images."; + description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; homepage = http://www.emojione.com/; }; 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"; @@ -21778,14 +23837,14 @@ in sources."async-0.2.10" sources."cycle-1.0.3" sources."pkginfo-0.3.1" - sources."stack-trace-0.0.9" + sources."stack-trace-0.0.10" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."read-1.0.7" sources."revalidator-0.1.8" sources."mute-stream-0.0.7" - sources."chokidar-1.6.1" - sources."minimatch-3.0.3" + sources."chokidar-1.7.0" + sources."minimatch-3.0.4" sources."ps-tree-0.0.3" sources."anymatch-1.3.0" sources."async-each-1.0.1" @@ -21794,7 +23853,7 @@ in sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.1.1" + sources."fsevents-1.1.2" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -21802,132 +23861,135 @@ in sources."braces-1.8.5" sources."expand-brackets-0.1.5" sources."extglob-0.3.2" - sources."filename-regex-2.0.0" + sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-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.0.1" + 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.6" + (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."isarray-1.0.0" + sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" - sources."is-dotfile-1.0.2" + sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" - sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" - sources."node-pre-gyp-0.6.33" + sources."nan-2.6.2" + sources."node-pre-gyp-0.6.36" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."nopt-3.0.6" - sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."once-1.3.3" - sources."readable-stream-2.1.5" - ]; - }) + sources."tar-pack-3.4.0" sources."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.3" // { + (sources."gauge-2.7.4" // { dependencies = [ sources."object-assign-4.1.1" ]; }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.1" + sources."aproba-1.1.2" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" - sources."wide-align-1.1.0" + 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."ansi-regex-2.1.1" - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21941,31 +24003,30 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" - sources."debug-2.2.0" + sources."fstream-1.0.11" + sources."debug-2.6.8" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."ms-2.0.0" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."event-stream-0.5.3" // { dependencies = [ @@ -21975,7 +24036,6 @@ in sources."lazy-1.0.11" sources."caller-0.0.1" sources."tape-2.3.3" - sources."jsonify-0.0.0" sources."deep-equal-0.1.2" sources."defined-0.0.0" sources."through-2.3.8" @@ -21994,15 +24054,21 @@ in git-run = nodeEnv.buildNodePackage { name = "git-run"; packageName = "git-run"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz"; - sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c"; + url = "https://registry.npmjs.org/git-run/-/git-run-0.5.4.tgz"; + sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ + sources."async-2.5.0" + sources."lodash.groupby-4.6.0" sources."minilog-2.0.8" + sources."simple-git-1.73.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" + sources."lodash-4.17.4" sources."microee-0.0.2" + sources."debug-2.6.8" + sources."ms-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -22012,6 +24078,22 @@ in }; production = true; }; + git-standup = nodeEnv.buildNodePackage { + name = "git-standup"; + packageName = "git-standup"; + version = "2.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.8.tgz"; + sha1 = "4df13a13e9c49ba4cdbd5ad35a90457c8795e352"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Recall what you did on the last working day. Psst! or be nosy and find what someone else in your team did ;-)"; + homepage = "https://github.com/kamranahmedse/git-standup#readme"; + license = "MIT"; + }; + production = true; + }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; @@ -22028,12 +24110,12 @@ in sources."glob-5.0.15" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."abbrev-1.1.0" ]; @@ -22055,17 +24137,17 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.6" 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.25" // { + (sources."clean-css-3.4.28" // { dependencies = [ sources."commander-2.8.1" ]; @@ -22082,7 +24164,7 @@ in sources."source-map-0.1.43" ]; }) - (sources."uglify-js-2.7.5" // { + (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -22106,9 +24188,8 @@ in sources."css-stringify-1.0.5" sources."optimist-0.3.7" sources."wordwrap-0.0.3" - sources."async-0.2.10" - sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" + sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" (sources."cliui-2.1.0" // { dependencies = [ @@ -22121,17 +24202,17 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.1.0" + sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" 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.5.1" + sources."nan-2.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -22153,14 +24234,14 @@ in sources."chalk-1.1.3" sources."deprecated-0.0.1" sources."gulp-util-3.0.8" - sources."interpret-1.0.1" + sources."interpret-1.0.3" sources."liftoff-2.3.0" sources."minimist-1.2.0" sources."orchestrator-0.3.8" sources."pretty-hrtime-1.0.3" sources."semver-4.3.6" sources."tildify-1.2.0" - sources."v8flags-2.0.11" + sources."v8flags-2.1.1" (sources."vinyl-fs-0.3.14" // { dependencies = [ sources."through2-0.6.5" @@ -22191,12 +24272,13 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."vinyl-0.5.3" - sources."time-stamp-1.0.1" + sources."time-stamp-1.1.0" sources."glogg-1.0.0" sources."sparkles-1.0.0" sources."lodash._basecopy-3.0.1" @@ -22218,20 +24300,24 @@ in sources."string_decoder-0.10.31" sources."inherits-2.0.3" sources."xtend-4.0.1" - sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" + 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.0" + 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" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.3.2" + sources."resolve-1.3.3" sources."detect-file-0.1.0" sources."is-glob-2.0.1" sources."micromatch-2.3.11" @@ -22243,13 +24329,13 @@ in sources."braces-1.8.5" sources."expand-brackets-0.1.5" sources."extglob-0.3.2" - sources."filename-regex-2.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."filename-regex-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.0.1" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -22260,15 +24346,25 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.6" + (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."is-buffer-1.1.4" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" - sources."is-dotfile-1.0.2" + 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" @@ -22279,13 +24375,24 @@ in sources."is-windows-0.2.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.12" + sources."which-1.2.14" sources."parse-passwd-1.0.0" - sources."isexe-1.1.2" - sources."lodash.assignwith-4.2.0" - sources."lodash.isempty-4.4.0" - sources."lodash.pick-4.4.0" + sources."isexe-2.0.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" @@ -22321,8 +24428,8 @@ in sources."glob2base-0.0.12" sources."unique-stream-1.0.0" sources."inflight-1.0.6" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."find-index-0.1.1" sources."gaze-0.5.2" @@ -22362,7 +24469,7 @@ in sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-2.0.2" + sources."eventemitter3-2.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -22397,12 +24504,12 @@ in sources."parserlib-0.2.5" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."cli-0.6.6" // { dependencies = [ @@ -22433,7 +24540,7 @@ in sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."glob-base-0.3.0" - sources."is-dotfile-1.0.2" + sources."is-dotfile-1.0.3" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" sources."glob-parent-2.0.0" @@ -22476,14 +24583,14 @@ in sources."escodegen-1.8.1" sources."esprima-2.7.3" sources."glob-5.0.15" - (sources."handlebars-4.0.6" // { + (sources."handlebars-4.0.10" // { dependencies = [ sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.8.1" // { + (sources."js-yaml-3.9.0" // { dependencies = [ - sources."esprima-3.1.3" + sources."esprima-4.0.0" ]; }) (sources."mkdirp-0.5.1" // { @@ -22495,7 +24602,7 @@ in sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.2.3" - sources."which-1.2.12" + sources."which-1.2.14" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -22509,26 +24616,25 @@ in sources."amdefine-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" ]; }) - (sources."uglify-js-2.7.5" // { + (sources."uglify-js-2.8.29" // { dependencies = [ - sources."async-0.2.10" sources."source-map-0.5.6" ]; }) sources."minimist-0.0.10" - sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" + sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" (sources."cliui-2.1.0" // { dependencies = [ @@ -22541,14 +24647,14 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.1.0" + sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."argparse-1.0.9" sources."sprintf-js-1.0.3" sources."has-flag-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -22558,6 +24664,74 @@ in }; production = true; }; + javascript-typescript-langserver = nodeEnv.buildNodePackage { + name = "javascript-typescript-langserver"; + packageName = "javascript-typescript-langserver"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.1.tgz"; + sha1 = "37abd20a6fe7569c55bc823848e6e40e9148c1a6"; + }; + dependencies = [ + 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" + sources."mz-2.6.0" + sources."object-hash-1.1.8" + sources."opentracing-0.14.1" + sources."semaphore-async-await-1.5.1" + sources."string-similarity-1.2.0" + sources."typescript-2.3.4" + 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" + sources."assertion-error-1.0.2" + sources."check-error-1.0.2" + (sources."deep-eql-2.0.2" // { + dependencies = [ + sources."type-detect-3.0.0" + ]; + }) + sources."get-func-name-2.0.0" + sources."pathval-1.1.0" + sources."type-detect-4.0.3" + sources."ansi-styles-3.1.0" + sources."escape-string-regexp-1.0.5" + 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" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; + homepage = https://github.com/sourcegraph/javascript-typescript-langserver; + license = "Apache-2.0"; + }; + production = true; + }; jayschema = nodeEnv.buildNodePackage { name = "jayschema"; packageName = "jayschema"; @@ -22580,21 +24754,21 @@ 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" sources."console-browserify-1.1.0" sources."exit-0.1.2" sources."htmlparser2-3.8.3" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."shelljs-0.3.0" sources."strip-json-comments-1.0.4" sources."lodash-3.7.0" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -22616,8 +24790,8 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; buildInputs = globalBuildInputs; @@ -22631,15 +24805,46 @@ in json = nodeEnv.buildNodePackage { name = "json"; packageName = "json"; - version = "9.0.4"; + version = "9.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; - sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; + url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz"; + sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585"; }; buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; - homepage = https://github.com/trentm/json; + homepage = "https://github.com/trentm/json#readme"; + }; + 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; }; @@ -22658,245 +24863,154 @@ in }; production = true; }; - js-yaml = nodeEnv.buildNodePackage { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.8.1"; + json-server = nodeEnv.buildNodePackage { + name = "json-server"; + packageName = "json-server"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; - sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.11.2.tgz"; + sha1 = "f31b366bd3c540ecebf0cf3e0f4d04c427b21781"; }; dependencies = [ - sources."argparse-1.0.9" - sources."esprima-3.1.3" - sources."sprintf-js-1.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "YAML 1.2 parser and serializer"; - homepage = https://github.com/nodeca/js-yaml; - license = "MIT"; - }; - production = true; - }; - karma = nodeEnv.buildNodePackage { - name = "karma"; - packageName = "karma"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz"; - sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; - }; - dependencies = [ - sources."bluebird-3.4.7" - sources."body-parser-1.16.1" - sources."chokidar-1.6.1" - sources."colors-1.1.2" - (sources."combine-lists-1.0.1" // { + sources."body-parser-1.17.2" + sources."chalk-1.1.3" + (sources."compression-1.7.0" // { dependencies = [ - sources."lodash-4.17.4" + sources."bytes-2.5.0" + sources."debug-2.6.8" ]; }) - sources."connect-3.6.0" - sources."core-js-2.4.1" - sources."di-0.0.1" - sources."dom-serialize-2.2.1" - (sources."expand-braces-0.1.2" // { + sources."connect-pause-0.1.1" + sources."cors-2.8.4" + sources."errorhandler-1.5.0" + sources."express-4.15.3" + (sources."express-urlrewrite-1.2.0" // { dependencies = [ - sources."braces-0.1.5" - sources."expand-range-0.1.1" - sources."is-number-0.1.1" - sources."repeat-string-0.2.2" + sources."path-to-regexp-1.7.0" ]; }) - sources."glob-7.1.1" - sources."graceful-fs-4.1.11" - sources."http-proxy-1.16.2" - sources."isbinaryfile-3.0.2" - sources."lodash-3.10.1" - (sources."log4js-0.6.38" // { + sources."json-parse-helpfulerror-1.0.3" + sources."lodash-4.17.4" + sources."lodash-id-0.13.0" + sources."lowdb-0.15.5" + (sources."method-override-2.3.9" // { dependencies = [ - sources."readable-stream-1.0.34" - sources."semver-4.3.6" - sources."isarray-0.0.1" + sources."debug-2.6.8" ]; }) - sources."mime-1.3.4" - sources."minimatch-3.0.3" - sources."optimist-0.6.1" - sources."qjobs-1.1.5" - sources."range-parser-1.2.0" - sources."rimraf-2.6.1" - sources."safe-buffer-5.0.1" - (sources."socket.io-1.7.3" // { + (sources."morgan-1.8.2" // { dependencies = [ - sources."debug-2.3.3" - sources."object-assign-4.1.0" + sources."debug-2.6.8" + ]; + }) + 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" + sources."shortid-2.2.8" + sources."update-notifier-1.0.3" + (sources."yargs-6.6.0" // { + dependencies = [ + sources."camelcase-3.0.0" ]; }) - sources."source-map-0.5.6" - sources."tmp-0.0.31" - sources."useragent-2.1.12" sources."bytes-2.4.0" sources."content-type-1.0.2" - sources."debug-2.6.1" + sources."debug-2.6.7" sources."depd-1.1.0" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.2.1" + sources."qs-6.4.0" sources."raw-body-2.2.0" - sources."type-is-1.6.14" - sources."ms-0.7.2" + sources."type-is-1.6.15" + 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."media-typer-0.3.0" - sources."mime-types-2.1.14" - sources."mime-db-1.26.0" - sources."anymatch-1.3.0" - sources."async-each-1.0.1" - sources."glob-parent-2.0.0" - sources."is-binary-path-1.0.1" - sources."is-glob-2.0.1" - sources."path-is-absolute-1.0.1" - sources."readdirp-2.1.0" - sources."fsevents-1.1.1" - sources."arrify-1.0.1" - sources."micromatch-2.3.11" - 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.0" - sources."is-extglob-1.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" - sources."object.omit-2.0.1" - sources."parse-glob-3.0.4" - sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" - 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.6" - sources."repeat-string-1.6.1" - sources."isarray-1.0.0" - sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" - sources."for-own-0.1.5" - sources."is-extendable-0.1.1" - sources."for-in-1.0.1" - sources."glob-base-0.3.0" - sources."is-dotfile-1.0.2" - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" - sources."binary-extensions-1.8.0" - sources."readable-stream-2.2.3" - sources."set-immediate-shim-1.0.1" - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.33" // { - dependencies = [ - sources."rimraf-2.5.4" - ]; - }) - sources."mkdirp-0.5.1" - sources."nopt-3.0.6" - sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" - ]; - }) - sources."semver-5.3.0" - sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."debug-2.2.0" - sources."readable-stream-2.1.5" - sources."rimraf-2.5.4" - sources."ms-0.7.1" - ]; - }) - sources."minimist-0.0.8" - sources."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" - sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."aproba-1.1.1" - 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."mime-types-2.1.15" + sources."mime-db-1.27.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."wide-align-1.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" + sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."deep-extend-0.4.1" - sources."ini-1.3.4" - sources."strip-json-comments-2.0.1" + 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" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.2" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."encodeurl-1.0.1" + 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.15.3" + sources."serve-static-1.12.3" + sources."utils-merge-1.0.0" + sources."forwarded-0.1.0" + 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" + sources."steno-0.4.4" + sources."basic-auth-1.1.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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."oauth-sign-0.8.2" + sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22910,24 +25024,394 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (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."punycode-1.4.1" + sources."boxen-0.6.0" + (sources."configstore-2.1.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."is-npm-1.0.0" + sources."latest-version-2.0.0" + sources."lazy-req-1.1.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-2.0.0" + sources."ansi-align-1.1.0" + sources."camelcase-2.1.1" + sources."cli-boxes-1.0.0" + sources."filled-array-1.1.0" + sources."repeating-2.0.1" + sources."string-width-1.0.2" + sources."widest-line-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."dot-prop-3.0.0" + sources."mkdirp-0.5.1" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.4" + sources."write-file-atomic-1.3.4" + sources."is-obj-1.0.1" + sources."minimist-0.0.8" + sources."os-homedir-1.0.2" + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + sources."package-json-2.4.0" + sources."got-5.7.1" + sources."registry-auth-token-3.3.1" + sources."registry-url-3.1.0" + sources."semver-5.3.0" + sources."create-error-class-3.0.2" + sources."duplexer2-0.1.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-1.0.0" + sources."parse-json-2.2.0" + sources."pinkie-promise-2.0.1" + sources."read-all-stream-3.1.0" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."pinkie-2.0.4" + sources."core-util-is-1.0.2" + sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."prepend-http-1.0.4" + (sources."rc-1.2.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."deep-extend-0.4.2" + sources."ini-1.3.4" + sources."strip-json-comments-2.0.1" + sources."cliui-3.2.0" + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + sources."which-module-1.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-4.2.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + sources."wrap-ansi-2.1.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + 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.5.0" + sources."is-builtin-module-1.0.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" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Serves JSON files through REST routes."; + homepage = https://github.com/typicode/json-server; + license = "MIT"; + }; + production = true; + }; + js-yaml = nodeEnv.buildNodePackage { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz"; + sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"; + }; + dependencies = [ + sources."argparse-1.0.9" + sources."esprima-4.0.0" + sources."sprintf-js-1.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "YAML 1.2 parser and serializer"; + homepage = https://github.com/nodeca/js-yaml; + license = "MIT"; + }; + production = true; + }; + karma = nodeEnv.buildNodePackage { + name = "karma"; + packageName = "karma"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz"; + sha1 = "6f7a1a406446fa2e187ec95398698f4cee476269"; + }; + dependencies = [ + sources."bluebird-3.5.0" + sources."body-parser-1.17.2" + sources."chokidar-1.7.0" + sources."colors-1.1.2" + (sources."combine-lists-1.0.1" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) + sources."connect-3.6.2" + sources."core-js-2.4.1" + sources."di-0.0.1" + sources."dom-serialize-2.2.1" + (sources."expand-braces-0.1.2" // { + dependencies = [ + sources."braces-0.1.5" + sources."expand-range-0.1.1" + sources."is-number-0.1.1" + sources."repeat-string-0.2.2" + ]; + }) + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."http-proxy-1.16.2" + sources."isbinaryfile-3.0.2" + sources."lodash-3.10.1" + (sources."log4js-0.6.38" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."semver-4.3.6" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + sources."mime-1.3.6" + sources."minimatch-3.0.4" + sources."optimist-0.6.1" + sources."qjobs-1.1.5" + sources."range-parser-1.2.0" + sources."rimraf-2.6.1" + sources."safe-buffer-5.1.1" + (sources."socket.io-1.7.3" // { + dependencies = [ + sources."debug-2.3.3" + sources."object-assign-4.1.0" + sources."ms-0.7.2" + ]; + }) + sources."source-map-0.5.6" + sources."tmp-0.0.31" + sources."useragent-2.2.1" + sources."bytes-2.4.0" + sources."content-type-1.0.2" + sources."debug-2.6.7" + sources."depd-1.1.0" + sources."http-errors-1.6.1" + sources."iconv-lite-0.4.15" + sources."on-finished-2.3.0" + sources."qs-6.4.0" + sources."raw-body-2.2.0" + sources."type-is-1.6.15" + sources."ms-2.0.0" + sources."inherits-2.0.3" + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."media-typer-0.3.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" + sources."anymatch-1.3.0" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + sources."path-is-absolute-1.0.1" + sources."readdirp-2.1.0" + sources."fsevents-1.1.2" + sources."arrify-1.0.1" + sources."micromatch-2.3.11" + 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."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."isarray-1.0.0" + 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."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."binary-extensions-1.8.0" + 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.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.2" + (sources."rc-1.2.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."request-2.81.0" + sources."semver-5.3.0" + sources."tar-2.2.1" + sources."tar-pack-3.4.0" + sources."minimist-0.0.8" + sources."abbrev-1.1.0" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + 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."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."strip-ansi-3.0.1" + 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."ansi-regex-2.1.1" + sources."deep-extend-0.4.2" + sources."ini-1.3.4" + sources."strip-json-comments-2.0.1" + 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" + 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."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + 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."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-1.0.0" + sources."finalhandler-1.0.3" sources."parseurl-1.3.1" sources."utils-merge-1.0.0" sources."encodeurl-1.0.1" @@ -22940,13 +25424,14 @@ in sources."inflight-1.0.6" sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."wordwrap-0.0.3" (sources."engine.io-1.8.3" // { dependencies = [ sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) (sources."has-binary-0.1.7" // { @@ -22957,11 +25442,13 @@ in (sources."socket.io-adapter-0.5.0" // { dependencies = [ sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) (sources."socket.io-client-1.7.3" // { dependencies = [ sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) (sources."socket.io-parser-2.3.1" // { @@ -22991,6 +25478,7 @@ in (sources."engine.io-client-1.8.3" // { dependencies = [ sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) sources."indexof-0.0.1" @@ -23006,7 +25494,6 @@ in sources."better-assert-1.0.2" sources."callsite-1.0.0" sources."json3-3.3.2" - sources."os-tmpdir-1.0.2" sources."lru-cache-2.2.4" ]; buildInputs = globalBuildInputs; @@ -23079,16 +25566,15 @@ in (sources."express-session-1.11.3" // { dependencies = [ sources."uid-safe-2.0.0" - sources."base64-url-1.2.1" ]; }) sources."finalhandler-0.4.0" sources."http-errors-1.3.1" - (sources."method-override-2.3.7" // { + (sources."method-override-2.3.9" // { dependencies = [ - sources."debug-2.3.3" - sources."vary-1.1.0" - sources."ms-0.7.2" + sources."debug-2.6.8" + sources."vary-1.1.1" + sources."ms-2.0.0" ]; }) sources."morgan-1.6.1" @@ -23119,7 +25605,7 @@ in sources."statuses-1.2.1" ]; }) - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."vhost-3.0.2" sources."iconv-lite-0.4.11" sources."on-finished-2.3.0" @@ -23132,18 +25618,18 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.9" - sources."mime-types-2.1.14" + sources."compressible-2.0.10" + sources."mime-types-2.1.15" sources."negotiator-0.5.3" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."ms-0.7.1" - sources."csrf-3.0.4" - sources."base64-url-1.3.3" + sources."csrf-3.0.6" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - sources."uid-safe-2.1.3" + sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" sources."crc-3.3.0" + sources."base64-url-1.2.1" sources."inherits-2.0.3" sources."statuses-1.3.1" sources."readable-stream-1.1.14" @@ -23165,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" ]; @@ -23188,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.3" + sources."readable-stream-2.3.3" sources."xtend-4.0.1" - sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" sources."inherits-2.0.3" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + 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" @@ -23206,6 +25692,7 @@ in sources."through2-0.6.5" sources."readable-stream-1.0.34" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."graceful-fs-4.1.11" @@ -23224,7 +25711,7 @@ in sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."glob-5.0.15" sources."glob-parent-3.1.0" (sources."micromatch-2.3.11" // { @@ -23237,10 +25724,10 @@ in sources."to-absolute-glob-0.1.1" sources."unique-stream-2.2.1" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" @@ -23254,9 +25741,9 @@ in sources."is-extglob-1.0.0" ]; }) - sources."filename-regex-2.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."filename-regex-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" // { dependencies = [ @@ -23265,20 +25752,30 @@ in ]; }) sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + 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.6" + (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."is-buffer-1.1.4" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -23286,14 +25783,14 @@ in sources."is-extglob-1.0.0" ]; }) - sources."is-dotfile-1.0.2" + sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."is-stream-1.1.0" sources."extend-shallow-2.0.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."convert-source-map-1.4.0" + sources."convert-source-map-1.5.0" sources."minimist-0.0.8" sources."is-utf8-0.2.1" sources."first-chunk-stream-1.0.0" @@ -23332,7 +25829,7 @@ in sources."eyes-0.1.8" sources."pkginfo-0.2.3" sources."request-2.9.203" - sources."stack-trace-0.0.9" + sources."stack-trace-0.0.10" ]; buildInputs = globalBuildInputs; meta = { @@ -23344,34 +25841,34 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.2.0"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; - sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; + url = "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz"; + sha1 = "d0ef4d332126dbf18d0d640c9b382dd48be97594"; }; dependencies = [ sources."browser-stdout-1.3.0" sources."commander-2.9.0" - sources."debug-2.2.0" - sources."diff-1.4.0" + sources."debug-2.6.0" + sources."diff-3.2.0" sources."escape-string-regexp-1.0.5" - sources."glob-7.0.5" + sources."glob-7.1.1" sources."growl-1.9.2" sources."json3-3.3.2" sources."lodash.create-3.1.1" sources."mkdirp-0.5.1" sources."supports-color-3.1.2" sources."graceful-readlink-1.0.1" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."lodash._baseassign-3.2.0" sources."lodash._basecreate-3.0.3" @@ -23415,10 +25912,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz"; - sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.2.0.tgz"; + sha1 = "3c0a578ffebc231a14f0c0e9078b8063ff776408"; }; dependencies = [ sources."optparse-1.0.5" @@ -23448,25 +25945,25 @@ in sources."concat-stream-1.6.0" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" - sources."normalize-package-data-2.3.5" - sources."npm-package-arg-4.2.0" + sources."normalize-package-data-2.4.0" + sources."npm-package-arg-4.2.1" sources."once-1.4.0" - sources."request-2.79.0" + sources."request-2.81.0" sources."retry-0.8.0" sources."rimraf-2.6.1" sources."slide-1.1.6" sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + 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-0.10.31" + 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.2.0" + 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" @@ -23476,50 +25973,43 @@ in sources."wrappy-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - 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."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23533,41 +26023,42 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."are-we-there-yet-1.1.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" sources."gauge-2.6.0" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.1" + sources."aproba-1.1.2" sources."has-color-0.1.7" 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.0" + sources."strip-ansi-3.0.1" + 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."ansi-regex-2.1.1" sources."config-chain-1.1.11" sources."ini-1.3.4" sources."nopt-3.0.6" @@ -23578,7 +26069,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" (sources."fs-extra-0.6.4" // { dependencies = [ sources."mkdirp-0.3.5" @@ -23595,61 +26086,62 @@ in meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; + license = "MIT"; }; production = true; }; node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.5.0"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz"; + sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; }; dependencies = [ - sources."fstream-1.0.10" - sources."glob-7.1.1" + sources."fstream-1.0.11" + sources."glob-7.1.2" sources."graceful-fs-4.1.11" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.0.2" + sources."npmlog-4.1.2" sources."osenv-0.1.4" - sources."request-2.79.0" + sources."request-2.81.0" sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.12" + sources."which-1.2.14" sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.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."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + 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-0.10.31" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."aproba-1.1.1" + 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."strip-ansi-3.0.1" - sources."wide-align-1.1.0" + 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" @@ -23658,48 +26150,43 @@ in sources."os-tmpdir-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23713,20 +26200,19 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -23739,36 +26225,30 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "0.12.8"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.8.tgz"; - sha1 = "a59c3dc47cb08d15a2e526be3a1da7d64e5c227f"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.1.tgz"; + sha1 = "e7851eb973f380543c058db564a9812055eac640"; }; dependencies = [ sources."async-0.9.2" sources."biased-opener-0.2.8" - sources."debug-2.6.1" - (sources."express-4.14.1" // { + sources."debug-2.6.8" + (sources."express-4.15.3" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."debug-2.6.7" ]; }) sources."glob-5.0.15" sources."path-is-absolute-1.0.1" - sources."rc-1.1.7" + sources."rc-1.2.1" sources."semver-4.3.6" - (sources."serve-favicon-2.4.0" // { - dependencies = [ - sources."etag-1.8.0" - sources."fresh-0.4.0" - ]; - }) + sources."serve-favicon-2.4.3" sources."strong-data-uri-1.0.4" - sources."v8-debug-0.7.7" - sources."v8-profiler-5.6.5" - sources."which-1.2.12" - sources."ws-1.1.2" + sources."v8-debug-1.0.1" + sources."v8-profiler-5.7.0" + sources."which-1.2.14" + sources."ws-1.1.4" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" sources."minimist-1.2.0" @@ -23805,12 +26285,12 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.17" + sources."big-integer-1.6.23" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.5" + 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" @@ -23819,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.2.0" + 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" @@ -23837,7 +26317,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.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" @@ -23846,7 +26326,7 @@ in sources."is-finite-1.0.2" sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" @@ -23856,145 +26336,138 @@ in sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - (sources."finalhandler-0.5.1" // { + sources."etag-1.8.0" + (sources."finalhandler-1.0.3" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."debug-2.6.7" ]; }) - sources."fresh-0.3.0" + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" - sources."qs-6.2.0" + sources."proxy-addr-1.1.4" + sources."qs-6.4.0" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.3" // { dependencies = [ - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) + sources."debug-2.6.7" ]; }) - sources."serve-static-1.11.2" - sources."type-is-1.6.14" - sources."utils-merge-1.0.0" - sources."vary-1.1.0" - sources."mime-types-2.1.14" - sources."negotiator-0.6.1" - sources."mime-db-1.26.0" + sources."serve-static-1.12.3" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" + sources."type-is-1.6.15" + sources."utils-merge-1.0.0" + sources."vary-1.1.1" + sources."mime-types-2.1.15" + sources."negotiator-0.6.1" + sources."mime-db-1.27.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."mime-1.3.4" sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" + sources."safe-buffer-5.0.1" sources."truncate-1.0.5" - sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.33" // { + sources."nan-2.6.2" + (sources."node-pre-gyp-0.6.36" // { dependencies = [ - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" - sources."glob-7.1.1" - ]; - }) - sources."nopt-3.0.6" - sources."npmlog-4.0.2" - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" + sources."glob-7.1.2" ]; }) + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + sources."request-2.81.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { + (sources."tar-pack-3.4.0" // { dependencies = [ - sources."debug-2.2.0" - sources."once-1.3.3" - sources."readable-stream-2.1.5" - sources."rimraf-2.5.4" - sources."ms-0.7.1" - sources."glob-7.1.1" + sources."rimraf-2.6.1" + sources."glob-7.1.2" ]; }) sources."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + (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-0.10.31" - sources."aproba-1.1.1" + (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" sources."strip-ansi-3.0.1" - sources."wide-align-1.1.0" + sources."wide-align-1.1.2" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.1.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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."oauth-sign-0.8.2" + sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24008,23 +26481,22 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."options-0.0.6" sources."ultron-1.0.2" sources."cliui-3.2.0" @@ -24045,103 +26517,96 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.33"; + version = "0.6.36"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; - sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; + sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; }; dependencies = [ sources."mkdirp-0.5.1" - sources."nopt-3.0.6" - sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."once-1.3.3" - sources."readable-stream-2.1.5" - ]; - }) + sources."tar-pack-3.4.0" sources."minimist-0.0.8" sources."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" sources."inherits-2.0.3" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."aproba-1.1.1" + 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."strip-ansi-3.0.1" - sources."wide-align-1.1.0" + 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."ansi-regex-2.1.1" - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24155,35 +26620,34 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."graceful-fs-4.1.11" - sources."debug-2.2.0" + sources."debug-2.6.8" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" + sources."ms-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -24202,16 +26666,12 @@ in sha1 = "226c562bd2a7b13d3d7518b49ad4828a3623d06c"; }; dependencies = [ - sources."chokidar-1.6.1" - (sources."debug-2.6.1" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) + sources."chokidar-1.7.0" + sources."debug-2.6.8" sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."ps-tree-1.1.0" (sources."touch-1.0.0" // { dependencies = [ @@ -24228,7 +26688,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.1.1" + sources."fsevents-1.1.2" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -24236,127 +26696,129 @@ in sources."braces-1.8.5" sources."expand-brackets-0.1.5" sources."extglob-0.3.2" - sources."filename-regex-2.0.0" + sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-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.0.1" + 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.6" + (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."isarray-1.0.0" + sources."is-buffer-1.1.5" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" - sources."is-dotfile-1.0.2" + sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" - sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" - sources."node-pre-gyp-0.6.33" + sources."nan-2.6.2" + sources."node-pre-gyp-0.6.36" sources."mkdirp-0.5.1" - sources."nopt-3.0.6" - sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" 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."tar-pack-3.4.0" sources."minimist-0.0.8" sources."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.1" + 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."strip-ansi-3.0.1" - sources."wide-align-1.1.0" + 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."ansi-regex-2.1.1" - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24370,28 +26832,27 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" + sources."ms-2.0.0" sources."lodash.assign-3.2.0" sources."lodash.restparam-3.6.1" sources."lodash._baseassign-3.2.0" @@ -24403,17 +26864,18 @@ in sources."lodash._getnative-3.9.1" sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."event-stream-3.3.4" sources."through-2.3.8" sources."duplexer-0.1.1" - sources."from-0.1.3" + sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" sources."split-0.3.3" sources."stream-combiner-0.0.4" + sources."chalk-1.1.3" (sources."configstore-1.4.0" // { dependencies = [ sources."uuid-2.0.3" @@ -24424,11 +26886,12 @@ in sources."repeating-1.1.3" sources."semver-diff-2.1.0" sources."string-length-1.0.1" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" - sources."write-file-atomic-1.3.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" - sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" sources."slide-1.1.6" sources."package-json-1.2.0" @@ -24453,6 +26916,8 @@ in ]; }) sources."stream-shift-1.0.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."is-finite-1.0.2" ]; buildInputs = globalBuildInputs; @@ -24466,90 +26931,85 @@ 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.1" - sources."ms-0.7.2" - ]; - }) + 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.7" - sources."node-red-node-email-0.1.21" - (sources."node-red-node-twitter-0.1.9" // { + sources."node-red-node-feedparser-0.1.8" + sources."node-red-node-email-0.1.23" + (sources."node-red-node-twitter-0.1.11" // { dependencies = [ - sources."request-2.79.0" - sources."form-data-2.1.2" - sources."qs-6.3.1" + sources."request-2.81.0" + sources."caseless-0.12.0" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" + sources."tunnel-agent-0.6.0" ]; }) - sources."node-red-node-rbe-0.1.6" + sources."node-red-node-rbe-0.1.11" 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."type-is-1.6.14" - sources."ms-0.7.1" + sources."qs-6.4.0" + sources."type-is-1.6.15" + 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.14" - sources."mime-db-1.26.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" sources."css-select-1.2.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -24575,44 +27035,40 @@ in sources."boolbase-1.0.0" sources."nth-check-1.0.1" sources."domelementtype-1.3.0" - sources."domhandler-2.3.0" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + sources."domhandler-2.4.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-0.10.31" + 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."vary-1.1.0" - sources."moment-timezone-0.5.11" - sources."moment-2.17.1" + 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.3" + 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.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."graceful-fs-4.1.11" @@ -24625,129 +27081,102 @@ 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.1.0" - sources."help-me-1.0.1" + sources."end-of-stream-1.4.0" + sources."help-me-1.1.0" sources."minimist-1.2.0" - sources."mqtt-packet-5.2.1" + 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" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."callback-stream-1.1.0" - (sources."glob-stream-5.3.5" // { - dependencies = [ - sources."through2-0.6.5" - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - ]; - }) + sources."glob-stream-6.1.0" sources."through2-2.0.3" - sources."extend-3.0.0" - sources."glob-5.0.15" + sources."extend-3.0.1" + sources."glob-7.1.2" sources."glob-parent-3.1.0" - (sources."micromatch-2.3.11" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."ordered-read-streams-0.3.0" - sources."to-absolute-glob-0.1.1" + sources."is-negated-glob-1.0.0" + sources."ordered-read-streams-1.0.1" + sources."pumpify-1.3.5" + sources."remove-trailing-separator-1.0.2" + sources."to-absolute-glob-2.0.1" sources."unique-stream-2.2.1" + sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" sources."is-extglob-2.1.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" // { - dependencies = [ - sources."is-extglob-1.0.0" - ]; - }) - sources."filename-regex-2.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" - sources."object.omit-2.0.1" - (sources."parse-glob-3.0.4" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" - 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.6" - sources."repeat-string-1.6.1" - sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" - sources."for-own-0.1.5" - sources."is-extendable-0.1.1" - sources."for-in-1.0.1" - (sources."glob-base-0.3.0" // { - dependencies = [ - sources."glob-parent-2.0.0" - sources."is-glob-2.0.1" - sources."is-extglob-1.0.0" - ]; - }) - sources."is-dotfile-1.0.2" - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" - sources."is-stream-1.1.0" - sources."extend-shallow-2.0.1" - sources."json-stable-stringify-1.0.1" - sources."through2-filter-2.0.0" - sources."jsonify-0.0.0" - sources."bl-1.2.0" (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" + sources."once-1.3.3" ]; }) sources."stream-shift-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-absolute-0.2.6" + sources."is-extendable-0.1.1" + sources."is-relative-0.2.1" + sources."is-windows-0.2.0" + sources."is-unc-path-0.1.2" + sources."unc-path-regex-0.1.2" + sources."json-stable-stringify-1.0.1" + 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."longest-1.0.1" + 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" // { @@ -24755,12 +27184,15 @@ in sources."sax-0.6.1" sources."readable-stream-1.0.34" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) (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" ]; }) sources."addressparser-0.1.3" @@ -24772,7 +27204,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.5" + sources."async-2.5.0" ]; }) sources."har-validator-2.0.6" @@ -24780,14 +27212,13 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" 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" @@ -24796,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" @@ -24807,8 +27237,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24822,14 +27256,13 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" @@ -24840,6 +27273,7 @@ in dependencies = [ sources."readable-stream-1.1.14" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."libmime-1.2.0" @@ -24866,7 +27300,8 @@ in sources."minimist-0.0.10" ]; }) - (sources."mimelib-0.3.0" // { + sources."wordwrap-0.0.3" + (sources."mimelib-0.3.1" // { dependencies = [ sources."addressparser-1.0.1" ]; @@ -24876,57 +27311,57 @@ in sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" - sources."uuid-3.0.1" + sources."performance-now-0.2.0" + sources."uuid-3.1.0" sources."asynckit-0.4.0" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" sources."bindings-1.2.1" sources."nan-2.5.0" (sources."node-pre-gyp-0.6.32" // { dependencies = [ - sources."request-2.79.0" - sources."form-data-2.1.2" - sources."qs-6.3.1" + sources."request-2.81.0" + sources."caseless-0.12.0" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" + sources."tunnel-agent-0.6.0" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."npmlog-4.0.2" + sources."npmlog-4.1.2" sources."rc-1.1.7" - (sources."rimraf-2.5.4" // { - dependencies = [ - sources."glob-7.1.1" - ]; - }) + 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" ]; }) - sources."are-we-there-yet-1.1.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.1" + 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.0" + 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."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" + sources."buffer-shims-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -24990,9 +27425,9 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.6.1" // { + (sources."debug-2.6.8" // { dependencies = [ - sources."ms-0.7.2" + sources."ms-2.0.0" ]; }) sources."qs-0.5.1" @@ -25000,7 +27435,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.6" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -25029,7 +27464,7 @@ in sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" - sources."mailcomposer-4.0.1" + sources."mailcomposer-4.0.2" sources."simplesmtp-0.3.35" sources."optimist-0.6.1" sources."buildmail-4.0.1" @@ -25065,84 +27500,88 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.3.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz"; - sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28"; + url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz"; + sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17"; }; dependencies = [ sources."JSONStream-1.3.1" - sources."abbrev-1.0.9" - sources."ansi-regex-2.1.1" + sources."abbrev-1.1.0" + sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.1.1" + sources."aproba-1.1.2" sources."archy-1.0.0" - sources."asap-2.0.5" + sources."bluebird-3.5.0" + 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" sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" - sources."fstream-npm-1.2.0" - sources."glob-7.1.1" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fstream-1.0.11" + sources."fstream-npm-1.2.1" + sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.2.0" + 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.9.4" // { - dependencies = [ - sources."glob-6.0.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.1.1" sources."mississippi-1.3.0" sources."mkdirp-0.5.1" - (sources."node-gyp-3.5.0" // { + sources."move-concurrently-1.0.1" + (sources."node-gyp-3.6.2" // { dependencies = [ sources."nopt-3.0.6" ]; }) sources."nopt-4.0.1" - sources."normalize-git-url-3.0.2" - sources."normalize-package-data-2.3.5" + 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-4.2.0" - sources."npm-registry-client-7.4.5" - sources."npm-user-validate-0.1.5" - sources."npmlog-4.0.2" + sources."npm-package-arg-5.1.2" + sources."npm-registry-client-8.4.0" + sources."npm-user-validate-1.0.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.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.4" // { - dependencies = [ - sources."glob-6.0.4" - ]; - }) - sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.3" - sources."realize-package-specifier-3.0.3" - sources."request-2.79.0" + sources."read-package-json-2.0.10" + sources."read-package-tree-5.1.6" + sources."readable-stream-2.3.3" + sources."request-2.81.0" sources."retry-0.10.1" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" + sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -25152,20 +27591,24 @@ in 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" + sources."ssri-4.1.6" + 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."uuid-3.0.1" - sources."validate-npm-package-name-2.2.2" - sources."which-1.2.12" + 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-1.3.1" + sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -25176,22 +27619,89 @@ in sources."lodash.restparam-3.6.1" sources."readdir-scoped-modules-1.0.2" sources."validate-npm-package-license-3.0.1" - sources."jsonparse-1.3.0" + sources."jsonparse-1.3.1" sources."through-2.3.8" + sources."y18n-3.2.1" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.2" sources."proto-list-1.2.4" + sources."asap-2.0.6" sources."fstream-ignore-1.0.5" - sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."minimatch-3.0.4" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" 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" + sources."yallist-2.1.2" sources."concat-stream-1.6.0" (sources."duplexify-3.5.0" // { dependencies = [ @@ -25199,11 +27709,7 @@ in sources."once-1.3.3" ]; }) - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.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" @@ -25216,74 +27722,102 @@ in sources."cyclist-0.2.2" sources."xtend-4.0.1" sources."minimist-0.0.8" + sources."copy-concurrently-1.0.3" + 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.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" - 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.0" - 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.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.3.0" + sources."http-cache-semantics-3.7.3" + 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-3.0.0" + sources."humanize-ms-1.2.1" + sources."ms-2.0.0" + 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" + sources."jju-1.3.0" + sources."socks-1.1.10" + sources."ip-1.1.5" + sources."smart-buffer-1.1.15" + sources."err-code-1.1.2" + sources."genfun-4.0.1" + sources."bl-1.2.1" sources."mute-stream-0.0.7" sources."util-extend-1.0.3" - sources."json-parse-helpfulerror-1.0.3" - sources."jju-1.3.0" - sources."buffer-shims-1.0.0" 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."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.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25297,23 +27831,102 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - sources."builtins-0.0.7" - sources."isexe-1.1.2" + (sources."boxen-1.2.0" // { + dependencies = [ + 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."configstore-3.1.0" + sources."import-lazy-2.1.0" + sources."is-npm-1.0.0" + sources."latest-version-3.1.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-3.0.0" + sources."ansi-align-2.0.0" + sources."cli-boxes-1.0.0" + (sources."term-size-1.2.0" // { + dependencies = [ + sources."execa-0.7.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + ]; + }) + (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."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."crypto-random-string-1.0.0" + sources."package-json-4.0.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."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."lowercase-keys-1.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."prepend-http-1.0.4" + (sources."rc-1.2.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."deep-extend-0.4.2" + 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" @@ -25363,10 +27976,10 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.6" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.79.0" + sources."request-2.81.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" @@ -25374,53 +27987,47 @@ in sources."rimraf-2.6.1" sources."retry-0.6.0" sources."couch-login-0.1.20" - sources."npmlog-4.0.2" + sources."npmlog-4.1.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - 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."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25434,50 +28041,50 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."are-we-there-yet-1.1.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + 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-0.10.31" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."aproba-1.1.1" + 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.0" + sources."strip-ansi-3.0.1" + 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."ansi-regex-2.1.1" (sources."config-chain-1.1.11" // { dependencies = [ sources."ini-1.3.4" @@ -25517,17 +28124,17 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.3"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz"; - sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz"; + sha1 = "9a41006f5186e8a59da7fd2b466fee9e896d865d"; }; dependencies = [ - sources."bluebird-3.4.7" + 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" @@ -25540,11 +28147,46 @@ in sources."semver-4.3.6" ]; }) - sources."require-dir-0.3.1" + sources."require-dir-0.3.2" sources."semver-5.3.0" sources."semver-utils-1.1.1" - sources."spawn-please-0.2.0" - sources."update-notifier-1.0.3" + (sources."snyk-1.36.2" // { + dependencies = [ + sources."update-notifier-0.5.0" + sources."latest-version-1.0.1" + sources."repeating-1.1.3" + sources."package-json-1.2.0" + sources."got-3.3.1" + sources."object-assign-3.0.0" + sources."timed-out-2.0.0" + ]; + }) + sources."spawn-please-0.3.0" + (sources."update-notifier-2.2.0" // { + dependencies = [ + (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" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -25552,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" @@ -25562,18 +28203,18 @@ 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" sources."config-chain-1.1.11" sources."dezalgo-1.0.3" sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" - sources."fstream-npm-1.2.0" - sources."glob-7.1.1" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fstream-1.0.11" + sources."fstream-npm-1.2.1" + sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" @@ -25581,9 +28222,9 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.4" // { + (sources."init-package-json-1.9.6" // { dependencies = [ - sources."glob-6.0.4" + sources."validate-npm-package-name-3.0.0" ]; }) sources."lockfile-1.0.3" @@ -25600,10 +28241,10 @@ in }) sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.8" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.2.0" + sources."npm-package-arg-4.2.1" (sources."npm-registry-client-7.2.1" // { dependencies = [ sources."npmlog-3.1.2" @@ -25612,7 +28253,7 @@ in sources."npm-user-validate-0.1.5" (sources."npmlog-4.0.2" // { dependencies = [ - sources."gauge-2.7.3" + sources."gauge-2.7.4" ]; }) sources."once-1.4.0" @@ -25622,13 +28263,13 @@ 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.4" // { + sources."read-package-json-2.0.10" + sources."read-package-tree-5.1.6" + (sources."readable-stream-2.1.5" // { dependencies = [ - sources."glob-6.0.4" + sources."string_decoder-0.10.31" ]; }) - sources."read-package-tree-5.1.5" - sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" sources."request-2.75.0" sources."retry-0.10.1" @@ -25642,8 +28283,12 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."unpipe-1.0.0" - sources."validate-npm-package-name-2.2.2" - sources."which-1.2.12" + (sources."validate-npm-package-name-2.2.2" // { + dependencies = [ + sources."builtins-0.0.7" + ]; + }) + sources."which-1.2.14" sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" sources."debuglog-1.0.1" @@ -25661,18 +28306,19 @@ in sources."clone-1.0.2" sources."proto-list-1.2.4" sources."fstream-ignore-1.0.5" - sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."minimatch-3.0.4" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" + sources."builtins-1.0.3" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."minimist-0.0.8" sources."path-array-1.0.1" - sources."are-we-there-yet-1.1.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" sources."gauge-2.6.0" sources."set-blocking-2.0.0" @@ -25681,45 +28327,47 @@ in sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" - sources."wide-align-1.1.0" + 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."array-index-1.0.0" - sources."debug-2.6.1" - sources."es6-symbol-3.1.0" - sources."ms-0.7.2" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" + sources."debug-2.6.8" + sources."es6-symbol-3.1.1" + sources."ms-2.0.0" + sources."d-1.0.0" + 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.3" + sources."readable-stream-2.3.3" ]; }) sources."typedarray-0.0.6" - sources."buffer-shims-1.0.0" 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."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" sources."mute-stream-0.0.7" sources."util-extend-1.0.3" + sources."buffer-shims-1.0.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) sources."caseless-0.11.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-2.0.0" sources."har-validator-2.0.6" @@ -25728,10 +28376,10 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.15" + sources."node-uuid-1.4.8" sources."oauth-sign-0.8.2" - sources."qs-6.2.2" + sources."qs-6.2.3" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -25748,8 +28396,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25763,45 +28415,156 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - sources."builtins-0.0.7" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."boxen-0.6.0" - sources."configstore-2.1.0" + sources."ansi-escapes-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."es6-promise-3.3.1" + sources."hasbin-1.2.3" + (sources."inquirer-1.0.3" // { + dependencies = [ + sources."mute-stream-0.0.6" + ]; + }) + 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.2.2" + (sources."snyk-recursive-readdir-2.0.0" // { + dependencies = [ + sources."minimatch-3.0.2" + ]; + }) + sources."snyk-resolve-1.0.0" + (sources."snyk-resolve-deps-1.7.0" // { + dependencies = [ + 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" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."then-fs-2.0.0" + sources."undefsafe-0.0.3" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."uuid-3.1.0" + sources."xdg-basedir-2.0.0" + sources."async-1.5.2" + sources."cli-cursor-1.0.2" + sources."cli-width-2.1.0" + sources."figures-1.7.0" + sources."run-async-2.3.0" + sources."rx-4.1.0" + sources."through-2.3.8" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."is-promise-2.1.0" + (sources."osx-release-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."win-release-1.1.1" + (sources."nconf-0.7.2" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + sources."yargs-3.15.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.4" + 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."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-4.0.0" + sources."sprintf-js-1.0.3" + (sources."clite-0.3.0" // { + dependencies = [ + sources."update-notifier-0.6.3" + sources."yargs-4.8.1" + sources."configstore-2.1.0" + sources."uuid-2.0.3" + sources."cliui-3.2.0" + sources."window-size-0.2.0" + ]; + }) + sources."lru-cache-4.1.1" + sources."lodash.defaults-4.2.0" + sources."lodash.defaultsdeep-4.6.0" + sources."lodash.mergewith-4.6.0" + sources."boxen-0.3.1" sources."is-npm-1.0.0" sources."latest-version-2.0.0" - sources."lazy-req-1.1.0" sources."semver-diff-2.1.0" - sources."xdg-basedir-2.0.0" - sources."ansi-align-1.1.0" - sources."camelcase-2.1.1" - sources."cli-boxes-1.0.0" sources."filled-array-1.1.0" sources."repeating-2.0.1" sources."widest-line-1.0.0" sources."is-finite-1.0.2" sources."dot-prop-3.0.0" - sources."uuid-2.0.3" sources."is-obj-1.0.1" sources."package-json-2.4.0" sources."got-5.7.1" - sources."registry-auth-token-3.1.0" + sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer2-0.1.4" @@ -25816,16 +28579,79 @@ in sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."prepend-http-1.0.4" - (sources."rc-1.1.7" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."which-module-1.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-2.4.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + sources."wrap-ansi-2.1.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + sources."read-pkg-1.1.0" + sources."load-json-file-1.1.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."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."promise-7.3.1" + sources."string-length-1.0.1" + sources."duplexify-3.5.0" + sources."infinity-agent-2.0.3" + sources."nested-error-stacks-1.0.2" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + sources."querystring-0.2.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 = { @@ -25838,24 +28664,23 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; - sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz"; + sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328"; }; dependencies = [ sources."async-0.9.2" sources."babybird-0.0.1" - (sources."body-parser-1.16.1" // { + (sources."body-parser-1.17.2" // { dependencies = [ 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" @@ -25864,12 +28689,10 @@ in sources."diff-1.4.0" sources."domino-1.0.28" sources."entities-1.1.1" - (sources."express-4.14.1" // { + (sources."express-4.15.3" // { dependencies = [ sources."content-type-1.0.2" - sources."debug-2.2.0" - sources."qs-6.2.0" - sources."ms-0.7.1" + sources."finalhandler-1.0.3" ]; }) sources."express-handlebars-3.0.0" @@ -25879,67 +28702,60 @@ in sources."ms-0.7.1" ]; }) - sources."gelf-stream-0.2.4" - sources."js-yaml-3.8.1" + 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.7" + sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" - ]; - }) + sources."request-2.81.0" sources."semver-5.3.0" - (sources."serve-favicon-2.4.0" // { + (sources."serve-favicon-2.4.3" // { dependencies = [ - sources."etag-1.8.0" - sources."fresh-0.4.0" + sources."safe-buffer-5.0.1" ]; }) - (sources."service-runner-2.2.4" // { + (sources."service-runner-2.3.0" // { dependencies = [ - sources."gelf-stream-1.1.1" - sources."yargs-6.6.0" - sources."gelfling-0.3.1" + sources."yargs-7.1.0" sources."camelcase-3.0.0" sources."cliui-3.2.0" ]; }) sources."simplediff-0.1.1" - (sources."yargs-4.8.1" // { + (sources."yargs-5.0.0" // { dependencies = [ sources."cliui-3.2.0" sources."window-size-0.2.0" - sources."yargs-parser-2.4.1" + sources."yargs-parser-3.2.0" 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.1" + sources."debug-2.6.7" sources."depd-1.1.0" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.2.1" + sources."qs-6.4.0" sources."raw-body-2.2.0" - sources."type-is-1.6.14" - sources."ms-0.7.2" + sources."type-is-1.6.15" + 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."media-typer-0.3.0" - sources."mime-types-2.1.14" - sources."mime-db-1.26.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" sources."accepts-1.3.3" - sources."compressible-2.0.9" + sources."compressible-2.0.10" sources."on-headers-1.0.1" - sources."vary-1.1.0" + sources."safe-buffer-5.1.1" + sources."vary-1.1.1" sources."busboy-0.2.14" sources."dicer-0.2.5" sources."readable-stream-1.1.14" @@ -25953,51 +28769,42 @@ in sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."fresh-0.3.0" + sources."etag-1.8.0" + 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.3" + sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { - dependencies = [ - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - ]; - }) - sources."serve-static-1.11.2" + sources."send-0.15.3" + sources."serve-static-1.12.3" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."glob-6.0.4" sources."graceful-fs-4.1.11" - (sources."handlebars-4.0.6" // { + (sources."handlebars-4.0.10" // { dependencies = [ sources."async-1.5.2" ]; }) sources."object.assign-4.0.4" - sources."promise-7.1.1" + sources."promise-7.3.1" sources."inflight-1.0.6" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."optimist-0.6.1" sources."source-map-0.4.4" - (sources."uglify-js-2.7.5" // { + (sources."uglify-js-2.8.29" // { dependencies = [ - sources."async-0.2.10" sources."source-map-0.5.6" sources."yargs-3.10.0" ]; @@ -26018,62 +28825,54 @@ in sources."right-align-0.1.3" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.1.0" + sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."function-bind-1.1.0" sources."object-keys-1.0.11" sources."define-properties-1.1.2" sources."foreach-2.0.5" - sources."gelfling-0.2.0" 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" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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."oauth-sign-0.8.2" + sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.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" - 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."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26087,33 +28886,34 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" - sources."bluebird-3.4.7" - sources."bunyan-1.8.5" + sources."bluebird-3.5.0" + sources."bunyan-1.8.10" sources."bunyan-syslog-udp-0.1.0" - sources."hot-shots-4.3.1" + sources."gelf-stream-1.1.1" + sources."hot-shots-4.5.0" (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."dnscache-1.0.1" - sources."dtrace-provider-0.8.0" + sources."dtrace-provider-0.8.3" sources."mv-2.1.1" - sources."safe-json-stringify-1.0.3" - sources."moment-2.17.1" - sources."nan-2.5.1" + sources."safe-json-stringify-1.0.4" + sources."moment-2.18.1" + sources."nan-2.6.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -26121,39 +28921,47 @@ in }) sources."ncp-2.0.0" sources."rimraf-2.4.5" - sources."kad-git+https://github.com/gwicke/kad.git#master" + sources."gelfling-0.3.1" + (sources."kad-git+https://github.com/gwicke/kad.git#master" // { + dependencies = [ + sources."ms-0.7.3" + ]; + }) sources."clarinet-0.11.0" sources."colors-1.1.2" sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + 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.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) - sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."dom-storage-2.0.2" - (sources."bl-1.2.0" // { + (sources."bl-1.2.1" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."get-caller-file-1.0.2" @@ -26165,27 +28973,31 @@ in sources."string-width-1.0.2" sources."which-module-1.0.0" sources."y18n-3.2.1" - (sources."yargs-parser-4.2.1" // { + (sources."yargs-parser-5.0.0" // { dependencies = [ sources."camelcase-3.0.0" ]; }) + sources."strip-ansi-3.0.1" sources."wrap-ansi-2.1.0" + sources."ansi-regex-2.1.1" sources."lcid-1.0.0" sources."invert-kv-1.0.0" 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."normalize-package-data-2.3.5" + sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.2.0" + 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" @@ -26210,10 +29022,10 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.36.1"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz"; - sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz"; + sha1 = "535019f8dcbae8932bd38b28533bf61c0f979048"; }; dependencies = [ sources."airplayer-2.0.0" @@ -26224,7 +29036,7 @@ in ]; }) sources."keypress-0.2.1" - sources."mime-1.3.4" + sources."mime-1.3.6" sources."network-address-1.1.2" sources."numeral-1.5.6" sources."open-0.0.5" @@ -26233,14 +29045,14 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.1" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."get-stdin-5.0.1" ]; }) sources."pump-1.0.2" sources."range-parser-1.2.0" - sources."rc-1.1.7" + sources."rc-1.2.1" (sources."torrent-stream-1.0.3" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -26252,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" @@ -26264,17 +29076,17 @@ in sources."bplist-parser-0.1.1" sources."concat-stream-1.6.0" sources."plist-1.2.0" - sources."reverse-http-1.2.0" + sources."reverse-http-1.3.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.17" + sources."big-integer-1.6.23" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + 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-0.10.31" + 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" @@ -26303,18 +29115,17 @@ in sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" sources."dns-txt-2.0.2" - sources."multicast-dns-6.1.0" + sources."multicast-dns-6.1.1" sources."multicast-dns-service-types-1.1.0" sources."dns-packet-1.1.1" sources."thunky-0.1.0" - sources."ip-1.1.4" - sources."safe-buffer-5.0.1" + sources."ip-1.1.5" sources."meow-3.7.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."normalize-package-data-2.3.5" + 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" @@ -26323,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.2.0" + 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" @@ -26342,7 +29153,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.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" @@ -26362,7 +29173,7 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."spawn-sync-1.0.15" sources."tmp-0.0.29" sources."os-shim-0.1.3" @@ -26370,27 +29181,23 @@ in sources."is-promise-2.1.0" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.1" - sources."simple-get-2.4.0" + sources."magnet-uri-5.1.7" + 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.5" + sources."rusha-0.8.6" sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) - sources."deep-extend-0.4.1" + sources."end-of-stream-1.4.0" + sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."bitfield-0.1.0" sources."bncode-0.5.3" - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -26404,18 +29211,19 @@ in sources."peer-wire-swarm-0.12.1" sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.0" - (sources."random-access-file-1.5.0" // { + sources."torrent-piece-1.1.1" + (sources."random-access-file-1.8.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) - sources."randombytes-2.0.3" + sources."randombytes-2.0.5" sources."run-parallel-1.1.6" - sources."debug-2.6.1" - sources."ms-0.7.2" + sources."buffer-alloc-unsafe-1.0.0" + sources."debug-2.6.8" + sources."ms-2.0.0" sources."flatten-0.0.1" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -26423,18 +29231,19 @@ in sources."readable-stream-1.1.14" sources."bncode-0.2.3" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."speedometer-0.1.4" sources."utp-0.0.7" sources."cyclist-0.1.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -26456,24 +29265,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.3" + sources."simple-peer-6.4.4" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."ws-2.1.0" + sources."ws-2.3.1" + sources."safe-buffer-5.0.1" ]; }) sources."string2compact-1.2.2" - (sources."ws-1.1.2" // { + (sources."ws-1.1.4" // { dependencies = [ sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.2.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" @@ -26490,17 +29300,16 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.1.3"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz"; - sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.2.0.tgz"; + sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87"; }; dependencies = [ - sources."connect-multiparty-1.2.5" - (sources."express-3.5.3" // { + sources."connect-multiparty-2.0.0" + (sources."express-3.21.2" // { dependencies = [ - sources."range-parser-1.0.0" - sources."mkdirp-0.4.0" + sources."range-parser-1.0.3" ]; }) sources."lodash-2.4.2" @@ -26508,107 +29317,148 @@ in sources."pump-1.0.2" sources."range-parser-1.2.0" sources."read-torrent-1.3.0" - (sources."socket.io-1.7.3" // { + (sources."socket.io-1.7.4" // { dependencies = [ sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) - (sources."torrent-stream-0.18.1" // { + (sources."torrent-stream-1.0.3" // { dependencies = [ sources."end-of-stream-0.1.5" sources."mkdirp-0.3.5" sources."once-1.3.3" ]; }) - sources."fluent-ffmpeg-2.1.0" - sources."multiparty-3.3.2" - sources."on-finished-2.1.1" - sources."qs-2.2.5" - sources."type-is-1.5.7" + sources."fluent-ffmpeg-2.1.2" + sources."multiparty-4.1.3" + sources."on-finished-2.3.0" + sources."qs-4.0.0" + sources."type-is-1.6.15" + sources."fd-slicer-1.0.1" + sources."pend-1.2.0" + sources."ee-first-1.1.1" + sources."media-typer-0.3.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" + sources."basic-auth-1.0.4" + (sources."connect-2.30.2" // { + dependencies = [ + sources."multiparty-3.3.2" + ]; + }) + sources."content-disposition-0.5.0" + sources."content-type-1.0.2" + sources."commander-2.6.0" + sources."cookie-0.1.3" + sources."cookie-signature-1.0.6" + sources."debug-2.2.0" + sources."depd-1.0.1" + sources."escape-html-1.0.2" + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.0" + sources."methods-1.1.2" + sources."parseurl-1.3.1" + sources."proxy-addr-1.0.10" + (sources."send-0.13.0" // { + dependencies = [ + sources."destroy-1.0.3" + sources."range-parser-1.0.3" + sources."statuses-1.2.1" + ]; + }) + sources."utils-merge-1.0.0" + sources."vary-1.0.1" + sources."basic-auth-connect-1.0.0" + sources."body-parser-1.13.3" + sources."bytes-2.1.0" + sources."cookie-parser-1.3.5" + sources."compression-1.5.2" + sources."connect-timeout-1.6.2" + sources."csurf-1.8.3" + (sources."errorhandler-1.4.3" // { + dependencies = [ + sources."accepts-1.3.3" + sources."escape-html-1.0.3" + sources."negotiator-0.6.1" + ]; + }) + (sources."express-session-1.11.3" // { + dependencies = [ + sources."uid-safe-2.0.0" + ]; + }) + sources."finalhandler-0.4.0" + sources."http-errors-1.3.1" + (sources."method-override-2.3.9" // { + dependencies = [ + sources."debug-2.6.8" + sources."vary-1.1.1" + sources."ms-2.0.0" + ]; + }) + sources."morgan-1.6.1" + sources."on-headers-1.0.1" + sources."pause-0.1.0" + (sources."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + (sources."serve-favicon-2.3.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + (sources."serve-index-1.7.3" // { + dependencies = [ + sources."escape-html-1.0.3" + ]; + }) + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."escape-html-1.0.3" + sources."send-0.13.2" + sources."depd-1.1.0" + sources."range-parser-1.0.3" + sources."statuses-1.2.1" + ]; + }) + sources."vhost-3.0.2" + sources."iconv-lite-0.4.11" + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" + ]; + }) + sources."unpipe-1.0.0" + sources."accepts-1.2.13" + sources."compressible-2.0.10" + sources."negotiator-0.5.3" + sources."ms-0.7.1" + sources."csrf-3.0.6" + sources."rndm-1.2.0" + sources."tsscmp-1.0.5" + sources."uid-safe-2.1.4" + sources."random-bytes-1.0.0" + sources."crc-3.3.0" + sources."base64-url-1.2.1" + sources."inherits-2.0.3" + sources."statuses-1.3.1" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.3" - sources."ee-first-1.1.0" - sources."media-typer-0.3.0" - sources."mime-types-2.0.14" - sources."mime-db-1.12.0" - (sources."connect-2.14.5" // { - dependencies = [ - sources."qs-0.6.6" - sources."multiparty-2.2.0" - ]; - }) - sources."commander-1.3.2" - sources."cookie-0.1.2" - sources."buffer-crc32-0.2.1" - sources."fresh-0.2.2" - sources."methods-0.1.0" - (sources."send-0.3.0" // { - dependencies = [ - sources."debug-0.8.0" - sources."range-parser-1.0.3" - ]; - }) - sources."cookie-signature-1.0.3" - sources."merge-descriptors-0.0.2" - sources."debug-0.8.1" - sources."basic-auth-connect-1.0.0" - (sources."cookie-parser-1.0.1" // { - dependencies = [ - sources."cookie-0.1.0" - ]; - }) - (sources."compression-1.0.0" // { - dependencies = [ - sources."bytes-0.2.1" - ]; - }) - sources."connect-timeout-1.0.0" - sources."csurf-1.1.0" - sources."errorhandler-1.0.0" - (sources."express-session-1.0.2" // { - dependencies = [ - sources."cookie-0.1.0" - sources."debug-0.7.4" - ]; - }) - sources."method-override-1.0.0" - (sources."morgan-1.0.0" // { - dependencies = [ - sources."bytes-0.2.1" - ]; - }) - sources."raw-body-1.1.4" - sources."response-time-1.0.0" - sources."setimmediate-1.0.1" - (sources."serve-index-1.0.1" // { - dependencies = [ - sources."negotiator-0.4.2" - ]; - }) - sources."serve-static-1.1.0" - sources."static-favicon-1.0.2" - sources."vhost-1.0.0" - sources."bytes-0.3.0" - sources."pause-0.0.1" - sources."negotiator-0.3.0" - sources."compressible-1.0.0" - sources."uid2-0.0.3" - sources."scmp-0.0.3" - sources."utils-merge-1.0.0" - sources."batch-0.5.0" - sources."parseurl-1.0.1" - sources."keypress-0.1.0" - sources."mime-1.2.11" + sources."batch-0.5.3" + sources."destroy-1.0.4" + sources."mime-1.3.4" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.0.5" sources."minimist-0.0.8" - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."once-1.4.0" sources."wrappy-1.0.2" sources."magnet-uri-2.0.1" @@ -26619,6 +29469,7 @@ in }) (sources."request-2.16.6" // { dependencies = [ + sources."mime-1.2.11" sources."qs-0.5.6" ]; }) @@ -26628,10 +29479,14 @@ in sources."flatten-0.0.1" sources."bencode-0.7.0" sources."simple-sha1-2.1.0" - sources."rusha-0.8.5" - sources."form-data-0.0.10" + sources."rusha-0.8.6" + (sources."form-data-0.0.10" // { + dependencies = [ + sources."mime-1.2.11" + ]; + }) sources."hawk-0.10.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."cookie-jar-0.2.0" sources."aws-sign-0.2.0" sources."oauth-sign-0.2.0" @@ -26645,10 +29500,13 @@ in sources."boom-0.3.8" sources."cryptiles-0.1.3" sources."sntp-0.1.4" - (sources."engine.io-1.8.3" // { + (sources."engine.io-1.8.4" // { dependencies = [ + sources."accepts-1.3.3" sources."debug-2.3.3" sources."cookie-0.3.1" + sources."negotiator-0.6.1" + sources."ms-0.7.2" ]; }) sources."has-binary-0.1.7" @@ -26656,31 +29514,23 @@ in (sources."socket.io-adapter-0.5.0" // { dependencies = [ sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) - (sources."socket.io-client-1.7.3" // { + (sources."socket.io-client-1.7.4" // { dependencies = [ sources."debug-2.3.3" + sources."ms-0.7.2" ]; }) (sources."socket.io-parser-2.3.1" // { dependencies = [ - sources."debug-2.2.0" sources."component-emitter-1.1.2" - sources."ms-0.7.1" - ]; - }) - sources."ms-0.7.2" - (sources."accepts-1.3.3" // { - dependencies = [ - sources."mime-types-2.1.14" - sources."negotiator-0.6.1" - sources."mime-db-1.26.0" ]; }) sources."base64id-1.0.0" sources."engine.io-parser-1.3.2" - sources."ws-1.1.2" + sources."ws-1.1.4" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" @@ -26691,9 +29541,11 @@ in sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - (sources."engine.io-client-1.8.3" // { + (sources."engine.io-client-1.8.4" // { dependencies = [ sources."debug-2.3.3" + sources."ws-1.1.2" + sources."ms-0.7.2" ]; }) sources."indexof-0.0.1" @@ -26710,66 +29562,98 @@ in sources."callsite-1.0.0" sources."json3-3.3.2" sources."bitfield-0.1.0" - (sources."bittorrent-dht-3.2.6" // { - dependencies = [ - sources."debug-2.6.1" - ]; - }) - (sources."bittorrent-tracker-2.12.1" // { - dependencies = [ - sources."bencode-0.6.0" - sources."debug-2.6.1" - ]; - }) sources."bncode-0.5.3" - sources."compact2string-1.4.0" + sources."fs-chunk-store-1.6.5" sources."hat-0.0.3" - sources."ip-0.3.3" - (sources."ip-set-1.0.1" // { - dependencies = [ - sources."ip-1.1.4" - ]; - }) - sources."peer-wire-swarm-0.9.2" - sources."random-access-file-0.3.2" + sources."immediate-chunk-store-1.0.8" + sources."ip-set-1.0.1" + sources."peer-wire-swarm-0.12.1" sources."rimraf-2.6.1" - sources."thunky-0.1.0" - sources."addr-to-ip-port-1.4.2" - sources."buffer-equal-0.0.1" - sources."is-ip-1.0.0" - sources."k-bucket-0.5.0" - sources."network-address-1.1.2" - sources."run-parallel-1.1.6" - sources."simple-get-1.4.3" - sources."string2compact-1.2.2" - sources."ip-regex-1.0.3" - sources."unzip-response-1.0.2" - sources."ipaddr.js-1.2.0" - sources."bn.js-1.3.0" - sources."extend.js-0.0.2" - (sources."portfinder-0.3.0" // { + sources."torrent-discovery-5.4.0" + sources."torrent-piece-1.1.1" + (sources."random-access-file-1.8.1" // { dependencies = [ - sources."mkdirp-0.0.7" + sources."debug-2.6.8" + sources."ms-2.0.0" ]; }) - sources."run-series-1.1.4" + sources."randombytes-2.0.5" + sources."run-parallel-1.1.6" + sources."thunky-1.0.2" + sources."buffer-alloc-unsafe-1.0.0" + sources."safe-buffer-5.1.1" + sources."ip-1.1.5" + sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { dependencies = [ sources."bncode-0.2.3" ]; }) - sources."fifo-0.1.4" sources."speedometer-0.1.4" - sources."glob-7.1.1" + sources."utp-0.0.7" + sources."cyclist-0.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."which-1.2.12" - sources."isexe-1.1.2" + sources."bittorrent-dht-6.4.2" + (sources."bittorrent-tracker-7.7.0" // { + dependencies = [ + sources."bencode-0.8.0" + sources."minimist-1.2.0" + ]; + }) + sources."re-emitter-1.1.3" + sources."buffer-equals-1.0.4" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."k-bucket-2.0.1" + ]; + }) + sources."lru-2.0.1" + sources."buffer-equal-0.0.1" + (sources."k-rpc-socket-1.7.1" // { + dependencies = [ + sources."bencode-1.0.0" + ]; + }) + 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.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + (sources."simple-websocket-4.3.1" // { + dependencies = [ + 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."ultron-1.1.0" + ]; + }) + sources."string2compact-1.2.2" + sources."uniq-1.0.1" + sources."simple-concat-1.0.0" + sources."unzip-response-2.0.1" + sources."get-browser-rtc-1.0.2" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."addr-to-ip-port-1.4.2" + sources."which-1.2.14" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -26795,7 +29679,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.12" + sources."which-1.2.14" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."mkdirp-0.5.0" @@ -26816,26 +29700,26 @@ in sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" sources."rimraf-2.6.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-stream-1.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."bl-1.0.3" sources."caseless-0.11.0" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.15" + sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" sources."tough-cookie-2.2.2" @@ -26848,12 +29732,16 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.5" + sources."async-2.5.0" sources."lodash-4.17.4" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26867,14 +29755,13 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."hoek-2.16.3" @@ -26883,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" @@ -26891,14 +29778,13 @@ 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" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."throttleit-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -26908,6 +29794,22 @@ in }; production = true; }; + prettier = nodeEnv.buildNodePackage { + name = "prettier"; + packageName = "prettier"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.5.2.tgz"; + sha1 = "7ea0751da27b93bfb6cecfcec509994f52d83bb3"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Prettier is an opinionated JavaScript formatter"; + homepage = "https://github.com/prettier/prettier#readme"; + license = "MIT"; + }; + production = true; + }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; packageName = "react-tools"; @@ -26923,29 +29825,28 @@ in sources."source-map-0.1.31" ]; }) - sources."commander-2.9.0" - sources."detective-4.3.2" + sources."commander-2.11.0" + sources."detective-4.5.0" sources."glob-5.0.15" sources."graceful-fs-4.1.11" - sources."iconv-lite-0.4.15" + sources."iconv-lite-0.4.18" sources."mkdirp-0.5.1" sources."private-0.1.7" - sources."q-1.4.1" - sources."recast-0.11.22" - sources."graceful-readlink-1.0.1" - sources."acorn-3.3.0" + sources."q-1.5.0" + sources."recast-0.11.23" + sources."acorn-4.0.13" sources."defined-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-3.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.6" - sources."balanced-match-0.4.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."ast-types-0.9.5" + sources."ast-types-0.9.6" sources."esprima-3.1.3" sources."source-map-0.5.6" sources."base62-0.1.1" @@ -26994,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" // { @@ -27010,7 +29911,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.6.1" + sources."debug-2.6.8" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -27026,13 +29927,13 @@ in sources."inherits-2.0.3" sources."keypress-0.1.0" sources."mime-1.2.11" - sources."ms-0.7.2" + sources."ms-2.0.0" sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" sources."request-2.9.203" (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.79.0" - sources."qs-6.3.1" + sources."request-2.81.0" + sources."qs-6.4.0" ]; }) sources."node-swt-0.1.1" @@ -27041,52 +29942,43 @@ in sources."crc-0.2.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - (sources."har-validator-2.0.6" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.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."graceful-readlink-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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27100,17 +29992,16 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."events.node-0.4.9" ]; @@ -27144,37 +30035,33 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."express-5.0.0-alpha.3" + sources."express-5.0.0-alpha.5" sources."express-json5-0.1.0" - (sources."body-parser-1.16.1" // { + (sources."body-parser-1.17.2" // { dependencies = [ sources."bytes-2.4.0" - sources."debug-2.6.1" - sources."http-errors-1.5.1" + sources."debug-2.6.7" sources."iconv-lite-0.4.15" - sources."qs-6.2.1" sources."raw-body-2.2.0" - sources."ms-0.7.2" + sources."ms-2.0.0" ]; }) - (sources."compression-1.6.2" // { + (sources."compression-1.7.0" // { dependencies = [ - sources."bytes-2.3.0" + 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.1" + sources."commander-2.11.0" + sources."js-yaml-3.9.0" sources."cookies-0.7.0" - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" - ]; - }) + sources."request-2.81.0" sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.5" + sources."bunyan-1.8.10" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -27183,17 +30070,14 @@ in sources."JSONStream-1.3.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.6.1" // { - dependencies = [ - sources."setprototypeof-1.0.3" - ]; - }) + sources."http-errors-1.6.1" (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) - sources."fs-ext-0.5.0" + sources."fs-ext-0.6.0" sources."crypt3-0.2.0" sources."accepts-1.3.3" sources."array-flatten-2.1.1" @@ -27201,99 +30085,98 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."debug-2.2.0" + sources."debug-2.6.1" sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.1" - sources."fresh-0.3.0" + sources."etag-1.8.0" + (sources."finalhandler-1.0.3" // { + dependencies = [ + sources."debug-2.6.7" + sources."ms-2.0.0" + ]; + }) + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" - sources."qs-6.2.0" + sources."proxy-addr-1.1.4" + sources."qs-6.4.0" sources."range-parser-1.2.0" - sources."router-1.1.5" - (sources."send-0.14.2" // { + (sources."router-1.3.1" // { dependencies = [ - sources."http-errors-1.5.1" - sources."ms-0.7.2" + sources."debug-2.6.8" + sources."ms-2.0.0" ]; }) - sources."serve-static-1.11.2" - sources."type-is-1.6.14" - sources."utils-merge-1.0.0" - sources."vary-1.1.0" - sources."mime-types-2.1.14" - sources."negotiator-0.6.1" - sources."mime-db-1.26.0" - sources."ms-0.7.1" + sources."send-0.15.1" + sources."serve-static-1.12.1" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" + sources."type-is-1.6.15" + sources."utils-merge-1.0.0" + 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.2" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" - sources."setprototypeof-1.0.2" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" sources."iconv-lite-0.4.8" - sources."compressible-2.0.9" + 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" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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."oauth-sign-0.8.2" + sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.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."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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27307,36 +30190,36 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."dtrace-provider-0.8.0" + sources."dtrace-provider-0.8.3" sources."mv-2.1.1" - sources."safe-json-stringify-1.0.3" - sources."moment-2.17.1" - sources."nan-2.5.1" + sources."safe-json-stringify-1.0.4" + sources."moment-2.18.1" + sources."nan-2.6.2" sources."ncp-2.0.0" sources."rimraf-2.4.5" (sources."glob-6.0.4" // { dependencies = [ - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" ]; }) sources."inflight-1.0.6" + sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."optimist-0.3.7" (sources."uglify-js-2.3.6" // { @@ -27355,25 +30238,25 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" ]; }) sources."regexp-quote-0.0.0" + sources."xtend-4.0.1" sources."domelementtype-1.3.0" - sources."domhandler-2.3.0" - sources."domutils-1.5.1" + sources."domhandler-2.4.1" + sources."domutils-1.6.2" (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" ]; }) - sources."buffer-shims-1.0.0" 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."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."jsonparse-1.3.0" + sources."jsonparse-1.3.1" sources."through-2.3.8" sources."minimist-0.0.8" ]; @@ -27405,18 +30288,18 @@ in sources."colors-1.0.3" sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" - sources."minimatch-3.0.3" - sources."readable-stream-2.2.3" + sources."minimatch-3.0.4" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" sources."inherits-2.0.3" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -27491,15 +30374,15 @@ in sources."formidable-1.1.1" sources."http-signature-0.11.0" sources."keep-alive-agent-0.0.1" - sources."mime-1.3.4" + sources."mime-1.3.6" sources."negotiator-0.5.3" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."once-1.4.0" sources."qs-3.1.0" sources."semver-4.3.6" sources."spdy-1.32.5" sources."tunnel-agent-0.4.3" - (sources."verror-1.9.0" // { + (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27515,9 +30398,9 @@ in sources."wrappy-1.0.2" sources."extsprintf-1.2.0" sources."core-util-is-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."mv-2.1.1" - sources."safe-json-stringify-1.0.3" + sources."safe-json-stringify-1.0.4" sources."mkdirp-0.5.1" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -27525,10 +30408,10 @@ in sources."glob-6.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."sshpk-agent-1.2.1" (sources."sshpk-1.7.1" // { @@ -27542,18 +30425,19 @@ in }) ]; }) - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."verror-1.3.6" ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + 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" @@ -27578,21 +30462,21 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.6.1" + sources."debug-2.6.8" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" sources."minimist-0.0.8" - sources."ms-0.7.2" + 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.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.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."amdefine-1.0.1" ]; @@ -27613,19 +30497,19 @@ in sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ - sources."sax-1.2.2" - sources."coa-1.0.1" + 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" sources."mkdirp-0.5.1" - sources."csso-2.3.1" - sources."q-1.4.1" + sources."csso-2.3.2" + sources."q-1.5.0" sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."minimist-0.0.8" - sources."clap-1.1.2" + sources."clap-1.2.0" sources."source-map-0.5.6" sources."chalk-1.1.3" sources."ansi-styles-2.2.1" @@ -27652,32 +30536,32 @@ in sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7"; }; dependencies = [ - sources."acorn-4.0.11" + sources."acorn-4.0.13" sources."enhanced-resolve-2.3.0" - sources."glob-7.1.1" - sources."minimatch-3.0.3" + sources."glob-7.1.2" + sources."minimatch-3.0.4" sources."resolve-from-2.0.0" sources."tapable-0.2.6" sources."memory-fs-0.3.0" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."prr-0.0.0" - sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" sources."inherits-2.0.3" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + 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" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; buildInputs = globalBuildInputs; @@ -27688,186 +30572,13 @@ in }; production = true; }; - titanium = nodeEnv.buildNodePackage { - name = "titanium"; - packageName = "titanium"; - version = "5.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz"; - sha1 = "dd0f7132475a5db6ea188222876d28538b47df27"; - }; - dependencies = [ - sources."async-2.1.2" - sources."colors-1.1.2" - (sources."fields-0.1.24" // { - dependencies = [ - sources."colors-0.6.2" - ]; - }) - sources."humanize-0.0.9" - sources."longjohn-0.2.11" - sources."moment-2.16.0" - (sources."node-appc-0.2.39" // { - dependencies = [ - sources."async-1.5.2" - sources."request-2.69.0" - sources."semver-5.1.0" - sources."wrench-1.5.8" - ]; - }) - (sources."request-2.78.0" // { - dependencies = [ - sources."form-data-2.1.2" - sources."qs-6.3.1" - sources."tough-cookie-2.3.2" - ]; - }) - sources."semver-5.3.0" - sources."sprintf-0.1.5" - sources."temp-0.8.3" - (sources."winston-1.1.2" // { - dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" - ]; - }) - sources."wrench-1.5.9" - sources."lodash-4.17.4" - sources."keypress-0.2.1" - sources."source-map-support-0.3.2" - sources."source-map-0.1.32" - sources."amdefine-1.0.1" - sources."adm-zip-0.4.7" - sources."diff-2.2.1" - sources."node-uuid-1.4.7" - sources."optimist-0.6.1" - (sources."uglify-js-2.6.1" // { - dependencies = [ - sources."async-0.2.10" - sources."source-map-0.5.6" - ]; - }) - sources."xmldom-0.1.22" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."bl-1.0.3" - sources."caseless-0.11.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - sources."form-data-1.0.1" - 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.14" - sources."oauth-sign-0.8.2" - sources."qs-6.0.3" - sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" - sources."tunnel-agent-0.4.3" - sources."readable-stream-2.0.6" - 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-0.10.31" - sources."util-deprecate-1.0.2" - 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" - 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."graceful-readlink-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."pinkie-2.0.4" - 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.3.1" - (sources."sshpk-1.10.2" // { - 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.6" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" - sources."uglify-to-browserify-1.0.2" - sources."yargs-3.10.0" - sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - sources."center-align-0.1.3" - sources."right-align-0.1.3" - sources."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.1.0" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" - sources."asynckit-0.4.0" - sources."punycode-1.4.1" - sources."os-tmpdir-1.0.2" - sources."rimraf-2.2.8" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."pkginfo-0.3.1" - sources."stack-trace-0.0.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Appcelerator Titanium Command line"; - homepage = "https://github.com/appcelerator/titanium#readme"; - license = "Apache-2.0"; - }; - production = true; - }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.2.1"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz"; - sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz"; + sha1 = "c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"; }; buildInputs = globalBuildInputs; meta = { @@ -27880,29 +30591,15 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "3.0.24"; 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.24.tgz"; + sha1 = "ee93400ad9857fb7a1671778db83f6a23f033121"; }; dependencies = [ - sources."async-0.2.10" + 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.1.0" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."graceful-readlink-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -27915,49 +30612,67 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.8"; + version = "1.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz"; - sha1 = "1519b78475ef5162ef3342c2046889b396add651"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.23.tgz"; + sha1 = "8067752f07877ef4311833146d58f7badf2f9f4a"; }; dependencies = [ - sources."async-2.1.5" - sources."bluebird-3.4.7" - sources."blueimp-md5-2.6.0" - sources."body-parser-1.15.2" + sources."async-2.4.1" + sources."bluebird-3.5.0" + sources."blueimp-md5-2.7.0" + sources."body-parser-1.17.2" sources."color-1.0.3" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" - sources."diff2html-2.0.12" - sources."express-4.14.1" - sources."express-session-1.14.2" + sources."diff2html-2.3.0" + sources."express-4.15.3" + sources."express-session-1.15.3" sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.4" - sources."keen.io-0.1.3" - sources."knockout-3.4.1" + sources."ignore-3.2.7" + sources."just-detect-adblock-1.0.0" + (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" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."moment-2.17.1" + sources."moment-2.18.1" sources."node-cache-4.1.1" - (sources."npm-4.1.2" // { + (sources."npm-4.6.1" // { dependencies = [ - sources."abbrev-1.0.9" sources."nopt-4.0.1" - sources."request-2.79.0" + 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.2" + sources."form-data-2.1.4" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" @@ -27965,17 +30680,17 @@ in sources."sntp-1.0.9" ]; }) - (sources."npm-registry-client-7.4.5" // { + (sources."npm-registry-client-8.3.0" // { dependencies = [ - sources."request-2.79.0" + 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.2" + sources."form-data-2.1.4" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" @@ -27988,40 +30703,42 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.1.2" // { + (sources."raven-1.2.1" // { dependencies = [ sources."json-stringify-safe-5.0.1" sources."uuid-3.0.0" + sources."stack-trace-0.0.9" ]; }) - (sources."rc-1.1.7" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" - sources."serve-static-1.11.2" + sources."serve-static-1.12.3" sources."signals-1.0.0" - sources."snapsvg-0.4.0" - (sources."socket.io-1.7.3" // { + sources."snapsvg-0.5.1" + (sources."socket.io-1.7.4" // { dependencies = [ sources."debug-2.3.3" sources."object-assign-4.1.0" 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."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" // { @@ -28035,40 +30752,47 @@ in sources."colors-1.0.3" ]; }) - sources."yargs-6.6.0" + (sources."yargs-8.0.2" // { + 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."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."raw-body-2.1.7" - sources."type-is-1.6.14" - sources."ms-0.7.1" + sources."qs-6.4.0" + sources."raw-body-2.2.0" + sources."type-is-1.6.15" + 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."media-typer-0.3.0" - sources."mime-types-2.1.14" - sources."mime-db-1.26.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" sources."color-convert-1.9.0" - sources."color-string-1.5.0" - sources."color-name-1.1.1" + sources."color-string-1.5.2" + sources."color-name-1.1.2" sources."simple-swizzle-0.2.2" 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" ]; }) - sources."whatwg-fetch-2.0.2" + sources."whatwg-fetch-2.0.3" sources."nopt-1.0.10" sources."abbrev-1.1.0" sources."accepts-1.3.3" @@ -28076,31 +30800,26 @@ in 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.1" - 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.3" + sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) + sources."send-0.15.3" sources."utils-merge-1.0.0" - sources."vary-1.1.0" + sources."vary-1.1.1" sources."negotiator-0.6.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."crc-3.4.1" + sources."crc-3.4.4" sources."on-headers-1.0.1" - sources."uid-safe-2.1.3" - sources."base64-url-1.3.3" + sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" (sources."broadway-0.2.10" // { dependencies = [ @@ -28141,7 +30860,7 @@ in sources."eyes-0.1.8" sources."cycle-1.0.3" sources."request-2.9.203" - sources."stack-trace-0.0.9" + sources."stack-trace-0.0.10" sources."ini-1.3.4" sources."optimist-0.6.0" sources."wordwrap-0.0.3" @@ -28153,7 +30872,7 @@ in ]; }) sources."hawk-0.10.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."cookie-jar-0.2.0" sources."aws-sign-0.2.0" sources."oauth-sign-0.2.0" @@ -28180,57 +30899,71 @@ in sources."editions-1.3.3" sources."typechecker-4.4.1" sources."underscore-1.5.2" - sources."clone-2.1.0" + 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" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.0.4" + 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" sources."columnify-1.5.4" sources."config-chain-1.1.11" sources."dezalgo-1.0.3" sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" - sources."fstream-npm-1.2.0" - (sources."glob-7.1.1" // { + sources."fs-vacuum-1.2.10" + (sources."fs-write-stream-atomic-1.0.10" // { dependencies = [ - sources."minimatch-3.0.3" + 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" // { + dependencies = [ + sources."minimatch-3.0.4" ]; }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" - (sources."init-package-json-1.9.4" // { - dependencies = [ - sources."glob-6.0.4" - sources."minimatch-3.0.3" - ]; - }) + sources."init-package-json-1.10.1" + sources."lazy-property-1.0.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."mississippi-1.2.0" - (sources."node-gyp-3.5.0" // { + sources."mississippi-1.3.0" + sources."move-concurrently-1.0.1" + (sources."node-gyp-3.6.2" // { dependencies = [ - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."nopt-3.0.6" ]; }) sources."normalize-git-url-3.0.2" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.8" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.2.0" + sources."npm-package-arg-4.2.1" sources."npm-user-validate-0.1.5" sources."npmlog-4.0.2" sources."once-1.4.0" @@ -28240,24 +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.4" // { - dependencies = [ - sources."glob-6.0.4" - sources."minimatch-3.0.3" - ]; - }) - sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.3" + sources."read-package-json-2.0.10" + sources."read-package-tree-5.1.6" 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."strip-ansi-3.0.1" @@ -28266,12 +30998,12 @@ in sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unique-filename-1.1.0" + sources."update-notifier-2.1.0" sources."uuid-3.0.1" - sources."validate-npm-package-name-2.2.2" - sources."which-1.2.12" + sources."validate-npm-package-name-3.0.0" + sources."which-1.2.14" sources."wrappy-1.0.2" - sources."write-file-atomic-1.3.1" - sources."ansi-regex-2.1.1" + sources."write-file-atomic-1.3.4" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -28282,7 +31014,7 @@ in sources."lodash.restparam-3.6.1" sources."readdir-scoped-modules-1.0.2" sources."validate-npm-package-license-3.0.1" - sources."jsonparse-1.3.0" + sources."jsonparse-1.3.1" sources."through-2.3.8" sources."wcwidth-1.0.1" (sources."defaults-1.0.3" // { @@ -28291,51 +31023,93 @@ 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.3" + sources."minimatch-3.0.4" ]; }) - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" 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.1.0" // { + sources."end-of-stream-1.4.0" + (sources."flush-write-stream-1.0.2" // { dependencies = [ - sources."once-1.3.3" + 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."flush-write-stream-1.0.2" - sources."from2-2.3.0" 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" sources."xtend-4.0.1" + sources."copy-concurrently-1.0.3" + 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.2" + (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.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" 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.0" + 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" @@ -28344,40 +31118,29 @@ in sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" sources."jju-1.3.0" - sources."buffer-shims-1.0.0" - 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."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" - sources."extend-3.0.0" - sources."har-validator-2.0.6" + sources."caseless-0.12.0" + sources."har-validator-4.2.1" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" + sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."asynckit-0.4.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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28391,63 +31154,144 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" - sources."stream-iterate-1.2.0" + (sources."stream-iterate-1.2.0" // { + dependencies = [ + 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."builtins-0.0.7" - sources."isexe-1.1.2" + (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."configstore-3.1.0" // { + dependencies = [ + sources."write-file-atomic-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" // { + 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."camelcase-4.1.0" + sources."cli-boxes-1.0.0" + sources."term-size-1.2.0" + sources."widest-line-1.0.0" + 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-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."shebang-regex-1.0.0" + sources."path-key-2.0.1" + sources."has-ansi-2.0.0" + 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."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."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."lowercase-keys-1.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."prepend-http-1.0.4" + sources."builtins-1.0.3" + sources."isexe-2.0.0" 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" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" - sources."eve-0.4.2" - (sources."engine.io-1.8.3" // { + sources."eve-0.5.4" + (sources."engine.io-1.8.4" // { dependencies = [ sources."debug-2.3.3" 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" sources."ms-0.7.2" ]; }) - (sources."socket.io-client-1.7.3" // { + (sources."socket.io-client-1.7.4" // { dependencies = [ + sources."component-emitter-1.2.1" sources."debug-2.3.3" sources."ms-0.7.2" ]; }) (sources."socket.io-parser-2.3.1" // { dependencies = [ - sources."component-emitter-1.1.2" - sources."isarray-0.0.1" + sources."debug-2.2.0" + sources."ms-0.7.1" ]; }) sources."base64id-1.0.0" sources."engine.io-parser-1.3.2" - sources."ws-1.1.2" + sources."ws-1.1.4" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" @@ -28457,10 +31301,11 @@ 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.3" // { + (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" ]; }) @@ -28477,37 +31322,45 @@ 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."camelcase-3.0.0" sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" - sources."os-locale-1.4.0" - sources."read-pkg-up-1.0.1" + (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."lru-cache-4.1.1" + ]; + }) + sources."read-pkg-up-2.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."which-module-1.0.0" + sources."which-module-2.0.0" sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" + sources."yargs-parser-7.0.0" sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."invert-kv-1.0.0" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."load-json-file-1.1.0" - sources."path-type-1.1.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-2.0.0" - (sources."error-ex-1.3.0" // { + sources."strip-bom-3.0.0" + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; }) - sources."is-utf8-0.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -28561,7 +31414,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.12" + sources."which-1.2.14" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."yauzl-2.4.1" @@ -28580,24 +31433,24 @@ in sources."klaw-1.3.1" sources."path-is-absolute-1.0.1" sources."rimraf-2.6.1" - sources."glob-7.1.1" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."minimatch-3.0.4" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-stream-1.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."bl-1.0.3" sources."caseless-0.11.0" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.15" + sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" sources."tough-cookie-2.2.2" @@ -28610,12 +31463,16 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.5" + sources."async-2.5.0" sources."lodash-4.17.4" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28629,14 +31486,13 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."hoek-2.16.3" @@ -28645,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" @@ -28653,14 +31509,13 @@ 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" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."throttleit-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."os-tmpdir-1.0.2" sources."underscore-1.8.3" ]; @@ -28675,36 +31530,41 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.2.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz"; - sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.2.0.tgz"; + sha1 = "8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"; }; dependencies = [ - sources."acorn-4.0.11" - sources."acorn-dynamic-import-2.0.1" - sources."ajv-4.11.3" - sources."ajv-keywords-1.5.1" - sources."async-2.1.5" - sources."enhanced-resolve-3.1.0" - sources."interpret-1.0.1" + sources."acorn-5.1.1" + (sources."acorn-dynamic-import-2.0.2" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + 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" + (sources."node-libs-browser-2.0.0" // { + dependencies = [ + sources."string_decoder-0.10.31" + ]; + }) sources."source-map-0.5.6" sources."supports-color-3.2.3" sources."tapable-0.2.6" - (sources."uglify-js-2.7.5" // { - dependencies = [ - sources."async-0.2.10" - sources."yargs-3.10.0" - ]; - }) + sources."uglifyjs-webpack-plugin-0.4.6" sources."watchpack-1.3.1" - sources."webpack-sources-0.1.4" + sources."webpack-sources-1.0.1" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" @@ -28712,23 +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."json5-0.5.1" sources."errno-0.1.4" - sources."readable-stream-2.2.3" + sources."readable-stream-2.3.3" sources."prr-0.0.0" - sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" sources."inherits-2.0.3" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + 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" @@ -28736,17 +31607,17 @@ 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" sources."os-browserify-0.2.1" sources."path-browserify-0.0.0" - sources."process-0.11.9" + sources."process-0.11.10" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.2" sources."timers-browserify-2.0.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -28761,36 +31632,37 @@ 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" - sources."browserify-sign-4.0.0" + sources."browserify-sign-4.0.4" sources."create-ecdh-4.0.0" - sources."create-hash-1.1.2" - sources."create-hmac-1.1.4" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.9" + sources."pbkdf2-3.0.12" sources."public-encrypt-4.0.0" - sources."randombytes-2.0.3" + 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.0.0" + sources."parse-asn1-5.1.0" sources."brorand-1.1.0" - sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + 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-1.0.1" + sources."ripemd160-2.0.1" sources."sha.js-2.4.8" + sources."hash-base-2.0.2" sources."miller-rabin-4.0.0" sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" @@ -28799,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" @@ -28809,11 +31686,11 @@ in sources."wordwrap-0.0.2" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" - sources."kind-of-3.1.0" + sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" - sources."chokidar-1.6.1" + sources."is-buffer-1.1.5" + sources."chokidar-1.7.0" sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -28821,7 +31698,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.1.1" + sources."fsevents-1.1.2" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -28829,118 +31706,119 @@ in sources."braces-1.8.5" sources."expand-brackets-0.1.5" sources."extglob-0.3.2" - sources."filename-regex-2.0.0" + sources."filename-regex-2.0.1" sources."is-extglob-1.0.0" - sources."normalize-path-2.0.1" + 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.0.1" + 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.6" + (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."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.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" - sources."is-dotfile-1.0.2" + sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."nan-2.5.1" - sources."node-pre-gyp-0.6.33" - sources."nopt-3.0.6" - sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + sources."nan-2.6.2" + sources."node-pre-gyp-0.6.36" + sources."nopt-4.0.1" + sources."npmlog-4.1.2" + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."once-1.3.3" - sources."readable-stream-2.1.5" - ]; - }) + sources."tar-pack-3.4.0" sources."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.3" + sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.1.1" + sources."aproba-1.1.2" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" - sources."wide-align-1.1.0" + 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."ansi-regex-2.1.1" - sources."deep-extend-0.4.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + (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" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - 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" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."har-schema-1.0.5" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28954,29 +31832,28 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" - sources."glob-7.1.1" + sources."mime-db-1.27.0" + sources."glob-7.1.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" - sources."debug-2.2.0" + sources."fstream-1.0.11" + sources."debug-2.6.8" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" - sources."source-list-map-0.1.8" + sources."ms-2.0.0" + 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" @@ -28995,16 +31872,18 @@ in 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."normalize-package-data-2.3.5" + sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.2.0" + 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" @@ -29039,49 +31918,56 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.20.4"; + version = "0.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz"; - sha1 = "575190fee60a27a54d4125a0f7579fc702f01229"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.27.5.tgz"; + sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1"; }; dependencies = [ sources."babel-runtime-6.23.0" - sources."bytes-2.4.0" - sources."camelcase-3.0.0" + sources."bytes-2.5.0" + 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.1" - sources."defaults-1.0.3" + sources."debug-2.6.8" sources."detect-indent-5.0.0" - sources."diff-2.2.3" + sources."glob-7.1.2" + sources."gunzip-maybe-1.4.1" sources."ini-1.3.4" - sources."inquirer-3.0.5" + (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.3" + sources."micromatch-2.3.11" sources."mkdirp-0.5.1" - sources."node-emoji-1.5.1" - sources."node-gyp-3.5.0" + sources."node-emoji-1.7.0" sources."object-path-0.11.4" - sources."proper-lockfile-2.0.0" + sources."proper-lockfile-2.0.1" sources."read-1.0.7" - sources."request-2.79.0" - sources."request-capture-har-1.1.4" + sources."request-2.81.0" + sources."request-capture-har-1.2.2" sources."rimraf-2.6.1" - sources."roadrunner-1.1.0" sources."semver-5.3.0" sources."strip-bom-3.0.0" - sources."tar-2.2.1" - sources."tar-stream-1.5.2" - sources."user-home-2.0.0" + sources."tar-fs-1.15.3" + sources."tar-stream-1.5.4" + sources."uuid-3.1.0" + sources."v8-compile-cache-1.1.0" sources."validate-npm-package-license-3.0.1" sources."core-js-2.4.1" - sources."regenerator-runtime-0.10.3" + sources."regenerator-runtime-0.10.5" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -29089,120 +31975,164 @@ 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-0.7.2" - sources."clone-1.0.2" - sources."ansi-escapes-1.4.0" + 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" + sources."peek-stream-1.1.2" + sources."pumpify-1.3.5" + sources."through2-2.0.3" + sources."pako-0.2.9" + sources."duplexify-3.5.0" + (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."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + 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" + ]; + }) + sources."xtend-4.0.1" + sources."ansi-escapes-2.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" - sources."external-editor-2.0.1" + sources."external-editor-2.0.4" sources."figures-2.0.0" sources."lodash-4.17.4" sources."mute-stream-0.0.7" sources."run-async-2.3.0" - sources."rx-4.1.0" - sources."string-width-2.0.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."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.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."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.6" - sources."balanced-match-0.4.2" - 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."fstream-1.0.10" - sources."glob-7.1.1" - sources."nopt-3.0.6" - sources."npmlog-4.0.2" - sources."osenv-0.1.4" - sources."which-1.2.12" - sources."inherits-2.0.3" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."abbrev-1.1.0" - sources."are-we-there-yet-1.1.2" - sources."console-control-strings-1.1.0" - (sources."gauge-2.7.3" // { - dependencies = [ - sources."string-width-1.0.2" - sources."is-fullwidth-code-point-1.0.0" - ]; - }) - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."readable-stream-2.2.3" - sources."buffer-shims-1.0.0" - 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."aproba-1.1.1" - sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" - (sources."wide-align-1.1.0" // { - dependencies = [ - sources."string-width-1.0.2" - sources."is-fullwidth-code-point-1.0.0" - ]; - }) - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" - sources."os-homedir-1.0.2" - sources."isexe-1.1.2" sources."retry-0.10.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.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."pinkie-2.0.4" + sources."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29216,32 +32146,26 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" - sources."block-stream-0.0.9" - sources."bl-1.2.0" - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."chownr-1.0.1" + sources."bl-1.2.1" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" ]; buildInputs = globalBuildInputs; meta = { - description = "

\"Yarn\"

"; + description = "📦🐈 Fast, reliable, and secure dependency management."; homepage = "https://github.com/yarnpkg/yarn#readme"; license = "BSD-2-Clause"; }; @@ -29250,214 +32174,274 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "1.8.5"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz"; - sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928"; + url = "https://registry.npmjs.org/yo/-/yo-2.0.0.tgz"; + sha1 = "0cd75211379ed87105f99510885759062147b517"; }; dependencies = [ - sources."async-1.5.2" + sources."async-2.5.0" sources."chalk-1.1.3" - sources."cli-list-0.1.8" - sources."configstore-1.4.0" - sources."cross-spawn-3.0.1" - sources."figures-1.7.0" - sources."fullname-2.1.0" - sources."got-5.7.1" + sources."cli-list-0.2.0" + sources."configstore-3.1.0" + sources."cross-spawn-5.1.0" + sources."figures-2.0.0" + sources."fullname-3.3.0" + sources."got-6.7.1" sources."humanize-string-1.0.1" - sources."inquirer-0.11.4" - (sources."insight-0.7.0" // { + (sources."inquirer-3.2.0" // { dependencies = [ - sources."inquirer-0.10.1" + 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."lodash-3.10.1" + (sources."insight-0.8.4" // { + dependencies = [ + sources."async-1.5.2" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."inquirer-0.10.1" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."figures-1.7.0" + sources."lodash-3.10.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" + ]; + }) + sources."lodash-4.17.4" (sources."meow-3.7.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."read-pkg-up-1.0.1" ]; }) - sources."npm-keyword-4.2.0" - sources."opn-3.0.3" + (sources."npm-keyword-4.2.0" // { + dependencies = [ + sources."got-5.7.1" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" + ]; + }) + sources."opn-4.0.2" (sources."package-json-2.4.0" // { dependencies = [ - sources."semver-5.3.0" + sources."got-5.7.1" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" ]; }) sources."parse-help-0.1.1" - sources."read-pkg-up-1.0.1" - sources."repeating-2.0.1" + (sources."read-pkg-up-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."strip-bom-3.0.0" + ]; + }) sources."root-check-1.0.0" - sources."sort-on-1.3.0" + sources."sort-on-2.0.0" sources."string-length-1.0.1" (sources."tabtab-1.3.2" // { dependencies = [ sources."inquirer-1.2.3" - sources."minimist-1.2.0" - sources."cli-width-2.1.0" - sources."lodash-4.17.4" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."external-editor-1.1.1" + sources."figures-1.7.0" sources."mute-stream-0.0.6" - sources."run-async-2.3.0" + sources."string-width-1.0.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" + sources."tmp-0.0.29" + sources."is-fullwidth-code-point-1.0.0" ]; }) sources."titleize-1.0.0" - (sources."update-notifier-0.6.3" // { - dependencies = [ - sources."configstore-2.1.0" - sources."dot-prop-3.0.0" - ]; - }) + sources."update-notifier-2.2.0" sources."user-home-2.0.0" (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" // { + sources."yeoman-doctor-2.1.0" + sources."yeoman-environment-2.0.0" + (sources."yosay-2.0.0" // { dependencies = [ - sources."semver-5.3.0" + sources."ansi-styles-3.1.0" ]; }) - (sources."yeoman-environment-1.6.6" // { - dependencies = [ - sources."inquirer-1.2.3" - sources."lodash-4.17.4" - sources."cli-width-2.1.0" - sources."mute-stream-0.0.6" - sources."run-async-2.3.0" - ]; - }) - sources."yosay-1.2.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."dot-prop-4.1.1" sources."graceful-fs-4.1.11" - sources."mkdirp-0.5.1" - sources."object-assign-4.1.1" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" - sources."uuid-2.0.3" - sources."write-file-atomic-1.3.1" - sources."xdg-basedir-2.0.0" - sources."minimist-0.0.8" - sources."os-homedir-1.0.2" + sources."make-dir-1.0.0" + sources."unique-string-1.0.0" + sources."write-file-atomic-2.1.0" + sources."xdg-basedir-3.0.0" + sources."is-obj-1.0.1" + sources."pify-2.3.0" + sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."slide-1.1.6" - sources."lru-cache-4.0.2" - sources."which-1.2.12" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.2.14" sources."pseudomap-1.0.2" - sources."yallist-2.0.0" - sources."isexe-1.1.2" - sources."npmconf-2.1.2" - sources."pify-2.3.0" - sources."pinkie-promise-2.0.1" - sources."config-chain-1.1.11" - sources."inherits-2.0.3" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" + sources."execa-0.6.3" + sources."filter-obj-1.1.0" + sources."mem-1.1.0" + sources."p-any-1.1.0" + sources."p-try-1.0.0" + (sources."passwd-user-2.1.0" // { + dependencies = [ + sources."execa-0.4.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + ]; + }) + sources."rc-1.2.1" + sources."get-stream-3.0.0" + 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."path-key-2.0.1" + sources."mimic-fn-1.1.0" + sources."p-some-2.0.0" + sources."aggregate-error-1.0.0" + sources."clean-stack-1.3.0" + sources."indent-string-3.1.0" + sources."cross-spawn-async-2.2.5" + sources."object-assign-4.1.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" - sources."nopt-3.0.6" - sources."once-1.3.3" - sources."semver-4.3.6" - sources."uid-number-0.0.5" - sources."proto-list-1.2.4" - sources."abbrev-1.1.0" - sources."wrappy-1.0.2" - sources."pinkie-2.0.4" + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" sources."create-error-class-3.0.2" - sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" - sources."node-status-codes-1.0.0" - sources."parse-json-2.2.0" - sources."read-all-stream-3.1.0" - sources."readable-stream-2.2.3" - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" + 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" sources."capture-stack-trace-1.0.0" - sources."error-ex-1.3.0" - sources."is-arrayish-0.2.1" - sources."buffer-shims-1.0.0" - 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."prepend-http-1.0.4" sources."decamelize-1.2.0" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."cli-width-1.1.1" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."string-width-1.0.2" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.1.0" + sources."external-editor-2.0.4" + 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."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" + 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."lodash.debounce-3.1.1" sources."os-name-1.0.3" - (sources."request-2.79.0" // { - dependencies = [ - sources."uuid-3.0.1" - ]; - }) + sources."request-2.81.0" sources."tough-cookie-2.3.2" + sources."uuid-3.1.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + (sources."readline2-1.0.1" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.5" + ]; + }) + sources."exit-hook-1.1.1" + sources."code-point-at-1.1.0" + sources."number-is-nan-1.0.1" + sources."once-1.4.0" + sources."wrappy-1.0.2" sources."lodash._getnative-3.9.1" - (sources."osx-release-1.1.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - (sources."win-release-1.1.1" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) + sources."osx-release-1.1.0" + sources."win-release-1.1.1" + sources."semver-5.3.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" - sources."extend-3.0.0" + sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."form-data-2.1.4" + sources."har-validator-4.2.1" 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.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" sources."stringstream-0.0.5" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."graceful-readlink-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."ajv-4.11.8" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" 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.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29471,152 +32455,182 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."getpass-0.1.6" // { + (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."camelcase-keys-2.1.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.5" - sources."redent-1.0.0" + sources."normalize-package-data-2.4.0" + (sources."redent-1.0.0" // { + dependencies = [ + sources."indent-string-2.1.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.2.0" + 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" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."indent-string-2.1.0" + 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."parse-json-2.2.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."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" sources."get-stdin-4.0.1" sources."registry-url-3.1.0" - (sources."rc-1.1.7" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."deep-extend-0.4.1" - sources."strip-json-comments-2.0.1" - sources."registry-auth-token-3.1.0" + sources."duplexer2-0.1.4" + sources."node-status-codes-1.0.0" + sources."read-all-stream-3.1.0" + 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.3" + sources."util-deprecate-1.0.2" + sources."registry-auth-token-3.3.1" sources."execall-1.0.0" sources."clone-regexp-1.0.0" sources."is-regexp-1.0.0" sources."is-supported-regexp-flag-1.0.0" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."load-json-file-1.1.0" - sources."path-type-1.1.0" - sources."strip-bom-2.0.0" - sources."is-utf8-0.2.1" - sources."is-finite-1.0.2" + (sources."locate-path-2.0.0" // { + dependencies = [ + sources."path-exists-3.0.0" + ]; + }) + sources."p-locate-2.0.0" + sources."p-limit-1.1.0" sources."downgrade-root-1.2.2" sources."sudo-block-1.2.0" sources."default-uid-1.0.0" sources."is-root-1.0.0" sources."is-docker-1.1.0" sources."arrify-1.0.1" - sources."dot-prop-2.4.0" - sources."is-obj-1.0.1" - sources."debug-2.6.1" + sources."debug-2.6.8" sources."npmlog-2.0.4" - sources."ms-0.7.2" - sources."external-editor-1.1.1" + sources."ms-2.0.0" sources."rx-4.1.0" sources."spawn-sync-1.0.15" - sources."tmp-0.0.29" sources."concat-stream-1.6.0" sources."os-shim-0.1.3" sources."typedarray-0.0.6" - sources."is-promise-2.1.0" sources."ansi-0.3.1" - sources."are-we-there-yet-1.1.2" + sources."are-we-there-yet-1.1.4" sources."gauge-1.2.7" sources."delegates-1.0.0" sources."has-unicode-2.0.1" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - sources."boxen-0.3.1" - sources."is-npm-1.0.0" - sources."latest-version-2.0.0" - (sources."semver-diff-2.1.0" // { + (sources."boxen-1.2.0" // { dependencies = [ - sources."semver-5.3.0" + 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" + sources."is-npm-1.0.0" + (sources."latest-version-3.1.0" // { + dependencies = [ + sources."package-json-4.0.1" + ]; + }) + sources."semver-diff-2.1.0" + sources."ansi-align-2.0.0" + sources."cli-boxes-1.0.0" + (sources."term-size-1.2.0" // { + dependencies = [ + sources."execa-0.7.0" + ]; + }) + (sources."widest-line-1.0.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."filled-array-1.1.0" - sources."widest-line-1.0.0" - sources."has-flag-1.0.0" (sources."bin-version-check-2.1.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."semver-4.3.6" + ]; + }) + (sources."each-async-1.1.1" // { + dependencies = [ + sources."onetime-1.1.0" ]; }) - sources."each-async-1.1.1" sources."log-symbols-1.0.2" sources."object-values-1.0.0" sources."twig-0.8.9" sources."bin-version-1.0.4" - (sources."semver-truncate-1.1.2" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) + sources."semver-truncate-1.1.2" sources."find-versions-1.2.1" sources."array-uniq-1.0.3" sources."semver-regex-1.0.0" sources."set-immediate-shim-1.0.1" sources."walk-2.3.9" - sources."minimatch-3.0.3" + sources."minimatch-3.0.4" sources."foreachasync-3.0.0" - sources."brace-expansion-1.1.6" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."diff-2.2.3" - sources."globby-4.1.0" - (sources."grouped-queue-0.3.3" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) + sources."diff-3.3.0" + sources."globby-6.1.0" + sources."grouped-queue-0.3.3" + sources."is-scoped-1.0.0" sources."mem-fs-1.1.3" sources."text-table-0.2.0" - sources."untildify-2.1.0" + sources."untildify-3.0.2" sources."array-union-1.0.2" - sources."glob-6.0.4" + sources."glob-7.1.2" + sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."path-is-absolute-1.0.1" + sources."scoped-regex-1.0.0" sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" + sources."xtend-4.0.1" sources."clone-1.0.2" sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" sources."strip-bom-stream-2.0.0" sources."first-chunk-stream-2.0.0" - sources."cli-boxes-1.0.0" sources."pad-component-0.0.1" - (sources."taketalk-1.0.0" // { + sources."taketalk-1.0.0" + (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."wrap-ansi-2.1.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 755724bc8b82..4f968ce6c099 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.3.0"; + inherit (param) version; name = "ocaml-angstrom-${version}"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "angstrom"; rev = "${version}"; - sha256 = "1x9pvy5vw98ns4pspj7i10pmgqyngn4v4cdlz5pbvwbrpwpn090q"; + inherit (param) sha256; }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix deleted file mode 100644 index 2bace35aa8b6..000000000000 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, comparelib, core_p4, ctypes, openssl, - fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_ssl"; - version = "112.24.03"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_ssl/archive/${version}.tar.gz"; - sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68"; - }; - - buildInputs = [ pa_bench pa_test ]; - propagatedBuildInputs = [ ctypes async_p4 comparelib core_p4 fieldslib_p4 pa_ounit - herelib pipebang sexplib_p4 openssl ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_ssl; - description = "Async wrappers for ssl"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index c7f8bc3d10f7..af52bd9aaafa 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 new file mode 100644 index 000000000000..ea151d1e0e5c --- /dev/null +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -0,0 +1,63 @@ +{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}: + +buildOcaml rec { + name = "bap"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap"; + rev = "v${version}"; + sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; + }; + + sigs = fetchurl { + url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; + sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; + }; + + createFindlibDestdir = true; + + setupHook = writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" + ''; + + nativeBuildInputs = [ which makeWrapper ]; + + buildInputs = [ ocaml_oasis + llvm_38 + utop ]; + + propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi + piqi-ocaml uuidm frontc ounit ]; + + installPhase = '' + export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; + export PATH=$PATH:$out/bin + export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH:$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ + mkdir -p $out/lib/bap + make install + rm $out/bin/baptop + makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\"" + wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH + ln -s $sigs $out/share/bap/sigs.zip + ''; + + disableIda = "--disable-ida --disable-fsi-benchmark"; + + doCheck = true; + + checkTarget = "check test"; + + configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; + + BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; + + meta = with stdenv.lib; { + description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; + 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/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index d24c61745104..b3e657842f88 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: -let version = "2.5.3"; in +let version = "2.6.0"; in stdenv.mkDerivation { name = "ocaml-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "047v05qy0526ad52hzhfa0giczhyzbmw9fwsn6l319icq77ms6jh"; + sha256 = "1nnypfxm3zkahjkzll5qn4ngpqvbxlwg9qdp8qdqvq2vl76w0672"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix new file mode 100644 index 000000000000..de2010275ef9 --- /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/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix deleted file mode 100644 index 68ce28c40bd5..000000000000 --- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, buildOcaml, time}: - -buildOcaml rec { - name = "bitstring"; - version = "2.0.4"; - src = fetchurl { - url = "http://bitstring.googlecode.com/files/ocaml-bitstring-${version}.tar.gz"; - sha256 = "0mapzn2ls5qcrzjm1az50lqjj76ldkmz4fbv2phc9w6smab50qy5"; - }; - - patches = [ ./camlp4.patch ./meta.patch ./srcdir.patch ]; - - buildInputs = [time]; - doCheck = true; - - createFindlibDestdir = true; - hasSharedObjects = true; - - meta = with stdenv.lib; { - description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; - homepage = http://code.google.com/p/bitstring/; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.maurer ]; - }; -} diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4.patch b/pkgs/development/ocaml-modules/bitstring/camlp4.patch deleted file mode 100644 index 920c78007bb0..000000000000 --- a/pkgs/development/ocaml-modules/bitstring/camlp4.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -rupN ocaml-bitstring-2.0.4.orig/camlp4.patch ocaml-bitstring-2.0.4/camlp4.patch ---- ocaml-bitstring-2.0.4.orig/camlp4.patch 1970-01-01 00:00:00.000000000 +0000 -+++ ocaml-bitstring-2.0.4/camlp4.patch 2015-06-10 18:06:54.016000000 +0000 -@@ -0,0 +1,31 @@ -+--- Makefile.in 2015-06-10 20:05:26.603000000 +0200 -++++ ../bs-old/Makefile.in 2013-05-14 17:42:32.000000000 +0200 -+@@ -40,10 +40,10 @@ -+ enable_coverage = @enable_coverage@ -+ -+ OCAMLCFLAGS = -g -+-OCAMLCPACKAGES = -package camlp4 -++OCAMLCPACKAGES = -+ OCAMLCLIBS = -linkpkg -+ OCAMLOPTFLAGS = -+-OCAMLOPTPACKAGES = -package camlp4 -++OCAMLOPTPACKAGES = -+ OCAMLOPTLIBS = -linkpkg -+ -+ ifneq ($(enable_coverage),no) -+@@ -110,13 +110,12 @@ -+ -I +camlp4 -pp camlp4of -c $< -+ -+ pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma -+- $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \ -+- bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -++ $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -+ -pp camlp4of -c $< -o $@ -+ -+ bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma -+ $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \ -+- $(OCAMLCPACKAGES) $(OCAMLCLIBS) \ -++ $(OCAMLCLIBS) \ -+ bitstring.cma bitstring_persistent.cma \ -+ $< -o $@ -+ -diff -rupN ocaml-bitstring-2.0.4.orig/Makefile.in ocaml-bitstring-2.0.4/Makefile.in ---- ocaml-bitstring-2.0.4.orig/Makefile.in 2013-05-14 15:42:32.000000000 +0000 -+++ ocaml-bitstring-2.0.4/Makefile.in 2015-06-25 20:05:52.759000000 +0000 -@@ -40,10 +40,10 @@ pkg_extlib = @OCAML_PKG_extlib@ - enable_coverage = @enable_coverage@ - - OCAMLCFLAGS = -g --OCAMLCPACKAGES = -+OCAMLCPACKAGES = -package camlp4 - OCAMLCLIBS = -linkpkg - OCAMLOPTFLAGS = --OCAMLOPTPACKAGES = -+OCAMLOPTPACKAGES = -package camlp4 - OCAMLOPTLIBS = -linkpkg - - ifneq ($(enable_coverage),no) -@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_pers - -I +camlp4 -pp camlp4of -c $< - - pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma -- $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -+ $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \ -+ bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ - -pp camlp4of -c $< -o $@ - - bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma - $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \ -- $(OCAMLCLIBS) \ -+ $(OCAMLCPACKAGES) $(OCAMLCLIBS) \ - bitstring.cma bitstring_persistent.cma \ - $< -o $@ - -@@ -158,13 +159,13 @@ tests/test.bmpp: create_test_pattern - - create_test_pattern: create_test_pattern.cmo - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ -- unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -- $(OCAMLCLIBS) \ -+ unix.cma -I `$(OCAMLFIND) query camlp4` dynlink.cma camlp4lib.cma \ -+ $(OCAMLCLIBS) $(OCAMLCPACKAGES) \ - -I . bitstring.cma bitstring_persistent.cma $< -o $@ - - create_test_pattern.cmo: create_test_pattern.ml - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ -- unix.cma -I +camlp4 \ -+ unix.cma -I `$(OCAMLFIND) query camlp4` $(OCAMLCPACKAGES) \ - -I . -c $< -o $@ - - # Coverage of tests. diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 26b41a75146f..d6909efe4a6d 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchzip, buildOcaml, time, autoconf, automake }: +{ stdenv, fetchurl, buildOcaml, time, autoconf, automake }: buildOcaml rec { name = "bitstring"; - version = "f1673f8"; - src = fetchzip { - url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/bitstring/source-archive.zip; - sha256 = "03343yggwp3y483zj5axaalxlnl698xrjiv3hmd4c2s05g53iwas"; + version = "2.1.0"; + src = fetchurl { + url = http://github.com/xguerin/bitstring/archive/v2.1.0.tar.gz; + sha256 = "0miw4banfpmx4kxrckpqr57b1fcmsqdmspyjx6gqjd4kghm4l7xj"; }; - patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ]; + patches = [ ./camlp4-git.patch ./srcdir.patch ]; buildInputs = [time autoconf automake]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/bitstring/meta.patch b/pkgs/development/ocaml-modules/bitstring/meta.patch deleted file mode 100644 index 78f44cbe15f5..000000000000 --- a/pkgs/development/ocaml-modules/bitstring/meta.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN ocaml-bitstring-2.0.4/META.in ocaml-bitstring-2.0.4.new/META.in ---- ocaml-bitstring-2.0.4/META.in 2013-05-14 17:42:32.000000000 +0200 -+++ ocaml-bitstring-2.0.4.new/META.in 2015-06-11 17:26:11.674000000 +0200 -@@ -15,8 +15,8 @@ package "persistent" ( - - package "syntax" ( - version = "@PACKAGE_VERSION@" -- requires = "camlp4" -+ requires = "camlp4, bitstring.persistent, bitstring" - description = "Syntax extension: bitstring operators" -- archive(syntax,preprocessor) = "-parser o -parser op -printer p unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo" -- archive(syntax,toploop) = "unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo" -+ archive(syntax,preprocessor) = "-parser o -parser op -printer p pa_bitstring.cmo" -+ archive(syntax,toploop) = "pa_bitstring.cmo" - ) diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 5d1fe8aa0d11..fa9b353f4d60 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 < install.sh - sh install.sh + opam-installer --script --prefix=$out | sh ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://erratique.ch/software/cmdliner; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix new file mode 100644 index 000000000000..99f101010f3e --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix @@ -0,0 +1,30 @@ +{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4 +, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, lwt ? null, async_p4 ? null, async_ssl_p4 ? null +}: + +buildOcaml rec { + name = "cohttp"; + version = "0.19.3"; + + minimumSupportedOcamlVersion = "4.01"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; + sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; + }; + + buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] + ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; + propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; + + buildFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-cohttp; + description = "Very lightweight HTTP server using Lwt or Async"; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 99f101010f3e..1fd4446f1ee9 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,30 +1,35 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4 -, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest -, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, lwt ? null, async_p4 ? null, async_ssl_p4 ? null +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +, ppx_fields_conv, ppx_sexp_conv +, base64, fieldslib, uri, conduit +# Optional for async and lwt support: +, async , async_ssl, cmdliner, fmt, magic-mime, ocaml_lwt, tls }: -buildOcaml rec { - name = "cohttp"; - version = "0.19.3"; +stdenv.mkDerivation rec { + version = "0.22.0"; + name = "ocaml${ocaml.version}-cohttp-${version}"; - minimumSupportedOcamlVersion = "4.01"; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cohttp"; + rev = "v${version}"; + sha256 = "1iy4ynh0yrw8337nsa9zvgcf476im0bhccsbs0vki3c5yxw2x60d"; + }; - src = fetchurl { - url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; - sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; - }; + buildInputs = [ ocaml findlib ocamlbuild ppx_fields_conv ppx_sexp_conv conduit + async async_ssl cmdliner fmt magic-mime ocaml_lwt tls ]; - buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] - ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; - propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; + propagatedBuildInputs = [ base64 fieldslib uri ]; - buildFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-cohttp; - description = "Very lightweight HTTP server using Lwt or Async"; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; + createFindlibDestdir = true; + + meta = { + description = "HTTP(S) library for Lwt, Async and Mirage"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/conduit/0.10.0.nix b/pkgs/development/ocaml-modules/conduit/0.10.0.nix new file mode 100644 index 000000000000..4d1c43e0ae18 --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/0.10.0.nix @@ -0,0 +1,26 @@ +{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4 +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +}: + +buildOcaml rec { + name = "conduit"; + version = "0.10.0"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; + sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh"; + }; + + propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ]; + buildInputs = stdenv.lib.optional (lwt != null) lwt + ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 + ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-conduit; + description = "Resolve URIs into communication channels for Async or Lwt "; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index d1da95ffaa1c..750bded28938 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,26 +1,33 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4 -, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +, ppx_driver, ppx_sexp_conv +, ipaddr, uri, logs +, ocaml_lwt ? null +, async ? null, async_ssl ? null +, tls ? null }: -buildOcaml rec { - name = "conduit"; - version = "0.8.3"; +stdenv.mkDerivation rec { + version = "0.15.4"; + name = "ocaml${ocaml.version}-conduit-${version}"; - src = fetchurl { - url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; - sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; - }; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-conduit"; + rev = "v${version}"; + sha256 = "1ya7jqvhl8hc22cid5myf31w5c473imdxjnl9785lavsqj3djjxq"; + }; - propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ]; - buildInputs = stdenv.lib.optional (lwt != null) lwt - ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 - ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; + buildInputs = [ ocaml findlib ocamlbuild ppx_driver ppx_sexp_conv + ocaml_lwt async async_ssl tls ]; + propagatedBuildInputs = [ ipaddr uri logs ]; - meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-conduit; - description = "Resolve URIs into communication channels for Async or Lwt "; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; + createFindlibDestdir = true; + + meta = { + description = "Network connection library for TCP and SSL"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 2e56635f3600..f44db6151751 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -6,7 +6,7 @@ let mkpath = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "0.22"; + version = "1.2"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "1kbf865z484z9nxskmg150xhfspikkvsxk0wbry5vvczqr63cwhq"; + sha256 = "0k1676bn12hhayjlpy8bxfc3sgq6wd7zkh0ca700zh8jxjrshjqk"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; @@ -39,9 +39,8 @@ EOF configureFlags = [ "--enable-unix" "--enable-thread" - "--enable-bigarray" - "--enable-advanced" "--enable-tests" + "--enable-docs" "--disable-bench" ]; diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix new file mode 100644 index 000000000000..1bdf70e86c5a --- /dev/null +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ocb-stubblr }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-cpuid-0.1.0"; + + src = fetchurl { + url = http://github.com/pqwy/cpuid/releases/download/v0.1.0/cpuid-0.1.0.tbz; + sha256 = "08k2558a3dnxn8msgpz8c93sfn0y027ganfdi2yvql0fp1ixv97p"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg ocb-stubblr ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + homepage = https://github.com/pqwy/cpuid; + description = "Detect CPU features from OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index eb148311be0b..0278b0f26558 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { version = "2.3.0"; sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; } + then { version = "2.3.2"; sha256 = "1fykack86hvvqhwngddyxxqlwm3xjljfaszsjbdrvjlrd1nlg079"; } else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; }; in diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 95199f16dcc2..751d40ff706d 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,19 +1,35 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_lwt }: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.2" + then { + version = "1.7"; + url = https://math.umons.ac.be/anum/software/csv/csv-1.7.tar.gz; + sha256 = "1mmcjiiz0jppgipavpph5kn04xcpalw4scbjrw2z3drghvr3qqwf"; + lwtSupport = true; + } else { + version = "1.5"; + url = https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz; + sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; + lwtSupport = false; + }; +in stdenv.mkDerivation { - name = "ocaml-csv-1.4.2"; + name = "ocaml${ocaml.version}-csv-${param.version}"; src = fetchzip { - url = https://github.com/Chris00/ocaml-csv/releases/download/1.4.2/csv-1.4.2.tar.gz; - sha256 = "05s8py2qr3889c72g1q07r15pzch3j66xdphxi2sd93h5lvnpi4j"; + inherit (param) url sha256; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild ] + ++ stdenv.lib.optional param.lwtSupport ocaml_lwt; createFindlibDestdir = true; - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests" + + stdenv.lib.optionalString param.lwtSupport " --enable-lwt"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index e64310f6db8d..24a67a38f3c3 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "ctypes"; - version = "0.4.1"; + version = "0.11.5"; minimumSupportedOcamlVersion = "4"; src = fetchurl { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5"; + sha256 = "164gyrs6zxr5pyljwpjgd4knwlrkcmamsq3gvkkkvgf9rmhrl3zf"; }; buildInputs = [ ncurses pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix new file mode 100644 index 000000000000..389a136aae6b --- /dev/null +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, opam +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "decompress is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "0.6"; + name = "ocaml${ocaml.version}-decompress-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "decompress"; + rev = "v${version}"; + sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08"; + }; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Pure OCaml implementation of Zlib"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index d7b0bbd3d48c..63e256b60958 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, + js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml, ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam, ppx_tools, ppx_deriving, findlib , ocamlbuild @@ -10,19 +10,19 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; stdenv.mkDerivation rec { pname = "eliom"; - version = "6.0.0"; + version = "6.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "1yaqi5fdzvi2ga412chw5rk3533a3xamwfmias1crk793d43cmpc"; + sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx"; }; patches = [ ./camlp4.patch ]; buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ]; - propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving + propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving ocsigen_deriving js_of_ocaml calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec createFindlibDestdir = true; + setupHook = [ ./setup-hook.sh ]; + meta = { homepage = http://ocsigen.org/eliom/; description = "Ocaml Framework for programming Web sites and client/server Web applications"; diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh new file mode 100644 index 000000000000..096d8f8bf635 --- /dev/null +++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh @@ -0,0 +1,5 @@ +addOcsigenDistilleryTemplate() { + addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates +} + +envHooks+=(addOcsigenDistilleryTemplate) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 492b10bb09b3..6c2cb894b542 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}: +{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml-extlib-1.6.1"; + name = "ocaml-extlib-1.7.2"; src = fetchurl { - url = http://ocaml-extlib.googlecode.com/files/extlib-1.6.1.tar.gz; - sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.2.tar.gz; + sha256 = "0r7mhfgh6n5chj9r12s2x1fxrzvh6nm8h80ykl1mr75j86za41bm"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installPhase = "make ${if minimal then "minimal=1" else ""} install"; meta = { - homepage = http://code.google.com/p/ocaml-extlib/; + homepage = https://github.com/ygrek/ocaml-extlib; description = "Enhancements to the OCaml Standard Library modules"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 9dfffbf48c55..6265a4b90cae 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { - name = "ocaml-fileutils-0.5.0"; + name = "ocaml-fileutils-0.5.1"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1531/ocaml-fileutils-0.5.0.tar.gz; - sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47"; + url = https://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz; + sha256 = "0g6zx2rcvacklxyli19ixcf6ich9ipxsps4k3jz98f5zlaab0a7g"; }; buildInputs = [ ocaml findlib ocamlbuild ounit ]; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 9994d156a4c2..0d6ab72fadee 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner, result, uchar }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fmt-0.8.0"; + name = "ocaml${ocaml.version}-fmt-0.8.4"; src = fetchurl { - url = http://erratique.ch/software/fmt/releases/fmt-0.8.0.tbz; - sha256 = "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px"; + url = http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz; + sha256 = "1qilsbisqqhmn8b1ar9lvjbgz8vf4gmqwqjnnjzgld2a3gmh8qvv"; }; unpackCmd = "tar xjf $src"; buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ]; + propagatedBuildInputs = [ result uchar ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 88f120033809..c5382ddd2656 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, astring }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fpath-0.7.1"; + name = "ocaml${ocaml.version}-fpath-0.7.2"; src = fetchurl { - url = http://erratique.ch/software/fpath/releases/fpath-0.7.1.tbz; - sha256 = "05134ij27xjl6gaqsc65yl19vfj6cjxq3mbm9bf4mija8grdpn6g"; + url = http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz; + sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix new file mode 100644 index 000000000000..2d8c00c72383 --- /dev/null +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +, bos, cmdliner, ocamlgraph +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "functoria is not available for OCaml ${ocaml.version}" else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-functoria-${version}"; + version = "2.0.2"; + src = fetchurl { + url = "http://github.com/mirage/functoria/releases/download/${version}/functoria-${version}.tbz"; + sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + propagatedBuildInputs = [ bos cmdliner ocamlgraph ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "A DSL to organize functor applications"; + homepage = https://github.com/mirage/functoria; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 8ead12427fdb..a993a64a49ac 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { - name = "gapi-ocaml-0.3.1"; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1665/${name}.tar.gz"; - sha256 = "1fn563k9mpqp61909l5bzddnkyn04bk106vrcr7qiim1d2i6cf8i"; + name = "gapi-ocaml-${version}"; + version = "0.3.4"; + src = fetchFromGitHub { + owner = "astrada"; + repo = "gapi-ocaml"; + rev = "v${version}"; + sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv"; }; buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix new file mode 100644 index 000000000000..7df47b093b35 --- /dev/null +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -0,0 +1,19 @@ +{ stdenv, ocaml, findlib, jbuilder, git, cohttp }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-git-http-${version}"; + inherit (git) version src; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ git cohttp ]; + + buildPhase = "jbuilder build -p git-http"; + + inherit (jbuilder) installPhase; + + meta = { + description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; + inherit (git.meta) homepage license maintainers platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix new file mode 100644 index 000000000000..1fd4fd926492 --- /dev/null +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -0,0 +1,21 @@ +{ stdenv, ocaml, findlib, jbuilder, git-http +, ocaml_lwt, tls, conduit, magic-mime, cmdliner, mtime +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-git-unix-${version}"; + inherit (git-http) version src; + + buildInputs = [ ocaml findlib jbuilder cmdliner mtime ]; + + propagatedBuildInputs = [ conduit git-http magic-mime ocaml_lwt tls ]; + + buildPhase = "jbuilder build -p git-unix"; + + inherit (jbuilder) installPhase; + + meta = { + description = "Unix backend for the Git protocol(s)"; + inherit (git-http.meta) homepage license maintainers platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix new file mode 100644 index 000000000000..13b85c0c570c --- /dev/null +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam +, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri +}: + +stdenv.mkDerivation rec { + version = "1.11.0"; + name = "ocaml${ocaml.version}-git-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-git"; + rev = version; + sha256 = "1gsvp783g4jb54ccvvpyjpxjmp0pjvlq0cicygk4z4rxs0crd6kw"; + }; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; + + buildPhase = "jbuilder build -p git"; + + inherit (jbuilder) installPhase; + + meta = { + description = "Git format and protocol in pure OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix new file mode 100644 index 000000000000..1e3a9713406b --- /dev/null +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: + +stdenv.mkDerivation rec { + name = "higlo-${version}"; + version = "0.6"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "higlo"; + rev = "release-${version}"; + sha256 = "0m0qyk2ydivai54502s45sdw9w4xr0j3jpwyc4vqk62a7iz9ihxh"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ xtmpl ulex ]; + + createFindlibDestdir = true; + + patches = ./install.patch; + + meta = with stdenv.lib; { + description = "OCaml library for syntax highlighting"; + homepage = "https://zoggy.github.io/higlo/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} + + diff --git a/pkgs/development/ocaml-modules/higlo/install.patch b/pkgs/development/ocaml-modules/higlo/install.patch new file mode 100644 index 000000000000..bbdaace293bf --- /dev/null +++ b/pkgs/development/ocaml-modules/higlo/install.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index b8c2e01..fcd07ed 100644 +--- a/Makefile ++++ b/Makefile +@@ -149,7 +149,8 @@ webdoc: + install: install-lib install-bin + + install-bin: +- $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) `dirname \`which ocamlfind\``/ ++ mkdir -p $(out)/bin ++ $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) $(out)/bin + + install-lib: higlo.cmo higlo.cmx higlo.cmxs $(HIGLO) $(HIGLO_BYTE) + ocamlfind install higlo META LICENSE \ diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix new file mode 100644 index 000000000000..1860e585b59f --- /dev/null +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-inifiles-1.2"; + + src = fetchurl { + url = http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz; + sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns"; + }; + + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff; + sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; + })]; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ ocaml_pcre ]; + + buildFlags = [ "all" "opt" ]; + + createFindlibDestdir = true; + + meta = { + description = "A small OCaml library to read and write .ini files"; + license = stdenv.lib.licenses.lgpl21Plus; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix new file mode 100644 index 000000000000..e29930775212 --- /dev/null +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +, ocaml_lwt # optional lwt support +, doCheck ? stdenv.lib.versionAtLeast ocaml.version "4.03" +, ounit, fileutils # only for tests +}: + +stdenv.mkDerivation rec { + version = "2.3"; + name = "ocaml${ocaml.version}-inotify-${version}"; + + src = fetchFromGitHub { + owner = "whitequark"; + repo = "ocaml-inotify"; + rev = "v${version}"; + sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ] + ++ stdenv.lib.optionals doCheck [ ounit fileutils ]; + + configureFlags = [ "--enable-lwt" + (stdenv.lib.optionalString doCheck "--enable-tests") ]; + + inherit doCheck; + checkTarget = "test"; + + createFindlibDestdir = true; + + meta = { + description = "Bindings for Linux’s filesystem monitoring interface, inotify"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix new file mode 100644 index 000000000000..e76c3aadc039 --- /dev/null +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-integers-0.2.2"; + + src = fetchurl { + url = https://github.com/ocamllabs/ocaml-integers/releases/download/v0.2.2/integers-0.2.2.tbz; + sha256 = "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Various signed and unsigned integer types for OCaml"; + license = stdenv.lib.licenses.mit; + homepage = https://github.com/ocamllabs/ocaml-integers; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index ed058d82a0ed..24aa25570829 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }: -let version = "1.5.1"; in +let version = "1.6.1"; in stdenv.mkDerivation { name = "ocaml-io-page-${version}"; src = fetchzip { url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz"; - sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79"; + sha256 = "1djwks3ss12m55q6h4jsvfsy848cxfnpaxkilw10h26xj6jchflz"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix deleted file mode 100644 index 2110b1d6b504..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, core_kernel, ppx_jane -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-async_kernel-113.33.00"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_kernel-113.33.00.tar.gz; - sha256 = "1kkkqpdd3mq9jh3b3l1yk37841973lh6g3pfv8fcjzif4n7myf15"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ]; - propagatedBuildInputs = [ core_kernel ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix new file mode 100644 index 000000000000..5cd4c6064e08 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl, + fieldslib, herelib, pipebang, sexplib, ocaml_oasis}: + +buildOcamlJane rec { + name = "async_ssl"; + version = "113.33.07"; + hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; + propagatedBuildInputs = [ ctypes async comparelib core fieldslib + herelib pipebang sexplib openssl ocaml_oasis ]; + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_ssl; + description = "Async wrappers for ssl"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix deleted file mode 100644 index 595e1198de5f..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, async_kernel, core, ppx_jane -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-async_unix-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_unix-113.33.00+4.03.tar.gz; - sha256 = "12b0ffq9yhv3f49kk2k7z7hrn2j4xlka7knm99hczl6gmjni7nqv"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ]; - propagatedBuildInputs = [ async_kernel core ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index 6e988c4479a5..61b2038bfd29 100644 --- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -1,4 +1,4 @@ -{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } : +{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } : { name, version ? "113.33.03", buildInputs ? [], hash ? "", @@ -14,7 +14,7 @@ buildOcaml (args // { hasSharedObjects = true; - buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs; + buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix deleted file mode 100644 index 48bafd5c3c5a..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_jane, core_kernel -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-core-113.33.02+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core-113.33.02+4.03.tar.gz; - sha256 = "1gvd5saa0sdgyv9w09imqlkw0c21v2ixic8fxx14jxrwck0zn4bc"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ]; - propagatedBuildInputs = [ core_kernel ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index df7f6903cd24..dc84ea34337e 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -13,6 +13,13 @@ buildOcamlJane rec { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane re2 textutils ]; + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patch src/extended_unix_stubs.c < #define _LINUX_QUOTA_VERSION 2 +EOF + ''; + meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; description = "Jane Street Capital's standard library overlay"; diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix new file mode 100644 index 000000000000..83e6100f0597 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -0,0 +1,20 @@ +{ stdenv +, buildOcamlJane +, core +, core_extended +, textutils +}: + +buildOcamlJane rec { + name = "core_bench"; + hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj"; + propagatedBuildInputs = + [ core core_extended textutils ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_bench; + description = "Micro-benchmarking library for OCaml"; + license = licenses.asl20; + maintainers = [ maintainers.pmahoney ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix deleted file mode 100644 index d6da9caed7d7..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ppx_jane -, bin_prot, fieldslib, typerep, variantslib -, ppx_assert, ppx_bench, ppx_expect, ppx_inline_test -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-core_kernel-113.33.01+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core_kernel-113.33.01+4.03.tar.gz; - sha256 = "0ra2frspqjqk1wbb58lrb0anrgsyhja00zsybka85qy71lblamfs"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ]; - propagatedBuildInputs = [ - bin_prot fieldslib typerep variantslib - ppx_assert ppx_bench ppx_expect ppx_inline_test - ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix new file mode 100644 index 000000000000..d6acbaa71422 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -0,0 +1,600 @@ +{ stdenv, lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime, + ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, + openssl }: + +rec { + + # Jane Street packages, up to ppx_core + + sexplib = janePackage { + name = "sexplib"; + version = "0.9.1"; + hash = "087md38l73lp24j2lmwi053jjav00k11r06s6whmff1xlhj70wdj"; + meta.description = "Automated S-expression conversion"; + }; + + base = janePackage { + name = "base"; + version = "0.9.1"; + hash = "09gj30zyv23gv3gkf2pb3d3ywmkgd74dq8sfaps5xarr3grvndhm"; + propagatedBuildInputs = [ sexplib ]; + meta.description = "Full standard library replacement for OCaml"; + }; + + ocaml-compiler-libs = janePackage { + name = "ocaml-compiler-libs"; + hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + ppx_ast = janePackage { + name = "ppx_ast"; + hash = "0p9v4q3cjz8wwdrh6bjidani2npzvhdy8isnqwigqkl6n326dba9"; + propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; + meta.description = "OCaml AST used by Jane Street ppx rewriters"; + }; + + ppx_traverse_builtins = janePackage { + name = "ppx_traverse_builtins"; + hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi"; + meta.description = "Builtins for Ppx_traverse"; + }; + + stdio = janePackage { + name = "stdio"; + hash = "1c08jg930j7yxn0sjvlm3fs2fvwaf15sn9513yf1rb7y1lxrgwc4"; + propagatedBuildInputs = [ base ]; + meta.description = "Standard IO library for OCaml"; + }; + + ppx_core = janePackage { + name = "ppx_core"; + hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3"; + propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ]; + meta.description = "Jane Street's standard library for ppx rewriters"; + }; + + # Jane Street packages, up to ppx_base + + ppx_optcomp = janePackage { + name = "ppx_optcomp"; + hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd"; + propagatedBuildInputs = [ ppx_core ]; + meta.description = "Optional compilation for OCaml"; + }; + + ppx_driver = janePackage { + name = "ppx_driver"; + hash = "1w3khwnvy18nkh673zrbhcs6051hs7z5z5dib7npkvpxndw22hwj"; + buildInputs = [ ocamlbuild ]; + propagatedBuildInputs = [ ppx_optcomp ]; + meta.description = "Feature-full driver for OCaml AST transformers"; + }; + + ppx_metaquot = janePackage { + name = "ppx_metaquot"; + hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k"; + propagatedBuildInputs = [ ppx_driver ]; + meta.description = "Metaquotations for ppx_ast"; + }; + + ppx_type_conv = janePackage { + name = "ppx_type_conv"; + hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p"; + propagatedBuildInputs = [ ppx_metaquot ppx_deriving ]; + meta.description = "Support Library for type-driven code generators"; + }; + + ppx_sexp_conv = janePackage { + name = "ppx_sexp_conv"; + hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l"; + propagatedBuildInputs = [ ppx_type_conv sexplib ]; + meta.description = "Generation of S-expression conversion functions from type definitions"; + }; + + ppx_compare = janePackage { + name = "ppx_compare"; + hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9"; + propagatedBuildInputs = [ ppx_type_conv ]; + meta.description = "Generation of comparison functions from types"; + }; + + ppx_enumerate = janePackage { + name = "ppx_enumerate"; + hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46"; + propagatedBuildInputs = [ ppx_type_conv ]; + meta.description = "Generate a list containing all values of a finite type"; + }; + + ppx_hash = janePackage { + name = "ppx_hash"; + hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + }; + + ppx_js_style = janePackage { + name = "ppx_js_style"; + hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59"; + propagatedBuildInputs = [ ppx_metaquot octavius ]; + meta.description = "Code style checker for Jane Street Packages"; + }; + + ppx_base = janePackage { + name = "ppx_base"; + hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3"; + propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ]; + meta.description = "Base set of ppx rewriters"; + }; + + # Jane Street packages, up to ppx_bin_prot + + fieldslib = janePackage { + name = "fieldslib"; + hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501"; + propagatedBuildInputs = [ ppx_driver ]; + meta.description = "OCaml record fields as first class values"; + }; + + variantslib = janePackage { + name = "variantslib"; + hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz"; + propagatedBuildInputs = [ ppx_driver ]; + meta.description = "OCaml variants as first class values"; + }; + + ppx_traverse = janePackage { + name = "ppx_traverse"; + hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2"; + propagatedBuildInputs = [ ppx_type_conv ]; + meta.description = "Automatic generation of open recursion classes"; + }; + + ppx_custom_printf = janePackage { + name = "ppx_custom_printf"; + hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19"; + propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ]; + meta.description = "Printf-style format-strings for user-defined string conversion"; + }; + + ppx_fields_conv = janePackage { + name = "ppx_fields_conv"; + hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z"; + propagatedBuildInputs = [ fieldslib ppx_type_conv ]; + meta.description = "Generation of accessor and iteration functions for OCaml records"; + }; + + ppx_variants_conv = janePackage { + name = "ppx_variants_conv"; + hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834"; + propagatedBuildInputs = [ ppx_type_conv variantslib ]; + meta.description = "Generation of accessor and iteration functions for OCaml variant types"; + }; + + bin_prot = janePackage { + name = "bin_prot"; + hash = "0cy6lhksx4jypkrnj3ha31p97ghslki0bx5rpnzc2v28mfp6pzh1"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; + meta.description = "Binary protocol generator"; + }; + + ppx_here = janePackage { + name = "ppx_here"; + hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh"; + propagatedBuildInputs = [ ppx_driver ]; + meta.description = "Expands [%here] into its location"; + }; + + ppx_bin_prot = janePackage { + name = "ppx_bin_prot"; + hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3"; + propagatedBuildInputs = [ ppx_here bin_prot ]; + meta.description = "Generation of bin_prot readers and writers from types"; + }; + + # Jane Street packages, up to ppx_jane + + ppx_assert = janePackage { + name = "ppx_assert"; + hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z"; + propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ]; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + }; + + ppx_inline_test = janePackage { + name = "ppx_inline_test"; + hash = "01xml88ahrzqnc7g1ib184jbqxpdfx4gn2wdvi09dpi4i0jahy33"; + propagatedBuildInputs = [ ppx_metaquot ]; + meta.description = "Syntax extension for writing in-line tests in OCaml code"; + }; + + typerep = janePackage { + name = "typerep"; + hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3"; + propagatedBuildInputs = [ base ]; + meta.description = "Runtime types for OCaml"; + }; + + ppx_bench = janePackage { + name = "ppx_bench"; + hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93"; + propagatedBuildInputs = [ ppx_inline_test ]; + meta.description = "Syntax extension for writing in-line benchmarks in OCaml code"; + }; + + ppx_expect = janePackage { + name = "ppx_expect"; + hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b"; + propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ]; + meta.description = "Cram like framework for OCaml"; + }; + + ppx_fail = janePackage { + name = "ppx_fail"; + hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32"; + propagatedBuildInputs = [ ppx_here ppx_metaquot ]; + meta.description = "Add location to calls to failwiths"; + }; + + ppx_let = janePackage { + name = "ppx_let"; + hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr"; + propagatedBuildInputs = [ ppx_driver ]; + meta.description = "Monadic let-bindings"; + }; + + ppx_optional = janePackage { + name = "ppx_optional"; + hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82"; + propagatedBuildInputs = [ ppx_metaquot ]; + meta.description = "Pattern matching on flat options"; + }; + + ppx_pipebang = janePackage { + name = "ppx_pipebang"; + hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h"; + propagatedBuildInputs = [ ppx_metaquot ]; + meta.description = "A ppx rewriter that inlines reverse application operators |> and |!"; + }; + + ppx_sexp_message = janePackage { + name = "ppx_sexp_message"; + hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv"; + propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; + meta.declarations = "A ppx rewriter for easy construction of s-expressions"; + }; + + ppx_sexp_value = janePackage { + name = "ppx_sexp_value"; + hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah"; + propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; + meta.declarations = "A ppx rewriter that simplifies building s-expressions from OCaml values"; + }; + + ppx_typerep_conv = janePackage { + name = "ppx_typerep_conv"; + hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1"; + propagatedBuildInputs = [ ppx_type_conv typerep ]; + meta.description = "Generation of runtime types from type declarations"; + }; + + ppx_jane = janePackage { + name = "ppx_jane"; + hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc"; + propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ]; + meta.description = "Standard Jane Street ppx rewriters"; + }; + + # Jane Street packages, up to core + + configurator = janePackage { + name = "configurator"; + hash = "1ll90pnprc5nah621ckvqi1gwagvglzx2mzjpkppddw1kr320w80"; + propagatedBuildInputs = [ ppx_base ]; + meta.description = "Helper library for gathering system configuration"; + }; + + jane-street-headers = janePackage { + name = "jane-street-headers"; + hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy"; + meta.description = "Jane Street header files"; + }; + + core_kernel = janePackage { + name = "core_kernel"; + hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh"; + propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ]; + meta.description = "Jane Street's standard library overlay (kernel)"; + }; + + spawn = janePackage { + name = "spawn"; + hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5"; + meta.description = "Spawning sub-processes"; + }; + + core = janePackage { + name = "core"; + hash = "0x05ky8l75k2dnpsa02vmqcr7p7q0vvc6279psq3iybrwcvab9yi"; + propagatedBuildInputs = [ core_kernel spawn ]; + meta.description = "Jane Street's standard library overlay"; + }; + + # Jane Street packages, up to core_extended + + re2 = janePackage { + name = "re2"; + hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi"; + propagatedBuildInputs = [ core_kernel ]; + meta = { + description = "OCaml bindings for RE2"; + broken = stdenv.isDarwin; + }; + }; + + textutils = janePackage { + name = "textutils"; + hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d"; + propagatedBuildInputs = [ core ]; + meta.description = "Text output utilities"; + }; + + core_extended = janePackage { + name = "core_extended"; + hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk"; + propagatedBuildInputs = [ core re2 textutils ]; + postPatch = '' + patchShebangs src/discover.sh + ''; + meta = { + description = "Jane Street Capital's standard library overlay"; + }; + }; + + # Jane Street async packages + + async_kernel = janePackage { + name = "async_kernel"; + hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Jane Street Capital's asynchronous execution library (core)"; + }; + + async_rpc_kernel = janePackage { + name = "async_rpc_kernel"; + hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b"; + propagatedBuildInputs = [ core_kernel async_kernel ]; + meta.description = "Platform-independent core of Async RPC library"; + }; + + async_unix = janePackage { + name = "async_unix"; + hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d"; + propagatedBuildInputs = [ core async_kernel ]; + meta.description = "Jane Street Capital's asynchronous execution library (unix)"; + }; + + async_extra = janePackage { + name = "async_extra"; + hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0"; + propagatedBuildInputs = [ async_rpc_kernel async_unix ]; + meta.description = "Jane Street's asynchronous execution library (extra)"; + }; + + async = janePackage { + name = "async"; + hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1"; + propagatedBuildInputs = [ async_extra ]; + meta.description = "Jane Street Capital's asynchronous execution library"; + }; + + async_find = janePackage { + name = "async_find"; + hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq"; + propagatedBuildInputs = [ async ]; + meta.description = "Directory traversal with Async"; + }; + + async_interactive = janePackage { + name = "async_interactive"; + hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j"; + propagatedBuildInputs = [ async ]; + meta.description = "Utilities for building simple command-line based user interfaces"; + }; + + async_parallel = janePackage { + name = "async_parallel"; + hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn"; + propagatedBuildInputs = [ async ]; + meta.description = "Distributed computing library"; + }; + + async_shell = janePackage { + name = "async_shell"; + hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2"; + propagatedBuildInputs = [ core_extended async ]; + meta = { + description = "Shell helpers for Async"; + }; + }; + + async_ssl = janePackage { + name = "async_ssl"; + hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss"; + propagatedBuildInputs = [ async ctypes openssl ]; + meta.description = "Async wrappers for SSL"; + }; + + # Jane Street packages, up to expect_test_helpers + + sexp_pretty = janePackage { + name = "sexp_pretty"; + hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx"; + propagatedBuildInputs = [ ppx_base re ]; + meta.description = "S-expression pretty-printer"; + }; + + expect_test_helpers_kernel = janePackage { + name = "expect_test_helpers_kernel"; + hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6"; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + meta.description = "Helpers for writing expectation tests"; + }; + + expect_test_helpers = janePackage { + name = "expect_test_helpers"; + hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2"; + propagatedBuildInputs = [ async expect_test_helpers_kernel ]; + meta.description = "Async helpers for writing expectation tests"; + }; + + # Miscellaneous Jane Street packages + + bignum = janePackage { + name = "bignum"; + hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3"; + propagatedBuildInputs = [ core_kernel zarith ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + cinaps = janePackage { + name = "cinaps"; + hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5"; + propagatedBuildInputs = [ re ]; + meta.description = "Trivial Metaprogramming tool using the OCaml toplevel"; + }; + + command_rpc = janePackage { + name = "command_rpc"; + hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824"; + propagatedBuildInputs = [ async ]; + meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout"; + }; + + core_bench = janePackage { + name = "core_bench"; + hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h"; + propagatedBuildInputs = [ core_extended ]; + meta = { + description = "Micro-benchmarking library for OCaml"; + }; + }; + + core_profiler = janePackage { + name = "core_profiler"; + hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44"; + propagatedBuildInputs = [ core_extended ]; + meta = { + description = "Profiling library"; + }; + }; + + csvfields = janePackage { + name = "csvfields"; + hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v"; + propagatedBuildInputs = [ core ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + ecaml = janePackage { + name = "ecaml"; + hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i"; + propagatedBuildInputs = [ async ]; + meta.description = "Writing Emacs plugin in OCaml"; + }; + + email_message = janePackage { + name = "email_message"; + hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz"; + propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ]; + meta = { + description = "E-mail message parser"; + }; + }; + + incremental_kernel = janePackage { + name = "incremental_kernel"; + hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Library for incremental computations depending only on core_kernel"; + }; + + incremental = janePackage { + name = "incremental"; + hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh"; + propagatedBuildInputs = [ core incremental_kernel ]; + meta.description = "Library for incremental computations"; + }; + + incr_map = janePackage { + name = "incr_map"; + hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv"; + propagatedBuildInputs = [ incremental_kernel ]; + meta.description = "Helpers for incremental operations on map like data structures"; + }; + + ocaml_plugin = janePackage { + name = "ocaml_plugin"; + hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14"; + buildInputs = [ ocamlbuild ]; + propagatedBuildInputs = [ async ]; + meta.description = "Automatically build and dynlink ocaml source files"; + }; + + parsexp = janePackage { + name = "parsexp"; + hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b"; + propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ]; + meta.description = "S-expression parsing library"; + }; + + parsexp_io = janePackage { + name = "parsexp_io"; + hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5"; + propagatedBuildInputs = [ parsexp ]; + meta.description = "S-expression parsing library (IO functions)"; + }; + + patience_diff = janePackage { + name = "patience_diff"; + hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Tool and library implementing patience diff"; + }; + + posixat = janePackage { + name = "posixat"; + hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + rpc_parallel = janePackage { + name = "rpc_parallel"; + hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38"; + propagatedBuildInputs = [ async ]; + meta.description = "Type-safe library for building parallel applications"; + }; + + shexp = janePackage { + name = "shexp"; + hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y"; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + + topological_sort = janePackage { + name = "topological_sort"; + hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Topological sort algorithm"; + }; + + typerep_extended = janePackage { + name = "typerep_extended"; + hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Runtime types for OCaml (Extended)"; + }; + +} diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix new file mode 100644 index 000000000000..6d6a4d714422 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib }: + +{ name, version ? "0.9.0", buildInputs ? [], hash, meta, ...}@args: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else + +stdenv.mkDerivation (args // { + name = "ocaml${ocaml.version}-${name}-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = name; + rev = "v${version}"; + sha256 = hash; + }; + + buildInputs = [ ocaml jbuilder findlib ] ++ buildInputs; + + inherit (jbuilder) installPhase; + + meta = { + license = stdenv.lib.licenses.asl20; + inherit (ocaml.meta) platforms; + homepage = "https://github.com/janestreet/${name}"; + } // meta; +}) diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index 328ffc58bdc1..2c314f3dbdea 100644 --- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}: +{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opam }: buildOcaml rec { name = "js-build-tools"; @@ -13,7 +13,7 @@ buildOcaml rec { hasSharedObjects = true; - buildInputs = [ ocaml_oasis_46 opam ]; + buildInputs = [ ocaml_oasis opam ]; dontAddPrefix = true; configurePhase = "./configure --prefix $prefix"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix deleted file mode 100644 index 3414324a5c81..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_tools, ppx_inline_test -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_bench-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bench-113.33.00+4.03.tar.gz; - sha256 = "00iv0p3cni4r7iimwm04bjg2hzvlvdb0b1kynjw2xav64xc29q01"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ ppx_inline_test ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix deleted file mode 100644 index 43517a82d3b2..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, bin_prot, ppx_deriving, ppx_tools, ppx_type_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_bin_prot-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bin_prot-113.33.00+4.03.tar.gz; - sha256 = "1xw1yjgnd5ny1cq0n6rbsdaywyzq2n0jwg4gjsxv14dhv0alav36"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ bin_prot ppx_deriving ppx_type_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix deleted file mode 100644 index 794570402025..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_tools, ppx_deriving, ppx_type_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_compare-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_compare-113.33.00+4.03.tar.gz; - sha256 = "07drgg6c857lsvxdjscdcb1ncdr5p3183spw32sbfcrbnr12nzys"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ ppx_type_conv ppx_deriving ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix deleted file mode 100644 index 71bc62937d4d..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_tools -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_core-133.33.01+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_core-113.33.01+4.03.tar.gz; - sha256 = "0ibww4lx87lmn164mxczl3sa7ldwc7g1zi4m9c4vllsv004iyffl"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix deleted file mode 100644 index d75c7f811286..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_sexp_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_custom_printf-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_custom_printf-113.33.00+4.03.tar.gz; - sha256 = "1hw8q4x0hzyg3brlqpdm0bc7z6lnj6qymzw123cf51q9dq0386jb"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ ppx_sexp_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix deleted file mode 100644 index 77fde21e8d79..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_tools, ppx_deriving, ppx_type_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_enumerate-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_enumerate-113.33.00+4.03.tar.gz; - sha256 = "0b0kvdw6kids4yrzqq2h82gmnx1zfiahr82rrdbwiwkk4g0pxl93"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ ppx_deriving ppx_type_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix deleted file mode 100644 index 32133dfb6894..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_driver, ppx_assert, ppx_custom_printf, ppx_inline_test -, ppx_fields_conv, ppx_variants_conv, re, sexplib, fieldslib -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_expect-113.33.01+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_expect-113.33.01+4.03.tar.gz; - sha256 = "1r358vx3wnkzq8kwgi49400l1fx2bnl6gds4hl7s67lxsqxki2z7"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_assert ppx_custom_printf ppx_fields_conv ppx_variants_conv re ]; - propagatedBuildInputs = [ ppx_driver ppx_inline_test fieldslib sexplib ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix deleted file mode 100644 index ba098b9294f6..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_tools, ppx_here -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_fail-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fail-113.33.00+4.03.tar.gz; - sha256 = "1fy1aqsylf6yk527w13rm2b20il9vy026c5ww65pj3ks5zykfvx9"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ ppx_here ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix deleted file mode 100644 index 70d6ec61b0ea..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, fieldslib, ppx_deriving, ppx_type_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_fields_conv-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fields_conv-113.33.00+4.03.tar.gz; - sha256 = "1wfi8pc0y7wjiscvawhfgbcfx7ypmikmyyagwhzw7jhnldljwrkg"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ fieldslib ppx_deriving ppx_type_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix deleted file mode 100644 index 7b9414353a9e..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_tools, ppx_driver -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_inline_test-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_inline_test-113.33.00+4.03.tar.gz; - sha256 = "1sw71wnwznia1spicilj4bzspgdk1dhp0j4hp57a9xmsscg44i4k"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ ppx_driver ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix deleted file mode 100644 index 0a5b19051fc2..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_assert, ppx_bench, ppx_bin_prot, ppx_custom_printf, ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_let, ppx_pipebang, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_jane-113.33.00"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_jane-113.33.00.tar.gz; - sha256 = "15lbrc9jj83k208gv7knz7mk9xh9mdb657jdjb1006gdsskfmra6"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ ppx_assert ppx_bench ppx_bin_prot - ppx_custom_printf ppx_enumerate ppx_expect ppx_fail ppx_fields_conv - ppx_let ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv - ppx_variants_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix deleted file mode 100644 index b5f0bd4c9324..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_driver -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_let-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_let-113.33.00+4.03.tar.gz; - sha256 = "012yzayknm9qv8ap9rbwf4fwnmx935mfy7c75ifagbnfl4lh7dmp"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ ppx_driver ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix deleted file mode 100644 index 05e7f40eb686..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, oasis -, ppx_core, ppx_tools -}: - -let - param = { - "4.03" = { - version = "113.33.00+4.03"; - sha256 = "1fkz6n40l4ck8bcr548d2yp08zc9fjv42zldlh0cj3ammhiz3gap"; - }; - "4.04" = { - version = "113.33.01+4.03"; - sha256 = "1caw5dfgh5rw8mcgar0hdn485j1rqlnkbfb8wd0wdl5zhkg8jk3d"; - }; - }."${ocaml.meta.branch}"; -in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_optcomp-${param.version}"; - src = fetchzip { - url = "http://github.com/janestreet/ppx_optcomp/archive/${param.version}.tar.gz"; - inherit (param) sha256; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam oasis ppx_tools ]; - propagatedBuildInputs = [ ppx_core ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix deleted file mode 100644 index 5aa589e250c1..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_tools, ppx_driver -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_pipebang-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_pipebang-113.33.00+4.03.tar.gz; - sha256 = "1rjrpbncy8vzwnmc5n0qs4dd40dmg4h75dvd7h7lm8cpxalifivc"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ ppx_driver ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix deleted file mode 100644 index d8c9166585e1..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, sexplib, ppx_deriving, ppx_tools, ppx_type_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_sexp_conv-133.33.01+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_conv-113.33.01+4.03.tar.gz; - sha256 = "176pydk5fs8m2md9v8v5b16gra90s4v0ssqq38ghfsbv1faca8d6"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ sexplib ppx_deriving ppx_type_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix deleted file mode 100644 index ddf66364b305..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_sexp_conv, ppx_here -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_sexp_message-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_message-113.33.00+4.03.tar.gz; - sha256 = "01vrm8dk413gh19i2y6ffpsmscjhayp3asn5hcbcflxsvlaf4klx"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix deleted file mode 100644 index 21b67b9cce73..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_here, ppx_sexp_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_sexp_value-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_value-113.33.00+4.03.tar.gz; - sha256 = "0pn2v1m479lbdgprv4w9czyv5nim0hz6ailmy1xxlxlhazwbqzwm"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix deleted file mode 100644 index 49cfc19321d6..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, ppx_core, ppx_deriving, ppx_driver -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_type_conv-133.33.02+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_type_conv-113.33.02+4.03.tar.gz; - sha256 = "0y7hsh152gcj89i6cr3b9kxgdnb2sx8vhaq2bdvbcc9zrirwq4d2"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_deriving ]; - propagatedBuildInputs = [ ppx_core ppx_driver ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix deleted file mode 100644 index 69a4ad7e69a4..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, typerep, ppx_tools, ppx_type_conv, ppx_deriving -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_typerep_conv-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_typerep_conv-113.33.00+4.03.tar.gz; - sha256 = "0k03wp07jvv3zpsm8n5hvskd5iagjvpcpxj9rpj012nia5iqfaj6"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ]; - propagatedBuildInputs = [ ppx_type_conv typerep ppx_deriving ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix deleted file mode 100644 index fb8a994790cb..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, variantslib, ppx_deriving, ppx_type_conv -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_variants_conv-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_variants_conv-113.33.00+4.03.tar.gz; - sha256 = "0il0nkdwwsc1ymshj4q9nzw5ixm12ls0jj7z3q16k48bg3z5ibc0"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ variantslib ppx_deriving ppx_type_conv ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix deleted file mode 100644 index 4f86f080738a..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-sexplib-113.33.00+4.03"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/113.33/files/sexplib-113.33.00+4.03.tar.gz; - sha256 = "1dirdrags3z8m80z1vczfnpdfzgcvm2wyy7g61fxdr8h3jgixpl3"; - }; - - buildInputs = [ ocaml findlib ocamlbuild opam ]; - - inherit (topkg) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index c0b1c32553e7..843cf44a1538 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,16 +1,20 @@ {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: +if !stdenv.lib.versionAtLeast ocaml.version "4" +then throw "javalib not supported for ocaml ${ocaml.version}" +else + let pname = "javalib"; webpage = "http://sawja.inria.fr/"; in stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "2.3"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "2.3.3"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2"; - sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j"; + url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2; + sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11"; }; buildInputs = [ which ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index fb73df808fe7..2bdaf6556486 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, uutf }: -let version = "1.0.0"; in +let version = "1.0.1"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-jsonm-${version}"; src = fetchurl { url = "http://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz"; - sha256 = "1v3ln6d965lplj28snjdqdqablpp1kx8bw2cfx0m6i157mqyln62"; + sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w"; }; buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index c59f15c57ad6..f54df0c17d40 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { description = "OpenGL bindings for ocaml"; license = licenses.gpl2; maintainers = with maintainers; [ pSub vbgl ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index ba966b68002c..2aa0842c55f7 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: +if stdenv.lib.versionAtLeast ocaml.version "4.04" +then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else + let pname = "lablgtk"; in diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 7408ee4b478c..67f579eb4698 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH ''; + dontStrip = true; + meta = with stdenv.lib; { platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index 4638748160a2..f8e79d566d44 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed, camlp4 }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; }; - buildInputs = [ libev ocaml findlib ocamlbuild ocaml_lwt ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ]; propagatedBuildInputs = [ camlp4 zed ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index f66773d426af..86d03896ab16 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed }: +{ stdenv, buildOcaml, fetchurl, libev, ocaml, findlib, jbuilder, opam, zed, lwt_react }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; -stdenv.mkDerivation rec { - version = "1.10"; - name = "lambda-term-${version}"; +buildOcaml rec { + version = "1.11"; + name = "lambda-term"; src = fetchurl { url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz"; - sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m"; + sha256 = "10lx1jqgmmfwwlv64di4a8nia9l53v7179z70n9fx6aq5l7r8nba"; }; - buildInputs = [ libev ocaml findlib ocamlbuild ocaml_react ]; + buildInputs = [ libev ocaml findlib jbuilder opam ]; - propagatedBuildInputs = [ zed ocaml_lwt ]; + propagatedBuildInputs = [ zed lwt_react ]; - createFindlibDestdir = true; + installPhase = '' + ${jbuilder.installPhase} + mv $out/lib/ocaml/${ocaml.version}/site-lib/{stubslibs,lambda-term}/dlllambda_term_stubs.so + ''; + + hasSharedObjects = true; meta = { description = "Terminal manipulation library for OCaml"; longDescription = '' diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 351a773a6f7b..3bced92cc3e3 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, llvm, ocaml, findlib, ctypes }: +{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: let version = stdenv.lib.getVersion llvm; in @@ -7,21 +7,23 @@ stdenv.mkDerivation { inherit (llvm) src; - buildInputs = [ python llvm ocaml findlib ctypes ]; + buildInputs = [ python cmake llvm ocaml findlib ctypes ]; - configurePhase = '' - mkdir build - cd build - ../configure --disable-compiler-version-checks --prefix=$out \ - --disable-doxygen --disable-docs --with-ocaml-libdir=$OCAMLFIND_DESTDIR/llvm \ - --enable-static - ''; + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch; + sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9"; + })]; - enableParallelBuilding = false; + cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ]; - makeFlags = [ "-C bindings" "SYSTEM_LLVM_CONFIG=llvm-config" ]; + buildFlags = "ocaml_all"; + + installFlags = "-C bindings/ocaml"; postInstall = '' + mv $out/lib/ocaml $out/ocaml + mkdir -p $OCAMLFIND_DESTDIR/ + mv $out/ocaml $OCAMLFIND_DESTDIR/llvm mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,} ''; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index d3a373ab4dbc..fc721dc4c9a3 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,30 +1,49 @@ -{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 +{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 , ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib -, ppx_tools, result +, ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" }: -stdenv.mkDerivation rec { - name = "ocaml-lwt-${version}"; - version = "2.6.0"; +if !stdenv.lib.versionAtLeast ocaml.version "4" +then throw "lwt is not available for OCaml ${ocaml.version}" +else + +let sha256 = { + "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; + "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; + "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; +}."${version}"; in + +let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in + +buildOcaml rec { + name = "lwt"; + inherit version; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; + inherit sha256; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ] + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] ++ stdenv.lib.optional ppxSupport ppx_tools; - propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ]; + propagatedBuildInputs = [ result ] + ++ optionals [ ocaml_react ocaml_ssl ] + ++ [ libev ]; configureScript = "ocaml setup.ml -configure"; prefixKey = "--prefix "; - configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4" ] + configureFlags = + optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ] + ++ [ "--enable-camlp4" ] ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ]; createFindlibDestdir = true; + hasSharedObjects = true; + meta = with stdenv.lib; { homepage = http://ocsigen.org/lwt; description = "Lightweight thread library for Objective Caml"; diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix new file mode 100644 index 000000000000..022a60dcc66f --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, ocaml_react }: + +stdenv.mkDerivation rec { + version = "1.0.1"; + name = "ocaml${ocaml.version}-lwt_react-${version}"; + src = fetchzip { + url = https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz; + sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + propagatedBuildInputs = [ lwt ocaml_react ]; + + createFindlibDestdir = true; + + meta = { + description = "Helpers for using React with Lwt"; + inherit (lwt.meta) homepage license maintainers platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index e7e29c73a6b1..2a101da74d55 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr" + else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a" else throw ("menhir: unknown version " ++ version); in diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index 9d4615a006b5..d52da82d6d76 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { and Yann Régis-Gianas. ''; license = with licenses; [ - qpl /* generator */ + (if versionAtLeast version "20170418" then gpl2 else qpl) /* generator */ lgpl2 /* library */ ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/merlin_extend/default.nix b/pkgs/development/ocaml-modules/merlin_extend/default.nix new file mode 100644 index 000000000000..79b8b69bbb57 --- /dev/null +++ b/pkgs/development/ocaml-modules/merlin_extend/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildOcaml, fetchFromGitHub, cppo }: + +buildOcaml rec { + name = "merlin_extend"; + version = "0.3"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "let-def"; + repo = "merlin-extend"; + sha256 = "1z6hybcb7ry0bkzjd0r2dlcgjnhhxdsr06x3h03sj7h5fihsc7vd"; + rev = "v${version}"; + }; + + buildInputs = [ cppo ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/let-def/merlin-extend; + description = "SDK to extend Merlin"; + license = licenses.mit; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index 0c51fe71ce1d..20455cc60167 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -1,5 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: +if stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "mlgmp is not available for OCaml ${ocaml.version}" else + let pname = "mlgmp"; in diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index 6490eeb2f38c..9a935cf4a5ae 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-mparser-1.2.1"; + name = "ocaml${ocaml.version}-mparser-1.2.3"; src = fetchzip { - url = http://github.com/cakeplus/mparser/archive/1.2.1.tar.gz; - sha256 = "1g1r3p0inmm5xwh9i5mrc4s414b0j8l13a66hpvwhqcpp6qglfh3"; + url = http://github.com/cakeplus/mparser/archive/1.2.3.tar.gz; + sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix new file mode 100644 index 000000000000..958cbdc554e8 --- /dev/null +++ b/pkgs/development/ocaml-modules/mstruct/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam +, cstruct +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "mstruct is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "1.3.3"; + name = "ocaml${ocaml.version}-mstruct-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-mstruct"; + rev = "v${version}"; + sha256 = "1rxjzkg6156vl6yazbk1h0ndqj80wym5aliaapijf60apqqmsp4s"; + }; + + buildInputs = [ ocaml findlib jbuilder opam ]; + + propagatedBuildInputs = [ cstruct ]; + + inherit (jbuilder) installPhase; + + meta = { + description = "A thin mutable layer on top of cstruct"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index a26109bd4f95..534bb4de48ca 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,29 +1,42 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml -, jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04") +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, js_of_ocaml +, jsooSupport ? true }: +with lib; + +let param = + if versionAtLeast ocaml.version "4.03" + then { + version = "1.1.0"; + sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3"; + } else { + version = "0.8.4"; + sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh"; + }; +in + stdenv.mkDerivation { - name = "ocaml${ocaml.version}-mtime-0.8.3"; + name = "ocaml${ocaml.version}-mtime-${param.version}"; src = fetchurl { - url = http://erratique.ch/software/mtime/releases/mtime-0.8.3.tbz; - sha256 = "1hfx4ny2dkw6jf3jppz0640dafl5xgn8r2si9kpwzhmibal8qrah"; + url = "http://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz"; + inherit (param) sha256; }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam ] + buildInputs = [ ocaml findlib ocamlbuild opam topkg ] ++ stdenv.lib.optional jsooSupport js_of_ocaml; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}"; + buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; - installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + inherit (topkg) installPhase; meta = { description = "Monotonic wall-clock time for OCaml"; homepage = http://erratique.ch/software/mtime; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 9eafa055b240..3fa8e9d46b40 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, mysql, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, mysql }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz"; - sha256 = "f896fa101a05d81b85af8122fe1c2809008a5e5fdca00f9ceeb7eec356369e3a"; + url = "http://ygrek.org.ua/p/release/ocaml-mysql/${name}.tar.gz"; + sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2"; }; configureFlags = [ @@ -22,17 +22,12 @@ stdenv.mkDerivation rec { "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; - buildInputs = [ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ]; createFindlibDestdir = true; propagatedBuildInputs = [ mysql.client ]; - buildPhase = '' - make - make opt - ''; - meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index d7f7ae0e3655..91ab694eb6f2 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,32 +1,33 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib -, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib -, lwt ? null}: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg +, cpuid, ocb-stubblr +, cstruct, zarith, ocaml_oasis, ppx_sexp_conv, sexplib +, lwt ? null +}: with stdenv.lib; let withLwt = lwt != null; in -buildOcaml rec { - name = "nocrypto"; - version = "0.5.3"; - - minimumSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-nocrypto-${version}"; + version = "0.5.4"; src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-nocrypto"; rev = "v${version}"; - sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl"; + sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p"; }; - buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; + buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild topkg opam cpuid ocb-stubblr + ppx_sexp_conv ]; propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt; - configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"]; + buildPhase = '' + LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \ + ${topkg.buildPhase} --with-lwt ${boolToString withLwt} + ''; + inherit (topkg) installPhase; - configurePhase = "./configure --prefix $out $configureFlags"; - - doCheck = true; - checkTarget = "test"; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index b967728d048c..950395bd7eaa 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -29,7 +29,7 @@ buildOcaml rec { optional withLwt lwt; buildPhase = topkg.buildPhase - + " --with-lwt ${if withLwt then "true" else "false"}"; + + " --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 439beaa24ffc..0ad5d09d687c 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,20 +1,28 @@ -{ stdenv, fetchurl, libvirt, ocaml, findlib }: +{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: stdenv.mkDerivation rec { name = "ocaml-libvirt-${version}"; - version = "0.6.1.4"; + rev = "3169af3"; + version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4 - src = fetchurl { - url = "http://libvirt.org/sources/ocaml/ocaml-libvirt-${version}.tar.gz"; - sha256 = "06q2y36ckb34n179bwczxkl82y3wrba65xb2acg8i04jpiyxadjd"; + src = fetchgit { + url = "git://git.annexia.org/git/ocaml-libvirt.git"; + rev = rev; + sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg"; }; propagatedBuildInputs = [ libvirt ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ autoconf findlib ]; + + buildInputs = [ ocaml ]; createFindlibDestdir = true; + preConfigure = '' + autoconf + ''; + buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt"; installPhase = "make install-opt"; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix new file mode 100644 index 000000000000..46cc922917e2 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "let-def"; + repo = "ocaml-migrate-parsetree"; + rev = "v${version}"; + sha256 = "142svvixhz153argd3khk7sr38dhiy4w6sck4766f8b48p41pp3m"; + }; + + buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; + propagatedBuildInputs = [ result ]; + + installPhase = '' + for p in *.install + do + ${jbuilder.installPhase} $p + done + ''; + + meta = { + description = "Convert OCaml parsetrees between different major versions"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index f531de5118ea..362ad697934f 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: -let version = "1.1"; in +let version = "1.2"; in stdenv.mkDerivation { - name = "ocaml-result-${version}"; + name = "ocaml${ocaml.version}-result-${version}"; src = fetchFromGitHub { owner = "janestreet"; repo = "result"; rev = "${version}"; - sha256 = "05y07rxdbkaxsc8cy458y00gq05i8gp35hhwg1b757mam21ccxxz"; + sha256 = "1jwzpcmxwgkfsbjz9zl59v12hf1vv4r9kiifancn9p8gm206g3g0"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 4f7c79142019..f6379c8b5a75 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,24 +1,22 @@ -{stdenv, fetchurl, ocaml, findlib, ocamlPackages }: +{stdenv, fetchurl, ocaml, findlib, lablgtk}: stdenv.mkDerivation rec { name = "ocamlgraph-${version}"; - version = "1.8.5"; + version = "1.8.7"; src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi"; + sha256 = "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz"; }; - buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ]; + buildInputs = [ ocaml findlib lablgtk ]; + + patches = ./destdir.patch; - # some patching is required so that the lablgtk2 library is taken into account. It - # does not reside in a subdirectory of the default library path, hence: - # * configure looked in the wrong path - # * ocaml needs that directory and the stubs directory as -I flag postPatch = '' - sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(prefix)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in - sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2@' configure Makefile.in - sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile + sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in + sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in + sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile ''; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix new file mode 100644 index 000000000000..4da9fb45d332 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }: + +if stdenv.lib.versionOlder ocaml.version "4.03" +then throw "ocf not supported for ocaml ${ocaml.version}" +else +stdenv.mkDerivation rec { + name = "ocf-${version}"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "ocf"; + rev = "release-${version}"; + sha256 = "1fhq9l2nmr39hxzpavc0jssmba71nnmhsncdn4dsbh2ylv29w56y"; + }; + + buildInputs = [ ocaml findlib ppx_tools ]; + propagatedBuildInputs = [ yojson ]; + + createFindlibDestdir = true; + + dontStrip = true; + + patches = [(fetchpatch { + url = "https://github.com/zoggy/ocf/commit/3a231c7a6c5e535a77c25e207af8952793436444.patch"; + sha256 = "0nc8cggc5gxhch9amaz3s71lxs1xbgi7fs9p90cng04dsgr64xk5"; + }) + ]; + + meta = with stdenv.lib; { + description = "OCaml library to read and write configuration options in JSON syntax"; + homepage = "https://zoggy.github.io/ocf/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix new file mode 100644 index 000000000000..bf0e98ec1952 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, pprint }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; + version = "0.3"; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocp-ocamlres"; + rev = "v${version}"; + sha256 = "0pm1g38f6pmch1x4pcc09ky587x5g7p7n9dfbbif8zkjqr603ixg"; + }; + + buildInputs = [ ocaml findlib pprint ]; + createFindlibDestdir = true; + + installFlags = [ "BINDIR=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; + + meta = { + description = "A simple tool and library to embed files and directories inside OCaml executables"; + license = stdenv.lib.licenses.lgpl3Plus; + homepage = https://www.typerex.org/ocp-ocamlres.html; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix new file mode 100644 index 000000000000..cadb65bcbed9 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocplib-json-typed-${version}"; + version = "0.5"; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocplib-json-typed"; + rev = "v${version}"; + sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q"; + }; + + buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ]; + propagatedBuildInputs = [ uri ]; + + createFindlibDestdir = true; + + meta = { + description = "A collection of type-aware JSON utilities for OCaml"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 8d949497b465..c8e60015d013 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,6 +1,7 @@ {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, -ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, +lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 +, camlzip, pgocaml }: let mkpath = p: n: @@ -16,9 +17,9 @@ stdenv.mkDerivation { sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; }; - buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt + buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 ]; + ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; configureFlags = "--root $(out) --prefix /"; @@ -30,7 +31,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath ocaml_lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix new file mode 100644 index 000000000000..13794602af4f --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }: + +buildOcaml rec +{ + name = "ocsigen-start"; + version = "1.0.0"; + + buildInputs = [ eliom ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ]; + + patches = [ ./templates-dir.patch ]; + + postPatch = '' + substituteInPlace "src/os_db.ml" --replace "citext" "text" + ''; + + src = fetchurl { + url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; + sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll"; + }; + + createFindlibDestdir = true; + + meta = { + homepage = http://ocsigen.org/ocsigen-start; + description = "Eliom application skeleton"; + longDescription ='' + An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. + ''; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch new file mode 100644 index 000000000000..38365a26b99a --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/install.sh b/scripts/install.sh +index f88ae11..d6aae70 100755 +--- a/scripts/install.sh ++++ b/scripts/install.sh +@@ -11,9 +11,9 @@ fi + + TPL_DIR=$1 + TPL_NAME=$2 +-DEST0=$DESTDIR/$(eliom-distillery -dir) ++DEST0=$out/eliom-distillery-templates + DEST=$DEST0/$TPL_NAME + + mkdir -p $DEST0 diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix new file mode 100644 index 000000000000..00416c92bb94 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }: + +buildOcaml rec +{ + name = "ocsigen-toolkit"; + version = "1.0.0"; + + propagatedBuildInputs = [ eliom ]; + buildInputs = [ opam ]; + + createFindlibDestdir = true; + + installPhase = + '' + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH + make install + opam-installer --prefix=$out + ''; + + src = fetchurl { + sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2"; + url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; + }; + + meta = { + homepage = http://ocsigen.org/ocsigen-toolkit/; + description = " User interface widgets for Ocsigen applications"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + }; + + +} diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix new file mode 100644 index 000000000000..f1668160df19 --- /dev/null +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "octavius is not available for OCaml ${ocaml.version}" else + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-octavius-0.2.0"; + src = fetchurl { + url = http://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz; + sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Ocamldoc comment syntax parser"; + homepage = https://github.com/ocaml-doc/octavius; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 974779e473ff..94c2e1208839 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr"; }; - buildInputs = [ocaml findlib curl ncurses]; + buildInputs = [ ocaml findlib ncurses ]; + propagatedBuildInputs = [ curl ]; createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index a8b3ed158625..f4d1ef829bb4 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, buildOcaml, calendar, csv, re }: +{ stdenv, fetchurl, buildOcaml, ocaml, calendar, csv, re }: + +if !stdenv.lib.versionAtLeast ocaml.version "4" +then throw "pgocaml is not available for OCaml ${ocaml.version}" +else buildOcaml { name = "pgocaml"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 488a13ecf161..165a566b1b71 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, base64, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }: stdenv.mkDerivation rec { version = "0.7.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; }; - buildInputs = [ocaml findlib piqi base64 camlp4]; + buildInputs = [ ocaml findlib piqi camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index 273cd8f1862c..f8126f91d876 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -9,13 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l"; }; - buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64]; - propagatedBuildInputs = [ulex xmlm easy-format]; + buildInputs = [ocaml findlib camlp4 which ocaml_optcomp]; + propagatedBuildInputs = [ulex xmlm easy-format base64]; patches = [ ./no-ocamlpath-override.patch ]; createFindlibDestdir = true; + buildPhase = '' + make + make -C piqilib piqilib.cma + ''; + installPhase = '' make install; make ocaml-install; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix new file mode 100644 index 000000000000..69276fb5a7d6 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, cppo +, ppx_import, ppx_deriving, yojson, ounit +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "whitequark"; + repo = "ppx_deriving_yojson"; + rev = "v${version}"; + sha256 = "1id1a29qq0ax9qp98b5hv6p2q2r0vp4fbkkwzm1bxdhnasw97msk"; + }; + + buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ]; + + propagatedBuildInputs = [ ppx_deriving yojson ]; + + inherit (topkg) installPhase; + + doCheck = true; + checkTarget = "test"; + + meta = { + description = "A Yojson codec generator for OCaml >= 4.02."; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix new file mode 100644 index 000000000000..b680bcdd48c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildOcaml, fetchFromGitHub, ocaml-migrate-parsetree }: + +buildOcaml rec { + name = "ppx_tools_versioned"; + version = "5.0.1"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "let-def"; + repo = "ppx_tools_versioned"; + rev = version; + sha256 = "1rpbxbhk3k7f61h7lr4qkllkc12gjpq0rg52q7i6hcrg2dxkhwh6"; + }; + + propagatedBuildInputs = [ ocaml-migrate-parsetree ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/let-def/ppx_tools_versioned; + description = "Tools for authors of syntactic tools (such as ppx rewriters)"; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index b8017134e526..bb4bbef516c8 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,28 +1,25 @@ -{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam}: +{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam, js_of_ocaml }: buildOcaml rec { - version = "0.8.2"; + version = "0.8.3"; name = "ptime"; src = fetchurl { url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "1lihkhzskzwxskiarh4mvf7gbz5nfv25vmazbfz81m344i32a5pj"; + sha256 = "18jimskgnd9izg7kn6zk6sk35adgjm605dkv13plwslbb90kqr44"; }; unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg opam js_of_ocaml ]; propagatedBuildInputs = [ result ]; buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml false + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml true ''; - installPhase = '' - opam-installer --script --prefix=$out ptime.install | sh - ln -s $out/lib/ptime $out/lib/ocaml/${ocaml.version}/site-lib - ''; + inherit (topkg) installPhase; meta = { homepage = http://erratique.ch/software/ptime; diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix new file mode 100644 index 000000000000..aa44fe3d009b --- /dev/null +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip, ocaml, findlib, obuild }: + +let version = "2.0.1"; in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-ptmap-${version}"; + + src = fetchzip { + url = "https://github.com/UnixJunkie/ptmap/archive/v${version}.tar.gz"; + sha256 = "09ib4q5amkac2yy0hr7yn1n1j6y10v08chh82qc70wl7s473if15"; + }; + + buildInputs = [ ocaml findlib obuild ]; + + createFindlibDestdir = true; + + buildPhase = '' + substituteInPlace ptmap.obuild --replace 'build-deps: qcheck' "" + obuild configure + obuild build lib-ptmap + ''; + + installPhase = '' + obuild install --destdir $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + meta = { + homepage = https://www.lri.fr/~filliatr/software.en.html; + platforms = ocaml.meta.platforms or []; + description = "Maps over integers implemented as Patricia trees"; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 158c69ef11a8..695a751c7a94 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; stdenv.mkDerivation { - name = "ocaml-qcheck-0.4.0.1"; + name = "ocaml${ocaml.version}-qcheck-0.6"; src = fetchzip { - url = https://github.com/c-cube/qcheck/archive/0.4.0.1.tar.gz; - sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv"; + url = https://github.com/c-cube/qcheck/archive/0.6.tar.gz; + sha256 = "14rlg0jh4p12sd9xagppacsbfw0239anbq5r1aqhsqxlfmzbmi1p"; }; - buildInputs = [ ocaml findlib ocamlbuild oasis ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configureFlags = "--enable-tests --enable-ounit"; + configureFlags = "--enable-tests"; doCheck = true; checkPhase = "ocaml setup.ml -test"; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index 6d5f8ecc6833..4d3ab0ddb4f2 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: +if !stdenv.lib.versionAtLeast ocaml.version "4" +then throw "qtest is not available for OCaml ${ocaml.version}" +else + let version = "2.2"; in stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix new file mode 100644 index 000000000000..a62c321a4e83 --- /dev/null +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, benchmark }: + +let version = "0.5"; in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-rope-${version}"; + + src = fetchzip { + url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-${version}.tar.gz"; + sha256 = "1i8kzg19jrapl30mq8m91vy09z0r0dl4bnpw24ga96w8pxqf9qhd"; + }; + + buildInputs = [ ocaml findlib ocamlbuild benchmark ]; + + createFindlibDestdir = true; + + meta = { + homepage = http://rope.forge.ocamlcore.org/; + platforms = ocaml.meta.platforms or []; + description = ''Ropes ("heavyweight strings") in OCaml''; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix new file mode 100644 index 000000000000..f9951b56da2d --- /dev/null +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-rresult-${version}"; + version = "0.5.0"; + src = fetchurl { + url = "http://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; + sha256 = "1xxycxhdhaq8p9vhwi93s2mlxjwgm44fcxybx5vghzgbankz9yhm"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + license = stdenv.lib.licenses.isc; + homepage = http://erratique.ch/software/rresult; + description = "Result value combinators for OCaml"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index cfc74ad16683..b6c66c82811d 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -4,16 +4,16 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; let pname = "sawja"; - version = "1.5"; + version = "1.5.2"; webpage = "http://sawja.inria.fr/"; in stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33091/${pname}-${version}.tar.bz2"; - sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm"; + url = https://gforge.inria.fr/frs/download.php/file/36093/sawja-1.5.2.tar.bz2; + sha256 = "12046arkxiy4gf1s17hyc0yzydjzpzwqxn13sbkbxl8xzvmankx4"; }; buildInputs = [ which perl ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 5dbc74ef5436..1e3cb02b913a 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools }: +{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "sedlex is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-${version}"; - version = "1.99.3"; + name = "ocaml${ocaml.version}-sedlex-${version}"; + version = "1.99.4"; src = fetchzip { url = "http://github.com/alainfrisch/sedlex/archive/v${version}.tar.gz"; - sha256 = "1wghjy3qyj43ll1ikchlqy7fv2hxcn3ap9xgsscm2ch09d8dcv7y"; + sha256 = "1b7nqxyfcz8i7m4b8zil2rn6ygh2czy26f9v64xnxn8r0hy9sh1m"; }; - buildInputs = [ ocaml findlib ppx_tools ]; + buildInputs = [ ocaml findlib ppx_tools_versioned ]; propagatedBuildInputs = [ gen ]; @@ -19,6 +21,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + dontStrip = true; + meta = { homepage = https://github.com/alainfrisch/sedlex; description = "An OCaml lexer generator for Unicode"; diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix index ae973178d137..34f342faaa3f 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/sequence/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: -let version = "0.8"; in +let version = "0.10"; in stdenv.mkDerivation { - name = "ocaml-sequence-${version}"; + name = "ocaml${ocaml.version}-sequence-${version}"; src = fetchFromGitHub { owner = "c-cube"; repo = "sequence"; - rev = "${version}"; - sha256 = "1y9nkz6g4plnbk1pcdbvs7f719r48zxrp3gsaxyq1vg98i9h8qr3"; + rev = version; + sha256 = "0pl8pv758wn8bm555i8f0fvfn2pw88w1bmzjrzrv01092d85wx1g"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index a8acee1c5388..685f2afb0b46 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,6 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: -assert stdenv.lib.versionOlder "3.12" ocaml.version; +if !stdenv.lib.versionAtLeast ocaml.version "3.12" +|| stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "sexlib-108.08.00 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { name = "ocaml-sexplib-108.08.00"; diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index a8724f23cfe8..e98a2ecdb30e 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -1,6 +1,9 @@ {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: -assert stdenv.lib.versionOlder "4.00" ocaml.version; +if !stdenv.lib.versionAtLeast ocaml.version "4.00" +|| stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "sexlib-111.25.00 is not available for OCaml ${ocaml.version}" else + stdenv.mkDerivation { name = "ocaml-sexplib-111.25.00"; diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix index b63b5af05e82..24cdb497189e 100644 --- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix +++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix @@ -1,4 +1,8 @@ -{stdenv, buildOcaml, fetchurl, type_conv, camlp4}: +{ stdenv, buildOcaml, fetchurl, ocaml, type_conv, camlp4 }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +|| stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "sexlib-112.24.01 is not available for OCaml ${ocaml.version}" else buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix index c12e47968ef0..1eb789ec2690 100644 --- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchFromGitHub, ocaml, findlib, owee }: +if !stdenv.lib.versionAtLeast ocaml.version "4.04" +then throw "spacetime_lib is not available for OCaml ${ocaml.version}" else + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-spacetime_lib-${version}"; version = "0.1.0"; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 9eb9ad514f72..c932bc3a46ac 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -3,14 +3,14 @@ , doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" }: -let version = "1.4.0"; in +let version = "1.4.3"; in stdenv.mkDerivation { - name = "ocaml-stringext-${version}"; + name = "ocaml${ocaml.version}-stringext-${version}"; src = fetchzip { url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz"; - sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii"; + sha256 = "121k79vjazvsd254yg391fp4spsd1p32amccrahd0g6hjhf5w6sl"; }; buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index f343eed6b467..fa238a84b35c 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: +if !stdenv.lib.versionAtLeast ocaml.version "4.01" +then throw "topkg is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-topkg-${version}"; version = "0.8.1"; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index d47d5d3169b6..01fa5b7ba6ab 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,44 +1,40 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ctypes, result, SDL2, pkgconfig, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, opam, ocb-stubblr }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "tsdl is not available for OCaml ${ocaml.version}" +else let - inherit (stdenv.lib) getVersion; - pname = "tsdl"; - version = "0.9.0"; + version = "0.9.4"; webpage = "http://erratique.ch/software/${pname}"; - in stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm"; + sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2"; }; - buildInputs = [ ocaml findlib ocamlbuild result pkgconfig opam ]; + buildInputs = [ ocaml findlib ocamlbuild topkg result pkgconfig opam ocb-stubblr ]; propagatedBuildInputs = [ SDL2 ctypes ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' + preConfigure = '' # The following is done to avoid an additional dependency (ncurses) # due to linking in the custom bytecode runtime. Instead, just # compile directly into a native binary, even if it's just a # temporary build product. substituteInPlace myocamlbuild.ml \ --replace ".byte" ".native" - - ocaml pkg/build.ml native=true native-dynlink=true ''; - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { homepage = "${webpage}"; diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index e5831be93bda..207a7b183e6e 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, ocaml, findlib }: stdenv.mkDerivation { - name = "ocaml-twt-0.94.0"; + name = "ocaml${ocaml.version}-twt-0.94.0"; src = fetchzip { url = https://github.com/mlin/twt/archive/v0.94.0.tar.gz; @@ -20,6 +20,8 @@ stdenv.mkDerivation { installFlags = "PREFIX=$(out)"; + dontStrip = true; + meta = with stdenv.lib; { homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/; description = "“The Whitespace Thing” for OCaml"; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 4a3d8c58f0ba..f17e5a7b89ef 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,6 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -assert stdenv.lib.versionOlder "3.12" ocaml.version; +if !stdenv.lib.versionAtLeast ocaml.version "3.12" +|| stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { name = "ocaml-type_conv-108.08.00"; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index ae2b62f6b360..5e6f5967d138 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,6 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -assert stdenv.lib.versionOlder "4.00" ocaml.version; +if !stdenv.lib.versionAtLeast ocaml.version "4.00" +|| stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { name = "ocaml-type_conv-109.60.01"; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index ae41c8729607..f08ee7fc2fc1 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -4,7 +4,9 @@ , sexplib_p4 }: -assert stdenv.lib.versionAtLeast ocaml.version "4"; +if !stdenv.lib.versionAtLeast ocaml.version "4" +|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else with if legacyVersion diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index d44309b266a5..89d9d545e57d 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "4.0.0"; + version = "10.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "11cjfwa4wjhsyvzq4wl9z44xi28n49drz8nbfpx754vyfzwj3yc6"; + sha256 = "0cdyg6vaic4n58w80qriwvaq1c40ng3fh74ilxrwajbq163k055q"; }; buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index db0b29d94c50..cf5b05492330 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, uunf }: let pname = "uucp"; - version = "2.0.0"; + version = "10.0.1"; webpage = "http://erratique.ch/software/${pname}"; in @@ -14,10 +14,10 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "07m7pfpcf03dqsbvqpq88y9hzic8fighlp4fgbav6n6xla35mk5k"; + sha256 = "0qgbrx3lnrzii8a9f0hv4kp73y57q6fr79hskxxxs70q68j2xpfm"; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf uunf ]; propagatedBuildInputs = [ uchar ]; @@ -25,7 +25,9 @@ stdenv.mkDerivation { unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; + buildPhase = "${topkg.buildPhase} --with-cmdliner false"; + + inherit (topkg) installPhase; meta = with stdenv.lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index a9c7add6129b..d65f002ebef3 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "2.0.0"; + version = "10.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1i132168949vdc8magycgf9mdysf50vvr7zngnjl4vi3zdayq20c"; + sha256 = "0c5lwica5668ybsffllk6x4p921nw4pljimgqikhf17k5hvyjsbr"; }; buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ]; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index d1e958144612..f55b757eb268 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "1.0.0"; + version = "10.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0m5n0kn70w862g5dhfkfvrnmb98z1r02g21ap7l81hy8sn08cbsz"; + sha256 = "01q8ljjgi7d73x7ms489b5my83xds4jax1vbjhwwjdai01friscc"; }; buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ]; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index feb197defc32..93e3fd9c9d2e 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "08i0cw02cxw4mi2rs01v9xi307qshs6fnd1dlqyb52kcxzblpp37"; + sha256 = "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj"; }; buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index cb7878ac731e..ba33081486d7 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg , uchar, result, gg, uutf, otfm, js_of_ocaml, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: +with lib; + let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; version = "0.9.0"; webpage = "http://erratique.ch/software/${pname}"; - sob = b: if b then "true" else "false"; in assert versionAtLeast ocaml.version "4.02.0"; @@ -35,13 +36,14 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; buildPhase = topkg.buildPhase - + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}" - + " --with-js_of_ocaml ${sob htmlcBackend}" - + " --with-cairo2 false"; + + " --with-uutf ${boolToString pdfBackend}" + + " --with-otfm ${boolToString pdfBackend}" + + " --with-js_of_ocaml ${boolToString htmlcBackend}" + + " --with-cairo2 false"; inherit (topkg) installPhase; - meta = with stdenv.lib; { + meta = { description = "Declarative 2D vector graphics for OCaml"; longDescription = '' Vg is an OCaml module for declarative 2D vector graphics. In Vg, images diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix new file mode 100644 index 000000000000..86c9974c9316 --- /dev/null +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, uutf, sedlex, ppx_tools, js_of_ocaml +, re }: + +if stdenv.lib.versionOlder ocaml.version "4.03" +then throw "xtmpl not supported for ocaml ${ocaml.version}" +else +stdenv.mkDerivation rec { + name = "xtmpl-${version}"; + version = "0.16.0"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "xtmpl"; + rev = version; + sha256 = "1dj5b4b266y4d8q3v1g0xsivz4vkhj0gi0jis37w84xcnlgiik8k"; + }; + + buildInputs = [ ocaml findlib ppx_tools js_of_ocaml ]; + propagatedBuildInputs = [ sedlex uutf re ]; + + createFindlibDestdir = true; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Xml template library for OCaml"; + homepage = "https://zoggy.github.io/xtmpl/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} diff --git a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch b/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch new file mode 100644 index 000000000000..7b513f21a29f --- /dev/null +++ b/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch @@ -0,0 +1,10 @@ +--- File-Slurp-9999.19.orig/lib/File/Slurp.pm 2011-05-30 21:58:53.000000000 +0200 ++++ File-Slurp-9999.19/lib/File/Slurp.pm 2017-04-28 10:05:59.047681755 +0200 +@@ -4,6 +4,7 @@ + + use strict; + use warnings ; ++no warnings 'deprecated'; + + use Carp ; + use Exporter ; diff --git a/pkgs/development/perl-modules/perl-opengl.patch b/pkgs/development/perl-modules/perl-opengl.patch index 77bba1efa41c..a44dc4f2e42d 100644 --- a/pkgs/development/perl-modules/perl-opengl.patch +++ b/pkgs/development/perl-modules/perl-opengl.patch @@ -2,12 +2,14 @@ diff --git a/Makefile.PL b/Makefile.PL index 55c485c..8501c02 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -116,12 +116,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) +@@ -124,14 +124,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) # Look for available libs our @libdirs = qw { - -L/usr/lib +- -L/usr/lib/i386-linux-gnu - -L/usr/X11R6/lib +- -L/opt/X11/lib - -L/usr/local/lib - -L/usr/openwin/lib - -L/opt/csw/lib diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 02004061b83a..911680b1eb8d 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -43,6 +43,19 @@ stdenv.mkDerivation rec { chmod +x $prefix/bin/${executable-name} ''; + doCheck = true; + + checkPhase = '' + # Launcher should be able to run for a few seconds without crashing. + (set +e + export HOME=. # Pharo will try to create files here + secs=5 + echo -n "Running headless Pharo for $secs seconds to check for a crash... " + timeout $secs \ + ${pharo-vm}/bin/pharo-vm-nox PharoLauncher.image --no-quit eval 'true' + test "$?" == 124 && echo "ok") + ''; + meta = { description = "Launcher for Pharo distributions"; longDescription = '' @@ -65,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.lukego ]; platforms = pharo-vm.meta.platforms; }; } diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 1eeb5dc31517..1f9e82f866ee 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mimeType = "application/x-pharo-image"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "pic" ]; # Building preConfigure = '' diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index 9f9527d0f025..f1a54eb50aed 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, pure, octave }: +{ stdenv, fetchurl, pkgconfig, pure, octave, gcc6 }: stdenv.mkDerivation rec { baseName = "octave"; - version = "0.7"; + version = "0.9"; name = "pure-${baseName}-${version}"; src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; - sha256 = "04c1q5cjcyc5sg15ny1hn43rkphja3virw4k110cahc3piwbpsqk"; + sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; - buildInputs = [ pkgconfig ]; + buildInputs = [ pkgconfig gcc6 ]; propagatedBuildInputs = [ pure octave ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { description = "An Octave module for the Pure programming language"; homepage = http://puredocs.bitbucket.org/pure-octave.html; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + # This is set to none for now because it does not work with the + # current stable version of Octave. + platforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ asppsa ]; }; } diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix new file mode 100644 index 000000000000..9efcbbfa7d31 --- /dev/null +++ b/pkgs/development/python-modules/3to2/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "3to2"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test lib3to2/tests + ''; + + # Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35) + doCheck = false; + + meta = { + homepage = https://bitbucket.org/amentajo/lib3to2; + description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mt-caret ]; + }; +} diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix new file mode 100644 index 000000000000..a556aebc47ed --- /dev/null +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytestcov +, sqlalchemy +, tornado +, twisted +, mock +, trollius +, gevent +, six +, pytz +, tzlocal +, funcsigs +, futures +, isPy3k +}: + +buildPythonPackage rec { + pname = "APScheduler"; + version = "3.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b"; + }; + + buildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + pytest + pytestcov + sqlalchemy + tornado + twisted + mock + trollius + gevent + ]; + + propagatedBuildInputs = [ + six + pytz + tzlocal + funcsigs + ] ++ lib.optional (!isPy3k) futures; + + checkPhase = '' + py.test + ''; + + # Somehow it cannot find pytestcov + doCheck = false; + + meta = with lib; { + description = "A Python library that lets you schedule your Python code to be executed"; + homepage = http://pypi.python.org/pypi/APScheduler/; + license = licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix new file mode 100644 index 000000000000..520a9c3a30b0 --- /dev/null +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, doit +, glibcLocales +, pytest +, pytestcov +, pytest-mock +, pygments +, pillow +, dateutil +, docutils +, Mako +, unidecode +, lxml +, Yapsy +, PyRSS2Gen +, Logbook +, blinker +, setuptools +, natsort +, requests +, piexif +, markdown +, phpserialize +, jinja2 +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Nikola"; + version = "7.8.9"; + + # Nix contains only Python 3 supported version of doit, which is a dependency + # of Nikola. Python 2 support would require older doit 0.29.0 (which on the + # other hand doesn't support Python 3.3). So, just disable Python 2. + disabled = !isPy3k; + + buildInputs = [ pytest pytestcov pytest-mock glibcLocales ]; + + propagatedBuildInputs = [ + pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen + Logbook blinker setuptools natsort requests piexif markdown phpserialize + jinja2 doit + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "c85bf293a245a34057fb55236fc2f2c5d28e9ef1c375889f443bca1d86924df4"; + }; + + meta = { + homepage = "https://getnikola.com/"; + description = "A modular, fast, simple, static website and blog generator"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix new file mode 100644 index 000000000000..893caa88d676 --- /dev/null +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -0,0 +1,24 @@ +{ lib , buildPythonPackage , fetchPypi, tkinter }: + +buildPythonPackage rec { + pname = "Pmw"; + version = "2.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "080iml3868nxniyn56kcwnbghm10j7fw74a5nj0s19sm4zsji78b"; + }; + + propagatedBuildInputs = [ tkinter ]; + + # Disable tests due to their xserver requirement + doCheck = false; + + meta = { + description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; + homepage = "http://pmw.sourceforge.net/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mounium ]; + }; +} diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix new file mode 100644 index 000000000000..e4edaf83a25c --- /dev/null +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }: + +let + + json-ld = fetchFromGitHub { + owner = "json-ld"; + repo = "json-ld.org"; + rev = "843a70e4523d7cd2a4d3f5325586e726eb1b123f"; + sha256 = "05j0nq6vafclyypxjj30iw898ig0m32nvz0rjdlslx6lawkiwb2a"; + }; + + normalization = fetchFromGitHub { + owner = "json-ld"; + repo = "normalization"; + rev = "aceeaf224b64d6880189d795bd99c3ffadb5d79e"; + sha256 = "125q5rllfm8vg9mz8hn7bhvhv2vqpd86kx2kxlk84smh33l8kbyl"; + }; + +in + +buildPythonPackage rec { + pname = "PyLD"; + version = "0.7.2"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "digitalbazaar"; + repo = "pyld"; + rev = "652473f828e9a396d4c1db9addbd294fb7db1797"; + sha256 = "1bmpz4s6j7by6l45wwxy7dn7hmrhxc26kbx2hbfy41x29vbjg6j9"; + }; + + # Unfortunately PyLD does not pass all testcases in the JSON-LD corpus. We + # check for at least a minimum amount of successful tests so we know it's not + # getting worse, at least. + checkPhase = '' + ok_min=401 + + if ! ${python.interpreter} tests/runtests.py -d ${json-ld}/test-suite 2>&1 | tee test.out; then + ok_count=$(${gnugrep}/bin/grep -F '... ok' test.out | wc -l) + if [[ $ok_count -lt $ok_min ]]; then + echo "Less than $ok_min tests passed ($ok_count). Failing the build." + exit 1 + fi + fi + + ${python.interpreter} tests/runtests.py -d ${normalization}/tests + ''; + + meta = with stdenv.lib; { + description = "Python implementation of the JSON-LD API"; + homepage = "https://github.com/digitalbazaar/pyld"; + license = licenses.bsd3; + maintainers = with maintainers; [ apeschar ]; + }; +} diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix new file mode 100644 index 000000000000..11a6fc96eb2f --- /dev/null +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +}: + +buildPythonPackage rec { + pname = "Pygments"; + version = "2.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv"; + }; + + propagatedBuildInputs = [ docutils ]; + + # Circular dependency with sphinx + doCheck = false; + + meta = { + homepage = http://pygments.org/; + description = "A generic syntax highlighter"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nckx garbas ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix index c9ea79bef9a8..f8b7a713d08e 100644 --- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix +++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix @@ -1,5 +1,7 @@ { buildPythonPackage , fetchFromGitHub +, pythonOlder +, future , numpy , six , scipy @@ -56,7 +58,8 @@ buildPythonPackage rec { pycuda cudatoolkit libgpuarray - ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]); + cudnn + ] ++ (stdenv.lib.optional (pythonOlder "3.0") future); passthru.cudaSupport = true; } diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix index 6efa945b0e61..902554070029 100644 --- a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix +++ b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - name = "Theano-0.8.2"; + name = "Theano-0.9.0"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = fetchurl { url = "mirror://pypi/T/Theano/${name}.tar.gz"; - sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930"; + sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; }; #preCheck = '' diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix new file mode 100644 index 000000000000..f7b6aeae6157 --- /dev/null +++ b/pkgs/development/python-modules/Wand/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, imagemagick +, pytest +, psutil +, memory_profiler +, pytest_xdist +, sharedLibraryExtension +}: + +let + magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${sharedLibraryExtension}"; + imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${sharedLibraryExtension}"; +in buildPythonPackage rec { + pname = "Wand"; + version = "0.4.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "28e0454c9d16d69c5d5034918d96320d8f9f1377b4fdaf4944eec2f938c74704"; + }; + + checkInputs = [ pytest pytest_xdist memory_profiler psutil ]; + + buildInputs = [ imagemagick ]; + + patches = [ + ./libraries.patch + ]; + + inherit magick_wand_library imagemagick_library; + + postPatch = '' + substituteAllInPlace wand/api.py + ''; + + # No tests + doCheck = false; + meta = { + description = "Ctypes-based simple MagickWand API binding for Python"; + homepage = http://wand-py.org/; + license = with lib.licenses; [ mit ]; + }; + + passthru = { + inherit imagemagick; + }; +} diff --git a/pkgs/development/python-modules/Wand/libraries.patch b/pkgs/development/python-modules/Wand/libraries.patch new file mode 100644 index 000000000000..15b19f5168bd --- /dev/null +++ b/pkgs/development/python-modules/Wand/libraries.patch @@ -0,0 +1,149 @@ +diff --git a/wand/api.py b/wand/api.py +index 2c18513..1a1b511 100644 +--- a/wand/api.py ++++ b/wand/api.py +@@ -43,98 +43,6 @@ class c_magick_char_p(ctypes.c_char_p): + """ + library.MagickRelinquishMemory(self) + +- +-def library_paths(): +- """Iterates for library paths to try loading. The result paths are not +- guaranteed that they exist. +- +- :returns: a pair of libwand and libmagick paths. they can be the same. +- path can be ``None`` as well +- :rtype: :class:`tuple` +- +- """ +- libwand = None +- libmagick = None +- versions = '', '-6', '-Q16', '-Q8', '-6.Q16' +- options = '', 'HDRI', 'HDRI-2' +- system = platform.system() +- magick_home = os.environ.get('MAGICK_HOME') +- +- if system == 'Windows': +- # ImageMagick installers normally install coder and filter DLLs in +- # subfolders, we need to add those folders to PATH, otherwise loading +- # the DLL later will fail. +- try: +- with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, +- r"SOFTWARE\ImageMagick\Current") as reg_key: +- libPath = winreg.QueryValueEx(reg_key, "LibPath") +- coderPath = winreg.QueryValueEx(reg_key, "CoderModulesPath") +- filterPath = winreg.QueryValueEx(reg_key, "FilterModulesPath") +- magick_home = libPath[0] +- os.environ['PATH'] += (';' + libPath[0] + ";" + +- coderPath[0] + ";" + filterPath[0]) +- except OSError: +- # otherwise use MAGICK_HOME, and we assume the coder and +- # filter DLLs are in the same directory +- pass +- +- def magick_path(path): +- return os.path.join(magick_home, *path) +- combinations = itertools.product(versions, options) +- for suffix in (version + option for version, option in combinations): +- # On Windows, the API is split between two libs. On other platforms, +- # it's all contained in one. +- if magick_home: +- if system == 'Windows': +- libwand = 'CORE_RL_wand_{0}.dll'.format(suffix), +- libmagick = 'CORE_RL_magick_{0}.dll'.format(suffix), +- yield magick_path(libwand), magick_path(libmagick) +- libwand = 'libMagickWand{0}.dll'.format(suffix), +- libmagick = 'libMagickCore{0}.dll'.format(suffix), +- yield magick_path(libwand), magick_path(libmagick) +- elif system == 'Darwin': +- libwand = 'lib', 'libMagickWand{0}.dylib'.format(suffix), +- yield magick_path(libwand), magick_path(libwand) +- else: +- libwand = 'lib', 'libMagickWand{0}.so'.format(suffix), +- yield magick_path(libwand), magick_path(libwand) +- if system == 'Windows': +- libwand = ctypes.util.find_library('CORE_RL_wand_' + suffix) +- libmagick = ctypes.util.find_library('CORE_RL_magick_' + suffix) +- yield libwand, libmagick +- libwand = ctypes.util.find_library('libMagickWand' + suffix) +- libmagick = ctypes.util.find_library('libMagickCore' + suffix) +- yield libwand, libmagick +- else: +- libwand = ctypes.util.find_library('MagickWand' + suffix) +- yield libwand, libwand +- +- +-def load_library(): +- """Loads the MagickWand library. +- +- :returns: the MagickWand library and the ImageMagick library +- :rtype: :class:`ctypes.CDLL` +- +- """ +- tried_paths = [] +- for libwand_path, libmagick_path in library_paths(): +- if libwand_path is None or libmagick_path is None: +- continue +- try: +- tried_paths.append(libwand_path) +- libwand = ctypes.CDLL(libwand_path) +- if libwand_path == libmagick_path: +- libmagick = libwand +- else: +- tried_paths.append(libmagick_path) +- libmagick = ctypes.CDLL(libmagick_path) +- except (IOError, OSError): +- continue +- return libwand, libmagick +- raise IOError('cannot find library; tried paths: ' + repr(tried_paths)) +- +- + if not hasattr(ctypes, 'c_ssize_t'): + if ctypes.sizeof(ctypes.c_uint) == ctypes.sizeof(ctypes.c_void_p): + ctypes.c_ssize_t = ctypes.c_int +@@ -176,43 +84,14 @@ class AffineMatrix(ctypes.Structure): + # Preserve the module itself even if it fails to import + sys.modules['wand._api'] = sys.modules['wand.api'] + +-try: +- libraries = load_library() +-except (OSError, IOError): +- msg = 'http://docs.wand-py.org/en/latest/guide/install.html' +- if sys.platform.startswith(('dragonfly', 'freebsd')): +- msg = 'pkg install' +- elif sys.platform == 'win32': +- msg += '#install-imagemagick-on-windows' +- elif sys.platform == 'darwin': +- mac_pkgmgrs = {'brew': 'brew install freetype imagemagick', +- 'port': 'port install imagemagick'} +- for pkgmgr in mac_pkgmgrs: +- with os.popen('which ' + pkgmgr) as f: +- if f.read().strip(): +- msg = mac_pkgmgrs[pkgmgr] +- break +- else: +- msg += '#install-imagemagick-on-mac' +- else: +- distname, _, __ = platform.linux_distribution() +- distname = (distname or '').lower() +- if distname in ('debian', 'ubuntu'): +- msg = 'apt-get install libmagickwand-dev' +- elif distname in ('fedora', 'centos', 'redhat'): +- msg = 'yum install ImageMagick-devel' +- raise ImportError('MagickWand shared library not found.\n' +- 'You probably had not installed ImageMagick library.\n' +- 'Try to install:\n ' + msg) +- + #: (:class:`ctypes.CDLL`) The MagickWand library. +-library = libraries[0] ++library = ctypes.CDLL("@magick_wand_library@") + + #: (:class:`ctypes.CDLL`) The ImageMagick library. It is the same with + #: :data:`library` on platforms other than Windows. + #: + #: .. versionadded:: 0.1.10 +-libmagick = libraries[1] ++libmagick = ctypes.CDLL("@imagemagick_library@") + + try: + library.MagickWandGenesis.argtypes = [] diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix new file mode 100644 index 000000000000..1084eca762be --- /dev/null +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi, pillow }: + +buildPythonPackage rec { + pname = "aafigure"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091"; + }; + + propagatedBuildInputs = [ pillow ]; + + # error: invalid command 'test' + doCheck = false; + + # 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 + ''; + + meta = with stdenv.lib; { + description = "ASCII art to image converter"; + homepage = https://launchpad.net/aafigure/; + license = licenses.bsd2; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix new file mode 100644 index 000000000000..9558febec735 --- /dev/null +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, python, openssl }: + +buildPythonPackage rec { + pname = "acme-tiny"; + version = "2016-03-26"; + name = "${pname}-${version}"; + + src = 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" "${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 = with stdenv.lib; { + description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; + homepage = https://github.com/diafygi/acme-tiny; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix new file mode 100644 index 000000000000..71357e5bef23 --- /dev/null +++ b/pkgs/development/python-modules/acme/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi +, certbot, nose, cryptography, pyasn1, pyopenssl, pyRFC3339 +, pytz, requests, six, werkzeug, mock, ndg-httpsclient }: + +buildPythonPackage rec { + inherit (certbot) src version; + + pname = "acme"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ + cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock + ndg-httpsclient + ]; + + buildInputs = [ nose ]; + + postUnpack = "sourceRoot=\${sourceRoot}/acme"; +} diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix new file mode 100644 index 000000000000..d1cb1180358f --- /dev/null +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, cython, pytest, numpy, scipy, matplotlib, pandas, tabulate }: + +buildPythonPackage rec { + pname = "acoustics"; + version = "0.1.2"; + name = "${pname}-${version}"; + + buildInputs = [ cython pytest ]; + propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; + + src = fetchPypi { + inherit pname version; + sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7"; + }; + + # Tests not distributed + doCheck = false; + + meta = with stdenv.lib; { + description = "A package for acousticians"; + maintainer = with maintainers; [ fridh ]; + license = with licenses; [ bsd3 ]; + homepage = https://github.com/python-acoustics/python-acoustics; + }; +} diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix new file mode 100644 index 000000000000..064e5e6c11a3 --- /dev/null +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pep8, nose, unittest2, docutils, blockdiag }: + +buildPythonPackage rec { + pname = "actdiag"; + version = "0.5.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # One test fails: + # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) + doCheck = false; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix new file mode 100644 index 000000000000..982e63882ad3 --- /dev/null +++ b/pkgs/development/python-modules/adal/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, pyjwt }: + +buildPythonPackage rec { + pname = "adal"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09"; + }; + + propagatedBuildInputs = [ requests pyjwt ]; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 1233b94dccdf..3aa03aaa5993 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "aenum"; - version = "1.4.7"; + version = "2.0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1bvn2k53nz99fiwql5fkl0fh7xjw8ama9qzdjp36609mpk05ikl8"; + sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d"; }; + doCheck = !isPy3k; + # The following tests fail (only in python3 + # test_convert (aenum.test.TestIntEnumConvert) + # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert) + # test_convert (aenum.test.TestIntEnumConvert) + # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert) + meta = { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; - maintainer = with stdenv.lib.maintainers; [ vrthra ]; + maintainers = with stdenv.lib.maintainers; [ vrthra ]; license = with stdenv.lib.licenses; [ bsd3 ]; homepage = https://bitbucket.org/stoneleaf/aenum; }; diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix new file mode 100644 index 000000000000..4a2d4a0f7224 --- /dev/null +++ b/pkgs/development/python-modules/afew/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, isPy3k , dbacl, notmuch, chardet, subprocess32 }: + +buildPythonPackage rec { + pname = "afew"; + version = "git-2017-02-08"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "afewmail"; + repo = "afew"; + rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67"; + sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm"; + }; + + buildInputs = [ dbacl ]; + + propagatedBuildInputs = [ + notmuch + chardet + ] ++ stdenv.lib.optional (!isPy3k) subprocess32; + + doCheck = false; + + preConfigure = '' + substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${dbacl}/bin/dbacl'" + ''; + + postInstall = '' + wrapProgram $out/bin/afew \ + --prefix LD_LIBRARY_PATH : ${notmuch}/lib + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/teythoon/afew; + description = "An initial tagging script for notmuch mail"; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix new file mode 100644 index 000000000000..11409a11778f --- /dev/null +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "agate-dbf"; + version = "0.2.0"; + + propagatedBuildInputs = [ agate dbf dbfread ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6"; + }; + + meta = with stdenv.lib; { + description = "Adds read support for dbf files to agate"; + homepage = https://github.com/wireservice/agate-dbf; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix new file mode 100644 index 000000000000..cb0113c22b3d --- /dev/null +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "agate-excel"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7"; + }; + + propagatedBuildInputs = [ agate openpyxl xlrd ]; + + meta = with stdenv.lib; { + description = "Adds read support for excel files to agate"; + homepage = "https://github.com/wireservice/agate-excel"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + +} diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix new file mode 100644 index 000000000000..0167b40ea43f --- /dev/null +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "agate-sql"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14"; + }; + + propagatedBuildInputs = [ agate sqlalchemy ]; + + meta = with stdenv.lib; { + description = "Adds SQL read/write support to agate."; + homepage = https://github.com/wireservice/agate-sql; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix new file mode 100644 index 000000000000..3ff097a78cf3 --- /dev/null +++ b/pkgs/development/python-modules/agate/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, + discid, six, parsedatetime, isodate, Babel, pytimeparse, + leather, python-slugify }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "agate"; + version = "1.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm"; + }; + + propagatedBuildInputs = [ discid six parsedatetime + isodate Babel pytimeparse leather python-slugify ]; + + doCheck = !isPy3k; + # (only) on python3 unittest loader (loadTestsFromModule) fails + + meta = with stdenv.lib; { + description = "A Python data analysis library that is optimized for humans instead of machines"; + homepage = https://github.com/wireservice/agate; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix new file mode 100644 index 000000000000..4265a7488f66 --- /dev/null +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, isPy33, isPy26, isPy27, isPyPy, python, pycares, asyncio, trollius }: + +buildPythonPackage rec { + pname = "aiodns"; + version = "1.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d"; + }; + + propagatedBuildInputs = with stdenv.lib; [ pycares ] + ++ optional isPy33 asyncio + ++ optional (isPy26 || isPy27 || isPyPy) trollius; + + checkPhase = '' + ${python.interpreter} tests.py + ''; + + # 'Could not contact DNS servers' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/saghul/aiodns; + license = licenses.mit; + description = "Simple DNS resolver for asyncio"; + }; +} diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix new file mode 100644 index 000000000000..d1c6e279064e --- /dev/null +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy33 +, pythonOlder +, asyncio +, singledispatch +}: + +buildPythonPackage rec { + pname = "aiofiles"; + version = "0.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c4936cea65175277183553dbc27d08b286a24ae5bd86f44fbe485dfcf77a14a"; + }; + + disabled = pythonOlder "3.3"; + + propagatedBuildInputs = lib.optionals isPy33 [ asyncio singledispatch ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "File support for asyncio"; + homepage = https://github.com/Tinche/aiofiles; + license = with lib.licenses; [ asl20 ]; + maintainer = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix new file mode 100644 index 000000000000..69bcaa1fc06e --- /dev/null +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pygments }: + +buildPythonPackage rec { + pname = "alabaster"; + version = "0.7.7"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71"; + }; + + propagatedBuildInputs = [ pygments ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/bitprophet/alabaster; + description = "A Sphinx theme"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix new file mode 100644 index 000000000000..0538e7cf416d --- /dev/null +++ b/pkgs/development/python-modules/alembic/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcov, mock, coverage +, Mako, sqlalchemy, python-editor, dateutil +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "alembic"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0iw6wysm83hycvrycymf9b4mkji47536kl3x7grynfcbyjcvbdm2"; + }; + + buildInputs = [ pytest pytestcov mock coverage ]; + propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ]; + + meta = with stdenv.lib; { + homepage = http://bitbucket.org/zzzeek/alembic; + description = "A database migration tool for SQLAlchemy"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix new file mode 100644 index 000000000000..a0504de4fb81 --- /dev/null +++ b/pkgs/development/python-modules/altair/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, vega, pandas, ipython, traitlets }: + +buildPythonPackage rec { + pname = "altair"; + version = "1.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + export LANG=en_US.UTF-8 + py.test altair --doctest-modules + ''; + + propagatedBuildInputs = [ vega pandas ipython traitlets ]; + + meta = with stdenv.lib; { + description = "A declarative statistical visualization library for Python."; + homepage = https://github.com/altair-viz/altair; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix new file mode 100644 index 000000000000..bc49e991b4fa --- /dev/null +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, dateutil }: + +buildPythonPackage rec { + pname = "aniso8601"; + version = "1.2.0"; + name = "${pname}-${version}"; + + meta = with stdenv.lib; { + description = "Parses ISO 8601 strings."; + homepage = "https://bitbucket.org/nielsenb/aniso8601"; + license = licenses.bsd3; + }; + + propagatedBuildInputs = [ dateutil ]; + + src = fetchPypi { + inherit pname version; + sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4"; + }; +} diff --git a/pkgs/development/python-modules/ansible/2.3.nix b/pkgs/development/python-modules/ansible/2.3.nix new file mode 100644 index 000000000000..e5152029f8ff --- /dev/null +++ b/pkgs/development/python-modules/ansible/2.3.nix @@ -0,0 +1,50 @@ +{ lib +, fetchurl +, buildPythonPackage +, pycrypto +, paramiko +, jinja2 +, pyyaml +, httplib2 +, boto +, six +, netaddr +, dns +, windowsSupport ? false +, pywinrm ? null +}: + +buildPythonPackage rec { + pname = "ansible"; + version = "2.3.1.0"; + name = "${pname}-${version}"; + + + src = fetchurl { + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = false; + + propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2 + boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; + + meta = { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = with lib.licenses; [ gpl3] ; + maintainers = with lib.maintainers; [ + jgeerds + joamaki + ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix new file mode 100644 index 000000000000..3a45811ed9b3 --- /dev/null +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ansicolor"; + version = "0.2.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; + }; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix new file mode 100644 index 000000000000..bc0701806544 --- /dev/null +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ansicolors"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/verigak/colors/"; + description = "ANSI colors for Python"; + license = licenses.isc; + maintainers = with maintainers; [ copumpkin ]; + }; +} diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix new file mode 100644 index 000000000000..211d51c241d7 --- /dev/null +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "appdirs"; + version = "1.4.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92"; + }; + + meta = { + description = "A python module for determining appropriate platform-specific dirs"; + homepage = http://github.com/ActiveState/appdirs; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix new file mode 100644 index 000000000000..32c020961f21 --- /dev/null +++ b/pkgs/development/python-modules/arelle/default.nix @@ -0,0 +1,55 @@ +{ gui ? true, + buildPythonPackage, fetchFromGitHub, lib, + sphinx_1_2, lxml, isodate, numpy, pytest, + tkinter ? null, + ... }: + +let + # Releases are published at http://arelle.org/download/ but sadly no + # tags are published on github. + version = "2017-06-01"; + + src = fetchFromGitHub { + owner = "Arelle"; + repo = "Arelle"; + rev = "c883f843d55bb48f03a15afceb4cc823cd4601bd"; + sha256 = "1h48qdj0anv541rd3kna8bmcwfrl1l3yw76wsx8p6hx5prbmzg4v"; + }; + +in + +buildPythonPackage { + name = "arelle-${version}${lib.optionalString (!gui) "-headless"}"; + inherit src; + outputs = ["out" "doc"]; + postPatch = "rm testParser2.py"; + buildInputs = [ + sphinx_1_2 + pytest + ]; + propagatedBuildInputs = [ + lxml + isodate + numpy + ] ++ lib.optional gui [ + tkinter + ]; + + # arelle-gui is useless without gui dependencies, so delete it when !gui. + postInstall = lib.optionalString (!gui) '' + find $out/bin -name "*arelle-gui*" -delete + ''; + + # Documentation + postBuild = '' + (cd apidocs && make html && cp -r _build $doc) + ''; + + meta = { + description = "An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a python or REST API" + lib.optionalString gui " and a graphical user interface"; + homepage = http://arelle.org/; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ roberth ]; + }; +} diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix new file mode 100644 index 000000000000..cd0cc47d9e7b --- /dev/null +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, fetchPypi, lib, + coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "argcomplete"; + version = "1.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s"; + }; + + doCheck = false; # bash-completion test fails with "compgen: command not found". + + # re-enable if we are able to make testing work + # buildInputs = [ coverage flake8 ]; + + propagatedBuildInputs = [ dicttoxml pexpect prettytable requests_toolbelt ]; + + meta = with lib; { + description = "Bash tab completion for argparse"; + homepage = "https://argcomplete.readthedocs.io"; + maintainers = [ maintainers.womfoo ]; + license = [ licenses.asl20 ]; + }; +} diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix new file mode 100644 index 000000000000..a85987a95b16 --- /dev/null +++ b/pkgs/development/python-modules/arrow/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, chai, simplejson +, dateutil }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "arrow"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; + }; + + checkPhase = '' + nosetests --cover-package=arrow + ''; + + buildInputs = [ nose chai simplejson ]; + propagatedBuildInputs = [ dateutil ]; + + meta = with stdenv.lib; { + description = "Python library for date manipulation"; + license = "apache"; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix new file mode 100644 index 000000000000..e282294ef0cc --- /dev/null +++ b/pkgs/development/python-modules/asgi_ipc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchurl, + asgiref, msgpack, posix_ipc +}: +buildPythonPackage rec { + version = "1.4.0"; + pname = "asgi_ipc"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; + sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588"; + }; + + propagatedBuildInputs = [ asgiref msgpack posix_ipc ]; + + meta = with stdenv.lib; { + description = "Posix IPC-backed ASGI channel layer implementation"; + license = licenses.bsd3; + homepage = http://github.com/django/asgi_ipc/; + }; +} diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix new file mode 100644 index 000000000000..440f15cbd3a1 --- /dev/null +++ b/pkgs/development/python-modules/asgi_redis/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchurl, + asgiref, asgi_ipc, msgpack, six, redis, cryptography +}: +buildPythonPackage rec { + version = "1.4.2"; + pname = "asgi_redis"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; + sha256 = "aa8e9342a3e66c4e7f9035b074f6f66b92e5f1cf8022f1446106ed6dd004a274"; + }; + + # Requires a redis server available + doCheck = false; + + propagatedBuildInputs = [ asgiref asgi_ipc msgpack six redis cryptography ]; + + meta = with stdenv.lib; { + description = "Redis-backed ASGI channel layer implementation"; + license = licenses.bsd3; + homepage = http://github.com/django/asgi_redis/; + }; +} diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix new file mode 100644 index 000000000000..1b5112fb3358 --- /dev/null +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchurl, six }: +buildPythonPackage rec { + version = "1.1.2"; + pname = "asgiref"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/a/asgiref/${name}.tar.gz"; + sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Reference ASGI adapters and channel layers"; + license = licenses.bsd3; + homepage = https://github.com/django/asgiref; + }; +} diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix new file mode 100644 index 000000000000..a34879e55967 --- /dev/null +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "asn1crypto"; + version = "0.22.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a"; + }; + + # No tests included + doCheck = false; + + meta = { + description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP"; + license = lib.licenses.mit; + homepage = https://github.com/wbond/asn1crypto; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 76f58e695f28..fd742031d5ad 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,34 +1,39 @@ -{ stdenv, fetchurl, buildPythonPackage, python, logilab_common, six, - lazy-object-proxy, wrapt }: +{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six +, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder +, backports_functools_lru_cache +}: - buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "astroid"; - version = "1.4.9"; +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "astroid"; + version = "1.5.3"; - src = fetchurl { - url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "1mw5q20b80j55vbpcdfl824sbb1q15dhkfbczjnnv8733j4yg0x4"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35"; + }; - propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]; + propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] + ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch] + ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ]; - postPatch = '' - cd astroid/tests - for i in $(ls unittest*); do mv -v $i test_$i; done - cd ../.. - rm -vf astroid/tests/test_unittest_inference.py - ''; + postPatch = '' + cd astroid/tests + for i in $(ls unittest*); do mv -v $i test_$i; done + cd ../.. + rm -vf astroid/tests/test_unittest_inference.py + rm -vf astroid/tests/test_unittest_manager.py + ''; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; - meta = with stdenv.lib; { - description = "A abstract syntax tree for Python with inference support"; - homepage = http://bitbucket.org/logilab/astroid; - license = licenses.lgpl2; - platform = platforms.all; - maintainers = with maintainers; [ nand0p ]; - }; - } + meta = with lib; { + description = "A abstract syntax tree for Python with inference support"; + homepage = http://bitbucket.org/logilab/astroid; + license = licenses.lgpl2; + platforms = platforms.all; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix new file mode 100644 index 000000000000..6e3e66167f1d --- /dev/null +++ b/pkgs/development/python-modules/astropy/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, cython +, h5py +, scipy }: + +buildPythonPackage rec { + + pname = "astropy"; + version = "1.3.3"; + + name = "${pname}-${version}"; + doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. + src = fetchPypi { + inherit pname version; + sha256 = "ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99"; + }; + propagatedBuildInputs = [ numpy cython h5py scipy ]; + + + meta = { + description = "Astronomy/Astrophysics library for Python"; + homepage = "http://www.astropy.org"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ kentjames ]; + }; +} + + diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index d5009e9bccb0..aa548602d372 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,13 +7,13 @@ let pname = "async-timeout"; - version = "1.1.0"; + version = "1.2.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081"; + sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix new file mode 100644 index 000000000000..b83d731c720a --- /dev/null +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchurl, isPy3k, isPy33, + unittest2, mock, pytest, trollius, asyncio, + pytest-asyncio, futures, + six, twisted, txaio, zope_interface +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "autobahn"; + version = "17.5.1"; + + src = fetchurl { + url = "mirror://pypi/a/${pname}/${name}.tar.gz"; + sha256 = "0p2xx20g0rj6pnp4h3231mn8zk4ag8msv69f93gai2hzl5vglcia"; + }; + + # Upstream claim python2 support, but tests require pytest-asyncio which + # is pythn3 only. Therefore, tests are skipped for python2. + doCheck = isPy3k; + buildInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ]; + propagatedBuildInputs = [ six twisted zope_interface txaio ] ++ + (stdenv.lib.optional isPy33 asyncio) ++ + (stdenv.lib.optionals (!isPy3k) [ trollius futures ]); + + checkPhase = '' + py.test $out + ''; + + meta = with stdenv.lib; { + description = "WebSocket and WAMP in Python for Twisted and asyncio."; + homepage = "http://crossbar.io/autobahn"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix new file mode 100644 index 000000000000..e4f3e061dd4e --- /dev/null +++ b/pkgs/development/python-modules/automat/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchurl, + m2r, setuptools_scm, six, attrs }: +buildPythonPackage rec { + version = "0.6.0"; + pname = "Automat"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/A/Automat/${name}.tar.gz"; + sha256 = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8"; + }; + + buildInputs = [ m2r setuptools_scm ]; + propagatedBuildInputs = [ six attrs ]; + + # Some tests require twisetd, but twisted requires Automat to build. + # this creates a circular dependency. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/glyph/Automat; + description = "Self-service finite-state machines for the programmer on the go"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix new file mode 100644 index 000000000000..6a8e33dc2ee6 --- /dev/null +++ b/pkgs/development/python-modules/bap/default.nix @@ -0,0 +1,24 @@ +{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: + +buildPythonPackage rec { + pname = "bap"; + version = "1.1.0"; + name = "${pname}-${version}"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap-python"; + rev = "v${version}"; + sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; + }; + + propagatedBuildInputs = [bap requests]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; + homepage = https://github.com/BinaryAnalysisPlatform/bap/; + maintainers = [ maintainers.maurer ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix index 94f04880c8e1..d159ff8fe902 100644 --- a/pkgs/development/python-modules/bcrypt.nix +++ b/pkgs/development/python-modules/bcrypt.nix @@ -1,18 +1,19 @@ { stdenv, buildPythonPackage, isPyPy, fetchurl -, cffi, pycparser, mock, pytest, py }: +, cffi, pycparser, mock, pytest, py, six }: with stdenv.lib; buildPythonPackage rec { - name = "bcrypt-${version}"; - version = "3.1.2"; + version = "3.1.3"; + pname = "bcrypt"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/bcrypt/${name}.tar.gz"; - sha256 = "1al54xafv1aharpb22yv5rjjc63fm60z3pn2shbiq48ah9f1fvil"; + sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488"; }; buildInputs = [ pycparser mock pytest py ]; - propagatedBuildInputs = optional (!isPyPy) cffi; + propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; meta = { maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix new file mode 100644 index 000000000000..0f624a145e01 --- /dev/null +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "bibtexparser"; + version = "0.6.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5888219ac5db1c63ae0ad4db52ec7ad87fe7a32bd60e62ee87bceedb8ebf73b8"; + }; + + # No tests in archive + doCheck = false; + + meta = { + description = "Bibtex parser for python 2.7 and 3.3 and newer"; + homepage = https://github.com/sciunto-org/python-bibtexparser; + license = with lib.licenses; [ gpl3 bsd3 ]; + maintainer = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix new file mode 100644 index 000000000000..3f43318f08a6 --- /dev/null +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, dateutil, requests }: + +buildPythonPackage rec { + pname = "bitcoin-price-api"; + version = "0.0.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; + }; + + propagatedBuildInputs = [ dateutil requests ]; + + # No tests in archive + doCheck = false; + + meta = { + homepage = "http://github.com/dursk/bitcoin-price-api"; + description = "Price APIs for bitcoin exchanges"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 42a7401b09d6..19acf7b49ef7 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -7,7 +7,8 @@ let selinuxWithPython = libselinux.override pyenable; cryptsetupWithPython = cryptsetup.override pyenable; in buildPythonPackage rec { - name = "blivet-${version}"; + pname = "blivet"; + name = "${pname}-${version}"; version = "0.67"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 7c992921e948..3e07806986b1 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -1,24 +1,35 @@ -{ stdenv, python, fetchurl, makeWrapper, unzip }: +{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }: let - wheel_source = fetchurl { - url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.29.0-py2.py3-none-any.whl"; + wheel_source = fetchPypi { + pname = "wheel"; + version = "0.29.0"; + format = "wheel"; sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd"; }; - setuptools_source = fetchurl { - url = "https://files.pythonhosted.org/packages/b8/cb/b919f52dd81b4b2210d0c5529b6b629a4002e08d49a90183605d1181b10c/setuptools-30.2.0-py2.py3-none-any.whl"; - sha256 = "b7e7b28d6a728ea38953d66e12ef400c3c153c523539f1b3997c5a42f3770ff1"; + setuptools_source = fetchPypi { + pname = "setuptools"; + version = "36.0.1"; + format = "wheel"; + sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587"; }; - argparse_source = fetchurl { - url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl"; - sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3"; - }; -in stdenv.mkDerivation rec { - name = "${python.libPrefix}-bootstrapped-pip-${version}"; - version = "9.0.1"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl"; + # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + # https://github.com/NixOS/nixpkgs/issues/26392 + # https://github.com/pypa/setuptools/issues/885 + pkg_resources = fetchurl { + url = https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py; + sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv"; + }; + +in stdenv.mkDerivation rec { + pname = "pip"; + version = "9.0.1"; + name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + format = "wheel"; sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0"; }; @@ -27,11 +38,10 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} $src unzip -d $out/${python.sitePackages} ${setuptools_source} unzip -d $out/${python.sitePackages} ${wheel_source} - '' + stdenv.lib.optionalString (python.isPy26 or false) '' - unzip -d $out/${python.sitePackages} ${argparse_source} + # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py ''; - patchPhase = '' mkdir -p $out/bin ''; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix new file mode 100644 index 000000000000..886433a358ae --- /dev/null +++ b/pkgs/development/python-modules/branca/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, jinja2 +, selenium +}: + +buildPythonPackage rec { + pname = "branca"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "327b0bae73a519f25dc2f320d8d9f1885aad2e8e5105add1496269d5391b8ea4"; + }; + + checkInputs = [ pytest selenium ]; + propagatedBuildInputs = [ jinja2 ]; + + # Seems to require a browser + doCheck = false; + + meta = { + description = "Generate complex HTML+JS pages with Python"; + homepage = https://github.com/python-visualization/branca; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index d27a65375567..08d66e539ad0 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,13 @@ { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - name = "breathe-${version}"; - version = "4.2.0"; + version = "4.6.0"; + pname = "breathe"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - sha256 = "0m3w8yx24nm01xxx6aj08cklnifwlzzmczc5b0ni40l63lhvm3lp"; + sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix new file mode 100644 index 000000000000..67dd0c8c9d73 --- /dev/null +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "browsermob-proxy"; + version = "0.8.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bxvmghm834gsfz3pm69772wzhh15p8ci526b25dpk3z4315nd7v"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "A library for interacting with Browsermob Proxy"; + homepage = "http://oss.theautomatedtester.co.uk/browsermob-proxy-py"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/btrees-py35.patch b/pkgs/development/python-modules/btrees-py35.patch deleted file mode 100644 index 77e47d670b9b..000000000000 --- a/pkgs/development/python-modules/btrees-py35.patch +++ /dev/null @@ -1,79 +0,0 @@ -From eee0beef88d135640871050b40844272a3aee790 Mon Sep 17 00:00:00 2001 -From: Tres Seaver -Date: Tue, 15 Sep 2015 17:20:18 -0400 -Subject: [PATCH 1/2] Ensure that we don't overlook errors in first - PyObject_RichCompareBool call. - -Python 3.5 turns such cases into SystemErrors. - -See: https://bugs.python.org/issue23571 - -Fixes #15. ---- - BTrees/_compat.h | 22 +++++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/BTrees/_compat.h b/BTrees/_compat.h -index e004d54..19dd377 100644 ---- a/BTrees/_compat.h -+++ b/BTrees/_compat.h -@@ -27,9 +27,25 @@ - #define TEXT_FROM_STRING PyUnicode_FromString - #define TEXT_FORMAT PyUnicode_Format - --#define COMPARE(lhs, rhs) \ -- PyObject_RichCompareBool((lhs), (rhs), Py_LT) > 0 ? -1 : \ -- (PyObject_RichCompareBool((lhs), (rhs), Py_EQ) > 0 ? 0 : 1) -+/* Emulate Python2's __cmp__, wrapping PyObject_RichCompareBool(), -+ * Return -2/-3 for errors, -1 for lhsrhs. -+ */ -+static inline -+int __compare(PyObject *lhs, PyObject *rhs) { -+ int less, equal; -+ -+ less = PyObject_RichCompareBool(lhs, rhs, Py_LT); -+ if ( less == -1 ) { -+ return -2; -+ } -+ equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ); -+ if ( equal == -1 ) { -+ return -3; -+ } -+ return less ? -1 : (equal ? 0 : 1); -+} -+ -+#define COMPARE(lhs, rhs) __compare((lhs), (rhs)) - - - #else - -From ff4c3309fe471f2b9bdd642b8f7d1c2fe0f5e458 Mon Sep 17 00:00:00 2001 -From: Tres Seaver -Date: Sun, 20 Sep 2015 11:07:10 -0400 -Subject: [PATCH 2/2] Avoid unnecessary comparison for 'Py_EQ' if 'Py_LT' - returned True. - ---- - BTrees/_compat.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/BTrees/_compat.h b/BTrees/_compat.h -index 19dd377..ece2bf9 100644 ---- a/BTrees/_compat.h -+++ b/BTrees/_compat.h -@@ -38,11 +38,14 @@ int __compare(PyObject *lhs, PyObject *rhs) { - if ( less == -1 ) { - return -2; - } -+ if (less) { -+ return -1; -+ } - equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ); - if ( equal == -1 ) { - return -3; - } -- return less ? -1 : (equal ? 0 : 1); -+ return equal ? 0 : 1; - } - - #define COMPARE(lhs, rhs) __compare((lhs), (rhs)) diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix new file mode 100644 index 000000000000..7cb10d96f905 --- /dev/null +++ b/pkgs/development/python-modules/btrees/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, persistent, zope_interface, transaction }: + +buildPythonPackage rec { + pname = "BTrees"; + version = "4.4.1"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ persistent zope_interface transaction ]; + + src = fetchPypi { + inherit pname version; + sha256 = "a2738b71693971c1f7502888d649bef270c65f026db731e03d53f1ec4edfe8a3"; + }; + + meta = with stdenv.lib; { + description = "Scalable persistent components"; + homepage = http://packages.python.org/BTrees; + license = licenses.zpt21; + }; +} diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix new file mode 100644 index 000000000000..9f7ef8d5521e --- /dev/null +++ b/pkgs/development/python-modules/bz2file/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +}: + +buildPythonPackage rec { + pname = "bz2file"; + version = "0.98"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "126s53fkpx04f33a829yqqk8fj4png3qwg4m66cvlmhmwc8zihb4"; + }; + + doCheck = false; + # The test module (test_bz2file) is not available + + meta = { + description = "Bz2file is a Python library for reading and writing bzip2-compressed files"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jpbernardy ]; + }; +} diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix new file mode 100644 index 000000000000..a2cf4633d302 --- /dev/null +++ b/pkgs/development/python-modules/certifi/default.nix @@ -0,0 +1,22 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "certifi"; + version = "2017.4.17"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a"; + }; + + meta = { + homepage = http://certifi.io/; + description = "Python package for providing Mozilla's CA Bundle"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ koral ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix new file mode 100644 index 000000000000..55bd8deef9ac --- /dev/null +++ b/pkgs/development/python-modules/cffi/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: + +if isPyPy then null else buildPythonPackage rec { + pname = "cffi"; + version = "1.10.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k"; + }; + + propagatedBuildInputs = [ libffi pycparser ]; + buildInputs = [ pytest ]; + + patchPhase = '' + substituteInPlace testing/cffi0/test_ownlib.py --replace "gcc" "cc" + ''; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + maintainers = with maintainers; [ domenkozar ]; + homepage = https://cffi.readthedocs.org/; + license = with licenses; [ mit ]; + description = "Foreign Function Interface for Python calling C code"; + }; +} diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index c7466d242c75..4dfe83f6758b 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -2,12 +2,13 @@ asgiref, django, daphne }: buildPythonPackage rec { - name = "channels-${version}"; - version = "1.0.3"; + pname = "channels"; + name = "${pname}-${version}"; + version = "1.1.6"; src = fetchurl { url = "mirror://pypi/c/channels/${name}.tar.gz"; - sha256 = "1bwlqnfc27p1qnjmdl8jnr941gpl8ggnxxfy8anh9qgmg20q9pfd"; + sha256 = "44ab9a1f610ecc9ac25d5f90e7a44f49b18de28a05a26fe34e935af257f1eefe"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix new file mode 100644 index 000000000000..c44989ab5b7e --- /dev/null +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "characteristic"; + version = "14.3.0"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380"; + }; + + checkInputs = [ pytest ]; + + meta = { + description = "Python attributes without boilerplate"; + homepage = https://characteristic.readthedocs.org; + }; +} diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix new file mode 100644 index 000000000000..93620098446a --- /dev/null +++ b/pkgs/development/python-modules/codecov/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }: + +buildPythonPackage rec { + pname = "codecov"; + version = "2.0.9"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "037h4dcl8xshlq3rj8409p11rpgnyqrhlhfq8j34s94nm0n1h76v"; + }; + + buildInputs = [ unittest2 ]; # Tests only + + propagatedBuildInputs = [ requests coverage ]; + + postPatch = '' + sed -i 's/, "argparse"//' setup.py + ''; + + meta = { + description = "Python report uploader for Codecov"; + homepage = https://codecov.io/; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix new file mode 100644 index 000000000000..99a59ae8fd43 --- /dev/null +++ b/pkgs/development/python-modules/colorama/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "colorama"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/tartley/colorama; + license = licenses.bsd3; + description = "Cross-platform colored terminal text"; + }; +} + diff --git a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch new file mode 100644 index 000000000000..05dbf4677182 --- /dev/null +++ b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch @@ -0,0 +1,42 @@ +From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Tue, 14 Mar 2017 15:00:33 +0100 +Subject: [PATCH] namespace fix + +configparser broke other namespace packages +https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428 +This patch seems to solve that issue. +--- + setup.py | 1 - + src/backports/__init__.py | 6 ------ + 2 files changed, 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 3b07823..63ed25d 100644 +--- a/setup.py ++++ b/setup.py +@@ -42,7 +42,6 @@ setup( + py_modules=modules, + package_dir={'': 'src'}, + packages=find_packages('src'), +- namespace_packages=['backports'], + include_package_data=True, + zip_safe=False, + install_requires=requirements, +diff --git a/src/backports/__init__.py b/src/backports/__init__.py +index f84d25c..febdb2f 100644 +--- a/src/backports/__init__.py ++++ b/src/backports/__init__.py +@@ -3,9 +3,3 @@ + + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) +- +-try: +- import pkg_resources +- pkg_resources.declare_namespace(__name__) +-except ImportError: +- pass +-- +2.11.1 + diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix new file mode 100644 index 000000000000..bd5d8b7dca64 --- /dev/null +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.9.4"; + pname = "confluent-kafka"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v8apw9f8l01ql42jg1sfqv41yxvcbxn1a3ar01y0ni428swq6wk"; + }; + + buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ; + + # Tests fail for python3 under this pypi release + doCheck = if isPy3k then false else true; + + meta = with stdenv.lib; { + description = "Confluent's Apache Kafka client for Python"; + homepage = "https://github.com/confluentinc/confluent-kafka-python"; + license = licenses.asl20; + maintainers = with maintainers; [ mlieberman85 ]; + }; +} diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix new file mode 100644 index 000000000000..50216c7ae1f1 --- /dev/null +++ b/pkgs/development/python-modules/constantly/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchurl +}: +buildPythonPackage rec { + pname = "constantly"; + name = "${pname}-${version}"; + version = "15.1.0"; + + src = fetchurl { + url = "mirror://pypi/c/constantly/${name}.tar.gz"; + sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/twisted/constantly; + description = "symbolic constant support"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix new file mode 100644 index 000000000000..57431c2c2c25 --- /dev/null +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -0,0 +1,51 @@ +{ buildPythonPackage +, lib +, fetchPypi +, mock +, pytest_27 +, sh +, coverage +, docopt +, requests +, git +}: + +buildPythonPackage rec { + pname = "coveralls"; + name = "${pname}-python-${version}"; + version = "1.1"; + + # wanted by tests + src = fetchPypi { + inherit pname version; + sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il"; + }; + + buildInputs = [ + mock + sh + pytest_27 + git + ]; + + # FIXME: tests requires .git directory to be present + doCheck = false; + + checkPhase = '' + python setup.py test + ''; + + propagatedBuildInputs = [ + coverage + docopt + requests + ]; + + meta = { + description = "Show coverage stats online via coveralls.io"; + homepage = https://github.com/coveralls-clients/coveralls-python; + license = lib.licenses.mit; + }; +} + + diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix new file mode 100644 index 000000000000..4db709769a6e --- /dev/null +++ b/pkgs/development/python-modules/cram/default.nix @@ -0,0 +1,40 @@ +{stdenv, lib, buildPythonPackage, fetchPypi, coverage, bash, which, writeText}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.7"; + pname = "cram"; + + buildInputs = [ coverage which ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0bvz6fwdi55rkrz3f50zsy35gvvwhlppki2yml5bj5ffy9d499vx"; + }; + + postPatch = '' + substituteInPlace tests/test.t \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + # This testing is copied from Makefile. Simply using `make test` doesn't work + # because it uses the unpatched `scripts/cram` executable which has a bad + # shebang. Also, for some reason, coverage fails on one file so let's just + # ignore that one. + checkPhase = '' + # scripts/cram tests + #COVERAGE=${coverage}/bin/coverage $out/bin/cram tests + #${coverage}/bin/coverage report --fail-under=100 + COVERAGE=coverage $out/bin/cram tests + coverage report --fail-under=100 --omit="*/_encoding.py" + ''; + + meta = { + description = "A simple testing framework for command line applications"; + homepage = https://bitheap.org/cram/; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ jluttine ]; + # Tests fail on i686: https://hydra.nixos.org/build/52896671/nixlog/4 + broken = stdenv.isi686; + }; +} diff --git a/pkgs/development/python-modules/csscompressor.nix b/pkgs/development/python-modules/csscompressor.nix new file mode 100644 index 000000000000..a9aad8d40e5f --- /dev/null +++ b/pkgs/development/python-modules/csscompressor.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "csscompressor"; + version = "0.9.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b"; + }; + + doCheck = false; # No tests + + meta = { + description = "A python port of YUI CSS Compressor"; + homepage = https://pypi.python.org/pypi/csscompressor; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.ahmedtd]; + }; +} diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix new file mode 100644 index 000000000000..bfabf4376e7a --- /dev/null +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage, + dateutil, dbf, xlrd, sqlalchemy, openpyxl, + agate-excel, agate-dbf, agate-sql, isPy3k }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "csvkit"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; + }; + + propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl + agate-excel agate-dbf agate-sql ]; + + doCheck = !isPy3k; + # (only) python 3 we had 9 failures and 57 errors out of a much larger + # number of tests. + + meta = with stdenv.lib; { + description = "A library of utilities for working with CSV, the king of tabular file formats"; + maintainers = with maintainers; [ vrthra ]; + license = with licenses; [ mit ]; + homepage = https://github.com/wireservice/csvkit; + }; +} diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 6e19d9d9e864..562b29cf0625 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,15 +1,17 @@ { stdenv, buildPythonPackage, fetchurl, - asgiref, autobahn, twisted + asgiref, autobahn, twisted, hypothesis }: buildPythonPackage rec { - name = "daphne-${version}"; - version = "1.0.3"; + pname = "daphne"; + name = "${pname}-${version}"; + version = "1.2.0"; src = fetchurl { url = "mirror://pypi/d/daphne/${name}.tar.gz"; - sha256 = "1bpavq3sxr66mqwnnfg67pcchyaq7siqyin2r89aqadf6nab58d2"; + sha256 = "084216isw7rwy693i62rbd8kvpqx418jvf1q72cplv833wz3in7l"; }; + buildInputs = [ hypothesis ]; propagatedBuildInputs = [ asgiref autobahn twisted ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix new file mode 100644 index 000000000000..6d5388a443ca --- /dev/null +++ b/pkgs/development/python-modules/dask/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, cloudpickle +, numpy +, toolz +, dill +, pandas +, partd +}: + +buildPythonPackage rec { + pname = "dask"; + version = "0.14.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9bf007f9cedc08f73089f0621ff65ec0882fc0a834acef56830dfd2872908211"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ cloudpickle numpy toolz dill pandas partd ]; + + checkPhase = '' + py.test dask + ''; + + # URLError + doCheck = false; + + meta = { + description = "Minimal task scheduling abstraction"; + homepage = "http://github.com/ContinuumIO/dask/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix new file mode 100644 index 000000000000..c814b82dad01 --- /dev/null +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchurl, six }: +buildPythonPackage rec { + pname = "dateutil"; + name = "${pname}-${version}"; + version = "2.6.0"; + + src = fetchurl { + url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Powerful extensions to the standard datetime module"; + homepage = http://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; +} diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix new file mode 100644 index 000000000000..2343ea2918b1 --- /dev/null +++ b/pkgs/development/python-modules/dbf/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k }: + +buildPythonPackage rec { + pname = "dbf"; + version = "0.96.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1"; + }; + + propagatedBuildInputs = [ aenum ]; + + doCheck = !isPy3k; + # tests are not yet ported. + # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w + + meta = with stdenv.lib; { + description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; + homepage = "https://pypi.python.org/pypi/dbf"; + license = licenses.bsd2; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix new file mode 100644 index 000000000000..facdd00edace --- /dev/null +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "dbfread"; + version = "2.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "07c8a9af06ffad3f6f03e8fe91ad7d2733e31a26d2b72c4dd4cfbae07ee3b73d"; + }; + + meta = with stdenv.lib; { + description = "Read DBF Files with Python"; + homepage = http://dbfread.readthedocs.org/; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index f3f897ac9e79..ab6e70a9a642 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,8 +1,11 @@ -{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy , ncurses, pygobject3 }: -if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else mkPythonDerivation rec { - name = "dbus-python-1.2.4"; +if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { + pname = "dbus-python"; + version = "1.2.4"; + name = "${pname}-${version}"; + format = "other"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix new file mode 100644 index 000000000000..167efe914256 --- /dev/null +++ b/pkgs/development/python-modules/discid/default.nix @@ -0,0 +1,24 @@ +{ stdenv, libdiscid, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "discid"; + version = "1.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8"; + }; + + patchPhase = '' + substituteInPlace discid/libdiscid.py \ + --replace '_open_library(_LIB_NAME)' "_open_library('${libdiscid}/lib/libdiscid.so.0')" + ''; + + meta = with stdenv.lib; { + description = "Python binding of libdiscid"; + homepage = "https://python-discid.readthedocs.org/"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index c4f92caf8d59..53a4a51fcd87 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.4"; + version = "0.16.8"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "04q4gknv9lb8r2sdnsqs5nfcyyl850j4pcqcs0xjvmqhd7axa5ai"; + sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix new file mode 100644 index 000000000000..49349839331d --- /dev/null +++ b/pkgs/development/python-modules/distro/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "distro"; + version = "1.0.4"; + + buildInputs = [ pytest pytestcov tox]; + + checkPhase = '' + touch tox.ini + tox + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/nir0s/distro; + description = "Linux Distribution - a Linux OS platform information API."; + license = licenses.asl20; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix new file mode 100644 index 000000000000..591031912854 --- /dev/null +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python, + django, django_nose, six +}: +buildPythonPackage rec { + pname = "django-compat"; + name = "${pname}-${version}"; + version = "1.0.14"; + + # the pypi packages don't include everything required for the tests + src = fetchFromGitHub { + owner = "arteria"; + repo = "django-compat"; + rev = "v${version}"; + sha256 = "11g6ra6djkchqk44v8k7biaxd1v69qyyyask5l92vmrvb0qiwvm8"; + }; + + checkPhase = '' + runHook preCheck + + # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the + # source directory + mkdir -p testbase/compat + pushd testbase + # note we're not copying the direct contents of compat/ (notably __init__.py) so python won't recognize this as a + # package, but the tests need to be in a specific path for the test templates to get picked up. + cp -r ../compat/tests compat/ + cp ../runtests.py . + ${python.interpreter} runtests.py compat/tests + popd + + runHook postCheck + ''; + + checkInputs = [ django_nose ]; + propagatedBuildInputs = [ django six ]; + + meta = with stdenv.lib; { + description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11"; + homepage = https://github.com/arteria/django-compat; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix new file mode 100644 index 000000000000..8eb98924491a --- /dev/null +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python, + django, django_compat, django_nose +}: +buildPythonPackage rec { + name = "django-hijack-${version}"; + version = "2.1.4"; + + # the pypi packages don't include everything required for the tests + src = fetchFromGitHub { + owner = "arteria"; + repo = "django-hijack"; + rev = "v${version}"; + sha256 = "1wbm6l8mzpkj4wsj4fyfamzpzi3day2v1cva5j89v4dn4403jq21"; + }; + + checkInputs = [ django_nose ]; + propagatedBuildInputs = [ django django_compat ]; + + checkPhase = '' + runHook preCheck + + # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the + # source directory + mkdir testbase + pushd testbase + cp ../runtests.py . + ${python.interpreter} runtests.py hijack + popd + + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Allows superusers to hijack (=login as) and work on behalf of another user"; + homepage = https://github.com/arteria/django-hijack; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix new file mode 100644 index 000000000000..2d06b41d2db3 --- /dev/null +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, django }: + +buildPythonPackage rec { + pname = "django-polymorphic"; + version = "1.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bz86711sx2b66rl2xz141xppsfmlxilkgjgq0jsavpw37vg7r3r"; + }; + + checkInputs = [ django ]; + propagatedBuildInputs = [ django ]; + + meta = { + homepage = "https://github.com/django-polymorphic/django-polymorphic"; + description = "Improved Django model inheritance with automatic downcasting"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix new file mode 100644 index 000000000000..2332229100c5 --- /dev/null +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchurl, + numpy, django_colorful, pillow, psycopg2, + pyparsing, django, celery +}: +buildPythonPackage rec { + version = "0.4"; + pname = "django-raster"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/d/django-raster/${name}.tar.gz"; + sha256 = "7fd6afa42b07ac51a3873e3d4840325dd3a8a631fdb5b853c76fbbfe59a2b17f"; + }; + + # Tests require a postgresql + postgis server + doCheck = false; + + propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 + pyparsing django celery ]; + + meta = with stdenv.lib; { + description = "Basic raster data integration for Django"; + homepage = https://github.com/geodesign/django-raster; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix new file mode 100644 index 000000000000..52b62e8d8b8b --- /dev/null +++ b/pkgs/development/python-modules/django/1_10.nix @@ -0,0 +1,36 @@ +{ stdenv, buildPythonPackage, fetchurl, substituteAll, + pythonOlder, + geos, gdal +}: +buildPythonPackage rec { + pname = "Django"; + name = "${pname}-${version}"; + version = "1.10.7"; + disabled = pythonOlder "2.7"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; + sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar"; + }; + + patches = [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + }) + ]; + + # 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/; + }; +} diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix new file mode 100644 index 000000000000..20f9d8505abd --- /dev/null +++ b/pkgs/development/python-modules/django/1_11.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchurl, substituteAll, + pythonOlder, + geos, gdal, pytz +}: +buildPythonPackage rec { + pname = "Django"; + name = "${pname}-${version}"; + version = "1.11.3"; + + disabled = pythonOlder "2.7"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; + sha256 = "0swgmwnfi6sa5fg5yxcs4k554cj9zp92w5n454xfsibjjl5dxycy"; + }; + + patches = [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + }) + ]; + + # patch only $out/bin to avoid problems with starter templates (see #3134) + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + propagatedBuildInputs = [ pytz ]; + + # too complicated to setup + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; +} diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix new file mode 100644 index 000000000000..77fc708a50b4 --- /dev/null +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: +buildPythonPackage rec { + pname = "django-appconf"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba"; + }; + + # No tests in archive + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix new file mode 100644 index 000000000000..5d8626ec5760 --- /dev/null +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, + rcssmin, rjsmin, django_appconf }: +buildPythonPackage rec { + pname = "django_compressor"; + version = "2.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j"; + }; + + # Need to setup django testing + doCheck = false; + + propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix index c9217955213d..e83076674e8a 100644 --- a/pkgs/development/python-modules/django_guardian.nix +++ b/pkgs/development/python-modules/django_guardian.nix @@ -1,17 +1,18 @@ { stdenv, buildPythonPackage, python, fetchurl , django_environ, mock, django, six -, pytest, pytestrunner, pytestdjango, setuptools_scm +, pytest, pytestrunner, pytest-django, setuptools_scm }: buildPythonPackage rec { - name = "django-guardian-${version}"; - version = "1.4.6"; + pname = "django-guardian"; + name = "${pname}-${version}"; + version = "1.4.9"; src = fetchurl { url = "mirror://pypi/d/django-guardian/${name}.tar.gz"; - sha256 = "1r3xj0ik0hh6dfak4kjndxk5v73x95nfbppgr394nhnmiayv4zc5"; + sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191"; }; - buildInputs = [ pytest pytestrunner pytestdjango django_environ mock setuptools_scm ]; + buildInputs = [ pytest pytestrunner pytest-django django_environ mock setuptools_scm ]; propagatedBuildInputs = [ django six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix new file mode 100644 index 000000000000..6207408e0123 --- /dev/null +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, django }: + +buildPythonPackage rec { + pname = "django-tagging"; + version = "0.4.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ django ]; + + meta = { + description = "A generic tagging application for Django projects"; + homepage = https://github.com/Fantomas42/django-tagging; + }; +} diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 5ad026a8255a..8bbce992c1b0 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - name = "djangorestframework-${version}"; - version = "3.5.4"; + version = "3.6.3"; + pname = "djangorestframework"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "1rays9d8jxqng13fv18ldf11y44w0ln6vvj2k8m4sd9gw9da75gr"; + sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix new file mode 100644 index 000000000000..df768f5d1222 --- /dev/null +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, openssl, makeWrapper, buildPythonApplication +, pytest, dns }: + +buildPythonApplication rec { + name = "${pname}-${majorversion}.${minorversion}"; + pname = "dkimpy"; + majorversion = "0.6"; + minorversion = "1"; + + src = fetchurl { + url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz"; + sha256 = "0zmvyw18ww1jqrbqws636w3xki59fyqva553r6s74q5c4jvy36v2"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ openssl dns ]; + + patchPhase = ''substituteInPlace dknewkey.py --replace \ + /usr/bin/openssl ${openssl}/bin/openssl + ''; + + postInstall = '' + mkdir -p $out/bin $out/libexec + mv $out/bin/*.py $out/libexec + makeWrapper "$out/libexec/dkimverify.py" $out/bin/dkimverify + makeWrapper "$out/libexec/dkimsign.py" $out/bin/dkimsign + makeWrapper "$out/libexec/arcverify.py" $out/bin/arcverify + makeWrapper "$out/libexec/arcsign.py" $out/bin/arcsign + makeWrapper "$out/libexec/dknewkey.py" $out/bin/dknewkey + ''; + + meta = with stdenv.lib; { + description = "DKIM + ARC email signing/verification tools + Python module"; + longDescription = ''Python module that implements DKIM (DomainKeys Identified Mail) + email signing and verification. It also provides a number of convєnient tools + for command line signing and verification, as well as generating new DKIM records. + This version also supports the experimental Authenticated Received Chain (ARC) + protocol. + ''; + homepage = "https://launchpad.net/dkimpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix index 12c9aac4c23d..58c7da4cbe56 100644 --- a/pkgs/development/python-modules/docker.nix +++ b/pkgs/development/python-modules/docker.nix @@ -1,19 +1,20 @@ { stdenv, buildPythonPackage, fetchurl -, six, requests2, websocket_client +, six, requests, websocket_client , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - name = "docker-${version}"; - version = "2.0.2"; + version = "2.3.0"; + pname = "docker"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z"; + sha256 = "b0e3f353a3df3eedfbbcaf48235117263479b893edfa0cf6d8d056cca5edde1c"; }; propagatedBuildInputs = [ six - requests2 + requests websocket_client ipaddress backports_ssl_match_hostname diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix index c21b69e1643e..25435c396d76 100644 --- a/pkgs/development/python-modules/docker_compose.nix +++ b/pkgs/development/python-modules/docker_compose.nix @@ -1,17 +1,18 @@ { stdenv, buildPythonApplication, fetchurl, pythonOlder , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt -, dockerpty, docker, ipaddress, jsonschema, requests2 +, dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property , enum34, functools32 }: buildPythonApplication rec { - version = "1.10.0"; - name = "docker-compose-${version}"; + version = "1.13.0"; + pname = "docker-compose"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z"; + sha256 = "3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c"; }; # lots of networking and other fails @@ -19,7 +20,7 @@ buildPythonApplication rec { buildInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker - ipaddress jsonschema requests2 six texttable websocket_client + ipaddress jsonschema requests six texttable websocket_client docopt cached-property ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ++ diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix new file mode 100644 index 000000000000..424be07aa616 --- /dev/null +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcov, mock, Mako +}: + +buildPythonPackage rec { + pname = "dogpile.cache"; + version = "0.6.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a73aa3049cd88d7ec57a1c2e8946abdf4f14188d429c1023943fcc55c4568da1"; + }; + + # Disable concurrency tests that often fail, + # probably some kind of timing issue. + postPatch = '' + rm tests/test_lock.py + # Failing tests. https://bitbucket.org/zzzeek/dogpile.cache/issues/116 + rm tests/cache/test_memcached_backend.py + ''; + + buildInputs = [ pytest pytestcov mock Mako ]; + + meta = with stdenv.lib; { + description = "A caching front-end based on the Dogpile lock"; + homepage = http://bitbucket.org/zzzeek/dogpile.cache; + platforms = platforms.unix; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix index 8698a65ea11b..ba40b0b3f858 100644 --- a/pkgs/development/python-modules/ds4drv.nix +++ b/pkgs/development/python-modules/ds4drv.nix @@ -4,7 +4,8 @@ }: buildPythonPackage rec { - name = "ds4drv-${version}"; + pname = "ds4drv"; + name = "${pname}-${version}"; version = "0.5.1"; # PyPi only carries py3 wheel diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix index d482aa146279..804419d0fca9 100644 --- a/pkgs/development/python-modules/dulwich.nix +++ b/pkgs/development/python-modules/dulwich.nix @@ -3,12 +3,13 @@ , git, glibcLocales }: buildPythonPackage rec { - name = "dulwich-${version}"; - version = "0.14.1"; + version = "0.17.3"; + pname = "dulwich"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "14xsyxha6qyxxyf0ma3zv1sy31iy22vzwayk519n7a1gwzk4j7vw"; + sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix new file mode 100644 index 000000000000..57549792d218 --- /dev/null +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, hidapi +, pycrypto, pillow, protobuf, future, ecpy +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ECPy"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l"; + }; + + buildInputs = [ hidapi pycrypto pillow protobuf future ]; + + meta = with stdenv.lib; { + description = "Pure Pyhton Elliptic Curve Library"; + homepage = "https://github.com/ubinity/ECPy"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix new file mode 100644 index 000000000000..1cdf85385e8b --- /dev/null +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ed25519"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499"; + }; + + meta = with stdenv.lib; { + description = "Ed25519 public-key signatures"; + homepage = "https://github.com/warner/python-ed25519"; + license = licenses.mit; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 0ae81aef0968..93ac292282a6 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "edward"; - version = "1.2.2"; + version = "1.3.3"; name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "0h9i15l7mczwx8jvabjbvxjjidr13x81h6vylb1p8r308w01r2as"; + sha256 = "104d58321c5040235b3039ae3215c3c7881073e6aa88bb0b8ca1141ca87c4891"; }; # disabled for now due to Tensorflow trying to create files in $HOME: diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix new file mode 100644 index 000000000000..3e95859fc0f8 --- /dev/null +++ b/pkgs/development/python-modules/emcee/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, numpy }: + +buildPythonPackage rec { + pname = "emcee"; + version = "2.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with stdenv.lib; { + description = "Kick ass affine-invariant ensemble MCMC sampling"; + homepage = http://dan.iel.fm/emcee; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix new file mode 100644 index 000000000000..321259d99395 --- /dev/null +++ b/pkgs/development/python-modules/emoji/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "emoji"; + name = "${pname}-${version}"; + version = "0.4.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "13i9mgkpll8m92b8mgm5yab4i78nwsl9h38nriavg105id94mg6q"; + }; + + checkInputs = [ nose ]; + + checkPhase = ''nosetests''; + + meta = with lib; { + description = "Emoji for Python"; + homepage = https://pypi.python.org/pypi/emoji/; + license = licenses.bsd3; + maintainers = with maintainers; [ joachifm ]; + }; +} diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix new file mode 100644 index 000000000000..60c92fe76fb2 --- /dev/null +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "enzyme"; + version = "0.4.1"; + + # Tests rely on files obtained over the network + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj"; + }; + + meta = { + homepage = https://github.com/Diaoul/enzyme; + license = with stdenv.lib; licenses.asl20; + description = "Python video metadata parser"; + }; +} diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix new file mode 100644 index 000000000000..1f457235b6a3 --- /dev/null +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }: + +buildPythonPackage rec { + version = "0.8.1"; + pname = "ezdxf"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "mozman"; + repo = "ezdxf"; + rev = "v${version}"; + sha256 = "1c20j96n3rsgzaakfjl0wnydaj2qr69gbnnjs6mfa1hz2fjqri22"; + }; + + buildInputs = [ pytest ]; + checkPhase = "python -m unittest discover -s tests"; + + propagatedBuildInputs = [ pyparsing ]; + + meta = with stdenv.lib; { + description = "Python package to read and write DXF drawings (interface to the DXF file format)"; + homepage = https://github.com/mozman/ezdxf/; + license = licenses.mit; + maintainers = with maintainers; [ hodapp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix new file mode 100644 index 000000000000..d5ce8f8afc2e --- /dev/null +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }: + +buildPythonPackage rec { + pname = "feedgenerator"; + version = "1.9"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/f/feedgenerator/${name}.tar.gz"; + sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s"; + }; + + buildInputs = [ glibcLocales ]; + + LC_ALL="en_US.UTF-8"; + + propagatedBuildInputs = [ six pytz ]; + + meta = with stdenv.lib; { + description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; + homepage = https://github.com/dmdm/feedgenerator-py3k.git; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix new file mode 100644 index 000000000000..5ecbff90442d --- /dev/null +++ b/pkgs/development/python-modules/first/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +let + pname = "first"; + version = "2.0.1"; +in +buildPythonPackage { + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pn9hl2y0pz61la1xhkdz6vl9i2dg3nh0ksizcf0f9ybh8sxxcrv"; + }; + + doCheck = false; # no tests + + meta = with stdenv.lib; { + description = "The function you always missed in Python"; + homepage = https://github.com/hynek/first/; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index 88b4f811e944..a657c25eed7c 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "flake8-blind-except-${version}"; + pname = "flake8-blind-except"; + name = "${pname}-${version}"; version = "0.1.1"; src = fetchurl { url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index b383c5db0083..c00bf0c85512 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage, flake8, nose }: buildPythonPackage rec { - name = "flake8-debugger-${version}"; + pname = "flake8-debugger"; + name = "${pname}-${version}"; version = "1.4.0"; src = fetchurl { url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix new file mode 100644 index 000000000000..aec715328f9b --- /dev/null +++ b/pkgs/development/python-modules/flake8/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, mock, pytest, pytestrunner +, configparser, enum34, mccabe, pycodestyle, pyflakes +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "flake8"; + version = "3.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "04izn1q1lgbr408l9b3vkxqmpi6mq47bxwc0iwypb02mrxns41xr"; + }; + + buildInputs = [ pytest mock pytestrunner ]; + propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] + ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ]; + + meta = with stdenv.lib; { + description = "Code checking using pep8 and pyflakes"; + homepage = http://pypi.python.org/pypi/flake8; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic.nix index 9ea9616fbda1..4181d9647876 100644 --- a/pkgs/development/python-modules/flask-elastic.nix +++ b/pkgs/development/python-modules/flask-elastic.nix @@ -2,7 +2,8 @@ , flask, elasticsearch }: buildPythonPackage rec { - name = "Flask-Elastic-${version}"; + pname = "Flask-Elastic"; + name = "${pname}-${version}"; version = "0.2"; src = fetchurl { diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login.nix index 37f9d72dd3f8..cdc7cefff954 100644 --- a/pkgs/development/python-modules/flask-ldap-login.nix +++ b/pkgs/development/python-modules/flask-ldap-login.nix @@ -3,7 +3,9 @@ , mock, nose }: buildPythonPackage rec { - name = "flask-ldap-login-0.3.0"; + pname = "flask-ldap-login"; + version = "0.3.0"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix index 0149e29bcf78..a463964b312d 100644 --- a/pkgs/development/python-modules/flask-login.nix +++ b/pkgs/development/python-modules/flask-login.nix @@ -2,7 +2,8 @@ , flask, nose, mock, blinker}: buildPythonPackage rec { - name = "Flask-Login-${version}"; + pname = "Flask-Login"; + name = "${pname}-${version}"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix new file mode 100644 index 000000000000..3e2c7ac4602c --- /dev/null +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic +}: + +with stdenv.lib; + +buildPythonPackage rec { + pname = "Flask-Migrate"; + version = "2.0.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d"; + }; + + checkInputs = optional isPy3k glibcLocales; + propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ]; + + # tests invoke the flask cli which uses click and therefore has py3k encoding troubles + preCheck = optionalString isPy3k '' + export LANG="en_US.UTF-8" + ''; + + meta = { + description = "SQLAlchemy database migrations for Flask applications using Alembic"; + license = licenses.mit; + homepage = https://github.com/miguelgrinberg/Flask-Migrate; + }; +} diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib.nix index 83413dadb7f8..cacb16cb7bb7 100644 --- a/pkgs/development/python-modules/flask-oauthlib.nix +++ b/pkgs/development/python-modules/flask-oauthlib.nix @@ -2,7 +2,8 @@ , flask, oauthlib, requests_oauthlib, flask_sqlalchemy , mock, nose}: buildPythonPackage rec { - name = "Flask-OAuthlib-${version}"; + pname = "Flask-OAuthlib"; + name = "${pname}-${version}"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flask-restplus/0.8.nix b/pkgs/development/python-modules/flask-restplus/0.8.nix new file mode 100644 index 000000000000..bd586aeb32fd --- /dev/null +++ b/pkgs/development/python-modules/flask-restplus/0.8.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, blinker +, tzlocal +, mock +, rednose +, flask +, six +, jsonschema +, pytz +, aniso8601 +, flask-restful +}: + +buildPythonPackage rec { + pname = "flask-restplus"; + version = "0.8.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "3bb76cc156b9a09da62396d82b29fa31e4f27cccf79528538fe7155cf2785593"; + }; + + checkInputs = [ nose blinker tzlocal mock rednose ]; + propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]; + + # RuntimeError: Working outside of application context. + doCheck = false; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = "https://github.com/noirbizarre/flask-restplus"; + description = "Fast, easy and documented API development with Flask"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix new file mode 100644 index 000000000000..f14c9982b6d2 --- /dev/null +++ b/pkgs/development/python-modules/flask-restplus/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, blinker +, tzlocal +, mock +, rednose +, flask +, six +, jsonschema +, pytz +, aniso8601 +, flask-restful +}: + +buildPythonPackage rec { + pname = "flask-restplus"; + version = "0.10.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qs9c3fzidd0m3r8rhw0zqrlsaqr2561z45xs6kg19l7c2x6g5qj"; + }; + + checkInputs = [ nose blinker tzlocal mock rednose ]; + propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]; + + # RuntimeError: Working outside of application context. + doCheck = false; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = "https://github.com/noirbizarre/flask-restplus"; + description = "Fast, easy and documented API development with Flask"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix index 24e66ea4e987..a0b623c6b6ab 100644 --- a/pkgs/development/python-modules/flask-wtf.nix +++ b/pkgs/development/python-modules/flask-wtf.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }: buildPythonPackage rec { - name = "Flask-WTF-0.14.2"; + pname = "Flask-WTF"; + version = "0.14.2"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix new file mode 100644 index 000000000000..387da64219df --- /dev/null +++ b/pkgs/development/python-modules/folium/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, numpy +, nbconvert +, pandas +, mock +, jinja2 +, branca +, six +}: + +buildPythonPackage rec { + pname = "folium"; + version = "0.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "7729ddd6766b9c5dab17b3709e2387935fd5c655872f1cbab7b7036474415217"; + }; + + postPatch = '' + # Causes trouble because a certain file cannot be found + rm tests/notebooks/test_notebooks.py + ''; + + checkInputs = [ pytest numpy nbconvert pandas mock ]; + propagatedBuildInputs = [ jinja2 branca six ]; + + # +# doCheck = false; + +# checkPhase = '' +# py.test -k 'not test_notebooks' +# ''; + + meta = { + description = "Make beautiful maps with Leaflet.js & Python"; + homepage = https://github.com/python-visualization/folium; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix new file mode 100644 index 000000000000..602fa50d00c3 --- /dev/null +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, fetchPypi +, numpy +, pytest +, pytestrunner +}: + +buildPythonPackage rec { + pname = "fonttools"; + version = "3.13.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "ded1f9a6cdd6ed19a3df05ae40066d579ffded17369b976f9e701cf31b7b1f2d"; + extension = "zip"; + }; + + buildInputs = [ + numpy + ]; + + checkInputs = [ + pytest + pytestrunner + ]; + + meta = { + homepage = "https://github.com/fonttools/fonttools"; + description = "A library to manipulate font files from Python"; + }; +} diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix new file mode 100644 index 000000000000..c368913caae9 --- /dev/null +++ b/pkgs/development/python-modules/future/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy26 +, importlib +, argparse +}: + +buildPythonPackage rec { + pname = "future"; + version = "0.16.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; + }; + + propagatedBuildInputs = lib.optionals isPy26 [ importlib argparse ]; + doCheck = false; + + meta = { + description = "Clean single-source support for Python 3 and 2"; + longDescription = '' + python-future is the missing compatibility layer between Python 2 and + Python 3. It allows you to use a single, clean Python 3.x-compatible + codebase to support both Python 2 and Python 3 with minimal overhead. + + It provides future and past packages with backports and forward ports + of features from Python 3 and 2. It also comes with futurize and + pasteurize, customized 2to3-based scripts that helps you to convert + either Py2 or Py3 code easily to support both Python 2 and 3 in a + single clean Py3-style codebase, module by module. + ''; + homepage = https://python-future.org; + downloadPage = https://github.com/PythonCharmers/python-future/releases; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ prikhi ]; + }; +} diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix new file mode 100644 index 000000000000..51794059b8e1 --- /dev/null +++ b/pkgs/development/python-modules/gensim/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, six +, scipy +, smart_open +, scikitlearn +, testfixtures +, unittest2 +}: + +buildPythonPackage rec { + pname = "gensim"; + name = "${pname}-${version}"; + version = "2.1.0"; + src = fetchPypi { + inherit pname version; + sha256 = "1wn7bji9b80wn1yggmh7a0dlwzdjr6cp24x4p33j2rf29lxnm2kc"; + }; + + propagatedBuildInputs = [ smart_open numpy six scipy + # scikitlearn testfixtures unittest2 # for tests + ]; + doCheck = false; + + # Two tests fail. + + # ERROR: testAddMorphemesToEmbeddings (gensim.test.test_varembed_wrapper.TestVarembed) + # ImportError: Could not import morfessor. + # This package is not in nix + + # ERROR: testWmdistance (gensim.test.test_fasttext_wrapper.TestFastText) + # ImportError: Please install pyemd Python package to compute WMD. + # This package is not in nix + + meta = { + description = "Topic-modelling library"; + homepage = "https://radimrehurek.com/gensim/"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ jpbernardy ]; + }; +} diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix new file mode 100644 index 000000000000..48fff7230569 --- /dev/null +++ b/pkgs/development/python-modules/gflags/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, six, pytest }: + +buildPythonPackage rec { + version = "3.1.1"; + name = "gflags-${version}"; + + src = fetchPypi { + inherit version; + pname = "python-gflags"; + sha256 = "0qvcizlz6r4511kl4jlg6fr34y1ka956dr2jj1q0qcklr94n9zxa"; + }; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ six ]; + + checkPhase = '' + # clashes with our pythhon wrapper (which is in argv0) + # AssertionError: 'gflags._helpers_test' != 'nix_run_setup.py' + py.test -k 'not testGetCallingModule' + ''; + + meta = { + homepage = https://github.com/google/python-gflags; + description = "A module for command line handling, similar to Google's gflags for C++"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix index 1f14b661d53e..5dfd399ac7de 100644 --- a/pkgs/development/python-modules/ghdiff.nix +++ b/pkgs/development/python-modules/ghdiff.nix @@ -2,7 +2,9 @@ , zope_testrunner, six, chardet}: buildPythonPackage rec { - name = "ghdiff-0.4"; + pname = "ghdiff"; + version = "0.4"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/g/ghdiff/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix new file mode 100644 index 000000000000..ac476f6bb6a2 --- /dev/null +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchurl +, bottle +, isPy3k +}: + +buildPythonPackage rec { + pname = "grammalecte"; + version = "0.5.17.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip"; + sha256 = "1g5i978cdz14rfdi4z2ayb2c1rf8cq991slwsv0krhpvl9ripl9c"; + }; + + propagatedBuildInputs = [ bottle ]; + + patches = [ ./spellchecker.patch ]; + preBuild = "cd .."; + postInstall = '' + mkdir $out/bin + cp $out/cli.py $out/bin/gramalecte + cp $out/server.py $out/bin/gramalected + chmod a+rx $out/bin/gramalecte + chmod a+rx $out/bin/gramalected + ''; + + disabled = !isPy3k; + + meta = { + description = "Grammalecte is an open source grammar checker for the French language"; + homepage = "https://dicollecte.org/grammalecte/"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ apeyroux ]; + }; +} diff --git a/pkgs/development/python-modules/grammalecte/spellchecker.patch b/pkgs/development/python-modules/grammalecte/spellchecker.patch new file mode 100644 index 000000000000..151eaa62f4a5 --- /dev/null +++ b/pkgs/development/python-modules/grammalecte/spellchecker.patch @@ -0,0 +1,13 @@ +diff --git a/spellchecker.py b/spellchecker.py +index 37ac0ea..a60b3a9 100644 +--- a/spellchecker.py ++++ b/spellchecker.py +@@ -2,7 +2,7 @@ + # Wrapper for the IBDAWG class. + # Useful to check several dictionaries at once. + +-import ibdawg ++from grammalecte import ibdawg + + + dDictionaries = { diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix new file mode 100644 index 000000000000..b0c0bb9496f7 --- /dev/null +++ b/pkgs/development/python-modules/guessit/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestrunner +, dateutil +, babelfish +, rebulk +}: + +buildPythonPackage rec { + pname = "guessit"; + version = "2.1.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56"; + }; + + # Tests require more packages. + doCheck = false; + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil babelfish rebulk + ]; + + meta = { + homepage = http://pypi.python.org/pypi/guessit; + license = lib.licenses.lgpl3; + description = "A library for guessing information from video files"; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn.nix index 026e9df360ce..cc8017f0cd88 100644 --- a/pkgs/development/python-modules/gunicorn.nix +++ b/pkgs/development/python-modules/gunicorn.nix @@ -2,11 +2,13 @@ , pytest, mock, pytestcov, coverage }: buildPythonPackage rec { - name = "gunicorn-19.3.0"; + pname = "gunicorn"; + version = "19.7.1"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/g/gunicorn/${name}.tar.gz"; - sha256 = "12d0jd9y9fyssc28mn8j6nzrck8y05hc946p5h0rmbc25043bj4b"; + sha256 = "eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622"; }; buildInputs = [ pytest mock pytestcov coverage ]; diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/pkgs/development/python-modules/gyp/no-xcode.patch index eb33a2b9987c..d202b7224744 100644 --- a/pkgs/development/python-modules/gyp/no-xcode.patch +++ b/pkgs/development/python-modules/gyp/no-xcode.patch @@ -1,66 +1,12 @@ -Index: pylib/gyp/xcode_emulation.py -diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py -index b2aab986a427d5285d70558bf97f0a42bfe1556e..20592c73fae660009aac621097cf3c4fb61d6cb6 100644 --- a/pylib/gyp/xcode_emulation.py +++ b/pylib/gyp/xcode_emulation.py -@@ -236,8 +236,14 @@ class XcodeSettings(object): - if sdk_root.startswith('/'): - return sdk_root - if sdk_root not in XcodeSettings._sdk_path_cache: -- XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( -- sdk_root, 'Path') -+ try: -+ XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( -+ sdk_root, 'Path') -+ except: -+ # if this fails it's because xcodebuild failed, which means -+ # the user is probably on a CLT-only system, where there -+ # is no valid SDK root -+ XcodeSettings._sdk_path_cache[sdk_root] = None - return XcodeSettings._sdk_path_cache[sdk_root] - - def _AppendPlatformVersionMinFlags(self, lst): -@@ -340,10 +346,11 @@ class XcodeSettings(object): - - cflags += self._Settings().get('WARNING_CFLAGS', []) - -- config = self.spec['configurations'][self.configname] -- framework_dirs = config.get('mac_framework_dirs', []) -- for directory in framework_dirs: -- cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) +@@ -1470,7 +1470,8 @@ + sdk_root = xcode_settings._SdkRoot(configuration) + if not sdk_root: + sdk_root = xcode_settings._XcodeSdkPath('') +- env['SDKROOT'] = sdk_root + if sdk_root: -+ config = self.spec['configurations'][self.configname] -+ framework_dirs = config.get('mac_framework_dirs', []) -+ for directory in framework_dirs: -+ cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ env['SDKROOT'] = sdk_root - self.configname = None - return cflags -@@ -573,10 +580,11 @@ class XcodeSettings(object): - for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): - ldflags.append('-Wl,-rpath,' + rpath) - -- config = self.spec['configurations'][self.configname] -- framework_dirs = config.get('mac_framework_dirs', []) -- for directory in framework_dirs: -- ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) -+ if self._SdkPath(): -+ config = self.spec['configurations'][self.configname] -+ framework_dirs = config.get('mac_framework_dirs', []) -+ for directory in framework_dirs: -+ ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) - - self.configname = None - return ldflags -@@ -701,7 +709,10 @@ class XcodeSettings(object): - l = '-l' + m.group(1) - else: - l = library -- return l.replace('$(SDKROOT)', self._SdkPath(config_name)) -+ if self._SdkPath(): -+ return l.replace('$(SDKROOT)', self._SdkPath(config_name)) -+ else: -+ return l - - def AdjustLibraries(self, libraries, config_name=None): - """Transforms entries like 'Cocoa.framework' in libraries into entries like + if not additional_settings: + additional_settings = {} diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e2cb11cedb41..7b517df09222 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -11,12 +11,13 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - name = "h5py-${version}"; - version = "2.6.0"; + version = "2.7.0"; + pname = "h5py"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/h5py/${name}.tar.gz"; - sha256 = "0df46dg7i7xfking9lp221bfm8dbl974yvlrbi1w7r6m61ac7bxj"; + sha256 = "79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix new file mode 100644 index 000000000000..697bc1cd0e3d --- /dev/null +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, libusb1, udev, fetchPypi, buildPythonPackage, cython }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "hidapi"; + version = "0.7.99.post20"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z"; + }; + + propagatedBuildInputs = [ libusb1 udev cython ]; + + # Fix the USB backend library lookup + postPatch = '' + libusb=${libusb1.dev}/include/libusb-1.0 + test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py + ''; + + meta = with stdenv.lib; { + description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi"; + homepage = https://github.com/trezor/cython-hidapi; + # license can actually be either bsd3 or gpl3 + # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix new file mode 100644 index 000000000000..9e97e56c1341 --- /dev/null +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -0,0 +1,27 @@ +{ stdenv , fetchurl , buildPythonPackage , sphinx }: + +buildPythonPackage rec { + pname = "hieroglyph"; + version = "0.7.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/h/hieroglyph/${name}.tar.gz"; + sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb"; + }; + + propagatedBuildInputs = [ sphinx ]; + + # all tests fail; don't know why: + # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate HTML presentations from plain text sources"; + homepage = https://github.com/nyergler/hieroglyph/; + license = licenses.bsd3; + maintainers = with maintainers; [ juliendehos ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin.nix new file mode 100644 index 000000000000..35f86479a4e3 --- /dev/null +++ b/pkgs/development/python-modules/htmlmin.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "htmlmin"; + version = "0.1.10"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63"; + }; + + # Tests run fine in a normal source checkout, but not when being built by nix. + doCheck = false; + + meta = { + description = "A configurable HTML Minifier with safety features"; + homepage = https://pypi.python.org/pypi/htmlmin; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.ahmedtd]; + }; +} diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix new file mode 100644 index 000000000000..72917fdd771b --- /dev/null +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, flask +, markupsafe +, decorator +, itsdangerous +, six }: + +buildPythonPackage rec { + pname = "httpbin"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054"; + }; + + propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/kennethreitz/httpbin; + description = "HTTP Request & Response Service"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix new file mode 100644 index 000000000000..0e4ae14acd76 --- /dev/null +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchPypi, buildPythonPackage, docopt, pythonOlder }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "httpserver"; + version = "1.1.0"; + + buildInputs = [ docopt ]; + + # Tests pull in lots of other dependencies to emulate different web + # drivers. + doCheck = false; + + # Because it uses asyncio + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv"; + }; + + meta = { + description = "Asyncio implementation of an HTTP server"; + homepage = https://github.com/thomwiggers/httpserver; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index f313f6ab5c4d..ab56cde9c131 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python -, isPy27, enum34 -, doCheck ? true, pytest, flake8, flaky +, pythonOlder, pythonAtLeast, enum34 +, doCheck ? true, pytest, pytest_xdist, flake8, flaky }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html @@ -9,27 +9,33 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - name = "hypothesis-${version}"; - version = "3.6.0"; + version = "3.11.1"; + pname = "hypothesis"; + name = "${pname}-${version}"; # Upstream prefers github tarballs src = fetchFromGitHub { owner = "HypothesisWorks"; - repo = "hypothesis"; + repo = "hypothesis-python"; rev = "${version}"; - sha256 = "0a3r4c8sr9jn7sv419vdzrzfc9sp7zf105f1lgyiwyzi3cgyvcvg"; + sha256 = "0damf6zbm0db2a3gfwrbbj92yal576wpmhhchc0w0np8vdnax70n"; }; - buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; - propagatedBuildInputs = stdenv.lib.optionals isPy27 [ enum34 ]; + checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ]; + propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; inherit doCheck; # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' - ${python.interpreter} -m pytest tests/cover + rm tox.ini # This file changes how py.test runs and breaks it + py.test tests/cover ''; + # Unsupport by upstream on certain versions + # https://github.com/HypothesisWorks/hypothesis-python/issues/477 + disabled = pythonOlder "3.4" && pythonAtLeast "2.8"; + meta = with stdenv.lib; { description = "A Python library for property based testing"; homepage = https://github.com/DRMacIver/hypothesis; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index b8565a8b7587..0c54c3ab8aec 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "incremental"; - version = "16.10.1"; + version = "17.5.0"; src = fetchurl { url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0hh382gsj5lfl3fsabblk2djngl4n5yy90xakinasyn41rr6pb8l"; + sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix new file mode 100644 index 000000000000..d6ddadea9ca0 --- /dev/null +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchurl +}: + +buildPythonPackage rec { + pname = "intelhex"; + version = "2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0k5l1mn3gv1vb0jd24ygxksx8xqr57y1ivgyj37jsrwpzrp167kw"; + }; + + patches = [ + (fetchurl { + url = https://github.com/bialix/intelhex/commit/f251aef214daa2116e15ff7f7dcec1639eb12d5b.patch; + sha256 = "02i15qjmcz7mwbwvyj3agl5y7098rag2iwypdilkaadhbslsl9b9"; + }) + ]; + + meta = { + homepage = https://github.com/bialix/intelhex; + description = "Python library for Intel HEX files manipulations"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pjones ]; + }; +} diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix new file mode 100644 index 000000000000..69b35df29738 --- /dev/null +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchPypi +, python, pytest, sortedcontainers }: + +buildPythonPackage rec { + version = "2.1.0"; + pname = "intervaltree"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc"; + }; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ sortedcontainers ]; + + checkPhase = '' + runHook preCheck + # pytest will try to run tests for nix_run_setup.py / files in build/lib which fails + mv nix_run_setup.py run_setup + rm build -rf + ${python.interpreter} run_setup test + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "Editable interval tree data structure for Python 2 and 3"; + homepage = https://github.com/chaimleib/intervaltree; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.bennofs ]; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix new file mode 100644 index 000000000000..a77f6ac9c2f1 --- /dev/null +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, isPy27 +, mock +, ipython +, jupyter_client +, pexpect +, traitlets +, tornado +}: + +buildPythonPackage rec { + pname = "ipykernel"; + version = "4.6.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db"; + }; + + buildInputs = [ nose ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ + ipython + jupyter_client + pexpect + traitlets + tornado + ]; + + # Tests require backends. + # I don't want to add all supported backends as propagatedBuildInputs + doCheck = false; + + meta = { + description = "IPython Kernel for Jupyter"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix new file mode 100644 index 000000000000..3e8ea0489207 --- /dev/null +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, dateutil +, ipython_genutils +, decorator +, pyzmq +, ipython +, jupyter_client +, ipykernel +, tornado +, isPy3k +, futures +}: + +buildPythonPackage rec { + pname = "ipyparallel"; + version = "6.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "7eea4780266252fcc987b220a302d589fbb4d6b0569bd131115a20b31891103d"; + }; + + buildInputs = [ nose ]; + + propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + ] ++ lib.optionals (!isPy3k) [ futures ]; + + # Requires access to cluster + doCheck = false; + + meta = { + description = "Interactive Parallel Computing with IPython"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix new file mode 100644 index 000000000000..b25039cc71e8 --- /dev/null +++ b/pkgs/development/python-modules/ipython/5.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +# Build dependencies +, glibcLocales +# Test dependencies +, nose +, pygments +, testpath +, isPy27 +, mock +# Runtime dependencies +, backports_shutil_get_terminal_size +, jedi +, decorator +, pathlib2 +, pickleshare +, requests +, simplegeneric +, traitlets +, prompt_toolkit +, pexpect +, appnope +}: + +buildPythonPackage rec { + pname = "ipython"; + version = "5.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d"; + }; + + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + + buildInputs = [ glibcLocales ]; + + checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; + + propagatedBuildInputs = [ + backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit + simplegeneric traitlets requests pathlib2 pexpect + ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Circular dependency with ipykernel + + checkPhase = '' + nosetests + ''; + + meta = { + description = "IPython: Productive Interactive Computing"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bjornfor jgeerds orivej lnl7 ]; + }; +} diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix new file mode 100644 index 000000000000..af5bf5c4faa4 --- /dev/null +++ b/pkgs/development/python-modules/ipython/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +# Build dependencies +, glibcLocales +# Test dependencies +, nose +, pygments +# Runtime dependencies +, jedi +, decorator +, pickleshare +, simplegeneric +, traitlets +, prompt_toolkit +, pexpect +, appnope +}: + +buildPythonPackage rec { + pname = "ipython"; + version = "6.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814"; + }; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + + buildInputs = [ glibcLocales ]; + + checkInputs = [ nose pygments ]; + + propagatedBuildInputs = [ + jedi + decorator + pickleshare + simplegeneric + traitlets + prompt_toolkit + pexpect + ] ++ lib.optionals stdenv.isDarwin [appnope]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Circular dependency with ipykernel + + checkPhase = '' + nosetests + ''; + + # IPython 6.0.0 and above does not support Python < 3.3. + # The last IPython version to support older Python versions + # is 5.3.x. + disabled = pythonOlder "3.3"; + + meta = { + description = "IPython: Productive Interactive Computing"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bjornfor jgeerds fridh ]; + }; +} diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix new file mode 100644 index 000000000000..dcd5b89b6b8e --- /dev/null +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, nose +, pytest +, mock +, ipython +, ipykernel +, traitlets +, notebook +, widgetsnbextension +}: + +buildPythonPackage rec { + pname = "ipywidgets"; + version = "6.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7"; + }; + + # Tests are not distributed + # doCheck = false; + + buildInputs = [ nose pytest mock ]; + propagatedBuildInputs = [ + ipython + ipykernel + traitlets + notebook + widgetsnbextension + ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = { + description = "IPython HTML widgets for Jupyter"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix new file mode 100644 index 000000000000..f44bb7caf3d5 --- /dev/null +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "iso-639"; + version = "0.4.5"; + + src = fetchurl { + url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/noumar/iso639; + description = "ISO 639 library for Python"; + license = licenses.agpl3; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix new file mode 100644 index 000000000000..4d9792ebbb82 --- /dev/null +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "iso3166"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "deactivated"; + repo = "python-iso3166"; + # repo has no version tags + rev = "f04e499447bbff10af701cf3dd81f6bcdf02f7d7"; + sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/deactivated/python-iso3166; + description = "Self-contained ISO 3166-1 country definitions"; + license = licenses.mit; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot.nix index efbd4b981fa5..9161f3f6f0b8 100644 --- a/pkgs/development/python-modules/jabberbot.nix +++ b/pkgs/development/python-modules/jabberbot.nix @@ -1,7 +1,9 @@ { stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }: buildPythonPackage rec { - name = "jabberbot-0.16"; + pname = "jabberbot"; + version = "0.16"; + name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix new file mode 100644 index 000000000000..3f5d48975374 --- /dev/null +++ b/pkgs/development/python-modules/jedi/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "jedi"; + version = "0.10.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test test + ''; + + # 7 failed + #doCheck = false; + + meta = { + homepage = https://github.com/davidhalter/jedi; + description = "An autocompletion tool for Python that can be used for text editors"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix new file mode 100644 index 000000000000..c199b2f50dbd --- /dev/null +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }: + +buildPythonApplication rec { + pname = "jsbeautifier"; + version = "1.6.14"; + name = "jsbeautifier-1.6.14"; + + propagatedBuildInputs = [ six ]; + + buildInputs = [ EditorConfig pytest ]; + + src = fetchurl { + url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; + sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2"; + }; + + meta = with stdenv.lib; { + homepage = "http://jsbeautifier.org"; + description = "JavaScript unobfuscator and beautifier."; + license = licenses.mit; + maintainers = with maintainers; [ apeyroux ]; + }; +} diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix new file mode 100644 index 000000000000..ca9549b677bb --- /dev/null +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, mock }: + +buildPythonPackage rec { + pname = "jsonref"; + version = "0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lqa8dy1sr1bxi00ri79lmbxvzxi84ki8p46zynyrgcqhwicxq2n"; + }; + + buildInputs = [ pytest mock ]; + + checkPhase = '' + py.test tests.py + ''; + + meta = with stdenv.lib; { + description = "An implementation of JSON Reference for Python"; + homepage = "http://github.com/gazpachoking/jsonref"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix new file mode 100644 index 000000000000..3782d313df89 --- /dev/null +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, traitlets +, jupyter_core +, pyzmq +, dateutil +, isPyPy +, py +}: + +buildPythonPackage rec { + pname = "jupyter_client"; + version = "5.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py; + + checkPhase = '' + nosetests -v + ''; + + # Circular dependency with ipykernel + doCheck = false; + + meta = { + description = "Jupyter protocol implementation and client libraries"; + homepage = http://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix new file mode 100644 index 000000000000..e54ed52d9c52 --- /dev/null +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchPypi, buildPythonPackage, ecdsa +, mnemonic, protobuf3_2, hidapi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "keepkey"; + version = "0.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714"; + }; + + propagatedBuildInputs = [ protobuf3_2 hidapi ]; + + buildInputs = [ ecdsa mnemonic ]; + + # There are no actual tests: "ImportError: No module named tests" + doCheck = false; + + # Remove impossible dependency constraint + postPatch = "sed -i -e 's|hidapi==|hidapi>=|' setup.py"; + + meta = with stdenv.lib; { + description = "KeepKey Python client"; + homepage = https://github.com/keepkey/python-keepkey; + license = licenses.gpl3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 65c72ca98314..43e576b1b312 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "1.2.2"; + version = "2.0.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0bby93sffjadrxnx9j9nn2lq0ygsgqjp16260c6lz77b6r1qrcfj"; + sha256 = "cbce24758530e070fe1b403d6d21391cbea78c037b70bf6afc1ca9f1f8269eff"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix new file mode 100644 index 000000000000..033f08f9587c --- /dev/null +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, isPyPy, fetchPypi, python +, pbr, testtools, testresources, testrepository, mock +, pep8, fixtures, mox3, requests-mock +, iso8601, requests, six, stevedore, webob, oslo-config +}: + +buildPythonPackage rec { + pname = "keystoneauth1"; + version = "1.1.0"; + name = "${pname}-${version}"; + disabled = isPyPy; # a test fails + + src = fetchPypi { + inherit pname version; + sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118"; + }; + + buildInputs = [ pbr testtools testresources testrepository mock + pep8 fixtures mox3 requests-mock ]; + propagatedBuildInputs = [ iso8601 requests six stevedore + webob oslo-config ]; + + postPatch = '' + sed -i 's@python@${python.interpreter}@' .testr.conf + substituteInPlace requirements.txt --replace "argparse" + ''; +} diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix new file mode 100644 index 000000000000..895cdedcb6e8 --- /dev/null +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "kitchen"; + version = "1.2.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq"; + }; + + meta = with stdenv.lib; { + description = "Kitchen contains a cornucopia of useful code"; + license = licenses.lgpl2; + maintainers = with maintainers; [ mornfall ]; + }; +} diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 262ea74d4a34..d43e56781a7b 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,7 +1,10 @@ -{ stdenv, fetchurl, mkPythonDerivation, pycurl }: +{ stdenv, fetchurl, buildPythonPackage, pycurl }: -mkPythonDerivation rec { - name = "koji-1.8"; +buildPythonPackage rec { + pname = "koji"; + version = "1.8"; + name = "${pname}-${version}"; + format = "other"; src = fetchurl { url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index 95243f52a38a..b583a2ae2d82 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -1,15 +1,41 @@ -{ buildPythonPackage, isPy3k, fetchurl +{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi , openldap, cyrus_sasl, openssl }: buildPythonPackage rec { - name = "ldap-2.4.22"; + pname = "python-ldap"; + version = "2.4.39"; + name = "${pname}-${version}"; disabled = isPy3k; - src = fetchurl { - url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz"; - sha256 = "1dshpq84kl4xpa0hmnjrh6q5h5bybn09r83sa3z3ybr9jlm8gxcy"; + src = fetchPypi { + inherit pname version; + sha256 = "3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3"; }; + # Needed by tests to setup a mockup ldap server. + preCheck = '' + export BIN="${openldap}/bin" + export SBIN="${openldap}/bin" + export SLAPD="${openldap}/libexec/slapd" + export SCHEMA="${openldap}/etc/schema" + ''; + + patches = lib.singleton (writeText "avoid-syslog.diff" '' + diff a/Lib/slapdtest.py b/Lib/slapdtest.py + --- a/Lib/slapdtest.py + +++ b/Lib/slapdtest.py + @@ -60,7 +60,8 @@ def combined_logger( + pass + # for writing to syslog + new_logger = logging.getLogger(log_name) + - if sys_log_format: + + # /dev/log does not exist in nix build environment. + + if False: + my_syslog_formatter = logging.Formatter( + fmt=' '.join((log_name, sys_log_format))) + my_syslog_handler = logging.handlers.SysLogHandler( + ''); + NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; propagatedBuildInputs = [openldap cyrus_sasl openssl]; } diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix new file mode 100644 index 000000000000..9ed18190a8e3 --- /dev/null +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, buildPythonPackage, hidapi +, pycrypto, pillow, protobuf, future, ecpy +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ledgerblue"; + version = "0.1.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0"; + }; + + buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; + + meta = with stdenv.lib; { + description = "Python library to communicate with Ledger Blue/Nano S"; + homepage = "https://github.com/LedgerHQ/blue-loader-python"; + license = licenses.asl20; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix new file mode 100644 index 000000000000..5192abf8200f --- /dev/null +++ b/pkgs/development/python-modules/libagent/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa +, semver, keepkey, trezor, mnemonic, ledgerblue +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "libagent"; + version = "0.9.1"; + + src = fetchPypi{ + inherit pname version; + sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc"; + }; + + buildInputs = [ + ed25519 ecdsa semver keepkey + trezor mnemonic ledgerblue + ]; + + meta = with stdenv.lib; { + description = "Using hardware wallets as SSH/GPG agent"; + homepage = "https://github.com/romanz/trezor-agent"; + license = licenses.gpl3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix new file mode 100644 index 000000000000..5d8c886e00bd --- /dev/null +++ b/pkgs/development/python-modules/libais/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchurl, + six, pytest, pytestrunner, pytestcov, coverage +}: +buildPythonPackage rec { + pname = "libais"; + name = "${pname}-${version}"; + version = "0.16"; + + src = fetchurl { + url = "mirror://pypi/l/libais/${name}.tar.bz2"; + sha256 = "14dsh5k32ryszwdn6p45wrqp4ska6cc9qpm6lk5c5d1p4rc7wnhq"; + }; + + # data files missing + doCheck = false; + + buildInputs = [ pytest pytestrunner pytestcov coverage ]; + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/schwehr/libais; + description = "Library for decoding maritime Automatic Identification System messages"; + license = licenses.asl20; + platforms = platforms.linux; # It currently fails to build on darwin + }; +} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index cae6ac62e1e6..bfe3b7bbb667 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -5,7 +5,8 @@ then throw "libArcus not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "libarcus-${version}"; + pname = "libarcus"; + name = "${pname}-${version}"; version = "2.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index 63bcad285c4e..b27dbc2935af 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -2,7 +2,8 @@ , libasyncns, pkgconfig }: buildPythonPackage rec { - name = "libasyncns-python-${version}"; + pname = "libasyncns-python"; + name = "${pname}-${version}"; version = "0.7.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix new file mode 100644 index 000000000000..7a96530912b6 --- /dev/null +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, libsodium }: + +buildPythonPackage rec { + pname = "libnacl"; + version = "1.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ libsodium ]; + + postPatch = '' + substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium.so')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium.so')" + ''; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ xvapx ]; + description = "Python bindings for libsodium based on ctypes"; + homepage = "https://pypi.python.org/pypi/libnacl"; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index fa79cfa3be5c..69d9dde6cbac 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, mkPythonDerivation, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: -mkPythonDerivation rec { - name = "libsexy-${version}"; +buildPythonPackage rec { + pname = "libsexy"; + name = "${pname}-${version}"; version = "0.1.9"; + format = "other"; src = fetchurl { url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix new file mode 100644 index 000000000000..745f83fe5081 --- /dev/null +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchFromGitHub +, stdenv +, lib +, pythonOlder +, requests +, enum34 +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "libsoundtouch"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "CharlesBlonde"; + repo = "libsoundtouch"; + rev = "875074b7a23734021974345b3dc297918e453aa2"; + sha256 = "1psd556j4x77hjxahxxgdgnq2mcd769whvnf0gmwf3jy2svfkqlg"; + }; + + postPatch = lib.optionalString (! (pythonOlder "3.4")) '' + substituteInPlace setup.py --replace "'enum34>=1.1.6'" "" + ''; + + propagatedBuildInputs = [ requests enum34 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Bose Soundtouch Python library"; + homepage = https://github.com/CharlesBlonde/libsoundtouch; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix new file mode 100644 index 000000000000..203b9e6bf754 --- /dev/null +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest_29 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "libtmux"; + version = "0.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "111qbgq28za12la5b0aa9rr7hg8235zy0kyzzryn7fa6z3i5k5z8"; + }; + + buildInputs = [ pytest_29 ]; + patchPhase = '' + sed -i 's/==.*$//' requirements/test.txt + ''; + + meta = with stdenv.lib; { + description = "Scripting library for tmux"; + homepage = https://libtmux.readthedocs.io/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; + }; +} + diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix new file mode 100644 index 000000000000..570bba2a8c42 --- /dev/null +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, isPyPy +, ipython +, python +}: + +buildPythonPackage rec { + pname = "line_profiler"; + version = "2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381"; + }; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ ipython ]; + + disabled = isPyPy; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = { + description = "Line-by-line profiler"; + homepage = https://github.com/rkern/line_profiler; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 1da503417503..c08d05c0341a 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; name = "${pname}-${version}"; - version = "0.15.0"; + version = "0.18.0"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4"; + sha256 = "25a38af925f0523b834b92216d7f7cc997624942d5958287350c254f5e730404"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/ltc_scrypt/default.nix b/pkgs/development/python-modules/ltc_scrypt/default.nix new file mode 100644 index 000000000000..273571c66e1f --- /dev/null +++ b/pkgs/development/python-modules/ltc_scrypt/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ltc_scrypt"; + version = "1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h90hh3iw4i7zs7jgskdjlk8gi97b3v2zqsxdfwdvhrrnhpvv856"; + }; + + meta = with stdenv.lib; { + description = "Bindings for scrypt proof of work used by Litecoin"; + homepage = https://pypi.python.org/pypi/ltc_scrypt; + maintainers = with maintainers; [ asymmetric ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix new file mode 100644 index 000000000000..74cc87d5d897 --- /dev/null +++ b/pkgs/development/python-modules/m2r/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, + mistune, docutils } : +buildPythonPackage rec { + pname = "m2r"; + name = "${pname}-${version}"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527"; + }; + + propagatedBuildInputs = [ mistune docutils ]; + + # Some tests interfeere with each other (test.md and test.rst are + # deleted by some tests and not properly regenerated) + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/miyakogi/m2r; + description = "converts a markdown file including reST markups to a valid reST format"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 483e9aa3a3b9..a777094aea16 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,33 +1,56 @@ -{ stdenv, fetchurl, nettools, glibcLocales, pythonPackages }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, nettools +, glibcLocales +, autobahn +, cffi +, click +, hkdf +, pynacl +, spake2 +, tqdm +, python +, mock +, ipaddress +, humanize +, pyopenssl +, service-identity +}: -pythonPackages.buildPythonApplication rec { - name = "magic-wormhole-${version}"; - version = "0.8.1"; +buildPythonPackage rec { + pname = "magic-wormhole"; + version = "0.9.2"; + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz"; - sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; + src = fetchPypi { + inherit pname version; + sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3"; }; + checkInputs = [ mock ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ]; + propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ]; - patchPhase = '' + postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py # XXX: disable one test due to warning: # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py + '' + lib.optionalString (pythonAtLeast "3.3") '' + sed -i -e 's|"ipaddress",||' setup.py ''; checkPhase = '' export PATH="$PATH:$out/bin" export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole + ${python.interpreter} -m wormhole.test.run_trial wormhole ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole"; license = licenses.mit; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix new file mode 100644 index 000000000000..8e8af34fcdc6 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozprofile +, mozversion +, moztest +, manifestparser +, marionette_driver +, browsermob-proxy +, wptserve +}: + +buildPythonPackage rec { + pname = "marionette-harness"; + version = "4.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0726zm09nwh4kkd4xirva4596svlifkkpbaywlmq2yb6ayk7d4vl"; + }; + + propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest + wptserve manifestparser marionette_driver ]; + + meta = { + description = "Mozilla Marionette protocol test automation harness"; + homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix new file mode 100644 index 000000000000..9a3fe07680d9 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "manifestparser"; + version = "1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "06cnj682ynacwpi63k1427vbf7ydnwh3dchc4b11yw8ii25wbc5d"; + }; + + propagatedBuildInputs = [ ]; + + meta = { + description = "Mozilla test manifest handling"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix new file mode 100644 index 000000000000..ea72c0d0d18d --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozversion +, mozrunner +}: + +buildPythonPackage rec { + pname = "marionette_driver"; + version = "2.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0phlb4r6xf3yv1z23kn6paxkq6fvfywj2h4gcbavg4w6jd63vd5z"; + }; + + propagatedBuildInputs = [ mozversion mozrunner ]; + + meta = { + description = "Mozilla Marionette driver"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Marionette"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix new file mode 100644 index 000000000000..d47cdd83976b --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozfile +, mozlog +}: + +buildPythonPackage rec { + pname = "mozcrash"; + version = "1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02101v6v2jqlv6cbrmmggj12asz9vz6m50b6mk9mq17b1dr1zik3"; + }; + + propagatedBuildInputs = [ mozfile mozlog ]; + + meta = { + description = "Minidump stack trace extractor"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix new file mode 100644 index 000000000000..2dc0e9b860aa --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, moznetwork +, mozprocess +}: + +buildPythonPackage rec { + pname = "mozdevice"; + version = "0.50"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cfxzhfxdphlzj80vkd3h7m0mg5w7zhb8h6f5lmybliqdiv9vz20"; + }; + + propagatedBuildInputs = [ moznetwork mozprocess ]; + + meta = { + description = "Mozilla-authored device management"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix new file mode 100644 index 000000000000..eb627dcf243c --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mozfile"; + version = "1.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mz941np62mg0zncy74d8fbq9fafsxjsxlwdsydl92badhrhzc6k"; + }; + + propagatedBuildInputs = [ ]; + + # mozhttpd -> moznetwork -> mozinfo -> mozfile + doCheck = false; + + meta = { + description = "File utilities for Mozilla testing"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix new file mode 100644 index 000000000000..32580d7f7726 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, moznetwork +}: + +buildPythonPackage rec { + pname = "mozhttpd"; + version = "0.7"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "10y1cr933ajx9ni701ayb7r361pak9wrzr7pdpyx81kkbjddq7qa"; + }; + + propagatedBuildInputs = [ moznetwork ]; + + meta = { + description = "Webserver for Mozilla testing"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix new file mode 100644 index 000000000000..556706930948 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozfile +}: + +buildPythonPackage rec { + pname = "mozinfo"; + version = "0.9"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwhnhbj7xipwh33wf7m12pw5g662dpr1chkp6p2fmy0mwpn2y4z"; + }; + + propagatedBuildInputs = [ mozfile ]; + + meta = { + description = "System information utilities for Mozilla testing"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix new file mode 100644 index 000000000000..34a1fbf3aa0b --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, blessings +, mozfile +}: + +buildPythonPackage rec { + pname = "mozlog"; + version = "3.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq"; + }; + + propagatedBuildInputs = [ blessings mozfile ]; + + meta = { + description = "Mozilla logging library"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix new file mode 100644 index 000000000000..6a42ad0d872d --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozlog +, mozinfo +}: + +buildPythonPackage rec { + pname = "moznetwork"; + version = "0.27"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "09ypx5wif0mly6fk3491nlzg8whg6qw24x7h9w70hykdqindbh2s"; + }; + + propagatedBuildInputs = [ mozlog mozinfo ]; + + meta = { + description = "Network utilities for Mozilla testing"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix new file mode 100644 index 000000000000..db3c713acad4 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozinfo +}: + +buildPythonPackage rec { + pname = "mozprocess"; + version = "0.25"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0lfflwjkwvc8bqvsgdib3b78w2pms8nharh3sc3zgsrmqb1mbzks"; + }; + + propagatedBuildInputs = [ mozinfo ]; + + meta = { + description = "Mozilla-authored process handling"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix new file mode 100644 index 000000000000..3639d63e5484 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozlog +, mozfile +, mozhttpd +}: + +buildPythonPackage rec { + pname = "mozprofile"; + version = "0.28"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15xsdhrpbg7hlr6nvb3k3ci33h786hrv12az8j2k7aa9gzjcf8nh"; + }; + + propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; + + meta = { + description = "Mozilla application profile handling library"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix new file mode 100644 index 000000000000..20942955c4c7 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozdevice +, mozfile +, mozinfo +, mozlog +, mozprocess +, mozprofile +, mozcrash +}: + +buildPythonPackage rec { + pname = "mozrunner"; + version = "6.13"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d5k3a0w1iyyk6l28l65j47grq87zd207h369x4vahq02nrx2g6l"; + }; + + propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess + mozprofile mozcrash ]; + + meta = { + description = "Mozilla application start/stop helpers"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix new file mode 100644 index 000000000000..0ac697ce35f1 --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozinfo +}: + +buildPythonPackage rec { + pname = "moztest"; + version = "0.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pg9pqq4xnn14k1jqbyqg81zag2v66y725537v6hixi41yiqkdas"; + }; + + propagatedBuildInputs = [ mozinfo ]; + + meta = { + description = "Mozilla test result storage and output"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix new file mode 100644 index 000000000000..7d01767490cb --- /dev/null +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, mozlog +, mozdevice +}: + +buildPythonPackage rec { + pname = "mozversion"; + version = "1.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15ipddn6bpqxl590cy37fj52vgpa4faw2dax1mwvdxj7b18s3pwh"; + }; + + propagatedBuildInputs = [ mozlog mozdevice ]; + + meta = { + description = "Application version information library"; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix index af7511bc9aa3..f614eb0747bb 100644 --- a/pkgs/development/python-modules/markdown2.nix +++ b/pkgs/development/python-modules/markdown2.nix @@ -1,12 +1,13 @@ { stdenv, buildPythonPackage, fetchurl }: buildPythonPackage rec { - name = "markdown2-${version}"; - version = "2.3.1"; + pname = "markdown2"; + version = "2.3.4"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/markdown2/${name}.zip"; - sha256 = "03nqcx79r9lr5gp2zpqa1n54hnxqczdq27f2j3aazr3r9rsxsqs4"; + sha256 = "264731e7625402227ff6fb01f2d814882da7705432659a18a419c508e8bfccb1"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix new file mode 100644 index 000000000000..2e05ee621e2a --- /dev/null +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, markdown }: + +buildPythonPackage rec { + pname = "MarkdownSuperscript"; + version = "2.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dsx21h9hkx098d5azpw81dcz23rrgzrwlymwv7jri348q26p748"; + }; + + propagatedBuildInputs = [ markdown ]; + + doCheck = false; # See https://github.com/NixOS/nixpkgs/pull/26985 + + meta = { + description = "An extension to the Python Markdown package enabling superscript text"; + homepage = https://github.com/jambonrose/markdown_superscript_extension; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index b917575e2390..03a03007cf91 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -20,12 +20,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - name = "matplotlib-${version}"; - version = "2.0.0"; + version = "2.0.2"; + pname = "matplotlib"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "04zqymd5dw6lxvfbxf1sycdnibjk5qky5rfsn6wb46lwha2hkkrn"; + sha256 = "0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix new file mode 100644 index 000000000000..472bba26eb65 --- /dev/null +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "mccabe"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; + }; + + buildInputs = [ pytest pytestrunner ]; + + meta = with stdenv.lib; { + description = "McCabe checker, plugin for flake8"; + homepage = "https://github.com/flintwork/mccabe"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix new file mode 100644 index 000000000000..b72789369f26 --- /dev/null +++ b/pkgs/development/python-modules/metaphone/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "Metaphone"; + version = "0.6"; + name = "metaphone-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "09ysaczwh2rlsqq9j5fz7m4pq2fs0axp5vvivrpfrdvclvffl2xd"; + }; + + disabled = isPy3k; + + buildInputs = [ nose ]; + + meta = with stdenv.lib; { + homepage = https://github.com/oubiwann/metaphone; + description = "A Python implementation of the metaphone and double metaphone algorithms"; + license = licenses.bsd3; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/mnemonic.nix b/pkgs/development/python-modules/mnemonic.nix new file mode 100644 index 000000000000..9f71fdb8e741 --- /dev/null +++ b/pkgs/development/python-modules/mnemonic.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildPythonPackage, pbkdf2 }: + +buildPythonPackage rec { + pname = "mnemonic"; + version = "0.17"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/m/${pname}/${name}.tar.gz"; + sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn"; + }; + + propagatedBuildInputs = [ pbkdf2 ]; + + meta = { + description = "Implementation of Bitcoin BIP-0039"; + homepage = https://github.com/trezor/python-mnemonic; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix new file mode 100644 index 000000000000..9f71fdb8e741 --- /dev/null +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildPythonPackage, pbkdf2 }: + +buildPythonPackage rec { + pname = "mnemonic"; + version = "0.17"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/m/${pname}/${name}.tar.gz"; + sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn"; + }; + + propagatedBuildInputs = [ pbkdf2 ]; + + meta = { + description = "Implementation of Bitcoin BIP-0039"; + homepage = https://github.com/trezor/python-mnemonic; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index c38d948dd6be..a9ffe37a4638 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }: buildPythonPackage rec { - name = "mpi4py-1.3.1"; + pname = "mpi4py"; + version = "2.0.0"; + name = "${pname}-${version}"; src = fetchurl { url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz"; - sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507"; + sha256 = "6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81"; }; passthru = { diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix new file mode 100644 index 000000000000..29984eed9e90 --- /dev/null +++ b/pkgs/development/python-modules/mplleaflet/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jinja2 +, six +}: + +buildPythonPackage rec { + pname = "mplleaflet"; + version = "0.0.5"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ jinja2 six ]; + + # No tests in archive + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "049e0b91797ce5b462853395138161fed9e8dfc1f4723f482ebb0739a0bbd289"; + }; + + meta = { + description = "Convert Matplotlib plots into Leaflet web maps"; + homepage = http://github.com/jwass/mplleaflet; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 9a2e13f0c598..faece73e172f 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,13 +7,13 @@ let pname = "multidict"; - version = "2.1.4"; + version = "2.1.6"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7"; + sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix new file mode 100644 index 000000000000..79ec9f5bd896 --- /dev/null +++ b/pkgs/development/python-modules/natsort/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, hypothesis +, pytestcache +, pytestcov +, pytestflakes +, pytestpep8 +, pytest +, glibcLocales +, mock ? null +, pathlib ? null +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "natsort"; + version = "5.0.3"; + + buildInputs = [ + hypothesis + pytestcache + pytestcov + pytestflakes + pytestpep8 + pytest + glibcLocales + ] + # pathlib was made part of standard library in 3.5: + ++ (lib.optionals (pythonOlder "3.4") [ pathlib ]) + # based on testing-requirements.txt: + ++ (lib.optionals (pythonOlder "3.3") [ mock ]); + + src = fetchPypi { + inherit pname version; + sha256 = "1h87n0jcsi6mgjx1pws6g1lmcn8jwabwxj8hq334jvziaq0plyym"; + }; + + # do not run checks on nix_run_setup.py + patches = [ ./setup.patch ]; + + # testing based on project's tox.ini + checkPhase = '' + pytest --doctest-modules natsort + pytest --flakes --pep8 --cov natsort --cov-report term-missing + ''; + + meta = { + description = "Natural sorting for python"; + homepage = https://github.com/SethMMorton/natsort; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/natsort/setup.patch b/pkgs/development/python-modules/natsort/setup.patch new file mode 100644 index 000000000000..4c52b740152c --- /dev/null +++ b/pkgs/development/python-modules/natsort/setup.patch @@ -0,0 +1,20 @@ +diff --git a/setup.cfg b/setup.cfg +index 604994d..e38c3ec 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -6,6 +6,7 @@ formats = gztar + + [tool:pytest] + flakes-ignore = ++ nix_run_setup.py ALL + natsort/compat/py23.py UndefinedName + natsort/__init__.py UnusedImport + natsort/compat/* UnusedImport +@@ -14,6 +15,7 @@ flakes-ignore = + test_natsort/test_locale_help.py UnusedImport RedefinedWhileUnused + test_natsort/compat/* UnusedImport + pep8ignore = ++ nix_run_setup.py ALL + natsort/ns_enum.py E126 E241 E123 E221 + test_natsort/test_*.py E501 E241 E221 + test_natsort/test_natsort_keygen.py E501 E241 E221 E701 diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix new file mode 100644 index 000000000000..881895ba6baa --- /dev/null +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, nose +, entrypoints +, bleach +, mistune +, jinja2 +, pygments +, traitlets +, testpath +, jupyter_core +, nbformat +, nbconvert +, ipykernel +, pandocfilters +, tornado +, jupyter_client +}: + +buildPythonPackage rec { + pname = "nbconvert"; + version = "5.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9ed68ec7fe90a8672b43795b29ea91cc75ea355c83debc83ebd12171521ec274"; + }; + + checkInputs = [ nose pytest ]; + + propagatedBuildInputs = [ + entrypoints bleach mistune jinja2 pygments traitlets testpath + jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client + ]; + + checkPhase = '' + nosetests -v + ''; + + # PermissionError. Likely due to being in a chroot + doCheck = false; + + meta = { + description = "Converting Jupyter Notebooks"; + homepage = http://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix new file mode 100644 index 000000000000..143c57321b61 --- /dev/null +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, glibcLocales +, ipython_genutils +, traitlets +, testpath +, jsonschema +, jupyter_core +}: + +buildPythonPackage rec { + pname = "nbformat"; + version = "4.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b"; + }; + LC_ALL="en_US.UTF-8"; + + checkInputs = [ pytest glibcLocales ]; + propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; + + # Failing tests and permission issues + doCheck = false; + + meta = { + description = "The Jupyter Notebook format"; + homepage = "http://jupyter.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4/default.nix similarity index 73% rename from pkgs/development/python-modules/netcdf4.nix rename to pkgs/development/python-modules/netcdf4/default.nix index 979a741e1ab3..75b4723b0b51 100644 --- a/pkgs/development/python-modules/netcdf4.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,17 +1,22 @@ { stdenv, buildPythonPackage, fetchurl, isPyPy -, numpy, zlib, netcdf, hdf5, curl, libjpeg +, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython }: buildPythonPackage rec { - name = "netCDF4-${version}"; - version = "1.2.7"; + pname = "netCDF4"; + name = "${pname}-${version}"; + version = "1.2.9"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c"; + sha256 = "259edab1f03b1c1b93bdbaa804d50211a0c9d8a15eee4f23988b5685c6c0d2c0"; }; + buildInputs = [ + cython + ]; + propagatedBuildInputs = [ numpy zlib diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix index c436e40d2382..302bd89be02c 100644 --- a/pkgs/development/python-modules/nltk.nix +++ b/pkgs/development/python-modules/nltk.nix @@ -1,12 +1,13 @@ { fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: buildPythonPackage rec { - name = "nltk-${version}"; - version = "3.2.2"; + version = "3.2.4"; + pname = "nltk"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; - sha256 = "13m8i393h5mhpyvh5rghxxpax3bscv8li3ynwfdiq0kh8wsdndqv"; + sha256 = "8682ae52f5de4f2ba7b77bd78222a38575ad01ef29946214b254dfdf93a3a0eb"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix new file mode 100644 index 000000000000..0bd569fd4ad3 --- /dev/null +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.1.1"; + pname = "node-semver"; + + buildInputs = [ pytest tox ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/podhmo/python-semver; + description = "A port of node-semver"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix new file mode 100644 index 000000000000..3a24c5566bf0 --- /dev/null +++ b/pkgs/development/python-modules/notebook/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, glibcLocales +, isPy27 +, mock +, jinja2 +, tornado +, ipython_genutils +, traitlets +, jupyter_core +, jupyter_client +, nbformat +, nbconvert +, ipykernel +, terminado +, requests +, pexpect +}: + +buildPythonPackage rec { + pname = "notebook"; + version = "5.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54"; + }; + + LC_ALL = "en_US.UTF-8"; + + buildInputs = [nose glibcLocales] ++ lib.optionals isPy27 [mock]; + + propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core + jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ]; + + checkPhase = '' + nosetests -v + ''; + + # Certain tests fail due to being in a chroot. + # PermissionError + doCheck = false; + meta = { + description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; + homepage = http://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix new file mode 100644 index 000000000000..03890f712afc --- /dev/null +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytest +, unittest2 +, six +}: + +buildPythonPackage rec { + pname = "ntlm-auth"; + version = "1.0.3"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jborean93"; + repo = "ntlm-auth"; + rev = "v${version}"; + sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz"; + }; + + checkInputs = [ mock pytest unittest2 ]; + propagatedBuildInputs = [ six ]; + + # Functional tests require networking + checkPhase = '' + py.test --ignore=tests/functional/test_iis.py + ''; + + meta = with lib; { + description = "Calculates NTLM Authentication codes"; + homepage = https://github.com/jborean93/ntlm-auth; + license = licenses.lgpl3; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 422fee396412..99c7ce008533 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - version = "0.30.1"; - name = "numba-${version}"; + version = "0.33.0"; + pname = "numba"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "66e6254b3002f448fd212c5df4c8a69964dff9b9f315fb733e3c95e7e2b6c8fd"; + sha256 = "56c5fcf3175f72b67ba8998d02870e3ea598e10c41d93289cecb9d89be7669fd"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy/default.nix similarity index 69% rename from pkgs/development/python-modules/numpy.nix rename to pkgs/development/python-modules/numpy/default.nix index 16c919eb4b2e..d427a33f80f4 100644 --- a/pkgs/development/python-modules/numpy.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,16 +1,17 @@ -{lib, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: +{lib, fetchurl, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: -args: +buildPythonPackage rec { + pname = "numpy"; + version = "1.12.1"; + name = "${pname}-${version}"; -let - inherit (args) version; -in buildPythonPackage (args // rec { - - name = "numpy-${version}"; + src = fetchurl { + url = "mirror://pypi/n/numpy/numpy-${version}.zip"; + sha256 = "a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542"; + }; disabled = isPyPy; - buildInputs = args.buildInputs or [ gfortran nose ]; - propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ]; + buildInputs = [ gfortran nose blas ]; patches = lib.optionals (python.hasDistutilsCxxPatch or false) [ # See cpython 2.7 patches. @@ -26,8 +27,8 @@ in buildPythonPackage (args // rec { echo "Creating site.cfg file..." cat << EOF > site.cfg [openblas] - include_dirs = ${passthru.blas}/include - library_dirs = ${passthru.blas}/lib + include_dirs = ${blas}/include + library_dirs = ${blas}/lib EOF ''; @@ -56,5 +57,5 @@ in buildPythonPackage (args // rec { description = "Scientific tools for Python"; homepage = "http://numpy.scipy.org/"; maintainers = with lib.maintainers; [ fridh ]; - } // (args.meta or {}); -}) + }; +} diff --git a/pkgs/development/python-modules/numpy-distutils-C++.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch similarity index 100% rename from pkgs/development/python-modules/numpy-distutils-C++.patch rename to pkgs/development/python-modules/numpy/numpy-distutils-C++.patch diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix new file mode 100644 index 000000000000..d97c525b17a8 --- /dev/null +++ b/pkgs/development/python-modules/os-testr/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchurl, python, + pbr, Babel, testrepository, subunit, testtools, + coverage, oslosphinx, oslotest, testscenarios, six, ddt +}: +buildPythonPackage rec { + version = "0.8.2"; + pname = "os-testr"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/o/os-testr/${name}.tar.gz"; + sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837"; + }; + + patchPhase = '' + sed -i 's@python@${python.interpreter}@' .testr.conf + sed -i 's@python@${python.interpreter}@' os_testr/tests/files/testr-conf + ''; + + checkPhase = '' + export PATH=$PATH:$out/bin + ${python.interpreter} setup.py test + ''; + + propagatedBuildInputs = [ pbr Babel testrepository subunit testtools ]; + buildInputs = [ coverage oslosphinx oslotest testscenarios six ddt ]; + + meta = with stdenv.lib; { + description = "A testr wrapper to provide functionality for OpenStack projects"; + homepage = http://docs.openstack.org/developer/os-testr/; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix new file mode 100644 index 000000000000..7cdfb9061fb2 --- /dev/null +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock }: + +buildPythonPackage rec { + pname = "oslo.config"; + version = "2.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz"; + }; + + propagatedBuildInputs = [ pbr six netaddr stevedore ]; + buildInputs = [ mock ]; + + # TODO: circular import on oslo-i18n + doCheck = false; + + postPatch = '' + substituteInPlace requirements.txt --replace "argparse" + ''; +} diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix new file mode 100644 index 000000000000..776ec7ffc4b3 --- /dev/null +++ b/pkgs/development/python-modules/packaging/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyparsing, six, pytest, pretend }: + +buildPythonPackage rec { + pname = "packaging"; + version = "16.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; + }; + + propagatedBuildInputs = [ pyparsing six ]; + + buildInputs = [ pytest pretend ]; + + meta = with stdenv.lib; { + description = "Core utilities for Python packages"; + homepage = "https://github.com/pypa/packaging"; + license = [ licenses.bsd2 licenses.asl20 ]; + maintainers = with maintainers; [ bennofs ]; + }; +} diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 21a7755c4097..ee75d211ad80 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -1,8 +1,9 @@ { buildPythonPackage +, fetchPypi , python , stdenv , fetchurl -, nose +, pytest , glibcLocales , cython , dateutil @@ -18,7 +19,6 @@ , openpyxl , tables , xlwt -, darwin ? {} , libcxx ? null }: @@ -27,16 +27,16 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.19.2"; + version = "0.20.2"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "6f0f4f598c2b16746803c8bafef7c721c57e4844da752d36240c0acf97658014"; + src = fetchPypi { + inherit pname version; + sha256 = "92173c976fcca70cb19a958eccdacf98af62ef7301bf786d0321cb8857cdfae6"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ nose glibcLocales ] ++ optional isDarwin libcxx; + buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx; propagatedBuildInputs = [ cython dateutil @@ -52,33 +52,33 @@ in buildPythonPackage rec { openpyxl tables xlwt - ] ++ optional isDarwin darwin.locale; # provides the locale command + ]; # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. - patchPhase = optionalString isDarwin '' + postPatch = optionalString isDarwin '' cpp_sdk="${libcxx}/include/c++/v1"; echo "Adding $cpp_sdk to the setup.py common_include variable" substituteInPlace setup.py \ --replace "['pandas/src/klib', 'pandas/src']" \ "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - - # disable clipboard tests since pbcopy/pbpaste are not open source - substituteInPlace pandas/io/tests/test_clipboard.py \ - --replace pandas.util.clipboard no_such_module \ - --replace OSError ImportError ''; - # The flag `-A 'not network'` will disable tests that use internet. - # The `-e` flag disables a few problematic tests. - checkPhase = '' runHook preCheck - # The flag `-w` provides the initial directory to search for tests. - # The flag `-A 'not network'` will disable tests that use internet. - nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' --stop \ - --verbosity=3 - runHook postCheck + '' + # TODO: Get locale and clipboard support working on darwin. + # Until then we disable the tests. + + optionalString isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + echo "#!/bin/sh" > pbcopy + echo "#!/bin/sh" > pbpaste + chmod a+x pbcopy pbpaste + export PATH=$(pwd):$PATH + '' + '' + py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \ + ${if isDarwin then "-k 'not test_locale and not test_clipboard'" else ""} + runHook postCheck ''; meta = { @@ -88,7 +88,7 @@ in buildPythonPackage rec { homepage = "http://pandas.pydata.org/"; description = "Python Data Analysis Library"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ raskin fridh ]; + maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix new file mode 100644 index 000000000000..a40635b8d33b --- /dev/null +++ b/pkgs/development/python-modules/path.py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytestrunner +, pytest +, glibcLocales +}: + +buildPythonPackage rec { + pname = "path.py"; + version = "10.3.1"; + name = "path.py-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "412706be1cd8ab723c77829f9aa0c4d4b7c7b26c7b1be0275a6841c3cb1001e0"; + }; + + checkInputs = [ pytest pytestrunner ]; + buildInputs = [setuptools_scm glibcLocales ]; + + LC_ALL="en_US.UTF-8"; + + meta = { + description = "A module wrapper for os.path"; + homepage = http://github.com/jaraco/path.py; + license = lib.licenses.mit; + }; + + checkPhase = '' + py.test test_path.py + ''; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix new file mode 100644 index 000000000000..68a2ef484c5b --- /dev/null +++ b/pkgs/development/python-modules/pbr/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pbr"; + version = "3.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91"; + }; + + # circular dependencies with fixtures + doCheck = false; + + meta = { + homepage = "http://docs.openstack.org/developer/pbr/"; + license = stdenv.lib.licenses.asl20; + description = "Python Build Reasonableness"; + }; +} diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix new file mode 100644 index 000000000000..b54bcc0ed1d5 --- /dev/null +++ b/pkgs/development/python-modules/pelican/default.nix @@ -0,0 +1,54 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy26 +, glibcLocales, pandoc, git +, mock, nose, markdown, lxml, typogrify +, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator +, blinker, pillow, beautifulsoup4, markupsafe }: + +buildPythonPackage rec { + pname = "pelican"; + name = "${pname}-${version}"; + version = "3.7.1"; + disabled = isPy26; + + src = fetchFromGitHub { + owner = "getpelican"; + repo = "pelican"; + rev = version; + sha256 = "0nkxrb77k2bra7bqckg7f5k73wk98hcbz7rimxl8sw05b2bvd62g"; + }; + + doCheck = true; + + checkPhase = '' + python -Wd -m unittest discover + ''; + + buildInputs = [ + glibcLocales + pandoc + git + mock + nose + markdown + typogrify + ]; + + propagatedBuildInputs = [ + jinja2 pygments docutils pytz unidecode six dateutil feedgenerator + blinker pillow beautifulsoup4 markupsafe lxml + ]; + + postPatch= '' + substituteInPlace pelican/tests/test_pelican.py \ + --replace "'git'" "'${git}/bin/git'" + ''; + + LC_ALL="en_US.UTF-8"; + + meta = with stdenv.lib; { + description = "A tool to generate a static blog from reStructuredText or Markdown input files"; + homepage = "http://getpelican.com/"; + license = licenses.agpl3; + maintainers = with maintainers; [ offline prikhi garbas ]; + }; +} diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257.nix index 1cd0e4afc0ce..9f61619e12bc 100644 --- a/pkgs/development/python-modules/pep257.nix +++ b/pkgs/development/python-modules/pep257.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchurl, pytest, mock }: buildPythonPackage rec { - name = "pep257-${version}"; + pname = "pep257"; + name = "${pname}-${version}"; version = "0.7.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix new file mode 100644 index 000000000000..aba0631a5367 --- /dev/null +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + pname = "phonenumbers"; + version = "8.5.1"; + name = "${pname}-${version}"; + + meta = { + description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; + homepage = "https://github.com/daviddrysdale/python-phonenumbers"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ fadenb ]; + }; + + src = fetchurl { + url = "mirror://pypi/p/phonenumbers/${name}.tar.gz"; + sha256 = "b7d1a5832650fad633d1e4159873788ebfb15e053292c20ab9f5119a574f3a67"; + }; +} diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix new file mode 100644 index 000000000000..57dd687604db --- /dev/null +++ b/pkgs/development/python-modules/phpserialize/default.nix @@ -0,0 +1,22 @@ +{lib, buildPythonPackage, fetchPypi}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "phpserialize"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "19qgkb9z4zjbjxlpwh2w6pxkz2j3iymnydi69jl0jg905lqjsrxz"; + }; + + # project does not have tests at the moment + doCheck = false; + + meta = { + description = "A port of the serialize and unserialize functions of PHP to Python"; + homepage = http://github.com/mitsuhiko/phpserialize; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix new file mode 100644 index 000000000000..e21593993cd2 --- /dev/null +++ b/pkgs/development/python-modules/piexif/default.nix @@ -0,0 +1,24 @@ +{lib, buildPythonPackage, fetchurl, pillow}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "piexif"; + version = "1.0.12"; + + # pillow needed for unit tests + buildInputs = [ pillow ]; + + # No .tar.gz source available at PyPI, only .zip source, so need to use + # fetchurl because fetchPypi doesn't support .zip. + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.zip"; + sha256 = "15dvdr7b5xxsbsq5k6kq8h0xnzrkqzc08dzlih48a21x27i02bii"; + }; + + meta = { + description = "Simplify Exif manipulations with Python"; + homepage = https://github.com/hMatoba/Piexif; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix new file mode 100644 index 000000000000..93933c435230 --- /dev/null +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pika +}: + +buildPythonPackage rec { + pname = "pika-pool"; + version = "0.1.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397"; + }; + + # Tests require database connections + doCheck = false; + + propagatedBuildInputs = [ pika ]; + meta = with stdenv.lib; { + homepage = "https://github.com/bninja/pika-pool"; + license = licenses.bsdOriginal; + description = "Pools for pikas."; + }; +} diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix new file mode 100644 index 000000000000..5fa03a18aaa2 --- /dev/null +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first, setuptools_scm, glibcLocales }: +buildPythonPackage rec { + pname = "pip-tools"; + version = "1.9.0"; + name = "pip-tools-${version}"; + + src = fetchurl { + url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; + sha256 = "0mjdpq2zjn8n4lzn9l2myh4bv0l2f6751k1rdpgdm8k3fargw1h7"; + }; + + LC_ALL = "en_US.UTF-8"; + buildInputs = [ pytest glibcLocales ]; + propagatedBuildInputs = [ pip click six first setuptools_scm ]; + + checkPhase = '' + export HOME=$(mktemp -d) + py.test -k "not test_realistic_complex_sub_dependencies" # requires network + ''; + + meta = with stdenv.lib; { + description = "Keeps your pinned dependencies fresh"; + homepage = https://github.com/jazzband/pip-tools/; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix new file mode 100644 index 000000000000..383dbd1e08f7 --- /dev/null +++ b/pkgs/development/python-modules/plotly/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, decorator +, nbformat +, pytz +, requests +, six +}: + +buildPythonPackage rec { + pname = "plotly"; + version = "2.0.10"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "8c013a01bb11c4c269c38a7086ffb92d6a2827922c49706131842498a49b3b81"; + }; + + propagatedBuildInputs = [ + decorator + nbformat + pytz + requests + six + ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "Python plotting library for collaborative, interactive, publication-quality graphs"; + homepage = https://plot.ly/python/; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix new file mode 100644 index 000000000000..9d90c617fc16 --- /dev/null +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.5"; + pname = "pluginbase"; + + buildInputs = [ pytest tox ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1palagrlszs4f4f5j6npzl4d195vclrlza3qr524z2h758j31y5l"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/mitsuhiko/pluginbase; + description = "A support library for building plugins sytems in Python"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix new file mode 100644 index 000000000000..216c163bc9d2 --- /dev/null +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "plumbum"; + version = "1.6.3"; + name = "${pname}-${version}"; + + checkInputs = [ pytest ]; + + # No tests in archive + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "0249e708459f1b05627a7ca8787622c234e4db495a532acbbd1f1f17f28c7320"; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix new file mode 100644 index 000000000000..25682099225c --- /dev/null +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, nose }: + +buildPythonPackage rec { + pname = "podcastparser"; + version = "0.6.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "gpodder"; + repo = "podcastparser"; + rev = version; + sha256 = "0q3qc8adykmm692ha0c37xd6wbj830zlq900fyw6vrfan9bgdj5y"; + }; + + propagatedBuildInputs = [ ]; + + buildInputs = [ nose ]; + + checkPhase = "nosetests test_*.py"; + + meta = { + description = "podcastparser is a simple, fast and efficient podcast parser written in Python."; + homepage = http://gpodder.org/podcastparser/; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix new file mode 100644 index 000000000000..86f5adb28244 --- /dev/null +++ b/pkgs/development/python-modules/powerline/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchurl +, buildPythonPackage +, git +, mercurial +, bazaar +, psutil +, pygit2 +}: + +buildPythonPackage rec { + rev = "2.6"; + name = "powerline-${rev}"; + src = fetchurl { + url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272"; + }; + + propagatedBuildInputs = [ git mercurial bazaar psutil pygit2]; + +# error: This is still beta and some tests still fail + doCheck = false; + + postInstall = '' + install -dm755 "$out/share/fonts/OTF/" + install -dm755 "$out/etc/fonts/conf.d" + install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf" + install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf" + + install -dm755 "$out/share/vim/vimfiles/plugin" + install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim" + + install -dm755 "$out/share/zsh/site-contrib" + install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh" + + install -dm755 "$out/share/tmux" + install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" + ''; + + meta = { + homepage = https://github.com/powerline/powerline; + description = "The ultimate statusline/prompt utility"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix index f2f0f5025d11..44b9ed70a185 100644 --- a/pkgs/development/python-modules/protobuf.nix +++ b/pkgs/development/python-modules/protobuf.nix @@ -1,5 +1,5 @@ { stdenv, python, buildPythonPackage -, protobuf, google_apputils, pyext +, protobuf, google_apputils, pyext, libcxx , disabled, doCheck ? true }: with stdenv.lib; @@ -8,6 +8,9 @@ buildPythonPackage rec { inherit (protobuf) name src; inherit disabled doCheck; + # work around python distutils compiling C++ with $CC + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + propagatedBuildInputs = [ protobuf google_apputils ]; buildInputs = [ google_apputils pyext ]; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix new file mode 100644 index 000000000000..75fb75f93185 --- /dev/null +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub +, cacert +, buildPythonPackage, python-jose }: + +buildPythonPackage rec { + name = "PyGithub-${version}"; + version = "1.32"; + + src = fetchFromGitHub { + owner = "PyGithub"; + repo = "PyGithub"; + rev = "v${version}"; + sha256 = "15dr9ja63zdxax9lg6q2kcakqa82dpffyhgpjr13wq3sfkcy5pdw"; + }; + + postPatch = '' + # requires network + echo "" > github/tests/Issue142.py + ''; + propagatedBuildInputs = [ python-jose ]; + meta = with stdenv.lib; { + homepage = "https://github.com/PyGithub/PyGithub"; + description = "A Python (2 and 3) library to access the GitHub API v3"; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ jhhuh ]; + }; +} diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes.nix new file mode 100644 index 000000000000..c2feb2e239c7 --- /dev/null +++ b/pkgs/development/python-modules/pyaes.nix @@ -0,0 +1,18 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "pyaes"; + version = "1.6.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw"; + }; + + meta = { + description = "Pure-Python AES"; + license = lib.licenses.mit; + homepage = https://github.com/ricmoo/pyaes; + }; +} diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 012c8c42d6ab..d96a4c8cea32 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: stdenv.mkDerivation rec { + pname = "pyatspi"; version = "2.18.0"; - name = "pyatspi-${version}"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz"; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index e7cf3b4c4489..284736fd4754 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,8 +1,19 @@ -{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }: +{ lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy36, isPy3k }: -if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec { +if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else let + + patch_waf = fetchpatch { + url = http://www.linuxfromscratch.org/patches/blfs/8.0/pycairo-1.10.0-waf_python_3_4-1.patch; + sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; + }; + patch_waf-py3_5 = ./waf-py3_5.patch; + +in buildPythonPackage rec { + pname = "pycairo"; version = "1.10.0"; - name = "pycairo-${version}"; + name = "${pname}-${version}"; + format = "other"; + src = if isPy3k then fetchurl { url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; @@ -13,26 +24,20 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k"; }; - patches = [(fetchpatch { - url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch; - sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; - })]; - - patch_waf = fetchpatch { - url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch; - sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; - }; - - patch_waf-py3_5 = ./waf-py3_5.patch; + patches = [ + (fetchpatch { + url = http://www.linuxfromscratch.org/patches/blfs/8.0/pycairo-1.10.0-waf_unpack-1.patch; + sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; + }) + ]; buildInputs = [ python pkgconfig cairo xlibsWrapper ]; configurePhase = '' ( cd $(${python.executable} waf unpack) - pwd patch -p1 < ${patch_waf} - ${lib.optionalString isPy35 "patch -p1 < ${patch_waf-py3_5}"} + ${lib.optionalString (isPy35 || isPy36) "patch -p1 < ${patch_waf-py3_5}"} ) ${python.executable} waf configure --prefix=$out diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix new file mode 100644 index 000000000000..fc8fbcaa8d2d --- /dev/null +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }: + +buildPythonPackage rec { + pname = "pycassa"; + version = "1.11.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nsqjzgn6v0rya60dihvbnrnq1zwaxl2qwf0sr08q9qlkr334hr6"; + }; + + disabled = isPy3k; + + # Tests are not executed since they require a cassandra up and + # running + doCheck = false; + + propagatedBuildInputs = [ thrift ]; + + meta = { + description = "A python client library for Apache Cassandra"; + homepage = http://github.com/pycassa/pycassa; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix new file mode 100644 index 000000000000..e6c7a85aaf28 --- /dev/null +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pycodestyle"; + version = "2.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8"; + }; + + meta = with lib; { + description = "Python style guide checker (formerly called pep8)"; + homepage = https://pycodestyle.readthedocs.io; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 04964ab03dd2..71b90d242f06 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.3"; - name = "pycryptodome-${version}"; - namePrefix = ""; + version = "3.4.6"; + pname = "pycryptodome"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb"; + sha256 = "df1be662060cf3abdcf2086ebb401f750744106425ddebf74c57feab410e4923"; }; meta = { diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 471ffbe6c354..71bf64b77339 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -22,12 +22,12 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2016.1.2"; + version = "2017.1"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7"; + sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix new file mode 100644 index 000000000000..38123acd32ec --- /dev/null +++ b/pkgs/development/python-modules/pydot/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, chardet +, pyparsing +, graphviz +}: + +buildPythonPackage rec { + pname = "pydot"; + version = "1.2.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "edb5d3f249f97fbd9c4bb16959e61bc32ecf40eee1a9f6d27abe8d01c0a73502"; + }; + checkInputs = [ chardet ]; + # No tests in archive + doCheck = false; + propagatedBuildInputs = [pyparsing graphviz]; + meta = { + homepage = https://github.com/erocarrera/pydot; + description = "Allows to easily create both directed and non directed graphs from Python"; + licenses = with lib.licenses; [ mit ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index 1bdf61904eb2..5d11b716a2f8 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, python, exiv2, scons, boost }: -let version = "0.3.2"; in - stdenv.mkDerivation rec { - name = "pyexiv2-${version}"; + pname = "pyexiv2"; + version = "0.3.2"; + name = "${pname}-${version}"; src = fetchurl { url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2"; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 6f03a2edf797..563a3217e8c8 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = pname + "-" + version; pname = "pyext"; - version = "0.7"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "1pvwjkrjqajzh4wiiw1mzqp0bb81cqc2gk23nj24m32fpqssc676"; + sha256 = "6c406cf71b991e1fc5a7f963d3a289525bce5e7ad1c43b697d9f5223185fcaef"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix new file mode 100644 index 000000000000..fbb0de6f0ced --- /dev/null +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unittest2 }: + +buildPythonPackage rec { + pname = "pyflakes"; + version = "1.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da"; + }; + + buildInputs = [ unittest2 ]; + + doCheck = !isPyPy; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/pyflakes; + description = "A simple program which checks Python source files for errors"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 226b613a8b4b..a10c858c2336 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,29 +1,25 @@ { stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11 -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k, +, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype }: buildPythonPackage rec { - name = "pygame-${version}"; - version = "1.9.1"; + pname = "pygame"; + name = "${pname}-${version}"; + version = "1.9.3"; src = fetchurl { - url = "http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz"; - sha256 = "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52"; + url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz"; + sha256 = "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m"; }; buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg - smpeg portmidi libX11 + portmidi libX11 freetype ]; - # http://ubuntuforums.org/showthread.php?t=1960262 - disabled = isPy3k; - # Tests fail because of no audio device and display. doCheck = false; - patches = [ ./pygame-v4l.patch ]; - preConfigure = '' sed \ -e "s/^origincdirs = .*/origincdirs = []/" \ diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix new file mode 100644 index 000000000000..6f6163bb35e8 --- /dev/null +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub +, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: + +buildPythonPackage rec { + pname = "pygame_sdl2"; + version = "6.99.10.1227"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "renpy"; + repo = "${pname}"; + rev = "renpy-${version}"; + sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1"; + }; + + buildInputs = [ + SDL2 SDL2_image SDL2_ttf SDL2_mixer + cython libjpeg libpng + ]; + + postInstall = '' + ( cd "$out"/include/python*/ ; + ln -s pygame-sdl2 pygame_sdl2 || true ; ) + ''; + + meta = with stdenv.lib; { + 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 ]; + }; +} diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 33bb1d5a4cab..984b11844342 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: +{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: -mkPythonDerivation rec { +buildPythonPackage rec { major = "3.22"; minor = "0"; name = "pygobject-${major}.${minor}"; + format = "other"; src = fetchurl { url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz"; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 6723ba6b6a58..b72bd8b9b529 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }: +{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }: -mkPythonDerivation rec { +buildPythonPackage rec { name = "pygobject-${version}"; version = "2.28.6"; + format = "other"; src = fetchurl { url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix new file mode 100644 index 000000000000..911779e67fd7 --- /dev/null +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, graphviz +, pkgconfig, doctest-ignore-unicode, mock, nose }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pygraphviz"; + version = "1.4rc1"; + + src = fetchPypi { + inherit pname version; + sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a"; + }; + + buildInputs = [ doctest-ignore-unicode mock nose ]; + propagatedBuildInputs = [ graphviz pkgconfig ]; + + # the tests are currently failing: + # check status of pygraphviz/pygraphviz#129 + doCheck = false; + + meta = with stdenv.lib; { + description = "Python interface to Graphviz graph drawing package"; + homepage = https://github.com/pygraphviz/pygraphviz; + license = licenses.bsd3; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 133cbdb34fd2..499634236acd 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,9 +1,10 @@ -{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }: let version = "2.10.1"; in -mkPythonDerivation { +buildPythonPackage { name = "pygtksourceview-${version}"; + format = "other"; src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix new file mode 100644 index 000000000000..aa0d1d5f575d --- /dev/null +++ b/pkgs/development/python-modules/pylast/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, certifi, six }: + +buildPythonPackage rec { + pname = "pylast"; + version = "1.8.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "85f8dd96aef0ccba5f80379c3d7bc1fabd72f59aebab040daf40a8b72268f9bd"; + }; + + propagatedBuildInputs = [ certifi six ]; + + # tests require last.fm credentials + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/pylast/pylast"; + description = "A python interface to last.fm (and compatibles)"; + license = licenses.asl20; + maintainers = with maintainers; [ rvolosatovs ]; + }; +} diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix new file mode 100644 index 000000000000..7f57f17efeb1 --- /dev/null +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }: +buildPythonPackage rec { + version = "1.5.2"; + pname = "pylibmc"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33"; + }; + + buildInputs = [ libmemcached zlib ]; + + # requires an external memcached server running + doCheck = false; + + meta = with stdenv.lib; { + description = "Quick and small memcached client for Python"; + homepage = http://sendapatch.se/projects/pylibmc/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 844d2e229547..12871bd8f6c2 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, buildPythonPackage, python, astroid, isort, - pytest, mccabe, configparser, backports_functools_lru_cache }: + pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.6.5"; + version = "1.7.1"; src = fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "06b78nl996949a7h01c4ycy8779hl5cm7vpxij5lm3npim59hwx6"; + sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a"; }; - buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ]; + buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; - propagatedBuildInputs = [ astroid isort ]; + propagatedBuildInputs = [ astroid configparser isort ]; postPatch = '' # Remove broken darwin tests @@ -35,7 +35,7 @@ meta = with stdenv.lib; { homepage = http://www.logilab.org/project/pylint; description = "A bug and style checker for Python"; - platform = platforms.all; + platforms = platforms.all; license = licenses.gpl1Plus; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/pyocr-tesseract.patch b/pkgs/development/python-modules/pyocr-tesseract.patch new file mode 100644 index 000000000000..d09a7c57352e --- /dev/null +++ b/pkgs/development/python-modules/pyocr-tesseract.patch @@ -0,0 +1,316 @@ +This patch is required for pyocr to work with Tesseract version 3.05.00 +and has been submitted upstream at the following URL: + +https://github.com/jflesch/pyocr/pull/62 + +diff --git a/src/pyocr/builders.py b/src/pyocr/builders.py +index 73c964d..20f390c 100644 +--- a/src/pyocr/builders.py ++++ b/src/pyocr/builders.py +@@ -240,8 +240,10 @@ class BaseBuilder(object): + cuneiform_args : Arguments passed to the Cuneiform command line. + """ + +- def __init__(self, file_extensions, tesseract_configs, cuneiform_args): ++ def __init__(self, file_extensions, tesseract_flags, tesseract_configs, ++ cuneiform_args): + self.file_extensions = file_extensions ++ self.tesseract_flags = tesseract_flags + self.tesseract_configs = tesseract_configs + self.cuneiform_args = cuneiform_args + +@@ -298,7 +300,7 @@ class TextBuilder(BaseBuilder): + def __init__(self, tesseract_layout=3, cuneiform_dotmatrix=False, + cuneiform_fax=False, cuneiform_singlecolumn=False): + file_ext = ["txt"] +- tess_conf = ["-psm", str(tesseract_layout)] ++ tess_flags = ["-psm", str(tesseract_layout)] + cun_args = ["-f", "text"] + # Add custom cuneiform parameters if needed + for par, arg in [(cuneiform_dotmatrix, "--dotmatrix"), +@@ -306,7 +308,7 @@ class TextBuilder(BaseBuilder): + (cuneiform_singlecolumn, "--singlecolumn")]: + if par: + cun_args.append(arg) +- super(TextBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(TextBuilder, self).__init__(file_ext, tess_flags, [], cun_args) + self.tesseract_layout = tesseract_layout + self.built_text = [] + +@@ -540,9 +542,11 @@ class WordBoxBuilder(BaseBuilder): + + def __init__(self, tesseract_layout=1): + file_ext = ["html", "hocr"] +- tess_conf = ["hocr", "-psm", str(tesseract_layout)] ++ tess_flags = ["-psm", str(tesseract_layout)] ++ tess_conf = ["hocr"] + cun_args = ["-f", "hocr"] +- super(WordBoxBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(WordBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf, ++ cun_args) + self.word_boxes = [] + self.tesseract_layout = tesseract_layout + +@@ -614,9 +618,11 @@ class LineBoxBuilder(BaseBuilder): + + def __init__(self, tesseract_layout=1): + file_ext = ["html", "hocr"] +- tess_conf = ["hocr", "-psm", str(tesseract_layout)] ++ tess_flags = ["-psm", str(tesseract_layout)] ++ tess_conf = ["hocr"] + cun_args = ["-f", "hocr"] +- super(LineBoxBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(LineBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf, ++ cun_args) + self.lines = [] + self.tesseract_layout = tesseract_layout + +diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py +index 0c2259a..f7ab309 100644 +--- a/src/pyocr/libtesseract/tesseract_raw.py ++++ b/src/pyocr/libtesseract/tesseract_raw.py +@@ -263,11 +263,22 @@ if g_libtesseract: + ] + g_libtesseract.TessDeleteText.restype = None + +- g_libtesseract.TessBaseAPIDetectOS.argtypes = [ +- ctypes.c_void_p, # TessBaseAPI* +- ctypes.POINTER(OSResults), +- ] +- g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool ++ if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'): ++ g_libtesseract.TessBaseAPIDetectOrientationScript.argtypes = [ ++ ctypes.c_void_p, # TessBaseAPI* ++ ctypes.POINTER(ctypes.c_int), # orient_deg ++ ctypes.POINTER(ctypes.c_float), # orient_conf ++ ctypes.POINTER(ctypes.c_char_p), # script_name ++ ctypes.POINTER(ctypes.c_float), # script_conf ++ ] ++ g_libtesseract.TessBaseAPIDetectOrientationScript.restype = \ ++ ctypes.c_bool ++ else: ++ g_libtesseract.TessBaseAPIDetectOS.argtypes = [ ++ ctypes.c_void_p, # TessBaseAPI* ++ ctypes.POINTER(OSResults), ++ ] ++ g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool + + + def init(lang=None): +@@ -526,15 +537,37 @@ def detect_os(handle): + global g_libtesseract + assert(g_libtesseract) + +- results = OSResults() +- r = g_libtesseract.TessBaseAPIDetectOS( +- ctypes.c_void_p(handle), +- ctypes.pointer(results) +- ) +- if not r: +- raise TesseractError("detect_orientation failed", +- "TessBaseAPIDetectOS() failed") +- return { +- "orientation": results.best_orientation_id, +- "confidence": results.best_oconfidence, +- } ++ # Use the new API function if it is available, because since Tesseract ++ # 3.05.00 the old API function _always_ returns False. ++ if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'): ++ orientation_deg = ctypes.c_int(0) ++ orientation_confidence = ctypes.c_float(0.0) ++ ++ r = g_libtesseract.TessBaseAPIDetectOrientationScript( ++ ctypes.c_void_p(handle), ++ ctypes.byref(orientation_deg), ++ ctypes.byref(orientation_confidence), ++ None, # script_name ++ None # script_confidence ++ ) ++ ++ if not r: ++ raise TesseractError("detect_orientation failed", ++ "TessBaseAPIDetectOrientationScript() failed") ++ return { ++ "orientation": round(orientation_deg.value / 90), ++ "confidence": orientation_confidence.value, ++ } ++ else: # old API (before Tesseract 3.05.00) ++ results = OSResults() ++ r = g_libtesseract.TessBaseAPIDetectOS( ++ ctypes.c_void_p(handle), ++ ctypes.pointer(results) ++ ) ++ if not r: ++ raise TesseractError("detect_orientation failed", ++ "TessBaseAPIDetectOS() failed") ++ return { ++ "orientation": results.best_orientation_id, ++ "confidence": results.best_oconfidence, ++ } +diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py +index 99b0121..658c96b 100755 +--- a/src/pyocr/tesseract.py ++++ b/src/pyocr/tesseract.py +@@ -22,6 +22,8 @@ import os + import subprocess + import sys + import tempfile ++import contextlib ++import shutil + + from . import builders + from . import error +@@ -62,9 +64,11 @@ class CharBoxBuilder(builders.BaseBuilder): + + def __init__(self): + file_ext = ["box"] ++ tess_flags = [] + tess_conf = ["batch.nochop", "makebox"] + cun_args = [] +- super(CharBoxBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(CharBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf, ++ cun_args) + self.tesseract_layout = 1 + + @staticmethod +@@ -173,18 +177,19 @@ def detect_orientation(image, lang=None): + TesseractError --- if no script detected on the image + """ + _set_environment() +- with temp_file(".bmp") as input_file: +- command = [TESSERACT_CMD, input_file.name, 'stdout', "-psm", "0"] ++ with temp_dir() as tmpdir: ++ command = [TESSERACT_CMD, "input.bmp", 'stdout', "-psm", "0"] + if lang is not None: + command += ['-l', lang] + + if image.mode != "RGB": + image = image.convert("RGB") +- image.save(input_file.name) ++ image.save(os.path.join(tmpdir, "input.bmp")) + + proc = subprocess.Popen(command, stdin=subprocess.PIPE, shell=False, + startupinfo=g_subprocess_startup_info, + creationflags=g_creation_flags, ++ cwd=tmpdir, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + proc.stdin.close() +@@ -224,8 +229,8 @@ def get_available_builders(): + ] + + +-def run_tesseract(input_filename, output_filename_base, lang=None, +- configs=None): ++def run_tesseract(input_filename, output_filename_base, cwd=None, lang=None, ++ flags=None, configs=None): + ''' + Runs Tesseract: + `TESSERACT_CMD` \ +@@ -238,6 +243,8 @@ def run_tesseract(input_filename, output_filename_base, lang=None, + input_filename --- image to read + output_filename_base --- file name in which must be stored the result + (without the extension) ++ cwd --- Run Tesseract in the specified working directory or use current ++ one if None + lang --- Tesseract language to use (if None, none will be specified) + config --- List of Tesseract configs to use (if None, none will be + specified) +@@ -252,10 +259,13 @@ def run_tesseract(input_filename, output_filename_base, lang=None, + if lang is not None: + command += ['-l', lang] + ++ if flags is not None: ++ command += flags ++ + if configs is not None: + command += configs + +- proc = subprocess.Popen(command, ++ proc = subprocess.Popen(command, cwd=cwd, + startupinfo=g_subprocess_startup_info, + creationflags=g_creation_flags, + stdout=subprocess.PIPE, +@@ -301,11 +311,18 @@ class ReOpenableTempfile(object): + self.name = None + + +-def temp_file(suffix): +- ''' Returns a temporary file ''' +- if os.name == 'nt': # Windows +- return ReOpenableTempfile(suffix) +- return tempfile.NamedTemporaryFile(prefix='tess_', suffix=suffix) ++@contextlib.contextmanager ++def temp_dir(): ++ """ ++ A context manager for maintaining a temporary directory ++ """ ++ # NOTE: Drop this as soon as we don't support Python 2.7 anymore, because ++ # since Python 3.2 there is a context manager called TemporaryDirectory(). ++ path = tempfile.mkdtemp(prefix='tess_') ++ try: ++ yield path ++ finally: ++ shutil.rmtree(path) + + + def image_to_string(image, lang=None, builder=None): +@@ -329,23 +346,20 @@ def image_to_string(image, lang=None, builder=None): + + if builder is None: + builder = builders.TextBuilder() +- with temp_file(".bmp") as input_file: +- with temp_file('') as output_file: +- output_file_name_base = output_file.name +- ++ with temp_dir() as tmpdir: + if image.mode != "RGB": + image = image.convert("RGB") +- image.save(input_file.name) +- (status, errors) = run_tesseract(input_file.name, +- output_file_name_base, ++ image.save(os.path.join(tmpdir, "input.bmp")) ++ (status, errors) = run_tesseract("input.bmp", "output", cwd=tmpdir, + lang=lang, ++ flags=builder.tesseract_flags, + configs=builder.tesseract_configs) + if status: + raise TesseractError(status, errors) + + output_file_name = "ERROR" + for file_extension in builder.file_extensions: +- output_file_name = ('%s.%s' % (output_file_name_base, ++ output_file_name = ('%s.%s' % (os.path.join(tmpdir, "output"), + file_extension)) + if not os.access(output_file_name, os.F_OK): + continue +diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py +index ccddd07..1ac2a4b 100644 +--- a/tests/tests_libtesseract.py ++++ b/tests/tests_libtesseract.py +@@ -33,8 +33,9 @@ class TestContext(unittest.TestCase): + (3, 3, 0), + (3, 4, 0), + (3, 4, 1), ++ (3, 5, 0), + ), ("Tesseract does not have the expected version" +- " (3.4.0) ! Some tests will be skipped !")) ++ " (3.5.0) ! Some tests will be skipped !")) + + def test_langs(self): + langs = libtesseract.get_available_languages() +diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py +index e29c512..fa4d483 100644 +--- a/tests/tests_tesseract.py ++++ b/tests/tests_tesseract.py +@@ -27,8 +27,9 @@ class TestContext(unittest.TestCase): + (3, 3, 0), + (3, 4, 0), + (3, 4, 1), ++ (3, 5, 0), + ), ("Tesseract does not have the expected version" +- " (3.4.0) ! Some tests will be skipped !")) ++ " (3.5.0) ! Some tests will be skipped !")) + + def test_langs(self): + langs = tesseract.get_available_languages() diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 7be60b1e69b3..ddab1cde1e67 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , buildPythonPackage , Mako , pytest @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2016.2"; + version = "2017.1.1"; name = "${pname}-${version}"; buildInputs = [ pytest opencl-headers ocl-icd ]; propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1b94540cf59ea71a3ef234a8f1d0eb2b4633c112f0f554fb69e52b4a0337d82b"; + src = fetchPypi { + inherit pname version; + sha256 = "928c458a463321c6c91e7fa54bf325bf71d7a8aa5ff750ec8fed2472f6aeb323"; }; # gcc: error: pygpu_language_opencl.cpp: No such file or directory diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix new file mode 100644 index 000000000000..8e06ba38ef97 --- /dev/null +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pip, pandoc, glibcLocales, haskellPackages, texlive }: + +buildPythonPackage rec { + pname = "pypandoc"; + version = "1.3.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + 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 = [ 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/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix new file mode 100644 index 000000000000..8b15c63fb206 --- /dev/null +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, nose2 +, proj ? null +}: + +buildPythonPackage (rec { + pname = "pyproj"; + version = "1.9.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8"; + }; + + buildInputs = [ nose2 ]; + + checkPhase = '' + runHook preCheck + pushd unittest # changing directory should ensure we're importing the global pyproj + ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])" + popd + runHook postCheck + ''; + + meta = { + description = "Python interface to PROJ.4 library"; + homepage = http://github.com/jswhit/pyproj; + license = with lib.licenses; [ isc ]; + }; +} // (if proj == null then {} else { PROJ_DIR = proj; })) diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index dc3dd69ac02e..a5ae0aaa137d 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -2,9 +2,10 @@ let version = "4.12"; - inherit (pythonPackages) mkPythonDerivation python dbus-python sip; -in mkPythonDerivation { + inherit (pythonPackages) buildPythonPackage python dbus-python sip; +in buildPythonPackage { name = "PyQt-x11-gpl-${version}"; + format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ee3419eed0e9..5d98544da886 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,11 +1,12 @@ { lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs -, lndir, makeWrapper, qmakeHook }: +, lndir, makeWrapper, qmake }: let version = "5.8.1"; - inherit (pythonPackages) mkPythonDerivation python dbus-python sip; -in mkPythonDerivation { + inherit (pythonPackages) buildPythonPackage python dbus-python sip; +in buildPythonPackage { name = "PyQt-${version}"; + format = "other"; meta = with lib; { description = "Python bindings for Qt5"; @@ -20,9 +21,10 @@ in mkPythonDerivation { sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy"; }; + nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + buildInputs = [ - pkgconfig makeWrapper lndir - qtbase qtsvg qtwebkit qtwebengine dbus_libs qmakeHook + lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix index 0abf54f03fe1..7857f46e2422 100644 --- a/pkgs/development/python-modules/pyrax.nix +++ b/pkgs/development/python-modules/pyrax.nix @@ -1,7 +1,9 @@ -{ lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring, +{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring, rackspace-novaclient, six, isPy3k, pytest, glibcLocales }: buildPythonPackage rec { - name = "pyrax-1.9.8"; + pname = "pyrax"; + version = "1.9.8"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyrax/${name}.tar.gz"; @@ -15,7 +17,7 @@ buildPythonPackage rec { ''; disabled = isPy3k; - propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ]; + propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ]; LC_ALL = "en_US.UTF-8"; buildInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 91bfa97cb970..de1651ec2b0b 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,11 +1,13 @@ {stdenv, buildPythonPackage, fetchurl}: buildPythonPackage rec { - name = "pyroute2-0.4.13"; + pname = "pyroute2"; + version = "0.4.16"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "0f8a1ihxc1r78m6dqwhks2vdp4vwwbw72mbv88v70qmkb0pxgwwk"; + sha256 = "5c692efd83369cb44086572b3e1e95ab11f1bc516a89c8ca2429795a789f32a9"; }; # requires root priviledges @@ -16,6 +18,6 @@ buildPythonPackage rec { homepage = https://github.com/svinota/pyroute2; license = licenses.asl20; maintainers = [maintainers.mic92]; - platform = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index bb2291fb4ac3..796bc88430a6 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, buildPythonPackage, swig, pcsclite }: buildPythonPackage rec { - name = "pyscard-${version}"; - version = "1.9.4"; + version = "1.9.5"; + pname = "pyscard"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyscard/${name}.tar.gz"; - sha256 = "0gn0p4p8dhk99g8vald0dcnh45jbf82bj72n4djyr8b4hawkck4v"; + sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index a27a365bb2cd..e02f32f223df 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }: -stdenv.mkDerivation { +# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. +let + pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); +in stdenv.mkDerivation { name = "pyside-apiextractor-0.10.10"; src = fetchurl { @@ -10,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake libxml2 libxslt sphinx qt4 ]; + buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ]; meta = { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 6473ebf22b13..9d7f11b939dd 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,8 +1,11 @@ -{ lib, fetchurl, cmake, python, mkPythonDerivation, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: -mkPythonDerivation rec { - name = "pyside-${version}"; +# This derivation provides a Python module and should therefore be called via `python-packages.nix`. +buildPythonPackage rec { + pname = "pyside"; + name = "${pname}-${version}"; version = "1.2.4"; + format = "other"; src = fetchurl { url = "https://github.com/PySide/PySide/archive/${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 28ea88ad1fa4..8ecf2734832a 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,7 +1,12 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }: -stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.16"; +# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. +let + pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); +in stdenv.mkDerivation rec { + pname = "pyside-generatorrunner"; + version = "0.6.16"; + name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; @@ -10,7 +15,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor sphinx qt4 ]; + buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ]; meta = { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 8c91b63d0e11..cef78c215500 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: +{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: +# This derivation provides a Python module and should therefore be called via `python-packages.nix`. # Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 -stdenv.mkDerivation rec { - name = "pyside-shiboken-${version}"; +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyside-shiboken"; version = "1.2.4"; + format = "other"; + src = fetchurl { url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz"; sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4"; @@ -25,9 +29,9 @@ stdenv.mkDerivation rec { meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://www.pyside.org/docs/shiboken/"; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.chaoflow ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index 11f2bd97175c..9d02a016e723 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }: +{ lib, fetchurl, cmake, pyside, qt4, pysideShiboken, buildPythonPackage }: -stdenv.mkDerivation { - name = "pyside-tools-0.2.15"; +# This derivation provides a Python module and should therefore be called via `python-packages.nix`. +buildPythonPackage rec { + pname = "pyside-tools"; + version = "0.2.15"; + name = "${pname}-${version}"; + format = "other"; src = fetchurl { url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; @@ -10,13 +14,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pyside python qt4 pysideShiboken ]; + buildInputs = [ cmake pyside qt4 pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "http://www.pyside.org"; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.chaoflow ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix new file mode 100644 index 000000000000..2acdef1b372e --- /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 000000000000..2b3798a30706 --- /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/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix new file mode 100644 index 000000000000..2f275005c199 --- /dev/null +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -0,0 +1,57 @@ +{ buildPythonPackage +, fetchPypi +, isPy3k +, stdenv +, numpy +, wxPython +, matplotlib +, pycairo +, python-gnupg +, xlrd +, xlwt +, jedi +, pyenchant +, basemap +, pygtk +, makeDesktopItem +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyspread"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0m1a4zvzrfrnc42j8mrbm7747w03nzyl9z02wjagccmlhi6nd9hx"; + }; + + propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; + # Could also (optionally) add pyrsvg and python bindings for libvlc + + # Tests try to access X Display + doCheck = false; + + disabled = isPy3k; + + desktopItem = makeDesktopItem rec { + name = pname; + exec = name; + icon = name; + desktopName = "Pyspread"; + genericName = "Spreadsheet"; + comment = meta.description; + categories = "Development;Spreadsheet;"; + }; + + postInstall = '' + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications + ''; + + meta = with stdenv.lib; { + description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python"; + homepage = https://manns.github.io/pyspread/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix new file mode 100644 index 000000000000..147e9773fbf7 --- /dev/null +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonApplication +, fetchFromGitHub +, chardet +, nose +}: + +buildPythonApplication rec { + pname = "pysrt"; + name = "${pname}-${version}"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "byroot"; + repo = "pysrt"; + rev = "v${version}"; + sha256 = "0rwjaf26885vxhxnas5d8zwasvj7x88y4y2pdivjd4vdcpqrqdjn"; + }; + + buildInputs = [ nose ]; + checkPhase = '' + nosetests -v + ''; + + propagatedBuildInputs = [ chardet ]; + + meta = with stdenv.lib; { + homepage = https://github.com/byroot/pysrt; + license = licenses.gpl3; + description = "Python library used to edit or create SubRip files"; + }; +} diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix new file mode 100644 index 000000000000..966a207e50cf --- /dev/null +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchurl, pytest, isPy3k }: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-asyncio"; + version = "0.5.0"; + + disabled = !isPy3k; + + src = fetchurl { + url = "mirror://pypi/p/${pname}/${name}.tar.gz"; + sha256 = "03sxq8fglr4lw4y6wqlbli9ypr65fxzx6hlpn5wpccx8v5472iff"; + }; + + buildInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "library for testing asyncio code with pytest"; + license = licenses.asl20; + homepage = https://github.com/pytest-dev/pytest-asyncio; + }; +} diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix new file mode 100644 index 000000000000..fdd2b2316e29 --- /dev/null +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -0,0 +1,34 @@ +{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.1.1"; + pname = "pytest-cram"; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ cram ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0ad05999iqzyjay9y5lc0cnd3jv8qxqlzsvxzp76shslmhrv0c4f"; + }; + + postPatch = '' + substituteInPlace pytest_cram/tests/test_options.py \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + # Remove __init__.py from tests folder, otherwise pytest raises an error that + # the imported and collected modules are different. + checkPhase = '' + rm pytest_cram/tests/__init__.py + pytest pytest_cram + ''; + + meta = { + description = "Test command-line applications with pytest and cram"; + homepage = https://github.com/tbekolay/pytest-cram; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix new file mode 100644 index 000000000000..6df1792f884b --- /dev/null +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, py, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-datafiles"; + version = "1.0"; + src = fetchPypi { + inherit version pname; + sha256 = "1w5435b5pimk6479ml53lmld3qbag7awcg4gl3ljdywc1v096r5v"; + }; + + buildInputs = [ py pytest ]; + + meta = with stdenv.lib; { + license = licenses.mit; + website = https://pypi.python.org/pypi/pytest-catchlog/; + description = "py.test plugin to create a 'tmpdir' containing predefined files/directories."; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytest-django/default.nix similarity index 58% rename from pkgs/development/python-modules/pytestdjango.nix rename to pkgs/development/python-modules/pytest-django/default.nix index 5a8dd85f4bdb..0fd485684464 100644 --- a/pkgs/development/python-modules/pytestdjango.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,8 +1,10 @@ { stdenv, buildPythonPackage, fetchurl , pytest, django, setuptools_scm +, fetchpatch }: buildPythonPackage rec { - name = "pytest-django-${version}"; + pname = "pytest-django"; + name = "${pname}-${version}"; version = "3.1.2"; src = fetchurl { @@ -13,6 +15,17 @@ buildPythonPackage rec { buildInputs = [ pytest setuptools_scm ]; propagatedBuildInputs = [ django ]; + patches = [ + # Unpin setuptools-scm + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; + sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws"; + }) + ]; + + # Complicated. Requires Django setup. + doCheck = false; + meta = with stdenv.lib; { description = "py.test plugin for testing of Django applications"; homepage = http://pytest-django.readthedocs.org/en/latest/; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix new file mode 100644 index 000000000000..93883283627e --- /dev/null +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -0,0 +1,29 @@ +{lib, buildPythonPackage, fetchPypi, pytest, flake8}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-flake8"; + version = "0.8.1"; + + # although pytest is a runtime dependency, do not add it as + # propagatedBuildInputs in order to allow packages depend on another version + # of pytest more easily + buildInputs = [ pytest ]; + propagatedBuildInputs = [ flake8 ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1za5i09gz127yraigmcl443w6149714l279rmlfxg1bl2kdsc45a"; + }; + + checkPhase = '' + pytest --ignore=nix_run_setup.py . + ''; + + meta = { + description = "py.test plugin for efficiently checking PEP8 compliance"; + homepage = https://github.com/tholo/pytest-flake8; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix new file mode 100644 index 000000000000..6f6f79109d9b --- /dev/null +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, pytest +, flask +, decorator +, httpbin +, six +, requests +}: + +buildPythonPackage rec { + pname = "pytest-httpbin"; + name = "${pname}-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "kevin1024"; + repo = "pytest-httpbin"; + rev = "v${version}"; + sha256 = "0j3n12jjy8cm0va8859wqra6abfyajrgh2qj8bhcngf3a72zl9ks"; + }; + + checkPhase = '' + py.test -k "not test_chunked_encoding" + ''; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ flask decorator httpbin six requests ]; + + meta = { + description = "Easily test your HTTP library against a local copy of httpbin.org"; + homepage = https://github.com/kevin1024/pytest-httpbin; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix new file mode 100644 index 000000000000..fdd1986c04fc --- /dev/null +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, lib +, fetchPypi +, requests +, pytest +, six +, werkzeug +}: + +buildPythonPackage rec { + pname = "pytest-localserver"; + name = "${pname}-${version}"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c11hn61n06ms0wmw6536vs5k4k9hlndxsb3p170nva56a9dfa6q"; + }; + + propagatedBuildInputs = [ werkzeug ]; + buildInputs = [ pytest six requests ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Plugin for the pytest testing framework to test server connections locally"; + homepage = https://pypi.python.org/pypi/pytest-localserver; + license = lib.licenses.mit; + }; +} + diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257.nix index 7ce63ebc7a6d..1509d80feb1a 100644 --- a/pkgs/development/python-modules/pytest-pep257.nix +++ b/pkgs/development/python-modules/pytest-pep257.nix @@ -1,19 +1,21 @@ { stdenv, buildPythonPackage, fetchurl, pytest, pep257 }: + buildPythonPackage rec { - name = "pytest-pep257-${version}"; - version = "0.0.5"; + pname = "pytest-pep257"; + name = "${pname}-${version}"; + version = "0.0.5"; - src = fetchurl { - url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; - sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; - }; + src = fetchurl { + url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; + sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; + }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ pep257 ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pep257 ]; - meta = with stdenv.lib; { - homepage = https://github.com/anderslime/pytest-pep257; - description = "py.test plugin for PEP257"; - license = licenses.mit; - }; + meta = with stdenv.lib; { + homepage = https://github.com/anderslime/pytest-pep257; + description = "py.test plugin for PEP257"; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix new file mode 100644 index 000000000000..b3577908cf9c --- /dev/null +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-xdist"; + version = "1.16.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "42e5a1e5da9d7cff3e74b07f8692598382f95624f234ff7e00a3b1237e0feba2"; + }; + + buildInputs = [ pytest setuptools_scm ]; + propagatedBuildInputs = [ execnet ]; + + postPatch = '' + rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py + ''; + + checkPhase = '' + py.test testing + ''; + + # Only test on 3.x + # INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer' + doCheck = isPy3k; + + meta = with stdenv.lib; { + description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; + homepage = https://github.com/pytest-dev/pytest-xdist; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d3fea5a3b43f..402c869c98c9 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }: buildPythonPackage rec { - name = "pytest-${version}"; - version = "3.0.6"; + version = "3.0.7"; + pname = "pytest"; + name = "${pname}-${version}"; preCheck = '' # don't test bash builtins @@ -10,7 +11,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/p/pytest/${name}.tar.gz"; - sha256 = "0h6rfp7y7c5mqwfm9fy5fq4l9idnp160c82ylcfjg251y6lk8d34"; + sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab"; }; buildInputs = [ hypothesis ]; 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 000000000000..98ed980588e3 --- /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 000000000000..28870d3db853 --- /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-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix new file mode 100644 index 000000000000..c1472bc66a8e --- /dev/null +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, future, six, ecdsa, pycryptodome, pytest +}: + +buildPythonPackage rec { + pname = "python-jose"; + name = "${pname}-${version}"; + version = "1.3.2"; + src = fetchFromGitHub { + owner = "mpdavis"; + repo = "python-jose"; + rev = version; + sha256 = "0933pbflv2pvws5m0ksz8y1fqr8m123smmrbr5k9a71nssd502sv"; + }; + + buildInputs = [ pytest ]; + checkPhase = "py.test ."; + patches = [ + # to use pycryptodme instead of pycrypto + ./pycryptodome.patch + ]; + propagatedBuildInputs = [ future six ecdsa pycryptodome ]; + meta = with stdenv.lib; { + homepage = "https://github.com/mpdavis/python-jose"; + description = "A JOSE implementation in Python"; + platforms = platforms.all; + license = licenses.mit; + maintainers = [ maintainers.jhhuh ]; + }; +} diff --git a/pkgs/development/python-modules/python-jose/pycryptodome.patch b/pkgs/development/python-modules/python-jose/pycryptodome.patch new file mode 100644 index 000000000000..665ad5980343 --- /dev/null +++ b/pkgs/development/python-modules/python-jose/pycryptodome.patch @@ -0,0 +1,37 @@ +diff -ru python-jose-1.3.2/requirements.txt python-jose-1.3.2.new/requirements.txt +--- python-jose-1.3.2/requirements.txt 2016-09-05 15:13:49.000000000 +0200 ++++ python-jose-1.3.2.new/requirements.txt 2017-03-15 11:35:47.118001810 +0100 +@@ -1,3 +1,3 @@ +-pycrypto ++pycryptodome + six + future +diff -ru python-jose-1.3.2/setup.py python-jose-1.3.2.new/setup.py +--- python-jose-1.3.2/setup.py 2016-09-05 15:13:49.000000000 +0200 ++++ python-jose-1.3.2.new/setup.py 2017-03-15 11:37:15.725077184 +0100 +@@ -25,12 +25,8 @@ + + + def get_install_requires(): +- if platform.python_implementation() == 'PyPy': +- crypto_lib = 'pycryptodome >=3.3.1, <3.4.0' +- else: +- crypto_lib = 'pycrypto >=2.6.0, <2.7.0' + return [ +- crypto_lib, ++ 'pycryptodome >=3.3.1, <3.5.0', + 'six <2.0', + 'ecdsa <1.0', + 'future <1.0', +diff -ru python-jose-1.3.2/tox.ini python-jose-1.3.2.new/tox.ini +--- python-jose-1.3.2/tox.ini 2016-09-05 15:13:49.000000000 +0200 ++++ python-jose-1.3.2.new/tox.ini 2017-03-15 11:36:50.423055657 +0100 +@@ -6,7 +6,7 @@ + py.test --cov-report term-missing --cov jose + deps = + future +- pycrypto ++ pycryptodome + ecdsa + pytest + pytest-cov diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix new file mode 100644 index 000000000000..03c37f7a6c45 --- /dev/null +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, unidecode, regex, isPy3k }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "python-slugify"; + version = "1.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp"; + }; + doCheck = !isPy3k; + # (only) on python3 unittest loader (loadTestsFromModule) fails + + propagatedBuildInputs = [ unidecode regex ]; + + meta = with stdenv.lib; { + homepage = https://github.com/un33k/python-slugify; + description = "A Python Slugify application that handles Unicode"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 30f734d57193..f5ce3a156266 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -1,11 +1,12 @@ { lib, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "python-sql-${version}"; - version = "0.8"; + pname = "python-sql"; + name = "${pname}-${version}"; + version = "0.9"; src = fetchurl { url = "mirror://pypi/p/python-sql/${name}.tar.gz"; - sha256 = "0xik939sxqfqqbpgcsnfjnws692bjip32khgwhq1ycphfy7df3h2"; + sha256 = "07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c"; }; meta = { homepage = http://python-sql.tryton.org/; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index fe85b7bb0d34..337577141c2a 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,13 +1,14 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - name = "python-stdnum-${version}"; - version = "1.5"; + version = "1.6"; + pname = "python-stdnum"; + name = "${pname}-${version}"; # Failing tests and dependency issue on Py3k disabled = isPy3k; src = fetchurl { url = "mirror://pypi/p/python-stdnum/${name}.tar.gz"; - sha256 = "0zkkpjy4gc161dkyxjmingjw48glljlqqrl4fh2k5idf0frkvzhh"; + sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655"; }; meta = { homepage = "http://arthurdejong.org/python-stdnum/"; 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 000000000000..93b67fe4782e --- /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/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix new file mode 100644 index 000000000000..ce5ff0586649 --- /dev/null +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose }: + +buildPythonPackage rec { + pname = "pytimeparse"; + version = "1.1.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "A small Python library to parse various kinds of time expressions"; + homepage = "https://github.com/wroberts/pytimeparse"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix new file mode 100644 index 000000000000..55479e76dafd --- /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 000000000000..2088b2e0b103 --- /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/pyudev.nix b/pkgs/development/python-modules/pyudev.nix index 98607501e032..70950e4e9273 100644 --- a/pkgs/development/python-modules/pyudev.nix +++ b/pkgs/development/python-modules/pyudev.nix @@ -1,9 +1,10 @@ { lib, fetchurl, buildPythonPackage -, six, systemd +, six, systemd, pytest, mock, hypothesis, docutils }: buildPythonPackage rec { - name = "pyudev-${version}"; + pname = "pyudev"; + name = "${pname}-${version}"; version = "0.21.0"; src = fetchurl { @@ -12,12 +13,21 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace src/pyudev/_ctypeslib/libudev.py \ - --replace "find_library('udev')" "'${systemd.lib}/lib/libudev.so'" + substituteInPlace src/pyudev/_ctypeslib/utils.py \ + --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'" ''; + buildInputs = [ pytest mock hypothesis docutils ]; propagatedBuildInputs = [ systemd six ]; + checkPhase = '' + py.test + ''; + + # Bunch of failing tests + # https://github.com/pyudev/pyudev/issues/187 + doCheck = false; + meta = { homepage = "http://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index 27925a619f2f..a69c8568aca6 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - name = "PyWebDAV-${version}"; + pname = "pywebdav"; + name = "${pname}-${version}"; version = "0.9.8"; disabled = isPy3k; src = fetchurl { diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix new file mode 100644 index 000000000000..b2b5ba208016 --- /dev/null +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytest +, requests +, requests_ntlm +, six +, xmltodict +}: + +buildPythonPackage rec { + pname = "pywinrm"; + version = "0.2.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h"; + }; + + checkInputs = [ mock pytest ]; + propagatedBuildInputs = [ requests requests_ntlm six xmltodict ]; + + meta = with lib; { + description = "Python library for Windows Remote Management"; + homepage = "http://github.com/diyan/pywinrm/"; + license = licenses.mit; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index abea143d11da..0ef91fda9e35 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -1,7 +1,10 @@ -{lib, fetchurl, python, mkPythonDerivation, makeWrapper}: +{lib, fetchurl, python, buildPythonPackage, makeWrapper}: -mkPythonDerivation rec { - name = "PyXML-0.8.4"; +buildPythonPackage rec { + pname = "PyXML"; + version = "0.8.4"; + name = "${pname}-${pname}"; + format = "other"; src = fetchurl { url = "mirror://sourceforge/pyxml/${name}.tar.gz"; sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix new file mode 100644 index 000000000000..b09458de5683 --- /dev/null +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, isPy27 +, mock +, traitlets +, jupyter_core +, jupyter_client +, pygments +, ipykernel +, pyqt5 +}: + +buildPythonPackage rec { + pname = "qtconsole"; + version = "4.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209"; + }; + + buildInputs = [ nose ] ++ lib.optionals isPy27 [mock]; + propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; + + # : cannot connect to X server + doCheck = false; + + meta = { + description = "Jupyter Qt console"; + homepage = http://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient.nix index 0eaed7e36fd9..144b61c9b9a5 100644 --- a/pkgs/development/python-modules/rackspace-novaclient.nix +++ b/pkgs/development/python-modules/rackspace-novaclient.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchurl, isPy3k, requests2, novaclient, six, lib }: +{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }: let os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec { name = "os_virtual_interfacesv2_python_novaclient_ext-0.20"; @@ -129,7 +129,7 @@ buildPythonPackage rec { disabled = isPy3k; propagatedBuildInputs = [ - requests2 + requests novaclient six # extensions diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix new file mode 100644 index 000000000000..c2c8c926432a --- /dev/null +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -0,0 +1,44 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, libarchive, glibcLocales +# unrar is non-free software +, useUnrar ? false, unrar +}: + +assert useUnrar -> unrar != null; +assert !useUnrar -> libarchive != null; + +buildPythonPackage rec { + pname = "rarfile"; + name = "${pname}-${version}"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "markokr"; + repo = "rarfile"; + rev = "rarfile_3_0"; + sha256 = "07yliz6p1bxzhipnrgz133gl8laic35gl4rqfay7f1vc384ch7sn"; + }; + buildInputs = [ pytest nose glibcLocales ]; + + prePatch = '' + substituteInPlace rarfile.py \ + '' + (if useUnrar then + ''--replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\"" + '' + else + ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\"" + '') + + '' + ''; + # the tests only work with the standard unrar package + doCheck = useUnrar; + LC_ALL = "en_US.UTF-8"; + checkPhase = '' + py.test test -k "not test_printdir" + ''; + + meta = with stdenv.lib; { + description = "RAR archive reader for Python"; + homepage = https://github.com/markokr/rarfile; + license = licenses.isc; + }; +} diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix new file mode 100644 index 000000000000..9347cd55cf38 --- /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/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix new file mode 100644 index 000000000000..3dec364b292d --- /dev/null +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: + +buildPythonPackage rec { + pname = "rebulk"; + version = "0.9.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sw516ihfrb7i9bfl1n3049akvb23mpsk3llh7w3xfnbvkfrpip0"; + }; + + # Some kind of trickery with imports that doesn't work. + doCheck = false; + buildInputs = [ pytest pytestrunner ]; + propagatedBuildInputs = [ six regex ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/Toilal/rebulk/"; + license = licenses.mit; + description = "Advanced string matching from simple patterns"; + }; +} diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 14ebe52eae9e..d8b380896cc4 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "reikna"; name = "${pname}-${version}"; - version = "0.6.7"; + version = "0.6.8"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "810b349eb9339aa0d13bca99a3d8a380972708474b8c0990d188ec6074358d62"; + sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c"; }; buildInputs = [ sphinx pytestcov pytest ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 4f2c3da8936e..dc42449a3398 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage, genshi, lxml }: buildPythonPackage rec { - name = "relatorio-${version}"; + pname = "relatorio"; + name = "${pname}-${version}"; version = "0.6.4"; src = fetchurl { url = "mirror://pypi/r/relatorio/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix index a353ebd39d9b..0162d6f6eb5e 100644 --- a/pkgs/development/python-modules/requests-oauthlib.nix +++ b/pkgs/development/python-modules/requests-oauthlib.nix @@ -1,17 +1,18 @@ { stdenv, buildPythonPackage, fetchurl -, oauthlib, requests2 }: +, oauthlib, requests }: buildPythonPackage rec { - version = "0.7.0"; - name = "requests-oauthlib-${version}"; + version = "0.8.0"; + pname = "requests-oauthlib"; + name = "${pname}-${version}"; src = fetchurl { url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz"; - sha256 = "0cdn45k7qla0qwha0rm9pk9bcfhghvmqrdsphs73irs2rzk5cp2j"; + sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468"; }; doCheck = false; # Internet tests fail when building in chroot - propagatedBuildInputs = [ oauthlib requests2 ]; + propagatedBuildInputs = [ oauthlib requests ]; meta = with stdenv.lib; { description = "OAuthlib authentication support for Requests"; diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix new file mode 100644 index 000000000000..c475ff85ff36 --- /dev/null +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ntlm-auth +, requests +}: + +buildPythonPackage rec { + pname = "requests_ntlm"; + version = "1.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk"; + }; + + propagatedBuildInputs = [ ntlm-auth requests ]; + + # Tests require networking + doCheck = false; + + meta = with lib; { + description = "HTTP NTLM authentication support for python-requests"; + homepage = https://github.com/requests/requests-ntlm; + license = licenses.isc; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix new file mode 100644 index 000000000000..a8848fcac338 --- /dev/null +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, + pytest }: + +buildPythonPackage rec { + pname = "rfc3986"; + version = "1.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2faacfabcc13ed89b061b5f21cbbf330f82400654b317b5907d311c3478ec4c4"; + }; + + buildInputs = [ pytest ]; + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = "https://rfc3986.readthedocs.org"; + license = licenses.asl20; + description = "Validating URI References per RFC 3986"; + }; +} diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 7ba1c79cd054..d502ad75566c 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,16 +1,18 @@ {stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}: -stdenv.mkDerivation { - name = "rhpl-0.218"; - +stdenv.mkDerivation rec { + pname = "rhpl"; + version = "0.218"; + name = "${pname}-${version}"; + src = fetchurl { url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16"; }; - + inherit python; - + builder = ./builder.sh; - + buildInputs = [ rpmextract python wirelesstools gettext ]; } diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix new file mode 100644 index 000000000000..24adf830699c --- /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 new file mode 100644 index 000000000000..c8958f9dd1f0 --- /dev/null +++ b/pkgs/development/python-modules/ropper/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonApplication +, fetchPypi +, capstone +, filebytes +, pytest }: + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "ropper"; + version = "1.10.10"; + + src = fetchPypi { + 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 + ''; + buildInputs = [pytest]; + propagatedBuildInputs = [ capstone filebytes ]; + meta = with stdenv.lib; { + homepage = "https://scoding.de/ropper/"; + license = licenses.gpl2; + description = "Show information about files in different file formats"; + maintainers = with maintainers; [ bennofs ]; + }; +} diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix new file mode 100644 index 000000000000..6ac787bc82b2 --- /dev/null +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -0,0 +1,41 @@ +{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, python +, nose, pillow +, gfortran, glibcLocales +, numpy, scipy +}: + +buildPythonPackage rec { + pname = "scikit-learn"; + version = "0.18.1"; + name = "${pname}-${version}"; + disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 + + src = fetchPypi { + inherit pname version; + sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c"; + }; + + patches = [ + # python 3.6 test fixes (will be part of 0.18.2) + (fetchpatch { + url = https://github.com/scikit-learn/scikit-learn/pull/8123/commits/b77f28a7163cb4909da1b310f1fb741bee3cabfe.patch; + sha256 = "1rp6kr6hiabb6s0vh7mkgr10qwrqlq3z1fhpi0s011hg434ckh19"; + }) + ]; + + buildInputs = [ nose pillow gfortran glibcLocales ]; + propagatedBuildInputs = [ numpy scipy numpy.blas ]; + + LC_ALL="en_US.UTF-8"; + + checkPhase = '' + HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/ + ''; + + meta = with stdenv.lib; { + description = "A set of python modules for machine learning and data mining"; + homepage = http://scikit-learn.org; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy/default.nix similarity index 62% rename from pkgs/development/python-modules/scipy.nix rename to pkgs/development/python-modules/scipy/default.nix index 023335a5e347..a7428f134a7a 100644 --- a/pkgs/development/python-modules/scipy.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,16 +1,17 @@ -{lib, python, buildPythonPackage, isPyPy, gfortran, nose}: +{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}: -args: +buildPythonPackage rec { + pname = "scipy"; + version = "0.19.0"; + name = "${pname}-${version}"; -let - inherit (args) version; - inherit (args) numpy; -in buildPythonPackage (args // rec { + src = fetchurl { + url = "mirror://pypi/s/scipy/scipy-${version}.zip"; + sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122"; + }; - name = "scipy-${version}"; - - buildInputs = (args.buildInputs or [ gfortran nose ]); - propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); + buildInputs = [ gfortran nose numpy.blas ]; + propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper prePatch = '' @@ -25,8 +26,8 @@ in buildPythonPackage (args // rec { echo "Creating site.cfg file..." cat << EOF > site.cfg [openblas] - include_dirs = ${passthru.blas}/include - library_dirs = ${passthru.blas}/lib + include_dirs = ${numpy.blas}/include + library_dirs = ${numpy.blas}/lib EOF ''; @@ -48,5 +49,5 @@ in buildPythonPackage (args // rec { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; homepage = http://www.scipy.org/; maintainers = with lib.maintainers; [ fridh ]; - } // (args.meta or {}); -}) + }; +} diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 8f3b2ef74b21..2fcc06593848 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,8 +2,9 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - name = "Scrapy-${version}"; - version = "1.3.1"; + version = "1.4.0"; + pname = "Scrapy"; + name = "${pname}-${version}"; buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; propagatedBuildInputs = [ @@ -25,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk"; + sha256 = "04a08f027eef5d271342a016439533c81ba46f14bfcf230fecf602e99beaf233"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/pkgs/development/python-modules/scrapy/permissions-fix.patch index 5ea5269c799e..53038cf74e5f 100644 --- a/pkgs/development/python-modules/scrapy/permissions-fix.patch +++ b/pkgs/development/python-modules/scrapy/permissions-fix.patch @@ -21,8 +21,3 @@ index 5941066..89f8edb 100644 def run(self, args, opts): if len(args) not in (1, 2): -@@ -118,4 +117,3 @@ class Command(ScrapyCommand): - _templates_base_dir = self.settings['TEMPLATES_DIR'] or \ - join(scrapy.__path__[0], 'templates') - return join(_templates_base_dir, 'project') -- diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix new file mode 100644 index 000000000000..285da5460717 --- /dev/null +++ b/pkgs/development/python-modules/semver/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "semver"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m"; + }; + + meta = with stdenv.lib; { + description = "Python package to work with Semantic Versioning (http://semver.org/)"; + homepage = "https://github.com/k-bx/python-semver"; + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 63e05736d796..59fe5f148399 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,18 +1,23 @@ -{ stdenv, lib, fetchurl, python, wrapPython }: +{ stdenv +, fetchPypi +, python +, wrapPython +, unzip +}: +# Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - shortName = "${pname}-${version}"; - name = "${python.libPrefix}-${shortName}"; + version = "36.0.1"; + name = "${python.libPrefix}-${pname}-${version}"; - version = "30.2.0"; - - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz"; - sha256 = "f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857"; + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a"; }; - buildInputs = [ python wrapPython ]; + buildInputs = [ python wrapPython unzip ]; doCheck = false; # requires pytest installPhase = '' dst=$out/${python.sitePackages} @@ -27,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; - license = with lib.licenses; [ psfl zpt20 ]; + license = with licenses; [ psfl zpt20 ]; platforms = platforms.all; priority = 10; }; diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index cd77f66b56eb..78dc82bc7704 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "simpleeval-${version}"; + pname = "simpleeval"; + name = "${pname}-${version}"; version = "0.9.5"; src = fetchurl { url = "mirror://pypi/s/simpleeval/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix new file mode 100644 index 000000000000..4deac80fb06d --- /dev/null +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, stdenv +}: + +buildPythonPackage rec { + pname = "simplejson"; + version = "3.10.0"; + name = "${pname}-${version}"; + doCheck = !stdenv.isDarwin; + + src = fetchPypi { + inherit pname version; + sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2"; + }; + + meta = { + description = "A simple, fast, extensible JSON encoder/decoder for Python"; + longDescription = '' + simplejson is compatible with Python 2.4 and later with no + external dependencies. It covers the full JSON specification + for both encoding and decoding, with unicode support. By + default, encoding is done in an encoding neutral fashion (plain + ASCII with \uXXXX escapes for unicode characters). + ''; + homepage = http://code.google.com/p/simplejson/; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 99d3c89e1f9d..b6094f37c3a5 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,7 +1,10 @@ -{ lib, fetchurl, mkPythonDerivation, python, isPyPy }: +{ lib, fetchurl, buildPythonPackage, python, isPyPy }: -if isPyPy then throw "sip not supported for interpreter ${python.executable}" else mkPythonDerivation rec { - name = "sip-4.19.1"; +if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { + pname = "sip"; + version = "4.19.1"; + name = "${pname}-${version}"; + format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; @@ -18,7 +21,7 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 sander urkud ]; + maintainers = with maintainers; [ lovek323 sander ]; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix new file mode 100644 index 000000000000..dbc3889406f0 --- /dev/null +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, boto +, bz2file +, moto +, requests +, responses +}: + +buildPythonPackage rec { + pname = "smart_open"; + name = "${pname}-${version}"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s"; + }; + + propagatedBuildInputs = [ boto bz2file requests responses moto ]; + meta = { + license = lib.licenses.mit; + description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file"; + maintainers = with lib.maintainers; [ jpbernardy ]; + }; +} diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index be6f86dae545..6754089ffce8 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, buildPythonPackage, tornado }: buildPythonPackage rec { - name = "snakeviz-${version}"; + pname = "snakeviz"; + name = "${pname}-${version}"; version = "0.4.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix new file mode 100644 index 000000000000..326975e71558 --- /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-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix new file mode 100644 index 000000000000..9cf1ba1b3d87 --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchurl, python, + unittest2, scripttest, pytz, pylint, tempest-lib, mock, testtools, + pbr, tempita, decorator, sqlalchemy, six, sqlparse +}: +buildPythonPackage rec { + pname = "sqlalchemy-migrate"; + name = "${pname}-${version}"; + version = "0.11.0"; + + src = fetchurl { + url = "mirror://pypi/s/sqlalchemy-migrate/${name}.tar.gz"; + sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; + }; + + buildInputs = [ unittest2 scripttest pytz pylint tempest-lib mock testtools ]; + propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; + + checkPhase = '' + export PATH=$PATH:$out/bin + echo sqlite:///__tmp__ > test_db.cfg + # depends on ibm_db_sa + rm migrate/tests/changeset/databases/test_ibmdb2.py + # wants very old testtools + rm migrate/tests/versioning/test_schema.py + # transient failures on py27 + substituteInPlace migrate/tests/versioning/test_util.py --replace "test_load_model" "noop" + ${python.interpreter} setup.py test + ''; + + meta = with stdenv.lib; { + homepage = http://code.google.com/p/sqlalchemy-migrate/; + description = "Schema migration tools for SQLAlchemy"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix new file mode 100644 index 000000000000..4cd522fe1953 --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytest +, mock +, pytest_xdist +, isPy3k +, pysqlite +}: + +buildPythonPackage rec { + pname = "SQLAlchemy"; + name = "${pname}-${version}"; + version = "1.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211"; + }; + + checkInputs = [ pytest mock pytest_xdist ] + ++ lib.optional (!isPy3k) pysqlite; + + # Test-only dependency pysqlite doesn't build on Python 3. This isn't an + # acceptable reason to make all dependents unavailable on Python 3 as well + #doCheck = !(isPyPy || isPy3k); + + checkPhase = '' + py.test + ''; + + meta = with lib; { + homepage = http://www.sqlalchemy.org/; + description = "A Python SQL toolkit and Object Relational Mapper"; + license = licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix new file mode 100644 index 000000000000..60e35d2ade43 --- /dev/null +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -0,0 +1,33 @@ +{ lib +, self +, buildPythonPackage +, fetchPypi +, nose +, numpy +, scipy +, pandas +, patsy +, cython +, matplotlib +}: + +buildPythonPackage rec { + pname = "statsmodels"; + version = "0.8.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048"; + }; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib]; + + meta = { + description = "Statistical computations and models for use with SciPy"; + homepage = "https://www.github.com/statsmodels/statsmodels"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix new file mode 100644 index 000000000000..c6ce6c0d922e --- /dev/null +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, oslosphinx, pbr, six, argparse }: + +buildPythonPackage rec { + pname = "stevedore"; + version = "1.21.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "12sg88ax0lv2sxr685rqdaxm9gryjrpj4fvax459zvwy1r4n83ma"; + }; + + doCheck = false; + + buildInputs = [ oslosphinx ]; + propagatedBuildInputs = [ pbr six argparse ]; + + meta = with stdenv.lib; { + description = "Manage dynamic plugins for Python applications"; + homepage = "https://pypi.python.org/pypi/stevedore"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 50a425132a26..cd7bb2b9507b 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}: buildPythonPackage rec { - name = "PyStringTemplate-${version}"; + pname = "PyStringTemplate"; + name = "${pname}-${version}"; version = "3.2b1"; src = fetchurl { diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix new file mode 100644 index 000000000000..5a1e114fb259 --- /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/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix new file mode 100644 index 000000000000..0788ddaeec62 --- /dev/null +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchurl +, buildPythonApplication +, guessit +, babelfish +, enzyme +, beautifulsoup4 +, requests +, click +, dogpile_cache +, stevedore +, chardet +, pysrt +, six +, appdirs +, rarfile +, pytz +, futures +}: + +buildPythonApplication rec { + pname = "subliminal"; + name = "${pname}-${version}"; + version = "2.0.5"; + + src = fetchurl { + url = "mirror://pypi/s/subliminal/${name}.tar.gz"; + sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl"; + }; + + # Too many test dependencies + doCheck = false; + propagatedBuildInputs = [ guessit babelfish enzyme beautifulsoup4 requests + click dogpile_cache stevedore chardet pysrt six + appdirs rarfile pytz futures ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Diaoul/subliminal; + description = "Python library to search and download subtitles"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix new file mode 100644 index 000000000000..4786e7eb7e18 --- /dev/null +++ b/pkgs/development/python-modules/systemd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: + +buildPythonPackage rec { + name = "python-systemd-${version}"; + version = "234"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "python-systemd"; + rev = "v${version}"; + sha256 = "1fakw7qln44mfd6pj4kqsgyrhkc6cyr653id34kv0rdnb1bvysrz"; + }; + + buildInputs = [ systemd ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python module for native access to the systemd facilities"; + homepage = http://www.freedesktop.org/software/systemd/python-systemd/; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 88a39400c77c..f80dcdf74fd5 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, python, buildPythonPackage -, cython, bzip2, lzo, numpy, numexpr, hdf5 }: +, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }: buildPythonPackage rec { - version = "3.2.2"; - name = "tables-${version}"; + version = "3.4.2"; + pname = "tables"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/t/tables/${name}.tar.gz"; - sha256 = "3564b351a71ec1737b503b001eb7ceae1f65d5d6e3ffe1ea75aafba10f37fa84"; + sha256 = "fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c"; }; - buildInputs = [ hdf5 cython bzip2 lzo ]; - propagatedBuildInputs = [ numpy numexpr ]; + buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; + propagatedBuildInputs = [ numpy numexpr six ]; # The setup script complains about missing run-paths, but they are # actually set. @@ -19,6 +20,7 @@ buildPythonPackage rec { [ "--hdf5=${hdf5}" "--lzo=${lzo}" "--bzip2=${bzip2.dev}" + "--blosc=${c-blosc}" ]; # Run the test suite. diff --git a/pkgs/development/python-modules/tarsnapper-path.patch b/pkgs/development/python-modules/tarsnapper-path.patch deleted file mode 100644 index 337ad49f9715..000000000000 --- 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/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 04e820307a48..388d27e06867 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -5,20 +5,18 @@ , cudaSupport ? false , cudatoolkit ? null , cudnn ? null -, gcc49 ? null , linuxPackages ? null , numpy , six , protobuf3_2 , swig +, werkzeug , mock -, gcc , zlib }: assert cudaSupport -> cudatoolkit != null && cudnn != null - && gcc49 != null && linuxPackages != null; # unsupported combination @@ -31,7 +29,7 @@ assert ! (stdenv.isDarwin && cudaSupport); buildPythonPackage rec { pname = "tensorflow"; - version = "1.0.0"; + version = "1.1.0"; name = "${pname}-${version}"; format = "wheel"; disabled = ! (isPy35 || isPy27); @@ -49,31 +47,31 @@ buildPythonPackage rec { darwin.cpu = { py2 = { url = tfurl "mac" "cpu" "py2-none-any" ; - sha256 = "15ayil28p20wkgpwkr4mz0imjxnf049xx4117jspg1qkjg2bn1b2"; + sha256 = "1fgf26lw0liqxc9pywc8y2mj8l1mv48nhkav0pag9vavdacb9mqr"; }; py3 = { url = tfurl "mac" "cpu" "py3-none-any" ; - sha256 = "1ynyhbm7yrp421364s49a1r3p83zxy74iiy5c4hx2xm5c4gs29an"; + sha256 = "0z5p1fra7bih0vqn618i2w3vyy8d1rkc72k7bmjq0rw8msl717ia"; }; }; linux-x86_64.cpu = { py2 = { url = tfurl "linux" "cpu" "cp27-none-linux_x86_64"; - sha256 = "1hwhq1qhjrfkqfkxpsrq6mdmdibnqr3n7xvzkxp6gaqj73vn5ch2"; + sha256 = "0ld3hqx3idxk0zcrvn3p9yqnmx09zsj3mw66jlfw6fkv5hznx8j2"; }; py3 = { url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64"; - sha256 = "0jx2mmlw0nxah9l25r46i7diqiv31qcz7855n250lsxfwcppy7y3"; + sha256 = "0ahz9222rzqrk43lb9w4m351klkm6mlnnvw8xfqip28vbmymw90b"; }; }; linux-x86_64.cuda = { py2 = { url = tfurl "linux" "gpu" "cp27-none-linux_x86_64"; - sha256 = "0l8f71x3ama5a6idj05jrswlmp4yg37fxhz8lx2xmgk14aszbcy5"; + sha256 = "1baa9jwr6f8f62dyx6isbw8yyrd0pi1dz1srjblfqsyk1x3pnfvh"; }; py3 = { url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64"; - sha256 = "12q7s0yk0h3r4glh0fhl1fcdx7jl8xikwwp04a1lcagasr51s36m"; + sha256 = "0606m2awy0ifhniy8lsyhd0xc388dgrwksn87989xlgy90wpxi92"; }; }; }; @@ -96,8 +94,8 @@ buildPythonPackage rec { ); propagatedBuildInputs = with stdenv.lib; - [ numpy six protobuf3_2 swig mock ] - ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ]; + [ numpy six protobuf3_2 swig werkzeug mock ] + ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then @@ -105,10 +103,10 @@ buildPythonPackage rec { postFixup = let rpath = stdenv.lib.makeLibraryPath (if cudaSupport then - [ gcc49.cc.lib zlib cudatoolkit cudnn + [ stdenv.cc.cc.lib zlib cudatoolkit cudnn linuxPackages.nvidia_x11 ] else - [ gcc.cc.lib zlib ] + [ stdenv.cc.cc.lib zlib ] ); in '' @@ -121,6 +119,7 @@ buildPythonPackage rec { description = "TensorFlow helps the tensors flow"; homepage = http://tensorflow.org; license = licenses.asl20; + maintainers = with maintainers; [ jpbernardy ]; platforms = with platforms; if cudaSupport then linux else linux ++ darwin; }; } diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix new file mode 100644 index 000000000000..6a0dd6a36552 --- /dev/null +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, coverage +, glibcLocales +, flake8 +, matplotlib +, pandas +}: + +buildPythonPackage rec { + pname = "tqdm"; + version = "4.11.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14baa7a9ea7723d46f60de5f8c6f20e840baa7e3e193bf0d9ec5fe9103a15254"; + }; + + buildInputs = [ nose coverage glibcLocales flake8 ]; + + LC_ALL="en_US.UTF-8"; + + meta = { + description = "A Fast, Extensible Progress Meter"; + homepage = https://github.com/tqdm/tqdm; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 37f9e3324c7e..7bb028b233d9 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,45 +1,38 @@ -{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2, - six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx, - openssl, pyopenssl }: +{ stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six +, mock, twisted, incremental, pep8 }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "treq"; - version = "16.12.0"; + version = "17.3.1"; - src = fetchurl { - url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "1aci3f3rmb5mdf4s6s4k4kghmnyy784cxgi3pz99m5jp274fs25h"; + src = fetchPypi { + inherit pname version; + sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii"; }; - buildInputs = [ + propagatedBuildInputs = [ twisted requests six incremental service-identity ]; + + checkInputs = [ pep8 mock ]; - propagatedBuildInputs = [ - service-identity - requests2 - twisted - incremental - sphinx - six - openssl - pyopenssl - ]; - - checkPhase = '' - ${pep8}/bin/pep8 --ignore=E902 treq - trial treq + postPatch = '' + rm -fv src/treq/test/test_treq_integration.py ''; - doCheck = false; - # Failure: twisted.web._newclient.RequestTransmissionFailed: [] + # XXX tox tries to install coverage despite it is installed + #postBuild = '' + # # build documentation and install in $out + # tox -e docs + # mkdir -pv $out/docs + # cp -rv docs/* $out/docs/ + #''; - postBuild = '' - ${coreutils}/bin/mkdir -pv treq - ${coreutils}/bin/echo "${version}" | ${coreutils}/bin/tee treq/_version - cd docs && ${gnumake}/bin/make html && cd .. + checkPhase = '' + pep8 --ignore=E902 treq + trial treq ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix new file mode 100644 index 000000000000..6a3f9c638908 --- /dev/null +++ b/pkgs/development/python-modules/trezor/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchPypi, buildPythonPackage, protobuf3_2, hidapi, ecdsa, mnemonic +, requests +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "trezor"; + version = "0.7.15"; + + src = fetchPypi { + inherit pname version; + sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618"; + }; + + propagatedBuildInputs = [ protobuf3_2 hidapi requests ]; + + buildInputs = [ ecdsa mnemonic ]; + + # There are no actual tests: "ImportError: No module named tests" + doCheck = false; + + meta = { + description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; + homepage = https://github.com/trezor/python-trezor; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index f3e7bb7025bc..8f0fbbd6dfbf 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,12 +1,14 @@ { stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }: buildPythonPackage rec { - name = "twill-0.9.1"; + pname = "twill"; + version = "1.8.0"; + name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { url = "mirror://pypi/t/twill/${name}.tar.gz"; - sha256 = "0zmssp41cgb5sz1jym7rxy6mamb64dxq3wra1bn6snna9v653pyj"; + sha256 = "d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188"; }; propagatedBuildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix new file mode 100644 index 000000000000..6898863e8afc --- /dev/null +++ b/pkgs/development/python-modules/twisted/default.nix @@ -0,0 +1,45 @@ +{ stdenv, buildPythonPackage, fetchurl, python, + zope_interface, incremental, automat, constantly +}: +buildPythonPackage rec { + pname = "Twisted"; + name = "${pname}-${version}"; + version = "17.1.0"; + + src = fetchurl { + url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; + sha256 = "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv"; + }; + + propagatedBuildInputs = [ zope_interface incremental automat constantly ]; + + # Patch t.p._inotify to point to libc. Without this, + # twisted.python.runtime.platform.supportsINotify() == False + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace src/twisted/python/_inotify.py --replace \ + "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" + ''; + + # Generate Twisted's plug-in cache. Twisted users must do it as well. See + # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for + # details. + postInstall = "$out/bin/twistd --help > /dev/null"; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s twisted/test + ''; + # Tests require network + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://twistedmatrix.com/; + description = "Twisted, an event-driven networking engine written in Python"; + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix new file mode 100644 index 000000000000..98060536638e --- /dev/null +++ b/pkgs/development/python-modules/txaio/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "txaio"; + version = "2.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lmllmjjsqzl3w4faq2qhlgkaqn1yn1m7d99k822ib7qgz18bsly"; + }; + + buildInputs = [ pytest mock ]; + + propagatedBuildInputs = [ six twisted ]; + + patchPhase = '' + sed -i '152d' test/test_logging.py + ''; + + # test_chained_callback has been removed just post-2.7.1 because the functionality was decided against and the test + # breaks on python 3.6 https://github.com/crossbario/txaio/pull/104 + checkPhase = '' + py.test -k "not (test_sdist or test_chained_callback)" + ''; + + meta = with stdenv.lib; { + description = "Utilities to support code that runs unmodified on Twisted and asyncio."; + homepage = "https://github.com/crossbario/txaio"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 8d36d3c3a61f..45aea2de1a42 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,13 +1,16 @@ -{ buildPythonPackage, fetchzip, isPy3k, lib, pythonOlder }: +{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: buildPythonPackage rec { - name = "typed-ast-${version}"; - version = "1.0.1"; - src = fetchzip { - url = "mirror://pypi/t/typed-ast/${name}.zip"; - sha256 = "1q69czr9ghnbd81hay71kgynn6mqi5nsgand9yw6dyw5bim5l154"; + pname = "typed-ast"; + version = "1.0.4"; + name = "${pname}-${version}"; + src = fetchPypi{ + inherit pname version; + sha256 = "73f09aac0119f6664a3f471a1ec1c9b719f572bc9212913cea96a78b22c2e96e"; }; # Only works with Python 3.3 and newer; - disabled = !isPy3k && !(pythonOlder "3.3"); + disabled = pythonOlder "3.3"; + # No tests in archive + doCheck = false; meta = { homepage = "https://pypi.python.org/pypi/typed-ast"; description = "a fork of Python 2 and 3 ast modules with type comment support"; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix new file mode 100644 index 000000000000..c099aba5b7af --- /dev/null +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv +, setuptools_scm +, pytest +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "typeguard"; + version = "2.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l3pih5ca469v7if255h5rqymirsw46bi6s7p885jxhq1gv6cfpk"; + }; + + buildInputs = [ setuptools_scm ]; + + postPatch = '' + substituteInPlace setup.cfg --replace " --cov" "" + ''; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test . + ''; + + disabled = pythonOlder "3.3"; + + meta = with stdenv.lib; { + description = "This library provides run-time type checking for functions defined with argument type annotations"; + homepage = "https://github.com/agronholm/typeguard"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 34d88d74c559..aca4e370e461 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,13 +7,13 @@ let pname = "u-msgpack-python"; - version = "2.3.0"; + version = "2.4.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "d8df6bb0e2a838aa227c39cfd14aa147ab32b3df6871001874e9b9da9ce1760c"; + sha256 = "2f31fc1b6dd8632c230ea7012470e40f77119f20999274dda6f1afa9c305e590"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix new file mode 100644 index 000000000000..a0aa14789448 --- /dev/null +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, numpy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "uncertainties"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; + }; + + buildInputs = [ nose numpy ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://pythonhosted.org/uncertainties/"; + description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; + maintainer = with maintainers; [ rnhmjoj ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix new file mode 100644 index 000000000000..89496e00e568 --- /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/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index bce88635d3c5..066230d0a1fc 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,8 +5,9 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "uranium-${version}"; version = "2.4.0"; + pname = "uranium"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "Ultimaker"; diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix new file mode 100644 index 000000000000..d680c29e224e --- /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/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix new file mode 100644 index 000000000000..9387c7de792b --- /dev/null +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -0,0 +1,50 @@ +{ buildPythonPackage +, lib +, six +, fetchPypi +, pyyaml +, mock +, contextlib2 +, wrapt +, pytest +, httpbin +, pytest-httpbin +, yarl +, pythonOlder +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "vcrpy"; + version = "1.11.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f434fe7e05d940d576ac850709ae57a738ba40e7f317076ea8d359ced5b32320"; + }; + + checkInputs = [ + pytest + pytest-httpbin + ]; + + propagatedBuildInputs = [ + pyyaml + wrapt + six + ] + ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ] + ++ lib.optionals (pythonAtLeast "3.4") [ yarl ]; + + checkPhase = '' + py.test --ignore=tests/integration -k "not TestVCRConnection" + ''; + + meta = with lib; { + description = "Automatically mock your HTTP interactions to simplify and speed up testing"; + homepage = https://github.com/kevin1024/vcrpy; + license = licenses.mit; + }; +} + diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix new file mode 100644 index 000000000000..efdce1e6dba3 --- /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 000000000000..85b17f5119ca --- /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 000000000000..f6d3a747ee48 --- /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/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 4c343985c597..8c980cf2b2cf 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -1,32 +1,33 @@ { fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }: + pythonPackages.buildPythonPackage rec { - name = "vowpalwabbit-${version}"; - version = "8.3.2"; + pname = "vowpalwabbit"; + name = "${pname}-${version}"; + version = "8.3.2"; - src = fetchurl{ - url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; - }; - # vw tries to write some explicit things to home - # python installed: The directory '/homeless-shelter/.cache/pip/http' - preInstall = '' - export HOME=$PWD - ''; + src = fetchurl{ + url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; + sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; + }; + # vw tries to write some explicit things to home + # python installed: The directory '/homeless-shelter/.cache/pip/http' + preInstall = '' + export HOME=$PWD + ''; - buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ]; - propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ]; + buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ]; + propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ]; - checkPhase = '' - # check-manifest requires a git clone, not a tarball - # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*" - python setup.py check -mrs - ''; - - meta = with lib; { - description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project."; - homepage = https://github.com/JohnLangford/vowpal_wabbit; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; + checkPhase = '' + # check-manifest requires a git clone, not a tarball + # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*" + python setup.py check -mrs + ''; + meta = with lib; { + description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project."; + homepage = https://github.com/JohnLangford/vowpal_wabbit; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; } diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index 54f3517ca002..834a0ab07fbf 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -6,13 +6,13 @@ let pname = "webencodings"; - version = "0.5"; + version = "0.5.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a5c55ee93b24e740fe951c37b5c228dccc1f171450e188555a775261cce1b904"; + sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 8c66dc604077..7e29b2b61902 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -6,13 +6,13 @@ let pname = "websockets"; - version = "3.2"; + version = "3.3"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1dah1faywsnrlqyzagb1qc1cxrq9145srkdy118yhy9s8dyq4dmm"; + sha256 = "305ab7fdd86afd08c2723461c949e153f7b01233f95a108619a15e41b7a74c93"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix new file mode 100644 index 000000000000..5574a800b5b7 --- /dev/null +++ b/pkgs/development/python-modules/wheel/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytestcov +, coverage +, jsonschema +}: + +buildPythonPackage rec { + pname = "wheel"; + version = "0.29.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648"; + }; + + buildInputs = [ pytest pytestcov coverage ]; + + propagatedBuildInputs = [ jsonschema ]; + + # We add this flag to ignore the copy installed by bootstrapped-pip + installFlags = [ "--ignore-installed" ]; + + meta = { + description = "A built-package format for Python"; + license = with lib.licenses; [ mit ]; + homepage = https://bitbucket.org/pypa/wheel/; + }; +} diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix new file mode 100644 index 000000000000..7e2a571b1bba --- /dev/null +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Whoosh"; + version = "2.7.4"; + src = fetchPypi { + inherit pname version; + sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; + }; + buildInputs = [ pytest ]; + + # Wrong encoding + postPatch = '' + rm tests/test_reading.py + ''; + checkPhase = '' + # FIXME: test_minimize_dfa fails on python 3.6 + py.test -k "not test_timelimit and not test_minimize_dfa" + ''; + + meta = with stdenv.lib; { + description = "Fast, pure-Python full text indexing, search, and spell +checking library."; + homepage = "http://bitbucket.org/mchaput/whoosh"; + license = licenses.bsd2; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix new file mode 100644 index 000000000000..dda58c65f60c --- /dev/null +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, notebook +, ipywidgets +}: + +buildPythonPackage rec { + pname = "widgetsnbextension"; + name = "${pname}-${version}"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "566582a84642d0c0f78b756a954450a38a8743eeb8dad04b7cab3ca66f455e6f"; + }; + + propagatedBuildInputs = [ notebook ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "IPython HTML widgets for Jupyter"; + homepage = http://ipython.org/; + license = ipywidgets.meta.license; # Build from same repo + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix new file mode 100644 index 000000000000..1d454fc4a628 --- /dev/null +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "wptserve"; + version = "1.4.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rkq4dpl41hx64m3ad0bwn0r5i7sf8qpgazgkq905j3wgk5aaspg"; + }; + + propagatedBuildInputs = [ ]; + + meta = { + description = "A webserver intended for web browser testing"; + homepage = " http://wptserve.readthedocs.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ raskin ]; + }; +} diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index defdc920d6e5..14f6f802ba2a 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -12,6 +12,8 @@ , isPy3k , isPyPy , python +, cairo +, pango }: assert wxGTK.unicode; @@ -43,6 +45,15 @@ buildPythonPackage rec { # this check is supposed to only return false on older systems running non-framework python substituteInPlace src/osx_cocoa/_core_wrap.cpp \ --replace "return wxPyTestDisplayAvailable();" "return true;" + '' + lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace wx/lib/wxcairo.py \ + --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' + substituteInPlace wx/lib/wxcairo.py \ + --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ + ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), + ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), + ("appsvc", None) + ]}' ''; NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lX11 -lgdk-x11-2.0"; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix new file mode 100644 index 000000000000..7b9712dfd023 --- /dev/null +++ b/pkgs/development/python-modules/xarray/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, numpy +, pandas +, python +}: + +buildPythonPackage rec { + pname = "xarray"; + version = "0.9.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [numpy pandas]; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + meta = { + description = "N-D labeled arrays and datasets in Python"; + homepage = https://github.com/pydata/xarray; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 01f920a387ad..f25646fffdbb 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -8,21 +8,13 @@ buildPythonPackage rec { pname = "xlwt"; name = "${pname}-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c"; + sha256 = "505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9"; }; - # re.LOCALE was removed in Python 3.6 - patches = [ - (fetchpatch { - url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch"; - sha256 = "0ifavfld3rrqjb0iyriy4c0drw31gszvlg3nmnn9dmfsh91vxhs6"; - }) - ]; - buildInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 332feef9e497..33adac52c903 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { - name = "xmpp.py-${version}"; + pname = "xmpp.py"; + name = "${pname}-${version}"; version = "0.5.0rc1"; patches = [ ./ssl.patch ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix new file mode 100644 index 000000000000..6fbd6886b1a9 --- /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 000000000000..86ef792a437c --- /dev/null +++ b/pkgs/development/python-modules/yapf/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "yapf"; + version = "0.16.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qxq41y65saljw0jk5fzinvynr9fhwzqcjsxxs8bn78in073x7a2"; + }; + + 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/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 246b761fa538..0455efc31276 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -8,12 +8,12 @@ let pname = "yarl"; - version = "0.8.1"; + version = "0.10.3"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "9f0397ae540124bf16a8a5b89bc3ea1c07f8ae70c3e44231a40a9edd254d5712"; + sha256 = "27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138"; }; buildInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 33e9cfeab3a9..f6bbb8f4b86c 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -3,7 +3,8 @@ with lib; buildPythonApplication rec { - name = "yolk-${version}"; + pname = "yolk"; + name = "${pname}-${version}"; version = "0.4.3"; src = fetchurl { diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix new file mode 100644 index 000000000000..aa90bf0ce1a6 --- /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 000000000000..ee3fcff49036 --- /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/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix new file mode 100644 index 000000000000..41418a99c8d1 --- /dev/null +++ b/pkgs/development/python-modules/zeep/default.nix @@ -0,0 +1,91 @@ +{ fetchPypi +, lib +, buildPythonPackage +, python +, isPy3k +, appdirs +, cached-property +, defusedxml +, isodate +, lxml +, pytz +, requests_toolbelt +, six +# test dependencies +, freezegun +, mock +, nose +, pretend +, pytest +, pytestcov +, requests-mock +, testtools +}: + +let + pname = "zeep"; + version = "2.0.0"; +in buildPythonPackage { + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5b9bd6b8772d6b505118c11d6924eb7df0decf12bbbeb43b1c27d781817361ad"; + }; + + propagatedBuildInputs = [ + appdirs + cached-property + defusedxml + isodate + lxml + pytz + requests_toolbelt + six + ]; + + # testtools dependency not supported for py3k + doCheck = !isPy3k; + + buildInputs = if isPy3k then [] else [ + freezegun + mock + nose + pretend + pytest + pytestcov + requests-mock + ]; + + patchPhase = '' + # remove overly strict bounds and lint requirements + sed -e "s/freezegun==.*'/freezegun'/" \ + -e "s/pytest-cov==.*'/pytest-cov'/" \ + -e "s/'isort.*//" \ + -e "s/'flake8.*//" \ + -i setup.py + + # locale.preferredencoding() != 'utf-8' + sed -e "s/xsd', 'r')/xsd', 'r', encoding='utf-8')/" -i tests/*.py + + # cache defaults to home directory, which doesn't exist + sed -e "s|SqliteCache()|SqliteCache(path='./zeeptest.db')|" \ + -i tests/test_transports.py + + # requires xmlsec python module + rm tests/test_wsse_signature.py + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m pytest tests + runHook postCheck + ''; + + meta = with lib; { + homepage = "http://docs.python-zeep.org"; + license = licenses.mit; + description = "A modern/fast Python SOAP client based on lxml / requests"; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix new file mode 100644 index 000000000000..487f657680c2 --- /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 000000000000..bfde1f0a2151 --- /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 000000000000..fc1a3c4c9028 --- /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 new file mode 100644 index 000000000000..66a0f8d77aab --- /dev/null +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "zxcvbn-python"; + version = "4.4.15"; + + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "ef982a382518d217d353a42093aa8bb8608a50bc2df559c08885bba166782cd0"; + }; + + # No tests in archive + doCheck = false; + + meta = { + description = "Python implementation of Dropbox's realistic password strength estimator, zxcvbn"; + homepage = https://github.com/dwolfhub/zxcvbn-python; + license = with lib.licenses; [ mit ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index ea7e7d0fb8e3..f3d8e746c22d 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper -, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmakeHook +, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake , withDocumentation ? false }: with stdenv.lib; let - baseVersion = "4.2"; + baseVersion = "4.3"; revision = "1"; in @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { version = "${baseVersion}.${revision}"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; - sha256 = "0f2slaf579q2anflf524lbhmpwrwy3hzjfxzs10n44r7s7yc4dr5"; + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + sha256 = "1bd4wxvp8b5imsmrbnn8rkiln38g74g2545x07pmihc8z51qh2h6"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; - nativeBuildInputs = [ qmakeHook makeQtWrapper makeWrapper ]; + nativeBuildInputs = [ qmake makeWrapper ]; doCheck = true; @@ -32,23 +32,12 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; preBuild = optional withDocumentation '' - ln -s ${qtbase}/share/doc $NIX_QT5_TMP/share + ln -s ${qtbase}/$qtDocPrefix $NIX_QT5_TMP/share ''; postInstall = '' - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/qtcreator.desktop" << __EOF__ - [Desktop Entry] - Exec=$out/bin/qtcreator - Name=Qt Creator - GenericName=Cross-platform IDE for Qt - Icon=QtProject-qtcreator.png - Terminal=false - Type=Application - Categories=Qt;Development;IDE; - __EOF__ - wrapQtProgram $out/bin/qtcreator + substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ + --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" ''; meta = { @@ -60,7 +49,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ maintainers.akaWolf maintainers.bbenoist ]; + maintainers = [ maintainers.akaWolf ]; platforms = platforms.all; }; } diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index 5aa839b3b5a8..477059cbb2c8 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -12,7 +12,7 @@ use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix fil { rEnv = super.rWrapper.override { - packages = with self.rPackages; [ + packages = with self.rPackages; [ devtools ggplot2 reshape2 @@ -55,28 +55,23 @@ available. ## RStudio -RStudio by default will not use the libraries installed like above. -You must override its R version with your custom R environment, and -set `useRPackages` to `true`, like below: +RStudio uses a standard set of packages and ignores any custom R +environments or installed packages you may have. To create a custom +environment, see `rstudioWrapper`, which functions similarly to +`rWrapper`: ```nix { packageOverrides = super: let self = super.pkgs; in { - rEnv = super.rWrapper.override { - packages = with self.rPackages; [ - devtools + rstudioEnv = super.rstudioWrapper.override { + packages = with self.rPackages; [ + dplyr ggplot2 reshape2 - yaml - optparse ]; }; - rstudioEnv = super.rstudio.override { - R = rEnv; - useRPackages = true; - }; }; } ``` @@ -106,4 +101,3 @@ nix-build test-evaluation.nix --dry-run ``` If this exits fine, the expression is ok. If not, you have to edit `default.nix` - diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix index 25a89d94ebaf..75ae872d77cd 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 93fc5a95482e..e87c0160ff31 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 7d5db5a744ac..5f72f46f2a06 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -4,1217 +4,1299 @@ # Rscript generate-r-packages.R bioc >new && mv new bioc-packages.nix { self, derive }: -let derive2 = derive { rVersion = "3.3"; }; +let derive2 = derive { rVersion = "3.4"; }; in with self; { - ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.2.2"; sha256="1jb88iwgp80i3ir1509chr7cjrjvk92a2d5hcdyl0vg9b0qxymbj"; depends=[ABAData gplots Rcpp]; }; - ABSSeq = derive2 { name="ABSSeq"; version="1.8.1"; sha256="099z80h097sf0slj3m29nfdmn1a5p3b0c7sgh1wfnm6dg6y7g26k"; depends=[limma locfit]; }; - ABarray = derive2 { name="ABarray"; version="1.40.0"; sha256="1qylnf9x8hihc9g64xpcb6jrphysmlg61aa14jd3afjak3xh52g4"; depends=[Biobase multtest]; }; - ACME = derive2 { name="ACME"; version="2.28.0"; sha256="0l56y211r9i50gksv7bm7jzdpk8b3dmc83vkpd5xfnbigdfn7al4"; depends=[Biobase BiocGenerics]; }; - ADaCGH2 = derive2 { name="ADaCGH2"; version="2.12.0"; sha256="0ndgqrg0d02yx9ykgqss9n21dfmldfmgx1hpfj9bmsblyf074gxm"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; }; - AGDEX = derive2 { name="AGDEX"; version="1.20.0"; sha256="0j1n9r8xagb5wrwhs7sdmvzg2vz9nwl9rf3214kq87hgwbkqn64m"; depends=[Biobase GSEABase]; }; - AIMS = derive2 { name="AIMS"; version="1.4.0"; sha256="1sq9gwsmvrq4fdhh5p9wwrikrhgpzw5pv07ncvmirpkhh0qi50l6"; depends=[Biobase e1071]; }; - ALDEx2 = derive2 { name="ALDEx2"; version="1.4.0"; sha256="0vhsfa7asfd8rwvi9z1g0wjsx91dldfhisa6a447wahb7m73cs4y"; depends=[GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; - ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.12.0"; sha256="1y79fll7jxw8h80h0zld0ys4an23f0f86phl8r40kbxlk002mpsq"; depends=[ARRmData]; }; - ASEB = derive2 { name="ASEB"; version="1.16.0"; sha256="0g2qsmqmsk1ka4mvf2qkh9pxdi0xm1n7csqhwsfbmlmv3za0zkdy"; depends=[]; }; - ASGSCA = derive2 { name="ASGSCA"; version="1.6.0"; sha256="0y1gq5xii5p5m0x19xmbs00hlc68zgw7nqnpxkk3jf8g995gvsvb"; depends=[MASS Matrix]; }; - ASSET = derive2 { name="ASSET"; version="1.10.0"; sha256="0yb1ps4cwb36zr6f3na3wp6v6l0wi1x1hqck4irzpwmlh7vazkqj"; depends=[MASS msm mvtnorm rmeta tmvnsim]; }; - ASSIGN = derive2 { name="ASSIGN"; version="1.8.0"; sha256="18pdw43ibbhqf25z1vcm34gpyxwxm96d28clqp8grq50zr60n9ii"; depends=[gplots msm Rlab]; }; - AffyCompatible = derive2 { name="AffyCompatible"; version="1.32.0"; sha256="15cg6jbmn7fq89cmmfkwykmxqrz8fvq59ip691ai93n18js8hzwf"; depends=[Biostrings RCurl XML]; }; - AffyExpress = derive2 { name="AffyExpress"; version="1.38.0"; sha256="1kq17y9864d94pvpw9hvrrl8s8fh9c7sd6cf4cykzj34729k6xm1"; depends=[affy limma]; }; - AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.18.0"; sha256="1p8j3286ix36sckzrw726q7nsxivcgxggkmp76vmrd6l0a67bz75"; depends=[affy]; }; - AffyTiling = derive2 { name="AffyTiling"; version="1.29.0"; sha256="0s5hrlzzxpyw52lpp7xq7vd5wds5ymph2gav4mhbbplvism7wnjz"; depends=[affxparser affy preprocessCore]; }; - AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.22.0"; sha256="1fkl1rnj9pj654pdjfs2k6r74yvpbm331gf9cdcsq3baafygv48z"; depends=[affy affycoretools Biobase limma preprocessCore]; }; - AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.10.2"; sha256="09p2z1vh7hq7fkfz49n7c8yfsji66p6dry5dmi6b6gm22fj5q7f2"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; }; - AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.6.2"; sha256="0fws4b2cln0i9fn5cnvggjk86y2mcbzvd1r5gfs8idjsm79mzaxn"; depends=[Biobase graph log4r rjson]; }; - AneuFinder = derive2 { name="AneuFinder"; version="1.0.3"; sha256="1a0kaxd65r9453cx8jw5y2zvybqxjlyw68x3vn0kvgz6pv84dwq1"; depends=[AneuFinderData BiocGenerics Biostrings cowplot doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 IRanges mclust preseqR ReorderCluster reshape2 Rsamtools S4Vectors]; }; - AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.34.4"; sha256="1k3gfsjrivc7467vg0h705hh4dvzgdhknz62j7zmfxm67qk9r8rq"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; }; - AnnotationForge = derive2 { name="AnnotationForge"; version="1.14.2"; sha256="1vkdd1qdv5g680ipw4vwjvn52xn66xpg6ngmwyknz77ckxnnpf4q"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors XML]; }; - AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.22.0"; sha256="1mc2y5ra8cmbmr10vnywx4hjdklrq3ihwl9m11g2vaqylwy7gh1c"; depends=[AnnotationDbi DBI]; }; - AnnotationHub = derive2 { name="AnnotationHub"; version="2.4.2"; sha256="1jjl1q5wgwfjhrm96c7wh0w8dpaxzqy9wjisy3pmg483vg0960y4"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; }; - AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.2.2"; sha256="1h9qljbyjg2qgxx9knwwyfiy0kw7wp2k281hxzq66c24idp3kkrl"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller Biostrings curl DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery httr IRanges jsonlite OrganismDbi rBiopaxParser Rsamtools RSQLite rtracklayer S4Vectors XML xml2]; }; - ArrayExpress = derive2 { name="ArrayExpress"; version="1.32.0"; sha256="08fcvhjmpr1fx90qyik12hc3yb3v6i4bvx62xadxm3m2zq52nmgl"; depends=[Biobase limma oligo XML]; }; - ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.22.1"; sha256="1p5flrkb8xwhw51fjr8zm27qgzm5v10s4kccjajiykiv0v301snh"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; }; - ArrayTV = derive2 { name="ArrayTV"; version="1.10.0"; sha256="0vh53xlg4yidmk39rxa0nw2cr12f6mld1vwiq6jba5j51szqm0aw"; depends=[DNAcopy foreach oligoClasses S4Vectors]; }; - ArrayTools = derive2 { name="ArrayTools"; version="1.32.0"; sha256="09cqab10xh052d0932p2y3svspn9lqi1zylkm7kglkksn7j27vih"; depends=[affy Biobase limma xtable]; }; - AtlasRDF = derive2 { name="AtlasRDF"; version="1.8.0"; sha256="1hw5i074cxkwqi4gkb3abqvl9q3wz93s5fvym28id63qsmpdssl9"; depends=[hash SPARQL]; }; - BAC = derive2 { name="BAC"; version="1.32.0"; sha256="07f8vcbdqlq4i0b6xqrlf6fr3zj8kbbjssc3pf9gy2s0kf1da6p0"; depends=[]; }; - BADER = derive2 { name="BADER"; version="1.10.0"; sha256="1ibcchi6qgd49m4kjz3dx8nc31nkg5bjw8g5w5ih05pki0gl4219"; depends=[]; }; - BAGS = derive2 { name="BAGS"; version="2.12.0"; sha256="1krnkamjxk71lxmm1n1zg8c2agv4w0xksz3gngpjjgzcybfnnn2i"; depends=[Biobase breastCancerVDX]; }; - BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.2.0"; sha256="0q8kj2gp0j6xrmgq1zd1230hddiy139qrdrz64m2nab5avn1fmlm"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; }; - BCRANK = derive2 { name="BCRANK"; version="1.34.0"; sha256="0y6dj26qd6a3jm7lp0jcdkpvdc4jq3gp11mvv1ix724zasb57k3d"; depends=[Biostrings]; }; - BEAT = derive2 { name="BEAT"; version="1.10.0"; sha256="0v7hl5v84bn2iik89j4wsq9vnnr392n4h2x2n8x9fdips2bjpq3w"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; }; - BEclear = derive2 { name="BEclear"; version="1.4.0"; sha256="17p4g4gh6vnnymsrhfh1xhjj4ahm0dilapnlh4mf883x9q8acbda"; depends=[Matrix snowfall]; }; - BGmix = derive2 { name="BGmix"; version="1.32.0"; sha256="1z0i0h43din2659yzzjx10bzmbak5nwrbgnab4ifq8hq6sgxyzg2"; depends=[KernSmooth]; }; - BHC = derive2 { name="BHC"; version="1.24.0"; sha256="0v906vnh5ph1srr1s5i4cbplkyqfim6fmxn0wp290jb0ilkp3ziv"; depends=[]; }; - BRAIN = derive2 { name="BRAIN"; version="1.18.0"; sha256="0iwz6yy164hwy1mqa869y6d1qs69ijx566dfff8mj0ym655pd3rz"; depends=[Biostrings lattice PolynomF]; }; - BSgenome = derive2 { name="BSgenome"; version="1.40.1"; sha256="0zmlzlcwairka59is5wmkh6knh6j4d328z9fsw3v91fx6gavjl2n"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; }; - BUS = derive2 { name="BUS"; version="1.28.0"; sha256="1z8l27rsz6zz8d0sga5pwn77iv5pwjgy3zjm8rcc6w3ql86za5m3"; depends=[infotheo minet]; }; - BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.0.0"; sha256="1rxncqjv7bw4f17ra00cq1xp9g72mlj1wc335g5ln7778wiax1g9"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; }; - BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.16.0"; sha256="1w1n9m5j9mcphvhsdj7dh8awvj1r10zna7dx13b2f280jmglg215"; depends=[RCurl RJSONIO]; }; - Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.8.0"; sha256="0216xhqj4ysscj4lr66vibijrac7kmkmxnqsqcwwxwzqsrk5gh7z"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; }; - BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.0.2"; sha256="1ryarcvb9cpmgc3yzd7qck46ff2xc417dhnfiwma3gy3gm2g4lyi"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; }; - BatchQC = derive2 { name="BatchQC"; version="1.0.22"; sha256="18c675pnah7xc089ny6h8zf4150d9f3ayf5wyxji0zdkvk2gnxjv"; depends=[corpcor d3heatmap ggvis gplots knitr limma matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; }; - BayesPeak = derive2 { name="BayesPeak"; version="1.24.0"; sha256="1m8c6akdi4mw1aj6482s9x8918m2a3d58s0fvvhpwzcppz7yjw33"; depends=[IRanges]; }; - BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.24.2"; sha256="04jviwwx4brbv19kzzw69vjqhprl8sgsghw71gxmp91c6i1pv5a2"; depends=[]; }; - BgeeDB = derive2 { name="BgeeDB"; version="1.0.3"; sha256="0g84hyirg3blbk6vxwjazgvpqzn384i6i01r7fxyqfdyfczprsfp"; depends=[Biobase data_table dplyr graph RCurl tidyr topGO]; }; - BiGGR = derive2 { name="BiGGR"; version="1.8.0"; sha256="15ffri2xdjwqxf7mn6mxk5h9c7m0xkq2di6nlvdwvapwm9945ldq"; depends=[hyperdraw hypergraph LIM rsbml stringr]; }; - BiRewire = derive2 { name="BiRewire"; version="3.2.1"; sha256="0y32y9vfs1sh7lwpkzpsmvgrll3x5l7y8xm3rcxalag17lkfax65"; depends=[igraph Matrix slam tsne]; }; - BiSeq = derive2 { name="BiSeq"; version="1.12.0"; sha256="14gr8dmkpm2wzdwlhrf9gkj9307cxpsap7a0a6bfip2zgrp82414"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; }; - BicARE = derive2 { name="BicARE"; version="1.30.0"; sha256="0faq2w40ikgrzcf39908icb0kph9sxbrplh86m12xwjwsbfwys47"; depends=[Biobase GSEABase multtest]; }; - BioMVCClass = derive2 { name="BioMVCClass"; version="1.40.0"; sha256="1249q8qpnva9a1wh1q8mi0x2yggbg5kmfkcv75wdbzmc82hkck42"; depends=[Biobase graph MVCClass Rgraphviz]; }; - BioNet = derive2 { name="BioNet"; version="1.32.0"; sha256="0zrfdlqfy18zk6z8a3slg8ksywknjbywr5r90ksyfqmvd869ick2"; depends=[AnnotationDbi Biobase graph igraph RBGL]; }; - BioQC = derive2 { name="BioQC"; version="1.0.0"; sha256="0zqpdfdjlsfm203kva8jfv09rwdwmr47daz1zjj06p1m82bwhg1v"; depends=[Biobase Rcpp]; }; - BioSeqClass = derive2 { name="BioSeqClass"; version="1.30.0"; sha256="1gcy27f9jim5b5q7979pz5m9rbphij0cln4mhvzwmkdwvi2ddyj8"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; }; - Biobase = derive2 { name="Biobase"; version="2.32.0"; sha256="0q4icv9n5rc2qfkv6k1wjhmfcpzcyr8f45m2z3xharbdv912kl1i"; depends=[BiocGenerics]; }; - BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.34.0"; sha256="1g4307x962ccvxdb421n3cksrrydglmp0hjhwlqlvfyddmkxmym0"; depends=[Biobase]; }; - BiocCheck = derive2 { name="BiocCheck"; version="1.8.2"; sha256="0bvkhxmr25nb0gkncifbc3x48i5zgls3737g3xais6jx16wd4q35"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; }; - BiocGenerics = derive2 { name="BiocGenerics"; version="0.18.0"; sha256="1jjp48vbph09w5bmc7368gjjywsa1lmzfybpiwlypr60b51vlkp6"; depends=[]; }; - BiocInstaller = derive2 { name="BiocInstaller"; version="1.22.3"; sha256="02qkfq6f2b7v9klri6d1nv21r54bywv1zd5x47ka0jhhp946cqpr"; depends=[]; }; - BiocParallel = derive2 { name="BiocParallel"; version="1.6.6"; sha256="1l39zmvhjlvlczrk5wal4y2s4g0b2kmaczgq5biah9qn45y474mw"; depends=[futile_logger snow]; }; - BiocStyle = derive2 { name="BiocStyle"; version="2.0.3"; sha256="06aaj0snj0y3bhhfh7lr949fi6cg7gz6fwf5drdm10ckbs4zp9dk"; depends=[]; }; - Biostrings = derive2 { name="Biostrings"; version="2.40.2"; sha256="153rfws5sdha324p1nv7jp75ip6ny0f62jzhqcvs46l85h3i8zgh"; depends=[BiocGenerics IRanges S4Vectors XVector]; }; - BitSeq = derive2 { name="BitSeq"; version="1.16.0"; sha256="1w585sk92053pwhw1h1qd421rr7s42cm8l8b6mm9cdvrf9095p9r"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; }; - BrainStars = derive2 { name="BrainStars"; version="1.16.0"; sha256="0y6l0c17xlm8q3nbhy21bk2mrbb0a660x6h19q14x01jm58gxwis"; depends=[Biobase RCurl RJSONIO]; }; - BridgeDbR = derive2 { name="BridgeDbR"; version="1.6.0"; sha256="0i5cqyvgyk9yjd8sc8mqrbw0dvkr24hkzlwvw3dn1zk553nwyg98"; depends=[RCurl rJava]; }; - BrowserViz = derive2 { name="BrowserViz"; version="1.4.0"; sha256="15j9cz4x9azn81myjnhckcil24ql3lbf83dfyl33qndszi9aqin4"; depends=[BiocGenerics httpuv jsonlite]; }; - BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.4.0"; sha256="1krl88q9z7y2f25p8c9ghr9iyrldgw64xa5za6dv35d7aiihgr9s"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; }; - BubbleTree = derive2 { name="BubbleTree"; version="2.2.2"; sha256="1gg1qxvs930lq7f2awpgmfq455306snzvyp4qxx1cm25yklvc0h6"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr rainbow RColorBrewer WriteXLS]; }; - BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.36.0"; sha256="19yxbw4g4l1gmn14yrr8lmd627f4br5gkgzxpif21gmjvq2iaal1"; depends=[]; }; - BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.36.0"; sha256="00jwgdk1y8is5256q664ph9rhsm4n1pqzrzrbabf9ahq2cm75f96"; depends=[BufferedMatrix]; }; - CAFE = derive2 { name="CAFE"; version="1.8.0"; sha256="13lf4xm55qr8knjh644gb9a610lxxn8b97lkcprjv4n7pbc4vqxp"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; }; - CAGEr = derive2 { name="CAGEr"; version="1.14.0"; sha256="14fkr47hq97wh6a9ig4k4gnybzwvcgf61yqqay4wma0aqi07cd3l"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; }; - CALIB = derive2 { name="CALIB"; version="1.38.0"; sha256="1fb5w9bhwd9n818mrahbv2i6bllgzq2lslzkcybyp3llbrckbigy"; depends=[limma]; }; - CAMERA = derive2 { name="CAMERA"; version="1.28.0"; sha256="02shq9gh2zpj2vkpzyslqzqa5q68lzz6hr07pklj5qldyvgxma52"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; - CAnD = derive2 { name="CAnD"; version="1.4.0"; sha256="1hmyi76bhjihj7313f9jxcpnmpzs8r59s2prc2in4p1xmj2v26ha"; depends=[ggplot2 reshape]; }; - CFAssay = derive2 { name="CFAssay"; version="1.6.0"; sha256="1ni4hss9m2i8cxjnsslp0s2rlpikd78w3c0x1590l0pqki5kbgbq"; depends=[]; }; - CGEN = derive2 { name="CGEN"; version="3.8.0"; sha256="1zandlkv5fnm4zk6xpakpqbadrc9bgd73716rlwmlxrqqbqhqzdb"; depends=[mvtnorm survival]; }; - CGHbase = derive2 { name="CGHbase"; version="1.32.0"; sha256="1v4h2zlfrb45y80skl3f2hqnzz8gk1k387m7sz2izx33dwfxgdpd"; depends=[Biobase marray]; }; - CGHcall = derive2 { name="CGHcall"; version="2.34.1"; sha256="0vpvlddkihsvhr03m6kvn72p3dl2qd9ncr46va05hrvhgqxr976k"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; - CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.26.0"; sha256="033ckmn74zhmmy3fi8sbrvb2zzxyzwzmkdyal7djm63rf8f52km1"; depends=[Biobase CGHbase CGHcall]; }; - CGHregions = derive2 { name="CGHregions"; version="1.30.0"; sha256="1lglc0wglckc6c24yzjjc9l86p7i37ag837n75d0h4lv8x1yfzik"; depends=[Biobase CGHbase]; }; - CHRONOS = derive2 { name="CHRONOS"; version="1.0.3"; sha256="1a87shlr88i0ampzayybpnhmzd9k9j05fylb2q6n4ykk1igq5mdy"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; }; - CINdex = derive2 { name="CINdex"; version="1.0.2"; sha256="1f2gqfj88dlihqw0ba24sygcg7sr7pm91hv7s2jylys3r1013r0f"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; - CMA = derive2 { name="CMA"; version="1.30.0"; sha256="03yirnn476as8ml97valczx2ad6a2g22mfp4czg1a3kblw4s3r3k"; depends=[Biobase]; }; - CNAnorm = derive2 { name="CNAnorm"; version="1.18.0"; sha256="0wi76k3qz5zvhqyhx2zabw7baj1pyzi0srynbdws3zdcc2qaks57"; depends=[DNAcopy]; }; - CNEr = derive2 { name="CNEr"; version="1.8.3"; sha256="169pbzm6k1kqy5214s7ka5snmbz98zi515nfjki2crnvr1fjjgxb"; depends=[BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges readr RSQLite rtracklayer S4Vectors XVector]; }; - CNORdt = derive2 { name="CNORdt"; version="1.14.0"; sha256="0gp0fb1rqjlcxf3sa1miq5abzcmqnpnp62lmb88a6ljkisi2hqnq"; depends=[abind CellNOptR]; }; - CNORfeeder = derive2 { name="CNORfeeder"; version="1.12.0"; sha256="19yggabd3m5afd1lbivhqninfif4ra88nlf3kv4qi6ixvbp685km"; depends=[CellNOptR graph]; }; - CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.14.0"; sha256="052hb464pq3sr513rmn8i12mz6xczfaqd9fax6djfwwdzprva315"; depends=[CellNOptR nloptr]; }; - CNORode = derive2 { name="CNORode"; version="1.14.0"; sha256="07xyqd51pz7ygvya4pvqpapglj82w4fwmra7c7r1yny7lcq7ylh6"; depends=[CellNOptR genalg]; }; - CNPBayes = derive2 { name="CNPBayes"; version="1.2.2"; sha256="1r1spk29zy7sc9kgyh1r2s7awc3hh5rl2c1p5chhik39lpdvmnbs"; depends=[BiocGenerics coda combinat GenomeInfoDb GenomicRanges gtools IRanges matrixStats RColorBrewer Rcpp S4Vectors SummarizedExperiment]; }; - CNTools = derive2 { name="CNTools"; version="1.28.0"; sha256="1iwgcphdcd5hxb4a61s30lgdp10s0435vkjz6cvhriimwq0bia4z"; depends=[genefilter]; }; - CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.2.2"; sha256="1mcdyib8gbg4w9m3r437z3a1az249pgad0db2w9cjk78hblxsi8d"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq openxlsx plyr Rsamtools S4Vectors]; }; - CNVrd2 = derive2 { name="CNVrd2"; version="1.10.2"; sha256="1r0fjb6br699rkkqpkpwi8s8bk9gv5lgck4xfgbydjllbbvmiq35"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; }; - CNVtools = derive2 { name="CNVtools"; version="1.66.0"; sha256="1v6y0j20d306snr3r8zrvk574ybcyg00pjxjya09r6srmci2bz74"; depends=[survival]; }; - CODEX = derive2 { name="CODEX"; version="1.4.0"; sha256="0cjfnryzxxhmhcbwsf34509b7srgxzlv4barrh8h8dyq2wfzzrqp"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools]; }; - COHCAP = derive2 { name="COHCAP"; version="1.10.0"; sha256="0qdwd7igd2aaqbwl5lpfrzw9qilz651b1p88794qmxwih7lmd6s5"; depends=[COHCAPanno WriteXLS]; }; - COMPASS = derive2 { name="COMPASS"; version="1.10.2"; sha256="1y9r6d9gd1fbvmxi3cvxcmz2b3n9gbncw6p2s8gjdzqj7i0nar7x"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; }; - CONFESS = derive2 { name="CONFESS"; version="1.0.2"; sha256="0xc8bns00980fwxdpbx48r6h7pddv2jiplw38svmsv497zcb2mny"; depends=[changepoint cluster contrast EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; }; - CORREP = derive2 { name="CORREP"; version="1.38.0"; sha256="16zhb5ajkh10azb2mkjbq6hmf6vqvxz3bzm4q424ir4azfqrd3qs"; depends=[e1071]; }; - COSNet = derive2 { name="COSNet"; version="1.6.0"; sha256="16gfbz6i5kmi8msgs0n5igybxz9kd4qyqv3p2dhr6n5nxzcqlhfw"; depends=[]; }; - CRISPRseek = derive2 { name="CRISPRseek"; version="1.12.0"; sha256="0kl20amakkyl3296zbfifi669ajm6i9x4hslav20ibzykgdwkscc"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; }; - CRImage = derive2 { name="CRImage"; version="1.20.0"; sha256="0061qhplzjwhdyqa1m4jzwfmpjlc24a87b5z3p7yr2vrihp66n7y"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; }; - CSAR = derive2 { name="CSAR"; version="1.24.0"; sha256="1m48njl4w0x7dyxqsfpflchclwy8nj07ldwckkh6522zdqmijb46"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - CSSP = derive2 { name="CSSP"; version="1.10.0"; sha256="0p2zs1ny4khmdpnbma53npb1lh4d8fh7szp2g8xhnilvmj744y1q"; depends=[]; }; - CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.14.0"; sha256="13nivw19hqaglg3v6pmqshwy2gnfjvigciw3wpl2791a22iaimn2"; depends=[AnnotationDbi limma qvalue]; }; - Cardinal = derive2 { name="Cardinal"; version="1.4.0"; sha256="0b4yb6sf27by2cjqy6cr4qrzs5ms83h210m1777vy33c7l4idlc7"; depends=[Biobase BiocGenerics irlba lattice ProtGenerics signal sp]; }; - Category = derive2 { name="Category"; version="2.38.0"; sha256="0c8px9ar589f3iqkbk9vfhwj30dpnxj81h8sfq20cl1cbmcx2a04"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter graph GSEABase Matrix RBGL RSQLite]; }; - CausalR = derive2 { name="CausalR"; version="1.4.3"; sha256="0307k6wnhar675l25xvwi0h97x6jpi64a5y874h8gqm2a5f0ybyl"; depends=[igraph]; }; - CellNOptR = derive2 { name="CellNOptR"; version="1.18.0"; sha256="0vqjyjn2248mpc1lc4p4sivf1lhvjiwvgyi0jifm9as2yqz2np7k"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; }; - CexoR = derive2 { name="CexoR"; version="1.10.0"; sha256="0g2ln2l3vlp86zymyf2bdlc3g2piwv65vaxb7w7wd8ngp06zqais"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; - ChAMP = derive2 { name="ChAMP"; version="1.10.0"; sha256="168z9lgfmhmymflfiml8g8kq6v695r94sfjhcng8wjkjn8dfbz6x"; depends=[bumphunter ChAMPdata DNAcopy doParallel GenomicRanges Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest impute isva limma marray minfi plyr preprocessCore quadprog qvalue RefFreeEWAS RPMM sva wateRmelon]; }; - ChIPComp = derive2 { name="ChIPComp"; version="1.2.0"; sha256="1l120wiq8xmvxa513vy4vgz34ddbh870djr776yvlcsrapxdl2iz"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; - ChIPQC = derive2 { name="ChIPQC"; version="1.8.9"; sha256="1d3rm2shs2f66dahllspb4sgnqzkds6ds0b1pp6jnrzkqhw07s5h"; 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.14.0"; sha256="1ilqkx21jsvj3x0im4fgp4kacspynqn234pjj6vpsx1981lvavxy"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; - ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.6.5"; sha256="0mncyh1ixsp4ngpc8flmkq1czi1kkgcy14ws556rymkx02v3c9pc"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR S4Vectors seqinr SummarizedExperiment VennDiagram]; }; - ChIPseeker = derive2 { name="ChIPseeker"; version="1.8.9"; sha256="0c2sm9zs377iq9fhpqlmqkfxxldww97yd0p1isbvmzz4m8j81nqb"; depends=[AnnotationDbi BiocGenerics boot DOSE dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; }; - ChIPseqR = derive2 { name="ChIPseqR"; version="1.26.0"; sha256="14c4hyzj19c4r8s74zfpkslv0nswmb2pqf0pihn43hycn1z9dhfi"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; - ChIPsim = derive2 { name="ChIPsim"; version="1.26.0"; sha256="0b992sv8xrrafrj30bmgmy1p7zb5qdw5kyjm23bmnk7jd9fck382"; depends=[Biostrings IRanges ShortRead XVector]; }; - ChemmineOB = derive2 { name="ChemmineOB"; version="1.10.2"; sha256="0jxnlwprn8r8mwqgkij6r4xrh94rxx8l44h1x3scplkphdwslxbk"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; - ChemmineR = derive2 { name="ChemmineR"; version="2.24.2"; sha256="02idsylmrpm2g20vbg81i12r6snp95lg0wbljcvrri91p09xb8xy"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; }; - Chicago = derive2 { name="Chicago"; version="1.0.4"; sha256="10dx3ka4habmgw1ykybpb3f93qn4xghy2mivmym904i8fgli28ys"; depends=[data_table Delaporte Hmisc MASS matrixStats]; }; - ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.26.0"; sha256="08zpng276f2dq56sgmzrjpf76plh9778f11liw01yx0c16ysxvj5"; depends=[annotate AnnotationDbi Biobase BiocGenerics IRanges rtracklayer]; }; - ClassifyR = derive2 { name="ClassifyR"; version="1.6.2"; sha256="1vz569b6prmndq4vw7g6xprx39ckprhi8bk0hn7gj62hv4drcalv"; depends=[Biobase BiocParallel locfit ROCR]; }; - Clomial = derive2 { name="Clomial"; version="1.8.0"; sha256="1vzzb1lxmzwihihi4241xhj3l0szllzvq70da6nsir4sqikfljdm"; depends=[matrixStats permute]; }; - Clonality = derive2 { name="Clonality"; version="1.20.0"; sha256="19fizpvnpzqcjlkyalg341c3v5w9ll7a6h3g2fqnq4ffn1n61a05"; depends=[DNAcopy]; }; - ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.0.3"; sha256="15pfs74k6ggp2v1ilbgzv5ab0w2rvq9f4igxzaq17krdakgq2krs"; depends=[pracma princurve RColorBrewer scatterplot3d]; }; - CoCiteStats = derive2 { name="CoCiteStats"; version="1.44.0"; sha256="1v22ld0iprp2c3hrr0vnfga2j1wvlay43p9g4mdbkiw7a6mxi21x"; depends=[AnnotationDbi org_Hs_eg_db]; }; - CoGAPS = derive2 { name="CoGAPS"; version="2.6.0"; sha256="0wy072pdjss5jzk5s9vm70y9xj6basqwhbiawllr716c7shcgmlb"; depends=[BH gplots RColorBrewer Rcpp]; }; - CoRegNet = derive2 { name="CoRegNet"; version="1.8.2"; sha256="19i9mnbqnfaglfljgngcqw63gg1nka4qcqrn1l6siqx15sfc77zb"; depends=[arules igraph shiny]; }; - CompGO = derive2 { name="CompGO"; version="1.8.1"; sha256="18vlkgrdsd2hq2w787zqg2b0hyqnxsjnx82nnk024fsirgrb5p6a"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; }; - ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.10.2"; sha256="0974qmzy93msn0xr1bz98bzmmq3pnc2y43116yv7vnaabqb2mml1"; depends=[circlize colorspace dendextend GetoptLong GlobalOptions RColorBrewer]; }; - ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.36.0"; sha256="1kb2h46hp20b2mij120nz8lmn8icbjm0ixchg0p4izhsj1g3l8s2"; depends=[ALL Biobase cluster]; }; - CopyNumber450k = derive2 { name="CopyNumber450k"; version="1.8.0"; sha256="0swjl0jh25ybnayx2q7kk6f01q1vjgplp5791im5r4q6djdisfay"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; }; - CopywriteR = derive2 { name="CopywriteR"; version="2.4.0"; sha256="0lr9m7b5hn3a983y6614905yhs86676x53d78i2bk0ndh7p5hah9"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; - CorMut = derive2 { name="CorMut"; version="1.14.0"; sha256="0asakw2bqwb8qp0zcwjachyx4w7kiw8fzwwa7sllfpa57m5m1v64"; depends=[igraph seqinr]; }; - Cormotif = derive2 { name="Cormotif"; version="1.18.0"; sha256="17ldh2yfiapka2clz6j71jqla6a7avas3hnnxpi0p0598vawp6x0"; depends=[affy limma]; }; - CountClust = derive2 { name="CountClust"; version="1.0.2"; sha256="192i2mvzsf558lsh2zshvgrm9q0a4xbhbgjjma1403v5cyrks8j1"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam]; }; - CoverageView = derive2 { name="CoverageView"; version="1.8.0"; sha256="1z4prmf20r2y872yjlj5zza31rn5dlcn95348gib04hwwba6d5ak"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; - CrispRVariants = derive2 { name="CrispRVariants"; version="1.0.2"; sha256="0y16rlk5yi2bsq28m0gw4sbr0w1rf4msyimgh28rh0imd63rmmwc"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; - DAPAR = derive2 { name="DAPAR"; version="1.4.8"; sha256="0m1jbv3l3qz972q53wylrybl872ldxm1sscyw8l8p7rcznk0q5fl"; depends=[Cairo cp4p doParallel foreach ggplot2 gplots impute imputeLCMD knitr lattice limma Matrix MSnbase norm pcaMethods png preprocessCore RColorBrewer reshape2 scales tmvtnorm XLConnect]; }; - DART = derive2 { name="DART"; version="1.20.0"; sha256="17x980mix19pb72yag6v0ingq64vn6hpynfpy4vcjrlhf9874pf6"; depends=[igraph]; }; - DASiR = derive2 { name="DASiR"; version="1.11.0"; sha256="078ligzx37pa3apd5xpjbf8pq0i1q7cz709767aalbwhbw2zf6ak"; depends=[Biostrings GenomicRanges IRanges XML]; }; - DBChIP = derive2 { name="DBChIP"; version="1.16.0"; sha256="1ilq33jpynz51ipsrjdbwcbl6h6a40l7d230mfqzq922347dd9ll"; depends=[DESeq edgeR]; }; - DChIPRep = derive2 { name="DChIPRep"; version="1.2.3"; sha256="10h2nwzd9z7c0nb1pw28zivq0fjpn7slzavhcwjfbynixhq2v84i"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; }; - DECIPHER = derive2 { name="DECIPHER"; version="2.0.2"; sha256="01plhsbw94pjvj9hc9css0zj7vp3xzad39sbwicx7rc0wpzk5knw"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; - DEDS = derive2 { name="DEDS"; version="1.46.0"; sha256="1pli8wgcgcsdv2r4gw9fygiv842iyi1a2w80axla98l53wjzljyw"; depends=[]; }; - DEFormats = derive2 { name="DEFormats"; version="1.0.2"; sha256="034kbmsjgdg916cgihjmaa237dx6xn24ndz50a5fxvjmpy8y99am"; depends=[checkmate DESeq2 edgeR GenomicRanges SummarizedExperiment]; }; - DEGraph = derive2 { name="DEGraph"; version="1.24.0"; sha256="1yarc6xr0swlc6q583kmm65vpp195v86h8gsidr9as2y6cm6ggww"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; }; - DEGreport = derive2 { name="DEGreport"; version="1.8.2"; sha256="1763z307m4k8h66xd7fjzljxggcgnf74k0rhdn40j83mbvcs4ar4"; depends=[BiocGenerics edgeR ggplot2 plyr]; }; - DEGseq = derive2 { name="DEGseq"; version="1.26.0"; sha256="04fxbnhgg6l674vr0xav0fl7vg8isqsnksvhanssarvaa1wqlrys"; depends=[qvalue samr]; }; - DESeq = derive2 { name="DESeq"; version="1.24.0"; sha256="01v5ikwpzxlp6f9p17qrvxbigxdhr0y24b9pjkh7n6ak2faqz5k7"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; }; - DESeq2 = derive2 { name="DESeq2"; version="1.12.4"; sha256="12h77f0dpi5xaj7aqf50kkyn6lq9j7bcsly1r0ffmyfcszrp1sfx"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; - DEXSeq = derive2 { name="DEXSeq"; version="1.18.4"; sha256="0dm9n0k26gg78v8qmnjly3mdigfjdp2lzaabyss8ilcbx81z64ic"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; - DFP = derive2 { name="DFP"; version="1.30.0"; sha256="0r5jjzmirnb4ngcb497yqg0fg1di1lcax2nlhbq27v1grb9001q9"; depends=[Biobase]; }; - DMRcaller = derive2 { name="DMRcaller"; version="1.4.2"; sha256="1s57yfjajjw9m5i15p3wywfc1dins22fwd18bly7a14yxb6qdyrk"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; - DMRcate = derive2 { name="DMRcate"; version="1.8.6"; sha256="0y1ysmavim5jc0mr1higk5sz9cg8bydav7zj2vn0p6da45ijjzqd"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi plyr S4Vectors]; }; - DMRforPairs = derive2 { name="DMRforPairs"; version="1.8.0"; sha256="1hjw3d3pwdg10bwkxwjcrcjxrcanyk13zbrhb50p0zhys5gksp78"; depends=[GenomicRanges Gviz R2HTML]; }; - DNABarcodes = derive2 { name="DNABarcodes"; version="1.2.2"; sha256="12qw1f3h4sb89fv5i9wr65hb86x84a6j5f3khwv8r9w0y6cp9llq"; depends=[BH Matrix Rcpp]; }; - DNAcopy = derive2 { name="DNAcopy"; version="1.46.0"; sha256="0vwv2mndfjpcjp4sybg75abc7xnx8zyw8zjk717k6xh8c33ymcip"; depends=[]; }; - DNAshapeR = derive2 { name="DNAshapeR"; version="1.0.2"; sha256="10x1331rmvdywsfd9agzir4lalv97bzwsa4vwifw7gizdbb3a5b8"; depends=[Biostrings fields GenomicRanges Rcpp]; }; - DOQTL = derive2 { name="DOQTL"; version="1.8.0"; sha256="0vlvvwhqg8vw45p6kp3p3nazvy9hkpr8wz8sxrvkdy6pyj4nwws1"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; - DOSE = derive2 { name="DOSE"; version="2.10.7"; sha256="1i3pfkvx7z1n6wzb4rnmdrnsjisfl0lnh29wl1k8kj1pgj1qbjy5"; depends=[AnnotationDbi DO_db ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; }; - DRIMSeq = derive2 { name="DRIMSeq"; version="1.0.2"; sha256="0gkv3xvsklnhsyiwzxwqvsj3nii9rqswfbvw7nxk209zrmmqkj7l"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges reshape2 S4Vectors]; }; - DSS = derive2 { name="DSS"; version="2.12.0"; sha256="0l9sgp198pdmd36hipsk3whf29d44qqay2d1k4mchsbq0qbmwsza"; depends=[Biobase bsseq]; }; - DTA = derive2 { name="DTA"; version="2.18.0"; sha256="0y7516d5yxijnl15wmvh8n5wyp3551ph5vzdm6i0yy0riaihqki8"; depends=[LSD scatterplot3d]; }; - DeMAND = derive2 { name="DeMAND"; version="1.2.1"; sha256="1haqr8mq77jvvkrc1pfs37i89fd3zjjdi59nnl9qlll1k761qh99"; depends=[KernSmooth]; }; - DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.14.0"; sha256="14bd8yd5zy4nagmcfr9r510410va9avcljaxxwjbbprp6chxm64h"; depends=[ggplot2 limSolve pcaMethods]; }; - DiffBind = derive2 { name="DiffBind"; version="2.0.9"; sha256="0sy1mb986mi1cxzy1ar5hmshzmqdw8082h725d0yiinymqbfc529"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; }; - DiffLogo = derive2 { name="DiffLogo"; version="1.2.1"; sha256="0dj8qkxx17sn1yh5wwcb4mmghsigicfz5kb5sldk3j988f0pnbcj"; depends=[cba]; }; - DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.14.0"; sha256="14xr8g3bzhni780pafi2jm53fd124xw9rnvdanhqzwqk5l8mrqzn"; depends=[BiocGenerics IRanges S4Vectors]; }; - DriverNet = derive2 { name="DriverNet"; version="1.12.0"; sha256="1xwvryjf98hi4l5g4qwg8ilw3kw206r9ipn4dy5jv5kzgirp3p4f"; depends=[]; }; - DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.12.0"; sha256="1bj86zlcp73km49zqv8ijlq9zq7bjnmf2bhcdhrcf0rixph52q62"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; }; - DupChecker = derive2 { name="DupChecker"; version="1.10.2"; sha256="0npx294zvpypk23z0h2pmyazc7w8d5wywl6psyr2m2vhmcrax5xl"; depends=[R_utils RCurl]; }; - DynDoc = derive2 { name="DynDoc"; version="1.50.0"; sha256="0j00kjlv1h9vx5jmq7cwj2vwnif52rqcs4mb0j9dv1mndqcdf2p6"; depends=[]; }; - EBImage = derive2 { name="EBImage"; version="4.14.2"; sha256="1dvjnkzjfsshm15jxcmzs82jarxqx9dr8z5kafyxjklh2arivwgx"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; }; - EBSEA = derive2 { name="EBSEA"; version="1.0.0"; sha256="11wgdgrqv83bhlngl9wqrazydsjvawnwrdb9b82h50hd5h080vvh"; depends=[edgeR gtools limma]; }; - EBSeq = derive2 { name="EBSeq"; version="1.12.0"; sha256="0yqrrabx78ml8na1ppwg6b0a47pc2c488c5pfavyi75v04k708yp"; depends=[blockmodeling gplots testthat]; }; - EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.6.0"; sha256="001swq9m414mk6r8j5iglfbp1cw3xp165hf68jk2dy9sz0p0l25j"; depends=[EBSeq]; }; - EBarrays = derive2 { name="EBarrays"; version="2.36.0"; sha256="1jvfk0f4rr8f502vhgh4fq5x7m9823xl3ncyl032rdsrwbildbxp"; depends=[Biobase cluster lattice]; }; - EBcoexpress = derive2 { name="EBcoexpress"; version="1.16.0"; sha256="069smdyv8bpd5v2nz2i67h6vqpfdf5r9n5s2cyk7g136a0p29zca"; depends=[EBarrays mclust minqa]; }; - EDASeq = derive2 { name="EDASeq"; version="2.6.2"; sha256="05infzrah41xh3mzbckh2g9hywbn3xqwx3jjzvyxs3q5z209av91"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; }; - EDDA = derive2 { name="EDDA"; version="1.10.0"; sha256="10rlahznhva9b6f4isb604a7di753md6l260z987291vp70m0pyf"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; }; - EGAD = derive2 { name="EGAD"; version="1.0.4"; sha256="0ysn42wpji4nphdwdy2j25v137rlxpyvg2wqifqm0vh09m7mgwr5"; depends=[arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; }; - EGSEA = derive2 { name="EGSEA"; version="1.0.3"; sha256="1f7fsh3kzhq3l55lczxmv724hwy6pq4gb1rnhc4pkqandl7vvsig"; depends=[AnnotationDbi Biobase edgeR EGSEAdata gage ggplot2 globaltest gplots GSVA HTMLUtils hwriter limma org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview safe stringi topGO]; }; - ELBOW = derive2 { name="ELBOW"; version="1.8.0"; sha256="0133j9zdmpy22l4672dhz8y1i2hi8a1izxakrvd0ldbmg502jscw"; depends=[]; }; - ELMER = derive2 { name="ELMER"; version="1.4.2"; sha256="0nbbh2rwynr28y2rmsd0nmpc5b22x5bbvhgrh447w9znl05smqx6"; depends=[BiocGenerics ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi reshape S4Vectors]; }; - EMDomics = derive2 { name="EMDomics"; version="2.2.2"; sha256="0qdachnnhvwyh9v3s9isd6yyksxi8gs56nf29v5rfw7429v2wgmf"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; - ENCODExplorer = derive2 { name="ENCODExplorer"; version="1.4.3"; sha256="0khc5qfwjl2adqgayjz5yhg0g3jw0blkqxqih9jxkccrw83b28b6"; depends=[jsonlite RCurl RSQLite]; }; - ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.20.0"; sha256="012f7scrmnxqjg52gjhswrrxbvagsdxmiwbxs4n6358yf214wr2h"; depends=[rJava XML]; }; - ENmix = derive2 { name="ENmix"; version="1.8.0"; sha256="01r332wngrvzg5daspaf6dqkwanyc40mv2k6qc8iz2wvh3vdpg4q"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; }; - EWCE = derive2 { name="EWCE"; version="1.0.2"; sha256="1qcqadqfjmhr96mnd86wx9x5ncc6pm593kcqx8wnlgkkdzr6flq5"; depends=[biomaRt ggplot2 reshape2]; }; - EasyqpcR = derive2 { name="EasyqpcR"; version="1.14.0"; sha256="1vnh0g87x52qlrqk1nwfcaa4r7nb7mr6xdzrxqsivrx13k5d070q"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; }; - EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.0.2"; sha256="183zn477pjrj71d5b3dnkf4mgvjb8razply0lrpq8ickvqn3z3s6"; depends=[]; }; - EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.2.2"; sha256="1fky5gb6ix2y0xfn8whwsrw793msmcrf5bjlpzk1vmvyyc5pvc9a"; depends=[ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats]; }; - EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.2.3"; sha256="0l1zxb5425li1jzhqd0x1dwwhl92g2d5j5jrms2bpl70klyy2af1"; depends=[AnnotationDbi Biobase biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; }; - ExiMiR = derive2 { name="ExiMiR"; version="2.14.0"; sha256="0krk4dgnla63dmn5r3qy5nmq0rkmff26qdhw7rilmh3yb95ri7lx"; depends=[affy affyio Biobase limma preprocessCore]; }; - ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.0.3"; sha256="1yvvqhd2d7lz8fwfrag68xn7sndhag89dnj37w5zwg0hfippyas9"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; }; - ExpressionView = derive2 { name="ExpressionView"; version="1.24.0"; sha256="1sirhz91xfcbsya2s9y565hffrsjbyd4bippn92x5c8y4qhyw11z"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; }; - FEM = derive2 { name="FEM"; version="2.8.0"; sha256="1jgy0k5a7h46vda32a2m077w4z1gif3vvxxch7qp7hx982y4xyjy"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; }; - FGNet = derive2 { name="FGNet"; version="3.6.2"; sha256="1b4v0hx1xrzi7zyah8wb983akr9jl3f4xqr9b5yy8cv72bqvch0x"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; - FISHalyseR = derive2 { name="FISHalyseR"; version="1.6.2"; sha256="1j4gsmzzkbz0mifqqrfgaxxrvprc1rp62dhv897wx0yhn893fynv"; depends=[abind EBImage]; }; - FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.8.0"; sha256="02y0jx0lqsikh947cs6byjahbi6yxplwv6gqfrdv2imd47g38309"; depends=[fda MASS]; }; - FamAgg = derive2 { name="FamAgg"; version="1.0.2"; sha256="17v6jy03f3x6a09f5fdqkw0gd4h5ipl1bcsqzq39vvkmrvdr6q09"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; - FindMyFriends = derive2 { name="FindMyFriends"; version="1.2.2"; sha256="18wz62sr4nf3df165bik57khz7wq5xab6s6b100ml7crn912a7li"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; }; - FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.4.0"; sha256="1rixa090sdbv8crfccygaq3lhx5171fqaf7vn8dsbawfqczzmyam"; depends=[jsonlite RCurl XML]; }; - FlowSOM = derive2 { name="FlowSOM"; version="1.4.0"; sha256="05rsy2hdjv4fr9bv1b8phzdj0xw4ilgk8m3dgqlnlm6m8sylhnk2"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; }; - FourCSeq = derive2 { name="FourCSeq"; version="1.6.2"; sha256="13c23ndssfhzcqv8wl37zmswajyk4x08aj0v562j0zcqnqcrscg1"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; }; - FunciSNP = derive2 { name="FunciSNP"; version="1.14.0"; sha256="197v7kf6xl3b4jkyjpzgy1z49dh4dbrf8nsfa9mlzi114l5kbyy8"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; - GENE_E = derive2 { name="GENE.E"; version="1.12.2"; sha256="0ri377knly3cwlif64c68rsk8f1fjdfx1abq55j3lr30pxyphc97"; depends=[RCurl rhdf5]; }; - GENESIS = derive2 { name="GENESIS"; version="2.2.7"; sha256="1dllw2kjrnmp61xakxavwbrgr1rfrad7hs2msbc8k6axw4n90hl4"; depends=[Biobase gdsfmt graph GWASTools SeqArray SeqVarTools]; }; - GEOmetadb = derive2 { name="GEOmetadb"; version="1.32.2"; sha256="1pr2zl4814b5zpzn0msyy2hwf39kv03ci3fi5113xlpbiy1rj9ch"; depends=[GEOquery RSQLite]; }; - GEOquery = derive2 { name="GEOquery"; version="2.38.4"; sha256="1ckgxd7h8009h0bnmvggpd6yppp461zw2bcqkda5hiwys8mfb78x"; depends=[Biobase httr RCurl XML]; }; - GEOsearch = derive2 { name="GEOsearch"; version="1.2.2"; sha256="0fdkf590kvjscvvjg2lfkz7bw7jg2vpay1z99l9yrnpgaqv146vl"; depends=[org_Hs_eg_db org_Mm_eg_db]; }; - GEOsubmission = derive2 { name="GEOsubmission"; version="1.24.0"; sha256="0fvdps5ly55j442lisg6hj96wn6821427xc1bdfyc7ri1ds4fxgy"; depends=[affy Biobase]; }; - GEWIST = derive2 { name="GEWIST"; version="1.16.0"; sha256="1qrs0apb27isv8aabv64ym1rr4zvv201v43zhmgdjdlbmwcfyjky"; depends=[car]; }; - GGBase = derive2 { name="GGBase"; version="3.34.0"; sha256="1nbqpfdpi3bh26wqmvrrfk8khpy6sgsrvkj7b193ycbdnsjv2iqk"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; }; - GGtools = derive2 { name="GGtools"; version="5.8.0"; sha256="1zrl22p5cfhw6w0034176js8y0rzmdhdias1acin7dwbw588rp5l"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; }; - GLAD = derive2 { name="GLAD"; version="2.36.0"; sha256="09wpmh5mahvg16hfl8h5rqvrxpc81df4k7z5wv93s0p41kx6kil7"; depends=[]; }; - GMRP = derive2 { name="GMRP"; version="1.0.0"; sha256="15rh0sy29v91c0s91vjfmci64ar6x58lfm3ixgwm6z7lf0xhbrl3"; depends=[diagram GenomicRanges plotrix]; }; - GOFunction = derive2 { name="GOFunction"; version="1.20.0"; sha256="06y42nydbc19z5kzp80iy3b3xhq0wmk2mfsp9chxvgrc54a21ynj"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; }; - GOSemSim = derive2 { name="GOSemSim"; version="1.30.3"; sha256="15g7r0cccfphm32pw9bmk28k54vl21b0jczx8nr1z2q5kgg04ca8"; depends=[AnnotationDbi GO_db Rcpp]; }; - GOSim = derive2 { name="GOSim"; version="1.10.0"; sha256="03s79r03f2nv6blf3qrvfazx89jiyyn9bm41b53rig1lpadp2fzh"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; }; - GOTHiC = derive2 { name="GOTHiC"; version="1.8.1"; sha256="0s4jsk4j2yxh5mqvvni5c606hyfqjgh9p7g4rssh9gq9saglpgni"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; - GOexpress = derive2 { name="GOexpress"; version="1.6.1"; sha256="09m0g03f0s9fnp1c1h1d1mv0dw73msbifpdf8ldyqcx75c3xdx6k"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer stringr VennDiagram]; }; - GOstats = derive2 { name="GOstats"; version="2.38.1"; sha256="1hhw6vqr8f3g4jzq0v8f2za0r1h117j5s6av87zxs41cv7dq1wb3"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL]; }; - GOsummaries = derive2 { name="GOsummaries"; version="2.6.0"; sha256="0skhvpr80jgxfzk1c7jf2206jnxs44v6r2j39l4xj4llcfjf46b1"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; }; - GRENITS = derive2 { name="GRENITS"; version="1.24.0"; sha256="1qhjqpjdasql1i8njnq431qp8zqklb1xh170lqlwjcfhhmnprzai"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; - GSALightning = derive2 { name="GSALightning"; version="1.0.2"; sha256="1ahcm9iikql1d73ng7irs37rwp99q1jp5g2nbxdk7436f7hglcgv"; depends=[data_table Matrix]; }; - GSAR = derive2 { name="GSAR"; version="1.6.0"; sha256="1q3pjwf66mi3kws88whw72xfh5xskvw55g7wiq3dp0kr0r45d5am"; depends=[igraph]; }; - GSCA = derive2 { name="GSCA"; version="2.2.0"; sha256="0vq94s36yq591lgva3v1317kh6dpq3wvy38ayxab0zmxzqhnighb"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; }; - GSEABase = derive2 { name="GSEABase"; version="1.34.1"; sha256="1mvgja8malrnbzfakzjl5mmi7g080kj8zgxwc5964hcmn33i937j"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; }; - GSEAlm = derive2 { name="GSEAlm"; version="1.32.0"; sha256="0axqalz4ixjsv91ga3sc9f9f5ncm8lr5fk6v40ng58nzb6xsk0sc"; depends=[Biobase]; }; - GSRI = derive2 { name="GSRI"; version="2.20.0"; sha256="0mwv7riwgg0jc06skna8cph7q7ry1a9k7alrhxxgysd9458m8v9l"; depends=[Biobase fdrtool genefilter GSEABase les]; }; - GSReg = derive2 { name="GSReg"; version="1.6.0"; sha256="1wibhyqi2kfbi5fqmx867lxb4dw8ymfk6xkg0vjws5d2a5r5yf1d"; depends=[]; }; - GSVA = derive2 { name="GSVA"; version="1.20.0"; sha256="1n3hi48p7p5alzlw4rlxk7mp5bp3ybkf76a8b2swa7ifq52jiin2"; depends=[Biobase BiocGenerics GSEABase]; }; - GUIDEseq = derive2 { name="GUIDEseq"; version="1.2.1"; sha256="07ihkg1am7mfwc6f51zwpmm41sh1a3fsdkbdwk0p396f3069lva7"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges IRanges matrixStats Rsamtools S4Vectors]; }; - GWASTools = derive2 { name="GWASTools"; version="1.18.0"; sha256="07rxyl5b32ydnywx6z9ic156s1q6nn8wqx096pknyawi7wi9k3ad"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf4 quantsmooth RSQLite sandwich survival]; }; - GenRank = derive2 { name="GenRank"; version="1.0.2"; sha256="0dipv90wskcymvkmdw0313w5asz6wcnpx4nph3ab7kidgii6d8gp"; depends=[matrixStats reshape2 survcomp]; }; - GenVisR = derive2 { name="GenVisR"; version="1.0.4"; sha256="1593xfyk9pz92ndxgjr0ma4b1q7kjkx03a9kln4y16y2rxvfm4zh"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; }; - GeneAnswers = derive2 { name="GeneAnswers"; version="2.14.0"; sha256="17zfm2zm52m6x4kc07d9n06xyfw4ym7rk6d8z4mgxrmns7v83dkw"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; }; - GeneBreak = derive2 { name="GeneBreak"; version="1.2.0"; sha256="1k9f4vdg09h2bxs5gn7fjc6vm9zdq3afdcjl0bv33m6703k50k6i"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; - GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.18.0"; sha256="055n0m0nwblasr6rwd28zpq6iranyymm403dd5bqi4kq6zg6ld4a"; depends=[Biobase PGSEA]; }; - GeneGA = derive2 { name="GeneGA"; version="1.22.0"; sha256="1p77yncy6frzqyc22yhaqx63j8xkv4idfqysald7bc8n8cvk7x03"; depends=[hash seqinr]; }; - GeneMeta = derive2 { name="GeneMeta"; version="1.44.0"; sha256="1l1ldj01a7p0ygb055kfbl2j2cj0y9xgalbq9fdn07j21jxf6wxl"; depends=[Biobase genefilter]; }; - GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.14.4"; sha256="0560351z8f7rv7jn1ff88y1z9lyn7hd53zghfkhy2mbkjwvbn3lw"; depends=[graph plyr Rcpp]; }; - GeneOverlap = derive2 { name="GeneOverlap"; version="1.8.0"; sha256="0dnp91knca25l5q62ga36p04kwb7a1drmzjcbyvhkxxfd6d7h6jh"; depends=[gplots RColorBrewer]; }; - GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.28.0"; sha256="0z2m96i7rv9vffw5h70lgkq9b6wj8m0p8n6nl184rkpq1d14fhk3"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; }; - GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.16.0"; sha256="1kj1xdscqhi84x89ygw9sc8yr991y19bc932ynhblhjrxs1fxrjb"; depends=[Biobase limma MASS survival]; }; - GeneSelector = derive2 { name="GeneSelector"; version="2.22.0"; sha256="1ykmmzr2cal43n72547ywl5w871pfxilhxnqdl2ki0dxss9l8cap"; depends=[Biobase limma multtest samr siggenes]; }; - GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.40.0"; sha256="17r1bqa0ay6d5dyihgxwv4i1mc12980dkc5j995c5qkpcg0f3zv2"; depends=[gmodels gtools mvtnorm]; }; - GeneticsPed = derive2 { name="GeneticsPed"; version="1.34.0"; sha256="04lgnrpx8zd1rz7zdsyvjbvnlg6l4r4rbf82xdr5bhrn9805hw7c"; depends=[gdata genetics MASS]; }; - GenoGAM = derive2 { name="GenoGAM"; version="1.0.3"; sha256="0ag9v97hdk7vi0052ksapvsgh61w6i5g4fp9lygyfvb5kbzh6k5n"; depends=[BiocParallel data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; }; - GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.32.0"; sha256="17w40q7ykmc01xgr72z2j5yk3gyvf5y62s17n0yk4vlary01g9iv"; depends=[biomaRt]; }; - GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.8.7"; sha256="1x96468bbjx7z3ikp1dgr2krnz9pwx86vmssfbfrsikaxfs4q829"; depends=[BiocGenerics IRanges S4Vectors]; }; - GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.8.4"; sha256="1cccvalmm83ilk1kpq31ll8kdy9xclsr4pm4mlcc7bmp0rwkd2p2"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; - GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.24.5"; sha256="17qpisdgqyjz2mnaiwc4dx7dg11pwq3mkvmkah9zn07g9rhh8f7p"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; - GenomicFiles = derive2 { name="GenomicFiles"; version="1.8.0"; sha256="1blvi0817c2926msjiggmrizchqzmsa2ksvfl8yg13a45s52rkil"; depends=[Biobase BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; - GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.6.2"; sha256="1cm2zp9l9jdb6bgpq1sx799j24gs077ysvg02yn4qvag0p0xf1h5"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; - GenomicRanges = derive2 { name="GenomicRanges"; version="1.24.3"; sha256="098a34hfgb5z120v6wpl5nv8v61nm65yg6xq0j7i9bigvxr7apg2"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; - GenomicTuples = derive2 { name="GenomicTuples"; version="1.6.2"; sha256="04pq3f474lbhdni2hx942qs1wbsbq4454pgnr75bfj7q94rbx0fr"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; - Genominator = derive2 { name="Genominator"; version="1.26.0"; sha256="1d4j1k2m19w7bh41xjpl898yxhd05b2ja2ysrrpnincigdzsrczk"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; }; - Glimma = derive2 { name="Glimma"; version="1.0.0"; sha256="147bjpll9rjz77wdhmn75pjxv8znihix5f5sm539m897inviabcm"; depends=[DESeq2 edgeR]; }; - GlobalAncova = derive2 { name="GlobalAncova"; version="3.40.0"; sha256="0ir53i68zvb9vjvsiwqhqgppkk6r6jm6ydjcff6264mhp5pbmjsf"; depends=[annotate AnnotationDbi corpcor globaltest]; }; - GoogleGenomics = derive2 { name="GoogleGenomics"; version="1.4.2"; sha256="03y56akzkz7dy6868kcy03gqsnsjl7si5cfsx972m8wrhx5wa466"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; }; - GraphAT = derive2 { name="GraphAT"; version="1.44.0"; sha256="1rb4zvlbljpvb0091j0phv6fdcpvk3f9b77dg3x2jcj321kbcgd2"; depends=[graph MCMCpack]; }; - GraphAlignment = derive2 { name="GraphAlignment"; version="1.36.0"; sha256="1nayinwnpqsn66idxyliwi6md7c7w3j9bdn4b049sqk45yq25v05"; depends=[]; }; - GraphPAC = derive2 { name="GraphPAC"; version="1.14.0"; sha256="14ia19g7k05r7hljybl8ipqh6bk2yc04l7vq3j30fxq9ahjx0l5h"; depends=[igraph iPAC RMallow TSP]; }; - GreyListChIP = derive2 { name="GreyListChIP"; version="1.4.1"; sha256="18fxm3mns373ljdsc6aqm9k3m6088fhg095bg6gamyd99dyf7y9p"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; - Guitar = derive2 { name="Guitar"; version="1.10.0"; sha256="1mgswk1gr2y5ilj8v07rincibg941i4rbmk8nd73xvw2pg83gvx8"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; }; - Gviz = derive2 { name="Gviz"; version="1.16.5"; sha256="0r83ml7jfpdn2286wh1614arla3ih5nqvjjnsb3n9883j2prakr4"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; - HCsnip = derive2 { name="HCsnip"; version="1.12.0"; sha256="11sfhf931xnk6qmxmfiybfs5izgr932r3r0xxbbm96xbm6xxk7n5"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; }; - HDF5Array = derive2 { name="HDF5Array"; version="1.0.2"; sha256="0df0xyn8f58vycyakx1xsv0jz43mkhbr3d9bb2cc0p5082hwk65a"; depends=[BiocGenerics IRanges rhdf5 S4Vectors]; }; - HDTD = derive2 { name="HDTD"; version="1.6.0"; sha256="0838l4fnfany068fz20vrcr4m4yb6di88i0whn8hyfjm8ws21461"; depends=[]; }; - HELP = derive2 { name="HELP"; version="1.30.0"; sha256="0aql69piqrfgav9fh3ff1byamd3c9k8nil3a09k4affdxl3nhqah"; depends=[Biobase]; }; - HEM = derive2 { name="HEM"; version="1.44.0"; sha256="1fj92nzkng5cgy2wkifjmcpn2lfqw3ginyxzs36pxryz12v8yg2f"; depends=[Biobase]; }; - HIBAG = derive2 { name="HIBAG"; version="1.8.3"; sha256="0s6vcx03kzxyqddzr7h3qhf6m9ax7l9n9jx9amk2f046wfhy4z7d"; depends=[]; }; - HMMcopy = derive2 { name="HMMcopy"; version="1.14.0"; sha256="0ac2d8byinx6li1r622k960lpyihgf5xp0jdifvl5dmn1va0gmdl"; depends=[geneplotter IRanges]; }; - HTSFilter = derive2 { name="HTSFilter"; version="1.12.0"; sha256="03bd29q6irgq6nqfp1grq3dzv1x1pz5bl2sx1z4714i75i8wildw"; depends=[Biobase DESeq DESeq2 edgeR]; }; - HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.24.0"; sha256="0cmcihsqxacvxf4nan48i1f22bzz4g0j2vcn0vc3r4jirznxcjs6"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; }; - HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.2.0"; sha256="0v5m8ix7j6db2fa461w4c50rn7xp415gaa3dl78hwbhns30f0il0"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; }; - HTqPCR = derive2 { name="HTqPCR"; version="1.26.0"; sha256="0lk6qrq6in9y8xg1656m1j9mrwfajbadhr2ry7lyp8wx5acai7nz"; depends=[affy Biobase gplots limma RColorBrewer]; }; - Harman = derive2 { name="Harman"; version="1.0.2"; sha256="0v7szj4xh8xr4zg3p0x1gf7b278a6y8blz962ygj77pnccmqikf6"; depends=[Rcpp]; }; - Harshlight = derive2 { name="Harshlight"; version="1.44.0"; sha256="10dq78la4kby2zay69l3s9plrd271w5f8kmkmwxmscfqbv0zhi59"; depends=[affy altcdfenvs Biobase]; }; - Heatplus = derive2 { name="Heatplus"; version="2.18.0"; sha256="13rzsahx3a4w2s1v99kz4lg6sgll2md9ibf2jz7dkk8gafbn1yri"; depends=[RColorBrewer]; }; - HiTC = derive2 { name="HiTC"; version="1.16.0"; sha256="1rk3q4s4kpcbkm23ccw61p1isvrim3y3dhvi1kcs6yqbb3lg1nvl"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; - HilbertCurve = derive2 { name="HilbertCurve"; version="1.2.2"; sha256="0gjv39l5sxsllc3c620ndnarvl4x2fd3i86pwy4wqy5riq5xxaph"; depends=[circlize GenomicRanges HilbertVis IRanges png]; }; - HilbertVis = derive2 { name="HilbertVis"; version="1.30.0"; sha256="0przsvy6zqs4chwn0m625h421zi7dpapma7wib6v8i5lf85d4d2a"; depends=[lattice]; }; - HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.30.0"; sha256="0w2n511dkazajbm80kq9paypwphryf61x2rpfprc5va5wxhs36x8"; depends=[HilbertVis]; }; - HybridMTest = derive2 { name="HybridMTest"; version="1.16.0"; sha256="0g2cknzbj043m8gm8qps0mdnamcqg08pd40hm7fmz70piw7sjw3f"; depends=[Biobase fdrtool MASS survival]; }; - IHW = derive2 { name="IHW"; version="1.0.2"; sha256="1drhgvgl6gfzi0ii5dw86mw8bm6f008v07nbzn3865vq4l99kmm1"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; - IMPCdata = derive2 { name="IMPCdata"; version="1.6.0"; sha256="155633pgv06qqch0x8isczm7i5w4azg99vfzbbx31xh7y0dawb8y"; depends=[rjson]; }; - INPower = derive2 { name="INPower"; version="1.8.0"; sha256="12xixf4wzsa5fbcp7prbj7lg0aswlcqcx6f6q2y6x34g7jyh047n"; depends=[mvtnorm]; }; - INSPEcT = derive2 { name="INSPEcT"; version="1.2.2"; sha256="1bmd1f662nf6s2aw2lg7pfq2d5rqbmpj7zp7wp6abc94gm8vsxzx"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; }; - IONiseR = derive2 { name="IONiseR"; version="1.2.3"; sha256="1dwdkqf493c19p5b3phbj4g364h0aj32szjq3n3h3rn8aw0cjs87"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; }; - IPPD = derive2 { name="IPPD"; version="1.20.0"; sha256="030pyqdmlqmriwcm3bikk0wf4qjhkrdjb306csr7327iqq4kbm0d"; depends=[bitops digest MASS Matrix XML]; }; - IRanges = derive2 { name="IRanges"; version="2.6.1"; sha256="06pyam3bjjfw2m3l86rda503lsz2jcg645lcnhvrz6qi0nv359yg"; depends=[BiocGenerics S4Vectors]; }; - ISoLDE = derive2 { name="ISoLDE"; version="1.0.2"; sha256="1nc3r8y49fgvgx0vj2m79cd5ywnm93a6vqy20cr1llg4fpnmdlb4"; depends=[]; }; - ITALICS = derive2 { name="ITALICS"; version="2.32.0"; sha256="18afl5gkrzh89wzmlpsfjzcm32yl1521dm2vrdhmy1kjjsy1g1f6"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; }; - IVAS = derive2 { name="IVAS"; version="1.4.0"; sha256="10q5wmvwi10f81a0gss0shjv947yfghib1pk26cj04icr96v6b6f"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; }; - Icens = derive2 { name="Icens"; version="1.44.0"; sha256="0aw92cq446dpwi6nnck72xvk67jwfr829klzbn9a6b0z53qmlb1w"; depends=[survival]; }; - IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.16.0"; sha256="1q7s0zy9bx1ypca232yqj25k8g3w33078dp5ik48j1ga71bp1xwk"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; }; - IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.20.0"; sha256="1z67dj5qil8l2acryqvax6v1qp0z4jnf1iiy1l87j09kyn2949p4"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; }; - IdeoViz = derive2 { name="IdeoViz"; version="1.6.0"; sha256="111vqwx7cxi419jzcz3yqhzv4436flj1h839rimn5vhlk9dlq6zr"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; }; - Imetagene = derive2 { name="Imetagene"; version="1.2.2"; sha256="1bfqjq3c62j5hirx95bi03q0mxnizgqsm6mf6snfd8b33752fy0r"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; }; - ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.0.2"; sha256="08nfnvchbimhdrywcf8bsghml5pwhb2ys2jyqh0nvmj9g19khhg5"; depends=[Biobase data_table ggplot2 gplots gtools pheatmap RCurl reshape2 Rlabkey scales]; }; - InPAS = derive2 { name="InPAS"; version="1.4.4"; sha256="0939f6ag20im9n8vq04k2nza1hl32mwm1xr9lyg4kpbq80gyscs4"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; }; - InteractionSet = derive2 { name="InteractionSet"; version="1.0.4"; sha256="05sa7rrgw7563af9fzy8r1ndhy9f8cd2ymxc9p9fd4xmw1yk31s9"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors SummarizedExperiment]; }; - IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.8.0"; sha256="0sg1fqsblhxynm4yvh5jzkrjw7h7rqi3n5ck5996xd0r5zhyqd1q"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; }; - JunctionSeq = derive2 { name="JunctionSeq"; version="1.2.4"; sha256="1allsshg9bbl0krx9as31g41px0fvk3hn00vis3saxshq95mcn76"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix S4Vectors statmod stringr SummarizedExperiment]; }; - KCsmart = derive2 { name="KCsmart"; version="2.30.0"; sha256="0fpmjdlnvrcj6s3pnrhvb09hm1ws2nqxw7is7rdx4grq1j21ppgj"; depends=[BiocGenerics KernSmooth multtest siggenes]; }; - KEGGREST = derive2 { name="KEGGREST"; version="1.12.3"; sha256="14p6506ml6l1h2j3pr1hda8475sa4rvph4vc1z3h84bj0czciibz"; depends=[Biostrings httr png]; }; - KEGGgraph = derive2 { name="KEGGgraph"; version="1.30.0"; sha256="14zwnncks3ayb4dwa2i08aqf7abyxcwpd95dag6si8fwhz1di4v9"; depends=[graph XML]; }; - KEGGprofile = derive2 { name="KEGGprofile"; version="1.14.0"; sha256="04997klqr44vi87zasvr41bgjjn2gfa3abv23zqjmj4xqr5693r8"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png TeachingDemos XML]; }; - LBE = derive2 { name="LBE"; version="1.40.0"; sha256="174bwp93lnb1lg19yd1r1piza23zm8wi2mnk3kk0r79hj9y1vx04"; depends=[]; }; - LEA = derive2 { name="LEA"; version="1.4.0"; sha256="1srrabmvb9ghvhi3vqmr348as0vjzqfmcln2lclsc6za5prqnaja"; depends=[]; }; - LMGene = derive2 { name="LMGene"; version="2.28.0"; sha256="0d0nvkcrg8hqrjlhhmcw1194w2aw363xr5dfqv9r10r618x5s5zy"; depends=[affy Biobase multtest survival]; }; - LOLA = derive2 { name="LOLA"; version="1.2.2"; sha256="0fjs5z64s6xd62161qkpb38dblsl9dycw4ij0kggrkrjsfqnnapa"; depends=[BiocGenerics data_table GenomicRanges IRanges S4Vectors]; }; - LPE = derive2 { name="LPE"; version="1.46.0"; sha256="14j8ha907nsj382hx67ci0675n15j7anxg95kz7v4lrd5w6bbb5f"; depends=[]; }; - LPEadj = derive2 { name="LPEadj"; version="1.32.0"; sha256="1lx2p99dyjg1vamglnc2j1qan52wpz2sn9lyzhq9gxh77716rxlj"; depends=[LPE]; }; - LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.22.0"; sha256="0cx9msy13cdihpdl92xz66c9hi5lblmfm113zmd6p7zzpfjzb8rg"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; }; - LedPred = derive2 { name="LedPred"; version="1.6.1"; sha256="1ryggr2n2rhsxcgxy3rkxhvvjxcmbj8rm274qyzi0i7na4m98jkq"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; }; - Linnorm = derive2 { name="Linnorm"; version="1.0.6"; sha256="1s66vzwyrmxwd3y52nxikcplbl5crvcamr0cfyg5hw5hmhbx4n1g"; depends=[limma MASS Rcpp RcppArmadillo statmod]; }; - LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.26.0"; sha256="04g4rh6digbdymlbbblvscsdvkq6nxnbsc7g5y2zp1afn175wg45"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; }; - LowMACA = derive2 { name="LowMACA"; version="1.4.2"; sha256="1aj59sxnbxwl5lz9nk18jb6n2da0qr3b3zz2fiw5z5bd8qd06aj1"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; }; - LymphoSeq = derive2 { name="LymphoSeq"; version="1.0.2"; sha256="0gii3d4w8219p8lc4isbkh3y6hhz2mhgr3qb5cm7hq0v10a9w85w"; depends=[circlize data_table dplyr ggplot2 ineq LymphoSeqDB plyr RColorBrewer reshape VennDiagram]; }; - M3D = derive2 { name="M3D"; version="1.6.2"; sha256="0z20kfhx8p8l6c2lh4mhnmp8ib8jcb3ld5h2sw7n5prsd22qs1mv"; depends=[BiocGenerics BiSeq GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; - MAIT = derive2 { name="MAIT"; version="1.6.0"; sha256="0qbpdilk9h6sz64p4r18iay9v8kh19y3sgik9h8mmlywfvjl2d36"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; }; - MANOR = derive2 { name="MANOR"; version="1.44.0"; sha256="1h3ia41anx3bg2nzfa40vjzgrd30aayprlhj2amgiidv37xam7jd"; depends=[GLAD]; }; - MBASED = derive2 { name="MBASED"; version="1.6.0"; sha256="1a69ymyn817qn5xdm1lnc5nf1iir8sshj4awkn2vm7nc5zf0yyw6"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; }; - MBAmethyl = derive2 { name="MBAmethyl"; version="1.6.0"; sha256="1wjd3v2kj1g7hc39rg5g8npvppyrdp99fvcqiyv7fybpp4i106ws"; depends=[]; }; - MBCB = derive2 { name="MBCB"; version="1.26.0"; sha256="1hv14jmmh8vzispdbww3hpbkb57naxqy7wcy5ilc1kz2sg4a6h30"; depends=[preprocessCore tcltk2]; }; - MBttest = derive2 { name="MBttest"; version="1.0.0"; sha256="1df76rma5j9nc4pzz7ql9zs08hzvsclh8crhrh3pwgidny6i485h"; depends=[gplots gtools]; }; - MCRestimate = derive2 { name="MCRestimate"; version="2.28.0"; sha256="02zlkrkzia1398wxvrqgdhika3v7nnkcy4w6bd0s1c3mzri3br4i"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; }; - MEAL = derive2 { name="MEAL"; version="1.2.3"; sha256="0jji6c0g6ks13g52v0xdzk97g6ifh2jkphlbwhs1qz930wmzmyk1"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 IRanges limma minfi MultiDataSet permute S4Vectors SNPassoc snpStats sva vegan]; }; - MEDIPS = derive2 { name="MEDIPS"; version="1.22.0"; sha256="1c6p2jkx3p8fgxah1qs74ia4934m9cbw8gdmm9kig1sfipmw5rjs"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; - MEDME = derive2 { name="MEDME"; version="1.32.0"; sha256="062dqr4l6fg6azalfl93zrfzj7xnx9fn0l4gbn5gmmvxz5ldqp86"; depends=[Biostrings drc MASS]; }; - MEIGOR = derive2 { name="MEIGOR"; version="1.6.0"; sha256="1bmb27ka2d4khghzp8wja5aqh82jlkqsjiqg3vc550k02g9yyf2j"; depends=[CNORode deSolve Rsolnp snowfall]; }; - MGFM = derive2 { name="MGFM"; version="1.6.0"; sha256="1ly89riycn4x92q58jhmdpqpk3y069cpipbajwla59iczjl333qj"; depends=[annotate AnnotationDbi]; }; - MIMOSA = derive2 { name="MIMOSA"; version="1.10.2"; sha256="0c82szbvk84h8p4zws8za1lk0hchf2n9p38m9dav8g8p8p2mvm37"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; }; - MLInterfaces = derive2 { name="MLInterfaces"; version="1.52.0"; sha256="17plgfwj8n4861rpg4a5qlp951v5wsdr6p7xplb2did0hz555lw2"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rgl rpart sfsmisc shiny threejs]; }; - MLP = derive2 { name="MLP"; version="1.20.0"; sha256="0s923x14xdbfqa6vnmsijfw7bifvkj4dpbvkqnnppgdm0n0y42gq"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; }; - MLSeq = derive2 { name="MLSeq"; version="1.12.2"; sha256="045nbqn369lisnn5b6y1lq4xhzd724dv3b58zcl3mgi3yja3rzq5"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; }; - MMDiff = derive2 { name="MMDiff"; version="1.12.0"; sha256="11gzg1qshfrhf7m7w60pqfndpq9xbjns1kzq83fhmg3xydw8byb5"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; }; - MMDiff2 = derive2 { name="MMDiff2"; version="1.0.2"; sha256="05nnk927h0bywcwkqasyhb6zq8iky18bcjhiavmjbm6rs44x8r38"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; - MPFE = derive2 { name="MPFE"; version="1.8.0"; sha256="0ipsvsan3z0z7ax94fg7vmmzyhzh9184nd0k1b26sr0ddqk36n8k"; depends=[]; }; - MSGFgui = derive2 { name="MSGFgui"; version="1.6.2"; sha256="1b7bv47avxhvnr0ilbsfmr2yg6q3k5m62qkmxn9fapar0c7w6my1"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; }; - MSGFplus = derive2 { name="MSGFplus"; version="1.6.2"; sha256="04jqff48h48s7kwhai76y1y80hwgpw8x5svl0xzb6qvqwz12lsc9"; depends=[mzID]; }; - MSnID = derive2 { name="MSnID"; version="1.6.0"; sha256="0xgqq5gx9jgk0hflbmwsbp9l3652mm2l0jkyanxqbwn5ys6k9l2n"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; }; - MSnbase = derive2 { name="MSnbase"; version="1.20.7"; sha256="0540ha72mkd9paylq5qzpcxw63d6b4rzjplg2rdixzzdhfg5rcgc"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; }; - MSstats = derive2 { name="MSstats"; version="3.4.0"; sha256="0fkdfvd0fm5p5x5a23n2hnysawl6idwni0ib1a4ckdgx9mb183dm"; depends=[data_table ggplot2 ggrepel gplots limma lme4 marray minpack_lm MSnbase preprocessCore Rcpp reshape reshape2 survival]; }; - MVCClass = derive2 { name="MVCClass"; version="1.46.0"; sha256="1aa63zn86m9nc3pr9y4rnzh5irfmkqkxbgbx5qf87x0rxnl7b8c2"; depends=[]; }; - MantelCorr = derive2 { name="MantelCorr"; version="1.42.0"; sha256="1123cvr1psl5hvin8fw3zx3rp0317pfs7jzliyl1namkyz86nmyy"; depends=[]; }; - MassArray = derive2 { name="MassArray"; version="1.24.0"; sha256="1ijrsgfzfqg4knvfdd2jlhzc0d58q90phwjkfklxq416r68za7sh"; depends=[]; }; - MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.38.0"; sha256="0xyilbr0qcli8qkj5nj3zydgpbx6xlqf9877vyyb471isd0h764p"; depends=[waveslim]; }; - MatrixRider = derive2 { name="MatrixRider"; version="1.4.0"; sha256="1f114p00splb8rkz0s4l44m16xf4i00ig6h56jvca3i9knhv9g4p"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; }; - MeSHDbi = derive2 { name="MeSHDbi"; version="1.8.0"; sha256="1jf4jx7cybivlasmlsn369fwcjv4jyid0i5p7aj5hqs9cb48kzfz"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; }; - MeSHSim = derive2 { name="MeSHSim"; version="1.4.0"; sha256="1dgvpqfg41kawmdy9vag6ysm3iwkfijc48blw6rr5pbjmx75f3wg"; depends=[RCurl XML]; }; - MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.44.0"; sha256="1snrpm5dx9rwb2i7g0y6q80cdjmmw5pcybifq3z1li86i5w1llic"; depends=[]; }; - MergeMaid = derive2 { name="MergeMaid"; version="2.44.0"; sha256="1dblfravkmvjcwmd9c9c5gzl68ygczsvpydcz6n2qjfnvv2qz3cq"; depends=[Biobase MASS survival]; }; - Mergeomics = derive2 { name="Mergeomics"; version="1.0.0"; sha256="01fz5ms2giwj18irr2rdm98hzg0hscai9zi3zwyqmkjwpifz845g"; depends=[]; }; - Metab = derive2 { name="Metab"; version="1.6.0"; sha256="0v6003ra26lm7gcadlc8ijn3lfiqrbc3i3bqwfmgsrd477kb3ppg"; depends=[pander svDialogs xcms]; }; - MethPed = derive2 { name="MethPed"; version="1.0.2"; sha256="0ijvk0pmjgr0x12hv12p7lbvarlaz5pg7nc2nly8hh7hmv8y807p"; depends=[Biobase randomForest]; }; - MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.4.0"; sha256="19yws0346kia30p4sjmikbsvzfynl920n8ici3wpmcks2vs1a1xd"; depends=[Biostrings gplots seqinr stringr]; }; - MethylAid = derive2 { name="MethylAid"; version="1.6.2"; sha256="1ih9s9jmixfa1h060y7sqmip1rwz32a445cfjhcff20bsjblld42"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny]; }; - MethylMix = derive2 { name="MethylMix"; version="1.6.0"; sha256="0waq027d51gnz6l883dph2srklzf3d1fwlan3khzcmi8yq75ciar"; depends=[doParallel foreach optimx RColorBrewer RPMM]; }; - MethylSeekR = derive2 { name="MethylSeekR"; version="1.12.0"; sha256="1x6kc2xl2jf8f6r2yjpybh51kk75xhmpb7m9j1zs1hzi0aqd0rz4"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; }; - Mfuzz = derive2 { name="Mfuzz"; version="2.32.0"; sha256="17afgpshz7nb0kcdks19z6izb6hrmgy9rigzw3mvk488mxhczlw8"; depends=[Biobase e1071 tkWidgets]; }; - MiChip = derive2 { name="MiChip"; version="1.26.0"; sha256="0fddfvay8zjamb6gzmf6f6xvqjh163ss3wikf1a04ihj7if8x6nf"; depends=[Biobase]; }; - MiPP = derive2 { name="MiPP"; version="1.44.0"; sha256="0ffiyrkda0hwjg4l062kxx5rrp57q2f716gk6n3f8dicx938fc4d"; depends=[Biobase e1071 MASS]; }; - MiRaGE = derive2 { name="MiRaGE"; version="1.14.0"; sha256="02x8p9l48g0b7s2pjq5j3w4dxnr6r0495di1y7sknrsbc2gdczib"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; }; - MineICA = derive2 { name="MineICA"; version="1.12.0"; sha256="0155kj48kxajd4sg1ajvppk1jss1wqkkyjz6xhzr3xpl9g2jnh51"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; }; - MinimumDistance = derive2 { name="MinimumDistance"; version="1.16.0"; sha256="1yw8ym00bkvn955d8yrz068yxszy3jv7gh55z3357k9spf1r9kmi"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; - Mirsynergy = derive2 { name="Mirsynergy"; version="1.8.1"; sha256="1zs09wm9n51d1bswbl6q9xmd5kb9rgbjgmqniq4nril18cqksqnp"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; }; - MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.22.0"; sha256="05fnam7yak4jxjwmkzmczwrfvbqw7y91layz6g7kgzz56ifqj33s"; depends=[Biobase lattice limma statmod vsn xtable]; }; - MoPS = derive2 { name="MoPS"; version="1.6.0"; sha256="19bkydam974lam2v7ljzmj6xs8hw5ggd839j5mld1in44q7p8y3h"; depends=[Biobase]; }; - MotIV = derive2 { name="MotIV"; version="1.28.0"; sha256="1yzx1m1csi9x8i0jljcqla3hgwly3yb9r710q23f5kswir3qdawn"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; }; - MotifDb = derive2 { name="MotifDb"; version="1.14.0"; sha256="05pbqrq547am6l74cv3pqnlw6kiasnlfx9hgicfp290ir6ws0clx"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; }; - Mulcom = derive2 { name="Mulcom"; version="1.22.0"; sha256="08h94yykypmm5zshmf0i547g6lw4bsyn5zw8swgpiv4c2p46drhd"; depends=[Biobase fields]; }; - MultiDataSet = derive2 { name="MultiDataSet"; version="1.0.2"; sha256="05gx3kdzrc1lyw2xx1w2vw0c562x7cj3raqi6mafs40dlxyplf0h"; depends=[Biobase BiocGenerics GenomicRanges IRanges minfi S4Vectors SummarizedExperiment]; }; - MultiMed = derive2 { name="MultiMed"; version="1.6.0"; sha256="1shl11v2m926c2ccypj561rb17h490bndw2nflcpg19bgw43smj6"; depends=[]; }; - NCIgraph = derive2 { name="NCIgraph"; version="1.20.0"; sha256="08kjg6ynynbccdi57hns1bxnr9cjh07w71rah8zkx2irsgg22485"; depends=[graph KEGGgraph R_methodsS3 RBGL RCytoscape]; }; - NGScopy = derive2 { name="NGScopy"; version="1.6.0"; sha256="07hrqv4xdsi2w3ln4lbjgfkyqv22m9nj9zwcaxdxhy8sr3dr7zzw"; depends=[changepoint rbamtools Xmisc]; }; - NOISeq = derive2 { name="NOISeq"; version="2.16.0"; sha256="0j2698rsdbm76rcdc9b1ddhrs7ka0qwi51p8cqzcymkjks4pb4jh"; depends=[Biobase Matrix]; }; - NTW = derive2 { name="NTW"; version="1.22.0"; sha256="094lwailsdl889h880igkwmg1vkbs4k44m5l9zdncy2d4cbmz9fx"; depends=[mvtnorm]; }; - NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.2.0"; sha256="00bw33qa0szb0g46ni35jaxk848pbfqcy5z7jv3sbfc3kfv2qzki"; depends=[Biobase matrixStats]; }; - NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.4.0"; sha256="1y68zx0psvnyfxbslw59spdv054shrfj3m8l30f13x734ff2bcd2"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; }; - NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.16.0"; sha256="08x5hv0qpkg241pxzgfs5pbs5vmf7bj36hdhr1iakmqic3p88xaf"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; }; - NetPathMiner = derive2 { name="NetPathMiner"; version="1.8.0"; sha256="1brr77b0gj4mbfcxiwk0ip11shj1829i12ivwjhls2f2iwn72s4b"; depends=[igraph]; }; - NetSAM = derive2 { name="NetSAM"; version="1.12.0"; sha256="16hcg60fnqznjj218ms3i9yz8sw9r5fgbcbg7m6fbqdf9wvblbdn"; depends=[graph igraph seriation]; }; - NormqPCR = derive2 { name="NormqPCR"; version="1.18.0"; sha256="1h2x08ns8q4fr26mk3sqn65rqb3j6i7a0ni3fasbjsbc6yhbi2lf"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; }; - NuPoP = derive2 { name="NuPoP"; version="1.22.0"; sha256="0q0qh9xwlz6flhqzvmc438h0ywj66y794mzlqyjm648qc33csd2x"; depends=[]; }; - OCplus = derive2 { name="OCplus"; version="1.46.0"; sha256="1qib8knxymmdy0a7afmjg1zvrpb4nx1mkdc53zpdicjrv1k64v6h"; depends=[akima multtest]; }; - OGSA = derive2 { name="OGSA"; version="1.2.0"; sha256="17cc03pv4lgs7306mhwd62hnkl74gvqpaw71rk8sas2iy0rd2xnf"; depends=[Biobase gplots limma]; }; - OLIN = derive2 { name="OLIN"; version="1.50.0"; sha256="0a4ahksrng4bvcslx7mw6q3gf6wlgkskqigk1axaxa6jy6jyg70c"; depends=[limma locfit marray]; }; - OLINgui = derive2 { name="OLINgui"; version="1.46.0"; sha256="1vdkxkbwxf42fp9y24xqd598ksif4najbp77s689qr2hbi3mw0rp"; depends=[marray OLIN tkWidgets widgetTools]; }; - OSAT = derive2 { name="OSAT"; version="1.20.0"; sha256="0hccp457gqb2c1qs9jlwglvhm8dqazxgk3qj6cidh9wmdd97ppcw"; depends=[]; }; - OTUbase = derive2 { name="OTUbase"; version="1.22.0"; sha256="0i14424m00ivvssb9qax48dxk2pm68hkwykd1xqpl38p0p4d1fh5"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; - OmicCircos = derive2 { name="OmicCircos"; version="1.10.0"; sha256="0s55hrr712z15v0svrijgr0gvn5r8c39jyff0ihl7wyddvyky982"; depends=[GenomicRanges]; }; - OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.4.2"; sha256="05vjkr2gaa1w8lnrxpmqnf1a89clwlzjq4vb9nxmjk21gp6dgqf8"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; }; - OncoScore = derive2 { name="OncoScore"; version="1.0.2"; sha256="1wynyfc76vz1qinfvbyzgawcwwyic1khdsmjqkr2b8mcs3sb97xs"; depends=[biomaRt]; }; - OncoSimulR = derive2 { name="OncoSimulR"; version="2.2.2"; sha256="06i2scrv2dh5yhpaf2dnhjmmdknm0x06597baxk85k95q1m4zpg2"; depends=[data_table graph gtools igraph RColorBrewer Rcpp Rgraphviz]; }; - OperaMate = derive2 { name="OperaMate"; version="1.4.0"; sha256="0qn2r3347khd671yf200p2wfbqysi2k4wk0y52vr1kji39shjqy4"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; }; - OrderedList = derive2 { name="OrderedList"; version="1.44.0"; sha256="0z32bp9gjy0sf7qw626p2dignrcq22h6l5zwza2ap5c0hr0m7l2r"; depends=[Biobase twilight]; }; - OrganismDbi = derive2 { name="OrganismDbi"; version="1.14.1"; sha256="0h48qkliiyl4fk1dnk2310gy76bj7nhgnw92cxllvbcq4caakv52"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; }; - Oscope = derive2 { name="Oscope"; version="1.2.0"; sha256="0p9ri0djqf87jbb6pcjz5m8l0vgjc04mspdahqaj258yg2zgkvdp"; depends=[BiocParallel cluster EBSeq testthat]; }; - OutlierD = derive2 { name="OutlierD"; version="1.36.0"; sha256="1carw9ylv7gwcawfdpx3aahbw1hnglila3miry5vhg978lk662f2"; depends=[Biobase quantreg]; }; - PAA = derive2 { name="PAA"; version="1.7.1"; sha256="1kgqb4q6jmr34w7pkgksbzbhvvlyr57xgv7k17hibggy0b1ykp1j"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; }; - PADOG = derive2 { name="PADOG"; version="1.14.0"; sha256="1s1adlswz3na5k072nbsp419ix75jg4h94jgg1w54730dymphasm"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; }; - PANR = derive2 { name="PANR"; version="1.18.0"; sha256="1b4r8bz22rfykysbp2cfxa98gq2hsig8nx2kfizx5z7z28gnsfba"; depends=[igraph MASS pvclust RedeR]; }; - PAPi = derive2 { name="PAPi"; version="1.12.0"; sha256="1dvhghn0g7ka2qvfyj785ma6pm25p7j8j76cqwjhg9n8kja9999i"; depends=[KEGGREST svDialogs]; }; - PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.36.0"; sha256="1s2b0s5pb2yhji756y21sy22sypvp3zkmdg7jv7xnsrrnvkqjnqd"; depends=[AnnotationDbi Biobase DBI RSQLite]; }; - PCAN = derive2 { name="PCAN"; version="1.0.2"; sha256="1rkgkash3y07srq2y5r0hrhs8gzzwn739g5jhjdmky73m7xbdc3p"; depends=[BiocParallel]; }; - PCpheno = derive2 { name="PCpheno"; version="1.34.0"; sha256="0y93qv6gghr461rqbq11vl0khf25n6pvrqzszybwbrw9q6hynzhw"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; }; - PECA = derive2 { name="PECA"; version="1.8.0"; sha256="0qm40zwmbzj06z18k8wyqvlk6rvv70h7m8g4zrrslsjdx8anhzll"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; }; - PGA = derive2 { name="PGA"; version="1.2.2"; sha256="13a4q8dldyp2djc2f33w8kj6vpaa7xzymf3p1l47mmv6gz9n17yv"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; }; - PGSEA = derive2 { name="PGSEA"; version="1.46.0"; sha256="1sx7ffg0sjzs9hxh1fhp0149h6j4fhaqqrq56aanmacqpcd8lhna"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; }; - PICS = derive2 { name="PICS"; version="2.16.0"; sha256="0gn1dqmhii2ys95gs85sm812kgw2pnph7mv6yml0xg0929rph3pa"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; - PING = derive2 { name="PING"; version="2.16.0"; sha256="13yhwmcvhcvn99x6czq09zhrqaw0p644iw3jhw2gv3r93q39blci"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; }; - PLPE = derive2 { name="PLPE"; version="1.32.0"; sha256="0i114wl9w4ka7w8w1jllfcq436mgpjkxaaymbxn81kfjw3jp4pql"; depends=[Biobase LPE MASS]; }; - PREDA = derive2 { name="PREDA"; version="1.18.0"; sha256="10bnsf62vlxzymwlh683g0asmkwldgr66fwfxhdlk807lh4phi8k"; depends=[annotate Biobase lokern multtest]; }; - PROMISE = derive2 { name="PROMISE"; version="1.24.0"; sha256="04wd1s0ki10scspd48h2m0y5wzxab2q6jd8farnca62sr7nzz46x"; depends=[Biobase GSEABase]; }; - PROPER = derive2 { name="PROPER"; version="1.4.2"; sha256="1pqa3k4id6j1j8nwrp4ax3fbpxc9vhkyddy9vylg0s6l5c3jnqkh"; depends=[edgeR]; }; - PROcess = derive2 { name="PROcess"; version="1.48.0"; sha256="0dna1smq8phmm2xd4928wbr2y9a4l3yv98ss8ida1fxmbxhy3sxy"; depends=[Icens]; }; - PSEA = derive2 { name="PSEA"; version="1.6.0"; sha256="07bsdx8vclk2mjpq65zqgzx8l9pb31vj00j1qi3krk2gjb64pj1j"; depends=[Biobase MASS]; }; - PSICQUIC = derive2 { name="PSICQUIC"; version="1.10.0"; sha256="1psivm4zlg0nidg0kzy61m0my0y8pdjwprlyzcidbjqal1s8mpzc"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; }; - PWMEnrich = derive2 { name="PWMEnrich"; version="4.8.2"; sha256="1afyrrqdxacnnx1r0pzqp1nhbjrb0wqaamycvxmap9x0nq96a6ww"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; }; - PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.0.3"; sha256="0n3i9385zq09jqwp81q869h5qk4xjnrnx7mlcsyng087h2sgnmvh"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; }; - Path2PPI = derive2 { name="Path2PPI"; version="1.2.2"; sha256="00cbchrvqwxdv777f3rbgdqj127wi5383gk7j0amxvdx9xrkjyp1"; depends=[igraph]; }; - PathNet = derive2 { name="PathNet"; version="1.12.0"; sha256="12wv9izq6hk27v2x8dv7mfvp9s51jyjydwdd2vb44a6d1pz8fn94"; depends=[]; }; - Pbase = derive2 { name="Pbase"; version="0.12.2"; sha256="1cl9j8s5hxib5wzj42rbp747ckbidni5dii6qxylp89msvp1wlia"; depends=[Biobase BiocGenerics biomaRt Biostrings cleaver GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; }; - PhenStat = derive2 { name="PhenStat"; version="2.6.0"; sha256="0f69r7qg6cbpmlrbcz8ddmcfkzx5bixry0nksmkfbf6hbw08pgn1"; depends=[car logistf MASS nlme nortest]; }; - Polyfit = derive2 { name="Polyfit"; version="1.6.0"; sha256="1szx61apdn014496qzr5aqzy9nfyvnbhc7w949kxmw1vrgjkrdmc"; depends=[DESeq]; }; - Prize = derive2 { name="Prize"; version="1.2.0"; sha256="0birhqvk5myb1j41hffy71dmshc43vfx5qd9rnpwylq66dp9f9f9"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; }; - ProCoNA = derive2 { name="ProCoNA"; version="1.10.0"; sha256="0hh21hdhgaf63mbbfi5pnpds2bgkybnr1xrc0w2siqnyfvva1613"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; }; - Prostar = derive2 { name="Prostar"; version="1.4.12"; sha256="0720rlql0wq9spxrr438gsjn3xd7hci6vssdxa1mqq1p8xcv12ik"; depends=[DAPAR DAPARdata data_table DT rhandsontable shiny shinyAce shinyjs]; }; - ProtGenerics = derive2 { name="ProtGenerics"; version="1.4.0"; sha256="15n8ykfwh8zng8px25qybskwcr627xwap3wzz3qs8g9mgxk69avn"; depends=[]; }; - ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.2.2"; sha256="1z5708sh0ar98xyrj3xpl87pn9zwj19wa2yq30kspp84kl924dz4"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; }; - PureCN = derive2 { name="PureCN"; version="1.0.4"; sha256="1nprrvr5mfccji6iw7cfwvi1d087nxa43l30lvi0fkqnaw5ba7x2"; depends=[data_table DNAcopy GenomeInfoDb GenomicRanges IRanges RColorBrewer S4Vectors SummarizedExperiment VariantAnnotation]; }; - Pviz = derive2 { name="Pviz"; version="1.6.2"; sha256="1kqamr8ir84jy6ija3y3v99wadrfajwycwb687x9l219a0l8h5k4"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; }; - QDNAseq = derive2 { name="QDNAseq"; version="1.8.1"; sha256="1r9j3324qc3r597gry39jbkvzhwgmsqkn8ss5z78k84b97n7raz9"; depends=[Biobase CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; }; - QUALIFIER = derive2 { name="QUALIFIER"; version="1.16.1"; sha256="00303dl9sypzl2zii1jyjmjvcmq4ff5qqy5i4aavzq1d82slf5g4"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; }; - QUBIC = derive2 { name="QUBIC"; version="1.0.3"; sha256="12qrk97m42ifqj6mk8alrhr4pxqddb2ca23raf528hxphc6z7hml"; depends=[biclust Matrix Rcpp RcppArmadillo]; }; - QuartPAC = derive2 { name="QuartPAC"; version="1.4.0"; sha256="1gw79h59xl45k89hj2d3l964y7w61svwlyjibz17z1r2pxc9vzj1"; depends=[data_table GraphPAC iPAC SpacePAC]; }; - QuasR = derive2 { name="QuasR"; version="1.12.0"; sha256="15f9xqvhf7c57l12xapm4jfm32np0y8lgi31vp44dwz281gxh61q"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; }; - QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.0.2"; sha256="152iby14x0xx8h05c1c5wqk6ndv38hl3zzwj7iiw9m2apbfms9fs"; depends=[Rcpp]; }; - R3CPET = derive2 { name="R3CPET"; version="1.4.2"; sha256="1cv4dxlvxdbcynm49syajhlrk9vak54v6gmljsbry0g6hjiyfiv1"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; }; - R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.22.0"; sha256="11clxpbkzkvjrj6s0415285ajjziymmn5hgz61n61sjxm08al6qj"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; }; - R4RNA = derive2 { name="R4RNA"; version="1.0.0"; sha256="0v6sl6xxnwkkkvs2j496kv9hqk7f5lbgpgk39fz2pyvxysccwi5y"; depends=[Biostrings]; }; - RBGL = derive2 { name="RBGL"; version="1.48.1"; sha256="1k82zcbyfx3p9hc8r0hwq73krbhakjan8fgbfr6w8z2crfkv3zmz"; depends=[graph]; }; - RBM = derive2 { name="RBM"; version="1.4.0"; sha256="0a17l6wmlqimb3jlh5i4qjyyhkymv4mcdhjbkis2qrf4zx6yn428"; depends=[limma marray]; }; - RBioinf = derive2 { name="RBioinf"; version="1.32.0"; sha256="0yvbvhcydsqx2c4vmdbgcsccn71yswci82xb2qcjbps4z1q31g4x"; depends=[graph]; }; - RCASPAR = derive2 { name="RCASPAR"; version="1.18.0"; sha256="15har8sa0drdjn033fia2gny1iacb5q06h2hr36k6hqr42y33p07"; depends=[]; }; - RCy3 = derive2 { name="RCy3"; version="1.2.0"; sha256="020j4ay8r4rsbwpc9bjgw96hwp4m4q4rg078grg9scqfz9jjpksw"; depends=[graph httr RCurl RJSONIO]; }; - RCyjs = derive2 { name="RCyjs"; version="1.4.0"; sha256="10d55bjav4fshn92fiif63fb17b58wsbg39fxslcyg5hl2wa8vhl"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; }; - RCytoscape = derive2 { name="RCytoscape"; version="1.21.1"; sha256="0jr3wlqk8aghaxdpq9a9z7gp7hmdfgmzkflv561p9g6yawv3v1q2"; depends=[BiocGenerics graph]; }; - RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.10.0"; sha256="1ly2xfmq3vwp2zxjqlmsjfy415h3zf6hhb71blf56g0naws7j5xh"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; }; - RDRToolbox = derive2 { name="RDRToolbox"; version="1.22.0"; sha256="1p2c7l16q9lyiki1a6vq076r9crjqpr6pgjckhpcis9p9gh5gapy"; depends=[MASS rgl]; }; - REDseq = derive2 { name="REDseq"; version="1.18.0"; sha256="14f2vh1s16dmar21h673qx8ypq5rbajazvmw6iw0bvxzbk6fy7f6"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; }; - RGSEA = derive2 { name="RGSEA"; version="1.6.2"; sha256="1y5qfcspj0l1ckfqlyy0dhl3aaach2mhk8bkqyx4qr68rh496y3s"; depends=[BiocGenerics]; }; - RGalaxy = derive2 { name="RGalaxy"; version="1.16.2"; sha256="03ippdid60iql6dlc5c7f2njfjfs7ssgfs8gl1p8kmrg4c4hd3p0"; depends=[Biobase BiocGenerics digest optparse roxygen2 XML]; }; - RGraph2js = derive2 { name="RGraph2js"; version="1.0.0"; sha256="0mhj021nczpf6ji5297zx0k7kc7503i2w5z9js5irlj5d6552700"; depends=[digest graph rjson whisker]; }; - RIPSeeker = derive2 { name="RIPSeeker"; version="1.12.0"; sha256="1dymn67l2d6165misxh4p6j8cwlydkh75j77pxx5wdnr2x2nfkcb"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - RImmPort = derive2 { name="RImmPort"; version="1.0.2"; sha256="0278fgq6b9jl5qy2nf6r1qijcrwkzyi6wpx1hq0021k3m1q2sl0b"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; }; - RLMM = derive2 { name="RLMM"; version="1.34.0"; sha256="0inyvbr5khwf24j7wdnn6x0b8zqcqf11jm5jqn6lgyxwljl5j0lq"; depends=[MASS]; }; - RMassBank = derive2 { name="RMassBank"; version="2.0.0"; sha256="0b0aghrr1s9izk7bsxj6qr2gdavxpyjk5ks7zbnqdjwc95hprndv"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; }; - RNASeqPower = derive2 { name="RNASeqPower"; version="1.12.0"; sha256="0y5cgdcj4wn3j9pxyv0hsjpbsc7ahl2a19mj6agjf8l4hn3wg3ky"; depends=[]; }; - RNAinteract = derive2 { name="RNAinteract"; version="1.20.0"; sha256="0a33sr1iqsym990d76rhrxpmcf0g0zzg7waidc5i608496kx3012"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; - RNAither = derive2 { name="RNAither"; version="2.20.0"; sha256="0a4h1wmr158wmm477pbn2jkn5hcfj0w5dxi071shbv26b88lvfgg"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; - RNAprobR = derive2 { name="RNAprobR"; version="1.4.0"; sha256="08cp1ycx6h9h7df58v84x5l7a3b2as27hap4jd37frvhy8bwkkay"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; }; - ROC = derive2 { name="ROC"; version="1.48.0"; sha256="01n66xmy2wsh2m7vxvlnvh5n40cfnqngsgzywnx5ywbq3g570328"; depends=[]; }; - ROTS = derive2 { name="ROTS"; version="1.0.0"; sha256="1s48zavs9w3swn3q0hjq6rnld28hd8jsbqq1jr38dd4rmh1mxgxr"; depends=[Biobase Rcpp]; }; - ROntoTools = derive2 { name="ROntoTools"; version="2.0.0"; sha256="0rmi1f8nr1ks5mwqmriqyh025qzs7j8a5fmfk7y3kb9wm5is7dm7"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; }; - RPA = derive2 { name="RPA"; version="1.28.0"; sha256="08cj1li41vgxg61bgbv5gw6fnqsc1hgsm6xl3yldpy33rl3q0sg2"; depends=[affy BiocGenerics phyloseq]; }; - RRHO = derive2 { name="RRHO"; version="1.12.0"; sha256="0vv4lxavgm1jfj2lvm7j589cbnd23mp77jfwacaswgz8q3s7l936"; depends=[VennDiagram]; }; - RSVSim = derive2 { name="RSVSim"; version="1.12.0"; sha256="1pbsp2an6y4mgcwcsc25v6v68yn8fxpkn4anmx6rmhpdl2dvwpzc"; depends=[Biostrings GenomicRanges IRanges ShortRead]; }; - RTCA = derive2 { name="RTCA"; version="1.24.0"; sha256="0q7cfkhayir6a437q7glyk536jhlq61kpapsrh6kvl0m5jcknai8"; depends=[Biobase gtools RColorBrewer]; }; - RTCGA = derive2 { name="RTCGA"; version="1.2.5"; sha256="112xmvk4cx6y4ma9kmrl6yryadml3mwd1i2924gbj1xy3wk0p0f2"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; }; - RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.2.2"; sha256="0gfhvzswjdlxpy6i7bhni39a5qvqdkdqiwrm411g2mx38zicgnxm"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; }; - RTN = derive2 { name="RTN"; version="1.10.0"; sha256="14dixlh8fr7kjzf6jrgcr7qhqpdbwl5r76c78mzqig5lzba3s0gy"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; }; - RTopper = derive2 { name="RTopper"; version="1.18.0"; sha256="0bmgyn74h0i2jbqw470l3ffv6lv7iwqilgb2zx6zh1f0gsy11km9"; depends=[Biobase limma multtest]; }; - RUVSeq = derive2 { name="RUVSeq"; version="1.6.2"; sha256="0kwgf512gld4vdmygwps0zqlas936fg05b573xvhag88rcdx8b5b"; depends=[Biobase EDASeq edgeR MASS]; }; - RUVcorr = derive2 { name="RUVcorr"; version="1.4.2"; sha256="0japqgx5jvava36hsc3jjx5x762ayhsklnn7m242wb77k97qwi4p"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; - RUVnormalize = derive2 { name="RUVnormalize"; version="1.6.0"; sha256="0pnx0zxacwi5qbm4cy83da60r306phzc9j8sib2n166g9wpqiypw"; depends=[Biobase RUVnormalizeData]; }; - RWebServices = derive2 { name="RWebServices"; version="1.36.0"; sha256="03x97qwv3nryazz4d3g70lfs6la2v79favlgskbr3x3ajjc2n0cg"; depends=[RCurl SJava TypeInfo]; }; - RamiGO = derive2 { name="RamiGO"; version="1.18.0"; sha256="0rq2xvb4gpcj5daczrj2if7v3kzs00kkvsa7kb78v37vvhif4rh8"; depends=[graph gsubfn igraph png RCurl RCytoscape]; }; - RankProd = derive2 { name="RankProd"; version="2.44.0"; sha256="1vyghlm4a1wvq6mcw7ls0jnwf0q64730zvvycjb34x38v18wml3y"; depends=[]; }; - RareVariantVis = derive2 { name="RareVariantVis"; version="1.6.2"; sha256="1ia1gdaw8n3v091yp1hsgy6i2dcshcm179vnm3q40ip05mm9yshz"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; }; - Rariant = derive2 { name="Rariant"; version="1.8.3"; sha256="0cnqrl8n9piyzbrxpk22nqkkmrnnz7vrhpbg20i6sfyp34353gzj"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; }; - RbcBook1 = derive2 { name="RbcBook1"; version="1.40.0"; sha256="19cwhsshw9fgq933cgrr9j31n9nf85jjix7ykdcs43rbfryzy99s"; depends=[Biobase graph rpart]; }; - Rbowtie = derive2 { name="Rbowtie"; version="1.12.0"; sha256="1gpjc4h11g4c0v2g6fpf1kjyws93i7w1slh12gwpn4hfbha1vsp2"; depends=[]; }; - Rcade = derive2 { name="Rcade"; version="1.14.0"; sha256="0z2rd8g9dbw2q48jmw0d25qrq4x47n708kryp5r7ssb78jmvk7nc"; depends=[baySeq GenomicRanges plotrix rgl Rsamtools S4Vectors]; }; - Rchemcpp = derive2 { name="Rchemcpp"; version="2.10.0"; sha256="1i4fm7ybclj5c87azqv2kjijq28wklrhs3vclyjfk5wapf6kfj5d"; depends=[ChemmineR Rcpp]; }; - RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.12.0"; sha256="1vkfsjl0krp69vhg5riq0bnlmij1qg8xbip5sd2m48z13qwysv6b"; depends=[flowType graph Rgraphviz sfsmisc]; }; - Rcpi = derive2 { name="Rcpi"; version="1.8.0"; sha256="0zx2x5zzx8n4ixyqk5h9sbd48nx3y68cknjpmby8j06csdzjdcc1"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; }; - Rdisop = derive2 { name="Rdisop"; version="1.32.0"; sha256="1x8sdgksx4wh3kdapfmlgq312ip3a8lwi4diafgjkzjyb3rpqwgd"; depends=[Rcpp RcppClassic]; }; - ReQON = derive2 { name="ReQON"; version="1.18.0"; sha256="0kx7mz8m4siygdg1saq1xk9n4qxpz6ymsm6hf3d566sn3ldb97dr"; depends=[rJava Rsamtools seqbias]; }; - ReactomePA = derive2 { name="ReactomePA"; version="1.16.2"; sha256="1rd58nfkbjkryg5z2if9g2lck3da65bbr4pkph3wnlhxdn1i5q9l"; depends=[AnnotationDbi DOSE GOSemSim graphite igraph reactome_db]; }; - ReadqPCR = derive2 { name="ReadqPCR"; version="1.18.0"; sha256="11hzn2lvgjys8jj5y6999s90jngmj8gnnq7cywql0l6dg7y4mjgq"; depends=[affy Biobase]; }; - RedeR = derive2 { name="RedeR"; version="1.20.0"; sha256="1gy2i8kkakv89d335cj0agdbdbrrcaaz5ykpgh46aphag2z2z3fw"; depends=[igraph pvclust RCurl XML]; }; - RefNet = derive2 { name="RefNet"; version="1.8.0"; sha256="0wc93cq5g9x7ah925k7jcz4cnlpccfkrzq4l3ahzxc338xyrsj5j"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; }; - RefPlus = derive2 { name="RefPlus"; version="1.42.0"; sha256="18pnia63wxqanc8v2ljlhvxiff0l9dshfm68rq5kwlhzmihxdz9q"; depends=[affy affyPLM Biobase preprocessCore]; }; - Repitools = derive2 { name="Repitools"; version="1.18.3"; sha256="0h1sm6jq0kn1ahkj9k8xlj9smb8j63d482wvknmx8j3xn3qmjg1r"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; }; - ReportingTools = derive2 { name="ReportingTools"; version="2.12.2"; sha256="04acgb7gqf6p0dgimi5sm54kwppclamayfk8m7373bjnzd25m88w"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; }; - Rgraphviz = derive2 { name="Rgraphviz"; version="2.16.0"; sha256="0zspfl87qz60hlnc6hcbd2sjjc9fgcq72zd75wnmf20h7ry1ngd7"; depends=[graph]; }; - Rhtslib = derive2 { name="Rhtslib"; version="1.4.3"; sha256="1wgpn9x8abjj7fc087pdavqc3fz0pl5xdh231mgjila18irwlhb3"; depends=[zlibbioc]; }; - RiboProfiling = derive2 { name="RiboProfiling"; version="1.2.1"; sha256="18s35h70isvy6q4psa5j04x7w0srvd3rlslzvkmb0qs2m2x786mz"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; }; - Ringo = derive2 { name="Ringo"; version="1.36.0"; sha256="18rbl1mvhmh31wvlvh1mjcmy4r7688alzzg0hjswvs8dmb66pr86"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; - Risa = derive2 { name="Risa"; version="1.14.0"; sha256="0lss7cx84f2sm4r6g1r3m8qpv0ml5y0mkgdbigx49676d8hir9d8"; depends=[affy Biobase biocViews Rcpp xcms]; }; - Rmagpie = derive2 { name="Rmagpie"; version="1.28.0"; sha256="19hvhrbzca631n4jz88k52zlaxj21lpcfcz6gdwqiibpa8p0hqhd"; depends=[Biobase e1071 kernlab pamr]; }; - RmiR = derive2 { name="RmiR"; version="1.28.0"; sha256="10bbwcwssidad2lvk25nm9n40dgmklj7k5m7fps61ny1my4bmbhs"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; }; - RnBeads = derive2 { name="RnBeads"; version="1.4.0"; sha256="0jmlcjxiri356ykg6dm0cxbmh85kljq8m3cndrfqc1wdj3jg3my3"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer S4Vectors]; }; - RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.4.2"; sha256="1jrf22a8f5g8scpaqwyp62hlpkfa9cm9y8ifqzz6fkr319i892yy"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; }; - Rnits = derive2 { name="Rnits"; version="1.6.2"; sha256="1h1g3wqrcsgmixs8bqbray6p0zknfh2gr47dxlwcmlb6gacwzkra"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; }; - Roleswitch = derive2 { name="Roleswitch"; version="1.10.0"; sha256="1vfywgjnk0dgr47brpalcg8dwgway5lkc4b320mxrpjvkfa9nh60"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; }; - Rolexa = derive2 { name="Rolexa"; version="1.27.0"; sha256="002bsgk5b7zkxzf26wj53k5qjfjqn55fy3qfaql6xa78yb8kzfad"; depends=[Biostrings IRanges mclust ShortRead]; }; - RpsiXML = derive2 { name="RpsiXML"; version="2.14.0"; sha256="018l540g50nsnqwazpkla2sqf2zvsnlp4ps6j7rly2cl3qay2kzn"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; }; - Rqc = derive2 { name="Rqc"; version="1.6.2"; sha256="0jm2ib52fjy13lh31xm8fn0z2rkx8sld7zykhjj2ci8514hqcczm"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; }; - Rsamtools = derive2 { name="Rsamtools"; version="1.24.0"; sha256="0w0drs8cpk8nlazq64ag7nm1w5jd1m8riialivm01hz5zcra7scb"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; }; - Rsubread = derive2 { name="Rsubread"; version="1.22.3"; sha256="0p7d542gbk5d9pqlyhvqmapfqbay2cgdrs83dvyq0fbg98nzf32l"; depends=[]; }; - Rtreemix = derive2 { name="Rtreemix"; version="1.34.0"; sha256="0xxkii2fmkphxj478ykdym1z09asz28cyzg8r7h6f4adns2rby7h"; depends=[Biobase graph Hmisc]; }; - S4Vectors = derive2 { name="S4Vectors"; version="0.10.3"; sha256="09lrvy3d5q58hsgw9as4hyyx07k1vyy2zjn3xsvhyfd97yk6w6lv"; depends=[BiocGenerics]; }; - SAGx = derive2 { name="SAGx"; version="1.46.0"; sha256="1rp190n21p5cav07rkm400al354b4wwqicz3nk095jdrjw6d5pcx"; depends=[Biobase multtest]; }; - SANTA = derive2 { name="SANTA"; version="2.10.2"; sha256="19v4kvfsj6zqv18q1hhl1r0ngkxd3b18h19mbpd4p0chzrfzj36d"; depends=[igraph Matrix snow]; }; - SBMLR = derive2 { name="SBMLR"; version="1.68.0"; sha256="0xamsiq5dqmb2l52ckzbra5q072s5y1xbg6983fp9626mns350ry"; depends=[deSolve XML]; }; - SC3 = derive2 { name="SC3"; version="1.1.4"; sha256="1laxigz5141s877f22dkw4r0icq282s2s4wxlaapdnyg062m2qic"; depends=[cluster colorspace doParallel doRNG e1071 foreach ggplot2 pheatmap RColorBrewer robustbase ROCR rrcov RSelenium Rtsne shiny WriteXLS]; }; - SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.14.0"; sha256="038d5rd649xyfl66h0gmfgp9ldmikl39qivmz0knl4g20b8p5ma0"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; - SELEX = derive2 { name="SELEX"; version="1.4.0"; sha256="1gxdcql81l8anjdrpi4mc8aw36srry076yhi7vwlia3s9rg3371i"; depends=[Biostrings rJava]; }; - SEPA = derive2 { name="SEPA"; version="1.2.2"; sha256="0nmi87s9288p5mrqajpkqq80y17lh71dhr996snp9przq00g2ga4"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; }; - SGSeq = derive2 { name="SGSeq"; version="1.6.12"; sha256="1swb3yac81s97m2bp15j02x0s364rf1szbhfmfpnmxmqmm9jdpsb"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; }; - SICtools = derive2 { name="SICtools"; version="1.2.2"; sha256="12jpr2w61pyx61rliz0snsa1ynyxl0kszvjqvk12rkihwgfrmld9"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; }; - SIM = derive2 { name="SIM"; version="1.42.0"; sha256="0sqm6rgfillq0fbiisy0g3cy0xyaaa7l93vw0gcjcyysyy0gls7c"; depends=[globaltest quantreg quantsmooth]; }; - SIMAT = derive2 { name="SIMAT"; version="1.4.0"; sha256="1z53q0f862irgdplszcpljkf27lsgw20055w0g80knygf6kkzyvq"; depends=[ggplot2 mzR Rcpp reshape2]; }; - SISPA = derive2 { name="SISPA"; version="1.2.1"; sha256="17qvzlmbb4mpijfglfgnmk6xvirdc3xfi2fc8wwgcv4f3vw2sqmw"; depends=[changepoint data_table ggplot2 GSVA plyr]; }; - SJava = derive2 { name="SJava"; version="0.98.0"; sha256="05y04474frdm78lpwvbqsqbg9d1nw746j0ndllh2489p6qk0w2ky"; depends=[]; }; - SLGI = derive2 { name="SLGI"; version="1.32.0"; sha256="1ki1vyaabzlcjkmmdf1rj73wadnahdgvnyz5zkasfszxfifxa5x5"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; }; - SLqPCR = derive2 { name="SLqPCR"; version="1.38.0"; sha256="0jzfcbhm45sgppxm21y969l2wwvvi3i0k73pgi91djxww9iax302"; depends=[]; }; - SMAP = derive2 { name="SMAP"; version="1.36.0"; sha256="0w43xrmcy6rk0rfrd5jx3s646bk2nwjcignd8gh4wg9x2wp03f9n"; depends=[]; }; - SMITE = derive2 { name="SMITE"; version="1.0.2"; sha256="1y6i5bifxfabhpp60np60rxqj5flxwrc3dxz5nclgm4c3kr95gk1"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGG_db org_Hs_eg_db plyr reactome_db S4Vectors scales]; }; - SNAGEE = derive2 { name="SNAGEE"; version="1.12.0"; sha256="00vxji06x84fh3sfgpdfk67ll1mxvbh58p16dyhd5xjw2rb37s6q"; depends=[SNAGEEdata]; }; - SNPRelate = derive2 { name="SNPRelate"; version="1.6.6"; sha256="0cjgzww9pj4ivg8rdiaz1v1kv83ghsypjm57pqbx093b1xdjgkq8"; depends=[gdsfmt]; }; - SNPchip = derive2 { name="SNPchip"; version="2.18.0"; sha256="0ajzpwspbw9jn6lpf5z0rgg1gxfr8d4qw8pwxd64784lwfcvn063"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; }; - SNPhood = derive2 { name="SNPhood"; version="1.2.3"; sha256="00kr6ri7vv7m0qz5wzx7bd6hj92mp2pbprbyc79ggan5dzpfaxsc"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - SPEM = derive2 { name="SPEM"; version="1.12.0"; sha256="0m3cd58nm3jmdzsph3yq8ndp8civmckhf553yl1q8y4v99y9dpa4"; depends=[Biobase Rsolnp]; }; - SPIA = derive2 { name="SPIA"; version="2.24.0"; sha256="1mp626ygyyyi2faad0qg5bi86rg21sq2bs0jxs95fwcwyziwj8np"; depends=[KEGGgraph]; }; - SQUADD = derive2 { name="SQUADD"; version="1.22.0"; sha256="098621vqfykkry6hf06yg4fg4ickrcb8wscv89s763kjc1nlkly8"; depends=[RColorBrewer]; }; - SRAdb = derive2 { name="SRAdb"; version="1.30.0"; sha256="0adrrs5bcpxqsji41wah2pww591wv8g1abrkim08cry5wpprznj9"; depends=[GEOquery graph RCurl RSQLite]; }; - SSPA = derive2 { name="SSPA"; version="2.12.0"; sha256="0v9xi3s7ayab6qcark77kblnyzh2jp0vschh4ylpfgjqljy0cing"; depends=[lattice limma qvalue]; }; - STAN = derive2 { name="STAN"; version="2.0.3"; sha256="0fkiskqylpdwgwr9nanf4xajdq9v09f6dqja69d4rw2bksb1xxqs"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; }; - STATegRa = derive2 { name="STATegRa"; version="1.6.2"; sha256="1np76zcxqh3yqjbxqvlzfasf95bjp3sa5f7nwyzz3xffykb4fzbp"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; }; - STRINGdb = derive2 { name="STRINGdb"; version="1.12.0"; sha256="0vww6nqv00n1230xqf48j99252dmpwa9sd9pgsjlvcgzbwgnccnk"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; - SVM2CRM = derive2 { name="SVM2CRM"; version="1.4.0"; sha256="10418yvdyw9n74qjhlm9zcdnw2qpyxc75j5i3ayqdnym2xq5qfvm"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; }; - SWATH2stats = derive2 { name="SWATH2stats"; version="1.2.3"; sha256="06pajvvis9wi9pn9rfgsdwhpvdyp6zf2iv0kd3rjkvr9ypl9m0z4"; depends=[data_table ggplot2 reshape2]; }; - SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.26.0"; sha256="1m47ysqnihm0kggqwzczvl8c2njcv7whbl1pz7q75bn02wn2nx09"; depends=[]; }; - ScISI = derive2 { name="ScISI"; version="1.44.0"; sha256="0yqq5jnyksnlwpxq9n5ajg7h0fzvm4pphsc6xks0fx7zkb7j65b2"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; }; - SemDist = derive2 { name="SemDist"; version="1.6.0"; sha256="1na6imf2n5q3sjfrjnhyf8jwygn4h5mafsnmlqpjjsamn7jnnp2d"; depends=[annotate AnnotationDbi GO_db]; }; - SeqArray = derive2 { name="SeqArray"; version="1.12.9"; sha256="083wkjbmph9lw9psfb8gvmkpwwgrs6p8l6wldcffq1bp46kzmlpk"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; - SeqGSEA = derive2 { name="SeqGSEA"; version="1.12.0"; sha256="06srbq183hdgvjg7dlx9iycb557j9pv9ip9ffm66kigwyyyg7ys0"; depends=[Biobase biomaRt DESeq doParallel]; }; - SeqVarTools = derive2 { name="SeqVarTools"; version="1.10.1"; sha256="1jali8s39gc9v9r69gknwsgkjxjp4sqyv45gkri289qx1cv4ck69"; depends=[Biobase gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray stringr VariantAnnotation]; }; - ShortRead = derive2 { name="ShortRead"; version="1.30.0"; sha256="0qlxns4bhwfpafx3km2lnivgl2qyp7n4g1ardm6vrinpq8paxbjg"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; }; - SigCheck = derive2 { name="SigCheck"; version="2.4.0"; sha256="0c2wlp96dvwjxaa533lf0dqn42nbiilca0klzw8ca0b8qq81506c"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; - SigFuge = derive2 { name="SigFuge"; version="1.10.0"; sha256="142aas9vcsf9n69c22rfmz1aidr6r9bi6q2vzl5dcj9yyfgm44h7"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; - SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.10.0"; sha256="11k8vwwjiz5q586cqcc4z2yr9h6kj78n3k4kwc33cb5yxvv5yf4p"; depends=[Biobase limma mclust Ringo]; }; - SomatiCA = derive2 { name="SomatiCA"; version="2.2.1"; sha256="17kmqrqjis7zg4wn2h1jmq27q57l3p8fb8sy9x3wm5wh2kh476nn"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; }; - SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.8.4"; sha256="1mkwsvn5z78sba9sx0hxrfnpkqz5xjs0zhc2a93ljx1fxzsxx8kh"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; }; - SpacePAC = derive2 { name="SpacePAC"; version="1.10.0"; sha256="11vn9l50ndkxb0yi4nx1g23hzmcwlgiqjrv74vyncpkc8dw6kx76"; depends=[iPAC]; }; - SpeCond = derive2 { name="SpeCond"; version="1.26.0"; sha256="0f2m2cyqnr495hlv167hpki2syn8pq3aicsnn52qycyx7ym4rywa"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; - SpidermiR = derive2 { name="SpidermiR"; version="1.2.5"; sha256="0q3l0fw9yx47d02w4ivaafrb4rclnd85fmyf46lxhjaskmsb10gl"; depends=[AnnotationDbi ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; }; - SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.12.0"; sha256="1jqngzakzc28vclxd14cbgfihvh161qh665ps5zmc00sjiapfh14"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; - Starr = derive2 { name="Starr"; version="1.28.0"; sha256="15h869kg4ba6qcx0gvjfp3k4dkdxxl9pbr1cpmyjha05zvbk3zss"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; }; - Streamer = derive2 { name="Streamer"; version="1.18.0"; sha256="03p4dpi5lfl3q4wfh2q26vmshawxzpj5linh1933724lip4bn20l"; depends=[BiocGenerics graph RBGL]; }; - SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.2.3"; sha256="0c43fsrha886sd0diislnlf8r5h5x7fbhphkzcm0rw3k2jz8wlyk"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - Sushi = derive2 { name="Sushi"; version="1.10.0"; sha256="0y9gz80xf5y2pilcg7c3gffsdspgr2hr51jbk4xhazijzimwf70k"; depends=[biomaRt zoo]; }; - SwathXtend = derive2 { name="SwathXtend"; version="1.0.0"; sha256="1j0dzmx8d247s206cfzf80p6gjgh44qfccvbn0xmjrpswbwsj3sy"; depends=[e1071 lattice openxlsx VennDiagram]; }; - SwimR = derive2 { name="SwimR"; version="1.10.0"; sha256="0prwypkjq3kry70akfah50bfh6rdhfwgcc5a7wp7vd7nz2sn78cs"; depends=[gplots heatmap_plus R2HTML signal]; }; - TCC = derive2 { name="TCC"; version="1.12.1"; sha256="1zk7njhdv50lryrdnlnvrbkzpjz4zizwzv0v7hdxg45jak1q7zvd"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; }; - TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.0.13"; sha256="0hs370sjkx5x8fgz902a91q1r5p9am6s0a2sscsw1x391xz659ad"; depends=[affy Biobase BiocGenerics biomaRt circlize coin ComplexHeatmap ConsensusClusterPlus data_table dnet doParallel downloader dplyr EDASeq edgeR genefilter GenomicFeatures GenomicRanges GGally ggplot2 ggrepel ggthemes gplots httr igraph IRanges jsonlite knitr limma matlab parmigene plyr R_utils RColorBrewer readr reshape2 rvest S4Vectors scales stringr SummarizedExperiment supraHex survival TxDb_Hsapiens_UCSC_hg19_knownGene XML xml2 xtable]; }; - TDARACNE = derive2 { name="TDARACNE"; version="1.22.0"; sha256="11hy6j6yv008bfkggjyb08k9dzk2xy5sdklga62v8lczpwd161wn"; depends=[Biobase GenKern Rgraphviz]; }; - TEQC = derive2 { name="TEQC"; version="3.12.0"; sha256="0ayw4ir8rpq1lk2ml7djp8x67fhn43x852p3myjnb0d8war46whm"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; - TFBSTools = derive2 { name="TFBSTools"; version="1.10.4"; sha256="1hgaqng02y0kgmjnxv8z93698hslr7cqbmgdf8rpaxg6zbn9cb0h"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; }; - TIN = derive2 { name="TIN"; version="1.4.1"; sha256="1mgbbk2jifb04c07bwhj9azhgsnza05qf28l2jpi9d10qnfn0nxq"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; - TPP = derive2 { name="TPP"; version="2.2.6"; sha256="1xzvd2pf6j7d9wwjsfvxzl4xib0h2nxkp4zzb3g60p6mfydr78gd"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr RColorBrewer RCurl reshape2 VennDiagram VGAM]; }; - TRONCO = derive2 { name="TRONCO"; version="2.4.3"; sha256="0j32db8d067nd7fiiny4whv1hm4w8fv1ivq91ri728n21f92qw52"; depends=[bnlearn cgdsr circlize doParallel foreach gRapHD gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; - TSCAN = derive2 { name="TSCAN"; version="1.10.2"; sha256="15mi3qg8qrwa44h52cbrmalyi13bbllzcjc4dglpp9mnybwrs126"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; }; - TSSi = derive2 { name="TSSi"; version="1.18.0"; sha256="0y2grk912mv2jfadypfrxr5k2kkwl6s2dcnn7g3svj65038b92jw"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; }; - TarSeqQC = derive2 { name="TarSeqQC"; version="1.2.0"; sha256="1a2gg203j9djf01w5xk04h79mn7wgd1yibgrvp1qaj3hvl0i0n54"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; - TargetScore = derive2 { name="TargetScore"; version="1.10.0"; sha256="1rj56jjhp4cz6jp5xrbmj9s3jszq5dmczf5szbzc34fg70y4fbqs"; depends=[Matrix pracma]; }; - TargetSearch = derive2 { name="TargetSearch"; version="1.28.1"; sha256="0wl9qx6q1czz2nhzz7di928ldv2x0bwj5si6kfm9rpw9q5v6wcs2"; depends=[ncdf4]; }; - TitanCNA = derive2 { name="TitanCNA"; version="1.10.0"; sha256="085z6j0a0rk86lm8c1asks2rvl7f0w1ncvsly2p8s9jfbk8yahwc"; depends=[foreach GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; - ToPASeq = derive2 { name="ToPASeq"; version="1.6.0"; sha256="1q9ys84ccv79jm475vm40ncm15dchlw8ak3xarsw9vkdrr4dv5wl"; depends=[AnnotationDbi Biobase clipper DESeq DESeq2 doParallel edgeR fields graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz SummarizedExperiment TeachingDemos]; }; - TransView = derive2 { name="TransView"; version="1.16.0"; sha256="1s4i694g2qlf9hsci6flm6z7vxic0n63rc1fi4dh8ag9ds2b9wzj"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; }; - TurboNorm = derive2 { name="TurboNorm"; version="1.20.0"; sha256="0rda1gw43nbs9p3axsiwr3vv2rxnpnpsip8pjk8z6jbk01hc76jx"; depends=[affy convert lattice limma marray]; }; - TypeInfo = derive2 { name="TypeInfo"; version="1.38.0"; sha256="1lg9s53a1cn8zqh4jkns7x9ivp4wc1557nphv6g5m227pi008vrx"; depends=[]; }; - UNDO = derive2 { name="UNDO"; version="1.14.0"; sha256="1i9hsyrmzlnkl37wkxkxb4y26qr3ds987kb0f18c1g75pm3pg5vd"; depends=[Biobase BiocGenerics boot MASS nnls]; }; - UniProt_ws = derive2 { name="UniProt.ws"; version="2.12.0"; sha256="09wayrpkk9mpmm8a6ckjyazlyqy9lfnz89xj665khnpblicn0f89"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; }; - Uniquorn = derive2 { name="Uniquorn"; version="1.0.8"; sha256="04zc53lh2r4mv6sybs3rf4b7gqv66q1gic8fycyba8fhb4p49glp"; depends=[DBI R_utils RSQLite stringr WriteXLS]; }; - VanillaICE = derive2 { name="VanillaICE"; version="1.34.0"; sha256="038ziyk80ilfwyxg104sz436all2spblwfy7gk64prshzlb04hbc"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; }; - VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.18.7"; sha256="002kif2c66wbcng953m3g1jys7w1lgz7hh3zsk4jlnhc20jdv1vj"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; - VariantFiltering = derive2 { name="VariantFiltering"; version="1.8.6"; sha256="1na1z0hk8xyvlwb43d4knnhaggbirlq1bdsb53q3s9agqkc8lki2"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny SummarizedExperiment VariantAnnotation XVector]; }; - VariantTools = derive2 { name="VariantTools"; version="1.14.1"; sha256="08kasppyj8h2vrs3sk9m8f1ixk5r689j9i43j0qjdp3kl8kr8ply"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - Vega = derive2 { name="Vega"; version="1.20.0"; sha256="19pd5jgc83gwgdmi1c2n5hjark0qk20svh0w5ay49xs82f939hj2"; depends=[]; }; - VegaMC = derive2 { name="VegaMC"; version="3.10.0"; sha256="05mkdqriizqddi6p9mnb52zamvgm8w967g1jjbinakhb6fbxqv76"; depends=[Biobase biomaRt genoset]; }; - XBSeq = derive2 { name="XBSeq"; version="1.2.2"; sha256="1ilvzhl373lpxsq9ff5i1hx09s0jj3ahkhg6i4x2dnqciq2kkax4"; depends=[Biobase Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma]; }; - XDE = derive2 { name="XDE"; version="2.18.0"; sha256="032bvdc2740cni5lkvkiybmyf01y6hg8xmz216p73aj75ggbp6i1"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; }; - XVector = derive2 { name="XVector"; version="0.12.1"; sha256="1kydy9f5y0ihn2mbkamr1kh0g1d3g1k9d7s4i09qgw9ysr6j414v"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; - a4 = derive2 { name="a4"; version="1.20.0"; sha256="0da0wivzg69f115yc77vajmzkqvb6y98lg35q2gsrb44wyhsvv2f"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; - a4Base = derive2 { name="a4Base"; version="1.20.0"; sha256="0pjanqc2z19ya3p87sqfb6avb3xmmhmr96c2bg0psjrh986d67q9"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; }; - a4Classif = derive2 { name="a4Classif"; version="1.20.0"; sha256="13a97mbfrzs4wfrm2qswrzw0rxiqc8405imz5lii7qygrmw3l8mr"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; }; - a4Core = derive2 { name="a4Core"; version="1.20.0"; sha256="0aqrb7d54mbdpkk1q86y5ixfnp569kzrw9azl7v4fwcb9y54k344"; depends=[Biobase glmnet]; }; - a4Preproc = derive2 { name="a4Preproc"; version="1.20.0"; sha256="06y6v1lj3wbhvr6y6q36qvkpxbbj2wcbhzzwkh4dsfvblwr90sw6"; depends=[AnnotationDbi]; }; - a4Reporting = derive2 { name="a4Reporting"; version="1.20.0"; sha256="0rfaqy40m7mhf3zjgcmsz99sm9f4nvbk8sqxn7lswwr42656ga8g"; depends=[annaffy xtable]; }; - aCGH = derive2 { name="aCGH"; version="1.50.0"; sha256="0g5gxc7204171lb1mf00vdi5yj4cfvvaspzd12xxp6z62ndw8ws7"; depends=[Biobase cluster multtest survival]; }; - acde = derive2 { name="acde"; version="1.2.0"; sha256="04r23mxk2srspzl2sghkjvr98apyq2kz213wmks4kpa6lpzvsipx"; depends=[boot]; }; - adSplit = derive2 { name="adSplit"; version="1.42.0"; sha256="1qrni9jsn9q1y9kskxynyi7pihzf79kbgchpfnbqr8q3xfjbfcm1"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; }; - affxparser = derive2 { name="affxparser"; version="1.44.0"; sha256="125ckbcc1bg041a9khiv9m3hdvzhm7mmi3hk2zp4hzza11a9mww6"; depends=[]; }; - affy = derive2 { name="affy"; version="1.50.0"; sha256="15620q8x0d42izn5hdbbmj7207id5ld1waws2d9ykplbv88ld8a5"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; }; - affyContam = derive2 { name="affyContam"; version="1.30.0"; sha256="0bzifl3dvccy2x2al3p9fqwhznxp8j0hisa2sr9hs896s0frc5a6"; depends=[affy affydata Biobase]; }; - affyILM = derive2 { name="affyILM"; version="1.24.0"; sha256="0w2x43xziy1d5nq6vmgnr753z36841y5n552h1liwbf6wzrwm4mi"; depends=[affxparser affy Biobase gcrma]; }; - affyPLM = derive2 { name="affyPLM"; version="1.48.0"; sha256="1g4ci0k5b8i05wpa4kyxm9f83qyb0ym4v8v5vzqq35yhsh78lhw7"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; }; - affyPara = derive2 { name="affyPara"; version="1.32.0"; sha256="183npqbc6zr8rwkfrsk78s8vha8fcmahwzn4fh39chf010kkxjvy"; depends=[affy affyio aplpack snow vsn]; }; - affyQCReport = derive2 { name="affyQCReport"; version="1.50.0"; sha256="12yk6qdwj1840kys8j8iipsbyrgqkv826arqsvvb0kk9h0bqw3b8"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; }; - affycomp = derive2 { name="affycomp"; version="1.48.0"; sha256="0w1095afp97c2qi2rrlp64yhxh0qrlnrgd6d3q1v608lv9nwknxs"; depends=[Biobase]; }; - affycoretools = derive2 { name="affycoretools"; version="1.44.3"; sha256="11cvxkir715kj3z9qsshss6zpxshynzw19nk9dpvvw7g76wvljfn"; depends=[affy AnnotationDbi Biobase edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools S4Vectors xtable]; }; - affyio = derive2 { name="affyio"; version="1.42.0"; sha256="0rx7vf9fpl4jpnvdcvwh250nnpzxarrrl87dp0pwasmghzdyl9vw"; depends=[zlibbioc]; }; - affylmGUI = derive2 { name="affylmGUI"; version="1.46.0"; sha256="1xspid2m74cyivhmhx4jlpli9pixvx0jfs5r05w4k9mj7jjxaivv"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; }; - affypdnn = derive2 { name="affypdnn"; version="1.46.0"; sha256="1yvr21w5s7kxl8rcp052f440l2czbwchmyi3hcpiqjvxc6fjmb9q"; depends=[affy]; }; - agilp = derive2 { name="agilp"; version="3.4.0"; sha256="18gd0wj3gz0fbasrfi8jx1r6m0nl7q83p9dcp2jqbkgrqk6r3ki5"; depends=[]; }; - alsace = derive2 { name="alsace"; version="1.8.0"; sha256="054pbjii52325xf3ar1ma8afnmxzwirgygj2xl5y2ngq09lyd9m6"; depends=[ALS ptw]; }; - altcdfenvs = derive2 { name="altcdfenvs"; version="2.34.0"; sha256="009cqk05bld0h0p8wmz8103irs1gbgyrpsnq5nsglywk1i5hqq4a"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; }; - ampliQueso = derive2 { name="ampliQueso"; version="1.10.0"; sha256="1kliy097yycls88cd3qxdg8vjwbb8v8iv9kp12kdq2ws5rc1gcvn"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; }; - annaffy = derive2 { name="annaffy"; version="1.44.0"; sha256="11dfl5mfzghyc8rc3dnclmwnn4kbrgmzizbqgj5dvy5x70s79hi8"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; }; - annmap = derive2 { name="annmap"; version="1.14.0"; sha256="01s00vg5p0kcpdsh4mib9xiv6y2fygqxi6n7bm6q94vrwaipjwmd"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; - annotate = derive2 { name="annotate"; version="1.50.1"; sha256="0anjh1b3vckgcfdxdd7jdhzsdivjlgx381i97iz59691kmvf8pqk"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; }; - annotationTools = derive2 { name="annotationTools"; version="1.46.0"; sha256="1ywpxlb3faikjqvaksr4xx1b48daa6yf6vmhs20llp9rrpwnl51p"; depends=[Biobase]; }; - anota = derive2 { name="anota"; version="1.20.0"; sha256="0kzf4lkgb54w8dy5xkadgnf9j4s47xnc53s3xn824k6sdg0l6grh"; depends=[multtest qvalue]; }; - antiProfiles = derive2 { name="antiProfiles"; version="1.12.0"; sha256="1y2sw41rv92wyq4dsqy45r0yqbmvp0dyh2jq8prqaniiiwhxh1b4"; depends=[locfit matrixStats]; }; - apComplex = derive2 { name="apComplex"; version="2.38.0"; sha256="0virfxj7x7nzs1xhh9cia3c951mlcgj918sfzy9w75p6cpciaww8"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; - aroma_light = derive2 { name="aroma.light"; version="3.2.0"; sha256="0yjmmxh8gl5nr5w3913xvk9nxmxd8qidjmzkdxwf756g01a6gr4m"; depends=[matrixStats R_methodsS3 R_oo R_utils]; }; - arrayMvout = derive2 { name="arrayMvout"; version="1.30.0"; sha256="12ws1bc7jwnys7dj43bd2iib7gdak9i3sirsnkldcyk6ndd18wi1"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; }; - arrayQuality = derive2 { name="arrayQuality"; version="1.50.0"; sha256="0jv03ywh3hngykll9zbywlsdq0wl7629qlm285z3as6kjzv04dkk"; depends=[gridBase hexbin limma marray RColorBrewer]; }; - arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.28.2"; sha256="08jm8wxrnxik6s9lnchq5crglzxscrnh1a06nbfdaj3h9nxwcb01"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; }; - attract = derive2 { name="attract"; version="1.24.0"; sha256="0d7bcdmk9dgx2yqsvvmq39l63lajx4nvx4km1b3nnqiwqph3cmlr"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; }; - bacon = derive2 { name="bacon"; version="1.0.5"; sha256="1cnjlgjivxgswfqvk9yk8b4pi89sr8mxaci486mybpbjvzrjzsc8"; depends=[BiocParallel ellipse ggplot2]; }; - ballgown = derive2 { name="ballgown"; version="2.4.3"; sha256="09nd5792cfi5zbqi58a8ggl4nff6n87jyix0fwn3xgf91qzcrgmr"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; - bamsignals = derive2 { name="bamsignals"; version="1.4.3"; sha256="1xqiqvg52p6fcvhr4146djbz79r3j1kmh75mq7rndwglmiybpwmy"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; - baySeq = derive2 { name="baySeq"; version="2.6.0"; sha256="1c2la9fw65mz4ns07h9n97di1rvzw8q8ga84x4x14y4hcm1zcr5a"; depends=[abind GenomicRanges perm]; }; - beadarray = derive2 { name="beadarray"; version="2.22.2"; sha256="03dzp6fpwwc3znf6by1c1s279ry41c8rlszclixzkmhm1q7vxf43"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; }; - beadarraySNP = derive2 { name="beadarraySNP"; version="1.38.0"; sha256="0wy6zva0z93i4hgcms8fvsbrhk9kzrapsiha72rsirgsd94zxsrw"; depends=[Biobase quantsmooth]; }; - betr = derive2 { name="betr"; version="1.28.0"; sha256="147i92ki54l0m26i6da1mp4cx7d3g3dd3sp9dk2lz0j46wd3476n"; depends=[Biobase limma mvtnorm]; }; - bgafun = derive2 { name="bgafun"; version="1.34.0"; sha256="0z8p6zl2080kkr48q86kqh2bhs3fiq6zzzjj8vgv7mqjwgwf8w06"; depends=[ade4 made4 seqinr]; }; - bgx = derive2 { name="bgx"; version="1.38.0"; sha256="17dmjh35hr4jbxqwvw5r5w99m27ck8zyfdysd86cc679fc1d6ird"; depends=[affy Biobase gcrma]; }; - bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.18.1"; sha256="0qv3l5yvg530a3mqdgnp01z3idkxr8qlnd30qplr8wr33gxvqa9f"; depends=[bigmemory]; }; - bioDist = derive2 { name="bioDist"; version="1.44.0"; sha256="1z1pgyrz1fswvsjravamx1w756w7y1ld4v8ijbhms8n39397jzza"; depends=[Biobase KernSmooth]; }; - bioassayR = derive2 { name="bioassayR"; version="1.10.15"; sha256="01gr7k0irkblhivnz4vj2y6pxwkhz2ccw9y4wcw4cf6j0yp6aq9x"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; }; - biobroom = derive2 { name="biobroom"; version="1.4.2"; sha256="1i5y32sb8zm23nkxx05b05wcqr1zgg2mh2rfdif3a27ax6r6vkiy"; depends=[Biobase broom dplyr tidyr]; }; - biocGraph = derive2 { name="biocGraph"; version="1.34.0"; sha256="0x1ka2b6gwzncb3s8k4dz8wnwfwiwzcmfzp0xrh94mrmwhda618p"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; - biocViews = derive2 { name="biocViews"; version="1.40.1"; sha256="1d1g06zwx3xhc07mdhs5x31730xw08fg3x73xyfj0qdy2ykww3f9"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; }; - biomaRt = derive2 { name="biomaRt"; version="2.28.0"; sha256="1g0w6an9hkflgyhvq6pmrs92s93qarv23v636b9a4bz771wjvm5v"; depends=[AnnotationDbi RCurl XML]; }; - biomformat = derive2 { name="biomformat"; version="1.0.2"; sha256="1shbf6gscvj6n52azvx6phcql3p462bk68cr9gr44lshq3y3g49d"; depends=[jsonlite Matrix plyr rhdf5]; }; - biomvRCNS = derive2 { name="biomvRCNS"; version="1.12.0"; sha256="1yr8bhqmkmvmw26fv53xkam05z17b0chwziv8b793f8zlkq34hw7"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; - biosigner = derive2 { name="biosigner"; version="1.0.8"; sha256="16v3kvd4zgsws59cz67642dnyzk9a8fjdb5g2mssh6znk9v6ig4a"; depends=[e1071 randomForest ropls]; }; - biosvd = derive2 { name="biosvd"; version="2.8.0"; sha256="11wzvy6x5zvqxl1g3z7xbsmn94ygy7fiazaq97fg88xqcc910kmv"; depends=[Biobase BiocGenerics NMF]; }; - biovizBase = derive2 { name="biovizBase"; version="1.20.0"; sha256="1plrwh1rqm6830xzmws9fna6azyalfnvn6r55bxifnhxy2zi1dpv"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - birta = derive2 { name="birta"; version="1.16.0"; sha256="0nrvdpfjra9ndqk2v07pl8srizg5nfigk3l25d28wzz81ngvcdfq"; depends=[Biobase limma MASS]; }; - birte = derive2 { name="birte"; version="1.8.1"; sha256="1d9hvwc7fcdbk4c93qgmgcrs5fpjjl4f469z8sk60ryrc8v58i9f"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; }; - blima = derive2 { name="blima"; version="1.6.0"; sha256="1hirr1g1q6bn6l877m9zz9vl8vnpdv8ziacp8d2if98anh8xmp4q"; depends=[beadarray Biobase BiocGenerics]; }; - bridge = derive2 { name="bridge"; version="1.36.0"; sha256="027098brim9m6dwf5m5ksjidy4g5q4s7hq92spqvnmjpcfrc9bzx"; depends=[rama]; }; - bsseq = derive2 { name="bsseq"; version="1.8.2"; sha256="0pv4fsw0mjcyq3171d507bwv8aqwzsqdy0v2ghlkx5z94qxsk67g"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges limma locfit matrixStats permute R_utils S4Vectors scales SummarizedExperiment]; }; - bumphunter = derive2 { name="bumphunter"; version="1.12.0"; sha256="02apjhvwqizlwmcw6qzaqj9p73j5qvnnf7bxzmgqy76m0723k2qi"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; - caOmicsV = derive2 { name="caOmicsV"; version="1.2.0"; sha256="1a90karz4m13lpsys9zlif6y95xxh4b5g8l6db2v0hfcfrz5msk5"; depends=[bc3net igraph]; }; - canceR = derive2 { name="canceR"; version="1.4.0"; sha256="1fk8mv5jx22y36m7bb8avf51dgpzyhx5j1kk1vglcyym9g4d39cw"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; }; - cancerclass = derive2 { name="cancerclass"; version="1.16.0"; sha256="0j3apzzkh744hha3nzsg0inhgr24dp9l217vgzjyrxq2x6rq9fra"; depends=[binom Biobase]; }; - casper = derive2 { name="casper"; version="2.6.0"; sha256="071x3182mjwd56dchz6mndzc3gpibxbvh30k957qdmmfc6bpadi0"; 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.16.2"; sha256="0l4zaw9f3h0innxpxphv46f7blk0aa1xfy6r7rya2rqb89rnf3vk"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; }; - ccrepe = derive2 { name="ccrepe"; version="1.8.2"; sha256="0qh1a5j4i1x4w6d7nvv4fb4prhyfhb54knav3849c6flkx4px2pn"; depends=[infotheo]; }; - cellGrowth = derive2 { name="cellGrowth"; version="1.16.0"; sha256="00qijblp5ycjhl6vrvdjfzx87k95p84mxglk1gpnrsqxkvaf61dx"; depends=[lattice locfit]; }; - cellHTS = derive2 { name="cellHTS"; version="1.42.0"; sha256="0ghls72gnsgqc28km5a1i37y0hg2774b09ws20l6jfgj215lsfas"; depends=[Biobase genefilter prada RColorBrewer]; }; - cellHTS2 = derive2 { name="cellHTS2"; version="2.36.0"; sha256="0f6406a1r5gqh25kq6fl9hws5bxjcmg8dz93hf24iqfkri8qzzw8"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; - cellTree = derive2 { name="cellTree"; version="1.2.2"; sha256="0wzdbyg8yj602mndpmwaqfhyql424w0fgnphyv4v2qr52wwzpz12"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; - cellity = derive2 { name="cellity"; version="1.0.2"; sha256="0qg1g8k6wfamsazj13nlrra3zydj5r2yn42zkzniwyrc40fvlm86"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; - cghMCR = derive2 { name="cghMCR"; version="1.30.0"; sha256="1g66pc61nj628dip1rysc0mdq6yjhiznv6p8nfw5lmm1kbg3jzn1"; depends=[BiocGenerics CNTools DNAcopy limma]; }; - charm = derive2 { name="charm"; version="2.18.0"; sha256="1lram97r7bqbmi6qxwdjsi4m6vvqry84f2l2afzl1f6v7yjzs1fj"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; }; - chimera = derive2 { name="chimera"; version="1.14.0"; sha256="01j46sycs492j550n6z38nj23s6v0b0mrffpyc2hv95g6nf5vmx7"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; }; - chipenrich = derive2 { name="chipenrich"; version="1.10.0"; sha256="0nx5mmdxjra1vkdssn3dwf6jafdqvjbc53vcqfva0ns4jyyzx89l"; depends=[chipenrich_data GenomicRanges IRanges lattice latticeExtra mgcv plyr rms stringr]; }; - chipseq = derive2 { name="chipseq"; version="1.22.0"; sha256="0b42aikjq4wk83v314yrq1jjmz0vszk9z00xw069h84shz4zrnng"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; - chopsticks = derive2 { name="chopsticks"; version="1.36.0"; sha256="01r6w9y7gw0zja2vpr5g4mp4400njixc0mrlmy010brdfjx6zgg1"; depends=[survival]; }; - chroGPS = derive2 { name="chroGPS"; version="1.16.0"; sha256="1h0nfn74agdhwcr1w1xj0iid3y0g0mkf22b3zajxyr9yjpjws7z8"; depends=[Biobase changepoint cluster DPpackage ICSNP IRanges MASS]; }; - chromDraw = derive2 { name="chromDraw"; version="2.2.0"; sha256="16p54kd35ghdx67pnlcm6v9paic0iwl5sz4343v8rhf8yf9dxyih"; depends=[GenomicRanges Rcpp]; }; - chromPlot = derive2 { name="chromPlot"; version="1.0.0"; sha256="1qwnqmihapc0xiii8ihpw9xralwaac2jn1k62rd1a83w6b3l76f7"; depends=[biomaRt GenomicRanges]; }; - cisPath = derive2 { name="cisPath"; version="1.12.0"; sha256="1a3kjahscpdpgv07d3sjag29szyjnrn2fmgv534ljasjqdk7ay5k"; depends=[]; }; - cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.10.2"; sha256="1p2c2a7snnz25msmzxa30aijpha8mivpw6rmbqcqhv78xv5a51qq"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; }; - cleaver = derive2 { name="cleaver"; version="1.10.2"; sha256="08v4a6rc5yx3vqjdjdzxsxh6m4dnj52ybnchhhx0qq3y8ma4djd3"; depends=[Biostrings IRanges S4Vectors]; }; - clippda = derive2 { name="clippda"; version="1.22.0"; sha256="19in9vc3w35v1ixwc2i7n1nm8zc7i79hhig2n224zjrl15j0bd9a"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; }; - clipper = derive2 { name="clipper"; version="1.12.0"; sha256="0f8zx4s7linhwflnz57qhgx16zkxlgd8mlsck4py5zvs9zz7ph6c"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; }; - clonotypeR = derive2 { name="clonotypeR"; version="1.10.2"; sha256="1l4dmbszg4qkw4ksj1lcfrfi5j8fvk51qsc1l7bhvcvzwvbp9p6b"; depends=[]; }; - clst = derive2 { name="clst"; version="1.20.0"; sha256="04wq05qyrxbd138y7npfmnr7d8pngldcm77ksf5ckn92n6gc46nk"; depends=[lattice ROC]; }; - clstutils = derive2 { name="clstutils"; version="1.20.0"; sha256="0fz7mcf7csfmw9r18anliwkh77nv6bhkq6ah6cx1a5nvn05pq4l9"; depends=[ape clst lattice rjson RSQLite]; }; - clustComp = derive2 { name="clustComp"; version="1.0.0"; sha256="0k0l8s50hnpsfsfalfcvjfg38dv9pyi12g8m17nqrrvkldld7p9y"; depends=[sm]; }; - clusterProfiler = derive2 { name="clusterProfiler"; version="3.0.5"; sha256="1sm8dcyps81phf2jz7xc27wg3i43nr32883r2pb4s7syqsl4kvn0"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim GSEABase IRanges magrittr plyr qvalue S4Vectors tidyr topGO]; }; - clusterStab = derive2 { name="clusterStab"; version="1.44.0"; sha256="039xnvsji3aqvxkj4zq02lv5nk0hkgkhhvk7x9bqhgc1jlafgbrf"; depends=[Biobase]; }; - cn_farms = derive2 { name="cn.farms"; version="1.20.0"; sha256="1f55s7x8g7jyljgcdxvcfgy65h5dm7fmgwxb1qdh557sifalvy0v"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; }; - cn_mops = derive2 { name="cn.mops"; version="1.18.0"; sha256="08mhnn6vgbcfb1y84s2f7mk96z5fhafrb72cacfc8ija4l0a86ki"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; - cnvGSA = derive2 { name="cnvGSA"; version="1.16.0"; sha256="1ggm0gk6vjx7161xc8pcy7d9z1z4mngxbhjmmnj9w7qd2225yblk"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; }; - coGPS = derive2 { name="coGPS"; version="1.16.0"; sha256="1y5c43s6ivmin43rahvywm0jqyflw3klzj56b5f5yvbcn13m463w"; depends=[]; }; - coMET = derive2 { name="coMET"; version="1.4.4"; sha256="0cawkc12cj2039p7d416jalz0n6p311lir2f5cdly79n2phi1wyx"; depends=[biomaRt colortools corrplot GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; }; - coRNAi = derive2 { name="coRNAi"; version="1.22.0"; sha256="1ib66fljgiqykjs0i9yrqsa979ibz7nllh3f3gybzrs86k8i5p6h"; depends=[cellHTS2 gplots lattice limma locfit MASS]; }; - cobindR = derive2 { name="cobindR"; version="1.10.0"; sha256="16b085jxfc2ph69m8rd7523mkvribbykzv05g54jakqcgz613g6f"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; }; - codelink = derive2 { name="codelink"; version="1.40.2"; sha256="16a2qshsc7515a35cah6snifv30rbb3gzb034amz1g3a2h24z2bq"; depends=[annotate Biobase BiocGenerics limma]; }; - cogena = derive2 { name="cogena"; version="1.6.2"; sha256="0xy31pr6ginsxzf2lwyd9mnraw690zj37xylm7xfi1w1kchg3nfh"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; }; - compEpiTools = derive2 { name="compEpiTools"; version="1.6.4"; sha256="1v22hzp89409vfdi6v56cg4galfb8yr3sqpv9igjjvbbyvyil7p2"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; - compcodeR = derive2 { name="compcodeR"; version="1.8.2"; sha256="0w39pnyygvgicdivmcb6p0691fbrmg628d54i1wan070ndxkqn2x"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; }; - consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.0.2"; sha256="1lwzp5l463xg2q97mhf1cz1fgqyf0gwkzipnw1ars6832vpd579s"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; }; - contiBAIT = derive2 { name="contiBAIT"; version="1.0.0"; sha256="1apjm3i4vlkwfgrrby58aimixqlmc56l24dc2vff8s8b568582w6"; depends=[BH BiocParallel clue cluster colorspace diagram DNAcopy exomeCopy GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; }; - conumee = derive2 { name="conumee"; version="1.4.2"; sha256="0hk6chlakd2alghnzsfgzw9bw2js4byqd7lsk5kz3iwb3dds8k9b"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IRanges minfi rtracklayer]; }; - convert = derive2 { name="convert"; version="1.48.0"; sha256="1pr5nn3k8a85r1ssp6hvgayrq6hars82m9v6h5arbz93ksjj4ax3"; depends=[Biobase limma marray]; }; - copa = derive2 { name="copa"; version="1.40.0"; sha256="0ly8af559z74v2lkhiviamb54b7jfpmmnqp9fxvv2c2vg56nnigx"; depends=[Biobase]; }; - copynumber = derive2 { name="copynumber"; version="1.12.0"; sha256="1rrc8mbkh73fizp2jdqqiarxbwryf25lwcf05dwvyqbnaz8c94zl"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; }; - cosmiq = derive2 { name="cosmiq"; version="1.6.0"; sha256="0057j6a4lsmjfvjk48x2axmg13f6qbf4pjzc2ijz98laljlakc18"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; }; - cpvSNP = derive2 { name="cpvSNP"; version="1.4.0"; sha256="0hcamhbxrs5vpgw2rrm399s17ywnqqi4lx78aga2x8v9l9acga1z"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; }; - cqn = derive2 { name="cqn"; version="1.18.0"; sha256="01rqvs400ldfcyayjbqd2jpp550v8xh4a4kvic4b82dn3cxb301y"; depends=[mclust nor1mix preprocessCore quantreg]; }; - crlmm = derive2 { name="crlmm"; version="1.30.0"; sha256="0z8b97v04gmcv2zs7pnk3bwccx28whzgkgl4d1gah1b9rjpdifaj"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; }; - csaw = derive2 { name="csaw"; version="1.6.1"; sha256="18qj9axgs94vkhxwx91lmpm8rssvwiidgbijzrzabss69y1m9g8y"; depends=[AnnotationDbi BiocGenerics edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; - ctc = derive2 { name="ctc"; version="1.46.0"; sha256="0568b5b2f97jdsmhf6biixpjxd1wgh2imalcr94szynpsr5j2knz"; depends=[amap]; }; - cummeRbund = derive2 { name="cummeRbund"; version="2.14.0"; sha256="1ni7ldzbj5sjk2124i7s2p840z4igcaak4kjb28yhv7c0c2nx362"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; }; - customProDB = derive2 { name="customProDB"; version="1.12.0"; sha256="1nlyb71mrr7dd73n7gq5dvxp9yisqb8skfdabpn67wvx2kl0qq68"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; }; - cycle = derive2 { name="cycle"; version="1.26.0"; sha256="0clsi3dm3dbmfd7g03gvfhc4zczfv6lfivrxgjbhs3wm79zgbl7l"; depends=[Biobase Mfuzz]; }; - cytofkit = derive2 { name="cytofkit"; version="1.4.10"; sha256="1gdbc8k0rqrk83h90rshax6bilbb8wip9xa9bf42301a87lysnk3"; depends=[Biobase destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny vegan VGAM]; }; - daMA = derive2 { name="daMA"; version="1.44.0"; sha256="1xx0ba5wjh1ma0fpshy50ajshfpv1w1zdmzrf21jdbq1zz8ciw87"; depends=[MASS]; }; - dada2 = derive2 { name="dada2"; version="1.0.3"; sha256="12bb9vp2yxayzxicnxjs0cb5bria6h9w06qcfn4yhnp4641ql914"; depends=[Biostrings data_table ggplot2 Rcpp reshape2 ShortRead]; }; - dagLogo = derive2 { name="dagLogo"; version="1.10.2"; sha256="018vdgbyfmsrxhkv9kf80yfsgdl3mqmvzfwcw5lanfyipwpl4jgm"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; }; - dcGSA = derive2 { name="dcGSA"; version="1.0.1"; sha256="1nnh3xa7gg1ap24wf79clkm4vrlr9jbvq5f5crl7f5mmfmxpzp43"; depends=[BiocParallel Matrix]; }; - ddCt = derive2 { name="ddCt"; version="1.28.0"; sha256="1k7r0w22as0226sq11kwfb5ihbim5i5bny2qvn7gx86fzyy0br43"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; }; - ddgraph = derive2 { name="ddgraph"; version="1.16.0"; sha256="1yqkrzbkjn86mwjf5x5cq1gf8k20hnbhwppzkpspsdcyi68ldbf5"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; }; - debrowser = derive2 { name="debrowser"; version="1.0.10"; sha256="1l3pc6xqsvhmjddv27pkndgf9dz529svyj4dkm166yq4vm6pcska"; depends=[annotate AnnotationDbi clusterProfiler DESeq2 DOSE DT edgeR GenomicRanges ggplot2 ggvis gplots igraph IRanges jsonlite org_Hs_eg_db org_Mm_eg_db RColorBrewer ReactomePA reshape2 S4Vectors shiny shinyjs stringi SummarizedExperiment]; }; - deepSNV = derive2 { name="deepSNV"; version="1.18.1"; sha256="150aqdhzzydn2f3nr8zq6r7iwsr8l2jpaig5c8h7li9rhlzjma45"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; }; - deltaGseg = derive2 { name="deltaGseg"; version="1.12.2"; sha256="0m071s1qs9xv0dxb8applj0dldv4aji9vlrflbszw82gp60wzpvf"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; }; - derfinder = derive2 { name="derfinder"; version="1.6.4"; sha256="1iyabwad32g0p69651zph79zi0rvv7bpdrx66qkp7xqllddhxi8i"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; }; - derfinderHelper = derive2 { name="derfinderHelper"; version="1.6.3"; sha256="1d58n1xm1rpr65hg5p3y3abylhcp6ih5vnld8ny89492n0ssvf4n"; depends=[IRanges Matrix S4Vectors]; }; - derfinderPlot = derive2 { name="derfinderPlot"; version="1.6.3"; sha256="1mdcd0cxarbjwq4qznlks9mpfz9x4w2cd04jfhfkywpf45fkc797"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; }; - destiny = derive2 { name="destiny"; version="1.2.1"; sha256="0cwgdqx07bflrpan49ra2qcxc5dhv5xq733gb3blcam7pvjj7mfw"; depends=[Biobase BiocGenerics FNN Hmisc igraph Matrix proxy Rcpp RcppEigen scatterplot3d VIM]; }; - dexus = derive2 { name="dexus"; version="1.12.1"; sha256="1ra6wxp3wvb9g5qpvh8bm0xb13yqjmnda60mq63hks6jdg2ippmp"; depends=[BiocGenerics]; }; - diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.54.0"; sha256="0fbk3idxd9hzh9v8gk6dma7l4512k0682kcsfr72h8v0l587ayfr"; depends=[minpack_lm]; }; - diffHic = derive2 { name="diffHic"; version="1.4.3"; sha256="1gvw6kslpadlyhslwngjfh81pgdgzn1h8dpxq32l29fpyrhiig9d"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; - diffloop = derive2 { name="diffloop"; version="1.0.2"; sha256="0kgzvidpm6zxgh7rjrh4fvzvvkg4p3nm6pa9l57qnb1223r8ygwv"; depends=[Biobase biomaRt dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats plyr readr reshape2 S4Vectors statmod Sushi]; }; - diggit = derive2 { name="diggit"; version="1.5.2"; sha256="1rpp472cx3pvhi2f1xr52hdxkd9s79w4wp1iy89plam86wrp0xh9"; depends=[Biobase ks viper]; }; - dks = derive2 { name="dks"; version="1.18.0"; sha256="1nzpjph8n9s4kzyyffj6k1pbrvgzryagmr10l97dh2j2qsydz5kh"; depends=[cubature]; }; - domainsignatures = derive2 { name="domainsignatures"; version="1.32.0"; sha256="1jv72qiq5hyajryf91f6mnvbqd4klwsb0viiw4ykid02cj14vwz1"; depends=[AnnotationDbi biomaRt KEGG_db prada]; }; - doppelgangR = derive2 { name="doppelgangR"; version="1.0.2"; sha256="11g57fwhq7yzrzb5wdd07xxb75plrqdmdlar2qvn6kmbi2knn7dg"; depends=[Biobase BiocParallel digest impute mnormt sva]; }; - dualKS = derive2 { name="dualKS"; version="1.32.0"; sha256="1f31qwds9xb0lymb1cdkspk4r65rm6y7v90zrxdd6j1vij42g6m9"; depends=[affy Biobase]; }; - dupRadar = derive2 { name="dupRadar"; version="1.2.2"; sha256="1n07sr5g2hr7rgpcybcaksrihyxlgyghy5l6ldmxqdchzrz90shc"; depends=[Rsubread]; }; - dyebias = derive2 { name="dyebias"; version="1.32.0"; sha256="0g3lslnbbqxfbbyg16is33gd4v55cvqx00bcj0ig8w3xk31lpfph"; depends=[Biobase marray]; }; - easyRNASeq = derive2 { name="easyRNASeq"; version="2.8.2"; sha256="0bmwcx8gpr3a1fl4vz41s9k5rsi4l0jivsfxwvsw1kw87py00qvl"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; }; - ecolitk = derive2 { name="ecolitk"; version="1.44.0"; sha256="16zsqrvbwl8ayh4x87ycnzv3iyqjixwd2rkc5xhk3ywd8khvdp0i"; depends=[Biobase]; }; - edge = derive2 { name="edge"; version="2.4.2"; sha256="168qgzszvmv9rjk999a1csvv9k27bgpjl67m9qi46y14y0mnlgmk"; depends=[Biobase jackstraw MASS qvalue snm sva]; }; - edgeR = derive2 { name="edgeR"; version="3.14.0"; sha256="14vrygy7rz5ngaap4kgkvr3j18y5l6m742n79h68plk6iqgmsskn"; depends=[limma]; }; - eiR = derive2 { name="eiR"; version="1.12.2"; sha256="00vzydf6nf6cql7qds5nxbw46cr5w4h02xiayi7ayg7nl54xdfa2"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; }; - eisa = derive2 { name="eisa"; version="1.24.0"; sha256="0pn6ilkvnji974j9qjhvqgfh7427nxaqwjvd22mplsnr81mfrr6d"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; }; - ensemblVEP = derive2 { name="ensemblVEP"; version="1.12.0"; sha256="1akhzdk9kczy34fczff1j420682rkbniwcjx1bqrml75jd87xz36"; depends=[BiocGenerics Biostrings GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; - ensembldb = derive2 { name="ensembldb"; version="1.4.7"; sha256="1310n4ws68xw0ymac59w172jd61s547wl6zagzkk2zhk00bfwfma"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; }; - epigenomix = derive2 { name="epigenomix"; version="1.12.0"; sha256="0rhhnh835ah5d9hsv64i6y9hqb9yqmd15f7g4xkc7hws84jw3alb"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; - epivizr = derive2 { name="epivizr"; version="2.2.4"; sha256="0jvp08mfk05v2gmmxnbxbr825w2n75dc7jwvw88aymn0cc4bv5mf"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; }; - epivizrData = derive2 { name="epivizrData"; version="1.0.3"; sha256="101jn7fabzk3jkn25vn5r3g4iyjjm9qq8gdqq8wk45m0b5gglf7p"; depends=[Biobase epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; }; - epivizrServer = derive2 { name="epivizrServer"; version="1.0.3"; sha256="1zzixb6gz43l9wlj4g6givax9rykb26xjx0i1xfnlwbxfl62z3wm"; depends=[httpuv mime R6 rjson]; }; - epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.0.4"; sha256="0sd9vddihba3xwi2yjmzilklavggrwpavffbs9mhrjnh6hl62h73"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; }; - erccdashboard = derive2 { name="erccdashboard"; version="1.6.0"; sha256="0f4q701yd8zghzxj6mj8ljd0h09q7f694mlm566p4867gc4iqs3c"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; }; - erma = derive2 { name="erma"; version="0.4.2"; sha256="09fmys40b2vz8py69bblq7chxqwn34mcq460zqlxpj51f7d1zn1d"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; }; - eudysbiome = derive2 { name="eudysbiome"; version="1.2.0"; sha256="1pcfbx120vyxvdw7hfaqmy1snc2ksvra59kz0qi0mjimvva69hd9"; depends=[Biostrings plyr R_utils Rsamtools]; }; - exomeCopy = derive2 { name="exomeCopy"; version="1.18.0"; sha256="008dvhcha5jjawzvxknqzxgv3cp0v1nxv60ngjkqczzihac66pby"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; - exomePeak = derive2 { name="exomePeak"; version="2.6.0"; sha256="1lwk5y3ma373mcr3l9cq9biq6qj7yc1lljmpa8qndwckgkg2dzl7"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; }; - explorase = derive2 { name="explorase"; version="1.36.0"; sha256="1aa21qgx59g8iipys9rm57ll3smjwz49wi7l2s833svd5z53amkf"; depends=[limma rggobi RGtk2]; }; - fCI = derive2 { name="fCI"; version="1.2.2"; sha256="1fhxhy6jkkly439l2sfz8mg4nknqgh167j6b413iikl2b7w9sg83"; depends=[FNN gtools psych rgl VennDiagram zoo]; }; - fabia = derive2 { name="fabia"; version="2.18.1"; sha256="1hm6zlcky156zb3wppmxhkrm8xjkl12kcn8hh2kc95k6hsajc6zb"; depends=[Biobase]; }; - facopy = derive2 { name="facopy"; version="1.6.0"; sha256="0wgd05sg3h9h8v7y9kva0v6296928bbzbifdkfp2910fsjw8pvdl"; depends=[annotate cgdsr coin data_table DOSE facopy_annot FactoMineR ggplot2 GO_db GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz S4Vectors scales]; }; - factDesign = derive2 { name="factDesign"; version="1.48.0"; sha256="1cxyzxxz0cli21bqcsg2arcdqnimczql8d47skdwv449mxgcan9c"; depends=[Biobase]; }; - farms = derive2 { name="farms"; version="1.24.0"; sha256="06swwfjbaq2xqbkrabv4jk4xxnxkmvjpx3a0rx0mi0j7fv8i5xs8"; depends=[affy Biobase MASS]; }; - fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.8.0"; sha256="1d7y120sxh3dqfyhpc4bayplrfwvarfj31imrad3h8mpk6j7a3jg"; depends=[Hmisc LiquidAssociation WGCNA]; }; - fastseg = derive2 { name="fastseg"; version="1.18.0"; sha256="1dnlws7wv9dl5adimzmzcmhg7zlc7xrfxvbzdf86hnh6ci0wvxji"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; }; - fdrame = derive2 { name="fdrame"; version="1.44.0"; sha256="16dlcmn8ldh4irxbczr0pyljj98rgjz6xb084nz7gqg7w5mfdakl"; depends=[]; }; - ffpe = derive2 { name="ffpe"; version="1.16.0"; sha256="1nhi0xbicw7iglizq3kxhywmlmyxaj30c588ccaf039v9p0rx165"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; }; - flagme = derive2 { name="flagme"; version="1.28.0"; sha256="01andc84ls5r3pa0m63mxl3f203kf5i6z00hj4fs1c0999jyv14x"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; }; - flipflop = derive2 { name="flipflop"; version="1.10.0"; sha256="1pm64f58m3i4vq95s6y4kan2cw5zc70xjh1z3h6343jqn9vfpnxv"; depends=[GenomicRanges IRanges Matrix]; }; - flowAI = derive2 { name="flowAI"; version="1.2.9"; sha256="1gb3a8f4xsjwspyacdbi2h5kicsawh20dd22xnpg8nlviypqz912"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 scales]; }; - flowBeads = derive2 { name="flowBeads"; version="1.10.0"; sha256="1vvggb937iabdn9y6z81sc5vshdyi9017ivz0mf5npi09gm02xb5"; depends=[Biobase flowCore knitr rrcov xtable]; }; - flowBin = derive2 { name="flowBin"; version="1.8.0"; sha256="138h229ny5k9abclby79phlywyckgkqdkd02sdg16028amckmgq7"; depends=[BiocGenerics class flowCore flowFP limma snow]; }; - flowCHIC = derive2 { name="flowCHIC"; version="1.6.0"; sha256="1gy7cgyy1ifn989vgkik3b633li6ir3kznhb4wh21wqvrfy9d39n"; depends=[EBImage flowCore ggplot2 hexbin vegan]; }; - flowCL = derive2 { name="flowCL"; version="1.10.0"; sha256="14z6pyjc5v5zi3l9qiz85yrbhaykyfw77vmvb4nzrvm6mdqm1z5r"; depends=[Rgraphviz SPARQL]; }; - flowClean = derive2 { name="flowClean"; version="1.10.0"; sha256="1slf34rss2l1faj2kszgaiafaj0n0wddfgrnpylav62lfricyzih"; depends=[bit changepoint flowCore sfsmisc]; }; - flowClust = derive2 { name="flowClust"; version="3.10.1"; sha256="0y5mylb09fnyk8a8bhr8g3xpzz3l8pcs7xi91gdxjqamkqi8v700"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; }; - flowCore = derive2 { name="flowCore"; version="1.38.2"; sha256="1pspsjmvc3lk06i0mrccdpmp0snpb79ng7dip4lc5rbbr9764ps3"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; }; - flowCyBar = derive2 { name="flowCyBar"; version="1.8.0"; sha256="1vj97swrfqh3v50js0hk1agfnjzdawsc0pjrvcncs3avh9awag1r"; depends=[gplots vegan]; }; - flowDensity = derive2 { name="flowDensity"; version="1.6.0"; sha256="1x9jfkv4s5l1pa4cjm5d96l1s9nvxjv8vxlkyax33h009cci4yzs"; depends=[car flowCore GEOmap gplots RFOC]; }; - flowFP = derive2 { name="flowFP"; version="1.30.0"; sha256="1nqqm0zmv9rf46dflshmhcgwi15kg0f7szljxm4l4j4vg377hc0w"; depends=[Biobase BiocGenerics flowCore flowViz]; }; - flowFit = derive2 { name="flowFit"; version="1.10.0"; sha256="0wfsg359zi7bi8wgf5zfwj3gjk5sghynsd9la5x1idsm2hfkqh7x"; depends=[flowCore flowViz gplots kza minpack_lm]; }; - flowMap = derive2 { name="flowMap"; version="1.10.2"; sha256="11fkd89rcwmzfln375p9hgv1z79ipvvhha7krz6wvi0z63lv1131"; depends=[abind ade4 doParallel Matrix reshape2 scales]; }; - flowMatch = derive2 { name="flowMatch"; version="1.8.0"; sha256="071fkhwfwwabbrb1vmwwdvg96lizyf67wvf6g080qac9jsqq2xid"; depends=[Biobase flowCore Rcpp]; }; - flowMeans = derive2 { name="flowMeans"; version="1.32.0"; sha256="0z06479v8xihjyvb8y615yqkd5mkw2879z7qciwkyc32dy3kp6zs"; depends=[Biobase feature flowCore rrcov]; }; - flowMerge = derive2 { name="flowMerge"; version="2.20.0"; sha256="1ibclh3wdz07rqzri61y01ijvrrj8bjmv3l9ddlzgzs6wk07r842"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; }; - flowPeaks = derive2 { name="flowPeaks"; version="1.14.0"; sha256="0ypp5qhl4wxfsbz64d7zvkk606h7wniz4s01zswv61vhygjhr8p0"; depends=[]; }; - flowPlots = derive2 { name="flowPlots"; version="1.20.0"; sha256="01gjkks9cvrjzacpynsv5i9ir4569b7q9yzfzk337xhz5r140brh"; depends=[]; }; - flowQ = derive2 { name="flowQ"; version="1.32.0"; sha256="1bf5avnjn5vg2569pyvrrsq1jv6n0sslyxm9rav2mj321smy05lm"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; }; - flowQB = derive2 { name="flowQB"; version="1.18.4"; sha256="15gk1nbn4yhjw7378d84y3lh4kr1p2bxdra1wfd8scz7nyd6q8kr"; depends=[extremevalues flowCore]; }; - flowStats = derive2 { name="flowStats"; version="3.30.1"; sha256="0sblxshpkw9sx16p1ni9wg6hmhdv9q5i8ssccq41rhrgnyiahacc"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS]; }; - flowTrans = derive2 { name="flowTrans"; version="1.24.0"; sha256="1ri3frs5z702scn88zrymhm8slwl4g1273yn14w065vay9gq2klr"; depends=[flowClust flowCore flowViz]; }; - flowType = derive2 { name="flowType"; version="2.10.0"; sha256="0w0zgddk89bavjhjnkjv7bmqpg2q3d9fxadll4da2dsqzg4nwpy2"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; }; - flowUtils = derive2 { name="flowUtils"; version="1.36.0"; sha256="1vd01iw2ki7yqq7g9islqy3z8ks6ciih7j2ja2gff31kvn95lyyc"; depends=[Biobase corpcor flowCore graph RUnit XML]; }; - flowVS = derive2 { name="flowVS"; version="1.4.2"; sha256="0d0xrsscnsxl3b2rm7rhvjm0rhca9x6hckxq5hvnmwdcnyswr2jr"; depends=[flowCore flowStats flowViz]; }; - flowViz = derive2 { name="flowViz"; version="1.36.2"; sha256="1b1sp46lbkdsyx43g3qxx3ggvj8hy17bg71n6l8r6gh0i39fagqn"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; - flowWorkspace = derive2 { name="flowWorkspace"; version="3.18.11"; sha256="0i16fq30lbrjq3nkd6lkkz9c9p2azprnsjw9bm0y01wkzjlhc9hz"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz scales stringr XML]; }; - flowcatchR = derive2 { name="flowcatchR"; version="1.6.2"; sha256="0p1yb5gz2zyc6g9k3jxsbllvysj65srhnj1bsh57qmk7glkda7wl"; depends=[abind BiocParallel colorRamps EBImage rgl]; }; - fmcsR = derive2 { name="fmcsR"; version="1.14.2"; sha256="07c14iix1c31axskgxf8ffwyrryxpdmsq33nwfpv20951c3n9zc1"; depends=[BiocGenerics ChemmineR RUnit]; }; - focalCall = derive2 { name="focalCall"; version="1.6.0"; sha256="16y4ry894ricj3jyq26y5kcyb90za2f7bpc8n9qxb5b69179dsdw"; depends=[CGHcall]; }; - frma = derive2 { name="frma"; version="1.24.0"; sha256="0rglkly4b0n9hsw47hznymmzk1g6c64qk12bkhfj6hcp8hg4swss"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; }; - frmaTools = derive2 { name="frmaTools"; version="1.24.0"; sha256="1wgybdhqvh1ip9qiqcgnsav0bdm9lspxgb611vh7nga4qlham2y5"; depends=[affy Biobase DBI preprocessCore]; }; - gCMAP = derive2 { name="gCMAP"; version="1.16.0"; sha256="0914vnpzy5kmff9d09x5bdisy01r0j482hm0jy3d7v1c0ij57psl"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; }; - gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.12.0"; sha256="1ba4ayc2ylyrijym48lyrmkn2az3x42n8q0cb7snwb9wc8c4pn5x"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; }; - gQTLBase = derive2 { name="gQTLBase"; version="1.4.2"; sha256="1xhpxpjhnjzwwpmsm9v0jxqikl52fwaw6h8lyp6svzjwcxni863h"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; - gQTLstats = derive2 { name="gQTLstats"; version="1.4.3"; sha256="0lbhmicn47zqblnanwd8j05lnmcgmxz21n7r3fr1vj3wigkl2p77"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggplot2 gQTLBase IRanges limma mgcv reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; }; - gaga = derive2 { name="gaga"; version="2.18.0"; sha256="0pp0k2gqb5ysxxgfw4551lc87rd5b5n4fxkp0c59hdiwqr2gm9jv"; depends=[Biobase coda EBarrays mgcv]; }; - gage = derive2 { name="gage"; version="2.22.0"; sha256="1hcl0ipripvkz8i9bk6vlb0qhx7mq487vay7668h4byjdxw33axq"; depends=[AnnotationDbi graph KEGGREST]; }; - gaggle = derive2 { name="gaggle"; version="1.40.0"; sha256="0xs2rblfh4wa05jdb6fjf8mgqhfwgjzbrf8gq9nsh8lgv4a8azz0"; depends=[graph rJava RUnit]; }; - gaia = derive2 { name="gaia"; version="2.16.0"; sha256="14fnwf7rizc8vp7mjbnw16ar5l21kkgggxn1rrmwpsjd321rzyc3"; depends=[]; }; - garfield = derive2 { name="garfield"; version="1.0.2"; sha256="00xpv7aqx0bh9azmpkxlpwjn0kp0wijpac9ssz9ic9chs2p9b4ga"; depends=[]; }; - gaucho = derive2 { name="gaucho"; version="1.8.2"; sha256="0w09hd7r1y41yv3fyarzrkqw3gzzqk6qplbqrdd74hz7iq4rxcqg"; depends=[GA graph heatmap_plus png Rgraphviz]; }; - gcatest = derive2 { name="gcatest"; version="1.2.2"; sha256="04il1idfisf99d7v50gpk5dscn9vs787mxw4h3ga9f5a73ii1hn9"; depends=[lfa]; }; - gcrma = derive2 { name="gcrma"; version="2.44.0"; sha256="0zvv9wqv5cxs203cfnxgvlf7xmdkcm66jx4jjdamjvvlnlbgbvd4"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; }; - gdsfmt = derive2 { name="gdsfmt"; version="1.8.3"; sha256="1cvg87fzgd1fzdphxkl5vh0frbjwrghf2i4hrwgh9h9pszkjpirc"; depends=[]; }; - geNetClassifier = derive2 { name="geNetClassifier"; version="1.12.0"; sha256="0i5pbcsz1y9z75yvc7fdk7820y1hmbr28jfmvm382c43namcki55"; depends=[Biobase e1071 EBarrays minet]; }; - geecc = derive2 { name="geecc"; version="1.6.0"; sha256="11a3dlgzaagb6iyx8pa38kxv50wvb1s96m36w0azcg1z3z77h6yy"; depends=[gplots hypergea MASS]; }; - genArise = derive2 { name="genArise"; version="1.48.0"; sha256="0zyxnx2xx5ywz3cgbmkh7ay0fwgmgn320knbs8mz8bniilc2mm0b"; depends=[locfit tkrplot xtable]; }; - genbankr = derive2 { name="genbankr"; version="1.0.4"; sha256="0x6m9qa61cka549gd0fvywc63rkj2afxhgyfjmyfg4x9dxdxc670"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; }; - geneRecommender = derive2 { name="geneRecommender"; version="1.44.0"; sha256="0hij3vx023z9wc905hhq845wya4ivapnpf5cp57vvcssxxks91nl"; depends=[Biobase]; }; - geneRxCluster = derive2 { name="geneRxCluster"; version="1.8.0"; sha256="1nrq2sfazs0zpnlh70lsnalvgqb3z8sqr3fryxqdb4vp26alddbk"; depends=[GenomicRanges IRanges]; }; - genefilter = derive2 { name="genefilter"; version="1.54.2"; sha256="1hmz6as0njvrsrdbgmk72jyclnnqvfdvp6kqv456h43ldq2ajfv5"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; }; - genefu = derive2 { name="genefu"; version="2.4.2"; sha256="09priw4chfy853dadylfk8h2jjwajccq4kcyjxdfycd8np02f6sq"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; }; - geneplotter = derive2 { name="geneplotter"; version="1.50.0"; sha256="0lvrywl0251g4y0h0qlgkbg4l83ja5544c85z1wj30qxiy77iqc2"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; - genoCN = derive2 { name="genoCN"; version="1.24.0"; sha256="1wd21qd153lnq8z69mia84ij8v9323is81njxivh4lqcrr2m0lgr"; depends=[]; }; - genomation = derive2 { name="genomation"; version="1.4.2"; sha256="017hxh3yhizlsswd2vw8504arkckrcgq5zraiw67lldq9wzs5qzg"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr readr reshape2 Rsamtools rtracklayer S4Vectors seqPattern]; }; - genomeIntervals = derive2 { name="genomeIntervals"; version="1.28.0"; sha256="0ic0h1jd1qddqg90j7i55cyjc28jqc1s1qvbjdv0xi2zfl0yfi5g"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; }; - genomes = derive2 { name="genomes"; version="3.2.0"; sha256="16gyr1wb822hw92cf00njkgls1i718n67zprpc9q364b9js1095g"; depends=[curl readr]; }; - genoset = derive2 { name="genoset"; version="1.28.2"; sha256="1zrng0c0yws8hlhz09gm68dlc6xk5kmjz3xxqhfg5dr56sdryg1y"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; - genotypeeval = derive2 { name="genotypeeval"; version="1.2.2"; sha256="1asmy822hb6i02jgbx005zb7p02zladhp5zvbgi3apxy9h17fwlw"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; }; - genphen = derive2 { name="genphen"; version="1.0.0"; sha256="1030gg9cqmzz4iwssv9y0ai42ar356w6y61aj96p3901jbq78v0v"; depends=[Biostrings e1071 effsize ggplot2 randomForest]; }; - gespeR = derive2 { name="gespeR"; version="1.4.2"; sha256="1npbfm20cbq9raq9d26biy65c1ag705k1s068yc9z6j51w4a9h8m"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; - ggbio = derive2 { name="ggbio"; version="1.20.2"; sha256="167ppjb4kkxhgxmlzfcgwa7ggm6mkfg2b0z2q1iav0kc9sdy1zz4"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - ggcyto = derive2 { name="ggcyto"; version="1.0.6"; sha256="1xpavy6dcgq5zwlyi7wb0ldavqdh74bkg2plpbp7lmmn496w26n6"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; }; - ggtree = derive2 { name="ggtree"; version="1.4.20"; sha256="15fnkbq9jcw5n54z5vm5dj9giaxm0a8w3017gkd3klyywlcpk7mp"; depends=[ape ggplot2 jsonlite magrittr tidyr]; }; - girafe = derive2 { name="girafe"; version="1.24.0"; sha256="0qr0mv1biv6xs86sc3kv97p19kc12hvxa96mhbpw4qabbmaaadh8"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; - globalSeq = derive2 { name="globalSeq"; version="1.0.2"; sha256="1hbi19i0jyg3axjgmvakdckk5hdbm6p3hxxnqh2xgnf7qwkj74v3"; depends=[]; }; - globaltest = derive2 { name="globaltest"; version="5.26.0"; sha256="0myg87l3aqrk03qiibzya8fx12xn7w3myizhhvbd84v86xgjl8dp"; depends=[annotate AnnotationDbi Biobase survival]; }; - gmapR = derive2 { name="gmapR"; version="1.14.0"; sha256="034z2z2gav7nny0c9npn9h71hlq15ag866fbab7ii8rqvapy6vh0"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - goProfiles = derive2 { name="goProfiles"; version="1.34.0"; sha256="0m2cki0mrf874nhj390zb7i41v6a9lrr22sx2x6yq22qs6067p32"; depends=[AnnotationDbi Biobase GO_db]; }; - goTools = derive2 { name="goTools"; version="1.46.0"; sha256="15n35kp826lgp0bl91p1zxy65a7vx8ln895vqp31ss06hqlgrksf"; depends=[AnnotationDbi GO_db]; }; - goseq = derive2 { name="goseq"; version="1.24.0"; sha256="05zm23bj1i9al9bsg870pyk1r663vsv08sz9wn5dmriwv9rq2i4b"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; }; - gpls = derive2 { name="gpls"; version="1.44.0"; sha256="07v0k6bsf35rkj7irsz7rwfba3fnnszy2kx6n0qzphlcgwda94hx"; depends=[]; }; - gprege = derive2 { name="gprege"; version="1.16.0"; sha256="103z7bsjqwc4d4mimaavrd46v8l0pchrahhgqkkpyjxq6ibk7krw"; depends=[gptk]; }; - graph = derive2 { name="graph"; version="1.50.0"; sha256="0ys5s19m5r30rlr0fnx2h0z2qw7n2xrad4l2yfb1bbrk8dwyf4pi"; depends=[BiocGenerics]; }; - graphite = derive2 { name="graphite"; version="1.18.1"; sha256="0s9si7jz044nv80r0zyy4kvc0sjd8mckhnhn05bb16ym5650qg2r"; depends=[AnnotationDbi BiocGenerics graph rappdirs]; }; - groHMM = derive2 { name="groHMM"; version="1.6.0"; sha256="1l9mcyzyc548114ysb9r0q7hgzw3yy7gpiahrzkzj6hblc4f1jyp"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; }; - gtrellis = derive2 { name="gtrellis"; version="1.4.2"; sha256="133wlm7807rz9wa37prjrwginwlljbyvf5j7zlslzihpfj3b1q2n"; depends=[circlize GenomicRanges GetoptLong IRanges]; }; - gwascat = derive2 { name="gwascat"; version="2.4.2"; sha256="1q6wfp234c2ja2k3r2m21mfgwz3dwy2ayml9vxbdhgsi496ixray"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; }; - h5vc = derive2 { name="h5vc"; version="2.6.3"; sha256="0x4frfkx6l30ns686ybqqhqvxn3x8gwm5m9zbcvnk8yd864jxfwh"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; }; - hapFabia = derive2 { name="hapFabia"; version="1.14.1"; sha256="1fmlw49ab6b5ry7qsh9riismki8slh4kym4agpkfbdj4qjhicdwq"; depends=[Biobase fabia]; }; - hiAnnotator = derive2 { name="hiAnnotator"; version="1.6.2"; sha256="1p6w035pm6ikkf8nv1lah0055rblmj8313bjwxkqm8m5g51imz7b"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; }; - hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.8.2"; sha256="18iq1f6hvxi3n7bm25np8daa5bvmyayhq47w2qf1nbbl7j8vyi4z"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator rSFFreader sonicLength xlsx]; }; - hierGWAS = derive2 { name="hierGWAS"; version="1.2.0"; sha256="0gnc9cnwy9ji8r7jiy2irsikb06v044cmhpjfgphsqchaf53h4sv"; depends=[fastcluster fmsb glmnet]; }; - hopach = derive2 { name="hopach"; version="2.32.0"; sha256="15x6mrk9f0vjbddafzr8g5p3j1a7z5ws2a361nj83djnx4z7mnh8"; depends=[Biobase BiocGenerics cluster]; }; - hpar = derive2 { name="hpar"; version="1.14.2"; sha256="0rmnwrkblljlpa1d19sxjwqw6hcqx6aajl2vv8g9qlcwklp0igl8"; depends=[]; }; - htSeqTools = derive2 { name="htSeqTools"; version="1.18.0"; sha256="0n05bsqxmji335nkfg7a38i91k8nf7mf1vkhi8mg6mags7sqysl2"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; }; - hyperdraw = derive2 { name="hyperdraw"; version="1.24.0"; sha256="1bng0b48blj3mmga799j2103lwdnrh1shbp0jjczzyrhh8l30xby"; depends=[graph hypergraph Rgraphviz]; }; - hypergraph = derive2 { name="hypergraph"; version="1.44.0"; sha256="10vyxw05a6asyvphzxdv10fl437nqwxcy8z2maqijxhhkrq91mz9"; depends=[graph]; }; - iASeq = derive2 { name="iASeq"; version="1.16.0"; sha256="0ggcpygyf4x39ky1y0p7f67i0knnhrmpab20gcf5cs5239l1k369"; depends=[]; }; - iBBiG = derive2 { name="iBBiG"; version="1.16.0"; sha256="1776i6jsgfhwmbzflx487l7aav5a9xa5v3md6wzwkalmq4vz1h0s"; depends=[ade4 biclust xtable]; }; - iBMQ = derive2 { name="iBMQ"; version="1.12.0"; sha256="14rmnzzq5ix2in0hhz36nzixvm51jgsrhrzp28767vfrw3d59dqn"; depends=[Biobase ggplot2]; }; - iCARE = derive2 { name="iCARE"; version="1.0.0"; sha256="035i02mi92kqsrn1n81j7bqxzf1czra4fdrfya0ihjyvjl363hsx"; depends=[]; }; - iCOBRA = derive2 { name="iCOBRA"; version="1.0.2"; sha256="16f7vdlwnnlk73lwi3y5yvcb5ww9qkc6ynyyafi73a4mj4vyiw0x"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; }; - iCheck = derive2 { name="iCheck"; version="1.2.0"; sha256="16rr1l1s0kbhk8xhbr4cac0xb7sd9p92y9dm8hyi5hd65w3yryzc"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d vsn]; }; - iChip = derive2 { name="iChip"; version="1.26.0"; sha256="1271033d2rfj4ib50955rk3bspj78h1aslmf8pkfbmb2y1pm1jz9"; depends=[limma]; }; - iClusterPlus = derive2 { name="iClusterPlus"; version="1.8.0"; sha256="1ryalbvf24pd2lk3brxy6zb616n5sfqn484lxgsl04mb8k4qppzd"; depends=[]; }; - iGC = derive2 { name="iGC"; version="1.2.2"; sha256="0p8nhybxn82c82i6z7hy4ddlnkrw5r3zsal67wkvbxw40h0ljpmx"; depends=[data_table plyr]; }; - iPAC = derive2 { name="iPAC"; version="1.16.0"; sha256="0qh1fikcqkl2hxqfkgxy16nlzqnqkkpz93b81kbpj1bgb4y3amnm"; depends=[Biostrings gdata multtest scatterplot3d]; }; - iSeq = derive2 { name="iSeq"; version="1.24.0"; sha256="0sbnnr0mcnidvk3bb303a3i4n5f5lf3c2p3rnaj1m96msfjfhfmw"; depends=[]; }; - ibh = derive2 { name="ibh"; version="1.20.0"; sha256="1fx1bb14z0is1zbarxy3bd7ynrlxf97z2501k2ajq5c5ijm05kkr"; depends=[simpIntLists]; }; - idiogram = derive2 { name="idiogram"; version="1.48.0"; sha256="0p0ji1yqp8ygzm8bqdq5zw73rw1n5c9y104k2bnf90vp9q8428kr"; depends=[annotate Biobase plotrix]; }; - illuminaio = derive2 { name="illuminaio"; version="0.14.0"; sha256="0vywygdg57msqm1a9m5ld40rf06fir686gc0h5ygs9gcs2rm7979"; depends=[base64]; }; - imageHTS = derive2 { name="imageHTS"; version="1.22.0"; sha256="0rrjwf1yfdln7xwsizssjfavr4dwmdm1bwys09bk8ja63d5s9zb5"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; - immunoClust = derive2 { name="immunoClust"; version="1.4.0"; sha256="144nhjg6r3jjn7ws0gqfhzsfhkx4b2azvijrjqndr958bip81qnr"; depends=[flowCore lattice]; }; - impute = derive2 { name="impute"; version="1.46.0"; sha256="0v9ibgv8kp8il52miz7b7z65mv6irqxylx6lfzkxgvxd970dgrz0"; depends=[]; }; - inSilicoDb = derive2 { name="inSilicoDb"; version="2.7.0"; sha256="14sv2rwfjv3h5l9qxd4c1wc83gfghmwbwds92g4wfvflbda9i6g8"; depends=[Biobase RCurl rjson]; }; - inSilicoMerging = derive2 { name="inSilicoMerging"; version="1.15.0"; sha256="1dvbkjn5pj6w6ixrkvljbz843dsmihcnhbs6vm6a1iyc2l6dx41k"; depends=[Biobase]; }; - intansv = derive2 { name="intansv"; version="1.10.0"; sha256="0fgc45gaqm2vpvcbvwm54w93i7fmp4pv365pqqcq6sy3lilzxn92"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; }; - interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.10.2"; sha256="1rvqh3krhcmqk82ykhcpqm93xci5bsh0xg8dw45jb80ldfz00nrh"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; }; - interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.10.3"; sha256="0gn19dd8m8jc8cjkwy12m7g7mzbxpfg2lhw0pklhbb00nq1hykqa"; depends=[BiocGenerics shiny]; }; - inveRsion = derive2 { name="inveRsion"; version="1.20.0"; sha256="1sjrpcccnnk2jfiwxm1ly0mzj8h6z3dvv9r3sa2ph5k4v13rn3gn"; depends=[haplo_stats]; }; - iontree = derive2 { name="iontree"; version="1.18.0"; sha256="07j97v062sm1dv3bz7n5s7z5vimizkmv5g8ck4irvdjwm7my572a"; depends=[rJava RSQLite XML]; }; - isobar = derive2 { name="isobar"; version="1.18.0"; sha256="1zckdyaclbnmyhmzavlr350q1pqqwrl9s0cdplfr1bj6hjififc0"; depends=[Biobase distr plyr]; }; - isomiRs = derive2 { name="isomiRs"; version="1.0.3"; sha256="1kclz9kl3pvg2djm6kkxwg8nds33pryf7l27ilx51hcarci78gkq"; depends=[BiocGenerics DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots IRanges plyr RColorBrewer S4Vectors SummarizedExperiment]; }; - iterativeBMA = derive2 { name="iterativeBMA"; version="1.30.0"; sha256="0x6sd1zdw5lr5r5fw3xig1466cch3snradcms8dl9y1dwnv7vr2v"; depends=[Biobase BMA leaps]; }; - iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.30.0"; sha256="0vbvkqlj2facp4wfww650wm9m3czh33rj99d7mmi9h2qsvmbza21"; depends=[BMA leaps survival]; }; - jmosaics = derive2 { name="jmosaics"; version="1.11.0"; sha256="1wg8mqh72dqwzqyx0wr1y0wqqmy10qv7fx0ybb78fh76jdwrq4lw"; depends=[mosaics]; }; - joda = derive2 { name="joda"; version="1.20.0"; sha256="06lli20fxdvf9836xmg1dkf7f62khnd4lpz9c3xna9wqawcdk3wa"; depends=[bgmm RBGL]; }; - kebabs = derive2 { name="kebabs"; version="1.6.2"; sha256="1bc5qg23h0f648l2xpizvyagd6jwwhwj1hw5s70jkb42qfvgpyr5"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; - keggorthology = derive2 { name="keggorthology"; version="2.24.0"; sha256="0340gpvjpnk00iyn06bp0ad1cibp6b0kq4gk143mvkcvyk8vhk01"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; - kimod = derive2 { name="kimod"; version="1.0.0"; sha256="05g1kvdfnhb77iwnad85214lf2q6lmrsz29lgc95kwyn62r60fj8"; depends=[Biobase cluster]; }; - lapmix = derive2 { name="lapmix"; version="1.38.0"; sha256="1k4057cykcm1nzzp09yb31pl2w9ii047cc4iknndklp3827riyc0"; depends=[Biobase]; }; - ldblock = derive2 { name="ldblock"; version="1.2.2"; sha256="1rr01m9dgzg3lxnql0fvak89rnjwnlqxclq70wks1j6wr5ggyxqi"; depends=[Matrix snpStats]; }; - les = derive2 { name="les"; version="1.22.0"; sha256="17cxxbf5z2v5ada43lj6blb6c0wcfp8izvgyi58dv1rf8nmp77w7"; depends=[boot fdrtool gplots RColorBrewer]; }; - lfa = derive2 { name="lfa"; version="1.2.2"; sha256="1xqjj7q70qxx952yf28s2ry03mj4csbri21gi7rl5ixi0581ji3a"; depends=[corpcor]; }; - limma = derive2 { name="limma"; version="3.28.21"; sha256="1dvisifd2rr7s1rrsqj5vrv2qcg4la4yi2ajbn0zkk5z81ffxv9f"; depends=[]; }; - limmaGUI = derive2 { name="limmaGUI"; version="1.48.0"; sha256="0rr6202jp7qx2csbvqr6qcg8584v9msmiqgcm6r1wmrwggh7nksb"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; }; - lmdme = derive2 { name="lmdme"; version="1.14.0"; sha256="1ng0ng1pxdrxpmmaqzg8dxl4wics06z9g28zfgpdzq1hacckspd4"; depends=[limma pls stemHypoxia]; }; - logicFS = derive2 { name="logicFS"; version="1.42.0"; sha256="0311x3miljdg9d1fw0x24il4c2i0d799z3si44vw7r6xxws11fzb"; depends=[LogicReg mcbiopi]; }; - logitT = derive2 { name="logitT"; version="1.30.0"; sha256="16fqyk0kkidz7as21zslii97mhzclmf7pd5bimvajv9hbx7m1284"; depends=[affy]; }; - lol = derive2 { name="lol"; version="1.20.0"; sha256="1vp25q5a1q9fzagy85lb0ab3iiapj4ilas5wkjxavh6bx6198z4w"; depends=[Matrix penalized]; }; - lpNet = derive2 { name="lpNet"; version="2.4.0"; sha256="02bq0fw0hq50y591ys85lk50hy2ad72izrvf7wds1x4c3sgcbhnm"; depends=[lpSolve nem]; }; - lpsymphony = derive2 { name="lpsymphony"; version="1.0.2"; sha256="1ckijz59g5sx8phwg28xv17iwlja6mdnffnzrwqg1f17kc423vzm"; depends=[]; }; - lumi = derive2 { name="lumi"; version="2.24.0"; sha256="1p8w6lfwlzcizc6517hb85ih8p9wzqklk2s7qsacsprfwh1h7wvq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; }; - mAPKL = derive2 { name="mAPKL"; version="1.4.2"; sha256="089hsy6x144qrwqd555py8zlb7zka4yjf1qww0lx7kv131295wkf"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; }; - mBPCR = derive2 { name="mBPCR"; version="1.26.0"; sha256="1c57c3dfaxdzalqnsfg9ac5kppn8hdajnxmy58rzma0509k9kjkd"; depends=[Biobase oligoClasses SNPchip]; }; - mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.6.0"; sha256="1p2wk16db2g2ns6vvk7ms5s10n3xk37nbbpdgjrim9b1jxiv7mf3"; depends=[GenABEL MASS outliers qtl]; }; - maCorrPlot = derive2 { name="maCorrPlot"; version="1.42.0"; sha256="14i8q92jhp22r6mkb2813507q270z6jhpq1qvagaardvhvaqjqzj"; depends=[lattice]; }; - maPredictDSC = derive2 { name="maPredictDSC"; version="1.10.0"; sha256="0w3csffy6285d3y9lj8b7i59x5x4zkgwf2pl07y5vx7rdpjg9rfr"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; }; - maSigPro = derive2 { name="maSigPro"; version="1.44.0"; sha256="05piq7h2zg8pgxd29xgk346ikbbam02fsg8i4k9q55i5bnx7ifmb"; depends=[Biobase limma MASS Mfuzz]; }; - maanova = derive2 { name="maanova"; version="1.42.0"; sha256="0kypia11sal5gmiykapzaly18qsrbv4qi22ilz5c1plrk65rz0li"; depends=[Biobase]; }; - macat = derive2 { name="macat"; version="1.46.0"; sha256="137g4wmdyzfyj45gjxla0caf0pp0gbns30v521j7awlxq8rsd6qh"; depends=[annotate Biobase]; }; - made4 = derive2 { name="made4"; version="1.46.0"; sha256="1wj7pfajhwhl6gbja4hr8jlzciighgzhhvy8553pkj4mnrv204r3"; depends=[ade4 gplots RColorBrewer scatterplot3d]; }; - maigesPack = derive2 { name="maigesPack"; version="1.36.0"; sha256="061bp7mqi1n0c1vcbnbmmpxbj2lvjvbcny4vh55klqw1r7wqjbm6"; depends=[convert graph limma marray]; }; - makecdfenv = derive2 { name="makecdfenv"; version="1.48.0"; sha256="0s065hgmrinrixxc813114cqi91n0s10ngkbm8r20q5jm3xfsiqd"; depends=[affy affyio Biobase zlibbioc]; }; - manta = derive2 { name="manta"; version="1.18.0"; sha256="0kqic6985zxz9hwcmyhc0px6ggdmshbsz4x3xyw9mc1q2d6svjdp"; depends=[caroline edgeR Hmisc]; }; - marray = derive2 { name="marray"; version="1.50.0"; sha256="1rzbk40zzkr7xll5dzfy92jjmf0qkkw9l806kaz1mwfal8qka87m"; depends=[limma]; }; - maskBAD = derive2 { name="maskBAD"; version="1.16.0"; sha256="0s1l2s2niqsvjk2083i8141mrvf8ardxg5mg7w742r5ga0m469sq"; depends=[affy gcrma]; }; - massiR = derive2 { name="massiR"; version="1.8.0"; sha256="01yhz3cf9wgxszrcvxkyqj8ab8a5p52kqj1zg499147kaf8hciqn"; depends=[Biobase cluster diptest gplots]; }; - matchBox = derive2 { name="matchBox"; version="1.14.0"; sha256="1fnxyig4wmhaymbn4adh7pxxk9qqck796n34w4lrrx0ggxwlz2g1"; depends=[]; }; - mcaGUI = derive2 { name="mcaGUI"; version="1.20.0"; sha256="0akv7l6sy6nvj658q8pjp7dhkkfsx7x9iww9mv0jwyfdn811saa2"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; }; - mdgsa = derive2 { name="mdgsa"; version="1.4.2"; sha256="047syngjdzjpad3iqy0s1a6f5pyl3rmsmadasjzc4f3l7xyq6jmn"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; }; - mdqc = derive2 { name="mdqc"; version="1.34.0"; sha256="0xm6v7irlkhbi1ny93fglhixajbp41lkv7yjzr8ysszvdakwrmmr"; depends=[cluster MASS]; }; - meshr = derive2 { name="meshr"; version="1.8.0"; sha256="171is2w5d7i26mmdncz2wx3y48dnqhbzgskwsn3l3c1acmnrpbr6"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; }; - messina = derive2 { name="messina"; version="1.8.2"; sha256="01p0zbmay73v2ba41fs0hmnn47q7flggc0y0jhgf22cpjmsqm0qj"; depends=[foreach ggplot2 plyr Rcpp survival]; }; - metaArray = derive2 { name="metaArray"; version="1.50.0"; sha256="1kfhiplzxvz0j99h2kigqfwpgpqzp17yl3dq2qw51s99257gwjvd"; depends=[Biobase MergeMaid]; }; - metaCCA = derive2 { name="metaCCA"; version="1.0.2"; sha256="0g345pxmlhkxdx8fm725y52vx8zd24wi5rxhqh5xs087dqyzmy6k"; depends=[]; }; - metaMS = derive2 { name="metaMS"; version="1.8.0"; sha256="1skvlqz8q9k3pqibbjyr9ajx9x1p11649lmh8f0sgi6y4xframq7"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; }; - metaSeq = derive2 { name="metaSeq"; version="1.12.0"; sha256="1x398spd55qwj4pj5bfsmh0skj4gqy7h4dv16c65lk7r9qmkg99s"; depends=[NOISeq Rcpp snow]; }; - metaX = derive2 { name="metaX"; version="1.4.2"; sha256="0d70jnljn2r26vrsyndf8pac0k731q38l8g84sb932ff7w48sqkf"; depends=[ape BBmisc boot bootstrap CAMERA caret data_table DiffCorr DiscriMiner doParallel dplyr faahKO ggplot2 igraph impute lattice missForest mixOmics Nozzle_R1 pcaMethods pheatmap pls plyr preprocessCore pROC RColorBrewer RCurl reshape2 scales scatterplot3d SSPA stringr tidyr VennDiagram vsn xcms]; }; - metabomxtr = derive2 { name="metabomxtr"; version="1.6.0"; sha256="0shgzl0k2b3ig6gycgl4xf09qwk288p61dqd2gi231p4q825sc5v"; depends=[Biobase Formula multtest optimx plyr]; }; - metagene = derive2 { name="metagene"; version="2.4.4"; sha256="0p8d6fq1zn0k8r7fb6iz80azk866abw1kqahx1lx35vgaxxm9smx"; depends=[BiocParallel DBChIP GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges matrixStats muStat R6 Rsamtools rtracklayer]; }; - metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.1.0"; sha256="1z7wj7zglm05ny0caqkj8h22sxgawrh295i4jlis6y39lhwbv6bj"; depends=[Biobase Biostrings dplyr lattice lazyeval magrittr RSQLite ShortRead stringr]; }; - metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.14.2"; sha256="08iwmv4ggsw98h6pf26dzbpb5qg77pcmjapxr77z4mhcram6yaxi"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; }; - metahdep = derive2 { name="metahdep"; version="1.30.0"; sha256="0yifwp5cya5j8c1kl9a8nfqgn2l8imfjb1gzcxf32c53jwppwbf9"; depends=[]; }; - metaseqR = derive2 { name="metaseqR"; version="1.12.2"; sha256="0ycfqjxd9vyx4dky42yxg3754lx37s1yc3r1nr774r0kbzaykbc3"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; }; - methVisual = derive2 { name="methVisual"; version="1.24.0"; sha256="1g4ijymr6bv384vcsdpkamn5mk0gkd5mf7yiyjmbsgzwxx6mrpii"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; }; - methyAnalysis = derive2 { name="methyAnalysis"; version="1.14.0"; sha256="1nva4c9f30x5ym3cd2f3r4dxksihdaqzzskkanb7f6n89xdl512h"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; }; - methylMnM = derive2 { name="methylMnM"; version="1.10.0"; sha256="1944palwb2hfvsi8j4384fhjmqfk41fihq2w9y3cff0993j5i8cp"; depends=[edgeR statmod]; }; - methylPipe = derive2 { name="methylPipe"; version="1.6.2"; sha256="1mci0y9dy1lb5vv7makh4mbm4h5ybdi0ay6qqf343y56zpjdlwmm"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; - methylumi = derive2 { name="methylumi"; version="2.18.2"; sha256="1jxmk1r44x847sny1jrkka20a1z27yh7fv9pwgaabl5z8vxhpbyy"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; - mgsa = derive2 { name="mgsa"; version="1.20.0"; sha256="0zy1mmil5s2jiwknixavxhn05b58qyr87gc1yd7i86z7d0f66zjh"; depends=[gplots]; }; - miRLAB = derive2 { name="miRLAB"; version="1.2.2"; sha256="1wd591kd12dlj8dzxyv7dadi5clr0l6ar9n6lscc2yr16jwlwcv6"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; }; - miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.0.2"; sha256="1nc4qgk5sr1l007q5rqm2492azbbmffd7y17r0kfscr2pv67cs4x"; depends=[AnnotationDbi DBI miRBaseVersions_db]; }; - miRNApath = derive2 { name="miRNApath"; version="1.32.0"; sha256="1cijz8wbaq0wg6f0qf37b65fska619fw8vxy57anm258nasi1z8m"; depends=[]; }; - miRNAtap = derive2 { name="miRNAtap"; version="1.6.0"; sha256="0dbqh8jwzqhdjs8gd8095qzhbwn5c8ahqn7qq0dhl1yhhv3hpbw5"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; }; - miRcomp = derive2 { name="miRcomp"; version="1.2.2"; sha256="19x8ldv1bdnbmjwjaicqmaf7iy391n42h5y1lckjlbcsxbss84bi"; depends=[Biobase KernSmooth miRcompData]; }; - microRNA = derive2 { name="microRNA"; version="1.30.0"; sha256="1y997xxnf6b3magg2jkg26pa6sibz9c30bcc2131minvw2a1x7i4"; depends=[Biostrings]; }; - minet = derive2 { name="minet"; version="3.30.0"; sha256="06ya26k7k8a3pphqfr93xcplrl2di895mnqmvywqg17lgn2df557"; depends=[infotheo]; }; - minfi = derive2 { name="minfi"; version="1.18.6"; sha256="1mbrjmmjib5fw8jvk9fw6gfwfcqwi87qgwjphsvdfwhczlzkii7j"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter data_table genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; }; - mirIntegrator = derive2 { name="mirIntegrator"; version="1.2.0"; sha256="0axnmf01xdbf50jzi16awx4anj44diyshzhwjy9akcq0fw3x9bs9"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; }; - missMethyl = derive2 { name="missMethyl"; version="1.6.2"; sha256="02i343siji4z48zg8p9daxl57smgc3myx2f0s67mmzp59gbabz7q"; depends=[AnnotationDbi BiasedUrn IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; }; - mitoODE = derive2 { name="mitoODE"; version="1.10.0"; sha256="1vgywn96b1p6yndhxcx2297p93skdpw8r7yzfz6ph828camw7g73"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; }; - mmnet = derive2 { name="mmnet"; version="1.10.2"; sha256="18ypmvx4pjqv40k2jclq92gl2cw9qpkakifv2jnaa27qnp1x9ivc"; depends=[Biobase flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; }; - mogsa = derive2 { name="mogsa"; version="1.6.4"; sha256="14mfnsylckgv01k8g2hj5vxbfiih0d0jk77rb0r8p21lcd25ls7a"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; - monocle = derive2 { name="monocle"; version="1.6.2"; sha256="1j65kdzrlzyfzv1in0lswqksv3rs336jddnpxyw8k27iz343dvvf"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 HSMMSingleCell igraph irlba limma matrixStats plyr reshape2 VGAM]; }; - mosaics = derive2 { name="mosaics"; version="2.10.0"; sha256="0kazrdn03a5969d7gy86wfvskpw3bmfib7pbd1p59pic5nnhqznp"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; - motifRG = derive2 { name="motifRG"; version="1.16.0"; sha256="1ds22paqc0923y6z1fy0arw0wxvvmglfvfgarhywv1qywhq68mbq"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; }; - motifStack = derive2 { name="motifStack"; version="1.16.2"; sha256="1a37h7ryj9hj43mb1ynrsi5ypfaw2cr1cfmccw44bwf1fn5grzl3"; depends=[ade4 Biostrings grImport MotIV scales XML]; }; - motifbreakR = derive2 { name="motifbreakR"; version="1.2.2"; sha256="0zfvig6rf4ix5hh6mk5lada9sh7cr6nbngqr6gqgm5hy5bvkn51m"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; }; - msa = derive2 { name="msa"; version="1.4.5"; sha256="0g3p5kfyszll09dwdfjwkkdyhnfj1ymk4bfk1j01vlzqhcd3d2hl"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; - msmsEDA = derive2 { name="msmsEDA"; version="1.10.0"; sha256="0spbbj1vxyyhmhbg79sby9i7hw8lxzn95qp1qpcds6pzbi98555p"; depends=[gplots MASS MSnbase RColorBrewer]; }; - msmsTests = derive2 { name="msmsTests"; version="1.10.0"; sha256="04gdsxdpmrpj8nzm5jn96dzvyxrcjj29nks4n0rx53lqada3zx8y"; depends=[edgeR msmsEDA MSnbase qvalue]; }; - multiClust = derive2 { name="multiClust"; version="1.0.2"; sha256="1a4brwg01ni96p661aqvaivdrfg6x7iwv5sh1303bm7fzr8kyhhh"; depends=[amap cluster ctc dendextend mclust survival]; }; - multiscan = derive2 { name="multiscan"; version="1.32.0"; sha256="0kxnnk55605km690ikfglbnc39kps4a26r2v9wcdfngza0jcf4xa"; depends=[Biobase]; }; - multtest = derive2 { name="multtest"; version="2.28.0"; sha256="11z0rzfzfk2fgl0l7hv9sb6g19d9ixkn634fnfb2pz141bbsrcwd"; depends=[Biobase BiocGenerics MASS survival]; }; - muscle = derive2 { name="muscle"; version="3.14.0"; sha256="0h9czpi4qvl94kgdil6c263k4r55a0baw2h11qn0i8vy6szgb4l0"; depends=[Biostrings]; }; - mvGST = derive2 { name="mvGST"; version="1.6.0"; sha256="16gdxqghch4422vnjf1phzfrdp63043bag2jmhm3yni0z92b47p1"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; }; - mygene = derive2 { name="mygene"; version="1.8.0"; sha256="17a5q7zbsm1qk7asz4ddf5vgyxvfsxkpxhn52p5gd6aikv5kjdqr"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; }; - myvariant = derive2 { name="myvariant"; version="1.2.0"; sha256="06d7awkmx8fg4m8j09lscs1kvk9nx1nbd0xmb6divsjhb3mx1p0j"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; }; - mzID = derive2 { name="mzID"; version="1.10.2"; sha256="18fwrd3df0gbji1g48dd1zblmf7hz33h1jwfx0nana0j8y8x3xr1"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; }; - mzR = derive2 { name="mzR"; version="2.6.3"; sha256="1kfz5kwbjpz3pg0ccrkx0alq14bcp4z6az4k8h3766n9zcb69774"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; }; - ncdfFlow = derive2 { name="ncdfFlow"; version="2.18.0"; sha256="01614r9507vwz7irdccxb3swlx5jlxrmdcnxjgd7yxzfdwsc012x"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo zlibbioc]; }; - neaGUI = derive2 { name="neaGUI"; version="1.9.0"; sha256="12sca0i2h7k6lcr525cnc476bf1g6gqzvi6zm0zpdbciyl9cxbny"; depends=[hwriter]; }; - nem = derive2 { name="nem"; version="2.46.0"; sha256="0aa6lgivy69daaixx5zzymlfypn22gn1x0126ygrbv9g8vpzr470"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; }; - netbenchmark = derive2 { name="netbenchmark"; version="1.4.2"; sha256="0id1b0v6vkzdh030vq3ppfr808kq1blyb6s4jncr772izy4irnmb"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; }; - netbiov = derive2 { name="netbiov"; version="1.6.0"; sha256="12d28igggc8mw05bzxl67647akx1yrw671s67jfdc0zyg2xvfgi9"; depends=[igraph]; }; - nethet = derive2 { name="nethet"; version="1.4.2"; sha256="0ygz7zqksp5i1fk5gqpb4dlsqyi3z609379h654arzkr1s1kvdqj"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; }; - netresponse = derive2 { name="netresponse"; version="1.32.2"; sha256="1qx8xsxlgib73c2bgjxj01y8y47c8mi15708pdb589dm8aldkilq"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; }; - networkBMA = derive2 { name="networkBMA"; version="1.14.0"; sha256="1az74f0fa9z9x4d68mjxlzf1d5x1zjam494qs79r294qbf7h7jpr"; depends=[BMA Rcpp RcppArmadillo RcppEigen]; }; - nnNorm = derive2 { name="nnNorm"; version="2.36.0"; sha256="02s0rcwq5b0bar5h8x08xgz1gdvr69dlv4l3s84d4s1rb2bmjipa"; depends=[marray nnet]; }; - nondetects = derive2 { name="nondetects"; version="2.2.0"; sha256="06dkj8fd2l3a0x2zz84g3kfyqsw3pridn05admhag0nalzqiy6c3"; depends=[Biobase HTqPCR limma mvtnorm]; }; - normalize450K = derive2 { name="normalize450K"; version="1.0.0"; sha256="0rfzvg4lc8wppx5g5zhcgp8vh4qw9gynmmnwdgnf48fmdvkirpm9"; depends=[Biobase illuminaio quadprog]; }; - npGSEA = derive2 { name="npGSEA"; version="1.8.0"; sha256="130w9rw7njff90b070kkq395ariy9y409kxxmbq61fmdmnqvxnnk"; depends=[Biobase BiocGenerics GSEABase]; }; - nucleR = derive2 { name="nucleR"; version="2.4.0"; sha256="1s6k181g4q23x1pk9728vbsjia8dlcwn1gl2b9rvwagspidyvq1p"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; - nucleoSim = derive2 { name="nucleoSim"; version="1.0.2"; sha256="0vyjr0lbswfwdil48pafljz79s384qr7pk4jsfqnih07c8drj5pb"; depends=[IRanges S4Vectors]; }; - nudge = derive2 { name="nudge"; version="1.38.0"; sha256="01gvisf0894hz1jgmhf9d0b98rj92k1bfhy3pn1fpqp4qq9i3dp0"; depends=[]; }; - occugene = derive2 { name="occugene"; version="1.32.0"; sha256="06ywswmbmkajwa7wwj0bbmgwk50h0af9b5m1bvm26w6yqkpxyn0v"; depends=[]; }; - odseq = derive2 { name="odseq"; version="1.0.2"; sha256="1y2nvm05pf7pmrrb1kfvkspqwrlq5fsk28kbp6bh3df7f4rahwpx"; depends=[kebabs mclust msa]; }; - oligo = derive2 { name="oligo"; version="1.36.1"; sha256="1jwbj5b3n9vwgf81cr8cnxhiynmnh2yjzsd1520a67na739ddsxr"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; }; - oligoClasses = derive2 { name="oligoClasses"; version="1.34.0"; sha256="1jz5s7srrdxxfppplajq7q4c1sqwbw6lwsb0xms2chw1qnshj3r5"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; }; - omicade4 = derive2 { name="omicade4"; version="1.12.0"; sha256="031vnyv15aw1kmw0cdjsmb2q0g90hc1316dh8za64z0k0cmhdkb9"; depends=[ade4 made4]; }; - oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.38.0"; sha256="0x7s8f6cvl6dlrjq5g7wq9542rpjqqgal1x0jh1za667n5cw1zgv"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; }; - ontoCAT = derive2 { name="ontoCAT"; version="1.24.0"; sha256="188j6wl5y9zvki4gzfv58i50vf56q36snk025pkj973nll82m4vl"; depends=[rJava]; }; - openCyto = derive2 { name="openCyto"; version="1.10.3"; sha256="1i0qq7v5s09cm6icp7347dlcbf9n81fai8xxv6ahk90jngmlsncs"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; - oposSOM = derive2 { name="oposSOM"; version="1.10.0"; sha256="0ybyqxy4z0djppjj7gqw71pm4ll6b5rzwrc7zfsil9n1n33ajvdj"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; }; - oppar = derive2 { name="oppar"; version="1.0.2"; sha256="0nzjiy18amidc7x388lpq65i2yj0lvy0xgwzzgnlyqfjcdhlasi4"; depends=[Biobase GSEABase GSVA]; }; - pRoloc = derive2 { name="pRoloc"; version="1.12.4"; sha256="1qvg41wyn9snqr0fqygcpma4q80kr7gxsfh78yz4jmykqdvgwm53"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; }; - pRolocGUI = derive2 { name="pRolocGUI"; version="1.6.2"; sha256="1ka87amamlzbapb1ih0x5mlcq0lmz4prqsdf0j4il01kq5x9ml5i"; depends=[dplyr DT MSnbase pRoloc scales shiny]; }; - paircompviz = derive2 { name="paircompviz"; version="1.10.0"; sha256="0b1vfkg554pmm0nmfjlbriqvbvy4fzik8cwn7qqsvzqs1928ii0i"; depends=[Rgraphviz]; }; - pandaR = derive2 { name="pandaR"; version="1.4.2"; sha256="17gx2hfr1s79c69y8w3fmfrrvkzbr2m0917cq7wwdpxxi376b6yk"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; }; - panp = derive2 { name="panp"; version="1.42.0"; sha256="17hlbi20bxm2qidk8aa224vsqp9dfjjd79yhh0711h9aylwixn6m"; depends=[affy Biobase]; }; - parglms = derive2 { name="parglms"; version="1.4.2"; sha256="1k04zpwwk1aknlwg5xqsl1pszwbh2873606y2ycqsi7ngz1yhwnx"; depends=[BatchJobs BiocGenerics doParallel foreach]; }; - parody = derive2 { name="parody"; version="1.30.0"; sha256="03hvv8jgk56h60gfm62ia4f67fhszs8dv5whx3frriwbf7w2jxaw"; depends=[]; }; - pathRender = derive2 { name="pathRender"; version="1.40.0"; sha256="1fa9d2sp1rxwmxkd1snqa5ay5q5znx8xbmn3jsga9giw9nh7iras"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; }; - pathVar = derive2 { name="pathVar"; version="1.2.0"; sha256="15jha74blfxdr5398gdwg59p4wmymjkmwvinrspw29dqkxn0wm64"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; }; - pathifier = derive2 { name="pathifier"; version="1.10.0"; sha256="0kj9jm0az186d89lr6p016zsnj3zjcbwcs094jqf322zz795c275"; depends=[princurve R_oo]; }; - pathview = derive2 { name="pathview"; version="1.12.0"; sha256="1vx6s2ad0yaqv2mnc6257qgmghffhyh7cwsir2pcvy7jd7xdkcl8"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; }; - paxtoolsr = derive2 { name="paxtoolsr"; version="1.6.3"; sha256="1l6d4r6c3mjsaczw4cyiglfc8dw34k56bz0vd5ddaiy01kqn5g1w"; depends=[data_table httr igraph plyr R_utils rJava rjson XML]; }; - pbcmc = derive2 { name="pbcmc"; version="1.0.0"; sha256="0xchby283wni800wlslk7rfdm7nqnasli1d81al8rsn98lachyiq"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; }; - pcaExplorer = derive2 { name="pcaExplorer"; version="1.0.2"; sha256="0nr84v2mwzw0bbz5y8llgkpkg10jalc0ciwnqgaskl1skxvhc4ja"; depends=[AnnotationDbi d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges limma NMF plyr S4Vectors scales shiny shinyBS shinydashboard SummarizedExperiment topGO]; }; - pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.16.0"; sha256="08c8ppxb6md10ar252xii7qgr6pjlbbiim9ap1giib7dyvzf4qjj"; depends=[AnnotationDbi Biostrings ellipse]; }; - pcaMethods = derive2 { name="pcaMethods"; version="1.64.0"; sha256="0dkvsh758hv16h6irhr8xy4sgsxp2ki1gpan33vyqq0fzlbibhxl"; depends=[Biobase BiocGenerics MASS Rcpp]; }; - pcot2 = derive2 { name="pcot2"; version="1.40.0"; sha256="011p0935bkvlm12f0lbcflcprlzn34m25gj64169wp15lpygpcky"; depends=[amap Biobase]; }; - pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.36.0"; sha256="0f57fsp1aaz4sliqzamjma7shmiqfn82ggdcnzaysizn4r86gd4b"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; - pdmclass = derive2 { name="pdmclass"; version="1.44.0"; sha256="0mcd1s33j0l0nqma31dwh7wyx3vfbvw68rnlxksp5a6d6fx0sxlb"; depends=[Biobase fibroEset mda]; }; - pepStat = derive2 { name="pepStat"; version="1.6.2"; sha256="1a95f5sha96ww4y92qjycimclikd19x4dc5az9nha6c7v5l67nqw"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; - pepXMLTab = derive2 { name="pepXMLTab"; version="1.6.0"; sha256="1amgga42b7rds5k9c2m3is1s6lgh80sc8df7y9yfw1m09gwjg8vd"; depends=[XML]; }; - phenoDist = derive2 { name="phenoDist"; version="1.20.0"; sha256="1car8mpffbbabnh7fbsrk445y0ld45lz7953sbsbrfwd9chj4dk9"; depends=[e1071 imageHTS]; }; - phenoTest = derive2 { name="phenoTest"; version="1.20.0"; sha256="0bcg6qd51i9npskjsiflz5fl6135wchlk0pqpbnv0g33fzqvgrgi"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; }; - phyloseq = derive2 { name="phyloseq"; version="1.16.2"; sha256="12h69xckgsnl12mlmn7nard4pac42w5r8m8gj4vaml9w2hwlxcgq"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; - piano = derive2 { name="piano"; version="1.12.1"; sha256="08zl41mv4wldpbnjhgqynp56csksz9x2ggy3v6axbsf4av08xl0p"; depends=[Biobase BiocGenerics gplots igraph marray relations]; }; - pickgene = derive2 { name="pickgene"; version="1.44.0"; sha256="0ilz8dcidximbrijy8a957hf6rxp54h45c36wmd90cbmxj54lv3c"; depends=[MASS]; }; - pint = derive2 { name="pint"; version="1.22.0"; sha256="01ydp1y039vq359ir7h13wl7avar8layx10r132488qdv7g65gnd"; depends=[dmt Matrix mvtnorm]; }; - pkgDepTools = derive2 { name="pkgDepTools"; version="1.38.0"; sha256="0rcrq32y3qi63ad8inc71y1gxydjc110lgz4bsvdkxykwmyxabgk"; depends=[graph RBGL]; }; - plateCore = derive2 { name="plateCore"; version="1.30.0"; sha256="00ccxrad5xfklwh2040hvp20wqqqgh0351qj00y11bmpz4ylng2p"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; }; - plethy = derive2 { name="plethy"; version="1.10.0"; sha256="0mvvhzacz1m4k9ig898r6kn7c1f7f96lky358km28gpk463cm3bp"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; }; - plgem = derive2 { name="plgem"; version="1.44.0"; sha256="07ygi6gvll2bnjwn8y4nmmgcz1daah0zzgidnwblzbyj4s2d4dam"; depends=[Biobase MASS]; }; - plier = derive2 { name="plier"; version="1.42.0"; sha256="0fqdvp75hz8c3k3779kdbl4xdjfqqvbd11vp0ad9jxan7j5giyca"; depends=[affy Biobase]; }; - plrs = derive2 { name="plrs"; version="1.12.0"; sha256="0pwpbpp05r95qcsk00icspna35lbw67d3h5apvgl4mibdw4jyvw4"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; }; - plw = derive2 { name="plw"; version="1.32.0"; sha256="114lpq9ksf8sbbcwvaczkmqgqqjfwpay1c82v192bmrhpjr3g6y4"; depends=[affy MASS]; }; - pmm = derive2 { name="pmm"; version="1.4.0"; sha256="1kh9h6033lq4mix4x4nw67dj6kw4y4k333i72swfki0vl6b43lip"; depends=[lme4]; }; - podkat = derive2 { name="podkat"; version="1.4.2"; sha256="0bfa2f04yr71vm1w9bqqij8gb68d5n5v1ydcnai016y7gkxxrb25"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; }; - polyester = derive2 { name="polyester"; version="1.8.3"; sha256="13visqfz6kpjqyqq8i6zwg7mr2f2p5rlk6pssysa8yc0j7bk1hrn"; depends=[BiocGenerics Biostrings IRanges limma logspline S4Vectors]; }; - ppiStats = derive2 { name="ppiStats"; version="1.38.0"; sha256="1z24495iy33qk7ymq08zrpl4kfv0s61slibsycn1diwhgshzglx3"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; }; - pqsfinder = derive2 { name="pqsfinder"; version="1.0.2"; sha256="0zqxr39lpzhlv22fdhlbihnr7hwwql94amhdvddbp25frdizmann"; depends=[BH Biostrings flowCore GenomicRanges IRanges Rcpp S4Vectors]; }; - prada = derive2 { name="prada"; version="1.48.0"; sha256="0209h2v72kqp6993kvfbddpc1s2qh880ag6j60lqfaz3zb09cd32"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; }; - prebs = derive2 { name="prebs"; version="1.12.0"; sha256="0rbas8hkzlsn1ch3pgwz8sh5siwfgdfr0hpr592vjp9mmxz4jl2j"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; }; - predictionet = derive2 { name="predictionet"; version="1.18.0"; sha256="0b39arsfjxz43ybm479aisl5pc2n5z4vpva5whzr8z7qh382bfan"; depends=[catnet igraph MASS penalized RBGL]; }; - preprocessCore = derive2 { name="preprocessCore"; version="1.34.0"; sha256="0bcfi26ahs4ybagvz29vlp1wldhhbwwh73xz6v6xb07nakyzb6cf"; depends=[]; }; - proBAMr = derive2 { name="proBAMr"; version="1.6.0"; sha256="0r5sw67h8dwqbaizvaz7prch4jxzj6gfvcym1iv30nim7iadnd0m"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; }; - procoil = derive2 { name="procoil"; version="2.0.2"; sha256="0j3n3nxldwzv3pjn2djnk8ql97x6xppn0lhcz6nq4glwcdrly47b"; depends=[Biostrings kebabs S4Vectors]; }; - profileScoreDist = derive2 { name="profileScoreDist"; version="1.0.2"; sha256="0fl71nlvzl7gi96py4q63qkrd33xrpqcvld2jly7sv0cj2ng36nc"; depends=[BiocGenerics Rcpp]; }; - prot2D = derive2 { name="prot2D"; version="1.10.0"; sha256="1iy2lklhd4hmmf66z2yzs5bm8zmbcmdk52b0n6f4m1hlfwb0cv8n"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; }; - proteinProfiles = derive2 { name="proteinProfiles"; version="1.12.1"; sha256="07ymi2m0vrnf4dzd0m6hard90y80k1v1r4i3ci8pa5mgfziws70s"; depends=[]; }; - proteoQC = derive2 { name="proteoQC"; version="1.8.2"; sha256="0z8swyyvwcw8phwnnsvjrvr21fh2m453k57b69sqb87hisczg2ra"; depends=[ggplot2 MSnbase Nozzle_R1 plyr Rcpp reshape2 rTANDEM seqinr VennDiagram XML]; }; - psygenet2r = derive2 { name="psygenet2r"; version="1.4.0"; sha256="1mw1d95fbq2b88by9hmil3vycrqbmpmg2kasx4grypiz1ximyngb"; depends=[BgeeDB biomaRt ggplot2 igraph RCurl reshape2 stringr topGO]; }; - puma = derive2 { name="puma"; version="3.14.0"; sha256="0pd87cd4qn81839vvlxcvivwnfl40rbgjqz1mrmv4rbwgqz1ail5"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; - pvac = derive2 { name="pvac"; version="1.20.0"; sha256="0n62i5byxrw879q0gxd9sbg2by4cy76f8ngmbxnwpz4bnc8j6vpj"; depends=[affy Biobase]; }; - pvca = derive2 { name="pvca"; version="1.12.0"; sha256="0jcswb05gwrwc2zv3idzr0qcp7p1bn32xx8rhmq557aiirql1dib"; depends=[Biobase lme4 Matrix vsn]; }; - pwOmics = derive2 { name="pwOmics"; version="1.4.0"; sha256="121qvb2mlnq7as5bjb2xzq7y8gz4x47wg2z3s7s40zvglgpdjf03"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; }; - qcmetrics = derive2 { name="qcmetrics"; version="1.10.2"; sha256="0mr0iabnj51wdhv9q5wifhisfl002dhddvscqpp78kycv12dvmga"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; }; - qpcrNorm = derive2 { name="qpcrNorm"; version="1.30.0"; sha256="127lqq0p80h920c5lf6k2ffng9fl3p78ivhnkk9y9drv2p2imr5f"; depends=[affy Biobase limma]; }; - qpgraph = derive2 { name="qpgraph"; version="2.6.1"; sha256="0y2dlaww0wyrmj73h50478fjzlg8cib6rsimzhrhh48gvgaw5whl"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; - qrqc = derive2 { name="qrqc"; version="1.26.0"; sha256="0r0gds35czs1xq5gv94n3c5i5gr2bjswij7l048npb8cqsmpvdq5"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; }; - quantro = derive2 { name="quantro"; version="1.6.2"; sha256="1rv0hihccq35cjf70vpk12y60w5kl9iwhhxx0fmjbax230v4vjmg"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; }; - quantsmooth = derive2 { name="quantsmooth"; version="1.38.0"; sha256="1c69rrl8cijixlcr9kzcs3wfvgizvvrsyglqr8s10s23drrwywzb"; depends=[quantreg]; }; - qusage = derive2 { name="qusage"; version="2.4.0"; sha256="125mp6w9g335sjkf2894iycp98s5jcz3jljy0l6s46pbpy0hc77v"; depends=[Biobase limma lsmeans nlme]; }; - qvalue = derive2 { name="qvalue"; version="2.4.2"; sha256="08zcqxs6mrqxin01m998s9lglb9ylcb4p7sqd8am57z4qcqwwcra"; depends=[ggplot2 reshape2]; }; - r3Cseq = derive2 { name="r3Cseq"; version="1.18.0"; sha256="05rli70p45q10b7gk9k4fanw35ayljj6b6079phdsm1v7vnbdkw5"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; }; - rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.10.0"; sha256="1yzaj7fra1m4f89j5n1iqv9iiq9w9j5crscdhd2plm331nparhiv"; depends=[data_table XML]; }; - rCGH = derive2 { name="rCGH"; version="1.2.2"; sha256="0ysyhgnzb50222mjlyzawdw0xw10xw8isd5knj81hwn9x80ag6jp"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; - rGADEM = derive2 { name="rGADEM"; version="2.20.0"; sha256="0m1nmab4xmw4v1b6nvb3x7f7kiq24rdw4xzh591qs90rl4r0y339"; depends=[Biostrings BSgenome IRanges seqLogo]; }; - rGREAT = derive2 { name="rGREAT"; version="1.4.2"; sha256="08daai2dwsahsnc1yzrnbs8bs2yadz2vd7fkpaigp4k6i9b0mvrm"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; }; - rHVDM = derive2 { name="rHVDM"; version="1.38.0"; sha256="0806iyx00mpi4jv9ff6x3ncfzvrk4smp60l91w5xldwysxmwn10q"; depends=[affy Biobase minpack_lm R2HTML]; }; - rMAT = derive2 { name="rMAT"; version="3.22.0"; sha256="00gg376hqxpg02vwv6qklgaivxj04bcb6d8vd6cvdnn43j2ffpdr"; depends=[affxparser Biobase BiocGenerics IRanges]; }; - rRDP = derive2 { name="rRDP"; version="1.6.0"; sha256="0rv2cj91w6xp7q066imgkw3r3yiwfvrl3qhm89nmnqbda8sgnw2i"; depends=[Biostrings]; }; - rSFFreader = derive2 { name="rSFFreader"; version="0.20.0"; sha256="067mykdwa1xzr0jhp95nmdvj4z0kp983vsimpcshqzpifv7xj32s"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; }; - rTANDEM = derive2 { name="rTANDEM"; version="1.12.0"; sha256="01ghsf4wr9pvssd6qs1jkxav53bw1mjyirik7992rdam7j9lidzr"; depends=[data_table Rcpp XML]; }; - rTRM = derive2 { name="rTRM"; version="1.10.2"; sha256="1lr3f2ysw8rwqb1l5x29vqsyp4934jl9jb3yjyqqbacgrfxf7syb"; depends=[AnnotationDbi DBI igraph RSQLite]; }; - rTRMui = derive2 { name="rTRMui"; version="1.10.0"; sha256="0j622hasfzqszsh09q9w4prv8dqbdy7hnyrrdvhbx2fkm1r6h9zp"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; }; - rain = derive2 { name="rain"; version="1.6.0"; sha256="07xcqq6wb81220l8c6hb8i2d9s8vysr577bb53khxsrqnv4am57w"; depends=[gmp multtest]; }; - rama = derive2 { name="rama"; version="1.46.0"; sha256="01xc7ys5505a8krb785w4l36yf7n050m4cdnk00vhkd60j0g6dy9"; depends=[]; }; - randPack = derive2 { name="randPack"; version="1.18.0"; sha256="08mnwj7lb7z6pffnpvilii6bphzb5vkc4f1fzyvgbbk3zvdcrajf"; depends=[Biobase]; }; - rbsurv = derive2 { name="rbsurv"; version="2.30.0"; sha256="1q89kz0wqixl6m9vp8x54255j2qjpkb60jd0y8a24kpphln54afq"; depends=[Biobase survival]; }; - rcellminer = derive2 { name="rcellminer"; version="1.4.2"; sha256="0256asrz6ivjvhkwskfk71q6n3xdgnjqbggp9lz8dvsk2wl8snrn"; depends=[Biobase fingerprint gplots rcdk rcellminerData shiny stringr]; }; - reb = derive2 { name="reb"; version="1.50.0"; sha256="0bi8jv4r5h7hbkn6m8wc2kv2qyadc0gvx16jkwsk5p450lh5c5ba"; depends=[Biobase idiogram]; }; - recoup = derive2 { name="recoup"; version="1.0.2"; sha256="09cgbdqv9q60dhd972mcgyrfcczv52idni69yj2c4jnbmx1224ks"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; }; - regionReport = derive2 { name="regionReport"; version="1.6.5"; sha256="0fa9vhx2as2agbij1scpsih5f31ksqdvvrfj7mn2d3rkz8sqi9a7"; depends=[DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; - regioneR = derive2 { name="regioneR"; version="1.4.2"; sha256="0qn5say4gy9l1lli0i98i4amjqz75f390689dxn9ncfdcaqxkprw"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer]; }; - rfPred = derive2 { name="rfPred"; version="1.10.0"; sha256="1k1s7i9va0dnnii76nnhcv4g4a4b03rmhicl7hsbmy56fnx91qf9"; depends=[data_table GenomicRanges IRanges Rsamtools]; }; - rgsepd = derive2 { name="rgsepd"; version="1.4.2"; sha256="0nj8x65q0642c6gimll84r2794bw41iz1iimqfznjkndv344a8g8"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; }; - rhdf5 = derive2 { name="rhdf5"; version="2.16.0"; sha256="1a1bwnwqfx40jfhf0cv6ajxdh4k9y9z5zm446cjdx8fw6garam3j"; depends=[zlibbioc]; }; - riboSeqR = derive2 { name="riboSeqR"; version="1.6.0"; sha256="0n4apcqgcyw71sypjkia45q61i4z35rq7r653i53fhsck4prwgzx"; depends=[abind GenomicRanges]; }; - rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.30.0"; sha256="0y5m2prpvg10xpidvihvzmywi08vhj23mi3xx9i49kn5jx46jiix"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; }; - rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.2.2"; sha256="0hfixw4fv0s38ar1faafvvm2z9jflh7lxzcmb8m8751b0wn9mkq2"; depends=[RColorBrewer]; }; - roar = derive2 { name="roar"; version="1.8.0"; sha256="1ymc4bgbi90nyz4lalrwr51n138vxr59f9lvr8j454ikdda6vpgs"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; }; - rols = derive2 { name="rols"; version="2.0.3"; sha256="0irk8h8vgpxgcka1ad5grsxq6dw734flshlsyicv96kg3nb7qqrq"; depends=[Biobase httr jsonlite progress]; }; - ropls = derive2 { name="ropls"; version="1.4.6"; sha256="1pls9c5l8lidj6cdvls3gk0mc1sy4374mbikn95fzj4vw46vcpaz"; depends=[]; }; - rpx = derive2 { name="rpx"; version="1.8.3"; sha256="1aq4hp38wiqv1p6lhjj8d759sr4sk6jy1jmnnb16ln4jls77hs7f"; depends=[RCurl XML]; }; - rqubic = derive2 { name="rqubic"; version="1.18.0"; sha256="0lv9xmip5prbkb4dha7lj7nii7wvk1wvcyad8chir76lks1ysdhn"; depends=[biclust Biobase BiocGenerics]; }; - rsbml = derive2 { name="rsbml"; version="2.30.0"; sha256="1q30yl7fny5rh1bai0z5gc5l7ci6qys0j59j417glc2pwsampcq4"; depends=[BiocGenerics graph]; }; - rtracklayer = derive2 { name="rtracklayer"; version="1.32.2"; sha256="190767zpwc7maqjpy0x5bpkm0jp1vfawy9991fifw0mc634cjkga"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; }; - sRAP = derive2 { name="sRAP"; version="1.12.0"; sha256="1wxg597ks3xa1srl8mwh90y09jc73758bfcw1pfwq2wpym5x6qsf"; depends=[gplots pls qvalue ROCR WriteXLS]; }; - sSeq = derive2 { name="sSeq"; version="1.10.0"; sha256="1w33zc6kaxm5ripji4n2gc0sk29fqq0nzv8nmddx3qwvhv1x91k2"; depends=[caTools RColorBrewer]; }; - safe = derive2 { name="safe"; version="3.12.0"; sha256="0f2i6zqc5x742r6501qsn0c8g0ld4lkvmvj6a2sjjacpj8g663am"; depends=[AnnotationDbi Biobase SparseM]; }; - sagenhaft = derive2 { name="sagenhaft"; version="1.42.0"; sha256="181sw6wdkv7c3sb9m9hfgd7ki3rv63p0k5mfhal7j48wphd1l8f9"; depends=[SparseM]; }; - sangerseqR = derive2 { name="sangerseqR"; version="1.8.2"; sha256="106p78f804b2ibkrkg6j2dxp6v9qsr03g4shkkcawb698qvgbr38"; depends=[Biostrings shiny]; }; - sapFinder = derive2 { name="sapFinder"; version="1.10.0"; sha256="0a5kq447l0f3mdml4ykcdvp4whqzc4pn3zsvzjhrxc06d4a91y5k"; depends=[pheatmap Rcpp rTANDEM]; }; - saps = derive2 { name="saps"; version="2.4.2"; sha256="191kmdf5czf96d7likysfxm13z240qd4z22n3dwdw94akpsfvrrp"; depends=[piano reshape2 survcomp survival]; }; - savR = derive2 { name="savR"; version="1.10.0"; sha256="14d3r64w00j99cd9wdlcxcyhlp278skyadn0dcmmjg2lfcwv9dj5"; depends=[ggplot2 gridExtra reshape2 scales XML]; }; - sbgr = derive2 { name="sbgr"; version="1.1.1"; sha256="1z6xz5apv8cg6b0ciarvj0zn8s5xa93sfirzmldwsx9wmnm95kqq"; depends=[httr jsonlite objectProperties stringr]; }; - scater = derive2 { name="scater"; version="1.0.4"; sha256="1zmaml2mbj5fkxfnah5klm2kyx09fghqddmbb4084bz7w737s2by"; depends=[Biobase BiocGenerics biomaRt data_table dplyr edgeR ggplot2 limma matrixStats plyr reshape2 rhdf5 rjson shiny shinydashboard tximport viridis]; }; - scde = derive2 { name="scde"; version="2.0.1"; sha256="1d1wfcaxj7j4zhvs35038z7zdsn3idqhv1hb1s0bhhrvxyh95j1v"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; }; - scran = derive2 { name="scran"; version="1.0.4"; sha256="0z748nmy5z346anbv33p7knh489d556aghrwdpp8jjv8lqqy6fha"; depends=[Biobase BiocGenerics BiocParallel dynamicTreeCut edgeR limma Matrix scater zoo]; }; - scsR = derive2 { name="scsR"; version="1.8.0"; sha256="033f6kdmw70mf2hjadsanb1wx5wgnj69ipixb4n16262bvz54ajy"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; }; - segmentSeq = derive2 { name="segmentSeq"; version="2.6.0"; sha256="07xh6gpi1pprinza2vswjpihff7hjqzsj3j6yrqmrhyja63n0ni8"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; }; - seq2pathway = derive2 { name="seq2pathway"; version="1.4.0"; sha256="19r1gpmpzrxiyjx7gila1ldn714k15whhjg25kv79s2ji5fsqcrb"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; }; - seqCNA = derive2 { name="seqCNA"; version="1.18.0"; sha256="16hbmzlc69jpirl8yix3lnx3hbw7jdj7njwxar47w3r3vbqhc7xg"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; }; - seqLogo = derive2 { name="seqLogo"; version="1.38.0"; sha256="01jddx62nhi3r7czbh9hxy0wwpazbc9ax1fgagfxl6p4kx9xz9rb"; depends=[]; }; - seqPattern = derive2 { name="seqPattern"; version="1.4.0"; sha256="1dj9hfnbdj11yjxwd8jmxrdkj7n6gmaaj6244g2psgarhjcp4wfb"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; }; - seqTools = derive2 { name="seqTools"; version="1.6.0"; sha256="1xzc2457rjnc901dq0jaqpya04cxmk9c1y41495hmx5yimls2hnj"; depends=[zlibbioc]; }; - seqbias = derive2 { name="seqbias"; version="1.20.0"; sha256="0yhzc8iyiqja93d919sh8jxnxq4wkydfbiygk8g3h45amzzx3iwb"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; }; - seqplots = derive2 { name="seqplots"; version="1.10.2"; sha256="0dd6pmmidbkrr1gxflly1skj8qk3h882jas0a49ibmyyhgydffqx"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 RSQLite rtracklayer S4Vectors shiny]; }; - sevenbridges = derive2 { name="sevenbridges"; version="1.2.8"; sha256="1b8l26anjq1bv1x71y1py3807kv4f9wzc4n2fxdgrvzdkimmnymp"; depends=[curl docopt dplyr httr jsonlite liftr objectProperties rstudioapi S4Vectors stringr uuid yaml]; }; - shinyMethyl = derive2 { name="shinyMethyl"; version="1.6.2"; sha256="0q7lkmyh2hrxfmv5vl42d35hrgisc6x0iwgw9ahdiskmp13dwjqs"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; - shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.10.0"; sha256="0xg5mhkgdpx12x9ys9w9bfqrg2595av88g975p50k2wikv9map14"; depends=[mixtools rTANDEM shiny xtable]; }; - sigPathway = derive2 { name="sigPathway"; version="1.40.0"; sha256="0q1xwm87ia1zp5ry5pk5qb2rcxfi2s4ifiyn4yi24a7n2byanqy4"; depends=[]; }; - sigaR = derive2 { name="sigaR"; version="1.15.0"; sha256="0z1nkxafiv71virpgsb32ji6z88yb9r6w7jvp2ck5yqxvv0brsg2"; depends=[Biobase CGHbase corpcor igraph marray MASS mvtnorm penalized quadprog snowfall]; }; - siggenes = derive2 { name="siggenes"; version="1.46.0"; sha256="05adv1phvj8x9f1rnd2cz1xxyfbyk6zl0004vgfnsipklqy22z2c"; depends=[Biobase multtest]; }; - sigsquared = derive2 { name="sigsquared"; version="1.4.0"; sha256="0683my2rflshlgx9nhamqvp3fqnxp0fb8jj14wqh29drrx6v93jk"; depends=[Biobase survival]; }; - similaRpeak = derive2 { name="similaRpeak"; version="1.4.2"; sha256="1rdpf77mbqrs4ja0f9298qp8jfcwxl2hcbxk0ss5aia1cds8g475"; depends=[GenomicAlignments R6 Rsamtools rtracklayer]; }; - simpleaffy = derive2 { name="simpleaffy"; version="2.48.0"; sha256="1v16zgqz2kg943lcwdc6v2hwq4ngd0qw9611pv145ysd4bx6p92l"; depends=[affy Biobase BiocGenerics gcrma genefilter]; }; - simulatorZ = derive2 { name="simulatorZ"; version="1.6.0"; sha256="1bxpk4kigaymfgnf723s9pyfgpckhqfryjbz6b572jadf3swdjhc"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; }; - sincell = derive2 { name="sincell"; version="1.4.2"; sha256="0hdx2wzs6z5birxvin0xp0xvh0zrpmbwzxgralv2aghkv21ji5l6"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; - sizepower = derive2 { name="sizepower"; version="1.42.0"; sha256="0c17hs0yqqi92c1f27s7nh0vr1y6ak06mrv8m537w98cr659vlas"; depends=[]; }; - skewr = derive2 { name="skewr"; version="1.4.2"; sha256="0k11mvxkrgqx5gxzi2li7pdw44zdvdyb41yh0wjqxn413qj67jp2"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; }; - snapCGH = derive2 { name="snapCGH"; version="1.42.0"; sha256="10fap32vzbjwpgvbq4i1jh8sca0bdcza9xzw7mmw8cnr20ddv388"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; }; - snm = derive2 { name="snm"; version="1.20.0"; sha256="15nh0p79jpwdzd3l2yzc0kfg9gbl5y5cjzbvcvklpprhh11s787r"; depends=[corpcor lme4]; }; - snpStats = derive2 { name="snpStats"; version="1.22.0"; sha256="1hyznmdgjl96jf8aisa5nyjp4in74vn5nhipwxnc8g65j8qlmgdv"; depends=[BiocGenerics Matrix survival zlibbioc]; }; - soGGi = derive2 { name="soGGi"; version="1.4.4"; sha256="0wdg7p5rmfdhqy7294h99pf84l1hfpqmjkvmxkx87p1a8590a9nl"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - spade = derive2 { name="spade"; version="1.20.0"; sha256="17x550ixg8f8gcjg3sc80v7bimzbvdi687m3znavkdpw03v7jcg9"; depends=[Biobase flowCore igraph Rclusterpp]; }; - specL = derive2 { name="specL"; version="1.6.2"; sha256="1kg6zhrd7fp07jl0njd54z4m4886drkks0b8k4w17vdxw2cpajc5"; depends=[DBI protViz Rcpp RSQLite seqinr]; }; - spikeLI = derive2 { name="spikeLI"; version="2.32.0"; sha256="0qk447fyrfj0ha0faf62i2h5hv8wnyfng42jkqcn8k391ga33w03"; depends=[]; }; - spkTools = derive2 { name="spkTools"; version="1.28.0"; sha256="1b76k0jp4dk2w53q8d536jfjznfdy1f2a8s44klm1rn3qw0nfp4c"; depends=[Biobase gtools RColorBrewer]; }; - spliceR = derive2 { name="spliceR"; version="1.14.0"; sha256="09c6h8xlfpfsnxvndf9zab9kiv4kfx4j3jqqm6f5ry25y1ixv49c"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; }; - spliceSites = derive2 { name="spliceSites"; version="1.20.0"; sha256="12j2mx7al7yxzhb3g6xy7v85vjipmfw0sa5nb3c3kh711r2485mj"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; }; - splicegear = derive2 { name="splicegear"; version="1.44.0"; sha256="02kzm95hnn1b9384qpndqxfrc9916i50rynpw52131rjzhy2qkqy"; depends=[annotate Biobase XML]; }; - splineTCDiffExpr = derive2 { name="splineTCDiffExpr"; version="0.99.4"; sha256="0b14hyrh2fa02yh2cvr2xjmrq81y46r6lrc6pzybi6mv3gpkdr6j"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; }; - splineTimeR = derive2 { name="splineTimeR"; version="1.0.1"; sha256="1ham5hzfcv2ws9j8j07fzhvzij7fdnpnddd24sqb2w4l5p8sjj1z"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; }; - splots = derive2 { name="splots"; version="1.38.0"; sha256="0pq9xgylc3qq3pzfizg25c3m6l64zvkc94xa5i8sm0v49161rjh9"; depends=[RColorBrewer]; }; - spotSegmentation = derive2 { name="spotSegmentation"; version="1.46.0"; sha256="1hbvxfcwpaz5gbkvnsnravd9zdghkl2kqwx6mhznjbzggjp5hf1i"; depends=[mclust]; }; - sscore = derive2 { name="sscore"; version="1.44.0"; sha256="14wl2chv9xrfn02s8dif0pa6nq41dbv5n9q2sjp1rgbknhs92l4f"; depends=[affy affyio]; }; - sscu = derive2 { name="sscu"; version="1.0.2"; sha256="0rflgvb8anzrv5y9rzm8aiaappafyjmmak39mvz6b3mm1a32zwkq"; depends=[BiocGenerics Biostrings seqinr]; }; - ssize = derive2 { name="ssize"; version="1.46.0"; sha256="161k421x32wp2qs705p7i7hqcf53sdmw5vllnwiqfidw62xagiya"; depends=[gdata xtable]; }; - ssviz = derive2 { name="ssviz"; version="1.6.2"; sha256="11w4y3fv5m9qxp998k9xm9w1vg0v34npqm9s05biv0qqxwgs9v36"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; }; - staRank = derive2 { name="staRank"; version="1.14.0"; sha256="1fn9m8q834v8540q8m2n9vfxdzqz2mbxb5k7mnjljf9ja07da9l8"; depends=[cellHTS2]; }; - stepNorm = derive2 { name="stepNorm"; version="1.44.0"; sha256="1l21pw9d2scp9jczf0d4mscvd5qjqkrn4maxx9k2l2kqz47bh1dc"; depends=[marray MASS]; }; - stepwiseCM = derive2 { name="stepwiseCM"; version="1.18.0"; sha256="1375hwx4zln7mnscfd6w7k4x6jc34m6mqs8fxmnihvkq4imhxd58"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; }; - subSeq = derive2 { name="subSeq"; version="1.2.2"; sha256="04qg83x7cmjsnzg925jx8aw83gpzynkqdgxy4n44rxqspw922f11"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; - supraHex = derive2 { name="supraHex"; version="1.10.0"; sha256="1kzkkidlr034m0sgyb32zia0p47gi52l6ki7s88559h7gx5d7bg1"; depends=[ape hexbin MASS]; }; - survcomp = derive2 { name="survcomp"; version="1.22.0"; sha256="0l6plsjfbpx0lxkyscfnbykinjcijp1bwbrqn4i76y003g91b4yz"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; }; - sva = derive2 { name="sva"; version="3.20.0"; sha256="0jqa4rdd0cd546sc1dbsq1lrm3kqcfym77xr7rsmrpc12yp85xdv"; depends=[genefilter mgcv]; }; - switchBox = derive2 { name="switchBox"; version="1.6.0"; sha256="0ys69bh12b9idni67v1phfm1nik9z8izpix3az4xhy253gsb3idz"; depends=[]; }; - synapter = derive2 { name="synapter"; version="1.14.2"; sha256="1wql8q8fbkl16g1xczrbcd68g41c35rfyqyrb6cj250axjl5x2q4"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; }; - synlet = derive2 { name="synlet"; version="1.2.2"; sha256="1rgsfxjkfv546c285cwp740gcglfjg8sbf0hw9v1dmqa16fy3pss"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; - systemPipeR = derive2 { name="systemPipeR"; version="1.6.4"; sha256="0s2g46a5d5bvx45i3cgmib48wf8hrniyladhm0f7kgcbfx57248m"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; }; - tRanslatome = derive2 { name="tRanslatome"; version="1.10.0"; sha256="0dylpkmz91gvl6zsi501yqg5kf0sagb4f6bcdb9gl68r3vbmkxnm"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; }; - ternarynet = derive2 { name="ternarynet"; version="1.16.0"; sha256="0xzvvhgmbka28ka6q2inkfgc3lgi6007apndw6gb33548by7l30p"; depends=[igraph]; }; - tigre = derive2 { name="tigre"; version="1.26.0"; sha256="0k9sjq3qxji7zsgjmy8zp0744zw17w86i2rf7yqapw2khgk80pdh"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; - tilingArray = derive2 { name="tilingArray"; version="1.50.0"; sha256="03m6xcrs80a9kc63wawrnynxbydr54qfc2azfjj28qjb38cij792"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; }; - timecourse = derive2 { name="timecourse"; version="1.44.0"; sha256="09m2laz25wmlch2r657q97ii1gryhs04yva8ym9a2z7dpypr4hpp"; depends=[Biobase limma marray MASS]; }; - tkWidgets = derive2 { name="tkWidgets"; version="1.50.0"; sha256="1dazx95p1751kzdf0k8a1kbbbq6d258ga53j71gnbzskg2pmr3s9"; depends=[DynDoc widgetTools]; }; - tofsims = derive2 { name="tofsims"; version="1.0.2"; sha256="0yyxwhhj6nqfxclzp05dsm8ydpvcxld73rd2qnq2xplffx9db45v"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; }; - topGO = derive2 { name="topGO"; version="2.24.0"; sha256="1p4vsl32qhjw15yv9ym01ni63gjg73jaghlf17wc4zfn3iaz2zar"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; }; - trackViewer = derive2 { name="trackViewer"; version="1.8.4"; sha256="0qzqzqqpajdv8srr59i7qxwn90vf0xdshnlchmn2v6k4949n3jcj"; depends=[AnnotationDbi GenomicAlignments GenomicFeatures GenomicRanges grImport Gviz IRanges pbapply Rsamtools rtracklayer scales]; }; - tracktables = derive2 { name="tracktables"; version="1.6.2"; sha256="1mx924d22w794gx3n5xdl711ajyxpmfwfx1x496cbcy9fqbc38sm"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; }; - transcriptR = derive2 { name="transcriptR"; version="1.0.2"; sha256="08jbwajdbjx8jj7snfihyf4nzh72af4cj4grgvv5j0lqymvkziv6"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; }; - traseR = derive2 { name="traseR"; version="1.2.0"; sha256="1mpvb38zg13b28s9fp3lm1m4gv002kaq7fqgxjnhk743bs4zqwbp"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; - triform = derive2 { name="triform"; version="1.14.0"; sha256="1rfrqa5k2sfsyxpjjhs9scjgz1qzqgks13xxppz64sdlpjgrr8zw"; depends=[BiocGenerics IRanges yaml]; }; - trigger = derive2 { name="trigger"; version="1.18.0"; sha256="1vzp9xlq2i6g659i4v1bbmh396lqwac3iwzx10kxjadzsp3kmd30"; depends=[corpcor qtl qvalue sva]; }; - trio = derive2 { name="trio"; version="3.10.0"; sha256="07a20anzcg98nvbwkb1y3wna7kp4wwh2r994gnajl9lpp4ya8v4m"; depends=[]; }; - triplex = derive2 { name="triplex"; version="1.12.0"; sha256="0562c7i9y3ajb6krqxfg2l7hmv8x9qrd7jqm1pkv7mb507yw3ijr"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; }; - tspair = derive2 { name="tspair"; version="1.30.0"; sha256="1di6h6hm5bjl7j3hnnblfi042i0pj6rlzigprbz41spppassvg28"; depends=[Biobase]; }; - tweeDEseq = derive2 { name="tweeDEseq"; version="1.18.0"; sha256="1i15pjvyz1idzam54d93f5i0693gjwqnnr97a6i2k7mnng859ik1"; depends=[cqn edgeR limma MASS]; }; - twilight = derive2 { name="twilight"; version="1.48.0"; sha256="1mz8967fkjkyv75j6ahxrygvlwi1cmjiag4vd9gi6jrqqbpj0hdg"; depends=[Biobase]; }; - tximport = derive2 { name="tximport"; version="1.0.3"; sha256="14j85aw1hhszaajnk7pj02bsj0id2y70ja94njxcr3j3rax1ngg0"; depends=[]; }; - unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.8.0"; sha256="1fa5nmdfg52kppvxri08x97zb03c5fq2mz78jpcjaryhcz1jcpr8"; depends=[BiocGenerics HTqPCR]; }; - variancePartition = derive2 { name="variancePartition"; version="1.2.11"; sha256="01525cbxgh9q4dnwn8ynrc1ixg9b98k7yn59svj6pdxmi2b9a58q"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 MASS pbkrtest reshape2]; }; - vbmp = derive2 { name="vbmp"; version="1.40.0"; sha256="0b6dw8z2lvzlfafc0p38x0skwgayafznvcwc813rkb2jcfac3q5h"; depends=[]; }; - viper = derive2 { name="viper"; version="1.7.4"; sha256="12hyvy6dz67r3aybg4cbkzayb3j4vm0vi5ib2y9lq4195fp6ffxr"; depends=[Biobase e1071 KernSmooth mixtools]; }; - vsn = derive2 { name="vsn"; version="3.40.0"; sha256="0cqx7kar7ihhbqdk37zhj6w5g1nw04l10vwnw2gxwm2y4229skh4"; depends=[affy Biobase ggplot2 hexbin lattice limma]; }; - vtpnet = derive2 { name="vtpnet"; version="0.12.0"; sha256="0yq4h1pv7vkhwmk1vq0nahzyw6wnbvhlmw0rgggzbdc0irp99yj7"; depends=[doParallel foreach GenomicRanges graph gwascat]; }; - wateRmelon = derive2 { name="wateRmelon"; version="1.17.0"; sha256="1xhqv5hrxivw924snl1nb0biir39mzwc3m8d9qczhn52ds04wsn1"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; }; - wavClusteR = derive2 { name="wavClusteR"; version="2.6.2"; sha256="0dbjkpajs4src5kgymin7b4h4yciksa112s52fm116mfll0g1rxl"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; }; - waveTiling = derive2 { name="waveTiling"; version="1.14.0"; sha256="1yfvzb0k5b495460b1k2229h3qcx7gva48lc419r2y9dlnajii3d"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; }; - weaver = derive2 { name="weaver"; version="1.38.0"; sha256="1g6796sw321la3rh4s28xzfv5wr91f4xva965sccl5l4vxqs5ccr"; depends=[codetools digest]; }; - webbioc = derive2 { name="webbioc"; version="1.44.0"; sha256="0wd6xdnp3qcinj7sgl1hizl674v65n9xjbw0haf1xyrlijakpn7h"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; }; - widgetTools = derive2 { name="widgetTools"; version="1.50.0"; sha256="191agm9c0g43wbncya8dnrgssx5s84i5w147na84g37r6b9cn67y"; depends=[]; }; - xcms = derive2 { name="xcms"; version="1.48.0"; sha256="0xynzbvsknyyh5zdnh8mgs7rjf53m3fkhwqqi116lscqmf89scda"; depends=[Biobase BiocGenerics lattice mzR ProtGenerics RColorBrewer]; }; - xmapbridge = derive2 { name="xmapbridge"; version="1.30.0"; sha256="17nccdcnwvi4vj2ykc0adq0018prfxpkzk78s315gx2l0ywkzmv4"; depends=[]; }; - xps = derive2 { name="xps"; version="1.32.0"; sha256="0clajv5qpv6z9hhq4ns5gjys1zb5k1r6bngpjfm0g2k8alaj82rk"; depends=[]; }; - yaqcaffy = derive2 { name="yaqcaffy"; version="1.32.0"; sha256="16sif5lsfczrl811g7237yg5pw8am2q7m9yk7zfkh3l07lr75zni"; depends=[simpleaffy]; }; - zlibbioc = derive2 { name="zlibbioc"; version="1.18.0"; sha256="0m8l7zpx1l3qsk73k3ibkxxzzff938x3qhnwki1ymf3cnsg8cb36"; depends=[]; }; + ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.4.0"; sha256="1skhxyvyfgld2abiw8cl8wkqrq80jm2pm4p6l297v25cbsjmk3lz"; depends=[ABAData gplots Rcpp]; }; + ABSSeq = derive2 { name="ABSSeq"; version="1.20.4"; sha256="032j430z787j1jrm0c40nn6m33vbjyngiz9ln1jx2z222ybcxrd6"; depends=[limma locfit]; }; + ABarray = derive2 { name="ABarray"; version="1.42.0"; sha256="17vmy7419jdbrkzjll2ck2qvw3wdbba2cdazvji5zrflg9938hmj"; depends=[Biobase multtest]; }; + ACME = derive2 { name="ACME"; version="2.30.0"; sha256="1hhqdnv4dkck47yvp17y3b741d63dxnlhbmkylz5bdab2swffz4m"; depends=[Biobase BiocGenerics]; }; + ADaCGH2 = derive2 { name="ADaCGH2"; version="2.14.0"; sha256="0lvj93gy2x7c6fh2lv8mr17aglk97cmp8s7nwrhysxizbhpzf6mn"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; }; + AGDEX = derive2 { name="AGDEX"; version="1.22.0"; sha256="06zcc8zc5dz310wi1rp75f6015lf97dwaqgqrbxim2akrfrnhyzb"; depends=[Biobase GSEABase]; }; + AIMS = derive2 { name="AIMS"; version="1.6.0"; sha256="1z62cw3f803vl4mymaxaa0vkvrlsmc79idqcq92qw9iznpdl2jam"; depends=[Biobase e1071]; }; + ALDEx2 = derive2 { name="ALDEx2"; version="1.6.0"; sha256="1iiympsbj234nh7pdpgw6wiadj356i925j6in5d14jcqkq12jwpv"; depends=[BiocParallel GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; + AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.0.0"; sha256="0fh7086cdhpp05nwwj6bxwrzi9m6wkzirlb905c3g46afd9wxjrp"; depends=[]; }; + ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.14.0"; sha256="1ikfh4sqzclhva92wz9xhlf835sw9isa6jflnsjwqilg5kivy9bp"; depends=[ARRmData]; }; + ASAFE = derive2 { name="ASAFE"; version="1.0.0"; sha256="0jcjd5gh8j9iwq1b97jw614cz69z2s2fxv1prqkx3alibsf8jr2x"; depends=[]; }; + ASEB = derive2 { name="ASEB"; version="1.18.0"; sha256="09kppm2lhhhd0kfy274xx6p387fxh7rfa3g4ajncnq6bspz8hvia"; depends=[]; }; + ASGSCA = derive2 { name="ASGSCA"; version="1.8.0"; sha256="0w8lwaaj51fh3ibrdcba74x1nfar4m30dz2rii63lk0ah2xb9amy"; depends=[MASS Matrix]; }; + ASSET = derive2 { name="ASSET"; version="1.12.0"; sha256="0vpyi5vpyys597ma8ig18hm1x2f86fwzd35wq5h68glnm3jm3vds"; depends=[MASS msm mvtnorm rmeta tmvnsim]; }; + ASSIGN = derive2 { name="ASSIGN"; version="1.10.0"; sha256="0ks2k8r650j95wd0s7bvxl4d8bgx6dzzb4bpqc68p6bmnx80vkqv"; depends=[gplots msm Rlab]; }; + ASpli = derive2 { name="ASpli"; version="1.0.0"; sha256="0cyq81f2ll9ygvq71p3mlmnvs8pm1582pldz1amlwwwdng7c4v36"; depends=[AnnotationDbi BiocGenerics DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges S4Vectors]; }; + AffyCompatible = derive2 { name="AffyCompatible"; version="1.34.0"; sha256="1275r14pgj33zq275yp9xqvmxl2nqi2cgylbyjy8i9xvbg4f4sfg"; depends=[Biostrings RCurl XML]; }; + AffyExpress = derive2 { name="AffyExpress"; version="1.40.0"; sha256="0ahj4fm2wdcza4w9m12vvfmzgl2f71xkhwf8mrwm69fp9n1s27lx"; depends=[affy limma]; }; + AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.20.0"; sha256="03rsp23nzvzyswxziwf07x0q5w2f7lhsjpz1biz2pzv64g6xnkwi"; depends=[affy]; }; + AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.24.0"; sha256="0jd78lh02kwxqll5qwnfkwrgfrm5scdc6p703r0vd8gl3cz8wdws"; depends=[affy affycoretools Biobase limma preprocessCore]; }; + AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.12.0"; sha256="0a4bmv7fpd134vdixlwxszlz7lx8xab8122m6p92q6gpla5fb6hk"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; }; + AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.8.1"; sha256="16x28f7lc5rn73m8l5z3jigkld5yf12pf5hv0mrq9l6fln1i002x"; depends=[Biobase graph log4r rjson]; }; + Anaquin = derive2 { name="Anaquin"; version="1.0.0"; sha256="1fcbxzl4jwcbkgn4v5x4g901fpvlij5hv5n0jfvhxi8wdwqi0xq6"; depends=[ggplot2 knitr locfit plyr qvalue ROCR]; }; + AneuFinder = derive2 { name="AneuFinder"; version="1.2.1"; sha256="1yicsbfj72qbzz03pn1wndmkmsa9i97a78cblhl3vhqgkfff8dx5"; depends=[AneuFinderData bamsignals BiocGenerics Biostrings cowplot DNAcopy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust ReorderCluster reshape2 Rsamtools S4Vectors]; }; + AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.36.2"; sha256="0574lmyisn3nv9aicz9x3iivx990da4q2j4i0f1jz0mpj9v3vc2w"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; }; + AnnotationForge = derive2 { name="AnnotationForge"; version="1.16.1"; sha256="0l1g9hy88sh5g567svyfd8pnjvkyklkn6a3gjn8zalvh62qqjjq1"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; }; + AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.24.0"; sha256="1x8rwldmwiri0jk1ypc47bgwdq8nzbbxji9pphgs69g09dijsd0f"; depends=[AnnotationDbi DBI]; }; + AnnotationHub = derive2 { name="AnnotationHub"; version="2.6.5"; sha256="0ff2by5bw5ywxwasiq7z5zc5w7wwwjsvwkj26mjv35zvy7d33kd2"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors yaml]; }; + AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.4.1"; sha256="16v6pqdicjsc9vr4mpjrczffw2dzfkzqp302n0c7m8q2hyw869yl"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller Biostrings curl DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery httr IRanges jsonlite OrganismDbi rBiopaxParser Rsamtools RSQLite rtracklayer S4Vectors XML xml2]; }; + ArrayExpress = derive2 { name="ArrayExpress"; version="1.34.0"; sha256="00142sbwbxgwqqhizhjkv5c6jc3575r4s3wwmq4jl6xhlb6nmab6"; depends=[Biobase limma oligo XML]; }; + ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.24.0"; sha256="13y4z76sf05ix9ca0pw058q49y5q1z9yisngwjwkmigcz2bwp6z2"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; }; + ArrayTV = derive2 { name="ArrayTV"; version="1.12.0"; sha256="10dxj9p02lbh80s17yg3blkx1jha8a962949g733k4p6l25av4jx"; depends=[DNAcopy foreach oligoClasses S4Vectors]; }; + ArrayTools = derive2 { name="ArrayTools"; version="1.34.0"; sha256="02sbknh03k84ylbmmbby8f96dbnwyi2i7hl1p8akf7idg3skinma"; depends=[affy Biobase limma xtable]; }; + AtlasRDF = derive2 { name="AtlasRDF"; version="1.10.0"; sha256="1ar3ggivwc5nx22kyqapv1sb0ra91nq78c989prx5bli3cxfrkxg"; depends=[hash SPARQL]; }; + BAC = derive2 { name="BAC"; version="1.34.0"; sha256="0j7l177nc5c1imib2y1lnnza2b5824rjb10plbpa5knn15kql1l9"; depends=[]; }; + BADER = derive2 { name="BADER"; version="1.12.0"; sha256="0q62cyjqqb5v5cnbn9nm3mlfifz140wk6r27d75dshji4arwc60y"; depends=[]; }; + BAGS = derive2 { name="BAGS"; version="2.14.0"; sha256="0ajjbz3g09qwdl57ab2yhrdvmbw1d0hfcncglpsbf98pb6kda1br"; depends=[Biobase breastCancerVDX]; }; + BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.4.0"; sha256="1q6msd8l3v10swx4cbc71ggihnw9p3pj87v2n5mgdzpc1nngygib"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; }; + BCRANK = derive2 { name="BCRANK"; version="1.36.0"; sha256="0jx6mp6ca4kwpyv341n485hlyzgqayynfrx6vl18dp6f0zkarkym"; depends=[Biostrings]; }; + BEAT = derive2 { name="BEAT"; version="1.12.0"; sha256="03wcm4ga5vsf7iqih7p0sw39ipjaygvhx2x153fnqfhg34a4k67z"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; }; + BEclear = derive2 { name="BEclear"; version="1.6.0"; sha256="1z04ylm5821s7rgrv0bgx5mmy4f09d3a5n4r0mz82lnin7i8swab"; depends=[Matrix snowfall]; }; + BGmix = derive2 { name="BGmix"; version="1.34.0"; sha256="1zkylanfd9m35hswvyykjqz1rb84fhn51q18g32ilpk4yd78aqj2"; depends=[KernSmooth]; }; + BHC = derive2 { name="BHC"; version="1.26.0"; sha256="0xawsqh3drpw14c9a3sacd0rmk93p6gn2yfmqlf91a41sbpj0hpc"; depends=[]; }; + BPRMeth = derive2 { name="BPRMeth"; version="1.0.0"; sha256="0rn4q12bjy5k6g9wkghrxivfzw32qwc6sh4b2b6gaxqsq4rqbnmj"; depends=[assertthat data_table doParallel e1071 earth foreach GenomicRanges IRanges MASS randomForest S4Vectors]; }; + BRAIN = derive2 { name="BRAIN"; version="1.20.0"; sha256="1nj78v1z98mj1n6kyw4fgradn4yqbyd58db15xwlk8d23gs902wq"; depends=[Biostrings lattice PolynomF]; }; + BSgenome = derive2 { name="BSgenome"; version="1.42.0"; sha256="0hxwc02h5mzhkrk60d1jmlsfjf0ai9jxdc0128kj1sg4r2k1q94y"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; }; + BUS = derive2 { name="BUS"; version="1.30.0"; sha256="144x8zl983vis1k0nba5j2i6pywrczmq2cqdg3bd1w1z9n69643k"; depends=[infotheo minet]; }; + BaalChIP = derive2 { name="BaalChIP"; version="1.0.0"; sha256="0dy3096078gfy9awyagqnbv63ib8bbgh36jf9zvfhilrz9d31xl5"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; }; + BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.2.0"; sha256="09q1bqgz6amraslcdihjz81q7gndn158vp6wpzb1ky9fdd6akd0a"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; }; + BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.18.0"; sha256="03jpwdngyjs18pzkp17fdyy5vq6h0ccqw942a7nd60dsf27mw3pf"; depends=[RCurl RJSONIO]; }; + Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.10.0"; sha256="0cgb4qn3gg7cgp81cblg9qkim729bjvygi7wlxsnsriqfjljsb5s"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; }; + BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.2.0"; sha256="0z7z6gnsczdb4x9277i0fyf5306gkn94j1j2i5aw1j990hrnb619"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; }; + BatchQC = derive2 { name="BatchQC"; version="1.2.1"; sha256="0gdxbn74zrbpgg0y9w0n8mbibh0f320ghgyw32ya1agc8maqkfzm"; depends=[corpcor d3heatmap ggvis gplots knitr limma matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; }; + BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.0.0"; sha256="07zmkihvakhqxc6v6hh95d3wkg32vrvag1fbx9qxfmqnnicsrnin"; depends=[Biobase]; }; + BayesPeak = derive2 { name="BayesPeak"; version="1.26.0"; sha256="1hk31ic0r7zbvfz04h1ginkkhzbz85wdlsmym1aqbiz4x53j97wj"; depends=[IRanges]; }; + BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.26.0"; sha256="0ms2wa4h81j4q6bwak217q8nkrkmj5zjm33i3gkifbzav2s1k5vf"; depends=[]; }; + BgeeDB = derive2 { name="BgeeDB"; version="2.0.0"; sha256="11az0sqnjrpfw3pnf0aqgz4kqd8gd1976s9zfyl10gyrfj7h9n49"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; }; + BiGGR = derive2 { name="BiGGR"; version="1.10.0"; sha256="1h2ilx761cy3f4vd52kz4vyq74khln5jiwhllg3w4vs4kczvs32k"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; }; + BiRewire = derive2 { name="BiRewire"; version="3.6.0"; sha256="138q86h188nnwb4f0q1xw07n0v44cgmfzh5j9xvbkcp522lj0n92"; depends=[igraph Matrix slam tsne]; }; + BiSeq = derive2 { name="BiSeq"; version="1.14.0"; sha256="1bdgg8mb269hipp0n8bphdgrslzmc8ykcdx848vcgppgfb0dab7a"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; }; + BicARE = derive2 { name="BicARE"; version="1.32.0"; sha256="0mkdb2ijr8lb1j08nzd3vwr63vjlpfs739fwk5ay586a99n4qi0z"; depends=[Biobase GSEABase multtest]; }; + BioMVCClass = derive2 { name="BioMVCClass"; version="1.42.0"; sha256="1zd7s997dyhl85b99nzqy5a2ljdz7gh55l02y3qadgbfazfrfbfl"; depends=[Biobase graph MVCClass Rgraphviz]; }; + BioNet = derive2 { name="BioNet"; version="1.34.0"; sha256="1vjnlr7gasklb9dshz580bc8z8rkd98093rf0049vqf4z7d65m3j"; depends=[AnnotationDbi Biobase graph igraph RBGL]; }; + BioQC = derive2 { name="BioQC"; version="1.2.0"; sha256="0cjh945vjcgn8lxi3gd13m96vrp01pz96mjn0apcp7xbf2rcfmmx"; depends=[Biobase Rcpp]; }; + BioSeqClass = derive2 { name="BioSeqClass"; version="1.32.0"; sha256="1m0arhpckd2g48mwfm56av4fkgs6mcmwygxyci0jfh9hl78mp155"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; }; + Biobase = derive2 { name="Biobase"; version="2.34.0"; sha256="0js9j9wqls8f571ifl9ylllbb9a9hwf7b7drf2grwb1fl31ldazl"; depends=[BiocGenerics]; }; + BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.36.0"; sha256="1qgf7hii9zhw8awqs7j89k35y34w45xb9k4sa8csd76h3y7av3q0"; depends=[Biobase]; }; + BiocCheck = derive2 { name="BiocCheck"; version="1.10.1"; sha256="197kpiycyl3qawm6801fxyxj81d2g57a00qxaqprapsf1d140l52"; depends=[BiocInstaller biocViews codetools graph httr optparse]; }; + BiocGenerics = derive2 { name="BiocGenerics"; version="0.20.0"; sha256="06szdz7dfs1iyv5zdl4fjzad18nnf1zf3wvglc6c6yd9mrqlf7vk"; depends=[]; }; + BiocInstaller = derive2 { name="BiocInstaller"; version="1.24.0"; sha256="0y1y5wmy6lzjqx3hdg15n91d417ccjj8dbvdkhmp99bs5aijwcpn"; depends=[]; }; + BiocParallel = derive2 { name="BiocParallel"; version="1.8.2"; sha256="18zpa0vl375n9pvxsgbid1k96m17nqqgv1g1sfnlmm7kj34jxg6v"; depends=[futile_logger snow]; }; + BiocStyle = derive2 { name="BiocStyle"; version="2.2.1"; sha256="0sl99xw940ixrm6v24lgaw3ljh56g59a6rdz7g160hx84z9f8n2n"; depends=[]; }; + BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.0.0"; sha256="0asia6f2ff80g8a2w0fckkqhcydkj4ry67c7wlxsz0xzllp14gxl"; depends=[httr knitr rmarkdown stringr]; }; + Biostrings = derive2 { name="Biostrings"; version="2.42.1"; sha256="0vqgd9i6y3wj4zviqwgvwgd4qj6033fg01rmx1cw9bw5i8ans42d"; depends=[BiocGenerics IRanges S4Vectors XVector]; }; + BitSeq = derive2 { name="BitSeq"; version="1.18.0"; sha256="0kv2kk1flm6vbs7s2d6kya1jg8hajrxdg5ndihrsybaas5fby8mb"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; }; + BrainStars = derive2 { name="BrainStars"; version="1.18.0"; sha256="0q0jx30baf2hnz4mplqj6jhl7mj5hncgb00cj1d6yijv9c9iiay7"; depends=[Biobase RCurl RJSONIO]; }; + BridgeDbR = derive2 { name="BridgeDbR"; version="1.8.0"; sha256="049a5bdjxp30jc5zgswk0bsyfvri58g4zrbkw258kwgsmk44l6f4"; depends=[RCurl rJava]; }; + BrowserViz = derive2 { name="BrowserViz"; version="1.6.0"; sha256="06a7sg26b0lwla9vzq9vnggvbhnnw5xh07r7yr258d5030nabpy3"; depends=[BiocGenerics httpuv jsonlite]; }; + BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.6.0"; sha256="0v1l13i6xf8605xrmgfj0pi0r4w15jpzvz4inhpnm66rn0qv2r5q"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; }; + BubbleTree = derive2 { name="BubbleTree"; version="2.4.0"; sha256="16sy8yfbjr1shbd63g9354mzxsisqp4d9nfi6hxhj5c2r35x6bga"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr rainbow RColorBrewer WriteXLS]; }; + BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.38.0"; sha256="04l2dqnf2akq4fhy63sywnmrcddz0r7da3gbd2zgp9fyn6m5ayv0"; depends=[]; }; + BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.38.0"; sha256="0m7pwiyrk482g73aknmhpp09vc4yb5s3jb8bp3y9d494hdy7mijl"; depends=[BufferedMatrix]; }; + CAFE = derive2 { name="CAFE"; version="1.10.0"; sha256="0gw5c94fr1kzckai6bgyc5dkgizqir3k8zcc6mdpl5d07hwahsip"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; }; + CAGEr = derive2 { name="CAGEr"; version="1.16.0"; sha256="1bbbj2bqc2xd5akmgi30w0h0rfn1n5sv626dz916alhjzhiqx52m"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; }; + CALIB = derive2 { name="CALIB"; version="1.40.0"; sha256="0r0dz6vg3sx4bxajh6c8gc12wgnaahnz3yah82jsws1wzplqhkvi"; depends=[limma]; }; + CAMERA = derive2 { name="CAMERA"; version="1.30.0"; sha256="074ln7d0f5gqsk9cxsckmklbx8grzh9kqjlf8zcz6j7ypnzkhy57"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; + CAnD = derive2 { name="CAnD"; version="1.6.0"; sha256="14nq061i69hk8yrkiq35lk7nk58klpl7lmkjzfdd8789h87218b2"; depends=[ggplot2 reshape]; }; + CCPROMISE = derive2 { name="CCPROMISE"; version="1.0.0"; sha256="0cx58i42dypx6sqyrmbf4gw2c2213cgjbijkq2fxf9ah8fm4ss3p"; depends=[Biobase CCP GSEABase PROMISE]; }; + CFAssay = derive2 { name="CFAssay"; version="1.8.0"; sha256="0p91q4z8kip0pqn45kspczhffv9f6mwn1p07q2bwl5fdcbs2xp5p"; depends=[]; }; + CGEN = derive2 { name="CGEN"; version="3.10.0"; sha256="189bhjzgcag4n216h0jnq994y439nd052yalx7ll5q7nazhw5j8w"; depends=[mvtnorm survival]; }; + CGHbase = derive2 { name="CGHbase"; version="1.34.0"; sha256="1pb1paby9n9map71jk971qfpni2m23hcwrssqqjb7byjc9flnmf5"; depends=[Biobase marray]; }; + CGHcall = derive2 { name="CGHcall"; version="2.36.0"; sha256="0wnyslj7yn0yc57q60w2y644lmvvvih6rzm55rrad34lz2h39bsz"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; + CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.28.0"; sha256="1bv8vivl9b0c1dp7ka9dh3gvk1z4zpcirifh7yq0p9g9yr22k0vb"; depends=[Biobase CGHbase CGHcall]; }; + CGHregions = derive2 { name="CGHregions"; version="1.32.0"; sha256="1cc2vz6k5lasvzj2dh8xm26j7zvvwwx8791pqhz6q2fisxq5vz1c"; depends=[Biobase CGHbase]; }; + CHRONOS = derive2 { name="CHRONOS"; version="1.2.1"; sha256="0hzj01dw4xwivy0ikyh55i2zkf61g03m6rm6xfdhc7a49y6fzxpr"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; }; + CINdex = derive2 { name="CINdex"; version="1.2.0"; sha256="096qiz86rxfhcrjs0pf3mp5zqgi3j7i4agbw53ym5kwzg486y2r2"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; + CMA = derive2 { name="CMA"; version="1.32.0"; sha256="0706k4xjakyid6mkca6z6r24kbsnkvw7qzzadqkm45sy11z0w5l8"; depends=[Biobase]; }; + CNAnorm = derive2 { name="CNAnorm"; version="1.20.0"; sha256="0dja320m9yiaj0kp9gmygpbqffnjdpi476wwcs2gwd6yixsldl6b"; depends=[DNAcopy]; }; + CNEr = derive2 { name="CNEr"; version="1.10.2"; sha256="12z2iza0mgw9yrpnlv7447mcsxn8h183712q66f1j4a779mhn5ii"; depends=[annotate BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; }; + CNORdt = derive2 { name="CNORdt"; version="1.16.0"; sha256="086ynj0nb6799qxgj7zys9gzxf4lvhacsqxr2qzl2hw4y13gxxkp"; depends=[abind CellNOptR]; }; + CNORfeeder = derive2 { name="CNORfeeder"; version="1.14.0"; sha256="19x8xxra4n5ys8wjqwj49qs3lg5jq9y00c36avr7cckxi9kyqqhc"; depends=[CellNOptR graph]; }; + CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.16.0"; sha256="03k246x3yi0c3bw8h0642767p6zbgx8d0ahvnv29lcrb7wp9qsi3"; depends=[CellNOptR nloptr]; }; + CNORode = derive2 { name="CNORode"; version="1.16.0"; sha256="1zsnig3r8yqa06nfxbd8czxjk72h5z7h0vd85cqkb181bwagl0r3"; depends=[CellNOptR genalg]; }; + CNPBayes = derive2 { name="CNPBayes"; version="1.4.0"; sha256="1ly0mh6k7x443i25g0j716aflc5q2rld0fqnyr86k1x06rh0ky8q"; depends=[BiocGenerics coda combinat GenomeInfoDb GenomicRanges gtools IRanges matrixStats RColorBrewer Rcpp S4Vectors SummarizedExperiment]; }; + CNTools = derive2 { name="CNTools"; version="1.30.0"; sha256="0wcny74g377741as9dw87n4vf6yi8yvxhxbf87x0y4zkf88aimcz"; depends=[genefilter]; }; + CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.4.0"; sha256="00xgwf62cs9l6pnvbp33b442q1mgaibac5fw4n2qsypdfb2p1xn3"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq openxlsx plyr Rsamtools S4Vectors]; }; + CNVrd2 = derive2 { name="CNVrd2"; version="1.12.0"; sha256="1msjvq3200y637ybh2yb5g1c2z0aqk1bwjvrndrg36vlg7342b6y"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; }; + CNVtools = derive2 { name="CNVtools"; version="1.68.0"; sha256="1lx2jhwfwya2hm8v9dkqkjhfbfp008k2k75r63wpph8yfxhyvvmz"; depends=[survival]; }; + CODEX = derive2 { name="CODEX"; version="1.6.0"; sha256="077cbv8n6mr8ksapxj2b837ms68kyzgjlk499c69q3dji456bgfw"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; }; + COHCAP = derive2 { name="COHCAP"; version="1.16.0"; sha256="14smbyviii5ghac3rhkrz87vhx6nxgv3n54k3rrzsdbrw8n0i773"; depends=[COHCAPanno gplots RColorBrewer WriteXLS]; }; + COMPASS = derive2 { name="COMPASS"; version="1.12.0"; sha256="1cmqqcsv32ixdmm9qybvafjca6lqzc652hp4jn9vy62ffb81r8i8"; depends=[abind clue data_table knitr pdist plyr RColorBrewer Rcpp scales]; }; + CONFESS = derive2 { name="CONFESS"; version="1.2.2"; sha256="1zw3sl5vzn6j8qppz39s2l11f9n2p5yzr4b17qgar6p41f83xffa"; depends=[changepoint cluster contrast EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; }; + CORREP = derive2 { name="CORREP"; version="1.40.0"; sha256="1wd8qq11xdyis0acnzlml10m0z8fazzhmvxxqa21h2wpq0yz9m19"; depends=[e1071]; }; + COSNet = derive2 { name="COSNet"; version="1.8.0"; sha256="07s72x0dbsnq340v1akl4jp8m63nnxck2nvivz12cvbq8hbhz6hf"; depends=[]; }; + CRISPRseek = derive2 { name="CRISPRseek"; version="1.14.1"; sha256="0l3blmszil8zr03wg9pwl59lkyxbn1pa3pz967nlbwffcv2lqfa0"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; }; + CRImage = derive2 { name="CRImage"; version="1.22.0"; sha256="0km82x446b1r9b27z1cx65nd9lm8ppxkarzqwqs426hj59wpzxhf"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; }; + CSAR = derive2 { name="CSAR"; version="1.26.0"; sha256="15w6mmwd5pqb144x3dyhi6x2ni00n0ak94lfrw317rajq733zr0p"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + CSSP = derive2 { name="CSSP"; version="1.12.0"; sha256="03gpl3w7iw79gcni4xchvbkrsp7v6i8zy6aqws54za4wimwqvsnf"; depends=[]; }; + CVE = derive2 { name="CVE"; version="1.0.0"; sha256="0xmy5mdw43db9d8pd3k6d73005hba72df24fsmgp9dv5sy9rg6p2"; depends=[ape ConsensusClusterPlus ggplot2 gplots jsonlite plyr RColorBrewer shiny WGCNA]; }; + CancerInSilico = derive2 { name="CancerInSilico"; version="1.0.0"; sha256="17jmyrcgs698g74hxp9mif7g4s175qdrfy5h1zz72fwcssmblh74"; depends=[BH Rcpp testthat]; }; + CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.16.0"; sha256="1wzbrlw5zf0pmm5m41wqf73wlsidb11l7l9llrmidbg860j0jjs0"; depends=[AnnotationDbi limma qvalue]; }; + CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.0.0"; sha256="1vja80lj16icp6jblw62b24daj7izgk9wbhbwprlbgcjvkppxfik"; depends=[cluster ConsensusClusterPlus iCluster impute limma NMF sigclust SNFtool survival]; }; + Cardinal = derive2 { name="Cardinal"; version="1.6.0"; sha256="1fwni0dwn1syz5j0961fpmnmifqb20hd23ysazfi3xvdq7pf1lw7"; depends=[Biobase BiocGenerics irlba lattice ProtGenerics signal sp]; }; + Category = derive2 { name="Category"; version="2.40.0"; sha256="16ncwz7b4y48k0p3fvbrbmvf7nfz63li9ysgcl8kp9kl4hg7llng"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter graph GSEABase Matrix RBGL RSQLite]; }; + CausalR = derive2 { name="CausalR"; version="1.6.0"; sha256="0l0021qslqj0xvrkg1lpmfnwdvi03yc7y2k62iz83s7k77z0wj6c"; depends=[igraph]; }; + 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]; }; + 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]; }; + ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.8.9"; sha256="1wykx52xqnz9pcxgfzf5i0ckrw41jg0piwynx1v1ldjxajbdh904"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools S4Vectors seqinr SummarizedExperiment VennDiagram]; }; + ChIPseeker = derive2 { name="ChIPseeker"; version="1.10.3"; sha256="00bv8i44c33ak2v6wzzk7s963wdhzb3c03ch2v8bkmnnb99sk0za"; depends=[AnnotationDbi BiocGenerics boot DOSE dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; }; + ChIPseqR = derive2 { name="ChIPseqR"; version="1.28.0"; sha256="0bv5anp4p220vh53khaqggwclp34k2402mfcj28wv9cfl7xhw4g3"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; + ChIPsim = derive2 { name="ChIPsim"; version="1.28.0"; sha256="06f00mviqxgqqli6lkybryl81hvf1ica94sj1zjc9bzm1aiva2fv"; depends=[Biostrings IRanges ShortRead XVector]; }; + ChemmineOB = derive2 { name="ChemmineOB"; version="1.12.0"; sha256="1f5wx3259v5whwy9h8jw7gs52n65gdby8q0lq1z9md0846i8cx6p"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; + ChemmineR = derive2 { name="ChemmineR"; version="2.26.1"; sha256="1i3cdszdb4k0cj3sl1p2fll7vxk47w2fldjzwb3b24qab0xczyih"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; }; + Chicago = derive2 { name="Chicago"; version="1.2.0"; sha256="1bxb35azi6sdlw0rl043h50cs20ysgmmydlscl5nn96ajk5ahs74"; depends=[data_table Delaporte Hmisc MASS matrixStats]; }; + ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.28.0"; sha256="034cianqg08rkqi2gpw29q144hnnnjb8jrmw180lfsdqbms8hlq3"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; }; + ClassifyR = derive2 { name="ClassifyR"; version="1.8.2"; sha256="0mn5hmlyhln7yngqvq8k6ir63jhf71b1h6s3322pppbypq25njsz"; depends=[Biobase BiocParallel locfit ROCR]; }; + Clomial = derive2 { name="Clomial"; version="1.10.0"; sha256="0nabq2nng5hc1rpqhr8riav0gjckzhhfr6i35ff5dxb4md3bgsxm"; depends=[matrixStats permute]; }; + Clonality = derive2 { name="Clonality"; version="1.22.0"; sha256="0qi62476ix6vm0zr7n3zvh6msl8w3lcnk8bn8c7qvynkn82ky4j4"; depends=[DNAcopy]; }; + ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.2.3"; sha256="169mi6xr5jslwgs9vyx0g90n2vp3za6v0hih714bamkk4vsjpzrv"; depends=[pracma princurve RColorBrewer scatterplot3d]; }; + CoCiteStats = derive2 { name="CoCiteStats"; version="1.46.0"; sha256="0jsgcgrr8nnw8mngxcvijri94k6aq2r8svzbrif22m1v7cpddhll"; depends=[AnnotationDbi org_Hs_eg_db]; }; + CoGAPS = derive2 { name="CoGAPS"; version="2.8.0"; sha256="1mbnyim02l1k77r2lchz7k42x9hpj1yvcq4qspyf2rh9d9p03zg6"; depends=[BH gplots RColorBrewer Rcpp]; }; + CoRegNet = derive2 { name="CoRegNet"; version="1.10.0"; sha256="1gh9nkgxm4b583rf33g4qziz989725l42nnfyrjasjcgwb996scz"; depends=[arules igraph shiny]; }; + CompGO = derive2 { name="CompGO"; version="1.10.0"; sha256="1walrgh7bczfzms8syi2vcmjzq1xigxl2jld9v9i7v139h4yvp6d"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.12.0"; sha256="0r5d75lj0fbskizpmhbv0w4wscpfjfq9k3vbadyfs8wadmp9xvdh"; depends=[circlize colorspace dendextend GetoptLong GlobalOptions RColorBrewer]; }; + ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.38.0"; sha256="0lw8j9gvm227yjh0ya05j4x87a9p6s95cr7sraza0zh6qc70vgzb"; depends=[ALL Biobase cluster]; }; + CopywriteR = derive2 { name="CopywriteR"; version="2.6.0"; sha256="1bwwnsyk7cpgwkagsnn5mv6fv233b0rkhjvbadrh70h8m4anawfj"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; + CorMut = derive2 { name="CorMut"; version="1.16.0"; sha256="0c0wx7nldq0wsa5z6l398jnnpkxjkqj9yc490x15kyds9pyazm85"; depends=[igraph seqinr]; }; + Cormotif = derive2 { name="Cormotif"; version="1.20.0"; sha256="0wh5wj3z5q2yk9jw5wmd2adpwhl0vck19flzdwns55bfndz7s5xd"; depends=[affy limma]; }; + CountClust = derive2 { name="CountClust"; version="1.2.0"; sha256="14frvr84dxfp4ily2x40gr7phh8d39ljxnlkz0224cc7v2lnkjz7"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam]; }; + CoverageView = derive2 { name="CoverageView"; version="1.10.0"; sha256="1sfhir56rra207z8pl8px40qrc5hca8kf4zmrl2pk9zr7ksbd1z5"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; + CrispRVariants = derive2 { name="CrispRVariants"; version="1.2.0"; sha256="0dvzyz3rxwd5blfcaf05viy35w7n8681wzb2lr5zdc44nm92d3kz"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; + CytoML = derive2 { name="CytoML"; version="1.0.1"; sha256="034ki5bi83m04c9l2m636vb5l1wj0nmvyphj1db7bhz8i0h8as7w"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace graph jsonlite ncdfFlow openCyto RBGL Rgraphviz XML]; }; + DAPAR = derive2 { name="DAPAR"; version="1.6.0"; sha256="0v176my80p7p26azczw75yqi9zdfvxjf35hjr5hprhm795bppavx"; depends=[Cairo cp4p doParallel foreach ggplot2 gplots impute imputeLCMD knitr lattice limma Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer reshape2 scales tmvtnorm vioplot]; }; + DART = derive2 { name="DART"; version="1.22.0"; sha256="0ysi99wlhb6v98nfqd6vss0c14sh87p0v13099dll18ijifvfkqr"; depends=[igraph]; }; + DBChIP = derive2 { name="DBChIP"; version="1.18.0"; sha256="00jwf6163dbrglbq1fba3380ad7wxd8swj2xcm650m41i2nf2rqz"; depends=[DESeq edgeR]; }; + DChIPRep = derive2 { name="DChIPRep"; version="1.4.0"; sha256="0l31w5xs2g9bdyy191gpslp41m9k42pq5lzd86vpm1xw0792q9w0"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; }; + DECIPHER = derive2 { name="DECIPHER"; version="2.2.0"; sha256="07i9dgw4hck0jgxsj80sc68wf1d7d7zqxy8vbpf1ynf3m1zwkynp"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; + DEDS = derive2 { name="DEDS"; version="1.48.0"; sha256="18bb887dhifdkcp0bgg4dfcx3nlwxnrakh0r000i856m5fn79zd5"; depends=[]; }; + DEFormats = derive2 { name="DEFormats"; version="1.2.0"; sha256="047cvxbzs0mg14y9005f40xjgj1pgik43jb3q5z1inipqgmj1sn4"; depends=[checkmate DESeq2 edgeR GenomicRanges SummarizedExperiment]; }; + DEGraph = derive2 { name="DEGraph"; version="1.26.0"; sha256="1s7gjraaqvndr590wbnvjq4wik6bmbdijl6l0ribd5d7r5zic0gm"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; }; + DEGreport = derive2 { name="DEGreport"; version="1.10.1"; sha256="0llhniqryz3fckgmkc89h89ipc7ambi323y2awwyqc080d7ph37p"; depends=[cluster coda dplyr edgeR ggplot2 gridExtra knitr logging Nozzle_R1 pheatmap quantreg reshape tidyr]; }; + DEGseq = derive2 { name="DEGseq"; version="1.28.0"; sha256="0p9m0bky2fa320nw22bfa270zj91aywmyp0vs67x3x4aimhirz7g"; depends=[qvalue samr]; }; + DESeq = derive2 { name="DESeq"; version="1.26.0"; sha256="18f0400pcmla88kc2prscw0skkf7bww0mnkrj6hhxyy79dhzdy86"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; }; + DESeq2 = derive2 { name="DESeq2"; version="1.14.1"; sha256="1walwkqryn1gnwz7zryr5764a0p6ia7ag4w6w9n8fskg8dkg0fqs"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; + DEXSeq = derive2 { name="DEXSeq"; version="1.20.2"; sha256="1j3ll3417smxx1akbi3kk1r2p0m8jfrgfd35rhmr3q8b3lz3x9pw"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; + DEsubs = derive2 { name="DEsubs"; version="1.0.2"; sha256="0v35x38sh6i69m7wjwzyyjhcx88wrrz3gr5w1r80cg5rvjl8bhch"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; }; + DFP = derive2 { name="DFP"; version="1.32.0"; sha256="08jjhzqr4yv2zwdgn43r3bvh2hw0fsamicyzdwcfkamvw9p5ipxf"; depends=[Biobase]; }; + DMRcaller = derive2 { name="DMRcaller"; version="1.6.0"; sha256="196km32s5z881hsranycsmmqk1nxr3vdfhwdy9l1j179b64vz09w"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; + DMRcate = derive2 { name="DMRcate"; version="1.10.10"; sha256="1snsq6j1na9z78mks43fhgz2iayizm4vd51kx4m8zikc198h3xw1"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors]; }; + DMRforPairs = derive2 { name="DMRforPairs"; version="1.10.0"; sha256="0flr8a8bzhwcs4hhrcb8ilzr1pzlgic4d5nm8gsqnrgjdjh05np7"; depends=[GenomicRanges Gviz R2HTML]; }; + DNABarcodes = derive2 { name="DNABarcodes"; version="1.4.0"; sha256="13xc3abfm2yg7s1h0way99vcj3577p3j183jhqq4ii86c6y9c6k7"; depends=[BH Matrix Rcpp]; }; + DNAcopy = derive2 { name="DNAcopy"; version="1.48.0"; sha256="1idyvfvy7xx8k9vk00y4k3819qmip8iqm809j3vpxabmsn7r9zyh"; depends=[]; }; + DNAshapeR = derive2 { name="DNAshapeR"; version="1.2.0"; sha256="0zm1c989h34iqk0w9sgz7bdz3h0njns856yhc1q7n6vfqnhhygsz"; depends=[Biostrings fields GenomicRanges Rcpp]; }; + DOQTL = derive2 { name="DOQTL"; version="1.10.0"; sha256="0fn444vc1w274079a3yn79rnv6i1nhqp9jwyg0qkih53bg49519x"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; + DOSE = derive2 { name="DOSE"; version="3.0.10"; sha256="13m5akx9hi11906sbrbcz8q36m9h8i0wqm5323bdnlprv217m8fq"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim igraph qvalue reshape2 S4Vectors scales]; }; + DRIMSeq = derive2 { name="DRIMSeq"; version="1.2.0"; sha256="1iiqb3ccxh9y2sc913sw7lcd16bq54kj6z5hk6f7khsgwy84g5q6"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges reshape2 S4Vectors]; }; + DSS = derive2 { name="DSS"; version="2.14.0"; sha256="09452x6cs16b2fxx7h74midxkla7cc46paqkxhilx82nf2yrjzrm"; depends=[Biobase bsseq]; }; + DTA = derive2 { name="DTA"; version="2.20.0"; sha256="16bp4gy8ifc3ag24d6npfzvwhv4by371qilqsxnmd677pq75ccx6"; depends=[LSD scatterplot3d]; }; + DeMAND = derive2 { name="DeMAND"; version="1.4.0"; sha256="03w9vcv8ji82hhyy70mh5smib565gzjdp4bl7i1h1y3wjmsrq760"; depends=[KernSmooth]; }; + DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.16.0"; sha256="0p8vg1b8arpv01cdgq37c0mfmkd824b47cd8cpdzf7nhrhq53w65"; depends=[ggplot2 limSolve pcaMethods]; }; + DeepBlueR = derive2 { name="DeepBlueR"; version="1.0.11"; sha256="1zqr0bdsf4xlkdqrpg1ihc287gppw56p9p9smy97npm2dnqygw6f"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; }; + DiffBind = derive2 { name="DiffBind"; version="2.2.12"; sha256="0w3dwhjkf0sc7bd3m13gwym03j3pyli3xy2y7dqsqn8mhm64bqcy"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; }; + DiffLogo = derive2 { name="DiffLogo"; version="1.4.0"; sha256="1pla3izw79il49vlrp21shyq13xvg6vbayrjs6kbhjih738x0i5j"; depends=[cba]; }; + Director = derive2 { name="Director"; version="1.0.0"; sha256="0g0z2pp4jk9a3sfcidq8abgwnki8za73wzvpm4xdzy5g6lrcf3y7"; depends=[htmltools]; }; + DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.16.0"; sha256="0jrjragn40qjbrm7amg066jbl1ypxzs3h5cbd7vv35iwwvzgmgr3"; depends=[BiocGenerics IRanges S4Vectors]; }; + DriverNet = derive2 { name="DriverNet"; version="1.14.0"; sha256="19n396565sngzc3pk2dibqsza9pmp8dm1nrhlipv663r46s6j6kz"; depends=[]; }; + DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.14.0"; sha256="0pbaa9dg8g0bwky2mjr3wjpavf82xd564c1wx813ivsdx8a69pnm"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; }; + DupChecker = derive2 { name="DupChecker"; version="1.12.0"; sha256="0yrlx3w8ndij5ynfyjh0y5xyldsnsyhgw7ilnx728vfxp7zgw6fv"; depends=[R_utils RCurl]; }; + DynDoc = derive2 { name="DynDoc"; version="1.52.0"; sha256="0nd7873m3zgyx1ryyhy9bsvzzkvdvqggk5sbnai4aph2hy2lbk1a"; depends=[]; }; + EBImage = derive2 { name="EBImage"; version="4.16.0"; sha256="0gbl9waszvkavw68npsjq1c7yhqljgb2r0qx4f8i05cp8i0yr3rx"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; }; + EBSEA = derive2 { name="EBSEA"; version="1.2.0"; sha256="1ikkj4mmr1rdcxsy1anc3ik3vy1hn0v262h17751y64bk2djvycj"; depends=[edgeR gtools limma]; }; + EBSeq = derive2 { name="EBSeq"; version="1.14.0"; sha256="14ny417fijjnrkz5hjj8z8s6dbrqxx0cyi85585g06nrv8mm1hhl"; depends=[blockmodeling gplots testthat]; }; + EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.8.0"; sha256="0ahmsxqixapdjpwsr1wnmk7lq5fnbqpq7vsbs9qk2a5pl2lxzqd0"; depends=[EBSeq]; }; + EBarrays = derive2 { name="EBarrays"; version="2.38.0"; sha256="1r00rdd5zlm29jc0yq3jns08cv67f9wk6lia56m52zscqcji6nvw"; depends=[Biobase cluster lattice]; }; + EBcoexpress = derive2 { name="EBcoexpress"; version="1.18.0"; sha256="0lhcvd49rhmcdbmxizivcn7wi9bv0av2p9mz4grpnb3a0r6hjgdm"; depends=[EBarrays mclust minqa]; }; + EDASeq = derive2 { name="EDASeq"; version="2.8.0"; sha256="0biwxx1ssqj3isc15i7crm05cyapm47ny4jks8wr9pqha715myai"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; }; + EDDA = derive2 { name="EDDA"; version="1.12.0"; sha256="1ra5jdngpiif9wd322ncg72ik2wkapcn7z3raw6rb5ii8g5706fc"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; }; + EGAD = derive2 { name="EGAD"; version="1.2.0"; sha256="04zaykhl3dkaqy73dsgj0kqghisxgck2fjbwrvlc9j8rb2rggnmd"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; }; + EGSEA = derive2 { name="EGSEA"; version="1.2.0"; sha256="0wd4a89l8isbgqcyls8pw5h1l68qd4k1c7nxci7q4d86vrv3xzwd"; depends=[AnnotationDbi Biobase edgeR EGSEAdata gage ggplot2 globaltest gplots GSVA HTMLUtils hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview RColorBrewer safe stringi topGO]; }; + ELBOW = derive2 { name="ELBOW"; version="1.10.0"; sha256="0x86czjfzpkxs9z6fn6siapwj6320f096bzg3bfjzaa387g89sk0"; depends=[]; }; + ELMER = derive2 { name="ELMER"; version="1.4.1"; sha256="1q60yi3wqjmm2y6dfl5qjgxzhdjd22vsdsnan8mw1fl2kljjlbdl"; depends=[BiocGenerics ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi reshape S4Vectors]; }; + EMDomics = derive2 { name="EMDomics"; version="2.4.0"; sha256="0fkyvmib34kwz4zzp3f0miw9bhn87hmbk0j94gla2fgxvxwby1sf"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; + ENCODExplorer = derive2 { name="ENCODExplorer"; version="2.0.6"; sha256="0876lfyh5584nq6sqz3yyc4ixl1pfyx1wamhdfcyq6c86yi5prgp"; depends=[data_table dplyr DT jsonlite RCurl shiny shinythemes stringi stringr tidyr]; }; + ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.22.0"; sha256="1h3nz1k2rl2b14hh61yqq3dng3h3k3qp48w8izfsdwjm9imxs3kb"; depends=[rJava XML]; }; + ENmix = derive2 { name="ENmix"; version="1.10.0"; sha256="17ppsfbl68fsck4nyda4x8k5sdymn52dgkvky1q4cri3xvn2kkpj"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; }; + EWCE = derive2 { name="EWCE"; version="1.2.0"; sha256="1iq62cn389sa0h3y6rj61n51a1wkjcpnq9a3la2gavddd0iqsbl8"; depends=[biomaRt ggplot2 reshape2]; }; + EasyqpcR = derive2 { name="EasyqpcR"; version="1.16.0"; sha256="1hlhvpz18q6wfwmfj0fs8saacpyaild2p7qwmgmndcv2lqpmgcrh"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; }; + EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.2.0"; sha256="0l7dq2ww2vi39iipazfv71i0bw6j029x3llbnd15sf7lpsplc9df"; depends=[]; }; + EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.4.0"; sha256="013y7iygzf7vy1g34c2ww55m4w1173mxbwi4pn6x75r1fmnmvkai"; depends=[ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats]; }; + EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.4.6"; sha256="1xijwplmlcdi2rqp8frsbwgxby6k2mnjbfv2dw560rgcmys7n395"; depends=[AnnotationDbi Biobase biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; }; + ExiMiR = derive2 { name="ExiMiR"; version="2.16.0"; sha256="11pr3jlzm8hm4bizpgwvmr1ylb41rd487mp71890paqwhv91abq1"; depends=[affy affyio Biobase limma preprocessCore]; }; + ExperimentHub = derive2 { name="ExperimentHub"; version="1.0.0"; sha256="15254v73vi7vr7cky29i58np5ljq7iawmffrb1vir54snpgw72q9"; depends=[AnnotationHub BiocGenerics BiocInstaller S4Vectors]; }; + ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.0.0"; sha256="1i55z69idxk3zpiypid045mssvfbysbincxfp0z8sh5gf0dipj9d"; depends=[AnnotationHubData BiocCheck BiocGenerics BiocInstaller curl DBI ExperimentHub httr S4Vectors]; }; + ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.2.0"; sha256="07asxjzplx05jkxm05lxny4np9yw0i9ir0pbhg76dxnx7k1x1bv4"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; }; + ExpressionView = derive2 { name="ExpressionView"; version="1.26.0"; sha256="0fy2cay5s9ypbrdjj6v5n8l99pq0fggw6gl9xh451vr2j0c8cmr8"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; }; + FEM = derive2 { name="FEM"; version="3.2.0"; sha256="1ivhzap6hcdwpy8yf1sl4gh53c24nzm22br08z8g99wl3q3apsg0"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; }; + FGNet = derive2 { name="FGNet"; version="3.8.0"; sha256="07v32575vws879745zc1c75rlwbdrybijhbc3hs7s4w4nz574lfc"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; + FISHalyseR = derive2 { name="FISHalyseR"; version="1.8.0"; sha256="0fn92g2zzv35xhd28p5zb3qqhqy9hflz4d1sk3cjajpav26k9dnd"; depends=[abind EBImage]; }; + FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.10.0"; sha256="0ccp7s4qg2mf0mnz9hvasscgc18nmqmjrfwj9k2x1nv6rhph51cv"; depends=[fda MASS]; }; + FamAgg = derive2 { name="FamAgg"; version="1.2.1"; sha256="16iaj8zn12kq89sksq5dqgfxyb5048vdfhvjqgvp455vi74jkx9z"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; + FindMyFriends = derive2 { name="FindMyFriends"; version="1.4.0"; sha256="1r2jqrsgsmrlz3fa8qp7pb4bxh6am2xmgafnk5xh679kyvdhp4dh"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; }; + FitHiC = derive2 { name="FitHiC"; version="1.0.0"; sha256="1pzywxdn2qkkfkhnf1n4d9fnvz3kz4301kxqmszj3d10z2wlhzab"; depends=[data_table fdrtool Rcpp]; }; + FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.6.0"; sha256="06z3wandk8vaabkbmm0w6jaknimysfm16r351alg28ajznxqiw1n"; depends=[jsonlite RCurl XML]; }; + FlowSOM = derive2 { name="FlowSOM"; version="1.6.0"; sha256="1lbyxhs59cc3mfqbgskgnx5vbly6rr2dswn3hwlw5nh2idpwnwfn"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; }; + FourCSeq = derive2 { name="FourCSeq"; version="1.8.0"; sha256="0n0zsmh48vy756wg3rmnsqsl0kyy8wl1sm97c0w1yp4wpak36qqp"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; }; + FunChIP = derive2 { name="FunChIP"; version="1.0.0"; sha256="1l0hyg3scp0b1xsx7xl8x6629iaf155k50vykjk17kb6aand5p19"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges Rcpp Rsamtools shiny]; }; + FunciSNP = derive2 { name="FunciSNP"; version="1.18.0"; sha256="03wzrrdhnp6svf4vy907h6bbnpfgrbqhqabsah37qzld15qm2xs2"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; + GAprediction = derive2 { name="GAprediction"; version="1.0.0"; sha256="18675g9405x4bhbgk1y3lc011cz409qgqgmnsr9pg1cr1cpfcgqh"; depends=[glmnet Matrix]; }; + GEM = derive2 { name="GEM"; version="1.0.0"; sha256="12y8pnbvfmid0spid61nxlf79nnq64yd1q6as7mi95nqgf498lcb"; depends=[ggplot2]; }; + GENE_E = derive2 { name="GENE.E"; version="1.14.0"; sha256="07qc96cja92zbs87qmrpxl6jym96vazygybmjvkxzb3cmw8ivcrg"; depends=[RCurl rhdf5]; }; + GENESIS = derive2 { name="GENESIS"; version="2.4.0"; sha256="1gknm10fjgry5arz60y6yvkdpiwf1nkvyyxdgh2jbslz6ypgcy57"; depends=[Biobase gdsfmt graph GWASTools SeqArray SeqVarTools]; }; + GEOmetadb = derive2 { name="GEOmetadb"; version="1.34.0"; sha256="0gjzhx3x1945ny8wqp1w6gwgbx81wsqbgc9l7sd2wqnf85w5y513"; depends=[GEOquery RSQLite]; }; + GEOquery = derive2 { name="GEOquery"; version="2.40.0"; sha256="1p4dsmbibhrjdffkh8z1fff4j85jczwn4djnnpj2ifvz2x05q3vc"; depends=[Biobase httr RCurl XML]; }; + GEOsearch = derive2 { name="GEOsearch"; version="1.0.0"; sha256="1xz3mizjh1nfmc4726jjj38qdn5byjwlinwbd3j0k2qw5dvzmjaj"; depends=[org_Hs_eg_db org_Mm_eg_db RCurl]; }; + GEOsubmission = derive2 { name="GEOsubmission"; version="1.26.1"; sha256="0niagqjl5sqi4frjj23glgib0js1gf7p7lj4qbz8lvkg1arj2kba"; depends=[affy Biobase]; }; + GEWIST = derive2 { name="GEWIST"; version="1.18.0"; sha256="1faw43mvv3v9yl9lbllx0gj588i7r9rfm453mwq80v9adllrnnkw"; depends=[car]; }; + GGBase = derive2 { name="GGBase"; version="3.36.0"; sha256="1wmxv6wl6d050xjc0sc0z2i74y3xnnr6vmdynipcncbsrmsw91gv"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; }; + GGtools = derive2 { name="GGtools"; version="5.10.1"; sha256="1cngmdk9ggp38gbp3kqs74ixa5ak5cm1n09z1lrhg110byim79ry"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; }; + GLAD = derive2 { name="GLAD"; version="2.38.0"; sha256="1din6jgb2n6qs6g10133mc506y3bmc2gpwdcj6q8fm3jwq3iw769"; depends=[]; }; + GMRP = derive2 { name="GMRP"; version="1.2.0"; sha256="17n77baq513wxnh0dh313h7bpj01jkfs4ybac1w5bmsqbafnakz8"; depends=[diagram GenomicRanges plotrix]; }; + GOFunction = derive2 { name="GOFunction"; version="1.22.0"; sha256="1gn9z2si5jg7db28ldmgj03b0acv9mq884srmgjyq3ar705hkvd9"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; }; + GOSemSim = derive2 { name="GOSemSim"; version="2.0.4"; sha256="1ii12y5yb6mby76c193ampvjk0klsx3kl0h6qmr3359sdx9mcbiq"; depends=[AnnotationDbi GO_db Rcpp]; }; + GOSim = derive2 { name="GOSim"; version="1.12.0"; sha256="0539da5ljil1l158bdrj7xmgj7da33kwqk8ng5snwv9jzvmynrdn"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; }; + GOTHiC = derive2 { name="GOTHiC"; version="1.10.0"; sha256="17n51iw61xyfiladvrz36ksvj6sdfgmhbxs9hx25g3j5biv0sxw0"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; + GOexpress = derive2 { name="GOexpress"; version="1.8.1"; sha256="00gnznvyg2mpk6cv5jk842h71awikw3qbzg43vl72cxcb8iai7fj"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr VennDiagram]; }; + GOpro = derive2 { name="GOpro"; version="1.0.0"; sha256="0wypc72p940b2jh8s83k4hs5m4flvpr724xgzscygcn3v25b23c7"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; }; + GOstats = derive2 { name="GOstats"; version="2.40.0"; sha256="0g2czm94zhzx92z7y2r4mjfxhwml7bhab2db6820ks8nkw1zvr9n"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL]; }; + GOsummaries = derive2 { name="GOsummaries"; version="2.8.0"; sha256="05aws7ln6jxisgmxkx3m3lfz87i8ayy8bdm8lgjyhhskf5gq7yzn"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; }; + GRENITS = derive2 { name="GRENITS"; version="1.26.0"; sha256="1x1rxs3id7kbp7lf3a8460qh6p0mlhx1w33yyy20cd45y407xxji"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; + GRmetrics = derive2 { name="GRmetrics"; version="1.0.0"; sha256="0pviyq23gsivqxm9pzxa5d911f32m3p8gkav9hbsn2fm2x7g8k07"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; }; + GSALightning = derive2 { name="GSALightning"; version="1.2.0"; sha256="0hxjlnzwk16s1qxnd1dsd8f9zbwqnpq7vyrr3ag6yq4xm6rksr9v"; depends=[data_table Matrix]; }; + GSAR = derive2 { name="GSAR"; version="1.8.0"; sha256="0wdz3jx1dnw6w71r3spfi09nqyndvb0f610qci50s824k593aglp"; depends=[igraph]; }; + GSCA = derive2 { name="GSCA"; version="2.4.0"; sha256="1fxc3s891flai43j8i7bp9q3v6ynkbd4yx6y5rgvf8360bl62s3z"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; }; + GSEABase = derive2 { name="GSEABase"; version="1.36.0"; sha256="0l2x7yj7lfb0m2dmsav5ib026dikpgl4crdckrnj776yy08lgxpj"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; }; + GSEAlm = derive2 { name="GSEAlm"; version="1.34.0"; sha256="0ykxpki36spgb562805k5hi2cyp984gjr2flq591vc8qhz87d1ry"; depends=[Biobase]; }; + GSRI = derive2 { name="GSRI"; version="2.22.0"; sha256="1dml01y75yc2f3ra65ha4ah991mvlzdnhkzllqxlah0gayvbhw52"; depends=[Biobase fdrtool genefilter GSEABase les]; }; + GSReg = derive2 { name="GSReg"; version="1.8.0"; sha256="0ccghcpdpaa3dfaxbg682jll7gj6yh6513adffyi7q9qif6rz4jx"; depends=[]; }; + GSVA = derive2 { name="GSVA"; version="1.22.4"; sha256="1v0znan5xyd1b3cr83ag83sk5ipnifn3882qcnfz6d26b5rq5cdz"; depends=[Biobase BiocGenerics GSEABase]; }; + GUIDEseq = derive2 { name="GUIDEseq"; version="1.4.1"; sha256="0n21pd96q9xj6ljamq40zld0276dj4raiwdak8l27y37n1xq5bna"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; }; + GWASTools = derive2 { name="GWASTools"; version="1.20.0"; sha256="07ql1iihqvmks7pzlwab6hffsp7d6by8n7sq9mgi5zqwdy1kdyw3"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf4 quantsmooth RSQLite sandwich survival]; }; + GenRank = derive2 { name="GenRank"; version="1.2.0"; sha256="1sp43mr40dnfmxavqrn3bhbwkvrx229q7kvbwv4xbzl9980y2mwq"; depends=[matrixStats reshape2 survcomp]; }; + GenVisR = derive2 { name="GenVisR"; version="1.4.1"; sha256="0a4nnq7nkmza8kyx6jq321rzfh843cj9yjn36pqam2w3gkx4a5q2"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; }; + GeneAnswers = derive2 { name="GeneAnswers"; version="2.16.0"; sha256="164vas8gkrs1q9s3vhnb1f1lkqlndd5n2v7q0hb0rndjg0b08ryb"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; }; + GeneBreak = derive2 { name="GeneBreak"; version="1.4.0"; sha256="153a1ca44apavrf09fc8gwyvqbln6rwjpcjq6cxa2ixw714xvmk1"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; + GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.20.0"; sha256="0v26wyibllqw1mwncb4h8m3bg0x8zm9iv6apadp7n91x0zaqflmd"; depends=[Biobase PGSEA]; }; + GeneGA = derive2 { name="GeneGA"; version="1.24.0"; sha256="19jr504whini0csk8cir3rs8fwccnrpf84kpnhphsc6j7ypy45qd"; depends=[hash seqinr]; }; + GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.0.0"; sha256="15i67aqjvss9g8irh6ifr000y37irxg2glpg9qajm9kpwjvsr8kf"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm rioja Rsamtools snpStats]; }; + GeneMeta = derive2 { name="GeneMeta"; version="1.46.0"; sha256="1zxn1wm8wzia561hgljdyp1djidr1bzzb5kxpb73jwpxb43j8pd5"; depends=[Biobase genefilter]; }; + GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.16.0"; sha256="0mkd7ny0h0j53daxz7zwcbgnk85rmkpbsj0p4l205g3nfwa06iip"; depends=[graph plyr Rcpp]; }; + GeneOverlap = derive2 { name="GeneOverlap"; version="1.10.0"; sha256="1y8n4r2gps65sz1yhhzr1n0frv79vwm2j9vxvs75v6c3a236x4r0"; depends=[gplots RColorBrewer]; }; + GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.30.0"; sha256="0ac6qqzlnl29hkxyxyn6rvffg8klfp9qps0bx9hgmmhj60iwzqdi"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; }; + GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.18.0"; sha256="04asjxn49vipaidammf568gf4gfck6d0300hdydxkpbzm8frpn0n"; depends=[Biobase limma MASS survival]; }; + GeneSelector = derive2 { name="GeneSelector"; version="2.24.0"; sha256="1d99hqmp5jrwaq08svzvliqfli9r4731gmj3d9ly6rqaiba003zf"; depends=[Biobase limma multtest samr siggenes]; }; + GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.42.0"; sha256="0mx55dqrib9ik0nvh96l5nz80hslz7ihi2lri98nlfanm1ckmgjn"; depends=[gmodels gtools mvtnorm]; }; + GeneticsPed = derive2 { name="GeneticsPed"; version="1.36.0"; sha256="0z4zqni9sncigi89c2vvw7pian2zlni9rhbc9l39ig2970zyvh7s"; depends=[gdata genetics MASS]; }; + GenoGAM = derive2 { name="GenoGAM"; version="1.2.1"; sha256="04r18wff2zjkb0hh731ssl7jplb8kn4lrmls0zzfl6iqgh539vvf"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; }; + GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.34.0"; sha256="0088s233lj2p0vy5wdw049zgakppvzk1zf07k628yaz8ckbgjg99"; depends=[biomaRt]; }; + GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.10.3"; sha256="18g24cf6b3vi13w85ki2mam6i2gl4yxr1zchyga34xc3dkdngzrw"; depends=[BiocGenerics IRanges RCurl S4Vectors]; }; + GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.10.1"; sha256="1dilghbsyf64iz5c0kib2c7if72x7almd5w3ali09a2b2ff2mcjk"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; + GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.26.4"; sha256="1y16lqach0v3ym5zhdhj4r2imfi0kpa0djlb51hj85yf7xkzwdlb"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; + GenomicFiles = derive2 { name="GenomicFiles"; version="1.10.3"; sha256="03yqkl2yjdz999j1y7azcs16vg0vydrqs6sxcfkgn11fiwi6i3l2"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.8.1"; sha256="1lqwyz6ms6iw8sl2l52xbaaag10lp3k8s03c9326hxhyy3ba7c5f"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; + GenomicRanges = derive2 { name="GenomicRanges"; version="1.26.4"; sha256="1789ycqzv20d8p1axkxrhsz9v0ww6w1dk2mfvm85p8j53zd1f67c"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; + GenomicTuples = derive2 { name="GenomicTuples"; version="1.8.3"; sha256="1wxcz06gywipyv0cnw8w7f9wccbn90l0h07zspwfd0l0d4rmqh1p"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; + Genominator = derive2 { name="Genominator"; version="1.28.0"; sha256="0aayjr0sw9xqy4y2xyfbmbk7cbc81c5f0kf6fhdiswxl1v5f43l4"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; }; + Glimma = derive2 { name="Glimma"; version="1.2.1"; sha256="0gqkm41rsdkgq15b3w2hv3n77kp85sirnypdav7g3lq00r8q69iv"; depends=[DESeq2 edgeR]; }; + GlobalAncova = derive2 { name="GlobalAncova"; version="3.42.0"; sha256="0wxs7l4jx4c54bafvif48c4rlnv5vgl658403j4gp6w2xapbi4dv"; depends=[annotate AnnotationDbi corpcor globaltest]; }; + GoogleGenomics = derive2 { name="GoogleGenomics"; version="1.6.0"; sha256="12jpp6j4pzx5agnshzxa42izxby9iwl5vpaj2c7bh1m07xn35qkg"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; }; + GraphAT = derive2 { name="GraphAT"; version="1.46.0"; sha256="0gynda9y1px750ffgxprs8nlq85gxfkggvg9g0qdwsw32gn5s2nw"; depends=[graph MCMCpack]; }; + GraphAlignment = derive2 { name="GraphAlignment"; version="1.38.0"; sha256="1p6qswivfmapm0qh58r0chp9jqc0yljpx9c405viss36k2sxv7k0"; depends=[]; }; + GraphPAC = derive2 { name="GraphPAC"; version="1.16.0"; sha256="0xmcg6d5v7qzi9kxvgfigxz2zv0fgpsqrvwq3dckvziqpv214dyc"; depends=[igraph iPAC RMallow TSP]; }; + GreyListChIP = derive2 { name="GreyListChIP"; version="1.6.0"; sha256="16rv1z40j4wkhify0xf24afd7f40pmwjm1r1nq5zhrz4im7skc8r"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; + Guitar = derive2 { name="Guitar"; version="1.12.0"; sha256="1mfp56d4wqml5ki5mayq3cd4zidgm0jv1gxl9g04nxp7jzzcm6c1"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; }; + Gviz = derive2 { name="Gviz"; version="1.18.2"; sha256="0gdd1h474gyy7g5cwrjzy6dwddblpg9gqnig5gdcbdzl0ll8kpc4"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; + HCsnip = derive2 { name="HCsnip"; version="1.14.0"; sha256="1vmh1j954pj6xfafcgwc6wfw066clqdggc79360anbr9rlfsmjkw"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; }; + HDF5Array = derive2 { name="HDF5Array"; version="1.2.1"; sha256="07c4xp9v6rvi2zpg5r504rjp041h438djz4x1d28ryxpmp9sgj1a"; depends=[BiocGenerics IRanges rhdf5 S4Vectors]; }; + HDTD = derive2 { name="HDTD"; version="1.8.0"; sha256="0diq8m2qrv42hknyvhzgjxw17jykxaw1qifpm4k4fidp55dgd9qf"; depends=[]; }; + HELP = derive2 { name="HELP"; version="1.32.0"; sha256="0qypbj5vvv0r75izdarh48y94jc1b0msn7rnhkcqkpqcwpdfxgpl"; depends=[Biobase]; }; + HEM = derive2 { name="HEM"; version="1.46.0"; sha256="0gsqfpg10ywskcn782h7saqqhd8y72x4cxd3z9vhwdz3rkf99maf"; depends=[Biobase]; }; + HIBAG = derive2 { name="HIBAG"; version="1.10.0"; sha256="18dr6y6fw85hip4njzaax9sjr02xbwcicjmrxsdq4g8gx5r0rrsh"; depends=[]; }; + HMMcopy = derive2 { name="HMMcopy"; version="1.16.0"; sha256="1syy98jgim2adchcc4ni1xji3ssixbawqafrkzq68fspsh467yc6"; depends=[geneplotter IRanges]; }; + HTSFilter = derive2 { name="HTSFilter"; version="1.14.1"; sha256="145lbxcv0fqqby9y5fzrijvmm6rhmqr0a6n49n8syq03ibg1pa04"; depends=[Biobase BiocParallel DESeq DESeq2 edgeR]; }; + HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.26.0"; sha256="0zh3zlkgiwk1bsxv3j4bwf300531ifpg5hyniwal732zm7xbbiq3"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; }; + HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.4.0"; sha256="121z3hmpgv3bhg28ns1k570s11gicmsrp4a2y4jndarxrzdi5f7k"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; }; + HTqPCR = derive2 { name="HTqPCR"; version="1.28.0"; sha256="19gfjgf7d2xqb9vr5sg45yp2d0jmqx3s2s2y71wdg48508xf3990"; depends=[affy Biobase gplots limma RColorBrewer]; }; + Harman = derive2 { name="Harman"; version="1.2.0"; sha256="0hdravpr71mp34ix486nx7czrfz9pqg045m4c7rs7d10p0vb76cn"; depends=[Rcpp]; }; + Harshlight = derive2 { name="Harshlight"; version="1.46.0"; sha256="069826gdbb4xzdbizxzfn8z681vvrchk20k8awd7r7n3i01gbz5f"; depends=[affy altcdfenvs Biobase]; }; + Heatplus = derive2 { name="Heatplus"; version="2.20.0"; sha256="0svmlq531jasggndz1n8b6sh97k9pj1i9a0w2k5iz17cpg89w9sp"; depends=[RColorBrewer]; }; + HelloRanges = derive2 { name="HelloRanges"; version="1.0.1"; sha256="11z2d0d98l0wgxd0dicrph6ldrgvdrngibhgkknfshzcs4c6yqkv"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; + HiTC = derive2 { name="HiTC"; version="1.18.1"; sha256="0l3a7f4caj2ijd54swjgz9893hy5yn2bv0gp9mjibj5x0hgrwbmf"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; + HilbertCurve = derive2 { name="HilbertCurve"; version="1.4.0"; sha256="132dn6l3g70wfznwfqg33f7saqn8av2p8nbrbymipavy5jmaki1s"; depends=[circlize GenomicRanges HilbertVis IRanges png]; }; + HilbertVis = derive2 { name="HilbertVis"; version="1.32.0"; sha256="1k2lmvjvzfj73fpfd3ri4ifwvb30kd5k55cssr0cz2fx37rd8hiv"; depends=[lattice]; }; + HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.32.0"; sha256="1v0s125k56nmjpmk4352ygyzi0w8is8ispqgyjcgyfhzn4fs46aw"; depends=[HilbertVis]; }; + HybridMTest = derive2 { name="HybridMTest"; version="1.18.0"; sha256="0g62cgmy6g150fhjx2v4xk8mg6c5glz2h6ry89dr8pk5czfxqwcj"; depends=[Biobase fdrtool MASS survival]; }; + IHW = derive2 { name="IHW"; version="1.2.0"; sha256="1m8m7zhj0hwdnb4z93dh918jynp3amnxwv0yl9zflf54nwg0p8y0"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; + IMPCdata = derive2 { name="IMPCdata"; version="1.8.0"; sha256="15gskfs84anw2x902zhldsh8hzfhyrv9vjlb8qplkmd7prskjs48"; depends=[rjson]; }; + INPower = derive2 { name="INPower"; version="1.10.0"; sha256="135xlhcv3h1rkipdy7vp2knr8gqgcfcsadcrl9a477iaps1ljfg1"; depends=[mvtnorm]; }; + INSPEcT = derive2 { name="INSPEcT"; version="1.4.0"; sha256="15bn5x42igdxrj1fg9fzi2rgy1c24nxgwpqxxipqkippr985ybvg"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; }; + IONiseR = derive2 { name="IONiseR"; version="1.4.4"; sha256="09vv5h8zwwlkc3azw1hb166wbhafdz9q7pd0xxcckwm596sbpnc6"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; }; + IPO = derive2 { name="IPO"; version="1.0.0"; sha256="05g41kx40n7kv8cc51khg6wql7i8p5h53g873xvccld5vpc8dish"; depends=[CAMERA rsm xcms]; }; + IPPD = derive2 { name="IPPD"; version="1.22.0"; sha256="1p0c5wr7lcarmlchfglmjd7d8r38mm262g8wyj7dljknlbw1p2n1"; depends=[bitops digest MASS Matrix XML]; }; + IRanges = derive2 { name="IRanges"; version="2.8.2"; sha256="0x8h74ik3xwdnwrkn89hq5ll0qa1lp9jgzlbmpa02dpws7snfwyr"; depends=[BiocGenerics S4Vectors]; }; + ISoLDE = derive2 { name="ISoLDE"; version="1.2.0"; sha256="1j9ckl0xq10scrrc0nr7522pz39bd5wapmpkgnlz93rflf90jq3g"; depends=[]; }; + ITALICS = derive2 { name="ITALICS"; version="2.34.0"; sha256="1i4b94wngb6306dq5mx9vnmv69i6pl19c7kwrwmdfiq8hsl47wq1"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; }; + IVAS = derive2 { name="IVAS"; version="1.6.0"; sha256="04qa9i4jkq3w040y3pzklld5p8v1qirr5vpglj3r8i01mj5r7krf"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; }; + Icens = derive2 { name="Icens"; version="1.46.0"; sha256="0mfz0k2p2jsbm1rchylrl2k222p96xjdplnl0zgkhv32747svpv8"; depends=[survival]; }; + IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.18.0"; sha256="1v98zqp5hyix49rlzvpiv289fsivcs602xi9bfhs15p9z33599qy"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; }; + IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.22.0"; sha256="0kvs65qny43q4s0nkm9g8giv4d5qajpr12620208jhwbrm6jpg99"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; }; + IdeoViz = derive2 { name="IdeoViz"; version="1.8.0"; sha256="1irxfpdf8i5zx96bw1v9pz5v0lrjb2z5gxzmfyibgivfp6dl9xj6"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; }; + Imetagene = derive2 { name="Imetagene"; version="1.4.0"; sha256="0h80hwa8ksqwbhrwfvqp09yzlfqncrg0s6j48h9p4rhzf8958k6p"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; }; + ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.2.0"; sha256="1nw7swi6mq2gs8qc8k8psfzfrkxcbdkmc7vz8shsiszxp5idfy8b"; depends=[Biobase data_table ggplot2 gplots gtools pheatmap RCurl reshape2 Rlabkey scales]; }; + ImpulseDE = derive2 { name="ImpulseDE"; version="1.0.0"; sha256="0qaq5gb19zdp4z2vhmn0gm3f1ccc8939nvcmaca34w51g4l1i4c0"; depends=[amap boot]; }; + InPAS = derive2 { name="InPAS"; version="1.6.0"; sha256="1mkp059xzx0r1a3jv59pbwnwwkcg2kyrd2amxblgd27418j3g0mp"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; }; + InteractionSet = derive2 { name="InteractionSet"; version="1.2.1"; sha256="0ax3qlsvm6zqfgli6dm68d1ip1cr74db8xbhs63mb6l84nni14y5"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors SummarizedExperiment]; }; + IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.10.0"; sha256="17z67xxq9vs80nl69bv4n9932dvwhsvra7k2wyj4gj1mmh11v6gg"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; }; + JunctionSeq = derive2 { name="JunctionSeq"; version="1.4.0"; sha256="1x7ngcyhcyi5aynp2zig24rpkkmc8bc8b5f4zlfvkxq3igh8gyri"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix S4Vectors statmod stringr SummarizedExperiment]; }; + 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=[]; }; + LINC = derive2 { name="LINC"; version="1.2.0"; sha256="0658n1pqm9ccq0s3al7xiljysfqg06wsr0zn9hqb4bafr7amycnf"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; }; + LMGene = derive2 { name="LMGene"; version="2.30.0"; sha256="07dchmzvdp2m2ky2f0vs32ch7cg2fgibmfwsw0din0rx96q0g3y9"; depends=[affy Biobase multtest survival]; }; + LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.0.0"; sha256="0cbr5124rix2lib3gscx7ci1ir4mj4dy5npmxi506804a27rs6z8"; depends=[CAMERA xcms]; }; + LOLA = derive2 { name="LOLA"; version="1.4.0"; sha256="175k4j4yj3j95gy2h7n3yinqf95l8g2vvhpsqc0j9wrpj0wwqyix"; depends=[BiocGenerics data_table GenomicRanges IRanges S4Vectors]; }; + LPE = derive2 { name="LPE"; version="1.48.0"; sha256="1r86lj75qk9inhslh6m6cvk4d57yqxyxssp85hci3w48axz9gnfg"; depends=[]; }; + LPEadj = derive2 { name="LPEadj"; version="1.34.0"; sha256="0fa4cq3yph30mdlx9wk8k90hwy2plflfz2sahighl0ahx98b7mij"; depends=[LPE]; }; + LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.24.0"; sha256="102r6v36q2m03jfc65l5az4570nf3f30klkhqbsb00w0fqhmyi97"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; }; + LedPred = derive2 { name="LedPred"; version="1.8.0"; sha256="1hi6y7h7yxw5dgj6aq2z48wf8qaxz9q5qd68m41myicwzgva7b8j"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; }; + Linnorm = derive2 { name="Linnorm"; version="1.2.11"; sha256="07cgs6q6svkf9l9qn41702mzank6v1hm4z3isz9cdxlhz586r4cp"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 igraph limma MASS mclust Rcpp RcppArmadillo statmod vegan zoo]; }; + LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.28.0"; sha256="1pwcdy4gp1vhdx6kgcligmr5pha5hx03yf3r0lidskcrzydk4sms"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; }; + LowMACA = derive2 { name="LowMACA"; version="1.6.0"; sha256="07lgl3hcgdiin1r7ws5g7s0jw371v6qlzici0myjz9hw8p9p8gwf"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; }; + LymphoSeq = derive2 { name="LymphoSeq"; version="1.2.0"; sha256="0mi82fgkl9bn9x9mhx4zw8cg0acmqsmw22v824xd2ik6c3q017pv"; depends=[circlize data_table dplyr ggplot2 ineq LymphoSeqDB plyr RColorBrewer reshape VennDiagram]; }; + M3D = derive2 { name="M3D"; version="1.8.2"; sha256="06hxxvbk2jpbsyksvl7blll70hg2qb1kg44yv0vaa4a12cq8a1k1"; depends=[BiocGenerics BiSeq GenomicRanges IRanges Rcpp S4Vectors SummarizedExperiment]; }; + M3Drop = derive2 { name="M3Drop"; version="1.0.0"; sha256="0adfklx4nzsy2xvz2gngqlyda4a0avdj3yal9brdk27826s2hyqf"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; }; + MADSEQ = derive2 { name="MADSEQ"; version="1.0.0"; sha256="1m4mfrijyin27v0wxvv9p5i6zxiwkc0hmsriccs58qq9x4zi52ik"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM zlibbioc]; }; + MAIT = derive2 { name="MAIT"; version="1.8.0"; sha256="085yih04ah4rbbzcchr6qvb69bbvbwsxbfmzd8wfvjdg9r6z3j8v"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; }; + MANOR = derive2 { name="MANOR"; version="1.46.0"; sha256="101rdapxpvjd383mykx1l6n3h3xvh6z1q60mxwbndwfl429fypy9"; depends=[GLAD]; }; + MAST = derive2 { name="MAST"; version="1.0.5"; sha256="1462b82alj0lbjl1zpfq8i2h3zxj38r82dvanyipg4m468ynmws7"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr reshape2 S4Vectors stringr SummarizedExperiment]; }; + MBASED = derive2 { name="MBASED"; version="1.8.0"; sha256="0isvf0n0zy7q5vhixnijrmyhdb0zpn74ddqdczgp3j93ripnb04q"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; }; + MBAmethyl = derive2 { name="MBAmethyl"; version="1.8.0"; sha256="0l3crgq2i263wq5l91dzbj472bp0y4khlxklikfir1793sgzhwi7"; depends=[]; }; + MBCB = derive2 { name="MBCB"; version="1.28.0"; sha256="0n6f61w5dq1hz80s434zzn78nipi75jn8zwaisgi77kb5k2xrss9"; depends=[preprocessCore tcltk2]; }; + MBttest = derive2 { name="MBttest"; version="1.2.0"; sha256="12yqdgw3wzmzvvfdvf8lb5lyif4cpchdk21ik2k7r7qsvfwkcqnd"; depends=[gplots gtools]; }; + MCRestimate = derive2 { name="MCRestimate"; version="2.30.0"; sha256="0sc3grx8l97cdwxvjvbmb7a3hnqbi1f9lqd4a12n2zcwcv6xr8ly"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; }; + MEAL = derive2 { name="MEAL"; version="1.4.2"; sha256="05gk7gs70i36xw4sxzrwlcdkbr9bprqgg0hlqwcynyl3x816s3qr"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 IRanges limma minfi MultiDataSet permute S4Vectors SNPassoc snpStats sva vegan]; }; + MEDIPS = derive2 { name="MEDIPS"; version="1.24.0"; sha256="1gincnn8ay83rzdm3rgd8h9fgg7s1j8i8s22pn1rp073pph582yf"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; + MEDME = derive2 { name="MEDME"; version="1.34.0"; sha256="1zrxd0bqayxbbgmpqj77lij58a4szsr3y064mmn4manhmij3hbml"; depends=[Biostrings drc MASS]; }; + MEIGOR = derive2 { name="MEIGOR"; version="1.8.0"; sha256="0m4g0np2f5yab1h1j8swfhkgnl1s2a0xw5cvbg7l5pbmzs2fkxa1"; depends=[CNORode deSolve Rsolnp snowfall]; }; + MGFM = derive2 { name="MGFM"; version="1.8.0"; sha256="0i05pcgk5axjr1piwm5g6wb7zh4hwya1zbvvrfr4v8rwilsyq27z"; depends=[annotate AnnotationDbi]; }; + MGFR = derive2 { name="MGFR"; version="1.0.0"; sha256="0qbmndrvn19h8vnx2qhcpa175hvid1vlnzzi9177x73naj2lyyv3"; depends=[annotate biomaRt]; }; + MIMOSA = derive2 { name="MIMOSA"; version="1.12.0"; sha256="0nzl95cnhf9d38v8gaxy2hlqgxbzzllvh71k5sa335zfr0p1lzr8"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; }; + MLInterfaces = derive2 { name="MLInterfaces"; version="1.54.0"; sha256="1fg8l1digl14ijr53bwarbqwcaj5374vmqdkvy5jfg2s06iwdkym"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; }; + MLP = derive2 { name="MLP"; version="1.22.0"; sha256="0awiqvhzzvgqmacks3yxl4a6savc39dv6brf8m0lz9rcl6cgzsza"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; }; + MLSeq = derive2 { name="MLSeq"; version="1.14.1"; sha256="1wdh4rpsfnv1nzypgqm4y9c4vzv9z8snrb0nh2s9ssbcc7cwkpl7"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; }; + MMDiff2 = derive2 { name="MMDiff2"; version="1.2.0"; sha256="1zy8whabpqbl1cfhh6bjax97snyy6pqfd8dqa7w21s6y4wg9krzd"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; + MODA = derive2 { name="MODA"; version="1.0.0"; sha256="1fh26d0gfisif8v1ms321mj08202kfqngvghpg1xzr28cp59h9c8"; depends=[dynamicTreeCut igraph WGCNA]; }; + MPFE = derive2 { name="MPFE"; version="1.10.0"; sha256="1d2b3mhcjxvdq99iqj96gygq9bivg95n2n7jxscy3gdkzpf70336"; depends=[]; }; + MSGFgui = derive2 { name="MSGFgui"; version="1.8.0"; sha256="0g8pygqqxb4g5hh47n9jwikim8hakrbppn85ydzq4hvrsjysjdxz"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; }; + MSGFplus = derive2 { name="MSGFplus"; version="1.8.0"; sha256="104h4f0jnhswn4sbr5r1ivd7g1r4gdrrjj3a0kd7p3ckl542vwcq"; depends=[mzID]; }; + MSnID = derive2 { name="MSnID"; version="1.8.0"; sha256="0fkk3za39cxi0jyxmagmycjdslr2xf6vg3ylz14jyffqi0blw9d5"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; }; + MSnbase = derive2 { name="MSnbase"; version="2.0.2"; sha256="0jjjs29dcwsjaxzfqxy98ycpg3rwxzzchkj77my3cjgdc00sm66n"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn XML]; }; + MSstats = derive2 { name="MSstats"; version="3.6.0"; sha256="1p9000y7ca94vingg1gdd6sdxy3p0njqdinxhy3raf4gb4hmnv7y"; depends=[data_table ggplot2 ggrepel gplots limma lme4 marray minpack_lm MSnbase preprocessCore Rcpp reshape reshape2 survival]; }; + MVCClass = derive2 { name="MVCClass"; version="1.48.0"; sha256="1jd2vh63j4jj0q4x05drrwfkn7qddxq96403ambkavcxcxs3z0x7"; depends=[]; }; + MantelCorr = derive2 { name="MantelCorr"; version="1.44.0"; sha256="1r1lb71mw7fqlmfai7d2lbij3n9pjpvvng8lx0fpbzaxghrbcd37"; depends=[]; }; + MassArray = derive2 { name="MassArray"; version="1.26.0"; sha256="152wy0h3zrfqyf444m7mcp6gvnx4q10ahj5nziwdp26k7zjm4jx9"; depends=[]; }; + MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.40.0"; sha256="0c734mvynmyir7pcfy8igvvxk8y3hvcpkazsjljykfjvjs47x49p"; depends=[waveslim]; }; + MatrixRider = derive2 { name="MatrixRider"; version="1.6.0"; sha256="0khdgn3kcj1mw5z8d2cz781n56myqgxalycg9317dap6r2hng11x"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; }; + MeSHDbi = derive2 { name="MeSHDbi"; version="1.10.0"; sha256="1jyz50q4svakq8ckwnrfyc568ryhg3jxl920v7s477nxj2854pa1"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; }; + MeSHSim = derive2 { name="MeSHSim"; version="1.6.0"; sha256="1ab92abmyw469v4gzk6ki95j5m9ivdwr7v74hgh8jr5zw674gfzp"; depends=[RCurl XML]; }; + MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.46.0"; sha256="046yc0bvqxxh5x83zy7qq6b5cyhzkcg78bgyzz9w7lb7sim0h491"; depends=[]; }; + MergeMaid = derive2 { name="MergeMaid"; version="2.46.0"; sha256="07ann5kkbp0kz2cplks934yy20ixnqjz1fnhd292lbsq493www1x"; depends=[Biobase MASS survival]; }; + Mergeomics = derive2 { name="Mergeomics"; version="1.2.0"; sha256="187w71dr1brjz6fhdlxxvanipn9rmkyfrp5ij943y3jca0iibbij"; depends=[]; }; + MetCirc = derive2 { name="MetCirc"; version="1.0.1"; sha256="09mw5nqvp5pj8dma7fqdiiw5qqxm3m51s2r4ji3shiliq961bkw4"; depends=[amap circlize scales shiny]; }; + Metab = derive2 { name="Metab"; version="1.8.0"; sha256="1kb41ld1fxggmwa4chzpwnfy6473jhs79386k0py9i7z9myaf7pj"; depends=[pander svDialogs xcms]; }; + MetaboSignal = derive2 { name="MetaboSignal"; version="1.4.0"; sha256="08j76zdkzg42j3x1h5dzw7qkx44fcj7bwigrv452s6frkanhb5ij"; depends=[AnnotationDbi biomaRt hpar igraph KEGGgraph KEGGREST mygene org_Hs_eg_db RCurl]; }; + MethPed = derive2 { name="MethPed"; version="1.2.0"; sha256="0phja8mf6vi913kjypbyx25j9bgqj25iis4jz1y7hbafvy3vx4x8"; depends=[Biobase randomForest]; }; + MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.6.0"; sha256="15vbqsci33fbcz94va64w53qnzx4hqzv2ss4myhy9kavk4h5ma07"; depends=[Biostrings gplots seqinr stringr]; }; + MethylAid = derive2 { name="MethylAid"; version="1.8.0"; sha256="0c2y6r72ypgc9rjyk4779l0s3x3wpdm88ygab5zdfi9sgy108r4x"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny]; }; + MethylMix = derive2 { name="MethylMix"; version="2.0.0"; sha256="06zq28ns2h2l6zlrwhgrf80ac679fq3qbrlcn0rshwz2vwbk6xha"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; }; + MethylSeekR = derive2 { name="MethylSeekR"; version="1.14.0"; sha256="06kixgxrla3rvxf6xsg4r4yxi9qld6kx82p9xv2x978qsx717frr"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; }; + Mfuzz = derive2 { name="Mfuzz"; version="2.34.0"; sha256="1bzi6kwpbkr8g4zqxw517grl2sc4pq6ph4m4vb4hmn6x6qxlijlr"; depends=[Biobase e1071 tkWidgets]; }; + MiChip = derive2 { name="MiChip"; version="1.28.0"; sha256="0lxdcmfy1gpfpmnagg2649dbq9rj13rggv43n79l2f033awbpsp8"; depends=[Biobase]; }; + MiPP = derive2 { name="MiPP"; version="1.46.0"; sha256="1280c04222l2hbapbw7k6rnsi8hrbpd0w49gvx50sl0mkl3zq5gh"; depends=[Biobase e1071 MASS]; }; + MiRaGE = derive2 { name="MiRaGE"; version="1.16.0"; sha256="17ys0qwz8y4ka81ynzp46fcy5qi6mw7y7vsffqvgnsf587bdj9ia"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; }; + MineICA = derive2 { name="MineICA"; version="1.14.0"; sha256="0si7l560d14vhz4k8p0c1fqmr85f91zcfz3vh0fbnyg3m4rh8yz2"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; }; + MinimumDistance = derive2 { name="MinimumDistance"; version="1.18.0"; sha256="1zl8ravn0dpb6ca3f9k92p7wdhz7afjy7cx28nx0hv71aqk1q5i8"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; + Mirsynergy = derive2 { name="Mirsynergy"; version="1.10.0"; sha256="1w98swg02n1gfk1cgjvzi09wwymn8v6v3gjlm58sgj0j47h8l4c6"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; }; + MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.24.0"; sha256="1g6wlk8qlszc42jqrdlwa340p69h7fk7nmdrk0k0rdl1mmjsmcs9"; depends=[Biobase lattice limma statmod vsn xtable]; }; + MoPS = derive2 { name="MoPS"; version="1.8.0"; sha256="1z0m6c61sp6cljaibskrk8xywpkgx4m3d2s8rdq3hs99x6w1f200"; depends=[Biobase]; }; + MoonlightR = derive2 { name="MoonlightR"; version="1.0.0"; sha256="10r0vnyig561d5hrvhbb3srr6v1lndgjxabj03adhmn7nbv4iija"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; }; + MotIV = derive2 { name="MotIV"; version="1.30.0"; sha256="1zq22llziicgfsh9ykf8blf9593h4yw3nhr58alvvp5hjjh2pz3r"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; }; + MotifDb = derive2 { name="MotifDb"; version="1.16.1"; sha256="105a320znvrdkwvsixv1ddaiax1ay87wr4675pv4j79xdjh7by2z"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; }; + Mulcom = derive2 { name="Mulcom"; version="1.24.0"; sha256="0mlmb9lk71676dz45812ni72vbid2hv2v9b1i437dr69qnppm126"; depends=[Biobase fields]; }; + MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.0.1"; sha256="0vq7xfw3wv7i07v57qz2b3v599mfp27p6fxadlsqjql9v5jy6kk6"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors shiny shinydashboard SummarizedExperiment]; }; + MultiDataSet = derive2 { name="MultiDataSet"; version="1.2.0"; sha256="04hrqi8x2fsfnpyk344kfrvfl66mv1lx3kdqs7ga9wnfq98b82b2"; depends=[Biobase BiocGenerics GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi S4Vectors SummarizedExperiment]; }; + MultiMed = derive2 { name="MultiMed"; version="1.8.0"; sha256="1185flg1grb14m00km2v6z4ypl5lh6p4p05wsxq231g255aljq64"; depends=[]; }; + MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.0.0"; sha256="1a3c2bm0xx0q4gf98jiw74msmdf2fr8rbsdysd5ww9kqlzmsbr17"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF plyr pracma reshape2 SummarizedExperiment VariantAnnotation]; }; + NCIgraph = derive2 { name="NCIgraph"; version="1.22.0"; sha256="1dbbnlbbjqvmb8adppkacl7qrxic4gavvcmh0cafpvsm3ybs4zvb"; depends=[graph KEGGgraph R_methodsS3 RBGL RCytoscape]; }; + NGScopy = derive2 { name="NGScopy"; version="1.8.0"; sha256="0hc103pa3qbd6pd4578wdrczd4sljhb408lclkjlv3abdc6x7247"; depends=[changepoint rbamtools Xmisc]; }; + NOISeq = derive2 { name="NOISeq"; version="2.18.0"; sha256="0iw4zy01a0lk6n60q4kw3jmgha41dxchidzg9rbsbsci3ysnl3h5"; depends=[Biobase Matrix]; }; + NTW = derive2 { name="NTW"; version="1.24.0"; sha256="0cqc8rgkx9gqhkc62csyws7c23nf94pwigiq5myirgamga314cqb"; depends=[mvtnorm]; }; + NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.4.0"; sha256="06zln140q6r00mhi820hzgw5zincr1kg56h3387iikyw4hyq53s2"; depends=[Biobase matrixStats]; }; + NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.6.0"; sha256="0848h8dmbk0gj4w0p77bi6byqil76ggaikqqdxflyzv39zkw28sc"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; }; + NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.18.0"; sha256="02g8rbqaddcy4w9i2ma0xmzdb84bykba3p3zmv1lylh77knmxdrw"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; }; + NetPathMiner = derive2 { name="NetPathMiner"; version="1.10.0"; sha256="0ssbmp0qkvnvii646zj2qiwzrn8cyi6jvg7h937vbr6vnzv643cg"; depends=[igraph]; }; + NetSAM = derive2 { name="NetSAM"; version="1.14.0"; sha256="1jzlpnnry9lbnfvrks5fz14nwkvg3r8pp8f5lw63izg0fx1m5ypm"; depends=[graph igraph seriation]; }; + NormqPCR = derive2 { name="NormqPCR"; version="1.20.0"; sha256="1qik5gvzvj4zzfllj5p9cryfwq8z33jziv6p5gyfndyn5b9p2sq6"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; }; + NuPoP = derive2 { name="NuPoP"; version="1.24.0"; sha256="1aqw86yn9pq1901qzqjvjw9sfqpnnqn29pagdrxqd6858x034w6n"; depends=[]; }; + OCplus = derive2 { name="OCplus"; version="1.48.2"; sha256="04drljh5m46v9gpvfgwgajq9kn1ycb7fhbxxk6j4xq89ddlz1dk7"; depends=[akima multtest]; }; + OGSA = derive2 { name="OGSA"; version="1.4.0"; sha256="0i2w0g4310sg1zy4z7bc9ajr4yizf313bpzwgzjngx51hsyjk9ws"; depends=[Biobase gplots limma]; }; + OLIN = derive2 { name="OLIN"; version="1.52.0"; sha256="1q0p8jry2nw3w1a4zan0kwgc87nk2v2psnw00m5m6m0a1j9drryd"; depends=[limma locfit marray]; }; + OLINgui = derive2 { name="OLINgui"; version="1.48.0"; sha256="168bbsacsj74ah84zbfi7h2bpnz7zclbykl9rwaic8gr4ymgz1qw"; depends=[marray OLIN tkWidgets widgetTools]; }; + OSAT = derive2 { name="OSAT"; version="1.22.0"; sha256="0f4lz86g8205hbbdka50a6s1gbdb19zqjna4gwakb4w3ni53gqhg"; depends=[]; }; + OTUbase = derive2 { name="OTUbase"; version="1.24.0"; sha256="0xxha9f2f2qfzb8cv4m59grbyv011w9f27zm3cq64affgzwnb5r2"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; + OmicCircos = derive2 { name="OmicCircos"; version="1.12.0"; sha256="0q6ngrf5cyy6hyvhhhrx6ldbij7b051fgdsknm7qb4xzbsk5i75k"; depends=[GenomicRanges]; }; + OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.8.1"; sha256="0y38441v5lnj25w3qw5d4f6bijf3c9jzxp57jjhhj12vxqmrdajy"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; }; + OncoScore = derive2 { name="OncoScore"; version="1.2.1"; sha256="1f8nx3p8dik5b8yvpn7pvk5iy5vyy5fjgy49d3czkfwp1dzis49d"; depends=[biomaRt]; }; + OncoSimulR = derive2 { name="OncoSimulR"; version="2.4.0"; sha256="0a1m54x14f6rz9sz9m1kwlxl8xl3vlxqz3iq5qrs8n36crqbx3nj"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph RColorBrewer Rcpp Rgraphviz smatr]; }; + OperaMate = derive2 { name="OperaMate"; version="1.6.0"; sha256="152qxkf4qnkjj4grk0jsysh80daybgw6ywwm1h8l6lk64q0dhl6w"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; }; + OrderedList = derive2 { name="OrderedList"; version="1.46.0"; sha256="1wfpypaimvzisv032irbsmk766zxq1xqh8q0qn9ipqp9hrp7mrlb"; depends=[Biobase twilight]; }; + OrganismDbi = derive2 { name="OrganismDbi"; version="1.16.0"; sha256="0pj1qfz015203dkkik49i00jlvbbzh1p4lz2jgpk2iqx8n0yx923"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; }; + Oscope = derive2 { name="Oscope"; version="1.4.0"; sha256="1cxmz482wlqvkcz9x3riwn01kz5flyzyg41ygs0flkjml64dp7hj"; depends=[BiocParallel cluster EBSeq testthat]; }; + OutlierD = derive2 { name="OutlierD"; version="1.38.0"; sha256="10lwi35l9iv2hx7hra43i0b6n1r853rdzcbwir4m34iijjxjx9db"; depends=[Biobase quantreg]; }; + PAA = derive2 { name="PAA"; version="1.8.0"; sha256="0kv6mxczp0mwmhyqlq2qxzzhzapl2ijmr6063aw6klsh03q1n73m"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; }; + PADOG = derive2 { name="PADOG"; version="1.16.0"; sha256="0f0rl44sclmbcqfsw086nalhzxrjc04yml89xwgnjny4f5kh7sri"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; }; + PANR = derive2 { name="PANR"; version="1.20.0"; sha256="0ml99gy3fi55qqj6k9hbs5hwvf51344k0anwx30hnpk1xsxvcjy0"; depends=[igraph MASS pvclust RedeR]; }; + PAPi = derive2 { name="PAPi"; version="1.14.0"; sha256="18mnm303ryyz912m6yqnc2fbdhkin1v45jb55dxaplpzh57hmsxg"; depends=[KEGGREST svDialogs]; }; + PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.38.0"; sha256="0sws413s9gy9zkaj007wbbgkk8ghh38kzr28kmpjwviga09142zr"; depends=[AnnotationDbi Biobase DBI RSQLite]; }; + PCAN = derive2 { name="PCAN"; version="1.2.1"; sha256="07yhqzvvmhldlvg7d2zg3shwlhnpm381rwrbfcrazhf2bgysd9kd"; depends=[BiocParallel]; }; + PCpheno = derive2 { name="PCpheno"; version="1.36.0"; sha256="08pxms6hs82ngjh7vcjqh7m5jchznss4i7izm37dwxp1nmy83bhy"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; }; + PECA = derive2 { name="PECA"; version="1.10.0"; sha256="1g91z0ywbm7ck9bi9a2v75hx98hvxvi1b6h8wlzv6gjjsv2z849a"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; }; + PGA = derive2 { name="PGA"; version="1.4.0"; sha256="12fwd2c7psp5ffmi7z81a33ynjg0khikccp5qjyin76bvnqxx7sw"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; }; + PGSEA = derive2 { name="PGSEA"; version="1.48.0"; sha256="0yn1ayvf6g8g3w5lakp3224qm3h2h984zii7n7cqnzl8gciwxyb4"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; }; + PICS = derive2 { name="PICS"; version="2.18.0"; sha256="1vzsrmyk4l19z0a7i9gzmrymks3jh2c8rfib6g7kn9z5pwbw56l1"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; + PING = derive2 { name="PING"; version="2.18.0"; sha256="0rlx8dasj51xnj3nwvx4sjia7di9q3sawmz5zhp6a2kfacgss0lc"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; }; + PLPE = derive2 { name="PLPE"; version="1.34.0"; sha256="1d2m9xxhvmgjn92dv1i8x7yzam377hzj6ibb3d4rmqmbjs446cdk"; depends=[Biobase LPE MASS]; }; + PREDA = derive2 { name="PREDA"; version="1.20.0"; sha256="07477ps2whj4h0ph5kdjra4x6jlc0xyii2yp338jhgrhdnpxwjqx"; depends=[annotate Biobase lokern multtest]; }; + PROMISE = derive2 { name="PROMISE"; version="1.26.0"; sha256="1ybgzw043fm0lzayq4ddqwgr6j5bd3a0r73aica5bg8hzr5x1pll"; depends=[Biobase GSEABase]; }; + PROPER = derive2 { name="PROPER"; version="1.6.0"; sha256="15xqwbn098vv0h8f0cz8nzxb5swf83idb2gd25k1vzh4nv34vr4m"; depends=[edgeR]; }; + PROcess = derive2 { name="PROcess"; version="1.50.0"; sha256="1l0kbd0b2xarw7wc4mkvyb0ixkky7slqd3w5r41isppa4wanvvjn"; depends=[Icens]; }; + PSEA = derive2 { name="PSEA"; version="1.8.0"; sha256="0rkf4w35xgkwa2mc5h65nf5kc61cv1p3xmyz0pg0cim8q50y5wsh"; depends=[Biobase MASS]; }; + PSICQUIC = derive2 { name="PSICQUIC"; version="1.12.1"; sha256="1948cs1ygx16kj9kj1ip2l7k2za51zkknc1sm2n51zhl7ywk9dnv"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; }; + PWMEnrich = derive2 { name="PWMEnrich"; version="4.10.0"; sha256="152vkwaabwsyrgh2hdkp63gac418k4yl1iwvli45ax6cv2mb1c81"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; }; + PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.2.0"; sha256="09x527v5iwhnn4gn52xlk40553lzcgfwrmrc2qn9kv791rf7k743"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; }; + Path2PPI = derive2 { name="Path2PPI"; version="1.4.0"; sha256="0y3pz6sdrv0szi068w78kdpksxqa6dqjg3vy5sqdvj0y4sr0ss0w"; depends=[igraph]; }; + PathNet = derive2 { name="PathNet"; version="1.14.0"; sha256="1hj9k43sb9vjryphma140g1fmqnrgj2dkcy11b0dksd9mdlldwvg"; depends=[]; }; + PathoStat = derive2 { name="PathoStat"; version="1.0.0"; sha256="01vn24q4l7rbwksbdk0srac2rr352912bmr0brdjjfh3y9v26j8p"; depends=[alluvial ape BatchQC BiocStyle corpcor dplyr DT ggplot2 gtools knitr limma matrixStats MCMCpack pander phyloseq plyr rentrez reshape2 rmarkdown scales shiny tidyr XML]; }; + Pbase = derive2 { name="Pbase"; version="0.14.0"; sha256="0r42974jfylqf51i00n9b1axzmqb3kv9idj6p4dz5hq223r18x1j"; depends=[Biobase BiocGenerics biomaRt Biostrings cleaver GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; }; + PharmacoGx = derive2 { name="PharmacoGx"; version="1.4.3"; sha256="1cfly0xfd7sgiv65kmmb3899glvzzypb8za9prv569d7h6vz9yq8"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer]; }; + PhenStat = derive2 { name="PhenStat"; version="2.8.0"; sha256="1cmpkv11s55ackgdvqmhidijznnvy1xpfhqdw3h0b11vrwi17d1a"; depends=[car logistf MASS nlme nortest]; }; + Pi = derive2 { name="Pi"; version="1.2.1"; sha256="0b79qf119n3737n1bifnc3qb36jsyh4c9h76svqy1rpkh68pairi"; depends=[dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel igraph MASS Matrix randomForest ROCR scales supraHex XGR]; }; + Pigengene = derive2 { name="Pigengene"; version="1.0.0"; sha256="16s46alh0vm31crn3dzsf91k53v3j2hgn0rqzm1wvyw61y05la26"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; }; + Polyfit = derive2 { name="Polyfit"; version="1.8.0"; sha256="0r87xv86mivdgyifvp9snmxswsyvmsif4zkzp24wycypza7wr3l3"; depends=[DESeq]; }; + Prize = derive2 { name="Prize"; version="1.5.1"; sha256="11rzkwrkq329g2a6wzbk9yxbjza2qihdxk9l35fd39vmdw6ykfr5"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; }; + ProCoNA = derive2 { name="ProCoNA"; version="1.12.0"; sha256="0k7nb2cq1xn64m96wjvn5g18kbpigslcf99hyv03ib7r790h32qy"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; }; + Prostar = derive2 { name="Prostar"; version="1.6.1"; sha256="1gj9d425wxk57rf0qk8m9k9xxgmv02wbwjg1h4nl9q7c23vmxsbg"; depends=[DAPAR DAPARdata data_table DT rhandsontable shiny shinyAce shinyjs sm]; }; + ProtGenerics = derive2 { name="ProtGenerics"; version="1.6.0"; sha256="0hb3vrrvfx6lcfalmjxm8dmigfmi5nba0pzjfgsrzd35c8mbfc6f"; depends=[]; }; + ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.4.0"; sha256="0iwcsnv05g83plsb8wdgpa9lzp136pfl7qyp3yqik1fn62s32fj4"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; }; + PureCN = derive2 { name="PureCN"; version="1.2.3"; sha256="0h3w3d1dnr8ng0cg54jp02v1v6zhn8csrli9cpbszjgrn9dfxybx"; depends=[Biostrings data_table DNAcopy GenomeInfoDb GenomicRanges IRanges RColorBrewer Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; }; + Pviz = derive2 { name="Pviz"; version="1.8.0"; sha256="1m2s37bzlxkih4c868wq3n8y3mg161laxh5p1789k3w32nlli89c"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; }; + QDNAseq = derive2 { name="QDNAseq"; version="1.10.0"; sha256="0pa9r9pndk2viv7xcy961c26vx2afpc4rr7dl5zihsgb4y2az8vc"; depends=[Biobase CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; }; + QUALIFIER = derive2 { name="QUALIFIER"; version="1.18.0"; sha256="06aamgjl3bay76wdjzqfkwcmj9bwkvbrgv542zwqppv059an9wxf"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; }; + QUBIC = derive2 { name="QUBIC"; version="1.2.1"; sha256="15mqx8aqhk7hhhlingri1l27dydfv3vaqjvjmpa4lh7a0p9ac2rg"; depends=[biclust Matrix Rcpp RcppArmadillo]; }; + QuartPAC = derive2 { name="QuartPAC"; version="1.6.0"; sha256="0mh2rzh3cp0n0ky133iiy1zgv1q90ilqspi4l8r5d3mqi2bs056n"; depends=[data_table GraphPAC iPAC SpacePAC]; }; + QuasR = derive2 { name="QuasR"; version="1.14.0"; sha256="1330vlvsfypr0pl7arawks4d80yjk2afn637ivcnbhrchkmicfdv"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; }; + QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.2.0"; sha256="0bnnh4p7ifj9kpx29x2scy7qshnbnwr9a2bzyi5npqss6nd68fpy"; depends=[Rcpp]; }; + R3CPET = derive2 { name="R3CPET"; version="1.6.0"; sha256="1f345ci24ff1fj5i509ar8900gf4850cc88b0h7w0wm14k76s6dk"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; }; + R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.24.0"; sha256="02s8rxcv1k41v2nzrpzhbh7l7hhyp94k61cic35kvbd84xs8bwvl"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; }; + R4RNA = derive2 { name="R4RNA"; version="1.2.0"; sha256="0hl5khn72nid1f9863nl8wyh98xgj2zx3yp0bf7q5ja5559kqnj7"; depends=[Biostrings]; }; + RBGL = derive2 { name="RBGL"; version="1.50.0"; sha256="1q14m8w6ih56v680kf3d9wh1qbgp7af33kz3cxafdf1vvzx9km08"; depends=[graph]; }; + RBM = derive2 { name="RBM"; version="1.6.0"; sha256="0h0qzn1hp5g167z5r5p9b445v8nqmvzg3ixyj709zh66y93nqcwx"; depends=[limma marray]; }; + RBioinf = derive2 { name="RBioinf"; version="1.34.0"; sha256="1q20v3h2zxxa5i655fdd6zyn3glga52mpq0dpmdrlx4yxb4pw3ms"; depends=[graph]; }; + RCAS = derive2 { name="RCAS"; version="1.0.2"; sha256="0rim13lnh1pc5ks33x1pa63mlrn64fmmpwy7d10ypplrvn7sq75a"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 data_table DT genomation GenomeInfoDb GenomicFeatures GenomicRanges knitr motifRG org_Hs_eg_db plotly rmarkdown rtracklayer S4Vectors topGO]; }; + RCASPAR = derive2 { name="RCASPAR"; version="1.20.0"; sha256="070j74bsjg3rq6bhi201r1vajcim8kzf99hpjcswq358q070ghbl"; depends=[]; }; + RCy3 = derive2 { name="RCy3"; version="1.5.2"; sha256="1jkjg6byb5rwny0q77xmsc2gnppxcym59rcdn5kpgvd33l7jwnbn"; depends=[graph httr RCurl RJSONIO]; }; + RCyjs = derive2 { name="RCyjs"; version="1.6.0"; sha256="1dh16hhm32hhk4nb12kw17gxpsg6513grvddialxhjzi21j2y698"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; }; + RCytoscape = derive2 { name="RCytoscape"; version="1.24.1"; sha256="1al8w3nz19abxxsnifgzb9myciacws79z2i2ffx29yvfhcsk2z7s"; depends=[BiocGenerics graph]; }; + RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.12.0"; sha256="1320ky26p0zq90qb5x2ysbzrz3ipcp04jz74r11qzivxzb1hzkrl"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; }; + RDRToolbox = derive2 { name="RDRToolbox"; version="1.24.0"; sha256="1z0p6wi6l0lg8y4ffi5mnlm6hxlv3rx2wrlvzdqrv7pbg6vnv2m2"; depends=[MASS rgl]; }; + REDseq = derive2 { name="REDseq"; version="1.20.0"; sha256="0wfmqanrjmrnj7prxvci3m5qaw8y8qqml6jwnbjn42b7qk57l8n6"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; }; + RGSEA = derive2 { name="RGSEA"; version="1.8.0"; sha256="1fqlvshy4yp17v1cvjvgyiv23zcccrqs7l6mvapb2cs1q67bfhhx"; depends=[BiocGenerics]; }; + RGalaxy = derive2 { name="RGalaxy"; version="1.18.0"; sha256="13r07fhas3bqmblydrc1h7r2sz1knc082iay5n8zi94x7bb5vx8b"; depends=[Biobase BiocGenerics digest optparse roxygen2 XML]; }; + RGraph2js = derive2 { name="RGraph2js"; version="1.2.0"; sha256="0shkmaxsdj078vk2h3n80cfmibxnz50mlr55hbi6vf3awj81iy1x"; depends=[digest graph rjson whisker]; }; + RIPSeeker = derive2 { name="RIPSeeker"; version="1.14.0"; sha256="1yvn9d4psifkipv1mp42qi5h09a5023cbf7mhw6nmyqpkcw4bwjd"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + RImmPort = derive2 { name="RImmPort"; version="1.2.0"; sha256="0pl2zd9y2skhxp1clnv0y7dyi4ib2pj5a6rbq9f0nqjcwqc251h0"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; }; + RLMM = derive2 { name="RLMM"; version="1.36.0"; sha256="0h7k448ajdpvqbq5vi0lx38sc581hv74224fi0grdrk9s56n3993"; depends=[MASS]; }; + RMassBank = derive2 { name="RMassBank"; version="2.2.1"; sha256="1jkn5y8bwic6nmcd9jhs8i5kfwmldxfylapassrmzjbfg7jil4gm"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; }; + RNASeqPower = derive2 { name="RNASeqPower"; version="1.14.0"; sha256="1yzd5z1dbav72w1df0z93810ym09hbmghwikkv7b8y0b2blkigcy"; depends=[]; }; + RNAinteract = derive2 { name="RNAinteract"; version="1.22.0"; sha256="0nlz20hwyrycya82wdkaj962q1zpgncf4sjawiczz7wagll61rsm"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; + RNAither = derive2 { name="RNAither"; version="2.22.0"; sha256="0saq1yichxgr12wcb2d6xd5qixxisk992drza82gv31c1sq8i5vx"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; + RNAprobR = derive2 { name="RNAprobR"; version="1.6.0"; sha256="1j6mrih9aqcy3d9xh05aj1p3a39ivnj0k6i482ax1l4cq7gvna7x"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; }; + ROC = derive2 { name="ROC"; version="1.50.0"; sha256="0bm9vp0viyjr4xcar2b5dl0fbpy9fmnkrg0hzvhillrlh0xzzhwk"; depends=[]; }; + ROTS = derive2 { name="ROTS"; version="1.2.0"; sha256="1grfw0bxb5fv4sy9xbwa8ydppr6g77qw8q9rminjnfqdafpqkakk"; depends=[Biobase Rcpp]; }; + ROntoTools = derive2 { name="ROntoTools"; version="2.2.0"; sha256="0lq5al7g4r58wc0byyj2a49m9dcj1llcys9hdwlns1ahzvw6d76h"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; }; + RPA = derive2 { name="RPA"; version="1.30.0"; sha256="0dq6g94jb6zam5fb667finkdn6mavvi5dnxws4dgvjw1qrlwg7vl"; depends=[affy BiocGenerics phyloseq]; }; + RRHO = derive2 { name="RRHO"; version="1.14.0"; sha256="0iwg3hjxc9avm8mysrx0ix03ncwik0iikph9j6jgd7y7dczq3y1j"; depends=[VennDiagram]; }; + RSVSim = derive2 { name="RSVSim"; version="1.14.0"; sha256="123fly20prx0g8bjbgqwfwrh73xjrq4xbl45rsp9q84kgi6w07i3"; depends=[Biostrings GenomicRanges IRanges ShortRead]; }; + RTCA = derive2 { name="RTCA"; version="1.26.0"; sha256="07kb4zh14g2lvqyicmig29wn50i4sz8bcxg4vq74019al2xj7fsv"; depends=[Biobase gtools RColorBrewer]; }; + RTCGA = derive2 { name="RTCGA"; version="1.4.0"; sha256="0y8d0y043n0ragn1saz0rw5lbx6g04ara7iggn4df5w5xzg6rm08"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; }; + RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.4.0"; sha256="16p872nl9470f7yksdy73n5kwn4mlgsfjkndjg50z59sbbhc7h68"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; }; + RTN = derive2 { name="RTN"; version="1.12.0"; sha256="19rsyr07hq17jah063w74dck9c0yjn6s2i73afawbdjpcqzcrz1n"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; }; + RTopper = derive2 { name="RTopper"; version="1.20.0"; sha256="11vqgq594z3di5pa89irrnaiynxmi332g6d35za0glhpba3bj5bz"; depends=[Biobase limma multtest]; }; + RUVSeq = derive2 { name="RUVSeq"; version="1.8.0"; sha256="043dmg1ggfvkn8vjaz4k9qvkjrc4ncm4p74iarh02mk0pzx5m9f9"; depends=[Biobase EDASeq edgeR MASS]; }; + RUVcorr = derive2 { name="RUVcorr"; version="1.6.0"; sha256="13c9l874qlikk5qi8qbfdy9q749xsknf9rl7pz46n03j74afad86"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; + RUVnormalize = derive2 { name="RUVnormalize"; version="1.8.0"; sha256="1hsw0y9s2890z6vim5xjp95p3gdxcy1x2paw276rrgwbz1xda1p1"; depends=[Biobase RUVnormalizeData]; }; + RamiGO = derive2 { name="RamiGO"; version="1.20.0"; sha256="0a61368vzjljqwk3zvd92fb8h6hgr1baiww28531kqadjf83f8nr"; depends=[graph gsubfn igraph png RCurl RCytoscape]; }; + RankProd = derive2 { name="RankProd"; version="3.0.0"; sha256="02k3977y55qph3jx86q4s4dkhndfsbcqq2xgk4xn1nglr64z4azv"; depends=[gmp Rmpfr]; }; + RareVariantVis = derive2 { name="RareVariantVis"; version="1.8.0"; sha256="1irnj6331sr6387k922x6548pk7727vwlzy15awjxcrqlzi5jmim"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; }; + Rariant = derive2 { name="Rariant"; version="1.10.0"; sha256="1sl9wxdkhac2s5sp93mavpxdmif6pkmki95xm1ci8rhms7jg66xr"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; }; + RbcBook1 = derive2 { name="RbcBook1"; version="1.42.0"; sha256="1plcslp68xmr0727wj9v82yyc7lf4n76ixnh6k9lnrrs1ayzz2i9"; depends=[Biobase graph rpart]; }; + Rbowtie = derive2 { name="Rbowtie"; version="1.14.0"; sha256="11sl03ljkq7hkm6ilw91bh4p2lz6iw35xn0f5fyh37i0j5nrmikh"; depends=[]; }; + Rcade = derive2 { name="Rcade"; version="1.16.0"; sha256="05jg13qmrg11d9gkm76d2c3drlzk5l7ld7c57f5fysakg49qbxsd"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; }; + Rchemcpp = derive2 { name="Rchemcpp"; version="2.12.0"; sha256="140hwsb7b0cdps5vzjjv4hjcli58g1mkbapxkd8692hjd6ncvpsj"; depends=[ChemmineR Rcpp]; }; + RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.14.0"; sha256="0w4gzcml89ww8br6xqc903ygbkmzfl5xq13k4lngcbis7b7xmxpj"; depends=[flowType graph Rgraphviz sfsmisc]; }; + Rcpi = derive2 { name="Rcpi"; version="1.10.6"; sha256="0cqy9fr1dg85fwgkilyflwarqs0dp98xrx78xzysh0nckwbqj6mz"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; }; + Rdisop = derive2 { name="Rdisop"; version="1.34.0"; sha256="0fvwv7mm771wa86by3clbrx9sh7hflp1kmcyjj3xnbilwyyglvsg"; depends=[Rcpp RcppClassic]; }; + ReQON = derive2 { name="ReQON"; version="1.20.0"; sha256="1bg7y50zh6zd6v8pmvzdzpd51nazl7ymdx57ydc5ngai372g6s0j"; depends=[rJava Rsamtools seqbias]; }; + ReactomePA = derive2 { name="ReactomePA"; version="1.18.1"; sha256="033cq1pjd03h543abz35mz6vdcxk9ai879b2f8jxppbrmhyi3jij"; depends=[AnnotationDbi DOSE graphite igraph reactome_db]; }; + ReadqPCR = derive2 { name="ReadqPCR"; version="1.20.0"; sha256="0rh42d2wskcmwx81266gb9npgl2gcfxsslz2drd74yvr19vc9wg2"; depends=[affy Biobase]; }; + RedeR = derive2 { name="RedeR"; version="1.22.0"; sha256="0si80xqv3sgyjflrc4h8sq4babcd5pqr2h87a3vbmiry9daw6q2d"; depends=[igraph pvclust RCurl XML]; }; + RefNet = derive2 { name="RefNet"; version="1.10.1"; sha256="0ssb5lhzqwgn9zahhnyk3cqbqdk0qv46819iclz2zd3na6qpkg27"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; }; + RefPlus = derive2 { name="RefPlus"; version="1.44.0"; sha256="0zai3s27xlqjjwvz4da5mq67yll4a4l8a6jyps6m9f6dw1q2c5jl"; depends=[affy affyPLM Biobase preprocessCore]; }; + Repitools = derive2 { name="Repitools"; version="1.20.0"; sha256="05y2y7v768mir3r8c53w1qm9dhpy46fqbyhwakpjaiha1h8y6gxn"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; }; + ReportingTools = derive2 { name="ReportingTools"; version="2.14.0"; sha256="02q90prc115wbhk1851gsbv4xxd39xzbav9c9vck6qirbiangj5g"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; }; + Rgraphviz = derive2 { name="Rgraphviz"; version="2.18.0"; sha256="08brd7cmhxmbv43cf3pq0282fwyxc6hmx3y5dr7filzdb0qs8ja1"; depends=[graph]; }; + Rhtslib = derive2 { name="Rhtslib"; version="1.6.0"; sha256="1vk3ng61dhi3pbia1lp3gl3mlr3i1vb2lkq83qb53i9dzz128wh9"; depends=[zlibbioc]; }; + RiboProfiling = derive2 { name="RiboProfiling"; version="1.4.1"; sha256="19ndx2xdvj57r9wsz9ym3ywilib18cbpm4dswzrhdgjliw73kdjs"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; }; + Ringo = derive2 { name="Ringo"; version="1.38.0"; sha256="0c6h7lm6aqs7y57w2h36g4yr7wl2h9yrp60vv4128bdxgjqkv539"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; + Risa = derive2 { name="Risa"; version="1.16.0"; sha256="1iix9nrn0p7vvv138qxdnz9aqcicrd97hn1sfgm8n46dcn5ghmqy"; depends=[affy Biobase biocViews Rcpp xcms]; }; + Rmagpie = derive2 { name="Rmagpie"; version="1.30.0"; sha256="00bv93d861finxi38pqbrypjiz1hsazzjrbihy4q5sfy2162xpa5"; depends=[Biobase e1071 kernlab pamr]; }; + RmiR = derive2 { name="RmiR"; version="1.30.0"; sha256="0j0h6ififbdbc4k99k0fq5pvaig4dm0gndzbglqrl2xl77ykhpyr"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; }; + RnBeads = derive2 { name="RnBeads"; version="1.6.1"; sha256="1kjxxbhm9f519sbldmklp7nizf71wq6vbnhkad23y4j05ywlywmf"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer S4Vectors]; }; + RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.6.0"; sha256="1lyvhkli4xdhshh53dg2xl9cyy11913zm3pnfpbfha1b0cl5w7d6"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; }; + Rnits = derive2 { name="Rnits"; version="1.8.0"; sha256="0dna0gv4f4ws0xwx5ikaqvn9x01yzln1ihrdc5886bnwmlrxwqm7"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; }; + Roleswitch = derive2 { name="Roleswitch"; version="1.12.0"; sha256="13db86wfzw6bixjxk77d0syzazvy11x5khij2yda5py45cc6q042"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; }; + RpsiXML = derive2 { name="RpsiXML"; version="2.16.0"; sha256="14wlw9cmjr6iv6zydw4l7bfg9dicgb3zk7qfnrlqd9060kgqbfv2"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; }; + Rqc = derive2 { name="Rqc"; version="1.8.0"; sha256="1h3fqmkifr2bdcql161dssfbabkn4x5wg753wbg1j9lfsgn2zp96"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; }; + Rsamtools = derive2 { name="Rsamtools"; version="1.26.2"; sha256="118nsajgghi4cy3h0wi7777kc70a5j1fdyxv5n1dy01glix2z4qk"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; }; + Rsubread = derive2 { name="Rsubread"; version="1.24.2"; sha256="14v255j1n01gl1s0d13rag6m4nmpc2gg636hy4mn505bnvqp147y"; depends=[]; }; + Rtreemix = derive2 { name="Rtreemix"; version="1.36.0"; sha256="18a6pf517an68n5bxxrnql2qzm5jmmi0k3zaqg3n6zkmfz6izm48"; depends=[Biobase graph Hmisc]; }; + S4Vectors = derive2 { name="S4Vectors"; version="0.12.2"; sha256="0syx0qgipx97zsp3b8afhzamsr30835a2a99yb9wnq7b50g3v3p1"; depends=[BiocGenerics]; }; + SAGx = derive2 { name="SAGx"; version="1.48.0"; sha256="1sy7r5nnp9lq8r9217zfy8g5vzjcsh4raiwd06dk4qgshqwd091b"; depends=[Biobase multtest]; }; + SANTA = derive2 { name="SANTA"; version="2.12.0"; sha256="19xrjv25y780jlgl0fw0hlvwdnnjkr6ql769y86qnmj5ipqmgici"; depends=[igraph Matrix snow]; }; + SBMLR = derive2 { name="SBMLR"; version="1.70.0"; sha256="0g1wzx18sac73mwn1v1jgvdx8kbbc2ijrc8nq45h64hg00w66zys"; depends=[deSolve XML]; }; + SC3 = derive2 { name="SC3"; version="1.3.18"; sha256="1nqrzwgb55353q9gf4lky55sda6vggq5rfnmfs0g66vld6ghs6ag"; depends=[cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov scater shiny WriteXLS]; }; + SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.16.0"; sha256="04pfbmhnn6y842i7hd210qqqdkk1q2x25y34x6bnxvfvs5adg4nm"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; + SELEX = derive2 { name="SELEX"; version="1.6.0"; sha256="0j8jqfxynh22r1b4cb2l0chq93i8r5izf40bfbmyxcyw56hbp9y7"; depends=[Biostrings rJava]; }; + SEPA = derive2 { name="SEPA"; version="1.4.0"; sha256="0qrlirs7y6b4f86n9xzk29c1mpq32rjzmz22rl3dgqfanm0rhazy"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; }; + SGSeq = derive2 { name="SGSeq"; version="1.8.1"; sha256="13rv6dwf7bmd2asd16kg3cvpw3zfbnx4z8xh3sficzr409r4xj5v"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; }; + SICtools = derive2 { name="SICtools"; version="1.4.0"; sha256="14crfai0zy3yc74g755hvxpm0r942k6a38sgx399bybxwnlbqdd7"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; }; + SIM = derive2 { name="SIM"; version="1.44.0"; sha256="1f37dc843ir2jy9998gmniydc8ypqnmp68f975vkyqicbzfplh83"; depends=[globaltest quantreg quantsmooth]; }; + SIMAT = derive2 { name="SIMAT"; version="1.6.1"; sha256="14masfdaqbsfwi1yh9cqb2cs4b47a3sy159iig5ahlbc4x9mkmvq"; depends=[ggplot2 mzR Rcpp reshape2]; }; + SIMLR = derive2 { name="SIMLR"; version="1.0.1"; sha256="1r5yzjmjgv1lvw4b4863zs6h54614shp2bvic439wdaqr8pcq6dk"; depends=[Matrix]; }; + SISPA = derive2 { name="SISPA"; version="1.4.0"; sha256="1rfk3gyz5h1qz333cjim6952h01x15gl067jil6i4kislkpjlza7"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; }; + SLGI = derive2 { name="SLGI"; version="1.34.0"; sha256="0080vwdh43i61xsii3kr517z24606dg1l412q0pg4z68p57cqrg1"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; }; + SLqPCR = derive2 { name="SLqPCR"; version="1.40.0"; sha256="1zqdmq461mcz0ic9m5l4y12jmp5vf4b6w19icj2l18s9ndb2b12v"; depends=[]; }; + SMAP = derive2 { name="SMAP"; version="1.38.0"; sha256="0qpllwng8xgx6vfg8a6vrz2353b45xhbmv8vqx81z4b0jh1knbav"; depends=[]; }; + SMITE = derive2 { name="SMITE"; version="1.2.0"; sha256="1xqidcmr1p1nmmrhpdhbclxzfqcs33l1q8zpqs2qcbpx4svvjafb"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGG_db org_Hs_eg_db plyr reactome_db S4Vectors scales]; }; + SNAGEE = derive2 { name="SNAGEE"; version="1.14.0"; sha256="1qpvqxwh14iqw5w9sx366ri9h5q3fbq2cvk0brhsq9hslccb480m"; depends=[SNAGEEdata]; }; + SNPRelate = derive2 { name="SNPRelate"; version="1.8.0"; sha256="07ml3kwpz272q40k4qynj5farwr17lwarwclsd642s2vg0xandd6"; depends=[gdsfmt]; }; + SNPchip = derive2 { name="SNPchip"; version="2.20.0"; sha256="036k1la7ji9fgni0mgrz3bivkh2r66xzqd3q0hys4hr6bg7xrywi"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; }; + SNPediaR = derive2 { name="SNPediaR"; version="1.0.0"; sha256="0cbw37jdmv9bvaclvnj3wyn4r05bbyab6gr0q5gapkzz7zvg8rj1"; depends=[jsonlite RCurl]; }; + SNPhood = derive2 { name="SNPhood"; version="1.4.1"; sha256="17miqrv6v0n6nlrn8rkblqzsf6vk5gspmban8drbjc0j13fjpmli"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + SPEM = derive2 { name="SPEM"; version="1.14.0"; sha256="1pik7sd9gg9hq3yapvc046cjcm6braq2q6nfbc2fv360xsm43ahm"; depends=[Biobase Rsolnp]; }; + SPIA = derive2 { name="SPIA"; version="2.26.0"; sha256="0z5d3bdzixams0nv6z3yr6c8cgymv2wzbnkvg6r1xfi86mrqh0s0"; depends=[KEGGgraph]; }; + SPLINTER = derive2 { name="SPLINTER"; version="1.0.0"; sha256="0w8082mnb8zkbkrp09hcwvn7y63y9p26slx2hvjxh07zw2h2k73c"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo]; }; + SQUADD = derive2 { name="SQUADD"; version="1.24.0"; sha256="1l7rkmqw571wjwcr2wh3d2q652jpcba2hgf8nfbhc1h7da0yz5n5"; depends=[RColorBrewer]; }; + SRAdb = derive2 { name="SRAdb"; version="1.32.0"; sha256="168ijnvv3yhh9j5wbp5m4bqns63dhnmqm108pjdfwxjm2ya0dvra"; depends=[GEOquery graph RCurl RSQLite]; }; + SRGnet = derive2 { name="SRGnet"; version="1.0.0"; sha256="02y7w06j6qjvf49k8a4k03djahv934h4npj18hj10a4941d8ixfn"; depends=[DMwR EBcoexpress gbm gRain igraph limma MASS matrixStats pvclust RedeR]; }; + SSPA = derive2 { name="SSPA"; version="2.14.0"; sha256="0l95hws5c4gb8c1jsqpnwc3010gx9l8yi132svxa6wbms73qpfy2"; depends=[lattice limma qvalue]; }; + STAN = derive2 { name="STAN"; version="2.2.0"; sha256="0z5b22rqyk15gpqhlafq15gaa5h9cs0v1pm64j12qww41nrd6sz0"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; }; + STATegRa = derive2 { name="STATegRa"; version="1.8.0"; sha256="1qn3gdz23a23i1mm006z1s58j8ky5ik3zy67bc6ji6yv0pqcdmah"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; }; + STRINGdb = derive2 { name="STRINGdb"; version="1.14.0"; sha256="17mliwk1cd67bd485j5g8wp1ch8z4mvap44ikvxa4pv51jqrqvh0"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; + SVAPLSseq = derive2 { name="SVAPLSseq"; version="1.0.0"; sha256="17f0a3h82yh9lsanq17prkrbs094bc4kgj9vy6hjk0ivlh0mb0wm"; depends=[edgeR ggplot2 limma lmtest pls SummarizedExperiment]; }; + SVM2CRM = derive2 { name="SVM2CRM"; version="1.6.0"; sha256="02k95x5ifdbnr2jwkppq94q5xbpfxvix8dnqfnjjzxni2qqgwzs3"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; }; + SWATH2stats = derive2 { name="SWATH2stats"; version="1.4.1"; sha256="0jnryq56yjnp7blp9hiw45w03k7g7bb08frxqv98a2zz93vqrcxd"; depends=[data_table ggplot2 reshape2]; }; + SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.28.0"; sha256="08yyvidwzn3ijj0p339nbd94ix4f96141sa1y175cv13rfpcapdw"; depends=[]; }; + ScISI = derive2 { name="ScISI"; version="1.46.0"; sha256="0hrm72dkn8xn5ipw7q1vixybxhc5w13d1g42k6g7ds94mgm4y7lk"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; }; + SemDist = derive2 { name="SemDist"; version="1.8.0"; sha256="1a7f3md15a5fb9s483wz2mhhi99jhmbix9vwa44rnkd3c6xahvyz"; depends=[annotate AnnotationDbi GO_db]; }; + SeqArray = derive2 { name="SeqArray"; version="1.14.1"; sha256="05s7iq3pbn3cpfqr5jvk4fxmvqcgray1d0yvk1j2d2fs6jmdsj97"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; + SeqGSEA = derive2 { name="SeqGSEA"; version="1.14.0"; sha256="03g7pzhw7xz7iwac9d8lw1z0d5hxz982b65ydjwnfq87psssklx4"; depends=[Biobase biomaRt DESeq doParallel]; }; + SeqVarTools = derive2 { name="SeqVarTools"; version="1.12.0"; sha256="1y9bdprh3iw8m5mcys5w6cvi4msh5m2291mnh81gchypk4wmpcgi"; depends=[Biobase gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray stringr VariantAnnotation]; }; + ShortRead = derive2 { name="ShortRead"; version="1.32.1"; sha256="1m7lbfxs7xwcy9xs76zy5rky2mb96anvh457xfw60lh3kygwfpxc"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; }; + SigCheck = derive2 { name="SigCheck"; version="2.6.0"; sha256="0ddq2q47g6anz3y3p25p5vp2nkr4ib3slyd1z5q86gaa6rja9zsv"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; + SigFuge = derive2 { name="SigFuge"; version="1.12.0"; sha256="0cqdzpim9la30fdcn2kk1jb8yj27hx22szlmj86jadv21wrjspwz"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; + SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.12.0"; sha256="02rcz4h0agqm4xp5p6w3i7ssyjj9l52hg9rzp2pig854nmbyyhay"; depends=[Biobase limma mclust Ringo]; }; + SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.10.0"; sha256="14y7ija2c1qby4gb4p9jm1dgn6d1175nlm1cwpvisi8nrri3bfzq"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; }; + SpacePAC = derive2 { name="SpacePAC"; version="1.12.0"; sha256="0xawxv7a59b9w4ggn2ifgwbmxslwp9f4cvkx1mafllj8m9wg8m2q"; depends=[iPAC]; }; + SpeCond = derive2 { name="SpeCond"; version="1.28.0"; sha256="1paj6xpab9gv77fa5p6ndddsc0w9wqd59xkyvaarwka4c74i3983"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; + SpidermiR = derive2 { name="SpidermiR"; version="1.4.8"; sha256="1nqakgccxz5112sfj89jw5mc530kxw5lspsrnhma3sb5ivv89291"; depends=[AnnotationDbi ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; }; + SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.14.0"; sha256="00cgvkh5g16i2kbdlhafpjwfszcki7g5ipl7lpkrvrzk3f9701h7"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; + StarBioTrek = derive2 { name="StarBioTrek"; version="1.0.3"; sha256="0al6l12msrgh6hv73xhqvsqnm1yyvkv34g23dazwf52lxm3qvlkn"; depends=[AnnotationDbi e1071 igraph KEGGREST org_Hs_eg_db ROCR SpidermiR]; }; + Starr = derive2 { name="Starr"; version="1.30.0"; sha256="1wq7166k8incddgivrvijyzq7xd65bwl7rlqxc4c34g7fwzmh0hc"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; }; + Streamer = derive2 { name="Streamer"; version="1.20.0"; sha256="00vi6wh4gq6x5yrvqs2gxmy0nbcjdhiwxzi1v2v99ax11p69h37m"; depends=[BiocGenerics graph RBGL]; }; + SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.4.0"; sha256="1kbj8sg2ik9f8d6g95wz0py62jldg01qy5rsdpg1cxw95nf7dzi3"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors]; }; + Sushi = derive2 { name="Sushi"; version="1.12.0"; sha256="05cl27h76kvxvsbc70gkma3rv9xnavg9iqm7wncardc2b8jprsk1"; depends=[biomaRt zoo]; }; + SwathXtend = derive2 { name="SwathXtend"; version="1.2.0"; sha256="0r7cmiqmp8pkzzr3hbp8k2wk4gzikxp46bxz90dbxaxhasl0b8i0"; depends=[e1071 lattice openxlsx VennDiagram]; }; + SwimR = derive2 { name="SwimR"; version="1.12.0"; sha256="1mmj7sf1j5414gq5ng0s74xkx0cp93l7js0whnw5bvpp43d2f2iv"; depends=[gplots heatmap_plus R2HTML signal]; }; + TCC = derive2 { name="TCC"; version="1.14.0"; sha256="09kyj1wfpkc0iphd5iml3nh2mxr3dkzs52bbqsn259pc82p8bhxb"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.2.10"; sha256="0cmv0ca3y3nc15na55j4684c2q2g2z64cpfnlxkxkgmd4djkxxwv"; depends=[affy Biobase biomaRt c3net circlize clusterProfiler ComplexHeatmap ConsensusClusterPlus data_table dnet doParallel downloader dplyr EDASeq edgeR genefilter GenomicRanges ggplot2 ggrepel ggthemes gplots gridExtra httr igraph IRanges jsonlite knitr limma matlab minet parmigene pathview plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment supraHex survival survminer tibble XML xml2 xtable]; }; + TDARACNE = derive2 { name="TDARACNE"; version="1.24.0"; sha256="06zvmrdg1rjns750w6mlx817r9fn1nkb75qd4qhcvyz6iagpdh54"; depends=[Biobase GenKern Rgraphviz]; }; + TEQC = derive2 { name="TEQC"; version="3.14.0"; sha256="0a85r0skfjqmqs25lgarghzlq3fqp6gcyi5dzm7s3kn0kin0y8cf"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; + TFBSTools = derive2 { name="TFBSTools"; version="1.12.2"; sha256="0r3rgxprc61gmvc636bybw1hqf8li2h52ch54c4jp3ach0bmyjcf"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; }; + TIN = derive2 { name="TIN"; version="1.6.0"; sha256="18y6786wdpq9q4cvxqw0fs01hckgfhqhglpz8sb1hh044i6i00n0"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; + TPP = derive2 { name="TPP"; version="3.0.3"; sha256="1l0qyjwqcn5hj1820pmxfrfb0c0i226jdpbamx4kmszy5rc3b5yv"; depends=[Biobase doParallel dplyr foreach ggplot2 gridExtra knitr limma magrittr MASS nls2 openxlsx plyr RColorBrewer RCurl reshape2 rmarkdown sme tidyr VennDiagram VGAM]; }; + TRONCO = derive2 { name="TRONCO"; version="2.6.1"; sha256="1hwyac9jrivcl4h4k5fv54ywlf2aicd4hkr44v0mz5wgbdy1glgg"; depends=[bnlearn cgdsr circlize doParallel foreach gRapHD gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; + TSCAN = derive2 { name="TSCAN"; version="1.12.0"; sha256="0zcmm7rwhc85fb5b271mdlynplsh0qdbyaw6h6fnwl8w1rdxfa6d"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; }; + TSSi = derive2 { name="TSSi"; version="1.20.0"; sha256="0f7xpd4lmv13297klvrskmiwszxl0i980vvg8ba5k9kd60qjk811"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; }; + TVTB = derive2 { name="TVTB"; version="1.0.2"; sha256="1v3vcyh8sqv7bn06zzndppdpb8vvwm6jgsv0xz9yfx2lnasgbw3v"; depends=[BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges ggplot2 IRanges reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; }; + TarSeqQC = derive2 { name="TarSeqQC"; version="1.4.1"; sha256="1x57wd2cdfw1qrsqqm6v4flzwzkq1rkq58k214nqmi602sv66nlf"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; + TargetScore = derive2 { name="TargetScore"; version="1.12.0"; sha256="0mj25y82nvlk5sk9d2dh0p96i2bzrh0xl3cjsyxz0r7n2vyzlrl2"; depends=[Matrix pracma]; }; + TargetSearch = derive2 { name="TargetSearch"; version="1.30.0"; sha256="1z7sf0qmq3fcpf9h569f4qd4647p1rl4372w9ch8ykyjc8md7gs0"; depends=[ncdf4]; }; + TitanCNA = derive2 { name="TitanCNA"; version="1.12.0"; sha256="1bi6gx9k3f13zjq1pp79ixzalvql5bjlmb8fb5schghb99yx82m5"; depends=[foreach GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; + ToPASeq = derive2 { name="ToPASeq"; version="1.8.0"; sha256="1b65f3jak7yqlfwwzcld41s40x0p1cfyc2lklvc9ngz8g12hql8z"; depends=[AnnotationDbi Biobase clipper DESeq DESeq2 doParallel edgeR fields graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz SummarizedExperiment TeachingDemos]; }; + TransView = derive2 { name="TransView"; version="1.18.0"; sha256="0hnk5msxpb8734djy07cgkgcf4wkkfcdcvg14a44drxdiahsijyk"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; }; + TurboNorm = derive2 { name="TurboNorm"; version="1.22.0"; sha256="06bs841mfspzsjhh61p25apwmn0qnakbxgj1l142i9bv3z7v69cc"; depends=[affy convert lattice limma marray]; }; + TypeInfo = derive2 { name="TypeInfo"; version="1.40.0"; sha256="108q2bxmqf4mshc5ixbf1v55099lzsprwii5qs0y9y2n8x5ra0h2"; depends=[]; }; + UNDO = derive2 { name="UNDO"; version="1.16.0"; sha256="0pmdb7gkf7g2b45j5hiksppn75ja3r2nm71qr4a2841diz93fsri"; depends=[Biobase BiocGenerics boot MASS nnls]; }; + UniProt_ws = derive2 { name="UniProt.ws"; version="2.14.0"; sha256="10m7qzcvhqvqskhrnxbbk2kx4fpq8dn9k2p8l665ds65ixv8xn9x"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; }; + Uniquorn = derive2 { name="Uniquorn"; version="1.2.0"; sha256="19pcbl37khg4m7h4amzzc28xpm5izg8nn998b42pjvibxg6x14hb"; depends=[DBI R_utils RSQLite stringr WriteXLS]; }; + VanillaICE = derive2 { name="VanillaICE"; version="1.36.0"; sha256="00nf5zxjv5409qj79jh1mhidsgkxjk5piysadv2ak8xwpj9zznws"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; }; + VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.20.3"; sha256="10v8apgfw57nd4dxmdxdrijxpw135jpp2p8wrk3wjpb3hhfjp1qj"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; + VariantFiltering = derive2 { name="VariantFiltering"; version="1.10.1"; sha256="0dy97x77v5ray8d5iw5brs15h4r9l6kizqvziccc47jxxsxl103i"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny SummarizedExperiment VariantAnnotation XVector]; }; + VariantTools = derive2 { name="VariantTools"; version="1.16.0"; sha256="13i481iiv3vi1m1lwi2s1vjaaplb4y1l7blmyvpqbpa87ync5crl"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + Vega = derive2 { name="Vega"; version="1.22.0"; sha256="11a8fz2fb2zyn6fgfa9hs5i4hsswp1hdxhahm41f4spn7acglmj7"; depends=[]; }; + VegaMC = derive2 { name="VegaMC"; version="3.12.0"; sha256="1swjak8yg33ykrfa52jiq7v3rcgwzf1w664j6wifi5bcflgbjhg1"; depends=[Biobase biomaRt genoset]; }; + XBSeq = derive2 { name="XBSeq"; version="1.4.0"; sha256="0f72qyhs8rsa5d4xbpgqd7lzxmgxcvk5dwqihfw714vg8mis7p8y"; depends=[Biobase Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; }; + XDE = derive2 { name="XDE"; version="2.20.0"; sha256="11phzwfpyc4dfhhgbfn54ybz71jl2z5wyysvfv34d63lv00jj3yp"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; }; + XVector = derive2 { name="XVector"; version="0.14.1"; sha256="1j14ip4c260kdp3zcmgfa2v8ky88csa0gfdg6a1xsb64s03hdbm6"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; + YAPSA = derive2 { name="YAPSA"; version="1.0.0"; sha256="104ij0pwc8bfys8by0ha99fhjgr85n9havzcsakawna3vrkj2s3b"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; }; + a4 = derive2 { name="a4"; version="1.22.0"; sha256="12c6y89nr4cck4fsx85bnsklpjic2fkyq550xjfjimy7a2jyx9pb"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; + a4Base = derive2 { name="a4Base"; version="1.22.0"; sha256="0w1p7ggj9q33filrkgzqkdah6pb81d6lis3p0l4mmy254kgcc61s"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; }; + a4Classif = derive2 { name="a4Classif"; version="1.22.0"; sha256="01c0gl0161psm8pbwwj7ny2zfgj7f1h9crzsj2hwl6240p771a51"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; }; + a4Core = derive2 { name="a4Core"; version="1.22.0"; sha256="19wb5h9w7zw33hwacnj1y2ylg3ksh1w4vg0mhpgnmrj79zn26wqz"; depends=[Biobase glmnet]; }; + a4Preproc = derive2 { name="a4Preproc"; version="1.22.0"; sha256="1wxf2yp52y63mr3jdsk7x1ah2xm39gwj0sz3fmp42bb1nrga57kh"; depends=[AnnotationDbi]; }; + a4Reporting = derive2 { name="a4Reporting"; version="1.22.0"; sha256="0s57kfn9ca75cqscm6lhs2hw9jxydbcyvj9fwf93ygm731q47lrq"; depends=[annaffy xtable]; }; + aCGH = derive2 { name="aCGH"; version="1.52.0"; sha256="0spz1y4vxi262h6dmrjdimwa58vsksys0mww80lgcqnggc3inzy2"; depends=[Biobase cluster multtest survival]; }; + acde = derive2 { name="acde"; version="1.4.0"; sha256="1rabc0d7fnjw52i6qa4r27ch95jal7kyxmsn1iqfy8mcy8w0dqi4"; depends=[boot]; }; + adSplit = derive2 { name="adSplit"; version="1.44.0"; sha256="0hk5wzssmfaz4vc4hm9xb3j3y285pvcpavcsvas6z68143j39cws"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; }; + affxparser = derive2 { name="affxparser"; version="1.46.0"; sha256="0byfdrrsd3nbs4qdnxcyzb0xd244nnbs5y0h8h6km3fnc2cibghx"; depends=[]; }; + affy = derive2 { name="affy"; version="1.52.0"; sha256="1snq71ligf0wvaxa6zfrl13ydw0zfhspmhdyfk8q3ba3np4cz344"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; }; + affyContam = derive2 { name="affyContam"; version="1.32.0"; sha256="0b3bmqnrk9mzl8ap7rabfq9mlfqi9x80721qbc99hycxywdb9cfj"; depends=[affy affydata Biobase]; }; + affyILM = derive2 { name="affyILM"; version="1.26.0"; sha256="19iw1aaqw7a9snhyg00ldj5h2j9gvb04wjl56ikvxfa83i1w2w2d"; depends=[affxparser affy Biobase gcrma]; }; + affyPLM = derive2 { name="affyPLM"; version="1.50.0"; sha256="02kqhjiffq52gsyaz31yz62chs2kh314ivqhwcpkr7pixhsdzhiw"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; }; + affyPara = derive2 { name="affyPara"; version="1.34.0"; sha256="0f7yrgij5mvwp66hc04lnkp628iva4wb9xs54m573hmvjdmqcjxv"; depends=[affy affyio aplpack snow vsn]; }; + affyQCReport = derive2 { name="affyQCReport"; version="1.52.0"; sha256="0sr24zaav5mqs47mv956m6qn7yjgldqmcjq3pqahb5bfbi6j3gmc"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; }; + affycomp = derive2 { name="affycomp"; version="1.50.0"; sha256="0ar8pv1k0ajx9l53cb0izarfap7wfji6rbjzwhkjzdijkr1ax3gh"; depends=[Biobase]; }; + affycoretools = derive2 { name="affycoretools"; version="1.46.5"; sha256="0c1wpqwqlcdi0sa6dbxkmscd21wni1vrnj7wmxzbf37mq6wcggpp"; depends=[affy AnnotationDbi Biobase BiocGenerics edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; }; + affyio = derive2 { name="affyio"; version="1.44.0"; sha256="1svsl4mpk06xm505pap913x69ywks99262krag8y4ygpllj7dfyy"; depends=[zlibbioc]; }; + affylmGUI = derive2 { name="affylmGUI"; version="1.48.0"; sha256="1zd7644p3zfw1dlgv1f7d53nml2l6bxmlaa96yazd4n37bvx1k4b"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; }; + affypdnn = derive2 { name="affypdnn"; version="1.48.0"; sha256="1fk5mvcg3w3p20mrwac972sxd1m1xza6dzd4kc9m5yzkjw7hp5p4"; depends=[affy]; }; + agilp = derive2 { name="agilp"; version="3.6.0"; sha256="00fmn774rzp291fkkfncp1pg0ryg4203pnqhpqlgp58kw7dj1fmd"; depends=[]; }; + alpine = derive2 { name="alpine"; version="1.0.0"; sha256="0gqqk0hv38f1jmlf1n78kphb2p9bsax9lv0mmd5ph5lsi0jdip7j"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; }; + alsace = derive2 { name="alsace"; version="1.10.0"; sha256="1qikhcxs24ycap2f2wvkm27fw7r7mlzxzz18am13371igbc8rl9d"; depends=[ALS ptw]; }; + altcdfenvs = derive2 { name="altcdfenvs"; version="2.36.0"; sha256="1z7c2kb5c8d28i110mf6vqnhzijhyz7icjrgjab0jg1jbfm466ad"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; }; + ampliQueso = derive2 { name="ampliQueso"; version="1.12.0"; sha256="0p0ydmz185hbzvc9rcqk45hqs3288k4zd36x0a6kk6hyjmjx0z05"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; }; + anamiR = derive2 { name="anamiR"; version="1.0.1"; sha256="0rw4dg54vqmwl76917wgw2fz71zghg0jp6gal32vm3752hg92l3s"; depends=[agricolae DBI DESeq2 gplots limma lumi RMySQL SummarizedExperiment]; }; + annaffy = derive2 { name="annaffy"; version="1.46.0"; sha256="0x0d9hhw7n8ay3d2kncl10b8q7ajb4mv8f6dpzg985cf6irm9pgb"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; }; + annmap = derive2 { name="annmap"; version="1.16.0"; sha256="1qfm2r6w10nmixzwrk52mwkldgc6g2fqzlppd84wwf6mlvxsmb4j"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; + annotate = derive2 { name="annotate"; version="1.52.1"; sha256="0yymz8qxgnbybvfhqrgkd1hh9dhwxdii1yxkhr1zicjgb35xixxb"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; }; + annotationTools = derive2 { name="annotationTools"; version="1.48.0"; sha256="095mrvw3vjr068zm04z8fdidjg3h8iijdvhdfizkfdp36a6lm3kk"; depends=[Biobase]; }; + annotatr = derive2 { name="annotatr"; version="1.0.3"; sha256="0m4s98sdj5i6wifnf05hb4hjr1qqrpkwjrvc13iq151v2zmzhfbn"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges org_Dm_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db readr regioneR reshape2 rtracklayer S4Vectors TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Dmelanogaster_UCSC_dm6_ensGene 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 TxDb_Rnorvegicus_UCSC_rn5_refGene TxDb_Rnorvegicus_UCSC_rn6_refGene]; }; + anota = derive2 { name="anota"; version="1.22.0"; sha256="0qknx73nx2v9y2d2wc57i07varii1y8cr0dvnjcvwr0bnnbi38za"; depends=[multtest qvalue]; }; + antiProfiles = derive2 { name="antiProfiles"; version="1.14.0"; sha256="1frd43dcyaad6rrm8xdhf8vc4fwqyz6kyjlgvq7bxgfkdl8j0si0"; depends=[locfit matrixStats]; }; + apComplex = derive2 { name="apComplex"; version="2.40.0"; sha256="09sd7jx0as0bqgga0ammqghkx8cff4rl8vs1nzhfpv5g00kzdqvh"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; + aroma_light = derive2 { name="aroma.light"; version="3.4.0"; sha256="1cgad3xydmglfkqjqqxvxwxnq65m517hp1jwpw0lsfc13ip13f27"; depends=[matrixStats R_methodsS3 R_oo R_utils]; }; + arrayMvout = derive2 { name="arrayMvout"; version="1.32.0"; sha256="1chrnjnl9yx3xjf1hk36x2xmh93hg1dnhifj8nh9c1hwgnwkkaf1"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; }; + arrayQuality = derive2 { name="arrayQuality"; version="1.52.0"; sha256="0nrw7wzs73y4zcvdk96mqprpnzzcn44ys6i4cbk3hvmrqwfgrhj0"; depends=[gridBase hexbin limma marray RColorBrewer]; }; + arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.30.0"; sha256="0vdvf8wb8dcm2zygqn34l24d6liw3v1qc2nx9sl6wb3zyi4ly60s"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; }; + attract = derive2 { name="attract"; version="1.26.0"; sha256="0wmkydqkrpbn460wa1xsgjic9jfd0j764nn7f7fh5f5iwif1g2gj"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; }; + bacon = derive2 { name="bacon"; version="1.2.0"; sha256="1h38yh9d6mc4jbmhnq342ba8xndfmjr9mpf5gnq7hzb7ai2gmspy"; depends=[BiocParallel ellipse ggplot2]; }; + ballgown = derive2 { name="ballgown"; version="2.6.0"; sha256="02f547y31a133jxqwlq0qianjj2lrlr9kn63x9i91vsyf22mb1ya"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; + bamsignals = derive2 { name="bamsignals"; version="1.6.0"; sha256="1k42gvk5mgq4la1fp0in3an2zfdz69h6522jsqhmk0f6i75kg4mb"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; + baySeq = derive2 { name="baySeq"; version="2.8.0"; sha256="136ll90xapsv1p6pns81kk4krgvbhsamhrych9gfb34r8p6pyplr"; depends=[abind edgeR GenomicRanges]; }; + beadarray = derive2 { name="beadarray"; version="2.24.0"; sha256="1yjpkzknvznvc3qacdf6ma1jfxkw5basir3h0ipvfm6jnd07l1g3"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; }; + beadarraySNP = derive2 { name="beadarraySNP"; version="1.40.0"; sha256="1afy96fx6600cw92my65zds9w99y4yxyzbssr06ycfrzz3sd6xrb"; depends=[Biobase quantsmooth]; }; + betr = derive2 { name="betr"; version="1.32.0"; sha256="093lynqrfbb6iai3s2wvwmjjx8p43nb32mxghxf3ymchaq0hnbgw"; depends=[Biobase limma mvtnorm]; }; + bgafun = derive2 { name="bgafun"; version="1.36.0"; sha256="1kjrg0c686cj7ykvas7wknc3lvdlj4jvfybfwqxwnnzxrjqn350l"; depends=[ade4 made4 seqinr]; }; + bgx = derive2 { name="bgx"; version="1.40.0"; sha256="1lzcgfjqgvd0a8r7qi8hyb1l99qw7d68bqzy97sqaaqnfb773qr4"; depends=[affy Biobase gcrma]; }; + bigmelon = derive2 { name="bigmelon"; version="1.0.0"; sha256="1wj8x195gaqq3h0y62ilxsrh0xz17d0vfnbcbblg392a4c41p4j2"; depends=[Biobase gdsfmt methylumi minfi wateRmelon]; }; + bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.20.0"; sha256="0zd43xyx433s7aghs3x4963hf2pcr6q6qyx99bxrbkbdws5m9zql"; depends=[bigmemory]; }; + bioCancer = derive2 { name="bioCancer"; version="1.2.0"; sha256="1szkrk81nyxfj8agd010495l8c3iirnixmwly38lz1f16w2p494l"; depends=[AlgDesign AnnotationFuncs Biobase broom car cgdsr clusterProfiler covr curl data_tree DiagrammeR DOSE dplyr DT geNetClassifier ggdendro ggplot2 GPArotation gridExtra htmlwidgets jsonlite knitr lubridate magrittr markdown MASS org_Hs_eg_db plyr pryr psych RCurl reactome_db ReactomePA readr scales shiny shinyAce stringr tibble tidyr visNetwork wordcloud XML yaml]; }; + bioDist = derive2 { name="bioDist"; version="1.46.0"; sha256="1ark28jkh3zi0pc4a0xj9qmim38n9k919avx9ir35wxm81133g0a"; depends=[Biobase KernSmooth]; }; + bioassayR = derive2 { name="bioassayR"; version="1.12.1"; sha256="09sd6naqai7qiwinjwdh6fxgswcs7z9jfh5w93vg34m29i8sry36"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; }; + biobroom = derive2 { name="biobroom"; version="1.6.0"; sha256="1r2v43hpk0h6cnsaxxbks4c3c1jnakrpx693px2vg04r2gl9b9pc"; depends=[Biobase broom dplyr tidyr]; }; + biocGraph = derive2 { name="biocGraph"; version="1.36.0"; sha256="1sxhb713sn32kpjin5m0rg32b7gw75d5a6b4m9gqj0p7537phkjd"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; + biocViews = derive2 { name="biocViews"; version="1.42.0"; sha256="07rjk10b91pkriyq297w86199r2d3sfji3ggs9mq2gyalsa8y4b6"; depends=[Biobase graph RBGL RCurl RUnit XML]; }; + biomaRt = derive2 { name="biomaRt"; version="2.30.0"; sha256="1x0flcghq71784q2l02j0g4f9jkmyb14f6i307n6c59d6ji7h7x6"; depends=[AnnotationDbi RCurl XML]; }; + biomformat = derive2 { name="biomformat"; version="1.2.0"; sha256="1p768n1kw82bl2n1ifsdfvl7rxbxhgg6qg6f72nqn07x2s14rr6g"; depends=[jsonlite Matrix plyr rhdf5]; }; + biomvRCNS = derive2 { name="biomvRCNS"; version="1.14.0"; sha256="111mhlfmnyz2m0n1s6f72kyd37fbs73fdcwva06p8b3v21pq4zbx"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; + biosigner = derive2 { name="biosigner"; version="1.2.4"; sha256="0ckmmr9lsyvzarwpz49iwz2w31sjzlvp9pblaj5xkw7x2cj06i8l"; depends=[Biobase e1071 randomForest ropls]; }; + biosvd = derive2 { name="biosvd"; version="2.10.0"; sha256="1gd93p178hs9rhh1w1vgxygw997lk3asmmgajkk6mh7463z340hg"; depends=[Biobase BiocGenerics NMF]; }; + biovizBase = derive2 { name="biovizBase"; version="1.22.0"; sha256="0f3zwn0g0rc3ld8dd5sgpr14l9aff57j766h4grkiyazyyb46bnh"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + birta = derive2 { name="birta"; version="1.18.0"; sha256="101bwd0miz377ahc1v7g0rzx1m8qzgy2wmpw57bqnpfn0xawxzg3"; depends=[Biobase limma MASS]; }; + birte = derive2 { name="birte"; version="1.10.0"; sha256="1kkj41d5w70kak00564zjycrcbr8vq3fxkg5f5j710b5shms91v2"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; }; + blima = derive2 { name="blima"; version="1.8.0"; sha256="181xqsmqq1g52dvkxx7b5myj9fd1ss15x853n617fsij8sbnbarb"; depends=[beadarray Biobase BiocGenerics]; }; + bridge = derive2 { name="bridge"; version="1.38.0"; sha256="1jfyg88i8yw6nz15sn3mhg5d7ms5xmimaca57bpj2y8yzzbbmg2k"; depends=[rama]; }; + bsseq = derive2 { name="bsseq"; version="1.10.0"; sha256="0akzqcpcfsldjxyn9znyzdfczkkjpxxf9hfqzjqd3yj4x1hgnf4j"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges limma locfit matrixStats permute R_utils S4Vectors scales SummarizedExperiment]; }; + bumphunter = derive2 { name="bumphunter"; version="1.14.0"; sha256="08r5bvxnx96rv34lww0ccn1qhy98kwsdlvyp2bq21bmwqgfm5m03"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; + caOmicsV = derive2 { name="caOmicsV"; version="1.4.0"; sha256="06zksrn6psfwfxqagf5ksqakqkpm32sls4vi8nvfpwkh69s1r7va"; depends=[bc3net igraph]; }; + canceR = derive2 { name="canceR"; version="1.6.0"; sha256="10cai1l21cjdj61rp0s6w1a03fn03dzgcz9snb76yrr24cynhrf8"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; }; + 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]; }; + cellTree = derive2 { name="cellTree"; version="1.4.0"; sha256="1aqjz3cwl34inm7bw9pspgpi15h81si8gki3015j1ib8r45n9wda"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; + cellity = derive2 { name="cellity"; version="1.2.0"; sha256="1lzrhqs1jq8khh3gmca381kcr6szmc17ng2jxpz025isbpc9b8y2"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; + cghMCR = derive2 { name="cghMCR"; version="1.32.0"; sha256="1d9vygzf4dinr4xwcz7091zlyk798ph99g27dywpkqr7yijgjz8m"; depends=[BiocGenerics CNTools DNAcopy limma]; }; + charm = derive2 { name="charm"; version="2.20.0"; sha256="14vf7jdi5hwk3rysm59kylzfajak0wqafipa8r02rij2h1354c3v"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; }; + chimera = derive2 { name="chimera"; version="1.16.0"; sha256="0j7nhardm70p2l4svdb1cyqwk3j2247q5ig7ya72az5bh3bmamb6"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + chipenrich = derive2 { name="chipenrich"; version="1.12.1"; sha256="0vqhlljikhfb3byla05s0w95n0rfyww1rjp7g6zdsf09fy79pcw7"; depends=[chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv plyr rms S4Vectors stringr]; }; + chipseq = derive2 { name="chipseq"; version="1.24.0"; sha256="115ayp82rs99iaswrx45skw1i5iacgwzz5k8rzijbp5qic0554n0"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; + chopsticks = derive2 { name="chopsticks"; version="1.38.0"; sha256="1cxr419sdvy5s2whcs49hda3zy5fbgzjqgj9bb651qcwk6vc5n0h"; depends=[survival]; }; + 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]; }; + clippda = derive2 { name="clippda"; version="1.24.0"; sha256="0dqlr468awg4r1rnskzjj77c0amcq0nj1rh8j9s5ad6jvspyk1wk"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; }; + clipper = derive2 { name="clipper"; version="1.14.0"; sha256="1qrj1l7qdkq6s8k2zq5rfkwnag0f1ivhcjcnzyszkf8nzpxz019g"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; }; + clonotypeR = derive2 { name="clonotypeR"; version="1.12.0"; sha256="1j4s26l2k0msw8yza92348z8kpji0c9a1a83gjn7lazbs27arlnf"; depends=[]; }; + clst = derive2 { name="clst"; version="1.22.0"; sha256="1yilfyf6azwdc48rdvfanjl0anl275qc6p1f2agyf5nfrhacpaaz"; depends=[lattice ROC]; }; + clstutils = derive2 { name="clstutils"; version="1.22.0"; sha256="0wc7xv65dg2qi2778qlk49d3snx4ahv9km74jdysixwww2fqqqs4"; depends=[ape clst lattice rjson RSQLite]; }; + clustComp = derive2 { name="clustComp"; version="1.2.2"; sha256="0pmna9q3y607d04pqyi4vkl5r7hl41cywsplpkmkwmwp8y1v2zls"; depends=[sm]; }; + clusterExperiment = derive2 { name="clusterExperiment"; version="1.0.0"; sha256="0idg0iw7lb1iqzxwpilqh7njz2yv6783nzvmnxvdnx1vj7xihdky"; depends=[ape cluster dendextend howmany limma locfdr matrixStats NMF phylobase RColorBrewer SummarizedExperiment]; }; + clusterProfiler = derive2 { name="clusterProfiler"; version="3.2.14"; sha256="0nip67hzcwc1zary2abcki4cgz32ixxkv9b8apllvz5a26scn02r"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim IRanges magrittr plyr qvalue tidyr]; }; + clusterStab = derive2 { name="clusterStab"; version="1.46.0"; sha256="1h3j1qs6d5d4whmzljzjlg6favlb8r4nk2sm8sk5kjad37ywz3cm"; depends=[Biobase]; }; + cn_farms = derive2 { name="cn.farms"; version="1.22.0"; sha256="18q8v82i90sj2c19idv5czy8dvlr2qghdlj29nqn8rwh8i04ayz9"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; }; + cn_mops = derive2 { name="cn.mops"; version="1.20.1"; sha256="0wrf4k0a2zc6ymhlr6shncw4xdpfzwzfxig7ddrrwx4brrhn1c91"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; }; + cnvGSA = derive2 { name="cnvGSA"; version="1.18.0"; sha256="18i6g6hmky6r9c6vgs67kxq5vvyaldlghlbpv518awd0y135fx4x"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; }; + coGPS = derive2 { name="coGPS"; version="1.18.0"; sha256="0hcyha03gyh6zp1b24h2n9nx0vkzphh2d10nvss3ryaqj9305cxd"; depends=[]; }; + coMET = derive2 { name="coMET"; version="1.6.0"; sha256="0biiz7g893l12ibqdx16zagyk124yjz41mmb8gb283rhlibf6bpm"; depends=[biomaRt colortools corrplot GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; }; + coRNAi = derive2 { name="coRNAi"; version="1.24.0"; sha256="0qa7wrsz9m34dr7dm97cqwl2bzxn8zr0fkdqyr6x1jkixxfs76p1"; depends=[cellHTS2 gplots lattice limma locfit MASS]; }; + cobindR = derive2 { name="cobindR"; version="1.12.0"; sha256="1nygdg9bipj1nwv6i1dk3mmmba7jzmf2q4wmqwf9ivgjfaskqd19"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; }; + codelink = derive2 { name="codelink"; version="1.42.0"; sha256="0kxh3qs8plqlbq38mqyzc8lqcdsh4ig5ar2s12w5z8f17flax1fh"; depends=[annotate Biobase BiocGenerics limma]; }; + cogena = derive2 { name="cogena"; version="1.8.0"; sha256="0q5w7bjaizsvzi576lpkh59j0ynjklq1h2f9sz4wssvi9xpkg7h8"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; }; + compEpiTools = derive2 { name="compEpiTools"; version="1.8.0"; sha256="0bc7pmxi7j6gv1irwaab1z3x350pnnarp216lhvkn799g6bard9r"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; + compcodeR = derive2 { name="compcodeR"; version="1.10.0"; sha256="0fzwxnf2n408k3548c3ravddd1m6vdc6212vnka5vggjhr6aapbm"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; }; + consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.2.0"; sha256="0fmryl0lhahh75iy1ngqvv607iz1y9a1div3wkhw22hkzwkj0r9m"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; }; + contiBAIT = derive2 { name="contiBAIT"; version="1.2.0"; sha256="07l8fy2caynakkixyipym7wmnvrjdng6j3gqqy6lbsczc18l2ljm"; depends=[BH BiocParallel clue cluster colorspace diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; }; + conumee = derive2 { name="conumee"; version="1.8.0"; sha256="0a1abk4xfzlmz87gl6iysgriy1crs7yzhr11qajbayf7qlajyk1l"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; }; + convert = derive2 { name="convert"; version="1.50.0"; sha256="01cgfnlnry5p3zjnb93cwm16kqdcl2szbps4pvgs3b8myznq3c4k"; depends=[Biobase limma marray]; }; + copa = derive2 { name="copa"; version="1.42.0"; sha256="1k93l7sgia6p6acbzdg48pr3l7lcc6v3k4g2mgixm2r130i78s3v"; depends=[Biobase]; }; + copynumber = derive2 { name="copynumber"; version="1.14.0"; sha256="1hm0k2gqgsgqvald19x09pf3x37xyyjwm5f32dxivfb04n504s1v"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; }; + cosmiq = derive2 { name="cosmiq"; version="1.8.0"; sha256="12bc7hbjww6kza2hrg2x691h3nrsx74hji93xsk14zkf5z3c17wd"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; }; + covEB = derive2 { name="covEB"; version="1.0.0"; sha256="0sbcsf6y68n49w7zvzci3q3dmgi7vji3b3rfa4xzqzdj89zzns8z"; depends=[Biobase gsl igraph mvtnorm]; }; + covRNA = derive2 { name="covRNA"; version="1.0.0"; sha256="0igvcnni8in70dch50l6vx8aj66rgbaxh93y0bv86mnvmzs5avhk"; depends=[ade4 Biobase genefilter]; }; + cpvSNP = derive2 { name="cpvSNP"; version="1.6.0"; sha256="0yw04dsbhvg1hfhd71b76cny79r553y8gfin2jzzy6jkifzd19fq"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; }; + cqn = derive2 { name="cqn"; version="1.20.0"; sha256="1ac8kwd43ynli6hwfz9innlpiys1vyvq0ic8garixwpv9qwayrvs"; depends=[mclust nor1mix preprocessCore quantreg]; }; + crisprseekplus = derive2 { name="crisprseekplus"; version="1.0.0"; sha256="1cvz483j94v2kk6fcjh22kj71zs097wghqfsdmr128za38x9vxf0"; depends=[AnnotationDbi BiocInstaller BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; }; + crlmm = derive2 { name="crlmm"; version="1.32.0"; sha256="1pa8879k0xdgmz5mk4lq8rhi0v9ai01bv3h1c0cq6blhvyca1rw2"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; }; + crossmeta = derive2 { name="crossmeta"; version="1.0.1"; sha256="1fid7bl27vsj6kxkwpymkvm5b8p5xq25xk3d8x2r1k4sx10nfidl"; depends=[affxparser affy AnnotationDbi Biobase BiocGenerics BiocInstaller data_table DT fdrtool GEOquery limma matrixStats metaMA miniUI oligo pander RColorBrewer rdrop2 shiny stringr sva]; }; + csaw = derive2 { name="csaw"; version="1.8.1"; sha256="0vq3kxwqaaxz7k710f5y3pb8jidiqp815f5h4hy174cgmj3y1sz2"; depends=[AnnotationDbi BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; + ctc = derive2 { name="ctc"; version="1.48.0"; sha256="137087cms5rdivm1fh2m5v414lcf96sch409b3yapkl8zva99i0q"; depends=[amap]; }; + ctsGE = derive2 { name="ctsGE"; version="1.0.0"; sha256="00dmky3fggz0xq1hwwk5xk9lbk93jmym5fc0g628apq520g9h7b0"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; }; + cummeRbund = derive2 { name="cummeRbund"; version="2.16.0"; sha256="1191frlhs738xcfqcw0la7jx4jhiqfnqqcaj1a8z61p0rkx2vi70"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; }; + customProDB = derive2 { name="customProDB"; version="1.14.1"; sha256="0m4gl4w7lwvz1irwbrgx4xz8ipz55h2xz85pl89jpr35cxv7gh6z"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; }; + cycle = derive2 { name="cycle"; version="1.28.0"; sha256="17azpsw3ah7ifshn0gfnfa458y70l551ix4s623d3wjbzdbk03kj"; depends=[Biobase Mfuzz]; }; + cytofkit = derive2 { name="cytofkit"; version="1.6.5"; sha256="1ml3g8p9r7azg3c31izrvkbpfss49q8ns293jqsk9470h9yl2p4m"; depends=[Biobase colourpicker destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny vegan VGAM]; }; + dSimer = derive2 { name="dSimer"; version="1.0.0"; sha256="0a36xlq0hsn7krf23ynmny6gckv3iisisr7pp928jblh43pspr0r"; depends=[AnnotationDbi ggplot2 GO_db igraph org_Hs_eg_db Rcpp reshape2]; }; + daMA = derive2 { name="daMA"; version="1.46.0"; sha256="04x1ipqa04khki98yq8qyzlwjwz3p3ra18s4qc1hkfqsgqij20bm"; depends=[MASS]; }; + dada2 = derive2 { name="dada2"; version="1.2.2"; sha256="1996n96afn074h5mkwbdi8chvswb8xc9ms6rnbb060vdzwsrfi7k"; depends=[Biostrings data_table ggplot2 Rcpp RcppParallel reshape2 ShortRead]; }; + dagLogo = derive2 { name="dagLogo"; version="1.12.0"; sha256="14swyk3vywbm09cs4ny7wrjy9q4nmpy5nis1ik18ilmifqff3xh7"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; }; + dcGSA = derive2 { name="dcGSA"; version="1.2.0"; sha256="0fz730m7agvidrq3rdkymaa9vn5ry0jj2p8bzlpzb8ab7siaqapr"; depends=[BiocParallel Matrix]; }; + ddCt = derive2 { name="ddCt"; version="1.30.0"; sha256="03j2njmx90ivd9rb2vsd4fxcciwy9q8fj48rv3z43wrq4vbkf8s8"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; }; + ddgraph = derive2 { name="ddgraph"; version="1.18.0"; sha256="17rmc4fcf1vac9jw95h4nqr32jk7vpn10ddxgl0qp9zcabxd8vm6"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; }; + debrowser = derive2 { name="debrowser"; version="1.3.11"; sha256="18hc0zlw0dzhqsnjhw7grb77y3mya2hdp1g4kgkk9fah44y8xihs"; depends=[annotate AnnotationDbi baySeq clusterProfiler d3heatmap DESeq2 devtools DOSE DT edgeR GenomicRanges ggplot2 ggvis gplots igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db RColorBrewer RCurl reshape2 S4Vectors shiny shinydashboard shinyjs stringi SummarizedExperiment sva V8]; }; + deepSNV = derive2 { name="deepSNV"; version="1.20.0"; sha256="00zl9sxifx4z2ydab6fdfyaidfin0m79v603nwv1h3kac703awvs"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; }; + deltaGseg = derive2 { name="deltaGseg"; version="1.14.0"; sha256="1qwzfg284ac8snwc1v9lwqd2cfkzvgp1gc0baf802kdwnp94hpq5"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; }; + derfinder = derive2 { name="derfinder"; version="1.8.5"; sha256="1snwy5q99jy5lcnrdmanclyhfsiax5gslznphzpps19hdzby045r"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; }; + derfinderHelper = derive2 { name="derfinderHelper"; version="1.8.1"; sha256="0920kl7lsjf9hzxh304q2n4n5nscxmaiacxqbn2ql9ja7saypqag"; depends=[IRanges Matrix S4Vectors]; }; + derfinderPlot = derive2 { name="derfinderPlot"; version="1.8.1"; sha256="0fvyira43hknhs72s520czprgcgy4hh54pmcsd3caca2f077cxks"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; }; + destiny = derive2 { name="destiny"; version="2.0.8"; sha256="1zqmfi8ha028lcwb147m4xin4zkgrg5aqh4mp0aidqv0d8p59hkp"; depends=[Biobase BiocGenerics FNN Hmisc igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother VIM]; }; + dexus = derive2 { name="dexus"; version="1.14.0"; sha256="04vihwcvb7kx1i1pws5rhk1cdnkrhh6ipi8fwz2yfizyc253hfmh"; depends=[BiocGenerics]; }; + diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.56.0"; sha256="17fyvgw9izdzhh1nmd0g0ibaxsy36438dbvszf9c447h21qqr3r5"; depends=[minpack_lm]; }; + diffHic = derive2 { name="diffHic"; version="1.6.0"; sha256="1331cf5d774hsd037gvzjx8dym5m0kk2azjb17gls1fqd08y33g6"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; }; + diffloop = derive2 { name="diffloop"; version="1.2.2"; sha256="1hkhprz6bxpd94l5648j03xxn5rj85dl4dl419pfi4n7r21gywrq"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; }; + diggit = derive2 { name="diggit"; version="1.6.0"; sha256="0n5slh0w1g8zdnrbqxfram5j82yy5aaw9m7h5r5ybw6hbwmjf93r"; depends=[Biobase ks viper]; }; + dks = derive2 { name="dks"; version="1.20.0"; sha256="09y7h7gw5p3rxrbwg4mq4qpp89cv6gj45idilv30jvsjyvv03a31"; depends=[cubature]; }; + domainsignatures = derive2 { name="domainsignatures"; version="1.34.0"; sha256="0sw6fyv91nrgf55g0387hghxa7gsfcqb81lmpg11ccvm8pzj7hlp"; depends=[AnnotationDbi biomaRt KEGG_db prada]; }; + doppelgangR = derive2 { name="doppelgangR"; version="1.2.0"; sha256="06zbgkyi38v80d2szfhklbnxpnl3lfqq78ha7y8zwa2l16pkpj0m"; depends=[Biobase BiocParallel digest impute mnormt sva]; }; + dualKS = derive2 { name="dualKS"; version="1.34.0"; sha256="1qh3v18gp1flryj6wzyvi20rd7gh35rvq9cyir72cj801w95rkzs"; depends=[affy Biobase]; }; + dupRadar = derive2 { name="dupRadar"; version="1.4.0"; sha256="1m0fk5aq5nx98khkahq1wwq4hs6rfnf3gi0bnyfcm0719hk70nah"; depends=[Rsubread]; }; + dyebias = derive2 { name="dyebias"; version="1.34.0"; sha256="16nxwg53ccx128k5ih26gm9z18n6prbas7nxm5hgfl44ihl6a2w6"; depends=[Biobase marray]; }; + easyRNASeq = derive2 { name="easyRNASeq"; version="2.10.0"; sha256="1jjwskac47scnbs0xdxw48l2lm389gpf38rg93z6z4sri5qk9xbk"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; }; + ecolitk = derive2 { name="ecolitk"; version="1.46.0"; sha256="1mz2qk6cf0sq2395p7snj9mjqnsh3jkcbj3hd4awc4iyj4zrcw3l"; depends=[Biobase]; }; + edge = derive2 { name="edge"; version="2.6.0"; sha256="02825wnwysafi06vr5vglwld52hz9dvyrsz57rxx7bfras1y60xw"; depends=[Biobase jackstraw MASS qvalue snm sva]; }; + edgeR = derive2 { name="edgeR"; version="3.16.5"; sha256="04vpa0a6dkkjyvvfbkmfjyaxf2ldkagi66g028qpaszd8jsk8yiv"; depends=[limma locfit]; }; + eegc = derive2 { name="eegc"; version="1.0.0"; sha256="00l7aym526p9l6iz3j72v9n2c42l70mm1nx7q653jfhbivdikh0i"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; }; + eiR = derive2 { name="eiR"; version="1.14.1"; sha256="16s07903wq9wwirkwv4pd77kpi1rkbmlyg24bg38zlanfyqprqfq"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; }; + eisa = derive2 { name="eisa"; version="1.26.0"; sha256="0hvpk8jsh5f0b23n4bk8h238j4afw1fdkcr9l4k3m9hm4078xjj0"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; }; + ensemblVEP = derive2 { name="ensemblVEP"; version="1.14.0"; sha256="175fj7w2zawpymsjbcqxwp82la6lb60ajp5sbz3hkr9mscb9xi19"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; + ensembldb = derive2 { name="ensembldb"; version="1.6.2"; sha256="1hxvjplkgkibjfzrbi6whqr7czf5digh96j7ww6szdyxy86gbf3r"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; }; + epigenomix = derive2 { name="epigenomix"; version="1.14.0"; sha256="0wp8xbqy98b9i1vwdhjg3wbsi2nfqm9vl1alzp67s92sdafa0lax"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; + epivizr = derive2 { name="epivizr"; version="2.4.1"; sha256="119q39cr0fawrr4a64qx4fxddwmxcav44fq4i0dip0wf7pr7wwrw"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; }; + epivizrData = derive2 { name="epivizrData"; version="1.2.0"; sha256="0vr3czsdky6f4s60jg8ddm47kf5qsk3dj76kwwbaz9ffd3sgsv0z"; depends=[Biobase epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; }; + epivizrServer = derive2 { name="epivizrServer"; version="1.2.0"; sha256="0ajxc77g604m5756bx8ivv0jqfdkglh4vjc4295d1dzwml555xil"; depends=[httpuv mime R6 rjson]; }; + epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.2.0"; sha256="0nm644hmryyn8wsgzm129nldixn6z3yqff6851c7nwifz7vkzsln"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; }; + erccdashboard = derive2 { name="erccdashboard"; version="1.8.0"; sha256="09hba0gbfgq7799kd41vm4j7qsyhkfg1awi8mymqqfb9fkdladkh"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; }; + erma = derive2 { name="erma"; version="0.6.0"; sha256="1540i8m9fr2v8n8pzf0zfjcv2gxmfd1b2fld73hkcfv2mkfiks1m"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; }; + esetVis = derive2 { name="esetVis"; version="1.0.1"; sha256="1s56qkm0r93bl7bfsp804q5fhcqmkazwh9g5jv01v23llsd6i0b6"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; }; + eudysbiome = derive2 { name="eudysbiome"; version="1.4.0"; sha256="1sjqn0l25hw8y8i0g0ba22h5z9drj7m6104dwyfl41rprrasxjps"; depends=[Biostrings plyr R_utils Rsamtools]; }; + exomeCopy = derive2 { name="exomeCopy"; version="1.20.0"; sha256="1hdhbnb318m05bhiqijnci1d0q40d0lpw5cnvsszg6jykks3axxm"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; + exomePeak = derive2 { name="exomePeak"; version="2.8.0"; sha256="0573n29115djdbb47dkidwrx9m9j84ajamqanq0vx8rgjrg2xljm"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; }; + explorase = derive2 { name="explorase"; version="1.38.0"; sha256="04338jfp3kf8wngm15ws3q2r6d2wc7kvzvf50nmx6dji52952807"; depends=[limma rggobi RGtk2]; }; + fCCAC = derive2 { name="fCCAC"; version="1.0.0"; sha256="0mgzk2siwwq5ajmzqv7k5w3a8zsha7vawqj3frzfmsccbaifdw9h"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; }; + fCI = derive2 { name="fCI"; version="1.4.0"; sha256="188599kcl50k3lvdn5z1r3xy4fnipma2idacxglrfh5pxbnc0wf7"; depends=[FNN gtools psych rgl VennDiagram zoo]; }; + fabia = derive2 { name="fabia"; version="2.20.0"; sha256="14lnyc9b0h9kb0xp7miiz3znwsbdb3ar1j5qlnfl0s9syc9y0p46"; depends=[Biobase]; }; + facopy = derive2 { name="facopy"; version="1.8.0"; sha256="02z3bdsiz3crzlb038av9bsmbwq2wi3hxfdizngkcc8x2zp4gl4f"; depends=[annotate cgdsr coin data_table DOSE facopy_annot FactoMineR ggplot2 GO_db GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz S4Vectors scales]; }; + factDesign = derive2 { name="factDesign"; version="1.50.0"; sha256="0zmbnb5nf6724k6xbmn19pp2jflfr0ckl11zhms0yhhmagd17wlz"; depends=[Biobase]; }; + farms = derive2 { name="farms"; version="1.26.0"; sha256="00hxllk193v5rbmqzayv7cizlz1kpba7jpxafd2n02471ga7qjvf"; depends=[affy Biobase MASS]; }; + fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.10.0"; sha256="0aqagldg2qc8fhk6131dj4rr5yka0sr19m7pqr1pxczg6gn7yxpr"; depends=[Hmisc LiquidAssociation WGCNA]; }; + fastseg = derive2 { name="fastseg"; version="1.20.0"; sha256="1ax0c5apmixyl7daahb3wqq8m8mc6prrylgfgbnv02rx5b3ii9hn"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors]; }; + fdrame = derive2 { name="fdrame"; version="1.46.0"; sha256="1zc40aa32jijmvxc07sv4gp0hdw0m4rd06aslfjyb7ngsz16lik6"; depends=[]; }; + ffpe = derive2 { name="ffpe"; version="1.18.0"; sha256="0p1sdapm6394j2xknn44g1vgry1ys004q9fkgchv40yy874ym1w9"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; }; + fgsea = derive2 { name="fgsea"; version="1.0.2"; sha256="1yq4s4g4xxzcpkv9dpbg29444iy38vfgwj4wgr47rjjq8njfblfx"; depends=[BiocParallel data_table fastmatch ggplot2 gridExtra Rcpp]; }; + flagme = derive2 { name="flagme"; version="1.30.0"; sha256="0s6f1928fswv8fvbqrhgq6ah0j7pqpar9q5xs3nwmig3nb9x8win"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; }; + flipflop = derive2 { name="flipflop"; version="1.12.0"; sha256="1sbqdynm4wbz3ybyzdaa6scpyav9fyn0zjm817sl8gpnsnp89m5g"; depends=[GenomicRanges IRanges Matrix]; }; + flowAI = derive2 { name="flowAI"; version="1.2.10"; sha256="1hwhzzjz7hwc9751p7kvs32w0nqn3yzkbwh8v7mdpfxsx7xi5pfp"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 scales]; }; + flowBeads = derive2 { name="flowBeads"; version="1.12.0"; sha256="1zpjgk2ppcgmhlqmknsgp0wagilgdqk8mfhjnc474yrr339dwvcs"; depends=[Biobase flowCore knitr rrcov xtable]; }; + flowBin = derive2 { name="flowBin"; version="1.10.0"; sha256="0357nin7rcapvj82c1bxmgcn6gryi8avgzqszhk264qzmlhl2kq7"; depends=[BiocGenerics class flowCore flowFP limma snow]; }; + flowCHIC = derive2 { name="flowCHIC"; version="1.8.0"; sha256="1fvy99wql8lszd5kcp9gms111hw8mxkmdv68jl8cya3x7b113cr5"; depends=[EBImage flowCore ggplot2 hexbin vegan]; }; + flowCL = derive2 { name="flowCL"; version="1.12.0"; sha256="0cxaixdx1i25p0vv8b6ynjb144cz6b9lyx40d0i21iv0fxvyxb37"; depends=[graph Rgraphviz SPARQL]; }; + flowClean = derive2 { name="flowClean"; version="1.12.0"; sha256="05jnp36ar05sgy06rfd91zkjsbinag7nylz4fimkzlsfwkaya2i1"; depends=[bit changepoint flowCore sfsmisc]; }; + flowClust = derive2 { name="flowClust"; version="3.12.2"; sha256="1hq7wmzd2jpbr8scvi7scg2y1cf5pq562fsl14i1p4112fhj88n1"; depends=[Biobase BiocGenerics clue ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; }; + flowCore = derive2 { name="flowCore"; version="1.40.6"; sha256="0r4plrqbmqhn7zlhr6c8zb969r41jsdb0v7vk730zc8bqhqnw5c0"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; }; + flowCyBar = derive2 { name="flowCyBar"; version="1.10.0"; sha256="0q3lizif3mc057yfbxsm1b6l79ia3ls9iaalnsrlmxlbqk3rylcp"; depends=[gplots vegan]; }; + flowDensity = derive2 { name="flowDensity"; version="1.8.0"; sha256="0s0zd6q5fxl40wv9fmdd6g2x8ar67ian0ihn61v95z2kgcrz2ygd"; depends=[car flowCore GEOmap gplots RFOC]; }; + flowFP = derive2 { name="flowFP"; version="1.32.0"; sha256="010m41pbz2f5rcx6453x889mjwbx0rx37lcnfhrz3hsnzqnykdim"; depends=[Biobase BiocGenerics flowCore flowViz]; }; + flowFit = derive2 { name="flowFit"; version="1.12.0"; sha256="1laaa4f4jbhr1ri6zakbh2wwivhq8b44xmb1yvvrjy61fqfl4d9f"; depends=[flowCore flowViz gplots kza minpack_lm]; }; + flowMap = derive2 { name="flowMap"; version="1.12.0"; sha256="0pnq4dc364dr6wjvim5dav8399k2vwq0i7zfbjq70r8hk6d59c53"; depends=[abind ade4 doParallel Matrix reshape2 scales]; }; + flowMatch = derive2 { name="flowMatch"; version="1.10.0"; sha256="11r1x2aicbgj5sbyinwzniv463yrpvxlm36agmspgjnq4ir1p3m7"; depends=[Biobase flowCore Rcpp]; }; + flowMeans = derive2 { name="flowMeans"; version="1.34.0"; sha256="1jqci86yi0q5qvzhj9448gvv587kgkbx79r90957bwzj6z5nlj2z"; depends=[Biobase feature flowCore rrcov]; }; + flowMerge = derive2 { name="flowMerge"; version="2.22.0"; sha256="07x5im2m98nszcaw4ip6l3pnd6j6nrc17amnnpxqpnbpm73hfsz6"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; }; + flowPeaks = derive2 { name="flowPeaks"; version="1.18.0"; sha256="1211wcypqjwdv2w4pyzkmjg2c0yz18r5i4mdj114lbia6v1p1jza"; depends=[]; }; + flowPloidy = derive2 { name="flowPloidy"; version="1.0.0"; sha256="189al2wzpr1f7haihifyfzvd42sj6nk6f305ny5v9lcr4afp3538"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; }; + flowPlots = derive2 { name="flowPlots"; version="1.22.0"; sha256="0wskj8nfi0zd7rmx0spz8l2h8xzw4qpm9qnxv7s4cq3s8spknbmp"; depends=[]; }; + flowQ = derive2 { name="flowQ"; version="1.34.0"; sha256="0ax0m6dzfhnr0n0qnhxlhq58vrxy583c9aznczldx808xf2krx8x"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; }; + flowQB = derive2 { name="flowQB"; version="2.2.0"; sha256="11kwv1nwzvpfppla5n3zsz64hljlrjblbcgd04hfzzqbck5d9c7w"; depends=[extremevalues flowCore]; }; + flowStats = derive2 { name="flowStats"; version="3.32.0"; sha256="104yp7agkvr7p8ywmrqh8xy1anrvrnnwwl34pw68bl50p7dcb5qp"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS ncdfFlow]; }; + flowTrans = derive2 { name="flowTrans"; version="1.26.0"; sha256="11h6rs6844mv5wjkr9l5hlmfv2nkwzrhg80l773mx2yllzqq84vg"; depends=[flowClust flowCore flowViz]; }; + flowType = derive2 { name="flowType"; version="2.12.0"; sha256="1ghbxlfpc9l1cg54b898rh3p79dldhpza4qynyx2q3b0yc4hanil"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; }; + flowUtils = derive2 { name="flowUtils"; version="1.38.0"; sha256="0rs62hbfzgb2mva7irjmnqcccn2zp3cn1177ji6faszkzsnmmz0i"; depends=[Biobase corpcor flowCore graph RUnit XML]; }; + flowVS = derive2 { name="flowVS"; version="1.6.0"; sha256="1ivsyqrxg4xg67jgmn9rm9pmmr751bpfxqsgpx8m8cw8ywxbvm3m"; depends=[flowCore flowStats flowViz]; }; + flowViz = derive2 { name="flowViz"; version="1.38.0"; sha256="1jrn6j2i1i6hiw4xc7s271rixz1qi4nr9awyx1dv48fnp5bhz2dd"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; + flowWorkspace = derive2 { name="flowWorkspace"; version="3.20.5"; sha256="17yd6hhlmagpasp3cksza1v8g62kkl1nw8rh0jif8sxz6hlsh7jd"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz scales stringr XML]; }; + flowcatchR = derive2 { name="flowcatchR"; version="1.8.0"; sha256="0mzjva3vyf7xcgcr62aiy547p2ga9kv2543bwjd3f7y6ankz7cnn"; depends=[abind BiocParallel colorRamps EBImage rgl]; }; + fmcsR = derive2 { name="fmcsR"; version="1.16.0"; sha256="05k8c8vhdq6lqgrmc8r7dqwixindwpn32hp2a52vkqny8gn9fvbg"; depends=[BiocGenerics ChemmineR RUnit]; }; + focalCall = derive2 { name="focalCall"; version="1.8.0"; sha256="088453sxnlz76iz6fkardi3pb3z033pi4x9na6gn85sxpa53byqf"; depends=[CGHcall]; }; + frma = derive2 { name="frma"; version="1.26.0"; sha256="1q6hfmdh1m9nifz593i70x58q877lkyx55yigw095f2pgr7ikqg5"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; }; + frmaTools = derive2 { name="frmaTools"; version="1.26.0"; sha256="1vjdci710y9zzbnhfc1yp48bzvnzp2lrl6q6gqxc64m4xh4s0fs0"; depends=[affy Biobase DBI preprocessCore]; }; + gCMAP = derive2 { name="gCMAP"; version="1.18.0"; sha256="1s4zdhwxpwv8ddp3914syrbmpfhryvaq2lqiyal4nhhp5nklbmlj"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; }; + gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.14.0"; sha256="1wdfj1qf8d80qxj17ji863gripdxdzcldfw5s6z7jblirabsxp7j"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; }; + gCrisprTools = derive2 { name="gCrisprTools"; version="1.0.0"; sha256="1zqxj566hzmd1yfjrc0nfvd1djsf2vpj1jcx25c85ssssbh3if2f"; depends=[Biobase BiocParallel ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; }; + gQTLBase = derive2 { name="gQTLBase"; version="1.6.0"; sha256="07fas0d1ybpk9h8qf4hdhnh0gq9ip9xc4hfaxsdnk65xy2p4dvhc"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; + gQTLstats = derive2 { name="gQTLstats"; version="1.6.0"; sha256="0lpnn8992dy7bavsyym3m361sgyra54p8wz0xg25f0d4dw5bg4sq"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggplot2 gQTLBase IRanges limma mgcv reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; }; + gaga = derive2 { name="gaga"; version="2.20.0"; sha256="1jnbmirwxnwdyvx76gqrz4y8rx5g9llnnbz06sqjkigprians1lw"; depends=[Biobase coda EBarrays mgcv]; }; + gage = derive2 { name="gage"; version="2.24.0"; sha256="05kdc8pqjwhi9pl0pwm4rkisrdlkkrhnj0iwwya5vakgvh3bw42d"; depends=[AnnotationDbi graph KEGGREST]; }; + gaggle = derive2 { name="gaggle"; version="1.42.0"; sha256="1a04mzcamgw1k1s0s2n9myv9mj84lrb4mvlircnmpy6a7ag5d3lb"; depends=[graph rJava RUnit]; }; + gaia = derive2 { name="gaia"; version="2.18.0"; sha256="10wi2i8yqrcxjs7vp2dywrj4fqvgd3sd238bvy7kj5kvr24ajfd1"; depends=[]; }; + garfield = derive2 { name="garfield"; version="1.2.0"; sha256="09ijwqxmwq3432bkx4zi0c8h93nj3jd4jqyz5lm65hjn2slmwbfl"; depends=[]; }; + gaucho = derive2 { name="gaucho"; version="1.10.0"; sha256="13wavb2l3bdkd3yjsd9v53wfmylq7y19q70ybncyd6qr05mzqj07"; depends=[GA graph heatmap_plus png Rgraphviz]; }; + gcatest = derive2 { name="gcatest"; version="1.4.0"; sha256="0b365k1a8yrqnxrrm8iclgg06h1mcrbl6kfkj2rzsajg4ahx9gly"; depends=[lfa]; }; + gcrma = derive2 { name="gcrma"; version="2.46.0"; sha256="0yr1wcf32ihjpkb4swnnf933i0sbniyjswsvx9ly4z1dv8yigjji"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; }; + gdsfmt = derive2 { name="gdsfmt"; version="1.10.1"; sha256="1mn7ircm2i9bfmxprbl2rdvwazngnv1jxdxpcdknl5c66j5lhzap"; depends=[]; }; + geNetClassifier = derive2 { name="geNetClassifier"; version="1.14.0"; sha256="1z3j12y97n8bc8nc9gjfs1bbmjbbwgkwfp7g14g11p3qfhlsjyzn"; depends=[Biobase e1071 EBarrays minet]; }; + geecc = derive2 { name="geecc"; version="1.8.0"; sha256="0yhi0a2141q93dxr26wr44724yyfh9bykr7swllql036nkdpfhvv"; depends=[gplots hypergea MASS Rcpp]; }; + genArise = derive2 { name="genArise"; version="1.50.0"; sha256="1f8ic85955v866sqc02b5m2rk8agws80w2rv7g4j7kk5ssffrv0r"; depends=[locfit tkrplot xtable]; }; + genbankr = derive2 { name="genbankr"; version="1.2.1"; sha256="1pcn4asxxzark6w5a188as3h5klwb6yj5varrf9lm6qdrhmdwimy"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; }; + geneAttribution = derive2 { name="geneAttribution"; version="1.0.1"; sha256="15vbi1fax2jwbh5j82vv3qlzhkscwd9qm3ls51rgbir72m915x3a"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; }; + geneRecommender = derive2 { name="geneRecommender"; version="1.46.0"; sha256="1ddj9w6jdbcxnzw22q8qjg6b0pydcin51h3n7l7crwa0d8wvmg6j"; depends=[Biobase]; }; + geneRxCluster = derive2 { name="geneRxCluster"; version="1.10.0"; sha256="18h5a9yb6h7lhz4yija3vx7ca8x4mvlji659kqzy7a7prm9yqi2w"; depends=[GenomicRanges IRanges]; }; + geneXtendeR = derive2 { name="geneXtendeR"; version="1.0.0"; sha256="104mn7rgsakc89gz3phsp00ijcw99zxbyd2q96s5ikz1c4pnf6bl"; depends=[data_table dplyr rtracklayer]; }; + genefilter = derive2 { name="genefilter"; version="1.56.0"; sha256="1vzgciqd09csqcw9qync8blsv51ylrd86a65iadgyy6j26g01fwd"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; }; + genefu = derive2 { name="genefu"; version="2.6.0"; sha256="0gh6n4k1b0f57w2lb1kjwymh5x8iirvrmhqlq46yybfs4928h147"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; }; + geneplast = derive2 { name="geneplast"; version="1.0.0"; sha256="0sxvdnw4kdr2bikibhaf538qq5adr2cv4warbpmi28wjiyzs7jy1"; depends=[ape snow]; }; + geneplotter = derive2 { name="geneplotter"; version="1.52.0"; sha256="1p6yvxi243irhjxwm97hp73abhwampj0myyf8z00ij166674pc7h"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; + genoCN = derive2 { name="genoCN"; version="1.26.0"; sha256="0v0sg2h9f3dqwydfvydbpjw37xzl2yn26244nyq8rzb1g5p30l6l"; depends=[]; }; + genomation = derive2 { name="genomation"; version="1.6.0"; sha256="1m4mz7wihj8yqivwkzw68div8ybk4rjsai3ffki7xp7sh21ax03y"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rhtslib Rsamtools rtracklayer RUnit S4Vectors seqPattern]; }; + genomeIntervals = derive2 { name="genomeIntervals"; version="1.30.1"; sha256="0kglh50x76b4n0r6cfjk63bja1d1mdf5m14k7n6jjg6glprys3j5"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; }; + genomes = derive2 { name="genomes"; version="3.4.0"; sha256="160279nd3iybpn6v1da9yr248fac865hg0dmxq32mbdhmp591xjy"; depends=[curl readr]; }; + genoset = derive2 { name="genoset"; version="1.30.0"; sha256="08vyiyipcnrw3r8cyk4yzynzby8gy5mn8v16s582wzc37kdj46yz"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; + genotypeeval = derive2 { name="genotypeeval"; version="1.4.0"; sha256="057b36rjfcg45irl80c4rkiq2bkjyczdxvph6wyn6nfl657ki5k2"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; }; + genphen = derive2 { name="genphen"; version="1.2.0"; sha256="1czigszpqrvqqyrgn8jhifqq31i7qkbm7gq2i9h9x11qr0l421p2"; depends=[Biostrings e1071 effsize ggplot2 randomForest rjags]; }; + gespeR = derive2 { name="gespeR"; version="1.6.1"; sha256="1kk0c2hvvq1rbmkagnxsx03nd9jjnh3yci92fgb3y9vqa4gfps3n"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; + ggbio = derive2 { name="ggbio"; version="1.22.4"; sha256="1kjhxhhinl5h3h3yyb1miwy4kzngmdi418awvdiimrnj3412vvrg"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + ggcyto = derive2 { name="ggcyto"; version="1.2.3"; sha256="03cb9zhpchg6ymyvp3gbma35sk81a3f7x3brkriwig74vv9x1hw5"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; }; + ggtree = derive2 { name="ggtree"; version="1.6.11"; sha256="0lh6wj4bkmad2wrv6lpxz0qprhwxava6w8v0y6l3930026wj01q4"; depends=[ape ggplot2 jsonlite magrittr tidyr]; }; + girafe = derive2 { name="girafe"; version="1.26.0"; sha256="07d0j8px5zrb07agpsvhl5v1d2hdcavcqg0q57hs2jk4ysl98way"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; + globalSeq = derive2 { name="globalSeq"; version="1.2.0"; sha256="1laz11w4haiq4j754krcy3hlca2rmgwgcsy4vlc89lmfrc68pfmk"; depends=[]; }; + globaltest = derive2 { name="globaltest"; version="5.28.0"; sha256="0vxwhk6c2sxy46v7amnsgvgq4yy77z5mifb917649r0q4n3jaaaw"; depends=[annotate AnnotationDbi Biobase survival]; }; + gmapR = derive2 { name="gmapR"; version="1.16.0"; sha256="1afxlz1z6khc16ab62chnfzkm9y0vdfrfnmkdhrsqwr68lf3dh9d"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + goProfiles = derive2 { name="goProfiles"; version="1.36.0"; sha256="1imwqla70j643w7h25da0f0c52szqk81z4g8vwpdpriq512d9gm9"; depends=[AnnotationDbi Biobase GO_db]; }; + goTools = derive2 { name="goTools"; version="1.48.0"; sha256="171picf9ic0z1lbpmyy8dkvglq75dnpzj39yzxkkinkbyzlnfhm2"; depends=[AnnotationDbi GO_db]; }; + goseq = derive2 { name="goseq"; version="1.26.0"; sha256="1xay2ay8whwsvy10wss07svc638gg4ks1qayskplvrwxkp2kg2p8"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; }; + gpls = derive2 { name="gpls"; version="1.46.0"; sha256="1y12zzkf7knc1j8xh3kqax3jzlllwb8hyfqjnxxailad3gbxwc1x"; depends=[]; }; + gprege = derive2 { name="gprege"; version="1.18.0"; sha256="1gjcgy0bw87rgh3j8pq3940l7g6zzmwnzvkrrfviizny0p8ynxgn"; depends=[gptk]; }; + graph = derive2 { name="graph"; version="1.52.0"; sha256="0g3dk5vsdp489fmyg8mifczmzgqrjlakkkr8i96dj15gghp3l135"; depends=[BiocGenerics]; }; + graphite = derive2 { name="graphite"; version="1.20.1"; sha256="1lkknnjac5m5wvkvbz02548q16h6c5jhzhi410vr4lfzcz7v201a"; depends=[AnnotationDbi graph rappdirs]; }; + groHMM = derive2 { name="groHMM"; version="1.8.0"; sha256="0d91nyhqbi5hv3mgmr2z0g29wg2md26g0hyv5mgapmz20cd9zi4y"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; }; + gtrellis = derive2 { name="gtrellis"; version="1.6.0"; sha256="09hds0dcs7w94gl7zm5w94kxzv09dsggn8wqibhx3a0m4h515wz7"; depends=[circlize GenomicRanges GetoptLong IRanges]; }; + gwascat = derive2 { name="gwascat"; version="2.6.0"; sha256="11y1knppdqcnj4w0hs33g2kcpx4sy8anb2y7kjgjxrpj4wvzinz9"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; }; + h5vc = derive2 { name="h5vc"; version="2.8.1"; sha256="1c4scm9z1ckmp5cdc979a44vryraqq60bzgsn329aq92r0rpd4y2"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; }; + hapFabia = derive2 { name="hapFabia"; version="1.16.1"; sha256="0j0iip9mdvksb2y83891mplmh18ajhpi6jmgrszp2kjjh3sfwicj"; depends=[Biobase fabia]; }; + hiAnnotator = derive2 { name="hiAnnotator"; version="1.8.0"; sha256="0v0js3wkcw5dlg01g5xgj0m0rzxg86y9mxxw72jy6vr8j78wkzci"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; }; + hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.10.0"; sha256="0krgb5139fl425vyz13vyzr1kiv06nysk511h4yiif4r4ggharif"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl rSFFreader sonicLength]; }; + hierGWAS = derive2 { name="hierGWAS"; version="1.4.0"; sha256="0gahm81v1gcwph2xm0p3il1pc3wp28z3ik8l0c8mvwwd3kn69cdw"; depends=[fastcluster fmsb glmnet]; }; + hopach = derive2 { name="hopach"; version="2.34.0"; sha256="01rxryijz762bcf4dzha0rfmf263svy86aq7a8zxmampb39k5a62"; depends=[Biobase BiocGenerics cluster]; }; + hpar = derive2 { name="hpar"; version="1.16.0"; sha256="19qx0abwmn7yl7ix6wad912d3xwvmrw13idvrrfwhwj481w7b2xw"; depends=[]; }; + htSeqTools = derive2 { name="htSeqTools"; version="1.22.0"; sha256="1g0a3fmywcrsv7p2lv7r22hfvv3mbhl43yl71bp84v53r7pb95vw"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; }; + hyperdraw = derive2 { name="hyperdraw"; version="1.26.0"; sha256="1jvj19fq24fpj10i2gjvrb9vmf5b4wdz5xcbifkgkbwf8pb4jcci"; depends=[graph hypergraph Rgraphviz]; }; + hypergraph = derive2 { name="hypergraph"; version="1.46.0"; sha256="0g0hk5ykbxa0kmpmlmrw8qvvkxk8hhh1jcvx0hcbqkjmld1sgfkg"; depends=[graph]; }; + iASeq = derive2 { name="iASeq"; version="1.18.0"; sha256="16ranqshbcfmik400gwycv37h3azhksrh1hkv9s3s8kii1aydzrq"; depends=[]; }; + iBBiG = derive2 { name="iBBiG"; version="1.18.0"; sha256="1sz6yw0n6j8gz0rwwfinckgkcrynr6zp10vlwpfkrksnpwc2qw7i"; depends=[ade4 biclust xtable]; }; + iBMQ = derive2 { name="iBMQ"; version="1.14.0"; sha256="1g2lf38z2j5n922k7a7q5c04jz1nncyjxy7aiic305lnjmdhh91h"; depends=[Biobase ggplot2]; }; + iCARE = derive2 { name="iCARE"; version="1.2.0"; sha256="1yq1kp0jzf8jiwf7l8chn4lmvlzfhfwc78ivdlqydrl2xarvb725"; depends=[]; }; + iCOBRA = derive2 { name="iCOBRA"; version="1.2.0"; sha256="1nvfp09j3n689szrjlvnjhbp7bpma6b00mpkffvadcprgalb1j63"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; }; + iCheck = derive2 { name="iCheck"; version="1.4.0"; sha256="1vara7v0811n6d3h9b3xwbw8hd8jlxkr7mb920m5v5l86rnd798y"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; }; + iChip = derive2 { name="iChip"; version="1.28.0"; sha256="00scfxyklyzpmd7yqpzh1xbq9d6drngczkvhmzklvnwcwxicw6sg"; depends=[limma]; }; + iClusterPlus = derive2 { name="iClusterPlus"; version="1.10.0"; sha256="1qjr1d53xq4ad9d1fqx8cg0wf0br19ga1a7m7yrjmqxnjf82kfcc"; depends=[]; }; + iGC = derive2 { name="iGC"; version="1.4.0"; sha256="1zw9lqwvnmvgj2xvq6dhi7vs1lklkfpmhxf99hqbbr6km30gjq6a"; depends=[data_table plyr]; }; + iPAC = derive2 { name="iPAC"; version="1.18.0"; sha256="1m6c1ka7yx6ish9cw3kl683dp9zn3nbr4ii49b09lzjvxq6n2cbi"; depends=[Biostrings gdata multtest scatterplot3d]; }; + iSeq = derive2 { name="iSeq"; version="1.26.0"; sha256="07ri9w8i57jigfs7zlz35k6qcin5pipv7c4w9k7nxlrm43n6s7nd"; depends=[]; }; + ibh = derive2 { name="ibh"; version="1.22.0"; sha256="0k2pncvjc8zr4xxb4yqiphc8a02hsl2r2j6mflhzs7iw61z8rq4q"; depends=[simpIntLists]; }; + idiogram = derive2 { name="idiogram"; version="1.50.0"; sha256="13jhq6bd938rsyqfl3qjzryqx9pv6z2k7bya8r0vrjrzcssnasyh"; depends=[annotate Biobase plotrix]; }; + illuminaio = derive2 { name="illuminaio"; version="0.16.0"; sha256="0ysvblxbk3hdnd70l31f2qzg3qsrpdyix395zhqjz5hmviyy91q7"; depends=[base64]; }; + imageHTS = derive2 { name="imageHTS"; version="1.24.0"; sha256="0c5szadgyz53r9cj14gc5r1s3wkv68pi66dlg9gnnpqyfcfpsd8y"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; + immunoClust = derive2 { name="immunoClust"; version="1.6.0"; sha256="0nmgvwccfnzpfd6x6x52qgxqi56348ljpdwhylflxbd1f4szqr58"; depends=[flowCore lattice]; }; + impute = derive2 { name="impute"; version="1.48.0"; sha256="1164zvnikbjd0ybdn9xwn520rlmdjd824vmhnl83zgv3v9lzp9bm"; depends=[]; }; + intansv = derive2 { name="intansv"; version="1.12.0"; sha256="0djcb8yzrppbawp5dvf45cj8j3g9z95kifzyk3ndz48vr62ksaav"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; }; + interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.12.0"; sha256="1psai99wp2d4hchfm2m7bmy9hxwz0kfl1mc9xgq57k5vq8bdq7gc"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; }; + interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.12.0"; sha256="1gxa1sc2sk7xvxc4p74cwjkxdk3ns7igl51jg7a7086k729k3m8j"; depends=[BiocGenerics shiny]; }; + inveRsion = derive2 { name="inveRsion"; version="1.22.0"; sha256="1f35l6gnvs5kz0v4d2dhq6mdpkvknhzadzka2m0jdhhpdk1vqkq3"; depends=[haplo_stats]; }; + iontree = derive2 { name="iontree"; version="1.20.0"; sha256="1kvj73vzgrszvyyb0xlvc46ba58pznsczhxj8mxd6pp2sa3pjgbh"; depends=[rJava RSQLite XML]; }; + isobar = derive2 { name="isobar"; version="1.20.0"; sha256="171a3jphxwx7n9kw77c1wng6fbv1fm5qxlwxz8n8fbnr6z4n0k2b"; depends=[Biobase biomaRt distr ggplot2 plyr]; }; + isomiRs = derive2 { name="isomiRs"; version="1.2.0"; sha256="1dgbb9nlsjbjp06wsjnzml7laqi2353xk2pwi0kqhd6yqhrkcagz"; depends=[BiocGenerics DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges plyr RColorBrewer readr reshape S4Vectors SummarizedExperiment tidyr]; }; + iterativeBMA = derive2 { name="iterativeBMA"; version="1.32.0"; sha256="1pkq48a8hsalfi9w1dcyzskbwzg1ba4dw5z3y11yb9fzxh9f5y7l"; depends=[Biobase BMA leaps]; }; + iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.32.0"; sha256="112wv08b4c3qgfd7w3a61zi1nk2va5b7ip9ayfknvj15kzrxsy9j"; depends=[BMA leaps survival]; }; + joda = derive2 { name="joda"; version="1.22.0"; sha256="1f2a8jn9pvi1p3x9fvj78sxl5mvar0lss4zxpivqm376sz3h71hg"; depends=[bgmm RBGL]; }; + kebabs = derive2 { name="kebabs"; version="1.8.1"; sha256="086a7z992wrj73k7zrkxk9zcz37r8bbnrdqhf4b3jvd0cwck7vib"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; + keggorthology = derive2 { name="keggorthology"; version="2.26.0"; sha256="0r01hz6sra2h3irjy268y24hz0yzjzcdp8wxrj5qv103fahghjk1"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; + kimod = derive2 { name="kimod"; version="1.2.0"; sha256="1bylbi4pwk4khhgx7ffi2sa1vqvffkmzd2c09n0pws03gpjm77ic"; depends=[Biobase cluster]; }; + lapmix = derive2 { name="lapmix"; version="1.40.0"; sha256="1mgabcribl4jgm35ypy5rkmigzsq3vxk71i2j2jsvil48fwwpmw9"; depends=[Biobase]; }; + ldblock = derive2 { name="ldblock"; version="1.4.0"; sha256="090f1yf30mklvq1kgqq28dsr4qy1zv4b1jp0c8m4a46115d7f57x"; depends=[Matrix snpStats]; }; + les = derive2 { name="les"; version="1.24.0"; sha256="0736ymhiq4a6aq6439nigs475x08sw3msl4jzg5g594lbs3nxklb"; depends=[boot fdrtool gplots RColorBrewer]; }; + lfa = derive2 { name="lfa"; version="1.4.0"; sha256="1awfqd3pmzkljn19fvflxp5q8ilncamcl3hx7ns7d4r9r98d9a3s"; depends=[corpcor]; }; + limma = derive2 { name="limma"; version="3.30.13"; sha256="1ji8kb19anwq2505zii2kzqlrnk75mk1mpz8vy4s1mckzs1cz4m0"; depends=[]; }; + limmaGUI = derive2 { name="limmaGUI"; version="1.50.0"; sha256="19jiqpkqcchbrsqac9l8a9zrcn37qc02586kr1n8c9fayhr91iby"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; }; + lmdme = derive2 { name="lmdme"; version="1.16.0"; sha256="033j6pz45wf9xzgjz25s9y7jyfc92srmispsy4m1apyb22gjazgs"; depends=[limma pls stemHypoxia]; }; + logicFS = derive2 { name="logicFS"; version="1.44.0"; sha256="0j7qwgxdqq2m1ffdp78xg875xi2drlv9im8mzjc9m9mxv45fmala"; depends=[LogicReg mcbiopi]; }; + logitT = derive2 { name="logitT"; version="1.32.0"; sha256="17r5zbf5lv13rcjlv6vw1qvqk7ha8gbqbcb957jvcdncjh1rrv72"; depends=[affy]; }; + lol = derive2 { name="lol"; version="1.22.0"; sha256="15q0kz4xhzj75qa3qsg2fck9w9c1s0n87dlasim35i89y56kyzki"; depends=[Matrix penalized]; }; + lpNet = derive2 { name="lpNet"; version="2.6.0"; sha256="1bfw7xp0dbx9kdg59x5jcwjwf8bjdqky6hvcpn2q4l9p6g9h72nn"; depends=[lpSolve nem]; }; + lpsymphony = derive2 { name="lpsymphony"; version="1.2.0"; sha256="142jynr4fs70zwc3plm4wcjki6sb3ampmy6wp1cxpb92jmdavc9y"; depends=[]; }; + lumi = derive2 { name="lumi"; version="2.26.4"; sha256="0k8d3xc1k53j0mlyy69j6dfkx9rkc305vnp72jk2k6b071ian1xw"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; }; + mAPKL = derive2 { name="mAPKL"; version="1.6.0"; sha256="0664mnmw5v6ifkrq61z4b3m3rw10133awds70h7m074qdkwl89ad"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; }; + mBPCR = derive2 { name="mBPCR"; version="1.28.0"; sha256="1r3jv0a9xn564lmszcigpqqgfhckyjwbzzmxi632wj98cn7qj4f0"; depends=[Biobase oligoClasses SNPchip]; }; + mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.8.0"; sha256="1a1v2wylv14rz96qwqrshkf63ll54bx7h6g3y6d9fy1qdfgncwgq"; depends=[GenABEL MASS outliers qtl]; }; + maCorrPlot = derive2 { name="maCorrPlot"; version="1.44.0"; sha256="11i2ri10gwmd6c9852z24v24f7hwcj378lmzxynrxqhz7825s1jr"; depends=[lattice]; }; + maPredictDSC = derive2 { name="maPredictDSC"; version="1.12.0"; sha256="0rf092xaw7jw1i0p57d725x4g0827yvgl29cj6qix92ssv3fjm92"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; }; + maSigPro = derive2 { name="maSigPro"; version="1.46.0"; sha256="0i2p236ysmhvmpbs4zc1rsxgd9z2c1633kxljsnyq7wqrkf4hx7i"; depends=[Biobase MASS mclust venn]; }; + maanova = derive2 { name="maanova"; version="1.44.0"; sha256="094zbqwj97da540z03yxprdla3fbwwhcylpg3g92p4crnp7laaym"; depends=[Biobase]; }; + macat = derive2 { name="macat"; version="1.48.0"; sha256="1jwqq6x9nrjyl60vpnraa4n4hp3rqqr794yh6372bqjk4ini0pph"; depends=[annotate Biobase]; }; + made4 = derive2 { name="made4"; version="1.48.0"; sha256="1rmgyns0xvm6v7svlzbpkinc66cg0zr2h2lwsv4xnnva4zs5w8ns"; depends=[ade4 gplots RColorBrewer scatterplot3d]; }; + maftools = derive2 { name="maftools"; version="1.0.55"; sha256="1wyapzh1zzqs0v725k24wlzfwkx0ap8dd2pxaqaxbmk6pg70vn3d"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table DPpackage ggplot2 ggrepel mclust NMF RColorBrewer rjson Rsamtools VariantAnnotation wordcloud]; }; + maigesPack = derive2 { name="maigesPack"; version="1.38.0"; sha256="1g6my6nabm810q34cgrlmgdnvn93g968a7jyymgh8rs3gpj9gzgv"; depends=[convert graph limma marray]; }; + makecdfenv = derive2 { name="makecdfenv"; version="1.50.0"; sha256="0bkkpsq5mgnkbygp3f0rvzxnmbrbd9isfbdfgq8q4ch4hwsfba28"; depends=[affy affyio Biobase zlibbioc]; }; + manta = derive2 { name="manta"; version="1.20.0"; sha256="1gpvjmkf14jh7z5h96ixin783xaiznag1n0lp01iarz0412jvb86"; depends=[caroline edgeR Hmisc]; }; + marray = derive2 { name="marray"; version="1.52.0"; sha256="1d242pjas4vqqcgj2cb3p66n1n9va3bqph62nyg0kr95fy2y7nf7"; depends=[limma]; }; + maskBAD = derive2 { name="maskBAD"; version="1.18.0"; sha256="0y932wzga1crd0xrfjdap0pnji2fkaqfx68s016apx1x78k755ig"; depends=[affy gcrma]; }; + massiR = derive2 { name="massiR"; version="1.10.0"; sha256="0qnn4cpb0xa49cxaaf7a2i87m5np1hqa6wcsxslbmvvrfik8j11b"; depends=[Biobase cluster diptest gplots]; }; + matchBox = derive2 { name="matchBox"; version="1.16.0"; sha256="1pz8k1ygi59h4x2ykmvzqnwv44nryhqwpb3i4wg2bgm04nvd1kcz"; depends=[]; }; + matter = derive2 { name="matter"; version="1.0.1"; sha256="1yh2lgv1dw4cf62iy5il095v6zsa64dhdrpzn31b8aw4p5y7g2hw"; depends=[biglm BiocGenerics irlba S4Vectors]; }; + mcaGUI = derive2 { name="mcaGUI"; version="1.22.0"; sha256="0jmsf9vdv6nzqrzgmfgqvfgar9d1ziqp1qvj85pgsi1200n91rna"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; }; + mdgsa = derive2 { name="mdgsa"; version="1.6.0"; sha256="0r1zs60922pzf7n9z1sxx7599rmq4mas0frm1931a2r9rf78dwdw"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; }; + mdqc = derive2 { name="mdqc"; version="1.36.0"; sha256="0fva73csci63xd4kp3nr2j3gllkkwfvp9dd0b581mfgkfa2p3khm"; depends=[cluster MASS]; }; + meshes = derive2 { name="meshes"; version="1.0.0"; sha256="0abqbsai946lm3dj7759q6crad3xj6919vgmnm5416sjnmfvk0v2"; depends=[AnnotationDbi DOSE GOSemSim MeSH_db]; }; + meshr = derive2 { name="meshr"; version="1.10.0"; sha256="170mpx0z9h4lxkl7b159nrbjl4vc2bdz92vfc6piwb3pmggg2r8r"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; }; + messina = derive2 { name="messina"; version="1.10.0"; sha256="1q3ikcq5pxbiahycbxgviry820p8498q2nh5wbdw5aq26cv00nak"; depends=[foreach ggplot2 plyr Rcpp survival]; }; + metaArray = derive2 { name="metaArray"; version="1.52.0"; sha256="0k9msa564981i0dc6fqsrcc3kpv58jjmkibpgn93c6966rxx76j2"; depends=[Biobase MergeMaid]; }; + metaCCA = derive2 { name="metaCCA"; version="1.2.0"; sha256="1d57h6a2idc5zrr8kn851b8ny2rsy1yhalrz5lch9xzl7ly5n5jc"; depends=[]; }; + metaMS = derive2 { name="metaMS"; version="1.10.0"; sha256="0f09cagf82by2wzb6gsi2wapwrgdymyhg37jnfalb00v0xhzzwwq"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; }; + metaSeq = derive2 { name="metaSeq"; version="1.14.0"; sha256="1jm79gd1wnyrcv8cj6ymiwj5g0b4r5p7l193zfh7v2y32ki0khq8"; depends=[NOISeq Rcpp snow]; }; + metabomxtr = derive2 { name="metabomxtr"; version="1.8.0"; sha256="1blxfg4ciad5rq1lxxj6i9hw1y7ljd60hqgp46hb2bdr97p4xq1r"; depends=[Biobase Formula multtest optimx plyr]; }; + metagene = derive2 { name="metagene"; version="2.6.1"; sha256="0zynw4bmid9m4n2v2vxy1ybbxgag7dhhf3vsipvxwn9dxfn28ls2"; depends=[BiocParallel DBChIP GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges matrixStats muStat R6 Rsamtools rtracklayer]; }; + metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.4.0"; sha256="0sfh1zm2vkkw6gy4lkl21p33h530mff190mymf5ymj31g6ql44ag"; depends=[ape Biobase Biostrings dplyr lattice lazyeval magrittr metagenomeSeq purrr RSQLite ShortRead stringr]; }; + metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.16.0"; sha256="14q96wsya19zv0ag06s9sqjq9azrh81kfim88aqvw8mp0vvc8k0x"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; }; + metahdep = derive2 { name="metahdep"; version="1.32.0"; sha256="0qnimqg6zj2hq5a9ak39z3bv9da48k1191267rdbfn5rza910hwh"; depends=[]; }; + metaseqR = derive2 { name="metaseqR"; version="1.14.0"; sha256="1h5gg9dzn91si1ir2xbv8fsf9wdih8wxl01q83279x56ghf1sy8y"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; }; + methVisual = derive2 { name="methVisual"; version="1.26.0"; sha256="1dkknkr6z10i2ljfmgjb4sxn9vv46g26cf9nc7s47rbxbycjvlqw"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; }; + methyAnalysis = derive2 { name="methyAnalysis"; version="1.16.1"; sha256="0rhjn2ql3c5m6ayj5mmgs8fb348nbxdsn2717x44a7aj3zamn9py"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; }; + methylKit = derive2 { name="methylKit"; version="1.0.0"; sha256="1fxyarvz0vi4wbki70gqb1nwrmz6m7kgsvqh1am4j8m46qzv1h9a"; depends=[data_table emdbook fastseg GenomeInfoDb GenomicRanges gtools IRanges KernSmooth limma mclust qvalue R_utils Rcpp Rhtslib Rsamtools rtracklayer S4Vectors zlibbioc]; }; + methylMnM = derive2 { name="methylMnM"; version="1.12.0"; sha256="15669zficwabd3wdl3b24q3hal7d587k5lzg8s6sr3f3f9w2lyqf"; depends=[edgeR statmod]; }; + methylPipe = derive2 { name="methylPipe"; version="1.8.0"; sha256="1mfgxz43vxksvmwywh65q5v9jlcs5a43rb9w8zvjfgpg0zg8l46l"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; + methylumi = derive2 { name="methylumi"; version="2.20.0"; sha256="02p1wwgz7w7qvsn08mw4ffrqwsi0kkahs7sdlm6ll0r7q3z03pkk"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; + mgsa = derive2 { name="mgsa"; version="1.22.0"; sha256="1iwlqjs70hcgcr3m1k93xkl7xbqc9gw7k5ik9j9yhzsd7s8zxvpi"; depends=[gplots]; }; + miRLAB = derive2 { name="miRLAB"; version="1.4.0"; sha256="0lgkm4arfc37z11ilfc0wp8m4zm1dpigr01757r82ksaxc2iqv54"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; }; + miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.2.0"; sha256="0y4dmd6mlwyhi9k4nqfzg5x71k3x08cg0n4j0zrdqf5dby68yc3m"; depends=[AnnotationDbi DBI miRBaseVersions_db]; }; + miRNApath = derive2 { name="miRNApath"; version="1.34.0"; sha256="01yb8n3i5jkpmy5ksq8lrllaspdc6lyixz7zzndzrwrk0gibph3b"; depends=[]; }; + miRNAtap = derive2 { name="miRNAtap"; version="1.8.0"; sha256="0ap5c02m7j8mvvkxcw1mkxkwx7n8cslam1q4kj93pfpnn9bk2ll1"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; }; + miRcomp = derive2 { name="miRcomp"; version="1.4.0"; sha256="0j07g3cvazxafvi3m0vp4rscivxydihdjkjy0fzqaxbgin2p35gj"; depends=[Biobase KernSmooth miRcompData]; }; + microRNA = derive2 { name="microRNA"; version="1.32.0"; sha256="0yyldx2icbr36m6n0kf1f156ixm0hbjnyzrw535d36sxhy1pplpb"; depends=[Biostrings]; }; + minet = derive2 { name="minet"; version="3.32.0"; sha256="1qk2xr88d7hc3ymg23byaqmnx3d2spddzwr81n48hwala8sy7apk"; depends=[infotheo]; }; + minfi = derive2 { name="minfi"; version="1.20.2"; sha256="1dj88a1mv74fp9pv3iqmvqvgvr91mwdwan6qzx0svi4gh5g5hx3n"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter data_table genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; }; + mirIntegrator = derive2 { name="mirIntegrator"; version="1.4.0"; sha256="0iq3223i8hl7jsgbnzz748j253n6rjvxw374g5bk1p4b0n4dcj5v"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; }; + missMethyl = derive2 { name="missMethyl"; version="1.8.0"; sha256="03wy0j8jr855kw87w7l4hd6cbk8n6iamyqnw0z2r9hf4dwd54v5v"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; }; + mitoODE = derive2 { name="mitoODE"; version="1.12.0"; sha256="0jcc4rzc64sadanwgrg48dcsk3ibwsxka53h3wiz3yf8mlzq605a"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; }; + mmnet = derive2 { name="mmnet"; version="1.12.0"; sha256="0fb9g4cizh0zf9gqwasygsc59njj6pffrmr5f0v96fmj3gvgfs1k"; depends=[Biobase flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; }; + mogsa = derive2 { name="mogsa"; version="1.8.0"; sha256="1lw39c31n1k93i9a4rdpw03s3b638yplq8xlv4n6ac4bjy14q6l6"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; + monocle = derive2 { name="monocle"; version="2.2.0"; sha256="05nhkk7n6pz2p5gmr3siwawcbjmhcswqs49xx16ycf7bqj2hbfn7"; depends=[Biobase BiocGenerics cluster combinat DDRTree dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix reshape2 slam stringr VGAM]; }; + mosaics = derive2 { name="mosaics"; version="2.12.0"; sha256="01fvc0qc3fd8pjh6qjf9c1k4z0427gfx2li3jd7xp05nwyfbs68d"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; + motifRG = derive2 { name="motifRG"; version="1.18.0"; sha256="1pa97aj6c5f3gx4bgriw110764dj3m9h104ddi8rv2bpy41yd98d"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; }; + motifStack = derive2 { name="motifStack"; version="1.18.0"; sha256="1h4qw89wqnl0r6drfi26h6jnvpjh5r45qc588g18rplgw3ckjmfz"; depends=[ade4 Biostrings grImport MotIV scales XML]; }; + motifbreakR = derive2 { name="motifbreakR"; version="1.4.0"; sha256="14mgwligzfwlg9asdr125wzg15j1rhg29xsv58r802q6r2prgryy"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; }; + msPurity = derive2 { name="msPurity"; version="1.0.0"; sha256="0az2g69djc9kjzj10wgl0qpyyng6a8hzwa9ppwg66yj8da09x8zl"; depends=[doSNOW fastcluster foreach ggplot2 mzR plyr Rcpp reshape2 sapa stringr]; }; + msa = derive2 { name="msa"; version="1.6.0"; sha256="0i3cx1s5gg24dyik1mclhbpiqhxakc63fiazihdxn4k0bdg8ca9p"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; + msmsEDA = derive2 { name="msmsEDA"; version="1.12.0"; sha256="1l8clsma1rd322dfjr14klx0w5gjgn7fg21m4d4cyayyb44vsf1s"; depends=[gplots MASS MSnbase RColorBrewer]; }; + msmsTests = derive2 { name="msmsTests"; version="1.12.0"; sha256="12amngakmr4h3hl0nbladynn51r2zndcd0kxkm5cyhd90rrzs18i"; depends=[edgeR msmsEDA MSnbase qvalue]; }; + multiClust = derive2 { name="multiClust"; version="1.4.0"; sha256="1g8j8ad61njs1zbc2vrwbzp4lliapamzy9bd0cyhh520b55ziy8q"; depends=[amap cluster ctc dendextend mclust survival]; }; + multiscan = derive2 { name="multiscan"; version="1.34.0"; sha256="12ld46bm58lr95w7v7ynyhl6mw1ws9gbdr7afjdrs7ba4313qa0j"; depends=[Biobase]; }; + multtest = derive2 { name="multtest"; version="2.30.0"; sha256="0q302f3yf9v7mlq2kib7ynq015d5f94jrsk9drkp5vq0z5j0h3sw"; depends=[Biobase BiocGenerics MASS survival]; }; + muscle = derive2 { name="muscle"; version="3.16.0"; sha256="0rkv1gdbpk8sss1nlq19y7p2kba8hy3dh3bx5x1rzn9cn0qn16ig"; depends=[Biostrings]; }; + mvGST = derive2 { name="mvGST"; version="1.8.0"; sha256="19sn5rg3ny1ch5ka8agssn048wgj764cspzzj0pn3vf025qa9pbv"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; }; + mygene = derive2 { name="mygene"; version="1.10.0"; sha256="1qir3d378plqxwkz006vi00qb1zgj2m13sjcaxcclcg59fh1fh9m"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; }; + myvariant = derive2 { name="myvariant"; version="1.4.0"; sha256="0xlxcs0vqlwjqiwlycfznvj8n7sm54m3y287ndijs0461qkm2xil"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; }; + mzID = derive2 { name="mzID"; version="1.12.0"; sha256="1zn896cpfvqp1qmq5c4vcj933hb8rxwb6gkck1wqvr7393rpqy1q"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; }; + mzR = derive2 { name="mzR"; version="2.8.1"; sha256="0ipmhg6l3pf648rdx5g2ha7l5ppd3cja6afxhdw76x8ga3633x0r"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; }; + ncdfFlow = derive2 { name="ncdfFlow"; version="2.20.2"; sha256="0s8gd6wf20zxi8vs1bl1d75rmssgvkrgrndzxn56g8cxdnyg95hl"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo zlibbioc]; }; + nem = derive2 { name="nem"; version="2.48.0"; sha256="00x0hb1h95dh9mg3wj89l3g2fh9hdbqlisylvmlmf7dzngcyn2c3"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; }; + netbenchmark = derive2 { name="netbenchmark"; version="1.6.0"; sha256="1f27n82kzwwqcpx71rv824lj1h9723vf9cjcp1djh6d8jpx6yx3a"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; }; + netbiov = derive2 { name="netbiov"; version="1.8.0"; sha256="1yz9q8s1ls6944rwbmjmk6bzg0d16sxr93sw49vlzjqg1xydfc0x"; depends=[igraph]; }; + nethet = derive2 { name="nethet"; version="1.6.0"; sha256="04kpkff1kvxq060jx1fqg5vjszipzyjlshmr23ybm40lj31nl92k"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; }; + netprioR = derive2 { name="netprioR"; version="1.0.0"; sha256="1ilpjkwnl81rv2xn2k3174jqp9jidm0fn4aajfybz0fbhzxi5r8k"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; }; + netresponse = derive2 { name="netresponse"; version="1.34.0"; sha256="15gq1x7ksmr5slbbdv0cfpk5nkibpq0b6mkpda0f4rg58zq0nsb6"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; }; + networkBMA = derive2 { name="networkBMA"; version="2.12.0"; sha256="1ccs0ardxa7d6b8jlkrnrs2idbf3bg7610zwjdg3p25da1f9gpn0"; depends=[BH BMA Rcpp RcppArmadillo RcppEigen]; }; + nnNorm = derive2 { name="nnNorm"; version="2.38.0"; sha256="1mdgbmdhqc1mjhjjhx8g0x6jy4pzza13f083c7wb9hhh7mi5w5jp"; depends=[marray nnet]; }; + nondetects = derive2 { name="nondetects"; version="2.4.0"; sha256="06jraad50df9kw4sl44qs3km1ba4nfvqkkzf0ghmrs624msyl4xx"; depends=[Biobase HTqPCR limma mvtnorm]; }; + normalize450K = derive2 { name="normalize450K"; version="1.2.0"; sha256="0h9dqm1n7kmaydjxhn9m9gw2kfwr98aa3nil32x32qsx9rsf5yk0"; depends=[Biobase illuminaio quadprog]; }; + normr = derive2 { name="normr"; version="1.0.0"; sha256="0ad2nbyngpigx7gy9nnpifjcz33bd8vkpggjl80vp5w4swj9vkrp"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; }; + npGSEA = derive2 { name="npGSEA"; version="1.10.0"; sha256="1w4v4b53rdg4g8zw8hbcvw3z2x7i3f4kn9i68ql7f9p7ba21qr2p"; depends=[Biobase BiocGenerics GSEABase]; }; + nucleR = derive2 { name="nucleR"; version="2.6.0"; sha256="0aa2hi3pscjypys1zf1qdzzxsxkaj7myrja3932kb2vjnydk6da7"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; + nucleoSim = derive2 { name="nucleoSim"; version="1.2.0"; sha256="0j65i9yah3v3iidrndka05rfabgah7yk2d2fg1rqkw2nkyv47shk"; depends=[IRanges S4Vectors]; }; + nudge = derive2 { name="nudge"; version="1.40.0"; sha256="0ggbj3bjxjklw6944icgjcy3mgcly6b7d5cl68yn1cyagmdfdl63"; depends=[]; }; + occugene = derive2 { name="occugene"; version="1.34.0"; sha256="0qavm0wkhaq2vlrbqwb5yr79251m9nxlv4kj3bhhkdf0azzjpxmp"; depends=[]; }; + odseq = derive2 { name="odseq"; version="1.2.0"; sha256="1bf9s0vvgvq44p37396jj7wis6isj07mips52hmq299s7r5zl6gp"; depends=[kebabs mclust msa]; }; + oligo = derive2 { name="oligo"; version="1.38.0"; sha256="1lpdqyraamyqdz9dc56xpdph4sbx7fa4ngvdg407nblbqxbyyz3d"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; }; + oligoClasses = derive2 { name="oligoClasses"; version="1.36.0"; sha256="0cs8hkiz1rmp17hf1zsc2g1zwq7ah7x3bxbjapwgy6s12f68x2g9"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; }; + omicade4 = derive2 { name="omicade4"; version="1.14.0"; sha256="0z6fvr4qq2bi0lpprs5fwv7lg501pgq648pd9af6w0km5ij7hrcf"; depends=[ade4 made4]; }; + oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.40.0"; sha256="0x1g8f2aw95yvkc2mr9998wk3xmrzraaw4zp95kp21avv196kswh"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; }; + ontoCAT = derive2 { name="ontoCAT"; version="1.26.0"; sha256="1p6kgdv9h9hd87ccbvgz8l8vkmn7j9bvmq4wjvz4si5pwjghsz4l"; depends=[rJava]; }; + openCyto = derive2 { name="openCyto"; version="1.12.1"; sha256="07nv87c578dgacld01dzvnj8sba5f6yll5d3v3754zswnl7glk4j"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; + oposSOM = derive2 { name="oposSOM"; version="1.12.0"; sha256="1hfyr7sbwr9wyhan71mr8l22qkl5q5pm09n6rbbsy1z3wfd4yj9k"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; }; + oppar = derive2 { name="oppar"; version="1.2.0"; sha256="12bdfckimhrwx0zvgjm0lq320h5b6n8a8gwj50kz75fdqg7zjw0v"; depends=[Biobase GSEABase GSVA]; }; + pRoloc = derive2 { name="pRoloc"; version="1.14.6"; sha256="15g28asmk65vzrdm9cnq083vr7vcl76z2zw7j61mnlb73z1y3vqg"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class dendextend e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; }; + pRolocGUI = derive2 { name="pRolocGUI"; version="1.8.2"; sha256="0zw89sdy0y1hxydkglscn3xx29yna17a83w1c73ps4q30laybl6a"; depends=[Biobase dplyr DT MSnbase pRoloc scales shiny]; }; + paircompviz = derive2 { name="paircompviz"; version="1.12.0"; sha256="0mwpgds5blylhh4ac24flzvpdp8xvky1yidmfafk002yf6pdk8i0"; depends=[Rgraphviz]; }; + pandaR = derive2 { name="pandaR"; version="1.6.0"; sha256="13fs3qa42z9bh8wfbfbfzhzq9z2rj6436caqd1flx7m4ibbww9fc"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; }; + panp = derive2 { name="panp"; version="1.44.0"; sha256="1pj9pgknfmrq8fnyk30hkn0mz1f3n6lv1dvvs7nywd8702wfyxhv"; depends=[affy Biobase]; }; + parglms = derive2 { name="parglms"; version="1.6.0"; sha256="0lqzvy0q6nlzm9k3ar70mqrvlkiw2ks2fi07bqcccmspvvkd25a6"; depends=[BatchJobs BiocGenerics doParallel foreach]; }; + parody = derive2 { name="parody"; version="1.32.0"; sha256="04n9ngqmdlm44bkhgwyk7a9rky7dcm8h3jy3m6nhz8lm6k6q72h3"; depends=[]; }; + pathRender = derive2 { name="pathRender"; version="1.42.0"; sha256="18bdli1sbb32kdza10lzf1mfd0dwlgkmbha20bjvcpd9jxxhl79z"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; }; + pathVar = derive2 { name="pathVar"; version="1.4.0"; sha256="17332arpxdn9sh3lknrdnjc7dlp6qzjp0px82grkvfw9nqs0d4m3"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; }; + pathifier = derive2 { name="pathifier"; version="1.12.0"; sha256="132yhr43y88kz2qaadkw3hxbrjawk76hiy0h7y72h33zmz4l5z26"; depends=[princurve R_oo]; }; + pathview = derive2 { name="pathview"; version="1.14.0"; sha256="1nlfh2i1gj1f35z9v95yajvpp1p60z0pgjbc9xyvdg82s58ggjvd"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; }; + paxtoolsr = derive2 { name="paxtoolsr"; version="1.8.0"; sha256="09z7w9mp2f710y5rf83gqw490axvsg6xgqq05n44r21741rblxdf"; depends=[data_table httr igraph plyr R_utils rJava rjson XML]; }; + pbcmc = derive2 { name="pbcmc"; version="1.2.2"; sha256="0p7gacnbgf65iz9h7hfyybyak595ykl4xlfv4jvz4hpigbq8alzc"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; }; + pcaExplorer = derive2 { name="pcaExplorer"; version="2.0.0"; sha256="00zak0j907wrpr4ng6lxj4fki3lg8kgx6j8y7vxiib7dd01sw2fp"; depends=[AnnotationDbi biomaRt d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges knitr limma NMF pheatmap plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; }; + pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.18.0"; sha256="1xh7dwskik3q3npwhz2jgmpadh59q04hz6rd6fpph470d98213pm"; depends=[AnnotationDbi Biostrings ellipse]; }; + pcaMethods = derive2 { name="pcaMethods"; version="1.66.0"; sha256="18mawhxw57pgpn87qha4mwki24gqja7wpqha8q496476vyap11xw"; depends=[Biobase BiocGenerics MASS Rcpp]; }; + pcot2 = derive2 { name="pcot2"; version="1.42.0"; sha256="0rqkclr272ss61nlcay1wk0fy904bgw9rkryx236p7087kmjbasi"; depends=[amap Biobase]; }; + pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.38.0"; sha256="1vhb37y8mfravdlvvsdnnxw3yjx6mf6x9wkj140s3bmrjyaabyxa"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pdmclass = derive2 { name="pdmclass"; version="1.46.0"; sha256="1g88p9jrhllqxjy6043gm34h1lmyqxqyvifdlxz2afrc5h0g3rs8"; depends=[Biobase fibroEset mda]; }; + pepStat = derive2 { name="pepStat"; version="1.8.0"; sha256="1r7a10dhicq2lhk3g1yqz6q5wv0a9dwsl7pvxzhds1ix980a4rm9"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; + pepXMLTab = derive2 { name="pepXMLTab"; version="1.8.0"; sha256="0bgr2v9hj6lvwn2r1m5bfa20bxbk1zibysmr2cnzr8qxvlcpi354"; depends=[XML]; }; + phenoDist = derive2 { name="phenoDist"; version="1.22.0"; sha256="0945wxmf1dr6hp8pjc995nhisdnzc0rjwlpkfkw93dn10gn947w8"; depends=[e1071 imageHTS]; }; + phenoTest = derive2 { name="phenoTest"; version="1.23.1"; sha256="1nlgzzh8ddrk943vgna9ngdha60zmpn8zmbb4sxy8sya4n1z097v"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; }; + philr = derive2 { name="philr"; version="1.0.0"; sha256="0k0ck7miirmwincp1fxcmdgfbcfdvyhgpmgxv5d4nlsasr3sf9n5"; depends=[ape ggplot2 ggtree phangorn tidyr]; }; + phyloseq = derive2 { name="phyloseq"; version="1.19.1"; sha256="19vq14gqr5wwkgbp1qdvz704ilhwvdfn7m8yzfcr6xcdxxks0gad"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; + piano = derive2 { name="piano"; version="1.14.5"; sha256="1y6vy7fh23mpa2r65mhygaj27zwjl9v3khkff80lsaax0cc287s7"; depends=[Biobase BiocGenerics fgsea gplots igraph marray relations]; }; + pickgene = derive2 { name="pickgene"; version="1.46.0"; sha256="0lcgfw8w08akrkqb74ibavav9ph5pd1daa3zbdrxkycxqxylwcmm"; depends=[MASS]; }; + pint = derive2 { name="pint"; version="1.24.0"; sha256="1q0j037z4rq7z2yd76rnspg0xarbnblbhssm338hvh84l3kyhsvj"; depends=[dmt Matrix mvtnorm]; }; + pkgDepTools = derive2 { name="pkgDepTools"; version="1.40.0"; sha256="1r1z4ksjjd0av85jwfvawfv4j5jkjvglf03h55zixg8iwhcgrmz1"; depends=[graph RBGL]; }; + plateCore = derive2 { name="plateCore"; version="1.32.0"; sha256="123r9qcqan3bcqpzgw34dnrf1dgl28x01clc0j4rr61zxakapbq1"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; }; + plethy = derive2 { name="plethy"; version="1.12.1"; sha256="0q8xqk123rm1sj4knljaaz97hl0pshf8m7f99kggna0hc33hgz60"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; }; + plgem = derive2 { name="plgem"; version="1.46.0"; sha256="16g433rh7avqml7dlil8hm8a1ksmgfansck26r3hcg2ic9ys1gly"; depends=[Biobase MASS]; }; + plier = derive2 { name="plier"; version="1.44.0"; sha256="0iyazrna17qc5pk4lfxqmzwhhjxpjnli8ks6v7xf8c620ydrfdlm"; depends=[affy Biobase]; }; + plrs = derive2 { name="plrs"; version="1.14.0"; sha256="084vc0570ccl1hbp3gjp6mdk1x6qzxipyzwdh76ffahafg1lyk5s"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; }; + plw = derive2 { name="plw"; version="1.34.0"; sha256="1r5b2rpzhl5xj7477saac2j1qjdrcbdd3hrsi01hfsapczggz7sl"; depends=[affy MASS]; }; + pmm = derive2 { name="pmm"; version="1.6.0"; sha256="19v4cbc6ws84pa5byxam3cgdbmdd6qm44m1x62iz9hsmbx38fsg6"; depends=[lme4]; }; + podkat = derive2 { name="podkat"; version="1.6.1"; sha256="01kk7j2kvb15803dgyszjardy2mb8hii7f2c08x5whbprajx1h06"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; }; + polyester = derive2 { name="polyester"; version="1.10.1"; sha256="1z011zvj1jzr2diznp528skhxafngk26i080fvyc9vpviabpbl3l"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; }; + ppiStats = derive2 { name="ppiStats"; version="1.40.0"; sha256="1ymyn5gf2879gb20q9aczw056ib5c7c0lhpap6f4iyxivz9lpbhq"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; }; + pqsfinder = derive2 { name="pqsfinder"; version="1.2.3"; sha256="0d497y179r9yk43sh03vbanv1ilpp43a0zxj33fjnmm0cfc6w8cx"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; }; + prada = derive2 { name="prada"; version="1.50.0"; sha256="1nng189vl5xykba2gahmf88sb5fx9v980bhpy419anif26hx5fdl"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; }; + prebs = derive2 { name="prebs"; version="1.14.0"; sha256="0jkvpa5dvgvdln8bzd3cf4i5ki3mpf7n9353x0ba482p1qk3ip5z"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; }; + predictionet = derive2 { name="predictionet"; version="1.20.0"; sha256="0c988g47nw91rv62kc6rnxvmym7xxfr4gdlj339wy70w52yjf8vk"; depends=[catnet igraph MASS penalized RBGL]; }; + preprocessCore = derive2 { name="preprocessCore"; version="1.36.0"; sha256="1n8y12q7145f385gm2k3c6y3vwvin7jlb47la4mnl7mar6pq9kmp"; depends=[]; }; + proBAMr = derive2 { name="proBAMr"; version="1.8.0"; sha256="1kdaxyx0y3p4zvs589q4svb8h1xjsw2sccm3287rdj6a6wp4z5km"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; }; + proFIA = derive2 { name="proFIA"; version="1.0.10"; sha256="18ncxwzgyvq4ks2y0sqvm01fsw8xfvri9h5nm0446ailjwg64mj9"; depends=[Biobase BiocParallel FNN minpack_lm pracma xcms]; }; + procoil = derive2 { name="procoil"; version="2.2.0"; sha256="1ffjrn2fg2z48c5lrabma34zyvm75fqngndxfd4g216znyzll2dn"; depends=[Biostrings kebabs S4Vectors]; }; + profileScoreDist = derive2 { name="profileScoreDist"; version="1.2.0"; sha256="1b1mvh6aw9k72qxjslb5qa42l70y9zz4r49kyxf48nfm8hgs2cj7"; depends=[BiocGenerics Rcpp]; }; + prot2D = derive2 { name="prot2D"; version="1.12.0"; sha256="0pdwkyqi0lplr12ayj9rrj09xhdbm7sjn821k4ilfbnxic3lldf2"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; }; + proteinProfiles = derive2 { name="proteinProfiles"; version="1.14.0"; sha256="0xika21c4fadh4sxbn7kqjmmqpg85qxl3aynwfvl0qmk8xjpvdin"; depends=[]; }; + proteoQC = derive2 { name="proteoQC"; version="1.10.0"; sha256="0396qp0jzyz1ss3ahcxbqpxgsn1rwiy87zmrfr3wl22gs44vijrv"; depends=[ggplot2 MSnbase Nozzle_R1 plyr Rcpp reshape2 rTANDEM seqinr VennDiagram XML]; }; + psichomics = derive2 { name="psichomics"; version="1.0.8"; sha256="15v689jcc8d107cp9chzyh4bx01x5639lf474bl2ac9jlqca3mb3"; depends=[AnnotationHub data_table digest dplyr DT fastmatch highcharter httr jsonlite miscTools plyr R_utils shiny shinyBS shinyjs stringr survival Sushi XML]; }; + psygenet2r = derive2 { name="psygenet2r"; version="1.7.4"; sha256="0553fbkbfylqk7z4rw7m4sdyddgwh5qv0rgkp0crnj0cp49cmvnc"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 igraph labeling RCurl reshape2 stringr topGO]; }; + puma = derive2 { name="puma"; version="3.16.0"; sha256="0692cvv6v58dpi0phrh5zfraw090mc83cwpnqibgi3w7kigq5zl7"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; + pvac = derive2 { name="pvac"; version="1.22.0"; sha256="1hhd87fh688r03l15f1m8rsaglcnqm6lzkb1lg002lzm8ghnzq81"; depends=[affy Biobase]; }; + pvca = derive2 { name="pvca"; version="1.14.0"; sha256="1z71i79hq8n139xpqvwz03r8arpscimy4p8ms77q7q3pcxb0rs94"; depends=[Biobase lme4 Matrix vsn]; }; + pwOmics = derive2 { name="pwOmics"; version="1.6.0"; sha256="1iq3aw9l2r3fc0kv0pj70yh8c729rb39v51hcy1bc5syfasr7shr"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; }; + qcmetrics = derive2 { name="qcmetrics"; version="1.12.0"; sha256="0s2p02j1v41hg5yrryi7lf819hhfv1wrdi58wxxff4m69qzzypzg"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; }; + qpcrNorm = derive2 { name="qpcrNorm"; version="1.32.0"; sha256="1q7w247r2ac4nqr262mc15q54ak0zdpw6a1sl0p7hiqcj1bc60f8"; depends=[affy Biobase limma]; }; + qpgraph = derive2 { name="qpgraph"; version="2.8.3"; sha256="02isqzh92dw6xr8wjb2nigfkk5lxmywm09p5ywffx4fvjl1bvs4f"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; + qrqc = derive2 { name="qrqc"; version="1.28.0"; sha256="0yl5q6c2yfizc9kaxdksc0zyl88xyy2i5m9qhcjkvzw71nlhihlj"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; }; + qsea = derive2 { name="qsea"; version="1.0.3"; sha256="1r3b90ibhvrg98xji81rdfazvk7a2ib622dga7gvpqax0rs1np8i"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; }; + quantro = derive2 { name="quantro"; version="1.8.0"; sha256="0y33mx9nvi7k2w6qzal2z0jav1c68m9rkiqx7g22rjhisg2vynvi"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; }; + quantsmooth = derive2 { name="quantsmooth"; version="1.40.0"; sha256="0bxy8rj5bflk9qv672rn9yr9lmk8z5a5lakgcamisbf28s6d3qkm"; depends=[quantreg]; }; + qusage = derive2 { name="qusage"; version="2.6.1"; sha256="1npv86c0z2ka2r3w4dydf843lhx6fsyyhxx268dnpv604rm0f662"; depends=[Biobase limma lsmeans nlme]; }; + qvalue = derive2 { name="qvalue"; version="2.6.0"; sha256="1dijh11v1kr29gnikq09pkdvm3qwmp1a406ahx9l4j6mgn8hlsfq"; depends=[ggplot2 reshape2]; }; + r3Cseq = derive2 { name="r3Cseq"; version="1.20.0"; sha256="039p2chdxcikjd58ighdd5vh6hp9mb3w169az0m9asrys4wgkps0"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; }; + rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.14.0"; sha256="1a3c1yk57rmmsxwfkmgjvkfh3vs7aq71h6iwcihyvp2b15xdg8wp"; depends=[data_table XML]; }; + rCGH = derive2 { name="rCGH"; version="1.4.0"; sha256="0hh36zfmy7284528lfgf103r7f0839hxzr2z75gmsjjvr3c4q8vb"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + rDGIdb = derive2 { name="rDGIdb"; version="1.0.0"; sha256="0ix6j1m9bcllblwivv0i3m5mns787kpzpmx8kvb8bw4qd3lb09hq"; depends=[httr jsonlite]; }; + rGADEM = derive2 { name="rGADEM"; version="2.22.0"; sha256="1n673zr7g27fdksikk945krc539bnyvi3awabaifc57ldzj0hz1v"; depends=[Biostrings BSgenome IRanges seqLogo]; }; + rGREAT = derive2 { name="rGREAT"; version="1.6.0"; sha256="1q56cg6crgr95myk8pd7dmrhblcm4yl0n21dy126c0h38i6q5f5i"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; }; + rHVDM = derive2 { name="rHVDM"; version="1.40.0"; sha256="1v410qv0djpf6cd90fjaidlifxcfv3l7s925ni9q4dqk8dr8x4y3"; depends=[affy Biobase minpack_lm R2HTML]; }; + rMAT = derive2 { name="rMAT"; version="3.24.0"; sha256="1s6lq7pc5g93qvwq79va9k6b2z2z65pf5hyya9bdjrr7q6bgd6fd"; depends=[affxparser Biobase BiocGenerics IRanges]; }; + rRDP = derive2 { name="rRDP"; version="1.8.0"; sha256="1z8m3036sarciw69pqhl5ib7prilbbwx43xv597byq03n45fgawq"; depends=[Biostrings]; }; + rSFFreader = derive2 { name="rSFFreader"; version="0.22.0"; sha256="1n9rzd3lpjzjbwpx1jvb68yymkr6k01y6a2jjyf7cdpdd9mpyg8s"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; }; + rTANDEM = derive2 { name="rTANDEM"; version="1.14.2"; sha256="1c9y3lf0ksmck7zw2qm6r3mnpgrmf6gpq471bzpyx8443cs7fj7h"; depends=[data_table Rcpp XML]; }; + rTRM = derive2 { name="rTRM"; version="1.12.0"; sha256="14ma36hx7hzaz903dzbmhzmipqlr3lnibjxr5y518wsml4ih70gi"; depends=[AnnotationDbi DBI igraph RSQLite]; }; + rTRMui = derive2 { name="rTRMui"; version="1.12.0"; sha256="0slp9yggz7yfhpil540k6d1ppkbmmbks1ssacj6xf5h4yksc6zh8"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; }; + rain = derive2 { name="rain"; version="1.8.0"; sha256="1gqkh3rjr3h6l8y3s9rdc1j4ivnpx1hmhnlp6ay63y99q4yxgj8c"; depends=[gmp multtest]; }; + rama = derive2 { name="rama"; version="1.48.0"; sha256="0zmmilwhvh51fg0bi6jid27z38xr5yyqa0xa5kjwq3xh9pnrg17l"; depends=[]; }; + randPack = derive2 { name="randPack"; version="1.20.0"; sha256="0wby3nwhj5d4r98p14qfl3p2z4rb73bbpfh68zf75gjaqvkm0j25"; depends=[Biobase]; }; + rbsurv = derive2 { name="rbsurv"; version="2.32.0"; sha256="1n067rk8jiwf56rm22h8jfngwg75hp0xg7hlx86yzsdffpkmmbbv"; depends=[Biobase survival]; }; + rcellminer = derive2 { name="rcellminer"; version="1.6.0"; sha256="1lmghcwrwdwknpsv2cq47yyaw09ishb0s7i29zs5c4ksvpmdhw5h"; depends=[Biobase fingerprint gplots rcdk rcellminerData shiny stringr]; }; + readat = derive2 { name="readat"; version="1.0.0"; sha256="0l89x1pb1c8kypdh2ka9bp9jwq8j19p34qnf2zzm34361amh90wz"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_sets assertive_types Biobase data_table dplyr magrittr openxlsx pathological reshape2 stringi SummarizedExperiment testthat tidyr]; }; + reb = derive2 { name="reb"; version="1.52.0"; sha256="1cg88gglzr5r5m0bq51fz2xabhrlk9rybvrbbdnd7ph2ss1jxkis"; depends=[Biobase idiogram]; }; + recount = derive2 { name="recount"; version="1.0.17"; sha256="1ffvpkzafqhy75j8r39l91lrm321yq73w5a929nngk82lwwd6dcf"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; }; + recoup = derive2 { name="recoup"; version="1.2.0"; sha256="1n5af8fbly8qdwn4ggysd01s15l26lkw9dh1mnmimhhi6wzz1brj"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; }; + regionReport = derive2 { name="regionReport"; version="1.8.2"; sha256="0q59fhxa9a1cr75c6m4qmgpxrv8q1jj0k1zm76xbj6anri5cmprd"; depends=[DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; + regioneR = derive2 { name="regioneR"; version="1.6.2"; sha256="0mvwk2yjsdxda7w6f82dbj91i0zrr95ipglfyw9ndhl2ki8dka0i"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer]; }; + regsplice = derive2 { name="regsplice"; version="1.0.0"; sha256="0kl8xsz4jph4jrj3yfnfaymhsrrmcxgfjjanbc3yfv6kj5pwjfcp"; depends=[BiocParallel edgeR glmnet limma S4Vectors SummarizedExperiment]; }; + rfPred = derive2 { name="rfPred"; version="1.12.0"; sha256="1bc5rj00mlayahqb6vla9ghq15676fscj9kqagp1x6ivpgxqkl65"; depends=[data_table GenomicRanges IRanges Rsamtools]; }; + rgsepd = derive2 { name="rgsepd"; version="1.6.0"; sha256="047svzia4f5qhcr6h0p0hfzshzmissdm9hg0pp4mfd6051nkdv5x"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; }; + rhdf5 = derive2 { name="rhdf5"; version="2.18.0"; sha256="0pb04li55ysag30s7rap7nnivc0rqmgsmpj43kin0rxdabfn1w0k"; depends=[zlibbioc]; }; + riboSeqR = derive2 { name="riboSeqR"; version="1.8.0"; sha256="1196qh0vwnfwshccl725mbkf698dlyz4658cq7kpvyrpv56z5l90"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; + rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.32.0"; sha256="0bxlc5lwxlnlbp2qj3gsdvbrb96c9dhmp3fjdnpdcjwbvwh9a2jn"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; }; + rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.4.0"; sha256="1q1lsf75nbwkn91lgwkpx4lsmg94v1lbwzq7glwai4766xkvd2nb"; depends=[RColorBrewer]; }; + roar = derive2 { name="roar"; version="1.10.0"; sha256="1hp2542vi0jqxqqin6gb5py5hvl06sn0x9ks4lb371sw0smps7ak"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; }; + rols = derive2 { name="rols"; version="2.2.5"; sha256="0xc467hd2jzdhw73a97lvj5m2hv10w06l11yrqff13gkhch4d6mi"; depends=[Biobase httr jsonlite progress]; }; + ropls = derive2 { name="ropls"; version="1.6.2"; sha256="0piwi6l83a7lcgsv2561d71y7hm3j3g2ax6vq2h0izf6qrzj4nvy"; depends=[Biobase]; }; + rpx = derive2 { name="rpx"; version="1.10.2"; sha256="1814f3jdmbj2yyv8ll7lfnc6bcwbv5hn9i7wydf2xzvpi2954ijr"; depends=[RCurl XML]; }; + rqubic = derive2 { name="rqubic"; version="1.20.0"; sha256="1d5zbicb5lsqvbb0djaixi9i05q2caysa1pxnlbvf4pc3pjl2bzh"; depends=[biclust Biobase BiocGenerics]; }; + rsbml = derive2 { name="rsbml"; version="2.32.0"; sha256="13y47fkrq80c9s0y7rrvynr6y5df9cxr0i9zxksm27fvk7bq2rzh"; depends=[BiocGenerics graph]; }; + rtracklayer = derive2 { name="rtracklayer"; version="1.34.2"; sha256="1j3cyvg1wg1d9l0lkcjk3jn7pb96zi17nd1qsa5lglsimja19mpl"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; }; + sRAP = derive2 { name="sRAP"; version="1.14.0"; sha256="04nnkxb59s9qfv8kyvqc5kw8hd60c0qnpp9v8rl2iash3yng8xxb"; depends=[gplots pls qvalue ROCR WriteXLS]; }; + sSeq = derive2 { name="sSeq"; version="1.12.0"; sha256="0pawi0svlz3cfq14f81lkvfawa5vd59cbvk4nxgwpwwk1ldxrdiq"; depends=[caTools RColorBrewer]; }; + safe = derive2 { name="safe"; version="3.14.0"; sha256="1n2i36gg8iykcaxy4347il2hbjd4lzrygyzibj4l9a7xprfb05y0"; depends=[AnnotationDbi Biobase SparseM]; }; + sagenhaft = derive2 { name="sagenhaft"; version="1.44.0"; sha256="1j6y4bj156szbf454m4zmlcg1idzxq2vzis2vjl5awpm0jvgz6sa"; depends=[SparseM]; }; + sangerseqR = derive2 { name="sangerseqR"; version="1.10.0"; sha256="058la6zb2prgnf0vwy8fc4p7n13zpm1gr7fhsy4m9qknd4mdcvkz"; depends=[Biostrings shiny]; }; + sapFinder = derive2 { name="sapFinder"; version="1.12.0"; sha256="1fybnkzjg2jfjc4qzcr96ma75389x928110a2nmq8326xknwd6f1"; depends=[pheatmap Rcpp rTANDEM]; }; + savR = derive2 { name="savR"; version="1.12.0"; sha256="0h32mrnwls8bgq0h71vzhr29f56hpl1hgxi7sycz7hmzp9pxcfh8"; depends=[ggplot2 gridExtra reshape2 scales XML]; }; + scater = derive2 { name="scater"; version="1.2.0"; sha256="0pambafir3aqpgk7kdq5i2pn0278d97bn2qb9712c0jivw363whf"; depends=[Biobase BiocGenerics biomaRt data_table dplyr edgeR ggbeeswarm ggplot2 limma matrixStats plyr reshape2 rhdf5 rjson shiny shinydashboard tximport viridis]; }; + scde = derive2 { name="scde"; version="2.2.0"; sha256="1yhg9gd8qphnfk5x93hsxqhw6mc2v6kdrw1wlgb93njic0cfmv7b"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; }; + scran = derive2 { name="scran"; version="1.2.2"; sha256="02jlxxm3nwgdx3v4dxw7041c4klfalpbqx0qwj25pk4f0fn9xrak"; depends=[Biobase BiocGenerics BiocParallel dynamicTreeCut edgeR Matrix scater shiny statmod zoo]; }; + scsR = derive2 { name="scsR"; version="1.10.0"; sha256="143qn75g3kijbdx2f7yg0wxa8kakyv6w119fwnfqxgpswdgdz2hn"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; }; + segmentSeq = derive2 { name="segmentSeq"; version="2.8.0"; sha256="1azbyabm0nsjq45z3p6xhbxs01b5prwnq384y5yp5f6akkr3i4h7"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; + seq2pathway = derive2 { name="seq2pathway"; version="1.6.0"; sha256="0rr5fzbcyc32ciyx42kahn8f9fvk7sy6055i37ql8zk5msgrsdsw"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; }; + seqCNA = derive2 { name="seqCNA"; version="1.20.0"; sha256="0951qnwgh29w7ws7mjcsrrkavipjpryf0mf0z7bgnpzdlpvkf361"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; }; + seqLogo = derive2 { name="seqLogo"; version="1.40.0"; sha256="18bajdl75h3039559d81rgllqqvnq8ygsfxfx081xphxs0v6xggy"; depends=[]; }; + seqPattern = derive2 { name="seqPattern"; version="1.6.0"; sha256="0lsa5pz36xapi3yiv78k3z286a5md5sm5g21pgfyg8zmhmkxr7y8"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; }; + seqTools = derive2 { name="seqTools"; version="1.8.0"; sha256="18ld6syl85hsdzapgbh9dp2f5prprc64yr2yi5mwrlrsjpqzix00"; depends=[zlibbioc]; }; + seqbias = derive2 { name="seqbias"; version="1.22.0"; sha256="094scvmbcfamblqnc0k9daxym890lff1968xg2lfwfhc92sdnwyd"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; }; + seqplots = derive2 { name="seqplots"; version="1.12.0"; sha256="09l0sks7hzsjv8bha7ric1jhpn65ql4957lh7qg1hfd4pifyamvp"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 RSQLite rtracklayer S4Vectors shiny]; }; + sevenbridges = derive2 { name="sevenbridges"; version="1.4.9"; sha256="1cy53v8a4bsyhf84201p5fwbyjbmr2j0c3075rj0baqxydbp4fqv"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; }; + shinyMethyl = derive2 { name="shinyMethyl"; version="1.10.0"; sha256="0i6gjg3kjafx7pf9jkmnka33zma2ifg7kl4m71ii4a3zafy384r7"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; + shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.12.0"; sha256="1nay7lw325v0gfgnalypyw8dl8i5nc5dwfm3x7gk3cpz2k9f1n0f"; depends=[mixtools rTANDEM shiny xtable]; }; + sigPathway = derive2 { name="sigPathway"; version="1.42.0"; sha256="0bk2gnsli8gnw70qmsic1244h0fpy10xv8i5nns70m9hh600rssc"; depends=[]; }; + sigaR = derive2 { name="sigaR"; version="1.22.0"; sha256="1akjzr8h429ag2sys8kka3adrfx1b2145ag7anxyl125h2dfqh97"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; }; + siggenes = derive2 { name="siggenes"; version="1.48.0"; sha256="1djhghhh4rgjwrfprj376zy77pw1h52j4g5v3jz58xy47a346ila"; depends=[Biobase multtest]; }; + sights = derive2 { name="sights"; version="1.0.0"; sha256="0j5gcpmv6g1b29a93sgmlrzvypfflk035rhbz578cl5ps9iqgbxy"; depends=[ggplot2 lattice MASS qvalue reshape2]; }; + signeR = derive2 { name="signeR"; version="1.0.1"; sha256="05mqk99c8clv1vak4f1w6q928g49lfmlmlq4v46yfrqjkrq1acll"; depends=[BiocGenerics Biostrings BSgenome class GenomicRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; }; + sigsquared = derive2 { name="sigsquared"; version="1.6.0"; sha256="12dqrf4ffcaigrrk9rl7d66m7fk1fiinmqrjffl80viyknjvz710"; depends=[Biobase survival]; }; + similaRpeak = derive2 { name="similaRpeak"; version="1.6.0"; sha256="11apli0ak9givkw2r9185ckkn7zp7sjq01fvhpv3szlpli5kczkm"; depends=[GenomicAlignments R6 Rsamtools rtracklayer]; }; + simpleaffy = derive2 { name="simpleaffy"; version="2.50.0"; sha256="1gv6843dy1dzli1cvg5pl39kk8kg0cbcj4qcz4kc20n6zq6dx88q"; depends=[affy Biobase BiocGenerics gcrma genefilter]; }; + simulatorZ = derive2 { name="simulatorZ"; version="1.8.0"; sha256="0kw54dw4sfyxns3b78n116rxxl7yfqlaslbvmiksbqj1a2gnsifk"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; }; + sincell = derive2 { name="sincell"; version="1.6.0"; sha256="0hpzrigp6hppamffv0l9fn3xn187dyfbwx91az7hav04lc4slymv"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; + sizepower = derive2 { name="sizepower"; version="1.44.0"; sha256="0f8gaj0l47pcamml9wbzfrrv51cpclj91cqig6pyigjwqcxahi29"; depends=[]; }; + skewr = derive2 { name="skewr"; version="1.6.0"; sha256="1xk7vf8m90bshk3179ndis672rnvvl15p00dsfh9y4kvxz2skr4q"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; }; + snapCGH = derive2 { name="snapCGH"; version="1.44.0"; sha256="02dkhid7cz9lxffpnrh5d88iyvv6g23yrr14w3vpa189l6n8qvff"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; }; + snm = derive2 { name="snm"; version="1.22.0"; sha256="01rwb8z9wbf4zw5kh7mnxj9add4r1a3fldvb5n0rir0wyr6snqg5"; depends=[corpcor lme4]; }; + snpStats = derive2 { name="snpStats"; version="1.24.0"; sha256="1hkgjd12cz6rfm7w51dgc7cxvrsrqgc2byfinbp0d42rnc3600n2"; depends=[BiocGenerics Matrix survival zlibbioc]; }; + soGGi = derive2 { name="soGGi"; version="1.6.1"; sha256="03bdclygsbvahgx6klmmp3bzcq70kjicrwxjbc6gmpi9gqsyf6nd"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + specL = derive2 { name="specL"; version="1.8.0"; sha256="07yp81v8ypbysfj881j97cl0qwsxy0yryyzr07by382iys9hdy4c"; depends=[DBI protViz Rcpp RSQLite seqinr]; }; + spikeLI = derive2 { name="spikeLI"; version="2.34.0"; sha256="1qaqf4f8vpnrdriz6pplbzjl2vjfhwqgrm528p3m9w48d3s1ccyy"; depends=[]; }; + spkTools = derive2 { name="spkTools"; version="1.30.0"; sha256="0fwz77q5xqddhxilbcrv5aq5bhw4i15b0m4bw3dsmw26m0xlwsrq"; depends=[Biobase gtools RColorBrewer]; }; + spliceR = derive2 { name="spliceR"; version="1.16.0"; sha256="1h4bbn20cfq5ml0rdy0gn5z4bqf82v6nd3y2zylni29f2gp1j3za"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; }; + spliceSites = derive2 { name="spliceSites"; version="1.22.1"; sha256="1fc4h0ssd0kapgmjfksf0k6zpn5z6gkfvmacgap1nqm8s4y3912z"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; }; + splicegear = derive2 { name="splicegear"; version="1.46.0"; sha256="0c8h9z525qv32d60q24x9crm1aqm511fr2c9ihwq5q7wx3wzi7bq"; depends=[annotate Biobase XML]; }; + splineTimeR = derive2 { name="splineTimeR"; version="1.2.0"; sha256="0wv0k4x6c3m2km0qkgsmb2rr1pj3mdzacqafvg3y8f8996nn4k7s"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; }; + splots = derive2 { name="splots"; version="1.40.0"; sha256="1qby74smkq6v8lmknsinfmp4qphmndfbs9b8828h68x02j2cmp06"; depends=[RColorBrewer]; }; + spotSegmentation = derive2 { name="spotSegmentation"; version="1.48.0"; sha256="1ia6nmhllvw19hfp7zw41n43wclmzgirbcm274l1d85nqxq0a277"; depends=[mclust]; }; + sscore = derive2 { name="sscore"; version="1.46.0"; sha256="0s6pd5m18m90fgsaqcjwq6py886z257xz6b3xyg5zr3hqy0nzy9j"; depends=[affy affyio]; }; + sscu = derive2 { name="sscu"; version="2.2.0"; sha256="1rhijb4wyahvjfpsz5kkmw1rxc8qj9w1f5imkzb5p59n4cj094b0"; depends=[BiocGenerics Biostrings seqinr]; }; + ssize = derive2 { name="ssize"; version="1.48.0"; sha256="1nj2nhxf85qbpx43j2ymb25wnhd6anw3a2dgxhi3bjpx6qlngnhs"; depends=[gdata xtable]; }; + ssviz = derive2 { name="ssviz"; version="1.8.0"; sha256="1lpf941whhmksw8y8ingaqp17687f3xkgs5rimq65px8bfpa7apq"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; }; + staRank = derive2 { name="staRank"; version="1.16.0"; sha256="1rx4khhj24rdkx2zf5zlgx5avkpgx3qpg0ly815gbdrv7j7imx0f"; depends=[cellHTS2]; }; + statTarget = derive2 { name="statTarget"; version="1.4.12"; sha256="0i4dq5563fkcryax1n5mhdir9w6bq72xxx2c5alb4si892c14ygr"; depends=[gWidgets2 gWidgets2RGtk2 impute pdist pls plyr pROC randomForest rrcov]; }; + stepNorm = derive2 { name="stepNorm"; version="1.46.0"; sha256="0ns0abii8h6dxd44n9hdh7ww11mwb9izcpawxg2vwdqj5wv342qg"; depends=[marray MASS]; }; + stepwiseCM = derive2 { name="stepwiseCM"; version="1.20.0"; sha256="0fyf4n76r8p53byapfb0fjp7dyxsy3gh2d7f4sl81hsa69zz703g"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; }; + subSeq = derive2 { name="subSeq"; version="1.4.0"; sha256="0ly7qcghf9979qmxjvd3ihs7wqys1r45x459jp3sl3skf3cnlz9m"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; + supraHex = derive2 { name="supraHex"; version="1.12.0"; sha256="05jaqr98rwy02wzppbb2q77yw7yjkz7h6wd74mhd3v8dk4h7963g"; depends=[ape hexbin MASS]; }; + survcomp = derive2 { name="survcomp"; version="1.24.0"; sha256="03232xxda6w9cxj7q84bdqjiza7y36kxk6l9n1nqawmy2kayc3kn"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; }; + sva = derive2 { name="sva"; version="3.22.0"; sha256="1wc1fjm6dzlsqqagm43y57w8jh8nsh0r0m8z1p6ximcb5gxqh7hn"; depends=[genefilter mgcv]; }; + switchBox = derive2 { name="switchBox"; version="1.10.0"; sha256="1avzqy2iqfzb0f6d03bhjr6fr835mwy3isga96fgxnyyca8cf81r"; depends=[gplots pROC]; }; + switchde = derive2 { name="switchde"; version="1.0.0"; sha256="0335xxl5g3xi6g9qhhhgm6qhaqpv2dqs1579c9agz05hm5fm3r1c"; depends=[Biobase dplyr ggplot2]; }; + synapter = derive2 { name="synapter"; version="1.16.0"; sha256="0bqldlj2fq55nlsbx0d59i8rcsja9sapx34jgm8vfrch8qng9srv"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; }; + synergyfinder = derive2 { name="synergyfinder"; version="1.0.0"; sha256="09vznrqz6f9db9wxralg3sb8jx8wra1d1lw5z8ywm8xfsc6jjs4s"; depends=[drc ggplot2 gplots gridBase kriging lattice nleqslv reshape2]; }; + synlet = derive2 { name="synlet"; version="1.4.0"; sha256="18sik8k7j72sd2ix6k1qvcx44njf6rbbrj8bp6y60nzbc4z7psfk"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; + systemPipeR = derive2 { name="systemPipeR"; version="1.8.1"; sha256="0hyi841w8fm2yzpm6lwqi3jz5kc8ny8dy5p29dxynzaw5bpjw56d"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; }; + tRanslatome = derive2 { name="tRanslatome"; version="1.12.0"; sha256="0jypkql5fklqsr79hzj2fvkzkam1gxrjhkhfqjpws53bvy1f6d55"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; }; + ternarynet = derive2 { name="ternarynet"; version="1.18.0"; sha256="14dj124wp0q5cdhmy7ywdvrzs2dpv2gwhwqmzbqazljmmjc49mzk"; depends=[igraph]; }; + tigre = derive2 { name="tigre"; version="1.28.1"; sha256="0imsxpk0v9vwai48hmd3ndaki5z9v3yim0a3kmx3y1aym71wx68c"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; + tilingArray = derive2 { name="tilingArray"; version="1.52.0"; sha256="1h1bgkc2smlxrivsqv5k92ynlcwf7gzpjlzsgaimcjvrzd6rvxcp"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; }; + timecourse = derive2 { name="timecourse"; version="1.46.0"; sha256="0m8jlair0bzv0rw52ydv5r1bjnkdq3vxaavhbrpaqynx31lc9hqk"; depends=[Biobase limma marray MASS]; }; + tkWidgets = derive2 { name="tkWidgets"; version="1.52.0"; sha256="1iazw1dc0xr0vdm9vlxy0awlxmdjsvc1l0g9zrqr9h1mldpi1p5x"; depends=[DynDoc widgetTools]; }; + tofsims = derive2 { name="tofsims"; version="1.2.0"; sha256="0msmpix09ypq9gn4gh0z15caap1736zqzzda3zp8pnbjvj45jvv6"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; }; + topGO = derive2 { name="topGO"; version="2.26.0"; sha256="0j6sgvam4lk9348ag6pypcbkv93x4fk0di8ivhr23mz2s2yqzwrx"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; }; + trackViewer = derive2 { name="trackViewer"; version="1.10.2"; sha256="0a54xl7g8p6nzw6zyxchb4qinbzpfl6d7g12080lnjvkcf8dm2pj"; depends=[AnnotationDbi GenomicAlignments GenomicFeatures GenomicRanges grImport Gviz IRanges pbapply Rsamtools rtracklayer S4Vectors scales]; }; + tracktables = derive2 { name="tracktables"; version="1.8.1"; sha256="0px4lhnz6nswih0fwqhqa37wl8j4pc33jyl2yrvi8dhfky3n4pn4"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; }; + transcriptR = derive2 { name="transcriptR"; version="1.2.0"; sha256="0ny0qnwrzd9xyhjdkb6cigdsk4k0db3qivkma553zifrwrd41ja9"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; }; + traseR = derive2 { name="traseR"; version="1.4.0"; sha256="03c33z1832rxq2h7hi69ya07708264v57h4f5xn29c0xmgd9zz7j"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; + triform = derive2 { name="triform"; version="1.16.0"; sha256="18s80s90bfjz5nnm3xh0x1h2px5cq3la1x4vir1g3bgbqgmmfrrm"; depends=[BiocGenerics IRanges yaml]; }; + trigger = derive2 { name="trigger"; version="1.20.0"; sha256="1yg6vcsqccfdd6im5xfa7m5zcm2l1iyd46bj4zfc4fjwbgqw833p"; depends=[corpcor qtl qvalue sva]; }; + trio = derive2 { name="trio"; version="3.12.0"; sha256="1wdjapmj8wxgjg6c201jx14c1gakgr79x8xdszw8kwpnb5ih9byn"; depends=[]; }; + triplex = derive2 { name="triplex"; version="1.14.0"; sha256="0bxxs37iia281k4y94bs0n356xpfw9wvxzzwj8pyqp2gdw876yhj"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; }; + tspair = derive2 { name="tspair"; version="1.32.0"; sha256="1vicp69g5ykvqxpp00rgmnvgg87ra40wyvlnb9gj3xy3g9ixqj8g"; depends=[Biobase]; }; + tweeDEseq = derive2 { name="tweeDEseq"; version="1.20.0"; sha256="0n6g74088ikbnfzzmiq60r3l51rch51krc05zzjg2vw1gx5zschn"; depends=[cqn edgeR limma MASS]; }; + twilight = derive2 { name="twilight"; version="1.50.0"; sha256="0d84xcvpr7y1c6mr4z9dnp2bck52dzw7xbf99dwmj20vxq9d424r"; depends=[Biobase]; }; + tximport = derive2 { name="tximport"; version="1.2.0"; sha256="1k5a7dad6zqg936s17f6cmwgqp11x24z9zhxndsgwbscgpyhpcb0"; depends=[]; }; + uSORT = derive2 { name="uSORT"; version="1.0.0"; sha256="14bb5sfl0fwmg1g214dqk4i3daqxay0jkcw7a3wlh6a61dcrcfbl"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; + unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.10.0"; sha256="108rrifxbk9g06ssfa4jx73j6r0r5d1xaagk071c6zi4a09pa3hh"; depends=[BiocGenerics HTqPCR]; }; + variancePartition = derive2 { name="variancePartition"; version="1.4.2"; sha256="0iidrw8pcrd6c7z5sdff163108q493im8csikl1ahiyz1dxwfhw8"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 MASS pbkrtest reshape2]; }; + vbmp = derive2 { name="vbmp"; version="1.42.0"; sha256="0dqk8lgnib6if2j4j03zl59yc1g97457ib97ayycws9l56amf135"; depends=[]; }; + viper = derive2 { name="viper"; version="1.8.0"; sha256="1wnaqfm6lds9qb6dqqrv8k8asbvgfimnkg4q7czv9bk30b9820i5"; depends=[Biobase e1071 KernSmooth mixtools]; }; + vsn = derive2 { name="vsn"; version="3.42.3"; sha256="0mgl0azys2g90simf8wx6jdwd7gyg3m4pf12n6w6507jixm2cg97"; depends=[affy Biobase ggplot2 lattice limma]; }; + vtpnet = derive2 { name="vtpnet"; version="0.14.0"; sha256="0w52411h0w3bidgcqxanw8f4j2053iff2dfc3qzaiaxj6gfcbf4p"; depends=[doParallel foreach GenomicRanges graph gwascat]; }; + wateRmelon = derive2 { name="wateRmelon"; version="1.18.0"; sha256="1jl8h5xdppnvb8zfj103858dh6lr9w20r64y769wg1kpd3zxvxfw"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; }; + wavClusteR = derive2 { name="wavClusteR"; version="2.8.0"; sha256="013931vz9xz12vz27i15lr63sgmc95krqkx9kz0nsmfs458c6qfz"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; }; + waveTiling = derive2 { name="waveTiling"; version="1.16.0"; sha256="0234jqsc1q2na8x0cnfc8lm52hyqakmp0bc377d6cfgzcdp7racg"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; }; + weaver = derive2 { name="weaver"; version="1.40.0"; sha256="0zvhiasy3s428xy0n0fk0601dbs7fgwpqmp90fbq26aj4gfxy5vg"; depends=[codetools digest]; }; + webbioc = derive2 { name="webbioc"; version="1.46.0"; sha256="0alxpikfnfhsfjkkj8cz27x661r8gwvwvxnzndvzbw5smnyklac5"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; }; + widgetTools = derive2 { name="widgetTools"; version="1.52.0"; sha256="1jj18mkaq8fc5zdaf1l1vvs9barx9b5wp0qa8rvx3j6zacdlbw2r"; depends=[]; }; + xcms = derive2 { name="xcms"; version="1.50.1"; sha256="0gr59vn52cmpsqlbqlr55a6rfwq0sk2gqnba1fhyfjd22cbghxm8"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet multtest mzR plyr ProtGenerics RANN RColorBrewer S4Vectors]; }; + xmapbridge = derive2 { name="xmapbridge"; version="1.32.0"; sha256="02fm6sy5ynq450pkcf1zlwj2ih6f48pishmhia2d5is5iy22acbh"; depends=[]; }; + xps = derive2 { name="xps"; version="1.34.0"; sha256="1hrprdnqyy7rrvrzsnm9sy75q31zgxy134v4zbivya8f30dap4x8"; depends=[]; }; + yamss = derive2 { name="yamss"; version="1.0.4"; sha256="0dirg1nl2bp1xr0m10yzckhwynxl6p6jmvb5s5b03g66m4a7i72p"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; }; + yaqcaffy = derive2 { name="yaqcaffy"; version="1.34.0"; sha256="0wv52qnds4ni2a1p7m54ihdwiqxzdyvq0fb5dzjcq41abnkpiqsi"; depends=[simpleaffy]; }; + yarn = derive2 { name="yarn"; version="1.0.1"; sha256="1ra8b711inispl3in1ajjwkyxax6w9w5nb9w47iacyk7kp6vi3a3"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; }; + zlibbioc = derive2 { name="zlibbioc"; version="1.20.0"; sha256="0hbk90q5hl0fycfvy5nxxa4hxgglag9lzp7i0fg849bqygg5nbyq"; depends=[]; }; } diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index a19aa0f51a2d..4b592385fb08 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,11 +4,11 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2017-03-03"; }; +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=[]; }; - ABCanalysis = derive2 { name="ABCanalysis"; version="1.1.2"; sha256="1z7m8j6zqai7kg5b00wmv7hjndpb29s6819bshwrqc7z0vz71491"; depends=[plotrix]; }; + ABCanalysis = derive2 { name="ABCanalysis"; version="1.2.1"; sha256="0wac1ksmnxa36v99ca4hv8k0rsh3igwpcllmlv9wf7i9kgqviqwi"; depends=[plotrix]; }; ABCoptim = derive2 { name="ABCoptim"; version="0.14.0"; sha256="0nqnflidknwxj4bzql486cs4fi51iwyw73b5sdf26s705hkknhj0"; depends=[Rcpp]; }; ABCp2 = derive2 { name="ABCp2"; version="1.2"; sha256="1s2skkxpzss7c29i8600psgrp0hl46jcrxqrmy2b4db8hc0kcnbx"; depends=[MASS]; }; ABHgenotypeR = derive2 { name="ABHgenotypeR"; version="1.0.1"; sha256="08cpmnaaxsm5c5bjifnfxdlvg5inrf13biqpcl2yq5zpqjmiki0l"; depends=[ggplot2 reshape2]; }; @@ -16,7 +16,8 @@ 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]; }; ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; }; @@ -34,37 +35,41 @@ 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.1"; sha256="0llsfx6nfkhz37vdqd1mjbv0sh3v2q9drk7dml5qzdxkqxbbcyi6"; depends=[dplyr mgcv]; }; + 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]; }; ALKr = derive2 { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; }; ALS = derive2 { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; }; ALSCPC = derive2 { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; }; - ALSM = derive2 { name="ALSM"; version="0.1.9"; sha256="11lj493wpf2hkk6cim93qad9ikqq1ni5i65xbpzj1qwq8zv7bdzk"; depends=[car leaps SuppDists]; }; + ALSM = derive2 { name="ALSM"; version="0.2.0"; sha256="1g7zk8q462j4faq5wzzghkjc003ny6rj8hrymsgvh3fg3a72lvy3"; depends=[car leaps SuppDists]; }; ALTopt = derive2 { name="ALTopt"; version="0.1.1"; sha256="0frpnycnljz6r24cg4z99ivm3rbg9j1nxfkhw18vbrb7gcl1hqj6"; depends=[cubature lattice]; }; AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; }; AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; }; + AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="0.1.0"; sha256="0wqz9akk5340k0z5791dh8zmh7bfrj7ln05xlw548dql47w0xnrk"; depends=[]; }; AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; }; AMModels = derive2 { name="AMModels"; version="0.1.2"; sha256="0503vwagrlg14f8n15p7jsz25mvmjinr1cyns24hpp4y2fgbc56s"; depends=[unmarked]; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; 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.4.3"; sha256="0ayz5jl7pkz07n0dv4q99n3b47dwxj2ry6x4zc5xz5mgs5pgv2nl"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; + 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.0"; sha256="0iq008pq7drkl3d1m5qrhpqmmpvzxcbknax57lfzh5nxk657zx03"; 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]; }; @@ -75,21 +80,25 @@ 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.1"; sha256="0z3ghz0wmf2z4s2mnadiacir5frzlw77gca8fkvdh8rv5pwyy38c"; 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]; }; AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.62"; sha256="0cxl58by9mfd6hf4hb2d5qnm0pgb0gplgg7mm0qhvckvghjpb00q"; depends=[MASS mgcv nlme SemiPar]; }; - AdaptGauss = derive2 { name="AdaptGauss"; version="1.2.4"; sha256="0idqh1g4aypak1hm04vz2p3yklw6gbryjgm735gl46bzhlzlyyfv"; depends=[caTools ggplot2 mclust shiny]; }; + 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]; }; @@ -117,13 +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]; }; - ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.0"; sha256="04p1h2iahy6x65rdlrzcp18126dikrl2mapvrmh6jlwsg19b9sjc"; depends=[doParallel foreach stringr]; }; + 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.0"; sha256="0q0j08ih9isd91wkm39x887fjb01481g9d7i5086zs5jyahlfdkw"; depends=[coda hdrcde 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]; }; @@ -148,18 +158,21 @@ in with self; { BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; BAMBI = derive2 { name="BAMBI"; version="1.1.0"; sha256="1578iifmjzlhxvgih8l5va07w6zk8d6li7j1w91033lfpzivahr0"; depends=[label_switching Rcpp RcppArmadillo]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; }; - BANFF = derive2 { name="BANFF"; version="1.1"; sha256="1jzmrw170577xl6zliyf53862gk1gkpx4dhb6jyqxmipkn56b8la"; depends=[coda doParallel DPpackage foreach igraph mclust network pscl tmvtnorm]; }; + 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]; }; - BAS = derive2 { name="BAS"; version="1.4.3"; sha256="1ix277flarxp5xk3w3r715i1y30bx2d49c73s1xhjrwjlpj6jj74"; 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.0"; sha256="1sgz4clzbrbhj845nf1bbv16ww2j72vfvmb7n8hhnpv84r5q5dm9"; depends=[]; }; - BAT = derive2 { name="BAT"; version="1.5.5"; sha256="1kgrc2crj834qlnac2kb18pp3dfpryhsrh4l84jpm561kk3wzcqb"; depends=[nls2 raster spatstat vegan]; }; + BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; + 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.10"; sha256="0cw2mhw7qhdrx91zzd5iwyh7ch9fy4wxga8j63731q6sxr1airjl"; depends=[checkmate]; }; + 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]; }; BCBCSF = derive2 { name="BCBCSF"; version="1.0-1"; sha256="0hvhnra68i0x78n57nlbxmz0qwl2flng9w47089jw6f9hzkq9r7n"; depends=[abind]; }; BCC1997 = derive2 { name="BCC1997"; version="0.1.1"; sha256="1lqbivjkc7858jn54av1v9bzp0as43klgndbzkr59dc3l128xp12"; depends=[]; }; @@ -169,75 +182,85 @@ in with self; { BCEE = derive2 { name="BCEE"; version="1.1"; sha256="0pssqmjj13wjbkq8ls5r9zr08by24q0k9g4f1aysgxds2a4dawd1"; depends=[BMA]; }; BCEs0 = derive2 { name="BCEs0"; version="1.1-1"; sha256="1ipg8xliqnpfa4ga9r0gqf5sfa9gass4hvrlgxazs5hb18fpsl91"; depends=[]; }; BCRA = derive2 { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; }; - BCSub = derive2 { name="BCSub"; version="0.3"; sha256="0ap3mj6dm71xrx9aygnhmhkiyga0ln7xcg863da27yw2a74fdjxk"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; }; - BCellMA = derive2 { name="BCellMA"; version="0.3.2"; sha256="10n2z8p8m7np0d3v3w7ig2hmi9lxf59fiwib27zxz5xzdkdf61af"; depends=[ggplot2 reshape2]; }; + 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.33"; sha256="1l59dk9ml40yhl71xxv0agxhiljabv15dr9gpzfdsxjbnjgk6mqi"; 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.0.98"; sha256="0snw5vw0qxllfinjzqwgkyyfavzqx5kay1xx3xqjd3w8ncj1vqs5"; depends=[colorspace dygraphs FinTS forecast foreign fpp fracdiff ggplot2 grnn gtable htmlwidgets lmtest mFilter normtest plotly quadprog Rcpp rmarkdown rootSolve rugarch scales seasonal sqldf stringi stringr testthat timeDate TSA tseries TTR urca viridis 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=[]; }; - BIEN = derive2 { name="BIEN"; version="1.0.0"; sha256="1yzn7inxc471pnk8b1c6q3s07r8j400dhmplnk7nbbgfbagqi987"; depends=[ape DBI maptools rgdal rgeos RPostgreSQL sp]; }; - BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.13-24"; sha256="03p4k067s5wl7i9qy1iym9ndq4977a42nbbcac40akvibqpzhgdy"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; }; + 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="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.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]; }; BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; }; - BUCSS = derive2 { name="BUCSS"; version="0.0.1"; sha256="1in3y2z9maqd10fma67v8skpngsifr5cm9wsnfii0iflibs4ljbq"; depends=[]; }; + BUCSS = derive2 { name="BUCSS"; version="0.0.2"; sha256="188d9f0gdhym28xvvk5z10amdbg50w6ab4ik2r9qfc3p1v7k10q9"; depends=[]; }; BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; }; - BWStest = derive2 { name="BWStest"; version="0.2.0"; sha256="1fv4jv2fr740a1f8p6wild6szb03j8vm59y12nl4cl4aa6wn40rz"; depends=[memoise Rcpp]; }; + BWStest = derive2 { name="BWStest"; version="0.2.1"; sha256="1kwd1s1dd21qca31np49aql839j8325y8bnxlcq84nw48vqv0jgc"; depends=[memoise Rcpp]; }; BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; }; BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; }; 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.1.7"; sha256="06bvx2f094r4rkzpv517h81pjg211k7ajfcq0k3lxdar7ck1388a"; 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]; }; + BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.1"; sha256="0qqq7f2s9jqr85xvab9d4pma4aknlfigh4vgm445bwamb6x8ms2n"; depends=[foreach iterators R6 RColorBrewer rTensor]; }; + 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]; }; BayHap = derive2 { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; @@ -259,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]; }; @@ -268,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.0"; sha256="195y5jwbdmi9m4vbxmcc3yw8gx2ay2vgwxsa29yb3sy542wiy0ii"; 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="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm mvtnorm network]; }; + 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]; }; @@ -296,24 +322,26 @@ in with self; { BigQuic = derive2 { name="BigQuic"; version="1.1-7"; sha256="1bhi9dilrprgjvqyc2hb4a0y8rm9la0m5lgry9mf184p56z1syzb"; depends=[Matrix Rcpp scalreg]; }; BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; }; BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; }; - BigVAR = derive2 { name="BigVAR"; version="1.0.1"; sha256="1hsx6fl3zjxfhjr18h2gbhgh0zzh9mdmr3zh0jnbfk8wv3y1nhxv"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; + BigVAR = derive2 { name="BigVAR"; version="1.0.2"; sha256="14vb6nc6bn22dd112sg9zypkchmkv17gnwxs915k0k5vbb9czlr5"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; BinNonNor = derive2 { name="BinNonNor"; version="1.3"; sha256="0lxhfys066wz8svr9mjb28rd85lhjicqw4py4j96w9zgi974ha51"; depends=[BB corpcor Matrix mvtnorm]; }; BinNor = derive2 { name="BinNor"; version="2.1"; sha256="14b90y40wzqwaf1v1l92s17j0kggbcsg5c90l1r7wi3j4xcl20pc"; depends=[corpcor Matrix mvtnorm psych]; }; - BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.2"; sha256="196mn1ldbj4ngrrvr3d8aqwdjcprpjh0z66655vbzqb9m3nj893l"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; + BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.3"; sha256="18cks0hh6a49jr1yq0pwgw3scy1b7cl2060miwxswpwry9lcnnn5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; Binarize = derive2 { name="Binarize"; version="1.2"; sha256="014iagr76y3v7ljn6zlbg1hxwbwdi889bqxa7hwmqrcybnla22ja"; depends=[diptest]; }; BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; }; 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.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.2"; sha256="1igav8l1s4byannhkdm5fznqrga6cv9ws1lxyam221h8cl3qz8aw"; depends=[arules class discretization e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; + 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]; }; BivRegBLS = derive2 { name="BivRegBLS"; version="1.0.0"; sha256="1fi399vv54dnfywxbc8yb1r58lrl7zpqkahvcx3f5svjy20dvvbw"; depends=[ellipse]; }; BivUnifBin = derive2 { name="BivUnifBin"; version="1.1"; sha256="0dxkk3pjnbjx04r9870lcr3hl4r5j7cd3y1fn800fz0qjnv5dahd"; depends=[BinOrdNonNor rootSolve]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; @@ -323,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-33"; sha256="1i01bfcmzpy9i3f3x0pmw2c6ff4zx4vk13isdnvkhbbks6ppm394"; depends=[mvtnorm]; }; + 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.5"; sha256="1p1bgswzjply3afcgxdn67dq3gb46i9gxwm1l2v79wjpiizhagrb"; depends=[BH MASS]; }; - BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.7.0"; sha256="08xb931q3j16r4942p7r6cl4capc19nbywzg4hr7yv0fzcmpjprb"; 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.6"; sha256="1qzy93fzzj4b0x0m9rrlh1wmv44rd9kvjw6wkdd3m3l2qbqsbzn8"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart 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]; }; - CARBayesST = derive2 { name="CARBayesST"; version="2.4"; sha256="1z0w4cbs3gbll4fzcmg4vgbnx0bq15nb1c69aql4mdqm6i0zx6xr"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep truncdist]; }; + 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]; }; @@ -373,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.4-0"; sha256="1gbzk9iijn37njal6fq70y6hhl44zgi79yb3lwp3cxys1j2fp0kw"; 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]; }; @@ -381,12 +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=[]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.0.8"; sha256="03hvvkm7i2q73hkcm79136lzjn99apqmcdlfghbz0318490gxin5"; depends=[]; }; + CHMM = derive2 { name="CHMM"; version="0.1.0"; sha256="18wpld1anws9hv1z8sgib5nvjdg1wmk4dv5s1ysh8s0rzwnq9x2p"; depends=[mclust]; }; + 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]; }; @@ -399,61 +430,69 @@ in with self; { CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; }; CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; - CMplot = derive2 { name="CMplot"; version="3.1.4"; sha256="0ph8pqmlbm2j40dq4lqyfy43hz5s958vvqaglzmcqdvkgpv1ni0a"; depends=[]; }; + CMplot = derive2 { name="CMplot"; version="3.2.0"; sha256="0hrym0kadwyc36hpgskls1fhipiq1vrpyhsjzrkny10m9yny5c8i"; depends=[]; }; + CNLTreg = derive2 { name="CNLTreg"; version="0.1"; sha256="1fjc45kv2nm902vpfynfxj0n7nm2prazm44nhg2m30vd6l1ijisv"; depends=[adlift miscTools nlt]; }; + CNLTtsa = derive2 { name="CNLTtsa"; version="0.1"; sha256="0s98ckg6ms3kh49b8la2d8rsdb0m4m0v8gdbj48nqxncdvg25qk4"; depends=[adlift CNLTreg fields nlt]; }; CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; CNVassoc = derive2 { name="CNVassoc"; version="2.2"; sha256="0rvb5sl7kfyb9jp07w4zk8817s9xld9b2cb0m33lrs4kbsv7rpnx"; depends=[CNVassocData mclust mixdist survival]; }; CNVassocData = derive2 { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; }; CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; + CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; }; COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; COCONUT = derive2 { name="COCONUT"; version="1.0.1"; sha256="1bpn1zhlbm99w8d80lp7iasi1ivvh0ndhpzh8glmnlnanm2b06ni"; depends=[]; }; 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.3.5"; sha256="15w78h0kkqbisp34g4wj2mkq4c0pb2166f1m7s65iifnnd5plvb6"; 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.0"; sha256="1pcr1pfchys4x566sa69als59vwpaa91jhl038pkj69scchv0max"; depends=[FactoMineR gWidgets pander raster readxl REdaS]; }; + 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=[]; }; - CORElearn = derive2 { name="CORElearn"; version="1.48.0"; sha256="1pm2gqns1d7yxv4i5h110b6s6i6an7xnz379n1cm8rcfnlpndryz"; depends=[cluster rpart]; }; + CORElearn = derive2 { name="CORElearn"; version="1.50.3"; sha256="0pa8jlvqgkdw3r5k6wlalq6xnqqc75gg2hzmc7s0qy57wjx450jw"; depends=[cluster rpart]; }; CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; }; COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; }; - CPBayes = derive2 { name="CPBayes"; version="0.1.0"; sha256="004n2s09b8wfg8aj7j400hvkbwxsxd27fyk72x6nnc8lkrpwzs5b"; depends=[MASS]; }; + CPBayes = derive2 { name="CPBayes"; version="0.2.0"; sha256="1h4mipvmcjhs1s1dqbibxz2sf73psbwplgc5ki65y5654yqc26pl"; depends=[forestplot MASS]; }; CPE = derive2 { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[rms survival]; }; CPHshape = derive2 { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; }; CPMCGLM = derive2 { name="CPMCGLM"; version="1.1"; sha256="1w8yp37vxz2cl0yqdzpyxdfq2scz2h9i4crjzjmjzpzffi45f06s"; depends=[mvtnorm plyr]; }; + 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=[]; }; CRTgeeDR = derive2 { name="CRTgeeDR"; version="1.2"; sha256="0dq5q1gb392imfgqhzqphc7h5af0qcx2vx4fh77gwpz08ycrlkmg"; depends=[ggplot2 MASS Matrix]; }; CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; }; + CSeqpat = derive2 { name="CSeqpat"; version="0.1.0"; sha256="097r5hhq45wl783qakqs8j2b3315j1bvk9pcpssx6svkn507hh66"; depends=[NLP tm]; }; CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; }; 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=[]; }; + CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; }; CVST = derive2 { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; }; CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; }; CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; }; CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; - CaDENCE = derive2 { name="CaDENCE"; version="1.2.3"; sha256="1810a785czaxwfvhjnmhzqg743mgcgrdp3j1irlfl9pbli0ppidx"; depends=[pso]; }; + CaDENCE = derive2 { name="CaDENCE"; version="1.2.4"; sha256="1v6930wyh12jc2mrr4svg36nppxd1bqvcqardj2bjxzxzg998bq7"; depends=[pso]; }; Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; }; - Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.1"; sha256="1wgksvfkpbr7sicfnv9g5w04kbrb9pwl40aqbflzy9kmqbjy5hhx"; depends=[]; }; + Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.2"; sha256="07g7ik3xb9ijghkz94qyk87c2d4q942h4d0yicwr1j1xzcv5qzsw"; depends=[]; }; CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.0"; sha256="1r3318rzh29cgq72gdp16z60xkan7hyh1vj4gjg3pzbxy8zawqxx"; depends=[survey]; }; CampaR1 = derive2 { name="CampaR1"; version="0.8.4"; sha256="0qlbrmqfs38bg9hsmvzd3cfgsbd2zx99f64bjv1gfhkmysmg1ysb"; depends=[bio3d ggplot2]; }; - Canopy = derive2 { name="Canopy"; version="1.1.1"; sha256="0hv7ar4kj3d7cfpj2j5wcdbzag7w7x0zifay5hdyr0j6v776zvh6"; depends=[ape fields]; }; + Canopy = derive2 { name="Canopy"; version="1.2.0"; sha256="10z511vp9nmyf7jaihdx2367ddsnlrfg4rdzlz7rg9b5k9d92pja"; depends=[ape fields pheatmap scatterplot3d]; }; CarletonStats = derive2 { name="CarletonStats"; version="1.3"; sha256="1a8ic2ny2zkqy6xsnzhlc3hybhk200d8jbdbjfy7jav7n757kr0y"; depends=[]; }; CatDyn = derive2 { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; }; - CatEncoders = derive2 { name="CatEncoders"; version="0.1.0"; sha256="1vg8a4v0fj8c4dwpynl8jf9d9lpjl08xpzkr4aa32gqkkk016mh3"; depends=[data_table Matrix]; }; + CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; }; 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.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]; }; @@ -470,38 +509,45 @@ 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]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; CoClust = derive2 { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; }; - CoFRA = derive2 { name="CoFRA"; version="0.1001"; sha256="1nb6054mb8md3i0108n6jgwc9ydn9vn82q01jlnynfq2r3j06drw"; depends=[gplots Rcpp]; }; + 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]; }; @@ -520,38 +566,41 @@ in with self; { Comp2ROC = derive2 { name="Comp2ROC"; version="1.1.4"; sha256="06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d"; depends=[boot ROCR]; }; CompGLM = derive2 { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; }; CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; }; - CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.2"; sha256="0bsgbdblxpv57mbwnf51xyiydp2bqyxkg4zzwqki85cv5xqlrq1n"; depends=[]; }; + CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; }; CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; }; CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; }; 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=[]; }; - Conigrave = derive2 { name="Conigrave"; version="0.1.0"; sha256="173panb3pz09fikzx3p0yjszizzi4sjl4pzrcw73ywvzkksg55kr"; depends=[ggplot2 miceadds mitools]; }; + 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="1.0.2"; sha256="11pdccndmiz4vm15kaidzwy92vi2aqi5klwxag4p2xk1xivnlm0n"; depends=[gtools MASS 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.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; }; + 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=[]; }; CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.5"; sha256="0zc2i3d7b0p7qn6gy1pygq6xn31fkasdqgqa40zidzjwiwl3h3g4"; depends=[ggplot2 plyr reshape2 rstan]; }; 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]; }; - CorrToolBox = derive2 { name="CorrToolBox"; version="1.3"; sha256="0q6w3avlpdr35aigc2a03wzi36z5k3c7hacbarjpfv9lig3c35wc"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; + CorrToolBox = derive2 { name="CorrToolBox"; version="1.4"; sha256="15x9l4swgrbry10k5iws75xs4bbh7mpcg4f4fx9yd9z92yq72ly2"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.14"; sha256="1if4qb1d6mg3435pk3znln8id8fj12n3j9sjv4zn104v2fr90mhr"; depends=[caTools digest xcms XML]; }; Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; }; CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; }; @@ -560,16 +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.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]; }; @@ -577,25 +627,28 @@ 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.0"; sha256="1hkd9chpn78hwjbyv1c9pa03fh3p3bj2axilibz8pyxd2vfqdk3y"; 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.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-1"; sha256="0f904cpyq140fbsxfqrm3wg41bncf6h2rkxfd37ij5m0qp067f0w"; depends=[limma]; }; + DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; }; - DAISIE = derive2 { name="DAISIE"; version="1.2"; sha256="0570q8bs2464516ink56a1ir4p5chdwnj1vygywn9lgc7n4dricd"; depends=[DDD deSolve subplex]; }; + DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; 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.4"; sha256="1p25ddnn1r7lcqm077kxq0l5kv5104gnj0q9xf3yjyzgm4vsrfrn"; 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.5-1"; sha256="1idwm9lkmz6ns6h0vvgml18mg0k7vjqiv9p5svrdcmx7r1rirpdi"; 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=[]; }; DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; }; DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; @@ -607,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=[]; }; @@ -619,21 +673,21 @@ in with self; { DEploid = derive2 { name="DEploid"; version="0.3.2"; sha256="12yh9w6qlg3l9w9i7isic1g825d9r7qwwwf3d0x8j7prim37w5yr"; depends=[Rcpp]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; }; - DHARMa = derive2 { name="DHARMa"; version="0.1.3"; sha256="0kq8q13f3jdjczsc3vq8x6i85qydqk5jmm0yl8m6x6w2nva5glvg"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; }; + 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.2"; sha256="13qpv6k3dn793kykxi9bmj2bl893lql7zsyfp6s3r7wp29k3kjj1"; depends=[abind boot MASS Rcpp readxl snowfall]; }; + 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]; }; - DNAprofiles = derive2 { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[bit Rcpp RcppProgress]; }; DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; }; DNAtools = derive2 { name="DNAtools"; version="0.1-22"; sha256="1kkqbzwbivd78lpphsn9xqdxqc46ng6f86nqns18gq0s2g8gvys1"; depends=[multicool Rcpp Rsolnp]; }; DNLC = derive2 { name="DNLC"; version="1.0.0"; sha256="05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00"; depends=[caTools fdrtool GOstats igraph locfdr mvtnorm spdep]; }; @@ -643,8 +697,9 @@ 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.0.0"; sha256="07n5iq0yv9f09wibbkamyz2x1b6sp4v0mzasfmllzlzqsr6s50gz"; depends=[msgps]; }; + 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]; }; DRR = derive2 { name="DRR"; version="0.0.2"; sha256="1scfwp6ry6apxzqjclsmn2frxp9qfw6zxsxn5w0j0q3sz42hz1h2"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; @@ -662,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]; }; @@ -673,7 +729,9 @@ in with self; { DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; }; DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; }; 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=[]; }; @@ -687,21 +745,24 @@ in with self; { DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; }; 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="4.0.3"; sha256="15zwfqvi4qvv7gp34nvsbx2zhp21b6f7dyyxb09hrvll0bczxbaj"; depends=[]; }; - Demerelate = derive2 { name="Demerelate"; version="0.9-2"; sha256="00x0jjfzcq819pfrzs0jr5rvzpk4828q8kdb05icc79im1yq627v"; depends=[fts mlogit sfsmisc vegan]; }; + 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.19"; sha256="086ivipgzpq8pwc7r9a0jpd6qswp6b034jn603fw9rxz8ygz7rvj"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; + 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]; }; @@ -718,8 +779,9 @@ 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=[]; }; DiscML = derive2 { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; }; DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; }; @@ -735,7 +797,7 @@ in with self; { DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DiversitySampler = derive2 { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; - DoE_base = derive2 { name="DoE.base"; version="0.29"; sha256="013p4y7imf6nb1mq7dx62c0nq5shf1yzdlfbri86icrdm00s63fd"; depends=[combinat conf_design lattice MASS vcd]; }; + DoE_base = derive2 { name="DoE.base"; version="0.30"; sha256="0zpb5cvraznaawkrc7swwvsq363slv0sq1w4rs80jg14sshvr67n"; depends=[combinat conf_design lattice MASS vcd]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; }; Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; }; @@ -744,15 +806,16 @@ in with self; { DoubleCone = derive2 { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj MASS Matrix]; }; DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; }; Dowd = derive2 { name="Dowd"; version="0.12"; sha256="1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk"; depends=[bootstrap forecast MASS]; }; + Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; }; 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.13"; sha256="0a1p2l4rpafpbggi3vshcd7xkkn1g5jy93hypgk9g7qskvhzyq0n"; depends=[MASS]; }; + 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.0"; sha256="16xsgm6nb8qdk5j0srh6w7jda807sh3m73p0sbvvb5h4rf8vdy06"; depends=[BBmisc compare ggplot2 rms shiny stargazer survival]; }; - DynTxRegime = derive2 { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; }; + DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; }; + 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=[]; }; @@ -760,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]; }; @@ -775,26 +839,29 @@ 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=[]; }; - EMVC = derive2 { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; }; + EMVC = derive2 { name="EMVC"; version="0.3"; sha256="1n7fxmqg8762lc7lg50h6wcrxrrz4nvi0xdaganz84l8vp8w90ms"; depends=[]; }; EMbC = derive2 { name="EMbC"; version="2.0.0"; sha256="11qnln7a36zcrycbs0lz0qdvili25adv0rxdybmb6kk20a6q1lwf"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; }; ENMeval = derive2 { name="ENMeval"; version="0.2.2"; sha256="1w8mjcmxxkx8lxxzzbjpv1i7cm6l8hhml7ynp80s9yiprr04bq9c"; depends=[dismo doParallel foreach raster rJava]; }; ENiRG = derive2 { name="ENiRG"; version="1.0.1"; sha256="0yjy7g0pia4g18h7mawkxn77dnnqcajnbml21rrv63qwlr347355"; depends=[ade4 fgui gdata miniGUI raster rgrass7 sp]; }; @@ -816,29 +883,34 @@ 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]; }; Ecfun = derive2 { name="Ecfun"; version="0.1-7"; sha256="0s4hhvwyi411xr7c1fv098nmwqjcyvh8vy65j5w9hd80l864lvkl"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; }; - EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.0-3"; sha256="09mrbg99id65y2wnmkpdjn39rd7gffa9rwqymqkcmrlz95pizkrm"; depends=[ggplot2 party raster reshape2 rgdal rkt SoDA sp]; }; + EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1"; sha256="0ww0p4allaaz2zmj88105xr75gffcsycjjyy1ph4m9q7w5sw3c5y"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; }; + EcoIndR = derive2 { name="EcoIndR"; version="1.0"; sha256="0yw27rv0w7z276cbjqqiidf4r5razp0xmam8kl8jd06q6yjpizrw"; depends=[]; }; EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; 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]; }; @@ -853,22 +925,28 @@ 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.10"; sha256="0kmyan9jhjsr9f1yhff94yyy56xhm9irfrzm2m4dpf56376m2w8b"; 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.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=[]; }; - EpiModel = derive2 { name="EpiModel"; version="1.2.8"; sha256="1h4mspa7yi2z7rj98nzs3ay2m7gccv7bp63p9sjnqp08pdwk3x5y"; 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]; }; EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; }; + EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.1.2"; sha256="148srhlpzh0scvnkjbkyia1pr8a2ridabm3dahw4zn7p3cryiyb1"; depends=[igraph qgraph]; }; + EthSEQ = derive2 { name="EthSEQ"; version="2.0.1"; sha256="014yhh1msn1vg4ncrs557xrw25vd6jplbsqw2x728hjfivrlwl78"; depends=[data_table gdsfmt rgeos SNPRelate]; }; EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.0"; sha256="08m7igh6n8haf8yi8ikrz6ih4agvsnx415kdx4cgjw4xilvgpgqm"; depends=[clinfun data_table plyr shiny VGAM]; }; EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; 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]; }; @@ -876,11 +954,13 @@ 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=[]; }; - ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.1.4"; sha256="1n608qz2mj1x36kmbyi7lp0zp744bf9k1zq15yhdv8yy7pcdfl0d"; depends=[CORElearn semiArtificial]; }; + 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]; }; FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; }; @@ -891,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=[]; }; @@ -902,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.1.8"; sha256="0zslr3k3wjvin14i7y2qfc5acf864kp9ih52bq0sb34590papy18"; depends=[circlize MASS rpart]; }; + 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]; }; @@ -917,10 +998,11 @@ 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.5"; sha256="0kyvnqjdr82x82l3isqw4kr31x0a15nzgmlggxbv9rjk3pxjnfbx"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; }; + 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]; }; + FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; }; FME = derive2 { name="FME"; version="1.3.5"; sha256="1r1mb61hylsgcryac35bz1pzfcw27gzpvfwkkf0sh754ya6xh69n"; depends=[coda deSolve MASS minpack_lm minqa rootSolve]; }; FMP = derive2 { name="FMP"; version="1.4"; sha256="0w11a78nz4n7zih9h00xkv7prsy9hlxphbpa7hpnbvq9r98g08qm"; depends=[]; }; FMStable = derive2 { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; }; @@ -932,14 +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]; }; - FSA = derive2 { name="FSA"; version="0.8.11"; sha256="0pwqdw7kq2fkxqwwazjcx3g9y6cwrkanfv2j58q2hhjzrhyp08qs"; depends=[car dplyr epitools gplots plotrix plyr sciplot]; }; - FSAdata = derive2 { name="FSAdata"; version="0.3.5"; sha256="0cj4pvhb52zpxi5r3ffkpmwf420waw5kczfw9p9jv6d5byhi6jd5"; depends=[]; }; - FSInteract = derive2 { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Matrix Rcpp]; }; + 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.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=[]; }; @@ -947,23 +1032,24 @@ in with self; { FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; }; 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]; }; - FactoMineR = derive2 { name="FactoMineR"; version="1.35"; sha256="1a8mnyjh3915h3n46p6pph7nv9chxj02pjsyjv2ic78xavz7dqdg"; depends=[car cluster ellipse flashClust knitr lattice leaps MASS scatterplot3d]; }; - FactoRizationMachines = derive2 { name="FactoRizationMachines"; version="0.1"; sha256="0iycm1ih0947b8qsm1p3x42g088pk3vvayb96irmj0cd2a0fix6c"; depends=[Matrix Rcpp]; }; + FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.0"; sha256="10yim7xvzizr383hygs4s2f59ipbl4sj2i85g55zw7j5crangql3"; depends=[FactoMineR rmarkdown rrcov]; }; + 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]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; - FamEvent = derive2 { name="FamEvent"; version="1.2"; sha256="1z611g6nginmga2mzkjlplwmfiiply2wwnbn6icsn412wzj8a606"; depends=[kinship2 MASS survival truncnorm]; }; + FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; }; Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; }; FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; }; FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; FastHCS = derive2 { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; }; - FastImputation = derive2 { name="FastImputation"; version="1.3.1"; sha256="05rs5mzb7aww7x06zqn4q053jqxbrc185ra11brm0xkb02cc1dih"; depends=[]; }; + FastImputation = derive2 { name="FastImputation"; version="2.0"; sha256="0zhin8000c78kba6zly9mvpxdxx68kcsh2hn697pxkl73wqsz3p5"; depends=[Matrix]; }; FastKM = derive2 { name="FastKM"; version="1.0"; sha256="0sqxd2pg9y6yn1lnxni32ca3bgbmz04k9z37q9pzgijvf9qvik3f"; depends=[rARPACK]; }; FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; }; 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]; }; @@ -980,20 +1066,23 @@ 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]; }; - ForestTools = derive2 { name="ForestTools"; version="0.1.0"; sha256="0jvsz96ll3apl4br5m8cbs24yds05xh93brvrib6yiwcss55avf1"; depends=[APfun imager maptools raster rgdal rgeos sp TileManager]; }; + 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=[]; }; ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; }; @@ -1005,18 +1094,19 @@ 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]; }; FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; }; 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.8.0"; sha256="1rpmwyqgdbc4hcx375m6j6djbhm4ggb6j9sni2dq8rwza96qv5zb"; depends=[]; }; - FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-3"; sha256="1c7yynrz0vfvan9mfin2vsrkhhi3sy8c5nya7l8hja0nh1a4bzki"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; + FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; }; + 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=[]; }; - FuzzyR = derive2 { name="FuzzyR"; version="2.0"; sha256="1li54ad0lqmmdsr9pcp56d2n8ki6hzdljy8l3lzhrsjmii7ycasw"; depends=[plyr shiny]; }; + FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="1.0"; sha256="1mqpdii0lf1p19kmzw93bzqbfjx2jzbphd0aacyzzai72vzx6aj1"; depends=[FuzzyNumbers]; }; + FuzzyR = derive2 { name="FuzzyR"; version="2.1"; sha256="08mhwzyksw0snxxcwn2kg62ya8smfvrls30znqhmnbkn5ijz0642"; depends=[plyr shiny]; }; FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.2"; sha256="01rdvsvdfyg8cz6rl1kzwzg9ns5zmikmb7ljlavvzcbg4i1vliqq"; depends=[DEoptim FuzzyNumbers MultinomialCI]; }; FuzzyStatTra = derive2 { name="FuzzyStatTra"; version="1.0"; sha256="1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00"; depends=[]; }; FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; }; @@ -1026,13 +1116,15 @@ in with self; { GA4Stratification = derive2 { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; }; 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.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.5"; sha256="14n973bks28chxxlidz578359nh8kd2jjp32k1fp2r8qfddsk21i"; 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=[]; }; @@ -1040,38 +1132,40 @@ in with self; { GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; GCalignR = derive2 { name="GCalignR"; version="0.1.0"; sha256="0prky8n2j6xvq4srxcp08k4wlikg7hhj78mw7fjqbf01sl0zhwz5"; depends=[ggplot2 readr reshape2 stringr]; }; GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; - GDAtools = derive2 { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; }; + GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; - GDINA = derive2 { name="GDINA"; version="1.2.1"; sha256="1ay3s4r8v4zzggmxbq7m1kppb2bpa8mcgsiaak82955l19k40dy4"; depends=[alabama data_table ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp]; }; + 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.3-8"; sha256="14nar0djn8jzcyv0aij79xr3iqbgllrpcnfazi865plfa5ah7k9v"; depends=[fields MBA RPMG splancs]; }; - GERGM = derive2 { name="GERGM"; version="0.10.0"; sha256="0fg984d553zfnnv00flmlzib4zjvgp33lgmbczvr4wssj4rsbpj7"; depends=[BH coda ggplot2 igraph plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; }; - GESE = derive2 { name="GESE"; version="2.0.0"; sha256="04gd9xplwk5kknwikn5c8wa01bbc10ijfj08gpycf0x0q54szf8y"; depends=[kinship2]; }; + 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.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.4"; sha256="13p6wi72z6j7iyp5hv16ndvsq6jf6hdqgcmf1i8g713gn73l79kj"; depends=[VGAM]; }; + GEVcdn = derive2 { name="GEVcdn"; version="1.1.5"; sha256="0nqym5jqgshx6ad4k4nwain6lnhx5y7s3b10f2xmcn93287p3rji"; depends=[VGAM]; }; GEint = derive2 { name="GEint"; version="0.1.2"; sha256="12jkrflv9p05bnsx5xqyr55c18q1vrs1wlcni38zyppd334yyiyh"; depends=[geepack mvtnorm nleqslv pracma rje speedglm]; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; - GFA = derive2 { name="GFA"; version="1.0.0"; sha256="1mgcgdypfpd3i5n5kgk162p1jp9gfz1h7h3rlzrw9srsbc6dza97"; depends=[]; }; + 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-11"; sha256="1ir3zyi9xxq9aq1zxl506x1fwxsv7rd350k461l9lc2r5338xrgh"; depends=[gtools lars mvtnorm]; }; - GGally = derive2 { name="GGally"; version="1.3.0"; sha256="12ddab0nd0f9c7bb6cx3c22mliyvc8xsxv26aqz3cvfbla8crp3b"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape]; }; + GGMselect = derive2 { name="GGMselect"; version="0.1-12"; sha256="1vjzmnnvnckr8s0badqm3l15arsa31fwg4wq6c2wx3g0hi1nzxxs"; depends=[gtools lars mvtnorm]; }; + 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]; }; GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; }; + GLIDE = derive2 { name="GLIDE"; version="1.0.1"; sha256="02pmn0ydrmblgchz189avlrz3zaz0qfhy75d945yphpmvjf9f9m5"; depends=[doParallel foreach MASS]; }; GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; }; GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; }; GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; }; + GMAC = derive2 { name="GMAC"; version="1.0"; sha256="0936j60cf7jvy8frr8p8ysbg5if14r0wm896aq89ivxfypvw7n1g"; depends=[qvalue]; }; GMCM = derive2 { name="GMCM"; version="1.2.4"; sha256="1y0yr6i4l28qw22drca7r4mzqjfbpm3jdssfb7p8pc664g6vmm81"; depends=[Rcpp RcppArmadillo]; }; GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; }; GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; }; @@ -1085,12 +1179,14 @@ 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]; }; GPseq = derive2 { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; }; - GPvam = derive2 { name="GPvam"; version="3.0-3"; sha256="0dmws29ahbjhx82s2i8jfzhl8pp5q201a592w90jvhwy2bnm1ywk"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + GPvam = derive2 { name="GPvam"; version="3.0-4"; sha256="1vqvm9647jnw91vpf4dhjjp9rc05n5k6qgzilfpmcg4a7zzi917k"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; GRANBase = derive2 { name="GRANBase"; version="1.2.1"; sha256="1fxbgl7z61qdfg0lcjylc00wr819kg9kycc42gsjl1gxxy94b433"; depends=[hwriter switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; }; GRS_test = derive2 { name="GRS.test"; version="1.0"; sha256="1igyb3rma1v2arx1k16fanvzmlywx0n9lf5jz69vnf6z2qmqvrg5"; depends=[]; }; @@ -1100,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.1"; sha256="0r0bgfmlxb81am34gm5c1bxfwkjl82f51ck1lqf7jwc7w08d75az"; 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.1"; sha256="14rc9gs4375mwk5gzz17iadb5gnphw411rh4sxhg8y48gj6drlqs"; 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]; }; @@ -1117,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-1"; sha256="1030qkrwn4b40553j80ignq2dvrnsi1p6wvhq7iq7nmc9jcil1wz"; 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]; }; @@ -1140,23 +1237,24 @@ 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]; }; - GeneralTree = derive2 { name="GeneralTree"; version="0.0.1"; sha256="0wlhpxky4vckmcg0imvcxsg2rg2pbrh5822lpkdp28aj7b4s7wqv"; depends=[R6]; }; 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=[]; }; - GenomicTools = derive2 { name="GenomicTools"; version="0.2.3"; sha256="1ga2myi2y5rpab0v58y1ndfqrxmbl1wdr3d0s8215apwiax4rfm4"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; }; + 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.0"; sha256="10zwa5grkz95q69l8yvvcj071lql7hh7f7cbmjxl1vnsyanlan4x"; depends=[agricolae assertthat dplyr ggplot2 gtools magrittr shiny tidyr]; }; - GetHFData = derive2 { name="GetHFData"; version="1.2.4"; sha256="0bhrxxrmhmvpks81n9xxzcwgp370ym7sxz6x7cnv50gzyd1yz9sm"; depends=[curl dplyr lubridate RCurl readr stringr]; }; + 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.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.5"; sha256="109x6m904x1cnqb9d0s4yglx6lfllhpdzl6is5d559bfsb990vwd"; depends=[GlobalOptions rjson]; }; + GetoptLong = derive2 { name="GetoptLong"; version="0.1.6"; sha256="1d98gcvlvp9nz5lbnzr0kkpc2hbkx74hlhrnybqhg1gdwc3g09pm"; depends=[GlobalOptions rjson]; }; GiANT = derive2 { name="GiANT"; version="1.2"; sha256="0h9jx2vpgpzlinf6v9mxj260r22nlqml8xnd2jknw36j5imim57w"; depends=[]; }; GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; }; GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; }; @@ -1166,16 +1264,16 @@ 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.10"; sha256="0vkfr29q92g02138g2iscn95g3dc3shvzlmrh502fw89asm7kh57"; 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]; }; GofKmt = derive2 { name="GofKmt"; version="1.0"; sha256="1b91js02kam515p7s0c6v63rl31wk16bvkr4f4z25wa5nb8g8p81"; depends=[Rsolnp]; }; GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; }; - Grace = derive2 { name="Grace"; version="0.5.1"; sha256="1bx2bqfxxgq5dq9825iad5zgjxx3b2lgw18lzc1fxq5rnximsh08"; depends=[glmnet MASS scalreg]; }; + Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; }; GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; }; GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; }; - GraphKit = derive2 { name="GraphKit"; version="0.4"; sha256="12h7p1ka4036d3c1vri014jci02zkjgira6rk8f1mcrv94sywinc"; depends=[Rcpp RcppArmadillo]; }; + GraphKit = derive2 { name="GraphKit"; version="0.5"; sha256="1ip0rkrwxpjcd9mhz2z8n7lwdrjj1idymsafm8aac1hfbxr6c0xz"; depends=[Rcpp RcppArmadillo]; }; GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; }; GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.0"; sha256="00a2lcqrj17ckw4npkvm3sxydfn2lyvs7pzpccy3xnzrr006ibsx"; depends=[rJava]; }; @@ -1185,7 +1283,7 @@ in with self; { GroupSeq = derive2 { name="GroupSeq"; version="1.3.4"; sha256="0m127793gh00spj2ghapmysvf3dbxhpf2jlms3xxrflh7ajrmy5m"; depends=[]; }; GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; }; GrowingSOM = derive2 { name="GrowingSOM"; version="0.1.1"; sha256="0pzhf27kk9nc73w6wp0qd50i7hk7904y90l2ppdgy738z9gcbz4i"; depends=[plotrix]; }; - GrpString = derive2 { name="GrpString"; version="0.1.1"; sha256="0kqz2m6ycj83s5kcgbf7l6cpfgfrza7b0y23cgljf952pys2ndys"; depends=[plyr]; }; + GrpString = derive2 { name="GrpString"; version="0.3.1"; sha256="0j2xyil4z3dcl306ralf277ixypk0i0dfysbbl5j22ykgg21lbfd"; depends=[plyr]; }; GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; }; GuardianR = derive2 { name="GuardianR"; version="0.8"; sha256="07bg7wz7d2rgjkw5ldzi5p7nd4ch39m6ql5w4sqnvds4r08jspj9"; depends=[RCurl RJSONIO]; }; Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; }; @@ -1196,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=[]; }; @@ -1206,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=[]; }; @@ -1223,58 +1322,61 @@ in with self; { HMMpa = derive2 { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; }; HMP = derive2 { name="HMP"; version="1.4.3"; sha256="15fsyk61y141wdkc5cjrw05gc5kzl2a8cmk2n54c8gmhhjbjy692"; depends=[dirmult doParallel foreach gplots MASS]; }; HMPTrees = derive2 { name="HMPTrees"; version="1.3"; sha256="1q0zfwhzfr45mykql8hsp6pzkfhcplr7gkq7dbd8xa97wxsf63yd"; depends=[ape dirmult doParallel foreach HMP]; }; - HMR = derive2 { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; }; + HMR = derive2 { name="HMR"; version="0.4.2"; sha256="0rbpghih99avaq803f6hb66pfbqgzh1i2yaqs0mhbj61yyjzyb7b"; depends=[]; }; HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; - HRM = derive2 { name="HRM"; version="0.5.0"; sha256="0xppx5ip0qhrfhri7yzqmkqrr6lf1a4pmk2lc5vxmsxdfs273y9r"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; }; + 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=[]; }; HWxtest = derive2 { name="HWxtest"; version="1.1.7"; sha256="030fl88bj0g7y9b9kd56bnxh0cad6y84bnmvsgwlanb51n3ggz3w"; depends=[]; }; + HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; }; Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; }; 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.8"; sha256="1lw0p02rzb4b9b66435w8dr058bfzpcygfgi75av28lrc75c6skv"; depends=[coda]; }; + 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]; }; - HoRM = derive2 { name="HoRM"; version="0.1.0"; sha256="07vq8v1pdmm35sna9yz7n6al4g9mf45sx1rbzgsymyjac38zw62k"; depends=[ggplot2 MASS orthopolynom quantmod]; }; + 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]; }; @@ -1283,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=[]; }; @@ -1297,7 +1400,7 @@ in with self; { ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; ICCbin = derive2 { name="ICCbin"; version="1.0"; sha256="1ybhxk5bvgfsz45r1kbb8b82qwjb8a88q11x5c4dbdk85fkxg3w9"; depends=[]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; - ICEbox = derive2 { name="ICEbox"; version="1.1"; sha256="0yv9ybvk6s3lnyx5xfsnx19x32r9g9gk7klkpc8q672pl4fn4yp5"; depends=[sfsmisc]; }; + ICEbox = derive2 { name="ICEbox"; version="1.1.1"; sha256="1j2sdszvi6h1pjv1n46qymgfxc7rdznspjxpyf2aa3axh0v0l3zk"; depends=[sfsmisc]; }; ICEinfer = derive2 { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; }; ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; }; ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; }; @@ -1306,33 +1409,37 @@ 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.4.1"; sha256="093c7jx74hl41v6i75qlphshw6gbxn7cl9063f971ilxi4hmsd21"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; }; + 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=[]; }; + IMTest = derive2 { name="IMTest"; version="1.0.0"; sha256="0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48"; depends=[lme4 ltm MASS reshape2]; }; 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.1"; sha256="0h2r1yijc00va48zhvb9b0mnmw9b1anfhs9v8gjqyv4dy6l8lrif"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; - IRTShiny = derive2 { name="IRTShiny"; version="1.1"; sha256="0izw7mk78b9ab2p6jb5vph80cjbaq0m6xvyw8xlzypa3j3ns17sv"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; + 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]; }; ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; @@ -1343,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]; }; @@ -1366,24 +1474,26 @@ in with self; { Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; }; InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; }; InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.4"; sha256="145k4hggymra2jnxkcck795xk280yyldfzh9ls2irnsxmxfszr52"; depends=[boot dplyr survival]; }; - Infusion = derive2 { name="Infusion"; version="1.0.0"; sha256="1n0wp05xzr1sbd1a5p36d7f9lg7bhp1yha71zg6h5zjdzpsjjh1a"; depends=[blackbox geometry Matrix mvtnorm numDeriv proxy rcdd Rmixmod spaMM viridis]; }; + Infusion = derive2 { name="Infusion"; version="1.1.0"; sha256="07wzs0gnqgasxsvqawdsywasb2ybcml8fbg4jrmdy02ni8d8zmhs"; depends=[blackbox geometry Matrix mvtnorm numDeriv proxy rcdd Rmixmod spaMM viridis]; }; InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.0.1"; sha256="1wirdbz4v7hk7znpjhw9j3l596lmfcrlr4wxayw7klbbdhcwq5qs"; depends=[MASS]; }; IntClust = derive2 { name="IntClust"; version="0.0.2"; sha256="1n0ywickky1w5m8swfidiprdnkrv0mrh9z5294bimxj5ppi1yl8v"; depends=[a4Core ade4 analogue Biobase cluster e1071 FactoMineR ggplot2 gplots gridExtra gtools limma lsa plotrix pls plyr prodlim SNFtool]; }; IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; }; 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.4"; sha256="1r42zzrm5cmqlaxxzla0fwf5l34qjil9ndmv2cdwzw1kbqp84qz4"; depends=[Biobase ggplot2 nlme]; }; - IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.5"; sha256="0f2jsf6lh1nrrfqdgq72jqan94f81cr2pckfcjn86c933gjlq4bm"; depends=[bootstrap caTools ggplot2 limSolve Rcpp]; }; + IntegratedJM = derive2 { name="IntegratedJM"; version="1.5"; sha256="0vw2k8f0smb2vbn10rqp5alhra8q5d87c0zjs2xjc8w6i72fy2q8"; depends=[Biobase ggplot2 nlme]; }; + 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.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]; }; @@ -1392,8 +1502,8 @@ 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.10"; sha256="1hlhj36bmxlj8y83kmis0knwgfn0s8dab1nw0715d2vhh74g4xmp"; depends=[MASS]; }; - IsoriX = derive2 { name="IsoriX"; version="0.4-1"; sha256="0j6lb7kvxw1lywq0jg8d26936521pyw5apz9k9cf34pb3hsa5qm2"; depends=[latticeExtra numDeriv proxy RandomFields raster rasterVis sp spaMM]; }; + 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]; }; JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; }; @@ -1402,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=[]; }; @@ -1422,21 +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.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; }; KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; }; - KFAS = derive2 { name="KFAS"; version="1.2.5"; sha256="144yiwww0vn309dikhj8irppg021qjy3zi6m6yna14payplnqyxr"; 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]; }; @@ -1444,16 +1559,17 @@ in with self; { Kernelheaping = derive2 { name="Kernelheaping"; version="1.6"; sha256="1xsszbx6srrgzdddr11pfrmfi985amjwngsrbhg8mgn58pwz3yiy"; depends=[ks MASS plyr sp sparr]; }; Kmisc = derive2 { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; - KnowBR = derive2 { name="KnowBR"; version="1.1"; sha256="10cnnr110wyzxlmh8w3gfp53dx9jww0bv95rly8rvp5bhrava8y5"; depends=[]; }; + KnowBR = derive2 { name="KnowBR"; version="1.2"; sha256="1d2rzggj3jp8r748mrvk4c692xkmbim5avxjy30qzn3wmy15r479"; depends=[]; }; KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; }; KoulMde = derive2 { name="KoulMde"; version="3.0.0"; sha256="01mczlrdrfwdp2cj10kdqay3qpg8xf2v7vym62pll9l8n595snrl"; depends=[Rcpp]; }; Kpart = derive2 { name="Kpart"; version="1.2.0"; sha256="14c6ngc37xpxy5pd5jishaqz6aahky32p0x5bfsn5zirdahlphsa"; depends=[leaps]; }; 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]; }; @@ -1463,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.0"; sha256="0j15z2krj7b1939vrvjhcr3aw5crjdrvn6llzzrkibrh71m4dscq"; 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]; }; @@ -1477,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]; }; - LNIRT = derive2 { name="LNIRT"; version="0.1.0"; sha256="0szcdp9vl1mifb3ybwi836xif7b57vk2jqp0zcadkfardjpc7pd0"; depends=[MASS]; }; + 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]; }; @@ -1509,9 +1625,10 @@ in with self; { LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; 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.0.0"; sha256="0icfgsh93f4i73p7wpacb6dsg4cdfh71l7rwhqknnifvb5nvp8sv"; depends=[MASS mgcv plotrix]; }; + 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=[]; }; @@ -1519,15 +1636,15 @@ in with self; { Langevin = derive2 { name="Langevin"; version="1.2"; sha256="0iy1nh4wzipw8spmfr0kscdnpaz3cq4idkbl5khiia2jid0kimvl"; depends=[Rcpp RcppArmadillo]; }; LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; }; LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.0.1"; sha256="0yc6bv1mvs8ivrjgi49xz5bn4if24693rw148w5zxd11r3ryy8dy"; depends=[]; }; - LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.1"; sha256="1vd47vf88qsac02sdnwag1zgvclnjw10apdbfkapxkik3xs0wkck"; depends=[Matrix Rcpp]; }; - LatentREGpp = derive2 { name="LatentREGpp"; version="0.2.2"; sha256="0y00rf53bwmx3f6k637n3jh8597k96xm679li079ij5l7j9r2yb3"; depends=[ade4 BH FactoMineR fastGHQuad MASS mvtnorm numDeriv optimx paran randtoolbox Rcpp RSpectra sirt statmod]; }; + 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]; }; + 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.5"; sha256="1a3yygpnc160qkwp3fd6aksynd533z5slncvby06byngqb42ib4h"; 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=[]; }; @@ -1541,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]; }; @@ -1549,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]; }; @@ -1562,38 +1680,39 @@ 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.3"; sha256="1g2dqar35rrnky9p8h14p63prq9x7fl629y2xkaf70gfkk1j4pg4"; 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]; }; - MALDIquant = derive2 { name="MALDIquant"; version="1.16.1"; sha256="0058i0nc81qp7sj7j9bcy7s2vkmbacj5ycwdnvsfmsr172adxdar"; depends=[]; }; + 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]; }; - MAMA = derive2 { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[genefilter GeneMeta gtools MergeMaid metaArray metaMA multtest xtable]; }; 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.4"; sha256="1xw0wk2a14xwgay3vw7s1sxpwrmm01lqnfphcnhf1iyhdsxqnnnc"; depends=[magic MASS Matrix plotrix plyr]; }; - MAPA = derive2 { name="MAPA"; version="2.0.1"; sha256="013gp1wnw77nf1d9mvvw9zxs3dml9jvxd50nifx76bpkr00im940"; depends=[forecast RColorBrewer smooth]; }; + 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.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=[]; }; MAclinical = derive2 { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; }; MAd = derive2 { name="MAd"; version="0.8-2"; sha256="0mhys27rmzb0kal4jr8j2y44z4qq46fw260sxl8da9qqvplcwq1p"; depends=[]; }; - MBA = derive2 { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[BH sp]; }; - MBC = derive2 { name="MBC"; version="0.10-1"; sha256="14y0adpm0h57b6r15hi69ri69kmfvxnacvxsspfhijyxhnwgnan6"; depends=[energy Matrix]; }; + 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]; }; @@ -1608,7 +1727,8 @@ 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]; }; MCPMod = derive2 { name="MCPMod"; version="1.0-9"; sha256="03zqassvyqwllg1yjfdg2zxamkg2dy8cy19ki5srpn6clv5zy1rj"; depends=[lattice mvtnorm]; }; @@ -1618,33 +1738,34 @@ in with self; { MChtest = derive2 { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; }; MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; }; MDM = derive2 { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; }; - MDMR = derive2 { name="MDMR"; version="0.4.3"; sha256="0vgqdvvryyyzibpfwax8qx45phc9iwb5rwgqpcp21d32z0n7a56f"; depends=[CompQuadForm]; }; - MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[linprog Matrix]; }; + MDMR = derive2 { name="MDMR"; version="0.5.0"; sha256="185qdm39mydsb7h09j0763a13wd84h0w8rx2g0xwdynp2rakkw75"; depends=[car CompQuadForm lme4]; }; + MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.3"; sha256="0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc"; depends=[linprog Matrix]; }; MDR = derive2 { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; }; MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; }; MDplot = derive2 { name="MDplot"; version="1.0.0"; sha256="18q25qxwqd8jwn8y781xqisd15k9p81nmxkx41pyi703njav1fm1"; depends=[gplots gtools MASS RColorBrewer]; }; MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; }; MEGENA = derive2 { name="MEGENA"; version="1.3.6"; sha256="0ylv7kbk0x3rm08aiwci4p3kma08qj4szlw2h1d6wcqmipy93v8s"; depends=[BH cluster doParallel foreach fpc ggplot2 ggrepel igraph Matrix Rcpp reshape]; }; MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; }; - MESS = derive2 { name="MESS"; version="0.4-3"; sha256="0317nk2lbrrflg6gaz7nz413n4i79xvh6jndw0m4dzlwmcj6al2r"; depends=[geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; + MESS = derive2 { name="MESS"; version="0.4-15"; sha256="0cfhbl099znjyij6sfhp5ma7yk1cj20paqixdy8lrif31mgkibd0"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; MEclustnet = derive2 { name="MEclustnet"; version="1.1"; sha256="1ayyrxdb9qd7fxnr8y2lbjcd2c8m38mjm1ks6z22vyddbhkf78in"; depends=[e1071 ellipse latentnet MASS mclust mvtnorm nnet vegan]; }; MExPosition = derive2 { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; }; 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.7"; sha256="0wqwdx8gskrp2y04f947m0cvgd685n8g3wgggc8sv0ra7z2qzx9y"; 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]; }; @@ -1656,25 +1777,28 @@ in with self; { MLCM = derive2 { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; }; MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; }; MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; - MLID = derive2 { name="MLID"; version="1.0.0"; sha256="1zbydvw4sv5q0lh2d4z0alrlc28dy6xnxd67iq8qd0k28gpwnzd1"; depends=[lme4 nlme]; }; + MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; }; MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; }; MLRMPA = derive2 { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; }; MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; }; MM = derive2 { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[emulator magic Oarray partitions]; }; MM2S = derive2 { name="MM2S"; version="1.0.5"; sha256="0h10cbsdnndllwq4cb4aamjy104ckvn01skh7rixa1iqdndac9fx"; depends=[GSVA kknn lattice pheatmap]; }; MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; }; - MMDai = derive2 { name="MMDai"; version="1.0.1"; sha256="0bh25yhdyk5i4gh4h6f5i8gkwympy3i2xwlkgrj18jzghyy02rx2"; depends=[DirichletReg]; }; + MMDai = derive2 { name="MMDai"; version="1.2.0"; sha256="083007bp3spgjx9y65hwk6074yky1sf5n7w44pfnxzrjbc7d0qhb"; depends=[DirichletReg]; }; MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; }; 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]; }; MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; }; MODISTools = derive2 { name="MODISTools"; version="0.95.1"; sha256="099xh987phvya67b75c8j4z58zpqf69q3qxh280l9ka3w6pq3ljm"; depends=[RCurl XML]; }; + 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=[]; }; @@ -1700,32 +1824,35 @@ in with self; { MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; - MST = derive2 { name="MST"; version="1.3"; sha256="0qxkwkb13g6jqsiwa44izp2f3swzc7zhkprpl2qlxfs6sszr9v36"; depends=[MASS partykit survival]; }; + MST = derive2 { name="MST"; version="2.0"; sha256="131c98lzy1cs1gbv20nv9r6yhlyyhk43hh1mrx12k1cgw299265k"; depends=[Formula MASS partykit survival]; }; MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; }; MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; }; MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; MSwM = derive2 { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; }; + MTA = derive2 { name="MTA"; version="0.1.0"; sha256="0h1nnvylp5yvzx6mljayjjz73l0bjyz5zahymxa9z3z7jlahvkwh"; depends=[igraph rgeos sp]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; }; 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.0.1"; sha256="1vl6wn7ryn529bhx2l5frw89dqn79bnk4qfih4mj1dyycwh3h4fj"; depends=[CompQuadForm]; }; + 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.7"; sha256="1d5xgq3ydzv69v5dazkmmbxgag530cx5m1a3566kxkdk02rd8i71"; 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.8"; sha256="1bi8lkw3dx5m2p6r8yr60ysxs0ijkaahjvh7c8q7vlg8116fdvbp"; depends=[doParallel e1071 energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; }; + 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]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; MagneticMap = derive2 { name="MagneticMap"; version="1.0"; sha256="1634bk6x92z01gyiy89c1g6z5cjsj8pf4f358y7rk2kppmfz4cf7"; depends=[scatterplot3d]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; - ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.2"; sha256="0ywkd4i9bxavxffh89sxcz995vfnk1czcvcjdwzbvrpxa5fwbx79"; depends=[Rcpp RcppArmadillo]; }; + ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.3"; sha256="1ppc0ik7vx14n6alq9wpykgfacg78ph9fc5r9k9jqm55nwz4d3xh"; depends=[Rcpp RcppArmadillo]; }; ManlyMix = derive2 { name="ManlyMix"; version="0.1.7"; sha256="10m5kfs8n34frygn36ryn4h8128p4smmr5s2ngbbj05dchni09ai"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; }; @@ -1733,27 +1860,28 @@ in with self; { MareyMap = derive2 { name="MareyMap"; version="1.3.3"; sha256="0d8prx08321f0p42xbnf0b1446fq4km35xs3ih5ssbdm14q7fnln"; depends=[tkrplot]; }; MarkowitzR = derive2 { name="MarkowitzR"; version="0.9900.0"; sha256="1wyqlgmb376dsvx7nixpbynjzp7xpmsh4fx9s7nai6fhjb50mxha"; depends=[gtools matrixcalc sandwich]; }; MasterBayes = derive2 { name="MasterBayes"; version="2.54"; sha256="016xk43mhl4249p3wsx0v68b69nmp7zllaa0c1in5l18g5v0npi0"; depends=[coda genetics gtools kinship2]; }; - MatchIt = derive2 { name="MatchIt"; version="2.4-22"; sha256="16j7kwnr94736p58a9fsjydkbixm71jgdmgfcvmr26c8r5q89042"; depends=[MASS]; }; + MatchIt = derive2 { name="MatchIt"; version="3.0.1"; sha256="0iifn286ssdavpg3ajlmd5z7n5wn0rsj3l23xf6qnvij35k95kbw"; depends=[MASS Matching rgenoud]; }; MatchItSE = derive2 { name="MatchItSE"; version="1.0"; sha256="01ghv3hdlsx6ypvsh7k0mi20yc8vg7z602mhcprhhh97qsb81v6h"; depends=[Rcpp RcppArmadillo]; }; 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]; }; - MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.8"; sha256="007i1zmklcmj76kmyl60wvcgb9vzrn677k81n5mmfz36vr0zkp8f"; depends=[dplyr lubridate rgdal rgeos rvest sp stringr xml2]; }; + 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]; }; MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; }; + 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]; }; + 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]; }; @@ -1773,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.0"; sha256="0gfv093l5s5gy98qcz49kr1qk8afkz1hm0hrd9a7k4r54fn6vx3c"; 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]; }; @@ -1784,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]; }; @@ -1798,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]; }; @@ -1815,16 +1944,16 @@ in with self; { ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; ModelMap = derive2 { name="ModelMap"; version="3.3.5"; sha256="1rmm1a2nw91kzvxpvq9qhlag0dhihis7mgscgslqia6z8fr86qvs"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; }; ModelMetrics = derive2 { name="ModelMetrics"; version="1.1.0"; sha256="119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8"; depends=[Rcpp]; }; - Momocs = derive2 { name="Momocs"; version="1.1.0"; sha256="0r9q1ag25fcj9zl0vd5d6c6ijpildmqi2p7fnmhcp023x026sy2v"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; }; + Momocs = derive2 { name="Momocs"; version="1.1.6"; sha256="15rmda0d270wallhn9f0nksms194js3vy71cii0aih02rwcpg9kw"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; }; Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; }; MonetDBLite = derive2 { name="MonetDBLite"; version="0.3.1"; sha256="1lbymf7kh3jag7qhb873mw2g66xp1589w2linp0r7kx0ia86rqd3"; depends=[codetools DBI digest]; }; 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]; }; - Morpho = derive2 { name="Morpho"; version="2.4.1.1"; sha256="0wshfxxkbwwnj92law22wdfxw8hai1s576hi6gq2lda0684ccyvb"; 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]; }; @@ -1836,29 +1965,36 @@ 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.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; + NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; }; NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; }; - NAM = derive2 { name="NAM"; version="1.5.0"; sha256="01p0xncaly7pxc9fpiqh77z0pq6cbbskj40r7rhhbiad5pdihb0r"; depends=[randomForest Rcpp]; }; + 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]; }; @@ -1866,8 +2002,9 @@ in with self; { NFP = derive2 { name="NFP"; version="0.99.2"; sha256="1wnllzlww8257sbrgvfyvd21qvhf7j17mcpf6d4p6binaw8svnsb"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; }; NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; }; 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=[]; }; @@ -1880,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.2.6"; sha256="0lynyfj5njvk2smlp9l83fri6308kr6bblckz31wwk3bpy0mlh4c"; depends=[rgl]; }; + 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=[]; }; @@ -1892,16 +2029,17 @@ 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=[]; }; - NPflow = derive2 { name="NPflow"; version="0.10.1"; sha256="0lq3xchw932qjfk0akvxqpy50jnn4gwmyghvb8iabc7scl6px97n"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; + NPflow = derive2 { name="NPflow"; version="0.12.0"; sha256="0vdnhwls80yaqh9mnfprks4l609jf4vcic1x99rji1gjmawhs93r"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; }; 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]; }; @@ -1918,25 +2056,27 @@ 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.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]; }; - NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.1"; sha256="0lgkj7r2rsf91ig5f1w85vpzy8aa43pk8vjif15ci3any82yz4is"; depends=[dplyr expm ggplot2 Matrix]; }; + 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.2.6"; sha256="1zvpgdir2wzbg20l4v2fdpf1f3kw78pzx7kg1m8v83738f9jhc3a"; depends=[]; }; - NonpModelCheck = derive2 { name="NonpModelCheck"; version="2.0"; sha256="0i87v666i0fc1c4rwxl6zmal7dp4ph7l7ki5vck9wykm28qr6q5y"; depends=[dr]; }; - NormPsy = derive2 { name="NormPsy"; version="1.0.4"; sha256="07xx3n9g8ka9k6zqkx1963nqbqi6qlnkxy0fary7l1arv7vjly4s"; depends=[lcmm]; }; + NonCompart = derive2 { name="NonCompart"; version="0.3.0"; sha256="0c6sdsigfmkan1q728n6v3s2lyg0y24cdbl7xdjfgdwsvg67kbdb"; depends=[]; }; + 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]; }; NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.2-2"; sha256="0r3yz8x123f0p9d165074ylnmf3hkyyc4h1758018m9iqj5cqp2h"; depends=[curl XML]; }; - OBsMD = derive2 { name="OBsMD"; version="0.1-0.4"; sha256="00hakq94lkkx9iscxm3sv4hslyqsnjcxs74l6v89bm8p5ds8dlzl"; depends=[]; }; + OBsMD = derive2 { name="OBsMD"; version="0.2-0.00"; sha256="16km0v6678lbgh9n2d9nvmpq6k7d2gicc68wnfy4kvn9vmpr79cz"; depends=[Rcpp]; }; OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; }; ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; }; ODMconverter = derive2 { name="ODMconverter"; version="2.3"; sha256="07j9p2hfx3almd5n3j0clc1alj5wzrnzljd9w13bbd6nrvil1krm"; depends=[xlsx XML]; }; @@ -1956,10 +2096,11 @@ in with self; { ORDER2PARENT = derive2 { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; }; ORIClust = derive2 { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; }; ORMDR = derive2 { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; }; - OSMscale = derive2 { name="OSMscale"; version="0.4.1"; sha256="175m15mas5kpqq93czlgiimkxvl4mg40dw04il1jnk4gypj4ifjq"; depends=[berryFunctions OpenStreetMap sp]; }; + OSCV = derive2 { name="OSCV"; version="1.0"; sha256="17wrfak6b6m2l3iqbhdwcfh0rlqb14rkvrbari7v46gya9v7hq20"; depends=[mc2d]; }; + 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.0.0"; sha256="0wdzi1ii5hwvr2fby26ydc4jhwl0gyi24jnl4yib6621hnjgv10y"; 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]; }; @@ -1968,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.4"; sha256="1bzfbfckc7yaflsd74c5zs2ig4rkd3q9fzxxrw4kc0vgijalyf3p"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; }; - OpenML = derive2 { name="OpenML"; version="1.2"; sha256="16zvxr45jcw4z30jmg9l6xdlkq76wbi89xj8c328qkwlghik17sy"; 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.4"; sha256="18zgypwjd37fcmsc3gzsa3ww6b7l9y9sm7jgj5x79hzqn0mfknfv"; 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]; }; @@ -2001,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.6"; sha256="04jbyxgw8cpbjajlnal66y1kfjnxd4v6gp32wg7cdp7cmz0yxbii"; depends=[dplyr igraph 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.6"; sha256="0jallwvzrjw4vv1gnszlhx6jv8g67wx41kgcil0yz8867wf1sxkb"; depends=[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]; }; @@ -2016,36 +2159,37 @@ 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]; }; PCAmixdata = derive2 { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; }; PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; }; - PCGSE = derive2 { name="PCGSE"; version="0.3"; sha256="1fb4in6b8d5n0zjfys33y35n3srqpzrnyk2qhzvpjsjf7jmn9898"; depends=[MASS RMTstat safe]; }; + PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; }; + PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; }; PCICt = derive2 { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; }; PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; }; 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.5"; sha256="1k9zfdsxyn384ymq920y0p0fps6svlq08sp13ayg0mindsswmp3k"; depends=[moments orthopolynom]; }; + PDQutils = derive2 { name="PDQutils"; version="0.1.6"; sha256="0mmfi0ifwbkjm0274sddpwkj27cvdkwngnka8vdmfm4b2nn7vgsp"; depends=[moments orthopolynom]; }; PDSCE = derive2 { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; }; 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=[]; }; - PGRdup = derive2 { name="PGRdup"; version="0.2.3"; sha256="10nm71kj746ap7qx1qr7y8xm3m732blkaac20lwif2zljl3cy2dl"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; - 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]; }; @@ -2065,35 +2209,42 @@ 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=[]; }; - 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]; }; - PRIMsrc = derive2 { name="PRIMsrc"; version="0.6.3"; sha256="18vk968dz9508bnnyhq2wz7py72ld42c0ah22a7d8n3nwx26ldbd"; depends=[glmnet Hmisc MASS survival]; }; + PRIMME = derive2 { name="PRIMME"; version="2.1-0"; sha256="1sjgy923ppp28qhkvhgv2xmx7b7aqd17g60af1my44ygdsd8c1kw"; depends=[Matrix Rcpp]; }; + 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]; }; - PSM = derive2 { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[deSolve MASS numDeriv ucminf]; }; + 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.2"; sha256="1slx4c2s3agrpfxhr4fs2gy9mhiqvnhsqs06m2wkan909fkjdw1z"; 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.0.0"; sha256="1m2wg0fzmlf9xbynr7mw6izkjp3r32fm4l6njrfkcr9gqfz2dab8"; depends=[survival]; }; + PWEALL = derive2 { name="PWEALL"; version="1.1.0"; sha256="0k66wzyvy89zfnsyrgbj5vr4w6c008lw2jlfkrm11l01vvgy7wgf"; depends=[survival]; }; + PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="0.99.9"; sha256="019kggrp956jry59qg5s2jwy7mcg3vvjf9741q2zvxhr0dqn86ps"; depends=[cluster dplyr dygraphs futile_logger ggmap httr leaflet lubridate mapproj maps maptools MazamaSpatialUtils openair png RColorBrewer RCurl readr reshape2 RgoogleMaps sp stringr xts zoo]; }; PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; }; 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.1"; sha256="00bvmwskawmi4x89wcn6k37nrdxfil7j1n6kc368yxvrfwvxgssy"; 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]; }; @@ -2104,22 +2255,24 @@ in with self; { ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; }; Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="1.0"; sha256="1wwfq0zwf2b2wlq4pwhw92d02f715l7bkc0si7gndk0mp2pibcrx"; depends=[]; }; - Pasha = derive2 { name="Pasha"; version="0.99.21"; sha256="0z77n5wplapdfcqxbak7mg58a9nnnwwqcznah5lswlwa0prz18jc"; depends=[Biostrings bitops GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; PathSelectMP = derive2 { name="PathSelectMP"; version="1.0"; sha256="19gkd7il4whxp1mm4pinlrl8yj09b5sknz8c4g75n2hhh96libns"; depends=[mice MplusAutomation]; }; 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="0.98"; sha256="11y44j7js67k4kgg2rdc3y23ckaih63fvm5li7z6p6d8anlx1fcv"; depends=[]; }; + PearsonDS = derive2 { name="PearsonDS"; version="1.0"; sha256="1fnlkadq53vl0gn3b066kvxh1s3pljkpxlpfbyp8jcyp8gxm6i8n"; depends=[]; }; PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; PeerPerformance = derive2 { name="PeerPerformance"; version="2.1.2"; sha256="07as5csvrlr3a55miadhbcvjrjag7g69wxmb8z7rpipppa8f9q7y"; depends=[lmtest sandwich snow]; }; 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="1.2.1"; sha256="0s6d3b9qgc38az11pa7r427dzcfhf2a2hl4c97av8c43hfvyrnzi"; 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]; }; @@ -2129,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]; }; @@ -2149,37 +2303,40 @@ in with self; { PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; }; PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.1"; sha256="02xa028jrc50fmrasidjsh5h6z9i8gyyc68q6809ic1bs23sq06i"; depends=[BB corpcor Matrix mvtnorm]; }; PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.2"; sha256="0ig3iqj0h2v4a4ahf8l2nfvjx4846skkdk5sb7qab8bkqqqkmbpy"; depends=[corpcor GenOrd Matrix mvtnorm]; }; - PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.2"; sha256="0bpgr3zzma04l8652da39vifszjyq17sx2hdq5nsqw3fb2s13zyh"; depends=[BB corpcor GenOrd MASS Matrix]; }; - PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.3"; sha256="0y29p06q977qiybzgay7yx779blv29b8i1vmxfwklc5bm3xiplri"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; - PoisNonNor = derive2 { name="PoisNonNor"; version="1.2"; sha256="01mixrlpk1vcqh9v5qiz9vkn9rkwks3hss91sjyyw3jjqpggxvp6"; depends=[BB corpcor MASS Matrix]; }; + PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.3"; sha256="0cwp9zkw89bdvak7jrjmw0n1c1xkkw0kb1l5kn8vrpm7xkwzva8h"; depends=[BB corpcor GenOrd MASS Matrix]; }; + PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.4"; sha256="0sgj76crzb7byi0nbx50y0v8zr02b8jl1qfzapj46l2f8z78vkrm"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; + PoisNonNor = derive2 { name="PoisNonNor"; version="1.3"; sha256="0p39sad9wiwrhgg9vdx0gzgd4kf2wwxjzmyav04q8ijbmqp0mjbw"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.1"; sha256="0z5h8rdb7kjqzasrdvkpkvwv05rfazv92cza8pln1qrvi6cdk5f3"; depends=[corpcor Matrix mvtnorm]; }; 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.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]; }; PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; PopGenReport = derive2 { name="PopGenReport"; version="3.0.0"; sha256="0z4g7ll3dk9mgawnn7k0ysgj8w55adivc4zcrr898x399g7vnfx4"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; }; - PopGenome = derive2 { name="PopGenome"; version="2.2.0"; sha256="1rwqv7pa5is2ciyx25q042jxk7jwvr7v64r2z32ak8dc1218x35a"; depends=[ff]; }; + PopGenome = derive2 { name="PopGenome"; version="2.2.3"; sha256="1v8gwsp45vbqrbvcg4z6s29mnqii7a0cjm4df8y6lyh296xqma7w"; depends=[ff]; }; PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; }; PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; }; 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.7"; sha256="043bpyrzl5r7gifi450l162sp7l5pgb1p6arfbf118i0jg0m61j9"; depends=[ggplot2 rJava zoo]; }; + 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-3"; sha256="1yxxg0y8w6g5138wznd3fil3pmizb20ar1h5gavlbil5b1bhhm44"; 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]; }; @@ -2188,7 +2345,7 @@ in with self; { ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; }; ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.0"; sha256="0pq5bsjd00qc83c7x8vlpsxdksywlnfg7rlsvb6j21fz9wi3hpas"; depends=[Matrix numDeriv RANN Rcpp RcppEigen speedglm]; }; - ProfessR = derive2 { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; }; + ProfessR = derive2 { name="ProfessR"; version="2.3-5"; sha256="0q04mjfr2g2l2md8c7nampivg6z4wjv6nfcq13b94sgixak0ww6f"; depends=[RPMG]; }; ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; }; ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; }; ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.7"; sha256="0jf8r9lbczvjvnzf15lz6fm31naxm1fpqni88484yrd6vpxjacq6"; depends=[]; }; @@ -2203,12 +2360,11 @@ 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]; }; - QCA = derive2 { name="QCA"; version="2.5"; sha256="0f0gia23aqkhvxna15vcck75im4r3nc6mbs1svg5hldc33088wh7"; depends=[fastdigest lpSolve shiny venn]; }; - QCA3 = derive2 { name="QCA3"; version="0.0-8"; sha256="1cqk5hhx57c4ayg0kn4gz3sfwm1jik96a80psfyb7cnmbxwdgw2s"; depends=[lpSolveAPI]; }; + QCA = derive2 { name="QCA"; version="2.6"; sha256="1f518s990i23yiddkp2d756864nfkk6zadrl373ibqlgl3ahp74b"; depends=[fastdigest lpSolve shiny venn]; }; QCAGUI = derive2 { name="QCAGUI"; version="2.5"; sha256="1v15rd5wmdx1zdssklbchw71cr9v1mjp1mfkv5kg2xa3hp0x2hz9"; depends=[QCA]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; QCApro = derive2 { name="QCApro"; version="1.1-1"; sha256="0rp1mcgp21m4wi301kwb7vzilb4z0pq78h9wavkpyxnq0ch6hnlh"; depends=[lpSolve]; }; @@ -2220,8 +2376,9 @@ in with self; { QFASA = derive2 { name="QFASA"; version="1.0.2"; sha256="1gfclbalcfcfmb8bq7rp8kpnaqblai9y7n7n7zh4a3qmia5vrz2b"; depends=[Rsolnp]; }; 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.1.1"; sha256="0mg17w62yzgslifbc08vglsxwiczicgzilczidpjwlcrg3lq8jjc"; depends=[]; }; - QNB = derive2 { name="QNB"; version="1.1.7"; sha256="1xakzwsaf5297nxx5a193ji0dn30rw3yly4rhdjqabgrh3fgzv92"; depends=[locfit]; }; + QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; }; + 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]; }; @@ -2232,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.3"; sha256="1j7v6cg3rafs9a8qmlmqk1an39kd6h6pbspd7zalmnq1v1a10m91"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; + 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]; }; @@ -2252,7 +2408,7 @@ in with self; { R_matlab = derive2 { name="R.matlab"; version="3.6.1"; sha256="013qi3iikikgib23cqg74vpp2ymsbw1zd6zny7m1km2js6gmfchh"; depends=[R_methodsS3 R_oo R_utils]; }; R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; }; R_oo = derive2 { name="R.oo"; version="1.21.0"; sha256="0723gxjazgqq7v3lwnl7axw3brzcnizvhbd71ijkkv8mz31fwp34"; depends=[R_methodsS3]; }; - R_rsp = derive2 { name="R.rsp"; version="0.40.0"; sha256="1hz5fnxz30m3cc7x7ha1swx4pn8c2244z6ka6v9m3l5lpdgc1367"; depends=[R_cache R_methodsS3 R_oo R_utils]; }; + R_rsp = derive2 { name="R.rsp"; version="0.41.0"; sha256="01l430avj5ggmdsla2kiriix72g0dlzx9klniq321bs0za808v3c"; depends=[R_cache R_methodsS3 R_oo R_utils]; }; R_utils = derive2 { name="R.utils"; version="2.5.0"; sha256="17q3w5dlly5xl2srrzsmf9s7vs5d576vqbcs6sr2p5x4qvqa1q8s"; depends=[R_methodsS3 R_oo]; }; R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; @@ -2261,42 +2417,43 @@ 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]; }; R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; }; R2admb = derive2 { name="R2admb"; version="0.7.15"; sha256="1v01fbcc7hx6mswn4gkwpm6k171956wk51ls6sgca1i6ia6ckmli"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; }; + R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; }; 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.0.1"; sha256="1idy7kik0gfzd404xs8g2mg5ycinld1wp1a9lxd2wqmyc8ghpd0y"; depends=[matrixStats plotrix rstudioapi]; }; + 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]; }; RADami = derive2 { name="RADami"; version="1.1-2"; sha256="1k4g58r64i19j8wj3d202283bnwaxf19l7ckiz29dlw4zidx6mvz"; depends=[ape Biostrings geiger hierfstat IRanges phangorn]; }; 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]; }; - RAdwords = derive2 { name="RAdwords"; version="0.1.11"; sha256="069ik7irl68chwpfdpp06ng2w272kr0cx7fjd1c6zz4nrsw8zxrn"; depends=[RCurl rjson]; }; + RAdwords = derive2 { name="RAdwords"; version="0.1.12"; sha256="0g2lbrqqh3azyc2xlafgqnd1langjg8xhma1njjcd3jn7q21mhnk"; depends=[RCurl rjson]; }; + RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; RAppArmor = derive2 { name="RAppArmor"; version="2.0.2"; sha256="18zmqqh4rnbnaiwi60jfp4xi8fp63ydr3jk9w4ijmy6s4hkpp75g"; depends=[]; }; 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.2"; sha256="0znkw5n123xhn902nyv1p0bpm0djyscsyqdab3bpps0n35mfxlq5"; depends=[data_table ggplot2 httr plotly rjson]; }; - RBPcurve = derive2 { name="RBPcurve"; version="1.1"; sha256="0g243h4zpjigayf7kryfpdvshycaxz12ifqilyk3ylz91kk61nmb"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; - RBerkeley = derive2 { name="RBerkeley"; version="0.7-5"; sha256="049qvlpqwcaj82fdl815c0b2il7jbs6karibqpkq0fa3hq0q4hzz"; depends=[]; }; + RBMRB = derive2 { name="RBMRB"; version="2.0.4"; sha256="0l6w3j4dykxd5r3h3qj7hsz77657bhif7qk020hvmcg17jszr9a2"; depends=[data_table ggplot2 httr plotly rjson]; }; + 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]; }; - RCEIM = derive2 { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; }; + 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]; }; RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; @@ -2307,10 +2464,9 @@ in with self; { RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; }; RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; - RCryptsy = derive2 { name="RCryptsy"; version="0.4"; sha256="01rz9wz5y1k77mjw4zs0jng3k4zwqda32m5xvw6kx7vkgzfas6q0"; depends=[RCurl RJSONIO]; }; 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=[]; }; @@ -2318,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.0"; sha256="1vm4bxvvwlx1qmnss4zkbh7i29yy95macd79hrf78c7sfc8zkiqn"; 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]; }; @@ -2331,10 +2487,10 @@ in with self; { RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; }; REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; }; REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; }; - REndo = derive2 { name="REndo"; version="1.1"; sha256="1n168xxjxj9353chdgsj88as0dj7ylm207xk75rbfzv7bdi7rlj9"; depends=[AER corpcor e1071 gmm lme4 lmtest Matrix mvtnorm optimx plyr sandwich]; }; + REndo = derive2 { name="REndo"; version="1.2"; sha256="0ghr2iww4fiwah2aalk3fbn90wgx2r5mdkvn37kpbg2q9prvcmwd"; depends=[AER corpcor e1071 gmm lme4 lmtest Matrix mvtnorm optimx plyr sandwich]; }; RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; - RFOC = derive2 { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; + RFOC = derive2 { name="RFOC"; version="3.4-3"; sha256="04nm672pfrlqywhdpw0yrylwk3gqjfhxfdghf6af27ry6m3rjpcd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; RFc = derive2 { name="RFc"; version="0.1-2"; sha256="0zqnx9hbwp6j4y4r6mndgm95px07if93mpdmp3ls5kh4pnj2n6ff"; depends=[httr jsonlite sp]; }; RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; }; RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; }; @@ -2344,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-4"; sha256="0z4qkwmkwf3r9lpfk5dgrphzb493wqrl7mrh58hyiz09dsy224h1"; 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.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=[]; }; - RInno = derive2 { name="RInno"; version="0.0.1"; sha256="15rbd757am55kr1jkm1vh3ida5h4wbfcj0brj6ddjbpfivybg8wr"; depends=[curl httr jsonlite stringr]; }; - 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.6-2"; sha256="0015r71fh2ynwvq4lzdq1h59kvsr04h82anznwz5ixrc3vz3abzj"; depends=[rJava zoo]; }; + 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]; }; @@ -2381,9 +2541,11 @@ in with self; { RKEELjars = derive2 { name="RKEELjars"; version="1.0.15"; sha256="06wc4x6lhk9akaghqi5bfkfs3yxg29lbga074a5nwadiz2fbnmkv"; depends=[downloader]; }; 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.0"; sha256="164bg9smxllwwk93g3g08v3902p5bl0i278dyal71cxycayzc8y1"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; }; - RLumShiny = derive2 { name="RLumShiny"; version="0.1.1"; sha256="0wrn1lmwzigaq1w3a04mrz6ikgw2whr36718ckixphm5kcqlcnjr"; depends=[googleVis Luminescence shiny]; }; + RLumModel = derive2 { name="RLumModel"; version="0.2.1"; sha256="1v2a2rrk9x0s3f62jg1v919ilia4r8h3n732rid3hbpmpky1iha0"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; }; + 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]; }; @@ -2399,80 +2561,90 @@ in with self; { RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; 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.9"; sha256="0hpxjvr6yh2093ci7dwrww8wv9zhclfjk3wbx86jxvn87ms9qa21"; depends=[DBI]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.11"; sha256="127a0f7hp0msiqqdjfpk3pz862rb4agrd71bdic2idwbs0w5wh6s"; depends=[DBI]; }; + 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=[]; }; RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; }; + RNRCS = derive2 { name="RNRCS"; version="0.1.1"; sha256="1dmkvb63wacwnjl51si1zyx26z1p4jkrdrr7pgxp2zh3lp8gsa96"; depends=[magrittr rvest xml2]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; 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.4.0"; sha256="1gj63rhzzrlxhwcwmn5jmq512zy08zhrbibh7w7xk0fzd6j0lkra"; 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]; }; ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; }; ROCt = derive2 { name="ROCt"; version="0.9.5"; sha256="0f7day0rv62ggm1nc7qkh45r6svr84mdk7xxpdf09pi4lbdx0rm6"; depends=[date relsurv survival timereg]; }; ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; - RODBC = derive2 { name="RODBC"; version="1.3-14"; sha256="12zjyhfclxj7k9lxhdlwxqh7ckmh916hh3ywmhzbvzvxvzymnkgd"; depends=[]; }; + RODBC = derive2 { name="RODBC"; version="1.3-15"; sha256="0m37b5ccdh4imbhmk7gj795fys2pcb9d0zx0xx2qanfrf54gk6kk"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; - RODBCext = derive2 { name="RODBCext"; version="0.2.7"; sha256="0lklafxhs9s5gwd0jd7jmz7inalxc6967vl4r2faq7d07zxmsyd8"; depends=[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_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.2"; sha256="0zp4zwh5gkywswrribyillgjvrp8hgbdn22c4iyl406wvbaiyy7y"; depends=[ape cluster corpcor deSolve fpc igraph phytools picante pspline pvclust TESS]; }; + 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.8"; sha256="11z0ka5zlg6kglnm4ix4rfw2wakps6js11fzx762f78945g14r1s"; depends=[Rcpp RCurl]; }; - RPtests = derive2 { name="RPtests"; version="0.1.3"; sha256="0gprbd4m889kaklvc7ljbsl8m7l02pkfrdrzs84d92lgphg0wv9n"; depends=[glmnet randomForest Rcpp]; }; + 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=[]; }; RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; }; RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; }; RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; }; - RRreg = derive2 { name="RRreg"; version="0.6.1"; sha256="1vf40xcg39hh9wz6hjfr2p10pzpbs4b6x5hmsf1njajcf6yfl09q"; depends=[doParallel foreach lme4]; }; + RRreg = derive2 { name="RRreg"; version="0.6.2"; sha256="0cm1r34hqdil3d27670q6a5iixh3lg8r4rzam6mq4zf2fqiwdpb9"; depends=[doParallel foreach lme4]; }; RSA = derive2 { name="RSA"; version="0.9.10"; sha256="0m9gd1h9ghj6gfwixwy8hhc2625f9mi473zp55zdl5w2q10qk3ij"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; 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]; }; - RSEIS = derive2 { name="RSEIS"; version="3.6-8"; sha256="1jhxd1aq85abll5vrdbbyz52ch8xyaxzqf5r2nzvnc6953hv6jnf"; depends=[RPMG Rwave]; }; + 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]; }; RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; }; @@ -2480,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=[]; }; @@ -2489,16 +2662,15 @@ 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.1"; sha256="1p8bffsngk0s91y4f7prnlr7w9bxh460mf5ibi7v4md7jbbvhcsf"; 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.10"; sha256="1wi2rv5wwibw8m0xd37f284b14irg2gnm31yz73c3wpic2sbf3wf"; 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.1-24"; sha256="19myaccxxa11b92zi0ra53b6n5dx0af8ymxymqpmg7hlr3v6n82x"; depends=[httr jsonlite mime plyr]; }; + RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.12"; sha256="0yxqna3vgjqpgbk6391dd3j5lvfa0n5xnjkq3i2i9i0pwzdr2knh"; depends=[base64enc digest httr jsonlite plyr stringr]; }; + 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=[]; }; - RStars = derive2 { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RCurl RJSONIO]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; - RStoolbox = derive2 { name="RStoolbox"; version="0.1.7"; sha256="122z9792bsh5afd1j9z7q8j1039hf86axw12w1r5cbrnkccnbgpj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; }; + RStoolbox = derive2 { name="RStoolbox"; version="0.1.8"; sha256="1q2gahx8a9dgj8bxhrgl1k2ky5qba1rrrfyszx826mpnlzv72psd"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; }; RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; }; RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; }; @@ -2506,58 +2678,64 @@ in with self; { RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; 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-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[GEOmap RPMG RSEIS splancs]; }; + 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-63"; sha256="0ckpwblflvz48745rp46sx14lvkqpb3csrpapk22ihryr9zn17mh"; 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]; }; RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.4"; sha256="0g7ckda8a278zg5vpfgajpa17r4hknf5akn556afyhmigj8bdax1"; depends=[]; }; - RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.8"; sha256="013mh8ghxccrhdcrcdfqll2jgf3z5zw7fsn0083bn3nkr19xbabz"; depends=[Rcpp]; }; + RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.9"; sha256="1xvjl2mfknrb3jrvxxdza4l21sh76n6w6r12makvjkr9q0nal408"; depends=[Rcpp]; }; RVsharing = derive2 { name="RVsharing"; version="1.7.0"; sha256="1z1jwj6dzyib8sxpz4p4wpiizfhxz6sp62nnig779rhnv7wfkqqf"; depends=[kinship2]; }; 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-31"; sha256="0g801r5whb9iw6lxkjv89w042qb3iig8qw7bpwxjnlc2i8didzy4"; depends=[rJava RWekajars]; }; - RWekajars = derive2 { name="RWekajars"; version="3.9.1-1"; sha256="0kr9amnldnaz5vhmy0qkr3a0393wzqcl5x55qc8yqxq6g1ypzg5v"; depends=[rJava]; }; + 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]; }; - RXKCD = derive2 { name="RXKCD"; version="1.7-7"; sha256="13g5nylxh6ms57k2bhz3isfwcbxr4z0swcqja8inky25bid7jqgk"; depends=[jpeg png RJSONIO]; }; + RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; RXshrink = derive2 { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; }; RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; }; RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; }; - RadOnc = derive2 { name="RadOnc"; version="1.1.2"; sha256="03pcv5wh1v12k6wys4n1j2gz1x0pzrxnjj7lbimcy7plv183psfi"; depends=[geometry oro_dicom ptinpoly rgl]; }; + RadOnc = derive2 { name="RadOnc"; version="1.1.3"; sha256="15ww09dpyljph2pq0d2d0pbr3dzwkwsn0zv8f3w8jhhgc3s8hqkz"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; 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]; }; - RandomFields = derive2 { name="RandomFields"; version="3.1.36"; sha256="04pj5zl6az69xa9nr044l1rqkl4hzxdzvw99yvn0qppiqkn8grc2"; depends=[RandomFieldsUtils sp]; }; - RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.15"; sha256="0cr8xngvc5984q4h444x05lqxqh6ml8pcgg3pigyg77jafapmy6l"; depends=[]; }; + 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]; }; RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; }; + RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; }; RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[PBSmapping RANN RgoogleMaps sp]; }; Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; }; RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; }; RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; }; - RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.0"; sha256="0ch368wvvknm38wvjhk2ia0ihk8hikpssph9n0q4p2gzq9m4vj57"; depends=[ggplot2 pROC]; }; + RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.1"; sha256="0h9wlx87wbavx7hs3ryx88iykk0lj3lfsvrdi4w9h31y3x6cwagy"; depends=[ggplot2 pROC]; }; 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.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]; }; @@ -2586,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]; }; @@ -2603,54 +2781,61 @@ 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.9"; sha256="0pndpgmfmvkssvn9m3i4nbq2n6hxz3i4i8y2nlycn2gdipr0vggh"; 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.700.0.0"; sha256="03cvl2xgmvh4sylw7ff7s020y7k2wzyj34l0zngm09qs44pa9q0m"; 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.0"; sha256="0fy9kr03160f1ywzff3p380s8a59jz7d2d0rggb14g2y0slzpbr5"; 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.1"; sha256="00jqn1ix0qpv1zn8ciz161pq6gxq5had1afm194k6k7hahph3bip"; depends=[Rcpp]; }; + RcppGSL = derive2 { name="RcppGSL"; version="0.3.2"; sha256="0fg13va124shkyy6g1fwblld1r4vdgxscab64kszyjivkjsb2lw1"; depends=[Rcpp]; }; RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.2"; sha256="0z5sg2jlr465196ws2pqi7j7hfmd7j8xlqqj6841m635cg4q48ba"; depends=[Rcpp]; }; 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]; }; RcppProgress = derive2 { name="RcppProgress"; version="0.3"; sha256="0796g11w7iv3ix1wfm3fh09qq7jki4r4cp1mjagq77igri3xrr9x"; depends=[Rcpp]; }; + RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.1"; sha256="0c4kb6jnhsnha6139nj9kifg4yb5glj7azs0xwch5052bnl7xhyp"; depends=[BH Rcpp]; }; RcppRedis = derive2 { name="RcppRedis"; version="0.1.7"; sha256="0x456zrd7qv8iclhdbgl4bwa1bvpirlqx6ywsincj6y0446f13rz"; depends=[BH RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; }; - RcppSMC = derive2 { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; }; - RcppShark = derive2 { name="RcppShark"; version="3.1.0"; sha256="0fyf7ffv5hhxnandrrx9xg72zwrw8cp73bwmb48iy5514gdwg77a"; depends=[BH checkmate Rcpp]; }; + 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.1"; sha256="1kmhmi13666zv3zsy3wlmh13picvicjc1nrlv9dqjzwcwahpih1l"; 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=[]; }; - Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6.1"; sha256="1rvqb3lsn5br9cmj63c9ql4dkp0igdrag65sxgajpsyqkpyg17qn"; depends=[formatR roxygen2]; }; + 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.2"; sha256="05ipf3gvgfv3q58mdh3g9zg7z7wm0gvigb839y1nprb98wvrqj2f"; 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-2"; sha256="0rmqy3csgfvq5c3sawvd3v37is8v5nnnrhifschqfsycmadf1gdp"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + 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]; }; RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-10"; sha256="09xp0ad7v2bsg1r7gf3awdqcpds0v3ygsbnkm8ysy8w14sbrrydf"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; @@ -2660,6 +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=[]; }; + 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=[]; }; @@ -2676,13 +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]; }; - 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=[]; }; @@ -2690,18 +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.133"; sha256="1lvik88zfxlipr24qdj04faknfjsaiv6q75zllgz3v6rjbxvh4jz"; depends=[fasttime Rcpp RCurl rjson]; }; + 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]; }; @@ -2711,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]; }; @@ -2719,38 +2909,36 @@ 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.0-3"; sha256="055ldafgf0lp3g2kjlpbhsq03fwwia6a6fwk7d4w5znihah9ibbg"; depends=[]; }; + Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; }; Rramas = derive2 { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-14"; sha256="18ry07pi9iwskbxcimvp91fgpvrlaf44z0hp7k90dnyaa8qpbwjx"; depends=[]; }; - Rsampletrees = derive2 { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[ape haplo_stats]; }; + Rsampletrees = derive2 { name="Rsampletrees"; version="1.0"; sha256="1qq7z7wxb933wvy62zz2vxmpiz0441v01ravhkrmz70ppq5jnlpn"; depends=[ape haplo_stats Rcpp]; }; Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; }; Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; - RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[fields jpeg RANN]; }; + 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]; }; - Rsundials = derive2 { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; }; Rsymphony = derive2 { name="Rsymphony"; version="0.1-26"; sha256="0v51sjhggvl8i3ysslqcc4x84874nagxq2v68izs4hpvcpzn7268"; depends=[]; }; Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; }; Rtextrankr = derive2 { name="Rtextrankr"; version="1.0.0"; sha256="16dby3xsfcjyp35xdflmgnh7zkqygfbffvj4jqa565vj9ksnq5ir"; depends=[igraph KoNLP sets stringi]; }; Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; }; - Rtsne = derive2 { name="Rtsne"; version="0.11"; sha256="0zi4nxgpiv1gpdmcnqdhz5kymzp8m5xj02zpf290p1yyydl76bhy"; depends=[Rcpp]; }; + Rtsne = derive2 { name="Rtsne"; version="0.13"; sha256="17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw"; depends=[Rcpp]; }; Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.4"; sha256="19wcjgcv871vzclgskvb7xywnzvvi9v5k0qhwxwwi3qc9yx2kpaq"; depends=[]; }; Rtts = derive2 { name="Rtts"; version="0.3.3"; sha256="0jphdpnpbq0d48kzflilxlh6psk282hi1hz3rmnwnd0rx5iyg624"; depends=[RCurl]; }; RtutoR = derive2 { name="RtutoR"; version="0.3"; sha256="0knqwk44di24x8w2pf794hk2raq7gcpl6cd6s9m0sr73rxh9sf11"; depends=[dplyr DT ggplot2 ggthemes plotly rmarkdown shiny shinyBS shinydashboard shinyjs]; }; @@ -2759,19 +2947,21 @@ in with self; { Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; Runuran = derive2 { name="Runuran"; version="0.23.0"; sha256="1qkml3n0h1z59085spla0ry1wl42c1ljg9nh2sxv6mnhxygm6aq1"; depends=[]; }; RunuranGUI = derive2 { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; }; - Rvcg = derive2 { name="Rvcg"; version="0.15"; sha256="0h0gl6s7xa96g91d0df08ssgr1hnxgc1pqrlirvjdknr7jpkq04k"; depends=[Rcpp RcppArmadillo RcppEigen]; }; + Rvcg = derive2 { name="Rvcg"; version="0.16"; sha256="0629fl4bq15mcb9kxiqsgllqgygxx0xn50849akx0rn72y7jp5v0"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; }; - Rwave = derive2 { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; }; + Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; + Rwave = derive2 { name="Rwave"; version="2.4-5"; sha256="1q80759382yig5gmjd83qafavhbbh7bbbgil8qha91xfs27m45br"; depends=[]; }; 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-5"; sha256="1rh25vjy8pnaavz9df6bcmk9b8d72hxm73n1hg3ha724cyxypzpa"; depends=[]; }; - RxnSim = derive2 { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[data_table fingerprint rcdk rJava]; }; + RxODE = derive2 { name="RxODE"; version="0.5-6"; sha256="06y4cdkx93ldhdbs5iaiad7hzlbnsjnimmnmvcnfv4gbicxjq9c5"; depends=[]; }; + 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]; }; @@ -2782,7 +2972,7 @@ in with self; { SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; SAPP = derive2 { name="SAPP"; version="1.0.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; }; - SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.7"; sha256="0xs2zjr3r3a39szip53qkcja3n89vr1hq46a2zcwl6s5gdbb1vyj"; depends=[]; }; + SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.8"; sha256="1hz5a2zjv8hrasjck981sqahq0l88b6ard1iwsfqznalva8zywbb"; depends=[]; }; SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; @@ -2790,16 +2980,17 @@ 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]; }; SCGLR = derive2 { name="SCGLR"; version="2.0.3"; sha256="03v76nh6ng41hh4lm27r8ipf382sj98dyl9lh4fzl4y6ff1vwzzj"; depends=[expm Formula ggplot2 Matrix pROC scales]; }; SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; }; - SCMA = derive2 { name="SCMA"; version="1.1.1"; sha256="1jbx4fkixm31zdlfx65xxdzpf77dzpqazy1l6qyjz7q672s2vidd"; depends=[]; }; + 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-0"; sha256="1mf11xxzi6g0cs91l6a0b9dic3a737ckxwrrbxk3m2cz6ymy5k9r"; depends=[mvtnorm]; }; - SCRT = derive2 { name="SCRT"; version="1.1.1"; sha256="02sndf5r1y27pgkw4wd9bhz7jhzk3cv78hp3xl222phjznjf2lzi"; depends=[]; }; - SCVA = derive2 { name="SCVA"; version="1.1.1"; sha256="1n660pml288ia4x18kjbrcx0n1cnasdxhl6pymh1nzxm4ai2hinc"; 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]; }; @@ -2811,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]; }; - SGCS = derive2 { name="SGCS"; version="2.5"; sha256="1245xqv8im457zdgcny66jnzv8kyfi8ddic9zdk94sr6jkwx6x17"; depends=[spatstat]; }; + 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]; }; - SGPdata = derive2 { name="SGPdata"; version="15.0-0.0"; sha256="1mqvrax1sndxbn8rp1hqnkhyfr9nlkz3bl7h2gr27ka3ddz1vv1h"; depends=[data_table]; }; + 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.0"; sha256="0vny2iy5jyffz6fh6a6y4i270c9ndkj0ixh0322lfa45cc6f4m7q"; depends=[hdrcde mnormt rjags]; }; + 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.5"; sha256="1klfbvzlddblz6wgp0gb2i2c1bdp44iyl0gi87v9sg7wb3kwilld"; 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=[]; }; @@ -2842,8 +3035,8 @@ 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]; }; SMPracticals = derive2 { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; }; SMR = derive2 { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; }; @@ -2853,7 +3046,7 @@ in with self; { SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; }; SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; }; SNPtools = derive2 { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[Biostrings GenomicRanges IRanges Rsamtools]; }; - SNSequate = derive2 { name="SNSequate"; version="1.2.1"; sha256="0pkf12cmbk4w7q8vn4rfz2wnb0rirn1lnn71jd3g4573lvk3fhdi"; depends=[magic]; }; + SNSequate = derive2 { name="SNSequate"; version="1.3.0"; sha256="0j0cj6c3j1pqh67nxz3wrwr0cf4hj44zqh2k7c1jc5cbldixkhpn"; depends=[DPpackage emdbook knitr magic plyr progress statmod]; }; SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; }; SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; SOD = derive2 { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; }; @@ -2867,18 +3060,19 @@ 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.0.0"; sha256="07wc5mf49d65jizx3j4cjlcil758fzi6x688jji80spsapfq9gbn"; 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]; }; SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; }; - SPOT = derive2 { name="SPOT"; version="1.1.0"; sha256="1f1nafp7v8k50s5x8m5bg6r9sb5ihr08f1x4643jqhxf7fcz2x10"; depends=[AlgDesign emoa MASS mco randomForest rpart rsm]; }; + SPOT = derive2 { name="SPOT"; version="2.0.1"; sha256="0zyh0pn0mc7n150851vdqx3ixjn53id3pm3a408365h0wafcrn3g"; depends=[MASS randomForest]; }; SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; }; SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; }; SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; }; @@ -2891,20 +3085,21 @@ 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.1.1"; sha256="1kg2694l42sbd0glzhvsykfpadmzarc275n88775g03as800vq1w"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.4.14"; sha256="13xj3nq4rfi5yih7h5gp01mpjyj6090sy9835p41k89pfdd6g71p"; depends=[MASS psych TSA TTR]; }; + 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.8"; sha256="0r5l8yw9zq8ddmyhifl27r13bab7327kwb5grlpfx4yqpp11szyp"; depends=[BH igraph lattice maptools MASS Matrix rgeos RSQLite sp]; }; + 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]; }; - STMedianPolish = derive2 { name="STMedianPolish"; version="0.1"; sha256="1mysmigksrgkgzz7cng5vn8i7q4marq144dpwww30lisw2jgraiq"; depends=[maptools reshape2 sp spacetime zoo]; }; + STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; }; STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; SVMMaj = derive2 { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; }; @@ -2912,7 +3107,6 @@ in with self; { SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; SWMPr = derive2 { name="SWMPr"; version="2.2.0"; sha256="1nq3wc06c7fga9v69fwk3dr348lb127wd9ikb59lgnx2w86g83mk"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[FD mice vegan]; }; - Sabermetrics = derive2 { name="Sabermetrics"; version="2.0"; sha256="00axm9wxwzasjrld9nfn1wqzrm2ybm7i6xh6005m9lnkb6qwmvi3"; depends=[XML]; }; SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; @@ -2920,60 +3114,72 @@ 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]; }; + SeerMapperEast = derive2 { name="SeerMapperEast"; version="1.2.0"; sha256="1bafxrfjdq4ipml6zl6ng3piz8i6izm3b2daf8k1041mlbb35k6f"; depends=[sp]; }; + SeerMapperRegs = derive2 { name="SeerMapperRegs"; version="1.2.0"; sha256="16byqrwmjwhgsfav344m99jpl403k9ajqgv74ibwms9319xqfz59"; depends=[sp]; }; + SeerMapperWest = derive2 { name="SeerMapperWest"; version="1.2.0"; sha256="1mq88ljz86bk4mjj6pmrd8k61rf69s7g1j8by4c0s3c6fnkwb3qg"; depends=[sp]; }; SegCorr = derive2 { name="SegCorr"; version="1.1"; sha256="1hfkwfq4s3xm0wip82v000x5axkzkn4vkv6wima4mrnlvwi2yb9k"; depends=[cghseg]; }; Segmentor3IsBack = derive2 { name="Segmentor3IsBack"; version="2.0"; sha256="0c7ag9svd1xlm60padg41gvz7qnbcp41kg3cz2dvi9hy2yrqw0qd"; depends=[]; }; Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; 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"; sha256="0z0ywrvc81gyk4wl810628gikaiadhbapbvkqf2ihr6n632cbr2z"; depends=[]; }; - SetMethods = derive2 { name="SetMethods"; version="2.0"; sha256="0ya8n4pin8j54gcc2fx99xgcrmnv9rm4r9a32nnylyqk49yj41dv"; depends=[betareg lattice QCA QCAGUI]; }; + Sequential = derive2 { name="Sequential"; version="2.3.1"; sha256="0rdcxmqysi9x8671zvjndaxp91g7h5a8qhcs0qb5zxh3pbrch0jk"; depends=[]; }; + SetMethods = derive2 { name="SetMethods"; version="2.1"; sha256="1n6pd6cs11qahbfimqg1mskvq364gs1hvjbyygr49pv28cb3rig7"; depends=[betareg lattice QCA]; }; SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; SetTest = derive2 { name="SetTest"; version="0.1.0"; sha256="0b5lkdhaymi3vsx9acdn9jxvqwwsac9lbdr43c44c06gglqlvk47"; depends=[]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; 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]; }; SiZer = derive2 { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; }; + SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.5"; sha256="1i0zhawv0dl764ciyyr3r4sbql2xhhks2r8vbya10wnzyqipxmmb"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; SignifReg = derive2 { name="SignifReg"; version="1.0"; sha256="1360892wy0qc6dch3753s4a17l3pcijjmxd34zqvzl9534arlsxd"; depends=[]; }; - Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.6"; sha256="0hkh97yi7zpm6d87vapzlwyq7l8dra36wy3brfh6b827535wfg3k"; depends=[MASS rgl scatterplot3d]; }; + Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.7"; sha256="0g45mi7hd64h2ja215g61qa5v47vqlbfbbs15dsmlv4yygy1n2fx"; depends=[ks MASS misc3d rgl scatterplot3d]; }; SimComp = derive2 { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.4.2"; sha256="04qs0b7sn170m65176p7gmk03dzm2jjgqknmc8kjab8snlrr3r3k"; depends=[evd]; }; - SimDesign = derive2 { name="SimDesign"; version="1.5"; sha256="00hyignxsy3h4qcr98rwsahahgg3p9xhz6dbpr2hn6ymdaxvddyb"; depends=[foreach pbapply plyr]; }; + 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="3.0.0"; sha256="0pj99jrkx898rnjijvzcw7xxz0hka767a1b2khwlk5kpja7zx5ax"; 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]; }; @@ -2987,7 +3193,7 @@ in with self; { SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; }; SimultAnR = derive2 { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; - SixSigma = derive2 { name="SixSigma"; version="0.9-3"; sha256="04d09w1h6aq3j245gbj8cx7dsr88n4np6i751k9sx7lfx6al3w50"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; + SixSigma = derive2 { name="SixSigma"; version="0.9-4"; sha256="01bsr98m3a7i075f2q04jjmhqb2m9120w6yg1af168s25qymfjwy"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; }; SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; }; @@ -2995,16 +3201,16 @@ 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]; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; - SmoothHazard = derive2 { name="SmoothHazard"; version="1.2.3"; sha256="0p6hnq782d5qwmq6ak2rmbzx84lrsy02lr303gg3y0vln5i2myyn"; depends=[lava mvtnorm prodlim]; }; - SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.4"; sha256="06wzyjpzqclf794lapr67g8qrk9y253gksidpcgn8fmfz5443mrp"; depends=[jsonlite Rcpp stringr]; }; + SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.0"; sha256="122j7rr9d5pkyxlchlvs0zyfxxs1c9n4hj2kk9v9fws3gjlrrlds"; depends=[lava mvtnorm prodlim]; }; + 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=[]; }; @@ -3019,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.74"; sha256="1fpfhld887y5lyb8jydprmv5krqm1fk6n53z942b4g4z1v4g04j7"; 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.1"; sha256="06l2ayjwawjp1kap76jqbnbjhx7x27z7vfn5jd0pz4g764krpfdr"; depends=[fields Rcpp RcppArmadillo RcppParallel]; }; - SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.1"; sha256="0yk6sisl07wqrl16mzk6ch7567l87qrqlnzg976zq2s58cd6y3vh"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + 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=[]; }; @@ -3037,56 +3245,58 @@ in with self; { SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; }; SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.2"; sha256="1hwlyjpgzf2wgigbc49xcqhf6rzrjzkbriwa4i9gwpa0bnrs4wp1"; depends=[gsubfn splancs]; }; SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; }; - SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-1"; sha256="18l2dpyks6vay4vh24jmv81br9fblhm0rb1m6jpfj1qzpa974010"; depends=[Rcpp RcppArmadillo]; }; + 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.2.0"; sha256="1ijp29skqpb9c1h3a3qby9511qfnawsbz8bg6kdl9cclww7a90ij"; 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.3.1"; sha256="0ly1bznixw4qbnag56xykj8gnfrzhqh5blsii32paalk0n920mrm"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; + 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]; }; StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; }; StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; }; Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; }; StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; }; - StanHeaders = derive2 { name="StanHeaders"; version="2.14.0-1"; sha256="18x23a7nmj5497g3i6a01cv5g34p0xdkb6srf9nwisbhshz25mxl"; depends=[]; }; + 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]; }; StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; }; - StatMethRank = derive2 { name="StatMethRank"; version="1.3"; sha256="1jn7xg6f78lhpcd1b2bvjm90yws52klqz625lkwvwfmchwqrxi0i"; depends=[MASS pmr Rcpp rjags]; }; + StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; }; StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; }; SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; }; Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; }; StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; }; - StereoMorph = derive2 { name="StereoMorph"; version="1.6"; sha256="17c8r50i9wlvsq6gha56a4mhq84cmqm82j98zg4lb96jpydcp4dr"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; }; + StereoMorph = derive2 { name="StereoMorph"; version="1.6.1"; sha256="1q0fif4azv8nd37smhmr61mr4fls1jpm1ky40aqlv6kjm336pn1c"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; }; + Stickbreaker = derive2 { name="Stickbreaker"; version="1.0.0"; sha256="11g97yj61s09d1687algr9f80gcgw8fadc1vbadglxh7l9wxj6lv"; depends=[lattice nnet xtable]; }; StockChina = derive2 { name="StockChina"; version="0.3.1"; sha256="1myxyfchnkskyqb5yciw1wfk3006f51y89ipzfjzdlfyzwy1lsp1"; depends=[]; }; Storm = derive2 { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; }; StrainRanking = derive2 { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; 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.0"; sha256="13f9y6l7pcjmgyvhhk7qcl6k4j0krmg5m2bn3faq5ijpasw7m56x"; depends=[ape cluster nlme]; }; + 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]; }; - SubgrpID = derive2 { name="SubgrpID"; version="0.10"; sha256="1gvlvsvc9v20l24zxy9i57bzj1gjplzk14fpjrhallsnp23h8zn5"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; }; + 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-79"; sha256="1ilh9w6v73aafsxcanhdjz2whsng2vyhkv240smmqifcl93kl208"; 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=[]; }; @@ -3095,17 +3305,18 @@ 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=[]; }; SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; }; SyncRNG = derive2 { name="SyncRNG"; version="1.2.1"; sha256="0360pdx2p8a6519y3ik5xfdm2yxndyl31p3bb73nj4ihmr4w6lmj"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; 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="1.99999-31"; sha256="0h2545b7hc417g5k9g482gk74mz15d0vqxviw60fqizxinxghlwv"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; }; - TANDEM = derive2 { name="TANDEM"; version="1.0.0"; sha256="1zrx5zbfz0zrw46iziqnb11m75ri75dw1x88fd2dhw22am3q2940"; 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]; }; @@ -3113,11 +3324,10 @@ 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]; }; - TDMR = derive2 { name="TDMR"; version="1.4"; sha256="1vaa75bazpk6fa34cahc597ifs307n4d8gq0r50q6rpm5rs0mnxx"; depends=[adabag SPOT testit twiddler]; }; TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; }; TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; }; TED = derive2 { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; }; @@ -3136,28 +3346,31 @@ in with self; { TInPosition = derive2 { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; }; TKF = derive2 { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; }; TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; }; - TLMoments = derive2 { name="TLMoments"; version="0.6.3.1"; sha256="1rcix93s70lwjpmlfxqjrdphkp3p84pmxjxxchsm05qif7y6iwn1"; depends=[evd hypergeo Rcpp]; }; + 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.8"; sha256="0dwfz6js35wb28qah85m3y2ddkfbiy567402npmyqr4wrh8l37p3"; 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.1.3"; sha256="15a7g1ccxk9xjcs3gysq8h4p0gd7527yq5zy6k9ara68a8f2dz1r"; depends=[]; }; + 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.15"; sha256="16mijxxddvnr3ii4v0djx5l844bp36pypmqn2r6gp3jwp9jn8czx"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; + 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]; }; TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; }; TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; }; 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]; }; - TSHRC = derive2 { name="TSHRC"; version="0.1-4"; sha256="04pvh3vhgx3pj3sgkbxsqdwjglqbmaaj0rsb8b4q162bh608d9zl"; depends=[]; }; + 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=[]; }; TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; }; TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; }; TSP = derive2 { name="TSP"; version="1.1-5"; sha256="03xxfr5kk4zhzpb1q1pwncdp0dhchm9b48wzhvvxn2dxf3mnby2w"; depends=[foreach]; }; TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; }; - TSPred = derive2 { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; }; + TSPred = derive2 { name="TSPred"; version="3.0.2"; sha256="0cbf5h3yrissng4xqrgbisarml772mg6b2ap508imf29zfks76gn"; depends=[forecast KFAS MuMIn]; }; TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.1.02"; sha256="1rvxbzhdzjb4f3b4pk53iwv0vpw8s0z8k1fyfpcxvy333f68d59f"; depends=[bfast broom ggplot2 RcppRoll strucchange]; }; TSSQLite = derive2 { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[DBI RSQLite tframe tframePlus TSdbi TSsql]; }; TSTr = derive2 { name="TSTr"; version="1.2"; sha256="0nljkqsrwzg7i82arpfrz2k9m1k1akin1akf01c5cadxq4rgarsf"; depends=[data_table stringdist stringr]; }; @@ -3165,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]; }; @@ -3187,20 +3400,21 @@ in with self; { TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; }; 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.0"; sha256="1z5n1wfzc9c6zlxbr1vszp492vlq105p28n8jf5gkzsjraznk9zv"; 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]; }; + TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; }; + 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]; }; - TeachBayes = derive2 { name="TeachBayes"; version="0.1.0"; sha256="0izxdgjzjclnfg01v1inkm4mb4h56nn9y0ilc54m4rrayicvs071"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; }; + 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]; }; - Thermimage = derive2 { name="Thermimage"; version="2.2.3"; sha256="16pwykp33bwmca7dlcr4ia3sakfdazxxk501v4rcr735767fsvyh"; depends=[png tiff]; }; + Thermimage = derive2 { name="Thermimage"; version="3.0.0"; sha256="0l098praarg5kg0m5hxs9zbwhl8w7g48ngyiry1rlwkp2rsl3cza"; depends=[png tiff]; }; Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; }; ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-0"; sha256="075cn99k06lgdd0cwl1i9242fcxwmd5malcyks0mmwjf9kzw00z2"; depends=[MASS numDeriv]; }; ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; }; @@ -3208,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]; }; @@ -3217,32 +3431,33 @@ 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.12"; sha256="1awmc2gdas90hz66wiy4n7yqz3p0bl65adx0l6q7zx88w8nxn6lw"; depends=[audio dplyr]; }; - Tnseq = derive2 { name="Tnseq"; version="0.1.1"; sha256="00pd51mmy2w5cpxrx2zh5jmpcirj8ynma3whnv1nmdy4lf10mn50"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; }; + 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.0.1"; sha256="19nszlw5xgvd4r8rn6a4ayhx2nxxrmqw1ji4pbvn01y15cfyilfq"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; }; + 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.2"; sha256="1c61afb49kjlfb6iy69vk2bgl20g8bhsbwnai2d2shmv1nimi5jf"; depends=[ape geiger laser]; }; - TreeSimGM = derive2 { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; }; + TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; }; + 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"; sha256="0iv7v2wl899mw4c9nwgn530spc9vz0klhbrkc9ssazzrpxn3lq21"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; }; + TropFishR = derive2 { name="TropFishR"; version="1.1.3"; sha256="114vg4jvb1k7mzz81ag1hs7zvpnq4ql68p55xbci24gi3qg5s7cj"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; }; TruncatedNormal = derive2 { name="TruncatedNormal"; version="1.0"; sha256="1qj18xcq58xah1niwxgqqzscl7dfgxh2s8fdbzk1vigwwm5xfvij"; depends=[randtoolbox]; }; Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; }; TukeyC = derive2 { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; }; @@ -3255,8 +3470,8 @@ 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]; }; - UPMASK = derive2 { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[DBI MASS RSQLite]; }; + 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]; }; UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; @@ -3265,18 +3480,19 @@ in with self; { UScensus2010 = derive2 { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; }; UStatBookABSC = derive2 { name="UStatBookABSC"; version="1.0.0"; sha256="16r6clhfaalfsg5hmvzm8a128zygxax5hyc0vr1q9bsw9hj7cs0c"; depends=[]; }; UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; - Ultimixt = derive2 { name="Ultimixt"; version="2.0"; sha256="18xg1z41nccwzn9mdzpap41ffp4cmfww8bwk10m1v96acf9kq2i5"; depends=[coda gtools]; }; + Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; 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=[]; }; - UpSetR = derive2 { name="UpSetR"; version="1.3.2"; sha256="0b8nms8b3n6m2ya1ms68crya41k0kq149kxg5999fw5lykx35bjr"; depends=[ggplot2 gridExtra plyr scales]; }; + 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.2"; sha256="1sdjmg3d8m0jmfs7zmz7cpw4ffar76nia2dzymnb373alm1gwlh6"; 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]; }; VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; }; - VBmix = derive2 { name="VBmix"; version="0.3.1"; sha256="0gicp470w6xy2z4r54ywjd4c9cck2yhhw7ismdp4jm9zsvc7nv1y"; depends=[lattice mnormt pixmap]; }; + VBmix = derive2 { name="VBmix"; version="0.3.2"; sha256="09kgllh8wbsgx9ykv95igczy4hi8d8grvffvdkp2zygdiyvkhsxa"; depends=[lattice mnormt pixmap]; }; VCA = derive2 { name="VCA"; version="1.3.2"; sha256="10d8vw6ihnsmqgvbfd6dwdilk9mz9wvmlxi39fpq219mqvqyzkah"; depends=[lme4 Matrix numDeriv]; }; VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; }; @@ -3286,21 +3502,22 @@ in with self; { VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; }; VIGoR = derive2 { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; }; - VIM = derive2 { name="VIM"; version="4.6.0"; sha256="1yl6bsdigwjfkdn5mbfrw10ip1xr7scw1mvykdwgzkyfnlb8z86w"; depends=[car colorspace data_table e1071 laeken MASS nnet Rcpp robustbase sp vcd]; }; + VIM = derive2 { name="VIM"; version="4.7.0"; sha256="1vjcs5wvjv94ln01d94h9rs4j50d3ky4n26mm3prgh13raylrmnd"; depends=[car colorspace data_table e1071 laeken MASS nnet Rcpp robustbase sp vcd]; }; 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]; }; - VPdtw = derive2 { name="VPdtw"; version="2.1-11"; sha256="0qsw5mqv36k8mcvwj1ka41z5kc05yn79wv41ai8f5412sbngihlr"; depends=[]; }; + 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.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]; }; @@ -3310,10 +3527,11 @@ in with self; { VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; }; VennDiagram = derive2 { name="VennDiagram"; version="1.6.17"; sha256="14cahgxm5kq133j5wv6p7ivlmcmym5r39v4dpj69wnq6w9rjqki8"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; - VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.1.0"; sha256="0k5mr9426v1b3kqnzrb1nizrsvjmm5qx6fybrnn0y1j2w7hk99jr"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; + VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; + 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]; }; @@ -3328,32 +3546,34 @@ in with self; { WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; }; WGCNA = derive2 { name="WGCNA"; version="1.51"; sha256="0hzvnhw76vwg8bl8x368f0c5szpwb8323bmrb3bir93i5bmfjsxx"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore survival]; }; WHO = derive2 { name="WHO"; version="0.2"; sha256="0rpk7ddpkjcqs0m7cgxs55k178js0d70ccfximp2vqrsw0igkmk9"; depends=[dplyr httr]; }; + WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; }; WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; }; 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.2"; sha256="11zbmsq2nbvb9m7wkybwcmk1lj6n8w1v355qwsp41j9pd7r3ccw8"; 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.0.0"; sha256="0nsgcasdgzxxlnpicmq9n9200gg2c2si3gfpwaxdy4ccwasgjq6p"; depends=[]; }; + 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.5"; sha256="17h7gq14mnwfjgiyf8gwvy7z60rwd13bqgbx6pkxqf95j48k0bsg"; depends=[data_table doParallel foreach pkgmaker rjson rPython]; }; + 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=[]; }; - WhatIf = derive2 { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; }; - WhiteStripe = derive2 { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; }; - WhopGenome = derive2 { name="WhopGenome"; version="0.9.6"; sha256="038bg8c3y9h5hbkicikdqcjli5cf1bpmsc021zi00bgsk8z4i1iq"; 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=[]; }; @@ -3362,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]; }; - XBRL = derive2 { name="XBRL"; version="0.99.17"; sha256="00dg9624hc1l8c0nw1ma4ykgkmjzk3gqf77ndnagddh65cqbiigq"; depends=[Rcpp]; }; - XGR = derive2 { name="XGR"; version="1.0.8"; sha256="1fy203927bai86pj80m275afvcpj78nil1yi99lf1jvmmfck7riv"; depends=[BiocGenerics dnet GenomicRanges ggplot2 igraph IRanges Matrix RCircos rtracklayer S4Vectors supraHex]; }; + 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.5"; sha256="0dcdj7ryn8lm7wmv4hqhh9jxa5k97l6ad8xyvb932yfkwj1g1byy"; 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=[]; }; @@ -3376,33 +3596,36 @@ in with self; { XRJulia = derive2 { name="XRJulia"; version="0.7"; sha256="0xcm8rkgg6l5p50x7mpzxx4ln29j8s2ngdswfmgb6vq48p7ws9gw"; depends=[XR]; }; XRPython = derive2 { name="XRPython"; version="0.7"; sha256="1vgxby01ac8s9ldfnjdyg0yj0y0341w596pp4sx5szdrl359n0fn"; depends=[rPython XR]; }; XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; - XiMpLe = derive2 { name="XiMpLe"; version="0.03-23"; sha256="13vsf9l3s0scqvxwxj109n6vb7rx3a2hv5lbrnjk6rxjwl8iqrly"; 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-16"; sha256="1myj1a6y69rmjrgaax2n26qa7cprclszg1s9xdzw6s6kqaw5b969"; 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.3"; sha256="0ar325hwzmldviq7f8c478z95xlamvhwwmqs2fv6p3cx7l9k0kz6"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; }; + 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.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; 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.0"; sha256="1i0mrh25mgl8aykprihsdm3zn0nsw0cr458rqnz7djff1j0mp8rg"; depends=[curl httr progress readr XML]; }; + abbyyR = derive2 { name="abbyyR"; version="0.5.1"; sha256="1s8zf18sh0s89vk3dl09fzrq50csmmfvmsanf5vfkv9n5lx6pklg"; depends=[curl httr plyr progress readr XML]; }; abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; }; 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=[]; }; @@ -3415,12 +3638,12 @@ 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]; }; acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; }; - acnr = derive2 { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; }; + acnr = derive2 { name="acnr"; version="1.0.0"; sha256="087hq4i7jp67ba2finzsqjfnqbiprl33na6ryjv9zqzsdawj9cym"; depends=[]; }; acopula = derive2 { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; }; acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; }; acrt = derive2 { name="acrt"; version="1.0.1"; sha256="0y9ndcq8ffpfrv7w9rikm4zn68jpsj6baqisq9kp2433xrwzdb6s"; depends=[Rcpp RcppEigen sandwich]; }; @@ -3429,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=[]; }; @@ -3437,25 +3660,26 @@ 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]; }; - addhazard = derive2 { name="addhazard"; version="1.0.0"; sha256="178rn3md0pgbg9nimvypj4c3paq3bgh2h06vqj3p0n78hrwf97rl"; depends=[ahaz rootSolve survival]; }; + addhazard = derive2 { name="addhazard"; version="1.1.0"; sha256="0hk7br52wjmq605xgslv8lspr35aqpdgkiz2yljz31khy3y3vi8c"; depends=[ahaz rootSolve survival]; }; addinslist = derive2 { name="addinslist"; version="0.2"; sha256="04jqhdy0axs1a9c0cfi3pqy9hd67jqxz79a2lj209gd27qv1q22c"; depends=[curl devtools DT miniUI rappdirs rmarkdown rvest shiny shinyjs xml2]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; addreg = derive2 { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; }; - ade4 = derive2 { name="ade4"; version="1.7-5"; sha256="0aaqbnydm5fb37nrvqj4bx6hxax7255j426cwh2lh88nyvznbq37"; depends=[]; }; + ade4 = derive2 { name="ade4"; version="1.7-6"; sha256="0lnc37d6waajmagy8qvw206pyc4vgrpzl3hk3j9frh6wa0b8x140"; depends=[]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; }; adegenet = derive2 { name="adegenet"; version="2.0.1"; sha256="045vc1s1n4ihw9id02c3w315pgfr004was2b0d6xb07ncipg9pby"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; }; - adegraphics = derive2 { name="adegraphics"; version="1.0-6"; sha256="0qahc6ld5nz6z81jv9yhh2cd27vh9n02swdf787fr83jgig43hja"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; + adegraphics = derive2 { name="adegraphics"; version="1.0-8"; sha256="1588n1cqgzdv4lpdgsyj47mha41n11sb36vvjdix3drncq997p9b"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; adehabitat = derive2 { name="adehabitat"; version="1.8.18"; sha256="1ng55j95hzhh853qa55mfx4xdh954ap8pqy01kyg5mgyn45i7rpa"; depends=[ade4 shapefiles sp tkrplot]; }; adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.14"; sha256="0ljmn4zbg2lb5b2ckddbxd7ibbib1pzv4iv0ld2k3bv1mvn2j565"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.12"; sha256="06lrg1s3l7slbff17my62ap7mn6h3p6s8jnn7j8mrs48nvim00z9"; depends=[ade4 adehabitatHR adehabitatMA sp]; }; adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.21"; sha256="0anyvijvlrq7c0a77dpcyq60yl1jc817rj5cb3s9iq6scicymp87"; depends=[ade4 adehabitatMA CircStats sp]; }; adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.11"; sha256="1911zdpwyr1gqyjvnn5w3blhk0mjafy0xmr3l6l749lx4cwa08d9"; depends=[filehash sp]; }; adephylo = derive2 { name="adephylo"; version="1.1-10"; sha256="1hj9nkl2z2xdb5yv9a7fb7zn9sd41lrhk2ff5z8s88xab3b2vhnc"; depends=[ade4 adegenet ape phylobase]; }; - adespatial = derive2 { name="adespatial"; version="0.0-7"; sha256="0abbds2f43dcri50crlz2fbqy444zp4bhbs81zdiby5fz64m9gr5"; depends=[ade4 adegraphics lattice MASS shiny sp spdep]; }; - adhoc = derive2 { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[ape polynom spider]; }; + adespatial = derive2 { name="adespatial"; version="0.0-8"; sha256="0h2waffkgdns5pz47zhy0wi388hrya6s01gwgwbyp7fgxj65i9ba"; depends=[ade4 adegraphics lattice MASS shiny sp spdep]; }; + adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; }; adimpro = derive2 { name="adimpro"; version="0.8.2"; sha256="0nfzk9pp4p16c1nvpidngag96r845376h8ljh7m6p6rhk9fs4jdw"; depends=[awsMethods]; }; adlift = derive2 { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; @@ -3463,7 +3687,10 @@ 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.16-1"; sha256="0y0q7lbdraw8sn4l9qazvdawqpsyjzhfzddp9gii8w72a69s90dq"; depends=[car coin lme4 lsmeans Matrix 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]; }; agRee = derive2 { name="agRee"; version="0.5-0"; sha256="16ijw02x5qvc8rppf0yn35aljd35alnvjkjyi6725nywjib2xy5x"; depends=[coda lme4 miscF R2jags]; }; agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; }; @@ -3476,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.5"; sha256="1mc6riwycizbmr7mx6r4fs513ij8g14fgs5ngg2rai7cp58796cc"; depends=[data_table dplyr ggplot2 igraph lazyeval Rcpp 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=[]; }; @@ -3490,59 +3719,69 @@ in with self; { allelematch = derive2 { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; }; allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; }; - alm = derive2 { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 httr jsonlite lubridate plyr reshape reshape2 stringr]; }; alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; }; alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; }; alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; alphashape3d = derive2 { name="alphashape3d"; version="1.2"; sha256="1apbirffqipdj618qgqh7vjlhg9fp6ncxb0yk4dclpn7g645863x"; depends=[geometry rgl]; }; alr3 = derive2 { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; + 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=[]; }; - anametrix = derive2 { name="anametrix"; version="2.0.0"; sha256="1dnmz7mpm1rsw61a39pkby0jsiprwk0g74h09g3r4vbn4k93r375"; depends=[dplyr plyr RCurl XML]; }; 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.4"; sha256="092xqnnr16rdf9yx68l6qgq4gg2ghdk31s4liycx71kvn6kr3vss"; depends=[]; }; + animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; }; anocva = derive2 { name="anocva"; version="0.1.0"; sha256="1kira0bs3yjmsq7zrd4y5zzl948pz3rgbfsvkzidi2n6vvcl5344"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; + 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.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.1"; sha256="0grz40c4wv8z174b7avrj2fcfbr3clmvbrqjgmvi6x3ww6sqfppm"; 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.4"; sha256="0ckxp37p1aizvs5sql54xvpimhq4m4944x18ihqffhpzb3dxw1ba"; depends=[ReporteRs]; }; - apaTables = derive2 { name="apaTables"; version="1.0.4"; sha256="1ncs79n0jvr6m9gmaazi5d9g2c6c6hf8alrb45z8fy8sj9bj51hn"; depends=[car MBESS rockchalk]; }; + apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; }; + 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=[]; }; @@ -3553,6 +3792,7 @@ in with self; { apsimr = derive2 { name="apsimr"; version="1.2"; sha256="14vhsm6am2c2q2sgabnhxr0lgldifss0anjpisrhjqk04njllviy"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; }; apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; }; + aptg = derive2 { name="aptg"; version="0.1.0"; sha256="06z8041h1k9v0ymd7azn11xzhqxb8lda4r7nyg51h8z3i8mpq1ba"; depends=[ape brranching phytools taxize xml2]; }; aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; aqp = derive2 { name="aqp"; version="1.10"; sha256="1c8vj10mygsrlixx4pwfs1xk69bvhdi37hl4p1v6g3nwvsr8f7ac"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; }; @@ -3560,47 +3800,48 @@ 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=[]; }; arm = derive2 { name="arm"; version="1.9-3"; sha256="00773z8ai07s9wa2annzjqrxml3z13fh9zqls0z1n7s3h8fwrvqw"; depends=[abind coda lme4 MASS Matrix nlme]; }; arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; - aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.0.0"; sha256="1i6swcg13sajsr2r49ga3qnkiza87ql49v96mjwaj0s5x23szknp"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; + aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.0"; sha256="1slbmqr0qd8r9lrms7b86fhvn612g4yjbm604zahjr335q6d7h03"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; }; aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; }; - aroma_core = derive2 { name="aroma.core"; version="3.0.0"; sha256="0y0hydf2b2fp2dn2fqxbdqsf2r04rk7y1s2wwm1dg3p6nzsgnypk"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; + aroma_core = derive2 { name="aroma.core"; version="3.1.0"; sha256="1hynag8jgjbxhnihpvv3zy3z5wdfg52ca9mly9bc649yh3gpmmxk"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; arrApply = derive2 { name="arrApply"; version="2.0.1"; sha256="007fsqgb9bsr4mscljhp37dvrk7cv6nrb7y28w8kc7mxvgdq29wg"; depends=[Rcpp RcppArmadillo]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; }; ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; }; - arsenal = derive2 { name="arsenal"; version="0.2.0"; sha256="1rwzgza4dy1xyi0p157yfhwr1bwwk6bxbkb31752av34nvddl4cm"; depends=[broom stringr]; }; + arsenal = derive2 { name="arsenal"; version="0.3.0"; sha256="19m6zblghdsx0phm82bb6dbjba260pa495xxwssypciyf7lrj3mc"; depends=[broom stringr]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; - arules = derive2 { name="arules"; version="1.5-0"; sha256="0x75ggaaqnhikkpk2rhwnzbg1lakch7kykw6q9iw6wzvq8qbmnmi"; depends=[Matrix]; }; - arulesCBA = derive2 { name="arulesCBA"; version="1.0.2"; sha256="0sckrw702ah5dphbixfinnb0g9sca7r12k91c564aigfj3yspc1s"; depends=[arules caret Matrix testthat]; }; + 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-17"; sha256="1ch2k70k713h5vr3g7ddzv1bsgpyiaf6i6jjf7jmvcc4m6pcg2s1"; depends=[arules]; }; - arulesViz = derive2 { name="arulesViz"; version="1.2-0"; sha256="1vdcrqw5m4ca379y4xapz8azifnv608lna0mx3kl7zi6iy8ysn61"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd]; }; + 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.8"; sha256="0j8fabrdpnp7y8pa7crjx976hngyvm2zy0chdp4p44pgcs4dn071"; 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.1"; sha256="0q204l1wlnwvlf72lzaqfxf5x88h53c8zva5vmiq0c825h2v67an"; 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]; }; @@ -3617,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="1.0.2"; sha256="1l0j0jxg5dr6c1hkigwpmr04df30s0cqpy64brrkl8jkwf4c1ji1"; depends=[dplyr lazyeval MASS]; }; - assertthat = derive2 { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; }; - assignPOP = derive2 { name="assignPOP"; version="1.1.1"; sha256="11786lxnrwi4gb1nddk8bkz7h9wyjiav8gajss43cybhiwpcy0p1"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; + 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.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.8-31"; sha256="1rn9hp7dg81rd14ckmfz23aav3ywm7i3w46jx66kqbrfs7kdrslq"; depends=[trust]; }; - aster2 = derive2 { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; 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.5"; sha256="141nw03ggxc4p297g799kvk15sa6n5apf733kg7w9bbfgqwm4aa5"; 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]; }; @@ -3645,20 +3887,21 @@ in with self; { audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; }; autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; - autoimage = derive2 { name="autoimage"; version="1.2"; sha256="1dzxdz7wpmhl5p1jcab2i7k9fd7idm3dflsyj8clpp203wr4kz56"; depends=[fields ggplot2 mapproj maps viridis]; }; + autoimage = derive2 { name="autoimage"; version="1.3"; sha256="109n23j9wx0nbbawpr28l3xsxhc3pq21b0pg6h2symgjahvw9b5n"; depends=[fields ggplot2 mapproj maps viridisLite]; }; automagic = derive2 { name="automagic"; version="0.3"; sha256="0yzv0ianfq217jvz7rba86bcmxh09p513khvq6jk5k7isblvn0qd"; depends=[devtools dplyr formatR githubinstall knitr magrittr pacman purrr remotes yaml]; }; 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.2"; sha256="0k7f0l7bx76q5x8cam2z0q6akc9a6zj0pj0644v8gbr40n2y5snz"; depends=[MASS]; }; + 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=[]; }; @@ -3667,22 +3910,24 @@ in with self; { b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; bReeze = derive2 { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk3qf9kikrxrly4n6sfyim1z6sagnj0z"; depends=[]; }; - bWGR = derive2 { name="bWGR"; version="1.3.2"; sha256="0c0fj8w6gzkcbpfw68hvdp3ihjdwpnplqgnxnj7zp5cxac996vs8"; depends=[Rcpp]; }; + bWGR = derive2 { name="bWGR"; version="1.4"; sha256="0sj6fa4ajp7a7k8z7znqn3wkibvxmdlnj5xf1n0zmsvncmgqhkwh"; depends=[Rcpp]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; - babynames = derive2 { name="babynames"; version="0.2.1"; sha256="1knzr0pn77k8krinp8pmlzf07v8597g2iby4mayig91cna1m0psx"; depends=[]; }; + babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; }; 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]; }; - bamlss = derive2 { name="bamlss"; version="0.1-1"; sha256="1r34qgy0w0hx2q9bfc7bxzyjgnqn3wfb0r0ij3rkvdi5rzcrsw7z"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp spam survival]; }; + 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=[]; }; banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; }; @@ -3692,46 +3937,48 @@ 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-36"; sha256="1y2pvs5gffifvchyqahsnqg6zw00yargajvryrb96labh9c5dqyl"; 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.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.3-3"; sha256="08d7ffv1nr1q7syf8fxp40fczyl5i8xd2cyv3piqn40l7dlpckhj"; depends=[Rcpp RcppArmadillo]; }; - bayesLife = derive2 { name="bayesLife"; version="3.0-4"; sha256="1n15df1rsyad3ij7l6ib79q7yflgwaykxq8msbkaq4ly8fvyy72x"; depends=[bayesTFR car coda hett wpp2015]; }; + bayesImageS = derive2 { name="bayesImageS"; version="0.4-0"; sha256="1z8jvjqz56xlj5x2ilp9m93v74qsqd7xvdld5pk7y80pxnfd6wpy"; depends=[Rcpp RcppArmadillo]; }; + 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]; }; - bayesTFR = derive2 { name="bayesTFR"; version="5.0-5"; sha256="091yzazvj66g6l9997qgnybbhvidfd9gr1wj15b7r3ji0cigywkm"; depends=[coda MASS mvtnorm wpp2015]; }; + 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.1.0"; sha256="0c71ma6v6b44j39x7z44wyashnpd8xdwj3hrvvjafx473pgmbx4s"; depends=[dplyr ggplot2 reshape2]; }; + bayesplot = derive2 { name="bayesplot"; version="1.2.0"; sha256="10xk90vh9p9ifnkffh4l7icq7072zmn3cf5gdr8j4982pbb3d4w0"; depends=[dplyr ggplot2 reshape2]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; 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.18"; sha256="0gcj16msny7ni60r000mv2knb4gxbb470qn16pc6vzdhrl6c6dxj"; depends=[lattice MASS numDeriv]; }; + bbmle = derive2 { name="bbmle"; version="1.0.19"; sha256="014h6mw16gv4acs2p78dy7lla7s428n633aybsb1mbi6250dg0p8"; depends=[lattice MASS numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-1"; sha256="0gikx66lwirvh037za1ipwvw6kj7n8r31zdsbsasrvksg4r3k58m"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; @@ -3742,35 +3989,38 @@ in with self; { bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; bcrm = derive2 { name="bcrm"; version="0.4.6"; sha256="1nqa7kd83h8gh6bb5lbd17m1hgv8vjlbbq8w0i1fgmadz7y5rpji"; depends=[ggplot2 mvtnorm]; }; bcrypt = derive2 { name="bcrypt"; version="0.2"; sha256="0f4sw1w2k1237wipfva3k9w2a678pvfz0k86jd7djslhyimb6jrq"; depends=[openssl]; }; + bcs = derive2 { name="bcs"; version="1.0.0"; sha256="0wv7kfcr6i36ik8v3prwp4mrwg1x6vf5nmybq9a57fz66pf1ff1x"; depends=[fda Rcpp RcppArmadillo wmtsa]; }; 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]; }; bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; }; bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; }; - bdvis = derive2 { name="bdvis"; version="0.2.9"; sha256="0qgxi9i2vblc219d0gn81mkqnpn9i6c84fczc5lrbcf9a2x0q88g"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; }; + bdvis = derive2 { name="bdvis"; version="0.2.15"; sha256="0qmzy41bbv6vin0ah1skqb1sp5z66pgbi8h81cfmmffsypzwawx5"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; }; bdynsys = derive2 { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; }; bea_R = derive2 { name="bea.R"; version="1.0.1"; sha256="15ihbw3chmwnlyh68dwdzzzbvzj909jz8d1m4gnmi71s4v5mc1v8"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; }; 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]; }; benchmarkme = derive2 { name="benchmarkme"; version="0.4.0"; sha256="1x17nhpxvz51mllml8mhn9lzx5in1mmfi1f6arqw2xhxd6rkbjdz"; depends=[benchmarkmeData httr Matrix]; }; benchmarkmeData = derive2 { name="benchmarkmeData"; version="0.4.0"; sha256="06nphyma03pmjynmck9mcnws6sjp32894wv8pvh9xa14ifxqf48f"; depends=[]; }; - benchr = derive2 { name="benchr"; version="0.1.0"; sha256="1a47ambg70hl4jsr6v96z29rm3ipg1psqma792k5l2ws8422gxgw"; depends=[Rcpp]; }; - benford_analysis = derive2 { name="benford.analysis"; version="0.1.4"; sha256="0kz55548f141ic4bvg6wbb0dqrkdnggpdsalf7pra7dj8x67wbhm"; depends=[data_table]; }; + benchr = derive2 { name="benchr"; version="0.2.0"; sha256="042ijh6726s116z7w2cky5l105p3dj7xsfmlwkigsbrmya8x5d37"; depends=[Rcpp RcppProgress]; }; + benford_analysis = derive2 { name="benford.analysis"; version="0.1.4.1"; sha256="0acbjjavbvsaigy78b5k9qhj8011751116lqln8j0v8w1k3vqwqm"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; - berryFunctions = derive2 { name="berryFunctions"; version="1.14.0"; sha256="16332811v3ivddklif5n3mwjp02c2hzysbj4vc6z6v6sxd1jvjq2"; depends=[abind]; }; + berryFunctions = derive2 { name="berryFunctions"; version="1.15.0"; sha256="006q9p97mz7mc6z892680a49s2j4jcykjgkddgb69jpbj5shx1pg"; depends=[abind]; }; bestglm = derive2 { name="bestglm"; version="0.36"; sha256="1das1qnczgw46hrjplfhw00wqjd8gxqsdr9s4zmc3k8qlzhb3ych"; depends=[glmnet grpreg lattice leaps]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; @@ -3781,46 +4031,48 @@ in with self; { betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; }; betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; }; bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; - beyondWhittle = derive2 { name="beyondWhittle"; version="0.17"; sha256="1lmrsc85v3gjafk2pb013jr5v01jlf7y7csbzck48rmlgv6bqf89"; depends=[ltsa Rcpp]; }; + beyondWhittle = derive2 { name="beyondWhittle"; version="0.18.1"; sha256="0aph1sshnxk7aajnm871zw9fadxbhv8l93kbydzh69b8kiz6wi6x"; depends=[ltsa Rcpp]; }; bezier = derive2 { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; }; bfa = derive2 { name="bfa"; version="0.4"; sha256="08n6446xl2w8z0rsqi6v2hp9cp744frxw6vrbxg5cpybhyyfzr36"; depends=[coda Rcpp RcppArmadillo]; }; 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-31"; sha256="01b6471a0vwfickj5sl4dak1y4bqysanmzlxs867j7dcsh6nqha7"; depends=[Rcpp]; }; - bgeva = derive2 { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[magic mgcv trust]; }; + 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.4"; sha256="14p5rss6maqy4d63w537lnslgdadvybg5vkscj38db16vqasvhcf"; depends=[dplyr factoextra FactoMineR ggplot2 igraph Matrix 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]; }; - bigFastlm = derive2 { name="bigFastlm"; version="0.0.1"; sha256="00i5hq3i837hj5kszm9rqax86g273aklxwikrabzwnyai9ziz8qa"; depends=[BH bigmemory Rcpp RcppEigen]; }; + 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]; }; - 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-3"; sha256="1mv9zildvkq8a5rvhr8hr1d7v3zn58j5bjc17wz75mqk0dsfwdjs"; 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.1"; sha256="1x8bx0n9nplb6h54nf1s18qv2zgy79ykass08qin6l1d65qvpfwc"; depends=[bigmemory R_utils RcppEigen speedglm]; }; + 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=[]; }; @@ -3831,16 +4083,16 @@ 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]; }; binhf = derive2 { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[adlift wavethresh]; }; binman = derive2 { name="binman"; version="0.1.0"; sha256="103f74gm124vw4rwbfrd5dlgca3v83kqd8m5j9z3ma3snh788mkx"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; }; binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; - binomSamSize = derive2 { name="binomSamSize"; version="0.1-4"; sha256="0m7g4fagw44l23ancisnp41928pwkr0cwyi1015nbccqbgrw2g3n"; depends=[binom]; }; + 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=[]; }; @@ -3848,23 +4100,26 @@ 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=[]; }; biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; }; 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]; }; - biomartr = derive2 { name="biomartr"; version="0.3.0"; sha256="15r0dx0pbb2fxgc1ai2f9rg4dd3vly1yxkh4vv698gkf1z0r6cxx"; depends=[biomaRt Biostrings data_table downloader dplyr httr jsonlite RCurl readr stringi stringr tibble XML]; }; + biolink = derive2 { name="biolink"; version="0.1.2"; sha256="12hpd50swnij9jzc8m6bz7iwmndgwmlyj7vnd8hvnz1gc68bjs2p"; depends=[memoise rentrez xml2]; }; + 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.0"; sha256="0avn35r567crp3z4i1fvlfirvc085cf3g6znc6wgnm7mhxp3l1ss"; depends=[signal]; }; + 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]; }; - bipartite = derive2 { name="bipartite"; version="2.07"; sha256="10gpmcnlnhv55ffff23xsmwbq58r2wvg54wyv1isa0jp4vh0b67x"; depends=[fields igraph MASS permute sna vegan]; }; + 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]; }; birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; @@ -3872,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.1"; sha256="1nig6nfxw7vrvq20p49l2b5z8cnjihljivir3lgj99djb5w8i6lk"; depends=[]; }; - bkmr = derive2 { name="bkmr"; version="0.1.0"; sha256="0pw82sd8x82nk5c5c6lr7yqr767nrkgk1rvbpwy5vwdpvwwj5ibl"; depends=[dplyr fields magrittr MASS nlme tidyr truncnorm]; }; + 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=[]; }; @@ -3891,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]; }; - bnlearn = derive2 { name="bnlearn"; version="4.1"; sha256="0ywj94m9jvwci3q1abld2yfpz0h48x4lbfqyqyg43pbzs3p7p6r0"; depends=[]; }; - bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.4"; sha256="0rbv8vq7wlzc1mmjqaw9yxjfdgb0cwiwvhwlay24njq16fhidk9w"; depends=[pec prodlim Rcpp]; }; + 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.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]; }; @@ -3921,25 +4176,25 @@ 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]; }; - bootTimeInference = derive2 { name="bootTimeInference"; version="0.1.0"; sha256="0kpb0xnvyjf3z2zy1970zzmiiln232m8xykz9qylpmln91z6xnjm"; depends=[Rcpp RcppArmadillo]; }; - 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]; }; bootstrap = derive2 { name="bootstrap"; version="2017.2"; sha256="08lmsy7k8wsgv89yc904c6fidcymr1ma2ry4fl0p69p21v4iiwa4"; depends=[]; }; boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; - boral = derive2 { name="boral"; version="1.2"; sha256="1xd9g3ll6ax363ip0wh5zpk8yw23pcv4wxlm2xxshmxyx0k9gqfk"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; + boral = derive2 { name="boral"; version="1.3.1"; sha256="0kwgjfp4r8a2mph83n3ljlqr7077i4f8dvbk2kz80n5jq48v84j0"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxoffice = derive2 { name="boxoffice"; version="0.1.1"; sha256="19l65nxrj0q7vr5ds6cwf7ynaqzd3ivzx673svvl6wmxlgn67cfi"; depends=[foreach lubridate rvest xml2]; }; @@ -3954,44 +4209,55 @@ in with self; { braQCA = derive2 { name="braQCA"; version="0.9.9.6"; sha256="1xqy0vykxdp0kr87w1sq8yjqrj0y8xh64fr2y8l79763xkyxpn0y"; depends=[bootstrap dplyr QCA QCAGUI]; }; braidReports = derive2 { name="braidReports"; version="0.5.3"; sha256="107c9lrzb55dw5pal8qqpn8is3nrh19vfngx3zcfpmc49f06kskq"; depends=[braidrm ggplot2]; }; braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; }; - brainGraph = derive2 { name="brainGraph"; version="0.72.0"; sha256="1r52zyvyxd7qj46ffpvv5vjjmkk8zanvq3w1mdww1fsim94i1507"; depends=[abind ade4 boot cairoDevice data_table foreach ggplot2 Hmisc igraph oro_nifti permute plyr RcppEigen RGtk2 scales]; }; + 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-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]; }; + 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.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.5.1"; sha256="1qh72qfkpg2226ckjraca9lc5waaajnmv729w52c04b2vmxzsr0x"; 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="0.8"; sha256="1cdc1ghvwdr64spns7x96gml9vqjd33xhk76w04nk0ldb3in4jfp"; depends=[]; }; + 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]; }; brranching = derive2 { name="brranching"; version="0.2.0"; sha256="0y99px2m02rl60qgf6pjbjv6isp8v1w9sny6p2icgsx4bwxjxmns"; depends=[ape curl httr phytools taxize]; }; + brt = derive2 { name="brt"; version="1.1.0"; sha256="11a6zpdml5vz3kcdcajw5zcck1zbp4kfdkqm3y6q7qj8ym2f12q5"; depends=[ggplot2]; }; bsam = derive2 { name="bsam"; version="1.1.1"; sha256="00ckj2pmyh7pqmbvwlgvgc3m53c807mri46jc0ivfwgf0kc8q0s0"; depends=[coda dplyr ggplot2 gridExtra msm mvtnorm rjags rworldxtra sp tibble]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; }; 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.6.5"; sha256="1ywk73f5dnlpwz1hl1rpaxnvg9zag70fs237gw3gc8gsdydc7dlk"; depends=[BH Boom BoomSpikeSlab xts zoo]; }; - btb = derive2 { name="btb"; version="0.1.3"; sha256="0ac6jfk66ij4av5i63gm69ry7vfp08ka6l6l3y28ycf10fzp84k8"; depends=[Rcpp sp]; }; - btergm = derive2 { name="btergm"; version="1.8.2"; sha256="16vyxyg3nc7p65nrg46f5mh1py3i6vxk34m9645376s80gxkspcn"; depends=[boot coda ergm 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]; }; + 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.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=[]; }; - 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=[]; }; @@ -3999,10 +4265,10 @@ in with self; { bvpSolve = derive2 { name="bvpSolve"; version="1.3.3"; sha256="1q5sh3kj1c07zq7mx8sh4ggp1fvwh86394qrc3ildj4wrbakmzib"; depends=[deSolve rootSolve]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; - c212 = derive2 { name="c212"; version="0.90"; sha256="15s0482kl7zd2kzxcyzd7gdclv1z8yn4x70cgsdlbmd5047pcn9k"; depends=[coda]; }; + 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=[]; }; @@ -4021,61 +4287,73 @@ in with self; { calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; camel = derive2 { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; - camtrapR = derive2 { name="camtrapR"; version="0.99.7"; sha256="0yhpxx7p02j10b2ascdf0mqhlv8gssi6v9g4pc0s4p6bi2zhs7m6"; depends=[overlap rgdal ritis secr sp taxize]; }; + camtrapR = derive2 { name="camtrapR"; version="0.99.8"; sha256="06sl3rlzgjf3yq9y0sg664xc0xfxwlvvd5w4wr5946h6kwvnhih4"; depends=[overlap rgdal ritis secr sp taxize]; }; 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]; }; + 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.2.0"; sha256="04bg1d22n2h24w4j46fg30p1n85qvy5868sllrcwybrv4j15xh1f"; depends=[curl jsonlite]; }; + 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]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; car = derive2 { name="car"; version="2.1-4"; sha256="0a6v7rsd1xsdyapnfqy37m7c4kx9wslkzsizc9k0lmnba0bwyfgx"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; }; cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; }; - care = derive2 { name="care"; version="1.1.9"; sha256="0fx5cbi1fx3hpyzghn1788rkh91i10z1ngryqc1v3iqqn3akbk4j"; depends=[corpcor]; }; - caret = derive2 { name="caret"; version="6.0-73"; sha256="1jzaqwv4glyqqnfbpalgajd0ag866247vvdh5i83ffqs1yhs984h"; depends=[car foreach ggplot2 lattice ModelMetrics nlme plyr reshape2]; }; + care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; + caret = derive2 { name="caret"; version="6.0-76"; sha256="1w31xzpmj8p6r6s7s1vwnjxainq54bbh4cqm177ba0myv69hh8cc"; depends=[car foreach ggplot2 lattice ModelMetrics nlme plyr reshape2]; }; 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.1"; sha256="0bblhnz94rhjrrm0v9mvlvqrcqfxq4762crijk34xf9cxcpmhjx4"; depends=[classInt raster rgeos rosm 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]; }; cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; }; cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; }; ccda = derive2 { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; }; - ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.2"; sha256="1q6fcmd2byjpwsqa9a9m9w8dm9gy76g9477p9jb8q92kiv2rs6bq"; depends=[Rcpp sparsebnUtils]; }; + ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.3"; sha256="0b5rm17zqf4w22vfjhp13wjqrds7f6mbvmd0kazxrnrnb10799a3"; depends=[Rcpp sparsebnUtils]; }; 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.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]; }; @@ -4091,94 +4369,109 @@ 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-22"; sha256="0s955gzd40nwl2qq20ss1yqjfpdrhv6bwbiksvd1smg4ip038w5q"; depends=[glmmML maxLik miscTools plm sandwich]; }; + 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=[]; }; - cffdrs = derive2 { name="cffdrs"; version="1.7.5"; sha256="1v5acbp8469b2mbv3x6986f8rw6hh34jqkwdm6fp50dx1r8x9p1x"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; }; + 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]; }; cgam = derive2 { name="cgam"; version="1.6"; sha256="04mwkij3fyamm8i1wnd87vihcg7c45872n10q9ax5f2nby95ddrc"; depends=[coneproj svDialogs]; }; - cgdsr = derive2 { name="cgdsr"; version="1.2.5"; sha256="1w5nd4hirlw8s9a8ysr6102pq9sbz4820qni06g98ykyg7yb32hx"; depends=[R_methodsS3 R_oo]; }; + cgdsr = derive2 { name="cgdsr"; version="1.2.6"; sha256="05q26g7gflq4hsd3xa5xkjc3mhvml7i6dzamfwm0i14kxigghqp8"; depends=[R_methodsS3 R_oo]; }; cggd = derive2 { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; }; cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; }; cghFLasso = derive2 { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; }; + cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; }; cghseg = derive2 { name="cghseg"; version="1.0.2-1"; sha256="0q9ks19r21b6p0gfd7mnsgp7pbihz3yzmbzijlrx178f1z9yjx5q"; depends=[]; }; 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.3.18"; sha256="17r3hamj66hx1w050yim21b8kp1mbfkjh6rsdmd0z3s04wash7bi"; 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=[]; }; - chemometrics = derive2 { name="chemometrics"; version="1.4.1"; sha256="019r0n4s6lzzjyp94zv12gn113p69c4s4ji0aqinfzb5fw0dlikn"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; + 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.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; }; - chillR = derive2 { name="chillR"; version="0.65"; sha256="0r584h2y2w7hcrdxvf7xlw4ivbyid293li0scxwvkd4v8s78kmcm"; depends=[fields httr Kendall pls raster readxl RMAWGEN sp XML]; }; - chinese_misc = derive2 { name="chinese.misc"; version="0.1.1"; sha256="0gcr0lw3ns3wbjchhzb0alabs4d8fmq8gvf4ggph3m8fcyfch0cc"; depends=[jiebaR NLP Ruchardet stringi tm]; }; + 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.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]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; chopthin = derive2 { name="chopthin"; version="0.2.1"; sha256="0sib3ic79hff5w2xmmw4z9c6bax33jczrcijs7ywdb8y3viwy5av"; depends=[Rcpp]; }; chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; }; - choroplethr = derive2 { name="choroplethr"; version="3.5.3"; sha256="1iagrm8ybr7whn77i96cnyl2kil96lb9zznlbc93kcy17jbf4yns"; depends=[acs dplyr ggmap ggplot2 Hmisc R6 RgoogleMaps scales stringr WDI]; }; + choroplethr = derive2 { name="choroplethr"; version="3.6.1"; sha256="11f529zcflbqbchnp3v5yw2vwrlhyfib5pn2j6l60x0gdfxp07bb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps scales stringr tigris WDI]; }; choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; }; choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; }; chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; }; 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=[]; }; - circlize = derive2 { name="circlize"; version="0.3.9"; sha256="0zaqisklz28y262lwh11m4fi5x6rr6hzw4fzibgsx4x34nxxavlb"; depends=[colorspace GlobalOptions shape]; }; - circular = derive2 { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; + cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; }; + 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]; }; - clarifai = derive2 { name="clarifai"; version="0.4.0"; sha256="0qlv4aj5vlrrc0h6gyryly33rfz5jz7cahw5l6qdbba4dibrkajm"; depends=[curl jsonlite]; }; + 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-23"; sha256="07anmwmchri4ppl01y041zh3xdqsdwzv4n5jpr3crmpk39qwwhzq"; depends=[class e1071]; }; - classifierplots = derive2 { name="classifierplots"; version="1.3.2"; sha256="18xsjsfsr4dz791b0ap8lcbk7mnr3i0pspbal6n5ah864ngqvbvn"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; + 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="0.24"; sha256="0j4im6518sqdyfwbfabc1q3g01nqfpshznq033193g9b519792z3"; depends=[dplyr magrittr RCurl readr rJava]; }; + 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.1.9"; sha256="0hg8ywnm82r5787qal19rcg7q0jvvrw6ifaya84p6sazwqwy8m4g"; depends=[arules data_table igraph linprog plyr Rsolnp]; }; - clifro = derive2 { name="clifro"; version="3.1-2"; sha256="0fa1r4rsl3cq8dmy0jxalga9qzhiwpdhkzmjgx2hfbkgklfdnr40"; 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]; }; @@ -4190,55 +4483,56 @@ 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.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; }; + 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.5"; sha256="1bkvqmv8h2c423q9ag2afb6s9j2vcdlxsf559zzbimraphrr2c2b"; depends=[]; }; + cluster = derive2 { name="cluster"; version="2.0.6"; sha256="1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.7"; sha256="13smdm8dmp4795qqn8an3k22l7xs4i4kgazyjzxdbzkg742akk7q"; depends=[]; }; clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; }; 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.2"; sha256="1pxfvmkgx45xp7q2fdd34zd2f0snyq6mazqsd1nqrda7791a494f"; depends=[AER Formula lmtest mlogit plm sandwich]; }; - clusterSim = derive2 { name="clusterSim"; version="0.45-1"; sha256="0wmhsz71rspg98smdp08q3jgdkldqn2l3szwdl70lz93kyls3ivv"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; }; + 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=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; - clusternomics = derive2 { name="clusternomics"; version="0.1.0"; sha256="054jbzgz53b1vbv5492zrhywjly8pwiiy4j11qsb20sfz4j951h6"; depends=[magrittr MASS plyr]; }; + 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.0"; sha256="0ax27y1h0pz8i5ckjcrbgpav6m1srym6av94bvy02mv26ida0l8c"; 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]; }; cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; }; - cmsaf = derive2 { name="cmsaf"; version="1.7.1"; sha256="0q954akb9myb64p7x2zplfljkzqnakx74w93h1n2kfzx7bbh482h"; depends=[fields ncdf4 raster sp]; }; + cmsaf = derive2 { name="cmsaf"; version="1.7.2"; sha256="12kim4nfzar7g6fv2mjqaiy6ks82pp20v4mwnk6b0hilmpvlnhsh"; depends=[fields ncdf4 raster sp]; }; cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; }; - cna = derive2 { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; }; + cna = derive2 { name="cna"; version="2.0.0"; sha256="0cfr4g63wwqkkz2xxz76m82p0am2kyazal6sqp7gnrc48x9lv8im"; depends=[Rcpp]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnmlcd = derive2 { name="cnmlcd"; version="1.0-0"; sha256="0kbq01qrmpn133v18rjphhznpnj8g6dcn1lrbsjykhxkqz086s36"; depends=[lsei]; }; coRanking = derive2 { name="coRanking"; version="0.1.3"; sha256="1ss00l0c99fi9p6gcimb31nrl5iflps6lvplnjjqwcqjkb2pjh9p"; depends=[Rtsne scatterplot3d]; }; 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]; }; - cobs = derive2 { name="cobs"; version="1.3-2"; sha256="1kqyh2c0jlb6gbpgwdk0dh5sh6ziw9wyxvxgdk4n4j8d0klb9kx1"; depends=[quantreg SparseM]; }; + 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.2.2"; sha256="1x1h5jdnfx6l8ry7nmn3f1qyzv96vf8axzjxcxqrlylh6z1zc068"; 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]; }; @@ -4246,19 +4540,23 @@ 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]; }; + collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; }; 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]; }; @@ -4266,34 +4564,35 @@ in with self; { colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive2 { name="colourlovers"; version="0.2.2"; sha256="0fgxs73l4g1lnmc2q613ykxxrbmvq6w66zpidccqg64wa9cy5yhm"; depends=[jsonlite png XML]; }; colourpicker = derive2 { name="colourpicker"; version="0.3"; sha256="0sxxllfwdbdc283nk9b82xrvb6xali14c6qfywm2qck0k8jh7ppy"; depends=[ggplot2 htmltools htmlwidgets miniUI shiny shinyjs]; }; - colourvision = derive2 { name="colourvision"; version="0.1"; sha256="1v9qipx1rglga0mdw97xbdbq1mgx7avif7a6gi1xh9gvw408x25c"; depends=[rgl]; }; + colourvision = derive2 { name="colourvision"; version="1.1"; sha256="1lygk7ak8hdpscdh80bf3p3z58a37nlrmx02wqfnyd0v6qns8azv"; depends=[rgl]; }; 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=[]; }; compareDF = derive2 { name="compareDF"; version="1.1.0"; sha256="1597xmq857jf4b67k7y869gbflad89rxfvrq8m0gp1wd21wv8z1h"; depends=[dplyr htmlTable tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="3.2.3"; sha256="0sliphw8yxx93qaf6pk405rqbfnpixjx8yazzjqiird6bm746i9n"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; + compareGroups = derive2 { name="compareGroups"; version="3.2.4"; sha256="0lg54vyg8jpf98bwqxzbnfiykx2l5dccdw1m48dbkncgkhm388lk"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; }; 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.0.0"; sha256="15wdlrc8ng1zxgp3gi8d1zfy366mv9m4p643ia7vdcgqv3icq7fc"; depends=[combinat]; }; - complexplus = derive2 { name="complexplus"; version="2.0"; sha256="05b36gql6fqcairwpxvis9vllpvmpgv6rg69zd8vabl5xsgv8q44"; depends=[expm Matrix]; }; + complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; + 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.2"; sha256="028mpal6gdrxgw08hxhsl4yvc9plj0bvndb48fyrzpj8kmk5dibv"; depends=[numDeriv survival]; }; + 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=[]; }; concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; }; conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; }; @@ -4304,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]; }; @@ -4314,14 +4613,16 @@ 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.1.0"; sha256="0yajq3c9j22p3llkhla2x6mmphmpi4l1wshyyn1sv1fczldijvzc"; depends=[ini jsonlite RcppTOML yaml]; }; + 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]; }; connect3 = derive2 { name="connect3"; version="0.1.0"; sha256="07ih875ynrxzynj989d0h469ilq6c634z2z3igvxpkx40wr451d5"; depends=[]; }; - conover_test = derive2 { name="conover.test"; version="1.1.2"; sha256="063a43v6f8hknaph78b92aqhwv6nfzsd029j4gqs2087lyqdk2ap"; depends=[]; }; + conover_test = derive2 { name="conover.test"; version="1.1.4"; sha256="1dscb0rwwvl83ag4lbn13bxnn9apv3dkr37q8qr5i4diahcva17c"; depends=[]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; contfrac = derive2 { name="contfrac"; version="1.1-10"; sha256="10mw75aznwbhi4kj8s7hyisgxnb4rv8pggcs8zdbmq22w7ql2rd7"; depends=[]; }; conting = derive2 { name="conting"; version="1.6"; sha256="0hyg1nj89i780mf1fgmrfiv5gl5nzlar8i1zy8fsim73cw9y39fm"; depends=[BMS coda gtools mvtnorm tseries]; }; @@ -4331,17 +4632,19 @@ 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]; }; - convey = derive2 { name="convey"; version="0.1.0"; sha256="0qv8v5mfnzgyyiyx2yhmkmqscnf1q8i2p2hvhhx5y1ix045an93x"; depends=[survey]; }; - convoSPAT = derive2 { name="convoSPAT"; version="1.1.1"; sha256="17j5a5nppslx2rwg2grdz8ihhy0ryjlhrqar1yq7jknmrss3jlpv"; depends=[ellipse fields geoR MASS plotrix StatMatch]; }; + 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]; }; cooccurNet = derive2 { name="cooccurNet"; version="0.1.6"; sha256="1vqfmvjrxxn977jrry47wn4lag4yi4bkyxwlis3n1ly39kkmyh2j"; depends=[bigmemory doParallel foreach igraph knitr Matrix pryr seqinr]; }; coop = derive2 { name="coop"; version="0.6-0"; sha256="1q38kawck0625fyxmh7a0cya5yyhv9ds53q1l0h03vrappq5amxv"; depends=[]; }; cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; }; copBasic = derive2 { name="copBasic"; version="2.0.5"; sha256="0xijw9abqkljacwnblyncjkpaj178s9kq8jazxb39v4qk8pmvq6c"; depends=[lmomco randtoolbox]; }; - copCAR = derive2 { name="copCAR"; version="2.0-1"; sha256="1mvbarzq409lkf7sd6s4adf2cgvmby7f1yg35x83bp1sc8529kz8"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; + 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=[]; }; @@ -4349,20 +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.8"; sha256="0gnwqzfhxhxy7zxjzgga9l2npn588jjavqlmv9dag7ciq1kxmzk9"; 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.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.10"; sha256="065l93pdz3bms1b9qkcqhyi0j2bh4firl35rnfkajqbz5i3v8q55"; 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-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]; }; @@ -4370,21 +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.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]; }; @@ -4397,28 +4707,33 @@ in with self; { cplexAPI = derive2 { name="cplexAPI"; version="1.3.3"; sha256="1li5sbakkq8hrgwsa4i1qa5bdjj6vm6s9sq23ccknbb8bxp4zmwv"; depends=[]; }; cplm = derive2 { name="cplm"; version="0.7-5"; sha256="16li79x2zyydi7gi4n8k09g9x2n1dgd9av3nqjnb0by3v31c44n0"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; }; + 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.5"; sha256="113apslycwdgyx18gxbamz235267h2v9b4r2d3pakw38sh74z3qz"; 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]; }; creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; }; credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; }; - cricketr = derive2 { name="cricketr"; version="0.0.13"; sha256="1nj72avz1m12nn3kyiy4msrvrwhdxl0mywc22wwc6j9dq7v7gh18"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; + cricketr = derive2 { name="cricketr"; version="0.0.14"; sha256="0vziyagx594d0k44c53z720vwb1hflcxb7m898l5vfds8jsi6mhv"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; 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=[]; }; crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; }; @@ -4427,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.0"; sha256="1a59zb2ifxg59yzjyf1gq4fk0vqvc0alvifpn2rssis8jyr6g7wr"; depends=[curl httpcode mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.15.0"; sha256="0ylkp861dy8qa03pjl6znf2mgknhnf3wfyby01zjzrwak2pixi5n"; 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]; }; @@ -4454,26 +4770,25 @@ in with self; { csvy = derive2 { name="csvy"; version="0.1.3"; sha256="0vszbxqa88sdsi73wng4y8zxhrvcksqa6qs3rbh50c2nll8r8kb3"; depends=[yaml]; }; cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; }; ctl = derive2 { name="ctl"; version="1.0.0-0"; sha256="12hrrql9wz43s1d3sfyzlqzx7ajrl3hvf96776ik6icbm8by8h6j"; depends=[MASS qtl]; }; - ctmcd = derive2 { name="ctmcd"; version="1.0"; sha256="1qv2r7myrvr0a5gcrs6bi46dm4kicyyn95rkr6qyvvdnz2i2mhqm"; depends=[expm numDeriv Rcpp RcppArmadillo]; }; - ctmcmove = derive2 { name="ctmcmove"; version="1.2.7"; sha256="1bhzwh1hhfda49p52ixvicx2mbca28mhnhh4h6nvm2i3m72dkfrq"; 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]; }; + 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.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.2.0"; sha256="0gi2lh9wyl0bl1dhlmifciyj4f0xffxqswhhcrybff5dv7bip3nv"; depends=[Matrix OpenMx plyr 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.3"; sha256="0gbw5l0wnsw26fbr08gj9vgxrzxg8axvqxfshmd8g9khpgbdl0gr"; depends=[]; }; - curlconverter = derive2 { name="curlconverter"; version="0.7.0"; sha256="03nv3kkw171qxafy0acbfs7kxaz89i1l7jyi3n46f5fapks4vx4x"; depends=[clipr curl formatR httr jsonlite magrittr purrr stringi V8]; }; + 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.1-0"; sha256="0cymz4i29sih9z5hkih86db41x39kzzm9vq1374rfxz26l2c00xy"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; + curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; curvetest = derive2 { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; }; cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; }; customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; }; @@ -4496,19 +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.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.2"; sha256="0abxv8ld6zzkajqkiz0dv61axw3yak4arpw8ar43dypg1ar5cbmm"; 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=[]; }; @@ -4517,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.1.2"; sha256="1z9r7f82rl6x63bl6mcvdvb0pbc6n0202vn9hh0lqf86qz30q7dp"; depends=[dplyr magrittr]; }; + 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.0.1"; sha256="1ka4yxggdm9yify4vdbsrnxarjx0yab4p94xyzks72xqn6kpwarg"; depends=[digest hash redland uuid XML]; }; - datapasta = derive2 { name="datapasta"; version="1.1.0"; sha256="0cvcb074blc35kl709s6gpii353pfn1biscl5d9jma4ad9i0fi5a"; depends=[clipr readr rstudioapi]; }; - datarobot = derive2 { name="datarobot"; version="2.4.0"; sha256="1whlzakr01v5wrzv4fmpzml5xdk1vk48mmnhnh41hycxgssvlp04"; depends=[httr jsonlite yaml]; }; - dataseries = derive2 { name="dataseries"; version="0.1.0"; sha256="1z2hvksk9c9rnwi0r2i61sbkiwk3g2q8knxh08w6wkj9864payhw"; depends=[]; }; + 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]; }; + 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]; }; - datautils = derive2 { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; }; + 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]; }; @@ -4551,9 +4877,11 @@ in with self; { dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; }; 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.3-0"; sha256="02dmm7djm4k5c9cz0dcs5fkdnld6xmj110619yry2z307irdqamk"; depends=[cubature Rcpp RcppParallel spatstat]; }; - dbscan = derive2 { name="dbscan"; version="1.0-0"; sha256="0yqng42d7nl4x2qnkpvv5cj426gzdx872gcwfblys73hw20v09ky"; depends=[Rcpp]; }; + 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]; }; dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; }; dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; }; dclone = derive2 { name="dclone"; version="2.1-2"; sha256="0s3s46hvlsivfhrc559y0b3dc5m6g11cv3fwy4asigh8lqjc972d"; depends=[coda Matrix rjags snow]; }; @@ -4563,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=[]; }; @@ -4582,31 +4910,32 @@ 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=[]; }; - demography = derive2 { name="demography"; version="1.19"; sha256="08cfvsvv6ayxy93vihavyb3lddgwfdlwrb2x4is5fxids79lpm9x"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; - dendextend = derive2 { name="dendextend"; version="1.4.0"; sha256="0piqa8jvzarkkxmrv8hz11gg1jzm75b2fbrmd3nkwv4fcjlzpa0x"; depends=[fpc ggplot2 magrittr viridis whisker]; }; - dendextendRcpp = derive2 { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; }; - dendroextras = derive2 { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; }; + demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; }; + 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.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]; }; denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; + denseFLMM = derive2 { name="denseFLMM"; version="0.1.0"; sha256="0sckr9r2wylncpsq5yz2vww35imcc0zw8ghz8prqw2n20233gqj1"; depends=[MASS Matrix mgcv mvtnorm]; }; 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]; }; @@ -4615,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.3-1"; sha256="1s0rmw3gsyj28ywlkfdjr98fr7cjhmzb0fq5qn9s91dw9a3fx8zf"; 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.1-6"; sha256="14jyagnrsbzdwcfy0z6c9gwbv40xrnany43ylpks6qgnq4rya7a2"; 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.3-4"; sha256="18lmgpv6jhjs15difiq0jck6kf898ngr2g13wrf3y5s5xc70iwkp"; 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.0.0"; sha256="0nn0m4kvjsyv48xribkab0jnbv0db17aan9flnkg5jh4s03pg9sc"; 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]; }; @@ -4673,26 +5010,28 @@ 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]; }; - directlabels = derive2 { name="directlabels"; version="2015.12.16"; sha256="0vi9zbc2sa8fpi2n2ax1ni9f8s9w1hc0f6gahk8fcrmnagj4g089"; depends=[quadprog]; }; + directlabels = derive2 { name="directlabels"; version="2017.03.31"; sha256="01ahw0c56mnzwl611s8hnghicww4c4dgf5v2wv6bl1s1pramw9pr"; depends=[quadprog]; }; dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; - discSurv = derive2 { name="discSurv"; version="1.1.5"; sha256="0lbzaalh1jack49px47sqsmpwmv14w4h1y2r9k294921d02zl0w5"; depends=[functional mgcv mvtnorm]; }; + discSurv = derive2 { name="discSurv"; version="1.1.7"; sha256="0shxwxbvbbgp0qphpbih582d5psqj5n0izv7zvcw97vh82bzra4l"; depends=[functional mgcv mvtnorm]; }; discgolf = derive2 { name="discgolf"; version="0.1.0"; sha256="15bk2k7glahcbz4kyl3fiayi7ck6z3wabl9y25fg6cnxkbyh6dbn"; depends=[httr jsonlite xml2]; }; 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.2"; sha256="1rdcwlp6m08fjvw54f4m07ahdx1vh1wdzxpai79kchgxp0i9np9g"; depends=[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]; }; @@ -4702,18 +5041,19 @@ in with self; { disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; }; displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; dispmod = derive2 { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; - disposables = derive2 { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; depends=[]; }; + 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]; }; - 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=[]; }; - distory = derive2 { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; }; - distr = derive2 { name="distr"; version="2.6"; sha256="0f2y3ycng2chbhas0bq8zqp314lsm8c39chxpg40dcfq0f1z3rmk"; depends=[MASS sfsmisc startupmsg SweaveListingUtils]; }; + 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.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]; }; @@ -4721,11 +5061,11 @@ in with self; { distrTeach = derive2 { name="distrTeach"; version="2.6.1"; sha256="0x60xlij1m9q7xhi9vnf61vb2px9aah8iqaki6d87c1pxylmqnvr"; depends=[distr distrEx startupmsg]; }; distrom = derive2 { name="distrom"; version="0.3-3"; sha256="1kpbrsa7ml72zvmdcpbbz2rsv4lpqd5i2w3v488ji6nbi44v1gp6"; depends=[gamlr Matrix]; }; divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; - diveMove = derive2 { name="diveMove"; version="1.4.2"; sha256="0j761js14ip6spxm6xz9lwyc6zv094bylp1lq487pkgwwcakqs0k"; depends=[caTools geosphere KernSmooth quantreg uniReg]; }; - diveRsity = derive2 { name="diveRsity"; version="1.9.89"; sha256="0f75dak14x9x9xs6ql9686n6w1f0w5g6h5ya983mg547f1zzbw9m"; depends=[ggplot2 qgraph Rcpp shiny]; }; - diverse = derive2 { name="diverse"; version="0.1.4"; sha256="0c5a2ippnygyny9bkqk8s9vywq5207nss0ikywgji8ld0zvxsmi6"; depends=[foreign proxy reshape2]; }; - diversitree = derive2 { name="diversitree"; version="0.9-9"; sha256="00dzw9fpcdgfvf7jl3lr2a2gpfd8pr17myih04v5hkxpjmsydawp"; depends=[ape deSolve Rcpp subplex]; }; - divest = derive2 { name="divest"; version="0.2.0"; sha256="0yhk83dmwkii1w355vqmcn4wsm3k8npm4v8wsf6knvqrszh6zh0s"; depends=[Rcpp RNifti]; }; + diveMove = derive2 { name="diveMove"; version="1.4.3"; sha256="18420gm1cb0pinp05n08cj5qgf9rmn5ksr7bfq464s61isrhmzhy"; depends=[caTools geosphere KernSmooth quantreg uniReg]; }; + 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.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=[]; }; @@ -4734,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]; }; @@ -4745,39 +5085,43 @@ in with self; { dnc = derive2 { name="dnc"; version="1.2"; sha256="0a0nc1yx6vhbjsik9pidda97i7s6ndlsm8pzx29ccmxlmqncc18b"; depends=[BayesLogit igraph MCMCpack movMF plot3D plot3Drgl Rcpp RcppArmadillo skmeans vegan]; }; dnet = derive2 { name="dnet"; version="1.0.10"; sha256="011rqvwski3jh5nmn84pg3pxznbfm37gjz7sp7n6f3x3y807q2rg"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; }; doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; }; - doFuture = derive2 { name="doFuture"; version="0.3.0"; sha256="1np7g4dqxkbfrilcbyrfdkppdv558xl9a4s4wgcxb2in6h27zzwp"; depends=[foreach future iterators]; }; + 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"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach iterators pkgmaker rngtools]; }; + 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]; }; doSNOW = derive2 { name="doSNOW"; version="1.0.14"; sha256="1xfk48i465sv2jqzydsaff3a656ggkrxzvhsqnrsgqh1k3423a1g"; depends=[foreach iterators snow]; }; 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]; }; + 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=[]; }; - docxtools = derive2 { name="docxtools"; version="0.1.0"; sha256="109fv2sg4dw6s10b4fx44npwvyr5yr69y7m701irqpc0bbwssh55"; depends=[dplyr ggplot2 pander stringr tibble tidyr]; }; + 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=[]; }; dosresmeta = derive2 { name="dosresmeta"; version="1.3.3"; sha256="0j0718mlzwnnxc7rm9yqm9izsa7c2kbwfx9ai2ygj3xki9wr70jm"; depends=[aod Matrix mvmeta]; }; 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.3"; sha256="0q5l7vkypnh1rxlh5yd8jq4kql62wqf60gdpf7cds437w8fs8c01"; 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.1"; sha256="0cl143b6rn5l7q67vd9kjj5sdqq13s2fww722vqcq7ham20k2wsp"; depends=[dplyr R_utils]; }; + 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="1.0.1"; sha256="14r1qa6nf1g0gixnyx7b60xga37gic99ma7mr2fzgqa7i89bz2hc"; depends=[crayon digest eply formatR igraph magrittr plyr pryr R6 storr stringi stringr]; }; + 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]; }; @@ -4794,58 +5138,66 @@ 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.1"; sha256="0w0hg0cp827mw98xlq8yqmx4cs4m7zlg6gbjlxk5pm8v2a3nhn3s"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp zoo]; }; - dtwclust = derive2 { name="dtwclust"; version="3.1.1"; sha256="0g3fffsvlwqb528y02fkazbll10yzcpblwxpc3519zff23vvb025"; 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=[]; }; dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; - dunn_test = derive2 { name="dunn.test"; version="1.3.3"; sha256="1hkfv9p06gfv0j4fh299x0cm9rrvsbqv89kqddqf6fablxmqm7vh"; depends=[]; }; + dunn_test = derive2 { name="dunn.test"; version="1.3.4"; sha256="1vnh98vqy0zy9bi3kpdzp74apy8zw8jl9r75vnqz5hjs3d6rg7lb"; depends=[]; }; 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-9"; sha256="1a94mwllk116k9al18ckzy9p6yckvifp5hwrz2na4n2r10ivhn86"; depends=[]; }; + 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]; }; eAnalytics = derive2 { name="eAnalytics"; version="0.1.3"; sha256="1lrkmfs2sq9p2n7g528jf6wxixqk08w468nckkij2mprhrccjjj6"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard]; }; eDMA = derive2 { name="eDMA"; version="1.4-0"; sha256="1nkbl6yywffb8q0x6ajymh1hpmkq038dc3a7xvw9szcjfrfbhw9v"; depends=[Rcpp RcppArmadillo xts zoo]; }; eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; }; + 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"; sha256="1dyz2ac754scg474x9ksrwrqflmh9wi7qwgm494fpfi9ndd9ycig"; 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="1.0"; sha256="17wjsvy9hnrp6s50ivrvahd6p147ibcn3wrlj1hx95qckqjk2b06"; depends=[multcomp PMCMR]; }; + easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; }; + 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.2.1"; sha256="0a7779xvsqzcsva9jxa10wz8bdbfp49r0w7c2dqwi9md04bv1qg1"; depends=[sdcTable SSBtools]; }; - easyVerification = derive2 { name="easyVerification"; version="0.4.0"; sha256="0jllrrp0abqkij7iq4z5paca4lgxh4lbrj5ifhrakrxdpncrg9wd"; depends=[pbapply Rcpp SpecsVerification]; }; + easySdcTable = derive2 { name="easySdcTable"; version="0.3.0"; sha256="1dyj66vd1g06s2fs6xqrf7b4sr2p55azhzdjhazvkm9h8j55ai02"; depends=[sdcTable shiny SSBtools]; }; + 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]; }; @@ -4863,57 +5215,58 @@ in with self; { echogram = derive2 { name="echogram"; version="0.1.0"; sha256="0v0fiy2fflk7pxn8wqr75wym0m6snggvvgxpa2b35alpmqch9k18"; depends=[geosphere readHAC]; }; ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; }; - ecm = derive2 { name="ecm"; version="0.8.0"; sha256="0y9whfr75mc54ip1vc0zrbxsjslz86adqrqdvpbbva81c2x1b0ir"; depends=[car]; }; + ecm = derive2 { name="ecm"; version="2.0.0"; sha256="1xfcpsnimik8a2rzsywgiw4dj3r66mfcq7l79096d3zifg2vjgxc"; depends=[car]; }; eco = derive2 { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; }; ecodist = derive2 { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; }; 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=[]; }; - ecoretriever = derive2 { name="ecoretriever"; version="0.2.1"; sha256="0jg4rmxfa9k0smlkrhiqdrjk3vhhmv6w634nh9y3mrdwnq4sk466"; 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]; }; - edarf = derive2 { name="edarf"; version="1.1.0"; sha256="04gcki36xnaflg1szsdsdvdw5icsny6iaqmqyxmb2im1b1a0r39w"; depends=[data_table ggplot2 mmpf]; }; + 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.4.7"; sha256="1fgngqd9qi798v435cax3kvwczq536jac6fhj5nsjbach1jlmm2y"; depends=[data_table dplyr ggplot2 lubridate magrittr tidyr 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.0"; sha256="113afdf1w1q75alc4i5i8l3ljsdsfn22l8cszljrpgp420csbzhv"; depends=[]; }; - efreadr = derive2 { name="efreadr"; version="0.1.1"; sha256="1fkifml8g7hgg3qb19b9ljljzx9sbbpnb9xa18mvkxgmbw41qsy7"; depends=[dplyr ensurer magrittr readr]; }; - ega = derive2 { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; }; + effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; }; + 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.8"; sha256="12ga90nnxzy08ajgx9yavasbx5j4nrqkqinbi9w7yp4r5f27pqg8"; depends=[cubature data_table 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=[]; }; @@ -4927,9 +5280,9 @@ 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]; }; - elementR = derive2 { name="elementR"; version="1.2"; sha256="030ljdk8qbvv81bjr1pxg597mq1i22fpjzqdcrbrgl1c508ms2l2"; depends=[abind devtools gdata gnumeric lmtest R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2]; }; - elevatr = derive2 { name="elevatr"; version="0.1.1"; sha256="0dwq748f4nfz41j6jc5v7l4gdrwkjrfqmivkiz799yq0pql9djar"; depends=[httr jsonlite prettyunits progress raster ratelimitr rgdal sp]; }; + 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=[]; }; elhmc = derive2 { name="elhmc"; version="1.0.0"; sha256="0xjl43xa0qw0hwdx73vv8cl1gyd5srdhpcpkap3wbnka4c75wpgj"; depends=[emplik plyr]; }; elliplot = derive2 { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; }; @@ -4938,45 +5291,48 @@ in with self; { elmNN = derive2 { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; }; elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; }; - embryogrowth = derive2 { name="embryogrowth"; version="6.4"; sha256="13mh7sh30q1zz4pqg4gwqsky172c0kklypv8n0432dkhmcv14543"; depends=[deSolve HelpersMG polynom]; }; + 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.0"; sha256="1g4bibrzjjgw3swzly590p9c1zipddzr8bgfydcqcbsqigzwvpj8"; depends=[ggplot2 proto showtext sysfonts]; }; - emon = derive2 { name="emon"; version="1.3"; sha256="025pl4biwncwb5cfpm0mb1r7wjv6akg1qkzz0bfnbp44sl58kfsc"; depends=[MASS mgcv]; }; + 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=[]; }; - emuR = derive2 { name="emuR"; version="0.2.1"; sha256="0lfgv2lbzp8l6f51mdfx6y0dj26w74ych924mlbpi53vm3sqa266"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RSQLite stringr uuid wrassp]; }; + 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=[]; }; - enaR = derive2 { name="enaR"; version="2.9.1"; sha256="1ryxzrdq9f88bvkyf6vdg61vfcjw1mj4dzzj8kliaf0h3ygzyaw1"; depends=[gdata MASS network sna stringr]; }; - encode = derive2 { name="encode"; version="0.2"; sha256="0sv881rpbfq1843f6bfa54jlj8ayrznyqxa6j4ngpx7ynyj84qwx"; depends=[]; }; + enaR = derive2 { name="enaR"; version="2.10.0"; sha256="09hzpmjbwg433b8ibrbvjzi8622cgfcq4rz194vq6qgknjr57z2j"; depends=[gdata MASS network sna stringr]; }; + 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.0"; sha256="0nyrcbrq8c5q2h45g1iz4n845kf3lvcwsj9j9ngkma17vbqf91hl"; 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]; }; - english = derive2 { name="english"; version="1.1-1"; sha256="09g4srg9wkmr0w9yssp491g0fkripwlhp790mjwanb03wbvz8g2d"; depends=[]; }; + english = derive2 { name="english"; version="1.1-2"; sha256="1wlqpl85rq49ndrfqlixayp4zzvpad0snln5qirr1i3y2q510dgx"; depends=[]; }; engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; enigma = derive2 { name="enigma"; version="0.3.0"; sha256="0ld3jhxrpyrhjklwif4jf1rn9ykx218pqzn9bfl0qdxr6cr4hhwy"; depends=[crul jsonlite plyr tibble xml2]; }; - enpls = derive2 { name="enpls"; version="5.7"; sha256="1c5brjddbaw4y23zpdaybkkgh4i2nsv5n5cvyv0jqi18qhx2s7rz"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; + 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.2"; sha256="08kzj805mnxg23b3q5ayj8fp66qf5maiky1prv8mgxyays8yv4dl"; depends=[]; }; - ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.3"; sha256="1iscg03v691cyfma3fs6xnj9chf5arlg61bggg2wmkczp7gnsi3g"; depends=[chron]; }; + 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]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; - entropart = derive2 { name="entropart"; version="1.4-6"; sha256="0qvxwqg8fypc2q7a75s7ngqx5ga409p1iw1fdxp84xwdvgdcw07l"; depends=[ade4 ape EntropyEstimation geiger vegan]; }; + entropart = derive2 { name="entropart"; version="1.4-7"; sha256="18h8jzan7q9wkz0awpzlypvz8xzq7ak0j21jy7nk02k64v7zkpch"; depends=[ade4 ape EntropyEstimation geiger vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; - enveomics_R = derive2 { name="enveomics.R"; version="1.1.1"; sha256="0vz4cz52dx8r7zkgb3d8w2716g0g23rb638sf2b6asbfp2h2w5f6"; depends=[fitdistrplus investr modeest sn]; }; + envDocument = derive2 { name="envDocument"; version="2.3.0"; sha256="151ibmkq63r7lvh5lrszy7wsmrygvr2789lhcfp11nw3d39b4rqc"; depends=[]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.1.5"; sha256="0zb7bl92n2h3hhrs7slbqizkjk0rg47lmahmrg9sk0px7ncbjhmv"; depends=[fitdistrplus investr modeest sn]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.1.1"; sha256="1wvanngizif7yx91f15v5mgs0dib01g440f4nvi0iid2hzx9ls4q"; depends=[mixtools rcdk xcms]; }; enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; @@ -4984,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-79"; sha256="08gfy4ri4haxi82zs4xngrabimvajlrbw1s1dqwl0gfjz4zdklby"; depends=[BiasedUrn 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]; }; @@ -4995,21 +5352,21 @@ in with self; { episheet = derive2 { name="episheet"; version="0.2.0"; sha256="15c4xbam9b60xkkgmbswj4raln49hk43pxp2l75a7j1wykgkif95"; depends=[dplyr ggplot2 magrittr tidyr]; }; episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; }; - epitools = derive2 { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; }; + epitools = derive2 { name="epitools"; version="0.5-9"; sha256="1lnwygbwpw0b29sxiz3wry2wf6k7kcjlb4c8bj02gyaxq7rssnzk"; depends=[]; }; eply = derive2 { name="eply"; version="0.1.0"; sha256="18q40n06gbqg5cs0jknlxk5x0pwcbjnfb27ysmbf76s826qdc8gh"; depends=[magrittr]; }; epoc = derive2 { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; }; epr = derive2 { name="epr"; version="2.0"; sha256="1xqc0jhgdwwvilqpljxzpzz3wx30kigy09sxvzcfvsjmxyyvflqy"; depends=[car]; }; - epxToR = derive2 { name="epxToR"; version="0.1-0"; sha256="1nvm9cr12lvh877xxiyii0gbfs6r0px76f5qlpn3pdlgj59msn3s"; depends=[httr XML]; }; + 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.0.1"; sha256="0sy1wfdr9p5m8hx0wbf4kzcfxmak2q6snaasp224agammslgyqyp"; depends=[huge igraph mvtnorm 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-1"; sha256="07kyy0adg42vzg26ssfwy5hiwggymbkkpvyczhzch4113lipz6pd"; 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]; }; erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; }; - ergm = derive2 { name="ergm"; version="3.6.1"; sha256="1gjl1gil4vkcwrbb1fcri3jkdqy1m3bqqinw2g3fnv69m2k38szh"; depends=[coda lpSolve MASS Matrix network robustbase statnet_common trust]; }; + ergm = derive2 { name="ergm"; version="3.7.1"; sha256="1hsl9fl1vzggarqk6sbfv3cjbbnxgfzblfmvhhmwngmracch3pci"; depends=[coda lpSolve MASS Matrix network robustbase statnet_common trust]; }; ergm_count = derive2 { name="ergm.count"; version="3.2.2"; sha256="1zg07vm5y6n6r687sbdy5hcinsircm4zzkx5w4849s9kwjlnpn0b"; depends=[ergm network statnet_common]; }; ergm_ego = derive2 { name="ergm.ego"; version="0.3.0"; sha256="1152g9zz2wach0hbj27knxficvhf062alqa0wpj6nyqj2vsgnchh"; depends=[coda ergm network RColorBrewer statnet_common]; }; ergm_graphlets = derive2 { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[ergm network statnet_common]; }; @@ -5021,9 +5378,11 @@ 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.2.0"; sha256="0ihkmfw6h7lk3a1fzrgjpfz5dh8rfvpr1b7ijljnv7s8pa4yi5na"; depends=[readr]; }; + 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]; }; estimability = derive2 { name="estimability"; version="1.2"; sha256="13b80bpnbrarazjvnpnk91ljjsqgfm2fm3gy66aj09cmmsmv199h"; depends=[]; }; @@ -5036,57 +5395,60 @@ 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.3"; sha256="1mjrrz8xjizxvkmzidbwxs82ijaa70l39anaba8bi7vj8l2k64bm"; depends=[dplyr httr jsonlite plyr urltools xml2]; }; + 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="2.2.43"; sha256="1h3vx0lf6kqvvhcj1ichzsvqhjmskcpvxd37hym6cwwgkkmxrzk3"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; }; + 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.0"; sha256="1h0lqf6wixsbcs4hnpzsjhsj8fifh9z5r90zcwscj1vk7aqf9cwg"; depends=[FNN]; }; + 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]; }; evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; }; 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.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[gsl MASS SparseM]; }; + evmix = derive2 { name="evmix"; version="2.7"; sha256="0x3m4lwpwcavr950q66p7bkimshnvav4842dr505g5rc9vkw9xxg"; depends=[gsl MASS SparseM]; }; evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; }; evolqg = derive2 { name="evolqg"; version="0.2-5"; sha256="11n0gxkxhg1d2ziwbipqvyccgnsrzm3mk4xy2d7nxn662q1yl2ah"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; }; - evoper = derive2 { name="evoper"; version="0.3.0"; sha256="1vbzlskb4l3mnxv8vkdqqrifldhcq053pfy927c0y7h5sfkfajra"; depends=[boot deSolve futile_logger ggplot2 plot3D reshape rrepast]; }; + evoper = derive2 { name="evoper"; version="0.4.0"; sha256="11l55jj7f4ggwvimvl3d2sv2nyds29bl4dai6ycpgnff7wwdv43g"; depends=[boot deSolve futile_logger ggplot2 plot3D plyr reshape rrepast]; }; evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; - evtree = derive2 { name="evtree"; version="1.0-2"; sha256="1izcv93irbi5zffyyzag2gcaf8zrhp2lkf3h68gb2jpf5x6wdw64"; depends=[partykit]; }; + evtree = derive2 { name="evtree"; version="1.0-5"; sha256="06afqr0gsyh80f2j56vl4cbjsz5gpywri87ykfmf1wxls7jqxqac"; depends=[partykit]; }; exCon = derive2 { name="exCon"; version="0.2.1"; sha256="0rblghg29azzbf8wq7wsypf9jprcy9a2063fhwn0lpxqqgbyzw8v"; depends=[jsonlite]; }; exact2x2 = derive2 { name="exact2x2"; version="1.5.2"; sha256="12m3kaxdrf4bsw7lrylk15nimhy4sgmjbnlqm684y2kyvii9yrg0"; depends=[exactci ssanv]; }; exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-29"; sha256="0sj4bf0sab2rsgh967i5jl7ml2l1niydqmyn7c6ybai1gavsdpi1"; depends=[]; }; exactci = derive2 { name="exactci"; version="1.3-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; - exams = derive2 { name="exams"; version="2.2-0"; sha256="14w0m8jnnpbg153l0gq5lixw68ml3qvnnjyl4dbaiccm2as9spbn"; 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]; }; exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; }; expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; }; - expands = derive2 { name="expands"; version="1.7.2"; sha256="1yyic21ng5wj61na3d3lw6r2y8iclfhhbkkcrkjy01mx3pp6iiac"; depends=[ape flexmix matlab mclust moments permute rJava]; }; + expands = derive2 { name="expands"; version="2.0.0"; sha256="1ai269sic10hzw70whwv477yfgx5nhz4m06dfg373jp6i7vi5p9x"; depends=[ape flexmix matlab moments rJava]; }; 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-1"; sha256="1d526dn1k9py1hiadnlp4a5dmxcfyfssh57f0v7hfy3gr9qmhn7a"; depends=[Matrix]; }; + expm = derive2 { name="expm"; version="0.999-2"; sha256="1mihl67kvv1xv0figp25jkmwfn4iwkcx15cng2348y8gm6zybw9q"; depends=[Matrix]; }; expoRkit = derive2 { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; }; expoTree = derive2 { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; }; expp = derive2 { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[deldir rgeos sp spdep]; }; exprso = derive2 { name="exprso"; version="0.1.8"; sha256="1k3is8f4yfzzkcak9fmm2nk8vi85b0na5r96f3yjbc9qb0av9vb8"; depends=[affy Biobase cluster e1071 kernlab lattice MASS mRMRe nnet pathClass plyr randomForest ROCR sampling]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.5.5"; sha256="1qpj6grmbld8q75kk8rj8l15vm4gqnpq8vbbc81415w3dw2phz84"; depends=[foreign]; }; + expss = derive2 { name="expss"; version="0.7.1"; sha256="02033gqm2hsdjil8qf0458a4xg19bsp7pk06p3i92chdz4z534q8"; depends=[data_table DT foreign htmlTable htmltools magrittr matrixStats]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; }; @@ -5097,13 +5459,13 @@ 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.3"; sha256="0xrjcwvmmz5g68cm2q6imkjm3v6mb6xnkmf8svqkg1825hd18g34"; 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]; }; extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; extremeStat = derive2 { name="extremeStat"; version="1.3.0"; sha256="1hj78ks4wfb0awkpg4qyrhy7f9rz0rxl9ddgsas3730snyfhspx6"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; - extremefit = derive2 { name="extremefit"; version="0.2.0"; sha256="1zzwn6r6zmxzaiq4h5jclz4ys24j8ffzq194hkw72rzblyzj8gcz"; depends=[]; }; + extremefit = derive2 { name="extremefit"; version="0.2.2"; sha256="1mkmb3rz0v2wm5m323xqaic628jv6xnlrx4cm2dpgsxj2mkznmg7"; depends=[]; }; extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; }; extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; }; eyelinker = derive2 { name="eyelinker"; version="0.1"; sha256="1lwpm247czqm26zvv5c6lkhdxpp4svszfw74g9ys9vwvwhry9c15"; depends=[intervals magrittr plyr readr stringi stringr]; }; @@ -5136,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]; }; @@ -5150,37 +5512,41 @@ in with self; { fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; }; falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; }; falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; }; + fam2r = derive2 { name="fam2r"; version="1.2"; sha256="0pq5cmzwk3s8cz5x8dsfb2d6qfpapkrwbzvkqmqkhcwhwryy40mm"; depends=[Familias paramlink]; }; fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; }; fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; }; 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.0.4"; sha256="0xxfwgzf6xbk4sajchaz7wjppg6cs1vkb00wiwsqmjm2yr48yp0m"; depends=[Rcpp]; }; + 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=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.2"; sha256="1xqr4azc5gsr7kcm8qzwjpjy72w1b111i61wbm35vns9r38a6cxz"; depends=[kinship2 multgee]; }; fauxpas = derive2 { name="fauxpas"; version="0.1.0"; sha256="1mi19zrgkx25g8j1f948n0ps27dn0rr2jqnhf15w73lpsjbwvi54"; depends=[httpcode R6 whisker]; }; @@ -5192,14 +5558,15 @@ 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=[]; }; - fcros = derive2 { name="fcros"; version="1.5.2"; sha256="0ggg8jyzdsy5ihhs4hqjjj5v0sh1ln4n7380b1z1rafjfr9j2hwv"; 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]; }; - fdaMixed = derive2 { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp RcppArmadillo]; }; + fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; }; 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.7.0"; sha256="0701ishhbxqjapin0c780m92pl02x4xvfvnsmydn0s6fqbxvxb1v"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo]; }; + 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]; }; @@ -5211,71 +5578,74 @@ 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.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=[]; }; - fftwtools = derive2 { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; 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=[]; }; - fheatmap = derive2 { name="fheatmap"; version="1.0.1"; sha256="1ir666zwlrw00c8pzm7np91n8qajc4w38pkmn2r12zpmcivqhvpk"; depends=[gdata ggplot2 gplots RColorBrewer reshape2]; }; - 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.3"; sha256="1nvf7qbnn6vjz68303xdm190iq0nwmmghyydcb4amx1ckbgric33"; depends=[]; }; + filehash = derive2 { name="filehash"; version="2.4-1"; sha256="1x7an7rsy5pz2qr86m511rsv297vacxwk3y1a71754yq739qgq6h"; depends=[]; }; filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; }; filematrix = derive2 { name="filematrix"; version="1.1.0"; sha256="1z1nlpmckmh96zfc17gkgagagzz84ih6sjy4b8vfv1nzfipprsfy"; depends=[RSQLite]; }; 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.3.1"; sha256="1vzvs43wzlivgyazinavxbhzca5ffz7a1q7hnbcl8mp1y9vnwski"; 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.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; }; + 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-0"; sha256="1sr5f1yg55qirk9afamb7nq142y7l5j93c04a6xyhmkrgf5kcs0p"; 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-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; }; + 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.7"; sha256="1bam6hj3cqi5bw1zx4gkl62lzdy40pr3g7f6v36bwkczccasxrwr"; depends=[httr jsonlite stringr]; }; - fitcoach = derive2 { name="fitcoach"; version="1.0"; sha256="1nnd7g093qjlbyrdai78gpbs0xjqlfdjn1v786v7966rzp83xfkg"; depends=[caret dplyr gbm ggplot2 httr jsonlite plyr R6 reshape2]; }; + fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; }; fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; }; - fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-8"; sha256="0h6b5zp5z2g87vz1zv4k7b0rl8rh17vs2ca0i2v583v0b4si7hz4"; depends=[MASS survival]; }; + 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.1.0"; sha256="1k4c6n36s324akscm0mkyw68hxmh52kh0l01kyw18mxlbr3d0rhq"; depends=[fitdistrplus]; }; - fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.1.0"; sha256="0fcc8rq745nsghp27dk0lgih90y4zx8hrzcvsn6ih786yv7qxhvl"; depends=[]; }; + 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=[]; }; flexCWM = derive2 { name="flexCWM"; version="1.7"; sha256="0kgvj3l4cscr1p3305mnz42km5i8280wrvxp317dif3pvq7iigi4"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; 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.4"; sha256="0zb0k4mph4d9rqq655dj8mma51r77v716xrpwj4ypgs66ni08c1l"; 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]; }; - flexsurv = derive2 { name="flexsurv"; version="1.0.0"; sha256="0lzcbfwxwvh7dm743mvmkz3d35z6gf0az4mn4x0sbv318j2bg0hr"; depends=[deSolve mstate muhaz mvtnorm quadprog survival]; }; + flexdashboard = derive2 { name="flexdashboard"; version="0.5"; sha256="1dv1h32diff7174mxw2n3l2216crnyb6c38qbrramhj5w72zf3da"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; + 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]; }; + 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]; }; @@ -5290,14 +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.5.2"; sha256="0y3sx4lmn05rwaywlyckl3l8ds21p6zjbbw47zqlh0kgcbiv1q1a"; 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=[]; }; - foghorn = derive2 { name="foghorn"; version="0.4.2"; sha256="0wskaky1jb9yqz0ds1hjrvdfdxdsmbfx730257z9xsyip1fwlic4"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; }; + focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; + 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=[]; }; @@ -5309,32 +5681,33 @@ 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.3.0"; sha256="1j5mfmdi6ky6ssai3lv2x7n09i93hpl5r1068qlm32mijf4yylbs"; depends=[forecast ggplot2 reshape2]; }; - 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]; }; - forestmodel = derive2 { name="forestmodel"; version="0.4.0"; sha256="1csw85zmj39zk3qr0238xjxj9qvp4fda62cqiliy5qm3a68kgpk3"; depends=[broom dplyr ggplot2 lazyeval]; }; + 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]; }; fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; + 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]; }; @@ -5343,10 +5716,11 @@ 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.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.10.5"; sha256="1hlbbkagy1hy3yrlabq4r8rn0hzsyhabj0zfj6z37r4a3a0hp5fm"; depends=[boot MASS nlme survC1 survival]; }; - frair = derive2 { name="frair"; version="0.5"; sha256="1fdyvv75mgdwn5csi2wgy4cadw753q941jzpycvjfln77n9nixci"; depends=[bbmle boot lamW]; }; + 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=[]; }; freeknotsplines = derive2 { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; }; @@ -5356,55 +5730,61 @@ 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.2"; sha256="183x94j727z6phayy0zy9q4x5fnww8h51ghpmc6jbwc5r40vp4px"; 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=[]; }; frmqa = derive2 { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; fromo = derive2 { name="fromo"; version="0.1.3"; sha256="132i9z8zwjm8a7fw5mdqq0a3q8hd985mrifg67lddqkxwgc8lxcc"; depends=[Rcpp]; }; - frontier = derive2 { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[Formula lmtest micEcon miscTools moments]; }; + frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; }; 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=[]; }; - fslr = derive2 { name="fslr"; version="2.0"; sha256="010kd7h5dfqqq4vxhkyf11sg8aj5jhk92953y0jfln24z6qbkz5m"; depends=[matrixStats neurobase oro_nifti R_utils]; }; + 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.1"; sha256="1pnz1gykmvxdwf1a3n1z4v9md6kjlai4fvzqjzcyshw5nq81dciw"; depends=[afex lme4]; }; + 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.1"; sha256="18lhvp0i7lfbhyg4ry24qk06nfmsqlgb8qr1ag7hwwsxxssjhmxb"; 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.4.1"; sha256="1bziqav2y7h7fkv84ci3p483zbn2rw0wr0cz6jc5a9h8g1gz80cl"; depends=[knitr]; }; + furniture = derive2 { name="furniture"; version="1.5.0"; sha256="1x0r22hblqlbialpp9vr41ngyrcffqy86d79vhazk3lcdks5hh1s"; depends=[knitr]; }; futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; }; 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.3.0"; sha256="00ys5h583s9kr415l6mv79k2s63b13jk7kjrvfmzskzvxrgqizm4"; depends=[digest globals listenv]; }; - future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.13.1"; sha256="0w3mbrqxy7w7rl2blka81djmlgj6yffxssn56f0xfwfwhbhsn1pc"; 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-7"; sha256="0mhml0zzya58yn4wrafxk62agfrck6rryn5klprr416pj83pzcgk"; 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]; }; + fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; }; + 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=[]; }; fwsim = derive2 { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; }; @@ -5423,9 +5803,9 @@ in with self; { gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; }; gRapHD = derive2 { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[graph]; }; gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; }; - gRbase = derive2 { name="gRbase"; version="1.8-1"; sha256="07b5vl55v04ycwwh92xp86c12kxvhrlbakjrlxrlq8i8drs3bpcj"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; }; + gRbase = derive2 { name="gRbase"; version="1.8-3"; sha256="143qvs5mwypswdq344a48kzn83sx9jskdr9w6kxa3fzhdcqlhi7d"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; }; gRc = derive2 { name="gRc"; version="0.4-2"; sha256="0cqc3s7a1njxzmnx7yx1yjkrazbai3gpw2kc4l7g49ld4j40bsln"; depends=[gRbase MASS]; }; - gRim = derive2 { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRain gRbase igraph Rcpp RcppArmadillo]; }; + gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; gSeg = derive2 { name="gSeg"; version="0.3"; sha256="0dcvnxldvxmmzaz4cqpr40jpmny5l012m6j7xd5954bgfg06gs7w"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.1"; sha256="19037qn7q92dykry4wrnbdg7irkzk2vwz1j0kq2r836m03bs04nc"; depends=[]; }; @@ -5440,71 +5820,78 @@ 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-16"; sha256="0xyln7ffapm31cvx4n86ncyg3cdz5d2149qb5h5xx3kf0a8r7gpz"; depends=[]; }; - gapfill = derive2 { name="gapfill"; version="0.9.5-2"; sha256="1qmkr0yvc9akjaj30lxq2b4xrkxvdlmbkpk5zy89xvj6qnpdpb47"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; + gap = derive2 { name="gap"; version="1.1-17"; sha256="0pkimpjrdbz04yh2z9n3hbhn4gkpwgx5w9nkj8zqv773qsdj8h5c"; depends=[]; }; + 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"; sha256="01mqqj49p8z1m580a9fjrifyd7q2nl2qh8p3bxi2qqw38jxaccql"; depends=[AICcmodavg data_table MASS sfsmisc]; }; - gaston = derive2 { name="gaston"; version="1.4.9"; sha256="13fb67lq30rv91q5ffwijm011dqflrvywlcd0s2caims6zsarbvz"; depends=[Rcpp RcppEigen RcppParallel WhopGenome]; }; - gatepoints = derive2 { name="gatepoints"; version="0.1.2"; sha256="03m84xixsardy4yjzf67qway07hwhjpzc92xgvg9kb7npiclq5bl"; depends=[]; }; + gasfluxes = derive2 { name="gasfluxes"; version="0.2-1"; sha256="0cdqyyqb5dcn5978jmwmf06d9jcga5ma72zf3cdz72hbcil4f93k"; depends=[AICcmodavg data_table MASS sfsmisc]; }; + 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=[]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; }; - gazepath = derive2 { name="gazepath"; version="1.1"; sha256="0zq7bcld41737qk94gjbcphpirrnnf8k6z3f8l3jay2n47yn4gji"; depends=[jpeg scales SDMTools shiny zoo]; }; + gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; }; gb = derive2 { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; - gbm = derive2 { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[lattice survival]; }; + gbm = derive2 { name="gbm"; version="2.1.3"; sha256="0ayrpq5qm18dsain088mbw0037bijxcy342grb6g2qnp67llpwpa"; depends=[lattice survival]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; }; gbs2ploidy = derive2 { name="gbs2ploidy"; version="1.0"; sha256="0gdjfqs9ccyaw7vi22wbyc742n1badr5ypr08g6rvi8ka5lmx836"; depends=[MASS rjags]; }; gbts = derive2 { name="gbts"; version="1.2.0"; sha256="1v8x4dnja8va28rjznyqa6js9wazndijasb95lfj2qwhxhgf5h65"; depends=[doParallel doRNG earth foreach gbm]; }; gbutils = derive2 { name="gbutils"; version="0.2-0"; sha256="1hi2kq4m7lrhd9yikf4qb0xccr6v1pp7kmly5j68xd3m95fi86rc"; depends=[]; }; - gcKrig = derive2 { name="gcKrig"; version="1.0.1"; sha256="1iqbhfw4ib3lgjbaspjdh2qxif1inwly9fi8hyf4x6a153f20502"; depends=[Rcpp RcppArmadillo]; }; + gcKrig = derive2 { name="gcKrig"; version="1.0.2"; sha256="084rxc5dmnn1gdvfdhy48fyqrbcbbrjgs9sziv55c9r85hvn086c"; depends=[Rcpp RcppArmadillo]; }; 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.1"; sha256="10lb4lk4gx26ksr1njfqg13by1mam609ysi5k44pfj55mwna7k9r"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; + gdm = derive2 { name="gdm"; version="1.3.2"; sha256="1fr9cgsw158zkvw5dsabyf5jhgrwp8k4qk43g9mhdp82szma759k"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; }; gdns = derive2 { name="gdns"; version="0.2.0"; sha256="0cyyqmbdd520h8q6b9dficgh1vc8zf47bih72zdqbz2hrkjm4yc4"; depends=[httr jsonlite purrr stringi]; }; gdpc = derive2 { name="gdpc"; version="1.0.2"; sha256="03gh69vb3zmsi7rlikl3a7vr7sar3x12d8lar2qa0nfksn0qa6dk"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; }; - gdtools = derive2 { name="gdtools"; version="0.1.3"; sha256="1prh814lw3qkgnf0760cvpic1k68jhlkpcxlksv8chjkvsrnnf09"; depends=[Rcpp withr]; }; + gdtools = derive2 { name="gdtools"; version="0.1.4"; sha256="0l8c4bh6765x9s6rw3mfm1bgicdzdngir1kxh9pxx4sidrdndcip"; depends=[Rcpp withr]; }; gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; }; gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; }; + gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; geeM = derive2 { name="geeM"; version="0.10.0"; sha256="0bk99kwh6xapkaxc3yis5x3d49j7pb45hq4ksbmkhz6ba21c4sn5"; depends=[Matrix]; }; geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; @@ -5513,7 +5900,7 @@ in with self; { gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; }; gem = derive2 { name="gem"; version="0.19"; sha256="11gzqpc9s1bkx1w6ncjylmfqqf3wj5hgca4lzygvlni9xz7pk517"; depends=[signal]; }; gemlog = derive2 { name="gemlog"; version="0.20"; sha256="1f36p2ggba2rkkp7i6y9sgwjg2ygjhb01ww8adfivksgj103ww8v"; depends=[signal]; }; - gems = derive2 { name="gems"; version="1.1.0"; sha256="1ydc0qj9xhhshgpyd4f8l7ljk6mszn2n1sg9s5l4c4y87br2rfyn"; depends=[data_table MASS msm plyr]; }; + gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; }; gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gemtc_jar = derive2 { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; @@ -5532,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]; }; @@ -5551,22 +5939,27 @@ in with self; { geoGAM = derive2 { name="geoGAM"; version="0.1-1"; sha256="04qgkbqjzvm9pxazj96716hf5cviy08a12r782id77l61dd9ya3s"; depends=[grpreg MASS mboost mgcv]; }; geoR = derive2 { name="geoR"; version="1.7-5.2"; sha256="1sy968x154bsc3i3a6mxcwnyixcnmab5bc07dgibi9vzn0nkbbpb"; depends=[MASS RandomFields sp splancs]; }; geoRglm = derive2 { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; }; + 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.2"; sha256="19adj5v14cxi32iadi4xlbg8f94vx4ail7454i4jj61i9a426ag1"; 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]; }; - geophys = derive2 { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; 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]; }; + 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-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]; }; @@ -5581,18 +5974,21 @@ 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.4"; sha256="1j5l4ig1cwxbl2si0kq4b7jv5r9ma4df2zbsw81z9lnkykc638g5"; depends=[curl dplyr plyr purrr raster 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.3"; sha256="1s6s0ng940spj1056z8jd0p3i34kzr1skzjr8w64x20kps1rvl9l"; depends=[httr jsonlite rvest stringi V8 xml2]; }; + 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]; }; ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; }; @@ -5600,16 +5996,19 @@ in with self; { ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.5.3"; sha256="1jgp55rvmzc4agcrlsjn8m5lk85di9c4wj94xzikqkql4lvq3qpd"; depends=[beeswarm ggplot2 vipor]; }; 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.5"; sha256="0idsmviv1znkgi5yzwbj7wnn7hy9jk83jwjzsh7h205gbkzqjn90"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; }; - gge = derive2 { name="gge"; version="1.1"; sha256="04212spczyr2vqxki0n82ml26mgiq29i6mxyh06v42lqpg39sx19"; depends=[reshape2]; }; + 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.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]; }; - ggimage = derive2 { name="ggimage"; version="0.0.1"; sha256="1jy4zg3ipbqsj6kj87crkb26wjlwcbipkh3yjhp8fsx4cqdcdrz7"; depends=[EBImage ggplot2]; }; - ggiraph = derive2 { name="ggiraph"; version="0.3.2"; sha256="07r5kf2ky6b09hvd3zdahl9b9v2509k4yxf10mw6hag2bb4lmgcz"; depends=[ggplot2 htmltools htmlwidgets plyr rvg xml2]; }; + 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.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]; }; @@ -5622,36 +6021,42 @@ 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.1"; sha256="1r1hhlw2zz1n1grwddd45sssdgrv43wf4dj9vjdryssz44rvxs85"; 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.0"; sha256="1045yi825lynw074cqi7r596ldbn7snj0rzdqcb5iwl5cn2s7gcw"; 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]; }; - ggsn = derive2 { name="ggsn"; version="0.3.1"; sha256="1q1bba9pcr51m7hxz07d0ycbl93ln4cgkkw17acbfipmbaack5f0"; depends=[ggplot2 maptools png]; }; - ggspectra = derive2 { name="ggspectra"; version="0.2.0"; sha256="0x0q7sa3i4z52wifbpi5q7hwqw79cz599f3mcln8qkd8fkz7fg96"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; }; + 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]; }; ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; 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-0"; sha256="0x2j4041rah6bi99z8syypg3w8zzkdkxymmdz33rgc7azx799cps"; 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]; }; - 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.6.4"; sha256="1x1s2wcfgzxbqjrrn9f5003q5x4ri19r6gbkd55qgqxnc1cg27gb"; depends=[base64enc dplyr functional httr magrittr stringr]; }; + 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]; }; @@ -5659,25 +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]; }; - gldist = derive2 { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; }; - 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]; }; @@ -5687,28 +6094,29 @@ in with self; { globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; 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.8.0"; sha256="0882vpjsl9f5jld3bldgl6y1kdncl9gk3m6amigmpgcd9a6v7pm2"; depends=[codetools]; }; - globe = derive2 { name="globe"; version="1.1-2"; sha256="11y3dbi3x3idlwhzr5s2g976myci91l1qlsfyny732gb7q32c79w"; depends=[]; }; + globals = derive2 { name="globals"; version="0.10.0"; sha256="1vxp4lliihjd9p5d5yaf4dqvj0hmr8nzpxayscdckcxq6jr2p34i"; depends=[codetools]; }; + 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.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"; sha256="0gng529l8nkazrlypsmc50gd0sn8zgkw7xc2ymrwkykiv1lcwdv2"; depends=[]; }; - gmt = derive2 { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; + gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; 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]; }; - gmwm = derive2 { name="gmwm"; version="2.0.0"; sha256="1cjmd0758ggjkpf5mkfdhwl121yv84gm1cwg6b2c1r8pd3wcqx57"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 scales]; }; 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]; }; gnmf = derive2 { name="gnmf"; version="0.7.1"; sha256="1vbcsxg61mlsdir8szd0rdxfswr7kr6a07750ar2l9b4rkg3yfqz"; depends=[]; }; - gnumeric = derive2 { name="gnumeric"; version="0.7-6"; sha256="0d8igplypw40kshg9skij0cymc6j5hmbmqhbfpm0v2q3kw5r9d3p"; depends=[XML]; }; + gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; }; goalprog = derive2 { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; }; goeveg = derive2 { name="goeveg"; version="0.3.3"; sha256="1p66fc1vr09zxp1h81b8by2cldxn0q8vivcc5g3pggb65d9wj846"; depends=[fields mgcv vegan]; }; gof = derive2 { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; }; @@ -5716,26 +6124,28 @@ in with self; { gofMC = derive2 { name="gofMC"; version="1.1.2"; sha256="0hbqx0z2517qgmp6sjg76hv74yrkfbswb9rmfjmsmcyzj2x67w86"; depends=[ggplot2 scales]; }; 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.0-4"; sha256="0rp8qlcv0az49gxplxycz4q9l66z8y69jg4kwzfn78l5z6qdvq5s"; depends=[]; }; + 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]; }; - goldi = derive2 { name="goldi"; version="1.0.0"; sha256="1asn5r8klmpizmp8bfapfy5vraf7sxswm3fky6473hxajz4hyfvw"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; }; - googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.3.0"; sha256="1zjldi93g5871dw1vdxriw08rz5hrmpx530r76s6r0rlijs9lwal"; depends=[bigQueryR dplyr googleAuthR googleCloudStorageR jsonlite magrittr shiny tidyjson]; }; - googleAuthR = derive2 { name="googleAuthR"; version="0.5.0"; sha256="0fk0rijn3529v918chpygvlkigj31dpimdfnkmhsgcznfarkc598"; 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]; }; + 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.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=[]; }; gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; }; gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; }; gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; }; - gpg = derive2 { name="gpg"; version="0.4"; sha256="081b2s491hcy2azyqwlzr5xh5bbvinhnlqr21w6w02rxvib6p3jj"; depends=[curl]; }; + gpg = derive2 { name="gpg"; version="0.5"; sha256="1l13wwmhayyhgl2m3r5f5p3m3y3z3pcj38liywx6a24hpxmir7pp"; depends=[curl]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; }; gplots = derive2 { name="gplots"; version="3.0.1"; sha256="02nb8n3s7c1zxq2s7ycaq2ys72y7mzirxrwj954h6gdc4x1zhg9l"; depends=[caTools gdata gtools KernSmooth]; }; @@ -5744,31 +6154,35 @@ 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"; sha256="0qfm9vzi8j083na5ziwjypycbw6ncwk75xsaam2vc4xhfarw8fjs"; depends=[]; }; + gradDescent = derive2 { name="gradDescent"; version="2.0.1"; sha256="0kxyvr30hygg82s5m7nng02fvn6nak43y2v18445xbb05y6f5gmx"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; }; granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; + grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; graphTweets = derive2 { name="graphTweets"; version="0.3.2"; sha256="13kab1nz85ghs5n882ss513di30b7lg72h676v37404ypj5a1vi1"; depends=[dplyr igraph reshape2]; }; - graphicalVAR = derive2 { name="graphicalVAR"; version="0.1.4"; sha256="09qrndfxxjfc8l2g6p4si6w9khz0gjmr7fisbvw395bf2vxvd47i"; depends=[dplyr glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; + 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]; }; - graphql = derive2 { name="graphql"; version="1.2"; sha256="03rmxpd1g9r1hgv9r3mrwf5pp4013cpqvbg385ywfm8l1c3j0a3z"; depends=[jsonlite Rcpp]; }; + graphkernels = derive2 { name="graphkernels"; version="1.2"; sha256="06lh4w0xw1apz70s9qzlhlayzh6nyd6v512lc90a0g7n6xw1fqvg"; depends=[igraph Rcpp RcppEigen]; }; + 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.3.0.3"; sha256="1k8ynf6wazjhsr0m3wy39s6833cd5j906awxkr2yhy5dfwy4jfhr"; 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]; }; - gridsample = derive2 { name="gridsample"; version="0.1.3"; sha256="169jsvavn46iaczf9j9zh41ila3vv7i8bapsbdy39sifwadqqw4y"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat]; }; + 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=[]; }; groc = derive2 { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[MASS mgcv pls robust robustbase rrcov]; }; @@ -5777,6 +6191,7 @@ in with self; { groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; groupdata2 = derive2 { name="groupdata2"; version="0.1.0"; sha256="1kqmwjf06bnm0fbvcsicfrkgl7kn42v5bip1m9riiqmk4wh2bkqx"; depends=[dplyr plyr]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; + groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; grove = derive2 { name="grove"; version="1.0"; sha256="1w8qz2k6m2xm0n699dj69aiagxy728q66bphxbmn71kakymvkgnz"; depends=[Rcpp RcppArmadillo wavethresh]; }; growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; }; growfunctions = derive2 { name="growfunctions"; version="0.13"; sha256="19ngsd326vws2f3wsrkcsyzn64fm9nnqvnbamfw6aal9xzzzz59m"; depends=[ggplot2 Matrix mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; @@ -5788,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=[]; }; @@ -5803,13 +6218,17 @@ 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-4"; sha256="138v8accqwf95a3i980x57wd2j8vmdg1ga44rx9nbjcpyxc5x6mf"; depends=[FNN lattice sp spacetime zoo]; }; + gstat = derive2 { name="gstat"; version="1.1-5"; sha256="1wfzffl0wfimb93d5ln96yhv2g64aywzmh6hdaadl8qyqx6rx7q3"; depends=[FNN lattice sp spacetime zoo]; }; gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; }; + gsynth = derive2 { name="gsynth"; version="1.0.3"; sha256="07cr4lnjpqzlbsv8w35iazag89n75wy1lj7db2nh5msd9qsb1a79"; depends=[abind doParallel foreach GGally ggplot2 Rcpp RcppArmadillo]; }; + gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; gtable = derive2 { name="gtable"; version="0.2.0"; sha256="0vz7073m0a2q12qzzihrfh5c2kx5jqi5l7z470fxmwqghdllh7l0"; depends=[]; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; @@ -5821,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=[]; }; @@ -5831,32 +6250,35 @@ 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.3.6"; sha256="1jpliv63dpqmq635gxjar19z70ciyw76yxvcg505rgryk2nf3m1h"; 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]; }; + 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.3.4"; sha256="01z2v0lqm35p74hm9x874xgaqdmqa7pig3l4ah5id148s2f5bafd"; depends=[httr jsonlite plyr]; }; + 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=[]; }; hashFunction = derive2 { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; }; - hashmap = derive2 { name="hashmap"; version="0.1.0"; sha256="1pp62py2n8ajv90fmv4zkga3hshk9cj1qfzagnp8jnfym0jp9rlc"; depends=[BH Rcpp]; }; + hashmap = derive2 { name="hashmap"; version="0.2.0"; sha256="0dy5q11s5ds69yqzax7nqjjq2kfljk7m7sjh6s114bchx3wc77zg"; depends=[BH Rcpp]; }; hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; }; hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; }; 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=[]; }; @@ -5866,27 +6288,31 @@ in with self; { hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; }; hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; }; hddplot = derive2 { name="hddplot"; version="0.57-2"; sha256="1mckgd99wvxbqvpyx231r97kysppnn1xggy8jvnc31sxq8m9gfr7"; depends=[MASS multtest]; }; + hddtools = derive2 { name="hddtools"; version="0.7"; sha256="0acvdysyyv5i109adh1prrc9ifwadb0gk303hh3b0g69wysnmhl8"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; }; hdeco = derive2 { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; }; hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; }; hdm = derive2 { name="hdm"; version="0.2.0"; sha256="01zd3b44c0rnwxwxcmsgj7w0clq4h7wrlzy4yiwvxcifiv8mgp8l"; depends=[checkmate Formula ggplot2 glmnet MASS]; }; - hdnom = derive2 { name="hdnom"; version="4.6"; sha256="0hp8sd4xcwcmrs1a7idnhkq7fawvajg35v5mzv2dfa69xdga740h"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; }; + hdnom = derive2 { name="hdnom"; version="4.8"; sha256="0z6rj8r7v1z2f8c5vgslnzl6f09ncbpzv0l2xyiy5c78j68z16l3"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; }; hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; }; 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.7.0"; sha256="1s4qcwmv6la6p3vcxp67nvlbbkd92zj1jagj8vwgk46pykqwr1h5"; depends=[colorspace dendextend GGally ggplot2 magrittr plotly reshape2 scales seriation viridis]; }; - heavy = derive2 { name="heavy"; version="0.38"; sha256="0swrn7vvs682k8yhvi49sfs1zpivhjlh7kfcjnk14i2jp1yk2slz"; depends=[]; }; - heemod = derive2 { name="heemod"; version="0.8.0"; sha256="0wzwqb2rj578zlr3nfwmcw3m3dx9rv5v8wlqyn4x2504d3i7g4yv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast pryr rgho tibble tidyr]; }; + 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.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]; }; @@ -5894,6 +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.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]; }; @@ -5902,7 +6329,7 @@ in with self; { hglasso = derive2 { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[fields glasso igraph mvtnorm]; }; hglm = derive2 { name="hglm"; version="2.1-1"; sha256="1vr1332db60fqbck0nplfw5dnxpb7sa3irh80k2hyx4aw74ckr2k"; depends=[hglm_data MASS Matrix]; }; hglm_data = derive2 { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[MASS Matrix]; }; - hgm = derive2 { name="hgm"; version="1.16"; sha256="1jgci5fg5fk867qvjgdlqr20spymjqxrypyp58jkfkjjrx1jpjsa"; depends=[deSolve]; }; + hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; }; hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; }; hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; }; @@ -5919,8 +6346,8 @@ 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]; }; - highlight = derive2 { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x6r8rf6wc6ak6y4fkbad9v23fl8wldb4a8dyg"; depends=[]; }; + 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]; }; highr = derive2 { name="highr"; version="0.6"; sha256="0n9v44dxdy5fhkdmpbpa2p78whyd9z3rhhy42ipdz5m5vsr55qa3"; depends=[]; }; @@ -5929,7 +6356,7 @@ in with self; { hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hisemi = derive2 { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[fda Iso Matrix]; }; - hisse = derive2 { name="hisse"; version="1.8.1"; sha256="0vdl61ylnv4f77hrpv68xf2ssjczynpmyla4pgsxhyp1r65l6in8"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; }; + hisse = derive2 { name="hisse"; version="1.8.2"; sha256="1cni5byx0187ss92ijs8j2dnswqb6dn6pva93bny3dylszqlyy96"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; }; histmdl = derive2 { name="histmdl"; version="0.6-1"; sha256="0vgfy49hrjcm3f8l2hb0fbn1ydh94g4xq2s116yf2c9pd0pwsbi1"; depends=[]; }; histogram = derive2 { name="histogram"; version="0.0-24"; sha256="1jihw92zi5a4dj6lzm1qvkynv9fp6j5iy83g8rzikp276x63nb62"; depends=[]; }; historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; @@ -5940,20 +6367,24 @@ 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.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]; }; hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; + horserule = derive2 { name="horserule"; version="0.1.0"; sha256="1kswmzdb58fkwhm9l3v8qhkw0wkprhprkxhxzsc7c3znvcim6jni"; depends=[BayesLogit gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer]; }; horseshoe = derive2 { name="horseshoe"; version="0.1.0"; sha256="19khsr7gfcygqasjswvm0v0ddna1i1grfbhars8jlvybfawswhgx"; depends=[]; }; hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; }; hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; }; @@ -5975,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.4"; sha256="1abjb1vg8q4va8g2bfsv537fwrsga83amc9rfsxbdbhzhf2qn0qr"; depends=[deSolve msm]; }; + 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.1.0"; sha256="0fdsksxdq9y44460zpip0c3fhmlzvjbj9fp11g27k4lh85p042fa"; 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]; }; @@ -5991,8 +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.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]; }; @@ -6003,15 +6436,16 @@ in with self; { hydroGOF = derive2 { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[hydroTSM xts zoo]; }; hydroPSO = derive2 { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; }; hydroTSM = derive2 { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[automap e1071 gstat sp xts zoo]; }; - hydrogeo = derive2 { name="hydrogeo"; version="0.5-1"; sha256="05766n82r6cvk4gnpnfrq28248awzm3y06dnybaymydjh6n1dn73"; depends=[]; }; + hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; }; - hyfo = derive2 { name="hyfo"; version="1.3.6"; sha256="0d8dhp15h3ajvivb6fq8q83l7nz25a2lc7zx9cwlq6vrkj8ww3ya"; depends=[ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; + 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.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; 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]; }; @@ -6028,17 +6462,25 @@ 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.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]; }; iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; }; iRepro = derive2 { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; }; + 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]; }; @@ -6046,43 +6488,47 @@ 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.5"; sha256="1r6rrjha8c1cy7qf682yzkw7i1qxzrcvs8g20vb77mzhzjq6d073"; depends=[Rcpp RcppArmadillo]; }; + 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.2.2"; sha256="1bs04j0xdf6b0mvczi8v3jyjdf2g99vfqr9by83a7gl9vpsar4kn"; 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]; }; + icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; }; + 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="1.3.6"; sha256="024iwpwbn3g2lsq9kn6p86m1qdj1ndlfakk6hsijc8akg0cmmzcg"; depends=[foreach MLEcens RcppEigen survival]; }; + 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-0"; sha256="05fj1sx9fbpyhmng7llmayc2m0gvfyak6ispjkwrx55hms17i5p9"; 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=[]; }; - idm = derive2 { name="idm"; version="1.7.1"; sha256="1pn8iyfwcpp3zj51jjf0dvfc0rbh8f5smnbswxf186fqs9fkjpmy"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; + 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]; }; - ie2miscdata = derive2 { name="ie2miscdata"; version="1.0.1"; sha256="1jqh5x5wnfv4cx3ck9k4kxchai7vfb3i968n5nq0yqgbvfii5kli"; depends=[]; }; 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]; }; iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; }; iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; - ifaTools = derive2 { name="ifaTools"; version="0.13"; sha256="1mffvlzm4flz7n26vllm28s1iib66gbqq7nl4yfwbdljrpp4ph23"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; + ifaTools = derive2 { name="ifaTools"; version="0.14"; sha256="1m10j0isbaa30rd3dnvig9v9mwizmns36q8haaw07y8zw6mngzra"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; }; ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; }; ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; }; @@ -6094,14 +6540,16 @@ in with self; { ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; }; ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; }; - imPois = derive2 { name="imPois"; version="0.0.7.5"; sha256="15l2air707xnzxvgvzsv90m5pl8vvr9inywvmx7f7irn4syy0g3a"; depends=[geometry rgl]; }; + 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.31"; sha256="1lknn7lk6g6mda2sqabxkdkv4aryfq1k4f0bmz6ym14y5j7kjlzz"; depends=[jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; }; - imagine = derive2 { name="imagine"; version="1.1.0"; sha256="0xmmm38vwya0dlycky3dllr9j015fbc98bwwcp8k7xmknvvnzz83"; depends=[Rcpp]; }; - imfr = derive2 { name="imfr"; version="0.1.3"; sha256="0i25fl8ixq1z2hv3gf1rh5ssnxxzxaxg30wi5ixngwnnwkljxbph"; depends=[dplyr httr jsonlite]; }; + 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.2"; sha256="1bymmfcchhmwdl0gq7x9llhykqzjw74c80x15mxs8dl9ha6fndc5"; depends=[imputeLCMD Iso truncnorm]; }; + 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]; }; @@ -6109,8 +6557,9 @@ in with self; { imputeMissings = derive2 { name="imputeMissings"; version="0.0.3"; sha256="1dfhi235j1qz2mv89j92b903j5mdwlzisiyvvi9mmiacdj5ln89z"; depends=[randomForest]; }; 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]; }; - imputeTS = derive2 { name="imputeTS"; version="1.8"; sha256="1r86fpv51jl1d5lskbx19c0njr5qdn0l8m3xj5brisvf035b7pp4"; depends=[forecast stinepack]; }; - imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.0"; sha256="082ps3r4priv3r5w8gydvkjxp8r3nsrss964hdsff2kc5dsmqn14"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; + 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.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]; }; @@ -6118,31 +6567,31 @@ 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.1"; sha256="03dlgqz6mnayc5lvaalxdhdidzgq49djkd8129ymjmmcg6qwd2h4"; depends=[ggplot2 ISOweek]; }; - inctools = derive2 { name="inctools"; version="1.0.7"; sha256="0hw42i0zj8f156wkdc7v7njg6sgxkhhn84v2pg1qxwvlyy3daz0y"; depends=[cubature doParallel foreach ggplot2 glm2 MASS plyr pracma]; }; + 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]; }; inegiR = derive2 { name="inegiR"; version="1.2.0"; sha256="14mpjyc85l9sznhn29cxk37l3y5yxclqiv2kgcwf8prpxfgwy83l"; depends=[jsonlite plyr XML zoo]; }; 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]; }; - influence_SEM = derive2 { name="influence.SEM"; version="2.0"; sha256="113h4nrcik21vhfld143ivcij49vimzilq7nxn2d0821iz1dmnfg"; depends=[lavaan]; }; + 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.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; }; + infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.0"; sha256="1gmsf4gw6xf70sh7y5hagkavknp80293sb7wgx6lycngq2acmi4w"; depends=[MASS]; }; informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; }; infotheo = derive2 { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.5"; sha256="1bgjfhwkbd0y1iwxq3qh80kshsd9g1r1gg99lr75n2i61qnnimnf"; depends=[fields]; }; - infuser = derive2 { name="infuser"; version="0.2.5"; sha256="0zq05i55gkwrvjs3mzh64ffwmxln3lrjqw3w87xy3ihsqjhxb2pg"; depends=[]; }; + infuser = derive2 { name="infuser"; version="0.2.6"; sha256="1b18476k17kkj2aq5icw8rlrla8ax1h6nx08jjn9pcx02p3lm1ni"; depends=[]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; ini = derive2 { name="ini"; version="0.2"; sha256="0dzy2zzzczs7xnnm7v6achd6qsy2wbrvsgahkgbsrpvwxpcb79bp"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; }; inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; }; - inlmisc = derive2 { name="inlmisc"; version="0.2.4"; sha256="1j2wxzm45zzykm29swvqj6hdscgxq6094s4wwj6rr7nwpp9v3qni"; depends=[dplyr igraph knitr raster rgdal rgeos sp]; }; + inlmisc = derive2 { name="inlmisc"; version="0.2.6"; sha256="1bgf31k3xmqmw8wsmz8z4b7d7jzivr9yxy7w9cy4vdiz05i3v96p"; depends=[dplyr igraph knitr raster rgdal rgeos sp]; }; inpdfr = derive2 { name="inpdfr"; version="0.1.5"; sha256="161p45hj5h6yxn9w140gkcsj2y90lqc8avsj2dsg3gnzyks07as1"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; }; @@ -6152,15 +6601,18 @@ 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]; }; - interactionTest = derive2 { name="interactionTest"; version="1.0"; sha256="1ppc476glwf0bsr1wgzircvnhgn9kkbhy3rskfz671ma6fv3p67b"; depends=[]; }; + interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; }; intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; - interflex = derive2 { name="interflex"; version="1.0.2"; sha256="0ybfk9jxfc98jd97pg469wrddllhm43hgg4lwg1i1gmz34y84yf2"; depends=[doParallel foreach ggplot2 Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; }; + 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]; }; @@ -6169,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]; }; @@ -6185,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.2.8"; sha256="0jyg69bj32j1xgnwrl233s6bi85drhry94midsrjqn3g2ik6xafz"; 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.1"; sha256="0q3k8jd2s7m20vdx8bfjh3kwgqjyymkfwdfgmbflmlj8q1km8iqc"; 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]; }; @@ -6213,11 +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]; }; - itcSegment = derive2 { name="itcSegment"; version="0.2"; sha256="121k0j5w47c10ws0dwcl1qd3ryichx5m86mzf2w3249p6wj54y7j"; depends=[maptools raster rgeos sp]; }; + itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; }; + 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=[]; }; @@ -6230,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=[]; }; @@ -6241,26 +6695,26 @@ 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]; }; - jetset = derive2 { name="jetset"; version="3.3.0"; sha256="1lyjrakk8f25541v7q3zwam7xbxykh75r0czk6qvil92a9y1005r"; depends=[AnnotationDbi org_Hs_eg_db]; }; + 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=[]; }; jmcm = derive2 { name="jmcm"; version="0.1.7.0"; sha256="0qq7dc6i5w5r276r7l9j29f783s41y3gp70hj5cz72wkmhdnvg4j"; depends=[Formula Rcpp RcppArmadillo]; }; 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.3"; sha256="0knrpnr2mpq2h1s6xis6wsf3k6yc142mfmrmp8s53s29zlzs6ljr"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lsmeans lsr multcomp PMCMR psych R6 vcd vcdExtra]; }; - jmvcore = derive2 { name="jmvcore"; version="0.4.0"; sha256="0kga95ryxvvgdlc1z9s53bmasfizyl6gvxjwp55nf2k0pm0lx6sf"; 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.1.1"; sha256="0m8cyjrhbk0bspigpjh30g74084hdn0q4zg9364vp2dmna092m47"; depends=[lme4 MASS Matrix nlme Rcpp RcppArmadillo survival]; }; - joint_Cox = derive2 { name="joint.Cox"; version="2.10"; sha256="1vfndask1njl01h4vqbsbhvd5vpy432wapp6vz2byddb358hg4rh"; 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]; }; @@ -6268,49 +6722,54 @@ in with self; { jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; }; 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.1"; sha256="1bmfdcyjcz3cgy0vkliwvd97kww8djdib08bsq99v485gspl2x87"; depends=[curl jsonlite V8]; }; - jsonlite = derive2 { name="jsonlite"; version="1.3"; sha256="0y55znjn69af4d4cy7n8r3nlgblnri7vdhvzpvp4fq4n43faqzsw"; depends=[]; }; + jsonld = derive2 { name="jsonld"; version="1.2"; sha256="1y4574ai4m31x4yjx5bp9i8wfgcgjgfr8jn5nn0x6qzlnjg58gyz"; depends=[curl jsonlite V8]; }; + 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.2"; sha256="0jzp284ac43s89p9cl5f3x8jcsw09ywjwi5b72zlwbx2a6x6bbq4"; 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.6"; sha256="19n6fi26yssid1xlixwmvqd6720rvn2jcnw7347izsmlxxyip6hv"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; }; + 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.0"; sha256="1s116d6qh4zc7gazhylhzcwiifkd2xmaqi58r4ns82d7rv54gkaf"; 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.0"; sha256="0m8l1d43gb25zdwbv0ymnazm02m2qxg5pcir37n55sl08dh0zyby"; depends=[equateIRT ltm mirt]; }; + kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; }; + 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]; }; @@ -6324,27 +6783,27 @@ 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-1"; sha256="1f7mspq7iiahpqfj57n63i8b0qs73qgmvpgm1yxi0ax5zjdnspqb"; depends=[data_table]; }; + 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]; }; kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; }; - kohonen = derive2 { name="kohonen"; version="2.0.19"; sha256="0fi94m2gpknzk31q3mjkplrq9qwac8bjc8hdlb3zxvz6rabbhxrr"; depends=[class MASS]; }; + kohonen = derive2 { name="kohonen"; version="3.0.2"; sha256="1dg2jmdlp888bcfkpmd8w9w9dj7y9r94fgr7gl2fkhlhkid9ss78"; depends=[MASS Rcpp]; }; kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.2.0"; sha256="1sk7r5v3d65w126vin9gawan3f21zrd9ps974l9nxj7kv1pa3szh"; depends=[digest dplyr httr purrr rgdal shiny xml2]; }; kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; @@ -6352,23 +6811,25 @@ in with self; { kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; }; kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krm = derive2 { name="krm"; version="2016.7-9"; sha256="0yc8agnb4685fa00pnwsxwc4vnr2aj2dwb6zxppj62r6c59xl47f"; depends=[kyotil]; }; - ks = derive2 { name="ks"; version="1.10.5"; sha256="12ianxlfrdzvb56y42p3mpyl01fqxrm97xym4wghvqyz59w0x51k"; depends=[KernSmooth misc3d multicool mvtnorm rgl]; }; + ks = derive2 { name="ks"; version="1.10.6"; sha256="07gdh95y16yy2qabl2bhlnad6ifclak81lwjza0v25nw2zklwfcf"; depends=[FNN KernSmooth misc3d multicool mvtnorm rgl]; }; + kscons = derive2 { name="kscons"; version="0.7.0"; sha256="1i4dp56y9swl5s6cipqlm5i5fknz2v0yz5g930cl5i8kx91rxwrp"; depends=[]; }; kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; }; kst = derive2 { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; }; 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=[]; }; @@ -6380,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]; }; @@ -6392,11 +6854,11 @@ 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.0"; sha256="0lviw0rzpd7453y0swab74kg8yc2byg88ca1fmf1f8zffgrdx9ld"; depends=[]; }; - largeVis = derive2 { name="largeVis"; version="0.1.10.2"; sha256="16qsc0jv8gbacgjal6hkqdm52yd0n973bkgab0zp1hldj9m4ykl2"; depends=[dbscan ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; }; + largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; }; + 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=[]; }; - laser = derive2 { name="laser"; version="2.4-1"; sha256="1f6j3xdks0w63fqjj9q8ng2m6ss90kcnsrigwal0bqskpvrpiqyz"; depends=[ape geiger]; }; lasso2 = derive2 { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; }; lassopv = derive2 { name="lassopv"; version="0.1.3"; sha256="07b7n74z4jvrirf0rc0sbvz9nm2s2s22mb8y973iwpf0i7fqxq2c"; depends=[lars]; }; lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; @@ -6404,15 +6866,17 @@ 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-34"; sha256="0615h69czr73k47whhzimf1qxv5qk0cabcrkljwhyrn6m6piq6ja"; depends=[]; }; + 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]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; }; - lava = derive2 { name="lava"; version="1.4.7"; sha256="1gzla8ns3n899vfz80yjx8bb2pcnrvp52c5rxxw591clba1x9jym"; depends=[numDeriv survival]; }; - lava_tobit = derive2 { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; }; + lava = derive2 { name="lava"; version="1.5"; sha256="0x6s7x111x87a4rh5nbk7vw6j4iq40i1c21w0j795h28rgyc7zc2"; depends=[numDeriv survival]; }; + lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; 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.1"; sha256="06k9myq33p9jz7rz6ffansgi27ang4gq0s179vgsrdi10krxxg1b"; depends=[lavaan psych semPlot shiny shinyAce]; }; + 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=[]; }; @@ -6425,59 +6889,70 @@ 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.6"; sha256="04vapw0iwwsx3zn5q84cildr7aprr9pyrkq4gacfi8baahpqj1w9"; 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.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_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]; }; leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; }; learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; }; - learningCurve = derive2 { name="learningCurve"; version="1.0"; sha256="0hfd793kk1rl224y2vb51b0xf29xinix9q91nv51047lm6hkcfah"; depends=[ggplot2]; }; + 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=[]; }; - lessR = derive2 { name="lessR"; version="3.5.5"; sha256="05pf0l4irsv71c7ywdq92gwl58caphjxlxkls6vs89prib2bj4sf"; depends=[ellipse foreign leaps png readxl sas7bdat triangle]; }; + 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.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]; }; - lexicon = derive2 { name="lexicon"; version="0.1.1"; sha256="0iibyzmgmkkmw0x7n9j1hklf7ff0r0aayb7khg9wbgsa7x1z20im"; depends=[]; }; - lfactors = derive2 { name="lfactors"; version="1.0.0"; sha256="0j2sq3kh9qgc8z7q8j6fl2n4zih8b7y1yapswsw928b1glava8p7"; depends=[]; }; + 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.3-15"; sha256="16a8bg40pravg7jxnqxp74rnncgwxy5jki27038497ask5yxzpdd"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat]; }; + 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-1"; sha256="0whxgylcrhm03yln8k11cxr3bcjkvhyqhgj0yc8wc4avaq6gl1dh"; depends=[mvtnorm]; }; + 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.1.0"; sha256="04skxqjcq27fbkfc274575r215iv13xhjyzdwlr2hf6ksnn54jdf"; depends=[data_table lazyeval magrittr RANN raster Rcpp 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.4"; sha256="10r29z9p83cmvgwrcwbb3ws8ayvjmvqgvx83ppa9p01rgw6n9jwq"; depends=[knitr rmarkdown stringr yaml]; }; + 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.1.1"; sha256="0yf0lnzarl6hgs21l6acjcz40dsw269pagxkfcl5fqpkb53rnqgq"; 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]; }; @@ -6485,16 +6960,17 @@ in with self; { limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; 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.1"; sha256="0i99j7n1hxvnm2605b2xr4mxpib64abr10wp03nxii16nssvv66m"; 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.2"; sha256="1m0szmlraqvqvqcj5nlfkpcwckiagc31qkd834m00w47kggmzlhb"; 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=[]; }; @@ -6503,23 +6979,24 @@ 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.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-12"; sha256="0j60l5kgx1wvw2wm3jwfqwi63hammaq8gfcxzwa4h552likvaxi9"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lme4 = derive2 { name="lme4"; version="1.1-13"; sha256="13j4a721rx0272pdxrz6nabjv56xb6srklq5w4z1abc82lyvda2z"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; @@ -6534,15 +7011,15 @@ 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=[]; }; lmomRFA = derive2 { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; }; - lmomco = derive2 { name="lmomco"; version="2.2.5"; sha256="0xk114vc9pz0f2nfzfyh43idz0hrn0w4g1j3kidlqhnd96g576vs"; depends=[goftest Lmoments MASS]; }; + 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.0.0"; sha256="03j7ix7f0n4jlrvffs37mrjvl1bbz2q0cqc1qaqpk1davmxc1vfi"; depends=[Matrix matrixcalc nleqslv]; }; + 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]; }; @@ -6552,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.1"; sha256="13fxq3lslsmial52ih80ziagbkm00a8681dnnn3s8kykqg1m8v7f"; 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]; }; @@ -6562,22 +7041,23 @@ 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.33"; sha256="1arsgc57vr77m9ygy0rbqkayj587k9k5k8nrr6k30v63qapc2irv"; depends=[]; }; + logitnorm = derive2 { name="logitnorm"; version="0.8.34"; sha256="08jm49picrxbwr8d0c64z5gbslrliq674vr0h30gljf3r9w6s5jj"; depends=[]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; - logmult = derive2 { name="logmult"; version="0.6.3"; sha256="05vxvi9zf2araxfng7gibak9g8m6vwmp7aclddpd814lxzmsmf8a"; depends=[gnm qvcalc]; }; + logmult = derive2 { name="logmult"; version="0.6.4"; sha256="1p40ava74qdhzysp9w8bkp7hiwr6wq61gvc0jlm4cppxa7ag2n5n"; depends=[gnm qvcalc]; }; logspline = derive2 { name="logspline"; version="2.1.9"; sha256="1kd7ricaxbcjl6d9hx7bb5mlkr7x2h7gc8vrmfvlzxppbcghb6vw"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; }; lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; - longCatEDA = derive2 { name="longCatEDA"; version="0.30"; sha256="1xj1lfwnsl864c0wycpwg8ibns6447l5988132p79a2rpd30rw3r"; depends=[]; }; + longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; }; longclust = derive2 { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; }; longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; }; longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longmemo = derive2 { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; longpower = derive2 { name="longpower"; version="1.0-16"; sha256="0hbv43y0fgbv1qiczy4kibqc7pk7whrz4kyxshg8730y8g9wyxdi"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; }; - loo = derive2 { name="loo"; version="1.0.0"; sha256="1c4knrcfc3r2yg9623lryfbndrv3fbz2ksascmi5wgik3fz44w01"; depends=[matrixStats]; }; + loo = derive2 { name="loo"; version="1.1.0"; sha256="0nh1jbrvm33v28gbys8sh6v4cxfzfd85561gz380b4kaahn2089l"; depends=[matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; }; @@ -6588,9 +7068,10 @@ 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.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.0.1"; sha256="0f0xphlxl0ma3s2miadl74cb1l20cikqgk3nc1dg5ml05cqzhyxr"; depends=[Rcpp RcppArmadillo]; }; + lpme = derive2 { name="lpme"; version="1.1.0"; sha256="1mq1lf4vdlbxjax9p8k17vdkc2h3xslbbs17xzy10fbkdicljc10"; depends=[decon flexmix Rcpp RcppArmadillo]; }; lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; }; lpridge = derive2 { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; }; lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; }; @@ -6600,20 +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.5"; sha256="0afg1n03zl00b0w87j4v8afp1q6h5d8kx8xgciy52dki4yvb1c3r"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; + 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"; sha256="0akz77f4fhkarjf3nn4y3nfh1xflxjzj4jxaw4c7l4dhia7pji30"; 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]; }; @@ -6623,25 +7105,30 @@ in with self; { lucid = derive2 { name="lucid"; version="1.4"; sha256="1kwl9h7ynp8nhny51xskrbgc3060bawxjkdijhsjzss2hbbygwds"; depends=[nlme]; }; 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.1"; sha256="1xq4rjsds9vwj4prkjxfcp9sv53ha9pj65ns0frpbh8grvrjwimv"; depends=[lattice raster rasterVis ROCR]; }; + 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]; }; lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; }; - lvnet = derive2 { name="lvnet"; version="0.3"; sha256="17kp1r6dxajql8b7lzr8s6wv1gqvradbxivz5gnnhdkmx290asaz"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; + lvnet = derive2 { name="lvnet"; version="0.3.1"; sha256="1bzykd70j8xbvpxqwdac49pv7ndvjqljwywhbf6sn3yvq72n3hlj"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; 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=[]; }; mFilter = derive2 { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; }; mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; }; mHG = derive2 { name="mHG"; version="1.0"; sha256="18hj9chp9dy6nmi5w0808nivqbyni117darvdpf03kzq5ym8dlm6"; depends=[]; }; + mMPA = derive2 { name="mMPA"; version="0.1.0"; sha256="1p9rzk1x5ldb3afr53f195vb4jdj8kw50rmv961k2jsw128mrzr5"; depends=[]; }; mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; }; mRMRe = derive2 { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[igraph survival]; }; + mRchmadness = derive2 { name="mRchmadness"; version="1.0.0"; sha256="0f6cb3d5dhp6b0dd0fshplp75jjbhx3v9r53pa8gmcfd10hvbqba"; depends=[dplyr glmnet Matrix rvest shiny xml2]; }; mRm = derive2 { name="mRm"; version="1.1.6"; sha256="1d897c5xflbkkj25hw15rd62nggv000cv2j481x0lhdgmgldjhrh"; depends=[]; }; - maGUI = derive2 { name="maGUI"; version="2.1"; sha256="16q6hiadqwwm7viz29kn420fi5ca5hx7azgrz0vsvv3bnr0y7aq5"; depends=[affy amap annotate beadarray Biobase BiocInstaller Biostrings Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets gWidgetsRGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; }; + maGUI = derive2 { name="maGUI"; version="2.2"; sha256="0b0iprpb4mnaj4lpaismr0f1rnq4m0b61imcx8mrffw9mx45qapv"; depends=[affy amap annotate beadarray Biobase BiocInstaller Biostrings Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets gWidgetsRGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; }; maRketSim = derive2 { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; }; maSAE = derive2 { name="maSAE"; version="0.1-5"; sha256="0v0vlj41j3ddyxv8lld39k1ryrdjin7r6bj13x2agbklb1fd4an1"; depends=[]; }; maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; }; @@ -6651,16 +7138,17 @@ 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.0"; sha256="02swq1hzmsdcfjhlmjykd81cyygxfx4add9caj2q2z6xhmfh3rlv"; 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.3"; sha256="06ljr1avgp0ki9d15rrlcdz6n0m8v5rx07aq3xqa5zmkqgm6s0a5"; depends=[curl Rcpp]; }; + magick = derive2 { name="magick"; version="0.4"; sha256="15w904zqbdm8051xqg1s83pmimkan0wg7z5vdzm5h96mjsqf6wap"; depends=[curl Rcpp]; }; magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; @@ -6673,39 +7161,42 @@ 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]; }; - mapr = derive2 { name="mapr"; version="0.3.0"; sha256="0xgbc4zpjdd6lncccdd85ar909z7bv8yqrv5s1xrp2j2j1gv97z1"; depends=[ggplot2 gistr httr leaflet RColorBrewer rworldmap sp spocc]; }; - maps = derive2 { name="maps"; version="3.1.1"; sha256="0ajdrd4z66jpdjqdgk6vz89x7gh1isidgr8qkg0fq6cmrvjn08lp"; depends=[]; }; - maptools = derive2 { name="maptools"; version="0.9-1"; sha256="0ma1diflrkq9wa6qjli6ncjn17b3rqrgjwq984dx5djy9f5bjf3f"; depends=[foreign lattice sp]; }; + 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.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]; }; marelac = derive2 { name="marelac"; version="2.1.6"; sha256="024gbrdby6h722j58wl8xn8027sanlpnz1l3hhxnllwzbz3mbdz4"; depends=[seacarb shape]; }; marg = derive2 { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; + 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.6"; sha256="165zh185fjgr61ah4y763816fai6g6phj64afdlklbsj5an1mvr9"; 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=[]; }; mason = derive2 { name="mason"; version="0.2.5"; sha256="1v2gja8kbwzx5c8y8gchh4rwwprv99ad0nhgb0hnfgjnqsbdmdv7"; depends=[assertive broom dplyr lazyeval magrittr tidyr]; }; matR = derive2 { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; }; matchMulti = derive2 { name="matchMulti"; version="1.1.5"; sha256="186ndliw32aqbcpacd1hjsab7dm38sxmgh77iyp203swif1iv6jn"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; }; - matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-2"; sha256="1kajwh81l4h30szdpg8y5178cswgp89zifh5nsw5480k6n2g6asa"; depends=[partitions Rcpp RcppArmadillo RcppProgress rJava]; }; + matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-3"; sha256="0jpx4k82h0mdhbwb1jc8g18qjsr9448m6d69zii99bdinsd637rv"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; matchingR = derive2 { name="matchingR"; version="1.2.1"; sha256="09vx3yqaq0pq341v8rm2hjxx0aza0bnh9iffrygwbhls7fi7kn7y"; depends=[Rcpp RcppArmadillo]; }; matconv = derive2 { name="matconv"; version="0.3.2"; sha256="0vnmqz5vzv5n0cfpgr30gkl0pv8p2b5cp3ap6mn01sxd671lx38z"; depends=[]; }; mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; }; @@ -6716,30 +7207,32 @@ in with self; { matlib = derive2 { name="matlib"; version="0.8.1"; sha256="080mbmr1lb5ha5ql40hv0idcnnbyaai46c42z756kdyq9pdzcabf"; depends=[car rgl]; }; matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; - matrixStats = derive2 { name="matrixStats"; version="0.51.0"; sha256="0bsalx605kgb9nl7mfnq1qinkyd9s97p8plymsyfja1gmcnjrcpj"; depends=[]; }; + 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]; }; maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; }; maxnet = derive2 { name="maxnet"; version="0.1.2"; sha256="1rfcylbv068pz4jgry5ijszwf5fibz566s5iv0ar8dhv0fhjr86z"; depends=[glmnet]; }; maxstat = derive2 { name="maxstat"; version="0.7-25"; sha256="114z1rwxwvk05ijjhdppzm148n1h192fp0w12ky10zkrhf6kphbg"; depends=[exactRankTests mvtnorm]; }; - mazeGen = derive2 { name="mazeGen"; version="0.1.1"; sha256="1vqhcypxbw15prc77i1jl8vnb1q3lr9bb9s6ql2pcadv3i02ybnb"; depends=[igraph]; }; + mazeGen = derive2 { name="mazeGen"; version="0.1.2"; sha256="05lsb7ldk6nzmfaklbvkcb4n5sfnimgcv5vgilblw5awzhavj5vm"; depends=[igraph]; }; 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-17"; sha256="07gxh9lpkrxvq7m1vbh8k4l4ka7wqf40sbj1zv99avlsvh9aicya"; depends=[mvtnorm]; }; + mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; }; mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; mcIRT = derive2 { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp RcppArmadillo]; }; mcPAFit = derive2 { name="mcPAFit"; version="0.1.3"; sha256="0yg79sry8jdp17mbdnfaj2phg3vdxs11si7hmfh5csfk7maax8v6"; depends=[PAFit RColorBrewer Rcpp]; }; 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]; }; @@ -6749,8 +7242,8 @@ 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.2"; sha256="19cbg7p5h2b6h9mvcx9rjppyd3awma18ymaljakbnclpvhwbqpwd"; depends=[]; }; - mcmc = derive2 { name="mcmc"; version="0.9-4"; sha256="1ws80j64df8inzz0a6k8r51wf44zwjnpvp591pxwah2jbi6j6kna"; 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]; }; mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; @@ -6760,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-1"; sha256="1fz80nc4xxd8q9zdfa38z159n35jf9y90ys39rgdzmc7ahqpkvh1"; 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=[]; }; @@ -6781,60 +7276,63 @@ in with self; { medflex = derive2 { name="medflex"; version="0.6-1"; sha256="0i3808qh4ryqcgx5rl60d4xdy25wzx008abijg5fcirsrdly7j91"; depends=[boot car Matrix multcomp sandwich]; }; mediation = derive2 { name="mediation"; version="4.4.5"; sha256="0jq0gg5ydqvy0vv8m7xk609ljw7p31jppgwgin3y3mvd32wapgk3"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; - medicare = derive2 { name="medicare"; version="0.2.0"; sha256="1z0ch704cw43hsp97j9mf6s0w9rpiv76swk7xlbiqcmyv7wivrhy"; depends=[]; }; + medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; }; mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; }; - megaptera = derive2 { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc315kwrhxcjisxfq23l4sm7m2011k5nrjmv37"; depends=[ape ips RPostgreSQL seqinr snowfall XML]; }; 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.7-1"; sha256="1b5g0rd5bllz3g4if7j5crgavz2a5mky5gchfpxyp0yl2jar4br3"; 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]; }; - metacom = derive2 { name="metacom"; version="1.4.5"; sha256="1c79sm0b00mm723g3h9llxlk33zk6f9yv6z10jx1la6kk1cgs7a2"; depends=[vegan]; }; + 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.3"; sha256="0xhaqpyhix7akk4vmb1zxi69g1j7c2h8d5fk547qfx7nqaiwzh53"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; }; + 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.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[bbmle coda ellipse mvtnorm rjags]; }; + 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.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]; }; metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; - metavcov = derive2 { name="metavcov"; version="1.0"; sha256="183xrrdz8agwcxgn8i4jg28f8gqskim9wcz193524fjhcm4bklxr"; depends=[corpcor]; }; + metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; metaviz = derive2 { name="metaviz"; version="0.1.0"; sha256="1cl44dvd625sfz906cggrj092bxy35vsiglalsay9frsi440d82p"; depends=[ggplot2 plyr RColorBrewer]; }; meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; }; meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; - meteoForecast = derive2 { name="meteoForecast"; version="0.50"; sha256="19yzfvaj4h5l70j54nlivq5dvp5psp43y5d2l978ai6pwvmi291a"; depends=[ncdf4 raster sp XML zoo]; }; + 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.2"; sha256="17sfi14q5cp74cmlvhbyg6xlpiw9ssqc4kp48r41allk38dfk1zd"; 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]; }; + 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.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.1"; sha256="0wmycy87v0hry7vzyz3vjpjq8cx7nraigihwch04nfhpg6x4zal8"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; }; + 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]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; - mexhaz = derive2 { name="mexhaz"; version="1.1"; sha256="168a8b3y17nh2dalqanph384laf2awv3jdk8dm9cl5jbkh7ah4lb"; depends=[MASS statmod survival]; }; + mexhaz = derive2 { name="mexhaz"; version="1.3"; sha256="1sqys7k6hrs892b50cn54q2k3vnlmgz1467rdwaksailhhizpbc5"; depends=[MASS numDeriv statmod survival]; }; mfe = derive2 { name="mfe"; version="0.1.0"; sha256="06x6csf3pr1vdmmimg6f7iffrivj8wcdfafvld7nrzbkl09cbfbn"; depends=[C50 class e1071 infotheo MASS rpart]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; }; @@ -6842,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=[]; }; @@ -6852,15 +7350,19 @@ 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-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; }; - micEconAids = derive2 { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon miscTools systemfit]; }; + micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; }; + micEconAids = derive2 { name="micEconAids"; version="0.6-18"; sha256="0s2gkf6widdnxqqb1xjqdvji8vhdz5a4q05clbbbyq1h409q7qvl"; depends=[lmtest micEcon miscTools systemfit]; }; micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; }; + 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.3-0"; sha256="0jmj5zrggbyp5yaqn96naicfm6ajir3ybs9j1028vxdj2wyapz13"; 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=[]; }; + 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]; }; @@ -6876,10 +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]; }; - milonga = derive2 { name="milonga"; version="1.0"; sha256="1pkmh1mabqag38xzw2s86x9c6pr83wlmh4f45s7km5g0j1zllrd9"; depends=[MCMCpack]; }; - 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=[]; }; @@ -6887,35 +7389,37 @@ 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.5"; sha256="1pbcfcaysaicppkzvnllvvx2jykc17nk3331n0rl41x56jxcjsgd"; depends=[gdata XML]; }; + 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]; }; miscTools = derive2 { name="miscTools"; version="0.6-22"; sha256="1sngkl5rwg1vp2xx9a5g2nz2nhwxwv7ni21ww7hyjc8x5mhb42yh"; depends=[]; }; misclassGLM = derive2 { name="misclassGLM"; version="0.2.0"; sha256="1dz36q2gl0q8d0s2rxn28b8ykw31wcdxf91s7ypmjggfdj64i8br"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; }; - miscor = derive2 { name="miscor"; version="0.1-0"; sha256="0kgdsqcqdfi7976qc2f2r6z68z6znrgwgcr801cfkqql8s0wksfj"; depends=[PoisNonNor]; }; + miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; }; 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.10"; sha256="1wqb5badqcs6yj2c7llbhbssdzg0irjzfcjasfrq1zg0lk82zafj"; depends=[FactoMineR mice mvtnorm]; }; + 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-4"; sha256="0lwy87f0v43i6fpbhl85vg9x5mvll8bllcm6q2qj06nk7yy25573"; depends=[haven jomo pan]; }; + 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=[]; }; - mixAK = derive2 { name="mixAK"; version="4.4"; sha256="0aj1x80kxwksn7as6lfncl6ar218hnbcs8vbxwiqp1lh4il74iiq"; 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]; }; + 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]; }; + 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=[]; }; @@ -6926,14 +7430,14 @@ 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=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; mixsmsn = derive2 { name="mixsmsn"; version="1.1-2"; sha256="02hincq7bflmyvdahjmkcdpr6vwxjw5hrbvld38riwv2kw4wmn4l"; depends=[mvtnorm]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; - mixtools = derive2 { name="mixtools"; version="1.0.4"; sha256="133rr17ywmlhsc6457hs8qxi8ng443ql9ashxpwc8875gjhv1x32"; depends=[boot MASS segmented]; }; + mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; }; mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; }; mixture = derive2 { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; }; mizer = derive2 { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; }; @@ -6942,7 +7446,7 @@ in with self; { mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; - mlVAR = derive2 { name="mlVAR"; version="0.3.2"; sha256="07jxggh5qds0b7by61m1xiyx3lxffpgzl3knk97q8fafw46dg1r4"; depends=[abind arm clusterGeneration corpcor dplyr lme4 mvtnorm plyr qgraph]; }; + mlVAR = derive2 { name="mlVAR"; version="0.3.3"; sha256="1psw3kcfq23c4i1qq4vfgjwd1lgjhhhly6bwz37ky5l753lvl9yf"; depends=[abind arm clusterGeneration corpcor dplyr lme4 mvtnorm plyr qgraph]; }; mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; mldr = derive2 { name="mldr"; version="0.3.22"; sha256="0q5dpqx6zapawjjq8rqk112w5qsk7r6sc90y63yvllk9yhdgygyw"; depends=[circlize shiny XML]; }; mldr_datasets = derive2 { name="mldr.datasets"; version="0.3.15"; sha256="1xivwmv6hvl026c5ymc23fr36sk797dxn2wa9lp20dgh5s0cq10n"; depends=[]; }; @@ -6952,39 +7456,42 @@ 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]; }; mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; 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.10"; sha256="1brylz7x10wyi0k4cdh9qkjv73yz8g67ib8flzw9dcd9i15ppgbv"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival]; }; + 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.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-2"; sha256="0z7gvg31by1xbw6yqxfs2hvfw7l0392gsrislah05bjay482b01q"; depends=[basefun BB numDeriv quadprog sandwich variables]; }; - mlt_docreg = derive2 { name="mlt.docreg"; version="0.1-4"; sha256="15gc27rgw728f005wriik3dixw4f38krjg0zy0fx5macij3fbc7z"; 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]; }; - mma = derive2 { name="mma"; version="4.0-0"; sha256="1dj9z9brmqrfl4ah27cjwksh16b6nww033wwf741hiadr5jl13pn"; depends=[car gbm gplots survival]; }; - mmand = derive2 { name="mmand"; version="1.4.1"; sha256="1gkn0dhfffsa2bsrm6wy21l1w17x6h3znfn4a8s8yvgggwnq4030"; depends=[Rcpp reportr]; }; + 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.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]; }; mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; }; mme = derive2 { name="mme"; version="0.1-5"; sha256="07k1xagwpyzsrlc00y9xlaxcpwdhz55v567i7fzvqa96ical8nlf"; depends=[MASS Matrix]; }; mmeln = derive2 { name="mmeln"; version="1.2"; sha256="1kcfq5y2fzsrbjyvh6dfp734ly7alj9vrjikzadlz33s7wjanh79"; depends=[]; }; - mmeta = derive2 { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; }; + mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; }; mmm = derive2 { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; }; mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; - mmod = derive2 { name="mmod"; version="1.3.2"; sha256="1yq3cvkfsqmiiqqzyisfiyzfcd2jdp7xv19rydpqaq4qb6322ljg"; depends=[adegenet pegas]; }; - mmpf = derive2 { name="mmpf"; version="0.0.2"; sha256="0cw45rfrcb2f3ghfkkxm3gzdms7mn7rl4gmqnr4jbxyqca263aza"; depends=[checkmate data_table]; }; + mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; }; + mmpf = derive2 { name="mmpf"; version="0.0.3"; sha256="0mwsnhz1f62l8msisz9m1aln7w24rg9844bxh07g2y7sa29ls1lp"; depends=[checkmate data_table]; }; 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.1"; sha256="0jacjwz68667k5066v6lv1dhw946mjnvff53j2l8vdsxzm34hbc6"; depends=[httr jsonlite plyr]; }; + 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]; }; @@ -6992,48 +7499,54 @@ 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=[]; }; - moezipfR = derive2 { name="moezipfR"; version="1.0"; sha256="192gmn591g7fn0v2kp6i20rpziyf81mgq1gqwvwsrcc7lnbgrw04"; depends=[numDeriv tolerance VGAM]; }; + moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; }; mogavs = derive2 { name="mogavs"; version="1.0.1"; sha256="1bzjrcisbg0fb8kj8x9ngd9i1nrhif1rdacz6nrny6xrmw0m3ckp"; depends=[cvTools]; }; - mokken = derive2 { name="mokken"; version="2.8.4"; sha256="1c3jjsbs8wp2z701y9qmr6v6q90achlchpbfwf31skj6bg2y85zm"; depends=[poLCA]; }; + 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.8.3"; sha256="0pbbklhvc4hlw2rpf4vg0p8c9bcq2cd5yxm6x6sbqdf3709ffy6j"; 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.0"; sha256="02m9909wkwbyc0w1jhvlib7jmwslq16n49a22bq9pdriaq4rmb8m"; depends=[jsonlite openssl]; }; + 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]; }; - monmlp = derive2 { name="monmlp"; version="1.1.3"; sha256="1f42d8j6jxz8x3yy02ppimbza3b3dn8402373qhj4yizrfk9wkz9"; depends=[]; }; + 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.3"; sha256="1idna90fw1i8g8cnhzxnqvb6bh8w51h426ngknrv8bh1skl09fck"; depends=[boot CircStats ggmap ggplot2 MASS Rcpp RcppArmadillo 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]; }; @@ -7047,33 +7560,35 @@ 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.2"; sha256="0byfcny476zmf11h5aynwix4fshy22aymrw93kybmpvffscjvq3x"; depends=[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.4"; sha256="045f38fzlxsawsssyvp7122dc44hvzyha05js7xzb5zg1pq0i1qv"; 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]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; - msgl = derive2 { name="msgl"; version="2.3.5"; sha256="0lihvgh86r3swfma6msjbsmfc14b1p1h16v6pkd53v5q3dp4asld"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; + msgl = derive2 { name="msgl"; version="2.3.6"; sha256="0qq9v8bb70iw67raygpzsg35nb2wdafp7rh7wzq42xd4gghi31ya"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; }; msgtools = derive2 { name="msgtools"; version="0.2.7"; sha256="1lk4r9gdhlfarl5z6a48aih682q7dvwa6lf31119lljpa5gmi92y"; depends=[devtools digest hunspell poio tibble]; }; @@ -7082,21 +7597,27 @@ 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]; }; - mtconnectR = derive2 { name="mtconnectR"; version="1.0.1"; sha256="151gybpl7d44syk7xclyhy169na58lab7l5vynrf1ark79xidwa3"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; }; + 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]; }; + mudfold = derive2 { name="mudfold"; version="1.0"; sha256="1zh9qh2ja91lk2z4lpkqinn63v577qivbl0qh3xixfr63primby7"; depends=[ggplot2 gtools reshape2 zoo]; }; muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; 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]; }; @@ -7104,11 +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]; }; - multic = derive2 { name="multic"; version="0.4.3.1"; sha256="16nzvwnh3qjpvzljanzfcz3flvnlir269ss7pic3c6krg6j4m480"; depends=[]; }; + 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]; }; @@ -7116,19 +7637,19 @@ in with self; { multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinet = derive2 { name="multinet"; version="1.0"; sha256="1ydwb86dylywj76sqsl1yy08mzgj8vqj1gkv9q683i9wc4k74281"; depends=[igraph Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; - multipanelfigure = derive2 { name="multipanelfigure"; version="0.8.3"; sha256="1mjjy1ql8hxb4lfbbh5njly5wswrkf9d63dw24avk9kn7skfmk4h"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; }; + 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-12"; sha256="011qpkwpjclfc24y2qqigmdnikqwdnanflfhihigh5b5k7qwgm5j"; depends=[]; }; - multivator = derive2 { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; }; + multitaper = derive2 { name="multitaper"; version="1.0-13"; sha256="1ckf9bhvd5k7ypaw2viqh3cyj9jij0ygcp4q9pxwqs508s6yx3a5"; depends=[]; }; + 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]; }; @@ -7138,21 +7659,22 @@ 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]; }; - mvctm = derive2 { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula MNM nlme quantreg Rfit]; }; + mvctm = derive2 { name="mvctm"; version="1.1"; sha256="00lrnqnzpnvrl84b41ai33iwpyb4qzpjyqrw1d18hj6szybdfhsv"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; }; mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; }; mvdalab = derive2 { name="mvdalab"; version="1.2"; sha256="0jgvpspvfj4m79rn8bfb7rihh6w948b7z66qisckdmv6wyxwwr4i"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; }; @@ -7178,7 +7700,7 @@ in with self; { mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; }; mwaved = derive2 { name="mwaved"; version="1.1.4"; sha256="09v3cx2scp8fjcjzsdf7k2xl5y2491hbp25mnbjvm6v16hi2g180"; depends=[Rcpp shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; - myTAI = derive2 { name="myTAI"; version="0.4.0"; sha256="15ax5hwgqqyf5qmpmnjqvszwxyvvasmmxc03m53f7gdnpmv2wpg8"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 nortest RColorBrewer Rcpp readr reshape2 taxize]; }; + myTAI = derive2 { name="myTAI"; version="0.5.0"; sha256="1lnqpp06qvwg2qrf4ilh059gkv105zkpcz2yrhzg4xl6581mz455"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; }; mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; mycor = derive2 { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; }; myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; @@ -7188,85 +7710,92 @@ 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.1"; sha256="1jir0hhksa4shfn7paln9s3ccsmmyl70hlsk9q5glwi87j6mhlnn"; 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.1.1"; sha256="0n620wzhmlyjkbbwr0py2xfk0vj59a5zyr4d93iyplcrjg91n6zg"; depends=[abind pryr reshape2 stringr]; }; + 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]; }; ncappc = derive2 { name="ncappc"; version="0.2.1.1"; sha256="19wq7ihcr8989xpzf1dsxz1kwwzqvsx2mwcciqv9204k4fc94zjc"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; }; - ncar = derive2 { name="ncar"; version="0.3.1"; sha256="1mlqmz4737827dl131lqg5mbn8sk4ghiazlicdp99cjq5vr8fk7h"; depends=[dplyr Hmisc lubridate measurements tidyr]; }; + ncar = derive2 { name="ncar"; version="0.3.4"; sha256="1q9744gj0mj7w6b28mala7lzmxy8q99jkkpi3png2awwr2ilznw7"; depends=[rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; 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.15"; sha256="0kad69py4nhlsl4xmsfdisx0kzcjch91c0m786h80v3w67s9i0nm"; depends=[]; }; + 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.8-0"; sha256="19yir4bwinpd6rgk6ncg3x42qpx3d884f91qq9gl16y9kc4blp87"; 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.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.2"; sha256="18ffpkcqhpw3b5jrlv63av8v2hhpgz8pqvg5mwc5mmqgar0cffb0"; depends=[igraph Matrix]; }; - netassoc = derive2 { name="netassoc"; version="0.6.2"; sha256="01h0nnyrgv08bxyl01lqsqnj69bhkwci692h77vfa7cf8rsm67kg"; depends=[corpcor huge igraph infotheo rags2ridges vegan]; }; + netCoin = derive2 { name="netCoin"; version="0.2.5"; sha256="0bhn7jhwr5jf8hmw4n86fg4994bhcjd6awcx96gm2qgf1j5r2m44"; depends=[igraph Matrix]; }; + 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-2"; sha256="1hzmlac8kpgh27783fir27dwvzga1v00098qy8z955iy4nkpm1pq"; depends=[magic 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=[]; }; - networkD3 = derive2 { name="networkD3"; version="0.3"; sha256="0g1l8a6qlpxylxnnavjcwdjx6v8nxkxzigilywyqhqhmpcsnp7bg"; depends=[htmlwidgets igraph magrittr]; }; + networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; }; networkDynamic = derive2 { name="networkDynamic"; version="0.9.0"; sha256="1949fbcw0gq8lsm6rx5d5mpj1y9k4rk2v0pmm1kxi5igi6yd8lg9"; depends=[network statnet_common]; }; networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; }; networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; }; + networktools = derive2 { name="networktools"; version="1.0.0"; sha256="00zp2mvxn3pgac6wdyhra64fk3i0h3vhf5f7y1v0pvdhhrz3wk6z"; depends=[devtools ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet qgraph reshape2]; }; neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; }; neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; }; - neurobase = derive2 { name="neurobase"; version="1.9.2"; sha256="048z1m8kx5g91v6hram4xchyfa28kkp8cjc8rkdvs6r1wrflp0a3"; depends=[matrixStats oro_nifti R_utils RNifti]; }; + 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.3.0"; sha256="17jil4xsys676n73icpx5b9d1jilqq190xcdqjq7da11pvig76i9"; depends=[BayesFactor dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png prettyR tm wordcloud2]; }; - ngram = derive2 { name="ngram"; version="3.0.2"; sha256="01ji3whn10m6z29vhi01vpjl09ci1r52arrjp73s7z3y0l6pj9r7"; depends=[]; }; + 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"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[biglm bitops RCurl rjson]; }; + 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.1"; sha256="0vvyyafighfck8f9imcpqlr1b5v3znsr5czgl5k4b02jymdwrhvs"; 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]; }; @@ -7277,16 +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=[]; }; @@ -7295,19 +7828,20 @@ 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]; }; nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; }; - nopaco = derive2 { name="nopaco"; version="0.99.8"; sha256="07pff53nzilbl0ww6jzxw0m8z6x4ssb1xajzgi8bck2bsdd8bhid"; depends=[Matrix]; }; + nopaco = derive2 { name="nopaco"; version="1.0.3"; sha256="1sbjgzd7q2gjhs5qsy23w30cv73d9d6g08ymq18wppqpir5hikh2"; depends=[Matrix]; }; nopp = derive2 { name="nopp"; version="1.0.8"; sha256="0yjnzxlmadh2g0frfwm7rrr0kqb5pjvrnjmzl6pikzr99yh8aags"; depends=[MASS mlogit]; }; nor1mix = derive2 { name="nor1mix"; version="1.2-2"; sha256="14djjhhivl49jnsmnydcswmc6bzfvgjjg7pibg32a9p3y2f0lmnq"; depends=[]; }; nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; @@ -7318,21 +7852,22 @@ in with self; { normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; 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"; sha256="170dqxaln51snqzqjwagd16f2x4aarqg3xsim0gbvfqlv43sksb7"; depends=[astsa]; }; + 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]; }; @@ -7344,32 +7879,37 @@ in with self; { nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; npregfast = derive2 { name="npregfast"; version="1.4.0"; sha256="1p5hp8mld05p03lrgyqwdh5wg4qh7n2bqx9w5p7z4dvvh6h67nji"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; nprobust = derive2 { name="nprobust"; version="0.0.1"; sha256="13fc84ahv2gid3b1iyyc151v10pafaxbbym3g891ivxglyw10zy1"; depends=[Rcpp RcppArmadillo]; }; - nproc = derive2 { name="nproc"; version="2.0.4"; sha256="1hbyf1n2s4wbd0206a69pf6akyxv6gx3dvifn26nizas3iaccp48"; depends=[ada e1071 glmnet MASS randomForest]; }; + nproc = derive2 { name="nproc"; version="2.0.6"; sha256="07f5awjc7ds8xghvkvc0z6jna4n09syr63941n8g2q9099rvw9kc"; depends=[ada e1071 glmnet MASS randomForest ROCR tree]; }; npsf = derive2 { name="npsf"; version="0.2.0"; sha256="0cww1fi0amgc9n1hbfy3z7xgwrbcdwvsr2d6l8lpsr1bdcpgbjzv"; depends=[Formula]; }; npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; }; 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.1"; sha256="1my1pb23qafh96kk5vyjgks06g8pk9pkhk9rnqx76y5fdb5m8yy1"; 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=[]; }; nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; nycflights13 = derive2 { name="nycflights13"; version="0.2.2"; sha256="1857pwyhb5gvbdxv934nlc50n4ai7njm89js7b7ywfg7mhgha4yc"; depends=[tibble]; }; - nzelect = derive2 { name="nzelect"; version="0.2.0"; sha256="1ijyvqm8yz3wib8wyibcxqx6p848xgxjrl84ppwq0nx0ic0vizbm"; depends=[]; }; + nzelect = derive2 { name="nzelect"; version="0.3.3"; sha256="1y1nwcgghk64gmh1jn01gm3qqk5ja88gm59xq6bhl9pb03416n0p"; depends=[]; }; nzpullover = derive2 { name="nzpullover"; version="0.0.2"; sha256="0c50854dhvjmhh8c34w9w0r8v8wk5j8bi6j81m5wpcd2jxrkbw4f"; depends=[]; }; - oXim = derive2 { name="oXim"; version="1.1.2"; sha256="1270m0mng8sz8bsa8gi0pkp2znglv2sqzhq3s09mj73c0l96pzm7"; depends=[gstat imagine R_matlab sp]; }; + oXim = derive2 { name="oXim"; version="1.2.1"; sha256="1qjscjq5v50v7kwbmiz1niylwpnh20g5qldyxn7fw0kkqs398sk0"; depends=[gstat imagine R_matlab sp]; }; oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; }; oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; }; oai = derive2 { name="oai"; version="0.2.2"; sha256="0q1w29wrppi5sfabdw8px7zr92bgri3jhy0y7dhi46xggxfg9vm1"; depends=[httr plyr stringr tibble xml2]; }; @@ -7380,90 +7920,96 @@ 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=[]; }; observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; }; 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-20"; sha256="1pckxrkkgb22rrm1q9j2xijnbhk6j260rq8pvmi02l8mdx6l99l5"; depends=[gsw]; }; - oceanmap = derive2 { name="oceanmap"; version="0.0.2"; sha256="0pbwja7m0ng2j2147sgc07v3q80xmj3bwidvqksigklka4zx822q"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; }; + oce = derive2 { name="oce"; version="0.9-21"; sha256="1nwnfs75mdq0s13jz5l9zv1rjx5637yljhrc56sghwq38gi1mpal"; depends=[gsw]; }; + 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]; }; - odeintr = derive2 { name="odeintr"; version="1.7.0"; sha256="0qjgiik1vg4cp0fh07zabbmlxq12074nqczqxgf49sgvjgmasxx0"; depends=[BH Rcpp]; }; + 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.4"; sha256="1n9b8zw4d3ydirrrl4n14as5x8jc10bzfza4zs4gn6ljk5p3lsci"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; - officer = derive2 { name="officer"; version="0.1.0"; sha256="155vzgxrprsnk11m3d8wmvr40pkw1sp99p82g07d6l9d5ix1s28r"; depends=[base64enc digest dplyr gdtools lazyeval magrittr purrr R_utils R6 Rcpp tibble xml2]; }; - oglmx = derive2 { name="oglmx"; version="2.0.0.1"; sha256="03lsgdz2pjykzcv7k9r940rgh7qh7vn651nrshx1r0b63mh9cqsj"; depends=[maxLik]; }; + 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.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.2"; sha256="1fscyffmvlasx56hxlk2b60fk0scfjbb3yk5q74ffszk4xvqbrzg"; depends=[]; }; + 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=[]; }; - onlineCPD = derive2 { name="onlineCPD"; version="1.0"; sha256="1hdj9wizf0b2vs481fnx80m4b7rqp0bl14xbxfcawlk9d82q2mh2"; depends=[ggplot2 gridExtra reshape2 scales]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; }; ontologyIndex = derive2 { name="ontologyIndex"; version="2.4"; sha256="168m4jdwbzv8lpimx9063306691hnfdjmdhb5y8195d9vcq049jr"; depends=[]; }; 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.0-0"; sha256="1cwlk0vi510065p1rb70h5rsprd55xfyb7ym8mv93iwvqgwxhx5j"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj maps 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]; }; + 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.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]; }; - openxlsx = derive2 { name="openxlsx"; version="4.0.0"; sha256="1jz75kxpbbdw3bf9a49fih4wlk36nki3nr8yq7v9n31qzyb5k3qy"; depends=[Rcpp]; }; + openxlsx = derive2 { name="openxlsx"; version="4.0.17"; sha256="1mq4lasp12kc30sxcsmz9gskd114l8s7z7wd6svv2nm8qllrhsqi"; depends=[Rcpp]; }; opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; }; ops = derive2 { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; }; optBiomarker = derive2 { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; }; - optCluster = derive2 { name="optCluster"; version="1.1.0"; sha256="1p4mwnarai1kakyb0w8z46c3lwnwcndvfxspywh72mj35wfrdbc8"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; }; + 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.3"; sha256="1b4yrijkdxd78wyjjskawahrzj1k3cgh5d7mpcyr2li1hg86k7m1"; depends=[alabama cccp data_table kinship2 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]; }; optimx = derive2 { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; }; optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; }; optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; }; optmatch = derive2 { name="optmatch"; version="0.9-7"; sha256="1ps3qd7kidi0n1m9nxspz03sdw7p3lcg31q3p7c13l3vb226i5yj"; depends=[digest Rcpp RItools survival]; }; optparse = derive2 { name="optparse"; version="1.3.2"; sha256="1g8as89r91xxi5j5azsd6vrfrhg84mnfx2683j7pacdp8s33radw"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; }; + optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; }; orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; }; ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; orca = derive2 { name="orca"; version="1.1-1"; sha256="1wd5nh2vh6j1rp78hbw17qipi67f0wimrbkiarak8f7k5pfiy1zn"; depends=[]; }; orclus = derive2 { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; }; - orcutt = derive2 { name="orcutt"; version="2.0"; sha256="07190v3llnpkvrgsd33bbdywlvmqqgysn0p4y8krb3wgxx2dv6kg"; depends=[lmtest]; }; + orcutt = derive2 { name="orcutt"; version="2.1"; sha256="1ljzgi6dgawgz3rr9n7g3r4cfil3qplzjphd9bxj84ayi31vy0pk"; depends=[lmtest]; }; ordBTL = derive2 { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret gtools VGAM wikibooks]; }; ordDisp = derive2 { name="ordDisp"; version="1.0.1"; sha256="1vjki73h8933z36ikwmjn84ldz154mahp2jkd9cbj5n6xsi47fnw"; depends=[VGAM]; }; ordPens = derive2 { name="ordPens"; version="0.3-1"; sha256="0yzf3qzi4p7xqimihjvr0wkdvj3sy9n3wc86bf4bjbavniq6m69r"; depends=[grplasso mgcv RLRsim]; }; @@ -7471,15 +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]; }; - ordinalNet = derive2 { name="ordinalNet"; version="1.5"; sha256="1iy8vgx6znnazhzx7m649hbikliwv9j5c5nrr0jrbdl28d84qapl"; depends=[]; }; + 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="2.0"; sha256="168sl18rcxnv2h26y83sbna5855b6shc5pw72dhv8zi268ykwkcx"; depends=[]; }; ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.3"; sha256="0ki91l6vvfxpzq7zgl3d08r5pzx47jxkgf7g0g95580xx2q7n7zx"; depends=[survival]; }; - ore = derive2 { name="ore"; version="1.5.0"; sha256="0bvpi4gz71qgi21byax6np0ivr2a9b9qnzywhl06rbkx9l0r2yfn"; depends=[]; }; + 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]; }; @@ -7487,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=[]; }; @@ -7495,15 +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.0"; sha256="099k0cfkzzq5pdb17j9ian8x6s3i13f6lcyhy4ls0dnhdgk4d7l1"; depends=[bitops gepaf jsonlite raster RCurl rgeos sp]; }; - otrimle = derive2 { name="otrimle"; version="0.4"; sha256="0xhsx11rpm9179jm5p00x2c125r15bhslsnll182bhw282vwx2kx"; depends=[mclust prabclus]; }; + 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="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=[]; }; - overlap = derive2 { name="overlap"; version="0.2.7"; sha256="1v7i3p8mmhvnxd9h1g6zprphjgs2nfh7ffkyj7vjbkhfsixp9fpz"; depends=[]; }; - overlapping = derive2 { name="overlapping"; version="1.4.0"; sha256="00rn55wvcj32qgjbjplaq32k2vxzrdlbp8dh7scyw78wyn8bdv2c"; depends=[ggplot2]; }; + outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; + 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=[]; }; @@ -7515,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]; }; @@ -7526,14 +8079,15 @@ in with self; { packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; - packcircles = derive2 { name="packcircles"; version="0.1.1"; sha256="0xvw283gyjak3j66g8x5jy2jdrkcxwhfzck2wdq2q6a6nxbyb0i1"; depends=[Rcpp]; }; + 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"; sha256="1z8jiz951jj13dmgl75yjdvahph0jhk0d6n2f8xgzaj4rwmli6i8"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; + 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=[]; }; @@ -7547,13 +8101,13 @@ in with self; { paleoTS = derive2 { name="paleoTS"; version="0.5-1"; sha256="18f5lkgzvndc8s7w7d7dfdlqf37adrmzabpwkavjw1zkpb1dga8c"; depends=[doParallel foreach iterators mnormt]; }; paleobioDB = derive2 { name="paleobioDB"; version="0.5.0"; sha256="195w0jzg8bhlqbsd3shi161wqr9cff6q85ik0x8w4laazzxs0jhr"; depends=[gtools maps plyr raster RCurl rjson scales]; }; paleofire = derive2 { name="paleofire"; version="1.1.9"; sha256="0x11g90g6hlxw5407mmb6z4w7iqmipb5f0n3czs834ji5jhxl1x8"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; }; - paleomorph = derive2 { name="paleomorph"; version="0.1.3"; sha256="0s119va1j4sqmc08wrk1z1ywdvam0qcn6lgla93bavpw4q7y9zbm"; depends=[]; }; + paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; }; paleotree = derive2 { name="paleotree"; version="2.7"; sha256="0h2rch89p8n1i1zdy3xj5966hsz47a49r5baqvn1s9c9pr024czk"; depends=[ape phangorn phytools]; }; palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; }; 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]; }; @@ -7563,37 +8117,40 @@ in with self; { pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; }; panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; - pangaear = derive2 { name="pangaear"; version="0.2.4"; sha256="0h504b4wnqahy3sq35yq48rafaikkidfqdx96hv8999ag7kyndl2"; depends=[httr jsonlite oai rappdirs tibble xml2]; }; + pangaear = derive2 { name="pangaear"; version="0.3.0"; sha256="1kkjvcwdnak5rxdz5q066b1q7yx75djm5q0gbx6iqcgvvhly1kpp"; depends=[httr jsonlite oai rappdirs tibble xml2]; }; 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]; }; parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; paramGUI = derive2 { name="paramGUI"; version="2.1.2"; sha256="054l9hqsvgnwipzqrapkhsk67afz93zv1cligqhjl2wggzn9a8sc"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - paramlink = derive2 { name="paramlink"; version="0.9-9"; sha256="1d2s20ys2zbbpw38l24j57p070h5wf4rgf3gb9lxgx1ibpww1zf0"; depends=[assertthat kinship2 maxLik]; }; + paramlink = derive2 { name="paramlink"; version="1.1-0"; sha256="1qbd80x50nnyiy0y6nnnwhj8z528gzqq7098w9md3rj0ih3523xl"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; 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=[]; }; parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; }; 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.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; }; + 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=[]; }; partitions = derive2 { name="partitions"; version="1.9-18"; sha256="1brzvk2zbrh0s4vbaiib6zkpcyx7ghc6ws36h3diz5nxbx3g95ik"; depends=[gmp polynom]; }; - partools = derive2 { name="partools"; version="1.1.5"; sha256="062rnq35cbzyr6mdpq4w88bxd6c2pzbghxan6j11pipyzvv7qsj3"; depends=[data_table pdist]; }; + partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; }; partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; - party = derive2 { name="party"; version="1.2-2"; sha256="0rmvscgmbligg23djyph54cz5r8xkmmrn04vd3r7pwy1qarah9fi"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; + party = derive2 { name="party"; version="1.2-3"; sha256="1rpp4qfb7igpqlz0jw12ykd7p3ri8miby6nlvyzbblz3h67lplkb"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; partykit = derive2 { name="partykit"; version="1.1-1"; sha256="0cl3ir54pafjhk1cvyzx1a8a244x0qa5lky47m7fx1fdj0k7dx6r"; depends=[Formula survival]; }; parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; }; @@ -7607,12 +8164,16 @@ in with self; { patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; pathClass = derive2 { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; }; pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; }; + 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.0"; sha256="0xi9sb36xc6h8j4h4b46imwy936wi8vlqsv4mfkjka34bn0q7afr"; 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]; }; @@ -7623,18 +8184,18 @@ 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-6"; sha256="00cw18q7wvddzjrbxz917wkix6r7672vi2wmsp4gwgzady8vha4x"; depends=[lme4 MASS Matrix]; }; - pbmcapply = derive2 { name="pbmcapply"; version="1.2.1"; sha256="1dlpiphvl8rl08r7lml2mky137kahqij102wyjif1yk3xwdds8ca"; depends=[future]; }; + pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; }; + 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]; }; pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; }; pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; - pcaL1 = derive2 { name="pcaL1"; version="1.4.1"; sha256="07qsi3k6l9ga1ixqmz8sw1hmjqg0l3rv1czwwgb6izsmjkcxfyzd"; depends=[]; }; + 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]; }; @@ -7644,39 +8205,42 @@ in with self; { pcnetmeta = derive2 { name="pcnetmeta"; version="2.4"; sha256="1d7cjf15blh0ysc064n8yil77yj799bsff0rdjvimaa2hbxpnk98"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; }; - pcrsim = derive2 { name="pcrsim"; version="1.0.1"; sha256="004xrxnfkq1a8y27p7v4xz7jf3y3h5fkxiy2vyqdqv2yqhqdbzpg"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; }; + pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; }; pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; pdR = derive2 { name="pdR"; version="1.5"; sha256="072ra8czfvgcgkbdfkjhbpk7f23zh717f9sh84vls9j0wyrai6hn"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.0.0"; sha256="0jd7540v7zdg4l5i6i7pdwc7bgnpkhdfpf5b9bjx2gka592swhq4"; depends=[astsa Rcpp RcppArmadillo]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; pdfCluster = derive2 { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; }; - pdfetch = derive2 { name="pdfetch"; version="0.1.8"; sha256="0yg5s7nxfbsffi3v1layi7w7y3bcyb1lkyinr0ygnjz5cmqf3df0"; depends=[httr jsonlite lubridate readr reshape2 stringr XML xml2 xts zoo]; }; + 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.0"; sha256="1ziflvvzwk3g21s67b09qx023i2chvx09b0675nskvbxssnsc5r5"; 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]; }; - pdp = derive2 { name="pdp"; version="0.4.0"; sha256="19kijpz0davv8359a0x623zjbq1jn5agp6wfx36yi87l2dlh254y"; depends=[gridExtra lattice magrittr mgcv plyr viridis]; }; + pdp = derive2 { name="pdp"; version="0.5.2"; sha256="1bsi8v143q4bmdzlx55q6xrhi1scm5bi7q8ky0mh1505kz09nd74"; depends=[boot dplyr ggplot2 gridExtra lattice magrittr mgcv plyr Rcpp viridis]; }; peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; }; peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; }; peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; }; pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; }; - pec = derive2 { name="pec"; version="2.4.9"; sha256="0r8fg4kic366606pdysyws4an3152fc8mykr7vwixhn63yjk0vpd"; depends=[foreach prodlim rms survival timereg]; }; + pec = derive2 { name="pec"; version="2.5.3"; sha256="16ad20zagf3sbnj6jw0ay4kkywlslgc7p5ghz5zknrsby7ac0147"; depends=[foreach prodlim rms survival timereg]; }; pedantics = derive2 { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; }; pedgene = derive2 { name="pedgene"; version="2.9"; sha256="1200d6blz7n3krnvhw0i9mz6219vwk0vlj17yzr3fqzyn5cyf91z"; depends=[CompQuadForm kinship2 Matrix survey]; }; 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]; }; @@ -7688,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=[]; }; @@ -7706,7 +8272,7 @@ in with self; { pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; }; pgam = derive2 { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; }; - pgirmess = derive2 { name="pgirmess"; version="1.6.5"; sha256="0z3yxdcgngsyy9ylga76gh0m92vfdfzg4asgx6a3g0hnixh0pri3"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; + pgirmess = derive2 { name="pgirmess"; version="1.6.7"; sha256="1an7isajb4h04i2sfnssnxfi61v17fh803ddf8hmcfqkpig4yi6p"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; pglm = derive2 { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; }; pgmm = derive2 { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; }; pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; }; @@ -7716,78 +8282,91 @@ in with self; { ph2bye = derive2 { name="ph2bye"; version="0.1.4"; sha256="0h5d8d4bagkp6g0nb67cb225ki5p1amnclnfj6afgdcsli5clr67"; depends=[animation nleqslv Rcpp VGAM]; }; 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.1.1"; sha256="1klc2s6crwmg30psgf1xkchyjqbksl7cdlnk3b0ypdw7pd3js5im"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; }; + 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.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.3"; sha256="1lw4blnv06w0czliqwpz34nz7nanfihcv04l72sxma7jjmjpn4w8"; depends=[coda fields HelpersMG zoo]; }; + 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.13"; sha256="14pziwhg87gbzc3yjhb5kvbcfd8v6mqa4r8l83nnxp2gkr0kl66s"; depends=[caTools dplyr lubridate plyr polynom splus2R tibble]; }; - photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.12"; sha256="02pfajd9wzbrlxsk29d5sdp2bnzjdw1g08rrl5742c6ha4dll81m"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl reshape2 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.0"; sha256="1qdd2zbkdw601p5zcamd2ly0qp0hmnd32bdlnvpv96v90iwxpj9q"; depends=[photobiology photobiologyWavebands]; }; - photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.1"; sha256="07a2hw59k1a2knccijy82pb0f72y00s2wlc70b6snrgii45qgc23"; depends=[photobiology]; }; - phrasemachine = derive2 { name="phrasemachine"; version="1.0.0"; sha256="0jdz8imcry78shhbayhw7vpcx3kj8sfin3jl4fz5bb1ncdpcrpbj"; depends=[NLP openNLP quanteda stringr]; }; + 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.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.0"; sha256="14bsmq62afkzcnacjd8464krk5hnh1s54r6znlknnpyphy0g8xzk"; depends=[ape igraph NHPoisson phylobase]; }; - phylobase = derive2 { name="phylobase"; version="0.8.2"; sha256="0wspm8fv2lps2z6zhz3qrf3icad1mgpq4379gmbi3i614h25r5gp"; depends=[ade4 ape Rcpp rncl RNeXML]; }; + phyloTop = derive2 { name="phyloTop"; version="2.0.1"; sha256="1mwifnmq4zk83vj7886ndz6i3xa9dyxsz9p4b0ah53cdvbcqcspd"; depends=[ape igraph NHPoisson phylobase]; }; + 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.2"; sha256="16r3m1bsfsfjvzl9k8ss197m1hvghlm62fwdrrm9zk6jc4fjc0cf"; depends=[ape DiagrammeR dplyr ggm ggplot2 igraph MuMIn nlme pbapply purrr tibble tidyr]; }; + 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=[]; }; physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; }; - phytools = derive2 { name="phytools"; version="0.5-64"; sha256="0vamljghwxrdgncwzg0217cw65f0gzn0bx72xxlmdw69wshhrj3m"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; + phytools = derive2 { name="phytools"; version="0.6-00"; sha256="04xf7rksii496xiih3ijywxs4j4994z1f1yllvywzvmqqyk0khdn"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; pi0 = derive2 { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; }; picante = derive2 { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; }; 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="1.92"; sha256="1a2s33sizg9q6iml56hbbs1c7hx5lz7v7hplhs0nv05vrh8cg9zm"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; }; - 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]; }; - 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.0"; sha256="1wdi86qyaxq1mwkr3nrax3ab7hhj2gp1lbsyqnbcc9vzg230nh0r"; 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]; }; pks = derive2 { name="pks"; version="0.4-0"; sha256="0fx7p2d83x0ip65aqp9dga59d9cggam8k79mi0drk5birzchqbcr"; depends=[sets]; }; plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; }; @@ -7795,17 +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-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]; }; @@ -7814,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=[]; }; @@ -7834,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.1"; sha256="0xqvs4lax8r2avwpdpf4p49dkwghiqbqc93brz7l1qma6ih0yfrs"; 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]; }; @@ -7848,7 +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]; }; - 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]; }; @@ -7866,30 +8446,32 @@ 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=[]; }; polidata = derive2 { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; }; 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.50.0"; sha256="1f6bjh7vkwyma8jzigdcijazmzr2mhnmwmaf135lx81d044xj2zr"; depends=[dplyr lubridate purrr]; }; + 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.1"; sha256="189zfqcw9w1i1z14l2rgkzqali0arkiq7k770xhzdrahw1whcsc7"; 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-2"; sha256="0nr8mw0k79kz5zd1k81kz0i940vmlzqqscn1z1yaik0rx8i7mhs7"; 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.5-6"; sha256="1ypwvgd5z61md539z7ndmpl8vaifsjbm231n08zsxskskj1fid7y"; depends=[]; }; + 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.11"; sha256="1z66q3l1p7dmds0160w93q31hsxq4fj7bwfyd74d166yg0wfia8x"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; - pooh = derive2 { name="pooh"; version="0.3-1"; sha256="0fn711jyn18byfc2nq3y154k8rb39vpnfw1a0xw73pqp1cwd2i73"; depends=[]; }; + pomp = derive2 { name="pomp"; version="1.12"; sha256="1fvzd68pc1lhxikc16f6a0lhyf66rj54if80icfvx6z3zvqc5dgw"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; + pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; }; popEpi = derive2 { name="popEpi"; version="0.4.1"; sha256="0n4kf3h6zgr7sc2bk8bbrf5bvaybnacy6vsqck63gfdn3kkc43m2"; depends=[data_table Epi survival]; }; @@ -7898,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.3.0"; sha256="0zhmsx23fjjl8zy7s0gyzd0br4imdl2hfgk0g9v9p2ff72xg046d"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn reshape2 shiny vegan]; }; + 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]; }; - potts = derive2 { name="potts"; version="0.5-4"; sha256="1818md2mdkf47r5vcqawnn84lanir9q6r72kf41lq4zbjkk2yazv"; depends=[]; }; + 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]; }; @@ -7928,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="1.9.9"; sha256="1g062d9lsjkqrd5m91h55pc3zcqha9drmdi4zqic4hx6qyyhy2q1"; 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.0"; sha256="0bm1jixkdz682721j78kigs6v6dyckj4va41ik4f94ikb5j2f7hh"; 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.6.2"; sha256="100zr5932vm1rs359nzq4cxbx924az5d8zl9h7720fd5sgy4av7f"; 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.1.10"; sha256="1za32spd6qg63mi5dvkw54k24f5s4a10p2rkfgzjzqxjb9rd265h"; depends=[]; }; + 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]; }; @@ -7954,12 +8539,12 @@ 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.0"; sha256="07pwqn985dg5kjx65gfgcyg1nywjpxaswa7i6nsr8h0cr7a2mc9j"; 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]; }; prettydoc = derive2 { name="prettydoc"; version="0.2.0"; sha256="1zpvi4lyjazhj2h6m3j46x93s9c2300xqylaqy6gp1yjn9im36dp"; depends=[rmarkdown]; }; - prettymapr = derive2 { name="prettymapr"; version="0.1.5"; sha256="1mccqidbnyl31wzbf5ly8qv23v6zha1chqna59j97cc2m3rhkqdf"; depends=[digest foreach rgdal rjson sp]; }; + prettymapr = derive2 { name="prettymapr"; version="0.2.1"; sha256="1839zhc4s9pkl6fq0jd613cbyrwj4a9h04r9c5ki3jkcwi3w80jq"; depends=[digest httr plyr rjson]; }; prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; }; prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; @@ -7970,6 +8555,8 @@ 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=[]; }; prob = derive2 { name="prob"; version="1.0-0"; sha256="0gnp3q3dm176c1n7vdgisv3p11m2jk1hiza1yi8qaqyd9mfh86bg"; depends=[combinat fAsianOptions]; }; @@ -7978,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.5.9"; sha256="0hkv3y0j8crssvw7ck7m4vhzkwsbwl1nwsyjdmzjw42pdj448dl5"; depends=[KernSmooth lava Rcpp survival]; }; - productivity = derive2 { name="productivity"; version="0.1.0"; sha256="0hbysja40yv5ssiq4c3dn5bwypjhjdf1g3x56zms2ck78sk75zxk"; depends=[doParallel foreach Rglpk]; }; + prodlim = derive2 { name="prodlim"; version="1.6.1"; sha256="0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"; depends=[KernSmooth lava Rcpp survival]; }; + 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=[]; }; @@ -7995,34 +8585,36 @@ in with self; { prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.1.2"; sha256="1fxakchfjr5vj59s9sxynd7crpz97xj42438rmkhkf3rjpyspx59"; depends=[prettyunits R6]; }; proj4 = derive2 { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; }; - prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.1"; sha256="0zrz0rywhmb4n3my9ihf070rpmd3xni59rr4dsl1ahq9lkd97h20"; depends=[rootSolve]; }; + prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; 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"; sha256="0bpkpl0wpvhlcrk5z0fv7ra7l7yxdkbgzlxp99h88ilnad49hh5d"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr zoo]; }; - propr = derive2 { name="propr"; version="2.1.2"; sha256="1qymykn6jgbs7pfnm1and8l87m8wyhqfnr1cx1jd1ghw8avniixl"; depends=[fastcluster ggplot2 Rcpp]; }; + prophet = derive2 { name="prophet"; version="0.1.1"; sha256="1knkkm3ai91rcak5c5199gjqazq3db8202knk7b846w0n4f77hn3"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr zoo]; }; + 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]; }; proto = derive2 { name="proto"; version="1.0.0"; sha256="1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"; depends=[]; }; protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; protoclust = derive2 { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; }; - protolite = derive2 { name="protolite"; version="1.5"; sha256="0x25zcw3ayy0rl0sshd0iisaka25xx0sf6fjzlg26ssqjxhzv2f9"; depends=[jsonlite Rcpp]; }; + 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]; }; @@ -8030,13 +8622,13 @@ 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.6.12"; sha256="0ijz9gcc52byzmrw4iz976lgayp1wmn5b9v36bras14fwlwri0ky"; depends=[foreign mnormt]; }; + 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-3"; sha256="15lz6rh3101pxsam07zlgiryyzmf8m16mxnh1fsgdnz8bw0li9g7"; depends=[flexmix Formula lattice modeltools psychotools]; }; + 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=[]; }; psychotree = derive2 { name="psychotree"; version="0.15-1"; sha256="1awavyzblh4s0v15kv52sq5dpalg5p0fp7ih46jxppm1srdxsz41"; depends=[Formula partykit psychotools]; }; psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; @@ -8044,24 +8636,26 @@ in with self; { ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; ptstem = derive2 { name="ptstem"; version="0.0.3"; sha256="0dasfqkrd5dkqr1wbg56qrpkyjcb0lcdfcgz5mbxbhs478gf0nwj"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; }; - ptw = derive2 { name="ptw"; version="1.9-11"; sha256="0vh5xv26l27pbx1g9xrj4vcv2bv75cjxs3zf5zcalrnga2lhbdjw"; depends=[nloptr]; }; + 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-0"; sha256="1zpyd8ij93w0c27v4i68y869sj8hw30prppaxq0iprgf3d72qf6r"; depends=[]; }; + 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=[]; }; @@ -8070,22 +8664,23 @@ in with self; { pxweb = derive2 { name="pxweb"; version="0.6.3"; sha256="106nb0a3v295cam8ixhdwpgjhwq8p71c2z5c49s6xnqwmf6rbd0h"; depends=[data_table httr plyr RJSONIO stringr]; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; }; pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; }; - pystr = derive2 { name="pystr"; version="2.0.0"; sha256="08a20ii7h97qvyzqndbf3rdmnyr04g8h9lrs6qw193p1p41dl94w"; depends=[Rcpp]; }; + qGaussian = derive2 { name="qGaussian"; version="0.1.4"; sha256="00dn6cxix1yhaz877g240i1rkk9j6f3ys5hj41l9rvwsq95ayi5h"; depends=[robustbase zipfR]; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; qPCR_CT = derive2 { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; }; qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; }; qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; }; qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; }; + qboxplot = derive2 { name="qboxplot"; version="0.1"; sha256="1izihjcdwj5y90fmr97wbp2qswszjpb28cv0cf3gl57pypbq5vq2"; depends=[]; }; qcc = derive2 { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; }; qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; }; qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; 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.6.0"; sha256="0k6n3zr07ccr9xlmkyg6m0pp7plh91066b61zrn7jphgs0d31c0a"; depends=[stringi]; }; - qdapTools = derive2 { name="qdapTools"; version="1.3.1"; sha256="0sfzqmds888r599mwm7j0qjsqfv6z59p4apmmg36hsyaxmw51233"; depends=[chron data_table RCurl XML]; }; + qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; + 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.2"; sha256="1pp3dwrmp7j4rv0djbypnwjb26gji5fhqw4iwqbnxyi86m47z7z7"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; }; + 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]; }; qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; qicharts = derive2 { name="qicharts"; version="0.5.4"; sha256="0lq9faksp18mgb6pa7qhbm9frd6f4675623d797snvnm67aiy8fa"; depends=[ggplot2 lattice latticeExtra scales]; }; @@ -8095,31 +8690,33 @@ in with self; { qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.5"; sha256="0fm49iydbjp264h9mkk8qfblbvg4l3bfcnphxyhcv3n27m0w44sf"; depends=[Matrix slam]; }; qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; - qmethod = derive2 { name="qmethod"; version="1.5"; sha256="1j2i3m55vvs6l9fc8sdnp84a5yndcihz8sz49a7gd6sarr55ily4"; depends=[digest GPArotation knitr psych xtable]; }; + qmethod = derive2 { name="qmethod"; version="1.5.2"; sha256="1snllw82cijl7qgmgkn2x1k3x43x0hxbvh5mx5sffrma9kkv2fii"; depends=[digest GPArotation knitr psych xtable]; }; qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; qpcR = derive2 { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS Matrix minpack_lm rgl robustbase]; }; - qqman = derive2 { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; }; + qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; }; qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; }; qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; }; - qrLMM = derive2 { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[ghyp matrixcalc mvtnorm nlme psych quantreg]; }; - qrNLMM = derive2 { name="qrNLMM"; version="1.3"; sha256="046xzzyrjaqa8sa7pxf4mhi1q5pdhvsn5z8gid0cypb0z140ia85"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; }; + qrLMM = derive2 { name="qrLMM"; version="1.3"; sha256="1k85d09yvhx3pgmvqrsmhd14hqaah4pdr87vp4kg60dp9w5sydjz"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; }; + qrNLMM = derive2 { name="qrNLMM"; version="1.4"; sha256="0h1jra247flipv4pwww8rn61pj8jxpiaw74f2czs950klnznp1xm"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; - qrcm = derive2 { name="qrcm"; version="2.0"; sha256="09awa82qvxhdif9g6w36d89wyhfm55z39dw063lasa7pp7dd3gcl"; depends=[pch survival]; }; + qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; }; qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; }; qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; }; 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=[]; }; - qtbase = derive2 { name="qtbase"; version="1.0.11"; sha256="01fx8yabvk2rsb0mdx9f59a9qf981sl88s56iy58w5dd6r2ag6gc"; depends=[]; }; - qte = derive2 { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; }; - qtl = derive2 { name="qtl"; version="1.40-8"; sha256="05bj1x2ry0i7yqiydlswb3d2h4pxg70z8w1072az1mrv1m54k8sp"; 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.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]; }; @@ -8128,38 +8725,42 @@ 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=[]; }; - quadrupen = derive2 { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; + 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.3.1"; sha256="0qfdhzlr4l68a0pwvc58kdh0n5hj7lx7vjkqrq75nbz2b2ycksd3"; 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-7"; sha256="16iqpavdslhb1fdpvnxdd3awq9b0rj16mravg9nq8brqb6z3p2x2"; depends=[TTR xts zoo]; }; - quantreg = derive2 { name="quantreg"; version="5.29"; sha256="098gy8xv9kcl5y0cm93b8chr5sm6crrdxi20bkx9lmwmybl3himv"; depends=[Matrix MatrixModels SparseM]; }; + 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]; }; quantregForest = derive2 { name="quantregForest"; version="1.3-5"; sha256="0yckbz8bk7zlg787a0q70x5k1y4z1nj4difavimgs4s5ac6nbajd"; depends=[randomForest RColorBrewer]; }; 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.5"; sha256="1n3qv4ynddhhh0h9n0v21y7dq7mq5rmg0qqh3spxgrj0acrnqzhp"; depends=[classInt highr htmltools miniUI rstudioapi shiny]; }; - queuecomputer = derive2 { name="queuecomputer"; version="0.6.1"; sha256="171fgmb5xz653fh9lr3p562g5ap9072a546r8kan5b6msmnh6adk"; depends=[dplyr Rcpp RcppArmadillo]; }; - queueing = derive2 { name="queueing"; version="0.2.8"; sha256="08wcb58rp9g85cigm0zn0ba4xgihi4283w3sr4b16lv67sgld4p6"; depends=[]; }; + 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.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]; }; - qut = derive2 { name="qut"; version="1.1"; sha256="0d9gap5jp69y9r7zip4r1kp79lq2wfrxpjka225pxjgj59rj3xls"; depends=[flare glmnet lars Matrix]; }; + 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]; }; - r_jive = derive2 { name="r.jive"; version="1.7"; sha256="051kd6ksan4bw3z9w6p22h0sqn6y6dyadcxkibgyi8pz5xp6qypx"; depends=[gplots SpatioTemporal]; }; + r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; }; r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; }; r2glmm = derive2 { name="r2glmm"; version="0.1.1"; sha256="0b64kia06n8l88rm63hcb8h8qha5if2h8vm8m4s5fdf5hl34dv02"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; @@ -8167,9 +8768,9 @@ in with self; { r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; }; r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; }; rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; }; - rAltmetric = derive2 { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[ggplot2 plyr png RCurl reshape2 RJSONIO]; }; + rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; }; rAmCharts = derive2 { name="rAmCharts"; version="2.1.3"; sha256="0q02x00gvvqzrsl2m9lmmjc2xf3vf718ar0zlqnqn6rnz94lbvv3"; depends=[data_table htmltools htmlwidgets knitr pipeR yaml]; }; - rAverage = derive2 { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; }; + rAverage = derive2 { name="rAverage"; version="0.5-3"; sha256="0mn0ngnjjcyh59q4k0lc1fpim2n81aif1b4nrkdwl5dn59zb3cw3"; depends=[]; }; rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; }; rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.1.0"; sha256="194j445nirvvkz880ax0zw2q1mkiy0khdfjl7bwiwj8knhhvkrhw"; depends=[data_table foreach GPfit magrittr]; }; rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; }; @@ -8192,6 +8793,7 @@ in with self; { rFerns = derive2 { name="rFerns"; version="2.0.2"; sha256="19lwvb9aa115gc6wb5vzhmmhqgq2xxf6y83hw5y6k589prbxfq8y"; depends=[]; }; rForest = derive2 { name="rForest"; version="0.1"; sha256="1y7gqa1333nvllngy821k655glxkb9p6rbnx9cns7dy0qdqjzx50"; depends=[alphashape3d geometry rgl sp]; }; rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; + rGoodData = derive2 { name="rGoodData"; version="0.1.0"; sha256="1yys79dgcwsbc1xv1d5qv6bvcsdyf4k50jrvbgmmwwygami257zn"; depends=[data_table httr jsonlite]; }; rGroovy = derive2 { name="rGroovy"; version="1.0"; sha256="03kyw1hv1xmv580cf47gb3fzvjp27j0a93604h5hap981pzibdpy"; depends=[rJava]; }; rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; }; rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; }; @@ -8201,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.3"; sha256="186pcxdfkp24aff3qldkhbcxydifg092w3jadahfrd30d6gyfvp8"; 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]; }; @@ -8218,26 +8821,27 @@ in with self; { rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; rSPACE = derive2 { name="rSPACE"; version="1.2.0"; sha256="1nmv8niqc34mipzhny1mlwc9v4kck02ixmm1i25cqdfhsng03dma"; depends=[ggplot2 plyr raster RMark sp tcltk2]; }; rSymPy = derive2 { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; }; - rTableICC = derive2 { name="rTableICC"; version="1.0.3"; sha256="1q7xac9vfnakjp54ccqli42wi8idfb9g9crgbqyg5s726b7z50n7"; depends=[aster partitions]; }; + rTableICC = derive2 { name="rTableICC"; version="1.0.4"; sha256="0if18is64m3ka2dxfbj7vb1lbwwhn2hgfh3kdh7d47nr3z4ak7p0"; depends=[aster partitions]; }; 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]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; - rags2ridges = derive2 { name="rags2ridges"; version="2.1.1"; sha256="1wma4yikm7aqccldqga96hl2vpagjvmv5gwglj04clcmh9i7cskp"; depends=[expm fdrtool ggplot2 Hmisc igraph Rcpp RcppArmadillo reshape sfsmisc snowfall]; }; - ragt2ridges = derive2 { name="ragt2ridges"; version="0.2.3"; sha256="1ws2drllynmwc4dfd90b7pafc1gpz99g129yjf511ikjzfbl3lra"; depends=[expm fdrtool graph gRbase igraph marray Matrix mvtnorm rags2ridges RBGL Rcpp RcppArmadillo]; }; + rags2ridges = derive2 { name="rags2ridges"; version="2.2"; sha256="04f9gvwpgrx54dgbjjixlxa2056aqcz2kryn4jplwf5fc0vj1lyn"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape sfsmisc snowfall]; }; + ragt2ridges = derive2 { name="ragt2ridges"; version="0.2.4"; sha256="0pygq4na4xws1s1f96a0qslgsj94r28x0sbmxl402pshwkjl0xs4"; depends=[abind expm fdrtool graph gRbase igraph marray MASS Matrix mvtnorm rags2ridges RBGL Rcpp RcppArmadillo]; }; ragtop = derive2 { name="ragtop"; version="0.5"; sha256="0h09h9ws9c2d9xc00w4hl000h0kbvq16lz4vgv1w93am8zmsp4wm"; depends=[futile_logger limSolve]; }; rainbow = derive2 { name="rainbow"; version="3.4"; sha256="09vxdb4j099grnlx10995b74r3h9g1vs8div3nywgnslaj8x7pay"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; }; raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; @@ -8254,24 +8858,24 @@ in with self; { random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; }; random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; }; randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; }; - randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.1"; sha256="0q4xjh7qqmd4slxwd1z5mnpn4y3vx1vbn6v060zbd0afibpcw92b"; depends=[ddR Matrix randomForest]; }; - randomForestSRC = derive2 { name="randomForestSRC"; version="2.4.1"; sha256="17a59jc8h7bfgz9gpisc144fyas7da1c1lab1x8wasfilgkg08z2"; depends=[]; }; + randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.2"; sha256="1fijnzzap8my4l211m5pgj4fwna04z1db5m3hhim72i3xzc77hy2"; depends=[ddR Matrix randomForest]; }; + 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-2"; sha256="1mkq1fpr7bwlk01246qy6w175jcc94q8sb3pyjkdr8yms6iqk8i7"; depends=[]; }; + 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.6.0"; sha256="1fwqwbi0dnla16x6zj14rf95qr5gmilfmlrwnv7s960h4yiw4n97"; 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]; }; @@ -8282,27 +8886,31 @@ 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.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.2-22"; sha256="0wva7dd7zsclqxk3imkvbi98rxsvd1axr1l1msfcf9r8xrzybshf"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; + 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.0"; sha256="0a3862923wn9mxpbhsq7sxd0q306xnzphsn2p0zxsx1ixw7ksy4j"; depends=[refGenome]; }; + rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; }; + 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]; }; - rbhl = derive2 { name="rbhl"; version="0.3.0"; sha256="0ig9s0xnwkri1sxqaa8fax68v22bp4vl9rv4wq1gd3gpgl2c0frc"; depends=[httr jsonlite plyr tibble xml2]; }; + rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; }; rbi = derive2 { name="rbi"; version="0.7.0"; sha256="0j5h5m4xshs5xizzb3fxlzjgp6nkyz0hbh0yhky1pj815n66ww9m"; depends=[data_table ncdf4 reshape2]; }; rbiouml = derive2 { name="rbiouml"; version="1.7"; sha256="0bk0pvx0rfk74s7lbr8lc664yplfky94j1ym098w029045k233pi"; depends=[RCurl RJSONIO]; }; - rbison = derive2 { name="rbison"; version="0.5.0"; sha256="01j8jnfhikaggsvcnxamchvgabp8rbpmi1q18s1bcn5vc55fi12f"; depends=[dplyr ggplot2 httr jsonlite mapproj plyr sp]; }; + rbison = derive2 { name="rbison"; version="0.5.4"; sha256="0l3653q7bfda9lw1isnx6gdd7l5b8aldqgc2hppg2wh2k004rnf6"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; }; rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; }; rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; }; @@ -8311,85 +8919,96 @@ 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-10"; sha256="16j98x87dsjd7zj5pp9i5lc0a3ypr98zjwydpyhpl3zc0vnbbild"; 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.4.0"; sha256="1brl9q421q8n5lab5wlp0hzgzdldwr2b9sa8qngkk3nfvzy1jdwx"; 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.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.1"; sha256="1c5j2ja54k7pk86g7mh5wbqx1qkj8ks2ihmn774aqyky6nkgmx92"; depends=[plyr RCurl XML]; }; + 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.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.95"; sha256="09dk8kgpyz3sdkvspwka9p4a6kvl7yibdppd9y06sa7grmpykvzm"; 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.0"; sha256="1fw6rdi231blr416hq881pc3glv7pnn3fhc496cnj0dzwg0b32v6"; depends=[htmltools]; }; + 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]; }; readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; }; readODS = derive2 { name="readODS"; version="1.6.4"; sha256="1kj648phxvpg480fdhr2sj4l8q306gjdl886zqnkwxif5mw1aq7g"; depends=[cellranger readr xml2]; }; + readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; }; readability = derive2 { name="readability"; version="0.1.1"; sha256="19csrvnl1gslzamn46w5r0q4x12g56zr11m4lwp6rzwd5wcnj9ra"; depends=[data_table ggplot2 syllable tidyr]; }; 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.0.0"; sha256="0xji0dbal6xcxnsmjj678fw29n7wrj45wrd5ng99yhqqijcm9f6g"; depends=[BH curl hms R6 Rcpp tibble]; }; - readstata13 = derive2 { name="readstata13"; version="0.8.5"; sha256="1hkbh7kia7bgshhlq2n683s0gs4rw4wzyfwrbp0hq1xirqnypj0a"; depends=[Rcpp]; }; - readxl = derive2 { name="readxl"; version="0.1.1"; sha256="0ypmxp1xl2a27vlx7dj6kszbbr8fbs6lcc1ibhw1ln1p053xmlrr"; 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.0"; sha256="1kbmz969wiv2jspa2pi0lgbxsj3sd9xzn24bmks6mv5hzl8pp9xb"; 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]; }; recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; }; rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; - recmap = derive2 { name="recmap"; version="0.5.16"; sha256="0fq0l483mmb04n2qj2msngw6midwjrq5fjdh3sgzy5fhj5bcd288"; depends=[GA Rcpp sp]; }; + recmap = derive2 { name="recmap"; version="0.5.20"; sha256="1ld3ifcn9rwgk4hiislmdkz73sdxagrbynq9x3mswjifx1hlqj6d"; depends=[GA Rcpp sp]; }; recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; - recommenderlab = derive2 { name="recommenderlab"; version="0.2-1"; sha256="03gyz6davjimrbbnjglj41hysvvd2hnxsi166san1877ibblgw4c"; depends=[arules irlba Matrix proxy registry]; }; + recommenderlab = derive2 { name="recommenderlab"; version="0.2-2"; sha256="13mgkxrcwh5ry699my3w6xgm6rabsk9fd5qqsdwzy7cfq6xkq7cg"; depends=[arules irlba Matrix proxy registry]; }; recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; }; 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"; sha256="1h8147x9caxxprxpgzk7qj9nkafbi34zhcnaksdpv95k7vnhs4ps"; depends=[Rcpp]; }; - red = derive2 { name="red"; version="1.0.0"; sha256="07m48znd0dm2fd4jagjrn2fqx2wr1hzvx2rljlkpl0hkkljcz8lj"; depends=[BAT dismo geosphere igraph jsonlite maptools raster rgdal rgeos rJava sp]; }; + recosystem = derive2 { name="recosystem"; version="0.4.1"; sha256="1gnq2gq47qwinack3f95d7c8877qia44zk9pnj1sx83jjs8sxk8p"; depends=[Rcpp]; }; + 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"; sha256="19d5m17b8rzy9fsl95r0zdr5swawdbdbg0pib85028f8pqh9g5f1"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; }; + 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.0"; sha256="0xj5mqk7i4bl6ffdx346q558sn8hmqlkfpiv7ggrfhaqg02f6war"; depends=[DBI doBy RSQLite]; }; + 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]; }; refimpact = derive2 { name="refimpact"; version="0.1.0"; sha256="03634gmfr423bjygdxcpgmnh9nm2l86rfmvkvq74qymwc2gl6l6p"; depends=[curl jsonlite tibble]; }; refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; }; @@ -8401,12 +9020,14 @@ in with self; { regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexr = derive2 { name="regexr"; version="1.1.0"; sha256="1gjv4wl4gjsh5rr0kz057x9j4dhikrm3zzlmxlhd1f9srjdmcdzy"; depends=[]; }; + 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=[]; }; @@ -8414,8 +9035,8 @@ 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.2.0"; sha256="0x68zivcydczq7rxxzjbgif8c4qbmp80nbz78f7292xlbzc39hjx"; depends=[]; }; - relMix = derive2 { name="relMix"; version="1.2.2"; sha256="03mn7rnx2kh7v4alfvkiw3iakxi9dkfnmhgqsdfld3qrijjp1i6y"; depends=[Familias gWidgets paramlink]; }; + 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=[]; }; relabeLoadings = derive2 { name="relabeLoadings"; version="1.0"; sha256="16gxdrhkaaa33hypnsacn4vd1g3lbqdl3j8p8va54v777c561g81"; depends=[]; }; @@ -8430,35 +9051,39 @@ 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.3"; sha256="04qjfsb7cq3x993ai4skkzj1p60y616qpmh3v94n260z0syd2gxj"; 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=[]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; - repr = derive2 { name="repr"; version="0.10"; sha256="06wnmc1xvkf6kzb396qjvn0m71lh1mp2q5p2lh4s20i1l42469cr"; depends=[]; }; + repr = derive2 { name="repr"; version="0.12.0"; sha256="1p6a2ryb5iaf4i6nn1iav26bh83wmvncwpk25hyrzd5rxich1bq3"; depends=[]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="0.1.1"; sha256="0jxsnlspy12dnbpkghkmkr6p6783dhvsk3g9mj7gpn5j74qfk6li"; depends=[callr clipr knitr rmarkdown whisker]; }; 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]; }; @@ -8466,29 +9091,30 @@ 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]; }; - restfulr = derive2 { name="restfulr"; version="0.0.8"; sha256="1dysvw757fcnmz94an8wzcq7h334f3j8lgv4j5w4lhgaa1949m94"; depends=[RCurl rjson S4Vectors XML yaml]; }; + 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.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]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; - revdbayes = derive2 { name="revdbayes"; version="1.0.0"; sha256="1q6fad3jpvpj0k976010i18ias540k0b2skiw7jk5z1zj9rrxi10"; depends=[rust spatstat]; }; + 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.8"; sha256="0cv410k7nflzkwz7g7zvc86wsmqz0kxlciz7mms7bixrwvqq2w0a"; depends=[rmarkdown]; }; + 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-0"; sha256="0jwn1rs4a8y7syyv8sgvkjpi69y5jv59xlznm5a3j4pidj5kxf10"; 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.1"; sha256="17xkbn930vczxc8b9bljambzhc5j14b7fjswbrl8c8ygdhcd436n"; depends=[dplyr httr lazyeval tidyr]; }; + 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]; }; rflann = derive2 { name="rflann"; version="1.3"; sha256="1y8m52vlrcl69srssd23zgg90yfhh9rryd16hk1dnqg713qhksgm"; depends=[Rcpp RcppArmadillo]; }; rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; @@ -8497,18 +9123,17 @@ in with self; { rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; }; - rgbif = derive2 { name="rgbif"; version="0.9.7"; sha256="1ajwmxk8pgmgba2vv4pw424zzsjbx0z5ppsavmiy6zjxns7l5rbn"; depends=[data_table geoaxe ggplot2 httr jsonlite magrittr oai tibble V8 whisker xml2]; }; + 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-5"; sha256="03bi89n2n80lr0v99s130yl256nf3ww5hr02kpb2lawzz8d3rb7v"; 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]; }; - rgeos = derive2 { name="rgeos"; version="0.3-22"; sha256="0bl5hwf0gn5dnm5v35hpkp1w7aiy3hzf2k9nrv70j33d7r8gbnif"; depends=[sp]; }; - rgeospatialquality = derive2 { name="rgeospatialquality"; version="0.3.2"; sha256="19g685bz9x7jbn8mmz0yy6mr3qhkjdvvglhfxxh45mjvi2dz5aj8"; depends=[httr jsonlite plyr]; }; + rgeos = derive2 { name="rgeos"; version="0.3-23"; sha256="0p04szj4bcsycj6lgnq65dgsc3w807hdqp5zrd5zxgclhqryq9nm"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; }; rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; - rgl = derive2 { name="rgl"; version="0.97.0"; sha256="0firba0rvp8kc5w2s1glzk72m2awkg4c2vsd3xhp9b247dvr1aj2"; depends=[htmltools htmlwidgets jsonlite knitr magrittr shiny]; }; + rgl = derive2 { name="rgl"; version="0.98.1"; sha256="11k93b3wkfasx63w0niin1ns1kgzrmjm66la7kvp5rljw3cvwjaz"; depends=[htmltools htmlwidgets jsonlite knitr magrittr shiny]; }; rglobi = derive2 { name="rglobi"; version="0.2.9"; sha256="15kc3gb998ryrnpw6nn87vsg63xknchs0hbl33g9napyj5wjmmiw"; depends=[RCurl rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgp = derive2 { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; @@ -8526,36 +9151,40 @@ 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]; }; - rinat = derive2 { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; }; + 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.1.7"; sha256="1db331s67w9i84dji05fjh8ml938w2y694gkyq00h14fkmwr9g4g"; depends=[cmprsk pec prodlim randomForestSRC rms survival]; }; + riskRegression = derive2 { name="riskRegression"; version="1.3.7"; sha256="0zk0k0xx7d72bsrava7n7wadpkx8aaawg44fignmsh8mpzhwwhav"; depends=[cmprsk data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo rms survival]; }; riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; rite = derive2 { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[knitr markdown RCurl tcltk2]; }; 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.13.1"; sha256="1xpl47hhddr5xa1px8fxw8l2hicg78cnz5ak2496f0h662g8zb0w"; depends=[rgdal sp]; }; - rivernet = derive2 { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; }; + riverdist = derive2 { name="riverdist"; version="0.14.0"; sha256="1j9yi27zwkgx329rj7bl6284390ajwmpj6fdsh7vz5pac4q4kcds"; depends=[rgdal sp]; }; + 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]; }; rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; }; rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; + rjmcmc = derive2 { name="rjmcmc"; version="0.2.2"; sha256="0c72nxhx57sarrpphlynrbwf2kp8cwd6bb7v39frqb1wi43ah63s"; depends=[coda madness R2jags]; }; 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.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; }; + 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.0"; sha256="1hdxkjvsqyng67fyf43ykh27xfi510cdy1i8y2dcrg31mwc7r9rs"; 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=[]; }; @@ -8565,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.3"; sha256="1vvxyf3zhyxx6k697lia299456hryp8nh3zr0fc27f3107a8mcjf"; 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.3"; sha256="14brfil6s9hi0rnw13g8d9xvgnyblqbwvs3iwwwb38lzl8az5rqs"; 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.1"; sha256="0x0vh1mdxb00k6c2m09szpbx4rqhch8p5zslb5jmbbacslicr1sq"; 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]; }; @@ -8579,26 +9208,27 @@ 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.11-1"; sha256="1apcn3pqv4fax784fjw2vkbqvkqh3xj3lp4sl59jsn6hbhm4zdnr"; 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]; }; rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; }; - rnbn = derive2 { name="rnbn"; version="1.1.2"; sha256="1b4fx5pi0h8hlikxqk68jk1nimlsh3hp6qr1hb6y1jwq8xa4lyiw"; depends=[httr rgdal rgeos sp]; }; rncl = derive2 { name="rncl"; version="0.8.2"; sha256="17inkk6ajdn1x6g253k2yjyivcryjwn903cd369h1bxlr80amqc0"; depends=[progress Rcpp]; }; 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]; }; - 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=[]; }; @@ -8607,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]; }; @@ -8617,11 +9248,11 @@ in with self; { robustbase = derive2 { name="robustbase"; version="0.92-7"; sha256="13xz4am7y0s0kl5bmbcw3dlhl7ji8h9sjx56wsgmj6r9n35nrggw"; depends=[DEoptimR]; }; robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; }; - robustlmm = derive2 { name="robustlmm"; version="2.1-2"; sha256="0vgrbvjaix44rixmgd8ljjzvx669gdk5il0f2p8y37ak4s4d2n09"; depends=[ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; + robustlmm = derive2 { name="robustlmm"; version="2.1-3"; sha256="0a5gk8n8aap14s1d6cmsla5x07cqgy6i266zd0922l93k40b60rk"; depends=[ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; 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=[]; }; @@ -8632,81 +9263,87 @@ 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.3"; sha256="1r3hp6y8wp397x8al5xx4ly4ydv40ln0s28db0cnnsi2arn4q4mb"; depends=[dplyr httr 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]; }; - rosm = derive2 { name="rosm"; version="0.1.4"; sha256="1p15pmhv52fg8lc0c0yiadc7s0q9s0dz9q6d8544msaxsjwfkpxp"; depends=[abind digest foreach jpeg png rgdal rjson sp]; }; - rospca = derive2 { name="rospca"; version="1.0.1"; sha256="16kd0nr76h4h64rz402k2pqz1qvczzga72wd7f16z713cwz2s2hn"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; - rotationForest = derive2 { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; }; + 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]; }; rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; }; - rotl = derive2 { name="rotl"; version="3.0.1"; sha256="18dzg3ysy6aphwbj1c4hzr1qn8q3vvr5r0qnpmidr5rwyhc78phb"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; + rotl = derive2 { name="rotl"; version="3.0.3"; sha256="0pfpgynvdi011m6j6gs98irldpjrdc8rgza36ndk60q2w5z436h4"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; }; 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.1"; sha256="0n2lpnphnb5h7y9jszq4m15wymwgv7v2pw5fwbflr0ihvx3i3iac"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; }; + rpdo = derive2 { name="rpdo"; version="0.2.2"; sha256="1yzvi4givrwpbs56p2vf0gciaigq50qq0r0n5lyaqk73azzhnhxc"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; }; rpf = derive2 { name="rpf"; version="0.53"; sha256="16d28i8s7f6ag1jvxw1ns8pi3s1rbxp9z9l13bxsm6cd6kq5jgrq"; depends=[mvtnorm RcppEigen]; }; rpg = derive2 { name="rpg"; version="1.5"; sha256="0hjfzikaryr55xjfw7zjdby4ja59rxq9ikycgbpapvpy2q9py5yp"; depends=[getPass RApiSerialize Rcpp uuid]; }; - rpgm = derive2 { name="rpgm"; version="0.1.3"; sha256="1d2q1g63w2vgq74aminllgsrzci224n1n9q0gw8230y0xgh3ih82"; depends=[]; }; + rpgm = derive2 { name="rpgm"; version="1.0.0"; sha256="03zc87jncbdzmjrl5mfc6wk1q9mkbrs75dnxy4sgim0mryvv53ap"; depends=[]; }; rphast = derive2 { name="rphast"; version="1.6.5"; sha256="1jff94hx7skvd6icbrcyabsvz80sgqqv28vz91mcz5jh6v6afhl3"; depends=[]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; - rpivotTable = derive2 { name="rpivotTable"; version="0.1.5.20"; sha256="1aqk0afw2vjb7d75n9imp0dc3nq1w94n3r9fd3k1zsmia8ds8dh3"; depends=[htmlwidgets]; }; + 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.1.1"; sha256="0bir893izyx8791m39fm9ykwdp9a6n3mgphx80i7gs0wsw5z7bv3"; 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.0.2"; sha256="0h539wdj255fynwhjvv7kzl8pfwfvqiji35bp3h55m5q09w77n98"; depends=[ggplot2 survival]; }; + 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]; }; - rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.1"; sha256="0zr3c84248myizrf3gmwkkybzlhk65j97dhg77cv2hbr7sdbjz2b"; depends=[eha mc2d msm tkrplot]; }; + 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]; }; - rscproxy = derive2 { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive2 { name="rsdmx"; version="0.5-8"; sha256="0f0hc2v9g7gxqcfhx3m7fawsvlba3jx666f675263d8vhdc9f311"; depends=[plyr RCurl XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; @@ -8715,84 +9352,85 @@ in with self; { rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; }; rsig = derive2 { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; }; rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; }; - rslurm = derive2 { name="rslurm"; version="0.3.1"; sha256="1mvs64g9j1ml8as18na39app1n8lk3m1qgki68nhkas81bmiq24a"; depends=[whisker]; }; + rslurm = derive2 { name="rslurm"; version="0.3.3"; sha256="1rlmimsd63y5ga0pz74936zbwlx07zqj9bwbz6i68lb4p0kca72v"; depends=[whisker]; }; 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]; }; - rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; }; - rsparkling = derive2 { name="rsparkling"; version="0.1.1"; sha256="1mjlm4gv0551nz0n6qd0596jpn6yc5a4pdqn7h5087gg9cpay0sv"; depends=[h2o sparklyr]; }; - rsq = derive2 { name="rsq"; version="0.6"; sha256="0qc5mkz7b68al3iahsbv45imkzabbsykd95w1yd7gfcrw0qk592m"; depends=[]; }; + 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.14.1"; sha256="035gph171z3ydl321a46p9rl5dbzaw5vn4qa7mj20dmvg90py99k"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; }; - rstanarm = derive2 { name="rstanarm"; version="2.14.1"; sha256="0hwiqn4swwg3b3g4szkrc1srqiibn227sb7rcqknh9fs6b8b78s5"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders]; }; - rstantools = derive2 { name="rstantools"; version="1.1.0"; sha256="14kf5faz7n7r08dxsd4dw6as63lbb2fsyqiknn48fh2kp36ykpwj"; 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.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.0"; sha256="1584g43jx21d2di6zn4ra5j916a5bqzpni223prwn3nii5244f3x"; 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.4.1"; sha256="1k1h5v0610bnxpz3fciim0ixjlrjzqlhx9h8b8zsz306l84bnxy8"; depends=[Rcpp]; }; - rtkore = derive2 { name="rtkore"; version="1.2.0"; sha256="1kchqxjyqz5vz3kfljvjhx42yahc58m99ifv8yijlffi68k486vl"; depends=[Rcpp]; }; + rtk = derive2 { name="rtk"; version="0.2.5.1"; sha256="17wqlplpqc9df5lg48xvqiny9wvn2h0drl8rj02iv50m14vrvpk1"; 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=[]; }; - rvcheck = derive2 { name="rvcheck"; version="0.0.5"; sha256="045anzzp3laavxm3sqnyfnnc13nhryv15w63qawr9y81alg91397"; depends=[devtools]; }; + rvcheck = derive2 { name="rvcheck"; version="0.0.8"; sha256="0n3pijlaxhvz692k56z5hx2cbffq3qmyll3dckp6jdv5pbbp4ywy"; depends=[]; }; 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.2"; sha256="173fklnnizbh475qk9k7ff9zk96j1ljnbyhj8p494ys3jk4na0hw"; depends=[gdtools R_utils 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]; }; - rwirelesscom = derive2 { name="rwirelesscom"; version="1.4.3"; sha256="1q4s9m9k6i7x2vq5dwq7950sbq03i8ff6qk8l30x77689kpflqcb"; depends=[ggplot2 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.0"; sha256="10m0wgym6rdrgvmhh79q4jf0lh8wlrg04mvq0yvgnqfgcxn4rmir"; depends=[countrycode dplyr httr]; }; + 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.0"; sha256="01fw6xpjq3h1ss38swivnp3rv7sh2lrdp0qcxz1ff7yln9sm5qsm"; 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=[]; }; @@ -8802,22 +9440,23 @@ 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.4"; sha256="04q6a7b27lmc9racc8g1f5wrz1qa322crsa7kdb4r8kdpkm9pji6"; 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]; }; saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; }; 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.2"; sha256="1w42j0g3yi3mqamkl9z3v103vv2hy2l1cy5ijbam0yddsaqqig3b"; depends=[hypergeo orthopolynom PDQutils]; }; - sads = derive2 { name="sads"; version="0.3.1"; sha256="17ndy8li01qgd86l3wvmkwjs2iz982bmrkxikv6y69s8mznd82qp"; depends=[bbmle GUILDS MASS poilog VGAM]; }; + sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; }; + 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]; }; @@ -8828,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]; }; @@ -8836,12 +9475,14 @@ 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]; }; + sbart = derive2 { name="sbart"; version="0.1.0"; sha256="0d74dmsxphsi548k81yihf7icay7fy5v6qxv3champw3j1fwkh3g"; depends=[LaplacesDemon msm Rcpp]; }; sbfc = derive2 { name="sbfc"; version="1.0.1"; sha256="1xz8h1m5d5ahrz4wsy55amd5mxh3acjs5qmcn7gl6yh3pn0c8phf"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; }; sbgcop = derive2 { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; }; sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; }; @@ -8852,26 +9493,28 @@ in with self; { scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; }; scales = derive2 { name="scales"; version="0.4.1"; sha256="1lqccfmqdwrw0cjyqvw2zvgpk2jvnqrfb303l1raqyyf3zxqhav4"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; }; + scalpel = derive2 { name="scalpel"; version="1.0.0"; sha256="0zk81q2f49vrbprlvjq3q4s2ak7rrlpj55rrfkqr8nq1vvi6nxd2"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; }; scalreg = derive2 { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; }; 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.6"; sha256="11ks8rarcgk8hj9vnhlj01v6z2kid0lv2nkkbqgj8gbcni9wgawr"; depends=[ggforce ggplot2 tidyr]; }; - scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-38"; sha256="1mw1v725cdq24lfygjjmx3vmxzr2zpd332v0lham7g0p4r7lc8pb"; depends=[]; }; + scatterpie = derive2 { name="scatterpie"; version="0.0.7"; sha256="0bfzhpakdwlps900dnsp6b5hrrmi02jcmk31afp4pixyj3r7h3c8"; depends=[ggforce ggplot2 tidyr]; }; + 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="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[digest iterators Matrix RCurl zoo]; }; + 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]; }; @@ -8880,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=[]; }; @@ -8887,47 +9531,50 @@ in with self; { scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; }; scrypt = derive2 { name="scrypt"; version="0.1.1"; sha256="0lgnmag2yr5r67kqni2mpbvflqzaq8icilcxqja7c8fzw6xxzjrx"; depends=[Rcpp]; }; scs = derive2 { name="scs"; version="1.1-1"; sha256="1qx8b73g5v7mjx85lx5bln6j6i9r7m238i7hm8adr2jrbl33532y"; depends=[Matrix]; }; - scuba = derive2 { name="scuba"; version="1.8-0"; sha256="1hlgvbcx7xmpaaszyqvhdwvwmf8z209jkf6aap205l3xkkc692c4"; depends=[]; }; + scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; }; scvxclustr = derive2 { name="scvxclustr"; version="0.1"; sha256="0d72hr9jcw513mapx1plif07b4qsi9b9pad6dwrqlh3z8kb8mn4j"; depends=[cvxclustr gglasso igraph Matrix mclust Rcpp RcppEigen]; }; 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.0"; sha256="1ppqs47p4zha30axgwyvf0dhfrh2hjhi6cgwchikl9k9zwdh4byv"; 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.1"; sha256="0mcvymzabflhd0akczczv1cmxaakknqxjma5vdv75043rv151hqr"; 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]; }; sdef = derive2 { name="sdef"; version="1.6"; sha256="1y1l5fl7lh636kyvc2hwssdnifl055nrz3riplj4qqw88lkm1mk8"; depends=[]; }; sdm = derive2 { name="sdm"; version="1.0-32"; sha256="1h20ap4q7bq2y92mrggir8fq4dlw6hz0pvpaqnj2v8fxng50fpjx"; depends=[raster sp]; }; + sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.5"; sha256="0hnfhdrvn78yl4shrk4y42j4wjrfrglhnkqsa56kgki4hnq88d29"; depends=[R_utils raster rgdal]; }; sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; }; sdnet = derive2 { name="sdnet"; version="2.3.8"; sha256="10c962wbzgl2zpz7yx5kpryldbbq76qrd5pnz4rlmbaa9kfg08s5"; depends=[]; }; 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"; sha256="0qrlzanmqqqwsb83rh2wys4jl2mz1ijwznnx32i2gk4h1nvkwxbx"; depends=[DBI dplyr RPostgreSQL rvest stringi XML xml2]; }; + 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]; }; @@ -8936,17 +9583,17 @@ 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.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[colorspace corpcor igraph lavaan lisrelToR plyr qgraph rockchalk sem XML]; }; + semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; }; semTools = derive2 { name="semTools"; version="0.4-14"; sha256="1j1chman14i908c009lf0jgdmrrb8avgp8nif1i9wlj6vgif890c"; depends=[lavaan]; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semds = derive2 { name="semds"; version="0.9-2"; sha256="0ig8b7ii1c8av0il904b71lzr8lqdiibwf16yj5dp8n4xc80bryh"; depends=[minpack_lm pracma]; }; - semiArtificial = derive2 { name="semiArtificial"; version="2.0.1"; sha256="1bjjqcm6r3hxj5752ywdzllh7wr4rwzqlrkf50wpdl05za3fbfd9"; depends=[cluster CORElearn dendextend fpc ks logspline MASS mclust nnet robustbase RSNNS timeDate]; }; + semiArtificial = derive2 { name="semiArtificial"; version="2.2.5"; sha256="1m8kwjhqjpqjzz22caiwpb4nb70d8y0ssf9j4rfyyh530x2q2k1m"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; }; semisupKernelPCA = derive2 { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; }; semsfa = derive2 { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf3y9i73rv3mrj7lkr2ycnsx8zz57h"; depends=[doParallel foreach iterators mgcv moments np]; }; - semtree = derive2 { name="semtree"; version="0.9.9"; sha256="1a66xiy0p9q3bmppc8rhnd0lfip2vxjjqi9094zqvnclkznrc9ar"; depends=[bitops digest OpenMx rpart rpart_plot sets]; }; + semtree = derive2 { name="semtree"; version="0.9.10"; sha256="1xx86pqzilxpd6zki7zd846vf13dcphn9d478hjjn2zlvzlxhfkz"; depends=[bitops digest OpenMx rpart rpart_plot sets]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; @@ -8955,55 +9602,62 @@ in with self; { sensitivity = derive2 { name="sensitivity"; version="1.14.0"; sha256="042bwjp906jmhsp09n03nf6xkzfvgad13f0bkm3nk5qf9xfjfszm"; depends=[boot]; }; 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.0.0"; sha256="162gf45gby7kz93j6xbv2fhzcmjqk55897m58xf64csphgfv6ibv"; depends=[]; }; + 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]; }; sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; }; - sentimentr = derive2 { name="sentimentr"; version="0.4.0"; sha256="0sfr1bgv8lap91bw9q7z4d1cn64kmn2iqf8mkxxcp9jcskb0qp0z"; depends=[data_table ggplot2 stringi syuzhet]; }; + sentimentr = derive2 { name="sentimentr"; version="1.0.0"; sha256="1hniwvm2mr85hs6v9pvs04n73a13nf0qkikxkz9bcb3hfgkk8v6c"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean]; }; separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; 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.6"; sha256="04cfii5i337g11qdrhq3sflas2vv8avy4qylxvridxqibvk70pjz"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; + 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-3"; sha256="1n1a2zqv1s5415fz2vgqys3nm282d6lkglbd1vprx4k76lp55gfn"; depends=[ade4 segmented]; }; - seqminer = derive2 { name="seqminer"; version="5.7"; sha256="0p75wyl70cvp36mwg5y74nv573j1gdqi15ac2a7xf61jmsq7ycpy"; depends=[]; }; + seqinr = derive2 { name="seqinr"; version="3.3-6"; sha256="13d0qxm2244wgdl2dy2s8vnrnf5fx4n47if9gkb49dqx6c0sx8s2"; depends=[ade4 segmented]; }; + 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.7.2"; sha256="0qvy9bmaai85gnhhrw1r59vzxll1r8r0h51cn88d6n7801yi9r3r"; depends=[plyr]; }; + 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-16"; sha256="0pl0wnlgzyc2d87nkx90ficcww6lixmghhymhwi130vjjd0bqdjx"; 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.3-4"; sha256="0d5n8aw0d2ak96q4vlwmvk1g5m0acaqyr83l203wd470w4ksihqg"; depends=[DBI 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=[]; }; sgd = derive2 { name="sgd"; version="1.1"; sha256="1kqpaxyacaq1fkmy4hsj62167gcmqng4pmafpdjdpqxwdqxz9xxf"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; sgee = derive2 { name="sgee"; version="0.2-0"; sha256="1dpbkab3wzcqp9rgy9gxibjs2dcpb5ql1dlgg97rxjr1fkigwxgk"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; - sglOptim = derive2 { name="sglOptim"; version="1.3.5"; sha256="1ys4hlpfsyc0iwhr1gpwzf47snpmmyxv0clb2vbcfm0lr272h25l"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; }; + sglOptim = derive2 { name="sglOptim"; version="1.3.6"; sha256="0gzhzfi5q9hgqgzagfdzi4cswpmwic9ggf72qi6axl1hixgmgp0w"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; }; sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; }; 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.2.0"; sha256="1p2g0anxl6ynvq97jy7qwy9p9pjmfpii7irh6arhvybz28v4ky00"; 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]; }; @@ -9011,20 +9665,27 @@ 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.4"; sha256="0gb6nahnkhhymq0bkxgb165rr1saqri43khgqx2xgm37s0wxqfc9"; depends=[alakazam ape data_table doParallel dplyr foreach ggplot2 igraph iterators lazyeval scales SDMTools seqinr stringi tidyr]; }; - shiny = derive2 { name="shiny"; version="1.0.0"; sha256="152v2z1cyg6893b0qd5rs12a2m9dbzk7ak04qvbcym0s9y4l0kf4"; 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]; }; - shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.2"; sha256="0zqfay21nn2mrjk33g60rqb5mdac15rl53kkny7ypblmiky0mlzz"; depends=[digest shiny]; }; + shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.3"; sha256="1ikxwa02jpkir1xxx4lvz995ggx8032vl0zknmhccb2mn1k98b4i"; depends=[digest shiny]; }; shinyFiles = derive2 { name="shinyFiles"; version="0.6.2"; sha256="1lphzqbzg482lv0xiamfv28n5nyjppss9zzcpx1cd5fsz0xg1282"; depends=[htmltools RJSONIO shiny]; }; + shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; }; shinyLP = derive2 { name="shinyLP"; version="1.1.0"; sha256="08vc35988pv0kx0kvdl26nkdzcgmi6w4xffmyylan7x59519imkk"; depends=[shiny shinyBS shinythemes]; }; shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; + 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.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]; }; - shinyjs = derive2 { name="shinyjs"; version="0.9"; sha256="1hh9djpcq80srxxy6ysy3pnwiyc5mx1xmhvs0jacbr3cszq1m6kk"; depends=[digest htmltools jsonlite miniUI 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.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]; }; @@ -9038,72 +9699,81 @@ in with self; { shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; }; siRSM = derive2 { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[doSNOW foreach MASS rsm]; }; 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=[]; }; sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; }; - sigmoid = derive2 { name="sigmoid"; version="0.2.0"; sha256="0cp16spja60nv6wpj0zg5b4nkj1dg0d0blhrjm4ki5pz9k7lc0g7"; depends=[]; }; + sigmoid = derive2 { name="sigmoid"; version="0.2.1"; sha256="1myphx64irwllf3p9aifmg37mg4jg58ik7f42zilg5qsjfhj37zf"; depends=[]; }; signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; }; 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.4"; sha256="0lw7l0dsjv0c4fdl8x0prg91qhbi4lvqfaky38j75w9jw8h9gkq4"; 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]; }; simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; - simboot = derive2 { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; }; + 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.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; 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]; }; + simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; }; + 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.0"; sha256="1i7ppj7rf21i5frycmcd9pn51rc702pp3hmyv03cf9rm454v6rc2"; depends=[BH magrittr R6 Rcpp]; }; - simmer_plot = derive2 { name="simmer.plot"; version="0.1.8"; sha256="0r1r88bq4m4qzqyzag3rr67b6cakf4446vdhxqiqc23ky16wl99l"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; + 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]; }; simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; }; - simpleRCache = derive2 { name="simpleRCache"; version="0.2.2"; sha256="1hbiwk2am56f2vhj5qvajkqwynlch7c857vnpj99497wgy2wxg7z"; depends=[digest]; }; + simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; }; simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; }; simpleboot = derive2 { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; }; 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]; }; - 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-0"; sha256="00np025vj2ckyp9ikv89fm4mrxgqbgq29870dzq3i071ba7r650z"; depends=[data_table]; }; + 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.2.0"; sha256="10ghh7ch33jjchirsbxmj36ig44zncwcmsy7is5vj4pbmhpbz6gv"; depends=[MASS matrixStats mcmc MCMCpack]; }; - sjPlot = derive2 { name="sjPlot"; version="2.3.0"; sha256="0gljrzlz4kcfam0i79qiapj858h9h7w6asrga6812w093f6k9ivi"; depends=[broom dplyr effects ggplot2 lme4 MASS merTools modelr nlme psych purrr scales sjmisc sjstats tibble tidyr]; }; + 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.3.0"; sha256="06h13sqh7k7dis5b02zqq41wsr0zrwxxkcaaam9jhmbb9k0nq8s1"; depends=[broom dplyr haven psych purrr stringdist stringr tibble tidyr]; }; - sjstats = derive2 { name="sjstats"; version="0.8.0"; sha256="0kg9g7g0d4cy75qfqa9iqs1wkbc7k4lm3sq6nmaq4x1nlc9hrl0r"; 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.2"; sha256="0xnlhlxdpj1lg7balpwsz5b4d90505al389b288ac81q0wg974rf"; depends=[]; }; + skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; @@ -9114,12 +9784,14 @@ in with self; { sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; depends=[lmom]; }; 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]; }; - slim = derive2 { name="slim"; version="0.1.0"; sha256="1d39hcsb6qxi36x7fkl67vy7r8n7ij275z7jnrb2n3pjnqkzjmzi"; depends=[data_table MASS]; }; + slickR = derive2 { name="slickR"; version="0.1.0"; sha256="0jk9h58v30cl64sfd5730ccv54bsw39d8d57085wrx1kqadsampy"; depends=[base64enc htmlwidgets xml2]; }; + 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]; }; @@ -9128,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=[]; }; @@ -9137,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"; sha256="1jqcgm098kdsrgwrpjry0l6rg8ql7cigxk54svs3170x1fvxa3il"; 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.7.0"; sha256="16jhg9qn6rcgd64wx6f7b9a3p9kgkbms8vlygc1gmnkifnh60a0v"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; }; + smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; + 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]; }; @@ -9154,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]; }; @@ -9170,15 +9842,16 @@ 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]; }; - sodium = derive2 { name="sodium"; version="0.4"; sha256="09xfla0227dx3354nm0pgkwa6322ifnxydxwmlc25s1vb7mjkk1s"; depends=[]; }; + 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]; }; softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; }; 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=[]; }; @@ -9188,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.6"; sha256="02y0iah34h9zjji0p5xllz76q3cdabkljsi6vvbdraf0rhi2x51f"; 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]; }; - sourcetools = derive2 { name="sourcetools"; version="0.1.5"; sha256="0jx6kslygfqaic3cmjwag3dy98q1a2dw20cz7z8agsknmmbk6dy2"; depends=[]; }; - sp = derive2 { name="sp"; version="1.2-4"; sha256="0crba3j00mb2xv2yk60rpa57gn97xq4ql3a6p9cjzqjxzv2cknk2"; depends=[lattice]; }; + 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-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.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[abind coda Formula magic]; }; - spBayesSurv = derive2 { name="spBayesSurv"; version="1.0.6"; sha256="1k9d8saab2isj60z5kffb7i8f1ymp7327m15gpinw0wv1m9wn11p"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; + spBayes = derive2 { name="spBayes"; version="0.4-0"; sha256="1qnn2jpc22594zvqr99m3r8sl5cab1khbcrk8w6i2s91kbwc0qyh"; depends=[abind coda Formula magic]; }; + 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="1.10.0"; sha256="1lr2y1pcbwpggq5fkfnbz76q0iixy9vj23akj2s9a7d6hxs01ya3"; depends=[geometry lpSolveAPI MASS Matrix mvtnorm 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]; }; @@ -9233,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]; }; @@ -9244,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.2"; sha256="0h09xjvq6sq7az5cxkac5840av2vgngp7b05gdrgc26d3x2qvpvm"; 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]; }; - sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.2"; sha256="1zn0nrdlgynxhq48cx8zi8bk2ir6zvfg1pgxr6j479j88q8hcjb3"; depends=[Matrix Rcpp RcppEigen]; }; + 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.2"; sha256="116m32rb1m7bbvkhiwb1270h7jirp3ysck6gij054igqprm4lq74"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; - sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.3"; sha256="1qgnqad6klhzg80hmk48bws0yabd3akw7vs2v3sfrwx4ckl3h4ii"; depends=[Matrix nnet]; }; - sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.3"; sha256="1sh6g1086l040547yajgyp4hq8yzlspdb6jmw4w1sv0zsmca25sv"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; }; + 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]; }; 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=[]; }; @@ -9275,31 +9951,31 @@ in with self; { spatial_tools = derive2 { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[abind doParallel foreach iterators mmap raster rgdal]; }; spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; - spatialEco = derive2 { name="spatialEco"; version="0.1-5"; sha256="04d6dqmayfs19922s1pg1rsi5b4hdj50665qkp02p0wbbnnkhvs4"; depends=[cluster RANN raster RCurl rgeos rms SDMTools sp SpatialPack spatstat spdep yaImpute]; }; + 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.43"; sha256="1jwjgpyy0dpghjwallqvi20bb84ljrn2qmdb35r5l243da511n8f"; depends=[spatstat]; }; - spatstat = derive2 { name="spatstat"; version="1.49-0"; sha256="0il36ljlql7xc00w8czydv529xjmi7c7fb30sr2k9mr7chln64bf"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart tensor]; }; - spatstat_utils = derive2 { name="spatstat.utils"; version="1.3-2"; sha256="0hky45v7hsg1anqvv5i0s6hndms18g5y9fbgy6r59yy7mybh6j4d"; depends=[]; }; - spatsurv = derive2 { name="spatsurv"; version="0.9-14"; sha256="1pd2dz7y64wi7bkw6nlnm6nyzkjk3pfxp2a3fmd3xrrp7fgsy7xk"; 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]; }; + spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; }; + 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.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.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-11"; sha256="15pv5ygaj924fjscm7wffjxyz9krbdh6f70f2vawq2m1w7qs2kd8"; 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]; }; - spduration = derive2 { name="spduration"; version="0.15.1"; sha256="1kjr3vncns91ha1q3q1xp2ss12m80k5hixzccm1ggdc77ha3bjhv"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; + 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]; }; specificity = derive2 { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; }; @@ -9308,65 +9984,66 @@ 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="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[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-29"; sha256="05rw1ck2gf5c0aqpagcfijxghslppa6xdz7pnwanfclwq8ri1xqa"; 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=[]; }; - spider = derive2 { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; }; spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; }; 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.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-39"; sha256="1lyzs7lbhw1pqmb4mr46ncm39wwrmin7qgshsr384j4023qwfqwd"; depends=[sp]; }; + 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.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]; }; splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; }; 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.0"; sha256="1bwc9mygsamlzp4f6a1ahycvwxpwap1bi55rm5y6p5hhr331gckf"; depends=[git2r matlabr neurobase oro_nifti R_utils]; }; + 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.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.0.0"; sha256="0g0c461ab7mshhbxd5qbskk1rxzlq1rl2cgg0xfq00hv6x9nhb8y"; depends=[fields ggplot2 matrixcalc mvtnorm Rcpp RcppArmadillo rgl sp spatstat USAboundaries]; }; - spray = derive2 { name="spray"; version="1.0"; sha256="12iv1sksxmac2ykrb8psfnaa9lzq6djv0a7a1x73jr3nflvrx9bh"; depends=[magic partitions Rcpp]; }; + 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-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]; }; - sqldf = derive2 { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[chron DBI gsubfn proto RSQLite]; }; + spup = derive2 { name="spup"; version="0.1-0"; sha256="1dfdxh45db91rmdws4pq1kbsbcjczz98fbfcmm4vlr0vbvisy9bj"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; + 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]; }; - ss3sim = derive2 { name="ss3sim"; version="0.9.3"; sha256="0l2xd0d4hgz0b42fz7zf5dgd71fm5dsvhys4hg8c7j2nzzzx9hdk"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; }; + 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=[]; }; ssc = derive2 { name="ssc"; version="1.0"; sha256="1hhlpcm1mdwkcxrprk5nc2yi3l69lz13av50y3cyz5vj73jhsg44"; depends=[proxy]; }; @@ -9377,12 +10054,13 @@ in with self; { ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; ssizeRNA = derive2 { name="ssizeRNA"; version="1.2.9"; sha256="1916r0hmhpfa0p1s8myqk8g4i8fgjqkm4wvpb4nf3sl69kfdva95"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; + sskm = derive2 { name="sskm"; version="1.0.0"; sha256="1qji34v66qj4k9axy5i2lf3j5zps8sjhwk3h3mqfln3pi9z6gmv8"; depends=[fpc sparcl]; }; ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; }; ssmrob = derive2 { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[MASS mvtnorm robustbase sampleSelection]; }; ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; }; sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; sspse = derive2 { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; }; - sss = derive2 { name="sss"; version="0.0-14"; sha256="19xq1pj4lrlh68fi2vy8cjg9xhmykwibm9rcg9snfc1qc6kp062x"; depends=[XML]; }; + sss = derive2 { name="sss"; version="0.1-0"; sha256="1qg56g60h8c52l8lpxihxsdgnqkxiag1mzh3p388r9hhff7g3g0k"; depends=[assertthat xml2]; }; ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; }; st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; }; @@ -9390,53 +10068,59 @@ in with self; { staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stable = derive2 { name="stable"; version="1.1.2"; sha256="11irpn0qfblzskdr71991jlmdrbqqqpszppn5pii3lr5hflqqr1d"; depends=[rmutil]; }; stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; }; - stablespec = derive2 { name="stablespec"; version="0.2.3"; sha256="1amscsnsgv1jz1h2arvc5k6lrvzasb58m65lid0qw6k8pvxr9155"; depends=[ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; + 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.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=[]; }; - statar = derive2 { name="statar"; version="0.6.2"; sha256="1p1a17mc6zy5yffybf5q156yyr52mq0z4vmqss05hq3hlaygbbxz"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stringr tidyr]; }; + 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]; }; statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; }; 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]; }; statprograms = derive2 { name="statprograms"; version="0.1.0"; sha256="1jm8vnzccx34rhypkc5brx52k0f0g4z9cckzib43i5fcqd4skib6"; depends=[]; }; statquotes = derive2 { name="statquotes"; version="0.2"; sha256="05qsffbgpgzrhk2nbyfa4a63ad06aj09bzcc11h9dl3sdz6jj7gr"; depends=[stringr tidytext wordcloud]; }; + statsgrokse = derive2 { name="statsgrokse"; version="0.1.4"; sha256="1kxkpddmgyyg51fhmllgahnhwixwv6b95nx0viyqa9c5ngix2gd5"; depends=[httr jsonlite stringr]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; stdReg = derive2 { name="stdReg"; version="2.1"; sha256="0h9h64vk52l7ai50f4pih0qdshsqsx5cm3fj1fjrcpbsfq7azg34"; depends=[data_table survival]; }; - stddiff = derive2 { name="stddiff"; version="1.0"; sha256="0jzl7khnmx0809x9b9nf1n7dj7yknfcblgsf7cpslvglrdzppp42"; depends=[]; }; + stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; }; stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; }; steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; steepness = derive2 { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; }; 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.4.0"; sha256="0ba7pjvavhm1jp5rk6szvi5d6fmy6z7n9z3qs2kxcraww8aa1gg8"; 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.1.3"; sha256="09r95d6xw2b4q063x1j2a6wc9kyzphqc2dhfmlc9crir8fah9ayr"; depends=[glmnet lda Matrix matrixStats Rcpp RcppArmadillo slam stringr]; }; + stm = derive2 { name="stm"; version="1.2.2"; sha256="1kv4plz9i446s8vdrh71lk49gvvl6v5dviym4qh63iwkipgz2fy1"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmBrowser = derive2 { name="stmBrowser"; version="1.0"; sha256="0jfh0c835a2sxn2cqlmwdlzj2g2dmkfl2z3pkv4fc1ajggw2n7g2"; depends=[httr jsonlite rjson stm]; }; 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]; }; @@ -9444,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]; }; - stpm = derive2 { name="stpm"; version="1.6.0"; sha256="1jfx9nkw66dhwrphqx9rpml53plzd5a831qmxz0012fkji9m0423"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; }; + 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="1.0.5"; sha256="1q3b06hkkwdbh3zvd1lbsklwl8jm743bf17fnvdr8npxgpgqci15"; depends=[adegenet ape apex copula ggplot2 Hmisc pegas phangorn RColorBrewer Rcpp reshape2 swfscMisc]; }; + 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-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; }; + 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]; }; @@ -9466,26 +10152,26 @@ in with self; { stringdist = derive2 { name="stringdist"; version="0.9.4.4"; sha256="1qngrhin1kqkjkfla7hp7ch0sfzi4nhaxgyzskmy51sz4llq5n4p"; depends=[]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.1"; sha256="16kkmb933v8pzc4gwz4x2nm51sj82slwpxmmn6p6p8dq5nfzmx5q"; depends=[stringr]; }; stringgaussnet = derive2 { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt GO_db httr igraph limma org_Hs_eg_db pspearman RCurl RJSONIO simone VennDiagram]; }; - stringi = derive2 { name="stringi"; version="1.1.2"; sha256="13i1p6j8mx31hsw2s4c2phm2llrrdakzixkm6i0axsxprri722z5"; depends=[]; }; + stringi = derive2 { name="stringi"; version="1.1.5"; sha256="1wh20is24lmzhcd9487ckv7r19009fyz4is3ianp3ky69vy8a7k5"; depends=[]; }; 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.2.2"; sha256="0y709fcdb12iwwhridbvg4xh0j9kgiz75237caax2wxf01fisahz"; 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]; }; strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; }; - strvalidator = derive2 { name="strvalidator"; version="1.8.0"; sha256="0c87256m6zx0m7qkkcdzfrb2x7gbl364499pj5xnfm274ib9l39x"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 MASS plyr RGtk2 scales]; }; + 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.2"; sha256="05grwm3g2l8sarybrybn6010769y76m4bp5df69r94p7v10wmd29"; 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=[]; }; @@ -9493,12 +10179,15 @@ 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-9"; sha256="1m4ggvg1nyx3l96zfg826sarfmwxcbjwpipqk5q2qsnhd12wymbd"; 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.3"; sha256="0lirf37kb0vgsd3hijhx4pcmx1v59nw3ng53k0kyhgq24r3hzvxw"; 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]; }; superMDS = derive2 { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; @@ -9507,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_BWS2 = derive2 { name="support.BWS2"; version="0.1-0"; sha256="0r5b7arcab2brcq3maizcy53vbbkzcs5n0zirjj3n1id5cdb36zl"; 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=[]; }; @@ -9525,20 +10215,23 @@ 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.6"; sha256="1nxxyny9bzb8p65vgrlfqq9x3r275d8vl99f6yg621hyzpbyz6gf"; depends=[data_table laeken]; }; - survival = derive2 { name="survival"; version="2.40-1"; sha256="10pf0kq0g66k5rgizrvh29mq3r84acljw2jgrv5yp6z38xw23mci"; depends=[Matrix]; }; + 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.2.4"; sha256="083hja5zid3ndfpx77vxm7vyqnjrq8c18vil8mch721fafhajrcd"; depends=[ggplot2 ggpubr gridExtra magrittr maxstat scales survival 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]; }; svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; }; svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; }; svGUI = derive2 { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; }; @@ -9565,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]; }; @@ -9578,47 +10272,56 @@ in with self; { sybilSBML = derive2 { name="sybilSBML"; version="3.0.1"; sha256="1dzx1cdvi4fvdqf5hliwwk3gn5ig2wzzxv2gr92760p9c84hmmrj"; depends=[Matrix sybil]; }; sybilccFBA = derive2 { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; }; 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.11-41"; sha256="077ixxfipc7msrmg0p4v5nhqwn276bj2766h6y5m9gj208xz5d91"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS 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.1"; sha256="1wik7rbnd0a1mq52ziknil6rjyrsmwgyhkzr9pb5c7vxqydp0jnj"; 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-18"; sha256="0sy0v0iz4qzrmazp5j63d62xvlyi9mw5ryd4msd1xmppdl7r453p"; depends=[car lmtest MASS Matrix sandwich]; }; + 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.0"; sha256="15qkjnnyf8fsiknr5jb550v34xs55x6psskbrkvr1vfwvbivkzcf"; depends=[dtt NLP openNLP zoo]; }; + 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=[]; }; @@ -9631,38 +10334,41 @@ in with self; { teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; }; teigen = derive2 { name="teigen"; version="2.2.0"; sha256="0ljm8dz4hndnc37psr7mnl1gbxs1kghygz3cyqzld1xpjwsjc2cz"; depends=[]; }; telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; }; - tempR = derive2 { name="tempR"; version="0.9.9.9"; sha256="1g2rj26a9zm4qbq2k325h112bb6w8qgifhzd1zhc2vql0bk6i18k"; depends=[]; }; + 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]; }; + 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]; }; termstrc = derive2 { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; }; ternvis = derive2 { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[dichromat mapdata maps maptools quadprog]; }; - tesseract = derive2 { name="tesseract"; version="1.3"; sha256="17rk3m4rd2qk8vhnkrnn6sffdlvg1amvawdkfp0fi2ip3p0qcrs4"; depends=[curl digest Rcpp]; }; + tesseract = derive2 { name="tesseract"; version="1.4"; sha256="1ycrclv4njbpwrdmh390pnyaczp7xk0ivkscfbr725mavq6xpvi7"; depends=[curl digest Rcpp]; }; 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.18"; sha256="1lzjs651b4mmjjgzkbdzdl3nk3g3kd5bzzj7ssfqvbkk7kp6g3rq"; depends=[]; }; + 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.3"; sha256="09wiql4fiw5zzilvfa3y6cqxpgifilf52kvvc7svmjc2abh3afz3"; 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=[]; }; textir = derive2 { name="textir"; version="2.0-4"; sha256="1ky22xar980afyydddahppad9m263mxnrdqpj1fcbmdhg8flwjgz"; depends=[distrom gamlr Matrix]; }; - textmineR = derive2 { name="textmineR"; version="2.0.4"; sha256="127ngmzvzsb8pbwv6f4k76jv3aqrmpwpbx29cic39m05zxjxxm7k"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; }; + 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]; }; - textreg = derive2 { name="textreg"; version="0.1.3"; sha256="0wp1yybhcybb77aykk9frrylk4kjn0jc98q488195qzx7m5n7ccw"; depends=[NLP Rcpp tm]; }; + 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]; }; textstem = derive2 { name="textstem"; version="0.0.1"; sha256="09010a5flly5kiifx2jha5zvwncpk1xsgx2idipjnrav01plhin2"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC textshape]; }; @@ -9676,6 +10382,8 @@ in with self; { tglm = derive2 { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; }; 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]; }; @@ -9683,45 +10391,48 @@ 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.2"; sha256="011i352ylq9b4xfcj7h10h7qsqd9qkc1rzc0pr1gf8qjb788p2pd"; depends=[assertthat 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.3.0"; sha256="1fn78ibi9c0a14kr54yca489xjac1j58w8g77il61czqq8bn5hdv"; depends=[curl devtools dplyr ggplot2 lubridate magrittr purrr 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.1.4"; sha256="1flwi9vxq5l92j47z88s50m6k3av2af43bpcmy8j1xkaygic2dlv"; depends=[sp]; }; + tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; }; time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; }; timeDate = derive2 { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; }; 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.5"; sha256="1b3qm46xyrssla11kcxmy9j5bhy9bzcqfvalwny3cgbjmzsc0pa9"; depends=[mnormt]; }; - timeit = derive2 { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; + 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.9.1"; sha256="12q3lbma8w3961apsifikngm17lw9vj2xl29rygdiizmk61ll4ha"; depends=[]; }; + timetools = derive2 { name="timetools"; version="1.11.4"; sha256="0sny0kbadpgaa84xbh0d8blhc8gz2l8gp5f98zfc1jq7m6jm5km8"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; timevis = derive2 { name="timevis"; version="0.4"; sha256="08caa5gilh1c0z41lm3ghf6cpnlsdjfm1v7ha73jxv1655kznmpx"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; }; timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; }; @@ -9736,7 +10447,7 @@ in with self; { tkrgl = derive2 { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; }; tkrplot = derive2 { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; }; tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; - tlm = derive2 { name="tlm"; version="0.1.4"; sha256="041ydlbsn0dxggrvfjfpg2jmns3c4z021f64cl2k1lwmxvqrp265"; depends=[boot]; }; + tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; }; tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; tm = derive2 { name="tm"; version="0.7-1"; sha256="1z76ryka8yd9xwcqgla8v7mgh6wc14mqpmygv958nfy5sf2w4k8q"; depends=[BH NLP Rcpp slam]; }; tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; @@ -9746,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]; }; @@ -9756,14 +10468,14 @@ in with self; { tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; }; tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; }; tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; }; - tnam = derive2 { name="tnam"; version="1.6.2"; sha256="09wqsqjssnzirx387y2mdd6qa38hlbf1d8s0dwzsz2jxx4w8xp01"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; }; + tnam = derive2 { name="tnam"; version="1.6.5"; sha256="0jbwnsnn6875yprmh6y2i0bvr875hfsg7wfsj6ydmjpr5cpqqk56"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; }; tnet = derive2 { name="tnet"; version="3.0.14"; sha256="05cc6jrkjbwxzmgzq30h63xzhlgq8f0l3wx2q54vrv0wpvlvfphn"; depends=[igraph survival]; }; toOrdinal = derive2 { name="toOrdinal"; version="0.0-6"; sha256="13mp6sxjbn1piw2q018nb4hznzsa2c7pkvmlv74f8qsjrvvw1h4x"; depends=[]; }; toaster = derive2 { name="toaster"; version="0.5.5"; sha256="0ga4l3zp422scrgvz701rjznn013vhsbp4gh7v1inqp7kpxafky9"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise network plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; }; tokenizers = derive2 { name="tokenizers"; version="0.1.4"; sha256="1qcsmcd74i39wql9p49g3pzc4flpi8jq9sxia5mcdx054viijgk9"; depends=[Rcpp SnowballC stringi]; }; tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; }; - topicmodels = derive2 { name="topicmodels"; version="0.2-5"; sha256="1kilkwfhs7295w410xv34np1cr1wdwqxq1776mg24z4f8a56ccrw"; depends=[modeltools slam tm]; }; + topicmodels = derive2 { name="topicmodels"; version="0.2-6"; sha256="13z04bgr6nxn5mr7891nm8ryixfp988ad9vmfjy4li9jsyr48q6d"; depends=[modeltools slam tm]; }; topmodel = derive2 { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; @@ -9773,14 +10485,15 @@ in with self; { tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; }; toxboot = derive2 { name="toxboot"; version="0.1.1"; sha256="0sw0mxhcq5k11swlhfpn6xk0nfsambh2yx1721zx75lya27wkmq1"; depends=[data_table tcpl]; }; toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; - tpAUC = derive2 { name="tpAUC"; version="2.0.1"; sha256="066fzlkcdma3id56i9qm3bpq9a9lamqkq00qlz7paqxsfph1rn5k"; depends=[pROC]; }; + tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; tpr = derive2 { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; }; 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]; }; @@ -9791,9 +10504,9 @@ in with self; { translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translateSPSS2R = derive2 { name="translateSPSS2R"; version="1.0.0"; sha256="11qnf44aq0dykcsv29faa9r4fcw9cc9rkgczsqx3mngvg3bilada"; depends=[car data_table e1071 foreign Hmisc plyr stringr tidyr zoo]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; - transport = derive2 { name="transport"; version="0.8-1"; sha256="1lz5gn9rrg1lyxl6l0r2b0vj4756xq0gb41mfg2darww6b4ifx5v"; 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.0.1"; sha256="0gb14f9dfa9slppl2a2bchkli51rprw6wzyzrkxlfqlski0piymf"; depends=[dbarts]; }; + 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]; }; @@ -9801,12 +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]; }; - treethresh = derive2 { name="treethresh"; version="0.1-9"; sha256="1fmnmfgaysbnqn002zgcm1d2kpzc7is2k2z859hj0h0ll3yjp592"; depends=[EbayesThresh wavethresh]; }; + 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-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=[]; }; @@ -9822,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]; }; @@ -9830,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=[]; }; @@ -9840,33 +10554,36 @@ 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-38"; sha256="1gs6i28v1v349z7ficzyy9pfrm3aw5x8pldrihm3wg8wvs22jwv5"; 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.5-12"; sha256="0z9354mlj0nh829ccwwhs53q5myfp31x9n6kv1k8gmvz5xma40kh"; depends=[cubature]; }; + 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]; }; + tsxtreme = derive2 { name="tsxtreme"; version="0.3.1"; sha256="0cfska93ws5x11pslcdhf5rrshxzh6ddlgmfkl9zlci2rqdbwz35"; depends=[evd MASS mvtnorm]; }; ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; }; ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; }; tth = derive2 { name="tth"; version="4.3-2-1"; sha256="19rvmyprl1nk9mmngk6dax8rnli10msfvm3vzp86pbdjxnsh3hjc"; depends=[]; }; 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.7.0"; sha256="1fcls8q4ihz50wnar87047i8il32a1nrxw67nv9wjqfi02z74c2p"; 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.1"; sha256="0m0fc8bx7645ddbcsvgwamfsd7rklz05wi8yc9p0kf2k5sbn48r3"; depends=[signal]; }; + tuneR = derive2 { name="tuneR"; version="1.3.2"; sha256="1xk66rrahfvvbjzpx2mkbmlmyj0l3vidd8kz24f72wh56gbdgbsa"; depends=[signal]; }; tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; turboEM = derive2 { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; }; turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; }; @@ -9878,7 +10595,9 @@ 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]; }; twoStageGwasPower = derive2 { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; }; twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; @@ -9892,11 +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-6"; sha256="1nd6miz9scc6llckafl73pxiqh0ycfhlsmn2l0swcvjxpj3kb0zv"; depends=[]; }; - umx = derive2 { name="umx"; version="1.5.0"; sha256="0b011ym5hai9c7r1lgr9y3yhscrwq77h6q6llkhklkz35qbz4056"; depends=[DiagrammeR knitr MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl sfsmisc]; }; + 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]; }; @@ -9906,53 +10628,58 @@ 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]; }; - units = derive2 { name="units"; version="0.4-2"; sha256="0c7nys38157wimmqqz7hglar343nfqkvbaf0bl6by5lbql0kj2vq"; 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=[]; }; - unmarked = derive2 { name="unmarked"; version="0.11-0"; sha256="0n5cm17ns464dxd9sdma6f12x1phnvv05aiwgxsj499lk6jazf0l"; 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]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; - uqr = derive2 { name="uqr"; version="0.2.0"; sha256="03v12w1ssfpp3h2aja4wlv6f2x1rplpm3dpmrq78bpyanban2gwf"; depends=[gtools Hmisc]; }; + uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; }; 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.5-2"; sha256="0i5nrfq7hgq3rx43s6p8bxc4yqqjkvn42bbyv6hndzkagp06d2vj"; depends=[car diptest fBasics GGally ggplot2 ggrepel GPArotation gridExtra 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=[]; }; - utiml = derive2 { name="utiml"; version="0.1.1"; sha256="118wa66s3cfp00yc9nngf7khaaswrrfj5pb71n66lnxwynf8mdgm"; depends=[mldr]; }; + 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=[]; }; - validann = derive2 { name="validann"; version="1.2.0"; sha256="1g8svbxyy56kmzm8yxwk9jqwnwsmlvxm87ss7l88arjl5kqgvasq"; depends=[moments]; }; - validate = derive2 { name="validate"; version="0.1.5"; sha256="166605h47bgcx1sf1rlvvgay00v8ykzw55zbfc5jnw9h8j8f7wsb"; depends=[settings yaml]; }; + valaddin = derive2 { name="valaddin"; version="0.1.0"; sha256="19j3vwg8nrsnqhdvn6865k7pf79cchlf1vkdrlz7w26lnfyzzv7p"; depends=[dplyr lazyeval purrr]; }; + 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.1"; sha256="0pzkaljlwqpk7n6z4f5lvy2f06a1bjsj6b20sxpd64rh302vn6hi"; depends=[BH broom dplyr ggplot2 lazyeval purrr Rcpp readr shiny 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=[]; }; varSelRF = derive2 { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; }; varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; }; - varbvs = derive2 { name="varbvs"; version="2.0.0"; sha256="1bi11qcgnw263p1vv25nhcf9b0vf04bl6hpb9agw1rp1f7c9xsrb"; depends=[lattice latticeExtra]; }; + 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.8.6"; sha256="0jfwrpg85w10m6y4pk06wrbmnvzjby1fiarn3i14dgglba8jcrbl"; 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]; }; @@ -9960,78 +10687,89 @@ 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-2"; sha256="12wf64izrpq9z3ix7mgm5421mq0xsm8dw5qblvcrz452nfhjf5w9"; depends=[cluster lattice MASS mgcv permute]; }; - vegan3d = derive2 { name="vegan3d"; version="1.0-1"; sha256="19xwbmnmhdvm8vsfjv17bhbjrlsr2wwgjj0nflw8kgmlz0d2f70k"; depends=[cluster rgl scatterplot3d vegan]; }; + vegan = derive2 { name="vegan"; version="2.4-3"; sha256="15zcxfix2d854897k1lr0sfmj2n00339nlsppcr3zrb238lb2mi5"; depends=[cluster lattice MASS mgcv permute]; }; + 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.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]; }; violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; - vipor = derive2 { name="vipor"; version="0.4.4"; sha256="0p1z9a3fazl78pj8a1i2n62v8hrs8cinq82j9wpawhmfkn3dggss"; depends=[]; }; - viridis = derive2 { name="viridis"; version="0.3.4"; sha256="1a9hqn2pccpc51vh8ghw698ni6xzdnp8v0n8kgjh51nlz5hhc87j"; depends=[ggplot2 gridExtra]; }; - viridisLite = derive2 { name="viridisLite"; version="0.1.3"; sha256="1b0fhj8i1m9jsz91gzag60k7vy7kk5xkdg31rc3h3spq96l66psp"; depends=[]; }; + vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; + 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.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.30"; sha256="1i61sv47y3g9hs9bkx9wcirapy30hs66013w5k7116wqsp0dy3b2"; 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.5"; sha256="1m6hvvf2xji3i3fs19zf54l16wgbi7hwmjxpwfyvh9w6lb6swlnz"; depends=[doParallel dtw fftw foreach jpeg maps pbapply 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.5"; sha256="0g7h1xgij107l5n3551m3ql5m3hn79a7ajv6grk05xf507fy1bb3"; depends=[raster rgdal sp]; }; - waterData = derive2 { name="waterData"; version="1.0.6"; sha256="1k1paifhngy97ik399dndm7m5hm6r935yipiapgpchzsvl5nwwva"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; }; + water = derive2 { name="water"; version="0.6"; sha256="0f569lcr68dk383cacgagyhkbyfh9aqgnn9w4c2y5x9bj3awjvq9"; depends=[raster rgdal sp]; }; + 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]; }; @@ -10046,55 +10784,64 @@ 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.1.1.1"; sha256="10h01a4slxcc6hllwh4wfayr9wfyaxijs0v875ncm97zb58gwl7h"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; - webp = derive2 { name="webp"; version="0.2"; sha256="1nwb30wyff5jynn0ppmg5ybw6q2ha9smnk69fi182grm3znf85as"; depends=[]; }; + 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=[]; }; weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; }; weightedScores = derive2 { name="weightedScores"; version="0.9.5.1"; sha256="118hzwaarcb8pk2zz83m6zzzndlpbbzb7gz87vc7zggpa998k1gr"; depends=[mvtnorm rootSolve]; }; - weightr = derive2 { name="weightr"; version="1.0.0"; sha256="03f6zif3a9cnshkchi5ak7s6mcsdyrqcij80aamk8cgb4s4nhc2x"; depends=[]; }; + 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]; }; whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; }; - wicket = derive2 { name="wicket"; version="0.2.0"; sha256="0wyd72w1l84kxzfy0hhrzr6ipxgzh2gfwldlmv0h79r5icjk17z3"; depends=[BH Rcpp]; }; + 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.1"; sha256="05fcdrv2splhxkr3xgp14mwn36z3sn5hjq4mjibkgh44x7av4rf8"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; }; + 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.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.1"; sha256="00fmbz8vdvf712plm2ip0jfiq3wpj7f4l6wn3i0x0d7fggkfhm1r"; depends=[]; }; - word_alignment = derive2 { name="word.alignment"; version="1.0.4"; sha256="0riz61wib1dbm5zb087xd31vkmw73nz3g82gh59mp673ancfahpd"; depends=[data_table openxlsx quanteda]; }; + 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]; }; wordcloud2 = derive2 { name="wordcloud2"; version="0.2.0"; sha256="0ylsmijrym61s1vhvf8csimznd1yg497xa3yign4bgi5jx4k64ny"; depends=[base64enc htmlwidgets]; }; @@ -10102,42 +10849,46 @@ 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.3"; sha256="1xmb245ps02s43r0ysx87wqjdr174163x5cn4x1y226qbbdclmmk"; depends=[dplyr lazyeval magrittr tidyr]; }; - wrapr = derive2 { name="wrapr"; version="0.1.0"; sha256="1kssir24az6l39lp26g13gacmgarmhdgmc2vlpgfjv37x5lpxk3y"; depends=[]; }; + wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; }; + 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-1"; sha256="103i3a741ik61jzp5zbhf0f6lfchlafq1gyjyy98jgw0cxc6ckcv"; 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.0"; sha256="1q4slnwn690z6ham0b2vy1rc0vkbrlj9bf0wkd6v86jag7wjr4fw"; depends=[Rcpp]; }; - wtcrsk = derive2 { name="wtcrsk"; version="1.6"; sha256="048gs469rdj85sid1gfj6yhh37w7zf9xv4fj8pd48c8ww3v7f61p"; depends=[]; }; + 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]; }; - xergm = derive2 { name="xergm"; version="1.7.3"; sha256="0pr6qm8q039j9c9vibm7inb5qsvl4x54djckm7087zymvriyfmvl"; depends=[btergm GERGM rem tnam xergm_common]; }; - xergm_common = derive2 { name="xergm.common"; version="1.7.4"; sha256="1mrd5sa6bwv5lw6q0q9xj6zacs41522r69bm1ijd14gx5k1gwn7s"; depends=[ergm network]; }; + 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]; }; xkcd = derive2 { name="xkcd"; version="0.0.5"; sha256="1cq4n7w4adj24qq658z15jkqvrn4pd5abxpcsdkzb2cq98m69iis"; depends=[extrafont ggplot2 Hmisc]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; + xlsimple = derive2 { name="xlsimple"; version="0.0.1"; sha256="1x0b2pb1sg2sqmh4z03bchsc9fhcphi6mxk4nbb6my2cr0kqrrdq"; depends=[]; }; xlsx = derive2 { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; }; xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; @@ -10145,51 +10896,59 @@ 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.0"; sha256="140dp3chsd9mlnbysachck3547zgcpsbrgqhnrdxp348pny0l94b"; depends=[ggplot2 lpSolveAPI reshape2 shiny]; }; + 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=[]; }; - xyz = derive2 { name="xyz"; version="0.1"; sha256="0hynmrbi1f0ijv2g0va8bnr84ls2d8prl32f76mmfq6a3laqrj9i"; depends=[Rcpp]; }; + xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; }; yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.2"; sha256="130zp8na3d50b49bcsqzsmjy2sif865h6vfpc5zmp1fhvkyykkfd"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; }; yaImpute = derive2 { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; depends=[]; }; yacca = derive2 { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; }; yaml = derive2 { name="yaml"; version="2.1.14"; sha256="0x88xicrf7vwp77xgan27mnpdljhpkn0pz5kphnwqi3ddy25k9a1"; depends=[]; }; - yarrr = derive2 { name="yarrr"; version="0.1.4"; sha256="171z69jgva1afzmcjk62g9mr18z9r955rizvsp46bcljj74vfq39"; depends=[BayesFactor jpeg]; }; + 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.3"; sha256="0x7l4sgbixlz6x28gm3sk7x65n3p8jcm5ck3i10vy49f1fsvkf80"; depends=[Rcpp RcppArmadillo]; }; - zoeppritz = derive2 { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; }; + 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.7-14"; sha256="167m142rwwfy8b9hnfc3fi28dcsdjk61g1crqhll6sh5xmgnfn28"; depends=[lattice]; }; + 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 40d8e2b1b436..3de25dd1478d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -262,6 +262,7 @@ let h5 = [ pkgs.hdf5-cpp pkgs.which ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; + imager = [ pkgs.x11 ]; iBMQ = [ pkgs.gsl_1 ]; igraph = [ pkgs.gmp ]; JavaGD = [ pkgs.jdk ]; @@ -280,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 ]; @@ -408,7 +410,6 @@ let Cairo = [ pkgs.pkgconfig ]; Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; qtutils = [ pkgs.qt4 ]; - ecoretriever = [ pkgs.which ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; rPython = [ pkgs.which ]; @@ -495,7 +496,6 @@ let "fscaret" "fSRM" "gcmr" - "Geneland" "GeoGenetix" "geomorph" "geoR" @@ -566,7 +566,6 @@ let "plotSEMM" "plsRbeta" "plsRglm" - "pmg" "PopGenReport" "poppr" "powerpkg" @@ -629,7 +628,6 @@ let "rioja" "ripa" "rite" - "rnbn" "RNCEP" "RQDA" "RSDA" @@ -661,7 +659,6 @@ let "SYNCSA" "SyNet" "tcltk2" - "TDMR" "TED" "TestScorer" "TIMP" @@ -684,517 +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 - "AffyTiling" # build is broken - "agRee" # depends on broken package BRugs-0.8-6 - "aLFQ" # depends on broken package bio3d-2.3-1 - "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 - "ArrayExpressHTS" # build is broken - "arrayQualityMetrics" # build is broken - "auRoc" # depends on broken package OpenMx-2.7.4 - "BatchQC" # 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 - "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 - "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 - "curlconverter" # depends on broken package V8-1.2 - "cytofkit" # depends on broken package flowCore-1.38.2 - "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 - "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 - "DecisionCurve" # 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 - "DNAprofiles" # build is broken - "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 - "exprso" # build is broken - "fastR" # build is broken - "fdq" # depends on broken package gdtools-0.1.3 - "Fgmutils" # depends on broken package gdtools-0.1.3 - "flan" # build is broken - "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 - "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 - "ForestTools" # depends on broken package imager-0.31 - "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 - "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 - "ggiraph" # depends on broken package gdtools-0.1.3 - "ggiraphExtra" # depends on broken package gdtools-0.1.3 - "ggseas" # 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 - "goldi" # build is broken - "googleformr" # build is broken - "gpg" # build is broken - "gpuR" # build is broken - "gputools" # depends on broken package cudatoolkit-8.0.61 - "GraphPAC" # 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 - "HierO" # build is broken - "HilbertVisGUI" # build is broken - "HiPLARM" # build is broken - "hisse" # depends on broken package animation-2.4 - "homomorpheR" # depends on broken package sodium-0.4 - "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 - "imager" # build is broken - "immunoClust" # depends on broken package r-flowCore-1.38.2 - "inSilicoMerging" # build is broken - "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 - "lawn" # depends on broken package V8-1.2 - "LCMCR" # build is broken - "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 - "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 - "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 - "MMDiff" # depends on broken package r-DiffBind-2.0.9 - "mmnet" # 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 - "nlts" # build is broken - "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 - "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 - "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 - "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 - "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 - "RBerkeley" # build is broken - "RbioRXN" # depends on broken package ChemmineR-2.24.2 - "Rblpapi" # build is broken - "Rchemcpp" # depends on broken package ChemmineR-2.24.2 - "rchess" # depends on broken package V8-1.2 - "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 - "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 - "rhdf5" # build is broken - "RhpcBLASctl" # 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 - "RMySQL" # build is broken - "RnavGraph" # build is broken - "rnetcarto" # build is broken - "ROI_plugin_cplex" # depends on broken package Rcplex-0.3-3 - "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-26 - "Rolexa" # build is broken - "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 - "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 - "Sabermetrics" # build is broken - "sapFinder" # build is broken - "sbrl" # build is broken - "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 - "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 - "SnakeCharmR" # build is broken - "sodium" # build is broken - "soilphysics" # depends on broken package rpanel-1.1-3 - "sortinghat" # build is broken - "spade" # depends on broken package r-flowCore-1.38.2 - "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 - "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 - "textreadr" # build is broken - "textTinyR" # build is broken - "TFBSTools" # depends on broken package CNEr-1.8.3 - "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 - "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 - "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 - "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/r-modules/generate-shell.nix b/pkgs/development/r-modules/generate-shell.nix index 126ab7422925..beb378275087 100644 --- a/pkgs/development/r-modules/generate-shell.nix +++ b/pkgs/development/r-modules/generate-shell.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { buildCommand = "exit 1"; buildInputs = [ wget ]; - nativeBuildInputs = [ + + nativeBuildInputs = [ (rWrapper.override { packages = with rPackages; [ data_table diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix new file mode 100644 index 000000000000..dd9b0e9c5381 --- /dev/null +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -0,0 +1,33 @@ +{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages }: + +stdenv.mkDerivation rec { + + name = rstudio.name + "-wrapper"; + + buildInputs = [makeWrapper R rstudio] ++ recommendedPackages ++ packages; + + unpackPhase = ":"; + + # rWrapper points R to a specific set of packages by using a wrapper + # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets + # R_LIBS_SITE. Ordinarily, it would be possible to make RStudio use + # this same set of packages by simply overriding its version of R + # with the wrapped one, however, RStudio internally overrides + # R_LIBS_SITE. The below works around this by turning R_LIBS_SITE + # into an R file (fixLibsR) which achieves the same effect, then + # uses R_PROFILE_USER to load this code at startup in RStudio. + fixLibsR = "fix_libs.R"; + installPhase = '' + mkdir $out + echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/${fixLibsR} + echo -n ".libPaths(c(.libPaths(), \"" >> $out/${fixLibsR} + echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR} + echo -n "\"))" >> $out/${fixLibsR} + echo >> $out/${fixLibsR} + makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR} + ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 25c765060279..3b9a9b184506 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -1,19 +1,12 @@ { stdenv, R, makeWrapper, recommendedPackages, packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = R.name + "-wrapper"; buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages; unpackPhase = ":"; - # This filename is used in 'installPhase', but needs to be - # referenced elsewhere. This will be relative to this package's - # path. - passthru = { - fixLibsR = "fix_libs.R"; - }; - installPhase = '' mkdir -p $out/bin cd ${R}/bin @@ -21,17 +14,6 @@ stdenv.mkDerivation rec { makeWrapper ${R}/bin/$exe $out/bin/$exe \ --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" done - # RStudio (and perhaps other packages) overrides the R_LIBS_SITE - # which the wrapper above applies, and as a result packages - # installed in the wrapper (as in the method described in - # https://nixos.org/nixpkgs/manual/#r-packages) aren't visible. - # The below turns R_LIBS_SITE into some R startup code which can - # correct this. - echo "# Autogenerated by wrapper.nix from R_LIBS_SITE" > $out/${passthru.fixLibsR} - echo -n ".libPaths(c(.libPaths(), \"" >> $out/${passthru.fixLibsR} - echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${passthru.fixLibsR} - echo -n "\"))" >> $out/${passthru.fixLibsR} - echo >> $out/${passthru.fixLibsR} ''; meta = { diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 378f148ca6ac..17f09724d189 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,30 +1,30 @@ -{ buildRubyGem, 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.0.8"; + version = "2.3.1"; - sha256 = "0ikpf2g01izadjpdnc4k2rb9v4g11f1jk2y5alxc7n7rxjkwdc66"; + src = fetchFromGitHub { + owner = "manveru"; + repo = "bundix"; + rev = version; + 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 f3737afdb222..53e47630fbb7 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.14.4"; - sha256 = "1hafmb7p41pm40a2z7f4x5zpgrb72xvgwlvkxnflmzqkvq2prkfv"; + version = "1.15.1"; + sha256 = "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 02fe9f50558e..204c74436008 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,15 +20,26 @@ { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi -, cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl -, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc +, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl +, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem }@args: let v8 = v8_3_16_14; + + rainbow_rake = buildRubyGem { + name = "rake"; + gemName = "rake"; + remotes = ["https://rubygems.org"]; + sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + type = "gem"; + version = "12.0.0"; + }; in { + atk = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + bundler = attrs: let templates = "${attrs.ruby.gemPath}/gems/${attrs.gemName}-${attrs.version}/lib/bundler/templates/"; @@ -44,6 +55,10 @@ in ''; }; + cairo = attrs: { + buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp]; + }; + capybara-webkit = attrs: { buildInputs = [ qt48 ]; }; @@ -72,12 +87,36 @@ in buildInputs = [ gpgme ]; }; + gio2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + + glib2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + + gtk2 = attrs: { + buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp]; + # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly + CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; + }; + + gobject-introspection = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; }; + hitimes = attrs: { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; }; + # disable bundle install as it can't install anything in addition to what is + # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R + # to compensate for read-only files in site_template in nix store. + jekyll = attrs: { + postInstall = '' + installPath=$(cat $out/nix-support/gem-meta/install-path) + sed -i $installPath/lib/jekyll/commands/new.rb \ + -e 's@Exec.run("bundle", "install"@Exec.run("true"@' \ + -e 's@FileUtils.cp_r site_template + "/.", path@FileUtils.cp_r site_template + "/.", path; FileUtils.chmod_R "u+w", path@' + ''; + }; + # note that you need version >= v3.16.14.8, # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161 @@ -119,10 +158,18 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + pango = attrs: { + buildInputs = [ gtk2 xlibs.libXdmcp pcre pkgconfig xlibs.libpthreadstubs ]; + }; + patron = attrs: { buildInputs = [ curl ]; }; + pcaprub = attrs: { + buildInputs = [ libpcap ]; + }; + pg = attrs: { buildFlags = [ "--with-pg-config=${postgresql}/bin/pg_config" @@ -133,6 +180,10 @@ in buildInputs = [ openssl ]; }; + rainbow = attrs: { + buildInputs = [ rainbow_rake ]; + }; + rbnacl = spec: { postInstall = '' sed -i $(cat $out/nix-support/gem-meta/install-path)/lib/rbnacl.rb -e "2a \ @@ -195,6 +246,14 @@ in ''; }; + rb-readline = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace lib/rbreadline.rb \ + --replace 'infocmp' '${ncurses.dev}/bin/infocmp' + ''; + }; + timfel-krb5-auth = attrs: { buildInputs = [ kerberos ]; }; @@ -211,7 +270,7 @@ in buildInputs = [ curl ]; }; - tzinfo = attrs: { + tzinfo = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { dontBuild = false; postPatch = '' substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \ diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix deleted file mode 100644 index 394c60e0fdd7..000000000000 --- a/pkgs/development/tools/activator/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, unzip, jre }: - -stdenv.mkDerivation rec { - - name = "${pname}-${version}"; - pname = "activator"; - version = "1.3.12"; - - src = fetchurl { - url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip"; - sha256 = "0c7mxznfgvywnyvr8l5jh4cp67ila5cdq14p6jwrkh6lwif3ah1p"; - }; - - buildInputs = [ unzip jre ]; - - installPhase = '' - mkdir -p $out/{bin,lib,libexec} - mv repository $out/lib - sed -i -e "s,declare.*activator_home.*=.*,declare -r activator_home=$out/lib/,g" bin/activator - mv bin/activator $out/bin - mv libexec/activator-launch-${version}.jar $out/libexec - ''; - - meta = with stdenv.lib; { - description = "A scafollding tool for setting up reactive projects"; - homepage = "http://typesafe.com/activator"; - license = licenses.asl20; - maintainers = with maintainers; [ edwtjo cko ]; - platforms = with platforms; unix; - }; - -} diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 049ea51b8f90..feb6865566f0 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,12 +1,16 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre }: +{ stdenv, lib, fetchurl, makeWrapper, jre +, disableRemoteLogging ? true +}: +with stdenv.lib; stdenv.mkDerivation rec { - name = "ammonite-repl-${version}"; - version = "0.8.2"; + name = "ammonite-${version}"; + version = "1.0.0"; + scalaVersion = "2.12"; src = fetchurl { - url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/2.12-${version}"; - sha256 = "0fgwqdvk0nljd6xm16r8qdhjcp7ix4vx91w5ab856hllf4911120"; + url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; + sha256 = "0d74b3aasgg4ap5ishzzm4jbf1k4dxv7gzd88d69miyapsaa4p0c"; }; propagatedBuildInputs = [ jre ] ; @@ -18,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/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index e25cb696a656..ce9ca76a43b2 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre }: stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.76.1"; + version = "1.79"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1l46bmzm5syfr9m5l0bqkj8lcyrynhw8gjf95s4fwhp2b7f0zisv"; + sha256 = "0vgh4zx191d7mcmiilkhcbd9jkspfkppl7l4y5451walvs9vd19b"; }; + buildInputs = [ pcre ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; - makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; + makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg HAVE_RULES=yes''; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index c1cb4412b9ca..e5f9fa26938c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }: +{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild }: with lib; stdenv.mkDerivation rec { - version = "0.39.0"; + version = "0.49.1"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "05a0kvhlakm7c7n19npg77rj52cz6282290126sfn0qq2059zhli"; + sha256 = "1fjqdyl72srla7ysjg0694ym5d3f2rdl5gfq8r9ay4v15jcb5dg6"; }; installPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml libelf ] + buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 14efe29442bc..1ce0ca161536 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,20 +9,20 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20160501"; - slang = "Aluminium"; + version = "20170501"; + slang = "Phosphorus"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "02z4d1lg2cs4hgbjx74crfrabv39dyhdrq5lvhv0q3hx5c8w7p90"; + sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1"; }; why2 = fetchurl { - url = "http://why.lri.fr/download/why-2.34.tar.gz"; - sha256 = "1335bhq9v3h46m8aba2c5myi9ghm87q41in0m15xvdrwq5big1jg"; + url = "http://why.lri.fr/download/why-2.37.tar.gz"; + sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoconf makeWrapper ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph @@ -29,7 +30,8 @@ stdenv.mkDerivation rec { ]; - enableParallelBuilding = true; + # Experimentally, the build segfaults with high core counts + enableParallelBuilding = false; unpackPhase = '' tar xf $src @@ -39,7 +41,8 @@ stdenv.mkDerivation rec { buildPhase = '' cd frama* ./configure --prefix=$out - make -j$NIX_BUILD_CORES + # It is not parallel safe + make make install cd ../why* FRAMAC=$out/bin/frama-c ./configure --prefix=$out diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff index 7ab2b32de1e7..737cad0cda4f 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 000000000000..ee9fbb111969 --- /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/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 586e9d5cd5d3..bf1d1357f5e7 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,24 +1,34 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchFromGitHub, ant, jdk }: -stdenv.mkDerivation { - name = "jdepend-2.9"; - buildInputs = [unzip] ; +stdenv.mkDerivation rec { + name = "jdepend-${version}"; + version = "2.9.1"; - src = fetchurl { - url = http://www.clarkware.com/software/jdepend-2.9.zip ; - sha256 = "1915fk9w9mjv9i6hlkn2grv2kjqcgn4xa8278v66f1ix5wpfcb90"; + src = fetchFromGitHub { + owner = "clarkware"; + repo = "jdepend"; + rev = version; + sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p"; }; + nativeBuildInputs = [ ant jdk ]; + buildPhase = "ant jar"; + installPhase = '' - mkdir -p $out - cp -R * $out + mkdir -p $out/bin $out/share + install dist/${name}.jar $out/share + + cat > "$out/bin/jdepend" < DARWIN_10_10, but I have no way +- to test for that. Hence '==' rather than '>=' in the version +- test above. */ +-void __bzero ( void* s, UWord n ); +-void __bzero ( void* s, UWord n ) +-{ +- (void) VG_(memset)( s, 0, n ); +-} +- +-#endif +- +- + /*--------------------------------------------------------------------*/ + /*--- end ---*/ + /*--------------------------------------------------------------------*/ + diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 045272e19d37..94960e1b74da 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1"; }; - propagatedBuildInputs = with pythonPackages; [ futures requests2 six tqdm4 ]; + propagatedBuildInputs = with pythonPackages; [ futures requests six tqdm ]; checkPhase = '' python test_b2_command_line.py test diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 6ecf6546e361..1e84a05cc85b 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,43 +1,31 @@ -{ stdenv, fetchgit, cmake, expat }: +{ stdenv, fetchgit, cmake, expat, qt5, boost }: stdenv.mkDerivation rec { name = "boomerang-${version}"; - version = "0.3.2alpha"; + version = "0.3.99-alpha-2016-11-02"; src = fetchgit { url = "https://github.com/nemerle/boomerang.git"; - rev = "78c6b9dd33790be43dcb07edc549161398904006"; - sha256 = "1n49wx2v9r40mh5kdkspqvc8rccpb4s004qxqvn4fwc59dm0pqbs"; + rev = "f95d6436845e9036c8cfbd936731449475f79b7a"; + sha256 = "1q3q92lfj24ij5sxdbdhcqyan28r6db1w80yrks4csf9zjij1ixh"; }; - buildInputs = [ cmake expat ]; + buildInputs = [ cmake expat qt5.qtbase boost ]; + + patches = [ ./fix-install.patch ./fix-output.patch ]; postPatch = '' - sed -i -e 's/-std=c++0x/-std=c++11 -fpermissive/' CMakeLists.txt + substituteInPlace loader/BinaryFileFactory.cpp \ + --replace '"lib"' '"../lib"' - # Hardcode library base path ("lib/" is appended elsewhere) - sed -i -e 's|::m_base_path = "|&'"$out"'/|' loader/BinaryFileFactory.cpp - # Deactivate setting base path at runtime - sed -i -e 's/m_base_path *=[^}]*//' include/BinaryFile.h + substituteInPlace ui/DecompilerThread.cpp \ + --replace '"output"' '"./output"' - # Fix up shared directory locations - shared="$out/share/boomerang/" - find frontend -name '*.cpp' -print | xargs sed -i -e \ - 's|Boomerang::get()->getProgPath()|std::string("'"$shared"'")|' + substituteInPlace boomerang.cpp \ + --replace 'progPath("./")' "progPath(\"$out/share/boomerang/\")" - cat >> loader/CMakeLists.txt <> CMakeLists.txt < +Date: Thu, 30 Mar 2017 10:06:03 -0500 +Subject: [PATCH] cmake: add install bits + +--- + CMakeLists.txt | 3 +++ + loader/CMakeLists.txt | 2 ++ + ui/CMakeLists.txt | 2 ++ + 3 files changed, 7 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 826fe307..740861db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,3 +113,6 @@ SET_PROPERTY(TARGET boom_base PROPERTY CXX_STANDARD_REQUIRED ON) + + ADD_SUBDIRECTORY(loader) + ADD_SUBDIRECTORY(ui) ++ ++INSTALL(DIRECTORY signatures DESTINATION share/boomerang) ++INSTALL(DIRECTORY frontend/machine DESTINATION share/boomerang/frontend) +diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt +index b371d366..dcf715fd 100644 +--- a/loader/CMakeLists.txt ++++ b/loader/CMakeLists.txt +@@ -6,6 +6,8 @@ macro(BOOMERANG_ADD_LOADER name) + endif() + qt5_use_modules(${target_name} Core) + set_target_properties(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/out/lib") ++ install(TARGETS "${target_name}" ++ LIBRARY DESTINATION lib) + endmacro() + + BOOMERANG_ADD_LOADER(Elf elf/ElfBinaryFile.cpp elf/ElfBinaryFile.h) +diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt +index f6fe3271..8729b522 100644 +--- a/ui/CMakeLists.txt ++++ b/ui/CMakeLists.txt +@@ -26,3 +26,5 @@ boom_base frontend db type boomerang_DSLs codegen util boom_base + ${CMAKE_THREAD_LIBS_INIT} boomerang_passes + ) + qt5_use_modules(boomerang Core Xml Widgets) ++ ++INSTALL(TARGETS boomerang DESTINATION bin) +-- +2.11.0 + diff --git a/pkgs/development/tools/boomerang/fix-output.patch b/pkgs/development/tools/boomerang/fix-output.patch new file mode 100644 index 000000000000..18fbe74177b3 --- /dev/null +++ b/pkgs/development/tools/boomerang/fix-output.patch @@ -0,0 +1,24 @@ +From f3f5f888a1b1fe72ea8fc8cc96ef4ee386011e1c Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 30 Mar 2017 11:21:38 -0500 +Subject: [PATCH] don't default to writing to program directory + +--- + boomerang.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/boomerang.cpp b/boomerang.cpp +index 5951ed91..b592f482 100644 +--- a/boomerang.cpp ++++ b/boomerang.cpp +@@ -601,7 +601,6 @@ int Boomerang::processCommand(QStringList &args) { + */ + void Boomerang::setProgPath(const QString &p) { + progPath = p + "/"; +- outputPath = progPath + "/output/"; // Default output path (can be overridden with -o below) + } + + /** +-- +2.11.0 + diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 240d24961e00..89c1b560eaca 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/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index bdd50421c1f7..5490790fe385 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.3.9"; in +let version = "3.5.0"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82"; + sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 16e31eaf5a8a..dcdc55f0aef3 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper }: +{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; meta = with stdenv.lib; { homepage = http://github.com/bazelbuild/bazel/; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1fwfahkqi680zyxmdriqj603lpacyh6cg6ff25bn9bkilbfj2anm"; + sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb"; }; sourceRoot = "."; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { zip unzip makeWrapper + which ]; # These must be propagated since the dependency is hidden in a compressed @@ -58,6 +59,10 @@ stdenv.mkDerivation rec { buildPhase = '' export TMPDIR=/tmp ./compile.sh + ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ + --spawn_strategy=standalone \ + --genrule_strategy=standalone + cp bazel-bin/scripts/bazel-complete.bash output/ ''; # Build the CPP and Java examples to verify that Bazel works. @@ -76,6 +81,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mv output/bazel $out/bin wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin" + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv output/bazel-complete.bash $out/share/bash-completion/completions/ + cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix new file mode 100644 index 000000000000..cddb1a90765a --- /dev/null +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }: + +stdenv.mkDerivation rec { + name = "buck-${version}"; + version = "v2017.05.31.01"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "buck"; + rev = "0b8b3828a11afa79dc128832cb55b106f07e48aa"; + sha256 = "1g3yg8qq91cdhsq7zmir7wxw3767l120f5zhq969gppdw9apqy0s"; + }; + + patches = [ ./pex-mtime.patch ]; + + postPatch = '' + grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g" + ''; + + buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ]; + nativeBuildInputs = [ makeWrapper ]; + + targets = [ "buck" "buckd" ]; + + buildPhase = '' + ant + + for exe in ${toString targets}; do + ./bin/buck build //programs:$exe + done + ''; + + installPhase = '' + for exe in ${toString targets}; do + install -D -m755 buck-out/gen/programs/$exe.pex $out/bin/$exe + wrapProgram $out/bin/$exe \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}" + done + ''; + + meta = with stdenv.lib; { + homepage = https://buckbuild.com/; + description = "A high-performance build tool"; + maintainers = [ maintainers.jgertm ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/buck/pex-mtime.patch b/pkgs/development/tools/build-managers/buck/pex-mtime.patch new file mode 100644 index 000000000000..b8726e64a604 --- /dev/null +++ b/pkgs/development/tools/build-managers/buck/pex-mtime.patch @@ -0,0 +1,13 @@ +diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py +index 76459ce23..eff411b20 100644 +--- a/third-party/py/pex/pex/common.py ++++ b/third-party/py/pex/pex/common.py +@@ -328,4 +328,7 @@ class Chroot(object): + def zip(self, filename, mode='wb'): + with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf: + for f in sorted(self.files()): +- zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED) ++ path = os.path.join(self.chroot, f) ++ instant = 615532801 ++ os.utime(path, (instant, instant)) ++ zf.write(path, arcname=f, compress_type=zipfile.ZIP_DEFLATED) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ed24e917a1cb..2ed436981e00 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -5,17 +5,19 @@ let buildInputs = [ makeWrapper ] ++ plugins; passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); } '' - makeWrapper ${package}/bin/buildbot $out/bin/buildbot --prefix PYTHONPATH : $PYTHONPATH + makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ + --prefix PYTHONPATH : "${package}/lib/python2.7/site-packages:$PYTHONPATH" + ln -sfv ${package}/lib $out/lib ''; package = pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.4"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086"; + sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w"; }; buildInputs = with pythonPackages; [ @@ -49,6 +51,7 @@ let txaio autobahn pyjwt + distro # tls pyopenssl @@ -66,6 +69,12 @@ let ]; + patches = [ + # This patch disables the test that tries to read /etc/os-release which + # is not accessible in sandboxed builds. + ./skip_test_linux_distro.patch + ]; + postPatch = '' substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; @@ -74,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 b22759af8fec..63fc61cd1b8d 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, pythonPackages }: let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.4"; + version = "0.9.9.post2"; - src = fetchurl { - url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "09a3yvs5hhf8syrkyydznmymgg86dpvgrwy9rb3bryq00wpjb3wn"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1h24fzyr4kfm1nb2627hgg9nl5mwv1gihc3f2wb5000gxmjdasg8"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -25,15 +25,14 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.4"; + version = "0.9.9.post2"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; src = pythonPackages.fetchPypi { inherit pname version format; - python = "py2"; - sha256 = "08m4h2pf6hgi8igh2j0qzfq49izc2z0qqj6ddxk0di5l306jx4im"; + sha256 = "1yzk3sy9i8g8wz9vvghhxnafs5dzsd3sybmm8lg043129rh116b9"; }; meta = with stdenv.lib; { @@ -47,11 +46,11 @@ in { console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.4"; + version = "0.9.9.post2"; - src = fetchurl { - url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "1w2vv8iyzl7ak4161avp9n6mhh08adav2fl82bbm17a3064apl8n"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0mmlxzlzl0r97jf0g98m7k1b13mzzy80445i0biazkj0vzkpwxza"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -67,11 +66,11 @@ in { waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.4"; + version = "0.9.9.post2"; - src = fetchurl { - url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "17xn6vrr0k2xabw6hr9sdyy0ry3llyjfmc79qrpgp5bsly2qv3jf"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0pq45gddwjd61nxmr48cl8s533i4gy3wg9wzbj3g1yb30yrz8qf4"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -83,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/skip_test_linux_distro.patch b/pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch new file mode 100644 index 000000000000..8fe5c7b56b4f --- /dev/null +++ b/pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch @@ -0,0 +1,11 @@ +diff -Nur buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py +--- buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-04-19 16:57:02.000000000 +0200 ++++ buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-05-04 12:22:54.575762551 +0200 +@@ -147,6 +147,7 @@ + _sendBuildbotNetUsageData({'foo': 'bar'}) + + def test_linux_distro(self): ++ raise SkipTest("NixOS sandboxed builds hides /etc/os-release") + system = platform.system() + if system != "Linux": + raise SkipTest("test is only for linux") diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index b9b4b86aa442..f87e8db85554 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.4"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0rdrr8x7sn2nxl51p6h9ad42s3c28lb6sys84zrg0d7fm4zhv7hj"; + 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 a197c69edff5..fb38e52811cf 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"; @@ -76,6 +77,6 @@ stdenv.mkDerivation rec { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; + maintainers = with stdenv.lib.maintainers; [ mornfall ]; }; } diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9f607a60b596..13c404374b0c 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig -, bzip2, curl, expat, libarchive, xz, zlib, libuv +, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash # darwin attributes , ps , isBootstrap ? false -, useSharedLibraries ? !stdenv.isCygwin +, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses , useQt4 ? false, qt4 }: @@ -12,7 +12,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.7"; + majorVersion = "3.8"; minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt - sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0"; + # from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt + sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"; }; prePatch = optionalString (!useSharedLibraries) '' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] - ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ] + ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; - maintainers = with maintainers; [ urkud mornfall ttuegel lnl7 ]; + maintainers = with maintainers; [ mornfall ttuegel lnl7 ]; }; } diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch index ba7438d2c0f9..623a7208a868 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch @@ -62,3 +62,16 @@ diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/P ) # Enable use of lib64 search path variants by default. +diff -ur cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake cmake-3.7.2/Modules/Platform/WindowsPaths.cmake +--- cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake 2017-04-26 09:08:39.095674666 -0700 ++++ cmake-3.7.2/Modules/Platform/WindowsPaths.cmake 2017-04-28 22:32:10.379015998 -0700 +@@ -66,7 +66,7 @@ + + if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") + # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) +- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) ++ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) + endif() + + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +diff -ur cmake-3.7.2-orig/Source/cmFindPackageCommand.cxx cmake-3.7.2/Source/cmFindPackageCommand.cxx diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index f6dd5460c352..bf876e81cda5 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -49,7 +49,7 @@ cmakeConfigurePhase() { # Avoid cmake resetting the rpath of binaries, on make install # And build always Release, to ensure optimisation flags - cmakeFlags="-DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix new file mode 100644 index 000000000000..69cc2db3ff28 --- /dev/null +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + version = "0.21.2"; + pname = "conan"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0x9s5h81d885xdrjw5x99q18lhmj11kalrs6xnjy2phrr8qzil8c"; + }; + + propagatedBuildInputs = with pythonPackages; [ + requests fasteners pyyaml pyjwt colorama patch + bottle pluginbase six distro pylint node-semver + ]; + + # enable tests once all of these pythonPackages available: + # [ nose nose_parameterized mock WebTest codecov ] + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://conan.io; + description = "Decentralized and portable C/C++ package manager"; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix new file mode 100644 index 000000000000..61f6a402cab7 --- /dev/null +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python3Packages }: + +let + + name = "doit"; + version = "0.30.3"; + +in python3Packages.buildPythonApplication { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz"; + sha256 = "1fcsslc3mc4bszq5xdqbxv37720s1s31d6pbfwc2iyxk1x2wi219"; + }; + + buildInputs = with python3Packages; [ mock pytest ]; + + propagatedBuildInputs = with python3Packages; [ cloudpickle pyinotify ]; + + # Tests fail due to mysterious gdbm.open() resource temporarily + # unavailable errors. + doCheck = false; + checkPhase = "py.test"; + + meta = { + homepage = "http://pydoit.org/"; + description = "A task management & automation tool"; + license = stdenv.lib.licenses.mit; + longDescription = '' + doit is a modern open-source build-tool written in python + designed to be simple to use and flexible to deal with complex + work-flows. It is specially suitable for building and managing + custom work-flows where there is no out-of-the-box solution + available. + ''; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 8d119371aa86..24897232fbc8 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,22 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.4"; - nativeVersion = "0.13"; + name = "gradle-4.0.1"; + nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0192yz1j59mvn6d3sch0yjx6i2fg4nyppkdpbqbbxqymrm6wvl3j"; + sha256 = "1m2gnh1vs3f5acdqcxmc8d0pi65bzm3v1nliz29rhdfi01if85yp"; + }; + }; + + gradle_3_5 = gradleGen rec { + name = "gradle-3.5"; + nativeVersion = "0.14"; + + src = fetchurl { + url = "http://services.gradle.org/distributions/${name}-bin.zip"; + sha256 = "046i268zkg89ps7c1sq8yx9lbn9kighh4gcskxmzf3qriiwm0x0b"; }; }; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 18cbe7731c00..c0d152ee7a2f 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,29 +1,32 @@ -{stdenv, fetchurl, yacc}: +{ stdenv, fetchurl, yacc }: -let - bindir = if stdenv.system == "i686-linux" then "bin.linuxx86" - else if stdenv.system == "x86_64-linux" then "bin.linux" - else throw "Unsupported platform by now"; -in +stdenv.mkDerivation rec { + name = "jam-2.6"; -stdenv.mkDerivation { - name = "jam-2.5"; src = fetchurl { - url = ftp://ftp.perforce.com/jam/jam-2.5.tar; - sha256 = "04c6khd7gdkqkvx4h3nbz99lyz7waid4fd221hq5chcygyx1sj3i"; + url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${name}.tar"; + sha256 = "0j4r7xcjz15ksnnpjw56qi99q4lpjmx097pkwwkl1hq3hqml1zhn"; }; - buildInputs = [ yacc ]; + nativeBuildInputs = [ yacc ]; - installPhase = '' - mkdir -p $out/bin - cp ${bindir}/jam $out/bin + buildPhase = '' + make jam0 + ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install ''; - meta = { - homepage = http://public.perforce.com/wiki/Jam; - license = stdenv.lib.licenses.free; + installPhase = '' + mkdir -p $out/doc/jam + cp *.html $out/doc/jam + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://www.perforce.com/resources/documentation/jam; + license = licenses.free; description = "Just Another Make"; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix new file mode 100644 index 000000000000..7b5dc2b79374 --- /dev/null +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -0,0 +1,26 @@ +{ fetchgit, stdenv }: + +stdenv.mkDerivation rec { + name = "kati-unstable-${version}"; + version = "2017-05-23"; + rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f"; + + src = fetchgit { + inherit rev; + url = "https://github.com/google/kati.git"; + sha256 = "1das1fvycra546lmh72cr5qpgblhbzqqy7gfywiijjgx160l75vq"; + }; + + patches = [ ./version.patch ]; + + installPhase = '' + install -D ckati $out/bin/ckati + ''; + + meta = { + description = "An experimental GNU make clone"; + homepage = "https://github.com/google/kati"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/pkgs/development/tools/build-managers/kati/version.patch new file mode 100644 index 000000000000..1821ac6bbb73 --- /dev/null +++ b/pkgs/development/tools/build-managers/kati/version.patch @@ -0,0 +1,19 @@ +diff --git a/Makefile.ckati b/Makefile.ckati +index e4067bb..15518f3 100644 +--- a/Makefile.ckati ++++ b/Makefile.ckati +@@ -102,14 +102,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o + $(KATI_LD) $^ -o $@ $(KATI_LIBS) + + # Rule to generate version.cc +-KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel) +-ifneq ($(KATI_GIT_DIR),) +-KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index +-KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD) +-else + KATI_VERSION_DEPS := + KATI_VERSION := unknown +-endif + $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS) + @mkdir -p $(dir $@) + echo '// +build ignore' > $@ diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 558b8acf70f1..d4dbc6b46d27 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,13 +1,23 @@ -{ lib, python3Packages, fetchurl }: -python3Packages.buildPythonPackage rec { - version = "0.35.0"; - name = "meson-${version}"; +{ lib, python3Packages }: +python3Packages.buildPythonApplication rec { + version = "0.40.0"; + pname = "meson"; + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/m/meson/${name}.tar.gz"; - sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw"; }; + postFixup = '' + pushd $out/bin + # undo shell wrapper as meson tools are called with python + for i in *; do + mv ".$i-wrapped" "$i" + done + popd + ''; + meta = with lib; { homepage = http://mesonbuild.com; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index cadda36a0e60..39d0d4e0e39c 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ninja-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/ninja-build/ninja/archive/v${version}.tar.gz"; - sha256 = "06dy2dc1aafm61ynw9gzig88la3km9dsh53bxf4mnw7l7kjisn2i"; + sha256 = "1n8n3g26ppwh7zwrc37n3alkbpbj0wki34ih53s3rkhs8ajs1p9f"; }; buildInputs = [ python asciidoc re2c ]; diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix new file mode 100644 index 000000000000..8ce495557e7f --- /dev/null +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -0,0 +1,40 @@ +{ stdenv, pythonPackages, runCommand, curl }: + +with stdenv.lib; +with pythonPackages; + +let + version = "1.3.0"; +in buildPythonApplication rec { + inherit version; + pname = "pantsbuild.pants"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "18fcf9047l9k006wz21g525p1w5avyjabmabh0giyz22xnm8g5gp"; + }; + + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py + ''; + + # 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 + ]; + + 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; + }; +} diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix new file mode 100644 index 000000000000..dc2d545a7654 --- /dev/null +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -0,0 +1,41 @@ +{ stdenv, qt5, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "qbs-${version}"; + + version = "1.8"; + + src = fetchFromGitHub { + owner = "qt-labs"; + repo = "qbs"; + rev = "fa9c21d6908e0dad805113f570ac883c1dc5067a"; + sha256 = "1manriz75rav1vldkk829yk1la9md4m872l5ykl9m982i9801d9g"; + }; + + enableParallelBuilding = true; + + buildInputs = with qt5; [ + qtbase + qtscript + ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + buildPhase = '' + # From http://doc.qt.io/qbs/building.html + qmake -r qbs.pro + make + ''; + + postInstall = '' + mv $out/usr/local/* "$out" + ''; + + meta = with stdenv.lib; { + description = "A tool that helps simplify the build process for developing projects across multiple platforms"; + license = licenses.lgpl21; + maintainers = with maintainers; [ expipiplus1 ]; + inherit version; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap index 81257dd8c0cb..aa7e6c5f9126 100755 --- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap +++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap @@ -146,7 +146,7 @@ make_symlink(Path, TargetFile) -> %% @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/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix new file mode 100644 index 000000000000..95a49dc167aa --- /dev/null +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, makeWrapper }: + +stdenv.mkDerivation rec { + version = "1.2.6"; + name = "redo-sh-${version}"; + + src = fetchurl { + url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; + sha256 = "1cwrk4v22rb9410rzyb4py4ncg01n6850l80s74bk3sflbw974wp"; + }; + + buildInputs = [ makeWrapper ]; + + sourceRoot = "."; + installPhase = '' + mkdir -p "$out/share" + mv man "$out/share" + mv bin "$out" + for p in $out/bin/*; do + wrapProgram "$p" --set PATH '$PATH:'"$out/bin" + done + ''; + + meta = with stdenv.lib; { + description = "Redo implementation in Bourne Shell"; + homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index e6006e948817..cf9b42abefd2 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.13"; + version = "0.13.15"; src = fetchurl { url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"; - sha256 = "0ygrz92qkzasj6fps1bjg7wlgl69867jjjc37yjadib0l8hkvl20"; + sha256 = "1vvsxpg1fwfzv3mcin69gnj44v6p7kfx3z9cm761sx01qbbp7q5n"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/pkgs/development/tools/build-managers/sbt/scala-native.nix new file mode 100644 index 000000000000..6c8b44605a35 --- /dev/null +++ b/pkgs/development/tools/build-managers/sbt/scala-native.nix @@ -0,0 +1,14 @@ +{ lib, sbt, makeWrapper, boehmgc, libunwind, re2, llvmPackages, zlib }: + +sbt.overrideDerivation(old: { + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/sbt \ + --set CLANG_PATH "${llvmPackages.clang}/bin/clang" \ + --set CLANGPP_PATH "${llvmPackages.clang}/bin/clang" \ + --set CPATH "${lib.makeSearchPathOutput "dev" "include" [ re2 zlib boehmgc libunwind llvmPackages.libcxxabi llvmPackages.libcxx ]}/c++/v1" \ + --set LIBRARY_PATH "${lib.makeLibraryPath [ re2 zlib boehmgc libunwind llvmPackages.libcxxabi llvmPackages.libcxx ]}" \ + --set NIX_CFLAGS_LINK "-lc++abi -lc++" + ''; +}) diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index ddbb1f5f1ddf..c397758aaac1 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,244 +1,268 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.4.0) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) app_conf (0.4.2) - ast (2.2.0) - berkshelf (4.3.0) + artifactory (2.8.1) + ast (2.3.0) + backports (3.7.0) + berkshelf (5.6.4) addressable (~> 2.3, >= 2.3.4) - berkshelf-api-client (~> 2.0, >= 2.0.2) - buff-config (~> 1.0) - buff-extensions (~> 1.0) - buff-shell_out (~> 0.1) - celluloid (= 0.16.0) - celluloid-io (~> 0.16.1) + berkshelf-api-client (>= 2.0.2, < 4.0) + buff-config (~> 2.0) + buff-extensions (~> 2.0) + buff-shell_out (~> 1.0) cleanroom (~> 1.0) faraday (~> 0.9) httpclient (~> 2.7) minitar (~> 0.5, >= 0.5.4) + mixlib-archive (~> 0.4) octokit (~> 4.0) retryable (~> 2.0) - ridley (~> 4.5) - solve (~> 2.0) - thor (~> 0.19) - berkshelf-api-client (2.0.2) - faraday (~> 0.9.1) - httpclient (~> 2.7.0) - ridley (~> 4.5) - buff-config (1.0.1) - buff-extensions (~> 1.0) - varia_model (~> 0.4) - buff-extensions (1.0.0) - buff-ignore (1.1.1) - buff-ruby_engine (0.1.0) - buff-shell_out (0.2.0) - buff-ruby_engine (~> 0.1.0) - builder (3.2.2) + ridley (~> 5.0) + solve (> 2.0, < 4.0) + thor (~> 0.19, < 0.19.2) + berkshelf-api-client (3.0.0) + faraday (~> 0.9) + httpclient (~> 2.7) + ridley (>= 4.5, < 6.0) + blankslate (2.1.2.4) + buff-config (2.0.0) + buff-extensions (~> 2.0) + varia_model (~> 0.6) + buff-extensions (2.0.0) + buff-ignore (1.2.0) + buff-ruby_engine (1.0.0) + buff-shell_out (1.1.0) + buff-ruby_engine (~> 1.0) + builder (3.2.3) celluloid (0.16.0) timers (~> 4.0.0) celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef (12.8.1) + chef (12.19.36) + addressable bundler (>= 1.10) - chef-config (= 12.8.1) - chef-zero (~> 4.5) + chef-config (= 12.19.36) + chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) + iniparse (~> 1.4) + mixlib-archive (~> 0.4) mixlib-authentication (~> 1.4) - mixlib-cli (~> 1.4) + mixlib-cli (~> 1.7) mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) - net-ssh (>= 2.9, < 4.0) - net-ssh-multi (~> 1.1) - ohai (>= 8.6.0.alpha.1, < 9) - plist (~> 3.1.0) + net-sftp (~> 2.1, >= 2.1.2) + net-ssh (>= 2.9, < 5.0) + net-ssh-multi (~> 1.2, >= 1.2.1) + ohai (>= 8.6.0.alpha.1, < 13) + plist (~> 3.2) proxifier (~> 1.0) - rspec-core (~> 3.4) - rspec-expectations (~> 3.4) - rspec-mocks (~> 3.4) + rspec-core (~> 3.5) + rspec-expectations (~> 3.5) + rspec-mocks (~> 3.5) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef-config (12.8.1) + chef-config (12.19.36) + addressable + fuzzyurl mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-dk (0.11.2) + chef-dk (1.3.40) + addressable (>= 2.3.5, < 2.6) chef (~> 12.5) - chef-provisioning (~> 1.2) - cookbook-omnifetch (~> 0.2, >= 0.2.2) + chef-provisioning (~> 2.0) + cookbook-omnifetch (~> 0.5) diff-lcs (~> 1.0) ffi-yajl (>= 1.0, < 3.0) minitar (~> 0.5.4) - mixlib-cli (~> 1.5) + mixlib-cli (~> 1.7) mixlib-shellout (~> 2.0) paint (~> 1.0) - solve (~> 2.0, >= 2.0.1) - chef-provisioning (1.6.0) - cheffish (>= 1.3.1, < 3.0) - inifile (~> 2.0) - mixlib-install (~> 0.7.0) + solve (> 2.0, < 4.0) + chef-provisioning (2.2.1) + cheffish (>= 4.0, < 6.0) + inifile (>= 2.0.2) + mixlib-install (>= 1.0, < 3.0) net-scp (~> 1.0) - net-ssh (>= 2.9, < 4.0) - net-ssh-gateway (~> 1.2.0) - winrm (~> 1.3) - chef-vault (2.8.0) - chef-zero (4.5.0) + net-ssh (>= 2.9, < 5.0) + net-ssh-gateway (~> 1.2) + winrm (~> 2.0) + winrm-elevated (~> 1.0) + winrm-fs (~> 1.0) + chef-vault (2.9.1) + chef-zero (5.3.2) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) - rack + rack (~> 2.0) uuidtools (~> 2.1) - cheffish (2.0.2) - chef-zero (~> 4.3) - compat_resource - chefspec (4.6.0) - chef (>= 11.14) - fauxhai (~> 3.0, >= 3.0.1) + cheffish (5.0.1) + chef-zero (~> 5.0) + net-ssh + chefspec (6.2.0) + chef (>= 12.0) + fauxhai (>= 3.6, < 5) rspec (~> 3.0) cleanroom (1.0.0) coderay (1.1.1) - compat_resource (12.8.0) - cookbook-omnifetch (0.2.2) - minitar (~> 0.5.4) - diff-lcs (1.2.5) - diffy (3.1.0) - docker-api (1.26.2) + cookbook-omnifetch (0.5.1) + mixlib-archive (~> 0.4) + cucumber-core (2.0.0) + backports (~> 3.6) + gherkin (~> 4.0) + diff-lcs (1.3) + diffy (3.2.0) + docker-api (1.33.3) excon (>= 0.38.0) json erubis (2.7.0) - excon (0.48.0) + excon (0.55.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - fauxhai (3.1.0) + fauxhai (4.1.0) net-ssh - ffi (1.9.10) - ffi-yajl (2.2.3) + ffi (1.9.18) + ffi-yajl (2.3.0) libyajl2 (~> 1.2) - foodcritic (6.0.1) + foodcritic (10.2.2) + cucumber-core (>= 1.3) erubis - gherkin (~> 2.11) nokogiri (>= 1.5, < 2.0) rake rufus-lru (~> 1.0) treetop (~> 1.4) yajl-ruby (~> 1.1) - gherkin (2.12.2) - multi_json (~> 1.3) + fuzzyurl (0.9.0) + gherkin (4.1.1) git (1.3.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.4.3) + hashie (3.5.5) highline (1.7.8) - hitimes (1.2.3) - httpclient (2.7.1) - inifile (2.0.2) - inspec (0.14.8) - json (~> 1.8) + hitimes (1.2.4) + httpclient (2.8.3) + inifile (3.0.0) + iniparse (1.4.2) + inspec (1.19.2) + addressable (~> 2.4) + faraday (>= 0.9.0) + hashie (~> 3.4) + json (>= 1.8, < 3.0) method_source (~> 0.8) + mixlib-log + parallel (~> 1.9) pry (~> 0) - r-train (~> 0.10.1) rainbow (~> 2) - rspec (~> 3.3) + rspec (~> 3) rspec-its (~> 1.2) rubyzip (~> 1.1) + sslshake (~> 1) thor (~> 0.19) + toml (~> 0.1) + train (>= 0.22.0, < 1.0) ipaddress (0.8.3) - json (1.8.3) - kitchen-inspec (0.12.3) - inspec (~> 0.14.1) + json (2.0.3) + kitchen-inspec (0.17.0) + hashie (~> 3.4) + inspec (>= 0.34.0, < 2.0.0) test-kitchen (~> 1.6) - kitchen-vagrant (0.19.0) + kitchen-vagrant (1.1.0) test-kitchen (~> 1.4) - knife-spork (1.6.1) + knife-spork (1.6.3) app_conf (>= 0.4.0) chef (>= 11.0.0) diffy (>= 3.0.1) git (>= 1.2.5) libyajl2 (1.2.0) little-plugger (1.1.4) - logging (2.0.0) + logging (2.2.0) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) - mini_portile2 (2.0.0) + mini_portile2 (2.1.0) minitar (0.5.4) - mixlib-authentication (1.4.0) + mixlib-archive (0.4.1) mixlib-log - rspec-core (~> 3.2) - rspec-expectations (~> 3.2) - rspec-mocks (~> 3.2) - mixlib-cli (1.5.0) - mixlib-config (2.2.1) - mixlib-install (0.7.1) - mixlib-log (1.6.0) - mixlib-shellout (2.2.6) - molinillo (0.2.3) - multi_json (1.11.2) + mixlib-authentication (1.4.1) + mixlib-log + mixlib-cli (1.7.0) + mixlib-config (2.2.4) + mixlib-install (2.1.12) + artifactory + mixlib-shellout + mixlib-versioning + thor + mixlib-log (1.7.1) + mixlib-shellout (2.2.7) + mixlib-versioning (1.1.0) + molinillo (0.5.7) + multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.2) - net-ssh-gateway (1.2.0) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (4.1.0) + net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) - nio4r (1.2.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) nori (2.6.0) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - ohai (8.12.0) + octokit (4.7.0) + sawyer (~> 0.8.0, >= 0.5.3) + ohai (8.23.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress mixlib-cli mixlib-config (~> 2.0) - mixlib-log + mixlib-log (>= 1.7.1, < 2.0) mixlib-shellout (~> 2.0) - plist - rake (~> 10.1) + plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) paint (1.0.1) - parser (2.3.0.6) + parallel (1.11.1) + parser (2.4.0.0) ast (~> 2.2) - plist (3.1.0) + parslet (1.5.0) + blankslate (~> 2.0) + plist (3.2.0) polyglot (0.3.5) powerpack (0.1.1) proxifier (1.0.3) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - r-train (0.10.3) - docker-api (~> 1.26.2) - json (~> 1.8) - mixlib-shellout (~> 2.1) - net-scp (~> 1.2) - net-ssh (>= 2.9, < 4.0) - winrm (~> 1.6) - winrm-fs (~> 0.3) - rack (1.6.4) - rainbow (2.1.0) - rake (10.5.0) - retryable (2.0.3) - ridley (4.5.0) + public_suffix (2.0.5) + rack (2.0.1) + rainbow (2.2.1) + rake (12.0.0) + retryable (2.0.4) + ridley (5.1.0) addressable - buff-config (~> 1.0) - buff-extensions (~> 1.0) - buff-ignore (~> 1.1) - buff-shell_out (~> 0.1) + buff-config (~> 2.0) + buff-extensions (~> 2.0) + buff-ignore (~> 1.2) + buff-shell_out (~> 1.0) celluloid (~> 0.16.0) celluloid-io (~> 0.16.1) chef-config (>= 12.5.0) @@ -249,91 +273,107 @@ GEM json (>= 1.7.7) mixlib-authentication (>= 1.3.0) retryable (~> 2.0) - semverse (~> 1.1) - varia_model (~> 0.4.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + semverse (~> 2.0) + varia_model (~> 0.6) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) + rspec-support (~> 3.5.0) rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.1) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.38.0) - parser (>= 2.3.0.6, < 3.0) + rubocop (0.48.1) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.7.5) - rubyntlm (0.6.0) - rubyzip (1.2.0) - rufus-lru (1.0.5) + ruby-progressbar (1.8.1) + rubyntlm (0.6.1) + rubyzip (1.2.1) + rufus-lru (1.1.0) safe_yaml (1.0.4) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - semverse (1.2.1) - serverspec (2.31.0) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + semverse (2.0.0) + serverspec (2.38.0) multi_json rspec (~> 3.0) rspec-its specinfra (~> 2.53) - sfl (2.2) + sfl (2.3) slop (3.6.0) - solve (2.0.2) - molinillo (~> 0.2.3) - semverse (~> 1.1) - specinfra (2.53.1) + solve (3.1.0) + molinillo (>= 0.5) + semverse (>= 1.1, < 3.0) + specinfra (2.67.7) net-scp - net-ssh (>= 2.7, < 3.1) + net-ssh (>= 2.7, < 5.0) net-telnet sfl + sslshake (1.1.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (1.6.0) - mixlib-install (~> 0.7) + test-kitchen (1.16.0) + mixlib-install (>= 1.2, < 3.0) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) - net-ssh (>= 2.9, < 4.0) + net-ssh (>= 2.9, < 5.0) + net-ssh-gateway (~> 1.2) safe_yaml (~> 1.0) - thor (~> 0.18) + thor (~> 0.19, < 0.19.2) thor (0.19.1) timers (4.0.4) hitimes - treetop (1.6.5) + toml (0.1.2) + parslet (~> 1.5.0) + train (0.23.0) + docker-api (~> 1.26) + json (>= 1.8, < 3.0) + mixlib-shellout (~> 2.0) + net-scp (~> 1.2) + net-ssh (>= 2.9, < 5.0) + winrm (~> 2.0) + winrm-fs (~> 1.0) + treetop (1.6.8) polyglot (~> 0.3) - unicode-display_width (1.0.2) + unicode-display_width (1.1.3) uuidtools (2.1.5) - varia_model (0.4.1) - buff-extensions (~> 1.0) + varia_model (0.6.0) + buff-extensions (~> 2.0) hashie (>= 2.0.2, < 4.0.0) - winrm (1.7.2) + winrm (2.2.1) builder (>= 2.1.2) + erubis (~> 2.7) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.6.0) - winrm-fs (0.3.2) + rubyntlm (~> 0.6.0, >= 0.6.1) + winrm-elevated (1.1.0) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.0.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) - winrm (~> 1.5) + winrm (~> 2.0) wmi-lite (1.0.0) - yajl-ruby (1.2.1) + yajl-ruby (1.3.0) PLATFORMS ruby @@ -356,4 +396,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.10.5 + 1.14.4 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 880d0ddcc743..b453b0ca5044 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { - name = "chefdk-0.11.2"; + name = "chefdk-1.3.40"; inherit ruby; gemdir = ./.; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index 87faa3105ad6..18e430a3dec7 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -1,1170 +1,1088 @@ { - "addressable" = { - version = "2.4.0"; + addressable = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; type = "gem"; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; }; + version = "2.5.1"; }; - "app_conf" = { - version = "0.4.2"; + app_conf = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "1yqwhr7d9i0cgavqkkq0b4pfqpn213dbhj5ayygr293wplm0jh57"; - }; - }; - "ast" = { - version = "2.2.0"; - source = { type = "gem"; - sha256 = "14md08f8f1mmr2v7lczqnf1n1v8bal73gvg6ldhvkds1bmbnkrlb"; }; + version = "0.4.2"; }; - "berkshelf" = { - version = "4.3.0"; + artifactory = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zaxa5fxrfal6vi90w725n8cd57fxw1jf99h38vn8d4vimvan2cc"; type = "gem"; - sha256 = "1dsbyq3749b9133rmnzjak7rsysyps1ryalc2r4rxyihflmxhix9"; }; - dependencies = [ - "addressable" - "berkshelf-api-client" - "buff-config" - "buff-extensions" - "buff-shell_out" - "celluloid" - "celluloid-io" - "cleanroom" - "faraday" - "httpclient" - "minitar" - "octokit" - "retryable" - "ridley" - "solve" - "thor" - ]; + version = "2.8.1"; }; - "berkshelf-api-client" = { - version = "2.0.2"; + ast = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; type = "gem"; - sha256 = "0xbn8q2xi09x5a7ma6wqs13gkpzj4ly21vls7m7ffv3sw8x29cyc"; }; - dependencies = [ - "faraday" - "httpclient" - "ridley" - ]; + version = "2.3.0"; }; - "buff-config" = { - version = "1.0.1"; + backports = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qlaq999znlbjw9wb0kwbjvidrbcimnd4v59y682kvm5c09mfn0l"; type = "gem"; - sha256 = "0r3h3mk1dj7pc4zymz450bdqp23faqprx363ji4zfdg8z6r31jfh"; }; - dependencies = [ - "buff-extensions" - "varia_model" - ]; + version = "3.7.0"; }; - "buff-extensions" = { + berkshelf = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aajjag7l55gi7k67n27dr6pscbdlzjaj751r2zhaggrczhh6yyq"; + type = "gem"; + }; + version = "5.6.4"; + }; + berkshelf-api-client = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n9bmrqmyy8cqm9vakscf5s1k2chks43x7dr201zp4bv2i6g3ih2"; + type = "gem"; + }; + version = "3.0.0"; + }; + blankslate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + type = "gem"; + }; + version = "2.1.2.4"; + }; + buff-config = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06zx175sww4grk1rwyn1g3b1j2y324jf1506wl4xx96iss8spa4r"; + type = "gem"; + }; + version = "2.0.0"; + }; + buff-extensions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qjyx97b9gavrk1r77bif1wv7z2mwlqy0v42q0vb7jd609n7vgcg"; + type = "gem"; + }; + version = "2.0.0"; + }; + buff-ignore = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vn0jh4l8np1xlyvsrrhlzhapcwvrjfni92jmg1an5qdw1qlgxmh"; + type = "gem"; + }; + version = "1.2.0"; + }; + buff-ruby_engine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1njpndvhvq7idfrwfw3p0hs5ch6nygwscjmksh23dz49dsirk7a9"; + type = "gem"; + }; version = "1.0.0"; - source = { - type = "gem"; - sha256 = "1jqb5sn38qgx66lc4km6rljzz05myijjw12hznz1fk0k4qfw6yzk"; - }; }; - "buff-ignore" = { - version = "1.1.1"; + buff-shell_out = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zg1li17759whsi2yhb08wvbbqn5cy6i5v51384yjk2a29vs9lck"; type = "gem"; - sha256 = "1ghzhkgbq7f5fc7xilw0c9gspxpdhqhq3ygi1ybjm6r0dxlmvdb4"; }; + version = "1.1.0"; }; - "buff-ruby_engine" = { - version = "0.1.0"; + builder = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; type = "gem"; - sha256 = "1llpwpmzkakbgz9fc3vr1298cx1n9zv1g25fwj80xnnr7428aj8p"; }; + version = "3.2.3"; }; - "buff-shell_out" = { - version = "0.2.0"; + celluloid = { source = { - type = "gem"; - sha256 = "0sphb69vxm346ys2laiz174k5jx628vfwz9ch8g2w9plc4xkxf3p"; - }; - dependencies = [ - "buff-ruby_engine" - ]; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "celluloid" = { - version = "0.16.0"; - source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; - }; - dependencies = [ - "timers" - ]; - }; - "celluloid-io" = { - version = "0.16.2"; - source = { type = "gem"; + }; + version = "0.16.0"; + }; + celluloid-io = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; - }; - dependencies = [ - "celluloid" - "nio4r" - ]; - }; - "chef" = { - version = "12.8.1"; - source = { type = "gem"; - sha256 = "16wb3ymnl7rbayy8qp35fp0947cnq2y9bac7xzhc1njp5j2p6lhg"; }; - dependencies = [ - "chef-config" - "chef-zero" - "diff-lcs" - "erubis" - "ffi-yajl" - "highline" - "mixlib-authentication" - "mixlib-cli" - "mixlib-log" - "mixlib-shellout" - "net-ssh" - "net-ssh-multi" - "ohai" - "plist" - "proxifier" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec_junit_formatter" - "serverspec" - "specinfra" - "syslog-logger" - "uuidtools" - ]; + version = "0.16.2"; }; - "chef-config" = { - version = "12.8.1"; + chef = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "057m3c7h3fz3682r7wxmm7dm3n90rv56lc7svrk1hmf4c3g4b99v"; type = "gem"; - sha256 = "0chgbdv9c1xfkhzx3kmpr8lj0wjdbziixgln2y3ryn84x4fg84ic"; }; - dependencies = [ - "mixlib-config" - "mixlib-shellout" - ]; + version = "12.19.36"; }; - "chef-dk" = { - version = "0.11.2"; + chef-config = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j4m13zzhd4w7j09a2cnj9sinxd9669i5qanbb1cvj90my0raxa2"; type = "gem"; - sha256 = "1qfx5qclvh3kwjgfs18iwdn0knpgka5py7mwi4r0mz2sw14wq5wk"; }; - dependencies = [ - "chef" - "chef-provisioning" - "cookbook-omnifetch" - "diff-lcs" - "ffi-yajl" - "minitar" - "mixlib-cli" - "mixlib-shellout" - "paint" - "solve" - ]; + version = "12.19.36"; }; - "chef-provisioning" = { - version = "1.6.0"; + chef-dk = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wvdv3hmxnp7ydcwji1w4x0g48dy4qq1ik8zd6n43mqcfgkjq0cb"; type = "gem"; - sha256 = "1nxgia4zyhyqbrz65q7lgjwx8ba5iyzxdxa181y0s4aqqpv0j45g"; }; - dependencies = [ - "cheffish" - "inifile" - "mixlib-install" - "net-scp" - "net-ssh" - "net-ssh-gateway" - "winrm" - ]; + version = "1.3.40"; }; - "chef-vault" = { - version = "2.8.0"; + chef-provisioning = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z5334zp76fswj7ygs5gzf8vsc13ixvyxywpyd5sif75dqsays48"; type = "gem"; - sha256 = "0dbvawlrfx9mqjyh8q71jjfh987xqqv3f6c0pmcjp6qxs95l1dqq"; }; + version = "2.2.1"; }; - "chef-zero" = { - version = "4.5.0"; + chef-vault = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pqxmraiai9jrld53fyfsglaqcw14xwmy4f3rjfwbrsmparsxjc2"; type = "gem"; - sha256 = "1lqvmgjniviahrhim8k67qddnwh5p7wzw33r1wga4z136pfka1zx"; }; - dependencies = [ - "ffi-yajl" - "hashie" - "mixlib-log" - "rack" - "uuidtools" - ]; + version = "2.9.1"; }; - "cheffish" = { - version = "2.0.2"; + chef-zero = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qmpn8wq2wns8m28pcn8ljgwz0v2ksninzc4wn5nq66gvksmpjig"; type = "gem"; - sha256 = "0mvp7kybgp3nm2sdcmlx8bv147hcdjx745a8k97bx1m47isv97ax"; }; - dependencies = [ - "chef-zero" - "compat_resource" - ]; + version = "5.3.2"; }; - "chefspec" = { - version = "4.6.0"; + cheffish = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "19hn46s3qm2ncnfzggm0lcdrsagspdxg699k97a4hbl18k1n6lb1"; type = "gem"; - sha256 = "1ikn8k6xdqixdjga50jmkqajz2z2z71dg4j3dsmd31hv1mdbp7wz"; }; - dependencies = [ - "chef" - "fauxhai" - "rspec" - ]; + version = "5.0.1"; }; - "cleanroom" = { - version = "1.0.0"; + chefspec = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "18xkzcxglrr3bfy5k0c1cjk5a3ka49xg3xirldb5yhv395svgg1r"; type = "gem"; + }; + version = "6.2.0"; + }; + cleanroom = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1r6qa4b248jasv34vh7rw91pm61gzf8g5dvwx2gxrshjs7vbhfml"; - }; - }; - "coderay" = { - version = "1.1.1"; - source = { type = "gem"; + }; + version = "1.0.0"; + }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; - }; - }; - "compat_resource" = { - version = "12.8.0"; - source = { type = "gem"; - sha256 = "0zp1dd1wkbgxbazvs7acqyk1xjls0wq1pd5ilhj6zi63lpychgy5"; }; + version = "1.1.1"; }; - "cookbook-omnifetch" = { - version = "0.2.2"; + cookbook-omnifetch = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qkzlkszq9f74i71vz72skvmrw24zvdpzfl2029x6vyxrwn83hwf"; type = "gem"; - sha256 = "1ml25xc69nsgbvp9a6w9yi376rav7b659cvyr8qhfb4jaj4l1yd6"; }; - dependencies = [ - "minitar" - ]; + version = "0.5.1"; }; - "diff-lcs" = { - version = "1.2.5"; + cucumber-core = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "136hnvqv444qyxzcgy1k60y4i6cn3sn9lbqr4wan9dzz1yzllqbm"; type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; }; + version = "2.0.0"; }; - "diffy" = { - version = "3.1.0"; + diff-lcs = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; type = "gem"; - sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; }; + version = "1.3"; }; - "docker-api" = { - version = "1.26.2"; + diffy = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941"; type = "gem"; - sha256 = "0sg2xazcga21pmlb9yy1z5f3yyzqa2ly5b2h2cxfhyfda6k748wk"; }; - dependencies = [ - "excon" - "json" - ]; + version = "3.2.0"; }; - "erubis" = { - version = "2.7.0"; + docker-api = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xg2iw6rffyd6zahm6rc80m10dghqmvjg8s83zjm6bqsqdg5h2dk"; type = "gem"; + }; + version = "1.33.3"; + }; + erubis = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "excon" = { - version = "0.48.0"; - source = { type = "gem"; - sha256 = "0hjfd2p2mhklavhy8gy1ygm390iz3imx71065dcr9r28s3wk63gf"; }; + version = "2.7.0"; }; - "faraday" = { - version = "0.9.2"; + excon = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "149grwcry52hi3f1xkbbx74jw5m3qcmiib13wxrk3rw5rz200kmx"; type = "gem"; + }; + version = "0.55.0"; + }; + faraday = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; - }; - dependencies = [ - "multipart-post" - ]; - }; - "fauxhai" = { - version = "3.1.0"; - source = { type = "gem"; - sha256 = "0ff8wappc4n4v7v6969zm64c36qiadfw3igl8cyqrpp36fnqm04d"; }; - dependencies = [ - "net-ssh" - ]; + version = "0.9.2"; }; - "ffi" = { - version = "1.9.10"; + fauxhai = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yk8cspxgs7y29hgzv248albld4d0y5z498xmgh7kqxav6vxpigj"; type = "gem"; - sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; }; + version = "4.1.0"; }; - "ffi-yajl" = { - version = "2.2.3"; + ffi = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; - sha256 = "14wgy2isc5yir4zdkk0l3hzh1s1ycwblqb1hllbv4g9svb9naqbz"; }; + version = "1.9.18"; + }; + ffi-yajl = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dlfzbs1amvqv9lrl87h614xz7319zcwn29qjl1mhnbclny98hqz"; + type = "gem"; + }; + version = "2.3.0"; dependencies = [ "libyajl2" ]; }; - "foodcritic" = { - version = "6.0.1"; + foodcritic = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0js522pp3q1xx929mpbzska2i87ydkax1dnyczpll4c46dkc2ivx"; type = "gem"; - sha256 = "06pi4984g6vwfzqvsf73zpw4h1p63bl7yn2sjb9mqd896bb3v6cn"; }; - dependencies = [ - "erubis" - "gherkin" - "nokogiri" - "rake" - "rufus-lru" - "treetop" - "yajl-ruby" - ]; + version = "10.2.2"; }; - "gherkin" = { - version = "2.12.2"; + fuzzyurl = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl"; type = "gem"; - sha256 = "1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25"; }; - dependencies = [ - "multi_json" - ]; + version = "0.9.0"; }; - "git" = { - version = "1.3.0"; + gherkin = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s2ibsl5vi3961cci677zjb03wg4wh5hcci5g87i416333qq69xx"; type = "gem"; + }; + version = "4.1.1"; + }; + git = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3"; - }; - }; - "gssapi" = { - version = "1.2.0"; - source = { type = "gem"; + }; + version = "1.3.0"; + }; + gssapi = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; - }; - dependencies = [ - "ffi" - ]; - }; - "gyoku" = { - version = "1.3.1"; - source = { type = "gem"; + }; + version = "1.2.0"; + }; + gyoku = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; - }; - dependencies = [ - "builder" - ]; - }; - "hashie" = { - version = "3.4.3"; - source = { type = "gem"; - sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899"; }; + version = "1.3.1"; }; - "highline" = { - version = "1.7.8"; + hashie = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lfmbh98ng141m7yc8s4v56v49ppam416pzvd2d7pg85wmm44ljw"; type = "gem"; + }; + version = "3.5.5"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; - }; - }; - "hitimes" = { - version = "1.2.3"; - source = { type = "gem"; - sha256 = "1fr9raz7652bnnx09dllyjdlnwdxsnl0ig5hq9s4s8vackvmckv4"; }; + version = "1.7.8"; }; - "httpclient" = { - version = "2.7.1"; + hitimes = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a4yfhj7vp5gx20y99z45skynyn57wzxwwjp9mjm0b6dgiv6l0lz"; type = "gem"; - sha256 = "1y01wgmvwz8r4ycr87d12niglpk0nlh2hkpgy9bnmm8as7kgs428"; }; + version = "1.2.4"; }; - "inifile" = { - version = "2.0.2"; + httpclient = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; type = "gem"; - sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; }; + version = "2.8.3"; }; - "inspec" = { - version = "0.14.8"; + inifile = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c5zmk7ia63yw5l2k14qhfdydxwi1sah1ppjdiicr4zcalvfn0xi"; type = "gem"; - sha256 = "0whd57f82ml0awn7wgfi8gj3mwl7njww22hn2ciabxafqld9xrri"; }; - dependencies = [ - "json" - "method_source" - "pry" - "r-train" - "rainbow" - "rspec" - "rspec-its" - "rubyzip" - "thor" - ]; + version = "3.0.0"; }; - "ipaddress" = { - version = "0.8.3"; + iniparse = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pj4r636swr6j7zisgs6xjws1hkkj8wxdbbknpzydcmaridk880r"; type = "gem"; + }; + version = "1.4.2"; + }; + inspec = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03c1xxp13yv601b5fdbjbqy0sq84ymn5bx4d7k34h553lgc0124f"; + type = "gem"; + }; + version = "1.19.2"; + }; + ipaddress = { + source = { + remotes = ["https://rubygems.org"]; sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; - }; - }; - "json" = { - version = "1.8.3"; - source = { type = "gem"; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; }; + version = "0.8.3"; }; - "kitchen-inspec" = { - version = "0.12.3"; + json = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; type = "gem"; - sha256 = "1vjb9pxb4ga9ppr35k6vsqh053k35b4fxamzg99g17y1rijp6dbj"; }; - dependencies = [ - "inspec" - "test-kitchen" - ]; - }; - "kitchen-vagrant" = { - version = "0.19.0"; - source = { - type = "gem"; - sha256 = "0sydjihhvnr40vqnj7bg65zxf00crwvwdli1av03ghhggrp5scla"; - }; - dependencies = [ - "test-kitchen" - ]; - }; - "knife-spork" = { - version = "1.6.1"; - source = { - type = "gem"; - sha256 = "104f3xq4gfy7rszc8zbfakg9wlnwnf8k9zij9ahdq4id3sdf1ylb"; - }; - dependencies = [ - "app_conf" - "chef" - "diffy" - "git" - ]; - }; - "libyajl2" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; - }; - }; - "little-plugger" = { - version = "1.1.4"; - source = { - type = "gem"; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - }; - }; - "logging" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "0ka5q88qvc2w7yr9z338jwxcyj1kifmbr9is5hps2f37asismqvb"; - }; - dependencies = [ - "little-plugger" - "multi_json" - ]; - }; - "method_source" = { - version = "0.8.2"; - source = { - type = "gem"; - sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; - }; - }; - "mini_portile2" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; - }; - }; - "minitar" = { - version = "0.5.4"; - source = { - type = "gem"; - sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka"; - }; - }; - "mixlib-authentication" = { - version = "1.4.0"; - source = { - type = "gem"; - sha256 = "0qk6mln2bkp6jgkz3sh5r69lzipzjs4dqdixqq12wzvwapmgc0zj"; - }; - dependencies = [ - "mixlib-log" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - ]; - }; - "mixlib-cli" = { - version = "1.5.0"; - source = { - type = "gem"; - sha256 = "0im6jngj76azrz0nv69hgpy1af4smcgpfvmmwh5iwsqwa46zx0k0"; - }; - }; - "mixlib-config" = { - version = "2.2.1"; - source = { - type = "gem"; - sha256 = "0smhnyhw1va94vrd7zapxplbavbs4dc78h9yd1yfv52fzxx16zk3"; - }; - }; - "mixlib-install" = { - version = "0.7.1"; - source = { - type = "gem"; - sha256 = "1ws2syfimnqzlff2fp6yj5v7zgnzmi3pj9kbkg7xlmd9fhnkb0n7"; - }; - }; - "mixlib-log" = { - version = "1.6.0"; - source = { - type = "gem"; - sha256 = "1xblfxby3psh4n5cgc6j6xnvmmssyr8qjy0l76f92nr4b9yvv9m2"; - }; - }; - "mixlib-shellout" = { - version = "2.2.6"; - source = { - type = "gem"; - sha256 = "1xfs7yp533qx3nsd4x2q2r125awyxcizgdc4dwgdlxsa1n1pj0pd"; - }; - }; - "molinillo" = { - version = "0.2.3"; - source = { - type = "gem"; - sha256 = "1ylvnpdn20nna488mkzpq3iy6gr866gmkiv090c7g5h88x1qws0b"; - }; - }; - "multi_json" = { - version = "1.11.2"; - source = { - type = "gem"; - sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; - }; - }; - "multipart-post" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; - }; - }; - "net-scp" = { - version = "1.2.1"; - source = { - type = "gem"; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; - }; - dependencies = [ - "net-ssh" - ]; - }; - "net-ssh" = { - version = "3.0.2"; - source = { - type = "gem"; - sha256 = "1k3hrgr899dlhkn53c4hnn5qzbhc7lwks0vaqgw95gg74hn1ivqw"; - }; - }; - "net-ssh-gateway" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy"; - }; - dependencies = [ - "net-ssh" - ]; - }; - "net-ssh-multi" = { - version = "1.2.1"; - source = { - type = "gem"; - sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; - }; - dependencies = [ - "net-ssh" - "net-ssh-gateway" - ]; - }; - "net-telnet" = { - version = "0.1.1"; - source = { - type = "gem"; - sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; - }; - }; - "nio4r" = { - version = "1.2.1"; - source = { - type = "gem"; - sha256 = "1adnm77xfxck0mrvid5d7lwng783gh580rh3y18nq4bwdikr6nha"; - }; - }; - "nokogiri" = { - version = "1.6.7.2"; - source = { - type = "gem"; - sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; - }; - dependencies = [ - "mini_portile2" - ]; - }; - "nori" = { - version = "2.6.0"; - source = { - type = "gem"; - sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; - }; - }; - "octokit" = { - version = "4.3.0"; - source = { - type = "gem"; - sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np"; - }; - dependencies = [ - "sawyer" - ]; - }; - "ohai" = { - version = "8.12.0"; - source = { - type = "gem"; - sha256 = "0l7vdfnfm4plla6q4qkngwpmy0ah53pnymlwfzc7iy6jn2n9ibpm"; - }; - dependencies = [ - "chef-config" - "ffi" - "ffi-yajl" - "ipaddress" - "mixlib-cli" - "mixlib-config" - "mixlib-log" - "mixlib-shellout" - "plist" - "rake" - "systemu" - "wmi-lite" - ]; - }; - "paint" = { - version = "1.0.1"; - source = { - type = "gem"; - sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj"; - }; - }; - "parser" = { - version = "2.3.0.6"; - source = { - type = "gem"; - sha256 = "1r14k5jlsc5ivxjm1kljhk9sqp50rnd71n0mzx18hz135nvw1hbz"; - }; - dependencies = [ - "ast" - ]; - }; - "plist" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "0rh8nddwdya888j1f4wix3dfan1rlana3mc7mwrvafxir88a1qcs"; - }; - }; - "polyglot" = { - version = "0.3.5"; - source = { - type = "gem"; - sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; - }; - }; - "powerpack" = { - version = "0.1.1"; - source = { - type = "gem"; - sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; - }; - }; - "proxifier" = { - version = "1.0.3"; - source = { - type = "gem"; - sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0"; - }; - }; - "pry" = { - version = "0.10.3"; - source = { - type = "gem"; - sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg"; - }; - dependencies = [ - "coderay" - "method_source" - "slop" - ]; - }; - "r-train" = { - version = "0.10.3"; - source = { - type = "gem"; - sha256 = "1hn0aap2lq15p97mb91h32yfsw8rh4imhyjlbs4jx9x52h2q6nam"; - }; - dependencies = [ - "docker-api" - "json" - "mixlib-shellout" - "net-scp" - "net-ssh" - "winrm" - "winrm-fs" - ]; - }; - "rack" = { - version = "1.6.4"; - source = { - type = "gem"; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; - }; - }; - "rainbow" = { - version = "2.1.0"; - source = { - type = "gem"; - sha256 = "11licivacvfqbjx2rwppi8z89qff2cgs67d4wyx42pc5fg7g9f00"; - }; - }; - "rake" = { - version = "10.5.0"; - source = { - type = "gem"; - sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; - }; - }; - "retryable" = { version = "2.0.3"; - source = { - type = "gem"; - sha256 = "0lr3wasxwdyzr0bag179003hs2ycn9w86m450pazc81v19j4x1dq"; - }; }; - "ridley" = { - version = "4.5.0"; + kitchen-inspec = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zpkb9hy6hbdk58xs2lf8rcdbm9l02m607bzdramwfm7czzh08rs"; type = "gem"; - sha256 = "0y0p45y3xp37gg8ab132x4i0iggl3p907wfklhr5gb7r5yj6sj4r"; }; - dependencies = [ - "addressable" - "buff-config" - "buff-extensions" - "buff-ignore" - "buff-shell_out" - "celluloid" - "celluloid-io" - "chef-config" - "erubis" - "faraday" - "hashie" - "httpclient" - "json" - "mixlib-authentication" - "retryable" - "semverse" - "varia_model" - ]; + version = "0.17.0"; }; - "rspec" = { - version = "3.4.0"; + kitchen-vagrant = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qanaqs769lvp3bw0bp2jivjs7n0y1y71x99j0cnx3qag9nbjca5"; type = "gem"; - sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s"; }; - dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" - ]; + version = "1.1.0"; }; - "rspec-core" = { - version = "3.4.4"; + knife-spork = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k2lmcz9ym6n7a5xn3jvlmfls10lbk7h6phqpc7ah1dz6dk4qw8d"; type = "gem"; - sha256 = "1z2zmy3xaq00v20ykamqvnynzv2qrrnbixc6dn0jw1c5q9mqq9fp"; }; - dependencies = [ - "rspec-support" - ]; + version = "1.6.3"; }; - "rspec-expectations" = { - version = "3.4.0"; + libyajl2 = { source = { + # remotes = ["https://rubygems.org"]; + sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; type = "gem"; - sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h"; }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-its" = { version = "1.2.0"; - source = { - type = "gem"; - sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; - }; - dependencies = [ - "rspec-core" - "rspec-expectations" - ]; }; - "rspec-mocks" = { - version = "3.4.1"; + little-plugger = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; type = "gem"; - sha256 = "0sk8ijq5d6bwhvjq94gfm02fssxkm99bgpasqazsmmll5m1cn7vr"; }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; + version = "1.1.4"; }; - "rspec-support" = { - version = "3.4.1"; + logging = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ddy1dh8sshbfaz3magaww1frlk0p3dpishmakpq0c2skp988wl2"; type = "gem"; - sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr"; }; + version = "2.2.0"; }; - "rspec_junit_formatter" = { - version = "0.2.3"; + method_source = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; type = "gem"; - sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai"; }; - dependencies = [ - "builder" - "rspec-core" - ]; + version = "0.8.2"; }; - "rubocop" = { - version = "0.38.0"; + mini_portile2 = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; type = "gem"; - sha256 = "0qgwq558n41z2id7nwc3bh7z8h9yh7c9zdasqn8p30p0p72f5520"; }; - dependencies = [ - "parser" - "powerpack" - "rainbow" - "ruby-progressbar" - "unicode-display_width" - ]; + version = "2.1.0"; }; - "ruby-progressbar" = { - version = "1.7.5"; + minitar = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka"; type = "gem"; - sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; }; + version = "0.5.4"; }; - "rubyntlm" = { - version = "0.6.0"; + mixlib-archive = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b56iprv8cdhxjpzb8ck0mc54cl0kmyzlkn6bzzdqws4gxvdf6gk"; type = "gem"; - sha256 = "00k1cll10mcyg6qpdzyrazm5pjbpj7wq54ki2y8vxz86842vbsgp"; }; - }; - "rubyzip" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s"; - }; - }; - "rufus-lru" = { - version = "1.0.5"; - source = { - type = "gem"; - sha256 = "1vrsbvcsl7yspzb761p2gbl7dwz0d1j82msbjsksf8hi4cv970s5"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sawyer" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j"; - }; - dependencies = [ - "addressable" - "faraday" - ]; - }; - "semverse" = { - version = "1.2.1"; - source = { - type = "gem"; - sha256 = "0s47lprqwmlhnxm3anrhvd3559g51hgrcqn3mq0fy696zkv8vfd8"; - }; - }; - "serverspec" = { - version = "2.31.0"; - source = { - type = "gem"; - sha256 = "169mh6s4drxy9qs7f01gqcaq1qfkvy9hdc1ny3lnk0aiwfcm2s1p"; - }; - dependencies = [ - "multi_json" - "rspec" - "rspec-its" - "specinfra" - ]; - }; - "sfl" = { - version = "2.2"; - source = { - type = "gem"; - sha256 = "0aq7ykbyvx8mx4szkcgp09zs094fg60l2pzxscmxqrgqk9yvyg1j"; - }; - }; - "slop" = { - version = "3.6.0"; - source = { - type = "gem"; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; - }; - }; - "solve" = { - version = "2.0.2"; - source = { - type = "gem"; - sha256 = "0mwdd6z3vbzna9vphnkgdghy40xawn0yiwhamvb6spfk6n2c80kb"; - }; - dependencies = [ - "molinillo" - "semverse" - ]; - }; - "specinfra" = { - version = "2.53.1"; - source = { - type = "gem"; - sha256 = "17jbrn7nm6c72qy1nw064c0yi9cimd295s7j6x9bm878cbyq9i6i"; - }; - dependencies = [ - "net-scp" - "net-ssh" - "net-telnet" - "sfl" - ]; - }; - "syslog-logger" = { - version = "1.6.8"; - source = { - type = "gem"; - sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm"; - }; - }; - "systemu" = { - version = "2.6.5"; - source = { - type = "gem"; - sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; - }; - }; - "test-kitchen" = { - version = "1.6.0"; - source = { - type = "gem"; - sha256 = "1glmvjm24fmlbhm8q4lzi1ynds77ip3s4s5q6fdjlhdanh6jrgwz"; - }; - dependencies = [ - "mixlib-install" - "mixlib-shellout" - "net-scp" - "net-ssh" - "safe_yaml" - "thor" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "timers" = { - version = "4.0.4"; - source = { - type = "gem"; - sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; - }; - dependencies = [ - "hitimes" - ]; - }; - "treetop" = { - version = "1.6.5"; - source = { - type = "gem"; - sha256 = "1lg7j8xf8yxmnz1v8zkwhs4l6j30kq2pxvvrvpah2frlaqz077dh"; - }; - dependencies = [ - "polyglot" - ]; - }; - "unicode-display_width" = { - version = "1.0.2"; - source = { - type = "gem"; - sha256 = "1cffs73zrn788dyd1vv91p0mcxgx2g1sis6552ggmfib3f148gbi"; - }; - }; - "uuidtools" = { - version = "2.1.5"; - source = { - type = "gem"; - sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; - }; - }; - "varia_model" = { version = "0.4.1"; - source = { - type = "gem"; - sha256 = "1qm9fhizfry055yras9g1129lfd48fxg4lh0hck8h8cvjdjz1i62"; - }; - dependencies = [ - "buff-extensions" - "hashie" - ]; }; - "winrm" = { - version = "1.7.2"; + mixlib-authentication = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v2r5klw6c8b67yw906slp8a7wi4v2gmhhi9b1slmm4sg2v0pgah"; type = "gem"; - sha256 = "1as865gd6f0g0hppw8plki1i4afpn6lcx89sgi52v1mlgwxfifff"; }; - dependencies = [ - "builder" - "gssapi" - "gyoku" - "httpclient" - "logging" - "nori" - "rubyntlm" - ]; + version = "1.4.1"; }; - "winrm-fs" = { - version = "0.3.2"; + mixlib-cli = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; type = "gem"; - sha256 = "08j2ip9wx1vcx45kd9ws6lb6znfq9gib1n2j7shzs10rxwgs1bj8"; }; - dependencies = [ - "erubis" - "logging" - "rubyzip" - "winrm" - ]; + version = "1.7.0"; }; - "wmi-lite" = { - version = "1.0.0"; + mixlib-config = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s2ag6jz59r1gn8rbhf5c1g2mpbkc5jmz2fxh3n7hzv80dfzk42w"; type = "gem"; - sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3"; }; + version = "2.2.4"; }; - "yajl-ruby" = { + mixlib-install = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08fmrc9qaagj3i85n37l50d9qpjsv0lkdppmx3y69r3d0xcgfv3p"; + type = "gem"; + }; + version = "2.1.12"; + }; + mixlib-log = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14sknyi9r7rg28m21c8ixzyndhbmi0d6vk02y4hf42dd60hmdbgp"; + type = "gem"; + }; + version = "1.7.1"; + }; + mixlib-shellout = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c6zhas6jfr4zd7f6s7sq7qi34ljs7qmdr4zj3ighpcsawm16zg9"; + type = "gem"; + }; + version = "2.2.7"; + }; + mixlib-versioning = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07an7gxrw6gda98bg9zbfk55b2d58hwpms8wx8sd2x2lv8qs670s"; + type = "gem"; + }; + version = "1.1.0"; + }; + molinillo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758"; + type = "gem"; + }; + version = "0.5.7"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + net-scp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + type = "gem"; + }; version = "1.2.1"; - source = { - type = "gem"; - sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; - }; }; -} \ No newline at end of file + net-sftp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + type = "gem"; + }; + version = "2.1.2"; + }; + net-ssh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + type = "gem"; + }; + version = "4.1.0"; + }; + net-ssh-gateway = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04ws9bvf3ppvcj9vrnwyabcwv4lz1m66ni443z2cf4wvvqssifsa"; + type = "gem"; + }; + version = "1.3.0"; + }; + net-ssh-multi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; + type = "gem"; + }; + version = "1.2.1"; + }; + net-telnet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; + type = "gem"; + }; + version = "0.1.1"; + }; + nio4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ka4923544ckvc9bxd75van9y901cjxmsiq9h5is9j743bz71k1f"; + type = "gem"; + }; + version = "2.0.0"; + }; + nokogiri = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fhmgciw6pfckqgc0aq9kqpbvnakxwh1xf351c9x4xqcj9xjgn0y"; + type = "gem"; + }; + version = "1.7.1"; + }; + nori = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + octokit = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4"; + type = "gem"; + }; + version = "4.7.0"; + }; + ohai = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18bxqa2rh6y6v3pvimy9ffjzrqh7q1my4vd0l7bnsczv07d5gxns"; + type = "gem"; + }; + version = "8.23.0"; + }; + paint = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj"; + type = "gem"; + }; + version = "1.0.1"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyiyd6s2dy42mhqfnvq2f64h78w0jjwgnyha1kz7dnxavncdb7i"; + type = "gem"; + }; + version = "1.11.1"; + }; + parser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq"; + type = "gem"; + }; + version = "2.4.0.0"; + }; + parslet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + type = "gem"; + }; + version = "1.5.0"; + }; + plist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1abhg9bcdk2v4liyf10mnww3ngvkmr7flbzzajwsg2z1pmax8g8b"; + type = "gem"; + }; + version = "3.2.0"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + powerpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + type = "gem"; + }; + version = "0.1.1"; + }; + proxifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0"; + type = "gem"; + }; + version = "1.0.3"; + }; + pry = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar"; + type = "gem"; + }; + version = "0.10.4"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + type = "gem"; + }; + version = "2.0.5"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1"; + type = "gem"; + }; + version = "2.0.1"; + }; + rainbow = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri"; + type = "gem"; + }; + version = "2.2.1"; + dependencies = [ + "rake" + ]; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + type = "gem"; + }; + version = "12.0.0"; + }; + retryable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pxv5xgr08s9gv5npj7h3raxibywznrv2wcrb85ibhlhzgzcxggf"; + type = "gem"; + }; + version = "2.0.4"; + }; + ridley = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y6dcbxmn74qg5psdjk9i751zryfwypf56rb458dkq6b7mwfxxwb"; + type = "gem"; + }; + version = "5.1.0"; + }; + rspec = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i"; + type = "gem"; + }; + version = "3.5.4"; + }; + rspec-expectations = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-its = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; + type = "gem"; + }; + version = "1.2.0"; + }; + rspec-mocks = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec-support = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0"; + type = "gem"; + }; + version = "3.5.0"; + }; + rspec_junit_formatter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai"; + type = "gem"; + }; + version = "0.2.3"; + }; + rubocop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mzv23i11hqwpxh4srvhm8dpzvnk90y46xdfd1fc1g9s054nnbq0"; + type = "gem"; + }; + version = "0.48.1"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; + type = "gem"; + }; + version = "1.8.1"; + }; + rubyntlm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nfl35b2lgc4p3bgl6vmhsisap8h7p0rrb4b20gahji7s4m93bbk"; + type = "gem"; + }; + version = "0.6.1"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + type = "gem"; + }; + version = "1.2.1"; + }; + rufus-lru = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sp7ymz054md75fnn2hx5d2axmhrh0abbn8c2p759j4g4lxn11ip"; + type = "gem"; + }; + version = "1.1.0"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + sawyer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + type = "gem"; + }; + version = "0.8.1"; + }; + semverse = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cf6iv5wgwb7b8jf7il751223k9yahz9aym06s9r0prda5mwddyy"; + type = "gem"; + }; + version = "2.0.0"; + }; + serverspec = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j8fvjzmkcri83p0hiyfdypgbc616w2r0nr6rsi1696cd4nppknp"; + type = "gem"; + }; + version = "2.38.0"; + }; + sfl = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qm4hvhq9pszi9zs1cl9qgwx1n4wxq0af0hq9sbf6qihqd8rwwwr"; + type = "gem"; + }; + version = "2.3"; + }; + slop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; + solve = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bbzny2bl94mv1xwcfrxbi3fjhxxawlz6la7mip2wwz9kkaf376h"; + type = "gem"; + }; + version = "3.1.0"; + }; + specinfra = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gdbkqr82p7s0aq0sixsahapijccs8qswssfmsb76hi40xb2s3sg"; + type = "gem"; + }; + version = "2.67.7"; + }; + sslshake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sm0vxh9ryywsl9iqj8kkwpykh8xrr2fmlv5ysm9jjgwmdpslfvl"; + type = "gem"; + }; + version = "1.1.0"; + }; + syslog-logger = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm"; + type = "gem"; + }; + version = "1.6.8"; + }; + systemu = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; + type = "gem"; + }; + version = "2.6.5"; + }; + test-kitchen = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mg13w1xi36r7vsbdwf7cb06s2j1p2hig144r0hzqwi599w5l9hr"; + type = "gem"; + }; + version = "1.16.0"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + type = "gem"; + }; + version = "0.19.1"; + }; + timers = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; + type = "gem"; + }; + version = "4.0.4"; + }; + toml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + type = "gem"; + }; + version = "0.1.2"; + }; + train = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dglwr6kirqn9k7am4gszvgkpndvyqydlfgmwjwikvpsvf8rxgrl"; + type = "gem"; + }; + version = "0.23.0"; + }; + treetop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kx3qqdbdk5sy44cyinfx2jxr4w9z3qb17f7wicqa2kshbrvnp1q"; + type = "gem"; + }; + version = "1.6.8"; + }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx"; + type = "gem"; + }; + version = "1.1.3"; + }; + uuidtools = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; + type = "gem"; + }; + version = "2.1.5"; + }; + varia_model = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kgj37rc3yia4pr5pma0psgar6xjk064qdfii3nwr6dj1v73cyxz"; + type = "gem"; + }; + version = "0.6.0"; + }; + winrm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xf36sf2cgangij9maphprzhznv4w50arnwrik5jdnmfxc8lqfmh"; + type = "gem"; + }; + version = "2.2.1"; + }; + winrm-elevated = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr"; + type = "gem"; + }; + version = "1.1.0"; + }; + winrm-fs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p9kv5hj57krlrh20ykq8pz4i911r30mbl57n6mc6hfba2zfl7j8"; + type = "gem"; + }; + version = "1.0.1"; + }; + wmi-lite = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3"; + type = "gem"; + }; + version = "1.0.0"; + }; + yajl-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i"; + type = "gem"; + }; + version = "1.3.0"; + }; +} diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 1d6ac8493f19..f64ead3e1078 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "clog-cli-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "clog-tool"; repo = "clog-cli"; - rev = "${version}"; - sha256 = "00sfbchyf50z6mb5dq1837hlrki88rrf043idy6qd1r90488jsbv"; + rev = "v${version}"; + sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - depsSha256 = "0czv190r6xhbw33l0jhlri6rgspxb8f6dakcamh52qr3z9m0xs2x"; + depsSha256 = "0gkg3bxx7nxsvff33n7pif731djfvlzk0msia27h0wq0mazq7kw3"; meta = { description = "Generate changelogs from local git metadata"; diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix new file mode 100644 index 000000000000..bad35e2422b5 --- /dev/null +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "compile-daemon-unstable-${version}"; + version = "2017-03-08"; + rev = "d447e567232bcb84cedd3b2be012c7127f31f469"; + + goPackagePath = "github.com/githubnemo/CompileDaemon"; + + src = fetchFromGitHub { + owner = "githubnemo"; + repo = "CompileDaemon"; + inherit rev; + sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Very simple compile daemon for Go"; + license = licenses.bsd2; + maintainers = with maintainers; [ profpatsch ]; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/development/tools/compile-daemon/deps.nix b/pkgs/development/tools/compile-daemon/deps.nix new file mode 100644 index 000000000000..53771ddad9f0 --- /dev/null +++ b/pkgs/development/tools/compile-daemon/deps.nix @@ -0,0 +1,48 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"; + sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18"; + sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "57fdcb988a5c543893cc61bce354a6e24ab70022"; + sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "99f16d856c9836c42d24e7ab64ea72916925fa97"; + sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "629574ca2a5df945712d3079857300b5e4da0236"; + sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; + }; + } +] 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 000000000000..eaae51f726bb --- /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 5e46b079aaa1..7e11cf531994 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 = "1.11.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 = "082slksd0fs0gpwi7kzmk2i71y52xccsn2r2j6qxmbzxwhpwli83"; + sha256 = "1svml4k1zkmnw49sg4ipzl4fzvxx9rbj0643lwf6vm55j8xykhrq"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1c0awx4q27bckk4xpnw7357d5422iz971jkrfin17wrya4dshg64"; + sha256 = "0xbbbjd7hvhlzi47rzf09fzcpkd7jrf80xk1y736px75yyvq3jr2"; }; in buildGoPackage rec { @@ -29,9 +29,11 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0fvkdiyfp1bf68j3kq721msfhmv8snf968yxgm7d1y6shidghrqb"; + sha256 = "0ddsh31sqjp9xs6mv5jbmqvjq2hcy6j21grrn1m73z8blk4ylxsd"; }; + patches = [ ./fix-shell-path.patch ]; + buildInputs = [ go-bindata ]; preBuild = '' @@ -60,7 +62,7 @@ buildGoPackage rec { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; - platforms = platforms.unix; - maintainers = [ lib.maintainers.bachp ]; + platforms = platforms.unix ++ platforms.darwin; + maintainers = with maintainers; [ bachp zimbatm ]; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch new file mode 100644 index 000000000000..8f71f9ed630c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch @@ -0,0 +1,25 @@ +diff --git a/shells/bash.go b/shells/bash.go +index 839b7781..2b478e1e 100644 +--- a/shells/bash.go ++++ b/shells/bash.go +@@ -7,6 +7,7 @@ import ( + "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common" + "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers" + "io" ++ "os/exec" + "path" + "runtime" + "strconv" +@@ -208,7 +209,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo + if info.User != "" { + script.Command = "su" + if runtime.GOOS == "linux" { +- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell) ++ shellPath, err := exec.LookPath(b.Shell) ++ if err != nil { ++ shellPath = "/bin/"+b.Shell ++ } ++ script.Arguments = append(script.Arguments, "-s", shellPath) + } + script.Arguments = append(script.Arguments, info.User) + script.Arguments = append(script.Arguments, "-c", shellCommand) \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix new file mode 100644 index 000000000000..a3e6a063596b --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix @@ -0,0 +1,68 @@ +{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: + +let + 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 = "0qy3xrq574c1lhkqw1zrkcn32w0ky3f4fppzdjhb5zwqvnaz7kx0"; + }; + + docker_arm = fetchurl { + url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; + sha256 = "12clc28yc157s2kaa8239p0g086vq062jfjh2m1bxqmaypw9pyla"; + }; +in +buildGoPackage rec { + inherit version; + name = "gitlab-runner-${version}"; + goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner"; + commonPackagePath = "${goPackagePath}/common"; + buildFlagsArray = '' + -ldflags= + -X ${commonPackagePath}.NAME=gitlab-runner + -X ${commonPackagePath}.VERSION=${version} + -X ${commonPackagePath}.REVISION=v${version} + ''; + + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "gitlab-ci-multi-runner"; + rev = "v${version}"; + sha256 = "1xgx8jbgcc3ga7dkjxa2i8nj4afsdavzpfrgpdzma03jkcq1g2sv"; + }; + + patches = [ ./fix-shell-path.patch ]; + + buildInputs = [ go-bindata ]; + + preBuild = '' + ( + # go-bindata names the assets after the filename thus we create a symlink with the name we want + cd go/src/${goPackagePath} + ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} prebuilt-arm.tar.xz + go-bindata \ + -pkg docker \ + -nocompress \ + -nomemcopy \ + -o executors/docker/bindata.go \ + prebuilt-x86_64.tar.xz \ + prebuilt-arm.tar.xz + ) + ''; + + postInstall = '' + install -d $out/bin + # The recommended name is gitlab-runner so we create a symlink with that name + ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner + ''; + + meta = with lib; { + description = "GitLab Runner the continuous integration executor of GitLab"; + license = licenses.mit; + homepage = "https://about.gitlab.com/gitlab-ci/"; + platforms = platforms.unix; + maintainers = [ lib.maintainers.bachp ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3196b6728e05..8be5c6ebe85a 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.44"; + version = "2.66"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d"; + sha256 = "05n03rm5vjzcz1f36829hwviw7i8l8d728nvr4cnf6mcl3rxciyl"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix new file mode 100644 index 000000000000..2764c81d6d86 --- /dev/null +++ b/pkgs/development/tools/coursier/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + name = "coursier-${version}"; + version = "1.0.0-RC3"; + + src = fetchurl { + url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; + sha256 = "0iiv79ig8p9pm7fklxskxn6bx1m4xqgdfdk6bvqq81gl8b101z5w"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/bin + cp ${src} $out/bin/coursier + chmod +x $out/bin/coursier + wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ; + ''; + + meta = with stdenv.lib; { + homepage = http://get-coursier.io/; + description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; + license = licenses.asl20; + maintainers = with maintainers; [ adelbertc nequissimus ]; + }; +} diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix new file mode 100644 index 000000000000..bcb0cf1d5e4c --- /dev/null +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -0,0 +1,40 @@ +{ lib, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "pgcli-${version}"; + version = "1.6.0"; + + src = fetchFromGitHub { + sha256 = "0f1zv4kwi2991pclf8chrhgjwf8jkqxdh5ndc9qx6igh56iyyncz"; + rev = "v${version}"; + repo = "pgcli"; + owner = "dbcli"; + }; + + buildInputs = with pythonPackages; [ pytest mock ]; + checkPhase = '' + mkdir /tmp/homeless-shelter + HOME=/tmp/homeless-shelter py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' + ''; + + propagatedBuildInputs = with pythonPackages; [ + click configobj humanize prompt_toolkit psycopg2 + pygments sqlparse pgspecial setproctitle + ]; + + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + rm tests/test_rowlimit.py + ''; + + meta = with lib; { + description = "Command-line interface for PostgreSQL"; + longDescription = '' + Rich command-line interface for PostgreSQL with auto-completion and + syntax highlighting. + ''; + homepage = https://pgcli.com; + license = licenses.bsd3; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index c9aecd591354..a43d3928980e 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qt5, sqlite, cmake }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "3.9.1"; name = "sqlitebrowser-${version}"; @@ -11,20 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; }; - buildInputs = [ qt5.qtbase qt5.qttools sqlite cmake ]; - - enableParallelBuilding = true; - + buildInputs = [ qtbase qttools sqlite ]; + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-DUSE_QT5=TRUE" ]; - + # A regression was introduced in CMakeLists.txt on v3.9.x # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 - patchPhase = '' + postPatch = '' substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "DB Browser for SQLite"; homepage = "http://sqlitebrowser.org/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 18933426db0a..ef339d47ea05 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,8 +1,9 @@ {stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool , makeWrapper, python2Packages }: -python2Packages.mkPythonDerivation { +python2Packages.buildPythonApplication { name = "gnome-doc-utils-0.20.10"; + format = "other"; src = fetchurl { url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 3d5c23678dbd..fc2651b91574 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.4.15"; + version = "1.6.6"; name = "electron-${version}"; meta = with stdenv.lib; { @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "07b9jdbjrf3siv205wd1dphq6ly0hkaapzvj87d2yjfiyzv3cbsl"; + sha256 = "1k6y1wcsb2z9h8wdj5f1z1fprvc3bvsj4rfx58if7q74qiq3q102"; name = "${name}.zip"; }; @@ -45,7 +45,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0p8gkyq4qczzia26wrnbs91vdqzxhgq515cmsrwvhw87mc9fka4k"; + sha256 = "1hp42iy32lymh9d5zp4vr51qjrr83wjxmbws0c16yw7zchq7fr64"; name = "${name}.zip"; }; diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 434348473ef6..a351c325ea24 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-2015-10-10"; + name = "FlameGraph-2017-07-01"; src = fetchFromGitHub { owner = "brendangregg"; repo = "FlameGraph"; - rev = "182b24fb635345d48c91ed1de58a08b620312f3d"; - sha256 = "1djz0wl8202a6j87ka9j3d8iw3bli056lrn73gv2i65p16rwk9kc"; + 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 000000000000..b4bc680a19aa --- /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/git-series/default.nix b/pkgs/development/tools/git-series/default.nix new file mode 100644 index 000000000000..b792cfe8c994 --- /dev/null +++ b/pkgs/development/tools/git-series/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }: + +with rustPlatform; + +buildRustPackage rec { + version = "0.9.1"; + name = "git-series-${version}"; + + src = fetchFromGitHub { + owner = "git-series"; + repo = "git-series"; + rev = version; + sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; + }; + + depsSha256 = "1xypk9ck7znca0nqm61m5ngpz6q7c0wydlpwxq4mnkd1np27xn53"; + + nativeBuildInputs = [ cmake pkgconfig perl ]; + buildInputs = [ openssl zlib ]; + + postBuild = '' + mkdir -p "$out/man/man1" + cp "$src/git-series.1" "$out/man/man1" + ''; + + meta = with stdenv.lib; { + description = "A tool to help with formatting git patches for review on mailing lists"; + longDescription = '' + git series tracks changes to a patch series over time. git + series also tracks a cover letter for the patch series, + formats the series for email, and prepares pull requests. + ''; + homepage = https://github.com/git-series/git-series; + + license = licenses.mit; + maintainer = [ maintainers.vmandela ]; + }; +} diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix new file mode 100644 index 000000000000..ded0aaa92424 --- /dev/null +++ b/pkgs/development/tools/github/cligh/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "cligh-${version}"; + version = "0.3"; + + doCheck = false; # no tests + + src = fetchFromGitHub { + owner = "CMB"; + repo = "cligh"; + rev = "v${version}"; + sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ]; + + meta = with stdenv.lib; { + homepage = "http://the-brannons.com/software/cligh.html"; + description = "A simple command-line interface to the facilities of Github"; + longDescription = '' + Cligh is a simple command-line interface to the facilities of GitHub. + It is written by Christopher Brannon chris@the-brannons.com. The + current version is 0.3, released July 23, 2016. This program is still + in the early stage of development. It is by no means feature-complete. + A friend and I consider it useful, but others may not. + ''; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.jhhuh ]; + }; +} diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 5a77ec7eaa6a..9a3ff192ba93 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.1.1"; + version = "1.2.1"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,11 +12,13 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "1idxgn9yf8shw4mq4d7rhf8fvb2s1lli4r4ck0h8ddf1s9q8p63s"; + sha256 = "0fr9aa50yvchfhv6h6zqblx8ynxk41i2hmv87b344zr2rz6rms72"; }; goDeps = ./deps.nix; + outputs = [ "bin" "out" "man" ]; + buildInputs = [ go-bindata goimports makeWrapper ]; preBuild = ''go generate ./...''; @@ -24,6 +26,9 @@ buildGoPackage rec { wrapProgram $bin/bin/go2nix \ --prefix PATH : ${nix-prefetch-git}/bin \ --prefix PATH : ${git}/bin + + mkdir -p $man/share/man/man1 + cp $src/go2nix.1 $man/share/man/man1 ''; allowGoReference = true; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 7ebbc1b88e30..62bf6557f68c 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, mesa, mesa_glu, zlib }: +, libpulseaudio, mesa_glu, zlib }: 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 = [ gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib + freetype openssl alsaLib libpulseaudio mesa_glu zlib ]; patches = [ ./pkg_config_additions.patch ]; diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index f5e835a73749..c4675322e2b3 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 new file mode 100644 index 000000000000..e6f36b6e32eb --- /dev/null +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchzip, python27, python27Packages, makeWrapper }: + +with python27Packages; + +stdenv.mkDerivation rec { + name = "google-app-engine-go-sdk-${version}"; + 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 = "1gwrmqs69h3wbx6z0a7shdr8gn1qiwrkvh3pg6mi7dybwmd1x61h"; + } + else + fetchzip { + url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip"; + sha256 = "0b8r2fqg9m285ifz0jahd4wasv7cq61nr6p1k664w021r5y5lbvr"; + }; + + buildInputs = [python27 makeWrapper]; + + installPhase = '' + mkdir -p $out/bin $out/share/ + cp -r "$src" "$out/share/go_appengine" + + # create wrappers with correct env + for i in goapp appcfg.py; do + makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \ + --prefix PATH : "${python27}/bin" \ + --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})" + done + ''; + + meta = with stdenv.lib; { + description = "Google App Engine SDK for Go"; + version = version; + homepage = "https://cloud.google.com/appengine/docs/go/"; + license = licenses.asl20; + platforms = ["x86_64-linux" "x86_64-darwin"]; + maintainers = with maintainers; [ lufia ]; + }; +} diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 156def09187a..7ca54365be5b 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Guile-Lint checks syntax and semantics in a Guile program or module"; homepage = http://user42.tuxfamily.org/guile-lint/index.html; license = "GPL"; + broken = true; }; } diff --git a/pkgs/development/tools/haskell/intero-nix-shim/default.nix b/pkgs/development/tools/haskell/intero-nix-shim/default.nix new file mode 100644 index 000000000000..7e82518c9b6b --- /dev/null +++ b/pkgs/development/tools/haskell/intero-nix-shim/default.nix @@ -0,0 +1,27 @@ +{ mkDerivation, base, cabal-install, directory, fetchFromGitHub +, filepath, intero, optparse-applicative, posix-escape, split +, stdenv, unix +}: +mkDerivation { + pname = "intero-nix-shim"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "michalrus"; + repo = "intero-nix-shim"; + rev = "0.1.2"; + sha256 = "0p1h3w15bgvsbzi7f1n2dxxxz9yq7vmbxmww5igc5d3dm76skgzg"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative posix-escape split + unix + ]; + postInstall = '' + mkdir -p $out/libexec + ln -s ${cabal-install}/bin/cabal $out/libexec + ln -s ${intero }/bin/intero $out/libexec + ''; + homepage = "https://github.com/michalrus/intero-nix-shim"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 71b363b27406..b3df9c605e03 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -2,31 +2,28 @@ stdenv.mkDerivation rec { name = "multi-ghc-travis-${version}"; - version = "git-2016-10-23"; + version = "git-2017-07-27"; buildInputs = [ ghc ]; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "03dd35f3801d6af4224906d45e982a748de9960e"; - sha256 = "1s08n8diis22cafych66zihdnd5q3dkv8m6i3a2s5g5f1phsk3mi"; + rev = "f21804164cf646d682d7da668a625cdbd8baf05a"; + sha256 = "07l3qzlc2hl7g5wbgqh8ld8ynl004i6m7p903667gbhs7sw03nbl"; }; - patchPhase = '' - substituteInPlace make_travis_yml.hs --replace "make_travis_yml.hs" "multi-ghc-travis" - ''; - installPhase = '' mkdir -p $out/bin - ghc -O --make make_travis_yml_2.hs -o $out/bin/multi-ghc-travis + ghc -O --make make_travis_yml.hs -o $out/bin/make-travis-yml + ghc -O --make make_travis_yml_2.hs -o $out/bin/make-travis-yml-2 ''; meta = with stdenv.lib; { description = "Generate .travis.yml for multiple ghc versions"; homepage = "https://github.com/hvr/multi-ghc-travis"; - license = licenses.free; - platforms = platforms.all; - maintainers = with maintainers; [ jb55 ]; + license = licenses.bsd3; + platforms = ghc.meta.platforms; + maintainers = with maintainers; [ jb55 peti ]; }; } diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 9c4b1f631488..db779ecbb0f9 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 f9c43ee841ba..0e0a46c906e3 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let cli = buildGoPackage rec { name = "cli-${version}"; - version = "5.6.14"; + version = "5.6.32"; goPackagePath = "github.com/heroku/cli"; @@ -14,8 +14,21 @@ let owner = "heroku"; repo = "cli"; rev = "v${version}"; - sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9"; + sha256 = "062aa79mv2njjb0ix7isbz6646wxmsldv27bsz5v2pbv597km0vz"; }; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + -X=main.Channel=stable + -X=main.Autoupdate=no + ''; + + preCheck = '' + export HOME=/tmp + ''; + + doCheck = true; }; in stdenv.mkDerivation rec { @@ -28,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/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh deleted file mode 100755 index 35e94d0fab93..000000000000 --- a/pkgs/development/tools/java/jclasslib/builder.sh +++ /dev/null @@ -1,22 +0,0 @@ -source $stdenv/setup || exit 1 - -tar zxf $src || exit 1 -cd jclasslib || exit 1 - -xpf-rm -f build.xml "//taskdef" - -ant clean || exit 1 -ant jar || exit 1 - -mkdir -p $out/bin -mv build/jclasslib.jar $out/bin/ || exit 1 - -cat >> $out/bin/jclasslib </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/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index b9a517f671fc..a5ad3910f3f0 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, ncurses, readline, flex, texinfo, help2man }: +{ stdenv, fetchurl, ncurses, readline, flex, texinfo }: stdenv.mkDerivation rec { name = "cgdb-${version}"; - version = "0.6.8"; + version = "0.7.0"; src = fetchurl { url = "http://cgdb.me/files/${name}.tar.gz"; - sha256 = "0hfgyj8jimb7imqlfdpzaln787r6r0yzwzmnk91rfl19pqlkw85y"; + sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; }; - buildInputs = [ ncurses readline flex texinfo help2man ]; + buildInputs = [ ncurses readline flex texinfo ]; meta = with stdenv.lib; { description = "A curses interface to gdb"; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index b00b9cc9910b..563d76930880 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,33 +1,26 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - inherit perl; - - name = "checkbashisms"; version = "2.0.0.2"; + name = "checkbashisms-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/checkbaskisms/${version}/${name}"; + url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; }; + buildInputs = [ perl ]; + # The link returns directly the script. No need for unpacking unpackPhase = "true"; installPhase = '' - mkdir -p $out/bin - cp $src $out/bin/checkbashisms - chmod 755 $out/bin/checkbashisms - ''; - - # Makes sure to point to the proper perl version - fixupPhase = '' - sed -e "s#/usr/bin/perl#$perl/bin/perl#" -i $out/bin/checkbashisms + install -D -m755 $src $out/bin/checkbashisms ''; meta = { homepage = http://sourceforge.net/projects/checkbaskisms/; description = "Check shell scripts for non-portable syntax"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index d768f68576c5..c8378e06df6d 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 000000000000..20d149f3efe0 --- /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/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 75a06291b021..a952475b9673 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ascherer"; repo = "cwebbin"; - rev = name; + rev = "2016-05-20-22p"; sha256 = "0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr"; }; cweb = fetchurl { - url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb.tar.gz; + url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz; sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; }; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "CP=cp" "RM=rm" "PDFTEX=echo" + "CC=c++" ]; buildPhase = '' diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 2ada782563e5..4fec00a2fd7e 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -4,9 +4,9 @@ let version = "${major}.11"; major = "0.3"; -in pythonPackages.mkPythonDerivation rec { +in pythonPackages.buildPythonApplication rec { name = "d-feet-${version}"; - namePrefix = ""; + format = "other"; src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index aae4a2fd5a12..5509ededb070 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchgit, cmake, pcre, doxygen }: stdenv.mkDerivation rec { - name = "editorconfig-core-c-${meta.version}"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-c.git"; - rev = "d1c2c881158dfb9faa4498a0b19593dcd105d6b8"; - fetchSubmodules = true; + rev = "v${meta.version}"; sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; + fetchSubmodules = true; inherit name; }; - buildInputs = [ cmake pcre doxygen ]; + buildInputs = [ pcre ]; + nativeBuildInputs = [ cmake doxygen ]; meta = with stdenv.lib; { - homepage = "http://editorconfig.org/"; + homepage = http://editorconfig.org/; description = "EditorConfig core library written in C"; longDescription = '' EditorConfig makes it easy to maintain the correct coding style when @@ -25,11 +25,10 @@ stdenv.mkDerivation rec { by those editors. For information on the file format and supported text editors, see the EditorConfig website. ''; - downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; + downloadPage = https://github.com/editorconfig/editorconfig-core-c; license = with licenses; [ bsd2 bsd3 ]; version = "0.12.1"; - maintainers = [ maintainers.dochang ]; + maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; }; - } diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix new file mode 100644 index 000000000000..603f8c0bef60 --- /dev/null +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "elfkickers-${version}"; + version = "3.1"; + + src = fetchurl { + url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; + sha256 = "0n0sypjrdm3ramv0sby4sdh3i3j9d0ihadr951wa08ypdnq3yrkd"; + }; + + makeFlags = [ "CC=cc prefix=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; + description = "A collection of programs that access and manipulate ELF files"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.dtzWill ]; + }; +} diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 8f3818fb6b4c..b8e2a9a189bc 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 f39d15bc7be6..78dd4a1e3f55 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,44 +1,44 @@ { fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo, zlib , dejagnu, perl, pkgconfig -, python ? null + +, buildPlatform, hostPlatform, targetPlatform + +, pythonSupport ? hostPlatform == buildPlatform && !hostPlatform.isCygwin, python ? null , guile ? null -, target ? null + # Support all known targets in one gdb binary. , multitarget ? false + # Additional dependencies for GNU/Hurd. , mig ? null, hurd ? null - }: let - - basename = "gdb-7.12.1"; - - # Whether (cross-)building for GNU/Hurd. This is an approximation since - # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and - # `nativeDrv'. - isGNU = - stdenv.system == "i686-gnu" - || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu"); - + basename = "gdb-${version}"; + version = "8.0"; in -assert isGNU -> mig != null && hurd != null; +assert targetPlatform.isHurd -> mig != null && hurd != null; +assert pythonSupport -> python != null; stdenv.mkDerivation rec { - name = basename + stdenv.lib.optionalString (target != null) - ("-" + target.config); + name = + stdenv.lib.optionalString (targetPlatform != hostPlatform) + (targetPlatform.config + "-") + + basename; src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "11ii260h1sd7v0bs3cz6d5l8gqxxgldry0md60ncjgixjw5nh1s6"; + sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn"; }; nativeBuildInputs = [ pkgconfig texinfo perl ] - ++ stdenv.lib.optional isGNU mig; + # TODO(@Ericson2314) not sure if should be host or target + ++ stdenv.lib.optional targetPlatform.isHurd mig; - buildInputs = [ ncurses readline gmp mpfr expat zlib python guile ] - ++ stdenv.lib.optional isGNU hurd + buildInputs = [ ncurses readline gmp mpfr expat zlib guile ] + ++ stdenv.lib.optional pythonSupport python + ++ stdenv.lib.optional targetPlatform.isHurd hurd ++ stdenv.lib.optional doCheck dejagnu; enableParallelBuilding = true; @@ -46,24 +46,19 @@ stdenv.mkDerivation rec { # darwin build fails with format hardening since v7.12 hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ]; - 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}" - "--with-separate-debug-dir=/run/current-system/sw/lib/debug" - ] - ++ optional (target != null) "--target=${target.config}" - ++ optional multitarget "--enable-targets=all" - ++ optional (elem stdenv.system platforms.cygwin) "--without-python"; + NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - crossAttrs = { - # Do not add --with-python here to avoid cross building it. - configureFlags = with stdenv.lib; - [ "--with-gmp=${gmp.crossDrv}" "--with-mpfr=${mpfr.crossDrv}" "--with-system-readline" - "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.crossDrv}" "--without-python" - ] - ++ optional (target != null) "--target=${target.config}" - ++ optional multitarget "--enable-targets=all"; - }; + # 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}" + ] ++ stdenv.lib.optional hostPlatform.isLinux + # 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" + ++ stdenv.lib.optional multitarget "--enable-targets=all"; postInstall = '' # Remove Info files already provided by Binutils and other packages. diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix new file mode 100644 index 000000000000..24f099a15337 --- /dev/null +++ b/pkgs/development/tools/misc/gede/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: + +stdenv.mkDerivation rec { + name = "gede-${version}"; + version = "2.0.4"; + + src = fetchurl { + url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; + sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; + }; + + nativeBuildInputs = [ makeWrapper python ]; + + 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 ]} + ''; + + meta = with stdenv.lib; { + description = "Graphical frontend (GUI) to GDB"; + homepage = "http://gede.acidron.com"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ juliendehos ]; + }; +} diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index bd111c4ffbbd..f55130ae1048 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "global-${version}"; - version = "6.5.6"; + version = "6.5.7"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "018m536k5y6lks1a6gqn3bsp7r8zk017znqj9kva1nm8d7x9lbqj"; + sha256 = "0cnd7a7d1pl46yk15q6mnr9i9w3xi8pxgchw4ia9njgr4jjqzh6r"; }; nativeBuildInputs = [ libtool makeWrapper ]; @@ -34,8 +34,10 @@ stdenv.mkDerivation rec { cp -v *.el "$out/share/emacs/site-lisp" wrapProgram $out/bin/gtags \ + --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \ --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" wrapProgram $out/bin/global \ + --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \ --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; 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 20b99998154d..82f8cf1cb37b 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 8bf3db59147b..5e2edce56f0d 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 e9da64b112b6..f438e72b64e1 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 0906492ad101..d5423fea2be8 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -55,21 +55,22 @@ let TextTable XMLSimple nixUnstable + nixUnstable.perl-bindings git boehmgc ]; }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-02-03"; + version = "2017-07-24"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "a366f362e197476615a813e2cc904b60db28e65f"; - sha256 = "0q7bywh59aqgpgj9ca2xscszxal9c3c90bs7sb4cfg7w8g6m69hf"; + rev = "a6d9201947aa1468d31ef5c2651251ceeefceb5c"; + sha256 = "0hk5pxzn94ip3nyccxl91zc5n6wd1h2zcbhdq9p38wa4lrnnm5zv"; }; buildInputs = @@ -103,7 +104,7 @@ in releaseTools.nixBuild rec { configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - preHook = '' + shellHook = '' PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH PERL5LIB=$(pwd)/src/lib:$PERL5LIB; ''; diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index 7f8dafad4af5..37bc73172da2 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index e7520091d1d9..d1aef990230b 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps }: +, procps, autoconf, automake }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.17"; + name = "intel-gpu-tools-1.19"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6"; + sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps ]; preBuild = '' patchShebangs debugger/system_routine/pre_cpp.py + substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 8c2686d9a229..70ed9cd0570e 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "XML to PO and back again"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix new file mode 100644 index 000000000000..71e21d31bb7a --- /dev/null +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -0,0 +1,45 @@ +{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }: + +with stdenv.lib; +let + inherit (builtins) elemAt; + archOverrides = { + "i686" = "x86"; + }; + info = splitString "-" stdenv.system; + arch = (elemAt info 0); + elasticArch = archOverrides."${arch}" or arch; + plat = elemAt info 1; + shas = { + "x86_64-linux" = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y"; + "i686-linux" = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9"; + "x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl"; + }; +in stdenv.mkDerivation rec { + name = "kibana-${version}"; + version = elk5Version; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/kibana $out/bin + mv * $out/libexec/kibana/ + rm -r $out/libexec/kibana/node + makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = licenses.asl20; + maintainers = with maintainers; [ offline rickynils ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index a81255212da5..f25fbcd00d84 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 000000000000..71bc3b87a7ac --- /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/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix new file mode 100644 index 000000000000..adc5ba967583 --- /dev/null +++ b/pkgs/development/tools/misc/lit/default.nix @@ -0,0 +1,22 @@ +{ lib, python2 }: + +python2.pkgs.buildPythonApplication rec { + pname = "lit"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = python2.pkgs.fetchPypi { + inherit pname version; + sha256 = "3ea4251e78ebeb2e07be2feb33243d1f8931d956efc96ccc2b0846ced212b58c"; + }; + + # Non-standard test suite. Needs custom checkPhase. + doCheck = false; + + meta = { + description = "Portable tool for executing LLVM and Clang style test suites"; + homepage = "http://llvm.org/docs/CommandGuide/lit.html"; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix new file mode 100644 index 000000000000..d0458c304679 --- /dev/null +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitLab }: +buildGoPackage rec { + name = "loccount-${version}"; + version = "1.0"; + + goPackagePath = "gitlab.com/esr/loccount"; + excludedPackages = "tests"; + + src = fetchFromGitLab { + owner = "esr"; + repo = "loccount"; + rev = version; + sha256 = "081wf7fckn76m4x0jwq4h2fsbhpb6f67dha77ni3p6wg7q6sihqx"; + }; + + meta = with stdenv.lib; { + description = "Re-implementation of sloccount in Go"; + longDescription = '' + loccount is a re-implementation of David A. Wheeler's sloccount tool + in Go. It is faster and handles more different languages. Because + it's one source file in Go, it is easier to maintain and extend than the + multi-file, multi-language implementation of the original. + + The algorithms are largely unchanged and can be expected to produce + identical numbers for languages supported by both tools. Python is + an exception; loccount corrects buggy counting of single-quote multiline + literals in sloccount 2.26. + ''; + homepage="https://gitlab.com/esr/loccount"; + downloadPage="https://gitlab.com/esr/loccount/tree/master"; + license = licenses.bsd2; + maintainers = with maintainers; [ calvertvl ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 733399ebf7d6..9e29487a2f3c 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 2d3fc6560524..3b294d137574 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 000000000000..e6f7ac3290b4 --- /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/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index bae9f07bda48..3c309493a33b 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -1,26 +1,39 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "objconv-${version}"; - version = "2.16"; + version = "2.44"; - src = fetchFromGitHub { - owner = "vertis"; - repo = "objconv"; - rev = "${version}"; - sha256 = "1by2bbrampwv0qy8vn4hhs49rykczyj7q8g373ym38da3c95bym2"; + src = fetchurl { + # Versioned archive of objconv sources maintained by orivej. + url = "https://archive.org/download/objconv/${name}.zip"; + sha256 = "1dlnpv8qwz0rwivpbgk84kmsjz3vh1i149z44ha2dvg8afzyfhjl"; }; - buildPhase = "c++ -o objconv -O2 src/*.cpp"; + nativeBuildInputs = [ unzip ]; - installPhase = "mkdir -p $out/bin && mv objconv $out/bin"; + outputs = [ "out" "doc" ]; + + unpackPhase = '' + mkdir -p "$name" + cd "$name" + unpackFile "$src" + unpackFile source.zip + ''; + + buildPhase = "c++ -o objconv -O2 *.cpp"; + + installPhase = '' + mkdir -p $out/bin $out/doc/objconv + mv objconv $out/bin + mv objconv-instructions.pdf $out/doc/objconv + ''; meta = with stdenv.lib; { - description = "Used for converting object files between COFF/PE, OMF, ELF and Mach-O formats for all 32-bit and 64-bit x86 platforms."; + description = "Object and executable file converter, modifier and disassembler"; homepage = http://www.agner.org/optimize/; license = licenses.gpl2; - maintainers = with maintainers; [ vrthra ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ orivej vrthra ]; + platforms = 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 246173d465af..c1dd808e6008 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 d0e63469987b..5be42855a9c7 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,10 +1,9 @@ {stdenv, fetchurl, automake, libiconv, vanilla ? false }: -let - inherit (stdenv.lib) optional; -in +with stdenv.lib; + stdenv.mkDerivation rec { - name = "pkg-config-0.29"; + name = "pkg-config-0.29.2"; setupHook = ./setup-hook.sh; @@ -13,26 +12,26 @@ stdenv.mkDerivation rec { "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz" "http://fossies.org/linux/misc/${name}.tar.gz" ]; - sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68"; + sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; - preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux") + preConfigure = optionalString (stdenv.system == "mips64el-linux") ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; - buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; + buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] - ++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; + ++ 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"; homepage = http://pkg-config.freedesktop.org/wiki/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 77066cfc8e15..fbb21a8b7c65 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0a3h1b9fb87c82d5fbql5lc4gp338pa5s9i66dhw7zk8jdygx474"; }; + patches = [ + ./getopt_on_darwin.patch + ]; + configurePhase = '' sed -i -r Makefile \ -e 's,/usr/,/,g' \ @@ -38,7 +42,7 @@ stdenv.mkDerivation rec { trees or files; and vifn, to invoke vi given a function name rather than a file name. ''; - platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch new file mode 100644 index 000000000000..534d6c1d6ef7 --- /dev/null +++ b/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch @@ -0,0 +1,15 @@ +diff --git a/decomment.c b/decomment.c +index 400707a..aea29fd 100644 +--- a/decomment.c ++++ b/decomment.c +@@ -11,6 +11,10 @@ + #include "getopt.h" + #endif + ++#ifdef __APPLE__ ++#include "getopt.h" ++#endif ++ + #ifdef NEED_OPTIND + extern int optind; + #endif diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix new file mode 100644 index 000000000000..b0bb32449a4c --- /dev/null +++ b/pkgs/development/tools/misc/premake/5.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, CoreServices }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "premake-${version}"; + version = "5.0.0pre.alpha.11"; + + src = fetchFromGitHub { + owner = "premake"; + repo = "premake-core"; + rev = "5dfb0238bc309df04819dd430def621ce854678d"; + sha256 = "0k9xbqrnbwj0hnmdgcrwn70py1kiqvr10l42aw42xnlmdyg1sgsc"; + }; + + buildInputs = optional stdenv.isDarwin [ CoreServices ]; + + patchPhase = optional stdenv.isDarwin '' + substituteInPlace premake5.lua \ + --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 + ''; + + buildPhase = + if stdenv.isDarwin then '' + make -f Bootstrap.mak osx + '' else '' + make -f Bootstrap.mak linux + ''; + + installPhase = '' + install -Dm755 bin/release/premake5 $out/bin/premake5 + ''; + + meta = { + homepage = https://premake.github.io; + description = "A simple build configuration and project generation tool using lua"; + license = stdenv.lib.licenses.bsd3; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 266a9824ed2a..a506831cd8ea 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,28 +1,41 @@ -{stdenv, fetchurl, ncurses, libpcap }: +{stdenv, fetchFromGitHub, autoreconfHook, ncurses, libpcap }: stdenv.mkDerivation rec { - - version = "3.4-beta2"; + version = "3.5.1"; name = "sipp-${version}"; - src = fetchurl { - url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz"; - sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv"; + src = fetchFromGitHub { + owner = "SIPp"; + repo = "sipp"; + rev = "v${version}"; + sha256 = "179a1fvqyk3jpxbi28l1xfw22cw9vgvxrn19w5f38w74x0jwqg5k"; }; - configurePhase = '' - export ac_cv_lib_curses_initscr=yes - export ac_cv_lib_pthread_pthread_mutex_init=yes + patchPhase = '' sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp - ./configure --prefix=$out --with-pcap + sed -i -e "s|AC_CHECK_LIB(curses|AC_CHECK_LIB(ncurses|" configure.ac + echo "#define SIPP_VERSION \"v${version}\"" > include/version.h ''; + configureFlags = [ + "--with-pcap" + ]; + postInstall = '' mkdir -pv $out/share/pcap cp pcap/* $out/share/pcap ''; buildInputs = [ncurses libpcap]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = http://sipp.sf.net; + description = "The SIPp testing tool"; + license = licenses.gpl3; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index d0e05dd35f8d..2dad1c596ab7 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.15"; + version = "4.18"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "1a9wb2nzfqgwazd0yrlbk48awlfn898n1bdayvdxj7qlssac1kf0"; + sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 21da4b21a4ba..6dbaca26c818 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index dfcfe7c9e897..2a6b6880183a 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ urkud wkennington ]; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index b6223230c1c9..540db210eb4e 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchgit, libmysql, libxslt, zlib, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql, + libaio }: stdenv.mkDerivation rec { - name = "sysbench-2015-04-22"; + name = "sysbench-1.0.6"; - buildInputs = [ autoreconfHook libmysql libxslt zlib ]; + buildInputs = [ autoreconfHook pkgconfig vim libmysql libaio ]; - src = fetchgit { - url = git://github.com/akopytov/sysbench.git; - rev = "2b3042883090c9cf8cb9be2b24d3590cdcee112f"; - sha256 = "1xlb3fracha3wva3dmmjk36b262vblynkmiz8n0mn1vkc78bssaw"; + src = fetchFromGitHub { + owner = "akopytov"; + repo = "sysbench"; + rev = "1.0.6"; + sha256 = "0y3hlhzrggyyxwf378n006zlg2kwhmhh6vq6il0qn9agjmjmhl5l"; }; - preAutoreconf = '' - touch NEWS AUTHORS - ''; - meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index db86f1a56d6e..7b360655c4f7 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/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index d88a06c64048..057c01a1885b 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "tokei-${version}"; - version = "4.0.0"; - src = fetchurl { - url = "https://github.com/Aaronepower/tokei/archive/${version}.tar.gz"; - sha256 = "1c7z3dgxr76dq6cvan3hgqlkcv61gmg6fkv6b98viymh4fy9if68"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "Aaronepower"; + repo = "tokei"; + rev = "v${version}"; + sha256 = "1j8k2i25c989mf15jwy4a4vazjc7x7pm8zywycg8xvv4ik1im7m7"; }; - depsSha256 = "0v4gplk7mkkik9vr1lqsr0yl1kqkqh14ncw95yb9iv7hcxvmcqn3"; + depsSha256 = "184x6lwma3lawr2dcc7ivkp1j049af9w040dyzca6i56i2s9998p"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index e84e87fb5232..529be0793605 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -3,32 +3,32 @@ GEM specs: addressable (2.4.0) backports (3.6.8) - ethon (0.8.1) + ethon (0.10.1) ffi (>= 1.3.0) - faraday (0.9.2) + faraday (0.11.0) multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - ffi (1.9.10) - gh (0.14.0) - addressable + faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) + ffi (1.9.18) + gh (0.15.1) + addressable (~> 2.4.0) backports faraday (~> 0.8) multi_json (~> 1.0) - net-http-persistent (>= 2.7) + net-http-persistent (~> 2.9) net-http-pipeline highline (1.7.8) - json (1.8.3) + json (2.0.3) launchy (2.4.3) addressable (~> 2.3) - multi_json (1.11.2) + multi_json (1.12.1) multipart-post (2.0.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) pusher-client (0.6.2) json websocket (~> 1.0) - travis (1.8.2) + travis (1.8.8) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -39,7 +39,7 @@ GEM typhoeus (~> 0.6, >= 0.6.8) typhoeus (0.8.0) ethon (>= 0.8.0) - websocket (1.2.2) + websocket (1.2.4) PLATFORMS ruby @@ -48,4 +48,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.11.2 + 1.14.4 diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index abfd352e90ec..148923848beb 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -18,42 +18,42 @@ ethon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0afvvv4sxs330jhk4xz9kj6qgj70yvd4zsjnb9yvxhmaq49k8yij"; + sha256 = "1i873cvma4j52xmij7kasjylh66vf60cy5prkp4cz4hcn9jlkznl"; type = "gem"; }; - version = "0.8.1"; + version = "0.10.1"; }; faraday = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; type = "gem"; }; - version = "0.9.2"; + version = "0.11.0"; }; faraday_middleware = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h"; + sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.0.1"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.10"; + version = "1.9.18"; }; gh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j7m6jmxzkxvnqgnhmci33a89qpaxxcrm55kk5vz4bcpply04hx2"; + sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.1"; }; highline = { source = { @@ -66,10 +66,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; type = "gem"; }; - version = "1.8.3"; + version = "2.0.3"; }; launchy = { source = { @@ -82,10 +82,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.1"; }; multipart-post = { source = { @@ -122,10 +122,10 @@ travis = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ph83whzw5hjkp1kgbkjd2g0vi6kdr9sif6vxvxgjf186id43q0s"; + sha256 = "02bjz73f6r9b7nskwzcvcbr4hlvgwrf9rnr6d218d2i1rk4ww936"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.8"; }; typhoeus = { source = { @@ -138,9 +138,9 @@ websocket = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frcsgj4f984db920xwapflqwgrwncw86c1rv94pp5gs2q1iaap4"; + sha256 = "1shymfaw14p8jdi74nwz4nsgc9cmpli166lkp5g5wbhjmhmpvrnh"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.4"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 8857e1d1e910..e3af8181601f 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "uhd-${version}"; - version = "3.10.1"; + version = "3.10.1.1"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_010_001_000"; - sha256 = "1wypn1cspwx331ah7awajjhnpyjykiif0h1l4fb3lahxvsnkwi51"; + rev = "release_003_010_001_001"; + sha256 = "009pynjfpwbf3vfyg4w5yhcn4xb93afagqb3p5svjxzswh90j1d2"; }; enableParallelBuilding = true; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { USRP devices are designed and sold by Ettus Research, LLC and its parent company, National Instruments. ''; - homepage = http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki; + homepage = https://uhd.ettus.com/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index a45db5fbcaf1..0ad79005d91e 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, tcl, usb-modeswitch }: +{ stdenv, fetchurl, tcl, usb-modeswitch }: stdenv.mkDerivation rec { name = "usb-modeswitch-data-${version}"; @@ -15,10 +15,9 @@ stdenv.mkDerivation rec { sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules ''; - buildInputs = [ libusb1 usb-modeswitch ]; # we add tcl here so we can patch in support for new devices by dropping config into # the usb_modeswitch.d directory - nativeBuildInputs = [ pkgconfig tcl ]; + nativeBuildInputs = [ tcl ]; meta = with stdenv.lib; { description = "Device database and the rules file for 'multi-mode' USB devices"; diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix new file mode 100644 index 000000000000..b613508c5c05 --- /dev/null +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }: + +stdenv.mkDerivation rec { + name = "xxdiff-4.0.1.20170101"; + + src = fetchFromBitbucket { + owner = "blais"; + repo = "xxdiff"; + rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8"; + sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z"; + }; + + nativeBuildInputs = [ flex bison qt5.qtbase docutils ]; + + buildInputs = [ qt5.qtbase ]; + + preConfigure = '' + ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs + ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true + ''; + + NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets"; + + configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap"; + + installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; + + + meta = with stdenv.lib; { + homepage = http://furius.ca/xxdiff/; + description = "Graphical file and directories comparator and merge tool"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub raskin ]; + }; +} diff --git a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch deleted file mode 100644 index baa907b21262..000000000000 --- a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt -index 2074c58e..9ecd6e57 100644 ---- a/cpp/ycm/CMakeLists.txt -+++ b/cpp/ycm/CMakeLists.txt -@@ -335,7 +335,7 @@ - COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$" - ) - -- if( APPLE ) -+ #if( APPLE ) - # In OS X El Capitan, Apple introduced System Integrity Protection. - # Amongst other things, this introduces features to the dynamic loader - # (dyld) which cause it to "sanitise" (and complain about) embedded -@@ -354,15 +354,15 @@ - # simply strip the rpath entry from the dylib. There's no way any - # @executable_path that python might have could be in any way useful to - # libclang.dylib, so this seems perfectly safe. -- get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) -- add_custom_command( TARGET ${PROJECT_NAME} -- POST_BUILD -- COMMAND install_name_tool -- "-delete_rpath" -- "@executable_path/../lib" -- "$/${LIBCLANG_TAIL}" -- ) -- endif() -+ # get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) -+ #add_custom_command( TARGET ${PROJECT_NAME} -+ # POST_BUILD -+ # COMMAND install_name_tool -+ # "-delete_rpath" -+ # "@executable_path/../lib" -+ # "$/${LIBCLANG_TAIL}" -+ # ) -+ # endif() - endif() - endif() diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 9ac227ac0063..cc805b499d43 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -2,27 +2,28 @@ , gocode ? null , godef ? null , rustracerd ? null -, Cocoa ? null +, fixDarwinDylibNames, Cocoa ? null }: stdenv.mkDerivation rec { name = "ycmd-${version}"; - version = "2017-02-03"; + version = "2017-03-27"; src = fetchgit { url = "git://github.com/Valloric/ycmd.git"; - rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d"; - sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi"; + rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2"; + sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj"; }; - buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ cmake boost ] + ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ]; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} ${python.interpreter} build.py --clang-completer --system-boost ''; - patches = [ ./2-ycm-cmake.patch ]; + patches = [ ./dont-symlink-clang.patch ]; configurePhase = ":"; @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { " ycmd/__main__.py mkdir -p $out/lib/ycmd - cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/ + cp -r ycmd/ CORE_VERSION libclang.so.* libclang.dylib* ycm_core.so $out/lib/ycmd/ mkdir -p $out/bin ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { description = "A code-completion and comprehension server"; homepage = https://github.com/Valloric/ycmd; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi cstrahan ]; + maintainers = with maintainers; [ rasendubi cstrahan lnl7 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch new file mode 100644 index 000000000000..6af691426bb7 --- /dev/null +++ b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch @@ -0,0 +1,16 @@ +diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt +index 00e4882..8f29797 100644 +--- a/cpp/ycm/CMakeLists.txt ++++ b/cpp/ycm/CMakeLists.txt +@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG ) + # our libraries require, in particular the Python one (from pyenv for + # instance). + set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) +- # When loading our library, the dynamic linker will look for +- # libclang.so.4, not libclang.so.4.x. +- file( RENAME +- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION} +- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} ) + endif() + endif() + diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 84e57e267c2f..1eed4c2ad862 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/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index eb6e50840a5b..a68b29dee248 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, python35Packages }: -python35Packages.buildPythonApplication rec { - name = "mypy-${version}"; - version = "0.501"; +{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast }: + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "mypy"; + version = "0.511"; # Tests not included in pip package. doCheck = false; - src = fetchurl { - url = "mirror://pypi/m/mypy/${name}.tar.gz"; - sha256 = "164g3dq2vzxa53n9lgvmbapg41qiwcxk1w9mvzmnqksvql5vm60h"; + src = fetchPypi { + inherit pname version; + sha256 = "1vmfyi6zh49mi7rmns5hjgpqshq7islxwsgp80j1izf82r8xgx1z"; }; - propagatedBuildInputs = with python35Packages; [ lxml typed-ast ]; + propagatedBuildInputs = [ lxml typed-ast ]; meta = with stdenv.lib; { description = "Optional static typing for Python"; homepage = "http://www.mypy-lang.org"; license = licenses.mit; - maintainers = with maintainers; [ martingms ]; + maintainers = with maintainers; [ martingms lnl7 ]; }; } diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix new file mode 100644 index 000000000000..aef851e64765 --- /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/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 780862b6727f..7cdf7dc93964 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, ocaml, ncurses }: +{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }: let pname = "camlidl"; @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { ln -s $out/camlidl $out/bin ''; + setupHook = writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" + export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" + ''; + meta = { description = "A stub code generator and COM binding for Objective Caml"; homepage = "${webpage}"; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 12148625a05b..648ec965d35c 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 ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation { postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META"; + dontStrip = true; + meta = with stdenv.lib; { description = "Preprocessor-pretty-printer for OCaml"; longDescription = '' diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 59130bec50e4..e778337ca5ca 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: let pname = "cppo"; - version = "1.3.2"; + version = "1.5.0"; webpage = "http://mjambon.com/${pname}.html"; in -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "mjambon"; repo = pname; rev = "v${version}"; - sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1"; + sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 71da6dd6d32f..846546ae7699 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 096330a31ae1..7cd32991d0eb 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/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index 9d6485841fae..f1bf5e33a617 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchzip, ocaml, opam }: stdenv.mkDerivation { - name = "jbuilder-1.0+beta2"; + name = "jbuilder-1.0+beta7"; src = fetchzip { - url = http://github.com/janestreet/jbuilder/archive/1.0+beta2.tar.gz; - sha256 = "0xbq6p0n4a740l3jvq4a0a58mwfcal0q37vi8ix053f3jiqki6ng"; + url = http://github.com/janestreet/jbuilder/archive/1.0+beta7.tar.gz; + sha256 = "10qjqs6gv9y8s580gvssjm56xw72pcxd5lkpzqpz6cz4390d45i8"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 81cd2caf7ee0..23556a0edbde 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/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 7af1b5ccd7a3..6f0d71d76b18 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, yojson, menhir, lib +{ stdenv, fetchzip, ocaml, findlib, yojson, lib , withEmacsMode ? false, emacs }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -8,10 +8,10 @@ let then "2.3.1" else - "2.5.3"; + "2.5.4"; hashes = { "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn"; - "2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha"; + "2.5.4" = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh"; }; in @@ -24,7 +24,7 @@ stdenv.mkDerivation { sha256 = hashes."${version}"; }; - buildInputs = [ ocaml findlib yojson menhir ] + buildInputs = [ ocaml findlib yojson ] ++ stdenv.lib.optional withEmacsMode emacs; preConfigure = "mkdir -p $out/bin"; 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 b5e977d623b3..000000000000 --- 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 214a2239688a..6ff5ee72666e 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 000000000000..1de95f730372 --- /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 5f3a2b884b16..e9331d078cf3 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,32 +1,31 @@ { stdenv, fetchzip, ncurses -, ocaml, ocpBuild, findlib, lablgtk, ocp-index -, opam }: +, ocamlPackages +, jbuilder }: stdenv.mkDerivation { - name = "ocaml-top-1.1.2"; + name = "ocaml-top-1.1.4"; src = fetchzip { - url = https://github.com/OCamlPro/ocaml-top/archive/1.1.2.tar.gz; - sha256 = "10wfz8d6c1lbh31kayvlb5fj7qmgh5c6xhs3q595dnf9skrf091j"; + url = https://github.com/OCamlPro/ocaml-top/archive/1.1.4.tar.gz; + sha256 = "1lmzjmnzsg8xdz0q5nm95zclihi9z80kzsalapg0s9wq0id8qm4j"; }; - buildInputs = [ ncurses opam ocaml ocpBuild findlib lablgtk ocp-index ]; + buildInputs = [ ncurses jbuilder ] + ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); configurePhase = '' export TERM=xterm ocp-build -init ''; - buildPhase = "ocp-build ocaml-top"; + buildPhase = "jbuilder build"; - installPhase = '' - opam-installer --script --prefix=$out ocaml-top.install | sh - ''; + inherit (jbuilder) installPhase; meta = { homepage = http://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; - platforms = ocaml.meta.platforms or []; + platforms = ocamlPackages.ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index df6c66cb98f0..5062f53cd71a 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4, ocamlmod, ocamlify, ounit, expect}: let - version = "0.9.3"; + version = "0.11.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "1ikm51lx4jz5vmbvrdwsm5p59bwbz3pi22vqkyz5lmqcciyn69i3"; + sha256 = "0c8lv15ngmrc471jmkv0jp3d573chibwnjlavps047d9hd8gwxak"; }; createFindlibDestdir = true; @@ -22,6 +22,7 @@ stdenv.mkDerivation { make -f configure.make Makefile.config \ "OCAMLBUILD_PREFIX=$out" \ "OCAMLBUILD_BINDIR=$out/bin" \ + "OCAMLBUILD_MANDIR=$out/share/man" \ "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" ''; @@ -33,4 +34,3 @@ stdenv.mkDerivation { maintainers = with maintainers; [ vbgl ]; }; } - diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 931e6989aa10..2a9a634d0a4a 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/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix new file mode 100644 index 000000000000..ee70a80b6af5 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: + +let inherit (stdenv.lib) getVersion versionAtLeast; in + +assert versionAtLeast (getVersion ocaml) "3.12.1"; +assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast "0.9.8" (getVersion cmdliner); + +stdenv.mkDerivation { + + name = "ocp-indent-1.5.2"; + + src = fetchzip { + url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; + sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; + }; + + nativeBuildInputs = [ ocpBuild opam ]; + + buildInputs = [ ocaml findlib cmdliner ]; + + createFindlibDestdir = true; + + preConfigure = "patchShebangs ./install.sh"; + + postInstall = '' + mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} + ''; + + meta = with stdenv.lib; { + homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + description = "A customizable tool to indent OCaml code"; + license = licenses.gpl3; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.jirkamarsik ]; + }; +} diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index d146dd5e9731..500002bed444 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -3,18 +3,21 @@ let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; +assert versionAtLeast (getVersion cmdliner) "1.0.0"; assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "ocp-indent-1.5.2"; + name = "ocp-indent-${version}"; + version = "1.6.0"; src = fetchzip { - url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; - sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; + url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; + sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; }; - buildInputs = [ ocaml findlib ocpBuild opam cmdliner ]; + nativeBuildInputs = [ ocpBuild opam ]; + buildInputs = [ ocaml findlib cmdliner ]; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix new file mode 100644 index 000000000000..c212ce324b33 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, ocamlPackages }: + +stdenv.mkDerivation rec +{ + name = "ocsigen-i18n"; + version = "3.1.0"; + + buildInputs = with ocamlPackages; [ ocaml findlib ]; + + installPhase = '' + mkdir -p $out/bin + make bindir=$out/bin install + ''; + + src = fetchurl { + url = "https://github.com/besport/${name}/archive/${version}.tar.gz"; + sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; + }; + + meta = { + homepage = https://github.com/besport/ocsigen-i18n; + description = "I18n made easy for web sites written with eliom"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + }; + +} diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 9b41a06c9355..0f73f4c54afc 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, ocaml_react -, lambdaTerm, ocaml_lwt, makeWrapper, camomile, zed, cppo, ppx_tools +{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4, ocaml_react +, 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}"; @@ -11,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x"; }; - buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ocaml findlib ocamlbuild cppo camlp4 ppx_tools ]; propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; @@ -25,13 +30,43 @@ stdenv.mkDerivation rec { make doc ''; + dontStrip = true; + postFixup = - let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; - in - '' + let + path = "etc/utop/env"; + + # derivation of just runtime deps so env vars created by + # setup-hooks can be saved for use at runtime + runtime = stdenv.mkDerivation rec { + name = "utop-runtime-env-${version}"; + + buildInputs = [ findlib ] ++ propagatedBuildInputs; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p "$out"/${path} + for e in OCAMLPATH CAML_LD_LIBRARY_PATH; do + printf %s "''${!e}" > "$out"/${path}/$e + done + ''; + }; + + get = key: ''$(cat "${runtime}/${path}/${key}")''; + in '' for prog in "$out"/bin/* do - wrapProgram $prog --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH' + + # Note: wrapProgram by default calls 'exec -a $0 ...', but this + # breaks utop on Linux with OCaml 4.04, and is disabled with + # '--argv0 ""' flag. See https://github.com/NixOS/nixpkgs/issues/24496 + wrapProgram "$prog" \ + --argv0 "" \ + --prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \ + --prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \ + --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") \ + --add-flags "-I ${findlib}/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib" done ''; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5c0ea18cab32..bcf08712ccb1 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "0.12.2"; + version = "1.0.0"; goPackagePath = "github.com/mitchellh/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "mitchellh"; repo = "packer"; rev = "v${version}"; - sha256 = "1li141y7rfbn021h33dnryhms5xwzqz8d92djnprbh7ba9ff02zm"; + sha256 = "16hdh3iwvdg1jk3pswa9r9lq4qkhds1lrqwl19vd1v2yz2r76kzi"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index a92e8aa72518..e6765806e4f7 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } 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 000000000000..acf7edf0145e --- /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/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index fdfac484bf10..c34eb9fc7084 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -1,17 +1,23 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "byacc-1.9"; +stdenv.mkDerivation rec { + name = "byacc-${version}"; + version = "20170201"; src = fetchurl { - url = ftp://invisible-island.net/byacc/byacc-20140715.tgz; - sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c"; + urls = [ + "ftp://invisible-island.net/byacc/${name}.tgz" + "http://invisible-mirror.net/archives/byacc/${name}.tgz" + ]; + sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91"; }; - meta = { + doCheck = true; + + meta = with stdenv.lib; { description = "Berkeley YACC"; - homepage = http://dickey.his.com/byacc/byacc.html; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + homepage = http://invisible-island.net/byacc/byacc.html; + license = licenses.publicDomain; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index 4b35ba0cce29..5406b4e9a0e5 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, jansson }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: stdenv.mkDerivation rec { name = "jshon-20140712"; @@ -12,14 +12,23 @@ stdenv.mkDerivation rec { repo = "jshon"; }; + patches = [ + # Fix null termination in read_stream. + # https://github.com/keenerd/jshon/issues/53 + (fetchpatch { + url = https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch; + sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl"; + }) + ]; + buildInputs = [ jansson ]; - patchPhase = + patchPhase = '' substituteInPlace Makefile --replace "/usr/" "/" ''; - preInstall = + preInstall = '' export DESTDIR=$out ''; diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index b1b9a6dee4ef..1706b5448e14 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://piumarta.com/software/peg/; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 0fe243e8aaff..02a13bfa28dc 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -3,7 +3,7 @@ }: let - generic = { version, sha256 }: + generic = { version, sha256, license }: stdenv.mkDerivation rec { name = "ragel-${version}"; @@ -27,7 +27,7 @@ let meta = with stdenv.lib; { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = licenses.gpl2; + inherit license; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; @@ -37,12 +37,14 @@ in { ragelStable = generic { - version = "6.9"; - sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf"; + version = "6.10"; + sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az"; + license = stdenv.lib.licenses.gpl2; }; ragelDev = generic { - version = "7.0.0.9"; - sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr"; + version = "7.0.0.10"; + sha256 = "1v4ddzxal4gf8l8nkn32qabba6nbpd2mg8sphgmdn8kaqv52nmj0"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index a70afe511798..dcf89d1604d9 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/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 1e6b6690e71b..e6c2467bc8a0 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts +{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git +, nix-prefetch-hg }: let - version = "1.6.0"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn"; + sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za"; }; click = fetchurl { - url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz"; - sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc"; + url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz"; + sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; requests = fetchurl { - url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz"; - sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d"; + url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz"; + sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp"; }; in stdenv.mkDerivation rec { @@ -27,7 +28,11 @@ in stdenv.mkDerivation rec { click requests ]; - buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ]; + buildInputs = [ + pythonPackages.python pythonPackages.flake8 + zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg + ]; + sourceRoot = "."; postUnpack = '' @@ -47,13 +52,14 @@ in stdenv.mkDerivation rec { patchPhase = '' sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py - sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py + sed -i -e "s|nix-prefetch-git|${nix-prefetch-git}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py + sed -i -e "s|nix-prefetch-hg|${nix-prefetch-hg}/bin/nix-prefetch-hg|" $out/pkgs/pypi2nix/stage2.py ''; commonPhase = '' mkdir -p $out/bin - echo "#!${python.interpreter}" > $out/bin/pypi2nix + echo "#!${pythonPackages.python.interpreter}" > $out/bin/pypi2nix echo "import pypi2nix.cli" >> $out/bin/pypi2nix echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix @@ -62,8 +68,16 @@ in stdenv.mkDerivation rec { export PYTHONPATH=$out/pkgs:$PYTHONPATH ''; + # flake8 doesn't run on python3 + doCheck = false; + checkPhase = '' + flake8 ${src}/src + ''; + installPhase = commonPhase + '' - wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH" + wrapProgram $out/bin/pypi2nix \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "${nix-prefetch-git}/bin:${nix-prefetch-hg}/bin" ''; shellHook = '' diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 1fd70730265a..fe6aeb3fa6e1 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, pkgs}: - -with pkgs; +{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }: stdenv.mkDerivation rec { - name = "quilt-0.63"; + + name = "quilt-0.65"; src = fetchurl { url = "mirror://savannah/quilt/${name}.tar.gz"; - sha256 = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52"; + sha256 = "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn"; }; buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; @@ -31,4 +30,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; + } diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index dbc2401970b9..35aab138292d 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonApplication rec { +with pythonPackages; buildPythonApplication rec { name = "reno-${version}"; - version = "1.8.0"; + version = "2.3.2"; src = fetchurl { url = "mirror://pypi/r/reno/${name}.tar.gz"; - sha256 = "1pqg0xzcilmyrrnpa87m11xwlvfc94a98s28z9cgddkhw27lg3ps"; + sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4"; }; # Don't know how to make tests pass @@ -15,8 +15,8 @@ pythonPackages.buildPythonApplication rec { # Nothing to strip (python files) dontStrip = true; - propagatedBuildInputs = with pythonPackages; [ pbr six pyyaml ]; - buildInputs = with pythonPackages; [ Babel ]; + propagatedBuildInputs = [ pbr six pyyaml dulwich ]; + buildInputs = [ Babel ]; meta = with stdenv.lib; { description = "Release Notes Manager"; diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index b383812d321d..eef8b660c41d 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -4,59 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "rq-${version}"; - version = "0.9.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "dflemstr"; repo = "rq"; rev = "v${version}"; - sha256 = "051k7ls2mbjf584crayd654wm8m7gk3b7s73j97f9l8sbppdhpcq"; + sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002"; }; - serde_json = fetchFromGitHub { - owner = "serde-rs"; - repo = "json"; - rev = "0c05059e4533368020bd356bd708c38286810a7d"; - sha256 = "0924ngqbsif2vmmpgn8l2gg4bzms0z0i7yng0zx6sdv0x836lw43"; - }; - - v8_rs = fetchFromGitHub { - owner = "dflemstr"; - repo = "v8-rs"; - rev = "0772be5b2e84842a2d434963702bc2995aeda90b"; - sha256 = "0h2n431rp6nqpip7dy7xpckkvcr19aq7l1f3x3wlrj02xi4c8mad"; - }; - - cargoDepsHook = '' - # use non-git dependencies - (cd $sourceRoot && patch -p1 < +Date: Sat, 15 Apr 2017 20:42:10 +0200 +Subject: [PATCH] use hardcoded dynamic-linker +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + src/rustup-cli/common.rs | 3 ++- + src/rustup/toolchain.rs | 22 ++++++++++++++++++++-- + 2 files changed, 22 insertions(+), 3 deletions(-) + +diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs +index 1abf345..21096e7 100644 +--- a/src/rustup-cli/common.rs ++++ b/src/rustup-cli/common.rs +@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String { + if toolchain.exists() { + let rustc_path = toolchain.binary_file("rustc"); + if utils::is_file(&rustc_path) { +- let mut cmd = Command::new(&rustc_path); ++ let mut cmd = Command::new("@dynamicLinker@"); ++ cmd.arg(&rustc_path); + cmd.arg("--version"); + toolchain.set_ldpath(&mut cmd); + +diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs +index dc29c32..212a4ab 100644 +--- a/src/rustup/toolchain.rs ++++ b/src/rustup/toolchain.rs +@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> { + } + Path::new(&binary) + }; +- let mut cmd = Command::new(&path); ++ let mut cmd = wrap_elf_interpreter(&path); + self.set_env(&mut cmd); + Ok(cmd) + } +@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> { + } else { + src_file + }; +- let mut cmd = Command::new(exe_path); ++ let mut cmd = wrap_elf_interpreter(exe_path); + self.set_env(&mut cmd); + cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name); + Ok(cmd) +@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> { + path + } + } ++ ++fn wrap_elf_interpreter>(p: S) -> Command { ++ use std::fs::File; ++ use std::io::Read; ++ let path = Path::new(&p); ++ let is_elf = File::open(path).map(|mut f| { ++ let mut buf = [0; 4]; ++ let _ = f.read(&mut buf); ++ buf == b"\x7fELF"[..] ++ }).unwrap_or(false); ++ if is_elf { ++ let mut cmd = Command::new("@dynamicLinker@"); ++ cmd.arg(&path); ++ cmd ++ } else { ++ Command::new(&path) ++ } ++} +-- +2.12.2 + diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix new file mode 100644 index 000000000000..b9e6a0e2d816 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, runCommand +, fetchFromGitHub, rustPlatform +, pkgconfig, curl, Security }: + +rustPlatform.buildRustPackage rec { + name = "rustup-${version}"; + version = "1.2.0"; + + depsSha256 = "06bfz5kyj3k0yxv55dq0s1arx34sy1jjfrpgd83rf99026vcm5x2"; + + src = fetchFromGitHub { + owner = "rust-lang-nursery"; + repo = "rustup.rs"; + rev = version; + sha256 = "0qwl27wh7j03h511bd8fq5fif5xcmkiyy9rm3hri7czjqr01mw0v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + curl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoBuildFlags = [ "--features no-self-update" ]; + + patches = lib.optionals stdenv.isLinux [ + (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out + '') + ]; + + postInstall = '' + pushd $out/bin + mv rustup-init rustup + for link in cargo rustc rustdoc rust-gdb rust-lldb; do + ln -s rustup $link + done + popd + + # tries to create .rustup + export HOME=$(mktemp -d) + mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions} + $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup" + $out/bin/rustup completions fish > "$out/share/fish/completions/rustup.fish" + $out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup" + ''; + + meta = with stdenv.lib; { + description = "The Rust toolchain installer"; + homepage = https://www.rustup.rs/; + license = licenses.mit; + maintainer = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index f8569249c06a..3caec9a75c15 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.8"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0n3c9ihrxqy4y4mzgchggqa2v7c0y9jw2yqnjdd7cf4nd24fixbq"; + sha256 = "1y6jmz0kdaz1fq9sirwxznzw52if6ypd0dp9mk7dkpipy0bx7pz6"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1pdvx4apd4x1bsyl8lhzlpv3jp3xzyv7yrsl3wjrql17p2asaba6"; + sha256 = "13nd2g1z4nvc3fa30xr3jnkqcy3fv4751s7ws4l93p7x6nc4aw1n"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "03kn7i0a6mpxfc6mz9h560wadhmw5qxn15is7cl9kgkz5j874xlz"; + sha256 = "0f8kcx7qd6bqbd74y6n83lb52zban9k631qkv1vyddvs9pjsxmpg"; } ); diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 59a16bfc27cb..dc7f96ea8a09 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.6.8"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { - url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "0xafl7vmncdycapi9shxqf73nhb24llgxjd2x98irmr9bvzg844q"; + url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; + sha256 = "1iaanrxk5lhxx1zj9gbxzgqbnyy1azfrab984mga7di5z1hs02s2"; }; unpackPhase = "tar xvzf $src"; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 488fefe62c41..26e820517c04 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -2,30 +2,53 @@ , glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf , libXi, libXrender, libXext }: +let + allSpecs = { + "i686-linux" = { + system = "linux32"; + sha256 = "70845d81304c5f5f0b7f65274216e613e867e621676a09790c8aa8ef81ea9766"; + }; -# note: there is a i686 version available as well -assert stdenv.system == "x86_64-linux"; + "x86_64-linux" = { + system = "linux64"; + sha256 = "bb2cf08f2c213f061d6fbca9658fc44a367c1ba7e40b3ee1e3ae437be0f901c2"; + }; -stdenv.mkDerivation rec { - product = "chromedriver_linux64"; - name = "${product}-2.25"; - version = "2.25"; - - src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; - sha256 = "0z6c3q73pi83iidq3n85sxhc9yikkf9rf22hnn8manrhfsg784fh"; + "x86_64-darwin" = { + system = "mac64"; + sha256 = "6c30bba7693ec2d9af7cd9a54729e10aeae85c0953c816d9c4a40a1a72fd8be0"; + }; }; - buildInputs = [ unzip makeWrapper ]; + spec = allSpecs."${stdenv.system}" + or (throw "missing chromedriver binary for ${stdenv.system}"); +in +stdenv.mkDerivation rec { + name = "chromedriver-${version}"; + version = "2.29"; + + src = fetchurl { + url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; + sha256 = spec.sha256; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; unpackPhase = "unzip $src"; + libs = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib + cairo fontconfig freetype + gdk_pixbuf glib gtk2 gconf + libX11 nspr nss pango libXrender + gconf libXext libXi + ]; + installPhase = '' - mkdir -p $out/bin - mv chromedriver $out/bin + install -m755 -D chromedriver $out/bin/chromedriver + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver - wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk2 libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" + wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { @@ -33,6 +56,6 @@ stdenv.mkDerivation rec { description = "A WebDriver server for running Selenium tests on Chrome"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = attrNames allSpecs; }; } diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 9fa6b8b5716c..5ad2647ea310 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}"; installFlags = buildFlags + " DESTDIR=$(out)"; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; + postFixup = '' target="$out/bin/simavr" patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e724d00e4d39..f9c5ee1b7b9e 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,22 +1,38 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree }: + +with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.16"; + version = "0.1.22"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - buildInputs = [ gpgme ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs pkgconfig ostree ]; src = fetchFromGitHub { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "11na7imx6yc1zijb010hx6fjh6v0m3wm5r4sa2nkclm5lkjq259b"; + sha256 = "0aivs37bcvx3g22a9r3q1vj2ahw323g1vaq9jzbmifm9k0pb07jy"; }; + patches = [ + ./path.patch + ]; + + preBuild = '' + export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" + export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + ''; + + postInstall = '' + mkdir $bin/etc + cp -v ./go/src/github.com/projectatomic/skopeo/default-policy.json $bin/etc/default-policy.json + ''; + meta = { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/projectatomic/skopeo"; diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch new file mode 100644 index 000000000000..eb3c54ae66c4 --- /dev/null +++ b/pkgs/development/tools/skopeo/path.patch @@ -0,0 +1,38 @@ +diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go +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" + + "github.com/Sirupsen/logrus" + "github.com/containers/image/signature" +@@ -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 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/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index cb6c4614a1a4..b3049736b710 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, fetchgit, zip, unzip, firefox, bash}: +{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.10.2"; + version="0.10.3"; name="${baseName}-${version}"; - hash="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529"; - url="http://download.slimerjs.org/releases/0.10.2/slimerjs-0.10.2.zip"; - sha256="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529"; + owner = "laurentj"; + repo = "${baseName}"; + sha256="16v6a1kcq8il4snbrgsq5xmxs35alzf4qlmscr2yli95xq5fnl5y"; + rev = "${version}"; }; buildInputs = [ unzip zip @@ -16,12 +17,15 @@ in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; + #src = fetchurl { + # inherit (s) url sha256; + #}; #src = fetchgit { # inherit (s) url sha256 rev; #}; + src = fetchFromGitHub { + inherit (s) owner repo rev sha256; + }; preConfigure = '' test -d src && cd src test -f omni.ja || zip omni.ja -r */ diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 9bc9bf9c0e41..bfd4b7370e0a 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -4,18 +4,18 @@ let spirv_sources = { # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in - # `/spirv-tools_revision`. + # `/external_revisions/spirv-tools_revision`. tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "37422e9dba1a3a8cb8028b779dd546d43add6ef8"; - sha256 = "0sp2p4wg902clq0fr94vj19vyv43cq333jjxr0mjzay8dw2h4yzk"; + rev = "7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4"; + sha256 = "0rh25y1k3m3f1nqs032lh3mng5qfw9kqn6xv9yzzm47i1i0b6hmr"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "c470b68225a04965bf87d35e143ae92f831e8110"; - sha256 = "18jgcpmm0ixp6314r5w144l3wayxjkmwqgx8dk5jgyw36dammkwd"; + rev = "6c08995e6e7b94129e6086c78198c77111f2f262"; + sha256 = "07m12wm9prib7hldj7pbc8vwnj0x6llgx4shzgy8x4xbhbafawws"; }; }; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2016-12-19"; + version = "2017-03-23"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; license = licenses.asl20; platforms = platforms.linux; + maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 350cda4e2630..578e759548a1 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeQtWrapper +{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper , boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }: let qscintillaLib = (qscintilla.override { withQt5 = true; }); -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "tora-${version}"; version = "3.1"; @@ -15,10 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7"; }; - enableParallelBuilding = true; - + nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ - cmake extra-cmake-modules makeQtWrapper boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase ]; @@ -54,11 +52,11 @@ in stdenv.mkDerivation rec { ]; postFixup = '' - wrapQtProgram $out/bin/tora \ + wrapProgram $out/bin/tora \ --prefix PATH : ${lib.getBin graphviz}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tora SQL tool"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 73cb902ae695..c7ba985d0f75 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt -, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr +, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi @@ -11,7 +11,7 @@ let libPath64 = lib.makeLibraryPath [ gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr alsaLib GConf cups libcap fontconfig freetype pango - cairo dbus expat zlib libpng12 + cairo dbus expat zlib libpng12 udev libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]; @@ -25,19 +25,16 @@ let gnome-sharp gtk-sharp-2_0 ]; - ver = "5.3.5"; + ver = "5.6.1"; build = "f1"; - date = "20160525"; - pkgVer = "${ver}${build}"; - fullVer = "${pkgVer}+${date}"; in stdenv.mkDerivation rec { name = "unity-editor-${version}"; - version = pkgVer; + version = "${ver}x${build}"; src = fetchurl { - url = "http://download.unity3d.com/download_unity/linux/unity-editor-installer-${fullVer}.sh"; - sha256 = "0lmc65175fdvbyn3565pjlg6cc4l5i58fj7bxzi5cqykkbzv5wdm"; + url = "http://beta.unity3d.com/download/6a86e542cf5c/unity-editor-installer-${version}Linux.sh"; + sha256 = "10z4h94c9h967gx4b3gwb268zn7bnrb7ylnqnmnqhx6byac7cf4m"; }; nosuidLib = ./unity-nosuid.c; @@ -46,47 +43,19 @@ in stdenv.mkDerivation rec { outputs = [ "out" "monodevelop" ]; + sourceRoot = "unity-editor-${version}Linux"; + unpackPhase = '' echo -e 'q\ny' | fakeroot sh $src - sourceRoot="unity-editor-${pkgVer}" ''; buildPhase = '' - patchFile() { - ftype="$(file -b "$1")" - if [[ "$ftype" =~ LSB\ .*dynamically\ linked ]]; then - if [[ "$ftype" =~ 32-bit ]]; then - rpath="${libPath32}" - intp="$(cat $NIX_CC/nix-support/dynamic-linker-m32)" - else - rpath="${libPath64}" - intp="$(cat $NIX_CC/nix-support/dynamic-linker)" - fi - - rpath="$(patchelf --print-rpath "$1"):$rpath" - if [[ "$ftype" =~ LSB\ shared ]]; then - patchelf \ - --set-rpath "$rpath" \ - "$1" - elif [[ "$ftype" =~ LSB\ executable ]]; then - patchelf \ - --set-rpath "$rpath" \ - --interpreter "$intp" \ - "$1" - fi - fi - } cd Editor $CC -fPIC -shared -o libunity-nosuid.so $nosuidLib -ldl strip libunity-nosuid.so - # Exclude PlaybackEngines to build something that can be run on FHS-compliant Linuxes - find . -name PlaybackEngines -prune -o -executable -type f -print | while read path; do - patchFile "$path" - done - cd .. ''; @@ -124,7 +93,42 @@ in stdenv.mkDerivation rec { --prefix MONO_GAC_PREFIX : "${developDotnetPath}" ''; + preFixup = '' + patchFile() { + ftype="$(file -b "$1")" + if [[ "$ftype" =~ LSB\ .*dynamically\ linked ]]; then + if [[ "$ftype" =~ 32-bit ]]; then + rpath="${libPath32}" + intp="$(cat $NIX_CC/nix-support/dynamic-linker-m32)" + else + rpath="${libPath64}" + intp="$(cat $NIX_CC/nix-support/dynamic-linker)" + fi + + oldRpath="$(patchelf --print-rpath "$1")" + # Always search at least for libraries in origin directory. + rpath="''${oldRpath:-\$ORIGIN}:$rpath" + if [[ "$ftype" =~ LSB\ shared ]]; then + patchelf \ + --set-rpath "$rpath" \ + "$1" + elif [[ "$ftype" =~ LSB\ executable ]]; then + patchelf \ + --set-rpath "$rpath" \ + --interpreter "$intp" \ + "$1" + fi + fi + } + + # Exclude PlaybackEngines to build something that can be run on FHS-compliant Linuxes + find $unitydir -name PlaybackEngines -prune -o -type f -print | while read path; do + patchFile "$path" + done + ''; + dontStrip = true; + dontPatchELF = true; meta = with stdenv.lib; { homepage = https://unity3d.com/; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 659c831bbe3c..8d86c96e4bfe 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv -, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: +, libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.9.1"; + version = "1.9.5"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -13,16 +13,16 @@ let url = if stdenv.isLinux then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb" else if stdenv.isDarwin - then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg" + then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.dmg" else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "0l1if9c4s4wkbi8k00pl7x00lil21izrd8wb9nv2b5q4gqidc1nh"; - "i686-linux" = "1789wjwcpgw3mljl49c8v5kycisay684gyalkkvd06928423y9zb"; - "x86_64-darwin" = "1xrfq1a0xyifkhhjnpm6wsnms9w8c9q5rd2qqn4sm5npl7viy68p"; + "x86_64-linux" = "16ijzaacfbqrgh561bf51747d2rv8kydgs14dfdr572qi0f88baw"; + "i686-linux" = "0lvkb4k0a34a8hzlsi0apf056rhyprh5w0gn16d0n2ijnaf9j2yk"; + "x86_64-darwin" = "070mrczsx1j0jl9sx6963l3hrk9anqa13r008wk1d22d25xj25mc"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; + arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system; in stdenv.mkDerivation rec { name = "vagrant-${version}"; @@ -96,8 +96,10 @@ in stdenv.mkDerivation rec { ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin # ruby libs - rm -rf opt/vagrant/embedded/lib - ln -s ${ruby}/lib opt/vagrant/embedded/lib + rm -rf opt/vagrant/embedded/lib/* + for lib in ${ruby}/lib/*; do + ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} + done # libiconv: iconv rm opt/vagrant/embedded/bin/iconv @@ -114,6 +116,9 @@ in stdenv.mkDerivation rec { ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin + # libffi + ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 + mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 14f01863c8a4..426d52eba707 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -2,16 +2,17 @@ buildGoPackage rec { name = "vndr-${version}"; - version = "20161110-${lib.strings.substring 0 7 rev}"; - rev = "cf8678fba5591fbacc4dafab1a22d64f6c603c20"; + version = "20170511-${lib.strings.substring 0 7 rev}"; + rev = "0cb33a0eb64c8ca73b8e2939a3430b22fbb8d3e3"; goPackagePath = "github.com/LK4D4/vndr"; + excludedPackages = "test"; src = fetchFromGitHub { inherit rev; owner = "LK4D4"; repo = "vndr"; - sha256 = "1fbrpdpfir05hqj1dr8rxw8hnjkhl0xbzncxkva56508vyyzbxcs"; + sha256 = "02vdr59xn79hffayfcxg29nf62rdc33a60i104fgj746kcswgy5n"; }; meta = { diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix new file mode 100644 index 000000000000..e351a75db4b2 --- /dev/null +++ b/pkgs/development/tools/vogl/default.nix @@ -0,0 +1,47 @@ +{ mkDerivation, lib, fetchFromGitHub +, cmake, git, pkgconfig, wget, zip +, qtbase, qtx11extras +, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 +, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf +, freeglut, mesa_glu +}: + +mkDerivation rec { + name = "vogl-${version}"; + version = "2016-05-13"; + + src = fetchFromGitHub { + owner = "deepfire"; + repo = "vogl"; + rev = "cbc5f1853e294b363f16c4e00b3e0c49dbf74559"; + sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + git wget zip + qtbase qtx11extras + libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 + SDL2 SDL2_gfx SDL2_image SDL2_ttf + freeglut mesa_glu + ]; + + dontUseCmakeBuildDir = true; + preConfigure = '' + cmakeDir=$PWD + mkdir -p vogl/vogl_build/release64 && cd $_ + ''; + cmakeFlags = [ + "-DCMAKE_VERBOSE=On" + "-DBUILD_X64=On" + ]; + + meta = with lib; { + description = "OpenGL capture / playback debugger."; + homepage = https://github.com/ValveSoftware/vogl; + license = licenses.mit; + maintainers = [ maintainers.deepfire ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index fe4b65846511..aac773b11e60 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "vultr-${version}"; - version = "1.12.0"; + version = "1.13.0"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "${version}"; - sha256 = "0fzwzp0vhf3cgl9ij5zpdyn29w9rwwxghr50jjfbagpkfpy4g686"; + sha256 = "0xjalxl2yncrhbh4m2gyg3cahv3wvq782qd668vim6qks676d9nx"; }; meta = { diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix new file mode 100644 index 000000000000..5a97eb09e4be --- /dev/null +++ b/pkgs/development/tools/wiggle/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, ncurses, groff }: + +stdenv.mkDerivation { + + name = "wiggle-1.0"; + + src = fetchurl { + url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz"; + sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs"; + }; + + buildInputs = [ ncurses groff ]; + + configurePhase = '' + makeFlagsArray=( CFLAGS="-I. -O3" + INSTALL="install" + BINDIR="$out/bin" + MANDIR="$out/share/man" + ) + patchShebangs . + ''; + + meta = { + homepage = http://blog.neil.brown.name/category/wiggle/; + description = "Tool for applying patches with conflicts"; + + longDescription = '' + Wiggle applies patches to a file in a similar manner to the patch(1) + program. The distinctive difference is, however, that wiggle will + attempt to apply a patch even if the "before" part of the patch doesn't + match the target file perfectly. This is achieved by breaking the file + and patch into words and finding the best alignment of words in the file + with words in the patch. Once this alignment has been found, any + differences (word-wise) in the patch are applied to the file as best as + possible. Also, wiggle will (in some cases) detect changes that have + already been applied, and will ignore them. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix new file mode 100644 index 000000000000..19bdb1cd9ef7 --- /dev/null +++ b/pkgs/development/tools/wllvm/default.nix @@ -0,0 +1,20 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + version = "1.1.3"; + pname = "wllvm"; + name = "${pname}-${version}"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1scv9bwr888x2km8njg0000xkj8pz73c0gjbphhqaj8vy87y25cb"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/travitch/whole-program-llvm; + description = "A wrapper script to build whole-program LLVM bitcode files"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index c52f2553e3d6..6603ac510b72 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.1.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 = "08b2lzc8fa9f5xldbdza6x3lg6jsp3wfwpyy187gxqw5pmqp11xc"; + sha256 = "1ds9nhm0akajwykblg0s131vki02k3rpf72a851r3wjw2qv116wz"; }; buildCommand = '' diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index f2be61bd2139..649c7d14927e 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -31,6 +31,9 @@ in stdenv.mkDerivation rec { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; + # See https://github.com/facebook/xcbuild/issues/238 and remove once that's in + patches = [ ./return-false.patch ]; + # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed 1i'#include ' \ diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 34fc5b0f6202..31692d9bee68 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -101,6 +101,54 @@ let Name = "$(EXECUTABLE_NAME)"; }; } + { + Identifier = "com.apple.package-type.wrapper"; + Type = "PackageType"; + Name = "Wrapper"; + DefaultBuildSettings = { + WRAPPER_SUFFIX = ".bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; + INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; + FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Identifier = "com.apple.package-type.wrapper.application"; + Type = "PackageType"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Application Wrapper"; + DefaultBuildSettings = { + GENERATE_PKGINFO_FILE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } ]; # Based off of the MacOSX Product Types.xcpsec file. All @@ -125,6 +173,39 @@ let Name = "Dynamic Library"; PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle"; + Name = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + }; + PackageTypes = [ "com.apple.package-type.wrapper" ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } + { + Identifier = "com.apple.product-type.application"; + Type = "ProductType"; + BasedOn = "com.apple.product-type.bundle"; + Name = "Application"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_execute"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "app"; + }; + PackageTypes = [ "com.apple.package-type.wrapper.application" ]; + } ]; in diff --git a/pkgs/development/tools/xcbuild/return-false.patch b/pkgs/development/tools/xcbuild/return-false.patch new file mode 100644 index 000000000000..8ec81b5e97ca --- /dev/null +++ b/pkgs/development/tools/xcbuild/return-false.patch @@ -0,0 +1,13 @@ +diff --git a/Libraries/dependency/Tools/dependency-info-tool.cpp b/Libraries/dependency/Tools/dependency-info-tool.cpp +index 006f53c7..d469f068 100644 +--- a/Libraries/dependency/Tools/dependency-info-tool.cpp ++++ b/Libraries/dependency/Tools/dependency-info-tool.cpp +@@ -271,7 +271,7 @@ main(int argc, char **argv) + */ + std::vector makefileContents = std::vector(contents.begin(), contents.end()); + if (!filesystem.write(makefileContents, *options.output())) { +- return false; ++ return -1; + } + + return 0; diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 386f67a9d631..9e34360909f9 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,6 +1,7 @@ -{stdenv, writeText, toolchainName, xcbuild +{stdenv, writeText, toolchainName, xcbuild, fetchurl , llvm, cctools, gcc, bootstrap_cmds, binutils -, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: +, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper +, xib2nib}: let @@ -8,15 +9,20 @@ let Identifier = toolchainName; }; + # We could pull this out of developer_cmds but it adds an annoying loop if we want to bootstrap and + # this is just a tiny script so I'm not going to bother + mkdep-darwin-src = fetchurl { + url = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh"; + sha256 = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541"; + executable = true; + }; in stdenv.mkDerivation { name = "nixpkgs.xctoolchain"; buildInputs = [ xcbuild makeWrapper ]; - propagatedBuildInputs = [ llvm gcc yacc flex m4 unifdef gperf indent ] - ++ stdenv.lib.optionals stdenv.isDarwin [ cctools bootstrap_cmds binutils ]; - ## cctools should build on Linux but it doesn't currentl + ## cctools should build on Linux but it doesn't currently buildCommand = '' mkdir -p $out @@ -58,8 +64,6 @@ stdenv.mkDerivation { ln -s ${unifdef}/bin/unifdefall ln -s ${gperf}/bin/gperf - ln -s ${gcc}/bin/gcov - ln -s ${gcc}/bin/mkdep ln -s ${indent}/bin/indent ln -s ${ctags}/bin/ctags '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -86,7 +90,17 @@ stdenv.mkDerivation { ln -s ${cctools}/bin/pagestuff ln -s ${cctools}/bin/ranlib ln -s ${cctools}/bin/redo_prebinding - ''; + + ln -s ${xib2nib}/bin/ibtool + '' + + # No point including the entire gcc closure if we don't already have it + (if stdenv.cc.isClang then '' + ln -s ${stdenv.cc.cc.llvm}/bin/llvm-cov gcov + ln -s ${mkdep-darwin-src} mkdep + '' else '' + ln -s ${gcc}/bin/gcov + ln -s ${gcc}/bin/mkdep + ''); } # other commands in /bin/ diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 0da733b8078e..ab6605e91b10 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -50,10 +50,10 @@ stdenv.mkDerivation { ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications mkdir -p $out/Platforms/ - ln -s ${platform} $out/Platforms/ + ln -s ${platform} $out/Platforms/nixpkgs.platform mkdir -p $out/Toolchains/ - ln -s ${toolchain} $out/Toolchains/ + ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolchain wrapProgram $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix new file mode 100644 index 000000000000..d585a35b0bc5 --- /dev/null +++ b/pkgs/development/tools/xib2nib/default.nix @@ -0,0 +1,22 @@ +{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }: + +stdenv.mkDerivation { + name = "xib2nib-730e177"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "xib2nib"; + rev = "97c6a53aab83d919805efcae33cf80690e953d1e"; + sha256 = "08442f4xg7racknj35nr56a4c62gvdgdw55pssbkn2qq0rfzziqq"; + }; + + buildInputs = [ PlistCpp pugixml boost ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "Compiles CocoaTouch .xib files into .nib"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 770eb9cc78b4..8b6f751d3aa1 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.22.0"; + version = "0.27.5"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1hs4fqjj9rg47ipcagpdk3grh7aa0ls3vsxq4q20d5hb43s9n5gs"; + sha256 = "0djjbdbwzlhdh6aww6awfl63nz72kj109kjxvmwk25x8dkvw795a"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/web/mailcatcher/Gemfile b/pkgs/development/web/mailcatcher/Gemfile new file mode 100644 index 000000000000..8cc16fad7e56 --- /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 000000000000..9a4969c11676 --- /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 000000000000..49c5c4d81af1 --- /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 000000000000..d9e95454a500 --- /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/no-xcode-v7.patch b/pkgs/development/web/nodejs/no-xcode-v7.patch new file mode 100644 index 000000000000..05623b21f13f --- /dev/null +++ b/pkgs/development/web/nodejs/no-xcode-v7.patch @@ -0,0 +1,79 @@ +diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py +index a173ff0..1fc821a 100644 +--- a/tools/gyp/pylib/gyp/xcode_emulation.py ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py +@@ -507,9 +507,12 @@ class XcodeSettings(object): + def _XcodePlatformPath(self, configname=None): + sdk_root = self._SdkRoot(configname) + if sdk_root not in XcodeSettings._platform_path_cache: +- platform_path = self._GetSdkVersionInfoItem(sdk_root, ++ try: ++ platform_path = self._GetSdkVersionInfoItem(sdk_root, + '--show-sdk-platform-path') +- XcodeSettings._platform_path_cache[sdk_root] = platform_path ++ XcodeSettings._platform_path_cache[sdk_root] = platform_path ++ except: ++ XcodeSettings._platform_path_cache[sdk_root] = None + return XcodeSettings._platform_path_cache[sdk_root] + + def _SdkPath(self, configname=None): +@@ -520,10 +523,13 @@ class XcodeSettings(object): + + def _XcodeSdkPath(self, sdk_root): + if sdk_root not in XcodeSettings._sdk_path_cache: +- sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path') +- XcodeSettings._sdk_path_cache[sdk_root] = sdk_path +- if sdk_root: +- XcodeSettings._sdk_root_cache[sdk_path] = sdk_root ++ try: ++ sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path') ++ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path ++ if sdk_root: ++ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root ++ except: ++ XcodeSettings._sdk_path_cache[sdk_root] = None + return XcodeSettings._sdk_path_cache[sdk_root] + + def _AppendPlatformVersionMinFlags(self, lst): +@@ -653,10 +659,11 @@ class XcodeSettings(object): + framework_root = sdk_root + else: + framework_root = '' +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) + + self.configname = None + return cflags +@@ -908,10 +915,11 @@ class XcodeSettings(object): + sdk_root = self._SdkPath() + if not sdk_root: + sdk_root = '' +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) + + platform_root = self._XcodePlatformPath(configname) + if sdk_root and platform_root and self._IsXCTest(): +@@ -1683,6 +1691,9 @@ def _NormalizeEnvVarReferences(str): + """Takes a string containing variable references in the form ${FOO}, $(FOO), + or $FOO, and returns a string with all variable references in the form ${FOO}. + """ ++ if str is None: ++ return '' ++ + # $FOO -> ${FOO} + str = re.sub(r'\$([a-zA-Z_][a-zA-Z0-9_]*)', r'${\1}', str) + diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 9a142a89677f..24832b6b8be0 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.6.2"; + version = "4.8.4"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545"; + sha256 = "35fe633a48cbe93c79327161d9dc964ac9810f4ceb2ed8628487e6e14a15905b"; }; }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 5fb122aefa86..9419b59e9212 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 b34d84ac851a..86d4fed8eab0 100644 --- a/pkgs/development/web/nodejs/v7.nix +++ b/pkgs/development/web/nodejs/v7.nix @@ -10,12 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "7.7.1"; + version = "7.10.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "04bn7c2hvhs6dqjz3khrlqyspljbxiw7y7g4fkjkn8k7lwmchpwn"; + 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 new file mode 100644 index 000000000000..593e9d1e5622 --- /dev/null +++ b/pkgs/development/web/nodejs/v8.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true +}@args: + +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "8.2.1"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "12wcmm2g1zlihja41my5r06sla0s6ygvycxds1ryl3jl2j4nvi02"; + }; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + }) + diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 7e8a3160b31f..2e17d72ea9ee 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "JSONStream-1.3.0" = { + "JSONStream-1.3.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz"; - sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; + sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; }; }; "assert-1.4.1" = { @@ -49,22 +49,22 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-4.9.1" = { + "buffer-5.0.5" = { name = "buffer"; packageName = "buffer"; - version = "4.9.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; + sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; - "cached-path-relative-1.0.0" = { + "cached-path-relative-1.0.1" = { name = "cached-path-relative"; packageName = "cached-path-relative"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz"; - sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; }; }; "concat-stream-1.5.2" = { @@ -211,13 +211,13 @@ let sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "module-deps-4.0.8" = { + "module-deps-4.1.1" = { name = "module-deps"; packageName = "module-deps"; - version = "4.0.8"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz"; - sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; "os-browserify-0.1.2" = { @@ -283,22 +283,22 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "readable-stream-2.2.2" = { + "readable-stream-2.2.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.2"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; + sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; }; }; - "resolve-1.2.0" = { + "resolve-1.3.2" = { name = "resolve"; packageName = "resolve"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"; - sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"; + sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235"; }; }; "shasum-1.0.2" = { @@ -355,13 +355,13 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "syntax-error-1.1.6" = { + "syntax-error-1.3.0" = { name = "syntax-error"; packageName = "syntax-error"; - version = "1.1.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz"; - sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; + sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; }; }; "through2-2.0.3" = { @@ -535,15 +535,6 @@ let sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -571,6 +562,15 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -607,13 +607,13 @@ let sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "browserify-sign-4.0.0" = { + "browserify-sign-4.0.4" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.0.0"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz"; - sha1 = "10773910c3c206d5420a46aad8694f820b85968f"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; "create-ecdh-4.0.0" = { @@ -760,31 +760,31 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.2" = { + "elliptic-6.4.0" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; - sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "parse-asn1-5.0.0" = { + "parse-asn1-5.1.0" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz"; - sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; }; }; - "brorand-1.0.6" = { + "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; - sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; "hash.js-1.0.3" = { @@ -796,6 +796,24 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; + "hmac-drbg-1.0.0" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; + sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; "asn1.js-4.9.1" = { name = "asn1.js"; packageName = "asn1.js"; @@ -922,13 +940,13 @@ let sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; }; }; - "is-buffer-1.1.4" = { + "is-buffer-1.1.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; "lexical-scope-1.2.0" = { @@ -940,22 +958,22 @@ let sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; }; }; - "astw-2.0.0" = { + "astw-2.2.0" = { name = "astw"; packageName = "astw"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz"; - sha1 = "08121ac8288d35611c0ceec663f6cd545604897d"; + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; }; }; - "acorn-1.2.2" = { + "acorn-4.0.11" = { name = "acorn"; packageName = "acorn"; - version = "1.2.2"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; - sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; }; }; "isarray-0.0.1" = { @@ -976,13 +994,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.3.2" = { + "detective-4.5.0" = { name = "detective"; packageName = "detective"; - version = "4.3.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz"; - sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c"; + url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; + sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; }; }; "stream-combiner2-1.1.1" = { @@ -994,15 +1012,6 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "acorn-3.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; - }; - }; "path-platform-0.11.15" = { name = "path-platform"; packageName = "path-platform"; @@ -1021,6 +1030,15 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "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"; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -1093,15 +1111,6 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; - }; - }; "punycode-1.3.2" = { name = "punycode"; packageName = "punycode"; @@ -1138,13 +1147,13 @@ let sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; "uglify-to-browserify-1.0.2" = { @@ -1156,15 +1165,6 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "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"; - }; - }; "camelcase-1.2.1" = { name = "camelcase"; packageName = "camelcase"; @@ -1327,13 +1327,13 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; - "request-2.79.0" = { + "request-2.81.0" = { name = "request"; packageName = "request"; - version = "2.79.0"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; "prr-0.0.0" = { @@ -1372,22 +1372,22 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "caseless-0.11.0" = { + "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; "combined-stream-1.0.5" = { @@ -1426,13 +1426,13 @@ let sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; - "har-validator-2.0.6" = { + "har-validator-4.2.1" = { name = "har-validator"; packageName = "har-validator"; - version = "2.0.6"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; "hawk-3.1.3" = { @@ -1480,13 +1480,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.14" = { + "mime-types-2.1.15" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; + sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; }; }; "oauth-sign-0.8.2" = { @@ -1498,13 +1498,31 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.3.0" = { + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.4.0" = { name = "qs"; packageName = "qs"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; - sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "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"; }; }; "stringstream-0.0.5" = { @@ -1525,13 +1543,13 @@ let sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; }; }; - "tunnel-agent-0.4.3" = { + "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; - version = "0.4.3"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; "uuid-3.0.1" = { @@ -1561,148 +1579,40 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "ajv-4.11.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; + sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; }; }; - "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"; - }; - }; - "is-my-json-valid-2.15.0" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; - sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "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"; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; - "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"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; 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"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; "hoek-2.16.3" = { @@ -1750,22 +1660,31 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.1" = { + "jsprim-1.4.0" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.10.2" = { + "sshpk-1.11.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; - sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; + sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; "extsprintf-1.0.2" = { @@ -1804,15 +1723,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -1831,13 +1741,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -1867,22 +1777,22 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "bcrypt-pbkdf-1.0.0" = { + "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.26.0" = { + "mime-db-1.27.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; + sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; }; }; "browser-stdout-1.3.0" = { @@ -1894,6 +1804,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.2.0" = { name = "debug"; packageName = "debug"; @@ -1912,6 +1831,15 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; + "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"; + }; + }; "glob-7.0.5" = { name = "glob"; packageName = "glob"; @@ -1957,6 +1885,15 @@ let sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; }; }; + "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"; + }; + }; "ms-0.7.1" = { name = "ms"; packageName = "ms"; @@ -2236,13 +2173,13 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "abbrev-1.0.9" = { + "abbrev-1.1.0" = { name = "abbrev"; packageName = "abbrev"; - version = "1.0.9"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; - sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; + sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; }; }; "qs-0.6.6" = { @@ -2272,13 +2209,13 @@ let sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; }; }; - "node-uuid-1.4.7" = { + "node-uuid-1.4.8" = { name = "node-uuid"; packageName = "node-uuid"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; "form-data-0.1.4" = { @@ -2290,6 +2227,15 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; "http-signature-0.10.1" = { name = "http-signature"; packageName = "http-signature"; @@ -2434,13 +2380,13 @@ let sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"; }; }; - "should-format-3.0.2" = { + "should-format-3.0.3" = { name = "should-format"; packageName = "should-format"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/should-format/-/should-format-3.0.2.tgz"; - sha1 = "1a543ad3abfea5dc2bea4a0ba875ede60fe22b19"; + url = "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz"; + sha1 = "9bfc8f74fa39205c53d38c34d717303e277124f1"; }; }; "should-type-1.4.0" = { @@ -2470,31 +2416,76 @@ let sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; }; }; - "formatio-1.1.1" = { + "diff-3.2.0" = { + name = "diff"; + packageName = "diff"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + }; + }; + "formatio-1.2.0" = { name = "formatio"; packageName = "formatio"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; - sha1 = "5ed3ccd636551097383465d996199100e86161e9"; + url = "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz"; + sha1 = "f3b2167d9068c4698a8d51f4f760a39a54d818eb"; }; }; - "lolex-1.3.2" = { + "lolex-1.6.0" = { name = "lolex"; packageName = "lolex"; - version = "1.3.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz"; - sha1 = "7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"; + url = "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz"; + sha1 = "3a9a0283452a47d7439e72731b9e07d7386e49f6"; }; }; - "samsam-1.1.2" = { + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; + "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"; + }; + }; + "samsam-1.2.1" = { name = "samsam"; packageName = "samsam"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; - sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; + url = "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz"; + sha1 = "edd39093a3184370cb859243b2bdf255e7d8ea67"; + }; + }; + "text-encoding-0.6.4" = { + name = "text-encoding"; + packageName = "text-encoding"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"; + sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; + }; + }; + "type-detect-4.0.0" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.0.tgz"; + sha1 = "62053883542a321f2f7b25746dc696478b18ff6b"; }; }; "cli-1.0.1" = { @@ -2623,13 +2614,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "interpret-1.0.1" = { + "interpret-1.0.2" = { name = "interpret"; packageName = "interpret"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz"; - sha1 = "d579fb7f693b858004947af39fa0db49f795602c"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz"; + sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"; }; }; "rechoir-0.6.2" = { @@ -2663,13 +2654,13 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.3.0"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; + sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; }; dependencies = [ - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -2699,14 +2690,13 @@ in sources."pako-0.2.9" ]; }) - (sources."buffer-4.9.1" // { + (sources."buffer-5.0.5" // { dependencies = [ sources."base64-js-1.2.0" sources."ieee754-1.1.8" - sources."isarray-1.0.0" ]; }) - sources."cached-path-relative-1.0.0" + sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ sources."typedarray-0.0.6" @@ -2749,17 +2739,20 @@ in sources."evp_bytestokey-1.0.0" ]; }) - (sources."browserify-sign-4.0.0" // { + (sources."browserify-sign-4.0.4" // { dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) - (sources."parse-asn1-5.0.0" // { + (sources."parse-asn1-5.1.0" // { dependencies = [ (sources."asn1.js-4.9.1" // { dependencies = [ @@ -2780,10 +2773,13 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) ]; @@ -2801,7 +2797,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.1.0" ]; }) ]; @@ -2811,7 +2807,7 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."parse-asn1-5.0.0" // { + (sources."parse-asn1-5.1.0" // { dependencies = [ (sources."asn1.js-4.9.1" // { dependencies = [ @@ -2881,12 +2877,12 @@ in sources."source-map-0.5.6" ]; }) - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" (sources."lexical-scope-1.2.0" // { dependencies = [ - (sources."astw-2.0.0" // { + (sources."astw-2.2.0" // { dependencies = [ - sources."acorn-1.2.2" + sources."acorn-4.0.11" ]; }) ]; @@ -2899,11 +2895,11 @@ in sources."stream-splicer-2.0.0" ]; }) - (sources."module-deps-4.0.8" // { + (sources."module-deps-4.1.1" // { dependencies = [ - (sources."detective-4.3.2" // { + (sources."detective-4.5.0" // { dependencies = [ - sources."acorn-3.3.0" + sources."acorn-4.0.11" ]; }) sources."stream-combiner2-1.1.1" @@ -2920,7 +2916,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -2929,7 +2925,11 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) (sources."shasum-1.0.2" // { dependencies = [ (sources."json-stable-stringify-0.0.1" // { @@ -2961,9 +2961,9 @@ in sources."minimist-1.2.0" ]; }) - (sources."syntax-error-1.1.6" // { + (sources."syntax-error-1.3.0" // { dependencies = [ - sources."acorn-2.7.0" + sources."acorn-4.0.11" ]; }) sources."through2-2.0.3" @@ -2998,15 +2998,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "2.8.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-2.8.20.tgz"; + sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; }; dependencies = [ - sources."async-0.2.10" sources."source-map-0.5.6" - sources."uglify-to-browserify-1.0.2" (sources."yargs-3.10.0" // { dependencies = [ sources."camelcase-1.2.1" @@ -3018,7 +3016,7 @@ in dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -3034,7 +3032,7 @@ in dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -3050,6 +3048,7 @@ in sources."window-size-0.1.0" ]; }) + sources."uglify-to-browserify-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -3087,11 +3086,11 @@ in ]; }) sources."source-map-0.5.6" - (sources."request-2.79.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" - sources."caseless-0.11.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" @@ -3104,47 +3103,19 @@ in sources."asynckit-0.4.0" ]; }) - (sources."har-validator-2.0.6" // { + (sources."har-validator-4.2.1" // { dependencies = [ - (sources."chalk-1.1.3" // { + (sources."ajv-4.11.5" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."jsonify-0.0.0" ]; }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.15.0" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" ]; }) + sources."har-schema-1.0.5" ]; }) (sources."hawk-3.1.3" // { @@ -3158,24 +3129,25 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.2" // { + (sources."sshpk-1.11.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -3183,20 +3155,22 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" ]; }) @@ -3324,7 +3298,7 @@ in sources."osenv-0.0.3" (sources."nopt-2.2.1" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) sources."semver-1.1.4" @@ -3339,7 +3313,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-1.2.11" sources."forever-agent-0.5.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" @@ -3401,14 +3375,14 @@ in should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "11.1.2"; + version = "11.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-11.1.2.tgz"; - sha1 = "3cad9c6fc600ffe2e1547d948be3284e984da946"; + url = "https://registry.npmjs.org/should/-/should-11.2.1.tgz"; + sha1 = "90f55145552d01cfc200666e4e818a1c9670eda2"; }; dependencies = [ sources."should-equal-1.0.1" - sources."should-format-3.0.2" + sources."should-format-3.0.3" sources."should-type-1.4.0" sources."should-type-adaptors-1.0.1" sources."should-util-1.0.0" @@ -3424,20 +3398,24 @@ in sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "1.17.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz"; - sha1 = "4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"; + url = "https://registry.npmjs.org/sinon/-/sinon-2.1.0.tgz"; + sha1 = "e057a9d2bf1b32f5d6dd62628ca9ee3961b0cafb"; }; dependencies = [ - sources."formatio-1.1.1" - (sources."util-0.10.3" // { + sources."diff-3.2.0" + sources."formatio-1.2.0" + sources."lolex-1.6.0" + sources."native-promise-only-0.8.1" + (sources."path-to-regexp-1.7.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."isarray-0.0.1" ]; }) - sources."lolex-1.3.2" - sources."samsam-1.1.2" + sources."samsam-1.2.1" + sources."text-encoding-0.6.4" + sources."type-detect-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -3533,10 +3511,10 @@ in shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.7.6"; + version = "0.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz"; - sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; + sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; }; dependencies = [ (sources."glob-7.1.1" // { @@ -3566,10 +3544,14 @@ in sources."path-is-absolute-1.0.1" ]; }) - sources."interpret-1.0.1" + sources."interpret-1.0.2" (sources."rechoir-0.6.2" // { dependencies = [ - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) ]; }) ]; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 54f8fe0c728d..751638e02da8 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index f038673f4c0b..3a50196456c0 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { gpl2 lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib ]; - platforms = platforms.linux; + platforms = subtractLists platforms.i686 platforms.linux; }; } diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 4b9b097bbb7e..05b645ee326b 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { name = "atanks-${version}"; - version = "6.2"; + version = "6.5"; src = fetchurl { url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz"; - sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy"; + sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j"; }; buildInputs = [ allegro ]; - patchPhase = '' - substituteInPlace Makefile --replace /usr $out - ''; - - makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" ]; + makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" "CXX=g++" ]; meta = with stdenv.lib; { description = "Atomic Tanks ballistics game"; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index eb3692b05ab0..5699dbb72700 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "banner-1.3.3"; + name = "banner-1.3.4"; src = fetchurl { url = "http://software.cedar-solutions.com/ftp/software/${name}.tar.gz"; - sha256 = "1njbgba0gzvrmdkvfjgrnvj0i80yi8k7mpkgyxaj07bmv9kc3h5v"; + sha256 = "04q5ribr0r9s8waky3nk356l0qdhfxw15ipz7lsfgv1fxq3qk6bz"; }; meta = with stdenv.lib; { diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index 682756c77871..4c55d571bd51 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "bastet-${version}"; - version = "0.43.1"; + version = "0.43.2"; buildInputs = [ ncurses boost ]; src = fetchFromGitHub { owner = "fph"; repo = "bastet"; rev = version; - sha256 = "14ymdarx30zqxyixvb17h4hs57y6zfx0lrdvc200crllz8zzdx5z"; + sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn"; }; installPhase = '' diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index d3792843d47c..1269b4346344 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.8"; + version = "2.4.10"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "08iiw0i0vx68d73hliiylswsm0nvnm849k37xc7iii6sflblvjj3"; + sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa"; }; nativeBuildInputs = [ pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multiplayer 3D Tank game"; - homepage = http://bzflag.org/; + homepage = https://bzflag.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index f1dd86d67b92..e8daca26ef7d 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }: +{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }: stdenv.mkDerivation rec { name = "chessx-${version}"; version = "1.4.0"; @@ -7,15 +7,13 @@ stdenv.mkDerivation rec { sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74"; }; buildInputs = [ - stdenv - pkgconfig qtbase qtsvg qttools qtmultimedia zlib - qmakeHook ]; + nativeBuildInputs = [ pkgconfig qmake ]; # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm' #enableParallelBuilding = true; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index ce935512178e..ba9cd1e58055 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 619060dc2534..877f6c3d215a 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/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 57610fb1c1c8..5be8c7d759e9 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }: +{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }: stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ texlive qmakeHook ]; + nativeBuildInputs = [ texlive qmake ]; enableParallelBuilding = false; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 7091b900b7e6..453afe9e985b 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,19 +1,25 @@ -{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, cmake, mesa_noglu, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "eternity-engine-3.40.46"; - src = fetchurl { - url = https://github.com/team-eternity/eternity/archive/3.40.46.tar.gz; - sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4"; + name = "eternity-engine-${version}"; + version = "3.42.02"; + src = fetchFromGitHub { + owner = "team-eternity"; + repo = "eternity"; + rev = "${version}"; + sha256 = "00kpq4k23hjmzjaymw3sdda7mqk8fjq6dzf7fmdal9fm7lfmj41k"; }; - buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ mesa_noglu SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; installPhase = '' - mkdir -p $out/bin - cp source/eternity $out/bin + install -Dm755 source/eternity $out/lib/eternity/eternity + cp -r $src/base $out/lib/eternity/base + mkdir $out/bin + makeWrapper $out/lib/eternity/eternity $out/bin/eternity ''; meta = { diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 27ffcf2e742e..649d69c6fe67 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' mkdir -p $out/share/exult/music diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix new file mode 100644 index 000000000000..a1560fb19340 --- /dev/null +++ b/pkgs/games/ezquake/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, curl, expat +, jansson, libpng, libjpeg, mesa, pcre +, pkgconfig, SDL2, vimNox }: + +stdenv.mkDerivation rec { + name = pname + "-" + version; + pname = "ezquake"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "ezQuake"; + repo = pname + "-source"; + rev = "v" + version; + sha256 = "14wck0r64z5haacp7g7qb2qrbhff3x6jfjmn4268dyb9dl5663f2"; + }; + + buildInputs = [ + expat curl jansson libpng libjpeg mesa pcre pkgconfig SDL2 vimNox + ]; + + installPhase = with stdenv.lib; let + sys = last (splitString "-" stdenv.system); + arch = head (splitString "-" stdenv.system); + in '' + mkdir -p $out/bin + find . + mv ezquake-${sys}-${arch} $out/bin/ezquake + ''; + + meta = with stdenv.lib; { + homepage = "http://ezquake.github.io/"; + description = "A modern QuakeWorld client focused on competitive online play."; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index e071edfeb815..5c24c3ec8076 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -6,12 +6,11 @@ , username ? "" , password ? "" }: -assert releaseType == "alpha" || releaseType == "headless"; +assert releaseType == "alpha" || releaseType == "headless" || releaseType == "demo"; with stdenv.lib; let - version = "0.14.21"; - isHeadless = releaseType == "headless"; + version = if releaseType != "demo" then "0.15.30" else "0.15.25"; arch = if stdenv.system == "x86_64-linux" then { inUrl = "linux64"; @@ -25,14 +24,16 @@ let fetch = rec { url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; - name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; + name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; x64 = { - headless = fetchurl { inherit name url; sha256 = "0bx4fq46781vv9vr0ciyckaskksjrqikvcdv1yz0wj8mrb2j08cw"; }; - alpha = authenticatedFetch { inherit url; sha256 = "067p1i5wcxk88kmblyklc4lh8fqjc5pqjdarvhjz420vqmdls7k6"; }; + 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."; - alpha = authenticatedFetch { inherit url; sha256 = "0iwhachp0z02w19x5y70qy3b0yp79dspawkcygdfna5cfqrybvx6"; }; + alpha = abort "Factorio 32-bit client is not available for this version."; + demo = abort "Factorio 32-bit demo binaries are not available for download."; }; }; @@ -95,55 +96,62 @@ let platforms = [ "i686-linux" "x86_64-linux" ]; }; }; - headless = base; - alpha = base // { - buildInputs = [ makeWrapper ]; + releases = rec { + headless = base; + demo = base // { - libPath = stdenv.lib.makeLibraryPath [ - alsaLib - libX11 - libXcursor - libXinerama - libXrandr - libXi - mesa_noglu - ]; + buildInputs = [ makeWrapper ]; - installPhase = base.installPhase + '' - wrapProgram $out/bin/factorio \ - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \ - --run "$out/share/factorio/update-config.sh" \ - --argv0 "" \ - --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}" + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + libX11 + libXcursor + libXinerama + libXrandr + libXi + mesa_noglu + ]; - # TODO Currently, every time a mod is changed/added/removed using the - # modlist, a new derivation will take up the entire footprint of the - # client. The only way to avoid this is to remove the mods arg from the - # package function. The modsDir derivation will have to be built - # separately and have the user specify it in the .factorio config or - # right along side it using a symlink into the store I think i will - # just remove mods for the client derivation entirely. this is much - # cleaner and more useful for headless mode. + installPhase = base.installPhase + '' + wrapProgram $out/bin/factorio \ + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \ + --run "$out/share/factorio/update-config.sh" \ + --argv0 "" \ + --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}" - # TODO: trying to toggle off a mod will result in read-only-fs-error. - # not much we can do about that except warn the user somewhere. In - # fact, no exit will be clean, since this error will happen on close - # regardless. just prints an ugly stacktrace but seems to be otherwise - # harmless, unless maybe the user forgets and tries to use the mod - # manager. + # TODO Currently, every time a mod is changed/added/removed using the + # modlist, a new derivation will take up the entire footprint of the + # client. The only way to avoid this is to remove the mods arg from the + # package function. The modsDir derivation will have to be built + # separately and have the user specify it in the .factorio config or + # right along side it using a symlink into the store I think i will + # just remove mods for the client derivation entirely. this is much + # cleaner and more useful for headless mode. - install -m0644 <(cat << EOF - ${configBaseCfg} - EOF - ) $out/share/factorio/config-base.cfg + # TODO: trying to toggle off a mod will result in read-only-fs-error. + # not much we can do about that except warn the user somewhere. In + # fact, no exit will be clean, since this error will happen on close + # regardless. just prints an ugly stacktrace but seems to be otherwise + # harmless, unless maybe the user forgets and tries to use the mod + # manager. - install -m0755 <(cat << EOF - ${updateConfigSh} - EOF - ) $out/share/factorio/update-config.sh + install -m0644 <(cat << EOF + ${configBaseCfg} + EOF + ) $out/share/factorio/config-base.cfg - cp -a doc-html $out/share/factorio - ''; + install -m0755 <(cat << EOF + ${updateConfigSh} + EOF + ) $out/share/factorio/update-config.sh + ''; + }; + alpha = demo // { + + installPhase = demo.installPhase + '' + cp -a doc-html $out/share/factorio + ''; + }; }; -in stdenv.mkDerivation (if isHeadless then headless else alpha) +in stdenv.mkDerivation (releases.${releaseType}) diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix index 04b31ac10d35..439f2478a667 100644 --- a/pkgs/games/factorio/fetch.nix +++ b/pkgs/games/factorio/fetch.nix @@ -8,6 +8,8 @@ # URL to fetch. url ? "" +, name ? "factorio.tar.gz" + # Login URL. , loginUrl ? "https://www.factorio.com/login" @@ -16,11 +18,9 @@ }: stdenv.mkDerivation { - name = "factorio.tar.gz"; - buildInputs = [ curl xidel ]; - inherit url loginUrl username password cacert; + inherit name url loginUrl username password cacert; builder = ./fetch.sh; diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh index 30d9c9fdefe0..312dc9b6d61e 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/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index de245913861f..466cfda7c4a5 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, cmake, perl, gmp, libtap, perlPackages }: +{ stdenv, fetchurl, pkgconfig, cmake +, perl, gmp, libtap, gperf +, perlPackages, python3Packages }: with stdenv.lib; stdenv.mkDerivation rec{ name = "freecell-solver-${version}"; - version = "3.26.0"; + version = "4.8.0"; src = fetchurl { - url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.bz2"; - sha256 = "0pm6xk4fmwgzva70qxb0pqymdfvpasnvqiwwmm8hpx7g37y11wqk"; + url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; + sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3"; }; - buildInputs = [ pkgconfig cmake perl gmp libtap + buildInputs = [ pkgconfig cmake perl gmp libtap gperf perlPackages.TemplateToolkit perlPackages.StringShellQuote - perlPackages.GamesSolitaireVerify ]; + perlPackages.GamesSolitaireVerify perlPackages.TaskFreecellSolverTesting + python3Packages.python python3Packages.random2 ]; meta = { description = "A FreeCell automatic solver"; @@ -26,6 +29,6 @@ stdenv.mkDerivation rec{ homepage = http://fc-solve.shlomifish.org/; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 608b1a011200..a6f1c305c4e7 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,7 +12,7 @@ let gtkName = if gtkClient then "-gtk" else ""; name = "freeciv"; - version = "2.5.6"; + version = "2.5.7"; in stdenv.mkDerivation { name = "${name}${sdlName}${gtkName}-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; - sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg"; + sha256 = "1lmydnnqraa947l7gdz6xgm0bgks1ywsivp9h4v8jr3avcv6gqzz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix new file mode 100644 index 000000000000..c0799e8fdf4c --- /dev/null +++ b/pkgs/games/galaxis/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, ncurses, xmlto }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "galaxis-${version}"; + version = "1.9"; + + src = fetchurl{ + url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz"; + sha256 = "1dsypk5brfbc399pg4fk9myyh5yyln0ljl1aiqkypws8h4nsdphl"; + }; + + buildInputs = [ ncurses xmlto ]; + + patchPhase = '' + sed -i\ + -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\ + -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\ + -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile + ''; + + dontConfigure = true; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = { + description = "Rescue lifeboats lost in interstellar space"; + longDescription = '' + Lifeboats from a crippled interstellar liner are adrift in a starfield. To + find them, you can place probes that look in all eight compass directions + and tell you how many lifeboats they see. If you drop a probe directly on + a lifeboat it will be revealed immediately. Your objective: find the + lifeboats as quickly as possible, before the stranded passengers run out + of oxygen! + + This is a UNIX-hosted, curses-based clone of the nifty little Macintosh + freeware game Galaxis. It doesn't have the super-simple, point-and-click + interface of the original, but compensates by automating away some of the + game's simpler deductions. + ''; + homepage = http://catb.org/~esr/galaxis/; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch new file mode 100644 index 000000000000..fa0337fc5850 --- /dev/null +++ b/pkgs/games/gargoyle/darwin.patch @@ -0,0 +1,97 @@ +From 06255a8b5a378a2484cd0faa1dd718d5b4e98042 Mon Sep 17 00:00:00 2001 +From: Orivej Desh +Date: Fri, 17 Mar 2017 08:43:57 +0000 +Subject: [PATCH] darwin + +--- + Jamrules | 5 ++--- + Jamshared | 2 +- + support/Jamfile | 4 ++-- + tads/Jamfile | 4 ++-- + terps/Jamfile | 4 ++-- + 5 files changed, 9 insertions(+), 10 deletions(-) + +diff --git a/Jamrules b/Jamrules +index 698220d..2294dfc 100644 +--- a/Jamrules ++++ b/Jamrules +@@ -141,8 +141,7 @@ switch $(OS) + case MACOSX : + Echo "OS is MACOSX (cocoa)" ; + SUFDLL = .dylib ; +- MAINARCH = -arch i386 ; +- CCFLAGS = -Wno-pointer-sign $(MAINARCH) $(ALTARCH) ; ++ CCFLAGS = -Wno-pointer-sign $(ALTARCH) ; + PKGCONFIG = "pkg-config freetype2" ; + GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" ; + SHRLINKLIBS += "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ; +@@ -155,7 +154,7 @@ switch $(OS) + SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ; + } + +- LINK = $(CC) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) ; ++ LINK = $(CC) $(FRAMEWORKS) $(ALTARCH) ; + + + case * : +diff --git a/Jamshared b/Jamshared +index 13db835..fd42928 100644 +--- a/Jamshared ++++ b/Jamshared +@@ -79,7 +79,7 @@ if $(OS) = MACOSX + { + actions together SharedLink bind NEEDLIBS + { +- $(LINK) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) ++ $(LINK) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) + } + } + else +diff --git a/support/Jamfile b/support/Jamfile +index aedf8fe..70cfefd 100644 +--- a/support/Jamfile ++++ b/support/Jamfile +@@ -41,8 +41,8 @@ if $(USESDL) = yes + ; + + if $(OS) = MINGW { SubDirCcFlags -DSDL_SOUND_DLL_EXPORTS ; } +- if $(OS) = SOLARIS { SubDirCcFlags -I/usr/include/SDL -fPIC ; } +- if $(OS) = MACOSX { SubDirCcFlags -I/opt/local/include/SDL -fPIC ; } ++ if $(OS) = SOLARIS { SubDirCcFlags -ISDL -fPIC ; } ++ if $(OS) = MACOSX { SubDirCcFlags -ISDL -fPIC ; } + + SEARCH_SOURCE = + [ FDirName $(TOP) support sdl_sound ] +diff --git a/tads/Jamfile b/tads/Jamfile +index 1f8829d..d8455eb 100644 +--- a/tads/Jamfile ++++ b/tads/Jamfile +@@ -33,8 +33,8 @@ if $(OS) = LINUX || $(OS) = SOLARIS + + if $(OS) = MACOSX + { +- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; +- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; ++ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; ++ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; + } + + SEARCH_SOURCE = +diff --git a/terps/Jamfile b/terps/Jamfile +index b5f6d52..2d1ccdb 100644 +--- a/terps/Jamfile ++++ b/terps/Jamfile +@@ -185,8 +185,8 @@ if $(MAKE_GEAS) = yes + + if $(OS) = MACOSX + { +- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; +- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; ++ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; ++ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; + } + + SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ; +-- +2.12.0 + diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/games/gargoyle/darwin.sh new file mode 100644 index 000000000000..9bd45d0b1d54 --- /dev/null +++ b/pkgs/games/gargoyle/darwin.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +set -e + +GARGDIST=build/macosx.release +BUNDLE=${out}/Applications/Gargoyle.app/Contents +TERPS=" +advsys/advsys +agility/agility +alan2/alan2 +alan3/alan3 +bocfel/bocfel +frotz/frotz +garglk/gargoyle +geas/geas +git/git +glulxe/glulxe +hugo/hugo +jacl/jacl +level9/level9 +magnetic/magnetic +nitfol/nitfol +scare/scare +scott/scott +tads/tadsr +" + +mkdir -p $BUNDLE/MacOS +mkdir -p $BUNDLE/Frameworks +mkdir -p $BUNDLE/Resources +mkdir -p $BUNDLE/PlugIns + +install_name_tool -id @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/garglk/libgarglk.dylib +for file in $TERPS +do +install_name_tool -change @executable_path/libgarglk.dylib @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/$file || true +cp -f $GARGDIST/$file $BUNDLE/PlugIns +done + +cp -f garglk/launcher.plist $BUNDLE/Info.plist +cp -f $GARGDIST/garglk/gargoyle $BUNDLE/MacOS/Gargoyle +cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/Frameworks +cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/PlugIns +cp -f garglk/launchmac.nib $BUNDLE/Resources/MainMenu.nib +cp -f garglk/garglk.ini $BUNDLE/Resources +cp -f garglk/*.icns $BUNDLE/Resources +cp -f licenses/* $BUNDLE/Resources + +mkdir $BUNDLE/Resources/Fonts +cp fonts/LiberationMono*.ttf $BUNDLE/Resources/Fonts +cp fonts/LinLibertine*.otf $BUNDLE/Resources/Fonts + +mkdir -p ${out}/bin +ln -s $BUNDLE/MacOS/Gargoyle ${out}/bin/gargoyle diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix new file mode 100644 index 000000000000..ecee61513b42 --- /dev/null +++ b/pkgs/games/gargoyle/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, jam, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: + +let + + jamenv = if stdenv.isDarwin then '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" + export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" + '' else '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/libexec/gargoyle" + export DESTDIR="$out" + export _BINDIR=libexec/gargoyle + export _APPDIR=libexec/gargoyle + export _LIBDIR=libexec/gargoyle + export GARGLKINI="$out/etc/garglk.ini" + ''; + +in + +stdenv.mkDerivation { + name = "gargoyle-2017-03-12"; + + src = fetchFromGitHub { + owner = "garglk"; + repo = "garglk"; + rev = "7d8fe875927c332ea30d75656bc982354b42f602"; + sha256 = "00nac7j84gfql1cr11cs9ad4j1gsxrnkqfx6mis4ijf7d6px3sih"; + }; + + nativeBuildInputs = [ jam pkgconfig ]; + + buildInputs = [ gtk2 SDL SDL_mixer ] ++ ( + if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ] + ); + + patches = [ ./darwin.patch ]; + + buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; + + installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' + jam -j$NIX_BUILD_CORES install + mkdir -p "$out/bin" + ln -s ../libexec/gargoyle/gargoyle "$out/bin" + mkdir -p "$out/etc" + cp garglk/garglk.ini "$out/etc" + mkdir -p "$out/share/applications" + cp garglk/gargoyle.desktop "$out/share/applications" + mkdir -p "$out/share/icons/hicolor/32x32/apps" + cp garglk/gargoyle-house.png "$out/share/icons/hicolor/32x32/apps" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://ccxvii.net/gargoyle/; + license = licenses.gpl2Plus; + description = "Interactive fiction interpreter GUI"; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index b485c8063527..dc51a6f0cc0e 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "2.3.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1ys7wl4ygvm2lm49qjpql6c5i8gydmbg4f436bcpkywf5srr6xrd"; + sha256 = "02287xvlk4a07ssm9y9h5vfsvdssshz13n5bbz13pfcani5d9flv"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i \ -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - src/sound/music_fluidsynth_mididevice.cpp + src/sound/mididevices/music_fluidsynth_mididevice.cpp ''; installPhase = '' @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/coelckers/gzdoom"; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - # Doom source license, MAME license - license = licenses.unfreeRedistributable; + license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ lassulus ]; }; diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 5cb79fa92997..4c3d22571b17 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://www.reddit.com/r/hawkthorne"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; + broken = true; }; } diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix new file mode 100644 index 000000000000..39324843e5e5 --- /dev/null +++ b/pkgs/games/instead-launcher/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }: + +stdenv.mkDerivation rec { + name = "instead-launcher-${version}"; + + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "instead-hub"; + repo = "instead-launcher"; + rev = version; + sha256 = "1svy8i8anspway01pnz2cy69aad03anvkq04wrdfv1h9c34gbvb9"; + }; + + patches = [ ./path.patch ]; + + postPatch = '' + substituteInPlace platform.cpp --subst-var-by instead ${instead} + ''; + + nativeBuildInputs = [ qmake4Hook ]; + + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + homepage = https://instead.syscall.ru/wiki/en/instead-launcher; + description = "Install and play games from INSTEAD repository"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/games/instead-launcher/path.patch b/pkgs/games/instead-launcher/path.patch new file mode 100644 index 000000000000..f63737bfb160 --- /dev/null +++ b/pkgs/games/instead-launcher/path.patch @@ -0,0 +1,39 @@ +From c7460a7fc255ef4e8e0e37798605c4d8bb50633d Mon Sep 17 00:00:00 2001 +From: Orivej Desh +Date: Sat, 1 Apr 2017 01:30:37 +0000 +Subject: [PATCH] path + +--- + mainwindow.cpp | 2 +- + platform.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mainwindow.cpp b/mainwindow.cpp +index 9687c4e..234b176 100644 +--- a/mainwindow.cpp ++++ b/mainwindow.cpp +@@ -688,7 +688,7 @@ void MainWindow::loadConfig() { + if ( args.contains( "default-gamespath" ) ) + defGamesPath = args["default-gamespath"].toString(); + +- QString insteadPath = conf.value("InsteadPath", defInsteadPath).toString(); ++ QString insteadPath = defInsteadPath; + bool autoRefresh = conf.value("AutoRefresh", "false").toString() == "true"; + bool autoRefreshSW = conf.value("AutoRefreshSW", "false").toString() == "true"; + QString lang = conf.value( "Language", "*" ).toString(); +diff --git a/platform.cpp b/platform.cpp +index bda86be..c356f1c 100644 +--- a/platform.cpp ++++ b/platform.cpp +@@ -22,7 +22,7 @@ QString getConfigPath() { + } + + QString getDefaultInterpreterPath() { +- return "/usr/local/bin/sdl-instead"; ++ return "@instead@/bin/sdl-instead"; + } + + #elif defined(Q_OS_WIN) +-- +2.12.2 + diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index e3fd6ccb2f7c..2c360241fb9d 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "2.4.1"; + version = "3.0.1"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "1i69b10jfb980d5zhmvh1i789hh982vxiwgqna82b84pdf3y7kgw"; + sha256 = "0ynqzmr35zd1vbbv8n3vk93zj0njhs45w9z33wwkphg2zlniwnzb"; }; NIX_LDFLAGS = "-llua -lgcc_s"; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 2ca105af19d2..ea56c1f1ac20 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -16,11 +16,14 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : $out/lib ''; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = { description = "Just another free touch typing tutor program"; homepage = http://klavaro.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; - maintainer = [stdenv.lib.maintainers.mimadrid]; + maintainers = [stdenv.lib.maintainers.mimadrid]; }; } diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix new file mode 100644 index 000000000000..eb9bed9e1d95 --- /dev/null +++ b/pkgs/games/lbreakout2/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintlOrEmpty }: + +stdenv.mkDerivation rec { + name = "lbreakout2-${version}"; + version = "2.6.5"; + buildInputs = [ SDL SDL_mixer zlib libpng ] ++ libintlOrEmpty; + + src = fetchurl { + url = "mirror://sourceforge/lgames/${name}.tar.gz"; + sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; + }; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + meta = with stdenv.lib; { + description = "Breakout clone from the LGames series"; + homepage = http://lgames.sourceforge.net/LBreakout2/; + license = licenses.gpl2; + maintainers = [ maintainers.ciil ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix new file mode 100644 index 000000000000..10a79a696732 --- /dev/null +++ b/pkgs/games/ltris/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, SDL, SDL_mixer }: + +stdenv.mkDerivation rec { + name = "ltris-${version}"; + version = "1.0.19"; + buildInputs = [ SDL SDL_mixer ]; + + src = fetchurl { + url = "mirror://sourceforge/lgames/${name}.tar.gz"; + sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg"; + }; + + patchPhase = "patch -p0 < ${./gcc5_compliance.diff}"; + + meta = with stdenv.lib; { + description = "Tetris clone from the LGames series"; + homepage = http://lgames.sourceforge.net/LBreakout2/; + license = licenses.gpl2; + maintainers = [ maintainers.ciil ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/ltris/gcc5_compliance.diff b/pkgs/games/ltris/gcc5_compliance.diff new file mode 100644 index 000000000000..bf53fcf8467b --- /dev/null +++ b/pkgs/games/ltris/gcc5_compliance.diff @@ -0,0 +1,299 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog (revision 163) ++++ ChangeLog (revision 164) +@@ -1,3 +1,5 @@ ++- removed all inline keywords to work with GCC 5 (2015/05/16 MS) ++ + 1.0.19: + - removed link to lib math as not needed (2013/10/29 MS) + - reset key states when unpausing to prevent unwanted movement (2013/10/29 MS) +Index: src/bowl.c +=================================================================== +--- src/bowl.c (revision 163) ++++ src/bowl.c (revision 164) +@@ -333,7 +333,7 @@ + Set a tile contents and pixel contents. + ==================================================================== + */ +-inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) ++void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) + { + int i, j = y * bowl->block_size; + bowl->contents[x][y] = tile_id; +Index: src/sdl.c +=================================================================== +--- src/sdl.c (revision 163) ++++ src/sdl.c (revision 164) +@@ -244,7 +244,7 @@ + #endif + + /* return full path of bitmap */ +-inline void get_full_bmp_path( char *full_path, char *file_name ) ++void get_full_bmp_path( char *full_path, char *file_name ) + { + sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name ); + } +@@ -330,7 +330,7 @@ + /* + lock surface + */ +-inline void lock_surf(SDL_Surface *sur) ++void lock_surf(SDL_Surface *sur) + { + if (SDL_MUSTLOCK(sur)) + SDL_LockSurface(sur); +@@ -339,7 +339,7 @@ + /* + unlock surface + */ +-inline void unlock_surf(SDL_Surface *sur) ++void unlock_surf(SDL_Surface *sur) + { + if (SDL_MUSTLOCK(sur)) + SDL_UnlockSurface(sur); +@@ -666,7 +666,7 @@ + /* + lock font surface + */ +-inline void lock_font(Font *fnt) ++void lock_font(Font *fnt) + { + if (SDL_MUSTLOCK(fnt->pic)) + SDL_LockSurface(fnt->pic); +@@ -675,7 +675,7 @@ + /* + unlock font surface + */ +-inline void unlock_font(Font *fnt) ++void unlock_font(Font *fnt) + { + if (SDL_MUSTLOCK(fnt->pic)) + SDL_UnlockSurface(fnt->pic); +@@ -905,7 +905,7 @@ + /* + update rectangle (0,0,0,0)->fullscreen + */ +-inline void refresh_screen(int x, int y, int w, int h) ++void refresh_screen(int x, int y, int w, int h) + { + SDL_UpdateRect(sdl.screen, x, y, w, h); + } +@@ -1055,7 +1055,7 @@ + /* + lock surface + */ +-inline void lock_screen() ++void lock_screen() + { + if (SDL_MUSTLOCK(sdl.screen)) + SDL_LockSurface(sdl.screen); +@@ -1064,7 +1064,7 @@ + /* + unlock surface + */ +-inline void unlock_screen() ++void unlock_screen() + { + if (SDL_MUSTLOCK(sdl.screen)) + SDL_UnlockSurface(sdl.screen); +@@ -1073,7 +1073,7 @@ + /* + flip hardware screens (double buffer) + */ +-inline void flip_screen() ++void flip_screen() + { + SDL_Flip(sdl.screen); + } +@@ -1132,7 +1132,7 @@ + /* + get milliseconds since last call + */ +-inline int get_time() ++int get_time() + { + int ms; + cur_time = SDL_GetTicks(); +@@ -1148,7 +1148,7 @@ + /* + reset timer + */ +-inline void reset_timer() ++void reset_timer() + { + last_time = SDL_GetTicks(); + } +Index: src/sdl.h +=================================================================== +--- src/sdl.h (revision 163) ++++ src/sdl.h (revision 164) +@@ -41,8 +41,8 @@ + SDL_Surface* load_surf(char *fname, int f); + SDL_Surface* create_surf(int w, int h, int f); + void free_surf( SDL_Surface **surf ); +-inline void lock_surf(SDL_Surface *sur); +-inline void unlock_surf(SDL_Surface *sur); ++void lock_surf(SDL_Surface *sur); ++void unlock_surf(SDL_Surface *sur); + void blit_surf(void); + void alpha_blit_surf(int alpha); + void fill_surf(int c); +@@ -86,8 +86,8 @@ + Font* load_fixed_font(char *fname, int off, int len, int w); + void free_font(Font **sfnt); + int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha); +-inline void lock_font(Font *sfnt); +-inline void unlock_font(Font *sfnt); ++void lock_font(Font *sfnt); ++void unlock_font(Font *sfnt); + SDL_Rect last_write_rect(Font *fnt); + int text_width(Font *fnt, char *str); + +@@ -132,14 +132,14 @@ + char** get_mode_names( int *count ); + int set_video_mode( Video_Mode mode ); + void hardware_cap(); +-inline void refresh_screen( int x, int y, int w, int h ); ++void refresh_screen( int x, int y, int w, int h ); + void refresh_rects(); + void add_refresh_rect(int x, int y, int w, int h); + int wait_for_key(); + void wait_for_click(); +-inline void lock_screen(); +-inline void unlock_screen(); +-inline void flip_screen(); ++void lock_screen(); ++void unlock_screen(); ++void flip_screen(); + void fade_screen( int type, int ms ); + void take_screenshot( int i ); + +@@ -148,8 +148,8 @@ + SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source ); + + /* timer */ +-inline int get_time(); +-inline void reset_timer(); ++int get_time(); ++void reset_timer(); + + #ifdef __cplusplus + }; +Index: src/tools.c +=================================================================== +--- src/tools.c (revision 163) ++++ src/tools.c (revision 164) +@@ -23,7 +23,7 @@ + #include "ltris.h" + + /* compares to strings and returns true if their first strlen(str1) chars are equal */ +-inline int strequal( char *str1, char *str2 ) ++int strequal( char *str1, char *str2 ) + { + if ( strlen( str1 ) != strlen( str2 ) ) return 0; + return ( !strncmp( str1, str2, strlen( str1 ) ) ); +@@ -30,7 +30,7 @@ + } + + /* set delay to ms milliseconds */ +-inline void delay_set( Delay *delay, int ms ) ++void delay_set( Delay *delay, int ms ) + { + delay->limit = ms; + delay->cur = 0; +@@ -37,13 +37,13 @@ + } + + /* reset delay ( cur = 0 )*/ +-inline void delay_reset( Delay *delay ) ++void delay_reset( Delay *delay ) + { + delay->cur = 0; + } + + /* check if times out and reset */ +-inline int delay_timed_out( Delay *delay, int ms ) ++int delay_timed_out( Delay *delay, int ms ) + { + delay->cur += ms; + if ( delay->cur >= delay->limit ) { +@@ -56,12 +56,12 @@ + } + + /* set timer so that we have a time out next call of delay_timed_out() */ +-inline void delay_force_time_out( Delay *delay ) ++void delay_force_time_out( Delay *delay ) + { + delay->cur = delay->limit; + } + +-inline void goto_tile( int *x, int *y, int d ) ++void goto_tile( int *x, int *y, int d ) + { + /* 0 -up, clockwise, 5 - left up */ + switch ( d ) { +@@ -326,24 +326,24 @@ + the target value until reached when counter_update() is called. + ==================================================================== + */ +-inline void counter_set( Counter *counter, double value ) ++void counter_set( Counter *counter, double value ) + { + counter->value = value; + counter->approach = value; + } +-inline void counter_add( Counter *counter, double add ) ++void counter_add( Counter *counter, double add ) + { + counter->value += add; + } +-inline double counter_get_approach( Counter counter ) ++double counter_get_approach( Counter counter ) + { + return counter.approach; + } +-inline double counter_get( Counter counter ) ++double counter_get( Counter counter ) + { + return counter.value; + } +-inline void counter_update( Counter *counter, int ms ) ++void counter_update( Counter *counter, int ms ) + { + double change; + if ( counter->approach == counter->value ) return; +Index: src/tools.h +=================================================================== +--- src/tools.h (revision 163) ++++ src/tools.h (revision 164) +@@ -33,7 +33,7 @@ + #define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) ) + + /* compares to strings and returns true if their first strlen(str1) chars are equal */ +-inline int strequal( char *str1, char *str2 ); ++int strequal( char *str1, char *str2 ); + + /* delete lines */ + void delete_lines( char **lines, int line_number ); +@@ -45,16 +45,16 @@ + } Delay; + + /* set delay to ms milliseconds */ +-inline void delay_set( Delay *delay, int ms ); ++void delay_set( Delay *delay, int ms ); + + /* reset delay ( cur = 0 )*/ +-inline void delay_reset( Delay *delay ); ++void delay_reset( Delay *delay ); + + /* check if time's out ( add ms milliseconds )and reset */ +-inline int delay_timed_out( Delay *delay, int ms ); ++int delay_timed_out( Delay *delay, int ms ); + + /* set timer so that we have a time out next call of delay_timed_out() */ +-inline void delay_force_time_out( Delay *delay ); ++void delay_force_time_out( Delay *delay ); + + /* return distance betwteen to map positions */ + int get_dist( int x1, int y1, int x2, int y2 ); diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix new file mode 100644 index 000000000000..5494e32b16b6 --- /dev/null +++ b/pkgs/games/mar1d/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, fetchFromGitHub +, cmake +, mesa_glu +, x11 +, xorg +, xinput_calibrator +, doxygen +, libpthreadstubs +, alsaLib +, alsaOss +, libao +, width ? 30 +, mute ? false +, effects ? false +, sensitivity ? 5 +, reverseY ? false +}: + +stdenv.mkDerivation rec { + name = "MAR1D-${version}"; + version = "0.2.0"; + options = "-w${toString width}" + + " -s${toString sensitivity}" + + (if mute then " -m" else "") + + (if effects then " -f" else "") + + (if reverseY then " -r" else ""); + + src = fetchFromGitHub { + sha256 = "152w5dnlxzv60cl24r5cmrj2q5ar0jiimrmxnp87kf4d2dpbnaq7"; + rev = "v${version}"; + repo = "fp_mario"; + owner = "olynch"; + }; + + buildInputs = + [ + alsaLib + alsaOss + cmake + doxygen + libao + libpthreadstubs + mesa_glu + x11 + xinput_calibrator + xorg.libXrandr + xorg.libXi + xorg.xinput + ]; + + preConfigure = '' + cd src + ''; + + meta = with stdenv.lib; { + description = "First person Super Mario Bros"; + longDescription = '' + The original Super Mario Bros as you've never seen it. Step into Mario's + shoes in this first person clone of the classic Mario game. True to the + original, however, the game still takes place in a two dimensional world. + You must view the world as mario does, as a one dimensional line. + ''; + homepage = https://github.com/olynch/fp_mario; + license = licenses.agpl3; + maintainers = with maintainers; [ taeer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index fd944bb7611d..1e8ec2b8a6a8 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.11.2"; + version = "1.12"; src = fetchurl { url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; - sha256 = "12nqcj6skwjfcywm3ah4jb1qn4r558ng9cchdc3hbz99nhv7vi6y"; + sha256 = "02fwlg4c9kqckmdi9wxi64jdqynj5myp0995aabc07746hwgzszy"; }; preferLocalBuild = true; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index b8cfe512c370..b40083bedba8 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -33,6 +33,8 @@ in stdenv.mkDerivation { "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" ]; + NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + buildInputs = [ cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ncurses diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 99c06e56043e..078075931dae 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,5 +1,5 @@ { fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell -, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmakeHook }: +, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmake }: stdenv.mkDerivation rec { name = "mudlet-${version}"; @@ -10,9 +10,10 @@ stdenv.mkDerivation rec { sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7"; }; + nativeBuildInputs = [ makeWrapper qmake ]; buildInputs = [ - unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper - luafilesystem luazip lrexlib luasqlite3 qmakeHook + unzip qtbase lua5_1 hunspell libzip yajl boost + luafilesystem luazip lrexlib luasqlite3 ]; preConfigure = "cd src"; diff --git a/pkgs/games/mudlet/libs.patch b/pkgs/games/mudlet/libs.patch index 3943c16e0eab..45b693828ff2 100644 --- a/pkgs/games/mudlet/libs.patch +++ b/pkgs/games/mudlet/libs.patch @@ -7,7 +7,7 @@ - -llua5.1 \ - -lhunspell \ + -llua \ -+ -lhunspell-1.3 \ ++ -lhunspell-1.6 \ -L/usr/local/lib/ \ -lyajl \ -lGLU \ diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 67f0a87df659..e438008b19c2 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,31 +4,29 @@ let libnbt = fetchFromGitHub { owner = "MultiMC"; repo = "libnbtplusplus"; - rev = "5d0ffb50a526173ce58ae57136bf5d79a7e1920d"; - sha256 = "05hnwfb77rmm9ba7n96g4g1sgwqqcmplvbcafsl76yxr6ysgw5jg"; + rev = "4b305bb"; + sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs"; }; in stdenv.mkDerivation { - name = "multimc-5"; + name = "multimc-0.5.1"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50"; - sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds"; + rev = "0.5.1"; + sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20"; }; buildInputs = [ cmake qtbase jdk zlib file makeWrapper ]; libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; postUnpack = '' - rmdir $sourceRoot/depends/libnbtplusplus - cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus - chmod 755 -R $sourceRoot/depends/libnbtplusplus + rmdir $sourceRoot/libraries/libnbtplusplus + cp -r ${libnbt} $sourceRoot/libraries/libnbtplusplus + chmod 755 -R $sourceRoot/libraries/libnbtplusplus mkdir -pv $sourceRoot/build/ cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz ''; - patches = [ ./multimc.patch ]; - enableParallelBuilding = true; # the install rule tries to bundle ALL deps into the output for portability @@ -41,7 +39,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin/jars $out/lib cp -v MultiMC $out/bin/ cp -v jars/*.jar $out/bin/jars/ #*/ - cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib + cp -v libMultiMC_rainbow.so libMultiMC_nbt++.so libMultiMC_logic.so libMultiMC_gui.so $out/lib wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/ ''; diff --git a/pkgs/games/multimc/multimc.patch b/pkgs/games/multimc/multimc.patch deleted file mode 100644 index 39d0076f16a7..000000000000 --- a/pkgs/games/multimc/multimc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp ---- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp 2015-10-25 03:29:25.270126028 -0300 -+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp 2015-10-25 04:22:48.568437861 -0300 -@@ -330,7 +330,7 @@ - } - - m_mmc_translator.reset(new QTranslator()); -- if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), staticDataPath + "/translations")) -+ if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), "translations")) - { - qDebug() << "Loading MMC Language File for" - << locale.bcp47Name().toLocal8Bit().constData() << "..."; -diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp ---- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp 2015-10-25 03:29:25.428124792 -0300 -+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp 2015-10-25 04:29:24.145412196 -0300 -@@ -147,7 +147,7 @@ - m_metacache->addBase("general", QDir("cache").absolutePath()); - m_metacache->addBase("skins", QDir("accounts/skins").absolutePath()); - m_metacache->addBase("root", QDir(rootPath).absolutePath()); -- m_metacache->addBase("translations", QDir(staticDataPath + "/translations").absolutePath()); -+ m_metacache->addBase("translations", QDir("translations").absolutePath()); - m_metacache->addBase("icons", QDir("cache/icons").absolutePath()); - m_metacache->Load(); - } diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 735065ca18e0..bf9d01800f33 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, ncurses, gzip, flex, bison }: +{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less }: let platform = @@ -10,6 +10,7 @@ let # We probably want something different for Darwin else "unix"; userDir = "~/.config/nethack"; + binPath = lib.makeBinPath [ coreutils less ]; in stdenv.mkDerivation { name = "nethack-3.6.0"; @@ -60,6 +61,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat <$out/bin/nethack #! ${stdenv.shell} -e + PATH=${binPath}:\$PATH if [ ! -d ${userDir} ]; then mkdir -p ${userDir} diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 7a23c4dc966b..d637c1595954 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,7 +1,7 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr , libXrender, fontconfig, freetype, openal }: -with { inherit (stdenv.lib) makeLibraryPath; }; +let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 0c129f8d556f..2ecff1c835e8 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.6.1"; + version = "1.7.1"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1ak32fj5xkk2fvmm3g8i7wzmk4bh2ijsp8fzvvw5wj6365p9j24v"; + sha256 = "0dhv5bbbg1dmmq7fi3xss0a9jq2rqgb5sf9fsqzlsjcdm590j6b1"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix new file mode 100644 index 000000000000..b6a76001ad09 --- /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 000000000000..c1d1e399ec1a --- /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/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix new file mode 100644 index 000000000000..cd7787604c2e --- /dev/null +++ b/pkgs/games/quakespasm/default.nix @@ -0,0 +1,40 @@ +{ stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: +stdenv.mkDerivation rec { + name = "quakespasm-${version}"; + majorVersion = "0.92"; + version = "${majorVersion}.1"; + + src = fetchurl { + url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tgz"; + sha256 = "0vhycjg97sn4cd85ph6qz68rplzrm4apijdkrlj9mycnqjv5l100"; + }; + + sourceRoot = "${name}/Quake"; + + buildInputs = [ + gzip SDL libvorbis libmad + ]; + + preInstall = '' + mkdir -p "$out/bin" + substituteInPlace Makefile --replace "/usr/local/games" "$out/bin" + ''; + + enableParallelBuilding = true; + + meta = { + description = "An engine for iD software's Quake"; + homepage = "http://quakespasm.sourceforge.net/"; + longDescription = '' + QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. + It includes support for 64 bit CPUs and custom music playback, a new sound driver, + some graphical niceities, and numerous bug-fixes and other improvements. + Quakespasm utilizes either the SDL or SDL2 frameworks, so choose which one + works best for you. SDL is probably less buggy, but SDL2 has nicer features + and smoother mouse input - though no CD support. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.m3tti ]; + }; +} diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index ac658ee1367a..a118a75aefe0 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "git-20160412"; + version = "0.4.7.0"; name = "rigsofrods-${version}"; src = fetchFromGitHub { owner = "RigsOfRods"; repo = "rigs-of-rods"; - rev = "1ebd359dbd467b4c3171dd6d054e7d8ec39f78ba"; - sha256 = "0h71nrgq5r5cnh20c7wl8jzyaf50dj1b5jdrwihnklpsfyfvjlw4"; + rev = version; + sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4"; }; enableParallelBuilding = true; diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix new file mode 100644 index 000000000000..14af1e3c7886 --- /dev/null +++ b/pkgs/games/robotfindskitten/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, ncurses }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "robotfindskitten-${version}"; + version = "2.7182818.701"; + + src = fetchurl { + url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${name}.tar.gz"; + sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp"; + }; + + buildInputs = + [ pkgconfig ncurses ]; + + meta = { + description = "Yet another zen simulation; A simple find-the-kitten game"; + homepage = http://robotfindskitten.org/; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 29ba75f9aa24..e965fc459ad8 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/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 6718b3b0b5e6..bb9772dae72a 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,22 +1,25 @@ -{stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}: -let +{ stdenv, fetchurl +, gtk3, libX11 +, makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "sgt-puzzles-r${version}"; version = "20170228.1f613ba"; - buildInputs = [ - gtk3 pkgconfig libX11 perl automake115x autoconf - ]; -in -stdenv.mkDerivation { + src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5"; }; - name = "sgt-puzzles-r" + version; - inherit buildInputs; + + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; + + buildInputs = [ gtk3 libX11 ]; + makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"]; preInstall = '' mkdir -p "$out"/{bin,share/doc/sgtpuzzles} cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles" - cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE" ''; # SGT Puzzles use generic names like net, map, etc. # Create symlinks with sgt-puzzle- prefix for possibility of @@ -33,12 +36,11 @@ stdenv.mkDerivation { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" cp Makefile.gtk Makefile ''; - meta = { - inherit version; + meta = with stdenv.lib; { description = "Simon Tatham's portable puzzle collection"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; homepage = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"; }; } diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 125566b8428c..ace8e9888a76 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -2,6 +2,7 @@ , steam-runtime, steam-runtime-i686 ? null , withJava ? false , withPrimus ? false +, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , nativeOnly ? false , runtimeOnly ? false , newStdcpp ? false @@ -37,7 +38,8 @@ let # Zoneinfo etc-zoneinfo ] ++ lib.optional withJava jdk - ++ lib.optional withPrimus primus2; + ++ lib.optional withPrimus primus2 + ++ extraPkgs pkgs; in buildFHSUserEnv rec { name = "steam"; @@ -63,6 +65,7 @@ in buildFHSUserEnv rec { libdrm mono xorg.xkeyboardconfig + xlibs.libpciaccess (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 1988463d61a6..6274a91625fa 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -50,7 +50,6 @@ let # Verified games requirements xlibs.libXmu xlibs.libxcb - xlibs.libpciaccess mesa_glu libuuid libogg @@ -58,6 +57,7 @@ let SDL SDL2_image glew110 + openssl libidn # Other things from runtime @@ -87,7 +87,7 @@ let alsaLib openalSoft libva - openssl-steam + vulkan-loader ] ++ lib.optional newStdcpp gcc.cc; ourRuntime = if runtimeOnly then [] diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 9ba78c0ab14a..cd59f96037fb 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,24 +1,24 @@ { stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis -, glew, libpulseaudio +, glew, libpulseaudio, udev }: stdenv.mkDerivation rec { name = "stepmania-${version}"; - version = "5.0.10"; + version = "5.0.12"; src = fetchFromGitHub { owner = "stepmania"; repo = "stepmania"; rev = "v${version}"; - sha256 = "174gzvk42gwm56hpkz51csad9xi4dg466xv0mf1z39xd7mqd5j5w"; + sha256 = "0ig5pnw78j45b35kfr76phaqbac9b2f6wg3c63l6mf0nrq17wslz"; }; nativeBuildInputs = [ cmake nasm ]; buildInputs = [ gtk2 glib ffmpeg alsaLib libmad libogg libvorbis - glew libpulseaudio + glew libpulseaudio udev ]; cmakeFlags = [ @@ -27,14 +27,6 @@ stdenv.mkDerivation rec { "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; - patches = [ - # Fix compilation on i686 - (fetchpatch { - url = "https://github.com/stepmania/stepmania/commit/f1e114aa03c90884946427bb43a75badec21f163.patch"; - sha256 = "1cm14w92dilqvlyqfffiihf09ra97hxzgfal5gx08brc3j1yyzdw"; - }) - ]; - postInstall = '' mkdir -p $out/bin ln -s $out/stepmania-5.0/stepmania $out/bin/stepmania diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/1.1.nix similarity index 98% rename from pkgs/games/ultrastardx/default.nix rename to pkgs/games/ultrastardx/1.1.nix index 5027abedcf4f..9810d5186b0e 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/1.1.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; license = stdenv.lib.licenses.gpl2Plus; + broken = true; }; } diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/1.3-beta.nix new file mode 100644 index 000000000000..ca7d6b35a21b --- /dev/null +++ b/pkgs/games/ultrastardx/1.3-beta.nix @@ -0,0 +1,49 @@ +{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +, lua, fpc, pcre, portaudio, freetype, libpng +, SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf +, ffmpeg, sqlite, zlib, libX11, mesa }: + +let + sharedLibs = [ + pcre portaudio freetype + SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf + sqlite lua zlib libX11 mesa ffmpeg + ]; + +in stdenv.mkDerivation rec { + name = "ultrastardx-${version}"; + version = "1.3.5-beta"; + src = fetchFromGitHub { + owner = "UltraStar-Deluxe"; + repo = "USDX"; + rev = "v${version}"; + sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn"; + }; + + buildInputs = [ + pkgconfig autoreconfHook + fpc libpng + ] ++ sharedLibs; + + postPatch = '' + # autoconf substitutes strange things otherwise + substituteInPlace src/config.inc.in \ + --subst-var-by libpcre_LIBNAME libpcre.so.1 + ''; + + preBuild = with stdenv.lib; + let items = concatMapStringsSep " " (x: "-rpath ${getLib x}/lib") sharedLibs; + in '' + export NIX_LDFLAGS="$NIX_LDFLAGS ${items}" + ''; + + # dlopened libgcc requires the rpath not to be shrinked + dontPatchELF = true; + + meta = with stdenv.lib; { + homepage = http://ultrastardx.sourceforge.net/; + description = "Free and open source karaoke game"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ profpatsch ]; + }; +} diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index ae32de2e7716..ea0186323c02 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "--with-gamesdir=/tmp/unnethack" ]; + makeFlags = [ "GAMEPERM=744" ]; + postInstall = '' cp -r /tmp/unnethack $out/share/unnethack/profile mv $out/bin/unnethack $out/bin/.wrapped_unnethack diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index d6bcb787d60c..d1416b0685a7 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/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 50b127fa9dc2..bc293a881079 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.3.1"; + version = "4.3.2"; srcs = [ (fetchurl { - url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror431_full.zip"; - sha256 = "1dfnyb2grf2fxxphwj7p2ff721j2l0gwrj76jzympr32sim5a6cw"; + url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror432_full.zip"; + sha256 = "192jwdyfy18cg413ysaklqc8yzmdnshljqc6dnr0xkd6dxbf3pkl"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.3.1.zip"; - sha256 = "1rbiqa1ki73649np3af96cilavkgv66a0b6p0a5x26cxvpgg128k"; + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; + sha256 = "0m376hdkk8vjnbdy8zakjazyag6jiw4n8zy4lxhv2ndn9mii8lcx"; }) ]; buildInputs = [ unzip SDL mesa openal curl libXxf86vm ]; - sourceRoot = "ioq3-for-UrbanTerror-4-release-4.3.1"; + sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' echo "USE_OPENAL = 1" > Makefile.local diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index ea3231dbe63e..98fe9d7c6f68 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { cp -r --reflink=auto $data data chmod -R +w data sed -i -e s,/usr/local,$out, SConstruct + export CXXFLAGS="$(pkg-config --cflags SDL2_image)" scons ''; installPhase = "scons install"; diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix new file mode 100644 index 000000000000..91f77277d9ec --- /dev/null +++ b/pkgs/games/vms-empire/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, ncurses, xmlto }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "vms-empire-${version}"; + version = "1.14"; + + src = fetchurl{ + url = "http://www.catb.org/~esr/vms-empire/${name}.tar.gz"; + sha256 = "0cymzhivvaahgqz0p11w25a710ls4w0jhyqj789jas5s07nvd890"; + }; + + buildInputs = + [ ncurses xmlto ]; + + patchPhase = '' + sed -i -e 's|^install: empire\.6 uninstall|install: empire.6|' -e 's|usr/||g' Makefile + ''; + + hardeningDisable = [ "format" ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = { + description = "The ancestor of all expand/explore/exploit/exterminate games"; + longDescription = '' + Empire is a simulation of a full-scale war between two emperors, the + computer and you. Naturally, there is only room for one, so the object of + the game is to destroy the other. The computer plays by the same rules + that you do. This game was ancestral to all later + expand/explore/exploit/exterminate games, including Civilization and + Master of Orion. + ''; + homepage = http://catb.org/~esr/vms-empire/; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} + + diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 0b335812ff03..315f9ea7a5ea 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.6"; + version = "1.13.8"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1"; + sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index e6e237529531..e8e27d7afb66 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { # Fix Makefiles find . -name 'Makefile.in' -exec sed -re 's@^ ( *)(cd|[&][&])@ \1\2@' -i '{}' ';' find . -name 'Makefile.in' -exec sed -e '/chown/d; /chgrp/d' -i '{}' ';' + # do not set sticky bit in nix store + find . -name 'Makefile.in' -exec sed -e 's/04755/755/g' -i '{}' ';' sed -e '/^ * *[$][(]tcltkdir[)]\/[*][.][*]/d' -i tcltk/Makefile.in # Fix C files diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index fc42b299e918..b6009ee72fd0 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl , # required for both - unzip, libjpeg, zlib, libvorbis, curl + unzip, libjpeg, zlib, libvorbis, curl, patchelf , # glx libX11, mesa, libXpm, libXext, libXxf86vm, alsaLib , # sdl - SDL + SDL2 }: stdenv.mkDerivation rec { - name = "xonotic-0.8.1"; + name = "xonotic-0.8.2"; src = fetchurl { url = "http://dl.xonotic.org/${name}.zip"; - sha256 = "0vy4hkrbpz9g91gb84cbv4xl845qxaknak6hshk2yflrw90wr2xy"; + sha256 = "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2"; }; buildInputs = [ @@ -21,17 +21,22 @@ stdenv.mkDerivation rec { # glx libX11 mesa libXpm libXext libXxf86vm alsaLib # sdl - SDL + SDL2 zlib libvorbis curl ]; sourceRoot = "Xonotic/source/darkplaces"; + # "debug", "release", "profile" + target = "release"; + + dontStrip = target != "release"; + buildPhase = '' DP_FS_BASEDIR="$out/share/xonotic" - make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release - make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release - make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release + make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-${target} + make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-${target} + make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-${target} ''; enableParallelBuilding = true; @@ -48,7 +53,21 @@ stdenv.mkDerivation rec { ln -s "$out/bin/xonotic-sdl" "$out/bin/xonotic" ''; + # Xonotic needs to find libcurl.so at runtime for map downloads dontPatchELF = true; + postFixup = '' + patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-dedicated + patchelf \ + --add-needed ${curl.out}/lib/libcurl.so \ + --add-needed ${libvorbis}/lib/libvorbisfile.so \ + --add-needed ${libvorbis}/lib/libvorbis.so \ + $out/bin/xonotic-glx + patchelf \ + --add-needed ${curl.out}/lib/libcurl.so \ + --add-needed ${libvorbis}/lib/libvorbisfile.so \ + --add-needed ${libvorbis}/lib/libvorbis.so \ + $out/bin/xonotic-sdl + ''; meta = { description = "A free fast-paced first-person shooter"; @@ -62,7 +81,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.xonotic.org; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl zalakain ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 47d05b7e3f6a..814241244e31 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + prePatch = '' + substituteInPlace Makefile.in --replace 4755 0755 + ''; + preConfigure = '' sed -e 's/getline/my_getline/' -i score.c @@ -22,7 +26,7 @@ stdenv.mkDerivation rec { cat >>config.h <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 000000000000..20c2d756d1eb --- /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/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index b2801c7ae671..9c187a8f378d 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cups ]; + patches = [ ./fix-includes.patch ]; + makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ]; meta = { diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/misc/cups/drivers/dymo/fix-includes.patch new file mode 100644 index 000000000000..fa7df5591dda --- /dev/null +++ b/pkgs/misc/cups/drivers/dymo/fix-includes.patch @@ -0,0 +1,67 @@ +diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h +*** dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h 2012-02-07 14:22:37.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h 2017-03-27 23:10:17.638976126 +0200 +*************** +*** 22,29 **** +--- 22,31 ---- + #define hfc4bbdea_8a1b_427c_9ab5_50b84576b19e + + #include ++ #include + #include + #include ++ #include + #include + #include "CupsPrintEnvironment.h" + #include "ErrorDiffusionHalftoning.h" +diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h +*** dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h 2012-02-07 14:22:37.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h 2017-03-27 23:10:17.638976126 +0200 +*************** +*** 22,27 **** +--- 22,28 ---- + #define h952b1c81_8931_433a_8479_7ae6d8e85a86 + + #include "PrinterDriver.h" ++ #include + + namespace DymoPrinterDriver + { +diff -rp dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h +*** dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h 2012-02-07 14:22:38.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h 2017-03-27 23:10:17.635976126 +0200 +*************** +*** 22,27 **** +--- 22,28 ---- + #define he780684b_6efc_428d_bfdb_c5422b1ed982 + + #include ++ #include + #include + #include "LabelManagerDriver.h" + #include "LabelManagerLanguageMonitor.h" +*************** public: +*** 50,53 **** + + /* + * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $". +! */ +\ No newline at end of file +--- 51,54 ---- + + /* + * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $". +! */ +diff -rp dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h +*** dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h 2012-02-07 14:22:37.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h 2017-03-27 23:10:17.632976126 +0200 +*************** +*** 22,27 **** +--- 22,28 ---- + #define hd8574b83_b264_47b2_8d33_a46ae75691d2 + + #include ++ #include + #include + #include "LabelWriterDriver.h" + #include "LabelWriterLanguageMonitor.h" diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix new file mode 100644 index 000000000000..6f9e4579a147 --- /dev/null +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { + name = "cups-toshiba-estudio"; + version = "7.51"; + + src = fetchurl { + url = http://business.toshiba.com/downloads/KB/f1Ulds/14079/TOSHIBA_ColorMFP_CUPS.tar; + sha256 = "3741bb79723495da5cb5a3971ae8c6042b6c71a6264af8f25aecf721f1f0752f"; + }; + + buildInputs = [ perl ]; + + phases = [ "unpackPhase" + "patchPhase" + "installPhase" ]; + + patchPhase = '' + patchShebangs lib/ + gunzip share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz + sed -i "s+/usr+$out+" share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS + gzip share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS + ''; + + installPhase = '' + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model/Toshiba + cp {.,$out}/lib/cups/filter/est6550_Authentication + chmod 755 $out/lib/cups/filter/est6550_Authentication + cp {.,$out}/share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz + chmod 755 $out/share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz + ''; + + meta = with stdenv.lib; { + description = "Printer only driver for the Toshiba e-STUDIO class of printers"; + longDescription = '' + This driver supports the following printers: TOSHIBA e-STUDIO2000AC, + TOSHIBA e-STUDIO2005AC, TOSHIBA e-STUDIO2040C, TOSHIBA e-STUDIO2050C, + TOSHIBA e-STUDIO2055C, TOSHIBA e-STUDIO2500AC, TOSHIBA e-STUDIO2505AC, + TOSHIBA e-STUDIO2540C, TOSHIBA e-STUDIO2550C, TOSHIBA e-STUDIO2555C, + TOSHIBA e-STUDIO287CS, TOSHIBA e-STUDIO3005AC, TOSHIBA e-STUDIO3040C, + TOSHIBA e-STUDIO3055C, TOSHIBA e-STUDIO347CS, TOSHIBA e-STUDIO3505AC, + TOSHIBA e-STUDIO3540C, TOSHIBA e-STUDIO3555C, TOSHIBA e-STUDIO407CS, + TOSHIBA e-STUDIO4505AC, TOSHIBA e-STUDIO4540C, TOSHIBA e-STUDIO4555C, + TOSHIBA e-STUDIO5005AC, TOSHIBA e-STUDIO5055C, TOSHIBA e-STUDIO5506AC, + TOSHIBA e-STUDIO5540C, TOSHIBA e-STUDIO5560C, TOSHIBA e-STUDIO6506AC, + TOSHIBA e-STUDIO6540C, TOSHIBA e-STUDIO6550C, TOSHIBA e-STUDIO6560C, + TOSHIBA e-STUDIO6570C and TOSHIBA e-STUDIO7506AC. + ''; + homepage = https://www.toshiba-business.com.au/support/drivers; + license = licenses.unfree; + maintainers = [ maintainers.jpotier ]; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index ee14e4a52db9..228f56d47ae0 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, vimNox +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd , ghostscript, a2ps }: # Why: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \ - ${vimNox}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched + ${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched chmod +x $out/usr/bin/brprintconf_mfcj6510dw_patched #executing from current dir. segfaults if it's not r\w. mkdir -p $out/bin @@ -79,11 +79,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; - description = "Brother MFC-J6510DW LPR driver"; - license = with licenses; unfree; - platforms = with platforms; linux; + description = "Brother MFC-J6510DW LPR driver"; downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; - maintainers = with maintainers; [ ramkromberg ]; + homepage = http://www.brother.com/; + license = with licenses; unfree; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix new file mode 100644 index 000000000000..0378aac6d70e --- /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 000000000000..1be1351bb823 --- /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/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 0569eabe8f14..16b40798a5da 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -16,7 +16,7 @@ # Do not bump lightly! Visit # to see what will break when upgrading. Consider a new versioned attribute. let - cups' = cups.out; + cups' = stdenv.lib.getLib cups; in stdenv.mkDerivation rec { name = "samsung-UnifiedLinuxDriver-${version}"; version = "4.00.39"; diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 8ef788df66fb..556c408012d2 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, cups, libusb, ghostscript }: +{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript }: let @@ -18,10 +18,9 @@ in stdenv.mkDerivation rec { buildInputs = [ cups libusb + libxml2 ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin @@ -69,16 +68,15 @@ in stdenv.mkDerivation rec { ''; preFixup = '' + for bin in "$out/bin/"*; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + done - for bin in $out/bin/*; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" - patchelf --set-rpath "$out/lib:${cups.out}/lib" "$bin" - done - - patchelf --set-rpath "$out/lib:${cups.out}/lib" "$out/lib/libscmssc.so" - - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ''; # all binaries are already stripped diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index e4c70e2fe988..375afcecf70a 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi -, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which +, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript +, mupdf }: let @@ -8,22 +9,23 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.11.1"; + version = "1.15.0"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0x0jxn1hnif92m7dyqrqh015gpsf79dviarb7dfl0zya2drlk1m8"; + sha256 = "0g6jmbzgvsq4dq6jaczr6fslpv3692v8yvvmqgw08sb3aly7kgd3"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ cups poppler poppler_utils fontconfig libjpeg libpng perl - ijs qpdf dbus avahi + ijs qpdf dbus avahi ghostscript mupdf ]; configureFlags = [ "--with-pdftops=pdftops" + "--with-pdftops-path=${poppler_utils}/bin/pdftops" "--enable-imagefilters" "--with-rcdir=no" "--with-shell=${stdenv.shell}" @@ -41,6 +43,9 @@ in stdenv.mkDerivation rec { # Ensure that gstoraster can find gs in $PATH. substituteInPlace filter/gstoraster.c --replace execve execvpe + + # Patch shebangs of generated build scripts + patchShebangs filter ''; postInstall = @@ -57,5 +62,6 @@ in stdenv.mkDerivation rec { description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ layus ]; }; } diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 36b580bb16df..14ceb405d687 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "ZjStream printer drivers"; maintainers = with maintainers; [ - raskin urkud + raskin ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index c0a6c0a9baa0..6adc2a765c7f 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, substituteAll , pkgconfig +, makeWrapper , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, openssl, polkit +, net_snmp, openssl, polkit, nettools , bash, coreutils, utillinux , qtSupport ? true , withPlugin ? false @@ -10,32 +11,29 @@ let name = "hplip-${version}"; - version = "3.16.5"; + version = "3.16.11"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6"; + sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"; }; plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q"; + sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg"; }; - hplipState = - substituteAll - { - inherit version; - src = ./hplip.state; - }; + hplipState = substituteAll { + inherit version; + src = ./hplip.state; + }; - hplipPlatforms = - { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - }; + hplipPlatforms = { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + }; hplipArch = hplipPlatforms."${stdenv.system}" or (throw "HPLIP not supported on ${stdenv.system}"); @@ -47,8 +45,9 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.system}"; -pythonPackages.mkPythonDerivation { +pythonPackages.buildPythonApplication { inherit name src; + format = "other"; buildInputs = [ libjpeg @@ -62,6 +61,7 @@ pythonPackages.mkPythonDerivation { nativeBuildInputs = [ pkgconfig + makeWrapper ]; propagatedBuildInputs = with pythonPackages; [ @@ -145,6 +145,9 @@ pythonPackages.mkPythonDerivation { ''; postFixup = '' + wrapProgram $out/lib/cups/filter/hpps \ + --prefix PATH : "${nettools}/bin" + substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out '' + stdenv.lib.optionalString (!withPlugin) '' # A udev rule to notify users that they need the binary plugin. diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index e39e52850395..e0fe451ce24d 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,8 +1,8 @@ { callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }: let pkg = import ./base.nix { - version = "3.0.1"; + version = "3.1.0"; pkgName = "image-analyzer"; - pkgSha256 = "19x5hx991pl55ddm2wjd2ylm2hiz9yvzgrwmpnsqr9zqc4lja682"; + pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2"; }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index 3a5850e10e95..ec4341a29459 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,11 +1,12 @@ { callPackage, pythonPackages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.0.3"; + version = "3.1.0"; pkgName = "cdemu-client"; - pkgSha256 = "1bfj7bc10z20isdg0h8sfdvnwbn6c49494mrmq6jwrfbqvby25x9"; + pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik"; }; in callPackage pkg { - buildInputs = [ pythonPackages.python pythonPackages.dbus-python intltool makeWrapper ]; + buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3 + intltool makeWrapper ]; drvParams = { postFixup = '' wrapProgram $out/bin/cdemu \ diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index ef58ff7f58fc..587224e71d78 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libao }: +{ callPackage, glib, libao, intltool }: let pkg = import ./base.nix { - version = "3.0.5"; + version = "3.1.0"; pkgName = "cdemu-daemon"; - pkgSha256 = "1cc0yxf1y5dxinv7md1cqhdjsbqb69v9jygrdq5c20mrkqaajz1i"; + pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9"; }; in callPackage pkg { - buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ]; + buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ]; } diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 835a690eb697..d6c85c53b421 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,9 +1,9 @@ { callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.0.2"; + version = "3.1.0"; pkgName = "gcdemu"; - pkgSha256 = "1kmcr2a0inaddx8wrjh3l1v5ymgwv3r6nv2w05lia51r1yzvb44p"; + pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02"; }; inherit (pythonPackages) python pygobject3; in callPackage pkg { diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index c9ba589cf2ae..3813ceef6115 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }: +{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }: let pkg = import ./base.nix { - version = "3.0.5"; + version = "3.1.0"; pkgName = "libmirage"; - pkgSha256 = "01wfxlyviank7k3p27grl1r40rzm744rr80zr9lcjk3y8i5g8ni2"; + pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn"; }; in callPackage pkg { - buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ]; + buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; } diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index c1692e1b9a83..2b3d98528150 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vhba-${version}"; - version = "20161009"; + version = "20170610"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "1n9k3z8hppnl5b5vrn41b69wqwdpml6pm0rgc8vq3jqwss5js1nd"; + sha256 = "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 97cd6a9ca798..02964d0232f5 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -5,7 +5,7 @@ , agg, alsaLib, soundtouch, openal , desktop_file_utils , gtk2, gtkglext, libglade, pangox_compat -, mesa, mesa_glu, libpcap, SDL, zziplib }: +, mesa_glu, libpcap, SDL, zziplib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -21,10 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop_file_utils gtk2 gtkglext libglade pangox_compat - mesa mesa_glu libpcap SDL zziplib ]; + mesa_glu libpcap SDL zziplib ]; configureFlags = [ - "--disable-osmesa" # Failing on compile step "--disable-glade" # Failing on compile step "--enable-openal" "--enable-glx" @@ -46,4 +45,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } -# TODO: investigate osmesa and glade +# TODO: investigate glade diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index db510024241d..f606e352a7b0 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,6 +1,7 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, mesa , gettext, libpthreadstubs, libXrandr, libXext, readline, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev +, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml , libpulseaudio ? null }: stdenv.mkDerivation rec { @@ -30,7 +31,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - libevdev libXdmcp portaudio libusb libpulseaudio ]; + libevdev libXdmcp portaudio libusb libpulseaudio + libevdev libXdmcp portaudio libusb libpulseaudio + wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 499e1177c3ea..ed44ea593119 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/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index bb6997dfb96c..c402dd444289 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg -, gsettings_desktop_schemas, makeWrapper, libcdio, nasm, ffmpeg, file +, wrapGAppsHook, libcdio, nasm, ffmpeg, file , fetchpatch }: stdenv.mkDerivation rec { @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { ./uncompress2.patch ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; buildInputs = [ - autoreconfHook intltool pkgconfig gtk3 SDL2 xorg.libXv xorg.libXtst - makeWrapper libcdio nasm ffmpeg file + gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file ]; dynarecTarget = @@ -67,8 +67,6 @@ stdenv.mkDerivation rec { ]; postInstall = '' - wrapProgram "$out/bin/pcsxr" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" mkdir -p "$out/share/doc/${name}" cp README \ AUTHORS \ diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 3f02304c0d42..611cc84325c1 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL != null); let - version = "1.1.0"; + version = "1.3"; fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); in with stdenv.lib; @@ -14,14 +14,16 @@ stdenv.mkDerivation rec{ src = fetchgit { url = "https://github.com/hrydgard/ppsspp.git"; - rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "1q21qskzni0nvz2yi2m17gjh4i9nrs2l4fm4y2dww9m29xpvzw3x"; + sha256 = "0l8vgdlw657r8gv7rz8iqa6zd9zrbzw10pwhcnahzil7w9qrd03g"; }; - buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ] + buildInputs = [ zlib libpng qt4 ] ++ (if withGamepads then [ SDL ] else [ ]); + nativeBuildInputs = [ pkgconfig qmake4Hook ]; + qmakeFlags = [ "PPSSPPQt.pro" ]; preConfigure = "cd Qt"; @@ -31,7 +33,7 @@ stdenv.mkDerivation rec{ homepage = "http://www.ppsspp.org/"; description = "A PSP emulator, the Qt4 version"; license = licenses.gpl2Plus; - maintainers = [ maintainers.fuuzetsu maintainers.AndersonTorres ]; + maintainers = with maintainers; [ fuuzetsu AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; }; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index b7b720af508e..7256120aa929 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch -, alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg -, libvorbis, zlib }: +{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper, python27, retroarch +, alsaLib, fluidsynth, curl, hidapi, mesa, gettext, glib, gtk2, portaudio, SDL +, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis +, miniupnpc, sfml, xorg, zlib }: let @@ -10,7 +11,7 @@ let stdenv.lib.makeOverridable stdenv.mkDerivation rec { name = "libretro-${core}-${version}"; - version = "2015-11-20"; + version = "2017-06-04"; inherit src; buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or []; @@ -54,8 +55,8 @@ in core = "4do"; src = fetchRetro { repo = core + "-libretro"; - rev = "cbd700e2bb95f08f241ca24330fa732aa6af8018"; - sha256 = "1xp43hpd23rhj96pns13fz9mjp66gmxzl5frqa8q9fqcn2qkx7b1"; + rev = "52d881743dd8614d96b4de8bd153cb725b87d474"; + sha256 = "1n42f70vni2zavppayaq8xmsyx5cn40qi4zk4pgq1w3hh2q8mj72"; }; description = "Port of 4DO/libfreedo to libretro"; }).override { @@ -66,8 +67,8 @@ in core = "mednafen-pce-fast"; src = fetchRetro { repo = "beetle-pce-fast-libretro"; - rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885"; - sha256 = "0m946108wzawg0c4xvqpv6yzfmjngz6lji5hn4swgk0z5f2bj5a5"; + rev = "2954e645d668ee73d93803dc30da4462fc7a459b"; + sha256 = "0p0k7kqfd6xg1qh6vgzgwp122miprb2bpzljgxd9kvigxihsl6f7"; }; description = "Port of Mednafen's PC Engine core to libretro"; }).override { @@ -79,8 +80,8 @@ in core = "mednafen-psx"; src = fetchRetro { repo = "beetle-psx-libretro"; - rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2"; - sha256 = "192xzvdbjjqlxrnxxn45hmrr6yjpxw3gapkbax6nhrabnxhva43k"; + rev = "76862abefdde9097561e2b795e75b49247deff17"; + sha256 = "1k4b7g50ajzchjrm6d3v68hvri4k3hzvacn2l99i5yq3hxp7vs7x"; }; description = "Port of Mednafen's PSX Engine core to libretro"; }).override { @@ -92,8 +93,8 @@ in core = "mednafen-saturn"; src = fetchRetro { repo = "beetle-saturn-libretro"; - rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab"; - sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b"; + rev = "3f1661b39ef249e105e6e2e655854ad0c87cd497"; + sha256 = "1d1brysynwr6inlwfgv7gwkl3i9mf4lsaxd9wm2szw86g4diyn4c"; }; description = "Port of Mednafen's Saturn core to libretro"; }).override { @@ -106,8 +107,8 @@ in core = bname + "-accuracy"; src = fetchRetro { repo = bname; - rev = "0bfe7f4f895af0927cec1c06dcae096b59416159"; - sha256 = "0dmaa1vy6nfj9jk6xkvrbbcxa9j3f3zrp24zflnqbizc088vncb9"; + rev = "e89c9a2e0a12d588366ee4f5c76b7d75139d938b"; + sha256 = "0vkn1f38vwazpp3kbvvv8c467ghak6yfx00s48wkxwvhmak74a3s"; }; description = "Fork of bsnes with HLE DSP emulation restored"; }).override { @@ -118,27 +119,55 @@ in core = "desmume"; src = fetchRetro { repo = core; - rev = "cae5945149a72b1dc0b130d6e60e2690b88a925a"; - sha256 = "1qzlbw0vy87zi3w6hp5zj9dxdkj3qc9czjf41sj70irwyvqi0kii"; + rev = "ce1f93abb4c3aa55099f56298e5438a03a3c2bbd"; + sha256 = "064gzfbr7yizmvi91ry5y6bzikj633kdqhvzycb9f1g6kspf8yyl"; }; description = "libretro wrapper for desmume NDS emulator"; }).override { configurePhase = "cd desmume"; }; + dolphin = (mkLibRetroCore { + core = "dolphin"; + src = fetchRetro { + repo = "dolphin"; + rev = "a6ad451fdd4ac8753fd1a8e2234ec34674677754"; + sha256 = "1cshlfmhph8dl3vgvn37imvp2b7xs2cx1r1ifp5js5psvhycrbz3"; + }; + description = "Port of Dolphin to libretro"; + + extraBuildInputs = [ + cmake curl mesa pcre pkgconfig sfml miniupnpc + gettext glib gtk2 hidapi + libevdev libudev + ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]); + }).override { + cmakeFlags = [ + "-DLINUX_LOCAL_DEV=true" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" + ]; + dontUseCmakeBuildDir = "yes"; + buildPhase = '' + cd Source/Core/DolphinLibretro + make + ''; + }; + fba = (mkLibRetroCore rec { core = "fba"; src = fetchRetro { repo = core + "-libretro"; - rev = "b642e054a1f581fbac16c08f4b8df9ab6c474203"; - sha256 = "0jxbzjhpyw1fzipm2ai2nv62vb0q5cb203m093vakr1zdsx7si2n"; + rev = "9146c18ac989c619256d1cb8954d49e728e44ea3"; + sha256 = "159dww8mxi95xz4ypw38vsn1g4k6z8sv415qqf0qriydwhw6mh2m"; }; description = "Port of Final Burn Alpha to libretro"; }).override { buildPhase = '' cd svn-current/trunk \ && make -f makefile.libretro \ - && mv fb_alpha_libretro.so fba_libretro.so + && mv fbalpha2012_libretro.so fba_libretro.so ''; }; @@ -146,30 +175,28 @@ in core = "fceumm"; src = fetchRetro { repo = "libretro-" + core; - rev = "eb19d48804ebeb381b20e74db7033c321f6b6d04"; - sha256 = "18wm6yzwshqfkd75kkcv035p1s2yhnchn98bcn9aj15aw5qyhvd4"; + rev = "45f773a1c221121746bbe2680e3aaaf92776a87e"; + sha256 = "0jnwh1338q710x47bzrx319g5xbq9ipv35kyjlbkrzhqjq1blz0b"; }; description = "FCEUmm libretro port"; }; - gambatte = (mkLibRetroCore rec { + gambatte = mkLibRetroCore rec { core = "gambatte"; src = fetchRetro { repo = core + "-libretro"; - rev = "59fb6a652e0de3c3a3b29e58af5ac035958da37e"; - sha256 = "0n2416lgqbzah1q3ji1hhpcdi9h29563gz739kf9libmnz86vd6f"; + rev = "db7af6cf6ea39fd5e39eea137ff752649599a4e4"; + sha256 = "0h7hyj630nk1s32wx02y4q9x2lp6wbnh6nkc9ihf4pygcsignmwr"; }; description = "Gambatte libretro port"; - }).override { - configurePhase = "cd libgambatte"; }; genesis-plus-gx = mkLibRetroCore rec { core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; - rev = "7d8d5f1026af8cfd00cdf32c67a999bd1e454a09"; - sha256 = "16jm97h66bb2sqlimjlks31sapb23x4q8sr16wdqn1xgi670xw3c"; + rev = "365a28c7349b691e6aaa3ad59b055261c42bd130"; + sha256 = "0s11ddpnb44q4xjkl7dylldhi9y5zqywqavpk0bbwyj84r1cbz3c"; }; description = "Enhanced Genesis Plus libretro port"; }; @@ -178,20 +205,20 @@ in core = "mame"; src = fetchRetro { repo = "mame"; - rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74"; - sha256 = "0afsxsm1d4x9jn28qz6v47hhnp7q9i0yqk62i4lk4d7i7m4dq5j9"; + rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e"; + sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1"; }; description = "Port of MAME to libretro"; - extraBuildInputs = [ alsaLib portaudio python27 ]; + extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ]; }; mgba = mkLibRetroCore rec { core = "mgba"; src = fetchRetro { repo = core; - rev = "4000128339b535896615c994cafcd777637573f4"; - sha256 = "1yar78rvgfqx7jdna9chkmmbnpcf7k9ckbzj506f7k7m7zv819fn"; + rev = "fdaaaee661e59f28c94c7cfa4e82e70b71e24a9d"; + sha256 = "1b30sa861r4bhbqkx6vkklh4iy625bpzki2ks4ivvjns1ijczvc7"; }; description = "Port of mGBA to libretro"; }; @@ -200,12 +227,12 @@ in core = "mupen64plus"; src = fetchRetro { repo = core + "-libretro"; - rev = "7db9296453629a44de806589f3ff64e824e775ad"; - sha256 = "075lpmwmj99yf9d9905x7apawd4bqz0whr37mh2fgr3jf730yiyl"; + rev = "407bcd40b3a42bff6b856a6d6f88a7d5d670bf9e"; + sha256 = "0q5kvjz7rpk7mp75cdywqjgmy10c0h7ky26hh1x90d39y94idcd8"; }; description = "Libretro port of Mupen64 Plus, GL only"; - extraBuildInputs = [ mesa ]; + extraBuildInputs = [ mesa libpng ]; }).override { buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; @@ -214,20 +241,34 @@ in core = "nestopia"; src = fetchRetro { repo = core; - rev = "dcaed965760669161d6fd44755887545ea393041"; - sha256 = "03fy5hb181ffx8sk9wmm415k084zqqhfqga4crgc7hdqi16s3r5v"; + rev = "ecfa170a582e5b8ec11225ca645843fa064955ca"; + sha256 = "17ac7dhasch6f4lpill8c5scsvaix0jvbf1cp797qbll4hk84f2q"; }; description = "nestopia undead libretro port"; }).override { buildPhase = "cd libretro && make"; }; + parallel-n64 = (mkLibRetroCore rec { + core = "parallel-n64"; + src = fetchRetro { + repo = core; + rev = "3276db27547bf7ca85896427f0b82d4658694d88"; + sha256 = "19396v50azrb52ifjk298zgcbxn8dvfvp6zwrnzsk6mp8ff7qcqw"; + }; + description = "Parallel Mupen64plus rewrite for libretro."; + + extraBuildInputs = [ mesa libpng ]; + }).override { + buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; + }; + picodrive = (mkLibRetroCore rec { core = "picodrive"; src = fetchRetro { repo = core; - rev = "e912fdf26376bfa5d7d6488055fe6fdbd13c2e49"; - sha256 = "1mi36y8kx6s76cgygpj11zw35p44gd66mxygmxliz7k6xsd7ww41"; + rev = "cbc93b68dca1d72882d07b54bbe1ef25b980558a"; + sha256 = "0fl9r6jj2x9231md5zc4scra79j5hfn1n2z67scff1375xg1k64h"; }; description = "Fast MegaDrive/MegaCD/32X emulator"; @@ -241,8 +282,8 @@ in core = "ppsspp"; src = fetchRetro { repo = "libretro-" + core; - rev = "ea17e27fcf16b9f875718b6550fe7145c6257c06"; - sha256 = "0w5njj5pamqc4a022hdplb7vapwkf34ad1w4acz3c8b05vkl457d"; + rev = "5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573"; + sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r"; }; description = "ppsspp libretro port"; extraBuildInputs = [ mesa ffmpeg ]; @@ -254,8 +295,8 @@ in core = "prboom"; src = fetchRetro { repo = "libretro-" + core; - rev = "90ad0db331c53e8851581e1547b7377fb9fffe5b"; - sha256 = "0jk73nakrs9jxj3d0dmjs0csskjhddn8a4sky3mpk9vp30csx0ll"; + rev = "4c690eb6b569a276c5b2a87680718f715477eae2"; + sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja"; }; description = "Prboom libretro port"; }).override { @@ -266,8 +307,8 @@ in core = "quicknes"; src = fetchRetro { repo = "QuickNES_Core"; - rev = "518638b8064c9d0cb1b5aa29d96419f8528c9de5"; - sha256 = "0jv1z65m4j3hbfnb3chklh0dhwlc4gdqr0asswdsc1y4iwp0331c"; + rev = "8613b48cee97f1472145bbafa76e543854b2bbd5"; + sha256 = "18lizdb9zjlfhh8ibvmcscldlf3mw4aj8nds3pah68cd2lw170w1"; }; description = "QuickNES libretro port"; }).override { @@ -278,8 +319,8 @@ in core = "reicast"; src = fetchRetro { repo = core + "-emulator"; - rev = "ed47c72cf2e124d9d753285fd61d12ea8e071d0d"; - sha256 = "05dw7qjnprf1lw3ps0sb7sp73hsh1a27rxbwjqd26j85zr84g3r9"; + rev = "40d4e8af2dd67a3f317c14224873c8ec0e1f9d11"; + sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m"; }; description = "Reicast libretro port"; extraBuildInputs = [ mesa ]; @@ -291,8 +332,8 @@ in core = "scummvm"; src = fetchRetro { repo = core; - rev = "c3e719acc08c1873609bab3578939b7c9e606511"; - sha256 = "03wvffy3h62qc7f3d8042wd234m8ikd843ggp903y285sgh54r9y"; + rev = "de8d7e58caa23f071ce9d1bc5133f45d16c3ff1c"; + sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy"; }; description = "Libretro port of ScummVM"; extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ]; @@ -304,30 +345,35 @@ in core = "snes9x"; src = fetchRetro { repo = core; - rev = "ccf1ee2eae73ed1e4044c8dd9536dd4ac1be6d8b"; - sha256 = "1bwjk817m8v69s13fc9kcj605ig6707rsj57wmz2ri2ggmydhvcb"; + rev = "db4bfaba3b0d5a067fe9aea323503656837a8d9a"; + sha256 = "02f04ss45km32lp68diyfkix1gryx89qy8cc80189ipwnx80pgip"; }; description = "Port of SNES9x git to libretro"; }).override { buildPhase = "cd libretro && make"; }; - snes9x-next = mkLibRetroCore rec { + snes9x-next = (mkLibRetroCore rec { core = "snes9x-next"; src = fetchRetro { repo = core; - rev = "dfb7eef46d6bc2dbcc98f25e2bfadc9d2cff5cfd"; - sha256 = "0vdfjdwr6b5izh3gy63lcfnrdvr99qhlqfibjw4mmyqk9gkjrwm8"; + rev = "b2a69de0df1eb39ed362806f9c9633f4544272af"; + sha256 = "1vhgsrg9l562nincfvpj2h2dqkkblg1qmh0v47jqlqgmgl2b1zij"; }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; + }).override { + buildPhase = '' + make -f Makefile.libretro + mv snes9x2010_libretro.so snes9x_next_libretro.so + ''; }; stella = (mkLibRetroCore rec { core = "stella"; src = fetchRetro { repo = core + "-libretro"; - rev = "ada5c57d632ace0ba915ce7a470d504a5d89ebcc"; - sha256 = "090isch1l5hm07l22l8hja31cdiaxc0vgc3i01qs8zgdyvsx4vvg"; + rev = "bbe65db0e344dcb38905586bd853076b65963e5a"; + sha256 = "18r1yyfzvjq2hq04d94y37kzsq6aywh1aim69a3imk8kh46gwrh0"; }; description = "Port of Stella to libretro"; }).override { @@ -338,8 +384,8 @@ in core = "vba-next"; src = fetchRetro { repo = core; - rev = "0c20cd92bc8684340d7a1bcae14a603001ad5e4a"; - sha256 = "016vm2xyjfkkcqkqfw3n09if4bxxppk3g6p92waa9bv2ni4xli69"; + rev = "e7734756d228ea604f8fa872cea1bba987780791"; + sha256 = "03s4rh7dbbhbfc4pfdvr9jcbxrp4ijg8yp49s1xhr7sxsblj2vpv"; }; description = "VBA-M libretro port with modifications for speed"; }; @@ -348,8 +394,8 @@ in core = "vbam"; src = fetchRetro { repo = core + "-libretro"; - rev = "bedddba614bc4fcbcf5b0d8565f94619b094c20c"; - sha256 = "1hvq4wsznb2vzg11iqmy5dnfjpiga368p1lmsx9d7ci7dcqyw7wy"; + rev = "1b82fc2d761f027567632692f787482d1e287ec2"; + sha256 = "043djmqvh2grc25hwjw4b5kfx57b89ryp6fcl8v632sm35l3dd6z"; }; description = "vanilla VBA-M libretro port"; }).override { diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index ac8e1e46112f..171453b89d5b 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -23,12 +23,12 @@ in stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; - version = "1.3.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "0ccp17580w0884baxj5kcynlm03jgd7i62dprz1ajxbi2s7b3mi3"; + sha256 = "1ym2kws58fbavkc3giz5xqaqiqqdbf7wrz7y7iw53p1bnkc3l8yi"; rev = "v${version}"; }; diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 38b8e27db7d9..6b708cccc8f8 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -8,8 +8,9 @@ let script = exec: '' #!${stdenv.shell} - nohup sh -c "sleep 1 && pkill -SIGSTOP kodi" & - nohup sh -c "${exec} '$@' -f;pkill -SIGCONT kodi" + nohup sh -c "pkill -SIGTSTP kodi" & + # https://forum.kodi.tv/showthread.php?tid=185074&pid=1622750#pid1622750 + nohup sh -c "sleep 10 && ${exec} '$@' -f;pkill -SIGCONT kodi" ''; scriptSh = exec: pkgs.writeScript ("kodi-"+exec.name) (script exec.path); execs = map (core: rec { name = core.core; path = core+"/bin/retroarch-"+name;}) cores; @@ -31,8 +32,8 @@ stdenv.mkDerivation rec { description = "Kodi retroarch advanced launchers"; longDescription = '' These retroarch launchers are intended to be used with - anglescry advanced launcher for Kodi since device input is - caught by both Kodi and the retroarch process. + advanced (emulation) launcher for Kodi since device input is + otherwise caught by both Kodi and the retroarch process. ''; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 19026274d56b..348b52dd492e 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 @@ -35,7 +36,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba3_light ++ lib.optional cursesSupport pkgs.ncurses - ++ lib.optional vaSupport pkgs.libva + ++ lib.optional vaSupport pkgs.libva-full ++ lib.optional pcapSupport pkgs.libpcap ++ lib.optional v4lSupport pkgs.libv4l ++ lib.optional saneSupport pkgs.saneBackends @@ -46,7 +47,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional alsaSupport pkgs.alsaLib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama - ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]) + ++ lib.optional udevSupport pkgs.udev + ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] @@ -90,9 +92,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ((map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos))} '' + lib.optionalString supportFlags.gstreamerSupport '' - wrapProgram "$out/bin/wine" \ - --argv0 "" \ - --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" + for i in wine wine64; do + if [ -e "$out/bin/$i" ]; then + wrapProgram "$out/bin/$i" \ + --argv0 "" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + fi + done ''; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index deeff3c73437..91fb0da82d8a 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -38,6 +38,7 @@ gphoto2Support ? false, ldapSupport ? false, pulseaudioSupport ? false, + udevSupport ? false, xineramaSupport ? false, xmlSupport ? false }: @@ -50,7 +51,7 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport; + openglSupport gstreamerSupport udevSupport; }; }); diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index e8409a631c3c..e92c77462ca9 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"; - url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; - sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp"; + version = "2.0.2"; + url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz"; + sha256 = "16iwf48cfi39aqyy8131jz4x7lr551c9yc0mnks7g24j77sq867p"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -24,30 +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 { - version = "2.1"; + # NOTE: Don't forget to change the SHA256 for staging as well. + version = "2.12"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz"; + sha256 = "19qk880fk7xxzx9jcl6sjzilhzssn0csqlqr9vnfd1qlhjpi2v29"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs"; + sha256 = "00qqpw5fmpwg4589q2dwlv3jrcyj0yzv4mk63w5ydhvmy5gq48wy"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20170207"; - sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw"; + version = "20170614"; + sha256 = "1xszflrdmixxr0v7vjby8fpnl8fgc9gldr1gnjpwzq1rnb84idqa"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 51af13b8a157..4a7fe0ff55b6 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -18,7 +18,7 @@ stdenv.lib.overrideDerivation wineUnstable (self: { chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$TMP/$sourceRoot" --all + ./patchinstall.sh DESTDIR="$PWD/.." --all cd .. ''; }) diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index aec498b899e4..e13abb6fe2b6 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2"; sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; }; - + buildInputs = [ python wxGTK29 SDL libX11 mesa ]; configurePhase = '' @@ -19,10 +19,11 @@ stdenv.mkDerivation { buildPhase = "python waf"; installPhase = "python waf install"; - + meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; license = stdenv.lib.licenses.gpl2Plus; homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; + broken = true; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 02f93eb931d5..ae94c3de41b2 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -57,6 +57,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index 231b8eabb071..6d0222207944 100644 --- a/pkgs/misc/freestyle/default.nix +++ b/pkgs/misc/freestyle/default.nix @@ -45,9 +45,10 @@ stdenv.mkDerivation { installPhase = ":"; - meta = { + meta = { description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; homepage = http://freestyle.sourceforge.net; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; + broken = true; }; } diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix new file mode 100644 index 000000000000..d7a6cebcc563 --- /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/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a38c9b764100..62c734859d5b 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline +{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper +, bash, libsamplerate, libsndfile, readline, eigen, celt # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -24,32 +24,24 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.10"; + version = "1.9.11-RC1"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr"; + sha256 = "0i708ar3ll5p8yj0h7ffg84nrn49ap47l2yy75rxyw30cyywhxp4"; }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ python libsamplerate libsndfile readline + buildInputs = [ python libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; - prePatch = '' + patchPhase = '' substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash ''; - patches = [ - ./jack-gcc5.patch - (fetchpatch { - url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch"; - sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5"; - }) - ]; - configurePhase = '' python waf configure --prefix=$out \ ${optionalString (optDbus != null) "--dbus"} \ diff --git a/pkgs/misc/jackaudio/jack-gcc5.patch b/pkgs/misc/jackaudio/jack-gcc5.patch deleted file mode 100644 index f18042c6e32c..000000000000 --- a/pkgs/misc/jackaudio/jack-gcc5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth -Date: Thu, 18 Sep 2014 18:29:23 +0200 -Subject: [PATCH] Fix FTBFS with clang++ - -Forwarded from http://bugs.debian.org/757820 ---- - common/memops.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/memops.c b/common/memops.c -index 27f6194..2d416b6 100644 ---- a/common/memops.c -+++ b/common/memops.c -@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s) - */ - static unsigned int seed = 22222; - --inline unsigned int fast_rand() { -+static inline unsigned int fast_rand() { - seed = (seed * 96314165) + 907633515; - return seed; - } --- -2.4.0 - diff --git a/pkgs/misc/jackaudio/unstable.nix b/pkgs/misc/jackaudio/unstable.nix deleted file mode 100644 index a2026dacc93a..000000000000 --- a/pkgs/misc/jackaudio/unstable.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline, eigen, celt - -# Optional Dependencies -, dbus ? null, libffado ? null, alsaLib ? null -, libopus ? null - -# Extra options -, prefix ? "" -}: - -with stdenv.lib; -let - inherit (python2Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - libOnly = prefix == "lib"; - - optDbus = shouldUsePkg dbus; - optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; - optLibffado = if libOnly then null else shouldUsePkg libffado; - optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; - optLibopus = shouldUsePkg libopus; -in -stdenv.mkDerivation rec { - name = "${prefix}jack2-unstable-${version}"; - version = "2017-02-23"; - - src = fetchFromGitHub { - owner = "jackaudio"; - repo = "jack2"; - rev = "4cf826c82c8f865c281833f92f8182d457277b3a"; - sha256 = "100pkc324m57ci3fb99d3api6wh6g58lya6ssly9hxyhdsa3i7bk"; - }; - - nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ - python - - libsamplerate libsndfile readline eigen celt - - optDbus optPythonDBus optLibffado optAlsaLib optLibopus - ]; - - patchPhase = '' - substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash - ''; - - configurePhase = '' - python waf configure --prefix=$out \ - ${optionalString (optDbus != null) "--dbus"} \ - --classic \ - ${optionalString (optLibffado != null) "--firewire"} \ - ${optionalString (optAlsaLib != null) "--alsa"} \ - --autostart=${if (optDbus != null) then "dbus" else "classic"} \ - ''; - - buildPhase = '' - python waf build - ''; - - installPhase = '' - python waf install - '' + (if libOnly then '' - rm -rf $out/{bin,share} - rm -rf $out/lib/{jack,libjacknet*,libjackserver*} - '' else '' - wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH - ''); - - meta = { - description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = "http://jackaudio.org"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ goibhniu wkennington ]; - }; -} diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 861d8cf14de9..2218b75a2e0f 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 new file mode 100644 index 000000000000..ec2fc975b339 --- /dev/null +++ b/pkgs/misc/logging/beats/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, elk5Version, buildGoPackage, libpcap }: + +let beat = package : extraArgs : buildGoPackage (rec { + name = "${package}-${version}"; + version = elk5Version; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "03pvzikl5wa6agf3aszx96xvd6yjbvdf0kdwjsr4vfga0h797s32"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ package ]; + + meta = with stdenv.lib; { + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; + } // extraArgs); +in { + filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat = beat "packetbeat" { + buildInputs = [ libpcap ]; + meta.description = "Network packet analyzer that ships data to Elasticsearch"; + meta.longDescription = '' + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + }; +} diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 2873225b26f1..735e73d5d490 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec{ - version="1.26"; + version="1.27"; name = "mxt-app-${version}"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "07afdgh8pnhgh2372cf5pqy6p7l6w3ing2hwnvz6db8wxw59n48h"; + sha256 = "0m1qxsdkwgajyd0sdw909l4w31csa26nw0xzr9ldddnvzb1va05h"; }; - buildInputs = [ autoconf automake libtool ]; - preConfigure = "./autogen.sh"; - + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libtool ]; + hardeningDisable = [ "fortify" ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index ffdaf3949aea..13102877d7e7 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -1,7 +1,7 @@ # idea: provide a build environments for your developement of preference /* #### examples of use: #### - # Add this to your ~/.nixpkgs/config.nix: + # Add this to your ~/.config/nixpkgs/config.nix: { packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { @@ -22,7 +22,7 @@ ##### Another example, more complicated but achieving more: ####### # Make an environment to build nix from source and create ctags (tagfiles can # be extracted from TAG_FILES) from every source package. Here would be a - # full ~/.nixpkgs/config.nix + # full ~/.config/nixpkgs/config.nix { packageOverrides = pkgs : with pkgs; with sourceAndTags; let complicatedMyEnv = { name, buildInputs ? [], cTags ? [], extraCmds ? ""}: diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 6f2ebbc51581..f05073469b73 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/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix new file mode 100644 index 000000000000..048740bfed29 --- /dev/null +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -0,0 +1,39 @@ +{ stdenv, pkgs, fetchurl }: + +stdenv.mkDerivation rec { + name = "i3lock-pixeled-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz"; + sha256 = "046qbx4qvcc66h53h4mm9pyjj9gjc6dzy38a0f0jc5a84xbivh7k"; + }; + + propagatedBuildInputs = with pkgs; [ + i3lock + imagemagick + scrot + playerctl + ]; + + buildPhases = [ "unpackPhase" "patchPhase" "installPhase" ]; + makeFlags = [ + "PREFIX=$(out)/bin" + ]; + + patchPhase = '' + substituteInPlace i3lock-pixeled \ + --replace i3lock "${pkgs.i3lock}/bin/i3lock" \ + --replace convert "${pkgs.imagemagick}/bin/convert" \ + --replace scrot "${pkgs.scrot}/bin/scrot" \ + --replace playerctl "${pkgs.playerctl}/bin/playerctl" + ''; + + meta = with stdenv.lib; { + description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; + homepage = "https://github.com/Ma27/i3lock-pixeled"; + license = licenses.mit; + platform = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 2f20943981a5..55765a520da2 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,13 +1,29 @@ -{ stdenv, fetchurl, xproto, libX11, libXext, libXrandr }: +{ stdenv, lib, fetchurl, writeText +, xproto, libX11, libXext, libXrandr +# default header can be obtained from +# http://git.suckless.org/slock/tree/config.def.h +, conf ? null }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "slock-1.4"; + src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; + buildInputs = [ xproto libX11 libXext libXrandr ]; + installFlags = "DESTDIR=\${out} PREFIX="; - meta = with stdenv.lib; { + + patchPhase = "sed -i '/chmod u+s/d' Makefile"; + + preBuild = optionalString (conf != null) '' + cp ${writeText "config.def.h" conf} config.def.h + ''; + + meta = { homepage = http://tools.suckless.org/slock; description = "Simple X display locker"; longDescription = '' diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 031afeeca2fc..0e5e87245f32 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/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index c65c7ef121cb..02cdcf7b4d1c 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "A program that launches a given program when your X session has been idle for a given time."; homepage = http://www.ibiblio.org/pub/linux/X11/screensavers; maintainers = with maintainers; [ garbas ]; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2; }; } diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index ceb0d0a6c441..f87e24efe184 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.50"; + name = "xlockmore-5.54"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0a9sargn36b5lxil777p35z8m5jr744h9xmc021057aq8kgp4pv3"; + sha256 = "0mdgl20619iii1i04pj2dq29nwvasbngy48cvd819h0wfawsqkwz"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 276c311fa455..cd437bfe452b 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = with stdenv.lib.platforms; allBut cygwin; inherit version; downloadPage = "http://www.jwz.org/xscreensaver/download.html"; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 8dc913601177..ff0e92d5b0e9 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.89.1.66"; + version = "3.90.0.125"; meta = with stdenv.lib; { description = "An adaptive GTK+ theme based on Material Design"; homepage = "https://github.com/tista500/Adapta"; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; - maintainers = [ maintainers.SShrike ]; + maintainers = [ maintainers.romildo ]; }; src = fetchFromGitHub { owner = "tista500"; repo = "Adapta"; rev = version; - sha256 = "08g941xgxg7i8g1srn3zdxz1nxm24bkrg5cx9ipjqk5cwsck7470"; + sha256 = "0abww5rcbn478w2kdhjlf68bfj8yf8i02nlmrjpp7j1v14r32xr0"; }; preferLocalBuild = true; - nativeBuildInputs = [ autoreconfHook parallel sassc inkscape libxml2 glib.dev ]; + nativeBuildInputs = [ autoreconfHook pkgconfig parallel sassc inkscape libxml2 glib.dev ]; buildInputs = [ gdk_pixbuf librsvg gtk-engine-murrine ]; diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix index a5495d5120cd..461c2a98c94b 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -2,22 +2,21 @@ stdenv.mkDerivation rec { name = "e17gtk-${version}"; - version = "${gnome3.version}.0"; + version = "${gnome3.version}.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "E17gtk"; rev = "V${version}"; sha256 = { - "3.20" = "1dbhwsqqk12rff1971q2snvg38dx2y33dxr2l9yvwrhrhsgmc2v7"; - "3.22" = "17ir1f7ka765m57bdx3knq4k1837p118a384qnmsj83bz15k39i3"; + "3.22" = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8"; }."${gnome3.version}"; }; installPhase = '' mkdir -p $out/share/{doc,themes}/E17gtk - cp -a index.theme gtk-2.0 gtk-3.0 metacity-1 $out/share/themes/E17gtk/ - cp -a README.md WORKAROUNDS screenshot.jpg $out/share/doc/E17gtk/ + cp -va index.theme gtk-2.0 gtk-3.0 metacity-1 $out/share/themes/E17gtk/ + cp -va README.md WORKAROUNDS screenshot.jpg $out/share/doc/E17gtk/ ''; meta = { diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix index 1b8f4f2d1105..3c7882e8f946 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { name = "flat-plat-gtk-theme-${version}"; - version = "2016-12-03"; + version = "20170605"; src = fetchFromGitHub { owner = "nana-4"; repo = "Flat-Plat"; - rev = "49a5a51ec1a5835ff04ba2c62c9bccbd3f49bbe6"; - sha256 = "1w4b16cp2yv5rpijcqywlzrs3xjkvg8ppp2rfls1kvxq12rz4jkb"; + rev = "v${version}"; + sha256 = "1vcd6mkkfk9a1n5hwpdigvsdsfd8df83kc94w53rs7gw9pqfygya"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; - buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine ]; + buildInputs = [ gnome3.gnome_themes_standard gtk-engine-murrine gdk_pixbuf librsvg ]; dontBuild = true; installPhase = '' + patchShebangs install.sh sed -i install.sh \ -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \ -e "s|/usr||" diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 2a75ea590eea..b1e104b7c3ef 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "greybird"; - version = "2017-02-26"; + version = "3.22.4"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "${pname}"; - rev = "66c222c25c43603e73d3521e0e91ffb268214229"; - sha256 = "1q0nc02d7kwaxjb8d2rvwc3yf3v46r44zsighwjnmczpw7y3j6h8"; + rev = "v${version}"; + sha256 = "1xh6vi4rmxmkrgy9qskcl8q6014qnsn19xjjwbmwf8n6yr07scl3"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; 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 000000000000..c01fb7f15dd9 --- /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 491885a14b3f..8fa6176f22eb 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/tw-rs/default.nix b/pkgs/misc/tw-rs/default.nix new file mode 100644 index 000000000000..6c6963303e98 --- /dev/null +++ b/pkgs/misc/tw-rs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform, perl, zlib, openssl }: + +rustPlatform.buildRustPackage rec { + name = "tw-rs-${version}"; + version = "0.1.26"; + + src = fetchFromGitHub { + owner = "vmchale"; + repo = "tw-rs"; + rev = "${version}"; + sha256 = "1s1gk2wcs3792gdzrngksczz3gma5kv02ni2jqrhib8l6z8mg9ia"; + }; + buildInputs = [ perl zlib openssl ]; + + depsSha256 = "1lg1jh6f9w28i94vaj62r859g6raalxmxabvw7av6sqr0hr56p05"; + + meta = with stdenv.lib; { + description = "Twitter command-line interface written in rust"; + homepage = https://github.com/vmchale/tw-rs; + license = licenses.bsd3; + maintainers = with maintainers; [ vmchale ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index f0ec5f483d40..a3e4f12cd892 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 @@ -10,17 +12,21 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2017.01"; + version = "2017.03"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc"; + sha256 = "0gqihplap05dlpwdb971wsqyv01nz2vabwq5g5649gr5jczsyjzm"; }; nativeBuildInputs = [ bc dtc python2 ]; hardeningDisable = [ "all" ]; + postPatch = '' + patchShebangs tools + ''; + configurePhase = '' make ${defconfig} ''; @@ -39,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}" ]; }; @@ -65,6 +71,12 @@ in rec { filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"]; }; + ubootA20OlinuxinoLime = buildUBoot rec { + defconfig = "A20-OLinuXino-Lime_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootBananaPi = buildUBoot rec { defconfig = "Bananapi_defconfig"; targetPlatforms = ["armv7l-linux"]; @@ -83,6 +95,12 @@ in rec { filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; }; + ubootOdroidXU3 = buildUBoot rec { + defconfig = "odroid-xu3_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-dtb.bin"]; + }; + ubootPcduino3Nano = buildUBoot rec { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; targetPlatforms = ["armv7l-linux"]; @@ -113,6 +131,20 @@ in rec { filesToInstall = ["u-boot.bin"]; }; + ubootUtilite = buildUBoot rec { + defconfig = "cm_fx6_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-with-nand-spl.imx"]; + buildFlags = "u-boot-with-nand-spl.imx"; + postConfigure = '' + cat >> .config << EOF + CONFIG_CMD_SETEXPR=y + EOF + ''; + # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx + # sf probe; sf update $loadaddr 0 80000 + }; + ubootWandboard = buildUBoot rec { defconfig = "wandboard_defconfig"; targetPlatforms = ["armv7l-linux"]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2686138bc930..be22b71d2b2b 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -4,7 +4,8 @@ , xkb_switch, rustracerd, fzf , python3, boost, icu , ycmd -, Cocoa ? null +, pythonPackages, python3Packages +, Cocoa ? null, git }: let @@ -15,7 +16,7 @@ in # TL;DR # Add your plugin to ./vim-plugin-names -# Regenerate via `nix-build -Q -A vimPlugins.pluginnames2nix; ./result/bin/vim-plugin-names-to-nix` +# Regenerate via `nix-shell -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix"` # Copy the generated expression(s) into this file. # If plugin is complicated then make changes to ./vim2nix/additional-nix-code @@ -124,11 +125,11 @@ rec { }; CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2017-02-26"; + name = "CheckAttach-2017-03-15"; src = fetchgit { url = "git://github.com/chrisbra/CheckAttach"; - rev = "4e841a854e8ee3fd24849e972a3c3f5456ef6be3"; - sha256 = "0dvqrca1sa8r29kg2k6qhpp3mbsbk29p81zpa7gzw8h73kqfwph1"; + rev = "b583efd45e03902438a55299623390a0f9253513"; + sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; }; dependencies = []; @@ -168,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-02-28"; + name = "Syntastic-2017-07-07"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "48e8b0e9d2721f608fd1d1157c9388b2626cbddf"; - sha256 = "0q52iqnbqm1h5iy8wr4l03y8w9yamgk48sd495p255pmxn8dryc5"; + rev = "e1161a723a353db99780f9a9351340df7abbb106"; + sha256 = "00gvx33yz199n7lynli0fb8cf58lb5cs0jxrqggjjy261xv2lcq1"; }; dependencies = []; @@ -201,66 +202,66 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-02-18"; + name = "Tagbar-2017-06-15"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "959f48798136bfd4ce60075d3c86c580fcf5e5c5"; - sha256 = "02v30744w2jcavwk9cjdy51ldpqylj6pgg6zavj4dni7knbnq3jm"; + rev = "f5792732de16b8a2cc202f920e363eb413d7241d"; + sha256 = "188xdmrp2g7bfzg95pv1qa2l17sqwy1g2p4syj7546fksddmwgms"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2017-02-28"; + name = "The_NERD_Commenter-2017-04-07"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "41e686824a5b77ba5afe9c5dabdc045aac922c5a"; - sha256 = "1c9zhlljbnskmgn8ycckznbh05cf3ldbq902gg8rn0n0433dy7wc"; + rev = "285902752f7ab2052ac700a6d29b263dd5788afb"; + sha256 = "1hd5ibpvxra8asr4zp0l68wc4djjgfbvh7kzmxc1r7jqr70wj8dl"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2017-02-25"; + name = "The_NERD_tree-2017-07-17"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "e671e403dd1ec1da59f70605c73aaedb6cb0e637"; - sha256 = "0g3bdwbg6hyh83qn4ad1hjk3pvq049fjqwj6viwa668zyvq4vwm4"; + rev = "e2a9929bbea0ec2050f2ea44b7e7bae3ccac66e6"; + sha256 = "03mygl8ic4awx4js04x0nw2l96kjv4vsldkgrdx0n43sh5i4z7nk"; }; 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 = []; }; VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2016-07-22"; + name = "VimOutliner-2017-05-03"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; - rev = "bd80cee8d9df9530c730ec4237de7ebe197b3642"; - sha256 = "0ynf60vzahif8ccb50kssjk64bh3r8bai3x37n6qb1gi5m61yn3z"; + rev = "fd2ca709acc161a9e65e75577c2bfefde173401a"; + sha256 = "13cqhajfz6rag7qwj2rws5gjs1f2jlrb2s30kyjrx227i05vikkn"; }; dependencies = []; }; WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2016-07-06"; + name = "WebAPI-2017-04-26"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; - rev = "e3fa93f29a3a0754204002775e140d8a9acfd7fd"; - sha256 = "0z6s3cnipcww4q33d4dcp0p8jw29izghcrj75fxy6dmy1yw2fbcr"; + rev = "e76f2da9a8f292a999a95ae688534f76c2dca9bd"; + sha256 = "02970g7blj478vid88gayba39rdcm9236nigkrijapyf5rd24zhh"; }; dependencies = []; @@ -283,13 +284,20 @@ rec { }; clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2017-02-16"; + name = "clang_complete-2017-07-15"; src = fetchgit { url = "git://github.com/Rip-Rip/clang_complete"; - rev = "b1a507fbc27ef581c966b035f52eafae773a6f32"; - sha256 = "19zs03giv8h5xmv18y9zn85sxr8akphvbscclrqhs4cf88285cgl"; + rev = "c41eea05317526a4ddd3bd389f3723390b196d4d"; + sha256 = "0bfalbzhy3n1k8bsvnh6aykgj6d17n6qgi9ahp0d8plvbjjvfw6j"; }; dependencies = []; + # In addition to the arguments you pass to your compiler, you also need to + # specify the path of the C++ std header (if you are using C++). + # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). + # The linked ruby code shows generates the required '.clang_complete' for cmake based projects + # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 + # as an alternative you can execute the following command: + # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" @@ -297,11 +305,11 @@ rec { }; commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2016-03-10"; + name = "commentary-2017-03-12"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; - rev = "73e0d9a9d1f51b6cc9dc965f62669194ae851cb1"; - sha256 = "1z409hpdk22v2ccx2y3sgcjf4fmnq7pyjfnk72srpqydfivxsl13"; + rev = "be79030b3e8c0ee3c5f45b4333919e4830531e80"; + sha256 = "1msbmbz96wa88ymjvcrbr07mxdrsjy1w2hl7z4pihf318ryq98cm"; }; dependencies = []; @@ -356,11 +364,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-02-25"; + name = "fugitive-2017-07-12"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "87c1bda4d5573185a1f79c42a919c4b62bc34c42"; - sha256 = "1zfq28sawq5x6y55w5m248r5vhs2g0llhs2xpihys9kg7jgj49zq"; + rev = "913fff1cea3aa1a08a360a494fa05555e59147f5"; + sha256 = "1qxzxk5szm25r7wi39n5s91fjnjgz5xib67risjcwhk6jdv0vzyd"; }; dependencies = []; @@ -378,77 +386,88 @@ rec { }; vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2017-01-16"; + name = "vim-auto-save-2017-03-10"; src = fetchgit { url = "https://github.com/907th/vim-auto-save"; - rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5"; - sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y"; + rev = "a81dea26d2a62dbe1a0f89aba5834aee40a89512"; + sha256 = "16ljzp2rww9c13pl2ci2pqri1774qp3yhhh042n7vqxcwy80kjjc"; }; dependencies = []; }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2017-02-19"; + name = "vim-autoformat-2017-06-26"; src = fetchgit { url = "https://github.com/Chiel92/vim-autoformat"; - rev = "42adced2500134017180ec37d10a8ffcde48e825"; - sha256 = "0yabhdnarrb0iiv51lxjvlicmlh6ga9n51iwrriv03p43s9h5hg1"; + rev = "ad189cdde5a50699a1d6b2b4b669e73942e47710"; + sha256 = "0jk1qigvz2xkpr13ii0pg0nszrnzwn51gckxjvgaqwbsz967ccsj"; }; dependencies = []; }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2016-11-02"; + name = "vim-nix-2017-04-30"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "b06cccd8ff61149b13d3fc8b7e0d06caa55c9888"; - sha256 = "0d1wxxijyyl449f81asl9d31kg0wvs3m0fypin172ahgpf3lyar4"; + rev = "867488a04c2ddc47f0f235f37599a06472fea299"; + sha256 = "1mwc06z9q45cigyxd0r9qnfs4ph6lbcwx50rf5lmpavakcn3vqir"; }; dependencies = []; }; tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2017-02-16"; + name = "tsuquyomi-2017-05-31"; src = fetchgit { url = "https://github.com/Quramy/tsuquyomi"; - rev = "043f8e0a008853bfe4c6a56a04930defe8494984"; - sha256 = "0jzkg2wrs46g6ycidh54z0rdhvjfm1syaf6sf17cl9m7h6wprsy8"; + rev = "46dfcd72b9701a52331349ba0d5c7596167093ab"; + sha256 = "12rvkc3wf959siijrgld56xvfhgacglxb69z4q567fsjv3ynqnrv"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-03-02"; + name = "deoplete-nvim-2017-07-22"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "b9774f4a320838288670fd215901115b06b4a600"; - sha256 = "1r91lnbjqhvpzszygkl4s1m9wc1qh4pg2pd43r66akpnddmgil0k"; + rev = "5cef0e6b607d3acb742d1de07a4ddd3a5bfa3036"; + sha256 = "0mh8zjaw369djffi1vzy124pwnrcxg4pbyjnhy3pq2j6k579znc2"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2016-10-30"; + name = "Spacegray-vim-2017-05-05"; src = fetchgit { url = "https://github.com/ajh17/Spacegray.vim"; - rev = "79936a4434bf57b64c2d73320e62b4e67d84af74"; - sha256 = "0dg037aw99yjdirw6f8v6da1lyf5ba2c6bni2wnka6bmzqx0k53r"; + rev = "95a5adbbbba7fb641af847d8666b8cad20431333"; + sha256 = "10p02n4arml1b4ah0bz754ifvkqnbms4j0wlgzqs5azb20y2kliv"; + }; + dependencies = []; + + }; + + 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-2016-07-19"; + name = "vim-closetag-2017-07-24"; src = fetchgit { url = "https://github.com/alvan/vim-closetag"; - rev = "e7e6cb99b9abb2aaa4711b9b2a98ad029169253b"; - sha256 = "0827yrgawfjf82z37lndf58ikyh6s8g9qhxvnbfxvz8cc4a6r21v"; + rev = "2cacc501df30586c0f96f40f24d1a1239529198c"; + sha256 = "00fayl6bnrf8b80xk73r1009z6hpzfc2jaih042hmnybx8k70byg"; }; dependencies = []; @@ -466,11 +485,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-03-04"; + name = "clighter8-2017-07-23"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "229012f8f8181417e0f43b4f19c4273dd7d5233a"; - sha256 = "0hx9l1mr7im9zrwhwf6n2lyc5azna7b2lkz4v1y9f93gv78b1vv5"; + rev = "a75644681c3a25f9441c482fd0b1c983d12da7e1"; + sha256 = "0hl14l8d0c0rwh7pv1d9bxkrvh1wjxdgjyi7cnhn75m7x9fd3ijh"; }; dependencies = []; preFixup = '' @@ -480,132 +499,154 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-03-03"; + name = "neomake-2017-07-25"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "4cd4dbb68f4f5c365e213552642c7e8a8b954f83"; - sha256 = "1h03cxdbbzghigrya2xy7a4rri5fjm8vma4bya7xfndc0sg9wlhz"; + rev = "0d1f1508ce2c9cfcffbf74a6bdea9c5766301fd6"; + sha256 = "0wc9b63s4j80f6irf2g6dmk2nx8w9il4dccbgmzirchmymndw4vh"; }; dependencies = []; }; vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hdevtools-2012-12-29"; + name = "vim-hdevtools-2017-03-11"; src = fetchgit { url = "https://github.com/bitc/vim-hdevtools"; - rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; - sha256 = "1wwjb9m2l9q75d408jzq9bwv5i376bfgs6vc3ihwwlawcrmhjpxz"; + rev = "4ffdace7002915cb10d663a2c56386286c5b8e37"; + sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka"; + }; + dependencies = []; + + }; + + vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-trailing-whitespace-2016-03-27"; + src = fetchgit { + url = "https://github.com/bronson/vim-trailing-whitespace"; + rev = "733fb64337b6da4a51c85a43450cd620d8b617b5"; + sha256 = "1469bd744lf8vk1nnw7kyq4ahpw84crp614mkpq88cs6rhvjhcyw"; }; dependencies = []; }; vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sort-motion-2017-01-28"; + name = "vim-sort-motion-2017-04-27"; src = fetchgit { url = "https://github.com/christoomey/vim-sort-motion"; - rev = "dab96e1f4100a559c58f1d0d8e5e400057479f6b"; - sha256 = "0p8p8nn0q62xm6sc36rwn3dknyk0wpjya21iy9y721vbz1s0l8x7"; + rev = "9833b22b24b469574178bff4a305472d52bd93b8"; + sha256 = "1rvg4c89vlhqdy0p76rn51hz5mz7qv5pckdacs5zz3g8rcpqxxwq"; }; dependencies = []; }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2017-02-26"; + name = "vim-tmux-navigator-2017-07-07"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "2fc1ed42ab580ab47c506ab0bef09f1dbb9ff04d"; - sha256 = "1mw0x3kcxvhfypzd7yj6bcknp6c5bh4zb4r9b16n1r7gplvwv8jn"; + rev = "d724094e7128acd7375cc758008f1e1688130877"; + sha256 = "1n0n26lx056a0f8nmzbjpf8a48971g4d0fzv8xmq8yy505gbq9iw"; }; dependencies = []; }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2017-01-22"; + name = "spacevim-2017-03-31"; src = fetchgit { url = "https://github.com/ctjhoa/spacevim"; - rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5"; - sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn"; + rev = "f4cd52c1746021bb3278c6a085e8d07f1c1a9258"; + sha256 = "0y146z0w1cbqwzw84k479a5hxs1phg1s11fqfvszn8928fsm8c4d"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2017-01-13"; + name = "ctrlp-vim-2017-07-18"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359"; - sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc"; + rev = "3a048e85d3c2f72b1564e2dc43ed5b1d67bd59a9"; + sha256 = "10i2lwjizd74b3zi1ahinz2h8qbd18jzw93xrpw0iswrynfsprjv"; }; dependencies = []; }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2016-10-22"; + name = "agda-vim-2017-07-18"; src = fetchgit { url = "https://github.com/derekelkins/agda-vim"; - rev = "5c698a0dcc4881ea8fbe672e60aaca70d4c8b6f4"; - sha256 = "0ii9gmwnc97zjis7d0a230gbh4pqvx4ja83aypmpmy67s3sxhwvf"; + rev = "d82c5da78780e866e1afd8eecba1aa9c661c2aa8"; + sha256 = "1aq7wyi1an6znql814w3v30p96yzyd5xnypblzxvsi62jahysfwa"; }; dependencies = []; }; vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scala-2016-08-02"; + name = "vim-scala-2017-04-29"; src = fetchgit { url = "https://github.com/derekwyatt/vim-scala"; - rev = "a6a350f7c632d0e640b57f9dcc7e123409a7bcd7"; - sha256 = "108c5h02vcb3pnr3si8dhwq3mv2pj5d83mj1ljxdk9595xv8j2rp"; + rev = "e7640f26e56f0be344d60a6098e05d6928fd396d"; + sha256 = "17gyqzsjjsg48x760qpm31bi169bzq0g80nm88jjkjw75m9jbv2j"; }; dependencies = []; }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2017-02-15"; + name = "vim-jade-2017-04-07"; src = fetchgit { url = "https://github.com/digitaltoad/vim-jade"; - rev = "20e41fc7ca0f1f1023c64548918e2b8155bb44ea"; - sha256 = "1smqwpzsllmwc7kafyj65fkmh8p87b14dzgldnh4cnrhkcbnddav"; + rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975"; + sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y"; + }; + dependencies = []; + + }; + + pony-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "pony-vim-syntax-2016-01-23"; + src = fetchgit { + url = "https://github.com/dleonard0/pony-vim-syntax"; + rev = "a0ab2e14d5a3796ebec01ce196392dc1de349cb3"; + sha256 = "1wraray7870hq75jqxyilxb125flhcgk9ysz437qbg75c495znl0"; }; dependencies = []; }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2016-09-21"; + name = "vim-2017-05-24"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "926dfbab01128322f6326bdd10de2856b1fa3232"; - sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv"; + rev = "6a5bf34193927c70b6c21dcbe1c130d2ab0951d6"; + sha256 = "1mmqrc52k133ddpxcs0mxjph4n4b856r5wbs17bgcpk95cfbspb1"; }; dependencies = []; }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2016-07-01"; + name = "neco-ghc-2017-07-22"; src = fetchgit { url = "https://github.com/eagletmt/neco-ghc"; - rev = "7f02a9c25fb272a87d2be092826e2cd3094c620d"; - sha256 = "1fcfk45qb96h6y4zb3p0104iyqc85q1synn9ah56zp6hnkkyffbw"; + rev = "1c7bf1b544f295d066863b9f193de709aec5bbad"; + sha256 = "1vbl75s0zvbw6zvs790yla06rl8akpamm0p98s5mbj7mdnivkqhb"; }; dependencies = []; }; editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2016-07-16"; + name = "editorconfig-vim-2017-05-13"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-vim"; - rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2"; - sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g"; + rev = "a069da8426ec5b9fc4d9f83c783c999e9d20f7d0"; + sha256 = "1zx5a8if3r77dnyidix7j0gi04y4pmmi5kfzlr3kjazj00606l79"; }; dependencies = []; @@ -623,33 +664,33 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-02-21"; + name = "vim-elixir-2017-07-19"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "9524e66ee03a36ef1d5913c7f42c3dd9b235146e"; - sha256 = "0n7v2kfzqifm527pbh8d08xmdzj8rmbhnnvs22hyxv2ij06lzzn2"; + rev = "7c16ab889d12a32a7d15c54c36c0f47809b06e06"; + sha256 = "0h9gqxqyl6p6ckknn8838wz71xz5v2jqkc2swjdkfbff2n9k1gwb"; }; dependencies = []; }; elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2017-02-27"; + name = "elm-vim-2017-07-09"; src = fetchgit { url = "https://github.com/elmcast/elm-vim"; - rev = "b47d013d1fdfecc9e19df8034439b8e379813696"; - sha256 = "0ibmb02qal7q29brmq0jkd3rcnwp6yba9agza3av1x1ixvb61mlw"; + rev = "ae5315396cd0f3958750f10a5f3ad9d34d33f40d"; + sha256 = "0a85l0mcxgha4s5c9lzdv9y2c1ff942y9a5sfjihz6sph21c77xp"; }; dependencies = []; }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2017-03-01"; + name = "vim-localvimrc-2017-07-06"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "aaea27fe897edbfb0c5f71ef0ac02489f4bcfefa"; - sha256 = "1lp947x9q9746r8zfssnn2xylbvzyyzxh7s7rshqglslwd74hhz8"; + rev = "48c01c214ea0312e8045aaa1a28b30850e98a194"; + sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d"; }; dependencies = []; @@ -666,6 +707,17 @@ rec { }; + ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ensime-vim-2017-07-06"; + src = fetchgit { + url = "https://github.com/ensime/ensime-vim"; + rev = "a8a2f024283af8e0b69165960ba59d850d1b80a4"; + sha256 = "0vn7iv05jil7j1k4wgnnb9b1b4yqlxjkqmmz8a71291qg17bs5c8"; + }; + dependencies = ["vimproc" "vimshell" "self" "forms"]; + pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; + }; + YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "YUNOcommit-vim-2014-11-26"; src = fetchgit { @@ -678,11 +730,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-02-19"; + name = "vim-go-2017-07-25"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "b9c81562630e9dfc098d25814c16bedcfcf9ffa9"; - sha256 = "0r5r4laqd4jwqc14lkjyccz3ijjzz366r0zgqw5cybspnf622f9a"; + rev = "76cd99db6a88e825f361df0043cbff777c4a14fb"; + sha256 = "1pda9dmaacnzwm92a7vsly053dq2c1bcsqx99rwr41mkpzsk649l"; }; dependencies = []; @@ -700,33 +752,33 @@ rec { }; floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2017-02-08"; + name = "floobits-neovim-2017-07-25"; src = fetchgit { url = "https://github.com/floobits/floobits-neovim"; - rev = "9755412fcd68cfc76a36aa000682a84d96013650"; - sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1"; + rev = "5b83fc75e4241911649782fd5b87ac7da30e77bd"; + sha256 = "05jrybkhg39v3z295l55aasb074wvm3pnyp7l38jqk7z4432gdc4"; }; dependencies = []; }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2017-03-03"; + name = "psc-ide-vim-2017-07-14"; src = fetchgit { url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "cfd4228ff907be6124953d4ff41951ce3eca28ce"; - sha256 = "1dvdrj06l65xflq7f5k2c4awrc7hh03qr48h9i39q8lg4xc0qc1p"; + rev = "0ff0c0a4e4087cb4444d0a19f2b2e436e723b186"; + sha256 = "0kq8iqhv8flyc12m9ajmbrfk7k6zl3gnnxg5j8sw69aqy6pqvd0p"; }; dependencies = []; }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2016-12-16"; + name = "vim-jsonnet-2017-04-06"; src = fetchgit { url = "https://github.com/google/vim-jsonnet"; - rev = "ff255a3ac45dcd8bcda04728a8140243adde9c57"; - sha256 = "16ica7n8dcb3kq40dx3sd8lwvdrz7bzks1cranw2vxh4riv1i251"; + rev = "2637e273713322befc476760809d46500e6088f3"; + sha256 = "0fxmqasznb3ra49r4j3fmksik7narnd3b6j1j4najp4l61x27ip2"; }; dependencies = []; @@ -744,55 +796,55 @@ rec { }; vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2017-02-12"; + name = "vim-leader-guide-2017-03-18"; src = fetchgit { url = "https://github.com/hecal3/vim-leader-guide"; - rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da"; - sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1"; + rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e"; + sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw"; }; dependencies = []; }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2017-01-27"; + name = "idris-vim-2017-06-05"; src = fetchgit { url = "https://github.com/idris-hackers/idris-vim"; - rev = "c9b8066730fd8e62cf20eecf0e2c60f225ff12c8"; - sha256 = "0nkr2qwykl57xky3dpz40m5gy7s1kjfsgb1kzj7z9jqm6a41m2bb"; + rev = "0709927e689f4f4158661d4eb8ac6ce310cd7548"; + sha256 = "05fiamb92l7d08kxv1jk5xpqvkxphr9vqi3bfa203mjkvymd3x34"; }; dependencies = []; }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2017-02-09"; + name = "calendar-vim-2017-07-08"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852"; - sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip"; + rev = "6d6be26b2ad1870658525e2a42046429c845516c"; + sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2017-02-12"; + name = "lightline-vim-2017-05-30"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a"; - sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5"; + rev = "ff74d6561487d220ed9d878172d8b55a79a4c17e"; + sha256 = "0j8pn42vfc1ka6hjnfsanl98vlk2839am5d4ynz9p1j1hichiqzv"; }; dependencies = []; }; thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "thumbnail-vim-2016-12-25"; + name = "thumbnail-vim-2017-04-24"; src = fetchgit { url = "https://github.com/itchyny/thumbnail.vim"; - rev = "f911ebd0dfe08dd83a55dd0d0e4804195079b13c"; - sha256 = "1pa0c34v2mah97i41hg1vyppf44sfmvdpji30bq54yv7gza36plz"; + rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00"; + sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5"; }; dependencies = []; @@ -821,11 +873,11 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2017-01-31"; + name = "vim-orgmode-2017-04-19"; src = fetchgit { url = "https://github.com/jceb/vim-orgmode"; - rev = "37fc5db4d167ca0def23febcb06d984ab72015be"; - sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x"; + rev = "8a5cb51fbb8d89b0151833a6deb654929818a964"; + sha256 = "0siqzwblads3n69chqsifpgglcda2iz2k40q76llf78fw5ylqd16"; }; dependencies = []; @@ -854,22 +906,22 @@ rec { }; auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2017-01-26"; + name = "auto-pairs-2017-07-03"; src = fetchgit { url = "https://github.com/jiangmiao/auto-pairs"; - rev = "e915d857fe927309ef0090e830f892204b750c43"; - sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4"; + 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 = []; @@ -909,11 +961,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-03-03"; + name = "fzf-vim-2017-07-24"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "87a910a127623db9ba2eae9ec9548db1a5142a0a"; - sha256 = "05b4slg10h9v19bvb6n8hn706w4zyyz0h8akyzzmjkrm0sv92x6r"; + rev = "685f9aae97072a190a1230a5c79692e15b7f46c9"; + sha256 = "1064qwypq8hl0dx65fhvx0aq4jp7hc60rzb0vy98zjr3sr4wshbh"; }; dependencies = []; @@ -931,11 +983,11 @@ rec { }; vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2017-01-13"; + name = "vim-peekaboo-2017-03-20"; src = fetchgit { url = "https://github.com/junegunn/vim-peekaboo"; - rev = "9de6fd70ad20cbf568664c06d673c69e2f622287"; - sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky"; + rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49"; + sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m"; }; dependencies = []; @@ -964,11 +1016,11 @@ rec { }; typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "typescript-vim-2017-03-02"; + name = "typescript-vim-2017-03-15"; src = fetchgit { url = "https://github.com/leafgarland/typescript-vim"; - rev = "48f92032a446daf2aea64ac5912b26328c3df1ef"; - sha256 = "1lpqqjl3im96zy8w0iwyvmzcwdijfgji0czbsmi84hx299dpn8n4"; + rev = "4dc79bd1b0c43c16cae146bee065f2acc6d2b789"; + sha256 = "1hm7cpkx7na106xpivzi5cqb322nanpa0sdjmvnkhgll244q5vy4"; }; dependencies = []; @@ -986,22 +1038,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-03-02"; + name = "vimtex-2017-07-25"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "75c4ac90f2d254741bad326536d03f382266a150"; - sha256 = "1l89skr6ifpavximggzyzaw11973ci5gyh48cni07a2m0z26sy07"; + rev = "1bba731f008a0905c1cf34e185c3f299d1f1759b"; + sha256 = "0gcsfdc2rrdaylsqz6hn9smchndb4y22f4sm230ljdf1rda6v57v"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2017-03-04"; + name = "vim-easymotion-2017-07-14"; src = fetchgit { url = "https://github.com/lokaltog/vim-easymotion"; - rev = "19d00afefe5a1b8f6d891ce0b73dcde38c718fdd"; - sha256 = "1fdfg8i1xllpgjfk52r58ar8pmbcw3gjdzj712d2n0j7mjmphdgs"; + rev = "e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50"; + sha256 = "16ww4myvgh7is5fbwm67v87bbdyhldvr9d4vqkvnn8v9mbj7p7vd"; }; dependencies = []; @@ -1019,22 +1071,22 @@ rec { }; rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2016-10-28"; + name = "rainbow-2017-04-21"; src = fetchgit { url = "https://github.com/luochen1990/rainbow"; - rev = "906094f73a46ab4636806541b50c5d4182fa09e1"; - sha256 = "1za2pwv24yiap2655wagyg4yd69g1xqwayazablwj7x1wvqdvd5p"; + rev = "1c45e0f81324641b23d4c21edda4eabeacba031b"; + sha256 = "143bkawg4sy1vbizfwb6p9alizyr80sr6incxrz179l9dp9r8frf"; }; dependencies = []; }; vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xkbswitch-2017-02-21"; + name = "vim-xkbswitch-2017-03-27"; src = fetchgit { url = "https://github.com/lyokha/vim-xkbswitch"; - rev = "0d88988f33b5b100fa14ab8ce93f3950ce6069e5"; - sha256 = "0bglqbdhgrq9c3dzl6031ar6wzz733ym1af1sahb6h6zky30ij7n"; + rev = "a85ebddb9038e6b05138c48868a319a9e13d1868"; + sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr"; }; dependencies = []; patchPhase = '' @@ -1045,44 +1097,88 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2017-02-22"; + name = "vim-highlightedyank-2017-03-25"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "db9b1e89af6dcbc56f84db980009915cac303fb8"; - sha256 = "05l7q7l3zbk2lssgs52srk65b53frmxw0rpnv5dma7c2mjxcn9gn"; + rev = "d656e1e62d2b4e1abd66c5f3a13a2be31a5a80ed"; + sha256 = "0rcd2q8f49iyv93s5g95brml7sng7lr8k9s5m4mxq3y0m9yf68fd"; + }; + dependencies = []; + + }; + + 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 = []; + + }; + + forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "forms-2012-11-28"; + src = fetchgit { + url = "https://github.com/megaannum/forms"; + rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; + sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + }; + dependencies = ["self"]; + + }; + + self = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "self-2014-05-28"; + src = fetchgit { + url = "https://github.com/megaannum/self"; + rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; + sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-02-26"; + name = "vim-startify-2017-06-15"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "a16e94e6879d8cb5443ebd79ec53883489f46b55"; - sha256 = "14c179wrh9aw4lwr2b88y6cjxj7x6jyl8kk4fqwzv1h5zqh48fk6"; + rev = "7f910ed4367de96310fedc98d5a12b97173a405f"; + sha256 = "1l5q8mqqp6gzmxqm5i0lx6lbm181vmkcg8w24ypa77vnid0ihd93"; }; dependencies = []; }; vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-object-2015-08-11"; + name = "vim-indent-object-2017-03-23"; src = fetchgit { url = "https://github.com/michaeljsmith/vim-indent-object"; - rev = "1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b"; - sha256 = "1xxl5pwbz56qjfxw6l686m1qc4a3q0r7afa9r5gjhgd1jy67z7d7"; + rev = "41d700f14b3decccdde421fbfe49e95a084a2f89"; + sha256 = "12mi4n5abfxx7xjl46aw400acgrjf1fxjgzak763l874y0whf5v2"; + }; + dependencies = []; + + }; + + ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ack-vim-2017-05-07"; + src = fetchgit { + url = "https://github.com/mileszs/ack.vim"; + rev = "a16a9b63eb85cc0960a7f25c54647ac1f99f3360"; + sha256 = "09bwawm2csliancl281y6wgalrrmaqq7d0baz4dq1cw18x657mk7"; }; dependencies = []; }; lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2016-10-12"; + name = "lushtags-2017-04-19"; src = fetchgit { url = "https://github.com/mkasa/lushtags"; - rev = "ef6410cd66c6729e6f4795222bdc0e406251f27a"; - sha256 = "094cl57zfqjq7gpv4151zxipb6kd1czwx4nv6x8wsl3n0z4p3jkx"; + rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf"; + sha256 = "1si5n07k4r8kji4whglav9q59ksv6bi5v58xbpc2l5bavlk8kn6n"; }; dependencies = []; @@ -1100,11 +1196,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 = []; @@ -1122,11 +1218,11 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2017-02-26"; + name = "haskell-vim-2017-07-18"; src = fetchgit { url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "5009c37a0f005aee164f8aaf2e99c57abf7a3402"; - sha256 = "1i2ahm0sikdybhkhmijwcmcsq86bf29jpac6mh3jh0iimimrgwi7"; + rev = "21c48768f1c5986d4f2351784b119eb9a5f925db"; + sha256 = "1dd18plhahkdz782d7y8w8265di2wvs78w2q2hx2m68686abmn0h"; }; dependencies = []; @@ -1166,44 +1262,44 @@ rec { }; vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2016-11-14"; + name = "vim-watchdogs-2017-06-23"; src = fetchgit { url = "https://github.com/osyo-manga/vim-watchdogs"; - rev = "455a61a34e6f2f82fda7e6de0fc14fc740a11764"; - sha256 = "05mqphn2l3f0sa86xq5iw1gmm8l1x8ri26kiw6w40hvdc22xkak5"; + rev = "22a08dcd33223ddbe95c977ca72e77d62d2c75d9"; + sha256 = "0d3i39cz5kpps2gxlbz2l73bz0rs67lhh6qrpzl3a2p014hixbyi"; }; dependencies = []; }; vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2017-02-02"; + name = "vim-markdown-2017-05-10"; src = fetchgit { url = "https://github.com/plasticboy/vim-markdown"; - rev = "d6d59eef6f604b6430fd6adade9e18364666232b"; - sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6"; + rev = "3fcde7215e22913f004c2836fd46ff61746be6db"; + sha256 = "0ymbs7235zi5hwyzc0vaikb3n6jwj6xarmgjj4lpf4wbsa1212yy"; }; dependencies = []; }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2017-02-06"; + name = "python-mode-2017-07-04"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "d113cffc3f7a48564aeb568e1c7a6f5312ff09f5"; - sha256 = "1gn74cj629q00ar3z0c1dlngn31jr4lv04bwi2npzinn7rpf8nj6"; + rev = "d2dead6ce9d900b26dbf1a06c52969f4194eda64"; + sha256 = "1iq26a2l9maapz3433pwywmqla4wf7jass7s7bh32h10m2fh88a0"; }; dependencies = []; }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2017-02-08"; + name = "vim-racer-2017-07-19"; src = fetchgit { url = "https://github.com/racer-rust/vim-racer"; - rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e"; - sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd"; + rev = "c729b895885c9ef548ed4f9c1cec7c7c741b5869"; + sha256 = "1r0idhc7yj5r4h2rfmbb5p0i1yckr3mckif3ijy6sm9rhwi242sw"; }; dependencies = []; @@ -1221,110 +1317,132 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2017-02-24"; + name = "vim-grammarous-2017-07-02"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "74a88d233056ac63ef65b3dd6766494ec33e6f2e"; - sha256 = "0av6j1i0kf1gdvj19n9mdaxkxhb6dkbl7yia81sw6j2mkdzka3jc"; + rev = "d117cd139b58319d8ac94f2fd36ee548b6ea1e88"; + sha256 = "0a5a65j9a3s54z9asjmfbqsvawx014bq772jqgpsxww53lap3s5x"; + }; + dependencies = []; + + }; + + vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-puppet-2017-07-02"; + src = fetchgit { + url = "https://github.com/rodjek/vim-puppet"; + rev = "cb1863af2ba4de9fb1c1d952d82692502348fb92"; + sha256 = "0a3q6f8jplxbvpjaz9vnh589al64vg567nc00xabp46vcm83nk4x"; }; dependencies = []; }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2017-01-01"; + name = "rust-vim-2017-07-14"; src = fetchgit { url = "https://github.com/rust-lang/rust.vim"; - rev = "732b5fcb3652f81726d5f0f5b97c9027c01f057a"; - sha256 = "0yrg0wlpc9nj5zf25vgr9zd1kwapds3f10njr0dw0wgxr7g204dz"; + rev = "5a6133680ecf9e22eeba35c35e62ea6210225b02"; + sha256 = "0mxzl8lghq7bnwp8qs3haxq83ds5q8s8br0ajn40a3c3ns2hkhla"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2017-03-01"; + name = "neoformat-2017-07-22"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "c59748c706b15cfae891772c4e17a31f396c8ffb"; - sha256 = "0awb1f7ham13rwsg88q356lczblb23kxq194j8h19jmjjbb1lv7p"; + rev = "a0c8e1f3c8b917afd175fc9ed9b2685ce5f952e9"; + sha256 = "1w2m54ag1g1czfwa8y2vq4p05wysvb1qhgfnbzqvlwb1mn9sh2kf"; + }; + dependencies = []; + + }; + + deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-rust-2017-07-18"; + src = fetchgit { + url = "https://github.com/sebastianmarkow/deoplete-rust"; + rev = "0a86e502113910c33448b337c4d50cabea120d25"; + sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; }; dependencies = []; }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2017-02-02"; + name = "vim-polyglot-2017-06-12"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb"; - sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny"; + rev = "8eab5f5403afc1c33a7593459a27f7ff625fa60b"; + sha256 = "0q2xfmqk5iad6gv8zzlpcv48xpv7lwr6mswc7mdllzkgaqilz75g"; }; dependencies = []; }; neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-vim-2017-01-16"; + name = "neco-vim-2017-07-23"; src = fetchgit { url = "https://github.com/shougo/neco-vim"; - rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa"; - sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3"; + rev = "7c188577ebf65bfb9e27affce8158e0f5af2ec3e"; + sha256 = "1jb9vw2gkag2fg18vxqj3rc6y4zqgrn0kf6vb5z8kgkbsam0cybk"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-01-08"; + name = "neocomplete-vim-2017-07-23"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "9617d825c0d4acdb18aec903e9c1c0443058d18b"; - sha256 = "0a6mhh0ylzgjddlnwqaa5zq4abpv2dhhw7wv7w9lmwa82w31j5ya"; + rev = "d8caad4fc14fc1be5272bf6ebc12048212d67d2c"; + sha256 = "1ab1p4w6187r15alb34mnvaq43mikk7ic05ysgilx4f4zz6dgz5y"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2017-01-24"; + name = "neosnippet-snippets-2017-07-05"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a"; - sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6"; + rev = "b89c544264912b064c79da2a90fc5d4e69d621b2"; + sha256 = "1cqgagzxl559mf06kkggdm90g27is0x80qqrrha09ng16hf6qf7a"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-02-13"; + name = "neosnippet-vim-2017-07-15"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "1bd7e23c79b73da16eb0c9469b25c376d3594583"; - sha256 = "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5"; + rev = "4bf88a9e497dc7180e9fe58551ad340de0192f39"; + sha256 = "0mj14cninszfw95zb0rwcmzf40851i49lj6vk8gz4iq9y0hxsnx7"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2017-02-10"; + name = "unite-vim-2017-07-01"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "97e634117ff05d3c867d625940da5c7947cebf63"; - sha256 = "1qc7k5n7whw5z78czhi363fbllj9znz1gqlps096aiwhapfv3m1z"; + rev = "ad15f96365b5cb43a45d0ca779df6a497f954f15"; + sha256 = "0pigwfwyas4zdzrazk08p9bnbmi51np4gb0mf5dy434glw9rrvjz"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-08-06"; + name = "vimproc-vim-2017-07-22"; src = fetchgit { url = "https://github.com/shougo/vimproc.vim"; - rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0"; - sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20"; + rev = "03a38f283ca9e15784e8fea84e8afc5d633b9639"; + sha256 = "0ypffp724f3qp0mryxmmmi1ci0bnz34nnr7yi3c893pd9mpkrjjr"; }; dependencies = []; buildInputs = [ which ]; @@ -1346,37 +1464,36 @@ rec { sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz"; }; dependencies = [ "vimproc-vim" ]; - }; gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gundo-vim-2016-12-16"; + name = "gundo-vim-2017-05-09"; src = fetchgit { url = "https://github.com/sjl/gundo.vim"; - rev = "b4f3624d01ffdfd7bdcd2e19128fffe768fe6262"; - sha256 = "0a18z3yc2fmpaymzlyjkjblxxkjvn83yh64rvidr3nzg262applz"; + rev = "46c443ee9d5854320eb965a1fdee781ba83a070e"; + sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2"; }; dependencies = []; }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2017-02-24"; + name = "alchemist-vim-2017-07-23"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "31c13df87ed13428f8070718cea8a3ade4c37c99"; - sha256 = "0c485zgrg997waf7jrw1qyzw8903yc4p5y5d7skn2irn66dl0388"; + rev = "35b0e59b4ae45baeef7fc46b6faf9b96515d35cb"; + sha256 = "021iwhnjjsfhmpbimm91jgmcrlj1hjh8rxcdqxwcwxc92h73wl58"; }; dependencies = []; }; vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hardtime-2016-12-19"; + name = "vim-hardtime-2017-03-31"; src = fetchgit { url = "https://github.com/takac/vim-hardtime"; - rev = "0551f0836d311fae408fb1dc73e0c09cdfa3661b"; - sha256 = "1izyx3dnds1hdhjk16578cdda72mnhbsrdz2klm0dygfvfq9h7x4"; + rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; + sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; }; dependencies = []; @@ -1405,11 +1522,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2017-01-22"; + name = "vim-quickrun-2017-03-21"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2"; - sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv"; + rev = "98889e1fc0f7136262c4dd7c312b82879df16486"; + sha256 = "1drv53fwp24z0yb79lj2nyapyndw1yirg202hg7px9jvxjr4k8a0"; }; dependencies = []; @@ -1427,44 +1544,44 @@ rec { }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2016-08-30"; + name = "vim-dispatch-2017-07-12"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "a54f2c5e18b8c2aad8c6f8ba474760e70fdaaca3"; - sha256 = "18z1hkr3qrgj9j0kr0q3i5vq27dpkjhsm3mqyssi6k5v0iyw49dk"; + rev = "14a1695f844a320dd28a7706710325773d1046a8"; + sha256 = "1whmqikg5ch523ffs2apkrd4clwl7s0y98gmxgaqq6gm2fa2wmfp"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2016-09-07"; + name = "vim-eunuch-2017-06-08"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "7eeb681ff3caedc1c01e50966bc293951f7b3e21"; - sha256 = "0hk4p1qjmplddmwrpp6b2x776z1298pkcgp855kgigib53w5srmc"; + rev = "b536b887072ff3cc382842ce9f675ec222302f4f"; + sha256 = "0vp037kb12mawy186cm384m5hl0p051rihhm1jr2qck0vwaps58p"; }; dependencies = []; }; vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-repeat-2015-05-09"; + name = "vim-repeat-2017-04-21"; src = fetchgit { url = "https://github.com/tpope/vim-repeat"; - rev = "7a6675f092842c8f81e71d5345bd7cdbf3759415"; - sha256 = "0p8g5y3vyl1765lj1r8jpc06l465f9bagivq6k8ndajbg049brl7"; + rev = "070ee903245999b2b79f7386631ffd29ce9b8e9f"; + sha256 = "1grsaaar2ng1049gc3r8wbbp5imp31z1lcg399vhh3k36y34q213"; }; dependencies = []; }; vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-speeddating-2015-01-24"; + name = "vim-speeddating-2017-05-24"; src = fetchgit { url = "https://github.com/tpope/vim-speeddating"; - rev = "426c792e479f6e1650a6996c683943a09344c21e"; - sha256 = "1i8pndds1lk5afxl6nwsnl4vzszh0qxgqx7x11fp3vqw27c5bwn8"; + rev = "a418667791f03694065948342f2d6c5cca8d0f32"; + sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw"; }; dependencies = []; @@ -1482,22 +1599,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-02-27"; + name = "youcompleteme-2017-07-24"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "39659caf34c664c7419cadb41cb813158e0749fa"; - sha256 = "0rl8fxcwcj61bj8b2qcnwfipcnf1nb47bvb52sv68sf9v78qa7sx"; + rev = "998303e2fd5e762c3bc2aee8c23af1b388fb459c"; + sha256 = "158wnxgnjir4n5p1jnpxqq4qwl6hapd9kpdd3gklihxvbj1zqskc"; }; dependencies = []; buildPhase = '' @@ -1519,22 +1636,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2017-02-26"; + name = "vim-airline-themes-2017-07-10"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "205f6964be55d17c908baaf89066928090b02729"; - sha256 = "0cz39gxmrsnv9r72ymyzjwlgdi2x0dxxibwvlwp6zwdwws4l3fw8"; + rev = "5d75d76ca2e17edd68f89ac4f547009d477570c6"; + sha256 = "15vq8fjax69wi447vhirj7vzqxppxcpvq2v8dhi0pf39gbzcd229"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2017-02-20"; + name = "vim-pandoc-2017-04-26"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "15873af56c3c15ebd5431983741c399097fb61de"; - sha256 = "08h1bmrjv8bjywz1fj2rjnmmwrlpdl1lv1gz5msdy817n5lf1xh2"; + rev = "fc209c66e937172efdd6db39ee64fcb3980ce329"; + sha256 = "19x8hf78833hcg508sn5a4g79h47ynqzzas998rqr2cmmpsc4mzs"; }; dependencies = []; @@ -1552,11 +1669,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2017-02-22"; + name = "vim-pandoc-syntax-2017-04-13"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "2e7420ba617da6aa6acc221c41fbea44783eb585"; - sha256 = "0k964jsr9v8nz1w2d8qy6rv66110ga6hllbp5zcrfw7j62cgmvn7"; + rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3"; + sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw"; }; dependencies = []; @@ -1672,30 +1789,40 @@ rec { }; + ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ale-2017-07-23"; + src = fetchgit { + url = "https://github.com/w0rp/ale"; + rev = "a0059cfe0362e8ba55bad1f4fa8a310c74b55280"; + sha256 = "0hjli8ww0i4yxa7gxiyvy9xgc9s8krr7vhdh8036nwwnrzrmcc5h"; + }; + dependencies = []; + + }; + vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2017-03-01"; + name = "vim-wakatime-2017-07-03"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "a7be16c948bc4975d83c07c7bf25206953b79b22"; - sha256 = "0lnng566bw4462xg3i4qjbqvnkxmg2m33368nllapb1yj0x735c9"; + rev = "0c5368cf01f4d452a05eb5e5569e6fe78dca2657"; + sha256 = "025d0gz0fs3jb062jp7js11b8vb20zyxa32llqsjkyy4gr8kv53b"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2017-03-02"; + name = "command-t-2017-06-23"; src = fetchgit { url = "https://github.com/wincent/command-t"; - rev = "5a19460ea0eab0ca617a8dbf405f7a506eca4ff6"; - sha256 = "0vzw5cvlsw0cs2jp52qbc7nghw4jsbldrbkynbx8g7nrh36847my"; + rev = "29f2606a9665058a98b56f2d8062ba614a3f246e"; + sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn"; }; dependencies = []; - buildInputs = [ perl ruby ]; + buildInputs = [ perl ruby git ]; buildPhase = '' pushd ruby/command-t - ruby extconf.rb - make + gem build ./command-t.gemspec popd ''; }; @@ -1722,15 +1849,26 @@ rec { }; - deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2017-02-13"; + nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nim-vim-2016-05-19"; src = fetchgit { - url = "https://github.com/zchee/deoplete-go"; - rev = "9c2d57710f022ea5fe3b0428e6635a3de77bcf9e"; - sha256 = "0rl211rmnzwribzpqxfg99lsyln2x1i8ygyz8b9jy804fm5i24f3"; + url = "https://github.com/zah/nim.vim"; + rev = "dcf25798f4a3f75e9538f9915959061edbff97cf"; + sha256 = "1jaiqkspfz2a4ny130dl0h6x9752flpcwwy0kscrqmlqf5fqiyvm"; }; dependencies = []; - buildInputs = [ python3 ]; + + }; + + deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-go-2017-05-26"; + src = fetchgit { + url = "https://github.com/zchee/deoplete-go"; + rev = "aef73fdf275053a6fb00c3f66d1f18821bc74bd3"; + sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq"; + }; + dependencies = []; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -1740,22 +1878,22 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2017-02-17"; + name = "deoplete-jedi-2017-07-16"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "a4dd511535a6fe06717a7bd2d680b9b87ade595d"; - sha256 = "03wwqk4r2rm5yjxqw2f4302lknb9a10yfpw4b0vyr40zch6jascr"; + rev = "56528fd1238bbf2f9363f16710d0936703dc9eab"; + sha256 = "1kwwbr1w3865rlqs04hpxrqv67a14mzyf85pa29djmryi2156wxb"; }; dependencies = []; }; goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2017-01-03"; + name = "goyo-2017-06-01"; src = fetchgit { url = "git://github.com/junegunn/goyo.vim"; - rev = "ebdd67fd6160b7f95ac8fe50b382694c9961d6b8"; - sha256 = "08kx7dsa00amwgjdq1grhapjsa8mk2z11pwgn6xc342zkvrlf0fn"; + rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; + sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; }; dependencies = []; @@ -1795,11 +1933,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2017-02-13"; + name = "pathogen-2017-05-27"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "020ab25c38f62627c1dab6c7a851176c6ad309f9"; - sha256 = "19cdb9ach89jx0y9kpz39d41dzq5dfy5l83v8l57jxjq1s4wry55"; + rev = "ddfb1f14d7597e6aedc749be06b559a673c437ab"; + sha256 = "0fdd88gj75bzq6ifaddz3sl71w8ljnnci9npm04jmyvf048gnjg8"; }; dependencies = []; @@ -1828,33 +1966,33 @@ rec { }; sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2016-09-05"; + name = "sensible-2017-05-09"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; - rev = "4b7535921819a5b2e39be68f81109ea684232503"; - sha256 = "0ghds721dawm8mcd8cp23hfqpgiznh811z73zxlqrm1sg2fmdq1s"; + rev = "49ee364222dc2a5a00dddf89fd61880e3e39d46a"; + sha256 = "0x9zn547hzzxjzplr2rkzhydh2y0a4fdkrwmdvw2yp203msyhcjx"; }; dependencies = []; }; sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2016-11-06"; + name = "sleuth-2017-07-23"; src = fetchgit { url = "git://github.com/tpope/vim-sleuth"; - rev = "62c4f261874dd44e6cdc6788b4a6bc59f9dfe746"; - sha256 = "13w4gv2k91ahdc25vhi0ilqphlnix1q5gddcihi8k7fapx990a9k"; + rev = "dfe0a33253c61dd8fac455baea4ec492e6cf0fe3"; + sha256 = "0576k4l2wbzy9frvv268vdix4k6iz9pw6n6626ifvg8hk6gbc5g9"; }; dependencies = []; }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2016-11-14"; + name = "snipmate-2017-04-20"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "2d70860ba49afc83cb5902acb99174e3cf08538d"; - sha256 = "015h8narda721svapf17963r3r48cz63477pmb3fhy2rp8lvvif4"; + rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; + sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1883,11 +2021,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2017-01-05"; + name = "table-mode-2017-04-20"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "30a3eba81628fdd099adc6dfdec8aa627c4783f7"; - sha256 = "0pw3mvrx3iyyj5xz05gixhvnrqxpl274cv04449mxm50q32zvmhr"; + rev = "4e41af8e5f0bf53326d1b83c2feb1eff89fe90d4"; + sha256 = "0l83j3963lzkmn54vcagkwm2rhk96cl9v42l5r7zcgjign28cfzw"; }; dependencies = []; @@ -1915,22 +2053,22 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2017-03-03"; + name = "tlib-2017-05-20"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "b80c8f0f932ffaf9078f6998fe422cfbc7b95178"; - sha256 = "177phwdhfckhc4bm4xv1db8lxrvsi8lvv7n3c1j03w2r8f9h8pj8"; + rev = "6f9d75b54478bcaab722d33cbec69d8a1fe49f32"; + sha256 = "1mh2m3c9xi7g650s06qxfpz57g493n0qjq35inad9y62yb1gsidm"; }; dependencies = []; }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2016-07-19"; + name = "undotree-2017-03-24"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "17dfeb6aeacc40036567d29c691898ac57b09182"; - sha256 = "0xmc95h5nbmjx6hvfd9lvkz8hdp8fw5xm5c7wcyy5f0rg7b6l68x"; + rev = "ad08a88df70c1865b8c9ef6eeac5cdb051d2a18a"; + sha256 = "1i1sss8vzsym44amq19rfy95wm7143ks5h9imm7z7rah7xkcqv9l"; }; dependencies = []; @@ -1948,11 +2086,11 @@ rec { }; vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2016-07-12"; + name = "vim-addon-async-2017-03-20"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; - rev = "b14414215b394a0ef887ea301085ae4b80012e38"; - sha256 = "1gr0rjn1vwqv4p51yb0s65gnpy1r0533lfy5nqbg20j4687yxls5"; + rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; + sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; }; dependencies = ["vim-addon-signs"]; @@ -2025,11 +2163,11 @@ rec { }; vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2016-12-20"; + name = "vim-addon-manager-2017-05-07"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "20f75ea1cfa119c61656d71701875c06493180fd"; - sha256 = "04q1rim08l1ccl7w2764nahhhampvkzzbwnjnnvpb1zgi71ixivy"; + rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; + sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; }; dependencies = []; buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; @@ -2113,11 +2251,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"]; @@ -2146,33 +2284,33 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2017-02-28"; + name = "vim-airline-2017-07-21"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "fbd791e7f0431e18b987a2a8937a4c3d34dd2125"; - sha256 = "15m4wdvx4x8m43x5z08sbw74i1l7vwj0qljsgs7jn36yc9453sn7"; + rev = "72e5f04f7c422e21cb6f6856c4e94cef25ea2288"; + sha256 = "0pkdlmil0lqwwi7anzn7r1zxxqbip9zy1pbwri031yksff6v2096"; }; dependencies = []; }; vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2017-03-02"; + name = "vim-coffee-script-2017-03-03"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; - rev = "1eddf182ba28d4e695fe1dbcae5b5b029218cb44"; - sha256 = "1s9idnbj3613ldgrysp4iscd1xnrfdcgdhygfzhhsv0a0lrm40xa"; + rev = "aace5c23d812a205c93e87ff79df72d9366928df"; + sha256 = "1saz5m3c329m2vk8ffhvxw4virz70k2qrjncwhvjpkik27jf75yy"; }; dependencies = []; }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2017-02-08"; + name = "vim-easy-align-2017-06-03"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9"; - sha256 = "0nqvzxr2i9jsyx1qhspf636q0j4b0d8y98yqhxklcpq18ap442zp"; + rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; + sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; }; dependencies = []; @@ -2190,11 +2328,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2017-02-22"; + name = "vim-gitgutter-2017-06-08"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "1c034be0d31168c8f4770ef7b69adb67d00d6f3d"; - sha256 = "1wj084frahj80h1nkllmpf0qj06d96a5m5qclnd3fc2aqclcimx0"; + rev = "dcac1f74ee5c26125363dca164463bde6657c838"; + sha256 = "0knkdv0sbdwf4p82g438l7pylwzxfbxcj44np3v15wr97w95wmlv"; }; dependencies = []; @@ -2212,66 +2350,66 @@ rec { }; vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2016-03-16"; + name = "vim-latex-live-preview-2017-07-19"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "99501642c1dd3f703ac6301ae13469f4990b7a06"; - sha256 = "0dkm3v1jqi8aq0jfpa6fdwgbfbwidc32ci1y9vhqb1prs15qrqfl"; + rev = "172b03cd0677f1fe55abeab86fa4a4c484e4c3b5"; + sha256 = "1wgnq1kbx80xqwm9rx3z4i9fldj965046s4hh62rdi5585hh6aps"; }; dependencies = []; }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2016-06-03"; + name = "vim-multiple-cursors-2017-06-02"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "51d0717f63cc231f11b4b63ee5b611f589dce1b3"; - sha256 = "1s06wp4cjdmfvljzd9gz0wawkfcpkj8l2scjdx626ml740pnhmx8"; + rev = "3afc475cc64479a406ce73d3333df1f67db3c73f"; + sha256 = "04dijb4hgidypppphcy83bacmfrd9ikyjc761hqq6bl4kc49f5kc"; }; dependencies = []; }; 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 = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2017-03-02"; + name = "vim-signify-2017-07-19"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "b4c516cd63f04c08bfc6a8eb27a971702d849f33"; - sha256 = "108vlkrv00b6ldj4r972k3z2a3dfcs1z4788dhnx81k25rax42k4"; + rev = "748cb0ddab1b7e64bb81165c733a7b752b3d36e4"; + sha256 = "0kc4nbf3a7ab0an4r1j37bvzjarr4135qqhkz348r7zdhmqkyyfm"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2017-03-01"; + name = "vim-snippets-2017-07-07"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "9a2379be7698ff83985eebb394b7a9f99560a77f"; - sha256 = "0c7gicl9m05m7wb846vbd1i7ginkm5k4rvcvcvhc9x7krn5qg64q"; + rev = "0817950a4fb8ccd48ec38a2b65cf046b597eecb3"; + sha256 = "0hxd96zl5gjkx5d381yzyrbahwbz3r9dljzn2cxbdbjsb7im6aks"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2017-02-25"; + name = "vim-webdevicons-2017-05-29"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "d246037d0da70d80be9699487a95f913316a4c76"; - sha256 = "0bps527fhhgp06yswxx6rdmrycckm4hzacmrwzll85xg8cqcjwh2"; + rev = "153266275acc4f4615407a18e90f58780ebaef92"; + sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn"; }; dependencies = []; @@ -2289,33 +2427,33 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2017-03-01"; + name = "vimwiki-2017-07-15"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "56cb06e73e9850e60b6eb53bad8bb98ded1ab872"; - sha256 = "1s9nppmgkr5v6ljc918qivlyzp491vnyn3cc4k3cqd1ly2ymxv48"; + rev = "976cbbcd23dcd19ddb5dc5544645da8a51dbdfe6"; + sha256 = "1mna3qavwj1jcjnvmw8hngrfccpk5krj2z0v2grp97i9m2kmkifx"; }; dependencies = []; }; vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vinegar-2016-06-30"; + name = "vinegar-2017-06-27"; src = fetchgit { url = "git://github.com/tpope/vim-vinegar"; - rev = "bd7f7b7929260072864462c04dde3b9f4c5e0d23"; - sha256 = "09shzlc9dagqlb5558nvm33b4bkk9cy34kp7zgnybphyy72wf31h"; + rev = "c795cb739347cbddeeb288c3c35da9f140a513c9"; + sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3"; }; dependencies = []; }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2017-02-24"; + name = "vundle-2017-06-08"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "f6cc06238d5ac888ddfc514f80392f44cb2e21ac"; - sha256 = "00qd5nalac7q83dx779547s6dwn952adj2w3j1sgdgaybjwmsrl2"; + rev = "6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87"; + sha256 = "13k194g0rs5hz7ci0ys4gml71jily5hdd0yljzmmn8qjiq88v6p4"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f5f3f9556577..10630636b89a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,7 +1,6 @@ "CSApprox" "CheckAttach" "Gist" -"gruvbox" "Hoogle" "Solarized" "Supertab" @@ -16,8 +15,8 @@ "YankRing" "clang_complete" "commentary" -"ctrlp-py-matcher" "ctrlp-cmatcher" +"ctrlp-py-matcher" "ctrlp-z" "extradite" "fugitive" @@ -28,11 +27,13 @@ "github:Quramy/tsuquyomi" "github:Shougo/deoplete.nvim" "github:ajh17/Spacegray.vim" +"github:albfan/nerdtree-git-plugin" "github:alvan/vim-closetag" "github:ap/vim-css-color" "github:bbchung/clighter8" "github:benekastah/neomake" "github:bitc/vim-hdevtools" +"github:bronson/vim-trailing-whitespace" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" @@ -40,19 +41,23 @@ "github:derekelkins/agda-vim" "github:derekwyatt/vim-scala" "github:digitaltoad/vim-jade" +"github:dleonard0/pony-vim-syntax" "github:dracula/vim" "github:eagletmt/neco-ghc" +"github:editorconfig/editorconfig-vim" "github:eikenb/acp" "github:elixir-lang/vim-elixir" "github:elmcast/elm-vim" "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" +"github:ensime/ensime-vim" "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" "github:flazz/vim-colorschemes" "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" "github:google/vim-jsonnet" +"github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" @@ -63,6 +68,7 @@ "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" +"github:jiangmiao/auto-pairs" "github:jistr/vim-nerdtree-tabs" "github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" @@ -80,13 +86,18 @@ "github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" "github:machakann/vim-highlightedyank" +"github:martinda/Jenkinsfile-vim-syntax" +"github:megaannum/forms" +"github:megaannum/self" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" +"github:mileszs/ack.vim" "github:mkasa/lushtags" "github:mpickering/hlint-refactor-vim" "github:nathanaelkane/vim-indent-guides" "github:nbouscal/vim-stylish-haskell" "github:neovimhaskell/haskell-vim" +"github:nixprime/cpsm" "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-watchdogs" "github:plasticboy/vim-markdown" @@ -94,8 +105,10 @@ "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" "github:rhysd/vim-grammarous" +"github:rodjek/vim-puppet" "github:rust-lang/rust.vim" "github:sbdchd/neoformat" +"github:sebastianmarkow/deoplete-rust" "github:sheerun/vim-polyglot" "github:shougo/neco-vim" "github:shougo/neocomplete.vim" @@ -126,19 +139,22 @@ "github:vim-scripts/Rename" "github:vim-scripts/ReplaceWithRegister" "github:vim-scripts/a.vim" -"github:vim-scripts/argtextobj.vim" "github:vim-scripts/align" +"github:vim-scripts/argtextobj.vim" "github:vim-scripts/changeColorScheme.vim" "github:vim-scripts/random.vim" "github:vim-scripts/tabmerge" "github:vim-scripts/wombat256.vim" +"github:w0rp/ale" "github:wakatime/vim-wakatime" "github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" -"github:zchee/deoplete-jedi" +"github:zah/nim.vim" "github:zchee/deoplete-go" +"github:zchee/deoplete-jedi" "goyo" +"gruvbox" "matchit.zip" "pathogen" "quickfixstatus" @@ -187,7 +203,3 @@ "vimwiki" "vinegar" "vundle" -"github:jiangmiao/auto-pairs" -"github:editorconfig/editorconfig-vim" -"github:heavenshell/vim-jsdoc" -"github:nixprime/cpsm" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 141dde927626..87b2f9d3e188 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -150,6 +150,10 @@ vim_with_plugins can be installed like any other application within Nix. let inherit (stdenv) lib; + toNames = x: + if builtins.isString x then [x] + else (lib.optional (x ? name) x.name) + ++ (x.names or []); findDependenciesRecursively = {knownPlugins, names}: let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or []; @@ -211,11 +215,6 @@ let (let knownPlugins = vam.knownPlugins or vimPlugins; - toNames = x: - if builtins.isString x then [x] - else (lib.optional (x ? name) x.name) - ++ (x.names or []); - names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; }; # Vim almost reads JSON, so eventually JSON support should be added to Nix @@ -412,6 +411,24 @@ rec { configurePhase =":"; } // a); + requiredPlugins = { + givenKnownPlugins ? null, + vam ? null, + pathogen ? null, ... + }: + let + # This is probably overcomplicated, but I don't understand this well enough to know what's necessary. + knownPlugins = if givenKnownPlugins != null then givenKnownPlugins else + if vam != null && vam ? knownPlugins then vam.knownPlugins else + if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else + vimPlugins; + pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; }); + vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; }; + names = (lib.optionals (pathogen != null) pathogenNames) ++ + (lib.optionals (vam != null) vamNames); + in + map (name: knownPlugins.${name}) names; + # test cases: test_vim_with_vim_addon_nix_using_vam = vim_configurable.customize { name = "vim-with-vim-addon-nix-using-vam"; @@ -427,5 +444,4 @@ rec { name = "vim-with-vim-addon-nix"; vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ]; }; - } diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete index 64e064e2a460..ed88e08742ed 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete @@ -1,3 +1,10 @@ + # In addition to the arguments you pass to your compiler, you also need to + # specify the path of the C++ std header (if you are using C++). + # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). + # The linked ruby code shows generates the required '.clang_complete' for cmake based projects + # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 + # as an alternative you can execute the following command: + # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t index a29c602b5d7e..5c96e11de7a7 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t @@ -1,7 +1,6 @@ - buildInputs = [ perl ruby ]; + buildInputs = [ perl ruby git ]; buildPhase = '' pushd ruby/command-t - ruby extconf.rb - make + gem build ./command-t.gemspec popd ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim new file mode 100644 index 000000000000..7d6267e95151 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim @@ -0,0 +1 @@ + pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index b7ab6c9a0fec..9ad37f3a63d7 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Displays text on your screen"; homepage = http://sourceforge.net/projects/libxosd; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 1148fe5c4a16..73126ce1f5c1 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,17 +1,30 @@ -{ stdenv, fetchurl, xar, gzip, cpio, pkgs }: +{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }: let + # TODO: make this available to other packages and generalize the unpacking a bit + # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d + # This isn't needed until we get to SDK 10.11, but that presents other challenges + # unpbzx = fetchurl { + # url = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py"; + # sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc"; + # }; + # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { - version = "10.9"; + version = "10.10"; name = "MacOS_SDK-${version}"; + # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.10.merged-1.sucatalog, which we found by: + # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version + # 2. In the resulting file, search for a file called DevSDK ending in .pkg + # 3. ??? + # 4. Profit src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg"; - sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; + url = "http://swcdn.apple.com/content/downloads/22/52/031-45139/hcjjv7cm4n6yqk56ict73qqw15ikm5iaql/DevSDK_OSX1010.pkg"; + sha256 = "08bxa93zw7r4vzs28j9giq2qyk3b68ky6jx1bb9850gflr3nvgq1"; }; - buildInputs = [ xar gzip cpio ]; + buildInputs = [ xar xz cpio python ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -114,11 +127,15 @@ let popd >/dev/null } + linkFramework "${name}.framework" ''; propagatedBuildInputs = deps; + # don't use pure CF for dylibs that depend on frameworks + setupHook = ../../../build-support/setup-hooks/fix-darwin-frameworks.sh; + # allows building the symlink tree __impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ]; @@ -140,6 +157,7 @@ in rec { mkdir -p $out/include pushd $out/include >/dev/null ln -s "${sdk}/include/xpc" + ln -s "${sdk}/include/launch.h" popd >/dev/null ''; }; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 9a3c3c556e3b..5475b6641707 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -52,6 +52,7 @@ with frameworks; with libs; { GSS = []; GameController = []; GameKit = [ Foundation ]; + Hypervisor = []; ICADevices = [ Carbon CF IOBluetooth ]; IMServicePlugIn = []; IOBluetoothUI = [ IOBluetooth ]; @@ -117,4 +118,6 @@ with frameworks; with libs; { OpenDirectory = []; Quartz = [ QuickLook QTKit ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; + + vmnet = []; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch deleted file mode 100644 index 46c230cfd1de..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- CF-855.17/CFRuntime.c 2014-11-26 21:29:48.000000000 -0800 -+++ CF-855.17/CFRuntime.c.new 2014-11-26 21:30:01.000000000 -0800 -@@ -756,6 +756,7 @@ - extern void __CFErrorInitialize(void); - extern void __CFTreeInitialize(void); - extern void __CFURLInitialize(void); -+extern void __CFPreferencesDomainInitialize(void); - #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI - extern void __CFMachPortInitialize(void); - #endif -@@ -1015,6 +1016,7 @@ - __CFErrorInitialize(); - __CFTreeInitialize(); - __CFURLInitialize(); -+ __CFPreferencesDomainInitialize(); - - #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS - __CFBundleInitialize(); diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix index 3993a360156a..e44966aa84d6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix @@ -1,12 +1,12 @@ -{ stdenv, appleDerivation, icu, dyld, libdispatch, launchd, libclosure }: +{ stdenv, appleDerivation, ICU, dyld, libdispatch, libplatform, launchd, libclosure }: # this project uses blocks, a clang-only extension assert stdenv.cc.isClang; appleDerivation { - buildInputs = [ dyld icu libdispatch launchd libclosure ]; + buildInputs = [ dyld ICU libdispatch libplatform launchd libclosure ]; - patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ]; + patches = [ ./add-cfmachport.patch ./cf-bridging.patch ./remove-xpc.patch ]; __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ]; @@ -19,7 +19,6 @@ appleDerivation { --replace "/bin/" "" \ --replace "INSTALLNAME=/System" "INSTALLNAME=$out" \ --replace "install_name_tool -id /System" "install_name_tool -id $out" \ - --replace "-licucore.A" "-licui18n -licuuc" \ --replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \ --replace 'chmod -RH' 'chmod -R' diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch new file mode 100644 index 000000000000..a7b9fe486434 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch @@ -0,0 +1,17 @@ +diff --git a/CFBundlePriv.h b/CFBundlePriv.h +index d4feb5f..e7b52e8 100644 +--- a/CFBundlePriv.h ++++ b/CFBundlePriv.h +@@ -254,12 +254,6 @@ Boolean _CFBundleGetStringsFilesShared(CFBundleRef bundle); + CF_EXPORT + CFURLRef _CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath); + +-#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE) +-#include +-CF_EXPORT +-void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap) CF_AVAILABLE(10_10, 8_0); +-#endif +- + /* Functions deprecated as SPI */ + + CF_EXPORT diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix new file mode 100644 index 000000000000..a9d06fc9dbc3 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -0,0 +1,22 @@ +{ stdenv, cctools, appleDerivation }: + +appleDerivation { + buildInputs = [ cctools ]; + + postPatch = '' + substituteInPlace makefile \ + --replace /usr/bin/ "" \ + --replace '$(ISYSROOT)' "" \ + --replace 'shell xcodebuild -version -sdk' 'shell true' \ + --replace 'shell xcrun -sdk $(SDKPATH) -find' 'shell echo' \ + --replace '-install_name $(libdir)' "-install_name $out/lib/" \ + --replace /usr/local/bin/ /bin/ \ + --replace /usr/lib/ /lib/ \ + ''; + + makeFlags = [ "DSTROOT=$(out)" ]; + + postInstall = '' + mv $out/usr/local/include $out/include + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 92c54d9b679e..e3583b3bf84a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile, - removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, libutil, version }: + removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; @@ -19,7 +19,7 @@ appleDerivation rec { for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ - ${Libnotify} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do + ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) done @@ -76,7 +76,11 @@ appleDerivation rec { /usr/lib/libSystem.dylib \ -reexported_symbols_list ${./system_symbols} - libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') + # We used to determine these impurely based on the host system, but then when we got some 10.12 Hydra boxes, + # one of them accidentally built this derivation, referenced libsystem_symptoms.dylib, which doesn't exist on + # 10.11, and then broke all subsequent builds on 10.11. By picking a 10.11 compatible subset of the libraries, + # we avoid scary impurity issues like that. + libs=$(cat ${./reexported_libraries} | grep -v '^#') for i in $libs; do if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries new file mode 100644 index 000000000000..00aaba1d4982 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries @@ -0,0 +1,41 @@ +# These are generated with otool -L /usr/lib/libSystem.dylib on a 10.11 machine +/usr/lib/system/libcache.dylib +/usr/lib/system/libcommonCrypto.dylib +/usr/lib/system/libcompiler_rt.dylib +/usr/lib/system/libcopyfile.dylib +/usr/lib/system/libcorecrypto.dylib +/usr/lib/system/libdispatch.dylib +/usr/lib/system/libdyld.dylib +/usr/lib/system/libkeymgr.dylib +/usr/lib/system/liblaunch.dylib +/usr/lib/system/libmacho.dylib +/usr/lib/system/libquarantine.dylib +/usr/lib/system/libremovefile.dylib +/usr/lib/system/libsystem_asl.dylib +/usr/lib/system/libsystem_blocks.dylib + +# We handle this specially in the expression +# /usr/lib/system/libsystem_c.dylib + +/usr/lib/system/libsystem_configuration.dylib +/usr/lib/system/libsystem_coreservices.dylib +/usr/lib/system/libsystem_coretls.dylib +/usr/lib/system/libsystem_dnssd.dylib +/usr/lib/system/libsystem_info.dylib + +# We handle this specially in the expression +# /usr/lib/system/libsystem_kernel.dylib + +/usr/lib/system/libsystem_m.dylib +/usr/lib/system/libsystem_malloc.dylib +/usr/lib/system/libsystem_network.dylib +/usr/lib/system/libsystem_networkextension.dylib +/usr/lib/system/libsystem_notify.dylib +/usr/lib/system/libsystem_platform.dylib +/usr/lib/system/libsystem_pthread.dylib +/usr/lib/system/libsystem_sandbox.dylib +/usr/lib/system/libsystem_secinit.dylib +/usr/lib/system/libsystem_trace.dylib +/usr/lib/system/libunc.dylib +/usr/lib/system/libunwind.dylib +/usr/lib/system/libxpc.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 29a0658d4388..a8509d1f0095 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -30,6 +30,7 @@ let # is the right one, even though it isn't. The version I have here doesn't appear to be linked # to any OS releases, but Apple also doesn't mention mDNSResponder from 10.11 to 10.11.6, and # neither of those versions are publicly available. + libplatform = "125"; mDNSResponder = "625.41.2"; libutil = "43"; @@ -47,6 +48,9 @@ let }; "osx-10.10.5" = { adv_cmds = "158"; + CF = "1153.18"; + ICU = "531.48"; + libdispatch = "442.1.4"; Security = "57031.40.6"; IOAudioFamily = "203.3"; @@ -66,11 +70,9 @@ let IOKitUser = "1050.20.2"; }; "osx-10.9.5" = { - CF = "855.17"; launchd = "842.92.1"; libauto = "185.5"; Libc = "997.90.3"; # We use this, but not from here - libdispatch = "339.92.1"; Libsystem = "1197.1.1"; Security = "55471.14.18"; security_dotmac_tp = "55107.1"; @@ -189,7 +191,7 @@ let bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; - CF = applePackage "CF" "osx-10.9.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {}; + CF = applePackage "CF" "osx-10.10.5" "07f5psjxi7wyd13ci4x83ya5hy6p69sjfqcpp2mmxdlhd8yzkf74" {}; CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {}; configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {}; @@ -197,6 +199,7 @@ let dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; + ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; @@ -208,11 +211,12 @@ let }; Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; libclosure = applePackage "libclosure" "osx-10.11.6" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; - libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; + libdispatch = applePackage "libdispatch" "osx-10.10.5" "0jsfbzp87lwk9snlby0hd4zvj7j894p5q3cw0wdx9ny1mcp3kdcj" {}; libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {}; Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; Libnotify = applePackage "Libnotify" "osx-10.11.6" "0zbcyxlcfhf91jxczhd5bq9qfgvg494gwwp3l7q5ayb2qdihzr8b" {}; + libplatform = applePackage "libplatform" "osx-10.11.6" "1v4ik6vlklwsi0xb1g5kmhy29j9xk5m2y8xb9zbi1k4ng8x39czk" {}; libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix index 2003bb6e55e4..7d6ab403a47a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix @@ -13,7 +13,8 @@ appleDerivation { --replace "#include " ''$'#include \nstatic void msgtracer_log_with_keys(...) { };' substituteInPlace Definitions.h \ - --replace "#include " "" + --replace "#include " "" \ + --replace 'void * const, void * const' 'void * const, void *' # getspecific_direct is more efficient, but this should be equivalent... substituteInPlace Zone.h \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index fe65e2907170..c80e37575697 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -6,8 +6,11 @@ appleDerivation { installPhase = '' mkdir -p $out/include/dispatch $out/include/os - cp -r dispatch/*.h $out/include/dispatch + # Move these headers so CF can find + mv private/voucher*.h $out/include/os cp -r private/*.h $out/include/dispatch + + cp -r dispatch/*.h $out/include/dispatch cp -r os/object*.h $out/include/os ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix new file mode 100644 index 000000000000..65accc870d71 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -0,0 +1,10 @@ +{ stdenv, appleDerivation }: + +appleDerivation { + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir $out + cp -r include $out/include + ''; +} 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 04b1e2f21fe1..1018100ba9c5 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 d2f15e19ccf0..c5e9418ce913 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 ab11d893d198..a1c3204c15a4 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 b0c35f0e30c3..b2dbb75f2971 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 6f2436f21496..26515353b730 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 d9b594bc47ca..aa73c281cab2 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 25701442d2b7..81551e9a76ef 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 f84c2d8963fc..b225d062dc94 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 9de1d120cc94..8dae60724137 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 d311f6783374..48bb80eb7511 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 b4b2b6858952..bd219ae434c0 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 c4ccdb94b812..933e7558dbbf 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,11 +1,26 @@ -{ stdenv, binutils-raw, cctools }: +{ stdenv, binutils-raw, cctools +, hostPlatform, targetPlatform +}: +# 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" + ]; +in + +# TODO loop over prefixed binaries too stdenv.mkDerivation { - name = "cctools-binutils-darwin"; + name = "${prefix}cctools-binutils-darwin"; buildCommand = '' mkdir -p $out/bin $out/include - ln -s ${binutils-raw.out}/bin/c++filt $out/bin/c++filt + ln -s ${binutils-raw.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt # We specifically need: # - ld: binutils doesn't provide it on darwin @@ -18,11 +33,11 @@ stdenv.mkDerivation { # - strip: the binutils one seems to break mach-o files # - lipo: gcc build assumes it exists # - nm: the gnu one doesn't understand many new load commands - for i in ar ranlib as dsymutil install_name_tool ld strip otool lipo nm strings size; do + for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: prefix + e) cmds)}; do ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - for i in ${binutils-raw.dev}/include/*.h; do + for i in ${binutils-raw.dev or binutils-raw.out}/include/*.h; do ln -s "$i" "$out/include/$(basename $i)" done @@ -36,4 +51,8 @@ stdenv.mkDerivation { ln -s ${cctools}/libexec $out/libexec ''; + + passthru = { + inherit prefix; + }; } diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch deleted file mode 100644 index 9aae2be1d033..000000000000 --- a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp -index 09c0e12..ac6b085 100644 ---- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp -+++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp -@@ -187,6 +187,7 @@ struct DynamicLibrary { - ld::File::ObjcConstraint _objcConstraint; - Options::Platform _platform; - std::vector _allowedClients; -+ std::vector _allowableClients; - std::vector _reexportedLibraries; - std::vector _symbols; - std::vector _classes; -@@ -246,6 +247,14 @@ class TBDFile { - }); - } - -+ void parseAllowableClients(DynamicLibrary& lib) { -+ if ( !hasOptionalToken("allowable-clients") ) -+ return; -+ parseFlowSequence([&](Token name) { -+ lib._allowableClients.emplace_back(name); -+ }); -+ } -+ - void parseReexportedDylibs(DynamicLibrary& lib) { - if ( !hasOptionalToken("re-exports") ) - return; -@@ -306,6 +315,21 @@ class TBDFile { - return false; - } - -+ void skipUUIDs(DynamicLibrary& lib) { -+ expectToken("uuids"); -+ while ( true ) { -+ auto token = next(); -+ if ( token == "]" ) -+ break; -+ } -+ } -+ -+ void skipParentUmbrella(DynamicLibrary& lib) { -+ if (!hasOptionalToken("parent-umbrella")) -+ return; -+ next(); -+ } -+ - void parsePlatform(DynamicLibrary& lib) { - expectToken("platform"); - -@@ -410,6 +434,7 @@ class TBDFile { - } - - parseAllowedClients(lib); -+ parseAllowableClients(lib); - parseReexportedDylibs(lib); - parseSymbols(lib); - if ( !hasOptionalToken("-") ) -@@ -455,17 +480,21 @@ class TBDFile { - return result.front(); - } - -- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { -+ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { - auto selectedArchName = parseAndSelectArchitecture(requestedArchName); - if (selectedArchName.empty()) - throwf("invalid arch"); - -+ if(isTbdV2) -+ skipUUIDs(lib); - parsePlatform(lib); - parseInstallName(lib); - parseCurrentVersion(lib); - parseCompatibilityVersion(lib); - parseSwiftVersion(lib); - parseObjCConstraint(lib); -+ if(isTbdV2) -+ skipParentUmbrella(lib); - parseExportsBlock(lib, selectedArchName); - } - -@@ -476,7 +505,8 @@ public: - _tokenizer.reset(); - DynamicLibrary lib; - expectToken("---"); -- parseDocument(lib, requestedArchName); -+ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); -+ parseDocument(lib, requestedArchName, isTbdV2); - expectToken("..."); - return lib; - } -@@ -486,6 +516,7 @@ public: - auto token = next(); - if ( token != "---" ) - return false; -+ hasOptionalToken("!tapi-tbd-v2"); - return !parseAndSelectArchitecture(requestedArchName).empty(); - } - diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 202426e78726..9fdb00d66be9 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,18 +1,32 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2 +{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2 , llvm, libcxx, libcxxabi, clang, libuuid -, libobjc ? null +, libobjc ? null, maloader ? null, xctoolchain ? null +, 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}-"; +in + +assert targetPlatform.isDarwin; + +# Non-Darwin alternatives +assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null); + let baseParams = rec { - name = "cctools-port-${version}"; - version = "886"; + name = "${prefix}cctools-port-${version}"; + version = "895"; src = fetchFromGitHub { owner = "tpoechtrager"; repo = "cctools-port"; - rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; - sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; + rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 + sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; }; buildInputs = [ autoconf automake libtool_2 libuuid ] ++ @@ -22,15 +36,15 @@ let patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. - ./undo-unknown-triple.patch - ./ld-tbd-v2.patch ]; enableParallelBuilding = true; - configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ "CXXFLAGS=-I${libcxx}/include/c++/v1" ]; + # 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" + ]; postPatch = '' sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp @@ -73,33 +87,30 @@ let popd ''; + postInstall = + if hostPlatform.isDarwin + then '' + cat >$out/bin/dsymutil << EOF + #!${stdenv.shell} + EOF + chmod +x $out/bin/dsymutil + '' + else '' + for tool in dyldinfo dwarfdump dsymutil; do + ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${targetPlatform.config}-$tool" \ + --add-flags "${xctoolchain}/bin/$tool" + ln -s "$out/bin/${targetPlatform.config}-$tool" "$out/bin/$tool" + done + ''; + + passthru = { + inherit prefix; + }; + meta = { homepage = "http://www.opensource.apple.com/source/cctools/"; description = "Mac OS X Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; }; }; -in { - native = stdenv.mkDerivation (baseParams // { - # A hack for now... - postInstall = '' - cat >$out/bin/dsymutil << EOF - #!${stdenv.shell} - EOF - chmod +x $out/bin/dsymutil - ''; - }); - - cross = - { cross, maloader, makeWrapper, xctoolchain}: stdenv.mkDerivation (baseParams // { - configureFlags = baseParams.configureFlags ++ [ "--target=${cross.config}" ]; - - postInstall = '' - for tool in dyldinfo dwarfdump dsymutil; do - ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${cross.config}-$tool" \ - --add-flags "${xctoolchain}/bin/$tool" - ln -s "$out/bin/${cross.config}-$tool" "$out/bin/$tool" - done - ''; - }); -} +in stdenv.mkDerivation baseParams diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch deleted file mode 100644 index 7df9bdd16dab..000000000000 --- a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cctools/as/driver.c b/cctools/as/driver.c -index b06d085..c03397a 100644 ---- a/cctools/as/driver.c -+++ b/cctools/as/driver.c -@@ -363,12 +363,6 @@ char **envp) - /* Add -c or clang will run ld(1). */ - new_argv[j] = "-c"; - j++; -- /* cctools-port start */ -- new_argv[j] = "-target"; -- j++; -- new_argv[j] = "unknown-apple-darwin"; -- j++; -- /* cctools-port end */ - new_argv[j] = NULL; - if(execute(new_argv, verbose)) - exit(0); diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix deleted file mode 100644 index 2d1eb7b6b3ca..000000000000 --- a/pkgs/os-specific/darwin/command-line-tools/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, xar, gzip, cpio }: - -let - pkg = { name, sha256 }: stdenv.mkDerivation { - inherit name; - - src = fetchurl { - # Magic url found in: - # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog - url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg"; - inherit sha256; - }; - - buildInputs = [ xar gzip cpio ]; - - phases = [ "unpackPhase" "installPhase" ]; - - unpackPhase = '' - xar -x -f $src - ''; - - installPhase = '' - start="$(pwd)" - mkdir -p $out - cd $out - cat $start/Payload | gzip -d | cpio -idm - ''; - - meta = with stdenv.lib; { - description = "Apple developer tools ${name}"; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.darwin; - }; - }; -in rec { - tools = pkg { - name = "CLTools_Executables_OSX109"; - sha256 = "1cjdnnjny6h0dc1cc994pgrkmsa5cvk7pi5dpkxyslyicwf260fx"; - }; - - sdk = pkg { - name = "DevSDK_OSX109"; - sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; - }; -} diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix deleted file mode 100644 index 581eb31cc71c..000000000000 --- a/pkgs/os-specific/darwin/install_name_tool/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "install_name_tool"; - src = "/usr/bin/install_name_tool"; - - unpackPhase = "true"; - dontBuild = true; - - installPhase = '' - mkdir -p "$out"/bin - ln -s "$src" "$out"/bin - ''; - - meta = with stdenv.lib; { - description = "Change dynamic shared library install names"; - homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.darwin; - - longDescription = '' - Install_name_tool changes the dynamic shared library install names and or - adds, changes or deletes the rpaths recorded in a Mach-O binary. - ''; - }; -} - diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index 7de7d291289f..f56c8148317d 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -6,6 +6,9 @@ , stdenv , coreutils , gnugrep +, buildPackages +, hostPlatform +, targetPlatform }: /* As of this writing, known-good prefix/arch/simulator triples: @@ -15,21 +18,26 @@ * x86_64-apple-darwin14 | x86_64 | true */ -{ prefix, arch, simulator ? false }: let +let + + prefix = targetPlatform.config; + inherit (targetPlatform) arch; + simulator = targetPlatform.isiPhoneSimulator or false; + sdkType = if simulator then "Simulator" else "OS"; sdkVer = "10.2"; 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 @@ -43,27 +51,6 @@ # 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 < Date: Sat, 28 Jan 2017 16:57:26 -0400 Subject: [PATCH 1/4] disable firmware copy @@ -8,7 +8,7 @@ Subject: [PATCH 1/4] disable firmware copy 1 file changed, 5 deletions(-) diff --git a/pre-build.sh b/pre-build.sh -index 25e718f..e3cd009 100755 +index 622ff13..e3cd009 100755 --- a/pre-build.sh +++ b/pre-build.sh @@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \ @@ -18,8 +18,8 @@ index 25e718f..e3cd009 100755 - -FW_DIR="/lib/firmware/$KERNELVER" -mkdir -p $FW_DIR --cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/radeon $FW_DIR --cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/amdgpu $FW_DIR +-cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/radeon $FW_DIR +-cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/amdgpu $FW_DIR -- -2.11.0 +2.12.2 diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch index 86dbea29e08a..aa6cbcc118dc 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch @@ -1,63 +1,31 @@ -From 52e47be93c7a492730477f590e5eb42e035018bd Mon Sep 17 00:00:00 2001 +From 0ead7017e1db18be971c24c891d4bdcc507deea7 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 29 Jan 2017 18:23:47 -0400 Subject: [PATCH 2/4] linux-4.9 fixes --- - amd/amdgpu/amdgpu_connectors.c | 8 ++++++++ - amd/amdgpu/amdgpu_ttm.c | 4 ++++ + amd/amdkcl/kcl_io.c | 2 ++ amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++ - include/kcl/kcl_mm.h | 4 +++- - 4 files changed, 23 insertions(+), 1 deletion(-) + 2 files changed, 10 insertions(+) -diff --git a/amd/amdgpu/amdgpu_connectors.c b/amd/amdgpu/amdgpu_connectors.c -index 1b51981..4b43379 100644 ---- a/amd/amdgpu/amdgpu_connectors.c -+++ b/amd/amdgpu/amdgpu_connectors.c -@@ -168,12 +168,20 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector) - } - - /* Any defined maximum tmds clock limit we must not exceed? */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+ if (connector->display_info.max_tmds_clock > 0) { -+#else - if (connector->max_tmds_clock > 0) { -+#endif - /* mode_clock is clock in kHz for mode to be modeset on this connector */ - mode_clock = amdgpu_connector->pixelclock_for_modeset; - - /* Maximum allowable input clock in kHz */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+ max_tmds_clock = connector->display_info.max_tmds_clock * 1000; -+#else - max_tmds_clock = connector->max_tmds_clock * 1000; -+#endif - - DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n", - connector->name, mode_clock, max_tmds_clock); -diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c -index 447529d..252bab4 100644 ---- a/amd/amdgpu/amdgpu_ttm.c -+++ b/amd/amdgpu/amdgpu_ttm.c -@@ -255,7 +255,11 @@ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp) - - if (amdgpu_ttm_tt_get_usermm(bo->ttm)) - return -EPERM; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+ return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp->private_data); -+#else - return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp); -+#endif +diff --git a/amd/amdkcl/kcl_io.c b/amd/amdkcl/kcl_io.c +index d8f843f..9a1bd9b 100644 +--- a/amd/amdkcl/kcl_io.c ++++ b/amd/amdkcl/kcl_io.c +@@ -31,4 +31,6 @@ void amdkcl_io_init(void) + _kcl_io_free_memtype = amdkcl_fp_setup("io_free_memtype", NULL); } - - static void amdgpu_move_null(struct ttm_buffer_object *bo, + #endif ++#else ++void amdkcl_io_init(void) {} + #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */ diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c -index be7aafb..5e11f26 100644 +index 34313a9..44a4a71 100644 --- a/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c -@@ -1692,6 +1692,10 @@ static int dm_plane_helper_prepare_fb( +@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb( + static int dm_plane_helper_prepare_fb( struct drm_plane *plane, - struct drm_framebuffer *fb, const struct drm_plane_state *new_state) +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) +static int dm_plane_helper_prepare_fb( @@ -66,9 +34,9 @@ index be7aafb..5e11f26 100644 #else static int dm_plane_helper_prepare_fb( struct drm_plane *plane, -@@ -1735,6 +1739,10 @@ static void dm_plane_helper_cleanup_fb( +@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb( + static void dm_plane_helper_cleanup_fb( struct drm_plane *plane, - struct drm_framebuffer *fb, const struct drm_plane_state *old_state) +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) +static void dm_plane_helper_cleanup_fb( @@ -77,21 +45,6 @@ index be7aafb..5e11f26 100644 #else static void dm_plane_helper_cleanup_fb( struct drm_plane *plane, -diff --git a/include/kcl/kcl_mm.h b/include/kcl/kcl_mm.h -index a18936d..f068195 100644 ---- a/include/kcl/kcl_mm.h -+++ b/include/kcl/kcl_mm.h -@@ -8,7 +8,9 @@ static inline int kcl_get_user_pages(struct task_struct *tsk, struct mm_struct * - int write, int force, struct page **pages, - struct vm_area_struct **vmas) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+ return get_user_pages(start, nr_pages, write ? FOLL_WRITE : 0, pages, vmas); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) - return get_user_pages(start, nr_pages, write, force, pages, vmas); - #else - return get_user_pages(tsk, mm, start, nr_pages, -- -2.11.0 +2.12.2 diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch index 6856b9ae0921..7a11c9bd4ef5 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch @@ -1,4 +1,4 @@ -From cc490c71a98b6bbe390fcf777fbe0360d01bf4ca Mon Sep 17 00:00:00 2001 +From b6dd36dd90c5d88ae10b9dbc763d3bacb95ccddb Mon Sep 17 00:00:00 2001 From: "Luke A. Guest" Date: Sun, 25 Sep 2016 16:46:39 +0100 Subject: [PATCH 3/4] Change seq_printf format for 64 bit context @@ -8,18 +8,18 @@ Subject: [PATCH 3/4] Change seq_printf format for 64 bit context 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c -index c43f582..8c4b9f7 100644 +index 74932bf..db4119a 100644 --- a/amd/amdgpu/amdgpu_sa.c +++ b/amd/amdgpu/amdgpu_sa.c -@@ -427,7 +427,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, +@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, soffset, eoffset, eoffset - soffset); if (i->fence) -#if defined(BUILD_AS_DKMS) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) seq_printf(m, " protected by 0x%08x on context %d", - i->fence->seqno, i->fence->context); + i->fence->seqno, i->fence->context); #else -- -2.11.0 +2.12.2 diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch index d226504c4e46..cd360e18faac 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch @@ -1,30 +1,15 @@ -From 9970f3107aed7b2b1ff1c5f29129b62cec99980d Mon Sep 17 00:00:00 2001 +From dbf01d3934c52acaaa37f008859f69c5edf19ad5 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 6 Feb 2017 22:13:49 -0400 Subject: [PATCH 4/4] fix warnings for Werror --- - amd/amdgpu/amdgpu_kms.c | 2 +- amd/amdgpu/amdgpu_ttm.c | 2 ++ - amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +- - 4 files changed, 5 insertions(+), 3 deletions(-) + 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/amd/amdgpu/amdgpu_kms.c b/amd/amdgpu/amdgpu_kms.c -index b7b51ae..bc884f6 100644 ---- a/amd/amdgpu/amdgpu_kms.c -+++ b/amd/amdgpu/amdgpu_kms.c -@@ -591,7 +591,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file - - bios = adev->bios + bios_offset; - return copy_to_user(out, bios, -- min((size_t)size, bios_size - bios_offset)) -+ min(size, bios_size - bios_offset)) - ? -EFAULT : 0; - } - default: diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c -index 252bab4..90f3655 100644 +index 0e30389..890aafa 100644 --- a/amd/amdgpu/amdgpu_ttm.c +++ b/amd/amdgpu/amdgpu_ttm.c @@ -1083,6 +1083,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, @@ -41,26 +26,13 @@ index 252bab4..90f3655 100644 } +#endif - static struct ttm_bo_driver amdgpu_bo_driver = { - .ttm_tt_create = &amdgpu_ttm_tt_create, -diff --git a/amd/display/amdgpu_dm/amdgpu_dm.c b/amd/display/amdgpu_dm/amdgpu_dm.c -index 3dcb619..5700861 100644 ---- a/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -121,7 +121,7 @@ static bool dm_check_soft_reset(void *handle) - - static int dm_soft_reset(void *handle) - { -- struct amdgpu_device *adev = (struct amdgpu_device *)handle; -+ /* struct amdgpu_device *adev = (struct amdgpu_device *)handle; */ - - /* XXX todo */ - return 0; + static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, + const struct ttm_place *place) diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c -index 5e11f26..7039542 100644 +index 44a4a71..ae7e707 100644 --- a/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c -@@ -913,7 +913,7 @@ static void decide_crtc_timing_for_drm_display_mode( +@@ -932,7 +932,7 @@ static void decide_crtc_timing_for_drm_display_mode( } static struct dc_target *create_target_for_sink( @@ -70,5 +42,5 @@ index 5e11f26..7039542 100644 const struct dm_connector_state *dm_state) { -- -2.11.0 +2.12.2 diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 08c729baaaf7..55f62e6073f0 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170305"; + version = "20170612"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0di64pqs0snbfmncbarvyb9dr3bpv203pqxn5h5i39400jvqwyb6"; + sha256 = "14x22d00zby6wsjaccyh7n8jq1mqzwpx49s85mhmaahbrfd5jwnw"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index c9a51ae569a1..ea4f44f52bbb 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, zlib, ncurses}: stdenv.mkDerivation rec { - version = "2.2-3"; + version = "2.3.0"; name = "atop-${version}"; src = fetchurl { url = "http://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "0p85isn6zih3xfprjym5xanqzazwqjj8x2mmwqyqpqjv6nibi1f7"; + sha256 = "0r5j9q89wpylmg0px5xymxi3jpihw9wq8bh37g3ciymsw1fp5r3k"; }; buildInputs = [zlib ncurses]; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { sed -e "/touch.*LOGPATH/s@touch@echo should have created @" -i Makefile sed -e 's/chown/true/g' -i Makefile sed -e '/chkconfig/d' -i Makefile + sed -e 's/chmod 04711/chmod 0711/g' -i Makefile ''; preInstall = '' diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 4decc8c7a32a..5d1f14bfec6b 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.6.6"; + name = "audit-2.7.6"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "0jwrww1vn7yqxmb84n6y4p58z34gga0ic4rs2msvpzc2x1hxrn31"; + sha256 = "1rqlj15kbyfw4z88z8whf1q2rcg17vs439fvzdds55fwzyf2hrgs"; }; outputs = [ "bin" "dev" "out" "man" "plugins" ]; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index a3c08b1b7856..698c478aca07 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -2,14 +2,14 @@ , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let - version = "5.1.2"; + version = "5.1.3"; name = "autofs-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz"; - sha256 = "031z64hmbzyllgvi72cw87755vnmafvsfwi0w21xksla10wxxdw8"; + sha256 = "1gxifa93104pxlmxrikhwciy5zdgk20m63siyhq1myym7vzfnvp9"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 5d58e50fd7b8..7b800fe6f4f5 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2017.0"; + ver = "2017.1"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1a0gnl8v8l7zj01hca0srbsc11sk51rj1qac6lw242z35hyximpq"; + sha256 = "1c6zq8j0nb1wm9zzlzc2bn8a500pvqbn2vv9hrv6nvq7il2silzq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index e7c20a07b051..c34c7746b909 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2017.0"; + ver = "2017.1"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "11n66hcs4jdnfdl896kzz22zlw8d2p8n6sldxfmlc2q7sqki3fy0"; + sha256 = "1imb59iaaw50y76595z6zvqnbpjgqkkp79gq4s7w7nj8wikiqcgq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 1449d85fc162..8a96279c66be 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, kernel }: -#assert stdenv.lib.versionOlder kernel.version "3.17"; - -let base = "batman-adv-2017.0.1"; in +let base = "batman-adv-2017.1"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0z640jgi9l9355s8v75yhrb9wjyc7cd4618pjpb17vy576bvrhjm"; + sha256 = "05cck0mlg8xsvbra69x6i25xclsq1xc49dggxq81gi086c14h67c"; }; hardeningDisable = [ "pic" ]; @@ -26,6 +24,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; platforms = with stdenv.lib.platforms; linux; - broken = (kernel.features.grsecurity or false); }; } diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index f3b262f1f7d3..88242df76d4d 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -2,14 +2,14 @@ flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.3.0"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "1xifh8lcqmn4mk6w4srjf4zk6mlwgck4fpcyhhliy39963ch5k08"; + sha256 = "19lkqmilfjmj7bnhxlacd0waa5db8gf4lng12fy2zgji0d77vm1d"; }; buildInputs = [ makeWrapper cmake llvmPackages.llvm llvmPackages.clang-unwrapped kernel diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index c2e3fa4b9e1f..ab1a93b3a703 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,14 +1,10 @@ { stdenv, lib, fetchurl, kernel, perl, makeWrapper }: -# BLCR 0.8.5 should works for kernel version up to 3.7.1 -# BLCR 0.8.6 should works for kernel version up to 3.17.x +# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x assert stdenv.isLinux; assert builtins.compareVersions "3.18" kernel.version == 1; -# it doesn't compile anymore on 3.12 -assert lib.versionAtLeast kernel.version "3.14"; - stdenv.mkDerivation { name = "blcr_${kernel.version}-0.8.6pre4"; diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 6185e22fb875..89734b321fc0 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { # FIXME: Move these into a separate package to prevent Bluez from # depending on Python etc. postInstall = '' + cp ./attrib/gatttool $out/bin/gatttool mkdir -p $test/test cp -a test $test pushd $test/test @@ -73,6 +74,10 @@ stdenv.mkDerivation rec { mkdir $out/sbin ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd ln -s ../libexec/bluetooth/obexd $out/sbin/obexd + + # Add extra configuration + mkdir $out/etc/bluetooth + ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 2fdf728ef4e1..4d4a51b984a5 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "http://sourceforge.net/projects/bridge/"; - homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ]; + homepage = "http://www.linux-foundation.org/en/Net:Bridge/"; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c548b55105de..3143968d75c8 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -25,13 +25,14 @@ stdenv.mkDerivation { ./i686-build-failure.patch ./license.patch ./linux-4.7.patch + # source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms + ./linux-4.8.patch + # source: https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl + ./linux-4.11.patch + # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl + ./linux-4.12.patch ./null-pointer-fix.patch ./gcc.patch - (fetchpatch { - name = "linux-4.8.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms"; - sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax"; - }) ]; makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch new file mode 100644 index 000000000000..a779f8c84cfd --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch @@ -0,0 +1,52 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index a9671e2..da36405 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++#include ++#endif + #include + #include + #include +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -117,6 +117,9 @@ int wl_found = 0; + + typedef struct priv_link { + wl_if_t *wlif; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ unsigned long last_rx; ++#endif + } priv_link_t; + + #define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif) +@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + { + struct sk_buff *oskb = (struct sk_buff *)p; + struct sk_buff *skb; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link_t *priv_link; ++#endif + uchar *pdata; + uint len; + +@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + if (skb == NULL) return; + + skb->dev = wl->monitor_dev; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link = MALLOC(wl->osh, sizeof(priv_link_t)); ++ priv_link = netdev_priv(skb->dev); ++ priv_link->last_rx = jiffies; ++#else + skb->dev->last_rx = jiffies; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + skb_reset_mac_header(skb); + #else diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch new file mode 100644 index 000000000000..8abc73db4db1 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.12.patch @@ -0,0 +1,68 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index da36405..d3741eb 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR; + #endif + + 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, 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/broadcom-sta/linux-4.8.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch new file mode 100644 index 000000000000..20e8a9ae49d2 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.8.patch @@ -0,0 +1,64 @@ +From d3f93542326a06d920c6eb89b703384290d37b8b Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Fri, 2 Sep 2016 17:35:34 +0200 +Subject: [PATCH 1/1] Add support for Linux 4.8 + +Orginal author: Krzysztof Kolasa +--- + src/wl/sys/wl_cfg80211_hybrid.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 2fc71fe..ec5e472 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -2388,8 +2388,16 @@ wl_bss_connect_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + s32 err = 0; + + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = true, ++ }; ++ WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + WL_DBG(("%s: Aborting scan\n", __FUNCTION__)); + cfg80211_scan_done(wl->scan_request, true); ++#endif + wl->scan_request = NULL; + } + +@@ -2490,7 +2498,14 @@ wl_notify_scan_status(struct wl_cfg80211_priv *wl, struct net_device *ndev, + + scan_done_out: + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = false, ++ }; ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + cfg80211_scan_done(wl->scan_request, false); ++#endif + wl->scan_request = NULL; + } + rtnl_unlock(); +@@ -2909,7 +2924,14 @@ s32 wl_cfg80211_down(struct net_device *ndev) + s32 err = 0; + + if (wl->scan_request) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct cfg80211_scan_info info = { ++ .aborted = true, ++ }; ++ cfg80211_scan_done(wl->scan_request, &info); ++#else + cfg80211_scan_done(wl->scan_request, true); ++#endif + wl->scan_request = NULL; + } + +-- +2.7.4 + diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 4956f13950dd..5447f13abc4c 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/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index f69319b52569..08c6d997795f 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cifs-utils-${version}"; - version = "6.5"; + version = "6.6"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "1xs9rwqfpx8qj5mcmagw6y1hzwc71zhzb5r8hv06sz16p1w6axz2"; + sha256 = "09biws1jm23l3mjb9kh99v57z8bgzybrmimwddb40s6y0yl54wfh"; }; buildInputs = [ kerberos keyutils pam talloc ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 674f3caa7653..9c2553dbf456 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -62,13 +62,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "1x1b7h4s8f8qbiyas7sw5v2nq5h2wy3q7hsp1ah4l7191jjidqix"; + sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index ac6117cd599f..5e63524e7dcb 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -40,7 +40,13 @@ stdenv.mkDerivation rec { longDescription = '' CRDA acts as the udev helper for communication between the kernel and userspace for regulatory compliance. It relies on nl80211 for communication. + CRDA is intended to be run only through udev communication from the kernel. + To use it under NixOS, add + + services.udev.packages = [ pkgs.crda ]; + + to the system configuration. ''; homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 46b5fcb0bf94..4ffd8fadd121 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,25 +1,27 @@ { fetchurl, stdenv, kernel, onlyHeaders ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.8"; + pname = "cryptodev-linux-1.9"; name = "${pname}-${kernel.version}"; src = fetchurl { - url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"; - sha256 = "0xhkhcdlds9aiz0hams93dv0zkgcn2abaiagdjlqdck7zglvvyk7"; + urls = [ + "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz" + "http://download.gna.org/cryptodev-linux/${pname}.tar.gz" + ]; + sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z"; }; hardeningDisable = [ "pic" ]; KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; INSTALL_MOD_PATH = "\${out}"; - PREFIX = "\${out}"; + prefix = "\${out}"; meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = http://home.gna.org/cryptodev-linux/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - broken = !stdenv.lib.versionOlder kernel.version "4.9"; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index f61a5497c4b3..47f49a3da40b 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.7.3"; + name = "cryptsetup-1.7.5"; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz"; - sha256 = "00nwd96m9yq4k3cayc04i5y7iakkzana35zxky6hpx2w8zl08axg"; + sha256 = "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b"; }; configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 87cf7c18caf6..1f923b9567a4 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -1,64 +1,47 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, unzip, kernel, utillinux, libdrm, libusb1, makeWrapper }: +{ stdenv, lib, fetchurl, unzip, utillinux, libusb1, evdi, systemd, makeWrapper }: let arch = if stdenv.system == "x86_64-linux" then "x64" else if stdenv.system == "i686-linux" then "x86" else throw "Unsupported architecture"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 ]; + bins = "${arch}-ubuntu-1604"; + libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ]; in stdenv.mkDerivation rec { name = "displaylink-${version}"; - version = "1.1.62"; + version = "1.3.52"; - src = fetchFromGitHub { - owner = "DisplayLink"; - repo = "evdi"; - rev = "fe779940ff9fc7b512019619e24a5b22e4070f6a"; - sha256 = "02hw83f6lscms8hssjzf30hl9zly3b28qcxwmxvnqwfhx1q491z9"; - }; - - daemon = fetchurl { + src = fetchurl { name = "displaylink.zip"; - url = "http://www.displaylink.com/downloads/file?id=607"; - sha256 = "0jky3xk4dfzbzg386qya9l9952i4m8zhf55fdl06pi9r82k2iijx"; + url = "http://www.displaylink.com/downloads/file?id=744"; + sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k"; }; nativeBuildInputs = [ unzip makeWrapper ]; - buildInputs = [ kernel libdrm ]; - buildCommand = '' - unpackPhase - cd $sourceRoot - unzip $daemon + unzip $src chmod +x displaylink-driver-${version}.run - ./displaylink-driver-${version}.run --target daemon --noexec + ./displaylink-driver-${version}.run --target . --noexec - ( cd module - export makeFlags="$makeFlags KVER=${kernel.modDirVersion} KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - export hardeningDisable="pic format" - buildPhase - install -Dm755 evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko + sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh + ( source udev-installer.sh + mkdir -p $out/lib/udev/rules.d + main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh" ) + sed -i '2iPATH=${systemd}/bin:$PATH' $out/lib/udev/displaylink.sh - ( cd library - buildPhase - install -Dm755 libevdi.so $out/lib/libevdi.so - ) + install -Dt $out/lib/displaylink *.spkg + install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath ${libPath} \ + $out/bin/DisplayLinkManager + wrapProgram $out/bin/DisplayLinkManager \ + --run "cd $out/lib/displaylink" fixupPhase - - ( cd daemon - install -Dt $out/lib/displaylink *.spkg - install -Dm755 ${arch}/DisplayLinkManager $out/bin/DisplayLinkManager - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - --set-rpath $out/lib:${libPath} \ - $out/bin/DisplayLinkManager - wrapProgram $out/bin/DisplayLinkManager \ - --run "cd $out/lib/displaylink" - ) ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 7ba8dffcc318..65908fd18e27 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dmidecode-3.0"; + name = "dmidecode-3.1"; src = fetchurl { url = "mirror://savannah/dmidecode/${name}.tar.xz"; - sha256 = "0iby0xfk5x3cdr0x0gxj5888jjyjhafvaq0l79civ73jjfqmphvy"; + sha256 = "1h0sg0lxa15nzf8s7884p6q7p6md9idm0c79wyqmk32l4ndwwrnp"; }; makeFlags = "prefix=$(out)"; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index cd561df0ec41..47dc42fed5ee 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18"; stdenv.mkDerivation rec { name = "dpdk-${version}-${kernel.version}"; - version = "16.07.2"; + version = "17.05.1"; src = fetchurl { url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876"; + sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld"; }; buildInputs = [ pkgconfig libvirt ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { install -m 0755 -d $out/${RTE_TARGET}/include install -m 0644 ${RTE_TARGET}/include/rte_config.h $out/${RTE_TARGET}/include - cp -pr mk scripts $out/ + cp -pr mk $out/ mkdir -p $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net cp ${RTE_TARGET}/kmod/*.ko $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 60615fb1e5be..5c0fae7bf4fa 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH=${systemd.udev.bin}/sbin:$PATH - substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ + substituteInPlace user/Makefile.in \ + --replace /sbin '$(sbindir)' substituteInPlace user/legacy/Makefile.in \ - --replace /sbin/ $out/sbin/ \ - --replace '$(DESTDIR)/lib/drbd' $out/lib/drbd + --replace '$(DESTDIR)/lib/drbd' '$(DESTDIR)$(LIBDIR)' substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd - substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm + substituteInPlace scripts/drbd.rules --replace /usr/sbin/drbdadm $out/sbin/drbdadm ''; makeFlags = "SHELL=${stdenv.shell}"; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; meta = { homepage = http://www.drbd.org/; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index ccedc381504f..366cc9787f28 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, python2Packages }: -python2Packages.mkPythonDerivation rec { +python2Packages.buildPythonApplication rec { name = "dstat-${version}"; + format = "other"; version = "0.7.3"; src = fetchurl { diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix new file mode 100644 index 000000000000..081996dfd42b --- /dev/null +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "earlyoom-${version}"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "rfjakob"; + repo = "earlyoom"; + rev = "08b7ed8e72feed2eec2e558ba2cfacbf6d469594"; + sha256 = "1k3xslb70fzk80wlka32l0k2v45qn1xgwyjkjiz85gv6v4mv92vl"; + }; + + installPhase = '' + mkdir -p $out/bin + cp earlyoom $out/bin + ''; + + meta = { + description = "Early OOM Daemon for Linux"; + homepage = https://github.com/rfjakob/earlyoom; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix new file mode 100644 index 000000000000..150534c9b957 --- /dev/null +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, kernel, libdrm }: + +stdenv.mkDerivation rec { + name = "evdi-${version}"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "DisplayLink"; + repo = "evdi"; + rev = "v${version}"; + sha256 = "176cq83qlmhc4c00dwfnqgd021l7s4gyj8604m5zmxbz0r5mnawv"; + }; + + buildInputs = [ kernel libdrm ]; + + makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + + hardeningDisable = [ "pic" "format" ]; + + installPhase = '' + install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko + install -Dm755 library/libevdi.so $out/lib/libevdi.so + ''; + + meta = with stdenv.lib; { + description = "Extensible Virtual Display Interface"; + platforms = platforms.linux; + license = licenses.gpl2; + homepage = "http://www.displaylink.com/"; + broken = !versionAtLeast kernel.version "3.16"; + }; +} diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index de27d7b0d838..cd11a79c8f82 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.03.03"; + version = "0.03.04"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "02pg46f3x7v1c1vvqzfjqq0wjb2bzmfkd6a8xp06cg9zvidn6jpb"; + sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index a9cea506c97a..720bc34c4197 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam"; license = licenses.gpl2; maintainers = with maintainers; [ womfoo grahamc ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 27acc8f1c283..1bbe8dbb160b 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.44.8"; + version="0.9.44.10"; name="${baseName}-${version}"; - hash="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr"; - url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.8.tar.xz"; - sha256="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr"; + hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; + url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz"; + sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj"; }; buildInputs = [ which @@ -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/firejail/default.upstream b/pkgs/os-specific/linux/firejail/default.upstream index 4a0037e8aa4b..186dd4408b74 100644 --- a/pkgs/os-specific/linux/firejail/default.upstream +++ b/pkgs/os-specific/linux/firejail/default.upstream @@ -1,3 +1,3 @@ url http://sourceforge.net/projects/firejail/files/firejail/ -version_link '[.]tar[.][a-z0-9]+/download$' +version_link '[-][0-9.]+[.]tar[.][a-z0-9]+/download$' SF_redirect diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix new file mode 100644 index 000000000000..87232acfa832 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, cabextract, bt-fw-converter }: + +# Kernels between 4.2 and 4.7 will not work with +# this packages as they expect the firmware to be named "BCM.hcd" +# see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865 +stdenv.mkDerivation rec { + name = "broadcom-bt-firmware-${version}"; + version = "12.0.1.1011"; + + src = fetchurl { + url = "http://download.windowsupdate.com/d/msdownload/update/driver/drvs/2016/11/200033618_94cfea9130b30c04bc602cd3dcc1f9a793fc75bb.cab"; + sha256 = "6091e49c9d9c71cbe3aed2db3c0d60994ff562804c3b40e1e8bcbb818180987b"; + }; + + nativeBuildInputs = [ cabextract bt-fw-converter ]; + + unpackCmd = '' + mkdir -p ${name} + cabextract $src --directory ${name} + ''; + + installPhase = '' + mkdir -p $out/lib/firmware/brcm + bt-fw-converter -f bcbtums.inf -o $out/lib/firmware/brcm + for filename in $out/lib/firmware/brcm/*.hcd + do + linkname=$(basename $filename | awk 'match($0,/^(BCM)[0-9A-Z]+(-[0-9a-z]{4}-[0-9a-z]{4}\.hcd)$/,c) { print c[1]c[2] }') + if ! [ -z $linkname ] + then + ln -s -T $filename $out/lib/firmware/brcm/$linkname + fi + done + ''; + + meta = with stdenv.lib; { + description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; + homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix new file mode 100644 index 000000000000..8927e1a28e7c --- /dev/null +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: + +stdenv.mkDerivation rec { + name = "bt-fw-converter-${version}"; + version = "2017-02-19"; + rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/winterheart/broadcom-bt-firmware/${rev}/tools/bt-fw-converter.pl"; + sha256 = "c259b414a4a273c89a0fa7159b3ef73d1ea62b6de91c3a7c2fcc832868e39f4b"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ perl perlPackages.RegexpGrammars bluez ]; + + unpackCmd = '' + mkdir -p ${name} + cp $src ${name}/bt-fw-converter.pl + ''; + + installPhase = '' + install -D -m755 bt-fw-converter.pl $out/bin/bt-fw-converter + substituteInPlace $out/bin/bt-fw-converter --replace /usr/bin/hex2hcd ${bluez}/bin/hex2hcd + wrapProgram $out/bin/bt-fw-converter --set PERL5LIB $PERL5LIB + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/winterheart/broadcom-bt-firmware/; + description = "A tool that converts hex to hcd based on inf file"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 69abaf26197d..5f8f6c542521 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { homepage = https://support.apple.com/downloads/DL1877; license = licenses.unfree; maintainers = with maintainers; [ womfoo grahamc ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } 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 69f0a16785d1..2f4689beea49 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-03-11"; + 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 = "05hz78z919jnacvk4i1mghjn2h15ph91vkffgi4w94zhzbf77cna"; + sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 50ffe7d25e66..8a6dfff34704 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20170303"; + version = "1.20170427"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "1s5dycgix97681vpq7ggpc27n865wgv9npzxvbr2q2bp3ia9mcim"; + sha256 = "0n79nij0rlwjx3zqs4p3wcyrgrgg9gmsf1a526r91c689r5lpwvl"; }; dontStrip = true; # Stripping breaks some of the binaries diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix new file mode 100644 index 000000000000..d8d4c37fd886 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub }: +with stdenv.lib; +stdenv.mkDerivation { + name = "rtl8192su-unstable-2016-10-05"; + + src = fetchFromGitHub { + owner = "chunkeey"; + repo = "rtl8192su"; + rev = "c00112c9a14133290fe30bd3b44e45196994cb1c"; + sha256 = "0j3c35paapq1icmxq0mg7pm2xa2m69q7bkfmwgq99d682yr2cb5l"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + for i in rtl8192sfw.bin \ + rtl8192sufw-ap.bin \ + rtl8192sufw-apple.bin \ + rtl8192sufw-windows.bin \ + rtl8712u-linux-firmware-bad.bin \ + rtl8712u-most-recent-v2.6.6-bad.bin \ + rtl8712u-most-recent-v2.6.6-bad.bin \ + rtl8712u-oldest-but-good.bin; + do + install -D -pm644 firmwares/$i $out/lib/firmware/rtlwifi/$i + done + ''; + + meta = with stdenv.lib; { + description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU"; + homepage = https://github.com/chunkeey/rtl8192su; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ mic92 ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 35638e7dabd5..2c90ff94d4a0 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "fnotifystat-${version}"; - version = "0.01.16"; + version = "0.01.17"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1k9nc7a4r7c2l7vrlcrfxj9rsdb04amiqcsnxm5kpshncry38nl5"; + sha256 = "0ncfbrpyb3ak49nrdr4cb3w082n9s181lizfqx51zi9rdgkj1vm3"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index f8d0eab835bd..6a987dc9f5b5 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.01.16"; + version = "0.01.17"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; - sha256 = "0g65basrs569y42zhgjq9sdyz62km8xy55yfilmyxa43ckb3xmlw"; + sha256 = "0plm2409mmp6n2fjj6bb3z7af2cnh5lg3czlylhgaki9zd0cyb7w"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 5385651030bc..581d0f841b96 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -5,12 +5,12 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { - version = "2.0.4"; + version = "2.0.5"; name = "guvcview-${version}"; src = fetchurl { url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz"; - sha256 = "18jg6dlqallpvjkb09dyn1v6prdmim4rrw22mhv8vdd9d18z83k7"; + sha256 = "a86beb5993a8449ed3cbcc6ec2a238ef0b90138b6cbe2afab4456d37f44c41a0"; }; buildInputs = diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 538d8d4ab837..fa63cddfcdb9 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.48"; + name = "hdparm-9.52"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1vpvlkrksfwx8lxq1p1nk3ddyzgrwy3rgxpn9kslchdh3jkv95yf"; + sha256 = "1djgxhfadd865dcrl6dp7dvjxpaisy7mk17mbdbglwg24ga9qhn3"; + }; preBuild = '' makeFlagsArray=(sbindir=$out/sbin manprefix=$out) - ''; + ''; - meta = { + meta = with stdenv.lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; homepage = http://sourceforge.net/projects/hdparm/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.fuuzetsu ]; }; + } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index dc3160af7aae..a330445634ac 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.291"; + version = "0.300"; src = fetchurl { - url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-${version}.tar.xz"; - sha256 = "121qixrdhdncva1cnj7m7jlqvi1kbj85dpi844jiis3a8hgpzw5a"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/hwdata/v0.300.tar.gz/sha512/34294fcf65c3cb17c19d625732d1656ec1992dde254a68ee35681ad2f310bc05028a85889efa2c1d1e8a2d10885ccc00185475a00f6f2fb82d07e2349e604a51/v0.300.tar.gz"; + sha256 = "03xlj05qyixhnsybq1qnr7j5q2nvirs4jxpgg4sbw8swsqj3dgqi"; }; preConfigure = "patchShebangs ./configure"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = "--datadir=$(prefix)/data"; meta = { - homepage = "https://fedorahosted.org/hwdata/"; + homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 7d2a5f795d91..1f67743af0d4 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "i2c-tools-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/i/i2c-tools/i2c-tools_${version}.orig.tar.bz2"; - sha256 = "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"; + sha256 = "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv"; }; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix new file mode 100644 index 000000000000..cdcae22a18e9 --- /dev/null +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake +, glib, gtk3, gtk_doc, libgudev, pkgconfig, systemd }: + +stdenv.mkDerivation rec { + name = "iio-sensor-proxy-${version}"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "hadess"; + repo = "iio-sensor-proxy"; + rev = version; + sha256 = "1x0whwm2r9g50hq5px0bgsrigy8naihqgi6qm0x5q87jz5lkhrnv"; + }; + + configurePhase = '' + ./autogen.sh --prefix=$out \ + --with-udevrulesdir=$out/lib/udev/rules.d \ + --with-systemdsystemunitdir=$out/lib/systemd/system + ''; + + buildInputs = [ + glib + gtk3 + gtk_doc + libgudev + systemd + ]; + + nativeBuildInputs = [ + autoconf + autoconf-archive + automake + gettext + intltool + libtool + pkgconfig + ]; + + meta = with stdenv.lib; { + description = "Proxy for sending IIO sensor data to D-Bus"; + homepage = https://github.com/hadess/iio-sensor-proxy; + license = licenses.gpl3 ; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + inherit version; + }; +} diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 688cfbb8df5d..0d33954fd5d8 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { ''; patchPhase = '' + runHook prePatch + # Remove libOpenCL.so, since we use ocl-icd's libOpenCL.so instead and this would cause a clash. rm opt/intel/opencl/libOpenCL.so* @@ -35,18 +37,28 @@ stdenv.mkDerivation rec { for lib in opt/intel/opencl/*.so; do patchelf --set-rpath "${libPath}:$out/lib/intel-ocl" $lib || true done + + runHook postPatch ''; buildPhase = '' + runHook preBuild + # Create ICD file, which just contains the path of the corresponding shared library. echo "$out/lib/intel-ocl/libintelocl.so" > intel.icd + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -D -m 0755 opt/intel/opencl/*.so* -t $out/lib/intel-ocl install -D -m 0644 opt/intel/opencl/*.{o,rtl,bin} -t $out/lib/intel-ocl install -D -m 0644 opt/intel/opencl/{LICENSE,NOTICES} -t $out/share/doc/intel-ocl install -D -m 0644 intel.icd -t $out/etc/OpenCL/vendors + + runHook postInstall ''; dontStrip = true; diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix new file mode 100644 index 000000000000..8ad84014a1af --- /dev/null +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -0,0 +1,17 @@ +{ stdenv, perl, fetchurl }: + +stdenv.mkDerivation { + name = "ioport-1.2"; + src = fetchurl { + url = "http://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; + sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; + }; + buildInputs = [ perl ]; + meta = with stdenv.lib; { + description = "Direct access to I/O ports from the command line"; + homepage = http://people.redhat.com/rjones/ioport/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.cleverca22 ]; + }; +} diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 1ff68fc04080..404e21bcbce0 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.9.0"; + version = "4.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0"; + sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if"; }; patches = lib.optionals enableFan [ @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "MANDIR=$(out)/share/man" "BASH_COMPDIR=$(out)/share/bash-completion/completions" "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs + "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers ]; buildFlags = [ @@ -47,10 +48,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; + homepage = https://wiki.linuxfoundation.org/networking/iproute2; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ eelco wkennington ]; + maintainers = with maintainers; [ eelco wkennington fpletz ]; }; } diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix new file mode 100644 index 000000000000..a9be26a20262 --- /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 53aa15ec62e6..2a6294e3b5b9 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 new file mode 100644 index 000000000000..adaca90650d5 --- /dev/null +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, autoreconfHook, readline }: + +let + ell = fetchgit { + url = https://git.kernel.org/pub/scm/libs/ell/ell.git; + rev = "58e873d7463f3a7f91e02260585bfa50cbc77668"; + sha256 = "12k1f1iarm29j8k16mhw83xx7r3bama4lp0fchhnj7iwxrpgs4gh"; + }; +in stdenv.mkDerivation rec { + name = "iwd-unstable-2017-06-02"; + + src = fetchgit { + url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; + rev = "6c64ae34619bf7f18cba007d8b0374badbe7c17e"; + sha256 = "19rkf6lk213hdfs40ija7salars08zw6k5i5djdlpcn1j6y69i36"; + }; + + configureFlags = [ + "--with-dbusconfdir=$(out)/etc/" + ]; + + postUnpack = '' + ln -s ${ell} ell + ''; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ readline ]; + + meta = with stdenv.lib; { + homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; + description = "Wireless daemon for Linux"; + platforms = platforms.linux; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 1dbc5c744153..96dc0775cec3 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, kernel, kmod }: -assert stdenv.lib.versionOlder kernel.version "4.10"; - stdenv.mkDerivation rec { name = "ixgbevf-${version}-${kernel.version}"; - version = "4.0.3"; + version = "4.1.2"; src = fetchurl { url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz"; - sha256 = "0f95p2d7yhf57qa6fl8nv1rb4x8vwwgh7qhqcqpag0hz19dc3xff"; + sha256 = "1dismhiq0asf04rv6pv2sk2m3xcy6m3bpk16gmxqybca3xa28a5b"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 260bf412062a..824bc3f9a186 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.10"; +assert stdenv.lib.versionOlder kernel.version "4.11"; let sourceAttrs = (import ./source.nix) { inherit fetchzip; }; diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index ee47ee118551..2de2aeeff8fa 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,9 +1,9 @@ { fetchzip }: rec { - version = "3.5.2"; + version = "3.5.3"; src = fetchzip { url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip"; - sha256 = "0gmjdi50c9wfapikniy2i1cfhz124pp7q02a0vbwxw7f21llcv8x"; + sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp"; }; } diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index a3f21b51b061..6e8893cc37d6 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; description = "Linux keyboard utilities and keyboard maps"; platforms = platforms.linux; - licenses = licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 1bc07f357a8a..44a63c9f1ece 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/3.18.nix b/pkgs/os-specific/linux/kernel-headers/3.18.nix deleted file mode 100644 index 22650747ba21..000000000000 --- a/pkgs/os-specific/linux/kernel-headers/3.18.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, fetchurl, perl, cross ? null }: - -assert cross == null -> stdenv.isLinux; - -let - - version = "3.18.14"; - - kernelHeadersBaseConfig = - if cross == null - then stdenv.platform.kernelHeadersBaseConfig - else cross.platform.kernelHeadersBaseConfig; - -in - -stdenv.mkDerivation { - name = "linux-headers-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i"; - }; - - targetConfig = if cross != null then cross.config else null; - - platform = - if cross != null then cross.platform.kernelArch else - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.isArm then "arm" else - if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else - abort "don't know what the kernel include directory is called for this platform"; - - buildInputs = [perl]; - - # FIXME needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "stackprotector" ]; - - extraIncludeDirs = - if cross != null then - (if cross.arch == "powerpc" then ["ppc"] else []) - else if stdenv.system == "powerpc-linux" then ["ppc"] else []; - - buildPhase = '' - if test -n "$targetConfig"; then - export ARCH=$platform - fi - make ${kernelHeadersBaseConfig} SHELL=bash - make mrproper headers_check SHELL=bash - ''; - - installPhase = '' - make INSTALL_HDR_PATH=$out headers_install - - # Some builds (e.g. KVM) want a kernel.release. - mkdir -p $out/include/config - echo "${version}-default" > $out/include/config/kernel.release - ''; - - # !!! hacky - fixupPhase = '' - ln -s asm $out/include/asm-$platform - if test "$platform" = "i386" -o "$platform" = "x86_64"; then - ln -s asm $out/include/asm-x86 - fi - ''; - - meta = with stdenv.lib; { - description = "Header files and scripts for Linux kernel"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index da9f30094746..da67747b8b24 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,6 +1,6 @@ -{ stdenv, kernel, perl }: - -assert (!(kernel.features.grsecurity or false)); +{ stdenv, kernel, perl +, hostPlatform +}: let baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ]; @@ -15,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/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch deleted file mode 100644 index 7fdcafa62d9d..000000000000 --- a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch +++ /dev/null @@ -1,47 +0,0 @@ -From de6299c1627d80ea6742a0bef15bdb6981e5cfd7 Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Fri, 25 Dec 2015 17:11:40 +0300 -Subject: [PATCH 1/2] drivers_base: fix double Kconfig entry - ---- - drivers/base/Kconfig | 24 ------------------------ - 1 file changed, 24 deletions(-) - -diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig -index 946ced4..fc3405e1 100644 ---- a/drivers/base/Kconfig -+++ b/drivers/base/Kconfig -@@ -163,30 +163,6 @@ config FW_LOADER_USER_HELPER - no longer required unless you have a special firmware file that - resides in a non-standard path. - --config WANT_DEV_COREDUMP -- bool -- help -- Drivers should "select" this option if they desire to use the -- device coredump mechanism. -- --config ALLOW_DEV_COREDUMP -- bool "Allow device coredump" if EXPERT -- default y -- help -- This option controls if the device coredump mechanism is available or -- not; if disabled, the mechanism will be omitted even if drivers that -- can use it are enabled. -- Say 'N' for more sensitive systems or systems that don't want -- to ever access the information to not have the code, nor keep any -- data. -- -- If unsure, say Y. -- --config DEV_COREDUMP -- bool -- default y if WANT_DEV_COREDUMP -- depends on ALLOW_DEV_COREDUMP -- - config DEBUG_DRIVER - bool "Driver Core verbose debug messages" - depends on DEBUG_KERNEL --- -2.6.3 - diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch deleted file mode 100644 index f17ecce92d1c..000000000000 --- a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 65c5b603489d230b1f1775b01ba1529843cfeba6 Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Fri, 25 Dec 2015 17:11:56 +0300 -Subject: [PATCH 2/2] mfd: fix dependency for MFD_CROS_EC - ---- - drivers/mfd/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index f425dce..a62a285 100644 ---- a/drivers/mfd/Kconfig -+++ b/drivers/mfd/Kconfig -@@ -61,7 +61,7 @@ config MFD_AAT2870_CORE - - config MFD_CROS_EC - tristate "Support ChromeOS Embedded Controller" -- depends on MFD_CORE -+ select MFD_CORE - help - If you say Y here you get support for the ChromeOS Embedded - Controller (EC) providing keyboard, battery and power services. --- -2.6.3 - diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 329f80d0e67e..9700373c852f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -33,14 +33,16 @@ with stdenv.lib; DEBUG_KERNEL y DYNAMIC_DEBUG y BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n DEBUG_DEVRES n DEBUG_STACK_USAGE n DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n SCHEDSTATS n DETECT_HUNG_TASK y + ${optionalString (versionOlder version "4.4") '' + CPU_NOTIFIER_ERROR_INJECT? n + ''} + ${optionalString (versionOlder version "4.11") '' TIMER_STATS y DEBUG_NX_TEST n @@ -90,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 @@ -97,6 +107,10 @@ with stdenv.lib; # Disable some expensive (?) features. PM_TRACE_RTC n + # Enable initrd support. + BLK_DEV_RAM y + BLK_DEV_INITRD y + # Enable various subsystems. ACCESSIBILITY y # Accessibility support AUXDISPLAY y # Auxiliary Display support @@ -116,6 +130,7 @@ with stdenv.lib; ${optionalString (versionOlder version "3.13") '' IPV6_PRIVACY y ''} + NETFILTER y NETFILTER_ADVANCED y IP_ROUTE_VERBOSE y IP_MROUTE_MULTIPLE_TABLES y @@ -205,8 +220,12 @@ with stdenv.lib; SND_DYNAMIC_MINORS y SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_HDA_RECONFIG y # Support reconfiguration of jack functions + SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + ${optionalString (versionOlder version "4.12") '' + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + ''} # USB serial devices. USB_SERIAL_GENERIC y # USB Generic Serial Driver @@ -228,7 +247,9 @@ with stdenv.lib; FANOTIFY y TMPFS y TMPFS_POSIX_ACL y - FS_ENCRYPTION? m + ${optionalString (versionAtLeast version "4.9") '' + FS_ENCRYPTION? m + ''} EXT2_FS_XATTR y EXT2_FS_POSIX_ACL y EXT2_FS_SECURITY y @@ -281,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 ''} @@ -308,7 +331,9 @@ with stdenv.lib; NLS_ISO8859_1 m # VFAT default for the iocharset= mount option # Runtime security tests - DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages + ${optionalString (versionOlder version "4.11") '' + DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages + ''} # Security related features. RANDOMIZE_BASE? y @@ -456,7 +481,13 @@ with stdenv.lib; FTRACE_SYSCALLS y SCHED_TRACER y STACK_TRACER y - UPROBE_EVENT y + + ${if versionOlder version "4.11" then '' + UPROBE_EVENT? y + '' else '' + UPROBE_EVENTS? y + ''} + ${optionalString (versionAtLeast version "4.4") '' BPF_SYSCALL y BPF_EVENTS y @@ -478,10 +509,12 @@ 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 ''} - KVM_DEVICE_ASSIGNMENT? y + ${optionalString (versionOlder version "4.12") '' + KVM_DEVICE_ASSIGNMENT? y + ''} ${optionalString (versionAtLeast version "4.0") '' KVM_GENERIC_DIRTYLOG_READ_PROTECT y ''} @@ -490,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) '' @@ -569,6 +604,55 @@ with stdenv.lib; # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK? n + # Disable various self-test modules that have no use in a production system + ${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 + GLOB_SELFTEST? n + INTERVAL_TREE_TEST? n + LNET_SELFTEST? n + LOCK_TORTURE_TEST? n + MTD_TESTS? n + NOTIFIER_ERROR_INJECTION? n + PERCPU_TEST? n + RBTREE_TEST? n + RCU_TORTURE_TEST? n + TEST_BPF? n + TEST_FIRMWARE? n + TEST_HEXDUMP? n + TEST_KSTRTOX? n + TEST_LIST_SORT? n + TEST_LKM? n + TEST_PRINTF? n + TEST_RHASHTABLE? n + TEST_STATIC_KEYS? n + TEST_STRING_HELPERS? n + TEST_UDELAY? n + TEST_USER_COPY? 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/cpu-cgroup-v2-patches/4.11.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch new file mode 100644 index 000000000000..38cc0532ba97 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch @@ -0,0 +1,784 @@ +commit 827b86ad1dd21feed4c0b99faf6059f245f7dadb +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Misc preps for cgroup unified hierarchy interface + + Make the following changes in preparation for the cpu controller + interface implementation for the unified hierarchy. This patch + doesn't cause any functional differences. + + * s/cpu_stats_show()/cpu_cfs_stats_show()/ + + * s/cpu_files/cpu_legacy_files/ + + * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While + at it, make the @val array u64 for consistency. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 3b31fc05a0f1..a1b95e83fa87 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -7174,7 +7174,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) + return ret; + } + +-static int cpu_stats_show(struct seq_file *sf, void *v) ++static int cpu_cfs_stats_show(struct seq_file *sf, void *v) + { + struct task_group *tg = css_tg(seq_css(sf)); + struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; +@@ -7214,7 +7214,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, + } + #endif /* CONFIG_RT_GROUP_SCHED */ + +-static struct cftype cpu_files[] = { ++static struct cftype cpu_legacy_files[] = { + #ifdef CONFIG_FAIR_GROUP_SCHED + { + .name = "shares", +@@ -7235,7 +7235,7 @@ static struct cftype cpu_files[] = { + }, + { + .name = "stat", +- .seq_show = cpu_stats_show, ++ .seq_show = cpu_cfs_stats_show, + }, + #endif + #ifdef CONFIG_RT_GROUP_SCHED +@@ -7261,7 +7261,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .fork = cpu_cgroup_fork, + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, +- .legacy_cftypes = cpu_files, ++ .legacy_cftypes = cpu_legacy_files, + .early_init = true, + }; + +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index f95ab29a45d0..6151c23f722f 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -276,26 +276,33 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V) + return 0; + } + +-static int cpuacct_stats_show(struct seq_file *sf, void *v) ++static void cpuacct_stats_read(struct cpuacct *ca, ++ u64 (*val)[CPUACCT_STAT_NSTATS]) + { +- struct cpuacct *ca = css_ca(seq_css(sf)); +- s64 val[CPUACCT_STAT_NSTATS]; + int cpu; +- int stat; + +- memset(val, 0, sizeof(val)); ++ memset(val, 0, sizeof(*val)); ++ + for_each_possible_cpu(cpu) { + u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat; + +- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; +- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; +- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; +- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; +- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; ++ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; ++ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; ++ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; ++ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; ++ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; + } ++} ++ ++static int cpuacct_stats_show(struct seq_file *sf, void *v) ++{ ++ u64 val[CPUACCT_STAT_NSTATS]; ++ int stat; ++ ++ cpuacct_stats_read(css_ca(seq_css(sf)), &val); + + for (stat = 0; stat < CPUACCT_STAT_NSTATS; stat++) { +- seq_printf(sf, "%s %lld\n", ++ seq_printf(sf, "%s %llu\n", + cpuacct_stat_desc[stat], + (long long)nsec_to_clock_t(val[stat])); + } + +commit fdb64d002b3a223ce4bb11aa4448a42050470052 +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Implement interface for cgroup unified hierarchy + + While the cpu controller doesn't have any functional problems, there + are a couple interface issues which can be addressed in the v2 + interface. + + * cpuacct being a separate controller. This separation is artificial + and rather pointless as demonstrated by most use cases co-mounting + the two controllers. It also forces certain information to be + accounted twice. + + * Use of different time units. Writable control knobs use + microseconds, some stat fields use nanoseconds while other cpuacct + stat fields use centiseconds. + + * Control knobs which can't be used in the root cgroup still show up + in the root. + + * Control knob names and semantics aren't consistent with other + controllers. + + This patchset implements cpu controller's interface on the unified + hierarchy which adheres to the controller file conventions described + in Documentation/cgroups/unified-hierarchy.txt. Overall, the + following changes are made. + + * cpuacct is implictly enabled and disabled by cpu and its information + is reported through "cpu.stat" which now uses microseconds for all + time durations. All time duration fields now have "_usec" appended + to them for clarity. While this doesn't solve the double accounting + immediately, once majority of users switch to v2, cpu can directly + account and report the relevant stats and cpuacct can be disabled on + the unified hierarchy. + + Note that cpuacct.usage_percpu is currently not included in + "cpu.stat". If this information is actually called for, it can be + added later. + + * "cpu.shares" is replaced with "cpu.weight" and operates on the + standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). + The weight is scaled to scheduler weight so that 100 maps to 1024 + and the ratio relationship is preserved - if weight is W and its + scaled value is S, W / 100 == S / 1024. While the mapped range is a + bit smaller than the orignal scheduler weight range, the dead zones + on both sides are relatively small and covers wider range than the + nice value mappings. This file doesn't make sense in the root + cgroup and isn't create on root. + + * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" + which contains both quota and period. + + * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by + "cpu.rt.max" which contains both runtime and period. + + v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for + CFS bandwidth stats and also using raw division for u64. Use + CONFIG_CFS_BANDWITH and do_div() instead. + + The semantics of "cpu.rt.max" is not fully decided yet. Dropped + for now. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index a1b95e83fa87..f01d56e58a1b 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -7253,6 +7253,139 @@ static struct cftype cpu_legacy_files[] = { + { } /* Terminate */ + }; + ++static int cpu_stats_show(struct seq_file *sf, void *v) ++{ ++ cpuacct_cpu_stats_show(sf); ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ struct task_group *tg = css_tg(seq_css(sf)); ++ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; ++ u64 throttled_usec; ++ ++ throttled_usec = cfs_b->throttled_time; ++ do_div(throttled_usec, NSEC_PER_USEC); ++ ++ seq_printf(sf, "nr_periods %d\n" ++ "nr_throttled %d\n" ++ "throttled_usec %llu\n", ++ cfs_b->nr_periods, cfs_b->nr_throttled, ++ throttled_usec); ++ } ++#endif ++ return 0; ++} ++ ++#ifdef CONFIG_FAIR_GROUP_SCHED ++static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, ++ struct cftype *cft) ++{ ++ struct task_group *tg = css_tg(css); ++ u64 weight = scale_load_down(tg->shares); ++ ++ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); ++} ++ ++static int cpu_weight_write_u64(struct cgroup_subsys_state *css, ++ struct cftype *cftype, u64 weight) ++{ ++ /* ++ * cgroup weight knobs should use the common MIN, DFL and MAX ++ * values which are 1, 100 and 10000 respectively. While it loses ++ * a bit of range on both ends, it maps pretty well onto the shares ++ * value used by scheduler and the round-trip conversions preserve ++ * the original value over the entire range. ++ */ ++ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) ++ return -ERANGE; ++ ++ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); ++ ++ return sched_group_set_shares(css_tg(css), scale_load(weight)); ++} ++#endif ++ ++static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, ++ long period, long quota) ++{ ++ if (quota < 0) ++ seq_puts(sf, "max"); ++ else ++ seq_printf(sf, "%ld", quota); ++ ++ seq_printf(sf, " %ld\n", period); ++} ++ ++/* caller should put the current value in *@periodp before calling */ ++static int __maybe_unused cpu_period_quota_parse(char *buf, ++ u64 *periodp, u64 *quotap) ++{ ++ char tok[21]; /* U64_MAX */ ++ ++ if (!sscanf(buf, "%s %llu", tok, periodp)) ++ return -EINVAL; ++ ++ *periodp *= NSEC_PER_USEC; ++ ++ if (sscanf(tok, "%llu", quotap)) ++ *quotap *= NSEC_PER_USEC; ++ else if (!strcmp(tok, "max")) ++ *quotap = RUNTIME_INF; ++ else ++ return -EINVAL; ++ ++ return 0; ++} ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++static int cpu_max_show(struct seq_file *sf, void *v) ++{ ++ struct task_group *tg = css_tg(seq_css(sf)); ++ ++ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); ++ return 0; ++} ++ ++static ssize_t cpu_max_write(struct kernfs_open_file *of, ++ char *buf, size_t nbytes, loff_t off) ++{ ++ struct task_group *tg = css_tg(of_css(of)); ++ u64 period = tg_get_cfs_period(tg); ++ u64 quota; ++ int ret; ++ ++ ret = cpu_period_quota_parse(buf, &period, "a); ++ if (!ret) ++ ret = tg_set_cfs_bandwidth(tg, period, quota); ++ return ret ?: nbytes; ++} ++#endif ++ ++static struct cftype cpu_files[] = { ++ { ++ .name = "stat", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_stats_show, ++ }, ++#ifdef CONFIG_FAIR_GROUP_SCHED ++ { ++ .name = "weight", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .read_u64 = cpu_weight_read_u64, ++ .write_u64 = cpu_weight_write_u64, ++ }, ++#endif ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ .name = "max", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_max_show, ++ .write = cpu_max_write, ++ }, ++#endif ++ { } /* terminate */ ++}; ++ + struct cgroup_subsys cpu_cgrp_subsys = { + .css_alloc = cpu_cgroup_css_alloc, + .css_online = cpu_cgroup_css_online, +@@ -7262,7 +7395,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, + .legacy_cftypes = cpu_legacy_files, ++ .dfl_cftypes = cpu_files, + .early_init = true, ++#ifdef CONFIG_CGROUP_CPUACCT ++ /* ++ * cpuacct is enabled together with cpu on the unified hierarchy ++ * and its stats are reported through "cpu.stat". ++ */ ++ .depends_on = 1 << cpuacct_cgrp_id, ++#endif + }; + + #endif /* CONFIG_CGROUP_SCHED */ +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index 6151c23f722f..fc1cf13c3af1 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -347,6 +347,31 @@ static struct cftype files[] = { + { } /* terminate */ + }; + ++/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ ++void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++ struct cgroup_subsys_state *css; ++ u64 usage, val[CPUACCT_STAT_NSTATS]; ++ ++ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); ++ ++ usage = cpuusage_read(css, seq_cft(sf)); ++ cpuacct_stats_read(css_ca(css), &val); ++ ++ val[CPUACCT_STAT_USER] *= TICK_NSEC; ++ val[CPUACCT_STAT_SYSTEM] *= TICK_NSEC; ++ do_div(usage, NSEC_PER_USEC); ++ do_div(val[CPUACCT_STAT_USER], NSEC_PER_USEC); ++ do_div(val[CPUACCT_STAT_SYSTEM], NSEC_PER_USEC); ++ ++ seq_printf(sf, "usage_usec %llu\n" ++ "user_usec %llu\n" ++ "system_usec %llu\n", ++ usage, val[CPUACCT_STAT_USER], val[CPUACCT_STAT_SYSTEM]); ++ ++ css_put(css); ++} ++ + /* + * charge this task's execution time to its accounting group. + * +diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h +index ba72807c73d4..ddf7af466d35 100644 +--- a/kernel/sched/cpuacct.h ++++ b/kernel/sched/cpuacct.h +@@ -2,6 +2,7 @@ + + extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); + extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); ++extern void cpuacct_cpu_stats_show(struct seq_file *sf); + + #else + +@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val) + { + } + ++static inline void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++} ++ + #endif + +commit 8dde150866b8c433216105c50b7e889d5242d583 +Author: Tejun Heo +Date: Fri Aug 5 12:41:01 2016 -0400 + + cgroup: add documentation regarding CPU controller cgroup v2 support + + Signed-off-by: Tejun Heo + +diff --git a/Documentation/cgroup-v2-cpu.txt b/Documentation/cgroup-v2-cpu.txt +new file mode 100644 +index 000000000000..1ed7032d4472 +--- /dev/null ++++ b/Documentation/cgroup-v2-cpu.txt +@@ -0,0 +1,368 @@ ++ ++ ++CPU Controller on Control Group v2 ++ ++August, 2016 Tejun Heo ++ ++ ++While most controllers have support for cgroup v2 now, the CPU ++controller support is not upstream yet due to objections from the ++scheduler maintainers on the basic designs of cgroup v2. This ++document explains the current situation as well as an interim ++solution, and details the disagreements and arguments. The latest ++version of this document can be found at the following URL. ++ ++ https://git.kernel.org/cgit/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu ++ ++This document was posted to the linux-kernel and cgroup mailing lists. ++Unfortunately, no consensus was reached as of Oct, 2016. The thread ++can be found at the following URL. ++ ++ http://lkml.kernel.org/r/20160805170752.GK2542@mtj.duckdns.org ++ ++ ++CONTENTS ++ ++1. Current Situation and Interim Solution ++2. Disagreements and Arguments ++ 2-1. Contentious Restrictions ++ 2-1-1. Process Granularity ++ 2-1-2. No Internal Process Constraint ++ 2-2. Impact on CPU Controller ++ 2-2-1. Impact of Process Granularity ++ 2-2-2. Impact of No Internal Process Constraint ++ 2-3. Arguments for cgroup v2 ++3. Way Forward ++4. References ++ ++ ++1. Current Situation and Interim Solution ++ ++All objections from the scheduler maintainers apply to cgroup v2 core ++design, and there are no known objections to the specifics of the CPU ++controller cgroup v2 interface. The only blocked part is changes to ++expose the CPU controller interface on cgroup v2, which comprises the ++following two patches: ++ ++ [1] sched: Misc preps for cgroup unified hierarchy interface ++ [2] sched: Implement interface for cgroup unified hierarchy ++ ++The necessary changes are superficial and implement the interface ++files on cgroup v2. The combined diffstat is as follows. ++ ++ kernel/sched/core.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++-- ++ kernel/sched/cpuacct.c | 57 ++++++++++++------ ++ kernel/sched/cpuacct.h | 5 + ++ 3 files changed, 189 insertions(+), 22 deletions(-) ++ ++The patches are easy to apply and forward-port. The following git ++branch will always carry the two patches on top of the latest release ++of the upstream kernel. ++ ++ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu ++ ++There also are versioned branches going back to v4.4. ++ ++ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu-$KERNEL_VER ++ ++While it's difficult to tell whether the CPU controller support will ++be merged, there are crucial resource control features in cgroup v2 ++that are only possible due to the design choices that are being ++objected to, and every effort will be made to ease enabling the CPU ++controller cgroup v2 support out-of-tree for parties which choose to. ++ ++ ++2. Disagreements and Arguments ++ ++There have been several lengthy discussion threads [3][4] on LKML ++around the structural constraints of cgroup v2. The two that affect ++the CPU controller are process granularity and no internal process ++constraint. Both arise primarily from the need for common resource ++domain definition across different resources. ++ ++The common resource domain is a powerful concept in cgroup v2 that ++allows controllers to make basic assumptions about the structural ++organization of processes and controllers inside the cgroup hierarchy, ++and thus solve problems spanning multiple types of resources. The ++prime example for this is page cache writeback: dirty page cache is ++regulated through throttling buffered writers based on memory ++availability, and initiating batched write outs to the disk based on ++IO capacity. Tracking and controlling writeback inside a cgroup thus ++requires the direct cooperation of the memory and the IO controller. ++ ++This easily extends to other areas, such as CPU cycles consumed while ++performing memory reclaim or IO encryption. ++ ++ ++2-1. Contentious Restrictions ++ ++For controllers of different resources to work together, they must ++agree on a common organization. This uniform model across controllers ++imposes two contentious restrictions on the CPU controller: process ++granularity and the no-internal-process constraint. ++ ++ ++ 2-1-1. Process Granularity ++ ++ For memory, because an address space is shared between all threads ++ of a process, the terminal consumer is a process, not a thread. ++ Separating the threads of a single process into different memory ++ control domains doesn't make semantical sense. cgroup v2 ensures ++ that all controller can agree on the same organization by requiring ++ that threads of the same process belong to the same cgroup. ++ ++ There are other reasons to enforce process granularity. One ++ important one is isolating system-level management operations from ++ in-process application operations. The cgroup interface, being a ++ virtual filesystem, is very unfit for multiple independent ++ operations taking place at the same time as most operations have to ++ be multi-step and there is no way to synchronize multiple accessors. ++ See also [5] Documentation/cgroup-v2.txt, "R-2. Thread Granularity" ++ ++ ++ 2-1-2. No Internal Process Constraint ++ ++ cgroup v2 does not allow processes to belong to any cgroup which has ++ child cgroups when resource controllers are enabled on it (the ++ notable exception being the root cgroup itself). This is because, ++ for some resources, a resource domain (cgroup) is not directly ++ comparable to the terminal consumer (process/task) of said resource, ++ and so putting the two into a sibling relationship isn't meaningful. ++ ++ - Differing Control Parameters and Capabilities ++ ++ A cgroup controller has different resource control parameters and ++ capabilities from a terminal consumer, be that a task or process. ++ There are a couple cases where a cgroup control knob can be mapped ++ to a per-task or per-process API but they are exceptions and the ++ mappings aren't obvious even in those cases. ++ ++ For example, task priorities (also known as nice values) set ++ through setpriority(2) are mapped to the CPU controller ++ "cpu.shares" values. However, how exactly the two ranges map and ++ even the fact that they map to each other at all are not obvious. ++ ++ The situation gets further muddled when considering other resource ++ types and control knobs. IO priorities set through ioprio_set(2) ++ cannot be mapped to IO controller weights and most cgroup resource ++ control knobs including the bandwidth control knobs of the CPU ++ controller don't have counterparts in the terminal consumers. ++ ++ - Anonymous Resource Consumption ++ ++ For CPU, every time slice consumed from inside a cgroup, which ++ comprises most but not all of consumed CPU time for the cgroup, ++ can be clearly attributed to a specific task or process. Because ++ these two types of entities are directly comparable as consumers ++ of CPU time, it's theoretically possible to mix tasks and cgroups ++ on the same tree levels and let them directly compete for the time ++ quota available to their common ancestor. ++ ++ However, the same can't be said for resource types like memory or ++ IO: the memory consumed by the page cache, for example, can be ++ tracked on a per-cgroup level, but due to mismatches in lifetimes ++ of involved objects (page cache can persist long after processes ++ are gone), shared usages and the implementation overhead of ++ tracking persistent state, it can no longer be attributed to ++ individual processes after instantiation. Consequently, any IO ++ incurred by page cache writeback can be attributed to a cgroup, ++ but not to the individual consumers inside the cgroup. ++ ++ For memory and IO, this makes a resource domain (cgroup) an object ++ of a fundamentally different type than a terminal consumer ++ (process). A process can't be a first class object in the resource ++ distribution graph as its total resource consumption can't be ++ described without the containing resource domain. ++ ++ Disallowing processes in internal cgroups avoids competition between ++ cgroups and processes which cannot be meaningfully defined for these ++ resources. All resource control takes place among cgroups and a ++ terminal consumer interacts with the containing cgroup the same way ++ it would with the system without cgroup. ++ ++ Root cgroup is exempt from this constraint, which is in line with ++ how root cgroup is handled in general - it's excluded from cgroup ++ resource accounting and control. ++ ++ ++Enforcing process granularity and no internal process constraint ++allows all controllers to be on the same footing in terms of resource ++distribution hierarchy. ++ ++ ++2-2. Impact on CPU Controller ++ ++As indicated earlier, the CPU controller's resource distribution graph ++is the simplest. Every schedulable resource consumption can be ++attributed to a specific task. In addition, for weight based control, ++the per-task priority set through setpriority(2) can be translated to ++and from a per-cgroup weight. As such, the CPU controller can treat a ++task and a cgroup symmetrically, allowing support for any tree layout ++of cgroups and tasks. Both process granularity and the no internal ++process constraint restrict how the CPU controller can be used. ++ ++ ++ 2-2-1. Impact of Process Granularity ++ ++ Process granularity prevents tasks belonging to the same process to ++ be assigned to different cgroups. It was pointed out [6] that this ++ excludes the valid use case of hierarchical CPU distribution within ++ processes. ++ ++ To address this issue, the rgroup (resource group) [7][8][9] ++ interface, an extension of the existing setpriority(2) API, was ++ proposed, which is in line with other programmable priority ++ mechanisms and eliminates the risk of in-application configuration ++ and system configuration stepping on each other's toes. ++ Unfortunately, the proposal quickly turned into discussions around ++ cgroup v2 design decisions [4] and no consensus could be reached. ++ ++ ++ 2-2-2. Impact of No Internal Process Constraint ++ ++ The no internal process constraint disallows tasks from competing ++ directly against cgroups. Here is an excerpt from Peter Zijlstra ++ pointing out the issue [10] - R, L and A are cgroups; t1, t2, t3 and ++ t4 are tasks: ++ ++ ++ R ++ / | \ ++ t1 t2 A ++ / \ ++ t3 t4 ++ ++ ++ Is fundamentally different from: ++ ++ ++ R ++ / \ ++ L A ++ / \ / \ ++ t1 t2 t3 t4 ++ ++ ++ Because if in the first hierarchy you add a task (t5) to R, all of ++ its A will run at 1/4th of total bandwidth where before it had ++ 1/3rd, whereas with the second example, if you add our t5 to L, A ++ doesn't get any less bandwidth. ++ ++ ++ It is true that the trees are semantically different from each other ++ and the symmetric handling of tasks and cgroups is aesthetically ++ pleasing. However, it isn't clear what the practical usefulness of ++ a layout with direct competition between tasks and cgroups would be, ++ considering that number and behavior of tasks are controlled by each ++ application, and cgroups primarily deal with system level resource ++ distribution; changes in the number of active threads would directly ++ impact resource distribution. Real world use cases of such layouts ++ could not be established during the discussions. ++ ++ ++2-3. Arguments for cgroup v2 ++ ++There are strong demands for comprehensive hierarchical resource ++control across all major resources, and establishing a common resource ++hierarchy is an essential step. As with most engineering decisions, ++common resource hierarchy definition comes with its trade-offs. With ++cgroup v2, the trade-offs are in the form of structural constraints ++which, among others, restrict the CPU controller's space of possible ++configurations. ++ ++However, even with the restrictions, cgroup v2, in combination with ++rgroup, covers most of identified real world use cases while enabling ++new important use cases of resource control across multiple resource ++types that were fundamentally broken previously. ++ ++Furthermore, for resource control, treating resource domains as ++objects of a different type from terminal consumers has important ++advantages - it can account for resource consumptions which are not ++tied to any specific terminal consumer, be that a task or process, and ++allows decoupling resource distribution controls from in-application ++APIs. Even the CPU controller may benefit from it as the kernel can ++consume significant amount of CPU cycles in interrupt context or tasks ++shared across multiple resource domains (e.g. softirq). ++ ++Finally, it's important to note that enabling cgroup v2 support for ++the CPU controller doesn't block use cases which require the features ++which are not available on cgroup v2. Unlikely, but should anybody ++actually rely on the CPU controller's symmetric handling of tasks and ++cgroups, backward compatibility is and will be maintained by being ++able to disconnect the controller from the cgroup v2 hierarchy and use ++it standalone. This also holds for cpuset which is often used in ++highly customized configurations which might be a poor fit for common ++resource domains. ++ ++The required changes are minimal, the benefits for the target use ++cases are critical and obvious, and use cases which have to use v1 can ++continue to do so. ++ ++ ++3. Way Forward ++ ++cgroup v2 primarily aims to solve the problem of comprehensive ++hierarchical resource control across all major computing resources, ++which is one of the core problems of modern server infrastructure ++engineering. The trade-offs that cgroup v2 took are results of ++pursuing that goal and gaining a better understanding of the nature of ++resource control in the process. ++ ++I believe that real world usages will prove cgroup v2's model right, ++considering the crucial pieces of comprehensive resource control that ++cannot be implemented without common resource domains. This is not to ++say that cgroup v2 is fixed in stone and can't be updated; if there is ++an approach which better serves both comprehensive resource control ++and the CPU controller's flexibility, we will surely move towards ++that. It goes without saying that discussions around such approach ++should consider practical aspects of resource control as a whole ++rather than absolutely focusing on a particular controller. ++ ++Until such consensus can be reached, the CPU controller cgroup v2 ++support will be maintained out of the mainline kernel in an easily ++accessible form. If there is anything cgroup developers can do to ++ease the pain, please feel free to contact us on the cgroup mailing ++list at cgroups@vger.kernel.org. ++ ++ ++4. References ++ ++[1] http://lkml.kernel.org/r/20160105164834.GE5995@mtj.duckdns.org ++ [PATCH 1/2] sched: Misc preps for cgroup unified hierarchy interface ++ Tejun Heo ++ ++[2] http://lkml.kernel.org/r/20160105164852.GF5995@mtj.duckdns.org ++ [PATCH 2/2] sched: Implement interface for cgroup unified hierarchy ++ Tejun Heo ++ ++[3] http://lkml.kernel.org/r/1438641689-14655-4-git-send-email-tj@kernel.org ++ [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy ++ Tejun Heo ++ ++[4] http://lkml.kernel.org/r/20160407064549.GH3430@twins.programming.kicks-ass.net ++ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP ++ Peter Zijlstra ++ ++[5] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt ++ Control Group v2 ++ Tejun Heo ++ ++[6] http://lkml.kernel.org/r/CAPM31RJNy3jgG=DYe6GO=wyL4BPPxwUm1f2S6YXacQmo7viFZA@mail.gmail.com ++ Re: [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy ++ Paul Turner ++ ++[7] http://lkml.kernel.org/r/20160105154503.GC5995@mtj.duckdns.org ++ [RFD] cgroup: thread granularity support for cpu controller ++ Tejun Heo ++ ++[8] http://lkml.kernel.org/r/1457710888-31182-1-git-send-email-tj@kernel.org ++ [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP ++ Tejun Heo ++ ++[9] http://lkml.kernel.org/r/20160311160522.GA24046@htj.duckdns.org ++ Example program for PRIO_RGRP ++ Tejun Heo ++ ++[10] http://lkml.kernel.org/r/20160407082810.GN3430@twins.programming.kicks-ass.net ++ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource ++ Peter Zijlstra diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.6.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.6.patch deleted file mode 100644 index f64908317cac..000000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.6.patch +++ /dev/null @@ -1,407 +0,0 @@ -commit 6426c5b02d4aab620219b08a5d97ad8851b56b0d -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, remove pointless cpuacct_stat_desc[] array. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index d1f7149..0d34f35 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8371,7 +8371,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8411,7 +8411,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8432,7 +8432,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8457,7 +8457,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = true, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 4a81120..b99030a 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -180,36 +180,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) - return 0; - } - --static const char * const cpuacct_stat_desc[] = { -- [CPUACCT_STAT_USER] = "user", -- [CPUACCT_STAT_SYSTEM] = "system", --}; -- --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); - int cpu; -- s64 val = 0; - -+ *userp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_USER]; -- val += kcpustat->cpustat[CPUTIME_NICE]; -+ *userp += kcpustat->cpustat[CPUTIME_USER]; -+ *userp += kcpustat->cpustat[CPUTIME_NICE]; - } -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); - -- val = 0; -+ *sysp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_SYSTEM]; -- val += kcpustat->cpustat[CPUTIME_IRQ]; -- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; -+ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; - } -+} - -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ cputime64_t user, sys; - -+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); -+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); -+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); - return 0; - } - - -commit d2a799f795a5d5a69c9dc365c34f926e0649f840 -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 0d34f35..5990efc 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8450,6 +8450,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_released = cpu_cgroup_css_released, -@@ -8458,7 +8591,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = true, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index b99030a..a1a5a4b 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -227,6 +227,30 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, user, sys; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &user, &sys); -+ -+ user *= TICK_NSEC; -+ sys *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(user, NSEC_PER_USEC); -+ do_div(sys, NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", usage, user, sys); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ba72807..ddf7af4 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.7.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.7.patch deleted file mode 100644 index 74dae740e37c..000000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.7.patch +++ /dev/null @@ -1,407 +0,0 @@ -commit 0d966df508ef4d6c0b1baae9e369f4fb0d3e10af -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, remove pointless cpuacct_stat_desc[] array. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 97ee9ac..c148dfe 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8482,7 +8482,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8522,7 +8522,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8543,7 +8543,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8568,7 +8568,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = true, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 41f85c4..3eb9eda 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -242,36 +242,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) - return __cpuacct_percpu_seq_show(m, CPUACCT_USAGE_NRUSAGE); - } - --static const char * const cpuacct_stat_desc[] = { -- [CPUACCT_STAT_USER] = "user", -- [CPUACCT_STAT_SYSTEM] = "system", --}; -- --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); - int cpu; -- s64 val = 0; - -+ *userp = 0; - for_each_possible_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_USER]; -- val += kcpustat->cpustat[CPUTIME_NICE]; -+ *userp += kcpustat->cpustat[CPUTIME_USER]; -+ *userp += kcpustat->cpustat[CPUTIME_NICE]; - } -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); - -- val = 0; -+ *sysp = 0; - for_each_possible_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_SYSTEM]; -- val += kcpustat->cpustat[CPUTIME_IRQ]; -- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; -+ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; - } -+} - -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ cputime64_t user, sys; - -+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); -+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); -+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); - return 0; - } - - -commit ed6d93036ec930cb774da10b7c87f67905ce71f1 -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index c148dfe..7bba2c5 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8561,6 +8561,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_released = cpu_cgroup_css_released, -@@ -8569,7 +8702,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = true, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 3eb9eda..7a02d26 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -305,6 +305,30 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, user, sys; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &user, &sys); -+ -+ user *= TICK_NSEC; -+ sys *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(user, NSEC_PER_USEC); -+ do_div(sys, NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", usage, user, sys); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ba72807..ddf7af4 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch new file mode 100644 index 000000000000..6f0904cbce99 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch @@ -0,0 +1,784 @@ +commit 280858b0bb3384b9ec06b455e196b453888bd6b8 +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Misc preps for cgroup unified hierarchy interface + + Make the following changes in preparation for the cpu controller + interface implementation for the unified hierarchy. This patch + doesn't cause any functional differences. + + * s/cpu_stats_show()/cpu_cfs_stats_show()/ + + * s/cpu_files/cpu_legacy_files/ + + * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While + at it, make the @val array u64 for consistency. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 154fd689fe02..57472485b79c 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -8705,7 +8705,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) + return ret; + } + +-static int cpu_stats_show(struct seq_file *sf, void *v) ++static int cpu_cfs_stats_show(struct seq_file *sf, void *v) + { + struct task_group *tg = css_tg(seq_css(sf)); + struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; +@@ -8745,7 +8745,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, + } + #endif /* CONFIG_RT_GROUP_SCHED */ + +-static struct cftype cpu_files[] = { ++static struct cftype cpu_legacy_files[] = { + #ifdef CONFIG_FAIR_GROUP_SCHED + { + .name = "shares", +@@ -8766,7 +8766,7 @@ static struct cftype cpu_files[] = { + }, + { + .name = "stat", +- .seq_show = cpu_stats_show, ++ .seq_show = cpu_cfs_stats_show, + }, + #endif + #ifdef CONFIG_RT_GROUP_SCHED +@@ -8791,7 +8791,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .fork = cpu_cgroup_fork, + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, +- .legacy_cftypes = cpu_files, ++ .legacy_cftypes = cpu_legacy_files, + .early_init = true, + }; + +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index bc0b309c3f19..d1e5dd0b3a64 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -276,26 +276,33 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V) + return 0; + } + +-static int cpuacct_stats_show(struct seq_file *sf, void *v) ++static void cpuacct_stats_read(struct cpuacct *ca, ++ u64 (*val)[CPUACCT_STAT_NSTATS]) + { +- struct cpuacct *ca = css_ca(seq_css(sf)); +- s64 val[CPUACCT_STAT_NSTATS]; + int cpu; +- int stat; + +- memset(val, 0, sizeof(val)); ++ memset(val, 0, sizeof(*val)); ++ + for_each_possible_cpu(cpu) { + u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat; + +- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; +- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; +- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; +- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; +- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; ++ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; ++ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; ++ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; ++ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; ++ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; + } ++} ++ ++static int cpuacct_stats_show(struct seq_file *sf, void *v) ++{ ++ u64 val[CPUACCT_STAT_NSTATS]; ++ int stat; ++ ++ cpuacct_stats_read(css_ca(seq_css(sf)), &val); + + for (stat = 0; stat < CPUACCT_STAT_NSTATS; stat++) { +- seq_printf(sf, "%s %lld\n", ++ seq_printf(sf, "%s %llu\n", + cpuacct_stat_desc[stat], + cputime64_to_clock_t(val[stat])); + } + +commit 015cbdcb90034fd566d00de9d3d405613da3cd26 +Author: Tejun Heo +Date: Fri Mar 11 07:31:23 2016 -0500 + + sched: Implement interface for cgroup unified hierarchy + + While the cpu controller doesn't have any functional problems, there + are a couple interface issues which can be addressed in the v2 + interface. + + * cpuacct being a separate controller. This separation is artificial + and rather pointless as demonstrated by most use cases co-mounting + the two controllers. It also forces certain information to be + accounted twice. + + * Use of different time units. Writable control knobs use + microseconds, some stat fields use nanoseconds while other cpuacct + stat fields use centiseconds. + + * Control knobs which can't be used in the root cgroup still show up + in the root. + + * Control knob names and semantics aren't consistent with other + controllers. + + This patchset implements cpu controller's interface on the unified + hierarchy which adheres to the controller file conventions described + in Documentation/cgroups/unified-hierarchy.txt. Overall, the + following changes are made. + + * cpuacct is implictly enabled and disabled by cpu and its information + is reported through "cpu.stat" which now uses microseconds for all + time durations. All time duration fields now have "_usec" appended + to them for clarity. While this doesn't solve the double accounting + immediately, once majority of users switch to v2, cpu can directly + account and report the relevant stats and cpuacct can be disabled on + the unified hierarchy. + + Note that cpuacct.usage_percpu is currently not included in + "cpu.stat". If this information is actually called for, it can be + added later. + + * "cpu.shares" is replaced with "cpu.weight" and operates on the + standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). + The weight is scaled to scheduler weight so that 100 maps to 1024 + and the ratio relationship is preserved - if weight is W and its + scaled value is S, W / 100 == S / 1024. While the mapped range is a + bit smaller than the orignal scheduler weight range, the dead zones + on both sides are relatively small and covers wider range than the + nice value mappings. This file doesn't make sense in the root + cgroup and isn't create on root. + + * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" + which contains both quota and period. + + * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by + "cpu.rt.max" which contains both runtime and period. + + v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for + CFS bandwidth stats and also using raw division for u64. Use + CONFIG_CFS_BANDWITH and do_div() instead. + + The semantics of "cpu.rt.max" is not fully decided yet. Dropped + for now. + + Signed-off-by: Tejun Heo + Cc: Ingo Molnar + Cc: Peter Zijlstra + Cc: Li Zefan + Cc: Johannes Weiner + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 57472485b79c..c0ae869f51c4 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -8784,6 +8784,139 @@ static struct cftype cpu_legacy_files[] = { + { } /* terminate */ + }; + ++static int cpu_stats_show(struct seq_file *sf, void *v) ++{ ++ cpuacct_cpu_stats_show(sf); ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ struct task_group *tg = css_tg(seq_css(sf)); ++ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; ++ u64 throttled_usec; ++ ++ throttled_usec = cfs_b->throttled_time; ++ do_div(throttled_usec, NSEC_PER_USEC); ++ ++ seq_printf(sf, "nr_periods %d\n" ++ "nr_throttled %d\n" ++ "throttled_usec %llu\n", ++ cfs_b->nr_periods, cfs_b->nr_throttled, ++ throttled_usec); ++ } ++#endif ++ return 0; ++} ++ ++#ifdef CONFIG_FAIR_GROUP_SCHED ++static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, ++ struct cftype *cft) ++{ ++ struct task_group *tg = css_tg(css); ++ u64 weight = scale_load_down(tg->shares); ++ ++ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); ++} ++ ++static int cpu_weight_write_u64(struct cgroup_subsys_state *css, ++ struct cftype *cftype, u64 weight) ++{ ++ /* ++ * cgroup weight knobs should use the common MIN, DFL and MAX ++ * values which are 1, 100 and 10000 respectively. While it loses ++ * a bit of range on both ends, it maps pretty well onto the shares ++ * value used by scheduler and the round-trip conversions preserve ++ * the original value over the entire range. ++ */ ++ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) ++ return -ERANGE; ++ ++ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); ++ ++ return sched_group_set_shares(css_tg(css), scale_load(weight)); ++} ++#endif ++ ++static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, ++ long period, long quota) ++{ ++ if (quota < 0) ++ seq_puts(sf, "max"); ++ else ++ seq_printf(sf, "%ld", quota); ++ ++ seq_printf(sf, " %ld\n", period); ++} ++ ++/* caller should put the current value in *@periodp before calling */ ++static int __maybe_unused cpu_period_quota_parse(char *buf, ++ u64 *periodp, u64 *quotap) ++{ ++ char tok[21]; /* U64_MAX */ ++ ++ if (!sscanf(buf, "%s %llu", tok, periodp)) ++ return -EINVAL; ++ ++ *periodp *= NSEC_PER_USEC; ++ ++ if (sscanf(tok, "%llu", quotap)) ++ *quotap *= NSEC_PER_USEC; ++ else if (!strcmp(tok, "max")) ++ *quotap = RUNTIME_INF; ++ else ++ return -EINVAL; ++ ++ return 0; ++} ++ ++#ifdef CONFIG_CFS_BANDWIDTH ++static int cpu_max_show(struct seq_file *sf, void *v) ++{ ++ struct task_group *tg = css_tg(seq_css(sf)); ++ ++ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); ++ return 0; ++} ++ ++static ssize_t cpu_max_write(struct kernfs_open_file *of, ++ char *buf, size_t nbytes, loff_t off) ++{ ++ struct task_group *tg = css_tg(of_css(of)); ++ u64 period = tg_get_cfs_period(tg); ++ u64 quota; ++ int ret; ++ ++ ret = cpu_period_quota_parse(buf, &period, "a); ++ if (!ret) ++ ret = tg_set_cfs_bandwidth(tg, period, quota); ++ return ret ?: nbytes; ++} ++#endif ++ ++static struct cftype cpu_files[] = { ++ { ++ .name = "stat", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_stats_show, ++ }, ++#ifdef CONFIG_FAIR_GROUP_SCHED ++ { ++ .name = "weight", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .read_u64 = cpu_weight_read_u64, ++ .write_u64 = cpu_weight_write_u64, ++ }, ++#endif ++#ifdef CONFIG_CFS_BANDWIDTH ++ { ++ .name = "max", ++ .flags = CFTYPE_NOT_ON_ROOT, ++ .seq_show = cpu_max_show, ++ .write = cpu_max_write, ++ }, ++#endif ++ { } /* terminate */ ++}; ++ + struct cgroup_subsys cpu_cgrp_subsys = { + .css_alloc = cpu_cgroup_css_alloc, + .css_released = cpu_cgroup_css_released, +@@ -8792,7 +8925,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, + .legacy_cftypes = cpu_legacy_files, ++ .dfl_cftypes = cpu_files, + .early_init = true, ++#ifdef CONFIG_CGROUP_CPUACCT ++ /* ++ * cpuacct is enabled together with cpu on the unified hierarchy ++ * and its stats are reported through "cpu.stat". ++ */ ++ .depends_on = 1 << cpuacct_cgrp_id, ++#endif + }; + + #endif /* CONFIG_CGROUP_SCHED */ +diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c +index d1e5dd0b3a64..57f390514c39 100644 +--- a/kernel/sched/cpuacct.c ++++ b/kernel/sched/cpuacct.c +@@ -347,6 +347,31 @@ static struct cftype files[] = { + { } /* terminate */ + }; + ++/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ ++void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++ struct cgroup_subsys_state *css; ++ u64 usage, val[CPUACCT_STAT_NSTATS]; ++ ++ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); ++ ++ usage = cpuusage_read(css, seq_cft(sf)); ++ cpuacct_stats_read(css_ca(css), &val); ++ ++ val[CPUACCT_STAT_USER] *= TICK_NSEC; ++ val[CPUACCT_STAT_SYSTEM] *= TICK_NSEC; ++ do_div(usage, NSEC_PER_USEC); ++ do_div(val[CPUACCT_STAT_USER], NSEC_PER_USEC); ++ do_div(val[CPUACCT_STAT_SYSTEM], NSEC_PER_USEC); ++ ++ seq_printf(sf, "usage_usec %llu\n" ++ "user_usec %llu\n" ++ "system_usec %llu\n", ++ usage, val[CPUACCT_STAT_USER], val[CPUACCT_STAT_SYSTEM]); ++ ++ css_put(css); ++} ++ + /* + * charge this task's execution time to its accounting group. + * +diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h +index ba72807c73d4..ddf7af466d35 100644 +--- a/kernel/sched/cpuacct.h ++++ b/kernel/sched/cpuacct.h +@@ -2,6 +2,7 @@ + + extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); + extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); ++extern void cpuacct_cpu_stats_show(struct seq_file *sf); + + #else + +@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val) + { + } + ++static inline void cpuacct_cpu_stats_show(struct seq_file *sf) ++{ ++} ++ + #endif + +commit 5019fe3d7ec456b58d451ef06fe1f81d7d9f28a9 +Author: Tejun Heo +Date: Fri Aug 5 12:41:01 2016 -0400 + + cgroup: add documentation regarding CPU controller cgroup v2 support + + Signed-off-by: Tejun Heo + +diff --git a/Documentation/cgroup-v2-cpu.txt b/Documentation/cgroup-v2-cpu.txt +new file mode 100644 +index 000000000000..1ed7032d4472 +--- /dev/null ++++ b/Documentation/cgroup-v2-cpu.txt +@@ -0,0 +1,368 @@ ++ ++ ++CPU Controller on Control Group v2 ++ ++August, 2016 Tejun Heo ++ ++ ++While most controllers have support for cgroup v2 now, the CPU ++controller support is not upstream yet due to objections from the ++scheduler maintainers on the basic designs of cgroup v2. This ++document explains the current situation as well as an interim ++solution, and details the disagreements and arguments. The latest ++version of this document can be found at the following URL. ++ ++ https://git.kernel.org/cgit/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu ++ ++This document was posted to the linux-kernel and cgroup mailing lists. ++Unfortunately, no consensus was reached as of Oct, 2016. The thread ++can be found at the following URL. ++ ++ http://lkml.kernel.org/r/20160805170752.GK2542@mtj.duckdns.org ++ ++ ++CONTENTS ++ ++1. Current Situation and Interim Solution ++2. Disagreements and Arguments ++ 2-1. Contentious Restrictions ++ 2-1-1. Process Granularity ++ 2-1-2. No Internal Process Constraint ++ 2-2. Impact on CPU Controller ++ 2-2-1. Impact of Process Granularity ++ 2-2-2. Impact of No Internal Process Constraint ++ 2-3. Arguments for cgroup v2 ++3. Way Forward ++4. References ++ ++ ++1. Current Situation and Interim Solution ++ ++All objections from the scheduler maintainers apply to cgroup v2 core ++design, and there are no known objections to the specifics of the CPU ++controller cgroup v2 interface. The only blocked part is changes to ++expose the CPU controller interface on cgroup v2, which comprises the ++following two patches: ++ ++ [1] sched: Misc preps for cgroup unified hierarchy interface ++ [2] sched: Implement interface for cgroup unified hierarchy ++ ++The necessary changes are superficial and implement the interface ++files on cgroup v2. The combined diffstat is as follows. ++ ++ kernel/sched/core.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++-- ++ kernel/sched/cpuacct.c | 57 ++++++++++++------ ++ kernel/sched/cpuacct.h | 5 + ++ 3 files changed, 189 insertions(+), 22 deletions(-) ++ ++The patches are easy to apply and forward-port. The following git ++branch will always carry the two patches on top of the latest release ++of the upstream kernel. ++ ++ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu ++ ++There also are versioned branches going back to v4.4. ++ ++ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu-$KERNEL_VER ++ ++While it's difficult to tell whether the CPU controller support will ++be merged, there are crucial resource control features in cgroup v2 ++that are only possible due to the design choices that are being ++objected to, and every effort will be made to ease enabling the CPU ++controller cgroup v2 support out-of-tree for parties which choose to. ++ ++ ++2. Disagreements and Arguments ++ ++There have been several lengthy discussion threads [3][4] on LKML ++around the structural constraints of cgroup v2. The two that affect ++the CPU controller are process granularity and no internal process ++constraint. Both arise primarily from the need for common resource ++domain definition across different resources. ++ ++The common resource domain is a powerful concept in cgroup v2 that ++allows controllers to make basic assumptions about the structural ++organization of processes and controllers inside the cgroup hierarchy, ++and thus solve problems spanning multiple types of resources. The ++prime example for this is page cache writeback: dirty page cache is ++regulated through throttling buffered writers based on memory ++availability, and initiating batched write outs to the disk based on ++IO capacity. Tracking and controlling writeback inside a cgroup thus ++requires the direct cooperation of the memory and the IO controller. ++ ++This easily extends to other areas, such as CPU cycles consumed while ++performing memory reclaim or IO encryption. ++ ++ ++2-1. Contentious Restrictions ++ ++For controllers of different resources to work together, they must ++agree on a common organization. This uniform model across controllers ++imposes two contentious restrictions on the CPU controller: process ++granularity and the no-internal-process constraint. ++ ++ ++ 2-1-1. Process Granularity ++ ++ For memory, because an address space is shared between all threads ++ of a process, the terminal consumer is a process, not a thread. ++ Separating the threads of a single process into different memory ++ control domains doesn't make semantical sense. cgroup v2 ensures ++ that all controller can agree on the same organization by requiring ++ that threads of the same process belong to the same cgroup. ++ ++ There are other reasons to enforce process granularity. One ++ important one is isolating system-level management operations from ++ in-process application operations. The cgroup interface, being a ++ virtual filesystem, is very unfit for multiple independent ++ operations taking place at the same time as most operations have to ++ be multi-step and there is no way to synchronize multiple accessors. ++ See also [5] Documentation/cgroup-v2.txt, "R-2. Thread Granularity" ++ ++ ++ 2-1-2. No Internal Process Constraint ++ ++ cgroup v2 does not allow processes to belong to any cgroup which has ++ child cgroups when resource controllers are enabled on it (the ++ notable exception being the root cgroup itself). This is because, ++ for some resources, a resource domain (cgroup) is not directly ++ comparable to the terminal consumer (process/task) of said resource, ++ and so putting the two into a sibling relationship isn't meaningful. ++ ++ - Differing Control Parameters and Capabilities ++ ++ A cgroup controller has different resource control parameters and ++ capabilities from a terminal consumer, be that a task or process. ++ There are a couple cases where a cgroup control knob can be mapped ++ to a per-task or per-process API but they are exceptions and the ++ mappings aren't obvious even in those cases. ++ ++ For example, task priorities (also known as nice values) set ++ through setpriority(2) are mapped to the CPU controller ++ "cpu.shares" values. However, how exactly the two ranges map and ++ even the fact that they map to each other at all are not obvious. ++ ++ The situation gets further muddled when considering other resource ++ types and control knobs. IO priorities set through ioprio_set(2) ++ cannot be mapped to IO controller weights and most cgroup resource ++ control knobs including the bandwidth control knobs of the CPU ++ controller don't have counterparts in the terminal consumers. ++ ++ - Anonymous Resource Consumption ++ ++ For CPU, every time slice consumed from inside a cgroup, which ++ comprises most but not all of consumed CPU time for the cgroup, ++ can be clearly attributed to a specific task or process. Because ++ these two types of entities are directly comparable as consumers ++ of CPU time, it's theoretically possible to mix tasks and cgroups ++ on the same tree levels and let them directly compete for the time ++ quota available to their common ancestor. ++ ++ However, the same can't be said for resource types like memory or ++ IO: the memory consumed by the page cache, for example, can be ++ tracked on a per-cgroup level, but due to mismatches in lifetimes ++ of involved objects (page cache can persist long after processes ++ are gone), shared usages and the implementation overhead of ++ tracking persistent state, it can no longer be attributed to ++ individual processes after instantiation. Consequently, any IO ++ incurred by page cache writeback can be attributed to a cgroup, ++ but not to the individual consumers inside the cgroup. ++ ++ For memory and IO, this makes a resource domain (cgroup) an object ++ of a fundamentally different type than a terminal consumer ++ (process). A process can't be a first class object in the resource ++ distribution graph as its total resource consumption can't be ++ described without the containing resource domain. ++ ++ Disallowing processes in internal cgroups avoids competition between ++ cgroups and processes which cannot be meaningfully defined for these ++ resources. All resource control takes place among cgroups and a ++ terminal consumer interacts with the containing cgroup the same way ++ it would with the system without cgroup. ++ ++ Root cgroup is exempt from this constraint, which is in line with ++ how root cgroup is handled in general - it's excluded from cgroup ++ resource accounting and control. ++ ++ ++Enforcing process granularity and no internal process constraint ++allows all controllers to be on the same footing in terms of resource ++distribution hierarchy. ++ ++ ++2-2. Impact on CPU Controller ++ ++As indicated earlier, the CPU controller's resource distribution graph ++is the simplest. Every schedulable resource consumption can be ++attributed to a specific task. In addition, for weight based control, ++the per-task priority set through setpriority(2) can be translated to ++and from a per-cgroup weight. As such, the CPU controller can treat a ++task and a cgroup symmetrically, allowing support for any tree layout ++of cgroups and tasks. Both process granularity and the no internal ++process constraint restrict how the CPU controller can be used. ++ ++ ++ 2-2-1. Impact of Process Granularity ++ ++ Process granularity prevents tasks belonging to the same process to ++ be assigned to different cgroups. It was pointed out [6] that this ++ excludes the valid use case of hierarchical CPU distribution within ++ processes. ++ ++ To address this issue, the rgroup (resource group) [7][8][9] ++ interface, an extension of the existing setpriority(2) API, was ++ proposed, which is in line with other programmable priority ++ mechanisms and eliminates the risk of in-application configuration ++ and system configuration stepping on each other's toes. ++ Unfortunately, the proposal quickly turned into discussions around ++ cgroup v2 design decisions [4] and no consensus could be reached. ++ ++ ++ 2-2-2. Impact of No Internal Process Constraint ++ ++ The no internal process constraint disallows tasks from competing ++ directly against cgroups. Here is an excerpt from Peter Zijlstra ++ pointing out the issue [10] - R, L and A are cgroups; t1, t2, t3 and ++ t4 are tasks: ++ ++ ++ R ++ / | \ ++ t1 t2 A ++ / \ ++ t3 t4 ++ ++ ++ Is fundamentally different from: ++ ++ ++ R ++ / \ ++ L A ++ / \ / \ ++ t1 t2 t3 t4 ++ ++ ++ Because if in the first hierarchy you add a task (t5) to R, all of ++ its A will run at 1/4th of total bandwidth where before it had ++ 1/3rd, whereas with the second example, if you add our t5 to L, A ++ doesn't get any less bandwidth. ++ ++ ++ It is true that the trees are semantically different from each other ++ and the symmetric handling of tasks and cgroups is aesthetically ++ pleasing. However, it isn't clear what the practical usefulness of ++ a layout with direct competition between tasks and cgroups would be, ++ considering that number and behavior of tasks are controlled by each ++ application, and cgroups primarily deal with system level resource ++ distribution; changes in the number of active threads would directly ++ impact resource distribution. Real world use cases of such layouts ++ could not be established during the discussions. ++ ++ ++2-3. Arguments for cgroup v2 ++ ++There are strong demands for comprehensive hierarchical resource ++control across all major resources, and establishing a common resource ++hierarchy is an essential step. As with most engineering decisions, ++common resource hierarchy definition comes with its trade-offs. With ++cgroup v2, the trade-offs are in the form of structural constraints ++which, among others, restrict the CPU controller's space of possible ++configurations. ++ ++However, even with the restrictions, cgroup v2, in combination with ++rgroup, covers most of identified real world use cases while enabling ++new important use cases of resource control across multiple resource ++types that were fundamentally broken previously. ++ ++Furthermore, for resource control, treating resource domains as ++objects of a different type from terminal consumers has important ++advantages - it can account for resource consumptions which are not ++tied to any specific terminal consumer, be that a task or process, and ++allows decoupling resource distribution controls from in-application ++APIs. Even the CPU controller may benefit from it as the kernel can ++consume significant amount of CPU cycles in interrupt context or tasks ++shared across multiple resource domains (e.g. softirq). ++ ++Finally, it's important to note that enabling cgroup v2 support for ++the CPU controller doesn't block use cases which require the features ++which are not available on cgroup v2. Unlikely, but should anybody ++actually rely on the CPU controller's symmetric handling of tasks and ++cgroups, backward compatibility is and will be maintained by being ++able to disconnect the controller from the cgroup v2 hierarchy and use ++it standalone. This also holds for cpuset which is often used in ++highly customized configurations which might be a poor fit for common ++resource domains. ++ ++The required changes are minimal, the benefits for the target use ++cases are critical and obvious, and use cases which have to use v1 can ++continue to do so. ++ ++ ++3. Way Forward ++ ++cgroup v2 primarily aims to solve the problem of comprehensive ++hierarchical resource control across all major computing resources, ++which is one of the core problems of modern server infrastructure ++engineering. The trade-offs that cgroup v2 took are results of ++pursuing that goal and gaining a better understanding of the nature of ++resource control in the process. ++ ++I believe that real world usages will prove cgroup v2's model right, ++considering the crucial pieces of comprehensive resource control that ++cannot be implemented without common resource domains. This is not to ++say that cgroup v2 is fixed in stone and can't be updated; if there is ++an approach which better serves both comprehensive resource control ++and the CPU controller's flexibility, we will surely move towards ++that. It goes without saying that discussions around such approach ++should consider practical aspects of resource control as a whole ++rather than absolutely focusing on a particular controller. ++ ++Until such consensus can be reached, the CPU controller cgroup v2 ++support will be maintained out of the mainline kernel in an easily ++accessible form. If there is anything cgroup developers can do to ++ease the pain, please feel free to contact us on the cgroup mailing ++list at cgroups@vger.kernel.org. ++ ++ ++4. References ++ ++[1] http://lkml.kernel.org/r/20160105164834.GE5995@mtj.duckdns.org ++ [PATCH 1/2] sched: Misc preps for cgroup unified hierarchy interface ++ Tejun Heo ++ ++[2] http://lkml.kernel.org/r/20160105164852.GF5995@mtj.duckdns.org ++ [PATCH 2/2] sched: Implement interface for cgroup unified hierarchy ++ Tejun Heo ++ ++[3] http://lkml.kernel.org/r/1438641689-14655-4-git-send-email-tj@kernel.org ++ [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy ++ Tejun Heo ++ ++[4] http://lkml.kernel.org/r/20160407064549.GH3430@twins.programming.kicks-ass.net ++ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP ++ Peter Zijlstra ++ ++[5] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt ++ Control Group v2 ++ Tejun Heo ++ ++[6] http://lkml.kernel.org/r/CAPM31RJNy3jgG=DYe6GO=wyL4BPPxwUm1f2S6YXacQmo7viFZA@mail.gmail.com ++ Re: [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy ++ Paul Turner ++ ++[7] http://lkml.kernel.org/r/20160105154503.GC5995@mtj.duckdns.org ++ [RFD] cgroup: thread granularity support for cpu controller ++ Tejun Heo ++ ++[8] http://lkml.kernel.org/r/1457710888-31182-1-git-send-email-tj@kernel.org ++ [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP ++ Tejun Heo ++ ++[9] http://lkml.kernel.org/r/20160311160522.GA24046@htj.duckdns.org ++ Example program for PRIO_RGRP ++ Tejun Heo ++ ++[10] http://lkml.kernel.org/r/20160407082810.GN3430@twins.programming.kicks-ass.net ++ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource ++ Peter Zijlstra diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 5574cc937af7..5bce3af94293 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -17,6 +17,7 @@ my $wd = getcwd; my $debug = $ENV{'DEBUG'}; my $autoModules = $ENV{'AUTO_MODULES'}; +my $preferBuiltin = $ENV{'PREFER_BUILTIN'}; $SIG{PIPE} = 'IGNORE'; @@ -73,7 +74,7 @@ sub runConfig { my $question = $1; my $name = $2; my $alts = $3; my $answer = ""; # Build everything as a module if possible. - $answer = "m" if $autoModules && $alts =~ /\/m/; + $answer = "m" if $autoModules && $alts =~ /\/m/ && !($preferBuiltin && $alts =~ /Y/); $answer = $answers{$name} if defined $answers{$name}; print STDERR "QUESTION: $question, NAME: $name, ALTS: $alts, ANSWER: $answer\n" if $debug; print OUT "$answer\n"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index af14434b08f2..bbe867926927 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 , ... }: @@ -55,10 +56,11 @@ let kernelBaseConfig = stdenv.platform.kernelBaseConfig; kernelTarget = stdenv.platform.kernelTarget; autoModules = stdenv.platform.kernelAutoModules; + preferBuiltin = stdenv.platform.kernelPreferBuiltin or false; arch = stdenv.platform.kernelArch; crossAttrs = let - cp = stdenv.cross.platform; + cp = hostPlatform.platform; in { arch = cp.kernelArch; platformName = cp.name; @@ -92,7 +94,7 @@ let echo "generating kernel configuration..." echo "$kernelConfig" > kernel-config DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \ - SRC=../$sourceRoot perl -w $generateConfig + PREFER_BUILTIN=$preferBuiltin SRC=../$sourceRoot perl -w $generateConfig ''; installPhase = "mv .config $out"; @@ -127,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/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix deleted file mode 100644 index ed8942b10669..000000000000 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv }: - -with stdenv.lib; - -'' -# Auto configuration with these constraints will enable most of the -# important features (RAP, UDEREF, ASLR, memory sanitization). -GRKERNSEC_CONFIG_AUTO y -GRKERNSEC_CONFIG_DESKTOP y -GRKERNSEC_CONFIG_PRIORITY_SECURITY y - -# We specify virt guest rather than host here, the latter deselects e.g., -# paravirtualization. -GRKERNSEC_CONFIG_VIRT_GUEST y -# Note: assumes platform supports CPU-level virtualization (so no pentium 4) -GRKERNSEC_CONFIG_VIRT_EPT y -GRKERNSEC_CONFIG_VIRT_KVM y - -# PaX control -PAX_SOFTMODE y -PAX_PT_PAX_FLAGS y -PAX_XATTR_PAX_FLAGS y -PAX_EI_PAX n - -PAX_INITIFY y - -# The bts instrumentation method is compatible with binary only modules. -# -# Note: if platform supports SMEP, we could do without this -PAX_KERNEXEC_PLUGIN_METHOD_BTS y - -# Additional grsec hardening not implied by auto constraints -GRKERNSEC_IO y -GRKERNSEC_SYSFS_RESTRICT y -GRKERNSEC_ROFS y - -GRKERNSEC_MODHARDEN y - -# Disable protections rendered useless by redistribution -GRKERNSEC_HIDESYM n -GRKERNSEC_RANDSTRUCT n - -# Disable protections covered by vanilla mechanisms -GRKERNSEC_DMESG n -GRKERNSEC_KMEM n -GRKERNSEC_PROC n - -# Disable protections that are inappropriate for a general-purpose kernel -GRKERNSEC_NO_SIMULT_CONNECT n - -# Enable additional audititing -GRKERNSEC_AUDIT_MOUNT y -GRKERNSEC_AUDIT_PTRACE y -GRKERNSEC_FORKFAIL y - -# Wishlist: support trusted path execution -GRKERNSEC_TPE n - -GRKERNSEC_SYSCTL y -GRKERNSEC_SYSCTL_DISTRO y -# Assume that appropriate sysctls are toggled once the system is up -GRKERNSEC_SYSCTL_ON n -'' diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch b/pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch deleted file mode 100644 index e0430a69c950..000000000000 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru a/kernel/kmod.c b/kernel/kmod.c ---- a/kernel/kmod.c 2016-04-21 17:06:09.882281660 +0200 -+++ b/kernel/kmod.c 2016-04-21 17:08:17.458949309 +0200 -@@ -294,7 +294,9 @@ - strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) && - strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) && - strncmp(sub_info->path, "/usr/sbin/", 10) && strcmp(sub_info->path, "/bin/false") && -- strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) { -+ strcmp(sub_info->path, "/usr/share/apport/apport") && -+ strncmp(sub_info->path, "/nix/store/", 11) && -+ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) { - printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path); - retval = -EPERM; - goto out; diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix new file mode 100644 index 000000000000..ba5e538c493a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -0,0 +1,63 @@ +# Based on recommendations from: +# http://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project#Recommended_settings +# https://wiki.gentoo.org/wiki/Hardened/Hardened_Kernel_Project +# +# Dangerous features that can be permanently (for the boot session) disabled at +# boot via sysctl or kernel cmdline are left enabled here, for improved +# flexibility. + +{ stdenv, version }: + +with stdenv.lib; + +assert (versionAtLeast version "4.9"); + +'' +GCC_PLUGINS y # Enable gcc plugin options + +${optionalString (versionAtLeast version "4.11") '' + GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin +''} + +DEBUG_WX y # A one-time check for W+X mappings at boot; doesn't do anything beyond printing a warning + +${optionalString (versionAtLeast version "4.10") '' + BUG_ON_DATA_CORRUPTION y # BUG if kernel struct validation detects corruption +''} + +# Additional validation of commonly targetted structures +DEBUG_CREDENTIALS y +DEBUG_NOTIFIERS y +DEBUG_LIST y +DEBUG_SG y + +HARDENED_USERCOPY y # Bounds check usercopy + +# Wipe on free with page_poison=1 +PAGE_POISONING y +PAGE_POISONING_NO_SANITY y +PAGE_POISONING_ZERO y + +CC_STACKPROTECTOR_REGULAR n +CC_STACKPROTECTOR_STRONG y + +# Stricter /dev/mem +STRICT_DEVMEM y +IO_STRICT_DEVMEM y + +# Disable various dangerous settings +ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory +PROC_KCORE n # Exposes kernel text image layout +INET_DIAG n # Has been used for heap based attacks in the past + +${optionalString (stdenv.system == "x86_64-linux") '' + DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory + + # Reduce attack surface by disabling various emulations + IA32_EMULATION n + X86_X32 n + + VMAP_STACK y # Catch kernel stack overflows +''} + +'' diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 8ab879f7b00e..9587ba356ff5 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-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix deleted file mode 100644 index f82eb073de9a..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.12.71"; - extraMeta.branch = "3.12"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "11wmrj2zqb3x2az22q7ggdp6ibhqmlngy7v01fm8vrhz7f6lwf87"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix deleted file mode 100644 index 01ee7211ba6f..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.10.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.10.1"; - extraMeta.branch = "4.10"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hrmph137q4j2xfsv1fyayig47g4v8ivd2rqsw03dy7mzasnp83c"; - }; - - 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.1.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix similarity index 64% rename from pkgs/os-specific/linux/kernel/linux-4.1.nix rename to pkgs/os-specific/linux/kernel/linux-4.12.nix index 9c7354024ada..9b8c99e1bc4d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.38"; - extraMeta.branch = "4.1"; + version = "4.12.3"; + extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0mmx11z1wlnlaw2nhpdw76xzmqmfr8q52dv0jvy0pjq8rcbk3hmq"; + sha256 = "05mz5rza2cn7pnn0cgd4pxal4xyjk74bl6h742v0xxlf4aqrvgcr"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index fba52eeaee5b..de98da0a48a4 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.52"; + version = "4.4.78"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01hz3g7j1m8dis6pyy9p8pi5ixl32g6cvgav0i7a7qbkrspdvlp8"; + sha256 = "14xnmcw0f2faizd6ylhgw929yyc30hglr82mc5c62yzgszsdngvw"; }; 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 9290bb125f50..59f349078ee6 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.13"; + version = "4.9.39"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0s52hrs3wrsa1chzgcqpxwgb5kjmpfd82i964n9d2bmk9zn4liin"; + sha256 = "0cgs3kprx73qffzy0vwd3wz0jdsxbb8b9p881mrcxa3gjfxzg33f"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix deleted file mode 100644 index c8e189dcbfcb..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchgit, perl, buildLinux, ncurses, openssh, ... } @ args: - -# ChromiumOS requires a 64bit build host -assert stdenv.is64bit; - -import ./generic.nix (args // rec { - version = "3.14.0"; - extraMeta.branch = "3.14"; - - src = fetchgit { - url = "https://chromium.googlesource.com/chromiumos/third_party/kernel"; - rev = "63a768b40c91c6f3518ea1f20d0cb664ed4e6a57"; - sha256 = "1gysrjanvnkbvgml7ipjr119bmlqfqn2zz5ca5kjkapwrfm3cb69"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; - features.chromiumos = true; -} // (args.argsOverride or {})) 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 b80c9acd659e..e27b2afb200e 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-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix deleted file mode 100644 index 859385c4e994..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.9.13"; - extraMeta.branch = "4.9"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha512 = "2mszr7n212ryaw5q2lj92766aqnjznkfr7ly04g2ggzk7cyiirrf1w37d9arzg3smn5695fb1frikacnbrmz2hsaia48kjhwgjbxn2h"; - }; - - 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-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix new file mode 100644 index 000000000000..abec37a268c4 --- /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.3"; + revision = "a"; + sha256 = "0nxzpkh2ca47g6qykkfhf8qynpx3kr9vdkm9wixky159zxfj6s85"; +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 e533670014b3..7e6110bf4a39 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91.2"; - modDirVersion = "4.1.35"; + mptcpVersion = "0.91.3"; + modDirVersion = "4.1.38"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { @@ -12,7 +12,7 @@ import ./generic.nix (args // rec { src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk"; + sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 264d4dffee1e..0e7f332e6177 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.4.50"; - tag = "1.20170303"; + modDirVersion = "4.9.24"; + tag = "1.20170427"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "1lvsr8zm8p1ng4b9vq0nkf2gn4gabla8dh6l60vifclqdcq2vwvx"; + sha256 = "0f7p2jc3a9yvz7k1fig6fardgz2lvp5kawbb3rfsx2p53yjlhmf9"; }; features.iwlwifi = true; @@ -36,6 +36,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { } # I am not sure if all of these are correct... + copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb @@ -45,5 +46,6 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb + # bcm2710-rpi-cm3.dts is yet unknown. ''; }) 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 000000000000..5599e1325d98 --- /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 124486606637..64b91cc677db 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.11-rc1"; - modDirVersion = "4.11.0-rc1"; - extraMeta.branch = "4.11"; + version = "4.13-rc2"; + modDirVersion = "4.13.0-rc2"; + extraMeta.branch = "4.13"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "19zcyjqiw255d48k1mk33i1wgbiwv58nn3dw9i9079hfb843s28l"; + url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; + sha256 = "1ni0z3v8zkqlmxn4czbw71yaipp6hbyh39vxdzpqy1dqn7zalmif"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 83020ad35a2b..c295293fa2cc 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,7 @@ -{ stdenv, runCommand, nettools, bc, perl, kmod, openssl, writeTextFile, ubootChooser }: +{ stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl +, writeTextFile, ubootChooser +, hostPlatform +}: let readConfig = configfile: import (runCommand "config.nix" {} '' @@ -102,6 +105,13 @@ let make $makeFlags "''${makeFlagsArray[@]}" oldconfig runHook postConfigure + make $makeFlags prepare + actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)" + if [ "$actualModDirVersion" != "${modDirVersion}" ]; then + echo "Error: modDirVersion specified in the Nix expression is wrong, it should be: $actualModDirVersion" + exit 1 + fi + # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged. buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") ''; @@ -139,17 +149,12 @@ let unlink $out/lib/modules/${modDirVersion}/build unlink $out/lib/modules/${modDirVersion}/source - mkdir -p $dev/lib/modules/${modDirVersion} - cd .. - mv $sourceRoot $dev/lib/modules/${modDirVersion}/source + mkdir -p $dev/lib/modules/${modDirVersion}/build + cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source cd $dev/lib/modules/${modDirVersion}/source - mv $buildRoot/.config $buildRoot/Module.symvers $TMPDIR - rm -fR $buildRoot - mkdir $buildRoot - mv $TMPDIR/.config $TMPDIR/Module.symvers $buildRoot - make modules_prepare $makeFlags "''${makeFlagsArray[@]}" - mv $buildRoot $dev/lib/modules/${modDirVersion}/build + cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build + make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build # !!! No documentation on how much of the source tree must be kept # If/when kernel builds fail due to missing files, you can add @@ -157,7 +162,7 @@ let # from drivers/ in the future; it adds 50M to keep all of its # headers on 3.10 though. - chmod +w -R ../source + chmod u+w -R ../source arch=`cd $dev/lib/modules/${modDirVersion}/build/arch; ls` # Remove unusued arches @@ -170,14 +175,14 @@ let rm -fR drivers # Keep all headers - find . -type f -name '*.h' -print0 | xargs -0 chmod -w + find . -type f -name '*.h' -print0 | xargs -0 chmod u-w # Keep root and arch-specific Makefiles - chmod -w Makefile - chmod -w arch/$arch/Makefile* + chmod u-w Makefile + chmod u-w arch/$arch/Makefile* # Keep whole scripts dir - chmod -w -R scripts + chmod u-w -R scripts # Delete everything not kept find . -type f -perm -u=w -print0 | xargs -0 rm @@ -217,7 +222,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; - nativeBuildInputs = [ perl bc nettools openssl ] ++ optional (stdenv.platform.uboot != null) + nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null) (ubootChooser stdenv.platform.uboot); hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; @@ -228,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/p9-fixes.patch b/pkgs/os-specific/linux/kernel/p9-fixes.patch new file mode 100644 index 000000000000..f6061b60667a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/p9-fixes.patch @@ -0,0 +1,85 @@ +diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c +--- a/fs/9p/vfs_inode.c ++++ b/fs/9p/vfs_inode.c +@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) + + if (v9inode->qid.type != st->qid.type) + return 0; ++ ++ if (v9inode->qid.path != st->qid.path) ++ return 0; + return 1; + } + +diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c +--- a/fs/9p/vfs_inode_dotl.c ++++ b/fs/9p/vfs_inode_dotl.c +@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) + + if (v9inode->qid.type != st->qid.type) + return 0; ++ ++ if (v9inode->qid.path != st->qid.path) ++ return 0; + return 1; + } + +diff --git a/net/9p/client.c b/net/9p/client.c +index 3ce672af1596..f1c8ad373f90 100644 +--- a/net/9p/client.c ++++ b/net/9p/client.c +@@ -749,8 +749,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) + } + again: + /* Wait for the response */ +- err = wait_event_interruptible(*req->wq, +- req->status >= REQ_STATUS_RCVD); ++ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); + + /* + * Make sure our req is coherent with regard to updates in other +diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c +index f24b25c25106..f3a4efcf1456 100644 +--- a/net/9p/trans_virtio.c ++++ b/net/9p/trans_virtio.c +@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) + if (err == -ENOSPC) { + chan->ring_bufs_avail = 0; + spin_unlock_irqrestore(&chan->lock, flags); +- err = wait_event_interruptible(*chan->vc_wq, +- chan->ring_bufs_avail); ++ err = wait_event_killable(*chan->vc_wq, ++ chan->ring_bufs_avail); + if (err == -ERESTARTSYS) + return err; + +@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, + * Other zc request to finish here + */ + if (atomic_read(&vp_pinned) >= chan->p9_max_pages) { +- err = wait_event_interruptible(vp_wq, ++ err = wait_event_killable(vp_wq, + (atomic_read(&vp_pinned) < chan->p9_max_pages)); + if (err == -ERESTARTSYS) + return err; +@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, + if (err == -ENOSPC) { + chan->ring_bufs_avail = 0; + spin_unlock_irqrestore(&chan->lock, flags); +- err = wait_event_interruptible(*chan->vc_wq, +- chan->ring_bufs_avail); ++ err = wait_event_killable(*chan->vc_wq, ++ chan->ring_bufs_avail); + if (err == -ERESTARTSYS) + goto err_out; + +@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, + virtqueue_kick(chan->vq); + spin_unlock_irqrestore(&chan->lock, flags); + p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n"); +- err = wait_event_interruptible(*req->wq, +- req->status >= REQ_STATUS_RCVD); ++ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); + /* + * Non kernel buffers are pinned, unpin them + */ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fffe524b11f3..1747d34fe112 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -17,26 +17,6 @@ let ''; }; }; - - grsecPatch = { grbranch ? "test", grver ? "3.1", kver, grrev, sha512 }: rec { - name = "grsecurity-${grver}-${kver}-${grrev}"; - - # Pass these along to allow the caller to determine compatibility - inherit grver kver grrev; - - patch = fetchurl { - urls = [ - "https://grsecurity.net/${grbranch}/${name}.patch" - # When updating versions/hashes, ALWAYS use the official - # version; we use this mirror only because upstream removes - # source files immediately upon releasing a new version ... - "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${kver}/${name}.patch" - ]; - inherit sha512; - }; - - features.grsecurity = true; - }; in rec { @@ -52,6 +32,11 @@ rec { patch = ./bridge-stp-helper.patch; }; + p9_fixes = + { name = "p9-fixes"; + patch = ./p9-fixes.patch; + }; + no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; @@ -94,19 +79,13 @@ rec { sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; }; - grsecurity_testing = grsecPatch - { kver = "4.9.13"; - grrev = "201703052141"; - sha512 = "197n21975ifp2nkpl6d7v3r9fllw2l7pyd2h8cic7dnigy65a5jqx1sxhqryivijx3czf6hj173q999j218ihlg15p6a7aqjhkh90kf"; - }; + grsecurity_testing = throw '' + Upstream has ceased free support for grsecurity/PaX. - # This patch relaxes grsec constraints on the location of usermode helpers, - # e.g., modprobe, to allow calling into the Nix store. - grsecurity_nixos_kmod = - { - name = "grsecurity-nixos-kmod"; - patch = ./grsecurity-nixos-kmod.patch; - }; + See https://grsecurity.net/passing_the_baton.php + and https://grsecurity.net/passing_the_baton_faq.php + for more information. + ''; crc_regression = { name = "crc-backport-regression"; @@ -118,12 +97,6 @@ rec { patch = ./genksyms-fix-segfault.patch; }; - - chromiumos_Kconfig_fix_entries_3_14 = - { name = "Kconfig_fix_entries_3_14"; - patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.14.patch; - }; - chromiumos_Kconfig_fix_entries_3_18 = { name = "Kconfig_fix_entries_3_18"; patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index fa4ac3b513d8..b6f1f7d9f8a5 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto +{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , libiberty, libaudit , zlib, withGtk ? false, gtk2 ? null }: @@ -11,7 +11,7 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src patches; + inherit (kernel) src; preConfigure = '' cd tools/perf @@ -24,15 +24,18 @@ stdenv.mkDerivation { # perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit ]; + flex bison libiberty libaudit makeWrapper ]; buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. - NIX_CFLAGS_COMPILE = [ - "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" - ] + NIX_CFLAGS_COMPILE = + [ "-Wno-error=cpp" + "-Wno-error=bool-compare" + "-Wno-error=deprecated-declarations" + "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" + ] # gcc before 6 doesn't know these options ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [ "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" @@ -40,11 +43,16 @@ stdenv.mkDerivation { installFlags = "install install-man ASCIIDOC8=1"; + preFixup = '' + wrapProgram $out/bin/perf \ + --prefix PATH : "${binutils}/bin" + ''; + crossAttrs = { /* 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 84b66ac0d9c7..92ac1a77898c 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-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index ca1131146932..7137390ecabc 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, gnugrep, findutils }: + let - version = "3ubuntu1"; # Saucy -in -stdenv.mkDerivation { + version = "22-1.1ubuntu1"; # Zesty + +in stdenv.mkDerivation { name = "kmod-blacklist-${version}"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; - sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; + sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi"; }; installPhase = '' @@ -15,9 +16,12 @@ stdenv.mkDerivation { for f in modprobe.d/*.conf; do echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf cat "$f" >> "$out"/modprobe.conf + # https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1475945 + sed -i '/^blacklist i2c_801/d' $out/modprobe.conf done substituteInPlace "$out"/modprobe.conf \ + --replace "blacklist bochs-drm" "" \ --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ @@ -25,9 +29,9 @@ stdenv.mkDerivation { --replace " xargs " " ${findutils}/bin/xargs " ''; - meta = { - homepage = http://packages.ubuntu.com/source/saucy/kmod; + meta = with stdenv.lib; { + homepage = http://packages.ubuntu.com/source/zesty/kmod; description = "Linux kernel module blacklists from Ubuntu"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index eac3fb920015..a7b6561239d0 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/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 322df73e404f..5d0dca7b6bec 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }: +{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }: let systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ]; @@ -6,21 +6,22 @@ let in stdenv.mkDerivation rec { name = "kmod-${version}"; - version = "23"; + version = "24"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "0mc12sx06p8il1ym3hdmgxxb37apn9yv7xij26gddjdfkx8xa0yk"; + sha256 = "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; - buildInputs = [ xz /* zlib */ ]; + buildInputs = [ xz ]; + # HACK until BUG issue #21191 is addressed + crossAttrs.preUnpack = ''PATH="${buildPackages.xz}/bin''${PATH:+:}$PATH"''; configureFlags = [ "--sysconfdir=/etc" "--with-xz" "--with-modulesdirs=${modulesDirs}" - # "--with-zlib" ]; patches = [ ./module-dir.patch ]; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 0b707ef7239a..079bfb7c5be1 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: stdenv.mkDerivation rec { - name = "kmscube-2016-09-19"; + name = "kmscube-2017-03-19"; - src = fetchFromGitHub { - owner = "robclark"; - repo = "kmscube"; - rev = "8c6a20901f95e1b465bbca127f9d47fcfb8762e6"; - sha256 = "045pf4q3g5b54cdbxppn1dxpcn81h630vmhrixz1d5bcl822nhwj"; + src = fetchgit { + url = git://anongit.freedesktop.org/mesa/kmscube; + rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea"; + sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index ea54f1a39fd1..d4625687c472 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "libcap-ng-${version}"; # When updating make sure to test that the version with # all of the python bindings still works - version = "0.7.7"; + version = "0.7.8"; src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "0syhyrixk7fqvwis3k7iddn75g0qxysc1q5fifvzccxk7774jmb1"; + sha256 = "0pyhjxgsph3p28ayk4ynxab6wvzaqmazk1nkamx11m2w8jbzj6n2"; }; nativeBuildInputs = [ swig ]; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index b51211e9aaf8..a70ab13db623 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/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 4bf243c4f036..8066eddd4f3d 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }: -let version = "3.2.29"; in +let version = "3.3.0"; in stdenv.mkDerivation { name = "libnl-${version}"; src = fetchFromGitHub { - sha256 = "0y8fcb1bfbdvxgckq5p6l4jzx0kvv3g11svy6d5v3i6zy9kkq8wh"; - rev = "libnl3_2_29"; repo = "libnl"; owner = "thom311"; + rev = "libnl${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1796kyq2lkhz2802v9kp32vlxf8ynlyqgyw9nhmry3qh5d0ahcsv"; }; outputs = [ "bin" "dev" "out" "man" ]; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; - meta = { + meta = with lib; { inherit version; homepage = "http://www.infradead.org/~tgr/libnl/"; - description = "Linux NetLink interface library"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; + description = "Linux Netlink interface library suite"; + license = licenses.lgpl21; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index e2b675fb4ffa..eaf6d98ba9d8 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation { cp -va "out/public-include/"* "$out/include/" ''; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + meta = { homepage = "http://linux.dell.com/libsmbios/main"; description = "A library to obtain BIOS information"; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 3bb61227fe41..d323c277814c 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" ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.bjornfor ]; broken = (builtins.compareVersions kernel.version "3.18" == -1) || - (kernel.features.grsecurity or false) || (kernel.features.chromiumos or false); }; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 9645a2d16b52..b7fa8e140e25 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -2,7 +2,7 @@ , thin-provisioning-tools, enable_dmeventd ? false }: let - version = "2.02.140"; + version = "2.02.173"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "1jd46diyv7074fw8kxwq7imn4pl76g01d8y7z4scq0lkxf8jmpai"; + sha256 = "0r4dx87z7ggxmxligdzz43chgfrwn9lyj7vaz63z97h0gs61dfff"; }; configureFlags = [ @@ -27,10 +27,7 @@ stdenv.mkDerivation { preConfigure = '' - substituteInPlace scripts/lvmdump.sh \ - --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/sbin/lvm $out/sbin/lvm \ --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in @@ -60,7 +57,7 @@ stdenv.mkDerivation { meta = { homepage = http://sourceware.org/lvm2/; - descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; + description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [raskin]; inherit version; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index bab7038aa475..1d432f9bbd99 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0paz0lgb9dzpgahysad1cr6gz54l6xyhqdx6dzw2kh3fy1sw028w"; + sha256 = "15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd"; }; nativeBuildInputs = [ @@ -29,13 +29,12 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch - (fetchurl { - name = "CVE-2017-5985.patch"; - url = "https://github.com/lxc/lxc/commit/d512bd5efb0e407eba350c4e649c464a65b712a3.patch"; - sha256 = "0v1rhlfviadsxj2wmbl7nqb64p6y2bxm9y43sc44jg3k6mkr0r5c"; - }) ]; + postPatch = '' + sed -i '/chmod u+s/d' src/lxc/Makefile.am + ''; + XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; # FIXME @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://lxc.sourceforge.net"; + homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 2555ce5c6c31..c23457c6b5f6 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -2,15 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - # use unstable because it fixed some serious crashes, - # stable should be reconsidered in future - name = "lxcfs-unstable-2017-03-02"; + name = "lxcfs-2.0.7"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; - sha256 = "1say5bf6gknzs0aymvrg2xiypc311gcdcfdmvb2vnz058pmianq9"; - rev = "4a6707e130b4b65a33606ebc18a95ec471f4bf40"; + rev = name; + sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; @@ -34,6 +32,6 @@ stdenv.mkDerivation rec { description = "FUSE filesystem for LXC"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 fpletz ]; }; } diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix index 05d98de0b234..a83e7c852ee2 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 e0109791ef22..589099c911cf 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 ee9d25dfe206..facab7128261 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 4e2888fa942a..a8348acd5d76 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/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix new file mode 100644 index 000000000000..128f3eac2635 --- /dev/null +++ b/pkgs/os-specific/linux/msr-tools/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "msr-tools-${version}"; + version = "1.3"; + + src = fetchurl { + url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip"; + sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr"; + }; + + buildInputs = [ unzip ]; + + preInstall = '' + mkdir -p $out/bin + substituteInPlace Makefile \ + --replace /usr/sbin $out/bin + ''; + + meta = with stdenv.lib; { + description = "Tool to read/write from/to MSR CPU registers on Linux"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 54d6dbcb1ca4..e37a2b9f55e6 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.15"; + version = "1.1.16"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p"; + sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck"; }; enableParallelBuilding = true; @@ -24,13 +24,7 @@ stdenv.mkDerivation rec { "--enable-static" ]; - patches = [ - # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1 - (fetchpatch { - url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7"; - sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v"; - }) - ]; + patches = []; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index f09e9543c48d..bed40fd02e4d 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { sha256 = "0i1y50mf559flhxgaxy2gdpa7dvpp12ix9xfzgxa61rc135x0im4"; }; + patches = [ ./linux_4_11_include_fix.patch ]; + preConfigure = '' cd ./src diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch new file mode 100644 index 000000000000..726efd9f537c --- /dev/null +++ b/pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch @@ -0,0 +1,30 @@ +diff -Naur ProCaptureForLinux_3269/src/sources/avstream/capture.c ProCaptureForLinux_3269_new/src/sources/avstream/capture.c +--- ProCaptureForLinux_3269/src/sources/avstream/capture.c 2016-12-12 17:17:18.000000000 -0800 ++++ ProCaptureForLinux_3269_new/src/sources/avstream/capture.c 2017-05-02 23:58:28.270827491 -0700 +@@ -154,7 +154,9 @@ + if (IS_ERR_OR_NULL(fp)) + return IS_ERR(fp) ? PTR_ERR(fp) : -1; + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ++ ret = vfs_getattr(&fp->f_path, &stat, STATX_BASIC_STATS, AT_STATX_SYNC_AS_STAT); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) + ret = vfs_getattr(&fp->f_path, &stat); + #else + ret = vfs_getattr(fp->f_path.mnt, fp->f_path.dentry, &stat); +diff -Naur ProCaptureForLinux_3269/src/sources/ospi/ospi-linux.c ProCaptureForLinux_3269_new/src/sources/ospi/ospi-linux.c +--- ProCaptureForLinux_3269/src/sources/ospi/ospi-linux.c 2016-12-12 17:17:18.000000000 -0800 ++++ ProCaptureForLinux_3269_new/src/sources/ospi/ospi-linux.c 2017-05-02 23:51:02.197633628 -0700 +@@ -21,6 +21,12 @@ + #include + #include + ++// some functions were moved from linux/sched.h out to their own headers in 4.11.x ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) ++#include ++#include ++#endif ++ + unsigned int debug_level = 0; + + struct kmem_cache *g_spin_cache = NULL; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index ac3cad414799..9fbf30557154 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 81ce7babba15..2e410fec561d 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -39,6 +39,12 @@ 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" ''; makeFlags = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 24a2e2cf06ff..99813d38236b 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -78,7 +78,7 @@ installPhase() { fi # All libs except GUI-only are installed now, so fixup them. - for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'` + for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'` do # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much. diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5e26fef6e19d..307c661ddf43 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ lib, callPackage, fetchurl, fetchpatch }: let generic = args: callPackage (import ./generic.nix args) { }; @@ -6,38 +6,64 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "375.26"; - sha256_32bit = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw"; - sha256_64bit = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg"; - settingsSha256 = "1s8zf5cfhx8m05fvws0gh1q0wy5zyyg2j510zlwp4hk35y7dic5y"; - persistencedSha256 = "15r6rbzyk4yaqkpkqs8j00zc7jbhgp8naskv93dwjyw0lnj0wgky"; + version = "375.66"; + sha256_32bit = "0k7ib5ah3c2apzgzxlq75l48zm8901mbwj7slv18k3rhk8j0w8i9"; + sha256_64bit = "1h01s8brpz42jwc24dsflm4psd3zsy26ds98h0adgwx51dbpzqsr"; + settingsSha256 = "0bpdayyqw4cpgl7bgddfz6w5j8y3wsgr89p5vxnzgk9g0vgqxh5h"; + persistencedSha256 = "113rllf9l26z546jjfijpxllp17qcpawblzxvsqc6rbzbkmvcdwi"; }; beta = generic { - version = "378.09"; - sha256_32bit = "0a1vwvsqi89pn29c9aii53xq8292dxf68sr8lxzx4bpqjqmsbapy"; - sha256_64bit = "018qqg9zlpwd2cad99vbn18rnrrkrqybs7q65h8dmxirkx4pcvh8"; - settingsSha256 = "1fjkpqmzdzk46p1chzxqvbj3cpqcwwx4qmv33yjq7z2a5zab9z8v"; - persistencedSha256 = "1svaa5a0zz0r8qy6pg9lnhy5zmffvw0h120h46qqd01pkb4yv5lc"; + version = "381.22"; + sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv"; + sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs"; + settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh"; + persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963"; }; legacy_340 = generic { - version = "340.101"; - sha256_32bit = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; - sha256_64bit = "02k8j0xzxp2y4vay0kf982q382ny1i4g1kai93f2h5sak6sq3kyj"; - settingsSha256 = "1mavbhff24n0jn154af152fp04njd505scdlxdm850h1ycb2i3g9"; - persistencedSha256 = "1396bmmg9b1z805dzljgi2f219ji84wfnnifdbk32dpd5mrywjk0"; + version = "340.102"; + sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1"; + sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib"; + settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598"; + persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i"; useGLVND = false; + + patches = [ + (fetchpatch { + name = "kernel-4.10.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89; + sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa"; + }) + # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx + # with datestamps removed + ./fs52243.patch + ]; }; legacy_304 = generic { - version = "304.134"; - sha256_32bit = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4"; - sha256_64bit = "0pydw7nr4d2dply38kwvjbghsbilbp2q0mas4nfq5ad050d2c550"; - settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf"; + version = "304.135"; + sha256_32bit = "14qdl39wird04sqba94dcb77i63igmxxav62ndr4qyyavn8s3c2w"; + sha256_64bit = "125mianhvq591np7y5jjrv9vmpbvixnkicr49ni48mcr0yjnjqkh"; + settingsSha256 = "1y7swikdngq4nlwzkrq20yfah9zr31n1a5i6nw37awnp8xjilhzm"; persistencedSha256 = null; useGLVND = false; useProfiles = false; + + prePatch = let + debPatches = fetchurl { + url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/" + + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz"; + sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr"; + }; + prefix = "debian/module/debian/patches"; + applyPatches = pnames: if pnames == [] then null else + '' + tar xf '${debPatches}' + sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch + patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}" + ''; + in applyPatches [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ]; }; legacy_173 = callPackage ./legacy173.nix { }; diff --git a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch new file mode 100644 index 000000000000..212df64fa615 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch @@ -0,0 +1,14 @@ +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -115,7 +115,11 @@ + }; + + static struct drm_driver nv_drm_driver = { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY, ++#else + .driver_features = DRIVER_GEM | DRIVER_PRIME, ++#endif + .load = nv_drm_load, + .unload = nv_drm_unload, + .fops = &nv_drm_fops, diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 9e39a6df09c1..0d19079fe662 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -6,9 +6,12 @@ , useGLVND ? true , useProfiles ? true , preferGtk2 ? false + +, prePatch ? "" +, patches ? [] }: -{ stdenv, callPackage, callPackage_i686, buildEnv, fetchurl +{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch , kernel ? null, xorg, zlib, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -32,16 +35,18 @@ let src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; sha256 = sha256_32bit; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; + url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; sha256 = sha256_64bit; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; + patches = if libsOnly then null else patches; + inherit prePatch; inherit version useGLVND useProfiles; inherit (stdenv) system; @@ -66,7 +71,7 @@ let withGtk2 = preferGtk2; withGtk3 = !preferGtk2; }; - persistenced = if persistencedSha256 == null then null else callPackage (import ./persistenced.nix self persistencedSha256) { }; + persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 6e5b412a9b8f..51a230974c86 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; + url = "https://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; sha256 = "08xb7s7cxmj4zv4i3645kjhlhhwxiq6km9ixmsw3vv91f7rkb6d0"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; + url = "https://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; sha256 = "1p2ls0xj81l8v4n6dbjj3p5wlw1iyhgzyvqcv4h5fdxhhs2cb3md"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index bc79e0efe63c..98d557261faf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (nvidia_x11) version; src = fetchurl { - url = "ftp://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2"; + url = "https://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index f89997441649..ddc190a08e66 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,22 +1,47 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau, libXext , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: -stdenv.mkDerivation rec { - name = "nvidia-settings-${nvidia_x11.version}"; - inherit (nvidia_x11) version; - +let src = fetchurl { - url = "ftp://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2"; + url = "https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.version}.tar.bz2"; inherit sha256; }; + libXNVCtrl = stdenv.mkDerivation { + name = "libXNVCtrl-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + inherit src; + + buildInputs = [ libXrandr libXext ]; + + preBuild = '' + cd src/libXNVCtrl + ''; + + installPhase = '' + mkdir -p $out/lib + mkdir -p $out/include/NVCtrl + + cp libXNVCtrl.a $out/lib + cp NVCtrl.h $out/include/NVCtrl + cp NVCtrlLib.h $out/include/NVCtrl + ''; + }; + +in + +stdenv.mkDerivation rec { + name = "nvidia-settings-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + inherit src; + nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 ] + buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; @@ -52,6 +77,10 @@ stdenv.mkDerivation rec { $out/bin/$binaryName ''; + passthru = { + inherit libXNVCtrl; + }; + meta = with stdenv.lib; { homepage = "http://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index b1e24884557a..9abb20a1c6a8 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; let _kernel = kernel; in stdenv.mkDerivation rec { - version = "2.5.0"; + version = "2.5.2"; name = "openvswitch-${version}"; src = fetchurl { url = "http://openvswitch.org/releases/${name}.tar.gz"; - sha256 = "08bgsqjjn2q5hvxsjqs7n3jir7k7291wlj3blsqhacjhmpxm9nil"; + sha256 = "0ifx758zl97dpad9vpd5i5dqj6i03k632mvgxs82hqkcsb3r6y7q"; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 956492ba747b..5de0081a411c 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pax-utils-${version}"; @@ -9,15 +9,19 @@ stdenv.mkDerivation rec { sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb"; }; - makeFlags = [ - "PREFIX=$(out)" - ]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - description = "A suite of tools for PaX/grsecurity"; - homepage = "https://dev.gentoo.org/~vapier/dist/"; - license = licenses.gpl2; - platforms = platforms.linux; + description = "ELF utils that can check files for security relevant properties"; + longDescription = '' + A suite of ELF tools to aid auditing systems. Contains + various ELF related utils for ELF32, ELF64 binaries useful + for displaying PaX and security info on a large groups of + binary files. + ''; + homepage = https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities; + license = licenses.gpl2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice joachifm ]; }; } diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 85edfa41fa2f..949350b8944e 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -3,8 +3,6 @@ assert stdenv.isLinux; # Don't bother with older versions, though some might even work: assert stdenv.lib.versionAtLeast kernel.version "4.10"; -# Disable on grsecurity kernels, which break module building: -assert !kernel.features ? grsecurity; let release = "0.4.0"; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix new file mode 100644 index 000000000000..a9c84516ef84 --- /dev/null +++ b/pkgs/os-specific/linux/ply/default.nix @@ -0,0 +1,33 @@ +{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison, p7zip }: + +assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; + +let + version = "1.0.beta1-9e810b1"; +in stdenv.mkDerivation { + name = "ply-${version}"; + nativeBuildInputs = [ autoreconfHook flex yacc p7zip ]; + + src = fetchFromGitHub { + owner = "iovisor"; + repo = "ply"; + rev = "9e810b157ba079c32c430a7d4c6034826982056e"; + sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50"; + }; + + preAutoreconf = '' + # ply wants to install header fails to its build directory + # use 7z to handle multiple archive formats transparently + 7z x ${kernel.src} -so | 7z x -aoa -si -ttar + + configureFlagsArray+=(--with-kerneldir=$(echo $(pwd)/linux-*)) + ./autogen.sh --prefix=$out + ''; + + meta = with stdenv.lib; { + description = "dynamic Tracing in Linux"; + homepage = https://wkz.github.io/ply/; + license = [ licenses.gpl2 ]; + maintainers = with maintainers; [ mic92 mbbx6spp ]; + }; +} diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 4d81126af444..5a10f455ea06 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.8"; + name = "powertop-${version}"; + version = "2.9"; src = fetchurl { - url = "https://01.org/sites/default/files/downloads/powertop/${name}.tar.gz"; - sha256 = "0nlwazxbnn0k6q5f5b09wdhw0f194lpzkp3l7vxansqhfczmcyx8"; + url = "https://01.org/sites/default/files/downloads/powertop/powertop-v${version}.tar.gz"; + sha256 = "0l4jjlf05li2mc6g8nrss3h435wjhmnqd8m7v3kha3x0x7cbfzxa"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index afe1a4388600..2fcf6dbf3c00 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, ncurses }: -stdenv.mkDerivation { - name = "procps-3.3.11"; +stdenv.mkDerivation rec { + name = "procps-${version}"; + version = "3.3.12"; src = fetchurl { - url = mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz; - sha256 = "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9"; + url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; + sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf"; }; buildInputs = [ ncurses ]; @@ -14,10 +15,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; - crossAttrs = { - CC = stdenv.cross.config + "-gcc"; - }; - # Too red configureFlags = [ "--disable-modern-top" ]; @@ -26,6 +23,6 @@ stdenv.mkDerivation { 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 2547e26def4b..5fdd1287a647 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/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch deleted file mode 100644 index 2bb93955aeae..000000000000 --- a/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 -From: Brad Jorsch -Date: Fri, 28 Feb 2014 21:55:02 +1100 -Subject: [PATCH] Typo in fuser makes -M on all the time - -Brad found that fuser had the -M option on all the time. -A simple but significant typo caused this, thanks the the patch. - -Bug-Debian: http://bugs.debian.org/740275 - -Signed-off-by: Craig Small ---- - ChangeLog | 4 ++++ - src/fuser.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index fd1cccf..e5f784c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+Changes in 22.22 -+================ -+ * Fixed typo in fuser which has -M on Debian #740275 -+ - Changes in 22.21 - ================ - * Missing comma in fuser(1) added Debian #702391 -diff --git a/src/fuser.c b/src/fuser.c -index b485f65..389b302 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) - usage(_("No process specification given")); - - /* Check if -M flag was used and if so check mounts */ -- if (opts * OPT_ISMOUNTPOINT) { -+ if (opts & OPT_ISMOUNTPOINT) { - check_mountpoints(&mounts, &names_head, &names_tail); - } - --- -1.9.2 - diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 5cf5e9a542d1..edc7220d6586 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -3,18 +3,15 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "psmisc-22.21"; + name = "psmisc-23.1"; src = fetchurl { - url = "mirror://sourceforge/psmisc/${name}.tar.gz"; - sha256 = "0nhlm1vrrwn4a845p6y4nnnb4liq70n74zbdd5dq844jc6nkqclp"; + url = "mirror://sourceforge/psmisc/${name}.tar.xz"; + sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f"; }; buildInputs = [ncurses]; - # From upstream, will be in next release. - patches = [ ./0001-Typo-in-fuser-makes-M-on-all-the-time.patch ]; - meta = { homepage = http://psmisc.sourceforge.net/; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 362f3edbc92a..8ec46d64600a 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig fuse pcre ]; + prePatch = '' + # do not set sticky bit in nix store + substituteInPlace Makefile --replace 6755 0755 + ''; + preConfigure = "substituteInPlace Makefile --replace /usr/local $out"; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index dd6f9ec42afa..fa3c2fc4c7e3 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://0pointer.de/blog/projects/rtkit; - descriptions = "A daemon that hands out real-time priority to processes"; + description = "A daemon that hands out real-time priority to processes"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 05dd0f8ebb96..eb90ac303444 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hadess/rtl8723bs"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - broken = (! versionAtLeast kernel.version "3.19") - || (kernel.features.grsecurity or false); + broken = (! versionAtLeast kernel.version "3.19"); maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 6b1e93e59df0..93c8e5b7ae42 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Grawp/rtl8812au_rtl8821au"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = (kernel.features.grsecurity or false); }; } diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index c6065dbfca2d..52d7446e48cb 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.2.3"; + version = "2.2.0.0"; in stdenv.mkDerivation rec { @@ -10,12 +10,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "1hwc3dmqh4cyhx9b4gd48yvjrwmfkz968rncpqc511krpfwzyngr"; + sha256 = "1y9mva7wk1ca2djq3qjh7hz756zk57yv7ljdnldn7k7jzfmlaxsq"; }; dontDisableStatic = true; configureFlags = [ + "--enable-absolute-paths" "--includedir=\${prefix}/include" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 8c91dc43666d..0c0edde05e22 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2 +{ 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; - dots_in_usernames = fetchurl { + dots_in_usernames = fetchpatch { url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch; sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; }; @@ -28,21 +30,35 @@ stdenv.mkDerivation rec { }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; - nativeBuildInputs = [autoreconfHook libxslt libxml2 + nativeBuildInputs = [autoreconfHook libxslt libxml2 docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison ]; - patches = [ ./keep-path.patch dots_in_usernames ]; + patches = + [ ./keep-path.patch + dots_in_usernames + (fetchpatch { + url = https://github.com/shadow-maint/shadow/commit/507f96cdeb54079fb636c7ce21e371f7a16a520e.patch; + sha256 = "10k70fx3z051f83p1k7ljjaawbykhn7cy6fg1zy04jp3xkvdwxc7"; + }) + ]; + + # The nix daemon often forbids even creating set[ug]id files. + postPatch = + ''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am + ''; outputs = [ "out" "su" "man" ]; + enableParallelBuilding = true; + # Assume System V `setpgrp (void)', which is the default on GNU variants # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) preConfigure = '' export ac_cv_func_setpgrp_void=yes export shadow_cv_logdir=/var/log ( - head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" + head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" tail -n +3 "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml" ) > xmlcatalog configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog "; diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 9a244c6ed8fb..04f5bf53f936 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.01.16"; + version = "0.01.17"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz"; - sha256 = "14n3s6ibm9bq58drvpiasqn11ci6mrwswfpcbpbsimx6fh2j4bi3"; + sha256 = "093ifrz688cm0kmzz1c6himhbdr75ig1mcaapmqy8jadc1gaw2im"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 8e0bb935730d..941bd8a86710 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.9"; - sha256 = "15qpx2nhprmk14jgb7yqp9dvfb6i3hhhspi77kvian171b0a6112"; + version = "0.6.5.11"; + sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5"; }; splUnstable = common { - version = "0.7.0-rc3"; - sha256 = "09v5gh7mqdl3bfq5an9iiw9fw3l1skprclxdz7r19bw3ids3lfja"; + 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 f666ac3e1351..3cb9179f535c 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/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b23da5451d1c..ed0e0849721e 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,19 +1,25 @@ {stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}: -let - inherit (stdenv.lib) optional optionalString; - baseName = "sysdig"; - version = "0.15.0"; -in +with stdenv.lib; stdenv.mkDerivation rec { - name = "${baseName}-${version}"; + name = "sysdig-${version}"; + version = "0.16.0"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2"; + src = fetchFromGitHub { + owner = "draios"; + repo = "sysdig"; + rev = version; + sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06"; }; + patches = [ + (fetchpatch { + # Sysdig fails to run on linux kernels with unified cgroups enabled + url = https://github.com/draios/sysdig/files/909689/0001-Fix-for-linux-kernels-with-cgroup-v2-API-enabled.patch.txt; + sha256 = "10nmisifa500hzpa3899rs837bcal72pnqidxmrnr1js187z8j84"; + }) + ]; + buildInputs = [ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc ]; @@ -25,13 +31,19 @@ stdenv.mkDerivation rec { "-DSYSDIG_VERSION=${version}" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; + # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = [ + "-DluaL_reg=luaL_Reg" + "-DluaL_getn(L,i)=((int)lua_objlen(L,i))" + ]; + preConfigure = '' export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ''; - libPath = stdenv.lib.makeLibraryPath [ + libPath = makeLibraryPath [ zlib luajit ncurses @@ -44,7 +56,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc ]; - postInstall = '' + postInstall = optionalString (!stdenv.isDarwin) '' patchelf --set-rpath "$libPath" "$out/bin/sysdig" patchelf --set-rpath "$libPath" "$out/bin/csysdig" '' + optionalString (kernel != null) '' @@ -61,7 +73,7 @@ stdenv.mkDerivation rec { fi ''; - meta = with stdenv.lib; { + meta = { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = licenses.gpl2; maintainers = [maintainers.raskin]; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index f4ad94b5085c..ce63d383c8e8 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid, mtools, makeWrapper }: +{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: stdenv.mkDerivation rec { name = "syslinux-2015-11-09"; @@ -10,7 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; }; - patches = [ ./perl-deps.patch ]; + patches = [ + ./perl-deps.patch + (fetchurl { + # ldlinux.elf: Not enough room for program headers, try linking with -N + name = "not-enough-room.patch"; + url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/" + + "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7"; + sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; + }) + ]; nativeBuildInputs = [ nasm perl python ]; buildInputs = [ libuuid makeWrapper ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index db474f688e59..41f9c1e3e996 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -9,14 +9,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - version = "232"; + version = "233"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "nixos"; repo = "systemd"; - rev = "c110fc3504d7a2fa944575b347814f7e97d3c5a0"; - sha256 = "19carch1adad70nifbqdx649kj5m8pgpiq27hh05ig38yrbmb2vz"; + 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 042e601ec14f..6ec8abdc1760 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/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 850fbe9f4495..526b1a86db1e 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -57,6 +57,6 @@ in stdenv.mkDerivation rec { homepage = ftp://ftp.porcupine.org/pub/security/index.html; license = "BSD-style"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 5ed7ad5b959c..f1347c197bf6 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, zsh, pinentry, cryptsetup, gnupg1orig, makeWrapper }: - -let - version = "2.2"; -in +{ stdenv, lib, fetchFromGitHub, gettext, zsh, pinentry, cryptsetup, gnupg, makeWrapper }: stdenv.mkDerivation rec { name = "tomb-${version}"; + version = "2.4"; - src = fetchurl { - url = "https://files.dyne.org/tomb/tomb-${version}.tar.gz"; - sha256 = "11msj38fdmymiqcmwq1883kjqi5zr01ybdjj58rfjjrw4zw2w5y0"; + src = fetchFromGitHub { + owner = "dyne"; + repo = "Tomb"; + rev = "v${version}"; + sha256 = "192jpgn02mvi4d4inbq2q11zl7xw6njymvali7al8wmygkkycrw4"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + # if not, it shows .tomb-wrapped when running + substituteInPlace tomb \ + --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' + ''; buildPhase = '' # manually patch the interpreter @@ -20,22 +25,21 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 + install -Dm755 tomb $out/bin/tomb + install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - cp tomb $out/bin/tomb - cp doc/tomb.1 $out/share/man/man1 + # it works fine with gnupg v2, but it looks for an executable named gpg + ln -s ${gnupg}/bin/gpg2 $out/bin/gpg wrapProgram $out/bin/tomb \ - --prefix PATH : "${pinentry}/bin" \ - --prefix PATH : "${cryptsetup}/bin" \ - --prefix PATH : "${gnupg1orig}/bin" + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} ''; - meta = { + meta = with stdenv.lib; { description = "File encryption on GNU/Linux"; - homepage = https://www.dyne.org/software/tomb/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + homepage = https://www.dyne.org/software/tomb/; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix index bf60331d8ade..fbc1685c577c 100644 --- a/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -3,13 +3,13 @@ # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { name = "tpacpi-bat-${version}"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "teleshoes"; repo = "tpacpi-bat"; rev = "v${version}"; - sha256 = "0l72qvjk5j7sg9x4by7an0xwx65x10dx82fky8lnwlwfv54vgg8l"; + sha256 = "0wbaz34z99gqx721alh5vmpxpj2yxg3x9m8jqyivfi1wfpwc2nd5"; }; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/upstart/check-config.nix b/pkgs/os-specific/linux/upstart/check-config.nix new file mode 100644 index 000000000000..5803b4ed8339 --- /dev/null +++ b/pkgs/os-specific/linux/upstart/check-config.nix @@ -0,0 +1,43 @@ +# Useful tool to check syntax of a config file. Upstart needs a dbus +# session, so this script wraps one up and makes the operation not +# require any prior state. +# +# See: http://mwhiteley.com/scripts/2012/12/11/dbus-init-checkconf.html +{stdenv, coreutils, upstart, writeScript, dbus}: + +writeScript "upstart-check-config" '' + #!${stdenv.shell} + + set -o errexit + set -o nounset + + export PATH=${stdenv.lib.makeBinPath [dbus.out upstart coreutils]}:$PATH + + if [[ $# -ne 1 ]] + then + echo "Usage: $0 upstart-conf-file" >&2 + exit 1 + fi + config=$1 && shift + + dbus_pid_file=$(mktemp) + exec 4<> $dbus_pid_file + + dbus_add_file=$(mktemp) + exec 6<> $dbus_add_file + + dbus-daemon --fork --print-pid 4 --print-address 6 --session + + function clean { + dbus_pid=$(cat $dbus_pid_file) + if [[ -n $dbus_pid ]]; then + kill $dbus_pid + fi + rm -f $dbus_pid_file $dbus_add_file + } + trap "{ clean; }" EXIT + + export DBUS_SESSION_BUS_ADDRESS=$(cat $dbus_add_file) + + init-checkconf $config +'' diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 938f4edd2fb8..d5b9be34d9c3 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libnih }: +{ stdenv, fetchurl, pkgconfig, dbus, libnih, python, makeWrapper, utillinux +, writeScript }: -let version = "1.5"; in +let + inherit (stdenv.lib) makeBinPath; + version = "1.5"; -stdenv.mkDerivation rec { + upstart = stdenv.mkDerivation rec { name = "upstart-${version}"; - + src = fetchurl { url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz"; sha256 = "01w4ab6nlisz5blb0an1sxjkndwikr7sjp0cmz4lg00g3n7gahmx"; }; - buildInputs = [ pkgconfig dbus libnih ]; - + buildInputs = [ pkgconfig dbus libnih python makeWrapper]; + NIX_CFLAGS_COMPILE = '' -DSHELL="${stdenv.shell}" @@ -33,6 +36,16 @@ stdenv.mkDerivation rec { t=$out/etc/bash_completion.d mkdir -p $t cp ${./upstart-bash-completion} $t/upstart + + # Patch some binaries to refer to the correct binary location. + sed -i "s,/sbin/init,$out/bin/init,g" $out/bin/init-checkconf + sed -i "s,initctl,$out/bin/initctl," $out/bin/initctl2dot + + # Add some missing executable permissions, and wrap binaries. + chmod +x $out/bin/init-checkconf $out/bin/init-checkconf + wrapProgram $out/bin/init-checkconf \ + --prefix PATH : $out/bin:${makeBinPath [utillinux dbus]} + wrapProgram $out/bin/initctl2dot --prefix PATH : $out/bin ''; meta = { @@ -40,4 +53,6 @@ stdenv.mkDerivation rec { description = "An event-based replacement for the /sbin/init daemon"; platforms = stdenv.lib.platforms.linux; }; -} +}; + +in upstart diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 872a1897457c..8e16a3165f67 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,25 +1,36 @@ { lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow , ncurses ? null, perl ? null, pam, systemd, minimal ? false }: -stdenv.mkDerivation rec { - name = "util-linux-${version}"; +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"; + sha256 = "1wj0fj3iwaimr6p8wxg6l2i1hjyrfgcwcxziyxqz8acxba7k6zxh"; + }; +in stdenv.mkDerivation rec { + name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc"; + sha256 = "13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262"; }; - patches = [ ./rtcwake-search-PATH-for-shutdown.patch ]; + patches = [ + ./rtcwake-search-PATH-for-shutdown.patch + fstrimPatch + ]; outputs = [ "bin" "dev" "out" "man" ]; postPatch = '' substituteInPlace include/pathnames.h \ --replace "/bin/login" "${shadow}/bin/login" + substituteInPlace sys-utils/eject.c \ + --replace "/bin/umount" "$out/bin/umount" ''; crossAttrs = { @@ -27,31 +38,30 @@ stdenv.mkDerivation rec { preConfigure = "export scanf_cv_type_modifier=ms"; }; + preConfigure = lib.optionalString (systemd != null) '' + configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/" + ''; + # !!! It would be better to obtain the path to the mount helpers # (/sbin/mount.*) through an environment variable, but that's # somewhat risky because we have to consider that mount can setuid # root... - configureFlags = '' - --enable-write - --enable-last - --enable-mesg - --disable-use-tty-group - --enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin - ${if ncurses == null then "--without-ncurses" else ""} - ${if systemd == null then "" else '' - --with-systemd - --with-systemdsystemunitdir=$out/lib/systemd/system/ - ''} - ''; + configureFlags = [ + "--enable-write" + "--enable-last" + "--enable-mesg" + "--disable-use-tty-group" + "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin" + "--disable-makeinstall-setuid" "--disable-makeinstall-chown" + ] + ++ lib.optional (ncurses == null) "--without-ncurses"; makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib pam ] - ++ lib.optional (ncurses != null) ncurses - ++ lib.optional (systemd != null) systemd - ++ lib.optional (perl != null) perl; + ++ lib.filter (p: p != null) [ ncurses systemd perl ]; postInstall = '' rm "$bin/bin/su" # su should be supplied by the su package (shadow) 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 2dd3fcc4ebe9..5f38861bf68b 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/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 11a9808392aa..622bf4fbd5cc 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,54 +1,46 @@ -{ stdenv, fetchurl, pkgconfig -, libjpeg -, alsaLib ? null -, libX11 ? null -, qt4 ? null # The default is set to qt4 in all-packages.nix -, qt5 ? null +{ stdenv, lib, fetchurl, pkgconfig, perl +, libjpeg, udev +, withUtils ? true +, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) -assert qt4 != null -> qt5 == null; -assert qt5 != null -> qt4 == null; - -let - inherit (stdenv.lib) optional; -in - stdenv.mkDerivation rec { - name = "v4l-utils-1.10.1"; + name = "v4l-utils-${version}"; + version = "1.12.3"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "1h1nhg5cmmzlbipak526nk4bm6d0yb217mll75f3rpg7kz1cqiv1"; + sha256 = "0vpl3jl0x441y7b5cn7zhdsyi954hp9h2p30jhnr1zkx1rpxsiss"; }; outputs = [ "out" "dev" ]; - configureFlags = [ - "--enable-libv4l" - ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [ - "--with-udevdir=\${out}/lib/udev" - "--enable-v4l-utils" - "--enable-qv4l2" - ] else [ - "--without-libudev" - "--without-udevdir" - "--disable-v4l-utils" - "--disable-qv4l2" - ]); + configureFlags = + if withUtils then [ + "--with-udevdir=\${out}/lib/udev" + ] else [ + "--disable-v4l-utils" + ]; postFixup = '' # Create symlink for V4l1 compatibility ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ alsaLib libX11 qt4 qt5 ]; + buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ]; propagatedBuildInputs = [ libjpeg ]; + NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11"; + + postPatch = '' + patchShebangs . + ''; + meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = http://linuxtv.org/projects.php; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 59b9475160ef..63e2e4ef493c 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, libmnl, kernel ? null }: -# module requires Linux >= 3.18 https://www.wireguard.io/install/#kernel-requirements -assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18"; +# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements +assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170223"; + version = "0.0.20170706"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d"; + sha256 = "0cvc2iv1836l6f0c3v3kqn3zqrr80i123f1cz5kilhk5c91vjqsp"; }; meta = with stdenv.lib; { homepage = https://www.wireguard.io/; downloadPage = https://git.zx2c4.com/WireGuard/refs/; description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security"; - maintainers = with maintainers; [ ericsagnes ]; + maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; license = licenses.gpl2; platforms = platforms.linux; }; @@ -35,6 +35,8 @@ let KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; INSTALL_MOD_PATH = "\${out}"; + NIX_CFLAGS = ["-Wno-error=cpp"]; + buildPhase = "make module"; }; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index fe0d2ca28f99..1cac0911b246 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { homepage = http://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; - maintainers = with maintainers; [ marcweber urkud wkennington ]; + maintainers = with maintainers; [ marcweber wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 89f40589c870..06a38b291661 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,32 +1,25 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }: +{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: stdenv.mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; inherit (wpa_supplicant) src; - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook imagemagick ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmake inkscape imagemagick ]; - patches = [ ./remove_inkscape.patch ]; prePatch = '' cd wpa_supplicant/wpa_gui-qt4 ''; - preConfigure = '' - lrelease wpa_gui.pro - ''; - postBuild = '' make -C icons ''; - installPhase = '' - mkdir -pv $out/bin + postInstall = '' + mkdir -pv $out/{bin,share/applications,share/icons} cp -v wpa_gui $out/bin - mkdir -pv $out/share/applications cp -v wpa_gui.desktop $out/share/applications - mkdir -pv $out/share/icons cp -av icons/hicolor $out/share/icons ''; diff --git a/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch b/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch deleted file mode 100644 index 1bdb164e24f5..000000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7a42ef048b420f9b939085ea8c6af6deb9c19dac Mon Sep 17 00:00:00 2001 -From: Moritz Ulrich -Date: Sun, 30 Oct 2016 22:17:54 +0100 -Subject: [PATCH] Foo - ---- - icons/Makefile | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/icons/Makefile b/icons/Makefile -index 709514c..9a5fa94 100644 ---- a/icons/Makefile -+++ b/icons/Makefile -@@ -9,10 +9,9 @@ all: $(ICONS) - - %.png: - mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/ -- inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \ -- --export-width=$(word 1, $(subst x, , $(@))) \ -- --export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \ -- --export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@)) -+ convert $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) \ -+ -size $(word 1, $(subst x, , $(@)))x$(word 2, $(subst x, , $(subst /, , $(@)))) \ -+ hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@)) - - %.xpm: - mkdir -p pixmaps/ --- -2.10.1 - diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index b308a5ec3c35..e231e3a59892 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { CFLAGS = "-I${pixman}/include/pixman-1"; meta = with stdenv.lib; { - maintainers = [ maintainers.goibhniu maintainers.urkud ]; + maintainers = [ maintainers.goibhniu ]; description = "Wacom digitizer driver for X11"; homepage = http://linuxwacom.sourceforge.net; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 602031bab732..f281e5b590eb 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -123,12 +123,12 @@ in # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.10"; + incompatibleKernelVersion = "4.12"; - version = "0.6.5.9"; + version = "0.6.5.11"; # this package should point to the latest release. - sha256 = "1m8q39j13k46fn0pw3adq87c20rpkg28llxgv2a90994p4127xh0"; + 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-rc3"; + version = "0.7.0-rc5"; # this package should point to a version / git revision compatible with the latest kernel release - sha256 = "0js3lazqq8wb4nklqxd6sgbvwqgwnjgz3xi3mm33xf4284gia6pc"; + 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 6537503add8f..b2b23f200455 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 000000000000..ece2586dc806 --- /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 a9df0d29e09f..6e21826381b6 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, binutilsCross ? 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 binutilsCross ]; - - 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 000000000000..03dbf712e2e5 --- /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 000000000000..c585ab54ff89 --- /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/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 286c63d01637..98461d690d92 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: +{stdenv, fetchurl, binutils ? null, gccCross ? null, onlyHeaders ? false}: let name = "mingwrt-3.20"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { cp -R include $out ''; } else { - buildInputs = [ gccCross binutilsCross ]; + buildInputs = [ gccCross binutils ]; crossConfig = gccCross.crossConfig; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index dde4f5d73711..f0b6852d5bf9 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/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 2a5af71b5eca..3443fff9668d 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, binutilsCross ? null +{ stdenv, fetchurl, xz, binutils ? null , gccCross ? null, onlyHeaders ? false }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation ({ cp -R include $out ''; } else { - buildInputs = [ gccCross binutilsCross ]; + buildInputs = [ gccCross binutils ]; crossConfig = gccCross.crossConfig; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 5c79460060ad..8770140cc633 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/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 581dbc3b1f76..e6102c84f134 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, +{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, binutils, newt, lua, speex, @@ -18,8 +18,17 @@ let # This patch changes the runtime behavior to look for state # directories in /var rather than ${out}/var. ./runtime-vardirs.patch + (fetchpatch { + url = "http://sources.debian.net/data/main/a/asterisk/1:13.14.1~dfsg-1/debian/patches/pjsip_unresolved_symbol.patch"; + sha256 = "0i6a6zplvzbjcvxqlmr87jmrfza7c3qx0rlym2nlmzzp2m7qpnfp"; + }) ]; + # Disable MD5 verification for pjsip + postPatch = '' + sed -i 's|$(verify_tarball)|true|' third-party/pjproject/Makefile + ''; + src = fetchurl { url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; inherit sha256; @@ -64,9 +73,9 @@ let }; }; - pjproject-255 = fetchurl { - url = http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.tar.bz2; - sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb"; + pjproject-26 = fetchurl { + url = http://www.pjsip.org/release/2.6/pjproject-2.6.tar.bz2; + sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; }; mp3-202 = fetchsvn { @@ -79,19 +88,19 @@ in { asterisk-lts = common { - version = "13.13.1"; - sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd"; + version = "13.15.0"; + sha256 = "0i2qzfa1iyh66nma39kdigb9lp5gz3sn46znd2djz24wgmamb2lb"; externals = { - "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; }; }; asterisk-stable = common { - version = "14.2.1"; - sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj"; + version = "14.4.0"; + sha256 = "095slnhl74hs1c36rgg378azan9zwgryp8him7py4am60lbk3n3w"; externals = { - "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; }; }; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 579cd9f4a0eb..20b7250d75df 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.0.3"; + version = "6.2.2"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "0dg5sb2qv2xskvhlrxmidl25kyg1w0dp31a3k8f3las72fhmkpb7"; + sha256 = "1fpn799382m8x7b0s3w4mxzlhy1s62ya287i622gbadqscprhagg"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 05b88cf9cf3b..0d78f361525b 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "2.10.1"; + version = "2.12.0"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "1pl4wyqvzqb97ql23530amslrrsysi0fmmnzpihhgqhvhwf57sc6"; + sha256 = "1kfnsa25axlyhnapfza381p94pyfixh7j999qhpg3ii821n9sggm"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index d0a278d2ef05..48678804c566 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.3.0"; + version = "7.3.7"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0i2r60gzs382i6b9r9cx60j6d1xnr4hrj773d4mbbf8r7sg1n8r0"; + sha256 = "1ixnnw3yj2ip9ndr9pwxcmdy8gaixkmp517ahg3w8xzymr8wh2qp"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index add92f688763..77c836305147 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.9.5"; + version = "0.10.4"; goPackagePath = "github.com/mholt/caddy"; @@ -12,20 +12,18 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0z1qjmlxrsiccrl5cb0j4c48ksng4xgp5bgy11gswrijvymsbq2r"; + sha256 = "0zch19a38487dflx84dlkwz67by9g4v2v8d7wrslqhs14a0sifhk"; }; buildFlagsArray = '' -ldflags= - -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version} + -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 = [ maintainers.rushmorem ]; + 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 49ae8fa09e89..000000000000 --- a/pkgs/servers/caddy/deps.nix +++ /dev/null @@ -1,192 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "7a41df006ff9af79a29f0ffa9c5f21fbe6314a2d"; - sha256 = "0055ir369kz63x9ay0fxqpx2xby8digja6ffbc35vsqjnzfwws18"; - }; - } - { - 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 = "0674c7c7968d9fac5f0f678325161ec31df406af"; - sha256 = "0ql8bsxcc0rjli5cxb0jf22jaq18bd6s4pja7razir3a9zcyn3km"; - }; - } - { - 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 = "86e02c4d2c459b70073cd5c39468e8a5a22db45a"; - sha256 = "16qrkcwllx88f6623ps5p5h62168xs6mcwybbw8862pvb0zkndz0"; - }; - } - { - 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 = "ca336a1f95a6b89be9c250df26c7a41742eb4a6f"; - sha256 = "03yh1zszhspmmq0v22ckw96q8ds2a5s3nd0c6r3p3n165w28z434"; - }; - } - { - 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 = "751171607256bb66e64c9f0220c00662420c38e9"; - sha256 = "07ivrcdd62y7jj5isrz7jhkqqc29s0wsn005mn0yxain51f8h7ly"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; - sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; - }; - } - { - 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/xenolf/lego"; - fetch = { - type = "git"; - url = "https://github.com/xenolf/lego"; - rev = "f5d538caab6dc0c167d4e32990c79bbf9eff578c"; - sha256 = "026sjqinb0j4ddfh3rwhhh7a1yjkfdmdr4yflba5syp1hrjf1f37"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "41d678d1df78cd0410143162dff954e6dc09300f"; - sha256 = "1gcw2850nghsfi3m98ibsxs8bwqzhdjsgiznrr9ymarzn58v3357"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d"; - sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "dd45e6a67c53f673bb49ca8a001fd3a63ceb640e"; - sha256 = "1fla2mzbwl1lxa9na3xhjmcszn8kiw051xq7i9xzbazzpgf0csg0"; - }; - } - { - 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 = "14227de293ca979cf205cd88769fe71ed96a97e2"; - sha256 = "038hnrjcnjygyi3qidfrkpkakis82qg381sr495d2s40g2dwlzah"; - }; - } -] diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix new file mode 100644 index 000000000000..9249d7cc347d --- /dev/null +++ b/pkgs/servers/cayley/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "cayley-${version}"; + version = "0.6.1"; + + goPackagePath = "github.com/cayleygraph/cayley"; + + src = fetchFromGitHub { + owner = "cayleygraph"; + repo = "cayley"; + rev = "v${version}"; + sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ''; + + meta = { + homepage = "https://cayley.io/"; + description = "A graph database inspired by Freebase and Knowledge Graph"; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix new file mode 100644 index 000000000000..1e6fadf9f4d8 --- /dev/null +++ b/pkgs/servers/cayley/deps.nix @@ -0,0 +1,272 @@ +[ + { + goPackagePath = "github.com/badgerodon/peg"; + fetch = { + type = "git"; + url = "https://github.com/badgerodon/peg"; + rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; + sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "a705895fdad108f053eae7ee011ed94a0541ee13"; + sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r"; + }; + } + { + goPackagePath = "github.com/cznic/mathutil"; + fetch = { + type = "git"; + url = "https://github.com/cznic/mathutil"; + rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd"; + sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "2df174808ee097f90d259e432cc04442cf60be21"; + sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5"; + sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz"; + }; + } + { + goPackagePath = "github.com/dop251/goja"; + fetch = { + type = "git"; + url = "https://github.com/dop251/goja"; + rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca"; + sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61"; + sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "888eb0692c857ec880338addf316bd662d5e630e"; + sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "ad28ea4487f05916463e2423a55166280e8254b5"; + sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "b59a38004596b696aca7aa2adccfa68760864d86"; + sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "0dad96c0b94f8dee039aa40467f767467392a0af"; + sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4"; + }; + } + { + goPackagePath = "github.com/linkeddata/gojsonld"; + fetch = { + type = "git"; + url = "https://github.com/linkeddata/gojsonld"; + rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31"; + sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced"; + sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d"; + sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb"; + sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d"; + sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab"; + sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18"; + sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "4875955338b0a434238a31165cb87255ab6e9e4a"; + sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i"; + }; + } + { + goPackagePath = "github.com/syndtr/gosnappy"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gosnappy"; + rev = "156a073208e131d7d2e212cb749feae7c339e846"; + sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6a513affb38dc9788b449d59ffed099b8de18fa0"; + sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; + sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c"; + sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05"; + sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + 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/dennwc/graphql"; + fetch = { + type = "git"; + url = "https://github.com/dennwc/graphql"; + rev = "fd5c4aa13f2119414084f229600de0d73f174436"; + sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs"; + }; + } +] diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix new file mode 100644 index 000000000000..58141a4cf0ee --- /dev/null +++ b/pkgs/servers/clickhouse/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, libtool, boost, double_conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, readline, sparsehash, unixODBC, zookeeper_mt, zstd }: + +stdenv.mkDerivation rec { + name = "clickhouse-${version}"; + + version = "1.1.54236"; + + src = fetchFromGitHub { + owner = "yandex"; + repo = "ClickHouse"; + rev = "v${version}-stable"; + sha256 = "1mfjr1yzvf810vbb35c2rknvqnc4mkncl56ja48myn7hc9p457d7"; + }; + + patches = [ ./termcap.patch ]; + + nativeBuildInputs = [ cmake libtool ]; + + buildInputs = [ boost double_conversion gperftools icu libmysql lz4 openssl poco re2 readline sparsehash unixODBC zookeeper_mt zstd ]; + + cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-function" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://clickhouse.yandex/; + description = "Column-oriented database management system"; + license = licenses.asl20; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/clickhouse/termcap.patch b/pkgs/servers/clickhouse/termcap.patch new file mode 100644 index 000000000000..e030d0956900 --- /dev/null +++ b/pkgs/servers/clickhouse/termcap.patch @@ -0,0 +1,25 @@ +From c2105ecdf6a6cc1fbb4c1ae01475db6a65fee32f Mon Sep 17 00:00:00 2001 +From: Orivej Desh +Date: Mon, 27 Mar 2017 01:39:11 +0000 +Subject: [PATCH] Search for termcap in ncurses + +--- + cmake/find_readline_edit.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/find_readline_edit.cmake b/cmake/find_readline_edit.cmake +index 26f2768..f520ece 100644 +--- a/cmake/find_readline_edit.cmake ++++ b/cmake/find_readline_edit.cmake +@@ -7,7 +7,7 @@ endif () + + list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.2) + +-find_library (TERMCAP_LIB NAMES termcap) ++find_library (TERMCAP_LIB NAMES ncurses) + find_library (EDIT_LIB NAMES edit) + + set(READLINE_INCLUDE_PATHS "/var/empty/local/var/empty/readline/include") +-- +2.12.0 + diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix new file mode 100644 index 000000000000..3a28368cc81c --- /dev/null +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -0,0 +1,35 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +{ stdenv, buildGoPackage, fetchFromGitHub, avahi, cups }: + +# TODO: Add a service for gcp-cups-connector and perhaps some other +# kind of configuration for the same thing that gcp-connector-util +# provides. + +buildGoPackage rec { + name = "cloud-print-connector-unstable-${version}"; + version = "1.11"; + rev = "481ad139cc023a3ba65e769f08f277368fa8a5de"; + + goPackagePath = "github.com/google/cloud-print-connector"; + + src = fetchFromGitHub { + owner = "google"; + repo = "cloud-print-connector"; + sha256 = "1vryhhv92bsncy1bsx9j4graz3sz9ddmizakv2fdrns09mmcgchm"; + rev = "v${version}"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ avahi cups ]; + + meta = with stdenv.lib; { + description = "Share printers from your Windows, Linux, FreeBSD or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector"; + homepage = https://github.com/google/cloud-print-connector; + license = licenses.bsd3; + maintainers = with maintainers; [ hodapp ]; + # TODO: Fix broken build on OS X. The GitHub presently lists the + # FreeBSD build as broken too, but this may change in the future. + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/cloud-print-connector/deps.nix b/pkgs/servers/cloud-print-connector/deps.nix new file mode 100644 index 000000000000..67901bdffeef --- /dev/null +++ b/pkgs/servers/cloud-print-connector/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "1f9909e51b2dab2487c26d64c8f2e7e580e4c9f5"; + sha256 = "1cc76wcmnyhhhi03dsc11lmxjwkzy09k3zx3h78bg05z8lhry4vn"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "d70f47eeca3afd795160003bc6e28b001d60c67c"; + sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "513929065c19401a1c7b76ecd942f9f86a0c061b"; + sha256 = "19ziin0k3n45nccjbk094f61hr198wzqnas93cmcxdja8f8fz27q"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "f047394b6d14284165300fd82dad67edb3a4d7f6"; + sha256 = "1l1a2iz1nmfmzzbjj1h8066prag4jvjqh13iv1jdlh05fgv6769i"; + }; + } + { + goPackagePath = "launchpad.net/go-xdg/v0"; + fetch = { + type = "bzr"; + url = "http://bazaar.launchpad.net/~chipaca/go-xdg/v0/"; + rev = "10"; + sha256 = "0fd68kkxzxjanpgannpys962bxzqdf8c1qvzk687hv504a3dp76f"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "879c5887cd475cd7864858769793b2ceb0d44feb"; + sha256 = "1nbydsmjr60904kz5d46nib0zid5kcv4gk9wayi44gn5wlzz80zp"; + }; + } + ] diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 311d707e9c59..69afd479af30 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/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 6d0037f74bdb..d0b8567c7483 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { for f in $(find ./ -name Makefile.in); do echo patching $f... - sed -i $f -e '/PBS_MKDIRS/d' + sed -i $f -e '/PBS_MKDIRS/d' -e '/chmod u+s/d' done + ''; postInstall = '' diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 41a0bea1cddb..cc566e712c29 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -17,6 +17,10 @@ buildGoPackage rec { # Keep consul.ui for backward compatability passthru.ui = consul-ui; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + ''; + meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 8dc062b75043..8df584435a2f 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, openssl, libevent }: -with { inherit (stdenv.lib) optional; }; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "coturn-${version}"; - version = "4.5.0.3"; + version = "4.5.0.6"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "${version}"; - sha256 = "1xr4dp3p16m4rq9mdsprs6s50rnif6hk38xx9siyykgfjnwr6i9g"; + sha256 = "084c3zgwmmz4s6211i5jbkzsn13703lsg7vhc2cpacazq4sgsrhb"; }; buildInputs = [ openssl libevent ]; diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix new file mode 100644 index 000000000000..119d5f03f626 --- /dev/null +++ b/pkgs/servers/dex/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +let version = "2.4.1"; in + +buildGoPackage rec { + name = "dex-${version}"; + + goPackagePath = "github.com/coreos/dex"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "coreos"; + repo = "dex"; + sha256 = "11qpn3wh74mq16xgl9l50n2v02ffqcd14xccf77j5il04xr764nx"; + }; + + subPackages = [ + "cmd/dex" + ]; + + buildFlagsArray = [ + "-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}" + ]; + + meta = { + description = "OpenID Connect and OAuth2 identity provider with pluggable connectors"; + license = lib.licenses.asl20; + homepage = https://github.com/coreos/dex; + maintainers = with lib.maintainers; [benley]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 2f8bdd06bf1d..45abcff27767 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,16 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 -, libseccomp ? null }: +, enableSeccomp ? false, libseccomp ? null }: -let version = "9.10.4-P6"; in +assert enableSeccomp -> libseccomp != null; + +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 = "0rgffdm0h6dks0np4h9q4kd8nyb3azrdxw2skqnjzd8ws78vzpx1"; + sha256 = "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; buildInputs = [ openssl libtool perl libxml2 ] ++ - stdenv.lib.optional stdenv.isLinux libseccomp; + stdenv.lib.optional enableSeccomp libseccomp; STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { "--without-pkcs11" "--without-purify" "--without-python" - ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) "--enable-seccomp"; + ] ++ lib.optional enableSeccomp "--enable-seccomp"; postInstall = '' moveToOutput bin/bind9-config $dev diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 94d5ee9f5c71..f1ae382aa382 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -2,16 +2,16 @@ , systemd, nettle, libedit, zlib, libiconv, fetchpatch }: -with { inherit (stdenv.lib) optional optionals; }; +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.4.1"; + version = "2.5.2"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c"; + 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 bc9e35f88c4b..441e1f1ab0f9 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which +{ stdenv, fetchurl, fetchpatch, pkgconfig, utillinux, hexdump, which , knot-dns, luajit, libuv, lmdb , cmocka, systemd, hiredis, libmemcached , gnutls, nettle @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.4"; + version = "1.3.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "630b2ad0bfdcf59164957a377adef8b1fddc37a58a7e1d10e76a1b497a30f036"; + sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117"; }; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ knot-dns luajit libuv gnutls ] ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin - ## optional dependencies + ## optional dependencies; TODO: libedit, dnstap? ++ optional doInstallCheck cmocka ++ optional stdenv.isLinux systemd # socket activation ++ [ @@ -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/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 89845fff9c6a..6cf98daab5bf 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -13,13 +13,17 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.14"; + name = "nsd-4.1.16"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802"; + sha256 = "1cmaddfjb7yr87gjd5yv4d0qng0j97sy5rw5m3zxsp6c4fnng0vz"; }; + prePatch = '' + substituteInPlace nsd-control-setup.sh.in --replace openssl ${openssl}/bin/openssl + ''; + buildInputs = [ libevent openssl ]; configureFlags = diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index b1e4ec6e368e..8b838a58b279 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "17b2gv7r53skj54ms4hx8rdjiggpc8bais0cy0jck1pmccxyalfh"; + sha256 = "10p2m2zbydbd5xjdgf8z4zgvl8diyb4k3bq1hzsl32r71daj3yk0"; }; buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index a9b1333fb0fa..7e4c69e3862d 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.5"; + version = "3.2.22.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "1vgn3k57pgj4prndhjshzkwchj9igpagmmlrbkvqdj4axw762i9g"; + sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 16189fb47234..15ea30aa16cb 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "etcd-${version}"; - version = "3.0.6"; # After updating check that nixos tests pass + version = "3.1.6"; # After updating check that nixos tests pass rev = "v${version}"; goPackagePath = "github.com/coreos/etcd"; @@ -13,10 +13,16 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "etcd"; - sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; + sha256 = "1qgi6zxnijzr644w2da2gbn3gw2qwk6a3z3qmdln0r2rjnm70sx0"; }; - goDeps = ./deps.nix; + subPackages = [ + "cmd/etcd" + "cmd/etcdctl" + "cmd/tools/benchmark" + "cmd/tools/etcd-dump-db" + "cmd/tools/etcd-dump-logs" + ]; buildInputs = [ libpcap ]; diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix deleted file mode 100644 index 2c07817a980f..000000000000 --- a/pkgs/servers/etcd/deps.nix +++ /dev/null @@ -1,335 +0,0 @@ -[ -{ - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; -} -{ - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"; - sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay"; - }; -} -{ - goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; - fetch = { - type = "git"; - url = "https://github.com/cloudfoundry-incubator/candiedyaml"; - rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; - sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; - }; -} -{ - goPackagePath = "github.com/cockroachdb/cmux"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cmux"; - rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; - sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; - }; -} -{ - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd.git"; - rev = "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0"; - sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; - }; -} -{ - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; -} -{ - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2"; - sha256 = "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk"; - }; -} -{ - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; - sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; - }; -} -{ - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "aa0c862057666179de291b67d9f093d12b5a8473"; - sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; - }; -} -{ - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "f20a1444730c7d9949b880a0309e737d007def25"; - sha256 = "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c"; - }; -} -{ - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "f592bd283e9ef86337a432eb50e592278c3d534d"; - sha256 = "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb"; - }; -} -{ - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "7d79101e329e5a3adf994758c578dab82b90c017"; - sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; - }; -} -{ - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "5e0e028ba0a015710eaebf6e47af18812c9f2767"; - sha256 = "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk"; - }; -} -{ - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "e3653ace2d63753697e0e5b07b9393971c0bba9d"; - sha256 = "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc"; - }; -} -{ - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; -} -{ - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; -} -{ - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; -} -{ - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; - sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; - }; -} -{ - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; - sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; - }; -} -{ - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; - sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; - }; -} -{ - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "6454a84b6da0ea8b628d5d8a26759f62c6c161b4"; - sha256 = "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna"; - }; -} -{ - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2"; - sha256 = "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx"; - }; -} -{ - goPackagePath = "github.com/xiang90/probing"; - fetch = { - type = "git"; - url = "https://github.com/xiang90/probing"; - rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; - sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; - }; -} -{ - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; - sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; - }; -} -{ - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "7394c112eae4dba7e96bfcfe738e6373d61772b4"; - sha256 = "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7"; - }; -} -{ - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "0032a855ba5c8a3c8e0d71c2deef354b70af1584"; - sha256 = "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67"; - }; -} -{ - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "168c95418e66e019fe17b8f4f5c45aa62ff80e23"; - sha256 = "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n"; - }; -} -{ - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; - }; -} -{ - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "daf2955e742cf123959884fdff4685aa79b63135"; - sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; - }; -} -{ - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; - sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; - }; -} -{ - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da"; - sha256 = "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01"; - }; -} -{ - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "ce7fa45920dc37a92de8377972e52bc55ffa8d57"; - sha256 = "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk"; - }; -} -{ - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "a6b377e3400b08991b80d6805d627f347f983866"; - sha256 = "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2"; - }; -} -{ - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "9453b2db37f4d8bc63751daca63bbe7049eb5e74"; - sha256 = "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb"; - }; -} -{ - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; -} -{ - goPackagePath = "github.com/spacejam/loghisto"; - fetch = { - type = "git"; - url = "https://github.com/spacejam/loghisto"; - rev = "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7"; - sha256 = "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1"; - }; -} -{ - goPackagePath = "github.com/akrennmair/gopcap"; - fetch = { - type = "git"; - url = "https://github.com/akrennmair/gopcap"; - rev = "00e11033259acb75598ba416495bb708d864a010"; - sha256 = "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a"; - }; -} -] diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix new file mode 100644 index 000000000000..369ef5a73692 --- /dev/null +++ b/pkgs/servers/exhibitor/default.nix @@ -0,0 +1,54 @@ +{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }: +stdenv.mkDerivation rec { + name = "exhibitor-${version}"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "soabase"; + repo = "exhibitor"; + sha256 = "07vikhkldxy51jbpy3jgva6wz75jksch6bjd6dqkagfgqd6baw45"; + rev = "5fcdb411d06e8638c2380f7acb72a8a6909739cd"; + }; + mavenDependenciesSha256 = "00r69n9hwvrn5cbhxklx7w00sjmqvcxs7gvhbm150ggy7bc865qv"; + # This is adapted from https://github.com/volth/nixpkgs/blob/6aa470dfd57cae46758b62010a93c5ff115215d7/pkgs/applications/networking/cluster/hadoop/default.nix#L20-L32 + fetchedMavenDeps = stdenv.mkDerivation { + name = "exhibitor-${version}-maven-deps"; + inherit src nativeBuildInputs; + buildPhase = '' + cd ${pomFileDir}; + while timeout --kill-after=21m 20m mvn package -Dmaven.repo.local=$out/.m2; [ $? = 124 ]; do + echo "maven hangs while downloading :(" + done + ''; + installPhase = ''find $out/.m2 -type f \! -regex '.+\(pom\|jar\|xml\|sha1\)' -delete''; # delete files with lastModified timestamps inside + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = mavenDependenciesSha256; + }; + + # The purpose of this is to fetch the jar file out of public Maven and use Maven + # to build a monolithic, standalone jar, rather than build everything from source + # (given the state of Maven support in Nix). We're not actually building any java + # source here. + pomFileDir = "exhibitor-standalone/src/main/resources/buildscripts/standalone/maven"; + nativeBuildInputs = [ maven ]; + buildInputs = [ makeWrapper ]; + buildPhase = '' + cd ${pomFileDir} + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + ''; + meta = with stdenv.lib; { + homepage = "https://github.com/soabase/exhibitor"; + description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; + license = licenses.asl20; + platforms = platforms.unix; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/java + mv target/$name.jar $out/share/java/ + makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${stdenv.lib.makeBinPath [ jdk ]} + ''; + +} diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 117fa8782c9b..ec6610b8245f 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/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index e56669645c3a..4e39b78b89ec 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "pure-ftpd-1.0.42"; + name = "pure-ftpd-1.0.46"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; - sha256 = "1yg7v1l3ng7c08nhh804k28y1f8ccmg0rq1a9l2sg45ib273mrvv"; + sha256 = "0p0arcaz63fbb03fkavbc8z6m1f90p5vbnxb8mqlvpma6mrq0286"; }; + buildInputs = [ openssl ]; + + configureFlags = [ "--with-tls" ]; + meta = with stdenv.lib; { description = "A free, secure, production-quality and standard-conformant FTP server"; homepage = https://www.pureftpd.org; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ maintainers.lethalman ]; - platforms = platforms.linux; + platforms = platforms.unix; }; - } diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index ac5e0b7c1b1c..e260ccfb761b 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 e9c1ec8b7242..568b0ee6c045 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 @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --includedir=$dev/include" ''; + configureFlags = '' --with-apr=${apr.dev} --with-apr-util=${aprutil.dev} @@ -67,6 +68,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + stripDebugList = "lib modules bin"; + postInstall = '' mkdir -p $doc/share/doc/httpd mv $out/manual $doc/share/doc/httpd diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 67648f9d4f2c..a99f081b24eb 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "mod_auth_mellon-${version}"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "UNINETT"; repo = "mod_auth_mellon"; rev = "v${version}"; - sha256 = "1p6v6vgrfvgvc5y2ygqyyxi0klpm3nxaw3fg35zmpmw663w8skqn"; + sha256 = "16b43y5a5p8g1287x04rv923230cy8dfs2j18cx6208n4bv4dvnk"; }; patches = [ diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix new file mode 100644 index 000000000000..0481ebb9b8dc --- /dev/null +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +, coreutils, bash, makeWrapper }: + +stdenv.mkDerivation rec { + name = "couchdb-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; + sha256 = "1jkfx6g9anrgmkhrkcn50axcamragranwsciw1rhmi86rglkrbyc"; + }; + + buildInputs = [ erlang icu openssl spidermonkey makeWrapper ]; + + patches = [ ./jsapi.patch ]; + postPatch = '' + substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE" + + patch bin/rebar < #!${coreutils}/bin/env escript + EOF + + ''; + + # Configure a username. The build system would use "couchdb" as + # default if none is provided. Note that it is unclear where this + # username is actually used in the build, as any choice seems to be + # working. + configurePhase = '' + ./configure -u nobody + ''; + + buildPhase = '' + make release + ''; + + installPhase = '' + mkdir -p $out + cp -r rel/couchdb/* $out + wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin + ''; + + meta = with stdenv.lib; { + description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; + homepage = "http://couchdb.apache.org"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/servers/http/couchdb/jsapi.patch b/pkgs/servers/http/couchdb/jsapi.patch new file mode 100644 index 000000000000..bb7d4ca610c7 --- /dev/null +++ b/pkgs/servers/http/couchdb/jsapi.patch @@ -0,0 +1,60 @@ +diff -ru couch_js/http.c couch_js-patched/http.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c 2017-02-10 10:52:33.025854045 +0100 +@@ -15,7 +15,7 @@ + #include + #include + #include +-#include ++#include + #include "config.h" + #include "utf8.h" + #include "util.h" +diff -ru couch_js/main.c couch_js-patched/main.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c 2017-02-10 10:52:33.001854154 +0100 +@@ -20,7 +20,7 @@ + #include + #endif + +-#include ++#include + #include "config.h" + #include "http.h" + #include "utf8.h" +diff -ru couch_js/utf8.c couch_js-patched/utf8.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c 2017-02-10 10:52:33.009854117 +0100 +@@ -10,7 +10,7 @@ + // License for the specific language governing permissions and limitations under + // the License. + +-#include ++#include + #include "config.h" + + static int +diff -ru couch_js/util.c couch_js-patched/util.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c 2017-02-10 10:52:33.017854081 +0100 +@@ -13,7 +13,7 @@ + #include + #include + +-#include ++#include + + #include "help.h" + #include "util.h" +diff -ru couch_js/util.h couch_js-patched/util.h +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h 2017-02-10 10:52:32.988854212 +0100 +@@ -13,7 +13,7 @@ + #ifndef COUCHJS_UTIL_H + #define COUCHJS_UTIL_H + +-#include ++#include + + typedef struct { + int no_eval; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index ba733c5bde58..0ca888fd6ed1 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/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 26566b2281cc..c5dd9f7a577d 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; + prePatch = '' + substituteInPlace CMakeLists.txt --replace SETUID "" + ''; + cmakeFlags = [ ( if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 2dd9d544a03b..068053d71f09 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -22,5 +22,8 @@ stdenv.mkDerivation { license = licenses.lgpl21; maintainers = [ maintainers.sander ]; platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2015-7501: remote code execution in apache-commons-collections: InvokerTransformer during deserialisation" + ]; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 5d5a98ad8a8f..dfde20452723 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation { homepage = http://nginx.org; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice raskin ]; + maintainers = with maintainers; [ thoughtpolice raskin fpletz ]; }; } diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index a9f3d74e99cb..ced0fd0976f1 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.11.10"; - sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp"; + version = "1.13.3"; + sha256 = "0whdpgfb1y9r7f3y91r4m0wpgrwwdl2byahp9a7gn0n30j0gjwsv"; }) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 20ea55f82a10..ea819c7ec835 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -15,8 +15,8 @@ src = fetchFromGitHub { owner = "arut"; repo = "nginx-rtmp-module"; - rev = "v1.1.9"; - sha256 = "19vqw1ba01m2wlncpycw9vj5n8741pv36hd3dy9jjdxwlzdjzyi5"; + rev = "v1.1.11"; + sha256 = "09zrnf8lk179mpqnx92zm24xl7m3bq4ca84wc2zwi5hc8kxjbwxc"; }; }; @@ -30,18 +30,6 @@ inputs = [ pkgs.expat ]; }; - syslog = rec { - src = fetchFromGitHub { - owner = "yaoweibin"; - repo = "nginx_syslog_patch"; - rev = "3ca5ba65541637f74467038aa032e2586321d0cb"; - sha256 = "0y8dxkx8m1jw4v5zsvw1gfah9vh3ryq0hfmrcbjzcmwp5b5lb1i8"; - }; - preConfigure = '' - patch -p1 < "${src}/syslog-1.7.0.patch" - ''; - }; - moreheaders = { src = fetchFromGitHub { owner = "openresty"; @@ -175,4 +163,13 @@ in { src = ngx_pagespeed; }; + + shibboleth = { + src = fetchFromGitHub { + owner = "nginx-shib"; + repo = "nginx-http-shibboleth"; + rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; + sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; + }; + }; } diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index efbcada62309..aa03d6162dd1 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.10.3"; - sha256 = "146xd566l1wkhzxqhmd01vj7c0yhsap1qkiwfg5mki6ach9hy0km"; + version = "1.12.1"; + sha256 = "1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7"; }) diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 692bba846eaf..96652515f7ab 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/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 12d6f8996ad4..06594885dbc2 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -44,8 +44,8 @@ in { tomcat85 = common { versionMajor = "8"; - versionMinor = "5.11"; - sha256 = "0i1xvgpj4l4agc8vxrnfm127w4mc33pyl8963pwpklqpdk4shcjn"; + versionMinor = "5.14"; + sha256 = "0dls16lw7yak3s6cwwcccfg0qb5g8s36waxlg8wgjk8vc57h316w"; }; tomcatUnstable = common { diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index d241b59c3feb..f1bd1a4c9d86 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -3,11 +3,11 @@ , libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.4.1"; + name = "icecast-2.4.3"; src = fetchurl { url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; - sha256 = "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23"; + sha256 = "14n5vm2xnyn8y7kl46lnnlgv6v5fjykhc57ffdsh0qaxfs6a8p68"; }; buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ]; diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix index ae3347c9671a..e09a9f740982 100644 --- a/pkgs/servers/inginious/default.nix +++ b/pkgs/servers/inginious/default.nix @@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication rec { ''; propagatedBuildInputs = with pythonPackages; [ - requests2 + requests cgroup-utils docker_1_7_2 docutils PyLTI mock pygments pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib websocket_client watchdog webpy-custom flup diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 46e4b755e5c3..b2288336d579 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, bison, flex, openssl }: stdenv.mkDerivation rec { - name = "charybdis-3.5.3"; + name = "charybdis-3.5.5"; src = fetchFromGitHub { owner = "charybdis-ircd"; repo = "charybdis"; rev = name; - sha256 = "1s8p26lrc5vm08gi6hc5gqidgyj7v5bzm4d2g81v4xk387f85lnc"; + sha256 = "16bl516hcj1chgzkfnpg9bf9s6zr314pqzhlz6641lgyzaw1z3w0"; }; patches = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=charybdis-" + "--sysconfdir=/etc/charybdis" ]; buildInputs = [ bison flex openssl ]; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix new file mode 100644 index 000000000000..fb5d49849f87 --- /dev/null +++ b/pkgs/servers/irker/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitLab, python, pkgconfig +, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: + +stdenv.mkDerivation rec { + name = "irker-${version}"; + version = "2017-02-12"; + + src = fetchFromGitLab { + owner = "esr"; + repo = "irker"; + rev = "dc0f65a7846a3922338e72d8c6140053fe914b54"; + sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p"; + }; + + nativeBuildInputs = [ pkgconfig xmlto docbook2x ]; + + buildInputs = [ + python + # Needed for proxy support I believe, which I haven't tested. + # Probably needs to be propagated and some wrapPython magic + # python.pkgs.pysocks + ]; + + preBuild = '' + export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml' + ''; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-o 0 -g 0' "" + ''; + + installFlags = [ + "prefix=/" + "DESTDIR=$$out" + ]; + + meta = with stdenv.lib; { + description = "IRC client that runs as a daemon accepting notification requests"; + homepage = "https://gitlab.com/esr/irker"; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix new file mode 100644 index 000000000000..db4ae8045338 --- /dev/null +++ b/pkgs/servers/jackett/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, mono, curl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "jackett-${version}"; + version = "0.7.1308"; + + src = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; + sha256 = "07yadywizhq7j986ax5d9dbjn1s5bqw6zrlqp6l32ppc119qhjwf"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/${name}} + cp -r * $out/share/${name} + + makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ + --add-flags "$out/share/${name}/JackettConsole.exe" \ + --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib" + ''; + + meta = with stdenv.lib; { + description = "API Support for your favorite torrent trackers."; + homepage = https://github.com/Jackett/Jackett/; + license = licenses.gpl2; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix new file mode 100644 index 000000000000..7c7755dee482 --- /dev/null +++ b/pkgs/servers/kwakd/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, stdenv }: + +stdenv.mkDerivation rec { + name = "kwakd-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "fetchinson"; + repo = "kwakd"; + rev = "acdf0e1491204ae30622a60fde0bcae4769f78be"; + sha256 = "1inf9ngrbxmkkdhqf1xday12nf0hxjxlx1810phkmivyyp6fl3nj"; + }; + + postInstall = '' + serviceDir=$out/share/dbus-1/system-services + mkdir -p $serviceDir + cp kwakd.service $serviceDir/ + substituteInPlace $serviceDir/kwakd.service \ + --replace "kwakd -p 80" "$out/bin/kwakd -p 80" + ''; + + meta = with lib; { + description = "A super small webserver that serves blank pages"; + license = licenses.gpl2; + maintainers = [ maintainers.nicknovitski ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix new file mode 100644 index 000000000000..9abf95fb6d60 --- /dev/null +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -0,0 +1,36 @@ +{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }: + +let + pkg = "dkimproxy"; + version = "1.4.1"; +in +stdenv.mkDerivation rec { + name = "${pkg}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/dkimproxy/${name}.tar.gz"; + sha256 = "1gc5c7lg2qrlck7b0lvjfqr824ch6jkrzkpsn0gjvlzg7hfmld75"; + }; + + # Idea taken from pkgs/development/perl-modules/generic/builder.sh + preFixup = '' + perlFlags= + for i in $(IFS=:; echo $PERL5LIB); do + perlFlags="$perlFlags -I$i" + done + for f in $(ls $out/bin); do + sed -i $out/bin/$f -e "s|#\!\(.*/perl.*\)$|#\! \1 $perlFlags|" + done + ''; + + buildInputs = [ perl ]; + propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ]; + + meta = with stdenv.lib; { + description = "SMTP-proxy that signs and/or verifies emails"; + homepage = http://dkimproxy.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 68e3ad4ca426..d503a4d7b571 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,13 +1,21 @@ -{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: +{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv, fetchpatch }: stdenv.mkDerivation rec { - name = "exim-4.88"; + name = "exim-4.89"; src = fetchurl { - url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2"; - sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i"; + url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; + 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 000000000000..554634d5a79d --- /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 000000000000..9967c3a549a5 --- /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 b18ab016c441..3c028b1ac170 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/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 8955f40e565a..ddf4fd5d880d 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0"; }; + postInstall = '' + # grab all documentation files + docfiles=$(find -maxdepth 1 -name "[[:upper:]][[:upper:]]*") + install -vDm 644 -t $out/share/doc/mlmmj/ $docfiles + ''; + meta = with stdenv.lib; { homepage = http://mlmmj.org; description = "Mailing List Management Made Joyful"; @@ -18,4 +24,4 @@ stdenv.mkDerivation rec { license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix new file mode 100644 index 000000000000..44840c91b058 --- /dev/null +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, lib, tls ? true, gnutls ? null }: + +assert tls -> gnutls != null; + +stdenv.mkDerivation rec { + + version = "2.0"; + name = "nullmailer-${version}"; + + src = fetchurl { + url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; + sha256 = "112ghdln8q9yljc8kp9mc3843mh0fyb4rig2v4q2dzy1l324q3yp"; + }; + + buildInputs = stdenv.lib.optional tls gnutls; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ] ++ stdenv.lib.optional tls "--enable-tls"; + + installFlags = [ "DESTDIR=$(out)" ]; + + # We have to remove the ''var'' directory, since nix can't handle named pipes + # and we can't use it in the store anyway. Same for ''etc''. + # The second line is need, because the installer of nullmailer will copy its + # own prepared version of ''etc'' and ''var'' and also uses the prefix path (configure phase) + # for hardcoded absolute references to its own binary farm, e.g. sendmail binary is + # calling nullmailer-inject binary. Since we can't configure inside the store of + # the derivation we need both directories in the root, but don't want to put them there + # during install, hence we have to fix mumbling inside the install directory. + # This is kind of a hack, but the only way I know of, yet. + postInstall = '' + rm -rf $out/var/ $out/etc/ + mv $out/$out/* $out/ + rmdir $out/$out + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "http://untroubled.org/nullmailer/"; + description = '' + A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays. + It is designed to be simple to configure, secure, and easily extendable. + ''; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers ; [ sargon ]; + }; +} diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 7ad5f6e9ad59..d2667597c627 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 9c72aa018989..bfdea71c5d78 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 1bbe6f3466b8..6a0d7fb588fd 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/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 14149713ee8b..f4ab6a029952 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,17 +1,7 @@ -{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile +{ stdenv, fetchurl, buildPerlPackage, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile , HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1 }: -# TODO: Add the Perl modules ... -# -# DBI -# Encode::Detect -# IP::Country::Fast -# Mail::SPF -# Net::Ident -# Razor2::Client::Agent -# - buildPerlPackage rec { name = "SpamAssassin-3.4.1"; @@ -20,14 +10,17 @@ buildPerlPackage rec { sha256 = "0la6s5ilamf9129kyjckcma8cr6fpb6b5f2fb64v7106iy0ckhd0"; }; - buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM - LWP IOSocketSSL ]; + # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434 + patches = [ ./sa-update_add--siteconfigpath.patch ]; + + buildInputs = with perlPackages; [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM + LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable ]; # Enabling 'taint' mode is desirable, but that flag disables support # for the PERL5LIB environment variable. Needs further investigation. makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no"; - makeMakerFlags = "CONFDIR=/etc/spamassassin LOCALSTATEDIR=/var/lib/spamassassin"; + makeMakerFlags = "CONFDIR=/homeless/shelter LOCALSTATEDIR=/var/lib/spamassassin"; doCheck = false; @@ -45,6 +38,6 @@ buildPerlPackage rec { description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + maintainers = with stdenv.lib.maintainers; [ peti qknight ]; }; } diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch new file mode 100644 index 000000000000..3264aefc0722 --- /dev/null +++ b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch @@ -0,0 +1,59 @@ +From 60abf3ee8864980a95b32e2d6cf60e26b49654c0 Mon Sep 17 00:00:00 2001 +From: joachim schiele +Date: Wed, 7 Jun 2017 22:15:39 +0200 +Subject: [PATCH 2/2] Adding --siteconfigpath to not be forced to use global /etc/spamasassin configuration directory but to provide an alternative location. + +--- + sa-update.raw | 5 +++++ + lib/Mail/SpamAssassin/PerMsgStatus.pm | 2 + + 2 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/sa-update.raw b/sa-update.raw +index bb7396d..39f681f 100755 +--- a/sa-update.raw ++++ b/sa-update.raw +@@ -196,6 +196,7 @@ GetOptions( + 'gpgkeyfile=s' => \$opt{'gpgkeyfile'}, + 'channelfile=s' => \$opt{'channelfile'}, + 'updatedir=s' => \$opt{'updatedir'}, ++ 'siteconfigpath=s' => \$opt{'siteconfigpath'}, + 'gpg!' => \$GPG_ENABLED, + + '4' => sub { $opt{'force_pf'} = 'inet' }, +@@ -267,6 +268,9 @@ else { + $opt{'updatedir'} = $SA->sed_path('__local_state_dir__/__version__'); + } + ++if (defined $opt{'siteconfigpath'}) { ++ $LOCAL_RULES_DIR = untaint_file_path($opt{'siteconfigpath'}); ++} + + # check only disabled gpg + # https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5854 +@@ -1808,6 +1812,7 @@ Options: + --updatedir path Directory to place updates, defaults to the + SpamAssassin site rules directory + (default: @@LOCAL_STATE_DIR@@/@@VERSION@@) ++ --siteconfigpath=path Path for site configs + --refreshmirrors Force the MIRRORED.BY file to be updated + -D, --debug [area=n,...] Print debugging messages + -v, --verbose Be verbose, like print updated channel names; +-- +diff --git a/lib/Mail/SpamAssassin/PerMsgStatus.pm b/lib/Mail/SpamAssassin/PerMsgStatus.pm +index 6d8beaa..6ad87dc 100644 +--- a/lib/Mail/SpamAssassin/PerMsgStatus.pm ++++ b/lib/Mail/SpamAssassin/PerMsgStatus.pm +@@ -389,7 +389,8 @@ sub check_timed { + if (!$self->{main}->have_plugin("check_main")) { + die "check: no loaded plugin implements 'check_main': cannot scan!\n". + "Check that the necessary '.pre' files are in the config directory.\n". +- "At a minimum, v320.pre loads the Check plugin which is required.\n"; ++ "At a minimum, v320.pre loads the Check plugin which is required.\n". ++ "NixOS: Since there is no '/etc/spamassassin' simply restart 'spamd.service' which on its behalf will run 'sa-learn --siteconfigpath=/nix/store/l4hr4yxk8mb4wbkha6vm6rh92pj19rj6-spamd-env ...' to update the /var/lib/spamassassin configs.\n"; + } + } + +-- + +2.12.2 + diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 863f7afd159f..c7c33928714b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,23 +24,24 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.19.2"; + version = "0.22.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "03gnz7rb7yncykqy0irl1y5lhk1cs0b4snpas8s1c9r0vsw1bmhr"; + sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7"; }; patches = [ ./matrix-synapse.patch ]; propagatedBuildInputs = with pythonPackages; [ blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 - pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 + pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack lxml matrix-synapse-ldap3 + phonenumbers jsonschema ]; # Checks fail because of Tox. diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 477338a33174..a00eed26dbf2 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mattermost-${version}"; - version = "3.6.2"; + version = "3.8.2"; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "1wf8xvy8njmhym45dwag6mdwhfgzg5xccvhyv7c68rz5h57vfgsb"; + sha256 = "1rrcasx8yzr48lwznqhkqk4qjfhxq5lnfcl9xiqkh6y2gmaqbk42"; }; installPhase = '' diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index d830af19bdce..549ec289d6bd 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterircd-${version}"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "0yxqlckir50kdlbi36kak5ncfzl6sh811hzicdar5yzanzcip8ja"; + sha256 = "0mnfay6bh9ls2fi3k96hmw4gr7q11lw4rd466lidi4jyjpc7q42x"; }; goPackagePath = "github.com/42vim/matterircd"; diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch index b5834bf62922..4c21a29a05c4 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 bc2bbb13c448..48b5279772a9 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20170125"; - longVersion = "2017-01-25T03-14-52Z"; + shortVersion = "20170613"; + longVersion = "2017-06-13T19-01-01Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk"; + sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 881a14b1117c..6b8bdd4b4d56 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/google/cadvisor; license = licenses.asl20; maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 6c7b7ff001a1..56d2f854654c 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.1.2"; - ts = "1486989747"; + version = "4.3.2"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0x2knb2lrs6sbj3svcjn70p46fzdy71gh8fgi801g1l0yp9s5yrg"; + sha256 = "0hz323favjm0gz4s2112rl8ygw7dy2pz808yhraplq8nljqh4h11"; }; srcStatic = fetchurl { - url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "1i7n1a2xn65flwy2zqs3kqg1ch51653r52qn3gfh5hp92k81q4dq"; + url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; + sha256 = "0vk668ibayx0hqlam9jns5c7pggdh83yy54hnz5l7fnws4lm50qc"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index d4f22ab81eed..212ab8513a91 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -16,8 +16,13 @@ stdenv.mkDerivation rec { ./log-stdout.patch ]; + # Read all configuration from /run/longview postPatch = '' - substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid + substituteInPlace Linode/Longview/Util.pm \ + --replace /var/run/longview.pid /run/longview/longview.pid \ + --replace /etc/linode /run/longview + substituteInPlace Linode/Longview.pl \ + --replace /etc/linode /run/longview ''; buildInputs = [ perl makeWrapper glibc ] diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 5d7d2e787735..7882572b6c88 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.30"; + version = "2.0.33"; name = "munin-${version}"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1sxsdfq9a5d8b13jigr06gs7n4m3c95645sfyyl49bkfy0n5cxrg"; + sha256 = "0rs05b7926mjd58sdry33i91m1h3v3svl0wg2gmhljl8wqidac5w"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 8bf9eef6cd09..78cd69714e85 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.5.1"; + version = "0.6.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1z0f8jqbd4v00634qcs41h1zb70ahl63svlzn33gavripk84hwzq"; + sha256 = "04969hqig0llfkvk3b0yqrywcxm6rgd7ph6nn5rx8pnq21i77sqm"; }; # Tests exist, but seem to clash with the firewall. @@ -27,6 +27,17 @@ buildGoPackage rec { -X ${t}.GoVersion=${stdenv.lib.getVersion go} ''; + postBuild = '' + $NIX_BUILD_TOP/go/bin/artifacts + ''; + + postInstall = '' + rm $bin/bin/artifacts + mkdir -p $bin/share/man/man1 $bin/etc/bash_completion.d + cp -v amtool*.1 $bin/share/man/man1 + cp -v amtool_completion.sh $bin/etc/bash_completion.d + ''; + meta = with stdenv.lib; { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = https://github.com/prometheus/alertmanager; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 1eaef1010d35..ccbcce260332 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 000000000000..47abcb33ee79 --- /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/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 5d7a75b20132..63ea093b4bb0 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.5.2"; + version = "1.7.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1b24nx6gmx2c7fj92p2byla3i0zs6xwymxqji00gvgpxr8bsfhn1"; + sha256 = "11acdwn2fw5qnyns5vdbxw18xnd2v4hb1y2cfjjxw478hhza4ni3"; }; docheck = true; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix new file mode 100644 index 000000000000..2e7a4932de62 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "fritzbox-exporter-${version}"; + version = "1.0"; + rev = "v${version}"; + + goPackagePath = "github.com/ndecker/fritzbox_exporter"; + + src= fetchFromGitHub { + inherit rev; + owner = "ndecker"; + repo = "fritzbox_exporter"; + sha256 = "1qk3dgxxz3cnz52jzz0yvfkrkk4s5kdhc26nbfgdpn0ifzqj0awr"; + }; + + meta = with stdenv.lib; { + description = "FRITZ!Box UPnP statistics exporter for prometheus"; + homepage = https://github.com/ndecker/fritzbox_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ bachp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 1115ca85f23f..2d2fb26324c4 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.13.0"; + version = "0.14.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "03xk8zns0dvzs13jgiwl2dxj9aq4bbfmwsg0wq5piravxpszs09q"; + sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; }; # FIXME: megacli test fails diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix new file mode 100644 index 000000000000..f866df49b54d --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "unifi-exporter-${version}"; + version = "0.4.0"; + rev = version; + + goPackagePath = "github.com/mdlayher/unifi_exporter"; + + src= fetchFromGitHub { + inherit rev; + owner = "mdlayher"; + repo = "unifi_exporter"; + sha256 = "0mbav3dkrwrgzzl80q590467nbq5j61v5v7mpsbhcn2p7ak0swx4"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; + homepage = https://github.com/mdlayher/unifi_exporter; + license = licenses.mit; + maintainers = with maintainers; [ bachp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix new file mode 100644 index 000000000000..1de25a21d8cc --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "c9c7427a2a70d2eb3bafa0ab2dc163e45f143317"; + sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mdlayher/unifi"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/unifi"; + rev = "418aad77bdb31a9b97d13f79162b0bac1a38bb25"; + sha256 = "16hv2mk2vl4lcj1qf2wp9psvffz26b5zsajs2yl21rbx0pcwkcp7"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "a5060f1eaab721946b185b2de468ff83ea5b89cb"; + sha256 = "1v9qva9c0wrjkl71b0rvvi1qj7l42gvcsj349r4lg8pwni8i6did"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "49fee292b27bfff7f354ee0f64e1bc4850462edf"; + sha256 = "01vcjzkxs34yyy402rsbxw3md7ia85ls9yzsxhgddcisa3mq23cj"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "a1dba9ce8baed984a2495b658c82687f8157b98f"; + sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6"; + }; + } +] diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index ee425b6edf97..0d01c2271458 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -12,51 +12,54 @@ GEM em-worker (0.0.2) eventmachine eventmachine (1.2.2) - ffi (1.9.17) - oj (2.14.6) + ffi (1.9.18) + oj (2.18.1) parse-cron (0.1.4) - sensu (0.28.0) + sensu (0.29.0) em-http-server (= 0.1.8) eventmachine (= 1.2.2) parse-cron (= 0.1.4) sensu-extension (= 1.5.1) - sensu-extensions (= 1.7.1) - sensu-json (= 2.0.1) + sensu-extensions (= 1.9.0) + sensu-json (= 2.1.0) sensu-logger (= 1.2.1) - sensu-redis (= 2.1.0) - sensu-settings (= 9.9.0) + sensu-redis (= 2.1.1) + sensu-settings (= 10.0.0) sensu-spawn (= 2.2.1) sensu-transport (= 7.0.2) sensu-extension (1.5.1) eventmachine - sensu-extensions (1.7.1) + sensu-extensions (1.9.0) sensu-extension + sensu-extensions-check-dependencies (= 1.0.1) sensu-extensions-debug (= 1.0.0) sensu-extensions-json (= 1.0.0) - sensu-extensions-occurrences (= 1.1.0) + sensu-extensions-occurrences (= 1.2.0) sensu-extensions-only-check-output (= 1.0.0) sensu-extensions-ruby-hash (= 1.0.0) sensu-json (>= 1.1.0) sensu-logger sensu-settings + sensu-extensions-check-dependencies (1.0.1) + sensu-extension sensu-extensions-debug (1.0.0) sensu-extension sensu-extensions-json (1.0.0) sensu-extension - sensu-extensions-occurrences (1.1.0) + sensu-extensions-occurrences (1.2.0) sensu-extension sensu-extensions-only-check-output (1.0.0) sensu-extension sensu-extensions-ruby-hash (1.0.0) sensu-extension - sensu-json (2.0.1) - oj (= 2.14.6) + sensu-json (2.1.0) + oj (= 2.18.1) sensu-logger (1.2.1) eventmachine sensu-json - sensu-redis (2.1.0) + sensu-redis (2.1.1) eventmachine - sensu-settings (9.9.0) + sensu-settings (10.0.0) parse-cron sensu-json (>= 1.1.0) sensu-spawn (2.2.1) @@ -76,4 +79,4 @@ DEPENDENCIES sensu BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 273496e2fb42..1df8d419cb63 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -50,18 +50,18 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.17"; + version = "1.9.18"; }; oj = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk"; + sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f"; type = "gem"; }; - version = "2.14.6"; + version = "2.18.1"; }; parse-cron = { source = { @@ -74,10 +74,10 @@ sensu = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx"; + sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; sensu-extension = { source = { @@ -90,10 +90,18 @@ sensu-extensions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g"; + sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; + }; + sensu-extensions-check-dependencies = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2"; + type = "gem"; + }; + version = "1.0.1"; }; sensu-extensions-debug = { source = { @@ -114,10 +122,10 @@ sensu-extensions-occurrences = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja"; + sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sensu-extensions-only-check-output = { source = { @@ -138,10 +146,10 @@ sensu-json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4"; + sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; sensu-logger = { source = { @@ -154,18 +162,18 @@ sensu-redis = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg"; + sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; sensu-settings = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i"; + sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli"; type = "gem"; }; - version = "9.9.0"; + version = "10.0.0"; }; sensu-spawn = { source = { diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 1412f76c25a4..b34fc6485319 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.2.1"; + version = "1.3.0"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "0vfx87a9shhwyqrbdf1jc32jkg0ych8bd0p222v2rcd83l75r0kh"; + sha256 = "0vcv4ylqzp4fvmpd3n5m0n2kxx39fcp9x62ny7cja4wraq36mdn0"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.2.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.3.0.nix similarity index 54% rename from pkgs/servers/monitoring/telegraf/deps-1.2.1.nix rename to pkgs/servers/monitoring/telegraf/deps-1.3.0.nix index a866881e53d9..bb31a4966032 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.2.1.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.3.0.nix @@ -1,12 +1,21 @@ -# This file was generated by go2nix. +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 [ + { + goPackagePath = "collectd.org"; + fetch = { + type = "git"; + url = "https://github.com/collectd/go-collectd"; + rev = "2ce144541b8903101fb8f1483cc0497a68798122"; + sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; + }; + } { goPackagePath = "github.com/Shopify/sarama"; fetch = { type = "git"; url = "https://github.com/Shopify/sarama"; - rev = "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9"; - sha256 = "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv"; + rev = "574d3147eee384229bf96a5d12c207fe7b5234f3"; + sha256 = "02ckm91bngkrbvkf4j7s5swrjjv3dr9kn9glwyc15apjv2ynkc4j"; }; } { @@ -14,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/Sirupsen/logrus"; - rev = "219c8cb75c258c552e999735be6df753ffc7afdc"; - sha256 = "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6"; + rev = "61e43dc76f7ee59a82bdf3d71033dc12bea4c77d"; + sha256 = "08kr7zvdgwv8vsakjzq1bla6cc6dlxlg1brlga69y69xw7cz5l9p"; }; } { @@ -23,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/aerospike/aerospike-client-go"; - rev = "7f3a312c3b2a60ac083ec6da296091c52c795c63"; - sha256 = "05ancqplckvni9xp6xd4bv2pgkfa4v23svfcg27m8xinzi4ry219"; + rev = "95e1ad7791bdbca44707fedbb29be42024900d9c"; + sha256 = "034pirm1dzdblwadcd829qk2jqkr8hg9gpfph8ax7z0b3h2ah8xf"; }; } { @@ -32,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/amir/raidman"; - rev = "53c1b967405155bfc8758557863bf2e14f814687"; - sha256 = "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4"; + rev = "c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985"; + sha256 = "10lmpz5vf2ysw8gnl0z8ravl4vvy48nbh8xpk2zzgifb6yn3x192"; }; } { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "13a12060f716145019378a10e2806c174356b857"; - sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; + rev = "7524cb911daddd6e5c9195def8e59ae892bef8d9"; + sha256 = "0dm8zfv3jdrbnhm1yyq6507v5lzi6wwhrpwkdswhf0ihgc9ca90z"; }; } { @@ -50,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; - sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; }; } { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/cenkalti/backoff"; - rev = "4dc77674aceaabba2c7e3da25d4c823edfb73f99"; - sha256 = "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w"; + rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3"; + sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc"; }; } { @@ -68,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/couchbase/go-couchbase"; - rev = "cb664315a324d87d19c879d9cc67fda6be8c2ac1"; - sha256 = "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr"; + rev = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28"; + sha256 = "0h59zzxcz3i8nd4ln89fi946ii8kscnqam67h3mxvjwvpnmcax9k"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/couchbase/gomemcached"; - rev = "a5ea6356f648fec6ab89add00edd09151455b4b2"; - sha256 = "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi"; + rev = "4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29"; + sha256 = "12h0wsimwmr0f398538g9ngasik4gisnac9vpn0ldy8hqdpa334d"; }; } { @@ -90,49 +99,22 @@ sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c"; }; } - { - goPackagePath = "github.com/dancannon/gorethink"; - fetch = { - type = "git"; - url = "https://github.com/dancannon/gorethink"; - rev = "e7cac92ea2bc52638791a021f212145acfedb1fc"; - sha256 = "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g"; - }; - } { goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; - sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; }; } { - goPackagePath = "github.com/docker/engine-api"; + goPackagePath = "github.com/docker/docker"; fetch = { type = "git"; - url = "https://github.com/docker/engine-api"; - rev = "8924d6900370b4c7e7984be5adc61f50a80d7537"; - sha256 = "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "f549a9393d05688dff0992ef3efd8bbe6c628aeb"; - sha256 = "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; - sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + url = "https://github.com/docker/docker"; + rev = "b89aff1afa1f61993ab2ba18fd62d9375a195f5d"; + sha256 = "1lkj1wmv4nfj3vrrdc072p5iib8p1l0y52mlg55p94b20v18ph2m"; }; } { @@ -144,13 +126,22 @@ sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; }; } + { + goPackagePath = "github.com/eapache/go-xerial-snappy"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-xerial-snappy"; + rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c"; + sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4"; + }; + } { goPackagePath = "github.com/eapache/queue"; fetch = { type = "git"; url = "https://github.com/eapache/queue"; - rev = "ded5959c0d4e360646dc9e9908cff48666781367"; - sha256 = "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n"; + rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; + sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; }; } { @@ -158,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "0f7a459f04f13a41b7ed752d47944528d4bf9a86"; - sha256 = "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh"; + rev = "d4f545eb108a2d19f9b1a735689dbfb719bc21fb"; + sha256 = "01cnca8y5caramqn6p8aigj6l5p6z0nrs2xqqv90658x584138kh"; }; } { @@ -167,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/go-sql-driver/mysql"; - rev = "1fca743146605a172a266e1654e01e5cd5669bee"; - sha256 = "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38"; + rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; + sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; }; } { @@ -176,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/gobwas/glob"; - rev = "49571a1557cd20e6a2410adc6421f85b66c730b5"; - sha256 = "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk"; + rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a"; + sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q"; }; } { @@ -185,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "552c7b9542c194800fd493123b3798ef0a832032"; - sha256 = "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm"; + rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; + sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; }; } { @@ -194,17 +185,8 @@ fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; - sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; - sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; + rev = "7db9049039a047d955fe8c19b83c8ff5abd765c7"; + sha256 = "09l3sc9z2fqnj5b040q320gwb4gqig6lnysxcayhwckrdp5bm8hs"; }; } { @@ -212,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "c9e326e2bdec29039a3761c07bece13133863e1e"; - sha256 = "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6"; + rev = "392c28fe23e1c45ddba891b0320b3b5df220beea"; + sha256 = "0dmihkq34ls23by08r8p92qpf77imibjd9m9qvw344j4r2z7bd4d"; }; } { @@ -230,35 +212,17 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/consul"; - rev = "5aa90455ce78d4d41578bafc86305e6e6b28d7d2"; - sha256 = "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw"; + rev = "63d2fc68239b996096a1c55a0d4b400ea4c2583f"; + sha256 = "0vx7jpi2a9374mlhn37b33780n7g950zh482z2sd4lsf29n4c580"; }; } { - goPackagePath = "github.com/hpcloud/tail"; + goPackagePath = "github.com/influxdata/tail"; fetch = { type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "b2940955ab8b26e19d43a43c4da0475dd81bdb56"; - sha256 = "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s"; - }; - } - { - goPackagePath = "github.com/influxdata/config"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/config"; - rev = "b79f6829346b8d6e78ba73544b1e1038f1f1c9da"; - sha256 = "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z"; - }; - } - { - goPackagePath = "github.com/influxdata/influxdb"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxdb"; - rev = "fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae"; - sha256 = "07cv1gryp4a84a2acgc8k8alr7jw4jwphf12cby8jjy1br35jrbq"; + url = "https://github.com/influxdata/tail"; + rev = "a395bf99fe07c233f41fba0735fa2b13b58588ea"; + sha256 = "0bmkv932xhjpxwp8n74xy8wf34kiiknwq8agfbnz931apq6iw9b0"; }; } { @@ -266,7 +230,7 @@ fetch = { type = "git"; url = "https://github.com/influxdata/toml"; - rev = "af4df43894b16e3fd2b788d01bd27ad0776ef2d0"; + rev = "5d1d907f22ead1cd47adde17ceec5bda9cacaf8f"; sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4"; }; } @@ -279,13 +243,22 @@ sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; }; } + { + goPackagePath = "github.com/jackc/pgx"; + fetch = { + type = "git"; + url = "https://github.com/jackc/pgx"; + rev = "b84338d7d62598f75859b2b146d830b22f1b9ec8"; + sha256 = "13q763a31yya8ij6m5zbnri7wc88hjwwn1rw4v7dmwbwsrqn885c"; + }; + } { goPackagePath = "github.com/kardianos/osext"; fetch = { type = "git"; url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; + sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; }; } { @@ -293,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/kardianos/service"; - rev = "5e335590050d6d00f3aa270217d288dda1c94d0a"; - sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h"; + rev = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893"; + sha256 = "1cgqg6zbwwsn6lz2ms094q4w37x84vd9ixs50wsh3037q4sfhyll"; }; } { @@ -311,17 +284,8 @@ fetch = { type = "git"; url = "https://github.com/klauspost/crc32"; - rev = "19b0b332c9e4516a6370a0456e6182c3b5036720"; - sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "e182dc4027e2ded4b19396d638610f2653295f36"; - sha256 = "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj"; + rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; + sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; }; } { @@ -329,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; - sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } { @@ -338,17 +302,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "cce6c130cdb92c752850880fd285bea1d64439dd"; - sha256 = "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx"; - }; - } - { - goPackagePath = "github.com/mreiferson/go-snappystream"; - fetch = { - type = "git"; - url = "https://github.com/mreiferson/go-snappystream"; - rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; - sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + rev = "99f84ae56e75126dd77e5de4fae2ea034a468ca1"; + sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf"; }; } { @@ -360,13 +315,22 @@ sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; }; } + { + goPackagePath = "github.com/nats-io/go-nats"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/go-nats"; + rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898"; + sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5"; + }; + } { goPackagePath = "github.com/nats-io/nats"; fetch = { type = "git"; url = "https://github.com/nats-io/nats"; - rev = "ea8b4fd12ebb823073c0004b9f09ac8748f4f165"; - sha256 = "0i5f6n9k0d2vzdy20sqygmss5j45y72irxsi80grjsh7qkxa6vn1"; + rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898"; + sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5"; }; } { @@ -374,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/nats-io/nuid"; - rev = "a5152d67cf63cbfb5d992a395458722a45194715"; - sha256 = "0fphar5bz735wwa7549j31nxnm5a9dyw472gs9zafz0cv7g8np40"; + rev = "289cccf02c178dc782430d534e3c1f5b72af807f"; + sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4"; }; } { @@ -383,17 +347,26 @@ fetch = { type = "git"; url = "https://github.com/nsqio/go-nsq"; - rev = "0b80d6f05e15ca1930e0c5e1d540ed627e299980"; - sha256 = "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr"; + rev = "a53d495e81424aaf7a7665a9d32a97715c40e953"; + sha256 = "04npqz6ajr4r2w5jfvfzppr307qrwr57w4c1ppq9p9ddf7hx3wpz"; }; } { - goPackagePath = "github.com/opencontainers/runc"; + goPackagePath = "github.com/pierrec/lz4"; fetch = { type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; - sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; + url = "https://github.com/pierrec/lz4"; + rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df"; + sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj"; + }; + } + { + goPackagePath = "github.com/pierrec/xxHash"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/xxHash"; + rev = "5a004441f897722c627870a981d02b29924215fa"; + sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; }; } { @@ -401,8 +374,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "18acf9993a863f4c4b40612e19cdd243e7c86831"; - sha256 = "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv"; + rev = "c317fb74746eac4fc65fe3909195f4cf67c5562a"; + sha256 = "1c3rqwkajkmhk5wh6agc5jnjbbfvpfxbiy8cprpw89khch428khp"; }; } { @@ -419,8 +392,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "e8eabff8812b05acf522b45fdcd725a785188e37"; - sha256 = "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq"; + rev = "dd2f054febf4a6c00f2343686efb775948a8bff4"; + sha256 = "0rhbgj51r105ax544mfg6wp4rsqpzn3776z1k82b21xwb3b51zr1"; }; } { @@ -428,8 +401,17 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; - sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + rev = "1878d9fbb537119d24b21ca07effd591627cd160"; + sha256 = "0jqn5l31szmc0dv5invp5mdhndx3fcsda7zpy49zd7k95c1y20m7"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c"; + sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj"; }; } { @@ -437,8 +419,17 @@ fetch = { type = "git"; url = "https://github.com/samuel/go-zookeeper"; - rev = "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f"; - sha256 = "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2"; + rev = "1d7be4effb13d2d908342d349d71a284a7542693"; + sha256 = "002s19109spms9ndfwykf3ryy3fnk7b56frxlqmmv37mlqgrd5v9"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; + sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; }; } { @@ -446,8 +437,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8"; - sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv"; + rev = "70693b6a3da51a8a686d31f1b346077bbc066062"; + sha256 = "0mrmwfpq8irqbmcqx64x7n1dw0qpl9kz4vbwm7c8bpfpjqmmni6b"; }; } { @@ -455,8 +446,8 @@ fetch = { type = "git"; url = "https://github.com/soniah/gosnmp"; - rev = "3fe3beb30fa9700988893c56a63b1df8e1b68c26"; - sha256 = "0a0vlxx1plqj9fi863wd8ajbzl705wgma4qk75v949azgn1yx9ib"; + rev = "5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15"; + sha256 = "0dqz0w077xfk9fj5dd8xa6sqgdvjpb8vx997wnqpi3kbii1b9jnb"; }; } { @@ -464,8 +455,8 @@ fetch = { type = "git"; url = "https://github.com/streadway/amqp"; - rev = "b4f3ceab0337f013208d31348b578d83c0064744"; - sha256 = "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp"; + rev = "63795daa9a446c920826655f26ba31c81c860fd6"; + sha256 = "1v6xwskb4dqyy2q1r7k12f9wky7v6cfb4f1mx94sr3qvx37zg2yj"; }; } { @@ -473,8 +464,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; - sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; + rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; + sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; }; } { @@ -482,8 +473,8 @@ fetch = { type = "git"; url = "https://github.com/vjeantet/grok"; - rev = "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2"; - sha256 = "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80"; + rev = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe"; + sha256 = "09p70h5inycwrw3dmn6c7lhx4m11fvw7449wzq1k5w2jcws7amd5"; }; } { @@ -500,8 +491,8 @@ fetch = { type = "git"; url = "https://github.com/wvanbergen/kazoo-go"; - rev = "0f768712ae6f76454f987c3356177e138df258f8"; - sha256 = "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16"; + rev = "968957352185472eacb69215fa3dbfcfdbac1096"; + sha256 = "07q37lmlc3vx620bklp93r368r73kgm2s9x7qcgcxk9701lqq7dc"; }; } { @@ -509,8 +500,8 @@ fetch = { type = "git"; url = "https://github.com/yuin/gopher-lua"; - rev = "bf3808abd44b1e55143a2d7f08571aaa80db1808"; - sha256 = "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm"; + rev = "66c871e454fcf10251c61bf8eff02d0978cae75a"; + sha256 = "1srcibhsl29cy8qih132iqigl4ss303nfmglrgc583nj9kz9sf8j"; }; } { @@ -527,8 +518,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; - sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; + rev = "dc137beb6cce2043eb6b5f223ab8bf51c32459f4"; + sha256 = "0kia3rd0g0vkb9pf102kbg1agr1xq27bi2shkpxy9l718yvy9jwd"; }; } { @@ -536,8 +527,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; - sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; + rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d"; + sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s"; }; } { @@ -545,8 +536,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; - sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; + rev = "506f9d5c962f284575e88337e7d9296d27e729d3"; + sha256 = "1ghx5vv4zlkjzlx2gslvcwpvxjggpl6wz5n49nqxiz777psx218s"; }; } { @@ -554,8 +545,8 @@ fetch = { type = "git"; url = "https://gopkg.in/dancannon/gorethink.v1"; - rev = "7d1af5be49cb5ecc7b177bf387d232050299d6ef"; - sha256 = "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi"; + rev = "edc7a6a68e2d8015f5ffe1b2560eed989f8a45be"; + sha256 = "0602082mfypdm98i963sdvij8l5ia5cw9r9cy7m6a60cvh1xmaka"; }; } { @@ -563,8 +554,8 @@ fetch = { type = "git"; url = "https://gopkg.in/fatih/pool.v2"; - rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; - sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; + rev = "6e328e67893eb46323ad06f0e92cb9536babbabc"; + sha256 = "1p1sljfpbg2bp4qv7ghvz1wcmmsbcfclsninxa97kr0v7na7jw5p"; }; } { @@ -572,8 +563,17 @@ fetch = { type = "git"; url = "https://gopkg.in/mgo.v2"; - rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; - sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; + rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; + sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; + }; + } + { + goPackagePath = "gopkg.in/olivere/elastic.v5"; + fetch = { + type = "git"; + url = "https://gopkg.in/olivere/elastic.v5"; + rev = "ee3ebceab960cf68ab9a89ee6d78c031ef5b4a4e"; + sha256 = "0pby1b8s0h964cq6nld0arapkbfqb8vzm1k41cnxjq14ryh8adlh"; }; } { @@ -581,8 +581,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + rev = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6"; + sha256 = "1ddwvmsfijgl09pbqrcx73fy5kh8y3888dd29lh7i50ds5a088cx"; }; } ] diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 82d18091050b..5c72ac97bc0d 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, doxygen }: +{ stdenv, fetchFromGitHub, autoreconfHook, doxygen }: stdenv.mkDerivation rec { version = "${passthru.majorVersion}.${passthru.minorVersion}"; name = "libmpdclient-${version}"; - src = fetchurl { - url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz"; - sha256 = "10pzs9z815a8hgbbbiliapyiw82bnplsccj5irgqjw5f5plcs22g"; + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "libmpdclient"; + rev = "v${version}"; + sha256 = "06rv2j8rw9v9l4nwpvbh28nad8bbg368hzd8s58znbr5pgb8dihd"; }; - buildInputs = [ doxygen ]; + nativeBuildInputs = [ autoreconfHook doxygen ]; + + enableParallelBuilding = true; passthru = { majorVersion = "2"; - minorVersion = "10"; + minorVersion = "11"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 87a477ab057d..b7eb0b5397db 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac @@ -33,18 +33,22 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "5"; + minor = "9"; in stdenv.mkDerivation rec { - name = "mpd-${major}${if minor == "" then "" else "." + minor}"; - src = fetchurl { - url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "11w9v0l9lf504nkxlb91y5r9x403ikl626mjd1lf4fj44yz76maj"; + name = "mpd-${version}"; + version = "${major}${if minor == "" then "" else "." + minor}"; + + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "MPD"; + rev = "v${version}"; + sha256 = "17ly30syrlw5274washifr0nddll3g1zb4rr4f9sfnlxz9wz73p1"; }; - patches = [ ./i386.patch ]; + patches = [ ./x86.patch ]; - buildInputs = [ pkgconfig glib boost ] + buildInputs = [ glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib @@ -77,6 +81,10 @@ in stdenv.mkDerivation rec { ++ opt opusSupport libopus ++ opt soundcloudSupport yajl; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + enableParallelBuilding = true; + configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") (mkFlag flacSupport "flac") diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/x86.patch similarity index 74% rename from pkgs/servers/mpd/i386.patch rename to pkgs/servers/mpd/x86.patch index dca8ea88a8b5..3e4c036418d2 100644 --- a/pkgs/servers/mpd/i386.patch +++ b/pkgs/servers/mpd/x86.patch @@ -1,5 +1,3 @@ -diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx -index 6986453..167fc07 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -20,8 +20,8 @@ diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix new file mode 100644 index 000000000000..1dba428e0ae9 --- /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 a3579aa83099..9a8a0a80e522 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/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d37b53398b6d..03c8463f9ea8 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "11.0.1"; + version = "12.0.0"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0"; + sha256 = "0gr47bwwni7y33qz3l8g3sjrqridykxiid2jlmjdaz35bvq9r78v"; }; installPhase = '' diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index d58005f7be2b..572cfe1f17d6 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!/bin/sh + #!${stdenv.shell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index f6fcca16081b..a2158c9b5410 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx"; + sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d87aefd37fb5..2666ddc5a43e 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 5e22cb118820..cc82e75a6154 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/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index b18650fbbca8..9998d34a2dae 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }: +{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }: let solrName = "solr-4.10.4-yz-2.tgz"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { name = "riak-2.2.0"; buildInputs = [ - which unzip erlangR16 pam + which unzip erlang pam ]; src = srcs.riak; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 6383ce12bc1d..ebbd10e8fa2c 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.20"; + version = "1.6.20.2"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0qar94k9x9dkws4clrnlw789q1ha9qjk06356s86hh78qwywc1ki"; + sha256 = "50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614"; }; nativeBuildInputs = [ autoconf automake flex yacc perl which ]; @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.z77z ]; broken = - (builtins.compareVersions kernel.version "3.18" == -1) || - (builtins.compareVersions kernel.version "4.4" != -1) || - (kernel.features.grsecurity or false); + (builtins.compareVersions kernel.version "3.18" == -1); }; } diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix index b1f33ff99cf0..8b17da99b9a3 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 122d5bd7dc9c..a1d5ce4147f3 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.3.3.3148"; - vsnHash = "b38628e"; - sha256 = "1dx8z27l1dwigr3ipcdzn25hnj0206255ihxh9rnh2qchrcqmb5y"; + version = "1.5.7.4016"; + vsnHash = "25d94bad9"; + sha256 = "0lc1shlyg7rvzfpjm9kww7rva33b3bip2bms64a4d5nb3lj4wilh"; }; in stdenv.mkDerivation rec { @@ -36,7 +36,14 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. - for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do + for bin in "Plex Media Server" \ + "Plex DLNA Server" \ + "Plex Media Scanner" \ + "Plex Media Server Tests" \ + "Plex Relay" \ + "Plex Script Host" \ + "Plex Transcoder" \ + "Plex Tuner Service" ; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done @@ -67,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 ]; + 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/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 680c9dfcb601..ba514ccdbcbc 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; - licenses = lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 wkennington ]; platforms = lib.platforms.unix; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index b60212dea014..ba3cc6dae761 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "1qyw675hrs3f67zprdbyw91wldmyihv97ibn1f99ypcp6x6n8hqh"; + sha256 = "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda"; }; buildInputs = diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix new file mode 100644 index 000000000000..23969dc2a23d --- /dev/null +++ b/pkgs/servers/radarr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper }: + +stdenv.mkDerivation rec { + name = "radarr-${version}"; + version = "0.2.0.778"; + + src = fetchurl { + url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; + sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/${name}} + cp -r * $out/share/${name}/. + + makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ + --add-flags "$out/share/${name}/Radarr.exe" \ + --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \ + --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib" + ''; + + meta = with stdenv.lib; { + description = "A Usenet/BitTorrent movie downloader."; + homepage = https://radarr.video/; + license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 47bdad75343d..b6d61e293951 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -2,20 +2,20 @@ pythonPackages.buildPythonApplication rec { name = "radicale-${version}"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz"; - sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"; + sha256 = "17p0hayyw30pfb81xqvd7jhjm6yrk2dnbgvqagx1nqdsr89ar0ss"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ pythonPackages.flup pythonPackages.ldap pythonPackages.sqlalchemy ]; - doCheck = true; + doCheck = !pythonPackages.isPy3k; meta = with stdenv.lib; { homepage = http://www.radicale.org/; @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { on mobile phones or computers. ''; license = licenses.gpl3Plus; - platform = platforms.all; - maintainers = with maintainers; [ edwtjo pSub ]; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo pSub aneeshusa ]; }; } diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index deec6589dbb2..82818037072a 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -1,5 +1,35 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: +# This package isn't extremely useful as it is, but is getting close. +# After running: +# +# nix-build . -A rt +# +# I created a config file named myconfig.pm with: +# +# use utf8; +# Set($rtname, '127.0.0.1'); +# # These dirs need to be pre-created: +# Set($MasonSessionDir, '/home/grahamc/foo/sessiondir/'); +# Set($MasonDataDir, '/home/grahamc/foo/localstate/'); +# Set($WebPort, 8080); +# +# Set($DatabaseType, "SQLite"); +# Set( $DatabaseName, '/home/grahamc/projects/foo/my.db' ); +# +# 1; +# +# and ran +# +# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-setup-database --action init +# +# Then: +# +# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-server +# +# Make sure to check out result/etc/RT_Config.pm +# +# Good luck. stdenv.mkDerivation rec { name = "rt-${version}"; @@ -12,14 +42,58 @@ stdenv.mkDerivation rec { patches = [ ./override-generated.patch ]; - buildInputs = [ perl ]; + buildInputs = [ + makeWrapper + perl + (buildEnv { + name = "rt-perl-deps"; + paths = (with perlPackages; [ + ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI + CSSMinifierXP CSSSquish ConvertColor CryptEksblowfish + CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID + DataICal DataPagePageset DateExtract DateManip + DateTimeFormatNatural DevelGlobalDestruction EmailAddress + EmailAddressList FCGI FCGIProcManager FileShareDir FileWhich + GD GDGraph GnuPGInterface GraphViz HTMLFormatTextWithLinks + HTMLFormatTextWithLinksAndTables HTMLMason + HTMLMasonPSGIHandler HTMLQuoted HTMLRewriteAttributes + HTMLScrubber IPCRun IPCRun3 JSON JavaScriptMinifierXS LWP + LWPProtocolHttps LocaleMaketextFuzzy LocaleMaketextLexicon + LogDispatch MIMETools MIMETypes MailTools ModuleRefresh + ModuleVersionsReport MozillaCA NetCIDR NetIP PerlIOeol Plack + RegexpCommon RegexpCommonnetCIDR RegexpIPv6 RoleBasic + ScopeUpper Starlet SymbolGlobalName TermReadKey + TextPasswordPronounceable TextQuoted TextTemplate + TextWikiFormat TextWrapper TimeParseDate TreeSimple + UNIVERSALrequire XMLRSS + ]); + }) + ]; - dontBuild = true; + preConfigure = '' + configureFlags="$configureFlags --with-web-user=$UID" + configureFlags="$configureFlags --with-web-group=$(id -g)" + configureFlags="$configureFlags --with-rt-group=$(id -g)" + configureFlags="$configureFlags --with-bin-owner=$UID" + configureFlags="$configureFlags --with-libs-owner=$UID" + configureFlags="$configureFlags --with-libs-group=$(id -g)" + ''; + configureFlags = [ + "--enable-graphviz" + "--enable-gd" + "--enable-gpg" + "--with-db-type=SQLite" + ]; - installPhase = '' - mkdir $out - cp -a {bin,docs,etc,lib,sbin,share} $out - find $out -name '*.in' -exec rm '{}' \; + buildPhase = '' + make testdeps | grep -i missing | sort + ''; + + preFixup = '' + for i in $(find $out/bin -type f; find $out/sbin -type f); do + wrapProgram $i \ + --prefix PERL5LIB ':' $PERL5LIB + done ''; meta = { diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 51bee4f0b4c9..d7b1c8173dde 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -19,11 +19,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.5.3"; + version = "4.6.4"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "1jif95684swssqwp9v3i2r08cn3r2iddf6ly68db4wmvl5ac8vgh"; + sha256 = "0qcsinhcq3frlqp7bfav5mdc9xn1h4xy4l6vfpf8cmcfs4lp7ija"; }; outputs = [ "out" "dev" "man" ]; @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; - enableParallelBuilding = true; + # To build in parallel. + buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES"; # Some libraries don't have /lib/samba in RPATH but need it. # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix new file mode 100644 index 000000000000..6f9895509ee0 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, elk5Version, makeWrapper, jre, utillinux, getopt }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = elk5Version; + name = "elasticsearch-${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; + sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2"; + }; + + patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; + + buildInputs = [ makeWrapper jre ] ++ + (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + + installPhase = '' + mkdir -p $out + cp -R bin config lib modules plugins $out + + chmod -x $out/bin/*.* + + wrapProgram $out/bin/elasticsearch \ + --prefix ES_CLASSPATH : "$out/lib/*" \ + ${if (!stdenv.isDarwin) + then ''--prefix PATH : "${utillinux}/bin/"'' + else ''--prefix PATH : "${getopt}/bin"''} \ + --set JAVA_HOME "${jre}" \ + --set ES_JVM_OPTIONS "$out/config/jvm.options" + + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" + ''; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ + maintainers.apeschar + ]; + }; +} diff --git a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch new file mode 100644 index 000000000000..6898ffcf1d79 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch @@ -0,0 +1,34 @@ +diff -rupN a/bin/elasticsearch b/bin/elasticsearch +--- a/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200 ++++ b/bin/elasticsearch 2017-05-17 10:55:52.755081523 +0200 +@@ -129,12 +129,7 @@ ES_JAVA_OPTS="$(parse_jvm_options "$ES_J + # If an include wasn't specified in the environment, then search for one... + if [ "x$ES_INCLUDE" = "x" ]; then + # Locations (in order) to use when searching for an include file. +- for include in /usr/share/elasticsearch/elasticsearch.in.sh \ +- /usr/local/share/elasticsearch/elasticsearch.in.sh \ +- /opt/elasticsearch/elasticsearch.in.sh \ +- ~/.elasticsearch.in.sh \ +- "$ES_HOME/bin/elasticsearch.in.sh" \ +- "`dirname "$0"`"/elasticsearch.in.sh; do ++ for include in "`dirname "$0"`"/elasticsearch.in.sh; do + if [ -r "$include" ]; then + . "$include" + break +diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh +--- a/bin/elasticsearch.in.sh 2017-04-28 19:41:47.000000000 +0200 ++++ b/bin/elasticsearch.in.sh 2017-05-17 10:56:49.303519788 +0200 +@@ -1,13 +1 @@ + #!/bin/bash +- +-# check in case a user was using this mechanism +-if [ "x$ES_CLASSPATH" != "x" ]; then +- cat >&2 << EOF +-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add +-additional elements via the plugin mechanism, or if code must really be +-added to the main classpath, add jars to lib/ (unsupported). +-EOF +- exit 1 +-fi +- +-ES_CLASSPATH="$ES_HOME/lib/*" diff --git a/pkgs/servers/search/elasticsearch/es-home-5.x.patch b/pkgs/servers/search/elasticsearch/es-home-5.x.patch new file mode 100644 index 000000000000..cee0137312f1 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/es-home-5.x.patch @@ -0,0 +1,31 @@ +diff -rupN a/bin/elasticsearch b/bin/elasticsearch +--- a/bin/elasticsearch 2017-05-17 10:53:42.214686741 +0200 ++++ b/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200 +@@ -105,7 +105,11 @@ while [ -h "$SCRIPT" ] ; do + done + + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++ ++if [ -z "$ES_HOME" ]; then ++ echo "You must set the ES_HOME var" >&2 ++ exit 1 ++fi + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` +diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin +--- a/bin/elasticsearch-plugin 2017-05-17 10:53:42.214686741 +0200 ++++ b/bin/elasticsearch-plugin 2017-05-17 10:53:49.445487044 +0200 +@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do + done + + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++if [ -z "$ES_HOME" ]; then ++ echo "You must set the ES_HOME var" >&2 ++ exit 1 ++fi + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 32b065364a6a..841ca530f322 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -36,7 +36,7 @@ in { }; }; - elasticsearch_analisys_lemmagen = esPlugin rec { + elasticsearch_analysis_lemmagen = esPlugin rec { name = "elasticsearch-analysis-lemmagen-${version}"; pluginName = "elasticsearch-analysis-lemmagen"; version = "0.1"; @@ -94,10 +94,10 @@ in { elasticsearch_kopf = esPlugin rec { name = "elasticsearch-kopf-${version}"; pluginName = "elasticsearch-kopf"; - version = "1.5.7"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip"; - sha256 = "0mq6jmjb4ldi03m431kzr7ly0bf7mdim7s5dx4wplb85gyhscns1"; + sha256 = "1nwwd92g0jxhfpkxb1a9z5a62naa1y7hvlx400dm6mwwav3mrf4v"; }; meta = { homepage = https://github.com/lmenezes/elasticsearch-kopf; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index e71c570f736f..500913b5eecd 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "7.0.0"; + version = "7.0.3"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0c3vzw2ias0xpz1hwywlib1qqfjvvzwj1zggswd5l2cj87f1krfd"; + sha256 = "17pp4sbfa6wpiiiqvdbnvd1qxrchmj7zh27zdrmmnbvwpyc5g2n6"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 3e340ba7df4b..535571f46e20 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -6,9 +6,10 @@ }: let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + stdenv.lib.optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 8eecfa1e276b..3395be9b9c1d 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.9.8"; + name = "sipwitch-1.9.15"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "0117c5iid1vrwl7sl3pys2jlinpmx2vfp8wcdwk93m7cc6k9793b"; + sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix new file mode 100644 index 000000000000..18dbed4d1f30 --- /dev/null +++ b/pkgs/servers/slimserver/default.nix @@ -0,0 +1,97 @@ +{ stdenv, buildPerlPackage, fetchurl +, perl, perlPackages }: + +buildPerlPackage rec { + name = "slimserver-${version}"; + version = "7.9.0"; + + src = fetchurl { + url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz"; + sha256 = "07rhqipg7m28x0nqdd83nyzi88dp9cf8rr2pamdyrfcwyp1h1b44"; + }; + + buildInputs = [ + perl + perlPackages.AnyEvent + perlPackages.AudioScan + perlPackages.CarpClan + perlPackages.CGI + perlPackages.ClassXSAccessor + perlPackages.DataDump + perlPackages.DataURIEncode + perlPackages.DBDSQLite + perlPackages.DBI + perlPackages.DBIxClass + perlPackages.DigestSHA1 + perlPackages.EV + perlPackages.ExporterLite + perlPackages.FileBOM + perlPackages.FileCopyRecursive + perlPackages.FileNext + perlPackages.FileReadBackwards + perlPackages.FileSlurp + perlPackages.FileWhich + perlPackages.HTMLParser + perlPackages.HTTPCookies + perlPackages.HTTPDaemon + perlPackages.HTTPMessage + perlPackages.ImageScale + perlPackages.IOSocketSSL + perlPackages.IOString + perlPackages.JSONXSVersionOneAndTwo + perlPackages.Log4Perl + perlPackages.LWPUserAgent + perlPackages.NetHTTP + perlPackages.ProcBackground + perlPackages.SubName + perlPackages.TemplateToolkit + perlPackages.TextUnidecode + perlPackages.TieCacheLRU + perlPackages.TieCacheLRUExpires + perlPackages.TieRegexpHash + perlPackages.TimeDate + perlPackages.URI + perlPackages.URIFind + perlPackages.UUIDTiny + perlPackages.XMLParser + perlPackages.XMLSimple + perlPackages.YAMLLibYAML + ]; + + + prePatch = '' + mkdir CPAN_used + # slimserver doesn't work with current DBIx/SQL versions, use bundled copies + mv CPAN/DBIx CPAN/SQL CPAN_used + rm -rf CPAN + rm -rf Bin + touch Makefile.PL + ''; + + preConfigurePhase = ""; + + buildPhase = " + mv lib tmp + mkdir -p lib/perl5/site_perl + mv CPAN_used/* lib/perl5/site_perl + cp -rf tmp/* lib/perl5/site_perl + "; + + doCheck = false; + + installPhase = '' + cp -r . $out + ''; + + outputs = [ "out" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Logitech/slimserver; + description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; + # the firmware is not under a free license! + # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt + license = licenses.unfree; + maintainers = [ maintainers.phile314 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 9a6423652b6a..db47dc994686 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.1.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "0mmwvjqbzhzwii4g6rz3ms9fhzppnhbsrhr4jqpih2y95cz039gg"; + sha256 = "0a1sgf9p39gbfrh7bhfg1hjqa6y18i7cig7bffmv7spqnvb50zx5"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 1e7ddb53e23a..bd921df6e528 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4613"; + version = "2.0.0.4753"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1a8wm50aw7yyigvywx7hgy58w60mi4s60dqvwwlgrbavl4z5jphl"; + sha256 = "1rhdnd37fd5a4wbnrd817bf7ln4095kzmv283kmm8fz93nmmc19c"; }; buildInputs = [ diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 0a5e0d170403..01f92dfa2b99 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,27 +1,36 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, gcc }: +{ stdenv, buildGoPackage, fetchurl, cmake, xz, which }: buildGoPackage rec { name = "cockroach-${version}"; - version = "beta-20160915"; + version = "v1.0.2"; goPackagePath = "github.com/cockroachdb/cockroach"; - subPackages = [ "." ]; - src = fetchFromGitHub { - owner = "cockroachdb"; - repo = "cockroach"; - rev = version; - sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3"; + src = fetchurl { + url = "https://binaries.cockroachdb.com/cockroach-${version}.src.tgz"; + sha256 = "0xq5lg9a2lxn89lilq3zzcd4kph0a5sga3b5bb9xv6af87igy6zp"; }; - buildFlagsArray = '' - -ldflags= - -X github.com/cockroachdb/cockroach/build.tag=${version} - ''; + buildInputs = [ cmake xz which ]; - buildInputs = [ gcc ]; + buildPhase = + '' + cd $NIX_BUILD_TOP/go/src/${goPackagePath} + patchShebangs ./ + make buildoss + cd src/${goPackagePath} + for asset in man autocomplete; do + ./cockroach gen $asset + done + ''; - goDeps = ./deps.nix; + installPhase = + '' + mkdir -p $bin/{bin,share,etc/bash_completion.d} + mv cockroach $bin/bin + mv man $bin/share + mv cockroach.bash $bin/etc/bash_completion.d + ''; meta = with stdenv.lib; { homepage = https://www.cockroachlabs.com; diff --git a/pkgs/servers/sql/cockroachdb/deps.nix b/pkgs/servers/sql/cockroachdb/deps.nix deleted file mode 100644 index da2ab57f91a1..000000000000 --- a/pkgs/servers/sql/cockroachdb/deps.nix +++ /dev/null @@ -1,471 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/VividCortex/ewma"; - fetch = { - type = "git"; - url = "https://github.com/VividCortex/ewma"; - rev = "8b9f1311551e712ea8a06b494238b8a2351e1c33"; - sha256 = "1w8gf6310dxl57jdq1b04wbh4ssb0nvck3926bbd86mnw78z0byl"; - }; - } - { - goPackagePath = "github.com/backtrace-labs/go-bcd"; - fetch = { - type = "git"; - url = "https://github.com/backtrace-labs/go-bcd"; - rev = "c5383e2df7004f8b2fb2f10a33167d757bb0fbfb"; - sha256 = "0v7al14ql8vddj8bw2yp1pp47nfdhq6vglbv6fmpg5sf5yfsp9xa"; - }; - } - { - goPackagePath = "github.com/biogo/store"; - fetch = { - type = "git"; - url = "https://github.com/biogo/store"; - rev = "913427a1d5e89604e50ea1db0f28f34966d61602"; - sha256 = "0xgz1g9digvvw64rmzw90a6iyxlljiiz2i1x0x0d8mw4wyaxcipz"; - }; - } - { - goPackagePath = "github.com/cenk/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenk/backoff"; - rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; - sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "a193146c91dea4b6cf30f355e99fb85f73d20f07"; - sha256 = "0amg5p3xadmj4p58f63f8kkggs9q3f3jhi7ijzb79grbg1lj2rj2"; - }; - } - { - goPackagePath = "github.com/cockroachdb/c-jemalloc"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/c-jemalloc"; - rev = "42e6a32cd7a4dff9c70d80323681d46d046181ef"; - sha256 = "16ddzw35xj2vz8324mac5bhhr9akvjrg14lgq2mn5nfw1zs42r7n"; - }; - } - { - goPackagePath = "github.com/cockroachdb/c-protobuf"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/c-protobuf"; - rev = "951f3e665896e7ba939fd1f2db9aeaae6ca988f8"; - sha256 = "032ncrq4p48riwk8zj6p3rp65p87k9793lg107ja6mf8nx0v3z3l"; - }; - } - { - goPackagePath = "github.com/cockroachdb/c-rocksdb"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/c-rocksdb"; - rev = "b5ca031b93fde49bfa2ba99aba423136aebf3c06"; - sha256 = "1vwq8fbcgwvq2mqv1vwm3b671iklg26s7zd3bgxr5rl076mhn6s5"; - }; - } - { - goPackagePath = "github.com/cockroachdb/c-snappy"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/c-snappy"; - rev = "d4e7b428fe7fc09e93573df3448567a62df8c9fa"; - sha256 = "09c1pnks51ypvqh97yf9mvi034cc3bb8dj3vkl9v959pg5ix91g4"; - }; - } - { - goPackagePath = "github.com/cockroachdb/cmux"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cmux"; - rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; - sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; - }; - } - { - goPackagePath = "github.com/cockroachdb/cockroach"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cockroach"; - rev = "3fff05767cd3eda2197ce102391c0de447fef606"; - sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3"; - }; - } - { - goPackagePath = "github.com/cockroachdb/pq"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/pq"; - rev = "40c6b2414c76cdb84aacc955f79dc844e48ad0c0"; - sha256 = "16pnyndzlsk5rbbrimpkg6mf9w2qf0z64pk2k70ja4a65kihlw9g"; - }; - } - { - goPackagePath = "github.com/codahale/hdrhistogram"; - fetch = { - type = "git"; - url = "https://github.com/codahale/hdrhistogram"; - rev = "f8ad88b59a584afeee9d334eff879b104439117b"; - sha256 = "1y1llqaczhc5hqa71pwa1ns8nchizpl678lp23vl51c04swn8h8n"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "656167d760543d442eae62f0c8c4f92c05f59508"; - sha256 = "1v4bwfh7ziklfcdapnyky00gjivcn1n30b72pwmbdlk7283p555k"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; - sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; - sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; - }; - } - { - goPackagePath = "github.com/elastic/gosigar"; - fetch = { - type = "git"; - url = "https://github.com/elastic/gosigar"; - rev = "7c0ce0d4814c8d4950d7e7f40ed3b6359e757875"; - sha256 = "1nar7jia3xfgwnvazp25m9b0kxxklarrq9fzdr63j3nqy2fnwvca"; - }; - } - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "e1a2a7ec64b07d04ac9ebb072404fe8b7b60de1b"; - sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; - }; - } - { - goPackagePath = "github.com/facebookgo/clock"; - fetch = { - type = "git"; - url = "https://github.com/facebookgo/clock"; - rev = "600d898af40aa09a7a93ecb9265d87b0504b6f03"; - sha256 = "1z3jxwsqll65il7rcdx5j4dggg6w143z24h3agk09xvsc2iyj7a2"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "a4cceea7a401a73fefafd1a21fedbd4694124a82"; - sha256 = "1b23izdgxlz010qrqgazm5yg0bc3pkni1qdf8n3z3xcn58hcx2yg"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "2c1988e8c18d14b142c0b472624f71647cf39adb"; - sha256 = "176x3yv6l0i49ddv73r9v6w9qcmgrfzy8db26r01yk7sczq75nd5"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "7d79101e329e5a3adf994758c578dab82b90c017"; - sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "ccd4e6b091a44f9f6b32848ffc63b3e8f8e26092"; - sha256 = "0nl9hddmxw2s4cqpg70k1913fna101lxrha6dgplw8g8rjikfna4"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "d8ff598a019f2c7bad0980917a588193cf26666e"; - sha256 = "11sdd5fi2w0szk850n4y35x4v2ndy62c3ss9alha5xcj4jh1j0yq"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "737b74a46c4bf788349f72cb256fed10aea4d0ac"; - sha256 = "13bip4vamvij8dx0v0nhrikz6qhsimd0w4i55424c76ws6ph84i8"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "7cafcd837844e784b526369c9bce262804aebc60"; - sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "80f8150043c80fb52dee6bc863a709cdac7ec8f8"; - sha256 = "0brk4di63f56x9fsidn8dk7c2azan1kjzrli79h262j9pd17c3jm"; - }; - } - { - goPackagePath = "github.com/lightstep/lightstep-tracer-go"; - fetch = { - type = "git"; - url = "https://github.com/lightstep/lightstep-tracer-go"; - rev = "f3c66066ce6023ad1bd721cfbd9fbd6292eb08cc"; - sha256 = "1ci38j6d3spy2279l6anxxvm7k85h4fr08pdfw9ghrv96ajmaizb"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; - sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "daf2955e742cf123959884fdff4685aa79b63135"; - sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; - }; - } - { - goPackagePath = "github.com/opentracing/basictracer-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/basictracer-go"; - rev = "c7c0202a8a77f658aeb2193a27b6c0cfcc821038"; - sha256 = "09mh7dlhr3lyw8kwpa07ywjzr3bg7847ky4hvx551lhyqk0bfv0l"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "855519783f479520497c6b3445611b05fc42f009"; - sha256 = "15amxprc5n0dgr42jd1lkcn697m7pcvmksps9g1gw38ahyicxq8g"; - }; - } - { - goPackagePath = "github.com/petermattis/goid"; - fetch = { - type = "git"; - url = "https://github.com/petermattis/goid"; - rev = "208e1c5be6bf38853827abdc6290b5f6a0c404d5"; - sha256 = "0d511pdyrv9lkzq04agnm7019c1769vmdq8kyh66pq2np1x6jsl2"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "a22138067af1c4942683050411a841ade67fe1eb"; - sha256 = "0fay1zxi8y4kj1q33mqxdsbicg9cplknnmzz87c9saq7rb4k6f36"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; - sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "bdb33529eca3e55eac7328e07c57012a797af602"; - sha256 = "146hfddgdi8rkg25v1f25klz3sy5slp0gny2lwjyi63jwly07512"; - }; - } - { - goPackagePath = "github.com/rubyist/circuitbreaker"; - fetch = { - type = "git"; - url = "https://github.com/rubyist/circuitbreaker"; - rev = "7e3e7fbe9c62b943d487af023566a79d9eb22d3b"; - sha256 = "01fshh514bq2bk7f6xv7zr781m23d3k1mla1lh8azqw5874m7a07"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "93622da34e54fb6529bfb7c57e710f37a8d9cbd8"; - sha256 = "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6"; - sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; - sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; - sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "f676131e2660dc8cd88de99f7486d34aa8172635"; - sha256 = "0gj4fpary501n32ag49mkd0vymqw01am0lv78l9db9dvd2im0i4m"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a548aac93ed489257b9d959b40fe1e8c1e20778c"; - sha256 = "022vl9s6hf8qzdrxfivzd3dg1gsr1vns0j3a3xfdkgv5z9qyvy83"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; - sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; - sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "2910a502d2bf9e43193af9d68ca516529614eed3"; - sha256 = "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b"; - sha256 = "0w2g3pcxxgnp3fk0qy7ail8mxdxv3cf1yavdx8rrjn9idyd261df"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v1"; - rev = "9f9df34309c04878acc86042b16630b0f696e1de"; - sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm"; - }; - } -] diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 4f64afe3d92b..1356915c1fac 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/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix new file mode 100644 index 000000000000..a394d5845366 --- /dev/null +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }: + +stdenv.mkDerivation rec { + name = "percona-server-${version}"; + version = "5.6.35-80.0"; + + src = fetchurl { + url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; + sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5"; + }; + + buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DFEATURE_SET=community" + "-DBUILD_CONFIG=mysql_release" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-DWITH_SSL=yes" + "-DWITH_READLINE=no" + "-DWITH_EMBEDDED_SERVER=no" + "-DWITH_EDITLINE=bundled" + "-DWITH_ZLIB=yes" + "-DHAVE_IPV6=no" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + NIX_LDFLAGS = "-lgcc_s"; + + prePatch = '' + sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake + ''; + postInstall = '' + sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db + rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a + rm $out/share/man/man1/mysql-test-run.pl.1 + ''; + + passthru.mysqlVersion = "5.6"; + + meta = with stdenv.lib; { + homepage = "https://www.percona.com"; + description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 50101fc5ce82..b9c940a01cdf 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 @@ -11,11 +11,11 @@ let inherit sha256; }; - outputs = [ "out" "lib" "doc" ]; + outputs = [ "out" "lib" "doc" "man" ]; 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 000000000000..158633735623 --- /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/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 5f6b39041551..b0b8f926d9ec 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 2087829084f5..a24daa708123 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; #configure: The current version [...] can only be built on 64bit platforms platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index 52fcad7ff958..f8c735d879bb 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -2,11 +2,11 @@ , expat, libxml2, openssl }: stdenv.mkDerivation rec { - name = "squid-4.0.17"; + name = "squid-4.0.20"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "1713fqw59r3d892p5hpbkhmfcaw6jzfnngfn5f4h46sx963k87wb"; + sha256 = "1apb496psfv513fad82m52s6x7l74lsdq2dkzifmfgh3zrlc7r9i"; }; buildInputs = [ diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index b64dfeda667a..eeec90486892 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -2,11 +2,11 @@ , expat, libxml2, openssl }: stdenv.mkDerivation rec { - name = "squid-3.5.23"; + name = "squid-3.5.26"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz"; - sha256 = "1nqbljph2mbxjy1jzsis5vplfvvc2y6rdlxy609zx4hyyjchqk7s"; + sha256 = "10m9g7wcik11gv7xqpv9wbkmmfbwxs00s1jm8hgqh63fgp5yx8ds"; }; buildInputs = [ diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index d42656cf0f6b..2cc0cac8a60a 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/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index ee51ace4b687..09cb2cca6288 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,9 +1,9 @@ -{avahi, dbus, fetchurl, git, gnutar, gzip, libav, libiconv, openssl, pkgconfig, python +{avahi, cmake, dbus, fetchurl, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, pkgconfig, python , stdenv, which, zlib}: with stdenv.lib; -let version = "4.0.8"; +let version = "4.2.1"; pkgName = "tvheadend"; in @@ -13,16 +13,26 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz"; - sha256 = "0k4g7pvfyk4bxpsjdwv7bmbygbp7gfg9wrr2aqb099ncbz18bx04"; + sha256 = "1wrj3w595c1hfl2vmfdmp5qncy5samqi7iisyq76jf3nlzgw6dvn"; }; enableParallelBuilding = true; # disable dvbscan, as having it enabled causes a network download which # cannot happen during build. - configureFlags = [ "--disable-dvbscan" ]; + configureFlags = [ + "--disable-dvbscan" + "--disable-bintray_cache" + "--disable-ffmpeg_static" + "--disable-hdhomerun_client" + "--disable-hdhomerun_static" + ]; - buildInputs = [ avahi dbus git gnutar gzip libav libiconv openssl pkgconfig python + buildPhase = "make"; + + dontUseCmakeConfigure = true; + + buildInputs = [ avahi dbus cmake gettext git gnutar gzip bzip2 ffmpeg libiconv openssl pkgconfig python which zlib ]; preConfigure = '' @@ -31,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TV steaming server"; + description = "TV streaming server"; longDescription = '' Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 8a411f0c1a52..7237bbdcd968 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv +, dpkg +, fetchurl +, unzip +}: stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.4.11"; + version = "5.5.19"; src = fetchurl { - url = "https://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "18hd0w1zif6x9yxmfpwm7vbd07n705lf36yhg3z8fy04an6njgv2"; + url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb"; + sha256 = "0bsfq48xjp230ir8pm9wpa5p4dh88zfy51lbi2xwpr454371ixcl"; }; - buildInputs = [ unzip ]; + buildInputs = [ dpkg ]; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; doConfigure = false; - buildPhase = '' - rm -rf bin conf readme.txt - ''; - installPhase = '' mkdir -p $out - cp -ar * $out + cd ./usr/lib/unifi + cp -ar dl lib webapps $out ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 6d29c7456974..f871e6adf2be 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; preBuild = "touch unix.h"; - inputs = [ php-embed php-embed.nativeBuildInputs ]; + inputs = [ php-embed ] ++ php-embed.buildInputs; }) ]; @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "11r829j4fyk7y068arqmwbc9dj6lc0n3l6bn6pr5z0vdjbpx3cr1"; + sha256 = "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp"; }; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index e1376a6c59f5..bf8e69bd9896 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,23 +1,27 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python, pythonPackages }: +, python, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.2"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "0jizha1mwqk42zmkrh80y07vfl78mg1d9pp5w83qla4xn9ras0ai"; + sha256 = "1qzwljdwp830l41nw4ils9hxly077zqn6wzhhmy8m516gq9min1r"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre libxslt groff ncurses readline python libedit - pythonPackages.docutils + pythonPackages.docutils makeWrapper ]; buildFlags = "localstatedir=/var/spool"; + postInstall = '' + wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}" + ''; + # https://github.com/varnishcache/varnish-cache/issues/1875 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/piwik/bootstrap.php new file mode 100644 index 000000000000..a8163f33e5c0 --- /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/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index d413475389fc..ee4dab5ad64a 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh index 51e05ce37d6b..6dc91c72c09e 100755 --- a/pkgs/servers/web-apps/pump.io/generate.sh +++ b/pkgs/servers/web-apps/pump.io/generate.sh @@ -15,15 +15,23 @@ set -e # Also jshon does funny things with slashes in strings, which can be # fixed with sed. -curl https://raw.githubusercontent.com/e14n/pump.io/v1.0.0/package.json | \ +VERSION="3.0.0" +URL="https://registry.npmjs.org/pump.io/-/pump.io-$VERSION.tgz" +SHA1="ycfm7ak83xi8mgafhp9q0n6n3kzmdz16" + +curl https://raw.githubusercontent.com/e14n/pump.io/v$VERSION/package.json | \ jshon -e dependencies \ -s '*' -i databank-mongodb \ -s '*' -i databank-redis \ - -s '*' -i databank-memcached \ -s '*' -i databank-lrucache \ -p | sed 's=\\/=/=g' > full-package.json node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix # overriding nodePackages src doesn't seem to work, so... -sed -i 's|src = ./.|src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }|' node-packages.nix +sed -i "s|src = ./.|src = fetchurl { url = \"$URL\"; sha1 = \"$SHA1\"; }|" node-packages.nix + +# fetchgit or node2nix is having problems with submodules or something. +# This is the sha256 for connect-auth which is a npm dep hosted on +# github and containing submodules. +sed -i "s|d08fecbb72aff14ecb39dc310e8965ba92228f0c0def41fbde3db5ea7a1aac19|1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b|" node-packages.nix diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index ab3022b95123..ca27c79fab90 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,13 +13,22 @@ let sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; }; }; - "bunyan-1.8.5" = { + "bunyan-1.8.9" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.5"; + version = "1.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; - sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; + sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; + }; + }; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; "connect-2.30.2" = { @@ -31,13 +40,14 @@ let sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; }; }; - "connect-auth-0.6.1" = { + "connect-auth-git://github.com/e14n/connect-auth" = { name = "connect-auth"; packageName = "connect-auth"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-auth/-/connect-auth-0.6.1.tgz"; - sha1 = "8d798153d6c8e78cb809de82a436f1de7c79868f"; + version = "0.6.0"; + src = fetchgit { + url = "git://github.com/e14n/connect-auth"; + rev = "ae4e3c4c86a5d266be7bd91c2b99856f9a37b1ec"; + sha256 = "1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b"; }; }; "connect-databank-1.0.3" = { @@ -49,6 +59,15 @@ let sha1 = "dad24f08dc385d9c3a94f1a52730aec0c7d13b02"; }; }; + "connect-multiparty-2.0.0" = { + name = "connect-multiparty"; + packageName = "connect-multiparty"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz"; + sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab"; + }; + }; "crypto-cacerts-0.1.0" = { name = "crypto-cacerts"; packageName = "crypto-cacerts"; @@ -58,13 +77,13 @@ let sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; }; }; - "databank-0.19.5" = { + "databank-0.19.8" = { name = "databank"; packageName = "databank"; - version = "0.19.5"; + version = "0.19.8"; src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-0.19.5.tgz"; - sha1 = "edcbd954b84730c0c5d0de551e004b92f1f53119"; + url = "https://registry.npmjs.org/databank/-/databank-0.19.8.tgz"; + sha1 = "bf73d6b4fc002045793faeff2b1c3fabc9999844"; }; }; "dateformat-1.0.12" = { @@ -85,13 +104,13 @@ let sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; }; }; - "dompurify-0.8.4" = { + "dompurify-0.8.5" = { name = "dompurify"; packageName = "dompurify"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.4.tgz"; - sha1 = "93cabe8b6b84f3cf83f63b985ff71ef05f8cdeb6"; + url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.5.tgz"; + sha1 = "5bc591b61e222243cc827ca382d7a2e2660c1a44"; }; }; "emailjs-1.0.8" = { @@ -103,22 +122,22 @@ let sha1 = "d4240db7670dc78aff97352092d8460edc130f66"; }; }; - "express-2.5.11" = { + "express-3.21.2" = { name = "express"; packageName = "express"; - version = "2.5.11"; + version = "3.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; - sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; + sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; }; }; - "express-session-1.14.2" = { + "express-session-1.15.2" = { name = "express-session"; packageName = "express-session"; - version = "1.14.2"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; - sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; }; }; "gm-1.23.0" = { @@ -130,13 +149,22 @@ let sha1 = "80a2fe9cbf131515024846444658461269f52661"; }; }; - "helmet-2.3.0" = { + "helmet-3.5.0" = { name = "helmet"; packageName = "helmet"; - version = "2.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-2.3.0.tgz"; - sha1 = "d655c85b55b0a3bf722a4c2c66e48b78b4161b91"; + url = "https://registry.npmjs.org/helmet/-/helmet-3.5.0.tgz"; + sha1 = "e1d6de27d2e3317d3182e00d672df3d0e1e12539"; + }; + }; + "jade-1.11.0" = { + name = "jade"; + packageName = "jade"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz"; + sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; "jankyqueue-0.1.1" = { @@ -157,6 +185,15 @@ let sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; + "method-override-2.3.8" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz"; + sha1 = "178234bf4bab869f89df9444b06fc6147b44828c"; + }; + }; "mkdirp-0.5.1" = { name = "mkdirp"; packageName = "mkdirp"; @@ -166,15 +203,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "node-uuid-1.4.7" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - }; "oauth-evanp-0.9.10-evanp.2" = { name = "oauth-evanp"; packageName = "oauth-evanp"; @@ -184,6 +212,15 @@ let sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; }; }; + "octal-1.0.0" = { + name = "octal"; + packageName = "octal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz"; + sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b"; + }; + }; "optimist-0.6.1" = { name = "optimist"; packageName = "optimist"; @@ -193,13 +230,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "rimraf-2.5.4" = { + "rimraf-2.6.1" = { name = "rimraf"; packageName = "rimraf"; - version = "2.5.4"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; - sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; + sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; }; }; "sanitize-html-1.14.1" = { @@ -229,13 +266,13 @@ let sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; - "showdown-1.6.0" = { + "showdown-1.6.4" = { name = "showdown"; packageName = "showdown"; - version = "1.6.0"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/showdown/-/showdown-1.6.0.tgz"; - sha1 = "4a3cd2b73c45914f8cc00a388303be78b9f3e2a4"; + url = "https://registry.npmjs.org/showdown/-/showdown-1.6.4.tgz"; + sha1 = "056bbb654ecdb8d8643ae12d6d597893ccaf46c6"; }; }; "sockjs-0.3.18" = { @@ -247,13 +284,22 @@ let sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207"; }; }; - "step-0.0.6" = { + "ssl-config-0.0.9" = { + name = "ssl-config"; + packageName = "ssl-config"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ssl-config/-/ssl-config-0.0.9.tgz"; + sha1 = "905ed1b7ddd0564aa9395cd4ae7146907351ff2c"; + }; + }; + "step-1.0.0" = { name = "step"; packageName = "step"; - version = "0.0.6"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; - sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + url = "https://registry.npmjs.org/step/-/step-1.0.0.tgz"; + sha1 = "b300e9d2ae9057d4d78633aae2303813a94bdff2"; }; }; "ua-parser-js-0.7.12" = { @@ -283,13 +329,13 @@ let sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; }; }; - "utml-0.2.0" = { - name = "utml"; - packageName = "utml"; - version = "0.2.0"; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; - sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; }; }; "validator-4.4.0" = { @@ -310,13 +356,13 @@ let sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; }; }; - "databank-mongodb-0.19.0" = { + "databank-mongodb-1.0.0" = { name = "databank-mongodb"; packageName = "databank-mongodb"; - version = "0.19.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.19.0.tgz"; - sha1 = "66ffa32848986d0e138403396506d64895fefc45"; + url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-1.0.0.tgz"; + sha1 = "66f229698df1d4f7e9e3ad849a30174b2aae527b"; }; }; "databank-redis-0.19.6" = { @@ -328,22 +374,13 @@ let sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; }; }; - "databank-memcached-0.15.0" = { - name = "databank-memcached"; - packageName = "databank-memcached"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; - sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; - }; - }; - "databank-lrucache-0.1.2" = { + "databank-lrucache-0.1.3" = { name = "databank-lrucache"; packageName = "databank-lrucache"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; - sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; + url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.3.tgz"; + sha1 = "a68fbf6bb5f2e1dab81f5a410065484889a0eeef"; }; }; "bindings-1.2.1" = { @@ -364,13 +401,13 @@ let sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; }; }; - "dtrace-provider-0.8.0" = { + "dtrace-provider-0.8.1" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; - sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz"; + sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f"; }; }; "mv-2.1.1" = { @@ -382,31 +419,31 @@ let sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; }; }; - "safe-json-stringify-1.0.3" = { + "safe-json-stringify-1.0.4" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; - sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; + sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; }; }; - "moment-2.17.1" = { + "moment-2.18.1" = { name = "moment"; packageName = "moment"; - version = "2.17.1"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; - sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; - "nan-2.5.0" = { + "nan-2.5.1" = { name = "nan"; packageName = "nan"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; + sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; }; }; "ncp-2.0.0" = { @@ -670,15 +707,6 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.7" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; - sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; - }; - }; "morgan-1.6.1" = { name = "morgan"; packageName = "morgan"; @@ -868,13 +896,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "compressible-2.0.9" = { + "compressible-2.0.10" = { name = "compressible"; packageName = "compressible"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; - sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; + sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; }; }; "vary-1.0.1" = { @@ -886,13 +914,13 @@ let sha1 = "99e4981566a286118dfb2b817357df7993376d10"; }; }; - "mime-types-2.1.14" = { + "mime-types-2.1.15" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; + sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; }; }; "negotiator-0.5.3" = { @@ -904,13 +932,13 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "mime-db-1.26.0" = { + "mime-db-1.27.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; + sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; }; }; "ms-0.7.1" = { @@ -922,22 +950,13 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "csrf-3.0.4" = { + "csrf-3.0.6" = { name = "csrf"; packageName = "csrf"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; - sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; - }; - }; - "base64-url-1.3.3" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; - sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; + sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; }; }; "rndm-1.2.0" = { @@ -958,13 +977,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.3" = { + "uid-safe-2.1.4" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; - sha1 = "077e264a00b3187936b270bb7376a26473631071"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; + sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; }; }; "random-bytes-1.0.0" = { @@ -1048,42 +1067,6 @@ let sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; }; }; - "debug-2.3.3" = { - name = "debug"; - packageName = "debug"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - }; - "vary-1.1.0" = { - name = "vary"; - packageName = "vary"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; - sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; - }; - }; - "ms-0.7.2" = { - name = "ms"; - packageName = "ms"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - }; "basic-auth-1.0.4" = { name = "basic-auth"; packageName = "basic-auth"; @@ -1156,6 +1139,15 @@ let sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; }; }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; "batch-0.5.3" = { name = "batch"; packageName = "batch"; @@ -1174,22 +1166,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "connect-2.7.11" = { - name = "connect"; - packageName = "connect"; - version = "2.7.11"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.7.11.tgz"; - sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e"; - }; - }; - "oauth-0.9.10" = { + "oauth-0.9.7" = { name = "oauth"; packageName = "oauth"; - version = "0.9.10"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.10.tgz"; - sha1 = "7d356af319a16d889e581fa80f86bbd5ab454646"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; + sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; }; }; "openid-0.4.1" = { @@ -1201,114 +1184,6 @@ let sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; }; }; - "qs-0.6.5" = { - name = "qs"; - packageName = "qs"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; - sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; - }; - }; - "formidable-1.0.14" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - }; - "cookie-signature-1.0.1" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; - sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; - }; - }; - "buffer-crc32-0.2.1" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; - sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; - }; - }; - "cookie-0.0.5" = { - name = "cookie"; - packageName = "cookie"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; - sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; - }; - }; - "send-0.1.1" = { - name = "send"; - packageName = "send"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.1.1.tgz"; - sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8"; - }; - }; - "bytes-0.2.0" = { - name = "bytes"; - packageName = "bytes"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; - sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; - }; - }; - "fresh-0.1.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; - sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; - }; - }; - "pause-0.0.1" = { - name = "pause"; - packageName = "pause"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; - }; - }; - "debug-2.6.0" = { - name = "debug"; - packageName = "debug"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "range-parser-0.0.4" = { - name = "range-parser"; - packageName = "range-parser"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; - sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; - }; - }; "async-1.5.2" = { name = "async"; packageName = "async"; @@ -1318,6 +1193,15 @@ let sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; + "node-uuid-1.4.8" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; + }; + }; "set-immediate-0.1.1" = { name = "set-immediate"; packageName = "set-immediate"; @@ -1327,40 +1211,31 @@ let sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; }; }; - "vows-0.7.0" = { - name = "vows"; - packageName = "vows"; - version = "0.7.0"; + "multiparty-4.1.3" = { + name = "multiparty"; + packageName = "multiparty"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; - sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; + sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; - "eyes-0.1.8" = { - name = "eyes"; - packageName = "eyes"; - version = "0.1.8"; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - }; - "diff-1.0.8" = { - name = "diff"; - packageName = "diff"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; - sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; "get-stdin-4.0.1" = { @@ -1426,13 +1301,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "normalize-package-data-2.3.5" = { + "normalize-package-data-2.3.6" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; - sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz"; + sha1 = "498fa420c96401f787402ba21e600def9f981fff"; }; }; "object-assign-4.1.1" = { @@ -1507,13 +1382,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.1.5" = { + "hosted-git-info-2.4.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.1.5"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; - sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; + sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; }; }; "is-builtin-module-1.0.0" = { @@ -1678,13 +1553,13 @@ let sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; }; }; - "error-ex-1.3.0" = { + "error-ex-1.3.1" = { name = "error-ex"; packageName = "error-ex"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; - sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; + sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; }; }; "is-arrayish-0.2.1" = { @@ -1759,6 +1634,15 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "step-0.0.6" = { + name = "step"; + packageName = "step"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; + sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + }; + }; "addressparser-0.3.2" = { name = "addressparser"; packageName = "addressparser"; @@ -1831,49 +1715,112 @@ let sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; - "connect-1.9.2" = { - name = "connect"; - packageName = "connect"; - version = "1.9.2"; + "content-disposition-0.5.0" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; - sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; }; }; - "mime-1.2.4" = { + "commander-2.6.0" = { + name = "commander"; + packageName = "commander"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + }; + }; + "merge-descriptors-1.0.0" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "proxy-addr-1.0.10" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; + sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; + }; + }; + "range-parser-1.0.3" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; + }; + }; + "send-0.13.0" = { + name = "send"; + packageName = "send"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; + sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; + }; + }; + "forwarded-0.1.0" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }; + }; + "ipaddr.js-1.0.5" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; + sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; + }; + }; + "destroy-1.0.3" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + }; + "mime-1.3.4" = { name = "mime"; packageName = "mime"; - version = "1.2.4"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; - sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; }; }; - "qs-0.4.2" = { - name = "qs"; - packageName = "qs"; - version = "0.4.2"; + "statuses-1.2.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; - sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; - }; - }; - "mkdirp-0.3.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; - }; - }; - "formidable-1.0.17" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; - sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; }; }; "cookie-0.3.1" = { @@ -1885,13 +1832,22 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "crc-3.4.1" = { + "crc-3.4.4" = { name = "crc"; packageName = "crc"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; - sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + }; + }; + "debug-2.6.3" = { + name = "debug"; + packageName = "debug"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; + sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; }; }; "array-parallel-0.1.3" = { @@ -1930,13 +1886,13 @@ let sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; - "which-1.2.12" = { + "which-1.2.14" = { name = "which"; packageName = "which"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; - sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; }; }; "pseudomap-1.0.2" = { @@ -1948,31 +1904,31 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "yallist-2.0.0" = { + "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; - version = "2.0.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; - sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "isexe-1.1.2" = { + "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; - sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "connect-3.4.1" = { + "connect-3.6.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz"; + sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e"; }; }; "dns-prefetch-control-0.1.0" = { @@ -1993,22 +1949,22 @@ let sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"; }; }; - "frameguard-2.0.0" = { + "frameguard-3.0.0" = { name = "frameguard"; packageName = "frameguard"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/frameguard/-/frameguard-2.0.0.tgz"; - sha1 = "30c2c149e5e3505f9e156f9bc491a438420e487e"; + url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz"; + sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; }; }; - "helmet-csp-1.2.2" = { + "helmet-csp-2.4.0" = { name = "helmet-csp"; packageName = "helmet-csp"; - version = "1.2.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-1.2.2.tgz"; - sha1 = "085c0307d57fc96cd97337f170ab8bfea99e5df7"; + url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.4.0.tgz"; + sha1 = "7e53a157167a0645aadd7177d12ae6c605c1842e"; }; }; "hide-powered-by-1.0.0" = { @@ -2020,22 +1976,22 @@ let sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; }; }; - "hpkp-1.2.0" = { + "hpkp-2.0.0" = { name = "hpkp"; packageName = "hpkp"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hpkp/-/hpkp-1.2.0.tgz"; - sha1 = "83f2cb38b26cff21daf26e2ff4b57126921dec65"; + url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz"; + sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672"; }; }; - "hsts-1.0.0" = { + "hsts-2.0.0" = { name = "hsts"; packageName = "hsts"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hsts/-/hsts-1.0.0.tgz"; - sha1 = "98e1039ef7aba554057b6b0e32584c0b1143a414"; + url = "https://registry.npmjs.org/hsts/-/hsts-2.0.0.tgz"; + sha1 = "a52234c6070decf214b2b6b70bb144d07e4776c7"; }; }; "ienoopen-1.0.0" = { @@ -2047,22 +2003,22 @@ let sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b"; }; }; - "nocache-1.0.1" = { + "nocache-2.0.0" = { name = "nocache"; packageName = "nocache"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nocache/-/nocache-1.0.1.tgz"; - sha1 = "695c9f736926a7554f7365fa25e087941065bd36"; + url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz"; + sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980"; }; }; - "referrer-policy-1.0.0" = { + "referrer-policy-1.1.0" = { name = "referrer-policy"; packageName = "referrer-policy"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.0.0.tgz"; - sha1 = "f60eedc92f942b01a6118121ec932d66e8fd7e14"; + url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz"; + sha1 = "35774eb735bf50fb6c078e83334b472350207d79"; }; }; "x-xss-protection-1.0.0" = { @@ -2074,13 +2030,31 @@ let sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; }; }; - "finalhandler-0.4.1" = { + "debug-2.6.1" = { + name = "debug"; + packageName = "debug"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + }; + }; + "finalhandler-1.0.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.4.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz"; + sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755"; + }; + }; + "encodeurl-1.0.1" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"; + sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20"; }; }; "camelize-1.0.0" = { @@ -2092,31 +2066,40 @@ let sha1 = "164a5483e630fa4321e5af07020e531831b2609b"; }; }; - "content-security-policy-builder-1.0.0" = { + "content-security-policy-builder-1.1.0" = { name = "content-security-policy-builder"; packageName = "content-security-policy-builder"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.0.0.tgz"; - sha1 = "11fd40c5cc298a6c725a35f9acf71e82ab5d3243"; + url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.1.0.tgz"; + sha1 = "d91f1b076236c119850c7dee9924bf55e05772b3"; }; }; - "lodash.reduce-4.5.0" = { + "dasherize-2.0.0" = { + name = "dasherize"; + packageName = "dasherize"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz"; + sha1 = "6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308"; + }; + }; + "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.5.0.tgz"; - sha1 = "af7d2ec621062441e77d5bf408a1e071ef86691c"; + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; }; }; - "platform-1.3.1" = { + "platform-1.3.3" = { name = "platform"; packageName = "platform"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/platform/-/platform-1.3.1.tgz"; - sha1 = "492210892335bd3131c0a08dda2d93ec3543e423"; + url = "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz"; + sha1 = "646c77011899870b6a0903e75e997e8e51da7461"; }; }; "dashify-0.2.2" = { @@ -2128,13 +2111,112 @@ let sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe"; }; }; - "abab-1.0.3" = { - name = "abab"; - packageName = "abab"; - version = "1.0.3"; + "character-parser-1.2.1" = { + name = "character-parser"; + packageName = "character-parser"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; - sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; + url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; + sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; + }; + }; + "clean-css-3.4.25" = { + name = "clean-css"; + packageName = "clean-css"; + version = "3.4.25"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz"; + sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"; + }; + }; + "constantinople-3.0.2" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"; + sha1 = "4b945d9937907bcd98ee575122c3817516544141"; + }; + }; + "jstransformer-0.0.2" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz"; + sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab"; + }; + }; + "transformers-2.1.0" = { + name = "transformers"; + packageName = "transformers"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; + sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; + }; + }; + "uglify-js-2.8.20" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.20"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; + sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + }; + }; + "void-elements-2.0.1" = { + name = "void-elements"; + packageName = "void-elements"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + }; + }; + "with-4.0.3" = { + name = "with"; + packageName = "with"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz"; + sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e"; + }; + }; + "commander-2.8.1" = { + name = "commander"; + packageName = "commander"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + }; + "source-map-0.4.4" = { + name = "source-map"; + packageName = "source-map"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; + 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"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; "acorn-2.7.0" = { @@ -2146,6 +2228,258 @@ let sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; }; }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "promise-6.1.0" = { + name = "promise"; + packageName = "promise"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; + sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; + }; + }; + "asap-1.0.0" = { + name = "asap"; + packageName = "asap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; + sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; + }; + }; + "promise-2.0.0" = { + name = "promise"; + packageName = "promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; + }; + }; + "css-1.0.8" = { + name = "css"; + packageName = "css"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; + sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; + }; + }; + "uglify-js-2.2.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; + }; + }; + "is-promise-1.0.1" = { + name = "is-promise"; + packageName = "is-promise"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; + sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; + }; + }; + "css-parse-1.0.4" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; + sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; + }; + }; + "css-stringify-1.0.5" = { + name = "css-stringify"; + packageName = "css-stringify"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; + sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; + }; + }; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + }; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "source-map-0.5.6" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + }; + "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"; + }; + }; + "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.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; + sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; + }; + }; + "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"; + }; + }; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -2155,13 +2489,22 @@ let sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; }; }; - "cssom-0.3.1" = { + "abab-1.0.3" = { + name = "abab"; + packageName = "abab"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; + sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; + }; + }; + "cssom-0.3.2" = { name = "cssom"; packageName = "cssom"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz"; - sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3"; + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz"; + sha1 = "b8036170c79f07a90ff2f16e22284027a243848b"; }; }; "cssstyle-0.2.37" = { @@ -2200,31 +2543,31 @@ let sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; }; }; - "request-2.79.0" = { + "request-2.81.0" = { name = "request"; packageName = "request"; - version = "2.79.0"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "sax-1.2.1" = { + "sax-1.2.2" = { name = "sax"; packageName = "sax"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; + sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; }; }; - "symbol-tree-3.2.1" = { + "symbol-tree-3.2.2" = { name = "symbol-tree"; packageName = "symbol-tree"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.1.tgz"; - sha1 = "8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"; + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; + sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; }; }; "tough-cookie-2.3.2" = { @@ -2362,15 +2705,6 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -2380,22 +2714,22 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "caseless-0.11.0" = { + "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; "combined-stream-1.0.5" = { @@ -2434,13 +2768,13 @@ let sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; - "har-validator-2.0.6" = { + "har-validator-4.2.1" = { name = "har-validator"; packageName = "har-validator"; - version = "2.0.6"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; "hawk-3.1.3" = { @@ -2497,13 +2831,31 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.3.0" = { + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.4.0" = { name = "qs"; packageName = "qs"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; - sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "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"; }; }; "stringstream-0.0.5" = { @@ -2515,22 +2867,13 @@ let sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; }; }; - "tunnel-agent-0.4.3" = { + "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; - version = "0.4.3"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; - }; - }; - "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/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; "delayed-stream-1.0.0" = { @@ -2551,139 +2894,49 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "ajv-4.11.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; + sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; }; }; - "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"; - }; - }; - "is-my-json-valid-2.15.0" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; - sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; - }; - }; - "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"; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; - "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"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; "hoek-2.16.3" = { @@ -2731,22 +2984,31 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.1" = { + "jsprim-1.4.0" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.10.2" = { + "sshpk-1.11.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; - sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; + sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; "extsprintf-1.0.2" = { @@ -2785,15 +3047,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -2812,13 +3065,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -2848,13 +3101,13 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "bcrypt-pbkdf-1.0.0" = { + "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; "punycode-1.4.1" = { @@ -2875,6 +3128,15 @@ let sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; }; }; + "vary-1.1.1" = { + name = "vary"; + packageName = "vary"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; + sha1 = "67535ebb694c1d52257457984665323f587e8d37"; + }; + }; "minimist-0.0.8" = { name = "minimist"; packageName = "minimist"; @@ -2884,15 +3146,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -2938,6 +3191,15 @@ let sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; }; }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; "domelementtype-1.3.0" = { name = "domelementtype"; packageName = "domelementtype"; @@ -2974,13 +3236,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "readable-stream-2.2.2" = { + "readable-stream-2.2.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.2"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; + sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; }; }; "dom-serializer-0.1.0" = { @@ -3046,33 +3308,6 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - }; - "range-parser-1.0.3" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - }; - "statuses-1.2.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; - }; - }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -3181,6 +3416,15 @@ let sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; + "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"; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -3190,6 +3434,15 @@ let sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; + "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"; + }; + }; "lcid-1.0.0" = { name = "lcid"; packageName = "lcid"; @@ -3262,6 +3515,51 @@ let sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; }; }; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + }; + }; + "es6-shim-0.27.1" = { + name = "es6-shim"; + packageName = "es6-shim"; + version = "0.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.27.1.tgz"; + sha1 = "bd3f870663eac2ede8e8943e2a6d23c052d53fc6"; + }; + }; + "minimum-tls-version-0.0.1" = { + name = "minimum-tls-version"; + packageName = "minimum-tls-version"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimum-tls-version/-/minimum-tls-version-0.0.1.tgz"; + sha1 = "42220187e52700e253218cfa8ad974920b73ea74"; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "underscore-1.6.0" = { name = "underscore"; packageName = "underscore"; @@ -3280,13 +3578,31 @@ let sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; }; - "mongodb-2.2.21" = { + "databank-1.0.1" = { + name = "databank"; + packageName = "databank"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/databank/-/databank-1.0.1.tgz"; + sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b"; + }; + }; + "mongodb-2.2.25" = { name = "mongodb"; packageName = "mongodb"; - version = "2.2.21"; + version = "2.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.21.tgz"; - sha1 = "f7ee56489600e0ac8024c062c0857ac04ddb5f48"; + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.25.tgz"; + sha1 = "d3b25dad00eda2bdfcbc996210ba082ac686a6b6"; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; "es6-promise-3.2.1" = { @@ -3298,13 +3614,13 @@ let sha1 = "ec56233868032909207170c39448e24449dd1fc4"; }; }; - "mongodb-core-2.1.6" = { + "mongodb-core-2.1.9" = { name = "mongodb-core"; packageName = "mongodb-core"; - version = "2.1.6"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.6.tgz"; - sha1 = "9d179e7487767c58993bb7c8d6685d035c346a42"; + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.9.tgz"; + sha1 = "85aa71ee4fb716196e06b787557bf139f801daf5"; }; }; "readable-stream-2.1.5" = { @@ -3361,93 +3677,12 @@ let sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; }; }; - "memcached-0.2.8" = { - name = "memcached"; - packageName = "memcached"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; - sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; - }; - }; - "databank-0.18.2" = { - name = "databank"; - packageName = "databank"; - version = "0.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; - sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; - }; - }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - }; - "hashring-0.0.8" = { - name = "hashring"; - packageName = "hashring"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; - sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; - }; - }; - "jackpot-0.0.6" = { - name = "jackpot"; - packageName = "jackpot"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; - sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; - }; - }; - "bisection-0.0.3" = { - name = "bisection"; - packageName = "bisection"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; - sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; - }; - }; - "simple-lru-cache-0.0.2" = { - name = "simple-lru-cache"; - packageName = "simple-lru-cache"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; - }; - }; - "retry-0.6.0" = { - name = "retry"; - packageName = "retry"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; - sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; - }; - }; - "lru-cache-2.3.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; - }; - }; }; args = { name = "pump.io"; packageName = "pump.io"; - version = "1.0.0"; - src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }; + version = "3.0.0"; + src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-3.0.0.tgz"; sha1 = "ycfm7ak83xi8mgafhp9q0n6n3kzmdz16"; }; dependencies = [ (sources."bcrypt-0.8.7" // { dependencies = [ @@ -3455,11 +3690,11 @@ let sources."nan-2.3.5" ]; }) - (sources."bunyan-1.8.5" // { + (sources."bunyan-1.8.9" // { dependencies = [ - (sources."dtrace-provider-0.8.0" // { + (sources."dtrace-provider-0.8.1" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -3497,10 +3732,11 @@ let }) ]; }) - sources."safe-json-stringify-1.0.3" - sources."moment-2.17.1" + sources."safe-json-stringify-1.0.4" + sources."moment-2.18.1" ]; }) + sources."colors-1.1.2" (sources."connect-2.30.2" // { dependencies = [ sources."basic-auth-connect-1.0.0" @@ -3529,17 +3765,17 @@ let dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."negotiator-0.5.3" ]; }) - (sources."compressible-2.0.9" // { + (sources."compressible-2.0.10" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."vary-1.0.1" @@ -3553,12 +3789,11 @@ let sources."content-type-1.0.2" (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.4" // { + (sources."csrf-3.0.6" // { dependencies = [ - sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.3" // { + (sources."uid-safe-2.1.4" // { dependencies = [ sources."random-bytes-1.0.0" ]; @@ -3577,9 +3812,9 @@ let dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."negotiator-0.6.1" @@ -3616,17 +3851,6 @@ let sources."statuses-1.3.1" ]; }) - (sources."method-override-2.3.7" // { - dependencies = [ - (sources."debug-2.3.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - sources."methods-1.1.2" - sources."vary-1.1.0" - ]; - }) (sources."morgan-1.6.1" // { dependencies = [ sources."basic-auth-1.0.4" @@ -3674,9 +3898,9 @@ let }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -3689,9 +3913,9 @@ let (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -3700,51 +3924,52 @@ let sources."vhost-3.0.2" ]; }) - (sources."connect-auth-0.6.1" // { + (sources."connect-auth-git://github.com/e14n/connect-auth" // { dependencies = [ - (sources."connect-2.7.11" // { - dependencies = [ - sources."qs-0.6.5" - sources."formidable-1.0.14" - sources."cookie-signature-1.0.1" - sources."buffer-crc32-0.2.1" - sources."cookie-0.0.5" - (sources."send-0.1.1" // { - dependencies = [ - sources."mime-1.2.11" - sources."range-parser-0.0.4" - ]; - }) - sources."bytes-0.2.0" - sources."fresh-0.1.0" - sources."pause-0.0.1" - (sources."debug-2.6.0" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - ]; - }) - sources."oauth-0.9.10" + sources."oauth-0.9.7" sources."openid-0.4.1" ]; }) (sources."connect-databank-1.0.3" // { dependencies = [ sources."async-1.5.2" + sources."node-uuid-1.4.8" sources."set-immediate-0.1.1" ]; }) - sources."crypto-cacerts-0.1.0" - (sources."databank-0.19.5" // { + (sources."connect-multiparty-2.0.0" // { dependencies = [ - (sources."vows-0.7.0" // { + (sources."multiparty-4.1.3" // { dependencies = [ - sources."eyes-0.1.8" - sources."diff-1.0.8" + (sources."fd-slicer-1.0.1" // { + dependencies = [ + sources."pend-1.2.0" + ]; + }) ]; }) - sources."setimmediate-1.0.5" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."qs-4.0.0" + (sources."type-is-1.6.14" // { + dependencies = [ + sources."media-typer-0.3.0" + (sources."mime-types-2.1.15" // { + dependencies = [ + sources."mime-db-1.27.0" + ]; + }) + ]; + }) + ]; + }) + sources."crypto-cacerts-0.1.0" + (sources."databank-0.19.8" // { + dependencies = [ + sources."set-immediate-0.1.1" ]; }) (sources."dateformat-1.0.12" // { @@ -3770,9 +3995,9 @@ let }) sources."map-obj-1.0.1" sources."minimist-1.2.0" - (sources."normalize-package-data-2.3.5" // { + (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -3811,7 +4036,7 @@ let sources."graceful-fs-4.1.11" (sources."parse-json-2.2.0" // { dependencies = [ - (sources."error-ex-1.3.0" // { + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; @@ -3872,9 +4097,10 @@ let (sources."dialback-client-0.2.0" // { dependencies = [ sources."underscore-1.5.2" + sources."step-0.0.6" ]; }) - sources."dompurify-0.8.4" + sources."dompurify-0.8.5" (sources."emailjs-1.0.8" // { dependencies = [ sources."addressparser-0.3.2" @@ -3893,34 +4119,70 @@ let sources."bufferjs-1.1.0" ]; }) - (sources."express-2.5.11" // { + (sources."express-3.21.2" // { dependencies = [ - (sources."connect-1.9.2" // { - dependencies = [ - sources."formidable-1.0.17" - ]; - }) - sources."mime-1.2.4" - sources."qs-0.4.2" - sources."mkdirp-0.3.0" - ]; - }) - (sources."express-session-1.14.2" // { - dependencies = [ - sources."cookie-0.3.1" + sources."basic-auth-1.0.4" + sources."content-disposition-0.5.0" + sources."content-type-1.0.2" + sources."commander-2.6.0" + sources."cookie-0.1.3" sources."cookie-signature-1.0.6" - sources."crc-3.4.1" (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" ]; }) + sources."depd-1.0.1" + sources."escape-html-1.0.2" + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.0" + sources."methods-1.1.2" + sources."parseurl-1.3.1" + (sources."proxy-addr-1.0.10" // { + dependencies = [ + sources."forwarded-0.1.0" + sources."ipaddr.js-1.0.5" + ]; + }) + sources."range-parser-1.0.3" + (sources."send-0.13.0" // { + dependencies = [ + sources."destroy-1.0.3" + (sources."http-errors-1.3.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."mime-1.3.4" + sources."ms-0.7.1" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."statuses-1.2.1" + ]; + }) + sources."utils-merge-1.0.0" + sources."vary-1.0.1" + ]; + }) + (sources."express-session-1.15.2" // { + dependencies = [ + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."crc-3.4.4" + (sources."debug-2.6.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."depd-1.1.0" sources."on-headers-1.0.1" sources."parseurl-1.3.1" - (sources."uid-safe-2.1.3" // { + (sources."uid-safe-2.1.4" // { dependencies = [ - sources."base64-url-1.3.3" sources."random-bytes-1.0.0" ]; }) @@ -3936,12 +4198,12 @@ let (sources."lru-cache-4.0.2" // { dependencies = [ sources."pseudomap-1.0.2" - sources."yallist-2.0.0" + sources."yallist-2.1.2" ]; }) - (sources."which-1.2.12" // { + (sources."which-1.2.14" // { dependencies = [ - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; }) ]; @@ -3953,23 +4215,25 @@ let }) ]; }) - (sources."helmet-2.3.0" // { + (sources."helmet-3.5.0" // { dependencies = [ - (sources."connect-3.4.1" // { + (sources."connect-3.6.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.6.1" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-1.0.0" // { dependencies = [ + sources."encodeurl-1.0.1" sources."escape-html-1.0.3" (sources."on-finished-2.3.0" // { dependencies = [ sources."ee-first-1.1.1" ]; }) + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -3979,34 +4243,155 @@ let }) sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" - sources."frameguard-2.0.0" - (sources."helmet-csp-1.2.2" // { + sources."frameguard-3.0.0" + (sources."helmet-csp-2.4.0" // { dependencies = [ sources."camelize-1.0.0" - (sources."content-security-policy-builder-1.0.0" // { + (sources."content-security-policy-builder-1.1.0" // { dependencies = [ sources."dashify-0.2.2" ]; }) - sources."lodash.reduce-4.5.0" - sources."platform-1.3.1" + sources."dasherize-2.0.0" + sources."lodash.reduce-4.6.0" + sources."platform-1.3.3" ]; }) sources."hide-powered-by-1.0.0" - sources."hpkp-1.2.0" - (sources."hsts-1.0.0" // { + sources."hpkp-2.0.0" + (sources."hsts-2.0.0" // { dependencies = [ sources."core-util-is-1.0.2" ]; }) sources."ienoopen-1.0.0" - (sources."nocache-1.0.1" // { + sources."nocache-2.0.0" + sources."referrer-policy-1.1.0" + sources."x-xss-protection-1.0.0" + ]; + }) + (sources."jade-1.11.0" // { + dependencies = [ + sources."character-parser-1.2.1" + (sources."clean-css-3.4.25" // { dependencies = [ - sources."depd-1.1.0" + (sources."commander-2.8.1" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."source-map-0.4.4" // { + dependencies = [ + sources."amdefine-1.0.1" + ]; + }) + ]; + }) + sources."commander-2.6.0" + (sources."constantinople-3.0.2" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) + (sources."jstransformer-0.0.2" // { + dependencies = [ + sources."is-promise-2.1.0" + (sources."promise-6.1.0" // { + dependencies = [ + sources."asap-1.0.0" + ]; + }) + ]; + }) + (sources."transformers-2.1.0" // { + dependencies = [ + (sources."promise-2.0.0" // { + dependencies = [ + sources."is-promise-1.0.1" + ]; + }) + (sources."css-1.0.8" // { + dependencies = [ + sources."css-parse-1.0.4" + sources."css-stringify-1.0.5" + ]; + }) + (sources."uglify-js-2.2.5" // { + dependencies = [ + (sources."source-map-0.1.43" // { + dependencies = [ + sources."amdefine-1.0.1" + ]; + }) + (sources."optimist-0.3.7" // { + dependencies = [ + sources."wordwrap-0.0.3" + ]; + }) + ]; + }) + ]; + }) + (sources."uglify-js-2.8.20" // { + dependencies = [ + sources."source-map-0.5.6" + (sources."yargs-3.10.0" // { + dependencies = [ + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.1.0" // { + dependencies = [ + sources."is-buffer-1.1.5" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.1.0" // { + dependencies = [ + sources."is-buffer-1.1.5" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + ]; + }) + sources."uglify-to-browserify-1.0.2" + ]; + }) + sources."void-elements-2.0.1" + (sources."with-4.0.3" // { + dependencies = [ + sources."acorn-1.2.2" + (sources."acorn-globals-1.0.9" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) ]; }) - sources."referrer-policy-1.0.0" - sources."x-xss-protection-1.0.0" ]; }) sources."jankyqueue-0.1.1" @@ -4015,7 +4400,7 @@ let sources."abab-1.0.3" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."cssom-0.3.1" + sources."cssom-0.3.2" sources."cssstyle-0.2.37" (sources."escodegen-1.8.1" // { dependencies = [ @@ -4041,11 +4426,11 @@ let }) sources."nwmatcher-1.3.9" sources."parse5-1.5.1" - (sources."request-2.79.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" - sources."caseless-0.11.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" @@ -4058,47 +4443,19 @@ let sources."asynckit-0.4.0" ]; }) - (sources."har-validator-2.0.6" // { + (sources."har-validator-4.2.1" // { dependencies = [ - (sources."chalk-1.1.3" // { + (sources."ajv-4.11.5" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."jsonify-0.0.0" ]; }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.15.0" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" ]; }) + sources."har-schema-1.0.5" ]; }) (sources."hawk-3.1.3" // { @@ -4112,24 +4469,25 @@ let (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.2" // { + (sources."sshpk-1.11.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -4137,20 +4495,21 @@ let sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" - sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" + sources."tunnel-agent-0.6.0" ]; }) - sources."sax-1.2.1" - sources."symbol-tree-3.2.1" + sources."sax-1.2.2" + sources."symbol-tree-3.2.2" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" @@ -4165,20 +4524,32 @@ let sources."xml-name-validator-2.0.1" ]; }) + (sources."method-override-2.3.8" // { + dependencies = [ + (sources."debug-2.6.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + sources."methods-1.1.2" + sources."parseurl-1.3.1" + sources."vary-1.1.1" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."node-uuid-1.4.7" sources."oauth-evanp-0.9.10-evanp.2" + sources."octal-1.0.0" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" sources."minimist-0.0.10" ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -4226,7 +4597,7 @@ let }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -4267,7 +4638,7 @@ let sources."statuses-1.2.1" ]; }) - (sources."showdown-1.6.0" // { + (sources."showdown-1.6.4" // { dependencies = [ (sources."yargs-6.6.0" // { dependencies = [ @@ -4312,7 +4683,7 @@ let sources."graceful-fs-4.1.11" (sources."parse-json-2.2.0" // { dependencies = [ - (sources."error-ex-1.3.0" // { + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; @@ -4332,9 +4703,9 @@ let }) ]; }) - (sources."normalize-package-data-2.3.5" // { + (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -4407,7 +4778,22 @@ let sources."uuid-2.0.3" ]; }) - sources."step-0.0.6" + (sources."ssl-config-0.0.9" // { + dependencies = [ + (sources."assert-1.4.1" // { + dependencies = [ + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + ]; + }) + sources."es6-shim-0.27.1" + sources."minimum-tls-version-0.0.1" + ]; + }) + sources."step-1.0.0" sources."ua-parser-js-0.7.12" sources."underscore-1.8.3" (sources."underscore-contrib-0.3.0" // { @@ -4415,28 +4801,34 @@ let sources."underscore-1.6.0" ]; }) - sources."utml-0.2.0" + sources."uuid-3.0.1" sources."validator-4.4.0" (sources."webfinger-0.4.2" // { dependencies = [ + sources."step-0.0.6" (sources."xml2js-0.1.14" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" ]; }) ]; }) - (sources."databank-mongodb-0.19.0" // { + (sources."databank-mongodb-1.0.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."databank-1.0.1" // { + dependencies = [ + sources."setimmediate-1.0.5" + ]; + }) + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."mongodb-2.2.21" // { + (sources."mongodb-2.2.25" // { dependencies = [ sources."es6-promise-3.2.1" - (sources."mongodb-core-2.1.6" // { + (sources."mongodb-core-2.1.9" // { dependencies = [ sources."bson-1.0.4" (sources."require_optional-1.0.0" // { @@ -4469,42 +4861,16 @@ let sources."underscore-1.6.0" ]; }) - (sources."databank-memcached-0.15.0" // { + (sources."databank-lrucache-0.1.3" // { dependencies = [ - (sources."memcached-0.2.8" // { + sources."databank-1.0.1" + (sources."lru-cache-4.0.2" // { dependencies = [ - (sources."hashring-0.0.8" // { - dependencies = [ - sources."bisection-0.0.3" - sources."simple-lru-cache-0.0.2" - ]; - }) - (sources."jackpot-0.0.6" // { - dependencies = [ - sources."retry-0.6.0" - ]; - }) + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" ]; }) - (sources."databank-0.18.2" // { - dependencies = [ - (sources."vows-0.7.0" // { - dependencies = [ - sources."eyes-0.1.8" - sources."diff-1.0.8" - ]; - }) - sources."set-immediate-0.1.1" - ]; - }) - sources."underscore-1.4.4" - ]; - }) - (sources."databank-lrucache-0.1.2" // { - dependencies = [ - sources."underscore-1.5.2" - sources."lru-cache-2.3.1" - sources."set-immediate-0.1.1" + sources."setimmediate-1.0.5" ]; }) ]; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 32eae53420a2..41a27690a2ab 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.1"; + version = "0.9.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "17p8bmkgmlan6vbvh955idddckr5kyf00gp8apjfcnm4b2awma8x"; + 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 4efb1ca9de6e..215e9fade0aa 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.1.6"; + version = "2.2.3"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { - url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "0znywkrjlmxhacfkdyba2cjhgmrh509mayrfsrnc0rx3haxam7fx"; + url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; + 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/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix new file mode 100644 index 000000000000..878e8480bb99 --- /dev/null +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -0,0 +1,12 @@ + # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix +{ fetchFromGitHub, lib } : fetchFromGitHub { + owner = "WordPress"; + repo = "WordPress"; + rev = "4.7.4"; + sha256 = "1ia9d3n085x2r6pvdrv4rk6gdp6xhjhpsq5g7a6448xzv9hf14ri"; + meta = { + homepage = https://wordpress.org; + description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 49e71614bf93..eb08986e7024 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1010,22 +1010,22 @@ let }) // {inherit xproto zlib ;}; libpciaccess = (mkDerivation "libpciaccess" { - name = "libpciaccess-0.13.4"; + name = "libpciaccess-0.13.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2; - sha256 = "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07"; + url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2; + sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"; }; buildInputs = [pkgconfig zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit zlib ;}; libpthreadstubs = (mkDerivation "libpthreadstubs" { - name = "libpthread-stubs-0.3"; + name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2; - sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"; + url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; + sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1197,11 +1197,11 @@ let }) // {inherit ;}; sessreg = (mkDerivation "sessreg" { - name = "sessreg-1.1.0"; + name = "sessreg-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2; - sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am"; + url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; + sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; buildInputs = [pkgconfig xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1604,11 +1604,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.23.0"; + name = "xf86-input-libinput-0.25.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2; - sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; + sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1670,11 +1670,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.2.0"; + name = "xf86-video-amdgpu-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; - sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; + sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1703,11 +1703,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.8.0"; + name = "xf86-video-ati-7.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; - sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; + sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1813,11 +1813,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2017-02-05"; + name = "xf86-video-intel-2017-04-18"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/e4fe79cf0d9a05ee3f3a027148ef0aeb2b1b34e1.tar.gz; - sha256 = "1hzfz5m9iclxk55531nqmyn25a50ggibl1qb80l6742k25k211cr"; + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz; + sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1869,11 +1869,11 @@ let }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonouveau = (mkDerivation "xf86videonouveau" { - name = "xf86-video-nouveau-1.0.13"; + name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2; - sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd"; + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; + sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1891,11 +1891,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" { - name = "xf86-video-openchrome-0.3.3"; + name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2; - sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"; + url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; + sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2210,11 +2210,11 @@ let }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; xkbcomp = (mkDerivation "xkbcomp" { - name = "xkbcomp-1.3.1"; + name = "xkbcomp-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2; - sha256 = "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103"; + url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; + sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; }; buildInputs = [pkgconfig libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2254,11 +2254,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.20"; + name = "xkeyboard-config-2.21"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2; - sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2; + sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2364,11 +2364,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.2"; + name = "xorg-server-1.19.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2; - sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; + sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 56a7b1f76a98..28b698bdc816 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,4 +1,4 @@ -http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 +http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c7a4ff20a73d..09f75b436da5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -316,6 +316,11 @@ in }; xf86inputlibinput = attrs: attrs // { + name = "xf86-input-libinput-0.25.1"; + src = args.fetchurl { + url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.1.tar.bz2; + sha256 = "1q67hjd67ni1nq7kgxdrrdgkyhzaqvvn2vlnsiiq9w4y3icpv7s8"; + }; buildInputs = attrs.buildInputs ++ [ args.libinput ]; installFlags = "sdkdir=\${out}/include/xorg"; }; @@ -340,7 +345,6 @@ in xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; - xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videotga = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videov4l = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videovoodoo = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4aeace9f0c22..8d9b66f21aef 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -56,7 +56,7 @@ mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2 @@ -96,7 +96,7 @@ mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2 +mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/twm-1.0.9.tar.bz2 @@ -122,16 +122,16 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 @@ -148,7 +148,7 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 @@ -174,10 +174,10 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index f32e6d684526..3285456a3485 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { - version = "0.9.10"; + version = "0.9.12"; name = "prosody-${version}"; src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8"; + sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s"; }; communityModules = fetchhg { diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 2a87eeb7cb5a..ebdc73aec30a 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/${name} cat > $out/bin/pyIRCt < $out/bin/pyMAILt < 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,34 +52,27 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; - patches = upstreamPatches - ++ [ (fetchurl { - # https://security.gentoo.org/glsa/201701-02 - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells" - + "/bash/files/bash-4.4-popd-offset-overflow.patch" - + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682"; - sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm"; - }) ] - ++ 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" + - 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; @@ -86,9 +80,14 @@ 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" - moveToOutput lib/bash/Makefile.inc "$dev" + rm $out/lib/bash/Makefile.inc ''; postFixup = if interactive diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix index c3ef5470aebf..741fb675d614 100644 --- a/pkgs/shells/bash/bash-4.4-patches.nix +++ b/pkgs/shells/bash/bash-4.4-patches.nix @@ -6,4 +6,11 @@ patch: [ (patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi") (patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d") (patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2") +(patch "006" "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka") +(patch "007" "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y") +(patch "008" "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546") +(patch "009" "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb") +(patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4") +(patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx") +(patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps") ] 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 e0959d0446a6..000000000000 --- 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 000000000000..c854e8828aea --- /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 eaccb9a68dad..1de2a52634bc 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 7dc6029acb42..1d1dddd0c2a0 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 cff60bad0a9b..000000000000 --- 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 b950e85916ba..76a979bcda1b 100644 --- a/pkgs/shells/fish-foreign-env/default.nix +++ b/pkgs/shells/fish-foreign-env/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { name = "fish-foreign-env-${version}"; - version = "git-20151223"; + version = "git-20170324"; src = fetchFromGitHub { owner = "oh-my-fish"; repo = "plugin-foreign-env"; - rev = "2dfe5b73fd2101702c83d1d7b566e2b9332c5ddc"; - sha256 = "17jxlbljp7k2azcl1miz5h5xfyazlf9z9lrddcrnm6r7c1w1zdh5"; + rev = "baefbd690f0b52cb8746f3e64b326d82834d07c5"; + 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 000000000000..b7ac4edc5189 --- /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 5bdf295cc6eb..b2a63e9532bc 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -2,19 +2,100 @@ nettools, kbd, bc, which, gnused, gnugrep, groff, man-db, glibc, libiconv, pcre2, gettext, ncurses, python + + , writeText + + , useOperatingSystemEtc ? true + }: with stdenv.lib; +let + etcConfigAppendixText = '' + ############### ↓ Nix hook for sourcing /etc/fish/config.fish ↓ ############### + # # + # Origin: + # This fish package was called with the attribute + # "useOperatingSystemEtc = true;". + # + # Purpose: + # Fish ordinarily sources /etc/fish/config.fish as + # $__fish_sysconfdir/config.fish, + # and $__fish_sysconfdir is defined at compile-time, baked into the C++ + # component of fish. By default, it is set to "/etc/fish". When building + # through Nix, $__fish_sysconfdir gets set to $out/etc/fish. Here we may + # have included a custom $out/etc/config.fish in the fish package, + # as specified, but according to the value of useOperatingSystemEtc, we + # may want to further source the real "/etc/fish/config.fish" file. + # + # When this option is enabled, this segment should appear the very end of + # "$out/etc/config.fish". This is to emulate the behavior of fish itself + # with respect to /etc/fish/config.fish and ~/.config/fish/config.fish: + # source both, but source the more global configuration files earlier + # than the more local ones, so that more local configurations inherit + # from but override the more global locations. + + if test -f /etc/fish/config.fish + source /etc/fish/config.fish + end + + # # + ############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ############### + ''; + + fishPreInitHooks = '' + # source nixos environment + # note that this is required: + # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) + # 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH + builtin status --is-login + or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED" + and test -f /etc/fish/nixos-env-preinit.fish + and source /etc/fish/nixos-env-preinit.fish + and set -gx __fish_nixos_env_preinit_sourced 1 + + test -n "$NIX_PROFILES" + and begin + # We ensure that __extra_* variables are read in $__fish_datadir/config.fish + # with a preference for user-configured data by making sure the package-specific + # data comes last. Files are loaded/sourced in encounter order, duplicate + # basenames get skipped, so we assure this by prepending Nix profile paths + # (ordered in reverse of the $NIX_PROFILE variable) + # + # Note that at this point in evaluation, there is nothing whatsoever on the + # fish_function_path. That means we don't have most fish builtins, e.g., `eval`. + + + # additional profiles are expected in order of precedence, which means the reverse of the + # NIX_PROFILES variable (same as config.environment.profiles) + set -l __nix_profile_paths (echo $NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')[-1..1] + + set __extra_completionsdir \ + $__nix_profile_paths"/etc/fish/completions" \ + $__nix_profile_paths"/share/fish/vendor_completions.d" \ + $__extra_completionsdir + set __extra_functionsdir \ + $__nix_profile_paths"/etc/fish/functions" \ + $__nix_profile_paths"/share/fish/vendor_functions.d" \ + $__extra_functionsdir + set __extra_confdir \ + $__nix_profile_paths"/etc/fish/conf.d" \ + $__nix_profile_paths"/share/fish/vendor_conf.d" \ + $__extra_confdir + end + ''; +in + stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.5.0"; + version = "2.6.0"; - patches = [ ./etc_config.patch ]; + 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 ]; @@ -24,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 = '' @@ -69,15 +150,10 @@ stdenv.mkDerivation rec { "$out/share/fish/tools/create_manpage_completions.py" sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ "$out/share/fish/functions/man.fish" + '' + optionalString useOperatingSystemEtc '' + tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} '' + '' - tee -a $out/share/fish/config.fish << EOF - - # make fish pick up completions from nix profile - if status --is-interactive - set -l profiles (echo \$NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n') - set fish_complete_path \$profiles"/share/fish/vendor_completions.d" \$fish_complete_path - end - EOF + tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/fish/etc_config.patch b/pkgs/shells/fish/etc_config.patch deleted file mode 100644 index c0098c058124..000000000000 --- a/pkgs/shells/fish/etc_config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/etc/config.fish b/etc/config.fish -index 9be6f07..61c9ae2 100644 ---- a/etc/config.fish -+++ b/etc/config.fish -@@ -12,3 +12,7 @@ - # if status --is-interactiv - # ... - # end -+ -+if test -f /etc/fish/config.fish -+ source /etc/fish/config.fish -+end diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix new file mode 100644 index 000000000000..4ab03b31fb93 --- /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 new file mode 100644 index 000000000000..8e2a0950d194 --- /dev/null +++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "lambda-mod-zsh-theme-unstable-2017-07-05"; + + src = fetchFromGitHub { + owner = "halfo"; + repo = "lambda-mod-zsh-theme"; + sha256 = "03kdhifxsnfbly6hqpr1h6kf52kyhdbh82nvwkkyrz1lw2cxl89n"; + rev = "ba7d5fea16db91fc8de887e69250f4e501b1e36d"; + }; + + buildPhases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/themes + cp lambda-mod.zsh-theme $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; + homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index edb44e09b1fa..e21c97c297ca 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,33 +1,22 @@ -{ stdenv, fetchurl, groff }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mksh-${version}"; - version = "52c"; + version = "55"; src = fetchurl { urls = [ "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "19ivsic15903hv3ipzk0kvkaxardw7b99s8l5iw3y415lz71ld66"; + sha256 = "0mssqd2wp3cs9x01v6g66iy3ymdxagbyw2c0v597vnc1l6s2rm6f"; }; - buildInputs = [ groff ]; - - hardeningDisable = [ "format" ]; - - buildPhase = '' - mkdir build-dir/ - cp mksh.1 dot.mkshrc build-dir/ - cd build-dir/ - sh ../Build.sh -c lto - ''; + buildPhase = ''sh ./Build.sh -r -c lto''; installPhase = '' - mkdir -p $out/bin $out/share/man/man1 $out/share/mksh $out/bin install -D -m 755 mksh $out/bin/mksh install -D -m 644 mksh.1 $out/share/man/man1/mksh.1 - install -D -m 644 mksh.cat1 $out/share/mksh/mksh.cat1 install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc ''; @@ -41,8 +30,8 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = licenses.free; - maintainers = with maintainers; [ AndersonTorres nckx ]; + license = licenses.bsd3; + maintainers = with maintainers; [ AndersonTorres nckx joachifm ]; platforms = platforms.unix; }; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index 5faca2fa8e84..1261a4429a4e 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 21e409b727b7..22f5aa48d610 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-02-20"; + version = "2017-06-22"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "98d8d3429f8b9fc2c4c109fb199a31c8d1735699"; - sha256 = "1zdjb5dsbr8n7jfmib4a6rhcx9wrp5lw4b8b9xrh164s97hza2d0"; + rev = "d848c94804918138375041a9f800f401bec12068"; + sha256 = "0mxmqkdpimwrskqjri3lp3haj1hzf583g7psnv34y3hyymzcx1h6"; }; pathsToLink = [ "/share/oh-my-zsh" ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { To copy the Oh My Zsh configuration file to your home directory, run the following command: - $ cp -v $(nix-env -q --out-path oh-my-zsh-git | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc + $ cp -v $(nix-env -q --out-path oh-my-zsh | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc ''; homepage = "http://ohmyz.sh/"; license = licenses.mit; diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix index f1fb4d03121d..d3ce1ff1cc2d 100644 --- a/pkgs/shells/rssh/default.nix +++ b/pkgs/shells/rssh/default.nix @@ -59,6 +59,12 @@ stdenv.mkDerivation rec { }) ]; + # Run this after to avoid conflict with patches above + postPatch = '' + sed -i '/chmod u+s/d' Makefile.in + ''; + + buildInputs = [ openssh rsync cvs ]; configureFlags = [ @@ -76,7 +82,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.pizzashack.org/rssh/"; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ arobyn ]; }; diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix index 4071d7bd0f21..fe7ed752f5e9 100644 --- a/pkgs/shells/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh-autosuggestions/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zsh-autosuggestions-${version}"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { - repo = "zsh-autosuggestions"; owner = "zsh-users"; + repo = "zsh-autosuggestions"; rev = "v${version}"; - sha256 = "0mnwyz4byvckrslzqfng5c0cx8ka0y12zcy52kb7amg3l07jrls4"; + sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; }; buildInputs = [ zsh ]; diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix index dc62460441d1..a1f708227250 100644 --- a/pkgs/shells/zsh-completions/default.nix +++ b/pkgs/shells/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.18.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "0iwb1kaidjxaz66kbbdzbydbdlfc6dk21sflzar0zy25jgx1p4xs"; + sha256 = "0hc56y0fvshzs05acbzxf4q37vqsk4q3zp4c7smh175v56wigy94"; }; installPhase= '' diff --git a/pkgs/shells/zsh-git-prompt/default.nix b/pkgs/shells/zsh-git-prompt/default.nix new file mode 100644 index 000000000000..7318da83d176 --- /dev/null +++ b/pkgs/shells/zsh-git-prompt/default.nix @@ -0,0 +1,70 @@ +# zsh-git-prompt -- Informative git prompt for zsh +# +# Usage: to enable this plugin for all users, you could +# add it to configuration.nix like this: +# +# programs.zsh.interactiveShellInit = '' +# source ${pkgs.zsh-git-prompt}/share/zsh-git-prompt/zshrc.sh +# ''; +# +# Or you can install it globally but only enable it in individual +# users' ~/.zshrc files: +# +# source /run/current-system/sw/share/zsh-git-prompt/zshrc.sh +# +# Or if installed locally: +# +# source ~/.nix-profile/share/zsh-git-prompt/zshrc.sh +# +# Either way, you then have to set a prompt that incorporates +# git_super_status, for example: +# +# PROMPT='%B%m%~%b$(git_super_status) %# ' +# +# More details are in share/doc/zsh-git-prompt/README.md, once +# installed. +# +{ fetchgit +, haskell +, python +, git +, lib +, ghcVersion ? "ghc802" +}: + +haskell.packages.${ghcVersion}.callPackage + ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }: + mkDerivation rec { + pname = "zsh-git-prompt"; + version = "0.5"; + src = fetchgit { + url = "https://github.com/olivierverdier/zsh-git-prompt.git"; + rev = "0a6c8b610e799040b612db8888945f502a2ddd9d"; + sha256 = "19x1gf1r6l7r6i7vhhsgzcbdlnr648jx8j84nk2zv1b8igh205hw"; + }; + prePatch = '' + substituteInPlace zshrc.sh \ + --replace ':-"python"' ':-"haskell"' \ + --replace 'python ' '${python.interpreter} ' \ + --replace 'git ' '${git}/bin/git ' + ''; + preCompileBuildDriver = "cd src"; + postInstall = '' + cd .. + gpshare=$out/share/${pname} + gpdoc=$out/share/doc/${pname} + mkdir -p $gpshare/src $gpdoc + cp README.md $gpdoc + cp zshrc.sh gitstatus.py $gpshare + mv $out/bin $gpshare/src/.bin + ''; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ base parsec process QuickCheck ]; + executableHaskellDepends = libraryHaskellDepends; + testHaskellDepends = [HUnit] ++ libraryHaskellDepends; + homepage = "http://github.com/olivierverdier/zsh-git-prompt#readme"; + description = "Informative git prompt for zsh"; + license = stdenv.lib.licenses.mit; + maintainers = [lib.maintainers.league]; + }) {} diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix index 792a8875db4d..21911c8800cb 100644 --- a/pkgs/shells/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh-syntax-highlighting/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, zsh }: +{ stdenv, fetchFromGitHub, zsh }: # To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option -let - - pkgName = "zsh-syntax-highlighting"; - version = "0.4.1"; - -in - stdenv.mkDerivation rec { - name = "${pkgName}-${version}"; + version = "0.5.0"; + name = "zsh-syntax-highlighting-${version}"; - src = fetchurl { - url = "https://github.com/zsh-users/${pkgName}/archive/${version}.tar.gz"; - sha256 = "15sih7blqz11d8wdybx38d91vgcq9jg3q0205r26138si0g9q6wp"; + src = fetchFromGitHub { + owner = "zsh-users"; + repo = "zsh-syntax-highlighting"; + rev = version; + sha256 = "0k0m5aw67lhi4z143sdawx93y1892scvvdfdnjvljb4hf0vzs2ww"; }; buildInputs = [ zsh ]; - installFlags="PREFIX=$(out)"; + installFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { description = "Fish shell like syntax highlighting for Zsh"; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3ffe1ab15d9b..5848ee87b1b0 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -56,12 +56,34 @@ rec { # Return a modified stdenv that adds a cross compiler to the # builds. - makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // { + makeStdenvCross = { stdenv + , cc + , buildPlatform, hostPlatform, targetPlatform + } @ overrideArgs: let + stdenv = overrideArgs.stdenv.override { + inherit + buildPlatform hostPlatform targetPlatform + cc; + 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 @@ -84,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 binutilsCross ] ++ 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 @@ -103,12 +133,8 @@ rec { propagatedBuildInputs = propagatedBuildInputs ++ buildInputs; propagatedNativeBuildInputs = propagatedNativeBuildInputs; - crossConfig = cross.config; + crossConfig = hostPlatform.config; } // args.crossAttrs or {}); - - inherit gccCross binutilsCross; - ccCross = gccCross; - }; diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 2c82d12da95d..a1055708f995 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -41,10 +41,39 @@ # other words, this does a foldr not foldl. stageFuns: let + /* "dfold" a ternary function `op' between successive elements of `list' as if + it was a doubly-linked list with `lnul' and `rnul` base cases at either + end. In precise terms, `fold op lnul rnul [x_0 x_1 x_2 ... x_n-1]` is the + same as + + let + f_-1 = lnul; + f_0 = op f_-1 x_0 f_1; + f_1 = op f_0 x_1 f_2; + f_2 = op f_1 x_2 f_3; + ... + f_n = op f_n-1 x_n f_n+1; + f_n+1 = rnul; + in + f_0 + */ + dfold = op: lnul: rnul: list: + let + len = builtins.length list; + go = pred: n: + if n == len + then rnul + else let + # Note the cycle -- call-by-need ensures finite fold. + cur = op pred (builtins.elemAt list n) succ; + succ = go cur (n + 1); + in cur; + in go lnul 0; + # 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 @@ -55,19 +84,21 @@ stageFuns: let # Adds the stdenv to the arguments, and sticks in it the previous stage for # debugging purposes. - folder = stageFun: finalSoFar: let - args = stageFun finalSoFar; + folder = nextStage: stageFun: prevStage: let + args = stageFun prevStage; args' = args // { stdenv = args.stdenv // { # For debugging - __bootPackages = finalSoFar; + __bootPackages = prevStage; + __hatPackages = nextStage; }; }; in if args.__raw or false then args' else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // { - buildPackages = if args.selfBuild or true then null else finalSoFar; + buildPackages = if args.selfBuild or true then null else prevStage; + __targetPackages = if args.selfBuild or true then null else nextStage; }); -in lib.lists.fold folder {} withAllowCustomOverrides +in dfold folder {} {} withAllowCustomOverrides diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index e322d4655201..c83714d01f2c 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -14,38 +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; - stdenv = vanillaPackages.stdenv // { - overrides = _: _: {}; - }; }) # 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 { - prefix = crossSystem.config; - inherit (crossSystem) arch; - simulator = crossSystem.isiPhoneSimulator or false; }) - cc binutils; - in buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - binutils cc - else buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - buildPackages.binutilsCross 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 d5dc977b37a7..b6ea8685f8e6 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 e97dc66c0ad6..091c9044d93f 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="$( { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/33f59c9d11b8d5014dfd18cc11a425f6393c884a/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c4effbe806be9a0a3727fdbbc9a5e28149347532/${file}"; inherit (localSystem) system; inherit sha256 executable; }; in { - sh = fetch { file = "sh"; sha256 = "1rx4kg6358xdj05z0m139a0zn4f4zfmq4n4vimlmnwyfiyn4x7wk"; }; - bzip2 = fetch { file = "bzip2"; sha256 = "104qnhzk79vkbp2yi0kci6lszgfppvrwk3rgxhry842ly1xz2r7l"; }; - mkdir = fetch { file = "mkdir"; sha256 = "0d91c19xjzmqisncvldv79d7ddzai9l7vcmajhwlwwv74g6da5yl"; }; - cpio = fetch { file = "cpio"; sha256 = "0lw057bmcqls96j0gv1n3mgl66q31mba7i413cbkkaf0rfzz3dxj"; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "13ihbj002pis3fgy1d9c4fi7flca21z9brjsjkklm82h5b4nlwxl"; executable = false; }; + sh = fetch { file = "sh"; sha256 = "1b9r3dksj907bpxp589yhc4217cas73vni8sng4r57f04ydjcinr"; }; + bzip2 = fetch { file = "bzip2"; sha256 = "1wm28jgap4cbr8hf4ambg6h9flr2b4mcbh7fw20i0l51v6n8igky"; }; + mkdir = fetch { file = "mkdir"; sha256 = "0jc32mzx2whhx2xh70grvvgz4jj26118p9yxmhjqcysagc0k7y66"; }; + cpio = fetch { file = "cpio"; sha256 = "0x5dcczkzn0g8yb4pah449jmgy3nmpzrqy4s480grcx05b6v6hkp"; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0ifdc8bwxdhmpbhx2vd3lwjg71gqm6pi5mfm0fkcsbqavl8hd8hz"; executable = false; }; } }: @@ -54,17 +54,24 @@ in rec { __sandboxProfile = binShClosure + libSystemProfile; }; - stageFun = step: last: {shell ? "${bootstrapTools}/bin/sh", + stageFun = step: last: {shell ? "${bootstrapTools}/bin/bash", overrides ? (self: super: {}), extraPreHook ? "", extraBuildInputs, allowedRequisites ? null}: let thisStdenv = import ../generic { - inherit system config shell extraBuildInputs allowedRequisites; + inherit config shell extraBuildInputs; + allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [ + thisStdenv.cc.expand-response-params + ]; name = "stdenv-darwin-boot-${toString step}"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenv; @@ -73,12 +80,17 @@ in rec { nativeTools = true; nativePrefix = bootstrapTools; nativeLibc = false; + buildPackages = lib.optionalAttrs (last ? stdenv) { + inherit (last) stdenv; + }; + hostPlatform = localSystem; + targetPlatform = localSystem; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; }; - preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/sh") '' + preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. dontPatchShebangs=1 @@ -87,6 +99,7 @@ in rec { ${extraPreHook} ''; initialPath = [ bootstrapTools ]; + fetchurlBoot = import ../../build-support/fetchurl { stdenv = stage0.stdenv; curl = bootstrapTools; @@ -101,9 +114,6 @@ in rec { }; in { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = thisStdenv; }; @@ -161,14 +171,14 @@ in rec { persistent1 = prevStage: self: super: with prevStage; { inherit - zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python + zlib patchutils m4 scons flex perl bison unifdef unzip openssl python libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils; darwin = super.darwin // { inherit (darwin) - dyld Libsystem xnu configd libdispatch libclosure launchd; + dyld Libsystem xnu configd ICU libdispatch libclosure launchd; }; }; @@ -181,8 +191,8 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++ - (with pkgs.darwin; [ dyld Libsystem CF locale ]); + (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ + (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); overrides = persistent1 prevStage; }; @@ -217,8 +227,8 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld Libsystem locale ]); + (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ + (with pkgs.darwin; [ dyld ICU Libsystem locale ]); overrides = persistent2 prevStage; }; @@ -229,11 +239,11 @@ in rec { libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils; - llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; - in super.llvmPackages // { - llvm = llvmOverride; - clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; - }; + llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; + in super.llvmPackages // { + llvm = llvmOverride; + clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; + }; darwin = super.darwin // { inherit (darwin) dyld Libsystem libiconv locale; @@ -252,24 +262,31 @@ in rec { persistent4 = prevStage: self: super: with prevStage; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash - libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep - coreutils findutils diffutils patchutils binutils binutils-raw; + libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep + coreutils findutils diffutils patchutils; llvmPackages = super.llvmPackages // { inherit (llvmPackages) llvm clang-unwrapped; }; darwin = super.darwin // { - inherit (darwin) dyld Libsystem cctools libiconv; + inherit (darwin) dyld ICU Libsystem cctools libiconv; }; + } // lib.optionalAttrs (super.targetPlatform == localSystem) { + # Need to get rid of these when cross-compiling. + inherit binutils binutils-raw; }; stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec { - inherit system config; + inherit config; inherit (pkgs.stdenv) fetchurlBoot; name = "stdenv-darwin"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + preHook = commonPreHook + '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; @@ -285,6 +302,11 @@ in rec { inherit shell; nativeTools = false; nativeLibc = false; + buildPackages = { + inherit (prevStage) stdenv; + }; + hostPlatform = localSystem; + targetPlatform = localSystem; inherit (pkgs) coreutils binutils gnugrep; inherit (pkgs.darwin) dyld; cc = pkgs.llvmPackages.clang-unwrapped; @@ -300,19 +322,22 @@ in rec { }; allowedRequisites = (with pkgs; [ - xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out - bzip2.bin llvmPackages.llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar + xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out + bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out binutils-raw.dev binutils gettext + cc.expand-response-params ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools libiconv locale + dyld Libsystem CF cctools ICU libiconv locale ]); - overrides = self: super: persistent4 prevStage self super // { - clang = cc; - inherit cc; - }; + overrides = self: super: + let persistent = persistent4 prevStage self super; in persistent // { + clang = cc; + llvmPackages = persistent.llvmPackages // { clang = cc; }; + inherit cc; + }; }; stagesDarwin = [ @@ -322,9 +347,6 @@ in rec { stage3 stage4 (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = stdenvDarwin prevStage; }) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 85e4dabbbded..65f0cba51f72 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -3,7 +3,7 @@ with import pkgspath { inherit system; }; let - llvmPackages = llvmPackages_37; + llvmPackages = llvmPackages_4; in rec { coreutils_ = coreutils.override (args: { # We want coreutils without ACL support. @@ -301,8 +301,8 @@ in rec { export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib" export CPP="clang -E $flags" - export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v" - export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v" + export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10" + export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10" echo '#include ' >> foo.c echo '#include ' >> foo.c diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index b926c6bdd901..d15afe761894 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -35,8 +35,13 @@ let inherit (localSystem) system; in stdenv = import ../generic { name = "stdenv-freebsd-boot-1"; - inherit system config; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config; initialPath = [ "/" "/usr" ]; + hostPlatform = localSystem; + targetPlatform = localSystem; shell = "${bootstrapTools}/bin/bash"; fetchurlBoot = null; cc = null; @@ -50,25 +55,29 @@ let inherit (localSystem) system; in stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; - inherit system config; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config; initialPath = [ prevStage.bootstrapTools ]; - inherit (prevStage.stdenv) shell; + inherit (prevStage.stdenv) + hostPlatform targetPlatform shell; fetchurlBoot = prevStage.fetchurl; cc = null; }; }) (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = import ../generic { name = "stdenv-freebsd-boot-3"; - inherit system config; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config; inherit (prevStage.stdenv) - initialPath shell fetchurlBoot; + hostPlatform targetPlatform initialPath shell fetchurlBoot; cc = import ../../build-support/cc-wrapper { nativeTools = true; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix new file mode 100644 index 000000000000..8b2cf01f169b --- /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 cb94db48f4bd..a5d3c5a8ff5c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,6 +1,6 @@ let lib = import ../../../lib; in lib.makeOverridable ( -{ system, name ? "stdenv", preHook ? "", initialPath, cc, shell +{ name ? "stdenv", preHook ? "", initialPath, cc, shell , allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config , # The `fetchurl' to use for downloading curl and its dependencies @@ -14,82 +14,43 @@ let lib = import ../../../lib; in lib.makeOverridable ( , __extraImpureHostDeps ? [] , stdenvSandboxProfile ? "" , extraSandboxProfile ? "" + + ## 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 - - 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 ../../build-support/setup-hooks/strip.sh ../../build-support/setup-hooks/patch-shebangs.sh + ] + # FIXME this on Darwin; see + # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369 + ++ 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 ../../build-support/setup-hooks/move-lib64.sh @@ -97,239 +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; - }; - 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)); - - # 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 { valid = true; }; - - outputs' = - outputs ++ - (if separateDebugInfo then assert result.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 = if crossConfig != null then buildInputs' else []; - propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs' else []; - # Inputs built by the usual native compiler. - nativeBuildInputs = nativeBuildInputs' - ++ lib.optionals (crossConfig == null) buildInputs' - ++ lib.optional - (result.isCygwin - || (crossConfig != null && lib.hasSuffix "mingw32" crossConfig)) - ../../build-support/setup-hooks/win-dll-link.sh - ; - propagatedNativeBuildInputs = propagatedNativeBuildInputs' ++ - (if crossConfig == null then propagatedBuildInputs' else []); - } // 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; @@ -339,7 +77,7 @@ let inherit preHook initialPath shell defaultNativeBuildInputs; } - // ifDarwin { + // lib.optionalAttrs buildPlatform.isDarwin { __sandboxProfile = stdenvSandboxProfile; __impureHostDeps = __stdenvImpureHostDeps; }) @@ -351,60 +89,23 @@ let platforms = lib.platforms.all; }; + inherit buildPlatform hostPlatform targetPlatform; + + inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile; + # Utility flags to test the type of platform. - isDarwin = system == "x86_64-darwin"; - isLinux = system == "i686-linux" - || system == "x86_64-linux" - || system == "powerpc-linux" - || system == "armv5tel-linux" - || system == "armv6l-linux" - || system == "armv7l-linux" - || system == "aarch64-linux" - || system == "mips64el-linux"; - isGNU = system == "i686-gnu"; # GNU/Hurd - isGlibc = isGNU # useful for `stdenvNative' - || isLinux - || system == "x86_64-kfreebsd-gnu"; - isSunOS = system == "i686-solaris" - || system == "x86_64-solaris"; - isCygwin = system == "i686-cygwin" - || system == "x86_64-cygwin"; - isFreeBSD = system == "i686-freebsd" - || system == "x86_64-freebsd"; - isOpenBSD = system == "i686-openbsd" - || system == "x86_64-openbsd"; - isi686 = system == "i686-linux" - || system == "i686-gnu" - || system == "i686-freebsd" - || system == "i686-openbsd" - || system == "i686-cygwin" - || system == "i386-sunos"; - isx86_64 = system == "x86_64-linux" - || system == "x86_64-darwin" - || system == "x86_64-freebsd" - || system == "x86_64-openbsd" - || system == "x86_64-cygwin" - || system == "x86_64-solaris"; - is64bit = system == "x86_64-linux" - || system == "x86_64-darwin" - || system == "x86_64-freebsd" - || system == "x86_64-openbsd" - || system == "x86_64-cygwin" - || system == "x86_64-solaris" - || system == "aarch64-linux" - || system == "mips64el-linux"; - isMips = system == "mips-linux" - || system == "mips64el-linux"; - isArm = system == "armv5tel-linux" - || system == "armv6l-linux" - || system == "armv7l-linux"; - isAarch64 = system == "aarch64-linux"; - isBigEndian = system == "powerpc-linux"; + inherit (hostPlatform) + isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD + isi686 isx86_64 is64bit isMips isBigEndian; + isArm = hostPlatform.isArm32; + isAarch64 = hostPlatform.isArm64; # 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. @@ -423,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 000000000000..05221e2f3c10 --- /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 154fdefd789c..b48b49c0ad1b 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -17,7 +17,9 @@ runHook() { shift local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi + eval "local -a dummy=(\"\${$var[@]}\")" + local hook for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do _eval "$hook" "$@" done @@ -33,6 +35,7 @@ runOneHook() { local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi eval "local -a dummy=(\"\${$var[@]}\")" + local hook for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do if _eval "$hook" "$@"; then return 0 @@ -192,6 +195,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 @@ -199,6 +203,19 @@ isELF() { if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi } +# Return success if the specified file is a script (i.e. starts with +# "#!"). +isScript() { + local fn="$1" + local fd + local magic + if ! [ -x /bin/sh ]; then return 0; fi + exec {fd}< "$fn" + read -n 2 -u $fd magic + exec {fd}<&- + if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi +} + ###################################################################### # Initialisation. @@ -290,15 +307,26 @@ findInputs() { fi } -crossPkgs="" -for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do - findInputs $i crossPkgs propagated-build-inputs -done +if [ -z "$crossConfig" ]; then + # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs) + # are handled identically to nativeBuildInputs + nativePkgs="" + for i in $nativeBuildInputs $buildInputs \ + $defaultNativeBuildInputs $defaultBuildInputs \ + $propagatedNativeBuildInputs $propagatedBuildInputs; do + findInputs $i nativePkgs propagated-native-build-inputs + done +else + crossPkgs="" + for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do + findInputs $i crossPkgs propagated-build-inputs + done -nativePkgs="" -for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do - findInputs $i nativePkgs propagated-native-build-inputs -done + nativePkgs="" + for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do + findInputs $i nativePkgs propagated-native-build-inputs + done +fi # Set the relevant environment variables to point to the build inputs @@ -759,14 +787,26 @@ fixupPhase() { # Propagate build inputs and setup hook into the development output. - if [ -n "$propagatedBuildInputs" ]; then - mkdir -p "${!outputDev}/nix-support" - echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs" - fi + if [ -z "$crossConfig" ]; then + # Not cross-compiling - propagatedBuildInputs are handled identically to propagatedNativeBuildInputs + local propagated="$propagatedNativeBuildInputs" + if [ -n "$propagatedBuildInputs" ]; then + propagated+="${propagated:+ }$propagatedBuildInputs" + fi + if [ -n "$propagated" ]; then + mkdir -p "${!outputDev}/nix-support" + echo "$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" + fi - if [ -n "$propagatedNativeBuildInputs" ]; then - mkdir -p "${!outputDev}/nix-support" - echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs" + if [ -n "$propagatedNativeBuildInputs" ]; then + mkdir -p "${!outputDev}/nix-support" + echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs" + fi fi if [ -n "$setupHook" ]; then diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix index 4e9c17da2d97..ca7e84502ab3 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix @@ -1,11 +1,11 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/busybox; + url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-03-11-bb3ef8/busybox; sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/bootstrap-tools.tar.xz; - sha256 = "13h7lgkjyxrmfkx5k1w6rj3j4iqrk28pqagiwqcg8izrydy318bi"; + url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-03-11-bb3ef8/bootstrap-tools.tar.xz; + sha256 = "1075d5n4yclbhgisi6ba50601mw3fhivlkjs462qlnq8hh0xc7nq"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix index 9781414895b8..37471e9ce426 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/busybox; - sha256 = "03i90dwkly1j2a7i12qixkybjz2b24ixjrl7zsr17s1sv6m27zba"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/busybox; + sha256 = "00mxas5xg2j9n1g0q0nklr0dy87qqxk0jja5qz1yi7xl7zzsnpnw"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/bootstrap-tools.tar.xz; - sha256 = "1sikiydjlbv8v35fgjvr5swgvj6bc83gmrbjrhpi0hyzyfcinxbn"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/bootstrap-tools.tar.xz; + sha256 = "0fhiy9l3mbmlhpkby31c2s63bhjiqx25qqr3wdp8cb7fxz8ayx2f"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix index 76fe900b9ae9..447189756821 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/busybox; - sha256 = "1vl1nx7ccalp2w8d5ymj6i2vs0s9w80xvxpsxl2l24k5ibbspcy0"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/busybox; + sha256 = "06n8dy8y2v28yx9ws8x64wxrvn9pszgpd299hc90nv9x21m79jzd"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/bootstrap-tools.tar.xz; - sha256 = "106f3r1ndl9h1cbxn44vwn3kkhgi8a937xx1v9n40zfx6dzzfv25"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/bootstrap-tools.tar.xz; + sha256 = "1gg2q3sw81vi65g1gmpvx0nnd6hxb76vlz73wfp292m90z1mym7f"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix index 91452d639c47..b97fd9967eae 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/busybox; - sha256 = "0kb439p37rzlascp6ldm4kwf5kwd6p3lv17c41zwj20wbv8sdilq"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/busybox; + sha256 = "187xwzsng5lpak1nanrk88y4mlydmrbhx6la00rrd6kjx376s565"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/bootstrap-tools.tar.xz; - sha256 = "0h75xbpkyzhvmjzhj9i598p0cq60py7v0b8lryrvcqw7qjlbgrsd"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/bootstrap-tools.tar.xz; + sha256 = "05ayki2kak3i5lw97qidd5h9jv00dmlhx9h7l771bj331yamyqdn"; }; } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index fe685a1e77ce..c475d2d1e927 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -52,8 +52,11 @@ let let thisStdenv = import ../generic { - inherit system 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 @@ -73,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; @@ -94,9 +102,6 @@ let }; in { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = thisStdenv; }; @@ -236,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; @@ -256,12 +266,12 @@ 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 { - inherit system config; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config; preHook = '' # Make "strip" produce deterministic output, by setting @@ -298,12 +308,14 @@ in */ overrides = self: super: { - gcc = cc; - inherit (prevStage) - gzip bzip2 xz bash binutils coreutils diffutils findutils gawk + gzip bzip2 xz bash coreutils diffutils findutils gawk glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl paxctl zlib pcre; + } // lib.optionalAttrs (super.targetPlatform == localSystem) { + # Need to get rid of these when cross-compiling. + inherit (prevStage) binutils; + gcc = cc; }; }; }) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 1a762bd87c79..90c9d2cef67f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -3,76 +3,24 @@ let buildFor = toolsArch: ( let + lib = import ../../../lib; pkgsFun = import ../../..; - pkgsNoParams = pkgsFun {}; - sheevaplugCrossSystem = { - crossSystem = rec { - config = "arm-linux-gnueabi"; - bigEndian = false; - arch = "armv5te"; - float = "soft"; - withTLS = true; - libc = "glibc"; - platform = pkgsNoParams.platforms.sheevaplug; - openssl.system = "linux-generic32"; - inherit (platform) gcc; - }; - }; - - raspberrypiCrossSystem = { - crossSystem = rec { - config = "arm-linux-gnueabihf"; - bigEndian = false; - arch = "armv6"; - float = "hard"; - fpu = "vfp"; - withTLS = true; - libc = "glibc"; - platform = pkgsNoParams.platforms.raspberrypi; - openssl.system = "linux-generic32"; - inherit (platform) gcc; - }; - }; - - armv7l-hf-multiplatform-crossSystem = { - crossSystem = rec { - config = "arm-linux-gnueabihf"; - bigEndian = false; - arch = "armv7-a"; - float = "hard"; - fpu = "vfpv3-d16"; - withTLS = true; - libc = "glibc"; - platform = pkgsNoParams.platforms.armv7l-hf-multiplatform; - openssl.system = "linux-generic32"; - inherit (platform) gcc; - }; - }; - - aarch64-multiplatform-crossSystem = { - crossSystem = rec { - config = "aarch64-linux-gnu"; - bigEndian = false; - arch = "aarch64"; - withTLS = true; - libc = "glibc"; - platform = pkgsNoParams.platforms.aarch64-multiplatform; - inherit (platform) gcc; - }; - }; + inherit (lib.systems.examples) + sheevaplug raspberryPi armv7l-hf-multiplatform + aarch64-multiplatform scaleway-c1 pogoplug4; selectedCrossSystem = - if toolsArch == "armv5tel" then sheevaplugCrossSystem else - if toolsArch == "armv6l" then raspberrypiCrossSystem else - if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else - if toolsArch == "aarch64" then aarch64-multiplatform-crossSystem else null; + if toolsArch == "armv5tel" then sheevaplug else + if toolsArch == "scaleway" then scaleway-c1 else + if toolsArch == "pogoplug4" then pogoplug4 else + if toolsArch == "armv6l" then raspberryPi else + if toolsArch == "armv7l" then armv7l-hf-multiplatform else + if toolsArch == "aarch64" then aarch64-multiplatform else null; - pkgs = pkgsFun ({inherit system;} // selectedCrossSystem); + pkgs = pkgsFun ({ inherit system; crossSystem = selectedCrossSystem; }); - inherit (pkgs.buildPackages) stdenv nukeReferences cpio binutilsCross; - - glibc = pkgs.buildPackages.libcCross; + glibc = pkgs.libcCross; bash = pkgs.bash; findutils = pkgs.findutils; diffutils = pkgs.diffutils; @@ -126,11 +74,14 @@ rec { build = - stdenv.mkDerivation { + pkgs.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; crossConfig = pkgs.hostPlatform.config; - buildInputs = [nukeReferences cpio binutilsCross]; + nativeBuildInputs = [ + pkgs.buildPackages.nukeReferences + pkgs.buildPackages.cpio + ]; buildCommand = '' set -x @@ -221,8 +172,7 @@ rec { # GCC has certain things built in statically. See # pkgs/stdenv/linux/default.nix for the details. cp -d ${isl}/lib/libisl*.so* $out/lib - # Also this is needed since bzip2 uses a custom build system - # for native builds but autoconf (via a patch) for cross builds + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. @@ -262,7 +212,7 @@ rec { allowedReferences = []; }; - dist = stdenv.mkDerivation { + dist = pkgs.stdenv.mkDerivation { name = "stdenv-bootstrap-tools-cross"; buildCommand = '' @@ -278,4 +228,6 @@ rec { armv6l = buildFor "armv6l"; armv7l = buildFor "armv7l"; aarch64 = buildFor "aarch64"; + scaleway = buildFor "scaleway"; + pogoplug4 = buildFor "pogoplug4"; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 42015a79a3e0..2ce73eb781d8 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -122,6 +122,8 @@ rec { cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib + # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index f5c0976bf931..02734f2f3e59 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -81,6 +81,10 @@ let { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }: import ../generic { + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + preHook = if system == "i686-freebsd" then prehookFreeBSD else if system == "x86_64-freebsd" then prehookFreeBSD else @@ -99,7 +103,7 @@ let fetchurlBoot = fetchurl; - inherit system shell cc overrides config; + inherit shell cc overrides config; }; in @@ -135,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; @@ -147,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 9aece3ce829d..aaf6c523ea4a 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 = '' @@ -24,11 +27,11 @@ bootStages ++ [ initialPath = (import ../common-path.nix) { pkgs = prevStage; }; - system = stdenv.system; + inherit (prevStage.stdenv) hostPlatform targetPlatform; cc = import ../../build-support/cc-wrapper { nativeTools = false; - nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr"; + nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; nativeLibc = true; inherit stdenv; inherit (prevStage) binutils coreutils gnugrep; diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index 1bb381826a13..fd5cfe03ea3a 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "screen-message-${version}"; - version = "0.24"; + version = "0.25"; src = fetchurl { url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz"; - sha256 = "1v03axr7471fmzxccl3ckv73j8gfcj615y5maxvm5phy0sd6rl49"; + sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 81b888ccb783..2245f03ec7fe 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -5,14 +5,14 @@ assert enableXinerama -> libXinerama != null; stdenv.mkDerivation rec { - version = "1.4.4"; + version = "2.0.1"; name = "setroot-${version}"; src = fetchFromGitHub { owner = "ttzhou"; repo = "setroot"; rev = "v${version}"; - sha256 = "0vphma0as8pnqrakdw6gaiiz7xawb4y72sc9dna755kkclgbyl8m"; + sha256 = "01krjfc3xpp0wbqz9nvf1n34gkpd41gysn289sj1wcjxia4n4gsi"; }; buildInputs = [ libX11 imlib2 ] @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { description = "Simple X background setter inspired by imlibsetroot and feh"; homepage = https://github.com/ttzhou/setroot; license = licenses.gpl3Plus; + maintainers = maintainers.vyp; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix new file mode 100644 index 000000000000..bb4435d56e7e --- /dev/null +++ b/pkgs/tools/X11/wayv/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchFromGitHub, libX11}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "wayv"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "mikemb"; + repo = pname; + rev = "b716877603250f690f08b593bf30fd5e8a93a872"; + sha256 = "046dvaq6na1fyxz5nrjg13aaz6ific9wbygck0dknqqfmmjrsv3b"; + }; + + buildInputs = [ libX11 ]; + + postInstall = '' + make -C doc install + mkdir -p "$out"/share/doc/wayv + cp [A-Z][A-Z]* "$out"/share/doc/wayv + cp doc/[A-Z][A-Z]* "$out"/share/doc/wayv + cp doc/*.txt "$out"/share/doc/wayv + cp doc/*.jpg "$out"/share/doc/wayv + ''; + + meta = { + inherit version; + description = "A gesture control for X11"; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/mikemb/wayV"; + }; +} diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix new file mode 100644 index 000000000000..829d9b8ab2d3 --- /dev/null +++ b/pkgs/tools/X11/xannotate/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromBitbucket, libX11}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xannotate"; + version = "20150301"; + + src = fetchFromBitbucket { + owner = "blais"; + repo = pname; + rev = "e5591c2ec67ca39988f1fb2966e94f0f623f9aa7"; + sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik"; + }; + + buildInputs = [ libX11 ]; + + meta = { + inherit version; + description = "A tool to scribble over X windows"; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://bitbucket.org/blais/xannotate"; + }; +} diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix new file mode 100644 index 000000000000..79ef4cb56dcb --- /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 000000000000..1d42f791fb5c --- /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/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 16e339b41c27..a1d3a059a830 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -29,15 +29,16 @@ stdenv.mkDerivation rec { postInstall = stdenv.lib.optionalString mimiSupport '' cp ${mimisrc}/xdg-open $out/bin/xdg-open - '' - + '' - for tool in "${coreutils}/bin/cut" "${gnused}/bin/sed" \ - "${gnugrep}"/bin/{e,}grep "${file}/bin/file" \ - ${stdenv.lib.optionalString mimiSupport - '' "${gawk}/bin/awk" "${coreutils}/bin/sort" ''} ; - do - sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/* - done + '' + '' + sed '2s#.#\ + cut() { ${coreutils}/bin/cut "$@"; }\ + sed() { ${gnused}/bin/sed "$@"; }\ + grep() { ${gnugrep}/bin/grep "$@"; }\ + egrep() { ${gnugrep}/bin/egrep "$@"; }\ + file() { ${file}/bin/file "$@"; }\ + awk() { ${gawk}/bin/awk "$@"; }\ + sort() { ${coreutils}/bin/sort "$@"; }\ + &#' -i "$out"/bin/* substituteInPlace $out/bin/xdg-open \ --replace "/usr/bin/printf" "${coreutils}/bin/printf" diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix new file mode 100644 index 000000000000..e6f6622f85ac --- /dev/null +++ b/pkgs/tools/X11/xkbset/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, perl, libX11 }: + +stdenv.mkDerivation rec { + name = "xkbset-0.5"; + + src = fetchurl { + url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz"; + sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172"; + }; + + buildInputs = [ perl libX11 ]; + + postPatch = '' + sed "s:^X11PREFIX=.*:X11PREFIX=$out:" -i Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + ''; + + postInstall = '' + rm -f $out/bin/xkbset-gui + ''; + + meta = with stdenv.lib; { + homepage = "http://faculty.missouri.edu/~stephen/software/#xkbset"; + description = "Program to help manage many of XKB features of X window"; + maintainers = with maintainers; [ drets ]; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 943707c0c5ee..aa0ae36fdd29 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -11,11 +11,11 @@ with lib; let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-0.17.6"; + name = "xpra-2.0.2"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj"; + sha256 = "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3"; }; buildInputs = [ diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index c7c7b9e55674..399531f71eb8 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 bdb9fd2d4772..23c35dab57c0 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -15,10 +15,10 @@ python2Packages.buildPythonApplication rec { dns ]; - meta = { + meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; homepage = https://github.com/barnybug/cli53; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ benley ]; + license = licenses.mit; + maintainers = with maintainers; [ benley ]; }; } diff --git a/pkgs/tools/admin/cli53/deps.nix b/pkgs/tools/admin/cli53/deps.nix new file mode 100644 index 000000000000..0cb0360e499d --- /dev/null +++ b/pkgs/tools/admin/cli53/deps.nix @@ -0,0 +1,3 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ +] diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 5594368b04f4..7e8c1bccc3e8 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -2,40 +2,42 @@ stdenv.mkDerivation rec { name = "daemontools-0.76"; - + src = fetchurl { url = "https://cr.yp.to/daemontools/${name}.tar.gz"; sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; }; - + + patches = [ ./fix-nix-usernamespace-build.patch ]; + configurePhase = '' cd ${name} - + sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc - + substituteInPlace src/Makefile \ --replace '/bin/sh' '${bash}/bin/bash -oxtrace' - + sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests - + cat ${glibc.dev}/include/errno.h ''; - + buildPhase = '' package/compile ''; - + installPhase = '' for cmd in $(cat package/commands); do install -Dm755 "command/$cmd" "$out/bin/$cmd" done ''; - + meta = { license = stdenv.lib.licenses.publicDomain; homepage = https://cr.yp.to/daemontools.html; description = "A collection of tools for managing UNIX services."; - + maintainers = with stdenv.lib.maintainers; [ kevincox ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch new file mode 100644 index 000000000000..9b784e7ca112 --- /dev/null +++ b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch @@ -0,0 +1,10 @@ +--- admin.org/daemontools-0.76/src/chkshsgr.c 2001-07-12 17:49:49.000000000 +0100 ++++ admin/daemontools-0.76/src/chkshsgr.c 2017-05-31 23:54:56.662174028 +0100 +@@ -4,6 +4,7 @@ + + int main() + { ++ return 0; + short x[4]; + + x[0] = x[1] = 0; 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 000000000000..d120969d8fb8 --- /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 000000000000..bb52c5a0bc4a --- /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 acc440b34ed4..26e63283f8da 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 = "138.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 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616"; + 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 = "efbe2074da5a544c09b6bf87a8ca045dc429ac38dfcd5380561987769491d5ba"; + sha256 = "0706dbea1279be2bc98a497d1bfed61a9cc29c305d908a376bcdb4403035b323"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "1y64bx9vj6rrapffr7zwxbxxbqlddx91n82kr99mwv19n11hydyw"; + sha256 = "7aa6094d1f9c87f4c2c4a6bdad6a1113aac5e72ea673e659d9acbb059dfd037e"; }; + buildInputs = [python27 makeWrapper]; phases = [ "installPhase" "fixupPhase" ]; @@ -34,13 +35,22 @@ 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" - wrapper="$out/bin/$program" - makeWrapper "$programPath" "$wrapper" \ + binaryPath="$out/bin/$program" + wrapProgram "$programPath" \ --set CLOUDSDK_PYTHON "${python27}/bin/python" \ --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})" + + mkdir -p $out/bin + ln -s $programPath $binaryPath done # install man pages diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 40647f73379b..1aec4209b4d3 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lxd-${version}"; - version = "2.0.2"; + version = "2.14"; rev = "lxd-${version}"; goPackagePath = "github.com/lxc/lxd"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "lxd"; - sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; + sha256 = "1jy60lb2m0497bnjj09qvflsj2rb0jjmlb8pm1xn5g4lpzibszjm"; }; goDeps = ./deps.nix; @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = https://github.com/lxc/lxd; + homepage = https://linuxcontainers.org/lxd/; license = licenses.asl20; maintainers = with maintainers; [ globin fpletz ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix index 7325100bb3ad..e0f591a23d1e 100644 --- a/pkgs/tools/admin/lxd/deps.nix +++ b/pkgs/tools/admin/lxd/deps.nix @@ -1,20 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 [ { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "github.com/dustinkirkland/golang-petname"; fetch = { type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + url = "https://github.com/dustinkirkland/golang-petname"; + rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14"; + sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di"; }; } { @@ -22,44 +14,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v2"; - rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; - sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a622679ebd7a3b813862379232f645f8e690e43f"; - sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; - }; - } - { - goPackagePath = "github.com/syndtr/gocapability"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/gocapability"; - rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"; - sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"; - }; - } - { - goPackagePath = "gopkg.in/inconshreveable/log15.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/inconshreveable/log15.v2"; - rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; - sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; + rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef"; + sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; }; } { @@ -67,8 +23,35 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5"; - sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"; + rev = "599cba5e7b6137d46ddf58fb1765f5d928e69604"; + sha256 = "0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; + sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "ded68f7a9561c023e790de24279db7ebf473ea80"; + sha256 = "0q019h59jq815jfl9rgk4yrpkn5rpcx9s6dksdm48rp1abafwvfc"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "cf7286f069c3ef596efcc87781a4653a2e7607bd"; + sha256 = "19ipf6bf1xd7w2fm8dnv5my4jp3lhwhlrhfwhwq559amp1h4nwyq"; }; } { @@ -76,8 +59,35 @@ fetch = { type = "git"; url = "https://github.com/pborman/uuid"; - rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; - sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + rev = "1b00554d822231195d1babd97ff4a781231955c9"; + sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan"; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gocapability"; + rev = "e7cb7fa329f456b3855136a2642b197bad7366ba"; + sha256 = "1i65kyjhbaya45zj9zqkb17plbqf92sfvl9fcz9s9qslg0qab2i1"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3543873453996aaab2fc6b3928a35fc5ca2b5afb"; + sha256 = "1d7pjqzh5893mzkz60bv5ypmr9zgyvb9z2gvcjrsqniwcqlhbk2c"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344"; + sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv"; }; } { @@ -90,21 +100,12 @@ }; } { - goPackagePath = "github.com/olekukonko/tablewriter"; + goPackagePath = "gopkg.in/inconshreveable/log15.v2"; fetch = { type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; - sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + url = "https://gopkg.in/inconshreveable/log15.v2"; + rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; + sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; }; } { @@ -112,62 +113,53 @@ fetch = { type = "git"; url = "https://gopkg.in/lxc/go-lxc.v2"; - rev = "8f9e220b36393c03854c2d224c5a55644b13e205"; - sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"; + rev = "8304875cc3423823032ec93556beee076c6ba687"; + sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk"; }; } { - goPackagePath = "github.com/mattn/go-runewidth"; + goPackagePath = "gopkg.in/tomb.v2"; fetch = { type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + url = "https://gopkg.in/tomb.v2"; + rev = "d5d1b5820637886def9eef33e03a27a9f166942c"; + sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"; }; } { - goPackagePath = "github.com/coreos/go-systemd"; + goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; - sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + url = "https://gopkg.in/yaml.v2"; + rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; + sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; }; } { - goPackagePath = "github.com/dustinkirkland/golang-petname"; - fetch = { - type = "git"; - url = "https://github.com/dustinkirkland/golang-petname"; - rev = "2182cecef7f257230fc998bc351a08a5505f5e6c"; - sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"; - }; + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; + sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; + }; } { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd"; - sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"; - }; + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb"; + sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g"; + }; } { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; - sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; - }; - } - { - goPackagePath = "github.com/gosexy/gettext"; - fetch = { - type = "git"; - url = "https://github.com/gosexy/gettext"; - rev = "305f360aee30243660f32600b87c3c1eaa947187"; - sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"; - }; + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; + sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; + }; } ] diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 786e3f64cda1..7fdef68f30f7 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchurl, python2Packages, openssl, + stdenv, python2Packages, openssl, # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. @@ -7,12 +7,13 @@ }: python2Packages.buildPythonApplication rec { - name = "salt-${version}"; - version = "2016.11.2"; + pname = "salt"; + version = "2016.11.5"; + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/s/salt/${name}.tar.gz"; - sha256 = "0hrss5x47cr7ffyjl8jlkhf9j88lqvg7c33rjc5bimck8b7x7hzm"; + src = python2Packages.fetchPypi { + inherit pname version; + sha256 = "1gpq6s87vy782z4b5h6s7zwndcxnllbdr2wldxr9hyp4lfj2f55q"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index b3707a4f4da0..0dca16b75025 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -2,19 +2,14 @@ pythonPackages.buildPythonApplication rec { pname = "simp_le-client"; - version = "0.1.1"; + version = "0.2.0"; name = "${pname}-${version}"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "18y8mg0s0i2bs57pi6mbkwgjlr5mmivchiyvrpcbdmkg9qlbfwaa"; + sha256 = "1zg18jfry9mvkri3yd2f5mwfsl27ac9zmnll3bm93jb91jhd6ssh"; }; - prePatch = '' - substituteInPlace setup.py \ - --replace 'acme>=0.9,<0.10' acme - ''; - checkPhase = '' $out/bin/simp_le --test ''; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 60d2b2bcd111..3df01dccced8 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchFromGitHub, xorg -, autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config -, fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext -, cmake, libjpeg_turbo, fltk, nettle, libiconv, libtasn1 -}: +{ stdenv, fetchFromGitHub +, xorg, xkeyboard_config, zlib +, libjpeg_turbo, pixman, fltk +, fontDirectories +, cmake, gettext, libtool +, glproto, mesa_glu +, gnutls, pam, nettle +, xterm }: with stdenv.lib; stdenv.mkDerivation rec { - version = "1.8.0pre20170211"; + version = "1.8.0pre20170419"; name = "tigervnc-${version}"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; - sha256 = "10bs6394ya953gmak8g2d3n133vyfrryq9zq6dc27g8s6lw0mrbh"; - rev = "b6c46a1a99a402d5d17b1afafc4784ce0958d6ec"; + sha256 = "1y3fn7dwlkm7ilqn8bwyqj3bw7s7clnv7d4jml4wyvfihzz9j90b"; + rev = "v1.7.90"; }; inherit fontDirectories; patchPhase = '' - sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do for j in $(find $i -name fonts.dir); do @@ -67,27 +69,23 @@ stdenv.mkDerivation rec { make TIGERVNC_SRCDIR=`pwd`/../.. install popd rm -f $out/lib/xorg/protocol.txt + + wrapProgram $out/bin/vncserver \ + --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot ]) } ''; - crossAttrs = { - buildInputs = (map (x : x.crossDrv) (buildInputs ++ [ - xorg.fixesproto xorg.damageproto xorg.xcmiscproto xorg.bigreqsproto xorg.randrproto xorg.renderproto - xorg.fontsproto xorg.videoproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.libxkbfile xorg.libXfont xorg.libpciaccess xorg.xineramaproto - ])); - }; + buildInputs = with xorg; [ + libjpeg_turbo fltk pixman + gnutls pam nettle + fixesproto damageproto compositeproto randrproto + xcmiscproto bigreqsproto randrproto renderproto + fontsproto videoproto scrnsaverproto resourceproto presentproto + utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft + libxkbfile libXfont2 libpciaccess xineramaproto + glproto mesa_glu + ] ++ xorgserver.buildInputs; - buildInputs = - [ xorg.libX11 xorg.libXext gettext xorg.libICE xorg.libXtst xorg.libXi xorg.libSM xorg.libXft - nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xorg.xineramaproto - xorg.libXinerama xorg.libXcursor nettle libiconv libtasn1 - ]; - - nativeBuildInputs = - [ autoconf automake cvs xorg.utilmacros xorg.fontutil libtool flex bison - cmake gettext - ] - ++ xorg.xorgserver.nativeBuildInputs; + nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs; diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index 83a73eb388f8..d75b50bca1af 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "dar-2.5.3"; + name = "dar-2.5.9"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0myakyfgv2mhazwvbbwwncn9j7c9b4g3szs0aqlclmp01naaqmj5"; + sha256 = "0bm91d82amh5h2sla2ngbpxd0l64alcdjhxz35bhj3cpz9562wv9"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ]; + ++ optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-dar-static" ]; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dar.linux.free.fr/; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 2b61b5b2679f..3550b7d7de36 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -10,12 +10,21 @@ 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"; }) ]; + # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional + postPatch = '' + sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits + + # I think this is a typo and should be CXX? Either way let's kill it + sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits + ''; + preConfigure = '' makeFlagsArray=(DEST_HOME=$out) buildFlags=all3 diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 41043cda5b65..77ab8a1cb033 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchurl, gettext, coreutils }: stdenv.mkDerivation rec { - name = "sharutils-4.11.1"; + name = "sharutils-4.15.2"; src = fetchurl { - url = "mirror://gnu/sharutils/${name}.tar.bz2"; - sha256 = "1mallg1gprimlggdisfzdmh1xi676jsfdlfyvanlcw72ny8fsj3g"; + url = "mirror://gnu/sharutils/${name}.tar.xz"; + sha256 = "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"; }; hardeningDisable = [ "format" ]; - preConfigure = '' - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in sharutils is updated. - sed -i ${stdenv.lib.optionalString (stdenv.isOpenBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h - ''; - # GNU Gettext is needed on non-GNU platforms. - buildInputs = [ gettext coreutils ]; + buildInputs = [ coreutils gettext ]; doCheck = true; @@ -25,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ]; }; - meta = { + meta = with stdenv.lib; { description = "Tools for remote synchronization and `shell archives'"; longDescription = '' GNU shar makes so-called shell archives out of many files, preparing @@ -44,8 +38,8 @@ stdenv.mkDerivation rec { concatenated shell archives. ''; homepage = http://www.gnu.org/software/sharutils/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainers.ndowens ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 0086891da299..a1454229a1c8 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 b9fa760c019b..a35e473ec366 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 000000000000..15dbbfe4c533 --- /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/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 145b81c95bc8..3c841aa621fe 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 499bccaa425b..5e63c7cfaabf 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -1,7 +1,10 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip +, buildPlatform, hostPlatform +}: + let - s = # Generated upstream information - rec { + # Generated upstream information + s = rec { baseName="zpaqd"; version="715"; name="${baseName}-${version}"; @@ -9,15 +12,12 @@ let url="http://mattmahoney.net/dc/zpaqd715.zip"; sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; }; - isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; - isx86 = stdenv.isi686 || stdenv.isx86_64; - compileFlags = with stdenv; "" - + (lib.optionalString (isUnix) " -Dunix -pthread") - + (lib.optionalString (isi686) " -march=i686") - + (lib.optionalString (isx86_64) " -march=nocona") - + (lib.optionalString (!isx86) " -DNOJIT") - + " -O3 -mtune=generic -DNDEBUG" - ; + + compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-mtune=generic" "-DNDEBUG" ] + ++ stdenv.lib.optional (hostPlatform.isUnix) "-Dunix -pthread" + ++ stdenv.lib.optional (hostPlatform.isi686) "-march=i686" + ++ stdenv.lib.optional (hostPlatform.isx86_64) "-march=nocona" + ++ stdenv.lib.optional (!hostPlatform.isx86) "-DNOJIT"); in stdenv.mkDerivation { inherit (s) name version; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 69f0d89e7f85..ff033e62a8b6 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, glibcLocales +{ stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins , pythonPackages, imagemagick, gobjectIntrospection, gst_all_1 , enableAcousticbrainz ? true @@ -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.requests2 + 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! @@ -158,20 +165,13 @@ in pythonPackages.buildPythonApplication rec { doCheck = true; preCheck = '' - (${concatMapStrings (s: "echo \"${s}\";") allPlugins}) \ - | sort -u > plugins_defined find beetsplug -mindepth 1 \ \! -path 'beetsplug/__init__.py' -a \ \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \ | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \ | sort -u > plugins_available - if ! mismatches="$(diff -y plugins_defined plugins_available)"; then - echo "The the list of defined plugins (left side) doesn't match" \ - "the list of available plugins (right side):" >&2 - echo "$mismatches" >&2 - exit 1 - fi + ${diffPlugins allPlugins "plugins_available"} ''; checkPhase = '' diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index bb2df52f84c5..3cfb9a05b2dc 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig , libjack2, alsaLib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix new file mode 100644 index 000000000000..6524bedf9392 --- /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/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix new file mode 100644 index 000000000000..e98667b8c04a --- /dev/null +++ b/pkgs/tools/audio/glyr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake +, curl, glib, sqlite, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.0.10"; + name = "glyr-${version}"; + + src = fetchFromGitHub { + owner = "sahib"; + repo = "glyr"; + rev = "${version}"; + sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ sqlite glib curl ]; + + configurePhase = '' + cmake -DCMAKE_INSTALL_PREFIX=$out + ''; + + meta = with stdenv.lib; { + license = licenses.lgpl3; + description = "A music related metadata searchengine"; + homepage = https://github.com/sahib/glyr; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; # TODO macOS would be possible + }; +} + + diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 9378585d8b2f..fd9cf2bacbfa 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mpDris2"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz"; - sha256 = "0zdmamj2ldhr6y3s464w8y2x3yizda784jnlrg3j3myfabssisvz"; + sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21"; }; preConfigure = '' diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 9827cc472430..385021b7354a 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pnmixer-${version}"; - version = "0.7.1-rc1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; rev = "v${version}"; - sha256 = "0ns7s1jsc7fc3fvs9m3xwbv1fk1410cqc5w1cmia1mlzy94r3r6p"; + sha256 = "0mmrq4m2rk0wmkfmqs3fk2rnw5g5lvd7ill2s3d7ggf9vba1pcn2"; }; nativeBuildInputs = [ cmake pkgconfig gettext ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/nicklan/pnmixer; - description = "ALSA mixer for the system tray"; + description = "ALSA volume mixer for the system tray"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ campadrenalin romildo ]; diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 3456f0986488..d86a0b09c269 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, cmake, alsaLib, udev, qtbase, - qtsvg, qttools, makeQtWrapper }: +{ mkDerivation, lib, fetchurl, cmake, alsaLib, udev, qtbase, qtsvg, qttools }: let version = "0.21.0"; in -stdenv.mkDerivation { +mkDerivation { name = "qastools-${version}"; src = fetchurl { @@ -14,15 +13,15 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake alsaLib udev qtbase qtsvg qttools makeQtWrapper + alsaLib udev qtbase qtsvg qttools ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DCMAKE_INSALL_PREFIX=$out" "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix index d5f47f9a6c0d..472b4a6508f2 100644 --- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix +++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix @@ -11,8 +11,12 @@ python2Packages.buildPythonApplication rec { sha256 = "1k5z8kda9v6klr4536pf5qbq9zklxvyysv7nc48gllschl09jywc"; }; + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "'argparse'," "" + ''; + propagatedBuildInputs = with python2Packages; [ - argparse boto dateutil prettytable diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index d4e8634039a9..abfccb97641c 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -1,6 +1,32 @@ -{ stdenv, fetchzip, python3Packages, openssl, acl }: +{ stdenv, fetchzip, python3Packages, openssl, acl, fetchurl, pkgconfig, fuse, attr, which }: -python3Packages.buildPythonApplication rec { +let + + # Old version needed for attic (backup program) due to breaking change in + # llfuse >= 0.42. + llfuse-0-41 = python3Packages.buildPythonPackage rec { + name = "llfuse-0.41.1"; + src = fetchurl { + url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; + }; + buildInputs = with python3Packages; [ pytest pkgconfig fuse attr which ]; + propagatedBuildInputs = with python3Packages; [ contextlib2 ]; + checkPhase = '' + py.test + ''; + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' + doCheck = false; + meta = { + description = "Python bindings for the low-level FUSE API"; + homepage = https://code.google.com/p/python-llfuse/; + license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + }; + }; + +in python3Packages.buildPythonApplication rec { name = "attic-${version}"; version = "0.16"; namePrefix = ""; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 476c42504a26..dcea9c9435b9 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.0.10"; + version = "1.0.11"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp"; + sha256 = "14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 4e035ab67acb..ae8752aa7c12 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, fetchurl, makeWrapper , perl, pandoc, python2Packages, git -, par2cmdline ? null, par2Support ? false +, par2cmdline ? null, par2Support ? true }: assert par2Support -> par2cmdline != null; -let version = "0.28.1"; in +let version = "0.29.1"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { repo = "bup"; owner = "bup"; rev = version; - sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; + sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf"; }; buildInputs = [ git python2Packages.python ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { Capable of doing *fast* incremental backups of virtual machine images. ''; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ muflax ]; }; } 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 bff46992d8b4..000000000000 --- 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 fe57202bc34a..000000000000 --- 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 fe57202bc34a..000000000000 --- 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 eb4240d33c6a..783a0796e91b 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/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index b08bb0768f2c..313167b1ae27 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,37 +1,43 @@ -{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper -}: +{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper }: -let - version = "0.7.07.1"; -in python2Packages.buildPythonApplication { +python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; + version = "0.7.12"; src = fetchurl { - url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8"; + url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/${name}.tar.gz"; + sha256 = "1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi"; }; + buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; + propagatedBuildInputs = with python2Packages; [ + boto cffi cryptography ecdsa enum idna + ipaddress lockfile paramiko pyasn1 pycrypto six + ]; + checkInputs = with python2Packages; [ lockfile mock pexpect ]; + + # lots of tests are failing, although we get a little further now with the bits in preCheck + doCheck = false; + postInstall = '' wrapProgram $out/bin/duplicity \ --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" + + wrapPythonPrograms ''; - buildInputs = [ librsync makeWrapper ]; + preCheck = '' + patchShebangs testing - # Inputs for tests. These are added to buildInputs when doCheck = true - checkInputs = with python2Packages; [ lockfile mock pexpect ]; + substituteInPlace testing/__init__.py \ + --replace 'mkdir testfiles' 'mkdir -p testfiles' + ''; - # Many problematic tests - doCheck = false; - - propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna - ipaddress lockfile paramiko pyasn1 pycrypto six ]; - - meta = { + meta = with stdenv.lib; { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; - homepage = "http://www.nongnu.org/duplicity"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric peti]; - platforms = stdenv.lib.platforms.unix; + homepage = http://www.nongnu.org/duplicity; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric peti ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix new file mode 100644 index 000000000000..8f918dda59be --- /dev/null +++ b/pkgs/tools/backup/restic/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "restic-${version}"; + version = "0.7.0"; + + goPackagePath = "github.com/restic/restic"; + + src = fetchFromGitHub { + owner = "restic"; + repo = "restic"; + rev = "v${version}"; + sha256 = "1whzzma2c199i604qy1a807zhi8qgri1r9bbxl5l7wlfh7x0n6sd"; + }; + + buildPhase = '' + cd go/src/${goPackagePath} + go run build.go + ''; + + installPhase = '' + mkdir -p $bin/bin/ + cp restic $bin/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://restic.github.io; + description = "A backup program that is fast, efficient and secure"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.mbrgm ]; + }; +} diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 9b2adc1d39f9..05bf38613efd 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,17 +1,29 @@ -{ stdenv, fetchurl, python3Packages, sqlite }: +{ stdenv, fetchurl, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "s3ql"; - version = "2.17.1"; + version = "2.21"; src = fetchurl { url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2"; - sha256 = "049vpvvkyia7v4v97rg2l01n43shrdxc1ik38bmjb2q4fvsh1pgx"; + sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d"; }; - propagatedBuildInputs = with python3Packages; - [ sqlite apsw pycrypto requests2 defusedxml dugong llfuse ]; + buildInputs = [ which ]; # tests will fail without which + propagatedBuildInputs = with python3Packages; [ + sqlite apsw pycrypto requests defusedxml dugong llfuse + cython pytest pytest-catchlog + ]; + + preBuild = '' + # https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851 + ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace + ''; + + checkPhase = '' + pytest tests + ''; meta = with stdenv.lib; { description = "A full-featured file system for online data storage"; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 0f95a26c9401..9fca48bde1bb 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 000000000000..54d85343e2da --- /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 000000000000..5fd36b14a133 --- /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/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 311df9086890..cacfb8287a33 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let - version = "0.15.7"; - checksum = "1xb94kxfq9sm3g0s6wpyyz6h2aihgca5gyybg0a5r8sar7yz97j0"; + version = "0.17.0"; + checksum = "0cncwkiw0w2am7gwi01p6ln87zgg1x6blfyxx7n7x8m1mv6704hl"; in stdenv.mkDerivation rec { name = "znapzend-${version}"; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 508fc7810690..db0c2c26d3c9 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 -, obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp -, hicolor_icon_theme, librsvg +, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp +, hicolor_icon_theme, librsvg, wrapGAppsHook , withPulseAudio ? true, libpulseaudio }: let @@ -9,16 +9,15 @@ let in stdenv.mkDerivation rec { name = "blueman-${version}"; version = "2.0.4"; - + src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; }; - nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ]; + nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg - gsettings_desktop_schemas hicolor_icon_theme ] + buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; @@ -28,17 +27,14 @@ in stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ]; - propagatedUserEnvPkgs = [ obex_data_server dconf ]; + propagatedUserEnvPkgs = [ obex_data_server ]; configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ]; - postFixup = '' - makeWrapperArgs="\ - --prefix PATH ':' ${binPath} \ - --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ - --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" - wrapPythonPrograms + preFixup = '' + makeWrapperArgs="--prefix PATH ':' ${binPath}" + wrapPythonProgramsIn "$out/bin" "$pythonPath" + wrapPythonProgramsIn "$out/libexec" "$pythonPath" ''; meta = with lib; { diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index 4640e3c4a615..47aaadc9ccf0 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -1,23 +1,25 @@ -{ stdenv, autoconf, automake, glib, pkgconfig, readline, fetchgit }: +{ stdenv, autoreconfHook, readline +, fetchFromGitHub, glib, pkgconfig }: stdenv.mkDerivation rec { - date = "2015-09-10"; + date = "2016-12-12"; name = "bluez-tools-${date}"; - rev = "193ad6bb3db"; + rev = "97efd29"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/khvzak/bluez-tools.git"; - sha256 = "0ylk10gfqlwmiz1k355axdhraixc9zym9f87xhag23934x64m8wa"; + owner = "khvzak"; + repo = "bluez-tools"; + sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6"; }; - preConfigure = '' - ./autogen.sh - ''; - buildInputs = [ stdenv autoconf automake glib pkgconfig readline ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + + buildInputs = [ readline glib ]; meta = with stdenv.lib; { description = "Command line bluetooth manager for Bluez5"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; maintainers = [ maintainers.dasuxullebt ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index ecc6bec3005d..74ea097d2f30 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -139,6 +139,7 @@ EOF homepage = http://refind.sourceforge.net/; maintainers = [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 7d4a341f555e..14076a757f49 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} \ + --set QT_X11_NO_MITSHM 1 ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 5737f1eca15f..23acf7446b17 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -1,31 +1,26 @@ -{stdenv, fetchurl, zlib}: -let - s = # Generated upstream information - rec { - baseName="advancecomp"; - version="1.19"; - name="${baseName}-${version}"; - url="http://prdownloads.sourceforge.net/advancemame/advancecomp-1.19.tar.gz?download"; - sha256="0irhmwcn9r4jc29442skqr1f3lafiaahxc3m3ybalmm37l6cb56m"; +{ stdenv, fetchFromGitHub +, autoreconfHook, zlib }: + +stdenv.mkDerivation rec { + name = "advancecomp-${version}"; + version = "1.23"; + + src = fetchFromGitHub { + owner = "amadvance"; + repo = "advancecomp"; + rev = "v${version}"; + sha256 = "1mrgmpjd9f7x16g847h1588mgryl26hlzfl40bc611259bb0bq7w"; }; - buildInputs = [ - zlib - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - meta = { - inherit (s) version; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { description = ''A set of tools to optimize deflate-compressed files''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - updateWalker = true; - homepage = "http://advancemame.sourceforge.net/comp-readme.html"; - downloadPage = "http://advancemame.sourceforge.net/comp-download.html"; + license = licenses.gpl3 ; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + homepage = https://github.com/amadvance/advancecomp; + }; } diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 921802166718..c900cfa79f78 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,17 +4,21 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "0wjypkzhbv30x30j2z8ba45r6nm4k98hsa4i42kqx03vzarsr2l4"; + sha256 = "1wapq5hzflbmrcqgz92iv79rm893bskh03kvqgnn33dzbz3slavs"; }; buildInputs = [ cmake ]; + # This breaks on Darwin because our cmake hook tries to make a build folder + # and the wonderful bazel BUILD file is already there (yay case-insensitivty?) + prePatch = "rm BUILD"; + meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 5a27d336c291..cb7dc65c710d 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/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index f270d29a694f..64a9ad7f6562 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.isc; homepage = http://fragglet.github.io/lhasa; maintainers = with stdenv.lib; [ maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index fca1a433ff33..0bf155807980 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lzfse-${version}"; - version = "2016-06-21"; + version = "2017-03-08"; src = fetchFromGitHub { owner = "lzfse"; repo = "lzfse"; - rev = "45912281e3945a09c6ebfa8c6629f6906a99fc29"; - sha256 = "1wbh3x874fjn548g1hw4bm7lkk60vlvy8ph0wsjkzcx8873hwj7h"; + rev = "88e2d27"; + sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"; }; makeFlags = [ "INSTALL_PREFIX=$(out)" ]; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index a800a19e12b9..17bc24ab5995 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "lzip-1.17"; + name = "lzip-${version}"; + version = "1.19"; buildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${name}.tar.gz"; - sha256 = "0lh3x964jjldx3piax6c2qzlhfiir5i6rnrcn8ri44rk19g8ahwl"; + sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz"; }; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix new file mode 100644 index 000000000000..29402b1bf79d --- /dev/null +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, python3, pylz4}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "mozlz4a"; + version = "2015-07-24"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5/raw/2483756c55ed34be565aea269f05bd5eeb6b0a33/mozlz4a.py"; + sha256 = "1y52zqkdyfacl2hr5adkjphgqfyfylp8ksrkh165bq48zlbf00s8"; + }; + + unpackPhase = "true;"; + + installPhase = '' + mkdir -p "$out/bin" "$out/${python3.sitePackages}/" + cp "${src}" "$out/${python3.sitePackages}/mozlz4a.py" + + echo "#!${stdenv.shell}" >> "$out/bin/mozlz4a" + echo "export PYTHONPATH='$PYTHONPATH'" >> "$out/bin/mozlz4a" + echo "'${python3}/bin/python' '$out/${python3.sitePackages}/mozlz4a.py' \"\$@\"" >> "$out/bin/mozlz4a" + chmod a+x "$out/bin/mozlz4a" + ''; + + buildInputs = [ pylz4 python3 ]; + + meta = { + inherit version; + description = "A script to handle Mozilla's mozlz4 files"; + license = stdenv.lib.licenses.bsd2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; + }; +} diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index b5e7f6652de5..8c9f74330581 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,33 +1,26 @@ -{stdenv, fetchurl, ucl, zlib}: +{stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl}: -stdenv.mkDerivation { - name = "upx-3.91"; +stdenv.mkDerivation rec { + name = "upx-${version}"; + version = "3.94"; src = fetchurl { - url = mirror://sourceforge/upx/upx-3.91-src.tar.bz2; - sha256 = "0g3aiinlcb37z1xhs202h2qrgbf8dygiyarmflbgahcq89byfz2j"; + url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz"; + sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1"; }; - buildInputs = [ ucl zlib ]; - - lzmaSrc = fetchurl { - url = mirror://sourceforge/sevenzip/lzma443.tar.bz2; - sha256 = "1ck4z81y6xv1x9ky8abqn3mj9xj2dwg41bmd5j431xgi8crgd1ds"; - }; + buildInputs = [ ucl zlib perl ]; preConfigure = " export UPX_UCLDIR=${ucl} - mkdir lzma443 - pushd lzma443 - tar xf $lzmaSrc - popd - export UPX_LZMADIR=`pwd`/lzma443 cd src "; + makeFlags = [ "CHECK_WHITESPACE=true" ]; + installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; meta = { - homepage = http://upx.sourceforge.net/; + homepage = https://upx.github.io/; description = "The Ultimate Packer for eXecutables"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 3092bd840c4f..55ab89993c7c 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xz-5.2.2"; + name = "xz-5.2.3"; src = fetchurl { url = "http://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg"; + sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index dba6e6fc3376..fb9301bf1ced 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, gnugrep , legacySupport ? false }: stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.1.3"; + version = "1.3.0"; src = fetchFromGitHub { - sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5"; + sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; + preInstall = '' + substituteInPlace programs/zstdgrep \ + --replace "=grep" "=${gnugrep}/bin/grep" \ + --replace "=zstdcat" "=$out/bin/zstdcat" + + substituteInPlace programs/zstdless \ + --replace "zstdcat" "$out/bin/zstdcat" + ''; + meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' @@ -40,6 +49,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx orivej ]; }; } diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix new file mode 100644 index 000000000000..5cf88e68c64b --- /dev/null +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, zstd, lz4 }: + +stdenv.mkDerivation rec { + name = "zstdmt-${version}"; + version = "0.3"; + + src = fetchFromGitHub { + sha256 = "17i44kjc612sbs7diim9ih007zp7z9zs3q3yacd6dzlqya5vsp0w"; + rev = "v${version}"; + repo = "zstdmt"; + owner = "mcmilk"; + }; + + sourceRoot = "zstdmt-v${version}-src/unix"; + + buildInputs = [ + zstd lz4 + ]; + + makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ]; + + installPhase = '' + mkdir -p $out/bin/ + mv zstdmt lz4mt $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Multithreading Library for LZ4, LZ5 and ZStandard"; + homepage = https://github.com/mcmilk/zstdmt; + license = with licenses; [ bsd2 ]; + + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 288cd14c16bb..1eedff5c011e 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, utillinux }: +{ stdenv, fetchurl, pkgconfig, utillinux, bash }: stdenv.mkDerivation rec { name = "bcache-tools-${version}"; version = "1.0.7"; src = fetchurl { + name = "${name}.tar.gz"; url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { preBuild = '' export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\""; + sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules ''; preInstall = '' diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix new file mode 100644 index 000000000000..42fe0b7ce342 --- /dev/null +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }: + +stdenv.mkDerivation rec { + name = "bcachefs-tools-unstable-2016-05-13"; + + src = fetchgit { + url = "https://evilpiepirate.org/git/bcachefs-tools.git"; + rev = "565b4a74d6c25c78b0d2b82d9529595fc6269308"; + sha256 = "1wnis26hq67vxqkxzck6wm6caq4c1rfmy9blmmgkzlhdd2nzisbx"; + }; + + buildInputs = [ pkgconfig attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; + + preConfigure = '' + substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.glibc.dev}/include/dirent.h + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Tool for managing bcachefs filesystems"; + homepage = "http://bcachefs.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ davidak ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch deleted file mode 100644 index e4903143f11c..000000000000 --- a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch +++ /dev/null @@ -1,157 +0,0 @@ -Copyright 2009-2016 Homebrew contributors. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -# Changes included in this patchset: -# 1) Explicitly use clang/clang++ in Makefile -# 2) __min() and __max() macros break bon_csv2html.cpp: "redefinition of 'min' as different kind of symbol" -# Remove the construct in favor of macro targets min()/max() provided by the library -# Files affected: port.h.in port.h duration.cpp bonnie++.cpp -# 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of -# splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place. -# The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked. -# Files affected: bonnie++.cp - -diff --git i/Makefile w/Makefile -index 4bb5103..8f7ed41 100644 ---- i/Makefile -+++ w/Makefile -@@ -10,8 +10,8 @@ eprefix=${prefix} - #MORE_WARNINGS=-Weffc++ - WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) - CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS) --CXX=g++ $(CFLAGS) --LINK=g++ -+CXX=clang++ $(CFLAGS) -+LINK=clang++ - THREAD_LFLAGS=-lpthread - - INSTALL=/usr/bin/install -c -diff --git i/bonnie++.cpp w/bonnie++.cpp -index 8c5a43a..8a4b3dc 100644 ---- i/bonnie++.cpp -+++ w/bonnie++.cpp -@@ -73,7 +73,7 @@ public: - void set_io_chunk_size(int size) - { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; } - void set_file_chunk_size(int size) -- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } -+ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } - - // Return the page-aligned version of the local buffer - char *buf() { return m_buf_pa; } -@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFlag) - , m_buf(NULL) - , m_buf_pa(NULL) - { -- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); -+ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); - SetName("."); - } - -@@ -294,11 +294,7 @@ int main(int argc, char *argv[]) - { - char *sbuf = _strdup(optarg); - char *size = strtok(sbuf, ":"); --#ifdef _LARGEFILE64_SOURCE - file_size = size_from_str(size, "gt"); --#else -- file_size = size_from_str(size, "g"); --#endif - size = strtok(NULL, ""); - if(size) - { -@@ -384,17 +380,8 @@ int main(int argc, char *argv[]) - if(file_size % 1024 > 512) - file_size = file_size + 1024 - (file_size % 1024); - } --#ifndef _LARGEFILE64_SOURCE -- if(file_size == 2048) -- file_size = 2047; -- if(file_size > 2048) -- { -- fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size); -- usage(); -- } --#endif -- globals.byte_io_size = __min(file_size, globals.byte_io_size); -- globals.byte_io_size = __max(0, globals.byte_io_size); -+ globals.byte_io_size = min(file_size, globals.byte_io_size); -+ globals.byte_io_size = max(0, globals.byte_io_size); - - if(machine == NULL) - { -@@ -465,14 +452,6 @@ int main(int argc, char *argv[]) - && (directory_max_size < directory_min_size || directory_max_size < 0 - || directory_min_size < 0) ) - usage(); --#ifndef _LARGEFILE64_SOURCE -- if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) ) -- { -- fprintf(stderr -- , "The small chunk size and large IO size make this test impossible in 32bit.\n"); -- usage(); -- } --#endif - if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) ) - { - fprintf(stderr -diff --git i/duration.cpp w/duration.cpp -index efa3fd3..f943155 100644 ---- i/duration.cpp -+++ w/duration.cpp -@@ -38,7 +38,7 @@ double Duration_Base::stop() - getTime(&tv); - double ret; - ret = tv - m_start; -- m_max = __max(m_max, ret); -+ m_max = max(m_max, ret); - return ret; - } - -diff --git i/port.h w/port.h -index 8d53622..2e1f112 100644 ---- i/port.h -+++ w/port.h -@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; - #endif - - typedef int FILE_TYPE; --#define __min min --#define __max max - typedef unsigned int UINT; - typedef unsigned long ULONG; - typedef const char * PCCHAR; -diff --git i/port.h.in w/port.h.in -index 69c8f24..8359d72 100644 ---- i/port.h.in -+++ w/port.h.in -@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; - #endif - - typedef int FILE_TYPE; --#define __min min --#define __max max - typedef unsigned int UINT; - typedef unsigned long ULONG; - typedef const char * PCCHAR; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index fb25446d2e31..c120073866d4 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "bonnie++-1.97"; +stdenv.mkDerivation rec { + name = "bonnie++-1.97.3"; src = fetchurl { - url = http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.tgz; - sha256 = "10jrqgvacvblyqv38pg5jb9jspyisxaladcrp8k6b2k46xcs1xa4"; + url = "http://www.coker.com.au/bonnie++/experimental/${name}.tgz"; + sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch; - enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 525aa2fec28a..d9b01eb5239f 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/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index d21d790dac81..0af97dd3b540 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -4,7 +4,7 @@ # Optional Dependencies , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null -, curl ? null, fuse ? null, accelio ? null, libibverbs ? null, librdmacm ? null +, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null , rocksdb ? null, libs3 ? null @@ -31,11 +31,10 @@ with stdenv; with stdenv.lib; let inherit (python2Packages) python; - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}" - + "${if val != null && cond != false then "=${val}" else ""}"; - + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; @@ -51,7 +50,6 @@ let optExpat = shouldUsePkg expat; optCurl = shouldUsePkg curl; optFuse = shouldUsePkg fuse; - optAccelio = shouldUsePkg accelio; optLibibverbs = shouldUsePkg libibverbs; optLibrdmacm = shouldUsePkg librdmacm; optLibedit = shouldUsePkg libedit; @@ -77,10 +75,6 @@ let hasOsd = hasServer; hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; - hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && - versionAtLeast version "9.0.3" && - optAccelio != null && optLibibverbs != null && optLibrdmacm != null; - hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null; # TODO: Reenable when kinetic support is fixed @@ -129,8 +123,6 @@ stdenv.mkDerivation { optSnappy optLeveldb ] ++ optionals hasRadosgw [ optFcgi optExpat optCurl optFuse optLibedit - ] ++ optionals hasXio [ - optAccelio optLibibverbs optLibrdmacm ] ++ optionals hasRocksdb [ optRocksdb ] ++ optionals hasKinetic [ @@ -193,7 +185,6 @@ stdenv.mkDerivation { (mkWith (malloc == optGperftools) "tcmalloc" null) (mkEnable false "pgrefdebugging" null) (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) (mkWith (optLibatomic_ops != null) "libatomic-ops" null) (mkWith true "ocf" null) (mkWith hasKinetic "kinetic" null) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 76df4f41257b..2eeb2003a194 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }: stdenv.mkDerivation rec { name = "dosfstools-${version}"; - version = "3.0.28"; + version = "4.1"; src = fetchFromGitHub { owner = "dosfstools"; repo = "dosfstools"; rev = "v${version}"; - sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2"; + sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1"; }; - makeFlags = "PREFIX=$(out)"; + nativeBuildInputs = [ autoreconfHook pkgconfig ] + ++ stdenv.lib.optional stdenv.isDarwin libiconv; + + configureFlags = [ "--enable-compat-symlinks" ]; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = http://www.daniel-baumann.ch/software/dosfstools/; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index acc3b5183fe1..d56c5e2ed9a7 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, autoreconfHook, libselinux, libuuid, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.7.0"; + version = "1.8.0"; - src = fetchurl { - url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz"; - sha256 = "1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; + rev = "refs/tags/v${version}"; + sha256 = "0mbpg6mng6jcm5vxq0ivhklgpkwvjbhjwgkhzxr50ln46h5kbd2f"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libselinux libuuid pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libselinux libuuid ]; meta = with stdenv.lib; { homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 06190a8f03da..086f0e0f790c 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -14,9 +14,9 @@ buildGoPackage rec { sha256 = "1lj9czippsgkhr8y3r7vwxgc8i952v76v1shdv10p43gsxwyyi9a"; }; - # TODO: add metadata https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes meta = { license = lib.licenses.asl20; + platforms = lib.platforms.linux; maintainers = []; homepage = https://cloud.google.com/storage/docs/gcs-fuse; description = diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 2f49d630c151..af76e429d31c 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,32 +1,91 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, - autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite - , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which + autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, + liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages, + openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, + rsync, glibc }: -let +let s = rec { baseName="glusterfs"; - version = "3.10.0"; + # NOTE: On each glusterfs release, it should be checked if gluster added + # new, or changed, Python scripts whose PYTHONPATH has to be set in + # `postFixup` below, and whose runtime deps need to go into + # `nativeBuildInputs`. + # The command + # find /nix/store/...-glusterfs-.../ -name '*.py' -executable + # can help with finding new Python scripts. + version = "3.10.2"; name="${baseName}-${version}"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.0/glusterfs-3.10.0.tar.gz"; - sha256 = "1svysq55z4sd6bxcdpkxljwis4cnzkknag22ngyr7sgb4bs19c97"; + url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; + sha256 = "09hpvw42sc77nc3bfv7395wjn7fxvp0n8qnmrlyxq83hf0w81gfs"; }; buildInputs = [ - fuse bison flex_2_5_35 openssl python2 ncurses readline + fuse bison flex_2_5_35 openssl ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 acl sqlite liburcu attr makeWrapper + (python2.withPackages (pkgs: [ + pkgs.flask + pkgs.prettytable + pkgs.requests + pkgs.xattr + ])) + # NOTE: `python2` has to be *AFTER* the above `python2.withPackages`, + # to ensure that the packages are available but the `toPythonPath` + # shell function used in `postFixup` is also still available. + python2 ]; # Some of the headers reference acl propagatedBuildInputs = [ acl ]; + # Packages from which GlusterFS calls binaries at run-time from PATH, + # with comments on which commands are known to be called by it. + runtimePATHdeps = [ + attr # getfattr setfattr + btrfs-progs # btrfs + coreutils # lots of commands in bash scripts + e2fsprogs # tune2fs + findutils # find + gawk # awk + glibc # getent + gnugrep # grep + gnused # sed + lvm2 # lvs + openssh # ssh + rsync # rsync, e.g. for geo-replication + systemd # systemctl + utillinux # mount umount + which # which + xfsprogs # xfs_info + ]; in stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs propagatedBuildInputs; - preConfigure = '' + postPatch = '' + sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am + ''; + + patches = [ + ./glusterfs-use-PATH-instead-of-hardcodes.patch + ./glusterfs-fix-unsubstituted-autoconf-macros.patch + ./glusterfs-python-remove-find_library.patch + ]; + + # Note that the VERSION file is something that is present in release tarballs + # but not in git tags (at least not as of writing in v3.10.1). + # That's why we have to create it. + # Without this, gluster (at least 3.10.1) will fail very late and cryptically, + # for example when setting up geo-replication, with a message like + # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. + # What happens here is that the gverify.sh script tries to compare the versions, + # but fails when the version is empty. + # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 + preConfigure = '' + echo "v${s.version}" > VERSION ./autogen.sh ''; @@ -36,18 +95,78 @@ rec { makeFlags = "DESTDIR=$(out)"; - preInstall = '' - substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out - substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out - substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out - substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out - substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out - ''; + enableParallelBuilding = true; postInstall = '' cp -r $out/$out/* $out rm -r $out/nix - wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}" + ''; + + postFixup = '' + # glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands. + # For example for `peer_georep-sshkey` key generation, so `$out/bin` is needed in the PATH. + # It also invokes bash scripts like `gverify.sh`. + # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly. + # We set up the paths for the main entry point executables. + + GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin" + GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs" + GLUSTER_LD_LIBRARY_PATH="$out/lib" + + wrapProgram $out/bin/glusterd --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + wrapProgram $out/bin/gluster --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + wrapProgram $out/sbin/mount.glusterfs --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + + # Set Python environment for the Python based utilities. + # It would be nice if there was a better way to do this, automatically for all of them. + # Also, this is brittle: If we forget a dependency or gluster adds a new one, things will break deep inside gluster. + # We should better try to get an explicit list of Python dependencies from gluster and ensure all of them are in the PYTHONPATH of all these python scripts. + # But at the time of writing (gluster 3.10), gluster only provides this in form of a gluster.spec file for RPM creation, + # and even that one is not complete (for example it doesn't mention the `flask` dependency). + + wrapProgram $out/bin/gluster-eventsapi --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + wrapProgram $out/bin/gluster-georep-sshkey --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + wrapProgram $out/bin/gluster-mountbroker --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + wrapProgram $out/bin/glusterfind --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + + # Note that we only wrap the symlinks in $out/bin, not the actual executable scripts in $out/libexec/glusterfs. + # This is because those scripts use `__file__` in their program logic + # (see https://github.com/gluster/glusterfs/blob/v3.10.1/extras/cliutils/cliutils.py#L116) + # which would break if we changed the file name (which is what `wrapProgram` does). + # Luckily, `libexec` scripts are never supposed to be invoked straight from PATH, + # instead they are invoked directly from `gluster` or `glusterd`, which is why it is + # sufficient to set PYTHONPATH for those executables. + + wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" + ''; + + doInstallCheck = true; + + # Below we run Python programs. That generates .pyc/.pyo files. + # By default they are indeterministic because such files contain time stamps + # (see https://nedbatchelder.com/blog/200804/the_structure_of_pyc_files.html). + # So we use the same environment variables as in + # https://github.com/NixOS/nixpkgs/blob/249b34aadca7038207492f29142a3456d0cecec3/pkgs/development/interpreters/python/mk-python-derivation.nix#L61 + # to make these files deterministic. + # A general solution to this problem might be brought by #25707. + DETERMINISTIC_BUILD = 1; + PYTHONHASHSEED = 0; + + installCheckPhase = '' + # Tests that the above programs work without import errors. + # For testing it manually in a shell you may want to substitute `$out` with `$(dirname $(readlink -f $(which gluster)))/../`. + $out/bin/glusterd --help + # $out/bin/gluster help # can't do this because even `gluster help` tries to write to `/var/log/glusterfs/cli.log` + $out/bin/gluster-eventsapi --help + $out/bin/gluster-georep-sshkey --help + $out/bin/gluster-mountbroker --help + $out/bin/glusterfind --help + # gfid_to_path.py doesn't accept --help, and it requires different arguments + # (a dir as single argument) than the usage prints when stdin is not a TTY. + # The `echo ""` is just so that stdin is not a TTY even if you try this line + # on a real TTY for testing purposes. + echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path) + $out/share/glusterfs/scripts/eventsdash.py --help ''; src = fetchurl { @@ -60,7 +179,7 @@ rec { maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; + platforms = with stdenv.lib.platforms; linux ++ freebsd; }; } diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch new file mode 100644 index 000000000000..de3c2fa9f62e --- /dev/null +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch @@ -0,0 +1,236 @@ +From b37e0222a6a60505868a6fbb8591608cdc4bba57 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Sat, 13 May 2017 15:33:27 +0200 +Subject: [PATCH] Revert "build/packaging: Debian and Ubuntu don't have + /usr/libexec". Fixes #1450588 + +This reverts commit 18509e436f8a728ef522f3e76e2f2dc30e1bd8ac. + +This fixes autoconf unsubstituted strings to appear in generated source code. +--- + cli/src/Makefile.am | 2 +- + configure.ac | 12 ++++++------ + events/src/Makefile.am | 8 ++++---- + extras/Makefile.am | 2 +- + geo-replication/src/Makefile.am | 8 ++++---- + geo-replication/syncdaemon/Makefile.am | 2 +- + tools/gfind_missing_files/Makefile.am | 4 ++-- + tools/glusterfind/Makefile.am | 4 ++-- + tools/glusterfind/src/Makefile.am | 2 +- + xlators/features/ganesha/src/Makefile.am | 2 +- + xlators/mgmt/glusterd/src/Makefile.am | 2 +- + 11 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am +index 5ef9389..f5b8d00 100644 +--- a/cli/src/Makefile.am ++++ b/cli/src/Makefile.am +@@ -18,7 +18,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ + -I$(top_builddir)/rpc/xdr/src\ + -DDATADIR=\"$(localstatedir)\" \ + -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ +- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ ++ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ + -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\ + $(XML_CPPFLAGS) + +diff --git a/configure.ac b/configure.ac +index c9742e2..0c3a386 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1056,24 +1056,24 @@ old_prefix=$prefix + if test "x$prefix" = xNONE; then + prefix=$ac_default_prefix + fi +-GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs" +-GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd" ++GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" ++GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" + prefix=$old_prefix + + ### Dirty hacky stuff to make LOCALSTATEDIR work + if test "x$prefix" = xNONE; then +- test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var ++ test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var + localstatedir=/var +- LOCALSTATEDIR=$localstatedir ++ LOCALSTATEDIR=$(eval echo ${localstatedir}) + else +- LOCALSTATEDIR=$localstatedir ++ LOCALSTATEDIR=$(eval echo ${localstatedir}) + fi + + old_prefix=$prefix + if test "x$prefix" = xNONE; then + prefix=$ac_default_prefix + fi +-GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol" ++GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol" + prefix=$old_prefix + + +diff --git a/events/src/Makefile.am b/events/src/Makefile.am +index 8493abd..87282c6 100644 +--- a/events/src/Makefile.am ++++ b/events/src/Makefile.am +@@ -5,7 +5,7 @@ EXTRA_DIST = glustereventsd.py __init__.py eventsapiconf.py.in \ + BUILT_SOURCES = eventtypes.py + CLEANFILES = eventtypes.py + +-eventsdir = $(GLUSTERFS_LIBEXECDIR)/events ++eventsdir = $(libexecdir)/glusterfs/events + events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \ + utils.py + +@@ -13,7 +13,7 @@ eventtypes.py: $(top_srcdir)/events/eventskeygen.py + $(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER + + if BUILD_EVENTS +-eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR) ++eventspeerscriptdir = $(libexecdir)/glusterfs + eventsconfdir = $(sysconfdir)/glusterfs + eventsconf_DATA = eventsconfig.json + +@@ -24,10 +24,10 @@ eventspeerscript_SCRIPTS = peer_eventsapi.py + install-exec-hook: + $(mkdir_p) $(DESTDIR)$(sbindir) + rm -f $(DESTDIR)$(sbindir)/glustereventsd +- ln -s $(GLUSTERFS_LIBEXECDIR)/events/glustereventsd.py \ ++ ln -s $(libexecdir)/glusterfs/events/glustereventsd.py \ + $(DESTDIR)$(sbindir)/glustereventsd + rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi +- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_eventsapi.py \ ++ ln -s $(libexecdir)/glusterfs/peer_eventsapi.py \ + $(DESTDIR)$(sbindir)/gluster-eventsapi + + uninstall-hook: +diff --git a/extras/Makefile.am b/extras/Makefile.am +index 9dfc93d..53ac476 100644 +--- a/extras/Makefile.am ++++ b/extras/Makefile.am +@@ -1,4 +1,4 @@ +-addonexecdir = $(GLUSTERFS_LIBEXECDIR) ++addonexecdir = $(libexecdir)/glusterfs + addonexec_SCRIPTS = peer_add_secret_pub + + EditorModedir = $(docdir) +diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am +index 9937a0b..87435d5 100644 +--- a/geo-replication/src/Makefile.am ++++ b/geo-replication/src/Makefile.am +@@ -1,4 +1,4 @@ +-gsyncddir = $(GLUSTERFS_LIBEXECDIR) ++gsyncddir = $(libexecdir)/glusterfs + + gsyncd_SCRIPTS = gverify.sh peer_gsec_create \ + set_geo_rep_pem_keys.sh peer_mountbroker peer_mountbroker.py \ +@@ -21,7 +21,7 @@ noinst_HEADERS = procdiggy.h + + AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ + -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ +- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \ ++ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" -DUSE_LIBGLUSTERFS \ + -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" + + AM_CFLAGS = -Wall $(GF_CFLAGS) +@@ -35,11 +35,11 @@ $(top_builddir)/libglusterfs/src/libglusterfs.la: + install-exec-hook: + $(mkdir_p) $(DESTDIR)$(sbindir) + rm -f $(DESTDIR)$(sbindir)/gluster-mountbroker +- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_mountbroker.py \ ++ ln -s $(libexecdir)/glusterfs/peer_mountbroker.py \ + $(DESTDIR)$(sbindir)/gluster-mountbroker + + rm -f $(DESTDIR)$(sbindir)/gluster-georep-sshkey +- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_georep-sshkey.py \ ++ ln -s $(libexecdir)/glusterfs/peer_georep-sshkey.py \ + $(DESTDIR)$(sbindir)/gluster-georep-sshkey + + +diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am +index f80fb26..7cdaf45 100644 +--- a/geo-replication/syncdaemon/Makefile.am ++++ b/geo-replication/syncdaemon/Makefile.am +@@ -1,4 +1,4 @@ +-syncdaemondir = $(GLUSTERFS_LIBEXECDIR)/python/syncdaemon ++syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon + + syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \ + resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \ +diff --git a/tools/gfind_missing_files/Makefile.am b/tools/gfind_missing_files/Makefile.am +index f77f789..043c34c 100644 +--- a/tools/gfind_missing_files/Makefile.am ++++ b/tools/gfind_missing_files/Makefile.am +@@ -1,4 +1,4 @@ +-gfindmissingfilesdir = $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files ++gfindmissingfilesdir = $(libexecdir)/glusterfs/gfind_missing_files + + gfindmissingfiles_SCRIPTS = gfind_missing_files.sh gfid_to_path.sh \ + gfid_to_path.py +@@ -21,6 +21,6 @@ uninstall-local: + + install-data-local: + rm -f $(DESTDIR)$(sbindir)/gfind_missing_files +- ln -s $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files ++ ln -s $(libexecdir)/glusterfs/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files + + CLEANFILES = +diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am +index 92fa614..37f23be 100644 +--- a/tools/glusterfind/Makefile.am ++++ b/tools/glusterfind/Makefile.am +@@ -6,7 +6,7 @@ bin_SCRIPTS = glusterfind + + CLEANFILES = $(bin_SCRIPTS) + +-deletehookscriptsdir = $(GLUSTERFS_LIBEXECDIR)/glusterfind/ ++deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/ + deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py + + uninstall-local: +@@ -16,5 +16,5 @@ install-data-local: + $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys + $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/ + rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post +- ln -s $(GLUSTERFS_LIBEXECDIR)/glusterfind/S57glusterfind-delete-post.py \ ++ ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \ + $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post +diff --git a/tools/glusterfind/src/Makefile.am b/tools/glusterfind/src/Makefile.am +index e4469c1..541ff94 100644 +--- a/tools/glusterfind/src/Makefile.am ++++ b/tools/glusterfind/src/Makefile.am +@@ -1,4 +1,4 @@ +-glusterfinddir = $(GLUSTERFS_LIBEXECDIR)/glusterfind ++glusterfinddir = $(libexecdir)/glusterfs/glusterfind + + glusterfind_PYTHON = conf.py utils.py __init__.py \ + main.py libgfchangelog.py changelogdata.py +diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am +index 78715d6..54cfcb3 100644 +--- a/xlators/features/ganesha/src/Makefile.am ++++ b/xlators/features/ganesha/src/Makefile.am +@@ -12,7 +12,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ + -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\ + -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ + -DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \ +- -DGYSNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" ++ -DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\" + + AM_CFLAGS = -Wall $(GF_CFLAGS) + +diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am +index 23ebf37..4f2fffd 100644 +--- a/xlators/mgmt/glusterd/src/Makefile.am ++++ b/xlators/mgmt/glusterd/src/Makefile.am +@@ -47,7 +47,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ + -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/rpc-lib/src \ + -I$(CONTRIBDIR)/mount -I$(CONTRIBDIR)/userspace-rcu \ + -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ +- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \ ++ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \ + -DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \ + -DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \ + -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS) +-- +2.7.4 + diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch new file mode 100644 index 000000000000..6dd1baad5dff --- /dev/null +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch @@ -0,0 +1,151 @@ +From d321df349d10f038f0c89b9c11f8059572264f1b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Sat, 13 May 2017 18:54:36 +0200 +Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593 + +`find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6. +--- + api/examples/getvolfile.py | 2 +- + geo-replication/syncdaemon/libcxattr.py | 3 +-- + geo-replication/syncdaemon/libgfchangelog.py | 3 +-- + tests/features/ipctest.py | 10 ++-------- + tests/utils/libcxattr.py | 5 ++--- + tools/glusterfind/src/libgfchangelog.py | 3 +-- + .../features/changelog/lib/examples/python/libgfchangelog.py | 3 +-- + 7 files changed, 9 insertions(+), 20 deletions(-) + +diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py +index 0c95213..32c2268 100755 +--- a/api/examples/getvolfile.py ++++ b/api/examples/getvolfile.py +@@ -3,7 +3,7 @@ + import ctypes + import ctypes.util + +-api = ctypes.CDLL(ctypes.util.find_library("gfapi")) ++api = ctypes.CDLL("libgfapi.so") + api.glfs_get_volfile.argtypes = [ctypes.c_void_p, + ctypes.c_void_p, + ctypes.c_ulong] +diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py +index 3671e10..f576648 100644 +--- a/geo-replication/syncdaemon/libcxattr.py ++++ b/geo-replication/syncdaemon/libcxattr.py +@@ -10,7 +10,6 @@ + + import os + from ctypes import CDLL, create_string_buffer, get_errno +-from ctypes.util import find_library + + + class Xattr(object): +@@ -25,7 +24,7 @@ class Xattr(object): + sizes we expect + """ + +- libc = CDLL(find_library("c"), use_errno=True) ++ libc = CDLL("libc.so.6", use_errno=True) + + @classmethod + def geterrno(cls): +diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py +index d87b56c..003c28c 100644 +--- a/geo-replication/syncdaemon/libgfchangelog.py ++++ b/geo-replication/syncdaemon/libgfchangelog.py +@@ -10,12 +10,11 @@ + + import os + from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong +-from ctypes.util import find_library + from syncdutils import ChangelogException, ChangelogHistoryNotAvailable + + + class Changes(object): +- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True) ++ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True) + + @classmethod + def geterrno(cls): +diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py +index 5aff319..9339248 100755 +--- a/tests/features/ipctest.py ++++ b/tests/features/ipctest.py +@@ -1,14 +1,8 @@ + #!/usr/bin/python + + import ctypes +-import ctypes.util +- +-# find_library does not lookup LD_LIBRARY_PATH and may miss the +-# function. In that case, retry with less portable but explicit name. +-libgfapi = ctypes.util.find_library("gfapi") +-if libgfapi == None: +- libgfapi = "libgfapi.so" +-api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL) ++ ++api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL) + + api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ] + api.glfs_ipc.restype = ctypes.c_int +diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py +index 149db72..4e6e6c4 100644 +--- a/tests/utils/libcxattr.py ++++ b/tests/utils/libcxattr.py +@@ -11,7 +11,6 @@ + import os + import sys + from ctypes import CDLL, c_int, create_string_buffer +-from ctypes.util import find_library + + + class Xattr(object): +@@ -28,9 +27,9 @@ class Xattr(object): + + if sys.hexversion >= 0x02060000: + from ctypes import DEFAULT_MODE +- libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True) ++ libc = CDLL("libc.so.6", DEFAULT_MODE, None, True) + else: +- libc = CDLL(find_library("libc")) ++ libc = CDLL("libc.so.6") + + @classmethod + def geterrno(cls): +diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py +index dd8153e..da822cf 100644 +--- a/tools/glusterfind/src/libgfchangelog.py ++++ b/tools/glusterfind/src/libgfchangelog.py +@@ -12,14 +12,13 @@ + import os + from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref + from ctypes import RTLD_GLOBAL +-from ctypes.util import find_library + + + class ChangelogException(OSError): + pass + + +-libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL) ++libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL) + + + def raise_oserr(): +diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py +index 10e73c0..2cdbf11 100644 +--- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py ++++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py +@@ -1,9 +1,8 @@ + import os + from ctypes import * +-from ctypes.util import find_library + + class Changes(object): +- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True) ++ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True) + + @classmethod + def geterrno(cls): +-- +2.7.4 + diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch new file mode 100644 index 000000000000..eb4bd5b7d56f --- /dev/null +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch @@ -0,0 +1,161 @@ +From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Sat, 13 May 2017 02:45:49 +0200 +Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes + #1450546. + +Instead, rely on programs to be in PATH, as gluster already +does in many places across its code base. + +Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246 +--- + contrib/fuse-lib/mount-common.c | 8 ++++---- + xlators/mgmt/glusterd/src/glusterd-ganesha.c | 6 +++--- + xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++--- + xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 ++-- + xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +------------- + 5 files changed, 13 insertions(+), 25 deletions(-) + +diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c +index e9f80fe81..6380dd867 100644 +--- a/contrib/fuse-lib/mount-common.c ++++ b/contrib/fuse-lib/mount-common.c +@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt, + exit (1); + } + #ifdef GF_LINUX_HOST_OS +- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt, ++ execl ("umount", "umount", "-i", rel_mnt, + lazy ? "-l" : NULL, NULL); +- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s", ++ GFFUSE_LOGERR ("%s: failed to execute umount: %s", + progname, strerror (errno)); + #elif __NetBSD__ + /* exitting the filesystem causes the umount */ + exit (0); + #else +- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL); +- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s", ++ execl ("umount", "umount", "-f", rel_mnt, NULL); ++ GFFUSE_LOGERR ("%s: failed to execute umount: %s", + progname, strerror (errno)); + #endif /* GF_LINUX_HOST_OS */ + exit (1); +diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c +index da1fee066..dcb9e5725 100644 +--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c ++++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c +@@ -122,15 +122,15 @@ manage_service (char *action) + int i = 0; + int ret = 0; + struct service_command sc_list[] = { +- { .binary = "/bin/systemctl", ++ { .binary = "systemctl", + .service = "nfs-ganesha", + .action = sc_systemctl_action + }, +- { .binary = "/sbin/invoke-rc.d", ++ { .binary = "invoke-rc.d", + .service = "nfs-ganesha", + .action = sc_service_action + }, +- { .binary = "/sbin/service", ++ { .binary = "service", + .service = "nfs-ganesha", + .action = sc_service_action + }, +diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c +index 0e6629cf0..fcb4738b7 100644 +--- a/xlators/mgmt/glusterd/src/glusterd-quota.c ++++ b/xlators/mgmt/glusterd/src/glusterd-quota.c +@@ -30,7 +30,7 @@ + + #ifndef _PATH_SETFATTR + # ifdef GF_LINUX_HOST_OS +-# define _PATH_SETFATTR "/usr/bin/setfattr" ++# define _PATH_SETFATTR "setfattr" + # endif + # ifdef __NetBSD__ + # define _PATH_SETFATTR "/usr/pkg/bin/setfattr" +@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, + + if (type == GF_QUOTA_OPTION_TYPE_ENABLE || + type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS) +- runner_add_args (&runner, "/usr/bin/find", ".", NULL); ++ runner_add_args (&runner, "find", ".", NULL); + + else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) { + +@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, + VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1", + "{}", "\\", ";", NULL); + #else +- runner_add_args (&runner, "/usr/bin/find", ".", ++ runner_add_args (&runner, "find", ".", + "-exec", _PATH_SETFATTR, "-n", + VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v", + "1", "{}", "\\", ";", NULL); +diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c +index da0152366..f0d135350 100644 +--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c ++++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c +@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname, + } + + runinit (&runner); +- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name", ++ runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name", + device, NULL); + runner_redir (&runner, STDOUT_FILENO, RUN_PIPE); + snprintf (msg, sizeof (msg), "Get volume group for device %s", device); +@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno) + + runinit (&runner); + +- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv", ++ runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv", + device, NULL); + runner_redir (&runner, STDOUT_FILENO, RUN_PIPE); + runner_log (&runner, this->name, GF_LOG_DEBUG, msg); +diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c +index 51db13df0..6fa7b92f9 100644 +--- a/xlators/mgmt/glusterd/src/glusterd-utils.c ++++ b/xlators/mgmt/glusterd/src/glusterd-utils.c +@@ -6027,7 +6027,6 @@ static struct fs_info { + char *fs_tool_pattern; + char *fs_tool_pkg; + } glusterd_fs[] = { +- /* some linux have these in /usr/sbin/and others in /sbin/? */ + { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" }, + { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, + { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, +@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) + char *trail = NULL; + runner_t runner = {0, }; + struct fs_info *fs = NULL; +- char fs_tool_name[256] = {0, }; + static dict_t *cached_fs = NULL; + + memset (key, 0, sizeof (key)); +@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) + cur_word = "N/A"; + goto cached; + } +- +- snprintf (fs_tool_name, sizeof (fs_tool_name), +- "/usr/sbin/%s", fs->fs_tool_name); +- if (sys_access (fs_tool_name, R_OK|X_OK) == 0) +- runner_add_arg (&runner, fs_tool_name); +- else { +- snprintf (fs_tool_name, sizeof (fs_tool_name), +- "/sbin/%s", fs->fs_tool_name); +- if (sys_access (fs_tool_name, R_OK|X_OK) == 0) +- runner_add_arg (&runner, fs_tool_name); +- } ++ runner_add_arg (&runner, fs->fs_tool_name); + break; + } + } +-- +2.12.0 + diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix new file mode 100644 index 000000000000..9c5412ddef7c --- /dev/null +++ b/pkgs/tools/filesystems/irods/common.nix @@ -0,0 +1,57 @@ +{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which }: + +# Common attributes of irods packages + +with stdenv; + +{ + enableParallelBuilding = true; + + buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which ]; + + propagateBuildInputs = [ boost ]; + + cmakeFlags = [ + "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" + "-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME=${stdenv.cc}" + "-DIRODS_EXTERNALS_FULLPATH_ARCHIVE=${libarchive.lib}" + "-DIRODS_EXTERNALS_FULLPATH_AVRO=${avro-cpp}" + "-DIRODS_EXTERNALS_FULLPATH_BOOST=${boost}" + "-DIRODS_EXTERNALS_FULLPATH_JANSSON=${jansson}" + "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" + "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" + "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" + "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}" + "-DCPACK_GENERATOR=TGZ" + "-DCMAKE_CXX_FLAGS=-I${libcxx}/include/c++/v1" + ]; + + preConfigure = '' + patchShebangs ./packaging + patchShebangs ./scripts + substituteInPlace CMakeLists.txt --replace "DESTINATION usr/bin" "DESTINATION bin" + substituteInPlace CMakeLists.txt --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" + substituteInPlace CMakeLists.txt --replace "DESTINATION usr/lib/" "DESTINATION lib/" + export cmakeFlags="$cmakeFlags + -DCMAKE_INSTALL_PREFIX=$out + " + ''; + + meta = { + description = "Integrated Rule-Oriented Data System (iRODS)"; + longDescription = '' + The Integrated Rule-Oriented Data System (iRODS) is open source data management + software used by research organizations and government agencies worldwide. + iRODS is released as a production-level distribution aimed at deployment in mission + critical environments. It virtualizes data storage resources, so users can take + control of their data, regardless of where and on what device the data is stored. + As data volumes grow and data services become more complex, iRODS is increasingly + important in data management. The development infrastructure supports exhaustive + testing on supported platforms; plug-in support for microservices, storage resources, + drivers, and databases; and extensive documentation, training and support services.''; + homepage = http://irods.org; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.bzizou ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix new file mode 100644 index 000000000000..db69fa64c84d --- /dev/null +++ b/pkgs/tools/filesystems/irods/default.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: + +with stdenv; + +let + common = import ./common.nix { + inherit stdenv bzip2 zlib autoconf automake cmake gnumake + help2man texinfo libtool cppzmq libarchive jansson + zeromq openssl pam libiodbc kerberos gcc libcxx + boost avro-cpp which; + }; +in rec { + + # irods: libs and server package + irods = stdenv.mkDerivation (common // rec { + version = "4.2.0"; + prefix = "irods"; + name = "${prefix}-${version}"; + + src = fetchurl { + url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; + sha256 = "b5c0d7209219629da139058ce462a237ecc22ad4dae613413a428961e4ff9d3e"; + }; + + # Patches: + # irods_root_path.patch : the root path is obtained by stripping 3 items of the path, + # but we don't use /usr with nix, so remove only 2 items. + patches = [ ./irods_root_path.patch ]; + + preConfigure = common.preConfigure + '' + patchShebangs ./test + substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" + substituteInPlace cmake/server.cmake --replace "DESTINATION usr/sbin" "DESTINATION sbin" + substituteInPlace cmake/server.cmake --replace "IRODS_DOC_DIR usr/share" "IRODS_DOC_DIR share" + substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" + substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" + substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include" + export cmakeFlags="$cmakeFlags + -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib + -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 // { + longDescription = common.meta.longDescription + '' + This package provides the servers and libraries.''; + }; + }); + + + # icommands (CLI) package, depends on the irods package + irods-icommands = stdenv.mkDerivation (common // rec { + version = "4.2.0"; + name = "irods-icommands-${version}"; + src = fetchurl { + url = "http://github.com/irods/irods_client_icommands/archive/${version}.tar.gz"; + sha256 = "b581067c8139b5ef7897f15fc1fc79f69d2e784a0f36d96e8fa3cb260b6378ce"; + }; + + buildInputs = common.buildInputs ++ [ irods ]; + + propagateBuildInputs = [ boost ]; + + preConfigure = common.preConfigure + '' + patchShebangs ./bin + ''; + + cmakeFlags = common.cmakeFlags ++ [ + "-DCMAKE_INSTALL_PREFIX=${out}" + "-DIRODS_DIR=${irods}/lib/irods/cmake" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + ]; + + meta = common.meta // { + description = common.meta.description + " CLI clients"; + longDescription = common.meta.longDescription + '' + This package provides the CLI clients, called 'icommands'.''; + }; + }); +} + diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/pkgs/tools/filesystems/irods/irods_root_path.patch new file mode 100644 index 000000000000..c88169ac023f --- /dev/null +++ b/pkgs/tools/filesystems/irods/irods_root_path.patch @@ -0,0 +1,11 @@ +--- a/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:02.955889536 +0200 ++++ b/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:43.178722157 +0200 +@@ -18,7 +18,7 @@ + try { + boost::filesystem::path path{dl_info.dli_fname}; + path = boost::filesystem::canonical(path); +- path.remove_filename().remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install ++ path.remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install + return path; + } catch(const boost::filesystem::filesystem_error& e) { + THROW(-1, e.what()); diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 81f82108995d..929c6690a269 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 ed3850b9fdd6..d0ceaf94a75f 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/mtools/UNUSED-darwin.patch b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch new file mode 100644 index 000000000000..46b790afd30a --- /dev/null +++ b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch @@ -0,0 +1,11 @@ +--- mtools/sysincludes.h.orig 2017-04-01 20:59:46.083196540 +0100 ++++ mtools/sysincludes.h 2017-04-01 20:59:12.855030456 +0100 +@@ -103,7 +103,7 @@ + # define PACKED __attribute__ ((packed)) + # if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3 + /* gcc 2.6.3 doesn't have "unused" */ /* mool */ +-# define UNUSED(x) x __attribute__ ((unused));x ++# define UNUSED(x) x + # define UNUSEDP __attribute__ ((unused)) + # else + # define UNUSED(x) x diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 6b9631bfccfe..ff311b9fae2f 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -8,12 +8,19 @@ stdenv.mkDerivation rec { sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar"; }; + # Prevents errors such as "mainloop.c:89:15: error: expected ')'" + # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html + patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + + # fails to find X on darwin + configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; + doCheck = true; meta = { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin; maintainers = [ ]; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 01d9b81d0389..0cf439c9fe95 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -2,8 +2,8 @@ , crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { - pname = "ntfs-3g"; - version = "2016.2.22"; + pname = "ntfs3g"; + version = "2017.3.23"; name = "${pname}-${version}"; buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; - sha256 = "180y5y09h30ryf2vim8j30a2npwz1iv9ly5yjmh3wjdkwh2jrdyp"; + sha256 = "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy"; }; patches = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.tuxera.com/community/open-source-ntfs-3g/; description = "FUSE-based NTFS driver with full write support"; - maintainers = with maintainers; [ urkud dezgeg ]; + maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+ }; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index bbaad516ebe0..ccb20e9f1bd0 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "11.0"; + version = "11.1"; - src = fetchurl { - url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz"; - sha256 = "0wapbi8ph7qcyh1jwyrn2r5slzsznlxvg137r4l02xgaaf42p9rh"; + src = fetchFromGitHub { + owner = "amadvance"; + repo = "snapraid"; + rev = "v${version}"; + sha256 = "13v0gz22ng09gs87f7900z2sk2hg5543njl32rfn4cxxp0jncs3r"; }; doCheck = true; + buildInputs = [ autoreconfHook ]; + meta = { homepage = http://www.snapraid.it/; description = "A backup program for disk arrays"; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 3a460241daaa..dd49b19358ce 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }: stdenv.mkDerivation rec { - version = "2.7"; + version = "2.9"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { repo = "sshfs"; owner = "libfuse"; rev = "sshfs-${version}"; - sha256 = "17l9b89zy5qzfcknw3krk74rfrqaa8q1r8jwdsahaqajsy09h4x4"; + sha256 = "1n0cq72ps4dzsh72fgfprqn8vcfr7ilrkvhzpy5500wjg88diapv"; }; buildInputs = [ pkgconfig glib fuse autoreconfHook ]; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index b7d7a07a084f..cfe3ff421fe4 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 ed41470f6001..eaea921c6f5c 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/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 0fbca9f659ce..de3ba3621a88 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.40"; + version="2.41"; name="${baseName}-${version}"; - hash="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544"; - url="https://netcologne.dl.sourceforge.net/project/asymptote/2.40/asymptote-2.40.src.tgz"; - sha256="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544"; + hash="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; + url="https://freefr.dl.sourceforge.net/project/asymptote/2.41/asymptote-2.41.src.tgz"; + sha256="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; }; buildInputs = [ ghostscriptX imagemagick fftw diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index b8cdb64da878..66d3a1100804 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "Decoder for many camera raw picture formats"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; allBut cygwin; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index 86ff9ec8fae5..56c1c9763621 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Convert ascii art diagrams into proper bitmap graphics"; homepage = http://ditaa.sourceforge.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix new file mode 100644 index 000000000000..9735adca53dc --- /dev/null +++ b/pkgs/tools/graphics/epstool/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.08"; + name = "epstool-${version}"; + + src = fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz"; + sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk"; + }; + + installPhase = '' + make EPSTOOL_ROOT=$out install + ''; + + patches = [ ./gcc43.patch ]; + + meta = with stdenv.lib; { + description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; + homepage = http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm; + license = licenses.gpl2; + maintainers = [ maintainers.asppsa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/epstool/gcc43.patch b/pkgs/tools/graphics/epstool/gcc43.patch new file mode 100644 index 000000000000..398ce08c5182 --- /dev/null +++ b/pkgs/tools/graphics/epstool/gcc43.patch @@ -0,0 +1,20 @@ +--- epstool-3.08.orig/src/epstool.c 2005-06-10 04:41:00.000000000 -0500 ++++ epstool-3.08/src/epstool.c 2009-02-16 20:55:43.186140029 -0600 +@@ -2824,7 +2824,7 @@ + code = -1; + } + if ((code==0) && stdout_name && (hChildStdoutWr == -1)) { +- handle = open(stdout_name, O_WRONLY | O_CREAT); ++ handle = open(stdout_name, O_WRONLY | O_CREAT, 0644); + hChildStdoutWr = dup2(handle, 1); + if (handle != -1) + close(handle); +@@ -2832,7 +2832,7 @@ + code = -1; + } + if ((code==0) && stderr_name && (hChildStderrWr == -1)) { +- handle = open(stderr_name, O_WRONLY | O_CREAT); ++ handle = open(stderr_name, O_WRONLY | O_CREAT, 0644); + hChildStderrWr = dup2(handle, 2); + if (handle != -1) + close(handle); diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix index 5769336693d4..5d42482b3091 100644 --- a/pkgs/tools/graphics/fast-neural-doodle/default.nix +++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index f4e0faffb0e1..e3c9cbf2e69f 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cosmic recursive fractal flames"; homepage = http://flam3.com/; - maintainers = maintainers.nand0p; + maintainers = [ maintainers.nand0p ]; platforms = platforms.linux; license = licenses.cc-by-nc-sa-20; }; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 70f9e29d0f5d..720af4622c78 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.31.1"; + name = "icoutils-0.31.3"; src = fetchurl { url = "mirror://savannah/icoutils/${name}.tar.bz2"; - sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6"; + sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152"; }; buildInputs = [ makeWrapper libpng perl ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/icoutils/; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index fb674bc8d808..39933e70e39f 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, zlib, libpng, libjpeg +, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop }: stdenv.mkDerivation rec { name = "maim-${version}"; - version = "3.4.47"; + version = "5.4.64"; - src = fetchurl { - url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz"; - sha256 = "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv"; + src = fetchFromGitHub { + owner = "naelstrof"; + repo = "maim"; + rev = "v${version}"; + sha256 = "16ipqs4s5hn7a7380n8w1ijj26d9n356bqwl1h8z5i1skbj4w7hj"; }; - buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = + [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr + libXcomposite slop ]; doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/naelstrof/maim; + inherit (src.meta) homepage; description = "A command-line screenshot utility"; longDescription = '' maim (make image) takes screenshots of your desktop. It has options to @@ -23,6 +30,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with maintainers; [ mbakke ]; + maintainers = with maintainers; [ primeos mbakke ]; }; } diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 0f7f7e2da2a2..471e8ee8df47 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/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix deleted file mode 100644 index f14c16775f8d..000000000000 --- a/pkgs/tools/graphics/panomatic/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, boost, zlib}: - -stdenv.mkDerivation { - name = "panomatic-0.9.4"; - - src = fetchurl { - url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2; - sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn"; - }; - - buildInputs = [ boost zlib ]; - - meta = { - homepage = http://aorlinsk2.free.fr/panomatic/; - description = "Tool that automates the creation of control points in Hugin"; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 985b8a1c59d5..78a2a7cb695e 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -1,29 +1,25 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: +{ stdenv, fetchgit, pkgconfig, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { name = "pngquant-${version}"; - version = "2.6.0"; + version = "2.9.1"; - src = fetchFromGitHub { - owner = "pornel"; - repo = "pngquant"; - rev = version; - sha256 = "0sdh9cz330rhj6xvqk3sdhy0393qwyl349klk9r55g88rjp774s5"; + src = fetchgit { + url = "https://www.github.com/pornel/pngquant.git"; + rev = "refs/tags/${version}"; + sha256 = "0xhnrjsk55jy5q68f81y7l61c6x18i4fzkm3i4dgndrhri5g4n1q"; + fetchSubmodules = true; }; preConfigure = "patchShebangs ."; buildInputs = [ pkgconfig libpng zlib lcms2 ]; - preInstall = '' - mkdir -p $out/bin - export PREFIX=$out - ''; - meta = with stdenv.lib; { homepage = https://pngquant.org/; description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; platforms = platforms.linux; - license = licenses.bsd2; # Not exactly bsd2, but alike + license = licenses.gpl3; + maintainers = [ maintainers.volth ]; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 170dfdac2b6b..9fdf0ad0465a 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/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 936956cbd177..40f612533068 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://fukuchi.org/works/qrencode/; description = "QR code encoder"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 24c4f2433c6f..b513115c68fe 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg , openssl, libX11, libXext, libXrender, overrideDerivation }: stdenv.mkDerivation rec { - version = "0.12.3.2"; + version = "0.12.4"; name = "wkhtmltopdf-${version}"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; - rev = "${version}"; - sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s"; + rev = version; + sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2"; }; wkQt = overrideDerivation qt4 (deriv: { @@ -105,14 +105,27 @@ stdenv.mkDerivation rec { ''; }); - buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl - libX11 libXext libXrender - ]; + buildInputs = [ + wkQt fontconfig freetype libpng zlib libjpeg openssl + libX11 libXext libXrender + ]; + + prePatch = '' + for f in src/image/image.pro src/pdf/pdf.pro ; do + substituteInPlace $f --replace '$(INSTALL_ROOT)' "" + done + ''; + + patches = [ + (fetchpatch { + name = "make-0.12.4-compile.patch"; + url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch"; + sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1"; + }) + ]; configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; - patches = [ ./makefix.patch ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index 4fbd0965c785..c11fae3888e4 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; - homepace = http://sourceforge.jp/projects/anthy/; + homepage = http://sourceforge.jp/projects/anthy/; license = licenses.gpl2Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index cdd99cd7e9a5..596b3ce15652 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,10 +1,11 @@ -{ clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchsvn, gyp, which, ninja, - python, pkgconfig, protobuf, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese, +{ clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, + python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let - japanese_usage_dictionary = fetchsvn { - url = "http://japanese-usage-dictionary.googlecode.com/svn/trunk"; - rev = "10"; + japanese_usage_dictionary = fetchFromGitHub { + owner = "hiroyuki-komatsu"; + repo = "japanese-usage-dictionary"; + rev = "e5b3425575734c323e1d947009dd74709437b684"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; }; icons = fetchurl { @@ -13,30 +14,30 @@ let }; in clangStdenv.mkDerivation rec { name = "fcitx-mozc-${version}"; - version = "2.17.2313.102"; + version = "2.20.2673.102"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "3306d3314499a54a4064b8b80bbc1bce3f6cfac4"; - sha256 = "0l7mjlnbm6i1ipni8pg9ym5bjg3rzkaxi9xwmsz2lddv348sqii2"; + rev = "280e38fe3d9db4df52f0713acf2ca65898cd697a"; + sha256 = "0s599f817gjgqynm4n1yll1ipd25ai2c55y8k6wvhg9s7qaxnyhs"; }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf gtk2 zinnia qt4 libxcb fcitx gettext ]; + buildInputs = [ protobuf gtk2 zinnia qt5.qtbase libxcb fcitx gettext ]; postUnpack = '' rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary - tar -xzf ${icons} -C $sourceRoot + tar -xzf ${icons} -C $sourceRoot/src ''; - patch_version = "2.17.2313.102.1"; + patch_version = "2.18.2612.102.1"; patches = [ (fetchpatch rec { name = "fcitx-mozc-${patch_version}.patch"; url = "https://download.fcitx-im.org/fcitx-mozc/${name}"; - sha256 = "172c34jkppibvwr9qf9xwgh2hdrmmhyx7nsdj49krxbfdlsy3yy0"; + sha256 = "1f9m4310kz09v5qvnv75ka2vq63m7by023qrkpddgq4dv7gxx3ca"; }) ]; @@ -47,42 +48,34 @@ in clangStdenv.mkDerivation rec { configurePhase = '' export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1" - python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \ - python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin - ''; - - preBuildPhase = '' - head -n 29 src/server/mozc_server.cc > LICENSE + cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc ''; buildPhase = '' - python src/build_mozc.py build -c Release \ - unix/fcitx/fcitx.gyp:fcitx-mozc \ + PYTHONPATH="$PWD:$PYTHONPATH" python build_mozc.py build -c Release \ server/server.gyp:mozc_server \ - gui/gui.gyp:mozc_tool - ''; - - checkPhase = '' - python src/build_mozc.py runtests -c Release + gui/gui.gyp:mozc_tool \ + unix/fcitx/fcitx.gyp:fcitx-mozc ''; installPhase = '' - install -d $out/share/licenses/fcitx-mozc/ - install -m 644 LICENSE src/data/installer/*.html $out/share/licenses/fcitx-mozc/ + install -d $out/share/licenses/fcitx-mozc + head -n 29 server/mozc_server.cc > $out/share/licenses/fcitx-mozc/LICENSE + install -m 644 data/installer/*.html $out/share/licenses/fcitx-mozc/ install -d $out/share/doc/mozc - install -m 644 src/data/installer/*.html $out/share/doc/mozc/ + install -m 644 data/installer/*.html $out/share/doc/mozc/ - install -D -m 755 src/out_linux/Release/mozc_server $out/lib/mozc/mozc_server - install -m 755 src/out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server + install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool - install -D -m 755 src/out_linux/Release/fcitx-mozc.so $out/lib/fcitx/fcitx-mozc.so - install -D -m 644 src/unix/fcitx/fcitx-mozc.conf $out/share/fcitx/addon/fcitx-mozc.conf - install -D -m 644 src/unix/fcitx/mozc.conf $out/share/fcitx/inputmethod/mozc.conf + install -D -m 755 out_linux/Release/fcitx-mozc.so $out/lib/fcitx/fcitx-mozc.so + install -D -m 644 unix/fcitx/fcitx-mozc.conf $out/share/fcitx/addon/fcitx-mozc.conf + install -D -m 644 unix/fcitx/mozc.conf $out/share/fcitx/inputmethod/mozc.conf install -d $out/share/doc/mozc - for mofile in src/out_linux/Release/gen/unix/fcitx/po/*.mo + for mofile in out_linux/Release/gen/unix/fcitx/po/*.mo do filename=`basename $mofile` lang=$filename.mo @@ -90,18 +83,9 @@ in clangStdenv.mkDerivation rec { done install -d $out/share/fcitx/imicon - install -m 644 fcitx-mozc-icons/mozc.png $out/share/fcitx/imicon/mozc.png + install -m 644 fcitx-mozc-icons/mozc.png $out/share/fcitx/imicon/mozc.png install -d $out/share/fcitx/mozc/icon - install -m 644 fcitx-mozc-icons/mozc.png $out/share/fcitx/mozc/icon/mozc.png - install -m 644 fcitx-mozc-icons/mozc-alpha_full.png $out/share/fcitx/mozc/icon/mozc-alpha_full.png - install -m 644 fcitx-mozc-icons/mozc-alpha_half.png $out/share/fcitx/mozc/icon/mozc-alpha_half.png - install -m 644 fcitx-mozc-icons/mozc-direct.png $out/share/fcitx/mozc/icon/mozc-direct.png - install -m 644 fcitx-mozc-icons/mozc-hiragana.png $out/share/fcitx/mozc/icon/mozc-hiragana.png - install -m 644 fcitx-mozc-icons/mozc-katakana_full.png $out/share/fcitx/mozc/icon/mozc-katakana_full.png - install -m 644 fcitx-mozc-icons/mozc-katakana_half.png $out/share/fcitx/mozc/icon/mozc-katakana_half.png - install -m 644 fcitx-mozc-icons/mozc-dictionary.png $out/share/fcitx/mozc/icon/mozc-dictionary.png - install -m 644 fcitx-mozc-icons/mozc-properties.png $out/share/fcitx/mozc/icon/mozc-properties.png - install -m 644 fcitx-mozc-icons/mozc-tool.png $out/share/fcitx/mozc/icon/mozc-tool.png + install -m 644 fcitx-mozc-icons/*.png $out/share/fcitx/mozc/icon/ ''; meta = with clangStdenv.lib; { diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 80abc5dd20cc..830342222617 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { - name = "fcitx-configtool-0.4.8"; + name = "fcitx-configtool-0.4.9"; meta = with stdenv.lib; { description = "GTK-based config tool for Fcitx"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; - sha256 = "1vaim0namw58bfafbvws1vgd4010p19zwqfbx6bd1zi5sgchdg0f"; + sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; }; buildInputs = [ makeWrapper fcitx cmake isocodes pkgconfig gtk3 diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 3f421e327d71..b0da0034ef96 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; - sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc"; + sha256 = "0r8c5k0qin3mz2p1mdciip6my0x58662sx5z50zs4c5pkdg21qwv"; }; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 50059e9477a9..5d130d7ad807 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig -, anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3 +, anthy, ibus, glib, gobjectIntrospection, gtk3, python3 }: stdenv.mkDerivation rec { @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ericsagnes ]; }; - configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; + configureFlags = [ "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" ]; buildInputs = [ - anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3 + anthy glib gobjectIntrospection gtk3 ibus python3 ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; postFixup = '' + wrapPythonPrograms substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 1ada62580dbc..74253fa09fc0 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig -, gtk3, ibus, libhangul, librsvg, python3, pygobject3 +, gtk3, ibus, libhangul, librsvg, python3 }: stdenv.mkDerivation rec { @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; }; - buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ]; + buildInputs = [ gtk3 ibus libhangul ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; + + postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { isIbusEngine = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 799d66aac9b2..6293fa30d7a7 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook , intltool, pkgconfig, sqlite, libpinyin, db -, ibus, glib, gtk3, python3, pygobject3 +, ibus, glib, gtk3, python3 }: stdenv.mkDerivation rec { @@ -15,12 +15,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig python3.pkgs.wrapPython ]; postAutoreconf = '' intltoolize ''; + postFixup = "wrapPythonPrograms"; + meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 2dbab7129555..c53f766cb7d3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig -, ibus, m17n_lib, m17n_db, gettext, python3, pygobject3 +, ibus, m17n_lib, m17n_db, gettext, python3 }: stdenv.mkDerivation rec { @@ -16,15 +16,17 @@ stdenv.mkDerivation rec { buildInputs = [ ibus m17n_lib m17n_db gettext - python3 pygobject3 + python3 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python3.pkgs.wrapPython ]; + + postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { isIbusEngine = true; description = "m17n engine for ibus"; - homepage = https://github.com.com/ibus/ibus-m17n; + homepage = https://github.com/ibus/ibus-m17n; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 644725c29107..2e32075992c9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,14 +1,16 @@ -{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: +{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf +, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: let - japanese_usage_dictionary = fetchsvn { - url = "http://japanese-usage-dictionary.googlecode.com/svn/trunk"; - rev = "10"; + japanese_usage_dictionary = fetchFromGitHub { + owner = "hiroyuki-komatsu"; + repo = "japanese-usage-dictionary"; + rev = "e5b3425575734c323e1d947009dd74709437b684"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; }; in clangStdenv.mkDerivation rec { name = "ibus-mozc-${version}"; - version = "2.17.2313.102"; + version = "2.20.2673.102"; meta = with clangStdenv.lib; { isIbusEngine = true; @@ -19,14 +21,14 @@ in clangStdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ericsagnes ]; }; - nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ]; + nativeBuildInputs = [ which ninja python gyp pkgconfig ]; + buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "3306d3314499a54a4064b8b80bbc1bce3f6cfac4"; - sha256 = "0l7mjlnbm6i1ipni8pg9ym5bjg3rzkaxi9xwmsz2lddv348sqii2"; + rev = "280e38fe3d9db4df52f0713acf2ca65898cd697a"; + sha256 = "0s599f817gjgqynm4n1yll1ipd25ai2c55y8k6wvhg9s7qaxnyhs"; }; postUnpack = '' @@ -36,16 +38,11 @@ in clangStdenv.mkDerivation rec { configurePhase = '' export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc" - python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \ - python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin - ''; - - preBuildPhase = '' - head -n 29 src/server/mozc_server.cc > LICENSE + cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc ''; buildPhase = '' - python src/build_mozc.py build -c Release \ + PYTHONPATH="$PWD:$PYTHONPATH" python build_mozc.py build -c Release \ unix/ibus/ibus.gyp:ibus_mozc \ unix/emacs/emacs.gyp:mozc_emacs_helper \ server/server.gyp:mozc_server \ @@ -53,32 +50,29 @@ in clangStdenv.mkDerivation rec { renderer/renderer.gyp:mozc_renderer ''; - checkPhase = '' - python src/build_mozc.py runtests -c Release - ''; - installPhase = '' - install -d $out/share/licenses/mozc/ - install -m 644 LICENSE src/data/installer/*.html $out/share/licenses/mozc/ + install -d $out/share/licenses/mozc + head -n 29 server/mozc_server.cc > $out/share/licenses/mozc/LICENSE + install -m 644 data/installer/*.html $out/share/licenses/mozc/ - install -D -m 755 src/out_linux/Release/mozc_server $out/lib/mozc/mozc_server - install -m 755 src/out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server + install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool - install -d $out/share/doc/mozc - install -m 644 src/data/installer/*.html $out/share/doc/mozc/ + install -d $out/share/doc/mozc + install -m 644 data/installer/*.html $out/share/doc/mozc/ - install -D -m 755 src/out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc - install -D -m 644 src/out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml - install -D -m 644 src/data/images/unix/ime_product_icon_opensource-32.png $out/share/ibus-mozc/product_icon.png - install -m 644 src/data/images/unix/ui-tool.png $out/share/ibus-mozc/tool.png - install -m 644 src/data/images/unix/ui-properties.png $out/share/ibus-mozc/properties.png - install -m 644 src/data/images/unix/ui-dictionary.png $out/share/ibus-mozc/dictionary.png - install -m 644 src/data/images/unix/ui-direct.png $out/share/ibus-mozc/direct.png - install -m 644 src/data/images/unix/ui-hiragana.png $out/share/ibus-mozc/hiragana.png - install -m 644 src/data/images/unix/ui-katakana_half.png $out/share/ibus-mozc/katakana_half.png - install -m 644 src/data/images/unix/ui-katakana_full.png $out/share/ibus-mozc/katakana_full.png - install -m 644 src/data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png - install -m 644 src/data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png - install -D -m 755 src/out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer + install -D -m 755 out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc + install -D -m 644 out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml + install -D -m 644 data/images/unix/ime_product_icon_opensource-32.png $out/share/ibus-mozc/product_icon.png + install -m 644 data/images/unix/ui-tool.png $out/share/ibus-mozc/tool.png + install -m 644 data/images/unix/ui-properties.png $out/share/ibus-mozc/properties.png + install -m 644 data/images/unix/ui-dictionary.png $out/share/ibus-mozc/dictionary.png + install -m 644 data/images/unix/ui-direct.png $out/share/ibus-mozc/direct.png + install -m 644 data/images/unix/ui-hiragana.png $out/share/ibus-mozc/hiragana.png + install -m 644 data/images/unix/ui-katakana_half.png $out/share/ibus-mozc/katakana_half.png + install -m 644 data/images/unix/ui-katakana_full.png $out/share/ibus-mozc/katakana_full.png + install -m 644 data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png + install -m 644 data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png + install -D -m 755 out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer ''; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index c5090e5b949b..8c842dbc841e 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub , autoreconfHook, docbook2x, pkgconfig , gtk3, dconf, gobjectIntrospection -, ibus, python3, pygobject3 }: +, ibus, python3 }: stdenv.mkDerivation rec { name = "ibus-table-${version}"; - version = "1.9.14"; + version = "1.9.16"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "1mkx03iqrq5yq57y7hjqcmxfh41dsjykyyl70d41dflcgp5q2nhw"; + sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb"; }; postPatch = '' @@ -29,16 +29,18 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - dconf gtk3 gobjectIntrospection ibus python3 pygobject3 + dconf gtk3 gobjectIntrospection ibus python3 ]; - nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ]; postUnpack = '' substituteInPlace $sourceRoot/engine/Makefile.am \ --replace "docbook2man" "docbook2man --sgml" ''; + postFixup = "wrapPythonPrograms"; + meta = with stdenv.lib; { isIbusEngine = true; description = "An IBus framework for table-based input methods"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 161982ac6186..1ea7ef4251fe 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ]; + nativeBuildInputs = [ python3Packages.wrapPython ]; + + postFixup = '' + buildPythonPath $out + patchPythonScript $out/share/ibus-uniemoji/uniemoji.py + ''; + makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" "PYTHON=${python3Packages.python.interpreter}" ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 58afb638b470..d392777dfd44 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,18 +1,60 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, fetchurl, wrapGAppsHook , intltool, isocodes, pkgconfig -, python3, pygobject3 +, python3 , gtk2, gtk3, atk, dconf, glib, json_glib , dbus, libnotify, gobjectIntrospection, wayland -, nodePackages }: -stdenv.mkDerivation rec { +let + emojiData = let + srcs = { + data = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; + sha256 = "0zfn3z61xy76yah3d24dd745qjssrib009m4nvqpnx4sf1r13i2x"; + }; + sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; + sha256 = "0xzk7hi2a8macx9s5gj2pb36d38y8fa9001sj71g6kw25c2h94cn"; + }; + variation-sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; + sha256 = "1wlg4gbq7spmpppjfy5zdl82sj0hc836p8gljgfrjmwsjgybq286"; + }; + zwj-sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; + sha256 = "0rrnk94mhm3k9vs74pvyvs4ir7f31f1libx7c196fmdqvp1qfafw"; + }; + test = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; + sha256 = "1dvxw5xp1xiy13c1p1c7l2xc9q8f8znk47kb7q8g7bbgbi21cq5m"; + }; + }; + in stdenv.mkDerivation { + name = "emoji-data-5.0"; + unpackPhase = ":"; + dontBuild = true; + installPhase = with stdenv.lib; '' + mkdir $out + ${builtins.toString (flip mapAttrsToList srcs (k: v: '' + cp ${v} $out/emoji-${k}.txt + ''))} + ''; + }; + cldrEmojiAnnotation = stdenv.mkDerivation rec { + name = "cldr-emoji-annotation-${version}"; + version = "31.0.1_1"; + src = fetchurl { + url = "https://github.com/fujiwarat/cldr-emoji-annotation/releases/download/${version}/${name}.tar.gz"; + sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7"; + }; + }; +in stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.14"; + version = "1.5.16"; src = fetchurl { url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; - sha256 = "0g4x02d7j5w1lfn4zvmzsq93h17lajgn9d7hlvr6pws28vz40ax4"; + sha256 = "07py16jb81kd7vkqhcia9cb2avsbg5jswp2kzf0k4bprwkxppd9n"; }; postPatch = '' @@ -30,20 +72,25 @@ stdenv.mkDerivation rec { "--disable-memconf" "--enable-ui" "--enable-python-library" - "--with-emoji-json-file=${nodePackages.emojione}/lib/node_modules/emojione/emoji.json" + "--with-unicode-emoji-dir=${emojiData}" + "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations" ]; buildInputs = [ - python3 pygobject3 + python3 intltool isocodes pkgconfig gtk2 gtk3 dconf json_glib dbus libnotify gobjectIntrospection wayland ]; - propagatedBuildInputs = [ glib ]; + propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; preConfigure = '' # Fix hard-coded installation paths, so make does not try to overwrite our @@ -57,14 +104,9 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" ''; - preFixup = '' - for f in "$out/bin"/*; do #*/ - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" - done + postFixup = '' + buildPythonPath $out + patchPythonScript $out/share/ibus/setup/main.py ''; doInstallCheck = true; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 819728032bb6..53aec187bb76 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - version = "3.0.9"; + version = "3.13"; name = "aescrypt-${version}"; src = fetchurl { url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; - sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882"; + sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7"; }; preBuild = '' diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 710641281e52..ee0accac2d9b 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,6 +1,6 @@ -{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: +{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "antimicro-${version}"; version = "2.23"; @@ -11,11 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v"; }; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - cmake pkgconfig SDL2 qtbase qttools xorg.libXtst + SDL2 qtbase qttools xorg.libXtst ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI for mapping keyboard and mouse controls to a gamepad"; inherit (src.meta) homepage; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index ccb13f2e42ca..2398d9019dc3 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,21 +2,21 @@ let - version = "0.9.7"; + version = "1.0.1"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; owner = "smira"; repo = "aptly"; - sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00"; + sha256 = "0rqxdhy2mlwndxhqb447gz626q92zd09rpvhysr2g1rx9nxa039p"; }; aptlyCompletionSrc = fetchFromGitHub { rev = version; owner = "aptly-dev"; repo = "aptly-bash-completion"; - sha256 = "1yz3pr2jfczqv81as2q3cizwywj5ksw76vi15xlbx5njkjp4rbm4"; + sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q"; }; in @@ -27,12 +27,10 @@ buildGoPackage { src = aptlySrc; goPackagePath = "github.com/smira/aptly"; - goDeps = ./deps.nix; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - rm $bin/bin/man mkdir -p $bin/share/bash-completion/completions ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions wrapProgram "$bin/bin/aptly" \ diff --git a/pkgs/tools/misc/aptly/deps.nix b/pkgs/tools/misc/aptly/deps.nix deleted file mode 100644 index f0163f34ae8b..000000000000 --- a/pkgs/tools/misc/aptly/deps.nix +++ /dev/null @@ -1,245 +0,0 @@ -[ - { - goPackagePath = "github.com/AlekSi/pointer"; - fetch = { - type = "git"; - url = https://github.com/AlekSi/pointer.git; - rev = "5f6d527dae3d678b46fbb20331ddf44e2b841943"; - sha256 = "127n71d8y1d8hxv9fq9z1midw3vk5xa6aq45gffjvwabx4cgha1l"; - }; - } - { - goPackagePath = "github.com/awalterschulze/gographviz"; - fetch = { - type = "git"; - url = https://github.com/awalterschulze/gographviz.git; - rev = "20d1f693416d9be045340150094aa42035a41c9e"; - sha256 = "1q4796nzanikqmz77jdc2xrq30n93w6ljcfsbhij3yj3s698bcaf"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = https://github.com/aws/aws-sdk-go.git; - rev = "a170e9cb76475a0da7c0326a13cc2b39e9244b3b"; - sha256 = "0z7pgb9q0msvdkrvjwi95cbl9k9w8f3n2liwkl6fli0nx9jyamqw"; - }; - } - { - goPackagePath = "github.com/cheggaaa/pb"; - fetch = { - type = "git"; - url = https://github.com/cheggaaa/pb.git; - rev = "2c1b74620cc58a81ac152ee2d322e28c806d81ed"; - sha256 = "148fv6a0ranzcc1lv4v5lmvgbfx05dhzpwsg8vxi9ggn51n496ny"; - }; - } - { - goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; - fetch = { - type = "git"; - url = https://github.com/DisposaBoy/JsonConfigReader.git; - rev = "33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4"; - sha256 = "1rq7hp1xk8lzvn9bv9jfkszw8p2qia8prvrx540gb2y93jw9i847"; - }; - } - { - goPackagePath = "github.com/gin-gonic/gin"; - fetch = { - type = "git"; - url = https://github.com/gin-gonic/gin.git; - rev = "b1758d3bfa09e61ddbc1c9a627e936eec6a170de"; - sha256 = "0y3v5vi68xafcvz9yz6ffww96xs2qalklnaab7vrwpax3brlkipk"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = https://github.com/go-ini/ini.git; - rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3"; - sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia"; - }; - } - { - goPackagePath = "github.com/jlaffaye/ftp"; - fetch = { - type = "git"; - url = https://github.com/jlaffaye/ftp.git; - rev = "fec71e62e457557fbe85cefc847a048d57815d76"; - sha256 = "08ivzsfswgl4xlr6wmqpbf77jclh8ivhwxlhj59allp27lic1kgm"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = https://github.com/jmespath/go-jmespath.git; - rev = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = https://github.com/julienschmidt/httprouter.git; - rev = "46807412fe50aaceb73bb57061c2230fd26a1640"; - sha256 = "0mvzjpzlb1gkb6lp0nwni3vid6fw33dkzl6s9gj7gp2wsbwzcdhd"; - }; - } - { - goPackagePath = "github.com/mattn/go-shellwords"; - fetch = { - type = "git"; - url = https://github.com/mattn/go-shellwords.git; - rev = "c7ca6f94add751566a61cf2199e1de78d4c3eee4"; - sha256 = "1714ca0p0mwijck0vxdssizxyjjjki1dpc5bl51ayw5sa7s6d4n2"; - }; - } - { - goPackagePath = "github.com/mkrautz/goar"; - fetch = { - type = "git"; - url = https://github.com/mkrautz/goar.git; - rev = "282caa8bd9daba480b51f1d5a988714913b97aad"; - sha256 = "0b6nmgyh5lmm8d1psm5yqqmshkqi87di1191c9q95z1gkkfi16b2"; - }; - } - { - goPackagePath = "github.com/mxk/go-flowrate"; - fetch = { - type = "git"; - url = https://github.com/mxk/go-flowrate.git; - rev = "cca7078d478f8520f85629ad7c68962d31ed7682"; - sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; - }; - } - { - goPackagePath = "github.com/ncw/swift"; - fetch = { - type = "git"; - url = https://github.com/ncw/swift.git; - rev = "384ef27c70645e285f8bb9d02276bf654d06027e"; - sha256 = "1is9z6pbn55yr5b7iizfyi8y19nc9xprd87cwab4i54bxkqqp5hg"; - }; - } - { - goPackagePath = "github.com/smira/go-aws-auth"; - fetch = { - type = "git"; - url = https://github.com/smira/go-aws-auth.git; - rev = "0070896e9d7f4f9f2d558532b2d896ce2239992a"; - sha256 = "0ic7fgpgr8n1gvhwab1isbm82azy8kb9bzjxsch5i2dpvnz03rvh"; - }; - } - { - goPackagePath = "github.com/smira/go-xz"; - fetch = { - type = "git"; - url = https://github.com/smira/go-xz.git; - rev = "0c531f070014e218b21f3cfca801cc992d52726d"; - sha256 = "1wpgw8y6xjyf75dfcirx58cr1c277avdb6hr7xvcddhcfn01qzma"; - }; - } - { - goPackagePath = "github.com/smira/commander"; - fetch = { - type = "git"; - url = https://github.com/smira/commander.git; - rev = "f408b00e68d5d6e21b9f18bd310978dafc604e47"; - sha256 = "0gzhxjni17qq0z4zhakjrp98qd0qmf6wlyrx5xwwsqgh07nyzssa"; - }; - } - { - goPackagePath = "github.com/smira/flag"; - fetch = { - type = "git"; - url = https://github.com/smira/flag.git; - rev = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107"; - sha256 = "0wh77lz7z23rs9mbyi89l28i16gp1zx2312zxs4ngqdvjvinsiri"; - }; - } - { - goPackagePath = "github.com/smira/go-ftp-protocol"; - fetch = { - type = "git"; - url = https://github.com/smira/go-ftp-protocol.git; - rev = "066b75c2b70dca7ae10b1b88b47534a3c31ccfaa"; - sha256 = "1az9p44fa7bcw92ywcyrqch2j1781b96rpid2qggyp3nhjivx8rx"; - }; - } - { - goPackagePath = "github.com/smira/go-uuid"; - fetch = { - type = "git"; - url = https://github.com/smira/go-uuid.git; - rev = "ed3ca8a15a931b141440a7e98e4f716eec255f7d"; - sha256 = "1vasidfa2pqrawk4zm5bqsi5q7f3qx3xm159hs36r0h0kj0c7sz4"; - }; - } - { - goPackagePath = "github.com/smira/lzma"; - fetch = { - type = "git"; - url = https://github.com/smira/lzma.git; - rev = "7f0af6269940baa2c938fabe73e0d7ba41205683"; - sha256 = "0ka8mbyg2dj076aslbi1hiahw5n5gjyn7s4w3x4ws9ak5chw5zif"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = https://github.com/golang/snappy.git; - rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; - sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = https://github.com/syndtr/goleveldb.git; - rev = "917f41c560270110ceb73c5b38be2a9127387071"; - sha256 = "0ybpcizg2gn3ln9rycqbaqlclci3k2q8mipcwq7927ym113d7q32"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = https://github.com/ugorji/go.git; - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; - }; - } - { - goPackagePath = "github.com/vaughan0/go-ini"; - fetch = { - type = "git"; - url = https://github.com/vaughan0/go-ini.git; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; - }; - } - { - goPackagePath = "github.com/wsxiaoys/terminal"; - fetch = { - type = "git"; - url = https://github.com/wsxiaoys/terminal.git; - rev = "5668e431776a7957528361f90ce828266c69ed08"; - sha256 = "0dirblp3lwijsrx590qfp8zn5xspkjzq7ihkv05806mpncg5ivxd"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = https://go.googlesource.com/crypto.git; - rev = "a7ead6ddf06233883deca151dffaef2effbf498f"; - sha256 = "0gyvja1kh6xkxy7mg5y72zpvmi6hfix34kmzg4sry1x7bycw3dfc"; - }; - } -] diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index da96bde2fd52..4d6e90a347e7 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -4,18 +4,23 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "1.3.0"; + version = "1.4.0"; buildInputs = with pythonPackages; [ nose ]; - propagatedBuildInputs = with pythonPackages; [ requests2 ]; + propagatedBuildInputs = with pythonPackages; [ requests ]; src = fetchFromGitHub { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - sha256 = "1hx7xipyy9w72iwlawldlif9qk3f7b8jx8c1wcx114pqbjz5d347"; + sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2"; }; + patchPhase = '' + # disable one test which is failing with -> OSError: out of pty devices + rm tests/pty_recorder_test.py + ''; + checkPhase = '' nosetests ''; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index da9a599714cb..b885b5ed09d5 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -1,35 +1,46 @@ -{ fetchgit -, stdenv +{ stdenv , python3Packages -, fetchFromGitHub }: +, fetchFromGitHub +, systemd }: let python = python3Packages.python; wrapPython = python3Packages.wrapPython; - date = "2016-11-23"; + version = "1.1"; in stdenv.mkDerivation { - name = "autorandr-unstable-${date}"; + name = "autorandr-${version}"; - buildInputs = [ python wrapPython ]; - - phases = [ "unpackPhase" "installPhase" ]; + buildInputs = [ python ]; installPhase = '' - # install bash completions - mkdir -p $out/bin $out/libexec $out/etc/bash_completion.d - cp -v contrib/bash_completion/autorandr $out/etc/bash_completion.d + runHook preInstall + make install TARGETS='autorandr' PREFIX=$out - # install autorandr bin - cp autorandr.py $out/bin/autorandr - wrapPythonProgramsIn $out/bin/autorandr $out + make install TARGETS='bash_completion' DESTDIR=$out + + make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out + + ${if systemd != null then '' + make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ + SYSTEMD_UNIT_DIR=/lib/systemd/system \ + UDEV_RULES_DIR=/etc/udev/rules.d + substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ + --replace /bin/systemctl "${systemd}/bin/systemctl" + '' else '' + make install TARGETS='pmutils' DESTDIR=$out \ + PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d + make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ + UDEV_RULES_DIR=/etc/udev/rules.d + ''} + runHook postInstall ''; src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; - rev = "53d29f99275aebf14240ea95f2d7022b305738d5"; - sha256 = "0pza4wfkzv7mmg2m4pf3n8wk0p7cy6bfqknn8ywz51r8ja16cqfj"; + rev = "${version}"; + sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd"; }; meta = { diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 8b0e17191964..143918baa9c2 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "bandwidth-${version}"; - version = "1.3.1"; + version = "1.4.2"; src = fetchurl { url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "13a0mxrkybpwiynv4cj8wsy8zl5xir5xi1a03fzam5gw815dj4am"; + sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd"; }; buildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 164bc3d55f05..2371e91ae2fc 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,21 +1,15 @@ -{stdenv, fetchurl, flex, readline}: +{stdenv, fetchurl, flex, readline, ed, texinfo}: stdenv.mkDerivation rec { - name = "bc-1.06"; + name = "bc-1.07.1"; src = fetchurl { url = "mirror://gnu/bc/${name}.tar.gz"; - sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf"; + sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"; }; - patches = [ ./readlinefix.patch ]; - - preConfigure = '' - sed -i 's/program.*save/static &/' bc/load.c - ''; - configureFlags = [ "--with-readline" ]; - buildInputs = [flex readline]; + buildInputs = [flex readline ed texinfo]; doCheck = true; diff --git a/pkgs/tools/misc/bc/readlinefix.patch b/pkgs/tools/misc/bc/readlinefix.patch deleted file mode 100644 index 74a66e90615d..000000000000 --- a/pkgs/tools/misc/bc/readlinefix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur bc-1.06.orig/bc/scan.l bc-1.06/bc/scan.l ---- bc-1.06.orig/bc/scan.l 2000-09-13 13:25:47.000000000 -0500 -+++ bc-1.06/bc/scan.l 2002-07-09 14:36:34.000000000 -0500 -@@ -143,7 +143,6 @@ - - /* Definitions for readline access. */ - extern FILE *rl_instream; --_PROTOTYPE(char *readline, (char *)); - - /* rl_input puts upto MAX characters into BUF with the number put in - BUF placed in *RESULT. If the yy input file is the same as diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index f60007341582..5e8a8c56b0a7 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibtool-${version}"; - version = "2.57"; + version = "2.67"; src = fetchurl { url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${version}.tar.gz"; - sha256 = "1g3yqywnbg04imkcqx7ypq0din81vcgq90k2xlqih69blbqpfb5y"; + sha256 = "116pv532mz0q954y5b7c6zipnamc05f0x7g5x1b674jsjxh42v2v"; }; # Perl for running test suite. @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; homepage = http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html; - license = licenses.gpl1; + license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index f466da91dffe..af9861ea6ed5 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 24a0d617b306..000000000000 --- 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/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix new file mode 100644 index 000000000000..064c836f843e --- /dev/null +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +let version = "0.8"; in + +stdenv.mkDerivation rec { + name = "buildtorrent"; + + src = fetchurl { + url = "http://mathr.co.uk/blog/code/${name}-${version}.tar.gz"; + sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; + }; + + meta = { + description = "A simple commandline torrent creator"; + homepage = http://mathr.co.uk/blog/torrent.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix index f2dc5150bbd7..41116288e533 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmakeHook, zlib }: +{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }: stdenv.mkDerivation rec { version = "0.2.6"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - qmakeHook + qmake ]; patches = [ @@ -29,8 +29,12 @@ stdenv.mkDerivation rec { doCheck = false; installPhase = '' + runHook preInstall + install -D --mode 0755 --target-directory $out/bin bin/ckb-daemon bin/ckb install -D --mode 0755 --target-directory $out/libexec/ckb-animations bin/ckb-animations/* + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix new file mode 100644 index 000000000000..55aa438226f6 --- /dev/null +++ b/pkgs/tools/misc/clac/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "clac"; + version = "0.0.0.20170503"; + + src = fetchFromGitHub { + owner = "soveran"; + repo = "clac"; + rev = "e92bd5cbab0d694cef945e3478820c9505e06f04"; + sha256 = "0j8p1npgq32s377c9lw959h5i2csq4yb27cvg7av17bji46816bv"; + }; + + buildInputs = []; + makeFlags = ["PREFIX=$(out)"]; + + postInstall = '' + mkdir -p "$out/share/doc/${pname}" + cp README* LICENSE "$out/share/doc/${pname}" + ''; + + meta = { + inherit version; + description = "Interactive stack-based calculator"; + license = stdenv.lib.licenses.bsd2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.unix; + homepage = "https://github.com/soveran/clac"; + }; +} diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 05cc33f8bce1..e34f4bc8f2f2 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,19 +1,20 @@ {fetchFromGitHub , stdenv, makeWrapper, python3, gtk3, libwnck3 }: stdenv.mkDerivation rec { - name = "clipster-unstable-${version}"; - version = "2017-02-17"; + name = "clipster-${version}"; + version = "1.0.1"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; - rev = "8c4732d7c26ddec6faac295d3ddb2278c6ed5647"; - sha256 = "00ki3srdjh96ghan1z4zd8w5cahgvnpa8hccnxmn0im1xrgpkh3b"; + rev = "${version}"; + sha256 = "0y0igi5r5x2gxglm0aarn2mhdfn6whakm6359i3h0wkn6qw1p1l2"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck3 makeWrapper ]; + buildInputs = [ pythonEnv gtk3 libwnck3 ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' sed -i 's/python/python3/g' clipster @@ -46,6 +47,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; homepage = https://github.com/mrichar1/clipster; platforms = platforms.linux; - maintainers = [maintainers.magnetophon]; + maintainers = [ maintainers.magnetophon ]; }; } diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 7db7ebf96d6d..6a76906a805f 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 2c435881f8c5..9a988a2b4311 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 }: @@ -13,24 +14,27 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.26"; + name = "coreutils-8.27"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm"; + sha256 = "0sv547572iq8ayy8klir4hnngnx92a9nsazmf1wgzfc7xr4x74c8"; }; # 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/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 98b91964e640..15701d3c429b 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpulimit-${version}"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; - sha256 = "1fr4rgi5vdbjxsn04j99g1qyr7n5169hrv6lp3lli030alvkfbm2"; + sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp"; }; buildFlags = with stdenv; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 375aa999e3b9..b4abb3097b98 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/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix new file mode 100644 index 000000000000..856138f046ae --- /dev/null +++ b/pkgs/tools/misc/crudini/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +python2Packages.buildPythonApplication rec { + name = "crudini-${version}"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "pixelb"; + repo = "crudini"; + rev = version; + sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav"; + }; + + propagatedBuildInputs = with python2Packages; [ iniparse ]; + + checkPhase = '' + patchShebangs . + pushd tests >/dev/null + ./test.sh + ''; + + meta = with stdenv.lib; { + description = "A utility for manipulating ini files "; + homepage = http://www.pixelbeat.org/programs/crudini/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index de9604200bac..e3f8a4c43a59 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/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 40d729d063d6..396d26a6cd14 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.4.1"; name = "dateutils-${version}"; - src =fetchurl { + src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c"; - }; + }; meta = with stdenv.lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index ddf9c38ec93a..26c5a6b21395 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./automake.patch ]; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "bindnow" ]; prePatch = '' newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") @@ -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/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix new file mode 100644 index 000000000000..c45c85e4271d --- /dev/null +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }: + +stdenv.mkDerivation rec { + name = "ddcutil-${version}"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "rockowitz"; + repo = "ddcutil"; + rev = "v${version}"; + sha256 = "1hcdg54xyb1pfl03iqll14y9yglwmyvxyvhbql87hd9q0dywah6m"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ + i2c-tools udev libgudev + glib libusb libdrm xorg.libXrandr + ]; + + meta = with stdenv.lib; { + homepage = http://www.ddcutil.com/; + description = "Query and change Linux monitor settings using DDC/CI and USB"; + license = licenses.gpl2; + maintainer = with maintainers; [ rnhmjoj ]; + }; +} + diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 7c84d913157c..039ec27947af 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkgconfig, glib, libintlOrEmpty }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "desktop-file-utils-0.22"; @@ -8,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; }; - buildInputs = [ pkgconfig glib ]; + buildInputs = [ pkgconfig glib libintlOrEmpty ]; + + NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; meta = { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; description = "Command line utilities for working with .desktop files"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6a9763666d3b..9c0d51c4a857 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -29,10 +29,10 @@ python3.pkgs.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++ - map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext + pythonPath = with python3.pkgs; + [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 596df4167438..346ee7976373 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go, bash }: +{ stdenv, fetchFromGitHub, go, bash, writeText}: stdenv.mkDerivation rec { name = "direnv-${version}"; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { installPhase = '' make install DESTDIR=$out + mkdir -p $out/share/fish/vendor_conf.d + echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 9ab9478e5438..df084579b79a 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl }: stdenv.mkDerivation rec { - name = "dmg2img-1.6.5"; + name = "dmg2img-1.6.7"; src = fetchurl { url = "http://vu1tur.eu.org/tools/${name}.tar.gz"; - sha256 = "021ka05vq7lsdngsglmv93r2j0vfakrkx964xslzhaybwp5ic2j0"; + sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; }; buildInputs = [zlib bzip2 openssl]; @@ -17,5 +17,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool."; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index b32f8f43146f..e2f2f51ccfb9 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dynamic-colors-${version}"; - version = "0.2.1"; + version = "0.2.2.1"; src = fetchFromGitHub { - owner = "peterhoeg"; - repo = "dynamic-colors"; - rev = "v${version}"; - sha256 = "061lh4qjk4671hwzmj55n3gy5hsi4p3hb30hj5bg3s6glcsbjpr5"; + owner = "peterhoeg"; + repo = "dynamic-colors"; + rev = "v${version}"; + sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw"; }; dontBuild = true; @@ -17,24 +17,24 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p \ $out/bin \ - $out/share/colorschemes \ + $out/share/dynamic-colors/colorschemes \ $out/share/bash-completion/completions \ $out/share/zsh/site-packages install -m755 bin/dynamic-colors $out/bin/ install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors - install -m644 colorschemes/* -t $out/share/colorschemes + install -m644 colorschemes/* -t $out/share/dynamic-colors/colorschemes - sed -e "s|/usr/share/dynamic-colors|$out/share|g" \ - -i $out/bin/dynamic-colors + substituteInPlace $out/bin/dynamic-colors \ + --replace /usr/share/dynamic-colors $out/share/dynamic-colors ''; - meta = { - homepage = https://github.com/peterhoeg/dynamic-colors; - license = stdenv.lib.licenses.mit; + meta = with stdenv.lib; { description = "Change terminal colors on the fly"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peterhoeg ]; + homepage = https://github.com/peterhoeg/dynamic-colors; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 8ba92990b536..a68e2be6aebe 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.6"; + version = "3.7"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4"; + sha256 = "0bx2ivx9hwixjwmk7aqlx20mwmn3cvryppnmc285d7byiw6dbvwl"; }; postPatch = '' diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix new file mode 100644 index 000000000000..c1678f3907fb --- /dev/null +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "esptool-ck-${version}"; + version = "0.4.11"; + + src = fetchFromGitHub { + owner = "igrr"; + repo = "esptool-ck"; + rev = "0.4.11"; + sha256 = "086x68jza24xkaap8nici18kj78id2p2lzbasin98wilvpjc8d7f"; + }; + + makeFlags = [ "VERSION=${version}" ]; + + installPhase = '' + mkdir -p $out/bin + cp esptool $out/bin + ''; + + meta = with stdenv.lib; { + description = "ESP8266/ESP32 build helper tool"; + homepage = https://github.com/igrr/esptool-ck; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix new file mode 100644 index 000000000000..04ba5788cd91 --- /dev/null +++ b/pkgs/tools/misc/esptool/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, python3 }: + +python3.pkgs.buildPythonApplication rec { + name = "esptool-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "espressif"; + repo = "esptool"; + rev = "v${version}"; + sha256 = "0112fybkz4259gyvhcs18wa6938jp6w7clk66kpd0d1dg70lz1h6"; + }; + + propagatedBuildInputs = with python3.pkgs; [ pyserial ]; + + doCheck = false; # FIXME: requires packaging some new deps + + meta = with stdenv.lib; { + description = "ESP8266 and ESP32 serial bootloader utility"; + homepage = https://github.com/espressif/esptool; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 363aaf3f389a..ae6ea6e3f538 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.6"; + version = "4.11"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "e90589a9349d008cce8c0510ac4e8878efdc0ddb1b732a9a4cc333b101313415"; + sha256 = "1cp132kk2xd2cwn1ysjv0cl8i9lnq3n4zi4wy676p5k4h2mfvn0j"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index d26eb8f45aea..110125727bf0 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,28 +1,52 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }: with rustPlatform; -buildRustPackage rec { +let + # check for updates + zoneinfo_compiled = fetchFromGitHub { + owner = "rust-datetime"; + repo = "zoneinfo-compiled"; + rev = "f56921ea5e9f7cf065b1480ff270a1757c1f742f"; + sha256 = "1xmw7c5f5n45lkxnyxp4llfv1bnqhc876w98165ccdbbiylfkw26"; + }; + cargoPatch = '' + # use non-git dependencies + patch Cargo.toml < path = "${zoneinfo_compiled}" + EOF + ''; +in buildRustPackage rec { name = "exa-${version}"; - version = "2016-04-20"; + version = "0.7.0"; - # NOTE: There is an impurity caused by `exa` depending on - # https://github.com/rust-datetime/zoneinfo-compiled.git - depsSha256 = "0qsqkgc1wxigvskhaamgfp5pyc2kprsikhcfccysgs07w44nxkd0"; + depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; - rev = "110a1c716bfc4a7f74f74b3c4f0a881c773fcd06"; - sha256 = "136yxi85m50vwmqinr1wnd0h29n5yjykqqqk9ibbcmmhx8sqhjzf"; + rev = "v${version}"; + sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl zlib ]; + nativeBuildInputs = [ cmake pkgconfig perl ]; + buildInputs = [ zlib ]; # Some tests fail, but Travis ensures a proper build doCheck = false; + cargoUpdateHook = '' + ${cargoPatch} + ''; + cargoDepsHook = '' + pushd $sourceRoot + ${cargoPatch} + popd + ''; + meta = with stdenv.lib; { description = "Replacement for 'ls' written in Rust"; longDescription = '' @@ -33,9 +57,8 @@ buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; - homepage = http://bsago.me/exa; + homepage = http://the.exa.website; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; - broken = true; }; } diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index f34c9b6db230..5010343d3c71 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.4.5"; + version = "2.2.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "01hfh2gmap3qd9qc5ncp1sxagrsi8q6cdjxxspwpmrc4d4cmzcr0"; + sha256 = "1795n6s0sp9hw8amx2hs9r395gv4c5sn63g077g1gal1vcpkcssn"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--libdir=\${prefix}/lib" "--includedir=\${prefix}/include" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" @@ -27,7 +28,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/execline/; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index b1e9990ea7d4..232eb68c8a60 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,21 +1,26 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "file-5.28"; - - buildInputs = [ zlib ]; + name = "file-${version}"; + version = "5.31"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" - "http://distfiles.macports.org/file/${name}.tar.gz" + "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "04p0w9ggqq6cqvwhyni0flji1z0rwrz896hmhkxd2mc6dca5xjqf"; + sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89"; }; - meta = { + buildInputs = [ zlib ]; + + doCheck = true; + + + meta = with stdenv.lib; { homepage = "http://darwinsys.com/file"; description = "A program that shows the type of files"; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 53d75485d5ca..06a140fed502 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/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 2cccee0a4e3b..ca636420854a 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, lib , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango +, withSpiro ? false, libspiro , withGTK ? false, gtk2 , withPython ? true , Carbon ? null, Cocoa ? null @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] + ++ lib.optionals withSpiro [libspiro] ++ lib.optionals withGTK [ gtk2 pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -57,6 +59,7 @@ stdenv.mkDerivation rec { description = "A font editor"; homepage = http://fontforge.github.io; platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix new file mode 100644 index 000000000000..046c1d449201 --- /dev/null +++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix @@ -0,0 +1,24 @@ +{stdenv, fontforge, zlib}: +stdenv.mkDerivation rec { + name = "fontforge-fonttools-${fontforge.version}"; + src = fontforge.src; + + buildInputs = [zlib]; + + setSourceRoot = ''export sourceRoot="$(echo */contrib/fonttools)"''; + + installPhase = '' + mkdir -p "$out"/{bin,share/doc/fontforge-fonttools} + for i in *.c; do + gcc "$i" -lz -lm --std=c99 -o "$out"/bin/$(basename "$i" .c) + done + cp README* "$out/share/doc/fontforge-fonttools" + ''; + + meta = with stdenv.lib; { + description = ''Small font tools shipped in FontForge contrib''; + license = fontforge.meta.license; + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix new file mode 100644 index 000000000000..32deb0c23067 --- /dev/null +++ b/pkgs/tools/misc/fsql/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "fsql-${version}"; + version = "0.3.1"; + + goPackagePath = "github.com/kshvmdn/fsql"; + + src = fetchFromGitHub { + owner = "kshvmdn"; + repo = "fsql"; + rev = "v${version}"; + sha256 = "1accpxryk4744ydfrqc3la5k376ji11yr84n66dz5cx0f3n71vmz"; + }; + + meta = with stdenv.lib; { + description = "Search through your filesystem with SQL-esque queries"; + homepage = https://github.com/kshvmdn/fsql; + license = licenses.mit; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + inherit version; + }; + +} diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix new file mode 100644 index 000000000000..8937de88c38d --- /dev/null +++ b/pkgs/tools/misc/fwup/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +, zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium +, libarchive, darwin, coreutils }: + +stdenv.mkDerivation rec { + name = "fwup-${version}"; + version = "0.14.3"; + + src = fetchFromGitHub { + owner = "fhunleth"; + repo = "fwup"; + rev = "v${version}"; + sha256 = "15sjpxw1llpipshriivpha6470lkvhcgs5wh5mlaabjbvrgxygqh"; + }; + + doCheck = true; + patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; + buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.DiskArbitration + ]; + propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ]; + + # segfaults on darwin without + NIX_LDFLAGS = lib.optional stdenv.isDarwin "-F/System/Library/Frameworks"; + + meta = with stdenv.lib; { + description = "Configurable embedded Linux firmware update creator and runner"; + homepage = https://github.com/fhunleth/fwup; + license = licenses.asl20; + maintainers = [ maintainers.georgewhewell ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch b/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch new file mode 100644 index 000000000000..b04b436ff5b1 --- /dev/null +++ b/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch @@ -0,0 +1,25 @@ +diff --git a/tests/common-orig.sh b/tests/common.sh +index 1f2673f..79dcf74 100755 +--- a/tests/common-orig.sh ++++ b/tests/common.sh +@@ -21,20 +21,6 @@ else + fi + + case "$HOST_OS" in +- Darwin) +- # BSD stat +- STAT_FILESIZE_FLAGS="-f %z" +- +- # Not -d? +- BASE64_DECODE=-D +- +- READLINK=/usr/local/bin/greadlink +- [ -e $READLINK ] || ( echo "Please run 'brew install coreutils' to install greadlink"; exit 1 ) +- [ -e /usr/local/bin/mdir ] || ( echo "Please run 'brew install mtools' to install mdir"; exit 1 ) +- +- FSCK_FAT=fsck_msdos +- TIMEOUT=gtimeout +- ;; + FreeBSD|NetBSD|OpenBSD|DragonFly) + # BSD stat + STAT_FILESIZE_FLAGS="-f %z" diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 84b074de6cc9..916ba99317e8 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }: buildGoPackage rec { name = "fzf-${version}"; - version = "0.16.4"; + version = "0.16.10"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,11 +11,13 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0kq4j6q1xk17ryzzcb8s6l2zqsjkk75lrwalias9gwcriqs6k6yn"; + sha256 = "0c9c9x2pim5g2jwy6jkdws2s7b1mw2qlnba1q46a1izswm7ljfq7"; }; outputs = [ "bin" "out" "man" ]; + fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; + buildInputs = [ ncurses ]; goDeps = ./deps.nix; @@ -25,12 +27,19 @@ buildGoPackage rec { sed -i -e "s|expand(':h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim ''; + preInstall = '' + mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d + cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish + cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish + ''; + postInstall = '' cp $src/bin/fzf-tmux $bin/bin mkdir -p $man/share/man 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/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix index 170761078c9e..7622a5f7b3b2 100644 --- a/pkgs/tools/misc/fzf/deps.nix +++ b/pkgs/tools/misc/fzf/deps.nix @@ -1,30 +1,57 @@ # This file was generated by go2nix. [ { - goPackagePath = "github.com/junegunn/go-isatty"; + goPackagePath = "github.com/gdamore/encoding"; fetch = { type = "git"; - url = "https://github.com/junegunn/go-isatty"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "44772c121bb7838819d3ba4a7e84c0c2d617328e"; + sha256 = "1l6yhy2bqckanjvixzvslz6qjjl5s0ciqf9hvk6625a7kfx030i6"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "c900de9dbbc73129068f5af6a823068fc5f2308c"; + sha256 = "0h6dkm5cvnlibngdhkqq7dh8ql8fjzfxn9xqpl3nv10rfwqdk80h"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; }; } { - goPackagePath = "github.com/junegunn/go-runewidth"; + goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; - url = "https://github.com/junegunn/go-runewidth"; - rev = "63c378b851290989b19ca955468386485f118c65"; - sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; + url = "https://github.com/mattn/go-runewidth"; + rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; + sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; }; } { - goPackagePath = "github.com/junegunn/go-shellwords"; + goPackagePath = "github.com/mattn/go-shellwords"; fetch = { type = "git"; - url = "https://github.com/junegunn/go-shellwords"; - rev = "33bd8f1ebe16d6e5eb688cc885749a63059e9167"; - sha256 = "0xcymw0fm0ir8d9swh1bkpknnqgx5ijjsj433z4d9riy8h8ywpw8"; + url = "https://github.com/mattn/go-shellwords"; + rev = "02e3cf038dcea8290e44424da473dd12be796a8a"; + sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr"; }; } { @@ -32,8 +59,26 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "854ae91cdcbf914b499b1d7641d07859f3653481"; - sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7"; + rev = "e1a4589e7d3ea14a3352255d04b6f1a418845e5e"; + sha256 = "1w90z8r4v96rqx723shjgl8dis12bfmihila20fxid11m8digk5h"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "b90f89a1e7a9c1f6b918820b3daa7f08488c8594"; + sha256 = "1bnvvk2z6wlmh39wza9cdf81nbyjfssdh86iywnnpxa7n9lg9dxq"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "4ee4af566555f5fbe026368b75596286a312663a"; + sha256 = "1zybf6nd47fr9vb587yvmzhmkzf2p58g9q5bz4q5mzpnz22ski3a"; }; } ] diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index da7af7ef66f6..b1f3cff0839e 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.2.2"; + version = "2.2.3"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1d6fbyc9m2dkmlv03w3b1n8vq6sga888ag1k55mq3rgn4ba1kx26"; + sha256 = "02x8brzlyx7qpxb1pgs74iv1gdykvs7cihff0rzjmh7bp1y1xq1x"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 979f409dde93..02ec3ba5493a 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -35,6 +35,19 @@ in { description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; + internal-logs = glPlugin rec { + name = "graylog-internal-logs-${version}"; + pluginName = "graylog-plugin-internal-logs"; + version = "1.0.0"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1abl7wwr59k9vvr2fmrlrx4ipsjjl8xryqy19fy5irxhpwp93ixl"; + }; + meta = { + homepage = "https://github.com/graylog-labs/graylog-plugin-internal-logs"; + description = "Graylog plugin to record internal logs of Graylog efficiently instead of sending them over the network"; + }; + }; ipanonymizer = glPlugin rec { name = "graylog-ipanonymizer-${version}"; pluginName = "graylog-plugin-ipanonymizer"; @@ -61,6 +74,19 @@ in { description = "Jabber Alarmcallback Plugin for Graylog"; }; }; + mongodb-profiler = glPlugin rec { + name = "graylog-mongodb-profiler-${version}"; + pluginName = "graylog-plugin-mongodb-profiler"; + version = "2.0.1"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1hadxyawdz234lal3dq5cy3zppl7ixxviw96iallyav83xyi23i8"; + }; + meta = { + homepage = "https://github.com/graylog-labs/graylog-plugin-mongodb-profiler"; + description = "Graylog input plugin that reads MongoDB profiler data"; + }; + }; netflow = glPlugin rec { name = "graylog-netflow-${version}"; pluginName = "graylog-plugin-netflow"; @@ -103,10 +129,10 @@ in { threatintel = glPlugin rec { name = "graylog-threatintel-${version}"; pluginName = "graylog-plugin-threatintel"; - version = "0.9.2"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0d2cjcgjwfqp6b756n68zbslm1pq1z9dhn6iiskmv6jdpkffjw3l"; + sha256 = "0clg0vy8aipw122rfqww1lnjriazlnnh77pqiy5vnmv6ycjw0y4i"; }; meta = { homepage = "https://github.com/Graylog2/graylog-plugin-threatintel"; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 5fcde9bdaeb7..c554c13bb4ab 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { name = "grc-${version}"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "garabik"; repo = "grc"; rev = "v${version}"; - sha256 = "1c2ndnbyznb608h3s99fbcyh4qb1ccipxm15lyszrrks0w2llbah"; + sha256 = "10h65qmv2cymixzfsckfcn6f01xsjzfq1x303rv01nibniwbq5z9"; }; buildInputs = with python3Packages; [ wrapPython makeWrapper ]; installPhase = '' + runHook preInstall + ./install.sh "$out" "$out" for f in $out/bin/* ; do @@ -25,13 +27,15 @@ stdenv.mkDerivation rec { wrapProgram $f \ --prefix PATH : $out/bin done + + runHook postInstall ''; meta = with stdenv.lib; { description = "Yet another colouriser for beautifying your logfiles or output of commands"; homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html; license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 AndersonTorres ]; + maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 7a70f2bdbff3..2bbeea8133e7 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 000000000000..e9883149ab5d --- /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 000000000000..69115b7101c9 --- /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 000000000000..ee6e5065f40b --- /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 000000000000..bc8ea769e8be --- /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/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 7215cccbfed8..192da26b452e 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -12,7 +12,10 @@ # (--enable-unsupported could be used to force the build) assert !cpp || mpi == null; -with { inherit (stdenv.lib) optional optionals; }; +# No point splitting version 1.8.18 into multiple outputs. +# The library /lib/libhdf5.so has a reference to gcc-wrapper + +let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { version = "1.8.18"; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 20f199ae73f9..499b4a87bc43 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -4,25 +4,25 @@ with rustPlatform; buildRustPackage rec { name = "heatseeker-${version}"; - version = "1.4.0"; - - depsSha256 = "1acimdkl6ra9jlyiydzzd6ccdygr5is2xf9gw8i45xzh0xnsq226"; + version = "1.5.1"; src = fetchFromGitHub { owner = "rschmitt"; repo = "heatseeker"; rev = "v${version}"; - sha256 = "1v2p6l4bdmvn9jggb12p0j5ajjvnbcdjsiavlcqiijz2w8wcdgs8"; + sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; }; + depsSha256 = "05mj84a5k65ai492grwg03c3wq6ardhs114bv951fgysc9rs07p5"; + # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of - TRAVIS= "true"; + TRAVIS = "true"; meta = with stdenv.lib; { description = "A general-purpose fuzzy selector"; homepage = https://github.com/rschmitt/heatseeker; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = [ maintainers.michaelpj ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix new file mode 100644 index 000000000000..f7be5dbbbe46 --- /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 4fb71b688c36..9e21ab5e38ff 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 000000000000..0ebad4f7117d --- /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/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix new file mode 100644 index 000000000000..b6b2bc9a25cb --- /dev/null +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -0,0 +1,73 @@ +{ lib, coreutils, curl, fetchFromGitHub, unzip, p7zip, gnused, gnugrep, stdenv +, blacklist ? [ "adwords.google.com" ] +, whitelist ? [ + ".dropbox.com" + " www.malwaredomainlists.com" + " www.arcamax.com" + " www.instructables.com" + " goo.gl" + " www.reddit.com" + " t.co" + " bit.ly" + " www.viddler.com" + " viddler.com" + " tinyurl.com" + " ompldr.org" + " www.ompldr.org" + "login.yahoo.com" + " l.yimg.com" + ".bp.blogspot.com" +] }: + +stdenv.mkDerivation rec { + name = "hostsblock-${version}"; + version = "20161213"; + + src = fetchFromGitHub { + owner = "gaenserich"; + repo = "hostsblock"; + rev = "91cacbdfbfb5e7ae9ba3babf8de41e135270c310"; + sha256 = "1w91fbgf8v2nn0a6m8l6kd455km2j1lvpvqil4yxhrg018aigax0"; + }; + + installPhase = '' + mkdir -p $out/bin + install -Dm744 src/hostsblock.sh $out/bin/hostsblock + install -Dm744 src/hostsblock-urlcheck.sh $out/bin/hostsblock-urlcheck + + mkdir -p $out/lib + install -Dm644 src/hostsblock-common.sh $out/lib/ + + mkdir -p $out/etc + install -Dm644 conf/hostsblock.conf $out/etc/ + ${lib.concatMapStrings (d: "echo ${d} >> $out/etc/black.list\n") blacklist} + ${lib.concatMapStrings (d: "echo ${d} >> $out/etc/white.list\n") whitelist} + install -Dm644 conf/hosts.head $out/etc/ + + for f in $out/bin/* $out/lib/* $out/etc/hostsblock.conf; do + substituteInPlace $f --replace "/dev/shm" "/tmp" + substituteInPlace $f --replace "/usr/lib/" "$out/lib/" + substituteInPlace $f --replace "/etc/hostsblock/" "$out/etc/" + sed --in-place --regexp-extended "s|([\` ])curl |\1${curl}/bin/curl |g" $f + substituteInPlace $f --replace grep ${gnugrep}/bin/grep + substituteInPlace $f --replace " sed " " ${gnused}/bin/sed " + sed --in-place --regexp-extended "s|([^_])unzip |\1${unzip}/bin/unzip |" $f + sed --in-place --regexp-extended "s|7za([^,])|${p7zip}/bin/7za\1|g" $f + done + + echo "postprocess(){ ${coreutils}/bin/true; }" >> $out/etc/hostsblock.conf + + mkdir -p $out/share/dbus-1/system-services + install -Dm644 systemd/hostsblock.service $out/share/dbus-1/system-services + install -Dm644 systemd/hostsblock.timer $out/share/dbus-1/system-services + ''; + + meta = with lib; { + description = "An ad- and malware-blocking script for Linux"; + website = http://gaenserich.github.io/hostsblock/; + license = licenses.gpl3; + maintainers = [ maintainers.nicknovitski ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 503beefa15af..99f19889201a 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isLinux emacs; - doCheck = true; + doCheck = !stdenv.isDarwin; patches = [ ./nix-mapping.patch ]; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 734d8fb78e23..4c390f1e80e2 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec { markupsafe netaddr pyasn1 - requests2 + requests setuptools ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 6ffd36312a3e..9abfdea5f7b9 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "keychain-${version}"; - version = "2.8.0"; + version = "2.8.3"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; - rev = "1c8eaba53a7788d12d086b66ac3929810510f73a"; - sha256 = "0ajas58cv8mp5wb6hn1zhsqiwfxvx69p4f91a5j2as299rxgrxlp"; + rev = "${version}"; + sha256 = "0za2fi4g7ixzj3izgwlv71b3cviz3qhz43y4bhdkglg16x5cnzcb"; }; buildInputs = [ makeWrapper perl ]; @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib; platforms.linux ++ platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ sigma ]; }; } diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 5ba2543e273d..d74e2b4e12a7 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,29 +1,25 @@ { - kdeDerivation, kdeWrapper, fetchurl, lib, - extra-cmake-modules, kdoctools, - kconfig, kinit + mkDerivation, fetchurl, lib, + extra-cmake-modules, kdoctools, wrapGAppsHook, + kconfig, kcrash, kinit }: let pname = "kronometer"; version = "2.1.3"; - unwrapped = kdeDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i"; - }; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kconfig kinit ]; - }; in -kdeWrapper { - inherit unwrapped; - targets = [ "bin/kronometer" ]; +mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i"; + }; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + propagatedBuildInputs = [ kconfig kcrash kinit ]; } diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix new file mode 100644 index 000000000000..738eceb20a0e --- /dev/null +++ b/pkgs/tools/misc/kt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "kt-${version}"; + version = "11.1.0"; + + src = fetchFromGitHub { + owner = "fgeller"; + repo = "kt"; + rev = "v${version}"; + sha256 = "1ymygd3l5pfbnjmdjcrspj520v29hnv3bdgxpim38dpv3qj518vq"; + }; + + goPackagePath = "github.com/fgeller/kt"; + + meta = with stdenv.lib; { + description = "Kafka command line tool"; + homepage = https://github.com/fgeller/kt; + maintainers = with maintainers; [ utdemir ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix new file mode 100644 index 000000000000..596a72ee5ac1 --- /dev/null +++ b/pkgs/tools/misc/latex2html/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, makeWrapper +, ghostscript, netpbm, perl }: +# TODO: withTex + +# Ported from Homebrew. +# https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb + +stdenv.mkDerivation rec { + name = "latex2html-${version}"; + version = "2016"; + + src = fetchurl { + url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz"; + sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db"; + }; + + buildInputs = [ ghostscript netpbm perl ]; + + nativeBuildInputs = [ makeWrapper ]; + + configurePhase = '' + ./configure \ + --prefix="$out" \ + --without-mktexlsr \ + --with-texpath=$out/share/texmf/tex/latex/html + ''; + + postInstall = '' + for p in $out/bin/{latex2html,pstoimg}; do \ + wrapProgram $p --add-flags '--tmp="''${TMPDIR:-/tmp}"' + done + ''; + + meta = with stdenv.lib; { + description = "LaTeX-to-HTML translator"; + longDescription = '' + A Perl program that translates LaTeX into HTML (HyperText Markup + Language), optionally creating separate HTML files corresponding to each + unit (e.g., section) of the document. LaTeX2HTML proceeds by interpreting + LaTeX (to the best of its abilities). It contains definitions from a wide + variety of classes and packages, and users may add further definitions by + writing Perl scripts that provide information about class/package + commands. + ''; + + homepage = "https://www.ctan.org/pkg/latex2html"; + + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 9693556862bd..b3370a3cab1f 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { - name = "less-481"; + name = "less-487"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz"; + sha256 = "01i7n6jaxwmww3pasy3hg38zc6x7jw0w05mqqvh6caqbrdaq9p7k"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index c54f8ebec0d0..a8bab014b9e3 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-02-04"; + version = "2017-05-15"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "c55c4bf254d59c4e943d5559cd6e062652751e36"; # nightly - sha256 = "0jq85pfhpzdplv083mxbys7pp8igcvhp4daa9dh0yn4xbd8x821d"; + rev = "9962b378a816c2f792dcbfe9e3f58ae16d5969dd"; # nightly + sha256 = "1ln14ma2iajlp9klj4bhrq0y9955rpw9aggvj7hcj1m5yqa0sdqn"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index d3aff8de33cc..bb136e98d66d 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; # master - sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; + rev = "7994c181db7761ca3c67a217068cf31826113f5f"; # master + sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj"; }; } { diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index e26533d46429..410ab4543123 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchgit +, fetchFromGitHub , libtool , automake , autoconf @@ -7,18 +7,19 @@ }: stdenv.mkDerivation rec { name = "libcpuid-${version}"; - version = "0.2.2"; + version = "0.4.0"; - src = fetchgit { - url = https://github.com/anrieff/libcpuid.git; - rev = "535ec64dd9d8df4c5a8d34b985280b58a5396fcf"; - sha256 = "1j9pg7fyvqhr859k5yh8ccl9jjx65c7rrsddji83qmqyg0vp1k1a"; + src = fetchFromGitHub { + owner = "anrieff"; + repo = "libcpuid"; + rev = "v${version}"; + sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7"; }; patchPhase = '' libtoolize autoreconf --install - ''; + ''; configurePhase = '' mkdir -p Install @@ -45,12 +46,12 @@ stdenv.mkDerivation rec { mkdir -p $out sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc - + cp -r Install/* $out cp -r tests $out ''; - buildInputs = [ + nativeBuildInputs = [ libtool automake autoconf diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 23e823eb9632..206fe987e626 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses, - readline, zlib, bzip2, autoconf, automake }: +{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses +, readline, zlib, bzip2, autoconf, automake, curl }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0pag2rl7b6s2xfl80c629vhwsdvvlhcdy6732yvpgfv94w0zyjp9"; + sha256 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc"; inherit name; }; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { pcre-cpp readline sqlite + curl ]; preConfigure = '' @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.1"; + version = "0.8.2"; maintainers = [ maintainers.dochang ]; }; diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix new file mode 100644 index 000000000000..6ebf86b06fa4 --- /dev/null +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -0,0 +1,31 @@ +{ cabextract, glibc_multi, fetchFromGitHub, readline, stdenv_32bit }: + +# stdenv_32bit is needed because the program depends upon 32-bit libraries and does not have +# support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. + +stdenv_32bit.mkDerivation rec { + name = "loadlibrary-${version}"; + version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}"; + rev = "721b084c088d779075405b7f20c77c2578e2a961"; + src = fetchFromGitHub { + inherit rev; + owner = "taviso"; + repo = "loadlibrary"; + sha256 = "01hb7wzfh1s5b8cvmrmr1gqknpq5zpzj9prq3wrpsgg129jpsjkb"; + }; + + buildInputs = [ glibc_multi cabextract readline stdenv_32bit.cc.libc ]; + + installPhase = '' + mkdir -p $out/bin/ + cp mpclient $out/bin/ + ''; + + meta = with stdenv_32bit.lib; { + homepage = "https://github.com/taviso/loadlibrary"; + description = "Porting Windows Dynamic Link Libraries to Linux"; + platforms = platforms.linux; + maintainers = [ maintainers.eleanor ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix new file mode 100644 index 000000000000..2628c777140d --- /dev/null +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, elk5Version, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = elk5Version; + name = "logstash-${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = "1z3rwpwafrn6h0rzdsmripnwj8ad33v92ryxq8xf9y7331rqb2gs"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + buildInputs = [ + makeWrapper jre + ]; + + installPhase = '' + mkdir -p $out + cp -r {Gemfile*,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = https://www.elastic.co/products/logstash; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.wjlroe maintainers.offline ]; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 7ea7789687fb..0828fea81e1c 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -4,17 +4,22 @@ stdenv.mkDerivation rec { name = "mc-${version}"; version = "4.8.19"; - + src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; }; - + buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; configureFlags = [ "--enable-vfs-smb" ]; + postFixup = '' + # remove unwanted build-dependency references + sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc + ''; + meta = { description = "File Manager and User Shell for the GNU Project"; homepage = http://www.midnight-commander.org; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index cbebd557d77c..5341c9840be8 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/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index c62bd45fef8d..0e1d3b8f49f3 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl, openssl}: +{stdenv, fetchFromGitHub, openssl}: -stdenv.mkDerivation { - name = "mktorrent-1.0"; +stdenv.mkDerivation rec { + name = "mktorrent-${version}"; + version = "1.1"; - src = fetchurl { - url = mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz; - sha256 = "17qi3nfky240pq6qcmf5qg324mxm83vk9r3nvsdhsvinyqm5d3kg"; + src = fetchFromGitHub { + owner = "Rudde"; + repo = "mktorrent"; + rev = "v${version}"; + sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr"; }; makeFlags = "USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1" @@ -22,7 +25,6 @@ stdenv.mkDerivation { homepage = http://mktorrent.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric profpatsch]; }; } diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index a232028976dc..dbb80067e6db 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, 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 { name = "moreutils-${version}"; - version = "0.59"; + version = "0.61"; - src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; - sha256 = "1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4"; + src = fetchgit { + url = "git://git.joeyh.name/moreutils"; + rev = "refs/tags/${version}"; + sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr"; }; preBuild = '' 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"; @@ -25,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = https://joeyh.name/code/moreutils/; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix index 6fb0b9c8201b..554aa0bccee2 100644 --- a/pkgs/tools/misc/nixbot/default.nix +++ b/pkgs/tools/misc/nixbot/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - desciption = "Github bot for reviewing/testing pull requests with the help of Hydra"; + description = "Github bot for reviewing/testing pull requests with the help of Hydra"; maintainers = with maintainers; [ domenkozar fpletz globin ]; license = licenses.asl20; homepage = https://github.com/domenkozar/nixbot; diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix new file mode 100644 index 000000000000..3cce28df4f3d --- /dev/null +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3 }: + +stdenv.mkDerivation { + name = "odroid-xu3-bootloader-2015-12-04"; + + src = fetchFromGitHub { + owner = "hardkernel"; + repo = "u-boot"; + rev = "fe2f831fd44a4071f58a42f260164544697aa666"; + sha256 = "1h5yvawzla0vqhkk98gxcwc824bhc936bh6j77qkyspvqcw761fr"; + }; + + buildCommand = '' + install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel_1mb_uboot/{bl2,tzsw}.* + install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/bl1.* + ln -sf ${ubootOdroidXU3}/u-boot-dtb.bin $out/lib/sd_fuse-xu3/u-boot-dtb.bin + + install -Dm755 $src/sd_fuse/hardkernel_1mb_uboot/sd_fusing.1M.sh $out/bin/sd_fuse-xu3 + sed -i \ + -e '1i#!${stdenv.shell}' \ + -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \ + -e '/set -x/d' \ + -e 's,.\/sd_fusing\.sh,sd_fuse-xu3,g' \ + -e "s,\./,$out/lib/sd_fuse-xu3/,g" \ + $out/bin/sd_fuse-xu3 + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.unfreeRedistributableFirmware; + description = "Secure boot enabled boot loader for ODROID-XU{3,4}"; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix index 9da59824e292..8d3850745f11 100644 --- a/pkgs/tools/misc/openopc/default.nix +++ b/pkgs/tools/misc/openopc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python }: let - pythonEnv = python.withPackages(ps: [ps.pyro3]); + pythonEnv = python.withPackages(ps: [ps.Pyro]); in stdenv.mkDerivation rec { name = "openopc-${version}"; version = "1.2.0"; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix new file mode 100644 index 000000000000..98489358738c --- /dev/null +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: + +let + version = "0.92.1-unstable"; +in +stdenv.mkDerivation rec { + name = "osm2pgsql-${version}"; + + src = fetchgit { + url = "https://github.com/openstreetmap/osm2pgsql.git"; + rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66"; + # Still waiting on release after: + # https://github.com/openstreetmap/osm2pgsql/pull/684 + # https://github.com/openstreetmap/osm2pgsql/issues/634 + #rev = "refs/tags/${version}"; + sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy"; + }; + nativeBuildInputs = [cmake]; + buildInputs = [expat proj bzip2 zlib boost postgresql lua]; + + meta = { + description = "OpenStreetMap data to PostgreSQL converter"; + version = "0.92.1-unstable"; + homepage = https://github.com/openstreetmap/osm2pgsql; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 842616793a39..07326e7a8ed6 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,18 +1,16 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20170122"; + name = "parallel-20170522"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "19maf889vj1c4zakqwap58f44hgypyb5mzzwfsliir9gvvcq6zj1"; + sha256 = "1k5wlcc0dr2fxna0vi48s0l6pvbyl4pbclbih4103f1155im23ca"; }; - nativeBuildInputs = [ makeWrapper ]; - - preFixup = '' - sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* + nativeBuildInputs = [ makeWrapper perl ]; + postInstall = '' wrapProgram $out/bin/parallel \ ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ --prefix PATH : "${perl}/bin" \ diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 9cd8c28c7f07..0865044eac63 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchFromGitHub, autoreconfHook +, gtk2, intltool, pkgconfig }: stdenv.mkDerivation rec { - name = "parcellite-1.1.9"; + name = "parcellite-${version}"; + version = "1.2.1"; - src = fetchurl { - url = "mirror://sourceforge/parcellite/${name}.tar.gz"; - sha256 = "1m0igxny8f8hlbwcbsr4vg08808sqwy05h61ia2bxsrf122rba6b"; + src = fetchFromGitHub { + owner = "rickyrockrat"; + repo = "parcellite"; + rev = version; + sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + buildInputs = [ gtk2 ]; - meta = { + meta = with stdenv.lib; { description = "Lightweight GTK+ clipboard manager"; - homepage = "http://parcellite.sourceforge.net"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/rickyrockrat/parcellite; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix new file mode 100644 index 000000000000..a1c1eccdd88a --- /dev/null +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchurl, lib +, extra-cmake-modules, kdoctools, wrapGAppsHook +, kconfig, kcrash, kinit, kpmcore +, eject, libatasmart }: + +let + pname = "partitionmanager"; +in mkDerivation rec { + name = "${pname}-${version}"; + version = "3.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410"; + }; + + meta = with lib; { + description = "KDE Partition Manager"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + # refer to kpmcore for the use of eject + buildInputs = [ eject libatasmart ]; + propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ]; +} diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix new file mode 100644 index 000000000000..908da587d4b2 --- /dev/null +++ b/pkgs/tools/misc/patdiff/default.nix @@ -0,0 +1,12 @@ +{ ocamlPackages }: + +with ocamlPackages; + +janePackage { + name = "patdiff"; + hash = "15b6nkmd2z07j4nnmkb2g6qn3daw2xmmz3lgswkj03v29ffib014"; + buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ]; + meta = { + description = "File Diff using the Patience Diff algorithm"; + }; +} diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index 1c7a28e29756..a3fdca001d94 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,7 +1,7 @@ { - kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib, - extra-cmake-modules, kdoctools, - baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework + mkDerivation, fetchFromGitHub, fetchurl, lib, + extra-cmake-modules, kdoctools, wrapGAppsHook, + baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework }: let @@ -13,33 +13,28 @@ let rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7"; sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr"; }; - unwrapped = kdeDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq"; - }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - - propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ]; - - pathsToLink = [ "/etc/xdg/peruse.knsrc"]; - - preConfigure = '' - rm -rf src/qtquick/karchive-rar/external/unarr - ln -s ${unarr} src/qtquick/karchive-rar/external/unarr - ''; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; +in mkDerivation rec { + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${name}.tar.xz"; + sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami knewstuff plasma-framework ]; + + pathsToLink = [ "/etc/xdg/peruse.knsrc"]; + + preConfigure = '' + rm -rf src/qtquick/karchive-rar/external/unarr + ln -s ${unarr} src/qtquick/karchive-rar/external/unarr + ''; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; }; -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/peruse" "bin/perusecreator" ]; } diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix new file mode 100644 index 000000000000..d5908210cbdd --- /dev/null +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "phraseapp-client-${version}"; + version = "1.4.5"; + + goPackagePath = "github.com/phrase/phraseapp-client"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "phrase"; + repo = "phraseapp-client"; + rev = version; + sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp"; + }; + + meta = with stdenv.lib; { + homepage = http://docs.phraseapp.com; + description = "PhraseApp API v2 Command Line Client"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ manveru ]; + }; +} diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index a407a85d1a20..075949f47e1a 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,19 +2,23 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "1.4.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "thoughtbot"; repo = "pick"; rev = "v${version}"; - sha256 = "113if0jh7svwrwrxhrsbi7h1whfr5707v2ny4dc9kk2sjbv6b9pg"; + sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + sed -i -e 's/\[curses]/\[ncurses]/g' configure.ac + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Fuzzy text selection utility"; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index f287e39e7b23..bfafe0151a0a 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "picocom-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "npat-efault"; repo = "picocom"; rev = version; - sha256 = "1ac3xdfiw5bd24lw4l9hxc75rcagw0y182x7svhkqp2gwsvzkbjv"; + sha256 = "06b2ic34dnxc73cprc5imi3iamlhsv623sbg9vj5h5rvs586dwjx"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index d1b5481ad017..8282c2a1cd96 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 8a3aa08abb78..cd1e5457639b 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/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index dd94e379eed9..86750518bb5a 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,23 +1,21 @@ -{stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper}: +{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.24"; + version = "0.33"; src = fetchurl { url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2"; - sha256 = "0k62nd945pbgkshycijzrgdyrwj5kcswk33slaj7hr7d6r7bmb6p"; + sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f"; }; + propagatedBuildInputs = [ qtbase qtsvg qttools ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase qtsvg ]; - nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ]; preConfigure = '' - qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins/platformthemes/" - ''; - - preFixup = '' - wrapQtProgram $out/bin/qt5ct + qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix new file mode 100644 index 000000000000..9ba138bf0e9d --- /dev/null +++ b/pkgs/tools/misc/quota/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: + +stdenv.mkDerivation rec { + version = "4.03"; + name = "quota-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; + sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w"; + }; + + outputs = [ "out" "dev" "doc" "man" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ e2fsprogs openldap ]; + + meta = with stdenv.lib; { + description = "Tools to manage kernel-level quotas in Linux"; + homepage = http://sourceforge.net/projects/linuxquota/; + license = licenses.gpl2; # With some files being BSD as an exception + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix new file mode 100644 index 000000000000..63f32763f223 --- /dev/null +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, qtbase, qmake, libXrandr }: + +stdenv.mkDerivation rec { + + name = "radeon-profile-${version}"; + version = "20161221"; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase libXrandr ]; + + src = (fetchFromGitHub { + owner = "marazmista"; + repo = "radeon-profile"; + rev = version; + sha256 = "0zdmpc0rx6i0y32dcbz02whp95hpbmmbkmcp39f00byvjm5cprgg"; + }) + "/radeon-profile"; + + postInstall = '' + mkdir -p $out/bin + cp ./radeon-profile $out/bin/radeon-profile + ''; + + meta = with stdenv.lib; { + description = "Application to read current clocks of AMD Radeon cards"; + homepage = https://github.com/marazmista/radeon-profile; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 7ef6d2ce7ed4..f84b9563967f 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libusb1, qt5 }: +{ stdenv, fetchurl, pkgconfig, libusb1 +, qtbase, qttools, makeWrapper, qmake +, withEspeak ? false, espeak ? null }: stdenv.mkDerivation rec { name = "rockbox-utility-${version}"; @@ -9,15 +11,25 @@ stdenv.mkDerivation rec { sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; }; - buildInputs = [ libusb1 ] ++ (with qt5; [ qtbase qttools ]); - nativeBuildInputs = [ qt5.qmakeHook ]; + buildInputs = [ libusb1 qtbase qttools ] + ++ stdenv.lib.optional withEspeak espeak; + nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; preConfigure = '' cd rbutil/rbutilqt ''; installPhase = '' - install -Dm755 RockboxUtility $out/bin/RockboxUtility + runHook preInstall + + install -Dm755 RockboxUtility $out/bin/rockboxutility + ln -s $out/bin/rockboxutility $out/bin/RockboxUtility + wrapProgram $out/bin/rockboxutility \ + ${stdenv.lib.optionalString withEspeak '' + --prefix PATH : ${espeak}/bin + ''} + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index de4c97731ef5..ee5c37ef6bb1 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,18 +1,26 @@ -{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff -, tcl-8_5 }: +{ fetchurl, fetchpatch, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +, tcl-8_5, darwin }: stdenv.mkDerivation rec { - name = "rrdtool-1.6.0"; + name = "rrdtool-1.7.0"; src = fetchurl { url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "1msj1qsy3sdmx2g2rngp9a9qv50hz0ih7yx6nkx2b21drn4qx56d"; + 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 ] - ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5; + ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 70b36222cca9..bf5a158625c5 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,34 +1,38 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv, fetchurl, skalibs, gcc }: -let - - version = "2.0.5.3"; - -in stdenv.mkDerivation rec { +with stdenv.lib; +stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; + version = "2.1.0.0"; src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7"; + sha256 = "0khw5ljmlghvl4hyrf4vd0hl5rrmsspchi8w4xgniwfip6vlbqfd"; }; dontDisableStatic = true; configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" ] - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + # On darwin, the target triplet from -dumpmachine includes version number, but + # skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + platforms = platforms.all; + license = licenses.isc; + maintainers = with maintainers; [ pmahoney ]; }; } diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index 03c1273a7d32..38b313111376 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; maintainers = [ maintainers.chattered ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.linux; license = licenses.gpl3; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 7af602106ff3..6ef042abb159 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 800fad3b564e..d2bf060edd08 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, cmake, gengetopt, libX11, libXext, cppcheck}: +{ stdenv, fetchFromGitHub, cmake +, glew, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}: stdenv.mkDerivation rec { name = "slop-${version}"; - version = "4.1.16"; + version = "6.3.47"; - src = fetchurl { - url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz"; - sha256 = "0679ax0jr97x91hmp9qrspdka8cvl3xa77z92k4qgicbnb6hr7y2"; + src = fetchFromGitHub { + owner = "naelstrof"; + repo = "slop"; + rev = "v${version}"; + sha256 = "05saxp5z2saq6b5hslxdc5kd7ln00svr5pazabcnchzydfhnkmsd"; }; - buildInputs = [ cmake gengetopt libX11 libXext ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ glew glm mesa libX11 libXext libXrender icu ] ++ stdenv.lib.optional doCheck cppcheck; doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/naelstrof/slop; + inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with maintainers; [ mbakke ]; + maintainers = with maintainers; [ primeos mbakke ]; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index a2d6caa15352..a652243a9d60 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -2,19 +2,19 @@ , rtmpdump, substituteAll }: let - inherit (pythonPackages) python nose pycrypto requests2 mock; + inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw"; + sha256 = "15vjaia1qbs49gplpfi8sj5scl9mb4qg8n2z4zyzjs5461lx5qqv"; }; - pythonPaths = [ pycrypto requests2 ]; + pythonPaths = [ pycrypto requests ]; buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths; nativeBuildInputs = [ zip ]; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index fc4a24ec355b..04aa838270cd 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto +{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl , libxml2, desktop_file_utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify +, gobjectIntrospection, libgnome_keyring3 , cups-filters , pythonPackages , withGUI ? true }: -let majorVersion = "1.5"; - -in stdenv.mkDerivation rec { - name = "system-config-printer-${majorVersion}.7"; +stdenv.mkDerivation rec { + name = "system-config-printer-${version}"; + version = "1.5.9"; src = fetchurl { - url = "http://cyberelk.net/tim/data/system-config-printer/${majorVersion}/${name}.tar.xz"; - sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn"; + url = "https://github.com/zdohnal/system-config-printer/releases/download/v${version}/${name}.tar.gz"; + sha256 = "03bwlpsiqpxzcwd78a7rmwiww4jnqd7kl7il4kx78l1r57lasd2r"; }; - propagatedBuildInputs = [ pythonPackages.pycurl ]; - patches = [ ./detect_serverbindir.patch ]; buildInputs = [ intltool pkgconfig glib udev libusb1 cups xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils pythonPackages.python pythonPackages.wrapPython + libnotify gobjectIntrospection gdk_pixbuf pango atk + libgnome_keyring3 ]; + nativeBuildInputs = [ wrapGAppsHook ]; + pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests2 pycairo ]; + [ pycups pycurl dbus-python pygobject3 requests pycairo pythonPackages.pycurl ]; configureFlags = [ "--with-udev-rules" @@ -35,33 +37,22 @@ in stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + stripDebugList = [ "bin" "lib" "etc/udev" ]; + postInstall = - let - giTypelibPath = stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gdk_pixbuf.out gtk3.out pango.out atk.out libnotify.out ]; - in '' - export makeWrapperArgs="--set prefix $out \ - --set GI_TYPELIB_PATH ${giTypelibPath} \ - --set CUPS_DATADIR ${cups-filters}/share/cups" - wrapPythonPrograms - # The program imports itself, so we need to move shell wrappers to a proper place. - fixupWrapper() { - mv "$out/share/system-config-printer/$2.py" \ - "$out/bin/$1" - sed -i "s/.$2.py-wrapped/$2.py/g" "$out/bin/$1" - mv "$out/share/system-config-printer/.$2.py-wrapped" \ - "$out/share/system-config-printer/$2.py" - } - fixupWrapper scp-dbus-service scp-dbus-service - fixupWrapper system-config-printer system-config-printer - fixupWrapper system-config-printer-applet applet - # This __init__.py is both executed and imported. - ( cd $out/share/system-config-printer/troubleshoot - mv .__init__.py-wrapped __init__.py + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=( + --prefix PATH "$program_PATH" + --set CUPS_DATADIR "${cups-filters}/share/cups" ) + find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do + patchPythonScript "$f" + done + # The below line will be unneeded when the next upstream release arrives. - sed -i -e "s|/usr/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" + sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" # Manually expand literal "$(out)", which have failed to expand sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix new file mode 100644 index 000000000000..00fde7acafb4 --- /dev/null +++ b/pkgs/tools/misc/thefuck/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgs, ... }: + +pkgs.pythonPackages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "thefuck"; + version = "3.18"; + + src = fetchurl { + url = "https://github.com/nvbn/${pname}/archive/${version}.tar.gz"; + sha256 = "1xsvkqh89rgxq5w03mnlcfkn9y39nfwhb2pjabjspcc2mi2mq5y6"; + }; + + propagatedBuildInputs = with pkgs.pythonPackages; [ + psutil + colorama + six + decorator + pathlib2 + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/nvbn/thefuck"; + description = "Magnificent app which corrects your previous console command."; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 9a2f9b65e8c2..ff69fb01cea7 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 f02c41484818..a528f5f394fa 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/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 95d1a7275d9b..a749f250c11d 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.3"; + version = "2.5"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "14c6iw0p3adz7w8jm42w9f3s1zph9is10cbwdjgh5bvifrhxrary"; + sha256 = "0zwjngfaqrlwwbzicc5pq5pyws8f1qghcajvj0hwkipj51hqyswf"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 5e8966108661..5bf7dd49143e 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.8.1"; - sha256 = "1cpmlfa684j9r1hjya70nfcl5lzdbzmbi9hqbs5nhxha97b77qs5"; + version = "0.9.0"; + sha256 = "13p8rvf1naknjin1n97370ifyj475lyyh60cbw2v6gczi9rs84p3"; erubis = buildRubyGem rec { inherit ruby; @@ -33,7 +33,7 @@ buildRubyGem rec { description = "Manage complex tmux sessions easily"; homepage = https://github.com/tmuxinator/tmuxinator; license = licenses.mit; - maintainers = with maintainers; [ auntie ]; + maintainers = with maintainers; [ auntie ericsagnes ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 04b42f6d7228..03950d601d00 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,17 +2,17 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.2.2"; + version = "1.3.1"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "1g37pdxs0wmnskqm7qsqm0ygwpc1dxk1d7lrzpgs717zxaak8vln"; + sha256 = "189mxnb2pxj3wjijn56j8y5x1r23fil00fn2q7d6bd13vgr0f85s"; }; patchPhase = '' - sed -i 's/==.*$//' requirements/test.txt + sed -i 's/==.*$//' requirements/base.txt requirements/test.txt ''; buildInputs = with pythonPackages; [ diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 40fc72a0d713..77308ecf2ed8 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils +{ stdenv, fetchFromGitHub, fetchpatch, coreutils , python3, python3Packages, substituteAll }: assert stdenv.isLinux; @@ -21,6 +21,12 @@ python3Packages.buildPythonApplication rec { df = "${coreutils}/bin/df"; libc = "${stdenv.cc.libc.out}/lib/libc.so.6"; }) + + # Fix build on Python 3.6. + (fetchpatch { + url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch"; + sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp"; + }) ]; buildInputs = with python3Packages; [ nose mock ]; diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix index a836a2a0d0e9..238d2d73d3bb 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/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix new file mode 100644 index 000000000000..30473059d6d9 --- /dev/null +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }: + +stdenv.mkDerivation rec { + name = "ultrastar-creator-${version}"; + version = "2017-04-12"; + + src = fetchFromGitHub { + owner = "UltraStar-Deluxe"; + repo = "UltraStar-Creator"; + rev = "ac519a003f8283bfbe5e2d8e9cdff3a3faf97001"; + sha256 = "00idr8a178gvmylq722n13bli59kpxlsy5d8hlplqn7fih48mnzi"; + }; + + postPatch = with stdenv.lib; '' + # we don’t want prebuild binaries checked into version control! + rm -rf lib include + sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \ + -e 's|-L".*unix"||' \ + -e "/QMAKE_POST_LINK/d" \ + -e "s|../include/bass|${getLib libbass}/include|g" \ + -e "s|../include/bass_fx|${getLib libbass_fx}/include|g" \ + -e "s|../include/taglib|${getLib taglib}/include|g" \ + -i src/UltraStar-Creator.pro + ''; + + preConfigure = '' + cd src + ''; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase taglib libbass libbass_fx ]; + + meta = with stdenv.lib; { + description = "Ultrastar karaoke song creation tool"; + homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator; + license = licenses.gpl2; + maintainers = with maintainers; [ profpatsch ]; + }; +} diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix new file mode 100644 index 000000000000..af443661b6cd --- /dev/null +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -0,0 +1,120 @@ +{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins +, qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }: + +let + version = "2017-05-24"; + rev = "eed5dc41c849ab29b2dee37d97852fffdb45e390"; + sha256 = "1ymdgaffazndg9vhh47qqjr5873ld7j066hycp670r08bm519ysg"; + buildInputs = [ qtbase qtmultimedia taglib libmediainfo libzen libbass ]; + + plugins = [ + "albumartex" + "amazon" + "audiotag" + "cleanup" + "freecovers" + "lyric" + "preparatory" + "rename" + ]; + + patchedSrc = + let src = fetchFromGitHub { + owner = "UltraStar-Deluxe"; + repo = "UltraStar-Manager"; + inherit rev sha256; + }; + in stdenv.mkDerivation { + name = "${src.name}-patched"; + inherit src; + phases = [ "unpackPhase" "patchPhase" ]; + + patchPhase = with stdenv.lib; '' + # we don’t want prebuild binaries checked into version control! + rm -rf lib include + + # fix up main project file + sed -e 's|-L.*unix.*lbass.*$|-lbass|' \ + -e "/QMAKE_POST_LINK/d" \ + -e "s|../include/bass|${getLib libbass}/include|g" \ + -e "s|../include/taglib|${getLib taglib}/include|g" \ + -e "s|../include/mediainfo|${getLib libmediainfo}/include|g" \ + -i src/UltraStar-Manager.pro + + # if more plugins start depending on ../../../include, + # it should be abstracted out for all .pro files + sed -e "s|../../../include/taglib|${getLib taglib}/include/taglib|g" \ + -i src/plugins/audiotag/audiotag.pro + + mkdir $out + mv * $out + ''; + }; + + patchApplicationPath = file: path: '' + sed -e "s|QCore.*applicationDirPath()|QString(\"${path}\")|" -i "${file}" + ''; + + buildPlugin = name: stdenv.mkDerivation { + name = "ultrastar-manager-${name}-plugin-${version}"; + src = patchedSrc; + + buildInputs = [ qmake ] ++ buildInputs; + + postPatch = '' + sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \ + -i src/plugins/${name}/${name}.pro + + # plugins use the application’s binary folder (wtf) + for f in $(grep -lr "QCoreApplication::applicationDirPath" src/plugins); do + ${patchApplicationPath "$f" "\$out"} + done + + ''; + preConfigure = '' + cd src/plugins/${name} + ''; + }; + + builtPlugins = + symlinkJoin { + name = "ultrastar-manager-plugins-${version}"; + paths = map buildPlugin plugins; + }; + +in stdenv.mkDerivation { + name = "ultrastar-manager-${version}"; + src = patchedSrc; + + postPatch = '' + sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \ + -i src/UltraStar-Manager.pro + # patch plugin manager to point to the collected plugin folder + ${patchApplicationPath "src/plugins/QUPluginManager.cpp" builtPlugins} + ''; + + buildPhase = '' + find -path './src/plugins/*' -prune -type d -print0 \ + | xargs -0 -i'{}' basename '{}' \ + | sed -e '/shared/d' \ + > found_plugins + ${diffPlugins plugins "found_plugins"} + + cd src && qmake && make + ''; + + # is not installPhase so that qt post hooks can run + preInstall = '' + make install + ''; + + nativeBuildInputs = [ pkgconfig ]; + inherit buildInputs; + + meta = with stdenv.lib; { + description = "Ultrastar karaoke song manager"; + homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager; + license = licenses.gpl2; + maintainers = with maintainers; [ profpatsch ]; + }; +} diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index e8b93569c729..90758e909e5b 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.13"; + version = "2.14"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "1awhjw9zjlfb8s5g3yyx63f7ddfcr1sanlbxpqifmrgq24ql198b"; + sha256 = "9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index accd3b8070ad..fc8c40ea4e06 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { talking to your iPhone or iPod Touch over USB and coordinating access to its services by other applications.''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 4ef050b409e5..acb42a7a8d27 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + prePatch = '' + # do not set sticky bit in nix store + substituteInPlace Makefile.in \ + --replace 4555 0555 + sed -i '/chown $(OWNER)/d' Makefile.in + ''; + meta = { description = "Unix-unix cp over serial line, also includes cu program"; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index a5abc8bef831..731a194cc6a2 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,18 +6,18 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.14.1"; + version = "0.15.0"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"; + sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj"; }; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading requests_toolbelt - requests2 + requests atomicwrites ]; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix new file mode 100644 index 000000000000..231ee9ac1576 --- /dev/null +++ b/pkgs/tools/misc/vimer/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.2.0"; + name = "vimer-${version}"; + + src = fetchFromGitHub { + owner = "susam"; + repo = "vimer"; + rev = version; + sha256 = "01qhr3i7wasbaxvms39c81infpry2vk0nzh7r5m5b9p713p0phsi"; + }; + + installPhase = '' + mkdir $out/bin/ -p + cp vimer $out/bin/ + chmod +x $out/bin/vimer + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/susam/vimer"; + description = '' + A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files + in an existing instance of GVim or MacVim. + ''; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; + +} + diff --git a/pkgs/tools/misc/winusb/default.nix b/pkgs/tools/misc/winusb/default.nix new file mode 100644 index 000000000000..b99d77dd70fc --- /dev/null +++ b/pkgs/tools/misc/winusb/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, parted, grub2_light, p7zip +, wxGTK30, gksu }: + +stdenv.mkDerivation rec { + name = "winusb-unstable-2017-01-30"; + + src = fetchFromGitHub { + owner = "slacka"; + repo = "WinUSB"; + rev = "599f00cdfd5c931056c576e4b2ae04d9285c4192"; + sha256 = "1219425d1m4463jy85nrc5xz5qy5m8svidbiwnqicy7hp8pdwa7x"; + }; + + buildInputs = [ wxGTK30 makeWrapper ]; + + postInstall = '' + # don't write data into / + substituteInPlace $out/bin/winusb \ + --replace /media/ /tmp/winusb/ + + wrapProgram $out/bin/winusb \ + --prefix PATH : ${stdenv.lib.makeBinPath [ parted grub2_light p7zip ]} + wrapProgram $out/bin/winusbgui \ + --prefix PATH : ${stdenv.lib.makeBinPath [ gksu ]} + ''; + + meta = with stdenv.lib; { + description = "Create bootable USB disks from Windows ISO images"; + homepage = https://github.com/slacka/WinUSB; + license = licenses.gpl3; + maintainers = with maintainers; [ bjornfor gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix new file mode 100644 index 000000000000..5876cfb6b74a --- /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 408879a45345..c64ae609bcbb 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/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index d9f87a8d8940..a28614e2a263 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,19 +1,21 @@ -{ stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk -, lib, libaio, libcap, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su +{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk +, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { - name = "xfstests-2016-08-26"; + name = "xfstests-2017-07-16"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "21eb9d303cff056753a3104602ff674d468af52e"; - sha256 = "175nfdjfakxij7cmajjv2ycsiv4hkmx7b94nsylqrg51drx3jkji"; + rev = "c3893c2dc623a07b1ace8e72ee4beb29f8bfae15"; + sha256 = "1p42dakry4r2366hdgj4i1wcnjs4qk0bfmyr70r1n7s7ykvnvnrl"; }; - buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ]; + nativeBuildInputs = [ autoconf automake libtool ]; + buildInputs = [ acl attr gawk libaio libuuid libxfs openssl perl ]; hardeningDisable = [ "format" ]; + enableParallelBuilding = true; patchPhase = '' # Patch the destination directory @@ -22,6 +24,14 @@ stdenv.mkDerivation { # Don't canonicalize path to mkfs (in util-linux) - otherwise e.g. mkfs.ext4 isn't found sed -i common/config -e 's|^export MKFS_PROG=.*|export MKFS_PROG=mkfs|' + # Move the Linux-specific test output files to the correct place, or else it will + # try to move them at runtime. Also nuke all the irix crap. + for f in tests/*/*.out.linux; do + mv $f $(echo $f | sed -e 's/\.linux$//') + done + rm -f tests/*/*.out.irix + + # Fix up lots of impure paths for f in common/* tools/* tests/*/*; do sed -i $f -e 's|/bin/bash|${bash}/bin/bash|' sed -i $f -e 's|/bin/true|true|' @@ -46,6 +56,8 @@ stdenv.mkDerivation { export MAKE=$(type -P make) export SED=$(type -P sed) export SORT=$(type -P sort) + + make configure ''; postInstall = '' @@ -74,13 +86,13 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; meta = with stdenv.lib; { description = "Torture test suite for filesystems"; - homepage = "http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/cmds/xfstests.git"; + homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xxd/default.nix b/pkgs/tools/misc/xxd/default.nix new file mode 100644 index 000000000000..a4cfd4321ba0 --- /dev/null +++ b/pkgs/tools/misc/xxd/default.nix @@ -0,0 +1,16 @@ +{ stdenv, vim }: + +stdenv.mkDerivation rec { + name = "xxd-${version}"; + inherit (vim) version; + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/{bin,share/man/man1} + install -m755 ${stdenv.lib.getBin vim}/bin/xxd $out/bin/xxd + install -m644 ${stdenv.lib.getBin vim}/share/man/man1/xxd.1.gz $out/share/man/man1/xxd.1.gz + ''; + meta = with stdenv.lib; { + description = "Make a hexdump or do the reverse."; + inherit (vim.meta) homepage license maintainers platforms; + }; +} diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 1ceab4f18cf0..6063dbf4f9a5 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, xsel }: stdenv.mkDerivation rec { @@ -8,13 +8,12 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "0d1vvmz6wg1m2byd22bxikywnm2970kyfsm46fhagxardsxbp6hj"; + sha256 = "0nf9y3jsvfjxa3mgigywnyirznn1m4zjm1glnwndrjsjrkcpnzb5"; inherit name; }; - installPhase = '' - make PREFIX=$out install - ''; + installFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "YANKCMD=${xsel}/bin/xsel" ]; meta = with stdenv.lib; { homepage = "https://github.com/mptre/yank"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.8.0"; + version = "0.8.2"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index a7f2d445bca5..7fc9589537fe 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.11"; + version = "2.20"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "1fa2a25j3wwk3m6q1alilklwhqf337ch8rj6bwricc5zqb58qivc"; + 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 aa92e66d98fb..b730d45c9e20 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonApplication -, zip, ffmpeg, rtmpdump, atomicparsley, pandoc +, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,21 +8,23 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true +, hlsEncryptedSupport ? true , makeWrapper }: with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.03.10"; + version = "2017.07.09"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0ccrwhgycz17xmsdsd0rsv7khhp1z7dnwp7fkxx7dxbivjf0h0a4"; + sha256 = "0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ zip ] ++ optional generateManPage pandoc; + propagatedBuildInputs = optional hlsEncryptedSupport pycryptodome; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix new file mode 100644 index 000000000000..820f193e5e25 --- /dev/null +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -0,0 +1,42 @@ +{ pythonPackages, fetchurl, lib, + yubikey-personalization, libu2f-host, libusb1 }: + +pythonPackages.buildPythonPackage rec { + name = "yubikey-manager-0.3.1"; + + srcs = fetchurl { + url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; + sha256 = "0vrhaqb8yc1qjq25k9dv8gmqxhbf6aa047i6dvz1lcraq6zwnq6g"; + }; + + propagatedBuildInputs = + with pythonPackages; + lib.optional (!pythonPackages.pythonAtLeast "3.4") enum34 ++ [ + click + cryptography + pyscard + pyusb + six + ] ++ [ + libu2f-host + libusb1 + yubikey-personalization + ]; + + makeWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${libu2f-host}/lib:${libusb1}/lib:${yubikey-personalization}/lib" + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true + ''; + + meta = with lib; { + homepage = https://developers.yubico.com/yubikey-manager; + description = "Command line tool for configuring any YubiKey over all USB transports."; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ benley ]; + }; +} diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 71c9a113298f..36dd8339f26e 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington calrama ]; }; } diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix new file mode 100644 index 000000000000..77c06ea1911d --- /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/nagstamon/default.nix b/pkgs/tools/nagstamon/default.nix new file mode 100644 index 000000000000..3163b78437ec --- /dev/null +++ b/pkgs/tools/nagstamon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "nagstamon-${version}"; + version = "2.0.1"; + + src = fetchurl { + url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"; + sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b"; + }; + + # Test assumes darwin + doCheck = false; + + propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests + beautifulsoup4 ]; + + meta = with stdenv.lib; { + description = "A status monitor for the desktop"; + homepage = https://nagstamon.ifw-dresden.de/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + inherit version; + }; +} diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix deleted file mode 100644 index a821c6476f74..000000000000 --- a/pkgs/tools/networking/aiccu/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, gnutls, iproute, makeWrapper }: - -stdenv.mkDerivation rec { - - name = "aiccu-${version}"; - version = "20070115"; - - src = fetchurl { - url = "http://http.debian.net/debian/pool/main/a/aiccu/aiccu_20070115.orig.tar.gz"; - sha256 = "1k73vw7i25qzmnbvmsp3ci4pm6h8q70w70vnr512517s2q5gag6j"; - }; - - buildInputs = [ gnutls iproute makeWrapper ]; - - patches = [ - (fetchurl { - url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/gnutls-3.4.0.patch?h=packages/aiccu&id=cc6decc4e734420e4c5d0cd28652077f6bd88d84"; - sha256 = "1ni3lhwy3r54js124p7fhm1my82a703chvh07vrhslb4v4b71g5s"; - name = "gnutls-3.4.0.patch"; - }) - ]; - - configureFlags = "--prefix=$out"; - installPhase = '' - install -D -m 755 unix-console/aiccu $out/bin/aiccu - install -D -m 644 doc/aiccu.sgml $out/doc/aiccu.sgml - install -D -m 644 doc/aiccu.1 $out/share/man/man1/aiccu.1 - wrapProgram "$out/bin/aiccu" \ - --prefix PATH : "${iproute}/bin" - ''; - - meta = with stdenv.lib; { - description = "Automatic IPv6 Connectivity Configuration Utility"; - homepage = "https://www.sixxs.net/tools/aiccu/"; - longDescription = '' - A TIC+ heartbeart client for the public dynamic-IPv4 IPv6 tunnel beta test from the SixXS tunnel service provider. - ''; - maintainers = with maintainers; [ edwtjo ]; - license = "SixXS"; - platforms = with platforms; linux; - }; - -} diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 1f003f67df6d..8e37b85275d1 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "0d7z4bss1plkvlw5kfwzivxryrh13zi58ii3vf8q4csaz4yqhcjy"; + sha256 = "098ahj7nyf5c70221aq5q3aqllb94frz9lzig8rkhqfsa4mmslg5"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index 906e3eda3a65..ae36980a60d8 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Udev helper for naming devices per BIOS names"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = ["x86_64-linux" "i686-linux"]; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 6f7e4ba4b695..976285eeee71 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/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 32a8ca5f99e8..b805a4bfcf32 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "0vfdsajz2w6b7c94rxrj7fsr234jryhl2rbdlmb7h10gla8pnf50"; + sha256 = "0xb03dya1zhcn1gch2v2ynifxw95g8m3plr9q4ys0s3pvgf0g4cx"; }; buildInputs = [ readline texinfo nss nspr ] @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; - homepage = http://chrony.tuxfamily.org/; + homepage = https://chrony.tuxfamily.org/; repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 3000aacafa38..12a8a1a184fe 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,20 +1,14 @@ { stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: -let version = "18"; 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 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap"; + sha256 = "1dyqxi9l2pmrgm16a161909rg3vfzvib40frr7p6ddpk8yfh5888"; }; - patches = [(fetchpatch { - name = "glibc-2.25.diff"; - url = https://github.com/cjdelisle/cjdns/pull/1017.diff; - sha256 = "1k05d1w04lngcki56b6brkwg9xakzsbr5ibkcba8112v6jdzw51f"; - })]; - buildInputs = [ which python27 nodejs ] ++ # for flock stdenv.lib.optional stdenv.isLinux utillinux; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 91472b7c61e5..8b99182242b6 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }: +{ stdenv, fetchFromGitHub, qtbase, qmake, makeWrapper, libX11 }: stdenv.mkDerivation rec { name = "cmst-${version}"; - version = "2016.10.03"; + version = "2017.03.18"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = name; - sha256 = "1pvk1jg0fiw0j4f1wrnhgirgziliwa44sxfdmcq9ans4zbig4izh"; + sha256 = "0lsg8ya36df48ij0jawgli3f63hy6mn9zcla48whb1l4r7cih545"; }; - nativeBuildInputs = [ makeWrapper qmakeHook ]; + nativeBuildInputs = [ makeWrapper qmake ]; buildInputs = [ qtbase ]; diff --git a/pkgs/tools/networking/connman-gtk/default.nix b/pkgs/tools/networking/connman-gtk/default.nix new file mode 100644 index 000000000000..d5688354a76d --- /dev/null +++ b/pkgs/tools/networking/connman-gtk/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, intltool, pkgconfig, +gtk3, connman, openconnect, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "connman-gtk-${version}"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jgke"; + repo = "connman-gtk"; + rev = "v${version}"; + sha256 = "09k0hx5hxpbykvslv12l2fq9pxdwpd311mxj038hbqzjghcyidyr"; + }; + + nativeBuildInputs = [ + autoconf + automake + intltool + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + openconnect + connman + ]; + + preConfigure = '' + # m4/intltool.m4 is an invalid symbolic link + rm m4/intltool.m4 + ln -s ${intltool}/share/aclocal/intltool.m4 m4/ + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "GTK GUI for Connman"; + homepage = https://github.com/jgke/connman-gtk; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 565892181e44..5e4966a374bd 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.33"; + version = "1.34"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; - sha256 = "187mknq2i907gf8dz0i79359gn1qc9mryvqkcgb280d7dw1ld2dw"; + sha256 = "07n71wcy1c4cc01ca4dl9k1jpdqr5nsyr33dqf7k87wwfa681859"; }; buildInputs = [ openconnect polkit diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index e9b438a6037b..daf5a19b01c2 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,16 +21,15 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.53.1"; + name = "curl-7.54.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw"; + sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x"; }; - patches = [ ]; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; + separateDebugInfo = stdenv.isLinux; enableParallelBuilding = true; @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" + "--with-ca-fallback" "--disable-manual" ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index ddef8a70012d..d1171a3c8355 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -15,11 +15,12 @@ let propagatedBuildInputs = with pythonPackages; [ six - requests2 + requests websocket_client ipaddress backports_ssl_match_hostname docker_pycreds + uptime ]; # due to flake8 @@ -41,13 +42,13 @@ in stdenv.mkDerivation rec { python unzip makeWrapper - pythonPackages.requests2 + pythonPackages.requests pythonPackages.psycopg2 pythonPackages.psutil pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml - pythonPackages.pymongo + pythonPackages.pymongo_2_9_1 pythonPackages.python-etcd pythonPackages.consul docker_1_10 @@ -63,6 +64,9 @@ in stdenv.mkDerivation rec { ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd ln -s $out/agent/ddagent.py $out/bin/dd-forwarder + # Move out default conf.d so that /etc/dd-agent/conf.d is used + mv $out/agent/conf.d $out/agent/conf.d-system + cat > $out/bin/dd-jmxfetch < depends on + buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd; postInstall = '' # Previous versions required libtool files to load plugins; they are diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 4b1717e09025..801d41c852b8 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,11 +11,11 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.76"; + name = "dnsmasq-2.77"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "15lzih6671gh9knzpl8mxchiml7z5lfqzr7jm2r0rjhrxs6nk4jb"; + sha256 = "12lbbwpy1wxi6n5dngv30x8g8v13apdnvjgq7w71f9dfa0f3pb3f"; }; preBuild = '' diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b1f726ad27d6..a918aa6375f3 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, zlib, enableStatic ? false, -sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: +{ stdenv, lib, fetchurl, glibc, zlib +, enableStatic ? false +, sftpPath ? "/run/current-system/sw/libexec/sftp-server" +}: stdenv.mkDerivation rec { name = "dropbear-2016.74"; @@ -11,7 +13,7 @@ stdenv.mkDerivation rec { dontDisableStatic = enableStatic; - configureFlags = stdenv.lib.optional enableStatic "LDFLAGS=-static"; + configureFlags = lib.optional enableStatic "LDFLAGS=-static"; CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\""; @@ -20,20 +22,13 @@ 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 ./pass-path.patch ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 017da63a1e92..c7a6fbcfd7c7 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/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix index 1cb614e88c03..9737108e6acf 100644 --- a/pkgs/tools/networking/fakeroute/default.nix +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { ''; homepage = https://moxie.org/software/fakeroute/; license = licenses.bsd3; - platform = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index ab8e14fddd0b..02d3bebcd301 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - make posix + make CC=cc posix ''; installPhase = '' @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://savannah.nongnu.org/projects/flvstreamer; maintainers = [ stdenv.lib.maintainers.thammers ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index f846a711aa4a..ea78cdd106ac 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "gupnp-tools-${version}"; majorVersion = "0.8"; - version = "${majorVersion}.8"; + version = "${majorVersion}.13"; src = fetchurl { url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; - sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; + sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 1b917019662a..332edce45cd4 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,23 +1,47 @@ -{ stdenv, pkgs, fetchurl, openssl, zlib }: +{ useLua ? !stdenv.isDarwin +, usePcre ? true +, stdenv, fetchurl +, openssl, zlib, lua5_3 ? null, pcre ? null +}: + +assert useLua -> lua5_3 != null; +assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; majorVersion = "1.7"; - minorVersion = "2"; + minorVersion = "8"; version = "${majorVersion}.${minorVersion}"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz"; - sha256 = "0bsb5q3s1k5gqybv5p8zyvl6zh8iyidv3jb3wfmgwqad5bsl0nzr"; + sha256 = "0hp1k957idaphhmw4m0x8cdzdw9ga1mzgsnk2m0as86xrqy1b47c"; }; - buildInputs = [ openssl zlib ]; + buildInputs = [ openssl zlib ] + ++ stdenv.lib.optional useLua lua5_3 + ++ stdenv.lib.optional usePcre pcre; # TODO: make it work on bsd as well - preConfigure = '' - export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else if stdenv.isLinux then "linux2628" else "generic"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes ${stdenv.lib.optionalString stdenv.isDarwin "CC=cc USE_KQUEUE=1"}" - ''; + makeFlags = [ + "PREFIX=\${out}" + ("TARGET=" + (if stdenv.isSunOS then "solaris" + else if stdenv.isLinux then "linux2628" + else if stdenv.isDarwin then "osx" + else "generic")) + ]; + buildFlags = [ + "USE_OPENSSL=yes" + "USE_ZLIB=yes" + ] ++ stdenv.lib.optionals usePcre [ + "USE_PCRE=yes" + "USE_PCRE_JIT=yes" + ] ++ stdenv.lib.optionals useLua [ + "USE_LUA=yes" + "LUA_LIB=${lua5_3}/lib" + "LUA_INC=${lua5_3}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc"; meta = { description = "Reliable, high performance TCP/HTTP load balancer"; @@ -30,7 +54,7 @@ stdenv.mkDerivation rec { hardware. ''; homepage = http://haproxy.1wt.eu; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with stdenv.lib.maintainers; [ fuzzy-id garbas ]; platforms = with stdenv.lib.platforms; linux ++ darwin; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix new file mode 100644 index 000000000000..cfc9986b0db8 --- /dev/null +++ b/pkgs/tools/networking/hss/default.nix @@ -0,0 +1,34 @@ +{ lib, buildRubyGem, ruby, openssh }: + +# Example ~/.hss.yml +#--- +#patterns: +# - note: Basic test +# example: g -> github +# short: '^g$' +# long: 'git@github.com' + +buildRubyGem rec { + name = "hss-${version}"; + inherit ruby; + gemName = "hss"; + version = "1.0.1"; + sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; + + postInstall = '' + substituteInPlace $GEM_HOME/gems/${gemName}-${version}/bin/hss \ + --replace \ + "'ssh'" \ + "'${openssh}/bin/ssh'" + ''; + + meta = with lib; { + description = '' + A SSH helper that uses regex and fancy expansion to dynamically manage SSH shortcuts. + ''; + homepage = https://github.com/akerl/hss; + license = licenses.mit; + maintainers = with maintainers; [ nixy ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 09200f40c934..84420aa3efb0 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1jsgfkyzzizgfy1b0aicb4cp34d5pwskz9c4a8kf4rq3lrpjw87i"; }; - propagatedBuildInputs = with pythonPackages; [ pygments requests2 ]; + propagatedBuildInputs = with pythonPackages; [ pygments requests ]; doCheck = false; diff --git a/pkgs/tools/networking/hue-cli/Gemfile b/pkgs/tools/networking/hue-cli/Gemfile new file mode 100644 index 000000000000..7049659d503d --- /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 000000000000..3b1f65707008 --- /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 000000000000..4f8d1039e5ea --- /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 000000000000..d1af93ff154c --- /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 d5b9ff665d4a..e13ada5994cd 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/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b7527cf97cec..fd78c52bc4fb 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,24 +4,24 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.11.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1ky4ckv5p86xxgjkgxdi48c9q9h4pff2blilg03bxks8f8dxfy9f"; + sha256 = "1nlnzvb4n351zwg4vd15qjmm8xvbmn2350vfnd249q06va62fqjk"; }; buildInputs = [ boost zlib openssl ]; - makeFlags = "USE_AESNI=no"; + makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; installPhase = '' install -D i2pd $out/bin/i2pd ''; meta = with stdenv.lib; { - homepage = "https://track.privacysolutions.no/projects/i2pd"; + homepage = "https://i2pd.website"; description = "Minimal I2P router written in C++"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index d01e0ededb3d..c05928fa34b9 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -1,10 +1,10 @@ {stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }: stdenv.mkDerivation rec { - name = "imapsync-1.684"; + name = "imapsync-1.727"; src = fetchurl { - url = "https://fedorahosted.org/released/imapsync/${name}.tgz"; - sha256 = "1ilqdaabh6xiwpjfdg2mrhygvjlxj6jdkmqjqadq5z29172hji5b"; + url = "https://releases.pagure.org/imapsync/${name}.tgz"; + sha256 = "1axacjw2wyaphczfw3kfmi5cl83fyr8nb207nks40fxkbs8q5dlr"; }; patchPhase = '' @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { buildInputs = with perlPackages; [ perl openssl MailIMAPClient TermReadKey IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString DataUniqid JSONWebToken TestMockGuard LWP CryptOpenSSLRSA - LWPProtocolHttps + LWPProtocolHttps Readonly TestPod TestMockObject ParseRecDescent + IOSocketInet6 NTLM ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 3a6e9b625b87..ad058174cff1 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl }: +{ stdenv, fetchurl, ncurses, perl, help2man }: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -8,9 +8,12 @@ stdenv.mkDerivation rec { sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; }; - patches = [ ./whois-Update-Canadian-TLD-server.patch ]; + patches = [ + ./whois-Update-Canadian-TLD-server.patch + ./service-name.patch + ]; - buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ]; + buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include"; @@ -18,6 +21,7 @@ stdenv.mkDerivation rec { # $TMPDIR is too long. #doCheck = true; + postInstall = '' # XXX: These programs are normally installed setuid but since it # fails, they end up being non-executable, hence this hack. diff --git a/pkgs/tools/networking/inetutils/service-name.patch b/pkgs/tools/networking/inetutils/service-name.patch new file mode 100644 index 000000000000..e34516313c57 --- /dev/null +++ b/pkgs/tools/networking/inetutils/service-name.patch @@ -0,0 +1,11 @@ +--- inetutils-1.9.4.org/whois/whois.c 2015-03-31 17:40:50.000000000 +0200 ++++ inetutils-1.9.4/whois/whois.c 2017-04-20 10:23:38.487358708 +0200 +@@ -576,7 +576,7 @@ + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + +- if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0) ++ if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0) + err_quit ("getaddrinfo: %s", gai_strerror (i)); + + for (ressave = res; res; res = res->ai_next) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 13f8cedc673d..c0fd6c973cd3 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.5"; + name = "iperf-2.0.9"; src = fetchurl { - url = "mirror://sourceforge/iperf/${name}.tar.gz"; - sha256 = "0nr6c81x55ihs7ly2dwq19v9i1n6wiyad1gacw3aikii0kzlwsv3"; + url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; + sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv"; }; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = "http://sourceforge.net/projects/iperf/"; + homepage = "http://sourceforge.net/projects/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; - license = "as-is"; + license = licenses.mit; }; } diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 7dc418cba574..a86e3e04530d 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.3"; + name = "iperf-3.2"; src = fetchurl { url = "http://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "1gwmhm29zlp5grrpglmqj7vgx19s6xy33hk6hpbn8jnpn5lxpn30"; + sha256 = "07cwrl9q5pmfjlh6ilpk7hm25lpkcaf917zhpmfq918lhrpv61zj"; }; postInstall = '' diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index e41b65d3d25e..aea77f725120 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "ipv6calc-${version}"; - version = "0.99.1"; + version = "0.99.2"; src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "0a0xpai14y969hp6l10r2wcd16sqf3v40fq5h97m4a69hcpmvg5h"; + sha256 = "1vs64v8v5g9rskg46baqrzyay86vs7ln3i5r5ippa9l6ildyrvpj"; }; buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ]; diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index a20fa2fe7371..9d32f91d0e19 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-20161218"; - rev = "77acc268123b8233843ca9bc3dcf90669efde08f"; + name = "isync-git-20170514"; + rev = "4b3768806278a70db696ba52645dc1b6eb8de58a"; src = fetchgit { url = "https://git.code.sf.net/p/isync/isync"; inherit rev; - sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj"; + 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 a09da684c983..ec2f34f56010 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/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 2a2e444f5b24..1d7932c7ad38 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sed -i -e "s|/usr/bin/lynx|${lynx}/bin/lynx|g" $out/etc/jwhois.conf ''; - patches = [ ./connect.patch ]; + patches = [ ./connect.patch ./service-name.patch ]; meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; diff --git a/pkgs/tools/networking/jwhois/service-name.patch b/pkgs/tools/networking/jwhois/service-name.patch new file mode 100644 index 000000000000..170eddbad794 --- /dev/null +++ b/pkgs/tools/networking/jwhois/service-name.patch @@ -0,0 +1,17 @@ +--- a/src/dns.c 2007-06-25 23:58:38.000000000 -0700 ++++ b/src/dns.c 2016-06-04 16:20:19.644865127 -0700 +@@ -113,12 +113,13 @@ + lookup_host_addrinfo(struct addrinfo **res, const char *host, int port) + { + struct addrinfo hints; +- char ascport[10] = "whois"; ++ char ascport[10] = "nicname"; + int error; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + ++ hints.ai_flags = AI_ADDRCONFIG; + hints.ai_socktype = SOCK_STREAM; + if (port) + sprintf(ascport, "%9.9d", port); diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index ca1846edb04e..8a474812e197 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "0b9w71d7pfgr0asqpffh9h935xpvwabyfdvdzqzna6da9zp7mnf3"; + sha256 = "0afiab6c8cw0w3m0l4hrc4g8bs9y3z59fdr16xnba01nn52mkl92"; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 6e18e1dba1dd..0e4842ec24d2 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "keepalived-${version}"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "0vmflvr7j53dhpfawd1l2kkqw9prs2vl6r4a8rv5ilrrj3j0q989"; + sha256 = "0lbzbw5giddr4rrhppdpsswh88x86ywxrl01vm8z5am7acixn1zr"; }; buildInputs = [ diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index d6ae4a0e5a94..67181d8aec36 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.6"; + 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 = "6b46389e9c2e67af9029a783806facea4c8f0b4d6adca5c1088e948d2fd68ae7"; + sha256 = "0z2432zxzg808swi72yak9kia976qrjj030grk0v4p54mcib3s34"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index d6906fdc554f..78bdea475c4b 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -5,7 +5,7 @@ python2Packages.buildPythonApplication rec { version = "9.3"; buildInputs = with python2Packages ; [ pytest ]; - propagatedBuildInputs = with python2Packages ; [ requests2 ] ++ [ gettext ]; + propagatedBuildInputs = with python2Packages ; [ requests ] ++ [ gettext ]; src = fetchurl { url = "mirror://pypi/L/LinkChecker/${name}.tar.gz"; @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { }; # 1. upstream refuses to support ignoring robots.txt - # 2. work around requests2 version detection - can be dropped >v9.3 + # 2. work around requests version detection - can be dropped >v9.3 patches = [ ./add-no-robots-flag.patch ./no-version-check.patch diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix new file mode 100644 index 000000000000..6b816fc8740a --- /dev/null +++ b/pkgs/tools/networking/lldpd/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo +, libevent, readline, net_snmp }: + +stdenv.mkDerivation rec { + name = "lldpd-${version}"; + version = "0.9.7"; + + src = fetchurl { + url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; + sha256 = "1f0d5s4643pjmgycc5ssgl1pggyq5a7navhabkyhcg0aqdah6dmr"; + }; + + configureFlags = [ + "--localstatedir=/var" + "--enable-pie" + "--with-snmp" + ]; + + 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/"; + license = licenses.isc; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 0ae993db332e..f83ea004db63 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/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix new file mode 100644 index 000000000000..eda93c82cce8 --- /dev/null +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "mcrcon-${version}"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "Tiiffi"; + repo = "mcrcon"; + rev = "v${version}"; + sha256 = "1pwr1cjldjy8bxqpp7w03nvdpw8l4vqfnk6w6b3mf0qpap1k700z"; + }; + + buildPhase = '' + $CC mcrcon.c -o mcrcon + ''; + + installPhase = '' + install -Dm 755 mcrcon $out/bin/mcrcon + ''; + + meta = { + homepage = https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/; + description = "Minecraft console client with Bukkit coloring support."; + longDescription = '' + Mcrcon is a powerful Minecraft RCON terminal client with Bukkit coloring support. + It is well suited for remote administration and to be used as part of automated server maintenance scripts. + It does not trigger "IO: Broken pipe" or "IO: Connection reset" spam bugs on the server side. + ''; + maintainers = with stdenv.lib.maintainers; [ dermetfan ]; + license = with stdenv.lib.licenses; [ zlib libpng ]; + }; +} diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index f948ab8eb616..7c7c63ef230c 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas -, asciidoc, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking +, asciidoc, wrapGAppsHook }: stdenv.mkDerivation rec { name = "megatools-${version}"; @@ -10,16 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv"; }; - buildInputs = [ pkgconfig glib fuse curl makeWrapper - gsettings_desktop_schemas asciidoc ]; - - postInstall = '' - for i in $(find $out/bin/ -type f); do - wrapProgram "$i" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; + nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ]; + buildInputs = [ glib glib_networking fuse curl ]; meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 258a81570c03..303204c9c21e 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-client-${shortVersion}"; - shortVersion = "20160821"; - longVersion = "2016-08-21T03:02:49Z"; + shortVersion = "20170206"; + longVersion = "2017-02-06T20-16-19Z"; src = fetchurl { url = "https://github.com/minio/mc/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1qnslwfspbvzawxrrym27agw79x8sgcafk7d0yakncjyg6vmdkka"; + sha256 = "0k66kr7x669jvydcxp3rpvg8p9knhmcihpnjiqynhqgrdy16mr1f"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 575bac3e9d1e..09459e0e2834 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -19,16 +19,16 @@ let meta = { homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; - platforms = with stdenv.lib.platforms; linux ++ freebsd; + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ darwin; }; }; in { miniupnpc_2 = generic { - version = "2.0.20161216"; - sha256 = "0gpxva9jkjvqwawff5y51r6bmsmdhixl3i5bmzlqsqpwsq449q81"; + version = "2.0.20170509"; + sha256 = "0spi75q6nafxp3ndnrhrlqagzmjlp8wwlr5x7rnvdpswgxi6ihyk"; }; miniupnpc_1 = generic { - version = "1.9.20150430"; - sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; + version = "1.9.20160209"; + sha256 = "0vsbv6a8by67alx4rxfsrxxsnmq74rqlavvvwiy56whxrkm728ap"; }; } diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index dcdcf9b734c0..fc496b416ffd 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchpatch, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { baseName = "mitmproxy"; name = "${baseName}-${version}"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = baseName; repo = baseName; rev = "v${version}"; - sha256 = "17gvr642skz4a23966lckdbrkh6mx31shi8hmakkvi91sa869i30"; + 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 jsbeautifier kaitaistruct passlib pyasn1 pyopenssl - pyparsing pyperclip requests2 ruamel_yaml tornado + pyparsing pyperclip requests ruamel_yaml tornado urwid watchdog brotlipy sortedcontainers ]; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 9fe4b4421a7f..dc4e246c02fb 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "WWAN modem manager, part of NetworkManager"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 7ef001971180..5f3975a1df86 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -2,11 +2,11 @@ , makeWrapper, perl, openssl, autoreconfHook, openssh }: stdenv.mkDerivation rec { - name = "mosh-1.2.6"; + name = "mosh-1.3.0"; src = fetchurl { url = "https://mosh.org/${name}.tar.gz"; - sha256 = "118fhpm754wpklf1blnlq5xbvrxqml6rdfs3b07wg666zkxvg0ky"; + sha256 = "0xikz40q873g9ihvz3x6bwkcb9hb8kcnp5wpcmb72pg5c7s143ij"; }; buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index c96e5cac367c..03a0c99c4213 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, autoconf +{stdenv, fetchurl, autoreconfHook, pkgconfig, ncurses , withGtk ? false, gtk2 ? null}: assert withGtk -> gtk2 != null; @@ -6,24 +6,29 @@ assert withGtk -> gtk2 != null; with stdenv.lib; stdenv.mkDerivation rec { baseName="mtr"; - version="0.86"; + version="0.87"; name="${baseName}-${version}"; - + src = fetchurl { url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz"; - sha256 = "01lcy89q3i9g4kz4liy6m7kcq1zyvmbc63rqidgw67341f94inf5"; + sha256 = "17zi99n8bdqrwrnbfyjn327jz4gxx287wrq3vk459c933p34ff8r"; }; + preConfigure = "substituteInPlace Makefile.in --replace ' install-exec-hook' ''"; + configureFlags = optionalString (!withGtk) "--without-gtk"; - buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk2; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ ncurses ] ++ optional withGtk gtk2; + + enableParallelBuilding = true; meta = { homepage = http://www.bitwizard.nl/mtr/; description = "A network diagnostics tool"; - maintainers = [ maintainers.koral maintainers.raskin ]; + maintainers = with maintainers; [ koral orivej raskin ]; platforms = platforms.unix; license = licenses.gpl2; }; } - diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 0fc6d7273eaf..595337906d02 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,15 +1,17 @@ -{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook, pmccabe +{ 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 { - version = "0.9.18"; name = "mu-${version}"; + version = "0.9.18"; - src = fetchurl { - url = "https://github.com/djcb/mu/archive/${version}.tar.gz"; - sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd"; + src = fetchFromGitHub { + owner = "djcb"; + repo = "mu"; + rev = version; + sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y"; }; # as of 0.9.18 2 tests are failing but previously we had no tests @@ -19,9 +21,10 @@ stdenv.mkDerivation rec { # pmccabe should be a checkInput instead, but configure looks for it buildInputs = [ - sqlite xapian glib gmime texinfo emacs guile libsoup icu pmccabe - ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ]; + sqlite xapian glib gmime texinfo emacs guile libsoup icu + ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; + checkInputs = [ pmccabe ]; doCheck = true; @@ -37,8 +40,9 @@ stdenv.mkDerivation rec { # Install mug and msg2pdf postInstall = stdenv.lib.optionalString withMug '' - cp -v toys/msg2pdf/msg2pdf $out/bin/ - cp -v toys/mug/mug $out/bin/ + for f in msg2pdf mug ; do + install -m755 toys/$f/$f $out/bin/$f + done ''; meta = with stdenv.lib; { @@ -46,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ antono the-kenny ]; + maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; } diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 86eec4555643..56cdbd178250 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/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 9933b512006f..ef539cbb51fd 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig libbsd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libbsd ]; + sourceRoot = name; patches = [ "../debian/patches/*.patch" ]; diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index f326059d9d77..6015ff9fbc7c 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-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index cca111db67d5..c596ea63f4d3 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }: +, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; - version = networkmanager.version; + major = "1.4"; + minor = "6"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; - sha256 = "09ijxicsqf39y6h8kwbfjyljfbqkkx4vrpyfn6gfg1h9mvp4cf39"; + url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; + sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh"; }; configureFlags = [ "--sysconfdir=/etc" ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson librsvg glib_networking gnome3.dconf + modemmanager jansson librsvg glib_networking gnome3.dconf webkitgtk ]; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom urkud rickynils ]; + maintainers = with maintainers; [ phreedom rickynils ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch index 98c1308e4dbf..4850d93716de 100644 --- a/pkgs/tools/networking/network-manager/PppdPath.patch +++ b/pkgs/tools/networking/network-manager/PppdPath.patch @@ -1,8 +1,6 @@ -diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c -index 89a7add..ae99eb4 100644 ---- a/src/ppp-manager/nm-ppp-manager.c -+++ b/src/ppp-manager/nm-ppp-manager.c -@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self, +--- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c 2017-02-15 13:10:27.000000000 +0100 ++++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c 2017-04-03 11:45:39.891653216 +0200 +@@ -724,7 +724,7 @@ g_return_val_if_fail (setting != NULL, NULL); diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 1ad1e54e7fb6..d2a51b3acc86 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,26 +2,36 @@ , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, coreutils, file, inetutils, kmod }: +, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt +, python3Packages, docbook_xsl, fetchpatch, openconnect }: stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; - major = "1.4"; - version = "${major}.4"; + major = "1.6"; + version = "${major}.2"; + # FIXME: this problem is fixed upstream (commit 6a77258f4ec2), remove when upgrading ^^^ + hardeningDisable = [ "format" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"; + sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"; }; outputs = [ "out" "dev" ]; + postPatch = '' + patchShebangs ./tools + ''; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping - substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe + substituteInPlace src/devices/nm-device.c \ + --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", "${iputils}/bin/arping", NULL);' substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ @@ -30,6 +40,10 @@ stdenv.mkDerivation rec { --replace /bin/sed ${gnused}/bin/sed substituteInPlace data/NetworkManager.service.in \ --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" ''; @@ -58,14 +72,23 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; - patches = [ ./PppdPath.patch ]; + patches = [ + ./PppdPath.patch + (fetchpatch { + sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6"; + name = "null-dereference.patch"; + url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; + }) + ./openconnect_helper_path.patch + ./modprobe.patch + ]; buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp - bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; - propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; + propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ]; preInstall = '' installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) @@ -78,7 +101,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service + mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. @@ -90,7 +113,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom urkud rickynils domenkozar obadz ]; + maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix new file mode 100644 index 000000000000..864af033a399 --- /dev/null +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig, +networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-fortisslvpn"; + major = "1.2"; + version = "${major}.4"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr"; + }; + + buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome" else "--without-gnome"}" + "--disable-static" + "--localstatedir=/tmp" + ]; + + preConfigure = '' + substituteInPlace "src/nm-fortisslvpn-service.c" \ + --replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn" + ''; + + meta = { + description = "NetworkManager's FortiSSL plugin"; + inherit (networkmanager.meta) maintainers platforms; + }; +} + diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 591994ddccf6..5d6be9398874 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig , networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3, networkmanagerapplet }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = networkmanager.version; + version = "1.2.4"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; - rev = "c0cedda5e2a0ded695b497c361eaf577068520cb"; - sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2"; + rev = "${version}"; + sha256 = "1mvn0z1vl4j9drl3dsw2dv0pppqvj29d2m07487dzzi8cbxrqj36"; }; buildInputs = [ networkmanager ppp libsecret ] ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ]; - nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; postPatch = '' sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd ''; - preConfigure = "./autogen.sh"; + preConfigure = '' + intltoolize -f + ''; configureFlags = if withGnome then "--with-gnome" else "--without-gnome"; diff --git a/pkgs/tools/networking/network-manager/modprobe.patch b/pkgs/tools/networking/network-manager/modprobe.patch new file mode 100644 index 000000000000..487c70b0165c --- /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/network-manager/openconnect_helper_path.patch b/pkgs/tools/networking/network-manager/openconnect_helper_path.patch new file mode 100644 index 000000000000..597fb753e268 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect_helper_path.patch @@ -0,0 +1,29 @@ +diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c +index 15611c45c..4a7444d3a 100644 +--- a/clients/common/nm-vpn-helpers.c ++++ b/clients/common/nm-vpn-helpers.c +@@ -203,23 +203,8 @@ nm_vpn_openconnect_authenticate_helper (const char *host, + gboolean ret; + char **strv = NULL, **iter; + char *argv[4]; +- const char *path; +- const char *const DEFAULT_PATHS[] = { +- "/sbin/", +- "/usr/sbin/", +- "/usr/local/sbin/", +- "/bin/", +- "/usr/bin/", +- "/usr/local/bin/", +- NULL, +- }; +- +- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS, +- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); +- if (!path) +- return FALSE; + +- argv[0] = (char *) path; ++ argv[0] = "@openconnect@/bin/openconnect"; + argv[1] = "--authenticate"; + argv[2] = (char *) host; + argv[3] = NULL; diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix new file mode 100644 index 000000000000..79fad953a2c5 --- /dev/null +++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix @@ -0,0 +1,40 @@ +{ stdenv, glib, fetchFromGitHub, networkmanager, python3Packages +, gobjectIntrospection, dmenu }: + +let inherit (python3Packages) python pygobject3; +in stdenv.mkDerivation rec { + name = "networkmanager_dmenu-unstable-${version}"; + version = "2017-05-28"; + + src = fetchFromGitHub { + owner = "firecat53"; + repo = "networkmanager-dmenu"; + rev = "eeb8e6922dee887890884f129b51bb21b0047d30"; + sha256 = "00n82sjjqk76sfxi92f5vnzpngk66cqwyzqdanbszpl019ajr5h6"; + }; + + buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp networkmanager_dmenu $out/bin/ + ''; + + postFixup = '' + makeWrapperArgs="\ + --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ + --prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${pygobject3})\"" + wrapPythonPrograms + ''; + + + meta = with stdenv.lib; { + description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; + homepage = https://github.com/firecat53/networkmanager-dmenu; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.jensbin ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix new file mode 100644 index 000000000000..f7a04eff0461 --- /dev/null +++ b/pkgs/tools/networking/nfdump/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, bzip2, yacc, flex }: + +let version = "1.6.15"; in + +stdenv.mkDerivation rec { + name = "nfdump-${version}"; + + src = fetchFromGitHub { + owner = "phaag"; + repo = "nfdump"; + rev = "v${version}"; + sha256 = "07grsfkfjy05yfqfcmgp5xpavpck9ps6q7x8x8j79fym5d8gwak5"; + }; + + nativeBuildInputs = [yacc flex]; + buildInputs = [bzip2]; + + meta = with stdenv.lib; { + description = "Tools for working with netflow data"; + longDescription = '' + nfdump is a set of tools for working with netflow data. + ''; + homepage = https://github.com/phaag/nfdump; + license = licenses.bsd3; + maintainers = [ maintainers.takikawa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 8bb2d7f3c761..9e7282c40bdd 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nss-pam-ldapd-${version}"; - version = "0.8.13"; + version = "0.9.7"; src = fetchurl { url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; - sha256 = "08jxxskzv983grc28zksk9fd8q5qad64rma9vcjsq0l4r6cax4mp"; + sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; }; buildInputs = [ makeWrapper pkgconfig python openldap pam ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 64f4b9008b1e..29f8e1ae2570 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,13 +8,17 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p9"; + name = "ntp-4.2.8p10"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p"; + sha256 = "17xrk7gxrl3hgg0i73n8qm53knyh01lf0f3l1zx9x6r1cip3dlnx"; }; + # The hardcoded list of allowed system calls for seccomp is + # insufficient for NixOS, add more to make it work (issue #21136). + patches = [ ./seccomp.patch ]; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -32,10 +36,10 @@ stdenv.mkDerivation rec { rm -rf $out/share/doc ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.ntp.org/; description = "An implementation of the Network Time Protocol"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch new file mode 100644 index 000000000000..28de2f01d073 --- /dev/null +++ b/pkgs/tools/networking/ntp/seccomp.patch @@ -0,0 +1,44 @@ +diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c +--- ntp-4.2.8p10.orig/ntpd/ntpd.c 2017-04-02 20:21:17.371319663 +0200 ++++ ntp-4.2.8p10/ntpd/ntpd.c 2017-04-02 21:26:02.766178723 +0200 +@@ -1157,10 +1157,12 @@ + SCMP_SYS(close), + SCMP_SYS(connect), + SCMP_SYS(exit_group), ++ SCMP_SYS(fcntl), + SCMP_SYS(fstat), + SCMP_SYS(fsync), + SCMP_SYS(futex), + SCMP_SYS(getitimer), ++ SCMP_SYS(getpid), + SCMP_SYS(getsockname), + SCMP_SYS(ioctl), + SCMP_SYS(lseek), +@@ -1179,6 +1181,7 @@ + SCMP_SYS(sendto), + SCMP_SYS(setitimer), + SCMP_SYS(setsid), ++ SCMP_SYS(setsockopt), + SCMP_SYS(socket), + SCMP_SYS(stat), + SCMP_SYS(time), +@@ -1195,9 +1198,11 @@ + SCMP_SYS(clock_settime), + SCMP_SYS(close), + SCMP_SYS(exit_group), ++ SCMP_SYS(fcntl), + SCMP_SYS(fsync), + SCMP_SYS(futex), + SCMP_SYS(getitimer), ++ SCMP_SYS(getpid), + SCMP_SYS(madvise), + SCMP_SYS(mmap), + SCMP_SYS(mmap2), +@@ -1211,6 +1216,7 @@ + SCMP_SYS(select), + SCMP_SYS(setitimer), + SCMP_SYS(setsid), ++ SCMP_SYS(setsockopt), + SCMP_SYS(sigprocmask), + SCMP_SYS(sigreturn), + SCMP_SYS(socketcall), diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 70f3d7e9c70a..23cce602875a 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { unpackPhase = ":"; buildPhase = '' - gcc -O2 -o nuttcp $src + cc -O2 -o nuttcp $src ''; installPhase = '' diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 5cffb6c5c0e4..d72ee844c0ec 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,14 +3,16 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "18.0"; + version = "19.0"; src = fetchurl { url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "0nzm2qbhwrbq02ynfl2vgs6k58bk5fk45d3547a4g1lqhri3dijb"; + sha256 = "08kgi4zmh4h1pvxh8x4c3ydf9xl2s6ncm579f0wdm2zknvpf0j16"; }; - buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt zlib openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index d585be26e26d..ae0318faaa71 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.0.13"; + version = "7.1.1"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0108xmp9df6cb1nzw3ym59mir3phgfdgp5d43n44ymsk2cc39xcc"; + sha256 = "12fv6fzi3cb0hkvs4h5vj2i440d85wzjjyjl90zvyxvlfy0pmljl"; }; postPatch = '' diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix index 90f686f77ea6..8fa30a5c2211 100644 --- a/pkgs/tools/networking/olsrd/default.nix +++ b/pkgs/tools/networking/olsrd/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "olsrd-0.6.6.1"; + name = "olsrd-${version}"; + version = "0.9.6.1"; src = fetchurl { - url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2"; - sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8"; + url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2"; + sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612"; }; buildInputs = [ bison flex ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c66900c06b7..aaef2723da0c 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam +{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false , withKerberos ? false @@ -12,17 +12,12 @@ assert withGssapiPatches -> withKerberos; let - hpnSrc = fetchurl { - url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz; - sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; - }; - # **please** update this patch when you update to a new openssh release. gssapiSrc = fetchpatch { name = "openssh-gssapi.patch"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa"; - sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2"; + + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef"; + sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3"; }; in @@ -31,18 +26,18 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.4p1"; + version = "7.5p1"; - src = fetchurl { - url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"; - }; - - prePatch = optionalString hpnSupport - '' - gunzip -c ${hpnSrc} | patch -p1 - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; + src = if hpnSupport then + fetchurl { + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz"; + sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn"; + } + else + fetchurl { + url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; + sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; + }; patches = [ @@ -54,8 +49,16 @@ stdenv.mkDerivation rec { ] ++ optional withGssapiPatches gssapiSrc; + postPatch = + # On Hydra this makes installation fail (sometimes?), + # and nix store doesn't allow such fancy permission bits anyway. + '' + substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' + ''; + buildInputs = [ zlib openssl libedit pkgconfig pam ] - ++ optional withKerberos kerberos; + ++ optional withKerberos kerberos + ++ optional hpnSupport autoreconfHook; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. @@ -94,6 +97,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ eelco aneeshusa ]; - broken = hpnSupport; # probably after 6.7 update }; } diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f609c90ad504..78f21e78277d 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -8,16 +8,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.0"; + version = "2.4.3"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "0zpqnbhjaifdalyxwmvk5kcyd7cpxbcigbn7967nbsyvl54vl8vg"; + sha256 = "0w85915nvdws1n1zsn8zcy9wg23jsx782nvrx1a3x4mqlmkn3a3s"; }; - patches = optional stdenv.isLinux ./systemd-notify.patch; - - buildInputs = [ lzo openssl pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lzo openssl ] ++ optionals stdenv.isLinux [ pam systemd iproute ] ++ optional pkcs11Support pkcs11helper; diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch deleted file mode 100644 index c0ac8ae89d3c..000000000000 --- a/pkgs/tools/networking/openvpn/systemd-notify.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c ---- openvpn-2.3.1-orig/src/openvpn/init.c 2013-03-20 09:28:14.000000000 +0100 -+++ openvpn-2.3.1/src/openvpn/init.c 2014-04-22 13:02:21.351026640 +0200 -@@ -48,6 +48,8 @@ - - #include "occ-inline.h" - -+#include -+ - static struct context *static_context; /* GLOBAL */ - - /* -@@ -1375,6 +1375,9 @@ - /* Reset the unsuccessful connection counter on complete initialisation */ - c->options.unsuccessful_attempts = 0; - -+ /* Tell systemd we're ready. */ -+ sd_notify(0, "READY=1"); -+ - /* If we delayed UID/GID downgrade or chroot, do it now */ - do_uid_gid_chroot (c, true); - diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index d091af624463..c278cc989357 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -13,11 +13,11 @@ let edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag; in mkDerivation rec { - name = "aMule-2.3.1"; + name = "aMule-2.3.2"; src = fetchurl { url = "mirror://sourceforge/amule/${name}.tar.xz"; - sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383"; + sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn"; }; buildInputs = @@ -25,7 +25,7 @@ mkDerivation rec { ++ lib.optional httpServer libpng ++ lib.optional client libX11; - patches = [ ./gcc47.patch ]; # from Gentoo + enableParallelBuilding = true; configureFlags = '' --with-crypto-prefix=${cryptopp} diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 66028a973b3c..552cda93bcc9 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, libpcap }: +{ stdenv, fetchFromGitHub, libpcap, cmake }: stdenv.mkDerivation rec { name = "pcapc-${version}"; - version = "2015-03-06"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "02j45wmxy8qcji0giwx3364pbqb6849s8y0xfvzx40g98mssl027"; - rev = "9dddf52e65c8cff72c7c11758a951b31bf083436"; + sha256 = "137crs0bb7kh9a8p9g168yj2jrp0h3j3073nwh31jy4nk0g5hlfp"; + rev = "v${version}"; repo = "pcapc"; owner = "pfactum"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ libpcap ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -19,12 +20,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = '' - install -Dm644 {.,$out/share/doc/pcapc}/README.md - ''; - meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/pfactum/pcapc"; description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix new file mode 100644 index 000000000000..bd7e87e2c10a --- /dev/null +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -0,0 +1,26 @@ +{ stdenv, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "pirate-get"; + version = "0.2.10"; + + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "04gsilbyq2plldzi495dcf19h5xfldfyn6zdczj2fdki1m29jyr0"; + }; + + propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; + + meta = with stdenv.lib; { + description = "A command line interface for The Pirate Bay"; + homepage = https://github.com/vikstrous/pirate-get; + license = licenses.gpl1; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 8fcdb49b2b1e..c2c41d92acbe 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "PPTP client for Linux"; homepage = http://pptpclient.sourceforge.net/; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 59d2b04786da..6e4a5561f07a 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps }: +{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps, makeWrapper }: stdenv.mkDerivation rec { version = "1.5.2"; name = "reaver-wps-t6x-${version}"; + confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db" src = fetchFromGitHub { owner = "t6x"; @@ -11,17 +12,27 @@ stdenv.mkDerivation rec { sha256 = "0zhlms89ncqz1f1hc22yw9x1s837yv76f1zcjizhgn5h7vp17j4b"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap sqlite pixiewps ]; - prePatch = "cd src"; + sourceRoot = "reaver-wps-fork-t6x-v${version}-src/src"; - preInstall = "mkdir -p $out/bin"; + configureFlags = "--sysconfdir=${confdir}"; - meta = { + installPhase = '' + mkdir -p $out/{bin,etc} + cp reaver.db $out/etc/ + cp reaver wash $out/bin/ + + wrapProgram $out/bin/reaver --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" + wrapProgram $out/bin/wash --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" + ''; + + meta = with stdenv.lib; { description = "Online and offline brute force attack against WPS"; homepage = https://github.com/t6x/reaver-wps-fork-t6x; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainer = stdenv.lib.maintainers.nico202; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nico202 volth ]; }; } diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 9efe3df75201..c9bd3fbaa853 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -1,27 +1,36 @@ -{ stdenv, fetchurl, libpcap, sqlite }: +{ stdenv, fetchurl, libpcap, sqlite, makeWrapper }: stdenv.mkDerivation rec { - name = "reaver-wps-1.4"; + version = "1.4"; + name = "reaver-wps-${version}"; + confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db" src = fetchurl { - url = http://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/reaver-${version}.tar.gz"; sha256 = "0bdjai4p8xbsw8zdkkk43rgsif79x0nyx4djpyv0mzh59850blxd"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap sqlite ]; - prePatch = '' - cd src + sourceRoot = "reaver-${version}/src"; + + configureFlags = "--sysconfdir=${confdir}"; + + installPhase = '' + mkdir -p $out/{bin,etc} + cp reaver.db $out/etc/ + cp reaver wash $out/bin/ + + wrapProgram $out/bin/reaver --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" + wrapProgram $out/bin/wash --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" ''; - preInstall = '' - mkdir -p $out/bin - ''; - - meta = { + meta = with stdenv.lib; { description = "Brute force attack against Wifi Protected Setup"; homepage = http://code.google.com/p/reaver-wps; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nico202 volth ]; }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index a8bbe8b71ab4..8ea134843c3e 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.7"; + version = "2.1.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "1f9a4bjpsqhs9aq0zam74mj6zn1ffaljgp98hqj9j83d2jlvqpv5"; + sha256 = "126ikznsw0hlk4mmf03yxzfnvcw823g5il1vfs3a5fa9q26xyc72"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--includedir=\${prefix}/include" "--libdir=\${prefix}/lib" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" @@ -27,7 +28,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-dns/; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index fa7994e8f8f3..6574a02bb921 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.0.4"; + version = "2.2.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "0rm0vpfshayhi5qwsvkgzdjmg43lvslp74h7lda964p72wr6gahg"; + sha256 = "0msfssd42pdwch0z8rhrm7hd4ps9d730az92vg0pnz769xs8kjx0"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-include=${execline}/include" @@ -33,7 +34,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${s6}/lib" "--with-dynlib=${s6Dns}/lib" ] - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-networking/; diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix new file mode 100644 index 000000000000..476e7dc229df --- /dev/null +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "simpleproxy-${version}"; + version = "3.5"; + rev = "v.${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "vzaliva"; + repo = "simpleproxy"; + sha256 = "1my9g4vp19dikx3fsbii4ichid1bs9b9in46bkg05gbljhj340f6"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/vzaliva/simpleproxy; + description = "A simple TCP proxy"; + license = licenses.gpl2; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix deleted file mode 100644 index 5667744ef221..000000000000 --- a/pkgs/tools/networking/sitecopy/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }: - -stdenv.mkDerivation rec { - name = "sitecopy-0.16.6"; - - src = fetchurl { - url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz"; - sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0"; - }; - - patches = [ ./neon-29.patch ]; - - buildInputs = [ openssl neon zlib autoreconfHook ]; - - configureFlags= "--with-ssl=openssl"; -} diff --git a/pkgs/tools/networking/sitecopy/neon-29.patch b/pkgs/tools/networking/sitecopy/neon-29.patch deleted file mode 100644 index bddcbde95e13..000000000000 --- a/pkgs/tools/networking/sitecopy/neon-29.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru sitecopy-0.16.6-orig/configure.in sitecopy-0.16.6/configure.in ---- sitecopy-0.16.6-orig/configure.in 2008-04-02 13:59:30.000000000 +0200 -+++ sitecopy-0.16.6/configure.in 2010-08-26 15:07:04.000000000 +0200 -@@ -112,8 +112,8 @@ - AC_LIBOBJ(lib/fnmatch) - fi - --# Support neon 0.24 through 0.28 --NE_REQUIRE_VERSIONS([0], [24 25 26 27 28]) -+# Support neon 0.24 through 0.29 -+#NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29]) - - dnl But we don't use zlib or ACL support - NEON_WITHOUT_ZLIB -Only in sitecopy-0.16.6/: configure.in~ diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index ac23635441d4..8ccc924d9f6e 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "1p7lavw95w3as9b2b55i61mwxdr1b6jj40yly91f9j26ywr5dpkg"; + sha256 = "13i7bvhvwv8h2lxnz9pfxq6jv915lb948d6xjiy5p7rqbki40ng2"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 7c47f2762dd6..ceac5a58800c 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; + # A request has been made to merge this patch into ssmtp. + # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858781 + patches = [ ./ssmtp_support_AuthPassFile_parameter.patch ]; + configureFlags = "--sysconfdir=/etc ${if tlsSupport then "--enable-ssl" else ""}"; postConfigure = @@ -27,7 +31,8 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional tlsSupport openssl; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch b/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch new file mode 100644 index 000000000000..371c0f6de2b3 --- /dev/null +++ b/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch @@ -0,0 +1,69 @@ +diff -Naurb a/ssmtp.c b/ssmtp.c +--- a/ssmtp.c 2009-11-23 10:55:11.000000000 +0100 ++++ b/ssmtp.c 2017-03-25 03:00:26.508283016 +0100 +@@ -57,6 +57,7 @@ + char arpadate[ARPADATE_LENGTH]; + char *auth_user = (char)NULL; + char *auth_pass = (char)NULL; ++char *auth_passfile = (char)NULL; + char *auth_method = (char)NULL; /* Mechanism for SMTP authentication */ + char *mail_domain = (char)NULL; + char *from = (char)NULL; /* Use this as the From: address */ +@@ -1053,6 +1054,15 @@ + log_event(LOG_INFO, "Set AuthPass=\"%s\"\n", auth_pass); + } + } ++ else if(strcasecmp(p, "AuthPassFile") == 0 && !auth_passfile) { ++ if((auth_passfile = strdup(q)) == (char *)NULL) { ++ die("parse_config() -- strdup() failed"); ++ } ++ ++ if(log_level > 0) { ++ log_event(LOG_INFO, "Set AuthPassFile=\"%s\"\n", auth_passfile); ++ } ++ } + else if(strcasecmp(p, "AuthMethod") == 0 && !auth_method) { + if((auth_method = strdup(q)) == (char *)NULL) { + die("parse_config() -- strdup() failed"); +@@ -1415,6 +1425,8 @@ + struct passwd *pw; + int i, sock; + uid_t uid; ++ FILE *fp; ++ char pass_buf[BUF_SZ+1]; + bool_t minus_v_save, leadingdot, linestart = True; + int timeout = 0; + int bufsize = sizeof(b)-1; +@@ -1433,6 +1445,17 @@ + log_event(LOG_INFO, "%s not found", config_file); + } + ++ if(auth_passfile != (char *)NULL) { ++ if((fp = fopen(auth_passfile, "r")) == (FILE *)NULL) { ++ die("Could not open the AuthPassFile %s", auth_passfile); ++ } ++ if (fgets(pass_buf, BUF_SZ, fp) == NULL) { ++ die("Error while reading a line from the AuthPassFile %s, or it is empty", auth_passfile); ++ } ++ fclose(fp); ++ auth_pass = strdup(pass_buf); ++ } ++ + if((p = strtok(pw->pw_gecos, ";,"))) { + if((gecos = strdup(p)) == (char *)NULL) { + die("ssmtp() -- strdup() failed"); +diff -Naurb a/ssmtp.conf.5 b/ssmtp.conf.5 +--- a/ssmtp.conf.5 2008-02-29 03:50:15.000000000 +0100 ++++ b/ssmtp.conf.5 2017-03-25 01:45:52.890165426 +0100 +@@ -61,6 +61,11 @@ + .Pp + .It Cm AuthPass + The password to use for SMTP AUTH. ++It is recommended to use AuthPassFile which also takes precedence over AuthPass. ++.Pp ++.It Cm AuthPassFile ++A file that should contain the password to use for SMTP AUTH. ++This takes precedence over AuthPass. + .Pp + .It Cm AuthMethod + The authorization method to use. diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 7da47e339d08..2c0352152d55 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,22 +1,24 @@ { 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 { name = "strongswan-${version}"; - version = "5.5.1"; + version = "5.5.3"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "1drahhmwz1jg14rfh67cl231dlg2a9pra6jmipfxwyzpj4ck02vj"; + sha256 = "1m7qq0l5pwj1wy0f7h2b7msb1d98rx78z6xg27g0hiqpk6qm9sn5"; }; 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/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index cf930769b861..fbebba21dbd6 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.39"; + version = "5.41"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1vjdn32iw11zqsygwxbjmqgs4644dk3ql1h8ap890ls6a1x0i318"; + sha256 = "13qld0b8w2yfs2kfwnqvhcg98warh8hcyk13rjxdwv8zxqhn6p7h"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 42cb3867e05c..a7130a3891b9 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/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix new file mode 100644 index 000000000000..236faa067ade --- /dev/null +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, libpcap, tcpdump }: + +stdenv.mkDerivation rec { + name = "tcpreplay-${version}"; + version = "4.2.5"; + + src = fetchurl { + url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; + sha256 = "1mw9r97blczm70rjf7p83sd1fxpzdzfvsbnjsc0m3nz16jz2c44l"; + }; + + buildInputs = [ libpcap ]; + + configureFlags = [ + "--disable-local-libopts" + "--disable-libopts-install" + "--enable-dynamic-link" + "--enable-shared" + "--enable-tcpreplay-edit" + "--with-libpcap=${libpcap}" + "--with-tcpdump=${tcpdump}/bin" + ]; + + meta = with stdenv.lib; { + description = "A suite of utilities for editing and replaying network traffic"; + homepage = http://tcpreplay.appneta.com/; + license = with licenses; [ bsd3 gpl3 ]; + maintainers = with maintainers; [ eleanor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix new file mode 100644 index 000000000000..9e13cfc59c1c --- /dev/null +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -0,0 +1,28 @@ +{ stdenv , pkgs , fetchurl, libpcap, libnet +}: + +stdenv.mkDerivation rec { + pkgname = "tcptraceroute"; + name = "${pkgname}-${version}"; + version = "1.5beta7"; + + src = fetchurl { + url = "https://github.com/mct/${pkgname}/archive/${name}.tar.gz"; + sha256 = "1rz8bgc6r1isb40awv1siirpr2i1paa2jc1cd3l5pg1m9522xzap"; + }; + + # for reasons unknown --disable-static configure flag doesn't disable static + # linking.. we instead override CFLAGS with -static omitted + preBuild = '' + makeFlagsArray=(CFLAGS=" -g -O2 -Wall") + ''; + + buildInputs = [ libpcap libnet ]; + + meta = { + description = "A traceroute implementation using TCP packets."; + homepage = https://github.com/mct/tcptraceroute; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.pbogdan ]; + }; +} diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 05e833f2f8ef..c7fa1c7a2719 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/ua/default.nix b/pkgs/tools/networking/ua/default.nix new file mode 100644 index 000000000000..3b5be589f331 --- /dev/null +++ b/pkgs/tools/networking/ua/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn +, pkgconfig +, glib, libxml2 +}: + +buildGoPackage rec { + name = "ua-unstable-${version}"; + version = "2017-02-24"; + rev = "325dab92c60e0f028e55060f0c288aa70905fb17"; + + goPackagePath = "github.com/sloonz/ua"; + + src = fetchgit { + inherit rev; + url = "https://github.com/sloonz/ua.git"; + sha256 = "0452qknc8km9495324g6b5ja3shvk8jl7aa9nrjhdylf09dp2nif"; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 ]; + + meta = { + homepage = "https://github.com/sloonz/ua"; + license = stdenv.lib.licenses.isc; + shortDescription = "Universal Aggregator"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/tools/networking/ua/deps.nix b/pkgs/tools/networking/ua/deps.nix new file mode 100644 index 000000000000..e59b9f239a68 --- /dev/null +++ b/pkgs/tools/networking/ua/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/sloonz/cfeedparser"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/cfeedparser"; + rev = "a220b181f09fa7fba347c7fa72168ed8a010907a"; + sha256 = "1dsdzflwbb0cw39bs37shggmswggb326sfdb5x25f4bpd19z6qp0"; + }; + } + { + goPackagePath = "github.com/sloonz/go-maildir"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/go-maildir"; + rev = "4629e76d952bb24730bbe1b4c7bc628cd54babb6"; + sha256 = "0i9r7hhk0ih47pmc9ixhv17fa6gba3j7vk9g8j0di0pr0siha65f"; + }; + } + { + goPackagePath = "github.com/sloonz/go-mime-message"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/go-mime-message"; + rev = "cf50e17d2410fee25cdb89485ab0d5996f2d3bfc"; + sha256 = "09r45w2qfl0rx785xpgcjv9bvdnwkz7fyr272rdi3krwr900fwxs"; + }; + } + { + goPackagePath = "github.com/sloonz/go-qprintable"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/go-qprintable"; + rev = "775b3a4592d5bfc47b0ba398ec0d4dba018e5926"; + sha256 = "19r8ica7kd946brdh1zn4hkzgbciqsz42a2p1h7hgzpmld51kg43"; + }; + } + { + goPackagePath = "gopkg.in/redis.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "b5e368500d0a508ef8f16e9c2d4025a8a46bcc29"; + sha256 = "1syhnm1csrlfh1jgd1v9bzf2pp9ljyg4ks3z6xx0nqd83xmyhdzh"; + }; + } + { + goPackagePath = "gopkg.in/bsm/ratelimit.v1"; + fetch = { + type = "git"; + url = "https://github.com/bsm/ratelimit"; + rev = "db14e161995a5177acef654cb0dd785e8ee8bc22"; + sha256 = "1ph6dsvgwrsli9akh6arwkvz78hkdb42lyqmgfckjcsar1a2fcsh"; + }; + } +] diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index 0bcd35b21ef9..fc46c6a15bc5 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 000000000000..dd6933208046 --- /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 0a1d557dd935..e700ea4fb286 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.1"; + version = "1.6.4"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "000lylg5qgriaxh6k78l2inb905qshx01kxgmqj89zn08gvn7ps2"; + sha256 = "1vbzfzp932nhii5vq7z7rpczdyv624p17sy9hj1cn763ds0qh2nz"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index c1b19f745a3f..8161f700ce18 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { keyring minidb pyyaml - requests2 + requests ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 1a8104c2ee1d..fd1045d03d99 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.14"; + version = "5.2.16"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "06nx295g03z7vzrrc3mhxikpw870zvkilrlxghd2rpcbm939iin5"; + sha256 = "1axkj3xp8ryw94ml8lkqgpdqkv56aygbyv18kynf2bcglxildyvv"; }; buildInputs = [ perl gettext ]; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index c8315d0c3f5f..7c72c2cd210c 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl }: +{ stdenv, fetchFromGitHub, luajit, openssl, perl }: stdenv.mkDerivation rec { name = "wrk-${version}"; @@ -11,7 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1qg6w8xz4pr227h1gxrbm6ylhqvspk95hvq2f9iakni7s56pkh1w"; }; - buildInputs = [ openssl perl ]; + buildInputs = [ luajit openssl perl ]; + + makeFlags = [ "WITH_LUAJIT=${luajit}" "WITH_OPENSSL=${openssl.dev}" "VER=${version}" ]; + + preBuild = '' + for f in src/*.h; do + substituteInPlace $f \ + --replace "#include $src/Makefile + ''; + + installPhase = '' + mkdir -p $out/bin + cp cde $out/bin + cp cde-exec $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pgbovine/CDE; + description = "A packaging tool for building portable packages"; + license = licenses.gpl3; + maintainers = [ maintainers.rlupton20 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index ed46b2d302aa..c2fd1293b791 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1sqzdkj9vigkvxsjlih1i0gylv53na2yic5if9w1s2sgxhqqz5zv"; }; - # FIXME: ugh, there has to be a better way to do this... - prePatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' \ - "set (BASHCOMP_DIR "$out/share/bash-completion/completions")" + patches = [ + ./fix-bash-completion-path.patch + ./fix-python-install-path.patch + ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '@BASHCOMP_DIR@' "$out/share/bash-completion/completions" substituteInPlace src/python/CMakeLists.txt \ - --replace 'EXECUTE_PROCESS(COMMAND ''${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python2_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)' \ - "set (PYTHON_INSTALL_DIR "$out/${python2.sitePackages}")" + --replace "@PYTHON_INSTALL_PATH@" "$out/${python2.sitePackages}" ''; - buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ]; meta = with stdenv.lib; { description = "C implementation of createrepo"; diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch new file mode 100644 index 000000000000..e184cc8facc0 --- /dev/null +++ b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch @@ -0,0 +1,11 @@ +--- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100 ++++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100 +@@ -100,7 +100,7 @@ + + pkg_check_modules(BASHCOMP bash-completion) + if (BASHCOMP_FOUND) +- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) ++ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") + message("Bash completion directory: ${BASHCOMP_DIR}") + INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) + INSTALL(CODE " diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch new file mode 100644 index 000000000000..a247c6d9fe47 --- /dev/null +++ b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch @@ -0,0 +1,11 @@ +--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100 ++++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100 +@@ -19,7 +19,7 @@ + FIND_PACKAGE(PythonInterp 3.0 REQUIRED) + endif() + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") + INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) + + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 08847b999cfe..152dc7dcc040 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixWebService-0.6"; + name = "DisnixWebService-0.7"; src = fetchurl { - url = http://hydra.nixos.org/build/36899117/download/4/DisnixWebService-0.6.tar.bz2; - sha256 = "0yvwjnzk1q4y3wj8pi6z3i7akw83ah9xm2v93ni1ri70z5930mdz"; + url = https://github.com/svanderburg/DisnixWebService/files/842861/DisnixWebService-0.7.tar.gz; + sha256 = "1zqy0badqqw8pzp9ky2aayi27v6znd64zafacvywjrn185fjz17g"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 45bd2abe8ece..534f8767a055 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,21 +1,19 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.6.1"; + name = "disnix-0.7.1"; src = fetchurl { - url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz; - sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj"; + 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 ]; - dontStrip = true; - meta = { description = "A Nix-based distributed service deployment tool"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index eb0b7d2a4187..2a6a0dcc78a3 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.5"; + name = "disnixos-0.6.1"; src = fetchurl { - url = http://hydra.nixos.org/build/36899006/download/3/disnixos-0.5.tar.gz; - sha256 = "0pl3j8kwcz90as5cs0yipfbg555lw3z6xsylk6g2ili878mni1aq"; + 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 ]; - dontStrip = true; - meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 08f58f668ece..e33776eaa2b7 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.6.1"; + name = "dysnomia-0.7"; src = fetchurl { - url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz; - sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi"; + url = https://github.com/svanderburg/dysnomia/files/842819/dysnomia-0.7.tar.gz; + sha256 = "0nlb7fvndnxs878aah30cac4gqf2w9qq4bdpqj4m0j3d9nhpak2j"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; 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 000000000000..b97eab9777d7 --- /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 000000000000..a551368eade1 --- /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 000000000000..1f70dc1c8c8c --- /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 000000000000..d310b41d7aaf --- /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 b879ef002b12..524dc01cbe72 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 19372f807c21..c34d142c3850 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 877d5c6540a0..6a9589f9ac2a 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; @@ -29,6 +29,6 @@ buildGoPackage rec { description = "A tool for importing go packages into gx"; homepage = https://github.com/whyrusleeping/gx-go; license = licenses.mit; - maintainer = with maintainers; [ zimbatm ]; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 4b9b593655b7..99a5013e217e 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: stdenv.mkDerivation rec { - version = "1.7.18"; + version = "1.7.20"; name = "librepo-${version}"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "librepo"; rev = name; - sha256 = "05iqx2kvfqsskb2r3n5p8f91i4gd4pbw6nh30pn532mgab64cvxk"; + sha256 = "17fgj2wifn2qxmh1p285fbwys0xbvwbnmxsdfvqyr5njpyl2s99h"; }; patchPhase = '' @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages" ''; - buildInputs = [ cmake python2 pkgconfig expat glib pcre openssl curl check attr gpgme ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here propagatedBuildInputs = [ curl gpgme expat ]; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix new file mode 100644 index 000000000000..1b8c1b2f6402 --- /dev/null +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "mynewt-newt-${version}"; + version = "1.0.0"; + + goPackagePath = "mynewt.apache.org/newt"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "apache"; + repo = "incubator-mynewt-newt"; + rev = "mynewt_${builtins.replaceStrings ["."] ["_"] version}_tag"; + sha256 = "1ixqxqizd957prd4j2nijgnkv84rffj8cx5f7aqyjq9nkawjksf6"; + }; + + meta = with stdenv.lib; { + homepage = https://mynewt.apache.org/; + description = "Build and package management tool for embedded development."; + longDescription = '' + Apache Newt is a smart build and package management tool, + designed for C and C++ applications in embedded contexts. Newt + was developed as a part of the Apache Mynewt Operating System. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ pjones ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/package-management/mynewt-newt/deps.nix b/pkgs/tools/package-management/mynewt-newt/deps.nix new file mode 100644 index 000000000000..ea3d97ca67ea --- /dev/null +++ b/pkgs/tools/package-management/mynewt-newt/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus.git"; + rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; + sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap.git"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty.git"; + rev = "cfb55aafdaf3ec08f0db22699ab822c50091b1c4"; + sha256 = "0441yi9ah9892hxdslv2h35bkfr75g7ajma0q45lqks84pawrdkg"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text.git"; + rev = "7cafcd837844e784b526369c9bce262804aebc60"; + sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure.git"; + rev = "f3009df150dadf309fdee4a54ed65c124afad715"; + sha256 = "1i08zzlsn1bwicjn8cvakv2h5wwicw8ijx0i0cipk49yfmd6ab4i"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast.git"; + rev = "24b6558033ffe202bf42f0f3b870dcc798dd2ba8"; + sha256 = "10g8vzvffkd55ivkbaqcjj50z3iiqffl2p902rmbriz14znqyywl"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra.git"; + rev = "9495bc009a56819bdb0ddbc1a373e29c140bc674"; + sha256 = "0hphdnhpcmy2mngah81c700s2y43f5g9jckwgmh6xyb4f1zjj9nm"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman.git"; + rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; + sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag.git"; + rev = "5ccb023bc27df288a957c5e994cd44fd19619465"; + sha256 = "1r65j8sw15pz0iacwnf303p6s51vkv0k6qc5cyb2kybfraqd7f7z"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify.git"; + rev = "629574ca2a5df945712d3079857300b5e4da0236"; + sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; + }; + } + { + goPackagePath = "golang.org/x/sys/unix"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys.git"; + rev = "b699b7032584f0953262cb2788a0ca19bb494703"; + sha256 = "172sw1bm581qwal9pbf9qj1sgivr74nabbj8qq4q4fhgpzams9ix"; + }; + } +] diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix new file mode 100644 index 000000000000..e3255afe7fe8 --- /dev/null +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, nix, makeWrapper, coreutils, gnutar, gzip, bzip2 }: + +stdenv.mkDerivation rec { + pname = "nix-bundle"; + name = "${pname}-${version}"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = pname; + rev = "v${version}"; + sha256 = "15r77pchf4s4cdv4lvw2zw1yic78k8p0n2r954qq370vscw30yac"; + }; + + # coreutils, gnutar is actually needed by nix for bootstrap + buildInputs = [ nix coreutils makeWrapper gnutar gzip bzip2 ]; + + binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + mkdir -p $out/bin + makeWrapper $out/share/nix-bundle/nix-bundle.sh $out/bin/nix-bundle \ + --prefix PATH : ${binPath} + ''; + + meta = with lib; { + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.all; + description = "Create bundles from Nixpkgs attributes"; + license = licenses.mit; + homepage = https://github.com/matthewbauer/nix-bundle; + }; +} diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix new file mode 100644 index 000000000000..388942f6ad87 --- /dev/null +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -0,0 +1,32 @@ +{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }: + +with rustPlatform; + +buildRustPackage rec { + name = "nix-index-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "bennofs"; + repo = "nix-index"; + rev = "v${version}"; + sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; + }; + depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl"; + buildInputs = [pkgconfig openssl curl]; + + postInstall = '' + mkdir -p $out/etc/profile.d + cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh + substituteInPlace $out/etc/profile.d/command-not-found.sh \ + --replace "@out@" "$out" + ''; + + meta = with lib; { + description = "A files database for nixpkgs"; + homepage = https://github.com/bennofs/nix-index; + license = with licenses; [ bsd3 ]; + maintainers = [ maintainers.bennofs ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix new file mode 100644 index 000000000000..a156c4f8a722 --- /dev/null +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -0,0 +1,46 @@ +{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: +python3Packages.buildPythonApplication rec { + version = "0.4.0"; + name = "nix-update-source-${version}"; + src = fetchFromGitHub { + owner = "timbertson"; + repo = "nix-update-source"; + rev = "version-0.4.0"; + sha256 = "0gz0f7nx1q697s16ya7q84q1cj020n547k2ffb99ds2r40nckr2g"; + }; + propagatedBuildInputs = [ nix-prefetch-scripts ]; + passthru = { + # NOTE: `fetch` should not be used within nixpkgs because it + # uses a non-idiomatic structure. It is provided for use by + # out-of-tree nix derivations. + fetch = path: + let + fetchers = { + # whitelist of allowed fetchers + inherit (pkgs) fetchgit fetchurl fetchFromGitHub; + }; + json = lib.importJSON path; + fetchFn = builtins.getAttr json.fetch.fn fetchers; + src = fetchFn json.fetch.args; + in + json // json.fetch // { inherit src; }; + updateScript = '' + set -e + echo + cd ${toString ./.} + ${pkgs.nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo nix-update-source \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --modify-nix default.nix + ''; + }; + meta = { + description = "Utility to automate updating of nix derivation sources"; + maintainers = with lib.maintainers; [ timbertson ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e755507356d7..56324f4073db 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,27 +1,47 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp +, 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" }: let + sh = busybox.override { + useMusl = true; + enableStatic = true; + enableMinimal = true; + extraConfig = '' + CONFIG_ASH y + CONFIG_ASH_BUILTIN_ECHO y + CONFIG_ASH_BUILTIN_TEST y + CONFIG_ASH_OPTIMIZE_FOR_SIZE y + ''; + }; + common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { inherit name src; version = lib.getVersion name; + is112 = lib.versionAtLeast version "1.12pre"; + VERSION_SUFFIX = lib.optionalString fromGit suffix; outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ perl pkgconfig ] + [ pkgconfig ] + ++ lib.optionals (!is112) [ perl ] ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre") + ++ lib.optionals fromGit [ brotli readline ] # Since 1.12 + ++ lib.optional stdenv.isLinux libseccomp + ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) (aws-sdk-cpp.override { apis = ["s3"]; customMemoryManagement = false; @@ -41,14 +61,16 @@ let configureFlags = [ "--with-store-dir=${storeDir}" "--localstatedir=${stateDir}" - "--sysconfdir=/etc" - "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + "--sysconfdir=${confDir}" "--disable-init-state" "--enable-gc" ] - ++ lib.optional (!lib.versionAtLeast version "1.12pre") [ + ++ lib.optionals (!is112) [ + "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" + ] ++ lib.optionals (is112 && stdenv.isLinux) [ + "--with-sandbox-shell=${sh}/bin/busybox" ]; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -57,6 +79,9 @@ let doInstallCheck = true; + # socket path becomes too long otherwise + preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp"; + separateDebugInfo = stdenv.isLinux; crossAttrs = { @@ -74,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; }; @@ -95,31 +120,55 @@ let license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; + outputsToInstall = [ "out" "man" ]; }; + + passthru = { inherit fromGit; }; + }; + + perl-bindings = { nix }: stdenv.mkDerivation { + name = "nix-perl-" + nix.version; + + inherit (nix) src; + + postUnpack = "sourceRoot=$sourceRoot/perl"; + + nativeBuildInputs = + [ perl pkgconfig curl nix libsodium ] + ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ]; + + configureFlags = + [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + ]; + + preConfigure = "export NIX_STATE_DIR=$TMPDIR"; + + preBuild = "unset NIX_INDENT_MAKE"; }; in rec { nix = nixStable; - nixStable = common rec { - name = "nix-1.11.7"; + nixStable = (common rec { + name = "nix-1.11.13"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d"; + sha256 = "0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913"; }; - }; + }) // { perl-bindings = nixStable; }; - nixUnstable = lib.lowPrio (common rec { + nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5073_1cf4801"; + suffix = "pre5511_c94f3d55"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1cf480110879ffc8aee94b4b75999da405b71d7c"; - sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02"; + rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751"; + sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18"; }; 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 820bcbb9a35a..1467faac8e3f 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/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 4d67e8a5d6f5..d9c9661d41a4 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -5,9 +5,7 @@ python2Packages.buildPythonApplication { name = "nixops-${version}"; - namePrefix = ""; - - src = src; + inherit version src; buildInputs = [ libxslt ]; @@ -31,23 +29,22 @@ python2Packages.buildPythonApplication { doCheck = false; - postInstall = - '' - make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man + postInstall = '' + make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ + docdir=$out/share/doc/nixops mandir=$out/share/man - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops + mkdir -p $out/share/nix/nixops + cp -av "nix/"* $out/share/nix/nixops - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" + ''; meta = { homepage = https://github.com/NixOS/nixops; description = "NixOS cloud provisioning and deployment tool"; - maintainers = [ lib.maintainers.eelco lib.maintainers.rob ]; + maintainers = with lib.maintainers; [ eelco rob domenkozar ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 820bcbb9a35a..681cc3d883c8 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,9 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5"; + version = "2017-05-22"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; + # Sadly hydra doesn't offer download links + url = "https://static.domenkozar.com/nixops-1.5.1pre2169_8f4a67c.tar.bz2"; + sha256 = "0rma5npgkhlknmvm8z0ps54dsr07za1f32p6d6na3nis784h0slw"; }; }) diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index d413475389fc..ee4dab5ad64a 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 74707ae015fd..cdb2df808041 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 1184c0194bc7..bba7c3d7fa69 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ dogpile_cache click - requests2 + requests characteristic ]; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 9d99af2e59a5..e1e57a84b555 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.3"; + version = "0.3.5"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "03nhz0ralc3cqsrwyc310n8kbk2m9im0m2r2za8lqphs29rrxnqr"; + sha256 = "0ciz6h6sx9hnz463alpkcqwqnq8jk382ifc6z89j29hix8fw4jvk"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 6c3a63119b06..78d815eb7c19 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, binutils, autoreconfHook }: stdenv.mkDerivation rec { - name = "rpm-4.13.0-rc1"; + name = "rpm-${version}"; + version = "4.13.0.1"; src = fetchurl { - url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2"; - sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp"; + url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; + sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; }; outputs = [ "out" "dev" "man" ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements - propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive ]; + propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; + patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; + postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} @@ -43,6 +46,10 @@ stdenv.mkDerivation rec { for tool in ld nm objcopy objdump strip; do sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/" done + + # symlinks produced by build are incorrect + ln -sf $out/bin/{rpm,rpmquery} + ln -sf $out/bin/{rpm,rpmverify} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch new file mode 100644 index 000000000000..b8192b24f134 --- /dev/null +++ b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch @@ -0,0 +1,11 @@ +diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c +--- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 ++++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #define _(x) x diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index d07396319d8d..4c3dfe4d07cc 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.35b"; + version = "2.48b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1smwc3j0mrpnhqq7li2ry42fxcmq3q2kl568dpq9r9npg996fqar"; + sha256 = "00x7p8lqrpx60hwynl5dqwn6isr8yhl263avcwfw3dqc7v9lwhrz"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index d190dff842ba..5779faec6b9d 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux }: +{ stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }: + stdenv.mkDerivation rec { name = "aide-${version}"; - version = "0.16a2"; + version = "0.16"; src = fetchurl { - url = "mirror://sourceforge/aide/devel/0.16a2/aide-${version}.tar.gz"; - sha256 = "11qvp6l2x4ajq9485lmg722gfdikh8r2wqfw17m0jm68df0m295m"; + url = "mirror://sourceforge/aide/${version}/aide-${version}.tar.gz"; + sha256 = "0ibkv4z2gk14fn014kq13rp2ysiq6nn2cflv2q5i7zf466hm6758"; }; - buildInputs = [ flex bison libmhash zlib acl attr libselinux ]; + buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; configureFlags = [ diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix new file mode 100644 index 000000000000..9f8a00c5956d --- /dev/null +++ b/pkgs/tools/security/browserpass/default.nix @@ -0,0 +1,35 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "browserpass-${version}"; + version = "1.0.5"; + + goPackagePath = "github.com/dannyvankooten/browserpass"; + + src = fetchFromGitHub { + repo = "browserpass"; + owner = "dannyvankooten"; + rev = version; + sha256 = "1r9x1asgblay7pry2jpgfisfgb3423x3cqd3g68q8b98zvc9l9lz"; + }; + + postInstall = '' + host_file="$bin/bin/browserpass" + mkdir -p "$bin/etc" + + 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 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 = with stdenv.lib; { + description = "A Chrome & Firefox extension for zx2c4's pass"; + homepage = https://github.com/dannyvankooten/browserpass; + license = licenses.mit; + platforms = with platforms; linux ++ darwin ++ openbsd; + }; +} diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 914247dcd0b5..e450cf5952ee 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.26"; + version = "1.4.27"; name = "ccid-${version}"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4205/ccid-1.4.26.tar.bz2"; - sha256 = "0bxy835c133ajalpj4gx60nqkjvpf9y1n97n04pw105pi9qbyrrj"; + url = "https://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2"; + sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56"; }; patchPhase = '' diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix new file mode 100644 index 000000000000..bf659f19e9be --- /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/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix new file mode 100644 index 000000000000..91a5fa4bdd24 --- /dev/null +++ b/pkgs/tools/security/cfssl/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }: + +buildGoPackage rec { + name = "cfssl-${version}"; + version = "20170527"; + + goPackagePath = "github.com/cloudflare/cfssl"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cfssl"; + rev = "114dc9691ec7bf3dac49d5953eccf7d91a0e0904"; + sha256 = "1ijq43mrzrf1gkgj5ssxq7sgy6sd4rl706dzqkq9krqv5f6kwhj1"; + }; + + meta = with stdenv.lib; { + homepage = https://cfssl.org/; + description = "Cloudflare's PKI and TLS toolkit"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ mbrgm ]; + }; +} diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 05ce60a05084..729f85a73fce 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "duo-unix-${version}"; - version = "1.9.19"; + version = "1.9.20"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "02hvayknj0kvdik4mqm9j9isqzxk0f992i9v274s27891xqgj8rd"; + sha256 = "0zxrpdbgi8k8jbqg5yxjv3b0lz9kpk89pglwb3lqlvzscbxdv5qj"; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index 05327ad3a090..40a728f6cb1a 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/libexec cp $src $out/libexec/ecryptfs-helper.py - makeWrapper "${python2.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper + makeWrapper "${python2.interpreter}" "$out/bin/ecryptfs-helper" --add-flags "$out/libexec/ecryptfs-helper.py" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 95d0299e8733..2cf07c63a84a 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -52,6 +52,6 @@ in stdenv.mkDerivation rec { description = "Free, private and secure password management tool and e-wallet"; license = licenses.unfree; maintainers = with maintainers; [ guillaumekoenig ]; - platform = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 257af4645f68..449a6911a150 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -53,7 +53,6 @@ let meta = { description = "a well known password manager"; homepage = https://www.enpass.io/; - maintainer = lib.maintainers.ronny; license = lib.licenses.unfree; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix new file mode 100644 index 000000000000..823bdbbffb5d --- /dev/null +++ b/pkgs/tools/security/fwknop/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, lib +, libpcap, texinfo +, iptables +, gnupgSupport ? true, gnupg, gpgme # Increases dependencies! +, wgetSupport ? true, wget +, buildServer ? true +, buildClient ? true }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "fwknop"; + version = "2.6.9"; + + src = fetchFromGitHub { + owner = "mrash"; + repo = pname; + rev = version; + sha256 = "1509d1lzfmhavdwi65dwb0jaglpy8ciccgpcnhx9ks6s7irn923c"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libpcap texinfo ] + ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme.dev ] + ++ stdenv.lib.optional wgetSupport [ wget ]; + + configureFlags = '' + --sysconfdir=/etc + --localstatedir=/run + --with-iptables=${iptables}/sbin/iptables + ${lib.optionalString (!buildServer) "--disable-server"} + ${lib.optionalString (!buildClient) "--disable-client"} + ${lib.optionalString gnupgSupport '' + --with-gpgme + --with-gpgme-prefix=${gpgme.dev} + --with-gpg=${gnupg} + ''} + ${lib.optionalString wgetSupport '' + --with-wget=${wget}/bin/wget + ''} + ''; + + # Temporary hack to copy the example configuration files into the nix-store, + # this'll probably be helpful until there's a NixOS module for that (feel free + # to ping me (@primeos) if you want to help). + preInstall = '' + substituteInPlace Makefile --replace\ + "sysconfdir = /etc"\ + "sysconfdir = $out/etc" + substituteInPlace server/Makefile --replace\ + "wknopddir = /etc/fwknop"\ + "wknopddir = $out/etc/fwknop" + ''; + + meta = with stdenv.lib; { + description = + "Single Packet Authorization (and Port Knocking) server/client"; + longDescription = '' + fwknop stands for the "FireWall KNock OPerator", and implements an + authorization scheme called Single Packet Authorization (SPA). + ''; + homepage = "https://www.cipherdyne.org/fwknop/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} 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 000000000000..49770813b2b6 --- /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/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 0dbea6529597..9c4f98a740bf 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -12,10 +12,21 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { - description = "Free implementation of the OpenPGP standard for encrypting and signing data"; - homepage = http://www.gnupg.org/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + meta = with stdenv.lib; { + homepage = "https://gnupg.org"; + description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; + license = licenses.gpl3Plus; + longDescription = '' + The GNU Privacy Guard is the GNU project's complete and free + implementation of the OpenPGP standard as defined by RFC4880. GnuPG + "classic" (1.4) is the old standalone version which is most suitable for + older or embedded platforms. GnuPG allows to encrypt and sign your data + and communication, features a versatile key management system as well as + access modules for all kind of public key directories. GnuPG, also known + as GPG, is a command line tool with features for easy integration with + other applications. A wealth of frontend applications and libraries are + available. + ''; + platforms = platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 0fe294e5a117..da700fe9f227 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -1,7 +1,7 @@ { stdenv, gnupg, coreutils, writeScript }: stdenv.mkDerivation { - name = "gnupg1compat-0"; + name = "gnupg1compat-${gnupg.version}"; builder = writeScript "gnupg1compat-builder" '' # First symlink all top-level dirs @@ -18,7 +18,9 @@ stdenv.mkDerivation { ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = gnupg.meta // { + description = gnupg.meta.description + + " with symbolic links for gpg and gpgv"; + priority = -1; }; } diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index fd79419d82ac..6b011a00eb76 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -44,24 +44,22 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { - homepage = "http://gnupg.org/"; - description = "Free implementation of the OpenPGP standard for encrypting and signing data"; - license = stdenv.lib.licenses.gpl3Plus; - + meta = with stdenv.lib; { + homepage = "https://gnupg.org"; + description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; + license = licenses.gpl3Plus; longDescription = '' - GnuPG is the GNU project's complete and free implementation of - the OpenPGP standard as defined by RFC4880. GnuPG allows to - encrypt and sign your data and communication, features a - versatile key management system as well as access modules for all - kind of public key directories. GnuPG, also known as GPG, is a - command line tool with features for easy integration with other - applications. A wealth of frontend applications and libraries - are available. Version 2 of GnuPG also provides support for - S/MIME. + The GNU Privacy Guard is the GNU project's complete and free + implementation of the OpenPGP standard as defined by RFC4880. GnuPG + "stable" (2.0) is the current stable version for general use. This is + what most users are still using. GnuPG allows to encrypt and sign your + data and communication, features a versatile key management system as well + as access modules for all kind of public key directories. GnuPG, also + known as GPG, is a command line tool with features for easy integration + with other applications. A wealth of frontend applications and libraries + are available. Version 2 of GnuPG also provides support for S/MIME. ''; - - maintainers = with stdenv.lib.maintainers; [ roconnor urkud ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ roconnor ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index f7968e47b1ce..e74b0920f4a2 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.18"; + version = "2.1.21"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h"; + sha256 = "1p97limv29p01y79mgnzpwixa50lv53wgdl3ymk9idkmpaldisks"; }; buildInputs = [ @@ -31,17 +31,6 @@ stdenv.mkDerivation rec { patches = [ ./fix-libusb-include-path.patch - # TODO: Remove the following two patches on the next gnupg release after 2.1.18 - (fetchpatch { - name = "scd-Backport-two-fixes-from-master"; - url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0028-scd-Backport-two-fixes-from-master.patch?h=debian/2.1.18-6"; - sha256 = "01l2s4s7kp6j2f3qd371arq7pfphvncc9k1m63rqm0kyzy9jk20k"; - }) - (fetchpatch { - name = "scd-Fix-use-case-of-PC-SC"; - url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch?h=debian/2.1.18-6"; - sha256 = "0lxqj614fialbqs2x0z13q5ikq2rc9xwphmkly179qs03d4mawsz"; - }) ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c @@ -59,9 +48,20 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://gnupg.org; - description = "A complete and free implementation of the OpenPGP standard"; + homepage = "https://gnupg.org"; + description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; + longDescription = '' + The GNU Privacy Guard is the GNU project's complete and free + implementation of the OpenPGP standard as defined by RFC4880. GnuPG + "modern" (2.1) is the latest development with a lot of new features. + GnuPG allows to encrypt and sign your data and communication, features a + versatile key management system as well as access modules for all kind of + public key directories. GnuPG, also known as GPG, is a command line tool + with features for easy integration with other applications. A wealth of + frontend applications and libraries are available. Version 2 of GnuPG + also provides support for S/MIME. + ''; maintainers = with maintainers; [ wkennington peti fpletz vrthra ]; platforms = platforms.all; }; diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix index 810d9df9e2fe..c8a8acf907d3 100644 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { # $out is not known until the build has started. configurePhase = '' + runHook preConfigure makeFlags="$makeFlags PREFIX=$out" + runHook postConfigure ''; postFixup = '' diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index abdcd5d2d3eb..911c1b12562a 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 106fbf0a150a..32bc1a4d7119 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 e502c296a50e..28c6caae6c33 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 b1d8181da65b..a45a6ea2a04c 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.18-20170209170023.17b641d"; + version = "1.0.25-20170714172717.73f9070"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "01mr6hyzs208g3ankl4swikna66n85xzn7ig4k7p6hxmnnvplgb3"; + 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 b962a6409b45..e4fa484b08ec 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 = "20170209.17b641d"; + version = "1.0.22"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -10,10 +10,10 @@ buildGoPackage rec { dontRenameImports = true; src = fetchFromGitHub { - owner = "keybase"; - repo = "client"; - rev = "17b641de629a85ad77621d0efa3e2442661b5ee7"; - sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11"; + owner = "keybase"; + repo = "client"; + rev = "v${version}"; + 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/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix new file mode 100644 index 000000000000..c655e9aecf8b --- /dev/null +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -0,0 +1,49 @@ +{ + mkDerivation, fetchurl, lib, + pkgconfig, + kcoreaddons, ki18n, kwallet, + mksh +}: + +let + pname = "kwalletcli"; + version = "3.00"; +in +mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz"; + sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98"; + }; + + postPatch = '' + substituteInPlace GNUmakefile \ + --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \ + --replace '-I/usr/include/KF5/KI18n' '-I${ki18n.dev}/include/KF5/KI18n' \ + --replace '-I/usr/include/KF5/KWallet' '-I${kwallet.dev}/include/KF5/KWallet' \ + --replace /usr/bin $out/bin \ + --replace /usr/share/man $out/share/man + ''; + + makeFlags = [ "KDE_VER=5" ]; + + # we need this when building against qt 5.8+ + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + + nativeBuildInputs = [ pkgconfig ]; + # if using just kwallet, cmake will be added as a buildInput and fail the build + propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ]; + propagatedUserEnvPkgs = [ mksh ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + meta = with lib; { + description = "Command-Line Interface to the KDE Wallet"; + homepage = http://www.mirbsd.org/kwalletcli.htm; + license = licenses.miros; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index b856308712f8..2d58bcc9a230 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Makefile.in --replace 'root' '$(id -u)' substituteInPlace configure --replace '/dev/input' '/tmp' + sed -i '/chmod u+s/d' src/Makefile.in ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix new file mode 100644 index 000000000000..46c90481628d --- /dev/null +++ b/pkgs/tools/security/masscan/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, libpcap }: + +stdenv.mkDerivation rec { + name = "masscan-${version}"; + version = "2016-11-03"; + + src = fetchFromGitHub { + owner = "robertdavidgraham"; + repo = "masscan"; + rev = "dc88677a11dc3d9a5f6aa55cc1377bc17dba1496"; + sha256 = "1mdjqkn4gnbwr5nci6i6xn7qzkjgq7dx37fzd6gghv87xgw7cdbg"; + }; + + buildInputs = [ libpcap ]; + + makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ]; + + postInstall = '' + mkdir -p $out/share/man/man8 + mkdir -p $out/share/{doc,licenses}/masscan + mkdir -p $out/etc/masscan + + cp data/exclude.conf $out/etc/masscan + cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.hml + cp doc/masscan.8 $out/share/man/man8/masscan.8 + cp LICENSE $out/share/licenses/masscan/LICENSE + ''; + + meta = with stdenv.lib; { + description = "Fast scan of the Internet"; + homepage = https://github.com/robertdavidgraham/masscan; + license = licenses.agpl3; + platforms = with platforms; allBut darwin; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile new file mode 100644 index 000000000000..de44760bde74 --- /dev/null +++ b/pkgs/tools/security/metasploit/Gemfile @@ -0,0 +1,4 @@ +# frozen_string_literal: true +source "https://rubygems.org" + +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.14.25" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock new file mode 100644 index 000000000000..d3a88a50aeca --- /dev/null +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -0,0 +1,267 @@ +GIT + remote: https://github.com/rapid7/metasploit-framework + revision: 8a194207f07c2b8c91c1a72e57c25683d4e9f744 + ref: refs/tags/4.14.25 + specs: + metasploit-framework (4.14.25) + actionpack (~> 4.2.6) + activerecord (~> 4.2.6) + activesupport (~> 4.2.6) + backports + bcrypt + bit-struct + filesize + jsobfu + json + metasm + metasploit-concern + metasploit-credential + metasploit-model + metasploit-payloads (= 1.2.32) + metasploit_data_models + metasploit_payloads-mettle (= 0.1.9) + msgpack + nessus_rest + net-ssh + network_interface + nexpose + nokogiri + octokit + openssl-ccm + openvas-omp + packetfu + patch_finder + pcaprub + pg + railties + rb-readline + recog + redcarpet + rex-arch + rex-bin_tools + rex-core + rex-encoder + rex-exploitation + rex-java + rex-mime + rex-nop + rex-ole + rex-powershell + rex-random_identifier + rex-registry + rex-rop_builder + rex-socket + rex-sslscan + rex-struct2 + rex-text + rex-zip + robots + ruby_smb + rubyntlm + rubyzip + sqlite3 + sshkey + tzinfo + tzinfo-data + windows_error + xmlrpc + +GEM + remote: https://rubygems.org/ + specs: + actionpack (4.2.8) + actionview (= 4.2.8) + activesupport (= 4.2.8) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.8) + activesupport (= 4.2.8) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activemodel (4.2.8) + activesupport (= 4.2.8) + builder (~> 3.1) + activerecord (4.2.8) + activemodel (= 4.2.8) + activesupport (= 4.2.8) + arel (~> 6.0) + activesupport (4.2.8) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) + arel (6.0.4) + arel-helpers (2.4.0) + activerecord (>= 3.1.0, < 6) + backports (3.8.0) + bcrypt (3.1.11) + bindata (2.4.0) + bit-struct (0.16) + builder (3.2.3) + erubis (2.7.0) + faraday (0.12.1) + multipart-post (>= 1.2, < 3) + filesize (0.1.1) + i18n (0.8.4) + jsobfu (0.4.2) + rkelly-remix + json (2.1.0) + loofah (2.0.3) + nokogiri (>= 1.5.9) + metasm (1.0.3) + metasploit-concern (2.0.4) + activemodel (~> 4.2.6) + activesupport (~> 4.2.6) + railties (~> 4.2.6) + metasploit-credential (2.0.10) + metasploit-concern + metasploit-model + metasploit_data_models + pg + railties + rex-socket + rubyntlm + rubyzip + metasploit-model (2.0.4) + activemodel (~> 4.2.6) + activesupport (~> 4.2.6) + railties (~> 4.2.6) + metasploit-payloads (1.2.32) + metasploit_data_models (2.0.14) + activerecord (~> 4.2.6) + activesupport (~> 4.2.6) + arel-helpers + metasploit-concern + metasploit-model + pg + postgres_ext + railties (~> 4.2.6) + recog (~> 2.0) + metasploit_payloads-mettle (0.1.9) + mini_portile2 (2.2.0) + minitest (5.10.2) + msgpack (1.1.0) + multipart-post (2.0.0) + nessus_rest (0.1.6) + net-ssh (4.1.0) + network_interface (0.0.1) + nexpose (6.0.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + octokit (4.7.0) + sawyer (~> 0.8.0, >= 0.5.3) + openssl-ccm (1.2.1) + openvas-omp (0.0.4) + packetfu (1.1.13) + pcaprub + patch_finder (1.0.2) + pcaprub (0.12.4) + pg (0.20.0) + pg_array_parser (0.0.9) + postgres_ext (3.0.0) + activerecord (>= 4.0.0) + arel (>= 4.0.1) + pg_array_parser (~> 0.0.9) + public_suffix (2.0.5) + rack (1.6.8) + rack-test (0.6.3) + rack (>= 1.0) + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.8) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.8) + actionpack (= 4.2.8) + activesupport (= 4.2.8) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-readline (0.5.4) + recog (2.1.8) + nokogiri + redcarpet (3.4.0) + rex-arch (0.1.8) + rex-text + rex-bin_tools (0.1.3) + metasm + rex-arch + rex-core + rex-struct2 + rex-text + rex-core (0.1.10) + rex-encoder (0.1.4) + metasm + rex-arch + rex-text + rex-exploitation (0.1.14) + jsobfu + metasm + rex-arch + rex-encoder + rex-text + rex-java (0.1.5) + rex-mime (0.1.5) + rex-text + rex-nop (0.1.1) + rex-arch + rex-ole (0.1.6) + rex-text + rex-powershell (0.1.72) + rex-random_identifier + rex-text + rex-random_identifier (0.1.2) + rex-text + rex-registry (0.1.3) + rex-rop_builder (0.1.3) + metasm + rex-core + rex-text + rex-socket (0.1.6) + rex-core + rex-sslscan (0.1.4) + rex-socket + rex-text + rex-struct2 (0.1.2) + rex-text (0.2.15) + rex-zip (0.1.3) + rex-text + rkelly-remix (0.0.7) + robots (0.10.1) + ruby_smb (0.0.18) + bindata + rubyntlm + windows_error + rubyntlm (0.6.2) + rubyzip (1.2.1) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + sqlite3 (1.3.13) + sshkey (1.9.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + tzinfo-data (1.2017.2) + tzinfo (>= 1.0.0) + windows_error (0.1.2) + xmlrpc (0.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + metasploit-framework! + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 41d9934191d7..4cc287c40f27 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -1,34 +1,51 @@ -{ stdenv, fetchurl, makeWrapper, ruby }: +{ stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }: -stdenv.mkDerivation rec { +# Maintainer notes for updating: +# 1. increment version number in expression and in Gemfile +# 2. run $ nix-shell --command "bundler install && bundix" +# in metasploit in nixpkgs + +let + env = bundlerEnv { + inherit ruby; + name = "metasploit-bundler-env"; + gemdir = ./.; + }; +in stdenv.mkDerivation rec { name = "metasploit-framework-${version}"; - version = "3.3.1"; + version = "4.14.25"; - src = fetchurl { - url = "http://downloads.metasploit.com/data/releases/archive/framework-${version}.tar.bz2"; - sha256 = "07clzw1zfnqjhyydsc4mza238isai58p7aygh653qxsqb9a0j7qw"; + src = fetchFromGitHub { + owner = "rapid7"; + repo = "metasploit-framework"; + rev = version; + sha256 = "0cp1ybq29a0r7kabg4p2yj0qm90hjvr4xxp0pynb2g406sbyycjm"; }; - buildInputs = [makeWrapper]; + buildInputs = [ makeWrapper ]; + + dontPatchelf = true; # stay away from exploit executables installPhase = '' - mkdir -p $out/share/msf - mkdir -p $out/bin + mkdir -p $out/{bin,share/msf} cp -r * $out/share/msf for i in $out/share/msf/msf*; do - makeWrapper $i $out/bin/$(basename $i) --prefix RUBYLIB : $out/share/msf/lib + bin=$out/bin/$(basename $i) + cat > $bin < {}; +stdenv.mkDerivation { + name = "env"; + buildInputs = [ + ruby.devEnv + git + sqlite + libpcap + postgresql + libxml2 + libxslt + pkgconfig + bundix + ]; +} diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index 96847c983f12..f04f67c7a434 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/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch deleted file mode 100644 index 74e466069d93..000000000000 --- a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -251,23 +251,23 @@ - # ${CMAKE_SOURCE_DIR}/data/icons/48x48 - # ${CMAKE_SOURCE_DIR}/data/icons/128x128 - ${CMAKE_SOURCE_DIR}/data/icons/ -- DESTINATION usr/share/icons/ -+ DESTINATION share/icons/ - ) - - install(FILES - ${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop -- DESTINATION usr/share/applications -+ DESTINATION share/applications - ) - - install(FILES - ${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png -- DESTINATION usr/share/pixmaps -+ DESTINATION share/pixmaps - ) - - # Install Nitrokey udev rules - install(FILES - ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules -- DESTINATION usr/lib/udev/rules.d -+ DESTINATION lib/udev/rules.d - ) - - # Install autocompletion scripts -@@ -278,7 +278,7 @@ - - install(FILES - ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo -- DESTINATION usr/share/locale/de_DE/LC_MESSAGES -+ DESTINATION share/locale/de_DE/LC_MESSAGES - ) - - install(FILES -@@ -286,7 +286,7 @@ - ${CMAKE_SOURCE_DIR}/images/quit.png - ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png - ${CMAKE_SOURCE_DIR}/images/settings.png -- DESTINATION usr/share/nitrokey -+ DESTINATION share/nitrokey - ) - - ENDIF () # NOT WIN32 -@@ -299,7 +299,7 @@ - ${resources_ouput} - ) - --INSTALL(TARGETS nitrokey-app DESTINATION usr/bin) -+INSTALL(TARGETS nitrokey-app DESTINATION bin) - - TARGET_LINK_LIBRARIES(nitrokey-app - ${QT_LIBRARIES} diff --git a/pkgs/tools/security/nitrokey-app/HeaderPath.patch b/pkgs/tools/security/nitrokey-app/HeaderPath.patch deleted file mode 100644 index 695b7559116c..000000000000 --- a/pkgs/tools/security/nitrokey-app/HeaderPath.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/utils/hid_libusb.c b/src/utils/hid_libusb.c -index bd8c14e..537292d 100644 ---- a/src/utils/hid_libusb.c -+++ b/src/utils/hid_libusb.c -@@ -44,7 +44,7 @@ - #include - - /* GNU / LibUSB */ --#include "libusb.h" -+#include "libusb-1.0/libusb.h" - #include "iconv.h" - - #include "hidapi.h" diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 91d5e75272bc..1443409c0226 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,28 +1,28 @@ -{ stdenv, cmake, fetchFromGitHub, libusb1, pkgconfig, qt5 }: +{ stdenv, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: stdenv.mkDerivation rec { name = "nitrokey-app"; - version = "0.5.1"; + version = "1.1"; - src = fetchFromGitHub { - owner = "Nitrokey"; - repo = "nitrokey-app"; - rev = "v${version}"; - sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw"; + src = fetchgit { + url = "https://github.com/Nitrokey/nitrokey-app.git"; + rev = "refs/tags/v${version}"; + sha256 = "11pz1p5qgghkr5f8s2wg34zqhxk2vq465i73w1h479j88x35rdp0"; }; buildInputs = [ - cmake + hidapi libusb1 - pkgconfig qt5.qtbase + qt5.qttranslations ]; - patches = [ - ./FixInstallDestination.patch - ./HeaderPath.patch + nativeBuildInputs = [ + cmake + pkgconfig ]; cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO"; - meta = { + + meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' The nitrokey-app provides a QT system tray widget with wich you can @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/Nitrokey/nitrokey-app; repositories.git = https://github.com/Nitrokey/nitrokey-app.git; - license = stdenv.lib.licenses.gpl3; - maintainer = stdenv.lib.maintainers.kaiha; + license = licenses.gpl3; + maintainers = with maintainers; [ kaiha fpletz ]; }; } diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix new file mode 100644 index 000000000000..99947a0eefef --- /dev/null +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -0,0 +1,25 @@ +{ stdenv, nitrokey-app +, group ? "nitrokey" +}: + +stdenv.mkDerivation { + name = "nitrokey-udev-rules"; + + inherit (nitrokey-app) src; + + dontBuild = true; + + patchPhase = '' + substituteInPlace data/41-nitrokey.rules --replace plugdev "${group}" + ''; + + installPhase = '' + mkdir -p $out/etc/udev/rules.d + cp data/41-nitrokey.rules $out/etc/udev/rules.d + ''; + + meta = { + description = "udev rules for Nitrokeys"; + inherit (nitrokey-app.meta) homepage license maintainers; + }; +} diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index aefa82128ac1..6495634da33b 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.40"; + version = "7.50"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "121i9mgyc28ra2825akd0ix5qyssv4xc2qlx296mam6hzxgnc54y"; + sha256 = "1ckl2qxqxkrfa2qxdrqyaa4k1hhj273aqckrc46fijdz0a76mag9"; }; patches = ./zenmap.patch; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index c3b1d64c3a3e..97a8c0af2c80 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -1,17 +1,16 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - - version = "1.3"; name = "paperkey-${version}"; - + version = "1.4"; + src = fetchurl { url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; - sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb"; + sha256 = "0vrkryxqbsjcmqalsnxvc3pahg6vvyrn139aj8md29sihgnb0az1"; }; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "Store OpenPGP or GnuPG on paper"; longDescription = '' @@ -23,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "http://www.jabberwocky.com/software/paperkey/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.skeidel ]; + maintainers = with maintainers; [ skeidel ]; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 62f1a3a05dd0..331a75495ed3 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,22 +12,40 @@ assert x11Support -> xclip != null && xdotool != null && dmenu != null; -stdenv.mkDerivation rec { - version = "1.7"; +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}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn"; + sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + patches = [ ./set-correct-program-name-for-sleep.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; nativeBuildInputs = [ makeWrapper ]; 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/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 165091d934ae..2f3fab6de816 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "09wpkxg5b7xicdisgbhlfr8vs1iv7z9sc58pjl0p198yap57khq5"; + sha256 = "08chbn966140p3gmgalkhhm01ym64fvb6d2w5mbwpyl0986m89ba"; }; buildInputs = [ makeWrapper ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = https://github.com/carnager/rofi-pass; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny garbas ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch new file mode 100644 index 000000000000..782e06e20fd9 --- /dev/null +++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch @@ -0,0 +1,69 @@ +From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001 +From: "Andrew R. M" +Date: Sat, 8 Apr 2017 13:50:01 -0400 +Subject: [PATCH] Patch the clip() function to work even when using + single-binary coreutils + +--- + src/password-store.sh | 4 ++-- + src/platform/cygwin.sh | 4 ++-- + src/platform/darwin.sh | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/password-store.sh b/src/password-store.sh +index 6a4172d..4dbd6b8 100755 +--- a/src/password-store.sh ++++ b/src/password-store.sh +@@ -155,11 +155,11 @@ clip() { + # variable. Specifically, it cannot store nulls nor (non-trivally) store + # trailing new lines. + local sleep_argv0="password store sleep on display $DISPLAY" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" + ( +- ( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" ) ++ ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") ) + local now="$(xclip -o -selection "$X_SELECTION" | base64)" + [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + +diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh +index 6e5dd86..f3574c4 100644 +--- a/src/platform/cygwin.sh ++++ b/src/platform/cygwin.sh +@@ -3,11 +3,11 @@ + + clip() { + local sleep_argv0="password store sleep on display $DISPLAY" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(base64 < /dev/clipboard)" + echo -n "$1" > /dev/clipboard + ( +- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) ++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) + local now="$(base64 < /dev/clipboard)" + [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + echo "$before" | base64 -d > /dev/clipboard +diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh +index 86eb325..deb04c4 100644 +--- a/src/platform/darwin.sh ++++ b/src/platform/darwin.sh +@@ -3,11 +3,11 @@ + + clip() { + local sleep_argv0="password store sleep for user $(id -u)" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(pbpaste | openssl base64)" + echo -n "$1" | pbcopy + ( +- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) ++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) + local now="$(pbpaste | openssl base64)" + [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now" + echo "$before" | openssl base64 -d | pbcopy +-- +2.12.2 + diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 5a40837f1d9d..e3aaca2e5b22 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.20"; + version = "1.8.21"; src = fetchurl { - # This URL changes in unpredictable ways, so it is not sensicle + # This URL changes in unpredictable ways, so it is not sensible # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4203/pcsc-lite-1.8.20.tar.bz2"; - sha256 = "1ckb0jf4n585a4j26va3jm2nrv3c1y38974514f8qy3c04a02zgc"; + url = "https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2"; + sha256 = "1b8kwl81f6s3y7qh68ahr8sp8a0w6m464v9b3s4zxq2cgpmnaczy"; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 1e33c18753a6..dfe4579aa588 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgpdump-${version}"; - version = "0.31"; + version = "0.32"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "pgpdump"; rev = "v${version}"; - sha256 = "05ywdgxzq3976dsy95vgdx3nnhd9i9vypzyrkabpmnxphfnjfrb4"; + sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix index 7116d1777d6d..4cba1c7e6172 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry-mac/default.nix @@ -1,20 +1,22 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; - src = fetchurl { - url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz"; - sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271"; + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "pinentry-mac"; + rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4"; + sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq"; }; - postPatch = '' - substituteInPlace ./Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild libiconv Cocoa ncurses ]; + + dontUseXcbuild = true; installPhase = '' mkdir -p $out/Applications - mv build/Release/pinentry-mac.app $out/Applications + mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications ''; passthru = { diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 97e66a250d7c..25edec9efd4d 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/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index 38d47e742a29..e8709130015f 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { homepage = http://hal.freedesktop.org/docs/PolicyKit/; description = "A dbus session bus service that is used to bring up authentication dialogs"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; + maintainers = with stdenv.lib.maintainers; [ phreedom ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/rhash/darwin.patch b/pkgs/tools/security/rhash/darwin.patch new file mode 100644 index 000000000000..76ad8fe9abd9 --- /dev/null +++ b/pkgs/tools/security/rhash/darwin.patch @@ -0,0 +1,38 @@ +diff --git a/Makefile b/Makefile +index e40dbc3..e198b93 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ ALLCFLAGS = -pipe $(CFLAGS) $(ADDCFLAGS) \ + -Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations + LDLIBRHASH = -Llibrhash -lrhash + ALLLDFLAGS = $(LDLIBRHASH) $(LDFLAGS) $(ADDLDFLAGS) +-SHAREDLIB = librhash/librhash.so.0 ++SHAREDLIB = librhash/librhash.0.dylib + SHRDLFLAGS = $(LDFLAGS) $(ADDLDFLAGS) + HEADERS = calc_sums.h hash_print.h common_func.h hash_update.h file_mask.h file_set.h find_file.h hash_check.h output.h parse_cmdline.h rhash_main.h win_utils.h version.h + SOURCES = calc_sums.c hash_print.c common_func.c hash_update.c file_mask.c file_set.c find_file.c hash_check.c output.c parse_cmdline.c rhash_main.c win_utils.c +diff --git a/librhash/Makefile b/librhash/Makefile +index 2f9bcc9..0c5aaad 100644 +--- a/librhash/Makefile ++++ b/librhash/Makefile +@@ -28,8 +28,8 @@ PREFIX = /usr/local + INCDIR = $(PREFIX)/include + LIBDIR = $(PREFIX)/lib + LIBRARY = librhash.a +-SONAME = librhash.so.0 +-SOLINK = librhash.so ++SONAME = librhash.0.dylib ++SOLINK = librhash.dylib + TEST_TARGET = test_hashes + TEST_SHARED = test_shared + # Set variables according to GNU coding standard +@@ -182,8 +182,7 @@ test-dll: $(DLLNAME) test_hashes.o + + # shared and static libraries + $(SONAME): $(SOURCES) +- sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/ \1;/p; $$s/.*/local: *; };/p' $(SO_HEADERS) > exports.sym +- $(CC) -fpic $(ALLCFLAGS) -shared $(SOURCES) -Wl,--version-script,exports.sym,-soname,$(SONAME) $(LIBLDFLAGS) -o $@ ++ $(CC) -fpic $(ALLCFLAGS) -dynamiclib $(SOURCES) $(LIBLDFLAGS) -Wl,-install_name,$(PREFIX)/lib/$@ -o $@ + ln -s $(SONAME) $(SOLINK) + # use 'nm -Cg --defined-only $@' to view exported symbols + diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 1f72ca294eb7..e33c680b4578 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -10,13 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; # we build the static library because of two makefile bugs # * .h files installed for static library target only # * .so.0 -> .so link only created in the static library install target buildPhase = '' - make lib-shared lib-static build-shared + make lib-shared lib-static build-shared CC=cc PREFIX=$out ''; # we don't actually want the static library, so we remove it after it @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://rhash.anz.ru; description = "Console utility and library for computing and verifying hash sums of files"; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.andrewrk ]; }; } diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index ea6b7411c4e7..7be136944c6d 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -1,73 +1,223 @@ -{ stdenv, fetchurl, makeWrapper, autoconf, automake -, gnupg, perl, python, libmd, qprint, coreutils, gnused, glibc, gnupg1compat -, perlPackages }: +{ stdenv, fetchurl, autoconf, automake, makeWrapper +, python, perl, perlPackages +, libmd, gnupg1, which, getopt, libpaper, nettools, qprint +, sendmailPath ? "/run/wrappers/bin/sendmail" }: +let + # All runtime dependencies from the CPAN graph: + # https://widgets.stratopan.com/wheel?q=GnuPG-Interface-0.52&runtime=1&fs=1 + # TODO: XSLoader seems optional + GnuPGInterfaceRuntimeDependencies = with perlPackages; [ + strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny + GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate + RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader + ]; +in stdenv.mkDerivation rec { + pname = "signing-party"; version = "2.5"; - basename = "signing-party"; - name = "${basename}-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2"; }; sourceRoot = "."; + # TODO: Get this patch upstream... patches = [ ./gpgwrap_makefile.patch ]; postPatch = '' - substituteInPlace gpg-mailkeys/gpg-mailkeys --replace "/usr/sbin/sendmail" "sendmail" + substituteInPlace gpg-mailkeys/gpg-mailkeys --replace \ + "/usr/sbin/sendmail" "${sendmailPath}" ''; + # One can use the following command to find all relevant Makefiles: + # grep -R '$(DESTDIR)/usr' | cut -d: -f1 | sort -u | grep -v 'debian/rules' preBuild = '' - substituteInPlace sig2dot/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace gpgsigs/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace keylookup/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace springgraph/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace keyanalyze/Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace gpgsigs/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace keyanalyze/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace keylookup/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace sig2dot/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace springgraph/Makefile --replace '$(DESTDIR)/usr' "$out" ''; + # Perl is required for it's pod2man. + # Python and Perl are required for patching the script interpreter paths. nativeBuildInputs = [ autoconf automake makeWrapper ]; - buildInputs = [ gnupg perl python libmd ] ++ - (with perlPackages; [ GnuPGInterface TextTemplate MIMEtools NetIDNEncode MailTools ]); - - installFlags = [ "DESTDIR=\${out}" ]; + buildInputs = [ python perl perlPackages.GnuPGInterface libmd gnupg1 ]; postInstall = '' - install -m 755 \ - caff/caff caff/pgp-clean caff/pgp-fixkey \ - gpglist/gpglist \ - gpgparticipants/gpgparticipants \ - gpgparticipants/gpgparticipants-prefill \ - gpgsigs/gpgsigs \ - gpg-key2ps/gpg-key2ps \ - gpg-mailkeys/gpg-mailkeys \ - keyart/keyart \ - $out/bin + # Install all tools which aren't handled by 'make install'. + # TODO: Fix upstream...! - install -m 644 \ - caff/caff.1 caff/pgp-clean.1 caff/pgp-fixkey.1 \ - gpglist/gpglist.1 \ - gpgparticipants/gpgparticipants-prefill.1 \ - gpgparticipants/gpgparticipants.1 \ - gpgsigs/gpgsigs.1 \ - gpg-key2ps/gpg-key2ps.1 \ - gpg-mailkeys/gpg-mailkeys.1 \ - $out/share/man/man1 + # caff: CA - Fire and Forget signs and mails a key + install -D -m555 caff/caff $out/bin/caff; + install -D -m444 caff/caff.1 $out/share/man/man1/caff.1; - wrapProgram $out/bin/caff --prefix PERL5LIB ":" "$PERL5LIB" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat ]}" - wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" "${stdenv.lib.makeBinPath [ qprint coreutils gnused glibc gnupg1compat ]}" + # pgp-clean: removes all non-self signatures from key + install -D -m555 caff/pgp-clean $out/bin/pgp-clean; + install -D -m444 caff/pgp-clean.1 $out/share/man/man1/pgp-clean.1; + + # pgp-fixkey: removes broken packets from keys + install -D -m555 caff/pgp-fixkey $out/bin/pgp-fixkey; + install -D -m444 caff/pgp-fixkey.1 $out/share/man/man1/pgp-fixkey.1; + + # gpg-mailkeys: simply mail out a signed key to its owner + install -D -m555 gpg-mailkeys/gpg-mailkeys $out/bin/gpg-mailkeys; + install -D -m444 gpg-mailkeys/gpg-mailkeys.1 $out/share/man/man1/gpg-mailkeys.1; + + # gpg-key2ps: generate PostScript file with fingerprint paper slips + install -D -m555 gpg-key2ps/gpg-key2ps $out/bin/gpg-key2ps; + install -D -m444 gpg-key2ps/gpg-key2ps.1 $out/share/man/man1/gpg-key2ps.1; + + # gpgdir: recursive directory encryption tool + install -D -m555 gpgdir/gpgdir $out/bin/gpgdir; + install -D -m444 gpgdir/gpgdir.1 $out/share/man/man1/gpgdir.1; + + # gpglist: show who signed which of your UIDs + install -D -m555 gpglist/gpglist $out/bin/gpglist; + install -D -m444 gpglist/gpglist.1 $out/share/man/man1/gpglist.1; + + # gpgsigs: annotates list of GnuPG keys with already done signatures + # The manual page is not handled by 'make install' + install -D -m444 gpgsigs/gpgsigs.1 $out/share/man/man1/gpgsigs.1; + + # gpgparticipants: create list of party participants for the organiser + install -D -m555 gpgparticipants/gpgparticipants $out/bin/gpgparticipants; + install -D -m444 gpgparticipants/gpgparticipants.1 $out/share/man/man1/gpgparticipants.1; + install -D -m555 gpgparticipants/gpgparticipants-prefill $out/bin/gpgparticipants-prefill; + install -D -m444 gpgparticipants/gpgparticipants-prefill.1 $out/share/man/man1/gpgparticipants-prefill.1; + + # gpgwrap: a passphrase wrapper + install -D -m555 gpgwrap/bin/gpgwrap $out/bin/gpgwrap; + install -D -m444 gpgwrap/doc/gpgwrap.1 $out/share/man/man1/gpgwrap.1; + + # keyanalyze: minimum signing distance (MSD) analysis on keyrings + # Only the binaries are handled by 'make install' + install -D -m444 keyanalyze/keyanalyze.1 $out/share/man/man1/keyanalyze.1; + install -D -m444 keyanalyze/pgpring/pgpring.1 $out/share/man/man1/pgpring.1; + install -D -m444 keyanalyze/process_keys.1 $out/share/man/man1/process_keys.1; + + # keylookup: ncurses wrapper around gpg --search + # Handled by 'make install' + + # sig2dot: converts a list of GnuPG signatures to a .dot file + # Handled by 'make install' + + # springgraph: creates a graph from a .dot file + # Handled by 'make install' + + # keyart: creates a random ASCII art of a PGP key file + install -D -m555 keyart/keyart $out/bin/keyart; + install -D -m444 keyart/doc/keyart.1 $out/share/man/man1/keyart.1; + + # gpg-key2latex: generate LaTeX file with fingerprint paper slips + install -D -m555 gpg-key2latex/gpg-key2latex $out/bin/gpg-key2latex; + install -D -m444 gpg-key2latex/gpg-key2latex.1 $out/share/man/man1/gpg-key2latex.1; ''; - doCheck = false; # no tests + postFixup = '' + # Add the runtime dependencies for all programs (but mainly for the Perl + # scripts) - meta = { - description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc"; - homepage = http://pgp-tools.alioth.debian.org; - platforms = gnupg.meta.platforms; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; + wrapProgram $out/bin/caff --set PERL5LIB \ + ${with perlPackages; stdenv.lib.makePerlPath ([ + TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ] + ++ GnuPGInterfaceRuntimeDependencies)} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}" + + wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 libpaper ]}" + + wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ which gnupg1 libpaper ]}" + + wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 qprint ]}" + + wrapProgram $out/bin/gpgdir --set PERL5LIB \ + ${with perlPackages; stdenv.lib.makePerlPath ([ + TermReadKey ] + ++ GnuPGInterfaceRuntimeDependencies)} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/gpglist --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ getopt gnupg1 ]}" + +# wrapProgram $out/bin/gpgparticipants-prefill + + wrapProgram $out/bin/gpgsigs --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/gpgwrap --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + +# wrapProgram $out/bin/keyanalyze --set PERL5LIB \ + + wrapProgram $out/bin/keyart --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/keylookup --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/pgp-clean --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + +# wrapProgram $out/bin/pgpring + +# wrapProgram $out/bin/process_keys + + # Upstream-Bug: Seems like sig2dot doesn't work with 2.1 (modern) anymore, + # please use 2.0 (stable) instead. +# wrapProgram $out/bin/sig2dot + + wrapProgram $out/bin/springgraph --set PERL5LIB \ + ${with perlPackages; stdenv.lib.makePerlPath [ GD ]} + ''; + + meta = with stdenv.lib; { + homepage = "https://pgp-tools.alioth.debian.org/"; + description = "A collection of several projects relating to OpenPGP"; + longDescription = '' + This is a collection of several projects relating to OpenPGP. + + * caff: CA - Fire and Forget signs and mails a key + * pgp-clean: removes all non-self signatures from key + * pgp-fixkey: removes broken packets from keys + * gpg-mailkeys: simply mail out a signed key to its owner + * gpg-key2ps: generate PostScript file with fingerprint paper slips + * gpgdir: recursive directory encryption tool + * gpglist: show who signed which of your UIDs + * gpgsigs: annotates list of GnuPG keys with already done signatures + * gpgparticipants: create list of party participants for the organiser + * gpgwrap: a passphrase wrapper + * keyanalyze: minimum signing distance (MSD) analysis on keyrings + * keylookup: ncurses wrapper around gpg --search + * sig2dot: converts a list of GnuPG signatures to a .dot file + * springgraph: creates a graph from a .dot file + * keyart: creates a random ASCII art of a PGP key file + * gpg-key2latex: generate LaTeX file with fingerprint paper slips + ''; + license = with licenses; [ bsd2 bsd3 gpl2 gpl2Plus gpl3Plus ]; + maintainers = with maintainers; [ fpletz primeos ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix new file mode 100644 index 000000000000..79753305c592 --- /dev/null +++ b/pkgs/tools/security/sops/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "sops-${version}"; + version = "2.0.8"; + + goPackagePath = "go.mozilla.org/sops"; + + src = fetchFromGitHub { + rev = version; + owner = "mozilla"; + repo = "sops"; + sha256 = "0kawnp24i3r981hz6apfwhgp71002vjq7ir54arq0zkssmykms1c"; + }; + + meta = with stdenv.lib; { + description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; + homepage = https://github.com/mozilla/sops; + license = licenses.mpl20; + }; +} diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index b581d8007947..0a9804a743bc 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f"; }; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" ''; + # For some reason (probably a build system bug), the binary isn't # properly linked to $out/lib to find libfuzzy.so postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch b/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch new file mode 100644 index 000000000000..f1233a04b7a6 --- /dev/null +++ b/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch @@ -0,0 +1,27 @@ +From 11f0d238d3149c31c4440b8f6a58fe6a00b82d3a Mon Sep 17 00:00:00 2001 +From: Daniel Aleksandersen +Date: Mon, 13 Mar 2017 16:29:33 +0100 +Subject: [PATCH 1/3] Remove the unnecessary = from ipset cmds + +--- + src/fw/sshg-fw-ipset.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/fw/sshg-fw-ipset.sh b/src/fw/sshg-fw-ipset.sh +index 510bc2c..dc7f86b 100644 +--- a/src/fw/sshg-fw-ipset.sh ++++ b/src/fw/sshg-fw-ipset.sh +@@ -3,8 +3,8 @@ + # This file is part of SSHGuard. + + fw_init() { +- ipset -quiet create -exist sshguard4 hash:ip family=inet +- ipset -quiet create -exist sshguard6 hash:ip family=inet6 ++ ipset -quiet create -exist sshguard4 hash:ip family inet ++ ipset -quiet create -exist sshguard6 hash:ip family inet6 + } + + fw_block() { +-- +2.10.0 + diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix new file mode 100644 index 000000000000..bb165e53c73d --- /dev/null +++ b/pkgs/tools/security/sshguard/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, autoreconfHook, yacc, flex}: + + +stdenv.mkDerivation rec { + version = "2.0.0"; + name = "sshguard-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz"; + sha256 = "e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06"; + }; + + doCheck = true; + + nativeBuildInputs = [ autoreconfHook yacc flex ]; + + configureFlags = [ "--sysconfdir=/etc" ]; + + patches = [ ./0001-Remove-the-unnecessary-from-ipset-cmds.patch ]; + + meta = with stdenv.lib; { + description = "SSHGuard protects hosts from brute-force attacks"; + longDescription = '' + SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns. + If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked. + ''; + homepage = https://sshguard.net; + license = licenses.bsd3; + maintainers = with maintainers; [ sargon ]; + platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd; + }; +} diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index daa02497d0f6..2d663175ec9d 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/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 90034b641a05..87fda1467f0d 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sslscan-${version}"; - version = "1.11.8"; + version = "1.11.10"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "${version}-rbsec"; - sha256 = "0vm9r0hmpb6ifix2biqbr7za1rld9yx8hi8vf7j69vcm647z7aas"; + sha256 = "1bxr7p7nhg4b8wkcm7j2xk10gf370sqcvl06vbgnqd3azp55fhpf"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index b8e0ebaa9bbe..6f662206350f 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -4,16 +4,21 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.19p2"; + name = "sudo-1.8.20p2"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1q2j3b1xqw66kdd5h8a6j62cz7xhk1qp1dx4rz59xm9agkk1hzi3"; + sha256 = "1na5likm1srnd1g5sjx7b0543sczw0yppacyqsazfdg9b48awhmx"; }; + prePatch = '' + # do not set sticky bit in nix store + substituteInPlace src/Makefile.in --replace 04755 0755 + ''; + configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index abfdf8eedca5..866e1f41028b 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy"; }; + prePatch = '' + # do not set sticky bit in nix store + substituteInPlace Makefile.in \ + --replace "-o root" "" \ + --replace 04755 755 + ''; + patches = [ (fetchpatch { url = http://anonscm.debian.org/cgit/users/robert/super.git/plain/debian/patches/14-Fix-unchecked-setuid-call.patch; sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 7fcde2a03509..e8eb3aacd3e9 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "thc-hydra-${version}"; - version = "8.2"; + version = "8.5"; src = fetchurl { url = "http://www.thc.org/releases/hydra-${version}.tar.gz"; - sha256 = "1i2a5glmrxdjr80gfppx6wgakflcpj3ksgng212fjzhxr9m4k24y"; + sha256 = "0vfx6xwmw0r7nd0s232y7rckcj58fc1iqjgp4s56rakpz22b4yjm"; }; preConfigure = '' diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 8128b58155c2..2555aeccea4c 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.2.9.10"; + name = "tor-0.3.0.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0h8kpn42mgpkzmnga143hi8nh0ai65ypxh7qhkwbb15j3wz2h4fn"; + sha256 = "0hhyb1wil8japynqnm07r1f67w3wdnafdg9amzlrrcfcyq5qim28"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix deleted file mode 100644 index 80a92b4a932e..000000000000 --- a/pkgs/tools/security/tor/torbrowser.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, fetchurl, makeDesktopItem -, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 -, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib -, gstreamer, gst-plugins-base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg -, libpulseaudio -, mediaSupport ? false -}: - -let - libPath = stdenv.lib.makeLibraryPath ([ - stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype - fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt - ] ++ stdenv.lib.optionals mediaSupport [ - gstreamer gst-plugins-base gmp ffmpeg - libpulseaudio - ]); - - # Ignored if !mediaSupport - gstPlugins = [ gstreamer gst-plugins-base gst-plugins-good gst-ffmpeg ]; - - gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x: - "${x}/lib/gstreamer-0.10") gstPlugins; -in - -stdenv.mkDerivation rec { - name = "tor-browser-${version}"; - version = "6.5.1"; - - src = fetchurl { - url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; - sha256 = if stdenv.is64bit then - "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i" else - "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr"; - }; - - preferLocalBuild = true; - - desktopItem = makeDesktopItem { - name = "torbrowser"; - exec = "tor-browser"; - icon = "torbrowser"; - desktopName = "Tor Browser"; - genericName = "Tor Browser"; - comment = meta.description; - categories = "Network;WebBrowser;Security;"; - }; - - patchPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor - - sed -e "s,./TorBrowser,$out/share/tor-browser/Browser/TorBrowser,g" -i Browser/TorBrowser/Data/Tor/torrc-defaults - ''; - - doCheck = true; - checkPhase = '' - echo "Checking firefox..." - LD_LIBRARY_PATH=${libPath} Browser/firefox --help 1> /dev/null - echo "Checking tor..." - LD_LIBRARY_PATH=${libPath}:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null - ''; - - installPhase = '' - mkdir -p $out/share/tor-browser - mkdir -p $out/bin - cp -R * $out/share/tor-browser - - cat > "$out/bin/tor-browser" << EOF - #! ${stdenv.shell} - unset SESSION_MANAGER - export HOME="\$HOME/.torbrowser4" - if [ ! -d \$HOME ]; then - mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME - echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ - ~/Data/Browser/profile.default/preferences/extension-overrides.js - echo "pref(\"extensions.torlauncher.torrc-defaults_path\", \"\$HOME/Data/Tor/torrc-defaults\");" >> \ - ~/Data/Browser/profile.default/preferences/extension-overrides.js - echo "pref(\"extensions.torlauncher.tor_path\", \"$out/share/tor-browser/Browser/TorBrowser/Tor/tor\");" >> \ - ~/Data/Browser/profile.default/preferences/extension-overrides.js - fi - export FONTCONFIG_PATH=\$HOME/Data/fontconfig - export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor - ${stdenv.lib.optionalString mediaSupport '' - export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} - ''} - exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@" - EOF - chmod +x $out/bin/tor-browser - - mkdir -p $out/share/applications - cp $desktopItem/share/applications"/"* $out/share/applications - - mkdir -p $out/share/pixmaps - cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png - ''; - - meta = with stdenv.lib; { - description = "Tor Browser Bundle"; - homepage = https://www.torproject.org/; - platforms = platforms.linux; - maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; - }; -} diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 0344fc0a74ee..9de6216ea594 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/default.nix b/pkgs/tools/security/vulnix/default.nix new file mode 100644 index 000000000000..a058c2ee1a87 --- /dev/null +++ b/pkgs/tools/security/vulnix/default.nix @@ -0,0 +1,42 @@ +{ stdenv, pythonPackages, fetchurl, callPackage, nix, }: + +let + external = callPackage ./requirements.nix { + inherit pythonPackages; + }; +in pythonPackages.buildPythonApplication rec{ + name = "${pname}-${version}"; + pname = "vulnix"; + version = "1.2.2"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12"; + }; + + buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; + + postPatch = '' + sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py + ''; + + propagatedBuildInputs = [ + nix + ] ++ (with pythonPackages; [ + click + colorama + lxml + pyyaml + requests + external.zodb + ]); + + checkPhase = "py.test"; + + meta = with stdenv.lib; { + description = "NixOS vulnerability scanner"; + homepage = https://github.com/flyingcircusio/vulnix; + license = licenses.bsd2; + maintainers = with maintainers; [ plumps ]; + }; +} diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix new file mode 100644 index 000000000000..11faca44ef93 --- /dev/null +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -0,0 +1,113 @@ +{ pythonPackages, fetchurl, stdenv }: + +rec { + BTrees = pythonPackages.buildPythonPackage { + name = "BTrees-4.3.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz"; + sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95"; + }; + propagatedBuildInputs = [ + persistent + transaction + ] ++ (with pythonPackages; [ zope_interface coverage ]); + + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Scalable persistent object containers"; + }; + }; + + ZConfig = pythonPackages.buildPythonPackage { + name = "ZConfig-3.1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz"; + sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e"; + }; + propagatedBuildInputs = with pythonPackages; [ zope_testrunner ]; + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Structured Configuration Library"; + }; + }; + + zodb = pythonPackages.buildPythonPackage { + name = "ZODB-5.2.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz"; + sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x"; + }; + doCheck = false; + propagatedBuildInputs = [ + BTrees + persistent + transaction + ZConfig + zc.lockfile + zodbpickle + ] ++ (with pythonPackages; [ six wheel zope_interface ]); + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Zope Object Database: object database and persistence"; + }; + }; + + persistent = pythonPackages.buildPythonPackage { + name = "persistent-4.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz"; + sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c"; + }; + propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Translucent persistent objects"; + }; + }; + + transaction = pythonPackages.buildPythonPackage { + name = "transaction-2.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; + sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; + }; + propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Transaction management for Python"; + }; + }; + + zc.lockfile = pythonPackages.buildPythonPackage { + name = "zc.lockfile-1.2.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz"; + sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; + }; + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Basic inter-process locks"; + }; + }; + + zodbpickle = pythonPackages.buildPythonPackage { + name = "zodbpickle-0.6.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz"; + sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; + }; + doCheck = false; + + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Fork of Python 3 pickle module."; + }; + }; +} diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index a3b3c1c0290f..21e5c3ffcef4 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "18hn6acfj0cha9cv70f6hyaqf8qbgj0c0dm9db4v2q8z7cgi1681"; + sha256 = "05nadqpvihdyxym11mn6n02rzv2ng8ga7j9l0g5gnjx366gcai42"; }; # FIXME: this is probably not the right way to make it work diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 4263709fe9ab..ca8fbdcf0319 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.2"; + name = "acct-6.6.4"; src = fetchurl { url = "mirror://gnu/acct/${name}.tar.gz"; - sha256 = "0081hzkcxw9aslpsakridj15m0wbnkdhm210fzbg021vi4pppm4f"; + sha256 = "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac"; }; doCheck = true; diff --git a/pkgs/tools/system/at/install.patch b/pkgs/tools/system/at/install.patch index 0297d680aa46..35be4af875a3 100644 --- a/pkgs/tools/system/at/install.patch +++ b/pkgs/tools/system/at/install.patch @@ -20,7 +20,7 @@ + $(INSTALL) -m 755 -d $(IROOT)$(sbindir) + $(INSTALL) -m 755 -d $(IROOT)$(docdir) + $(INSTALL) -m 755 -d $(IROOT)$(atdocdir) -+ $(INSTALL) -m 6755 -s at $(IROOT)$(bindir) ++ $(INSTALL) -m 0755 -s at $(IROOT)$(bindir) $(LN_S) -f at $(IROOT)$(bindir)/atq $(LN_S) -f at $(IROOT)$(bindir)/atrm - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 63bb8c1f9851..e3f743766140 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "0qwpjz23z1x7dkf5k2y9f1cppryzhx4hpxprla6a4yvzs1smacdr"; + sha256 = "1iac5lwi1q10r343ii9v5p2fdplvh06yv9svsi8zz6cd2c2fjp2i"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index ecf31d6c9d6e..1b3b694bf787 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 7d649256f866..824eb74b72e5 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -35,12 +35,12 @@ , libmnl ? null }: stdenv.mkDerivation rec { - version = "5.7.0"; + version = "5.7.2"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815"; + sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; }; buildInputs = [ @@ -52,12 +52,24 @@ 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 = http://collectd.org; + homepage = https://collectd.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index dec1bacd741c..4a8babfd6302 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation { hardeningEnable = [ "pie" ]; preBuild = '' - substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 - makeFlags="DESTROOT=$out" + # do not set sticky bit in /nix/store + substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755 + makeFlags="DESTROOT=$out CC=cc" # We want to ignore the $glibc/include/paths.h definition of # sendmail path. @@ -23,7 +24,7 @@ stdenv.mkDerivation { #define _PATH_SENDMAIL "${sendmailPath}" #undef _PATH_DEFPATH - #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin" + #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin" __EOT__ # Implicit saved uids do not work here due to way NixOS uses setuid wrappers @@ -35,6 +36,6 @@ stdenv.mkDerivation { meta = { description = "Daemon for running commands at specific times (Vixie Cron)"; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix new file mode 100644 index 000000000000..a0bda0c43355 --- /dev/null +++ b/pkgs/tools/system/ctop/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "ctop-unstable-${version}"; + version = "2017-05-28"; + rev = "b4e1fbf29073625ec803025158636bdbcf2357f4"; + + goPackagePath = "github.com/bcicen/ctop"; + + src = fetchFromGitHub { + inherit rev; + owner = "bcicen"; + repo = "ctop"; + sha256 = "162pc7gds66cgznqlq9gywr0qij5pymn7xszlq9rn4w2fm64qgg3"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Concise commandline monitoring for containers"; + homepage = "http://ctop.sh/"; + license = licenses.mit; + maintainers = with maintainers; [ apeyroux ]; + }; +} diff --git a/pkgs/tools/system/ctop/deps.nix b/pkgs/tools/system/ctop/deps.nix new file mode 100644 index 000000000000..4fb75cdcd3df --- /dev/null +++ b/pkgs/tools/system/ctop/deps.nix @@ -0,0 +1,120 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "599f207b45e74648a8a6a7ac87d77e40930504e9"; + sha256 = "1n0r9ahcx5h2f97ap5fy5hgnpamzzrgihknx7wgvvpm4hrzxm31r"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52"; + sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; + }; + } + { + goPackagePath = "github.com/fsouza/go-dockerclient"; + fetch = { + type = "git"; + url = "https://github.com/fsouza/go-dockerclient"; + rev = "c933ed18bef34ec2955de03de8ef9a3bb996e3df"; + sha256 = "1qci2m5ifmz3lcmc4y6k9baz9z1i77xnrrcq6zi9mpclhhfr0qzd"; + }; + } + { + goPackagePath = "github.com/gizak/termui"; + fetch = { + type = "git"; + url = "https://github.com/gizak/termui"; + rev = "ea10e6ccee219e572ffad0ac1909f1a17f6db7d6"; + sha256 = "1nxihx4vwxwgq3vnccc8a1v34raqvvsl0p10v1nlvs61rjvs9g32"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "3573b8b52aa7b37b9358d966a898feb387f62437"; + sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; + }; + } + { + goPackagePath = "github.com/jgautheron/codename-generator"; + fetch = { + type = "git"; + url = "https://github.com/jgautheron/codename-generator"; + rev = "16d037c7cc3c9b552fe4af9828b7338d752dbaf9"; + sha256 = "0v6fji5swnrdjlp3bahv65chnbhxzl25j3hwwnyvvbb4iwa9a376"; + }; + } + { + goPackagePath = "github.com/maruel/panicparse"; + fetch = { + type = "git"; + url = "https://github.com/maruel/panicparse"; + rev = "ae43f192cef2add653fe1481a3070ed00a4a6981"; + sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; + sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "7994c181db7761ca3c67a217068cf31826113f5f"; + sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj"; + }; + } + { + goPackagePath = "github.com/nu7hatch/gouuid"; + fetch = { + type = "git"; + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; + sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3da985ce5951d99de868be4385f21ea6c2b22f24"; + sha256 = "0mhqa53pyj9gxg4m0c9s0f4r5jp0rihlni1nrpkd1d921xxzh714"; + }; + } +] diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 3dcbf59d4d7d..5f439ccdb530 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 3e00ee795ff0..8bc94b64be99 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/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 11418919e413..31be8ab63f41 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchFromGitHub, perl, efivar, pciutils, zlib, popt }: +{ stdenv, fetchFromGitHub, pkgconfig, efivar, popt }: stdenv.mkDerivation rec { name = "efibootmgr-${version}"; - version = "13"; + version = "15"; - buildInputs = [ perl efivar pciutils zlib popt ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ efivar popt ]; src = fetchFromGitHub { owner = "rhinstaller"; repo = "efibootmgr"; rev = version; - sha256 = "1kwmvx111c3a5783kx3az76mkhpr1nsdx0yv09gp4k0hgzqlqj96"; + sha256 = "0z7h1dirp8za6lbbf4f3dzn7l1px891rdymhkbqc10yj6gi1jpqp"; }; NIX_CFLAGS_COMPILE = "-I${efivar}/include/efivar"; - NIX_LDFLAGS = "-lefiboot -lefivar -lpopt"; + + makeFlags = [ "EFIDIR=nixos" ]; installFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; - homepage = http://linux.dell.com/efibootmgr/; + homepage = https://github.com/rhinstaller/efibootmgr; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 744e34a9c60a..6b062513483d 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "31"; + version = "30"; src = fetchFromGitHub { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0dhycikylm87jmds4ii5ygwq59g4sa5sv9mzryjzgqlgppw5arli"; + sha256 = "1pghj019qr7qpqd9rxfhsr1hm3s0w1hd5cdndpl07vhys8hy4a8a"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 9f97a403159a..b66cd7d6112e 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.6.0"; + version = "3.6.4"; src = fetchFromGitHub { - sha256 = "1fwvjd84nw39lgclkz4kn90z84fs9lsama3ikq0qs1in3y3jfmvi"; + sha256 = "177mmg5a4s4q2p76df4z6c51nfnr73qya1pvvj6fcs1gld01xjr6"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 5286b6b2cbc9..eca3977f459f 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw"; }; + patches = stdenv.lib.optional stdenv.isLinux ./einval.patch # patchset from brew - patches = stdenv.lib.optionals stdenv.isDarwin [ + ++ stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20"; sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p"; }) - ]; + ]; buildInputs = [ getopt ] ++ stdenv.lib.optional (!stdenv.isDarwin) libcap diff --git a/pkgs/tools/system/fakeroot/einval.patch b/pkgs/tools/system/fakeroot/einval.patch new file mode 100644 index 000000000000..f8d4fb83d137 --- /dev/null +++ b/pkgs/tools/system/fakeroot/einval.patch @@ -0,0 +1,47 @@ +Ignore EINVAL errors. This matters within user namespaces. + +See: +https://github.com/NixOS/nixpkgs/issues/25901 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802612 +https://github.com/NixOS/nixpkgs/issues/10496 + +diff --git a/libfakeroot.c b/libfakeroot.c +index 68a95fb..70da8bc 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -792,7 +792,7 @@ int chown(const char *path, uid_t owner, gid_t group){ + r=next_lchown(path,owner,group); + else + r=0; +- if(r&&(errno==EPERM)) ++ if(r&&(errno==EPERM||errno==EINVAL)) + r=0; + + return r; +@@ -819,7 +819,7 @@ int lchown(const char *path, uid_t owner, gid_t group){ + r=next_lchown(path,owner,group); + else + r=0; +- if(r&&(errno==EPERM)) ++ if(r&&(errno==EPERM||errno==EINVAL)) + r=0; + + return r; +@@ -843,7 +843,7 @@ int fchown(int fd, uid_t owner, gid_t group){ + else + r=0; + +- if(r&&(errno==EPERM)) ++ if(r&&(errno==EPERM||errno==EINVAL)) + r=0; + + return r; +@@ -870,7 +870,7 @@ int fchownat(int dir_fd, const char *path, uid_t owner, gid_t group, int flags) + else + r=0; + +- if(r&&(errno==EPERM)) ++ if(r&&(errno==EPERM||errno==EINVAL)) + r=0; + + return r; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 0398ffc180a5..7f05a7271bbf 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libaio, python, zlib }: let - version = "2.17"; - sha256 = "17fygcy3flsp64mfmwpc66byy95cidby34s6grm3zgsjb7mcypr0"; + version = "2.99"; + sha256 = "0fj8fk2w06ahcn35z8pj88sx12yrx1yfd38j6k5aigj4dfj3f3zy"; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 8dd95a8b4dec..09dfb6e47a57 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = https://github.com/openSUSE/hwinfo; maintainers = with maintainers; [ bobvanderlinden ndowens ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index dcbea5156771..fe411edfcdac 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, openssl, static ? false }: +{ stdenv, lib, fetchurl, openssl, static ? false }: let pkgname = "ipmitool"; - version = "1.8.17"; + version = "1.8.18"; in stdenv.mkDerivation { name = "${pkgname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz"; - sha256 = "0qcrz1d1dbjg46n3fj6viglzcxlf2q15xa7bx9w1hm2hq1r3jzbi"; + sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -28,10 +28,11 @@ stdenv.mkDerivation { makeFlags = if static then "AM_LDFLAGS=-all-static" else ""; dontDisableStatic = static; - meta = { + meta = with lib; { description = ''Command-line interface to IPMI-enabled devices''; - license = stdenv.lib.licenses.bsd3; - homepage = http://ipmitool.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + homepage = https://sourceforge.net/projects/ipmitool/; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 5a66fcf52990..4b8ea62219ee 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -7,7 +7,7 @@ let in buildGoPackage rec { name = "journalbeat-${version}"; - version = "5.1.2"; + version = "5.4.1"; goPackagePath = "github.com/mheese/journalbeat"; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "mheese"; repo = "journalbeat"; rev = "v${version}"; - sha256 = "179jayzvd5k4mwhn73yflbzl5md1fmv7a9hb8vz2ir76lvr33g3l"; + sha256 = "14mhx3gqg19ljcr07ahbry9k5hkbj2mjji4qsjrbc7jknis6frz4"; }; meta = with lib; { diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix new file mode 100644 index 000000000000..a424eb6c4b2c --- /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/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 9c2a42eeb5ae..f27a0cbcb999 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1x4skb5nmv2xj8cygj8pq1rd1ws4m2fsibw54yslgdyjri4r2yq7"; }; + prePatch = '' + # do not set sticky bit in nix store. + substituteInPlace Makefile --replace 2750 0750 + ''; + preConfigure = '' substituteInPlace src/logtail --replace "/usr/bin/perl" "${perl}/bin/perl" substituteInPlace src/logtail2 --replace "/usr/bin/perl" "${perl}/bin/perl" @@ -36,7 +41,7 @@ stdenv.mkDerivation rec { Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; - homepage = http://logcheck.org; + homepage = http://logcheck.alioth.debian.org/; license = licenses.gpl2; maintainers = [ maintainers.bluescreen303 ]; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index a90d6afdc61f..5863504c7040 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/osquery/default.nix b/pkgs/tools/system/osquery/default.nix new file mode 100644 index 000000000000..7924054b7203 --- /dev/null +++ b/pkgs/tools/system/osquery/default.nix @@ -0,0 +1,79 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages +, udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive +, libgpgerror, libuuid, iptables, apt, dpkg, lzma, lz4, bzip2, rpm +, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags +, thrift, boost, rocksdb_lite, cpp-netlib, glog, gbenchmark, snappy +, openssl, linenoise-ng, file, doxygen, devicemapper +, gtest, sqlite +}: + +let + thirdparty = fetchFromGitHub { + owner = "osquery"; + repo = "third-party"; + rev = "6919841175b2c9cb2dee8986e0cfe49191ecb868"; + sha256 = "1kjxrky586jd1b2z1vs9cm7x1dxw51cizpys9kddiarapc2ih65j"; + }; + +in + +stdenv.mkDerivation rec { + name = "osquery-${version}"; + version = "2.5.2"; + + # this is what `osquery --help` will show as the version. + OSQUERY_BUILD_VERSION = version; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "osquery"; + rev = version; + sha256 = "16isplk66qpvhrf041l0lxb4z6k7wwd1sg7kpsw2q6kivkxpnk3z"; + }; + + patches = [ ./misc.patch ] ++ lib.optional stdenv.isLinux ./platform-nixos.patch; + + nativeBuildInputs = [ + pkgconfig cmake pythonPackages.python pythonPackages.jinja2 + ]; + + buildInputs = [ + udev audit + + (aws-sdk-cpp.override { + apis = [ "firehose" "kinesis" "sts" ]; + customMemoryManagement = false; + }) + + lvm2 libgcrypt libarchive libgpgerror libuuid iptables.dev apt dpkg + lzma lz4 bzip2 rpm beecrypt augeas libxml2 sleuthkit + yara lldpd google-gflags thrift boost + cpp-netlib glog gbenchmark snappy openssl linenoise-ng + file doxygen devicemapper cryptsetup + gtest sqlite + + # need to be consistent about the malloc implementation + (rocksdb_lite.override { jemalloc = null; gperftools = null; }) + ]; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2 $NIX_CFLAGS_COMPILE" + + cmakeFlagsArray+=( + -DCMAKE_LIBRARY_PATH=${cryptsetup}/lib + -DCMAKE_VERBOSE_MAKEFILE=OFF + ) + + cp -r ${thirdparty}/* third-party + chmod +w -R third-party + rm -r third-party/{googletest,sqlite3} + ''; + + meta = with lib; { + description = "SQL powered operating system instrumentation, monitoring, and analytics"; + homepage = "https://osquery.io/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch new file mode 100644 index 000000000000..1a0ef267f0df --- /dev/null +++ b/pkgs/tools/system/osquery/misc.patch @@ -0,0 +1,187 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a976a46d..408ac308 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,14 +125,13 @@ else() + set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libc++") + else() + set(LINUX TRUE) +- set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libstdc++") ++ set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14") + endif() + set(POSIX TRUE) + endif() + + if(POSIX) + add_compile_options( +- -Qunused-arguments + -Wstrict-aliasing + -Wno-missing-field-initializers + -Wno-unused-local-typedef +@@ -154,7 +153,6 @@ if(POSIX) + ) + if(NOT FREEBSD) + add_compile_options( +- -Werror=shadow + -fvisibility=hidden + -fvisibility-inlines-hidden + ) +@@ -372,12 +370,6 @@ elseif(NOT FREEBSD) + endif() + endif() + +-if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3") +- WARNING_LOG("Cannot find git submodule third-party/sqlite3 directory") +- WARNING_LOG("Please run: make deps or git submodule update --init") +- message(FATAL_ERROR "No sqlite3 directory") +-endif() +- + # Make sure deps were built before compiling (else show warning). + execute_process( + COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}" +@@ -439,6 +431,8 @@ endif() + + if(APPLE) + LOG_PLATFORM("OS X") ++elseif(OSQUERY_BUILD_PLATFORM STREQUAL "nixos") ++ LOG_PLATFORM("NixOS") + elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian") + LOG_PLATFORM("Debian") + elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu") +@@ -477,7 +471,6 @@ if(POSIX) + include_directories("${BUILD_DEPS}/include/openssl") + endif() + +-include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3") + include_directories("${CMAKE_SOURCE_DIR}/include") + include_directories("${CMAKE_SOURCE_DIR}") + +@@ -559,21 +552,10 @@ else() + set(GTEST_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=0") + endif() + +-set(GTEST_FLAGS +- ${GTEST_FLAGS} +- "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include" +- "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include" +-) +-join("${GTEST_FLAGS}" " " GTEST_FLAGS) +- + set(BUILD_GTEST TRUE) + +-add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest") +- + include(Thrift) + +-add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3") +- + add_subdirectory(osquery) + add_subdirectory(tools/tests) + +diff --git a/include/osquery/core.h b/include/osquery/core.h +index b597edee..b0628037 100644 +--- a/include/osquery/core.h ++++ b/include/osquery/core.h +@@ -15,8 +15,9 @@ + #include + #include + +-#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) + #include ++#include + #else + #include + #endif +@@ -188,7 +189,7 @@ inline bool isPlatform(PlatformType a, const PlatformType& t = kPlatformType) { + return (static_cast(t) & static_cast(a)) != 0; + } + +-#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) + #define MUTEX_IMPL boost + #else + #define MUTEX_IMPL std +@@ -204,10 +205,10 @@ using WriteLock = MUTEX_IMPL::unique_lock; + using ReadLock = MUTEX_IMPL::shared_lock; + + /// Helper alias for defining recursive mutexes. +-using RecursiveMutex = std::recursive_mutex; ++using RecursiveMutex = MUTEX_IMPL::recursive_mutex; + + /// Helper alias for write locking a recursive mutex. +-using RecursiveLock = std::lock_guard; ++using RecursiveLock = MUTEX_IMPL::lock_guard; + } + + /** +diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt +index 77913d31..671b20d4 100644 +--- a/osquery/CMakeLists.txt ++++ b/osquery/CMakeLists.txt +@@ -57,7 +57,7 @@ endif() + + # Construct a set of all object files, starting with third-party and all + # of the osquery core objects (sources from ADD_CORE_LIBRARY macros). +-set(OSQUERY_OBJECTS $) ++set(OSQUERY_OBJECTS "") + + # Add subdirectories + add_subdirectory(config) +@@ -138,6 +138,8 @@ elseif(FREEBSD) + ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite") + endif() + ++ADD_OSQUERY_LINK_CORE("sqlite3") ++ + if(POSIX) + ADD_OSQUERY_LINK_CORE("boost_system") + ADD_OSQUERY_LINK_CORE("boost_filesystem") +@@ -157,6 +159,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}") + ADD_OSQUERY_LINK_CORE("glog${WO_KEY}") + + if(POSIX) ++ ADD_OSQUERY_LINK_ADDITIONAL("benchmark") + ADD_OSQUERY_LINK_ADDITIONAL("snappy") + ADD_OSQUERY_LINK_ADDITIONAL("ssl") + ADD_OSQUERY_LINK_ADDITIONAL("crypto") +@@ -336,13 +339,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY) + + install(DIRECTORY "${CMAKE_SOURCE_DIR}/packs/" + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/packs" COMPONENT main) +- if(APPLE) +- install(FILES "${CMAKE_SOURCE_DIR}/tools/deployment/com.facebook.osqueryd.plist" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/" COMPONENT main) +- else() +- install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/deployment/osqueryd.initd" +- DESTINATION "/etc/init.d/" RENAME "osqueryd" COMPONENT main) +- endif() + endif() + + if(NOT SKIP_TESTS) +diff --git a/osquery/tables/system/linux/tests/md_tables_tests.cpp b/osquery/tables/system/linux/tests/md_tables_tests.cpp +index 126be362..119d361d 100644 +--- a/osquery/tables/system/linux/tests/md_tables_tests.cpp ++++ b/osquery/tables/system/linux/tests/md_tables_tests.cpp +@@ -72,7 +72,7 @@ void GetDrivesForArrayTestHarness(std::string arrayName, + EXPECT_CALL(md, getArrayInfo(arrayDevPath, _)) + .WillOnce(DoAll(SetArgReferee<1>(arrayInfo), Return(true))); + +- Sequence::Sequence s1; ++ Sequence s1; + for (int i = 0; i < MD_SB_DISKS; i++) { + mdu_disk_info_t diskInfo; + diskInfo.number = i; +diff --git a/specs/windows/services.table b/specs/windows/services.table +index 4ac24ee9..657d8b99 100644 +--- a/specs/windows/services.table ++++ b/specs/windows/services.table +@@ -12,7 +12,7 @@ schema([ + Column("path", TEXT, "Path to Service Executable"), + Column("module_path", TEXT, "Path to ServiceDll"), + Column("description", TEXT, "Service Description"), +- Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\UserName. If the account belongs to the built-in domain, the name can be of the form .\UserName."), ++ Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\\UserName. If the account belongs to the built-in domain, the name can be of the form .\\UserName."), + ]) + implementation("system/windows/services@genServices") + examples([ diff --git a/pkgs/tools/system/osquery/platform-nixos.patch b/pkgs/tools/system/osquery/platform-nixos.patch new file mode 100644 index 000000000000..7e1afcb640b3 --- /dev/null +++ b/pkgs/tools/system/osquery/platform-nixos.patch @@ -0,0 +1,22 @@ +diff --git a/tools/get_platform.py b/tools/get_platform.py +index 3dd34516..f53ca83a 100644 +--- a/tools/get_platform.py ++++ b/tools/get_platform.py +@@ -26,6 +26,8 @@ DEBIAN_VERSION = "/etc/debian_version" + GENTOO_RELEASE = "/etc/gentoo-release" + + def _platform(): ++ return ("nixos", "nixos") ++ + osType, _, _, _, _, _ = platform.uname() + + if osType == "Windows": +@@ -75,6 +77,8 @@ def _platform(): + return (None, osType.lower()) + + def _distro(osType): ++ return "unknown_version" ++ + def getRedhatDistroVersion(pattern): + with open(SYSTEM_RELEASE, "r") as fd: + contents = fd.read() diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index dd1070495786..998a3bdf6d1d 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.5.2"; # with database from 2016-10 + name = "pciutils-3.5.4"; # with database from 2017-02 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "1z2y4f3cyvm7a0dyan0n6jpb3p9pvh35lrim0058slj0kwd1969s"; + sha256 = "0rpy7kkb2y89wmbcbfjjjxsk2x89v5xxhxib4vpl131ip5m3qab4"; }; - patches = [ ./module-dir.diff ]; - buildInputs = [ pkgconfig zlib kmod which ]; makeFlags = "SHARED=yes PREFIX=\${out}"; diff --git a/pkgs/tools/system/pciutils/module-dir.diff b/pkgs/tools/system/pciutils/module-dir.diff deleted file mode 100644 index ea38b115b248..000000000000 --- a/pkgs/tools/system/pciutils/module-dir.diff +++ /dev/null @@ -1,23 +0,0 @@ -Don't override libkmod's way of finding modules. - -(We override that behavior in nixpkgs to fit nixos.) - -diff --git a/ls-kernel.c b/ls-kernel.c -index 78b70f1..ecacd0e 100644 ---- a/ls-kernel.c -+++ b/ls-kernel.c -@@ -29,13 +29,7 @@ show_kernel_init(void) - if (show_kernel_inited >= 0) - return show_kernel_inited; - -- struct utsname uts; -- if (uname(&uts) < 0) -- die("uname() failed: %m"); -- char *name = alloca(64 + strlen(uts.release)); -- sprintf(name, "/lib/modules/%s", uts.release); -- -- kmod_ctx = kmod_new(name, NULL); -+ kmod_ctx = kmod_new(NULL, NULL); - if (!kmod_ctx) - { - fprintf(stderr, "lspci: Unable to initialize libkmod context\n"); diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix new file mode 100644 index 000000000000..bbac78f4864b --- /dev/null +++ b/pkgs/tools/system/ps_mem/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +let + version = "3.9"; + pname = "ps_mem"; +in pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "pixelb"; + repo = "${pname}"; + rev = "f0891def54f1edb78a70006603d2b025236b830f"; + sha256 = "1vy0z5nhia61hpqndf7kkjm12mgi0kh33jx5g1glggy45ymcisif"; + }; + + meta = with stdenv.lib; { + description = "A utility to accurately report the in core memory usage for a program"; + homepage = https://github.com/pixelb/ps_mem; + license = licenses.lgpl21; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix new file mode 100644 index 000000000000..b62bb92564c3 --- /dev/null +++ b/pkgs/tools/system/psensor/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchurl, pkgconfig, lm_sensors, libgtop, libatasmart, gtk3 +, libnotify, udisks2, libXNVCtrl, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "psensor-${version}"; + + version = "1.2.0"; + + src = fetchurl { + url = "http://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; + sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ + lm_sensors libgtop libatasmart gtk3 libnotify udisks2 + ]; + + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include" + NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" + ''; + + meta = with lib; { + description = "Graphical hardware monitoring application for Linux"; + homepage = "https://wpitchoune.net/psensor/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 54899cb14df5..61c61226acd6 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -1,4 +1,6 @@ { stdenv, fetchurl + +# Build runit-init as a static binary , static ? false }: @@ -19,7 +21,12 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ]; - postPatch = stdenv.lib.optionalString (!static) '' + 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/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 02c76798fd77..763d44066685 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -2,7 +2,7 @@ let - version = "0.0.2.1"; + version = "0.1.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-rc"; rev = "refs/tags/v${version}"; - sha256 = "1gh72q1h1ds53yrzp481nvzaxkhhpm2kv59pfx4x564gxwdvq3a6"; + sha256 = "1izjss1vfmkrkbgpzxlh0krkd2zin9d77ykr6i08rhixz7c2am0r"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-include=${execline}/include" @@ -31,7 +32,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${s6}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/s6-rc/; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 84e79442ffa0..67acb8ac3dca 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.4.3"; + version = "2.4.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "1jlavi3q6wmcxdcwsy42qcgfkl0ag6hwcgmi4g67dvqs9nqjq2a3"; + sha256 = "0yf9apl05g1gxqwh01yd1iyg0xm50ywnlwp4szd08sg0srmvys16"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-include=${execline}/include" @@ -28,12 +29,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${execline}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); - - preBuild = '' - substituteInPlace "src/daemontools-extras/s6-log.c" \ - --replace '"execlineb"' '"${execline}/bin/execlineb"' - ''; + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6/; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index 5e7ec51bf107..ce0779c0999c 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index e0f30b2db731..c1c4527d0a0a 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { homepage = http://sg.danny.cz/sg/; description = "Utilities that send SCSI commands to devices"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix new file mode 100644 index 000000000000..0b95dcdb193d --- /dev/null +++ b/pkgs/tools/system/socklog/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "socklog-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "http://smarden.org/socklog/socklog-${version}.tar.gz"; + sha256 = "0mdlmhiq2j2fip7c4l669ams85yc3c1s1d89am7dl170grw9m1ma"; + }; + + sourceRoot = "admin/socklog-${version}"; + + outputs = [ "out" "man" "doc" ]; + + postPatch = '' + sed -i src/TARGETS -e '/^chkshsgr/d' + ''; + + configurePhase = '' + echo "$NIX_CC/bin/cc $NIX_CFLAGS_COMPILE" >src/conf-cc + echo "$NIX_CC/bin/cc -s" >src/conf-ld + ''; + + buildPhase = ''package/compile''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv command"/"* $out/bin + + for i in {1,8} ; do + mkdir -p $man/share/man/man$i + mv man"/"*.$i $man/share/man/man$i + done + + mkdir -p $doc/share/doc/socklog/html + mv doc/*.html $doc/share/doc/socklog/html/ + + runHook postInstall + ''; + + checkPhase = ''package/check''; + + doCheck = true; + + meta = { + description = "System and kernel logging services"; + homepage = http://smarden.org/socklog/; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = [ maintainers.joachifm ]; + }; +} diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 52cfd4dde74e..5a4734328ff9 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 1278480973f9..ebedf5f544e6 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/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index ddd6740c9836..983c881d388d 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.5.4"; + version = "1.6"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0yrlnm1blfxi97af4dbx6xm5w1p8r20raiim1ng08gbqbgnjg56g"; + sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3"; }; buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 3326f535b5f6..3442dbb62b05 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 97b35378673e..cce18b5d54b4 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 000000000000..e82ee18b8314 --- /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/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 3d4f99fc1f0b..a9a034ebde91 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -12,11 +12,10 @@ stdenv.mkDerivation rec { sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; }; - buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] ++ - (if libuuid == null - then [] - else [ (stdenv.lib.overrideDerivation libuuid - (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]); + buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] + ++ stdenv.lib.optional (libuuid != null) + (libuuid.overrideAttrs (attrs: + { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); arch = if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "i686-linux" then "x86" diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 9851f9596c36..7382078f114f 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.10.2"; + version = "0.4.10.6"; src = fetchFromGitHub { - sha256 = "14n0py8dzlvirawb8brq143nq0sy9s2z6in5589krrya0frlrlkj"; + sha256 = "18mz3f5aqw4vbdrxf8wblqm6nca73ppq9hb2z2ppw6k0557i71kz"; rev = version; repo = "aha"; owner = "theZiz"; diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index b9db2eba5cd6..fb0309e75325 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; license = licenses.gpl2; - maintainers = with maintainers; [ urkud ndowens ]; + maintainers = with maintainers; [ ndowens ]; }; } diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index ccb3f1d9ed98..fc7d74804fef 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/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index b22a1da22641..7661db22cc18 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation rec { - name = "colordiff-1.0.16"; + name = "colordiff-1.0.18"; src = fetchurl { urls = [ "http://www.colordiff.org/${name}.tar.gz" "http://www.colordiff.org/archive/${name}.tar.gz" ]; - sha256 = "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga"; + sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"; }; buildInputs = [ perl /* xmlto */ ]; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 587c89554aa5..787750c8ecf3 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, coreutils ? null }: stdenv.mkDerivation rec { - name = "diffutils-3.5"; + name = "diffutils-3.6"; src = fetchurl { url = "mirror://gnu/diffutils/${name}.tar.xz"; - sha256 = "0csmqfz8ks23kdjsq0v2ll1acqiz8lva06dj19mwmymrsp69ilys"; + sha256 = "1mivg0fy3a6fcn535ln8nkgfj6vxh5hsxxs5h6692wxmsjyyh8fn"; }; outputs = [ "out" "info" ]; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 2fafec02d816..da246832b93b 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix new file mode 100644 index 000000000000..38eadf40ae37 --- /dev/null +++ b/pkgs/tools/text/fanficfare/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, python27Packages }: + +python27Packages.buildPythonApplication rec { + version = "2.9.0"; + name = "fanficfare-${version}"; + nameprefix = ""; + + src = fetchurl { + url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; + sha256 = "781e9095d8152345a6106135e87c46eb306ff234b847de5073faca2f78544398"; + }; + + propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; + + meta = with stdenv.lib; { + description = "FanFicFare is a tool for making eBooks from fanfiction web sites"; + homepage = "https://github.com/JimmXinu/FanFicFare"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ lucas8 ]; + inherit version; + }; +} diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 271a89b784d9..dec7af045251 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -5,22 +5,23 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.1.3"; + name = "gawk-4.1.4"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3"; + sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak"; }; # When we do build separate interactive version, it makes sense to always include man. outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man"; - doCheck = !( + # FIXME: 4.1.4 testsuite breaks when only C locales are available + doCheck = false /*!( stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 || stdenv.isDarwin # XXX: `locale' segfaults || stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff? || stdenv.isFreeBSD - ); + )*/; nativeBuildInputs = [ xz.bin ]; buildInputs = @@ -31,7 +32,17 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")]; - postInstall = "rm $out/bin/gawk-*"; + postInstall = + if interactive then + '' + rm "$out"/bin/gawk-* + ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1 + '' + else # TODO: remove this other branch on a stdenv rebuild + '' + rm $out/bin/gawk-* + ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1 + ''; meta = with stdenv.lib; { homepage = http://www.gnu.org/software/gawk/; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index adbd69154ecc..13579b57e796 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/grin/default.nix b/pkgs/tools/text/grin/default.nix index 7c1df7f8819c..837ec5b7a5ff 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - name = "grin-1.2.1"; + program = "grin"; + version = "1.2.1"; + name = "${program}-${version}"; namePrefix = ""; - src = fetchurl { - url = "mirror://pypi/g/grin/${name}.tar.gz"; - sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz"; + src = fetchFromGitHub { + owner = "rkern"; + repo = program; + rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f"; + sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd"; }; buildInputs = with python2Packages; [ nose ]; - propagatedBuildInputs = with python2Packages; [ argparse ]; meta = { - homepage = https://pypi.python.org/pypi/grin; + homepage = https://github.com/rkern/grin; description = "A grep program configured the way I like it"; - platform = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.sjagoe ]; }; } diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index df6a1119800e..fc6b1abf24dd 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, perl, groff , ghostscript #for postscript and html output , psutils, netpbm #for html output +, buildPackages }: stdenv.mkDerivation rec { @@ -49,15 +50,18 @@ stdenv.mkDerivation rec { # Trick to get the build system find the proper 'native' groff # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html preBuild = '' - makeFlags="GROFF_BIN_PATH=${groff}/bin GROFFBIN=${groff}/bin/groff" + makeFlags="GROFF_BIN_PATH=${buildPackages.groff}/bin GROFFBIN=${buildPackages.groff}/bin/groff" ''; }; # 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 000000000000..8ef1040ca4a0 --- /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/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 6f2a2df82f8d..666dae1db9b8 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }: +{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; @@ -9,16 +11,23 @@ stdenv.mkDerivation rec { sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; buildInputs = [ getopt lua boost ]; - preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"''; + prePatch = stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/makefile \ + --replace 'CXX=g++' 'CXX=clang++' + ''; + + preConfigure = '' + makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/" + ''; meta = with stdenv.lib; { description = "Source code highlighting tool"; homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; - platforms = platforms.linux; - maintainers = maintainers.ndowens; + platforms = platforms.unix; + maintainers = [ maintainers.ndowens ]; }; } diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 1a264885b485..571dd41244b2 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, libxslt }: +{ stdenv, fetchFromGitHub, cmake, libxslt +, hostPlatform +}: stdenv.mkDerivation rec { name = "html-tidy-${version}"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; rev = version; - sha256 = "1yxp3kjsxd5zwwn4r5rpyq5ndyylbcnb9pisdyf7dxjqd47z64bc"; + sha256 = "1q9ag2dh2j636fw9vyz6gg0kiss8p6lvj22h25nqsw0daan57c32"; }; 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 @@ -31,4 +33,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo ]; }; } - diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 8469a151aa09..e2be6e9aca31 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication }: +{ stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "icdiff-${version}"; - version = "1.7.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; rev = "release-${version}"; - sha256 = "1k7dlf2i40flsrvkma1k1vii9hsjwdmwryx65q0n0yj4frv7ky6k"; + sha256 = "03gcgj3xsqasvgkr8r0q1ljbw2kd2xmfb21qpxhk9lqqm2gl11sv"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index b53d619d837c..38362333cadd 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,37 +1,44 @@ { - kdeDerivation, kdeWrapper, lib, fetchgit, - extra-cmake-modules, kdoctools, kconfig, kinit, kparts + mkDerivation, lib, fetchgit, fetchpatch, + extra-cmake-modules, kdoctools, wrapGAppsHook, + kcrash, kconfig, kinit, kparts }: -let - rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; +mkDerivation rec { + name = "kdiff3-${version}"; + version = "1.7.0-2017-02-19"; - unwrapped = kdeDerivation rec { - name = "kdiff3-${version}"; - version = "1.7.0-${lib.strings.substring 0 7 rev}"; - - src = fetchgit { - url = "https://gitlab.com/tfischer/kdiff3"; - sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; - inherit rev; - }; - - preConfigure = "cd kdiff3"; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - - propagatedBuildInputs = [ kconfig kinit kparts ]; - - meta = with lib; { - homepage = http://kdiff3.sourceforge.net/; - license = licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; - maintainers = with maintainers; [ viric urkud peterhoeg ]; - platforms = with platforms; linux; - }; + src = fetchgit { + # gitlab is outdated + url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; + sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; + rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; }; -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/kdiff3" ]; + setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; + + patches = [ + (fetchpatch { + name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2 + url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch"; + sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y"; + }) + ]; + patchFlags = "-p 2"; + + postPatch = '' + sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp + ''; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ kconfig kcrash kinit kparts ]; + + meta = with lib; { + homepage = http://kdiff3.sourceforge.net/; + license = licenses.gpl2Plus; + description = "Compares and merges 2 or 3 files or directories"; + maintainers = with maintainers; [ viric peterhoeg ]; + platforms = with platforms; linux; + }; } diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 383e9cf72c35..e08a5941ba9a 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "3.5"; + version = "3.7"; name = pname + "-" + version; src = fetchurl { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "1axw8fqg2wlkmv45s71q5pg44sg1s06szpkjhyscy704i7d2jc34"; + sha256 = "04i49z022k3nyyr8hnlxima9k5id8qvh2nr3dv8zgcqm5sin6xx9"; }; buildInputs = [ unzip jdk ]; installPhase = @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for lt in languagetool{,-commandline,-server};do cat > $out/bin/$lt < mb2md.pl + ''; + + installPhase = '' + install -D $sourceRoot/mb2md.pl $out/bin/mb2md + ''; + + postFixup = '' + wrapProgram $out/bin/mb2md \ + --set PERL5LIB "${lib.makePerlPath perlDeps}" + ''; + + meta = with stdenv.lib; { + description = "mbox to maildir tool"; + license = licenses.publicDomain; + platforms = platforms.all; + maintainers = [ maintainers.jb55 ]; + }; +} diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 8f22a9e7600e..96c91def9ac7 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/numdiff/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bbenoist ndowens ]; + maintainers = with maintainers; [ ndowens ]; platforms = platforms.gnu; }; } diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 85f0f24b3874..42f80f29073f 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://stosberg.net/odt2txt; platforms = stdenv.lib.platforms.all; lincense = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/papertrail/Gemfile b/pkgs/tools/text/papertrail/Gemfile new file mode 100755 index 000000000000..199cd1422aaa --- /dev/null +++ b/pkgs/tools/text/papertrail/Gemfile @@ -0,0 +1,4 @@ +# frozen_string_literal: true +source "https://rubygems.org" + +gem "papertrail" diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/tools/text/papertrail/Gemfile.lock new file mode 100644 index 000000000000..0d1b2a6fbe6d --- /dev/null +++ b/pkgs/tools/text/papertrail/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + ansi (1.5.0) + chronic (0.10.2) + papertrail (0.10.1) + ansi (~> 1.5) + chronic (~> 0.10) + +PLATFORMS + ruby + +DEPENDENCIES + papertrail + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix new file mode 100644 index 000000000000..a02ca1cd3dde --- /dev/null +++ b/pkgs/tools/text/papertrail/default.nix @@ -0,0 +1,21 @@ +{ stdenv, bundlerEnv, ruby}: + +let + # To update, just run `nix-shell` in this directory. + papertrail-env = bundlerEnv rec { + name = "papertrail-env"; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; +in stdenv.mkDerivation { + name = "papertrail-${(import ./gemset.nix).papertrail.version}"; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + ln -s ${papertrail-env}/bin/papertrail $out/bin/papertrail + ''; +} diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/tools/text/papertrail/gemset.nix new file mode 100644 index 000000000000..91bfe3198963 --- /dev/null +++ b/pkgs/tools/text/papertrail/gemset.nix @@ -0,0 +1,26 @@ +{ + ansi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ims9zfal4gs2wpx2m5rd8zsrl2k794d359shkrsgg3fhr2a22l"; + type = "gem"; + }; + version = "1.5.0"; + }; + chronic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; + type = "gem"; + }; + version = "0.10.2"; + }; + papertrail = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vb7bh7qh5hr4v3w711bl0yrr3rlhz5c3h3qx3fq31dr5y4100v7"; + type = "gem"; + }; + version = "0.10.1"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/text/papertrail/shell.nix b/pkgs/tools/text/papertrail/shell.nix new file mode 100644 index 000000000000..55a7a18f57b1 --- /dev/null +++ b/pkgs/tools/text/papertrail/shell.nix @@ -0,0 +1,19 @@ +{ pkgs ? import {} }: + +pkgs.stdenv.mkDerivation { + name = "papertrail"; + src = ./.; + + buildInputs = with pkgs; [ + bundix + bundler + ruby + ]; + + shellHook = '' + truncate --size 0 Gemfile.lock + bundle install --path=vendor/bundle + rm -rf vendor .bundle + bundix + ''; +} diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 502af44262b6..c76ba8ea88d5 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "the_platinum_searcher-${version}"; - version = "2.1.3"; - rev = "v2.1.3"; + version = "2.1.5"; + rev = "v${version}"; goPackagePath = "github.com/monochromegane/the_platinum_searcher"; @@ -11,11 +11,16 @@ buildGoPackage rec { inherit rev; owner = "monochromegane"; repo = "the_platinum_searcher"; - sha256 = "09pkdfh7fqn3x4l9zaw5wzk20k7nfdwry7br9vfy3vv3fwv61ynp"; + sha256 = "1y7kl3954dimx9hp2bf1vjg1h52hj1v6cm4f5nhrqzwrawp0b6q0"; }; goDeps = ./deps.nix; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + # fixes cycle between $out and $bin + install_name_tool -delete_rpath $out/lib $bin/bin/pt + ''; + meta = with stdenv.lib; { homepage = https://github.com/monochromegane/the_platinum_searcher; description = "A code search tool similar to ack and the_silver_searcher(ag)."; diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/tools/text/platinum-searcher/deps.nix index da3f3ff1b8ab..04fb9bd4be34 100644 --- a/pkgs/tools/text/platinum-searcher/deps.nix +++ b/pkgs/tools/text/platinum-searcher/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; + sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/jessevdk/go-flags"; - rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; - sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + rev = "4e64e4a4e2552194cf594243e23aa9baf3b4297e"; + sha256 = "02x7f1wm8119s27h4dc3a4aw6shydnpnnkvzwg5xm0snn5kb4zxm"; }; } { @@ -22,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + rev = "99064174e013895bbd9b025c31100bd1d9b590ca"; + sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"; }; } { @@ -31,8 +31,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + rev = "a49bea13b776691cb1b49873e5d8df96ec74831a"; + sha256 = "1pcmgf88wml6ca8v63nh3nxsfvpzjv3c4qj2w2wkizbil826g7as"; }; } { @@ -76,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/shiena/ansicolor"; - rev = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b"; - sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"; + rev = "a422bbe96644373c5753384a59d678f7d261ff10"; + sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; }; } ] diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix new file mode 100644 index 000000000000..6b499f3db183 --- /dev/null +++ b/pkgs/tools/text/proselint/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, buildPythonApplication, click, future, six }: + +buildPythonApplication rec { + name = "proselint-${version}"; + version = "0.8.0"; + + doCheck = false; # fails to pass because it tries to run in home directory + + src = fetchurl { + url = "mirror://pypi/p/proselint/${name}.tar.gz"; + sha256 = "1g8vx04gmv0agmggz1ml5vydfppqvl8dzjvqm6vqw5rzafa89m08"; + }; + + propagatedBuildInputs = [ click future six ]; + + meta = with stdenv.lib; { + description = "A linter for prose"; + homepage = http://proselint.com; + license = licenses.bsd3; + maintainers = with maintainers; [ alibabzo ]; + }; +} diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 40728c2c3ec5..18ef074c8a52 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "replace-2.24"; @@ -10,10 +10,6 @@ stdenv.mkDerivation { makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man"; - crossAttrs = { - makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc"; - }; - preBuild = '' sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h ''; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 7ba43e38f382..da7c5b593e3a 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,21 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; + sha256 = "128sfczms14zgfbhgmf84jjlivd4q6i581rxirhz3kmpnnby18rz"; }; - depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + depsSha256 = "1kjmv4bn5sicx8g5gyzq2zhxmqsqlgckhcg4ypvnjmcyq1ifiv2m"; + + preFixup = '' + mkdir -p "$out/man/man1" + cp "$src/doc/rg.1" "$out/man/man1" + ''; meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix new file mode 100644 index 000000000000..3d8afd0540ab --- /dev/null +++ b/pkgs/tools/text/rst2html5/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + + name = "${pname}-${version}"; + pname = "rst2html5"; + version = "1.9.3"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1js90asy7s0278b4p28inkkp0r7ajr5fk5pcdgcdw628a30vl3i6"; + }; + + propagatedBuildInputs = with pythonPackages; + [ docutils genshi pygments beautifulsoup4 ]; + + meta = with stdenv.lib;{ + homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5"; + description = "Converts ReSTructuredText to (X)HTML5"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 42a2ab852e1d..c6f7284d01ef 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -16,11 +16,15 @@ buildGoPackage rec { goDeps = ./deps.nix; + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sift + ''; + meta = with lib; { description = "sift is a fast and powerful alternative to grep"; homepage = "https://sift-tool.org"; maintainers = [ maintainers.carlsverre ]; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 26e1f9ef2759..146808963125 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "1.0.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "1c504x62yxf4b5k8ixvr97g97nd4kff32flxdjnvxvcrrnany8zx"; + sha256 = "074ll6l0486ak4ijvfzhwsp6fp8w55x4yjviql5kb8qpisi9ll7y"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 808574e27355..dc297afc9ad3 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Source code renderer with syntax highlighting"; homepage = http://www.gnu.org/software/src-highlite/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; longDescription = '' GNU Source-highlight, given a source file, produces a document diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix new file mode 100644 index 000000000000..bfddff938f95 --- /dev/null +++ b/pkgs/tools/text/staccato/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "staccato-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "tshlabs"; + repo = "staccato"; + rev = version; + sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm"; + }; + + depsSha256 = "1gwfkh3ck8n3zcy43ch2mnc28a6y10p3srhnx9dh8gwnwbpb733c"; + + meta = { + description = "A command line program that lets you compute statistics from values from a file or standard input"; + longDescription = '' + Staccato (`st` for short) is a command line program that lets you + compute statistics from values from a file or standard input. It + computes things about the stream of numbers like min, max, mean, median, + and standard deviation. It can also compute these things about some + subset of the stream, for example the lower 95% of values. + ''; + homepage = "https://docs.rs/crate/staccato"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index b7ff365fad52..4a7a478a12ac 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-8.3.1"; + name = "basex-${version}"; + version = "8.6.4"; src = fetchurl { - url = "http://files.basex.org/releases/8.3.1/BaseX831.zip"; - sha256 = "08ba0qvfaa1560hy0nsiq9y6slgdj46j9rdssigf2vvkc5ngkgg0"; + url = "http://files.basex.org/releases/${version}/BaseX864.zip"; + sha256 = "14320hfw53m0zl1v4377p0vcjvdnwfpa4gkj2y2wlrplma76y0w7"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 93655df64df2..e2445e39e3cb 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, curl, libiconv }: stdenv.mkDerivation rec { - name = "html-xml-utils-6.9"; + name = "html-xml-utils-${version}"; + version = "7.1"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - - sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w"; + sha256 = "0vnmcrbnc7irrszx5h71s3mqlp9wqh19zig519zbnr5qccigs3pc"; }; - meta = { + buildInputs = [curl libiconv]; + + meta = with stdenv.lib; { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; - license = stdenv.lib.licenses.w3c; - platforms = stdenv.lib.platforms.linux; + license = licenses.w3c; + platforms = platforms.all; }; } diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 36ff976a6c16..162f7e1a397b 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, ant, saxon }: +{ stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: stdenv.mkDerivation rec { name = "jing-trang-${version}"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { for tool in jing trang; do cat > "$out/bin/$tool" < SystemConfiguration != null + && Foundation != null; + +stdenv.mkDerivation rec { + version = "1.8.29"; + name = "htmldoc-${version}"; + src = fetchurl { + url = "https://github.com/michaelrsweet/htmldoc/releases/download" + + "/release-${version}/htmldoc-${version}-source.tar.gz"; + sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0"; + }; + buildInputs = with stdenv; + lib.optional isDarwin SystemConfiguration + ++ lib.optional isDarwin Foundation; + + meta = with stdenv.lib; { + description = "Converts HTML files to PostScript and PDF"; + homepage = https://michaelrsweet.github.io/htmldoc; + license = licenses.gpl2; + maintainers = with maintainers; [ viric shanemikel ]; + platforms = with platforms; linux ++ darwin; + + longDescription = '' + HTMLDOC is a program that reads HTML source files or web pages and + generates corresponding HTML, PostScript, or PDF files with an optional + table of contents. + ''; + }; +} diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index ec52adc225bc..cd3b9c67e3c9 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -39,6 +39,6 @@ cat makefile | \ > "$nixMakefile" && \ mkdir -p "$out/bin" && mkdir -p "$out/lib" \ mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" install installman && \ +make -f "$nixMakefile" CC=cc install installman && \ installDoc && \ fixupPhase diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix index b214e986be95..b6d29052dcce 100644 --- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, poppler, xlibs, pcre, python, glib, fontforge-gtk, cairo, pango, openjdk8 +, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8 + }: stdenv.mkDerivation rec { @@ -31,8 +32,8 @@ stdenv.mkDerivation rec { glib cairo pango - (poppler.override { withData = true; }) - fontforge-gtk + poppler + fontforge openjdk8 ]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 382219a0a3a3..18ab2d1f9c7c 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig +{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig , harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem , fontconfig, lua, libiconv }: @@ -26,7 +26,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [pkgconfig makeWrapper]; - buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ]; + buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ] + ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit + ; + + preConfigure = optionalString stdenv.isDarwin '' + sed -i -e 's|@import AppKit;|#import |' src/macfonts.m + ''; + + NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit"; LUA_PATH = luaPath; LUA_CPATH = luaCPath; @@ -37,6 +45,9 @@ stdenv.mkDerivation rec { --set LUA_CPATH "${luaCPath};" \ ''; + # Hack to avoid TMPDIR in RPATHs. + preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; + meta = { description = "A typesetting system"; longDescription = '' @@ -49,8 +60,8 @@ stdenv.mkDerivation rec { technologies and borrowing some ideas from graphical systems such as InDesign. ''; - homepage = "http://www.sile-typesetter.org"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + homepage = http://www.sile-typesetter.org; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 83bead83ea3e..313474745d10 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A full-featured (La)TeX distribution"; homepage = http://www.tug.org/tetex/; - matintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; hydraPlatforms = []; }; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 5591f64cee94..34520e92a9ae 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -20,7 +20,9 @@ let common = rec { src = fetchurl { url = # "ftp://tug.org/historic/systems/texlive/${year}/" - "http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016" # FIXME: a proper mirror + #"http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016" + # FIXME: a proper mirror, though tarballs.nixos.org saves this case ATM + http://146.185.144.154/texlive-2016 + "/texlive-${year}0523b-source.tar.xz"; sha256 = "1v91vahxlxkdra0qz3f132vvx5d9cx2jy84yl1hkch0agyj2rcx8"; }; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index abfe951a33fe..9af1d6a59ffd 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -111,6 +111,7 @@ in buildEnv { -e "s,\$SELFAUTODIR,$out/share,g" \ -e "s,\$SELFAUTOPARENT,$out/share,g" \ -e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \ + -e "/^mpost,/d" `# CVE-2016-10243` \ "$cnfOrig" > ./texmf.cnf patchCnfLua "./texmfcnf.lua" @@ -154,18 +155,24 @@ in buildEnv { --prefix PERL5LIB : "$out/share/texmf/scripts/texlive" # avoid using non-nix shebang in $target by calling interpreter - if [[ "$(head -c 2 $target)" = "#!" ]]; then - local cmdline="$(head -n 1 $target | sed 's/^\#\! *//;s/ *$//')" + if [[ "$(head -c 2 "$target")" = "#!" ]]; then + local cmdline="$(head -n 1 "$target" | sed 's/^\#\! *//;s/ *$//')" local relative=`basename "$cmdline" | sed 's/^env //' ` local newInterp=`echo "$relative" | cut -d\ -f1` local params=`echo "$relative" | cut -d\ -f2- -s` - local newPath="$(type -P $newInterp)" + local newPath="$(type -P "$newInterp")" if [[ -z "$newPath" ]]; then echo " Warning: unknown shebang '$cmdline' in '$target'" continue fi echo " and patching shebang '$cmdline'" sed "s|^exec |exec $newPath $params |" -i "$link" + + elif head -n 1 "$target" | grep -q 'exec perl'; then + # see #24343 for details of the problem + echo " and patching weird perl shebang" + sed "s|^exec |exec '${perl}/bin/perl' -w |" -i "$link" + else sed 's|^exec |exec -a "$0" |' -i "$link" echo diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 701ce7f67b2d..13eb90c77af3 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, perl, python, ruby +, makeWrapper, perl522, python, ruby , useFixedHashes ? true , recurseIntoAttrs }: @@ -28,7 +28,8 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv fastUnique lib makeWrapper writeText - perl stdenv python ruby; + stdenv python ruby; + perl = perl522; # avoid issues like #26890, probably remove after texlive upgrade }; # the set of TeX Live packages, collections, and schemes; using upstream naming @@ -109,7 +110,9 @@ let url = args.url or "${urlPrefix}/${urlName}.tar.xz"; urlPrefix = args.urlPrefix or - http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016; + http://146.185.144.154/texlive-2016 + #http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016 + ; # XXX XXX XXX FIXME: mirror the snapshot XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX # ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"); #mirror = "http://ftp.math.utah.edu"; diff --git a/pkgs/tools/video/atomicparsley/casts.patch b/pkgs/tools/video/atomicparsley/casts.patch deleted file mode 100644 index b70a3cbcf854..000000000000 --- a/pkgs/tools/video/atomicparsley/casts.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- AtomicParsley-source-0.9.0/AtomicParsley.cpp.orig 2015-03-13 15:38:16.817904490 -0600 -+++ AtomicParsley-source-0.9.0/AtomicParsley.cpp 2015-03-13 15:48:07.595273416 -0600 -@@ -1447,7 +1447,7 @@ - uint32_t atom_offsets = 0; - char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path - if (output_path == NULL) { -- char* orig_suffix = strrchr(originating_file, '.'); -+ char* orig_suffix = strrchr((char*)originating_file, (int)'.'); - if (orig_suffix == NULL) { - fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n"); - path_len = strlen(originating_file); -@@ -4464,7 +4464,7 @@ - void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) { - char* suffix = NULL; - if (forced_suffix == NULL) { -- suffix = strrchr(filePath, '.'); -+ suffix = strrchr((char*)filePath, (int)'.'); - } else { - suffix = forced_suffix; - } -@@ -4480,7 +4480,7 @@ - memcpy(temp_path, filePath, base_len); - memcpy(temp_path + base_len, file_kind, strlen(file_kind)); - #else -- char* file_name = strrchr(filePath, '/'); -+ char* file_name = strrchr((char*)filePath, (int)'/'); - size_t file_name_len = strlen(file_name); - memcpy(temp_path, filePath, filepath_len-file_name_len+1); - memcpy(temp_path + strlen(temp_path), ".", 1); -@@ -5006,7 +5006,7 @@ - free_modified_name = true; - if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension - uint16_t filename_len = strlen(m4aFile); -- char* suffix = strrchr(m4aFile, '.'); -+ char* suffix = strrchr((char*)m4aFile, (int)'.'); - memcpy(originating_file, m4aFile, filename_len+1 ); - memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 ); - } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 835cacf0098c..701850758bcb 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,28 +1,20 @@ -{ stdenv, pkgs, fetchurl }: +{ stdenv, fetchhg, autoreconfHook, zlib, darwin }: stdenv.mkDerivation rec { name = "atomicparsley-${version}"; - product = "AtomicParsley"; - version = "0.9.0"; + version = "0.9.6"; - src = fetchurl { - url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip"; - sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; + src = fetchhg { + url = "https://bitbucket.org/wez/atomicparsley"; + sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm"; }; - buildInputs = with pkgs; [ unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - patches = [ ./casts.patch ]; - setSourceRoot = "sourceRoot=${product}-source-${version}"; - buildPhase = "bash build"; - installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; + buildInputs = + [ autoreconfHook + zlib + ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - postPatch = '' - substituteInPlace build \ - --replace 'g++' 'c++' - substituteInPlace AP_NSImage.mm \ - --replace '_NSBitmapImageFileType' 'NSBitmapImageFileType' - ''; + installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; meta = with stdenv.lib; { description = '' @@ -30,7 +22,11 @@ stdenv.mkDerivation rec { setting metadata into MPEG-4 files ''; - homepage = http://atomicparsley.sourceforge.net/; + longDescription = '' + This is a maintained fork of the original AtomicParsley. + ''; + + homepage = https://bitbucket.org/wez/atomicparsley; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 547700639bb9..4eec47e9e759 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { ++ optionals gnutlsSupport [ gnutls nettle ] ++ optional opensslSupport openssl; + outputs = [ "out" "dev" ]; + meta = { description = "Toolkit for RTMP streams"; homepage = http://rtmpdump.mplayerhq.hu/; diff --git a/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch b/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch new file mode 100644 index 000000000000..00cb7d070c64 --- /dev/null +++ b/pkgs/tools/virtualization/cloud-init/add-nixos-support.patch @@ -0,0 +1,113 @@ +diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/__init__.py cloud-init-0.7.6/cloudinit/distros/__init__.py +--- cloud-init-0.7.6.orig/cloudinit/distros/__init__.py 2014-10-10 15:26:25.000000000 +0000 ++++ cloud-init-0.7.6/cloudinit/distros/__init__.py 2016-06-08 07:51:45.230357099 +0000 +@@ -43,6 +43,7 @@ + 'freebsd': ['freebsd'], + 'suse': ['sles'], + 'arch': ['arch'], ++ 'nixos': ['nixos'], + } + + LOG = logging.getLogger(__name__) +diff -ruN cloud-init-0.7.6.orig/cloudinit/distros/nixos.py cloud-init-0.7.6/cloudinit/distros/nixos.py +--- cloud-init-0.7.6.orig/cloudinit/distros/nixos.py 1970-01-01 00:00:00.000000000 +0000 ++++ cloud-init-0.7.6/cloudinit/distros/nixos.py 2016-06-08 07:50:58.602616595 +0000 +@@ -0,0 +1,98 @@ ++# vi: ts=4 expandtab ++# ++# Copyright (C) 2012 Canonical Ltd. ++# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. ++# Copyright (C) 2012 Yahoo! Inc. ++# ++# Author: Scott Moser ++# Author: Juerg Haefliger ++# Author: Joshua Harlow ++# ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License version 3, as ++# published by the Free Software Foundation. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++from cloudinit import distros ++from cloudinit import helpers ++from cloudinit import log as logging ++from cloudinit import util ++ ++from cloudinit.distros.parsers.hostname import HostnameConf ++ ++LOG = logging.getLogger(__name__) ++ ++class Distro(distros.Distro): ++ ++ def __init__(self, name, cfg, paths): ++ distros.Distro.__init__(self, name, cfg, paths) ++ # This will be used to restrict certain ++ # calls from repeatly happening (when they ++ # should only happen say once per instance...) ++ self._runner = helpers.Runners(paths) ++ self.osfamily = 'nixos' ++ ++ def _select_hostname(self, hostname, fqdn): ++ # Prefer the short hostname over the long ++ # fully qualified domain name ++ if not hostname: ++ return fqdn ++ return hostname ++ ++ def _write_hostname(self, your_hostname, out_fn): ++ conf = None ++ try: ++ # Try to update the previous one ++ # so lets see if we can read it first. ++ conf = self._read_hostname_conf(out_fn) ++ except IOError: ++ pass ++ if not conf: ++ conf = HostnameConf('') ++ conf.set_hostname(your_hostname) ++ util.write_file(out_fn, str(conf), 0644) ++ ++ def _read_system_hostname(self): ++ sys_hostname = self._read_hostname(self.hostname_conf_fn) ++ return (self.hostname_conf_fn, sys_hostname) ++ ++ def _read_hostname_conf(self, filename): ++ conf = HostnameConf(util.load_file(filename)) ++ conf.parse() ++ return conf ++ ++ def _read_hostname(self, filename, default=None): ++ hostname = None ++ try: ++ conf = self._read_hostname_conf(filename) ++ hostname = conf.hostname ++ except IOError: ++ pass ++ if not hostname: ++ return default ++ return hostname ++ ++ def _write_network(self, settings): ++ raise NotImplementedError() ++ ++ def apply_locale(self, locale, out_fn=None): ++ raise NotImplementedError() ++ ++ def install_packages(self, pkglist): ++ raise NotImplementedError() ++ ++ def package_command(self, command, args=None, pkgs=None): ++ raise NotImplementedError() ++ ++ def set_timezone(self, tz): ++ raise NotImplementedError() ++ ++ def update_package_sources(self): ++ raise NotImplementedError() diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index c038ca7c1bbe..caea7c21c91b 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchurl }: +{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }: -let version = "0.7.6"; +let version = "0.7.9"; in pythonPackages.buildPythonApplication rec { name = "cloud-init-${version}"; @@ -8,10 +8,11 @@ in pythonPackages.buildPythonApplication rec { src = fetchurl { url = "https://launchpad.net/cloud-init/trunk/${version}/+download/cloud-init-${version}.tar.gz"; - sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy"; + sha256 = "0wnl76pdcj754pl99wxx76hkir1s61x0bg0lh27sdgdxy45vivbn"; }; - patchPhase = '' + patches = [ ./add-nixos-support.patch ]; + prePatch = '' patchShebangs ./tools substituteInPlace setup.py \ @@ -19,15 +20,21 @@ in pythonPackages.buildPythonApplication rec { --replace /etc $out/etc \ --replace /lib/systemd $out/lib/systemd \ --replace 'self.init_system = ""' 'self.init_system = "systemd"' + + substituteInPlace cloudinit/config/cc_growpart.py \ + --replace 'util.subp(["growpart"' 'util.subp(["${cloud-utils}/bin/growpart"' + + # Argparse is part of python stdlib + sed -i s/argparse// requirements.txt ''; propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable - oauth pyserial configobj pyyaml argparse requests jsonpatch ]; + oauthlib pyserial configobj pyyaml requests jsonpatch ]; meta = { homepage = http://cloudinit.readthedocs.org; description = "Provides configuration and customization of cloud instance"; - maintainers = [ lib.maintainers.madjar ]; + maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix new file mode 100644 index 000000000000..b133bc094f97 --- /dev/null +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -0,0 +1,27 @@ +{ python2Packages, lib }: + +with python2Packages; + +buildPythonApplication rec { + + name = "${pname}-${version}"; + pname = "cloudmonkey"; + version = "5.3.3"; + + propagatedBuildInputs = [ argcomplete pygments ]; + + doCheck = false; # upstream has no tests defined + + src = fetchPypi { + inherit pname version; + sha256 = "064yk3lwl272nyn20xxrh0qxzh3r1rl9015qqf2i4snqdzwd5cf7"; + }; + + meta = with lib; { + description = "CLI for Apache CloudStack."; + homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.womfoo ]; + }; + +} diff --git a/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch b/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch new file mode 100644 index 000000000000..650e80c24fbe --- /dev/null +++ b/pkgs/tools/virtualization/google-compute-engine/0001-allow-nologin-other-paths.patch @@ -0,0 +1,27 @@ +From 2e9ac201af238b742c7032962b9b12a8b66bab0c Mon Sep 17 00:00:00 2001 +From: zimbatm +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 000000000000..7a5350fe2eb9 --- /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/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix new file mode 100644 index 000000000000..f74492b7727e --- /dev/null +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage, perlPackages, makeWrapper}: + +buildPerlPackage rec { + name = "linode-cli-${version}"; + version = "1.4.7"; + + src = fetchFromGitHub { + owner = "linode"; + repo = "cli"; + rev = "v${version}"; + sha256 = "1wiz067wgxi4z4rz4n9p7dlvx5z4hkl2nxpfvhikl6dri4m2nkkp"; + }; + + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = with perlPackages; [ + JSON + LWPUserAgent + MozillaCA + TryTiny + WebServiceLinode + ]; + + # Wrap perl scripts so they can find libraries + postInstall = '' + for n in "$out/bin"/*; do + wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" + done + ''; + + # Has no tests + doCheck = false; + + # Has no "doc" or "devdoc" outputs + outputs = [ "out" ]; + + meta = with stdenv.lib; { + description = "Command-line interface to the Linode platform"; + homepage = "https://github.com/linode/cli"; + license = with licenses; [ artistic2 gpl2 ]; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix new file mode 100644 index 000000000000..66618e59122a --- /dev/null +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "marathonctl-unstable-${version}"; + version = "2017-03-06"; + + goPackagePath = "github.com/shoenig/marathonctl"; + subPackages = [ "." ]; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "shoenig"; + repo = "marathonctl"; + rev = "0867e66551fff5d81f25959baf914a8ee11a3a8b"; + sha256 = "1fcc54hwpa8s3kz4gn26mc6nrv6zjrw869331nvm47khi23gpmxw"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/shoenig/marathonctl; + description = "CLI tool for Marathon"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ manveru ]; + }; +} diff --git a/pkgs/tools/virtualization/marathonctl/deps.nix b/pkgs/tools/virtualization/marathonctl/deps.nix new file mode 100644 index 000000000000..39efaab95358 --- /dev/null +++ b/pkgs/tools/virtualization/marathonctl/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/shoenig/config"; + fetch = { + type = "git"; + url = "https://github.com/shoenig/config"; + rev = "7d793e7ad7f175ef22743b1ea38acee8267788db"; + sha256 = "1dhcv1j5xk30kj73dfnx3xqx8mcvk9r8ywp9khgf2kq6wh9sm1qr"; + }; + } +] diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix index 19394ea45d30..0763536533f0 100644 --- a/pkgs/tools/virtualization/nixos-container/default.nix +++ b/pkgs/tools/virtualization/nixos-container/default.nix @@ -6,6 +6,8 @@ substituteAll { isExecutable = true; src = ./nixos-container.pl; perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl"; + su = "${shadow.su}/bin/su"; + inherit utillinux; postInstall = '' t=$out/etc/bash_completion.d diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 65a9c3f5814b..207177133a57 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -8,9 +8,15 @@ use Fcntl ':flock'; use Getopt::Long qw(:config gnu_getopt); use Cwd 'abs_path'; +my $nsenter = "@utillinux@/bin/nsenter"; +my $su = "@su@"; + # Ensure a consistent umask. umask 0022; +# Ensure $NIXOS_CONFIG is not set. +$ENV{"NIXOS_CONFIG"} = ""; + # Parse the command line. sub showHelp { @@ -76,7 +82,7 @@ if ($action eq "list") { } my $containerName = $ARGV[1] or die "$0: no container name specified\n"; -$containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n"; +$containerName =~ /^[a-zA-Z0-9_-]+$/ or die "$0: invalid container name\n"; sub writeNixOSConfig { my ($nixosConfigFile) = @_; @@ -223,6 +229,22 @@ sub stopContainer { or die "$0: failed to stop container\n"; } +# Return the PID of the init process of the container. +sub getLeader { + my $s = `machinectl show "$containerName" -p Leader`; + chomp $s; + $s =~ /^Leader=(\d+)$/ or die "unable to get container's main PID\n"; + return int($1); +} + +# Run a command in the container. +sub runInContainer { + my @args = @_; + my $leader = getLeader; + exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args); + die "cannot run ‘nsenter’: $!\n"; +} + # Remove a directory while recursively unmounting all mounted filesystems within # that directory and unmounting/removing that directory afterwards as well. # @@ -248,7 +270,7 @@ if ($action eq "destroy") { safeRemoveTree($profileDir) if -e $profileDir; safeRemoveTree($gcRootsDir) if -e $gcRootsDir; - system("chattr", "-i", "$root/var/empty") if -e $root; + system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty"; safeRemoveTree($root) if -e $root; unlink($confFile) or die; } @@ -297,14 +319,14 @@ elsif ($action eq "login") { } elsif ($action eq "root-login") { - exec("machinectl", "shell", $containerName, "/bin/sh", "-l"); + runInContainer("@su@", "root", "-l"); } elsif ($action eq "run") { shift @ARGV; shift @ARGV; # Escape command. my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV); - exec("machinectl", "--quiet", "shell", $containerName, "/bin/sh", "-l", "-c", $s); + runInContainer("@su@", "root", "-l", "-c", "exec " . $s); } elsif ($action eq "show-ip") { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f790bbf29ed0..c47e3fe325bf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -5,21 +5,29 @@ with self; let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = _n: alias: with lib; + removeRecurseForDerivations = alias: with lib; if alias.recurseForDerivations or false then removeAttrs alias ["recurseForDerivations"] else alias; - doNotDisplayTwice = aliases: - lib.mapAttrs removeRecurseForDerivations aliases; + # Disabling distribution prevents top-level aliases for non-recursed package + # sets from building on Hydra. + removeDistribute = alias: with lib; + if isDerivation alias then + dontDistribute alias + else alias; + + mapAliases = aliases: + lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases; in ### Deprecated aliases - for backward compatibility -doNotDisplayTwice rec { +mapAliases (rec { accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; aircrackng = aircrack-ng; # added 2016-01-14 + ammonite-repl = ammonite; # added 2017-05-02 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 bar = lemonbar; # added 2015-01-16 @@ -61,6 +69,8 @@ doNotDisplayTwice rec { gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 htmlTidy = html-tidy; # added 2014-12-06 + iana_etc = iana-etc; # added 2017-03-08 + idea = jetbrains; # added 2017-04-03 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 @@ -80,6 +90,9 @@ doNotDisplayTwice rec { links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 + lua5_sec = luaPackages.luasec; # added 2017-05-02 + lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 + lua5_expat = luaPackages.luaexpat; # added 2017-05-02 m3d-linux = m33-linux; # added 2016-08-13 manpages = man-pages; # added 2015-12-06 man_db = man-db; # added 2016-05 @@ -95,6 +108,7 @@ doNotDisplayTwice rec { nfsUtils = nfs-utils; # added 2014-12-06 opencl-icd = ocl-icd; # added 2017-01-20 owncloudclient = owncloud-client; # added 2016-08 + pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidginlatex; # added 2014-11-02 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 @@ -119,6 +133,7 @@ doNotDisplayTwice rec { speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfsFuse = sshfs-fuse; # added 2016-09 + surf-webkit2 = surf; # added 2017-04-02 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 @@ -133,6 +148,12 @@ doNotDisplayTwice rec { xlibs = xorg; # added 2015-09 youtubeDL = youtube-dl; # added 2014-10-26 + # added 2017-05-27 + wineMinimal = winePackages.minimal; + wineFull = winePackages.full; + wineStable = winePackages.stable; + wineUnstable = winePackages.unstable; + inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 @@ -148,4 +169,4 @@ doNotDisplayTwice rec { ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; ocaml = ocamlPackages.ocaml; -}) +})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d98ce26aff46..45ed837d2996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -98,6 +98,8 @@ with pkgs; inherit (haskellPackages) dhall-nix; }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; @@ -153,6 +155,8 @@ with pkgs; fetchpatch = callPackage ../build-support/fetchpatch { }; + fetchs3 = callPackage ../build-support/fetchs3 { }; + fetchsvn = callPackage ../build-support/fetchsvn { sshSupport = true; }; @@ -170,6 +174,8 @@ with pkgs; inherit curl stdenv; }; + fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; + # fetchurlBoot is used for curl and its dependencies in order to # prevent a cyclic dependency (curl depends on curl.tar.bz2, # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It @@ -179,14 +185,18 @@ with pkgs; fetchzip = callPackage ../build-support/fetchzip { }; + gitRepoToName = callPackage ../build-support/fetchgit/gitrepotoname.nix { }; + fetchFromGitHub = { - owner, repo, rev, name ? "${repo}-${rev}-src", - fetchSubmodules ? false, + owner, repo, rev, name ? gitRepoToName repo rev, + fetchSubmodules ? false, private ? false, + githubBase ? "github.com", varPrefix ? null, ... # For hash agility - }@args: + }@args: assert private -> !fetchSubmodules; let - baseUrl = "https://github.com/${owner}/${repo}"; - passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ]; + baseUrl = "https://${githubBase}/${owner}/${repo}"; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; + varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; in if fetchSubmodules then fetchgit ({ inherit name rev fetchSubmodules; @@ -199,10 +209,23 @@ with pkgs; inherit name; url = "${baseUrl}/archive/${rev}.tar.gz"; meta.homepage = "${baseUrl}/"; + } // lib.optionalAttrs private { + netrcPhase = '' + if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then + echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + exit 1 + fi + cat > netrc <$out/share/bash-completion/completions/${drv.pname} ''; }); + 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 { }; @@ -728,6 +812,8 @@ with pkgs; catclock = callPackage ../applications/misc/catclock { }; + cde = callPackage ../tools/package-management/cde { }; + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; @@ -746,6 +832,8 @@ with pkgs; ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clac = callPackage ../tools/misc/clac {}; + clasp = callPackage ../tools/misc/clasp { }; cli53 = callPackage ../tools/admin/cli53 { }; @@ -756,6 +844,8 @@ with pkgs; cloud-init = callPackage ../tools/virtualization/cloud-init { }; + cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { }; + clib = callPackage ../tools/package-management/clib { }; colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; @@ -796,10 +886,16 @@ with pkgs; coturn = callPackage ../servers/coturn { }; + coursier = callPackage ../development/tools/coursier {}; + crunch = callPackage ../tools/security/crunch { }; + crudini = callPackage ../tools/misc/crudini { }; + daemontools = callPackage ../tools/admin/daemontools { }; + dale = callPackage ../development/compilers/dale { }; + dante = callPackage ../servers/dante { }; datamash = callPackage ../tools/misc/datamash { }; @@ -818,6 +914,8 @@ with pkgs; devmem2 = callPackage ../os-specific/linux/devmem2 { }; + ioport = callPackage ../os-specific/linux/ioport {}; + diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; }; @@ -847,6 +945,8 @@ with pkgs; ditaa = callPackage ../tools/graphics/ditaa { }; + dino = callPackage ../applications/networking/instant-messengers/dino { }; + dlx = callPackage ../misc/emulators/dlx { }; dosage = pythonPackages.dosage; @@ -863,6 +963,8 @@ with pkgs; dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + earlyoom = callPackage ../os-specific/linux/earlyoom { }; + ecasound = callPackage ../applications/audio/ecasound { }; edac-utils = callPackage ../os-specific/linux/edac-utils { }; @@ -871,6 +973,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 { }; @@ -879,21 +983,30 @@ with pkgs; envconsul = callPackage ../tools/system/envconsul { }; + esptool = callPackage ../tools/misc/esptool { }; + + esptool-ck = callPackage ../tools/misc/esptool-ck { }; + f3 = callPackage ../tools/filesystems/f3 { }; facter = callPackage ../tools/system/facter { boost = boost160; - ruby = ruby_2_1; }; fasd = callPackage ../tools/misc/fasd { }; 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 { }; + fsql = callPackage ../tools/misc/fsql { }; + fop = callPackage ../tools/typesetting/fop { }; fondu = callPackage ../tools/misc/fondu { }; @@ -902,6 +1015,8 @@ with pkgs; fsmark = callPackage ../tools/misc/fsmark { }; + fwup = callPackage ../tools/misc/fwup { }; + fzf = callPackage ../tools/misc/fzf { }; fzy = callPackage ../tools/misc/fzy { }; @@ -910,6 +1025,8 @@ with pkgs; gdrivefs = python27Packages.gdrivefs; + gdrive = callPackage ../applications/networking/gdrive { }; + go-dependency-manager = callPackage ../development/tools/gdm { }; gencfsm = callPackage ../tools/security/gencfsm { }; @@ -934,24 +1051,36 @@ 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 { }; + icdiff = callPackage ../tools/text/icdiff {}; + interlock = callPackage ../servers/interlock {}; - jbuilder = callPackage ../development/tools/ocaml/jbuilder { - inherit (ocaml-ng.ocamlPackages_4_03) ocaml; - }; + jbuilder = callPackage ../development/tools/ocaml/jbuilder { }; kapacitor = callPackage ../servers/monitoring/kapacitor { }; languagetool = callPackage ../tools/text/languagetool { }; + loccount = callPackage ../development/tools/misc/loccount { }; + long-shebang = callPackage ../misc/long-shebang {}; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; + mathics = pythonPackages.mathics; + masscan = callPackage ../tools/security/masscan { }; + meson = callPackage ../development/tools/build-managers/meson { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; @@ -960,14 +1089,28 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; + nfdump = callPackage ../tools/networking/nfdump { }; + + patdiff = callPackage ../tools/misc/patdiff { + ocamlPackages = ocamlPackages_4_03; + }; + playerctl = callPackage ../tools/audio/playerctl { }; + ps_mem = callPackage ../tools/system/ps_mem { }; + + socklog = callPackage ../tools/system/socklog { }; + + staccato = callPackage ../tools/text/staccato { }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syslogng = callPackage ../tools/system/syslog-ng { }; 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; @@ -1000,10 +1143,18 @@ with pkgs; hiredis = null; }; + mar1d = callPackage ../games/mar1d { } ; + mcrypt = callPackage ../tools/misc/mcrypt { }; mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mozlz4a = callPackage ../tools/compression/mozlz4a { + pylz4 = python3Packages.lz4; + }; + + msr-tools = callPackage ../os-specific/linux/msr-tools { }; + mstflint = callPackage ../tools/misc/mstflint { }; mcelog = callPackage ../os-specific/linux/mcelog { @@ -1051,6 +1202,8 @@ with pkgs; pythonPackages = python2Packages; }; + bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; + bgs = callPackage ../tools/X11/bgs { }; biber = callPackage ../tools/typesetting/biber { @@ -1064,7 +1217,6 @@ with pkgs; }; blueman = callPackage ../tools/bluetooth/blueman { - inherit (gnome3) dconf gsettings_desktop_schemas; withPulseAudio = config.pulseaudio or true; }; @@ -1084,11 +1236,7 @@ with pkgs; inherit (pythonPackages) gyp; }; - bup = callPackage ../tools/backup/bup { - par2Support = config.bup.par2Support or false; - }; - - burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { }; + bup = callPackage ../tools/backup/bup { }; burp = callPackage ../tools/backup/burp { }; @@ -1195,6 +1343,8 @@ with pkgs; connman = callPackage ../tools/networking/connman { }; + connman-gtk = callPackage ../tools/networking/connman-gtk { }; + connman-notify = callPackage ../tools/networking/connman-notify { }; connmanui = callPackage ../tools/networking/connmanui { }; @@ -1218,7 +1368,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 { }; @@ -1232,37 +1382,27 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (python3Packages) pygobject3; inherit (gnome3) dconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; ibus-engines = recurseIntoAttrs { + anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { - inherit (python3Packages) pygobject3; - }; + hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; - hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { - inherit (python3Packages) pygobject3; - }; + libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { }; - libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { - inherit (python3Packages) pygobject3; - }; - - m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { - inherit (python3Packages) pygobject3; - }; + m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - inherit (pythonPackages) gyp; - protobuf = protobuf.override { stdenv = clangStdenv; }; + python = python2; + inherit (python2Packages) gyp; + protobuf = protobuf3_2.override { stdenv = clangStdenv; }; }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { - inherit (python3Packages) pygobject3; inherit (gnome3) dconf; }; @@ -1288,6 +1428,10 @@ with pkgs; c14 = callPackage ../applications/networking/c14 { }; + certstrap = callPackage ../tools/security/certstrap { }; + + cfssl = callPackage ../tools/security/cfssl { }; + checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; clamav = callPackage ../tools/security/clamav { }; @@ -1318,7 +1462,7 @@ with pkgs; convoy = callPackage ../tools/filesystems/convoy { }; - cool-retro-term = libsForQt55.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = libsForQt56.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; @@ -1433,6 +1577,8 @@ with pkgs; ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddcutil = callPackage ../tools/misc/ddcutil { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; @@ -1443,8 +1589,6 @@ with pkgs; desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; - despotify = callPackage ../development/libraries/despotify { }; - dfc = callPackage ../tools/system/dfc { }; dev86 = callPackage ../development/compilers/dev86 { }; @@ -1506,6 +1650,8 @@ with pkgs; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; + dockbarx = callPackage ../applications/misc/dockbarx { }; + dog = callPackage ../tools/system/dog { }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; @@ -1589,6 +1735,10 @@ with pkgs; eid-viewer = callPackage ../tools/security/eid-viewer { }; + mcrcon = callPackage ../tools/networking/mcrcon {}; + + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + ### DEVELOPMENT / EMSCRIPTEN buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; @@ -1596,7 +1746,7 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { }; - emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc '' + emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' # hardening flags break WASM support cat > $out/nix-support/add-hardening.sh '' emscriptenfastcomp-unwrapped; @@ -1621,8 +1771,12 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; + # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. + elk5Version = "5.4.2"; + elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; + elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } @@ -1646,6 +1800,8 @@ with pkgs; eplot = callPackage ../tools/graphics/eplot { }; + epstool = callPackage ../tools/graphics/epstool { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; @@ -1666,6 +1822,8 @@ with pkgs; exiftags = callPackage ../tools/graphics/exiftags { }; + exiftool = perlPackages.ImageExifTool; + extundelete = callPackage ../tools/filesystems/extundelete { }; expect = callPackage ../tools/misc/expect { }; @@ -1687,6 +1845,8 @@ with pkgs; pillow; }; + fanficfare = callPackage ../tools/text/fanficfare { }; + fastd = callPackage ../tools/networking/fastd { }; fatsort = callPackage ../tools/filesystems/fatsort { }; @@ -1708,8 +1868,9 @@ with pkgs; m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { - inherit (pythonPackages) gyp; - protobuf = protobuf.override { stdenv = clangStdenv; }; + python = python2; + inherit (python2Packages) gyp; + protobuf = protobuf3_2.override { stdenv = clangStdenv; }; }; table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; @@ -1779,7 +1940,12 @@ with pkgs; fdk_aac = callPackage ../development/libraries/fdk-aac { }; - flameGraph = callPackage ../development/tools/flamegraph { }; + flac123 = callPackage ../applications/audio/flac123 { }; + + flamegraph = callPackage ../development/tools/flamegraph { }; + + # Awkward historical capitalization for flamegraph. Remove eventually + flameGraph = flamegraph; flvtool2 = callPackage ../tools/video/flvtool2 { }; @@ -1787,11 +1953,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }); fontforge-gtk = callPackage ../tools/misc/fontforge { + withSpiro = true; withGTK = true; gtk2 = gtk2-x11; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; + fontmatrix = callPackage ../applications/graphics/fontmatrix {}; foremost = callPackage ../tools/system/foremost { }; @@ -1843,6 +2012,8 @@ with pkgs; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; + fwknop = callPackage ../tools/security/fwknop { }; + exfat = callPackage ../tools/filesystems/exfat { }; dos2unix = callPackage ../tools/text/dos2unix { }; @@ -1898,6 +2069,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 { }; @@ -1918,10 +2091,16 @@ 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 { }; gitfs = callPackage ../tools/filesystems/gitfs { }; @@ -1933,6 +2112,7 @@ with pkgs; gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; + gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { }; gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; @@ -1952,6 +2132,8 @@ with pkgs; gmvault = callPackage ../tools/networking/gmvault { }; + gnash = callPackage ../misc/gnash { }; + gnaural = callPackage ../applications/audio/gnaural { stdenv = overrideCC stdenv gcc49; }; @@ -1964,6 +2146,8 @@ with pkgs; gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; + gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; @@ -2015,12 +2199,16 @@ with pkgs; # rename to upower-notify? go-upower-notify = callPackage ../tools/misc/upower-notify { }; + google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { }; + google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; 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 { }; @@ -2105,6 +2293,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; }; @@ -2134,6 +2328,8 @@ with pkgs; gtdialog = callPackage ../development/libraries/gtdialog {}; + gtkd = callPackage ../development/libraries/gtkd { }; + gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; gtkvnc = callPackage ../tools/admin/gtk-vnc {}; @@ -2198,6 +2394,8 @@ with pkgs; hal-flash = callPackage ../os-specific/linux/hal-flash { }; + half = callPackage ../development/libraries/half { }; + halibut = callPackage ../tools/typesetting/halibut { }; hardinfo = callPackage ../tools/system/hardinfo { }; @@ -2206,6 +2404,10 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; + hdf4 = callPackage ../tools/misc/hdf4 { + szip = null; + }; + hdf5 = callPackage ../tools/misc/hdf5 { gfortran = null; szip = null; @@ -2229,7 +2431,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 { }; @@ -2239,9 +2443,12 @@ with pkgs; hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight { + highlight = callPackage ../tools/text/highlight ({ lua = lua5; - }; + } // lib.optionalAttrs stdenv.isDarwin { + # doesn't build with clang_37 + inherit (llvmPackages_38) stdenv; + }); homesick = callPackage ../tools/misc/homesick { }; @@ -2251,6 +2458,8 @@ with pkgs; host = bind.host; + hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; + hping = callPackage ../tools/networking/hping { }; htpdate = callPackage ../tools/networking/htpdate { }; @@ -2299,6 +2508,14 @@ with pkgs; ifuse = callPackage ../tools/filesystems/ifuse/default.nix { }; + inherit (callPackages ../tools/filesystems/irods rec { + stdenv = llvmPackages_38.libcxxStdenv; + libcxx = llvmPackages_38.libcxx; + boost = boost160.override { inherit stdenv; }; + }) + irods + irods-icommands; + ignition = recurseIntoAttrs { math = callPackage ../development/libraries/ignition-math { }; @@ -2377,6 +2594,8 @@ with pkgs; ipxe = callPackage ../tools/misc/ipxe { }; + irker = callPackage ../servers/irker { }; + ised = callPackage ../tools/misc/ised {}; isl = isl_0_17; @@ -2393,8 +2612,12 @@ with pkgs; jaaa = callPackage ../applications/audio/jaaa { }; + jackett = callPackage ../servers/jackett { }; + jade = callPackage ../tools/text/sgml/jade { }; + jd = callPackage ../development/tools/jd { }; + jd-gui = callPackage_i686 ../tools/security/jd-gui { }; jdiskreport = callPackage ../tools/misc/jdiskreport { }; @@ -2438,6 +2661,8 @@ with pkgs; jsduck = callPackage ../development/tools/jsduck { }; + jucipp = callPackage ../applications/editors/jucipp { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -2470,7 +2695,8 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - kibana = callPackage ../development/tools/misc/kibana { }; + kibana = callPackage ../development/tools/misc/kibana { }; + kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -2478,6 +2704,8 @@ with pkgs; knockknock = callPackage ../tools/security/knockknock { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; + kpcli = callPackage ../tools/security/kpcli { }; krename = libsForQt5.callPackage ../applications/misc/krename { }; @@ -2486,12 +2714,16 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; + kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; + peruse = libsForQt5.callPackage ../tools/misc/peruse { }; kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; kytea = callPackage ../tools/text/kytea { }; + lbreakout2 = callPackage ../games/lbreakout2 { }; + leocad = callPackage ../applications/graphics/leocad { }; less = callPackage ../tools/misc/less { }; @@ -2502,6 +2734,10 @@ with pkgs; libcpuid = callPackage ../tools/misc/libcpuid { }; + libscrypt = callPackage ../development/libraries/libscrypt { }; + + libsmi = callPackage ../development/libraries/libsmi { }; + lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { @@ -2510,13 +2746,18 @@ with pkgs; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; + lldpd = callPackage ../tools/networking/lldpd { }; + lnav = callPackage ../tools/misc/lnav { }; + loadlibrary = callPackage ../tools/misc/loadlibrary { }; + loc = callPackage ../development/misc/loc { }; lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash = callPackage ../tools/misc/logstash { }; + logstash = callPackage ../tools/misc/logstash { }; + logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; @@ -2536,6 +2777,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 { }; @@ -2560,6 +2803,10 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; + nagstamon = callPackage ../tools/nagstamon { + pythonPackages = python3Packages; + }; + netdata = callPackage ../tools/system/netdata { }; netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec { @@ -2639,6 +2886,15 @@ with pkgs; enableNpm = false; }; + nodejs-8_x = callPackage ../development/web/nodejs/v8.nix { + libtool = darwin.cctools; + }; + + nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { + libtool = darwin.cctools; + enableNpm = false; + }; + nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; }; @@ -2658,6 +2914,8 @@ with pkgs; kindlegen = callPackage ../tools/typesetting/kindlegen { }; + latex2html = callPackage ../tools/misc/latex2html { }; + ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { @@ -2686,6 +2944,8 @@ with pkgs; libevhtp = callPackage ../development/libraries/libevhtp { }; + libfann = callPackage ../development/libraries/libfann { }; + libircclient = callPackage ../development/libraries/libircclient { }; libite = callPackage ../development/libraries/libite { }; @@ -2774,6 +3034,8 @@ with pkgs; lshw = callPackage ../tools/system/lshw { }; + ltris = callPackage ../games/ltris { }; + lxc = callPackage ../os-specific/linux/lxc { }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; @@ -2796,10 +3058,14 @@ with pkgs; macchanger = callPackage ../os-specific/linux/macchanger { }; + madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; + mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; maildrop = callPackage ../tools/networking/maildrop { }; + mailhog = callPackage ../servers/mail/mailhog {}; + mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -2833,6 +3099,8 @@ with pkgs; mawk = callPackage ../tools/text/mawk { }; + mb2md = callPackage ../tools/text/mb2md { }; + mbox = callPackage ../tools/security/mbox { }; mbuffer = callPackage ../tools/misc/mbuffer { }; @@ -2887,12 +3155,16 @@ with pkgs; metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; + metar = callPackage ../applications/misc/metar { }; + mfcuk = callPackage ../tools/security/mfcuk { }; mfoc = callPackage ../tools/security/mfoc { }; mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; + mimeo = callPackage ../tools/misc/mimeo { }; mimetic = callPackage ../development/libraries/mimetic { }; @@ -2968,7 +3240,8 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; - msf = callPackage ../tools/security/metasploit { }; + metasploit = callPackage ../tools/security/metasploit { }; + msf = metasploit; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -3002,6 +3275,8 @@ with pkgs; mysqltuner = callPackage ../tools/misc/mysqltuner { }; + mytetra = libsForQt5.callPackage ../applications/office/mytetra { }; + nabi = callPackage ../tools/inputmethods/nabi { }; namazu = callPackage ../tools/text/namazu { }; @@ -3012,6 +3287,8 @@ with pkgs; ndjbdns = callPackage ../tools/networking/ndjbdns { }; + ndppd = callPackage ../applications/networking/ndppd { }; + neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -3073,10 +3350,14 @@ with pkgs; networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; + networkmanager_dmenu = callPackage ../tools/networking/networkmanager_dmenu { }; + newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; @@ -3089,6 +3370,8 @@ with pkgs; ngrok = callPackage ../tools/networking/ngrok { }; + noice = callPackage ../applications/misc/noice { }; + noip = callPackage ../tools/networking/noip { }; nomad = callPackage ../applications/networking/cluster/nomad { }; @@ -3130,6 +3413,8 @@ with pkgs; graphicalSupport = true; }; + nnn = callPackage ../applications/misc/nnn { }; + notify-osd = callPackage ../applications/misc/notify-osd { }; nox = callPackage ../tools/package-management/nox { @@ -3205,6 +3490,8 @@ with pkgs; opendbx = callPackage ../development/libraries/opendbx { }; + opendht = callPackage ../development/libraries/opendht {}; + opendkim = callPackage ../development/libraries/opendkim { }; opendylan = callPackage ../development/compilers/opendylan { @@ -3215,6 +3502,10 @@ with pkgs; openjade = callPackage ../tools/text/sgml/openjade { }; + openmvg = callPackage ../applications/science/misc/openmvg { }; + + openmvs = callPackage ../applications/science/misc/openmvs { }; + openntpd = callPackage ../tools/networking/openntpd { }; openntpd_nixos = openntpd.override { @@ -3285,7 +3576,7 @@ with pkgs; owncloud90 owncloud91; - owncloud-client = callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt56.callPackage ../applications/networking/owncloud-client { }; p2pvc = callPackage ../applications/video/p2pvc {}; @@ -3306,14 +3597,14 @@ with pkgs; buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs]; }); - panomatic = callPackage ../tools/graphics/panomatic { }; - pamtester = callPackage ../tools/security/pamtester { }; paper-gtk-theme = callPackage ../misc/themes/paper { }; paperwork = callPackage ../applications/office/paperwork { }; + papertrail = callPackage ../tools/text/papertrail { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; @@ -3401,6 +3692,8 @@ with pkgs; inherit (pythonPackages) pillow; }; + pdfshuffler = callPackage ../applications/misc/pdfshuffler { }; + briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { @@ -3443,10 +3736,14 @@ with pkgs; libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_mac = callPackage ../tools/security/pinentry-mac { }; + pinentry_mac = callPackage ../tools/security/pinentry-mac { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; pingtcp = callPackage ../tools/networking/pingtcp { }; + pirate-get = callPackage ../tools/networking/pirate-get { }; + pius = callPackage ../tools/security/pius { }; pixiewps = callPackage ../tools/networking/pixiewps {}; @@ -3552,6 +3849,10 @@ with pkgs; psutils = callPackage ../tools/typesetting/psutils { }; + psensor = callPackage ../tools/system/psensor { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + pv = callPackage ../tools/misc/pv { }; pwgen = callPackage ../tools/security/pwgen { }; @@ -3617,10 +3918,20 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; + quota = callPackage ../tools/misc/quota { }; + + wiggle = callPackage ../development/tools/wiggle { }; + radamsa = callPackage ../tools/security/radamsa { }; + radarr = callPackage ../servers/radarr { }; + + radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { }; + radvd = callPackage ../tools/networking/radvd { }; + rainbowstream = pythonPackages.rainbowstream; + rambox = callPackage ../applications/networking/instant-messengers/rambox { }; ranger = callPackage ../applications/misc/ranger { }; @@ -3641,6 +3952,8 @@ with pkgs; redsocks = callPackage ../tools/networking/redsocks { }; + rst2html5 = callPackage ../tools/text/rst2html5 { }; + rt = callPackage ../servers/rt { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -3685,6 +3998,8 @@ with pkgs; renameutils = callPackage ../tools/misc/renameutils { }; + renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { }; + replace = callPackage ../tools/text/replace { }; reckon = callPackage ../tools/text/reckon { }; @@ -3734,7 +4049,7 @@ with pkgs; rlwrap = callPackage ../tools/misc/rlwrap { }; - rockbox_utility = callPackage ../tools/misc/rockbox-utility { }; + rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; rosegarden = callPackage ../applications/audio/rosegarden { }; @@ -3752,6 +4067,10 @@ with pkgs; rrdtool = callPackage ../tools/misc/rrdtool { }; + rss2email = callPackage ../applications/networking/feedreaders/rss2email { + pythonPackages = python3Packages; + }; + rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; @@ -3809,7 +4128,7 @@ with pkgs; }; quazip_qt4 = libsForQt5.quazip.override { - qtbase = qt4; qmakeHook = qmake4Hook; + qtbase = qt4; qmake = qmake4Hook; }; scrot = callPackage ../tools/graphics/scrot { }; @@ -3850,13 +4169,15 @@ with pkgs; shellinabox = callPackage ../servers/shellinabox { }; + shrikhand = callPackage ../data/fonts/shrikhand { }; + sic = callPackage ../applications/networking/irc/sic { }; siege = callPackage ../tools/networking/siege {}; - sigil = libsForQt55.callPackage ../applications/editors/sigil { }; + sigil = libsForQt56.callPackage ../applications/editors/sigil { }; - # aka., gpg-tools + # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; @@ -3870,6 +4191,8 @@ with pkgs; silver-searcher = callPackage ../tools/text/silver-searcher { }; ag = self.silver-searcher; + simpleproxy = callPackage ../tools/networking/simpleproxy { }; + simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; sipsak = callPackage ../tools/networking/sipsak { }; @@ -3912,6 +4235,8 @@ with pkgs; snort = callPackage ../applications/networking/ids/snort { }; + sshguard = callPackage ../tools/security/sshguard {}; + softhsm = callPackage ../tools/security/softhsm { }; solr = callPackage ../servers/search/solr { }; @@ -3952,6 +4277,8 @@ with pkgs; squashfsTools = callPackage ../tools/filesystems/squashfs { }; + srcml = callPackage ../applications/version-management/srcml { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshuttle = callPackage ../tools/security/sshuttle { }; @@ -4012,6 +4339,10 @@ with pkgs; stunnel = callPackage ../tools/networking/stunnel { }; + stutter = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.stutter) (drv: { + preCheck = "export PATH=dist/build/stutter:$PATH"; + }); + strongswan = callPackage ../tools/networking/strongswan { }; strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; }; @@ -4037,8 +4368,6 @@ with pkgs; pythonPackages = python3Packages; }; - sitecopy = callPackage ../tools/networking/sitecopy { }; - stricat = callPackage ../tools/security/stricat { }; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; @@ -4061,8 +4390,12 @@ with pkgs; tarsnap = callPackage ../tools/backup/tarsnap { }; + tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tcpcrypt = callPackage ../tools/security/tcpcrypt { }; + tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; + tboot = callPackage ../tools/security/tboot { }; tcpdump = callPackage ../tools/networking/tcpdump { }; @@ -4071,6 +4404,8 @@ with pkgs; tcpkali = callPackage ../applications/networking/tcpkali { }; + tcpreplay = callPackage ../tools/networking/tcpreplay { }; + teamviewer = callPackage ../applications/networking/remote/teamviewer { stdenv = stdenv_32bit; }; @@ -4092,18 +4427,24 @@ with pkgs; thc-hydra = callPackage ../tools/security/thc-hydra { }; + thefuck = callPackage ../tools/misc/thefuck { }; + thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; timemachine = callPackage ../applications/audio/timemachine { }; + timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; + timetrap = callPackage ../applications/office/timetrap { }; tinc = callPackage ../tools/networking/tinc { }; tie = callPackage ../development/tools/misc/tie { }; + tilix = callPackage ../applications/misc/tilix { }; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; @@ -4138,7 +4479,14 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; + # added 2017-04-05 + torbrowser = /* builtins.trace '' + WARNING: torbrowser package was renamed to tor-browser-bundle-bin. + + Also, consider using nix-built tor-browser-unwrapped package instead. Read its longDescription. + '' */ tor-browser-bundle-bin; + + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -4205,6 +4553,8 @@ with pkgs; u9fs = callPackage ../servers/u9fs { }; + ua = callPackage ../tools/networking/ua { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; @@ -4237,6 +4587,8 @@ with pkgs; uriparser = callPackage ../development/libraries/uriparser {}; + urlscan = callPackage ../applications/misc/urlscan { }; + urlview = callPackage ../applications/misc/urlview {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; @@ -4259,7 +4611,9 @@ with pkgs; vboot_reference = callPackage ../tools/system/vboot_reference { }; - vcsh = callPackage ../applications/version-management/vcsh { }; + vcsh = callPackage ../applications/version-management/vcsh { + inherit (perlPackages) ShellCommand TestMost; + }; verilator = callPackage ../applications/science/electronics/verilator {}; @@ -4276,6 +4630,8 @@ with pkgs; vim-vint = callPackage ../development/tools/vim-vint { }; + vimer = callPackage ../tools/misc/vimer { }; + vit = callPackage ../applications/misc/vit { }; vnc2flv = callPackage ../tools/video/vnc2flv {}; @@ -4356,14 +4712,16 @@ with pkgs; html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; + htmldoc = callPackage ../tools/typesetting/htmldoc { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; + }; + rcm = callPackage ../tools/misc/rcm {}; tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc { - fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc - xorg.fontbhlucidatypewriter75dpi ]; - fltk = fltk13; + fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; }; tightvnc = callPackage ../tools/admin/tightvnc { @@ -4373,7 +4731,7 @@ with pkgs; time = callPackage ../tools/misc/time { }; - tkabber = callPackage ../applications/networking/instant-messengers/tkabber { }; + tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs; qfsm = callPackage ../applications/science/electronics/qfsm { }; @@ -4483,6 +4841,10 @@ with pkgs; python = python27; }; + veracrypt = callPackage ../applications/misc/veracrypt { + wxGUI = true; + }; + vlan = callPackage ../tools/networking/vlan { }; vmtouch = callPackage ../tools/misc/vmtouch { }; @@ -4510,6 +4872,8 @@ with pkgs; which = callPackage ../tools/system/which { }; + winusb = callPackage ../tools/misc/winusb { }; + chase = callPackage ../tools/system/chase { }; wicd = callPackage ../tools/networking/wicd { }; @@ -4540,15 +4904,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"; @@ -4567,11 +4932,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 { }; @@ -4588,8 +4955,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 { }; @@ -4613,6 +4980,8 @@ with pkgs; xsel = callPackage ../tools/misc/xsel { }; + xsv = callPackage ../tools/text/xsv { }; + xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; xurls = callPackage ../tools/text/xurls {}; @@ -4627,6 +4996,8 @@ with pkgs; yarn = callPackage ../development/tools/yarn { }; + yasr = callPackage ../applications/audio/yasr { }; + yank = callPackage ../tools/misc/yank { }; yaml-merge = callPackage ../tools/text/yaml-merge { }; @@ -4668,6 +5039,8 @@ with pkgs; zpaq = callPackage ../tools/archivers/zpaq { }; zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; + zsh-git-prompt = callPackage ../shells/zsh-git-prompt { }; + zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { }; @@ -4675,6 +5048,7 @@ with pkgs; zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { }; zstd = callPackage ../tools/compression/zstd { }; + zstdmt = callPackage ../tools/compression/zstdmt { }; zsync = callPackage ../tools/compression/zsync { }; @@ -4688,6 +5062,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; }); @@ -4702,6 +5077,8 @@ with pkgs; fish-foreign-env = callPackage ../shells/fish-foreign-env { }; + ion = callPackage ../shells/ion { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -4754,6 +5131,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + binaryen = callPackage ../development/compilers/binaryen { }; + boo = callPackage ../development/compilers/boo { inherit (gnome2) gtksourceview; }; @@ -4778,7 +5157,7 @@ with pkgs; clang = llvmPackages.clang; - clang_4 = lowPrio llvmPackages_4.clang; + clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; @@ -4793,7 +5172,7 @@ with pkgs; clangSelf = clangWrapSelf llvmPackagesSelf.clang; - clangWrapSelf = build: callPackage ../build-support/cc-wrapper { + clangWrapSelf = build: ccWrapperFun { cc = build; isClang = true; stdenv = clangStdenv; @@ -4852,6 +5231,7 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { }; + gerbil = callPackage ../development/compilers/gerbil { }; gcc = gcc5; gcc-unwrapped = gcc.cc; @@ -4862,8 +5242,8 @@ with pkgs; extraBuildCommands = '' echo "dontMoveLib64=1" >> $out/nix-support/setup-hook ''; - in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc); + in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc); profiledCompiler = false; enableMultilib = true; })) @@ -4877,48 +5257,48 @@ 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 stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers - else if stdenv.cross.libc == "libSystem" then darwin.xcode + 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 { - cross = targetPlatform; + in wrapCCCross { + cc = forcedNativePackages.gcc.cc.override { crossStageStatic = true; langCC = false; libcCross = libcCross1; enableShared = false; # Why is this needed? - inherit (forcedNativePackages) binutilsCross; + inherit (forcedNativePackages) binutils; }; libc = libcCross1; - binutils = binutilsCross; - cross = targetPlatform; + inherit (forcedNativePackages) binutils; }; # 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; - binutils = binutilsCross; - cross = targetPlatform; + inherit (forcedNativePackages) binutils; }; - gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapGCCCross { - gcc = forcedNativePackages.gcc.cc.override { - cross = targetPlatform; + gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCCross { + cc = forcedNativePackages.gcc.cc.override { crossStageStatic = false; - # XXX: We have troubles cross-compiling libstdc++ on MinGW (see - # ), so don't even try. - langCC = targetPlatform.config != "i686-pc-mingw32"; # Why is this needed? - inherit (forcedNativePackages) binutilsCross; + inherit (forcedNativePackages) binutils; }; libc = libcCross; - binutils = binutilsCross; - cross = targetPlatform; + inherit (forcedNativePackages) binutils; }; gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { @@ -4932,10 +5312,6 @@ with pkgs; # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 profiledCompiler = !stdenv.isArm; - # When building `gcc.crossDrv' (a "Canadian cross", with host == target - # and host != build), `cross' must be null but the cross-libc must still - # be passed. - cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; })); @@ -4945,10 +5321,6 @@ with pkgs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); - # When building `gcc.crossDrv' (a "Canadian cross", with host == target - # and host != build), `cross' must be null but the cross-libc must still - # be passed. - cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; @@ -4962,10 +5334,6 @@ with pkgs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - # When building `gcc.crossDrv' (a "Canadian cross", with host == target - # and host != build), `cross' must be null but the cross-libc must still - # be passed. - cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -4979,10 +5347,6 @@ with pkgs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - # When building `gcc.crossDrv' (a "Canadian cross", with host == target - # and host != build), `cross' must be null but the cross-libc must still - # be passed. - cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; @@ -4994,19 +5358,34 @@ with pkgs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - # When building `gcc.crossDrv' (a "Canadian cross", with host == target - # and host != build), `cross' must be null but the cross-libc must still - # be passed. - cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; })); - gfortran = if !stdenv.isDarwin then gfortran5 - else callPackage ../development/compilers/gcc/gfortran-darwin.nix { - inherit (darwin) Libsystem; - }; + gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + libcCross = if targetPlatform != buildPlatform then libcCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + + gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + libcCross = if targetPlatform != buildPlatform then libcCross else null; + + isl = isl_0_17; + })); + + gfortran = gfortran5; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -5040,6 +5419,14 @@ with pkgs; profiledCompiler = false; }); + gfortran7 = wrapCC (gcc7.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj49; gcj49 = wrapCC (gcc49.cc.override { name = "gcj"; @@ -5139,17 +5526,21 @@ with pkgs; inherit (haskellPackages) ghc; - cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install; + cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install; stack = haskell.lib.justStaticExecutables haskellPackages.stack; + hlint = haskell.lib.justStaticExecutables haskellPackages.hlint; all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { }; purescript = haskell.lib.justStaticExecutables haskellPackages.purescript; + 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; @@ -5161,6 +5552,10 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; + fsharp41 = callPackage ../development/compilers/fsharp41 { + mono = mono46; + }; + fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; @@ -5177,17 +5572,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go_1_7 = callPackage ../development/compilers/go/1.7.nix ({ + go_1_7 = callPackage ../development/compilers/go/1.7.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; - }); + }; - go_1_8 = callPackage ../development/compilers/go/1.8.nix ({ + go_1_8 = callPackage ../development/compilers/go/1.8.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; - }); + }; go = go_1_8; @@ -5251,8 +5642,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 = @@ -5265,7 +5656,7 @@ with pkgs; jre = jre8; jre_headless = jre8_headless; - openshot-qt = callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { }; oraclejdk = pkgs.jdkdistro true false; @@ -5285,7 +5676,8 @@ with pkgs; supportsJDK = system == "i686-linux" || - system == "x86_64-linux"; + system == "x86_64-linux" || + system == "armv7l-linux"; jdkdistro = oraclejdk8distro; @@ -5334,21 +5726,21 @@ with pkgs; lizardfs = callPackage ../tools/filesystems/lizardfs { }; - lld = lowPrio llvmPackages_4.lld; + lld = llvmPackages_4.lld; lldb = llvmPackages.lldb; + lldb_4 = llvmPackages_4.lldb; llvm = llvmPackages.llvm; - llvm_4 = lowPrio llvmPackages_4.llvm; + llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs - (if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39); + llvmPackages = recurseIntoAttrs llvmPackages_4; llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -5362,13 +5754,9 @@ with pkgs; isl = isl_0_14; }; - llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ + llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 { inherit (stdenvAdapters) overrideCC; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; }; - libxml2 = libxml2.override { pythonSupport = false; }; - python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; - }); + }; llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 { inherit (stdenvAdapters) overrideCC; @@ -5378,9 +5766,13 @@ with pkgs; inherit (stdenvAdapters) overrideCC; }; - llvmPackages_4 = callPackage ../development/compilers/llvm/4 { + llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; - }; + } // stdenv.lib.optionalAttrs stdenv.isDarwin { + cmake = cmake.override { isBootstrap = true; }; + libxml2 = libxml2.override { pythonSupport = false; }; + python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; + }); manticore = callPackage ../development/compilers/manticore { }; @@ -5418,6 +5810,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 { }; @@ -5446,7 +5843,11 @@ with pkgs; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - inherit (ocamlPackages) ocaml-top; + ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; + + ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { + ocamlPackages = ocamlPackages_4_03; + }; opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; @@ -5471,22 +5872,34 @@ with pkgs; inherit (darwin) apple_sdk; }; + rustRegistry = callPackage ./rust-packages.nix { }; + rust = rustStable; - rustStable = callPackage ../development/compilers/rust {}; + rustStable = callPackage ../development/compilers/rust { + inherit (llvmPackages_4) llvm; + }; rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {})); - rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { - rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); - })); + + rustNightly = rustBeta; + + # rust support in nixpkgs isn't yet well maintained enough for us to + # pretend to support nightlies in a meaningful way. + + # rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { + # rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); + # })); + rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix { buildRustPackage = callPackage ../build-support/rust { rust = rustNightlyBin; - rustRegistry = callPackage ./rust-packages.nix { }; }; }); cargo = rust.cargo; rustc = rust.rustc; + cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: @@ -5495,11 +5908,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 { }; @@ -5507,6 +5926,9 @@ with pkgs; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; + rustup = callPackage ../development/tools/rust/rustup { + inherit (darwin.apple_sdk.frameworks) Security; + }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -5525,7 +5947,7 @@ with pkgs; scalafmt = callPackage ../development/tools/scalafmt { }; - sdcc = callPackage ../development/compilers/sdcc { boost = boost159; }; + sdcc = callPackage ../development/compilers/sdcc { }; serpent = callPackage ../development/compilers/serpent { }; @@ -5550,6 +5972,8 @@ with pkgs; metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; + swift = callPackage ../development/compilers/swift { }; + swiProlog = callPackage ../development/compilers/swi-prolog { }; tbb = callPackage ../development/libraries/tbb { }; @@ -5589,7 +6013,7 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper { + wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun { nativeTools = stdenv.cc.nativeTools or false; nativeLibc = stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; @@ -5602,7 +6026,7 @@ with pkgs; ccWrapperFun = callPackage ../build-support/cc-wrapper; - wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc ""; + wrapCC = wrapCCWith stdenv.cc.libc ""; # legacy version, used for gnat bootstrapping wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old { nativeTools = stdenv.cc.nativeTools or false; @@ -5612,14 +6036,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 @@ -5646,6 +6075,8 @@ with pkgs; ceptre = callPackage ../development/interpreters/ceptre { }; + clips = callPackage ../development/interpreters/clips { }; + clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; @@ -5660,101 +6091,36 @@ with pkgs; clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - odbcSupport = true; - }; - erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - odbcSupport = true; - }; - erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - odbcSupport = true; - }; - erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - javacSupport = true; - }; - erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - javacSupport = true; odbcSupport = true; - }; - erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - }; - erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - odbcSupport = true; - }; - erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; - }; - erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; odbcSupport = true; - }; - erlangR19 = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - }; - erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - odbcSupport = true; - }; - erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; - }; - erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; odbcSupport = true; - }; - erlang = erlangR18; - erlang_odbc = erlangR18_odbc; - erlang_javac = erlangR18_javac; - erlang_odbc_javac = erlangR18_odbc_javac; + beam = callPackage ./beam-packages.nix { }; - 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 { }; + inherit (beam.interpreters) + erlang erlang_odbc erlang_javac erlang_odbc_javac + elixir elixir_1_5 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 + erlangR20 erlangR20_odbc erlangR20_javac erlangR20_odbc_javac; - beamPackages = callPackage ../development/beam-modules { }; - hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { }; - cuter = callPackage ../development/tools/erlang/cuter { }; + inherit (beam.packages.erlang) + rebar rebar3-open rebar3 + hexRegistrySnapshot fetchHex beamPackages + hex2nix cuter; - relxExe = callPackage ../development/tools/erlang/relx-exe {}; - - elixir = callPackage ../development/interpreters/elixir { debugInfo = true; }; - - lfe = callPackage ../development/interpreters/lfe { }; + inherit (beam.packages.erlangR18) relxExe; groovy = callPackage ../development/interpreters/groovy { }; guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; - guile_2_0 = callPackage ../development/interpreters/guile { }; + # Needed for autogen + guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - guile = guile_2_0; + guile_2_2 = callPackage ../development/interpreters/guile { }; + + guile = guile_2_2; hadoop = callPackage ../applications/networking/cluster/hadoop { }; @@ -5774,8 +6140,16 @@ with pkgs; gtk2 = gtk2-x11; }; + lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance { + withGtk3 = true; + }; + lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; + lxpanel = callPackage ../desktops/lxde/core/lxpanel { + gtk2 = gtk2-x11; + }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -5808,12 +6182,8 @@ with pkgs; luaPackages = lua52Packages; - lua5_1_sockets = lua51Packages.luasocket; - - lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; - lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; - - luajit = callPackage ../development/interpreters/luajit {}; + inherit (callPackages ../development/interpreters/luajit {}) + luajit luajit_2_0 luajit_2_1; luarocks = luaPackages.luarocks; @@ -5847,17 +6217,29 @@ with pkgs; git = gitMinimal; }; - octave = callPackage ../development/interpreters/octave { - qt = null; - ghostscript = null; - graphicsmagick = null; - llvm = null; - hdf5 = null; - glpk = null; - suitesparse = null; - jdk = null; - openblas = if stdenv.isDarwin then openblasCompat else openblas; - }; + inherit ( + let + defaultOctaveOptions = { + qt = null; + ghostscript = null; + graphicsmagick = null; + llvm = null; + hdf5 = null; + glpk = null; + suitesparse = null; + jdk = null; + openblas = if stdenv.isDarwin then openblasCompat else openblas; + }; + + hgOctaveOptions = + (removeAttrs defaultOctaveOptions ["ghostscript"]) // { + overridePlatforms = stdenv.lib.platforms.none; + }; + in { + octave = callPackage ../development/interpreters/octave defaultOctaveOptions; + octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions); + }) octave octaveHg; + octaveFull = (lowPrio (callPackage ../development/interpreters/octave { qt = qt4; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; @@ -5865,7 +6247,7 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522; + inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -5914,7 +6296,7 @@ with pkgs; # available as `pythonPackages.tkinter` and can be used as any other Python package. python = python2; python2 = python27; - python3 = python35; + python3 = python36; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -5928,9 +6310,9 @@ with pkgs; python36Full = python36.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync - pythonPackages = python2Packages; - python2Packages = python27Packages; - python3Packages = python35Packages; + pythonPackages = python.pkgs; + python2Packages = python2.pkgs; + python3Packages = python3.pkgs; python27 = callPackage ../development/interpreters/python/cpython/2.7 { self = python27; @@ -5940,19 +6322,22 @@ with pkgs; self = python33; inherit (darwin) CF configd; }; - python34 = hiPrio (callPackage ../development/interpreters/python/cpython/3.4 { + python34 = callPackage ../development/interpreters/python/cpython/3.4 { inherit (darwin) CF configd; self = python34; - }); - python35 = hiPrio (callPackage ../development/interpreters/python/cpython/3.5 { + }; + python35 = callPackage ../development/interpreters/python/cpython/3.5 { inherit (darwin) CF configd; self = python35; - }); + }; python36 = callPackage ../development/interpreters/python/cpython/3.6 { inherit (darwin) CF configd; self = python36; }; + # Should eventually be moved inside Python interpreters. + python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; + pypy = pypy27; pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { @@ -5965,7 +6350,14 @@ with pkgs; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); - pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; }; + pypi2nix = callPackage ../development/tools/pypi2nix { + pythonPackages = python3Packages; + }; + + # These pyside tools do not provide any Python modules and are meant to be here. + # See ../development/python-modules/pyside/default.nix for details. + pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; svg2tikz = python27Packages.svg2tikz; @@ -5985,6 +6377,8 @@ with pkgs; regina = callPackage ../development/interpreters/regina { }; + inherit (ocamlPackages) reason; + renpy = callPackage ../development/interpreters/renpy { ffmpeg = ffmpeg_2; }; @@ -6001,17 +6395,17 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby {}) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_5 - ruby_2_3_3 - ruby_2_4_0; + ruby_2_2_7 + ruby_2_3_4 + ruby_2_4_1; # Ruby aliases ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_5; - ruby_2_3 = ruby_2_3_3; - ruby_2_4 = ruby_2_4_0; + ruby_2_2 = ruby_2_2_7; + ruby_2_3 = ruby_2_3_4; + ruby_2_4 = ruby_2_4_1; scsh = callPackage ../development/interpreters/scsh { }; @@ -6020,7 +6414,7 @@ with pkgs; self = callPackage_i686 ../development/interpreters/self { }; spark = spark_21; - spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; }; + spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; }; spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; @@ -6032,7 +6426,7 @@ with pkgs; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; - supercollider = callPackage ../development/interpreters/supercollider { + supercollider = libsForQt56.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -6116,7 +6510,13 @@ with pkgs; ### DEVELOPMENT / TOOLS - activator = callPackage ../development/tools/activator { }; + activator = throw '' + Typesafe Activator was removed in 2017-05-08 as the actual package reaches end of life. + + See https://github.com/NixOS/nixpkgs/pull/25616 + and http://www.lightbend.com/community/core-tools/activator-and-sbt + for more information. + ''; alloy = callPackage ../development/tools/alloy { }; @@ -6131,6 +6531,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 { }; @@ -6140,6 +6543,8 @@ with pkgs; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; + kt = callPackage ../tools/misc/kt {}; + asn2quickder = callPackage ../development/tools/asn2quickder {}; astyle = callPackage ../development/tools/misc/astyle { }; @@ -6189,32 +6594,34 @@ with pkgs; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw; + binutils = + if targetPlatform.isDarwin + then darwin.binutils + else binutils-raw; - binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; + binutils-raw = callPackage ../development/tools/misc/binutils { + # FHS sys dirs presumably only have stuff for the build platform + noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; + }; - binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils { - inherit noSysDirs; + binutils_nogold = lowPrio (binutils-raw.override { gold = false; }); - binutilsCross = assert targetPlatform != buildPlatform; lowPrio ( - if targetPlatform.libc == "libSystem" then darwin.cctools_cross - else forcedNativePackages.binutils.override { - noSysDirs = true; - cross = targetPlatform; - }); - bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; 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 { wxGTK = wxGTK30; }; + buck = callPackage ../development/tools/build-managers/buck { }; + buildbot = callPackage ../development/tools/build-managers/buildbot { pythonPackages = python2Packages; }; @@ -6225,7 +6632,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 { }; @@ -6291,8 +6698,12 @@ with pkgs; coan = callPackage ../development/tools/analysis/coan { }; + compile-daemon = callPackage ../development/tools/compile-daemon { }; + complexity = callPackage ../development/tools/misc/complexity { }; + conan = callPackage ../development/tools/build-managers/conan { }; + cookiecutter = pythonPackages.cookiecutter; ctags = callPackage ../development/tools/misc/ctags { }; @@ -6334,12 +6745,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; @@ -6400,6 +6818,8 @@ with pkgs; doctl = callPackage ../development/tools/doctl { }; + doit = callPackage ../development/tools/build-managers/doit { }; + dot2tex = pythonPackages.dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { @@ -6421,6 +6841,8 @@ with pkgs; elfutils = callPackage ../development/tools/misc/elfutils { }; + elfkickers = callPackage ../development/tools/misc/elfkickers { }; + emma = callPackage ../development/tools/analysis/emma { }; epm = callPackage ../development/tools/misc/epm { }; @@ -6429,6 +6851,8 @@ with pkgs; eztrace = callPackage ../development/tools/profiling/EZTrace { }; + ezquake = callPackage ../games/ezquake { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; foreman = callPackage ../tools/system/foreman { }; @@ -6436,12 +6860,10 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - ocaml = ocaml_4_02; + inherit (ocamlPackages_4_03) ocaml findlib camlp4 sedlex ocamlbuild; }; - framac = callPackage ../development/tools/analysis/frama-c { - coq = coq_8_4; - }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -6449,6 +6871,8 @@ with pkgs; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; + gede = callPackage ../development/tools/misc/gede { }; + pmd = callPackage ../development/tools/analysis/pmd { }; jdepend = callPackage ../development/tools/analysis/jdepend { }; @@ -6495,6 +6919,7 @@ with pkgs; gradle = self.gradleGen.gradle_latest; gradle_2_14 = self.gradleGen.gradle_2_14; gradle_2_5 = self.gradleGen.gradle_2_5; + gradle_3_5 = self.gradleGen.gradle_3_5; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -6556,6 +6981,8 @@ with pkgs; jenkins-job-builder = pythonPackages.jenkins-job-builder; + kati = callPackage ../development/tools/build-managers/kati { }; + kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; }; @@ -6578,6 +7005,10 @@ 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 { }; ltrace = callPackage ../development/tools/misc/ltrace { }; @@ -6601,6 +7032,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 { }; @@ -6616,6 +7049,8 @@ with pkgs; }; }; + nailgun = callPackage ../development/tools/nailgun { }; + nant = callPackage ../development/tools/build-managers/nant { }; ninja = callPackage ../development/tools/build-managers/ninja { }; @@ -6643,6 +7078,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; }; @@ -6659,6 +7096,8 @@ with pkgs; pahole = callPackage ../development/tools/misc/pahole {}; + pants = callPackage ../development/tools/build-managers/pants {}; + parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; @@ -6667,6 +7106,8 @@ with pkgs; peg = callPackage ../development/tools/parsing/peg { }; + pgcli = callPackage ../development/tools/database/pgcli {}; + phantomjs = callPackage ../development/tools/phantomjs { }; phantomjs2 = callPackage ../development/tools/phantomjs2 { }; @@ -6692,6 +7133,10 @@ with pkgs; premake4 = callPackage ../development/tools/misc/premake { }; + premake5 = callPackage ../development/tools/misc/premake/5.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + premake = premake4; qtcreator = libsForQt5.callPackage ../development/qtcreator { }; @@ -6717,6 +7162,8 @@ with pkgs; ragel = ragelStable; + randoop = callPackage ../development/tools/analysis/randoop { }; + inherit (callPackages ../development/tools/parsing/ragel { tex = texlive.combined.scheme-small; }) ragelStable ragelDev; @@ -6729,6 +7176,8 @@ with pkgs; redo = callPackage ../development/tools/build-managers/redo { }; + redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; + reno = callPackage ../development/tools/reno { }; re2c = callPackage ../development/tools/parsing/re2c { }; @@ -6754,6 +7203,7 @@ with pkgs; scons = callPackage ../development/tools/build-managers/scons { }; sbt = callPackage ../development/tools/build-managers/sbt { }; + sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; simpleBuildTool = sbt; shards = callPackage ../development/tools/build-managers/shards { }; @@ -6791,7 +7241,7 @@ with pkgs; flex = flex_2_5_35; }; - sqlitebrowser = callPackage ../development/tools/database/sqlitebrowser { }; + sqlitebrowser = libsForQt56.callPackage ../development/tools/database/sqlitebrowser { }; sselp = callPackage ../tools/X11/sselp{ }; @@ -6856,16 +7306,18 @@ with pkgs; gdbGuile = lowPrio (gdb.override { inherit guile; }); - gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { - target = if targetPlatform != buildPlatform then targetPlatform else null; - }); - gdb-multitarget = lowPrio (gdb.override { multitarget = true; }); - valgrind = callPackage ../development/tools/analysis/valgrind { }; + valgrind = callPackage ../development/tools/analysis/valgrind { + inherit (darwin) xnu bootstrap_cmds cctools; + llvm = llvm_39; + }; + valgrind-light = self.valgrind.override { gdb = null; }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; + qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {}; + verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { coq = coq_8_4; }; @@ -6874,6 +7326,10 @@ with pkgs; vultr = callPackage ../development/tools/vultr { }; + vulnix = callPackage ../tools/security/vulnix { + pythonPackages = python3Packages; + }; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { @@ -6889,12 +7345,13 @@ with pkgs; xxdiff = callPackage ../development/tools/misc/xxdiff { bison = bison2; }; + xxdiff-tip = callPackage ../development/tools/misc/xxdiff/tip.nix { }; yacc = bison; ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; - llvmPackages = llvmPackages_39; + llvmPackages = llvmPackages_4; python = python2; }; @@ -6904,7 +7361,9 @@ with pkgs; grabserial = callPackage ../development/tools/grabserial { }; - mypy = callPackage ../development/tools/mypy { }; + mypy = callPackage ../development/tools/mypy { + inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast; + }; ### DEVELOPMENT / LIBRARIES @@ -6915,8 +7374,6 @@ with pkgs; aalib = callPackage ../development/libraries/aalib { }; - accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; }; - accountsservice = callPackage ../development/libraries/accountsservice { }; acl = callPackage ../development/libraries/acl { }; @@ -6965,6 +7422,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 { }; @@ -7028,6 +7487,8 @@ with pkgs; fetchurl = fetchurlBoot; }; + c-blosc = callPackage ../development/libraries/c-blosc { }; + capnproto = callPackage ../development/libraries/capnproto { }; ccnx = callPackage ../development/libraries/ccnx { }; @@ -7054,6 +7515,8 @@ with pkgs; certbot = callPackage ../tools/admin/certbot { }; + caf = callPackage ../development/libraries/caf {}; + cgal = callPackage ../development/libraries/CGAL {}; cgui = callPackage ../development/libraries/cgui {}; @@ -7134,8 +7597,12 @@ with pkgs; cracklib = callPackage ../development/libraries/cracklib { }; + cre2 = callPackage ../development/libraries/cre2 { }; + cryptopp = callPackage ../development/libraries/crypto++ { }; + cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; + curlcpp = callPackage ../development/libraries/curlcpp { }; cutee = callPackage ../development/libraries/cutee { }; @@ -7161,6 +7628,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 { }; @@ -7201,12 +7669,16 @@ with pkgs; dlib = callPackage ../development/libraries/dlib { }; + docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; + dotconf = callPackage ../development/libraries/dotconf { }; dssi = callPackage ../development/libraries/dssi {}; dxflib = callPackage ../development/libraries/dxflib {}; + eccodes = callPackage ../development/libraries/eccodes { }; + eclib = callPackage ../development/libraries/eclib {}; eigen = callPackage ../development/libraries/eigen {}; @@ -7216,12 +7688,12 @@ with pkgs; vmmlib = callPackage ../development/libraries/vmmlib {}; + elastix = callPackage ../development/libraries/science/biology/elastix { }; + enchant = callPackage ../development/libraries/enchant { }; enet = callPackage ../development/libraries/enet { }; - enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { }; - epoxy = callPackage ../development/libraries/epoxy {}; esdl = callPackage ../development/libraries/esdl { }; @@ -7242,6 +7714,8 @@ with pkgs; inherit (pkgs.gnome2) gtkglext; }; + far2l = callPackage ../applications/misc/far2l { }; + farbfeld = callPackage ../development/libraries/farbfeld { }; farsight2 = callPackage ../development/libraries/farsight2 { }; @@ -7269,17 +7743,14 @@ with pkgs; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - }; - ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix { + ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; - ffmpeg_3 = ffmpeg_3_1; + ffmpeg_3 = ffmpeg_3_3; ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { @@ -7342,6 +7813,8 @@ with pkgs; fontconfig = callPackage ../development/libraries/fontconfig { }; + fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {}; + fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; folly = callPackage ../development/libraries/folly { }; @@ -7461,7 +7934,6 @@ with pkgs; glibc = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; - gccCross = null; }; glibc_memusage = callPackage ../development/libraries/glibc { @@ -7469,15 +7941,19 @@ with pkgs; withGd = true; }; - glibcCross = forcedNativePackages.glibc.override { - gccCross = gccCrossStageStatic; - linuxHeaders = linuxHeadersCross; + # Being redundant to avoid cycles on boot. TODO: find a better way + glibcCross = callPackage ../development/libraries/glibc { + installLocales = config.glibc.locales or false; + stdenv = crossLibcStdenv; }; # We can choose: - libcCrossChooser = name: if name == "glibc" then glibcCross + libcCrossChooser = name: + # libc is hackily often used from the previous stage. This `or` + # 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"; @@ -7505,7 +7981,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 {}; @@ -7603,9 +8083,15 @@ with pkgs; gnutls = gnutls35; - gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix { - guileBindings = config.gnutls.guile or false; - }; + gnutls35 = callPackage + (if stdenv.isDarwin + # Avoid > 3.5.10 due to frameworks for now; see discussion on: + # https://github.com/NixOS/nixpkgs/commit/d6454e6a1 + then ../development/libraries/gnutls/3.5.10.nix + else ../development/libraries/gnutls/3.5.nix) + { + guileBindings = config.gnutls.guile or false; + }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { guileBindings = config.gnutls.guile or false; @@ -7614,9 +8100,7 @@ with pkgs; gpac = callPackage ../applications/video/gpac { }; - gpgme = callPackage ../development/libraries/gpgme { - gnupg1 = gnupg1orig; - }; + gpgme = callPackage ../development/libraries/gpgme { }; pgpdump = callPackage ../tools/security/pgpdump { }; @@ -7716,6 +8200,10 @@ with pkgs; gtk = gtk2; }; + gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration { + gtk = gtk3; + }; + gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; gtkspell2 = callPackage ../development/libraries/gtkspell { }; @@ -7767,6 +8255,8 @@ with pkgs; hound = callPackage ../development/tools/misc/hound { }; + hpx = callPackage ../development/libraries/hpx { }; + hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -7794,8 +8284,6 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; icu = callPackage ../development/libraries/icu { }; - # Needed for LibreOffice Still as of 5.2.6.2 - icu_57 = callPackage ../development/libraries/icu/57.nix { }; id3lib = callPackage ../development/libraries/id3lib { }; @@ -7884,7 +8372,7 @@ with pkgs; mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { inherit libsForQt5; - inherit kdeDerivation lib fetchurl; + inherit lib fetchurl; }; in recurseIntoAttrs (makeOverridable mkFrameworks attrs); @@ -7931,9 +8419,7 @@ with pkgs; levmar = callPackage ../development/libraries/levmar { }; - leptonica = callPackage ../development/libraries/leptonica { - libpng = libpng12; - }; + leptonica = callPackage ../development/libraries/leptonica { }; lib3ds = callPackage ../development/libraries/lib3ds { }; @@ -7947,7 +8433,7 @@ with pkgs; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libao = callPackage ../development/libraries/libao { - usePulseAudio = config.pulseaudio or true; + usePulseAudio = config.pulseaudio or stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; @@ -7982,10 +8468,19 @@ with pkgs; libb2 = callPackage ../development/libraries/libb2 { }; + libbap = callPackage ../development/libraries/libbap { + inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; + }; + + libbass = (callPackage ../development/libraries/audio/libbass { }).bass; + libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; + libbluedevil = callPackage ../development/libraries/libbluedevil { }; libbdplus = callPackage ../development/libraries/libbdplus { }; + libblocksruntime = callPackage ../development/libraries/libblocksruntime { }; + libbluray = callPackage ../development/libraries/libbluray { }; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; @@ -8287,6 +8782,8 @@ with pkgs; libharu = callPackage ../development/libraries/libharu { }; + libhdhomerun = callPackage ../development/libraries/libhdhomerun { }; + libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; libHX = callPackage ../development/libraries/libHX { }; @@ -8393,15 +8890,19 @@ with pkgs; libgsf = callPackage ../development/libraries/libgsf { }; - # glibc provides libiconv so systems with glibc don't need to build libiconv - # separately, but we also provide libiconvReal, which will always be a - # standalone libiconv, just in case you want it - libiconv = if stdenv ? cross then - (if stdenv.cross.libc == "glibc" then libcCross - else if stdenv.cross.libc == "libSystem" then darwin.libiconv - else libiconvReal) - else if stdenv.isGlibc then glibcIconv stdenv.cc.libc - else if stdenv.isDarwin then darwin.libiconv + # GNU libc provides libiconv so systems with glibc don't need to build + # libiconv separately. Additionally, Apple forked/repackaged libiconv so we + # use that instead of the vanilla version on that OS. + # + # We also provide `libiconvReal`, which will always be a standalone libiconv, + # just in case you want it regardless of platform. + libiconv = + if hostPlatform.libc == "glibc" + then glibcIconv (if hostPlatform != buildPlatform + then libcCross + else stdenv.cc.libc) + else if hostPlatform.isDarwin + then darwin.libiconv else libiconvReal; glibcIconv = libc: let @@ -8528,6 +9029,8 @@ with pkgs; libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { }; + libnetfilter_log = callPackage ../development/libraries/libnetfilter_log { }; + libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { }; libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; @@ -8637,6 +9140,8 @@ with pkgs; libsoup = callPackage ../development/libraries/libsoup { }; + libspiro = callPackage ../development/libraries/libspiro {}; + libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; @@ -8728,7 +9233,8 @@ with pkgs; libusb = callPackage ../development/libraries/libusb {}; libusb1 = callPackage ../development/libraries/libusb1 { - inherit (darwin) libobjc IOKit; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; }; libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; @@ -8744,10 +9250,7 @@ with pkgs; }; libv4l = lowPrio (v4l_utils.override { - alsaLib = null; - libX11 = null; - qt4 = null; - qt5 = null; + withUtils = false; }); libva = callPackage ../development/libraries/libva { }; @@ -8834,6 +9337,8 @@ with pkgs; libykneomgr = callPackage ../development/libraries/libykneomgr { }; + libytnef = callPackage ../development/libraries/libytnef { }; + libyubikey = callPackage ../development/libraries/libyubikey { }; libzen = callPackage ../development/libraries/libzen { }; @@ -8850,8 +9355,12 @@ with pkgs; linenoise = callPackage ../development/libraries/linenoise { }; + linenoise-ng = callPackage ../development/libraries/linenoise-ng { }; + lirc = callPackage ../development/libraries/lirc { }; + liquid-dsp = callPackage ../development/libraries/liquid-dsp { }; + liquidfun = callPackage ../development/libraries/liquidfun { }; live555 = callPackage ../development/libraries/live555 { }; @@ -8864,6 +9373,8 @@ with pkgs; log4cplus = callPackage ../development/libraries/log4cplus { }; + log4shib = callPackage ../development/libraries/log4shib { }; + loudmouth = callPackage ../development/libraries/loudmouth { }; luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; @@ -8900,24 +9411,31 @@ with pkgs; inherit (darwin) apple_sdk; } else alternative; + mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa { # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity - grsecEnabled = true; - llvmPackages = llvmPackages_39; + # grsecEnabled = true; # no more support in nixpkgs ATM + + # llvm-4.0.0 won't pass tests on aarch64 + llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_4; }); + mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; + enableTextureFloats = true; }; in mo.drivers ); + # Please, avoid using this attribute. It was meant as transitional hack + # for packages that assume that libGLU and libGL live in the same prefix. + # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether + # you need libGLU or not (_glu propagates _noglu). mesa = mesaDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; - # FIXME: this causes mesa to have a runtime dependency on - # mesa_noglu.dev. paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { platforms = lib.platforms.unix; @@ -8941,7 +9459,7 @@ with pkgs; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mkvtoolnix-cli = mkvtoolnix.override { + mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { withGUI = false; }; @@ -9024,9 +9542,7 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { - nix = pkgs.nixUnstable; - }; + nix-plugins = callPackage ../development/libraries/nix-plugins {}; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -9099,7 +9615,9 @@ with pkgs; ffmpeg = ffmpeg_2; }; - opencv3 = callPackage ../development/libraries/opencv/3.x.nix { }; + opencv3 = callPackage ../development/libraries/opencv/3.x.nix { + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; + }; # this ctl version is needed by openexr_viewers openexr_ctl = ctl; @@ -9122,25 +9640,25 @@ 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_4; - 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 { }; wolfssl = callPackage ../development/libraries/wolfssl { }; openssl = openssl_1_0_2; - openssl-steam = openssl_1_0_2-steam; inherit (callPackages ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -9150,8 +9668,7 @@ with pkgs; }; }) openssl_1_0_2 - openssl_1_1_0 - openssl_1_0_2-steam; + openssl_1_1_0; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { @@ -9203,6 +9720,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 {}; @@ -9222,6 +9741,8 @@ with pkgs; pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; + poco = callPackage ../development/libraries/poco { }; + podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; poker-eval = callPackage ../development/libraries/poker-eval { }; @@ -9262,6 +9783,11 @@ with pkgs; proj = callPackage ../development/libraries/proj { }; + proselint = callPackage ../tools/text/proselint { + inherit (python3Packages) + buildPythonApplication click future six; + }; + postgis = callPackage ../development/libraries/postgis { }; protobuf = protobuf2_6; @@ -9287,6 +9813,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; }; @@ -9329,48 +9857,37 @@ with pkgs; developerBuild = true; }); - qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 { - inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - cups = if stdenv.isLinux then cups else null; - harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; - inherit perl; - inherit (gnome2) libgnomeui GConf gnome_vfs; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); - - libsForQt55 = recurseIntoAttrs (lib.makeScope qt55.newScope mkLibsForQt5); - - qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 { - inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - cups = if stdenv.isLinux then cups else null; - harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); + qt56 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.6) { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit cups; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + }); libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); - qt57 = recurseIntoAttrs (import ../development/libraries/qt-5/5.7 { - inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - cups = if stdenv.isLinux then cups else null; - harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); + 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(... + inherit cups; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gnome3) gtk3 dconf; + }); - libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5); + libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5); - qt5 = qt57; - libsForQt5 = libsForQt57; + qt5 = qt59; + libsForQt5 = libsForQt59; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -9388,7 +9905,7 @@ with pkgs; knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework solid sonnet syntax-highlighting + networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting threadweaver; ### KDE PLASMA 5 @@ -9407,11 +9924,13 @@ with pkgs; fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; + qgpgme = callPackage ../development/libraries/gpgme { }; + grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; - kirigami_1 = callPackage ../development/libraries/kirigami { }; - - kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix { }; + inherit (callPackage ../development/libraries/kirigami { }) + kirigami_1 + kirigami_2; kirigami = kirigami_1; @@ -9423,6 +9942,16 @@ with pkgs; libktorrent = callPackage ../development/libraries/libktorrent { }; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; + + libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + + libqtav = callPackage ../development/libraries/libqtav { + libva = libva-full; # also wants libva-x11 + }; + + kpmcore = callPackage ../development/libraries/kpmcore { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -9457,6 +9986,8 @@ with pkgs; withQt5 = true; }; + qtinstaller = callPackage ../development/libraries/qtinstaller { }; + qtkeychain = callPackage ../development/libraries/qtkeychain { withQt5 = true; }; @@ -9523,10 +10054,14 @@ with pkgs; haskell-lib = haskell.lib; }; + lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { }; + leksah = callPackage ../development/tools/haskell/leksah { inherit (haskellPackages) ghcWithPackages; }; + libgme = callPackage ../development/libraries/audio/libgme { }; + librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { }; @@ -9561,6 +10096,8 @@ with pkgs; rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb_lite = rocksdb.override { enableLite = true; }; + rote = callPackage ../development/libraries/rote { }; ronn = callPackage ../development/tools/ronn { }; @@ -9571,6 +10108,8 @@ with pkgs; sad = callPackage ../applications/science/logic/sad { }; + safefile = callPackage ../development/libraries/safefile {}; + sbc = callPackage ../development/libraries/sbc { }; schroedinger = callPackage ../development/libraries/schroedinger { }; @@ -9641,6 +10180,10 @@ with pkgs; sfml = callPackage ../development/libraries/sfml { }; + shapelib = callPackage ../development/libraries/shapelib { }; + + shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; + skalibs = callPackage ../development/libraries/skalibs { }; slang = callPackage ../development/libraries/slang { }; @@ -9777,8 +10320,6 @@ with pkgs; tclap = callPackage ../development/libraries/tclap {}; - tclgpg = callPackage ../development/libraries/tclgpg { }; - tcllib = callPackage ../development/libraries/tcllib { }; tcltls = callPackage ../development/libraries/tcltls { }; @@ -9852,6 +10393,8 @@ with pkgs; uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; + umockdev = callPackage ../development/libraries/umockdev { }; + unibilium = callPackage ../development/libraries/unibilium { }; unicap = callPackage ../development/libraries/unicap {}; @@ -9864,8 +10407,6 @@ with pkgs; unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {}); - urt = callPackage ../development/libraries/urt { }; - ustr = callPackage ../development/libraries/ustr { }; usbredir = callPackage ../development/libraries/usbredir { @@ -9892,6 +10433,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 { @@ -9908,6 +10450,7 @@ with pkgs; v8 = callPackage ../development/libraries/v8 { inherit (python2Packages) python gyp; + cctools = darwin.cctools; }; v8_static = lowPrio (self.v8.override { static = true; }); @@ -9976,20 +10519,20 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk214x; + 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; }; - webkitgtk214x = callPackage ../development/libraries/webkitgtk/2.14.nix { + webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk2 = webkitgtk24x.override { + webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; }; @@ -10008,26 +10551,26 @@ with pkgs; wxGTK = wxGTK28; - wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { inherit (gnome2) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9/default.nix { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { + wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0/default.nix { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxmac = callPackage ../development/libraries/wxmac { + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; }; @@ -10043,8 +10586,8 @@ with pkgs; x265 = callPackage ../development/libraries/x265 { }; inherit (callPackages ../development/libraries/xapian { }) - xapian_1_2_22 xapian_1_4_0; - xapian = xapian_1_4_0; + xapian_1_2_22 xapian_1_4_4; + xapian = xapian_1_4_4; xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; @@ -10092,6 +10635,8 @@ with pkgs; xml-security-c = callPackage ../development/libraries/xml-security-c { }; + xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; + xlslib = callPackage ../development/libraries/xlslib { }; xvidcore = callPackage ../development/libraries/xvidcore { }; @@ -10104,6 +10649,8 @@ with pkgs; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; + yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; + yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { @@ -10206,8 +10753,6 @@ with pkgs; javaCup = callPackage ../development/libraries/java/cup { }; - jclasslib = callPackage ../development/tools/java/jclasslib { }; - jdom = callPackage ../development/libraries/java/jdom { }; jflex = callPackage ../development/libraries/java/jflex { }; @@ -10281,6 +10826,15 @@ with pkgs; texLive = null; }; + # QuickLisp minimal version + asdf_2_26 = callPackage ../development/lisp-modules/asdf/2.26.nix { + texLive = null; + }; + # Currently most popular + asdf_3_1 = callPackage ../development/lisp-modules/asdf/3.1.nix { + texLive = null; + }; + clwrapperFunction = callPackage ../development/lisp-modules/clwrapper; wrapLisp = lisp: clwrapperFunction { inherit lisp; }; @@ -10289,10 +10843,17 @@ with pkgs; inherit clwrapper; }; - lispPackagesClisp = lispPackagesFor (wrapLisp clisp); - lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl); - lispPackages = recurseIntoAttrs lispPackagesSBCL; + lispPackages = recurseIntoAttrs (quicklispPackages_asdf_3_1 // + lispPackagesFor ((wrapLisp sbcl).override { asdf = asdf_3_1; })); + quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix { + inherit clwrapper; + }; + quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp); + quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl); + quicklispPackages = quicklispPackagesSBCL; + quicklispPackages_asdf_3_1 = quicklispPackagesFor + ((wrapLisp sbcl).override { asdf = asdf_3_1; }); ### DEVELOPMENT / PERL MODULES @@ -10326,9 +10887,9 @@ with pkgs; python34Packages = python34.pkgs; - python35Packages = recurseIntoAttrs python35.pkgs; + python35Packages = python35.pkgs; - python36Packages = python36.pkgs; + python36Packages = recurseIntoAttrs python36.pkgs; pypyPackages = pypy.pkgs; @@ -10354,6 +10915,15 @@ with pkgs; packages = []; }; + rstudioWrapper = callPackage ../development/r-modules/wrapper-rstudio.nix { + recommendedPackages = with rPackages; [ + boot class cluster codetools foreign KernSmooth lattice MASS + Matrix mgcv nlme nnet rpart spatial survival + ]; + # Override this attribute to register additional libraries. + packages = []; + }; + rPackages = callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (p: {})) pkgs; }; @@ -10437,17 +11007,27 @@ with pkgs; bosun = callPackage ../servers/monitoring/bosun { }; scollector = bosun; + cayley = callPackage ../servers/cayley { }; + charybdis = callPackage ../servers/irc/charybdis {}; + clickhouse = callPackage ../servers/clickhouse { }; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; - erlang = erlangR16; + erlang = erlangR17; + }; + + couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { + spidermonkey = spidermonkey_1_8_5; }; couchpotato = callPackage ../servers/couchpotato {}; + dex-oidc = callPackage ../servers/dex { }; + dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { @@ -10460,6 +11040,10 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; + dkimproxy = callPackage ../servers/mail/dkimproxy { + inherit (perlPackages) Error MailDKIM MIMEtools NetServer; + }; + dnschain = callPackage ../servers/dnschain { }; dovecot = callPackage ../servers/mail/dovecot { }; @@ -10474,6 +11058,8 @@ with pkgs; ejabberd = callPackage ../servers/xmpp/ejabberd { }; + exhibitor = callPackage ../servers/exhibitor { }; + prosody = callPackage ../servers/xmpp/prosody { lua5 = lua5_1; inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; @@ -10593,9 +11179,13 @@ with pkgs; myserver = callPackage ../servers/http/myserver { }; + nas = callPackage ../servers/nas { }; + neard = callPackage ../servers/neard { }; - nginx = callPackage ../servers/http/nginx/stable.nix { + nginx = nginxStable; + + nginxStable = callPackage ../servers/http/nginx/stable.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; @@ -10611,6 +11201,11 @@ with pkgs; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; + # We should move to dynmaic modules and create a nginxFull package with all modules + nginxShibboleth = callPackage ../servers/http/nginx/stable.nix { + modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; + }; + ngircd = callPackage ../servers/irc/ngircd { }; nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; @@ -10699,7 +11294,12 @@ with pkgs; mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; - riak = callPackage ../servers/nosql/riak/2.2.0.nix { }; + percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; + percona-server = percona-server56; + + riak = callPackage ../servers/nosql/riak/2.2.0.nix { + erlang = erlang_basho_R16B02; + }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -10737,7 +11337,11 @@ with pkgs; neo4j = callPackage ../servers/nosql/neo4j { }; - net_snmp = callPackage ../servers/monitoring/net-snmp { }; + net_snmp = callPackage ../servers/monitoring/net-snmp { + # https://sourceforge.net/p/net-snmp/bugs/2712/ + # remove after net-snmp > 5.7.3 + perl = perl522; + }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -10792,6 +11396,8 @@ 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 { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; @@ -10801,6 +11407,7 @@ with pkgs; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; + prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; @@ -10831,6 +11438,8 @@ with pkgs; redstore = callPackage ../servers/http/redstore { }; + restic = callPackage ../tools/backup/restic { }; + restund = callPackage ../servers/restund {}; rethinkdb = callPackage ../servers/nosql/rethinkdb { @@ -10914,6 +11523,8 @@ with pkgs; sipwitch = callPackage ../servers/sip/sipwitch { }; + slimserver = callPackage ../servers/slimserver { }; + smcroute = callPackage ../servers/smcroute { }; spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; @@ -10927,9 +11538,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 { }; @@ -10951,6 +11564,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 { }; @@ -11000,7 +11615,9 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { erlang = erlangR17; }; + yaws = callPackage ../servers/http/yaws { + erlang = erlangR18; + }; zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); @@ -11058,6 +11675,10 @@ with pkgs; b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; + bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { }; + + broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { }; + batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; blktrace = callPackage ../os-specific/linux/blktrace { }; @@ -11087,9 +11708,7 @@ with pkgs; cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - gcc = gcc6; # needs gcc 6.0 and above - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not @@ -11110,20 +11729,15 @@ with pkgs; crda = callPackage ../os-specific/linux/crda { }; darwin = let - cmdline = callPackage ../os-specific/darwin/command-line-tools {}; apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; in apple-source-releases // rec { - cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross { - cross = assert targetPlatform != buildPlatform; targetPlatform; + cctools = callPackage ../os-specific/darwin/cctools/port.nix { + inherit libobjc; + stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv; inherit maloader; xctoolchain = xcode.toolchain; }; - cctools = (callPackage ../os-specific/darwin/cctools/port.nix { - inherit libobjc; - stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv; - }).native; - cf-private = callPackage ../os-specific/darwin/cf-private { inherit (apple-source-releases) CF; inherit osx_private_sdk; @@ -11143,7 +11757,6 @@ with pkgs; xcode = callPackage ../os-specific/darwin/xcode {}; - osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {}; security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool { @@ -11152,9 +11765,6 @@ with pkgs; binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; }; - cmdline_sdk = cmdline.sdk; - cmdline_tools = cmdline.tools; - apple_sdk = callPackage ../os-specific/darwin/apple-sdk {}; libobjc = apple-source-releases.objc4; @@ -11170,6 +11780,10 @@ with pkgs; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; + displaylink = callPackage ../os-specific/linux/displaylink { + inherit (linuxPackages) evdi; + }; + dmidecode = callPackage ../os-specific/linux/dmidecode { }; dmtcp = callPackage ../os-specific/linux/dmtcp { }; @@ -11304,12 +11918,16 @@ 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 { }; iw = callPackage ../os-specific/linux/iw { }; + iwd = callPackage ../os-specific/linux/iwd { }; + jfbview = callPackage ../os-specific/linux/jfbview { }; jfbpdf = callPackage ../os-specific/linux/jfbview { imageSupport = false; @@ -11335,6 +11953,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 { }; @@ -11357,25 +11977,30 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; - linuxHeaders = linuxHeaders_4_4; - - linuxHeaders24Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/2.4.nix { - cross = assert targetPlatform != buildPlatform; targetPlatform; + linuxHeaders_2_4 = callPackage ../os-specific/linux/kernel-headers/2.4.nix { + cross = if targetPlatform != hostPlatform then targetPlatform else null; }; - linuxHeaders26Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/4.4.nix { - cross = assert targetPlatform != buildPlatform; targetPlatform; + linuxHeaders_2_6 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { + cross = if targetPlatform != hostPlatform then targetPlatform else null; }; - linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; + linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { + cross = if targetPlatform != hostPlatform then targetPlatform else null; + }; # We can choose: - linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross - else if ver == "2.6" then linuxHeaders26Cross - else throw "Unknown linux kernel version"; - - linuxHeadersCross = assert targetPlatform != buildPlatform; - linuxHeadersCrossChooser targetPlatform.platform.kernelMajor; + linuxHeaders = + if targetPlatform != hostPlatform + then + { # switch + "2.4" = linuxHeaders_2_4; + "2.6" = linuxHeaders_2_6; + "4.4" = linuxHeaders_4_4; + }.${targetPlatform.platform.kernelMajor} + or (throw "Unknown linux kernel version") + else + linuxHeaders_4_4; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -11383,10 +12008,23 @@ 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 - kernelPatches.packet_fix_race_condition_CVE_2016_8655 + kernelPatches.p9_fixes kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11399,13 +12037,13 @@ with pkgs; linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper - DCCP_double_free_vulnerability_CVE-2017-6074 ]; }; linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + p9_fixes lguest_entry-linkage packet_fix_race_condition_CVE_2016_8655 DCCP_double_free_vulnerability_CVE-2017-6074 @@ -11417,32 +12055,10 @@ with pkgs; ]; }; - linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix { - kernelPatches = with kernelPatches; - [ bridge_stp_helper - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.4" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11455,10 +12071,8 @@ with pkgs; linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking - # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.p9_fixes + kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11468,13 +12082,13 @@ with pkgs; ]; }; - linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { + 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 - # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking - # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11487,6 +12101,7 @@ with pkgs; linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11495,15 +12110,20 @@ with pkgs; ]; }; - linux_chromiumos_3_14 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.14.nix { - kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_14 - kernelPatches.chromiumos_mfd_fix_dependency - kernelPatches.chromiumos_no_link_restrictions - kernelPatches.genksyms_fix_segfault - kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 - ]; + + 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 @@ -11525,8 +12145,6 @@ with pkgs; inherit kernel; - accelio = callPackage ../development/libraries/accelio { }; - acpi_call = callPackage ../os-specific/linux/acpi-call {}; amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; @@ -11545,12 +12163,12 @@ with pkgs; cpupower = callPackage ../os-specific/linux/cpupower { }; - displaylink = callPackage ../os-specific/linux/displaylink { }; - dpdk = callPackage ../os-specific/linux/dpdk { }; exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + evdi = callPackage ../os-specific/linux/evdi { }; + pktgen = callPackage ../os-specific/linux/pktgen { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -11583,6 +12201,8 @@ with pkgs; nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11 = nvidiaPackages.stable; + ply = callPackage ../os-specific/linux/ply { }; + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; @@ -11660,18 +12280,17 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_10; + 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_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12); - linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); + 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. @@ -11686,41 +12305,31 @@ with pkgs; # Build a kernel for Xen dom0 linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); + # Hardened linux + 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; + }; + }; + + linuxPackages_hardened = + recurseIntoAttrs (linuxPackagesFor linux_hardened); + # Grsecurity packages - linux_grsec_nixos = callPackage ../build-support/grsecurity { - inherit (lib) overrideDerivation; - kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { - kernelPatches = with self.kernelPatches; [ - bridge_stp_helper - modinst_arg_list_too_long - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - grsecPatch = self.kernelPatches.grsecurity_testing; - kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ]; - extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { }; - }; + linux_grsec_nixos = kernelPatches.grsecurity_testing; linuxPackages_grsec_nixos = recurseIntoAttrs (linuxPackagesFor linux_grsec_nixos); - # An unsupported grsec xen guest kernel - linux_grsec_server_xen = linux_grsec_nixos.override { - extraConfig = '' - GRKERNSEC_CONFIG_AUTO y - GRKERNSEC_CONFIG_PRIORITY_SECURITY y - GRKERNSEC_CONFIG_SERVER y - GRKERNSEC_CONFIG_VIRT_GUEST y - GRKERNSEC_CONFIG_VIRT_XEN y - ''; - }; + 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_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14); linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18); linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest); @@ -11843,6 +12452,8 @@ with pkgs; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; + odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; + pagemon = callPackage ../os-specific/linux/pagemon { }; pam = callPackage ../os-specific/linux/pam { }; @@ -11912,6 +12523,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; }); @@ -11933,6 +12546,8 @@ with pkgs; rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; + rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { }; + rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; @@ -12036,14 +12651,17 @@ with pkgs; inherit (callPackage ../misc/uboot {}) buildUBoot ubootTools + ubootA20OlinuxinoLime ubootBananaPi ubootBeagleboneBlack ubootJetsonTK1 + ubootOdroidXU3 ubootPcduino3Nano ubootRaspberryPi ubootRaspberryPi2 ubootRaspberryPi3_32bit ubootRaspberryPi3_64bit + ubootUtilite ubootWandboard ; @@ -12057,7 +12675,7 @@ with pkgs; uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { - linuxHeaders = linuxHeadersCross; + inherit (buildPackages) linuxHeaders; gccCross = gccCrossStageStatic; cross = assert targetPlatform != buildPlatform; targetPlatform; }); @@ -12081,6 +12699,8 @@ with pkgs; upstart = callPackage ../os-specific/linux/upstart { }; + upstart-check-config = callPackage ../os-specific/linux/upstart/check-config.nix {}; + usbutils = callPackage ../os-specific/linux/usbutils { }; usermount = callPackage ../os-specific/linux/usermount { }; @@ -12095,9 +12715,7 @@ with pkgs; systemd = null; }); - v4l_utils = callPackage ../os-specific/linux/v4l-utils { - qt5 = null; - }; + v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; vndr = callPackage ../development/tools/vndr { }; @@ -12108,7 +12726,7 @@ with pkgs; w32api = callPackage ../os-specific/windows/w32api { gccCross = gccCrossStageStatic; - binutilsCross = binutilsCross; + binutils = binutils; }; w32api_headers = w32api.override { @@ -12117,7 +12735,7 @@ with pkgs; mingw_runtime = callPackage ../os-specific/windows/mingwrt { gccCross = gccCrossMingw2; - binutilsCross = binutilsCross; + binutils = binutils; }; mingw_runtime_headers = mingw_runtime.override { @@ -12140,17 +12758,12 @@ with pkgs; }; mingw_w64 = callPackage ../os-specific/windows/mingw-w64 { - gccCross = gccCrossStageStatic; - binutilsCross = binutilsCross; + 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; @@ -12163,7 +12776,7 @@ with pkgs; wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; - wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; + wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { }; @@ -12199,6 +12812,8 @@ with pkgs; aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + babelstone-han = callPackage ../data/fonts/babelstone-han { }; + baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { }; bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; @@ -12287,6 +12902,8 @@ with pkgs; faba-mono-icons = callPackage ../data/icons/faba-mono-icons { }; + emacs-all-the-icons-fonts = callPackage ../data/fonts/emacs-all-the-icons-fonts { }; + emojione = callPackage ../data/fonts/emojione { inherit (nodePackages) svgo; inherit (pythonPackages) scfbuild; @@ -12294,11 +12911,14 @@ with pkgs; encode-sans = callPackage ../data/fonts/encode-sans { }; + envypn-font = callPackage ../data/fonts/envypn-font { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; fira-code = callPackage ../data/fonts/fira-code { }; + fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; fira-mono = callPackage ../data/fonts/fira-mono { }; @@ -12404,6 +13024,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 { }; @@ -12423,6 +13045,8 @@ with pkgs; inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji; + nullmailer = callPackage ../servers/mail/nullmailer { }; + numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; @@ -12447,6 +13071,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 {}; @@ -12484,10 +13110,12 @@ with pkgs; inherit (callPackages ../data/fonts/gdouros { }) symbola aegyptus akkadian anatolian maya unidings musica analecta; - iana_etc = callPackage ../data/misc/iana-etc { }; + iana-etc = callPackage ../data/misc/iana-etc { }; poppler_data = callPackage ../data/misc/poppler-data { }; + qgo = libsForQt5.callPackage ../games/qgo { }; + quattrocento = callPackage ../data/fonts/quattrocento {}; quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {}; @@ -12500,6 +13128,8 @@ with pkgs; raleway = callPackage ../data/fonts/raleway { }; + rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { }; + roboto = callPackage ../data/fonts/roboto { }; roboto-mono = callPackage ../data/fonts/roboto-mono { }; @@ -12523,6 +13153,11 @@ with pkgs; source-han-sans-korean = sourceHanSansPackages.korean; source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese; source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese; + sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { }; + source-han-serif-japanese = sourceHanSerifPackages.japanese; + source-han-serif-korean = sourceHanSerifPackages.korean; + source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; + source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; @@ -12544,6 +13179,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 { }; @@ -12576,11 +13213,17 @@ with pkgs; xlsx2csv = pythonPackages.xlsx2csv; + xorg-rgb = callPackage ../data/misc/xorg-rgb {}; + zeal = libsForQt5.callPackage ../data/documentation/zeal { }; ### APPLICATIONS + "2bwm" = callPackage ../applications/window-managers/2bwm { + patches = config."2bwm".patches or []; + }; + a2jmidid = callPackage ../applications/audio/a2jmidid { }; aacgain = callPackage ../applications/audio/aacgain { }; @@ -12623,7 +13266,7 @@ with pkgs; acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python35Packages) buildPythonApplication appdirs colorama dateutil - requests2 requests_toolbelt sqlalchemy fusepy; + requests requests_toolbelt sqlalchemy fusepy; }; adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; @@ -12662,11 +13305,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 {}; @@ -12683,6 +13324,8 @@ with pkgs; inherit (vamp) vampSDK; }; + inherit (python34Packages) arelle; + ario = callPackage ../applications/audio/ario { }; arora = callPackage ../applications/networking/browsers/arora { }; @@ -12708,6 +13351,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 { }; @@ -12728,6 +13373,10 @@ with pkgs; go-ethereum = self.altcoins.go-ethereum; 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; @@ -12785,6 +13434,8 @@ with pkgs; libgpod = pkgs.libgpod.override { monoSupport = true; }; }; + bashSnippets = callPackage ../applications/misc/bashSnippets { }; + batik = callPackage ../applications/graphics/batik { }; batti = callPackage ../applications/misc/batti { }; @@ -12803,6 +13454,8 @@ with pkgs; guile = guile_1_8; }; + bevelbar = callPackage ../applications/window-managers/bevelbar { }; + bibletime = callPackage ../applications/misc/bibletime { }; bitkeeper = callPackage ../applications/version-management/bitkeeper { @@ -12822,6 +13475,8 @@ with pkgs; inherit (gnome2) zenity; }; + blackbox = callPackage ../applications/version-management/blackbox { }; + bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { @@ -12935,15 +13590,20 @@ with pkgs; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (gnome3) gsettings_desktop_schemas; + inherit (xorg) libSM; enableNetworkManager = config.networking.networkmanager.enable or false; }; clfswm = callPackage ../applications/window-managers/clfswm { }; + cligh = callPackage ../development/tools/github/cligh {}; + clipgrab = callPackage ../applications/video/clipgrab { }; clipit = callPackage ../applications/misc/clipit { }; + cloud-print-connector = callPackage ../servers/cloud-print-connector { }; + cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { @@ -12971,8 +13631,6 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; - cortex = callPackage ../applications/misc/cortex { }; - csound = callPackage ../applications/audio/csound { }; cinepaint = callPackage ../applications/graphics/cinepaint { @@ -12993,18 +13651,22 @@ with pkgs; convchain = callPackage ../tools/graphics/convchain {}; + coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; csdp = callPackage ../applications/science/math/csdp { liblapack = liblapackWithoutAtlas; }; + ctop = callPackage ../tools/system/ctop { }; + cuneiform = callPackage ../tools/graphics/cuneiform {}; - cutecom = callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; cutegram = - let callpkg = libsForQt55.callPackage; + let callpkg = libsForQt56.callPackage; in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec { libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml { @@ -13076,12 +13738,21 @@ 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) { }; - docker = callPackage ../applications/virtualization/docker { }; + inherit (callPackage ../applications/virtualization/docker { }) + docker_17_06; + + docker = docker_17_06; + docker-edge = docker_17_06; + docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; @@ -13093,6 +13764,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; }; @@ -13130,7 +13805,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 { }; @@ -13144,6 +13819,8 @@ with pkgs; electrum-dash = callPackage ../applications/misc/electrum-dash { }; + electrum-ltc = callPackage ../applications/misc/electrum-ltc { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; @@ -13171,19 +13848,15 @@ with pkgs; withGTK3 = false; })); - emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs/macport-24.5.nix { + emacsMacport = emacs25Macport; + emacs25Macport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; - }); - emacs24Macport = self.emacs24Macport_24_5; + }; - emacs25Macport_25_1 = lowPrio (callPackage ../applications/editors/emacs/macport-25.1.nix { - inherit (darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit - ImageCaptureCore GSS ImageIO; - }); - emacs25Macport = self.emacs25Macport_25_1; + # for backwards compatibility + emacs25Macport_25_1 = emacs25Macport; emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -13408,6 +14081,8 @@ with pkgs; keepass = callPackage ../applications/misc/keepass { }; + keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; + keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; @@ -13420,7 +14095,7 @@ with pkgs; fbreader = callPackage ../applications/misc/fbreader { }; - fdr = qt57.callPackage ../applications/science/programming/fdr { }; + fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; fehlstart = callPackage ../applications/misc/fehlstart { }; @@ -13465,6 +14140,8 @@ with pkgs; gksu = callPackage ../applications/misc/gksu { }; + gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; + gnuradio = callPackage ../applications/misc/gnuradio { inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; fftw = fftwFloat; @@ -13485,7 +14162,7 @@ with pkgs; gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = libsForQt55.callPackage ../applications/misc/goldendict { }; + goldendict = libsForQt56.callPackage ../applications/misc/goldendict { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -13555,18 +14232,25 @@ with pkgs; filezilla = callPackage ../applications/networking/ftp/filezilla { }; - inherit (callPackages ../applications/networking/browsers/firefox { - inherit (gnome2) libIDL; - libpng = libpng_apng; - enableGTK3 = false; - python = python2; - gnused = gnused_422; - }) firefox-unwrapped firefox-esr-unwrapped; + firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { + callPackage = pkgs.newScope { + inherit (gnome2) libIDL; + libpng = libpng_apng; + python = python2; + gnused = gnused_422; + }; + }); + + firefox-unwrapped = firefoxPackages.firefox; + firefox-esr-unwrapped = firefoxPackages.firefox-esr; + tor-browser-unwrapped = firefoxPackages.tor-browser; firefox = wrapFirefox firefox-unwrapped { }; firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + channel = "release"; + generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; @@ -13580,6 +14264,7 @@ with pkgs; }; firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; @@ -13593,6 +14278,22 @@ with pkgs; desktopName = "Firefox Beta"; }; + firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + channel = "devedition"; + generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; + inherit (pkgs.gnome3) defaultIconTheme; + }; + + firefox-devedition-bin = self.wrapFirefox firefox-devedition-bin-unwrapped { + browserName = "firefox"; + nameSuffix = "-devedition"; + name = "firefox-devedition-bin-" + + (builtins.parseDrvName firefox-devedition-bin-unwrapped.name).version; + desktopName = "Firefox DevEdition"; + }; + firestr = libsForQt5.callPackage ../applications/networking/p2p/firestr { boost = boost155; }; @@ -13600,15 +14301,15 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; + debug = true; }; fluxbox = callPackage ../applications/window-managers/fluxbox { }; @@ -13633,6 +14334,8 @@ with pkgs; xfontsel = callPackage ../applications/misc/xfontsel { }; inherit (xorg) xlsfonts; + xrdp = callPackage ../applications/networking/remote/xrdp { }; + freerdp = callPackage ../applications/networking/remote/freerdp { inherit libpulseaudio; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; @@ -13646,10 +14349,6 @@ with pkgs; ffmpeg = ffmpeg_1; }; - freicoin = callPackage ../applications/misc/freicoin { - boost = boost155; - }; - fte = callPackage ../applications/editors/fte { }; game-music-emu = callPackage ../applications/audio/game-music-emu { }; @@ -13662,6 +14361,8 @@ with pkgs; getxbook = callPackage ../applications/misc/getxbook {}; + ghq = gitAndTools.ghq; + gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome2) libart_lgpl; webkit = null; @@ -13726,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; @@ -13740,7 +14441,7 @@ with pkgs; libart = pkgs.gnome2.libart_lgpl; }; - idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; }); + jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -13813,6 +14514,8 @@ with pkgs; gmpc = callPackage ../applications/audio/gmpc {}; + gmtp = callPackage ../applications/misc/gmtp {}; + gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; @@ -13825,13 +14528,19 @@ with pkgs; googleearth = callPackage_i686 ../applications/misc/googleearth { }; + google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { + inherit (gnome2) GConf; + }; + google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { libpng = libpng12; }; gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; + gpsbabel = libsForQt56.callPackage ../applications/misc/gpsbabel { + inherit (darwin) IOKit; + }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -13889,15 +14598,16 @@ with pkgs; hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; + hledger = haskell.lib.justStaticExecutables haskellPackages.hledger; + hledger-web = haskell.lib.justStaticExecutables haskellPackages.hledger-web; + homebank = callPackage ../applications/office/homebank { gtk = gtk3; }; ht = callPackage ../applications/editors/ht { }; - htmldoc = callPackage ../applications/misc/htmldoc { - fltk = fltk13; - }; + hue-cli = callPackage ../tools/networking/hue-cli { }; hugin = callPackage ../applications/graphics/hugin { }; @@ -13946,6 +14656,8 @@ with pkgs; i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled/default.nix { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; @@ -13972,6 +14684,8 @@ with pkgs; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; + imagej = callPackage ../applications/graphics/imagej { }; + imagemagick_light = imagemagick.override { bzip2 = null; zlib = null; @@ -14039,7 +14753,7 @@ with pkgs; lcms = lcms2; }; - inspectrum = callPackage ../applications/misc/inspectrum { }; + inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -14098,7 +14812,7 @@ with pkgs; jbrout = callPackage ../applications/graphics/jbrout { }; jumanji = callPackage ../applications/networking/browsers/jumanji { - webkitgtk = webkitgtk24x; + webkitgtk = webkitgtk24x-gtk3; gtk = gtk3; }; @@ -14109,9 +14823,7 @@ with pkgs; boost = boost155; }; - k3b-original = lowPrio (kde4.callPackage ../applications/misc/k3b { }); - - k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { }; + k3b = kdeApplications.k3b; k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; @@ -14126,16 +14838,17 @@ with pkgs; mkApplications = import ../applications/kde; attrs = { inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; - inherit kdeDerivation plasma5; + inherit plasma5; inherit attica phonon; }; in recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi ark dolphin ffmpegthumbs filelight gwenview kate - kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole marble - okteta okular spectacle; + akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive + kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmix + kolourpaint kompare konsole krfb kwalletmanager marble okteta okular + spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; @@ -14186,14 +14899,15 @@ with pkgs; kmplayer = kde4.callPackage ../applications/video/kmplayer { }; + kodestudio = callPackage ../applications/editors/kodestudio { }; + konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; krita = libsForQt5.callPackage ../applications/graphics/krita { - vc = vc_0_7; openjpeg = openjpeg_1; }; - krusader = kde4.callPackage ../applications/misc/krusader { }; + krusader = libsForQt5.callPackage ../applications/misc/krusader { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; @@ -14321,13 +15035,11 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; - luminanceHDR = libsForQt55.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { - ffmpeg = ffmpeg_2; - }; + handbrake = callPackage ../applications/video/handbrake { }; lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome2) vte; @@ -14365,6 +15077,7 @@ with pkgs; makeself = callPackage ../applications/misc/makeself { }; marathon = callPackage ../applications/networking/cluster/marathon { }; + marathonctl = callPackage ../tools/virtualization/marathonctl { } ; marp = callPackage ../applications/office/marp { }; @@ -14424,6 +15137,8 @@ with pkgs; mimms = callPackage ../applications/audio/mimms {}; + meh = callPackage ../applications/graphics/meh {}; + mirage = callPackage ../applications/graphics/mirage { }; mixxx = callPackage ../applications/audio/mixxx { @@ -14432,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 { }; @@ -14470,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 { }; @@ -14484,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 {}; @@ -14510,6 +15229,8 @@ with pkgs; clerk = callPackage ../applications/audio/clerk { }; + nbstripout = callPackage ../applications/version-management/nbstripout { }; + ncmpc = callPackage ../applications/audio/ncmpc { }; ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; @@ -14537,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; }; @@ -14562,12 +15279,23 @@ with pkgs; avahi = avahi.override { withLibdnssdCompat = true; }; - qt5 = qt55; # Mumble doesn't work with newer Qt versions. + qt5 = qt56; # Mumble doesn't work with Qt > 5.5 jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - }) mumble mumble_git murmur murmur_git; + }) mumble mumble_git murmur; + + inherit (callPackages ../applications/networking/mumble { + avahi = avahi.override { + withLibdnssdCompat = true; + }; + qt5 = qt56; # Mumble doesn't work with Qt > 5.5 + jackSupport = config.mumble.jackSupport or false; + speechdSupport = config.mumble.speechdSupport or false; + pulseSupport = config.pulseaudio or false; + iceSupport = false; + }) murmur_git; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_i686 = if system == "x86_64-linux" @@ -14579,7 +15307,7 @@ with pkgs; if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt55.callPackage ../applications/audio/musescore { }; + libsForQt5.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { @@ -14600,6 +15328,8 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus {}; + osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; + ostinato = callPackage ../applications/networking/ostinato { }; panamax_api = callPackage ../applications/networking/cluster/panamax/api { @@ -14617,6 +15347,8 @@ with pkgs; pig = callPackage ../applications/networking/cluster/pig { }; + pijul = callPackage ../applications/version-management/pijul {}; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { @@ -14625,13 +15357,15 @@ with pkgs; polybar = callPackage ../applications/misc/polybar { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; + scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt55.callPackage ../applications/video/smtube {}; + smtube = libsForQt56.callPackage ../applications/video/smtube {}; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; @@ -14650,6 +15384,8 @@ with pkgs; inherit (gnome3) defaultIconTheme; }; + typora = callPackage ../applications/editors/typora { }; + librep = callPackage ../development/libraries/librep { }; rep-gtk = callPackage ../development/libraries/rep-gtk { }; @@ -14704,9 +15440,9 @@ with pkgs; nedit = callPackage ../applications/editors/nedit { }; - notepadqq = callPackage ../applications/editors/notepadqq { - qtbase = qt55; - }; + nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; + + notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; @@ -14753,13 +15489,11 @@ with pkgs; omxplayer = callPackage ../applications/video/omxplayer { }; - oneteam = callPackage ../applications/networking/instant-messengers/oneteam { }; - openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { }; - openbrf = callPackage ../applications/misc/openbrf { }; + openbrf = libsForQt5.callPackage ../applications/misc/openbrf { }; opencpn = callPackage ../applications/misc/opencpn { }; @@ -14785,7 +15519,12 @@ with pkgs; osmo = callPackage ../applications/office/osmo { }; - palemoon = callPackage ../applications/networking/browsers/palemoon { }; + osquery = callPackage ../tools/system/osquery { }; + + palemoon = callPackage ../applications/networking/browsers/palemoon { + # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 + stdenv = overrideCC stdenv gcc49; + }; pamix = callPackage ../applications/audio/pamix { }; @@ -14842,6 +15581,8 @@ with pkgs; phrasendrescher = callPackage ../tools/security/phrasendrescher { }; + phraseapp-client = callPackage ../tools/misc/phraseapp-client { }; + phwmon = callPackage ../applications/misc/phwmon { }; pianobar = callPackage ../applications/audio/pianobar { }; @@ -14870,6 +15611,8 @@ with pkgs; pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; + pidgin-carbons = callPackage ../applications/networking/instant-messengers/pidgin-plugins/carbons { }; + pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; @@ -14948,15 +15691,20 @@ with pkgs; profanity = callPackage ../applications/networking/instant-messengers/profanity { notifySupport = config.profanity.notifySupport or true; + traySupport = config.profanity.traySupport or true; autoAwaySupport = config.profanity.autoAwaySupport or true; }; psi = kde4.callPackage ../applications/networking/instant-messengers/psi { }; + psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; + psol = callPackage ../development/libraries/psol/default.nix { }; pstree = callPackage ../applications/misc/pstree { }; + ptask = callPackage ../applications/misc/ptask { }; + pulseview = callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; @@ -14987,10 +15735,12 @@ with pkgs; qgis = callPackage ../applications/gis/qgis {}; - qgroundcontrol = libsForQt55.callPackage ../applications/science/robotics/qgroundcontrol { }; + qgroundcontrol = libsForQt56.callPackage ../applications/science/robotics/qgroundcontrol { }; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qmetro = callPackage ../applications/misc/qmetro { }; + qmidinet = callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; @@ -15007,9 +15757,11 @@ with pkgs; qt = qt4; }; - # 0.5.7 segfaults when opening the main panel with qt 5.7 + # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { }; + qstopmotion = callPackage ../applications/video/qstopmotion { }; + qsynth = callPackage ../applications/audio/qsynth { }; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; @@ -15060,7 +15812,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; }; @@ -15078,7 +15830,7 @@ with pkgs; demo = false; }; - rapcad = libsForQt55.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -15120,7 +15872,7 @@ with pkgs; retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); - ricochet = libsForQt55.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -15132,7 +15884,7 @@ with pkgs; rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; - rstudio = callPackage ../applications/editors/rstudio { }; + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { }; rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); @@ -15226,6 +15978,8 @@ with pkgs; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; + skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; + skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; @@ -15240,6 +15994,8 @@ with pkgs; sooperlooper = callPackage ../applications/audio/sooperlooper { }; + sops = callPackage ../tools/security/sops { }; + sorcer = callPackage ../applications/audio/sorcer { }; sound-juicer = callPackage ../applications/audio/sound-juicer { }; @@ -15267,6 +16023,7 @@ with pkgs; st = callPackage ../applications/misc/st { conf = config.st.conf or null; patches = config.st.patches or null; + extraLibs = config.st.extraLibs or []; }; st-wayland = callPackage ../applications/misc/st/wayland.nix { @@ -15274,6 +16031,8 @@ with pkgs; patches = config.st.patches or null; }; + xst = callPackage ../applications/misc/st/xst.nix { }; + stag = callPackage ../applications/misc/stag { curses = ncurses; }; @@ -15296,6 +16055,8 @@ with pkgs; sxiv = callPackage ../applications/graphics/sxiv { }; + resilio-sync = callPackage ../applications/networking/resilio-sync { }; + bittorrentSync = bittorrentSync14; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; @@ -15333,9 +16094,7 @@ with pkgs; printrun = callPackage ../applications/misc/printrun { }; - sddm = libsForQt5.callPackage ../applications/display-managers/sddm { - themes = []; # extra themes, etc. - }; + sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -15397,6 +16156,8 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; + inherit (ocamlPackages_4_03) stog; + stp = callPackage ../applications/science/logic/stp {}; stumpwm = callPackage ../applications/window-managers/stumpwm { @@ -15433,9 +16194,7 @@ with pkgs; subunit = callPackage ../development/libraries/subunit { }; - surf = callPackage ../applications/networking/browsers/surf { - webkit = webkitgtk2; - }; + surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; @@ -15474,14 +16233,10 @@ with pkgs; gconf = gnome2.GConf; }; - teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt56.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { }; - - taskjuggler = callPackage ../applications/misc/taskjuggler/3.x { - ruby = ruby_2_0; - }; + taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; }; tasknc = callPackage ../applications/misc/tasknc { }; @@ -15491,8 +16246,9 @@ with pkgs; taskserver = callPackage ../servers/misc/taskserver { }; - tdesktop = qt56.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { inherit (pythonPackages) gyp; + gcc = gcc6; }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; @@ -15505,36 +16261,47 @@ with pkgs; telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; - telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { }; - telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + termdown = (newScope pythonPackages) ../applications/misc/termdown { }; + terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; terminator = callPackage ../applications/misc/terminator { vte = gnome2.vte.override { pythonSupport = true; }; }; + deepin-terminal = callPackage ../applications/misc/deepin-terminal { + vte = gnome3.vte; + wnck = libwnck3; + gee = libgee_0_8; + }; + termite = callPackage ../applications/misc/termite { vte = gnome3.vte-ng; }; tesseract = callPackage ../applications/graphics/tesseract { }; + tesseract_4 = lowPrio (callPackage ../applications/graphics/tesseract/4.x.nix { }); tetraproc = callPackage ../applications/audio/tetraproc { }; 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; + enableGTK3 = true; }; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; + inherit (pkgs.gnome3) defaultIconTheme; }; tig = gitAndTools.tig; @@ -15584,6 +16351,8 @@ with pkgs; tortoisehg = callPackage ../applications/version-management/tortoisehg { }; + toot = callPackage ../applications/misc/toot { }; + toxic = callPackage ../applications/networking/instant-messengers/toxic { }; transcode = callPackage ../applications/audio/transcode { }; @@ -15602,12 +16371,13 @@ with pkgs; tree = callPackage ../tools/system/tree {}; + treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; }; + trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; tribler = callPackage ../applications/networking/p2p/tribler { }; - # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build - trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { }; tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; @@ -15638,7 +16408,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 { }; @@ -15655,6 +16425,10 @@ with pkgs; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; + verbiste = callPackage ../applications/misc/verbiste { + inherit (gnome2) libgnomeui; + }; + vim = callPackage ../applications/editors/vim { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -15679,6 +16453,8 @@ with pkgs; flags = [ "python" "X11" ]; # only flag "X11" by now }); + xxd = callPackage ../tools/misc/xxd { }; + vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); qpdfview = callPackage ../applications/misc/qpdfview {}; @@ -15707,9 +16483,7 @@ with pkgs; inherit (lua52Packages) lpeg; }; - virt-viewer = callPackage ../applications/virtualization/virt-viewer { - spice_gtk = spice_gtk; - }; + virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; virt-top = callPackage ../applications/virtualization/virt-top { ocamlPackages = ocamlPackages_4_01_0; @@ -15793,6 +16567,8 @@ with pkgs; vnstat = callPackage ../applications/networking/vnstat { }; + vogl = qt56.callPackage ../development/tools/vogl { }; + volnoti = callPackage ../applications/misc/volnoti { }; vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; @@ -15826,9 +16602,18 @@ with pkgs; imlib2 = imlib2-nox; }; + watson = callPackage ../applications/office/watson { + pythonPackages = python3Packages; + }; + + way-cooler = callPackage ../applications/window-managers/way-cooler {}; + + wayv = callPackage ../tools/X11/wayv {}; + weechat = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; + guile = guile_2_0; }; westonLite = callPackage ../applications/window-managers/weston { @@ -15851,20 +16636,24 @@ with pkgs; wily = callPackage ../applications/editors/wily { }; + winswitch = callPackage ../tools/X11/winswitch { }; + + wings = callPackage ../applications/graphics/wings { + erlang = erlangR18; + }; + + wireguard = callPackage ../os-specific/linux/wireguard { }; + alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; + wllvm = callPackage ../development/tools/wllvm { }; + wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { }; wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; - winswitch = callPackage ../tools/X11/winswitch { }; - - wings = callPackage ../applications/graphics/wings { }; - - wireguard = callPackage ../os-specific/linux/wireguard { }; - wmname = callPackage ../applications/misc/wmname { }; wmctrl = callPackage ../tools/X11/wmctrl { }; @@ -15880,6 +16669,8 @@ with pkgs; inherit (python27Packages) cheetah; }; + worldengine-cli = python3Packages.worldengine; + wpsoffice = callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -15898,6 +16689,7 @@ with pkgs; ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury ++ optional (cfg.enableDesmume or false) desmume + ++ optional (cfg.enableDolphin or false) dolphin ++ optional (cfg.enableFBA or false) fba ++ optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableGambatte or false) gambatte @@ -15906,6 +16698,7 @@ with pkgs; ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia + ++ optional (cfg.enableParallelN64 or false) parallel-n64 ++ optional (cfg.enablePicodrive or false) picodrive ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enablePPSSPP or false) ppsspp @@ -15937,18 +16730,25 @@ with pkgs; plugins = let inherit (lib) optional optionals; in with kodiPlugins; ([] ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher + ++ optional (config.kodi.enableAdvancedEmulatorLauncher or false) + advanced-emulator-launcher ++ optionals (config.kodi.enableControllers or false) (with controllers; [ default dreamcast gba genesis mouse n64 nes ps snes ]) ++ optional (config.kodi.enableExodus or false) exodus ++ optionals (config.kodi.enableHyperLauncher or false) (with hyper-launcher; [ plugin service pdfreader ]) + ++ optional (config.kodi.enableJoystick or false) joystick ++ optional (config.kodi.enableSVTPlay or false) svtplay + ++ optional (config.kodi.enableSteamController or false) steam-controller ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts + ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun ); }; + wtftw = callPackage ../applications/window-managers/wtftw {}; + wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; wxcam = callPackage ../applications/video/wxcam { @@ -15965,12 +16765,21 @@ with pkgs; x42-plugins = callPackage ../applications/audio/x42-plugins { }; + xannotate = callPackage ../tools/X11/xannotate {}; + xaos = callPackage ../applications/graphics/xaos { libpng = libpng12; }; xara = callPackage ../applications/graphics/xara { }; + xastir = callPackage ../applications/misc/xastir { + rastermagick = imagemagick; + inherit (xorg) libXt; + }; + + xautomation = callPackage ../tools/X11/xautomation { }; + xawtv = callPackage ../applications/video/xawtv { }; xbindkeys = callPackage ../tools/X11/xbindkeys { }; @@ -15984,9 +16793,7 @@ with pkgs; }; xbmcPlain = kodiPlain; - kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { - kodi = kodiPlain; - }); + kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); xbmcPlugins = kodiPlugins; kodi = wrapKodi { @@ -16001,7 +16808,7 @@ with pkgs; xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # v1.3.2 segfaults with qt 5.7 - xca = libsForQt56.callPackage ../applications/misc/xca { }; + xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -16034,6 +16841,11 @@ 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 { }; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; @@ -16067,7 +16879,7 @@ with pkgs; gconf = gnome2.GConf; inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper; python = python27; - webkitgtk = webkitgtk2; + webkitgtk = webkitgtk24x-gtk2; }; xournal = callPackage ../applications/graphics/xournal { @@ -16178,8 +16990,6 @@ with pkgs; inherit (gnome3) yelp; - ykpers = callPackage ../applications/misc/ykpers {}; - yoshimi = callPackage ../applications/audio/yoshimi { }; inherit (python3Packages) you-get; @@ -16211,6 +17021,8 @@ with pkgs; zim = callPackage ../applications/office/zim { }; + zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { }; + zotero = callPackage ../applications/office/zotero { firefox = firefox-esr-unwrapped; }; @@ -16267,6 +17079,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 { @@ -16333,6 +17147,8 @@ with pkgs; boost = boost160; }; + displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; + drumkv1 = callPackage ../applications/audio/drumkv1 { }; duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; @@ -16367,6 +17183,8 @@ with pkgs; factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; + factorio-mods = callPackage ../games/factorio/mods.nix { }; factorio-utils = callPackage ../games/factorio/utils.nix { }; @@ -16400,10 +17218,14 @@ with pkgs; wxGTK = wxGTK28.override { unicode = false; }; }; + galaxis = callPackage ../games/galaxis { }; + gambatte = callPackage ../games/gambatte { }; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; + gargoyle = callPackage ../games/gargoyle { }; + gav = callPackage ../games/gav { }; gcs = callPackage ../games/gcs { }; @@ -16457,6 +17279,8 @@ with pkgs; lua = lua5; }; + instead-launcher = callPackage ../games/instead-launcher { }; + ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; klavaro = callPackage ../games/klavaro {}; @@ -16590,6 +17414,8 @@ with pkgs; quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { }; + quakespasm = callPackage ../games/quakespasm { }; + ioquake3 = callPackage ../games/quake3/ioquake { }; quantumminigolf = callPackage ../games/quantumminigolf {}; @@ -16613,6 +17439,8 @@ with pkgs; rogue = callPackage ../games/rogue { }; + robotfindskitten = callPackage ../games/robotfindskitten { }; + saga = callPackage ../applications/gis/saga { }; samplv1 = callPackage ../applications/audio/samplv1 { }; @@ -16738,7 +17566,15 @@ with pkgs; ultimatestunts = callPackage ../games/ultimatestunts { }; - ultrastardx = callPackage ../games/ultrastardx { + ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { }; + + ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; + + ultrastardx = callPackage ../games/ultrastardx/1.1.nix { + ffmpeg = ffmpeg_0; + lua = lua5; + }; + ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix { ffmpeg = ffmpeg_0; lua = lua5; }; @@ -16773,6 +17609,8 @@ with pkgs; vessel = callPackage_i686 ../games/vessel { }; + vms-empire = callPackage ../games/vms-empire { }; + voxelands = callPackage ../games/voxelands { libpng = libpng12; }; @@ -16879,6 +17717,12 @@ 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 { }; kakasi = callPackage ../tools/text/kakasi { }; @@ -16923,12 +17767,16 @@ with pkgs; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; + latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; + orion = callPackage ../misc/themes/orion {}; albatross = callPackage ../misc/themes/albatross { }; 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; @@ -16952,7 +17800,7 @@ with pkgs; let mkPlasma5 = import ../desktops/plasma-5; attrs = { - inherit libsForQt5 kdeDerivation lib fetchurl; + inherit libsForQt5 lib fetchurl; inherit (gnome3) gconf; }; in @@ -16985,6 +17833,8 @@ with pkgs; alliance = callPackage ../applications/science/electronics/alliance { }; + ants = callPackage ../applications/science/biology/ants { }; + archimedes = callPackage ../applications/science/electronics/archimedes { stdenv = overrideCC stdenv gcc49; }; @@ -16993,6 +17843,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + diamond = callPackage ../applications/science/biology/diamond { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -17001,6 +17853,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; }; @@ -17009,6 +17865,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 { }; @@ -17147,6 +18005,10 @@ with pkgs; cmake = cmakeCurses; }); + ### SCIENCE/MEDICINE + + aliza = callPackage ../applications/science/medicine/aliza { }; + ### PHYSICS sacrifice = callPackage ../applications/science/physics/sacrifice {}; @@ -17165,6 +18027,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; }; @@ -17179,23 +18045,13 @@ with pkgs; camlp5 = ocamlPackages_3_12_1.camlp5_transitional; lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; }; - coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { - inherit (ocamlPackages_4_02) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; - }; - coq_8_5 = callPackage ../applications/science/logic/coq { - version = "8.5pl3"; - }; - coq_8_6 = callPackage ../applications/science/logic/coq {}; - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { - inherit (ocamlPackages) ocaml findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; - coq = coq_8_6; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { inherit callPackage; - coq = coq_8_4; + coq = callPackage ../applications/science/logic/coq/8.4.nix { + inherit (ocamlPackages_4_02) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_02.camlp5_transitional; + }; coqPackages = coqPackages_8_4; contribs = @@ -17227,42 +18083,61 @@ with pkgs; mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { inherit callPackage; - coq = coq_8_5; + coq = callPackage ../applications/science/logic/coq { + version = "8.5pl3"; + }; 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 {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; }; mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec { inherit callPackage; - coq = coq_8_6; + 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 {}; }; coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; - coqPackages = coqPackages_8_4; + coqPackages = coqPackages_8_6; + + coq_8_4 = coqPackages_8_4.coq; + coq_8_5 = coqPackages_8_5.coq; + coq_8_6 = coqPackages_8_6.coq; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; + coq = coqPackages.coq; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; + cubicle = callPackage ../applications/science/logic/cubicle { }; + cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); }; @@ -17321,6 +18196,7 @@ with pkgs; mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; minisat = callPackage ../applications/science/logic/minisat {}; + minisatUnstable = callPackage ../applications/science/logic/minisat/unstable.nix {}; opensmt = callPackage ../applications/science/logic/opensmt { }; @@ -17330,6 +18206,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; @@ -17370,11 +18248,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 @@ -17382,7 +18256,9 @@ with pkgs; caneda = callPackage ../applications/science/electronics/caneda { }; - geda = callPackage ../applications/science/electronics/geda { }; + geda = callPackage ../applications/science/electronics/geda { + guile = guile_2_0; + }; gerbv = callPackage ../applications/science/electronics/gerbv { }; @@ -17495,12 +18371,13 @@ with pkgs; gravit = callPackage ../applications/science/astronomy/gravit { }; - golly = callPackage ../applications/science/misc/golly { }; + golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; }; + golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; }; megam = callPackage ../applications/science/misc/megam { }; root = callPackage ../applications/science/misc/root { - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; simgrid = callPackage ../applications/science/misc/simgrid { }; @@ -17547,6 +18424,8 @@ with pkgs; motif = null; # motif or lesstif }; + cernlib = callPackage ../development/libraries/physics/cernlib { }; + g4py = callPackage ../development/libraries/physics/geant4/g4py { }; hepmc = callPackage ../development/libraries/physics/hepmc { }; @@ -17566,6 +18445,9 @@ with pkgs; thepeg = callPackage ../development/libraries/physics/thepeg { }; yoda = callPackage ../development/libraries/physics/yoda { }; + yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { + withRootSupport = true; + }); ### MISC @@ -17603,8 +18485,14 @@ with pkgs; cups-dymo = callPackage ../misc/cups/drivers/dymo {}; + cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; + crashplan = callPackage ../applications/backup/crashplan { }; + colort = callPackage ../applications/misc/colort { }; + + terminal-parrot = callPackage ../applications/misc/terminal-parrot { }; + e17gtk = callPackage ../misc/themes/e17gtk { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; @@ -17617,6 +18505,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; }; @@ -17724,6 +18615,8 @@ with pkgs; greybird = callPackage ../misc/themes/greybird { }; + guetzli = callPackage ../applications/graphics/guetzli { }; + gxemul = callPackage ../misc/emulators/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; @@ -17747,7 +18640,6 @@ with pkgs; libopus = libopus.override { withCustomModes = true; }; }; libjack2 = jack2Full.override { prefix = "lib"; }; - libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { }; keynav = callPackage ../tools/X11/keynav { }; @@ -17776,6 +18668,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + inherit (callPackages ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; @@ -17786,10 +18680,14 @@ with pkgs; nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; + nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; + + nix-index = callPackage ../tools/package-management/nix-index { }; + inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr nix-prefetch-cvs @@ -17798,6 +18696,8 @@ with pkgs; nix-prefetch-svn nix-prefetch-scripts; + nix-update-source = callPackage ../tools/package-management/nix-update-source {}; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; nix-repl = callPackage ../tools/package-management/nix-repl { }; @@ -17805,6 +18705,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 { }; @@ -17843,9 +18744,9 @@ with pkgs; pcre = pcre-cpp; }); - redis-desktop-manager = libsForQt55.callPackage ../applications/misc/redis-desktop-manager { }; + redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { }; - robomongo = libsForQt5.callPackage ../applications/misc/robomongo { }; + robomongo = callPackage ../applications/misc/robomongo { }; rucksack = callPackage ../development/tools/rucksack { }; @@ -17925,6 +18826,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 { }; @@ -17972,10 +18876,27 @@ with pkgs; sqsh = callPackage ../development/tools/sqsh { }; - terraform = callPackage ../applications/networking/cluster/terraform {}; + inherit (callPackage ../applications/networking/cluster/terraform {}) + terraform_0_8_5 + terraform_0_8_8 + terraform_0_9_11; + + terraform_0_8 = terraform_0_8_8; + terraform_0_9 = terraform_0_9_11; + terraform = terraform_0_9; + + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; + terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { + terraform = terraform_0_8; + }; + + terragrunt_0_9_8 = callPackage ../applications/networking/cluster/terragrunt/0.9.8.nix { + terraform = terraform_0_8_5; + }; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tewi-font = callPackage ../data/fonts/tewi {}; @@ -18035,12 +18956,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 { }; @@ -18059,48 +18980,59 @@ with pkgs; pythonPackages = python3Packages; }; - wineMinimal = callPackage ../misc/emulators/wine { - wineRelease = config.wine.release or "stable"; - wineBuild = config.wine.build or "wine32"; + winePackages = rec { + minimal = callPackage ../misc/emulators/wine { + wineRelease = config.wine.release or "stable"; + wineBuild = config.wine.build or "wine32"; + }; + + base = minimal.override { + pngSupport = true; + jpegSupport = true; + tiffSupport = true; + gettextSupport = true; + fontconfigSupport = true; + alsaSupport = true; + openglSupport = true; + tlsSupport = true; + cupsSupport = true; + dbusSupport = true; + cairoSupport = true; + cursesSupport = true; + saneSupport = true; + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + udevSupport = true; + xineramaSupport = true; + xmlSupport = true; + }; + + full = base.override { + gtkSupport = true; + gstreamerSupport = true; + colorManagementSupport = true; + mpg123Support = true; + openalSupport = true; + openclSupport = true; + odbcSupport = true; + netapiSupport = true; + vaSupport = true; + pcapSupport = true; + v4lSupport = true; + gsmSupport = true; + gphoto2Support = true; + ldapSupport = true; + }; + + stable = base.override { wineRelease = "stable"; }; + unstable = base.override { wineRelease = "unstable"; }; + staging = base.override { wineRelease = "staging"; }; }; - wine = lowPrio (self.wineMinimal.override { - pngSupport = true; - jpegSupport = true; - tiffSupport = true; - gettextSupport = true; - fontconfigSupport = true; - alsaSupport = true; - openglSupport = true; - tlsSupport = true; - cupsSupport = true; - colorManagementSupport = true; - dbusSupport = true; - mpg123Support = true; - openalSupport = true; - cairoSupport = true; - cursesSupport = true; - pulseaudioSupport = config.pulseaudio or stdenv.isLinux; - xineramaSupport = true; - xmlSupport = true; + + wine = winePackages.base; + + wineStaging = lowPrio (winePackages.full.override { + wineRelease = "staging"; }); - wineFull = lowPrio (self.wine.override { - gtkSupport = true; - gstreamerSupport = true; - openclSupport = true; - odbcSupport = true; - netapiSupport = true; - vaSupport = true; - pcapSupport = true; - v4lSupport = true; - saneSupport = true; - gsmSupport = true; - gphoto2Support = true; - ldapSupport = true; - pulseaudioSupport = true; - }); - wineStable = self.wine.override { wineRelease = "stable"; }; - wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; }); - wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { inherit (gnome2) zenity; @@ -18112,6 +19044,8 @@ with pkgs; wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; + wordpress = callPackage ../servers/web-apps/wordpress { }; + wraith = callPackage ../applications/networking/irc/wraith { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; @@ -18124,13 +19058,19 @@ with pkgs; wxGTK = wxGTK30; }; + x11idle = callPackage ../tools/misc/x11idle {}; + x2x = callPackage ../tools/X11/x2x { }; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { }; + xhyve = callPackage ../applications/virtualization/xhyve { + inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin) libobjc; + }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; @@ -18204,19 +19144,23 @@ with pkgs; mg = callPackage ../applications/editors/mg { }; + mpvc = callPackage ../applications/misc/mpvc { }; + aucdtect = callPackage ../tools/audio/aucdtect { }; togglesg-download = callPackage ../tools/misc/togglesg-download { }; discord = callPackage ../applications/networking/instant-messengers/discord { }; - golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; 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 {}; @@ -18232,19 +19176,39 @@ with pkgs; zuki-themes = callPackage ../misc/themes/zuki { }; - zoom-us = libsForQt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; - tora = libsForQt5.callPackage ../development/tools/tora {}; xulrunner = firefox-unwrapped; + xrq = callPackage ../applications/misc/xrq { }; + nitrokey-app = callPackage ../tools/security/nitrokey-app { }; + nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; fpm2 = callPackage ../tools/security/fpm2 { }; + tw-rs = callPackage ../misc/tw-rs { }; + simplenote = callPackage ../applications/misc/simplenote { }; hy = callPackage ../development/interpreters/hy {}; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; + + chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; + messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; + + NSPlist = callPackage ../development/libraries/NSPlist {}; + + PlistCpp = callPackage ../development/libraries/PlistCpp {}; + + xib2nib = callPackage ../development/tools/xib2nib {}; + + 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 new file mode 100644 index 000000000000..fd2a55691712 --- /dev/null +++ b/pkgs/top-level/beam-packages.nix @@ -0,0 +1,80 @@ +{ pkgs, stdenv, callPackage, wxGTK30, darwin }: + +rec { + lib = callPackage ../development/beam-modules/lib.nix {}; + + # Each + interpreters = rec { + + # 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 {}; + erlangR16_odbc = erlangR16.override { odbcSupport = true; }; + erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {}; + erlangR17_odbc = erlangR17.override { odbcSupport = true; }; + erlangR17_javac = erlangR17.override { javacSupport = true; }; + erlangR17_odbc_javac = erlangR17.override { + javacSupport = true; odbcSupport = true; + }; + erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { + wxGTK = wxGTK30; + }; + erlangR18_odbc = erlangR18.override { odbcSupport = true; }; + erlangR18_javac = erlangR18.override { javacSupport = true; }; + erlangR18_odbc_javac = erlangR18.override { + javacSupport = true; odbcSupport = true; + }; + erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { + wxGTK = wxGTK30; + }; + erlangR19_odbc = erlangR19.override { odbcSupport = true; }; + erlangR19_javac = erlangR19.override { javacSupport = true; }; + 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 { + }; + erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { + odbcSupport = true; + }; + + # 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 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 { + + # 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; + + }; +} diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 3e3ecdeea6cb..96d5e1fe2839 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -40,6 +40,7 @@ let # Rename the function arguments configExpr = config; + crossSystem0 = crossSystem; in let lib = import ../../lib; @@ -52,12 +53,15 @@ in let then configExpr { inherit pkgs; } else configExpr; - # Allow setting the platform in the config file. Otherwise, let's use a - # reasonable default. - localSystem = - { platform = (import ./platforms.nix).selectPlatformBySystem args.localSystem.system; } - // builtins.intersectAttrs { platform = null; } config - // args.localSystem; + # From a minimum of `system` or `config` (actually a target triple, *not* + # nixpkgs configuration), infer the other one and platform as needed. + localSystem = lib.systems.elaborate ( + # Allow setting the platform in the config file. This take precedence over + # the inferred platform, but not over an explicitly passed-in one. + builtins.intersectAttrs { platform = null; } config + // args.localSystem); + + crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0; # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 71f2326b9379..ac4c5eaac64c 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -46,6 +46,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; + FSharpCore = fetchNuGet { + baseName = "FSharp.Core"; + version = "4.0.0.1"; + sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn"; + outputFiles = [ "*" ]; + }; + + FSharpData225 = fetchNuGet { + baseName = "FSharp.Data"; + version = "2.2.5"; + sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724"; + outputFiles = [ "*" ]; + }; + FSharpDataSQLProvider = fetchNuGet { baseName = "SQLProvider"; version = "0.0.9-alpha"; @@ -60,6 +74,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FsCheck262 = fetchNuGet { + baseName = "FsCheck"; + version = "2.6.2"; + sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl"; + outputFiles = [ "*" ]; + }; + FsCheckNunit = fetchNuGet { baseName = "FsCheck.Nunit"; version = "1.0.4"; @@ -67,6 +88,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FSharpCompilerTools = fetchNuGet { + baseName = "FSharp.Compiler.Tools"; + version = "4.1.4"; + sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8"; + outputFiles = [ "*" ]; + }; + FsLexYacc = fetchNuGet { baseName = "FsLexYacc"; version = "6.1.0"; @@ -74,6 +102,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "build/*" ]; }; + FsLexYacc704 = fetchNuGet { + baseName = "FsLexYacc"; + version = "7.0.4"; + sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi"; + outputFiles = [ "*" ]; + }; + FsPickler = fetchNuGet { baseName = "FsPickler"; version = "1.2.9"; @@ -102,6 +137,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + NUnit350 = fetchNuGet { + baseName = "NUnit"; + version = "3.5.0"; + sha256 = "19fxq9cf754ygda5c8rn1zqs71pfxi7mb96jwqhlichnqih6i16z"; + outputFiles = [ "*" ]; + }; + NUnit2 = fetchNuGet { baseName = "NUnit"; version = "2.6.4"; @@ -153,6 +195,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "tools/*" ]; }; + SystemValueTuple = fetchNuGet { + baseName = "System.ValueTuple"; + version = "4.3.0"; + sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88"; + outputFiles = [ "*" ]; + }; + RestSharp = fetchNuGet { baseName = "RestSharp"; version = "105.2.3"; @@ -195,6 +244,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + MicrosoftDiaSymReader = fetchNuGet { + baseName = "Microsoft.DiaSymReader"; + version = "1.1.0"; + sha256 = "04dgwy6nyxksd1nb24k5c5vz8naggg7hryadvwqnm2v3alkh6g88"; + outputFiles = [ "*" ]; + }; + + MicrosoftDiaSymReaderPortablePdb = fetchNuGet { + baseName = "Microsoft.DiaSymReader.PortablePdb"; + version = "1.2.0"; + sha256 = "0qa8sqg0lzz9galkkfyi8rkbkali0nxm3qd5y4dlxp96ngrq5ldz"; + outputFiles = [ "*" ]; + }; + NUnitRunners = fetchNuGet { baseName = "NUnit.Runners"; version = "2.6.4"; @@ -210,6 +273,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; }; + SystemCollectionsImmutable131 = fetchNuGet { + baseName = "System.Collections.Immutable"; + version = "1.3.1"; + sha256 = "149fcp7k7r9iw24dv5hbaij0c38kcv28dyhzbkggilfh4x2hy8c2"; + outputFiles = [ "*" ]; + }; + + SystemReflectionMetadata = fetchNuGet { + baseName = "System.Reflection.Metadata"; + version = "1.4.2"; + sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i"; + outputFiles = [ "*" ]; + }; + Suave = fetchNuGet { baseName = "Suave"; version = "0.29.0"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4226e656fde..099e45f10226 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -8,6 +8,7 @@ let # These are attributes in compiler and packages that don't support integer-s "ghc6104" "ghc6123" "ghc704" + "ghc763" "ghcjs" "ghcjsHEAD" "ghcCross" @@ -67,6 +68,13 @@ in rec { inherit (bootPkgs) hscolour; sphinx = pkgs.python27Packages.sphinx; }; + ghc821 = callPackage ../development/compilers/ghc/8.2.1.nix rec { + bootPkgs = packages.ghc802; + inherit (bootPkgs) hscolour alex happy; + inherit buildPlatform targetPlatform; + sphinx = pkgs.python3Packages.sphinx; + selfPkgs = packages.ghc821; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; @@ -79,6 +87,10 @@ in rec { ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { bootPkgs = packages.ghc802; }; + ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec { + bootPkgs = packages.ghc802; + inherit (bootPkgs) hscolour alex happy; + }; jhc = callPackage ../development/compilers/jhc { inherit (packages.ghc763) ghcWithPackages; @@ -100,6 +112,7 @@ in rec { in pkgs.recurseIntoAttrs (integerSimpleGhcs // { ghcHEAD = integerSimpleGhcs.ghcHEAD.override { selfPkgs = packages.integer-simple.ghcHEAD; }; }); + }; packages = { @@ -150,6 +163,10 @@ in rec { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; + ghc821 = callPackage ../development/haskell-modules { + ghc = compiler.ghc821; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; @@ -159,13 +176,23 @@ in rec { ghc = compiler.ghcHEAD.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; + ghcCross821 = callPackage ../development/haskell-modules { + ghc = compiler.ghc821.crossCompiler; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + }; ghcjs = callPackage ../development/haskell-modules { ghc = compiler.ghcjs; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; ghcjsHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcjsHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; + ghcHaLVM240 = callPackage ../development/haskell-modules { + ghc = compiler.ghcHaLVM240; + compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { }; }; # The integer-simple attribute set contains package sets for all the GHC compilers diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix new file mode 100644 index 000000000000..5a85dc3433ba --- /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/impure.nix b/pkgs/top-level/impure.nix index c0f4e0fa089e..c0cf8fb09113 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -22,6 +22,7 @@ in # with unnamed parameters allowed by ... system ? localSystem.system , platform ? localSystem.platform +, crossSystem ? null , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.config/nixpkgs/config.nix. @@ -61,7 +62,7 @@ in assert args ? localSystem -> !(args ? system || args ? platform); import ./. (builtins.removeAttrs args [ "system" "platform" ] // { - inherit config overlays; + inherit config overlays crossSystem; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. localSystem = { system = builtins.currentSystem; } // localSystem; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ea3a849c7ac5..f33b397958ca 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -293,7 +293,7 @@ let maintainers = [ maintainers.koral ]; }; }; - + luastdlib = buildLuaPackage { name = "stdlib"; @@ -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; }; }; @@ -468,18 +466,20 @@ let vicious = stdenv.mkDerivation rec { name = "vicious-${version}"; - version = "2.1.3"; + version = "2.2.0"; - src = fetchzip { - url = "http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz"; - sha256 = "1c901siza5vpcbkgx99g1vkqiki5qgkzx2brnj4wrpbsbfzq0bcq"; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "vicious"; + rev = "v${version}"; + sha256 = "0dhy0vklrhqrnmxb9pyqbfvkwwy86lwysk93pzg1j1zwprx366fj"; }; meta = with stdenv.lib; { description = "Vicious widgets for window managers"; - homepage = http://git.sysphere.org/vicious/; + homepage = https://github.com/Mic92/vicious; license = licenses.gpl2; - maintainers = with maintainers; [ makefu ]; + maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index a69e7019c874..c7e5f21910bb 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -57,8 +57,15 @@ releaseTools.sourceTarball rec { fi # Run the regression tests in `lib'. - res="$(nix-instantiate --eval --strict --show-trace lib/tests.nix)" - if test "$res" != "[ ]"; then + if + # `set -e` doesn't work inside here, so need to && instead :( + res="$(nix-instantiate --eval --strict lib/tests/misc.nix)" \ + && [[ "$res" == "[ ]" ]] \ + && res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \ + && [[ "$res" == "[ ]" ]] + then + true + else echo "regression tests for lib failed, got: $res" exit 1 fi diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1cc5de01e101..bc5253328cfa 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -5,6 +5,7 @@ let let packageSet = self: with self; let inherit (self) callPackage; in + let ocamlPackages = { callPackage = newScope self; @@ -14,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 { }; @@ -30,13 +29,17 @@ let async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - async_find = callPackage ../development/ocaml-modules/async_find { }; + async_find = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.async_find + else callPackage ../development/ocaml-modules/async_find { }; async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - async_shell = callPackage ../development/ocaml-modules/async_shell { }; - - async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; + async_shell = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.async_shell + else callPackage ../development/ocaml-modules/async_shell { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; @@ -51,12 +54,13 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; + bap = callPackage ../development/ocaml-modules/bap { }; + + bitstring = callPackage ../development/ocaml-modules/bitstring { }; + bolt = callPackage ../development/ocaml-modules/bolt { }; - bitstring = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/bitstring { } - else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; + bos = callPackage ../development/ocaml-modules/bos { }; camlidl = callPackage ../development/tools/ocaml/camlidl { }; @@ -108,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 { }; @@ -124,10 +126,26 @@ let cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; - cohttp = callPackage ../development/ocaml-modules/cohttp { - lwt = ocaml_lwt; + cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; + + 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 { }; @@ -138,6 +156,8 @@ let cppo = callPackage ../development/tools/ocaml/cppo { }; + cpuid = callPackage ../development/ocaml-modules/cpuid { }; + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; cstruct = callPackage ../development/ocaml-modules/cstruct { @@ -152,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 { }; @@ -160,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 { }; @@ -194,12 +216,20 @@ let fpath = callPackage ../development/ocaml-modules/fpath { }; + functoria = callPackage ../development/ocaml-modules/functoria { }; + functory = callPackage ../development/ocaml-modules/functory { }; gen = callPackage ../development/ocaml-modules/gen { }; herelib = callPackage ../development/ocaml-modules/herelib { }; + 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 { }; @@ -221,18 +251,26 @@ 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 { }; hex = callPackage ../development/ocaml-modules/hex { }; + inifiles = callPackage ../development/ocaml-modules/inifiles { }; + jingoo = callPackage ../development/ocaml-modules/jingoo { batteries = ocaml_batteries; 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 { }; @@ -254,32 +292,48 @@ 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; llvm = callPackage ../development/ocaml-modules/llvm { - llvm = pkgs.llvm_37; + llvm = pkgs.llvm_39; }; logs = callPackage ../development/ocaml-modules/logs { 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 { }; merlin = callPackage ../development/tools/ocaml/merlin { }; + merlin_extend = callPackage ../development/ocaml-modules/merlin_extend { }; + mezzo = callPackage ../development/compilers/mezzo { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; @@ -288,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 { @@ -334,7 +390,7 @@ 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 { }; @@ -343,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 { }; @@ -364,17 +419,30 @@ let ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; + ocf = callPackage ../development/ocaml-modules/ocf { }; + ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; - ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; + ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; }; + ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { }; - ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; + 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 { }; + + ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { }; + + octavius = callPackage ../development/ocaml-modules/octavius { }; ojquery = callPackage ../development/ocaml-modules/ojquery { }; @@ -473,6 +541,8 @@ let then callPackage ../development/ocaml-modules/ppx_deriving {} else null; + ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; + ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; ppx_tools = @@ -480,22 +550,32 @@ let then callPackage ../development/ocaml-modules/ppx_tools {} else null; + 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 { }; re = callPackage ../development/ocaml-modules/re { }; + reason = callPackage ../development/compilers/reason { }; + + rope = callPackage ../development/ocaml-modules/rope { }; + + rresult = callPackage ../development/ocaml-modules/rresult { }; + safepass = callPackage ../development/ocaml-modules/safepass { }; sedlex = callPackage ../development/ocaml-modules/sedlex { }; sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + stog = callPackage ../applications/misc/stog { }; + stringext = callPackage ../development/ocaml-modules/stringext { }; topkg = callPackage ../development/ocaml-modules/topkg { }; @@ -536,6 +616,8 @@ let xml-light = callPackage ../development/ocaml-modules/xml-light { }; + xtmpl = callPackage ../development/ocaml-modules/xtmpl { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; @@ -547,209 +629,255 @@ let }; # Jane Street + + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; + + janeStreet = import ../development/ocaml-modules/janestreet { + inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime; + inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith; + inherit (pkgs) stdenv openssl; + }; + js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {}; ppx_core = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {} + then janeStreet.ppx_core else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {}; ppx_optcomp = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix { - oasis = ocaml_oasis; } + then janeStreet.ppx_optcomp else callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {}; - ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {}; + ppx_driver = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.ppx_driver + else callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {}; ppx_type_conv = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix { } + then janeStreet.ppx_type_conv else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {}; ppx_compare = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix {} + then janeStreet.ppx_compare else callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {}; - ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {}; + ppx_here = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.ppx_here + else callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {}; ppx_sexp_conv = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix { } + then janeStreet.ppx_sexp_conv else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {}; - ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {}; + ppx_assert = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.ppx_assert + else callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {}; ppx_inline_test = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix {} + then janeStreet.ppx_inline_test else callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {}; ppx_bench = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix {} + then janeStreet.ppx_bench else callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {}; ppx_bin_prot = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix {} + then janeStreet.ppx_bin_prot else callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {}; ppx_custom_printf = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix {} + then janeStreet.ppx_custom_printf else callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {}; ppx_enumerate = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix {} + then janeStreet.ppx_enumerate else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {}; ppx_fail = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix {} + then janeStreet.ppx_fail else callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {}; ppx_fields_conv = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix {} + then janeStreet.ppx_fields_conv else callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {}; ppx_let = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_let-113_33_00.nix {} + then janeStreet.ppx_let else callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {}; ppx_pipebang = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix {} + then janeStreet.ppx_pipebang else callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {}; ppx_sexp_message = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix {} + then janeStreet.ppx_sexp_message else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {}; ppx_sexp_value = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix {} + then janeStreet.ppx_sexp_value else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {}; ppx_typerep_conv = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix {} + then janeStreet.ppx_typerep_conv else callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {}; ppx_variants_conv = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix {} + then janeStreet.ppx_variants_conv else callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {}; ppx_expect = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix {} + then janeStreet.ppx_expect else callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {}; ppx_jane = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {} + then janeStreet.ppx_jane else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {}; # Core sublibs typerep = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.typerep + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/typerep.nix {} else typerep_p4; fieldslib = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.fieldslib + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {} else fieldslib_p4; sexplib = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/sexplib-113_33_00.nix {} + then janeStreet.sexplib else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {} else sexplib_p4; variantslib = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.variantslib + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {} else variantslib_p4; bin_prot = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.bin_prot + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {} 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 = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {} + then janeStreet.core_kernel else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {} else core_kernel_p4; core = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core-113_33_02.nix {} + then janeStreet.core else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/core.nix {} else core_p4; re2 = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.re2 + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/re2.nix {} else re2_p4; textutils = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.textutils + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} else textutils_p4; core_extended = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.core_extended + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} else core_extended_p4; async_kernel = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async_kernel-113_33_00.nix {} + then janeStreet.async_kernel else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} else async_kernel_p4; - async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; + async_rpc_kernel = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.async_rpc_kernel + else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; async_unix = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async_unix-113_33_00.nix {} + then janeStreet.async_unix else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} else async_unix_p4; async_extra = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.async_extra + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} else async_extra_p4; async = - if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.03" ocaml.version + then janeStreet.async + else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/async.nix {} else async_p4; + async_ssl = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.async_ssl + else callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { }; + # Apps / from all-packages wyrd = callPackage ../tools/misc/wyrd { }; haxe = callPackage ../development/compilers/haxe { }; - ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; trv = callPackage ../development/tools/misc/trv { }; @@ -762,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 { }; @@ -794,6 +916,7 @@ let }; }; + in (ocamlPackages.janeStreet // ocamlPackages); in lib.fix' (lib.extends overrides packageSet); in rec { @@ -818,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 db37a83154e4..e7234018508e 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}: @@ -25,10 +25,10 @@ let self = _self // overrides; _self = with self; { ack = buildPerlPackage rec { - name = "ack-2.14"; + name = "ack-2.16"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "0gqv30666vlclnwylhk9i64s7raa70x4ncy6bg48s5gcxwrshjc5"; + sha256 = "0ifbmbfvagfi76i7vjpggs2hrbqqisd14f5zizan6cbdn8dl5z2g"; }; outputs = ["out" "doc"]; # use gnused so that the preCheck command passes @@ -459,6 +459,22 @@ let self = _self // overrides; _self = with self; { }; }; + AudioScan = buildPerlPackage rec { + name = "Audio-Scan-0.93"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; + sha256 = "03nwcm234y76jb1p20rlcky6vzv68i46s9mjfr7kzp65w3yg94js"; + }; + buildInputs = [ pkgs.zlib ModuleBuild ModuleBuildPluggablePPPort ]; + propagatedBuildInputs = [ TestWarn ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; + meta = { + description = "Fast C metadata and tag reader for all common audio file formats"; + license = stdenv.lib.licenses.gpl2; + }; + }; + AuthenDecHpwd = buildPerlPackage rec { name = "Authen-DecHpwd-2.006"; src = fetchurl { @@ -501,6 +517,20 @@ let self = _self // overrides; _self = with self; { }; }; + AuthenRadius = buildPerlPackage rec { + name = "Authen-Radius-0.26"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/P/PO/PORTAONE/${name}.tar.gz"; + sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ DataHexDump NetIP ]; + meta = { + description = "Provide simple Radius client facilities "; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + AuthenSASL = buildPerlPackage rec { name = "Authen-SASL-2.16"; src = fetchurl { @@ -718,6 +748,19 @@ let self = _self // overrides; _self = with self; { ]; }; + BusinessHours = buildPerlPackage rec { + name = "Business-Hours-0.12"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz"; + sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + propagatedBuildInputs = [ SetIntSpan TimeLocal ]; + meta = { + description = "Calculate business hours in a time period"; + }; + }; + BusinessISBN = buildPerlPackage rec { name = "Business-ISBN-2.09"; src = fetchurl { @@ -865,6 +908,17 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestMore ]; }; + CanaryStability = buildPerlPackage rec { + name = "Canary-Stability-2012"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "fd240b111d834dbae9630c59b42fae2145ca35addc1965ea311edf0d07817107"; + }; + meta = { + license = stdenv.lib.licenses.gpl1Plus; + }; + }; + CaptchaReCAPTCHA = buildPerlPackage rec { name = "Captcha-reCAPTCHA-0.97"; src = fetchurl { @@ -1695,6 +1749,19 @@ let self = _self // overrides; _self = with self; { }; }; + Chart = buildPerlPackage rec { + name = "Chart-2.4.10"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/C/CH/CHARTGRP/${name}.tar.gz"; + sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf"; + }; + propagatedBuildInputs = [ GD ]; + meta = { + description = "A series of charting modules"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ClassAccessor = buildPerlPackage { name = "Class-Accessor-0.34"; src = fetchurl { @@ -2040,6 +2107,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassInspector ]; }; + ClassVirtual = buildPerlPackage rec { + name = "Class-Virtual-0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; + sha256 = "c6499b42d3b4e5c6488a5e82fbc28698e6c9860165072dddfa6749355a9cfbb2"; + }; + propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ]; + meta = { + homepage = https://metacpan.org/release/Class-Virtual; + description = "Base class for virtual base classes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ClassXSAccessor = buildPerlPackage { name = "Class-XSAccessor-1.19"; src = fetchurl { @@ -2736,6 +2817,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ Clone ]; }; + CSSMinifierXP = buildPerlPackage rec { + name = "CSS-Minifier-XS-0.09"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; + sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; + }; + meta = { + description = "XS based CSS minifier"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CSSSquish = buildPerlPackage { name = "CSS-Squish-0.10"; src = fetchurl { @@ -2766,16 +2859,15 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.044"; + name = "CryptX-0.050"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "15e5e6bd7b90af24c7e730751fec7b10d8e22ef4380d527bda242dee7dd20443"; + sha256 = "c1de040779d9f5482d0a2f17a9a5aa6b069c7c58c07fbe26ab62bc689a5c9161"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { description = "Crypto toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2875,11 +2967,11 @@ let self = _self // overrides; _self = with self; { }; }; - DataGUID = buildPerlPackage { - name = "Data-GUID-0.048"; + DataGUID = buildPerlPackage rec { + name = "Data-GUID-0.049"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.048.tar.gz; - sha256 = "cb263b1e6eeecc5797de6f945d42ace2db26c156172883550b73fa2ecdab29dc"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq"; }; propagatedBuildInputs = [ DataUUID SubExporter SubInstall ]; meta = { @@ -2956,6 +3048,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [TestException ClassAccessorChained]; }; + DataPagePageset = buildPerlPackage rec { + name = "Data-Page-Pageset-1.02"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz"; + sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + propagatedBuildInputs = [ DataPage ]; + meta = { + description = "change long page list to be shorter and well navigate"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataPassword = buildPerlPackage { name = "Data-Password-1.12"; src = fetchurl { @@ -3050,6 +3156,17 @@ let self = _self // overrides; _self = with self; { }; }; + DataURIEncode = buildPerlPackage rec { + name = "Data-URIEncode-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz"; + sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360"; + }; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataUUID = buildPerlPackage rec { name = "Data-UUID-1.220"; src = fetchurl { @@ -3709,17 +3826,16 @@ let self = _self // overrides; _self = with self; { }; DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.07045"; + name = "DBIx-Class-Schema-Loader-0.07047"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "b132c667aa7dfe6f054e097c3e572a7dbf8ad433500f085e372740d5bc23a440"; + sha256 = "6671fb3afbb1b4f3eb5905f34fb47ce18b29af3e055e479b06c09424bbc1421b"; }; buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ]; propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -4420,6 +4536,20 @@ let self = _self // overrides; _self = with self; { }; }; + EmailReply = buildPerlPackage rec { + name = "Email-Reply-1.204"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0"; + }; + propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ]; + meta = { + homepage = "http://search.cpan.org/~rjbs/${name}"; + description = "Reply to an email message"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailMessageID = buildPerlPackage { name = "Email-MessageID-1.404"; src = fetchurl { @@ -4450,6 +4580,22 @@ let self = _self // overrides; _self = with self; { }; }; + EmailMIMEAttachmentStripper = buildPerlPackage rec { + name = "Email-MIME-Attachment-Stripper-1.317"; + buildInputs = [ CaptureTiny TestPod ]; + propagatedBuildInputs = [ EmailAbstract EmailMIME ]; + + src = fetchurl { + url = "http://www.cpan.org/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789"; + }; + meta = { + homepage = "http://search.cpan.org/dist/${name}"; + description = "Strip the attachments from an email"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailMIMEContentType = buildPerlPackage rec { name = "Email-MIME-ContentType-1.018"; src = fetchurl { @@ -4479,6 +4625,21 @@ let self = _self // overrides; _self = with self; { }; }; + EmailMIMEModifier = buildPerlPackage rec { + doCheck = false; # tests are broken, it seems + name = "Email-MIME-Modifier-1.444"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "4521cf361527cd9b5e8b0db3d2e6c9588c52de6a8997e1daf5c21ed1eb7a4ba2"; + }; + propagatedBuildInputs = [ EmailMIME EmailMIMEContentType ]; + meta = { + homepage = "http://search.cpan.org/~rjbs/${name}"; + description = "Modify Email::MIME Objects Easily"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailSend = buildPerlPackage rec { name = "Email-Send-2.201"; src = fetchurl { @@ -4560,6 +4721,20 @@ let self = _self // overrides; _self = with self; { }; }; + EncodeDetect = buildPerlPackage rec { + name = "Encode-Detect-1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JG/JGMYERS/${name}.tar.gz"; + sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1"; + }; + propagatedBuildInputs = [ ModuleBuild ]; + meta = { + description = "An Encode::Encoding subclass that detects the encoding of data"; + license = stdenv.lib.licenses.free; + }; + }; + + EncodeEUCJPASCII = buildPerlPackage { name = "Encode-EUCJPASCII-0.03"; src = fetchurl { @@ -4614,6 +4789,17 @@ let self = _self // overrides; _self = with self; { }; }; + enum = buildPerlPackage rec { + name = "enum-1.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "d2f36b5015f1e35f640159867b60bf5d5cd66b56cd5e42d33f531be68e5eee35"; + }; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Env = buildPerlPackage { name = "Env-1.04"; src = fetchurl { @@ -4647,6 +4833,19 @@ let self = _self // overrides; _self = with self; { }; }; + EV = buildPerlPackage rec { + name = "EV-4.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "2ae7f8734e2e4945510252152c3bea4be35f4aa58aad3db0504c38844b08a991"; + }; + buildInputs = [ CanaryStability ]; + propagatedBuildInputs = [ CommonSense ]; + meta = { + license = stdenv.lib.licenses.gpl1Plus; + }; + }; + EvalClosure = buildPerlPackage { name = "Eval-Closure-0.11"; src = fetchurl { @@ -5073,6 +5272,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleBuild ]; }; + FileBOM = buildPerlPackage rec { + name = "File-BOM-0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz"; + sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1"; + }; + buildInputs = [ ModuleBuild TestException ]; + propagatedBuildInputs = [ Readonly ]; + meta = { + description = "Utilities for handling Byte Order Marks"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileCheckTree = buildPerlPackage { name = "File-CheckTree-4.42"; src = fetchurl { @@ -5120,6 +5333,35 @@ let self = _self // overrides; _self = with self; { }; }; + FileFindObject = buildPerlPackage rec { + name = "File-Find-Object-v0.3.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "7c467b6b7752bff46b7b8b84c9aabeac45bbfdab1e2224108a2e2170adb9f2b7"; + }; + buildInputs = [ ModuleBuild perl ]; + propagatedBuildInputs = [ ClassXSAccessor ]; + meta = { + description = "An object oriented File::Find replacement"; + license = stdenv.lib.licenses.artistic2; + }; + }; + + FileFindObjectRule = buildPerlModule rec { + name = "File-Find-Object-Rule-0.0306"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "2ce55766b25fb8799d37b95bca61e8a71d8a437e28541e1cd06b7eb89f7739d1"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ ClassXSAccessor FileFindObject NumberCompare TextGlob ]; + meta = { + homepage = http://www.shlomifish.org/open-source/projects/File-Find-Object/; + description = "Alternative interface to File::Find::Object"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileFindRule = buildPerlPackage rec { name = "File-Find-Rule-0.33"; src = fetchurl { @@ -5142,6 +5384,18 @@ let self = _self // overrides; _self = with self; { }; }; + FileFinder = buildPerlPackage rec { + name = "File-Finder-0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ME/MERLYN/${name}.tar.gz"; + sha256 = "2ecbc19ac67a9e635c872a807a8d3eaaff5babc054f15a191d47cdfc5f176a74"; + }; + propagatedBuildInputs = [ TextGlob ]; + meta = { + license = stdenv.lib.licenses.free; # Same as Perl + }; + }; + FileHandleUnget = buildPerlPackage rec { name = "FileHandle-Unget-0.1628"; src = fetchurl { @@ -5365,8 +5619,23 @@ let self = _self // overrides; _self = with self; { FileTemp = null; + FileType = buildPerlPackage { + name = "File-Type-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; + sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; + }; + meta = { + description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; + }; + FileSlurp = buildPerlPackage { name = "File-Slurp-9999.19"; + # WARNING: check on next update if deprecation warning is gone + patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ]; src = fetchurl { url = mirror://cpan/authors/id/U/UR/URI/File-Slurp-9999.19.tar.gz; sha256 = "0hrn4nipwx40d6ji8ssgr5nw986z9iqq8cn0kdpbszh9jplynaff"; @@ -5502,6 +5771,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; }; }; @@ -5563,6 +5833,20 @@ let self = _self // overrides; _self = with self; { makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; }; + GDGraph = buildPerlPackage rec { + name = "GDGraph-1.54"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz"; + sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr"; + }; + propagatedBuildInputs = [ GD GDText ]; + buildInputs = [ TestException CaptureTiny ]; + meta = { + description = "Graph Plotting Module for Perl 5"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GDSecurityImage = buildPerlPackage { name = "GD-SecurityImage-1.72"; src = fetchurl { @@ -5576,6 +5860,18 @@ let self = _self // overrides; _self = with self; { }; }; + GDText = buildPerlPackage rec { + name = "GDTextUtil-0.86"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz"; + sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8"; + }; + propagatedBuildInputs = [ GD ]; + meta = { + description = "Text utilities for use with GD"; + }; + }; + GeoIP = buildPerlPackage rec { name = "Geo-IP-1.45"; src = fetchurl { @@ -6528,6 +6824,21 @@ let self = _self // overrides; _self = with self; { }; }; + ImageScale = buildPerlPackage rec { + name = "Image-Scale-0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; + sha256 = "5b2c92dc2dd635b488879461760cd251aa2b1feef41b64f17914a6e4bbe3e442"; + }; + buildInputs = [ pkgs.libpng pkgs.libjpeg ]; + propagatedBuildInputs = [ TestNoWarnings pkgs.zlib ]; + makeMakerFlags = "--with-jpeg-includes=${pkgs.libjpeg.dev}/include --with-jpeg-libs=${pkgs.libjpeg.out}/lib --with-png-includes=${pkgs.libpng.dev}/include --with-png-libs=${pkgs.libpng.out}/lib"; + meta = { + description = "Fast, high-quality fixed-point image resizing"; + license = stdenv.lib.licenses.gpl2Plus; + }; + }; + ImageSize = buildPerlPackage rec { name = "Image-Size-3.232"; src = fetchurl { @@ -6686,7 +6997,7 @@ let self = _self // overrides; _self = with self; { sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad"; }; }; - + IOPager = buildPerlPackage { name = "IO-Pager-0.06"; src = fetchurl { @@ -6814,6 +7125,32 @@ let self = _self // overrides; _self = with self; { }; }; + IPCountry = buildPerlPackage rec { + name = "IP-Country-2.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NW/NWETTERS/${name}.tar.gz"; + sha256 = "88db833a5ab22ed06cb53d6f205725e3b5371b254596053738885e91fa105f75"; + }; + propagatedBuildInputs = [ GeographyCountries ]; + meta = { + description = "Fast lookup of country codes from IP addresses"; + license = stdenv.lib.licenses.mit; + }; + }; + + GeographyCountries = buildPerlPackage rec { + name = "Geography-Countries-2009041301"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AB/ABIGAIL/${name}.tar.gz"; + sha256 = "48c42e40e8281ba7c981743a854c48e6def2d51eb0925ea6c96e25c74497f20f"; + }; + meta = { + description = "2-letter, 3-letter, and numerical codes for countries"; + license = stdenv.lib.licenses.mit; + }; + }; + + IPCRun = buildPerlPackage { name = "IPC-Run-0.92"; src = fetchurl { @@ -6870,11 +7207,12 @@ let self = _self // overrides; _self = with self; { }; ImageExifTool = buildPerlPackage rec { - name = "Image-ExifTool-9.27"; + name = "Image-ExifTool-${version}"; + version = "10.55"; src = fetchurl { url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c"; + sha256 = "0z8zwjjfvyllnhsafhddbybywpgqv0pl1dbn1g034cs27yj836q2"; }; meta = with stdenv.lib; { @@ -6990,6 +7328,20 @@ let self = _self // overrides; _self = with self; { }; }; + JavaScriptMinifierXS = buildPerlPackage rec { + name = "JavaScript-Minifier-XS-0.11"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; + sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; + }; + propagatedBuildInputs = [ ]; + meta = { + description = "XS based JavaScript minifier"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + JSON = buildPerlPackage { name = "JSON-2.90"; src = fetchurl { @@ -7082,6 +7434,18 @@ let self = _self // overrides; _self = with self; { }; }; + JSONXSVersionOneAndTwo = buildPerlPackage rec { + name = "JSON-XS-VersionOneAndTwo-0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz"; + sha256 = "e6092c4d961fae777acf7fe99fb3cd6e5b710fec85765a6b90417480e4c94a34"; + }; + propagatedBuildInputs = [ JSONXS ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Later = buildPerlPackage rec { version = "0.19"; name = "Object-Realize-Later-${version}"; @@ -7389,6 +7753,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 { @@ -7810,6 +8175,28 @@ let self = _self // overrides; _self = with self; { }; }; + MailSPF = buildPerlPackage rec { + name = "Mail-SPF-v2.9.0"; + #src = /root/nixops/Mail-SPF-v2.9.0; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/${name}.tar.gz"; + sha256 = "61cb5915f1c7acc7a931ffc1bfc1291bdfac555e2a46eb2391b995ea9ecb6162"; + }; + # remove this patch patches = [ ../development/perl-modules/Mail-SPF.patch ]; + + buildInputs = [ ModuleBuild NetDNSResolverProgrammable ]; + propagatedBuildInputs = [ Error NetAddrIP NetDNS URI ]; + + buildPhase = "perl Build.PL --install_base=$out --install_path=\"sbin=$out/bin\"; ./Build build "; + + doCheck = false; # The main test performs network access + meta = { + description = "An object-oriented implementation of Sender Policy Framework"; + license = stdenv.lib.licenses.bsd3; + }; + }; + + MailTools = buildPerlPackage rec { name = "MailTools-2.14"; src = fetchurl { @@ -8067,6 +8454,29 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ProcWaitStat ]; }; + MIMETools = buildPerlPackage rec { + name = "MIME-tools-5.509"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz"; + sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; + }; + propagatedBuildInputs = [ + MailTools + FilePath + FileTemp + MIMEBase64 + ]; + buildInputs = [ + TestDeep + TestPod + TestPodCoverage + ]; + meta = { + description = "class for parsed-and-decoded MIME message"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MIMELite = buildPerlPackage rec { name = "MIME-Lite-3.030"; src = fetchurl { @@ -8137,10 +8547,10 @@ let self = _self // overrides; _self = with self; { }; ModuleBuild = buildPerlPackage rec { - name = "Module-Build-0.4214"; + name = "Module-Build-0.4222"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "0gywap0dfr8sx4wr6wqc23sjag1b4xsw8l55ai4vhkfg324lhyf5"; + sha256 = "0q5i03lbx52g22bwvyb04ycky4niq379j1c3fhmlfdj7lzclajz7"; }; buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { @@ -8692,6 +9102,20 @@ let self = _self // overrides; _self = with self; { }; }; + MooX = buildPerlPackage rec { + name = "MooX-0.101"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz"; + sha256 = "2ff91a656e78aae0aca42293829d7a7e5acb9bf22b0401635b2ab6c870de32d5"; + }; + propagatedBuildInputs = [ DataOptList ImportInto ModuleRuntime Moo ]; + meta = { + homepage = https://github.com/Getty/p5-moox; + description = "Using Moo and MooX:: packages the most lazy way"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooXlate = buildPerlPackage { name = "MooX-late-0.015"; src = fetchurl { @@ -9439,6 +9863,19 @@ let self = _self // overrides; _self = with self; { # Deprecated. NamespaceClean = self.namespaceclean; + NetIdent = buildPerlPackage rec { + name = "Net-Ident-1.24"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; + sha256 = "5f5f1142185a67b87406a3fb31f221564f61838a70ef4c07284a66c55e82ad05"; + }; + meta = { + homepage = http://wiki.github.com/toddr/Net-Ident/; + description = "Lookup the username on the remote end of a TCP/IP connection"; + license = stdenv.lib.licenses.mit; + }; + }; + NetAddrIP = buildPerlPackage rec { name = "NetAddr-IP-4.079"; src = fetchurl { @@ -9562,6 +9999,18 @@ let self = _self // overrides; _self = with self; { }; }; + NetCIDRLite = buildPerlPackage rec { + name = "Net-CIDR-Lite-0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz"; + sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093"; + }; + meta = { + description = "Perl extension for merging IPv4 or IPv6 CIDR addresses"; + license = "unknown"; + }; + }; + NetCoverArtArchive = buildPerlPackage { name = "Net-CoverArtArchive-1.02"; src = fetchurl { @@ -9694,6 +10143,18 @@ let self = _self // overrides; _self = with self; { }; }; + NetPatricia = buildPerlPackage rec { + name = "Net-Patricia-1.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRUBER/${name}.tar.gz"; + sha256 = "70835a926e1c5a8d0324c72fffee82eeb7ec6c141dee04fd446820b64f71c552"; + }; + propagatedBuildInputs = [ NetCIDRLite Socket6 ]; + meta = { + license = "unknown"; + }; + }; + NetPing = buildPerlPackage { name = "Net-Ping-2.41"; src = fetchurl { @@ -9705,6 +10166,21 @@ let self = _self // overrides; _self = with self; { }; }; + NetDNSResolverProgrammable = buildPerlPackage rec { + name = "Net-DNS-Resolver-Programmable-v0.003"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMEHNLE/net-dns-resolver-programmable/${name}.tar.gz"; + sha256 = "8d402260941f259c83bf1b2564408e75288df028f604136c29da11a9a6a076ec"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ NetDNS ]; + meta = { + description = "Programmable DNS resolver class for offline emulation of DNS"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + NetServer = buildPerlPackage { name = "Net-Server-2.007"; src = fetchurl { @@ -9844,6 +10320,19 @@ let self = _self // overrides; _self = with self; { }; }; + NTLM = buildPerlPackage rec { + name = "NTLM-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NB/NBEBOUT/${name}.tar.gz"; + sha256 = "c823e30cda76bc15636e584302c960e2b5eeef9517c2448f7454498893151f85"; + }; + propagatedBuildInputs = [ DigestHMAC ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.pSub ]; + }; + }; + ObjectAccessor = buildPerlPackage { name = "Object-Accessor-0.48"; src = fetchurl { @@ -9911,10 +10400,10 @@ let self = _self // overrides; _self = with self; { }; OpenGL = buildPerlPackage rec { - name = "OpenGL-0.6703"; + name = "OpenGL-0.70"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHM/${name}.tar.gz"; - sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; + sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; @@ -9990,6 +10479,19 @@ let self = _self // overrides; _self = with self; { }; }; + PatchReader = buildPerlPackage rec { + name = "PatchReader-0.9.6"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/T/TM/TMANNERM/${name}.tar.gz"; + sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c"; + }; + meta = { + homepage = "http://search.cpan.org/~tmannerm/${name}"; + description = "Utilities to read and manipulate patches and CVS"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + PackageStash = buildPerlPackage { name = "Package-Stash-0.37"; src = fetchurl { @@ -10163,10 +10665,10 @@ let self = _self // overrides; _self = with self; { }; PathTiny = buildPerlPackage { - name = "Path-Tiny-0.052"; + name = "Path-Tiny-0.104"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.052.tar.gz; - sha256 = "1b70yhbdww9k5m4a4lhdd71jrxdxhi10533slmxynxa04nyn2f0a"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz; + sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef"; }; buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ]; propagatedBuildInputs = [ autodie ]; @@ -10216,16 +10718,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; }; }; @@ -10252,18 +10754,17 @@ let self = _self // overrides; _self = with self; { }; PerlCritic = buildPerlModule rec { - name = "Perl-Critic-1.126"; + name = "Perl-Critic-1.130"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz"; - sha256 = "b1a6151cb3603aef8555195b807e831655c83003b81e2f64fff095ff7114f5af"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + sha256 = "0662e8f02dd78e39ee9d5b01bdf5376a7cc70ce2b0edc9ca015be35e6cb61df6"; }; - buildInputs = [ TestDeep ]; + buildInputs = [ ModuleBuild TestDeep ]; propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10513,13 +11014,13 @@ let self = _self // overrides; _self = with self; { }; }; - PPI = buildPerlPackage { - name = "PPI-1.220"; + PPI = buildPerlPackage rec { + name = "PPI-1.224"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.220.tar.gz; - sha256 = "1e15be50e7d95a36d351af8bf5074f6695a2c72165e586d93e616183e7602b83"; + url = "mirror://cpan/authors/id/M/MI/MITHALDU/${name}.tar.gz"; + sha256 = "8d0f9faaea68515fb5aa6323115dcf98ea6c1dec4441f3844d3b9633b6cc9d94"; }; - buildInputs = [ ClassInspector FileRemove TestNoWarnings TestObject TestSubCalls ]; + buildInputs = [ ClassInspector FileRemove TestDeep TestObject TestSubCalls TestWarn ]; propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; # Remove test that fails due to unexpected shebang after @@ -10530,7 +11031,6 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/adamkennedy/PPI; description = "Parse, Analyze and Manipulate Perl (without perl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10561,6 +11061,16 @@ let self = _self // overrides; _self = with self; { }; }; + ProcBackground = buildPerlPackage rec { + name = "Proc-Background-1.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BZ/BZAJAC/${name}.tar.gz"; + sha256 = "1ce0dd78c0bb8393a2431b385a27b99fcc623a41ebec57b3cc09cc38cdb708ee"; + }; + meta = { + }; + }; + ProcProcessTable = buildPerlPackage { name = "Proc-ProcessTable-0.51"; src = fetchurl { @@ -10952,6 +11462,21 @@ let self = _self // overrides; _self = with self; { }; }; + Razor2ClientAgent = buildPerlPackage rec { + name = "Razor2-Client-Agent-2.84"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; + sha256 = "d7c2ed7f347a673b1425e4da7656073d6c52847bc7403bf57e3a404b52f7e501"; + }; + propagatedBuildInputs = [ DigestSHA1 URI ]; + meta = { + homepage = http://razor.sourceforge.net/; + description = "Collaborative, content-based spam filtering network agent"; + license = stdenv.lib.licenses.mit; + }; + }; + + Readonly = buildPerlModule rec { name = "Readonly-2.05"; src = fetchurl { @@ -11032,6 +11557,19 @@ let self = _self // overrides; _self = with self; { }; }; + RegexpGrammars = buildPerlPackage rec { + name = "Regexp-Grammars-1.045"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; + sha256 = "8ab001f5641d03f7acce09ca5826b219b02ce40f8e56c2066737228a9232b594"; + }; + meta = { + homepage = http://search.cpan.org/~dconway/Regexp-Grammars-1.045/lib/Regexp/Grammars.pm; + description = "Add grammatical parsing features to Perl 5.10 regexes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + RegexpIPv6 = buildPerlPackage { name = "Regexp-IPv6-0.03"; src = fetchurl { @@ -11286,6 +11824,18 @@ let self = _self // overrides; _self = with self; { }; }; + SetIntSpan = buildPerlPackage rec { + name = "Set-IntSpan-1.19"; + src = fetchurl { + url = "https://cpan.metacpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz"; + sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"; + }; + + meta = { + description = "Manages sets of integers"; + }; + }; + SetObject = buildPerlPackage { name = "Set-Object-1.34"; src = fetchurl { @@ -11356,13 +11906,17 @@ let self = _self // overrides; _self = with self; { }; Socket6 = buildPerlPackage rec { - name = "Socket6-0.25"; + name = "Socket6-0.28"; src = fetchurl { url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz"; - sha256 = "1ads4k4vvq6pnxkdw0s8gaj03w4h9snxyw7zyikfzd20fy76yx6s"; + sha256 = "bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586"; }; setOutputFlags = false; buildInputs = [ pkgs.which ]; + meta = { + description = "IPv6 related part of the C socket.h defines and structure manipulators"; + license = stdenv.lib.licenses.bsd3; + }; }; SoftwareLicense = buildPerlPackage rec { @@ -11743,6 +12297,14 @@ let self = _self // overrides; _self = with self; { }; }; + ShellCommand = buildPerlPackage { + name = "Shell-Command-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz; + sha256 = "1lgc2rb3b5a4lxvbq0cbg08qk0n2i88srxbsz93bwi3razpxxr7k"; + }; + }; + StringToIdentifierEN = buildPerlPackage rec { name = "String-ToIdentifier-EN-0.11"; src = fetchurl { @@ -12060,6 +12622,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 { @@ -12138,6 +12709,21 @@ let self = _self // overrides; _self = with self; { }; }; + TaskFreecellSolverTesting = buildPerlModule rec { + name = "Task-FreecellSolver-Testing-v0.0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "ce8960c0250a9947ae5b4485e8a3e807bb2d87b1120096464b3d2247d2c194ff"; + }; + buildInputs = [ ModuleBuild perl ]; + propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify Inline InlineC ListMoreUtils Moo MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace YAMLLibYAML ]; + meta = { + homepage = http://metacpan.org/release/Task-FreecellSolver-Testing; + description = "Install the CPAN dependencies of the Freecell Solver test suite"; + license = stdenv.lib.licenses.mit; + }; + }; + TaskPlack = buildPerlModule rec { name = "Task-Plack-0.28"; src = fetchurl { @@ -12147,6 +12733,21 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack PSGI ModuleBuildTiny ]; }; + TaskTestRunAllPlugins = buildPerlPackage rec { + name = "Task-Test-Run-AllPlugins-0.0105"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; + meta = { + homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; + description = "Specifications for installing all the Test::Run"; + license = stdenv.lib.licenses.mit; + }; + }; + TaskWeaken = buildPerlPackage { name = "Task-Weaken-1.04"; src = fetchurl { @@ -12264,6 +12865,19 @@ let self = _self // overrides; _self = with self; { }; }; + TemplateGD = buildPerlPackage rec { + name = "Template-GD-2.66"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${name}.tar.gz"; + sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b"; + }; + propagatedBuildInputs = [ GD TemplateToolkit ]; + meta = { + description = "GD plugin(s) for the Template Toolkit"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermANSIColor = buildPerlPackage { name = "Term-ANSIColor-4.03"; src = fetchurl { @@ -12571,6 +13185,20 @@ let self = _self // overrides; _self = with self; { }; }; + TestDataSplit = buildPerlModule rec { + name = "Test-Data-Split-0.2.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "90811c2af56750bf08eeff39e1e30f2ff8f625e809ed838b5ccb56a256c4b595"; + }; + buildInputs = [ ModuleBuild TestDifferences perl ]; + propagatedBuildInputs = [ IOAll ListMoreUtils MooX MooXlate ]; + meta = { + description = "Split data-driven tests into several test scripts"; + license = stdenv.lib.licenses.mit; + }; + }; + TestDeep = buildPerlPackage { name = "Test-Deep-0.112"; src = fetchurl { @@ -12969,6 +13597,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PerlCritic ]; }; + TestPerlTidy = buildPerlPackage rec { + name = "Test-PerlTidy-20130104"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LA/LARRYL/${name}.tar.gz"; + sha256 = "3f15d9f3f4811e348594620312258d75095237925b491ada623fa73ac9d2b9c8"; + }; + propagatedBuildInputs = [ FileFinder FileSlurp PerlTidy TextDiff ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestPod = buildPerlPackage rec { name = "Test-Pod-1.51"; src = fetchurl { @@ -13058,6 +13698,129 @@ let self = _self // overrides; _self = with self; { }; }; + TestRun = buildPerlPackage rec { + name = "Test-Run-0.0304"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323"; + }; + buildInputs = [ ModuleBuild TestTrap ]; + propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MROCompat Moose MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; + meta = { + homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; + description = "Base class to run standard TAP scripts"; + license = stdenv.lib.licenses.mit; + }; + }; + + TestRunCmdLine = buildPerlPackage rec { + name = "Test-Run-CmdLine-0.0131"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18"; + }; + buildInputs = [ ModuleBuild TestTrap ]; + propagatedBuildInputs = [ Moose MooseXGetopt TestRun UNIVERSALrequire YAMLLibYAML ]; + meta = { + homepage = http://web-cpan.berlios.de/modules/Test-Run/; + description = "Analyze tests from the command line using Test::Run"; + license = stdenv.lib.licenses.mit; + }; + }; + + TestRunPluginAlternateInterpreters = buildPerlPackage rec { + name = "Test-Run-Plugin-AlternateInterpreters-0.0124"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3"; + }; + buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + meta = { + homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; + description = "Define different interpreters for different test scripts with Test::Run"; + license = stdenv.lib.licenses.mit; + }; + }; + + TestRunPluginBreakOnFailure = buildPerlPackage rec { + name = "Test-Run-Plugin-BreakOnFailure-v0.0.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430"; + }; + buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + meta = { + homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; + description = "Stop processing the entire test suite"; + license = stdenv.lib.licenses.mit; + }; + }; + + TestRunPluginColorFileVerdicts = buildPerlPackage rec { + name = "Test-Run-Plugin-ColorFileVerdicts-0.0124"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ] ++ moreInputs; + moreInputs = [ TestTrap ]; # Added because tests were failing without it + doCheck=true; + meta = { + homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; + description = "Make the file verdict ('ok', 'NOT OK')"; + license = stdenv.lib.licenses.mit; + }; + }; + + TestRunPluginColorSummary = buildPerlModule rec { + name = "Test-Run-Plugin-ColorSummary-0.0202"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ TestRun TestRunCmdLine ] ++ moreInputs; + moreInputs = [ TestTrap ]; # Added because tests were failing without it + doCheck=true; + meta = { + homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; + description = "A Test::Run plugin that"; + license = stdenv.lib.licenses.mit; + }; + }; + + TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec { + name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5"; + }; + buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + meta = { + homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; + description = "Trim the first components"; + license = stdenv.lib.licenses.mit; + }; + }; + + TestRunValgrind = buildPerlModule rec { + name = "Test-RunValgrind-0.0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "67bf3cf3e7d5d23ec33e592f8b0dbcccfa01205d5bf0a3d73d8c8358d167e83f"; + }; + buildInputs = [ ModuleBuild perl ]; + propagatedBuildInputs = [ PathTiny ]; + meta = { + description = "Tests that an external program is valgrind-clean"; + license = stdenv.lib.licenses.mit; + }; + }; + TestScript = buildPerlPackage rec { name = "Test-Script-1.10"; src = fetchurl { @@ -13181,6 +13944,20 @@ let self = _self // overrides; _self = with self; { }; }; + TestTrailingSpace = buildPerlPackage rec { + name = "Test-TrailingSpace-0.0301"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "a28875747adb7a0e7d1ae8a4ffe71869e7ceb3a85d0cb30172959dada7de5970"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ FileFindObjectRule ]; + meta = { + description = "Test for trailing space in source files"; + license = stdenv.lib.licenses.mit; + }; + }; + TestUnitLite = buildPerlPackage { name = "Test-Unit-Lite-0.1202"; src = fetchurl { @@ -13674,6 +14451,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ if_ ]; }; + TextSprintfNamed = buildPerlPackage rec { + name = "Text-Sprintf-Named-0.0402"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "951317fce8fa5dd08190ba760182bc71f2b4346fa21df55c76155e6353e2864f"; + }; + buildInputs = [ ModuleBuild TestWarn ]; + meta = { + description = "Sprintf-like function with named conversions"; + license = stdenv.lib.licenses.mit; + }; + }; + TextTable = buildPerlPackage rec { name = "Text-Table-1.130"; src = fetchurl { @@ -13933,6 +14723,31 @@ let self = _self // overrides; _self = with self; { }; }; + TieCacheLRU = buildPerlPackage rec { + name = "Tie-Cache-LRU-20150301"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; + sha256 = "1bf740450d3a6d7c12b48c25f7da5964e44e7cc38b28572cfb76ff22464f4469"; + }; + propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassVirtual enum ]; + meta = { + description = "A Least-Recently Used cache"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TieCacheLRUExpires = buildPerlPackage rec { + name = "Tie-Cache-LRU-Expires-0.55"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OE/OESTERHOL/${name}.tar.gz"; + sha256 = "b316d849acd25f24346d55a9950d281fee0746398767c601234122159573eb9a"; + }; + propagatedBuildInputs = [ TieCacheLRU ]; + meta = { + license = stdenv.lib.licenses.artistic1; + }; + }; + TieCycle = buildPerlPackage rec { name = "Tie-Cycle-1.21"; src = fetchurl { @@ -13988,6 +14803,17 @@ let self = _self // overrides; _self = with self; { }; }; + TieRegexpHash = buildPerlPackage rec { + name = "Tie-RegexpHash-0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALTREUS/${name}.tar.gz"; + sha256 = "0c207850e77efb16618e0aa015507926a3425b34aad5aa6e3e40d83989a085a3"; + }; + meta = { + license = stdenv.lib.licenses.artistic1; + }; + }; + TieToObject = buildPerlPackage { name = "Tie-ToObject-0.03"; src = fetchurl { @@ -14184,16 +15010,16 @@ let self = _self // overrides; _self = with self; { }; UnicodeCaseFold = buildPerlModule rec { - name = "Unicode-CaseFold-1.00"; + name = "Unicode-CaseFold-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; - sha256 = "c489b5a440e84b0554e866d3fe4077fa1956eeed473e203588e0c24acce1f016"; + sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; + buildInputs = [ ModuleBuild ]; meta = { homepage = http://metacpan.org/release/Unicode-CaseFold; description = "Unicode case-folding for case-insensitive lookups"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -14383,6 +15209,18 @@ let self = _self // overrides; _self = with self; { }; }; + UUIDTiny = buildPerlPackage rec { + name = "UUID-Tiny-1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CA/CAUGUSTIN/${name}.tar.gz"; + sha256 = "6dcd92604d64e96cc6c188194ae16a9d3a46556224f77b6f3d1d1312b68f9a3d"; + }; + meta = { + description = "Pure Perl UUID Support With Functional Interface"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + VariableMagic = buildPerlPackage rec { name = "Variable-Magic-0.58"; src = fetchurl { @@ -14392,10 +15230,14 @@ let self = _self // overrides; _self = with self; { }; version = buildPerlPackage rec { - name = "version-0.9912"; + name = "version-0.9918"; src = fetchurl { url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz"; - sha256 = "03hv7slgqrmzbbjjmxgvq91bjlbjg5xbp8n4h454amyab2adzw7b"; + sha256 = "54175c7ead4e2259c2fb2b83440b821e4287842067227e48fb899b5cae52237b"; + }; + meta = { + description = "Structured version objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14957,4 +15799,19 @@ let self = _self // overrides; _self = with self; { }; }; + WebServiceLinode = buildPerlModule rec { + name = "WebService-Linode-0.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKEGRB/${name}.tar.gz"; + sha256 = "66a315016999c0d2043caae86e664dad10c6613708f33a2f56aae8030326c509"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ JSON LWP LWPProtocolhttps ]; + meta = { + homepage = https://github.com/mikegrb/WebService-Linode; + description = "Perl Interface to the Linode.com API"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + }; in self diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e07930a94db0..c5e3ac0ac554 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -235,11 +235,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.3.2"; + version = "1.4.1"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva"; + sha256 = "1g2wsnjcx1ysbw1ps2xwyhgcl8kl3yfzxgwcnh5rigjk6k67glmb"; }; phases = [ "installPhase" ]; @@ -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/platforms.nix b/pkgs/top-level/platforms.nix deleted file mode 100644 index e26bc9e66ae1..000000000000 --- a/pkgs/top-level/platforms.nix +++ /dev/null @@ -1,493 +0,0 @@ -rec { - pcBase = { - name = "pc"; - uboot = null; - kernelHeadersBaseConfig = "defconfig"; - kernelBaseConfig = "defconfig"; - # Build whatever possible as a module, if not stated in the extra config. - kernelAutoModules = true; - kernelTarget = "bzImage"; - }; - - pc64 = pcBase // { kernelArch = "x86_64"; }; - - pc32 = pcBase // { kernelArch = "i386"; }; - - pc32_simplekernel = pc32 // { - kernelAutoModules = false; - }; - - pc64_simplekernel = pc64 // { - kernelAutoModules = false; - }; - - sheevaplug = { - name = "sheevaplug"; - kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; - kernelBaseConfig = "multi_v5_defconfig"; - kernelArch = "arm"; - kernelAutoModules = false; - kernelExtraConfig = - '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS m - XFS_FS m - JFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - # mv cesa requires this sw fallback, for mv-sha1 - CRYPTO_SHA1 y - # Fast crypto - CRYPTO_TWOFISH y - CRYPTO_TWOFISH_COMMON y - CRYPTO_BLOWFISH y - CRYPTO_BLOWFISH_COMMON y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - WATCHDOG y - WATCHDOG_CORE y - ORION_WATCHDOG m - - ZRAM m - NETCONSOLE m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # systemd uses cgroups - CGROUPS y - - # Latencytop - LATENCYTOP y - - # Ubi for the mtd - MTD_UBI y - UBIFS_FS y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - UBIFS_FS_LZO y - UBIFS_FS_ZLIB y - UBIFS_FS_DEBUG n - - # Kdb, for kernel troubles - KGDB y - KGDB_SERIAL_CONSOLE y - KGDB_KDB y - ''; - kernelMakeFlags = [ "LOADADDR=0x0200000" ]; - kernelTarget = "uImage"; - uboot = "sheevaplug"; - # Only for uboot = uboot : - ubootConfig = "sheevaplug_config"; - kernelDTB = true; # Beyond 3.10 - gcc = { - arch = "armv5te"; - float = "soft"; - }; - }; - - raspberrypi = { - name = "raspberrypi"; - kernelMajor = "2.6"; - kernelHeadersBaseConfig = "bcm2835_defconfig"; - kernelBaseConfig = "bcmrpi_defconfig"; - kernelDTB = true; - kernelArch = "arm"; - kernelAutoModules = false; - kernelExtraConfig = - '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y - ''; - kernelTarget = "zImage"; - uboot = null; - gcc = { - arch = "armv6"; - fpu = "vfp"; - float = "hard"; - }; - }; - - raspberrypi2 = armv7l-hf-multiplatform // { - name = "raspberrypi2"; - kernelBaseConfig = "bcm2709_defconfig"; - kernelDTB = true; - kernelAutoModules = false; - kernelExtraConfig = - '' - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - BTRFS_FS y - XFS_FS m - JFS_FS y - EXT4_FS y - - IP_PNP y - IP_PNP_DHCP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NETFILTER y - IP_NF_IPTABLES y - IP_NF_FILTER y - IP_NF_MATCH_ADDRTYPE y - IP_NF_TARGET_LOG y - IP_NF_MANGLE y - IPV6 m - VLAN_8021Q m - - CIFS y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - CIFS_ACL y - - ZRAM m - - # Disable OABI to have seccomp_filter (required for systemd) - # https://github.com/raspberrypi/firmware/issues/651 - OABI_COMPAT n - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # nixos mounts some cgroup - CGROUPS y - - # Latencytop - LATENCYTOP y - - # Disable the common config Xen, it doesn't build on ARM - XEN? n - ''; - kernelTarget = "zImage"; - uboot = null; - }; - - guruplug = sheevaplug // { - # Define `CONFIG_MACH_GURUPLUG' (see - # ) - # and other GuruPlug-specific things. Requires the `guruplug-defconfig' - # patch. - - kernelBaseConfig = "guruplug_defconfig"; - #kernelHeadersBaseConfig = "guruplug_defconfig"; - }; - - fuloong2f_n32 = { - name = "fuloong2f_n32"; - kernelMajor = "2.6"; - kernelHeadersBaseConfig = "fuloong2e_defconfig"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelArch = "mips"; - kernelAutoModules = false; - kernelExtraConfig = - '' - MIGRATION n - COMPACTION n - - # nixos mounts some cgroup - CGROUPS y - - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - IP_PNP y - IP_PNP_DHCP y - IP_PNP_BOOTP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # Needed for udev >= 150 - SYSFS_DEPRECATED_V2 n - - VGA_CONSOLE n - VT_HW_CONSOLE_BINDING y - SERIAL_8250_CONSOLE y - FRAMEBUFFER_CONSOLE y - EXT2_FS y - EXT3_FS y - REISERFS_FS y - MAGIC_SYSRQ y - - # The kernel doesn't boot at all, with FTRACE - FTRACE n - ''; - kernelTarget = "vmlinux"; - uboot = null; - gcc.arch = "loongson2f"; - }; - - beaglebone = armv7l-hf-multiplatform // { - name = "beaglebone"; - kernelBaseConfig = "omap2plus_defconfig"; - kernelAutoModules = false; - kernelExtraConfig = ""; # TBD kernel config - kernelTarget = "zImage"; - uboot = null; - }; - - armv7l-hf-multiplatform = { - name = "armv7l-hf-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "multi_v7_defconfig"; - kernelBaseConfig = "multi_v7_defconfig"; - kernelArch = "arm"; - kernelDTB = true; - kernelAutoModules = false; - uboot = null; - kernelTarget = "zImage"; - gcc = { - # Some table about fpu flags: - # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png - # Cortex-A5: -mfpu=neon-fp16 - # Cortex-A7 (rpi2): -mfpu=neon-vfpv4 - # Cortex-A8 (beaglebone): -mfpu=neon - # Cortex-A9: -mfpu=neon-fp16 - # Cortex-A15: -mfpu=neon-vfpv4 - - # More about FPU: - # https://wiki.debian.org/ArmHardFloatPort/VfpComparison - - # vfpv3-d16 is what Debian uses and seems to be the best compromise: NEON is not supported in e.g. Scaleway or Tegra 2, - # and the above page suggests NEON is only an improvement with hand-written assembly. - arch = "armv7-a"; - fpu = "vfpv3-d16"; - float = "hard"; - - # For Raspberry Pi the 2 the best would be: - # cpu = "cortex-a7"; - # fpu = "neon-vfpv4"; - }; - }; - - aarch64-multiplatform = { - name = "aarch64-multiplatform"; - kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "defconfig"; - kernelBaseConfig = "defconfig"; - kernelArch = "arm64"; - kernelDTB = true; - kernelAutoModules = false; - kernelExtraConfig = '' - # Raspberry Pi 3 stuff. Not needed for kernels >= 4.10. - ARCH_BCM2835 y - BCM2835_MBOX y - BCM2835_WDT y - BRCMFMAC m - DMA_BCM2835 m - DRM_VC4 m - I2C_BCM2835 m - PWM_BCM2835 m - RASPBERRYPI_FIRMWARE y - RASPBERRYPI_POWER y - SERIAL_8250_BCM2835AUX y - SERIAL_8250_EXTENDED y - SERIAL_8250_SHARE_IRQ y - SND_BCM2835_SOC_I2S m - SPI_BCM2835AUX m - SPI_BCM2835 m - - # Cavium ThunderX stuff. - PCI_HOST_THUNDER_ECAM y - THUNDER_NIC_RGX y - THUNDER_NIC_BGX y - THUNDER_NIC_PF y - THUNDER_NIC_VF y - ''; - uboot = null; - kernelTarget = "Image"; - gcc = { - arch = "armv8-a"; - }; - }; - - selectPlatformBySystem = system: { - "i686-linux" = pc32; - "x86_64-linux" = pc64; - "armv5tel-linux" = sheevaplug; - "armv6l-linux" = raspberrypi; - "armv7l-linux" = armv7l-hf-multiplatform; - "aarch64-linux" = aarch64-multiplatform; - "mips64el-linux" = fuloong2f_n32; - }.${system} or pcBase; -} diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix index 005e09cc003e..a16008880328 100644 --- a/pkgs/top-level/pure-packages.nix +++ b/pkgs/top-level/pure-packages.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, octaveHg }: rec { audio = callPackage ../development/pure-modules/audio { }; @@ -19,7 +19,7 @@ rec { lv2 = callPackage ../development/pure-modules/lv2 { }; midi = callPackage ../development/pure-modules/midi { }; mpfr = callPackage ../development/pure-modules/mpfr { }; - octave = callPackage ../development/pure-modules/octave { }; + octave = callPackage ../development/pure-modules/octave { octave = octaveHg; }; odbc = callPackage ../development/pure-modules/odbc { }; pandoc = callPackage ../development/pure-modules/pandoc { }; rational = callPackage ../development/pure-modules/rational { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11ebfad988c2..8ca3ace2083f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,3 +1,11 @@ +# This file contains the Python packages set. +# Each attribute is a Python library or a helper function. +# Expressions for Python libraries are supposed to be in `pkgs/development/python-modules//default.nix`. +# Python packages that do not need to be available for each interpreter version do not belong in this packages set. +# Examples are Python-based cli tools. +# +# For more details, please see the Python section in the Nixpkgs manual. + { pkgs , stdenv , python @@ -45,21 +53,24 @@ let let url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; in pkgs.fetchurl {inherit url sha256;}; - - fetchSource = {pname, version, sha256}: + fetchSource = {pname, version, sha256, extension ? "tar.gz"}: # Fetch a source tarball. let - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}"; in pkgs.fetchurl {inherit url sha256;}; fetcher = (if format == "wheel" then fetchWheel else if format == "setuptools" then fetchSource else throw "Unsupported kind ${kind}"); in fetcher (builtins.removeAttrs attrs ["format"]); + # This should become part of stdenv! + sharedLibraryExtension = if stdenv.isDarwin then ".dylib" else ".so"; + in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; - inherit fetchPypi; + inherit fetchPypi callPackage; + inherit sharedLibraryExtension; # helpers @@ -73,187 +84,59 @@ in { vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; }; - acoustics = buildPythonPackage rec { - pname = "acoustics"; - version = "0.1.2"; - name = pname + "-" + version; + acoustics = callPackage ../development/python-modules/acoustics { }; - 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; - }; - }; + "3to2" = callPackage ../development/python-modules/3to2 { }; aenum = callPackage ../development/python-modules/aenum { }; - agate = buildPythonPackage rec { - name = "agate-1.2.2"; - disabled = isPy3k; + agate = callPackage ../development/python-modules/agate { }; - meta = { - description = "A Python data analysis library that is optimized for humans instead of machines"; - homepage = "https://github.com/wireservice/agate"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; + agate-dbf = callPackage ../development/python-modules/agate-dbf { }; - propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel pytimeparse ]; + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; - src = pkgs.fetchurl { - url = "mirror://pypi/a/agate/${name}.tar.gz"; - sha256 = "0h2w30a0zhylivz86d823a05hvg8w8p61lmm855z1wwkgml9l9d4"; - }; - }; + agate-excel = callPackage ../development/python-modules/agate-excel { }; - agate-dbf = buildPythonPackage rec { - name = "agate-dbf-0.1.0"; - disabled = isPy3k; + agate-sql = callPackage ../development/python-modules/agate-sql { }; - meta = { - description = "Adds read support for dbf files to agate"; - homepage = "https://github.com/wireservice/agate-dbf"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; + ansicolor = callPackage ../development/python-modules/ansicolor { }; - propagatedBuildInputs = with self; [ agate dbf dbfread ]; + asn1crypto = callPackage ../development/python-modules/asn1crypto { }; - src = pkgs.fetchurl { - url = "mirror://pypi/a/agate-dbf/${name}.tar.gz"; - sha256 = "0xzz834lh4xbl342c6wmxqy7ynmsrjp42bsjahfcxhsgq33vzngz"; - }; - }; + astropy = callPackage ../development/python-modules/astropy { }; - agate-excel = buildPythonPackage rec { - name = "agate-excel-0.1.0"; - disabled = isPy3k; - - meta = { - description = "Adds read support for excel files to agate"; - homepage = "https://github.com/wireservice/agate-excel"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; - - propagatedBuildInputs = with self; [ agate openpyxl xlrd ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/agate-excel/${name}.tar.gz"; - sha256 = "08zvj3pwqw8zhd58iyymiwblrk92y4gl6yyrb2svb0k8za7v0hak"; - }; - }; - - 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 ]; - }; - }; + automat = callPackage ../development/python-modules/automat { }; # packages defined elsewhere + bap = callPackage ../development/python-modules/bap { + bap = pkgs.ocamlPackages_4_02.bap; + }; + + bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + blivet = callPackage ../development/python-modules/blivet { }; breathe = callPackage ../development/python-modules/breathe { }; + browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy {}; + bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; - dbf = buildPythonPackage rec { - name = "dbf-0.94.003"; - disabled = isPy3k; + dbf = callPackage ../development/python-modules/dbf { }; - meta = { - description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; - homepage = "https://pypi.python.org/pypi/dbf"; - license = licenses.bsd2; - maintainers = with maintainers; [ vrthra ]; - }; + dbfread = callPackage ../development/python-modules/dbfread { }; - src = pkgs.fetchurl { - url = "mirror://pypi/d/dbf/${name}.tar.gz"; - sha256 = "0i2454hwg67079jb56x663wqmmwr55pcr6c76q2415185y6nhny9"; - }; - }; + dkimpy = callPackage ../development/python-modules/dkimpy { }; - - dbfread = buildPythonPackage rec { - name = "dbfread-2.0.5"; - disabled = isPy3k; - - meta = { - description = "Read DBF Files with Python"; - homepage = "http://dbfread.readthedocs.org/"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dbfread/${name}.tar.gz"; - sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93"; - }; - }; - - 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 { }; @@ -265,6 +148,8 @@ in { hdf5 = pkgs.hdf5-mpi; }; + intelhex = callPackage ../development/python-modules/intelhex { }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; @@ -285,10 +170,16 @@ in { nltk = callPackage ../development/python-modules/nltk.nix { }; + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; + pitz = callPackage ../applications/misc/pitz { }; plantuml = callPackage ../tools/misc/plantuml { }; + Pmw = callPackage ../development/python-modules/Pmw { }; + + pyaes = callPackage ../development/python-modules/pyaes.nix { }; + pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; pycairo = callPackage ../development/python-modules/pycairo { }; @@ -305,7 +196,10 @@ in { pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; + 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; }; @@ -328,37 +222,21 @@ in { pyside = callPackage ../development/python-modules/pyside { }; - pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; - - pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; - - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { + inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. + }; 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 { }; - pytimeparse = buildPythonPackage rec { - pname = "pytimeparse"; - version = "1.1.6"; - name = "${pname}-${version}"; - - meta = { - description = "A small Python library to parse various kinds of time expressions"; - homepage = "https://github.com/wroberts/pytimeparse"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; - - propagatedBuildInputs = with self; [ nose ]; - - src = fetchPypi { - inherit pname version; - sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; - }; - }; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; PyWebDAV = callPackage ../development/python-modules/pywebdav { }; @@ -378,256 +256,31 @@ 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.0.0"; + adal = callPackage ../development/python-modules/adal { }; - src = pkgs.fetchurl { - url = "mirror://pypi/a/altair/${name}.tar.gz"; - sha256 = "024drhmiw8w3dl7dbal0pvnlfd3sv4n1rqywv2jb488b3fzm704r"; - }; + afew = callPackage ../development/python-modules/afew { }; - propagatedBuildInputs = with self; [ vega pandas ipython traitlets ]; + aiodns = callPackage ../development/python-modules/aiodns { }; - 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"; - }; - - 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 requests2 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; [ requests2 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"; - }; - }; + aiofiles = callPackage ../development/python-modules/aiofiles { }; aiohttp = buildPythonPackage rec { name = "aiohttp-${version}"; @@ -652,179 +305,25 @@ in { }; }; - alabaster = buildPythonPackage rec { - name = "alabaster-0.7.7"; + alabaster = callPackage ../development/python-modules/alabaster {}; - src = pkgs.fetchurl { - url = "mirror://pypi/a/alabaster/${name}.tar.gz"; - sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71"; - }; + alembic = callPackage ../development/python-modules/alembic {}; - propagatedBuildInputs = with self; [ pygments ]; + ansicolors = callPackage ../development/python-modules/ansicolors {}; - # No tests included - doCheck = false; + aniso8601 = callPackage ../development/python-modules/aniso8601 {}; - meta = { - homepage = https://github.com/bitprophet/alabaster; - description = "A Sphinx theme"; - license = licenses.bsd3; - }; - }; + asgiref = callPackage ../development/python-modules/asgiref { }; + asgi_ipc = callPackage ../development/python-modules/asgi_ipc { }; - alembic = buildPythonPackage rec { - name = "alembic-0.8.3"; + asgi_redis = callPackage ../development/python-modules/asgi_redis { }; - src = pkgs.fetchurl { - url = "mirror://pypi/a/alembic/${name}.tar.gz"; - sha256 = "1sgwvwylzd5h14130mwr0cbyy0fil0a1bq0d0ki97wqvkic3db7f"; - }; + python-editor = callPackage ../development/python-modules/python-editor { }; - buildInputs = with self; [ pytest pytestcov mock coverage ]; - propagatedBuildInputs = with self; [ Mako sqlalchemy python-editor ]; + python-gnupg = callPackage ../development/python-modules/python-gnupg {}; - meta = { - homepage = http://bitbucket.org/zzzeek/alembic; - description = "A database migration tool for SQLAlchemy"; - license = licenses.mit; - }; - }; - - ansicolors = buildPythonPackage rec { - name = "ansicolors-${version}"; - version = "1.0.2"; - - 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 ]; - }; - }; - - asgiref = buildPythonPackage rec { - name = "asgiref-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "1jg4nxjsn7nc4vd3170xd60m6syn57m6xwyyna6r68vniq8nhg7i"; - }; - - propagatedBuildInputs = with self ; [ six ]; - - meta = { - description = "Reference ASGI adapters and channel layers"; - license = licenses.bsd3; - homepage = https://github.com/django/asgiref; - }; - }; - - asgi_ipc = buildPythonPackage rec { - name = "asgi_ipc-${version}"; - version = "1.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "03phyfj30s4sgaqfbmv38nfvx3kdmjwsh3558d2lxrf2gdrimmf9"; - }; - - propagatedBuildInputs = with self ; [ asgiref msgpack posix_ipc ]; - - meta = { - description = "Posix IPC-backed ASGI channel layer implementation"; - license = licenses.bsd3; - homepage = http://github.com/django/asgi_ipc/; - }; - }; - - asgi_redis = buildPythonPackage rec { - name = "asgi_redis-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; - sha256 = "1pdzxannmgb0as2x6xy0rk4xi8ygnsggpsa0z31pzpwbk6jsgwxd"; - }; - - # Requires a redis server available - doCheck = false; - - propagatedBuildInputs = with self ; [ asgiref asgi_ipc msgpack six redis cryptography ]; - - meta = { - description = "Redis-backed ASGI channel layer implementation"; - license = licenses.bsd3; - homepage = http://github.com/django/asgi_redis/; - }; - }; - - python-editor = buildPythonPackage rec { - name = "python-editor-${version}"; - version = "0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-editor/${name}.tar.gz"; - sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4"; - }; - - 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.3.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-gnupg/${name}.tar.gz"; - sha256 = "0nkbs9c8f30lra7ca39kg91x8cyxn0jb61vih4qky839gpbwwwiq"; - }; - - # Let's make the library default to our gpg binary - patchPhase = '' - substituteInPlace gnupg.py \ - --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" - ''; - - 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}"; @@ -850,7 +349,36 @@ in { }; }; - almir = buildPythonPackage rec { + almir = let + sqlalchemy_0_8 = buildPythonPackage rec { + name = "SQLAlchemy-0.8.7"; + disabled = isPy34 || isPy35; +# doCheck = !isPyPy; + + src = pkgs.fetchurl { + url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; + sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc"; + }; + + preConfigure = optionalString isPy3k '' + python3 sa2to3.py --no-diffs -w lib test examples + ''; + + buildInputs = with self; [ nose mock ] + ++ stdenv.lib.optional doCheck pysqlite; + + checkPhase = '' + ${python.executable} sqla_nose.py + ''; + + doCheck = false; + + meta = { + homepage = http://www.sqlalchemy.org/; + description = "A Python SQL toolkit and Object Relational Mapper"; + }; + }; + in buildPythonPackage rec { name = "almir-0.1.8"; src = pkgs.fetchurl { @@ -883,12 +411,12 @@ in { self.pyramid_jinja2 self.pyramid_tm self.pytz - self.sqlalchemy8 + sqlalchemy_0_8 self.transaction self.waitress self.webhelpers self.psycopg2 - (self.zope_sqlalchemy.override rec {propagatedBuildInputs = with self; [ sqlalchemy8 transaction ];}) + (self.zope_sqlalchemy.override rec {propagatedBuildInputs = with self; [ sqlalchemy_0_8 transaction ];}) ]; postInstall = '' @@ -898,12 +426,14 @@ in { meta = { maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; + # Two versions of sqlalchemy in closure + broken = true; }; }; alot = buildPythonPackage rec { - rev = "0.5"; + rev = "0.5.1"; name = "alot-${rev}"; disabled = isPy3k; @@ -912,7 +442,7 @@ in { owner = "pazz"; repo = "alot"; inherit rev; - sha256 = "1hzajfh0f21k97xip9blg7zifiv3y5k33swp2h9sc57qd7qkr5i6"; + sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8"; }; postPatch = '' @@ -1023,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"; @@ -1049,20 +580,7 @@ in { }; }; - appdirs = buildPythonPackage rec { - name = "appdirs-1.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/appdirs/appdirs-1.4.0.tar.gz"; - sha256 = "8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5"; - }; - - meta = { - description = "A python module for determining appropriate platform-specific dirs"; - homepage = http://github.com/ActiveState/appdirs; - license = licenses.mit; - }; - }; + appdirs = callPackage ../development/python-modules/appdirs { }; application = buildPythonPackage rec { pname = "python-application"; @@ -1126,7 +644,7 @@ in { }; meta = with pkgs.stdenv.lib; { - descriptions = "Library for reading, writing and rewriting python AST"; + description = "Library for reading, writing and rewriting python AST"; homepage = https://github.com/berkerpeksag/astor; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; @@ -1170,39 +688,7 @@ in { }; }; - apscheduler = buildPythonPackage rec { - name = "APScheduler-3.0.4"; - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/A/APScheduler/${name}.tar.gz"; - sha256 = "1ljjhn6cv8b1pccsi3mgc887ypi2vim317r9p0zh0amd0bhkk6wb"; - }; - - buildInputs = with self; [ - pytest - sqlalchemy - tornado - twisted - mock - trollius - funcsigs - gevent - ]; - - propagatedBuildInputs = with self; [ - six - pytz - tzlocal - futures - ]; - - meta = with pkgs.stdenv.lib; { - description = "A Python library that lets you schedule your Python code to be executed"; - homepage = http://pypi.python.org/pypi/APScheduler/; - license = licenses.mit; - }; - }; + APScheduler = callPackage ../development/python-modules/APScheduler { }; args = buildPythonPackage rec { name = "args-0.1.0"; @@ -1218,6 +704,8 @@ in { }; }; + argcomplete = callPackage ../development/python-modules/argcomplete { }; + area53 = buildPythonPackage (rec { name = "Area53-0.94"; @@ -1266,29 +754,17 @@ in { }; }; - arrow = buildPythonPackage rec { - name = "arrow-${version}"; - version = "0.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/arrow/${name}.tar.gz"; - sha256 = "0yx10dz3hp825fcq9w15zbp26v622npcjscb91da05zig8036lra"; - }; - - checkPhase = '' - nosetests - ''; - - buildInputs = with self; [ nose chai simplejson ]; - propagatedBuildInputs = with self; [ dateutil ]; - - meta = { - description = "Python library for date manipulation"; - license = "apache"; - maintainers = with maintainers; [ thoughtpolice ]; - }; + arelle = callPackage ../development/python-modules/arelle { + gui = true; }; + arelle-headless = callPackage ../development/python-modules/arelle { + gui = false; + }; + + + arrow = callPackage ../development/python-modules/arrow { }; + async = buildPythonPackage rec { name = "async-0.6.1"; disabled = isPy3k; @@ -1364,36 +840,8 @@ in { }; - argparse = buildPythonPackage (rec { - name = "argparse-1.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/argparse/${name}.tar.gz"; - sha256 = "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32"; - }; - - checkPhase = '' - export PYTHONPATH=`pwd`/build/lib:$PYTHONPATH - ${python.interpreter} test/test_argparse.py - ''; - - # ordering issues in tests - doCheck = !isPy3k; - - meta = { - homepage = http://code.google.com/p/argparse/; - license = licenses.asl20; - description = "argparse: Python command line parser"; - longDescription = '' - The argparse module makes writing command line tools in Python - easy. Just briefly describe your command line interface and - argparse will take care of the rest, including: parsing the - arguments and flags from sys.argv, converting arg strings into - objects for your program, formatting and printing any help - messages, and much more. - ''; - }; - }); + # argparse is part of stdlib in 2.7 and 3.2+ + argparse = null; astroid = callPackage ../development/python-modules/astroid { }; @@ -1553,6 +1001,8 @@ in { }; })); + python-slugify = callPackage ../development/python-modules/python-slugify { }; + awesome-slugify = buildPythonPackage rec { name = "awesome-slugify-${version}"; version = "1.6.5"; @@ -1577,13 +1027,43 @@ in { }; }; - awscli = buildPythonPackage rec { - name = "awscli-${version}"; - version = "1.11.45"; - namePrefix = ""; - src = pkgs.fetchurl { - url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "0sv9dw4zsra8fm7ddbnwhlh80w534z4h8llz2p8asssaaj5nq2ya"; + noise = buildPythonPackage rec { + name = "noise-${version}"; + version = "1.2.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/n/noise/${name}.tar.gz"; + sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/caseman/noise"; + description = "Native-code and shader implementations of Perlin noise"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + + awscli = + let + colorama_3_7 = self.colorama.overrideAttrs (old: rec { + name = "${pname}-${version}"; + pname = "colorama"; + version = "0.3.7"; + src = fetchPypi { + inherit pname version; + sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; + }; + }); + in buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "awscli"; + version = "1.11.108"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "1wz76hkljc25zzfa2l5jv0mbr5vx6d9ixq4sq0p3zf3l45ql6mdf"; }; # No tests included @@ -1594,7 +1074,7 @@ in { bcdoc s3transfer six - colorama_3_3 + colorama_3_7 docutils rsa pyyaml @@ -1659,7 +1139,7 @@ in { sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24"; }; - propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests2 ]; + propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; meta = { description = "Microsoft Azure SDK for Python"; @@ -1711,7 +1191,7 @@ in { url = mirror://pypi/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip; sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; }; - propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests2 ]; + propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -1847,7 +1327,7 @@ in { url = mirror://pypi/a/azure-storage/azure-storage-0.20.3.zip; sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; }; - propagatedBuildInputs = with self; [ azure-common futures dateutil requests2 ]; + propagatedBuildInputs = with self; [ azure-common futures dateutil requests ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; @@ -1866,7 +1346,7 @@ in { url = mirror://pypi/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip; sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs"; }; - propagatedBuildInputs = with self; [ azure-common requests2 ]; + propagatedBuildInputs = with self; [ azure-common requests ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; @@ -1981,13 +1461,12 @@ in { }; babelfish = buildPythonPackage rec { - version = "0.5.3"; + version = "0.5.5"; name = "babelfish-${version}"; - disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/b/babelfish/${name}.tar.gz"; - sha256 = "0wrw21dyq7v6lbffwvi1ik43d7dhmcv8xvgrrihhiv7ys1rd3gag"; + sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; }; meta = { @@ -2050,6 +1529,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; @@ -2077,11 +1559,11 @@ in { }); beautifulsoup4 = buildPythonPackage (rec { - name = "beautifulsoup4-4.5.1"; + name = "beautifulsoup4-4.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz"; - sha256 = "1qgmhw65ncsgccjhslgkkszif47q6gvxwqv4mim17agxd81p951w"; + sha256 = "0glaw1vyxnbp03fni7h5496n6iib0n5iim4gax1n0ngscs9s075j"; }; buildInputs = [ self.nose ]; @@ -2097,26 +1579,6 @@ in { }; }); - # flexget needs beatifulsoup < 4.4 for now - beautifulsoup_4_1_3 = buildPythonPackage (rec { - name = "beautifulsoup4-4.1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz"; - sha256 = "0cbcml88bkx9gf1wznxa0kqz1wpyakfbyh9gmxw0wljhda1q0zk1"; - }; - - meta = { - homepage = http://crummy.com/software/BeautifulSoup/bs4/; - description = "HTML and XML parser"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - - disabled = isPy3k; - - }); - beaker = buildPythonPackage rec { name = "Beaker-${version}"; version = "1.8.0"; @@ -2157,7 +1619,7 @@ in { sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz"; }; - propagatedBuildInputs = [ self.requests2 ]; + propagatedBuildInputs = [ self.requests ]; doCheck = false; @@ -2188,6 +1650,8 @@ in { }; }; + bibtexparser = callPackage ../development/python-modules/bibtexparser { }; + binwalk_fun = { visualizationSupport ? false, pyqtgraph ? null }: assert visualizationSupport -> pyqtgraph != null; @@ -2424,6 +1888,26 @@ in { propagatedBuildInputs = with self; [ iowait psutil pyzmq tornado mock ]; }; + colorclass = buildPythonPackage rec { + pname = "colorclass"; + version = "2.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; + }; + + # No tests in archive + doCheck = false; + + meta = { + homepage = "https://github.com/Robpol86/colorclass"; + license = licenses.mit; + description = "Automatic support for console colors"; + }; + }; + colorlog = buildPythonPackage rec { name = "colorlog-${version}"; version = "2.6.1"; @@ -2462,6 +1946,8 @@ in { }; }; + constantly = callPackage ../development/python-modules/constantly { }; + cornice = buildPythonPackage rec { name = "cornice-${version}"; version = "1.2.1"; @@ -2476,25 +1962,11 @@ in { doCheck = false; # lazy packager }; - csvkit = buildPythonPackage rec { - name = "csvkit-${version}"; - version = "0.9.1"; - disabled = isPy3k; + cram = callPackage ../development/python-modules/cram { }; - src = pkgs.fetchurl { - url = "mirror://pypi/c/csvkit/${name}.tar.gz"; - sha256 = "0fprr4wgp0bq8kl5qims88np11af7ahr5bxkrhfwpdgcgdjbiy4j"; - }; + csscompressor = callPackage ../development/python-modules/csscompressor.nix {}; - propagatedBuildInputs = with self; [ dateutil_2_2 dbf xlrd sqlalchemy openpyxl_2_2_0_b1 ]; - - meta = { - description = "A library of utilities for working with CSV, the king of tabular file formats"; - maintainers = with maintainers; [ vrthra ]; - license = licenses.mit; - homepage = "https://github.com/wireservice/csvkit"; - }; - }; + csvkit = callPackage ../development/python-modules/csvkit { }; cx_Freeze = buildPythonPackage rec { name = "cx_freeze-${version}"; @@ -2582,7 +2054,7 @@ in { }; buildInputs = with self; [ pillow tox mock six nose ]; - propagatedBuildInputs = with self; [ requests2 decorator simplejson ]; + propagatedBuildInputs = with self; [ requests decorator simplejson ]; meta = { description = "The Datadog Python library "; @@ -2605,10 +2077,10 @@ in { defusedxml = buildPythonPackage rec { name = "${pname}-${version}"; pname = "defusedxml"; - version = "0.4.1"; + version = "0.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/${pname}/${name}.tar.gz"; - sha256 = "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd"; + sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; }; }; @@ -2624,7 +2096,7 @@ in { sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6"; }; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ requests2 lxml pbr ]; + propagatedBuildInputs = with self; [ requests lxml pbr ]; # prompt_toolkit doesn't work on 3.5 on OSX. doCheck = !isPy35; @@ -2668,25 +2140,13 @@ in { sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; }; - propagatedBuildInputs = with self; [ cookies mock requests2 six ]; + propagatedBuildInputs = with self; [ cookies mock requests six ]; doCheck = false; }; - rarfile = self.buildPythonPackage rec { - name = "rarfile-2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rarfile/rarfile-2.6.tar.gz"; - sha256 = "326700c5450cfb367f612e918866ea27551bac02f4656f340003c88873fa1a56"; - }; - - meta = { - description = "rarfile - RAR archive reader for Python"; - homepage = https://github.com/markokr/rarfile; - }; - }; + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; proboscis = buildPythonPackage rec { name = "proboscis-1.2.6.0"; @@ -2720,26 +2180,6 @@ in { }; }; - billiard_33 = buildPythonPackage rec { - name = "billiard-${version}"; - version = "3.3.0.23"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/billiard/${name}.tar.gz"; - sha256 = "02wxsc6bhqvzh8j6w758kvgqbnj14l796mvmrcms8fgfamd2lak9"; - }; - - buildInputs = with self; [ nose unittest2 mock ]; - - meta = { - homepage = https://github.com/celery/billiard; - description = "Python multiprocessing fork with improvements and bugfixes"; - license = licenses.bsd3; - }; - }; - billiard = buildPythonPackage rec { name = "billiard-${version}"; version = "3.5.0.2"; @@ -2811,7 +2251,7 @@ in { sha256 = "d881e21ec7ebfa006cfca6d10a5b7229aa59990568f8c6b8e3364769fa38b6f6"; }; - propagatedBuildInputs = [ self.requests2 ]; + propagatedBuildInputs = [ self.requests ]; # No tests doCheck = false; @@ -2872,7 +2312,7 @@ in { psutil pymongo pyyaml - requests2 + requests sqlalchemy tables toolz @@ -2896,7 +2336,7 @@ in { }; }; - # Needed for bleach 1.5.0 and calibre 2.76.0 + # Needed for FlexGet 1.2.337 and calibre 2.76.0 html5lib_0_9999999 = self.html5lib.override rec { name = "html5lib-${version}"; buildInputs = with self; [ nose flake8 ]; @@ -2912,23 +2352,20 @@ in { }; }; + httpserver = callPackage ../development/python-modules/httpserver {}; + bleach = buildPythonPackage rec { pname = "bleach"; - version = "1.5.0"; + version = "2.0.0"; name = "${pname}-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65"; + sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr"; }; buildInputs = with self; [ pytest pytestrunner ]; - propagatedBuildInputs = with self; [ six html5lib_0_9999999 ]; - - postPatch = '' - substituteInPlace setup.py --replace "==3.0.3" "" - substituteInPlace setup.py --replace ">=0.999,!=0.9999,!=0.99999,<0.99999999" "" - ''; + propagatedBuildInputs = with self; [ six html5lib ]; meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; @@ -2943,11 +2380,10 @@ in { to do lots of things, you're probably outside the use cases. Either trust those users, or don't. ''; - homepage = https://github.com/jsocol/bleach; - downloadPage = https://github.com/jsocol/bleach/releases; + homepage = https://github.com/mozilla/bleach; + downloadPage = https://github.com/mozilla/bleach/releases; license = licenses.asl20; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; }; }; @@ -3066,7 +2502,7 @@ in { werkzeug itsdangerous dateutil - requests2 + requests six pygments pystache @@ -3094,11 +2530,11 @@ in { boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.45.0"; + version = "2.47.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "18z5nacnbdpw3pmzc56didhy4sfik8riap204px24350g9xlgz7i"; + sha256 = "051gq8z9m2cir03jhc00qs36bnpla7zkqm9xqiqcqvdknmi2ndbq"; }; checkPhase = '' @@ -3106,7 +2542,7 @@ in { ''; buildInputs = [ self.nose self.mock ]; - propagatedBuildInputs = [ self.requests2 self.httpretty ]; + propagatedBuildInputs = [ self.requests self.httpretty ]; meta = { homepage = https://github.com/boto/boto; @@ -3146,6 +2582,9 @@ in { runHook postCheck ''; + # Network access + doCheck = false; + meta = { homepage = https://github.com/boto/boto3; license = stdenv.lib.licenses.asl20; @@ -3159,16 +2598,18 @@ in { }; botocore = buildPythonPackage rec { - version = "1.5.8"; # This version is required by awscli - name = "botocore-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "1qhrq2l9kvhi3gnrgwqhvy42aqbsk93j8mfr4ixqx18yqgbnylvz"; + name = "${pname}-${version}"; + pname = "botocore"; + version = "1.5.71"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fgg28halsy4g43wjpkbd6l0wqiwyzkd4zjrzbbyzw4dxbsf3xfm"; }; propagatedBuildInputs = [ self.dateutil - self.requests2 + self.requests self.jmespath ]; @@ -3234,6 +2675,8 @@ in { }; }; + branca = callPackage ../development/python-modules/branca { }; + bugwarrior = buildPythonPackage rec { name = "bugwarrior-${version}"; version = "1.4.0"; @@ -3245,7 +2688,7 @@ in { buildInputs = with self; [ mock unittest2 nose /* jira megaplan */ ]; propagatedBuildInputs = with self; [ - twiggy requests2 offtrac bugzilla taskw dateutil pytz keyring six + twiggy requests offtrac bugzilla taskw dateutil pytz keyring six jinja2 pycurl dogpile_cache lockfile click pyxdg ]; @@ -3291,7 +2734,7 @@ in { patches = [ ../development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch ]; buildInputs = with self; [ pep8 coverage logilab_common ]; - propagatedBuildInputs = [ self.requests2 ]; + propagatedBuildInputs = [ self.requests ]; preCheck = '' mkdir -p check-phase @@ -3307,9 +2750,6 @@ in { }; }; - buildout = self.zc_buildout; - buildout152 = self.zc_buildout152; - check-manifest = buildPythonPackage rec { name = "check-manifest"; version = "0.30"; @@ -3338,7 +2778,7 @@ in { sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j"; }; - propagatedBuildInputs = [ self.requests2 self.py ]; + propagatedBuildInputs = [ self.requests self.py ]; meta = { homepage = https://bitbucket.org/hpk42/devpi; @@ -3351,9 +2791,8 @@ in { # A patched version of buildout, useful for buildout based development on Nix zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - zc_recipe_egg = self.zc_recipe_egg_buildout171; - zc_buildout = self.zc_buildout171; - zc_buildout2 = self.zc_buildout221; + zc_buildout = self.zc_buildout221; + zc_buildout221 = buildPythonPackage rec { name = "zc.buildout-2.2.1"; @@ -3370,72 +2809,6 @@ in { }; }; - zc_buildout171 = buildPythonPackage rec { - name = "zc.buildout-1.7.1"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zc.buildout/${name}.tar.gz"; - sha256 = "a5c2fafa4d073ad3dabec267c44a996cbc624700a9a49467cd6b1ef63d35e029"; - }; - - meta = { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpt21; - maintainers = with maintainers; [ garbas ]; - }; - }; - - zc_buildout152 = buildPythonPackage rec { - name = "zc.buildout-1.5.2"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zc.buildout/${name}.tar.gz"; - sha256 = "0ac5a325d3ffbc5a988fb3ba87f4159d4769cc73e3331cb5234edc8839b6506b"; - }; - - # TODO: consider if this patch should be an option - # It makes buildout useful in a nix profile, but this alters the default functionality - patchPhase = '' - sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py - ''; - - meta = { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpt21; - maintainers = with maintainers; [ garbas ]; - }; - }; - - zc_recipe_egg_fun = { buildout, version, sha256 }: buildPythonPackage rec { - inherit version; - name = "zc.recipe.egg-${version}"; - - buildInputs = with self; [ buildout ]; - doCheck = false; - - src = pkgs.fetchurl { - inherit sha256; - url = "mirror://pypi/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz"; - }; - meta.broken = true; # https://bitbucket.org/pypa/setuptools/issues/462/pkg_resourcesfind_on_path-thinks-the - }; - zc_recipe_egg_buildout171 = self.zc_recipe_egg_fun { - buildout = self.zc_buildout171; - version = "1.3.2"; - sha256 = "12zl16fdz85l6hgrkqwily7d2brr9w5pdfqri5n978gh36mqf526"; - }; - zc_recipe_egg_buildout2 = self.zc_recipe_egg_fun { - buildout = self.zc_buildout2; - version = "2.0.3"; - sha256 = "0d7xkxxhm5bwrscchjzc88559njirqxishdwl2qjx3gij3s12l5s"; - }; - bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; meta.maintainers = with maintainers; [ mornfall ]; @@ -3630,31 +3003,6 @@ in { }; }; - celery_3 = buildPythonPackage rec { - name = "celery-${version}"; - version = "3.1.23"; - - disabled = (pythonOlder "2.6") || isPy35; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/celery/${name}.tar.gz"; - sha256 = "0614ppp18vmiwdk0rxvz0wn62d7svanwdnx7jgqxpy9pb20rqd8s"; - }; - - buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ kombu_3 billiard_33 pytz anyjson amqp_1 ]; - - checkPhase = '' - nosetests $out/${python.sitePackages}/celery/tests/ - ''; - - meta = { - homepage = https://github.com/celery/celery/; - description = "Distributed task queue"; - license = licenses.bsd3; - }; - }; - celery = buildPythonPackage rec { name = "celery-${version}"; version = "4.0.2"; @@ -3690,37 +3038,9 @@ in { }; }; - certifi = buildPythonPackage rec { - name = "certifi-${version}"; - version = "2017.1.23"; + certifi = callPackage ../development/python-modules/certifi { }; - src = pkgs.fetchurl { - url = "mirror://pypi/c/certifi/${name}.tar.gz"; - sha256 = "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1"; - }; - - meta = { - homepage = http://certifi.io/; - description = "Python package for providing Mozilla's CA Bundle"; - license = licenses.isc; - maintainers = with maintainers; [ koral ]; - }; - }; - - characteristic = buildPythonPackage rec { - name = "characteristic-14.1.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/characteristic/${name}.tar.gz"; - sha256 = "91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d"; - }; - - buildInputs = with self; [ self.pytest ]; - - meta = { - description = "Python attributes without boilerplate"; - homepage = https://characteristic.readthedocs.org; - }; - }; + characteristic = callPackage ../development/python-modules/characteristic { }; # This package is no longer actively maintained and can be removed if it becomes broken. cgkit = buildPythonPackage rec { @@ -3771,15 +3091,17 @@ in { cherrypy = buildPythonPackage (rec { name = "cherrypy-${version}"; - version = "3.2.2"; + version = "8.7.0"; src = pkgs.fetchurl { - url = "http://download.cherrypy.org/cherrypy/${version}/CherryPy-${version}.tar.gz"; - sha256 = "14dn129h69wj0h8yr0bjwbrk8kygl6mkfnxc5m3fxhlm4xb8hnnw"; + url = "mirror://pypi/C/CherryPy/CherryPy-${version}.tar.gz"; + sha256 = "cbf418bf46458a67eb841944f2d414c23bf59d090baf2a28704bd67243e6a79f"; }; - # error: invalid command 'test' - doCheck = false; + # wsgiserver.ssl_pyopenssl is broken on py3k. + doCheck = !isPy3k; + buildInputs = with self; [ pytest setuptools_scm pytestrunner ]; + propagatedBuildInputs = with self; [ six ]; meta = { homepage = "http://www.cherrypy.org"; @@ -3819,7 +3141,7 @@ in { sed -i 's/==/>=/' requirements.txt ''; - propagatedBuildInputs = with self; [ docopt requests2 pygments ]; + propagatedBuildInputs = with self; [ docopt requests pygments ]; # Error when running tests: # No local packages or download links found for requests @@ -3834,11 +3156,11 @@ in { }; click = buildPythonPackage rec { - name = "click-6.6"; + name = "click-6.7"; src = pkgs.fetchurl { url = "mirror://pypi/c/click/${name}.tar.gz"; - sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc"; + sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; buildInputs = with self; [ pytest ]; @@ -4033,6 +3355,8 @@ in { }; }; + codecov = callPackage ../development/python-modules/codecov {}; + cogapp = buildPythonPackage rec { version = "2.3"; name = "cogapp-${version}"; @@ -4054,36 +3378,7 @@ in { }; }; - - colorama = buildPythonPackage rec { - name = "colorama-${version}"; - version = "0.3.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorama/${name}.tar.gz"; - sha256 = "e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = https://github.com/tartley/colorama; - license = "bsd"; - description = "Cross-platform colored terminal text"; - }; - }; - - # Needed for awscli - colorama_3_3 = self.colorama.override rec { - name = "colorama-${version}"; - version = "0.3.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorama/${name}.tar.gz"; - sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c"; - }; - }; - + colorama = callPackage ../development/python-modules/colorama { }; CommonMark = buildPythonPackage rec { name = "CommonMark-${version}"; @@ -4174,6 +3469,12 @@ in { # No tests available doCheck = false; + # Fix issue when used together with other namespace packages + # https://github.com/NixOS/nixpkgs/issues/23855 + patches = [ + ./../development/python-modules/configparser/0001-namespace-fix.patch + ]; + meta = { maintainers = [ ]; platforms = platforms.all; @@ -4247,6 +3548,8 @@ in { }; }; + confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; + construct = buildPythonPackage rec { name = "construct-${version}"; @@ -4276,14 +3579,14 @@ in { consul = buildPythonPackage (rec { - name = "python-consul-0.6.0"; + name = "python-consul-0.7.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-consul/${name}.tar.gz"; - sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh"; + sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm"; }; - buildInputs = with self; [ requests2 six pytest ]; + buildInputs = with self; [ requests six pytest ]; # No tests distributed. https://github.com/cablehead/python-consul/issues/133 doCheck = false; @@ -4358,6 +3661,8 @@ in { }; }; + coveralls = callPackage ../development/python-modules/coveralls { }; + coverage = buildPythonPackage rec { name = "coverage-4.0.1"; @@ -4433,11 +3738,11 @@ in { sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"; }; - # On i686-linux and Python 2.x this test fails because the result is "3L" - # instead of "3", so let's fix it in-place. + # With Python 2.x on i686-linux or 32-bit ARM this test fails because the + # result is "3L" instead of "3", so let's fix it in-place. # # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = optionalString (stdenv.isi686 && !isPy3k) '' + postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ tests/run/cpdef_enums.pyx ''; @@ -4456,6 +3761,10 @@ in { ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""} ''; + # Disable tests temporarily + # https://github.com/cython/cython/issues/1676 + doCheck = false; + meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; platforms = platforms.all; @@ -4514,25 +3823,39 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors - name = "cryptography-${version}"; - version = "1.7.2"; + pname = "cryptography"; + name = "${pname}${version}"; + version = "1.8.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "1ad9zmzi31fnz31qfchxcwiydvlxq88xndlgsvzr7m537n5vd347"; + src = fetchPypi { + inherit pname version; + sha256 = "323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190"; }; - buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors - self.iso8601 self.pyasn1 self.pytest_29 self.py self.hypothesis self.pytz ] + buildInputs = [ pkgs.openssl self.cryptography_vectors ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules pytz ] - ++ optional (pythonOlder "3.4") self.enum34; + propagatedBuildInputs = with self; [ + idna + asn1crypto + packaging + six + ] ++ optional (pythonOlder "3.4") enum34 + ++ optional (pythonOlder "3.3") ipaddress + ++ optional (!isPyPy) cffi; + + checkInputs = with self; [ + pytest + pretend + iso8601 + pytz + hypothesis + ]; # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't # use it. This boils down to them checking compatibility with `getentropy` in two different places, # so let's neuter the second test. - patchPhase = '' + postPatch = '' substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' ''; @@ -4543,13 +3866,17 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography - name = "cryptography_vectors-${version}"; - version = "1.7.2"; + pname = "cryptography_vectors"; + name = "${pname}${version}"; + version = "1.8.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "1p5cw3dzgcpzmp81qb9860hn9qlcvr4rnf0fy31fbvhxl7lfxr2b"; + src = fetchPypi { + inherit pname version; + sha256 = "2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6"; }; + + # No tests included + doCheck = false; }; oslo-vmware = buildPythonPackage rec { @@ -4563,7 +3890,7 @@ in { propagatedBuildInputs = with self; [ pbr stevedore netaddr iso8601 six oslo-i18n oslo-utils Babel pyyaml eventlet - requests2 urllib3 oslo-concurrency suds-jurko + requests urllib3 oslo-concurrency suds-jurko ]; buildInputs = with self; [ bandit oslosphinx coverage testtools testscenarios testrepository mock @@ -4581,7 +3908,7 @@ in { }; propagatedBuildInputs = with self; [ - pbr argparse requests2 six keystoneclient cliff oslo-i18n oslo-serialization + pbr argparse requests six keystoneclient cliff oslo-i18n oslo-serialization oslo-utils ]; buildInputs = with self; [ @@ -4631,7 +3958,7 @@ in { buildInputs = with self; [ pbr testtools testscenarios testrepository requests-mock fixtures ]; propagatedBuildInputs = with self; [ - Babel argparse prettytable requests2 simplejson six iso8601 + Babel argparse prettytable requests simplejson six iso8601 keystoneclient tempest-lib ]; # TODO: check if removing this test is really harmless @@ -4742,7 +4069,7 @@ in { propagatedBuildInputs = with self; [ pbr six Babel cliff os-client-config oslo-config oslo-i18n oslo-utils - glanceclient keystoneclient novaclient cinderclient neutronclient requests2 + glanceclient keystoneclient novaclient cinderclient neutronclient requests stevedore cliff-tablib ]; buildInputs = with self; [ @@ -4760,11 +4087,13 @@ in { idna = buildPythonPackage rec { - name = "idna-2.0"; + pname = "idna"; + version = "2.5"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/idna/${name}.tar.gz"; - sha256 = "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n"; + src = fetchPypi { + inherit pname version; + sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab"; }; meta = { @@ -4900,6 +4229,9 @@ in { sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; }; + # No tests in archive + doCheck = false; + meta = { homepage = https://github.com/alex/pretend; license = licenses.bsd3; @@ -4950,32 +4282,7 @@ in { bcrypt = callPackage ../development/python-modules/bcrypt.nix { }; - cffi = if isPyPy then null else buildPythonPackage rec { - name = "cffi-1.9.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cffi/${name}.tar.gz"; - sha256 = "563e0bd53fda03c151573217b3a49b3abad8813de9dd0632e10090f6190fdaf8"; - }; - - propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; - buildInputs = with self; [ pytest ]; - - patchPhase = '' - substituteInPlace testing/cffi0/test_ownlib.py --replace "gcc" "cc" - ''; - - checkPhase = '' - py.test - ''; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - homepage = https://cffi.readthedocs.org/; - license = with licenses; [ mit ]; - description = "Foreign Function Interface for Python calling C code"; - }; - }; + cffi = callPackage ../development/python-modules/cffi { }; pycollada = buildPythonPackage rec { name = "pycollada-0.4.1"; @@ -5066,7 +4373,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 @@ -5085,6 +4392,10 @@ in { }; }; + PyLD = callPackage ../development/python-modules/PyLD { }; + + python-jose = callPackage ../development/python-modules/python-jose {}; + pyhepmc = buildPythonPackage rec { name = "pyhepmc-${version}"; version = "0.5.0"; @@ -5136,6 +4447,10 @@ in { }; }; + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + + pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + pytestcache = buildPythonPackage rec { name = "pytest-cache-1.0"; src = pkgs.fetchurl { @@ -5155,12 +4470,34 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-cache/"; + homepage = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; }; }; - pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; + pytest-catchlog = buildPythonPackage rec { + name = "pytest-catchlog-1.2.2"; + src = pkgs.fetchurl { + url = "mirror://pypi/p/pytest-catchlog/${name}.zip"; + sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; + }; + + buildInputs = with self; [ pytest ]; + + checkPhase = "make test"; + + meta = { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-catchlog/; + description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; + }; + }; + + pytest-cram = callPackage ../development/python-modules/pytest-cram { }; + + pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; + + pytest-django = callPackage ../development/python-modules/pytest-django { }; pytest-fixture-config = buildPythonPackage rec { name = "${pname}-${version}"; @@ -5213,6 +4550,8 @@ in { }; }; + pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; + pytestflakes = buildPythonPackage rec { name = "pytest-flakes-${version}"; version = "1.0.1"; @@ -5231,7 +4570,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-flakes"; + homepage = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; }; }; @@ -5239,9 +4578,9 @@ in { pytest-mock = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-mock"; - version = "1.2"; + version = "1.6.0"; - buildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest setuptools_scm ]; propagatedBuildInputs = with self; [ mock ]; meta = { @@ -5252,9 +4591,9 @@ in { platforms = platforms.all; }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.zip"; - sha256 = "03zxar5drzm7ksqyrwypjaza3cri6wqvpr6iam92djvg6znp32gp"; + src = fetchPypi { + inherit pname version; + sha256 = "07qccww4bq9jxlc0fbhlspr13kcsixchsnl8vk4wdiyvsjy7r8c3"; }; }; @@ -5277,7 +4616,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-pep8"; + homepage = "https://pypi.python.org/pypi/pytest-pep8"; description = "pytest plugin to check PEP8 requirements"; }; }; @@ -5342,7 +4681,7 @@ in { meta = { license = licenses.asl20; - website = "https://pypi.python.org/pypi/pytest-quickcheck"; + homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; }; }; @@ -5353,7 +4692,7 @@ in { version = "1.1.0"; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests2 ]; + propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests ]; meta = { description = "Extensible server fixures for py.test"; @@ -5374,10 +4713,10 @@ in { pytest-shutil = buildPythonPackage rec { name = "pytest-shutil-${version}"; - version = "1.1.1"; + version = "1.2.8"; src = pkgs.fetchurl { url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz"; - sha256 = "bb3c4fc2dddaf70b38bd9bb7a710d07728fa14f88fbc89c2a07979b383ade5d4"; + sha256 = "924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d"; }; buildInputs = with self; [ cmdline pytest ]; propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; @@ -5389,45 +4728,47 @@ in { license = licenses.mit; }; - checkPhase = '' py.test ''; - # Bunch of pickle errors - doCheck = false; }; - pytestcov = buildPythonPackage (rec { - name = "pytest-cov-2.3.1"; + pytestcov = buildPythonPackage rec { + name = "pytest-cov-2.4.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pytest-cov/${name}.tar.gz"; - sha256 = "fa0a212283cdf52e2eecc24dd6459bb7687cc29adb60cb84258fab73be8dda0f"; + sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k"; }; - buildInputs = with self; [ covCore pytest virtualenv process-tests helper ]; + buildInputs = with self; [ pytest pytest_xdist virtualenv process-tests ]; + propagatedBuildInputs = with self; [ coverage ]; + # xdist related tests fail with the following error + # OSError: [Errno 13] Permission denied: 'py/_code' doCheck = false; checkPhase = '' + # allow to find the module helper during the test run + export PYTHONPATH=$PYTHONPATH:$PWD/tests py.test tests ''; meta = { description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; - homepage = https://github.com/schlamar/pytest-cov; + homepage = https://github.com/pytest-dev/pytest-cov; license = licenses.mit; }; - }); + }; pytest-expect = callPackage ../development/python-modules/pytest-expect { }; pytest-virtualenv = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-virtualenv"; - version = "1.1.0"; + version = "1.2.7"; src = pkgs.fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "093f5fa479ee6201e48db367c307531dc8b800609b0c3ddca9c01e0fd466a669"; + sha256 = "51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755"; }; buildInputs = with self; [ pytest pytestcov mock cmdline ]; propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ]; @@ -5441,45 +4782,9 @@ in { }; }; - pytest_xdist = buildPythonPackage rec { - name = "pytest-xdist-1.8"; + pytest_xdist = callPackage ../development/python-modules/pytest-xdist { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-xdist/pytest-xdist-1.8.zip"; - sha256 = "b02135db7080c0978b7ce5d8f43a5879231441c2062a4791bc42b6f98c94fa69"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ execnet ]; - - meta = { - description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; - homepage = http://bitbucket.org/hpk42/pytest-xdist; - }; - }; - - pytest-localserver = buildPythonPackage rec { - name = "pytest-localserver-${version}"; - version = "0.3.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-localserver/${name}.tar.gz"; - sha256 = "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p"; - }; - - propagatedBuildInputs = with self; [ werkzeug ]; - buildInputs = with self; [ pytest six requests2 ]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Plugin for the pytest testing framework to test server connections locally"; - homepage = https://pypi.python.org/pypi/pytest-localserver; - license = licenses.mit; - }; - }; + pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; pytest-subtesthack = buildPythonPackage rec { name = "pytest-subtesthack-${version}"; @@ -5591,32 +4896,7 @@ in { }; }); - dask = buildPythonPackage rec { - name = "dask-${version}"; - version = "0.13.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dask/${name}.tar.gz"; - sha256 = "1f8r6jj9666cnvx3f8bilcx0017smmlw4i4v2p1nwxshs0k514hs"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ cloudpickle numpy toolz dill pandas partd ]; - - checkPhase = '' - py.test dask - ''; - - # URLError - doCheck = false; - - meta = { - description = "Minimal task scheduling abstraction"; - homepage = "http://github.com/ContinuumIO/dask/"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + dask = callPackage ../development/python-modules/dask { }; datrie = buildPythonPackage rec { name = "datrie"; @@ -5705,7 +4985,7 @@ in { digital-ocean = buildPythonPackage rec { name = "python-digitalocean-1.10.1"; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; # Package doesn't distribute tests. doCheck = false; @@ -5725,28 +5005,9 @@ in { leather = callPackage ../development/python-modules/leather { }; - libtmux = buildPythonPackage rec { - name = "libtmux-${version}"; - version = "0.6.0"; + libais = callPackage ../development/python-modules/libais { }; - src = pkgs.fetchurl { - url = "mirror://pypi/l/libtmux/${name}.tar.gz"; - sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; - }; - - buildInputs = with self; [ pytest_29 ]; - patchPhase = '' - sed -i 's/==.*$//' requirements/test.txt - ''; - - meta = with stdenv.lib; { - description = "Scripting library for tmux"; - homepage = https://libtmux.readthedocs.io/; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; - }; - }; + libtmux = callPackage ../development/python-modules/libtmux { }; locket = buildPythonPackage rec { name = "locket-${version}"; @@ -5839,17 +5100,16 @@ in { requests-cache = buildPythonPackage (rec { name = "requests-cache-${version}"; - version = "0.4.10"; - disabled = isPy3k; + version = "0.4.13"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests-cache/${name}.tar.gz"; - sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0"; + sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; }; buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ self.six requests2 ]; + propagatedBuildInputs = with self; [ requests six urllib3 ]; meta = { description = "Persistent cache for requests library"; @@ -5982,47 +5242,11 @@ in { description = "Date parsing library designed to parse dates from HTML pages"; homepage = http://pypi.python.org/pypi/dateparser; license = licenses.bsd3; + broken = true; }; }; - dateutil = buildPythonPackage (rec { - name = "dateutil-${version}"; - version = "2.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "1v9j9fmf8g911yg6k01xa2db6dx3wv73zkk7fncsj7vagjqgs20l"; - }; - - propagatedBuildInputs = with self; [ self.six ]; - - meta = { - description = "Powerful extensions to the standard datetime module"; - homepage = http://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; - }); - - # csvkit 0.9.1 needs dateutil==2.2 - dateutil_2_2 = buildPythonPackage (rec { - name = "dateutil-2.2"; - disabled = isPy3k; - - propagatedBuildInputs = with self; [ self.six ]; - - buildInputs = [ pkgs.glibcLocales ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "0s74ad6r789810s10dxgvaf48ni6adac2icrdad34zxygqq6bj7f"; - }; - - meta = { - description = "Powerful extensions to the standard datetime module"; - homepage = http://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; - }); + dateutil = callPackage ../development/python-modules/dateutil { }; # Buildbot 0.8.7p1 needs dateutil==1.5 dateutil_1_5 = buildPythonPackage (rec { @@ -6044,28 +5268,6 @@ in { }; }); - # flexget requires 2.1 - dateutil_2_1 = buildPythonPackage (rec { - name = "dateutil-2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c"; - }; - - propagatedBuildInputs = with self; [ self.six ]; - - buildInputs = [ pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - meta = { - description = "Powerful extensions to the standard datetime module"; - homepage = http://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; - }); - ddar = buildPythonPackage { name = "ddar-1.0"; @@ -6089,11 +5291,11 @@ in { decorator = buildPythonPackage rec { name = "decorator-${version}"; - version = "4.0.10"; + version = "4.0.11"; src = pkgs.fetchurl { url = "mirror://pypi/d/decorator/${name}.tar.gz"; - sha256 = "9c6e98edcb33499881b86ede07d9968c81ab7c769e28e9af24075f0a5379f070"; + sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; }; meta = { @@ -6130,34 +5332,6 @@ in { }; }; - deform2 = buildPythonPackage rec { - name = "deform-2.0a2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/deform/${name}.tar.gz"; - sha256 = "1gfaf1d8zp0mp4h229srlffxdp86w1nni9g4aqsshxysr23x591z"; - }; - - buildInputs = with self; [] ++ optional isPy26 unittest2; - - propagatedBuildInputs = - [ self.beautifulsoup4 - self.peppercorn - self.colander - self.translationstring - self.chameleon - self.zope_deprecation - self.coverage - self.nose - ]; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; - - deform_bootstrap = buildPythonPackage rec { name = "deform_bootstrap-0.2.9"; @@ -6258,16 +5432,14 @@ in { dill = buildPythonPackage rec { name = "dill-${version}"; - version = "0.2.5"; + version = "0.2.6"; src = pkgs.fetchurl { - url = "mirror://pypi/d/dill/${name}.tgz"; - sha256 = "431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319"; + url = "mirror://pypi/d/dill/${name}.zip"; + sha256 = "6c1ccca68be483fa8c66e85a89ffc850206c26373aa77a97b83d8d0994e7f1fd"; }; - propagatedBuildInputs = with self; [objgraph]; - - # failing tests + # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} doCheck = false; meta = { @@ -6285,7 +5457,7 @@ in { sha256 = "0a3616a818dd9fa61a61c3d9731d176e9123130d1b1b97a6beee63b4c72306b7"; }; - propagatedBuildInputs = with self; [ oauth2 requests2 ]; + propagatedBuildInputs = with self; [ oauth2 requests ]; meta = { description = "Official Python API client for Discogs"; @@ -6394,7 +5566,7 @@ in { doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy setuptools backports_lzma m2crypto + requests rsa sqlalchemy setuptools backports_lzma m2crypto ]; patchPhase = "> requirements/main.txt"; @@ -6444,24 +5616,7 @@ in { }; }; - dogpile_cache = buildPythonPackage rec { - name = "dogpile.cache-0.5.4"; - - propagatedBuildInputs = with self; [ dogpile_core ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dogpile.cache/dogpile.cache-0.5.4.tar.gz"; - sha256 = "9eab7a5dc05ad1b6573144c4a2717226b5c38811f9ec29b514e774535a91ea24"; - }; - - doCheck = false; - - meta = { - description = "A caching front-end based on the Dogpile lock"; - homepage = http://bitbucket.org/zzzeek/dogpile.cache; - license = licenses.bsd3; - }; - }; + dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; dogpile_core = buildPythonPackage rec { name = "dogpile.core-0.4.1"; @@ -6508,7 +5663,7 @@ in { sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; }; - propagatedBuildInputs = with self; [ requests2 six ]; + propagatedBuildInputs = with self; [ requests six ]; meta = { description = "Digital Ocean API python wrapper"; @@ -6561,6 +5716,8 @@ in { nosetests -v --cover-min-percentage 1 ''; + doCheck = false; + buildInputs = with self; [ coverage tornado mock nose psutil pysocks ]; meta = { @@ -6581,7 +5738,7 @@ in { sha256 = "f65c12bd97f09e29a951bc7cb30a74e005fc4b2f8bb48778796be3f73866b173"; }; - propagatedBuildInputs = with self; [ requests2 urllib3 mock setuptools ]; + propagatedBuildInputs = with self; [ requests urllib3 mock setuptools ]; meta = { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; @@ -6641,6 +5798,14 @@ in { }; }; + eccodes = if (isPy27) then + (pkgs.eccodes.overrideAttrs (oldattrs: { + name = "${python.libPrefix}-" + oldattrs.name; + })).override { + enablePython = true; + pythonPackages = self; + } else throw "eccodes not supported for interpreter ${python.executable}"; + EditorConfig = buildPythonPackage rec { name = "EditorConfig-${version}"; version = "0.12.0"; @@ -6679,7 +5844,7 @@ in { # Check is disabled because running them destroy the content of the local cluster! # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch doCheck = false; - propagatedBuildInputs = with self; [ urllib3 requests2 ]; + propagatedBuildInputs = with self; [ urllib3 requests ]; buildInputs = with self; [ nosexcover mock ]; meta = { @@ -6727,6 +5892,8 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; + enzyme = callPackage ../development/python-modules/enzyme {}; + escapism = buildPythonPackage rec { name = "escapism-${version}"; version = "0.0.1"; @@ -6761,7 +5928,7 @@ in { sed -i -e '13,14d;37d' setup.py ''; - propagatedBuildInputs = with self; [ simplejson pytz requests2 ]; + propagatedBuildInputs = with self; [ simplejson pytz requests ]; # No proper tests are available doCheck = false; @@ -6935,6 +6102,8 @@ in { }; }; + ezdxf = callPackage ../development/python-modules/ezdxf {}; + facebook-sdk = buildPythonPackage rec { name = "facebook-sdk-0.4.0"; @@ -7012,10 +6181,10 @@ in { Fabric = buildPythonPackage rec { name = "Fabric-${version}"; - version = "1.10.2"; + version = "1.13.2"; src = pkgs.fetchurl { url = "mirror://pypi/F/Fabric/${name}.tar.gz"; - sha256 = "0nikc05iz1fx2c9pvxrhrs819cpmg566azm99450yq2m8qmp1cpd"; + sha256 = "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq"; }; disabled = isPy3k; doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891 @@ -7023,9 +6192,10 @@ in { buildInputs = with self; [ fudge_9 nose ]; }; - fedora_cert = mkPythonDerivation rec { + fedora_cert = buildPythonPackage rec { name = "fedora-cert-0.5.9.2"; meta.maintainers = with maintainers; [ mornfall ]; + format = "other"; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; @@ -7063,7 +6233,7 @@ in { }; disabled = !isPy3k; - propagatedBuildInputs = with self; [ docutils requests2 requests_download zipfile36]; + propagatedBuildInputs = with self; [ docutils requests requests_download zipfile36]; meta = { description = "A simple packaging tool for simple packages"; @@ -7336,7 +6506,7 @@ in { mutagen protobuf3_0 setuptools - requests2 + requests dateutil proboscis mock @@ -7438,6 +6608,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}"; @@ -7507,7 +6689,7 @@ in { pyasn1 pycparser pycryptodome - requests2 + requests six ]; @@ -7531,7 +6713,7 @@ in { }; buildInputs = with self; [ pytest responses ]; - propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests2 ]; + propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests ]; checkPhase = '' export PATH="$PATH:$out/bin" @@ -7717,6 +6899,9 @@ in { }; }); + + htmlmin = callPackage ../development/python-modules/htmlmin.nix {}; + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; @@ -7793,7 +6978,7 @@ in { sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126"; }; - propagatedBuildInputs = with self; [ six requests2 ]; + propagatedBuildInputs = with self; [ six requests ]; meta = { description = "A python client library for the IPFS API"; @@ -7895,7 +7080,7 @@ in { ''; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ six clint pyyaml docopt requests2 jsonpatch args ]; + propagatedBuildInputs = with self; [ six clint pyyaml docopt requests jsonpatch args ]; meta = with stdenv.lib; { description = "A python wrapper for the various Internet Archive APIs"; @@ -7903,25 +7088,7 @@ in { }; }; - jsbeautifier = buildPythonApplication rec { - name = "jsbeautifier-1.6.4"; - - propagatedBuildInputs = with self; [ six ]; - - buildInputs = with self; [ EditorConfig pytest six ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "074n8f4ncz5pf0jkkf6i6by30qnaj5208sszaf9p86kgdigcdaf8"; - }; - - meta = { - homepage = "http://jsbeautifier.org"; - description = "JavaScript unobfuscator and beautifier."; - license = stdenv.lib.licenses.mit; - maintainers = with maintainers; [ apeyroux ]; - }; - }; + jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; jug = buildPythonPackage rec { version = "1.4.0"; @@ -8063,15 +7230,19 @@ in { libsexy = pkgs.libsexy; }; + libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; + libthumbor = buildPythonPackage rec { name = "libthumbor-${version}"; - version = "1.2.0"; + version = "1.3.2"; src = pkgs.fetchurl { url = "mirror://pypi/l/libthumbor/${name}.tar.gz"; - sha256 = "09bbaf08124ee33ea4ef99881625bd20450b0b43ab90fd678479beba8c03f86e"; + sha256 = "1vjhszsf8wl9k16wyg2rfjycjnawzl7z8j39bhiysbz5x4lqg91b"; }; + buildInputs = with self; [ django ]; + propagatedBuildInputs = with self; [ six pycrypto ]; meta = { @@ -8099,7 +7270,7 @@ in { description = "Cross-platform Bluetooth API for Python"; maintainers = with maintainers; [ leenaars ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -8292,6 +7463,8 @@ in { }; }; + m2r = callPackage ../development/python-modules/m2r { }; + mailchimp = buildPythonPackage rec { version = "2.0.9"; name = "mailchimp-${version}"; @@ -8337,7 +7510,21 @@ in { }; }; - mwlib = buildPythonPackage rec { + mwlib = let + pyparsing = buildPythonPackage rec { + name = "pyparsing-1.5.7"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pyparsing/${name}.tar.gz"; + sha256 = "646e14f90b3689b005c19ac9b6b390c9a39bf976481849993e277d7380e6e79f"; + }; + meta = { + homepage = http://pyparsing.wikispaces.com/; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + }; + }; + in buildPythonPackage rec { version = "0.15.15"; name = "mwlib-${version}"; @@ -8355,7 +7542,7 @@ in { pillow py pyPdf - pyparsing1 + pyparsing qserve roman simplejson @@ -8363,6 +7550,15 @@ in { timelib ]; + checkInputs = with self; [ pytest ]; + + checkPhase = '' + py.test + ''; + + # Tests are in build directory but we need extension modules that are in $out + doCheck = false; + meta = { description = "Library for parsing MediaWiki articles and converting them to different output formats"; homepage = "http://pediapress.com/code/"; @@ -8410,34 +7606,7 @@ in { }; }; - natsort = buildPythonPackage rec { - name = "natsort-5.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/natsort/${name}.tar.gz"; - sha256 = "4ad6b4d1153451e345967989bd3ca30abf33f615b116eeadfcc51a456e6974a9"; - }; - - buildInputs = with self; - [ - hypothesis - pytestcache - pytestcov - pytestflakes - pytestpep8 - pytest - mock - ] - # pathlib was made part of standard library in 3.5: - ++ (optionals (pythonOlder "3.4") [ pathlib ]); - - meta = { - description = "Natural sorting for python"; - homepage = https://github.com/SethMMorton/natsort; - license = licenses.mit; - broken = true; - }; - }; + natsort = callPackage ../development/python-modules/natsort { }; logster = buildPythonPackage { name = "logster-7475c53822"; @@ -8472,7 +7641,9 @@ in { }; }; - netcdf4 = callPackage ../development/python-modules/netcdf4.nix { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + + Nikola = callPackage ../development/python-modules/Nikola { }; nxt-python = buildPythonPackage rec { version = "unstable-20160819"; @@ -8557,66 +7728,30 @@ in { }; }; - pants = buildPythonPackage rec { - pname = "pantsbuild.pants"; - version = "1.2.1"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w"; - }; - - prePatch = '' - sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py - ''; - - # 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 = with self; [ - ansicolors beautifulsoup4 cffi coverage docutils fasteners futures - isort lmdb markdown mock packaging pathspec pep8 pex psutil pyflakes - pygments pystache pytestcov pytest pywatchman requests2 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 ]; - }; - }; + # These used to be here but were moved to all-packages, but I'll leave them around for a while. + pants = pkgs.pants; 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 = { @@ -8628,12 +7763,12 @@ in { pathspec = buildPythonPackage rec { pname = "pathspec"; - version = "0.3.4"; + version = "0.5.2"; name = "${pname}-${version}"; src = self.fetchPypi { inherit pname version; - sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; + sha256 = "f9fdf4408f4adb30e9f507f61d3a41c968e9c6e6c519d4bbd2a189627b5e86f0"; }; meta = { @@ -8680,7 +7815,7 @@ in { meta = { description = "A Python-based build/distribution/deployment scripting tool"; homepage = http://github.com/paver/paver; - matinainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; }; @@ -8694,7 +7829,8 @@ in { sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8"; }; - buildInputs = with self; [ nose pybcrypt]; + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ bcrypt ]; meta = { description = "A password hashing library for Python"; @@ -8784,14 +7920,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; @@ -8803,6 +7943,8 @@ in { }; }; + phpserialize = callPackage ../development/python-modules/phpserialize { }; + pies = buildPythonPackage rec { name = "pies-2.6.5"; @@ -8842,47 +7984,9 @@ in { }; }; - pirate-get = buildPythonPackage rec { - name = "pirate-get-${version}"; - version = "0.2.9"; - - disabled = !isPy3k; - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pirate-get/${name}.tar.gz"; - sha256 = "1djmfghnwsn3z525h6d98r0lllayvzsg71z0gskk25zr24kjs24a"; - }; - - propagatedBuildInputs = with self; [ colorama veryprettytable beautifulsoup4 ]; - - meta = { - description = "A command line interface for The Pirate Bay"; - homepage = https://github.com/vikstrous/pirate-get; - license = licenses.gpl1; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; - }; - - plotly = self.buildPythonPackage rec { - name = "plotly-1.9.5"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/plotly/${name}.tar.gz"; - sha256 = "628679e880caab22e2a46273e85e1d1ce1382b631e1c7bbfe539f804c5269b21"; - }; - - propagatedBuildInputs = with self; [ self.pytz self.six self.requests ]; - - meta = { - description = "Python plotting library for collaborative, interactive, publication-quality graphs"; - homepage = https://plot.ly/python/; - license = licenses.mit; - }; - }; + plotly = callPackage ../development/python-modules/plotly { }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; @@ -8969,11 +8073,13 @@ in { description = "Call graph visualizations for Python applications"; maintainers = with maintainers; [ auntie ]; license = licenses.gpl2; - platform = platforms.all; + platforms = platforms.all; }; }; - pybluez = buildPythonPackage rec { + pycassa = callPackage ../development/python-modules/pycassa { }; + + pybluez = buildPythonPackage rec { version = "unstable-20160819"; pname = "pybluez"; name = "${pname}-${version}"; @@ -9103,7 +8209,7 @@ in { description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9121,7 +8227,7 @@ in { description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9146,7 +8252,7 @@ in { description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9202,7 +8308,6 @@ in { meta = { maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; - broken = true; }; }; @@ -9351,10 +8456,12 @@ in { description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; - platform = platforms.all; + platforms = platforms.all; }; }; + pysrt = callPackage ../development/python-modules/pysrt { }; + pytools = buildPythonPackage rec { name = "pytools-${version}"; version = "2016.2.1"; @@ -9515,6 +8622,23 @@ in { }; }; + safe = buildPythonPackage rec { + version = "0.4"; + name = "Safe-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/S/Safe/${name}.tar.gz"; + sha256 = "a2fdac9fe8a9dcf02b438201d6ce0b7be78f85dc6492d03edfb89be2adf489de"; + }; + + buildInputs = with self; [ nose ]; + meta = { + homepage = "https://github.com/lepture/safe"; + license = licenses.bsd3; + description = "Check password strength"; + }; + }; + samplerate = buildPythonPackage rec { name = "scikits.samplerate-${version}"; version = "0.3.3"; @@ -9552,11 +8676,13 @@ in { homepage = "http://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; }; + subliminal = callPackage ../development/python-modules/subliminal {}; + hyp = buildPythonPackage rec { name = "hyp-server-${version}"; version = "1.2.0"; @@ -9657,7 +8783,7 @@ in { rev = version; sha256 = "1mnl0rfbnimcpp7q9hva0x9jfa58j4nc27r9kvaii8869kzssw48"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; prePatch = '' sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py sed -i -e "s|notify-send|${pkgs.libnotify}/bin/notify-send|" py3status/modules/battery_level.py @@ -9869,49 +8995,6 @@ in { }; }; - substanced = buildPythonPackage rec { - # no release yet - rev = "089818bc61c3dc5eca023254e37a280b041ea8cc"; - name = "substanced-${rev}"; - - src = pkgs.fetchgit { - inherit rev; - url = "https://github.com/Pylons/substanced.git"; - sha256 = "1fb8m5aylw8kig13fvldchgkxi4s2xlvwralrzinyma3imbznd3q"; - }; - - buildInputs = with self; [ mock ]; - patchPhase = '' - sed -i 's/assert_call(/assert_called_with(/' substanced/workflow/tests/test_workflow.py - ''; - - propagatedBuildInputs = with self; [ - pyramid - pytz - zodb - venusian - colander - deform2 - python_magic - pyyaml - cryptacular - hypatia - zope_copy - zope_component - zope_deprecation - statsd - pyramid_zodbconn - pyramid_mailer - pyramid_chameleon - ZEO - ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - - svg-path = buildPythonPackage rec { name = "svg.path-${version}"; version = "2.0b1"; @@ -10059,6 +9142,11 @@ in { substituteInPlace pywatchman/__init__.py \ --replace "'watchman'" "'${pkgs.watchman}/bin/watchman'" ''; + # SyntaxError + disabled = isPy3k; + # No tests in archive + doCheck = false; + }; zope_tales = buildPythonPackage rec { @@ -10106,6 +9194,8 @@ in { }; }; + vcrpy = callPackage ../development/python-modules/vcrpy { }; + venusian = buildPythonPackage rec { name = "venusian-1.0"; @@ -10239,72 +9329,27 @@ in { }; }; - django = self.django_1_10; + django = self.django_1_11; - django_1_10 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.10.5"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d"; - }; - - patches = [ - (pkgs.substituteAll { - src = ../development/python-modules/django/1.10-gis-libs.template.patch; - geos = pkgs.geos; - gdal = self.gdal; - }) - ]; - - # 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_11 = callPackage ../development/python-modules/django/1_11.nix { + gdal = self.gdal; }; - django_1_9 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.9.12"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "0daaz2rp1rwwpzm5l29wcgg1gbw9yqzcv9x2dsjfz29n806q685x"; - }; - - # 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/; - }; + # 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_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.17"; + version = "1.8.18"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "01zb2l0gcdb2wgxmvvrhjj9ccdj1mfhn6zhqcdq04m7lzi4dc6q2"; + sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7"; }; # too complicated to setup @@ -10321,78 +9366,7 @@ in { }; }; - - django_1_7 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.7.11"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; - sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90"; - }; - - # 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_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}"; @@ -10416,49 +9390,9 @@ in { }; }; - django_compressor = buildPythonPackage rec { - name = "django-compressor-${version}"; - version = "1.5"; + django_compressor = callPackage ../development/python-modules/django_compressor { }; - 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_compat = buildPythonPackage rec { - name = "django-compat-${version}"; - version = "1.0.13"; - - # build process attempts to access a missing README.rst - disabled = isPy35; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-compat/${name}.tar.gz"; - sha256 = "0s0z7cx0vv1kjsyzk24sg256hfnd09ssilc9rakhxrzr3firgx80"; - }; - - buildInputs = with self; [ django_nose ]; - propagatedBuildInputs = with self; [ django six ]; - - meta = { - description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9 and 1.10"; - homepage = https://github.com/arteria/django-compat; - license = licenses.mit; - }; - }; + django_compat = callPackage ../development/python-modules/django-compat { }; django_environ = buildPythonPackage rec { name = "django-environ-${version}"; @@ -10489,7 +9423,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"; @@ -10499,33 +9433,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 { @@ -10537,7 +9456,7 @@ in { sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0"; }; - propagatedBuildInputs = with self; [ django_1_7 ]; + propagatedBuildInputs = with self; [ django ]; # tests appear to be broken on 0.6.1 at least doCheck = ( version != "0.6.1" ); @@ -10549,30 +9468,10 @@ in { }; }; - django_hijack = buildPythonPackage rec { - name = "django-hijack-${version}"; - version = "2.0.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-hijack/${name}.tar.gz"; - sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04"; - }; - - # TODO improve the that multi-override necessity (the fixpoint based python - # packages work can be the solution) - propagatedBuildInputs = with self; [ django_1_9 (django_compat.override { - buildInputs = with self; [ (django_nose.override { - propagatedBuildInputs = with self; [ django_1_9 nose ]; - }) ]; - propagatedBuildInputs = with self; [ django_1_9 six ]; - }) ]; - - meta = { - description = "Allows superusers to hijack (=login as) and work on behalf of another user"; - homepage = https://github.com/arteria/django-hijack; - license = licenses.mit; - }; - }; + # This package may need an older version of Django. + # Override the package set and set e.g. `django = super.django_1_9`. + # See the Nixpkgs manual for examples on how to override the package set. + django_hijack = callPackage ../development/python-modules/django-hijack { }; django_nose = buildPythonPackage rec { name = "django-nose-${version}"; @@ -10618,24 +9517,7 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - django_raster = buildPythonPackage rec { - name = "django-raster-${version}"; - version = "0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-raster/${name}.tar.gz"; - sha256 = "0vn11y07wag7yvjzrk7m99xs3cqyaaaklwcsik9zbvw0kwp2khni"; - }; - - propagatedBuildInputs = with self ; [ numpy django_colorful pillow psycopg2 - pyparsing django celery_3 ]; - - meta = { - description = "Basic raster data integration for Django"; - homepage = https://github.com/geodesign/django-raster; - license = licenses.mit; - }; - }; + django-raster = callPackage ../development/python-modules/django-raster { }; django_redis = buildPythonPackage rec { name = "django-redis-${version}"; @@ -10700,7 +9582,7 @@ in { pygments simplejson dateutil - requests2 + requests sqlparse jinja2 autopep8 @@ -10764,7 +9646,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"; @@ -10782,7 +9664,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 { @@ -10791,7 +9676,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"; @@ -11171,26 +10056,9 @@ in { }; }; - feedgenerator = buildPythonPackage (rec { - name = "feedgenerator-1.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/feedgenerator/${name}.tar.gz"; - sha256 = "5d6b0b10134ac392be0c0c3a39c0e1d7e9c17cc7894590f75981e3f497a4a60f"; - }; - - buildInputs = [ pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ six pytz ]; - - meta = { - description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; - homepage = https://github.com/dmdm/feedgenerator-py3k.git; - maintainers = with maintainers; [ garbas ]; - }; - }); + feedgenerator = callPackage ../development/python-modules/feedgenerator { + inherit (pkgs) glibcLocales; + }; feedparser = buildPythonPackage (rec { name = "feedparser-5.2.1"; @@ -11287,22 +10155,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"; @@ -11319,27 +10172,7 @@ in { }; }; - flake8 = buildPythonPackage rec { - name = "flake8-${version}"; - version = "3.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/flake8/${name}.tar.gz"; - sha256 = "c7c460b5aff3a2063c798a77af18ec70af3941d35a22e2e76965e3c0e0b36055"; - }; - - buildInputs = with self; [ pytest mock pytestrunner ]; - propagatedBuildInputs = with self; [ pyflakes pycodestyle mccabe ] - ++ optionals (pythonOlder "3.4") [ enum34 ] - ++ optionals (pythonOlder "3.2") [ configparser ]; - - meta = { - description = "Code checking using pep8 and pyflakes"; - homepage = http://pypi.python.org/pypi/flake8; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; @@ -11419,6 +10252,24 @@ in { }; }; + flask-compress = buildPythonPackage rec { + name = "Flask-Compress-${version}"; + version = "1.3.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/F/Flask-Compress/${name}.tar.gz"; + sha256 = "4fbb53e7f6ce8b1458a2c3d7a528564912f2641ab2f9f43819fc96ed7f770734"; + }; + + propagatedBuildInputs = with self; [ flask ]; + + meta = { + description = "Compress responses in your Flask app with gzip"; + homepage = "https://libwilliam.github.io/flask-compress/"; + license = licenses.mit; + }; + }; + flask-cors = buildPythonPackage rec { name = "Flask-Cors-${version}"; version = "2.1.2"; @@ -11444,30 +10295,7 @@ in { flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { }; - flask_migrate = buildPythonPackage rec { - name = "Flask-Migrate-${version}"; - version = "1.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz"; - sha256 = "16d7vnaj9xmxvb3qbcmhahm3ldfdhzzi6y221h62x4v1v1jayx7v"; - }; - - # When tests run with python3*, tests should run commands as "python3 ", - # not "python " - patchPhase = '' - substituteInPlace tests/test_migrate.py --replace "python" "${python.executable}" - substituteInPlace tests/test_multidb_migrate.py --replace "python" "${python.executable}" - ''; - - propagatedBuildInputs = with self ; [ flask flask_sqlalchemy flask_script alembic ]; - - meta = { - description = "SQLAlchemy database migrations for Flask applications using Alembic"; - license = licenses.mit; - homepage = https://github.com/miguelgrinberg/Flask-Migrate; - }; - }; + flask_migrate = callPackage ../development/python-modules/flask-migrate { }; flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { }; @@ -11509,6 +10337,34 @@ in { }; }; + flask-restful = buildPythonPackage rec { + name = "Flask-RESTful-${version}"; + version = "0.3.5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/F/Flask-RESTful/${name}.tar.gz"; + sha256 = "cce4aeff959b571136b5af098bebe7d3deeca7eb1411c4e722ff2c5356ab4c42"; + }; + + # TypeError: Only byte strings can be passed to C code + patchPhase = if isPy3k then '' + rm tests/test_crypto.py tests/test_paging.py + '' else null; + buildInputs = with self; [ nose mock blinker ]; + propagatedBuildInputs = with self; [ flask six pytz aniso8601 pycrypto ]; + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + meta = { + homepage = "http://flask-restful.readthedocs.io/"; + description = "REST API building blocks for Flask"; + license = licenses.bsd3; + }; + }; + + 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 { }; + flask_script = buildPythonPackage rec { name = "Flask-Script-${version}"; version = "2.0.5"; @@ -11606,6 +10462,8 @@ in { }; }; + pytorch = callPackage ../development/python-modules/pytorch { }; + python_tvrage = buildPythonPackage (rec { version = "0.4.1"; name = "tvrage-${version}"; @@ -11732,7 +10590,7 @@ in { sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63"; }; - buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests2 testtools]; + buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests testtools]; propagatedBuildInputs = with self; [ six python_mimeparse ]; # The travis build fails since the migration from multiprocessing to threading for hosting the API under test. @@ -11752,8 +10610,9 @@ in { url = "mirror://pypi/h/hug/${name}.tar.gz"; sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c"; }; + disabled = !isPy3k; - propagatedBuildInputs = with self; [ falcon requests2 ]; + propagatedBuildInputs = with self; [ falcon requests ]; # tests are not shipped in the tarball doCheck = false; @@ -11779,29 +10638,14 @@ in { }; }); + folium = callPackage ../development/python-modules/folium { }; + fontforge = pkgs.fontforge.override { withPython = true; inherit python; }; - fonttools = buildPythonPackage (rec { - version = "3.0"; - name = "fonttools-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/FontTools/fonttools-${version}.tar.gz"; - sha256 = "0f4iblpbf3y3ghajiccvdwk2f46cim6dsj6fq1kkrbqfv05dr4nz"; - }; - - buildInputs = with self; [ - numpy - ]; - - meta = { - homepage = "https://github.com/behdad/fonttools"; - description = "Font file processing tools"; - }; - }); + fonttools = callPackage ../development/python-modules/fonttools { }; foolscap = buildPythonPackage (rec { name = "foolscap-${version}"; @@ -11937,37 +10781,7 @@ in { }; }; - future = buildPythonPackage rec { - version = "0.15.2"; - name = "future-${version}"; - - src = pkgs.fetchurl { - url = "http://github.com/PythonCharmers/python-future/archive/v${version}.tar.gz"; - sha256 = "0vm61j5br6jiry6pgcxnwvxhki8ksnirp7k9mcbmxmgib3r60xd3"; - }; - - propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ]; - doCheck = false; - - meta = { - description = "Clean single-source support for Python 3 and 2"; - longDescription = '' - python-future is the missing compatibility layer between Python 2 and - Python 3. It allows you to use a single, clean Python 3.x-compatible - codebase to support both Python 2 and Python 3 with minimal overhead. - - It provides future and past packages with backports and forward ports - of features from Python 3 and 2. It also comes with futurize and - pasteurize, customized 2to3-based scripts that helps you to convert - either Py2 or Py3 code easily to support both Python 2 and 3 in a - single clean Py3-style codebase, module by module. - ''; - homepage = https://python-future.org; - downloadPage = https://github.com/PythonCharmers/python-future/releases; - license = licenses.mit; - maintainers = with maintainers; [ prikhi ]; - }; - }; + future = callPackage ../development/python-modules/future { }; futures = buildPythonPackage rec { name = "futures-${version}"; @@ -12196,19 +11010,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 { }; @@ -12259,14 +11061,14 @@ in { glances = buildPythonPackage rec { name = "glances-${version}"; - version = "2.8.2"; + version = "2.10"; disabled = isPyPy; src = pkgs.fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1jwaq9k6q8wn197wadiwid7d8aik24rhsypmcl5q0jviwkhhiri9"; + sha256 = "0hxs9bplxvj6grq9dqinr4f5ip6ray6mrw54scrcaqal8f3c8ah2"; }; doCheck = false; @@ -12297,7 +11099,7 @@ in { buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers ]; - propagatedBuildInputs = with self; [ requests2 pyopenssl uritemplate_py + propagatedBuildInputs = with self; [ requests pyopenssl uritemplate_py ndg-httpsclient requests_toolbelt pyasn1 ]; postPatch = '' @@ -12412,6 +11214,7 @@ in { }; }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; greenlet = buildPythonPackage rec { name = "greenlet-${version}"; @@ -12438,6 +11241,14 @@ in { }; }; + grib-api = if (isPy27) then + (pkgs.grib-api.overrideAttrs (oldattrs: { + name = "${python.libPrefix}-" + oldattrs.name; + })).override { + enablePython = true; + pythonPackages = self; + } else throw "grib-api not supported for interpreter ${python.executable}"; + gspread = buildPythonPackage rec { version = "0.2.3"; name = "gspread-${version}"; @@ -12496,6 +11307,7 @@ in { patches = optionals pkgs.stdenv.isDarwin [ ../development/python-modules/gyp/no-darwin-cflags.patch + ../development/python-modules/gyp/no-xcode.patch ]; disabled = isPy3k; @@ -12509,29 +11321,9 @@ in { }; }; - guessit = buildPythonPackage rec { - version = "0.9.4"; - name = "guessit-${version}"; - disabled = isPy3k; + guessit = callPackage ../development/python-modules/guessit { }; - src = pkgs.fetchurl { - url = "mirror://pypi/g/guessit/${name}.tar.gz"; - sha256 = "068d3dmyk4v04p2zna0340lsdnpkm10gyza62apd9akgjh9rfs48"; - }; - - propagatedBuildInputs = with self; [ - dateutil_2_1 requests stevedore babelfish pyyaml - ]; - - # A unicode test fails - doCheck = false; - - meta = { - homepage = http://pypi.python.org/pypi/guessit; - license = licenses.lgpl3; - description = "A library for guessing information from video files"; - }; - }; + rebulk = callPackage ../development/python-modules/rebulk { }; gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; @@ -12664,23 +11456,7 @@ in { }; }); - httpbin = buildPythonPackage rec { - name = "httpbin-0.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/httpbin/${name}.tar.gz"; - sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054"; - }; - - propagatedBuildInputs = with self; [ flask markupsafe decorator itsdangerous six ]; - - meta = { - homepage = https://github.com/kennethreitz/httpbin; - description = "HTTP Request & Response Service"; - license = licenses.mit; - }; - - }; + httpbin = callPackage ../development/python-modules/httpbin { }; httplib2 = buildPythonPackage rec { name = "httplib2-0.9.2"; @@ -12707,7 +11483,7 @@ in { sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; }; hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; @@ -12810,7 +11586,7 @@ in { sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7"; }; - buildInputs = with self; [ tornado requests2 httplib2 sure nose coverage certifi ]; + buildInputs = with self; [ tornado requests httplib2 sure nose coverage certifi ]; propagatedBuildInputs = with self; [ urllib3 ]; @@ -12857,8 +11633,6 @@ in { }; }; - icdiff = callPackage ../tools/text/icdiff {}; - imageio = buildPythonPackage rec { name = "imageio-${version}"; version = "1.6"; @@ -12925,7 +11699,7 @@ in { # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = with self; [ requests2 dateutil pytz six ]; + propagatedBuildInputs = with self; [ requests dateutil pytz six ]; meta = { description = "Python client for InfluxDB"; @@ -13030,104 +11804,24 @@ in { }; }; - ipykernel = buildPythonPackage rec { - version = "4.5.2"; - name = "ipykernel-${version}"; + ipykernel = callPackage ../development/python-modules/ipykernel { }; - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462"; - }; + ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; - propagatedBuildInputs = with self; [ - ipython - jupyter_client - pexpect - traitlets - tornado - ]; + # Newer versions of IPython no longer support Python 2.7. + ipython = if isPy27 then self.ipython_5 else self.ipython_6; - # Tests require backends. - # I don't want to add all supported backends as propagatedBuildInputs - doCheck = false; + ipython_5 = callPackage ../development/python-modules/ipython/5.nix { }; - meta = { - description = "IPython Kernel for Jupyter"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; - - ipyparallel = buildPythonPackage rec { - version = "6.0.0"; - name = "ipyparallel-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; - sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6"; - }; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado - ] ++ optionals (!isPy3k) [ futures ]; - - # Requires access to cluster - doCheck = false; - - meta = { - description = "Interactive Parallel Computing with IPython"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - - }; - - ipython = buildPythonPackage rec { - version = "5.2.1"; - name = "ipython-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipython/${name}.tar.gz"; - sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb"; - }; - - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = with self; [ nose pkgs.glibcLocales pygments ] ++ optionals isPy27 [mock]; - - propagatedBuildInputs = with self; - [ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit - simplegeneric traitlets requests2 pathlib2 pexpect ] - ++ optionals stdenv.isDarwin [appnope]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - meta = { - description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor jgeerds fridh ]; - }; - }; + ipython_6 = callPackage ../development/python-modules/ipython { }; ipython_genutils = buildPythonPackage rec { - version = "0.1.0"; + version = "0.2.0"; name = "ipython_genutils-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz"; - sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6"; + sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; }; LC_ALL = "en_US.UTF-8"; @@ -13146,28 +11840,7 @@ in { }; - ipywidgets = buildPythonPackage rec { - version = "5.2.2"; - name = "ipywidgets-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipywidgets/${name}.tar.gz"; - sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; - }; - - # Tests are not distributed - doCheck = false; - - buildInputs = with self; [ nose pytest ]; - propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; - - meta = { - description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + ipywidgets = callPackage ../development/python-modules/ipywidgets { }; ipaddr = buildPythonPackage rec { name = "ipaddr-2.1.10"; @@ -13186,11 +11859,11 @@ in { }; ipaddress = if (pythonAtLeast "3.3") then null else buildPythonPackage rec { - name = "ipaddress-1.0.16"; + name = "ipaddress-1.0.18"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipaddress/${name}.tar.gz"; - sha256 = "1c3imabdrw8nfksgjjflzg7h4ynjckqacb188rf541m74arq4cas"; + sha256 = "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax"; }; checkPhase = '' @@ -13252,6 +11925,10 @@ in { }; }; + iso-639 = callPackage ../development/python-modules/iso-639 {}; + + iso3166 = callPackage ../development/python-modules/iso3166 {}; + iso8601 = buildPythonPackage rec { name = "iso8601-${version}"; version = "0.1.11"; @@ -13294,30 +11971,7 @@ in { jabberbot = callPackage ../development/python-modules/jabberbot.nix {}; - jedi = buildPythonPackage (rec { - name = "jedi-0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jedi/${name}.tar.gz"; - sha256 = "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v"; - }; - - buildInputs = [ self.pytest ]; - - checkPhase = '' - py.test test - ''; - - # 7 failed - doCheck = false; - - meta = { - homepage = https://github.com/davidhalter/jedi; - description = "An autocompletion tool for Python that can be used for text editors"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ garbas ]; - }; - }); + jedi = callPackage ../development/python-modules/jedi { }; jellyfish = buildPythonPackage rec { version = "0.5.2"; @@ -13430,6 +12084,9 @@ in { }; }; + journalwatch = callPackage ../tools/system/journalwatch { + inherit (self) systemd pytest; + }; jrnl = buildPythonPackage rec { name = "jrnl-1.9.7"; @@ -13456,40 +12113,15 @@ in { inherit (pkgs.jsonnet) name src; }; - jupyter_client = buildPythonPackage rec { - version = "4.4.0"; - name = "jupyter_client-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jupyter_client/${name}.tar.gz"; - sha256 = "c99a52fac2e5b7a3b714e9252ebf72cbf97536d556ae2b5082baccc3e5cd52ee"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py; - - checkPhase = '' - nosetests -v - ''; - - # Circular dependency with ipykernel - doCheck = false; - - meta = { - description = "Jupyter protocol implementation and client libraries"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + jupyter_client = callPackage ../development/python-modules/jupyter_client { }; jupyter_core = buildPythonPackage rec { - version = "4.2.1"; + version = "4.3.0"; name = "jupyter_core-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3"; + sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40"; }; buildInputs = with self; [ pytest mock ]; @@ -13605,6 +12237,8 @@ in { sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9"; }; + disabled = isPy3k; + propagatedBuildInputs = with self; [ werkzeug twisted ]; meta = { @@ -13686,36 +12320,9 @@ in { }; }; - kitchen = buildPythonPackage (rec { - name = "kitchen-1.1.1"; - disabled = isPy3k; + kitchen = callPackage ../development/python-modules/kitchen/default.nix { }; - meta.maintainers = with maintainers; [ mornfall ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kitchen/kitchen-1.1.1.tar.gz"; - sha256 = "0ki840hjk1q19w6icv0dj2jxb00966nwy9b1jib0dgdspj00yrr5"; - }; - }); - - 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}"; @@ -13805,7 +12412,7 @@ in { doCheck = false; propagatedBuildInputs = with self; [ - click watchdog exifread requests2 mistune inifile Babel jinja2 + click watchdog exifread requests mistune inifile Babel jinja2 flask pyopenssl ndg-httpsclient pkgs.glibcLocales ]; }; @@ -13859,6 +12466,10 @@ in { clblas = pkgs.clblas-cuda; }; + libnacl = callPackage ../development/python-modules/libnacl/default.nix { + inherit (pkgs) libsodium; + }; + libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else (pkgs.libplist.override{python2Packages=self; }).py; @@ -13893,26 +12504,7 @@ in { }; }; - line_profiler = buildPythonPackage rec{ - version = "1.0"; - name = "line_profiler-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/line_profiler/${name}.tar.gz"; - sha256 = "a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900"; - }; - - buildInputs = with self; [ cython ]; - - disabled = isPyPy; - - meta = { - description = "Line-by-line profiler"; - homepage = https://github.com/rkern/line_profiler; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + line_profiler = callPackage ../development/python-modules/line_profiler { }; linode = buildPythonPackage rec { name = "linode-${version}"; @@ -13923,7 +12515,7 @@ in { sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; meta = { homepage = "https://github.com/ghickman/linode"; @@ -13933,6 +12525,28 @@ in { }; }; + livereload = buildPythonPackage rec { + name = "livereload-${version}"; + version = "2.5.0"; + + src = pkgs.fetchFromGitHub { + owner = "lepture"; + repo = "python-livereload"; + rev = "v${version}"; + sha256 = "0ixsc7wibmkfk9fnyq0d1b5d9snxfpzzzgsxvq28rn54v6q8b7m2"; + }; + + buildInputs = with self; [ nose django ]; + + propagatedBuildInputs = with self; [ tornado six ]; + + meta = { + description = "Runs a local server that reloads as you develop"; + homepage = "https://github.com/lepture/python-livereload"; + license = licenses.bsd3; + }; + }; + llfuse = buildPythonPackage rec { name = "llfuse-1.0"; @@ -13961,30 +12575,6 @@ in { }; }; - # Old version needed for attic (backup program) due to breaking change in - # llfuse >= 0.42. - llfuse-0-41 = buildPythonPackage rec { - name = "llfuse-0.41.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"; - }; - buildInputs = with self; [ pytest pkgs.pkgconfig pkgs.fuse pkgs.attr pkgs.which ]; - propagatedBuildInputs = with self; [ contextlib2 ]; - checkPhase = '' - py.test - ''; - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' - doCheck = false; - meta = { - description = "Python bindings for the low-level FUSE API"; - homepage = https://code.google.com/p/python-llfuse/; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - locustio = buildPythonPackage rec { name = "locustio-0.7.2"; @@ -13993,7 +12583,7 @@ in { sha256 = "c9ca6fdfe6a6fb187a3d54ddf9b1518196348e8f20537f0a14ca81a264ffafa2"; }; - propagatedBuildInputs = [ self.msgpack self.requests2 self.flask self.gevent self.pyzmq ]; + propagatedBuildInputs = [ self.msgpack self.requests self.flask self.gevent self.pyzmq ]; buildInputs = [ self.mock self.unittest2 ]; meta = { @@ -14002,7 +12592,7 @@ in { }; }; - llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;}; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_4;}; lockfile = buildPythonPackage rec { pname = "lockfile"; @@ -14079,25 +12669,6 @@ in { }; }); - lxml_3_5 = buildPythonPackage ( rec { - name = "lxml-3.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "0y7m2s8ci6q642zl85y5axkj8z827l0vhjl532acb75hlkir77rl"; - }; - - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; - - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; - - meta = { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://lxml.de; - license = licenses.bsd3; - }; - }); - lxc = buildPythonPackage (rec { name = "python-lxc-unstable-2016-08-25"; disabled = !isPy27; @@ -14119,6 +12690,8 @@ in { }; }); + ltc_scrypt = callPackage ../development/python-modules/ltc_scrypt/default.nix { }; + python_magic = buildPythonPackage rec { name = "python-magic-0.4.10"; @@ -14152,17 +12725,19 @@ in { src = pkgs.file.src; patchPhase = '' - substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.so'" + substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.${if stdenv.isDarwin then "dylib" else "so"}'" ''; - buildInputs = with self; [ python pkgs.file ]; + buildInputs = with self; [ pkgs.file ]; preConfigure = "cd python"; + # No test suite + doCheck = false; + meta = { description = "A Python wrapper around libmagic"; homepage = http://www.darwinsys.com/file/; - broken = true; }; }; @@ -14207,18 +12782,34 @@ in { description = "Super-fast templating language"; homepage = http://www.makotemplates.org; license = licenses.mit; + platforms = platforms.unix; maintainers = with maintainers; [ domenkozar ]; }; }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix {}; + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix {}; + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix {}; + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix {}; + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix {}; + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix {}; + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix {}; + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix {}; + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix {}; + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix {}; + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {}; + marionette-harness = callPackage ../development/python-modules/marionette-harness {}; markupsafe = buildPythonPackage rec { name = "markupsafe-${version}"; - version = "0.23"; + version = "1.0"; src = pkgs.fetchurl { url = "mirror://pypi/M/MarkupSafe/MarkupSafe-${version}.tar.gz"; - sha256 = "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3"; + sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6"; }; meta = { @@ -14264,6 +12855,8 @@ in { }; }; + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; + markdown-macros = buildPythonPackage rec { name = "markdown-macros-${version}"; version = "0.1.2"; @@ -14297,7 +12890,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 { @@ -14323,7 +12919,7 @@ in { propagatedBuildInputs = with self; [ cython sympy - django_1_8 + django ply mpmath dateutil @@ -14347,52 +12943,18 @@ in { }; - mccabe = buildPythonPackage (rec { - name = "mccabe-0.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mccabe/${name}.tar.gz"; - sha256 = "16293af41e7242031afd73896fef6458f4cad38201d21e28f344fff50ae1c25e"; - }; - - buildInputs = with self; [ pytestrunner pytest ]; - - meta = { - description = "McCabe checker, plugin for flake8"; - homepage = "https://github.com/flintwork/mccabe"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }); - - mccabe_0_5 = buildPythonPackage (rec { - name = "mccabe-0.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mccabe/${name}.tar.gz"; - sha256 = "1zss8c5cn8wvxsbjzv70dxymybh3cjzrjl19vxfbnyvmidng0wrl"; - }; - - buildInputs = with self; [ pytestrunner pytest ]; - - meta = { - description = "McCabe checker, plugin for flake8"; - homepage = "https://github.com/flintwork/mccabe"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }); + 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; @@ -14414,7 +12976,7 @@ in { sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd"; }; - propagatedBuildInputs = with self; [ requests2 beautifulsoup4 six ]; + propagatedBuildInputs = with self; [ requests beautifulsoup4 six ]; meta = { description = "A Python library for automating interaction with websites"; @@ -14479,6 +13041,8 @@ in { }; }; + metaphone = callPackage ../development/python-modules/metaphone { }; + mezzanine = buildPythonPackage rec { version = "3.1.10"; name = "mezzanine-${version}"; @@ -14493,8 +13057,8 @@ in { buildInputs = with self; [ pyflakes pep8 ]; propagatedBuildInputs = with self; [ - django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 - requests2 requests_oauthlib future pillow + django filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 + requests requests_oauthlib future pillow ]; # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ @@ -14572,6 +13136,8 @@ in { }; }; + mplleaflet = callPackage ../development/python-modules/mplleaflet { }; + multidict = callPackage ../development/python-modules/multidict { }; munch = buildPythonPackage rec { @@ -14622,11 +13188,11 @@ in { rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "1.3.6"; + version = "1.3.7"; src = pkgs.fetchurl { url = "mirror://pypi/r/rainbowstream/${name}.tar.gz"; - sha256 = "04ki61mc2f5rw60zssr1rr6dmjmvhlws5rpnwd3zih6pi5b7cy4a"; + sha256 = "0zpi1x3b535pwx8rkq57nnrb5d5ma65vvlalar9vi6ilp124x1w2"; }; patches = [ @@ -14653,7 +13219,7 @@ in { buildInputs = with self; [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales - pillow twitter pyfiglet requests2 arrow dateutil pysocks + pillow twitter pyfiglet requests arrow dateutil pysocks pocket ]; @@ -14675,7 +13241,7 @@ in { }; buildInputs = with self; [ - requests2 + requests ]; meta = { @@ -14698,7 +13264,7 @@ in { buildInputs = with self; [nose]; meta = { - decription = "The fastest markdown parser in pure Python"; + description = "The fastest markdown parser in pure Python"; homepage = https://github.com/lepture/mistune; license = licenses.bsd3; }; @@ -14900,7 +13466,7 @@ in { propagatedBuildInputs = with self; [ # Main dependencies - jinja2 werkzeug flask requests2 six boto httpretty xmltodict + jinja2 werkzeug flask requests six boto httpretty xmltodict # For tests nose sure boto3 freezegun ]; @@ -15097,6 +13663,9 @@ in { sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; }; + # No tests in archive + doCheck = false; + meta = { homepage = http://github.com/mrocklin/multipledispatch/; description = "A relatively sane approach to multiple dispatch in Python"; @@ -15277,7 +13846,7 @@ in { buildInputs = with self; [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; - propagatedBuildInputs = with self; [ six requests2 requests_oauthlib ]; + propagatedBuildInputs = with self; [ six requests requests_oauthlib ]; checkPhase = '' py.test @@ -15330,16 +13899,15 @@ in { }; pygal = buildPythonPackage rec { - version = "2.0.10"; - name = "pygal-${version}"; + pname = "pygal"; + version = "2.3.1"; + name = "${pname}-${version}"; doCheck = !isPyPy; # one check fails with pypy - src = pkgs.fetchFromGitHub { - owner = "Kozea"; - repo = "pygal"; - rev = version; - sha256 = "1j7qjgraapvfc80yp8xcbddqrw8379gqi7pwkvfml3qcqm0z0d33"; + src = fetchPypi { + inherit pname version; + sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667"; }; buildInputs = with self; [ flask pyquery pytest ]; @@ -15371,25 +13939,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"; @@ -15409,6 +13959,8 @@ in { substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e" ''; + doCheck = stdenv.hostPlatform.isLinux; + meta = { description = "Tool to measure, monitor and analyze memory behavior"; homepage = http://pythonhosted.org/Pympler/; @@ -15502,6 +14054,9 @@ in { sha256 = "170fbf11c54def1b5fcc919be0a890b760bb2eca81f56123a5dda0c69b5b099e"; }; + # Judging from SyntaxError + disabled = isPy3k; + meta = { maintainers = with maintainers; [ garbas domenkozar ]; platforms = platforms.linux; @@ -15567,64 +14122,17 @@ in { }; }; - nbconvert = buildPythonPackage rec { - version = "5.1.1"; - name = "nbconvert-${version}"; + nbconvert = callPackage ../development/python-modules/nbconvert { }; - src = pkgs.fetchurl { - url = "mirror://pypi/n/nbconvert/${name}.tar.gz"; - sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d"; - }; - - buildInputs = with self; [nose ipykernel ]; - - propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client]; - - checkPhase = '' - nosetests -v - ''; - - # PermissionError. Likely due to being in a chroot - doCheck = false; - - meta = { - description = "Converting Jupyter Notebooks"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; - - nbformat = buildPythonPackage rec { - version = "4.2.0"; - name = "nbformat-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nbformat/${name}.tar.gz"; - sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06"; - }; - LC_ALL="en_US.UTF-8"; - buildInputs = with self; [ pytest pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core]; - - # Failing tests and permission issues - doCheck = false; - - meta = { - description = "The Jupyter Notebook format"; - homepage = "http://jupyter.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + nbformat = callPackage ../development/python-modules/nbformat { }; nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5.3"; + name = "nbxmpp-${version}"; + version = "0.5.5"; src = pkgs.fetchurl { - name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/8"; - sha256 = "0dcr786dyips1fdvgsn8yvpgcz5j7217fi05c29cfypdl8jnp6mp"; + url = "mirror://pypi/n/nbxmpp/${name}.tar.gz"; + sha256 = "1gnzrzrdl4nii1sc5x8p5iw2ya5sl70j3nn34abqsny51p2pzmv6"; }; meta = { @@ -15671,23 +14179,35 @@ in { propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; meta = { - meta = "Elegant Python library for XMPP"; + description = "Elegant Python library for XMPP"; license = licenses.mit; homepage = https://dev.louiz.org/projects/slixmpp; }; }; netaddr = buildPythonPackage rec { - name = "netaddr-0.7.18"; - doCheck = !isPy35; # https://github.com/drkjam/netaddr/issues/117 + pname = "netaddr"; + version = "0.7.19"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/n/netaddr/${name}.tar.gz"; - sha256 = "06dxjlbcicq7q3vqy8agq11ra01kvvd47j4mk6dmghjsyzyckxd1"; + src = fetchPypi { + inherit pname version; + sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ pkgs.glibcLocales ]; + buildInputs = with self; [ pkgs.glibcLocales pytest ]; + + checkPhase = '' + py.test netaddr/tests + ''; + + patches = [ + (pkgs.fetchpatch { + url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; + sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7"; + }) + ]; meta = { homepage = https://github.com/drkjam/netaddr/; @@ -15735,6 +14255,8 @@ in { name = "${name}.tar.gz"; }; + disabled = isPy3k; + propagatedBuildInputs = with self; [ twisted ]; postInstall = "twistd --help > /dev/null"; @@ -16043,35 +14565,7 @@ in { buildInputs = with self; [ nose ]; }; - notebook = buildPythonPackage rec { - version = "4.3.2"; - name = "notebook-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9"; - }; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = with self; [nose pkgs.glibcLocales] ++ optionals isPy27 [mock]; - - propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect]; - - checkPhase = '' - nosetests -v - ''; - - # Certain tests fail due to being in a chroot. - # PermissionError - doCheck = false; - meta = { - description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + notebook = callPackage ../development/python-modules/notebook { }; notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; @@ -16124,26 +14618,7 @@ in { }; }; - emoji = buildPythonPackage rec { - name = "emoji-${version}"; - version = "0.3.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/e/emoji/${name}.tar.gz"; - sha256 = "19p5c2nlq0w9972rf9fghyswnijwgig5f8cyzs32kppnmzvzbkxw"; - }; - - buildInputs = with self; [ nose ]; - - checkPhase = ''nosetests''; - - meta = { - description = "Emoji for Python"; - homepage = https://pypi.python.org/pypi/emoji/; - license = licenses.bsd3; - maintainers = with maintainers; [ joachifm ]; - }; - }; + emoji = callPackage ../development/python-modules/emoji { }; ntfy = buildPythonPackage rec { version = "1.2.0"; @@ -16155,7 +14630,7 @@ in { sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc"; }; - propagatedBuildInputs = with self; [ appdirs pyyaml requests2 dbus-python emoji sleekxmpp mock ]; + propagatedBuildInputs = with self; [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ]; meta = { description = "A utility for sending notifications, on demand and when commands finish"; @@ -16225,13 +14700,13 @@ in { # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.5.21.3"; + version = "0.5.25"; name = "Nuitka-${version}"; # Latest version is not yet on PyPi src = pkgs.fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "1i2069hxb94q9kkwcbky59fin8hk1vlj90lwgmrdhn1srvig1cq3"; + sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa"; }; buildInputs = with self; stdenv.lib.optionals doCheck [ vmprof pyqt4 ]; @@ -16264,30 +14739,10 @@ in { }; }; - - buildNumpyPackage = callPackage ../development/python-modules/numpy.nix { - gfortran = pkgs.gfortran; + numpy = callPackage ../development/python-modules/numpy { blas = pkgs.openblasCompat; }; - numpy = self.numpy_1_11; - - numpy_1_10 = self.buildNumpyPackage rec { - version = "1.10.4"; - src = pkgs.fetchurl { - url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz"; - sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b"; - }; - }; - - numpy_1_11 = self.buildNumpyPackage rec { - version = "1.11.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/n/numpy/numpy-${version}.zip"; - sha256 = "2e0fc5248246a64628656fe14fcab0a959741a2820e003bd15538226501b82f7"; - }; - }; - numpydoc = buildPythonPackage rec { pname = "numpydoc"; name = "${pname}-${version}"; @@ -16402,7 +14857,7 @@ in { buildInputs = [ pkgs.makeWrapper ]; - propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests2 ] + propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests ] ++ optionals isPy26 [ singledispatch futures argparse ] ++ optionals isPy27 [ singledispatch futures ] ++ optionals isPy33 [ singledispatch ]; @@ -16606,31 +15061,6 @@ in { doCheck = false; }; - openpyxl_2_2_0_b1 = buildPythonPackage rec { - version = "2.2.0-b1"; - name = "openpyxl-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/openpyxl/${name}.tar.gz"; - sha256 = "0n10pawp2558jrrmppyhkrv7889k3g4mifqj3fp68qbr20ldk51k"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; - - # Tests are not included in archive. - # https://bitbucket.org/openpyxl/openpyxl/issues/610 - doCheck = false; - - meta = { - description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; - license = licenses.mit; - maintainers = with maintainers; [ lihop sjourdois ]; - platforms = platforms.all; - }; - }; - openpyxl = buildPythonPackage rec { version = "2.3.5"; name = "openpyxl-${version}"; @@ -16782,18 +15212,19 @@ in { }); osc = buildPythonPackage { - name = "osc-0.156.0-16-g9e6d1a5"; + name = "osc-0.156.0-94-gd8ba394"; disabled = isPy3k; src = pkgs.fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9"; - sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z"; + rev = "d8ba39416bb193a15489cb2ae57847434adbf1c8"; + sha256 = "0bxl1sjfpdrhyc0qljyqlkffyzn1iywjqgaz2z1y07zq59gc8wq0"; }; buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; postInstall = '' ln -s $out/bin/osc-wrapper.py $out/bin/osc + install -D -m444 osc.fish $out/etc/fish/completions/osc.fish install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper mkdir -p $out/share/bash-completion/completions cat >>$out/share/bash-completion/completions/osc <=" - rm tests/test_rowlimit.py - ''; - - meta = { - description = "Command-line interface for PostgreSQL"; - longDescription = '' - Rich command-line interface for PostgreSQL with auto-completion and - syntax highlighting. - ''; - homepage = http://pgcli.com; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - pgspecial = buildPythonPackage rec { - name = "pgspecial-${version}"; - version = "1.6.0"; + pname = "pgspecial"; + version = "1.8.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - sha256 = "09ilalpgcl86f79648qsjm87dqi97bc70y51nrf0b3i1py3mhs2m"; - url = "mirror://pypi/p/pgspecial/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; + sha256 = "1dwlv3m4jl34zsakmvxg6hgbfv786jl8dcffxsrlnmcpks829xc9"; }; buildInputs = with self; [ pytest psycopg2 ]; checkPhase = '' + find tests -name \*.pyc -delete py.test tests ''; @@ -18809,15 +17060,18 @@ in { }; pickleshare = buildPythonPackage rec { - version = "0.5"; + version = "0.7.4"; name = "pickleshare-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pickleshare/${name}.tar.gz"; - sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286"; + sha256 = "84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b"; }; - propagatedBuildInputs = with self; [pathpy]; + propagatedBuildInputs = with self; [pathpy] ++ optional (pythonOlder "3.4") pathlib2; + + # No proper test suite + doCheck = false; meta = { description = "Tiny 'shelve'-like database with concurrency support"; @@ -18846,6 +17100,8 @@ in { }; }; + piexif = callPackage ../development/python-modules/piexif { }; + pip = buildPythonPackage rec { pname = "pip"; version = "9.0.1"; @@ -18860,7 +17116,7 @@ in { # to force it a little. installFlags = [ "--ignore-installed" ]; - buildInputs = with self; [ mock scripttest virtualenv pretend pytest ]; + checkInputs = with self; [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; @@ -18872,6 +17128,10 @@ in { }; }; + pip-tools = callPackage ../development/python-modules/pip-tools { + glibcLocales = pkgs.glibcLocales; + }; + pika = buildPythonPackage rec { name = "pika-${version}"; version = "0.10.0"; @@ -18893,6 +17153,8 @@ in { }; }; + pika-pool = callPackage ../development/python-modules/pika-pool { }; + platformio = buildPythonPackage rec { name = "platformio-${version}"; version="2.10.3"; @@ -18904,7 +17166,7 @@ in { sha256 = "f3a646871f9baed05f336a32576edaab90abf0737d8adb54f2acb7bcad42a65f"; }; - propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama]; + propagatedBuildInputs = with self; [ click_5 requests bottle pyserial lockfile colorama]; meta = with stdenv.lib; { description = "An open source ecosystem for IoT development"; @@ -18934,6 +17196,8 @@ in { }; }; + pylibmc = callPackage ../development/python-modules/pylibmc {}; + pymetar = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pymetar"; @@ -19023,10 +17287,10 @@ in { python-jenkins = buildPythonPackage rec { name = "python-jenkins-${version}"; - version = "0.4.11"; + version = "0.4.14"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-jenkins/${name}.tar.gz"; - sha256 = "153gm7pmmn0bymglsgcr2ya0752r2v1hajkx73gl1pk4jifb2gdf"; + sha256 = "1n8ikvd9jf4dlki7nqlwjlsn8wpsx4x7wg4h3d6bkvyvhwwf8yqf"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf @@ -19034,7 +17298,7 @@ in { buildInputs = with self; [ mock ]; propagatedBuildInputs = with self; [ pbr pyyaml six multi_key_dict testtools - testscenarios testrepository ]; + testscenarios testrepository kerberos ]; meta = { description = "Python bindings for the remote Jenkins API"; @@ -19133,16 +17397,7 @@ in { }; - plumbum = buildPythonPackage rec { - name = "plumbum-1.5.0"; - - buildInputs = with self; [ self.six ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/plumbum/${name}.tar.gz"; - sha256 = "b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756"; - }; - }; + plumbum = callPackage ../development/python-modules/plumbum { }; polib = buildPythonPackage rec { @@ -19180,44 +17435,7 @@ in { }; }; - powerline = buildPythonPackage rec { - rev = "2.4"; - name = "powerline-${rev}"; - src = pkgs.fetchurl { - url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz"; - name = "${name}.tar.gz"; - sha256 = "12fp3cpwgpkxcj4mfjdpsmf1h0b8pqy1icb07jdivz9kw18h0184"; - }; - - propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ]; - - # error: This is still beta and some tests still fail - doCheck = false; - - postInstall = '' - install -dm755 "$out/share/fonts/OTF/" - install -dm755 "$out/etc/fonts/conf.d" - install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf" - install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf" - - install -dm755 "$out/share/vim/vimfiles/plugin" - install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim" - - install -dm755 "$out/share/zsh/site-contrib" - install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh" - - install -dm755 "$out/share/tmux" - install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" - ''; - - meta = { - homepage = https://github.com/powerline/powerline; - description = "The ultimate statusline/prompt utility"; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.all; - }; - }; + powerline = callPackage ../development/python-modules/powerline { }; pox = buildPythonPackage rec { name = "pox-${version}"; @@ -19262,7 +17480,7 @@ in { }; propagatedBuildInputs = with self; [ - requests2 + requests decorator flake8 mock @@ -19305,10 +17523,10 @@ in { prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "1.0.9"; + version = "1.0.14"; src = pkgs.fetchurl { - sha256 = "172r15k9kwdw2lnajvpz1632dd16nqz1kcal1p0lq5ywdarj6rfd"; + sha256 = "cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f"; url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; checkPhase = '' @@ -19400,11 +17618,11 @@ in { }); psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.6.1"; + name = "psycopg2-2.7.1"; disabled = isPyPy; src = pkgs.fetchurl { url = "mirror://pypi/p/psycopg2/${name}.tar.gz"; - sha256 = "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"; + sha256 = "86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6"; }; buildInputs = optional stdenv.isDarwin pkgs.openssl; propagatedBuildInputs = with self; [ pkgs.postgresql ]; @@ -19486,7 +17704,7 @@ in { sha256 = "0117039cb116af245e6866e8e8bf3c9c8b2853ad087142bd0c2dfc0acc09d452"; }; - propagatedBuildInputs = with self; [ requests2 audioread ]; + propagatedBuildInputs = with self; [ requests audioread ]; patches = [ ../development/python-modules/pyacoustid-py3.patch ]; @@ -19597,7 +17815,7 @@ in { propagatedBuildInputs = with self; [ repoze_who paste cryptography pycrypto pyopenssl ipaddress six cffi idna - enum34 pytz setuptools zope_interface dateutil requests2 pyasn1 webob decorator pycparser + enum34 pytz setuptools zope_interface dateutil requests pyasn1 webob decorator pycparser defusedxml ]; buildInputs = with self; [ @@ -19728,13 +17946,24 @@ in { }; pygit2 = buildPythonPackage rec { - name = "pygit2-0.24.0"; + name = "pygit2-0.25.1"; src = pkgs.fetchurl { url = "mirror://pypi/p/pygit2/${name}.tar.gz"; - sha256 = "01c155ls0h5pvpdkrk8ld6fscshmz4fchcwxrg488dbij1zdjxms"; + sha256 = "0sja3g9mqwp5bnhdc313b2gc4z3p70nn6zzf2h8j581g0lrn0sg8"; }; + # Fixes a bug which can cause test failed when cffi==1.10 + prePatch = let + cffiVersionPatch = pkgs.fetchurl { + url = "https://github.com/libgit2/pygit2/commit/b88dc868423af2f760f649960112efd0e37e5335.patch"; + sha256 = "14cfrz56y2dnwlxrrss9pjhxfnyyg5856gbabzjzyx674k0qcid4"; + }; + in '' + # we need to delete part of the patch because the missing .travis.yml causes problem + sed -e '1,36d' ${cffiVersionPatch} | patch -p1 + ''; + preConfigure = ( if stdenv.isDarwin then '' export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" '' else "" ); @@ -19745,6 +17974,7 @@ in { # disable tests that require networking rm test/test_repository.py rm test/test_credentials.py + rm test/test_submodule.py ''; meta = { @@ -19755,7 +17985,6 @@ in { }; }; - Babel = buildPythonPackage (rec { name = "Babel-2.3.4"; @@ -19988,7 +18217,7 @@ in { sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf"; }; - propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; + buildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; # error: invalid command 'test' doCheck = false; @@ -20053,20 +18282,7 @@ in { }; }); - pydot = buildPythonPackage rec { - name = "pydot-1.0.2"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pydot/${name}.tar.gz"; - sha256 = "80ea01a7ba75671a3b7890375be0ad8d5321b07bfb6f572192c31409062b59f3"; - }; - propagatedBuildInputs = with self; [pyparsing pkgs.graphviz]; - meta = { - homepage = http://code.google.com/p/pydot/; - description = "Allows to easily create both directed and non directed graphs from Python"; - }; - }; + pydot = callPackage ../development/python-modules/pydot { }; pydot_ng = buildPythonPackage rec { name = "pydot_ng-1.0.0"; @@ -20114,12 +18330,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 = '' @@ -20291,11 +18507,11 @@ in { pyfiglet = buildPythonPackage rec { name = "pyfiglet-${version}"; - version = "0.7.2"; + version = "0.7.5"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyfiglet/${name}.tar.gz"; - sha256 = "0v8a18wvaqnb1jksyv5dc5n6zj0vrkyhz0ivmm8gfwpa0ky6n68y"; + sha256 = "04jy4182hn5xfs6jf432gxclfj1rhssd7bsf0b4gymrjzkhr8qa4"; }; doCheck = false; @@ -20307,28 +18523,7 @@ in { }; }; - pyflakes = buildPythonPackage rec { - pname = "pyflakes"; - version = "1.3.0"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a4f93317c97a9d9ed71d6ecfe08b68e3de9fea3f4d94dcd1d9d83ccbf929bc31"; - }; - - buildInputs = with self; [ unittest2 ]; - - doCheck = !isPyPy; - force-rebuild = 1; # fix transient test suite error at http://hydra.nixos.org/build/45083762 - - meta = { - homepage = https://launchpad.net/pyflakes; - description = "A simple program which checks Python source files for errors"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + pyflakes = callPackage ../development/python-modules/pyflakes { }; pyftgl = buildPythonPackage rec { name = "pyftgl-0.4b"; @@ -20368,6 +18563,8 @@ in { }; }; + PyGithub = callPackage ../development/python-modules/pyGithub {}; + pyglet = buildPythonPackage rec { name = "pyglet-${version}"; version = "1.2.4"; @@ -20392,30 +18589,10 @@ in { }; }; - pygments = buildPythonPackage rec { - version = "2.2.0"; - name = "Pygments-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/Pygments/${name}.tar.gz"; - sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv"; - }; - - propagatedBuildInputs = with self; [ docutils ]; - - # Circular dependency with sphinx - doCheck = false; - - meta = { - homepage = http://pygments.org/; - description = "A generic syntax highlighter"; - license = licenses.bsd2; - maintainers = with maintainers; [ nckx garbas ]; - }; - }; + pygments = callPackage ../development/python-modules/Pygments { }; # For Pelican 3.6.3 - pygments_2_0 = self.pygments.override rec { + pygments_2_0 = self.pygments.overrideAttrs( oldAttrs: rec { version = "2.0.2"; name = "Pygments-${version}"; @@ -20423,7 +18600,7 @@ in { url = "mirror://pypi/P/Pygments/${name}.tar.gz"; sha256 = "7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51"; }; - }; + }); pygpgme = buildPythonPackage rec { version = "0.3"; @@ -20452,6 +18629,12 @@ in { pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyproj = callPackage ../development/python-modules/pyproj { + # pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by + # a few decimal places, so caveat emptor. + proj = null; + }; + pyrr = buildPythonPackage rec { name = "pyrr-${version}"; version = "0.7.2"; @@ -20489,6 +18672,8 @@ in { }; }; + pyspread = callPackage ../development/python-modules/pyspread { }; + pyx = buildPythonPackage rec { name = "pyx-${version}"; version = "0.14.1"; @@ -20618,11 +18803,11 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.5"; + name = "PyICU-1.9.6"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; + sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5"; }; buildInputs = [ pkgs.icu ]; @@ -20792,16 +18977,18 @@ in { pyocr = buildPythonPackage rec { name = "pyocr-${version}"; - version = "0.4.4"; + version = "0.4.6"; # Don't fetch from PYPI because it doesn't contain tests. src = pkgs.fetchFromGitHub { owner = "jflesch"; repo = "pyocr"; rev = version; - sha256 = "09s7dxin8ams0f3xab60f45l3nn236a8win9yfyq9aqy9mm946ak"; + sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0"; }; + patches = [ ../development/python-modules/pyocr-tesseract.patch ]; + postPatch = '' sed -i \ -e 's,^\(TESSERACT_CMD *= *\).*,\1"${pkgs.tesseract}/bin/tesseract",' \ @@ -20867,22 +19054,6 @@ in { }; }; - pyparsing1 = buildPythonPackage rec { - name = "pyparsing-1.5.7"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyparsing/${name}.tar.gz"; - sha256 = "646e14f90b3689b005c19ac9b6b390c9a39bf976481849993e277d7380e6e79f"; - }; - - meta = { - homepage = http://pyparsing.wikispaces.com/; - description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - }; - }; - - pyparted = buildPythonPackage rec { name = "pyparted-${version}"; version = "3.10.7"; @@ -21013,7 +19184,7 @@ in { }; }); - pyro3 = buildPythonPackage (rec { + Pyro = buildPythonPackage (rec { name = "Pyro-3.16"; disabled = isPy3k; @@ -21054,14 +19225,19 @@ in { }; }); - pyrss2gen = buildPythonPackage (rec { - name = "PyRSS2Gen-1.0.0"; + PyRSS2Gen = buildPythonPackage (rec { + pname = "PyRSS2Gen"; + version = "1.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyRSS2Gen/${name}.tar.gz"; - sha256 = "4929d022713129401160fd47550d5158931e4ea6a7136b5d8dfe3b13ac16f2f0"; + src = fetchPypi { + inherit pname version; + sha256 = "1rvf5jw9hknqz02rp1vg8abgb1lpa0bc65l7ylmlillqx7bswq3r"; }; + # No tests in archive + doCheck = false; + meta = { homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html; description = "Library for generating RSS 2.0 feeds"; @@ -21369,6 +19545,38 @@ in { }; }; + pyplatec = buildPythonPackage rec { + name = "PyPlatec-${version}"; + version = "1.4.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/P/PyPlatec/${name}.tar.gz"; + sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg"; + }; + + meta = { + description = "Library to simulate plate tectonics with Python bindings"; + homepage = https://github.com/Mindwerks/plate-tectonics; + license = licenses.lgpl3; + }; + }; + + purepng = buildPythonPackage rec { + name = "purepng-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/purepng/${name}.tar.gz"; + sha256 = "1kcl7a6d7d59360fbz2jwfk6ha6pmqgn396962p4s62j893d2r0d"; + }; + + meta = { + description = "Pure Python library for PNG image encoding/decoding"; + homepage = https://github.com/scondo/purepng; + license = licenses.mit; + }; + }; + pymaging = buildPythonPackage rec { name = "pymaging-unstable-2016-11-16"; @@ -21491,11 +19699,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 = '' @@ -21715,8 +19929,9 @@ in { }; - pysvn = mkPythonDerivation rec { + pysvn = buildPythonPackage rec { name = "pysvn-1.8.0"; + format = "other"; src = pkgs.fetchurl { url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz"; @@ -21871,9 +20086,10 @@ in { }); - pywebkitgtk = mkPythonDerivation rec { + pywebkitgtk = buildPythonPackage rec { name = "pywebkitgtk-${version}"; version = "1.1.8"; + format = "other"; src = pkgs.fetchurl { url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2"; @@ -21882,7 +20098,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 = { @@ -21892,23 +20108,7 @@ in { }; }; - pywinrm = buildPythonPackage rec { - version = "0.1.1"; - name = "pywinrm-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/diyan/pywinrm/archive/v${version}.tar.gz"; - sha256 = "1pc0987f6q5sxcgm50a1k1xz2pk45ny9xxnyapaf60662rcavvfb"; - }; - - propagatedBuildInputs = with self; [ isodate kerberos xmltodict ]; - - meta = { - homepage = "http://github.com/diyan/pywinrm/"; - description = "Python library for Windows Remote Management"; - license = licenses.mit; - }; - }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; PyXAPI = stdenv.mkDerivation rec { name = "PyXAPI-0.1"; @@ -22110,8 +20310,8 @@ in { }; }; - - requests = buildPythonPackage rec { + # Remove before release of 17.09 + requests_1 = buildPythonPackage rec { name = "requests-1.2.3"; disabled = !pythonOlder "3.4"; @@ -22126,8 +20326,10 @@ in { }; }; + requests2 = throw "requests2 has been deprecated. Use requests instead."; - requests2 = buildPythonPackage rec { + # use requests, not requests_2 + requests = buildPythonPackage rec { name = "requests-${version}"; version = "2.13.0"; @@ -22159,7 +20361,7 @@ in { sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; meta = { description = "Download files using requests and save them to a target path"; @@ -22169,6 +20371,8 @@ in { }; }; + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; requests_toolbelt = buildPythonPackage rec { @@ -22180,7 +20384,7 @@ in { sha256 = "16grklnbgcfwqj3f39gw7fc9afi7xlp9gm7x8w6mi81dzhdxf50y"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; buildInputs = with self; [ betamax mock pytest ]; @@ -22206,10 +20410,11 @@ in { qscintilla = if isPy3k || isPyPy then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" - else mkPythonDerivation rec { + else buildPythonPackage rec { # TODO: Qt5 support name = "qscintilla-${version}"; version = pkgs.qscintilla.version; + format = "other"; src = pkgs.qscintilla.src; @@ -22255,28 +20460,7 @@ in { }; }; - qtconsole = buildPythonPackage rec { - version = "4.2.1"; - name = "qtconsole-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/q/qtconsole/${name}.tar.gz"; - sha256 = "1vqqx9hdvrg2d336wjyw0vr5b5v97kflkqqvr7ryicr8als7vv15"; - }; - - buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; - propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4]; - - # : cannot connect to X server - doCheck = false; - - meta = { - description = "Jupyter Qt console"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + qtconsole = callPackage ../development/python-modules/qtconsole { }; quantities = buildPythonPackage rec { name = "quantities-0.10.1"; @@ -22324,6 +20508,8 @@ in { }; }; + rcssmin = callPackage ../development/python-modules/rcssmin { }; + recommonmark = buildPythonPackage rec { name = "recommonmark-${version}"; version = "0.4.0"; @@ -22362,6 +20548,23 @@ in { }; }; + rednose = buildPythonPackage rec { + name = "rednose-${version}"; + version = "1.2.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/r/rednose/${name}.tar.gz"; + sha256 = "0b0bsna217lr1nykyhl5fgjly15zhdvqd4prg4wy1zrgfv7al6m0"; + }; + + meta = { + description = "A python nose plugin adding color to console results."; + }; + + buildInputs = with self; [ nose six ]; + propagatedBuildInputs = with self; [ colorama termstyle ]; + }; + reikna = callPackage ../development/python-modules/reikna { }; repocheck = buildPythonPackage rec { @@ -22393,7 +20596,7 @@ in { sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; # no tests in tarball doCheck = false; @@ -22457,6 +20660,8 @@ in { }; }; + rjsmin = callPackage ../development/python-modules/rjsmin { }; + pysolr = buildPythonPackage rec { name = "pysolr-${version}"; version = "3.3.3"; @@ -22467,7 +20672,7 @@ in { }; propagatedBuildInputs = with self; [ - requests2 + requests ]; buildInputs = with self; [ @@ -22492,7 +20697,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 = '' @@ -22563,7 +20768,6 @@ in { }; }; - reviewboard = buildPythonPackage rec { name = "ReviewBoard-2.5.1.1"; @@ -22578,7 +20782,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 ]; @@ -22797,7 +21001,7 @@ in { }; buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ robotframework lxml requests2 ]; + propagatedBuildInputs = with self; [ robotframework lxml requests ]; meta = { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; @@ -22882,21 +21086,7 @@ in { }; }; - ropper = buildPythonApplication rec { - name = "ropper-1.10.10"; - src = pkgs.fetchurl { - url = "mirror://pypi/r/ropper/${name}.tar.gz"; - sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; - }; - propagatedBuildInputs = with self; [ capstone filebytes ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://scoding.de/ropper/"; - license = licenses.gpl2; - description = "Show information about files in different file formats"; - maintainers = with maintainers; [ bennofs ]; - }; - }; - + ropper = callPackage ../development/python-modules/ropper { }; routes = buildPythonPackage rec { name = "routes-1.12.3"; @@ -22943,7 +21133,7 @@ in { buildInputs = with self; [ appdirs ]; meta = with pkgs.stdenv.lib; { - descriptions = "A python Lex/Yacc that works with RPython"; + description = "A python Lex/Yacc that works with RPython"; homepage = https://github.com/alex/rply; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; @@ -23077,6 +21267,8 @@ in { }; }; + typeguard = callPackage ../development/python-modules/typeguard { }; + ruamel_yaml = buildPythonPackage rec { name = "ruamel.yaml-${version}"; version = "0.13.7"; @@ -23104,7 +21296,6 @@ in { runsnakerun = buildPythonPackage rec { name = "runsnakerun-2.0.4"; - src = pkgs.fetchurl { url = "mirror://pypi/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz"; sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef"; @@ -23266,29 +21457,7 @@ in { }; }; - buildScipyPackage = callPackage ../development/python-modules/scipy.nix { - gfortran = pkgs.gfortran; - }; - - scipy = self.scipy_0_18; - - scipy_0_17 = self.buildScipyPackage rec { - version = "0.17.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w"; - }; - numpy = self.numpy; - }; - - scipy_0_18 = self.buildScipyPackage rec { - version = "0.18.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e"; - }; - numpy = self.numpy; - }; + scipy = callPackage ../development/python-modules/scipy { }; scikitimage = buildPythonPackage rec { name = "scikit-image-${version}"; @@ -23313,32 +21482,8 @@ in { }; }; - - scikitlearn = buildPythonPackage rec { - name = "scikit-learn-${version}"; - version = "0.18.1"; - disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scikit-learn/${name}.tar.gz"; - sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c"; - }; - - buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ numpy scipy numpy.blas ]; - - LC_ALL="en_US.UTF-8"; - - checkPhase = '' - HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/ - ''; - - meta = { - description = "A set of python modules for machine learning and data mining"; - homepage = http://scikit-learn.org; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; + scikitlearn = callPackage ../development/python-modules/scikitlearn { + inherit (pkgs) gfortran glibcLocales; }; scripttest = buildPythonPackage rec { @@ -23419,14 +21564,15 @@ in { setuptools_scm = buildPythonPackage rec { name = "setuptools_scm-${version}"; - version = "1.11.1"; + version = "1.15.0"; src = pkgs.fetchurl { url = "mirror://pypi/s/setuptools_scm/${name}.tar.gz"; - sha256 = "8c45f738a23410c5276b0ed9294af607f491e4260589f1eb90df8312e23819bf"; + sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs"; }; - buildInputs = with self; [ pip pytest ]; + buildInputs = with self; [ pip ]; + checkInputs = with self; [ pytest ]; # Seems to fail due to chroot doCheck = false; @@ -23488,11 +21634,15 @@ in { url = "mirror://pypi/s/${pname}/${name}.tar.gz"; sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = with self; [ pytest_29 virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ]; propagatedBuildInputs = with self; [ twisted pathlib2 ]; postPatch = '' sed -i '12,$d' tests/test_main.py ''; + + # Couldn't get tests working + doCheck = false; + meta = { description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit."; homepage = "https://github.com/rutsky/setuptools-trial"; @@ -23591,30 +21741,7 @@ in { }; }; - simplejson = buildPythonPackage (rec { - name = "simplejson-3.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/simplejson/${name}.tar.gz"; - sha256 = "14r4l4rcsyf87p2j4ycsbb017n4vzxfmv285rq2gny4w47rwi2j2"; - }; - - meta = { - description = "A simple, fast, extensible JSON encoder/decoder for Python"; - - longDescription = '' - simplejson is compatible with Python 2.4 and later with no - external dependencies. It covers the full JSON specification - for both encoding and decoding, with unicode support. By - default, encoding is done in an encoding neutral fashion (plain - ASCII with \uXXXX escapes for unicode characters). - ''; - - homepage = http://code.google.com/p/simplejson/; - - license = licenses.mit; - }; - }); + simplejson = callPackage ../development/python-modules/simplejson { }; simpleldap = buildPythonPackage rec { version = "0.8"; @@ -23844,7 +21971,7 @@ in { sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n"; }; - propagatedBuildInputs = with self; [ pydns lockfile ]; + propagatedBuildInputs = with self; [ bsddb3 pydns lockfile ]; meta = { description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; @@ -23937,25 +22064,7 @@ in { }; }; - stevedore = buildPythonPackage rec { - name = "stevedore-1.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/stevedore/${name}.tar.gz"; - sha256 = "149pjc0c3z6khjisn4yil3f94qjnzwafz093wc8rrzbw828qdkv8"; - }; - - doCheck = false; - - buildInputs = with self; [ oslosphinx ]; - propagatedBuildInputs = with self; [ pbr six argparse ]; - - meta = { - description = "Manage dynamic plugins for Python applications"; - homepage = "https://pypi.python.org/pypi/stevedore"; - license = licenses.asl20; - }; - }; + stevedore = callPackage ../development/python-modules/stevedore {}; Theano = self.TheanoWithoutCuda; @@ -24100,7 +22209,7 @@ in { sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg"; }; - propagatedBuildInputs = with self; [ six requests2 mock unittest2 ]; + propagatedBuildInputs = with self; [ six requests mock unittest2 ]; # FIXME doCheck = false; @@ -24514,6 +22623,25 @@ in { }; }; + sockjs-tornado = buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; + }; + + propagatedBuildInputs = with self; [ tornado ]; + + meta = { + homepage = "http://github.com/mrjoes/sockjs-tornado/"; + description = "SockJS python server implementation on top of Tornado framework"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; + }; + sorl_thumbnail = buildPythonPackage rec { name = "sorl-thumbnail-11.12"; @@ -24626,7 +22754,7 @@ in { sqlalchemy whoosh imagesize - requests2 + requests ]; # https://github.com/NixOS/nixpkgs/issues/22501 @@ -24655,6 +22783,8 @@ in { doCheck = false; }; + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + sphinx_rtd_theme = buildPythonPackage (rec { name = "sphinx_rtd_theme-0.1.9"; @@ -24726,8 +22856,21 @@ in { }; }); + sphinxcontrib-openapi = buildPythonPackage (rec { + name = "sphinxcontrib-openapi-0.3.0"; + + doCheck = false; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sphinxcontrib-openapi/${name}.tar.gz"; + sha256 = "0fyniq37nnmhrk4j7mzvg6vfcpb624hb9x70g6mccyw4xrnhadv6"; + }; + + propagatedBuildInputs = with self; [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; + }); + sphinxcontrib_httpdomain = buildPythonPackage (rec { - name = "sphinxcontrib-httpdomain-1.3.0"; + name = "sphinxcontrib-httpdomain-1.5.0"; # Check is disabled due to this issue: # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype @@ -24735,7 +22878,7 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/s/sphinxcontrib-httpdomain/${name}.tar.gz"; - sha256 = "ba8fbe82eddc96cfa9d7b975b0422801a14ace9d7e051b8b2c725b92ea6137b5"; + sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a"; }; propagatedBuildInputs = with self; [sphinx]; @@ -24843,6 +22986,8 @@ in { }; }); + spotipy = callPackage ../development/python-modules/spotipy { }; + Pweave = buildPythonPackage (rec { name = "Pweave-0.25"; @@ -24871,77 +23016,22 @@ in { rope = if isPy3k then null else self.rope; }; - sqlalchemy8 = buildPythonPackage rec { - name = "SQLAlchemy-0.8.7"; - disabled = isPy34 || isPy35; - doCheck = !isPyPy; + sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; - src = pkgs.fetchurl { - url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc"; - }; - - preConfigure = optionalString isPy3k '' - python3 sa2to3.py --no-diffs -w lib test examples - ''; - - buildInputs = with self; [ nose mock ] - ++ stdenv.lib.optional doCheck pysqlite; - - checkPhase = '' - ${python.executable} sqla_nose.py - ''; - - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; - broken = true; - }; - }; - - sqlalchemy = self.sqlalchemy_1_0; - - sqlalchemy_1_0 = buildPythonPackage rec { - name = "SQLAlchemy-${version}"; - version = "1.0.15"; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "586f5ccf068211795a89ed22d196c5cc3006b6be00261bcac6f584c0b8e0845a"; - }; - - buildInputs = with self; [ pytest mock pytest_xdist ] - ++ stdenv.lib.optional (!isPy3k) pysqlite; - - # Test-only dependency pysqlite doesn't build on Python 3. This isn't an - # acceptable reason to make all dependents unavailable on Python 3 as well - #doCheck = !(isPyPy || isPy3k); - - checkPhase = '' - py.test - ''; - - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; - license = licenses.mit; - }; - }; - - sqlalchemy_imageattach = buildPythonPackage rec { - name = "SQLAlchemy-ImageAttach-${version}"; - version = "0.8.2"; - disabled = isPy33; + SQLAlchemy-ImageAttach = buildPythonPackage rec { + pname = "SQLAlchemy-ImageAttach"; + version = "1.0.0"; + name = "${pname}-${version}"; src = pkgs.fetchFromGitHub { repo = "sqlalchemy-imageattach"; - owner = "crosspop"; + owner = "dahlia"; rev = "${version}"; - sha256 = "1pqf7vk4lsvnhw169cqfyk0iz5f8n45470mdslklpi38z2fax9p0"; + sha256 = "0ba97pn5dh00qvxyjbr0mr3pilxqw5kb3a6jd4wwbsfcv6nngqig"; }; - buildInputs = with self; [ pytest webob pkgs.imagemagick nose ]; - propagatedBuildInputs = with self; [ sqlalchemy8 Wand ]; + checkInputs = with self; [ pytest Wand.imagemagick webob ]; + propagatedBuildInputs = with self; [ sqlalchemy Wand ]; checkPhase = '' cd tests @@ -24953,43 +23043,13 @@ in { doCheck = !isPyPy; # failures due to sqla version mismatch meta = { - homepage = https://github.com/crosspop/sqlalchemy-imageattach; + homepage = https://github.com/dahlia/sqlalchemy-imageattach; description = "SQLAlchemy extension for attaching images to entity objects"; license = licenses.mit; }; }; - - sqlalchemy_migrate_func = sqlalchemy: buildPythonPackage rec { - name = "sqlalchemy-migrate-0.10.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sqlalchemy-migrate/${name}.tar.gz"; - sha256 = "00z0lzjs4ksr9yr31zs26csyacjvavhpz6r74xaw1r89kk75qg7q"; - }; - - buildInputs = with self; [ unittest2 scripttest pytz pylint tempest-lib mock testtools ]; - propagatedBuildInputs = with self; [ pbr tempita decorator sqlalchemy six sqlparse ]; - - checkPhase = '' - export PATH=$PATH:$out/bin - echo sqlite:///__tmp__ > test_db.cfg - # depends on ibm_db_sa - rm migrate/tests/changeset/databases/test_ibmdb2.py - # wants very old testtools - rm migrate/tests/versioning/test_schema.py - # transient failures on py27 - substituteInPlace migrate/tests/versioning/test_util.py --replace "test_load_model" "noop" - ${python.interpreter} setup.py test - ''; - - meta = { - homepage = http://code.google.com/p/sqlalchemy-migrate/; - description = "Schema migration tools for SQLAlchemy"; - }; - }; - - sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy; + sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; @@ -25019,29 +23079,7 @@ in { }; }; - statsmodels = buildPythonPackage rec { - name = "statsmodels-${version}"; - version = "0.6.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/statsmodels/${name}.tar.gz"; - sha256 = "be4e44374aec9e848b73e5a230dee190ac0c4519e1d40f69a5813190b13ec676"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib]; - - meta = { - description = "Statistical computations and models for use with SciPy"; - homepage = "https://www.github.com/statsmodels/statsmodels"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - - # Many tests fail when using latest numpy and pandas. - # See also https://github.com/statsmodels/statsmodels/issues/2602 - doCheck = false; - }; + statsmodels = callPackage ../development/python-modules/statsmodels { }; python_statsd = buildPythonPackage rec { name = "python-statsd-${version}"; @@ -25225,11 +23263,11 @@ in { freezegun = buildPythonPackage rec { name = "freezegun-${version}"; - version = "0.3.5"; + version = "0.3.8"; src = pkgs.fetchurl { url = "mirror://pypi/f/freezegun/freezegun-${version}.tar.gz"; - sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf"; + sha256 = "1sf38d3ibv1jhhvr52x7dhrsiyqk1hm165dfv8w8wh0fhmgxg151"; }; propagatedBuildInputs = with self; [ @@ -25240,6 +23278,7 @@ in { meta = with stdenv.lib; { description = "FreezeGun: Let your Python tests travel through time"; homepage = "https://github.com/spulec/freezegun"; + license = licenses.asl20; }; }; @@ -25284,28 +23323,8 @@ in { }; }; - systemd = buildPythonPackage rec { - version = "231"; - name = "python-systemd-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/systemd/python-systemd/archive/v${version}.tar.gz"; - sha256 = "1sifq7mdg0y5ngab8vjy8995nz9c0hxny35dxs5qjx0k0hyzb71c"; - }; - - buildInputs = with pkgs; [ systemd pkgconfig ]; - - patchPhase = '' - substituteInPlace setup.py \ - --replace "/usr/include" "${pkgs.systemd.dev}/include" - echo '#include ' >> systemd/pyutil.h - ''; - - meta = { - description = "Python module for native access to the systemd facilities"; - homepage = http://www.freedesktop.org/software/systemd/python-systemd/; - license = licenses.lgpl21; - }; + systemd = callPackage ../development/python-modules/systemd { + inherit (pkgs) pkgconfig systemd; }; tabulate = buildPythonPackage rec { @@ -25352,26 +23371,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; @@ -25469,6 +23468,22 @@ in { }; }; + terminaltables = buildPythonPackage rec { + name = "terminaltables-${version}"; + version = "3.1.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/t/terminaltables/${name}.tar.gz"; + sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81"; + }; + + meta = { + description = "Display simple tables in terminals"; + homepage = "https://github.com/Robpol86/terminaltables"; + license = licenses.mit; + }; + }; + keystoneclient = buildPythonPackage rec { name = "keystoneclient-${version}"; version = "1.8.1"; @@ -25485,7 +23500,7 @@ in { oslotest pep8 ]; propagatedBuildInputs = with self; [ oslo-serialization oslo-config oslo-i18n oslo-utils - Babel argparse prettytable requests2 six iso8601 stevedore + Babel argparse prettytable requests six iso8601 stevedore netaddr debtcollector bandit webob mock pycrypto ]; patchPhase = '' @@ -25523,7 +23538,7 @@ in { ]; propagatedBuildInputs = with self; [ pbr Babel oslo-config oslo-context oslo-i18n oslo-serialization oslo-utils - requests2 six webob keystoneclient pycadf oslo-messaging + requests six webob keystoneclient pycadf oslo-messaging ]; # lots of "unhashable type" errors @@ -25640,12 +23655,13 @@ in { }; traitlets = buildPythonPackage rec { - version = "4.3.1"; - name = "traitlets-${version}"; + pname = "traitlets"; + version = "4.3.2"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/traitlets/${name}.tar.gz"; - sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; + src = fetchPypi { + inherit pname version; + sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; }; LC_ALL = "en_US.UTF-8"; @@ -25725,9 +23741,10 @@ in { # Python package. tkinter = let py = python.override{x11Support=true;}; - in mkPythonDerivation rec { + in buildPythonPackage rec { name = "tkinter-${python.version}"; src = py; + format = "other"; disabled = isPy26 || isPyPy; @@ -25773,7 +23790,7 @@ in { meta = { description = "Quick Response code generation for Python"; - home = "https://pypi.python.org/pypi/qrcode"; + homepage = "https://pypi.python.org/pypi/qrcode"; license = licenses.bsd3; }; }; @@ -25833,51 +23850,7 @@ in { }; }; - tqdm = buildPythonPackage rec { - name = "tqdm-${version}"; - version = "4.8.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tqdm/${name}.tar.gz"; - sha256 = "bab05f8bb6efd2702ab6c532e5e6a758a66c0d2f443e09784b73e4066e6b3a37"; - }; - - buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ]; - propagatedBuildInputs = with self; [ matplotlib pandas ]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Many transient failures in performance tests and due to use of sleep - - meta = { - description = "A Fast, Extensible Progress Meter"; - homepage = https://github.com/tqdm/tqdm; - license = with licenses; [ mit ]; - }; - }; - - tqdm4 = buildPythonPackage rec { - name = "tqdm-${version}"; - version = "4.7.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tqdm/${name}.tar.gz"; - sha256 = "1z801zl1y3cf6ixzw4jlpkbp9a9j92sqzs35l0jaqfq00aj1bdm0"; - }; - - buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ]; - propagatedBuildInputs = with self; [ matplotlib pandas ]; - - LC_ALL="en_US.UTF-8"; - - doCheck = false; # Many transient failures in performance tests and due to use of sleep - - meta = { - description = "A Fast, Extensible Progress Meter"; - homepage = https://github.com/tqdm/tqdm; - license = with licenses; [ mit ]; - }; - }; + tqdm = callPackage ../development/python-modules/tqdm { }; smmap = buildPythonPackage rec { name = "smmap-0.9.0"; @@ -26047,7 +24020,7 @@ in { }; doCheck = false; - propagatedBuildInputs = with self; [ requests2 six requests_oauthlib ]; + propagatedBuildInputs = with self; [ requests six requests_oauthlib ]; meta = { homepage = "https://github.com/tweepy/tweepy"; @@ -26224,7 +24197,7 @@ in { sha256 = "68b663691a947b844f92853c992d42bb68b6333bffc9ab7f661346b001c1da82"; }; - propagatedBuildInputs = with self; [ clint pkginfo requests2 requests_toolbelt ]; + propagatedBuildInputs = with self; [ clint pkginfo requests requests_toolbelt ]; # Requires network doCheck = false; @@ -26237,47 +24210,7 @@ in { }; }; - twisted = buildPythonPackage rec { - - name = "Twisted-${version}"; - version = "16.4.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816"; - }; - - propagatedBuildInputs = with self; [ zope_interface ]; - - # Patch t.p._inotify to point to libc. Without this, - # twisted.python.runtime.platform.supportsINotify() == False - patchPhase = optionalString stdenv.isLinux '' - substituteInPlace twisted/python/_inotify.py --replace \ - "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" - ''; - - # Generate Twisted's plug-in cache. Twisted users must do it as well. See - # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 - # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for - # details. - postInstall = "$out/bin/twistd --help > /dev/null"; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s twisted/test - ''; - # Tests require network - doCheck = false; - - meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - longDescription = '' - Twisted is an event-driven networking engine written in Python - and licensed under the MIT license. - ''; - license = licenses.mit; - maintainers = [ ]; - }; - }; + twisted = callPackage ../development/python-modules/twisted { }; tzlocal = buildPythonPackage rec { name = "tzlocal-1.2.2"; @@ -26337,6 +24270,7 @@ in { description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; homepage = https://github.com/esnme/ultramemcache; license = licenses.bsdOriginal; + broken = true; }; }; @@ -26406,6 +24340,8 @@ in { }; }; + uritools = callPackage ../development/python-modules/uritools { }; + traceback2 = buildPythonPackage rec { version = "1.4.0"; name = "traceback2-${version}"; @@ -26475,7 +24411,7 @@ in { sha256 = "681bc7c26cffd1564eb6f0f3170d975a31c2a9f2224a32f80fe954232b86f173"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; doCheck = false; @@ -26508,6 +24444,23 @@ in { }; }; + uptime = buildPythonPackage rec { + name = "uptime-${version}"; + version = "3.0.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/u/uptime/${name}.tar.gz"; + sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/Cairnarvon/uptime; + description = "Cross-platform way to retrieve system uptime and boot time"; + license = licenses.bsd2; + maintainers = with maintainers; [ rob ]; + }; + }; + urlgrabber = buildPythonPackage rec { name = "urlgrabber-3.9.1"; disabled = isPy3k; @@ -26636,30 +24589,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"; @@ -26698,9 +24628,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" @@ -26731,7 +24661,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 @@ -26758,7 +24688,7 @@ EOF sha256 = "991bc2f1dc824c63e9b399f9e8606deded92a52378d0e449f258807d7556b039"; }; - propagatedBuildInputs = with self; [ requests2 six]; + propagatedBuildInputs = with self; [ requests six]; # No tests included doCheck = false; @@ -26782,7 +24712,7 @@ EOF sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; }; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; # Tests disabled. They fail because they try to access the network doCheck = false; @@ -26862,28 +24792,10 @@ EOF websockets = callPackage ../development/python-modules/websockets { }; - Wand = buildPythonPackage rec { - pname = "Wand"; - version = "0.4.4"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "28e0454c9d16d69c5d5034918d96320d8f9f1377b4fdaf4944eec2f938c74704"; - }; - - buildInputs = with self; [ pkgs.imagemagick pytest psutil memory_profiler pytest_xdist ]; - - # No tests - doCheck = false; - meta = { - description = "Ctypes-based simple MagickWand API binding for Python"; - homepage = http://wand-py.org/; - platforms = platforms.all; - }; + Wand = callPackage ../development/python-modules/Wand { + imagemagick = pkgs.imagemagickBig; }; - wcwidth = buildPythonPackage rec { name = "wcwidth-${version}"; version = "0.1.6"; @@ -27019,7 +24931,7 @@ EOF LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = with self; [ itsdangerous ]; - buildInputs = with self; [ pytest requests2 pkgs.glibcLocales ]; + buildInputs = with self; [ pytest requests pkgs.glibcLocales ]; @@ -27030,50 +24942,9 @@ EOF }; }; - wheel = buildPythonPackage rec { - name = "wheel-${version}"; - version = "0.29.0"; + wheel = callPackage ../development/python-modules/wheel { }; - src = pkgs.fetchurl { - url = "mirror://pypi/w/wheel/${name}.tar.gz"; - sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648"; - }; - - buildInputs = with self; [ pytest pytestcov coverage ]; - - propagatedBuildInputs = with self; [ jsonschema ]; - - # We add this flag to ignore the copy installed by bootstrapped-pip - installFlags = [ "--ignore-installed" ]; - - meta = { - description = "A built-package format for Python"; - license = with licenses; [ mit ]; - homepage = https://bitbucket.org/pypa/wheel/; - }; - }; - - widgetsnbextension = buildPythonPackage rec { - name = "widgetsnbextension-${version}"; - version = "1.2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/widgetsnbextension/${name}.tar.gz"; - sha256 = "c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51"; - }; - - propagatedBuildInputs = with self; [ notebook ]; - - # No tests in archive - doCheck = false; - - meta = { - description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; - license = self.ipywidgets.meta.license; # Build from same repo - maintainers = with maintainers; [ fridh ]; - }; - }; + widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; willie = buildPythonPackage rec { name = "willie-${version}"; @@ -27105,6 +24976,8 @@ EOF sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; }; + disabled = isPy3k; + propagatedBuildInputs = with self; [twisted dateutil]; meta = { @@ -27114,9 +24987,7 @@ EOF }; }); - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { - pythonPackages = self; - }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; wsgiproxy2 = buildPythonPackage rec { name = "WSGIProxy2-0.4.2"; @@ -27215,29 +25086,7 @@ EOF }; }); - xarray = buildPythonPackage rec { - name = "xarray-${version}"; - version = "0.9.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/x/xarray/${name}.tar.gz"; - sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [numpy pandas]; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - meta = { - description = "N-D labeled arrays and datasets in Python"; - homepage = https://github.com/pydata/xarray; - license = licenses.asl20; - maintainers = with maintainers; [ fridh ]; - }; - }; + xarray = callPackage ../development/python-modules/xarray { }; xlwt = callPackage ../development/python-modules/xlwt { }; @@ -27267,24 +25116,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 { @@ -27422,25 +25255,7 @@ EOF }; }; - - BTrees = self.buildPythonPackage rec { - name = "BTrees-4.1.4"; - - propagatedBuildInputs = with self; [ persistent zope_interface transaction ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/B/BTrees/${name}.tar.gz"; - sha256 = "1avvhkd7rvp3rzhw20v6ank8a8m9a1lmh99c4gjjsa1ry0zsri3y"; - }; - - patches = [ ../development/python-modules/btrees-py35.patch ]; - - meta = { - description = "Scalable persistent components"; - homepage = http://packages.python.org/BTrees; - }; - }; - + BTrees = callPackage ../development/python-modules/btrees {}; persistent = self.buildPythonPackage rec { name = "persistent-4.0.8"; @@ -27902,25 +25717,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"; @@ -27941,23 +25738,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"; @@ -28053,7 +25835,7 @@ EOF tunigo = buildPythonPackage rec { name = "tunigo-${version}"; version = "1.0.0"; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; src = pkgs.fetchFromGitHub { owner = "trygveaa"; @@ -28191,10 +25973,10 @@ EOF }; pyzmq = buildPythonPackage rec { - name = "pyzmq-15.2.0"; + name = "pyzmq-16.0.2"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyzmq/${name}.tar.gz"; - sha256 = "2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec"; + sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d"; }; buildInputs = with self; [ pkgs.zeromq3 pytest tornado ]; propagatedBuildInputs = [ self.py ]; @@ -28349,11 +26131,11 @@ EOF websocket_client = buildPythonPackage rec { - name = "websocket_client-0.32.0"; + name = "websocket_client-0.40.0"; src = pkgs.fetchurl { url = "mirror://pypi/w/websocket-client/${name}.tar.gz"; - sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040"; + sha256 = "1yz67wdjijrvwpx0a0f6wdfy8ajsvr9xbj5514ld452fqnh19b20"; }; propagatedBuildInputs = with self; [ six backports_ssl_match_hostname unittest2 argparse ]; @@ -28424,6 +26206,54 @@ EOF }; }; + worldengine = buildPythonPackage rec { + name = "worldengine-${version}"; + version = "0.19.0"; + + src = pkgs.fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine"; + rev = "v${version}"; + sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry"; + }; + + src-data = pkgs.fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine-data"; + rev = "029051e"; + sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm"; + }; + + postUnpack = '' + ln -s ${src-data} worldengine-data + ''; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf3_2 purepng argparse h5py gdal ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace pypng>=0.0.18 purepng \ + --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ + --replace 'argparse==1.2.1' 'argparse' \ + --replace 'protobuf==3.0.0a3' 'protobuf' \ + --replace 'noise==1.2.2' 'noise' \ + --replace 'PyPlatec==1.4.0' 'PyPlatec' \ + ''; + + doCheck = true; + postCheck = '' + nosetests tests + ''; + + meta = { + homepage = http://world-engine.org; + description = "World generator using simulation of plates, rain shadow, erosion, etc"; + platforms = platforms.all; + maintainers = with maintainers; [ rardiol ]; + }; + }; + carbon = buildPythonPackage rec { name = "carbon-${version}"; version = graphiteVersion; @@ -28593,7 +26423,7 @@ EOF url = "mirror://pypi/t/${pname}/${name}.tar.gz"; sha256 = "0kkxxd17ar5gyjkz9yrrdr15a64qw6ym60ndi0zbwx2s634yfafw"; }; - propagatedBuildInputs = with self; [ twisted requests2 cryptography ]; + propagatedBuildInputs = with self; [ twisted requests cryptography ]; # Require network access doCheck = false; @@ -28666,7 +26496,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 \ @@ -28808,8 +26638,7 @@ EOF }; propagatedBuildInputs = with self; [ cffi ]; - buildInputs = [ pkgs.libspotify ] - ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; + buildInputs = [ pkgs.libspotify ]; # python zip complains about old timestamps preConfigure = '' @@ -28858,23 +26687,21 @@ EOF }; ws4py = buildPythonPackage rec { - name = "ws4py-${version}"; + name = "${pname}-${version}"; + pname = "ws4py"; + version = "0.4.2"; - version = "git-20130303"; - - src = pkgs.fetchgit { - url = "https://github.com/Lawouach/WebSocket-for-Python.git"; - rev = "ace276500ca7e4c357595e3773be151d37bcd6e2"; - sha256 = "1g7nmhjjxjf6vx75dyzns8bpid3b5i02kakk2lh1i297b5rw2rjq"; + src = fetchPypi { + inherit pname version; + sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; }; - # python zip complains about old timestamps - preConfigure = '' - find -print0 | xargs -0 touch - ''; + buildInputs = with self; [ pytest mock ]; + propagatedBuildInputs = with self; [ asyncio cherrypy gevent tornado ]; - # Tests depend on other packages - doCheck = false; + checkPhase = '' + pytest test + ''; meta = { homepage = https://ws4py.readthedocs.org; @@ -28928,14 +26755,14 @@ EOF Logbook = buildPythonPackage rec { name = "Logbook-${version}"; - version = "0.11.3"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/L/Logbook/${name}.tar.gz"; - sha256 = "0bchn00jj0y4dmrmqsm29ffcx37g79jcxjihadmgz2aj0z6dbsrc"; + sha256 = "0whqbx5p0zkf7gmb5ssnsnhm4kn4drd4x7fbhdi8dnxklqajbnl7"; }; - buildInputs = [ self.pytest ]; + buildInputs = [ self.pytest ] ++ optionals (!isPy3k) [ self.mock ]; checkPhase = '' find tests -name \*.pyc -delete @@ -28950,13 +26777,13 @@ EOF }; libvirt = let - version = "3.0.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 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl"; + sha256 = "06mc0cm4k90z8vxaslk3ifpajg8w8dvm0m2mxwcd6fdzps8fwpsw"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -28991,11 +26818,12 @@ EOF --replace 'lxml==3.7.1' 'lxml' \ --replace 'pyopenssl==16.2.0' 'pyopenssl' \ --replace 'requests[socks]==2.12.4' 'requests[socks]' \ - --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' + --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ + --replace 'python-dateutil==2.5.3' 'python-dateutil>=2.5,<3.0' ''; propagatedBuildInputs = with self; [ - pyyaml lxml grequests flaskbabel flask requests2 + pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; @@ -29025,23 +26853,30 @@ EOF grequests = buildPythonPackage rec { - name = "grequests-0.2.0"; + pname = "grequests"; + version = "0.3.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/g/grequests/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c"; }; - buildInputs = with self; [ requests gevent ]; + # No tests in archive + doCheck = false; + + propagatedBuildInputs = with self; [ requests gevent ]; meta = { description = "Asynchronous HTTP requests"; homepage = https://github.com/kennethreitz/grequests; - license = "bsd"; + license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ matejc ]; }; }; + first = callPackage ../development/python-modules/first {}; + flaskbabel = buildPythonPackage rec { name = "Flask-Babel-0.11.1"; @@ -29112,10 +26947,10 @@ EOF # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.18.0"; + version = "1.19.0"; src = pkgs.fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "0p92xsw7sh7965mb097lxy98va5xsrkxdqqaq11fhkpwqccy2l8p"; + sha256 = "105qykdd04mlyzwzyscw6mlc7ajl4wbwhq87ncy1jvw8jjh6jads"; }; preConfigure = '' @@ -29130,9 +26965,9 @@ EOF meta = { description = "Python bindings for EFL and Elementary"; homepage = http://enlightenment.org/; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = platforms.linux; license = licenses.gpl3; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; }; }; @@ -29222,27 +27057,7 @@ EOF }; - uncertainties = buildPythonPackage rec { - name = "uncertainties-${version}"; - version = "3.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uncertainties/${name}.tar.gz"; - sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; - }; - - buildInputs = with self; [ nose numpy ]; - - meta = { - homepage = "http://pythonhosted.org/uncertainties/"; - description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; - license = licenses.bsd3; - }; - - # No tests included - doCheck = false; - }; - + uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = buildPythonPackage rec { name = "funcy-1.6"; @@ -29263,56 +27078,6 @@ EOF }; }; - boto-230 = buildPythonPackage rec { - name = "boto-2.30.0"; - disabled = ! isPy27; - src = pkgs.fetchurl { - url = mirror://pypi/b/boto/boto-2.30.0.tar.gz; - sha256 = "12gl8azmx1vv8dbv9jhnsbhjpc2dd1ng0jlbcg734k6ggwq1h6hh"; - }; - doCheck = false; - meta = { - homepage = https://github.com/boto/boto; - license = licenses.mit; - description = "Python interface to Amazon Web Services"; - }; - }; - - gcs-oauth2-boto-plugin = buildPythonPackage rec { - name = "gcs-oauth2-boto-plugin-1.8"; - disabled = ! isPy27; - src = pkgs.fetchurl { - url = mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz; - sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb"; - }; - propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pyopenssl socksipy-branch ]; - meta = { - homepage = https://developers.google.com/storage/docs/gspythonlibrary; - description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; - license = licenses.asl20; - }; - }; - - gsutil = buildPythonPackage rec { - name = "gsutil-4.6"; - disabled = ! isPy27; - meta = { - homepage = https://developers.google.com/storage/docs/gsutil; - description = "Google Cloud Storage Tool"; - maintainers = with maintainers; [ roconnor ]; - license = licenses.asl20; - }; - doCheck = false; - - src = pkgs.fetchurl { - url = mirror://pypi/g/gsutil/gsutil-4.6.tar.gz; - sha256 = "1i0clm60162rbk45ljr8nsw4ndkzjnwb7r440shcqjrvw8jq49mn"; - }; - - propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags - retry_decorator pyopenssl socksipy-branch crcmod ]; - }; - svg2tikz = self.buildPythonPackage { name = "svg2tikz-1.0.0"; disabled = ! isPy27; @@ -29538,7 +27303,7 @@ EOF thumbor = buildPythonPackage rec { name = "thumbor-${version}"; - version = "5.2.1"; + version = "6.3.2"; disabled = ! isPy27; @@ -29548,6 +27313,7 @@ EOF tornado pycrypto pycurl + pytz pillow derpconf python_magic @@ -29559,14 +27325,18 @@ EOF src = pkgs.fetchurl { url = "mirror://pypi/t/thumbor/${name}.tar.gz"; - sha256 = "57b0d7e261e792b2e2c53a79c3d8c722964003d1828331995dc3491dc67db7d8"; + sha256 = "0787245x4yci34cdfc9xaxhds0lv60476qgp132pwa78hrpc9m31"; }; + prePatch = '' + substituteInPlace setup.py \ + --replace '"argparse",' "" + ''; + meta = { description = "A smart imaging service"; homepage = https://github.com/globocom/thumbor/wiki; license = licenses.mit; - broken = true; }; }; @@ -29625,7 +27395,7 @@ EOF setupPyBuildFlags = ["--qt" "--xdg"]; - propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ]; + propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ]; meta = { homepage = http://weboob.org; @@ -29734,6 +27504,9 @@ EOF buildInputs = with self; [ nose ]; propagatedBuildInputs = with self; [ decorator ]; + # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299 + doCheck = !(isPy36); + meta = { homepage = "https://networkx.github.io/"; description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; @@ -29826,11 +27599,6 @@ EOF export GEOS_DIR=${pkgs.geos} ''; - # The installer does not support the '--old-and-unmanageable' option - installPhase = '' - ${python.interpreter} setup.py install --prefix $out - ''; - # The 'check' target is not supported by the `setup.py` script. # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) doCheck = false; @@ -30112,7 +27880,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"; @@ -30167,7 +27935,7 @@ EOF sha256 = "0fcc78b8dfc87237942aad2a8be54dbc08bc4afceaa7f6897f3d894e7d4bfd22"; }; - propagatedBuildInputs = with self; [ pytz requests2 ]; + propagatedBuildInputs = with self; [ pytz requests ]; buildInputs = with self; [ coverage mock nose unittest2 ]; @@ -30180,12 +27948,12 @@ EOF }; jenkins-job-builder = buildPythonPackage rec { - name = "jenkins-job-builder-1.6.1"; + name = "jenkins-job-builder-2.0.0.0b2"; disabled = ! (isPy26 || isPy27); src = pkgs.fetchurl { url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz"; - sha256 = "1v3xknfzgsp35nn3ma4imz233v569v3x75mx2yxlv1xf32nn7yk4"; + sha256 = "1y0yl2w6c9c91f9xbjkvff1ag8p72r24nzparrzrw9sl8kn9632x"; }; patchPhase = '' @@ -30202,6 +27970,7 @@ EOF python-jenkins pyyaml six + stevedore ] ++ optionals isPy26 [ ordereddict argparse @@ -30491,7 +28260,7 @@ EOF version = "0.4.5"; doCheck = false; #test needs packages too explicit buildInputs = with self; [ d2to1 ]; - propagatedBuildInputs = with self; [ requests2 ]; + propagatedBuildInputs = with self; [ requests ]; src = pkgs.fetchurl { url = "mirror://pypi/o/ovh/ovh-${version}.tar.gz"; @@ -30585,12 +28354,11 @@ EOF propagatedBuildInputs = with self; [ scipy ]; buildInputs = with self; [ nose ]; - # Cannot be installed with Python 2.x, most likely due to the patch below. - disabled = !isPy3k; - postPatch = '' cd python-package + sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py + sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py cat <xgboost/libpath.py def find_lib_path(): return ["${pkgs.xgboost}/lib/libxgboost.so"] @@ -30752,145 +28520,40 @@ EOF }; }; - hidapi = buildPythonPackage rec{ - version = "0.7.99.post15"; - name = "hidapi-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hidapi/${name}.tar.gz"; - sha256 = "09wlr1d7mx80974bsq62j4pk80234jgl7ip4br0y43q6999dpcr0"; - }; - - propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ]; - - # Fix the USB backend library lookup - postPatch = '' - libusb=${pkgs.libusb1.dev}/include/libusb-1.0 - test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py - ''; - - meta = { - description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi"; - homepage = https://github.com/trezor/cython-hidapi; - # license can actually be either bsd3 or gpl3 - # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt - license = licenses.bsd3; - maintainers = with maintainers; [ np ]; - }; + hidapi = callPackage ../development/python-modules/hidapi { + inherit (pkgs) udev libusb1; }; - mnemonic = buildPythonPackage rec{ - version = "0.12"; - name = "mnemonic-${version}"; + mnemonic = callPackage ../development/python-modules/mnemonic { }; - src = pkgs.fetchurl { - url = "mirror://pypi/m/mnemonic/${name}.tar.gz"; - sha256 = "0j5jm4v54135qqw455fw4ix2mhxhzjqvxji9gqkpxagk31cvbnj4"; - }; + keepkey = callPackage ../development/python-modules/keepkey { }; - propagatedBuildInputs = with self; [ pbkdf2 ]; + libagent = callPackage ../development/python-modules/libagent { }; - meta = { - description = "Implementation of Bitcoin BIP-0039"; - homepage = https://github.com/trezor/python-mnemonic; - license = licenses.mit; - maintainers = with maintainers; [ np ]; - }; - }; + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; - trezor = buildPythonPackage rec{ - version = "0.7.4"; - name = "trezor-${version}"; + ecpy = callPackage ../development/python-modules/ecpy { }; - src = pkgs.fetchurl { - url = "mirror://pypi/t/trezor/${name}.tar.gz"; - sha256 = "18nr76jkdg24sb3r8cfbiq12b95gnh0amc0r1wx9mmg3pwq6jx6y"; - }; + semver = callPackage ../development/python-modules/semver { }; - propagatedBuildInputs = with self; [ protobuf3_0 hidapi ]; + ed25519 = callPackage ../development/python-modules/ed25519 { }; - buildInputs = with self; [ ecdsa mnemonic ]; - - # There are no actual tests: "ImportError: No module named tests" - doCheck = false; - - meta = { - description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; - homepage = https://github.com/trezor/python-trezor; - license = licenses.gpl3; - maintainers = with maintainers; [ np ]; - }; - }; - - keepkey = buildPythonPackage rec{ - version = "0.7.3"; - name = "keepkey-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/keepkey/${name}.tar.gz"; - sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714"; - }; - - propagatedBuildInputs = with self; [ protobuf3_0 hidapi ]; - - buildInputs = with self; [ ecdsa mnemonic ]; - - # There are no actual tests: "ImportError: No module named tests" - doCheck = false; - - meta = { - description = "KeepKey Python client"; - homepage = https://github.com/keepkey/python-keepkey; - license = licenses.gpl3; - maintainers = with maintainers; [ np ]; - }; - }; - - semver = buildPythonPackage rec { - name = "semver-${version}"; - version = "2.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/semver/${name}.tar.gz"; - sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m"; - }; - - meta = { - description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = "https://github.com/k-bx/python-semver"; - license = licenses.bsd3; - maintainers = with maintainers; [ np ]; - }; - }; - - ed25519 = buildPythonPackage rec { - name = "ed25519-${version}"; - version = "1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/e/ed25519/${name}.tar.gz"; - sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499"; - }; - - meta = { - description = "Ed25519 public-key signatures"; - homepage = "https://github.com/warner/python-ed25519"; - license = licenses.mit; - maintainers = with maintainers; [ np ]; - }; - }; + trezor = callPackage ../development/python-modules/trezor { }; trezor_agent = buildPythonPackage rec{ - version = "0.7.0"; - name = "trezor_agent-${version}"; + name = "${pname}-${version}"; + pname = "trezor_agent"; + version = "0.9.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/trezor_agent/${name}.tar.gz"; - sha256 = "1x1gwih6w8kxhpgmcp0v1k7mpmfsqiikkjca291sd0v2if24x7q1"; + src = fetchPypi { + inherit pname version; + sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz"; }; - propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ]; + propagatedBuildInputs = with self; [ + trezor libagent ecdsa ed25519 + mnemonic keepkey semver + ]; meta = { description = "Using Trezor as hardware SSH agent"; @@ -31009,7 +28672,7 @@ EOF dateutil inflection more-itertools - requests2 + requests pandas ]; @@ -31228,6 +28891,9 @@ EOF lockfile clize ]; + # zerobin doesn't have any tests, but includes a copy of cherrypy which + # can wrongly fail the check phase. + doCheck = false; meta = { description = "A client side encrypted pastebin"; homepage = "http://0bin.net/"; @@ -31318,7 +28984,7 @@ EOF sha256 = "0hq887yb3rwc0rcw32lh7xdkk9bbrqy274aspzqkd6f7dyhp73ih"; }; - disabled = isPy3k; + propagatedBuildInputs = with self; [ requests-cache ]; meta = { description = "Simple to use TVDB (thetvdb.com) API in Python."; @@ -31330,19 +28996,18 @@ EOF tvnamer = buildPythonPackage rec { name = "tvnamer-${version}"; - version = "2.3"; + version = "2.4"; src = pkgs.fetchurl { url = "mirror://pypi/t/tvnamer/${name}.tar.gz"; - sha256 = "15i6qvhwhcx08c96xx3s2841yc7k8gxrqqvhw908c11g0045c2r3"; + sha256 = "10iizmwna2xpyc2694hsrvny68y3bdq576p8kxsvg5gj2spnsxav"; }; - propagatedBuildInputs = with self; [ - tvdb_api - ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ tvdb_api ]; - # tvdb_api isn't working with Python 3 - disabled = isPy3k; + # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. + doCheck = false; meta = { description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; @@ -31611,7 +29276,7 @@ EOF sha256 = "063cbzp1fbdipv53gb0hnban1pg80pls0lbld98lhnykzkcb6vf0"; }; - propagatedBuildInputs = with self; [ websocket_client requests2 ]; + propagatedBuildInputs = with self; [ websocket_client requests ]; }; tempora = buildPythonPackage rec { @@ -31639,7 +29304,7 @@ EOF sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; }; - propagatedBuildInputs = with self; [ requests2 six dateutil ]; + propagatedBuildInputs = with self; [ requests six dateutil ]; }; pivy = buildPythonPackage rec { @@ -31650,6 +29315,7 @@ EOF rev = "8eab90908f2a3adcc414347566f4434636202344"; sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; }; + disabled = isPy3k; # Judging from SyntaxError buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.mesa pkgs.xorg.libXi ]; }; @@ -31686,7 +29352,7 @@ EOF buildInputs = [ python pkgs.makeWrapper ]; - propagatedBuildInputs = with self; [ docopt requests2 smugpy ]; + propagatedBuildInputs = with self; [ docopt requests smugpy ]; installPhase = '' mkdir -p $out/bin $out/libexec @@ -31696,31 +29362,7 @@ EOF ''; }; - txaio = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "txaio"; - version = "2.5.2"; - - meta = { - description = "Utilities to support code that runs unmodified on Twisted and asyncio."; - homepage = "https://github.com/crossbario/txaio"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ six twisted ]; - - checkPhase = '' - py.test -k "not test_sdist" - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "321d441b336447b72dbe81a4d73470414454baf0543ec701fcfecbf4dcbda0fe"; - }; - }; + txaio = callPackage ../development/python-modules/txaio { }; ramlfications = buildPythonPackage rec { name = "${pname}-${version}"; @@ -31748,104 +29390,21 @@ EOF }; }; - yapf = buildPythonPackage rec { - name = "yapf-${version}"; - version = "0.11.0"; + yapf = callPackage ../development/python-modules/yapf { }; - meta = { - description = "A formatter for Python code."; - homepage = "https://github.com/google/yapf"; - license = licenses.asl20; - maintainers = with maintainers; [ siddharthist ]; - }; + autobahn = callPackage ../development/python-modules/autobahn { }; - src = pkgs.fetchurl { - url = "mirror://pypi/y/yapf/${name}.tar.gz"; - sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij"; - }; - }; + jsonref = callPackage ../development/python-modules/jsonref { }; - autobahn = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "autobahn"; - version = "0.16.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51"; - }; - buildInputs = with self; [ unittest2 mock pytest_29 trollius ]; - propagatedBuildInputs = with self; [ six twisted txaio ]; - checkPhase = '' - py.test $out - ''; - - meta = { - description = "WebSocket and WAMP in Python for Twisted and asyncio."; - homepage = "http://crossbar.io/autobahn"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - }; - - 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"; - }; - }; - - whoosh = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "Whoosh"; - version = "2.7.4"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/${name}.tar.gz"; - sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; - }; - buildInputs = with self; [ pytest ]; - - # Wrong encoding - postPatch = '' - rm tests/test_reading.py - ''; - checkPhase = '' - py.test -k "not test_timelimit" - ''; - - meta = { - description = "Fast, pure-Python full text indexing, search, and spell checking library."; - homepage = "http://bitbucket.org/mchaput/whoosh"; - license = licenses.bsd2; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - }; + whoosh = callPackage ../development/python-modules/whoosh { }; packet-python = buildPythonPackage rec { name = "${pname}-${version}"; pname = "packet-python"; - version = "1.31"; + version = "1.33"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/c3/1b/ea71ec9d6eeab92b783d23dd62e71e9296f9699bc7d457450859803929f0/${name}.tar.gz"; - sha256 = "1z1zmrajfw01jr3mafimq7dvsb1rs978zln9xfd6fbqkp3vm9hc0"; + url = "https://pypi.python.org/packages/eb/82/f0506bd964501f958ac6a37e843ccb7bd9e712732886258314d55f0ec710/packet-python-1.33.tar.gz"; + sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3"; }; propagatedBuildInputs = with self; [ requests ]; @@ -31860,13 +29419,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 requests2 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; @@ -31878,28 +29437,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 { @@ -31915,68 +29452,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 ]; + description = "Unicorn CPU emulator engine"; + homepage = "http://www.unicorn-engine.org/"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.bennofs ]; }; }; - pypandoc = buildPythonPackage rec { - name = "pypandoc-1.3.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pypandoc/${name}.tar.gz"; - sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6"; - }; + intervaltree = callPackage ../development/python-modules/intervaltree { }; - # 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

'" - ''; + packaging = callPackage ../development/python-modules/packaging { }; - LC_ALL="en_US.UTF-8"; + pytoml = callPackage ../development/python-modules/pytoml { }; - propagatedBuildInputs = with self; [ self.pip ]; - buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ]; + pypandoc = callPackage ../development/python-modules/pypandoc { }; - meta = with pkgs.stdenv.lib; { - description = "Thin wrapper for pandoc"; - homepage = "https://github.com/bebraw/pypandoc"; - license = licenses.mit; - maintainers = with maintainers; [ bennofs kristoff3r ]; - }; - }; - - yamllint = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "yamllint"; - version = "0.5.2"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/y/${pname}/${name}.tar.gz"; - sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pyyaml ]; - - meta = { - homepage = "https://github.com/adrienverge/yamllint"; - description = "A linter for YAML files"; - license = licenses.gpl3; - maintainers = with maintainers; [ mikefaille ]; - }; - }; + yamllint = callPackage ../development/python-modules/yamllint { }; yarl = callPackage ../development/python-modules/yarl { }; @@ -32005,53 +29505,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}"; @@ -32065,31 +29523,16 @@ EOF }; }; - yenc = callPackage ../development/python-modules/yenc { - }; + wptserve = callPackage ../development/python-modules/wptserve { }; + + yenc = callPackage ../development/python-modules/yenc { }; + + 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"; @@ -32117,6 +29560,8 @@ EOF }; }; + zxcvbn-python = callPackage ../development/python-modules/zxcvbn-python { }; + incremental = callPackage ../development/python-modules/incremental { }; treq = callPackage ../development/python-modules/treq { }; @@ -32125,6 +29570,18 @@ EOF nitpick = callPackage ../applications/version-management/nitpick { }; + pluginbase = callPackage ../development/python-modules/pluginbase { }; + + node-semver = callPackage ../development/python-modules/node-semver { }; + + distro = callPackage ../development/python-modules/distro { }; + + bz2file = callPackage ../development/python-modules/bz2file { }; + + smart_open = callPackage ../development/python-modules/smart_open { }; + + gensim = callPackage ../development/python-modules/gensim { }; + }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index f9382985fcd1..94c1e6c7ad2e 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -1,6 +1,8 @@ +/* This file defines some basic smoke tests for cross compilation. +*/ -{ # The platforms for which we build Nixpkgs. - supportedSystems ? [ builtins.currentSystem ] +{ # The platforms *from* which we cross compile. + supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true }: @@ -8,26 +10,42 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let - inherit (pkgs) lib; - nativePlatforms = linux; - /* Basic list of packages to cross-build */ - basicCrossDrv = { + common = { + buildPackages.binutils = nativePlatforms; + gmp = nativePlatforms; + libcCross = nativePlatforms; + }; + + gnuCommon = lib.recursiveUpdate common { + buildPackages.gccCrossStageFinal = nativePlatforms; + coreutils = nativePlatforms; + }; + + linuxCommon = lib.recursiveUpdate gnuCommon { + buildPackages.gdb = nativePlatforms; + bison = nativePlatforms; busybox = nativePlatforms; - coreutils = nativePlatforms; dropbear = nativePlatforms; + ed = nativePlatforms; + ncurses = nativePlatforms; + patch = nativePlatforms; }; - /* Basic list of packages to be natively built, - but need a crossSystem defined to get meaning */ - basicNativeDrv = { - buildPackages.gccCrossStageFinal = nativePlatforms; - buildPackages.gdbCross = nativePlatforms; + windowsCommon = lib.recursiveUpdate gnuCommon { + boehmgc = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; }; - basic = basicCrossDrv // basicNativeDrv; + darwinCommon = { + buildPackages.binutils = darwin; + }; in @@ -41,8 +59,8 @@ in # there probably a good idea to try to be "more parametric" --- i.e. avoid # any special casing. crossSystem = { - config = "foosys"; - libc = "foolibc"; + config = "mips64el-apple-windows-gnu"; + libc = "glibc"; }; # Converting to a string (drv path) before checking equality is probably a @@ -50,11 +68,11 @@ in # cause false negatives. testEqualOne = path: system: let f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs)); - in assert + in assertTrue ( f path { inherit system; } == - f (["buildPackages"] ++ path) { inherit system crossSystem; }; - true; + f (["buildPackages"] ++ path) { inherit system crossSystem; } + ); testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path); @@ -71,120 +89,26 @@ in guile = nativePlatforms; }; + crossIphone64 = mapTestOnCross lib.systems.examples.iphone64 darwinCommon; + + crossIphone32 = mapTestOnCross lib.systems.examples.iphone32 darwinCommon; /* Test some cross builds to the Sheevaplug */ - crossSheevaplugLinux = let - crossSystem = { - config = "armv5tel-unknown-linux-gnueabi"; - bigEndian = false; - arch = "arm"; - float = "soft"; - withTLS = true; - platform = pkgs.platforms.sheevaplug; - libc = "glibc"; - openssl.system = "linux-generic32"; - }; - in mapTestOnCross crossSystem (basic // { + crossSheevaplugLinux = mapTestOnCross lib.systems.examples.sheevaplug (linuxCommon // { ubootSheevaplug = nativePlatforms; }); - /* Test some cross builds on 32 bit mingw-w64 */ - crossMingw32 = let - crossSystem = { - config = "i686-w64-mingw32"; - arch = "x86"; # Irrelevant - libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain - platform = {}; - }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - boehmgc = nativePlatforms; - gmp = nativePlatforms; - guile_1_8 = nativePlatforms; - libffi = nativePlatforms; - libtool = nativePlatforms; - libunistring = nativePlatforms; - windows.wxMSW = nativePlatforms; - }; - + crossMingw32 = mapTestOnCross lib.systems.examples.mingw32 windowsCommon; /* Test some cross builds on 64 bit mingw-w64 */ - crossMingwW64 = let - crossSystem = { - # That's the triplet they use in the mingw-w64 docs. - config = "x86_64-w64-mingw32"; - arch = "x86_64"; # Irrelevant - libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain - platform = {}; - }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - boehmgc = nativePlatforms; - gmp = nativePlatforms; - guile_1_8 = nativePlatforms; - libffi = nativePlatforms; - libtool = nativePlatforms; - libunistring = nativePlatforms; - windows.wxMSW = nativePlatforms; - }; - + crossMingwW64 = mapTestOnCross lib.systems.examples.mingwW64 windowsCommon; /* Linux on the fuloong */ - fuloongminipc = let - crossSystem = { - config = "mips64el-unknown-linux"; - bigEndian = false; - arch = "mips"; - float = "hard"; - withTLS = true; - libc = "glibc"; - platform = { - name = "fuloong-minipc"; - kernelMajor = "2.6"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelHeadersBaseConfig = "fuloong2e_defconfig"; - uboot = null; - kernelArch = "mips"; - kernelAutoModules = false; - kernelTarget = "vmlinux"; - }; - openssl.system = "linux-generic32"; - gcc = { - arch = "loongson2f"; - abi = "n32"; - }; - }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - ed = nativePlatforms; - patch = nativePlatforms; - }; - + fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon; /* Linux on Raspberrypi */ - rpi = let - crossSystem = { - config = "armv6l-unknown-linux-gnueabi"; - bigEndian = false; - arch = "arm"; - float = "hard"; - fpu = "vfp"; - withTLS = true; - libc = "glibc"; - platform = pkgs.platforms.raspberrypi; - openssl.system = "linux-generic32"; - gcc = { - arch = "armv6"; - fpu = "vfp"; - float = "softfp"; - abi = "aapcs-linux"; - }; - }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - ed = nativePlatforms; - patch = nativePlatforms; + rpi = mapTestOnCross lib.systems.examples.raspberryPi (linuxCommon // { vim = nativePlatforms; unzip = nativePlatforms; ddrescue = nativePlatforms; @@ -192,7 +116,7 @@ in patchelf = nativePlatforms; buildPackages.binutils = nativePlatforms; mpg123 = nativePlatforms; - }; + }); /* Cross-built bootstrap tools for every supported platform */ diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index a6e574a7d11a..ddc449ae59c1 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,19 +1,20 @@ { supportedSystems , packageSet ? (import ../..) , scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ../../lib; +let + lib = import ../../lib; +in with lib; rec { - # Ensure that we don't build packages marked as unfree. - allPackages = args: packageSet (args // { - config.allowUnfree = false; - config.inHydra = true; - }); + allPackages = args: packageSet (args // nixpkgsArgs); pkgs = pkgsFor "x86_64-linux"; + inherit lib; hydraJob' = if scrubJobs then hydraJob else id; @@ -43,6 +44,11 @@ rec { pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; }; + assertTrue = bool: + if bool + then pkgs.runCommand "evaluated-to-true" {} "touch $out" + else pkgs.runCommand "evaluated-to-false" {} "false"; + /* The working or failing mails for cross builds will be sent only to the following maintainers, as most package maintainers will not be interested in the result of cross building a package. */ diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 0fbd5e50d12e..3bc252e440f7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,14 +3,14 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] }: -with import ../../lib; with import ./release-lib.nix {inherit supportedSystems; }; +with lib; let packagePython = mapAttrs (name: value: diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 86fbb0bf1b81..f329f2460d71 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -1,7 +1,7 @@ /* A small release file, with few packages to be built. The aim is to reduce the load on Hydra when testing the `stdenv-updates' branch. */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] }: @@ -68,7 +68,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; hdparm = linux; hello = all; host = linux; - iana_etc = linux; + iana-etc = linux; icewm = linux; idutils = all; inetutils = linux; @@ -157,7 +157,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; time = linux; tinycc = linux; udev = linux; - unrar = linux; + unar = linux; unzip = all; upstart = linux; usbutils = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3a9a304a72d2..be57b40fca64 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,27 +9,41 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ -{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; +with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let - - lib = pkgs.lib; - jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc; - lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; + lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; + + darwin-tested = pkgs.releaseTools.aggregate + { name = "nixpkgs-darwin-${jobs.tarball.version}"; + meta.description = "Release-critical builds for the Nixpkgs darwin channel"; + constituents = + [ jobs.tarball + jobs.stdenv.x86_64-darwin + jobs.ghc.x86_64-darwin + jobs.cabal2nix.x86_64-darwin + jobs.ruby.x86_64-darwin + jobs.python.x86_64-darwin + jobs.rustc.x86_64-darwin + jobs.go.x86_64-darwin + ]; + }; unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; @@ -41,23 +55,18 @@ let jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux - jobs.stdenv.aarch64-linux jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.linux.i686-linux - jobs.linux.aarch64-linux jobs.python.x86_64-linux jobs.python.i686-linux - jobs.python.aarch64-linux jobs.python.x86_64-darwin jobs.python3.x86_64-linux jobs.python3.i686-linux - jobs.python3.aarch64-linux jobs.python3.x86_64-darwin # Many developers use nix-repl jobs.nix-repl.x86_64-linux jobs.nix-repl.i686-linux - jobs.nix-repl.aarch64-linux jobs.nix-repl.x86_64-darwin # Needed by travis-ci to test PRs jobs.nox.i686-linux @@ -66,7 +75,6 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux - jobs.thunderbird.aarch64-linux # Ensure that basic stuff works on darwin jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin @@ -103,6 +111,7 @@ let ocamlPackages = { }; perlPackages = { }; pythonPackages = { + blaze = unix; pandas = unix; scikitlearn = unix; }; @@ -114,6 +123,12 @@ let pandas = unix; scikitlearn = unix; }; + python36Packages = { + blaze = unix; + pandas = unix; + scikitlearn = unix; + }; + } )); in jobs diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index faed3a218fc5..1caef26322d7 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-02-19"; - rev = "d822c5853cb14caa5de84a71f6d4ed07ea5e31e1"; - sha256 = "18m0smlqw3vkn0ljk01l333jj0x32m8rr1dgmpnq621vqvpk5mzp"; +stdenv.mkDerivation { + name = "rustRegistry-2017-07-23"; src = fetchFromGitHub { - inherit rev; - inherit sha256; - - owner = "rust-lang"; - repo = "crates.io-index"; + owner = "rust-lang"; + repo = "crates.io-index"; + rev = "ed8e6a6761278861db046073cc69d6a5e7dd8c15"; + sha256 = "1v72m0h31xcay2m64n2wil5wqnl8z4n4adxxpdllcpgj3pj5jai6"; }; + 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 -m 'Rust registry commit' - - touch $out/touch . "$out/.cargo-index-lock" -'' + touch $out/touch . "$out/.cargo-index-lock" + ''; +} diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index a22587d5b576..43951100de3d 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -64,7 +64,11 @@ let splicedPackages = if actuallySplice - then splicer defaultBuildScope defaultRunScope + then splicer defaultBuildScope defaultRunScope // { + # These should never be spliced under any circumstances + inherit (pkgs) pkgs buildPackages __targetPackages + buildPlatform targetPlatform hostPlatform; + } else pkgs // pkgs.xorg; in diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6febedb79f3d..617fa0c30ce8 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -18,37 +18,22 @@ , # 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 ## , # The package set used at build-time. If null, `buildPackages` will - # be defined internally as the produced package set as itself. + # be defined internally as the final produced package set itself. This allows + # us to avoid expensive splicing. buildPackages +, # The package set used in the next stage. If null, `__targetPackages` will be + # defined internally as the final produced package set itself, just like with + # `buildPackages` and for the same reasons. + # + # THIS IS A HACK for compilers that don't think critically about cross- + # compilation. Please do *not* use unless you really know what you are doing. + __targetPackages + , # The standard environment to use for building packages. stdenv @@ -60,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 @@ -87,21 +72,20 @@ let stdenvBootstappingAndPlatforms = self: super: { buildPackages = (if buildPackages == null then self else buildPackages) // { recurseForDerivations = false; }; - inherit stdenv - buildPlatform hostPlatform targetPlatform; + __targetPackages = (if __targetPackages == null then self else __targetPackages) + // { recurseForDerivations = false; }; + 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 (targetPlatform != buildPlatform) { - cross = targetPlatform; + inherit (super.stdenv.buildPlatform) platform; }; + inherit buildPlatform hostPlatform targetPlatform; inherit (buildPlatform) system platform; };